diff options
Diffstat (limited to 'src')
49 files changed, 80 insertions, 75 deletions
diff --git a/src/battle_2.c b/src/battle_2.c index a021e83b0..52530f6b3 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -11,7 +11,7 @@ #include "palette.h" #include "task.h" #include "event_data.h" -#include "species.h" +#include "constants/species.h" #include "berry.h" #include "text.h" #include "item.h" @@ -26,7 +26,7 @@ #include "m4a.h" #include "window.h" #include "random.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "battle_message.h" #include "sprite.h" @@ -37,7 +37,7 @@ #include "battle_controllers.h" #include "pokedex.h" #include "constants/abilities.h" -#include "moves.h" +#include "constants/moves.h" #include "trainer_classes.h" #include "evolution_scene.h" #include "roamer.h" diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index c3fab44f3..44be0a4d9 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -2,12 +2,12 @@ #include "battle_ai_script_commands.h" #include "pokemon.h" #include "battle.h" -#include "species.h" +#include "constants/species.h" #include "constants/abilities.h" #include "random.h" #include "item.h" #include "constants/battle_move_effects.h" -#include "moves.h" +#include "constants/moves.h" #include "util.h" #define AIScriptRead32(ptr) ((ptr)[0] | (ptr)[1] << 8 | (ptr)[2] << 16 | (ptr)[3] << 24) diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index 4177b82d2..b3fccb17f 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -2,9 +2,9 @@ #include "battle.h" #include "battle_controllers.h" #include "constants/abilities.h" -#include "moves.h" +#include "constants/moves.h" #include "pokemon.h" -#include "species.h" +#include "constants/species.h" #include "random.h" #include "util.h" #include "constants/items.h" diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 4795d2bd4..dd8582618 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -10,7 +10,7 @@ #include "link.h" #include "util.h" #include "main.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "window.h" #include "m4a.h" diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index fde364a55..9da468761 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -10,7 +10,7 @@ #include "link.h" #include "util.h" #include "main.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "window.h" #include "m4a.h" diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 5c2730490..0862e72a7 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -12,9 +12,9 @@ #include "main.h" #include "item.h" #include "constants/items.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "moves.h" +#include "constants/moves.h" #include "window.h" #include "m4a.h" #include "palette.h" diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 0c9ff211f..e497dbfe2 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -11,9 +11,9 @@ #include "main.h" #include "item.h" #include "constants/items.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "moves.h" +#include "constants/moves.h" #include "window.h" #include "m4a.h" #include "palette.h" diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index 3ce12fac7..eb57297da 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -9,7 +9,7 @@ #include "link.h" #include "util.h" #include "main.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "window.h" #include "m4a.h" diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index a57b2c576..8e2f31879 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -11,7 +11,7 @@ #include "link.h" #include "util.h" #include "main.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "window.h" #include "m4a.h" diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 86558d25c..f558fde87 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -10,7 +10,7 @@ #include "link.h" #include "util.h" #include "main.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "window.h" #include "m4a.h" diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 2ec14cab5..db4670523 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -8,7 +8,7 @@ #include "link.h" #include "util.h" #include "main.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "window.h" #include "m4a.h" diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 947836e34..446027944 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -11,9 +11,9 @@ #include "main.h" #include "item.h" #include "constants/items.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "moves.h" +#include "constants/moves.h" #include "window.h" #include "m4a.h" #include "palette.h" diff --git a/src/battle_controllers.c b/src/battle_controllers.c index a6e6a1b6d..c6d47e71e 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -6,7 +6,7 @@ #include "battle_ai_script_commands.h" #include "battle_anim.h" #include "pokemon.h" -#include "species.h" +#include "constants/species.h" #include "recorded_battle.h" #include "util.h" #include "constants/abilities.h" diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c index 9385417b4..d549856f2 100644 --- a/src/battle_dome_cards.c +++ b/src/battle_dome_cards.c @@ -4,7 +4,7 @@ #include "sprite.h" #include "window.h" #include "malloc.h" -#include "species.h" +#include "constants/species.h" #include "palette.h" #include "decompress.h" #include "battle_dome_cards.h" diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index e9b31ae55..22be086f0 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -9,18 +9,18 @@ #include "random.h" #include "util.h" #include "pokemon.h" -#include "moves.h" +#include "constants/moves.h" #include "task.h" #include "sprite.h" #include "sound.h" #include "m4a.h" -#include "species.h" +#include "constants/species.h" #include "decompress.h" #include "data2.h" #include "palette.h" #include "blend_palette.h" #include "contest.h" -#include "songs.h" +#include "constants/songs.h" extern u8 gBattleBufferA[BATTLE_BANKS_COUNT][0x200]; extern u8 gActiveBank; diff --git a/src/battle_interface.c b/src/battle_interface.c index 63813a424..95f1a1111 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -8,13 +8,13 @@ #include "string_util.h" #include "text.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "decompress.h" #include "task.h" #include "util.h" #include "gpu_regs.h" #include "battle_message.h" -#include "species.h" +#include "constants/species.h" #include "pokedex.h" #include "palette.h" #include "international_string_util.h" diff --git a/src/battle_message.c b/src/battle_message.c index ecfcc1228..ec1cfd626 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -2,7 +2,7 @@ #include "battle.h" #include "battle_message.h" #include "battle_string_ids.h" -#include "moves.h" +#include "constants/moves.h" #include "text.h" #include "string_util.h" #include "constants/items.h" diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index a7240783c..88d583c1f 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -4,7 +4,7 @@ #include "battle_message.h" #include "battle_ai_script_commands.h" #include "battle_scripts.h" -#include "moves.h" +#include "constants/moves.h" #include "constants/abilities.h" #include "item.h" #include "constants/items.h" @@ -15,8 +15,8 @@ #include "random.h" #include "battle_controllers.h" #include "battle_interface.h" -#include "species.h" -#include "songs.h" +#include "constants/species.h" +#include "constants/songs.h" #include "text.h" #include "sound.h" #include "pokedex.h" diff --git a/src/battle_util.c b/src/battle_util.c index 293915de7..1a624641d 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1,10 +1,10 @@ #include "global.h" #include "battle.h" #include "constants/abilities.h" -#include "moves.h" +#include "constants/moves.h" #include "constants/hold_effects.h" #include "pokemon.h" -#include "species.h" +#include "constants/species.h" #include "item.h" #include "constants/items.h" #include "util.h" diff --git a/src/berry_blender.c b/src/berry_blender.c index 2d3c38810..b1d36e2d9 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -7,7 +7,7 @@ #include "task.h" #include "sprite.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "m4a.h" #include "bg.h" #include "palette.h" @@ -1068,7 +1068,7 @@ static void Blender_SetPlayerNamesLocal(u8 opponentsNum) sBerryBlenderData->playersNo = 2; StringCopy(gLinkPlayers[0].name, gSaveBlock2Ptr->playerName); - if (!FlagGet(FLAG_340)) + if (!FlagGet(FLAG_0x340)) StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MASTER]); else StringCopy(gLinkPlayers[1].name, sBlenderOpponentsNames[BLENDER_MISTER]); @@ -1592,7 +1592,7 @@ static void sub_80808D4(void) if (gSpecialVar_0x8004 == 1) { - if (!FlagGet(FLAG_340)) + if (!FlagGet(FLAG_0x340)) sBerryBlenderData->field_120[0] = CreateTask(sub_8081224, 10); else sBerryBlenderData->field_120[0] = CreateTask(sUnknown_083399EC[0], 10); diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c index c3b66f87a..d6924de9f 100755 --- a/src/braille_puzzles.c +++ b/src/braille_puzzles.c @@ -1,9 +1,9 @@ #include "global.h" #include "event_data.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "script.h" -#include "species.h" +#include "constants/species.h" #include "task.h" #include "field_effect.h" #include "constants/flags.h" diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c index 868bf734a..d30599607 100644 --- a/src/calculate_base_damage.c +++ b/src/calculate_base_damage.c @@ -6,8 +6,8 @@ #include "item.h" #include "constants/items.h" #include "pokemon.h" -#include "species.h" -#include "moves.h" +#include "constants/species.h" +#include "constants/moves.h" #include "constants/battle_move_effects.h" extern u32 gBattleTypeFlags; diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index d5e173ee8..d00944ac1 100755 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -9,7 +9,7 @@ #include "gpu_regs.h" #include "bg.h" #include "text_window.h" -#include "songs.h" +#include "constants/songs.h" extern u8 gText_ClearAllSaveData[]; extern u8 gText_ClearingData[]; diff --git a/src/daycare.c b/src/daycare.c index df03e3b91..ce9952531 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -2,14 +2,14 @@ #include "pokemon.h" #include "daycare.h" #include "string_util.h" -#include "species.h" +#include "constants/species.h" #include "constants/items.h" #include "mail.h" #include "pokemon_storage_system.h" #include "event_data.h" #include "random.h" #include "main.h" -#include "moves.h" +#include "constants/moves.h" #include "egg_hatch.h" #include "text.h" #include "menu.h" diff --git a/src/decompress.c b/src/decompress.c index e2ae6ce83..8e8827194 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -1,6 +1,6 @@ #include "global.h" #include "decompress.h" -#include "species.h" +#include "constants/species.h" #include "text.h" #include "malloc.h" #include "pokemon.h" diff --git a/src/decoration.c b/src/decoration.c index ce678e046..987e628c5 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -9,7 +9,7 @@ #include "task.h" #include "main.h" #include "palette.h" -#include "songs.h" +#include "constants/songs.h" #include "overworld.h" #include "fieldmap.h" #include "metatile_behavior.h" diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 60deddf29..032607806 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -10,7 +10,7 @@ #include "main.h" #include "event_data.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "text.h" #include "text_window.h" #include "string_util.h" diff --git a/src/event_data.c b/src/event_data.c index e3742a147..9f1432f17 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -44,7 +44,7 @@ void ClearTempFieldEventData(void) FlagClear(FLAG_SYS_ENC_DOWN_ITEM); FlagClear(FLAG_SYS_USE_STRENGTH); FlagClear(FLAG_SYS_CTRL_OBJ_DELETE); - FlagClear(FLAG_SYS_UNKNOWN_880); + FlagClear(FLAG_0x880); } // probably had different flag splits at one point. diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index 30aacec94..8d02eef91 100644 --- a/src/evolution_graphics.c +++ b/src/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/evolution_scene.c b/src/evolution_scene.c index 452035b54..c17921b74 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -16,9 +16,9 @@ #include "m4a.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 "battle_string_ids.h" @@ -52,6 +52,7 @@ extern u8 gBattleTerrain; extern struct SpriteTemplate gUnknown_0202499C; extern bool8 gAffineAnimsDisabled; extern u16 gMoveToLearn; +extern const u8 gSpeciesNames[][11]; extern u8 gBattleCommunication[]; #define sEvoCursorPos gBattleCommunication[1] // when learning a new move diff --git a/src/field_poison.c b/src/field_poison.c index d953ab29c..b83788210 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -1,7 +1,7 @@ #include "global.h" #include "string_util.h" #include "party_menu.h" -#include "species.h" +#include "constants/species.h" #include "task.h" #include "field_message_box.h" #include "strings.h" diff --git a/src/field_special_scene.c b/src/field_special_scene.c index f92f342eb..d46ddeaa6 100755 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -2,11 +2,11 @@ #include "task.h" #include "sprite.h" #include "field_map_obj.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "palette.h" #include "script.h" -#include "vars.h" +#include "constants/vars.h" #include "event_data.h" #include "main.h" diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index c5394834b..52babe346 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -9,12 +9,12 @@ #include "gpu_regs.h" #include "main.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "decompress.h" #include "save.h" #include "window.h" #include "bg.h" -#include "species.h" +#include "constants/species.h" #include "constants/game_stat.h" #include "blend_palette.h" #include "string_util.h" @@ -58,6 +58,7 @@ extern struct MusicPlayerInfo gMPlay_BGM; extern MainCallback gGameContinueCallback; extern u32 gDamagedSaveSectors; extern u8 gReservedSpritePaletteCount; +extern const u8 gSpeciesNames[][11]; #define HALL_OF_FAME_MAX_TEAMS 50 diff --git a/src/lottery_corner.c b/src/lottery_corner.c index a6019e691..2ded9c943 100644 --- a/src/lottery_corner.c +++ b/src/lottery_corner.c @@ -4,7 +4,7 @@ #include "pokemon.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/mail.c b/src/mail.c index f56e05c44..877035fb6 100644 --- a/src/mail.c +++ b/src/mail.c @@ -15,7 +15,7 @@ #include "gpu_regs.h" #include "bg.h" #include "pokemon_icon.h" -#include "species.h" +#include "constants/species.h" #include "malloc.h" #include "easy_chat.h" #include "mail_data.h" diff --git a/src/pokeball.c b/src/pokeball.c index 728145791..127ba8e9d 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -6,12 +6,12 @@ #include "battle_anim.h" #include "task.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "trig.h" #include "main.h" #include "m4a.h" #include "decompress.h" -#include "species.h" +#include "constants/species.h" #include "util.h" #include "graphics.h" diff --git a/src/pokemon_2.c b/src/pokemon_2.c index e9bf14a41..a4d00112b 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -4,7 +4,7 @@ #include "event_data.h" #include "random.h" #include "sprite.h" -#include "species.h" +#include "constants/species.h" #include "text.h" #include "string_util.h" diff --git a/src/pokemon_3.c b/src/pokemon_3.c index b0ee4a7d9..a419dd46e 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -7,13 +7,13 @@ #include "rtc.h" #include "item.h" #include "battle.h" -#include "species.h" +#include "constants/species.h" #include "link.h" #include "constants/hold_effects.h" #include "random.h" #include "trainer_classes.h" #include "trainer_ids.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "m4a.h" #include "task.h" diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c index ec0103bc7..fe3b3e8dd 100644 --- a/src/pokemon_size_record.c +++ b/src/pokemon_size_record.c @@ -1,7 +1,7 @@ #include "global.h" #include "pokemon_size_record.h" #include "event_data.h" -#include "species.h" +#include "constants/species.h" #include "string_util.h" #include "text.h" #include "pokemon.h" diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index f82a52d38..bdf4427c7 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1,7 +1,7 @@ #include "global.h" #include "pokemon_storage_system.h" #include "pokemon.h" -#include "species.h" +#include "constants/species.h" #include "event_data.h" #include "string_util.h" #include "text.h" diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 3e99fe375..b00979945 100755 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -8,12 +8,12 @@ #include "m4a.h" #include "main.h" #include "malloc.h" -#include "moves.h" +#include "constants/moves.h" #include "palette.h" #include "pokemon.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" -#include "species.h" +#include "constants/species.h" #include "sprite.h" #include "unk_text_util.h" #include "string_util.h" diff --git a/src/region_map.c b/src/region_map.c index a3066b77e..b7fc625ca 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -17,7 +17,7 @@ #include "international_string_util.h" #include "strings.h" #include "text_window.h" -#include "songs.h" +#include "constants/songs.h" #include "m4a.h" #include "field_effect.h" #include "region_map.h" diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index 4ad1971fd..a034ca089 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -10,7 +10,7 @@ #include "battle_controllers.h" #include "link.h" #include "sprite.h" -#include "species.h" +#include "constants/species.h" #include "battle_interface.h" extern u16 gBattle_BG0_X; diff --git a/src/roamer.c b/src/roamer.c index bce85dffd..fbd25bfad 100644 --- a/src/roamer.c +++ b/src/roamer.c @@ -2,7 +2,7 @@ #include "roamer.h" #include "pokemon.h" #include "random.h" -#include "species.h" +#include "constants/species.h" #include "event_data.h" enum diff --git a/src/secret_base.c b/src/secret_base.c index 7a1f0158e..6d66e6576 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -12,7 +12,7 @@ #include "new_menu_helpers.h" #include "menu_indicators.h" #include "constants/maps.h" -#include "songs.h" +#include "constants/songs.h" #include "sound.h" #include "overworld.h" #include "fieldmap.h" diff --git a/src/sound.c b/src/sound.c index a95511ece..086fede67 100644 --- a/src/sound.c +++ b/src/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/starter_choose.c b/src/starter_choose.c index 6be362caf..82f8f75f6 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -12,7 +12,7 @@ #include "decompress.h" #include "menu.h" #include "sound.h" -#include "songs.h" +#include "constants/songs.h" #include "event_data.h" #include "pokedex.h" #include "data2.h" @@ -14,8 +14,8 @@ #include "pokemon_storage_system.h" #include "field_message_box.h" #include "easy_chat.h" -#include "species.h" -#include "moves.h" +#include "constants/species.h" +#include "constants/moves.h" #include "battle.h" #include "battle_tower.h" #include "contest.h" @@ -38,6 +38,9 @@ #include "secret_base.h" #include "tv.h" +extern const u8 gSpeciesNames[][11]; +extern const u8 gMoveNames[][13]; + // Static type declarations #define rbernoulli(num, den) TV_BernoulliTrial(0xFFFF * (num) / (den)) diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 5c85ef971..705c4416c 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -1,7 +1,7 @@ #include "global.h" #include "wild_encounter.h" #include "pokemon.h" -#include "species.h" +#include "constants/species.h" #include "metatile_behavior.h" #include "fieldmap.h" #include "random.h" |