convert more constants

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"

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)

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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;

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"

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"

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"

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"

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);

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"

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;

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[];

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"

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"

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"

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"

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.

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

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

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"

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"
 

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
 

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"
 

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"

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"
 

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"
 

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"

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"

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"

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"

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"

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;

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

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"

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

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"

src/tv.c

@@ -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))

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"