diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-20 12:39:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-20 12:39:55 -0500 |
| commit | 35a96cb0c007545ecc87732f8dc8b2eb93e3ecc2 (patch) | |
| tree | 79174cee322cfcaac7dec1ac43f668fa747d99c3 /asm/battle_controller_opponent.s | |
| parent | ae5aa3c4dfd81fc25e5abeef1b915bb2da68b8d1 (diff) | |
| parent | ccd7e8b3b1d942b2e1289611639f4e9a188cdc20 (diff) | |
Merge pull request #88 from DizzyEggg/decompile_battle_interface
decompile battle interface
Diffstat (limited to 'asm/battle_controller_opponent.s')
| -rw-r--r-- | asm/battle_controller_opponent.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s index f911c6d11..b66e373ca 100644 --- a/asm/battle_controller_opponent.s +++ b/asm/battle_controller_opponent.s @@ -1079,7 +1079,7 @@ sub_805FA70: @ 805FA70 adds r0, r5 ldrb r0, [r0] movs r2, 0 - bl heathbar_draw_hp + bl UpdateHpTextInHealthbox b _0805FABC .pool _0805FAB8: @@ -5574,7 +5574,7 @@ sub_8062294: @ 8062294 push {r6,r7} sub sp, 0x4 movs r0, 0 - bl load_gfxc_health_bar + bl LoadBattleBarGfx ldr r3, =gBattleBufferA ldr r0, =gActiveBank mov r9, r0 @@ -5621,7 +5621,7 @@ sub_8062294: @ 8062294 ldrb r1, [r1] str r7, [sp] mov r2, r8 - bl sub_807294C + bl SetBattleBarStruct b _0806234E .pool _08062324: @@ -5643,7 +5643,7 @@ _08062324: ldrb r1, [r1] str r7, [sp] movs r3, 0 - bl sub_807294C + bl SetBattleBarStruct _0806234E: ldr r1, =gBattleBankFunc ldr r0, =gActiveBank @@ -6409,7 +6409,7 @@ _080629B4: subs r4, 0x2 adds r3, r4 ldrb r3, [r3] - bl sub_80735DC + bl CreatePartyStatusSummarySprites ldr r2, =gUnknown_020244B4 ldrb r1, [r5] adds r1, r2 |