diff --git a/asm/include/main_020590F8.inc b/asm/include/main_02059118.inc similarity index 100% rename from asm/include/main_020590F8.inc rename to asm/include/main_02059118.inc diff --git a/asm/main_020590F8.s b/asm/main_02059118.s similarity index 99% rename from asm/main_020590F8.s rename to asm/main_02059118.s index 1f803869..caaca56d 100644 --- a/asm/main_020590F8.s +++ b/asm/main_02059118.s @@ -1,21 +1,8 @@ .include "asm/macros.inc" - .include "main_020590F8.inc" + .include "main_02059118.inc" .text - arm_func_start GetExplorerMazeMonster -GetExplorerMazeMonster: ; 0x020590F8 - ldr r1, _02059114 ; =TEAM_MEMBER_TABLE_PTR - mov r2, #0x44 - ldr r1, [r1] - add r1, r1, #0x98 - add r1, r1, #0x9800 - smlabb r0, r0, r2, r1 - bx lr - .align 2, 0 -_02059114: .word TEAM_MEMBER_TABLE_PTR - arm_func_end GetExplorerMazeMonster - arm_func_start WriteMonsterInfoToSave WriteMonsterInfoToSave: ; 0x02059118 stmdb sp!, {r4, r5, r6, r7, r8, lr} diff --git a/include/main_02059060.h b/include/main_02059060.h index 12a3319c..ed489953 100644 --- a/include/main_02059060.h +++ b/include/main_02059060.h @@ -7,5 +7,6 @@ void GetExplorerMazeTeamName(u8 *dest); u64 sub_020590C0(void); void sub_020590DC(u64 param0); +struct ground_monster* GetExplorerMazeMonster(s16 entry_number); #endif //PMDSKY_MAIN_02059060_H diff --git a/main.lsf b/main.lsf index 5f4b1a68..748f4e77 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_020590F8.o + Object asm/main_02059118.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 0e2c33e5..e4294187 100644 --- a/src/main_02059060.c +++ b/src/main_02059060.c @@ -41,3 +41,8 @@ void sub_020590DC(u64 param0) { TEAM_MEMBER_TABLE_PTR->field_0x9878 = param0; } + +struct ground_monster* GetExplorerMazeMonster(s16 entry_number) +{ + return TEAM_MEMBER_TABLE_PTR->explorer_maze_monsters + entry_number; +}