diff options
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/battle_transition.asm | 4 | ||||
| -rw-r--r-- | engine/battle/core.asm | 50 | ||||
| -rw-r--r-- | engine/battle/start_battle.asm | 4 | ||||
| -rwxr-xr-x | engine/battle/trainer_huds.asm | 2 |
4 files changed, 30 insertions, 30 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index f0c7a9b61..47c3b9f41 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -92,7 +92,7 @@ LoadTrainerBattlePokeballTiles: ; Load the tiles used in the Pokeball Graphic that fills the screen ; at the start of every Trainer battle. ld de, TrainerBattlePokeballTiles - ld hl, VTiles1 tile $7e + ld hl, vTiles1 tile $7e ld b, BANK(TrainerBattlePokeballTiles) ld c, 2 call Request2bpp @@ -103,7 +103,7 @@ LoadTrainerBattlePokeballTiles: ld [rVBK], a ld de, TrainerBattlePokeballTiles - ld hl, VTiles4 tile $7e + ld hl, vTiles4 tile $7e ld b, BANK(TrainerBattlePokeballTiles) ld c, 2 call Request2bpp diff --git a/engine/battle/core.asm b/engine/battle/core.asm index d9f660a41..1a3ee24f6 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -5309,13 +5309,13 @@ BattleMenuPKMN_Loop: Battle_StatsScreen: ; 3e308 call DisableLCD - ld hl, VTiles2 tile $31 - ld de, VTiles0 + ld hl, vTiles2 tile $31 + ld de, vTiles0 ld bc, $11 tiles call CopyBytes - ld hl, VTiles2 - ld de, VTiles0 tile $11 + ld hl, vTiles2 + ld de, vTiles0 tile $11 ld bc, $31 tiles call CopyBytes @@ -5330,13 +5330,13 @@ Battle_StatsScreen: ; 3e308 call DisableLCD - ld hl, VTiles0 - ld de, VTiles2 tile $31 + ld hl, vTiles0 + ld de, vTiles2 tile $31 ld bc, $11 tiles call CopyBytes - ld hl, VTiles0 tile $11 - ld de, VTiles2 + ld hl, vTiles0 tile $11 + ld de, vTiles2 ld bc, $31 tiles call CopyBytes @@ -6779,7 +6779,7 @@ BattleWinSlideInEnemyTrainerFrontpic: ; 3ebd8 call FinishBattleAnim ld a, [OtherTrainerClass] ld [TrainerClass], a - ld de, VTiles2 + ld de, vTiles2 callfar GetTrainerPic hlcoord 19, 0 ld c, 0 @@ -7155,15 +7155,15 @@ _LoadHPBar: ; 3eda6 LoadHPExpBarGFX: ; unreferenced ld de, EnemyHPBarBorderGFX - ld hl, VTiles2 tile $6c + ld hl, vTiles2 tile $6c lb bc, BANK(EnemyHPBarBorderGFX), 4 call Get1bpp ld de, HPExpBarBorderGFX - ld hl, VTiles2 tile $73 + ld hl, vTiles2 tile $73 lb bc, BANK(HPExpBarBorderGFX), 6 call Get1bpp ld de, ExpBarGFX - ld hl, VTiles2 tile $55 + ld hl, vTiles2 tile $55 lb bc, BANK(ExpBarGFX), 8 jp Get2bpp ; 3edd1 @@ -8286,7 +8286,7 @@ DropPlayerSub: ; 3f447 ld [CurPartySpecies], a ld hl, BattleMonDVs predef GetUnownLetter - ld de, VTiles2 tile $31 + ld de, vTiles2 tile $31 predef GetMonBackpic pop af ld [CurPartySpecies], a @@ -8325,7 +8325,7 @@ DropEnemySub: ; 3f486 call GetBaseData ld hl, EnemyMonDVs predef GetUnownLetter - ld de, VTiles2 + ld de, vTiles2 predef GetAnimatedFrontpicPredef pop af ld [CurPartySpecies], a @@ -8382,7 +8382,7 @@ BattleIntro: ; 3f4dd call DisableSpriteUpdates farcall ClearBattleRAM call InitEnemy - call BackUpVBGMap2 + call BackUpBGMap2 ld b, SCGB_BATTLE_GRAYSCALE call GetSGBLayout ld hl, rLCDC @@ -8428,13 +8428,13 @@ InitEnemy: ; 3f55e jp InitEnemyWildmon ; wild ; 3f568 -BackUpVBGMap2: ; 3f568 +BackUpBGMap2: ; 3f568 ld a, [rSVBK] push af ld a, $6 ; BANK(wDecompressScratch) ld [rSVBK], a ld hl, wDecompressScratch - ld bc, $40 tiles ; VBGMap3 - VBGMap2 + ld bc, $40 tiles ; vBGMap3 - vBGMap2 ld a, $2 call ByteFill ld a, [rVBK] @@ -8442,8 +8442,8 @@ BackUpVBGMap2: ; 3f568 ld a, $1 ld [rVBK], a ld de, wDecompressScratch - hlbgcoord 0, 0 ; VBGMap2 - lb bc, BANK(BackUpVBGMap2), $40 + hlbgcoord 0, 0 ; vBGMap2 + lb bc, BANK(BackUpBGMap2), $40 call Request2bpp pop af ld [rVBK], a @@ -8467,7 +8467,7 @@ InitEnemyTrainer: ; 3f594 ld [OTPartyMon1Item], a .ok - ld de, VTiles2 + ld de, vTiles2 callfar GetTrainerPic xor a ld [hGraphicStartTile], a @@ -8531,7 +8531,7 @@ InitEnemyWildmon: ; 3f607 ld a, [UnownLetter] ld [wFirstUnownSeen], a .skip_unown - ld de, VTiles2 + ld de, vTiles2 predef GetAnimatedFrontpicPredef xor a ld [TrainerClass], a @@ -9336,7 +9336,7 @@ InitBattleDisplay: ; 3fb6c ; 3fbff GetTrainerBackpic: ; 3fbff -; Load the player character's backpic (6x6) into VRAM starting from VTiles2 tile $31. +; Load the player character's backpic (6x6) into VRAM starting from vTiles2 tile $31. ; Special exception for Dude. ld b, BANK(DudeBackpic) @@ -9363,7 +9363,7 @@ GetTrainerBackpic: ; 3fbff ld hl, ChrisBackpic .Decompress: - ld de, VTiles2 tile $31 + ld de, vTiles2 tile $31 ld c, $31 predef DecompressPredef ret @@ -9374,8 +9374,8 @@ CopyBackpic: ; 3fc30 push af ld a, $6 ld [rSVBK], a - ld hl, VTiles0 - ld de, VTiles2 tile $31 + ld hl, vTiles0 + ld de, vTiles2 tile $31 ld a, [hROMBank] ld b, a ld c, $31 diff --git a/engine/battle/start_battle.asm b/engine/battle/start_battle.asm index 8d510b72e..7f0bff96b 100644 --- a/engine/battle/start_battle.asm +++ b/engine/battle/start_battle.asm @@ -191,7 +191,7 @@ ClearBattleRAM: ; 2ef18 call ClearWindowData ld hl, hBGMapAddress - xor a ; LOW(VBGMap0) + xor a ; LOW(vBGMap0) ld [hli], a - ld [hl], HIGH(VBGMap0) + ld [hl], HIGH(vBGMap0) ret diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm index 9efe08414..b236fc56b 100755 --- a/engine/battle/trainer_huds.asm +++ b/engine/battle/trainer_huds.asm @@ -232,7 +232,7 @@ LoadTrainerHudOAM: ; 2c143 LoadBallIconGFX: ; 2c165 ld de, .gfx - ld hl, VTiles0 tile $31 + ld hl, vTiles0 tile $31 lb bc, BANK(LoadBallIconGFX), 4 call Get2bpp_2 ret |