Prefix wram labels with w, part 2.

This commit is contained in:
luckytyphlosion
2018-01-23 17:39:09 -05:00
parent 79bd48f85c
commit a1951cefc0
323 changed files with 8581 additions and 8581 deletions

View File

@@ -9,28 +9,28 @@
Special_HealMachineAnim: ; 12324
; If you have no Pokemon, don't change the buffer. This can lead to some glitchy effects if you have no Pokemon.
ld a, [PartyCount]
ld a, [wPartyCount]
and a
ret z
; The location of the healing machine relative to the player is stored in ScriptVar.
; The location of the healing machine relative to the player is stored in wScriptVar.
; 0: Up and left (Pokemon Center)
; 1: Left (Elm's Lab)
; 2: Up (Hall of Fame)
ld a, [ScriptVar]
ld [Buffer1], a
ld a, [wScriptVar]
ld [wBuffer1], a
ld a, [rOBP1]
ld [Buffer2], a
ld [wBuffer2], a
call .DoJumptableFunctions
ld a, [Buffer2]
ld a, [wBuffer2]
call DmgToCgbObjPal1
ret
; 1233e
.DoJumptableFunctions: ; 1233e
xor a
ld [Buffer3], a
ld [wBuffer3], a
.jumpable_loop
ld a, [Buffer1]
ld a, [wBuffer1]
ld e, a
ld d, 0
ld hl, .Pointers
@@ -39,10 +39,10 @@ Special_HealMachineAnim: ; 12324
ld a, [hli]
ld h, [hl]
ld l, a
ld a, [Buffer3]
ld a, [wBuffer3]
ld e, a
inc a
ld [Buffer3], a
ld [wBuffer3], a
add hl, de
ld a, [hl]
cp HEALMACHINESTATE_FINISH
@@ -97,18 +97,18 @@ ENDM
; 12393
.PC_LoadBallsOntoMachine: ; 12393
ld hl, Sprite33
ld hl, wSprite33
ld de, .PC_ElmsLab_OAM
call .PlaceHealingMachineTile
call .PlaceHealingMachineTile
jr .LoadBallsOntoMachine
.HOF_LoadBallsOntoMachine: ; 123a1
ld hl, Sprite33
ld hl, wSprite33
ld de, .HOF_OAM
.LoadBallsOntoMachine: ; 123a7
ld a, [PartyCount]
ld a, [wPartyCount]
ld b, a
.party_loop
call .PlaceHealingMachineTile
@@ -254,7 +254,7 @@ INCLUDE "gfx/overworld/heal_machine.pal"
.PlaceHealingMachineTile: ; 124a3
push bc
ld a, [Buffer1]
ld a, [wBuffer1]
bcpixel 2, 4
cp HEALMACHINE_ELMS_LAB
jr z, .okay