diff --git a/include/code_8098BDC.h b/include/code_8098BDC.h deleted file mode 100644 index d08b6a0d3..000000000 --- a/include/code_8098BDC.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef GUARD_CODE_8098BDC_H -#define GUARD_CODE_8098BDC_H - -// code_8098DBC.s -extern void nullsub_104(void); - -#endif // GUARD_CODE_8098BDC_H diff --git a/include/unk_ds_only_feature.h b/include/unk_ds_only_feature.h new file mode 100644 index 000000000..92353f8f8 --- /dev/null +++ b/include/unk_ds_only_feature.h @@ -0,0 +1,19 @@ +#ifndef GUARD_UNK_DS_ONLY_FEATURE_H +#define GUARD_UNK_DS_ONLY_FEATURE_H + +void sub_809C5C4(void); +void sub_809C618(void); +void sub_809C63C(void); +void sub_809C658(void); +void sub_809C6CC(u16 param_1); +void sub_809C6EC(void); +bool8 sub_809C730(void); +bool8 sub_809C740(void); +void nullsub_104(void); +void sub_809C760(void); +void sub_809C770(s16 mapId_, s16 groundPlaceId_); +void nullsub_105(void); +void sub_809CA20(void); +void nullsub_106(void); + +#endif diff --git a/ld_script.ld b/ld_script.ld index 366847cf5..5c7257704 100755 --- a/ld_script.ld +++ b/ld_script.ld @@ -337,7 +337,7 @@ SECTIONS { src/code_8099360.o(.text); src/palette_util.o(.text); src/code_809A560.o(.text); - src/code_809C5C4.o(.text); + src/unk_ds_only_feature.o(.text); src/script_item.o(.text); src/ground_lives_helper.o(.text); src/code_809D148.o(.text); @@ -721,7 +721,7 @@ SECTIONS { src/code_8099360.o(.rodata); src/palette_util.o(.rodata); src/code_809A560.o(.rodata); - src/code_809C5C4.o(.rodata); + src/unk_ds_only_feature.o(.rodata); src/script_item.o(.rodata); src/ground_lives_helper.o(.rodata); src/code_809D148.o(.rodata); diff --git a/src/code_80227B8.c b/src/code_80227B8.c index 2addcc82f..e011730df 100644 --- a/src/code_80227B8.c +++ b/src/code_80227B8.c @@ -5,7 +5,6 @@ #include "code_801AFA4.h" #include "code_801B3C0.h" #include "code_80227B8.h" -#include "code_8098BDC.h" #include "code_8099360.h" #include "common_strings.h" #include "input.h" @@ -15,6 +14,7 @@ #include "pokemon_3.h" #include "string_format.h" #include "text_1.h" +#include "unk_ds_only_feature.h" EWRAM_INIT static unkStruct_203B294 *sUnknown_203B294 = {NULL}; diff --git a/src/friend_area_action_menu.c b/src/friend_area_action_menu.c index b30b1c90c..994751697 100644 --- a/src/friend_area_action_menu.c +++ b/src/friend_area_action_menu.c @@ -6,7 +6,6 @@ #include "code_801EE10_mid.h" #include "friend_list.h" #include "code_8024458.h" -#include "code_8098BDC.h" #include "code_8099360.h" #include "common_strings.h" #include "event_flag.h" @@ -24,6 +23,7 @@ #include "string_format.h" #include "text_1.h" #include "text_2.h" +#include "unk_ds_only_feature.h" static EWRAM_INIT struct unkStruct_203B2BC *sUnknown_203B2BC = {NULL}; diff --git a/src/friend_list_menu.c b/src/friend_list_menu.c index f7a3ca671..1d2f0e031 100644 --- a/src/friend_list_menu.c +++ b/src/friend_list_menu.c @@ -8,7 +8,6 @@ #include "code_801EE10_mid.h" #include "friend_list.h" #include "code_8024458.h" -#include "code_8098BDC.h" #include "code_8099360.h" #include "common_strings.h" #include "event_flag.h" @@ -26,6 +25,7 @@ #include "string_format.h" #include "text_1.h" #include "text_2.h" +#include "unk_ds_only_feature.h" EWRAM_INIT unkStruct_203B2B4 *gUnknown_203B2B4 = {NULL}; diff --git a/src/ground_main.c b/src/ground_main.c index 6304c1615..0861bd24b 100644 --- a/src/ground_main.c +++ b/src/ground_main.c @@ -20,6 +20,7 @@ #include "ground_map_conversion_table.h" #include "ground_lives_helper.h" #include "script_item.h" +#include "unk_ds_only_feature.h" EWRAM_DATA u32 gUnknown_20398A8 = {0}; EWRAM_DATA s32 gUnknown_20398AC = {0}; @@ -54,7 +55,6 @@ extern void sub_80A73EC(); extern void sub_8098CC8(); extern void ClearAllItems_8091FB4(); -extern u8 sub_809C730(); extern void sub_8095494(DungeonMailSeed *param_1, u8 index); extern u16 gUnknown_2026E4E; @@ -67,7 +67,6 @@ extern void sub_809A71C(s32); extern bool8 sub_809AFAC(void); extern bool8 sub_80048BC(void); extern u8 sub_80023E4(u32); -extern bool8 sub_809C740(void); extern bool8 sub_8099B94(void); extern void FreeGroundMapAction(void); extern void FreeGroundLives(void); @@ -75,7 +74,6 @@ extern void FreeGroundObjects(void); extern void FreeGroundEffects(void); extern void FreeGroundEvents(void); extern void sub_809A610(void); -extern void sub_809C618(void); extern void sub_80A658C(void); extern void sub_809D508(void); extern void sub_80A7754(void); @@ -88,7 +86,6 @@ extern void sub_809D0AC(void); extern void sub_80A7744(void); extern void sub_809D490(void); extern void sub_80A62F0(void); -extern void sub_809C5C4(void); extern void sub_809A560(void); extern void AllocGroundMapAction(void); extern void AllocGroundEvents(void); @@ -100,13 +97,11 @@ extern void nullsub_124(void); extern void GroundLives_Action(void); extern void GroundObject_Action(void); extern void GroundEffect_Action(void); -extern void nullsub_105(void); extern void sub_809B474(void); extern void GroundScript_Unlock(); extern void sub_809D25C(void); extern void sub_80A59DC(void); extern void sub_809B614(void); -extern void sub_809CA20(void); extern void sub_80A6E80(void); extern void sub_8099BE4(void); extern void sub_8099744(void); @@ -115,17 +110,14 @@ extern void LoadBufferedInputs(void); extern void nullsub_120(void); extern void sub_80A5E70(void); extern void sub_809B638(void); -extern void nullsub_106(void); extern void sub_80A73EC(void); extern void sub_8099750(void); -extern void DoScheduledMemCopies(void); extern void GroundMap_Reset(void); extern void sub_809D0BC(void); extern void DeleteGroundEvents(void); extern void DeleteGroundLives(void); extern void DeleteGroundObjects(void); extern void DeleteGroundEffects(void); -extern void sub_809C658(void); extern void nullsub_16(void); extern void UpdateAdventureAchievements(void); extern void xxx_call_update_bg_sound_input(void); @@ -141,7 +133,6 @@ extern void sub_8001D88(void); extern u32 GroundMainGameCancelRequest(u32 r0); extern void sub_80999D4(s32); extern void sub_809D4B0(void); -extern void sub_809C63C(void); extern void sub_8005838(s32, s32); u32 xxx_script_related_8098468(s32 param_1) diff --git a/src/ground_script.c b/src/ground_script.c index 1c810971d..33cf56af2 100644 --- a/src/ground_script.c +++ b/src/ground_script.c @@ -14,7 +14,6 @@ #include "code_80972F4.h" #include "code_8097670.h" #include "code_80A26CC.h" -#include "code_8098BDC.h" #include "debug.h" #include "dungeon_info.h" #include "event_flag.h" @@ -49,6 +48,7 @@ #include "friend_area_dialogue.h" #include "structs/str_dungeon_setup.h" #include "ground_map_conversion_table.h" +#include "unk_ds_only_feature.h" void GroundMap_Select(s16); void GroundMap_SelectDungeon(s32, DungeonLocation*, u32); @@ -97,7 +97,6 @@ void sub_809AFC8(bool8, s32, s32, const char*); u32 sub_809B028(const MenuItem *, s32 a1_, s32 a2, s32 a3, s32 a4_, const char *text); bool8 sub_809B1C0(s32, s32, char[12]); void sub_809B1D4(u8, s32, s32, const char*); -void sub_809C770(s16, s16); void sub_809D0BC(void); void sub_809D124(s32, s32, s32); void sub_809D158(s32, PixelPos*); @@ -172,9 +171,6 @@ void sub_80A8F50(const u8 *buffer, s32, s32 size); void sub_80A56A0(s32, s32); void sub_80A56F0(s32 *); void sub_80A5704(s32 *); -void sub_809C760(void); -void sub_809C6EC(void); -void sub_809C6CC(u16 param_1); void sub_80A86C8(s16, s32); void sub_80AC1B0(s16, s32); void sub_80AD0C8(s16, s32); diff --git a/src/luminous_cave.c b/src/luminous_cave.c index 24cf6abfd..737803593 100644 --- a/src/luminous_cave.c +++ b/src/luminous_cave.c @@ -7,7 +7,6 @@ #include "code_801602C.h" #include "code_801B3C0.h" #include "code_8097670.h" -#include "code_8098BDC.h" #include "code_8099360.h" #include "common_strings.h" #include "input.h" @@ -21,6 +20,7 @@ #include "text_1.h" #include "text_util.h" #include "pokemon_evolution.h" +#include "unk_ds_only_feature.h" enum { diff --git a/src/party_list_menu.c b/src/party_list_menu.c index 074cd5363..e8688a609 100644 --- a/src/party_list_menu.c +++ b/src/party_list_menu.c @@ -8,7 +8,6 @@ #include "code_801EE10_mid.h" #include "code_80227B8.h" #include "code_8024458.h" -#include "code_8098BDC.h" #include "code_8099360.h" #include "common_strings.h" #include "event_flag.h" @@ -27,6 +26,7 @@ #include "text_2.h" #include "text_3.h" #include "text_util.h" +#include "unk_ds_only_feature.h" static EWRAM_INIT unkStruct_203B2B8 *sUnknown_203B2B8 = {NULL}; diff --git a/src/code_809C5C4.c b/src/unk_ds_only_feature.c similarity index 98% rename from src/code_809C5C4.c rename to src/unk_ds_only_feature.c index b092846ed..3f400b690 100644 --- a/src/code_809C5C4.c +++ b/src/unk_ds_only_feature.c @@ -1,5 +1,6 @@ #include "global.h" #include "globaldata.h" +#include "unk_ds_only_feature.h" #include "memory.h" #include "game_options.h" #include "event_flag.h" @@ -9,7 +10,7 @@ #include "constants/ground_map.h" #include "constants/friend_area.h" -// This file effectively does nothing on GBA. +// This file effectively does nothing on GBA. If I were to guess I'd say it's bottom/top screen related. struct unkStruct_3001B68 { @@ -33,9 +34,6 @@ static IWRAM_INIT struct unkStruct_3001B68 *sUnknown_3001B68 = {NULL}; UNUSED static const u8 sUnused[4] = {0}; -bool8 sub_809C740(void); -void sub_809C63C(void); - static void nullsub_107(); static void nullsub_108(); static void nullsub_109(); @@ -84,7 +82,7 @@ void sub_809C63C(void) void sub_809C658(void) { - switch(sUnknown_3001B68->unkA) { + switch (sUnknown_3001B68->unkA) { case 3: nullsub_111(); nullsub_112(); diff --git a/sym_ewram.txt b/sym_ewram.txt index 8cc8e5b60..e7b453f13 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -81,7 +81,6 @@ .space 4 .include "src/palette_util.o" .include "src/code_809A560.o" - .include "src/code_809C5C4.o" .include "src/script_item.o" .space 4 .include "src/code_809D148.o" diff --git a/sym_iwram_init.txt b/sym_iwram_init.txt index 1af424969..94ec0d6b8 100644 --- a/sym_iwram_init.txt +++ b/sym_iwram_init.txt @@ -4,7 +4,7 @@ .include "src/code_8023144.o" .include "src/friend_list.o" .include "src/code_809A560.o" -.include "src/code_809C5C4.o" +.include "src/unk_ds_only_feature.o" .include "src/ground_map.o" .include "src/ground_map_2.o" .include "src/ground_sprite.o"