diff --git a/data/data_80F4D44.s b/data/data_80F4D44.s deleted file mode 100644 index dae085b27..000000000 --- a/data/data_80F4D44.s +++ /dev/null @@ -1,11 +0,0 @@ - .section .rodata - -.align 2,0 - .string "pksdir0\0" - .align 2,0 - - .global gUnknown_80F4D8C -gUnknown_80F4D8C: @ 80F4D8C - @ replacing .incbin "baserom.gba", 0x000f4d8c, 0x14 - .string "mapparam\0" - .align 2,0 diff --git a/ld_script.txt b/ld_script.txt index 492ba67ce..7fc190f1e 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -554,10 +554,9 @@ SECTIONS { src/personality_test2.o(.rodata); src/code_803D0D8.o(.rodata); src/dungeon_pos_data.o(.rodata); - data/data_80F4D44.o(.rodata); + src/code_803D110.o(.rodata); src/dungeon_config.o(.rodata); data/data_80F59C8_1.o(.rodata); - src/code_803D110.o(.rodata); src/code_803DA7C.o(.rodata); data/data_80F59C8_3.o(.rodata); src/code_803E724.o(.rodata); diff --git a/src/code_803D110.c b/src/code_803D110.c index 4a89b619b..08c6a6321 100644 --- a/src/code_803D110.c +++ b/src/code_803D110.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "constants/dungeon.h" #include "structs/str_202ED28.h" #include "structs/str_202EDE8.h" @@ -19,11 +20,11 @@ #include "text_3.h" #include "dungeon_config.h" +// File split is correct. + extern s32 sub_80902C8(u8 dungeon); extern void sub_808E9C4(UnkDungeonGlobal_unk1CD98 *r0, s16 r1); -extern const char gUnknown_80F4D8C[]; // "mapparam" - struct UnkDungeonFileData { s16 unk0; @@ -59,7 +60,7 @@ void sub_803D4D0(void) return; gDungeon->unk1C570 = gDungeon->unk644.dungeonLocation2; - file = OpenFileAndGetFileDataPtr(gUnknown_80F4D8C, &gDungeonFileArchive); + file = OpenFileAndGetFileDataPtr("mapparam", &gDungeonFileArchive); strPtr = &((struct UnkDataFileStruct *)(file->data))->unk0[gDungeon->unk1C570.id][gDungeon->unk1C570.floor]; gDungeon->unk1CEC8 = GetDungeonFloorCount(gDungeon->unk644.dungeonLocation.id); diff --git a/src/code_803DA7C.c b/src/code_803DA7C.c index 617df7a0b..15974c1c1 100644 --- a/src/code_803DA7C.c +++ b/src/code_803DA7C.c @@ -19,6 +19,8 @@ #include "text_3.h" #include "dungeon_config.h" +// File split could be wrong here. Todo. + extern bool8 sub_80848EC(void); extern u8 GetFloorType(void); extern const u8 *GetDungeonName2(u8 dungeon);