From 6b1b4fe706c700a8a8727f8eb4851dde7e7aee7c Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Mon, 16 Mar 2026 19:42:14 -0400 Subject: [PATCH] Decomped sub_020590DC Decomped by @slaw-22 --- .../{main_020590DC.inc => main_020590F8.inc} | 0 asm/{main_020590DC.s => main_020590F8.s} | 14 +------------- include/main_02059060.h | 1 + main.lsf | 2 +- src/main_02059060.c | 5 +++++ 5 files changed, 8 insertions(+), 14 deletions(-) rename asm/include/{main_020590DC.inc => main_020590F8.inc} (100%) rename asm/{main_020590DC.s => main_020590F8.s} (99%) diff --git a/asm/include/main_020590DC.inc b/asm/include/main_020590F8.inc similarity index 100% rename from asm/include/main_020590DC.inc rename to asm/include/main_020590F8.inc diff --git a/asm/main_020590DC.s b/asm/main_020590F8.s similarity index 99% rename from asm/main_020590DC.s rename to asm/main_020590F8.s index c32fc39d..1f803869 100644 --- a/asm/main_020590DC.s +++ b/asm/main_020590F8.s @@ -1,20 +1,8 @@ .include "asm/macros.inc" - .include "main_020590DC.inc" + .include "main_020590F8.inc" .text - arm_func_start sub_020590DC -sub_020590DC: ; 0x020590DC - ldr r2, _020590F4 ; =TEAM_MEMBER_TABLE_PTR - ldr r2, [r2] - add r2, r2, #0x9000 - str r0, [r2, #0x878] - str r1, [r2, #0x87c] - bx lr - .align 2, 0 -_020590F4: .word TEAM_MEMBER_TABLE_PTR - arm_func_end sub_020590DC - arm_func_start GetExplorerMazeMonster GetExplorerMazeMonster: ; 0x020590F8 ldr r1, _02059114 ; =TEAM_MEMBER_TABLE_PTR diff --git a/include/main_02059060.h b/include/main_02059060.h index dd6cb929..12a3319c 100644 --- a/include/main_02059060.h +++ b/include/main_02059060.h @@ -6,5 +6,6 @@ // dest: [output] Buffer void GetExplorerMazeTeamName(u8 *dest); u64 sub_020590C0(void); +void sub_020590DC(u64 param0); #endif //PMDSKY_MAIN_02059060_H diff --git a/main.lsf b/main.lsf index 4032dbba..5f4b1a68 100644 --- a/main.lsf +++ b/main.lsf @@ -130,7 +130,7 @@ Static main Object asm/main_02058F24.o Object src/main_02058FA4.o Object src/main_02059060.o - Object asm/main_020590DC.o + Object asm/main_020590F8.o Object src/dungeon_init_2.o Object asm/main_0206A750.o Object src/main_0206C98C.o diff --git a/src/main_02059060.c b/src/main_02059060.c index c725e97b..0e2c33e5 100644 --- a/src/main_02059060.c +++ b/src/main_02059060.c @@ -36,3 +36,8 @@ u64 sub_020590C0(void) { return TEAM_MEMBER_TABLE_PTR->field_0x9878; } + +void sub_020590DC(u64 param0) +{ + TEAM_MEMBER_TABLE_PTR->field_0x9878 = param0; +}