diff --git a/asm/include/overlay_29_0234CA7C.inc b/asm/include/overlay_29_0234CA84.inc similarity index 100% rename from asm/include/overlay_29_0234CA7C.inc rename to asm/include/overlay_29_0234CA84.inc diff --git a/asm/overlay_29_0234CA7C.s b/asm/overlay_29_0234CA84.s similarity index 99% rename from asm/overlay_29_0234CA7C.s rename to asm/overlay_29_0234CA84.s index a64bec41..8f4229af 100644 --- a/asm/overlay_29_0234CA7C.s +++ b/asm/overlay_29_0234CA84.s @@ -1,14 +1,8 @@ .include "asm/macros.inc" - .include "overlay_29_0234CA7C.inc" + .include "overlay_29_0234CA84.inc" .text - arm_func_start ov29_0234CA7C -ov29_0234CA7C: ; 0x0234CA7C - mov r0, #0x5800 - bx lr - arm_func_end ov29_0234CA7C - arm_func_start ov29_0234CA84 ov29_0234CA84: ; 0x0234CA84 stmdb sp!, {r3, lr} diff --git a/include/overlay_29_0234CA68.h b/include/overlay_29_0234CA68.h index 4aea2cf3..e0c77d33 100644 --- a/include/overlay_29_0234CA68.h +++ b/include/overlay_29_0234CA68.h @@ -2,5 +2,6 @@ #define PMDSKY_OVERLAY_29_0234CA68_H s32 ov29_0234CA68(); +s32 ov29_0234CA7C(); #endif //PMDSKY_OVERLAY_29_0234CA68_H diff --git a/main.lsf b/main.lsf index 2ebb0fcd..369070da 100644 --- a/main.lsf +++ b/main.lsf @@ -484,7 +484,7 @@ Overlay OVY_29 Object src/overlay_29_0234BBE8.o Object asm/overlay_29_0234BEE0.o Object src/overlay_29_0234CA68.o - Object asm/overlay_29_0234CA7C.o + Object asm/overlay_29_0234CA84.o Object src/overlay_29_0234D460.o Object asm/overlay_29_0234D484.o Object src/overlay_29_0234DDD0.o diff --git a/src/overlay_29_0234BBE8.c b/src/overlay_29_0234BBE8.c index 9742ea03..c7945b9e 100644 --- a/src/overlay_29_0234BBE8.c +++ b/src/overlay_29_0234BBE8.c @@ -19,7 +19,6 @@ typedef struct { extern unk_ov29_023537D8_t ov29_023537D8; void ov29_022DEBA4(); // thunk_FUN_022deadc void ov29_0234CB00(); -s32 ov29_0234CA7C(); bool8 sub_0204AFF8(); // is GAME_MODE rescue? void ov30_02382820(s32, s32, s32); s32 ov30_02382874(); diff --git a/src/overlay_29_0234CA68.c b/src/overlay_29_0234CA68.c index c125123f..79341473 100644 --- a/src/overlay_29_0234CA68.c +++ b/src/overlay_29_0234CA68.c @@ -6,3 +6,8 @@ s32 ov29_0234CA68() { return ov29_023537E4[1]; } + +s32 ov29_0234CA7C() +{ + return 0x5800; +}