diff --git a/asm/include/overlay_03.inc b/asm/include/overlay_03_0233CA98.inc similarity index 80% rename from asm/include/overlay_03.inc rename to asm/include/overlay_03_0233CA98.inc index dc679ae0..f596e9f6 100644 --- a/asm/include/overlay_03.inc +++ b/asm/include/overlay_03_0233CA98.inc @@ -1,6 +1,4 @@ #pragma once -.public _ll_udiv -.public _ull_mod .public AddItemToStorage .public CanSendItem .public CloseAdvancedMenu @@ -43,10 +41,21 @@ .public ItemZInit .public LoadFileFromRom .public MemAlloc -.public MemcpySimple .public MemFree .public MemZero +.public MemcpySimple .public NoteSaveBase +.public PlaySeVolumeWrapper +.public PrintIqSkillsMenu +.public RandInt +.public SetQuestionMarks +.public ShowKeyboard +.public StrcpyName +.public StringFromId +.public StrncpySimpleNoPadSafe +.public UnloadFile +.public _ll_udiv +.public _ull_mod .public ov00_022BCA80 .public ov00_022BCBAC .public ov00_022BCCF4 @@ -113,14 +122,66 @@ .public ov01_023398B0 .public ov01_02339988 .public ov01_0233C1B4 -.public PlaySeVolumeWrapper -.public PrintIqSkillsMenu -.public RandInt -.public SetQuestionMarks -.public ShowKeyboard -.public StrcpyName -.public StringFromId -.public StrncpySimpleNoPadSafe +.public ov03_0233CA80 +.public ov03_02346738 +.public ov03_0234673C +.public ov03_0234674C +.public ov03_0234675C +.public ov03_02346774 +.public ov03_0234678C +.public ov03_023467A4 +.public ov03_023467BC +.public ov03_023467C0 +.public ov03_023467D4 +.public ov03_023467EC +.public ov03_02346804 +.public ov03_02346824 +.public ov03_02346844 +.public ov03_02346848 +.public ov03_02346864 +.public ov03_02346884 +.public ov03_023468A4 +.public ov03_023468C4 +.public ov03_023468E4 +.public ov03_023468E8 +.public ov03_02346904 +.public ov03_02346908 +.public ov03_0234692C +.public ov03_02346930 +.public ov03_02346954 +.public ov03_02346958 +.public ov03_0234697C +.public ov03_023469A4 +.public ov03_023469A8 +.public ov03_023469D4 +.public ov03_023469D8 +.public ov03_02346A04 +.public ov03_02346A34 +.public ov03_02346A38 +.public ov03_02346A64 +.public ov03_02346A68 +.public ov03_02346A6C +.public ov03_02346A84 +.public ov03_02346A90 +.public ov03_02346A9C +.public ov03_02346AAC +.public ov03_02346ABC +.public ov03_02346AC8 +.public ov03_02346AD8 +.public ov03_02346AE8 +.public ov03_02346AF8 +.public ov03_02346B20 +.public ov03_02346BB8 +.public ov03_02346BBC +.public ov03_02346BC0 +.public ov03_02346BC4 +.public ov03_02346BC8 +.public ov03_02346BCC +.public ov03_02346BD4 +.public ov03_02346BD8 +.public ov03_02346BDC +.public ov03_02346BE0 +.public ov03_02346BF0 .public sub_02003B94 .public sub_02003BC8 .public sub_02003BFC @@ -243,4 +304,3 @@ .public sub_020698B8 .public sub_02069904 .public sub_02069940 -.public UnloadFile diff --git a/asm/overlay_03.s b/asm/overlay_03_0233CA98.s similarity index 99% rename from asm/overlay_03.s rename to asm/overlay_03_0233CA98.s index 17c30178..44f171ff 100644 --- a/asm/overlay_03.s +++ b/asm/overlay_03_0233CA98.s @@ -1,19 +1,8 @@ .include "asm/macros.inc" - .include "overlay_03.inc" + .include "overlay_03_0233CA98.inc" .text - arm_func_start ov03_0233CA80 -ov03_0233CA80: ; 0x0233CA80 - ldr ip, _0233CA90 ; =MemZero - ldr r0, _0233CA94 ; =ov03_02346BE0 - mov r1, #0x10 - bx ip - .align 2, 0 -_0233CA90: .word MemZero -_0233CA94: .word ov03_02346BE0 - arm_func_end ov03_0233CA80 - arm_func_start ov03_0233CA98 ov03_0233CA98: ; 0x0233CA98 ldr r1, _0233CAA4 ; =ov03_02346BE0 @@ -11773,9 +11762,6 @@ ov03_02346BDC: .byte 0x00, 0x00, 0x00, 0x00 .bss - .global ov03_02346BE0 -ov03_02346BE0: - .space 0x10 .global ov03_02346BF0 ov03_02346BF0: .space 0x10 diff --git a/include/overlay_03_0233CA80.h b/include/overlay_03_0233CA80.h new file mode 100644 index 00000000..ae3adfb7 --- /dev/null +++ b/include/overlay_03_0233CA80.h @@ -0,0 +1,13 @@ +#ifndef PMDSKY_OVERLAY_03_0233CA80_H +#define PMDSKY_OVERLAY_03_0233CA80_H + +struct Overlay03Main +{ + u32 unk0; + u32 unk4; + u8 fill8[0x10 - 8]; +}; + +void ov03_0233CA80(void); + +#endif //PMDSKY_OVERLAY_03_0233CA80_H diff --git a/main.lsf b/main.lsf index 4a1e9163..38e88d1b 100644 --- a/main.lsf +++ b/main.lsf @@ -73,7 +73,8 @@ Overlay OVY_2 Overlay OVY_3 { After OVY_1 - Object asm/overlay_03.o + Object src/overlay_03_0233CA80.o + Object asm/overlay_03_0233CA98.o } Overlay OVY_4 { diff --git a/src/overlay_03_0233CA80.c b/src/overlay_03_0233CA80.c new file mode 100644 index 00000000..443eb0e6 --- /dev/null +++ b/src/overlay_03_0233CA80.c @@ -0,0 +1,9 @@ +#include "overlay_03_0233CA80.h" + +extern void MemZero(void* ptr, u32 len); + +struct Overlay03Main ov03_02346BE0; + +void ov03_0233CA80(void) { + MemZero(&ov03_02346BE0, 0x10); +}