diff --git a/ld_script.txt b/ld_script.txt index 9767d0d50..907f33151 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -199,8 +199,7 @@ SECTIONS { src/code_803D110.o(.text); src/code_803DA7C.o(.text); src/dungeon_vram.o(.text); - src/code_803E724.o(.text); - src/code_8040094.o(.text); + src/dungeon_tilemap.o(.text); src/dungeon_map.o(.text); src/code_8040094_1.o(.text); src/code_8041AD0.o(.text); @@ -558,7 +557,7 @@ SECTIONS { data/data_80F59C8_1.o(.rodata); src/code_803DA7C.o(.rodata); src/dungeon_vram.o(.rodata); - src/code_803E724.o(.rodata); + src/dungeon_tilemap.o(.rodata); src/dungeon_map.o(.rodata); src/code_8040094_1.o(.rodata); data/pksdir_0.o(.rodata); diff --git a/src/code_8040094.c b/src/code_8040094.c deleted file mode 100644 index 78363a13a..000000000 --- a/src/code_8040094.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "global.h" -#include "structs/dungeon_entity.h" -#include "structs/str_dungeon.h" - - - - - -// Luminous Orb??? - diff --git a/src/code_803E724.c b/src/dungeon_tilemap.c similarity index 99% rename from src/code_803E724.c rename to src/dungeon_tilemap.c index 85073d082..da8ac9eb7 100644 --- a/src/code_803E724.c +++ b/src/dungeon_tilemap.c @@ -32,7 +32,6 @@ #include "code_80118A4.h" #include "dungeon_strings.h" -extern u32 gUnknown_202EDFC; extern s32 gDungeonFramesCounter; extern void ShowWholeRevealedDungeonMap(void); @@ -50,6 +49,8 @@ void sub_803FB74(void); void sub_803FE30(s32 a0, u16 *a1, bool8 a2, bool8 a3); void sub_803FF18(s32 a0, u16 *a1, bool8 a2); +static EWRAM_DATA u32 gUnknown_202EDFC = 0; + void sub_803F27C(bool8 a0) { UnkDungeonGlobal_unk181E8_sub *strPtr = &gDungeon->unk181e8; diff --git a/src/dungeon_vram.c b/src/dungeon_vram.c index 6f1ad0f43..cd749cc00 100644 --- a/src/dungeon_vram.c +++ b/src/dungeon_vram.c @@ -44,7 +44,6 @@ extern struct DungeonPalFile *gDungeonNameBannerPalette; extern struct DungeonPalFile *gUnknown_202EC94; extern RGB gUnknown_202ECA4[]; extern MenuInputStruct gDungeonMenu; -extern SpriteOAM gUnknown_202EDDC; extern OpenedFile *gUnknown_202EC9C; void xxx_draw_string_80524F0(void); @@ -72,6 +71,9 @@ EWRAM_DATA s32 gDungeonFramesCounter = 0; EWRAM_DATA s32 gUnknown_202EDD0 = 0; EWRAM_DATA s32 gUnknown_202EDD4 = 0; EWRAM_DATA s32 gUnknown_202EDD8 = 0; +static EWRAM_DATA SpriteOAM gUnknown_202EDDC = {0}; +UNUSED static EWRAM_DATA s32 sUnused = 0; +EWRAM_DATA struct UnkStruct_202EDE8 gUnknown_202EDE8 = {0}; EWRAM_INIT u8 gUnknown_203B40C = 0; EWRAM_INIT u8 gUnknown_203B40D = 0; diff --git a/sym_ewram.txt b/sym_ewram.txt index 5c692c7e7..5ce6c959c 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -63,14 +63,7 @@ gUnknown_202DCF8: /* 202DCF8 (sub_80001E8 - sub_800D9B8) */ .include "src/rescue_password_menu.o" .include "src/code_803DA7C.o" .include "src/dungeon_vram.o" - -gUnknown_202EDDC: /* 202EDDC (sub_803EDF0) */ - .space 0xC -gUnknown_202EDE8: /* 202EDE8 (sub_803E250 - sub_803EDF0) */ - .space 0x14 -gUnknown_202EDFC: /* 202EDFC (sub_803F27C - sub_803F878) */ - .space 0x4 - + .include "src/dungeon_tilemap.o" .include "src/dungeon_map.o" .include "src/dungeon_engine.o" .include "src/dungeon_action.o" diff --git a/sym_iwram.txt b/sym_iwram.txt index a98bce035..33f4c290b 100644 --- a/sym_iwram.txt +++ b/sym_iwram.txt @@ -8,5 +8,5 @@ gUnknown_3000C00: /* 3000C00 */ .include "src/text_1.o" .include "src/music.o" -.include "src/code_803E724.o" +.include "src/dungeon_tilemap.o" .include "src/random_mersenne_twister.o"