ref: 35deb771130a9012ee4494b1db097761f2fe2919
parent: 55bb99580eeccc92106437c4ad86edb8ca89ecda
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Fri Jul 3 15:59:41 EDT 2020
H_CONSTANTNAMES -> hConstantNames
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -308,7 +308,7 @@
; sets the transform to the subanimation type if it's the enemy's turn
GetSubanimationTransform1:
ld b, a
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, b
ret nz
@@ -319,7 +319,7 @@
; sets the transform to 2 (i.e. horizontal and vertical flip) if it's the player's turn
; sets the transform to 0 (i.e. no transform) if it's the enemy's turn
GetSubanimationTransform2:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, 2 << 5
ret z
@@ -421,7 +421,7 @@
ShareMoveAnimations:
; some moves just reuse animations from status conditions
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ret z
@@ -920,16 +920,16 @@
; calls a function with the turn flipped from player to enemy or vice versa
; input - hl - address of function to call
CallWithTurnFlipped:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
push af
xor 1
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
ld de, .returnAddress
push de
jp hl
.returnAddress
pop af
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
ret
; flashes the screen for an extended period (48 frames)
@@ -1133,7 +1133,7 @@
AnimationSlideMonUp:
; Slides the mon's sprite upwards.
ld c, 7
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
coord hl, 1, 6
coord de, 1, 5
@@ -1201,7 +1201,7 @@
jr nz, .slideLoop
; Fill in the bottom row of the mon pic with the next row's tile IDs.
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
coord hl, 1, 11
jr z, .next
@@ -1370,7 +1370,7 @@
AnimationShakeBackAndForth:
; Shakes the mon's sprite back and forth rapidly. This is used in Double Team.
; The mon's sprite disappears after this animation.
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
coord hl, 0, 5
coord de, 2, 5
@@ -1418,7 +1418,7 @@
; Shifts the mon's sprite horizontally to a fixed location. Used by lots of
; animations like Tackle/Body Slam.
call AnimationHideMonPic
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
coord hl, 2, 5
jr z, .next
@@ -1434,7 +1434,7 @@
AnimationResetMonPosition:
; Resets the mon's sprites to be located at the normal coordinates.
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, 5 * SCREEN_WIDTH + 2
jr z, .next
@@ -1446,7 +1446,7 @@
AnimationSpiralBallsInward:
; Creates an effect that looks like energy balls spiralling into the
; player mon's sprite. Used in Focus Energy, for example.
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .playerTurn
ld a, -40
@@ -1530,7 +1530,7 @@
ld c, 4
.loop
push bc
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .playerTurn
coord hl, 16, 0
@@ -1583,7 +1583,7 @@
AnimationShootBallsUpward:
; Shoots one pillar of "energy" balls upwards. Used in Teleport/Sky Attack
; animations.
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .playerTurn
lb bc, 0, 16 * 8
@@ -1651,7 +1651,7 @@
AnimationShootManyBallsUpward:
; Shoots several pillars of "energy" balls upward.
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld hl, UpwardBallsAnimXCoordinatesPlayerTurn
ld a, $50 ; y coordinate for "energy" ball pillar
@@ -1743,7 +1743,7 @@
_AnimationSlideMonOff:
; Slides the mon's sprite off the screen horizontally by e tiles and waits
; [wSlideMonDelay] V-blanks each time the pic is slid by one tile.
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .playerTurn
coord hl, 12, 0
@@ -1758,7 +1758,7 @@
.rowLoop ; iterates once for each row
ld c, 8
.tileLoop ; iterates once for each tile in the row
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .playerTurn2
call .EnemyNextTile
@@ -1821,7 +1821,7 @@
jp Delay3
CopyTempPicToMonPic:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld hl, vBackPic ; player turn
jr z, .next
@@ -1837,7 +1837,7 @@
call BattleAnimCopyTileMapToVRAM
call Delay3
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld a, SCREEN_HEIGHT_PIXELS
ld [hWY], a
ld d, $80 ; terminator
@@ -1865,7 +1865,7 @@
call SaveScreenTilesToBuffer2
call ClearScreen
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Delay3
call LoadScreenTilesFromBuffer2
ld hl, vBGMap1
@@ -1898,7 +1898,7 @@
xor a
ld bc, $0310
call FillMemory
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .playerTurn
ld hl, SlowbroSprite ; facing down sprite
@@ -1937,7 +1937,7 @@
jp FarCopyData2
HideSubstituteShowMonAnim:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld hl, wPlayerMonMinimized
ld a, [wPlayerBattleStatus2]
@@ -1987,7 +1987,7 @@
ld [wChangeMonPicEnemyTurnSpecies], a
ChangeMonPic:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .playerTurn
ld a, [wChangeMonPicEnemyTurnSpecies]
@@ -2020,11 +2020,11 @@
AnimationHideEnemyMonPic:
; Hides the enemy mon's sprite
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld hl, AnimationHideMonPic
call CallWithTurnFlipped
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
jp Delay3
InitMultipleObjectsOAM:
@@ -2050,7 +2050,7 @@
AnimationHideMonPic:
; Hides the mon's sprite.
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .playerTurn
ld a, 12
@@ -2078,7 +2078,7 @@
; in order to show only a portion of the mon sprite.
GetMonSpriteTileMapPointerFromRowCount:
push de
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr nz, .enemyTurn
ld a, 20 * 5 + 1
@@ -2166,7 +2166,7 @@
ld b, a
call IsCryMove
jr nc, .NotCryMove
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr nz, .next
ld a, [wBattleMonSpecies] ; get number of current monster
@@ -2211,7 +2211,7 @@
INCLUDE "data/moves/sfx.asm"
CopyPicTiles:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, $31 ; base tile ID of player mon sprite
jr z, .next
@@ -2235,7 +2235,7 @@
CopyTileIDs_NoBGTransfer:
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
; fall through
; b = number of rows
@@ -2261,7 +2261,7 @@
dec b
jr nz, .rowLoop
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
pop hl
ret
@@ -2624,9 +2624,9 @@
BattleAnimCopyTileMapToVRAM:
ld a, h
- ld [H_AUTOBGTRANSFERDEST + 1], a
+ ld [hAutoBGTransferDest + 1], a
ld a, l
- ld [H_AUTOBGTRANSFERDEST], a
+ ld [hAutoBGTransferDest], a
jp Delay3
TossBallAnimation:
--- a/engine/battle/battle_transitions.asm
+++ b/engine/battle/battle_transitions.asm
@@ -1,6 +1,6 @@
BattleTransition:
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Delay3
xor a
ld [hWY], a
@@ -349,7 +349,7 @@
.loop
push bc
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
coord hl, 0, 7
coord de, 0, 8
ld bc, -SCREEN_WIDTH * 2
@@ -367,7 +367,7 @@
ld bc, 2
call BattleTransition_CopyTiles2
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld c, 6
call DelayFrames
pop bc
@@ -381,7 +381,7 @@
BattleTransition_Split:
ld c, SCREEN_HEIGHT / 2
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
.loop
push bc
coord hl, 0, 16
@@ -496,7 +496,7 @@
coord hl, 0, 0
coord de, 1, 17
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
.loop
push bc
push hl
@@ -535,7 +535,7 @@
coord hl, 0, 0
coord de, 19, 1
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
.loop
push bc
push hl
@@ -582,7 +582,7 @@
ld b, $3
call BattleTransition_FlashScreen_
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ret
BattleTransition_Circle_Sub1:
@@ -601,10 +601,10 @@
BattleTransition_TransferDelay3:
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Delay3
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ret
; used for low level wild non-dungeon battles
--- a/engine/battle/common_text.asm
+++ b/engine/battle/common_text.asm
@@ -101,16 +101,16 @@
ld hl, GoText
jr z, .printText
xor a
- ld [H_MULTIPLICAND], a
+ ld [hMultiplicand], a
ld hl, wEnemyMonHP
ld a, [hli]
ld [wLastSwitchInEnemyMonHP], a
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand + 1], a
ld a, [hl]
ld [wLastSwitchInEnemyMonHP + 1], a
- ld [H_MULTIPLICAND + 2], a
+ ld [hMultiplicand + 2], a
ld a, 25
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
call Multiply
ld hl, wEnemyMonMaxHP
ld a, [hli]
@@ -121,9 +121,9 @@
rr b
ld a, b
ld b, 4
- ld [H_DIVISOR], a ; enemy mon max HP divided by 4
+ ld [hDivisor], a ; enemy mon max HP divided by 4
call Divide
- ld a, [H_QUOTIENT + 3] ; a = (enemy mon current HP * 25) / (enemy max HP / 4); this approximates the current percentage of max HP
+ ld a, [hQuotient + 3] ; a = (enemy mon current HP * 25) / (enemy max HP / 4); this approximates the current percentage of max HP
ld hl, GoText ; 70% or greater
cp 70
jr nc, .printText
@@ -179,14 +179,14 @@
dec hl
ld a, [de]
sub b
- ld [H_MULTIPLICAND + 2], a
+ ld [hMultiplicand + 2], a
dec de
ld b, [hl]
ld a, [de]
sbc b
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand + 1], a
ld a, 25
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
call Multiply
ld hl, wEnemyMonMaxHP
ld a, [hli]
@@ -197,11 +197,11 @@
rr b
ld a, b
ld b, 4
- ld [H_DIVISOR], a
+ ld [hDivisor], a
call Divide
pop bc
pop de
- ld a, [H_QUOTIENT + 3] ; a = ((LastSwitchInEnemyMonHP - CurrentEnemyMonHP) / 25) / (EnemyMonMaxHP / 4)
+ ld a, [hQuotient + 3] ; a = ((LastSwitchInEnemyMonHP - CurrentEnemyMonHP) / 25) / (EnemyMonMaxHP / 4)
; Assuming that the enemy mon hasn't gained HP since the last switch in,
; a approximates the percentage that the enemy mon's total HP has decreased
; since the last switch in.
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -57,7 +57,7 @@
ld [wUpdateSpritesEnabled], a
call Delay3
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld b, $70
ld c, $90
ld a, c
@@ -83,7 +83,7 @@
dec c
jr nz, .slideSilhouettesLoop
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld a, $31
ld [hStartTileID], a
coord hl, 1, 5
@@ -92,7 +92,7 @@
ld [hWY], a
ld [rWY], a
inc a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Delay3
ld b, SET_PAL_BATTLE
call RunPaletteCommand
@@ -266,7 +266,7 @@
ld a, SFX_RUN
call PlaySoundWaitForCurrent
xor a
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
jpab AnimationSlideEnemyMonOff
WildRanText:
@@ -412,7 +412,7 @@
jr .playerMovesFirst
.enemyMovesFirst
ld a, $1
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
callab TrainerAI
jr c, .AIActionUsedEnemyFirst
call ExecuteEnemyMove
@@ -450,7 +450,7 @@
jp z, HandlePlayerMonFainted
call DrawHUDsAndHPBars
ld a, $1
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
callab TrainerAI
jr c, .AIActionUsedPlayerFirst
call ExecuteEnemyMove
@@ -470,7 +470,7 @@
HandlePoisonBurnLeechSeed:
ld hl, wBattleMonHP
ld de, wBattleMonStatus
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .playersTurn
ld hl, wEnemyMonHP
@@ -495,7 +495,7 @@
call HandlePoisonBurnLeechSeed_DecreaseOwnHP
.notBurnedOrPoisoned
ld de, wPlayerBattleStatus2
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .playersTurn2
ld de, wEnemyBattleStatus2
@@ -504,16 +504,16 @@
add a
jr nc, .notLeechSeeded
push hl
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
push af
xor $1
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
xor a
ld [wAnimationType], a
ld a, ABSORB
call PlayMoveAnimation ; play leech seed animation (from opposing mon)
pop af
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
pop hl
call HandlePoisonBurnLeechSeed_DecreaseOwnHP
call HandlePoisonBurnLeechSeed_IncreaseEnemyHP
@@ -571,7 +571,7 @@
.nonZeroDamage
ld hl, wPlayerBattleStatus3
ld de, wPlayerToxicCounter
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .playersTurn
ld hl, wEnemyBattleStatus3
@@ -618,7 +618,7 @@
HandlePoisonBurnLeechSeed_IncreaseEnemyHP:
push hl
ld hl, wEnemyMonMaxHP
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .playersTurn
ld hl, wBattleMonMaxHP
@@ -655,19 +655,19 @@
ld [hl], a
ld [wHPBarNewHP], a
.noOverfullHeal
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
xor $1
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
call UpdateCurMonHPBar
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
xor $1
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
pop hl
ret
UpdateCurMonHPBar:
coord hl, 10, 9 ; tile pointer to player HP bar
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, $1
jr z, .playersTurn
@@ -1177,7 +1177,7 @@
db "@"
; slides pic of fainted mon downwards until it disappears
-; bug: when this is called, [H_AUTOBGTRANSFERENABLED] is non-zero, so there is screen tearing
+; bug: when this is called, [hAutoBGTransferEnabled] is non-zero, so there is screen tearing
SlideDownFaintedMonPic:
ld a, [wd730]
push af
@@ -1230,7 +1230,7 @@
; slides the player or enemy trainer off screen
; a is the number of tiles to slide it horizontally (always 9 for the player trainer or 8 for the enemy trainer)
; if a is 8, the slide is to the right, else it is to the left
-; bug: when this is called, [H_AUTOBGTRANSFERENABLED] is non-zero, so there is screen tearing
+; bug: when this is called, [hAutoBGTransferEnabled] is non-zero, so there is screen tearing
SlideTrainerPicOffScreen:
ld [hSlideAmount], a
ld c, a
@@ -1508,9 +1508,9 @@
inc a
ld [wNumRunAttempts], a
ld a, [hli]
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand + 1], a
ld a, [hl]
- ld [H_MULTIPLICAND + 2], a
+ ld [hMultiplicand + 2], a
ld a, [de]
ld [hEnemySpeed], a
inc de
@@ -1517,20 +1517,20 @@
ld a, [de]
ld [hEnemySpeed + 1], a
call LoadScreenTilesFromBuffer1
- ld de, H_MULTIPLICAND + 1
+ ld de, hMultiplicand + 1
ld hl, hEnemySpeed
ld c, 2
call StringCmp
jr nc, .canEscape ; jump if player speed greater than enemy speed
xor a
- ld [H_MULTIPLICAND], a
+ ld [hMultiplicand], a
ld a, 32
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
call Multiply ; multiply player speed by 32
- ld a, [H_PRODUCT + 2]
- ld [H_DIVIDEND], a
- ld a, [H_PRODUCT + 3]
- ld [H_DIVIDEND + 1], a
+ ld a, [hProduct + 2]
+ ld [hDividend], a
+ ld a, [hProduct + 3]
+ ld [hDividend + 1], a
ld a, [hEnemySpeed]
ld b, a
ld a, [hEnemySpeed + 1]
@@ -1541,10 +1541,10 @@
rr a
and a
jr z, .canEscape ; jump if enemy speed divided by 4, mod 256 is 0
- ld [H_DIVISOR], a ; ((enemy speed / 4) % 256)
+ ld [hDivisor], a ; ((enemy speed / 4) % 256)
ld b, $2
call Divide ; divide (player speed * 32) by ((enemy speed / 4) % 256)
- ld a, [H_QUOTIENT + 2]
+ ld a, [hQuotient + 2]
and a ; is the quotient greater than 256?
jr nz, .canEscape ; if so, the player can escape
ld a, [wNumRunAttempts]
@@ -1554,15 +1554,15 @@
dec c
jr z, .compareWithRandomValue
ld b, 30
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
add b
- ld [H_QUOTIENT + 3], a
+ ld [hQuotient + 3], a
jr c, .canEscape
jr .loop
.compareWithRandomValue
call BattleRandom
ld b, a
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
cp b
jr nc, .canEscape ; if the random value was less than or equal to the quotient
; plus 30 times the number of attempts, the player can escape
@@ -1754,7 +1754,7 @@
ld hl, wEnemyBattleStatus1
res USING_TRAPPING_MOVE, [hl]
ld a, $1
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
ld a, POOF_ANIM
call PlayMoveAnimation
coord hl, 4, 11
@@ -1812,7 +1812,7 @@
DrawPlayerHUDAndHPBar:
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
coord hl, 9, 7
lb bc, 5, 11
call ClearScreenArea
@@ -1845,7 +1845,7 @@
coord hl, 10, 9
predef DrawHP
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld hl, wPlayerHPBarColor
call GetBattleHealthBarColor
ld hl, wBattleMonHP
@@ -1873,7 +1873,7 @@
DrawEnemyHUDAndHPBar:
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
coord hl, 0, 0
lb bc, 4, 12
call ClearScreenArea
@@ -1895,9 +1895,9 @@
.skipPrintLevel
ld hl, wEnemyMonHP
ld a, [hli]
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand + 1], a
ld a, [hld]
- ld [H_MULTIPLICAND + 2], a
+ ld [hMultiplicand + 2], a
or [hl] ; is current HP zero?
jr nz, .hpNonzero
; current HP is 0
@@ -1908,45 +1908,45 @@
jp .drawHPBar
.hpNonzero
xor a
- ld [H_MULTIPLICAND], a
+ ld [hMultiplicand], a
ld a, 48
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
call Multiply ; multiply current HP by 48
ld hl, wEnemyMonMaxHP
ld a, [hli]
ld b, a
ld a, [hl]
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld a, b
and a ; is max HP > 255?
jr z, .doDivide
; if max HP > 255, scale both (current HP * 48) and max HP by dividing by 4 so that max HP fits in one byte
; (it needs to be one byte so it can be used as the divisor for the Divide function)
- ld a, [H_DIVISOR]
+ ld a, [hDivisor]
srl b
rr a
srl b
rr a
- ld [H_DIVISOR], a
- ld a, [H_PRODUCT + 2]
+ ld [hDivisor], a
+ ld a, [hProduct + 2]
ld b, a
srl b
- ld a, [H_PRODUCT + 3]
+ ld a, [hProduct + 3]
rr a
srl b
rr a
- ld [H_PRODUCT + 3], a
+ ld [hProduct + 3], a
ld a, b
- ld [H_PRODUCT + 2], a
+ ld [hProduct + 2], a
.doDivide
- ld a, [H_PRODUCT + 2]
- ld [H_DIVIDEND], a
- ld a, [H_PRODUCT + 3]
- ld [H_DIVIDEND + 1], a
+ ld a, [hProduct + 2]
+ ld [hDividend], a
+ ld a, [hProduct + 3]
+ ld [hDividend + 1], a
ld a, $2
ld b, a
call Divide ; divide (current HP * 48) by max HP
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
; set variables for DrawHPBar
ld e, a
ld a, $6
@@ -1958,7 +1958,7 @@
coord hl, 2, 2
call DrawHPBar
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld hl, wEnemyHPBarColor
GetBattleHealthBarColor:
@@ -2469,13 +2469,13 @@
.writemoves
ld de, wMovesString
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
set 2, a
- ld [hFlags_0xFFF6], a
+ ld [hFlagsFFF6], a
call PlaceString
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
res 2, a
- ld [hFlags_0xFFF6], a
+ ld [hFlagsFFF6], a
ret
.regularmenu
@@ -2595,10 +2595,10 @@
call AddNTimes
ld [hl], "▷"
.select
- ld hl, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
set 1, [hl]
call HandleMenuInput
- ld hl, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
res 1, [hl]
bit 6, a
jp nz, SelectMenuItem_CursorUp ; up
@@ -2825,7 +2825,7 @@
PrintMenuItem:
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
coord hl, 0, 8
ld b, 3
ld c, 9
@@ -2847,7 +2847,7 @@
ld hl, wCurrentMenuItem
dec [hl]
xor a
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
ld hl, wBattleMonMoves
ld a, [wCurrentMenuItem]
ld c, a
@@ -2891,7 +2891,7 @@
predef PrintMoveType
.moveDisabled
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
jp Delay3
DisabledText:
@@ -3043,7 +3043,7 @@
ExecutePlayerMove:
xor a
- ld [H_WHOSETURN], a ; set player's turn
+ ld [hWhoseTurn], a ; set player's turn
ld a, [wPlayerSelectedMove]
inc a
jp z, ExecutePlayerMoveDone ; for selected move = FF, skip most of player's turn
@@ -3252,7 +3252,7 @@
; print the ghost battle messages
call IsGhostBattle
ret nz
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr nz, .Ghost
ld a, [wBattleMonStatus] ; player’s turn
@@ -3619,7 +3619,7 @@
PrintMoveIsDisabledText:
ld hl, wPlayerSelectedMove
ld de, wPlayerBattleStatus1
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .removeChargingUp
inc hl
@@ -3675,11 +3675,11 @@
xor a
ld [wAnimationType], a
inc a
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
call PlayMoveAnimation
call DrawPlayerHUDAndHPBar
xor a
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
jp ApplyDamageToPlayerPokemon
PrintMonName1Text:
@@ -3694,7 +3694,7 @@
MonName1Text:
TX_FAR _MonName1Text
TX_ASM
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, [wPlayerMoveNum]
ld hl, wPlayerUsedMove
@@ -3818,7 +3818,7 @@
PrintMoveFailureText:
ld de, wPlayerMoveEffect
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .playersTurn
ld de, wEnemyMoveEffect
@@ -3866,7 +3866,7 @@
call PrintText
ld b, $4
predef PredefShakeScreenHorizontally
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr nz, .enemyTurn
jp ApplyDamageToPlayerPokemon
@@ -4160,9 +4160,9 @@
; in the case of a critical hit, reset the player's attack and the enemy's defense to their base values
ld c, 3 ; defense stat
call GetEnemyMonStat
- ld a, [H_PRODUCT + 2]
+ ld a, [hProduct + 2]
ld b, a
- ld a, [H_PRODUCT + 3]
+ ld a, [hProduct + 3]
ld c, a
push bc
ld hl, wPartyMon1Attack
@@ -4192,9 +4192,9 @@
; in the case of a critical hit, reset the player's and enemy's specials to their base values
ld c, 5 ; special stat
call GetEnemyMonStat
- ld a, [H_PRODUCT + 2]
+ ld a, [hProduct + 2]
ld b, a
- ld a, [H_PRODUCT + 3]
+ ld a, [hProduct + 3]
ld c, a
push bc
ld hl, wPartyMon1Special
@@ -4281,7 +4281,7 @@
push bc
ld c, 2 ; attack stat
call GetEnemyMonStat
- ld hl, H_PRODUCT + 2
+ ld hl, hProduct + 2
pop bc
jr .scaleStats
.specialAttack
@@ -4313,7 +4313,7 @@
push bc
ld c, 5 ; special stat
call GetEnemyMonStat
- ld hl, H_PRODUCT + 2
+ ld hl, hProduct + 2
pop bc
; if either the offensive or defensive stat is too large to store in a byte, scale both stats by dividing them by 4
; this allows values with up to 10 bits (values up to 1023) to be handled
@@ -4371,9 +4371,9 @@
ld bc, wEnemyMon2 - wEnemyMon1
call AddNTimes
ld a, [hli]
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand + 1], a
ld a, [hl]
- ld [H_MULTIPLICAND + 2], a
+ ld [hMultiplicand + 2], a
pop bc
pop de
ret
@@ -4404,7 +4404,7 @@
; d: base power
; e: level
- ld a, [H_WHOSETURN] ; whose turn?
+ ld a, [hWhoseTurn] ; whose turn?
and a
ld a, [wPlayerMoveEffect]
jr z, .effect
@@ -4436,7 +4436,7 @@
.skipbp
xor a
- ld hl, H_DIVIDEND
+ ld hl, hDividend
ldi [hl], a
ldi [hl], a
ld [hl], a
@@ -4487,41 +4487,41 @@
ld hl, wDamage
ld b, [hl]
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
add b
- ld [H_QUOTIENT + 3], a
+ ld [hQuotient + 3], a
jr nc, .asm_3dfd0
- ld a, [H_QUOTIENT + 2]
+ ld a, [hQuotient + 2]
inc a
- ld [H_QUOTIENT + 2], a
+ ld [hQuotient + 2], a
and a
jr z, .asm_3e004
.asm_3dfd0
- ld a, [H_QUOTIENT]
+ ld a, [hQuotient]
ld b, a
- ld a, [H_QUOTIENT + 1]
+ ld a, [hQuotient + 1]
or a
jr nz, .asm_3e004
- ld a, [H_QUOTIENT + 2]
+ ld a, [hQuotient + 2]
cp 998 / $100
jr c, .asm_3dfe8
cp 998 / $100 + 1
jr nc, .asm_3e004
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
cp 998 % $100
jr nc, .asm_3e004
.asm_3dfe8
inc hl
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
ld b, [hl]
add b
ld [hld], a
- ld a, [H_QUOTIENT + 2]
+ ld a, [hQuotient + 2]
ld b, [hl]
adc b
ld [hl], a
@@ -4573,7 +4573,7 @@
CriticalHitTest:
xor a
ld [wCriticalHitOrOHKO], a
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, [wEnemyMonSpecies]
jr nz, .handleEnemy
@@ -4584,7 +4584,7 @@
ld a, [wMonHBaseSpeed]
ld b, a
srl b ; (effective (base speed/2))
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld hl, wPlayerMovePower
ld de, wPlayerBattleStatus2
@@ -4646,7 +4646,7 @@
; the outcome may be affected by the player's actions in the move selection menu prior to switching the Pokemon.
; This might also lead to desync glitches in link battles.
- ld a, [H_WHOSETURN] ; whose turn
+ ld a, [hWhoseTurn] ; whose turn
and a
; player's turn
ld hl, wEnemySelectedMove
@@ -4954,7 +4954,7 @@
; values for player turn
ld de, wEnemySubstituteHP
ld bc, wEnemyBattleStatus2
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .applyDamageToSubstitute
; values for enemy turn
@@ -4979,14 +4979,14 @@
ld hl, SubstituteBrokeText
call PrintText
; flip whose turn it is for the next function call
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
xor $01
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
callab HideSubstituteShowMonAnim ; animate the substitute breaking
; flip the turn back to the way it was
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
xor $01
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
ld hl, wPlayerMoveEffect ; value for player's turn
and a
jr z, .nullifyEffect
@@ -5010,7 +5010,7 @@
ld hl, wEnemyBattleStatus2
ld de, wEnemyMonStatMods
ld bc, wEnemyMoveNum
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .next
; values for the enemy turn
@@ -5023,9 +5023,9 @@
ld a, [de]
cp $0d ; maximum stat modifier value
ret z ; return if attack modifier is already maxed
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
xor $01 ; flip turn for the stat modifier raising function
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
; temporarily change the target pokemon's move to $00 and the effect to the one
; that causes the attack modifier to go up one stage
ld h, b
@@ -5042,9 +5042,9 @@
ldd [hl], a ; null move effect
ld a, RAGE
ld [hl], a ; restore the target pokemon's move number to Rage
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
xor $01 ; flip turn back to the way it was
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
ret
BuildingRageText:
@@ -5060,7 +5060,7 @@
; wPlayerUsedMove is also set to 0 whenever the player is fast asleep or frozen solid.
; wEnemyUsedMove is also set to 0 whenever the enemy is fast asleep or frozen solid.
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
; values for player turn
ld a, [wEnemyUsedMove]
@@ -5113,7 +5113,7 @@
; values for player turn
ld de, wPlayerMoveNum
ld hl, wPlayerSelectedMove
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .pickMoveLoop
; values for enemy turn
@@ -5135,7 +5135,7 @@
; it's used to prevent moves that run another move within the same turn
; (like Mirror Move and Metronome) from losing 2 PP
IncrementMovePP:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
; values for player turn
ld hl, wBattleMonPP
@@ -5154,7 +5154,7 @@
ld h, d
ld l, e
add hl, bc
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, [wPlayerMonNumber] ; value for player turn
jr z, .updatePP
@@ -5178,7 +5178,7 @@
ld e, [hl] ; e = type 2 of defender
ld a, [wPlayerMoveType]
ld [wMoveType], a
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .next
; values for enemy turn
@@ -5242,25 +5242,25 @@
and $80
ld b, a
ld a, [hl] ; a = damage multiplier
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
add b
ld [wDamageMultipliers], a
xor a
- ld [H_MULTIPLICAND], a
+ ld [hMultiplicand], a
ld hl, wDamage
ld a, [hli]
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand + 1], a
ld a, [hld]
- ld [H_MULTIPLICAND + 2], a
+ ld [hMultiplicand + 2], a
call Multiply
ld a, 10
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, $04
call Divide
- ld a, [H_QUOTIENT + 2]
+ ld a, [hQuotient + 2]
ld [hli], a
ld b, a
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
ld [hl], a
or b ; is damage 0?
jr nz, .skipTypeImmunity
@@ -5325,7 +5325,7 @@
ld hl, wEnemyBattleStatus1
ld de, wPlayerMoveEffect
ld bc, wEnemyMonStatus
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .dreamEaterCheck
; enemy's turn
@@ -5354,7 +5354,7 @@
.checkForDigOrFlyStatus
bit INVULNERABLE, [hl]
jp nz, .moveMissed
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr nz, .enemyTurn
.playerTurn
@@ -5408,7 +5408,7 @@
call CalcHitChance ; scale the move accuracy according to attacker's accuracy and target's evasion
ld a, [wPlayerMoveAccuracy]
ld b, a
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .doAccuracyCheck
ld a, [wEnemyMoveAccuracy]
@@ -5427,7 +5427,7 @@
ld [hl], a
inc a
ld [wMoveMissed], a
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .playerTurn2
.enemyTurn2
@@ -5442,7 +5442,7 @@
; values for player turn
CalcHitChance:
ld hl, wPlayerMoveAccuracy
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, [wPlayerMonAccuracyMod]
ld b, a
@@ -5462,10 +5462,10 @@
; decreases the hit chance instead of increasing the hit chance)
; zero the high bytes of the multiplicand
xor a
- ld [H_MULTIPLICAND], a
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand], a
+ ld [hMultiplicand + 1], a
ld a, [hl]
- ld [H_MULTIPLICAND + 2], a ; set multiplicand to move accuracy
+ ld [hMultiplicand + 2], a ; set multiplicand to move accuracy
push hl
ld d, $02 ; loop has two iterations
; loop to do the calculations, the first iteration multiplies by the accuracy ratio and
@@ -5480,29 +5480,29 @@
add hl, bc ; hl = address of stat modifier ratio
pop bc
ld a, [hli]
- ld [H_MULTIPLIER], a ; set multiplier to the numerator of the ratio
+ ld [hMultiplier], a ; set multiplier to the numerator of the ratio
call Multiply
ld a, [hl]
- ld [H_DIVISOR], a ; set divisor to the the denominator of the ratio
+ ld [hDivisor], a ; set divisor to the the denominator of the ratio
; (the dividend is the product of the previous multiplication)
ld b, $04 ; number of bytes in the dividend
call Divide
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
ld b, a
- ld a, [H_QUOTIENT + 2]
+ ld a, [hQuotient + 2]
or b
jp nz, .nextCalculation
; make sure the result is always at least one
- ld [H_QUOTIENT + 2], a
+ ld [hQuotient + 2], a
ld a, $01
- ld [H_QUOTIENT + 3], a
+ ld [hQuotient + 3], a
.nextCalculation
ld b, c
dec d
jr nz, .loop
- ld a, [H_QUOTIENT + 2]
+ ld a, [hQuotient + 2]
and a ; is the calculated hit chance over 0xFF?
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
jr z, .storeAccuracy
; if calculated hit chance over 0xFF
ld a, $ff ; set the hit chance to 0xFF
@@ -5522,12 +5522,12 @@
ret c ; return if damage is equal to 0 or 1
.DamageGreaterThanOne
xor a
- ld [H_MULTIPLICAND], a
+ ld [hMultiplicand], a
dec hl
ld a, [hli]
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand + 1], a
ld a, [hl]
- ld [H_MULTIPLICAND + 2], a
+ ld [hMultiplicand + 2], a
; loop until a random number greater than or equal to 217 is generated
.loop
call BattleRandom
@@ -5534,17 +5534,17 @@
rrca
cp 217
jr c, .loop
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
call Multiply ; multiply damage by the random number, which is in the range [217, 255]
ld a, 255
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, $4
call Divide ; divide the result by 255
; store the modified damage
- ld a, [H_QUOTIENT + 2]
+ ld a, [hQuotient + 2]
ld hl, wDamage
ld [hli], a
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
ld [hl], a
ret
@@ -5900,11 +5900,11 @@
ld [hl], a
xor a
ld [wAnimationType], a
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
ld a, POUND
call PlayMoveAnimation
ld a, $1
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
call ApplyDamageToEnemyPokemon
jr .monHurtItselfOrFullyParalysed
.checkIfTriedToUseDisabledMove
@@ -6051,7 +6051,7 @@
ret
GetCurrentMove:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jp z, .player
ld de, wEnemyMoveNum
@@ -6257,13 +6257,13 @@
predef BattleTransition
callab LoadHudAndHpBarAndStatusTilePatterns
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld a, $ff
ld [wUpdateSpritesEnabled], a
call ClearSprites
call ClearScreen
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld [hWY], a
ld [rWY], a
ld [hTilesetType], a
@@ -6340,7 +6340,7 @@
ld [$4000], a
ld hl, vSprites
ld de, sSpriteBuffer1
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
ld b, a
ld c, 7 * 7
call CopyVideoData
@@ -6367,12 +6367,12 @@
xor a
ApplyBurnAndParalysisPenalties:
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
call QuarterSpeedDueToParalysis
jp HalveAttackDueToBurn
QuarterSpeedDueToParalysis:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .playerTurn
.enemyTurn ; quarter the player's speed
@@ -6415,7 +6415,7 @@
ret
HalveAttackDueToBurn:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .playerTurn
.enemyTurn ; halve the player's attack
@@ -6505,35 +6505,35 @@
ld b, 0
add hl, bc
xor a
- ld [H_MULTIPLICAND], a
+ ld [hMultiplicand], a
ld a, [de]
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand + 1], a
inc de
ld a, [de]
- ld [H_MULTIPLICAND + 2], a
+ ld [hMultiplicand + 2], a
ld a, [hli]
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
call Multiply
ld a, [hl]
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, $4
call Divide
pop hl
- ld a, [H_DIVIDEND + 3]
+ ld a, [hDividend + 3]
sub 999 % $100
- ld a, [H_DIVIDEND + 2]
+ ld a, [hDividend + 2]
sbc 999 / $100
jp c, .storeNewStatValue
; cap the stat at 999
ld a, 999 / $100
- ld [H_DIVIDEND + 2], a
+ ld [hDividend + 2], a
ld a, 999 % $100
- ld [H_DIVIDEND + 3], a
+ ld [hDividend + 3], a
.storeNewStatValue
- ld a, [H_DIVIDEND + 2]
+ ld a, [hDividend + 2]
ld [hli], a
ld b, a
- ld a, [H_DIVIDEND + 3]
+ ld a, [hDividend + 3]
ld [hl], a
or b
jr nz, .done
@@ -6683,7 +6683,7 @@
HandleExplodingAnimation:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld hl, wEnemyMonType1
ld de, wEnemyBattleStatus1
@@ -6826,18 +6826,18 @@
call RunPaletteCommand
call SlidePlayerAndEnemySilhouettesOnScreen
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld hl, .emptyString
call PrintText
call SaveScreenTilesToBuffer1
call ClearScreen
ld a, $98
- ld [H_AUTOBGTRANSFERDEST + 1], a
+ ld [hAutoBGTransferDest + 1], a
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Delay3
ld a, $9c
- ld [H_AUTOBGTRANSFERDEST + 1], a
+ ld [hAutoBGTransferDest + 1], a
call LoadScreenTilesFromBuffer1
coord hl, 9, 7
lb bc, 5, 10
@@ -6998,6 +6998,6 @@
ld hl, vSprites
ld de, vBackPic
ld c, (2*SPRITEBUFFERSIZE)/16 ; count of 16-byte chunks to be copied
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
ld b, a
jp CopyVideoData
--- a/engine/battle/effects.asm
+++ b/engine/battle/effects.asm
@@ -4,7 +4,7 @@
ret
_JumpMoveEffect:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, [wPlayerMoveEffect]
jr z, .next1
@@ -26,7 +26,7 @@
SleepEffect:
ld de, wEnemyMonStatus
ld bc, wEnemyBattleStatus2
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jp z, .sleepEffect
ld de, wBattleMonStatus
@@ -78,7 +78,7 @@
PoisonEffect:
ld hl, wEnemyMonStatus
ld de, wPlayerMoveEffect
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .poisonEffect
ld hl, wBattleMonStatus
@@ -121,7 +121,7 @@
set 3, [hl] ; mon is now poisoned
push de
dec de
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld b, ANIM_C7
ld hl, wPlayerBattleStatus3
@@ -175,7 +175,7 @@
ExplodeEffect:
ld hl, wBattleMonHP
ld de, wPlayerBattleStatus2
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .faintUser
ld hl, wEnemyMonHP
@@ -196,7 +196,7 @@
ld [wAnimationType], a
call CheckTargetSubstitute ; test bit 4 of d063/d068 flags [target has substitute flag]
ret nz ; return if they have a substitute, can't effect them
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jp nz, opponentAttacker
ld a, [wEnemyMonStatus]
@@ -308,7 +308,7 @@
; any fire-type move that has a chance inflict burn (all but Fire Spin) will defrost a frozen target
and 1 << FRZ ; are they frozen?
ret z ; return if so
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr nz, .opponent
;player [attacker]
@@ -346,7 +346,7 @@
StatModifierUpEffect:
ld hl, wPlayerMonStatMods
ld de, wPlayerMoveEffect
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .statModifierUpEffect
ld hl, wEnemyMonStatMods
@@ -382,7 +382,7 @@
push hl
ld hl, wBattleMonAttack + 1
ld de, wPlayerMonUnmodifiedAttack
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .pointToStats
ld hl, wEnemyMonAttack + 1
@@ -417,35 +417,35 @@
add hl, bc
pop bc
xor a
- ld [H_MULTIPLICAND], a
+ ld [hMultiplicand], a
ld a, [de]
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand + 1], a
inc de
ld a, [de]
- ld [H_MULTIPLICAND + 2], a
+ ld [hMultiplicand + 2], a
ld a, [hli]
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
call Multiply
ld a, [hl]
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, $4
call Divide
pop hl
; cap at 999
- ld a, [H_PRODUCT + 3]
+ ld a, [hProduct + 3]
sub 999 % $100
- ld a, [H_PRODUCT + 2]
+ ld a, [hProduct + 2]
sbc 999 / $100
jp c, UpdateStat
ld a, 999 / $100
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand + 1], a
ld a, 999 % $100
- ld [H_MULTIPLICAND + 2], a
+ ld [hMultiplicand + 2], a
UpdateStat:
- ld a, [H_PRODUCT + 2]
+ ld a, [hProduct + 2]
ld [hli], a
- ld a, [H_PRODUCT + 3]
+ ld a, [hProduct + 3]
ld [hl], a
pop hl
UpdateStatDone:
@@ -455,7 +455,7 @@
ld hl, wPlayerBattleStatus2
ld de, wPlayerMoveNum
ld bc, wPlayerMonMinimized
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .asm_3f4e6
ld hl, wEnemyBattleStatus2
@@ -488,7 +488,7 @@
pop af
call nz, Bankswitch
.applyBadgeBoostsAndStatusPenalties
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
call z, ApplyBadgeStatBoosts ; whenever the player uses a stat-up move, badge boosts get reapplied again to every stat,
; even to those not affected by the stat-up move (will be boosted further)
@@ -511,7 +511,7 @@
TX_FAR _MonsStatsRoseText
TX_ASM
ld hl, GreatlyRoseText
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, [wPlayerMoveEffect]
jr z, .playerTurn
@@ -534,7 +534,7 @@
ld hl, wEnemyMonStatMods
ld de, wPlayerMoveEffect
ld bc, wEnemyBattleStatus1
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .statModifierDownEffect
ld hl, wPlayerMonStatMods
@@ -601,7 +601,7 @@
push de
ld hl, wEnemyMonAttack + 1
ld de, wEnemyMonUnmodifiedAttack
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .pointToStat
ld hl, wBattleMonAttack + 1
@@ -637,33 +637,33 @@
add hl, bc
pop bc
xor a
- ld [H_MULTIPLICAND], a
+ ld [hMultiplicand], a
ld a, [de]
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand + 1], a
inc de
ld a, [de]
- ld [H_MULTIPLICAND + 2], a
+ ld [hMultiplicand + 2], a
ld a, [hli]
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
call Multiply
ld a, [hl]
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, $4
call Divide
pop hl
- ld a, [H_PRODUCT + 3]
+ ld a, [hProduct + 3]
ld b, a
- ld a, [H_PRODUCT + 2]
+ ld a, [hProduct + 2]
or b
jp nz, UpdateLoweredStat
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand + 1], a
ld a, $1
- ld [H_MULTIPLICAND + 2], a
+ ld [hMultiplicand + 2], a
UpdateLoweredStat:
- ld a, [H_PRODUCT + 2]
+ ld a, [hProduct + 2]
ld [hli], a
- ld a, [H_PRODUCT + 3]
+ ld a, [hProduct + 3]
ld [hl], a
pop de
pop hl
@@ -678,7 +678,7 @@
jr nc, .ApplyBadgeBoostsAndStatusPenalties
call PlayCurrentMoveAnimation2
.ApplyBadgeBoostsAndStatusPenalties
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
call nz, ApplyBadgeStatBoosts ; whenever the player uses a stat-down move, badge boosts get reapplied again to every stat,
; even to those not affected by the stat-up move (will be boosted further)
@@ -713,7 +713,7 @@
TX_FAR _MonsStatsFellText
TX_ASM
ld hl, FellText
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, [wPlayerMoveEffect]
jr z, .playerTurn
@@ -759,7 +759,7 @@
ld hl, wPlayerBattleStatus1
ld de, wPlayerBideAccumulatedDamage
ld bc, wPlayerNumAttacksLeft
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .bideEffect
ld hl, wEnemyBattleStatus1
@@ -778,7 +778,7 @@
inc a
inc a
ld [bc], a ; set Bide counter to 2 or 3 at random
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
add XSTATITEM_ANIM
jp PlayBattleAnimation2
@@ -785,7 +785,7 @@
ThrashPetalDanceEffect:
ld hl, wPlayerBattleStatus1
ld de, wPlayerNumAttacksLeft
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .thrashPetalDanceEffect
ld hl, wEnemyBattleStatus1
@@ -797,12 +797,12 @@
inc a
inc a
ld [de], a ; set thrash/petal dance counter to 2 or 3 at random
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
add ANIM_B0
jp PlayBattleAnimation2
SwitchAndTeleportEffect:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr nz, .handleEnemy
ld a, [wIsInBattle]
@@ -920,7 +920,7 @@
ld hl, wPlayerBattleStatus1
ld de, wPlayerNumAttacksLeft
ld bc, wPlayerNumHits
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .twoToFiveAttacksEffect
ld hl, wEnemyBattleStatus1
@@ -931,7 +931,7 @@
ret nz
set ATTACKING_MULTIPLE_TIMES, [hl] ; mon is now attacking multiple times
ld hl, wPlayerMoveEffect
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .setNumberOfHits
ld hl, wEnemyMoveEffect
@@ -967,7 +967,7 @@
ret nz
ld hl, wEnemyBattleStatus1
ld de, wPlayerMoveEffect
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .flinchSideEffect
ld hl, wPlayerBattleStatus1
@@ -992,7 +992,7 @@
ChargeEffect:
ld hl, wPlayerBattleStatus1
ld de, wPlayerMoveEffect
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld b, XSTATITEM_ANIM
jr z, .chargeEffect
@@ -1074,7 +1074,7 @@
TrappingEffect:
ld hl, wPlayerBattleStatus1
ld de, wPlayerNumAttacksLeft
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .trappingEffect
ld hl, wEnemyBattleStatus1
@@ -1120,7 +1120,7 @@
jr nz, ConfusionEffectFailed
ConfusionSideEffectSuccess:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld hl, wEnemyBattleStatus1
ld bc, wEnemyConfusedCounter
@@ -1164,7 +1164,7 @@
HyperBeamEffect:
ld hl, wPlayerBattleStatus2
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .hyperBeamEffect
ld hl, wEnemyBattleStatus2
@@ -1175,7 +1175,7 @@
ClearHyperBeam:
push hl
ld hl, wEnemyBattleStatus2
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .playerTurn
ld hl, wPlayerBattleStatus2
@@ -1186,7 +1186,7 @@
RageEffect:
ld hl, wPlayerBattleStatus2
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .player
ld hl, wEnemyBattleStatus2
@@ -1201,7 +1201,7 @@
ld a, [wMoveMissed]
and a
jr nz, .mimicMissed
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld hl, wBattleMonMoves
ld a, [wPlayerBattleStatus1]
@@ -1226,7 +1226,7 @@
and a
jr z, .getRandomMove
ld d, a
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld hl, wBattleMonMoves
ld a, [wPlayerMoveListIndex]
@@ -1284,7 +1284,7 @@
jr nz, .moveMissed
ld de, wEnemyDisabledMove
ld hl, wEnemyMonMoves
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .disableEffect
ld de, wPlayerDisabledMove
@@ -1307,7 +1307,7 @@
jr z, .pickMoveToDisable ; loop until a non-00 move slot is found
ld [wd11e], a ; store move number
push hl
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld hl, wBattleMonPP
jr nz, .enemyTurn
@@ -1345,7 +1345,7 @@
ld [de], a
call PlayCurrentMoveAnimation2
ld hl, wPlayerDisabledMoveNumber
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr nz, .printDisableText
inc hl ; wEnemyDisabledMoveNumber
@@ -1430,7 +1430,7 @@
CheckTargetSubstitute:
push hl
ld hl, wEnemyBattleStatus2
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .next1
ld hl, wPlayerBattleStatus2
@@ -1442,7 +1442,7 @@
PlayCurrentMoveAnimation2:
; animation at MOVENUM will be played unless MOVENUM is 0
; plays wAnimationType 3 or 6
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, [wPlayerMoveNum]
jr z, .notEnemyTurn
@@ -1454,7 +1454,7 @@
PlayBattleAnimation2:
; play animation ID at a and animation type 6 or 3
ld [wAnimationID], a
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, $6
jr z, .storeAnimationType
@@ -1468,7 +1468,7 @@
; resets wAnimationType
xor a
ld [wAnimationType], a
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, [wPlayerMoveNum]
jr z, .notEnemyTurn
--- a/engine/battle/experience.asm
+++ b/engine/battle/experience.asm
@@ -55,15 +55,15 @@
jr .gainStatExpLoop
.statExpDone
xor a
- ld [H_MULTIPLICAND], a
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand], a
+ ld [hMultiplicand + 1], a
ld a, [wEnemyMonBaseExp]
- ld [H_MULTIPLICAND + 2], a
+ ld [hMultiplicand + 2], a
ld a, [wEnemyMonLevel]
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
call Multiply
ld a, 7
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, 4
call Divide
ld hl, wPartyMon1OTID - (wPartyMon1DVs - 1)
@@ -91,12 +91,12 @@
inc hl
; add the gained exp to the party mon's exp
ld b, [hl]
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
ld [wExpAmountGained + 1], a
add b
ld [hld], a
ld b, [hl]
- ld a, [H_QUOTIENT + 2]
+ ld a, [hQuotient + 2]
ld [wExpAmountGained], a
adc b
ld [hl], a
@@ -311,14 +311,14 @@
ld c, wEnemyMonBaseExp + 1 - wEnemyMonBaseStats
.divideLoop
xor a
- ld [H_DIVIDEND], a
+ ld [hDividend], a
ld a, [hl]
- ld [H_DIVIDEND + 1], a
+ ld [hDividend + 1], a
ld a, [wd11e]
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, $2
call Divide ; divide value by number of mons gaining exp
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
ld [hli], a
dec c
jr nz, .divideLoop
@@ -326,17 +326,17 @@
; multiplies exp by 1.5
BoostExp:
- ld a, [H_QUOTIENT + 2]
+ ld a, [hQuotient + 2]
ld b, a
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
ld c, a
srl b
rr c
add c
- ld [H_QUOTIENT + 3], a
- ld a, [H_QUOTIENT + 2]
+ ld [hQuotient + 3], a
+ ld a, [hQuotient + 2]
adc b
- ld [H_QUOTIENT + 2], a
+ ld [hQuotient + 2], a
ret
GainedText:
--- a/engine/battle/ghost_marowak_anim.asm
+++ b/engine/battle/ghost_marowak_anim.asm
@@ -9,12 +9,12 @@
call ClearScreenArea
call Delay3
xor a
- ld [H_AUTOBGTRANSFERENABLED], a ; disable BG transfer so we don't see the Marowak too soon
+ ld [hAutoBGTransferEnabled], a ; disable BG transfer so we don't see the Marowak too soon
; replace ghost pic with Marowak in BG
ld a, MAROWAK
ld [wChangeMonPicEnemyTurnSpecies], a
ld a, $1
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
callab ChangeMonPic
; alternate between black and light grey 8 times.
; this makes the ghost's body appear to flash
@@ -44,7 +44,7 @@
and a
jr nz, .fadeInMarowakLoop
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a ; enable BG transfer so the BG Marowak pic will be visible after the sprite one is cleared
+ ld [hAutoBGTransferEnabled], a ; enable BG transfer so the BG Marowak pic will be visible after the sprite one is cleared
call Delay3
jp ClearSprites
--- a/engine/battle/move_effects/conversion.asm
+++ b/engine/battle/move_effects/conversion.asm
@@ -1,7 +1,7 @@
ConversionEffect_:
ld hl, wEnemyMonType1
ld de, wBattleMonType1
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, [wEnemyBattleStatus1]
jr z, .conversionEffect
--- a/engine/battle/move_effects/drain_hp.asm
+++ b/engine/battle/move_effects/drain_hp.asm
@@ -14,7 +14,7 @@
.getAttackerHP
ld hl, wBattleMonHP
ld de, wBattleMonMaxHP
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jp z, .addDamageToAttackerHP
ld hl, wEnemyMonHP
@@ -69,7 +69,7 @@
ld [wHPBarNewHP+1], a
inc de
.next
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
coord hl, 10, 9
ld a, $1
@@ -83,7 +83,7 @@
predef DrawEnemyHUDAndHPBar
callab ReadPlayerMonCurHPAndStatus
ld hl, SuckedHealthText
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, [wPlayerMoveEffect]
jr z, .next3
--- a/engine/battle/move_effects/focus_energy.asm
+++ b/engine/battle/move_effects/focus_energy.asm
@@ -1,6 +1,6 @@
FocusEnergyEffect_:
ld hl, wPlayerBattleStatus2
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .notEnemy
ld hl, wEnemyBattleStatus2
--- a/engine/battle/move_effects/haze.asm
+++ b/engine/battle/move_effects/haze.asm
@@ -15,7 +15,7 @@
; cure non-volatile status, but only for the target
ld hl, wEnemyMonStatus
ld de, wEnemySelectedMove
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .cureStatuses
ld hl, wBattleMonStatus
--- a/engine/battle/move_effects/heal.asm
+++ b/engine/battle/move_effects/heal.asm
@@ -1,5 +1,5 @@
HealEffect_:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld de, wBattleMonHP
ld hl, wBattleMonMaxHP
@@ -27,7 +27,7 @@
ld c, 50
call DelayFrames
ld hl, wBattleMonStatus
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .restEffect
ld hl, wEnemyMonStatus
@@ -87,7 +87,7 @@
.playAnim
ld hl, PlayCurrentMoveAnimation
call BankswitchEtoF
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
coord hl, 10, 9
ld a, $1
--- a/engine/battle/move_effects/leech_seed.asm
+++ b/engine/battle/move_effects/leech_seed.asm
@@ -5,7 +5,7 @@
jr nz, .moveMissed
ld hl, wEnemyBattleStatus2
ld de, wEnemyMonType1
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .leechSeedEffect
ld hl, wPlayerBattleStatus2
--- a/engine/battle/move_effects/mist.asm
+++ b/engine/battle/move_effects/mist.asm
@@ -1,6 +1,6 @@
MistEffect_:
ld hl, wPlayerBattleStatus2
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .mistEffect
ld hl, wEnemyBattleStatus2
--- a/engine/battle/move_effects/one_hit_ko.asm
+++ b/engine/battle/move_effects/one_hit_ko.asm
@@ -7,7 +7,7 @@
ld [wCriticalHitOrOHKO], a
ld hl, wBattleMonSpeed + 1
ld de, wEnemyMonSpeed + 1
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .compareSpeed
ld hl, wEnemyMonSpeed + 1
--- a/engine/battle/move_effects/paralyze.asm
+++ b/engine/battle/move_effects/paralyze.asm
@@ -1,7 +1,7 @@
ParalyzeEffect_:
ld hl, wEnemyMonStatus
ld de, wPlayerMoveType
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jp z, .next
ld hl, wBattleMonStatus
--- a/engine/battle/move_effects/pay_day.asm
+++ b/engine/battle/move_effects/pay_day.asm
@@ -2,7 +2,7 @@
xor a
ld hl, wcd6d
ld [hli], a
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, [wBattleMonLevel]
jr z, .payDayEffect
@@ -10,28 +10,28 @@
.payDayEffect
; level * 2
add a
- ld [H_DIVIDEND + 3], a
+ ld [hDividend + 3], a
xor a
- ld [H_DIVIDEND], a
- ld [H_DIVIDEND + 1], a
- ld [H_DIVIDEND + 2], a
+ ld [hDividend], a
+ ld [hDividend + 1], a
+ ld [hDividend + 2], a
; convert to BCD
ld a, 100
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, $4
call Divide
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
ld [hli], a
- ld a, [H_REMAINDER]
- ld [H_DIVIDEND + 3], a
+ ld a, [hRemainder]
+ ld [hDividend + 3], a
ld a, 10
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, $4
call Divide
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
swap a
ld b, a
- ld a, [H_REMAINDER]
+ ld a, [hRemainder]
add b
ld [hl], a
ld de, wTotalPayDayMoney + 2
--- a/engine/battle/move_effects/recoil.asm
+++ b/engine/battle/move_effects/recoil.asm
@@ -1,5 +1,5 @@
RecoilEffect_:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, [wPlayerMoveNum]
ld hl, wBattleMonMaxHP
@@ -54,7 +54,7 @@
ld [hl], a
.getHPBarCoords
coord hl, 10, 9
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, $1
jr z, .updateHPBar
--- a/engine/battle/move_effects/reflect_light_screen.asm
+++ b/engine/battle/move_effects/reflect_light_screen.asm
@@ -1,7 +1,7 @@
ReflectLightScreenEffect_:
ld hl, wPlayerBattleStatus3
ld de, wPlayerMoveEffect
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .reflectLightScreenEffect
ld hl, wEnemyBattleStatus3
--- a/engine/battle/move_effects/substitute.asm
+++ b/engine/battle/move_effects/substitute.asm
@@ -4,7 +4,7 @@
ld hl, wBattleMonMaxHP
ld de, wPlayerSubstituteHP
ld bc, wPlayerBattleStatus2
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .notEnemy
ld hl, wEnemyMonMaxHP
--- a/engine/battle/move_effects/transform.asm
+++ b/engine/battle/move_effects/transform.asm
@@ -3,7 +3,7 @@
ld de, wEnemyMonSpecies
ld bc, wEnemyBattleStatus3
ld a, [wEnemyBattleStatus1]
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr nz, .hitTest
ld hl, wEnemyMonSpecies
@@ -18,7 +18,7 @@
push de
push bc
ld hl, wPlayerBattleStatus2
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .transformEffect
ld hl, wEnemyBattleStatus2
@@ -64,7 +64,7 @@
inc bc
inc bc
call CopyData
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .next
; save enemy mon DVs at wTransformedEnemyMonOriginalDVs
@@ -128,7 +128,7 @@
jp PrintText
.copyBasedOnTurn
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
jr z, .gotStatsOrModsToCopy
push hl
--- a/engine/battle/scale_sprites.asm
+++ b/engine/battle/scale_sprites.asm
@@ -41,7 +41,7 @@
ScaleLastSpriteColumnByTwo:
ld a, 4*8 - 4 ; $1c, 4 tiles minus 4 unused rows
- ld [H_SPRITEINTERLACECOUNTER], a
+ ld [hSpriteInterlaceCounter], a
ld bc, -1
.columnInnerLoop
ld a, [de]
@@ -48,9 +48,9 @@
dec de
swap a ; only high nybble contains information
call ScalePixelsByTwo
- ld a, [H_SPRITEINTERLACECOUNTER]
+ ld a, [hSpriteInterlaceCounter]
dec a
- ld [H_SPRITEINTERLACECOUNTER], a
+ ld [hSpriteInterlaceCounter], a
jr nz, .columnInnerLoop
dec de ; skip last 4 rows of new column
dec de
--- a/engine/battle/trainer_ai.asm
+++ b/engine/battle/trainer_ai.asm
@@ -655,17 +655,17 @@
AICheckIfHPBelowFraction:
; return carry if enemy trainer's current HP is below 1 / a of the maximum
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld hl, wEnemyMonMaxHP
ld a, [hli]
- ld [H_DIVIDEND], a
+ ld [hDividend], a
ld a, [hl]
- ld [H_DIVIDEND + 1], a
+ ld [hDividend + 1], a
ld b, 2
call Divide
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
ld c, a
- ld a, [H_QUOTIENT + 2]
+ ld a, [hQuotient + 2]
ld b, a
ld hl, wEnemyMonHP + 1
ld a, [hld]
--- a/engine/battle/unused_stats_functions.asm
+++ b/engine/battle/unused_stats_functions.asm
@@ -1,6 +1,6 @@
; does nothing since no stats are ever selected (barring glitches)
DoubleSelectedStats:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, [wPlayerStatsToDouble]
ld hl, wBattleMonAttack + 1
@@ -30,7 +30,7 @@
; does nothing since no stats are ever selected (barring glitches)
HalveSelectedStats:
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
and a
ld a, [wPlayerStatsToHalve]
ld hl, wBattleMonAttack
--- a/engine/debug/test_battle.asm
+++ b/engine/debug/test_battle.asm
@@ -41,5 +41,5 @@
; do it all again.
ld a, 1
ld [wUpdateSpritesEnabled], a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
jr .loop
--- a/engine/events/hidden_objects/museum_fossils.asm
+++ b/engine/events/hidden_objects/museum_fossils.asm
@@ -26,7 +26,7 @@
; Displays a pokemon's front sprite in a pop-up window.
; [wcf91] = pokemon internal id number
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Delay3
xor a
ld [hWY], a
--- a/engine/events/hidden_objects/town_map.asm
+++ b/engine/events/hidden_objects/town_map.asm
@@ -10,7 +10,7 @@
xor a
ld [hWY], a
inc a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call LoadFontTilePatterns
callba DisplayTownMap
ld hl, wd730
@@ -17,6 +17,6 @@
res 6, [hl]
ld de, TextScriptEnd
push de
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
jp CloseTextDisplay
--- a/engine/gfx/hp_bar.asm
+++ b/engine/gfx/hp_bar.asm
@@ -6,7 +6,7 @@
GetHPBarLength:
push hl
xor a
- ld hl, H_MULTIPLICAND
+ ld hl, hMultiplicand
ld [hli], a
ld a, b
ld [hli], a
@@ -21,22 +21,22 @@
rr e
srl d
rr e
- ld a, [H_MULTIPLICAND+1]
+ ld a, [hMultiplicand+1]
ld b, a
- ld a, [H_MULTIPLICAND+2]
+ ld a, [hMultiplicand+2]
srl b ; divide multiplication result as well
rr a
srl b
rr a
- ld [H_MULTIPLICAND+2], a
+ ld [hMultiplicand+2], a
ld a, b
- ld [H_MULTIPLICAND+1], a
+ ld [hMultiplicand+1], a
.maxHPSmaller256
ld a, e
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, $4
call Divide
- ld a, [H_MULTIPLICAND+2]
+ ld a, [hMultiplicand+2]
ld e, a ; e = bc * 48 / de (num of pixels of HP bar)
pop hl
and a
@@ -213,7 +213,7 @@
ld a, [wHPBarOldHP + 1]
ld [wHPBarTempHP], a
push hl
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
bit 0, a
jr z, .asm_fb15
ld de, $9
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -239,14 +239,14 @@
; Calculate MaxHP * 255.
xor a
- ld [H_MULTIPLICAND], a
+ ld [hMultiplicand], a
ld hl, wEnemyMonMaxHP
ld a, [hli]
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand + 1], a
ld a, [hl]
- ld [H_MULTIPLICAND + 2], a
+ ld [hMultiplicand + 2], a
ld a, 255
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
call Multiply
; Determine BallFactor. It's 8 for Great Balls and 12 for the others.
@@ -260,7 +260,7 @@
; Note that the results of all division operations are floored.
; Calculate (MaxHP * 255) / BallFactor.
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, 4 ; number of bytes in dividend
call Divide
@@ -281,17 +281,17 @@
.skip2
; Let W = ((MaxHP * 255) / BallFactor) / max(HP / 4, 1). Calculate W.
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, 4
call Divide
-; If W > 255, store 255 in [H_QUOTIENT + 3].
-; Let X = min(W, 255) = [H_QUOTIENT + 3].
- ld a, [H_QUOTIENT + 2]
+; If W > 255, store 255 in [hQuotient + 3].
+; Let X = min(W, 255) = [hQuotient + 3].
+ ld a, [hQuotient + 2]
and a
jr z, .skip3
ld a, 255
- ld [H_QUOTIENT + 3], a
+ ld [hQuotient + 3], a
.skip3
pop bc ; b = Rand1 - Status
@@ -302,7 +302,7 @@
jr c, .failedToCapture
; If W > 255, the ball captures the Pokémon.
- ld a, [H_QUOTIENT + 2]
+ ld a, [hQuotient + 2]
and a
jr nz, .captured
@@ -310,7 +310,7 @@
; If Rand2 > X, the ball fails to capture the Pokémon.
ld b, a
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
cp b
jr c, .failedToCapture
@@ -318,17 +318,17 @@
jr .skipShakeCalculations
.failedToCapture
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
ld [wPokeBallCaptureCalcTemp], a ; Save X.
; Calculate CatchRate * 100.
xor a
- ld [H_MULTIPLICAND], a
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand], a
+ ld [hMultiplicand + 1], a
ld a, [wEnemyMonActualCatchRate]
- ld [H_MULTIPLICAND + 2], a
+ ld [hMultiplicand + 2], a
ld a, 100
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
call Multiply
; Determine BallFactor2.
@@ -349,7 +349,7 @@
.skip4
; Let Y = (CatchRate * 100) / BallFactor2. Calculate Y.
ld a, b
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, 4
call Divide
@@ -356,7 +356,7 @@
; If Y > 255, there are 3 shakes.
; Note that this shouldn't be possible.
; The maximum value of Y is (255 * 100) / 150 = 170.
- ld a, [H_QUOTIENT + 2]
+ ld a, [hQuotient + 2]
and a
ld b, $63 ; 3 shakes
jr nz, .setAnimData
@@ -363,12 +363,12 @@
; Calculate X * Y.
ld a, [wPokeBallCaptureCalcTemp]
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
call Multiply
; Calculate (X * Y) / 255.
ld a, 255
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, 4
call Divide
@@ -386,19 +386,19 @@
.addAilmentValue
; If the Pokémon has a status ailment, add Status2.
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
add b
- ld [H_QUOTIENT + 3], a
+ ld [hQuotient + 3], a
.skip5
; Finally determine the number of shakes.
-; Let Z = ((X * Y) / 255) + Status2 = [H_QUOTIENT + 3].
+; Let Z = ((X * Y) / 255) + Status2 = [hQuotient + 3].
; The number of shakes depend on the range Z is in.
; 0 ≤ Z < 10: 0 shakes (the ball misses)
; 10 ≤ Z < 30: 1 shake
; 30 ≤ Z < 70: 2 shakes
; 70 ≤ Z: 3 shakes
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
cp 10
ld b, $20
jr c, .setAnimData
@@ -422,7 +422,7 @@
ld a, TOSS_ANIM
ld [wAnimationID], a
xor a
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
ld [wAnimationType], a
ld [wDamageMultipliers], a
ld a, [wWhichPokemon]
@@ -1018,18 +1018,18 @@
call AddNTimes
ld a, [hli]
ld [wHPBarMaxHP + 1], a
- ld [H_DIVIDEND], a
+ ld [hDividend], a
ld a, [hl]
ld [wHPBarMaxHP], a
- ld [H_DIVIDEND + 1], a
+ ld [hDividend + 1], a
ld a, 5
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, 2 ; number of bytes
call Divide ; get 1/5 of max HP of pokemon that used Softboiled
ld bc, (wPartyMon1HP + 1) - (wPartyMon1MaxHP + 1)
add hl, bc ; hl now points to LSB of current HP of pokemon that used Softboiled
; subtract 1/5 of max HP from current HP of pokemon that used Softboiled
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
push af
ld b, a
ld a, [hl]
@@ -1037,7 +1037,7 @@
sub b
ld [hld], a
ld [wHPBarNewHP], a
- ld a, [H_QUOTIENT + 2]
+ ld a, [hQuotient + 2]
ld b, a
ld a, [hl]
ld [wHPBarOldHP+1], a
@@ -1050,15 +1050,15 @@
call AddNTimes ; calculate coordinates of HP bar of pokemon that used Softboiled
ld a, SFX_HEAL_HP
call PlaySoundWaitForCurrent
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
set 0, a
- ld [hFlags_0xFFF6], a
+ ld [hFlagsFFF6], a
ld a, $02
ld [wHPBarType], a
predef UpdateHPBar2 ; animate HP bar decrease of pokemon that used Softboiled
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
res 0, a
- ld [hFlags_0xFFF6], a
+ ld [hFlagsFFF6], a
pop af
ld b, a ; store heal amount (1/5 of max HP)
ld hl, wHPBarOldHP + 1
@@ -1200,15 +1200,15 @@
jr z, .playStatusAilmentCuringSound
ld a, SFX_HEAL_HP
call PlaySoundWaitForCurrent
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
set 0, a
- ld [hFlags_0xFFF6], a
+ ld [hFlagsFFF6], a
ld a, $02
ld [wHPBarType], a
predef UpdateHPBar2 ; animate the HP bar lengthening
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
res 0, a
- ld [hFlags_0xFFF6], a
+ ld [hFlagsFFF6], a
ld a, REVIVE_MSG
ld [wPartyMenuTypeOrMessageID], a
ld a, [wcf91]
@@ -1224,13 +1224,13 @@
call PlaySoundWaitForCurrent
.showHealingItemMessage
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call ClearScreen
dec a
ld [wUpdateSpritesEnabled], a
call RedrawPartyMenu ; redraws the party menu and displays the message
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld c, 50
call DelayFrames
call WaitForTextScrollButtonPress
@@ -1459,7 +1459,7 @@
ld [wAnimationID], a
xor a
ld [wAnimationType], a
- ld [H_WHOSETURN], a
+ ld [hWhoseTurn], a
ld [de], a ; zero escape factor (for bait), zero bait factor (for rock)
.randomLoop ; loop until a random number less than 5 is generated
call Random
@@ -1698,7 +1698,7 @@
call LoadScreenTilesFromBuffer1 ; restore saved screen
call Delay3
xor a
- ld [H_WHOSETURN], a ; set turn to player's turn
+ ld [hWhoseTurn], a ; set turn to player's turn
callba StatModifierUpEffect ; do stat increase move
pop hl
pop af
@@ -2463,13 +2463,13 @@
AddBonusPP:
push bc
ld a, [de] ; normal max PP of move
- ld [H_DIVIDEND + 3], a
+ ld [hDividend + 3], a
xor a
- ld [H_DIVIDEND], a
- ld [H_DIVIDEND + 1], a
- ld [H_DIVIDEND + 2], a
+ ld [hDividend], a
+ ld [hDividend + 1], a
+ ld [hDividend + 2], a
ld a, 5
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, 4
call Divide
ld a, [hl] ; move PP
@@ -2480,7 +2480,7 @@
srl a
ld c, a ; c = number of PP Ups used
.loop
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
cp 8 ; is the amount greater than or equal to 8?
jr c, .addAmount
ld a, 7 ; cap the amount at 7
--- a/engine/link/cable_club.asm
+++ b/engine/link/cable_club.asm
@@ -338,10 +338,10 @@
ld a, 1
ld [wTopMenuItemX], a
.enemyMonMenu_HandleInput
- ld hl, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
set 1, [hl]
call HandleMenuInput
- ld hl, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
res 1, [hl]
and a
jp z, .getNewInput
@@ -403,10 +403,10 @@
lb bc, 6, 1
call ClearScreenArea
.playerMonMenu_HandleInput
- ld hl, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
set 1, [hl]
call HandleMenuInput
- ld hl, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
res 1, [hl]
and a ; was anything pressed?
jr nz, .playerMonMenu_SomethingPressed
--- a/engine/math/multiply_divide.asm
+++ b/engine/math/multiply_divide.asm
@@ -2,120 +2,120 @@
ld a, $8
ld b, a
xor a
- ld [H_PRODUCT], a
- ld [H_MULTIPLYBUFFER], a
- ld [H_MULTIPLYBUFFER+1], a
- ld [H_MULTIPLYBUFFER+2], a
- ld [H_MULTIPLYBUFFER+3], a
+ ld [hProduct], a
+ ld [hMultiplyBuffer], a
+ ld [hMultiplyBuffer+1], a
+ ld [hMultiplyBuffer+2], a
+ ld [hMultiplyBuffer+3], a
.loop
- ld a, [H_MULTIPLIER]
+ ld a, [hMultiplier]
srl a
- ld [H_MULTIPLIER], a ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN)
+ ld [hMultiplier], a ; (aliases: hDivisor, hMultiplier, hPowerOf10)
jr nc, .smallMultiplier
- ld a, [H_MULTIPLYBUFFER+3]
+ ld a, [hMultiplyBuffer+3]
ld c, a
- ld a, [H_MULTIPLICAND+2]
+ ld a, [hMultiplicand+2]
add c
- ld [H_MULTIPLYBUFFER+3], a
- ld a, [H_MULTIPLYBUFFER+2]
+ ld [hMultiplyBuffer+3], a
+ ld a, [hMultiplyBuffer+2]
ld c, a
- ld a, [H_MULTIPLICAND+1]
+ ld a, [hMultiplicand+1]
adc c
- ld [H_MULTIPLYBUFFER+2], a
- ld a, [H_MULTIPLYBUFFER+1]
+ ld [hMultiplyBuffer+2], a
+ ld a, [hMultiplyBuffer+1]
ld c, a
- ld a, [H_MULTIPLICAND] ; (aliases: H_MULTIPLICAND)
+ ld a, [hMultiplicand] ; (aliases: hMultiplicand)
adc c
- ld [H_MULTIPLYBUFFER+1], a
- ld a, [H_MULTIPLYBUFFER]
+ ld [hMultiplyBuffer+1], a
+ ld a, [hMultiplyBuffer]
ld c, a
- ld a, [H_PRODUCT] ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT)
+ ld a, [hProduct] ; (aliases: hProduct, hPastLeadingZeros, hQuotient)
adc c
- ld [H_MULTIPLYBUFFER], a
+ ld [hMultiplyBuffer], a
.smallMultiplier
dec b
jr z, .done
- ld a, [H_MULTIPLICAND+2]
+ ld a, [hMultiplicand+2]
sla a
- ld [H_MULTIPLICAND+2], a
- ld a, [H_MULTIPLICAND+1]
+ ld [hMultiplicand+2], a
+ ld a, [hMultiplicand+1]
rl a
- ld [H_MULTIPLICAND+1], a
- ld a, [H_MULTIPLICAND]
+ ld [hMultiplicand+1], a
+ ld a, [hMultiplicand]
rl a
- ld [H_MULTIPLICAND], a
- ld a, [H_PRODUCT]
+ ld [hMultiplicand], a
+ ld a, [hProduct]
rl a
- ld [H_PRODUCT], a
+ ld [hProduct], a
jr .loop
.done
- ld a, [H_MULTIPLYBUFFER+3]
- ld [H_PRODUCT+3], a
- ld a, [H_MULTIPLYBUFFER+2]
- ld [H_PRODUCT+2], a
- ld a, [H_MULTIPLYBUFFER+1]
- ld [H_PRODUCT+1], a
- ld a, [H_MULTIPLYBUFFER]
- ld [H_PRODUCT], a
+ ld a, [hMultiplyBuffer+3]
+ ld [hProduct+3], a
+ ld a, [hMultiplyBuffer+2]
+ ld [hProduct+2], a
+ ld a, [hMultiplyBuffer+1]
+ ld [hProduct+1], a
+ ld a, [hMultiplyBuffer]
+ ld [hProduct], a
ret
_Divide::
xor a
- ld [H_DIVIDEBUFFER], a
- ld [H_DIVIDEBUFFER+1], a
- ld [H_DIVIDEBUFFER+2], a
- ld [H_DIVIDEBUFFER+3], a
- ld [H_DIVIDEBUFFER+4], a
+ ld [hDivideBuffer], a
+ ld [hDivideBuffer+1], a
+ ld [hDivideBuffer+2], a
+ ld [hDivideBuffer+3], a
+ ld [hDivideBuffer+4], a
ld a, $9
ld e, a
.asm_37db3
- ld a, [H_DIVIDEBUFFER]
+ ld a, [hDivideBuffer]
ld c, a
- ld a, [H_DIVIDEND+1] ; (aliases: H_MULTIPLICAND)
+ ld a, [hDividend+1] ; (aliases: hMultiplicand)
sub c
ld d, a
- ld a, [H_DIVISOR] ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN)
+ ld a, [hDivisor] ; (aliases: hDivisor, hMultiplier, hPowerOf10)
ld c, a
- ld a, [H_DIVIDEND] ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT)
+ ld a, [hDividend] ; (aliases: hProduct, hPastLeadingZeros, hQuotient)
sbc c
jr c, .asm_37dce
- ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT)
+ ld [hDividend], a ; (aliases: hProduct, hPastLeadingZeros, hQuotient)
ld a, d
- ld [H_DIVIDEND+1], a ; (aliases: H_MULTIPLICAND)
- ld a, [H_DIVIDEBUFFER+4]
+ ld [hDividend+1], a ; (aliases: hMultiplicand)
+ ld a, [hDivideBuffer+4]
inc a
- ld [H_DIVIDEBUFFER+4], a
+ ld [hDivideBuffer+4], a
jr .asm_37db3
.asm_37dce
ld a, b
cp $1
jr z, .asm_37e18
- ld a, [H_DIVIDEBUFFER+4]
+ ld a, [hDivideBuffer+4]
sla a
- ld [H_DIVIDEBUFFER+4], a
- ld a, [H_DIVIDEBUFFER+3]
+ ld [hDivideBuffer+4], a
+ ld a, [hDivideBuffer+3]
rl a
- ld [H_DIVIDEBUFFER+3], a
- ld a, [H_DIVIDEBUFFER+2]
+ ld [hDivideBuffer+3], a
+ ld a, [hDivideBuffer+2]
rl a
- ld [H_DIVIDEBUFFER+2], a
- ld a, [H_DIVIDEBUFFER+1]
+ ld [hDivideBuffer+2], a
+ ld a, [hDivideBuffer+1]
rl a
- ld [H_DIVIDEBUFFER+1], a
+ ld [hDivideBuffer+1], a
dec e
jr nz, .asm_37e04
ld a, $8
ld e, a
- ld a, [H_DIVIDEBUFFER]
- ld [H_DIVISOR], a ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN)
+ ld a, [hDivideBuffer]
+ ld [hDivisor], a ; (aliases: hDivisor, hMultiplier, hPowerOf10)
xor a
- ld [H_DIVIDEBUFFER], a
- ld a, [H_DIVIDEND+1] ; (aliases: H_MULTIPLICAND)
- ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT)
- ld a, [H_DIVIDEND+2]
- ld [H_DIVIDEND+1], a ; (aliases: H_MULTIPLICAND)
- ld a, [H_DIVIDEND+3]
- ld [H_DIVIDEND+2], a
+ ld [hDivideBuffer], a
+ ld a, [hDividend+1] ; (aliases: hMultiplicand)
+ ld [hDividend], a ; (aliases: hProduct, hPastLeadingZeros, hQuotient)
+ ld a, [hDividend+2]
+ ld [hDividend+1], a ; (aliases: hMultiplicand)
+ ld a, [hDividend+3]
+ ld [hDividend+2], a
.asm_37e04
ld a, e
cp $1
@@ -122,22 +122,22 @@
jr nz, .asm_37e0a
dec b
.asm_37e0a
- ld a, [H_DIVISOR] ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN)
+ ld a, [hDivisor] ; (aliases: hDivisor, hMultiplier, hPowerOf10)
srl a
- ld [H_DIVISOR], a ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN)
- ld a, [H_DIVIDEBUFFER]
+ ld [hDivisor], a ; (aliases: hDivisor, hMultiplier, hPowerOf10)
+ ld a, [hDivideBuffer]
rr a
- ld [H_DIVIDEBUFFER], a
+ ld [hDivideBuffer], a
jr .asm_37db3
.asm_37e18
- ld a, [H_DIVIDEND+1] ; (aliases: H_MULTIPLICAND)
- ld [H_REMAINDER], a ; (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN)
- ld a, [H_DIVIDEBUFFER+4]
- ld [H_QUOTIENT+3], a
- ld a, [H_DIVIDEBUFFER+3]
- ld [H_QUOTIENT+2], a
- ld a, [H_DIVIDEBUFFER+2]
- ld [H_QUOTIENT+1], a ; (aliases: H_MULTIPLICAND)
- ld a, [H_DIVIDEBUFFER+1]
- ld [H_DIVIDEND], a ; (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT)
+ ld a, [hDividend+1] ; (aliases: hMultiplicand)
+ ld [hRemainder], a ; (aliases: hDivisor, hMultiplier, hPowerOf10)
+ ld a, [hDivideBuffer+4]
+ ld [hQuotient+3], a
+ ld a, [hDivideBuffer+3]
+ ld [hQuotient+2], a
+ ld a, [hDivideBuffer+2]
+ ld [hQuotient+1], a ; (aliases: hMultiplicand)
+ ld a, [hDivideBuffer+1]
+ ld [hDividend], a ; (aliases: hProduct, hPastLeadingZeros, hQuotient)
ret
--- a/engine/menus/display_text_id_init.asm
+++ b/engine/menus/display_text_id_init.asm
@@ -74,5 +74,5 @@
ld [hWY], a ; put the window on the screen
call LoadFontTilePatterns
ld a, $01
- ld [H_AUTOBGTRANSFERENABLED], a ; enable continuous WRAM to VRAM transfer each V-blank
+ ld [hAutoBGTransferEnabled], a ; enable continuous WRAM to VRAM transfer each V-blank
ret
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -342,7 +342,7 @@
DisplayContinueGameInfo:
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
coord hl, 4, 7
ld b, 8
ld c, 14
@@ -360,13 +360,13 @@
coord hl, 13, 15
call PrintPlayTime
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld c, 30
jp DelayFrames
PrintSaveScreenText:
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
coord hl, 4, 0
ld b, $8
ld c, $e
@@ -386,7 +386,7 @@
coord hl, 13, 8
call PrintPlayTime
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld c, 30
jp DelayFrames
@@ -463,7 +463,7 @@
ld a, [wOptionsTextSpeedCursorX] ; text speed cursor X coordinate
ld [wTopMenuItemX], a
ld a, $01
- ld [H_AUTOBGTRANSFERENABLED], a ; enable auto background transfer
+ ld [hAutoBGTransferEnabled], a ; enable auto background transfer
call Delay3
.loop
call PlaceMenuCursor
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -337,7 +337,7 @@
PrintAlphabet:
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld a, [wAlphabetCase]
and a
ld de, LowerCaseAlphabet
@@ -362,7 +362,7 @@
jr nz, .outerLoop
call PlaceString
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
jp Delay3
INCLUDE "data/text/alphabets.asm"
--- a/engine/menus/party_menu.asm
+++ b/engine/menus/party_menu.asm
@@ -19,7 +19,7 @@
; f8: leveled up
DrawPartyMenu_::
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call ClearScreen
call UpdateSprites
callba LoadMonPartySpriteGfxWithLCDDisabled ; load pokemon icon graphics
@@ -88,14 +88,14 @@
pop hl
push hl
ld bc, SCREEN_WIDTH + 1 ; down 1 row and right 1 column
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
set 0, a
- ld [hFlags_0xFFF6], a
+ ld [hFlagsFFF6], a
add hl, bc
predef DrawHP2 ; draw HP bar and prints current / max HP
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
res 0, a
- ld [hFlags_0xFFF6], a
+ ld [hFlagsFFF6], a
call SetPartyMenuHPBarColor ; color the HP bar (on SGB)
pop hl
jr .printLevel
@@ -213,7 +213,7 @@
pop af
ld [hl], a
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Delay3
jp GBPalNormal
.printItemUseMessage
--- a/engine/menus/pokedex.asm
+++ b/engine/menus/pokedex.asm
@@ -156,7 +156,7 @@
; sets carry flag if player presses A, unsets carry flag if player presses B
HandlePokedexListMenu:
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
; draw the horizontal line separating the seen and owned amounts from the menu
coord hl, 15, 8
ld a, "─"
@@ -216,7 +216,7 @@
ld [wDexMaxSeenMon], a
.loop
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
coord hl, 4, 2
lb bc, 14, 10
call ClearScreenArea
@@ -280,7 +280,7 @@
dec d
jr nz, .printPokemonLoop
ld a, 01
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Delay3
call GBPalNormal
call HandleMenuInput
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -351,10 +351,10 @@
call z, EmptyAllSRAMBoxes ; if so, empty all boxes in SRAM
call DisplayChangeBoxMenu
call UpdateSprites
- ld hl, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
set 1, [hl]
call HandleMenuInput
- ld hl, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
res 1, [hl]
bit 1, a ; pressed b
ret nz
@@ -420,7 +420,7 @@
DisplayChangeBoxMenu:
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld a, A_BUTTON | B_BUTTON
ld [wMenuWatchedKeys], a
ld a, 11
@@ -445,12 +445,12 @@
ld b, 12
ld c, 7
call TextBoxBorder
- ld hl, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
set 2, [hl]
ld de, BoxNames
coord hl, 13, 1
call PlaceString
- ld hl, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
res 2, [hl]
ld a, [wCurrentBoxNum]
and $7f
@@ -486,7 +486,7 @@
dec a
jr nz, .loop
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ret
ChooseABoxText:
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
@@ -239,11 +239,11 @@
ld bc, wPartyMon2 - wPartyMon1
call AddNTimes
ld a, [hli]
- ld [H_DIVIDEND], a
+ ld [hDividend], a
ld a, [hl]
- ld [H_DIVIDEND + 1], a
+ ld [hDividend + 1], a
ld a, 5
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, 2 ; number of bytes
call Divide
ld bc, wPartyMon1HP - wPartyMon1MaxHP
@@ -250,10 +250,10 @@
add hl, bc
ld a, [hld]
ld b, a
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
sub b
ld b, [hl]
- ld a, [H_QUOTIENT + 2]
+ ld a, [hQuotient + 2]
sbc b
jp nc, .notHealthyEnough
ld a, [wPartyAndBillsPCSavedMenuItem]
@@ -648,7 +648,7 @@
StartMenu_Option::
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call ClearScreen
call UpdateSprites
callab DisplayOptionMenu
--- a/engine/movie/credits.asm
+++ b/engine/movie/credits.asm
@@ -47,7 +47,7 @@
DisplayCreditsMon:
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call SaveScreenTilesToBuffer1
call FillMiddleOfScreenWithWhite
@@ -67,7 +67,7 @@
ld hl, vBGMap0 + $c
call CreditsCopyTileMapToVRAM
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call LoadScreenTilesFromBuffer1
ld hl, vBGMap0
call CreditsCopyTileMapToVRAM
@@ -138,11 +138,11 @@
CreditsCopyTileMapToVRAM:
ld a, l
- ld [H_AUTOBGTRANSFERDEST], a
+ ld [hAutoBGTransferDest], a
ld a, h
- ld [H_AUTOBGTRANSFERDEST + 1], a
+ ld [hAutoBGTransferDest + 1], a
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
jp Delay3
ZeroMemory:
--- a/engine/movie/evolution.asm
+++ b/engine/movie/evolution.asm
@@ -13,12 +13,12 @@
ld [wNewSoundID], a
call PlaySound
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld a, SFX_TINK
call PlaySound
call Delay3
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld [hTilesetType], a
ld a, [wEvoOldSpecies]
ld [wWholeScreenPaletteMonSpecies], a
@@ -37,7 +37,7 @@
ld [wd0b5], a
call Evolution_LoadPic
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld a, [wEvoOldSpecies]
call PlayCry
call WaitForSoundToFinish
@@ -117,7 +117,7 @@
Evolution_ChangeMonPic:
push bc
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
coord hl, 7, 2
lb bc, 7, 7
ld de, SCREEN_WIDTH - 7
@@ -134,7 +134,7 @@
dec b
jr nz, .loop
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Delay3
pop bc
ret
--- a/engine/movie/hall_of_fame.asm
+++ b/engine/movie/hall_of_fame.asm
@@ -24,7 +24,7 @@
ld [wLetterPrintingDelayFlags], a ; no delay
ld [wHoFMonOrPlayer], a ; mon
inc a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld hl, wNumHoFTeams
ld a, [hl]
inc a
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -14,13 +14,13 @@
xor a
ld [hJoyHeld], a
inc a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call PlayShootingStar
call PlayIntroScene
call GBFadeOutToWhite
xor a
ld [hSCX], a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call ClearSprites
call DelayFrame
ret
--- a/engine/movie/oak_speech/oak_speech.asm
+++ b/engine/movie/oak_speech/oak_speech.asm
@@ -104,12 +104,12 @@
ld hl, OakSpeechText3
call PrintText
.next
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, SFX_SHRINK
call PlaySound
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ld c, 4
call DelayFrames
@@ -126,7 +126,7 @@
lb bc, BANK(ShrinkPic2), $00
call IntroDisplayPicCenteredOrUpperRight
call ResetPlayerSpriteData
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, BANK(Music_PalletTown)
ld [wAudioROMBank], a
@@ -137,7 +137,7 @@
ld [wNewSoundID], a
call PlaySound
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ld c, 20
call DelayFrames
--- a/engine/movie/oak_speech/oak_speech2.asm
+++ b/engine/movie/oak_speech/oak_speech2.asm
@@ -107,7 +107,7 @@
ld e, l
.loop
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld a, [hSlideDirection]
and a
jr nz, .slideLeft
@@ -134,7 +134,7 @@
ld [hl], a
.next3
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Delay3
ld a, [hSlidingRegionSize]
ld c, a
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -24,7 +24,7 @@
DisplayTitleScreen:
call GBPalWhiteOut
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
xor a
ld [hTilesetType], a
ld [hSCX], a
@@ -239,7 +239,7 @@
xor a
ld [hWY], a
inc a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call ClearScreen
ld a, vBGMap0 / $100
call TitleScreenCopyTileMapToVRAM
@@ -358,7 +358,7 @@
jp LoadFrontSpriteByMonIndex
TitleScreenCopyTileMapToVRAM:
- ld [H_AUTOBGTRANSFERDEST + 1], a
+ ld [hAutoBGTransferDest + 1], a
jp Delay3
LoadCopyrightAndTextBoxTiles:
--- a/engine/movie/trade.asm
+++ b/engine/movie/trade.asm
@@ -137,10 +137,10 @@
Trade_CopyTileMapToVRAM:
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Delay3
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ret
Trade_Delay80:
@@ -184,7 +184,7 @@
ld [rOBP0], a
call EnableLCD
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld a, [wTradedPlayerMonSpecies]
ld [wd11e], a
call GetMonName
@@ -231,7 +231,7 @@
ld [rWX], a
ld [hSCX], a
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
coord hl, 4, 0
ld b, 6
ld c, 10
@@ -261,7 +261,7 @@
ld a, [wTradedPlayerMonSpecies]
call PlayCry
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ret
Trade_DrawOpenEndOfLinkCable:
@@ -336,13 +336,13 @@
.ballSpriteReachedEdgeOfScreen
call ClearSprites
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call ClearScreen
ld b, $98
call CopyScreenTileBufferToVRAM
call Delay3
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ret
Trade_BallInsideLinkCableOAM:
@@ -360,13 +360,13 @@
call Trade_PrintEnemyMonInfoText
call Trade_CopyTileMapToVRAM
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld a, [wTradedEnemyMonSpecies]
call Trade_LoadMonSprite
ld a, TRADE_BALL_POOF_ANIM
call Trade_ShowAnimation
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld a, [wTradedEnemyMonSpecies]
call PlayCry
call Trade_Delay100
@@ -397,7 +397,7 @@
ld b, $6
call Trade_AnimMonMoveHorizontal
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Trade_DrawCableAcrossScreen
ld b, $4
call Trade_AnimMonMoveHorizontal
@@ -405,7 +405,7 @@
ld b, $6
call Trade_AnimMonMoveHorizontal
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Trade_AnimMonMoveVertical
jp ClearSprites
@@ -430,7 +430,7 @@
ld b, $6
call Trade_AnimMonMoveHorizontal
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Trade_DrawCableAcrossScreen
ld b, $4
call Trade_AnimMonMoveHorizontal
@@ -438,16 +438,16 @@
ld b, $6
call Trade_AnimMonMoveHorizontal
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
jp ClearSprites
Trade_InitGameboyTransferGfx:
; Initialises the graphics for showing a mon moving between gameboys.
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call ClearScreen
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Trade_LoadMonPartySpriteGfx
call DelayFrame
ld a, %10101011
@@ -731,9 +731,9 @@
ld b, SET_PAL_POKEMON_WHOLE_SCREEN
ld c, 0
call RunPaletteCommand
- ld a, [H_AUTOBGTRANSFERENABLED]
+ ld a, [hAutoBGTransferEnabled]
xor $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call GetMonHeader
coord hl, 7, 2
call LoadFlippedFrontSpriteByMonIndex
@@ -743,7 +743,7 @@
Trade_ShowClearedWindow:
; clears the window and covers the BG entirely with the window
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call ClearScreen
ld a, %11100011
ld [rLCDC], a
--- a/engine/overworld/auto_movement.asm
+++ b/engine/overworld/auto_movement.asm
@@ -66,7 +66,7 @@
call FillMemory
ld [hl], $ff
ld a, [wSpriteIndex]
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld de, wNPCMovementDirections2
call MoveSprite
ld a, $1
@@ -282,7 +282,7 @@
jr .loop
.notRival
ld a, [wSpriteIndex]
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
jp SetSpriteMovementBytesToFF
RivalIDs:
--- a/engine/overworld/clear_variables.asm
+++ b/engine/overworld/clear_variables.asm
@@ -3,7 +3,7 @@
ld [hWY], a
ld [rWY], a
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld [wStepCounter], a
ld [wLoneAttackNo], a
ld [hJoyPressed], a
--- a/engine/overworld/missable_objects.asm
+++ b/engine/overworld/missable_objects.asm
@@ -31,19 +31,19 @@
sub d
ld h, a
ld a, h
- ld [H_DIVIDEND], a
+ ld [hDividend], a
ld a, l
- ld [H_DIVIDEND+1], a
+ ld [hDividend+1], a
xor a
- ld [H_DIVIDEND+2], a
- ld [H_DIVIDEND+3], a
+ ld [hDividend+2], a
+ ld [hDividend+3], a
ld a, $3
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, $2
call Divide ; divide difference by 3, resulting in the global offset (number of missable items before ours)
ld a, [wCurMap]
ld b, a
- ld a, [H_DIVIDEND+3]
+ ld a, [hDividend+3]
ld c, a ; store global offset in c
ld de, wMissableObjectList
pop hl
@@ -99,7 +99,7 @@
; tests if current sprite is a missable object that is hidden/has been removed
IsObjectHidden:
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
swap a
ld b, a
ld hl, wMissableObjectList
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -63,7 +63,7 @@
ld a, [wd736]
bit 7, a ; is the player sprite spinning due to a spin tile?
jr nz, .skipSpriteAnim
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $7
ld l, a
ld a, [hl]
@@ -103,7 +103,7 @@
UnusedReadSpriteDataFunction:
push bc
push af
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
ld c, a
pop af
add c
@@ -112,7 +112,7 @@
ret
UpdateNPCSprite:
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
swap a
dec a
add a
@@ -122,7 +122,7 @@
ld a, [hl] ; read movement byte 2
ld [wCurSpriteMovement2], a
ld h, $c1
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
ld l, a
inc l
ld a, [hl] ; c1x1
@@ -131,7 +131,7 @@
call CheckSpriteAvailability
ret c ; if sprite is invisible, on tile >=MAP_TILESET_SIZE, in grass or player is currently walking
ld h, $c1
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
ld l, a
inc l
ld a, [hl] ; c1x1
@@ -151,7 +151,7 @@
ret nz ; don't do anything yet if player is currently moving (redundant, already tested in CheckSpriteAvailability)
call InitializeSpriteScreenPosition
ld h, $c2
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $6
ld l, a
ld a, [hl] ; c2x6: movement byte 1
@@ -264,11 +264,11 @@
TryWalking:
push hl
ld h, $c1
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $9
ld l, a
ld [hl], c ; c1x9 (update facing direction)
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $3
ld l, a
ld [hl], d ; c1x3 (update Y movement delta)
@@ -282,7 +282,7 @@
pop de
ret c ; cannot walk there (reinitialization of delay values already done)
ld h, $c2
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $4
ld l, a
ld a, [hl] ; c2x4: Y position
@@ -291,7 +291,7 @@
ld a, [hl] ; c2x5: X position
add e
ld [hl], a ; update X position
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
ld l, a
ld [hl], $10 ; c2x0=16: walk animation counter
dec h
@@ -301,7 +301,7 @@
; update the walking animation parameters for a sprite that is currently walking
UpdateSpriteInWalkingAnimation:
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $7
ld l, a
ld a, [hl] ; c1x7 (counter until next walk animation frame)
@@ -317,7 +317,7 @@
and $3
ld [hl], a ; advance to next animation frame every 4 ticks (16 ticks total for one step)
.noNextAnimationFrame
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $3
ld l, a
ld a, [hli] ; c1x3 (movement Y delta)
@@ -330,7 +330,7 @@
ld a, [hl] ; c1x6 (screen X position)
add b
ld [hl], a ; update screen X position
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
ld l, a
inc h
ld a, [hl] ; c2x0 (walk animation counter)
@@ -343,7 +343,7 @@
ld a, [hl] ; c2x6 (movement byte 1)
cp $fe
jr nc, .initNextMovementCounter ; values $fe and $ff
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
inc a
ld l, a
dec h
@@ -351,7 +351,7 @@
ret
.initNextMovementCounter
call Random
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $8
ld l, a
ld a, [hRandomAdd]
@@ -358,7 +358,7 @@
and $7f
ld [hl], a ; c2x8: set next movement delay to a random value in [0,$7f]
dec h ; note that value 0 actually makes the delay $100 (bug?)
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
inc a
ld l, a
ld [hl], $2 ; c1x1 = 2 (movement status)
@@ -375,7 +375,7 @@
; update delay value (c2x8) for sprites in the delayed state (c1x1)
UpdateSpriteMovementDelay:
ld h, $c2
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $6
ld l, a
ld a, [hl] ; c2x6: movement byte 1
@@ -390,13 +390,13 @@
jr nz, notYetMoving
.moving
dec h
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
inc a
ld l, a
ld [hl], $1 ; c1x1 = 1 (mark as ready to move)
notYetMoving:
ld h, wSpriteStateData1 / $100
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $8
ld l, a
ld [hl], $0 ; c1x8 = 0 (walk animation frame)
@@ -429,7 +429,7 @@
.notFacingRight
ld c, SPRITE_FACING_LEFT
.facingDirectionDetermined
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $9
ld l, a
ld [hl], c ; c1x9: set facing direction
@@ -440,7 +440,7 @@
inc l
ld [hl], $ff ; $c1x2: set sprite image to $ff (invisible/off screen)
inc h
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $2
ld l, a
ld a, $8
@@ -451,7 +451,7 @@
; calculates the sprite's screen position form its map position and the player position
InitializeSpriteScreenPosition:
ld h, wSpriteStateData2 / $100
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $4
ld l, a
ld a, [wYCoord]
@@ -479,13 +479,13 @@
and a
jp nz, .spriteInvisible
ld h, wSpriteStateData2 / $100
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $6
ld l, a
ld a, [hl] ; c2x6: movement byte 1
cp $fe
jr c, .skipXVisibilityTest ; movement byte 1 < $fe (i.e. the sprite's movement is scripted)
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $4
ld l, a
ld b, [hl] ; c2x4: Y pos (+4)
@@ -527,7 +527,7 @@
jr c, .spriteVisible ; standing on tile with ID >=MAP_TILESET_SIZE (top right tile)
.spriteInvisible
ld h, wSpriteStateData1 / $100
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $2
ld l, a
ld [hl], $ff ; c1x2
@@ -540,7 +540,7 @@
jr nz, .done ; if player is currently walking, we're done
call UpdateSpriteImage
inc h
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $7
ld l, a
ld a, [wGrassTile]
@@ -556,7 +556,7 @@
UpdateSpriteImage:
ld h, $c1
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $8
ld l, a
ld a, [hli] ; c1x8: walk animation frame
@@ -567,7 +567,7 @@
ld a, [$ff93] ; current sprite offset
add b
ld b, a
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $2
ld l, a
ld [hl], b ; c1x2: sprite to display
@@ -581,7 +581,7 @@
; set carry on failure, clears carry on success
CanWalkOntoTile:
ld h, wSpriteStateData2 / $100
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $6
ld l, a
ld a, [hl] ; c2x6 (movement byte 1)
@@ -602,7 +602,7 @@
cp c
jr nz, .tilePassableLoop
ld h, $c2
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $6
ld l, a
ld a, [hl] ; $c2x6 (movement byte 1)
@@ -609,7 +609,7 @@
inc a
jr z, .impassable ; if $ff, no movement allowed (however, changing direction is)
ld h, wSpriteStateData1 / $100
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $4
ld l, a
ld a, [hli] ; c1x4 (screen Y pos)
@@ -628,7 +628,7 @@
pop bc
pop de
ld h, wSpriteStateData1 / $100
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $c
ld l, a
ld a, [hl] ; c1xc (directions in which sprite collision would occur)
@@ -635,7 +635,7 @@
and b ; check against chosen direction (1,2,4 or 8)
jr nz, .impassable ; collision between sprites, don't go there
ld h, wSpriteStateData2 / $100
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $2
ld l, a
ld a, [hli] ; c2x2 (sprite Y displacement, initialized at $8, keep track of where a sprite did go)
@@ -666,7 +666,7 @@
ret
.impassable
ld h, $c1
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
inc a
ld l, a
ld [hl], $2 ; c1x1 = 2 (set movement status to delayed)
@@ -677,7 +677,7 @@
inc l
ld [hl], a ; c1x5 = 0 (clear X movement delta)
inc h
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $8
ld l, a
call Random
@@ -692,7 +692,7 @@
; hl: output pointer
GetTileSpriteStandsOn:
ld h, wSpriteStateData1 / $100
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $4
ld l, a
ld a, [hli] ; c1x4: screen Y position
@@ -784,7 +784,7 @@
ld a, [hl]
add b
ld [hl], a
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $9
ld l, a
ld a, c
@@ -817,7 +817,7 @@
GetSpriteScreenXYPointerCommon:
ld hl, wSpriteStateData1
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add l
add b
ld l, a
@@ -825,7 +825,7 @@
AnimScriptedNPCMovement:
ld hl, wSpriteStateData2
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $e
ld l, a
ld a, [hl] ; VRAM slot
@@ -833,7 +833,7 @@
swap a
ld b, a
ld hl, wSpriteStateData1
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $9
ld l, a
ld a, [hl] ; facing direction
@@ -852,7 +852,7 @@
ld [hSpriteVRAMSlotAndFacing], a
call AdvanceScriptedNPCAnimFrameCounter
ld hl, wSpriteStateData1
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $2
ld l, a
ld a, [hSpriteVRAMSlotAndFacing]
@@ -863,7 +863,7 @@
ret
AdvanceScriptedNPCAnimFrameCounter:
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $7
ld l, a
ld a, [hl] ; intra-animation frame counter
--- a/engine/overworld/push_boulder.asm
+++ b/engine/overworld/push_boulder.asm
@@ -92,7 +92,7 @@
call ResetBoulderPushFlags
set 7, [hl]
ld a, [wBoulderSpriteIndex]
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call GetSpriteMovementByte2Pointer
ld [hl], $10
ld a, SFX_CUT
--- a/engine/overworld/sprite_collisions.asm
+++ b/engine/overworld/sprite_collisions.asm
@@ -6,7 +6,7 @@
ld l, a
sub $e
ld c, a
- ld [H_CURRENTSPRITEOFFSET], a
+ ld [hCurrentSpriteOffset], a
ld a, [hl]
and a
jr z, .skipSprite ; tests $c2Xe
@@ -34,7 +34,7 @@
ld [$ff93], a ; $10 * sprite#
ld a, [wNPCMovementScriptSpriteOffset] ; some sprite offset?
ld b, a
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
cp b
jr nz, .unequal
jp DoScriptedNPCMovement
@@ -41,7 +41,7 @@
.unequal
jp UpdateNPCSprite
-; This detects if the current sprite (whose offset is at H_CURRENTSPRITEOFFSET)
+; This detects if the current sprite (whose offset is at hCurrentSpriteOffset)
; is going to collide with another sprite by looping over the other sprites.
; The current sprite's offset will be labelled with i (e.g. $c1i0).
; The loop sprite's offset will labelled with j (e.g. $c1j0).
@@ -54,7 +54,7 @@
nop
ld h, wSpriteStateData1 / $100
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add wSpriteStateData1 % $100
ld l, a
@@ -113,7 +113,7 @@
ld [$ff8f], a ; store loop counter
swap a
ld e, a
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
cp e ; does the loop sprite match the current sprite?
jp z, .next ; go to the next sprite if they match
@@ -128,7 +128,7 @@
inc a
jp z, .next ; go the next sprite if offscreen
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add 10
ld l, a
--- a/engine/overworld/trainer_sight.asm
+++ b/engine/overworld/trainer_sight.asm
@@ -2,7 +2,7 @@
ld hl, wSpriteStateData1
ld de, $4
ld a, [wSpriteIndex]
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call GetSpriteDataPointer
ld a, [hli] ; c1x4 (screen Y pos)
ld [$ffeb], a
@@ -21,7 +21,7 @@
ld hl, wSpriteStateData1
ld de, $4
ld a, [wSpriteIndex]
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call GetSpriteDataPointer
ld a, [hli] ; c1x4 (screen Y pos)
ld [wSavedSpriteScreenY], a
@@ -40,7 +40,7 @@
ld hl, wSpriteStateData1
ld de, $4
ld a, [wSpriteIndex]
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call GetSpriteDataPointer
ld a, [$ffeb] ; c1x4 (screen Y pos)
ld [hli], a
@@ -59,7 +59,7 @@
ld hl, wSpriteStateData1
ld de, 4
ld a, [wSpriteIndex]
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call GetSpriteDataPointer
ld a, [wSavedSpriteScreenY]
ld [hli], a ; c1x4 (screen Y pos)
@@ -144,7 +144,7 @@
call FillMemory ; write the necessary steps to reach player
ld [hl], $ff ; write end of list sentinel
ld a, [wSpriteIndex]
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
jp MoveSprite_
; input: de = offset within sprite entry
@@ -152,7 +152,7 @@
GetSpriteDataPointer:
push de
add hl, de
- ld a, [H_SPRITEINDEX]
+ ld a, [hSpriteIndex]
swap a
ld d, $0
ld e, a
--- a/engine/overworld/turn_sprite.asm
+++ b/engine/overworld/turn_sprite.asm
@@ -1,12 +1,12 @@
UpdateSpriteFacingOffsetAndDelayMovement::
ld h, $c2
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $8
ld l, a
ld a, $7f ; maximum movement delay
ld [hl], a ; c2x8 (movement delay)
dec h
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $9
ld l, a
ld a, [hld] ; c1x9 (facing direction)
@@ -14,7 +14,7 @@
xor a
ld [hld], a
ld [hl], a ; c1x8 (walk animation frame)
- ld a, [H_CURRENTSPRITEOFFSET]
+ ld a, [hCurrentSpriteOffset]
add $2
ld l, a
ld a, [hl] ; c1x2 (facing and animation table offset)
--- a/engine/overworld/update_map.asm
+++ b/engine/overworld/update_map.asm
@@ -50,12 +50,12 @@
ld a, [wIsInBattle]
inc a
ret z
- ld a, [H_AUTOBGTRANSFERENABLED]
+ ld a, [hAutoBGTransferEnabled]
push af
ld a, [hTilesetType]
push af
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld [hTilesetType], a ; no flower/water BG tile animations
call LoadCurrentMapView
call RunDefaultPaletteCommand
@@ -114,7 +114,7 @@
pop af
ld [hTilesetType], a
pop af
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ret
CompareHLWithBC:
--- a/engine/pokemon/add_mon.asm
+++ b/engine/pokemon/add_mon.asm
@@ -129,10 +129,10 @@
xor a
ld b, a
call CalcStat ; calc HP stat (set cur Hp to max HP)
- ld a, [H_MULTIPLICAND+1]
+ ld a, [hMultiplicand+1]
ld [de], a
inc de
- ld a, [H_MULTIPLICAND+2]
+ ld a, [hMultiplicand+2]
ld [de], a
inc de
xor a
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -1,6 +1,6 @@
DisplayPCMainMenu::
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call SaveScreenTilesToBuffer2
ld a, [wNumHoFTeams]
and a
@@ -82,7 +82,7 @@
ld [wCurrentMenuItem], a
ld [wLastMenuItem], a
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ret
SomeonesPCText: db "SOMEONE's PC@"
@@ -168,7 +168,7 @@
ld de, BoxNoPCText
call PlaceString
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Delay3
call HandleMenuInput
bit 1, a
--- a/engine/pokemon/evos_moves.asm
+++ b/engine/pokemon/evos_moves.asm
@@ -120,12 +120,12 @@
ld c, 50
call DelayFrames
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
coord hl, 0, 0
lb bc, 12, 20
call ClearScreenArea
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld a, $ff
ld [wUpdateSpritesEnabled], a
call ClearSprites
--- a/engine/pokemon/experience.asm
+++ b/engine/pokemon/experience.asm
@@ -38,58 +38,58 @@
add hl, bc
call CalcDSquared
ld a, d
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
call Multiply
ld a, [hl]
and $f0
swap a
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
call Multiply
ld a, [hli]
and $f
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld b, $4
call Divide
- ld a, [H_QUOTIENT + 1]
+ ld a, [hQuotient + 1]
push af
- ld a, [H_QUOTIENT + 2]
+ ld a, [hQuotient + 2]
push af
- ld a, [H_QUOTIENT + 3]
+ ld a, [hQuotient + 3]
push af
call CalcDSquared
ld a, [hl]
and $7f
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
call Multiply
- ld a, [H_PRODUCT + 1]
+ ld a, [hProduct + 1]
push af
- ld a, [H_PRODUCT + 2]
+ ld a, [hProduct + 2]
push af
- ld a, [H_PRODUCT + 3]
+ ld a, [hProduct + 3]
push af
ld a, [hli]
push af
xor a
- ld [H_MULTIPLICAND], a
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand], a
+ ld [hMultiplicand + 1], a
ld a, d
- ld [H_MULTIPLICAND + 2], a
+ ld [hMultiplicand + 2], a
ld a, [hli]
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
call Multiply
ld b, [hl]
- ld a, [H_PRODUCT + 3]
+ ld a, [hProduct + 3]
sub b
- ld [H_PRODUCT + 3], a
+ ld [hProduct + 3], a
ld b, $0
- ld a, [H_PRODUCT + 2]
+ ld a, [hProduct + 2]
sbc b
- ld [H_PRODUCT + 2], a
- ld a, [H_PRODUCT + 1]
+ ld [hProduct + 2], a
+ ld a, [hProduct + 1]
sbc b
- ld [H_PRODUCT + 1], a
+ ld [hProduct + 1], a
; The difference of the linear term and the constant term consists of 3 bytes
-; starting at H_PRODUCT + 1. Below, hExperience (an alias of that address) will
+; starting at hProduct + 1. Below, hExperience (an alias of that address) will
; be used instead for the further work of adding or subtracting the squared
; term and adding the cubed term.
pop af
@@ -139,11 +139,11 @@
; calculates d*d
CalcDSquared:
xor a
- ld [H_MULTIPLICAND], a
- ld [H_MULTIPLICAND + 1], a
+ ld [hMultiplicand], a
+ ld [hMultiplicand + 1], a
ld a, d
- ld [H_MULTIPLICAND + 2], a
- ld [H_MULTIPLIER], a
+ ld [hMultiplicand + 2], a
+ ld [hMultiplier], a
jp Multiply
INCLUDE "data/growth_rates.asm"
--- a/engine/pokemon/learn_move.asm
+++ b/engine/pokemon/learn_move.asm
@@ -126,13 +126,13 @@
call TextBoxBorder
coord hl, 6, 8
ld de, wMovesString
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
set 2, a
- ld [hFlags_0xFFF6], a
+ ld [hFlagsFFF6], a
call PlaceString
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
res 2, a
- ld [hFlags_0xFFF6], a
+ ld [hFlagsFFF6], a
ld hl, wTopMenuItemY
ld a, 8
ld [hli], a ; wTopMenuItemY
@@ -146,10 +146,10 @@
ld a, A_BUTTON | B_BUTTON
ld [hli], a ; wMenuWatchedKeys
ld [hl], 0 ; wLastMenuItem
- ld hl, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
set 1, [hl]
call HandleMenuInput
- ld hl, hFlags_0xFFF6
+ ld hl, hFlagsFFF6
res 1, [hl]
push af
call LoadScreenTilesFromBuffer1
--- a/engine/pokemon/status_screen.asm
+++ b/engine/pokemon/status_screen.asm
@@ -40,7 +40,7 @@
push hl
call DrawHPBar
pop hl
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
bit 0, a
jr z, .printFractionBelowBar
ld bc, $9 ; right of bar
@@ -299,7 +299,7 @@
push af
xor a
ld [hTilesetType], a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld bc, NUM_MOVES + 1
ld hl, wMoves
call FillMemory
@@ -424,7 +424,7 @@
coord hl, 9, 1
call PlaceString
ld a, $1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Delay3
call WaitForTextScrollButtonPress ; wait for button
pop af
--- a/engine/slots/game_corner_slots.asm
+++ b/engine/slots/game_corner_slots.asm
@@ -22,7 +22,7 @@
ld a, 250
.next
ld [wSlotMachineSevenAndBarModeChance], a
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
ld [wSlotMachineSavedROMBank], a
call PromptUserToPlaySlots
ret
--- a/home.asm
+++ b/home.asm
@@ -53,10 +53,10 @@
; a = ID of destination warp within destination map
LoadDestinationWarpPosition::
ld b, a
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, [wPredefParentBank]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ld a, b
add a
@@ -68,7 +68,7 @@
ld de, wCurrentTileBlockMapViewPointer
call CopyData
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -197,10 +197,10 @@
ld de, vFrontPic
call LoadMonFrontSprite
pop hl
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, Bank(CopyUncompressedPicToHL)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
xor a
ld [hStartTileID], a
@@ -208,7 +208,7 @@
xor a
ld [wSpriteFlipped], a
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -400,15 +400,15 @@
ret
PrintStatusConditionNotFainted::
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, BANK(PrintStatusAilment)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call PrintStatusAilment ; print status condition
pop bc
ld a, b
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -457,10 +457,10 @@
; INPUT:
; [wd0b5] = pokemon ID
GetMonHeader::
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, BANK(BaseStats)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
push bc
push de
@@ -515,7 +515,7 @@
pop de
pop bc
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -681,7 +681,7 @@
LoadUncompressedSpriteData::
push de
and $f
- ld [H_SPRITEWIDTH], a ; each byte contains 8 pixels (in 1bpp), so tiles=bytes for width
+ ld [hSpriteWidth], a ; each byte contains 8 pixels (in 1bpp), so tiles=bytes for width
ld b, a
ld a, $7
sub b ; 7-w
@@ -692,7 +692,7 @@
add a
add a
sub b ; 7*((8-w)/2) ; skip for horizontal center (in tiles)
- ld [H_SPRITEOFFSET], a
+ ld [hSpriteOffset], a
ld a, c
swap a
and $f
@@ -700,16 +700,16 @@
add a
add a
add a ; 8*tiles is height in bytes
- ld [H_SPRITEHEIGHT], a
+ ld [hSpriteHeight], a
ld a, $7
sub b ; 7-h ; skip for vertical center (in tiles, relative to current column)
ld b, a
- ld a, [H_SPRITEOFFSET]
+ ld a, [hSpriteOffset]
add b ; 7*((8-w)/2) + 7-h ; combined overall offset (in tiles)
add a
add a
add a ; 8*(7*((8-w)/2) + 7-h) ; combined overall offset (in bytes)
- ld [H_SPRITEOFFSET], a
+ ld [hSpriteOffset], a
xor a
ld [$4000], a
ld hl, sSpriteBuffer0
@@ -728,15 +728,15 @@
; copies and aligns the sprite data properly inside the sprite buffer
; sprite buffers are 7*7 tiles in size, the loaded sprite is centered within this area
AlignSpriteDataCentered::
- ld a, [H_SPRITEOFFSET]
+ ld a, [hSpriteOffset]
ld b, $0
ld c, a
add hl, bc
- ld a, [H_SPRITEWIDTH]
+ ld a, [hSpriteWidth]
.columnLoop
push af
push hl
- ld a, [H_SPRITEHEIGHT]
+ ld a, [hSpriteHeight]
ld c, a
.columnInnerLoop
ld a, [de]
@@ -775,7 +775,7 @@
ld de, sSpriteBuffer1 + (SPRITEBUFFERSIZE - 1) ; source 2: end of buffer 1
ld bc, sSpriteBuffer0 + (SPRITEBUFFERSIZE - 1) ; source 1: end of buffer 0
ld a, SPRITEBUFFERSIZE/2 ; $c4
- ld [H_SPRITEINTERLACECOUNTER], a
+ ld [hSpriteInterlaceCounter], a
.interlaceLoop
ld a, [de]
dec de
@@ -789,9 +789,9 @@
ld a, [bc]
dec bc
ld [hld], a ; write byte of source 1
- ld a, [H_SPRITEINTERLACECOUNTER]
+ ld a, [hSpriteInterlaceCounter]
dec a
- ld [H_SPRITEINTERLACECOUNTER], a
+ ld [hSpriteInterlaceCounter], a
jr nz, .interlaceLoop
ld a, [wSpriteFlipped]
and a
@@ -809,7 +809,7 @@
pop hl
ld de, sSpriteBuffer1
ld c, (2*SPRITEBUFFERSIZE)/16 ; $31, number of 16 byte chunks to be copied
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
ld b, a
jp CopyVideoData
@@ -830,14 +830,14 @@
ld a, [wUpdateSpritesEnabled]
dec a
ret nz
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, Bank(_UpdateSprites)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call _UpdateSprites
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -951,7 +951,7 @@
; this function is used to display sign messages, sprite dialog, etc.
; INPUT: [hSpriteIndexOrTextID] = sprite ID or text ID
DisplayTextID::
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
callba DisplayTextIDInit ; initialization
ld hl, wTextPredefFlag
@@ -962,7 +962,7 @@
call SwitchToMapRomBank
.skipSwitchToMapBank
ld a, 30 ; half a second
- ld [H_FRAMECOUNTER], a ; used as joypad poll timer
+ ld [hFrameCounter], a ; used as joypad poll timer
ld hl, wMapTextPtr
ld a, [hli]
ld h, [hl]
@@ -1065,7 +1065,7 @@
call DelayFrame
call LoadGBPal
xor a
- ld [H_AUTOBGTRANSFERENABLED], a ; disable continuous WRAM to VRAM transfer each V-blank
+ ld [hAutoBGTransferEnabled], a ; disable continuous WRAM to VRAM transfer each V-blank
; loop to make sprites face the directions they originally faced before the dialogue
ld hl, wSpriteStateData2 + $19
ld c, $0f
@@ -1079,7 +1079,7 @@
dec c
jr nz, .restoreSpriteFacingDirectionLoop
ld a, BANK(InitMapSprites)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call InitMapSprites ; reload sprite tile pattern data (since it was partially overwritten by text tile patterns)
ld hl, wFontLoaded
@@ -1089,7 +1089,7 @@
call z, LoadPlayerSpriteGraphics
call LoadCurrentMapView
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
jp UpdateSprites
@@ -1102,14 +1102,14 @@
call LoadItemList
ld a, PRICEDITEMLISTMENU
ld [wListMenuID], a
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, Bank(DisplayPokemartDialogue_)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call DisplayPokemartDialogue_
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
jp AfterDisplayingTextID
@@ -1141,14 +1141,14 @@
ld [$ff8d], a
inc hl
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, Bank(DisplayPokemonCenterDialogue_)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call DisplayPokemonCenterDialogue_
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
jp AfterDisplayingTextID
@@ -1237,14 +1237,14 @@
; [wWhichPokemon] = index (within the inventory) of the item to remove
; [wItemQuantity] = quantity to remove
RemoveItemFromInventory::
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, BANK(RemoveItemFromInventory_)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call RemoveItemFromInventory_
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -1256,15 +1256,15 @@
; sets carry flag if successful, unsets carry flag if unsuccessful
AddItemToInventory::
push bc
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, BANK(AddItemToInventory_)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call AddItemToInventory_
pop bc
ld a, b
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
pop bc
ret
@@ -1274,7 +1274,7 @@
; [wListPointer] = address of the list (2 bytes)
DisplayListMenuID::
xor a
- ld [H_AUTOBGTRANSFERENABLED], a ; disable auto-transfer
+ ld [hAutoBGTransferEnabled], a ; disable auto-transfer
ld a, 1
ld [hJoy7], a ; joypad state update flag
ld a, [wBattleType]
@@ -1328,10 +1328,10 @@
DisplayListMenuIDLoop::
xor a
- ld [H_AUTOBGTRANSFERENABLED], a ; disable transfer
+ ld [hAutoBGTransferEnabled], a ; disable transfer
call PrintListMenuEntries
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a ; enable transfer
+ ld [hAutoBGTransferEnabled], a ; enable transfer
call Delay3
ld a, [wBattleType]
and a ; is it the Old Man battle?
@@ -1798,10 +1798,10 @@
GetMonName::
push hl
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, BANK(MonsterNames)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ld a, [wd11e]
dec a
@@ -1817,7 +1817,7 @@
ld [hl], "@"
pop de
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
pop hl
ret
@@ -1941,7 +1941,7 @@
; reloads text box tile patterns, current map view, and tileset tile patterns
ReloadMapData::
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, [wCurMap]
call SwitchToMapRomBank
@@ -1951,13 +1951,13 @@
call LoadTilesetTilePatternData
call EnableLCD
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
; reloads tileset tile patterns
ReloadTilesetTilePatterns::
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, [wCurMap]
call SwitchToMapRomBank
@@ -1965,7 +1965,7 @@
call LoadTilesetTilePatternData
call EnableLCD
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -2002,15 +2002,15 @@
; OUTPUT:
; clears carry flag if the item is tossed, sets carry flag if not
TossItem::
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, BANK(TossItem_)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call TossItem_
pop de
ld a, d
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -2036,15 +2036,15 @@
; [wTextBoxID] = text box ID
; b, c = y, x cursor position (TWO_OPTION_MENU only)
DisplayTextBoxID::
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, BANK(DisplayTextBoxID_)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call DisplayTextBoxID_
pop bc
ld a, b
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -2078,15 +2078,15 @@
ld a, [hli]
ld h, [hl]
ld l, a
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, [wNPCMovementScriptBank]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ld a, [wNPCMovementScriptFunctionNum]
call CallFunctionInTable
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -2407,7 +2407,7 @@
; hl = text if the player wins
; de = text if the player loses
SaveEndBattleTextPointers::
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
ld [wEndBattleTextRomBank], a
ld a, h
ld [wEndBattleWinTextPointer], a
@@ -2442,10 +2442,10 @@
res 7, [hl]
pop hl
ret z
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, [wEndBattleTextRomBank]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
push hl
callba SaveTrainerName
@@ -2453,7 +2453,7 @@
call PrintText
pop hl
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
callba FreezeEnemyTrainerSprite
jp WaitForSoundToFinish
@@ -2623,7 +2623,7 @@
SetSpriteFacingDirection::
ld a, $9
- ld [H_SPRITEDATAOFFSET], a
+ ld [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1
ld a, [hSpriteFacingDirection]
ld [hl], a
@@ -2678,7 +2678,7 @@
; tests if a boulder's coordinates are in a specified array
; INPUT:
; hl = address of array
-; [H_SPRITEINDEX] = index of boulder sprite
+; [hSpriteIndex] = index of boulder sprite
; OUTPUT:
; [wCoordIndex] = if there is match, the matching array index
; sets carry if the coordinates are in the array, clears carry if not
@@ -2685,7 +2685,7 @@
CheckBoulderCoords::
push hl
ld hl, wSpriteStateData2 + $04
- ld a, [H_SPRITEINDEX]
+ ld a, [hSpriteIndex]
swap a
ld d, $0
ld e, a
@@ -2707,9 +2707,9 @@
ld h, $c2
_GetPointerWithinSpriteStateData:
- ld a, [H_SPRITEDATAOFFSET]
+ ld a, [hSpriteDataOffset]
ld b, a
- ld a, [H_SPRITEINDEX]
+ ld a, [hSpriteIndex]
swap a
add b
ld l, a
@@ -2746,7 +2746,7 @@
inc a ; include sentinel in counting
ret
-; sets movement byte 1 for sprite [H_SPRITEINDEX] to $FE and byte 2 to [hSpriteMovementByte2]
+; sets movement byte 1 for sprite [hSpriteIndex] to $FE and byte 2 to [hSpriteMovementByte2]
SetSpriteMovementBytesToFE::
push hl
call GetSpriteMovementByte1Pointer
@@ -2757,7 +2757,7 @@
pop hl
ret
-; sets both movement bytes for sprite [H_SPRITEINDEX] to $FF
+; sets both movement bytes for sprite [hSpriteIndex] to $FF
SetSpriteMovementBytesToFF::
push hl
call GetSpriteMovementByte1Pointer
@@ -2767,20 +2767,20 @@
pop hl
ret
-; returns the sprite movement byte 1 pointer for sprite [H_SPRITEINDEX] in hl
+; returns the sprite movement byte 1 pointer for sprite [hSpriteIndex] in hl
GetSpriteMovementByte1Pointer::
ld h, $C2
- ld a, [H_SPRITEINDEX]
+ ld a, [hSpriteIndex]
swap a
add 6
ld l, a
ret
-; returns the sprite movement byte 2 pointer for sprite [H_SPRITEINDEX] in hl
+; returns the sprite movement byte 2 pointer for sprite [hSpriteIndex] in hl
GetSpriteMovementByte2Pointer::
push de
ld hl, wMapSpriteData
- ld a, [H_SPRITEINDEX]
+ ld a, [hSpriteIndex]
dec a
add a
ld d, 0
@@ -2846,10 +2846,10 @@
; switches to bank # in a
; Only use this when in the home bank!
ld [wBankswitchHomeTemp], a
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
ld [wBankswitchHomeSavedROMBank], a
ld a, [wBankswitchHomeTemp]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -2856,7 +2856,7 @@
BankswitchBack::
; returns from BankswitchHome
ld a, [wBankswitchHomeSavedROMBank]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -2863,10 +2863,10 @@
Bankswitch::
; self-contained bankswitch, use this when not in the home bank
; switches to the bank in b
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, b
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ld bc, .Return
push bc
@@ -2874,7 +2874,7 @@
.Return
pop bc
ld a, b
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -2929,7 +2929,7 @@
ret
MoveSprite::
-; move the sprite [H_SPRITEINDEX] with the movement pointed to by de
+; move the sprite [hSpriteIndex] with the movement pointed to by de
; actually only copies the movement data to wNPCMovementDirections for later
call SetSpriteMovementBytesToFF
MoveSprite_::
@@ -3068,13 +3068,13 @@
LoadScreenTilesFromBuffer2::
call LoadScreenTilesFromBuffer2DisableBGTransfer
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ret
-; loads screen tiles stored in wTileMapBackup2 but leaves H_AUTOBGTRANSFERENABLED disabled
+; loads screen tiles stored in wTileMapBackup2 but leaves hAutoBGTransferEnabled disabled
LoadScreenTilesFromBuffer2DisableBGTransfer::
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld hl, wTileMapBackup2
coord de, 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
@@ -3089,13 +3089,13 @@
LoadScreenTilesFromBuffer1::
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld hl, wTileMapBackup
coord de, 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call CopyData
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ret
DelayFrames::
@@ -3154,7 +3154,7 @@
cp HM_01
jp nc, GetMachineName
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
push hl
push bc
@@ -3172,7 +3172,7 @@
.otherEntries
;2-7 = OTHER ENTRIES
ld a, [wPredefBank]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ld a, [wNameListType] ;VariousNames' entryID
dec a
@@ -3220,7 +3220,7 @@
pop bc
pop hl
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -3227,7 +3227,7 @@
GetItemPrice::
; Stores item's price as BCD at hItemPrice (3 bytes)
; Input: [wcf91] = item id
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, [wListMenuID]
cp MOVESLISTMENU
@@ -3235,7 +3235,7 @@
jr nz, .ok
ld a, $f ; hardcoded Bank
.ok
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ld hl, wItemPrices
ld a, [hli]
@@ -3259,13 +3259,13 @@
jr .done
.getTMPrice
ld a, Bank(GetMachinePrice)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call GetMachinePrice
.done
ld de, hItemPrice
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -3312,10 +3312,10 @@
jr z, .noNewlyPressedButtons
.newlyPressedButtons
ld a, 30 ; half a second delay
- ld [H_FRAMECOUNTER], a
+ ld [hFrameCounter], a
ret
.noNewlyPressedButtons
- ld a, [H_FRAMECOUNTER]
+ ld a, [hFrameCounter]
and a ; is the delay over?
jr z, .delayOver
.delayNotOver
@@ -3334,18 +3334,18 @@
ld [hJoy5], a
.setShortDelay
ld a, 5 ; 1/12 of a second delay
- ld [H_FRAMECOUNTER], a
+ ld [hFrameCounter], a
ret
WaitForTextScrollButtonPress::
- ld a, [H_DOWNARROWBLINKCNT1]
+ ld a, [hDownArrowBlinkCount1]
push af
- ld a, [H_DOWNARROWBLINKCNT2]
+ ld a, [hDownArrowBlinkCount2]
push af
xor a
- ld [H_DOWNARROWBLINKCNT1], a
+ ld [hDownArrowBlinkCount1], a
ld a, $6
- ld [H_DOWNARROWBLINKCNT2], a
+ ld [hDownArrowBlinkCount2], a
.loop
push hl
ld a, [wTownMapSpriteBlinkingEnabled]
@@ -3362,9 +3362,9 @@
and A_BUTTON | B_BUTTON
jr z, .loop
pop af
- ld [H_DOWNARROWBLINKCNT2], a
+ ld [hDownArrowBlinkCount2], a
pop af
- ld [H_DOWNARROWBLINKCNT1], a
+ ld [hDownArrowBlinkCount1], a
ret
; (unless in link battle) waits for A or B being pressed and outputs the scrolling sound effect
@@ -3407,14 +3407,14 @@
push hl
push de
push bc
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, Bank(_Divide)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call _Divide
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
pop bc
pop de
@@ -3439,11 +3439,11 @@
jr z, .waitOneFrame
ld a, [wOptions]
and $f
- ld [H_FRAMECOUNTER], a
+ ld [hFrameCounter], a
jr .checkButtons
.waitOneFrame
ld a, 1
- ld [H_FRAMECOUNTER], a
+ ld [hFrameCounter], a
.checkButtons
call Joypad
ld a, [hJoyHeld]
@@ -3458,7 +3458,7 @@
call DelayFrame
jr .done
.buttonsNotPressed ; if neither A nor B is pressed
- ld a, [H_FRAMECOUNTER]
+ ld a, [hFrameCounter]
and a
jr nz, .checkButtons
.done
@@ -3505,10 +3505,10 @@
.statsLoop
inc c
call CalcStat
- ld a, [H_MULTIPLICAND+1]
+ ld a, [hMultiplicand+1]
ld [de], a
inc de
- ld a, [H_MULTIPLICAND+2]
+ ld a, [hMultiplicand+2]
ld [de], a
inc de
ld a, c
@@ -3541,14 +3541,14 @@
add hl, bc ; skip to corresponding stat exp value
.statExpLoop ; calculates ceil(Sqrt(stat exp)) in b
xor a
- ld [H_MULTIPLICAND], a
- ld [H_MULTIPLICAND+1], a
+ ld [hMultiplicand], a
+ ld [hMultiplicand+1], a
inc b ; increment current stat exp bonus
ld a, b
cp $ff
jr z, .statExpDone
- ld [H_MULTIPLICAND+2], a
- ld [H_MULTIPLIER], a
+ ld [hMultiplicand+2], a
+ ld [hMultiplier], a
call Multiply
ld a, [hld]
ld d, a
@@ -3636,22 +3636,22 @@
jr nc, .noCarry2
inc d ; de = (Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4
.noCarry2
- ld [H_MULTIPLICAND+2], a
+ ld [hMultiplicand+2], a
ld a, d
- ld [H_MULTIPLICAND+1], a
+ ld [hMultiplicand+1], a
xor a
- ld [H_MULTIPLICAND], a
+ ld [hMultiplicand], a
ld a, [wCurEnemyLVL]
- ld [H_MULTIPLIER], a
+ ld [hMultiplier], a
call Multiply ; ((Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4) * Level
- ld a, [H_MULTIPLICAND]
- ld [H_DIVIDEND], a
- ld a, [H_MULTIPLICAND+1]
- ld [H_DIVIDEND+1], a
- ld a, [H_MULTIPLICAND+2]
- ld [H_DIVIDEND+2], a
+ ld a, [hMultiplicand]
+ ld [hDividend], a
+ ld a, [hMultiplicand+1]
+ ld [hDividend+1], a
+ ld a, [hMultiplicand+2]
+ ld [hDividend+2], a
ld a, $64
- ld [H_DIVISOR], a
+ ld [hDivisor], a
ld a, $3
ld b, a
call Divide ; (((Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4) * Level) / 100
@@ -3661,38 +3661,38 @@
jr nz, .notHPStat
ld a, [wCurEnemyLVL]
ld b, a
- ld a, [H_MULTIPLICAND+2]
+ ld a, [hMultiplicand+2]
add b
- ld [H_MULTIPLICAND+2], a
+ ld [hMultiplicand+2], a
jr nc, .noCarry3
- ld a, [H_MULTIPLICAND+1]
+ ld a, [hMultiplicand+1]
inc a
- ld [H_MULTIPLICAND+1], a ; HP: (((Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4) * Level) / 100 + Level
+ ld [hMultiplicand+1], a ; HP: (((Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4) * Level) / 100 + Level
.noCarry3
ld a, 10 ; +10 for HP stat
.notHPStat
ld b, a
- ld a, [H_MULTIPLICAND+2]
+ ld a, [hMultiplicand+2]
add b
- ld [H_MULTIPLICAND+2], a
+ ld [hMultiplicand+2], a
jr nc, .noCarry4
- ld a, [H_MULTIPLICAND+1]
+ ld a, [hMultiplicand+1]
inc a ; non-HP: (((Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4) * Level) / 100 + 5
- ld [H_MULTIPLICAND+1], a ; HP: (((Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4) * Level) / 100 + Level + 10
+ ld [hMultiplicand+1], a ; HP: (((Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4) * Level) / 100 + Level + 10
.noCarry4
- ld a, [H_MULTIPLICAND+1] ; check for overflow (>999)
+ ld a, [hMultiplicand+1] ; check for overflow (>999)
cp 999 / $100 + 1
jr nc, .overflow
cp 999 / $100
jr c, .noOverflow
- ld a, [H_MULTIPLICAND+2]
+ ld a, [hMultiplicand+2]
cp 999 % $100 + 1
jr c, .noOverflow
.overflow
ld a, 999 / $100 ; overflow: cap at 999
- ld [H_MULTIPLICAND+1], a
+ ld [hMultiplicand+1], a
ld a, 999 % $100
- ld [H_MULTIPLICAND+2], a
+ ld [hMultiplicand+2], a
.noOverflow
pop bc
pop de
@@ -3700,28 +3700,28 @@
ret
AddEnemyMonToPlayerParty::
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, BANK(_AddEnemyMonToPlayerParty)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call _AddEnemyMonToPlayerParty
pop bc
ld a, b
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
MoveMon::
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, BANK(_MoveMon)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call _MoveMon
pop bc
ld a, b
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -3801,14 +3801,14 @@
ld [wPartyMenuAnimMonEnabled], a
HandleMenuInput_::
- ld a, [H_DOWNARROWBLINKCNT1]
+ ld a, [hDownArrowBlinkCount1]
push af
- ld a, [H_DOWNARROWBLINKCNT2]
+ ld a, [hDownArrowBlinkCount2]
push af ; save existing values on stack
xor a
- ld [H_DOWNARROWBLINKCNT1], a ; blinking down arrow timing value 1
+ ld [hDownArrowBlinkCount1], a ; blinking down arrow timing value 1
ld a, 6
- ld [H_DOWNARROWBLINKCNT2], a ; blinking down arrow timing value 2
+ ld [hDownArrowBlinkCount2], a ; blinking down arrow timing value 2
.loop1
xor a
ld [wAnimCounter], a ; counter for pokemon shaking animation
@@ -3837,9 +3837,9 @@
.giveUpWaiting
; if a key wasn't pressed within the specified number of checks
pop af
- ld [H_DOWNARROWBLINKCNT2], a
+ ld [hDownArrowBlinkCount2], a
pop af
- ld [H_DOWNARROWBLINKCNT1], a ; restore previous values
+ ld [hDownArrowBlinkCount1], a ; restore previous values
xor a
ld [wMenuWrappingEnabled], a ; disable menu wrapping
ret
@@ -3901,9 +3901,9 @@
call PlaySound
.skipPlayingSound
pop af
- ld [H_DOWNARROWBLINKCNT2], a
+ ld [hDownArrowBlinkCount2], a
pop af
- ld [H_DOWNARROWBLINKCNT1], a ; restore previous values
+ ld [hDownArrowBlinkCount1], a ; restore previous values
xor a
ld [wMenuWrappingEnabled], a ; disable menu wrapping
ld a, [hJoy5]
@@ -3934,7 +3934,7 @@
and a ; was the previous menu id 0?
jr z, .checkForArrow1
push af
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
bit 1, a ; is the menu double spaced?
jr z, .doubleSpaced1
ld bc, 20
@@ -3960,7 +3960,7 @@
and a
jr z, .checkForArrow2
push af
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
bit 1, a ; is the menu double spaced?
jr z, .doubleSpaced2
ld bc, 20
@@ -4014,7 +4014,7 @@
; This toggles a blinking down arrow at hl on and off after a delay has passed.
; This is often called even when no blinking is occurring.
-; The reason is that most functions that call this initialize H_DOWNARROWBLINKCNT1 to 0.
+; The reason is that most functions that call this initialize hDownArrowBlinkCount1 to 0.
; The effect is that if the tile at hl is initialized with a down arrow,
; this function will toggle that down arrow on and off, but if the tile isn't
; initialized with a down arrow, this function does nothing.
@@ -4027,36 +4027,36 @@
cp b
jr nz, .downArrowOff
.downArrowOn
- ld a, [H_DOWNARROWBLINKCNT1]
+ ld a, [hDownArrowBlinkCount1]
dec a
- ld [H_DOWNARROWBLINKCNT1], a
+ ld [hDownArrowBlinkCount1], a
ret nz
- ld a, [H_DOWNARROWBLINKCNT2]
+ ld a, [hDownArrowBlinkCount2]
dec a
- ld [H_DOWNARROWBLINKCNT2], a
+ ld [hDownArrowBlinkCount2], a
ret nz
ld a, " "
ld [hl], a
ld a, $ff
- ld [H_DOWNARROWBLINKCNT1], a
+ ld [hDownArrowBlinkCount1], a
ld a, $06
- ld [H_DOWNARROWBLINKCNT2], a
+ ld [hDownArrowBlinkCount2], a
ret
.downArrowOff
- ld a, [H_DOWNARROWBLINKCNT1]
+ ld a, [hDownArrowBlinkCount1]
and a
ret z
dec a
- ld [H_DOWNARROWBLINKCNT1], a
+ ld [hDownArrowBlinkCount1], a
ret nz
dec a
- ld [H_DOWNARROWBLINKCNT1], a
- ld a, [H_DOWNARROWBLINKCNT2]
+ ld [hDownArrowBlinkCount1], a
+ ld a, [hDownArrowBlinkCount2]
dec a
- ld [H_DOWNARROWBLINKCNT2], a
+ ld [hDownArrowBlinkCount2], a
ret nz
ld a, $06
- ld [H_DOWNARROWBLINKCNT2], a
+ ld [hDownArrowBlinkCount2], a
ld a, "▼"
ld [hl], a
ret
@@ -4100,9 +4100,9 @@
; in bits 7 and 6 of b respectively.
push bc
xor a
- ld [H_PASTLEADINGZEROES], a
- ld [H_NUMTOPRINT], a
- ld [H_NUMTOPRINT + 1], a
+ ld [hPastLeadingZeros], a
+ ld [hNumToPrint], a
+ ld [hNumToPrint + 1], a
ld a, b
and $f
cp 1
@@ -4111,26 +4111,26 @@
jr z, .word
.long
ld a, [de]
- ld [H_NUMTOPRINT], a
+ ld [hNumToPrint], a
inc de
ld a, [de]
- ld [H_NUMTOPRINT + 1], a
+ ld [hNumToPrint + 1], a
inc de
ld a, [de]
- ld [H_NUMTOPRINT + 2], a
+ ld [hNumToPrint + 2], a
jr .start
.word
ld a, [de]
- ld [H_NUMTOPRINT + 1], a
+ ld [hNumToPrint + 1], a
inc de
ld a, [de]
- ld [H_NUMTOPRINT + 2], a
+ ld [hNumToPrint + 2], a
jr .start
.byte
ld a, [de]
- ld [H_NUMTOPRINT + 2], a
+ ld [hNumToPrint + 2], a
.start
push de
@@ -4159,16 +4159,16 @@
ld a, \1 / $10000 % $100
else xor a
endc
- ld [H_POWEROFTEN + 0], a
+ ld [hPowerOf10 + 0], a
if (\1) / $100
ld a, \1 / $100 % $100
else xor a
endc
- ld [H_POWEROFTEN + 1], a
+ ld [hPowerOf10 + 1], a
ld a, \1 / $1 % $100
- ld [H_POWEROFTEN + 2], a
+ ld [hPowerOf10 + 2], a
call .PrintDigit
call .NextDigit
@@ -4182,7 +4182,7 @@
.tens
ld c, 0
- ld a, [H_NUMTOPRINT + 2]
+ ld a, [hNumToPrint + 2]
.mod
cp 10
jr c, .ok
@@ -4192,9 +4192,9 @@
.ok
ld b, a
- ld a, [H_PASTLEADINGZEROES]
+ ld a, [hPastLeadingZeros]
or c
- ld [H_PASTLEADINGZEROES], a
+ ld [hPastLeadingZeros], a
jr nz, .past
call .PrintLeadingZero
jr .next
@@ -4219,67 +4219,67 @@
; Print the quotient, and keep the modulus.
ld c, 0
.loop
- ld a, [H_POWEROFTEN]
+ ld a, [hPowerOf10]
ld b, a
- ld a, [H_NUMTOPRINT]
- ld [H_SAVEDNUMTOPRINT], a
+ ld a, [hNumToPrint]
+ ld [hSavedNumToPrint], a
cp b
jr c, .underflow0
sub b
- ld [H_NUMTOPRINT], a
- ld a, [H_POWEROFTEN + 1]
+ ld [hNumToPrint], a
+ ld a, [hPowerOf10 + 1]
ld b, a
- ld a, [H_NUMTOPRINT + 1]
- ld [H_SAVEDNUMTOPRINT + 1], a
+ ld a, [hNumToPrint + 1]
+ ld [hSavedNumToPrint + 1], a
cp b
jr nc, .noborrow1
- ld a, [H_NUMTOPRINT]
+ ld a, [hNumToPrint]
or 0
jr z, .underflow1
dec a
- ld [H_NUMTOPRINT], a
- ld a, [H_NUMTOPRINT + 1]
+ ld [hNumToPrint], a
+ ld a, [hNumToPrint + 1]
.noborrow1
sub b
- ld [H_NUMTOPRINT + 1], a
- ld a, [H_POWEROFTEN + 2]
+ ld [hNumToPrint + 1], a
+ ld a, [hPowerOf10 + 2]
ld b, a
- ld a, [H_NUMTOPRINT + 2]
- ld [H_SAVEDNUMTOPRINT + 2], a
+ ld a, [hNumToPrint + 2]
+ ld [hSavedNumToPrint + 2], a
cp b
jr nc, .noborrow2
- ld a, [H_NUMTOPRINT + 1]
+ ld a, [hNumToPrint + 1]
and a
jr nz, .borrowed
- ld a, [H_NUMTOPRINT]
+ ld a, [hNumToPrint]
and a
jr z, .underflow2
dec a
- ld [H_NUMTOPRINT], a
+ ld [hNumToPrint], a
xor a
.borrowed
dec a
- ld [H_NUMTOPRINT + 1], a
- ld a, [H_NUMTOPRINT + 2]
+ ld [hNumToPrint + 1], a
+ ld a, [hNumToPrint + 2]
.noborrow2
sub b
- ld [H_NUMTOPRINT + 2], a
+ ld [hNumToPrint + 2], a
inc c
jr .loop
.underflow2
- ld a, [H_SAVEDNUMTOPRINT + 1]
- ld [H_NUMTOPRINT + 1], a
+ ld a, [hSavedNumToPrint + 1]
+ ld [hNumToPrint + 1], a
.underflow1
- ld a, [H_SAVEDNUMTOPRINT]
- ld [H_NUMTOPRINT], a
+ ld a, [hSavedNumToPrint]
+ ld [hNumToPrint], a
.underflow0
- ld a, [H_PASTLEADINGZEROES]
+ ld a, [hPastLeadingZeros]
or c
jr z, .PrintLeadingZero
@@ -4286,7 +4286,7 @@
ld a, "0"
add c
ld [hl], a
- ld [H_PASTLEADINGZEROES], a
+ ld [hPastLeadingZeros], a
ret
.PrintLeadingZero:
@@ -4303,7 +4303,7 @@
jr nz, .inc
bit BIT_LEFT_ALIGN, d
jr z, .inc
- ld a, [H_PASTLEADINGZEROES]
+ ld a, [hPastLeadingZeros]
and a
ret z
.inc
@@ -4491,7 +4491,7 @@
jpba UpdateCinnabarGymGateTileBlocks_
CheckForHiddenObjectOrBookshelfOrCardKeyDoor::
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, [hJoyHeld]
bit 0, a ; A button
@@ -4499,7 +4499,7 @@
; A button is pressed
ld a, Bank(CheckForHiddenObject)
ld [MBC1RomBank], a
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
call CheckForHiddenObject
ld a, [$ffee]
and a
@@ -4506,7 +4506,7 @@
jr nz, .hiddenObjectNotFound
ld a, [wHiddenObjectFunctionRomBank]
ld [MBC1RomBank], a
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld de, .returnAddress
push de
jp hl
@@ -4524,7 +4524,7 @@
ld [$ffeb], a
pop af
ld [MBC1RomBank], a
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ret
PrintPredefTextID::
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -170,10 +170,10 @@
.noFadeOut
xor a
ld [wNewSoundID], a
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
ld [hSavedROMBank], a
ld a, [wAudioROMBank]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
cp BANK(Audio1_PlaySound)
jr nz, .checkForAudio2
@@ -198,7 +198,7 @@
.next2
ld a, [hSavedROMBank]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
jr .done
--- a/home/copy.asm
+++ b/home/copy.asm
@@ -1,14 +1,14 @@
FarCopyData::
; Copy bc bytes from a:hl to de.
ld [wBuffer], a
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, [wBuffer]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call CopyData
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
--- a/home/copy2.asm
+++ b/home/copy2.asm
@@ -2,14 +2,14 @@
; Identical to FarCopyData, but uses hROMBankTemp
; as temp space instead of wBuffer.
ld [hROMBankTemp], a
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, [hROMBankTemp]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call CopyData
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -16,10 +16,10 @@
FarCopyData3::
; Copy bc bytes from a:de to hl.
ld [hROMBankTemp], a
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, [hROMBankTemp]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
push hl
push de
@@ -31,7 +31,7 @@
pop de
pop hl
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -39,10 +39,10 @@
; Expand bc bytes of 1bpp image data
; from a:hl to 2bpp data at de.
ld [hROMBankTemp], a
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, [hROMBankTemp]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
.loop
ld a, [hli]
@@ -55,7 +55,7 @@
or b
jr nz, .loop
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -64,27 +64,27 @@
; tiles from b:de to hl, 8 tiles at a time.
; This takes c/8 frames.
- ld a, [H_AUTOBGTRANSFERENABLED]
+ ld a, [hAutoBGTransferEnabled]
push af
xor a ; disable auto-transfer while copying
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
ld [hROMBankTemp], a
ld a, b
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ld a, e
- ld [H_VBCOPYSRC], a
+ ld [hVBlankCopySource], a
ld a, d
- ld [H_VBCOPYSRC + 1], a
+ ld [hVBlankCopySource + 1], a
ld a, l
- ld [H_VBCOPYDEST], a
+ ld [hVBlankCopyDest], a
ld a, h
- ld [H_VBCOPYDEST + 1], a
+ ld [hVBlankCopyDest + 1], a
.loop
ld a, c
@@ -92,18 +92,18 @@
jr nc, .keepgoing
.done
- ld [H_VBCOPYSIZE], a
+ ld [hVBlankCopySize], a
call DelayFrame
ld a, [hROMBankTemp]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
pop af
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ret
.keepgoing
ld a, 8
- ld [H_VBCOPYSIZE], a
+ ld [hVBlankCopySize], a
call DelayFrame
ld a, c
sub 8
@@ -114,26 +114,26 @@
; Wait for the next VBlank, then copy c 1bpp
; tiles from b:de to hl, 8 tiles at a time.
; This takes c/8 frames.
- ld a, [H_AUTOBGTRANSFERENABLED]
+ ld a, [hAutoBGTransferEnabled]
push af
xor a ; disable auto-transfer while copying
- ld [H_AUTOBGTRANSFERENABLED], a
- ld a, [H_LOADEDROMBANK]
+ ld [hAutoBGTransferEnabled], a
+ ld a, [hLoadedROMBank]
ld [hROMBankTemp], a
ld a, b
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ld a, e
- ld [H_VBCOPYDOUBLESRC], a
+ ld [hVBlankCopyDoubleSource], a
ld a, d
- ld [H_VBCOPYDOUBLESRC + 1], a
+ ld [hVBlankCopyDoubleSource + 1], a
ld a, l
- ld [H_VBCOPYDOUBLEDEST], a
+ ld [hVBlankCopyDoubleDest], a
ld a, h
- ld [H_VBCOPYDOUBLEDEST + 1], a
+ ld [hVBlankCopyDoubleDest + 1], a
.loop
ld a, c
@@ -141,18 +141,18 @@
jr nc, .keepgoing
.done
- ld [H_VBCOPYDOUBLESIZE], a
+ ld [hVBlankCopyDoubleSize], a
call DelayFrame
ld a, [hROMBankTemp]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
pop af
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ret
.keepgoing
ld a, 8
- ld [H_VBCOPYDOUBLESIZE], a
+ ld [hVBlankCopyDoubleSize], a
call DelayFrame
ld a, c
sub 8
@@ -200,16 +200,16 @@
.setup
ld a, d
- ld [H_VBCOPYBGSRC+1], a
+ ld [hVBlankCopyBGSource+1], a
call GetRowColAddressBgMap
ld a, l
- ld [H_VBCOPYBGDEST], a
+ ld [hVBlankCopyBGDest], a
ld a, h
- ld [H_VBCOPYBGDEST+1], a
+ ld [hVBlankCopyBGDest+1], a
ld a, c
- ld [H_VBCOPYBGNUMROWS], a
+ ld [hVBlankCopyBGNumRows], a
ld a, e
- ld [H_VBCOPYBGSRC], a
+ ld [hVBlankCopyBGSource], a
ret
ClearScreen::
--- a/home/init.asm
+++ b/home/init.asm
@@ -60,7 +60,7 @@
call ClearSprites
ld a, Bank(WriteDMACodeToHRAM)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call WriteDMACodeToHRAM
@@ -101,9 +101,9 @@
ld [wAudioROMBank], a
ld [wAudioSavedROMBank], a
ld a, $9c
- ld [H_AUTOBGTRANSFERDEST + 1], a
+ ld [hAutoBGTransferDest + 1], a
xor a
- ld [H_AUTOBGTRANSFERDEST], a
+ ld [hAutoBGTransferDest], a
dec a
ld [wUpdateSpritesEnabled], a
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -763,7 +763,7 @@
ld hl, wd72e
res 5, [hl]
ld a, Bank(ResetStatusAndHalveMoneyOnBlackout) ; also Bank(SpecialWarpIn) and Bank(SpecialEnterMap)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call ResetStatusAndHalveMoneyOnBlackout
call SpecialWarpIn
@@ -794,7 +794,7 @@
res 5, [hl] ; forced to ride bike
call LeaveMapAnim
ld a, Bank(SpecialWarpIn)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call SpecialWarpIn
jp SpecialEnterMap
@@ -1372,10 +1372,10 @@
; this builds a tile map from the tile block map based on the current X/Y coordinates of the player's character
LoadCurrentMapView::
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, [wTilesetBank] ; tile data ROM bank
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a ; switch to ROM bank that contains tile data
ld a, [wCurrentTileBlockMapViewPointer] ; address of upper left corner of current map view
ld e, a
@@ -1457,7 +1457,7 @@
dec b
jr nz, .rowLoop2
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a ; restore previous ROM bank
ret
@@ -2291,10 +2291,10 @@
ld a, [wCurMap]
ld c, a
ld b, $00
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, BANK(MapSongBanks)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ld hl, MapSongBanks
add hl, bc
@@ -2304,7 +2304,7 @@
ld a, [hl]
ld [wMapMusicROMBank], a ; music 2
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -2322,7 +2322,7 @@
; function to load map data
LoadMapData::
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
call DisableLCD
ld a, $98
@@ -2377,7 +2377,7 @@
call PlayDefaultMusicFadeOutCurrent
.restoreRomBank
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
@@ -2396,7 +2396,7 @@
ld [$ffe8], a ; save map ROM bank
call BankswitchBack
ld a, [$ffe8]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a ; switch to map ROM bank
pop bc
pop hl
--- a/home/pic.asm
+++ b/home/pic.asm
@@ -2,10 +2,10 @@
; bank is given in a, sprite input stream is pointed to in wSpriteInputPtr
UncompressSpriteData::
ld b, a
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, b
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ld a, SRAM_ENABLE
ld [MBC1SRamEnable], a
@@ -13,7 +13,7 @@
ld [MBC1SRamBank], a
call _UncompressSpriteData
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
--- a/home/predef.asm
+++ b/home/predef.asm
@@ -8,18 +8,18 @@
; A hack for LoadDestinationWarpPosition.
; See LoadTilesetHeader (predef $19).
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
ld [wPredefParentBank], a
push af
ld a, BANK(GetPredefPointer)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call GetPredefPointer
ld a, [wPredefBank]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ld de, .done
@@ -28,7 +28,7 @@
.done
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ret
--- a/home/start_menu.asm
+++ b/home/start_menu.asm
@@ -1,6 +1,6 @@
DisplayStartMenu::
ld a, BANK(StartMenu_Pokedex)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ld a, [wWalkBikeSurfState] ; walking/biking/surfing
ld [wWalkBikeSurfStateCopy], a
--- a/home/text.asm
+++ b/home/text.asm
@@ -62,7 +62,7 @@
cp $4E ; next
jr nz, .char4FTest
ld bc, 2 * SCREEN_WIDTH
- ld a, [hFlags_0xFFF6]
+ ld a, [hFlagsFFF6]
bit 2, a
jr z, .ok
ld bc, SCREEN_WIDTH
@@ -180,7 +180,7 @@
; or
; player active monster’s name
; (like Char5A but flipped)
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
xor 1
jr MonsterNameCharsCommon
@@ -189,7 +189,7 @@
; player active monster’s name
; or
; enemy active monster’s name, prefixed with “Enemy ”
- ld a, [H_WHOSETURN]
+ ld a, [hWhoseTurn]
MonsterNameCharsCommon::
push de
and a
@@ -675,7 +675,7 @@
; BB = bank
TextCommand17::
pop hl
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, [hli]
ld e, a
@@ -682,7 +682,7 @@
ld a, [hli]
ld d, a
ld a, [hli]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
push hl
ld l, e
@@ -690,7 +690,7 @@
call TextCommandProcessor
pop hl
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
jp NextTextCommand
--- a/home/vblank.asm
+++ b/home/vblank.asm
@@ -5,7 +5,7 @@
push de
push hl
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
ld [wVBlankSavedROMBank], a
ld a, [hSCX]
@@ -28,7 +28,7 @@
call UpdateMovingBgTiles
call $ff80 ; hOAMDMA
ld a, BANK(PrepareOAMData)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call PrepareOAMData
@@ -36,24 +36,24 @@
call Random
- ld a, [H_VBLANKOCCURRED]
+ ld a, [hVBlankOccurred]
and a
jr z, .skipZeroing
xor a
- ld [H_VBLANKOCCURRED], a
+ ld [hVBlankOccurred], a
.skipZeroing
- ld a, [H_FRAMECOUNTER]
+ ld a, [hFrameCounter]
and a
jr z, .skipDec
dec a
- ld [H_FRAMECOUNTER], a
+ ld [hFrameCounter], a
.skipDec
call FadeOutAudio
ld a, [wAudioROMBank] ; music ROM bank
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
cp BANK(Audio1_UpdateMusic)
@@ -79,7 +79,7 @@
call z, ReadJoypad
ld a, [wVBlankSavedROMBank]
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
pop hl
@@ -96,10 +96,10 @@
NOT_VBLANKED EQU 1
ld a, NOT_VBLANKED
- ld [H_VBLANKOCCURRED], a
+ ld [hVBlankOccurred], a
.halt
halt
- ld a, [H_VBLANKOCCURRED]
+ ld a, [hVBlankOccurred]
and a
jr nz, .halt
ret
--- a/home/vcopy.asm
+++ b/home/vcopy.asm
@@ -120,15 +120,15 @@
; the above function, RedrawRowOrColumn, is used when walking to
; improve efficiency.
AutoBgMapTransfer::
- ld a, [H_AUTOBGTRANSFERENABLED]
+ ld a, [hAutoBGTransferEnabled]
and a
ret z
ld hl, sp + 0
ld a, h
- ld [H_SPTEMP], a
+ ld [hSPTemp], a
ld a, l
- ld [H_SPTEMP + 1], a ; save stack pinter
- ld a, [H_AUTOBGTRANSFERPORTION]
+ ld [hSPTemp + 1], a ; save stack pinter
+ ld a, [hAutoBGTransferPortion]
and a
jr z, .transferTopThird
dec a
@@ -136,9 +136,9 @@
.transferBottomThird
coord hl, 0, 12
ld sp, hl
- ld a, [H_AUTOBGTRANSFERDEST + 1]
+ ld a, [hAutoBGTransferDest + 1]
ld h, a
- ld a, [H_AUTOBGTRANSFERDEST]
+ ld a, [hAutoBGTransferDest]
ld l, a
ld de, (12 * 32)
add hl, de
@@ -147,9 +147,9 @@
.transferTopThird
coord hl, 0, 0
ld sp, hl
- ld a, [H_AUTOBGTRANSFERDEST + 1]
+ ld a, [hAutoBGTransferDest + 1]
ld h, a
- ld a, [H_AUTOBGTRANSFERDEST]
+ ld a, [hAutoBGTransferDest]
ld l, a
ld a, TRANSFERMIDDLE
jr .doTransfer
@@ -156,15 +156,15 @@
.transferMiddleThird
coord hl, 0, 6
ld sp, hl
- ld a, [H_AUTOBGTRANSFERDEST + 1]
+ ld a, [hAutoBGTransferDest + 1]
ld h, a
- ld a, [H_AUTOBGTRANSFERDEST]
+ ld a, [hAutoBGTransferDest]
ld l, a
ld de, (6 * 32)
add hl, de
ld a, TRANSFERBOTTOM
.doTransfer
- ld [H_AUTOBGTRANSFERPORTION], a ; store next portion
+ ld [hAutoBGTransferPortion], a ; store next portion
ld b, 6
TransferBgRows::
@@ -192,73 +192,73 @@
dec b
jr nz, TransferBgRows
- ld a, [H_SPTEMP]
+ ld a, [hSPTemp]
ld h, a
- ld a, [H_SPTEMP + 1]
+ ld a, [hSPTemp + 1]
ld l, a
ld sp, hl
ret
-; Copies [H_VBCOPYBGNUMROWS] rows from H_VBCOPYBGSRC to H_VBCOPYBGDEST.
-; If H_VBCOPYBGSRC is XX00, the transfer is disabled.
+; Copies [hVBlankCopyBGNumRows] rows from hVBlankCopyBGSource to hVBlankCopyBGDest.
+; If hVBlankCopyBGSource is XX00, the transfer is disabled.
VBlankCopyBgMap::
- ld a, [H_VBCOPYBGSRC] ; doubles as enabling byte
+ ld a, [hVBlankCopyBGSource] ; doubles as enabling byte
and a
ret z
ld hl, sp + 0
ld a, h
- ld [H_SPTEMP], a
+ ld [hSPTemp], a
ld a, l
- ld [H_SPTEMP + 1], a ; save stack pointer
- ld a, [H_VBCOPYBGSRC]
+ ld [hSPTemp + 1], a ; save stack pointer
+ ld a, [hVBlankCopyBGSource]
ld l, a
- ld a, [H_VBCOPYBGSRC + 1]
+ ld a, [hVBlankCopyBGSource + 1]
ld h, a
ld sp, hl
- ld a, [H_VBCOPYBGDEST]
+ ld a, [hVBlankCopyBGDest]
ld l, a
- ld a, [H_VBCOPYBGDEST + 1]
+ ld a, [hVBlankCopyBGDest + 1]
ld h, a
- ld a, [H_VBCOPYBGNUMROWS]
+ ld a, [hVBlankCopyBGNumRows]
ld b, a
xor a
- ld [H_VBCOPYBGSRC], a ; disable transfer so it doesn't continue next V-blank
+ ld [hVBlankCopyBGSource], a ; disable transfer so it doesn't continue next V-blank
jr TransferBgRows
VBlankCopyDouble::
-; Copy [H_VBCOPYDOUBLESIZE] 1bpp tiles
-; from H_VBCOPYDOUBLESRC to H_VBCOPYDOUBLEDEST.
+; Copy [hVBlankCopyDoubleSize] 1bpp tiles
+; from hVBlankCopyDoubleSource to hVBlankCopyDoubleDest.
; While we're here, convert to 2bpp.
; The process is straightforward:
; copy each byte twice.
- ld a, [H_VBCOPYDOUBLESIZE]
+ ld a, [hVBlankCopyDoubleSize]
and a
ret z
ld hl, sp + 0
ld a, h
- ld [H_SPTEMP], a
+ ld [hSPTemp], a
ld a, l
- ld [H_SPTEMP + 1], a
+ ld [hSPTemp + 1], a
- ld a, [H_VBCOPYDOUBLESRC]
+ ld a, [hVBlankCopyDoubleSource]
ld l, a
- ld a, [H_VBCOPYDOUBLESRC + 1]
+ ld a, [hVBlankCopyDoubleSource + 1]
ld h, a
ld sp, hl
- ld a, [H_VBCOPYDOUBLEDEST]
+ ld a, [hVBlankCopyDoubleDest]
ld l, a
- ld a, [H_VBCOPYDOUBLEDEST + 1]
+ ld a, [hVBlankCopyDoubleDest + 1]
ld h, a
- ld a, [H_VBCOPYDOUBLESIZE]
+ ld a, [hVBlankCopyDoubleSize]
ld b, a
xor a ; transferred
- ld [H_VBCOPYDOUBLESIZE], a
+ ld [hVBlankCopyDoubleSize], a
.loop
rept 3
@@ -286,19 +286,19 @@
jr nz, .loop
ld a, l
- ld [H_VBCOPYDOUBLEDEST], a
+ ld [hVBlankCopyDoubleDest], a
ld a, h
- ld [H_VBCOPYDOUBLEDEST + 1], a
+ ld [hVBlankCopyDoubleDest + 1], a
ld hl, sp + 0
ld a, l
- ld [H_VBCOPYDOUBLESRC], a
+ ld [hVBlankCopyDoubleSource], a
ld a, h
- ld [H_VBCOPYDOUBLESRC + 1], a
+ ld [hVBlankCopyDoubleSource + 1], a
- ld a, [H_SPTEMP]
+ ld a, [hSPTemp]
ld h, a
- ld a, [H_SPTEMP + 1]
+ ld a, [hSPTemp + 1]
ld l, a
ld sp, hl
@@ -306,37 +306,37 @@
VBlankCopy::
-; Copy [H_VBCOPYSIZE] 2bpp tiles (or 16 * [H_VBCOPYSIZE] tile map entries)
-; from H_VBCOPYSRC to H_VBCOPYDEST.
+; Copy [hVBlankCopySize] 2bpp tiles (or 16 * [hVBlankCopySize] tile map entries)
+; from hVBlankCopySource to hVBlankCopyDest.
; Source and destination addresses are updated,
; so transfer can continue in subsequent calls.
- ld a, [H_VBCOPYSIZE]
+ ld a, [hVBlankCopySize]
and a
ret z
ld hl, sp + 0
ld a, h
- ld [H_SPTEMP], a
+ ld [hSPTemp], a
ld a, l
- ld [H_SPTEMP + 1], a
+ ld [hSPTemp + 1], a
- ld a, [H_VBCOPYSRC]
+ ld a, [hVBlankCopySource]
ld l, a
- ld a, [H_VBCOPYSRC + 1]
+ ld a, [hVBlankCopySource + 1]
ld h, a
ld sp, hl
- ld a, [H_VBCOPYDEST]
+ ld a, [hVBlankCopyDest]
ld l, a
- ld a, [H_VBCOPYDEST + 1]
+ ld a, [hVBlankCopyDest + 1]
ld h, a
- ld a, [H_VBCOPYSIZE]
+ ld a, [hVBlankCopySize]
ld b, a
xor a ; transferred
- ld [H_VBCOPYSIZE], a
+ ld [hVBlankCopySize], a
.loop
rept 7
@@ -356,19 +356,19 @@
jr nz, .loop
ld a, l
- ld [H_VBCOPYDEST], a
+ ld [hVBlankCopyDest], a
ld a, h
- ld [H_VBCOPYDEST + 1], a
+ ld [hVBlankCopyDest + 1], a
ld hl, sp + 0
ld a, l
- ld [H_VBCOPYSRC], a
+ ld [hVBlankCopySource], a
ld a, h
- ld [H_VBCOPYSRC + 1], a
+ ld [hVBlankCopySource + 1], a
- ld a, [H_SPTEMP]
+ ld a, [hSPTemp]
ld h, a
- ld a, [H_SPTEMP + 1]
+ ld a, [hSPTemp + 1]
ld l, a
ld sp, hl
--- a/hram.asm
+++ b/hram.asm
@@ -26,17 +26,17 @@
hRLEByteValue EQU $FF8B
-H_SPRITEWIDTH EQU $FF8B ; in tiles
-H_SPRITEINTERLACECOUNTER EQU $FF8B
-H_SPRITEHEIGHT EQU $FF8C ; in tiles
-H_SPRITEOFFSET EQU $FF8D
+hSpriteWidth EQU $FF8B ; in tiles
+hSpriteInterlaceCounter EQU $FF8B
+hSpriteHeight EQU $FF8C ; in tiles
+hSpriteOffset EQU $FF8D
; counters for blinking down arrow
-H_DOWNARROWBLINKCNT1 EQU $FF8B
-H_DOWNARROWBLINKCNT2 EQU $FF8C
+hDownArrowBlinkCount1 EQU $FF8B
+hDownArrowBlinkCount2 EQU $FF8C
-H_SPRITEDATAOFFSET EQU $FF8B
-H_SPRITEINDEX EQU $FF8C
+hSpriteDataOffset EQU $FF8B
+hSpriteIndex EQU $FF8C
hMapStride EQU $FF8B
hMapWidth EQU $FF8C
@@ -101,24 +101,24 @@
; Multiplication and division variables are meant
; to overlap for back-to-back usage. Big endian.
-H_MULTIPLICAND EQU $FF96 ; 3 bytes
-H_MULTIPLIER EQU $FF99 ; 1 byte
-H_PRODUCT EQU $FF95 ; 4 bytes
+hMultiplicand EQU $FF96 ; 3 bytes
+hMultiplier EQU $FF99 ; 1 byte
+hProduct EQU $FF95 ; 4 bytes
-H_DIVIDEND EQU $FF95 ; 4 bytes
-H_DIVISOR EQU $FF99 ; 1 byte
-H_QUOTIENT EQU $FF95 ; 4 bytes
-H_REMAINDER EQU $FF99 ; 1 byte
+hDividend EQU $FF95 ; 4 bytes
+hDivisor EQU $FF99 ; 1 byte
+hQuotient EQU $FF95 ; 4 bytes
+hRemainder EQU $FF99 ; 1 byte
-H_DIVIDEBUFFER EQU $FF9A
+hDivideBuffer EQU $FF9A
-H_MULTIPLYBUFFER EQU $FF9B
+hMultiplyBuffer EQU $FF9B
; PrintNumber (big endian).
-H_PASTLEADINGZEROES EQU $FF95 ; last char printed
-H_NUMTOPRINT EQU $FF96 ; 3 bytes
-H_POWEROFTEN EQU $FF99 ; 3 bytes
-H_SAVEDNUMTOPRINT EQU $FF9C ; 3 bytes
+hPastLeadingZeros EQU $FF95 ; last char printed
+hNumToPrint EQU $FF96 ; 3 bytes
+hPowerOf10 EQU $FF99 ; 3 bytes
+hSavedNumToPrint EQU $FF9C ; 3 bytes
; distance in steps between NPC and player
hNPCPlayerYDistance EQU $FF95
@@ -183,7 +183,7 @@
hJoy6 EQU $FFB6
hJoy7 EQU $FFB7
-H_LOADEDROMBANK EQU $FFB8
+hLoadedROMBank EQU $FFB8
hSavedROMBank EQU $FFB9
@@ -190,7 +190,7 @@
; is automatic background transfer during V-blank enabled?
; if nonzero, yes
; if zero, no
-H_AUTOBGTRANSFERENABLED EQU $FFBA
+hAutoBGTransferEnabled EQU $FFBA
TRANSFERTOP EQU 0
TRANSFERMIDDLE EQU 1
@@ -199,14 +199,14 @@
; 00 = top third of background
; 01 = middle third of background
; 02 = bottom third of background
-H_AUTOBGTRANSFERPORTION EQU $FFBB
+hAutoBGTransferPortion EQU $FFBB
; the destination address of the automatic background transfer
-H_AUTOBGTRANSFERDEST EQU $FFBC ; 2 bytes
+hAutoBGTransferDest EQU $FFBC ; 2 bytes
; temporary storage for stack pointer during memory transfers that use pop
; to increase speed
-H_SPTEMP EQU $FFBF ; 2 bytes
+hSPTemp EQU $FFBF ; 2 bytes
; source address for VBlankCopyBgMap function
; the first byte doubles as the byte that enabled the transfer.
@@ -213,31 +213,31 @@
; if it is 0, the transfer is disabled
; if it is not 0, the transfer is enabled
; this means that XX00 is not a valid source address
-H_VBCOPYBGSRC EQU $FFC1 ; 2 bytes
+hVBlankCopyBGSource EQU $FFC1 ; 2 bytes
; destination address for VBlankCopyBgMap function
-H_VBCOPYBGDEST EQU $FFC3 ; 2 bytes
+hVBlankCopyBGDest EQU $FFC3 ; 2 bytes
; number of rows for VBlankCopyBgMap to copy
-H_VBCOPYBGNUMROWS EQU $FFC5
+hVBlankCopyBGNumRows EQU $FFC5
; size of VBlankCopy transfer in 16-byte units
-H_VBCOPYSIZE EQU $FFC6
+hVBlankCopySize EQU $FFC6
; source address for VBlankCopy function
-H_VBCOPYSRC EQU $FFC7
+hVBlankCopySource EQU $FFC7
; destination address for VBlankCopy function
-H_VBCOPYDEST EQU $FFC9
+hVBlankCopyDest EQU $FFC9
; size of source data for VBlankCopyDouble in 8-byte units
-H_VBCOPYDOUBLESIZE EQU $FFCB
+hVBlankCopyDoubleSize EQU $FFCB
; source address for VBlankCopyDouble function
-H_VBCOPYDOUBLESRC EQU $FFCC
+hVBlankCopyDoubleSource EQU $FFCC
; destination address for VBlankCopyDouble function
-H_VBCOPYDOUBLEDEST EQU $FFCE
+hVBlankCopyDoubleDest EQU $FFCE
; controls whether a row or column of 2x2 tile blocks is redrawn in V-blank
; 00 = no redraw
@@ -253,12 +253,12 @@
hRandomAdd EQU $FFD3
hRandomSub EQU $FFD4
-H_FRAMECOUNTER EQU $FFD5 ; decremented every V-blank (used for delays)
+hFrameCounter EQU $FFD5 ; decremented every V-blank (used for delays)
; V-blank sets this to 0 each time it runs.
; So, by setting it to a nonzero value and waiting for it to become 0 again,
; you can detect that the V-blank handler has run since then.
-H_VBLANKOCCURRED EQU $FFD6
+hVBlankOccurred EQU $FFD6
; 00 = indoor
; 01 = cave
@@ -268,7 +268,7 @@
hMovingBGTilesCounter1 EQU $FFD8
-H_CURRENTSPRITEOFFSET EQU $FFDA ; multiple of $10
+hCurrentSpriteOffset EQU $FFDA ; multiple of $10
hItemCounter EQU $FFDB
@@ -310,11 +310,11 @@
hSpriteAnimFrameCounter EQU $FFEA
-H_WHOSETURN EQU $FFF3 ; 0 on player’s turn, 1 on enemy’s turn
+hWhoseTurn EQU $FFF3 ; 0 on player’s turn, 1 on enemy’s turn
; bit 0: draw HP fraction to the right of bar instead of below (for party menu)
; bit 1: menu is double spaced
-hFlags_0xFFF6 EQU $FFF6
+hFlagsFFF6 EQU $FFF6
hFieldMoveMonMenuTopMenuItemX EQU $FFF7
@@ -321,4 +321,3 @@
hDisableJoypadPolling EQU $FFF9
hJoyInput EQU $FFF8
-
--- a/macros/farcall.asm
+++ b/macros/farcall.asm
@@ -25,13 +25,13 @@
ENDM
homecall: MACRO
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
push af
ld a, BANK(\1)
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
call \1
pop af
- ld [H_LOADEDROMBANK], a
+ ld [hLoadedROMBank], a
ld [MBC1RomBank], a
ENDM
--- a/scripts/BillsHouse.asm
+++ b/scripts/BillsHouse.asm
@@ -23,7 +23,7 @@
ld de, MovementData_1e7a0
.notDown
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call MoveSprite
ld a, $2
ld [wBillsHouseCurScript], a
@@ -80,7 +80,7 @@
ld c, 8
call DelayFrames
ld a, $2
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld de, MovementData_1e807
call MoveSprite
ld a, $4
--- a/scripts/CeladonGym.asm
+++ b/scripts/CeladonGym.asm
@@ -170,7 +170,7 @@
ld hl, CeladonGymText_48a63
ld de, CeladonGymText_48a63
call SaveEndBattleTextPointers
- ld a, [H_SPRITEINDEX]
+ ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
--- a/scripts/CeruleanCity.asm
+++ b/scripts/CeruleanCity.asm
@@ -79,9 +79,9 @@
cp $14
jr z, .asm_19535
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, $5
- ld [H_SPRITEDATAOFFSET], a
+ ld [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData2
ld [hl], $19
.asm_19535
@@ -90,7 +90,7 @@
predef ShowObject
ld de, CeruleanCityMovement1
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call MoveSprite
ld a, $1
ld [wCeruleanCityCurScript], a
@@ -114,7 +114,7 @@
CeruleanCityScript_1955d:
ld a, 1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
ld [hSpriteFacingDirection], a
jp SetSpriteFacingDirectionAndDelay ; face object
@@ -176,7 +176,7 @@
call PlaySound
callba Music_RivalAlternateStart
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld a, [wXCoord]
cp $14
@@ -187,7 +187,7 @@
ld de, CeruleanCityMovement3
.asm_195f3
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call MoveSprite
ld a, $3
ld [wCeruleanCityCurScript], a
--- a/scripts/CeruleanGym.asm
+++ b/scripts/CeruleanGym.asm
@@ -121,7 +121,7 @@
ld hl, CeruleanGymText_5c7d8
ld de, CeruleanGymText_5c7d8
call SaveEndBattleTextPointers
- ld a, [H_SPRITEINDEX]
+ ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
--- a/scripts/ChampionsRoom.asm
+++ b/scripts/ChampionsRoom.asm
@@ -101,7 +101,7 @@
ld [hSpriteIndexOrTextID], a
call GaryScript_760c8
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld a, $4
ld [wChampionsRoomCurScript], a
@@ -113,11 +113,11 @@
ld [hSpriteIndexOrTextID], a
call GaryScript_760c8
ld a, $2
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld de, OakEntranceAfterVictoryMovement
ld a, $2
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call MoveSprite
ld a, HS_CHAMPIONS_ROOM_OAK
ld [wMissableObjectIndex], a
@@ -141,12 +141,12 @@
ld a, PLAYER_DIR_LEFT
ld [wPlayerMovingDirection], a
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, SPRITE_FACING_LEFT
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $2
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -159,7 +159,7 @@
GaryScript6:
ld a, $2
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, SPRITE_FACING_RIGHT
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -172,7 +172,7 @@
GaryScript7:
ld a, $2
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -181,7 +181,7 @@
call GaryScript_760c8
ld de, OakExitGaryRoomMovement
ld a, $2
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call MoveSprite
ld a, $8
ld [wChampionsRoomCurScript], a
--- a/scripts/CinnabarGym.asm
+++ b/scripts/CinnabarGym.asm
@@ -50,7 +50,7 @@
ld a, [wOpponentAfterWrongAnswer]
and a
ret z
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
cp $4
jr nz, .asm_757c3
ld a, PLAYER_DIR_DOWN
--- a/scripts/FightingDojo.asm
+++ b/scripts/FightingDojo.asm
@@ -43,7 +43,7 @@
ld a, PLAYER_DIR_RIGHT
ld [wPlayerMovingDirection], a
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, SPRITE_FACING_LEFT
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -62,7 +62,7 @@
ld a, PLAYER_DIR_RIGHT
ld [wPlayerMovingDirection], a
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, SPRITE_FACING_LEFT
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
--- a/scripts/FuchsiaGym.asm
+++ b/scripts/FuchsiaGym.asm
@@ -161,7 +161,7 @@
ld hl, KogaAfterBattleText
ld de, KogaAfterBattleText
call SaveEndBattleTextPointers
- ld a, [H_SPRITEINDEX]
+ ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
--- a/scripts/GameCorner.asm
+++ b/scripts/GameCorner.asm
@@ -60,7 +60,7 @@
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $b
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld de, MovementData_48c5a
ld a, [wYCoord]
@@ -75,7 +75,7 @@
ld de, MovementData_48c63
.asm_48c4d
ld a, $b
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call MoveSprite
ld a, $2
ld [wGameCornerCurScript], a
@@ -418,7 +418,7 @@
ld hl, CeladonGameCornerText_48ed3
ld de, CeladonGameCornerText_48ed3
call SaveEndBattleTextPointers
- ld a, [H_SPRITEINDEX]
+ ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
--- a/scripts/HallOfFame.asm
+++ b/scripts/HallOfFame.asm
@@ -79,7 +79,7 @@
ld a, PLAYER_DIR_RIGHT
ld [wPlayerMovingDirection], a
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld a, SPRITE_FACING_LEFT
ld [hSpriteFacingDirection], a
--- a/scripts/MtMoonB2F.asm
+++ b/scripts/MtMoonB2F.asm
@@ -88,7 +88,7 @@
MtMoon3Script4:
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld hl, CoordsData_49dea
call ArePlayerCoordsInArray
@@ -102,7 +102,7 @@
ld de, MovementData_49df8
.asm_49dda
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call MoveSprite
ld a, $5
ld [wMtMoonB2FCurScript], a
@@ -222,7 +222,7 @@
ld hl, MtMoon3Text_49f8a
ld de, MtMoon3Text_49f8a
call SaveEndBattleTextPointers
- ld a, [H_SPRITEINDEX]
+ ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
--- a/scripts/OaksLab.asm
+++ b/scripts/OaksLab.asm
@@ -48,7 +48,7 @@
OaksLabScript1:
ld a, $8
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld de, OakEntryMovement
call MoveSprite
@@ -86,12 +86,12 @@
ld [wSimulatedJoypadStatesIndex], a
call StartSimulatingJoypadStates
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
xor a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $5
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
xor a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -111,7 +111,7 @@
SetEvent EVENT_FOLLOWED_OAK_INTO_LAB
SetEvent EVENT_FOLLOWED_OAK_INTO_LAB_2
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, SPRITE_FACING_UP
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -155,12 +155,12 @@
cp $6
ret nz
ld a, $5
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
xor a
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -254,9 +254,9 @@
jr nz, .moveBlue
push hl
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, $4
- ld [H_SPRITEDATAOFFSET], a
+ ld [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1
push hl
ld [hl], $4c
@@ -281,7 +281,7 @@
.moveBlue
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call MoveSprite
ld a, $9
@@ -295,7 +295,7 @@
ld a, $fc
ld [wJoyIgnore], a
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, SPRITE_FACING_UP
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -324,7 +324,7 @@
ld [wd11e], a
call GetMonName
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, SPRITE_FACING_UP
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -344,7 +344,7 @@
cp $6
ret nz
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -368,7 +368,7 @@
predef FindPathToPlayer
ld de, wNPCMovementDirections2
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call MoveSprite
ld a, $b
@@ -424,7 +424,7 @@
ld [wSpriteIndex], a
call SetSpritePosition1
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -443,7 +443,7 @@
call DisplayTextID
callba Music_RivalAlternateStart
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld de, .RivalExitMovement
call MoveSprite
ld a, [wXCoord]
@@ -530,7 +530,7 @@
call FillMemory
ld [hl], $ff
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld de, wNPCMovementDirections2
call MoveSprite
@@ -540,12 +540,12 @@
OaksLabScript_1cefd:
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, SPRITE_FACING_UP
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
ld a, $8
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
xor a ; SPRITE_FACING_DOWN
ld [hSpriteFacingDirection], a
jp SetSpriteFacingDirectionAndDelay
@@ -588,7 +588,7 @@
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, SPRITE_FACING_RIGHT
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -616,7 +616,7 @@
call PlaySound
callba Music_RivalAlternateStart
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld de, wNPCMovementDirections2
call MoveSprite
@@ -840,15 +840,15 @@
OaksLabScript_1d157:
ld a, $5
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, $9
- ld [H_SPRITEDATAOFFSET], a
+ ld [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1
ld [hl], SPRITE_FACING_DOWN
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, $9
- ld [H_SPRITEDATAOFFSET], a
+ ld [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1
ld [hl], SPRITE_FACING_RIGHT
ld hl, wd730
@@ -947,9 +947,9 @@
OaksLabScript_1d22d:
ld a, $5
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, $9
- ld [H_SPRITEDATAOFFSET], a
+ ld [hSpriteDataOffset], a
call GetPointerWithinSpriteStateData1
ld [hl], $0
ld hl, OaksLabLastMonText
--- a/scripts/PalletTown.asm
+++ b/scripts/PalletTown.asm
@@ -61,7 +61,7 @@
PalletTownScript2:
ld a, 1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, SPRITE_FACING_UP
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -79,7 +79,7 @@
predef FindPathToPlayer ; load Oak’s movement into wNPCMovementDirections2
ld de, wNPCMovementDirections2
ld a, 1 ; oak
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call MoveSprite
ld a, $FF
ld [wJoyIgnore], a
@@ -111,7 +111,7 @@
ld [wNPCMovementScriptFunctionNum], a
ld a, 1
ld [wNPCMovementScriptPointerTableNum], a
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
ld [wNPCMovementScriptBank], a
; trigger the next script
--- a/scripts/PewterCity.asm
+++ b/scripts/PewterCity.asm
@@ -44,7 +44,7 @@
and a
ret nz
ld a, $3
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, SPRITE_FACING_UP
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -69,7 +69,7 @@
ld [wSpriteIndex], a
call SetSpritePosition1
ld a, $3
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld de, MovementData_PewterMuseumGuyExit
call MoveSprite
ld a, $2
@@ -112,7 +112,7 @@
and a
ret nz
ld a, $5
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, SPRITE_FACING_LEFT
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -137,7 +137,7 @@
ld [wSpriteIndex], a
call SetSpritePosition1
ld a, $5
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld de, MovementData_PewterGymGuyExit
call MoveSprite
ld a, $5
@@ -220,7 +220,7 @@
ld [wNPCMovementScriptFunctionNum], a
ld a, $2
ld [wNPCMovementScriptPointerTableNum], a
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
ld [wNPCMovementScriptBank], a
ld a, $3
ld [wSpriteIndex], a
@@ -284,7 +284,7 @@
ld [wNPCMovementScriptFunctionNum], a
ld a, $3
ld [wNPCMovementScriptPointerTableNum], a
- ld a, [H_LOADEDROMBANK]
+ ld a, [hLoadedROMBank]
ld [wNPCMovementScriptBank], a
ld a, $5
ld [wSpriteIndex], a
--- a/scripts/PewterGym.asm
+++ b/scripts/PewterGym.asm
@@ -120,7 +120,7 @@
ld hl, PewterGymText_5c4bc
ld de, PewterGymText_5c4bc
call SaveEndBattleTextPointers
- ld a, [H_SPRITEINDEX]
+ ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
--- a/scripts/PokemonTower2F.asm
+++ b/scripts/PokemonTower2F.asm
@@ -41,7 +41,7 @@
.asm_60544
ld [wPlayerMovingDirection], a
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, b
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -74,7 +74,7 @@
ld de, MovementData_605a9
.asm_60589
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call MoveSprite
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
--- a/scripts/PokemonTower7F.asm
+++ b/scripts/PokemonTower7F.asm
@@ -107,7 +107,7 @@
ld d, [hl]
ld e, a
ld a, [wSpriteIndex]
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
jp MoveSprite
.asm_60dde
inc hl
--- a/scripts/RocketHideoutB4F.asm
+++ b/scripts/RocketHideoutB4F.asm
@@ -125,7 +125,7 @@
ld hl, RocketHideout4Text_4557f
ld de, RocketHideout4Text_4557f
call SaveEndBattleTextPointers
- ld a, [H_SPRITEINDEX]
+ ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
--- a/scripts/Route22.asm
+++ b/scripts/Route22.asm
@@ -96,7 +96,7 @@
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call Route22MoveRivalSprite
ld a, $1
ld [wRoute22CurScript], a
@@ -118,7 +118,7 @@
.asm_50f7a
ld [hSpriteFacingDirection], a
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call SetSpriteFacingDirectionAndDelay
xor a
ld [wJoyIgnore], a
@@ -159,7 +159,7 @@
.done
ld [hSpriteFacingDirection], a
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call SetSpriteFacingDirectionAndDelay
ld a, $f0
ld [wJoyIgnore], a
@@ -191,7 +191,7 @@
ld de, Route22RivalExitMovementData2
Route22MoveRival1:
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
jp MoveSprite
Route22RivalExitMovementData1:
@@ -250,7 +250,7 @@
call PlaySound
callba Music_RivalAlternateTempo
ld a, $2
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call Route22MoveRivalSprite
ld a, $4
ld [wRoute22CurScript], a
@@ -261,7 +261,7 @@
bit 0, a
ret nz
ld a, $2
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, [wcf0d]
cp $1
jr nz, .asm_510a1
@@ -305,7 +305,7 @@
cp $ff
jp z, Route22Script_50ece
ld a, $2
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, [wcf0d]
cp $1
jr nz, .asm_510fb
@@ -350,7 +350,7 @@
ld de, MovementData_5114d
Route22MoveRival2:
ld a, $2
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
jp MoveSprite
MovementData_5114c:
--- a/scripts/SSAnne2F.asm
+++ b/scripts/SSAnne2F.asm
@@ -37,7 +37,7 @@
predef ShowObject
call Delay3
ld a, $2
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
xor a
ld [hJoyHeld], a
@@ -83,7 +83,7 @@
.asm_61427
ld [hSpriteFacingDirection], a
ld a, $2
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
jp SetSpriteFacingDirectionAndDelay
SSAnne2Script1:
@@ -132,7 +132,7 @@
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $2
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld a, [wXCoord]
cp $25
@@ -143,7 +143,7 @@
ld de, MovementData_614b7
.asm_6149a
ld a, $2
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call MoveSprite
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
--- a/scripts/SaffronGym.asm
+++ b/scripts/SaffronGym.asm
@@ -171,7 +171,7 @@
ld hl, SaffronGymText_5d167
ld de, SaffronGymText_5d167
call SaveEndBattleTextPointers
- ld a, [H_SPRITEINDEX]
+ ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
--- a/scripts/SilphCo11F.asm
+++ b/scripts/SilphCo11F.asm
@@ -178,7 +178,7 @@
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $3
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld de, MovementData_62216
call MoveSprite
@@ -199,7 +199,7 @@
SilphCo11Script_6221a:
ld [wPlayerMovingDirection], a
ld a, $3
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, b
ld [hSpriteFacingDirection], a
jp SetSpriteFacingDirectionAndDelay
@@ -239,7 +239,7 @@
bit 0, a
ret nz
ld a, $3
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld a, [wcf0d]
cp $1
@@ -263,7 +263,7 @@
ld hl, SilphCo10Text_62330
ld de, SilphCo10Text_62330
call SaveEndBattleTextPointers
- ld a, [H_SPRITEINDEX]
+ ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
--- a/scripts/SilphCo7F.asm
+++ b/scripts/SilphCo7F.asm
@@ -140,7 +140,7 @@
ld [hSpriteIndexOrTextID], a
call DisplayTextID
ld a, $9
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld de, MovementData_51c7d
ld a, [wCoordIndex]
@@ -150,7 +150,7 @@
inc de
.asm_51c6c
ld a, $9
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call MoveSprite
ld a, $3
jp SilphCo7Text_51c10
@@ -212,7 +212,7 @@
ld a, PLAYER_DIR_DOWN
ld [wPlayerMovingDirection], a
ld a, $9
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
ld a, SPRITE_FACING_UP
ld [hSpriteFacingDirection], a
call SetSpriteFacingDirectionAndDelay
@@ -230,7 +230,7 @@
ld de, MovementData_51d1a
.asm_51d0e
ld a, $9
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call MoveSprite
ld a, $5
jp SilphCo7Text_51c10
--- a/scripts/TradeCenter.asm
+++ b/scripts/TradeCenter.asm
@@ -8,7 +8,7 @@
.next
ld [hSpriteFacingDirection], a
ld a, $1
- ld [H_SPRITEINDEX], a
+ ld [hSpriteIndex], a
call SetSpriteFacingDirection
ld hl, wd72d
bit 0, [hl]
--- a/scripts/VermilionDock.asm
+++ b/scripts/VermilionDock.asm
@@ -57,10 +57,10 @@
ld a, $14 ; water tile
call FillMemory
ld a, 1
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
call Delay3
xor a
- ld [H_AUTOBGTRANSFERENABLED], a
+ ld [hAutoBGTransferEnabled], a
ld [wSSAnneSmokeDriftAmount], a
ld [rOBP1], a
ld a, 88
--- a/scripts/VermilionGym.asm
+++ b/scripts/VermilionGym.asm
@@ -150,7 +150,7 @@
ld hl, ReceivedThunderbadgeText
ld de, ReceivedThunderbadgeText
call SaveEndBattleTextPointers
- ld a, [H_SPRITEINDEX]
+ ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
--- a/scripts/ViridianGym.asm
+++ b/scripts/ViridianGym.asm
@@ -289,7 +289,7 @@
ld hl, ViridianGymText_74ad3
ld de, ViridianGymText_74ad3
call SaveEndBattleTextPointers
- ld a, [H_SPRITEINDEX]
+ ld a, [hSpriteIndex]
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
--- a/scripts/WardensHouse.asm
+++ b/scripts/WardensHouse.asm
@@ -95,7 +95,7 @@
FuchsiaHouse2Text5:
FuchsiaHouse2Text4:
TX_ASM
- ld a, [H_SPRITEINDEX]
+ ld a, [hSpriteIndex]
cp $4
ld hl, FuchsiaHouse2Text_7517b
jr nz, .asm_4c9a2