diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt index 54b7d4f..4e89f66 100644 --- a/linker_scripts/us/symbol_addrs.txt +++ b/linker_scripts/us/symbol_addrs.txt @@ -86,7 +86,7 @@ D_879060C4 = 0x879060C4; miniHudTransparency = 0x879060C8; gShowCPUProfiler = 0x80068BC0; gShowMEMProfiler = 0x80068BC4; -gDisplayListHead = 0x800A7420; +gDisplayListHead = 0x800A7420; // defined:true size:0x4 gMemPool = 0x800A6070; text_bss_VRAM = 0x8007ED80; gHeap = 0x80104BB0; @@ -247,7 +247,8 @@ D_87A01178 = 0x87A01178; D_87A01180 = 0x87A01180; D_87A01190 = 0x87A01190; D_87A011A4 = 0x87A011A4; -D_800A7428 = 0x800A7428; +D_800A7428 = 0x800A7428; // defined:true size:0x12 +D_800A7440 = 0x800A7440; // defined:true size:0x8 D_80079014 = 0x80079014; D_3004000 = 0x3004000; D_8780FCB8 = 0x8780FCB8; // size:0x20 diff --git a/src/6A40.c b/src/6A40.c index 5d5a097..3184570 100644 --- a/src/6A40.c +++ b/src/6A40.c @@ -1,15 +1,17 @@ #include "global.h" #include "6A40.h" -struct UnkStruct800A7428 { +typedef struct UnkStruct800A7428 { u32* unk0; u32* unk4; u32 unk8; s32 unkC; s16 unk10; -}; +} UnkStruct800A7428; // size = 0x12 -extern struct UnkStruct800A7428 D_800A7428; +Gfx* gDisplayListHead; +UnkStruct800A7428 D_800A7428; +unk_D_800A7440 D_800A7440; void func_80005EDC(void); diff --git a/src/profiler.c b/src/profiler.c index 9db1c35..4c05802 100644 --- a/src/profiler.c +++ b/src/profiler.c @@ -2,8 +2,6 @@ #include "profiler.h" #include "5580.h" -extern Gfx* gDisplayListHead; - struct Profiler gProfiler; /* diff --git a/yamls/us/rom.yaml b/yamls/us/rom.yaml index 0b490db..3e5d0f6 100644 --- a/yamls/us/rom.yaml +++ b/yamls/us/rom.yaml @@ -504,7 +504,7 @@ - {vram: 0x800A62E0, type: .bss, name: 5580} - {vram: 0x800A6D20, type: .bss, name: reset} - {vram: 0x800A7320, type: .bss, name: controller} - - {vram: 0x800A7420, type: bss, name: unk_bss_3} # 6A40 + - {vram: 0x800A7420, type: .bss, name: 6A40} - {vram: 0x800A7450, type: .bss, name: stage_loader} - {vram: 0x800A74C0, type: .bss, name: crash_screen} - {vram: 0x800A7EA0, type: .bss, name: profiler}