From 4b45282dd37266cc7d263a6fd4a5223f8e92b5be Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 16 Oct 2017 18:12:27 +0200 Subject: start working on battle interface --- asm/battle_controller_wally.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'asm/battle_controller_wally.s') diff --git a/asm/battle_controller_wally.s b/asm/battle_controller_wally.s index de17547a1..8bf630188 100644 --- a/asm/battle_controller_wally.s +++ b/asm/battle_controller_wally.s @@ -3883,7 +3883,7 @@ sub_816A5D4: @ 816A5D4 ldrb r1, [r1] str r7, [sp] mov r2, r8 - bl sub_807294C + bl SetBattleBarStruct b _0816A69E .pool _0816A664: @@ -3905,7 +3905,7 @@ _0816A664: ldrb r1, [r1] str r7, [sp] movs r3, 0 - bl sub_807294C + bl SetBattleBarStruct mov r1, r9 ldrb r0, [r1] adds r0, r4 -- cgit v1.2.3 From 0ffc5652fd746816a763e4e0ec83c08f2f53222c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 18 Oct 2017 00:00:46 +0200 Subject: hp printing in healthboxes done I hope --- asm/battle_controller_wally.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'asm/battle_controller_wally.s') diff --git a/asm/battle_controller_wally.s b/asm/battle_controller_wally.s index 8bf630188..ddceb87e6 100644 --- a/asm/battle_controller_wally.s +++ b/asm/battle_controller_wally.s @@ -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 -- cgit v1.2.3 From 6e56211f40d7a191afd91bcf41d63178e26b5199 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 18 Oct 2017 21:42:00 +0200 Subject: more of battle interface done --- asm/battle_controller_wally.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'asm/battle_controller_wally.s') diff --git a/asm/battle_controller_wally.s b/asm/battle_controller_wally.s index ddceb87e6..9ca0c6bf2 100644 --- a/asm/battle_controller_wally.s +++ b/asm/battle_controller_wally.s @@ -4645,7 +4645,7 @@ _0816ACA8: subs r3, 0x2 adds r4, r3 ldrb r3, [r4] - bl sub_80735DC + bl CreatePartyStatusSummarySprites ldr r2, =gUnknown_020244B4 ldrb r1, [r5] adds r1, r2 -- cgit v1.2.3 From ee6bdc9068794652f929783e2ef326e542521327 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 18 Oct 2017 23:52:21 +0200 Subject: more battle interface --- asm/battle_controller_wally.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'asm/battle_controller_wally.s') diff --git a/asm/battle_controller_wally.s b/asm/battle_controller_wally.s index 9ca0c6bf2..9aabc856e 100644 --- a/asm/battle_controller_wally.s +++ b/asm/battle_controller_wally.s @@ -3836,7 +3836,7 @@ sub_816A5D4: @ 816A5D4 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 -- cgit v1.2.3