dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

hp printing in healthboxes done I hope

Browse Source
This commit is contained in:
DizzyEggg
2017-10-18 00:00:46 +02:00
parent 4b45282dd3
commit 0ffc5652fd
13 changed files with 346 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asm/battle_anim.s
View File

@@ -129,7 +129,7 @@ move_something: @ 80A3A48
bne _080A3AE8
bl sub_80A8278
movs r0, 0
bl sub_8072A88
bl UpdateOamPriorityInAllHealthboxes
movs r4, 0
mov r0, r8
lsls r0, 2
@@ -852,7 +852,7 @@ _080A406E:
bne _080A409C
bl sub_80A8278
movs r0, 0x1
bl sub_8072A88
bl UpdateOamPriorityInAllHealthboxes
_080A409C:
ldr r0, =gAnimScriptActive
mov r1, r8

6
asm/battle_anim_8170478.s
View File

@@ -2379,7 +2379,7 @@ _0817185A:
movs r1, 0
strb r1, [r0]
movs r0, 0x1
bl sub_8072A88
bl UpdateOamPriorityInAllHealthboxes
bl m4aMPlayAllStop
ldr r0, =0x00000213
bl PlaySE
@@ -2879,7 +2879,7 @@ _08171C24:
ldr r0, =gDoingBattleAnim
strb r6, [r0]
movs r0, 0x1
bl sub_8072A88
bl UpdateOamPriorityInAllHealthboxes
_08171C8A:
pop {r4-r7}
pop {r0}
@@ -2974,7 +2974,7 @@ _08171D3E:
movs r0, 0
strb r0, [r1]
movs r0, 0x1
bl sub_8072A88
bl UpdateOamPriorityInAllHealthboxes
_08171D52:
pop {r4}
pop {r0}

2
asm/battle_controller_linkopponent.s
View File

@@ -985,7 +985,7 @@ sub_8064BC0: @ 8064BC0
adds r0, r5
ldrb r0, [r0]
movs r2, 0
bl heathbar_draw_hp
bl UpdateHpTextInHealthbox
b _08064C0C
.pool
_08064C08:

2
asm/battle_controller_linkpartner.s
View File

@@ -509,7 +509,7 @@ bx_t4_healthbar_update: @ 814B2D0
adds r0, r6
ldrb r0, [r0]
movs r2, 0
bl heathbar_draw_hp
bl UpdateHpTextInHealthbox
b _0814B332
.pool
_0814B318:

2
asm/battle_controller_opponent.s
View File

@@ -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:

4
asm/battle_controller_player.s
View File

@@ -3278,7 +3278,7 @@ bx_t1_healthbar_update: @ 8059130
adds r0, r6
ldrb r0, [r0]
movs r2, 0
bl heathbar_draw_hp
bl UpdateHpTextInHealthbox
b _08059192
.pool
_08059178:
@@ -9023,7 +9023,7 @@ _0805C4B4:
ldrb r0, [r0]
movs r1, 0
movs r2, 0
bl heathbar_draw_hp
bl UpdateHpTextInHealthbox
_0805C4F2:
ldr r1, =gBattleBankFunc
ldr r0, =gActiveBank

2
asm/battle_controller_player_partner.s
View File

@@ -510,7 +510,7 @@ bx_t3_healthbar_update: @ 81BB214
adds r0, r6
ldrb r0, [r0]
movs r2, 0
bl heathbar_draw_hp
bl UpdateHpTextInHealthbox
b _081BB276
.pool
_081BB25C:

2
asm/battle_controller_recorded_opponent.s
View File

@@ -966,7 +966,7 @@ sub_8186D04: @ 8186D04
adds r0, r5
ldrb r0, [r0]
movs r2, 0
bl heathbar_draw_hp
bl UpdateHpTextInHealthbox
b _08186D50
.pool
_08186D4C:

4
asm/battle_controller_recorded_player.s
View File

@@ -885,7 +885,7 @@ sub_818A0A4: @ 818A0A4
adds r0, r6
ldrb r0, [r0]
movs r2, 0
bl heathbar_draw_hp
bl UpdateHpTextInHealthbox
b _0818A106
.pool
_0818A0EC:
@@ -5083,7 +5083,7 @@ _0818C678:
ldrb r0, [r0]
movs r1, 0
movs r2, 0
bl heathbar_draw_hp
bl UpdateHpTextInHealthbox
_0818C6B2:
ldr r1, =gBattleBankFunc
ldr r0, =gActiveBank

4
asm/battle_controller_wally.s
View File

@@ -676,7 +676,7 @@ sub_8168934: @ 8168934
adds r0, r6
ldrb r0, [r0]
movs r2, 0
bl heathbar_draw_hp
bl UpdateHpTextInHealthbox
b _08168996
.pool
_0816897C:
@@ -3912,7 +3912,7 @@ _0816A664:
ldrb r0, [r0]
movs r1, 0
movs r2, 0
bl heathbar_draw_hp
bl UpdateHpTextInHealthbox
_0816A69E:
ldr r1, =gBattleBankFunc
ldr r0, =gActiveBank

910
asm/battle_interface.s
View File

File diff suppressed because it is too large Load Diff