Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-07-19 01:11:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

move data to code_803D110

Browse Source
This commit is contained in:
DizzyEggg 2025-04-03 23:24:28 +02:00
parent f21d2f20fd
commit 537828bb99
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/data_80F4D44.s
View File

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

3
ld_script.txt
View File

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

7
src/code_803D110.c
View File

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

2
src/code_803DA7C.c
View File

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