From baf230b25d461185c115bb7c5fa90d595c1cbaf6 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Thu, 19 Mar 2026 21:55:34 -0400 Subject: [PATCH] Decomped sub_0205E970 Decomped by @slaw-22 --- asm/include/{main_0205E970.inc => main_0205E984.inc} | 1 + asm/{main_0205E970.s => main_0205E984.s} | 12 +----------- include/main_0205E954.h | 1 + main.lsf | 2 +- src/main_0205E954.c | 5 +++++ 5 files changed, 9 insertions(+), 12 deletions(-) rename asm/include/{main_0205E970.inc => main_0205E984.inc} (99%) rename asm/{main_0205E970.s => main_0205E984.s} (99%) diff --git a/asm/include/main_0205E970.inc b/asm/include/main_0205E984.inc similarity index 99% rename from asm/include/main_0205E970.inc rename to asm/include/main_0205E984.inc index fe475ca5..d833c3b9 100644 --- a/asm/include/main_0205E970.inc +++ b/asm/include/main_0205E984.inc @@ -349,4 +349,5 @@ .public sub_0205E48C .public sub_0205E50C .public sub_0205E954 +.public sub_0205E970 .public vsprintf diff --git a/asm/main_0205E970.s b/asm/main_0205E984.s similarity index 99% rename from asm/main_0205E970.s rename to asm/main_0205E984.s index 115e2c9b..1c9207cd 100644 --- a/asm/main_0205E970.s +++ b/asm/main_0205E984.s @@ -1,18 +1,8 @@ .include "asm/macros.inc" - .include "main_0205E970.inc" + .include "main_0205E984.inc" .text - arm_func_start sub_0205E970 -sub_0205E970: ; 0x0205E970 - ldr r1, _0205E980 ; =MISSION_DELIVER_LIST_PTR - ldr r1, [r1, #0x18] - add r0, r1, r0, lsl #5 - bx lr - .align 2, 0 -_0205E980: .word MISSION_DELIVER_LIST_PTR - arm_func_end sub_0205E970 - arm_func_start sub_0205E984 sub_0205E984: ; 0x0205E984 ldr r1, _0205E9A4 ; =MISSION_DELIVER_LIST_PTR diff --git a/include/main_0205E954.h b/include/main_0205E954.h index 60a1df17..e649344f 100644 --- a/include/main_0205E954.h +++ b/include/main_0205E954.h @@ -2,5 +2,6 @@ #define PMDSKY_MAIN_0205E954_H void sub_0205E954(void); +struct mission* sub_0205E970(u32 index); #endif //PMDSKY_MAIN_0205E954_H diff --git a/main.lsf b/main.lsf index c7f457e3..f00ee081 100644 --- a/main.lsf +++ b/main.lsf @@ -170,7 +170,7 @@ Static main Object src/main_0205E288.o Object asm/main_0205E448.o Object src/main_0205E954.o - Object asm/main_0205E970.o + Object asm/main_0205E984.o Object src/dungeon_init_2.o Object asm/main_0206A750.o Object src/main_0206C98C.o diff --git a/src/main_0205E954.c b/src/main_0205E954.c index f37aa7ee..117b7a8a 100644 --- a/src/main_0205E954.c +++ b/src/main_0205E954.c @@ -9,3 +9,8 @@ void sub_0205E954(void) { sub_0205E448(8, (struct mission*) MISSION_DELIVER_LIST_PTR.unk18); } + +struct mission* sub_0205E970(u32 index) +{ + return (struct mission*) (MISSION_DELIVER_LIST_PTR.unk18 + (index * 32)); +}