Browse Source

updated some header file structure

SBird1337 6 years ago
parent
commit
f560ecd80b

+ 1
- 1
data/pkmn_tables/pokemon_moveset_table.s View File

@@ -1,4 +1,4 @@
1
-#include <moves.h>
1
+#include <constants/moves.h>
2 2
 
3 3
 .text
4 4
 .align 2

+ 1
- 1
src/battle_engine/battle_end_of_turn.c View File

@@ -30,7 +30,7 @@
30 30
 /* === INCLUDE === */
31 31
 
32 32
 #include <battle_structs.h>
33
-#include <pkmn_types.h>
33
+#include <constants/ptypes.h>
34 34
 
35 35
 /* === PROTOTYPES === */
36 36
 

+ 4
- 4
src/battle_engine/battle_help.c View File

@@ -34,11 +34,11 @@
34 34
 #include <battle_help.h>
35 35
 #include <battle_locations.h>
36 36
 #include <game_engine.h>
37
-#include <pkmn_abilities.h>
38
-#include <pkmn_attributes.h>
37
+#include <constants/abilities.h>
38
+#include <pkmn_attributes.h> /*TODO: POKEAGB */
39 39
 #include <pkmn_item_effects.h>
40
-#include <pkmn_items.h>
41
-#include <pkmn_types.h>
40
+#include <constants/items.h>
41
+#include <constants/ptypes.h>
42 42
 
43 43
 /* === STATICS === */
44 44
 

+ 1
- 1
src/battle_engine/battle_initiative.c View File

@@ -33,7 +33,7 @@
33 33
 #include <pkmn_item_effects.h>
34 34
 #include <pokemon.h>
35 35
 #include <battle_help.h>
36
-#include <pkmn_abilities.h>
36
+#include <constants/abilities.h>
37 37
 #include <math.h>
38 38
 #include <battle_common.h>
39 39
 #include <battle_abilities.h>

+ 1
- 1
src/battle_engine/battle_test.c View File

@@ -31,7 +31,7 @@
31 31
 #include <battle_test.h>
32 32
 #include <debug.h>
33 33
 #include <battle_initiative.h>
34
-#include <pkmn_abilities.h>
34
+#include <constants/abilities.h>
35 35
 #include <battle_structs.h>
36 36
 #include <battle_common.h>
37 37
 #include <battle_custom_structs.h>

+ 1
- 1
src/battle_engine/custom_structs_malloc.c View File

@@ -34,7 +34,7 @@
34 34
 #include <config.h>
35 35
 #include <game_engine.h>
36 36
 #include <memory.h>
37
-#include <moves.h>
37
+#include <constants/moves.h>
38 38
 #include <battle_common.h>
39 39
 #include <battle_locations.h>
40 40
 

+ 2
- 2
src/battle_engine/entry_hazards.c View File

@@ -30,10 +30,10 @@
30 30
 /* === INCLUDE === */
31 31
 #include <battle_help.h>
32 32
 #include <battle_locations.h>
33
-#include <moves.h>
33
+#include <constants/moves.h>
34 34
 #include <battle_structs.h>
35 35
 #include <battle_custom_structs.h>
36
-#include <pkmn_types.h>
36
+#include <constants/ptypes.h>
37 37
 #include <battle_common.h>
38 38
 
39 39
 /* === EXTERN STATICS === */

+ 2
- 2
src/evolution/evolution_methods.c View File

@@ -32,9 +32,9 @@
32 32
 #include <agb_debug.h>
33 33
 #include <math.h>
34 34
 #include <config.h>
35
-#include <moves.h>
35
+#include <constants/moves.h>
36 36
 #include <pokemon.h>
37
-#include <pkmn_types.h>
37
+#include <constants/ptypes.h>
38 38
 
39 39
 #define EVO_NULL              \
40 40
     {                         \

src/include/pkmn_abilities.h → src/include/constants/abilities.h View File


src/include/pkmn_items.h → src/include/constants/items.h View File


src/include/moves.h → src/include/constants/moves.h View File


src/include/pkmn_types.h → src/include/constants/ptypes.h View File


+ 2
- 2
src/moves/ability_changers/ability_change.c View File

@@ -1,8 +1,8 @@
1 1
 #include <battle_locations.h>
2 2
 #include <types.h>
3 3
 #include <battle_structs.h>
4
-#include <pkmn_abilities.h>
5
-#include <moves.h>
4
+#include <constants/abilities.h>
5
+#include <constants/moves.h>
6 6
 
7 7
 extern void* str_worry_seed_ref;
8 8
 extern void* str_entrainment_ref;

+ 1
- 1
src/moves/defog/defog_script.s View File

@@ -1,5 +1,5 @@
1 1
 #include <battle_script.h>
2
-#include <moves.h>
2
+#include <constants/moves.h>
3 3
 
4 4
 .align 2
5 5
 .thumb

+ 1
- 1
src/moves/feint/feint_scripts.s View File

@@ -1,5 +1,5 @@
1 1
 #include <battle_script.h>
2
-#include <moves.h>
2
+#include <constants/moves.h>
3 3
 .align 2
4 4
 .text
5 5
 .thumb

+ 1
- 1
src/moves/flare_blitz/flare_blitz_script.s View File

@@ -1,5 +1,5 @@
1 1
 #include <battle_script.h>
2
-#include <moves.h>
2
+#include <constants/moves.h>
3 3
 
4 4
 .align 2
5 5
 .thumb

+ 1
- 1
src/moves/hone_claws/hone_claws_script.s View File

@@ -1,5 +1,5 @@
1 1
 #include <battle_script.h>
2
-#include <moves.h>
2
+#include <constants/moves.h>
3 3
 
4 4
 .align 2
5 5
 .thumb

+ 1
- 1
src/moves/metal_burst/metal_burst_script.s View File

@@ -1,5 +1,5 @@
1 1
 #include <battle_script.h>
2
-#include <moves.h>
2
+#include <constants/moves.h>
3 3
 
4 4
 .align 2
5 5
 .thumb

+ 1
- 1
src/moves/rooms/rooms.c View File

@@ -1,5 +1,5 @@
1 1
 #include <battle_common.h>
2
-#include <moves.h>
2
+#include <constants/moves.h>
3 3
 #include <battle_custom_structs.h>
4 4
 #include <battle_structs.h>
5 5
 #include <battle_locations.h>

+ 1
- 1
src/moves/roost/roost.c View File

@@ -1,5 +1,5 @@
1 1
 #include <battle_structs.h>
2
-#include <pkmn_types.h>
2
+#include <constants/ptypes.h>
3 3
 #include <battle_locations.h>
4 4
 
5 5
 u8 roost_change_type()

+ 1
- 1
src/moves/seed_flare/seed_flare_script.s View File

@@ -1,5 +1,5 @@
1 1
 #include <battle_script.h>
2
-#include <moves.h>
2
+#include <constants/moves.h>
3 3
 
4 4
 .align 2
5 5
 .text

+ 1
- 1
src/moves/split_moves/split_moves.c View File

@@ -1,6 +1,6 @@
1 1
 #include <battle_locations.h>
2 2
 #include <battle_structs.h>
3
-#include <moves.h>
3
+#include <constants/moves.h>
4 4
 
5 5
 extern void* str_guard_split_ref;
6 6
 extern void* str_power_split_ref;

+ 1
- 1
src/moves/split_moves/split_moves_script.s View File

@@ -1,5 +1,5 @@
1 1
 #include <battle_script.h>
2
-#include <moves.h>
2
+#include <constants/moves.h>
3 3
 
4 4
 .align 2
5 5
 .thumb

+ 1
- 1
src/moves/swap_moves/swap_moves.c View File

@@ -1,5 +1,5 @@
1 1
 #include <battle_common.h>
2
-#include <moves.h>
2
+#include <constants/moves.h>
3 3
 #include <battle_structs.h>
4 4
 #include <battle_locations.h>
5 5
 

+ 1
- 1
src/moves/uturn/u_turn_script.s View File

@@ -1,5 +1,5 @@
1 1
 #include <battle_script.h>
2
-#include <moves.h>
2
+#include <constants/moves.h>
3 3
 
4 4
 .align 2
5 5
 .thumb