Oops, here's the rest

2026-04-26 08:19:51 -05:00 · 2023-08-05 16:02:59 -04:00 · 2023-08-05 16:02:59 -04:00 · 64e366755e
commit 64e366755e
parent 938f8cf177
60 changed files with 112 additions and 60 deletions
--- a/src/adventure_log.c
+++ b/src/adventure_log.c
@ -2,7 +2,8 @@
 #include "constants/input.h"
 #include "input.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "menu_input.h"

 struct AdventureLog
--- a/src/adventure_log_menu.c
+++ b/src/adventure_log_menu.c
@ -1,12 +1,12 @@
 #include "global.h"
+#include "adventure_log.h"
 #include "input.h"
 #include "main_menu.h"
-#include "adventure_log.h"
-#include "text.h"
+#include "text1.h"

 extern void CreateAdventureLogScreen(u32);
 extern u32 HandleAdventureLogInput(u32);
-extern void CleanAdventureLogScreen();
+extern void CleanAdventureLogScreen(void);

 void CreateAdventureLogMenu(void)
 {
@ -24,8 +24,7 @@ u32 UpdateAdventureLogMenu(void)
    u32 nextMenu;
    nextMenu = MENU_NO_SCREEN_CHANGE;

-    switch(HandleAdventureLogInput(1))
-    {
+    switch (HandleAdventureLogInput(1)) {
        case 0:
        case 1:
            break;
@ -37,4 +36,4 @@ u32 UpdateAdventureLogMenu(void)
            break;
    }
    return nextMenu;
-}
+}
--- a/src/code_2.c
+++ b/src/code_2.c
@ -12,7 +12,8 @@
 #include "play_time.h"
 #include "save.h"
 #include "game_options.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "exclusive_pokemon.h"
 #include "pokemon.h"
 #include "rescue_team_info.h"
--- a/src/code_8012A18_1.c
+++ b/src/code_8012A18_1.c
@ -3,7 +3,7 @@
 #include "file_system.h"
 #include "memory.h"
 #include "input.h"
-#include "text.h"
+#include "text1.h"
 #include "text_util.h"

 struct unkStruct_203B200
--- a/src/code_801B3C0.c
+++ b/src/code_801B3C0.c
@ -1,6 +1,7 @@
 #include "global.h"
 #include "constants/colors.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "input.h"
 #include "item.h"
 #include "memory.h"
--- a/src/code_801C620.c
+++ b/src/code_801C620.c
@ -7,7 +7,8 @@
 #include "pokemon.h"
 #include "pokemon_3.h"
 #include "team_inventory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "subStruct_203B240.h"
 #include "menu_input.h"

--- a/src/code_801D760.c
+++ b/src/code_801D760.c
@ -10,7 +10,8 @@
 #include "team_inventory.h"
 #include "memory.h"
 #include "input.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "rescue_team_info.h"
 #include "code_800D090.h"
 #include "menu_input.h"
--- a/src/code_801EE10.c
+++ b/src/code_801EE10.c
@ -1,6 +1,7 @@
 #include "global.h"
 #include "pokemon.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "memory.h"
 #include "input.h"
 #include "code_801EE10.h"
--- a/src/code_801EE10_1.c
+++ b/src/code_801EE10_1.c
@ -4,7 +4,8 @@
 #include "pokemon.h"
 #include "input.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "text_util.h"
 #include "menu_input.h"

--- a/src/code_801EE10_mid.c
+++ b/src/code_801EE10_mid.c
@ -1,6 +1,7 @@
 #include "global.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "pokemon.h"
 #include "input.h"
 #include "code_800D090.h"
--- a/src/code_8021774.c
+++ b/src/code_8021774.c
@ -2,7 +2,8 @@
 #include "global.h"
 #include "input.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "pokemon.h"
 #include "exclusive_pokemon.h"
 #include "friend_area.h"
--- a/src/code_8021774_pre.c
+++ b/src/code_8021774_pre.c
@ -4,7 +4,8 @@
 #include "friend_area.h"
 #include "input.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "item.h"
 #include "team_inventory.h"
 #include "menu_input.h"
--- a/src/code_8023144.c
+++ b/src/code_8023144.c
@ -7,7 +7,8 @@
 #include "pokemon.h"
 #include "pokemon_3.h"
 #include "team_inventory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "input.h"
 #include "item.h"
 #include "menu_input.h"
--- a/src/code_8023144_pre.c
+++ b/src/code_8023144_pre.c
@ -7,12 +7,12 @@
 #include "pokemon.h"
 #include "pokemon_3.h"
 #include "team_inventory.h"
-#include "text.h"
+#include "text1.h"
 #include "input.h"
 #include "item.h"
 #include "menu_input.h"
 #include "code_8023144.h"
-#include "text.h"
+#include "text2.h"

 struct unkStruct_203B294 *gUnknown_203B294;
 extern u8 gAvailablePokemonNames[];
--- a/src/code_8031D70.c
+++ b/src/code_8031D70.c
@ -3,7 +3,8 @@
 #include "constants/colors.h"
 #include "input.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "dungeon_global_data.h"
 #include "pokemon.h"
 #include "code_8094F88.h"
--- a/src/credits.c
+++ b/src/credits.c
@ -1,7 +1,8 @@
 #include "global.h"
 #include "input.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"

 // size: 0x6C
 struct unkCreditsStruct_203B340
--- a/src/debug_menu.c
+++ b/src/debug_menu.c
@ -10,6 +10,7 @@
 #include "save.h"
 #include "text_util.h"
 #include "menu_input.h"
+#include "text1.h"

 EWRAM_DATA_2 struct DebugMenu *gUnknown_203B3EC = {0};

--- a/src/debug_menu_1.c
+++ b/src/debug_menu_1.c
@ -2,7 +2,8 @@
 #include "pokemon.h"
 #include "debug_menu.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "input.h"
 #include "menu.h"
 #include "menu_input.h"
--- a/src/debug_menu_mid.c
+++ b/src/debug_menu_mid.c
@ -4,7 +4,8 @@
 #include "team_inventory.h"
 #include "memory.h"
 #include "menu.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "menu_input.h"
 #include "friend_area.h"

--- a/src/ds_menus.c
+++ b/src/ds_menus.c
@ -1,6 +1,6 @@
 #include "global.h"
 #include "input.h"
-#include "text.h"
+#include "text1.h"

 u32 CreateDualSlotMenu(void)
 {
--- a/src/felicity_bank.c
+++ b/src/felicity_bank.c
@ -1,12 +1,13 @@
 #include "global.h"
-#include "pokemon.h"
+#include "felicity_bank.h"
 #include "file_system.h"
 #include "input.h"
-#include "felicity_bank.h"
 #include "memory.h"
-#include "team_inventory.h"
-#include "text.h"
 #include "menu_input.h"
+#include "pokemon.h"
+#include "team_inventory.h"
+#include "text1.h"
+#include "text2.h"

 EWRAM_DATA_2 struct FelicityBankWork *gFelicityBankWork = {0};

--- a/src/friend_area_action_menu.c
+++ b/src/friend_area_action_menu.c
@ -1,6 +1,7 @@
 #include "global.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "input.h"
 #include "menu.h"
 #include "item.h"
--- a/src/friend_list_menu.c
+++ b/src/friend_list_menu.c
@ -1,6 +1,7 @@
 #include "global.h"
 #include "constants/dungeon.h"
 #include "memory.h"
+#include "text1.h"
 #include "text2.h"
 #include "input.h"
 #include "menu.h"
--- a/src/friend_rescue.c
+++ b/src/friend_rescue.c
@ -2,7 +2,8 @@
 #include "constants/communication_error_codes.h"
 #include "constants/monster.h"
 #include "constants/wonder_mail.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "text_util.h"
 #include "input.h"
 #include "item.h"
@ -294,8 +295,6 @@ extern void sub_802F2C0(void);
 extern void sub_8030DE4(void);
 extern void sub_802453C(void);
 extern void sub_801B450(void);
-extern void sub_800641C(struct UnkTextStruct2 *a0, u8 a1, u8 a2);
-extern void sub_8006518(struct UnkTextStruct2 *);
 extern u8 sub_800D588(void);
 extern void sub_8011830(void);
 extern void sub_80141B4(const u8 *, u32, struct OpenedFile **, u32);
--- a/src/gulpin_shop.c
+++ b/src/gulpin_shop.c
@ -3,7 +3,8 @@
 #include "pokemon.h"
 #include "memory.h"
 #include "moves.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "input.h"
 #include "menu.h"
 #include "gulpin_shop.h"
--- a/src/gulpin_shop_1.c
+++ b/src/gulpin_shop_1.c
@ -6,6 +6,7 @@
 #include "file_system.h"
 #include "input.h"
 #include "text1.h"
+#include "text2.h"
 #include "team_inventory.h"
 #include "menu_input.h"
 #include "gulpin_shop.h"
--- a/src/hints_menu.c
+++ b/src/hints_menu.c
@ -1,6 +1,7 @@
 #include "global.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "input.h"
 #include "menu_input.h"

--- a/src/kangaskhan_storage.c
+++ b/src/kangaskhan_storage.c
@ -7,6 +7,8 @@
 #include "menu_input.h"
 #include "pokemon.h"
 #include "team_inventory.h"
+#include "text1.h"
+#include "text2.h"

 extern u8 gUnknown_202DE58[];
 extern u8 gUnknown_202E1C8[];
--- a/src/kecleon_bros.c
+++ b/src/kecleon_bros.c
@ -7,6 +7,8 @@
 #include "menu_input.h"
 #include "pokemon.h"
 #include "team_inventory.h"
+#include "text1.h"
+#include "text2.h"

 extern struct KecleonBrosWork *gKecleonBrosWork;
 extern struct unkStruct_203B214 *gUnknown_203B214;
--- a/src/load_screen.c
+++ b/src/load_screen.c
@ -6,7 +6,8 @@
 #include "file_system.h"
 #include "memory.h"
 #include "menu.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "text_util.h"
 #include "pokemon.h"
 #include "save.h"
--- a/src/luminous_cave.c
+++ b/src/luminous_cave.c
@ -7,7 +7,8 @@
 #include "menu.h"
 #include "pokemon.h"
 #include "random.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "text_util.h"
 #include "team_inventory.h"
 #include "menu_input.h"
--- a/src/mailbox.c
+++ b/src/mailbox.c
@ -1,6 +1,7 @@
 #include "global.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "menu.h"
 #include "input.h"
 #include "mailbox.h"
--- a/src/main.c
+++ b/src/main.c
@ -2,7 +2,7 @@
 #include "crt0.h"
 #include "random.h"
 #include "flash.h"
-#include "text.h"
+#include "text1.h"

 extern char ewram_start[];

--- a/src/main_menu.c
+++ b/src/main_menu.c
@ -1,5 +1,6 @@
 #include "global.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "menu.h"
 #include "input.h"
 #include "menu_input.h"
--- a/src/makuhita_dojo.c
+++ b/src/makuhita_dojo.c
@ -7,6 +7,8 @@
 #include "memory.h"
 #include "menu_input.h"
 #include "pokemon.h"
+#include "text1.h"
+#include "text2.h"

 extern u8 gUnknown_202E5D8[];
 extern u8 gUnknown_202E1C8[];
--- a/src/menu_input.c
+++ b/src/menu_input.c
@ -2,7 +2,7 @@
 #include "constants/colors.h"
 #include "constants/input.h"
 #include "menu.h"
-#include "text.h"
+#include "text2.h"
 #include "util.h"
 #include "code_800D090.h"
 #include "menu_input.h"
--- a/src/options_menu.c
+++ b/src/options_menu.c
@ -3,7 +3,8 @@
 #include "constants/colors.h"
 #include "input.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "game_options.h"
 #include "menu_input.h"

--- a/src/other_menus.c
+++ b/src/other_menus.c
@ -6,7 +6,7 @@
 #include "team_inventory.h"
 #include "menu.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
 #include "menu_input.h"
 #include "dungeon_global_data.h"
 #include "pokemon.h"
--- a/src/party_list_menu.c
+++ b/src/party_list_menu.c
@ -5,7 +5,8 @@
 #include "menu.h"
 #include "memory.h"
 #include "pokemon.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "text_util.h"
 #include "team_inventory.h"
 #include "constants/move.h"
--- a/src/pelipper_board.c
+++ b/src/pelipper_board.c
@ -3,7 +3,8 @@
 #include "pokemon.h"
 #include "item.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "menu.h"
 #include "input.h"
 #include "wonder_mail.h"
--- a/src/personality_test.c
+++ b/src/personality_test.c
@ -10,7 +10,8 @@
 #include "save.h"
 #include "memory.h"
 #include "game_options.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "text_util.h"
 #include "menu.h"
 #include "menu_input.h"
--- a/src/pokemon_news.c
+++ b/src/pokemon_news.c
@ -5,7 +5,8 @@
 #include "pokemon.h"
 #include "pokemon_mail.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "menu.h"
 #include "save.h"
 #include "menu_input.h"
--- a/src/post_office_guide.c
+++ b/src/post_office_guide.c
@ -5,7 +5,8 @@
 #include "constants/mailbox.h"
 #include "menu.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "wonder_mail.h"
 #include "code_800D090.h"
 #include "code_8094F88.h"
--- a/src/rescue_password_menu.c
+++ b/src/rescue_password_menu.c
@ -5,7 +5,8 @@
 #include "menu.h"
 #include "pokemon.h"
 #include "save.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "main_menu.h"
 #include "rescue_password_menu.h"
 #include "code_8094F88.h"
--- a/src/save_menu.c
+++ b/src/save_menu.c
@ -3,7 +3,7 @@
 #include "menu.h"
 #include "main_menu.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
 #include "save.h"
 #include "menu_input.h"

--- a/src/text1.c
+++ b/src/text1.c
@ -3,6 +3,7 @@
 #include "code_800558C.h"
 #include "code_800B540.h"
 #include "text1.h"
+#include "text2.h"

 EWRAM_DATA struct UnkTextStruct1 gUnknown_2027370[4];
 EWRAM_DATA u8 *gCharmaps[2];
--- a/src/text2.c
+++ b/src/text2.c
@ -1,4 +1,5 @@
 #include "global.h"
+#include "text1.h"
 #include "text2.h"

 // data.s
--- a/src/thank_you_wonder_mail.c
+++ b/src/thank_you_wonder_mail.c
@ -10,7 +10,8 @@
 #include "menu.h"
 #include "input.h"
 #include "rescue_password_menu.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "text_util.h"
 #include "team_inventory.h"
 #include "code_800D090.h"
--- a/src/trade_items_menu.c
+++ b/src/trade_items_menu.c
@ -9,7 +9,8 @@
 #include "save.h"
 #include "menu.h"
 #include "menu_input.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"

 EWRAM_DATA_2 struct TradeItemsMenu *gTradeItemsMenu = {0};

--- a/src/wigglytuff_shop.c
+++ b/src/wigglytuff_shop.c
@ -5,7 +5,8 @@
 #include "pokemon.h"
 #include "input.h"
 #include "team_inventory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "memory.h"
 #include "menu_input.h"
 #include "friend_area.h"
--- a/src/wonder_mail.c
+++ b/src/wonder_mail.c
@ -8,7 +8,8 @@
 #include "wonder_mail.h"
 #include "memory.h"
 #include "menu.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "team_inventory.h"
 #include "rescue_password_menu.h"
 #include "menu_input.h"
--- a/src/wonder_mail_2.c
+++ b/src/wonder_mail_2.c
@ -6,7 +6,7 @@
 #include "pokemon.h"
 #include "pokemon_mail.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
 #include "menu.h"
 #include "save.h"
 #include "game_options.h"
--- a/src/wonder_mail_2_1.c
+++ b/src/wonder_mail_2_1.c
@ -3,7 +3,8 @@
 #include "constants/mailbox.h"
 #include "input.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "menu.h"
 #include "code_802C39C.h"
 #include "menu_input.h"
--- a/src/wonder_mail_2_mid.c
+++ b/src/wonder_mail_2_mid.c
@ -4,6 +4,7 @@
 #include "code_800D090.h"
 #include "input.h"
 #include "memory.h"
+#include "text1.h"
 #include "text2.h"
 #include "pokemon_mail.h"
 #include "wonder_mail.h"
--- a/src/wonder_mail_3.c
+++ b/src/wonder_mail_3.c
@ -5,6 +5,7 @@

 #include "memory.h"
 #include "text1.h"
+#include "text2.h"
 #include "input.h"
 #include "mailbox.h"
 #include "menu.h"
--- a/src/wonder_mail_3_mid.c
+++ b/src/wonder_mail_3_mid.c
@ -1,7 +1,8 @@
 #include "global.h"
 #include "constants/input.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "input.h"
 #include "wonder_mail.h"
 #include "menu.h"
--- a/src/wonder_mail_4.c
+++ b/src/wonder_mail_4.c
@ -1,6 +1,7 @@
 #include "constants/input.h"
 #include "global.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "input.h"
 #include "memory.h"
 #include "item.h"
--- a/src/wonder_mail_5.c
+++ b/src/wonder_mail_5.c
@ -1,7 +1,8 @@
 #include "global.h"
 #include "constants/wonder_mail.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "input.h"
 #include "dungeon.h"
 #include "pokemon.h"
--- a/src/wonder_mail_802DF88.c
+++ b/src/wonder_mail_802DF88.c
@ -5,6 +5,8 @@
 #include "code_802C39C.h"
 #include "wonder_mail.h"
 #include "menu_input.h"
+#include "text1.h"
+#include "text2.h"

 struct unkStruct_203B2FC
 {
--- a/src/wonder_mail_main_menu.c
+++ b/src/wonder_mail_main_menu.c
@ -3,7 +3,8 @@
 #include "constants/communication_error_codes.h"
 #include "save.h"
 #include "memory.h"
-#include "text.h"
+#include "text1.h"
+#include "text2.h"
 #include "input.h"
 #include "wonder_mail.h"
 #include "menu.h"