From 996d65eee76f6ca11395df4e9625f403d3b1909f Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Thu, 19 Mar 2026 22:03:13 -0400 Subject: [PATCH] Decomped sub_0205EAE8 Decomped by @slaw-22 --- .../{main_0205EAE8.inc => main_0205EB00.inc} | 1 + asm/{main_0205EAE8.s => main_0205EB00.s} | 13 +------------ include/main_0205EAC8.h | 1 + main.lsf | 2 +- src/main_0205EAC8.c | 5 +++++ 5 files changed, 9 insertions(+), 13 deletions(-) rename asm/include/{main_0205EAE8.inc => main_0205EB00.inc} (99%) rename asm/{main_0205EAE8.s => main_0205EB00.s} (99%) diff --git a/asm/include/main_0205EAE8.inc b/asm/include/main_0205EB00.inc similarity index 99% rename from asm/include/main_0205EAE8.inc rename to asm/include/main_0205EB00.inc index ee052cb3..adcaf3a6 100644 --- a/asm/include/main_0205EAE8.inc +++ b/asm/include/main_0205EB00.inc @@ -352,4 +352,5 @@ .public sub_0205E970 .public sub_0205E984 .public sub_0205EAC8 +.public sub_0205EAE8 .public vsprintf diff --git a/asm/main_0205EAE8.s b/asm/main_0205EB00.s similarity index 99% rename from asm/main_0205EAE8.s rename to asm/main_0205EB00.s index f479f347..387c038d 100644 --- a/asm/main_0205EAE8.s +++ b/asm/main_0205EB00.s @@ -1,19 +1,8 @@ .include "asm/macros.inc" - .include "main_0205EAE8.inc" + .include "main_0205EB00.inc" .text - arm_func_start sub_0205EAE8 -sub_0205EAE8: ; 0x0205EAE8 - ldr r1, _0205EAFC ; =MISSION_DELIVER_LIST_PTR - ldr r1, [r1, #0x18] - add r1, r1, #0x200 - add r0, r1, r0, lsl #5 - bx lr - .align 2, 0 -_0205EAFC: .word MISSION_DELIVER_LIST_PTR - arm_func_end sub_0205EAE8 - arm_func_start sub_0205EB00 sub_0205EB00: ; 0x0205EB00 ldr r1, _0205EB24 ; =MISSION_DELIVER_LIST_PTR diff --git a/include/main_0205EAC8.h b/include/main_0205EAC8.h index 0db61e20..76ecd34e 100644 --- a/include/main_0205EAC8.h +++ b/include/main_0205EAC8.h @@ -2,5 +2,6 @@ #define PMDSKY_MAIN_0205EAC8_H void sub_0205EAC8(void); +struct mission* sub_0205EAE8(u32 index); #endif //PMDSKY_MAIN_0205EAC8_H diff --git a/main.lsf b/main.lsf index b07d2907..158e5aef 100644 --- a/main.lsf +++ b/main.lsf @@ -172,7 +172,7 @@ Static main Object src/main_0205E954.o Object asm/main_0205E984.o Object src/main_0205EAC8.o - Object asm/main_0205EAE8.o + Object asm/main_0205EB00.o Object src/dungeon_init_2.o Object asm/main_0206A750.o Object src/main_0206C98C.o diff --git a/src/main_0205EAC8.c b/src/main_0205EAC8.c index 23f02881..b2a6fbf0 100644 --- a/src/main_0205EAC8.c +++ b/src/main_0205EAC8.c @@ -9,3 +9,8 @@ void sub_0205EAC8(void) { sub_0205E448(8, (struct mission*) (MISSION_DELIVER_LIST_PTR.unk18 + 0x200)); } + +struct mission* sub_0205EAE8(u32 index) +{ + return (struct mission*) (MISSION_DELIVER_LIST_PTR.unk18 + 0x200 + index * 32); +}