From fcc7606d7d343038a634086e9503fe46b1885b5c Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Tue, 17 Mar 2026 22:01:34 -0400 Subject: [PATCH] Decomped sub_0205B44C Decomped by @slaw-22 --- .../{main_0205B44C.inc => main_0205B478.inc} | 4 +--- asm/{main_0205B44C.s => main_0205B478.s} | 18 +----------------- include/main_0205B440.h | 1 + main.lsf | 2 +- src/main_0205B440.c | 11 +++++++++++ 5 files changed, 15 insertions(+), 21 deletions(-) rename asm/include/{main_0205B44C.inc => main_0205B478.inc} (99%) rename asm/{main_0205B44C.s => main_0205B478.s} (99%) diff --git a/asm/include/main_0205B44C.inc b/asm/include/main_0205B478.inc similarity index 99% rename from asm/include/main_0205B44C.inc rename to asm/include/main_0205B478.inc index 309f6548..576afbb1 100644 --- a/asm/include/main_0205B44C.inc +++ b/asm/include/main_0205B478.inc @@ -260,9 +260,6 @@ .public _020B0B44 .public _020B0B48 .public _022B57BC -.public _022B57C0 -.public _022B580C -.public _022B5910 .public _022B6F10 .public _022B7310 .public _022B7320 @@ -393,4 +390,5 @@ .public sub_02056E04 .public sub_02059AE8 .public sub_02059AF8 +.public sub_0205B44C .public vsprintf diff --git a/asm/main_0205B44C.s b/asm/main_0205B478.s similarity index 99% rename from asm/main_0205B44C.s rename to asm/main_0205B478.s index 12925aa3..56465b49 100644 --- a/asm/main_0205B44C.s +++ b/asm/main_0205B478.s @@ -1,24 +1,8 @@ .include "asm/macros.inc" - .include "main_0205B44C.inc" + .include "main_0205B478.inc" .text - arm_func_start sub_0205B44C -sub_0205B44C: ; 0x0205B44C - ldr r1, _0205B468 ; =_022B5910 - ldr r0, _0205B46C ; =_020B0A54 - ldr r2, _0205B470 ; =_022B57C0 - str r1, [r0] - ldr r1, _0205B474 ; =_022B580C - stmib r0, {r1, r2} - bx lr - .align 2, 0 -_0205B468: .word _022B5910 -_0205B46C: .word _020B0A54 -_0205B470: .word _022B57C0 -_0205B474: .word _022B580C - arm_func_end sub_0205B44C - arm_func_start sub_0205B478 sub_0205B478: ; 0x0205B478 stmdb sp!, {r3, lr} diff --git a/include/main_0205B440.h b/include/main_0205B440.h index 2de7d060..707be747 100644 --- a/include/main_0205B440.h +++ b/include/main_0205B440.h @@ -2,5 +2,6 @@ #define PMDSKY_MAIN_0205B440_H u8* sub_0205B440(void); +void sub_0205B44C(void); #endif //PMDSKY_MAIN_0205B440_H diff --git a/main.lsf b/main.lsf index c087b800..7bf6b97e 100644 --- a/main.lsf +++ b/main.lsf @@ -144,7 +144,7 @@ Static main Object src/main_0205B354.o Object asm/main_0205B39C.o Object src/main_0205B440.o - Object asm/main_0205B44C.o + Object asm/main_0205B478.o Object src/dungeon_init_2.o Object asm/main_0206A750.o Object src/main_0206C98C.o diff --git a/src/main_0205B440.c b/src/main_0205B440.c index e9228569..bdfa5a28 100644 --- a/src/main_0205B440.c +++ b/src/main_0205B440.c @@ -1,8 +1,19 @@ #include "main_0205B440.h" extern u8 _020A3550; +extern void _022B5910(void); +extern void _022B57C0(void); +extern void _022B580C(void); +extern void (*_020B0A54[])(void); u8* sub_0205B440(void) { return &_020A3550; } + +void sub_0205B44C(void) +{ + _020B0A54[0] = _022B5910; + _020B0A54[2] = _022B57C0; + _020B0A54[1] = _022B580C; +}