diff options
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/anim_objects.asm | 2 | ||||
| -rw-r--r-- | battle/bg_effects.asm | 6 | ||||
| -rw-r--r-- | battle/core.asm | 18 | ||||
| -rw-r--r-- | battle/effect_command_pointers.asm | 2 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 4 |
5 files changed, 16 insertions, 16 deletions
diff --git a/battle/anim_objects.asm b/battle/anim_objects.asm index 5c4c43525..21707f14c 100644 --- a/battle/anim_objects.asm +++ b/battle/anim_objects.asm @@ -24,7 +24,7 @@ Functioncc9a1: ; cc9a1 (33:49a1) Functioncc9bd: ; cc9bd - ld hl, $0000 + ld hl, NONE add hl, bc ld [hl], $0 ret diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm index 5b22308f2..f7245ce3b 100644 --- a/battle/bg_effects.asm +++ b/battle/bg_effects.asm @@ -338,7 +338,7 @@ Functionc81c0: ; c81c0 (32:41c0) jr .asm_c81d7 .asm_c81d1 hlcoord 2, 6 - ld bc, $606 + lb bc, 6, 6 .asm_c81d7 call ClearBox pop bc @@ -437,7 +437,7 @@ Functionc825a: ; c825a (32:425a) jr .asm_c8271 .asm_c826b hlcoord 2, 6 - ld bc, $106 + lb bc, 1, 6 .asm_c8271 call ClearBox ld a, $1 @@ -503,7 +503,7 @@ Functionc82c7: ; c82c7 (32:42c7) jr .asm_c82de .asm_c82d8 hlcoord 2, 6 - ld bc, $206 + lb bc, 2, 6 .asm_c82de call ClearBox ld a, $1 diff --git a/battle/core.asm b/battle/core.asm index d0cbe1c38..02ad67fa4 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -3247,7 +3247,7 @@ MonFaintedAnimation: ; 3d444 Function3d490: ; 3d490 - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a ld c, a .asm_3d493 push bc @@ -3271,7 +3271,7 @@ Function3d490: ; 3d490 ; 3d4ae Function3d4ae: ; 3d4ae - ld a, [hConnectionStripLength] + ld a, [hMapObjectIndexBuffer1] ld c, a cp $8 jr nz, .back @@ -3663,7 +3663,7 @@ Function3d714: ; 3d714 push af ld a, [CurBattleMon] ld [CurPartyMon], a - callba Functione538 + callba CheckCurPartyMonFainted pop bc ld a, b ld [CurPartyMon], a @@ -9364,7 +9364,7 @@ Function3fb6c: ; 3fb6c call TextBox callba MobileTextBorder hlcoord 1, 5 - ld bc, $0307 + lb bc, 3, 7 call ClearBox call Functione51 call Function3ed9f @@ -9486,7 +9486,7 @@ Function3fc30: ; 3fc30 Function3fc5b: ; 3fc5b ld hl, Sprites xor a - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a ld b, $6 ld e, $a8 .asm_3fc65 @@ -9497,10 +9497,10 @@ Function3fc5b: ; 3fc5b inc hl ld [hl], e inc hl - ld a, [hConnectionStripLength] + ld a, [hMapObjectIndexBuffer1] ld [hli], a inc a - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a ld a, $1 ld [hli], a ld a, d @@ -9508,9 +9508,9 @@ Function3fc5b: ; 3fc5b ld d, a dec c jr nz, .asm_3fc69 - ld a, [hConnectionStripLength] + ld a, [hMapObjectIndexBuffer1] add $3 - ld [hConnectionStripLength], a + ld [hMapObjectIndexBuffer1], a ld a, e add $8 ld e, a diff --git a/battle/effect_command_pointers.asm b/battle/effect_command_pointers.asm index 800b1ccd6..23beebc16 100644 --- a/battle/effect_command_pointers.asm +++ b/battle/effect_command_pointers.asm @@ -1,5 +1,5 @@ - dw $0000 ; padding + dw NONE ; padding BattleCommandPointers: ; 3fd28 dw BattleCommand01 ; 34084 diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 6115932b4..94f68d1ac 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -7257,7 +7257,7 @@ BattleCommand23: ; 3680f ld c, $14 call DelayFrames hlcoord 1, 0 - ld bc, $040a + lb bc, 4, 10 call ClearBox ld c, $14 call DelayFrames @@ -7351,7 +7351,7 @@ BattleCommand23: ; 3680f ld c, $14 call DelayFrames hlcoord 9, 7 - ld bc, $050b + lb bc, 5, 11 call ClearBox ld c, $14 call DelayFrames |