diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-30 14:52:46 -0500 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-30 14:52:46 -0500 |
| commit | 0b45e2e846c8b2feb7d2c4c4ebb854db07cf06fd (patch) | |
| tree | df6b2a87398c5912f878de5798cb8d19a31bc15b /engine/battle | |
| parent | 3c7ba37de72795e46c76f791b50b4a3d89ba0c2c (diff) | |
Fix wVirtualOAM labels, part 2.
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/core.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/sliding_intro.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/trainer_huds.asm | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 3742f00c9..0fe77df40 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -9327,7 +9327,7 @@ CopyBackpic: ; 3fc30 ; 3fc5b .LoadTrainerBackpicAsOAM: ; 3fc5b - ld hl, wSprite01 + ld hl, wVirtualOAMSprite00 xor a ld [hMapObjectIndexBuffer], a ld b, 6 diff --git a/engine/battle/sliding_intro.asm b/engine/battle/sliding_intro.asm index 781d30f38..667f18191 100755 --- a/engine/battle/sliding_intro.asm +++ b/engine/battle/sliding_intro.asm @@ -60,7 +60,7 @@ BattleIntroSlidingPics: ; 4e980 ; 4e9d6 .subfunction3 ; 4e9d6 - ld hl, wSprite01XCoord + ld hl, wVirtualOAMSprite00XCoord ld c, $12 ; 18 ld de, SPRITEOAMSTRUCT_LENGTH .loop3 diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm index f35d2fcdd..0a18098ed 100755 --- a/engine/battle/trainer_huds.asm +++ b/engine/battle/trainer_huds.asm @@ -28,7 +28,7 @@ ShowPlayerMonsRemaining: ; 2c01c ld [hl], a ld a, 8 ld [wPlaceBallsDirection], a - ld hl, wSprite01 + ld hl, wVirtualOAMSprite00 jp LoadTrainerHudOAM ; 2c03a @@ -44,7 +44,7 @@ ShowOTTrainerMonsRemaining: ; 2c03a ld [hl], 4 * 8 ld a, -8 ld [wPlaceBallsDirection], a - ld hl, wSprite01 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH + ld hl, wVirtualOAMSprite00 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH jp LoadTrainerHudOAM ; 2c059 @@ -193,7 +193,7 @@ LinkBattle_TrainerHuds: ; 2c10d ld [hl], 8 * 8 ld a, $8 ld [wPlaceBallsDirection], a - ld hl, wSprite01 + ld hl, wVirtualOAMSprite00 call LoadTrainerHudOAM ld hl, wOTPartyMon1HP @@ -203,7 +203,7 @@ LinkBattle_TrainerHuds: ; 2c10d ld a, 10 * 8 ld [hli], a ld [hl], 13 * 8 - ld hl, wSprite01 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH + ld hl, wVirtualOAMSprite00 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH jp LoadTrainerHudOAM ; 2c143 |