From 60aa4e56a4b1773bdfae9039d55adc6bd99ad360 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sat, 28 Mar 2026 18:46:39 -0700 Subject: [PATCH] overlay 03 work --- asm/include/overlay_03_0233CA98.inc | 7 ++++ asm/overlay_03_0233CA98.s | 63 ----------------------------- include/overlay_03_0233CA80.h | 10 ++++- src/overlay_03_0233CA80.c | 32 ++++++++++++++- 4 files changed, 47 insertions(+), 65 deletions(-) diff --git a/asm/include/overlay_03_0233CA98.inc b/asm/include/overlay_03_0233CA98.inc index 4ebc975d..4bb5c449 100644 --- a/asm/include/overlay_03_0233CA98.inc +++ b/asm/include/overlay_03_0233CA98.inc @@ -117,6 +117,13 @@ .public ov01_02339988 .public ov01_0233C1B4 .public ov03_0233CA80 +.public ov03_0233CA98 +.public ov03_0233CAA8 +.public ov03_0233CAB8 +.public ov03_0233CAC8 +.public ov03_0233CAD8 +.public ov03_0233CAE8 +.public ov03_0233CAF8 .public ov03_02346738 .public ov03_0234673C .public ov03_0234674C diff --git a/asm/overlay_03_0233CA98.s b/asm/overlay_03_0233CA98.s index 5999061b..07a6032c 100644 --- a/asm/overlay_03_0233CA98.s +++ b/asm/overlay_03_0233CA98.s @@ -3,69 +3,6 @@ .text - arm_func_start ov03_0233CA98 -ov03_0233CA98: ; 0x0233CA98 - ldr r1, _0233CAA4 ; =ov03_02346BE0 - str r0, [r1] - bx lr - .align 2, 0 -_0233CAA4: .word ov03_02346BE0 - arm_func_end ov03_0233CA98 - - arm_func_start ov03_0233CAA8 -ov03_0233CAA8: ; 0x0233CAA8 - ldr r1, _0233CAB4 ; =ov03_02346BE0 - str r0, [r1, #4] - bx lr - .align 2, 0 -_0233CAB4: .word ov03_02346BE0 - arm_func_end ov03_0233CAA8 - - arm_func_start ov03_0233CAB8 -ov03_0233CAB8: ; 0x0233CAB8 - ldr r0, _0233CAC4 ; =ov03_02346BE0 - ldr r0, [r0, #4] - bx lr - .align 2, 0 -_0233CAC4: .word ov03_02346BE0 - arm_func_end ov03_0233CAB8 - - arm_func_start ov03_0233CAC8 -ov03_0233CAC8: ; 0x0233CAC8 - ldr r1, _0233CAD4 ; =ov03_02346BE0 - str r0, [r1, #8] - bx lr - .align 2, 0 -_0233CAD4: .word ov03_02346BE0 - arm_func_end ov03_0233CAC8 - - arm_func_start ov03_0233CAD8 -ov03_0233CAD8: ; 0x0233CAD8 - ldr r0, _0233CAE4 ; =ov03_02346BE0 - ldr r0, [r0, #8] - bx lr - .align 2, 0 -_0233CAE4: .word ov03_02346BE0 - arm_func_end ov03_0233CAD8 - - arm_func_start ov03_0233CAE8 -ov03_0233CAE8: ; 0x0233CAE8 - ldr r1, _0233CAF4 ; =ov03_02346BE0 - str r0, [r1, #0xc] - bx lr - .align 2, 0 -_0233CAF4: .word ov03_02346BE0 - arm_func_end ov03_0233CAE8 - - arm_func_start ov03_0233CAF8 -ov03_0233CAF8: ; 0x0233CAF8 - ldr r0, _0233CB04 ; =ov03_02346BE0 - ldr r0, [r0, #0xc] - bx lr - .align 2, 0 -_0233CB04: .word ov03_02346BE0 - arm_func_end ov03_0233CAF8 - arm_func_start ov03_0233CB08 ov03_0233CB08: ; 0x0233CB08 stmdb sp!, {r3, lr} diff --git a/include/overlay_03_0233CA80.h b/include/overlay_03_0233CA80.h index ae3adfb7..695257be 100644 --- a/include/overlay_03_0233CA80.h +++ b/include/overlay_03_0233CA80.h @@ -5,9 +5,17 @@ struct Overlay03Main { u32 unk0; u32 unk4; - u8 fill8[0x10 - 8]; + s32 unk8; + s32 unkC; }; void ov03_0233CA80(void); +void ov03_0233CA98(s32 arg0); +void ov03_0233CAA8(s32 arg0); +s32 ov03_0233CAB8(void); +void ov03_0233CAC8(s32 arg0); +s32 ov03_0233CAD8(void); +void ov03_0233CAE8(s32 arg0); +s32 ov03_0233CAF8(void); #endif //PMDSKY_OVERLAY_03_0233CA80_H diff --git a/src/overlay_03_0233CA80.c b/src/overlay_03_0233CA80.c index 443eb0e6..40ce441b 100644 --- a/src/overlay_03_0233CA80.c +++ b/src/overlay_03_0233CA80.c @@ -5,5 +5,35 @@ extern void MemZero(void* ptr, u32 len); struct Overlay03Main ov03_02346BE0; void ov03_0233CA80(void) { - MemZero(&ov03_02346BE0, 0x10); + MemZero(&ov03_02346BE0, sizeof(struct Overlay03Main)); } + +void ov03_0233CA98(s32 arg0) { + ov03_02346BE0.unk0 = arg0; +} + +void ov03_0233CAA8(s32 arg0) { + ov03_02346BE0.unk4 = arg0; +} + +s32 ov03_0233CAB8(void) { + return ov03_02346BE0.unk4; +} + +void ov03_0233CAC8(s32 arg0) { + ov03_02346BE0.unk8 = arg0; +} + +s32 ov03_0233CAD8(void) { + return ov03_02346BE0.unk8; +} + +void ov03_0233CAE8(s32 arg0) { + ov03_02346BE0.unkC = arg0; +} + +s32 ov03_0233CAF8(void) { + return ov03_02346BE0.unkC; +} + +