diff options
| -rw-r--r-- | asm/party_menu.s | 24 | ||||
| -rw-r--r-- | src/battle_party_menu.c | 1 | ||||
| -rw-r--r-- | src/party_menu.c | 12 |
3 files changed, 11 insertions, 26 deletions
diff --git a/asm/party_menu.s b/asm/party_menu.s index aa6075723..305111b2c 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -7253,28 +7253,4 @@ _0806E6C0: bx r0 thumb_func_end PartyMenuTryDrawHPBar - thumb_func_start PartyMenuDrawHPBars -PartyMenuDrawHPBars: @ 806E6C8 - push {r4-r6,lr} - movs r4, 0 - movs r6, 0x64 - ldr r5, _0806E6EC @ =gPlayerParty -_0806E6D0: - adds r1, r4, 0 - muls r1, r6 - adds r1, r5 - adds r0, r4, 0 - bl PartyMenuTryDrawHPBar - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x5 - bls _0806E6D0 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0806E6EC: .4byte gPlayerParty - thumb_func_end PartyMenuDrawHPBars - .align 2, 0 @ Don't pad with nop. diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c index 9db9b0dab..a21a76683 100644 --- a/src/battle_party_menu.c +++ b/src/battle_party_menu.c @@ -31,7 +31,6 @@ extern void PartyMenuPrintMonsLevelOrStatus(void); extern void PrintPartyMenuMonNicknames(void); extern void PartyMenuTryPrintMonsHP(void); extern void nullsub_13(void); -extern void PartyMenuDrawHPBars(void); extern u8 sub_806B58C(u8); extern void sub_806D5A4(void); extern void sub_802E414(void); diff --git a/src/party_menu.c b/src/party_menu.c index 553ff0ad0..294a1f2ed 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -112,6 +112,16 @@ void sub_806AEDC(void) #endif +void PartyMenuDrawHPBars(void) +{ + u8 i; + + for (i = 0; i < PARTY_SIZE; i++) + { + PartyMenuTryDrawHPBar(i, &gPlayerParty[i]); + } +} + void SwapPokemon(struct Pokemon *a, struct Pokemon *b) { struct Pokemon temp = *a; @@ -2049,7 +2059,7 @@ _08070F8A:\n\ .syntax divided\n"); } -void unref_sub_8070F90() +void unref_sub_8070F90(void) { FlagSet(SYS_POKEDEX_GET); FlagSet(SYS_POKEMON_GET); |