summaryrefslogtreecommitdiff
path: root/src/battle
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle')
-rwxr-xr-xsrc/battle/anim/cube.c2
-rw-r--r--src/battle/battle_2.c12
-rw-r--r--src/battle/battle_3.c15
-rw-r--r--src/battle/battle_4.c14
-rw-r--r--src/battle/battle_7.c4
-rw-r--r--src/battle/battle_ai.c8
-rw-r--r--src/battle/battle_controller_linkopponent.c2
-rw-r--r--src/battle/battle_controller_linkpartner.c2
-rw-r--r--src/battle/battle_controller_opponent.c2
-rw-r--r--src/battle/battle_controller_player.c6
-rw-r--r--src/battle/battle_controller_safari.c2
-rw-r--r--src/battle/battle_controller_wally.c2
-rw-r--r--src/battle/battle_interface.c2
-rw-r--r--src/battle/battle_message.c5
-rw-r--r--src/battle/battle_party_menu.c2
-rw-r--r--src/battle/battle_records.c2
-rw-r--r--src/battle/battle_setup.c234
-rw-r--r--src/battle/battle_transition.c2
-rw-r--r--src/battle/calculate_base_damage.c12
-rw-r--r--src/battle/pokeball.c2
20 files changed, 167 insertions, 165 deletions
diff --git a/src/battle/anim/cube.c b/src/battle/anim/cube.c
index 250e3f2d1..07b3ea517 100755
--- a/src/battle/anim/cube.c
+++ b/src/battle/anim/cube.c
@@ -3,7 +3,7 @@
#include "trig.h"
#include "battle_anim.h"
#include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
extern s16 gBattleAnimArgs[];
extern u8 gBattleAnimBankAttacker;
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index a3cd15042..ff3df7235 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -1,5 +1,5 @@
#include "global.h"
-#include "abilities.h"
+#include "constants/abilities.h"
#include "battle.h"
#include "battle_interface.h"
#include "battle_setup.h"
@@ -17,18 +17,18 @@
#include "rom3.h"
#include "rom_8077ABC.h"
#include "rom_8094928.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
-#include "species.h"
+#include "constants/species.h"
#include "sprite.h"
#include "task.h"
#include "text.h"
#include "trig.h"
#include "unknown_task.h"
#include "util.h"
-#include "items.h"
-#include "hold_effects.h"
-#include "battle_move_effects.h"
+#include "constants/items.h"
+#include "constants/hold_effects.h"
+#include "constants/battle_move_effects.h"
#include "ewram.h"
struct UnknownStruct7
diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c
index 263eb2be5..342395c34 100644
--- a/src/battle/battle_3.c
+++ b/src/battle/battle_3.c
@@ -1,18 +1,19 @@
#include "global.h"
-#include "abilities.h"
+#include "constants/abilities.h"
#include "battle.h"
-#include "moves.h"
+#include "constants/moves.h"
#include "item.h"
-#include "items.h"
-#include "hold_effects.h"
-#include "species.h"
+#include "constants/items.h"
+#include "event_data.h"
+#include "constants/hold_effects.h"
+#include "constants/species.h"
#include "pokemon.h"
#include "data2.h"
#include "random.h"
#include "text.h"
-#include "battle_move_effects.h"
+#include "constants/battle_move_effects.h"
#include "string_util.h"
-#include "flags.h"
+#include "constants/flags.h"
#include "ewram.h"
extern u8* gBattlescriptCurrInstr;
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index 4483c252a..18585cebb 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -1,20 +1,20 @@
#include "global.h"
#include "battle.h"
-#include "battle_move_effects.h"
-#include "moves.h"
-#include "abilities.h"
+#include "constants/battle_move_effects.h"
+#include "constants/moves.h"
+#include "constants/abilities.h"
#include "item.h"
-#include "items.h"
+#include "constants/items.h"
#include "data2.h"
-#include "hold_effects.h"
+#include "constants/hold_effects.h"
#include "random.h"
#include "rom3.h"
-#include "species.h"
+#include "constants/species.h"
#include "pokemon.h"
#include "text.h"
#include "palette.h"
#include "main.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "task.h"
#include "decompress.h"
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index 0728b4b71..5a30e012d 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -11,9 +11,9 @@
#include "pokemon.h"
#include "rom_8077ABC.h"
#include "rom_8094928.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
-#include "species.h"
+#include "constants/species.h"
#include "sprite.h"
#include "task.h"
#include "text.h"
diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c
index 0348c3ccd..1fa7a2ed2 100644
--- a/src/battle/battle_ai.c
+++ b/src/battle/battle_ai.c
@@ -1,15 +1,15 @@
#include "global.h"
#include "battle_ai.h"
-#include "abilities.h"
+#include "constants/abilities.h"
#include "battle.h"
-#include "battle_move_effects.h"
+#include "constants/battle_move_effects.h"
#include "data2.h"
#include "item.h"
-#include "moves.h"
+#include "constants/moves.h"
#include "pokemon.h"
#include "random.h"
#include "rom_8077ABC.h"
-#include "species.h"
+#include "constants/species.h"
#include "util.h"
#include "ewram.h"
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index 88043c60d..3259fc7ee 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
@@ -8,7 +8,7 @@
#include "palette.h"
#include "rom_8077ABC.h"
#include "rom3.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "sprite.h"
#include "string_util.h"
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index 3e6ea4add..fc3fde661 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -13,7 +13,7 @@
#include "rom3.h"
#include "rom_8077ABC.h"
#include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sprite.h"
#include "string_util.h"
#include "task.h"
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index 4d4155419..a35687796 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -14,7 +14,7 @@
#include "rom3.h"
#include "rom_8077ABC.h"
#include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sprite.h"
#include "string_util.h"
#include "task.h"
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 55fc45f95..653f0938c 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -4,16 +4,16 @@
#include "battle_interface.h"
#include "battle_message.h"
#include "item.h"
-#include "items.h"
+#include "constants/items.h"
#include "link.h"
#include "m4a.h"
#include "main.h"
#include "menu_cursor.h"
-#include "moves.h"
+#include "constants/moves.h"
#include "palette.h"
#include "pokemon.h"
#include "rom3.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "string_util.h"
#include "task.h"
diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c
index f83eddc9f..3dcfca948 100644
--- a/src/battle/battle_controller_safari.c
+++ b/src/battle/battle_controller_safari.c
@@ -8,7 +8,7 @@
#include "menu_cursor.h"
#include "palette.h"
#include "rom3.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "text.h"
#include "util.h"
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index 77aa54873..0d698d9a5 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -9,7 +9,7 @@
#include "palette.h"
#include "pokemon.h"
#include "rom3.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "sprite.h"
#include "item_use.h"
diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c
index d35440246..ea393277e 100644
--- a/src/battle/battle_interface.c
+++ b/src/battle/battle_interface.c
@@ -7,7 +7,7 @@
#include "pokemon.h"
#include "rom_8077ABC.h"
#include "safari_zone.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "sprite.h"
#include "string_util.h"
diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c
index eac92a78d..fb045c8a7 100644
--- a/src/battle/battle_message.c
+++ b/src/battle/battle_message.c
@@ -3,7 +3,8 @@
#include "battle_message.h"
#include "battle_tower.h"
#include "item.h"
-#include "items.h"
+#include "event_data.h"
+#include "constants/items.h"
#include "pokemon.h"
#include "data2.h"
#include "text.h"
@@ -11,7 +12,7 @@
#include "link.h"
#include "battle_setup.h"
#include "battle_tower.h"
-#include "flags.h"
+#include "constants/flags.h"
#include "ewram.h"
#define BATTLESTRING_TO_SUB 12
diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c
index 5531ead4b..5decf8a7b 100644
--- a/src/battle/battle_party_menu.c
+++ b/src/battle/battle_party_menu.c
@@ -12,7 +12,7 @@
#include "pokemon_summary_screen.h"
#include "rom_8077ABC.h"
#include "rom_8094928.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "string_util.h"
#include "strings.h"
diff --git a/src/battle/battle_records.c b/src/battle/battle_records.c
index 54697593b..97740e3da 100644
--- a/src/battle/battle_records.c
+++ b/src/battle/battle_records.c
@@ -1,6 +1,6 @@
#include "global.h"
#include "battle_records.h"
-#include "game_stat.h"
+#include "constants/game_stat.h"
#include "link.h"
#include "menu.h"
#include "overworld.h"
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index 3d63a85c9..9f51c2878 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -13,9 +13,9 @@
#include "fieldmap.h"
#include "fldeff_poison.h"
#include "main.h"
-#include "map_constants.h"
+#include "constants/maps.h"
#include "metatile_behavior.h"
-#include "opponent_constants.h"
+#include "constants/opponents.h"
#include "palette.h"
#include "random.h"
#include "overworld.h"
@@ -23,9 +23,9 @@
#include "script.h"
#include "script_pokemon_80C4.h"
#include "secret_base.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
-#include "species.h"
+#include "constants/species.h"
#include "starter_choose.h"
#include "string_util.h"
#include "strings.h"
@@ -161,283 +161,283 @@ const struct TrainerEyeTrainer gTrainerEyeTrainers[] =
{
{
{OPPONENT_ROSE_1, OPPONENT_ROSE_2, OPPONENT_ROSE_3, OPPONENT_ROSE_4, OPPONENT_ROSE_5},
- MAP_GROUP_ROUTE118,
- MAP_ID_ROUTE118,
+ MAP_GROUP(ROUTE118),
+ MAP_NUM(ROUTE118),
},
{
{OPPONENT_DUSTY_1, OPPONENT_DUSTY_2, OPPONENT_DUSTY_3, OPPONENT_DUSTY_4, OPPONENT_DUSTY_5},
- MAP_GROUP_ROUTE111,
- MAP_ID_ROUTE111,
+ MAP_GROUP(ROUTE111),
+ MAP_NUM(ROUTE111),
},
{
{OPPONENT_LOLA_1, OPPONENT_LOLA_2, OPPONENT_LOLA_3, OPPONENT_LOLA_4, OPPONENT_LOLA_5},
- MAP_GROUP_ROUTE109,
- MAP_ID_ROUTE109,
+ MAP_GROUP(ROUTE109),
+ MAP_NUM(ROUTE109),
},
{
{OPPONENT_RICKY_1, OPPONENT_RICKY_2, OPPONENT_RICKY_3, OPPONENT_RICKY_4, OPPONENT_RICKY_5},
- MAP_GROUP_ROUTE109,
- MAP_ID_ROUTE109,
+ MAP_GROUP(ROUTE109),
+ MAP_NUM(ROUTE109),
},
{
{OPPONENT_RITA_AND_SAM_1, OPPONENT_RITA_AND_SAM_2, OPPONENT_RITA_AND_SAM_3, OPPONENT_RITA_AND_SAM_4, OPPONENT_RITA_AND_SAM_5},
- MAP_GROUP_ROUTE124,
- MAP_ID_ROUTE124,
+ MAP_GROUP(ROUTE124),
+ MAP_NUM(ROUTE124),
},
{
{OPPONENT_BROOKE_1, OPPONENT_BROOKE_2, OPPONENT_BROOKE_3, OPPONENT_BROOKE_4, OPPONENT_BROOKE_5},
- MAP_GROUP_ROUTE111,
- MAP_ID_ROUTE111,
+ MAP_GROUP(ROUTE111),
+ MAP_NUM(ROUTE111),
},
{
{OPPONENT_WILTON_1, OPPONENT_WILTON_2, OPPONENT_WILTON_3, OPPONENT_WILTON_4, OPPONENT_WILTON_5},
- MAP_GROUP_ROUTE111,
- MAP_ID_ROUTE111,
+ MAP_GROUP(ROUTE111),
+ MAP_NUM(ROUTE111),
},
{
{OPPONENT_VALERIE_1, OPPONENT_VALERIE_2, OPPONENT_VALERIE_3, OPPONENT_VALERIE_4, OPPONENT_VALERIE_5},
- MAP_GROUP_MT_PYRE_6F,
- MAP_ID_MT_PYRE_6F,
+ MAP_GROUP(MT_PYRE_6F),
+ MAP_NUM(MT_PYRE_6F),
},
{
{OPPONENT_CINDY_1, OPPONENT_CINDY_3, OPPONENT_CINDY_4, OPPONENT_CINDY_5, OPPONENT_CINDY_6},
- MAP_GROUP_ROUTE104,
- MAP_ID_ROUTE104,
+ MAP_GROUP(ROUTE104),
+ MAP_NUM(ROUTE104),
},
{
{OPPONENT_JESSICA_1, OPPONENT_JESSICA_2, OPPONENT_JESSICA_3, OPPONENT_JESSICA_4, OPPONENT_JESSICA_5},
- MAP_GROUP_ROUTE121,
- MAP_ID_ROUTE121,
+ MAP_GROUP(ROUTE121),
+ MAP_NUM(ROUTE121),
},
{
{OPPONENT_WINSTON_1, OPPONENT_WINSTON_2, OPPONENT_WINSTON_3, OPPONENT_WINSTON_4, OPPONENT_WINSTON_5},
- MAP_GROUP_ROUTE104,
- MAP_ID_ROUTE104,
+ MAP_GROUP(ROUTE104),
+ MAP_NUM(ROUTE104),
},
{
{OPPONENT_STEVE_1, OPPONENT_STEVE_2, OPPONENT_STEVE_3, OPPONENT_STEVE_4, OPPONENT_STEVE_5},
- MAP_GROUP_ROUTE114,
- MAP_ID_ROUTE114,
+ MAP_GROUP(ROUTE114),
+ MAP_NUM(ROUTE114),
},
{
{OPPONENT_TONY_1, OPPONENT_TONY_2, OPPONENT_TONY_3, OPPONENT_TONY_4, OPPONENT_TONY_5},
- MAP_GROUP_ROUTE107,
- MAP_ID_ROUTE107,
+ MAP_GROUP(ROUTE107),
+ MAP_NUM(ROUTE107),
},
{
{OPPONENT_NOB_1, OPPONENT_NOB_2, OPPONENT_NOB_3, OPPONENT_NOB_4, OPPONENT_NOB_5},
- MAP_GROUP_ROUTE115,
- MAP_ID_ROUTE115,
+ MAP_GROUP(ROUTE115),
+ MAP_NUM(ROUTE115),
},
{
{OPPONENT_DALTON_1, OPPONENT_DALTON_2, OPPONENT_DALTON_3, OPPONENT_DALTON_4, OPPONENT_DALTON_5},
- MAP_GROUP_ROUTE118,
- MAP_ID_ROUTE118,
+ MAP_GROUP(ROUTE118),
+ MAP_NUM(ROUTE118),
},
{
{OPPONENT_BERNIE_1, OPPONENT_BERNIE_2, OPPONENT_BERNIE_3, OPPONENT_BERNIE_4, OPPONENT_BERNIE_5},
- MAP_GROUP_ROUTE114,
- MAP_ID_ROUTE114,
+ MAP_GROUP(ROUTE114),
+ MAP_NUM(ROUTE114),
},
{
{OPPONENT_ETHAN_1, OPPONENT_ETHAN_2, OPPONENT_ETHAN_3, OPPONENT_ETHAN_4, OPPONENT_ETHAN_5},
- MAP_GROUP_JAGGED_PASS,
- MAP_ID_JAGGED_PASS,
+ MAP_GROUP(JAGGED_PASS),
+ MAP_NUM(JAGGED_PASS),
},
{
{OPPONENT_JOHN_AND_JAY_1, OPPONENT_JOHN_AND_JAY_2, OPPONENT_JOHN_AND_JAY_3, OPPONENT_JOHN_AND_JAY_4, OPPONENT_JOHN_AND_JAY_5},
- MAP_GROUP_METEOR_FALLS_1F_2R,
- MAP_ID_METEOR_FALLS_1F_2R,
+ MAP_GROUP(METEOR_FALLS_1F_2R),
+ MAP_NUM(METEOR_FALLS_1F_2R),
},
{
{OPPONENT_BRANDON_1, OPPONENT_BRANDON_2, OPPONENT_BRANDON_3, OPPONENT_BRANDON_4, OPPONENT_BRANDON_5},
- MAP_GROUP_ROUTE120,
- MAP_ID_ROUTE120,
+ MAP_GROUP(ROUTE120),
+ MAP_NUM(ROUTE120),
},
{
{OPPONENT_CAMERON_1, OPPONENT_CAMERON_2, OPPONENT_CAMERON_3, OPPONENT_CAMERON_4, OPPONENT_CAMERON_5},
- MAP_GROUP_ROUTE123,
- MAP_ID_ROUTE123,
+ MAP_GROUP(ROUTE123),
+ MAP_NUM(ROUTE123),
},
{
{OPPONENT_JACKI_1, OPPONENT_JACKI_2, OPPONENT_JACKI_3, OPPONENT_JACKI_4, OPPONENT_JACKI_5},
- MAP_GROUP_ROUTE123,
- MAP_ID_ROUTE123,
+ MAP_GROUP(ROUTE123),
+ MAP_NUM(ROUTE123),
},
{
{OPPONENT_WALTER_1, OPPONENT_WALTER_2, OPPONENT_WALTER_3, OPPONENT_WALTER_4, OPPONENT_WALTER_5},
- MAP_GROUP_ROUTE121,
- MAP_ID_ROUTE121,
+ MAP_GROUP(ROUTE121),
+ MAP_NUM(ROUTE121),
},
{
{OPPONENT_KAREN_1, OPPONENT_KAREN_2, OPPONENT_KAREN_3, OPPONENT_KAREN_4, OPPONENT_KAREN_5},
- MAP_GROUP_ROUTE116,
- MAP_ID_ROUTE116,
+ MAP_GROUP(ROUTE116),
+ MAP_NUM(ROUTE116),
},
{
{OPPONENT_JERRY_1, OPPONENT_JERRY_2, OPPONENT_JERRY_3, OPPONENT_JERRY_4, OPPONENT_JERRY_5},
- MAP_GROUP_ROUTE116,
- MAP_ID_ROUTE116,
+ MAP_GROUP(ROUTE116),
+ MAP_NUM(ROUTE116),
},
{
{OPPONENT_ANNA_AND_MEG_1, OPPONENT_ANNA_AND_MEG_2, OPPONENT_ANNA_AND_MEG_3, OPPONENT_ANNA_AND_MEG_4, OPPONENT_ANNA_AND_MEG_5},
- MAP_GROUP_ROUTE117,
- MAP_ID_ROUTE117,
+ MAP_GROUP(ROUTE117),
+ MAP_NUM(ROUTE117),
},
{
{OPPONENT_ISABEL_1, OPPONENT_ISABEL_2, OPPONENT_ISABEL_3, OPPONENT_ISABEL_4, OPPONENT_ISABEL_5},
- MAP_GROUP_ROUTE110,
- MAP_ID_ROUTE110,
+ MAP_GROUP(ROUTE110),
+ MAP_NUM(ROUTE110),
},
{
{OPPONENT_MIGUEL_1, OPPONENT_MIGUEL_2, OPPONENT_MIGUEL_3, OPPONENT_MIGUEL_4, OPPONENT_MIGUEL_5},
- MAP_GROUP_ROUTE103,
- MAP_ID_ROUTE103,
+ MAP_GROUP(ROUTE103),
+ MAP_NUM(ROUTE103),
},
{
{OPPONENT_TIMOTHY_1, OPPONENT_TIMOTHY_2, OPPONENT_TIMOTHY_3, OPPONENT_TIMOTHY_4, OPPONENT_TIMOTHY_5},
- MAP_GROUP_ROUTE115,
- MAP_ID_ROUTE115,
+ MAP_GROUP(ROUTE115),
+ MAP_NUM(ROUTE115),
},
{
{OPPONENT_SHELBY_1, OPPONENT_SHELBY_2, OPPONENT_SHELBY_3, OPPONENT_SHELBY_4, OPPONENT_SHELBY_5},
- MAP_GROUP_MT_CHIMNEY,
- MAP_ID_MT_CHIMNEY,
+ MAP_GROUP(MT_CHIMNEY),
+ MAP_NUM(MT_CHIMNEY),
},
{
{OPPONENT_CALVIN_1, OPPONENT_CALVIN_2, OPPONENT_CALVIN_3, OPPONENT_CALVIN_4, OPPONENT_CALVIN_5},
- MAP_GROUP_ROUTE102,
- MAP_ID_ROUTE102,
+ MAP_GROUP(ROUTE102),
+ MAP_NUM(ROUTE102),
},
{
{OPPONENT_ELLIOT_1, OPPONENT_ELLIOT_2, OPPONENT_ELLIOT_3, OPPONENT_ELLIOT_4, OPPONENT_ELLIOT_5},
- MAP_GROUP_ROUTE106,
- MAP_ID_ROUTE106,
+ MAP_GROUP(ROUTE106),
+ MAP_NUM(ROUTE106),
},
{
{OPPONENT_ABIGAIL_1, OPPONENT_ABIGAIL_2, OPPONENT_ABIGAIL_3, OPPONENT_ABIGAIL_4, OPPONENT_ABIGAIL_5},
- MAP_GROUP_ROUTE110,
- MAP_ID_ROUTE110,
+ MAP_GROUP(ROUTE110),
+ MAP_NUM(ROUTE110),
},
{
{OPPONENT_BENJAMIN_1, OPPONENT_BENJAMIN_2, OPPONENT_BENJAMIN_3, OPPONENT_BENJAMIN_4, OPPONENT_BENJAMIN_5},
- MAP_GROUP_ROUTE110,
- MAP_ID_ROUTE110,
+ MAP_GROUP(ROUTE110),
+ MAP_NUM(ROUTE110),
},
{
{OPPONENT_ISAIAH_1, OPPONENT_ISAIAH_2, OPPONENT_ISAIAH_3, OPPONENT_ISAIAH_4, OPPONENT_ISAIAH_5},
- MAP_GROUP_ROUTE128,
- MAP_ID_ROUTE128,
+ MAP_GROUP(ROUTE128),
+ MAP_NUM(ROUTE128),
},
{
{OPPONENT_KATELYN_1, OPPONENT_KATELYN_2, OPPONENT_KATELYN_3, OPPONENT_KATELYN_4, OPPONENT_KATELYN_5},
- MAP_GROUP_ROUTE128,
- MAP_ID_ROUTE128,
+ MAP_GROUP(ROUTE128),
+ MAP_NUM(ROUTE128),
},
{
{OPPONENT_MARIA_1, OPPONENT_MARIA_2, OPPONENT_MARIA_3, OPPONENT_MARIA_4, OPPONENT_MARIA_5},
- MAP_GROUP_ROUTE117,
- MAP_ID_ROUTE117,
+ MAP_GROUP(ROUTE117),
+ MAP_NUM(ROUTE117),
},
{
{OPPONENT_DYLAN_1, OPPONENT_DYLAN_2, OPPONENT_DYLAN_3, OPPONENT_DYLAN_4, OPPONENT_DYLAN_5},
- MAP_GROUP_ROUTE117,
- MAP_ID_ROUTE117,
+ MAP_GROUP(ROUTE117),
+ MAP_NUM(ROUTE117),
},
{
{OPPONENT_NICOLAS_1, OPPONENT_NICOLAS_2, OPPONENT_NICOLAS_3, OPPONENT_NICOLAS_4, OPPONENT_NICOLAS_5},
- MAP_GROUP_METEOR_FALLS_1F_2R,
- MAP_ID_METEOR_FALLS_1F_2R,
+ MAP_GROUP(METEOR_FALLS_1F_2R),
+ MAP_NUM(METEOR_FALLS_1F_2R),
},
{
{OPPONENT_ROBERT_1, OPPONENT_ROBERT_2, OPPONENT_ROBERT_3, OPPONENT_ROBERT_4, OPPONENT_ROBERT_5},
- MAP_GROUP_ROUTE120,
- MAP_ID_ROUTE120,
+ MAP_GROUP(ROUTE120),
+ MAP_NUM(ROUTE120),
},
{
{OPPONENT_LAO_1, OPPONENT_LAO_2, OPPONENT_LAO_3, OPPONENT_LAO_4, OPPONENT_LAO_5},
- MAP_GROUP_ROUTE113,
- MAP_ID_ROUTE113,
+ MAP_GROUP(ROUTE113),
+ MAP_NUM(ROUTE113),
},
{
{OPPONENT_CYNDY_1, OPPONENT_CYNDY_2, OPPONENT_CYNDY_3, OPPONENT_CYNDY_4, OPPONENT_CYNDY_5},
- MAP_GROUP_ROUTE115,
- MAP_ID_ROUTE115,
+ MAP_GROUP(ROUTE115),
+ MAP_NUM(ROUTE115),
},
{
{OPPONENT_MADELINE_1, OPPONENT_MADELINE_2, OPPONENT_MADELINE_3, OPPONENT_MADELINE_4, OPPONENT_MADELINE_5},
- MAP_GROUP_ROUTE113,
- MAP_ID_ROUTE113,
+ MAP_GROUP(ROUTE113),
+ MAP_NUM(ROUTE113),
},
{
{OPPONENT_JENNY_1, OPPONENT_JENNY_2, OPPONENT_JENNY_3, OPPONENT_JENNY_4, OPPONENT_JENNY_5},
- MAP_GROUP_ROUTE124,
- MAP_ID_ROUTE124,
+ MAP_GROUP(ROUTE124),
+ MAP_NUM(ROUTE124),
},
{
{OPPONENT_DIANA_1, OPPONENT_DIANA_2, OPPONENT_DIANA_3, OPPONENT_DIANA_4, OPPONENT_DIANA_5},
- MAP_GROUP_JAGGED_PASS,
- MAP_ID_JAGGED_PASS,
+ MAP_GROUP(JAGGED_PASS),
+ MAP_NUM(JAGGED_PASS),
},
{
{OPPONENT_AMY_AND_LIV_1, OPPONENT_AMY_AND_LIV_2, OPPONENT_AMY_AND_LIV_4, OPPONENT_AMY_AND_LIV_5, OPPONENT_AMY_AND_LIV_6},
- MAP_GROUP_ROUTE103,
- MAP_ID_ROUTE103,
+ MAP_GROUP(ROUTE103),
+ MAP_NUM(ROUTE103),
},
{
{OPPONENT_ERNEST_1, OPPONENT_ERNEST_2, OPPONENT_ERNEST_3, OPPONENT_ERNEST_4, OPPONENT_ERNEST_5},
- MAP_GROUP_ROUTE125,
- MAP_ID_ROUTE125,
+ MAP_GROUP(ROUTE125),
+ MAP_NUM(ROUTE125),
},
{
{OPPONENT_EDWIN_1, OPPONENT_EDWIN_2, OPPONENT_EDWIN_3, OPPONENT_EDWIN_4, OPPONENT_EDWIN_5},
- MAP_GROUP_ROUTE110,
- MAP_ID_ROUTE110,
+ MAP_GROUP(ROUTE110),
+ MAP_NUM(ROUTE110),
},
{
{OPPONENT_LYDIA_1, OPPONENT_LYDIA_2, OPPONENT_LYDIA_3, OPPONENT_LYDIA_4, OPPONENT_LYDIA_5},
- MAP_GROUP_ROUTE117,
- MAP_ID_ROUTE117,
+ MAP_GROUP(ROUTE117),
+ MAP_NUM(ROUTE117),
},
{
{OPPONENT_ISAAC_1, OPPONENT_ISAAC_2, OPPONENT_ISAAC_3, OPPONENT_ISAAC_4, OPPONENT_ISAAC_5},
- MAP_GROUP_ROUTE117,
- MAP_ID_ROUTE117,
+ MAP_GROUP(ROUTE117),
+ MAP_NUM(ROUTE117),
},
{
{OPPONENT_CATHERINE_1, OPPONENT_CATHERINE_2, OPPONENT_CATHERINE_3, OPPONENT_CATHERINE_4, OPPONENT_CATHERINE_5},
- MAP_GROUP_ROUTE119,
- MAP_ID_ROUTE119,
+ MAP_GROUP(ROUTE119),
+ MAP_NUM(ROUTE119),
},
{
{OPPONENT_JACKSON_1, OPPONENT_JACKSON_2, OPPONENT_JACKSON_3, OPPONENT_JACKSON_4, OPPONENT_JACKSON_5},
- MAP_GROUP_ROUTE119,
- MAP_ID_ROUTE119,
+ MAP_GROUP(ROUTE119),
+ MAP_NUM(ROUTE119),
},
{
{OPPONENT_HALEY_1, OPPONENT_HALEY_2, OPPONENT_HALEY_3, OPPONENT_HALEY_4, OPPONENT_HALEY_5},
- MAP_GROUP_ROUTE104,
- MAP_ID_ROUTE104,
+ MAP_GROUP(ROUTE104),
+ MAP_NUM(ROUTE104),
},
{
{OPPONENT_JAMES_1, OPPONENT_JAMES_2, OPPONENT_JAMES_3, OPPONENT_JAMES_4, OPPONENT_JAMES_5},
- MAP_GROUP_PETALBURG_WOODS,
- MAP_ID_PETALBURG_WOODS,
+ MAP_GROUP(PETALBURG_WOODS),
+ MAP_NUM(PETALBURG_WOODS),
},
{
{OPPONENT_TRENT_1, OPPONENT_TRENT_2, OPPONENT_TRENT_3, OPPONENT_TRENT_4, OPPONENT_TRENT_5},
- MAP_GROUP_ROUTE112,
- MAP_ID_ROUTE112,
+ MAP_GROUP(ROUTE112),
+ MAP_NUM(ROUTE112),
},
{
{OPPONENT_LOIS_AND_HAL_1, OPPONENT_LOIS_AND_HAL_2, OPPONENT_LOIS_AND_HAL_3, OPPONENT_LOIS_AND_HAL_4, OPPONENT_LOIS_AND_HAL_5},
- MAP_GROUP_ABANDONED_SHIP_ROOMS2_1F,
- MAP_ID_ABANDONED_SHIP_ROOMS2_1F,
+ MAP_GROUP(ABANDONED_SHIP_ROOMS2_1F),
+ MAP_NUM(ABANDONED_SHIP_ROOMS2_1F),
},
{
{OPPONENT_WALLY_3, OPPONENT_WALLY_4, OPPONENT_WALLY_5, OPPONENT_WALLY_6, OPPONENT_NONE},
- MAP_GROUP_VICTORY_ROAD_1F,
- MAP_ID_VICTORY_ROAD_1F,
+ MAP_GROUP(VICTORY_ROAD_1F),
+ MAP_NUM(VICTORY_ROAD_1F),
},
};
@@ -682,7 +682,7 @@ s8 BattleSetup_GetTerrain(void)
if (MetatileBehavior_IsBridge(tileBehavior) == TRUE)
return BATTLE_TERRAIN_WATER;
}
- if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE113 && gSaveBlock1.location.mapNum == MAP_ID_ROUTE113)
+ if (gSaveBlock1.location.mapGroup == MAP_GROUP(ROUTE113) && gSaveBlock1.location.mapNum == MAP_NUM(ROUTE113))
return BATTLE_TERRAIN_SAND;
if (GetSav1Weather() == 8)
return BATTLE_TERRAIN_SAND;
diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c
index f7c8073c5..985f43945 100644
--- a/src/battle/battle_transition.c
+++ b/src/battle/battle_transition.c
@@ -9,7 +9,7 @@
#include "random.h"
#include "sprite.h"
#include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "trainer.h"
#include "field_camera.h"
#include "ewram.h"
diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c
index 42c26dee0..f9ac03075 100644
--- a/src/battle/calculate_base_damage.c
+++ b/src/battle/calculate_base_damage.c
@@ -1,16 +1,16 @@
#include "global.h"
-#include "abilities.h"
+#include "constants/abilities.h"
#include "battle.h"
#include "berry.h"
#include "data2.h"
#include "event_data.h"
-#include "hold_effects.h"
+#include "constants/hold_effects.h"
#include "item.h"
-#include "items.h"
+#include "constants/items.h"
#include "pokemon.h"
-#include "species.h"
-#include "moves.h"
-#include "battle_move_effects.h"
+#include "constants/species.h"
+#include "constants/moves.h"
+#include "constants/battle_move_effects.h"
#include "ewram.h"
extern u16 gBattleTypeFlags;
diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c
index 8271e53ac..12fd5e5d9 100644
--- a/src/battle/pokeball.c
+++ b/src/battle/pokeball.c
@@ -8,7 +8,7 @@
#include "pokeball.h"
#include "pokemon.h"
#include "rom_8077ABC.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
#include "sprite.h"
#include "task.h"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 01:53:48 +0000