diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-11-27 14:07:31 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 14:07:31 -0600 |
| commit | 5498eaf94849bbc7b56d8c280862b61ecefa0643 (patch) | |
| tree | 518b0b12e669c09c31a33c7a071f10bcd4ea76b9 /src | |
| parent | 66f2ac4ba38cb32eb210545536a487969b593d10 (diff) | |
| parent | 5d74d11d3e3047b4b53153365325db9e6999c627 (diff) | |
Merge pull request #477 from camthesaxman/constant_headers
Use common headers for constants in assembly and C
Diffstat (limited to 'src')
120 files changed, 477 insertions, 470 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" diff --git a/src/data/battle_strings_de.h b/src/data/battle_strings_de.h index 5289ce4e0..f78d0bf14 100755 --- a/src/data/battle_strings_de.h +++ b/src/data/battle_strings_de.h @@ -1,4 +1,4 @@ -#include "moves.h" +#include "constants/moves.h" enum { diff --git a/src/data/battle_strings_en.h b/src/data/battle_strings_en.h index 7f0481b50..26523d2e0 100755 --- a/src/data/battle_strings_en.h +++ b/src/data/battle_strings_en.h @@ -1,4 +1,4 @@ -#include "moves.h" +#include "constants/moves.h" enum { diff --git a/src/debug/sound_check_menu.c b/src/debug/sound_check_menu.c index 14261b75e..968b047d9 100644 --- a/src/debug/sound_check_menu.c +++ b/src/debug/sound_check_menu.c @@ -6,7 +6,7 @@ #include "main.h" #include "text.h" #include "menu.h" -#include "songs.h" +#include "constants/songs.h" #include "title_screen.h" #include "sound.h" #include "pokedex_cry_screen.h" diff --git a/src/engine/cable_club.c b/src/engine/cable_club.c index ec8acc65f..4dda372f4 100644 --- a/src/engine/cable_club.c +++ b/src/engine/cable_club.c @@ -14,7 +14,7 @@ #include "overworld.h" #include "script.h" #include "script_pokemon_80C4.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "start_menu.h" #include "string_util.h" diff --git a/src/engine/clear_save_data_menu.c b/src/engine/clear_save_data_menu.c index 498562fe0..12cde22a7 100644 --- a/src/engine/clear_save_data_menu.c +++ b/src/engine/clear_save_data_menu.c @@ -4,7 +4,7 @@ #include "menu.h" #include "palette.h" #include "save.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "strings2.h" diff --git a/src/engine/decompress.c b/src/engine/decompress.c index 0893a8492..69edf01aa 100644 --- a/src/engine/decompress.c +++ b/src/engine/decompress.c @@ -1,7 +1,7 @@ #include "global.h" #include "decompress.h" #include "data2.h" -#include "species.h" +#include "constants/species.h" #include "text.h" #include "ewram.h" diff --git a/src/engine/link.c b/src/engine/link.c index 441f3707b..27afef937 100644 --- a/src/engine/link.c +++ b/src/engine/link.c @@ -9,7 +9,7 @@ #include "palette.h" #include "random.h" #include "save.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "strings2.h" diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c index a8375c6dd..909b5676b 100644 --- a/src/engine/main_menu.c +++ b/src/engine/main_menu.c @@ -13,9 +13,9 @@ #include "overworld.h" #include "rtc.h" #include "save_menu_util.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "string_util.h" #include "strings.h" #include "task.h" diff --git a/src/engine/menu.c b/src/engine/menu.c index a9c4aaa43..10988c1d7 100644 --- a/src/engine/menu.c +++ b/src/engine/menu.c @@ -4,7 +4,7 @@ #include "map_obj_lock.h" #include "menu_cursor.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "strings.h" #include "text.h" diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c index a472eea3b..b9c3d5ad8 100644 --- a/src/engine/mystery_event_menu.c +++ b/src/engine/mystery_event_menu.c @@ -6,7 +6,7 @@ #include "mystery_event_script.h" #include "palette.h" #include "save.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "string_util.h" diff --git a/src/engine/mystery_event_script.c b/src/engine/mystery_event_script.c index 69434710f..12ad329da 100644 --- a/src/engine/mystery_event_script.c +++ b/src/engine/mystery_event_script.c @@ -9,7 +9,7 @@ #include "pokemon.h" #include "pokemon_size_record.h" #include "script.h" -#include "species.h" +#include "constants/species.h" #include "strings.h" #include "string_util.h" #include "text.h" diff --git a/src/engine/naming_screen.c b/src/engine/naming_screen.c index 667a42ac8..4d2545440 100644 --- a/src/engine/naming_screen.c +++ b/src/engine/naming_screen.c @@ -8,7 +8,7 @@ #include "menu.h" #include "palette.h" #include "pokemon_icon.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "string_util.h" diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c index 4b5f1b6d5..2624837c7 100644 --- a/src/engine/record_mixing.c +++ b/src/engine/record_mixing.c @@ -7,7 +7,7 @@ #include "event_data.h" #include "fldeff_recordmixing.h" #include "item.h" -#include "items.h" +#include "constants/items.h" #include "load_save.h" #include "link.h" #include "mauville_man.h" @@ -18,7 +18,7 @@ #include "save.h" #include "script.h" #include "secret_base.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "strings2.h" diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c index 5701c1185..67e146899 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/engine/reset_rtc_screen.c @@ -6,7 +6,7 @@ #include "rtc.h" #include "save.h" #include "sprite.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "strings.h" diff --git a/src/engine/sound.c b/src/engine/sound.c index a6a61c0b5..159ad3f70 100644 --- a/src/engine/sound.c +++ b/src/engine/sound.c @@ -5,7 +5,7 @@ #include "m4a.h" #include "main.h" #include "pokemon.h" -#include "songs.h" +#include "constants/songs.h" #include "task.h" struct Fanfare diff --git a/src/engine/text.c b/src/engine/text.c index 1d1d31383..1b158d979 100644 --- a/src/engine/text.c +++ b/src/engine/text.c @@ -3,7 +3,7 @@ #include "battle.h" #include "main.h" #include "palette.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" diff --git a/src/engine/trade.c b/src/engine/trade.c index e09942589..06a6b96c7 100644 --- a/src/engine/trade.c +++ b/src/engine/trade.c @@ -3,10 +3,10 @@ #include "string_util.h" #include "text.h" #include "main.h" -#include "species.h" -#include "items.h" -#include "moves.h" -#include "easy_chat.h" +#include "constants/species.h" +#include "constants/items.h" +#include "constants/moves.h" +#include "constants/easy_chat.h" #include "link.h" #include "strings2.h" #include "graphics.h" @@ -17,7 +17,7 @@ #include "pokemon_icon.h" #include "cable_club.h" #include "party_menu.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "data2.h" #include "pokemon_summary_screen.h" diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c index 2045c6b21..468890ca5 100644 --- a/src/engine/trainer_card.c +++ b/src/engine/trainer_card.c @@ -12,7 +12,7 @@ #include "pokedex.h" #include "overworld.h" #include "script_pokemon_80C4.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "string_util.h" diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c index 2b45766dd..db822f71b 100644 --- a/src/field/battle_tower.c +++ b/src/field/battle_tower.c @@ -5,25 +5,26 @@ #include "battle_transition.h" #include "data2.h" #include "easy_chat.h" +#include "constants/easy_chat.h" #include "event_data.h" #include "item.h" -#include "items.h" +#include "constants/items.h" #include "main.h" -#include "map_object_constants.h" -#include "moves.h" +#include "constants/map_objects.h" +#include "constants/moves.h" #include "new_game.h" #include "overworld.h" #include "pokedex.h" #include "random.h" #include "save.h" #include "script_pokemon_80C4.h" -#include "species.h" +#include "constants/species.h" #include "string_util.h" #include "task.h" #include "text.h" #include "trainer.h" #include "tv.h" -#include "vars.h" +#include "constants/vars.h" #include "ewram.h" #if ENGLISH diff --git a/src/field/berry.c b/src/field/berry.c index 973bc56ff..874a60aa7 100644 --- a/src/field/berry.c +++ b/src/field/berry.c @@ -6,7 +6,7 @@ #include "item.h" #include "item_menu.h" #include "item_use.h" -#include "items.h" +#include "constants/items.h" #include "main.h" #include "random.h" #include "text.h" diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c index 55405138d..694599680 100644 --- a/src/field/berry_tag_screen.c +++ b/src/field/berry_tag_screen.c @@ -4,14 +4,14 @@ #include "decompress.h" #include "field_map_obj.h" #include "item_menu.h" -#include "items.h" +#include "constants/items.h" #include "item_use.h" #include "main.h" #include "menu.h" #include "menu_helpers.h" #include "palette.h" #include "overworld.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "string_util.h" diff --git a/src/field/bike.c b/src/field/bike.c index e36ae1798..8db01b4b4 100644 --- a/src/field/bike.c +++ b/src/field/bike.c @@ -3,11 +3,11 @@ #include "field_map_obj.h" #include "field_player_avatar.h" #include "fieldmap.h" -#include "flags.h" +#include "constants/flags.h" #include "global.fieldmap.h" #include "metatile_behavior.h" #include "overworld.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" extern bool8 gBikeCyclingChallenge; diff --git a/src/field/birch_pc.c b/src/field/birch_pc.c index 9872dd54d..4b0025504 100644 --- a/src/field/birch_pc.c +++ b/src/field/birch_pc.c @@ -2,7 +2,7 @@ #include "event_data.h" #include "field_message_box.h" #include "pokedex.h" -#include "species.h" +#include "constants/species.h" extern u16 gSpecialVar_0x8004; extern u16 gSpecialVar_0x8005; diff --git a/src/field/braille_puzzles.c b/src/field/braille_puzzles.c index b11b1ff3a..e6ab316d2 100644 --- a/src/field/braille_puzzles.c +++ b/src/field/braille_puzzles.c @@ -4,16 +4,16 @@ #include "field_camera.h" #include "field_effect.h" #include "fieldmap.h" -#include "flags.h" +#include "constants/flags.h" #include "main.h" -#include "map_constants.h" +#include "constants/maps.h" #include "map_obj_lock.h" #include "menu.h" #include "rom6.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "task.h" #include "text.h" @@ -25,8 +25,8 @@ extern u8 S_OpenRegiceChamber[]; // regiice event script bool8 ShouldDoBrailleDigEffect(void) { if (!FlagGet(SYS_BRAILLE_DIG) - && (gSaveBlock1.location.mapGroup == MAP_GROUP_SEALED_CHAMBER_OUTER_ROOM - && gSaveBlock1.location.mapNum == MAP_ID_SEALED_CHAMBER_OUTER_ROOM)) + && (gSaveBlock1.location.mapGroup == MAP_GROUP(SEALED_CHAMBER_OUTER_ROOM) + && gSaveBlock1.location.mapNum == MAP_NUM(SEALED_CHAMBER_OUTER_ROOM))) { if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 3) return TRUE; @@ -68,7 +68,7 @@ bool8 CheckRelicanthWailord(void) bool8 ShouldDoBrailleStrengthEffect(void) { - if (!FlagGet(SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == MAP_GROUP_DESERT_RUINS && gSaveBlock1.location.mapNum == MAP_ID_DESERT_RUINS)) + if (!FlagGet(SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == MAP_GROUP(DESERT_RUINS) && gSaveBlock1.location.mapNum == MAP_NUM(DESERT_RUINS))) { if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 23) return TRUE; @@ -98,7 +98,7 @@ void DoBrailleStrengthEffect(void) bool8 ShouldDoBrailleFlyEffect(void) { - if (!FlagGet(SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == MAP_GROUP_ANCIENT_TOMB && gSaveBlock1.location.mapNum == MAP_ID_ANCIENT_TOMB)) + if (!FlagGet(SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == MAP_GROUP(ANCIENT_TOMB) && gSaveBlock1.location.mapNum == MAP_NUM(ANCIENT_TOMB))) { if (gSaveBlock1.pos.x == 8 && gSaveBlock1.pos.y == 25) return TRUE; diff --git a/src/field/choose_party.c b/src/field/choose_party.c index e16da3a58..d278eda4a 100644 --- a/src/field/choose_party.c +++ b/src/field/choose_party.c @@ -11,7 +11,7 @@ #include "pokemon_summary_screen.h" #include "overworld.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "strings.h" #include "string_util.h" diff --git a/src/field/daycare.c b/src/field/daycare.c index 9f7e3b989..9ac63b3c7 100644 --- a/src/field/daycare.c +++ b/src/field/daycare.c @@ -2,11 +2,11 @@ #include "daycare.h" #include "event_data.h" #include "field_effect.h" -#include "items.h" +#include "constants/items.h" #include "mail_data.h" #include "main.h" #include "menu.h" -#include "moves.h" +#include "constants/moves.h" #include "name_string_util.h" #include "overworld.h" #include "party_menu.h" @@ -14,9 +14,9 @@ #include "pokemon_storage_system.h" #include "random.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "string_util.h" #include "strings2.h" #include "text.h" diff --git a/src/field/decoration.c b/src/field/decoration.c index 8e6276a2f..c7647f98d 100644 --- a/src/field/decoration.c +++ b/src/field/decoration.c @@ -1,9 +1,10 @@ #include "global.h" +#include "constants/decorations.h" #include "main.h" -#include "map_object_constants.h" +#include "constants/map_objects.h" #include "overworld.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "string_util.h" #include "menu.h" #include "menu_helpers.h" diff --git a/src/field/decoration_inventory.c b/src/field/decoration_inventory.c index 687589373..dd0e972aa 100644 --- a/src/field/decoration_inventory.c +++ b/src/field/decoration_inventory.c @@ -1,8 +1,5 @@ -// - -// - #include "global.h" +#include "constants/decorations.h" #include "sprite.h" #include "task.h" #include "decoration.h" diff --git a/src/field/dewford_trend.c b/src/field/dewford_trend.c index bdcd76ec5..90ea74f77 100644 --- a/src/field/dewford_trend.c +++ b/src/field/dewford_trend.c @@ -1,6 +1,7 @@ #include "global.h" #include "dewford_trend.h" #include "easy_chat.h" +#include "constants/easy_chat.h" #include "event_data.h" #include "link.h" #include "random.h" diff --git a/src/field/easy_chat.c b/src/field/easy_chat.c index 7a4ae045e..1dce5863e 100644 --- a/src/field/easy_chat.c +++ b/src/field/easy_chat.c @@ -1,5 +1,6 @@ #include "global.h" #include "easy_chat.h" +#include "constants/easy_chat.h" #include "data2.h" #include "event_data.h" #include "field_message_box.h" diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c index c7b4861d5..c4e53b13f 100644 --- a/src/field/field_control_avatar.c +++ b/src/field/field_control_avatar.c @@ -10,18 +10,18 @@ #include "field_poison.h" #include "field_specials.h" #include "fieldmap.h" -#include "flags.h" +#include "constants/flags.h" #include "item_menu.h" #include "metatile_behavior.h" #include "overworld.h" #include "safari_zone.h" #include "script.h" #include "secret_base.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "start_menu.h" #include "trainer_see.h" -#include "vars.h" +#include "constants/vars.h" #include "wild_encounter.h" struct Coords32 diff --git a/src/field/field_door.c b/src/field/field_door.c index ef349bca7..89dae725c 100644 --- a/src/field/field_door.c +++ b/src/field/field_door.c @@ -3,7 +3,7 @@ #include "field_camera.h" #include "fieldmap.h" #include "metatile_behavior.h" -#include "songs.h" +#include "constants/songs.h" #include "task.h" const u8 DoorAnimTiles_04[][0x100] = diff --git a/src/field/field_effect.c b/src/field/field_effect.c index 0ccbb6230..4337300da 100644 --- a/src/field/field_effect.c +++ b/src/field/field_effect.c @@ -12,7 +12,7 @@ #include "overworld.h" #include "task.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "decoration.h" #include "field_player_avatar.h" #include "field_map_obj_helpers.h" diff --git a/src/field/field_effect_helpers.c b/src/field/field_effect_helpers.c index c5b67fd9d..1d831d2e9 100644 --- a/src/field/field_effect_helpers.c +++ b/src/field/field_effect_helpers.c @@ -2,7 +2,7 @@ #include "sprite.h" #include "fieldmap.h" #include "metatile_behavior.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "field_map_obj.h" #include "field_camera.h" diff --git a/src/field/field_fadetransition.c b/src/field/field_fadetransition.c index 82776d18c..829ce2dfa 100644 --- a/src/field/field_fadetransition.c +++ b/src/field/field_fadetransition.c @@ -17,7 +17,7 @@ #include "palette.h" #include "overworld.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "start_menu.h" #include "task.h" diff --git a/src/field/field_map_obj.c b/src/field/field_map_obj.c index 20edbc34f..0e6794ed7 100644 --- a/src/field/field_map_obj.c +++ b/src/field/field_map_obj.c @@ -14,8 +14,8 @@ #include "overworld.h" #include "sprite.h" #include "metatile_behavior.h" -#include "map_constants.h" -#include "map_object_constants.h" +#include "constants/maps.h" +#include "constants/map_objects.h" #include "trainer_see.h" // rodata @@ -7054,7 +7054,7 @@ bool8 sub_8062088(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_80620B0(struct MapObject *mapObject, struct Sprite *sprite) { u8 objectId; - if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP_PETALBURG_CITY, MAP_ID_PETALBURG_CITY, &objectId)) + if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), &objectId)) { an_look_any(mapObject, sprite, sub_805FE90(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[objectId].coords2.x, gMapObjects[objectId].coords2.y)); } @@ -7065,7 +7065,7 @@ bool8 sub_80620B0(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_806210C(struct MapObject *mapObject, struct Sprite *sprite) { u8 objectId; - if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP_PETALBURG_CITY, MAP_ID_PETALBURG_CITY, &objectId)) + if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), &objectId)) { an_look_any(mapObject, sprite, GetOppositeDirection(sub_805FE90(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[objectId].coords2.x, gMapObjects[objectId].coords2.y))); } diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c index a26638b39..437d16208 100644 --- a/src/field/field_player_avatar.c +++ b/src/field/field_player_avatar.c @@ -9,7 +9,7 @@ #include "field_map_obj_helpers.h" #include "fieldmap.h" #include "main.h" -#include "map_object_constants.h" +#include "constants/map_objects.h" #include "menu.h" #include "metatile_behavior.h" #include "party_menu.h" @@ -17,7 +17,7 @@ #include "overworld.h" #include "rotating_gate.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "strings2.h" #include "task.h" diff --git a/src/field/field_special_scene.c b/src/field/field_special_scene.c index 5758929b6..6ef98f5e9 100644 --- a/src/field/field_special_scene.c +++ b/src/field/field_special_scene.c @@ -11,7 +11,7 @@ #include "overworld.h" #include "script.h" #include "script_movement.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" diff --git a/src/field/field_specials.c b/src/field/field_specials.c index e5bb1b798..d654d10f5 100644 --- a/src/field/field_specials.c +++ b/src/field/field_specials.c @@ -11,22 +11,22 @@ #include "field_camera.h" #include "field_player_avatar.h" #include "main.h" -#include "map_constants.h" +#include "constants/maps.h" #include "overworld.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "string_util.h" #include "strings.h" #include "pokeblock.h" -#include "species.h" -#include "abilities.h" -#include "moves.h" +#include "constants/species.h" +#include "constants/abilities.h" +#include "constants/moves.h" #include "text.h" #include "wallclock.h" #include "tv.h" #include "rtc.h" #include "link.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "menu.h" #include "starter_choose.h" @@ -207,7 +207,7 @@ u16 GetRecordedCyclingRoadResults(void) { } void UpdateCyclingRoadState(void) { - if (gUnknown_020297F0.mapNum == MAP_ID_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE && gUnknown_020297F0.mapGroup == MAP_GROUP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE) + if (gUnknown_020297F0.mapNum == MAP_NUM(ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE) && gUnknown_020297F0.mapGroup == MAP_GROUP(ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE)) { return; } @@ -259,38 +259,38 @@ u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y) case 2: if (*varCruiseStepCount < 60) { - *mapNum = MAP_ID_ROUTE134; + *mapNum = MAP_NUM(ROUTE134); *x = *varCruiseStepCount + 19; } else if (*varCruiseStepCount < 140) { - *mapNum = MAP_ID_ROUTE133; + *mapNum = MAP_NUM(ROUTE133); *x = *varCruiseStepCount - 60; } else { - *mapNum = MAP_ID_ROUTE132; + *mapNum = MAP_NUM(ROUTE132); *x = *varCruiseStepCount - 140; } break; case 7: if (*varCruiseStepCount < 66) { - *mapNum = MAP_ID_ROUTE132; + *mapNum = MAP_NUM(ROUTE132); *x = 65 - *varCruiseStepCount; } else if (*varCruiseStepCount < 146) { - *mapNum = MAP_ID_ROUTE133; + *mapNum = MAP_NUM(ROUTE133); *x = 145 - *varCruiseStepCount; } else { - *mapNum = MAP_ID_ROUTE134; + *mapNum = MAP_NUM(ROUTE134); *x = 224 - *varCruiseStepCount; } break; } - *mapGroup = MAP_GROUP_ROUTE132; + *mapGroup = MAP_GROUP(ROUTE132); *y = 20; return 0; } @@ -702,11 +702,11 @@ void CableCarWarp(void) { if (gSpecialVar_0x8004 != 0) { - Overworld_SetWarpDestination(MAP_GROUP_ROUTE112_CABLE_CAR_STATION, MAP_ID_ROUTE112_CABLE_CAR_STATION, -1, 6, 4); + Overworld_SetWarpDestination(MAP_GROUP(ROUTE112_CABLE_CAR_STATION), MAP_NUM(ROUTE112_CABLE_CAR_STATION), -1, 6, 4); } else { - Overworld_SetWarpDestination(MAP_GROUP_MT_CHIMNEY_CABLE_CAR_STATION, MAP_ID_MT_CHIMNEY_CABLE_CAR_STATION, -1, 6, 4); + Overworld_SetWarpDestination(MAP_GROUP(MT_CHIMNEY_CABLE_CAR_STATION), MAP_NUM(MT_CHIMNEY_CABLE_CAR_STATION), -1, 6, 4); } } @@ -1001,22 +1001,22 @@ void SetDepartmentStoreFloorVar(void) u8 deptStoreFloor; switch (gSaveBlock1.warp2.mapNum) { - case MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_1F: + case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_1F): deptStoreFloor = 0; break; - case MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_2F: + case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_2F): deptStoreFloor = 1; break; - case MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_3F: + case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_3F): deptStoreFloor = 2; break; - case MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_4F: + case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_4F): deptStoreFloor = 3; break; - case MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_5F: + case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_5F): deptStoreFloor = 4; break; - case MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP: + case MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP): deptStoreFloor = 15; break; default: @@ -1881,7 +1881,7 @@ bool8 ScrSpecial_AreLeadMonEVsMaxedOut(void) u8 sub_810F5BC(void) { - if (!FlagGet(0xc7) && gSaveBlock1.location.mapGroup == MAP_GROUP_RUSTURF_TUNNEL && gSaveBlock1.location.mapNum == MAP_ID_RUSTURF_TUNNEL) + if (!FlagGet(0xc7) && gSaveBlock1.location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL) && gSaveBlock1.location.mapNum == MAP_NUM(RUSTURF_TUNNEL)) { if (FlagGet(0x3a3)) { diff --git a/src/field/field_tasks.c b/src/field/field_tasks.c index e938a57ef..108ba64ba 100644 --- a/src/field/field_tasks.c +++ b/src/field/field_tasks.c @@ -1,10 +1,10 @@ #include "global.h" #include "task.h" #include "main.h" -#include "vars.h" +#include "constants/vars.h" #include "bike.h" #include "item.h" -#include "items.h" +#include "constants/items.h" #include "event_data.h" #include "overworld.h" #include "clock.h" @@ -16,7 +16,7 @@ #include "fieldmap.h" #include "field_player_avatar.h" #include "field_camera.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "field_tasks.h" diff --git a/src/field/field_weather.c b/src/field/field_weather.c index ff7c2e4c4..19ccca3bf 100644 --- a/src/field/field_weather.c +++ b/src/field/field_weather.c @@ -5,7 +5,7 @@ #include "palette.h" #include "random.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" diff --git a/src/field/field_weather_effects.c b/src/field/field_weather_effects.c index b1dca6396..31eda4393 100644 --- a/src/field/field_weather_effects.c +++ b/src/field/field_weather_effects.c @@ -4,7 +4,7 @@ #include "overworld.h" #include "random.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" diff --git a/src/field/fldeff_cut.c b/src/field/fldeff_cut.c index 599c916a2..edf38d800 100644 --- a/src/field/fldeff_cut.c +++ b/src/field/fldeff_cut.c @@ -11,7 +11,7 @@ #include "overworld.h" #include "rom6.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" diff --git a/src/field/fldeff_decoration.c b/src/field/fldeff_decoration.c index b0ac30062..d58f53a3c 100644 --- a/src/field/fldeff_decoration.c +++ b/src/field/fldeff_decoration.c @@ -6,7 +6,7 @@ #include "field_player_avatar.h" #include "fieldmap.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "strings.h" diff --git a/src/field/fldeff_flash.c b/src/field/fldeff_flash.c index 30423a3f9..920791ce2 100644 --- a/src/field/fldeff_flash.c +++ b/src/field/fldeff_flash.c @@ -7,7 +7,7 @@ #include "overworld.h" #include "rom6.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" diff --git a/src/field/fldeff_poison.c b/src/field/fldeff_poison.c index 0a0cf5539..b0052d59d 100644 --- a/src/field/fldeff_poison.c +++ b/src/field/fldeff_poison.c @@ -1,7 +1,7 @@ #include "global.h" #include "fldeff_poison.h" #include "task.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" static void Task_FieldPoisonEffect(u8 taskId) diff --git a/src/field/fldeff_secret_base_pc.c b/src/field/fldeff_secret_base_pc.c index ead970b27..8d71a4fb9 100644 --- a/src/field/fldeff_secret_base_pc.c +++ b/src/field/fldeff_secret_base_pc.c @@ -5,7 +5,7 @@ #include "field_player_avatar.h" #include "fieldmap.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "task.h" diff --git a/src/field/fldeff_secretpower.c b/src/field/fldeff_secretpower.c index 5ec4407ae..cd9a2ae36 100644 --- a/src/field/fldeff_secretpower.c +++ b/src/field/fldeff_secretpower.c @@ -10,7 +10,7 @@ #include "rom6.h" #include "script.h" #include "secret_base.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" extern u8 gUnknown_081A2CE6[]; diff --git a/src/field/fldeff_softboiled.c b/src/field/fldeff_softboiled.c index c2a315233..a574232a8 100644 --- a/src/field/fldeff_softboiled.c +++ b/src/field/fldeff_softboiled.c @@ -4,7 +4,7 @@ #include "party_menu.h" #include "pokemon.h" #include "pokemon_menu.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "strings.h" diff --git a/src/field/heal_location.c b/src/field/heal_location.c index 42bc18567..a10c7a7b8 100644 --- a/src/field/heal_location.c +++ b/src/field/heal_location.c @@ -1,33 +1,33 @@ #include "global.h" #include "heal_location.h" -#include "map_constants.h" +#include "constants/maps.h" #define NUM_HEAL_LOCATIONS 22 static const struct HealLocation sHealLocations[] = { - {MAP_GROUP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, MAP_ID_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 4, 2}, - {MAP_GROUP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, MAP_ID_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 4, 2}, - {MAP_GROUP_PETALBURG_CITY, MAP_ID_PETALBURG_CITY, 20, 17}, - {MAP_GROUP_SLATEPORT_CITY, MAP_ID_SLATEPORT_CITY, 19, 20}, - {MAP_GROUP_MAUVILLE_CITY, MAP_ID_MAUVILLE_CITY, 22, 6}, - {MAP_GROUP_RUSTBORO_CITY, MAP_ID_RUSTBORO_CITY, 16, 39}, - {MAP_GROUP_FORTREE_CITY, MAP_ID_FORTREE_CITY, 5, 7}, - {MAP_GROUP_LILYCOVE_CITY, MAP_ID_LILYCOVE_CITY, 24, 15}, - {MAP_GROUP_MOSSDEEP_CITY, MAP_ID_MOSSDEEP_CITY, 28, 17}, - {MAP_GROUP_SOOTOPOLIS_CITY, MAP_ID_SOOTOPOLIS_CITY, 43, 32}, - {MAP_GROUP_EVER_GRANDE_CITY, MAP_ID_EVER_GRANDE_CITY, 27, 49}, - {MAP_GROUP_LITTLEROOT_TOWN, MAP_ID_LITTLEROOT_TOWN, 5, 9}, - {MAP_GROUP_LITTLEROOT_TOWN, MAP_ID_LITTLEROOT_TOWN, 14, 9}, - {MAP_GROUP_OLDALE_TOWN, MAP_ID_OLDALE_TOWN, 6, 17}, - {MAP_GROUP_DEWFORD_TOWN, MAP_ID_DEWFORD_TOWN, 2, 11}, - {MAP_GROUP_LAVARIDGE_TOWN, MAP_ID_LAVARIDGE_TOWN, 9, 7}, - {MAP_GROUP_FALLARBOR_TOWN, MAP_ID_FALLARBOR_TOWN, 14, 8}, - {MAP_GROUP_VERDANTURF_TOWN, MAP_ID_VERDANTURF_TOWN, 16, 4}, - {MAP_GROUP_PACIFIDLOG_TOWN, MAP_ID_PACIFIDLOG_TOWN, 8, 16}, - {MAP_GROUP_EVER_GRANDE_CITY, MAP_ID_EVER_GRANDE_CITY, 18, 6}, - {MAP_GROUP_BATTLE_TOWER_OUTSIDE, MAP_ID_BATTLE_TOWER_OUTSIDE, 14, 9}, - {MAP_GROUP_SOUTHERN_ISLAND_EXTERIOR, MAP_ID_SOUTHERN_ISLAND_EXTERIOR, 15, 20}, + {MAP_GROUP(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F), MAP_NUM(LITTLEROOT_TOWN_BRENDANS_HOUSE_2F), 4, 2}, + {MAP_GROUP(LITTLEROOT_TOWN_MAYS_HOUSE_2F), MAP_NUM(LITTLEROOT_TOWN_MAYS_HOUSE_2F), 4, 2}, + {MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), 20, 17}, + {MAP_GROUP(SLATEPORT_CITY), MAP_NUM(SLATEPORT_CITY), 19, 20}, + {MAP_GROUP(MAUVILLE_CITY), MAP_NUM(MAUVILLE_CITY), 22, 6}, + {MAP_GROUP(RUSTBORO_CITY), MAP_NUM(RUSTBORO_CITY), 16, 39}, + {MAP_GROUP(FORTREE_CITY), MAP_NUM(FORTREE_CITY), 5, 7}, + {MAP_GROUP(LILYCOVE_CITY), MAP_NUM(LILYCOVE_CITY), 24, 15}, + {MAP_GROUP(MOSSDEEP_CITY), MAP_NUM(MOSSDEEP_CITY), 28, 17}, + {MAP_GROUP(SOOTOPOLIS_CITY), MAP_NUM(SOOTOPOLIS_CITY), 43, 32}, + {MAP_GROUP(EVER_GRANDE_CITY), MAP_NUM(EVER_GRANDE_CITY), 27, 49}, + {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), 5, 9}, + {MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), 14, 9}, + {MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), 6, 17}, + {MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), 2, 11}, + {MAP_GROUP(LAVARIDGE_TOWN), MAP_NUM(LAVARIDGE_TOWN), 9, 7}, + {MAP_GROUP(FALLARBOR_TOWN), MAP_NUM(FALLARBOR_TOWN), 14, 8}, + {MAP_GROUP(VERDANTURF_TOWN), MAP_NUM(VERDANTURF_TOWN), 16, 4}, + {MAP_GROUP(PACIFIDLOG_TOWN), MAP_NUM(PACIFIDLOG_TOWN), 8, 16}, + {MAP_GROUP(EVER_GRANDE_CITY), MAP_NUM(EVER_GRANDE_CITY), 18, 6}, + {MAP_GROUP(BATTLE_TOWER_OUTSIDE), MAP_NUM(BATTLE_TOWER_OUTSIDE), 14, 9}, + {MAP_GROUP(SOUTHERN_ISLAND_EXTERIOR), MAP_NUM(SOUTHERN_ISLAND_EXTERIOR), 15, 20}, }; u32 GetHealLocationIndexByMap(u16 mapGroup, u16 mapNum) diff --git a/src/field/item.c b/src/field/item.c index fd49f5c39..66d7d65df 100644 --- a/src/field/item.c +++ b/src/field/item.c @@ -1,7 +1,7 @@ #include "global.h" -#include "hold_effects.h" +#include "constants/hold_effects.h" #include "item.h" -#include "items.h" +#include "constants/items.h" #include "item_use.h" #include "berry.h" #include "string_util.h" diff --git a/src/field/item_menu.c b/src/field/item_menu.c index 67362d5f3..8f7cb3d90 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -8,7 +8,7 @@ #include "field_player_avatar.h" #include "graphics.h" #include "item.h" -#include "items.h" +#include "constants/items.h" #include "item_menu.h" #include "item_use.h" #include "link.h" @@ -25,7 +25,7 @@ #include "pokemon_menu.h" #include "overworld.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "strings.h" diff --git a/src/field/item_use.c b/src/field/item_use.c index 14b13ca3b..48b159c1c 100644 --- a/src/field/item_use.c +++ b/src/field/item_use.c @@ -14,7 +14,7 @@ #include "fieldmap.h" #include "item.h" #include "item_menu.h" -#include "items.h" +#include "constants/items.h" #include "mail.h" #include "main.h" #include "map_obj_lock.h" @@ -29,12 +29,12 @@ #include "overworld.h" #include "rom_8094928.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "strings.h" #include "task.h" -#include "vars.h" +#include "constants/vars.h" extern void (*gFieldItemUseCallback)(u8); extern void (*gFieldCallback)(void); diff --git a/src/field/lottery_corner.c b/src/field/lottery_corner.c index 5f0ce2907..2cfdb7f88 100644 --- a/src/field/lottery_corner.c +++ b/src/field/lottery_corner.c @@ -1,9 +1,9 @@ #include "global.h" #include "lottery_corner.h" #include "event_data.h" -#include "items.h" +#include "constants/items.h" #include "random.h" -#include "species.h" +#include "constants/species.h" #include "string_util.h" #include "text.h" diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c index a27c54df7..fad6674db 100644 --- a/src/field/mauville_man.c +++ b/src/field/mauville_man.c @@ -2,6 +2,7 @@ #include "bard_music.h" #include "mauville_man.h" #include "easy_chat.h" +#include "constants/easy_chat.h" #include "event_data.h" #include "field_message_box.h" #include "m4a.h" @@ -9,7 +10,7 @@ #include "overworld.h" #include "random.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "strings.h" diff --git a/src/field/menu_helpers.c b/src/field/menu_helpers.c index 8e13e5546..e3ef0c790 100644 --- a/src/field/menu_helpers.c +++ b/src/field/menu_helpers.c @@ -1,14 +1,14 @@ #include "global.h" #include "item_menu.h" -#include "items.h" +#include "constants/items.h" #include "link.h" #include "mail_data.h" #include "main.h" -#include "map_constants.h" +#include "constants/maps.h" #include "menu.h" #include "menu_helpers.h" #include "overworld.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" @@ -261,7 +261,7 @@ bool8 sub_80F92F4(u16 itemId) return TRUE; } - if (!(gSaveBlock1.location.mapGroup == MAP_GROUP_TRADE_CENTER && gSaveBlock1.location.mapNum == MAP_ID_TRADE_CENTER)) + if (!(gSaveBlock1.location.mapGroup == MAP_GROUP(TRADE_CENTER) && gSaveBlock1.location.mapNum == MAP_NUM(TRADE_CENTER))) { return TRUE; } diff --git a/src/field/overworld.c b/src/field/overworld.c index ca59426fa..21f3f98ef 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -25,7 +25,7 @@ #include "link.h" #include "load_save.h" #include "main.h" -#include "map_constants.h" +#include "constants/maps.h" #include "map_name_popup.h" #include "menu.h" #include "metatile_behavior.h" @@ -39,9 +39,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 "start_menu.h" #include "task.h" #include "tileset_anim.h" @@ -738,9 +738,9 @@ u16 cur_mapdata_block_role_at_screen_center_acc_to_sav1(void) bool32 Overworld_IsBikingAllowed(void) { // is player in cycling road entrance? - if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE - && (gSaveBlock1.location.mapNum == MAP_ID_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE - || gSaveBlock1.location.mapNum == MAP_ID_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE)) + if (gSaveBlock1.location.mapGroup == MAP_GROUP(ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE) + && (gSaveBlock1.location.mapNum == MAP_NUM(ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE) + || gSaveBlock1.location.mapNum == MAP_NUM(ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE))) return TRUE; // is player indoor, in a secret base, or underwater? @@ -752,11 +752,11 @@ bool32 Overworld_IsBikingAllowed(void) return FALSE; // Thou shalt not bike on the sacred resting grounds of Kyogre/Groudon. - if (gSaveBlock1.location.mapGroup == MAP_GROUP_SEAFLOOR_CAVERN_ROOM9 - && gSaveBlock1.location.mapNum == MAP_ID_SEAFLOOR_CAVERN_ROOM9) + if (gSaveBlock1.location.mapGroup == MAP_GROUP(SEAFLOOR_CAVERN_ROOM9) + && gSaveBlock1.location.mapNum == MAP_NUM(SEAFLOOR_CAVERN_ROOM9)) return FALSE; - if (gSaveBlock1.location.mapGroup == MAP_GROUP_CAVE_OF_ORIGIN_B4F - && gSaveBlock1.location.mapNum == MAP_ID_CAVE_OF_ORIGIN_B4F) + if (gSaveBlock1.location.mapGroup == MAP_GROUP(CAVE_OF_ORIGIN_B4F) + && gSaveBlock1.location.mapNum == MAP_NUM(CAVE_OF_ORIGIN_B4F)) return FALSE; return TRUE; @@ -798,16 +798,16 @@ static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp) { switch (warp->mapNum) { - case MAP_ID_LILYCOVE_CITY: - case MAP_ID_MOSSDEEP_CITY: - case MAP_ID_SOOTOPOLIS_CITY: - case MAP_ID_EVER_GRANDE_CITY: + case MAP_NUM(LILYCOVE_CITY): + case MAP_NUM(MOSSDEEP_CITY): + case MAP_NUM(SOOTOPOLIS_CITY): + case MAP_NUM(EVER_GRANDE_CITY): return TRUE; - case MAP_ID_ROUTE124: - case MAP_ID_ROUTE125: - case MAP_ID_ROUTE126: - case MAP_ID_ROUTE127: - case MAP_ID_ROUTE128: + case MAP_NUM(ROUTE124): + case MAP_NUM(ROUTE125): + case MAP_NUM(ROUTE126): + case MAP_NUM(ROUTE127): + case MAP_NUM(ROUTE128): return TRUE; } } @@ -818,10 +818,10 @@ static bool16 IsInfiltratedWeatherInstitute(struct WarpData *warp) { if (VarGet(VAR_WEATHER_INSTITUTE_CLEARED)) return FALSE; - if (warp->mapGroup != MAP_GROUP_ROUTE119_WEATHER_INSTITUTE_1F) + if (warp->mapGroup != MAP_GROUP(ROUTE119_WEATHER_INSTITUTE_1F)) return FALSE; - if (warp->mapNum == MAP_ID_ROUTE119_WEATHER_INSTITUTE_1F - || warp->mapNum == MAP_ID_ROUTE119_WEATHER_INSTITUTE_2F) + if (warp->mapNum == MAP_NUM(ROUTE119_WEATHER_INSTITUTE_1F) + || warp->mapNum == MAP_NUM(ROUTE119_WEATHER_INSTITUTE_2F)) return TRUE; return FALSE; } @@ -841,8 +841,8 @@ u16 GetCurrLocationDefaultMusic(void) u16 music; // Play the desert music only when the sandstorm is active on Route 111. - if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE111 - && gSaveBlock1.location.mapNum == MAP_ID_ROUTE111 + if (gSaveBlock1.location.mapGroup == MAP_GROUP(ROUTE111) + && gSaveBlock1.location.mapNum == MAP_NUM(ROUTE111) && GetSav1Weather() == 8) return BGM_ASHROAD; @@ -869,8 +869,8 @@ u16 GetWarpDestinationMusic(void) } else { - if (gSaveBlock1.location.mapGroup == MAP_GROUP_MAUVILLE_CITY - && gSaveBlock1.location.mapNum == MAP_ID_MAUVILLE_CITY) + if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAUVILLE_CITY) + && gSaveBlock1.location.mapNum == MAP_NUM(MAUVILLE_CITY)) return BGM_DOORO_X1; else return BGM_GRANROAD; @@ -1024,8 +1024,8 @@ void UpdateAmbientCry(s16 *state, u16 *delayCounter) void ChooseAmbientCrySpecies(void) { - if ((gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE130 - && gSaveBlock1.location.mapNum == MAP_ID_ROUTE130) + if ((gSaveBlock1.location.mapGroup == MAP_GROUP(ROUTE130) + && gSaveBlock1.location.mapNum == MAP_NUM(ROUTE130)) && !IsMirageIslandPresent()) { // Only play water pokemon cries on this route diff --git a/src/field/party_menu.c b/src/field/party_menu.c index bee64fb27..dc817f8c9 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -11,12 +11,12 @@ #include "item.h" #include "item_use.h" #include "item_menu.h" -#include "items.h" +#include "constants/items.h" #include "mail_data.h" #include "main.h" #include "menu.h" #include "menu_helpers.h" -#include "moves.h" +#include "constants/moves.h" #include "palette.h" #include "pokemon.h" #include "pokemon_icon.h" @@ -25,9 +25,9 @@ #include "pokemon_summary_screen.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 "string_util.h" #include "strings.h" diff --git a/src/field/player_pc.c b/src/field/player_pc.c index ce78a88d8..d92d13ce4 100644 --- a/src/field/player_pc.c +++ b/src/field/player_pc.c @@ -5,7 +5,7 @@ #include "field_weather.h" #include "item.h" #include "item_menu.h" -#include "items.h" +#include "constants/items.h" #include "main.h" #include "menu.h" #include "menu_helpers.h" @@ -15,7 +15,7 @@ #include "string_util.h" #include "strings.h" #include "task.h" -#include "songs.h" +#include "constants/songs.h" #include "name_string_util.h" #include "mail.h" #include "overworld.h" diff --git a/src/field/pokeblock.c b/src/field/pokeblock.c index 5aa03ff7a..3b70e7d76 100644 --- a/src/field/pokeblock.c +++ b/src/field/pokeblock.c @@ -21,9 +21,9 @@ #include "item_menu.h" #include "item_use.h" #include "item.h" -#include "items.h" +#include "constants/items.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "safari_zone.h" #include "event_data.h" #include "pokeblock.h" diff --git a/src/field/region_map.c b/src/field/region_map.c index 241b38bf6..f2e4b3251 100644 --- a/src/field/region_map.c +++ b/src/field/region_map.c @@ -4,14 +4,14 @@ #include "field_specials.h" #include "m4a.h" #include "main.h" -#include "map_constants.h" +#include "constants/maps.h" #include "menu.h" #include "palette.h" #include "pokemon_menu.h" #include "region_map.h" #include "overworld.h" #include "secret_base.h" -#include "songs.h" +#include "constants/songs.h" #include "sprite.h" #include "strings.h" #include "string_util.h" @@ -707,9 +707,9 @@ static void InitializeCursorPosition(void) u16 r9; if (gSaveBlock1.location.mapGroup == 25 - && (gSaveBlock1.location.mapNum == MAP_ID_SS_TIDAL_CORRIDOR - || gSaveBlock1.location.mapNum == MAP_ID_SS_TIDAL_LOWER_DECK - || gSaveBlock1.location.mapNum == MAP_ID_SS_TIDAL_ROOMS)) + && (gSaveBlock1.location.mapNum == MAP_NUM(SS_TIDAL_CORRIDOR) + || gSaveBlock1.location.mapNum == MAP_NUM(SS_TIDAL_LOWER_DECK) + || gSaveBlock1.location.mapNum == MAP_NUM(SS_TIDAL_ROOMS))) { sub_80FB600(); return; diff --git a/src/field/roamer.c b/src/field/roamer.c index d8ea1ef52..2eb26ef9d 100644 --- a/src/field/roamer.c +++ b/src/field/roamer.c @@ -2,7 +2,7 @@ #include "roamer.h" #include "pokemon.h" #include "random.h" -#include "species.h" +#include "constants/species.h" #ifdef SAPPHIRE #define ROAMER_SPECIES SPECIES_LATIAS diff --git a/src/field/rotating_gate.c b/src/field/rotating_gate.c index a672f3489..00008c69c 100644 --- a/src/field/rotating_gate.c +++ b/src/field/rotating_gate.c @@ -3,8 +3,8 @@ #include "event_data.h" #include "field_map_obj.h" #include "fieldmap.h" -#include "map_constants.h" -#include "songs.h" +#include "constants/maps.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" @@ -622,14 +622,14 @@ static EWRAM_DATA u8 gRotatingGate_PuzzleCount = 0; static int GetCurrentMapRotatingGatePuzzleType(void) { - if (gSaveBlock1.location.mapGroup == MAP_GROUP_FORTREE_CITY_GYM && - gSaveBlock1.location.mapNum == MAP_ID_FORTREE_CITY_GYM) + if (gSaveBlock1.location.mapGroup == MAP_GROUP(FORTREE_CITY_GYM) && + gSaveBlock1.location.mapNum == MAP_NUM(FORTREE_CITY_GYM)) { return PUZZLE_FORTREE_CITY_GYM; } - if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE110_TRICK_HOUSE_PUZZLE6 && - gSaveBlock1.location.mapNum == MAP_ID_ROUTE110_TRICK_HOUSE_PUZZLE6) + if (gSaveBlock1.location.mapGroup == MAP_GROUP(ROUTE110_TRICK_HOUSE_PUZZLE6) && + gSaveBlock1.location.mapNum == MAP_NUM(ROUTE110_TRICK_HOUSE_PUZZLE6)) { return PUZZLE_ROUTE110_TRICK_HOUSE_PUZZLE6; } diff --git a/src/field/script_menu.c b/src/field/script_menu.c index e25e74d8c..caa1d7562 100644 --- a/src/field/script_menu.c +++ b/src/field/script_menu.c @@ -6,7 +6,7 @@ #include "menu.h" #include "palette.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "strings.h" diff --git a/src/field/secret_base.c b/src/field/secret_base.c index 34352f39a..fee79a18c 100644 --- a/src/field/secret_base.c +++ b/src/field/secret_base.c @@ -1,9 +1,10 @@ #include "global.h" +#include "constants/decorations.h" #include "secret_base.h" #include "decoration.h" -#include "species.h" -#include "items.h" -#include "moves.h" +#include "constants/species.h" +#include "constants/items.h" +#include "constants/moves.h" #include "event_data.h" #include "field_camera.h" #include "field_effect.h" @@ -16,8 +17,8 @@ #include "link.h" #include "main.h" #include "sound.h" -#include "songs.h" -#include "map_constants.h" +#include "constants/songs.h" +#include "constants/maps.h" #include "map_name_popup.h" #include "menu.h" #include "menu_helpers.h" @@ -27,12 +28,12 @@ #include "overworld.h" #include "script.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "string_util.h" #include "strings.h" #include "task.h" #include "text.h" -#include "vars.h" +#include "constants/vars.h" static void sub_80BC7D8(u8 taskId); @@ -68,30 +69,30 @@ const struct const u8 gUnknown_083D1374[] = { - MAP_ID_SECRET_BASE_RED_CAVE1, 0, 1, 3, - MAP_ID_SECRET_BASE_RED_CAVE2, 0, 5, 9, - MAP_ID_SECRET_BASE_RED_CAVE3, 0, 1, 3, - MAP_ID_SECRET_BASE_RED_CAVE4, 0, 7, 13, - MAP_ID_SECRET_BASE_BROWN_CAVE1, 0, 2, 3, - MAP_ID_SECRET_BASE_BROWN_CAVE2, 0, 9, 2, - MAP_ID_SECRET_BASE_BROWN_CAVE3, 0, 13, 4, - MAP_ID_SECRET_BASE_BROWN_CAVE4, 0, 1, 2, - MAP_ID_SECRET_BASE_BLUE_CAVE1, 0, 1, 3, - MAP_ID_SECRET_BASE_BLUE_CAVE2, 0, 1, 2, - MAP_ID_SECRET_BASE_BLUE_CAVE3, 0, 3, 15, - MAP_ID_SECRET_BASE_BLUE_CAVE4, 0, 3, 14, - MAP_ID_SECRET_BASE_YELLOW_CAVE1, 0, 9, 3, - MAP_ID_SECRET_BASE_YELLOW_CAVE2, 0, 8, 7, - MAP_ID_SECRET_BASE_YELLOW_CAVE3, 0, 3, 6, - MAP_ID_SECRET_BASE_YELLOW_CAVE4, 0, 5, 9, - MAP_ID_SECRET_BASE_TREE1, 0, 2, 3, - MAP_ID_SECRET_BASE_TREE2, 0, 5, 6, - MAP_ID_SECRET_BASE_TREE3, 0, 15, 3, - MAP_ID_SECRET_BASE_TREE4, 0, 4, 10, - MAP_ID_SECRET_BASE_SHRUB1, 0, 3, 3, - MAP_ID_SECRET_BASE_SHRUB2, 0, 1, 2, - MAP_ID_SECRET_BASE_SHRUB3, 0, 7, 8, - MAP_ID_SECRET_BASE_SHRUB4, 0, 9, 6 + MAP_NUM(SECRET_BASE_RED_CAVE1), 0, 1, 3, + MAP_NUM(SECRET_BASE_RED_CAVE2), 0, 5, 9, + MAP_NUM(SECRET_BASE_RED_CAVE3), 0, 1, 3, + MAP_NUM(SECRET_BASE_RED_CAVE4), 0, 7, 13, + MAP_NUM(SECRET_BASE_BROWN_CAVE1), 0, 2, 3, + MAP_NUM(SECRET_BASE_BROWN_CAVE2), 0, 9, 2, + MAP_NUM(SECRET_BASE_BROWN_CAVE3), 0, 13, 4, + MAP_NUM(SECRET_BASE_BROWN_CAVE4), 0, 1, 2, + MAP_NUM(SECRET_BASE_BLUE_CAVE1), 0, 1, 3, + MAP_NUM(SECRET_BASE_BLUE_CAVE2), 0, 1, 2, + MAP_NUM(SECRET_BASE_BLUE_CAVE3), 0, 3, 15, + MAP_NUM(SECRET_BASE_BLUE_CAVE4), 0, 3, 14, + MAP_NUM(SECRET_BASE_YELLOW_CAVE1), 0, 9, 3, + MAP_NUM(SECRET_BASE_YELLOW_CAVE2), 0, 8, 7, + MAP_NUM(SECRET_BASE_YELLOW_CAVE3), 0, 3, 6, + MAP_NUM(SECRET_BASE_YELLOW_CAVE4), 0, 5, 9, + MAP_NUM(SECRET_BASE_TREE1), 0, 2, 3, + MAP_NUM(SECRET_BASE_TREE2), 0, 5, 6, + MAP_NUM(SECRET_BASE_TREE3), 0, 15, 3, + MAP_NUM(SECRET_BASE_TREE4), 0, 4, 10, + MAP_NUM(SECRET_BASE_SHRUB1), 0, 3, 3, + MAP_NUM(SECRET_BASE_SHRUB2), 0, 1, 2, + MAP_NUM(SECRET_BASE_SHRUB3), 0, 7, 8, + MAP_NUM(SECRET_BASE_SHRUB4), 0, 9, 6 }; const struct MenuAction2 gUnknown_083D13D4[] = { @@ -316,7 +317,7 @@ void sub_80BB970(struct MapEvents *events) void sub_80BBA14(void) { s8 idx = 4 * (gUnknown_020387DC / 10); - warp1_set_2(MAP_GROUP_SECRET_BASE_RED_CAVE1, gUnknown_083D1374[idx], gUnknown_083D1374[idx + 1]); + warp1_set_2(MAP_GROUP(SECRET_BASE_RED_CAVE1), gUnknown_083D1374[idx], gUnknown_083D1374[idx + 1]); } void sub_80BBA48(u8 taskid) @@ -401,7 +402,7 @@ void sub_80BBC78(void) bool8 CurrentMapIsSecretBase(void) { - if (gSaveBlock1.location.mapGroup == MAP_GROUP_SECRET_BASE_SHRUB4 && (u8)(gSaveBlock1.location.mapNum) <= MAP_ID_SECRET_BASE_SHRUB4) + if (gSaveBlock1.location.mapGroup == MAP_GROUP(SECRET_BASE_SHRUB4) && (u8)(gSaveBlock1.location.mapNum) <= MAP_NUM(SECRET_BASE_SHRUB4)) return TRUE; return FALSE; } diff --git a/src/field/shop.c b/src/field/shop.c index 493d8c748..23d668fc7 100644 --- a/src/field/shop.c +++ b/src/field/shop.c @@ -21,8 +21,8 @@ #include "fieldmap.h" #include "item.h" #include "decoration.h" -#include "items.h" -#include "songs.h" +#include "constants/items.h" +#include "constants/songs.h" #include "overworld.h" #include "decoration_inventory.h" #include "field_camera.h" diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 6e44090df..7913e5527 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -20,7 +20,7 @@ #include "save.h" #include "save_menu_util.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "string_util.h" diff --git a/src/field/starter_choose.c b/src/field/starter_choose.c index 49590f83a..149eaa03d 100644 --- a/src/field/starter_choose.c +++ b/src/field/starter_choose.c @@ -6,9 +6,9 @@ #include "menu.h" #include "palette.h" #include "pokedex.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "string_util.h" #include "strings.h" diff --git a/src/field/trader.c b/src/field/trader.c index 61f48fad8..c4fe73ba1 100644 --- a/src/field/trader.c +++ b/src/field/trader.c @@ -1,4 +1,5 @@ #include "global.h" +#include "constants/decorations.h" #include "decoration.h" #include "decoration_inventory.h" #include "event_data.h" @@ -7,7 +8,7 @@ #include "menu.h" #include "menu_helpers.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "strings.h" diff --git a/src/field/tv.c b/src/field/tv.c index e58adebc9..71d6455bd 100644 --- a/src/field/tv.c +++ b/src/field/tv.c @@ -8,25 +8,25 @@ #include "fieldmap.h" #include "field_message_box.h" #include "field_camera.h" -#include "flags.h" +#include "constants/flags.h" #include "random.h" #include "string_util.h" #include "text.h" -#include "species.h" +#include "constants/species.h" #include "pokedex.h" #include "naming_screen.h" #include "overworld.h" -#include "map_constants.h" +#include "constants/maps.h" #include "strings.h" #include "battle.h" #include "link.h" -#include "easy_chat.h" +#include "constants/easy_chat.h" #include "field_map_obj.h" #include "field_specials.h" #include "item.h" -#include "items.h" +#include "constants/items.h" #include "link.h" -#include "map_constants.h" +#include "constants/maps.h" #include "naming_screen.h" #include "pokedex.h" #include "region_map.h" @@ -34,12 +34,12 @@ #include "overworld.h" #include "rtc.h" #include "script_menu.h" -#include "species.h" +#include "constants/species.h" #include "string_util.h" #include "strings.h" #include "text.h" #include "ewram.h" -#include "moves.h" +#include "constants/moves.h" #include "region_map_sections.h" struct UnkTvStruct @@ -551,8 +551,8 @@ void UpdateTVScreensOnMap(int width, int height) case 2: break; default: - if (gSaveBlock1.location.mapGroup == MAP_GROUP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F - && gSaveBlock1.location.mapNum == MAP_ID_LILYCOVE_CITY_COVE_LILY_MOTEL_1F) + if (gSaveBlock1.location.mapGroup == MAP_GROUP(LILYCOVE_CITY_COVE_LILY_MOTEL_1F) + && gSaveBlock1.location.mapNum == MAP_NUM(LILYCOVE_CITY_COVE_LILY_MOTEL_1F)) { SetTVMetatilesOnMap(width, height, 0x3); } @@ -1460,16 +1460,16 @@ bool8 IsPriceDiscounted(u8 arg0) switch (arg0) { case 1: - if (gSaveBlock1.location.mapGroup == MAP_GROUP_SLATEPORT_CITY - && gSaveBlock1.location.mapNum == MAP_ID_SLATEPORT_CITY + if (gSaveBlock1.location.mapGroup == MAP_GROUP(SLATEPORT_CITY) + && gSaveBlock1.location.mapNum == MAP_NUM(SLATEPORT_CITY) && gScriptLastTalked == 0x1a) return TRUE; else return FALSE; break; case 3: - if (gSaveBlock1.location.mapGroup == MAP_GROUP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP - && gSaveBlock1.location.mapNum == MAP_ID_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP) + if (gSaveBlock1.location.mapGroup == MAP_GROUP(LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP) + && gSaveBlock1.location.mapNum == MAP_NUM(LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP)) return TRUE; else return FALSE; @@ -2121,16 +2121,16 @@ u32 GetPlayerTrainerId(void) u8 CheckForBigMovieOrEmergencyNewsOnTV(void) { - if (gSaveBlock1.location.mapGroup != MAP_GROUP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F) + if (gSaveBlock1.location.mapGroup != MAP_GROUP(LITTLEROOT_TOWN_BRENDANS_HOUSE_1F)) return 0; if (gSaveBlock2.playerGender == MALE) { - if (gSaveBlock1.location.mapNum != MAP_ID_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F) + if (gSaveBlock1.location.mapNum != MAP_NUM(LITTLEROOT_TOWN_BRENDANS_HOUSE_1F)) return 0; } else { - if (gSaveBlock1.location.mapNum != MAP_ID_LITTLEROOT_TOWN_MAYS_HOUSE_1F) + if (gSaveBlock1.location.mapNum != MAP_NUM(LITTLEROOT_TOWN_MAYS_HOUSE_1F)) return 0; } if (FlagGet(SYS_TV_LATI) == 1) @@ -2142,11 +2142,11 @@ u8 CheckForBigMovieOrEmergencyNewsOnTV(void) void GetMomOrDadStringForTVMessage(void) { - if (gSaveBlock1.location.mapGroup == MAP_GROUP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F) + if (gSaveBlock1.location.mapGroup == MAP_GROUP(LITTLEROOT_TOWN_BRENDANS_HOUSE_1F)) { if (gSaveBlock2.playerGender == MALE) { - if (gSaveBlock1.location.mapNum == MAP_ID_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F) + if (gSaveBlock1.location.mapNum == MAP_NUM(LITTLEROOT_TOWN_BRENDANS_HOUSE_1F)) { StringCopy(gStringVar1, gOtherText_Mom); VarSet(VAR_0x4003, 1); @@ -2154,7 +2154,7 @@ void GetMomOrDadStringForTVMessage(void) } else { - if (gSaveBlock1.location.mapNum == MAP_ID_LITTLEROOT_TOWN_MAYS_HOUSE_1F) + if (gSaveBlock1.location.mapNum == MAP_NUM(LITTLEROOT_TOWN_MAYS_HOUSE_1F)) { StringCopy(gStringVar1, gOtherText_Mom); VarSet(VAR_0x4003, 1); diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c index d301d93d6..8155b4216 100644 --- a/src/field/use_pokeblock.c +++ b/src/field/use_pokeblock.c @@ -15,7 +15,7 @@ #include "text.h" #include "menu.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "pokeblock.h" #define GFX_TAG_CONDITIONUPDOWN 0 diff --git a/src/field/wallclock.c b/src/field/wallclock.c index d86b1bc95..2892d09f9 100644 --- a/src/field/wallclock.c +++ b/src/field/wallclock.c @@ -5,7 +5,7 @@ #include "menu.h" #include "palette.h" #include "rtc.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "strings2.h" #include "task.h" diff --git a/src/field/wild_encounter.c b/src/field/wild_encounter.c index df0b12207..9b3db1a52 100644 --- a/src/field/wild_encounter.c +++ b/src/field/wild_encounter.c @@ -1,11 +1,11 @@ #include "global.h" #include "wild_encounter.h" -#include "abilities.h" +#include "constants/abilities.h" #include "battle_setup.h" #include "event_data.h" #include "field_player_avatar.h" #include "fieldmap.h" -#include "map_constants.h" +#include "constants/maps.h" #include "metatile_behavior.h" #include "pokeblock.h" #include "random.h" @@ -13,7 +13,7 @@ #include "overworld.h" #include "safari_zone.h" #include "script.h" -#include "species.h" +#include "constants/species.h" #include "tv.h" const struct WildPokemon PetalburgCity_WaterMons [] = @@ -2953,8 +2953,8 @@ static bool8 CheckFeebas(void) u8 route119section = 0; u16 waterTileNum; - if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE119 - && gSaveBlock1.location.mapNum == MAP_ID_ROUTE119) + if (gSaveBlock1.location.mapGroup == MAP_GROUP(ROUTE119) + && gSaveBlock1.location.mapNum == MAP_NUM(ROUTE119)) { GetXYCoordsOneStepInFrontOfPlayer(&x, &y); x -= 7; diff --git a/src/pokemon/learn_move.c b/src/pokemon/learn_move.c index 730717965..8aa10254c 100644 --- a/src/pokemon/learn_move.c +++ b/src/pokemon/learn_move.c @@ -10,7 +10,7 @@ #include "pokemon_summary_screen.h" #include "overworld.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "string_util.h" diff --git a/src/pokemon/mail.c b/src/pokemon/mail.c index 13129bf7f..b876c887d 100644 --- a/src/pokemon/mail.c +++ b/src/pokemon/mail.c @@ -1,7 +1,7 @@ #include "global.h" #include "mail.h" #include "easy_chat.h" -#include "items.h" +#include "constants/items.h" #include "mail_data.h" #include "menu.h" #include "menu_helpers.h" diff --git a/src/pokemon/mail_data.c b/src/pokemon/mail_data.c index ae3f4b3e8..4249b9f48 100644 --- a/src/pokemon/mail_data.c +++ b/src/pokemon/mail_data.c @@ -1,10 +1,10 @@ #include "global.h" #include "mail_data.h" -#include "items.h" +#include "constants/items.h" #include "name_string_util.h" #include "pokemon.h" #include "pokemon_icon.h" -#include "species.h" +#include "constants/species.h" #include "text.h" void ClearMailData(void) diff --git a/src/pokemon/mon_markings.c b/src/pokemon/mon_markings.c index e330fed65..18bbef89b 100644 --- a/src/pokemon/mon_markings.c +++ b/src/pokemon/mon_markings.c @@ -2,7 +2,7 @@ #include "main.h" #include "menu_cursor.h" #include "text_window.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" diff --git a/src/pokemon/pokedex.c b/src/pokemon/pokedex.c index 604085b28..a4d84bebd 100644 --- a/src/pokemon/pokedex.c +++ b/src/pokemon/pokedex.c @@ -16,9 +16,9 @@ #include "pokemon.h" #include "random.h" #include "overworld.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "string_util.h" #include "strings.h" #include "task.h" diff --git a/src/pokemon/pokemon_1.c b/src/pokemon/pokemon_1.c index d44a8b61e..f4d227f7f 100644 --- a/src/pokemon/pokemon_1.c +++ b/src/pokemon/pokemon_1.c @@ -1,11 +1,11 @@ #include "global.h" #include "data2.h" -#include "items.h" +#include "constants/items.h" #include "main.h" #include "pokemon.h" #include "random.h" #include "overworld.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "string_util.h" #include "text.h" diff --git a/src/pokemon/pokemon_2.c b/src/pokemon/pokemon_2.c index cedcc2720..8e5d7a33f 100644 --- a/src/pokemon/pokemon_2.c +++ b/src/pokemon/pokemon_2.c @@ -6,7 +6,7 @@ #include "pokemon.h" #include "random.h" #include "rom_8077ABC.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "string_util.h" #include "strings2.h" diff --git a/src/pokemon/pokemon_3.c b/src/pokemon/pokemon_3.c index 40165384d..d659ed680 100644 --- a/src/pokemon/pokemon_3.c +++ b/src/pokemon/pokemon_3.c @@ -3,9 +3,9 @@ #include "battle_message.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 "link.h" #include "m4a.h" #include "main.h" @@ -15,9 +15,9 @@ #include "rom_8077ABC.h" #include "rom_8094928.h" #include "rtc.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "string_util.h" #include "text.h" diff --git a/src/pokemon/pokemon_data.c b/src/pokemon/pokemon_data.c index 3d13a3390..82e452158 100644 --- a/src/pokemon/pokemon_data.c +++ b/src/pokemon/pokemon_data.c @@ -1,11 +1,11 @@ #include "global.h" #include "pokemon.h" -#include "species.h" +#include "constants/species.h" #include "trainer.h" -#include "abilities.h" -#include "moves.h" -#include "hold_effects.h" -#include "items.h" +#include "constants/abilities.h" +#include "constants/moves.h" +#include "constants/hold_effects.h" +#include "constants/items.h" #include "sprite.h" #include "data2.h" diff --git a/src/pokemon/pokemon_icon.c b/src/pokemon/pokemon_icon.c index e83f912ec..b1b462761 100644 --- a/src/pokemon/pokemon_icon.c +++ b/src/pokemon/pokemon_icon.c @@ -1,7 +1,7 @@ #include "global.h" #include "graphics.h" #include "mail_data.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #define POKE_ICON_BASE_PAL_TAG 56000 diff --git a/src/pokemon/pokemon_menu.c b/src/pokemon/pokemon_menu.c index ae9fcefea..ea33cd3e6 100644 --- a/src/pokemon/pokemon_menu.c +++ b/src/pokemon/pokemon_menu.c @@ -5,13 +5,13 @@ #include "palette.h" #include "menu.h" #include "mail_data.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "main.h" #include "overworld.h" #include "menu_helpers.h" #include "pokemon_summary_screen.h" -#include "moves.h" +#include "constants/moves.h" #include "data2.h" #include "strings.h" #include "item_use.h" diff --git a/src/pokemon/pokemon_size_record.c b/src/pokemon/pokemon_size_record.c index a71e6f1fd..260396de0 100644 --- a/src/pokemon/pokemon_size_record.c +++ b/src/pokemon/pokemon_size_record.c @@ -3,7 +3,7 @@ #include "data2.h" #include "event_data.h" #include "pokedex.h" -#include "species.h" +#include "constants/species.h" #include "string_util.h" #include "strings2.h" #include "text.h" diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c index c0f643818..532f30aaa 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon/pokemon_summary_screen.c @@ -5,7 +5,7 @@ #include "event_data.h" #include "ewram.h" #include "item.h" -#include "items.h" +#include "constants/items.h" #include "learn_move.h" #include "link.h" #include "m4a.h" @@ -19,9 +19,9 @@ #include "pokemon.h" #include "pokemon_summary_screen.h" #include "region_map.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "string_util.h" #include "strings.h" diff --git a/src/pokenav_before.c b/src/pokenav_before.c index 5cd1c8942..bab6648de 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -5,14 +5,15 @@ #include "battle.h" #include "data2.h" #include "de_rom_8040FE0.h" -#include "flags.h" +#include "event_data.h" +#include "constants/flags.h" #include "landmark.h" #include "link.h" #include "menu.h" #include "overworld.h" #include "palette.h" #include "region_map.h" -#include "songs.h" +#include "constants/songs.h" #include "string_util.h" #include "sound.h" #include "task.h" diff --git a/src/rom3.c b/src/rom3.c index 16e605390..dd520a839 100644 --- a/src/rom3.c +++ b/src/rom3.c @@ -6,12 +6,12 @@ #include "battle_anim_81258BC.h" #include "battle_anim_8137220.h" #include "cable_club.h" -#include "items.h" +#include "constants/items.h" #include "link.h" #include "pokemon.h" #include "rom3.h" #include "rom_8094928.h" -#include "species.h" +#include "constants/species.h" #include "task.h" #include "util.h" #include "battle_message.h" diff --git a/src/rom6.c b/src/rom6.c index 32b5f52a5..c25f0f9f5 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -8,7 +8,7 @@ #include "pokemon_menu.h" #include "overworld.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index e4801a194..42f360b69 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -7,7 +7,7 @@ #include "decompress.h" #include "palette.h" #include "pokemon_icon.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "task.h" #include "trig.h" diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c index 91b5c10bc..47ed314a8 100644 --- a/src/scene/berry_blender.c +++ b/src/scene/berry_blender.c @@ -7,14 +7,14 @@ #include "menu.h" #include "strings2.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "berry.h" #include "string_util.h" #include "link.h" #include "task.h" #include "overworld.h" #include "item.h" -#include "items.h" +#include "constants/items.h" #include "random.h" #include "save.h" #include "menu_cursor.h" diff --git a/src/scene/credits.c b/src/scene/credits.c index fed1d993a..81be60c9f 100644 --- a/src/scene/credits.c +++ b/src/scene/credits.c @@ -10,9 +10,9 @@ #include "palette.h" #include "pokedex.h" #include "random.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "starter_choose.h" #include "task.h" #include "trig.h" diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c index 3675b42cf..c0111de7d 100644 --- a/src/scene/egg_hatch.c +++ b/src/scene/egg_hatch.c @@ -4,7 +4,7 @@ #include "decompress.h" #include "event_data.h" #include "ewram.h" -#include "items.h" +#include "constants/items.h" #include "main.h" #include "menu.h" #include "naming_screen.h" @@ -13,7 +13,7 @@ #include "pokemon.h" #include "random.h" #include "script.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "strings2.h" diff --git a/src/scene/evolution_graphics.c b/src/scene/evolution_graphics.c index dc0e219c5..b9ef5b402 100644 --- a/src/scene/evolution_graphics.c +++ b/src/scene/evolution_graphics.c @@ -6,7 +6,7 @@ #include "decompress.h" #include "task.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "palette.h" // this file's functions diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c index d4c6417c7..e0b42e1c7 100644 --- a/src/scene/evolution_scene.c +++ b/src/scene/evolution_scene.c @@ -16,9 +16,9 @@ #include "trade.h" #include "menu.h" #include "pokedex.h" -#include "species.h" +#include "constants/species.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "overworld.h" #include "battle_message.h" #include "pokemon_summary_screen.h" diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c index 63aaf79c9..1751ee99c 100644 --- a/src/scene/hall_of_fame.c +++ b/src/scene/hall_of_fame.c @@ -3,14 +3,14 @@ #include "task.h" #include "palette.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "pokemon.h" #include "text.h" #include "strings.h" #include "string_util.h" #include "menu.h" #include "save.h" -#include "species.h" +#include "constants/species.h" #include "overworld.h" #include "m4a.h" #include "data2.h" diff --git a/src/scene/intro.c b/src/scene/intro.c index c713071e7..9e334d06b 100644 --- a/src/scene/intro.c +++ b/src/scene/intro.c @@ -13,9 +13,9 @@ #include "palette.h" #include "random.h" #include "save.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "task.h" #include "title_screen.h" #include "trig.h" diff --git a/src/scene/intro_credits_graphics.c b/src/scene/intro_credits_graphics.c index bb80ef3b6..05c67696a 100755 --- a/src/scene/intro_credits_graphics.c +++ b/src/scene/intro_credits_graphics.c @@ -13,9 +13,9 @@ #include "palette.h" #include "random.h" #include "save.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "task.h" #include "title_screen.h" #include "trig.h" diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index 9b6265308..9d1aaa125 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -10,7 +10,7 @@ #include "debug.h" #include "decompress.h" #include "event_data.h" -#include "items.h" +#include "constants/items.h" #include "link.h" #include "load_save.h" #include "main.h" @@ -20,7 +20,7 @@ #include "random.h" #include "overworld.h" #include "script_pokemon_80C4.h" -#include "species.h" +#include "constants/species.h" #include "task.h" #include "ewram.h" diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c index d95a0ed39..aed11bb7e 100644 --- a/src/script_pokemon_util_80F99CC.c +++ b/src/script_pokemon_util_80F99CC.c @@ -12,7 +12,7 @@ #include "overworld.h" #include "script.h" #include "script_pokemon_80F9.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "string_util.h" #include "task.h" |