Decomped sub_0205B028

Decomped by @slaw-22
This commit is contained in:
AnonymousRandomPerson 2026-03-16 23:06:01 -04:00
parent 5f5544a1d5
commit 7263f85f8d
5 changed files with 33 additions and 46 deletions

View File

@ -14,7 +14,6 @@
.public CopyMovesetFrom
.public CopyMovesetTo
.public CreateCollectionMenu
.public CreateMonsterSummaryFromTeamMember
.public CreatePortraitBox
.public DEFAULT_MISSION_REWARD_TYPE_WEIGHTS
.public DEF_SCARF_STAT_BOOST
@ -33,8 +32,6 @@
.public EnqueueRender3dTiling
.public ExplorersOfSkyMain
.public FemaleToMaleForm
.public GetActiveRosterIndex
.public GetActiveTeamMember
.public GetAdventureLogDungeonFloor
.public GetBaseForm
.public GetBaseFormBurmyWormadamShellosGastrodonCherrim
@ -402,14 +399,12 @@
.public sub_02051788
.public sub_02052C3C
.public sub_02052E2C
.public sub_02053224
.public sub_02054F18
.public sub_02055410
.public sub_02055474
.public sub_020554D8
.public sub_020555D0
.public sub_02055F04
.public sub_020564B0
.public sub_020568A4
.public sub_02056914
.public sub_02056D70

View File

@ -1,44 +1,8 @@
.include "asm/macros.inc"
.include "main_0205B028.inc"
.include "main_0205B0A0.inc"
.text
arm_func_start sub_0205B028
sub_0205B028: ; 0x0205B028
stmdb sp!, {r4, r5, r6, lr}
sub sp, sp, #0x68
mov r5, r1
mov r6, r0
mov r0, r5
bl GetActiveRosterIndex
mvn r1, #0
cmp r0, r1
bne _0205B078
add r0, sp, #0
mov r1, r5
mov r2, #0
bl sub_02053224
mov r0, r5
bl sub_020564B0
mov r2, r0
add r1, sp, #0
mov r0, r6
bl CreateMonsterSummaryFromTeamMember
b _0205B098
_0205B078:
bl GetActiveTeamMember
mov r4, r0
mov r0, r5
bl sub_020564B0
mov r2, r0
mov r0, r6
mov r1, r4
bl CreateMonsterSummaryFromTeamMember
_0205B098:
add sp, sp, #0x68
ldmia sp!, {r4, r5, r6, pc}
arm_func_end sub_0205B028
arm_func_start sub_0205B0A0
sub_0205B0A0: ; 0x0205B0A0
ldr ip, _0205B0B0 ; =sub_0205B39C

View File

@ -1,6 +1,9 @@
#ifndef PMDSKY_MAIN_0205B008_H
#define PMDSKY_MAIN_0205B008_H
void sub_0205B008(u32 a, u32 b);
#include "dungeon_mode.h"
void sub_0205B008(struct monster_summary *monster_summary, u32 b);
void sub_0205B028(struct monster_summary *monster_summary, s32 member_idx);
#endif //PMDSKY_MAIN_0205B008_H

View File

@ -140,7 +140,7 @@ Static main
Object src/main_0205A430.o
Object asm/main_0205A4B4.o
Object src/main_0205B008.o
Object asm/main_0205B028.o
Object asm/main_0205B0A0.o
Object src/dungeon_init_2.o
Object asm/main_0206A750.o
Object src/main_0206C98C.o

View File

@ -1,6 +1,31 @@
#include "main_0205B008.h"
#include "common.h"
void sub_0205B008(u32 a, u32 b)
extern s32 sub_02055894(u32 b);
extern s32 GetActiveRosterIndex(s32 member_idx);
extern void sub_02053224(struct team_member *team_member, s32 member_idx, s32 arg2);
extern bool8 sub_020564B0(s32 member_idx);
extern struct team_member* GetActiveTeamMember(s32 roster_idx);
extern void CreateMonsterSummaryFromTeamMember(struct monster_summary *monster_summary, struct team_member *team_member, bool8 is_leader);
void sub_0205B008(struct monster_summary *monster_summary, u32 b)
{
sub_0205B028(a, sub_02055894(b));
sub_0205B028(monster_summary, sub_02055894(b));
}
void sub_0205B028(struct monster_summary *monster_summary, s32 member_idx)
{
struct team_member team_member;
s32 active_roster_index = GetActiveRosterIndex(member_idx);
if (active_roster_index == -1)
{
sub_02053224(&team_member, member_idx, 0);
CreateMonsterSummaryFromTeamMember(monster_summary, &team_member, sub_020564B0(member_idx));
}
else
{
struct team_member *active_team_member = GetActiveTeamMember(active_roster_index);
CreateMonsterSummaryFromTeamMember(monster_summary, active_team_member, sub_020564B0(member_idx));
}
}