diff --git a/asm/include/overlay_31002382E08.inc b/asm/include/overlay_31002382E18.inc similarity index 99% rename from asm/include/overlay_31002382E08.inc rename to asm/include/overlay_31002382E18.inc index 651bf48e..dd021603 100644 --- a/asm/include/overlay_31002382E08.inc +++ b/asm/include/overlay_31002382E18.inc @@ -119,7 +119,6 @@ .public MemZero .public MonsterHasEmbargoStatus .public OVERLAY31_JP_STRING -.public OVERLAY31_UNKNOWN_POINTER__NA_238A260 .public OVERLAY31_UNKNOWN_POINTER__NA_238A268 .public OVERLAY31_UNKNOWN_POINTER__NA_238A26C .public OVERLAY31_UNKNOWN_POINTER__NA_238A270 diff --git a/asm/overlay_31002382E08.s b/asm/overlay_31002382E18.s similarity index 99% rename from asm/overlay_31002382E08.s rename to asm/overlay_31002382E18.s index 776d4f87..15c5f8fa 100644 --- a/asm/overlay_31002382E08.s +++ b/asm/overlay_31002382E18.s @@ -1,17 +1,8 @@ .include "asm/macros.inc" - .include "overlay_31002382E08.inc" + .include "overlay_31002382E18.inc" .text - arm_func_start ov31_02382E08 -ov31_02382E08: ; 0x02382E08 - ldr r0, _02382E14 ; =OVERLAY31_UNKNOWN_POINTER__NA_238A260 - ldr r0, [r0, #4] - bx lr - .align 2, 0 -_02382E14: .word OVERLAY31_UNKNOWN_POINTER__NA_238A260 - arm_func_end ov31_02382E08 - arm_func_start ov31_02382E18 ov31_02382E18: ; 0x02382E18 stmdb sp!, {r4, r5, r6, r7, r8, lr} diff --git a/include/overlay_3102382820.h b/include/overlay_3102382820.h index 0efa2136..ba36917d 100644 --- a/include/overlay_3102382820.h +++ b/include/overlay_3102382820.h @@ -50,6 +50,7 @@ struct struct_2 { #define OV31_02382B54_CONST_1 (0x00000233) u32 ov31_02382B54(void); void ov31_02382DAC(void); +struct struct_1* ov31_02382E08(void); diff --git a/main.lsf b/main.lsf index 227c3c1f..bf14662d 100644 --- a/main.lsf +++ b/main.lsf @@ -306,7 +306,7 @@ Overlay OVY_31 { After OVY_29 Object src/overlay_3102382820.o - Object asm/overlay_31002382E08.o + Object asm/overlay_31002382E18.o } Overlay OVY_32 { diff --git a/src/overlay_3102382820.c b/src/overlay_3102382820.c index 70ee4b68..39cdec65 100644 --- a/src/overlay_3102382820.c +++ b/src/overlay_3102382820.c @@ -227,3 +227,8 @@ void ov31_02382DAC(void) MemFree(OVERLAY31_UNKNOWN_POINTER__NA_238A260[0]); OVERLAY31_UNKNOWN_POINTER__NA_238A260[0] = NULL; } + +struct struct_1* ov31_02382E08(void) +{ + return OVERLAY31_UNKNOWN_POINTER__NA_238A260[1]; +}