ref: 40c17c906b2b3f65b3b04b1933b90238a7ac5566
parent: 52ba96f5f4ec53450a0ff6257ea1040d09b7e537
author: yenatch <yenatch@gmail.com>
date: Mon May 26 10:04:56 EDT 2014
Remove most static wram addresses. Use labels instead. For unknown addresses, use "w<address>". Label overleads are still an issue.
--- a/audio.asm
+++ b/audio.asm
@@ -365,9 +365,9 @@
PlayBattleMusic:: ; 0x90c6
xor a
ld [wMusicHeaderPointer], a
- ld [$d083], a
+ ld [wd083], a
dec a
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound ; stop music
call DelayFrame
ld c, BANK(Music_GymLeaderBattle)
@@ -406,7 +406,7 @@
ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
- ld hl, $c006
+ ld hl, wc006
ld de, Music_MeetRival_branch_b1a2
call Music2_OverwriteChannelPointer
ld de, Music_MeetRival_branch_b21d
@@ -425,7 +425,7 @@
ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
- ld hl, $c006
+ ld hl, wc006
ld de, Music_MeetRival_branch_b119
jp Music2_OverwriteChannelPointer
@@ -432,7 +432,7 @@
; applies both the alternate start and alternate tempo
Music_RivalAlternateStartAndTempo:: ; 0x9b75
call Music_RivalAlternateStart
- ld hl, $c006
+ ld hl, wc006
ld de, Music_MeetRival_branch_b19b
jp Music2_OverwriteChannelPointer
@@ -439,8 +439,8 @@
; an alternate tempo for Cities1 which is used for the Hall of Fame room
Music_Cities1AlternateTempo:: ; 0x9b81
ld a, $a
- ld [$cfc8], a
- ld [$cfc9], a
+ ld [wcfc8], a
+ ld [wcfc9], a
ld a, $ff
ld [wMusicHeaderPointer], a
ld c, $64
@@ -448,7 +448,7 @@
ld c, BANK(Music_Cities1)
ld a, MUSIC_CITIES1
call PlayMusic
- ld hl, $c006
+ ld hl, wc006
ld de, Music_Cities1_branch_aa6f
jp Music2_OverwriteChannelPointer
@@ -456,7 +456,7 @@
SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2]
Func_2136e:: ; 2136e (8:536e)
- ld a, [$d083]
+ ld a, [wd083]
cp $ff
jr z, .asm_2139b
bit 7, a
@@ -472,18 +472,18 @@
call Func_213ac
.asm_2138a
ld a, $86
- ld [$c02a], a
- ld a, [$d083]
+ ld [wc02a], a
+ ld a, [wd083]
and $7f
dec a
.asm_21395
set 7, a
- ld [$d083], a
+ ld [wd083], a
ret
.asm_2139b
xor a
- ld [$d083], a
- ld [$c02a], a
+ ld [wd083], a
+ ld [wc02a], a
ld de, Unknown_213c4 ; $53c4
jr asm_213af
@@ -523,7 +523,7 @@
Music_PokeFluteInBattle:: ; 22306 (8:6306)
ld a, (SFX_08_46 - SFX_Headers_08) / 3 ; PokeFlute outside of battle
call PlaySoundWaitForCurrent
- ld hl, $c00e
+ ld hl, wc00e
ld de, SFX_08_PokeFlute_Ch1
call Music8_OverwriteChannelPointer
ld de, SFX_08_PokeFlute_Ch2
@@ -553,7 +553,7 @@
.gotSfxPointer
push bc
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySoundWaitForCurrent
pop bc
ld b, $0
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -4,7 +4,7 @@
ld c, CH0
.loop
ld b, $0
- ld hl, $c026
+ ld hl, wc026
add hl, bc
ld a, [hl]
and a
@@ -12,13 +12,13 @@
ld a, c
cp CH4
jr nc, .asm_912e ; if sfx channel
- ld a, [$c002]
+ ld a, [wc002]
and a
jr z, .asm_912e
bit 7, a
jr nz, .nextChannel
set 7, a
- ld [$c002], a
+ ld [wc002], a
xor a
ld [$ff25], a
ld [$ff1a], a
@@ -36,7 +36,7 @@
; this routine checks flags for music effects currently applied
; to the channel and calls certain functions based on flags.
-; known flags for $c02e:
+; known flags for wc02e:
; 1: call has been used
; 3: a toggle used only by this routine for vibrato
; 4: pitchbend flag
@@ -43,7 +43,7 @@
; 6: dutycycle flag
Music2_ApplyMusicAffects: ; 0x9138
ld b, $0
- ld hl, $c0b6 ; delay unitl next note
+ ld hl, wc0b6 ; delay unitl next note
add hl, bc
ld a, [hl]
cp $1 ; if the delay is 1, play next note
@@ -53,7 +53,7 @@
ld a, c
cp CH4
jr nc, .startChecks ; if a sfx channel
- ld hl, $c02a
+ ld hl, wc02a
add hl, bc
ld a, [hl]
and a
@@ -60,7 +60,7 @@
jr z, .startChecks
ret
.startChecks
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 6, [hl] ; dutycycle
jr z, .checkForExecuteMusic
@@ -67,22 +67,22 @@
call Music2_ApplyDutyCycle
.checkForExecuteMusic
ld b, $0
- ld hl, $c036
+ ld hl, wc036
add hl, bc
bit 0, [hl]
jr nz, .checkForPitchBend
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 2, [hl]
jr nz, .disablePitchBendVibrato
.checkForPitchBend
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 4, [hl] ; pitchbend
jr z, .checkVibratoDelay
jp Music2_ApplyPitchBend
.checkVibratoDelay
- ld hl, $c04e ; vibrato delay
+ ld hl, wc04e ; vibrato delay
add hl, bc
ld a, [hl]
and a ; check if delay is over
@@ -91,7 +91,7 @@
.disablePitchBendVibrato
ret
.checkForVibrato
- ld hl, $c056 ; vibrato rate
+ ld hl, wc056 ; vibrato rate
add hl, bc
ld a, [hl]
and a
@@ -99,7 +99,7 @@
ret ; no vibrato
.vibrato
ld d, a
- ld hl, $c05e
+ ld hl, wc05e
add hl, bc
ld a, [hl]
and $f
@@ -112,10 +112,10 @@
swap [hl]
or [hl]
ld [hl], a ; reset the vibrato value and start again
- ld hl, $c066
+ ld hl, wc066
add hl, bc
ld e, [hl] ; get note pitch
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 3, [hl] ; this is the only code that sets/resets bit three so
jr z, .unset ; it continuously alternates which path it takes
@@ -148,13 +148,13 @@
; like tempo changes, duty changes etc. and doesn't return
; until the first note is reached
Music2_PlayNextNote ; 0x91d0
- ld hl, $c06e
+ ld hl, wc06e
add hl, bc
ld a, [hl]
- ld hl, $c04e
+ ld hl, wc04e
add hl, bc
ld [hl], a
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
res 4, [hl]
res 5, [hl]
@@ -167,7 +167,7 @@
cp $ff ; is this command an endchannel?
jp nz, Music2_callchannel ; no
ld b, $0 ; yes
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 1, [hl]
jr nz, .returnFromCall
@@ -177,7 +177,7 @@
jr .asm_923f
.noiseOrSfxChannel
res 2, [hl]
- ld hl, $c036
+ ld hl, wc036
add hl, bc
res 0, [hl]
cp CH6
@@ -188,11 +188,11 @@
ld [$ff1a], a
.notSfxChannel3
jr nz, .asm_9222
- ld a, [$c003]
+ ld a, [wc003]
and a
jr z, .asm_9222
xor a
- ld [$c003], a
+ ld [wc003], a
jr .asm_923f
.asm_9222
jr .asm_9248
@@ -202,10 +202,10 @@
ld a, c
add a
ld e, a
- ld hl, $c006
+ ld hl, wc006
add hl, de
push hl ; store current channel address
- ld hl, $c016
+ ld hl, wc016
add hl, de
ld e, l
ld d, h
@@ -223,12 +223,12 @@
and [hl]
ld [$ff25], a
.asm_9248
- ld a, [$c02a]
+ ld a, [wc02a]
cp $14
jr nc, .asm_9251
jr .asm_926e
.asm_9251
- ld a, [$c02a]
+ ld a, [wc02a]
cp $86
jr z, .asm_926e
jr c, .asm_925c
@@ -240,12 +240,12 @@
call Func_96c7
ret c
.asm_9265
- ld a, [$c005]
+ ld a, [wc005]
ld [$ff24], a
xor a
- ld [$c005], a
+ ld [wc005], a
.asm_926e
- ld hl, $c026
+ ld hl, wc026
add hl, bc
ld [hl], b
ret
@@ -264,10 +264,10 @@
ld a, c
add a
ld e, a
- ld hl, $c006
+ ld hl, wc006
add hl, de
push hl
- ld hl, $c016
+ ld hl, wc016
add hl, de
ld e, l
ld d, h
@@ -282,7 +282,7 @@
inc hl
ld [hl], d ; overwrite current address with pointer
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
set 1, [hl] ; set the call flag
jp Music2_endchannel
@@ -295,7 +295,7 @@
and a
jr z, .infiniteLoop
ld b, $0
- ld hl, $c0be
+ ld hl, wc0be
add hl, bc
ld a, [hl]
cp e
@@ -318,7 +318,7 @@
ld a, c
add a
ld e, a
- ld hl, $c006
+ ld hl, wc006
add hl, de
pop af
ld [hli], a
@@ -332,7 +332,7 @@
ld a, d ; yes
and $f
ld b, $0
- ld hl, $c0c6
+ ld hl, wc0c6
add hl, bc
ld [hl], a ; store low nibble as speed
ld a, c
@@ -345,10 +345,10 @@
jr z, .musicChannel3
cp CH6
jr nz, .notChannel3
- ld hl, $c0e7
+ ld hl, wc0e7
jr .sfxChannel3
.musicChannel3
- ld hl, $c0e6
+ ld hl, wc0e6
.sfxChannel3
ld a, d
and $f
@@ -363,7 +363,7 @@
; else, store volume (high nibble) and fade (low nibble)
.notChannel3
ld b, $0
- ld hl, $c0de
+ ld hl, wc0de
add hl, bc
ld [hl], d
.noiseChannel
@@ -374,11 +374,11 @@
cp $e8 ; is this command an togglecall?
jr nz, Music2_vibrato ; no
ld b, $0 ; yes
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
ld a, [hl]
xor $1
- ld [hl], a ; flip bit 0 of $c02e (toggle returning from call)
+ ld [hl], a ; flip bit 0 of wc02e (toggle returning from call)
jp Music2_endchannel
Music2_vibrato: ; 0x9335
@@ -386,10 +386,10 @@
jr nz, Music2_pitchbend ; no
call Music2_GetNextMusicByte ; yes
ld b, $0
- ld hl, $c04e
+ ld hl, wc04e
add hl, bc
ld [hl], a ; store delay
- ld hl, $c06e
+ ld hl, wc06e
add hl, bc
ld [hl], a ; store delay
call Music2_GetNextMusicByte
@@ -397,7 +397,7 @@
and $f0
swap a
ld b, $0
- ld hl, $c056
+ ld hl, wc056
add hl, bc
srl a
ld e, a
@@ -408,7 +408,7 @@
ld a, d
and $f
ld d, a
- ld hl, $c05e
+ ld hl, wc05e
add hl, bc
swap a
or d
@@ -420,7 +420,7 @@
jr nz, Music2_duty ; no
call Music2_GetNextMusicByte ; yes
ld b, $0
- ld hl, $c076
+ ld hl, wc076
add hl, bc
ld [hl], a ; store first param
call Music2_GetNextMusicByte
@@ -432,14 +432,14 @@
and $f
call Func_9858
ld b, $0
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, bc
ld [hl], d ; store unknown part of second param
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, bc
ld [hl], e ; store unknown part of second param
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
set 4, [hl] ; set pitchbend flag
call Music2_GetNextMusicByte
@@ -454,7 +454,7 @@
rrca
and $c0
ld b, $0
- ld hl, $c03e
+ ld hl, wc03e
add hl, bc
ld [hl], a ; store duty
jp Music2_endchannel
@@ -466,25 +466,25 @@
cp CH4
jr nc, .sfxChannel
call Music2_GetNextMusicByte
- ld [$c0e8], a ; store first param
+ ld [wc0e8], a ; store first param
call Music2_GetNextMusicByte
- ld [$c0e9], a ; store second param
+ ld [wc0e9], a ; store second param
xor a
- ld [$c0ce], a ; clear RAM
- ld [$c0cf], a
- ld [$c0d0], a
- ld [$c0d1], a
+ ld [wc0ce], a ; clear RAM
+ ld [wc0cf], a
+ ld [wc0d0], a
+ ld [wc0d1], a
jr .musicChannelDone
.sfxChannel
call Music2_GetNextMusicByte
- ld [$c0ea], a ; store first param
+ ld [wc0ea], a ; store first param
call Music2_GetNextMusicByte
- ld [$c0eb], a ; store second param
+ ld [wc0eb], a ; store second param
xor a
- ld [$c0d2], a ; clear RAM
- ld [$c0d3], a
- ld [$c0d4], a
- ld [$c0d5], a
+ ld [wc0d2], a ; clear RAM
+ ld [wc0d3], a
+ ld [wc0d4], a
+ ld [wc0d5], a
.musicChannelDone
jp Music2_endchannel
@@ -492,7 +492,7 @@
cp $ee ; is this command an unknownmusic0xee?
jr nz, Music2_unknownmusic0xef ; no
call Music2_GetNextMusicByte ; yes
- ld [$c004], a ; store first param
+ ld [wc004], a ; store first param
jp Music2_endchannel
; this appears to never be used
@@ -503,13 +503,13 @@
push bc
call Func_9876
pop bc
- ld a, [$c003]
+ ld a, [wc003]
and a
jr nz, .skip
- ld a, [$c02d]
- ld [$c003], a
+ ld a, [wc02d]
+ ld [wc003], a
xor a
- ld [$c02d], a
+ ld [wc02d], a
.skip
jp Music2_endchannel
@@ -518,14 +518,14 @@
jr nz, Music2_stereopanning ; no
call Music2_GetNextMusicByte ; yes
ld b, $0
- ld hl, $c046
+ ld hl, wc046
add hl, bc
ld [hl], a ; store full cycle
and $c0
- ld hl, $c03e
+ ld hl, wc03e
add hl, bc
ld [hl], a ; store first duty
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
set 6, [hl] ; set dutycycle flag
jp Music2_endchannel
@@ -541,7 +541,7 @@
cp $f8 ; is this command an executemusic?
jr nz, Music2_octave ; no
ld b, $0 ; yes
- ld hl, $c036
+ ld hl, wc036
add hl, bc
set 0, [hl]
jp Music2_endchannel
@@ -550,7 +550,7 @@
and $f0
cp $e0 ; is this command an octave?
jr nz, Music2_unknownsfx0x20 ; no
- ld hl, $c0d6 ; yes
+ ld hl, wc0d6 ; yes
ld b, $0
add hl, bc
ld a, d
@@ -565,7 +565,7 @@
cp CH3 ; is this a noise or sfx channel?
jr c, Music2_unknownsfx0x10 ; no
ld b, $0
- ld hl, $c036
+ ld hl, wc036
add hl, bc
bit 0, [hl]
jr nz, Music2_unknownsfx0x10 ; no
@@ -572,7 +572,7 @@
call Music2_notelength ; yes
ld d, a
ld b, $0
- ld hl, $c03e
+ ld hl, wc03e
add hl, bc
ld a, [hl]
or d
@@ -611,7 +611,7 @@
cp $10 ; is this command a unknownsfx0x10?
jr nz, Music2_note ; no
ld b, $0
- ld hl, $c036
+ ld hl, wc036
add hl, bc
bit 0, [hl]
jr nz, Music2_note ; no
@@ -646,7 +646,7 @@
call Music2_GetNextMusicByte ; get dnote instrument
asm_94fd
ld d, a
- ld a, [$c003]
+ ld a, [wc003]
and a
jr nz, .asm_9508
ld a, d
@@ -663,7 +663,7 @@
ld b, $0
ld e, a ; store note length (in 16ths)
ld d, b
- ld hl, $c0c6
+ ld hl, wc0c6
add hl, bc
ld a, [hl]
ld l, b
@@ -671,9 +671,9 @@
ld a, c
cp CH4
jr nc, .sfxChannel
- ld a, [$c0e8]
+ ld a, [wc0e8]
ld d, a
- ld a, [$c0e9]
+ ld a, [wc0e9]
ld e, a
jr .skip
.sfxChannel
@@ -682,31 +682,31 @@
cp CH7
jr z, .skip ; if noise channel
call Func_9693
- ld a, [$c0ea]
+ ld a, [wc0ea]
ld d, a
- ld a, [$c0eb]
+ ld a, [wc0eb]
ld e, a
.skip
ld a, l
ld b, $0
- ld hl, $c0ce
+ ld hl, wc0ce
add hl, bc
ld l, [hl]
call Func_9847
ld e, l
ld d, h
- ld hl, $c0ce
+ ld hl, wc0ce
add hl, bc
ld [hl], e
ld a, d
- ld hl, $c0b6
+ ld hl, wc0b6
add hl, bc
ld [hl], a
- ld hl, $c036
+ ld hl, wc036
add hl, bc
bit 0, [hl]
jr nz, Music2_notepitch
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 2, [hl]
jr z, Music2_notepitch
@@ -721,7 +721,7 @@
ld a, c
cp CH4
jr nc, .sfxChannel
- ld hl, $c02a
+ ld hl, wc02a
add hl, bc
ld a, [hl]
and a
@@ -754,12 +754,12 @@
.notRest
swap a
ld b, $0
- ld hl, $c0d6
+ ld hl, wc0d6
add hl, bc
ld b, [hl]
call Func_9858
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 4, [hl]
jr z, .asm_95b8
@@ -769,7 +769,7 @@
ld a, c
cp CH4
jr nc, .skip ; if sfx channel
- ld hl, $c02a
+ ld hl, wc02a
ld d, $0
ld e, a
add hl, de
@@ -782,7 +782,7 @@
ret
.skip
ld b, $0
- ld hl, $c0de
+ ld hl, wc0de
add hl, bc
ld d, [hl]
ld b, $2
@@ -792,7 +792,7 @@
call Func_95f8
pop de
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 0, [hl]
jr z, .asm_95ef
@@ -800,7 +800,7 @@
jr nc, .asm_95ef
inc d
.asm_95ef
- ld hl, $c066
+ ld hl, wc066
add hl, bc
ld [hl], e
call Func_964b
@@ -818,13 +818,13 @@
jr z, .sfxNoiseChannel
cp CH4
jr nc, .skip ; if sfx channel
- ld hl, $c02a
+ ld hl, wc02a
add hl, bc
ld a, [hl]
and a
jr nz, .skip
.sfxNoiseChannel
- ld a, [$c004]
+ ld a, [wc004]
ld hl, Unknown_9b27
add hl, bc
and [hl]
@@ -842,7 +842,7 @@
Func_9629: ; 0x9629
ld b, $0
- ld hl, $c0b6
+ ld hl, wc0b6
add hl, bc
ld d, [hl]
ld a, c
@@ -853,7 +853,7 @@
ld a, d
and $3f
ld d, a
- ld hl, $c03e
+ ld hl, wc03e
add hl, bc
ld a, [hl]
or d
@@ -873,10 +873,10 @@
; fall through
.channel3
push de
- ld de, $c0e6
+ ld de, wc0e6
cp CH2
jr z, .musicChannel3
- ld de, $c0e7
+ ld de, wc0e7
.musicChannel3
ld a, [de]
add a
@@ -919,20 +919,20 @@
call Func_96e5
jr nc, .asm_96ab
ld d, $0
- ld a, [$c0f2]
+ ld a, [wc0f2]
add $80
jr nc, .asm_96a2
inc d
.asm_96a2
- ld [$c0eb], a
+ ld [wc0eb], a
ld a, d
- ld [$c0ea], a
+ ld [wc0ea], a
jr .asm_96b4
.asm_96ab
xor a
- ld [$c0eb], a
+ ld [wc0eb], a
ld a, $1
- ld [$c0ea], a
+ ld [wc0ea], a
.asm_96b4
ret
@@ -939,7 +939,7 @@
Func_96b5: ; 0x96b5
call Func_96e5
jr nc, .asm_96c6
- ld a, [$c0f1]
+ ld a, [wc0f1]
add e
jr nc, .asm_96c1
inc d
@@ -955,7 +955,7 @@
Func_96c7: ; 0x96c7
call Func_96e5
jr nc, .asm_96e2
- ld hl, $c006
+ ld hl, wc006
ld e, c
ld d, $0
sla e
@@ -976,7 +976,7 @@
ret
Func_96e5: ; 0x96e5
- ld a, [$c02a]
+ ld a, [wc02a]
cp $14
jr nc, .asm_96ee
jr .asm_96f4
@@ -993,17 +993,17 @@
ret
Music2_ApplyPitchBend: ; 0x96f9
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 5, [hl]
jp nz, .asm_9740
- ld hl, $c09e
+ ld hl, wc09e
add hl, bc
ld e, [hl]
- ld hl, $c096
+ ld hl, wc096
add hl, bc
ld d, [hl]
- ld hl, $c07e
+ ld hl, wc07e
add hl, bc
ld l, [hl]
ld h, b
@@ -1010,10 +1010,10 @@
add hl, de
ld d, h
ld e, l
- ld hl, $c08e
+ ld hl, wc08e
add hl, bc
push hl
- ld hl, $c086
+ ld hl, wc086
add hl, bc
ld a, [hl]
pop hl
@@ -1025,13 +1025,13 @@
ld a, $0
adc d
ld d, a
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, bc
ld a, [hl]
cp d
jp c, .asm_9786
jr nz, .asm_9773
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, bc
ld a, [hl]
cp e
@@ -1038,13 +1038,13 @@
jp c, .asm_9786
jr .asm_9773
.asm_9740
- ld hl, $c09e
+ ld hl, wc09e
add hl, bc
ld a, [hl]
- ld hl, $c096
+ ld hl, wc096
add hl, bc
ld d, [hl]
- ld hl, $c07e
+ ld hl, wc07e
add hl, bc
ld e, [hl]
sub e
@@ -1052,7 +1052,7 @@
ld a, d
sbc b
ld d, a
- ld hl, $c086
+ ld hl, wc086
add hl, bc
ld a, [hl]
add a
@@ -1063,22 +1063,22 @@
ld a, d
sbc b
ld d, a
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, bc
ld a, d
cp [hl]
jr c, .asm_9786
jr nz, .asm_9773
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, bc
ld a, e
cp [hl]
jr c, .asm_9786
.asm_9773
- ld hl, $c09e
+ ld hl, wc09e
add hl, bc
ld [hl], e
- ld hl, $c096
+ ld hl, wc096
add hl, bc
ld [hl], d
ld b, $3
@@ -1088,7 +1088,7 @@
ld [hl], d
ret
.asm_9786
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
res 4, [hl]
res 5, [hl]
@@ -1095,16 +1095,16 @@
ret
Func_978f: ; 0x978f
- ld hl, $c096
+ ld hl, wc096
add hl, bc
ld [hl], d
- ld hl, $c09e
+ ld hl, wc09e
add hl, bc
ld [hl], e
- ld hl, $c0b6
+ ld hl, wc0b6
add hl, bc
ld a, [hl]
- ld hl, $c076
+ ld hl, wc076
add hl, bc
sub [hl]
jr nc, .asm_97a7
@@ -1111,7 +1111,7 @@
ld a, $1
.asm_97a7
ld [hl], a
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, bc
ld a, e
sub [hl]
@@ -1118,24 +1118,24 @@
ld e, a
ld a, d
sbc b
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, bc
sub [hl]
jr c, .asm_97c3
ld d, a
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
set 5, [hl]
jr .asm_97e6
.asm_97c3
- ld hl, $c096
+ ld hl, wc096
add hl, bc
ld d, [hl]
- ld hl, $c09e
+ ld hl, wc09e
add hl, bc
ld e, [hl]
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, bc
ld a, [hl]
sub e
@@ -1143,17 +1143,17 @@
ld a, d
sbc b
ld d, a
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, bc
ld a, [hl]
sub d
ld d, a
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
res 5, [hl]
.asm_97e6
- ld hl, $c076
+ ld hl, wc076
add hl, bc
.asm_97ea
inc b
@@ -1172,13 +1172,13 @@
add [hl]
ld d, b
ld b, $0
- ld hl, $c07e
+ ld hl, wc07e
add hl, bc
ld [hl], d
- ld hl, $c086
+ ld hl, wc086
add hl, bc
ld [hl], a
- ld hl, $c08e
+ ld hl, wc08e
add hl, bc
ld [hl], a
ret
@@ -1185,7 +1185,7 @@
Music2_ApplyDutyCycle: ; 0x980d
ld b, $0
- ld hl, $c046
+ ld hl, wc046
add hl, bc
ld a, [hl]
rlca
@@ -1206,7 +1206,7 @@
ld a, c
add a
ld e, a
- ld hl, $c006
+ ld hl, wc006
add hl, de
ld a, [hli]
ld e, a
@@ -1274,7 +1274,7 @@
ret
Func_9876:: ; 0x9876
- ld [$c001], a
+ ld [wc001], a
cp $ff
jp z, Func_9a34
cp $b9
@@ -1285,63 +1285,63 @@
jp nc, Func_994e
.asm_988d
xor a
- ld [$c000], a
- ld [$c003], a
- ld [$c0e9], a
- ld [$c0e6], a
- ld [$c0e7], a
+ ld [wc000], a
+ ld [wc003], a
+ ld [wc0e9], a
+ ld [wc0e6], a
+ ld [wc0e7], a
ld d, $8
- ld hl, $c016
+ ld hl, wc016
call FillMusicRAM2
- ld hl, $c006
+ ld hl, wc006
call FillMusicRAM2
ld d, $4
- ld hl, $c026
+ ld hl, wc026
call FillMusicRAM2
- ld hl, $c02e
+ ld hl, wc02e
call FillMusicRAM2
- ld hl, $c03e
+ ld hl, wc03e
call FillMusicRAM2
- ld hl, $c046
+ ld hl, wc046
call FillMusicRAM2
- ld hl, $c04e
+ ld hl, wc04e
call FillMusicRAM2
- ld hl, $c056
+ ld hl, wc056
call FillMusicRAM2
- ld hl, $c05e
+ ld hl, wc05e
call FillMusicRAM2
- ld hl, $c066
+ ld hl, wc066
call FillMusicRAM2
- ld hl, $c06e
+ ld hl, wc06e
call FillMusicRAM2
- ld hl, $c036
+ ld hl, wc036
call FillMusicRAM2
- ld hl, $c076
+ ld hl, wc076
call FillMusicRAM2
- ld hl, $c07e
+ ld hl, wc07e
call FillMusicRAM2
- ld hl, $c086
+ ld hl, wc086
call FillMusicRAM2
- ld hl, $c08e
+ ld hl, wc08e
call FillMusicRAM2
- ld hl, $c096
+ ld hl, wc096
call FillMusicRAM2
- ld hl, $c09e
+ ld hl, wc09e
call FillMusicRAM2
- ld hl, $c0a6
+ ld hl, wc0a6
call FillMusicRAM2
- ld hl, $c0ae
+ ld hl, wc0ae
call FillMusicRAM2
ld a, $1
- ld hl, $c0be
+ ld hl, wc0be
call FillMusicRAM2
- ld hl, $c0b6
+ ld hl, wc0b6
call FillMusicRAM2
- ld hl, $c0c6
+ ld hl, wc0c6
call FillMusicRAM2
- ld [$c0e8], a
+ ld [wc0e8], a
ld a, $ff
- ld [$c004], a
+ ld [wc004], a
xor a
ld [$ff24], a
ld a, $8
@@ -1366,9 +1366,9 @@
ld de, SFX_Headers_02
add hl, de
ld a, h
- ld [$c0ec], a
+ ld [wc0ec], a
ld a, l
- ld [$c0ed], a
+ ld [wc0ed], a
ld a, [hl]
and $c0
rlca
@@ -1381,9 +1381,9 @@
add c
ld c, a
ld b, $0
- ld a, [$c0ec]
+ ld a, [wc0ec]
ld h, a
- ld a, [$c0ed]
+ ld a, [wc0ed]
ld l, a
add hl, bc
ld c, d
@@ -1391,7 +1391,7 @@
and $f
ld e, a
ld d, $0
- ld hl, $c026
+ ld hl, wc026
add hl, de
ld a, [hl]
and a
@@ -1399,7 +1399,7 @@
ld a, e
cp $7
jr nz, .asm_999a
- ld a, [$c001]
+ ld a, [wc001]
cp $14
jr nc, .asm_9993
ret
@@ -1409,7 +1409,7 @@
jr z, .asm_99a3
jr c, .asm_99a3
.asm_999a
- ld a, [$c001]
+ ld a, [wc001]
cp [hl]
jr z, .asm_99a3
jr c, .asm_99a3
@@ -1422,77 +1422,77 @@
add hl, hl
ld d, h
ld e, l
- ld hl, $c016
+ ld hl, wc016
add hl, de
ld [hli], a
ld [hl], a
- ld hl, $c006
+ ld hl, wc006
add hl, de
ld [hli], a
ld [hl], a
pop de
- ld hl, $c026
+ ld hl, wc026
add hl, de
ld [hl], a
- ld hl, $c02e
+ ld hl, wc02e
add hl, de
ld [hl], a
- ld hl, $c03e
+ ld hl, wc03e
add hl, de
ld [hl], a
- ld hl, $c046
+ ld hl, wc046
add hl, de
ld [hl], a
- ld hl, $c04e
+ ld hl, wc04e
add hl, de
ld [hl], a
- ld hl, $c056
+ ld hl, wc056
add hl, de
ld [hl], a
- ld hl, $c05e
+ ld hl, wc05e
add hl, de
ld [hl], a
- ld hl, $c066
+ ld hl, wc066
add hl, de
ld [hl], a
- ld hl, $c06e
+ ld hl, wc06e
add hl, de
ld [hl], a
- ld hl, $c076
+ ld hl, wc076
add hl, de
ld [hl], a
- ld hl, $c07e
+ ld hl, wc07e
add hl, de
ld [hl], a
- ld hl, $c086
+ ld hl, wc086
add hl, de
ld [hl], a
- ld hl, $c08e
+ ld hl, wc08e
add hl, de
ld [hl], a
- ld hl, $c096
+ ld hl, wc096
add hl, de
ld [hl], a
- ld hl, $c09e
+ ld hl, wc09e
add hl, de
ld [hl], a
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, de
ld [hl], a
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, de
ld [hl], a
- ld hl, $c036
+ ld hl, wc036
add hl, de
ld [hl], a
ld a, $1
- ld hl, $c0be
+ ld hl, wc0be
add hl, de
ld [hl], a
- ld hl, $c0b6
+ ld hl, wc0b6
add hl, de
ld [hl], a
- ld hl, $c0c6
+ ld hl, wc0c6
add hl, de
ld [hl], a
ld a, e
@@ -1526,24 +1526,24 @@
ld a, $77
ld [$ff24], a
xor a
- ld [$c000], a
- ld [$c003], a
- ld [$c002], a
- ld [$c0e9], a
- ld [$c0eb], a
- ld [$c0e6], a
- ld [$c0e7], a
+ ld [wc000], a
+ ld [wc003], a
+ ld [wc002], a
+ ld [wc0e9], a
+ ld [wc0eb], a
+ ld [wc0e6], a
+ ld [wc0e7], a
ld d, $a0
- ld hl, $c006
+ ld hl, wc006
call FillMusicRAM2
ld a, $1
ld d, $18
- ld hl, $c0b6
+ ld hl, wc0b6
call FillMusicRAM2
- ld [$c0e8], a
- ld [$c0ea], a
+ ld [wc0e8], a
+ ld [wc0ea], a
ld a, $ff
- ld [$c004], a
+ ld [wc004], a
ret
; fills d bytes at hl with a
@@ -1556,7 +1556,7 @@
ret
Func_9a8f: ; 0x9a8f
- ld a, [$c001]
+ ld a, [wc001]
ld l, a
ld e, a
ld h, $0
@@ -1567,7 +1567,7 @@
add hl, de
ld e, l
ld d, h
- ld hl, $c006
+ ld hl, wc006
ld a, [de] ; get channel number
ld b, a
rlca
@@ -1593,14 +1593,14 @@
push af
ld b, $0
ld c, a
- ld hl, $c026
+ ld hl, wc026
add hl, bc
- ld a, [$c001]
+ ld a, [wc001]
ld [hl], a
pop af
cp $3
jr c, .asm_9ad2
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
set 2, [hl]
.asm_9ad2
@@ -1619,32 +1619,32 @@
ld a, [de]
inc de
jr nz, .asm_9ab1
- ld a, [$c001]
+ ld a, [wc001]
cp $14
jr nc, .asm_9aeb
jr .asm_9b15
.asm_9aeb
- ld a, [$c001]
+ ld a, [wc001]
cp $86
jr z, .asm_9b15
jr c, .asm_9af6
jr .asm_9b15
.asm_9af6
- ld hl, $c02a
+ ld hl, wc02a
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
- ld hl, $c012 ; sfx noise channel pointer
+ ld hl, wc012 ; sfx noise channel pointer
ld de, Noise2_endchannel
ld [hl], e
inc hl
ld [hl], d ; overwrite pointer to point to endchannel
- ld a, [$c005]
+ ld a, [wc005]
and a
jr nz, .asm_9b15
ld a, [$ff24]
- ld [$c005], a
+ ld [wc005], a
ld a, $77
ld [$ff24], a
.asm_9b15
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -4,7 +4,7 @@
ld c, CH0
.loop
ld b, $0
- ld hl, $c026
+ ld hl, wc026
add hl, bc
ld a, [hl]
and a
@@ -12,13 +12,13 @@
ld a, c
cp CH4
jr nc, .applyAffects ; if sfx channel
- ld a, [$c002]
+ ld a, [wc002]
and a
jr z, .applyAffects
bit 7, a
jr nz, .nextChannel
set 7, a
- ld [$c002], a
+ ld [wc002], a
xor a
ld [$ff25], a
ld [$ff1a], a
@@ -36,7 +36,7 @@
; this routine checks flags for music effects currently applied
; to the channel and calls certain functions based on flags.
-; known flags for $c02e:
+; known flags for wc02e:
; 1: call has been used
; 3: a toggle used only by this routine for vibrato
; 4: pitchbend flag
@@ -43,7 +43,7 @@
; 6: dutycycle flag
Music8_ApplyMusicAffects: ; 218ae (8:58ae)
ld b, $0
- ld hl, $c0b6 ; delay unitl next note
+ ld hl, wc0b6 ; delay unitl next note
add hl, bc
ld a, [hl]
cp $1 ; if the delay is 1, play next note
@@ -53,7 +53,7 @@
ld a, c
cp CH4
jr nc, .startChecks ; if a sfx channel
- ld hl, $c02a
+ ld hl, wc02a
add hl, bc
ld a, [hl]
and a
@@ -60,7 +60,7 @@
jr z, .startChecks
ret
.startChecks
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 6, [hl] ; dutycycle
jr z, .checkForExecuteMusic
@@ -67,22 +67,22 @@
call Music8_ApplyDutyCycle
.checkForExecuteMusic
ld b, $0
- ld hl, $c036
+ ld hl, wc036
add hl, bc
bit 0, [hl]
jr nz, .checkForPitchBend
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 2, [hl]
jr nz, .disablePitchBendVibrato
.checkForPitchBend
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 4, [hl] ; pitchbend
jr z, .checkVibratoDelay
jp Music8_ApplyPitchBend
.checkVibratoDelay
- ld hl, $c04e ; vibrato delay
+ ld hl, wc04e ; vibrato delay
add hl, bc
ld a, [hl]
and a ; check if delay is over
@@ -91,7 +91,7 @@
.disablePitchBendVibrato
ret
.checkForVibrato
- ld hl, $c056 ; vibrato rate
+ ld hl, wc056 ; vibrato rate
add hl, bc
ld a, [hl]
and a
@@ -99,7 +99,7 @@
ret ; no vibrato
.vibrato
ld d, a
- ld hl, $c05e
+ ld hl, wc05e
add hl, bc
ld a, [hl]
and $f
@@ -112,10 +112,10 @@
swap [hl]
or [hl]
ld [hl], a ; reset the vibrato value and start again
- ld hl, $c066
+ ld hl, wc066
add hl, bc
ld e, [hl] ; get note pitch
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 3, [hl] ; this is the only code that sets/resets bit three so
jr z, .unset ; it continuously alternates which path it takes
@@ -148,13 +148,13 @@
; like tempo changes, duty changes etc. and doesn't return
; until the first note is reached
Music8_PlayNextNote: ; 21946 (8:5946)
- ld hl, $c06e
+ ld hl, wc06e
add hl, bc
ld a, [hl]
- ld hl, $c04e
+ ld hl, wc04e
add hl, bc
ld [hl], a
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
res 4, [hl]
res 5, [hl]
@@ -161,7 +161,7 @@
ld a, c
cp CH4
jr nz, .beginChecks
- ld a, [$d083]
+ ld a, [wd083]
bit 7, a
ret nz
.beginChecks
@@ -174,7 +174,7 @@
cp $ff ; is this command an endchannel?
jp nz, Music8_callchannel ; no
ld b, $0 ; yes
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 1, [hl]
jr nz, .returnFromCall
@@ -184,7 +184,7 @@
jr .asm_219c0
.noiseOrSfxChannel
res 2, [hl]
- ld hl, $c036
+ ld hl, wc036
add hl, bc
res 0, [hl]
cp CH6
@@ -195,11 +195,11 @@
ld [$ff1a], a
.notSfxChannel3
jr nz, .asm_219a3
- ld a, [$c003]
+ ld a, [wc003]
and a
jr z, .asm_219a3
xor a
- ld [$c003], a
+ ld [wc003], a
jr .asm_219c0
.asm_219a3
jr .asm_219c9
@@ -209,10 +209,10 @@
ld a, c
add a
ld e, a
- ld hl, $c006
+ ld hl, wc006
add hl, de
push hl ; store current channel address
- ld hl, $c016
+ ld hl, wc016
add hl, de
ld e, l
ld d, h
@@ -230,12 +230,12 @@
and [hl]
ld [$ff25], a
.asm_219c9
- ld a, [$c02a]
+ ld a, [wc02a]
cp $14
jr nc, .asm_219d2
jr .asm_219ef
.asm_219d2
- ld a, [$c02a]
+ ld a, [wc02a]
cp $86
jr z, .asm_219ef
jr c, .asm_219dd
@@ -247,12 +247,12 @@
call Func_21e6d
ret c
.asm_219e6
- ld a, [$c005]
+ ld a, [wc005]
ld [$ff24], a
xor a
- ld [$c005], a
+ ld [wc005], a
.asm_219ef
- ld hl, $c026
+ ld hl, wc026
add hl, bc
ld [hl], b
ret
@@ -271,10 +271,10 @@
ld a, c
add a
ld e, a
- ld hl, $c006
+ ld hl, wc006
add hl, de
push hl
- ld hl, $c016
+ ld hl, wc016
add hl, de
ld e, l
ld d, h
@@ -289,7 +289,7 @@
inc hl
ld [hl], d ; overwrite current address with pointer
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
set 1, [hl] ; set the call flag
jp Music8_endchannel
@@ -302,7 +302,7 @@
and a
jr z, .infiniteLoop
ld b, $0
- ld hl, $c0be
+ ld hl, wc0be
add hl, bc
ld a, [hl]
cp e
@@ -325,7 +325,7 @@
ld a, c
add a
ld e, a
- ld hl, $c006
+ ld hl, wc006
add hl, de
pop af
ld [hli], a
@@ -339,7 +339,7 @@
ld a, d ; yes
and $f
ld b, $0
- ld hl, $c0c6
+ ld hl, wc0c6
add hl, bc
ld [hl], a ; store low nibble as speed
ld a, c
@@ -352,10 +352,10 @@
jr z, .musicChannel3
cp CH6
jr nz, .notChannel3
- ld hl, $c0e7
+ ld hl, wc0e7
jr .sfxChannel3
.musicChannel3
- ld hl, $c0e6
+ ld hl, wc0e6
.sfxChannel3
ld a, d
and $f
@@ -370,7 +370,7 @@
; else, store volume (high nibble) and fade (low nibble)
.notChannel3
ld b, $0
- ld hl, $c0de
+ ld hl, wc0de
add hl, bc
ld [hl], d
.noiseChannel
@@ -381,11 +381,11 @@
cp $e8 ; is this command an togglecall?
jr nz, Music8_vibrato ; no
ld b, $0 ; yes
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
ld a, [hl]
xor $1
- ld [hl], a ; flip bit 0 of $c02e (toggle returning from call)
+ ld [hl], a ; flip bit 0 of wc02e (toggle returning from call)
jp Music8_endchannel
Music8_vibrato: ; 21ab6 (8:5ab6)
@@ -393,10 +393,10 @@
jr nz, Music8_pitchbend ; no
call Music8_GetNextMusicByte ; yes
ld b, $0
- ld hl, $c04e
+ ld hl, wc04e
add hl, bc
ld [hl], a ; store delay
- ld hl, $c06e
+ ld hl, wc06e
add hl, bc
ld [hl], a ; store delay
call Music8_GetNextMusicByte
@@ -404,7 +404,7 @@
and $f0
swap a
ld b, $0
- ld hl, $c056
+ ld hl, wc056
add hl, bc
srl a
ld e, a
@@ -415,7 +415,7 @@
ld a, d
and $f
ld d, a
- ld hl, $c05e
+ ld hl, wc05e
add hl, bc
swap a
or d
@@ -427,7 +427,7 @@
jr nz, Music8_duty ; no
call Music8_GetNextMusicByte ; yes
ld b, $0
- ld hl, $c076
+ ld hl, wc076
add hl, bc
ld [hl], a ; store first param
call Music8_GetNextMusicByte
@@ -439,14 +439,14 @@
and $f
call Func_22017
ld b, $0
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, bc
ld [hl], d ; store unknown part of second param
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, bc
ld [hl], e ; store unknown part of second param
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
set 4, [hl] ; set pitchbend flag
call Music8_GetNextMusicByte
@@ -461,7 +461,7 @@
rrca
and $c0
ld b, $0
- ld hl, $c03e
+ ld hl, wc03e
add hl, bc
ld [hl], a ; store duty
jp Music8_endchannel
@@ -473,25 +473,25 @@
cp CH4
jr nc, .sfxChannel
call Music8_GetNextMusicByte
- ld [$c0e8], a ; store first param
+ ld [wc0e8], a ; store first param
call Music8_GetNextMusicByte
- ld [$c0e9], a ; store second param
+ ld [wc0e9], a ; store second param
xor a
- ld [$c0ce], a ; clear RAM
- ld [$c0cf], a
- ld [$c0d0], a
- ld [$c0d1], a
+ ld [wc0ce], a ; clear RAM
+ ld [wc0cf], a
+ ld [wc0d0], a
+ ld [wc0d1], a
jr .musicChannelDone
.sfxChannel
call Music8_GetNextMusicByte
- ld [$c0ea], a ; store first param
+ ld [wc0ea], a ; store first param
call Music8_GetNextMusicByte
- ld [$c0eb], a ; store second param
+ ld [wc0eb], a ; store second param
xor a
- ld [$c0d2], a ; clear RAM
- ld [$c0d3], a
- ld [$c0d4], a
- ld [$c0d5], a
+ ld [wc0d2], a ; clear RAM
+ ld [wc0d3], a
+ ld [wc0d4], a
+ ld [wc0d5], a
.musicChannelDone
jp Music8_endchannel
@@ -499,7 +499,7 @@
cp $ee ; is this command an unknownmusic0xee?
jr nz, Music8_unknownmusic0xef ; no
call Music8_GetNextMusicByte ; yes
- ld [$c004], a ; store first param
+ ld [wc004], a ; store first param
jp Music8_endchannel
; this appears to never be used
@@ -510,13 +510,13 @@
push bc
call Func_22035
pop bc
- ld a, [$c003]
+ ld a, [wc003]
and a
jr nz, .skip
- ld a, [$c02d]
- ld [$c003], a
+ ld a, [wc02d]
+ ld [wc003], a
xor a
- ld [$c02d], a
+ ld [wc02d], a
.skip
jp Music8_endchannel
@@ -525,14 +525,14 @@
jr nz, Music8_stereopanning ; no
call Music8_GetNextMusicByte ; yes
ld b, $0
- ld hl, $c046
+ ld hl, wc046
add hl, bc
ld [hl], a ; store full cycle
and $c0
- ld hl, $c03e
+ ld hl, wc03e
add hl, bc
ld [hl], a ; store first duty
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
set 6, [hl] ; set dutycycle flag
jp Music8_endchannel
@@ -548,7 +548,7 @@
cp $f8 ; is this command an executemusic?
jr nz, Music8_octave ; no
ld b, $0 ; yes
- ld hl, $c036
+ ld hl, wc036
add hl, bc
set 0, [hl]
jp Music8_endchannel
@@ -557,7 +557,7 @@
and $f0
cp $e0 ; is this command an octave?
jr nz, Music8_unknownsfx0x20 ; no
- ld hl, $c0d6 ; yes
+ ld hl, wc0d6 ; yes
ld b, $0
add hl, bc
ld a, d
@@ -572,7 +572,7 @@
cp CH3 ; is this a noise or sfx channel?
jr c, Music8_unknownsfx0x10 ; no
ld b, $0
- ld hl, $c036
+ ld hl, wc036
add hl, bc
bit 0, [hl]
jr nz, Music8_unknownsfx0x10 ; no
@@ -579,7 +579,7 @@
call Music8_notelength
ld d, a
ld b, $0
- ld hl, $c03e
+ ld hl, wc03e
add hl, bc
ld a, [hl]
or d
@@ -618,7 +618,7 @@
cp $10 ; is this command a unknownsfx0x10?
jr nz, Music8_note ; no
ld b, $0
- ld hl, $c036
+ ld hl, wc036
add hl, bc
bit 0, [hl]
jr nz, Music8_note ; no
@@ -653,7 +653,7 @@
call Music8_GetNextMusicByte ; get dnote instrument
asm_21c7e
ld d, a
- ld a, [$c003]
+ ld a, [wc003]
and a
jr nz, .asm_21c89
ld a, d
@@ -670,7 +670,7 @@
ld b, $0
ld e, a ; store note length (in 16ths)
ld d, b
- ld hl, $c0c6
+ ld hl, wc0c6
add hl, bc
ld a, [hl]
ld l, b
@@ -678,9 +678,9 @@
ld a, c
cp CH4
jr nc, .sfxChannel
- ld a, [$c0e8]
+ ld a, [wc0e8]
ld d, a
- ld a, [$c0e9]
+ ld a, [wc0e9]
ld e, a
jr .skip
.sfxChannel
@@ -689,31 +689,31 @@
cp CH7
jr z, .skip ; if noise channel
call Func_21e2f
- ld a, [$c0ea]
+ ld a, [wc0ea]
ld d, a
- ld a, [$c0eb]
+ ld a, [wc0eb]
ld e, a
.skip
ld a, l
ld b, $0
- ld hl, $c0ce
+ ld hl, wc0ce
add hl, bc
ld l, [hl]
call Func_22006
ld e, l
ld d, h
- ld hl, $c0ce
+ ld hl, wc0ce
add hl, bc
ld [hl], e
ld a, d
- ld hl, $c0b6
+ ld hl, wc0b6
add hl, bc
ld [hl], a
- ld hl, $c036
+ ld hl, wc036
add hl, bc
bit 0, [hl]
jr nz, Music8_notepitch
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 2, [hl]
jr z, Music8_notepitch
@@ -728,7 +728,7 @@
ld a, c
cp CH4
jr nc, .sfxChannel
- ld hl, $c02a
+ ld hl, wc02a
add hl, bc
ld a, [hl]
and a
@@ -761,12 +761,12 @@
.notRest
swap a
ld b, $0
- ld hl, $c0d6
+ ld hl, wc0d6
add hl, bc
ld b, [hl]
call Func_22017
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 4, [hl]
jr z, .asm_21d39
@@ -776,7 +776,7 @@
ld a, c
cp CH4
jr nc, .skip ; if sfx channel
- ld hl, $c02a
+ ld hl, wc02a
ld d, $0
ld e, a
add hl, de
@@ -789,7 +789,7 @@
ret
.skip
ld b, $0
- ld hl, $c0de
+ ld hl, wc0de
add hl, bc
ld d, [hl]
ld b, $2
@@ -799,7 +799,7 @@
call Func_21d79
pop de
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 0, [hl]
jr z, .asm_21d70
@@ -807,7 +807,7 @@
jr nc, .asm_21d70
inc d
.asm_21d70
- ld hl, $c066
+ ld hl, wc066
add hl, bc
ld [hl], e
call Func_21dcc
@@ -825,13 +825,13 @@
jr z, .sfxNoiseChannel
cp CH4
jr nc, .skip ; if sfx channel
- ld hl, $c02a
+ ld hl, wc02a
add hl, bc
ld a, [hl]
and a
jr nz, .skip
.sfxNoiseChannel
- ld a, [$c004]
+ ld a, [wc004]
ld hl, Unknown_222e6
add hl, bc
and [hl]
@@ -849,7 +849,7 @@
Func_21daa: ; 21daa (8:5daa)
ld b, $0
- ld hl, $c0b6
+ ld hl, wc0b6
add hl, bc
ld d, [hl]
ld a, c
@@ -860,7 +860,7 @@
ld a, d
and $3f
ld d, a
- ld hl, $c03e
+ ld hl, wc03e
add hl, bc
ld a, [hl]
or d
@@ -880,10 +880,10 @@
; fall through
.channel3
push de
- ld de, $c0e6
+ ld de, wc0e6
cp CH2
jr z, .musicChannel3
- ld de, $c0e7
+ ld de, wc0e7
.musicChannel3
ld a, [de]
add a
@@ -930,13 +930,13 @@
ld a, c
cp CH4
jr nz, .asm_21e2e
- ld a, [$d083]
+ ld a, [wd083]
bit 7, a
jr z, .asm_21e2e
xor a
- ld [$c0f1], a
+ ld [wc0f1], a
ld a, $80
- ld [$c0f2], a
+ ld [wc0f2], a
.asm_21e2e
ret
@@ -947,20 +947,20 @@
jr nc, .asm_21e4c
.asm_21e39
ld d, $0
- ld a, [$c0f2]
+ ld a, [wc0f2]
add $80
jr nc, .asm_21e43
inc d
.asm_21e43
- ld [$c0eb], a
+ ld [wc0eb], a
ld a, d
- ld [$c0ea], a
+ ld [wc0ea], a
jr .asm_21e55
.asm_21e4c
xor a
- ld [$c0eb], a
+ ld [wc0eb], a
ld a, $1
- ld [$c0ea], a
+ ld [wc0ea], a
.asm_21e55
ret
@@ -970,7 +970,7 @@
call Func_21e9f
jr nc, .asm_21e6c
.asm_21e60
- ld a, [$c0f1]
+ ld a, [wc0f1]
add e
jr nc, .asm_21e67
inc d
@@ -986,7 +986,7 @@
Func_21e6d: ; 21e6d (8:5e6d)
call Func_21e8b
jr nc, .asm_21e88
- ld hl, $c006
+ ld hl, wc006
ld e, c
ld d, $0
sla e
@@ -1007,7 +1007,7 @@
ret
Func_21e8b: ; 21e8b (8:5e8b)
- ld a, [$c02a]
+ ld a, [wc02a]
cp $14
jr nc, .asm_21e94
jr .asm_21e9a
@@ -1024,9 +1024,9 @@
ret
Func_21e9f: ; 21e9f (8:5e9f)
- ld a, [$c02d]
+ ld a, [wc02d]
ld b, a
- ld a, [$c02a]
+ ld a, [wc02a]
or b
cp $9d
jr nc, .asm_21ead
@@ -1044,17 +1044,17 @@
ret
Music8_ApplyPitchBend: ; 21eb8 (8:5eb8)
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 5, [hl]
jp nz, .asm_21eff
- ld hl, $c09e
+ ld hl, wc09e
add hl, bc
ld e, [hl]
- ld hl, $c096
+ ld hl, wc096
add hl, bc
ld d, [hl]
- ld hl, $c07e
+ ld hl, wc07e
add hl, bc
ld l, [hl]
ld h, b
@@ -1061,10 +1061,10 @@
add hl, de
ld d, h
ld e, l
- ld hl, $c08e
+ ld hl, wc08e
add hl, bc
push hl
- ld hl, $c086
+ ld hl, wc086
add hl, bc
ld a, [hl]
pop hl
@@ -1076,13 +1076,13 @@
ld a, $0
adc d
ld d, a
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, bc
ld a, [hl]
cp d
jp c, .asm_21f45
jr nz, .asm_21f32
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, bc
ld a, [hl]
cp e
@@ -1089,13 +1089,13 @@
jp c, .asm_21f45
jr .asm_21f32
.asm_21eff
- ld hl, $c09e
+ ld hl, wc09e
add hl, bc
ld a, [hl]
- ld hl, $c096
+ ld hl, wc096
add hl, bc
ld d, [hl]
- ld hl, $c07e
+ ld hl, wc07e
add hl, bc
ld e, [hl]
sub e
@@ -1103,7 +1103,7 @@
ld a, d
sbc b
ld d, a
- ld hl, $c086
+ ld hl, wc086
add hl, bc
ld a, [hl]
add a
@@ -1114,22 +1114,22 @@
ld a, d
sbc b
ld d, a
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, bc
ld a, d
cp [hl]
jr c, .asm_21f45
jr nz, .asm_21f32
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, bc
ld a, e
cp [hl]
jr c, .asm_21f45
.asm_21f32
- ld hl, $c09e
+ ld hl, wc09e
add hl, bc
ld [hl], e
- ld hl, $c096
+ ld hl, wc096
add hl, bc
ld [hl], d
ld b, $3
@@ -1139,7 +1139,7 @@
ld [hl], d
ret
.asm_21f45
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
res 4, [hl]
res 5, [hl]
@@ -1146,16 +1146,16 @@
ret
Func_21f4e: ; 21f4e (8:5f4e)
- ld hl, $c096
+ ld hl, wc096
add hl, bc
ld [hl], d
- ld hl, $c09e
+ ld hl, wc09e
add hl, bc
ld [hl], e
- ld hl, $c0b6
+ ld hl, wc0b6
add hl, bc
ld a, [hl]
- ld hl, $c076
+ ld hl, wc076
add hl, bc
sub [hl]
jr nc, .asm_21f66
@@ -1162,7 +1162,7 @@
ld a, $1
.asm_21f66
ld [hl], a
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, bc
ld a, e
sub [hl]
@@ -1169,24 +1169,24 @@
ld e, a
ld a, d
sbc b
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, bc
sub [hl]
jr c, .asm_21f82
ld d, a
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
set 5, [hl]
jr .asm_21fa5
.asm_21f82
- ld hl, $c096
+ ld hl, wc096
add hl, bc
ld d, [hl]
- ld hl, $c09e
+ ld hl, wc09e
add hl, bc
ld e, [hl]
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, bc
ld a, [hl]
sub e
@@ -1194,17 +1194,17 @@
ld a, d
sbc b
ld d, a
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, bc
ld a, [hl]
sub d
ld d, a
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
res 5, [hl]
.asm_21fa5
- ld hl, $c076
+ ld hl, wc076
add hl, bc
.asm_21fa9
inc b
@@ -1223,13 +1223,13 @@
add [hl]
ld d, b
ld b, $0
- ld hl, $c07e
+ ld hl, wc07e
add hl, bc
ld [hl], d
- ld hl, $c086
+ ld hl, wc086
add hl, bc
ld [hl], a
- ld hl, $c08e
+ ld hl, wc08e
add hl, bc
ld [hl], a
ret
@@ -1236,7 +1236,7 @@
Music8_ApplyDutyCycle: ; 21fcc (8:5fcc)
ld b, $0
- ld hl, $c046
+ ld hl, wc046
add hl, bc
ld a, [hl]
rlca
@@ -1257,7 +1257,7 @@
ld a, c
add a
ld e, a
- ld hl, $c006
+ ld hl, wc006
add hl, de
ld a, [hli]
ld e, a
@@ -1325,7 +1325,7 @@
ret
Func_22035:: ; 22035 (8:6035)
- ld [$c001], a
+ ld [wc001], a
cp $ff
jp z, Func_221f3
cp $e9
@@ -1336,63 +1336,63 @@
jp nc, Func_2210d
.asm_2204c
xor a
- ld [$c000], a
- ld [$c003], a
- ld [$c0e9], a
- ld [$c0e6], a
- ld [$c0e7], a
+ ld [wc000], a
+ ld [wc003], a
+ ld [wc0e9], a
+ ld [wc0e6], a
+ ld [wc0e7], a
ld d, $8
- ld hl, $c016
+ ld hl, wc016
call FillMusicRAM8
- ld hl, $c006
+ ld hl, wc006
call FillMusicRAM8
ld d, $4
- ld hl, $c026
+ ld hl, wc026
call FillMusicRAM8
- ld hl, $c02e
+ ld hl, wc02e
call FillMusicRAM8
- ld hl, $c03e
+ ld hl, wc03e
call FillMusicRAM8
- ld hl, $c046
+ ld hl, wc046
call FillMusicRAM8
- ld hl, $c04e
+ ld hl, wc04e
call FillMusicRAM8
- ld hl, $c056
+ ld hl, wc056
call FillMusicRAM8
- ld hl, $c05e
+ ld hl, wc05e
call FillMusicRAM8
- ld hl, $c066
+ ld hl, wc066
call FillMusicRAM8
- ld hl, $c06e
+ ld hl, wc06e
call FillMusicRAM8
- ld hl, $c036
+ ld hl, wc036
call FillMusicRAM8
- ld hl, $c076
+ ld hl, wc076
call FillMusicRAM8
- ld hl, $c07e
+ ld hl, wc07e
call FillMusicRAM8
- ld hl, $c086
+ ld hl, wc086
call FillMusicRAM8
- ld hl, $c08e
+ ld hl, wc08e
call FillMusicRAM8
- ld hl, $c096
+ ld hl, wc096
call FillMusicRAM8
- ld hl, $c09e
+ ld hl, wc09e
call FillMusicRAM8
- ld hl, $c0a6
+ ld hl, wc0a6
call FillMusicRAM8
- ld hl, $c0ae
+ ld hl, wc0ae
call FillMusicRAM8
ld a, $1
- ld hl, $c0be
+ ld hl, wc0be
call FillMusicRAM8
- ld hl, $c0b6
+ ld hl, wc0b6
call FillMusicRAM8
- ld hl, $c0c6
+ ld hl, wc0c6
call FillMusicRAM8
- ld [$c0e8], a
+ ld [wc0e8], a
ld a, $ff
- ld [$c004], a
+ ld [wc004], a
xor a
ld [$ff24], a
ld a, $8
@@ -1417,9 +1417,9 @@
ld de, SFX_Headers_08
add hl, de
ld a, h
- ld [$c0ec], a
+ ld [wc0ec], a
ld a, l
- ld [$c0ed], a
+ ld [wc0ed], a
ld a, [hl]
and $c0
rlca
@@ -1432,9 +1432,9 @@
add c
ld c, a
ld b, $0
- ld a, [$c0ec]
+ ld a, [wc0ec]
ld h, a
- ld a, [$c0ed]
+ ld a, [wc0ed]
ld l, a
add hl, bc
ld c, d
@@ -1442,7 +1442,7 @@
and $f
ld e, a
ld d, $0
- ld hl, $c026
+ ld hl, wc026
add hl, de
ld a, [hl]
and a
@@ -1450,7 +1450,7 @@
ld a, e
cp $7
jr nz, .asm_22159
- ld a, [$c001]
+ ld a, [wc001]
cp $14
jr nc, .asm_22152
ret
@@ -1460,7 +1460,7 @@
jr z, .asm_22162
jr c, .asm_22162
.asm_22159
- ld a, [$c001]
+ ld a, [wc001]
cp [hl]
jr z, .asm_22162
jr c, .asm_22162
@@ -1473,77 +1473,77 @@
add hl, hl
ld d, h
ld e, l
- ld hl, $c016
+ ld hl, wc016
add hl, de
ld [hli], a
ld [hl], a
- ld hl, $c006
+ ld hl, wc006
add hl, de
ld [hli], a
ld [hl], a
pop de
- ld hl, $c026
+ ld hl, wc026
add hl, de
ld [hl], a
- ld hl, $c02e
+ ld hl, wc02e
add hl, de
ld [hl], a
- ld hl, $c03e
+ ld hl, wc03e
add hl, de
ld [hl], a
- ld hl, $c046
+ ld hl, wc046
add hl, de
ld [hl], a
- ld hl, $c04e
+ ld hl, wc04e
add hl, de
ld [hl], a
- ld hl, $c056
+ ld hl, wc056
add hl, de
ld [hl], a
- ld hl, $c05e
+ ld hl, wc05e
add hl, de
ld [hl], a
- ld hl, $c066
+ ld hl, wc066
add hl, de
ld [hl], a
- ld hl, $c06e
+ ld hl, wc06e
add hl, de
ld [hl], a
- ld hl, $c076
+ ld hl, wc076
add hl, de
ld [hl], a
- ld hl, $c07e
+ ld hl, wc07e
add hl, de
ld [hl], a
- ld hl, $c086
+ ld hl, wc086
add hl, de
ld [hl], a
- ld hl, $c08e
+ ld hl, wc08e
add hl, de
ld [hl], a
- ld hl, $c096
+ ld hl, wc096
add hl, de
ld [hl], a
- ld hl, $c09e
+ ld hl, wc09e
add hl, de
ld [hl], a
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, de
ld [hl], a
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, de
ld [hl], a
- ld hl, $c036
+ ld hl, wc036
add hl, de
ld [hl], a
ld a, $1
- ld hl, $c0be
+ ld hl, wc0be
add hl, de
ld [hl], a
- ld hl, $c0b6
+ ld hl, wc0b6
add hl, de
ld [hl], a
- ld hl, $c0c6
+ ld hl, wc0c6
add hl, de
ld [hl], a
ld a, e
@@ -1577,24 +1577,24 @@
ld a, $77
ld [$ff24], a
xor a
- ld [$c000], a
- ld [$c003], a
- ld [$c002], a
- ld [$c0e9], a
- ld [$c0eb], a
- ld [$c0e6], a
- ld [$c0e7], a
+ ld [wc000], a
+ ld [wc003], a
+ ld [wc002], a
+ ld [wc0e9], a
+ ld [wc0eb], a
+ ld [wc0e6], a
+ ld [wc0e7], a
ld d, $a0
- ld hl, $c006
+ ld hl, wc006
call FillMusicRAM8
ld a, $1
ld d, $18
- ld hl, $c0b6
+ ld hl, wc0b6
call FillMusicRAM8
- ld [$c0e8], a
- ld [$c0ea], a
+ ld [wc0e8], a
+ ld [wc0ea], a
ld a, $ff
- ld [$c004], a
+ ld [wc004], a
ret
; fills d bytes at hl with a
@@ -1607,7 +1607,7 @@
ret
Func_2224e: ; 2224e (8:624e)
- ld a, [$c001]
+ ld a, [wc001]
ld l, a
ld e, a
ld h, $0
@@ -1618,7 +1618,7 @@
add hl, de
ld e, l
ld d, h
- ld hl, $c006
+ ld hl, wc006
ld a, [de] ; get channel number
ld b, a
rlca
@@ -1644,14 +1644,14 @@
push af
ld b, $0
ld c, a
- ld hl, $c026
+ ld hl, wc026
add hl, bc
- ld a, [$c001]
+ ld a, [wc001]
ld [hl], a
pop af
cp $3
jr c, .asm_22291
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
set 2, [hl]
.asm_22291
@@ -1670,32 +1670,32 @@
ld a, [de]
inc de
jr nz, .asm_22270
- ld a, [$c001]
+ ld a, [wc001]
cp $14
jr nc, .asm_222aa
jr .asm_222d4
.asm_222aa
- ld a, [$c001]
+ ld a, [wc001]
cp $86
jr z, .asm_222d4
jr c, .asm_222b5
jr .asm_222d4
.asm_222b5
- ld hl, $c02a
+ ld hl, wc02a
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
- ld hl, $c012 ; sfx noise channel pointer
+ ld hl, wc012 ; sfx noise channel pointer
ld de, Noise8_endchannel
ld [hl], e
inc hl
ld [hl], d ; overwrite pointer to point to endchannel
- ld a, [$c005]
+ ld a, [wc005]
and a
jr nz, .asm_222d4
ld a, [$ff24]
- ld [$c005], a
+ ld [wc005], a
ld a, $77
ld [$ff24], a
.asm_222d4
--- a/audio/engine_3.asm
+++ b/audio/engine_3.asm
@@ -4,7 +4,7 @@
ld c, CH0
.loop
ld b, $0
- ld hl, $c026
+ ld hl, wc026
add hl, bc
ld a, [hl]
and a
@@ -12,13 +12,13 @@
ld a, c
cp CH4
jr nc, .applyAffects ; if sfx channel
- ld a, [$c002]
+ ld a, [wc002]
and a
jr z, .applyAffects
bit 7, a
jr nz, .nextChannel
set 7, a
- ld [$c002], a
+ ld [wc002], a
xor a
ld [$ff25], a
ld [$ff1a], a
@@ -36,7 +36,7 @@
; this routine checks flags for music effects currently applied
; to the channel and calls certain functions based on flags.
-; known flags for $c02e:
+; known flags for wc02e:
; 1: call has been used
; 3: a toggle used only by this routine for vibrato
; 4: pitchbend flag
@@ -43,7 +43,7 @@
; 6: dutycycle flag
Music1f_Music2_ApplyMusicAffects: ; 7d1ac (1f:51ac)
ld b, $0
- ld hl, $c0b6 ; delay until next note
+ ld hl, wc0b6 ; delay until next note
add hl, bc
ld a, [hl]
cp $1 ; if delay is 1, play next note
@@ -53,7 +53,7 @@
ld a, c
cp CH4
jr nc, .startChecks ; if a sfx channel
- ld hl, $c02a
+ ld hl, wc02a
add hl, bc
ld a, [hl]
and a
@@ -60,7 +60,7 @@
jr z, .startChecks
ret
.startChecks
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 6, [hl] ; dutycycle
jr z, .checkForExecuteMusic
@@ -67,22 +67,22 @@
call Music1f_ApplyDutyCycle
.checkForExecuteMusic
ld b, $0
- ld hl, $c036
+ ld hl, wc036
add hl, bc
bit 0, [hl]
jr nz, .checkForPitchBend
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 2, [hl]
jr nz, .disablePitchBendVibrato
.checkForPitchBend
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 4, [hl] ; pitchbend
jr z, .checkVibratoDelay
jp Music1f_ApplyPitchBend
.checkVibratoDelay
- ld hl, $c04e ; vibrato delay
+ ld hl, wc04e ; vibrato delay
add hl, bc
ld a, [hl]
and a ; check if delay is over
@@ -91,7 +91,7 @@
.disablePitchBendVibrato
ret
.checkForVibrato
- ld hl, $c056 ; vibrato rate
+ ld hl, wc056 ; vibrato rate
add hl, bc
ld a, [hl]
and a
@@ -99,7 +99,7 @@
ret ; no vibrato
.vibrato
ld d, a
- ld hl, $c05e
+ ld hl, wc05e
add hl, bc
ld a, [hl]
and $f
@@ -112,10 +112,10 @@
swap [hl]
or [hl]
ld [hl], a ; reset the vibrato value and start again
- ld hl, $c066
+ ld hl, wc066
add hl, bc
ld e, [hl] ; get note pitch
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 3, [hl] ; this is the only code that sets/resets bit three so
jr z, .unset ; it continuously alternates which path it takes
@@ -148,13 +148,13 @@
; like tempo changes, duty changes etc. and doesn't return
; until the first note is reached
Music1f_Music2_PlayNextNote: ; 7d244 (1f:5244)
- ld hl, $c06e
+ ld hl, wc06e
add hl, bc
ld a, [hl]
- ld hl, $c04e
+ ld hl, wc04e
add hl, bc
ld [hl], a
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
res 4, [hl]
res 5, [hl]
@@ -167,7 +167,7 @@
cp $ff ; is this command an endchannel?
jp nz, Music1f_callchannel ; no
ld b, $0 ; yes
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 1, [hl]
jr nz, .returnFromCall
@@ -177,7 +177,7 @@
jr .asm_7d2b3
.noiseOrSfxChannel
res 2, [hl]
- ld hl, $c036
+ ld hl, wc036
add hl, bc
res 0, [hl]
cp CH6
@@ -188,11 +188,11 @@
ld [$ff1a], a
.notSfxChannel3
jr nz, .asm_7d296
- ld a, [$c003]
+ ld a, [wc003]
and a
jr z, .asm_7d296
xor a
- ld [$c003], a
+ ld [wc003], a
jr .asm_7d2b3
.asm_7d296
jr .asm_7d2bc
@@ -202,10 +202,10 @@
ld a, c
add a
ld e, a
- ld hl, $c006
+ ld hl, wc006
add hl, de
push hl ; store current channel address
- ld hl, $c016
+ ld hl, wc016
add hl, de
ld e, l
ld d, h
@@ -223,12 +223,12 @@
and [hl]
ld [$ff25], a
.asm_7d2bc
- ld a, [$c02a]
+ ld a, [wc02a]
cp $14
jr nc, .asm_7d2c5
jr .asm_7d2e2
.asm_7d2c5
- ld a, [$c02a]
+ ld a, [wc02a]
cp $86
jr z, .asm_7d2e2
jr c, .asm_7d2d0
@@ -240,12 +240,12 @@
call Func_7d73b
ret c
.asm_7d2d9
- ld a, [$c005]
+ ld a, [wc005]
ld [$ff24], a
xor a
- ld [$c005], a
+ ld [wc005], a
.asm_7d2e2
- ld hl, $c026
+ ld hl, wc026
add hl, bc
ld [hl], b
ret
@@ -264,10 +264,10 @@
ld a, c
add a
ld e, a
- ld hl, $c006
+ ld hl, wc006
add hl, de
push hl
- ld hl, $c016
+ ld hl, wc016
add hl, de
ld e, l
ld d, h
@@ -282,7 +282,7 @@
inc hl
ld [hl], d ; overwrite current address with pointer
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
set 1, [hl] ; set the call flag
jp Music1f_endchannel
@@ -295,7 +295,7 @@
and a
jr z, .infiniteLoop
ld b, $0
- ld hl, $c0be
+ ld hl, wc0be
add hl, bc
ld a, [hl]
cp e
@@ -318,7 +318,7 @@
ld a, c
add a
ld e, a
- ld hl, $c006
+ ld hl, wc006
add hl, de
pop af
ld [hli], a
@@ -332,7 +332,7 @@
ld a, d ; yes
and $f
ld b, $0
- ld hl, $c0c6
+ ld hl, wc0c6
add hl, bc
ld [hl], a ; store low nibble as speed
ld a, c
@@ -345,10 +345,10 @@
jr z, .musicChannel3
cp CH6
jr nz, .notChannel3
- ld hl, $c0e7
+ ld hl, wc0e7
jr .sfxChannel3
.musicChannel3
- ld hl, $c0e6
+ ld hl, wc0e6
.sfxChannel3
ld a, d
and $f
@@ -363,7 +363,7 @@
; else, store volume (high nibble) and fade (low nibble)
.notChannel3
ld b, $0
- ld hl, $c0de
+ ld hl, wc0de
add hl, bc
ld [hl], d
.noiseChannel
@@ -374,11 +374,11 @@
cp $e8 ; is this command an togglecall?
jr nz, Music1f_vibrato ; no
ld b, $0 ; yes
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
ld a, [hl]
xor $1
- ld [hl], a ; flip bit 0 of $c02e (toggle returning from call)
+ ld [hl], a ; flip bit 0 of wc02e (toggle returning from call)
jp Music1f_endchannel
Music1f_vibrato: ; 7d3a9 (1f:53a9)
@@ -386,10 +386,10 @@
jr nz, Music1f_pitchbend ; no
call Music1f_GetNextMusicByte ; yes
ld b, $0
- ld hl, $c04e
+ ld hl, wc04e
add hl, bc
ld [hl], a ; store delay
- ld hl, $c06e
+ ld hl, wc06e
add hl, bc
ld [hl], a ; store delay
call Music1f_GetNextMusicByte
@@ -397,7 +397,7 @@
and $f0
swap a
ld b, $0
- ld hl, $c056
+ ld hl, wc056
add hl, bc
srl a
ld e, a
@@ -408,7 +408,7 @@
ld a, d
and $f
ld d, a
- ld hl, $c05e
+ ld hl, wc05e
add hl, bc
swap a
or d
@@ -420,7 +420,7 @@
jr nz, Music1f_duty ; no
call Music1f_GetNextMusicByte ; yes
ld b, $0
- ld hl, $c076
+ ld hl, wc076
add hl, bc
ld [hl], a ; store first param
call Music1f_GetNextMusicByte
@@ -432,14 +432,14 @@
and $f
call Func_7d8cc
ld b, $0
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, bc
ld [hl], d ; store unknown part of second param
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, bc
ld [hl], e ; store unknown part of second param
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
set 4, [hl] ; set pitchbend flag
call Music1f_GetNextMusicByte
@@ -454,7 +454,7 @@
rrca
and $c0
ld b, $0
- ld hl, $c03e
+ ld hl, wc03e
add hl, bc
ld [hl], a ; store duty
jp Music1f_endchannel
@@ -466,25 +466,25 @@
cp CH4
jr nc, .sfxChannel
call Music1f_GetNextMusicByte
- ld [$c0e8], a ; store first param
+ ld [wc0e8], a ; store first param
call Music1f_GetNextMusicByte
- ld [$c0e9], a ; store second param
+ ld [wc0e9], a ; store second param
xor a
- ld [$c0ce], a ; clear RAM
- ld [$c0cf], a
- ld [$c0d0], a
- ld [$c0d1], a
+ ld [wc0ce], a ; clear RAM
+ ld [wc0cf], a
+ ld [wc0d0], a
+ ld [wc0d1], a
jr .musicChannelDone
.sfxChannel
call Music1f_GetNextMusicByte
- ld [$c0ea], a ; store first param
+ ld [wc0ea], a ; store first param
call Music1f_GetNextMusicByte
- ld [$c0eb], a ; store second param
+ ld [wc0eb], a ; store second param
xor a
- ld [$c0d2], a ; clear RAM
- ld [$c0d3], a
- ld [$c0d4], a
- ld [$c0d5], a
+ ld [wc0d2], a ; clear RAM
+ ld [wc0d3], a
+ ld [wc0d4], a
+ ld [wc0d5], a
.musicChannelDone
jp Music1f_endchannel
@@ -492,7 +492,7 @@
cp $ee ; is this command an unknownmusic0xee?
jr nz, Music1f_unknownmusic0xef ; no
call Music1f_GetNextMusicByte ; yes
- ld [$c004], a ; store first param
+ ld [wc004], a ; store first param
jp Music1f_endchannel
; this appears to never be used
@@ -503,13 +503,13 @@
push bc
call Func_7d8ea
pop bc
- ld a, [$c003]
+ ld a, [wc003]
and a
jr nz, .skip
- ld a, [$c02d]
- ld [$c003], a
+ ld a, [wc02d]
+ ld [wc003], a
xor a
- ld [$c02d], a
+ ld [wc02d], a
.skip
jp Music1f_endchannel
@@ -518,14 +518,14 @@
jr nz, Music1f_stereopanning ; no
call Music1f_GetNextMusicByte ; yes
ld b, $0
- ld hl, $c046
+ ld hl, wc046
add hl, bc
ld [hl], a ; store full cycle
and $c0
- ld hl, $c03e
+ ld hl, wc03e
add hl, bc
ld [hl], a ; store first duty
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
set 6, [hl] ; set duty flag
jp Music1f_endchannel
@@ -541,7 +541,7 @@
cp $f8 ; is this command an executemusic?
jr nz, Music1f_octave ; no
ld b, $0 ; yes
- ld hl, $c036
+ ld hl, wc036
add hl, bc
set 0, [hl]
jp Music1f_endchannel
@@ -550,7 +550,7 @@
and $f0
cp $e0 ; is this command an octave?
jr nz, Music1f_unknownsfx0x20 ; no
- ld hl, $c0d6 ; yes
+ ld hl, wc0d6 ; yes
ld b, $0
add hl, bc
ld a, d
@@ -565,7 +565,7 @@
cp CH3 ; is this a noise or sfx channel?
jr c, Music1f_unknownsfx0x10 ; no
ld b, $0
- ld hl, $c036
+ ld hl, wc036
add hl, bc
bit 0, [hl]
jr nz, Music1f_unknownsfx0x10 ; no
@@ -572,7 +572,7 @@
call Music1f_notelength ; yes
ld d, a
ld b, $0
- ld hl, $c03e
+ ld hl, wc03e
add hl, bc
ld a, [hl]
or d
@@ -611,7 +611,7 @@
cp $10 ; is this command an unknownsfx0x10?
jr nz, Music1f_note ; no
ld b, $0
- ld hl, $c036
+ ld hl, wc036
add hl, bc
bit 0, [hl]
jr nz, Music1f_note ; no
@@ -646,7 +646,7 @@
call Music1f_GetNextMusicByte ; get dnote instrument
asm_7d571
ld d, a
- ld a, [$c003]
+ ld a, [wc003]
and a
jr nz, .asm_7d57c
ld a, d
@@ -663,7 +663,7 @@
ld b, $0
ld e, a ; store note length (in 16ths)
ld d, b
- ld hl, $c0c6
+ ld hl, wc0c6
add hl, bc
ld a, [hl]
ld l, b
@@ -671,9 +671,9 @@
ld a, c
cp CH4
jr nc, .sfxChannel
- ld a, [$c0e8]
+ ld a, [wc0e8]
ld d, a
- ld a, [$c0e9]
+ ld a, [wc0e9]
ld e, a
jr .skip
.sfxChannel
@@ -682,31 +682,31 @@
cp CH7
jr z, .skip ; if noise channel
call Func_7d707
- ld a, [$c0ea]
+ ld a, [wc0ea]
ld d, a
- ld a, [$c0eb]
+ ld a, [wc0eb]
ld e, a
.skip
ld a, l
ld b, $0
- ld hl, $c0ce
+ ld hl, wc0ce
add hl, bc
ld l, [hl]
call Func_7d8bb
ld e, l
ld d, h
- ld hl, $c0ce
+ ld hl, wc0ce
add hl, bc
ld [hl], e
ld a, d
- ld hl, $c0b6
+ ld hl, wc0b6
add hl, bc
ld [hl], a
- ld hl, $c036
+ ld hl, wc036
add hl, bc
bit 0, [hl]
jr nz, Music1f_notepitch
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 2, [hl]
jr z, Music1f_notepitch
@@ -721,7 +721,7 @@
ld a, c
cp CH4
jr nc, .sfxChannel
- ld hl, $c02a
+ ld hl, wc02a
add hl, bc
ld a, [hl]
and a
@@ -754,12 +754,12 @@
.notRest
swap a
ld b, $0
- ld hl, $c0d6
+ ld hl, wc0d6
add hl, bc
ld b, [hl]
call Func_7d8cc
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 4, [hl]
jr z, .asm_7d62c
@@ -769,7 +769,7 @@
ld a, c
cp CH4
jr nc, .skip ; if sfx Channel
- ld hl, $c02a
+ ld hl, wc02a
ld d, $0
ld e, a
add hl, de
@@ -782,7 +782,7 @@
ret
.skip
ld b, $0
- ld hl, $c0de
+ ld hl, wc0de
add hl, bc
ld d, [hl]
ld b, $2
@@ -792,7 +792,7 @@
call Func_7d66c
pop de
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 0, [hl]
jr z, .asm_7d663
@@ -800,7 +800,7 @@
jr nc, .asm_7d663
inc d
.asm_7d663
- ld hl, $c066
+ ld hl, wc066
add hl, bc
ld [hl], e
call Func_7d6bf
@@ -818,13 +818,13 @@
jr z, .sfxNoiseChannel
cp CH4
jr nc, .skip ; if sfx channel
- ld hl, $c02a
+ ld hl, wc02a
add hl, bc
ld a, [hl]
and a
jr nz, .skip
.sfxNoiseChannel
- ld a, [$c004]
+ ld a, [wc004]
ld hl, Unknown_7db9b
add hl, bc
and [hl]
@@ -842,7 +842,7 @@
Func_7d69d: ; 7d69d (1f:569d)
ld b, $0
- ld hl, $c0b6
+ ld hl, wc0b6
add hl, bc
ld d, [hl]
ld a, c
@@ -853,7 +853,7 @@
ld a, d
and $3f
ld d, a
- ld hl, $c03e
+ ld hl, wc03e
add hl, bc
ld a, [hl]
or d
@@ -873,10 +873,10 @@
; fall through
.channel3
push de
- ld de, $c0e6
+ ld de, wc0e6
cp CH2
jr z, .musicChannel3
- ld de, $c0e7
+ ld de, wc0e7
.musicChannel3
ld a, [de]
add a
@@ -919,20 +919,20 @@
call Func_7d759
jr nc, .asm_7d71f
ld d, $0
- ld a, [$c0f2]
+ ld a, [wc0f2]
add $80
jr nc, .asm_7d716
inc d
.asm_7d716
- ld [$c0eb], a
+ ld [wc0eb], a
ld a, d
- ld [$c0ea], a
+ ld [wc0ea], a
jr .asm_7d728
.asm_7d71f
xor a
- ld [$c0eb], a
+ ld [wc0eb], a
ld a, $1
- ld [$c0ea], a
+ ld [wc0ea], a
.asm_7d728
ret
@@ -939,7 +939,7 @@
Func_7d729: ; 7d729 (1f:5729)
call Func_7d759
jr nc, .asm_7d73a
- ld a, [$c0f1]
+ ld a, [wc0f1]
add e
jr nc, .asm_7d735
inc d
@@ -955,7 +955,7 @@
Func_7d73b: ; 7d73b (1f:573b)
call Func_7d759
jr nc, .asm_7d756
- ld hl, $c006
+ ld hl, wc006
ld e, c
ld d, $0
sla e
@@ -976,7 +976,7 @@
ret
Func_7d759: ; 7d759 (1f:5759)
- ld a, [$c02a]
+ ld a, [wc02a]
cp $14
jr nc, .asm_7d762
jr .asm_7d768
@@ -993,17 +993,17 @@
ret
Music1f_ApplyPitchBend: ; 7d76d (1f:576d)
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
bit 5, [hl]
jp nz, .asm_7d7b4
- ld hl, $c09e
+ ld hl, wc09e
add hl, bc
ld e, [hl]
- ld hl, $c096
+ ld hl, wc096
add hl, bc
ld d, [hl]
- ld hl, $c07e
+ ld hl, wc07e
add hl, bc
ld l, [hl]
ld h, b
@@ -1010,10 +1010,10 @@
add hl, de
ld d, h
ld e, l
- ld hl, $c08e
+ ld hl, wc08e
add hl, bc
push hl
- ld hl, $c086
+ ld hl, wc086
add hl, bc
ld a, [hl]
pop hl
@@ -1025,13 +1025,13 @@
ld a, $0
adc d
ld d, a
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, bc
ld a, [hl]
cp d
jp c, .asm_7d7fa
jr nz, .asm_7d7e7
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, bc
ld a, [hl]
cp e
@@ -1038,13 +1038,13 @@
jp c, .asm_7d7fa
jr .asm_7d7e7
.asm_7d7b4
- ld hl, $c09e
+ ld hl, wc09e
add hl, bc
ld a, [hl]
- ld hl, $c096
+ ld hl, wc096
add hl, bc
ld d, [hl]
- ld hl, $c07e
+ ld hl, wc07e
add hl, bc
ld e, [hl]
sub e
@@ -1052,7 +1052,7 @@
ld a, d
sbc b
ld d, a
- ld hl, $c086
+ ld hl, wc086
add hl, bc
ld a, [hl]
add a
@@ -1063,22 +1063,22 @@
ld a, d
sbc b
ld d, a
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, bc
ld a, d
cp [hl]
jr c, .asm_7d7fa
jr nz, .asm_7d7e7
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, bc
ld a, e
cp [hl]
jr c, .asm_7d7fa
.asm_7d7e7
- ld hl, $c09e
+ ld hl, wc09e
add hl, bc
ld [hl], e
- ld hl, $c096
+ ld hl, wc096
add hl, bc
ld [hl], d
ld b, $3
@@ -1088,7 +1088,7 @@
ld [hl], d
ret
.asm_7d7fa
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
res 4, [hl]
res 5, [hl]
@@ -1095,16 +1095,16 @@
ret
Func_7d803: ; 7d803 (1f:5803)
- ld hl, $c096
+ ld hl, wc096
add hl, bc
ld [hl], d
- ld hl, $c09e
+ ld hl, wc09e
add hl, bc
ld [hl], e
- ld hl, $c0b6
+ ld hl, wc0b6
add hl, bc
ld a, [hl]
- ld hl, $c076
+ ld hl, wc076
add hl, bc
sub [hl]
jr nc, .asm_7d81b
@@ -1111,7 +1111,7 @@
ld a, $1
.asm_7d81b
ld [hl], a
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, bc
ld a, e
sub [hl]
@@ -1118,24 +1118,24 @@
ld e, a
ld a, d
sbc b
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, bc
sub [hl]
jr c, .asm_7d837
ld d, a
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
set 5, [hl]
jr .asm_7d85a
.asm_7d837
- ld hl, $c096
+ ld hl, wc096
add hl, bc
ld d, [hl]
- ld hl, $c09e
+ ld hl, wc09e
add hl, bc
ld e, [hl]
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, bc
ld a, [hl]
sub e
@@ -1143,17 +1143,17 @@
ld a, d
sbc b
ld d, a
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, bc
ld a, [hl]
sub d
ld d, a
ld b, $0
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
res 5, [hl]
.asm_7d85a
- ld hl, $c076
+ ld hl, wc076
add hl, bc
.asm_7d85e
inc b
@@ -1172,13 +1172,13 @@
add [hl]
ld d, b
ld b, $0
- ld hl, $c07e
+ ld hl, wc07e
add hl, bc
ld [hl], d
- ld hl, $c086
+ ld hl, wc086
add hl, bc
ld [hl], a
- ld hl, $c08e
+ ld hl, wc08e
add hl, bc
ld [hl], a
ret
@@ -1185,7 +1185,7 @@
Music1f_ApplyDutyCycle: ; 7d881 (1f:5881)
ld b, $0
- ld hl, $c046
+ ld hl, wc046
add hl, bc
ld a, [hl]
rlca
@@ -1206,7 +1206,7 @@
ld a, c
add a
ld e, a
- ld hl, $c006
+ ld hl, wc006
add hl, de
ld a, [hli]
ld e, a
@@ -1274,7 +1274,7 @@
ret
Func_7d8ea:: ; 7d8ea (1f:58ea)
- ld [$c001], a
+ ld [wc001], a
cp $ff
jp z, Func_7daa8
cp $c2
@@ -1285,63 +1285,63 @@
jp nc, Func_7d9c2
.asm_7d901
xor a
- ld [$c000], a
- ld [$c003], a
- ld [$c0e9], a
- ld [$c0e6], a
- ld [$c0e7], a
+ ld [wc000], a
+ ld [wc003], a
+ ld [wc0e9], a
+ ld [wc0e6], a
+ ld [wc0e7], a
ld d, $8
- ld hl, $c016
+ ld hl, wc016
call FillMusicRAM1f
- ld hl, $c006
+ ld hl, wc006
call FillMusicRAM1f
ld d, $4
- ld hl, $c026
+ ld hl, wc026
call FillMusicRAM1f
- ld hl, $c02e
+ ld hl, wc02e
call FillMusicRAM1f
- ld hl, $c03e
+ ld hl, wc03e
call FillMusicRAM1f
- ld hl, $c046
+ ld hl, wc046
call FillMusicRAM1f
- ld hl, $c04e
+ ld hl, wc04e
call FillMusicRAM1f
- ld hl, $c056
+ ld hl, wc056
call FillMusicRAM1f
- ld hl, $c05e
+ ld hl, wc05e
call FillMusicRAM1f
- ld hl, $c066
+ ld hl, wc066
call FillMusicRAM1f
- ld hl, $c06e
+ ld hl, wc06e
call FillMusicRAM1f
- ld hl, $c036
+ ld hl, wc036
call FillMusicRAM1f
- ld hl, $c076
+ ld hl, wc076
call FillMusicRAM1f
- ld hl, $c07e
+ ld hl, wc07e
call FillMusicRAM1f
- ld hl, $c086
+ ld hl, wc086
call FillMusicRAM1f
- ld hl, $c08e
+ ld hl, wc08e
call FillMusicRAM1f
- ld hl, $c096
+ ld hl, wc096
call FillMusicRAM1f
- ld hl, $c09e
+ ld hl, wc09e
call FillMusicRAM1f
- ld hl, $c0a6
+ ld hl, wc0a6
call FillMusicRAM1f
- ld hl, $c0ae
+ ld hl, wc0ae
call FillMusicRAM1f
ld a, $1
- ld hl, $c0be
+ ld hl, wc0be
call FillMusicRAM1f
- ld hl, $c0b6
+ ld hl, wc0b6
call FillMusicRAM1f
- ld hl, $c0c6
+ ld hl, wc0c6
call FillMusicRAM1f
- ld [$c0e8], a
+ ld [wc0e8], a
ld a, $ff
- ld [$c004], a
+ ld [wc004], a
xor a
ld [$ff24], a
ld a, $8
@@ -1366,9 +1366,9 @@
ld de, SFX_Headers_1f
add hl, de
ld a, h
- ld [$c0ec], a
+ ld [wc0ec], a
ld a, l
- ld [$c0ed], a
+ ld [wc0ed], a
ld a, [hl]
and $c0
rlca
@@ -1381,9 +1381,9 @@
add c
ld c, a
ld b, $0
- ld a, [$c0ec]
+ ld a, [wc0ec]
ld h, a
- ld a, [$c0ed]
+ ld a, [wc0ed]
ld l, a
add hl, bc
ld c, d
@@ -1391,7 +1391,7 @@
and $f
ld e, a
ld d, $0
- ld hl, $c026
+ ld hl, wc026
add hl, de
ld a, [hl]
and a
@@ -1399,7 +1399,7 @@
ld a, e
cp $7
jr nz, .asm_7da0e
- ld a, [$c001]
+ ld a, [wc001]
cp $14
jr nc, .asm_7da07
ret
@@ -1409,7 +1409,7 @@
jr z, .asm_7da17
jr c, .asm_7da17
.asm_7da0e
- ld a, [$c001]
+ ld a, [wc001]
cp [hl]
jr z, .asm_7da17
jr c, .asm_7da17
@@ -1422,77 +1422,77 @@
add hl, hl
ld d, h
ld e, l
- ld hl, $c016
+ ld hl, wc016
add hl, de
ld [hli], a
ld [hl], a
- ld hl, $c006
+ ld hl, wc006
add hl, de
ld [hli], a
ld [hl], a
pop de
- ld hl, $c026
+ ld hl, wc026
add hl, de
ld [hl], a
- ld hl, $c02e
+ ld hl, wc02e
add hl, de
ld [hl], a
- ld hl, $c03e
+ ld hl, wc03e
add hl, de
ld [hl], a
- ld hl, $c046
+ ld hl, wc046
add hl, de
ld [hl], a
- ld hl, $c04e
+ ld hl, wc04e
add hl, de
ld [hl], a
- ld hl, $c056
+ ld hl, wc056
add hl, de
ld [hl], a
- ld hl, $c05e
+ ld hl, wc05e
add hl, de
ld [hl], a
- ld hl, $c066
+ ld hl, wc066
add hl, de
ld [hl], a
- ld hl, $c06e
+ ld hl, wc06e
add hl, de
ld [hl], a
- ld hl, $c076
+ ld hl, wc076
add hl, de
ld [hl], a
- ld hl, $c07e
+ ld hl, wc07e
add hl, de
ld [hl], a
- ld hl, $c086
+ ld hl, wc086
add hl, de
ld [hl], a
- ld hl, $c08e
+ ld hl, wc08e
add hl, de
ld [hl], a
- ld hl, $c096
+ ld hl, wc096
add hl, de
ld [hl], a
- ld hl, $c09e
+ ld hl, wc09e
add hl, de
ld [hl], a
- ld hl, $c0a6
+ ld hl, wc0a6
add hl, de
ld [hl], a
- ld hl, $c0ae
+ ld hl, wc0ae
add hl, de
ld [hl], a
- ld hl, $c036
+ ld hl, wc036
add hl, de
ld [hl], a
ld a, $1
- ld hl, $c0be
+ ld hl, wc0be
add hl, de
ld [hl], a
- ld hl, $c0b6
+ ld hl, wc0b6
add hl, de
ld [hl], a
- ld hl, $c0c6
+ ld hl, wc0c6
add hl, de
ld [hl], a
ld a, e
@@ -1526,24 +1526,24 @@
ld a, $77
ld [$ff24], a
xor a
- ld [$c000], a
- ld [$c003], a
- ld [$c002], a
- ld [$c0e9], a
- ld [$c0eb], a
- ld [$c0e6], a
- ld [$c0e7], a
+ ld [wc000], a
+ ld [wc003], a
+ ld [wc002], a
+ ld [wc0e9], a
+ ld [wc0eb], a
+ ld [wc0e6], a
+ ld [wc0e7], a
ld d, $a0
- ld hl, $c006
+ ld hl, wc006
call FillMusicRAM1f
ld a, $1
ld d, $18
- ld hl, $c0b6
+ ld hl, wc0b6
call FillMusicRAM1f
- ld [$c0e8], a
- ld [$c0ea], a
+ ld [wc0e8], a
+ ld [wc0ea], a
ld a, $ff
- ld [$c004], a
+ ld [wc004], a
ret
; fills d bytes at hl with a
@@ -1556,7 +1556,7 @@
ret
Func_7db03: ; 7db03 (1f:5b03)
- ld a, [$c001]
+ ld a, [wc001]
ld l, a
ld e, a
ld h, $0
@@ -1567,7 +1567,7 @@
add hl, de
ld e, l
ld d, h
- ld hl, $c006
+ ld hl, wc006
ld a, [de] ; get channel number
ld b, a
rlca
@@ -1593,14 +1593,14 @@
push af
ld b, $0
ld c, a
- ld hl, $c026
+ ld hl, wc026
add hl, bc
- ld a, [$c001]
+ ld a, [wc001]
ld [hl], a
pop af
cp $3
jr c, .asm_7db46
- ld hl, $c02e
+ ld hl, wc02e
add hl, bc
set 2, [hl]
.asm_7db46
@@ -1619,32 +1619,32 @@
ld a, [de]
inc de
jr nz, .asm_7db25
- ld a, [$c001]
+ ld a, [wc001]
cp $14
jr nc, .asm_7db5f
jr .asm_7db89
.asm_7db5f
- ld a, [$c001]
+ ld a, [wc001]
cp $86
jr z, .asm_7db89
jr c, .asm_7db6a
jr .asm_7db89
.asm_7db6a
- ld hl, $c02a
+ ld hl, wc02a
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
- ld hl, $c012 ; sfx noise channel pointer
+ ld hl, wc012 ; sfx noise channel pointer
ld de, Noise1f_endchannel
ld [hl], e
inc hl
ld [hl], d ; overwrite pointer to point to endchannel
- ld a, [$c005]
+ ld a, [wc005]
and a
jr nz, .asm_7db89
ld a, [$ff24]
- ld [$c005], a
+ ld [wc005], a
ld a, $77
ld [$ff24], a
.asm_7db89
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -1,10 +1,14 @@
SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile)
+; Overload W_GRASSMONS
+wd893 EQU $d893 ; W_GRASSMONS + 11
+wd896 EQU $d896 ; W_GRASSMONS + 14
+
; Overload enemy party data
-W_WATERRATE EQU $d8a4
-W_WATERMONS EQU $d8a5
+W_WATERRATE EQU $d8a4 ; wEnemyMon1Species
+W_WATERMONS EQU $d8a5 ; wEnemyMon1Species + 1
; Overload enemy stat modifiers
-wTradeMonNick EQU $cd1e
+wTradeMonNick EQU $cd1e ; wPlayerMonAccuracyMod
--- a/data/hide_show_data.asm
+++ b/data/hide_show_data.asm
@@ -263,7 +263,7 @@
; a) Map_ID = $FF
; b) Map_ID ≠ currentMapID
;
-; This Data is loaded into RAM at $D5CE-$D5F?. (W_MISSABLEOBJECTLIST)
+; This Data is loaded into RAM at wd5ce-$D5F?. (W_MISSABLEOBJECTLIST)
; These constants come from the bytes for Predef functions:
Hide equ $11
--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -16,7 +16,7 @@
call FillMemory
ld hl, wTileMap
call Func_7417b
- FuncCoord 0, 14 ; $c4b8
+ FuncCoord 0, 14
ld hl, Coord
call Func_7417b
ld a, $c0
@@ -30,8 +30,8 @@
ld c, $80
call DelayFrames
xor a
- ld [wWhichTrade], a ; $cd3d
- ld [$cd3e], a
+ ld [wWhichTrade], a ; wWhichTrade
+ ld [wTrainerEngageDistance], a
jp Credits
Func_740ba: ; 740ba (1d:40ba)
@@ -53,7 +53,7 @@
call FillMiddleOfScreenWithWhite
; display the next monster from CreditsMons
- ld hl,$CD3E
+ ld hl,wTrainerEngageDistance
ld c,[hl] ; how many monsters have we displayed so far?
inc [hl]
ld b,0
@@ -60,9 +60,9 @@
ld hl,CreditsMons
add hl,bc ; go that far in the list of monsters and get the next one
ld a,[hl]
- ld [$CF91],a
- ld [$D0B5],a
- FuncCoord 8, 6 ; $c420
+ ld [wcf91],a
+ ld [wd0b5],a
+ FuncCoord 8, 6
ld hl,Coord
call GetMonHeader
call LoadFrontSpriteByMonIndex
@@ -153,7 +153,7 @@
jp FillMemory
FillMiddleOfScreenWithWhite: ; 74183 (1d:4183)
- FuncCoord 0, 4 ; $c3f0
+ FuncCoord 0, 4
ld hl, Coord
ld bc, $c8 ; 10 rows of 20 tiles each
ld a, $7f ; blank white tile
@@ -164,7 +164,7 @@
push de
.asm_74192
pop de
- FuncCoord 9, 6 ; $c421
+ FuncCoord 9, 6
ld hl, Coord
push hl
call FillMiddleOfScreenWithWhite
@@ -241,11 +241,11 @@
ld hl, $9600
ld bc, (BANK(TheEndGfx) << 8) + $0a
call CopyVideoData
- FuncCoord 4, 8 ; $c444
+ FuncCoord 4, 8
ld hl, Coord
ld de, UnnamedText_74229 ; $4229
call PlaceString
- FuncCoord 4, 9 ; $c458
+ FuncCoord 4, 9
ld hl, Coord
inc de
call PlaceString
--- a/engine/battle/1.asm
+++ b/engine/battle/1.asm
@@ -1,5 +1,5 @@
DrainHPEffect_: ; 783f (1:783f)
- ld hl, W_DAMAGE ; $d0d7
+ ld hl, W_DAMAGE ; W_DAMAGE
ld a, [hl]
srl a ; divide damage by 2
ld [hli], a
@@ -11,13 +11,13 @@
inc hl
inc [hl]
.asm_784f
- ld hl, W_PLAYERMONCURHP ; $d015
- ld de, W_PLAYERMONMAXHP ; $d023
+ ld hl, W_PLAYERMONCURHP ; wd015
+ ld de, W_PLAYERMONMAXHP ; wd023
ld a, [H_WHOSETURN] ; $fff3
and a
jp z, Func_7861
- ld hl, W_ENEMYMONCURHP ; $cfe6
- ld de, W_ENEMYMONMAXHP ; $cff4
+ ld hl, W_ENEMYMONCURHP ; W_ENEMYMONCURHP
+ ld de, W_ENEMYMONMAXHP ; W_ENEMYMONMAXHP
Func_7861: ; 7861 (1:7861)
ld bc, wHPBarOldHP+1
@@ -33,12 +33,12 @@
ld a, [de]
dec bc
ld [bc], a
- ld a, [$d0d8]
+ ld a, [wd0d8]
ld b, [hl]
add b
ld [hld], a
ld [wHPBarNewHP], a
- ld a, [W_DAMAGE] ; $d0d7
+ ld a, [W_DAMAGE] ; W_DAMAGE
ld b, [hl]
adc b
ld [hli], a
@@ -67,15 +67,15 @@
.asm_789c
ld a, [H_WHOSETURN] ; $fff3
and a
- FuncCoord 10, 9 ; $c45e
+ FuncCoord 10, 9
ld hl, Coord
ld a, $1
jr z, .asm_78aa
- FuncCoord 2, 2 ; $c3ca
+ FuncCoord 2, 2
ld hl, Coord
xor a
.asm_78aa
- ld [wListMenuID], a ; $cf94
+ ld [wListMenuID], a ; wListMenuID
ld a, $48
call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d))
ld a, $0
@@ -86,9 +86,9 @@
ld hl, SuckedHealthText ; $78dc
ld a, [H_WHOSETURN] ; $fff3
and a
- ld a, [W_PLAYERMOVEEFFECT] ; $cfd3
+ ld a, [W_PLAYERMOVEEFFECT] ; wcfd3
jr z, .asm_78d2
- ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
+ ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT
.asm_78d2
cp DREAM_EATER_EFFECT
jr nz, .asm_78d9
--- a/engine/battle/14.asm
+++ b/engine/battle/14.asm
@@ -1,25 +1,25 @@
Func_525af: ; 525af (14:65af)
ld a, [$ffd7]
- ld [$d0d4], a
+ ld [wd0d4], a
xor a
- ld [$cd6a], a
- ld [$cf0b], a
- ld hl, $cc2b
+ ld [wcd6a], a
+ ld [wcf0b], a
+ ld hl, wcc2b
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
- ld [wListScrollOffset], a ; $cc36
- ld [$d05e], a
+ ld [wListScrollOffset], a ; wcc36
+ ld [wd05e], a
ld [W_PLAYERMONID], a
ld [W_PLAYERMONSALIVEFLAGS], a
- ld [wPlayerMonNumber], a ; $cc2f
- ld [$d078], a
- ld [$d35d], a
- ld hl, $cf1d
+ ld [wPlayerMonNumber], a ; wPlayerMonNumber
+ ld [wd078], a
+ ld [wd35d], a
+ ld hl, wcf1d
ld [hli], a
ld [hl], a
- ld hl, $ccd3
+ ld hl, wccd3
ld b, $3c
.asm_525e1
ld [hli], a
@@ -26,14 +26,14 @@
dec b
jr nz, .asm_525e1
inc a
- ld [$ccd9], a
- ld a, [W_CURMAP] ; $d35e
+ ld [wccd9], a
+ ld a, [W_CURMAP] ; W_CURMAP
cp SAFARI_ZONE_EAST
jr c, .asm_525f9
cp SAFARI_ZONE_REST_HOUSE_1
jr nc, .asm_525f9
ld a, $2
- ld [W_BATTLETYPE], a ; $d05a
+ ld [W_BATTLETYPE], a ; wd05a
.asm_525f9
ld hl, PlayBattleMusic
ld b, BANK(PlayBattleMusic)
@@ -40,13 +40,13 @@
jp Bankswitch
ParalyzeEffect_: ; 52601 (14:6601)
- ld hl, W_ENEMYMONSTATUS ; $cfe9
- ld de, W_PLAYERMOVETYPE ; $cfd5
+ ld hl, W_ENEMYMONSTATUS ; wcfe9
+ ld de, W_PLAYERMOVETYPE ; wcfd5
ld a, [H_WHOSETURN] ; $fff3
and a
jp z, .asm_52613
- ld hl, W_PLAYERMONSTATUS ; $d018
- ld de, W_ENEMYMOVETYPE ; $cfcf
+ ld hl, W_PLAYERMONSTATUS ; W_PLAYERMONSTATUS
+ ld de, W_ENEMYMOVETYPE ; wcfcf
.asm_52613
ld a, [hl]
@@ -69,7 +69,7 @@
push hl
callab MoveHitTest
pop hl
- ld a, [W_MOVEMISSED] ; $d05f
+ ld a, [W_MOVEMISSED] ; W_MOVEMISSED
and a
jr nz, .asm_52659
set 6, [hl]
--- a/engine/battle/15.asm
+++ b/engine/battle/15.asm
@@ -1,11 +1,11 @@
GainExperience: ; 5524f (15:524f)
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
ret z
call Func_5546c
- ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA)
+ ld hl, W_PARTYMON1_NUM ; W_PARTYMON1_NUM (aliases: W_PARTYMON1DATA)
xor a
- ld [wWhichPokemon], a ; $cf92
+ ld [wWhichPokemon], a ; wWhichPokemon
Func_5525f: ; 5525f (15:525f)
inc hl
@@ -14,7 +14,7 @@
jp z, Func_55436
push hl
ld hl, W_PLAYERMONSALIVEFLAGS
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
ld c, a
ld b, $2
ld a, $10 ; FlagActionPredef
@@ -27,7 +27,7 @@
add hl, de
ld d, h
ld e, l
- ld hl, $d002
+ ld hl, wd002
ld c, $5
.asm_55285
ld a, [hli]
@@ -58,9 +58,9 @@
xor a
ld [H_NUMTOPRINT], a ; $ff96 (aliases: H_MULTIPLICAND)
ld [$ff97], a
- ld a, [$d008]
+ ld a, [wd008]
ld [$ff98], a
- ld a, [W_ENEMYMONLEVEL] ; $cff3
+ ld a, [W_ENEMYMONLEVEL] ; W_ENEMYMONLEVEL
ld [H_REMAINDER], a ; $ff99 (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN)
call Multiply
ld a, $7
@@ -71,11 +71,11 @@
add hl, de
ld b, [hl]
inc hl
- ld a, [wPlayerID] ; $d359
+ ld a, [wPlayerID] ; wPlayerID
cp b
jr nz, .asm_552d1
ld b, [hl]
- ld a, [wPlayerID + 1] ; $d35a
+ ld a, [wPlayerID + 1] ; wd35a
cp b
ld a, $0
jr z, .asm_552d6
@@ -83,8 +83,8 @@
call Func_5549f
ld a, $1
.asm_552d6
- ld [$cf4d], a
- ld a, [W_ISINBATTLE] ; $d057
+ ld [wcf4d], a
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
dec a
call nz, Func_5549f
inc hl
@@ -92,12 +92,12 @@
inc hl
ld b, [hl]
ld a, [$ff98]
- ld [$cf4c], a
+ ld [wcf4c], a
add b
ld [hld], a
ld b, [hl]
ld a, [$ff97]
- ld [$cf4b], a
+ ld [wcf4b], a
adc b
ld [hl], a
jr nc, .asm_552f8
@@ -107,13 +107,13 @@
.asm_552f8
inc hl
push hl
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
ld c, a
ld b, $0
- ld hl, W_PARTYMON1 ; $d164
+ ld hl, W_PARTYMON1 ; W_PARTYMON1
add hl, bc
ld a, [hl]
- ld [$d0b5], a
+ ld [wd0b5], a
call GetMonHeader
ld d, $64
callab CalcExperience
@@ -140,13 +140,13 @@
dec hl
.asm_5532e
push hl
- ld a, [wWhichPokemon] ; $cf92
- ld hl, W_PARTYMON1NAME ; $d2b5
+ ld a, [wWhichPokemon] ; wWhichPokemon
+ ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
call GetPartyMonName
ld hl, GainedText
call PrintText
xor a
- ld [$cc49], a
+ ld [wcc49], a
call LoadMonData
pop hl
ld bc, $13
@@ -157,17 +157,17 @@
ld a, [hl]
cp d
jp z, Func_55436
- ld a, [W_CURENEMYLVL] ; $d127
+ ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL
push af
push hl
ld a, d
- ld [W_CURENEMYLVL], a ; $d127
+ ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
ld [hl], a
ld bc, $ffdf
add hl, bc
ld a, [hl]
- ld [$d0b5], a
- ld [$d11e], a
+ ld [wd0b5], a
+ ld [wd11e], a
call GetMonHeader
ld bc, $23
add hl, bc
@@ -198,12 +198,12 @@
ld a, [hl]
adc b
ld [hl], a
- ld a, [wPlayerMonNumber] ; $cc2f
+ ld a, [wPlayerMonNumber] ; wPlayerMonNumber
ld b, a
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
cp b
jr nz, .asm_553f7
- ld de, W_PLAYERMONCURHP ; $d015
+ ld de, W_PLAYERMONCURHP ; wd015
ld a, [hli]
ld [de], a
inc de
@@ -212,19 +212,19 @@
ld bc, $1f
add hl, bc
push hl
- ld de, W_PLAYERMONLEVEL ; $d022
+ ld de, W_PLAYERMONLEVEL ; W_PLAYERMONLEVEL
ld bc, $b
call CopyData
pop hl
- ld a, [W_PLAYERBATTSTATUS3] ; $d064
+ ld a, [W_PLAYERBATTSTATUS3] ; W_PLAYERBATTSTATUS3
bit 3, a
jr nz, .asm_553c8
- ld de, $cd0f
+ ld de, wcd0f
ld bc, $b
call CopyData
.asm_553c8
xor a
- ld [$d11e], a
+ ld [wd11e], a
callab Func_3ed99
callab Func_3ed1a
callab Func_3ee19
@@ -235,7 +235,7 @@
ld hl, GrewLevelText
call PrintText
xor a
- ld [$cc49], a
+ ld [wcc49], a
call LoadMonData
ld d, $1
callab PrintStatsBox
@@ -242,13 +242,13 @@
call WaitForTextScrollButtonPress
call LoadScreenTilesFromBuffer1
xor a
- ld [$cc49], a
- ld a, [$d0b5]
- ld [$d11e], a
+ ld [wcc49], a
+ ld a, [wd0b5]
+ ld [wd11e], a
ld a, $1a
call Predef ; indirect jump to Func_3af5b (3af5b (e:6f5b))
- ld hl, $ccd3
- ld a, [wWhichPokemon] ; $cf92
+ ld hl, wccd3
+ ld a, [wWhichPokemon] ; wWhichPokemon
ld c, a
ld b, $1
ld a, $10 ; FlagActionPredef
@@ -255,18 +255,18 @@
call Predef
pop hl
pop af
- ld [W_CURENEMYLVL], a ; $d127
+ ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
Func_55436: ; 55436 (15:5436)
- ld a, [W_NUMINPARTY] ; $d163
+ ld a, [W_NUMINPARTY] ; W_NUMINPARTY
ld b, a
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
inc a
cp b
jr z, .asm_55450
- ld [wWhichPokemon], a ; $cf92
+ ld [wWhichPokemon], a ; wWhichPokemon
ld bc, $2c
- ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA)
+ ld hl, W_PARTYMON1_NUM ; W_PARTYMON1_NUM (aliases: W_PARTYMON1DATA)
call AddNTimes
jp Func_5525f
.asm_55450
@@ -273,13 +273,13 @@
ld hl, W_PLAYERMONSALIVEFLAGS
xor a
ld [hl], a
- ld a, [wPlayerMonNumber] ; $cc2f
+ ld a, [wPlayerMonNumber] ; wPlayerMonNumber
ld c, a
ld b, $1
push bc
ld a, $10 ; FlagActionPredef
call Predef
- ld hl, $ccf5
+ ld hl, wccf5
xor a
ld [hl], a
pop bc
@@ -301,8 +301,8 @@
jr nz, .asm_55475
cp $2
ret c
- ld [$d11e], a
- ld hl, $d002
+ ld [wd11e], a
+ ld hl, wd002
ld c, $7
.asm_55488
xor a
@@ -309,7 +309,7 @@
ld [H_DIVIDEND], a ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT)
ld a, [hl]
ld [H_NUMTOPRINT], a ; $ff96 (aliases: H_MULTIPLICAND)
- ld a, [$d11e]
+ ld a, [wd11e]
ld [H_REMAINDER], a ; $ff99 (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN)
ld b, $2
call Divide
@@ -336,12 +336,12 @@
GainedText: ; 554b2 (15:54b2)
TX_FAR _GainedText
db $08 ; asm
- ld a, [$cc5b]
+ ld a, [wcc5b]
ld hl, WithExpAllText
and a
ret nz
ld hl, ExpPointsText
- ld a, [$cf4d]
+ ld a, [wcf4d]
and a
ret z
ld hl, BoostedText
--- a/engine/battle/16.asm
+++ b/engine/battle/16.asm
@@ -1,8 +1,8 @@
PrintBeginningBattleText: ; 58d99 (16:4d99)
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
dec a
jr nz, .trainerBattle
- ld a, [W_CURMAP] ; $d35e
+ ld a, [W_CURMAP] ; W_CURMAP
cp POKEMONTOWER_3
jr c, .notPokemonTower
cp LAVENDER_HOUSE_1
@@ -11,7 +11,7 @@
ld a, [W_ENEMYMONID]
call PlayCry
ld hl, WildMonAppearedText
- ld a, [W_MOVEMISSED] ; $d05f
+ ld a, [W_MOVEMISSED] ; W_MOVEMISSED
and a
jr z, .notFishing
ld hl, HookedMonAttackedText
@@ -32,7 +32,7 @@
ld b, SILPH_SCOPE
call IsItemInBag
ld a, [W_ENEMYMONID]
- ld [$cf91], a
+ ld [wcf91], a
cp MAROWAK
jr z, .isMarowak
ld a, b
@@ -61,9 +61,9 @@
.playSFX
xor a
- ld [$c0f1], a
+ ld [wc0f1], a
ld a, $80
- ld [$c0f2], a
+ ld [wc0f2], a
ld a, (SFX_08_77 - SFX_Headers_08) / 3
call PlaySound
jp WaitForSoundToFinish
@@ -95,7 +95,7 @@
db "@"
SendOutMon: ; 58e59 (16:4e59)
- ld hl, W_ENEMYMONCURHP ; $cfe6
+ ld hl, W_ENEMYMONCURHP ; W_ENEMYMONCURHP
ld a, [hli]
or [hl]
ld hl, GoText
@@ -102,17 +102,17 @@
jr z, .printText
xor a
ld [H_NUMTOPRINT], a ; $ff96 (aliases: H_MULTIPLICAND)
- ld hl, W_ENEMYMONCURHP ; $cfe6
+ ld hl, W_ENEMYMONCURHP ; W_ENEMYMONCURHP
ld a, [hli]
- ld [$cce3], a
+ ld [wcce3], a
ld [$ff97], a
ld a, [hl]
- ld [$cce4], a
+ ld [wcce4], a
ld [$ff98], a
ld a, $19
ld [H_REMAINDER], a ; $ff99 (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN)
call Multiply
- ld hl, W_ENEMYMONMAXHP ; $cff4
+ ld hl, W_ENEMYMONMAXHP ; W_ENEMYMONMAXHP
ld a, [hli]
ld b, [hl]
srl a
@@ -173,8 +173,8 @@
db $08 ; asm
push de
push bc
- ld hl, $cfe7
- ld de, $cce4
+ ld hl, W_ENEMYMONCURHP + 1
+ ld de, wcce4
ld b, [hl]
dec hl
ld a, [de]
--- a/engine/battle/1a.asm
+++ b/engine/battle/1a.asm
@@ -11,10 +11,10 @@
ret nz ; if any of these statuses are true, don't decrement PP
bit 6, [hl] ; check 6th bit status flag on W_PLAYERBATTSTATUS2
ret nz ; and return if it is set
- ld hl, $D02D ; PP of first move (in battle)
+ ld hl, W_PLAYERMONPP ; PP of first move (in battle)
call .DecrementPP
- ld a, [$D064] ; load pokemon status bits?
+ ld a, [W_PLAYERBATTSTATUS3] ; load pokemon status bits?
bit 3, a ; XXX transform status?
ret nz ; If it is, return. Pokemon Red stores the "current pokemon's" PP
; separately from the "Pokemon in your party's" PP. This is
@@ -26,12 +26,12 @@
; its opponent, which is *not* the same as its real PP as part of your
; party. So we return, and don't do that part.
- ld hl, $D188 ; PP of first move (in party)
- ld a, [$CC2F] ; which mon in party is active
+ ld hl, W_PARTYMON1_MOVE1PP ; PP of first move (in party)
+ ld a, [wPlayerMonNumber] ; which mon in party is active
ld bc, $2C ; XXX probably size of party pokemon's data structure
call AddNTimes ; calculate address of the mon to modify
.DecrementPP
- ld a, [$CC2E] ; which move (0, 1, 2, 3) did we use?
+ ld a, [wPlayerMoveListIndex] ; which move (0, 1, 2, 3) did we use?
ld c, a
ld b, 0
add hl ,bc ; calculate the address in memory of the PP we need to decrement
--- a/engine/battle/1c.asm
+++ b/engine/battle/1c.asm
@@ -2,7 +2,7 @@
ld a, $e4
ld [rOBP1], a ; $ff49
call Func_7092a
- FuncCoord 12, 0 ; $c3ac
+ FuncCoord 12, 0
ld hl, Coord
ld bc, $707
call ClearScreenArea
@@ -10,7 +10,7 @@
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
ld a, $91
- ld [$cee9], a
+ ld [wHPBarMaxHP], a
ld a, $1
ld [H_WHOSETURN], a ; $fff3
callab Func_79793
@@ -50,15 +50,15 @@
ld bc, $31
call CopyVideoData
ld a, $10
- ld [W_BASECOORDY], a ; $d082
+ ld [W_BASECOORDY], a ; wd082
ld a, $70
- ld [W_BASECOORDX], a ; $d081
+ ld [W_BASECOORDX], a ; wd081
ld hl, wOAMBuffer
ld bc, $606
ld d, $8
.asm_70948
push bc
- ld a, [W_BASECOORDY] ; $d082
+ ld a, [W_BASECOORDY] ; wd082
ld e, a
.asm_7094d
ld a, e
@@ -65,7 +65,7 @@
add $8
ld e, a
ld [hli], a
- ld a, [W_BASECOORDX] ; $d081
+ ld a, [W_BASECOORDX] ; wd081
ld [hli], a
ld a, d
ld [hli], a
@@ -75,9 +75,9 @@
dec c
jr nz, .asm_7094d
inc d
- ld a, [W_BASECOORDX] ; $d081
+ ld a, [W_BASECOORDX] ; wd081
add $8
- ld [W_BASECOORDX], a ; $d081
+ ld [W_BASECOORDX], a ; wd081
pop bc
dec b
jr nz, .asm_70948
@@ -90,9 +90,9 @@
xor a
ld [$ffb0], a
dec a
- ld [$cfcb], a
+ ld [wcfcb], a
call DelayFrame
- ld hl, $c102
+ ld hl, wSpriteStateData1 + 2
ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c
ld c, a
ld b, $0
@@ -106,7 +106,7 @@
add hl, de
dec c
jr nz, .asm_70989
- ld hl, $c310
+ ld hl, wOAMBuffer + $10
ld c, $9
.asm_70998
ld a, b
@@ -128,7 +128,7 @@
call Delay3
call LoadBattleTransitionTile
ld bc, $0
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
jr z, .asm_709c9
call Func_709e2
@@ -154,7 +154,7 @@
dw Func_70bca
Func_709e2: ; 709e2 (1c:49e2)
- ld a, [W_CUROPPONENT] ; $d059
+ ld a, [W_CUROPPONENT] ; wd059
cp $c8
jr nc, .asm_709ec
res 0, c
@@ -164,7 +164,7 @@
ret
Func_709ef: ; 709ef (1c:49ef)
- ld hl, W_PARTYMON1_HP ; $d16c
+ ld hl, W_PARTYMON1_HP ; wd16c
.asm_709f2
ld a, [hli]
or [hl]
@@ -178,21 +178,21 @@
ld a, [hl]
add $3
ld e, a
- ld a, [W_CURENEMYLVL] ; $d127
+ ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL
sub e
jr nc, .asm_70a12
res 1, c
ld a, $1
- ld [$cd47], a
+ ld [wcd47], a
ret
.asm_70a12
set 1, c
xor a
- ld [$cd47], a
+ ld [wcd47], a
ret
Func_70a19: ; 70a19 (1c:4a19)
- ld a, [W_CURMAP] ; $d35e
+ ld a, [W_CURMAP] ; W_CURMAP
ld e, a
ld hl, MapIDList_70a3f ; $4a3f
.asm_70a20
@@ -266,20 +266,20 @@
ret
Func_70a72: ; 70a72 (1c:4a72)
- ld a, [$cd47]
+ ld a, [wcd47]
and a
jr z, .asm_70a7d
call Func_70aaa
jr .asm_70a9f
.asm_70a7d
- FuncCoord 10, 10 ; $c472
+ FuncCoord 10, 10
ld hl, Coord
ld a, $3
- ld [$d09f], a
+ ld [wd09f], a
ld a, l
- ld [$d09b], a
+ ld [wd09b], a
ld a, h
- ld [$d09a], a
+ ld [wd09a], a
ld b, $78
.asm_70a8f
ld c, $3
@@ -295,13 +295,13 @@
.asm_70a9f
call Func_70a69
xor a
- ld [$d09b], a
- ld [$d09a], a
+ ld [wd09b], a
+ ld [wd09a], a
ret
Func_70aaa: ; 70aaa (1c:4aaa)
ld a, $7
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
ld hl, wTileMap
ld c, $11
ld de, $14
@@ -335,13 +335,13 @@
ld [hl], $ff
add hl, de
push bc
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
dec a
jr nz, .asm_70af0
call Func_70d19
ld a, $7
.asm_70af0
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
pop bc
dec c
jr nz, .asm_70ae1
@@ -351,11 +351,11 @@
Func_70af9: ; 70af9 (1c:4af9)
ld bc, $ffec
ld de, $14
- ld a, [$d09b]
+ ld a, [wd09b]
ld l, a
- ld a, [$d09a]
+ ld a, [wd09a]
ld h, a
- ld a, [$d09f]
+ ld a, [wd09f]
cp $0
jr z, .asm_70b25
cp $1
@@ -368,9 +368,9 @@
ld [hl], $ff
.asm_70b1c
ld a, l
- ld [$d09b], a
+ ld [wd09b], a
ld a, h
- ld [$d09a], a
+ ld [wd09a], a
ret
.asm_70b25
dec hl
@@ -406,13 +406,13 @@
jr .asm_70b1a
.asm_70b4d
ld [hl], $ff
- ld a, [$d09f]
+ ld a, [wd09f]
inc a
cp $4
jr nz, .asm_70b58
xor a
.asm_70b58
- ld [$d09f], a
+ ld [wd09f], a
jr .asm_70b1c
Func_70b5d: ; 70b5d (1c:4b5d)
@@ -440,27 +440,27 @@
push bc
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
- FuncCoord 0, 7 ; $c42c
+ FuncCoord 0, 7
ld hl, Coord
- FuncCoord 0, 8 ; $c440
+ FuncCoord 0, 8
ld de, Coord
ld bc, $ffd8
call Func_70c12
- FuncCoord 0, 10 ; $c468
+ FuncCoord 0, 10
ld hl, Coord
- FuncCoord 0, 9 ; $c454
+ FuncCoord 0, 9
ld de, Coord
ld bc, $28
call Func_70c12
- FuncCoord 8, 0 ; $c3a8
+ FuncCoord 8, 0
ld hl, Coord
- FuncCoord 9, 0 ; $c3a9
+ FuncCoord 9, 0
ld de, Coord
ld bc, $fffe
call Func_70c3f
- FuncCoord 11, 0 ; $c3ab
+ FuncCoord 11, 0
ld hl, Coord
- FuncCoord 10, 0 ; $c3aa
+ FuncCoord 10, 0
ld de, Coord
ld bc, $2
call Func_70c3f
@@ -481,24 +481,24 @@
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
.asm_70bcf
push bc
- FuncCoord 0, 16 ; $c4e0
+ FuncCoord 0, 16
ld hl, Coord
- FuncCoord 0, 17 ; $c4f4
+ FuncCoord 0, 17
ld de, Coord
ld bc, $ffd8
call Func_70c12
- FuncCoord 0, 1 ; $c3b4
+ FuncCoord 0, 1
ld hl, Coord
ld de, wTileMap
ld bc, $28
call Func_70c12
- FuncCoord 18, 0 ; $c3b2
+ FuncCoord 18, 0
ld hl, Coord
- FuncCoord 19, 0 ; $c3b3
+ FuncCoord 19, 0
ld de, Coord
ld bc, $fffe
call Func_70c3f
- FuncCoord 1, 0 ; $c3a1
+ FuncCoord 1, 0
ld hl, Coord
ld de, wTileMap
ld bc, $2
@@ -514,9 +514,9 @@
Func_70c12: ; 70c12 (1c:4c12)
ld a, c
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
ld a, b
- ld [$cd3e], a
+ ld [wTrainerEngageDistance], a
ld c, $8
.asm_70c1c
push bc
@@ -526,9 +526,9 @@
call CopyData
pop hl
pop de
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
ld c, a
- ld a, [$cd3e]
+ ld a, [wTrainerEngageDistance]
ld b, a
add hl, bc
pop bc
@@ -546,9 +546,9 @@
Func_70c3f: ; 70c3f (1c:4c3f)
ld a, c
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
ld a, b
- ld [$cd3e], a
+ ld [wTrainerEngageDistance], a
ld c, $9
.asm_70c49
push bc
@@ -574,9 +574,9 @@
jr nz, .asm_70c4e
pop hl
pop de
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
ld c, a
- ld a, [$cd3e]
+ ld a, [wTrainerEngageDistance]
ld b, a
add hl, bc
pop bc
@@ -596,7 +596,7 @@
Func_70c7e: ; 70c7e (1c:4c7e)
ld c, $12
ld hl, wTileMap
- FuncCoord 1, 17 ; $c4f5
+ FuncCoord 1, 17
ld de, Coord
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@@ -635,7 +635,7 @@
Func_70cb4: ; 70cb4 (1c:4cb4)
ld c, $14
ld hl, wTileMap
- FuncCoord 19, 1 ; $c3c7
+ FuncCoord 19, 1
ld de, Coord
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@@ -736,9 +736,9 @@
jp Func_70a69
Func_70d50: ; 70d50 (1c:4d50)
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
ld a, [hli]
- ld [$cd3e], a
+ ld [wTrainerEngageDistance], a
ld a, [hli]
ld e, a
ld a, [hli]
@@ -857,7 +857,7 @@
inc de
.asm_70dc9
ld [hl], $ff
- ld a, [$cd3e]
+ ld a, [wTrainerEngageDistance]
and a
jr z, .asm_70dd4
inc hl
@@ -868,7 +868,7 @@
dec c
jr nz, .asm_70dc9
pop hl
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
and a
ld bc, $14
jr z, .asm_70de5
@@ -883,7 +883,7 @@
jr z, Func_70dc5
ld c, a
.asm_70def
- ld a, [$cd3e]
+ ld a, [wTrainerEngageDistance]
and a
jr z, .asm_70df8
dec hl
--- a/engine/battle/4.asm
+++ b/engine/battle/4.asm
@@ -1,12 +1,12 @@
Func_128d8: ; 128d8 (4:68d8)
- ld a, [W_YCOORD] ; $d361
+ ld a, [W_YCOORD] ; wd361
ld b, a
- ld a, [W_CURMAPHEIGHT] ; $d368
+ ld a, [W_CURMAPHEIGHT] ; wd368
call Func_128ea
ret z
- ld a, [W_XCOORD] ; $d362
+ ld a, [W_XCOORD] ; wd362
ld b, a
- ld a, [W_CURMAPWIDTH] ; $d369
+ ld a, [W_CURMAPWIDTH] ; wd369
Func_128ea: ; 128ea (4:68ea)
add a
@@ -24,11 +24,11 @@
call GetPredefRegisters
ld a, $2
asm_128fb: ; 128fb (4:68fb)
- ld [wListMenuID], a ; $cf94
+ ld [wListMenuID], a ; wListMenuID
push hl
- ld a, [$cf99]
+ ld a, [wcf99]
ld b, a
- ld a, [$cf9a]
+ ld a, [wcf9a]
ld c, a
or b
jr nz, .asm_12913
@@ -39,9 +39,9 @@
ld d, a
jp Func_12924
.asm_12913
- ld a, [$cfba]
+ ld a, [wcfba]
ld d, a
- ld a, [$cfbb]
+ ld a, [wcfbb]
ld e, a
ld a, $26
call Predef ; indirect jump to UpdateHPBar_LoadRegisters (f9dc (3:79dc))
@@ -65,12 +65,12 @@
ld bc, $15
.asm_1293a
add hl, bc
- ld de, $cf99
+ ld de, wcf99
ld bc, $203
call PrintNumber
ld a, "/"
ld [hli], a
- ld de, $cfba
+ ld de, wcfba
ld bc, $203
call PrintNumber
pop hl
--- a/engine/battle/4_2.asm
+++ b/engine/battle/4_2.asm
@@ -1,16 +1,16 @@
Func_137aa: ; 137aa (4:77aa)
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
jr nz, .asm_137eb
- ld a, [W_ENEMYMONNUMBER] ; $cfe8
- ld hl, $d8a8
+ ld a, [W_ENEMYMONNUMBER] ; W_ENEMYMONNUMBER
+ ld hl, wd8a8
ld bc, $2c
call AddNTimes
- ld a, [W_ENEMYMONSTATUS] ; $cfe9
+ ld a, [W_ENEMYMONSTATUS] ; wcfe9
ld [hl], a
call ClearScreen
callab Func_372d6
- ld a, [$cf0b]
+ ld a, [wcf0b]
cp $1
ld de, YouWinText
jr c, .asm_137de
@@ -18,7 +18,7 @@
jr z, .asm_137de
ld de, DrawText
.asm_137de
- FuncCoord 6, 8 ; $c446
+ FuncCoord 6, 8
ld hl, Coord
call PlaceString
ld c, $c8
@@ -25,16 +25,16 @@
call DelayFrames
jr .asm_1380a
.asm_137eb
- ld a, [$cf0b]
+ ld a, [wcf0b]
and a
jr nz, .asm_13813
- ld hl, $cce5
+ ld hl, wcce5
ld a, [hli]
or [hl]
inc hl
or [hl]
jr z, .asm_1380a
- ld de, wPlayerMoney + 2 ; $d349
+ ld de, wPlayerMoney + 2 ; wd349
ld c, $3
ld a, $b ; AddBCDPredef
call Predef
@@ -42,38 +42,38 @@
call PrintText
.asm_1380a
xor a
- ld [$ccd4], a
+ ld [wccd4], a
ld a, $2a
call Predef ; indirect jump to Func_3ad1c (3ad1c (e:6d1c))
.asm_13813
xor a
- ld [$d083], a
- ld [$c02a], a
- ld [W_ISINBATTLE], a ; $d057
- ld [W_BATTLETYPE], a ; $d05a
- ld [W_MOVEMISSED], a ; $d05f
- ld [W_CUROPPONENT], a ; $d059
- ld [$d11f], a
- ld [$d120], a
- ld [$d078], a
- ld hl, $cc2b
+ ld [wd083], a
+ ld [wc02a], a
+ ld [W_ISINBATTLE], a ; W_ISINBATTLE
+ ld [W_BATTLETYPE], a ; wd05a
+ ld [W_MOVEMISSED], a ; W_MOVEMISSED
+ ld [W_CUROPPONENT], a ; wd059
+ ld [wd11f], a
+ ld [wd120], a
+ ld [wd078], a
+ ld hl, wcc2b
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
- ld [wListScrollOffset], a ; $cc36
- ld hl, $d060
+ ld [wListScrollOffset], a ; wcc36
+ ld hl, wd060
ld b, $18
.asm_1383e
ld [hli], a
dec b
jr nz, .asm_1383e
- ld hl, $d72c
+ ld hl, wd72c
set 0, [hl]
call WaitForSoundToFinish
call GBPalWhiteOut
ld a, $ff
- ld [$d42f], a
+ ld [wd42f], a
ret
YouWinText: ; 13853 (4:7853)
@@ -90,10 +90,10 @@
db "@"
Func_13870: ; 13870 (4:7870)
- ld a, [$cc57]
+ ld a, [wcc57]
and a
ret nz
- ld a, [$d736]
+ ld a, [wd736]
and a
ret nz
callab Func_c49d
@@ -105,31 +105,31 @@
.asm_13888
callab Func_128d8
jr z, .asm_13884
- ld a, [$d0db]
+ ld a, [wd0db]
and a
jr z, .asm_1389e
dec a
jr z, .asm_13905
- ld [$d0db], a
+ ld [wd0db], a
.asm_1389e
- FuncCoord 9, 9 ; $c45d
+ FuncCoord 9, 9
ld hl, Coord
ld c, [hl]
ld a, [W_GRASSTILE]
cp c
- ld a, [W_GRASSRATE] ; $d887
+ ld a, [W_GRASSRATE] ; W_GRASSRATE
jr z, .asm_138c4
ld a, $14
cp c
- ld a, [W_WATERRATE] ; $d8a4
+ ld a, [W_WATERRATE] ; wEnemyMon1Species
jr z, .asm_138c4
- ld a, [W_CURMAP] ; $d35e
+ ld a, [W_CURMAP] ; W_CURMAP
cp REDS_HOUSE_1F
jr c, .asm_13912
- ld a, [W_CURMAPTILESET] ; $d367
+ ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
cp FOREST ; Viridian Forest/Safari Zone
jr z, .asm_13912
- ld a, [W_GRASSRATE] ; $d887
+ ld a, [W_GRASSRATE] ; W_GRASSRATE
.asm_138c4
ld b, a
ld a, [hRandomAdd]
@@ -146,31 +146,31 @@
jr .asm_138d0
.asm_138d7
ld c, [hl]
- ld hl, W_GRASSMONS ; $d888
- FuncCoord 8, 9 ; $c45c
+ ld hl, W_GRASSMONS ; wd888
+ FuncCoord 8, 9
ld a, [Coord]
cp $14
jr nz, .asm_138e5
- ld hl, W_WATERMONS ; $d8a5 (aliases: W_ENEMYMON1HP)
+ ld hl, W_WATERMONS ; wd8a5 (aliases: W_ENEMYMON1HP)
.asm_138e5
ld b, $0
add hl, bc
ld a, [hli]
- ld [W_CURENEMYLVL], a ; $d127
+ ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
ld a, [hl]
- ld [$cf91], a
+ ld [wcf91], a
ld [W_ENEMYMONID], a
- ld a, [$d0db]
+ ld a, [wd0db]
and a
jr z, .asm_13916
- ld a, [W_PARTYMON1_LEVEL] ; $d18c
+ ld a, [W_PARTYMON1_LEVEL] ; W_PARTYMON1_LEVEL
ld b, a
- ld a, [W_CURENEMYLVL] ; $d127
+ ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL
cp b
jr c, .asm_13912
jr .asm_13916
.asm_13905
- ld [$d0db], a
+ ld [wd0db], a
ld a, $d2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call EnableAutoTextBoxDrawing
@@ -202,14 +202,14 @@
RecoilEffect_: ; 1392c (4:792c)
ld a, [H_WHOSETURN] ; $fff3
and a
- ld a, [W_PLAYERMOVENUM] ; $cfd2
- ld hl, W_PLAYERMONMAXHP ; $d023
+ ld a, [W_PLAYERMOVENUM] ; wcfd2
+ ld hl, W_PLAYERMONMAXHP ; wd023
jr z, .asm_1393d
- ld a, [W_ENEMYMOVENUM] ; $cfcc
- ld hl, W_ENEMYMONMAXHP ; $cff4
+ ld a, [W_ENEMYMOVENUM] ; W_ENEMYMOVENUM
+ ld hl, W_ENEMYMONMAXHP ; W_ENEMYMONMAXHP
.asm_1393d
ld d, a
- ld a, [W_DAMAGE] ; $d0d7
+ ld a, [W_DAMAGE] ; W_DAMAGE
ld b, a
ld a, [W_DAMAGE + 1]
ld c, a
@@ -252,17 +252,17 @@
ld [hli], a
ld [hl], a
.asm_13982
- FuncCoord 10, 9 ; $c45e
+ FuncCoord 10, 9
ld hl, Coord
ld a, [H_WHOSETURN] ; $fff3
and a
ld a, $1
jr z, .asm_13990
- FuncCoord 2, 2 ; $c3ca
+ FuncCoord 2, 2
ld hl, Coord
xor a
.asm_13990
- ld [wListMenuID], a ; $cf94
+ ld [wListMenuID], a ; wListMenuID
ld a, $48
call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d))
ld hl, HitWithRecoilText ; $799e
@@ -312,10 +312,10 @@
call Func_13a43
ld hl, wEnemyMonAttackMod
call Func_13a43
- ld hl, $cd12
+ ld hl, wcd12
ld de, W_PLAYERMONATK
call Func_13a4a
- ld hl, $cd26
+ ld hl, wcd26
ld de, W_ENEMYMONATTACK
call Func_13a4a
ld hl, W_ENEMYMONSTATUS
@@ -338,7 +338,7 @@
xor a
ld [W_PLAYERDISABLEDMOVE], a
ld [W_ENEMYDISABLEDMOVE], a
- ld hl, $ccee
+ ld hl, wccee
ld [hli], a
ld [hl], a
ld hl, W_PLAYERBATTSTATUS1
@@ -384,12 +384,12 @@
db "@"
GetTrainerName_: ; 13a58 (4:7a58)
- ld hl, W_GRASSRATE ; $d887
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld hl, W_GRASSRATE ; W_GRASSRATE
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
and a
jr nz, .rival
- ld hl, W_RIVALNAME ; $d34a
- ld a, [W_TRAINERCLASS] ; $d031
+ ld hl, W_RIVALNAME ; wd34a
+ ld a, [W_TRAINERCLASS] ; wd031
cp SONY1
jr z, .rival
cp SONY2
@@ -396,13 +396,13 @@
jr z, .rival
cp SONY3
jr z, .rival
- ld [$d0b5], a
+ ld [wd0b5], a
ld a, TRAINER_NAME
ld [W_LISTTYPE], a
ld a, $e
- ld [$d0b7], a
+ ld [wPredefBank], a
call GetName
- ld hl, $cd6d
+ ld hl, wcd6d
.rival
ld de, W_TRAINERNAME
ld bc, $d
--- a/engine/battle/5.asm
+++ b/engine/battle/5.asm
@@ -42,7 +42,7 @@
ld h, b
ld l, c
set 4, [hl] ;set bit 4 of flags, user now has substitute
- ld a, [$d355] ;load options
+ ld a, [W_OPTIONS] ;load options
bit 7, a ;battle animation is enabled?
ld hl, Func_3fba8 ; $7ba8 ;animation enabled: 0F:7BA8
ld b, BANK(Func_3fba8)
--- a/engine/battle/9.asm
+++ b/engine/battle/9.asm
@@ -28,7 +28,7 @@
Func_27d98: ; 27d98 (9:7d98)
call GetPredefRegisters
push hl
- ld a, [W_PLAYERMOVETYPE] ; $cfd5
+ ld a, [W_PLAYERMOVETYPE] ; wcfd5
asm_27d9f: ; 27d9f (9:7d9f)
add a
ld hl, TypeNamePointers ; $7dae
@@ -54,7 +54,7 @@
ld a,[hli]
ld h,[hl]
ld l,a
- ld de,$CD6D
+ ld de,wcd6d
.CopyCharacter
ld a,[hli]
ld [de],a
@@ -157,11 +157,11 @@
db "COOLTRAINER♀@"
FocusEnergyEffect_: ; 27f86 (9:7f86)
- ld hl, W_PLAYERBATTSTATUS2 ; $d063
+ ld hl, W_PLAYERBATTSTATUS2 ; W_PLAYERBATTSTATUS2
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_27f91
- ld hl, W_ENEMYBATTSTATUS2 ; $d068
+ ld hl, W_ENEMYBATTSTATUS2 ; W_ENEMYBATTSTATUS2
.asm_27f91
bit 2, [hl] ; is mon already using focus energy?
jr nz, .asm_27fa5
--- a/engine/battle/a.asm
+++ b/engine/battle/a.asm
@@ -1,15 +1,15 @@
LeechSeedEffect_: ; 2bea9 (a:7ea9)
callab MoveHitTest
- ld a, [W_MOVEMISSED] ; $d05f
+ ld a, [W_MOVEMISSED] ; W_MOVEMISSED
and a
jr nz, .asm_2bee7
- ld hl, W_ENEMYBATTSTATUS2 ; $d068
- ld de, W_ENEMYMONTYPE1 ; $cfea (aliases: W_ENEMYMONTYPES)
+ ld hl, W_ENEMYBATTSTATUS2 ; W_ENEMYBATTSTATUS2
+ ld de, W_ENEMYMONTYPE1 ; wcfea (aliases: W_ENEMYMONTYPES)
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_2bec8
- ld hl, W_PLAYERBATTSTATUS2 ; $d063
- ld de, W_PLAYERMONTYPE1 ; $d019 (aliases: W_PLAYERMONTYPES)
+ ld hl, W_PLAYERBATTSTATUS2 ; W_PLAYERBATTSTATUS2
+ ld de, W_PLAYERMONTYPE1 ; wd019 (aliases: W_PLAYERMONTYPES)
.asm_2bec8
ld a, [de]
cp GRASS
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -223,7 +223,7 @@
rla
sla c
rla
- ld [$D09F],a ; tile select
+ ld [wd09f],a ; tile select
ld a,[hli] ; sound
ld [wAnimSoundID],a ; store sound
ld a,[hli] ; subanimation ID
@@ -243,7 +243,7 @@
push hl
ld a,[rOBP0]
push af
- ld a,[$CC79]
+ ld a,[wcc79]
ld [rOBP0],a
call LoadAnimationTileset
call LoadSubanimation
@@ -328,7 +328,7 @@
; loads tile patterns for battle animations
LoadAnimationTileset: ; 781d2 (1e:41d2)
- ld a,[$D09F] ; tileset select
+ ld a,[wd09f] ; tileset select
add a
add a
ld hl,AnimationTilesetPointers
@@ -336,7 +336,7 @@
ld d,0
add hl,de
ld a,[hli]
- ld [$D07D],a ; number of tiles
+ ld [wd07d],a ; number of tiles
ld a,[hli]
ld e,a
ld a,[hl]
@@ -343,7 +343,7 @@
ld d,a ; de = address of tileset
ld hl,$8310 ; destination address in VRAM
ld b, BANK(AnimationTileset1) ; ROM bank
- ld a,[$D07D]
+ ld a,[wd07d]
ld c,a ; number of tiles
jp CopyVideoData ; load tileset
@@ -394,7 +394,7 @@
.MoveAnimation
; check if battle animations are disabled in the options
- ld a,[$D355]
+ ld a,[W_OPTIONS]
bit 7,a
jr nz,.AnimationsDisabled
call ShareMoveAnimations
@@ -408,11 +408,11 @@
.AnimationFinished
call WaitForSoundToFinish
xor a
- ld [$D096],a
- ld [$D09B],a
- ld [$D08B],a
+ ld [W_SUBANIMSUBENTRYADDR],a
+ ld [wd09b],a
+ ld [W_SUBANIMTRANSFORM],a
dec a
- ld [$CF07],a
+ ld [wAnimSoundID],a
pop af
pop bc
pop de
@@ -443,7 +443,7 @@
ret
Func_78dbd: ; 78dbd (1e:4dbd)
- ld a,[$CC5B]
+ ld a,[wcc5b]
and a
ret z
dec a
@@ -517,14 +517,14 @@
ret
Func_78e23: ; 78e23 (1e:4e23)
- ld a, [$cf1b]
+ ld a, [wcf1b]
and a
ld a, $e4
jr z, .asm_78e47
ld a, $f0
- ld [$cc79], a
+ ld [wcc79], a
ld b, $e4
- ld a, [W_ANIMATIONID] ; $d07c
+ ld a, [W_ANIMATIONID] ; W_ANIMATIONID
cp $aa
jr c, .asm_78e3f
cp $ae
@@ -538,7 +538,7 @@
ret
.asm_78e47
ld a, $e4
- ld [$cc79], a
+ ld [wcc79], a
ld [rOBP0], a ; $ff48
ld a, $6c
ld [rOBP1], a ; $ff49
@@ -724,7 +724,7 @@
db $FF ; terminator
DoBallTossSpecialEffects: ; 78f3e (1e:4f3e)
- ld a,[$CF91]
+ ld a,[wcf91]
cp a,3 ; is it a Master Ball or Ultra Ball?
jr nc,.skipFlashingEffect
.flashingEffect ; do a flashing effect if it's Master Ball or Ultra Ball
@@ -742,7 +742,7 @@
ld a,[W_ISINBATTLE]
cp a,02 ; is it a trainer battle?
jr z,.isTrainerBattle
- ld a,[$d11e]
+ ld a,[wd11e]
cp a,$10 ; is the enemy pokemon the Ghost Marowak?
ret nz
; if the enemy pokemon is the Ghost Marowak, make it dodge during the last 3 frames
@@ -792,9 +792,9 @@
dec a
ret nz
; if it's the end of the ball shaking subanimation, check if more shakes are left and restart the subanimation
- ld a,[$cd3d] ; number of shakes
+ ld a,[wWhichTrade] ; number of shakes
dec a ; decrement number of shakes
- ld [$cd3d],a
+ ld [wWhichTrade],a
ret z
; if there are shakes left, restart the subanimation
ld a,[W_SUBANIMSUBENTRYADDR]
@@ -856,7 +856,7 @@
cp a,1 ; is it the end of the subanimation?
jr nz,FlashScreenEveryFourFrameBlocks
; if it's the end of the subanimation, make the attacking pokemon disappear
- FuncCoord 1, 5 ; $c405
+ FuncCoord 1, 5
ld hl,Coord
jp AnimationHideMonPic ; make pokemon disappear
@@ -975,7 +975,7 @@
; so that there are two musical notes flying towards the defending pokemon
DoGrowlSpecialEffects: ; 790bc (1e:50bc)
ld hl,wOAMBuffer ; OAM buffer
- ld de,$c310
+ ld de,wOAMBuffer + $10
ld bc,$10
call CopyData ; copy the musical note graphic
ld a,[W_SUBANIMCOUNTER]
@@ -1094,8 +1094,8 @@
; flashes the screen for an extended period (48 frames)
AnimationFlashScreenLong: ; 79165 (1e:5165)
ld a,3 ; cycle through the palettes 3 times
- ld [$D08A],a
- ld a,[$cf1b] ; running on SGB?
+ ld [wd08a],a
+ ld a,[wcf1b] ; running on SGB?
and a
ld hl,FlashScreenLongMonochrome
jr z,.loop
@@ -1110,9 +1110,9 @@
call FlashScreenLongDelay
jr .innerLoop
.endOfPalettes
- ld a,[$D08A]
+ ld a,[wd08a]
dec a
- ld [$D08A],a
+ ld [wd08a],a
pop hl
jr nz,.loop
ret
@@ -1152,8 +1152,8 @@
; causes a delay of 2 frames for the first cycle
; causes a delay of 1 frame for the second and third cycles
FlashScreenLongDelay: ; 791a8 (1e:51a8)
- ld a,[$D08A]
- cp a,4 ; never true since [$D08A] starts at 3
+ ld a,[wd08a]
+ cp a,4 ; never true since [wd08a] starts at 3
ld c,4
jr z,.delayFrames
cp a,3
@@ -1215,7 +1215,7 @@
ld bc, $4040
Func_791fc: ; 791fc (1e:51fc)
- ld a, [$cf1b]
+ ld a, [wcf1b]
and a
ld a, b
jr z, .asm_79204
@@ -1243,23 +1243,23 @@
; scroll. It's hard to describe, but it's the main animation
; in Surf/Mist/Toxic.
xor a
- ld [$d09f], a
+ ld [wd09f], a
call LoadAnimationTileset
ld d, $20
ld a, $f0
- ld [W_BASECOORDX], a ; $d081
+ ld [W_BASECOORDX], a ; wd081
ld a, $71
- ld [$d09f], a
+ ld [wd09f], a
.asm_79228
ld a, $10
- ld [W_BASECOORDY], a ; $d082
+ ld [W_BASECOORDY], a ; wd082
ld a, $0
- ld [$d08a], a
+ ld [wd08a], a
call Func_79246
ld a, $18
- ld [W_BASECOORDY], a ; $d082
+ ld [W_BASECOORDY], a ; wd082
ld a, $20
- ld [$d08a], a
+ ld [wd08a], a
call Func_79246
dec d
jr nz, .asm_79228
@@ -1268,24 +1268,24 @@
Func_79246: ; 79246 (1e:5246)
ld hl, wOAMBuffer
.asm_79249
- ld a, [W_BASECOORDY] ; $d082
+ ld a, [W_BASECOORDY] ; wd082
ld [hli], a
- ld a, [W_BASECOORDX] ; $d081
+ ld a, [W_BASECOORDX] ; wd081
add $1b
- ld [W_BASECOORDX], a ; $d081
+ ld [W_BASECOORDX], a ; wd081
ld [hli], a
- ld a, [$d09f]
+ ld a, [wd09f]
ld [hli], a
xor a
ld [hli], a
- ld a, [W_BASECOORDX] ; $d081
+ ld a, [W_BASECOORDX] ; wd081
cp $90
jr c, .asm_79249
sub $a8
- ld [W_BASECOORDX], a ; $d081
- ld a, [W_BASECOORDY] ; $d082
+ ld [W_BASECOORDX], a ; wd081
+ ld a, [W_BASECOORDY] ; wd082
add $10
- ld [W_BASECOORDY], a ; $d082
+ ld [W_BASECOORDY], a ; wd082
cp $70
jr c, .asm_79249
call AnimationCleanOAM
@@ -1296,15 +1296,15 @@
ld c, $7
ld a, [H_WHOSETURN]
and a
- ld hl, $c419
- ld de, $c405
+ ld hl, wTileMap + $79
+ ld de, wTileMap + $65
ld a, $30
jr z, .asm_79291
- ld hl, $c3c0
- ld de, $c3ac
+ ld hl, wTileMap + $20
+ ld de, wTileMap + $c
ld a, $ff
.asm_79291
- ld [$d09f], a
+ ld [wd09f], a
jp Func_792bf
AnimationSlideMonDown: ; 79297 (1e:5297)
@@ -1328,7 +1328,7 @@
; Slides the mon's sprite out of the screen horizontally.
ld e, $8
ld a, $3
- ld [W_SUBANIMTRANSFORM], a ; $d08b
+ ld [W_SUBANIMTRANSFORM], a ; W_SUBANIMTRANSFORM
jp Func_795f8
AnimationSlideEnemyMonOut: ; 792b9 (1e:52b9)
@@ -1356,13 +1356,13 @@
jr nz, .asm_792c4
ld a, [H_WHOSETURN]
and a
- ld hl, $c47d
+ ld hl, wTileMap + $dd
jr z, .asm_792e2
- ld hl, $c424
+ ld hl, wTileMap + $84
.asm_792e2
- ld a, [$d09f]
+ ld a, [wd09f]
inc a
- ld [$d09f], a
+ ld [wd09f], a
ld c, $7
.asm_792eb
ld [hli], a
@@ -1409,7 +1409,7 @@
add $8
ld e, a
ld [hli], a
- ld a, [W_BASECOORDX] ; $d081
+ ld a, [W_BASECOORDX] ; wd081
ld [hli], a
ld a, d
ld [hli], a
@@ -1424,7 +1424,7 @@
Func_79339: ; 79339 (1e:5339)
ld de, $4
.asm_7933c
- ld a, [$d08a]
+ ld a, [wd08a]
ld b, a
ld a, [hl]
add b
@@ -1447,7 +1447,7 @@
Func_79352: ; 79352 (1e:5352)
ld de, $4
.asm_79355
- ld a, [$d08a]
+ ld a, [wd08a]
ld b, a
ld a, [hl]
add b
@@ -1489,9 +1489,9 @@
AnimationFlashMonPic: ; 79389 (1e:5389)
; Flashes the mon's sprite on and off
ld a, [W_PLAYERMONID]
- ld [$ceea], a
- ld a, [$cfe5]
- ld [$cee9], a
+ ld [wHPBarMaxHP + 1], a
+ ld a, [wcfe5]
+ ld [wHPBarMaxHP], a
jp Func_79793
AnimationFlashEnemyMonPic: ; 79398 (1e:5398)
@@ -1517,11 +1517,11 @@
; The mon's sprite disappears after this animation.
ld a, [H_WHOSETURN]
and a
- ld hl, $c404
- ld de, $c406
+ ld hl, wTileMap + $64
+ ld de, wTileMap + $66
jr z, .asm_793c2
- ld hl, $c3ab
- ld de, $c3ad
+ ld hl, wTileMap + $b
+ ld de, wTileMap + $d
.asm_793c2
xor a
@@ -1565,10 +1565,10 @@
call AnimationHideMonPic
ld a, [H_WHOSETURN] ; $fff3
and a
- FuncCoord 2, 5 ; $c406
+ FuncCoord 2, 5
ld hl, Coord
jr z, .asm_79407
- FuncCoord 11, 0 ; $c3ab
+ FuncCoord 11, 0
ld hl, Coord
.asm_79407
xor a
@@ -1597,14 +1597,14 @@
and a
jr z, .asm_79435
ld a, $d8
- ld [$d08a], a
+ ld [wd08a], a
ld a, $50
- ld [W_SUBANIMTRANSFORM], a ; $d08b
+ ld [W_SUBANIMTRANSFORM], a ; W_SUBANIMTRANSFORM
jr .asm_7943c
.asm_79435
xor a
- ld [$d08a], a
- ld [W_SUBANIMTRANSFORM], a ; $d08b
+ ld [wd08a], a
+ ld [W_SUBANIMTRANSFORM], a ; W_SUBANIMTRANSFORM
.asm_7943c
ld d, $7a
ld c, $3
@@ -1619,12 +1619,12 @@
ld a, [hl]
cp $ff
jr z, .asm_7946f
- ld a, [$d08a]
+ ld a, [wd08a]
add [hl]
ld [de], a
inc de
inc hl
- ld a, [W_SUBANIMTRANSFORM] ; $d08b
+ ld a, [W_SUBANIMTRANSFORM] ; W_SUBANIMTRANSFORM
add [hl]
ld [de], a
inc hl
@@ -1680,24 +1680,24 @@
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_794b1
- FuncCoord 16, 0 ; $c3b0
+ FuncCoord 16, 0
ld hl, Coord
- FuncCoord 14, 0 ; $c3ae
+ FuncCoord 14, 0
ld de, Coord
jr .asm_794b7
.asm_794b1
- FuncCoord 5, 5 ; $c409
+ FuncCoord 5, 5
ld hl, Coord
- FuncCoord 3, 5 ; $c407
+ FuncCoord 3, 5
ld de, Coord
.asm_794b7
push de
xor a
- ld [$d09f], a
+ ld [wd09f], a
call Func_794d4
pop hl
ld a, $1
- ld [$d09f], a
+ ld [wd09f], a
call Func_794d4
pop bc
dec c
@@ -1712,7 +1712,7 @@
push bc
push hl
ld c, $3
- ld a, [$d09f]
+ ld a, [wd09f]
cp $0
jr nz, .asm_794e7
call Func_7985b
@@ -1743,9 +1743,9 @@
ld bc, $3028
.asm_79506
ld a, b
- ld [W_BASECOORDY], a ; $d082
+ ld [W_BASECOORDY], a ; wd082
ld a, c
- ld [W_BASECOORDX], a ; $d081
+ ld [W_BASECOORDX], a ; wd081
ld bc, $501
call Func_79517
jp AnimationCleanOAM
@@ -1753,13 +1753,13 @@
Func_79517: ; 79517 (1e:5517)
push bc
xor a
- ld [$d09f], a
+ ld [wd09f], a
call LoadAnimationTileset
pop bc
ld d, $7a
ld hl, wOAMBuffer
push bc
- ld a, [W_BASECOORDY] ; $d082
+ ld a, [W_BASECOORDY] ; wd082
ld e, a
.asm_7952a
call Func_79329
@@ -1768,12 +1768,12 @@
call DelayFrame
pop bc
ld a, b
- ld [$d08a], a
+ ld [wd08a], a
.asm_79538
push bc
ld hl, wOAMBuffer
.asm_7953c
- ld a, [W_BASECOORDY] ; $d082
+ ld a, [W_BASECOORDY] ; wd082
add $8
ld e, a
ld a, [hl]
@@ -1784,9 +1784,9 @@
jr .asm_79554
.asm_7954b
ld [hl], $0
- ld a, [$d08a]
+ ld a, [wd08a]
dec a
- ld [$d08a], a
+ ld [wd08a], a
.asm_79554
ld de, $4
add hl, de
@@ -1794,7 +1794,7 @@
jr nz, .asm_7953c
call DelayFrames
pop bc
- ld a, [$d08a]
+ ld a, [wd08a]
and a
jr nz, .asm_79538
ret
@@ -1838,7 +1838,7 @@
AnimationMinimizeMon: ; 7959f (1e:559f)
; Changes the mon's sprite to a mini black sprite. Used by the
; Minimize animation.
- ld hl, $c6e8
+ ld hl, wTempPic
push hl
xor a
ld bc, $310
@@ -1883,7 +1883,7 @@
dec c
jr nz, .asm_795cd
call AnimationHideMonPic
- ld hl, $c6e8
+ ld hl, wTempPic
ld bc, $0310
xor a
call FillMemory
@@ -1893,11 +1893,11 @@
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_79602
- FuncCoord 12, 0 ; $c3ac
+ FuncCoord 12, 0
ld hl, Coord
jr .asm_79605
.asm_79602
- FuncCoord 0, 5 ; $c404
+ FuncCoord 0, 5
ld hl, Coord
.asm_79605
ld d, $8
@@ -1924,7 +1924,7 @@
pop de
dec b
jr nz, .asm_7960a
- ld a, [W_SUBANIMTRANSFORM] ; $d08b
+ ld a, [W_SUBANIMTRANSFORM] ; W_SUBANIMTRANSFORM
ld c, a
call DelayFrames
pop hl
@@ -1964,7 +1964,7 @@
jr z, .asm_7965d
ld hl, $9000
.asm_7965d
- ld de, $c6e8
+ ld de, wTempPic
ld bc, $31
jp CopyVideoData
@@ -2031,7 +2031,7 @@
AnimationSubstitute: ; 796e0 (1e:56e0)
; Changes the pokemon's sprite to the mini sprite
- ld hl, $c6e8
+ ld hl, wTempPic
xor a
ld bc, $0310
call FillMemory
@@ -2038,31 +2038,31 @@
ld a, [$fff3]
and a
jr z, .asm_79715 ; 0x796ed $26
- ld hl, SlowbroSprite ; $4780 ; facing down sprite
- ld de, $c808
+ ld hl, SlowbroSprite ; facing down sprite
+ ld de, wTempPic + $120
call CopySlowbroSpriteData
- ld hl, SlowbroSprite + $10 ; $4790
- ld de, $c878
+ ld hl, SlowbroSprite + $10
+ ld de, wTempPic + $120 + $70
call CopySlowbroSpriteData
- ld hl, SlowbroSprite + $20 ; $47a0
- ld de, $c818
+ ld hl, SlowbroSprite + $20
+ ld de, wTempPic + $120 + $10
call CopySlowbroSpriteData
- ld hl, SlowbroSprite + $30 ; $47b0
- ld de, $c888
+ ld hl, SlowbroSprite + $30
+ ld de, wTempPic + $120 + $10 + $70
call CopySlowbroSpriteData
- jr .asm_79739 ; 0x79713 $24
+ jr .asm_79739
.asm_79715
- ld hl, SlowbroSprite + $40 ; $47c0 ; facing up sprite
- ld de, $c878
+ ld hl, SlowbroSprite + $40 ; facing up sprite
+ ld de, wTempPic + $120 + $70
call CopySlowbroSpriteData
- ld hl, SlowbroSprite + $50 ; $47d0
- ld de, $c8e8
+ ld hl, SlowbroSprite + $50
+ ld de, wTempPic + $120 + $e0
call CopySlowbroSpriteData
- ld hl, SlowbroSprite + $60 ; $47e0
- ld de, $c888
+ ld hl, SlowbroSprite + $60
+ ld de, wTempPic + $120 + $80
call CopySlowbroSpriteData
- ld hl, SlowbroSprite + $70 ; $47f0
- ld de, $c8f8
+ ld hl, SlowbroSprite + $70
+ ld de, wTempPic + $120 + $f0
call CopySlowbroSpriteData
.asm_79739
call Func_79652
@@ -2076,11 +2076,11 @@
Func_79747: ; 79747 (1e:5747)
ld a, [H_WHOSETURN] ; $fff3
and a
- ld hl, $ccf7
- ld a, [W_PLAYERBATTSTATUS2] ; $d063
+ ld hl, wccf7
+ ld a, [W_PLAYERBATTSTATUS2] ; W_PLAYERBATTSTATUS2
jr z, .asm_79758
- ld hl, $ccf3
- ld a, [W_ENEMYBATTSTATUS2] ; $d068
+ ld hl, wccf3
+ ld a, [W_ENEMYBATTSTATUS2] ; W_ENEMYBATTSTATUS2
.asm_79758
push hl
bit 4, a
@@ -2117,31 +2117,31 @@
AnimationTransformMon: ; 79787 (1e:5787)
; Redraws this mon's sprite as the back/front sprite of the opposing mon.
; Used in Transform.
- ld a, [$cfe5]
- ld [$ceea], a
+ ld a, [wcfe5]
+ ld [wHPBarMaxHP + 1], a
ld a, [W_PLAYERMONID]
- ld [$cee9], a
+ ld [wHPBarMaxHP], a
Func_79793: ; 79793 (1e:5793)
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_797b0
- ld a, [$cee9]
- ld [$cf91], a
- ld [$d0b5], a
+ ld a, [wHPBarMaxHP]
+ ld [wcf91], a
+ ld [wd0b5], a
xor a
ld [W_SPRITEFLIPPED], a
call GetMonHeader
- FuncCoord 12, 0 ; $c3ac
+ FuncCoord 12, 0
ld hl, Coord
call LoadFrontSpriteByMonIndex
jr .asm_797d3
.asm_797b0
- ld a, [$cfd9]
+ ld a, [wcfd9]
push af
- ld a, [$ceea]
- ld [$cfd9], a
- ld [$d0b5], a
+ ld a, [wHPBarMaxHP + 1]
+ ld [wcfd9], a
+ ld [wd0b5], a
call GetMonHeader
ld a, $4
call Predef ; indirect jump to LoadMonBackSprite (3f103 (f:7103))
@@ -2150,7 +2150,7 @@
call Func_79820
call Func_79aae
pop af
- ld [$cfd9], a
+ ld [wcfd9], a
.asm_797d3
ld b, $1
jp GoPAL_SET
@@ -2168,13 +2168,13 @@
Func_797e8: ; 797e8 (1e:57e8)
push bc
push de
- ld [$d09f], a
+ ld [wd09f], a
call LoadAnimationTileset
pop de
pop bc
xor a
ld e, a
- ld [W_BASECOORDX], a ; $d081
+ ld [W_BASECOORDX], a ; wd081
ld hl, wOAMBuffer
.asm_797fa
call Func_79329
@@ -2294,25 +2294,25 @@
ld a,[W_PLAYERMONID] ; get number of current monster
jr .Continue
.next
- ld a,[$CFE5]
+ ld a,[wcfe5]
.Continue
push hl
call GetCryData
ld b,a
pop hl
- ld a,[$C0F1]
+ ld a,[wc0f1]
add [hl]
- ld [$C0F1],a
+ ld [wc0f1],a
inc hl
- ld a,[$C0F2]
+ ld a,[wc0f2]
add [hl]
- ld [$C0F2],a
+ ld [wc0f2],a
jr .done
.NotCryMove
ld a,[hli]
- ld [$C0F1],a
+ ld [wc0f1],a
ld a,[hli]
- ld [$C0F2],a
+ ld [wc0f2],a
.done
ld a,b
ret
@@ -2510,7 +2510,7 @@
Func_79aba: ; 79aba (1e:5aba)
call GetPredefRegisters
- ld a, [$cd6c]
+ ld a, [wcd6c]
and a
jr nz, .asm_79ac8
ld de, Unknown_79b02 ; $5b02
@@ -2599,7 +2599,7 @@
; in Razor Leaf's animation.
ld a, [$ff48]
push af
- ld a, [$cc79]
+ ld a, [wcc79]
ld [$ff48], a
ld d, $37
ld a, $3
@@ -2636,7 +2636,7 @@
push hl
push de
ld a, [hl]
- ld [$d08a], a
+ ld [wd08a], a
call Func_79d16
call Func_79cdb
pop de
@@ -2645,7 +2645,7 @@
ld e, l
ld d, h
pop hl
- ld a, [$d08a]
+ ld a, [wd08a]
ld [hli], a
pop bc
dec c
@@ -2668,7 +2668,7 @@
ld a, $a0
.asm_79ce8
ld [hli], a
- ld a, [$d08a]
+ ld a, [wd08a]
ld b, a
ld de, Unknown_79d0d
and $7f
@@ -2702,7 +2702,7 @@
db $00,$01,$03,$05,$07,$09,$0B,$0D,$0F
Func_79d16: ; 79d16 (1e:5d16)
- ld a, [$d08a]
+ ld a, [wd08a]
inc a
ld b, a
and $7f
@@ -2712,11 +2712,11 @@
and $80
xor $80
.asm_79d26
- ld [$d08a], a
+ ld [wd08a], a
ret
Func_79d2a: ; 79d2a (1e:5d2a)
- ld hl, $c301
+ ld hl, wOAMBuffer + $01
ld de, Unknown_79d3e
ld a, [W_SUBANIMTRANSFORM]
ld c, a
@@ -2830,7 +2830,7 @@
ld a,[W_ISINBATTLE]
cp a,2
jr z,.BlockBall ; if in trainer battle, play different animation
- ld a,[$D11E]
+ ld a,[wd11e]
ld b,a
; upper nybble: how many animations (from PokeBallAnimations) to play
@@ -2843,11 +2843,11 @@
; store these for later
ld a,b
and a,$F
- ld [$CD3D],a
+ ld [wWhichTrade],a
ld hl,.PokeBallAnimations
; choose which toss animation to use
- ld a,[$CF91]
+ ld a,[wcf91]
cp a,POKE_BALL
ld b,TOSS_ANIM
jr z,.done
@@ -2885,7 +2885,7 @@
Func_79e6a: ; 79e6a (1e:5e6a)
call WaitForSoundToFinish
- ld a, [$d05b]
+ ld a, [wd05b]
and $7f
ret z
cp $a
@@ -2901,8 +2901,8 @@
ld b, $1
ld c, (SFX_08_51 - SFX_Headers_08) / 3
.asm_79e8b
- ld [$c0f1], a
+ ld [wc0f1], a
ld a, b
- ld [$c0f2], a
+ ld [wc0f2], a
ld a, c
jp PlaySound
--- a/engine/battle/b.asm
+++ b/engine/battle/b.asm
@@ -1,5 +1,5 @@
DisplayEffectiveness: ; 2fb7b (b:7b7b)
- ld a, [$D05B]
+ ld a, [wd05b]
and a, $7F
cp a, $0A
ret z
--- a/engine/battle/b_2.asm
+++ b/engine/battle/b_2.asm
@@ -86,13 +86,13 @@
PayDayEffect_ ; 2feb8 (b:7eb8)
xor a
- ld hl, $cd6d
+ ld hl, wcd6d
ld [hli], a
ld a, [$fff3]
and a
- ld a, [$d022]
+ ld a, [W_PLAYERMONLEVEL]
jr z, .asm_2fec8 ; 0x2fec3 $3
- ld a, [$cff3]
+ ld a, [W_ENEMYMONLEVEL]
.asm_2fec8
add a
ld [$ff98], a
@@ -118,7 +118,7 @@
ld a, [$ff99]
add b
ld [hl], a
- ld de, $cce7
+ ld de, wcce7
ld c, $3
ld a, $b ; AddBCDPredef
call Predef
--- a/engine/battle/c.asm
+++ b/engine/battle/c.asm
@@ -21,19 +21,19 @@
db "@"
OneHitKOEffect_: ; 33f57 (c:7f57)
- ld hl, W_DAMAGE ; $d0d7
+ ld hl, W_DAMAGE ; W_DAMAGE
xor a
ld [hli], a
ld [hl], a ; set the damage output to zero
dec a
- ld [$d05e], a
- ld hl, $d02a
- ld de, $cffb
+ ld [wd05e], a
+ ld hl, W_PLAYERMONSPEED + 1
+ ld de, W_ENEMYMONSPEED + 1
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_33f72
- ld hl, $cffb
- ld de, $d02a
+ ld hl, W_ENEMYMONSPEED + 1
+ ld de, W_PLAYERMONSPEED + 1
.asm_33f72
ld a, [de]
dec de
@@ -45,14 +45,14 @@
ld a, [hl]
sbc b
jr c, .asm_33f8a
- ld hl, W_DAMAGE ; $d0d7
+ ld hl, W_DAMAGE ; W_DAMAGE
ld a, $ff
ld [hli], a
ld [hl], a
ld a, $2
- ld [$d05e], a
+ ld [wd05e], a
ret
.asm_33f8a
ld a, $1
- ld [W_MOVEMISSED], a ; $d05f
+ ld [W_MOVEMISSED], a ; W_MOVEMISSED
ret
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -94,9 +94,9 @@
Func_3c04c: ; 3c04c (f:404c)
call Func_3ec92
ld a, $1
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
- FuncCoord 1, 5 ; $c405
+ FuncCoord 1, 5
ld hl, Coord
ld bc, $307
call ClearScreenArea
@@ -139,7 +139,7 @@
ld [$ffd7], a
ld [$ffaf], a
dec a
- ld [$cfcb], a
+ ld [wcfcb], a
call Delay3
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@@ -171,7 +171,7 @@
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
ld a, $31
ld [$ffe1], a
- FuncCoord 1, 5 ; $c405
+ FuncCoord 1, 5
ld hl, Coord
ld a, $1
call Predef ; indirect jump to Func_3f0c6 (3f0c6 (f:70c6))
@@ -190,7 +190,7 @@
Func_3c0ff: ; 3c0ff (f:40ff)
push bc
- ld hl, $c301
+ ld hl, wOAMBuffer + $01
ld c, $15
ld de, $4
.asm_3c108
@@ -217,11 +217,11 @@
Func_3c11e: ; 3c11e (f:411e)
xor a
ld [W_PLAYERMONSALIVEFLAGS], a
- ld [$ccf5], a
- ld [$cd6a], a
+ ld [wccf5], a
+ ld [wcd6a], a
inc a
- ld [$d11d], a
- ld hl, W_ENEMYMON1HP ; $d8a5
+ ld [wd11d], a
+ ld hl, W_ENEMYMON1HP ; wd8a5
ld bc, $2b
ld d, $3
.asm_3c134
@@ -233,8 +233,8 @@
jr .asm_3c134
.asm_3c13c
ld a, d
- ld [$cc3e], a
- ld a, [W_ISINBATTLE] ; $d057
+ ld [wcc3e], a
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
dec a
call nz, Func_3c92a
ld c, $28
@@ -246,16 +246,16 @@
and a
jp z, HandlePlayerBlackOut
call LoadScreenTilesFromBuffer1
- ld a, [W_BATTLETYPE] ; $d05a
+ ld a, [W_BATTLETYPE] ; wd05a
and a
jp z, Func_3c1ad
.asm_3c161
call InitBattleMenu
ret c
- ld a, [$cd6a]
+ ld a, [wcd6a]
and a
jr z, .asm_3c161
- ld a, [W_NUMSAFARIBALLS] ; $da47
+ ld a, [W_NUMSAFARIBALLS] ; W_NUMSAFARIBALLS
and a
jr nz, .asm_3c17a
call LoadScreenTilesFromBuffer1
@@ -263,17 +263,17 @@
jp PrintText
.asm_3c17a
callab PrintSafariZoneBattleText
- ld a, [$cffb]
+ ld a, [W_ENEMYMONSPEED + 1]
add a
ld b, a
jp c, asm_3c202
- ld a, [$cce9]
+ ld a, [wcce9]
and a
jr z, .asm_3c194
srl b
srl b
.asm_3c194
- ld a, [$cce8]
+ ld a, [wcce8]
and a
jr z, .asm_3c1a0
sla b
@@ -291,31 +291,31 @@
Func_3c1ad: ; 3c1ad (f:41ad)
xor a
- ld [wWhichPokemon], a ; $cf92
+ ld [wWhichPokemon], a ; wWhichPokemon
.asm_3c1b1
call Func_3ca97
jr nz, .asm_3c1bc
- ld hl, wWhichPokemon ; $cf92
+ ld hl, wWhichPokemon ; wWhichPokemon
inc [hl]
jr .asm_3c1b1
.asm_3c1bc
- ld a, [wWhichPokemon] ; $cf92
- ld [wPlayerMonNumber], a ; $cc2f
+ ld a, [wWhichPokemon] ; wWhichPokemon
+ ld [wPlayerMonNumber], a ; wPlayerMonNumber
inc a
- ld hl, W_NUMINPARTY ; $d163
+ ld hl, W_NUMINPARTY ; W_NUMINPARTY
ld c, a
ld b, $0
add hl, bc
ld a, [hl]
- ld [$cf91], a
- ld [$cfd9], a
+ ld [wcf91], a
+ ld [wcfd9], a
call LoadScreenTilesFromBuffer1
- FuncCoord 1, 5 ; $c405
+ FuncCoord 1, 5
ld hl, Coord
ld a, $9
call Func_3c8df
call SaveScreenTilesToBuffer1
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
ld c, a
ld b, $1
push bc
@@ -322,7 +322,7 @@
ld hl, W_PLAYERMONSALIVEFLAGS
ld a, $10 ; FlagActionPredef
call Predef
- ld hl, $ccf5
+ ld hl, wccf5
pop bc
ld a, $10 ; FlagActionPredef
call Predef
@@ -332,12 +332,12 @@
jr MainInBattleLoop
asm_3c202: ; 3c202 (f:4202)
call LoadScreenTilesFromBuffer1
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
ld hl, WildRanText
jr nz, .asm_3c216
xor a
- ld [$cf0b], a
+ ld [wcf0b], a
ld hl, EnemyRanText
.asm_3c216
call PrintText
@@ -363,19 +363,19 @@
ld a, [hli]
or [hl]
jp z, HandlePlayerMonFainted ; test if current player mon is fainted
- ld hl, $cfe6
+ ld hl, W_ENEMYMONCURHP
ld a, [hli]
or [hl]
jp z, HandleEnemyMonFainted
call SaveScreenTilesToBuffer1
xor a
- ld [$d11d], a
- ld a, [$d063]
+ ld [wd11d], a
+ ld a, [W_PLAYERBATTSTATUS2]
and $60
jr nz, .asm_3c2a6 ; 0x3c252 $52
- ld hl, $d067
+ ld hl, W_ENEMYBATTSTATUS1
res 3, [hl]
- ld hl, $d062
+ ld hl, W_PLAYERBATTSTATUS1
res 3, [hl]
ld a, [hl]
and $12
@@ -382,30 +382,30 @@
jr nz, .asm_3c2a6 ; 0x3c261 $43
call InitBattleMenu ; show battle menu
ret c
- ld a, [$d078]
+ ld a, [wd078]
and a
ret nz
- ld a, [$d018]
+ ld a, [W_PLAYERMONSTATUS]
and $27
jr nz, .asm_3c2a6 ; 0x3c271 $33
- ld a, [$d062]
+ ld a, [W_PLAYERBATTSTATUS1]
and $21
jr nz, .asm_3c2a6 ; 0x3c278 $2c
- ld a, [$d067]
+ ld a, [W_ENEMYBATTSTATUS1]
bit 5, a
jr z, .asm_3c288 ; 0x3c27f $7
ld a, $ff
- ld [$ccdc], a
+ ld [wPlayerSelectedMove], a
jr .asm_3c2a6 ; 0x3c286 $1e
.asm_3c288
- ld a, [$cd6a]
+ ld a, [wcd6a]
and a
jr nz, .asm_3c2a6 ; 0x3c28c $18
- ld [$ccdb], a
+ ld [wMoveMenuType], a
inc a
- ld [$d07c], a
+ ld [W_ANIMATIONID], a
xor a
- ld [$cc35], a
+ ld [wcc35], a
call MoveSelectionMenu
push af
call LoadScreenTilesFromBuffer1
@@ -417,7 +417,7 @@
ld a, [W_ISLINKBATTLE]
cp $4
jr nz, .noLinkBattle
- ld a, [$cc3e]
+ ld a, [wcc3e]
cp $f
jp z, asm_3c202
cp $e
@@ -426,10 +426,10 @@
jr z, .noLinkBattle
sub $4
jr c, .noLinkBattle
- ld a, [$d062]
+ ld a, [W_PLAYERBATTSTATUS1]
bit 5, a
jr z, .asm_3c2dd ; 0x3c2c9 $12
- ld a, [$cc2e]
+ ld a, [wPlayerMoveListIndex]
ld hl, W_PLAYERMONMOVES
ld c, a
ld b, $0
@@ -490,7 +490,7 @@
callab TrainerAI
jr c, .AIActionUsedEnemyFirst
call Func_3e6bc ; execute enemy move
- ld a, [$d078]
+ ld a, [wd078]
and a
ret nz
ld a, b
@@ -501,7 +501,7 @@
jp z, HandleEnemyMonFainted
call Func_3cd5a
call Func_3d65e ; execute player move
- ld a, [$d078]
+ ld a, [wd078]
and a
ret nz
ld a, b
@@ -514,7 +514,7 @@
jp MainInBattleLoop
.playerMovesFirst
call Func_3d65e ; execute player move
- ld a, [$d078]
+ ld a, [wd078]
and a
ret nz
ld a, b
@@ -528,7 +528,7 @@
callab TrainerAI
jr c, .AIActionUsedPlayerFirst
call Func_3e6bc ; execute enemy move
- ld a, [$d078]
+ ld a, [wd078]
and a
ret nz
ld a, b
@@ -542,13 +542,13 @@
jp MainInBattleLoop
HandlePoisonBurnLeechSeed: ; 3c3bd (f:43bd)
- ld hl, W_PLAYERMONCURHP ; $d015
- ld de, W_PLAYERMONSTATUS ; $d018
+ ld hl, W_PLAYERMONCURHP ; wd015
+ ld de, W_PLAYERMONSTATUS ; W_PLAYERMONSTATUS
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .playersTurn
- ld hl, W_ENEMYMONCURHP ; $cfe6
- ld de, W_ENEMYMONSTATUS ; $cfe9
+ ld hl, W_ENEMYMONCURHP ; W_ENEMYMONCURHP
+ ld de, W_ENEMYMONSTATUS ; wcfe9
.playersTurn
ld a, [de]
and (1 << BRN) | (1 << PSN)
@@ -562,17 +562,17 @@
.poisoned
call PrintText
xor a
- ld [$cc5b], a
+ ld [wcc5b], a
ld a,BURN_PSN_ANIM
call PlayMoveAnimation ; play burn/poison animation
pop hl
call HandlePoisonBurnLeechSeed_DecreaseOwnHP
.notBurnedOrPoisoned
- ld de, W_PLAYERBATTSTATUS2 ; $d063
+ ld de, W_PLAYERBATTSTATUS2 ; W_PLAYERBATTSTATUS2
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .playersTurn2
- ld de, W_ENEMYBATTSTATUS2 ; $d068
+ ld de, W_ENEMYBATTSTATUS2 ; W_ENEMYBATTSTATUS2
.playersTurn2
ld a, [de]
add a
@@ -583,7 +583,7 @@
xor $1
ld [H_WHOSETURN], a ; $fff3
xor a
- ld [$cc5b], a
+ ld [wcc5b], a
ld a,ABSORB
call PlayMoveAnimation ; play leech seed animation (from opposing mon)
pop af
@@ -643,13 +643,13 @@
jr nz, .nonZeroDamage
inc c ; damage is at least 1
.nonZeroDamage
- ld hl, W_PLAYERBATTSTATUS3 ; $d064
- ld de, W_PLAYERTOXICCOUNTER ; $d06c
+ ld hl, W_PLAYERBATTSTATUS3 ; W_PLAYERBATTSTATUS3
+ ld de, W_PLAYERTOXICCOUNTER ; wd06c
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .playersTurn
- ld hl, W_ENEMYBATTSTATUS3 ; $d069
- ld de, W_ENEMYTOXICCOUNTER ; $d071
+ ld hl, W_ENEMYBATTSTATUS3 ; W_ENEMYBATTSTATUS3
+ ld de, W_ENEMYTOXICCOUNTER ; wd071
.playersTurn
bit 0, [hl]
jr z, .noToxic
@@ -690,11 +690,11 @@
; adds bc to enemy HP
HandlePoisonBurnLeechSeed_IncreaseEnemyHP: ; 3c4a3 (f:44a3)
push hl
- ld hl, W_ENEMYMONMAXHP ; $cff4
+ ld hl, W_ENEMYMONMAXHP ; W_ENEMYMONMAXHP
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .playersTurn
- ld hl, W_PLAYERMONMAXHP ; $d023
+ ld hl, W_PLAYERMONMAXHP ; wd023
.playersTurn
ld a, [hli]
ld [wHPBarMaxHP+1], a
@@ -739,18 +739,18 @@
ret
UpdateCurMonHPBar: ; 3c4f6 (f:44f6)
- FuncCoord 10, 9 ; $c45e
+ FuncCoord 10, 9
ld hl, Coord ; tile pointer to player HP bar
ld a, [H_WHOSETURN] ; $fff3
and a
ld a, $1
jr z, .playersTurn
- FuncCoord 2, 2 ; $c3ca
+ FuncCoord 2, 2
ld hl, Coord ; tile pointer to enemy HP bar
xor a
.playersTurn
push bc
- ld [wListMenuID], a ; $cf94
+ ld [wListMenuID], a ; wListMenuID
ld a, $48
call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d))
pop bc
@@ -757,37 +757,37 @@
ret
Func_3c50f: ; 3c50f (f:450f)
- ld a, [$d06a]
+ ld a, [wd06a]
and a
jr nz, .asm_3c51a
- ld hl, W_PLAYERBATTSTATUS1 ; $d062
+ ld hl, W_PLAYERBATTSTATUS1 ; W_PLAYERBATTSTATUS1
res 5, [hl]
.asm_3c51a
- ld a, [$d06f]
+ ld a, [wd06f]
and a
ret nz
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
res 5, [hl]
ret
HandleEnemyMonFainted: ; 3c525 (f:4525)
xor a
- ld [$ccf0], a
+ ld [wccf0], a
call FaintEnemyPokemon
call AnyPlayerPokemonAliveCheck
ld a, d
and a
jp z, HandlePlayerBlackOut
- ld hl, W_PLAYERMONCURHP ; $d015
+ ld hl, W_PLAYERMONCURHP ; wd015
ld a, [hli]
or [hl]
call nz, Func_3cd60
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
dec a
ret z
call AnyEnemyPokemonAliveCheck
jp z, TrainerBattleVictory
- ld hl, W_PLAYERMONCURHP ; $d015
+ ld hl, W_PLAYERMONCURHP ; wd015
ld a, [hli]
or [hl]
jr nz, .asm_3c555
@@ -796,19 +796,19 @@
call Func_3c7d8
.asm_3c555
ld a, $1
- ld [$cd6a], a
+ ld [wcd6a], a
call Func_3c664
jp z, asm_3c202
xor a
- ld [$cd6a], a
+ ld [wcd6a], a
jp MainInBattleLoop
FaintEnemyPokemon ; 0x3c567
call ReadPlayerMonCurHPAndStatus
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
dec a
jr z, .wild
- ld a, [W_ENEMYMONNUMBER] ; $cfe8
+ ld a, [W_ENEMYMONNUMBER] ; W_ENEMYMONNUMBER
ld hl, W_ENEMYMON1HP
ld bc, $2c ; mon struct len
call AddNTimes
@@ -816,40 +816,40 @@
ld [hli], a
ld [hl], a
.wild
- ld hl, W_PLAYERBATTSTATUS1 ; $d062
+ ld hl, W_PLAYERBATTSTATUS1 ; W_PLAYERBATTSTATUS1
res 2, [hl]
xor a
- ld [W_NUMHITS], a ; $d074
- ld hl, $d065 ; enemy statuses
+ ld [W_NUMHITS], a ; wd074
+ ld hl, wd065 ; enemy statuses
ld [hli], a
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
- ld [W_ENEMYDISABLEDMOVE], a ; $d072
- ld [$ccef], a
- ld [$ccf3], a
- ld hl, $ccf1
+ ld [W_ENEMYDISABLEDMOVE], a ; W_ENEMYDISABLEDMOVE
+ ld [wccef], a
+ ld [wccf3], a
+ ld hl, wccf1
ld [hli], a
ld [hl], a
- FuncCoord 12, 5 ; $c410
+ FuncCoord 12, 5
ld hl, Coord
- FuncCoord 12, 6 ; $c424
+ FuncCoord 12, 6
ld de, Coord
call Func_3c893
ld hl, wTileMap
ld bc, $40b
call ClearScreenArea
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
dec a
jr z, .wild_win
xor a
- ld [$c0f1], a
- ld [$c0f2], a
+ ld [wc0f1], a
+ ld [wc0f2], a
ld a, (SFX_08_48 - SFX_Headers_08) / 3 ; SFX_FALL?
call PlaySoundWaitForCurrent
.sfxwait
- ld a, [$c02a]
+ ld a, [wc02a]
cp (SFX_08_48 - SFX_Headers_08) / 3
jr z, .sfxwait
ld a, (SFX_08_43 - SFX_Headers_08) / 3 ; SFX_DROP
@@ -861,11 +861,11 @@
ld a, MUSIC_DEFEATED_WILD_MON
call PlayBattleVictoryMusic
.sfxplayed
- ld hl, W_PLAYERMONCURHP ; $d015
+ ld hl, W_PLAYERMONCURHP ; wd015
ld a, [hli]
or [hl]
jr nz, .playermonnotfaint
- ld a, [$ccf0]
+ ld a, [wccf0]
and a
jr nz, .playermonnotfaint
call Func_3c741
@@ -879,12 +879,12 @@
call Func_3ee94
call SaveScreenTilesToBuffer1
xor a
- ld [$cf0b], a
+ ld [wcf0b], a
ld b, EXP__ALL
call IsItemInBag
push af
jr z, .no_exp_all
- ld hl, $d002
+ ld hl, wd002
ld b, $7
.exp_all_loop
srl [hl]
@@ -893,13 +893,13 @@
jr nz, .exp_all_loop
.no_exp_all
xor a
- ld [$cc5b], a
+ ld [wcc5b], a
callab GainExperience
pop af
ret z
ld a, $1
- ld [$cc5b], a
- ld a, [W_NUMINPARTY] ; $d163
+ ld [wcc5b], a
+ ld a, [W_NUMINPARTY] ; W_NUMINPARTY
ld b, $0
.asm_3c62c
scf
@@ -918,17 +918,17 @@
Func_3c643: ; 3c643 (f:4643)
xor a
- ld [$d083], a
- ld [$c02a], a
+ ld [wd083], a
+ ld [wc02a], a
inc a
- ld [$ccf6], a
+ ld [wccf6], a
ret
AnyEnemyPokemonAliveCheck: ; 3c64f (f:464f)
- ld a, [wEnemyPartyCount] ; $d89c
+ ld a, [wEnemyPartyCount] ; wEnemyPartyCount
ld b, a
xor a
- ld hl, W_ENEMYMON1HP ; $d8a5
+ ld hl, W_ENEMYMON1HP ; wd8a5
ld de, $2c
.asm_3c65a
or [hl]
@@ -942,15 +942,15 @@
ret
Func_3c664: ; 3c664 (f:4664)
- ld hl, $cf1e
+ ld hl, wcf1e
ld e, $30
call GetBattleHealthBarColor
callab DrawEnemyPokeballs
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
jr nz, .asm_3c687
call Func_3d605
- ld a, [$cc3e]
+ ld a, [wcc3e]
cp $f
ret z
call LoadScreenTilesFromBuffer1
@@ -957,9 +957,9 @@
.asm_3c687
call EnemySendOut
xor a
- ld [W_ENEMYMOVENUM], a ; $cfcc
- ld [$cd6a], a
- ld [$ccd5], a
+ ld [W_ENEMYMOVENUM], a ; W_ENEMYMOVENUM
+ ld [wcd6a], a
+ ld [wccd5], a
inc a
ret
@@ -966,12 +966,12 @@
TrainerBattleVictory: ; 3c696 (f:4696)
call Func_3c643
ld b, MUSIC_DEFEATED_GYM_LEADER
- ld a, [W_GYMLEADERNO] ; $d05c
+ ld a, [W_GYMLEADERNO] ; W_GYMLEADERNO
and a
jr nz, .gymleader
ld b, MUSIC_DEFEATED_TRAINER
.gymleader
- ld a, [W_TRAINERCLASS] ; $d031
+ ld a, [W_TRAINERCLASS] ; wd031
cp SONY3 ; final battle against rival
jr nz, .notrival
ld b, MUSIC_DEFEATED_GYM_LEADER
@@ -978,13 +978,13 @@
ld hl, W_FLAGS_D733
set 1, [hl]
.notrival
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
ld a, b
call nz, PlayBattleVictoryMusic
ld hl, TrainerDefeatedText
call PrintText
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
ret z
call ScrollTrainerPicAfterBattle
@@ -993,8 +993,8 @@
call Func_3381
ld hl, MoneyForWinningText
call PrintText
- ld de, wPlayerMoney + 2 ; $d349
- ld hl, $d07b
+ ld de, wPlayerMoney + 2 ; wd349
+ ld hl, wd07b
ld c, $3
ld a, $b ; AddBCDPredef
jp Predef
@@ -1010,7 +1010,7 @@
PlayBattleVictoryMusic: ; 3c6ee (f:46ee)
push af
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySoundWaitForCurrent
ld c, BANK(Music_DefeatedTrainer)
pop af
@@ -1019,18 +1019,18 @@
HandlePlayerMonFainted: ; 3c700 (f:4700)
ld a, $1
- ld [$ccf0], a
+ ld [wccf0], a
call Func_3c741
call AnyPlayerPokemonAliveCheck ; test if any more mons are alive
ld a, d
and a
jp z, HandlePlayerBlackOut
- ld hl, W_ENEMYMONCURHP ; $cfe6
+ ld hl, W_ENEMYMONCURHP ; W_ENEMYMONCURHP
ld a, [hli]
or [hl]
jr nz, .enemyMonNotFainted
call FaintEnemyPokemon
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
dec a
ret z ; if wild encounter, battle is over
call AnyEnemyPokemonAliveCheck
@@ -1041,46 +1041,46 @@
call Func_3c7d8
jp nz, MainInBattleLoop
ld a, $1
- ld [$cd6a], a
+ ld [wcd6a], a
call Func_3c664
jp z, asm_3c202
xor a
- ld [$cd6a], a
+ ld [wcd6a], a
jp MainInBattleLoop
Func_3c741: ; 3c741 (f:4741)
- ld a, [wPlayerMonNumber] ; $cc2f
+ ld a, [wPlayerMonNumber] ; wPlayerMonNumber
ld c, a
ld hl, W_PLAYERMONSALIVEFLAGS ; clear fainted mon's alive flag
ld b, $0
ld a, $10 ; FlagActionPredef
call Predef
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
res 2, [hl] ; reset "attacking multiple times" flag
- ld a, [$d083]
+ ld a, [wd083]
bit 7, a ; skip sound flag (red bar (?))
jr z, .skipWaitForSound
ld a, $ff
- ld [$d083], a
+ ld [wd083], a
call WaitForSoundToFinish
.skipWaitForSound
- ld hl, $cd05
+ ld hl, wcd05
ld [hli], a
ld [hl], a
- ld [W_PLAYERMONSTATUS], a ; $d018
+ ld [W_PLAYERMONSTATUS], a ; W_PLAYERMONSTATUS
call ReadPlayerMonCurHPAndStatus
- FuncCoord 9, 7 ; $c435
+ FuncCoord 9, 7
ld hl, Coord
ld bc, $50b
call ClearScreenArea
- FuncCoord 1, 10 ; $c469
+ FuncCoord 1, 10
ld hl, Coord
- FuncCoord 1, 11 ; $c47d
+ FuncCoord 1, 11
ld de, Coord
call Func_3c893
ld a, $1
- ld [$cf0b], a
- ld a, [$ccf0]
+ ld [wcf0b], a
+ ld a, [wccf0]
and a
ret z
ld a, [W_PLAYERMONID]
@@ -1095,7 +1095,7 @@
Func_3c79b: ; 3c79b (f:479b)
call Func_3ee94
call SaveScreenTilesToBuffer1
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
and a
dec a
ret nz
@@ -1102,22 +1102,22 @@
ld hl, UseNextMonText
call PrintText
.asm_3c7ad
- FuncCoord 13, 9 ; $c461
+ FuncCoord 13, 9
ld hl, Coord
ld bc, $a0e
ld a, $14
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
- ld a, [$d12e]
+ ld a, [wd12e]
cp $2
jr z, .asm_3c7c4
and a
ret
.asm_3c7c4
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
and a
jr z, .asm_3c7ad
- ld hl, W_PARTYMON1_SPEED ; $d193
+ ld hl, W_PARTYMON1_SPEED ; wd193
ld de, W_ENEMYMONSPEED
jp Func_3cab9
@@ -1127,7 +1127,7 @@
Func_3c7d8: ; 3c7d8 (f:47d8)
ld a, $2
- ld [$d07d], a
+ ld [wd07d], a
call DisplayPartyMenu
.asm_3c7e0
jr nc, .asm_3c7e7
@@ -1137,18 +1137,18 @@
.asm_3c7e7
call Func_3ca97
jr z, .asm_3c7e2
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
jr nz, .asm_3c7fa
inc a
- ld [$cd6a], a
+ ld [wcd6a], a
call Func_3d605
.asm_3c7fa
xor a
- ld [$cd6a], a
+ ld [wcd6a], a
call ClearSprites
- ld a, [wWhichPokemon] ; $cf92
- ld [wPlayerMonNumber], a ; $cc2f
+ ld a, [wWhichPokemon] ; wWhichPokemon
+ ld [wPlayerMonNumber], a ; wPlayerMonNumber
ld c, a
ld hl, W_PLAYERMONSALIVEFLAGS
ld b, $1
@@ -1156,7 +1156,7 @@
ld a, $10 ; FlagActionPredef
call Predef
pop bc
- ld hl, $ccf5
+ ld hl, wccf5
ld a, $10 ; FlagActionPredef
call Predef
call Func_3cba6
@@ -1166,7 +1166,7 @@
call GoPAL_SET_CF1C
call GBPalNormal
call Func_3cc91
- ld hl, W_ENEMYMONCURHP ; $cfe6
+ ld hl, W_ENEMYMONCURHP ; W_ENEMYMONCURHP
ld a, [hli]
or [hl]
ret
@@ -1174,10 +1174,10 @@
; called when player is out of usable mons.
; prints approriate lose message, sets carry flag if player blacked out (special case for initial rival fight)
HandlePlayerBlackOut: ; 3c837 (f:4837)
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
jr z, .notSony1Battle
- ld a, [W_CUROPPONENT] ; $d059
+ ld a, [W_CUROPPONENT] ; wd059
cp $c8 + SONY1
jr nz, .notSony1Battle
ld hl, wTileMap ; sony 1 battle
@@ -1195,15 +1195,15 @@
ld b, $0
call GoPAL_SET
ld hl, PlayerBlackedOutText2
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
jr nz, .noLinkBattle
ld hl, LinkBattleLostText
.noLinkBattle
call PrintText
- ld a, [$d732]
+ ld a, [wd732]
res 5, a
- ld [$d732], a
+ ld [wd732], a
call ClearScreen
scf
ret
@@ -1221,10 +1221,10 @@
db "@"
Func_3c893: ; 3c893 (f:4893)
- ld a, [$d730]
+ ld a, [wd730]
push af
set 6, a
- ld [$d730], a
+ ld [wd730], a
ld b, $7
.asm_3c89e
push bc
@@ -1263,7 +1263,7 @@
dec b
jr nz, .asm_3c89e
pop af
- ld [$d730], a
+ ld [wd730], a
ret
SevenSpacesText: ; 3c8d7 (f:48d7)
@@ -1313,13 +1313,13 @@
ld hl,W_PLAYERMONSALIVEFLAGS
xor a
ld [hl],a
- ld a,[$CC2F]
+ ld a,[wPlayerMonNumber]
ld c,a
ld b,1
push bc
ld a,$10
call Predef
- ld hl,$CCF5
+ ld hl,wccf5
xor a
ld [hl],a
pop bc
@@ -1327,16 +1327,16 @@
call Predef
Func_3c92a: ; 3c92a (f:492a)
xor a
- ld hl,$D065
+ ld hl,wd065
ld [hli],a
ld [hli],a
ld [hli],a
ld [hli],a
ld [hl],a
- ld [$D072],a
- ld [$CCEF],a
- ld [$CCF3],a
- ld hl,$CCF1
+ ld [W_ENEMYDISABLEDMOVE],a
+ ld [wccef],a
+ ld [wccf3],a
+ ld hl,wccf1
ld [hli],a
ld [hl],a
dec a
@@ -1343,16 +1343,16 @@
ld [wAICount],a
ld hl,W_PLAYERBATTSTATUS1
res 5,[hl]
- FuncCoord 18, 0 ; $c3b2
+ FuncCoord 18, 0
ld hl,Coord
ld a,8
call Func_3c8df
call Func_3ee94
call SaveScreenTilesToBuffer1
- ld a,[$D12B]
+ ld a,[W_ISLINKBATTLE]
cp 4
jr nz,.next
- ld a,[$CC3E]
+ ld a,[wcc3e]
sub 4
ld [wWhichPokemon],a
jr .next3
@@ -1360,10 +1360,10 @@
ld b,$FF
.next2
inc b
- ld a,[$CFE8]
+ ld a,[W_ENEMYMONNUMBER]
cp b
jr z,.next2
- ld hl,$D8A4
+ ld hl,wEnemyMon1Species
ld a,b
ld [wWhichPokemon],a
push bc
@@ -1378,59 +1378,59 @@
jr z,.next2
.next3
ld a,[wWhichPokemon]
- ld hl,$D8C5
+ ld hl,wd8c5
ld bc,$2C
call AddNTimes
ld a,[hl]
- ld [$D127],a
+ ld [W_CURENEMYLVL],a
ld a,[wWhichPokemon]
inc a
- ld hl,$D89C
+ ld hl,wEnemyPartyCount
ld c,a
ld b,0
add hl,bc
ld a,[hl]
ld [W_ENEMYMONID],a
- ld [$CF91],a
+ ld [wcf91],a
call Func_3eb01
- ld hl,$CFE6
+ ld hl,W_ENEMYMONCURHP
ld a,[hli]
- ld [$CCE3],a
+ ld [wcce3],a
ld a,[hl]
- ld [$CCE4],a
+ ld [wcce4],a
ld a,1
- ld [$CC26],a
- ld a,[$D11D]
+ ld [wCurrentMenuItem],a
+ ld a,[wd11d]
dec a
jr z,.next4
ld a,[W_NUMINPARTY]
dec a
jr z,.next4
- ld a,[$D12B]
+ ld a,[W_ISLINKBATTLE]
cp 4
jr z,.next4
- ld a,[$D355]
+ ld a,[W_OPTIONS]
bit 6,a
jr nz,.next4
ld hl, TrainerAboutToUseText
call PrintText
- FuncCoord 0, 7 ; $c42c
+ FuncCoord 0, 7
ld hl,Coord
ld bc,$0801
ld a,$14
- ld [$D125],a
+ ld [wd125],a
call DisplayTextBoxID
- ld a,[$CC26]
+ ld a,[wCurrentMenuItem]
and a
jr nz,.next4
ld a,2
- ld [$D07D],a
+ ld [wd07d],a
call DisplayPartyMenu
.next9
ld a,1
- ld [$CC26],a
+ ld [wCurrentMenuItem],a
jr c,.next7
- ld hl,$CC2F
+ ld hl,wPlayerMonNumber
ld a,[wWhichPokemon]
cp [hl]
jr nz,.next6
@@ -1443,7 +1443,7 @@
call Func_3ca97
jr z,.next8
xor a
- ld [$CC26],a
+ ld [wCurrentMenuItem],a
.next7
call GBPalWhiteOut
call Func_3ee5b
@@ -1459,14 +1459,14 @@
ld hl,TrainerSentOutText
call PrintText
ld a,[W_ENEMYMONID]
- ld [$CF91],a
- ld [$D0B5],a
+ ld [wcf91],a
+ ld [wd0b5],a
call GetMonHeader
ld de,$9000
call LoadMonFrontSprite
ld a,$CF
ld [$FFE1],a
- FuncCoord 15, 6 ; $c427
+ FuncCoord 15, 6
ld hl,Coord
ld a,2
call Predef
@@ -1473,12 +1473,12 @@
ld a,[W_ENEMYMONID]
call PlayCry
call Func_3cdec
- ld a,[$CC26]
+ ld a,[wCurrentMenuItem]
and a
ret nz
xor a
ld [W_PLAYERMONSALIVEFLAGS],a
- ld [$CCF5],a
+ ld [wccf5],a
call SaveScreenTilesToBuffer1
jp Func_3d1ba
@@ -1493,10 +1493,10 @@
; tests if the player has any pokemon that are not fainted
; sets d = 0 if all fainted, d != 0 if some mons are still alive
AnyPlayerPokemonAliveCheck: ; 3ca83 (f:4a83)
- ld a, [W_NUMINPARTY] ; $d163
+ ld a, [W_NUMINPARTY] ; W_NUMINPARTY
ld e, a
xor a
- ld hl, W_PARTYMON1_HP ; $d16c
+ ld hl, W_PARTYMON1_HP ; wd16c
ld bc, W_PARTYMON2DATA - W_PARTYMON1DATA - 1
.partyMonsLoop
or [hl]
@@ -1509,14 +1509,14 @@
ret
Func_3ca97: ; 3ca97 (f:4a97)
- ld a, [wWhichPokemon] ; $cf92
- ld hl, W_PARTYMON1_HP ; $d16c
+ ld a, [wWhichPokemon] ; wWhichPokemon
+ ld hl, W_PARTYMON1_HP ; wd16c
ld bc, $2c
call AddNTimes
ld a, [hli]
or [hl]
ret nz
- ld a, [$d11d]
+ ld a, [wd11d]
and a
jr nz, .asm_3cab2
ld hl, NoWillText
@@ -1532,18 +1532,18 @@
Func_3cab9: ; 3cab9 (f:4ab9)
call IsGhostBattle
jp z, .asm_3cb5c
- ld a, [W_BATTLETYPE] ; $d05a
+ ld a, [W_BATTLETYPE] ; wd05a
cp $2
jp z, .asm_3cb5c
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
jp z, .asm_3cb5c
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
dec a
jr nz, .asm_3cb4c
- ld a, [$d120]
+ ld a, [wd120]
inc a
- ld [$d120], a
+ ld [wd120], a
ld a, [hli]
ld [$ff97], a
ld a, [hl]
@@ -1583,7 +1583,7 @@
ld a, [$ff97]
and a
jr nz, .asm_3cb5c
- ld a, [$d120]
+ ld a, [wd120]
ld c, a
.asm_3cb2b
dec c
@@ -1601,7 +1601,7 @@
cp b
jr nc, .asm_3cb5c
ld a, $1
- ld [$cd6a], a
+ ld [wcd6a], a
ld hl, CantEscapeText
jr .asm_3cb4f
.asm_3cb4c
@@ -1609,29 +1609,29 @@
.asm_3cb4f
call PrintText
ld a, $1
- ld [$d11f], a
+ ld [wd11f], a
call SaveScreenTilesToBuffer1
and a
ret
.asm_3cb5c
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
ld a, $2
jr nz, .asm_3cb81
call SaveScreenTilesToBuffer1
xor a
- ld [$cd6a], a
+ ld [wcd6a], a
ld a, $f
- ld [wPlayerMoveListIndex], a ; $cc2e
+ ld [wPlayerMoveListIndex], a ; wPlayerMoveListIndex
call Func_3d605
call LoadScreenTilesFromBuffer1
- ld a, [$cc3e]
+ ld a, [wcc3e]
cp $f
ld a, $2
jr z, .asm_3cb81
dec a
.asm_3cb81
- ld [$cf0b], a
+ ld [wcf0b], a
ld a, (SFX_08_44 - SFX_Headers_08) / 3
call PlaySoundWaitForCurrent
ld hl, GotAwayText
@@ -1654,9 +1654,9 @@
db "@"
Func_3cba6: ; 3cba6 (f:4ba6)
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
ld bc, $2c
- ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA)
+ ld hl, W_PARTYMON1_NUM ; W_PARTYMON1_NUM (aliases: W_PARTYMON1DATA)
call AddNTimes
ld de, W_PLAYERMONID
ld bc, $c
@@ -1666,23 +1666,23 @@
ld de, W_PLAYERMONIVS
ld bc, $2
call CopyData
- ld de, W_PLAYERMONPP ; $d02d
+ ld de, W_PLAYERMONPP ; W_PLAYERMONPP
ld bc, $4
call CopyData
- ld de, W_PLAYERMONLEVEL ; $d022
+ ld de, W_PLAYERMONLEVEL ; W_PLAYERMONLEVEL
ld bc, $b
call CopyData
- ld a, [$cfd9]
- ld [$d0b5], a
+ ld a, [wcfd9]
+ ld [wd0b5], a
call GetMonHeader
- ld hl, W_PARTYMON1NAME ; $d2b5
- ld a, [wPlayerMonNumber] ; $cc2f
+ ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
+ ld a, [wPlayerMonNumber] ; wPlayerMonNumber
call SkipFixedLengthTextEntries
ld de, W_PLAYERMONNAME
ld bc, $b
call CopyData
- ld hl, W_PLAYERMONLEVEL ; $d022
- ld de, $cd0f
+ ld hl, W_PLAYERMONLEVEL ; W_PLAYERMONLEVEL
+ ld de, wcd0f
ld bc, $b
call CopyData
call Func_3ed1a
@@ -1689,7 +1689,7 @@
call Func_3ee19
ld a, $7
ld b, $8
- ld hl, wPlayerMonAttackMod ; $cd1a
+ ld hl, wPlayerMonAttackMod ; wcd1a
.asm_3cc0e
ld [hli], a
dec b
@@ -1697,40 +1697,40 @@
ret
Func_3cc13: ; 3cc13 (f:4c13)
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
ld bc, $2c
- ld hl, wEnemyMons ; $d8a4
+ ld hl, wEnemyMons ; wEnemyMon1Species
call AddNTimes
- ld de, $cfe5
+ ld de, wcfe5
ld bc, $c
call CopyData
ld bc, $f
add hl, bc
- ld de, $cff1
+ ld de, W_ENEMYMONATKDEFIV
ld bc, $2
call CopyData
- ld de, W_ENEMYMONPP ; $cffe
+ ld de, W_ENEMYMONPP ; wcffe
ld bc, $4
call CopyData
- ld de, W_ENEMYMONLEVEL ; $cff3
+ ld de, W_ENEMYMONLEVEL ; W_ENEMYMONLEVEL
ld bc, $b
call CopyData
- ld a, [$cfe5]
- ld [$d0b5], a
+ ld a, [wcfe5]
+ ld [wd0b5], a
call GetMonHeader
- ld hl, $d9ee
- ld a, [wWhichPokemon] ; $cf92
+ ld hl, W_ENEMYMON1NAME
+ ld a, [wWhichPokemon] ; wWhichPokemon
call SkipFixedLengthTextEntries
ld de, W_ENEMYMONNAME
ld bc, $b
call CopyData
- ld hl, W_ENEMYMONLEVEL ; $cff3
- ld de, $cd23
+ ld hl, W_ENEMYMONLEVEL ; W_ENEMYMONLEVEL
+ ld de, wcd23
ld bc, $b
call CopyData
call Func_3ed1e
ld hl, W_MONHBASESTATS
- ld de, $d002
+ ld de, wd002
ld b, $5
.asm_3cc79
ld a, [hli]
@@ -1740,18 +1740,18 @@
jr nz, .asm_3cc79
ld a, $7
ld b, $8
- ld hl, wEnemyMonStatMods ; $cd2e
+ ld hl, wEnemyMonStatMods ; wcd2e
.asm_3cc86
ld [hli], a
dec b
jr nz, .asm_3cc86
- ld a, [wWhichPokemon] ; $cf92
- ld [W_ENEMYMONNUMBER], a ; $cfe8
+ ld a, [wWhichPokemon] ; wWhichPokemon
+ ld [W_ENEMYMONNUMBER], a ; W_ENEMYMONNUMBER
ret
Func_3cc91: ; 3cc91 (f:4c91)
callab SendOutMon
- ld hl, W_ENEMYMONCURHP ; $cfe6
+ ld hl, W_ENEMYMONCURHP ; W_ENEMYMONCURHP
ld a, [hli]
or [hl]
jp z, Func_3cca4
@@ -1763,51 +1763,51 @@
call Predef ; indirect jump to LoadMonBackSprite (3f103 (f:7103))
xor a
ld [$ffe1], a
- ld hl, $cc2d
+ ld hl, wcc2d
ld [hli], a
ld [hl], a
- ld [$cc5b], a
- ld [$d05b], a
- ld [W_PLAYERMOVENUM], a ; $cfd2
- ld hl, $ccf1
+ ld [wcc5b], a
+ ld [wd05b], a
+ ld [W_PLAYERMOVENUM], a ; wcfd2
+ ld hl, wccf1
ld [hli], a
ld [hl], a
- ld hl, $d060
+ ld hl, wd060
ld [hli], a
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
- ld [W_PLAYERDISABLEDMOVE], a ; $d06d
- ld [$ccee], a
- ld [$ccf7], a
+ ld [W_PLAYERDISABLEDMOVE], a ; W_PLAYERDISABLEDMOVE
+ ld [wccee], a
+ ld [wccf7], a
ld b, $1
call GoPAL_SET
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
res 5, [hl]
ld a, $1
ld [H_WHOSETURN], a ; $fff3
ld a, POOF_ANIM
call PlayMoveAnimation
- FuncCoord 4, 11 ; $c480
+ FuncCoord 4, 11
ld hl, Coord
ld a, $2
call Predef ; indirect jump to Func_3f073 (3f073 (f:7073))
- ld a, [$cf91]
+ ld a, [wcf91]
call PlayCry
call Func_3ee94
jp SaveScreenTilesToBuffer1
Func_3ccfa: ; 3ccfa (f:4cfa)
- FuncCoord 1, 5 ; $c405
+ FuncCoord 1, 5
ld hl, Coord
ld bc, $707
call ClearScreenArea
- FuncCoord 3, 7 ; $c42f
+ FuncCoord 3, 7
ld hl, Coord
ld bc, $505
xor a
- ld [$cd6c], a
+ ld [wcd6c], a
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
ld a, $5
call Predef ; indirect jump to Func_79aba (79aba (1e:5aba))
@@ -1814,11 +1814,11 @@
ld c, $4
call DelayFrames
call Func_3cd3a
- FuncCoord 4, 9 ; $c458
+ FuncCoord 4, 9
ld hl, Coord
ld bc, $303
ld a, $1
- ld [$cd6c], a
+ ld [wcd6c], a
xor a
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
ld a, $5
@@ -1826,11 +1826,11 @@
call Delay3
call Func_3cd3a
ld a, $4c
- FuncCoord 5, 11 ; $c481
+ FuncCoord 5, 11
ld [Coord], a
Func_3cd3a: ; 3cd3a (f:4d3a)
- FuncCoord 1, 5 ; $c405
+ FuncCoord 1, 5
ld hl, Coord
ld bc, $707
jp ClearScreenArea
@@ -1837,13 +1837,13 @@
; reads player's current mon's HP into W_PLAYERMONCURHP
ReadPlayerMonCurHPAndStatus: ; 3cd43 (f:4d43)
- ld a, [wPlayerMonNumber] ; $cc2f
- ld hl, W_PARTYMON1_HP ; $d16c
+ ld a, [wPlayerMonNumber] ; wPlayerMonNumber
+ ld hl, W_PARTYMON1_HP ; wd16c
ld bc, W_PARTYMON2DATA - W_PARTYMON1DATA
call AddNTimes
ld d, h
ld e, l
- ld hl, W_PLAYERMONCURHP ; $d015
+ ld hl, W_PLAYERMONCURHP ; wd015
ld bc, $4 ; 2 bytes HP, 1 byte unknown (unused?), 1 byte status
jp CopyData
@@ -1854,67 +1854,67 @@
Func_3cd60: ; 3cd60 (f:4d60)
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
- FuncCoord 9, 7 ; $c435
+ FuncCoord 9, 7
ld hl, Coord
ld bc, $50b
call ClearScreenArea
callab PlacePlayerHUDTiles
- FuncCoord 18, 9 ; $c466
+ FuncCoord 18, 9
ld hl, Coord
ld [hl], $73
ld de, W_PLAYERMONNAME
- FuncCoord 10, 7 ; $c436
+ FuncCoord 10, 7
ld hl, Coord
call Func_3ce9c
call PlaceString
ld hl, W_PLAYERMONID
- ld de, $cf98
+ ld de, wcf98
ld bc, $c
call CopyData
- ld hl, W_PLAYERMONLEVEL ; $d022
- ld de, $cfb9
+ ld hl, W_PLAYERMONLEVEL ; W_PLAYERMONLEVEL
+ ld de, wcfb9
ld bc, $b
call CopyData
- FuncCoord 14, 8 ; $c44e
+ FuncCoord 14, 8
ld hl, Coord
push hl
inc hl
- ld de, $cf9c
+ ld de, wcf9c
call PrintStatusConditionNotFainted
pop hl
jr nz, .asm_3cdae
call PrintLevel
.asm_3cdae
- ld a, [$cf98]
- ld [$cf91], a
- FuncCoord 10, 9 ; $c45e
+ ld a, [wcf98]
+ ld [wcf91], a
+ FuncCoord 10, 9
ld hl, Coord
ld a, $5f
call Predef ; indirect jump to Func_128ef (128ef (4:68ef))
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
- ld hl, $cf1d
+ ld hl, wcf1d
call GetBattleHealthBarColor
- ld hl, W_PLAYERMONCURHP ; $d015
+ ld hl, W_PLAYERMONCURHP ; wd015
ld a, [hli]
or [hl]
jr z, .asm_3cdd9
- ld a, [$ccf6]
+ ld a, [wccf6]
and a
ret nz
- ld a, [$cf1d]
+ ld a, [wcf1d]
cp $2
jr z, .asm_3cde6
.asm_3cdd9
- ld hl, $d083
+ ld hl, wd083
bit 7, [hl]
ld [hl], $0
ret z
xor a
- ld [$c02a], a
+ ld [wc02a], a
ret
.asm_3cde6
- ld hl, $d083
+ ld hl, wd083
set 7, [hl]
ret
@@ -1926,23 +1926,23 @@
call ClearScreenArea
callab PlaceEnemyHUDTiles
ld de, W_ENEMYMONNAME
- FuncCoord 1, 0 ; $c3a1
+ FuncCoord 1, 0
ld hl, Coord
call Func_3ce9c
call PlaceString
- FuncCoord 4, 1 ; $c3b8
+ FuncCoord 4, 1
ld hl, Coord
push hl
inc hl
- ld de, W_ENEMYMONSTATUS ; $cfe9
+ ld de, W_ENEMYMONSTATUS ; wcfe9
call PrintStatusConditionNotFainted
pop hl
jr nz, .asm_3ce23
- ld a, [W_ENEMYMONLEVEL] ; $cff3
- ld [$cfb9], a
+ ld a, [W_ENEMYMONLEVEL] ; W_ENEMYMONLEVEL
+ ld [wcfb9], a
call PrintLevel
.asm_3ce23
- ld hl, W_ENEMYMONCURHP ; $cfe6
+ ld hl, W_ENEMYMONCURHP ; W_ENEMYMONCURHP
ld a, [hli]
ld [$ff97], a
ld a, [hld]
@@ -1959,7 +1959,7 @@
ld a, $30
ld [H_REMAINDER], a ; $ff99 (aliases: H_DIVISOR, H_MULTIPLIER, H_POWEROFTEN)
call Multiply
- ld hl, W_ENEMYMONMAXHP ; $cff4
+ ld hl, W_ENEMYMONMAXHP ; W_ENEMYMONMAXHP
ld a, [hli]
ld b, a
ld a, [hl]
@@ -1999,13 +1999,13 @@
Func_3ce7f: ; 3ce7f (f:4e7f)
xor a
- ld [wListMenuID], a ; $cf94
- FuncCoord 2, 2 ; $c3ca
+ ld [wListMenuID], a ; wListMenuID
+ FuncCoord 2, 2
ld hl, Coord
call DrawHPBar
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
- ld hl, $cf1e
+ ld hl, wcf1e
GetBattleHealthBarColor: ; 3ce90 (f:4e90)
ld b, [hl]
@@ -2039,7 +2039,7 @@
InitBattleMenu: ; 3ceb3 (f:4eb3)
call LoadScreenTilesFromBuffer1 ; restore saved screen
- ld a, [W_BATTLETYPE] ; $d05a
+ ld a, [W_BATTLETYPE] ; wd05a
and a
jr nz, .nonstandardbattle
call Func_3cd5a ; redraw names and HP bars?
@@ -2046,20 +2046,20 @@
call Func_3ee94
call SaveScreenTilesToBuffer1
.nonstandardbattle
- ld a, [W_BATTLETYPE] ; $d05a
+ ld a, [W_BATTLETYPE] ; wd05a
cp $2 ; safari
ld a, $b ; safari menu id
jr nz, .menuselected
ld a, $1b ; regular menu id
.menuselected
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
- ld a, [W_BATTLETYPE] ; $d05a
+ ld a, [W_BATTLETYPE] ; wd05a
dec a
jp nz, RegularBattleMenu ; regular battle
; the following happens for the old man tutorial
- ld hl, W_PLAYERNAME ; $d158
- ld de, W_GRASSRATE ; $d887
+ ld hl, W_PLAYERNAME ; wd158
+ ld de, W_GRASSRATE ; W_GRASSRATE
ld bc, $b
call CopyData ; temporarily save the player name in unused space,
; which is supposed to get overwritten when entering a
@@ -2067,17 +2067,17 @@
; may not get overwritten (cinnabar) and the infamous
; missingno. glitch can show up.
ld hl, OldManName ; $4f12
- ld de, W_PLAYERNAME ; $d158
+ ld de, W_PLAYERNAME ; wd158
ld bc, $b
call CopyData
; the following simulates the keystrokes by drawing menus on screen
- FuncCoord 9, 14 ; $c4c1
+ FuncCoord 9, 14
ld hl, Coord
ld [hl], "▶"
ld c, $50
call DelayFrames
ld [hl], $7f
- FuncCoord 9, 16 ; $c4e9
+ FuncCoord 9, 16
ld hl, Coord
ld [hl], "▶"
ld c, $32
@@ -2090,38 +2090,38 @@
db "OLD MAN@"
RegularBattleMenu: ; 3cf1a (f:4f1a)
- ld a, [$cc2d]
- ld [wCurrentMenuItem], a ; $cc26
- ld [wLastMenuItem], a ; $cc2a
+ ld a, [wcc2d]
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld [wLastMenuItem], a ; wLastMenuItem
sub $2
jr c, .leftcolumn
- ld [wCurrentMenuItem], a ; $cc26
- ld [wLastMenuItem], a ; $cc2a
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld [wLastMenuItem], a ; wLastMenuItem
jr .rightcolumn
.leftcolumn
- ld a, [W_BATTLETYPE] ; $d05a
+ ld a, [W_BATTLETYPE] ; wd05a
cp $2
ld a, " "
jr z, .safaribattle
- FuncCoord 15, 14 ; $c4c7
+ FuncCoord 15, 14
ld [Coord], a
- FuncCoord 15, 16 ; $c4ef
+ FuncCoord 15, 16
ld [Coord], a
ld b, $9
jr .notsafari
.safaribattle
- FuncCoord 13, 14 ; $c4c5
+ FuncCoord 13, 14
ld [Coord], a
- FuncCoord 13, 16 ; $c4ed
+ FuncCoord 13, 16
ld [Coord], a
- FuncCoord 7, 14 ; $c4bf
+ FuncCoord 7, 14
ld hl, Coord
- ld de, W_NUMSAFARIBALLS ; $da47
+ ld de, W_NUMSAFARIBALLS ; W_NUMSAFARIBALLS
ld bc, $102
call PrintNumber
ld b, $1
.notsafari
- ld hl, wTopMenuItemY ; $cc24
+ ld hl, wTopMenuItemY ; wTopMenuItemY
ld a, $e
ld [hli], a
ld a, b
@@ -2136,29 +2136,29 @@
jr nz, .rightcolumn
jr .selection
.rightcolumn
- ld a, [W_BATTLETYPE] ; $d05a
+ ld a, [W_BATTLETYPE] ; wd05a
cp $2
ld a, " "
jr z, .safarirightcolumn
- FuncCoord 9, 14 ; $c4c1
+ FuncCoord 9, 14
ld [Coord], a
- FuncCoord 9, 16 ; $c4e9
+ FuncCoord 9, 16
ld [Coord], a
ld b, $f
jr .notsafarirightcolumn
.safarirightcolumn
- FuncCoord 1, 14 ; $c4b9
+ FuncCoord 1, 14
ld [Coord], a
- FuncCoord 1, 16 ; $c4e1
+ FuncCoord 1, 16
ld [Coord], a
- FuncCoord 7, 14 ; $c4bf
+ FuncCoord 7, 14
ld hl, Coord
- ld de, W_NUMSAFARIBALLS ; $da47
+ ld de, W_NUMSAFARIBALLS ; W_NUMSAFARIBALLS
ld bc, $102
call PrintNumber
ld b, $d
.notsafarirightcolumn
- ld hl, wTopMenuItemY ; $cc24
+ ld hl, wTopMenuItemY ; wTopMenuItemY
ld a, $e
ld [hli], a
ld a, b
@@ -2172,15 +2172,15 @@
call HandleMenuInput
bit 5, a
jr nz, .leftcolumn
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
add $2 ; if we're in the right column, the actual id is +2
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
.selection
call PlaceUnfilledArrowMenuCursor
- ld a, [W_BATTLETYPE] ; $d05a
+ ld a, [W_BATTLETYPE] ; wd05a
cp $2
- ld a, [wCurrentMenuItem] ; $cc26
- ld [$cc2d], a
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+ ld [wcc2d], a
jr z, .asm_3cfd0
cp $1
jr nz, .asm_3cfcb
@@ -2194,21 +2194,21 @@
and a
jr nz, Func_3cfe8
; first option was selected...
- ld a, [W_BATTLETYPE] ; $d05a
+ ld a, [W_BATTLETYPE] ; wd05a
cp $2
jr z, .safari1
xor a
- ld [$d120], a
+ ld [wd120], a
jp LoadScreenTilesFromBuffer1 ; restore saved screen and return??
.safari1 ; safari first option??
ld a, SAFARI_BALL
- ld [$cf91], a
+ ld [wcf91], a
jr asm_3d05f
Func_3cfe8: ; 3cfe8 (f:4fe8)
cp $2
jp nz, Func_3d0ca
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
jr nz, .asm_3cffd
ld hl, ItemsCantBeUsedHereText
@@ -2216,27 +2216,27 @@
jp InitBattleMenu
.asm_3cffd ; bag?
call SaveScreenTilesToBuffer2 ; copy bg?
- ld a, [W_BATTLETYPE] ; $d05a
+ ld a, [W_BATTLETYPE] ; wd05a
cp $2
jr nz, asm_3d00e
ld a, SAFARI_BAIT
- ld [$cf91], a
+ ld [wcf91], a
jr asm_3d05f
asm_3d00e: ; 3d00e (f:500e)
call LoadScreenTilesFromBuffer1
- ld a, [W_BATTLETYPE] ; $d05a
+ ld a, [W_BATTLETYPE] ; wd05a
and a
jr nz, .asm_3d01a
call Func_3cd5a
.asm_3d01a
- ld a, [W_BATTLETYPE] ; $d05a
+ ld a, [W_BATTLETYPE] ; wd05a
dec a
jr nz, Func_3d031
ld hl, OldManItemList
ld a, l
- ld [$cf8b], a
+ ld [wcf8b], a
ld a, h
- ld [$cf8c], a
+ ld [wcf8c], a
jr Func_3d03c
OldManItemList: ; 3d02d (f:502d)
@@ -2243,56 +2243,56 @@
db $01, POKE_BALL, 50, $ff
Func_3d031
- ld hl, wNumBagItems ; $d31d
+ ld hl, wNumBagItems ; wNumBagItems
ld a, l
- ld [$cf8b], a
+ ld [wcf8b], a
ld a, h
- ld [$cf8c], a
+ ld [wcf8c], a
Func_3d03c
xor a
- ld [$cf93], a
+ ld [wcf93], a
ld a, $3
- ld [wListMenuID], a ; $cf94
- ld a, [$cc2c]
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wListMenuID], a ; wListMenuID
+ ld a, [wcc2c]
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
call DisplayListMenuID
- ld a, [wCurrentMenuItem] ; $cc26
- ld [$cc2c], a
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+ ld [wcc2c], a
ld a, $0
- ld [$cc37], a
- ld [$cc35], a
+ ld [wcc37], a
+ ld [wcc35], a
jp c, InitBattleMenu
asm_3d05f: ; 3d05f (f:505f)
- ld a, [$cf91]
- ld [$d11e], a
+ ld a, [wcf91]
+ ld [wd11e], a
call GetItemName
call CopyStringToCF4B ; copy name
xor a
- ld [$d152], a
+ ld [wd152], a
call UseItem
call Func_3ee5b
call ClearSprites
xor a
- ld [wCurrentMenuItem], a ; $cc26
- ld a, [W_BATTLETYPE] ; $d05a
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld a, [W_BATTLETYPE] ; wd05a
cp $2
jr z, .asm_3d09c
- ld a, [$cd6a]
+ ld a, [wcd6a]
and a
jp z, asm_3d00e
- ld a, [W_PLAYERBATTSTATUS1] ; $d062
+ ld a, [W_PLAYERBATTSTATUS1] ; W_PLAYERBATTSTATUS1
bit 5, a
jr z, .asm_3d09c
- ld hl, $d06a
+ ld hl, wd06a
dec [hl]
jr nz, .asm_3d09c
- ld hl, W_PLAYERBATTSTATUS1 ; $d062
+ ld hl, W_PLAYERBATTSTATUS1 ; W_PLAYERBATTSTATUS1
res 5, [hl]
.asm_3d09c
- ld a, [$d11c]
+ ld a, [wd11c]
and a
jr nz, .asm_3d0b7
- ld a, [W_BATTLETYPE] ; $d05a
+ ld a, [W_BATTLETYPE] ; wd05a
cp $2
jr z, .asm_3d0b2
call LoadScreenTilesFromBuffer1
@@ -2305,9 +2305,9 @@
.asm_3d0b7
call GBPalNormal
xor a
- ld [$d11c], a
+ ld [wd11c], a
ld a, $2
- ld [$cf0b], a
+ ld [wcf0b], a
scf
ret
@@ -2319,18 +2319,18 @@
dec a
jp nz, Func_3d1fa
call SaveScreenTilesToBuffer2
- ld a, [W_BATTLETYPE] ; $d05a
+ ld a, [W_BATTLETYPE] ; wd05a
cp $2
jr nz, Func_3d0e0
ld a, SAFARI_ROCK
- ld [$cf91], a
+ ld [wcf91], a
jp asm_3d05f
Func_3d0e0: ; 3d0e0 (f:50e0)
call LoadScreenTilesFromBuffer1
xor a
- ld [$d07d], a
- ld [$cc35], a
+ ld [wd07d], a
+ ld [wcc35], a
call DisplayPartyMenu
asm_3d0ed: ; 3d0ed (f:50ed)
jp nc, Func_3d119
@@ -2344,21 +2344,21 @@
jp InitBattleMenu
Func_3d105: ; 3d105 (f:5105)
- FuncCoord 11, 11 ; $c487
+ FuncCoord 11, 11
ld hl, Coord
ld bc, $81
ld a, $7f
call FillMemory
xor a
- ld [$d07d], a
+ ld [wd07d], a
call GoBackToPartyMenu
jr asm_3d0ed
Func_3d119: ; 3d119 (f:5119)
ld a, $c
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
- ld hl, wTopMenuItemY ; $cc24
+ ld hl, wTopMenuItemY ; wTopMenuItemY
ld a, $c
ld [hli], a
ld [hli], a
@@ -2375,30 +2375,30 @@
bit 1, a
jr nz, Func_3d105
call PlaceUnfilledArrowMenuCursor
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
cp $2
jr z, asm_3d0f0
and a
jr z, .asm_3d18a
xor a
- ld [$cc49], a
- ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA)
+ ld [wcc49], a
+ ld hl, W_PARTYMON1_NUM ; W_PARTYMON1_NUM (aliases: W_PARTYMON1DATA)
call ClearSprites
ld a, $36
call Predef ; indirect jump to StatusScreen (12953 (4:6953))
ld a, $37
call Predef ; indirect jump to StatusScreen2 (12b57 (4:6b57))
- ld a, [W_ENEMYBATTSTATUS2] ; $d068
+ ld a, [W_ENEMYBATTSTATUS2] ; W_ENEMYBATTSTATUS2
bit 4, a
ld hl, AnimationSubstitute
jr nz, .asm_3d182
- ld a, [$ccf3]
+ ld a, [wccf3]
and a
ld hl, AnimationMinimizeMon
jr nz, .asm_3d182
- ld a, [$cfe5]
- ld [$cf91], a
- ld [$d0b5], a
+ ld a, [wcfe5]
+ ld [wcf91], a
+ ld [wd0b5], a
call GetMonHeader
ld de, $9000
call LoadMonFrontSprite
@@ -2409,9 +2409,9 @@
.asm_3d187
jp Func_3d0e0
.asm_3d18a
- ld a, [wPlayerMonNumber] ; $cc2f
+ ld a, [wPlayerMonNumber] ; wPlayerMonNumber
ld d, a
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
cp d
jr nz, .asm_3d19d
ld hl, AlreadyOutText
@@ -2421,7 +2421,7 @@
call Func_3ca97
jp z, Func_3d105
ld a, $1
- ld [$cd6a], a
+ ld [wcd6a], a
call GBPalWhiteOut
call ClearSprites
call Func_3ee5b
@@ -2434,8 +2434,8 @@
ld c, $32
call DelayFrames
call Func_3ccfa
- ld a, [wWhichPokemon] ; $cf92
- ld [wPlayerMonNumber], a ; $cc2f
+ ld a, [wWhichPokemon] ; wWhichPokemon
+ ld [wPlayerMonNumber], a ; wPlayerMonNumber
ld c, a
ld b, $1
push bc
@@ -2443,7 +2443,7 @@
ld a, $10 ; FlagActionPredef
call Predef
pop bc
- ld hl, $ccf5
+ ld hl, wccf5
ld a, $10 ; FlagActionPredef
call Predef
call Func_3cba6
@@ -2450,7 +2450,7 @@
call Func_3cc91
call SaveScreenTilesToBuffer1
ld a, $2
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
and a
ret
@@ -2461,14 +2461,14 @@
Func_3d1fa: ; 3d1fa (f:51fa)
call LoadScreenTilesFromBuffer1
ld a, $3
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
ld hl, W_PLAYERMONSPEED
ld de, W_ENEMYMONSPEED
call Func_3cab9
ld a, $0
- ld [$d11f], a
+ ld [wd11f], a
ret c
- ld a, [$cd6a]
+ ld a, [wcd6a]
and a
ret nz
jp InitBattleMenu
@@ -2482,7 +2482,7 @@
jr .regularmenu
.loadmoves
- ld de, $d0dc
+ ld de, wd0dc
ld bc, $4
call CopyData
callab Func_39b87
@@ -2489,7 +2489,7 @@
ret
.writemoves
- ld de, $d0e1
+ ld de, wd0e1
ld a, [$fff6]
set 2, a
ld [$fff6], a
@@ -2504,20 +2504,20 @@
ret z
ld hl, W_PLAYERMONMOVES
call .loadmoves
- FuncCoord 4, 12 ; $c494
+ FuncCoord 4, 12
ld hl, Coord
ld b, $4
ld c, $e
di
call TextBoxBorder
- FuncCoord 4, 12 ; $c494
+ FuncCoord 4, 12
ld hl, Coord
ld [hl], $7a
- FuncCoord 10, 12 ; $c49a
+ FuncCoord 10, 12
ld hl, Coord
ld [hl], $7e
ei
- FuncCoord 6, 13 ; $c4aa
+ FuncCoord 6, 13
ld hl, Coord
call .writemoves
ld b, $5
@@ -2526,12 +2526,12 @@
.mimicmenu
ld hl, W_ENEMYMONMOVES
call .loadmoves
- FuncCoord 0, 7 ; $c42c
+ FuncCoord 0, 7
ld hl, Coord
ld b, $4
ld c, $e
call TextBoxBorder
- FuncCoord 2, 8 ; $c442
+ FuncCoord 2, 8
ld hl, Coord
call .writemoves
ld b, $1
@@ -2538,23 +2538,23 @@
ld a, $7
jr .menuset
.relearnmenu
- ld a, [wWhichPokemon] ; $cf92
- ld hl, W_PARTYMON1_MOVE1 ; $d173
+ ld a, [wWhichPokemon] ; wWhichPokemon
+ ld hl, W_PARTYMON1_MOVE1 ; W_PARTYMON1_MOVE1
ld bc, $2c
call AddNTimes
call .loadmoves
- FuncCoord 4, 7 ; $c430
+ FuncCoord 4, 7
ld hl, Coord
ld b, $4
ld c, $e
call TextBoxBorder
- FuncCoord 6, 8 ; $c446
+ FuncCoord 6, 8
ld hl, Coord
call .writemoves
ld b, $5
ld a, $7
.menuset
- ld hl, wTopMenuItemY ; $cc24
+ ld hl, wTopMenuItemY ; wTopMenuItemY
ld [hli], a
ld a, b
ld [hli], a ; wTopMenuItemX
@@ -2563,12 +2563,12 @@
jr z, .selectedmoveknown
ld a, $1
jr nc, .selectedmoveknown
- ld a, [wPlayerMoveListIndex] ; $cc2e
+ ld a, [wPlayerMoveListIndex] ; wPlayerMoveListIndex
inc a
.selectedmoveknown
ld [hli], a ; wCurrentMenuItem
inc hl ; wTileBehindCursor untouched
- ld a, [$cd6c]
+ ld a, [wcd6c]
inc a
inc a
ld [hli], a ; wMaxMenuItem
@@ -2579,7 +2579,7 @@
dec a
ld b, $c3
jr z, .matchedkeyspicked
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
jr z, .matchedkeyspicked
ld a, [W_FLAGS_D733]
@@ -2593,7 +2593,7 @@
ld a, [wMoveMenuType]
cp $1
jr z, .movelistindex1
- ld a, [wPlayerMoveListIndex] ; $cc2e
+ ld a, [wPlayerMoveListIndex] ; wPlayerMoveListIndex
inc a
.movelistindex1
ld [hl], a ; wLastMenuItem
@@ -2604,7 +2604,7 @@
jr z, .battleselect
dec a
jr nz, .select
- FuncCoord 1, 14 ; $c4b9
+ FuncCoord 1, 14
ld hl, Coord
ld de, WhichTechniqueString ; $53b8
call PlaceString
@@ -2614,10 +2614,10 @@
bit 0, a
jr nz, .select
call Func_3d4b6
- ld a, [$cc35]
+ ld a, [wcc35]
and a
jr z, .select
- FuncCoord 5, 13 ; $c4a9
+ FuncCoord 5, 13
ld hl, Coord
dec a
ld bc, $14
@@ -2638,10 +2638,10 @@
bit 1, a ; B, but was it reset above?
push af
xor a
- ld [$cc35], a
- ld a, [wCurrentMenuItem] ; $cc26
+ ld [wcc35], a
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
dec a
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
ld b, a
ld a, [wMoveMenuType]
dec a ; if not mimic
@@ -2651,7 +2651,7 @@
.nob
dec a
ld a, b
- ld [wPlayerMoveListIndex], a ; $cc2e
+ ld [wPlayerMoveListIndex], a ; wPlayerMoveListIndex
jr nz, .moveselected
pop af
ret
@@ -2658,8 +2658,8 @@
.moveselected
pop af
ret nz
- ld hl, W_PLAYERMONPP ; $d02d
- ld a, [wCurrentMenuItem] ; $cc26
+ ld hl, W_PLAYERMONPP ; W_PLAYERMONPP
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
ld c, a
ld b, $0
add hl, bc
@@ -2666,23 +2666,23 @@
ld a, [hl]
and $3f
jr z, .nopp
- ld a, [W_PLAYERDISABLEDMOVE] ; $d06d
+ ld a, [W_PLAYERDISABLEDMOVE] ; W_PLAYERDISABLEDMOVE
swap a
and $f
dec a
cp c
jr z, .disabled
- ld a, [W_PLAYERBATTSTATUS3] ; $d064
+ ld a, [W_PLAYERBATTSTATUS3] ; W_PLAYERBATTSTATUS3
bit 3, a ; transformed
jr nz, .dummy ; game freak derp
.dummy
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
ld hl, W_PLAYERMONMOVES
ld c, a
ld b, $0
add hl, bc
ld a, [hl]
- ld [wPlayerSelectedMove], a ; $ccdc
+ ld [wPlayerSelectedMove], a ; wPlayerSelectedMove
xor a
ret
.disabled
@@ -2707,19 +2707,19 @@
db "WHICH TECHNIQUE?@"
Func_3d3c9: ; 3d3c9 (f:53c9)
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
and a
jp nz, Func_3d2fe
call EraseMenuCursor
- ld a, [$cd6c]
+ ld a, [wcd6c]
inc a
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
jp Func_3d2fe
Func_3d3dd: ; 3d3dd (f:53dd)
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
ld b, a
- ld a, [$cd6c]
+ ld a, [wcd6c]
inc a
inc a
cp b
@@ -2726,15 +2726,15 @@
jp nz, Func_3d2fe
call EraseMenuCursor
ld a, $1
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
jp Func_3d2fe
Func_3d3f5: ; 3d3f5 (f:53f5)
ld a, $a5
- ld [wPlayerSelectedMove], a ; $ccdc
- ld a, [W_PLAYERDISABLEDMOVE] ; $d06d
+ ld [wPlayerSelectedMove], a ; wPlayerSelectedMove
+ ld a, [W_PLAYERDISABLEDMOVE] ; W_PLAYERDISABLEDMOVE
and a
- ld hl, W_PLAYERMONPP ; $d02d
+ ld hl, W_PLAYERMONPP ; W_PLAYERMONPP
jr nz, .asm_3d40e
ld a, [hli]
or [hl]
@@ -2776,43 +2776,43 @@
db "@"
Func_3d435: ; 3d435 (f:5435)
- ld a, [$cc35]
+ ld a, [wcc35]
and a
jr z, asm_3d4ad
ld hl, W_PLAYERMONMOVES
call Func_3d493
- ld hl, W_PLAYERMONPP ; $d02d
+ ld hl, W_PLAYERMONPP ; W_PLAYERMONPP
call Func_3d493
- ld hl, W_PLAYERDISABLEDMOVE ; $d06d
+ ld hl, W_PLAYERDISABLEDMOVE ; W_PLAYERDISABLEDMOVE
ld a, [hl]
swap a
and $f
ld b, a
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
cp b
jr nz, .asm_3d463
ld a, [hl]
and $f
ld b, a
- ld a, [$cc35]
+ ld a, [wcc35]
swap a
add b
ld [hl], a
jr .asm_3d474
.asm_3d463
- ld a, [$cc35]
+ ld a, [wcc35]
cp b
jr nz, .asm_3d474
ld a, [hl]
and $f
ld b, a
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
swap a
add b
ld [hl], a
.asm_3d474
- ld hl, W_PARTYMON1_MOVE1 ; $d173
- ld a, [wPlayerMonNumber] ; $cc2f
+ ld hl, W_PARTYMON1_MOVE1 ; W_PARTYMON1_MOVE1
+ ld a, [wPlayerMonNumber] ; wPlayerMonNumber
ld bc, $2c
call AddNTimes
push hl
@@ -2822,12 +2822,12 @@
add hl, bc
call Func_3d493
xor a
- ld [$cc35], a
+ ld [wcc35], a
jp MoveSelectionMenu
Func_3d493: ; 3d493 (f:5493)
push hl
- ld a, [$cc35]
+ ld a, [wcc35]
dec a
ld c, a
ld b, $0
@@ -2835,7 +2835,7 @@
ld d, h
ld e, l
pop hl
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
dec a
ld c, a
ld b, $0
@@ -2847,80 +2847,80 @@
ld [de], a
ret
asm_3d4ad: ; 3d4ad (f:54ad)
- ld a, [wCurrentMenuItem] ; $cc26
- ld [$cc35], a
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+ ld [wcc35], a
jp MoveSelectionMenu
Func_3d4b6: ; 3d4b6 (f:54b6)
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
- FuncCoord 0, 8 ; $c440
+ FuncCoord 0, 8
ld hl, Coord
ld b, $3
ld c, $9
call TextBoxBorder
- ld a, [W_PLAYERDISABLEDMOVE] ; $d06d
+ ld a, [W_PLAYERDISABLEDMOVE] ; W_PLAYERDISABLEDMOVE
and a
jr z, .asm_3d4df
swap a
and $f
ld b, a
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
cp b
jr nz, .asm_3d4df
- FuncCoord 1, 10 ; $c469
+ FuncCoord 1, 10
ld hl, Coord
ld de, DisabledText
call PlaceString
jr .asm_3d54e
.asm_3d4df
- ld hl, wCurrentMenuItem ; $cc26
+ ld hl, wCurrentMenuItem ; wCurrentMenuItem
dec [hl]
xor a
ld [H_WHOSETURN], a ; $fff3
ld hl, W_PLAYERMONMOVES
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
ld c, a
ld b, $0
add hl, bc
ld a, [hl]
- ld [wPlayerSelectedMove], a ; $ccdc
- ld a, [wPlayerMonNumber] ; $cc2f
- ld [wWhichPokemon], a ; $cf92
+ ld [wPlayerSelectedMove], a ; wPlayerSelectedMove
+ ld a, [wPlayerMonNumber] ; wPlayerMonNumber
+ ld [wWhichPokemon], a ; wWhichPokemon
ld a, $4
- ld [$cc49], a
+ ld [wcc49], a
callab GetMaxPP
- ld hl, wCurrentMenuItem ; $cc26
+ ld hl, wCurrentMenuItem ; wCurrentMenuItem
ld c, [hl]
inc [hl]
ld b, $0
- ld hl, W_PLAYERMONPP ; $d02d
+ ld hl, W_PLAYERMONPP ; W_PLAYERMONPP
add hl, bc
ld a, [hl]
and $3f
- ld [$cd6d], a
- FuncCoord 1, 9 ; $c455
+ ld [wcd6d], a
+ FuncCoord 1, 9
ld hl, Coord
ld de, TypeText
call PlaceString
- FuncCoord 7, 11 ; $c483
+ FuncCoord 7, 11
ld hl, Coord
ld [hl], "/"
- FuncCoord 5, 9 ; $c459
+ FuncCoord 5, 9
ld hl, Coord
ld [hl], "/"
- FuncCoord 5, 11 ; $c481
+ FuncCoord 5, 11
ld hl, Coord
- ld de, $cd6d
+ ld de, wcd6d
ld bc, $102
call PrintNumber
- FuncCoord 8, 11 ; $c484
+ FuncCoord 8, 11
ld hl, Coord
- ld de, $d11e
+ ld de, wd11e
ld bc, $102
call PrintNumber
call GetCurrentMove
- FuncCoord 2, 10 ; $c46a
+ FuncCoord 2, 10
ld hl, Coord
ld a, $5d
call Predef ; indirect jump to Func_27d98 (27d98 (9:7d98))
@@ -2942,7 +2942,7 @@
call SaveScreenTilesToBuffer1
call Func_3d605
call LoadScreenTilesFromBuffer1
- ld a, [$cc3e]
+ ld a, [wcc3e]
cp $e
jp z, .asm_3d601
cp $d
@@ -2949,7 +2949,7 @@
jr z, .unableToMove
cp $4
ret nc
- ld [$cce2], a
+ ld [wEnemyMoveListIndex], a
ld c, a
ld hl, W_ENEMYMONMOVES
ld b, $0
@@ -3028,14 +3028,14 @@
Func_3d605: ; 3d605 (f:5605)
ld a, $ff
- ld [$cc3e], a
- ld a, [wPlayerMoveListIndex] ; $cc2e
+ ld [wcc3e], a
+ ld a, [wPlayerMoveListIndex] ; wPlayerMoveListIndex
cp $f
jr z, .asm_3d630
- ld a, [$cd6a]
+ ld a, [wcd6a]
and a
jr nz, .asm_3d629
- ld a, [wPlayerSelectedMove] ; $ccdc
+ ld a, [wPlayerSelectedMove] ; wPlayerSelectedMove
cp $a5
ld b, $e
jr z, .asm_3d62f
@@ -3042,21 +3042,21 @@
dec b
inc a
jr z, .asm_3d62f
- ld a, [wPlayerMoveListIndex] ; $cc2e
+ ld a, [wPlayerMoveListIndex] ; wPlayerMoveListIndex
jr .asm_3d630
.asm_3d629
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
add $4
ld b, a
.asm_3d62f
ld a, b
.asm_3d630
- ld [$cc42], a
+ ld [wcc42], a
callab PrintWaitingText
.asm_3d63b
call Func_22c3
call DelayFrame
- ld a, [$cc3e]
+ ld a, [wcc3e]
inc a
jr z, .asm_3d63b
ld b, $a
@@ -3076,16 +3076,16 @@
Func_3d65e: ; 3d65e (f:565e)
xor a
ld [H_WHOSETURN], a ; $fff3
- ld a, [wPlayerSelectedMove] ; $ccdc
+ ld a, [wPlayerSelectedMove] ; wPlayerSelectedMove
inc a
jp z, Func_3d80a
xor a
- ld [W_MOVEMISSED], a ; $d05f
- ld [$cced], a
- ld [$ccf4], a
+ ld [W_MOVEMISSED], a ; W_MOVEMISSED
+ ld [wcced], a
+ ld [wccf4], a
ld a, $a
- ld [$d05b], a
- ld a, [$cd6a]
+ ld [wd05b], a
+ ld a, [wcd6a]
and a
jp nz, Func_3d80a
call PrintGhostText
@@ -3095,7 +3095,7 @@
jp [hl]
.asm_3d68a
call GetCurrentMove
- ld hl, W_PLAYERBATTSTATUS1 ; $d062
+ ld hl, W_PLAYERBATTSTATUS1 ; W_PLAYERBATTSTATUS1
bit 4, [hl]
jr nz, asm_3d6a9
call Func_3dc88
@@ -3102,7 +3102,7 @@
jp z, Func_3d80a
Func_3d69a: ; 3d69a (f:569a)
- ld a, [W_PLAYERMOVEEFFECT] ; $cfd3
+ ld a, [W_PLAYERMOVEEFFECT] ; wcfd3
cp CHARGE_EFFECT
jp z, Func_3f132
cp FLY_EFFECT
@@ -3117,7 +3117,7 @@
asm_3d6b0: ; 3d6b0 (f:56b0)
call PrintMonName1Text
ld hl,DecrementPP
- ld de,$CCDC ; pointer to the move just used
+ ld de,wPlayerSelectedMove ; pointer to the move just used
ld b,BANK(DecrementPP)
call Bankswitch
ld a,[W_PLAYERMOVEEFFECT] ; effect of the move just used
@@ -3168,7 +3168,7 @@
ld b,BANK(Func_79747)
call nz,Bankswitch
pop af
- ld [$CC5B],a
+ ld [wcc5b],a
ld a,[W_PLAYERMOVENUM]
call PlayMoveAnimation
call Func_3eed3
@@ -3190,7 +3190,7 @@
jr asm_3d766
.next5
xor a
- ld [$CC5B],a
+ ld [wcc5b],a
ld a,STATUS_AFFECTED_ANIM
call PlayMoveAnimation
asm_3d766
@@ -3200,7 +3200,7 @@
call MirrorMoveCopyMove
jp z,Func_3d80a
xor a
- ld [$CCED],a
+ ld [wcced],a
jp Func_3d69a
.next6
cp a,METRONOME_EFFECT
@@ -3226,7 +3226,7 @@
call Func_3dc5c
callab DisplayEffectiveness
ld a,1
- ld [$CCF4],a
+ ld [wccf4],a
.next9
ld a,[W_PLAYERMOVEEFFECT]
ld hl,EffectsArray4
@@ -3233,7 +3233,7 @@
ld de,1
call IsInArray
call c,Func_3f132
- ld hl,$CFE6
+ ld hl,W_ENEMYMONCURHP
ld a,[hli]
ld b,[hl]
or b
@@ -3243,9 +3243,9 @@
ld hl,W_PLAYERBATTSTATUS1
bit 2,[hl]
jr z,.next10 ; 57EF
- ld a,[$D06A]
+ ld a,[wd06a]
dec a
- ld [$D06A],a
+ ld [wd06a],a
jp nz,asm_3d714
res 2,[hl]
@@ -3269,7 +3269,7 @@
Func_3d80a: ; 3d80a (f:580a)
xor a
- ld [$CD6A],a
+ ld [wcd6a],a
ld b,1
ret
@@ -3330,7 +3330,7 @@
jr z,.WakeUp ; to 5874
xor a
- ld [$CC5B],a
+ ld [wcc5b],a
ld a,SLP_ANIM - 1
call PlayMoveAnimation
ld hl,FastAsleepText
@@ -3341,7 +3341,7 @@
call PrintText
.sleepDone
xor a
- ld [$CCF1],a
+ ld [wccf1],a
ld hl,Func_3d80a
jp Func_3da37
@@ -3351,7 +3351,7 @@
ld hl,IsFrozenText
call PrintText
xor a
- ld [$CCF1],a
+ ld [wccf1],a
ld hl,Func_3d80a
jp Func_3da37
@@ -3384,7 +3384,7 @@
ld hl,Func_3d80a ; $580a
jp Func_3da37
.next
- ld hl,$D06D
+ ld hl,W_PLAYERDISABLEDMOVE
ld a,[hl]
and a
jr z,.next2 ; 58EE
@@ -3393,7 +3393,7 @@
and a,$F
jr nz,.next2
ld [hl],a
- ld [$CCEE],a
+ ld [wccee],a
ld hl,DisabledNoMoreText
call PrintText
.next2
@@ -3400,7 +3400,7 @@
ld a,[W_PLAYERBATTSTATUS1]
add a
jr nc,.next3 ; 5929
- ld hl,$D06B
+ ld hl,wd06b
dec [hl]
jr nz,.next4 ; 5907
ld hl,W_PLAYERBATTSTATUS1
@@ -3412,7 +3412,7 @@
ld hl,IsConfusedText
call PrintText
xor a
- ld [$CC5B],a
+ ld [wcc5b],a
ld a,CONF_ANIM - 1
call PlayMoveAnimation
call BattleRandom
@@ -3425,10 +3425,10 @@
call PrintHurtItselfText
jr .next5 ; 5952
.next3
- ld a,[$CCEE]
+ ld a,[wccee]
and a
jr z,.ParalysisCheck ; 593E
- ld hl,$CCDC
+ ld hl,wPlayerSelectedMove
cp [hl]
jr nz,.ParalysisCheck
call PrintMoveIsDisabledText
@@ -3456,7 +3456,7 @@
jr .next9 ; 596F
.next8
xor a
- ld [$CC5B],a
+ ld [wcc5b],a
ld a,STATUS_AFFECTED_ANIM
call PlayMoveAnimation
.next9
@@ -3468,11 +3468,11 @@
jr z,.next10 ; 59D0
xor a
ld [W_PLAYERMOVENUM],a
- ld hl,$D0D7
+ ld hl,W_DAMAGE
ld a,[hli]
ld b,a
ld c,[hl]
- ld hl,$D075
+ ld hl,wd075
ld a,[hl]
add c
ld [hld],a
@@ -3479,7 +3479,7 @@
ld a,[hl]
adc b
ld [hl],a
- ld hl,$D06A
+ ld hl,wd06a
dec [hl]
jr z,.next11 ; 599B
ld hl,Func_3d80a ; $580a
@@ -3490,15 +3490,15 @@
ld hl,UnleashedEnergyText
call PrintText
ld a,1
- ld [$CFD4],a
- ld hl,$D075
+ ld [W_PLAYERMOVEPOWER],a
+ ld hl,wd075
ld a,[hld]
add a
ld b,a
- ld [$D0D8],a
+ ld [wd0d8],a
ld a,[hl]
rl a
- ld [$D0D7],a
+ ld [W_DAMAGE],a
or b
jr nz,.next12 ; 59C2
ld a,1
@@ -3518,7 +3518,7 @@
ld [W_PLAYERMOVENUM],a
ld hl,ThrashingAboutText
call PrintText
- ld hl,$D06A
+ ld hl,wd06a
dec [hl]
ld hl,asm_3d6dc ; $56dc
jp nz,Func_3da37
@@ -3530,7 +3530,7 @@
and a,3
inc a
inc a
- ld [$D06B],a
+ ld [wd06b],a
pop hl
jp Func_3da37
.next13
@@ -3538,23 +3538,23 @@
jp z,Func_3da1a
ld hl,AttackContinuesText
call PrintText
- ld a,[$D06A]
+ ld a,[wd06a]
dec a
- ld [$D06A],a
+ ld [wd06a],a
ld hl,asm_3d714 ; $5714
jp nz,Func_3da37
jp Func_3da37
Func_3da1a: ; 3da1a (f:5a1a)
- ld a, [W_PLAYERBATTSTATUS2] ; $d063
+ ld a, [W_PLAYERBATTSTATUS2] ; W_PLAYERBATTSTATUS2
bit 6, a
jp z, Func_3da39
ld a, RAGE
- ld [$d11e], a
+ ld [wd11e], a
call GetMoveName
call CopyStringToCF4B
xor a
- ld [W_PLAYERMOVEEFFECT], a ; $cfd3
+ ld [W_PLAYERMOVEEFFECT], a ; wcfd3
ld hl, asm_3d6b0 ; $56b0
jp Func_3da37
@@ -3628,19 +3628,19 @@
db "@"
PrintMoveIsDisabledText: ; 3da88 (f:5a88)
- ld hl, wPlayerSelectedMove ; $ccdc
- ld de, W_PLAYERBATTSTATUS1 ; $d062
+ ld hl, wPlayerSelectedMove ; wPlayerSelectedMove
+ ld de, W_PLAYERBATTSTATUS1 ; W_PLAYERBATTSTATUS1
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3da97
inc hl
- ld de, W_ENEMYBATTSTATUS1 ; $d067
+ ld de, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
.asm_3da97
ld a, [de]
res 4, a
ld [de], a
ld a, [hl]
- ld [$d11e], a
+ ld [wd11e], a
call GetMoveName
ld hl, MoveIsDisabledText
jp PrintText
@@ -3652,7 +3652,7 @@
PrintHurtItselfText: ; 3daad (f:5aad)
ld hl, HurtItselfText
call PrintText
- ld hl, W_ENEMYMONDEFENSE ; $cff8
+ ld hl, W_ENEMYMONDEFENSE ; wcff8
ld a, [hli]
push af
ld a, [hld]
@@ -3659,15 +3659,15 @@
push af
ld a, [W_PLAYERMONDEF]
ld [hli], a
- ld a, [$d028]
+ ld a, [W_PLAYERMONDEF + 1]
ld [hl], a
- ld hl, W_PLAYERMOVEEFFECT ; $cfd3
+ ld hl, W_PLAYERMOVEEFFECT ; wcfd3
push hl
ld a, [hl]
push af
xor a
ld [hli], a
- ld [$d05e], a
+ ld [wd05e], a
ld a, $28
ld [hli], a
xor a
@@ -3677,13 +3677,13 @@
pop af
pop hl
ld [hl], a
- ld hl, $cff9
+ ld hl, W_ENEMYMONDEFENSE + 1
pop af
ld [hld], a
pop af
ld [hl], a
xor a
- ld [$cc5b], a
+ ld [wcc5b], a
inc a
ld [H_WHOSETURN], a ; $fff3
call PlayMoveAnimation
@@ -3701,20 +3701,20 @@
db $08 ; asm
ld a, [H_WHOSETURN] ; $fff3
and a
- ld a, [W_PLAYERMOVENUM] ; $cfd2
- ld hl, $ccf1
+ ld a, [W_PLAYERMOVENUM] ; wcfd2
+ ld hl, wccf1
jr z, .asm_3db11
- ld a, [W_ENEMYMOVENUM] ; $cfcc
- ld hl, $ccf2
+ ld a, [W_ENEMYMOVENUM] ; W_ENEMYMOVENUM
+ ld hl, wccf2
.asm_3db11
ld [hl], a
- ld [$d11e], a
+ ld [wd11e], a
call Func_3db85
- ld a, [$cced]
+ ld a, [wcced]
and a
ld hl, Used2Text
ret nz
- ld a, [$d11e]
+ ld a, [wd11e]
cp DOUBLESLAP
ld hl, Used2Text
ret c
@@ -3731,7 +3731,7 @@
db $08 ; asm
PrintInsteadText: ; 3db39 (f:5b39)
- ld a, [$cced]
+ ld a, [wcced]
and a
jr z, PrintCF4BText
ld hl, InsteadText
@@ -3749,7 +3749,7 @@
TX_FAR _CF4BText
db $08 ; asm
ld hl, ExclamationPointPointerTable
- ld a, [$d11e]
+ ld a, [wd11e]
add a
push bc
ld b, $0
@@ -3790,7 +3790,7 @@
Func_3db85: ; 3db85 (f:5b85)
push bc
- ld a, [$d11e] ; move number
+ ld a, [wd11e] ; move number
ld c, a
ld b, $0
ld hl, UnknownMovesList_3dba3 ; $5ba3
@@ -3806,7 +3806,7 @@
jr .asm_3db8f
.asm_3db9d
ld a, b
- ld [$d11e], a
+ ld [wd11e], a
pop bc
ret
@@ -3826,18 +3826,18 @@
db $FF ; terminator
PrintMoveFailureText: ; 3dbe2 (f:5be2)
- ld de, W_PLAYERMOVEEFFECT ; $cfd3
+ ld de, W_PLAYERMOVEEFFECT ; wcfd3
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3dbed
- ld de, W_ENEMYMOVEEFFECT ; $cfcd
+ ld de, W_ENEMYMOVEEFFECT ; W_ENEMYMOVEEFFECT
.asm_3dbed
ld hl, DoesntAffectMonText ; $5c57
- ld a, [$d05b]
+ ld a, [wd05b]
and $7f
jr z, .asm_3dc04
ld hl, AttackMissedText ; $5c42
- ld a, [$d05e]
+ ld a, [wd05e]
cp $ff
jr nz, .asm_3dc04
ld hl, UnaffectedText ; $5c4c
@@ -3845,7 +3845,7 @@
push de
call PrintText
xor a
- ld [$d05e], a
+ ld [wd05e], a
pop de
ld a, [de]
cp JUMP_KICK_EFFECT
@@ -3852,7 +3852,7 @@
ret nz
; if you get here, the mon used hi jump kick and missed
- ld hl, W_DAMAGE ; $d0d7
+ ld hl, W_DAMAGE ; W_DAMAGE
ld a, [hli]
ld b, [hl]
srl a
@@ -3902,7 +3902,7 @@
db "@"
Func_3dc5c: ; 3dc5c (f:5c5c)
- ld a, [$d05e]
+ ld a, [wd05e]
and a
jr z, .asm_3dc75
dec a
@@ -3916,7 +3916,7 @@
ld l, a
call PrintText
xor a
- ld [$d05e], a
+ ld [wd05e], a
.asm_3dc75
ld c, $14
jp DelayFrames
@@ -3935,8 +3935,8 @@
Func_3dc88: ; 3dc88 (f:5c88)
xor a
- ld [$cced], a
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld [wcced], a
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
jr nz, .asm_3dc97
ld a, $1
@@ -3943,15 +3943,15 @@
and a
ret
.asm_3dc97
- ld hl, W_PARTYMON1_OTID ; $d177
+ ld hl, W_PARTYMON1_OTID ; W_PARTYMON1_OTID
ld bc, $2c
- ld a, [wPlayerMonNumber] ; $cc2f
+ ld a, [wPlayerMonNumber] ; wPlayerMonNumber
call AddNTimes
- ld a, [wPlayerID] ; $d359
+ ld a, [wPlayerID] ; wPlayerID
cp [hl]
jr nz, .asm_3dcb1
inc hl
- ld a, [wPlayerID + 1] ; $d35a
+ ld a, [wPlayerID + 1] ; wd35a
cp [hl]
jp z, Func_3ddb0
.asm_3dcb1
@@ -3973,7 +3973,7 @@
.asm_3dcce
ld b, a
ld c, a
- ld a, [W_PLAYERMONLEVEL] ; $d022
+ ld a, [W_PLAYERMONLEVEL] ; W_PLAYERMONLEVEL
ld d, a
add b
ld b, a
@@ -4015,7 +4015,7 @@
swap a
and $7
jr z, .asm_3dd0e
- ld [W_PLAYERMONSTATUS], a ; $d018
+ ld [W_PLAYERMONSTATUS], a ; W_PLAYERMONSTATUS
ld hl, BeganToNapText
jr .asm_3dd3a
.asm_3dd20
@@ -4035,16 +4035,16 @@
call PrintText
jr Func_3ddb4
.asm_3dd3f
- ld a, [$d01d]
+ ld a, [W_PLAYERMONMOVES + 1]
and a
jr z, .asm_3dd20
- ld a, [$ccee]
+ ld a, [wccee]
and a
jr nz, .asm_3dd20
- ld a, [wPlayerSelectedMove] ; $ccdc
+ ld a, [wPlayerSelectedMove] ; wPlayerSelectedMove
cp $a5
jr z, .asm_3dd20
- ld hl, W_PLAYERMONPP ; $d02d
+ ld hl, W_PLAYERMONPP ; W_PLAYERMONPP
push hl
ld a, [hli]
and $3f
@@ -4062,7 +4062,7 @@
add b
pop hl
push af
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
ld c, a
ld b, $0
add hl, bc
@@ -4073,10 +4073,10 @@
cp b
jr z, .asm_3dd20
ld a, $1
- ld [$cced], a
- ld a, [wMaxMenuItem] ; $cc28
+ ld [wcced], a
+ ld a, [wMaxMenuItem] ; wMaxMenuItem
ld b, a
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
ld c, a
.asm_3dd86
call BattleRandom
@@ -4085,8 +4085,8 @@
jr nc, .asm_3dd86
cp c
jr z, .asm_3dd86
- ld [wCurrentMenuItem], a ; $cc26
- ld hl, W_PLAYERMONPP ; $d02d
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld hl, W_PLAYERMONPP ; W_PLAYERMONPP
ld e, a
ld d, $0
add hl, de
@@ -4093,13 +4093,13 @@
ld a, [hl]
and a
jr z, .asm_3dd86
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
ld c, a
ld b, $0
ld hl, W_PLAYERMONMOVES
add hl, bc
ld a, [hl]
- ld [wPlayerSelectedMove], a ; $ccdc
+ ld [wPlayerSelectedMove], a ; wPlayerSelectedMove
call GetCurrentMove
Func_3ddb0: ; 3ddb0 (f:5db0)
@@ -4157,7 +4157,7 @@
rl b
.next
ld hl, W_PLAYERMONATK ;attack pointer
- ld a, [$d05e]
+ ld a, [wd05e]
and a
jr z, .next3
ld c, 3
@@ -4167,7 +4167,7 @@
ld a, [$ff98]
ld c, a
push bc
- ld hl, $d18f
+ ld hl, W_PARTYMON1_ATACK
ld a, [wPlayerMonNumber]
ld bc, $002c
call AddNTimes
@@ -4186,7 +4186,7 @@
rl b
.next2
ld hl, W_PLAYERMONSPECIAL
- ld a, [$d05e] ;XXX
+ ld a, [wd05e] ;XXX
and a
jr z, .next3 ;skip portion of code that pulls up inactive pokemon
.loadOtherPoke
@@ -4197,7 +4197,7 @@
ld a, [$ff98]
ld c, a
push bc
- ld hl, $d195
+ ld hl, W_PARTYMON1_SPECIAL
ld a, [wPlayerMonNumber]
ld bc, $002c
call AddNTimes
@@ -4222,9 +4222,9 @@
inc l ;minimum HL = 1
.next4
ld b, l ;*B = attack [possibly scaled] [C contains defense]
- ld a, [$d022] ;*E = level
+ ld a, [W_PLAYERMONLEVEL] ;*E = level
ld e, a
- ld a, [$d05e] ;critical hit?
+ ld a, [wd05e] ;critical hit?
and a
jr z, .next5
sla e ;double level if it was a critical hit
@@ -4234,11 +4234,11 @@
ret
Func_3de75: ; 3de75 (f:5e75)
- ld hl, W_DAMAGE ; $d0d7
+ ld hl, W_DAMAGE ; W_DAMAGE
xor a
ld [hli], a
ld [hl], a
- ld hl, W_ENEMYMOVEPOWER ; $cfce
+ ld hl, W_ENEMYMOVEPOWER ; wcfce
ld a, [hli]
ld d, a
and a
@@ -4250,7 +4250,7 @@
ld a, [hli]
ld b, a
ld c, [hl]
- ld a, [W_PLAYERBATTSTATUS3] ; $d064
+ ld a, [W_PLAYERBATTSTATUS3] ; W_PLAYERBATTSTATUS3
bit 2, a
jr z, .asm_3de98
sla c
@@ -4257,11 +4257,11 @@
rl b
.asm_3de98
ld hl, W_ENEMYMONATTACK
- ld a, [$d05e]
+ ld a, [wd05e]
and a
jr z, .asm_3deef
- ld hl, W_PARTYMON1_DEFENSE ; $d191
- ld a, [wPlayerMonNumber] ; $cc2f
+ ld hl, W_PARTYMON1_DEFENSE ; wd191
+ ld a, [wPlayerMonNumber] ; wPlayerMonNumber
ld bc, $2c
call AddNTimes
ld a, [hli]
@@ -4278,18 +4278,18 @@
ld a, [hli]
ld b, a
ld c, [hl]
- ld a, [W_PLAYERBATTSTATUS3] ; $d064
+ ld a, [W_PLAYERBATTSTATUS3] ; W_PLAYERBATTSTATUS3
bit 1, a
jr z, .asm_3decd
sla c
rl b
.asm_3decd
- ld hl, W_ENEMYMONSPECIAL ; $cffc
- ld a, [$d05e]
+ ld hl, W_ENEMYMONSPECIAL ; wcffc
+ ld a, [wd05e]
and a
jr z, .asm_3deef
- ld hl, W_PARTYMON1_SPECIAL ; $d195
- ld a, [wPlayerMonNumber] ; $cc2f
+ ld hl, W_PARTYMON1_SPECIAL ; W_PARTYMON1_SPECIAL
+ ld a, [wPlayerMonNumber] ; wPlayerMonNumber
ld bc, $2c
call AddNTimes
ld a, [hli]
@@ -4320,9 +4320,9 @@
inc l
.asm_3df0a
ld b, l
- ld a, [W_ENEMYMONLEVEL] ; $cff3
+ ld a, [W_ENEMYMONLEVEL] ; W_ENEMYMONLEVEL
ld e, a
- ld a, [$d05e]
+ ld a, [wd05e]
and a
jr z, .asm_3df17
sla e
@@ -4335,15 +4335,15 @@
Func_3df1c: ; 3df1c (f:5f1c)
push de
push bc
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
jr nz, .asm_3df40
- ld hl, $d8c6
+ ld hl, wd8c6
dec c
sla c
ld b, $0
add hl, bc
- ld a, [W_ENEMYMONNUMBER] ; $cfe8
+ ld a, [W_ENEMYMONNUMBER] ; W_ENEMYMONNUMBER
ld bc, $2c
call AddNTimes
ld a, [hli]
@@ -4354,13 +4354,13 @@
pop de
ret
.asm_3df40
- ld a, [W_ENEMYMONLEVEL] ; $cff3
- ld [W_CURENEMYLVL], a ; $d127
- ld a, [$cfe5]
- ld [$d0b5], a
+ ld a, [W_ENEMYMONLEVEL] ; W_ENEMYMONLEVEL
+ ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
+ ld a, [wcfe5]
+ ld [wd0b5], a
call GetMonHeader
- ld hl, $cff1
- ld de, $cfaf
+ ld hl, W_ENEMYMONATKDEFIV
+ ld de, wcfaf
ld a, [hli]
ld [de], a
inc de
@@ -4368,7 +4368,7 @@
ld [de], a
pop bc
ld b, $0
- ld hl, $cfa4
+ ld hl, wcfa4
call CalcStat
pop de
ret
@@ -4384,7 +4384,7 @@
and a
ld a, [W_PLAYERMOVEEFFECT]
jr z, .effect
- ld a, [$cfcd]
+ ld a, [W_ENEMYMOVEEFFECT]
.effect
; EXPLODE_EFFECT halves defense.
@@ -4534,7 +4534,7 @@
Func_3e016: ; 3e016 (f:6016)
call Func_3f132
- ld a, [W_MOVEMISSED] ; $d05f
+ ld a, [W_MOVEMISSED] ; W_MOVEMISSED
dec a
ret
@@ -4552,14 +4552,14 @@
; among the most popular) tend to CH about 20 to 25% of the time."
CriticalHitTest: ; 3e023 (f:6023)
xor a
- ld [$d05e], a
+ ld [wd05e], a
ld a, [H_WHOSETURN] ; $fff3
and a
- ld a, [$cfe5]
+ ld a, [wcfe5]
jr nz, .asm_3e032
ld a, [W_PLAYERMONID]
.asm_3e032
- ld [$d0b5], a
+ ld [wd0b5], a
call GetMonHeader
ld a, [W_MONHBASESPEED]
ld b, a
@@ -4566,11 +4566,11 @@
srl b ; (effective (base speed/2))
ld a, [H_WHOSETURN] ; $fff3
and a
- ld hl, W_PLAYERMOVEPOWER ; $cfd4
- ld de, W_PLAYERBATTSTATUS2 ; $d063
+ ld hl, W_PLAYERMOVEPOWER ; W_PLAYERMOVEPOWER
+ ld de, W_PLAYERBATTSTATUS2 ; W_PLAYERBATTSTATUS2
jr z, .calcCriticalHitProbability
- ld hl, W_ENEMYMOVEPOWER ; $cfce
- ld de, W_ENEMYBATTSTATUS2 ; $d068
+ ld hl, W_ENEMYMOVEPOWER ; wcfce
+ ld de, W_ENEMYBATTSTATUS2 ; W_ENEMYBATTSTATUS2
.calcCriticalHitProbability ; 0x3e04f
ld a, [hld] ; read base power from RAM
and a
@@ -4613,7 +4613,7 @@
cp b ; check a against calculated crit rate
ret nc ; no critical hit if no borrow
ld a, $1
- ld [$d05e], a ; set critical hit flag
+ ld [wd05e], a ; set critical hit flag
ret
; high critical hit moves
@@ -4795,10 +4795,10 @@
ld [wHPBarNewHP+1],a
ld a,[hl]
ld [wHPBarNewHP],a
- FuncCoord 2, 2 ; $c3ca
+ FuncCoord 2, 2
ld hl,Coord
xor a
- ld [$cf94],a
+ ld [wListMenuID],a
ld a,$48
call Predef ; animate the HP bar shortening
ApplyAttackToEnemyPokemonDone: ; 3e19d (f:619d)
@@ -4915,10 +4915,10 @@
ld [wHPBarMaxHP+1],a
ld a,[hl]
ld [wHPBarMaxHP],a
- FuncCoord 10, 9 ; $c45e
+ FuncCoord 10, 9
ld hl,Coord
ld a,$01
- ld [$cf94],a
+ ld [wListMenuID],a
ld a,$48
call Predef ; animate the HP bar shortening
ApplyAttackToPlayerPokemonDone
@@ -5031,12 +5031,12 @@
ld a,[H_WHOSETURN]
and a
; values for player turn
- ld a,[$ccf2]
+ ld a,[wccf2]
ld hl,wPlayerSelectedMove
ld de,W_PLAYERMOVENUM
jr z,.next
; values for enemy turn
- ld a,[$ccf1]
+ ld a,[wccf1]
ld de,W_ENEMYMOVENUM
ld hl,wEnemySelectedMove
.next
@@ -5058,7 +5058,7 @@
; function used to reload move data for moves like Mirror Move and Metronome
ReloadMoveData: ; 3e329 (f:6329)
- ld [$d11e],a
+ ld [wd11e],a
dec a
ld hl,Moves
ld bc,$0006
@@ -5076,7 +5076,7 @@
; function that picks a random move for metronome
MetronomePickMove: ; 3e348 (f:6348)
xor a
- ld [$cc5b],a
+ ld [wcc5b],a
ld a,METRONOME
call PlayMoveAnimation ; play Metronome's animation
; values for player turn
@@ -5113,7 +5113,7 @@
jr z,.next
; values for enemy turn
ld hl,W_ENEMYMONPP
- ld de,$d8c1 ; enemy party pokemon 1 PP
+ ld de,wd8c1 ; enemy party pokemon 1 PP
ld a,[wEnemyMoveListIndex]
.next
ld b,$00
@@ -5146,7 +5146,7 @@
ld d,a ; d = type 1 of defender
ld e,[hl] ; e = type 2 of defender
ld a,[W_PLAYERMOVETYPE]
- ld [$d11e],a
+ ld [wd11e],a
ld a,[H_WHOSETURN]
and a
jr z,.next
@@ -5160,9 +5160,9 @@
ld d,a ; d = type 1 of defender
ld e,[hl] ; e = type 2 of defender
ld a,[W_ENEMYMOVETYPE]
- ld [$d11e],a
+ ld [wd11e],a
.next
- ld a,[$d11e] ; move type
+ ld a,[wd11e] ; move type
cp b ; does the move type match type 1 of the attacker?
jr z,.sameTypeAttackBonus
cp c ; does the move type match type 2 of the attacker?
@@ -5184,10 +5184,10 @@
ld [W_DAMAGE],a
ld a,l
ld [W_DAMAGE + 1],a
- ld hl,$d05b
+ ld hl,wd05b
set 7,[hl]
.skipSameTypeAttackBonus
- ld a,[$d11e]
+ ld a,[wd11e]
ld b,a ; b = move type
ld hl,TypeEffects
.loop
@@ -5207,13 +5207,13 @@
push hl
push bc
inc hl
- ld a,[$d05b]
+ ld a,[wd05b]
and a,$80
ld b,a
ld a,[hl] ; a = damage multiplier
ld [H_MULTIPLIER],a
add b
- ld [$d05b],a
+ ld [wd05b],a
xor a
ld [H_MULTIPLICAND],a
ld hl,W_DAMAGE
@@ -5250,7 +5250,7 @@
; function to tell how effective the type of an enemy attack is on the player's current pokemon
; this doesn't take into account the effects that dual types can have
; (e.g. 4x weakness / resistance, weaknesses and resistances canceling)
-; the result is stored in [$D11E]
+; the result is stored in [wd11e]
; ($05 is not very effective, $10 is neutral, $14 is super effective)
; as far is can tell, this is only used once in some AI code to help decide which move to use
AIGetTypeEffectiveness: ; 3e449 (f:6449)
@@ -5261,7 +5261,7 @@
inc hl
ld c,[hl] ; c = type 2 of player's pokemon
ld a,$10
- ld [$d11e],a ; initialize [$D11E] to neutral effectiveness
+ ld [wd11e],a ; initialize [wd11e] to neutral effectiveness
ld hl,TypeEffects
.loop
ld a,[hli]
@@ -5282,7 +5282,7 @@
jr .loop
.done
ld a,[hl]
- ld [$d11e],a ; store damage multiplier
+ ld [wd11e],a ; store damage multiplier
ret
INCLUDE "data/type_effects.asm"
@@ -5478,7 +5478,7 @@
ret
Func_3e687: ; 3e687 (f:6687)
- ld hl, W_DAMAGE ; $d0d7
+ ld hl, W_DAMAGE ; W_DAMAGE
ld a, [hli]
and a
jr nz, .asm_3e692
@@ -5505,7 +5505,7 @@
ld b, $4
call Divide
ld a, [$ff97]
- ld hl, W_DAMAGE ; $d0d7
+ ld hl, W_DAMAGE ; W_DAMAGE
ld [hli], a
ld a, [$ff98]
ld [hl], a
@@ -5512,39 +5512,39 @@
ret
Func_3e6bc: ; 3e6bc (f:66bc)
- ld a, [wEnemySelectedMove] ; $ccdd
+ ld a, [wEnemySelectedMove] ; wccdd
inc a
jp z, Func_3e88c
call PrintGhostText
jp z, Func_3e88c
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
jr nz, .asm_3e6dc
ld b, $1
- ld a, [$cc3e]
+ ld a, [wcc3e]
cp $e
jr z, .asm_3e6dc
cp $4
ret nc
.asm_3e6dc
- ld hl, $ccd5
+ ld hl, wccd5
inc [hl]
xor a
- ld [W_MOVEMISSED], a ; $d05f
- ld [$ccf4], a
+ ld [W_MOVEMISSED], a ; W_MOVEMISSED
+ ld [wccf4], a
ld a, $a
- ld [$d05b], a
+ ld [wd05b], a
call Func_3e88f
jr nz, .asm_3e6f2
jp [hl]
.asm_3e6f2
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
bit 4, [hl]
jr nz, asm_3e70b
call GetCurrentMove
Func_3e6fc: ; 3e6fc (f:66fc)
- ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
+ ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT
cp CHARGE_EFFECT
jp z, Func_3f132
cp FLY_EFFECT
@@ -5551,28 +5551,28 @@
jp z, Func_3f132
jr asm_3e72b
asm_3e70b: ; 3e70b (f:670b)
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
res 4, [hl] ; no longer charging up for attack
res 6, [hl] ; no longer invulnerable to typcial attacks
- ld a, [W_ENEMYMOVENUM] ; $cfcc
- ld [$d0b5], a
+ ld a, [W_ENEMYMOVENUM] ; W_ENEMYMOVENUM
+ ld [wd0b5], a
ld a, $2c
- ld [$d0b7], a
+ ld [wPredefBank], a
ld a, MOVE_NAME
ld [W_LISTTYPE], a
call GetName
- ld de, $cd6d
+ ld de, wcd6d
call CopyStringToCF4B
asm_3e72b: ; 3e72b (f:672b)
xor a
- ld [$cced], a
+ ld [wcced], a
call PrintMonName1Text
- ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
+ ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT
ld hl, EffectsArray1 ; $4000
ld de, $1
call IsInArray
jp c, Func_3f132
- ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
+ ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT
ld hl, EffectsArray5B ; $4049
ld de, $1
call IsInArray
@@ -5579,7 +5579,7 @@
call c, Func_3f132
asm_3e750: ; 3e750 (f:6750)
call Func_3ec81
- ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
+ ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT
ld hl, EffectsArray2 ; $4011
ld de, $1
call IsInArray
@@ -5598,10 +5598,10 @@
Func_3e77f: ; 3e77f (f:677f)
call MoveHitTest
asm_3e782: ; 3e782 (f:6782)
- ld a, [W_MOVEMISSED] ; $d05f
+ ld a, [W_MOVEMISSED] ; W_MOVEMISSED
and a
jr z, .asm_3e791
- ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
+ ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT
cp EXPLODE_EFFECT
jr z, asm_3e7a0
jr Func_3e7d1
@@ -5609,7 +5609,7 @@
call Func_3ec81
Func_3e794: ; 3e794 (f:6794)
- ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
+ ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT
and a
ld a, $1
jr z, asm_3e7a4
@@ -5620,18 +5620,18 @@
xor a
asm_3e7a4: ; 3e7a4 (f:67a4)
push af
- ld a, [W_ENEMYBATTSTATUS2] ; $d068
+ ld a, [W_ENEMYBATTSTATUS2] ; W_ENEMYBATTSTATUS2
bit 4, a ; does mon have a substitute?
ld hl, Func_79747
ld b, BANK(Func_79747)
call nz, Bankswitch
pop af
- ld [$cc5b], a
- ld a, [W_ENEMYMOVENUM] ; $cfcc
+ ld [wcc5b], a
+ ld a, [W_ENEMYMOVENUM] ; W_ENEMYMOVENUM
call PlayMoveAnimation
call Func_3eed3
call Func_3cdec
- ld a, [W_ENEMYBATTSTATUS2] ; $d068
+ ld a, [W_ENEMYBATTSTATUS2] ; W_ENEMYBATTSTATUS2
bit 4, a ; does mon have a substitute?
ld hl, Func_79771
ld b, BANK(Func_79771)
@@ -5642,7 +5642,7 @@
call Func_3ec81
ld c, $1e
call DelayFrames
- ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
+ ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT
cp FLY_EFFECT
jr z, .asm_3e7e6
cp CHARGE_EFFECT
@@ -5650,11 +5650,11 @@
jr asm_3e7ef
.asm_3e7e6
xor a
- ld [$cc5b], a
+ ld [wcc5b], a
ld a,STATUS_AFFECTED_ANIM
call PlayMoveAnimation
asm_3e7ef: ; 3e7ef (f:67ef)
- ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
+ ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT
cp MIRROR_MOVE_EFFECT
jr nz, .notMirrorMoveEffect
call MirrorMoveCopyMove
@@ -5666,16 +5666,16 @@
call MetronomePickMove
jp Func_3e6fc
.notMetronomeEffect
- ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
+ ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT
ld hl, EffectsArray3 ; $4014
ld de, $1
call IsInArray
jp c, Func_3f132
- ld a, [W_MOVEMISSED] ; $d05f
+ ld a, [W_MOVEMISSED] ; W_MOVEMISSED
and a
jr z, .asm_3e82b
call PrintMoveFailureText
- ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
+ ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT
cp EXPLODE_EFFECT
jr z, .asm_3e83e
jp Func_3e88c
@@ -5684,24 +5684,24 @@
call Func_3dc5c
callab DisplayEffectiveness
ld a, $1
- ld [$ccf4], a
+ ld [wccf4], a
.asm_3e83e
- ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
+ ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT
ld hl, EffectsArray4 ; $4030
ld de, $1
call IsInArray
call c, Func_3f132
- ld hl, W_PLAYERMONCURHP ; $d015
+ ld hl, W_PLAYERMONCURHP ; wd015
ld a, [hli]
ld b, [hl]
or b
ret z
call HandleBuildingRage
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
bit 2, [hl] ; is mon hitting multiple times? (example: double kick)
jr z, .asm_3e873
push hl
- ld hl, $d06f
+ ld hl, wd06f
dec [hl]
pop hl
jp nz, Func_3e794
@@ -5709,9 +5709,9 @@
ld hl, HitXTimesText ; $6887
call PrintText
xor a
- ld [$cd05], a
+ ld [wcd05], a
.asm_3e873
- ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
+ ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT
and a
jr z, Func_3e88c
ld hl, EffectsArray5 ; $403b
@@ -5729,18 +5729,18 @@
ret
Func_3e88f: ; 3e88f (f:688f)
- ld hl, W_ENEMYMONSTATUS ; $cfe9
+ ld hl, W_ENEMYMONSTATUS ; wcfe9
ld a, [hl]
and $7
jr z, .asm_3e8bf
dec a
- ld [W_ENEMYMONSTATUS], a ; $cfe9
+ ld [W_ENEMYMONSTATUS], a ; wcfe9
and a
jr z, .asm_3e8af
ld hl, FastAsleepText
call PrintText
xor a
- ld [$cc5b], a
+ ld [wcc5b], a
ld a,SLP_ANIM
call PlayMoveAnimation
jr .asm_3e8b5
@@ -5749,7 +5749,7 @@
call PrintText
.asm_3e8b5
xor a
- ld [$ccf2], a
+ ld [wccf2], a
ld hl, Func_3e88c ; $688c
jp Func_3eab8
.asm_3e8bf
@@ -5758,11 +5758,11 @@
ld hl, IsFrozenText
call PrintText
xor a
- ld [$ccf2], a
+ ld [wccf2], a
ld hl, Func_3e88c ; $688c
jp Func_3eab8
.asm_3e8d3
- ld a, [W_PLAYERBATTSTATUS1] ; $d062
+ ld a, [W_PLAYERBATTSTATUS1] ; W_PLAYERBATTSTATUS1
bit 5, a
jp z, Func_3e8e7
ld hl, CantMoveText
@@ -5771,7 +5771,7 @@
jp Func_3eab8
Func_3e8e7: ; 3e8e7 (f:68e7)
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
bit 3, [hl]
jp z, Func_3e8fd
res 3, [hl]
@@ -5781,7 +5781,7 @@
jp Func_3eab8
Func_3e8fd: ; 3e8fd (f:68fd)
- ld hl, W_ENEMYBATTSTATUS2 ; $d068
+ ld hl, W_ENEMYBATTSTATUS2 ; W_ENEMYBATTSTATUS2
bit 5, [hl]
jr z, .asm_3e912
res 5, [hl]
@@ -5790,7 +5790,7 @@
ld hl, Func_3e88c ; $688c
jp Func_3eab8
.asm_3e912
- ld hl, W_ENEMYDISABLEDMOVE ; $d072
+ ld hl, W_ENEMYDISABLEDMOVE ; W_ENEMYDISABLEDMOVE
ld a, [hl]
and a
jr z, .asm_3e929
@@ -5799,17 +5799,17 @@
and $f
jr nz, .asm_3e929
ld [hl], a
- ld [$ccef], a
+ ld [wccef], a
ld hl, DisabledNoMoreText
call PrintText
.asm_3e929
- ld a, [W_ENEMYBATTSTATUS1] ; $d067
+ ld a, [W_ENEMYBATTSTATUS1] ; W_ENEMYBATTSTATUS1
add a
jp nc, Func_3e9aa
- ld hl, $d070
+ ld hl, wd070
dec [hl]
jr nz, .asm_3e944
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
res 7, [hl]
ld hl, ConfusedNoMoreText
call PrintText
@@ -5818,13 +5818,13 @@
ld hl, IsConfusedText
call PrintText
xor a
- ld [$cc5b], a
+ ld [wcc5b], a
ld a,CONF_ANIM
call PlayMoveAnimation
call BattleRandom
cp $80
jr c, Func_3e9aa
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
ld a, [hl]
and $80
ld [hl], a
@@ -5835,17 +5835,17 @@
push af
ld a, [hld]
push af
- ld a, [W_ENEMYMONDEFENSE] ; $cff8
+ ld a, [W_ENEMYMONDEFENSE] ; wcff8
ld [hli], a
- ld a, [$cff9]
+ ld a, [W_ENEMYMONDEFENSE + 1]
ld [hl], a
- ld hl, W_ENEMYMOVEEFFECT ; $cfcd
+ ld hl, W_ENEMYMOVEEFFECT ; W_ENEMYMOVEEFFECT
push hl
ld a, [hl]
push af
xor a
ld [hli], a
- ld [$d05e], a
+ ld [wd05e], a
ld a, $28
ld [hli], a
xor a
@@ -5855,13 +5855,13 @@
pop af
pop hl
ld [hl], a
- ld hl, $d028
+ ld hl, W_PLAYERMONDEF + 1
pop af
ld [hld], a
pop af
ld [hl], a
xor a
- ld [$cc5b], a
+ ld [wcc5b], a
ld [H_WHOSETURN], a ; $fff3
ld a, POUND
call PlayMoveAnimation
@@ -5871,10 +5871,10 @@
jr asm_3e9d3
Func_3e9aa: ; 3e9aa (f:69aa)
- ld a, [$ccef]
+ ld a, [wccef]
and a
jr z, .asm_3e9bf
- ld hl, wEnemySelectedMove ; $ccdd
+ ld hl, wEnemySelectedMove ; wccdd
cp [hl]
jr nz, .asm_3e9bf
call PrintMoveIsDisabledText
@@ -5881,7 +5881,7 @@
ld hl, Func_3e88c ; $688c
jp Func_3eab8
.asm_3e9bf
- ld hl, W_ENEMYMONSTATUS ; $cfe9
+ ld hl, W_ENEMYMONSTATUS ; wcfe9
bit 6, [hl]
jr z, asm_3e9f6
call BattleRandom
@@ -5890,11 +5890,11 @@
ld hl, FullyParalyzedText
call PrintText
asm_3e9d3: ; 3e9d3 (f:69d3)
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
ld a, [hl]
and $cc
ld [hl], a
- ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
+ ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT
cp FLY_EFFECT
jr z, .asm_3e9e7
cp CHARGE_EFFECT
@@ -5902,7 +5902,7 @@
jr .asm_3e9f0
.asm_3e9e7
xor a
- ld [$cc5b], a
+ ld [wcc5b], a
ld a, STATUS_AFFECTED_ANIM
call PlayMoveAnimation
.asm_3e9f0
@@ -5909,16 +5909,16 @@
ld hl, Func_3e88c ; $688c
jp Func_3eab8
asm_3e9f6: ; 3e9f6 (f:69f6)
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
bit 0, [hl] ; is mon using bide?
jr z, .asm_3ea54
xor a
- ld [W_ENEMYMOVENUM], a ; $cfcc
- ld hl, W_DAMAGE ; $d0d7
+ ld [W_ENEMYMOVENUM], a ; W_ENEMYMOVENUM
+ ld hl, W_DAMAGE ; W_DAMAGE
ld a, [hli]
ld b, a
ld c, [hl]
- ld hl, $cd06
+ ld hl, wcd06
ld a, [hl]
add c
ld [hld], a
@@ -5925,36 +5925,36 @@
ld a, [hl]
adc b
ld [hl], a
- ld hl, $d06f
+ ld hl, wd06f
dec [hl]
jr z, .asm_3ea1c
ld hl, Func_3e88c ; $688c
jp Func_3eab8
.asm_3ea1c
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
res 0, [hl]
ld hl, UnleashedEnergyText
call PrintText
ld a, $1
- ld [W_ENEMYMOVEPOWER], a ; $cfce
- ld hl, $cd06
+ ld [W_ENEMYMOVEPOWER], a ; wcfce
+ ld hl, wcd06
ld a, [hld]
add a
ld b, a
- ld [$d0d8], a
+ ld [wd0d8], a
ld a, [hl]
rl a
- ld [W_DAMAGE], a ; $d0d7
+ ld [W_DAMAGE], a ; W_DAMAGE
or b
jr nz, .asm_3ea43
ld a, $1
- ld [W_MOVEMISSED], a ; $d05f
+ ld [W_MOVEMISSED], a ; W_MOVEMISSED
.asm_3ea43
xor a
ld [hli], a
ld [hl], a
ld a, BIDE
- ld [W_ENEMYMOVENUM], a ; $cfcc
+ ld [W_ENEMYMOVENUM], a ; W_ENEMYMOVENUM
call Func_3ec81
ld hl, asm_3e782 ; $6782
jp Func_3eab8
@@ -5962,15 +5962,15 @@
bit 1, [hl] ; is mon using thrash or petal dance?
jr z, .asm_3ea83
ld a, THRASH
- ld [W_ENEMYMOVENUM], a ; $cfcc
+ ld [W_ENEMYMOVENUM], a ; W_ENEMYMOVENUM
ld hl, ThrashingAboutText
call PrintText
- ld hl, $d06f
+ ld hl, wd06f
dec [hl]
ld hl, asm_3e750 ; $6750
jp nz, Func_3eab8
push hl
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
res 1, [hl] ; mon is no longer using thrash or petal dance
set 7, [hl] ; mon is now confused
call BattleRandom
@@ -5977,7 +5977,7 @@
and $3
inc a
inc a
- ld [$d070], a
+ ld [wd070], a
pop hl
jp Func_3eab8
.asm_3ea83
@@ -5985,7 +5985,7 @@
jp z, Func_3ea9b
ld hl, AttackContinuesText
call PrintText
- ld hl, $d06f
+ ld hl, wd06f
dec [hl]
ld hl, Func_3e794 ; $6794
jp nz, Func_3eab8
@@ -5992,15 +5992,15 @@
jp Func_3eab8
Func_3ea9b: ; 3ea9b (f:6a9b)
- ld a, [W_ENEMYBATTSTATUS2] ; $d068
+ ld a, [W_ENEMYBATTSTATUS2] ; W_ENEMYBATTSTATUS2
bit 6, a ; is mon using rage?
jp z, Func_3eaba
ld a, RAGE
- ld [$d11e], a
+ ld [wd11e], a
call GetMoveName
call CopyStringToCF4B
xor a
- ld [W_ENEMYMOVEEFFECT], a ; $cfcd
+ ld [W_ENEMYMOVEEFFECT], a ; W_ENEMYMOVEEFFECT
ld hl, asm_3e72b ; $672b
jp Func_3eab8
@@ -6017,18 +6017,18 @@
ld a, [H_WHOSETURN] ; $fff3
and a
jp z, .player
- ld de, W_ENEMYMOVENUM ; $cfcc
- ld a, [wEnemySelectedMove] ; $ccdd
+ ld de, W_ENEMYMOVENUM ; W_ENEMYMOVENUM
+ ld a, [wEnemySelectedMove] ; wccdd
jr .selected
.player
- ld de, W_PLAYERMOVENUM ; $cfd2
+ ld de, W_PLAYERMOVENUM ; wcfd2
ld a, [W_FLAGS_D733]
bit 0, a
- ld a, [$ccd9]
+ ld a, [wccd9]
jr nz, .selected
- ld a, [wPlayerSelectedMove] ; $ccdc
+ ld a, [wPlayerSelectedMove] ; wPlayerSelectedMove
.selected
- ld [$d0b5], a
+ ld [wd0b5], a
dec a
ld hl, Moves ; $4000
ld bc, $6
@@ -6036,28 +6036,28 @@
ld a, BANK(Moves)
call FarCopyData
ld a, $2c
- ld [$d0b7], a
+ ld [wPredefBank], a
ld a, $2
ld [W_LISTTYPE], a ; list type 2 = move name
call GetName
- ld de, $cd6d
+ ld de, wcd6d
jp CopyStringToCF4B
Func_3eb01: ; 3eb01 (f:6b01)
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
jp z, Func_3cc13
ld a, [W_ENEMYMONID]
- ld [$cfe5], a
- ld [$d0b5], a
+ ld [wcfe5], a
+ ld [wd0b5], a
call GetMonHeader
- ld a, [W_ENEMYBATTSTATUS3] ; $d069
+ ld a, [W_ENEMYBATTSTATUS3] ; W_ENEMYBATTSTATUS3
bit 3, a
- ld hl, $cceb
+ ld hl, wcceb
ld a, [hli]
ld b, [hl]
jr nz, .asm_3eb33
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $2
ld a, $98
ld b, $88
@@ -6066,25 +6066,25 @@
ld b, a
call BattleRandom
.asm_3eb33
- ld hl, $cff1
+ ld hl, W_ENEMYMONATKDEFIV
ld [hli], a
ld [hl], b
- ld de, W_ENEMYMONLEVEL ; $cff3
- ld a, [W_CURENEMYLVL] ; $d127
+ ld de, W_ENEMYMONLEVEL ; W_ENEMYMONLEVEL
+ ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL
ld [de], a
inc de
ld b, $0
- ld hl, W_ENEMYMONCURHP ; $cfe6
+ ld hl, W_ENEMYMONCURHP ; W_ENEMYMONCURHP
push hl
call CalcStats
pop hl
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $2
jr z, .asm_3eb65
- ld a, [W_ENEMYBATTSTATUS3] ; $d069
+ ld a, [W_ENEMYBATTSTATUS3] ; W_ENEMYBATTSTATUS3
bit 3, a
jr nz, .asm_3eb86
- ld a, [W_ENEMYMONMAXHP] ; $cff4
+ ld a, [W_ENEMYMONMAXHP] ; W_ENEMYMONMAXHP
ld [hli], a
ld a, [W_ENEMYMONMAXHP+1]
ld [hli], a
@@ -6093,23 +6093,23 @@
ld [hl], a
jr .asm_3eb86
.asm_3eb65
- ld hl, W_ENEMYMON1HP ; $d8a5 (aliases: W_WATERMONS)
- ld a, [wWhichPokemon] ; $cf92
+ ld hl, W_ENEMYMON1HP ; wd8a5 (aliases: W_WATERMONS)
+ ld a, [wWhichPokemon] ; wWhichPokemon
ld bc, $2c
call AddNTimes
ld a, [hli]
- ld [W_ENEMYMONCURHP], a ; $cfe6
+ ld [W_ENEMYMONCURHP], a ; W_ENEMYMONCURHP
ld a, [hli]
- ld [$cfe7], a
- ld a, [wWhichPokemon] ; $cf92
- ld [W_ENEMYMONNUMBER], a ; $cfe8
+ ld [W_ENEMYMONCURHP + 1], a
+ ld a, [wWhichPokemon] ; wWhichPokemon
+ ld [W_ENEMYMONNUMBER], a ; W_ENEMYMONNUMBER
inc hl
ld a, [hl]
- ld [W_ENEMYMONSTATUS], a ; $cfe9
+ ld [W_ENEMYMONSTATUS], a ; wcfe9
jr .asm_3eb86
.asm_3eb86
ld hl, W_MONHTYPES
- ld de, W_ENEMYMONTYPES ; $cfea
+ ld de, W_ENEMYMONTYPES ; wcfea
ld a, [hli] ; copy type 1
ld [de], a
inc de
@@ -6119,11 +6119,11 @@
ld a, [hli] ; copy catch rate
ld [de], a
inc de
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $2
jr nz, .asm_3ebb0
- ld hl, $d8ac
- ld a, [wWhichPokemon] ; $cf92
+ ld hl, wd8ac
+ ld a, [wWhichPokemon] ; wWhichPokemon
ld bc, $2c
call AddNTimes
ld bc, $4
@@ -6146,16 +6146,16 @@
dec de
dec de
xor a
- ld [$cee9], a
+ ld [wHPBarMaxHP], a
ld a, $3e
call Predef ; indirect jump to WriteMonMoves (3afb8 (e:6fb8))
.asm_3ebca
ld hl, W_ENEMYMONMOVES
- ld de, $cffd
+ ld de, W_ENEMYMONSPECIAL + 1
ld a, $5e
call Predef ; indirect jump to LoadMovePPs (f473 (3:7473))
ld hl, W_MONHBASESTATS
- ld de, $d002
+ ld de, wd002
ld b, $5
.asm_3ebdd
ld a, [hli]
@@ -6170,30 +6170,30 @@
ld a, [hl] ; base exp
ld [de], a
ld a, [W_ENEMYMONID]
- ld [$d11e], a
+ ld [wd11e], a
call GetMonName
- ld hl, $cd6d
+ ld hl, wcd6d
ld de, W_ENEMYMONNAME
ld bc, $b
call CopyData
ld a, [W_ENEMYMONID]
- ld [$d11e], a
+ ld [wd11e], a
ld a, $3a
call Predef ; indirect jump to IndexToPokedex (41010 (10:5010))
- ld a, [$d11e]
+ ld a, [wd11e]
dec a
ld c, a
ld b, $1
- ld hl, wPokedexSeen ; $d30a
+ ld hl, wPokedexSeen ; wd30a
ld a, $10 ; FlagActionPredef
call Predef
- ld hl, W_ENEMYMONLEVEL ; $cff3
- ld de, $cd23
+ ld hl, W_ENEMYMONLEVEL ; W_ENEMYMONLEVEL
+ ld de, wcd23
ld bc, $b
call CopyData
ld a, $7
ld b, $8
- ld hl, wEnemyMonStatMods ; $cd2e
+ ld hl, wEnemyMonStatMods ; wcd2e
.asm_3ec2d
ld [hli], a
dec b
@@ -6201,14 +6201,14 @@
ret
Func_3ec32: ; 3ec32 (f:6c32)
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
jr nz, .asm_3ec4d
xor a
- ld [wMenuJoypadPollCount], a ; $cc34
+ ld [wMenuJoypadPollCount], a ; wMenuJoypadPollCount
callab Func_372d6
ld a, $1
- ld [$cfcb], a
+ ld [wcfcb], a
call ClearScreen
.asm_3ec4d
call DelayFrame
@@ -6218,7 +6218,7 @@
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
ld a, $ff
- ld [$cfcb], a
+ ld [wcfcb], a
call ClearSprites
call ClearScreen
xor a
@@ -6226,28 +6226,28 @@
ld [$ffb0], a
ld [rWY], a ; $ff4a
ld [$ffd7], a
- ld hl, $d060
+ ld hl, wd060
ld [hli], a
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
- ld [W_PLAYERDISABLEDMOVE], a ; $d06d
+ ld [W_PLAYERDISABLEDMOVE], a ; W_PLAYERDISABLEDMOVE
ret
Func_3ec81: ; 3ec81 (f:6c81)
push bc
- ld a, [W_PLAYERMONLEVEL] ; $d022
+ ld a, [W_PLAYERMONLEVEL] ; W_PLAYERMONLEVEL
ld b, a
- ld a, [W_ENEMYMONLEVEL] ; $cff3
- ld [W_PLAYERMONLEVEL], a ; $d022
+ ld a, [W_ENEMYMONLEVEL] ; W_ENEMYMONLEVEL
+ ld [W_PLAYERMONLEVEL], a ; W_PLAYERMONLEVEL
ld a, b
- ld [W_ENEMYMONLEVEL], a ; $cff3
+ ld [W_ENEMYMONLEVEL], a ; W_ENEMYMONLEVEL
pop bc
ret
Func_3ec92: ; 3ec92 (f:6c92)
- ld a, [W_BATTLETYPE] ; $d05a
+ ld a, [W_BATTLETYPE] ; wd05a
dec a
ld de, RedPicBack ; $7e0a
jr nz, .asm_3ec9e
@@ -6304,7 +6304,7 @@
ld [$0], a
ld a, $31
ld [$ffe1], a
- FuncCoord 1, 5 ; $c405
+ FuncCoord 1, 5
ld hl, Coord
ld a, $1
jp Predef ; indirect jump to Func_3f0c6 (3f0c6 (f:70c6))
@@ -6335,10 +6335,10 @@
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3ed48
- ld a, [W_PLAYERMONSTATUS] ; $d018
+ ld a, [W_PLAYERMONSTATUS] ; W_PLAYERMONSTATUS
and $40
ret z
- ld hl, $d02a
+ ld hl, W_PLAYERMONSPEED + 1
ld a, [hld]
ld b, a
ld a, [hl]
@@ -6354,10 +6354,10 @@
ld [hl], b
ret
.asm_3ed48
- ld a, [W_ENEMYMONSTATUS] ; $cfe9
+ ld a, [W_ENEMYMONSTATUS] ; wcfe9
and $40
ret z
- ld hl, $cffb
+ ld hl, W_ENEMYMONSPEED + 1
ld a, [hld]
ld b, a
ld a, [hl]
@@ -6377,10 +6377,10 @@
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3ed81
- ld a, [W_PLAYERMONSTATUS] ; $d018
+ ld a, [W_PLAYERMONSTATUS] ; W_PLAYERMONSTATUS
and $10
ret z
- ld hl, $d026
+ ld hl, W_PLAYERMONATK + 1
ld a, [hld]
ld b, a
ld a, [hl]
@@ -6394,10 +6394,10 @@
ld [hl], b
ret
.asm_3ed81
- ld a, [W_ENEMYMONSTATUS] ; $cfe9
+ ld a, [W_ENEMYMONSTATUS] ; wcfe9
and $10
ret z
- ld hl, $cff7
+ ld hl, W_ENEMYMONATTACK + 1
ld a, [hld]
ld b, a
ld a, [hl]
@@ -6424,16 +6424,16 @@
Func_3eda5: ; 3eda5 (f:6da5)
push bc
push bc
- ld a, [$d11e]
+ ld a, [wd11e]
and a
ld a, c
ld hl, W_PLAYERMONATK
- ld de, $cd12
- ld bc, wPlayerMonAttackMod ; $cd1a
+ ld de, wcd12
+ ld bc, wPlayerMonAttackMod ; wcd1a
jr z, .asm_3edc0
ld hl, W_ENEMYMONATTACK
- ld de, $cd26
- ld bc, wEnemyMonStatMods ; $cd2e
+ ld de, wcd26
+ ld bc, wEnemyMonStatMods ; wcd2e
.asm_3edc0
add c
ld c, a
@@ -6588,13 +6588,13 @@
push hl
push bc
- ld a, [$ccde]
+ ld a, [wccde]
ld c, a
ld b, 0
- ld hl, $d148
+ ld hl, wd148
add hl, bc
inc a
- ld [$ccde], a
+ ld [wccde], a
cp 9
ld a, [hl]
pop bc
@@ -6606,9 +6606,9 @@
push af
xor a
- ld [$ccde], a
+ ld [wccde], a
- ld hl, $d148
+ ld hl, wd148
ld b, 9
.loop
ld a, [hl]
@@ -6630,13 +6630,13 @@
Func_3eed3: ; 3eed3 (f:6ed3)
ld a, [H_WHOSETURN] ; $fff3
and a
- ld hl, W_ENEMYMONTYPE1 ; $cfea (aliases: W_ENEMYMONTYPES)
- ld de, W_ENEMYBATTSTATUS1 ; $d067
- ld a, [W_PLAYERMOVENUM] ; $cfd2
+ ld hl, W_ENEMYMONTYPE1 ; wcfea (aliases: W_ENEMYMONTYPES)
+ ld de, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
+ ld a, [W_PLAYERMOVENUM] ; wcfd2
jr z, .asm_3eeea
- ld hl, W_PLAYERMONTYPE1 ; $d019 (aliases: W_PLAYERMONTYPES)
- ld de, W_ENEMYBATTSTATUS1 ; $d067
- ld a, [W_ENEMYMOVENUM] ; $cfcc
+ ld hl, W_PLAYERMONTYPE1 ; wd019 (aliases: W_PLAYERMONTYPES)
+ ld de, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
+ ld a, [W_ENEMYMOVENUM] ; W_ENEMYMOVENUM
.asm_3eeea
cp SELFDESTRUCT
jr z, .asm_3eef1
@@ -6652,29 +6652,29 @@
ld a, [hl]
cp GHOST
ret z
- ld a, [W_MOVEMISSED] ; $d05f
+ ld a, [W_MOVEMISSED] ; W_MOVEMISSED
and a
ret nz
ld a, MEGA_PUNCH
- ld [$cc5b], a
+ ld [wcc5b], a
PlayMoveAnimation: ; 3ef07 (f:6f07)
- ld [$D07C],a
+ ld [W_ANIMATIONID],a
call Delay3
PREDEF_JUMP MoveAnimationPredef ; predef 8
InitBattle: ; 3ef12 (f:6f12)
- ld a, [W_CUROPPONENT] ; $d059
+ ld a, [W_CUROPPONENT] ; wd059
and a
jr z, asm_3ef23
InitOpponent: ; 3ef18 (f:6f18)
- ld a, [W_CUROPPONENT] ; $d059
- ld [$cf91], a
+ ld a, [W_CUROPPONENT] ; wd059
+ ld [wcf91], a
ld [W_ENEMYMONID], a
jr asm_3ef3d
asm_3ef23: ; 3ef23 (f:6f23)
- ld a, [$d732]
+ ld a, [wd732]
bit 1, a
jr z, .asm_3ef2f
ld a, [hJoyHeld]
@@ -6681,15 +6681,15 @@
bit 1, a
ret nz
.asm_3ef2f
- ld a, [$d13c]
+ ld a, [wd13c]
and a
ret nz
callab Func_13870
ret nz
asm_3ef3d: ; 3ef3d (f:6f3d)
- ld a, [$d35d]
+ ld a, [wd35d]
push af
- ld hl, $d358
+ ld hl, wd358
ld a, [hl]
push af
res 1, [hl]
@@ -6697,7 +6697,7 @@
ld a, [W_ENEMYMONID]
sub $c8
jp c, InitWildBattle
- ld [W_TRAINERCLASS], a ; $d031
+ ld [W_TRAINERCLASS], a ; wd031
call GetTrainerInformation
callab ReadTrainer
call Func_3ec32
@@ -6706,23 +6706,23 @@
ld [W_ENEMYMONID], a
ld [$ffe1], a
dec a
- ld [wAICount], a ; $ccdf
- FuncCoord 12, 0 ; $c3ac
+ ld [wAICount], a ; wccdf
+ FuncCoord 12, 0
ld hl, Coord
ld a, $1
call Predef ; indirect jump to Func_3f0c6 (3f0c6 (f:70c6))
ld a, $ff
- ld [W_ENEMYMONNUMBER], a ; $cfe8
+ ld [W_ENEMYMONNUMBER], a ; W_ENEMYMONNUMBER
ld a, $2
- ld [W_ISINBATTLE], a ; $d057
+ ld [W_ISINBATTLE], a ; W_ISINBATTLE
jp Func_3efeb
InitWildBattle: ; 3ef8b (f:6f8b)
ld a, $1
- ld [W_ISINBATTLE], a ; $d057
+ ld [W_ISINBATTLE], a ; W_ISINBATTLE
call Func_3eb01
call Func_3ec32
- ld a, [W_CUROPPONENT] ; $d059
+ ld a, [W_CUROPPONENT] ; wd059
cp MAROWAK
jr z, .isGhost
call IsGhostBattle
@@ -6747,14 +6747,14 @@
ld a, "T"
ld [hli], a
ld [hl], "@"
- ld a, [$cf91]
+ ld a, [wcf91]
push af
ld a, MON_GHOST
- ld [$cf91], a
+ ld [wcf91], a
ld de, $9000
call LoadMonFrontSprite ; load ghost sprite
pop af
- ld [$cf91], a
+ ld [wcf91], a
jr .spriteLoaded
.isNoGhost
ld de, $9000
@@ -6761,9 +6761,9 @@
call LoadMonFrontSprite ; load mon sprite
.spriteLoaded
xor a
- ld [W_TRAINERCLASS], a ; $d031
+ ld [W_TRAINERCLASS], a ; wd031
ld [$ffe1], a
- FuncCoord 12, 0 ; $c3ac
+ FuncCoord 12, 0
ld hl, Coord
ld a, $1
call Predef ; indirect jump to Func_3f0c6 (3f0c6 (f:70c6))
@@ -6786,25 +6786,25 @@
ld a, $9c
ld [$ffbd], a
call LoadScreenTilesFromBuffer1
- FuncCoord 9, 7 ; $c435
+ FuncCoord 9, 7
ld hl, Coord
ld bc, $50a
call ClearScreenArea
- FuncCoord 1, 0 ; $c3a1
+ FuncCoord 1, 0
ld hl, Coord
ld bc, $40a
call ClearScreenArea
call ClearSprites
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
dec a
call z, Func_3cdec
call Func_3c11e
callab Func_137aa
pop af
- ld [$d358], a
+ ld [wd358], a
pop af
- ld [$d35d], a
- ld a, [$d0d4]
+ ld [wd35d], a
+ ld a, [wd0d4]
ld [$ffd7], a
scf
ret
@@ -6813,12 +6813,12 @@
db "@"
_LoadTrainerPic: ; 3f04b (f:704b)
-; $d033-$d034 contain pointer to pic
- ld a, [$d033]
+; wd033-wd034 contain pointer to pic
+ ld a, [wd033]
ld e, a
- ld a, [$d034]
+ ld a, [wd034]
ld d, a ; de contains pointer to trainer pic
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
and a
ld a, Bank(TrainerPics) ; this is where all the trainer pics are (not counting Red's)
jr z, .loadSprite
@@ -6832,19 +6832,19 @@
Func_3f069: ; 3f069 (f:7069)
xor a
- ld [$c0f1], a
- ld [$c0f2], a
+ ld [wc0f1], a
+ ld [wc0f2], a
jp PlaySound
Func_3f073: ; 3f073 (f:7073)
- ld a, [$cc4f]
+ ld a, [wPredefRegisters]
ld h, a
- ld a, [$cc50]
+ ld a, [wPredefRegisters + 1]
ld l, a
ld a, [$ffe1]
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
ld b, $4c
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
and a
jr z, .asm_3f0bc
add b
@@ -6853,7 +6853,7 @@
ld bc, $ffd7
add hl, bc
ld a, $1
- ld [$cd6c], a
+ ld [wcd6c], a
ld bc, $303
ld a, $5
call Predef ; indirect jump to Func_79aba (79aba (1e:5aba))
@@ -6862,7 +6862,7 @@
ld bc, $ffd7
add hl, bc
xor a
- ld [$cd6c], a
+ ld [wcd6c], a
ld bc, $505
ld a, $5
call Predef ; indirect jump to Func_79aba (79aba (1e:5aba))
@@ -6879,9 +6879,9 @@
jr asm_3f0d0
Func_3f0c6: ; 3f0c6 (f:70c6)
- ld a, [$cc4f]
+ ld a, [wPredefRegisters]
ld h, a
- ld a, [$cc50]
+ ld a, [wPredefRegisters + 1]
ld l, a
ld a, [$ffe1]
asm_3f0d0: ; 3f0d0 (f:70d0)
@@ -6933,9 +6933,9 @@
; loads back sprite of mon to $8000
; assumes the corresponding mon header is already loaded
LoadMonBackSprite: ; 3f103 (f:7103)
- ld a, [$cfd9]
- ld [$cf91], a
- FuncCoord 1, 5 ; $c405
+ ld a, [wcfd9]
+ ld [wcf91], a
+ FuncCoord 1, 5
ld hl, Coord
ld b, $7
ld c, $8
@@ -7065,13 +7065,13 @@
dw DisableEffect ; DISABLE_EFFECT
SleepEffect: ; 3f1fc (f:71fc)
- ld de, W_ENEMYMONSTATUS ; $cfe9
- ld bc, W_ENEMYBATTSTATUS2 ; $d068
+ ld de, W_ENEMYMONSTATUS ; wcfe9
+ ld bc, W_ENEMYBATTSTATUS2 ; W_ENEMYBATTSTATUS2
ld a, [H_WHOSETURN] ; $fff3
and a
jp z, .asm_3f20e
- ld de, W_PLAYERMONSTATUS ; $d018
- ld bc, W_PLAYERBATTSTATUS2 ; $d063
+ ld de, W_PLAYERMONSTATUS ; W_PLAYERMONSTATUS
+ ld bc, W_PLAYERBATTSTATUS2 ; W_PLAYERBATTSTATUS2
.asm_3f20e
ld a, [bc]
@@ -7092,7 +7092,7 @@
push de
call MoveHitTest
pop de
- ld a, [W_MOVEMISSED] ; $d05f
+ ld a, [W_MOVEMISSED] ; W_MOVEMISSED
and a
jr nz, .asm_3f242
.asm_3f231
@@ -7115,13 +7115,13 @@
db "@"
PoisonEffect: ; 3f24f (f:724f)
- ld hl, W_ENEMYMONSTATUS ; $cfe9
- ld de, W_PLAYERMOVEEFFECT ; $cfd3
+ ld hl, W_ENEMYMONSTATUS ; wcfe9
+ ld de, W_PLAYERMOVEEFFECT ; wcfd3
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3f260
- ld hl, W_PLAYERMONSTATUS ; $d018
- ld de, W_ENEMYMOVEEFFECT ; $cfcd
+ ld hl, W_PLAYERMONSTATUS ; W_PLAYERMONSTATUS
+ ld de, W_ENEMYMOVEEFFECT ; W_ENEMYMOVEEFFECT
.asm_3f260
call CheckTargetSubstitute
jr nz, .asm_3f2d3
@@ -7147,7 +7147,7 @@
call MoveHitTest
pop de
pop hl
- ld a, [W_MOVEMISSED] ; $d05f
+ ld a, [W_MOVEMISSED] ; W_MOVEMISSED
and a
jr nz, .asm_3f2d7
jr .asm_3f295
@@ -7163,13 +7163,13 @@
ld a, [H_WHOSETURN] ; $fff3
and a
ld b, $c7
- ld hl, W_PLAYERBATTSTATUS3 ; $d064
+ ld hl, W_PLAYERBATTSTATUS3 ; W_PLAYERBATTSTATUS3
ld a, [de]
- ld de, W_PLAYERTOXICCOUNTER ; $d06c
+ ld de, W_PLAYERTOXICCOUNTER ; wd06c
jr nz, .asm_3f2b0
ld b, $a9
- ld hl, W_ENEMYBATTSTATUS3 ; $d069
- ld de, W_ENEMYTOXICCOUNTER ; $d071
+ ld hl, W_ENEMYBATTSTATUS3 ; W_ENEMYBATTSTATUS3
+ ld de, W_ENEMYTOXICCOUNTER ; wd071
.asm_3f2b0
cp $5c
jr nz, .asm_3f2bd
@@ -7214,13 +7214,13 @@
jp Bankswitch
ExplodeEffect: ; 3f2f1 (f:72f1)
- ld hl, W_PLAYERMONCURHP ; $d015
- ld de, W_PLAYERBATTSTATUS2 ; $d063
+ ld hl, W_PLAYERMONCURHP ; wd015
+ ld de, W_PLAYERBATTSTATUS2 ; W_PLAYERBATTSTATUS2
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3f302
- ld hl, W_ENEMYMONCURHP ; $cfe6
- ld de, W_ENEMYBATTSTATUS2 ; $d068
+ ld hl, W_ENEMYMONCURHP ; W_ENEMYMONCURHP
+ ld de, W_ENEMYBATTSTATUS2 ; W_ENEMYBATTSTATUS2
.asm_3f302
xor a
ld [hli], a ; set the mon's HP to 0
@@ -7234,7 +7234,7 @@
FreezeBurnParalyzeEffect: ; 3f30c (f:730c)
xor a
- ld [$cc5b], a
+ ld [wcc5b], 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, [$fff3] ;whose turn?
@@ -7358,7 +7358,7 @@
ret nz ;return if it isn't fire
;type is fire
ld [W_ENEMYMONSTATUS], a ;set opponent status to 00 ["defrost" a frozen monster]
- ld hl, $d8a8 ;status of first opponent monster in their roster
+ ld hl, wd8a8 ;status of first opponent monster in their roster
ld a, [W_ENEMYMONNUMBER]
ld bc, $002c ;$2C bytes per roster entry
call AddNTimes
@@ -7371,7 +7371,7 @@
sub a, FIRE
ret nz
ld [W_PLAYERMONSTATUS], a
- ld hl, $d16f
+ ld hl, W_PARTYMON1_STATUS
ld a, [wPlayerMonNumber]
ld bc, $002c
call AddNTimes
@@ -7386,13 +7386,13 @@
db "@"
StatModifierUpEffect: ; 3f428 (f:7428)
- ld hl, wPlayerMonStatMods ; $cd1a
- ld de, W_PLAYERMOVEEFFECT ; $cfd3
+ ld hl, wPlayerMonStatMods ; wcd1a
+ ld de, W_PLAYERMOVEEFFECT ; wcfd3
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3f439
- ld hl, wEnemyMonStatMods ; $cd2e
- ld de, W_ENEMYMOVEEFFECT ; $cfcd
+ ld hl, wEnemyMonStatMods ; wcd2e
+ ld de, W_ENEMYMOVEEFFECT ; W_ENEMYMOVEEFFECT
.asm_3f439
ld a, [de]
sub $a
@@ -7422,13 +7422,13 @@
cp $4
jr nc, asm_3f4ca
push hl
- ld hl, $d026
- ld de, $cd12
+ ld hl, W_PLAYERMONATK + 1
+ ld de, wcd12
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3f472
- ld hl, $cff7
- ld de, $cd26
+ ld hl, W_ENEMYMONATTACK + 1
+ ld de, wcd26
.asm_3f472
push bc
sla c
@@ -7492,15 +7492,15 @@
ld b, c
inc b
call Func_3f688
- ld hl, W_PLAYERBATTSTATUS2 ; $d063
- ld de, W_PLAYERMOVENUM ; $cfd2
- ld bc, $ccf7
+ ld hl, W_PLAYERBATTSTATUS2 ; W_PLAYERBATTSTATUS2
+ ld de, W_PLAYERMOVENUM ; wcfd2
+ ld bc, wccf7
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3f4e6
- ld hl, W_ENEMYBATTSTATUS2 ; $d068
- ld de, W_ENEMYMOVENUM ; $cfcc
- ld bc, $ccf3
+ ld hl, W_ENEMYBATTSTATUS2 ; W_ENEMYBATTSTATUS2
+ ld de, W_ENEMYMOVENUM ; W_ENEMYMOVENUM
+ ld bc, wccf3
.asm_3f4e6
ld a, [de]
cp MINIMIZE
@@ -7548,9 +7548,9 @@
ld hl, GreatlyRoseText
ld a, [H_WHOSETURN] ; $fff3
and a
- ld a, [W_PLAYERMOVEEFFECT] ; $cfd3
+ ld a, [W_PLAYERMOVEEFFECT] ; wcfd3
jr z, .asm_3f53b
- ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
+ ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT
.asm_3f53b
cp ATTACK_DOWN1_EFFECT
ret nc
@@ -7566,16 +7566,16 @@
db "@"
StatModifierDownEffect: ; 3f54c (f:754c)
- ld hl, wEnemyMonStatMods ; $cd2e
- ld de, W_PLAYERMOVEEFFECT ; $cfd3
- ld bc, W_ENEMYBATTSTATUS1 ; $d067
+ ld hl, wEnemyMonStatMods ; wcd2e
+ ld de, W_PLAYERMOVEEFFECT ; wcfd3
+ ld bc, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3f572
- ld hl, wPlayerMonStatMods ; $cd1a
- ld de, W_ENEMYMOVEEFFECT ; $cfcd
- ld bc, W_PLAYERBATTSTATUS1 ; $d062
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld hl, wPlayerMonStatMods ; wcd1a
+ ld de, W_ENEMYMOVEEFFECT ; W_ENEMYMOVEEFFECT
+ ld bc, W_PLAYERBATTSTATUS1 ; W_PLAYERBATTSTATUS1
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
jr z, .asm_3f572
call BattleRandom
@@ -7601,7 +7601,7 @@
pop bc
pop de
pop hl
- ld a, [W_MOVEMISSED] ; $d05f
+ ld a, [W_MOVEMISSED] ; W_MOVEMISSED
and a
jp nz, Func_3f65a
ld a, [bc]
@@ -7634,13 +7634,13 @@
jr nc, asm_3f62c
push hl
push de
- ld hl, $cff7
- ld de, $cd26
+ ld hl, W_ENEMYMONATTACK + 1
+ ld de, wcd26
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3f5d8
- ld hl, $d026
- ld de, $cd12
+ ld hl, W_PLAYERMONATK + 1
+ ld de, wcd12
.asm_3f5d8
push bc
sla c
@@ -7743,9 +7743,9 @@
ld hl, FellText
ld a, [H_WHOSETURN] ; $fff3
and a
- ld a, [W_PLAYERMOVEEFFECT] ; $cfd3
+ ld a, [W_PLAYERMOVEEFFECT] ; wcfd3
jr z, .asm_3f674
- ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
+ ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT
.asm_3f674
cp $1a
ret c
@@ -7774,7 +7774,7 @@
jr z, .asm_3f68d
jr .asm_3f690
.asm_3f696
- ld de, $cf4b
+ ld de, wcf4b
ld bc, $a
jp CopyData
@@ -7805,13 +7805,13 @@
BideEffect: ; 3f6e5 (f:76e5)
ld hl, W_PLAYERBATTSTATUS1
ld de, W_NUMHITS
- ld bc, $d06a
+ ld bc, wd06a
ld a, [H_WHOSETURN]
and a
jr z, .asm_3f6fc
ld hl, W_ENEMYBATTSTATUS1
- ld de, $cd05
- ld bc, $d06f
+ ld de, wcd05
+ ld bc, wd06f
.asm_3f6fc
set 0, [hl] ; mon is now using bide
xor a
@@ -7830,13 +7830,13 @@
jp Func_3fb96
ThrashPetalDanceEffect: ; 3f717 (f:7717)
- ld hl, W_PLAYERBATTSTATUS1 ; $d062
- ld de, $d06a
+ ld hl, W_PLAYERBATTSTATUS1 ; W_PLAYERBATTSTATUS1
+ ld de, wd06a
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3f728
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
- ld de, $d06f
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
+ ld de, wd06f
.asm_3f728
set 1, [hl] ; mon is now using thrash/petal dance
call BattleRandom
@@ -7852,12 +7852,12 @@
ld a, [H_WHOSETURN] ; $fff3
and a
jr nz, .asm_3f791
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
dec a
jr nz, .asm_3f77e
- ld a, [W_CURENEMYLVL] ; $d127
+ ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL
ld b, a
- ld a, [W_PLAYERMONLEVEL] ; $d022
+ ld a, [W_PLAYERMONLEVEL] ; W_PLAYERMONLEVEL
cp b
jr nc, .asm_3f76e
add b
@@ -7873,7 +7873,7 @@
jr nc, .asm_3f76e
ld c, $32
call DelayFrames
- ld a, [W_PLAYERMOVENUM] ; $cfd2
+ ld a, [W_PLAYERMOVENUM] ; wcfd2
cp TELEPORT
jp nz, PrintDidntAffectText
jp PrintButItFailedText_
@@ -7880,26 +7880,26 @@
.asm_3f76e
call ReadPlayerMonCurHPAndStatus
xor a
- ld [$cc5b], a
+ ld [wcc5b], a
inc a
- ld [$d078], a
- ld a, [W_PLAYERMOVENUM] ; $cfd2
+ ld [wd078], a
+ ld a, [W_PLAYERMOVENUM] ; wcfd2
jr .asm_3f7e4
.asm_3f77e
ld c, $32
call DelayFrames
ld hl, IsUnaffectedText
- ld a, [W_PLAYERMOVENUM] ; $cfd2
+ ld a, [W_PLAYERMOVENUM] ; wcfd2
cp TELEPORT
jp nz, PrintText
jp PrintButItFailedText_
.asm_3f791
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
dec a
jr nz, .asm_3f7d1
- ld a, [W_PLAYERMONLEVEL] ; $d022
+ ld a, [W_PLAYERMONLEVEL] ; W_PLAYERMONLEVEL
ld b, a
- ld a, [W_CURENEMYLVL] ; $d127
+ ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL
cp b
jr nc, .asm_3f7c1
add b
@@ -7915,7 +7915,7 @@
jr nc, .asm_3f7c1
ld c, $32
call DelayFrames
- ld a, [W_ENEMYMOVENUM] ; $cfcc
+ ld a, [W_ENEMYMOVENUM] ; W_ENEMYMOVENUM
cp TELEPORT
jp nz, PrintDidntAffectText
jp PrintButItFailedText_
@@ -7922,16 +7922,16 @@
.asm_3f7c1
call ReadPlayerMonCurHPAndStatus
xor a
- ld [$cc5b], a
+ ld [wcc5b], a
inc a
- ld [$d078], a
- ld a, [W_ENEMYMOVENUM] ; $cfcc
+ ld [wd078], a
+ ld a, [W_ENEMYMOVENUM] ; W_ENEMYMOVENUM
jr .asm_3f7e4
.asm_3f7d1
ld c, $32
call DelayFrames
ld hl, IsUnaffectedText
- ld a, [W_ENEMYMOVENUM] ; $cfcc
+ ld a, [W_ENEMYMOVENUM] ; W_ENEMYMOVENUM
cp TELEPORT
jp nz, PrintText
jp Func_3fb4e
@@ -7964,24 +7964,24 @@
db "@"
TwoToFiveAttacksEffect: ; 3f811 (f:7811)
- ld hl, W_PLAYERBATTSTATUS1 ; $d062
- ld de, $d06a
- ld bc, W_NUMHITS ; $d074
+ ld hl, W_PLAYERBATTSTATUS1 ; W_PLAYERBATTSTATUS1
+ ld de, wd06a
+ ld bc, W_NUMHITS ; wd074
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3f828
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
- ld de, $d06f
- ld bc, $cd05
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
+ ld de, wd06f
+ ld bc, wcd05
.asm_3f828
bit 2, [hl] ; is mon attacking multiple times?
ret nz
set 2, [hl] ; mon is now attacking multiple times
- ld hl, W_PLAYERMOVEEFFECT ; $cfd3
+ ld hl, W_PLAYERMOVEEFFECT ; wcfd3
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3f838
- ld hl, W_ENEMYMOVEEFFECT ; $cfcd
+ ld hl, W_ENEMYMOVEEFFECT ; W_ENEMYMOVEEFFECT
.asm_3f838
ld a, [hl]
cp TWINEEDLE_EFFECT
@@ -8010,13 +8010,13 @@
FlichSideEffect: ; 3f85b (f:785b)
call CheckTargetSubstitute
ret nz
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
- ld de, W_PLAYERMOVEEFFECT ; $cfd3
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
+ ld de, W_PLAYERMOVEEFFECT ; wcfd3
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3f870
- ld hl, W_PLAYERBATTSTATUS1 ; $d062
- ld de, W_ENEMYMOVEEFFECT ; $cfcd
+ ld hl, W_PLAYERBATTSTATUS1 ; W_PLAYERBATTSTATUS1
+ ld de, W_ENEMYMOVEEFFECT ; W_ENEMYMOVEEFFECT
.asm_3f870
ld a, [de]
cp FLINCH_SIDE_EFFECT1
@@ -8037,14 +8037,14 @@
jp Bankswitch
ChargeEffect: ; 3f88c (f:788c)
- ld hl, W_PLAYERBATTSTATUS1 ; $d062
- ld de, W_PLAYERMOVEEFFECT ; $cfd3
+ ld hl, W_PLAYERBATTSTATUS1 ; W_PLAYERBATTSTATUS1
+ ld de, W_PLAYERMOVEEFFECT ; wcfd3
ld a, [H_WHOSETURN] ; $fff3
and a
ld b, $ae
jr z, .asm_3f8a1
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
- ld de, W_ENEMYMOVEEFFECT ; $cfcd
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
+ ld de, W_ENEMYMOVEEFFECT ; W_ENEMYMOVEEFFECT
ld b, $af
.asm_3f8a1
set 4, [hl]
@@ -8062,11 +8062,11 @@
ld b, $c0
.asm_3f8b6
xor a
- ld [$cc5b], a
+ ld [wcc5b], a
ld a, b
call Func_3fbb9
ld a, [de]
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
ld hl, ChargeMoveEffectText ; $78c8
jp PrintText
@@ -8073,7 +8073,7 @@
ChargeMoveEffectText: ; 3f8c8 (f:78c8)
TX_FAR _ChargeMoveEffectText
db $08 ; asm
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
cp RAZOR_WIND
ld hl, MadeWhirlwindText ; $78f9
jr z, .asm_3f8f8
@@ -8119,13 +8119,13 @@
db "@"
TrappingEffect: ; 3f917 (f:7917)
- ld hl, W_PLAYERBATTSTATUS1 ; $d062
- ld de, $d06a
+ ld hl, W_PLAYERBATTSTATUS1 ; W_PLAYERBATTSTATUS1
+ ld de, wd06a
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3f928
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
- ld de, $d06f
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
+ ld de, wd06f
.asm_3f928
bit 5, [hl]
ret nz
@@ -8167,7 +8167,7 @@
call CheckTargetSubstitute
jr nz, Func_3f9a6
call MoveHitTest
- ld a, [W_MOVEMISSED] ; $d05f
+ ld a, [W_MOVEMISSED] ; W_MOVEMISSED
and a
jr nz, Func_3f9a6
@@ -8174,13 +8174,13 @@
Func_3f96f: ; 3f96f (f:796f)
ld a, [H_WHOSETURN] ; $fff3
and a
- ld hl, W_ENEMYBATTSTATUS1 ; $d067
- ld bc, $d070
- ld a, [W_PLAYERMOVEEFFECT] ; $cfd3
+ ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
+ ld bc, wd070
+ ld a, [W_PLAYERMOVEEFFECT] ; wcfd3
jr z, .asm_3f986
- ld hl, W_PLAYERBATTSTATUS1 ; $d062
- ld bc, $d06b
- ld a, [W_ENEMYMOVEEFFECT] ; $cfcd
+ ld hl, W_PLAYERBATTSTATUS1 ; W_PLAYERBATTSTATUS1
+ ld bc, wd06b
+ ld a, [W_ENEMYMOVEEFFECT] ; W_ENEMYMOVEEFFECT
.asm_3f986
bit 7, [hl] ; is mon confused?
jr nz, Func_3f9a6
@@ -8219,11 +8219,11 @@
jp Bankswitch
HyperBeamEffect: ; 3f9c1 (f:79c1)
- ld hl, W_PLAYERBATTSTATUS2 ; $d063
+ ld hl, W_PLAYERBATTSTATUS2 ; W_PLAYERBATTSTATUS2
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3f9cc
- ld hl, W_ENEMYBATTSTATUS2 ; $d068
+ ld hl, W_ENEMYBATTSTATUS2 ; W_ENEMYBATTSTATUS2
.asm_3f9cc
set 5, [hl] ; mon now needs to recharge
ret
@@ -8230,11 +8230,11 @@
Func_3f9cf: ; 3f9cf (f:79cf)
push hl
- ld hl, W_ENEMYBATTSTATUS2 ; $d068
+ ld hl, W_ENEMYBATTSTATUS2 ; W_ENEMYBATTSTATUS2
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3f9db
- ld hl, W_PLAYERBATTSTATUS2 ; $d063
+ ld hl, W_PLAYERBATTSTATUS2 ; W_PLAYERBATTSTATUS2
.asm_3f9db
res 5, [hl] ; mon no longer needs to recharge
pop hl
@@ -8314,7 +8314,7 @@
add hl, bc
ld a, d
ld [hl], a
- ld [$d11e], a
+ ld [wd11e], a
call GetMoveName
call Func_3fba8
ld hl, MimicLearnedMoveText
@@ -8337,15 +8337,15 @@
DisableEffect: ; 3fa8a (f:7a8a)
call MoveHitTest
- ld a, [W_MOVEMISSED] ; $d05f
+ ld a, [W_MOVEMISSED] ; W_MOVEMISSED
and a
jr nz, .asm_3fb06
- ld de, W_ENEMYDISABLEDMOVE ; $d072
+ ld de, W_ENEMYDISABLEDMOVE ; W_ENEMYDISABLEDMOVE
ld hl, W_ENEMYMONMOVES
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3faa4
- ld de, W_PLAYERDISABLEDMOVE ; $d06d
+ ld de, W_PLAYERDISABLEDMOVE ; W_PLAYERDISABLEDMOVE
ld hl, W_PLAYERMONMOVES
.asm_3faa4
ld a, [de]
@@ -8362,18 +8362,18 @@
pop hl
and a
jr z, .asm_3faa8
- ld [$d11e], a
+ ld [wd11e], a
push hl
ld a, [H_WHOSETURN] ; $fff3
and a
- ld hl, W_PLAYERMONPP ; $d02d
+ ld hl, W_PLAYERMONPP ; W_PLAYERMONPP
jr nz, .asm_3facf
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
pop hl
jr nz, .asm_3fae1
push hl
- ld hl, W_ENEMYMONPP ; $cffe
+ ld hl, W_ENEMYMONPP ; wcffe
.asm_3facf
push hl
ld a, [hli]
@@ -8399,13 +8399,13 @@
add c
ld [de], a
call Func_3fb89
- ld hl, $ccee
+ ld hl, wccee
ld a, [H_WHOSETURN] ; $fff3
and a
jr nz, .asm_3faf8
inc hl
.asm_3faf8
- ld a, [$d11e]
+ ld a, [wd11e]
ld [hl], a
call GetMoveName
ld hl, MoveWasDisabledText ; $7b09
@@ -8462,7 +8462,7 @@
db "@"
Func_3fb4e: ; 3fb4e (f:7b4e)
- ld a, [$ccf4]
+ ld a, [wccf4]
and a
ret nz
@@ -8496,11 +8496,11 @@
CheckTargetSubstitute: ; 3fb79 (f:7b79)
push hl
- ld hl, $d068
+ ld hl, W_ENEMYBATTSTATUS2
ld a, [$fff3] ;whose turn?
and a
jr z, .next1
- ld hl, $d063
+ ld hl, W_PLAYERBATTSTATUS2
.next1
bit 4, [hl] ;test bit 4 in d063/d068 flags
pop hl
@@ -8509,15 +8509,15 @@
Func_3fb89: ; 3fb89 (f:7b89)
ld a, [H_WHOSETURN] ; $fff3
and a
- ld a, [W_PLAYERMOVENUM] ; $cfd2
+ ld a, [W_PLAYERMOVENUM] ; wcfd2
jr z, .asm_3fb94
- ld a, [W_ENEMYMOVENUM] ; $cfcc
+ ld a, [W_ENEMYMOVENUM] ; W_ENEMYMOVENUM
.asm_3fb94
and a
ret z
Func_3fb96: ; 3fb96 (f:7b96)
- ld [W_ANIMATIONID], a ; $d07c
+ ld [W_ANIMATIONID], a ; W_ANIMATIONID
ld a, [H_WHOSETURN] ; $fff3
and a
ld a, $6
@@ -8524,23 +8524,23 @@
jr z, .asm_3fba2
ld a, $3
.asm_3fba2
- ld [$cc5b], a
+ ld [wcc5b], a
jp Func_3fbbc
Func_3fba8: ; 3fba8 (f:7ba8)
xor a
- ld [$cc5b], a
+ ld [wcc5b], a
ld a, [H_WHOSETURN] ; $fff3
and a
- ld a, [W_PLAYERMOVENUM] ; $cfd2
+ ld a, [W_PLAYERMOVENUM] ; wcfd2
jr z, .asm_3fbb7
- ld a, [W_ENEMYMOVENUM] ; $cfcc
+ ld a, [W_ENEMYMOVENUM] ; W_ENEMYMOVENUM
.asm_3fbb7
and a
ret z
Func_3fbb9: ; 3fbb9 (f:7bb9)
- ld [W_ANIMATIONID], a ; $d07c
+ ld [W_ANIMATIONID], a ; W_ANIMATIONID
Func_3fbbc: ; 3fbbc (f:7bbc)
push hl
--- a/engine/battle/d.asm
+++ b/engine/battle/d.asm
@@ -1,25 +1,25 @@
Func_372d6: ; 372d6 (d:72d6)
call LoadTextBoxTilePatterns
- FuncCoord 3, 4 ; $c3f3
+ FuncCoord 3, 4
ld hl, Coord
ld b, $7
ld c, $c
call TextBoxBorder
- FuncCoord 4, 5 ; $c408
+ FuncCoord 4, 5
ld hl, Coord
- ld de, W_PLAYERNAME ; $d158
+ ld de, W_PLAYERNAME ; wd158
call PlaceString
- FuncCoord 4, 10 ; $c46c
+ FuncCoord 4, 10
ld hl, Coord
- ld de, W_GRASSRATE ; $d887
+ ld de, W_GRASSRATE ; W_GRASSRATE
call PlaceString
- FuncCoord 9, 8 ; $c449
+ FuncCoord 9, 8
ld hl, Coord
ld a, $69
ld [hli], a
ld [hl], $6a
xor a
- ld [$cfcb], a
+ ld [wcfcb], a
callab SetupPlayerAndEnemyPokeballs
ld c, $96
jp DelayFrames
--- a/engine/battle/e.asm
+++ b/engine/battle/e.asm
@@ -1,11 +1,11 @@
Func_39680: ; 39680 (e:5680)
ld a, [H_WHOSETURN] ; $fff3
and a
- ld a, [$d060]
- ld hl, $d026
+ ld a, [wd060]
+ ld hl, W_PLAYERMONATK + 1
jr z, .asm_39691
- ld a, [$d065]
- ld hl, $cff7
+ ld a, [wd065]
+ ld hl, W_ENEMYMONATTACK + 1
.asm_39691
ld c, $4
ld b, a
@@ -30,10 +30,10 @@
Func_396a7: ; 396a7 (e:56a7)
ld a, [H_WHOSETURN] ; $fff3
and a
- ld a, [$d061]
+ ld a, [wd061]
ld hl, W_PLAYERMONATK
jr z, .asm_396b8
- ld a, [$d066]
+ ld a, [wd066]
ld hl, W_ENEMYMONATTACK
.asm_396b8
ld c, $4
@@ -67,7 +67,7 @@
ld b, $1
call GoPAL_SET
callab _LoadTrainerPic
- FuncCoord 19, 0 ; $c3b3
+ FuncCoord 19, 0
ld hl, Coord
ld c, $0
.asm_396e9
@@ -114,7 +114,7 @@
; unused slots are filled with 0, all used slots may be chosen with equal probability
AIEnemyTrainerChooseMoves: ; 39719 (e:5719)
ld a, $a
- ld hl, $cee9 ; init temporary move selection array. Only the moves with the lowest numbers are chosen in the end
+ ld hl, wHPBarMaxHP ; init temporary move selection array. Only the moves with the lowest numbers are chosen in the end
ld [hli], a ; move 1
ld [hli], a ; move 2
ld [hli], a ; move 3
@@ -123,7 +123,7 @@
swap a
and $f
jr z, .noMoveDisabled
- ld hl, $cee9
+ ld hl, wHPBarMaxHP
dec a
ld c, a
ld b, $0
@@ -165,7 +165,7 @@
push de
jp [hl] ; execute modification function
.loopFindMinimumEntries ; all entries will be decremented sequentially until one of them is zero
- ld hl, $cee9 ; temp move selection array
+ ld hl, wHPBarMaxHP ; temp move selection array
ld de, W_ENEMYMONMOVES ; enemy moves
ld c, $4
.loopDecrementEntries
@@ -187,7 +187,7 @@
inc a
cp $5
jr nz, .loopUndoPartialIteration
- ld hl, $cee9 ; temp move selection array
+ ld hl, wHPBarMaxHP ; temp move selection array
ld de, W_ENEMYMONMOVES ; enemy moves
ld c, $4
.filterMinimalEntries ; all minimal entries now have value 1. All other slots will be disabled (move set to 0)
@@ -209,7 +209,7 @@
inc de
dec c
jr nz, .filterMinimalEntries
- ld hl, $cee9 ; use created temporary array as move set
+ ld hl, wHPBarMaxHP ; use created temporary array as move set
ret
.useOriginalMoveSet
ld hl, W_ENEMYMONMOVES ; use original move set
@@ -226,7 +226,7 @@
ld a, [W_PLAYERMONSTATUS]
and a
ret z ; return if no status ailment on player's mon
- ld hl, $cee8 ; temp move selection array (-1 byte offest)
+ ld hl, wBuffer - 1 ; temp move selection array (-1 byte offest)
ld de, W_ENEMYMONMOVES ; enemy moves
ld b, $5
.nextMove
@@ -266,10 +266,10 @@
; slightly encourage moves with specific effects
AIMoveChoiceModification2: ; 397e7 (e:57e7)
- ld a, [$ccd5]
+ ld a, [wccd5]
cp $1
ret nz
- ld hl, $cee8 ; temp move selection array (-1 byte offest)
+ ld hl, wBuffer - 1 ; temp move selection array (-1 byte offest)
ld de, W_ENEMYMONMOVES ; enemy moves
ld b, $5
.nextMove
@@ -297,7 +297,7 @@
; encourages moves that are effective against the player's mon
AIMoveChoiceModification3: ; 39817 (e:5817)
- ld hl, $cee8 ; temp move selection array (-1 byte offest)
+ ld hl, wBuffer - 1 ; temp move selection array (-1 byte offest)
ld de, W_ENEMYMONMOVES ; enemy moves
ld b, $5
.nextMove
@@ -316,7 +316,7 @@
pop de
pop bc
pop hl
- ld a, [$d11e]
+ ld a, [wd11e]
cp $10
jr z, .nextMove
jr c, .notEffectiveMove
@@ -374,7 +374,7 @@
ld hl,Moves
ld bc,6
call AddNTimes
- ld de,$CFCC
+ ld de,W_ENEMYMOVENUM
call CopyData
pop bc
pop de
@@ -579,8 +579,8 @@
INCLUDE "text/trainer_names.asm"
Func_39b87: ; 39b87 (e:5b87)
- ld hl, $d0dc
- ld de, $d0e1
+ ld hl, wd0dc
+ ld de, wd0e1
ld b, $0
.asm_39b8f
ld a, [hli]
@@ -587,13 +587,13 @@
and a
jr z, .asm_39bc1
push hl
- ld [$d0b5], a
+ ld [wd0b5], a
ld a, $2c
- ld [$d0b7], a
+ ld [wPredefBank], a
ld a, MOVE_NAME
ld [W_LISTTYPE], a
call GetName
- ld hl, $cd6d
+ ld hl, wcd6d
.asm_39ba7
ld a, [hli]
cp $50
@@ -603,7 +603,7 @@
jr .asm_39ba7
.asm_39bb0
ld a, b
- ld [$cd6c], a
+ ld [wcd6c], a
inc b
ld a, $4e
ld [de], a
@@ -631,24 +631,24 @@
ret
Func_39bd5: ; 39bd5 (e:5bd5)
- ld a, [$d11b]
+ ld a, [wd11b]
cp $1
jr nz, .asm_39be6
- ld hl, wEnemyPartyCount ; $d89c
- ld de, W_ENEMYMON1OT ; $d9ac OT names of other player
+ ld hl, wEnemyPartyCount ; wEnemyPartyCount
+ ld de, W_ENEMYMON1OT ; wd9ac OT names of other player
ld a, $6
jr .asm_39c18
.asm_39be6
cp $4
jr nz, .calcAttackStat4
- ld hl, W_NUMINPARTY ; $d163
- ld de, W_PARTYMON1OT ; $d273
+ ld hl, W_NUMINPARTY ; W_NUMINPARTY
+ ld de, W_PARTYMON1OT ; wd273
ld a, $5
jr .asm_39c18
.calcAttackStat4
cp $5
jr nz, .asm_39c02
- ld hl, $cf7b
+ ld hl, wStringBuffer2 + 11
ld de, MonsterNames ; $421e
ld a, $1
jr .asm_39c18
@@ -655,47 +655,47 @@
.asm_39c02
cp $2
jr nz, .asm_39c10
- ld hl, wNumBagItems ; $d31d
+ ld hl, wNumBagItems ; wNumBagItems
ld de, ItemNames ; $472b
ld a, $4
jr .asm_39c18
.asm_39c10
- ld hl, $cf7b
+ ld hl, wStringBuffer2 + 11
ld de, ItemNames ; $472b
ld a, ITEM_NAME
.asm_39c18
ld [W_LISTTYPE], a
ld a, l
- ld [$cf8b], a
+ ld [wcf8b], a
ld a, h
- ld [$cf8c], a
+ ld [wcf8c], a
ld a, e
- ld [$cf8d], a
+ ld [wcf8d], a
ld a, d
- ld [$cf8e], a
+ ld [wcf8e], a
ld bc, ItemPrices ; $4608
ld a, c
- ld [$cf8f], a
+ ld [wcf8f], a
ld a, b
- ld [$cf90], a
+ ld [wcf90], a
ret
Func_39c37: ; 39c37 (e:5c37)
- ld hl, W_PARTYMON1 ; $d164
- ld a, [$cc49]
+ ld hl, W_PARTYMON1 ; W_PARTYMON1
+ ld a, [wcc49]
and a
jr z, .asm_39c4b
dec a
jr z, .asm_39c48
- ld hl, $da81
+ ld hl, wda81
jr .asm_39c4b
.asm_39c48
- ld hl, $d89d
+ ld hl, wEnemyPartyMons
.asm_39c4b
ld d, $0
add hl, de
ld a, [hl]
- ld [$cf91], a
+ ld [wcf91], a
ret
ReadTrainer: ; 39c53 (e:5c53)
@@ -705,7 +705,7 @@
and a
ret nz
-; set [wEnemyPartyCount] to 0, [$D89D] to FF
+; set [wEnemyPartyCount] to 0, [wEnemyPartyMons] to FF
; XXX first is total enemy pokemon?
; XXX second is species of first pokemon?
ld hl,wEnemyPartyCount
@@ -754,9 +754,9 @@
ld a,[hli]
and a ; have we reached the end of the trainer data?
jr z,.FinishUp
- ld [$CF91],a ; write species somewhere (XXX why?)
+ ld [wcf91],a ; write species somewhere (XXX why?)
ld a,1
- ld [$CC49],a
+ ld [wcc49],a
push hl
call AddPokemonToParty
pop hl
@@ -771,9 +771,9 @@
jr z,.AddLoneMove
ld [W_CURENEMYLVL],a
ld a,[hli]
- ld [$CF91],a
+ ld [wcf91],a
ld a,1
- ld [$CC49],a
+ ld [wcc49],a
push hl
call AddPokemonToParty
pop hl
@@ -821,7 +821,7 @@
jr .FinishUp ; nope
.GiveTeamMoves
ld a,[hl]
- ld [$D95E],a
+ ld [W_ENEMYMON5MOVE3],a
jr .FinishUp
.ChampionRival ; give moves to his team
@@ -843,7 +843,7 @@
ld [W_ENEMYMON6MOVE3],a
.FinishUp ; XXX this needs documenting
xor a ; clear D079-D07B
- ld de,$D079
+ ld de,wd079
ld [de],a
inc de
ld [de],a
@@ -852,7 +852,7 @@
ld a,[W_CURENEMYLVL]
ld b,a
.LastLoop
- ld hl,$D047
+ ld hl,wd047
ld c,2
push bc
ld a,$B
@@ -1092,9 +1092,9 @@
AIUseFullRestore: ; 3a6a0 (e:66a0)
call AICureStatus
ld a,FULL_RESTORE
- ld [$CF05],a
+ ld [wcf05],a
ld de,wHPBarOldHP
- ld hl,$CFE7
+ ld hl,W_ENEMYMONCURHP + 1
ld a,[hld]
ld [de],a
inc de
@@ -1101,12 +1101,12 @@
ld a,[hl]
ld [de],a
inc de
- ld hl,$CFF5
+ ld hl,W_ENEMYMONMAXHP + 1
ld a,[hld]
ld [de],a
inc de
ld [wHPBarMaxHP],a
- ld [$CFE7],a
+ ld [W_ENEMYMONCURHP + 1],a
ld a,[hl]
ld [de],a
ld [wHPBarMaxHP+1],a
@@ -1133,8 +1133,8 @@
AIRecoverHP: ; 3a6da (e:66da)
; heal b HP and print "trainer used $(a) on pokemon!"
- ld [$CF05],a
- ld hl,$CFE7
+ ld [wcf05],a
+ ld hl,W_ENEMYMONCURHP + 1
ld a,[hl]
ld [wHPBarOldHP],a
add b
@@ -1151,7 +1151,7 @@
inc hl
ld a,[hld]
ld b,a
- ld de,$CFF5
+ ld de,W_ENEMYMONMAXHP + 1
ld a,[de]
dec de
ld [wHPBarMaxHP],a
@@ -1174,10 +1174,10 @@
Func_3a718: ; 3a718 (e:6718)
call AIPrintItemUse_
- FuncCoord 2, 2 ; $c3ca
+ FuncCoord 2, 2
ld hl,Coord
xor a
- ld [$CF94],a
+ ld [wListMenuID],a
ld a,$48
call Predef
jp DecrementAICount
@@ -1229,10 +1229,10 @@
call PrintText
ld a,1
- ld [$D11D],a
+ ld [wd11d],a
callab EnemySendOut
xor a
- ld [$D11D],a
+ ld [wd11d],a
ld a,[W_ISLINKBATTLE]
cp 4
@@ -1253,19 +1253,19 @@
AICureStatus: ; 3a791 (e:6791)
; cures the status of enemy's active pokemon
ld a,[W_ENEMYMONNUMBER]
- ld hl,$D8A8
+ ld hl,wd8a8
ld bc,$2C
call AddNTimes
xor a
ld [hl],a ; clear status in enemy team roster
ld [W_ENEMYMONSTATUS],a ; clear status of active enemy
- ld hl,$D069
+ ld hl,W_ENEMYBATTSTATUS3
res 0,[hl]
ret
AIUseXAccuracy: ; 0x3a7a8 unused
call Func_3a69b
- ld hl,$D068
+ ld hl,W_ENEMYBATTSTATUS2
set 0,[hl]
ld a,X_ACCURACY
jp AIPrintItemUse
@@ -1272,7 +1272,7 @@
AIUseGuardSpec: ; 3a7b5 (e:67b5)
call Func_3a69b
- ld hl,$D068
+ ld hl,W_ENEMYBATTSTATUS2
set 1,[hl]
ld a,GUARD_SPEC_
jp AIPrintItemUse
@@ -1279,7 +1279,7 @@
AIUseDireHit: ; 0x3a7c2 unused
call Func_3a69b
- ld hl,$D068
+ ld hl,W_ENEMYBATTSTATUS2
set 2,[hl]
ld a,DIRE_HIT
jp AIPrintItemUse
@@ -1286,7 +1286,7 @@
Func_3a7cf: ; 3a7cf (e:67cf)
ld [H_DIVISOR],a
- ld hl,$CFF4
+ ld hl,W_ENEMYMONMAXHP
ld a,[hli]
ld [H_DIVIDEND],a
ld a,[hl]
@@ -1297,7 +1297,7 @@
ld c,a
ld a,[H_QUOTIENT + 2]
ld b,a
- ld hl,$CFE7
+ ld hl,W_ENEMYMONCURHP + 1
ld a,[hld]
ld e,a
ld a,[hl]
@@ -1330,11 +1330,11 @@
; fallthrough
AIIncreaseStat: ; 3a808 (e:6808)
- ld [$CF05],a
+ ld [wcf05],a
push bc
call AIPrintItemUse_
pop bc
- ld hl,$CFCD
+ ld hl,W_ENEMYMOVEEFFECT
ld a,[hld]
push af
ld a,[hl]
@@ -1352,14 +1352,14 @@
jp DecrementAICount
AIPrintItemUse: ; 3a82c (e:682c)
- ld [$CF05],a
+ ld [wcf05],a
call AIPrintItemUse_
jp DecrementAICount
AIPrintItemUse_: ; 3a835 (e:6835)
-; print "x used [$CF05] on z!"
- ld a,[$CF05]
- ld [$D11E],a
+; print "x used [wcf05] on z!"
+ ld a,[wcf05]
+ ld [wd11e],a
call GetItemName
ld hl, AIBattleUseItemText
jp PrintText
@@ -1371,7 +1371,7 @@
DrawAllPokeballs: ; 3a849 (e:6849)
call LoadPartyPokeballGfx
call SetupOwnPartyPokeballs
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
dec a
ret z ; return if wild pokémon
jp SetupEnemyPartyPokeballs
@@ -1389,14 +1389,14 @@
SetupOwnPartyPokeballs: ; 3a869 (e:6869)
call PlacePlayerHUDTiles
ld hl, W_PARTYMON1DATA
- ld de, W_NUMINPARTY ; $d163
+ ld de, W_NUMINPARTY ; W_NUMINPARTY
call SetupPokeballs
ld a, $60
- ld hl, W_BASECOORDX ; $d081
+ ld hl, W_BASECOORDX ; wd081
ld [hli], a
ld [hl], a
ld a, $8
- ld [$cd3e], a
+ ld [wTrainerEngageDistance], a
ld hl, wOAMBuffer
jp Func_3a8e1
@@ -1403,15 +1403,15 @@
SetupEnemyPartyPokeballs: ; 3a887 (e:6887)
call PlaceEnemyHUDTiles
ld hl, wEnemyMons
- ld de, wEnemyPartyCount ; $d89c
+ ld de, wEnemyPartyCount ; wEnemyPartyCount
call SetupPokeballs
- ld hl, W_BASECOORDX ; $d081
+ ld hl, W_BASECOORDX ; wd081
ld a, $48
ld [hli], a
ld [hl], $20
ld a, $f8
- ld [$cd3e], a
- ld hl, $c318
+ ld [wTrainerEngageDistance], a
+ ld hl, wOAMBuffer + $18
jp Func_3a8e1
SetupPokeballs: ; 0x3a8a6
@@ -1465,22 +1465,22 @@
ret
Func_3a8e1: ; 3a8e1 (e:68e1)
- ld de, $cee9
+ ld de, wHPBarMaxHP
ld c, $6
.asm_3a8e6
- ld a, [W_BASECOORDY] ; $d082
+ ld a, [W_BASECOORDY] ; wd082
ld [hli], a
- ld a, [W_BASECOORDX] ; $d081
+ ld a, [W_BASECOORDX] ; wd081
ld [hli], a
ld a, [de]
ld [hli], a
xor a
ld [hli], a
- ld a, [W_BASECOORDX] ; $d081
+ ld a, [W_BASECOORDX] ; wd081
ld b, a
- ld a, [$cd3e]
+ ld a, [wTrainerEngageDistance]
add b
- ld [W_BASECOORDX], a ; $d081
+ ld [W_BASECOORDX], a ; wd081
inc de
dec c
jr nz, .asm_3a8e6
@@ -1488,10 +1488,10 @@
PlacePlayerHUDTiles: ; 3a902 (e:6902)
ld hl, PlayerBattleHUDGraphicsTiles ; $6916
- ld de, $cd3f
+ ld de, wTrainerFacingDirection
ld bc, $3
call CopyData
- FuncCoord 18, 10 ; $c47a
+ FuncCoord 18, 10
ld hl, Coord
ld de, rIE ; $ffff
jr PlaceHUDTiles
@@ -1504,10 +1504,10 @@
PlaceEnemyHUDTiles: ; 3a919 (e:6919)
ld hl, EnemyBattleHUDGraphicsTiles ; $692d
- ld de, $cd3f
+ ld de, wTrainerFacingDirection
ld bc, $3
call CopyData
- FuncCoord 1, 2 ; $c3c9
+ FuncCoord 1, 2
ld hl, Coord
ld de, $1
jr PlaceHUDTiles
@@ -1522,7 +1522,7 @@
ld [hl], $73
ld bc, $14
add hl, bc
- ld a, [$cd40]
+ ld a, [wTrainerScreenY]
ld [hl], a
ld a, $8
.asm_3a93c
@@ -1531,33 +1531,33 @@
dec a
jr nz, .asm_3a93c
add hl, de
- ld a, [$cd41]
+ ld a, [wTrainerScreenX]
ld [hl], a
ret
SetupPlayerAndEnemyPokeballs: ; 3a948 (e:6948)
call LoadPartyPokeballGfx
- ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA)
- ld de, W_NUMINPARTY ; $d163
+ ld hl, W_PARTYMON1_NUM ; W_PARTYMON1_NUM (aliases: W_PARTYMON1DATA)
+ ld de, W_NUMINPARTY ; W_NUMINPARTY
call SetupPokeballs
- ld hl, W_BASECOORDX ; $d081
+ ld hl, W_BASECOORDX ; wd081
ld a, $50
ld [hli], a
ld [hl], $40
ld a, $8
- ld [$cd3e], a
+ ld [wTrainerEngageDistance], a
ld hl, wOAMBuffer
call Func_3a8e1
- ld hl, wEnemyMons ; $d8a4
- ld de, wEnemyPartyCount ; $d89c
+ ld hl, wEnemyMons ; wEnemyMon1Species
+ ld de, wEnemyPartyCount ; wEnemyPartyCount
call SetupPokeballs
- ld hl, W_BASECOORDX ; $d081
+ ld hl, W_BASECOORDX ; wd081
ld a, $50
ld [hli], a
ld [hl], $68
- ld hl, $c318
+ ld hl, wOAMBuffer + $18
jp Func_3a8e1
; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (faited) and pokeball slot (no mon)
PokeballTileGraphics:: ; 3a97e (e:697e)
- INCBIN "gfx/pokeball.2bpp"
\ No newline at end of file
+ INCBIN "gfx/pokeball.2bpp"
--- a/engine/battle/e_2.asm
+++ b/engine/battle/e_2.asm
@@ -1,13 +1,13 @@
HealEffect_: ; 3b9ec (e:79ec)
ld a, [H_WHOSETURN] ; $fff3
and a
- ld de, W_PLAYERMONCURHP ; $d015
- ld hl, W_PLAYERMONMAXHP ; $d023
- ld a, [W_PLAYERMOVENUM] ; $cfd2
+ ld de, W_PLAYERMONCURHP ; wd015
+ ld hl, W_PLAYERMONMAXHP ; wd023
+ ld a, [W_PLAYERMOVENUM] ; wcfd2
jr z, .asm_3ba03
- ld de, W_ENEMYMONCURHP ; $cfe6
- ld hl, W_ENEMYMONMAXHP ; $cff4
- ld a, [W_ENEMYMOVENUM] ; $cfcc
+ ld de, W_ENEMYMONCURHP ; W_ENEMYMONCURHP
+ ld hl, W_ENEMYMONMAXHP ; W_ENEMYMONMAXHP
+ ld a, [W_ENEMYMOVENUM] ; W_ENEMYMOVENUM
.asm_3ba03
ld b, a
ld a, [de]
@@ -25,11 +25,11 @@
push af
ld c, $32
call DelayFrames
- ld hl, W_PLAYERMONSTATUS ; $d018
+ ld hl, W_PLAYERMONSTATUS ; W_PLAYERMONSTATUS
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3ba25
- ld hl, W_ENEMYMONSTATUS ; $cfe9
+ ld hl, W_ENEMYMONSTATUS ; wcfe9
.asm_3ba25
ld a, [hl]
and a
@@ -85,15 +85,15 @@
call BankswitchEtoF
ld a, [H_WHOSETURN] ; $fff3
and a
- FuncCoord 10, 9 ; $c45e
+ FuncCoord 10, 9
ld hl, Coord
ld a, $1
jr z, .asm_3ba83
- FuncCoord 2, 2 ; $c3ca
+ FuncCoord 2, 2
ld hl, Coord
xor a
.asm_3ba83
- ld [wListMenuID], a ; $cf94
+ ld [wListMenuID], a ; wListMenuID
ld a, $48
call Predef ; indirect jump to UpdateHPBar (fa1d (3:7a1d))
ld hl, Func_3cd5a ; $4d5a
@@ -121,17 +121,17 @@
TransformEffect_: ; 3bab1 (e:7ab1)
ld hl, W_PLAYERMONID
- ld de, $cfe5
- ld bc, W_ENEMYBATTSTATUS3 ; $d069
- ld a, [W_ENEMYBATTSTATUS1] ; $d067
+ ld de, wcfe5
+ ld bc, W_ENEMYBATTSTATUS3 ; W_ENEMYBATTSTATUS3
+ ld a, [W_ENEMYBATTSTATUS1] ; W_ENEMYBATTSTATUS1
ld a, [H_WHOSETURN] ; $fff3
and a
jr nz, .asm_3bad1
- ld hl, $cfe5
+ ld hl, wcfe5
ld de, W_PLAYERMONID
- ld bc, W_PLAYERBATTSTATUS3 ; $d064
- ld [wPlayerMoveListIndex], a ; $cc2e
- ld a, [W_PLAYERBATTSTATUS1] ; $d062
+ ld bc, W_PLAYERBATTSTATUS3 ; W_PLAYERBATTSTATUS3
+ ld [wPlayerMoveListIndex], a ; wPlayerMoveListIndex
+ ld a, [W_PLAYERBATTSTATUS1] ; W_PLAYERBATTSTATUS1
.asm_3bad1
bit 6, a ; is mon invulnerable to typical attacks? (fly/dig)
jp nz, Func_3bb8c
@@ -138,11 +138,11 @@
push hl
push de
push bc
- ld hl, W_PLAYERBATTSTATUS2 ; $d063
+ ld hl, W_PLAYERBATTSTATUS2 ; W_PLAYERBATTSTATUS2
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3bae4
- ld hl, W_ENEMYBATTSTATUS2 ; $d068
+ ld hl, W_ENEMYBATTSTATUS2 ; W_ENEMYBATTSTATUS2
.asm_3bae4
bit 4, [hl]
push af
@@ -149,7 +149,7 @@
ld hl, Func_79747
ld b, BANK(Func_79747)
call nz, Bankswitch
- ld a, [W_OPTIONS] ; $d355
+ ld a, [W_OPTIONS] ; W_OPTIONS
add a
ld hl, Func_3fba8 ; $7ba8
ld b, BANK(Func_3fba8)
@@ -185,10 +185,10 @@
and a
jr z, .asm_3bb32
ld a, [de]
- ld [$cceb], a
+ ld [wcceb], a
inc de
ld a, [de]
- ld [$ccec], a
+ ld [wccec], a
dec de
.asm_3bb32
ld a, [hli]
@@ -227,13 +227,13 @@
.asm_3bb5d
pop hl
ld a, [hl]
- ld [$d11e], a
+ ld [wd11e], a
call GetMonName
- ld hl, $cd26
- ld de, $cd12
+ ld hl, wcd26
+ ld de, wcd12
call Func_3bb7d
- ld hl, wEnemyMonStatMods ; $cd2e
- ld de, wPlayerMonStatMods ; $cd1a
+ ld hl, wEnemyMonStatMods ; wcd2e
+ ld de, wPlayerMonStatMods ; wcd1a
call Func_3bb7d
ld hl, TransformedText ; $7b92
jp PrintText
@@ -259,13 +259,13 @@
db "@"
ReflectLightScreenEffect_: ; 3bb97 (e:7b97)
- ld hl, W_PLAYERBATTSTATUS3 ; $d064
- ld de, W_PLAYERMOVEEFFECT ; $cfd3
+ ld hl, W_PLAYERBATTSTATUS3 ; W_PLAYERBATTSTATUS3
+ ld de, W_PLAYERMOVEEFFECT ; wcfd3
ld a, [H_WHOSETURN] ; $fff3
and a
jr z, .asm_3bba8
- ld hl, W_ENEMYBATTSTATUS3 ; $d069
- ld de, W_ENEMYMOVEEFFECT ; $cfcd
+ ld hl, W_ENEMYBATTSTATUS3 ; W_ENEMYBATTSTATUS3
+ ld de, W_ENEMYMOVEEFFECT ; W_ENEMYMOVEEFFECT
.asm_3bba8
ld a, [de]
cp LIGHT_SCREEN_EFFECT
--- a/engine/battle/safari_zone.asm
+++ b/engine/battle/safari_zone.asm
@@ -1,5 +1,5 @@
PrintSafariZoneBattleText: ; 4277 (1:4277)
- ld hl, $cce9
+ ld hl, wcce9
ld a, [hl]
and a
jr z, .asm_4284
@@ -15,11 +15,11 @@
ld hl, SafariZoneAngryText
jr nz, .asm_429f
push hl
- ld a, [$cfe5]
- ld [$d0b5], a
+ ld a, [wcfe5]
+ ld [wd0b5], a
call GetMonHeader
ld a, [W_MONHCATCHRATE]
- ld [$d007], a
+ ld [wd007], a
pop hl
.asm_429f
push hl
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -6,22 +6,22 @@
call LoadFontTilePatterns
call LoadHpBarAndStatusTilePatterns
call LoadTrainerInfoTextBoxTiles
- FuncCoord 3, 8 ; $c443
+ FuncCoord 3, 8
ld hl, Coord
ld b, $2
ld c, $c
call Func_5ab3
- FuncCoord 4, 10 ; $c46c
+ FuncCoord 4, 10
ld hl, Coord
ld de, PleaseWaitString ; $550f
call PlaceString
- ld hl, W_NUMHITS ; $d074
+ ld hl, W_NUMHITS ; wd074
xor a
ld [hli], a
ld [hl], $50
Func_5345: ; 5345
- ld hl, $d152
+ ld hl, wd152
ld a, $fd
ld b, $6
.asm_534c
@@ -28,7 +28,7 @@
ld [hli], a
dec b
jr nz, .asm_534c
- ld hl, $d141
+ ld hl, wd141
ld a, $fd
ld b, $7
.asm_5357
@@ -54,7 +54,7 @@
ld [hli], a
dec b
jr nz, .asm_5373
- ld hl, W_GRASSRATE ; $d887
+ ld hl, W_GRASSRATE ; W_GRASSRATE
ld bc, $1a9
.asm_537d
xor a
@@ -63,8 +63,8 @@
ld a, b
or c
jr nz, .asm_537d
- ld hl, W_PARTYMONEND ; $d16a
- ld de, $c512
+ ld hl, W_PARTYMONEND
+ ld de, wTileMapBackup + 10
ld bc, $0
.asm_538d
inc c
@@ -114,20 +114,20 @@
call Delay3
ld a, $8
ld [rIE], a ; $ffff
- ld hl, $d141
+ ld hl, wd141
ld de, wTileMapBackup2
ld bc, $11
call Func_216f
ld a, $fe
ld [de], a
- ld hl, $d152
- ld de, $d893
+ ld hl, wd152
+ ld de, wd893
ld bc, $1a8
call Func_216f
ld a, $fe
ld [de], a
ld hl, wTileMapBackup
- ld de, $c5d0
+ ld de, wTileMapBackup + 200
ld bc, $c8
call Func_216f
ld a, $d
@@ -147,7 +147,7 @@
cp $fe
jr z, .asm_5415
dec hl
- ld de, $d148
+ ld de, wd148
ld c, $a
.asm_5427
ld a, [hli]
@@ -158,7 +158,7 @@
dec c
jr nz, .asm_5427
.asm_5431
- ld hl, $d896
+ ld hl, wd896
.asm_5434
ld a, [hli]
and a
@@ -168,7 +168,7 @@
cp $fe
jr z, .asm_5434
dec hl
- ld de, W_GRASSRATE ; $d887
+ ld de, W_GRASSRATE ; W_GRASSRATE
ld c, $b
.asm_5446
ld a, [hli]
@@ -178,7 +178,7 @@
inc de
dec c
jr nz, .asm_5446
- ld de, wEnemyPartyCount ; $d89c
+ ld de, wEnemyPartyCount ; wEnemyPartyCount
ld bc, $194
.asm_5456
ld a, [hli]
@@ -191,7 +191,7 @@
or c
jr nz, .asm_5456
ld de, wTileMapBackup
- ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA)
+ ld hl, W_PARTYMON1_NUM ; W_PARTYMON1_NUM (aliases: W_PARTYMON1DATA)
ld c, $2
.asm_546a
ld a, [de]
@@ -216,11 +216,11 @@
pop hl
jr .asm_546a
.asm_5489
- ld hl, W_PARTYMON6DATA + W_PARTYMON1_MOVE4PP - W_PARTYMON1DATA ; $d267
+ ld hl, W_PARTYMON6DATA + W_PARTYMON1_MOVE4PP - W_PARTYMON1DATA ; wd267
dec c
jr nz, .asm_546a
- ld de, $c5d0
- ld hl, W_WATERRATE ; $d8a4
+ ld de, wTileMapBackup + 200
+ ld hl, W_WATERRATE ; wEnemyMon1Species
ld c, $2
.asm_5497
ld a, [de]
@@ -245,15 +245,15 @@
pop hl
jr .asm_5497
.asm_54b6
- ld hl, $d9a0
+ ld hl, wd9a0
dec c
jr nz, .asm_5497
ld a, $ac
- ld [$cf8d], a
+ ld [wcf8d], a
ld a, $d9
- ld [$cf8e], a
+ ld [wcf8e], a
xor a
- ld [$cc38], a
+ ld [wcc38], a
ld a, $ff
call PlaySound
ld a, [$ffaa]
@@ -260,18 +260,18 @@
cp $2
ld c, $42
call z, DelayFrames
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $3
ld a, $32
- ld [W_ISLINKBATTLE], a ; $d12b
+ ld [W_ISLINKBATTLE], a ; W_ISLINKBATTLE
jr nz, .asm_5506
ld a, $4
- ld [W_ISLINKBATTLE], a ; $d12b
+ ld [W_ISLINKBATTLE], a ; W_ISLINKBATTLE
ld a, SONY1 + $c8
- ld [W_CUROPPONENT], a ; $d059
+ ld [W_CUROPPONENT], a ; wd059
call ClearScreen
call Delay3
- ld hl, W_OPTIONS ; $d355
+ ld hl, W_OPTIONS ; W_OPTIONS
res 7, [hl]
ld a, $2c
call Predef ; indirect jump to InitOpponent (3ef18 (f:6f18))
@@ -290,7 +290,7 @@
Func_551c:
ld hl, PointerTable_5a5b ; $5a5b
ld b, $0
- ld a, [$cc38]
+ ld a, [wcc38]
cp $ff
jp z, LoadTitlescreenGraphics
add a
@@ -307,31 +307,31 @@
call Func_57f2
call Func_57a2
xor a
- ld hl, $cc3d
+ ld hl, wcc3d
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
- ld [$cc37], a
- ld [$cc26], a
- ld [$cc2a], a
- ld [$cc34], a
+ ld [wcc37], a
+ ld [wCurrentMenuItem], a
+ ld [wLastMenuItem], a
+ ld [wMenuJoypadPollCount], a
inc a
- ld [$cc42], a
+ ld [wcc42], a
jp .asm_55dc
.asm_5557
xor a
- ld [$cc37], a
+ ld [wcc37], a
inc a
- ld [$cc49], a
+ ld [wcc49], a
ld a, $a1
- ld [$cc29], a
- ld a, [$d89c]
- ld [$cc28], a
+ ld [wMenuWatchedKeys], a
+ ld a, [wEnemyPartyCount]
+ ld [wMaxMenuItem], a
ld a, $9
- ld [$cc24], a
+ ld [wTopMenuItemY], a
ld a, $1
- ld [$cc25], a
+ ld [wTopMenuItemX], a
.asm_5574
ld hl, $fff6
set 1, [hl]
@@ -342,17 +342,17 @@
jp z, .asm_565b
bit 0, a
jr z, .asm_55b0 ; 0x5587 $27
- ld a, [$cc28]
+ ld a, [wMaxMenuItem]
ld c, a
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
cp c
jr c, .asm_559a ; 0x5591 $7
- ld a, [$cc28]
+ ld a, [wMaxMenuItem]
dec a
- ld [$cc26], a
+ ld [wCurrentMenuItem], a
.asm_559a
ld a, $1
- ld [$d11b], a
+ ld [wd11b], a
callab Func_39bd5
ld hl, wEnemyMons
call Func_57d6
@@ -361,20 +361,20 @@
bit 5, a
jr z, .asm_55d4 ; 0x55b2 $20
xor a
- ld [$cc49], a
- ld a, [$cc30]
+ ld [wcc49], a
+ ld a, [wMenuCursorLocation]
ld l, a
- ld a, [$cc31]
+ ld a, [wMenuCursorLocation + 1]
ld h, a
- ld a, [$cc27]
+ ld a, [wTileBehindCursor]
ld [hl], a
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
ld b, a
- ld a, [$d163]
+ ld a, [W_NUMINPARTY]
dec a
cp b
jr nc, .asm_55dc ; 0x55cd $d
- ld [$cc26], a
+ ld [wCurrentMenuItem], a
jr .asm_55dc ; 0x55d2 $8
.asm_55d4
bit 7, a
@@ -382,17 +382,17 @@
jp .asm_572f
.asm_55dc
xor a
- ld [$cc49], a
- ld [$cc37], a
+ ld [wcc49], a
+ ld [wcc37], a
ld a, $91
- ld [$cc29], a
- ld a, [$d163]
- ld [$cc28], a
+ ld [wMenuWatchedKeys], a
+ ld a, [W_NUMINPARTY]
+ ld [wMaxMenuItem], a
ld a, $1
- ld [$cc24], a
+ ld [wTopMenuItemY], a
ld a, $1
- ld [$cc25], a
- ld hl, $c3b5
+ ld [wTopMenuItemX], a
+ ld hl, wTileMap + $15
ld bc, $0601
call ClearScreenArea
.asm_5601
@@ -409,7 +409,7 @@
jr z, .asm_562e ; 0x5616 $16
jp .asm_5665
ld a, $4
- ld [$d11b], a
+ ld [wd11b], a
callab Func_39bd5
call Func_57d6
jp .asm_565b
@@ -417,20 +417,20 @@
bit 4, a
jr z, .asm_5654 ; 0x5630 $22
ld a, $1
- ld [$cc49], a
- ld a, [$cc30]
+ ld [wcc49], a
+ ld a, [wMenuCursorLocation]
ld l, a
- ld a, [$cc31]
+ ld a, [wMenuCursorLocation + 1]
ld h, a
- ld a, [$cc27]
+ ld a, [wTileBehindCursor]
ld [hl], a
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
ld b, a
- ld a, [$d89c]
+ ld a, [wEnemyPartyCount]
dec a
cp b
jr nc, .asm_5651 ; 0x564c $3
- ld [$cc26], a
+ ld [wCurrentMenuItem], a
.asm_5651
jp .asm_5557
.asm_5654
@@ -438,7 +438,7 @@
jr z, .asm_565b ; 0x5656 $3
jp .asm_572f
.asm_565b
- ld a, [$cc49]
+ ld a, [wcc49]
and a
jp z, .asm_5601
jp .asm_5574
@@ -445,36 +445,36 @@
.asm_5665
call SaveScreenTilesToBuffer1
call PlaceUnfilledArrowMenuCursor
- ld a, [$cc28]
+ ld a, [wMaxMenuItem]
ld c, a
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
cp c
jr c, .asm_5679 ; 0x5673 $4
- ld a, [$cc28]
+ ld a, [wMaxMenuItem]
dec a
.asm_5679
push af
- ld hl, $c4b8
+ ld hl, wTileMap + $118
ld b, $2
ld c, $12
call Func_5ab3
- ld hl, $c4e2
+ ld hl, wTileMap + $142
ld de, .statsTrade
call PlaceString
xor a
- ld [$cc26], a
- ld [$cc2a], a
- ld [$cc34], a
- ld [$cc28], a
+ ld [wCurrentMenuItem], a
+ ld [wLastMenuItem], a
+ ld [wMenuJoypadPollCount], a
+ ld [wMaxMenuItem], a
ld a, $10
- ld [$cc24], a
+ ld [wTopMenuItemY], a
.asm_569f
ld a, $7f
- ld [$c4eb], a
+ ld [wTileMap + $14b], a
ld a, $13
- ld [$cc29], a
+ ld [wMenuWatchedKeys], a
ld a, $1
- ld [$cc25], a
+ ld [wTopMenuItemX], a
call HandleMenuInput
bit 4, a
jr nz, .asm_56c3 ; 0x56b3 $e
@@ -482,16 +482,16 @@
jr z, .asm_56df ; 0x56b7 $26
.asm_56b9
pop af
- ld [$cc26], a
+ ld [wCurrentMenuItem], a
call LoadScreenTilesFromBuffer1
jp .asm_55dc
.asm_56c3
ld a, $7f
- ld [$c4e1], a
+ ld [wTileMap + $141], a
ld a, $23
- ld [$cc29], a
+ ld [wMenuWatchedKeys], a
ld a, $b
- ld [$cc25], a
+ ld [wTopMenuItemX], a
call HandleMenuInput
bit 5, a
jr nz, .asm_569f ; 0x56d7 $c6
@@ -500,9 +500,9 @@
jr .asm_56f9 ; 0x56dd $1a
.asm_56df
pop af
- ld [$cc26], a
+ ld [wCurrentMenuItem], a
ld a, $4
- ld [$d11b], a
+ ld [wd11b], a
callab Func_39bd5
call Func_57d6
call LoadScreenTilesFromBuffer1
@@ -510,35 +510,35 @@
.asm_56f9
call PlaceUnfilledArrowMenuCursor
pop af
- ld [$cc26], a
- ld [$cd3d], a
- ld [$cc42], a
+ ld [wCurrentMenuItem], a
+ ld [wWhichTrade], a
+ ld [wcc42], a
call Func_226e
- ld a, [$cc3d]
+ ld a, [wcc3d]
cp $f
jp z, Func_551c
- ld [$cd3e], a
+ ld [wTrainerEngageDistance], a
call Func_57c7
ld a, $1
- ld [$cc38], a
+ ld [wcc38], a
jp Func_551c
.statsTrade
db "STATS TRADE@"
.asm_572f
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
ld b, a
- ld a, [$cc28]
+ ld a, [wMaxMenuItem]
cp b
jp nz, .asm_565b
- ld a, [$cc30]
+ ld a, [wMenuCursorLocation]
ld l, a
- ld a, [$cc31]
+ ld a, [wMenuCursorLocation + 1]
ld h, a
ld a, $7f
ld [hl], a
.asm_5745
ld a, $ed
- ld [$c4e1], a
+ ld [wTileMap + $141], a
.asm_574a
call JoypadLowSensitivity
ld a, [$ffb5]
@@ -549,32 +549,32 @@
bit 6, a
jr z, .asm_574a ; 0x5758 $f0
ld a, $7f
- ld [$c4e1], a
- ld a, [$d163]
+ ld [wTileMap + $141], a
+ ld a, [W_NUMINPARTY]
dec a
- ld [$cc26], a
+ ld [wCurrentMenuItem], a
jp .asm_55dc
.asm_5769
ld a, $ec
- ld [$c4e1], a
+ ld [wTileMap + $141], a
ld a, $f
- ld [$cc42], a
+ ld [wcc42], a
call Func_226e
- ld a, [$cc3d]
+ ld a, [wcc3d]
cp $f
jr nz, .asm_5745 ; 0x577b $c8
Func_577d: ; 577d (1:577d)
call GBPalWhiteOutWithDelay3
- ld hl, $cfc4
+ ld hl, wcfc4
ld a, [hl]
push af
push hl
res 0, [hl]
xor a
- ld [$d72d], a
+ ld [wd72d], a
dec a
- ld [$d42f], a
+ ld [wd42f], a
call LoadMapData
callba Func_c335
pop hl
@@ -584,15 +584,15 @@
ret
Func_57a2:
- ld hl, $c4d7
+ ld hl, wTileMap + $137
ld a, $7e
ld bc, $0031
call FillMemory
- ld hl, $c4cc
+ ld hl, wTileMap + $12c
ld b, $1
ld c, $9
call Func_5ab3
- ld hl, $c4e2
+ ld hl, wTileMap + $142
ld de, CancelTextString
jp PlaceString
@@ -600,8 +600,8 @@
db "CANCEL@"
Func_57c7:
- ld a, [$cc3d]
- ld hl, $c455
+ ld a, [wcc3d]
+ ld hl, wTileMap + $b5
ld bc, $0014
call AddNTimes
ld [hl], $ec
@@ -608,7 +608,7 @@
ret
Func_57d6:
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
ld [wWhichPokemon], a
ld a, $36
call Predef
@@ -624,21 +624,21 @@
ld b, $6
ld c, $12
call Func_5ab3
- ld hl, $c440
+ ld hl, wTileMap + $a0
ld b, $6
ld c, $12
call Func_5ab3
- ld hl, $c3a5
+ ld hl, wTileMap + $5
ld de, W_PLAYERNAME
call PlaceString
- ld hl, $c445
- ld de, $d887
+ ld hl, wTileMap + $a5
+ ld de, W_GRASSRATE
call PlaceString
- ld hl, $c3b6
- ld de, $d164
+ ld hl, wTileMap + $16
+ ld de, W_PARTYMON1
call Func_5827
- ld hl, $c456
- ld de, $d89d
+ ld hl, wTileMap + $b6
+ ld de, wEnemyPartyMons
Func_5827:
ld c, $0
@@ -646,7 +646,7 @@
ld a, [de]
cp $ff
ret z
- ld [$d11e], a
+ ld [wd11e], a
push bc
push hl
push de
@@ -669,56 +669,56 @@
ld c, $64
call DelayFrames
xor a
- ld [$cc43], a
- ld [$cc3e], a
- ld [$cc37], a
- ld [$cc34], a
- ld hl, $c490
+ ld [wcc43], a
+ ld [wcc3e], a
+ ld [wcc37], a
+ ld [wMenuJoypadPollCount], a
+ ld hl, wTileMap + $f0
ld b, $4
ld c, $12
call Func_5ab3
- ld a, [$cd3d]
- ld hl, $d164
+ ld a, [wWhichTrade]
+ ld hl, W_PARTYMON1
ld c, a
ld b, $0
add hl, bc
ld a, [hl]
- ld [$d11e], a
+ ld [wd11e], a
call GetMonName
- ld hl, $cd6d
- ld de, $cd3f
+ ld hl, wcd6d
+ ld de, wTrainerFacingDirection
ld bc, $000b
call CopyData
- ld a, [$cd3e]
- ld hl, $d89d
- ld c, a
+ ld a, [wTrainerEngageDistance]
+ ld hl, wEnemyPartyMons
+ ld c, a
ld b, $0
add hl, bc
ld a, [hl]
- ld [$d11e], a
+ ld [wd11e], a
call GetMonName
ld hl, WillBeTradedText
- ld bc, $c4b9
+ ld bc, wTileMap + $119
call TextCommandProcessor
call SaveScreenTilesToBuffer1
- ld hl, $c436
+ ld hl, wTileMap + $96
ld bc, $080b
ld a, $5
- ld [$d12c], a
+ ld [wd12c], a
ld a, $14
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
call LoadScreenTilesFromBuffer1
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr z, .asm_58d9 ; 0x58b9 $1e
ld a, $1
- ld [$cc42], a
- ld hl, $c490
+ ld [wcc42], a
+ ld hl, wTileMap + $f0
ld b, $4
ld c, $12
call Func_5ab3
- ld hl, $c4b9
+ ld hl, wTileMap + $119
ld de, TradeCanceled
call PlaceString
call Func_226e
@@ -725,98 +725,98 @@
jp Func_5a18
.asm_58d9
ld a, $2
- ld [$cc42], a
+ ld [wcc42], a
call Func_226e
- ld a, [$cc3d]
+ ld a, [wcc3d]
dec a
jr nz, .asm_58fd ; 0x58e5 $16
- ld hl, $c490
+ ld hl, wTileMap + $f0
ld b, $4
ld c, $12
call Func_5ab3
- ld hl, $c4b9
+ ld hl, wTileMap + $119
ld de, TradeCanceled
call PlaceString
jp Func_5a18
.asm_58fd
- ld a, [$cd3d]
+ ld a, [wWhichTrade]
ld hl, W_PARTYMON1OT ; OT names of player
call SkipFixedLengthTextEntries
- ld de, $cd41
+ ld de, wTrainerScreenX
ld bc, $000b
call CopyData
- ld hl, $d16b
- ld a, [$cd3d]
+ ld hl, W_PARTYMON1_NUM
+ ld a, [wWhichTrade]
ld bc, $002c
call AddNTimes
ld bc, $000c
add hl, bc
ld a, [hli]
- ld [$cd4c], a
+ ld [wcd4c], a
ld a, [hl]
- ld [$cd4d], a
- ld a, [$cd3e]
+ ld [wcd4d], a
+ ld a, [wTrainerEngageDistance]
ld hl, W_ENEMYMON1OT ; OT names of other player
call SkipFixedLengthTextEntries
- ld de, $cd4e
+ ld de, wcd4e
ld bc, $000b
call CopyData
ld hl, wEnemyMons
- ld a, [$cd3e]
+ ld a, [wTrainerEngageDistance]
ld bc, $002c
call AddNTimes
ld bc, $000c
add hl, bc
ld a, [hli]
- ld [$cd59], a
+ ld [wcd59], a
ld a, [hl]
- ld [$cd5a], a
- ld a, [$cd3d]
+ ld [wcd5a], a
+ ld a, [wWhichTrade]
ld [wWhichPokemon], a
- ld hl, $d164
+ ld hl, W_PARTYMON1
ld b, $0
ld c, a
add hl, bc
ld a, [hl]
- ld [$cd3d], a
+ ld [wWhichTrade], a
xor a
- ld [$cf95], a
+ ld [wcf95], a
call RemovePokemon
- ld a, [$cd3e]
+ ld a, [wTrainerEngageDistance]
ld c, a
ld [wWhichPokemon], a
- ld hl, $d89d
+ ld hl, wEnemyPartyMons
ld d, $0
ld e, a
add hl, de
ld a, [hl]
- ld [$cf91], a
+ ld [wcf91], a
ld hl, wEnemyMons
ld a, c
ld bc, $002c
call AddNTimes
- ld de, $cf98
+ ld de, wcf98
ld bc, $002c
call CopyData
call AddEnemyMonToPlayerParty
- ld a, [$d163]
+ ld a, [W_NUMINPARTY]
dec a
ld [wWhichPokemon], a
ld a, $1
- ld [$ccd4], a
- ld a, [$cd3e]
- ld hl, $d89d
+ ld [wccd4], a
+ ld a, [wTrainerEngageDistance]
+ ld hl, wEnemyPartyMons
ld b, $0
ld c, a
add hl, bc
ld a, [hl]
- ld [$cd3e], a
+ ld [wTrainerEngageDistance], a
ld a, $a
ld [wMusicHeaderPointer], a
ld a, $2
- ld [$c0f0], a
+ ld [wc0f0], a
ld a, MUSIC_SAFARI_ZONE
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
ld c, $64
call DelayFrames
@@ -823,7 +823,7 @@
call ClearScreen
call LoadHpBarAndStatusTilePatterns
xor a
- ld [$cc5b], a
+ ld [wcc5b], a
ld a, [$ffaa]
cp $1
jr z, .asm_59d9 ; 0x59d0 $7
@@ -840,11 +840,11 @@
call Func_226e
ld c, $28
call DelayFrames
- ld hl, $c490
+ ld hl, wTileMap + $f0
ld b, $4
ld c, $12
call Func_5ab3
- ld hl, $c4b9
+ ld hl, wTileMap + $119
ld de, TradeCompleted
call PlaceString
ld a, $50
@@ -852,7 +852,7 @@
ld c, $32
call DelayFrames
xor a
- ld [$cc38], a
+ ld [wcc38], a
jp Func_5345
Func_5a18:
@@ -859,7 +859,7 @@
ld c, $64
call DelayFrames
xor a
- ld [$cc38], a
+ ld [wcc38], a
jp Func_551c
WillBeTradedText: ; 5a24 (1:5a24)
@@ -878,7 +878,7 @@
dw TradeCenter_Trade
Func_5a5f: ; 5a5f (1:5a5f)
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $2
jr z, .asm_5a75
cp $3
@@ -892,27 +892,27 @@
call Func_5317
ld hl, Club_GFX
ld a, h
- ld [$d52f], a
+ ld [W_TILESETGFXPTR + 1], a
ld a, l
- ld [$d52e], a
+ ld [W_TILESETGFXPTR], a
ld a, Bank(Club_GFX)
- ld [$d52b], a
+ ld [W_TILESETBANK], a
ld hl, Club_Coll
ld a, h
- ld [$d531], a
+ ld [W_TILESETCOLLISIONPTR + 1], a
ld a, l
- ld [$d530], a
+ ld [W_TILESETCOLLISIONPTR], a
xor a
- ld [W_GRASSRATE], a ; $d887
+ ld [W_GRASSRATE], a ; W_GRASSRATE
inc a
- ld [W_ISLINKBATTLE], a ; $d12b
+ ld [W_ISLINKBATTLE], a ; W_ISLINKBATTLE
ld [$ffb5], a
ld a, $a
ld [wMusicHeaderPointer], a
ld a, BANK(Music_Celadon)
- ld [$c0f0], a
+ ld [wc0f0], a
ld a, MUSIC_CELADON
- ld [$c0ee], a
+ ld [wc0ee], a
jp PlaySound
Func_5aaf: ; 5aaf (1:5aaf)
--- a/engine/clear_save.asm
+++ b/engine/clear_save.asm
@@ -5,15 +5,15 @@
call LoadTextBoxTilePatterns
ld hl, ClearSaveDataText
call PrintText
- FuncCoord 14, 7 ; $c43a
+ FuncCoord 14, 7
ld hl, Coord
ld bc, $80f
ld a, $7
- ld [$d12c], a
+ ld [wd12c], a
ld a, $14
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
and a
jp z, Init
callba Func_73b6a
--- a/engine/evolution.asm
+++ b/engine/evolution.asm
@@ -2,15 +2,15 @@
push hl
push de
push bc
- ld a, [$cf91]
+ ld a, [wcf91]
push af
- ld a, [$d0b5]
+ ld a, [wd0b5]
push af
xor a
- ld [$d083], a
- ld [$c02a], a
+ ld [wd083], a
+ ld [wc02a], a
dec a
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@@ -20,25 +20,25 @@
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
ld [$ffd7], a
- ld a, [$cee9]
- ld [$cf1d], a
+ ld a, [wHPBarMaxHP]
+ ld [wcf1d], a
ld c, $0
call Func_7beb4
- ld a, [$ceea]
- ld [$cf91], a
- ld [$d0b5], a
+ ld a, [wHPBarMaxHP + 1]
+ ld [wcf91], a
+ ld [wd0b5], a
call Func_7beb9
ld de, $9000
ld hl, $9310
ld bc, $31
call CopyVideoData
- ld a, [$cee9]
- ld [$cf91], a
- ld [$d0b5], a
+ ld a, [wHPBarMaxHP]
+ ld [wcf91], a
+ ld [wd0b5], a
call Func_7beb9
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
- ld a, [$cee9]
+ ld a, [wHPBarMaxHP]
call PlayCry
call WaitForSoundToFinish
ld c, BANK(Music_SafariZone)
@@ -60,28 +60,28 @@
dec c
jr nz, .asm_7be63
xor a
- ld [$ceec], a
+ ld [wHPBarOldHP + 1], a
ld a, $31
- ld [$ceeb], a
+ ld [wHPBarOldHP], a
call Func_7bed6
- ld a, [$ceea]
+ ld a, [wHPBarMaxHP + 1]
.asm_7be81
- ld [$cf1d], a
+ ld [wcf1d], a
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
- ld a, [$cf1d]
+ ld a, [wcf1d]
call PlayCry
ld c, $0
call Func_7beb4
pop af
- ld [$d0b5], a
+ ld [wd0b5], a
pop af
- ld [$cf91], a
+ ld [wcf91], a
pop bc
pop de
pop hl
- ld a, [$ceec]
+ ld a, [wHPBarOldHP + 1]
and a
ret z
scf
@@ -89,8 +89,8 @@
.asm_7bea9
pop bc
ld a, $1
- ld [$ceec], a
- ld a, [$cee9]
+ ld [wHPBarOldHP + 1], a
+ ld a, [wHPBarMaxHP]
jr .asm_7be81
Func_7beb4: ; 7beb4 (1e:7eb4)
@@ -99,15 +99,15 @@
Func_7beb9: ; 7beb9 (1e:7eb9)
call GetMonHeader
- FuncCoord 7, 2 ; $c3cf
+ FuncCoord 7, 2
ld hl, Coord
jp LoadFlippedFrontSpriteByMonIndex
asm_7bec2: ; 7bec2 (1e:7ec2)
ld a, $31
- ld [$ceeb], a
+ ld [wHPBarOldHP], a
call Func_7bed6
ld a, $cf
- ld [$ceeb], a
+ ld [wHPBarOldHP], a
call Func_7bed6
dec b
jr nz, asm_7bec2
@@ -117,7 +117,7 @@
push bc
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
- FuncCoord 7, 2 ; $c3cf
+ FuncCoord 7, 2
ld hl, Coord
ld bc, $707
ld de, $d
@@ -124,7 +124,7 @@
.asm_7bee3
push bc
.asm_7bee4
- ld a, [$ceeb]
+ ld a, [wHPBarOldHP]
add [hl]
ld [hli], a
dec c
@@ -152,7 +152,7 @@
and a
ret
.asm_7bf0d
- ld a, [$ccd4]
+ ld a, [wccd4]
and a
jr nz, .asm_7bf08
scf
--- a/engine/evolve_trade.asm
+++ b/engine/evolve_trade.asm
@@ -31,14 +31,14 @@
ret nz
.ok
- ld a, [W_NUMINPARTY] ; $d163
+ ld a, [W_NUMINPARTY] ; W_NUMINPARTY
dec a
- ld [wWhichPokemon], a ; $cf92
+ ld [wWhichPokemon], a ; wWhichPokemon
ld a, $1
- ld [$ccd4], a
+ ld [wccd4], a
ld a, $32
- ld [W_ISLINKBATTLE], a ; $d12b
+ ld [W_ISLINKBATTLE], a ; W_ISLINKBATTLE
callab Func_3ad0e
xor a
- ld [W_ISLINKBATTLE], a ; $d12b
+ ld [W_ISLINKBATTLE], a ; W_ISLINKBATTLE
jp Func_2307
--- a/engine/evos_moves.asm
+++ b/engine/evos_moves.asm
@@ -1,8 +1,8 @@
Func_3ad0e: ; 3ad0e (e:6d0e)
- ld hl, $ccd3
+ ld hl, wccd3
xor a
ld [hl], a
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
ld c, a
ld b, $1
call Func_3b057
@@ -11,16 +11,16 @@
ld a, [$ffd7]
push af
xor a
- ld [$d121], a
+ ld [wd121], a
dec a
- ld [wWhichPokemon], a ; $cf92
+ ld [wWhichPokemon], a ; wWhichPokemon
push hl
push bc
push de
- ld hl, W_NUMINPARTY ; $d163
+ ld hl, W_NUMINPARTY ; W_NUMINPARTY
push hl
asm_3ad2e: ; 3ad2e (e:6d2e)
- ld hl, wWhichPokemon ; $cf92
+ ld hl, wWhichPokemon ; wWhichPokemon
inc [hl]
pop hl
inc hl
@@ -27,17 +27,17 @@
ld a, [hl]
cp $ff
jp z, Func_3aede
- ld [$cee9], a
+ ld [wHPBarMaxHP], a
push hl
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
ld c, a
- ld hl, $ccd3
+ ld hl, wccd3
ld b, $2
call Func_3b057
ld a, c
and a
jp z, asm_3ad2e
- ld a, [$cee9]
+ ld a, [wHPBarMaxHP]
dec a
ld b, $0
ld hl, EvosMovesPointerTable
@@ -49,13 +49,13 @@
ld h, [hl]
ld l, a
push hl
- ld a, [$cf91]
+ ld a, [wcf91]
push af
xor a
- ld [$cc49], a
+ ld [wcc49], a
call LoadMonData
pop af
- ld [$cf91], a
+ ld [wcf91], a
pop hl
Func_3ad71: ; 3ad71 (e:6d71)
@@ -65,13 +65,13 @@
ld b, a
cp $3
jr z, .asm_3ad91
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $32
jr z, asm_3ad2e
ld a, b
cp $2
jr z, .asm_3ada4
- ld a, [$ccd4]
+ ld a, [wccd4]
and a
jr nz, asm_3ad2e
ld a, b
@@ -78,12 +78,12 @@
cp $1
jr z, .asm_3adad
.asm_3ad91
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $32
jp nz, Func_3aed9
ld a, [hli]
ld b, a
- ld a, [$cfb9]
+ ld a, [wcfb9]
cp b
jp c, asm_3ad2e
jr .asm_3adb6
@@ -90,24 +90,24 @@
.asm_3ada4
ld a, [hli]
ld b, a
- ld a, [$cf91]
+ ld a, [wcf91]
cp b
jp nz, Func_3aed9
.asm_3adad
ld a, [hli]
ld b, a
- ld a, [$cfb9]
+ ld a, [wcfb9]
cp b
jp c, Func_3aeda
.asm_3adb6
- ld [W_CURENEMYLVL], a ; $d127
+ ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
ld a, $1
- ld [$d121], a
+ ld [wd121], a
push hl
ld a, [hl]
- ld [$ceea], a
- ld a, [wWhichPokemon] ; $cf92
- ld hl, W_PARTYMON1NAME ; $d2b5
+ ld [wHPBarMaxHP + 1], a
+ ld a, [wWhichPokemon] ; wWhichPokemon
+ ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
call GetPartyMonName
call CopyStringToCF4B
ld hl, IsEvolvingText
@@ -122,7 +122,7 @@
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
ld a, $ff
- ld [$cfcb], a
+ ld [wcfcb], a
call ClearSprites
callab Func_7bde9
jp c, Func_3af2e
@@ -130,13 +130,13 @@
call PrintText
pop hl
ld a, [hl]
- ld [$d0b5], a
- ld [$cf98], a
- ld [$ceea], a
+ ld [wd0b5], a
+ ld [wcf98], a
+ ld [wHPBarMaxHP + 1], a
ld a, MONSTER_NAME
ld [W_LISTTYPE], a
ld a, $e
- ld [$d0b7], a
+ ld [wPredefBank], a
call GetName
push hl
ld hl, IntoText
@@ -148,13 +148,13 @@
call DelayFrames
call ClearScreen
call Func_3aef7
- ld a, [$d11e]
+ ld a, [wd11e]
push af
- ld a, [$d0b5]
- ld [$d11e], a
+ ld a, [wd0b5]
+ ld [wd11e], a
ld a, $3a
call Predef ; indirect jump to IndexToPokedex (41010 (10:5010))
- ld a, [$d11e]
+ ld a, [wd11e]
dec a
ld hl, BaseStats
ld bc, $1c
@@ -161,16 +161,16 @@
call AddNTimes
ld de, W_MONHEADER
call CopyData
- ld a, [$d0b5]
- ld [$d0b8], a
+ ld a, [wd0b5]
+ ld [W_MONHDEXNUM], a
pop af
- ld [$d11e], a
- ld hl, $cfa8
- ld de, $cfba
+ ld [wd11e], a
+ ld hl, wcfa8
+ ld de, wcfba
ld b, $1
call CalcStats
- ld a, [wWhichPokemon] ; $cf92
- ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA)
+ ld a, [wWhichPokemon] ; wWhichPokemon
+ ld hl, W_PARTYMON1_NUM ; W_PARTYMON1_NUM (aliases: W_PARTYMON1DATA)
ld bc, $2c
call AddNTimes
ld e, l
@@ -182,7 +182,7 @@
ld a, [hli]
ld b, a
ld c, [hl]
- ld hl, $cfbb
+ ld hl, wcfbb
ld a, [hld]
sub c
ld c, a
@@ -189,7 +189,7 @@
ld a, [hl]
sbc b
ld b, a
- ld hl, $cf9a
+ ld hl, wcf9a
ld a, [hl]
add c
ld [hld], a
@@ -199,32 +199,32 @@
dec hl
pop bc
call CopyData
- ld a, [$d0b5]
- ld [$d11e], a
+ ld a, [wd0b5]
+ ld [wd11e], a
xor a
- ld [$cc49], a
+ ld [wcc49], a
call Func_3af5b
pop hl
ld a, $42
call Predef ; indirect jump to SetPartyMonTypes (5db5e (17:5b5e))
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
and a
call z, Func_3af52
ld a, $3a
call Predef ; indirect jump to IndexToPokedex (41010 (10:5010))
- ld a, [$d11e]
+ ld a, [wd11e]
dec a
ld c, a
ld b, $1
- ld hl, wPokedexOwned ; $d2f7
+ ld hl, wPokedexOwned ; wPokedexOwned
push bc
call Func_3b057
pop bc
- ld hl, wPokedexSeen ; $d30a
+ ld hl, wPokedexSeen ; wd30a
call Func_3b057
pop de
pop hl
- ld a, [$cf98]
+ ld a, [wcf98]
ld [hl], a
push hl
ld l, e
@@ -244,27 +244,27 @@
pop hl
pop af
ld [$ffd7], a
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $32
ret z
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
and a
ret nz
- ld a, [$d121]
+ ld a, [wd121]
and a
call nz, Func_2307
ret
Func_3aef7: ; 3aef7 (e:6ef7)
- ld a, [$d0b5]
+ ld a, [wd0b5]
push af
- ld a, [$d0b8]
- ld [$d0b5], a
+ ld a, [W_MONHDEXNUM]
+ ld [wd0b5], a
call GetName
pop af
- ld [$d0b5], a
- ld hl, $cd6d
- ld de, $cf4b
+ ld [wd0b5], a
+ ld hl, wcd6d
+ ld de, wcf4b
.asm_3af0e
ld a, [de]
inc de
@@ -273,13 +273,13 @@
ret nz
cp $50
jr nz, .asm_3af0e
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
ld bc, $b
- ld hl, W_PARTYMON1NAME ; $d2b5
+ ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
call AddNTimes
push hl
call GetName
- ld hl, $cd6d
+ ld hl, wcd6d
pop de
jp CopyData
@@ -308,7 +308,7 @@
db "@"
Func_3af52: ; 3af52 (e:6f52)
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $32
ret z
jp ReloadTilesetTilePatterns
@@ -315,8 +315,8 @@
Func_3af5b: ; 3af5b (e:6f5b)
ld hl, EvosMovesPointerTable
- ld a, [$d11e]
- ld [$cf91], a
+ ld a, [wd11e]
+ ld [wcf91], a
dec a
ld bc, $0
ld hl, EvosMovesPointerTable
@@ -336,16 +336,16 @@
and a
jr z, .asm_3afb1
ld b, a
- ld a, [W_CURENEMYLVL] ; $d127
+ ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL
cp b
ld a, [hli]
jr nz, .asm_3af77
ld d, a
- ld a, [$cc49]
+ ld a, [wcc49]
and a
jr nz, .asm_3af96
- ld hl, W_PARTYMON1_MOVE1 ; $d173
- ld a, [wWhichPokemon] ; $cf92
+ ld hl, W_PARTYMON1_MOVE1 ; W_PARTYMON1_MOVE1
+ ld a, [wWhichPokemon] ; wWhichPokemon
ld bc, $2c
call AddNTimes
.asm_3af96
@@ -357,20 +357,20 @@
dec b
jr nz, .asm_3af98
ld a, d
- ld [$d0e0], a
- ld [$d11e], a
+ ld [wd0e0], a
+ ld [wd11e], a
call GetMoveName
call CopyStringToCF4B
ld a, $1b
call Predef ; indirect jump to LearnMove (6e43 (1:6e43))
.asm_3afb1
- ld a, [$cf91]
- ld [$d11e], a
+ ld a, [wcf91]
+ ld [wd11e], a
ret
; writes the moves a mon has at level [W_CURENEMYLVL] to [de]
; move slots are being filled up sequentially and shifted if all slots are full
-; [$cee9]: (?)
+; [wHPBarMaxHP]: (?)
WriteMonMoves: ; 3afb8 (e:6fb8)
call GetPredefRegisters
push hl
@@ -378,7 +378,7 @@
push bc
ld hl, EvosMovesPointerTable
ld b, $0
- ld a, [$cf91] ; cur mon ID
+ ld a, [wcf91] ; cur mon ID
dec a
add a
rl b
@@ -401,13 +401,13 @@
and a
jp z, .done ; end of list
ld b, a
- ld a, [W_CURENEMYLVL] ; $d127
+ ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL
cp b
jp c, .done ; mon level < move level (assumption: learnset is sorted by level)
- ld a, [$cee9]
+ ld a, [wHPBarMaxHP]
and a
jr z, .skipMinLevelCheck
- ld a, [wWhichTrade] ; $cd3d (min move level)
+ ld a, [wWhichTrade] ; wWhichTrade (min move level)
cp b
jr nc, .nextMove2 ; min level >= move level
.skipMinLevelCheck
@@ -436,7 +436,7 @@
ld h, d
ld l, e
call WriteMonMoves_ShiftMoveData ; shift all moves one up (deleting move 1)
- ld a, [$cee9]
+ ld a, [wHPBarMaxHP]
and a
jr z, .writeMoveToSlot
push de
@@ -451,7 +451,7 @@
.writeMoveToSlot2
ld a, [hl]
ld [de], a
- ld a, [$cee9]
+ ld a, [wHPBarMaxHP]
and a
jr z, .nextMove
push hl ; write move PP value
@@ -463,10 +463,10 @@
ld hl, Moves
ld bc, $6
call AddNTimes
- ld de, $cee9
+ ld de, wHPBarMaxHP
ld a, BANK(Moves)
call FarCopyData
- ld a, [$ceee]
+ ld a, [wHPBarNewHP + 1]
pop hl
ld [hl], a
pop hl
--- a/engine/experience.asm
+++ b/engine/experience.asm
@@ -1,6 +1,6 @@
Func_58f43: ; 58f43 (16:4f43)
- ld a, [$cf98]
- ld [$d0b5], a
+ ld a, [wcf98]
+ ld [wd0b5], a
call GetMonHeader
ld d, $1
.asm_58f4e
@@ -7,7 +7,7 @@
inc d
call CalcExperience
push hl
- ld hl, $cfa8
+ ld hl, wcfa8
ld a, [$ff98]
ld c, a
ld a, [hld]
--- a/engine/game_corner_slots.asm
+++ b/engine/game_corner_slots.asm
@@ -10,7 +10,7 @@
ld a, [wTrainerSpriteOffset]
and a
ret z
- ld a, [$cd05]
+ ld a, [wcd05]
ld b, a
ld a, [wTrainerFacingDirection]
inc a
@@ -21,9 +21,9 @@
.asm_37e58
ld a, $fa
.asm_37e5a
- ld [$cc5b], a
+ ld [wcc5b], a
ld a, [H_LOADEDROMBANK]
- ld [$cc5e], a
+ ld [wcc5e], a
call PromptUserToPlaySlots
ret
.printOutOfOrder
--- a/engine/game_corner_slots2.asm
+++ b/engine/game_corner_slots2.asm
@@ -1,5 +1,5 @@
AbleToPlaySlotsCheck ; 2ff09 (b:7f09)
- ld a, [$c102]
+ ld a, [wSpriteStateData1 + 2]
and $8
jr z, .done ; not able
ld b, COIN_CASE
@@ -20,7 +20,7 @@
call PrintPredefTextID
xor a
.done
- ld [$cd3d], a
+ ld [wWhichTrade], a
ret
GameCornerCoinCaseText: ; 2ff32 (b:7f32)
--- a/engine/gamefreak.asm
+++ b/engine/gamefreak.asm
@@ -85,7 +85,7 @@
dec a
jr nz, .asm_70098
xor a
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
ld hl, PointerTable_700f2 ; $40f2
ld c, $6
.asm_700af
@@ -110,15 +110,15 @@
inc hl
dec c
jr nz, .asm_700ba
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
cp $18
jr z, .asm_700d5
add $6
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
.asm_700d5
call Func_7011f
push af
- ld hl, $c310
+ ld hl, wOAMBuffer + $10
ld de, wOAMBuffer
ld bc, $50
call CopyData
@@ -173,8 +173,8 @@
Func_7011f: ; 7011f (1c:411f)
ld b, $8
.asm_70121
- ld hl, $c35c
- ld a, [wWhichTrade] ; $cd3d
+ ld hl, wOAMBuffer + $5c
+ ld a, [wWhichTrade] ; wWhichTrade
ld de, $fffc
ld c, a
.asm_7012b
--- a/engine/give_pokemon.asm
+++ b/engine/give_pokemon.asm
@@ -1,22 +1,22 @@
_GivePokemon: ; 4fda5 (13:7da5)
call EnableAutoTextBoxDrawing
xor a
- ld [$ccd3], a
- ld a, [W_NUMINPARTY] ; $d163
+ ld [wccd3], a
+ ld a, [W_NUMINPARTY] ; W_NUMINPARTY
cp $6
jr c, .asm_4fe01
- ld a, [W_NUMINBOX] ; $da80
+ ld a, [W_NUMINBOX] ; wda80
cp $14
jr nc, .asm_4fdf9
xor a
- ld [W_ENEMYBATTSTATUS3], a ; $d069
- ld a, [$cf91]
+ ld [W_ENEMYBATTSTATUS3], a ; W_ENEMYBATTSTATUS3
+ ld a, [wcf91]
ld [W_ENEMYMONID], a
callab Func_3eb01
call SetPokedexOwnedFlag
callab Func_e7a4
- ld hl, $cf4b
- ld a, [$d5a0]
+ ld hl, wcf4b
+ ld a, [wd5a0]
and $7f
cp $9
jr c, .asm_4fdec
@@ -43,26 +43,26 @@
call SetPokedexOwnedFlag
call AddPokemonToParty
ld a, $1
- ld [$cc3c], a
- ld [$ccd3], a
+ ld [wcc3c], a
+ ld [wccd3], a
scf
ret
SetPokedexOwnedFlag: ; 4fe11 (13:7e11)
- ld a, [$cf91]
+ ld a, [wcf91]
push af
- ld [$d11e], a
+ ld [wd11e], a
ld a, $3a
call Predef ; indirect jump to IndexToPokedex (41010 (10:5010))
- ld a, [$d11e]
+ ld a, [wd11e]
dec a
ld c, a
- ld hl, wPokedexOwned ; $d2f7
+ ld hl, wPokedexOwned ; wPokedexOwned
ld b, $1
ld a, $10 ; FlagActionPredef
call Predef
pop af
- ld [$d11e], a
+ ld [wd11e], a
call GetMonName
ld hl, GotMonText
jp PrintText
--- a/engine/hall_of_fame.asm
+++ b/engine/hall_of_fame.asm
@@ -14,18 +14,18 @@
ld hl, rLCDC ; $ff40
set 3, [hl]
xor a
- ld hl, $cc5b
+ ld hl, wcc5b
ld bc, $60
call FillMemory
xor a
- ld [$cfcb], a
+ ld [wcfcb], a
ld [$ffd7], a
ld [W_SPRITEFLIPPED], a
- ld [$d358], a
- ld [$cd40], a
+ ld [wd358], a
+ ld [wTrainerScreenY], a
inc a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
- ld hl, $d5a2
+ ld hl, wd5a2
ld a, [hl]
inc a
jr z, .asm_701eb
@@ -36,7 +36,7 @@
ld c, BANK(Music_HallOfFame)
ld a, MUSIC_HALL_OF_FAME
call PlayMusic
- ld hl, W_PARTYMON1 ; $d164
+ ld hl, W_PARTYMON1 ; W_PARTYMON1
ld c, $ff
.asm_701fb
ld a, [hli]
@@ -45,24 +45,24 @@
inc c
push hl
push bc
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
ld a, c
- ld [$cd3e], a
- ld hl, W_PARTYMON1_LEVEL ; $d18c
+ ld [wTrainerEngageDistance], a
+ ld hl, W_PARTYMON1_LEVEL ; W_PARTYMON1_LEVEL
ld bc, $2c
call AddNTimes
ld a, [hl]
- ld [$cd3f], a
+ ld [wTrainerFacingDirection], a
call Func_70278
call Func_702e1
ld c, $50
call DelayFrames
- FuncCoord 2, 13 ; $c4a6
+ FuncCoord 2, 13
ld hl, Coord
ld b, $3
ld c, $e
call TextBoxBorder
- FuncCoord 4, 15 ; $c4d0
+ FuncCoord 4, 15
ld hl, Coord
ld de, HallOfFameText
call PlaceString
@@ -75,15 +75,15 @@
.asm_70241
ld a, c
inc a
- ld hl, $cc5b
+ ld hl, wcc5b
ld bc, $10
call AddNTimes
ld [hl], $ff
call Func_73b0d
xor a
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
inc a
- ld [$cd40], a
+ ld [wTrainerScreenY], a
call Func_70278
call Func_70377
call Func_70423
@@ -102,18 +102,18 @@
ld [$ffaf], a
ld a, $c0
ld [$ffae], a
- ld a, [wWhichTrade] ; $cd3d
- ld [$cf91], a
- ld [$d0b5], a
- ld [$cfd9], a
- ld [$cf1d], a
- ld a, [$cd40]
+ ld a, [wWhichTrade] ; wWhichTrade
+ ld [wcf91], a
+ ld [wd0b5], a
+ ld [wcfd9], a
+ ld [wcf1d], a
+ ld a, [wTrainerScreenY]
and a
jr z, .asm_7029d
call Func_7033e
jr .asm_702ab
.asm_7029d
- FuncCoord 12, 5 ; $c410
+ FuncCoord 12, 5
ld hl, Coord
call GetMonHeader
call LoadFrontSpriteByMonIndex
@@ -129,7 +129,7 @@
call Func_7036d
ld d, $a0
ld e, $4
- ld a, [$cf1b]
+ ld a, [wcf1b]
and a
jr z, .asm_702c7
sla e
@@ -151,37 +151,37 @@
ret
Func_702e1: ; 702e1 (1c:42e1)
- ld a, [$cd3e]
- ld hl, W_PARTYMON1NAME ; $d2b5
+ ld a, [wTrainerEngageDistance]
+ ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
call GetPartyMonName
call Func_702f0
jp Func_70404
Func_702f0: ; 702f0 (1c:42f0)
- FuncCoord 0, 2 ; $c3c8
+ FuncCoord 0, 2
ld hl, Coord
ld b, $9
ld c, $a
call TextBoxBorder
- FuncCoord 2, 6 ; $c41a
+ FuncCoord 2, 6
ld hl, Coord
ld de, HoFMonInfoText
call PlaceString
- FuncCoord 1, 4 ; $c3f1
+ FuncCoord 1, 4
ld hl, Coord
- ld de, $cd6d
+ ld de, wcd6d
call PlaceString
- ld a, [$cd3f]
- FuncCoord 8, 7 ; $c434
+ ld a, [wTrainerFacingDirection]
+ FuncCoord 8, 7
ld hl, Coord
call PrintLevelCommon
- ld a, [wWhichTrade] ; $cd3d
- ld [$d0b5], a
- FuncCoord 3, 9 ; $c457
+ ld a, [wWhichTrade] ; wWhichTrade
+ ld [wd0b5], a
+ FuncCoord 3, 9
ld hl, Coord
ld a, $4b
call Predef ; indirect jump to Func_27d6b (27d6b (9:7d6b))
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
jp PlayCry
HoFMonInfoText: ; 70329 (1c:4329)
@@ -210,51 +210,51 @@
Func_7036d: ; 7036d (1c:436d)
ld b, $0
- FuncCoord 12, 5 ; $c410
+ FuncCoord 12, 5
ld hl, Coord
ld a, $31
jp Predef ; indirect jump to Func_79dda (79dda (1e:5dda))
Func_70377: ; 70377 (1c:4377)
- ld hl, $d747
+ ld hl, wd747
set 3, [hl]
ld a, $56
call Predef ; indirect jump to DisplayDexRating (44169 (11:4169))
- FuncCoord 0, 4 ; $c3f0
+ FuncCoord 0, 4
ld hl, Coord
ld b, $6
ld c, $a
call TextBoxBorder
- FuncCoord 5, 0 ; $c3a5
+ FuncCoord 5, 0
ld hl, Coord
ld b, $2
ld c, $9
call TextBoxBorder
- FuncCoord 7, 2 ; $c3cf
+ FuncCoord 7, 2
ld hl, Coord
- ld de, W_PLAYERNAME ; $d158
+ ld de, W_PLAYERNAME ; wd158
call PlaceString
- FuncCoord 1, 6 ; $c419
+ FuncCoord 1, 6
ld hl, Coord
ld de, HoFPlayTimeText
call PlaceString
- FuncCoord 5, 7 ; $c431
+ FuncCoord 5, 7
ld hl, Coord
- ld de, $da41
+ ld de, W_PLAYTIMEHOURS + 1
ld bc, $103
call PrintNumber
ld [hl], $6d
inc hl
- ld de, $da43
+ ld de, W_PLAYTIMEMINUTES + 1
ld bc, $8102
call PrintNumber
- FuncCoord 1, 9 ; $c455
+ FuncCoord 1, 9
ld hl, Coord
ld de, HoFMoneyText
call PlaceString
- FuncCoord 4, 10 ; $c46c
+ FuncCoord 4, 10
ld hl, Coord
- ld de, wPlayerMoney ; $d347
+ ld de, wPlayerMoney ; wPlayerMoney
ld c, $a3
call PrintBCDNumber
ld hl, DexSeenOwnedText
@@ -261,7 +261,7 @@
call Func_703e2
ld hl, DexRatingText
call Func_703e2
- ld hl, $cc5d
+ ld hl, wcc5d
Func_703e2: ; 703e2 (1c:43e2)
call PrintText
@@ -283,24 +283,24 @@
db "@"
Func_70404: ; 70404 (1c:4404)
- ld hl, $cc5b
+ ld hl, wcc5b
ld bc, $10
- ld a, [$cd3e]
+ ld a, [wTrainerEngageDistance]
call AddNTimes
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
ld [hli], a
- ld a, [$cd3f]
+ ld a, [wTrainerFacingDirection]
ld [hli], a
ld e, l
ld d, h
- ld hl, $cd6d
+ ld hl, wcd6d
ld bc, $b
jp CopyData
Func_70423: ; 70423 (1c:4423)
ld a, $a
- ld [$cfc8], a
- ld [$cfc9], a
+ ld [wcfc8], a
+ ld [wcfc9], a
ld a, $ff
ld [wMusicHeaderPointer], a
jp GBFadeOut2
--- a/engine/hidden_object_functions14.asm
+++ b/engine/hidden_object_functions14.asm
@@ -1,7 +1,7 @@
PrintNotebookText: ; 52996 (14:6996)
call EnableAutoTextBoxDrawing
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
ld a, [wTrainerSpriteOffset]
jp PrintPredefTextID
@@ -92,7 +92,7 @@
db "@"
PrintIndigoPlateauHQText: ; 52a2f (14:6a2f)
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4
ret nz
call EnableAutoTextBoxDrawing
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -16,7 +16,7 @@
db $fc ; FuncTX_ItemStoragePC
Route15GateLeftBinoculars: ; 5db8f (17:5b8f)
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4 ; i
ret nz
call EnableAutoTextBoxDrawing
@@ -23,7 +23,7 @@
ld a, $a ; text id Route15UpstairsBinocularsText
call PrintPredefTextID
ld a, ARTICUNO
- ld [$cf91], a
+ ld [wcf91], a
call PlayCry
jp DisplayMonFrontSpriteInBox
@@ -33,7 +33,7 @@
AerodactylFossil: ; 5dbad (17:5bad)
ld a, FOSSIL_AERODACTYL
- ld [$cf91], a
+ ld [wcf91], a
call DisplayMonFrontSpriteInBox
call EnableAutoTextBoxDrawing
ld a, $9
@@ -46,7 +46,7 @@
KabutopsFossil: ; 5bdc3 (17:5bc3)
ld a, FOSSIL_KABUTOPS
- ld [$cf91], a
+ ld [wcf91], a
call DisplayMonFrontSpriteInBox
call EnableAutoTextBoxDrawing
ld a, $b
@@ -59,7 +59,7 @@
DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9)
; Displays a pokemon's front sprite in a pop-up window.
-; [$cf91] = pokemon interal id number
+; [wcf91] = pokemon interal id number
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
call Delay3
@@ -67,17 +67,17 @@
ld [$ffb0], a
call SaveScreenTilesToBuffer1
ld a, $11
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
call UpdateSprites
- ld a, [$cf91]
- ld [$d0b5], a
+ ld a, [wcf91]
+ ld [wd0b5], a
call GetMonHeader
ld de, $8b10
call LoadMonFrontSprite
ld a, $80
ld [$ffe1], a
- FuncCoord 10, 11 ; $c486
+ FuncCoord 10, 11
ld hl, Coord
ld a, $2
call Predef ; indirect jump to Func_3f073 (3f073 (f:7073))
@@ -91,8 +91,8 @@
PrintBlackboardLinkCableText: ; 5dc1a (17:5c1a)
call EnableAutoTextBoxDrawing
ld a, $1
- ld [$cc3c], a
- ld a, [$cd3d]
+ ld [wcc3c], a
+ ld a, [wWhichTrade]
call PrintPredefTextID
ret
@@ -114,13 +114,13 @@
ld a, $1
ld [wTopMenuItemX], a
.asm_5c51
- ld hl, $d730
+ ld hl, wd730
set 6, [hl]
ld hl, wTileMap
ld b, $8
ld c, $d
call TextBoxBorder
- ld hl, $c3ca
+ ld hl, wTileMap + $2a
ld de, HowToLinkText
call PlaceString
ld hl, LinkCableHelpText2
@@ -131,7 +131,7 @@
ld a, [wCurrentMenuItem]
cp $3
jr z, .asm_5dc93 ; 0x5dc7b $16
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
ld hl, LinkCableInfoTexts
add a
@@ -144,7 +144,7 @@
call PrintText
jp .asm_5c51
.asm_5dc93
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
call LoadScreenTilesFromBuffer1
jp TextScriptEnd
@@ -198,15 +198,15 @@
ld a, $1
ld [wTopMenuItemX], a
.asm_5dd15
- ld hl, $d730
+ ld hl, wd730
set 6, [hl]
ld hl, wTileMap
ld bc, $060a
call TextBoxBorder
- ld hl, $c3c9
+ ld hl, wTileMap + $29
ld de, StatusAilmentText1
call PlaceString
- ld hl, $c3ce
+ ld hl, wTileMap + $2e
ld de, StatusAilmentText2
call PlaceString
ld hl, ViridianSchoolBlackboardText2
@@ -244,7 +244,7 @@
add b
cp $5
jr z, .exitBlackboard
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
ld hl, ViridianBlackboardStatusPointers
add a
@@ -257,7 +257,7 @@
call PrintText
jp .asm_5dd15
.exitBlackboard
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
call LoadScreenTilesFromBuffer1
jp TextScriptEnd
@@ -318,11 +318,11 @@
GymTrashScript: ; 5ddfc (17:5dfc)
call EnableAutoTextBoxDrawing
- ld a, [wWhichTrade] ; $cd3d
- ld [$cd5b], a
+ ld a, [wWhichTrade] ; wWhichTrade
+ ld [wcd5b], a
; Don't do the trash can puzzle if it's already been done.
- ld a, [$d773]
+ ld a, [wd773]
bit 0, a
jr z, .ok
@@ -333,9 +333,9 @@
bit 1, a
jr nz, .trySecondLock
- ld a, [$d743]
+ ld a, [wd743]
ld b, a
- ld a, [$cd5b]
+ ld a, [wcd5b]
cp b
jr z, .openFirstLock
@@ -344,11 +344,11 @@
.openFirstLock
; Next can is trying for the second switch.
- ld hl, $d773
+ ld hl, wd773
set 1, [hl]
ld hl, GymTrashCans ; $5e7d
- ld a, [$cd5b]
+ ld a, [wcd5b]
; * 5
ld b, a
add a
@@ -375,25 +375,25 @@
add hl, de
ld a, [hl]
and $f
- ld [$d744], a
+ ld [wd744], a
ld a, $3b ; DisplayTextID $3b = VermilionGymTrashSuccesText1 (first lock opened!)
jr .done
.trySecondLock
- ld a, [$d744]
+ ld a, [wd744]
ld b, a
- ld a, [$cd5b]
+ ld a, [wcd5b]
cp b
jr z, .openSecondLock
; Reset the cans.
- ld hl, $d773
+ ld hl, wd773
res 1, [hl]
call Random
and $e
- ld [$d743], a
+ ld [wd743], a
ld a, $3e ; DisplayTextID $3e = VermilionGymTrashFailText (locks reset!)
jr .done
@@ -400,9 +400,9 @@
.openSecondLock
; Completed the trash can puzzle.
- ld hl, $d773
+ ld hl, wd773
set 0, [hl]
- ld hl, $d126
+ ld hl, wd126
set 6, [hl]
ld a, $3d ; DisplayTextID $3d = VermilionGymTrashSuccesText3 (2nd lock opened!)
--- a/engine/hidden_object_functions18.asm
+++ b/engine/hidden_object_functions18.asm
@@ -3,7 +3,7 @@
; if in a gym and don’t have the corresponding badge, a = $C and jp PrintPredefTextID
; else ret
call EnableAutoTextBoxDrawing
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4
ret nz
ld hl, .BadgeFlags
@@ -19,7 +19,7 @@
jr .asm_62429 ; 0x62431 $f6
.asm_62433
ld b, [hl]
- ld a, [$d72a]
+ ld a, [wd72a]
and b
cp b
ld a, $d
@@ -64,7 +64,7 @@
.asm_62472
ld a, [hli]
ld b, a
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp b
jr nz, .asm_62467
ld a, [hl]
@@ -140,7 +140,7 @@
SaffronCityPokecenterBenchGuyText: ; 624e4 (18:64e4)
db $8 ; asm
- ld a, [$d838]
+ ld a, [wd838]
bit 7, a
ld hl, SaffronCityPokecenterBenchGuyText2
jr nz, .asm_624f2 ; 0x624ed $3
@@ -176,12 +176,12 @@
db "@"
OpenPokemonCenterPC: ; 62516 (18:6516)
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4 ; check to see if player is facing up
ret nz
call EnableAutoTextBoxDrawing
ld a, $1
- ld [$cf0c], a
+ ld [wcf0c], a
ld a, $1f ; PredefText1f
jp PrintPredefTextID
--- a/engine/hidden_object_functions3.asm
+++ b/engine/hidden_object_functions3.asm
@@ -1,11 +1,11 @@
; prints text for bookshelves in buildings without sign events
PrintBookshelfText: ; fb50 (3:7b50)
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4
jr nz, .asm_fb7f
- ld a, [W_CURMAPTILESET] ; $d367
+ ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
ld b, a
- FuncCoord 8, 7 ; $c434
+ FuncCoord 8, 7
ld a, [Coord]
ld c, a
ld hl, BookshelfTileIDs ; $7b8b
@@ -90,7 +90,7 @@
ld a, [W_CURMAPTILESET]
cp MANSION ; Celadon Mansion tileset
jr nz, .asm_fbfd
- ld a, [$c420]
+ ld a, [wTileMap + $80]
cp $38
jr nz, .asm_fbfd
ld hl, DiglettSculptureText
@@ -115,8 +115,8 @@
db $06
db $08 ; asm
ld a, $1
- ld [$cc3c], a
- ld hl, $d730
+ ld [wcc3c], a
+ ld hl, wd730
set 6, [hl]
call GBPalWhiteOutWithDelay3
xor a
@@ -125,7 +125,7 @@
ld [H_AUTOBGTRANSFERENABLED], a
call LoadFontTilePatterns
callba DisplayTownMap
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
ld de, TextScriptEnd
push de
--- a/engine/hidden_object_functions7.asm
+++ b/engine/hidden_object_functions7.asm
@@ -21,7 +21,7 @@
ld hl, wPokedexOwned
ld b, wPokedexOwnedEnd - wPokedexOwned
call CountSetBits
- ld a, [$d11e]
+ ld a, [wd11e]
cp $2
ld a, $6 ; SaveOptionText
jr c, .asm_1e97b
@@ -38,29 +38,29 @@
db "@"
SafariZoneCheck: ; 1e988 (7:6988)
- ld hl, $d790
+ ld hl, wd790
bit 7, [hl]
jr z, asm_1e9ab
- ld a, [W_NUMSAFARIBALLS] ; $da47
+ ld a, [W_NUMSAFARIBALLS] ; W_NUMSAFARIBALLS
and a
jr z, asm_1e9b0
jr asm_1e9ab
SafariZoneCheckSteps: ; 1e997 (7:6997)
- ld a, [wSafariSteps] ; $d70d
+ ld a, [wSafariSteps] ; wd70d
ld b, a
- ld a, [wSafariSteps + 1] ; $d70e
+ ld a, [wSafariSteps + 1] ; wd70e
ld c, a
or b
jr z, asm_1e9b0
dec bc
ld a, b
- ld [wSafariSteps], a ; $d70d
+ ld [wSafariSteps], a ; wd70d
ld a, c
- ld [wSafariSteps + 1], a ; $d70e
+ ld [wSafariSteps + 1], a ; wd70e
asm_1e9ab: ; 1e9ab (7:69ab)
xor a
- ld [$da46], a
+ ld [wda46], a
ret
asm_1e9b0: ; 1e9b0 (7:69b0)
call EnableAutoTextBoxDrawing
@@ -72,7 +72,7 @@
ld a, (SFX_02_5f - SFX_Headers_02) / 3
call PlayMusic
.asm_1e9c2
- ld a, [$c02a]
+ ld a, [wc02a]
cp $b9
jr nz, .asm_1e9c2
ld a, $d3
@@ -79,17 +79,17 @@
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
xor a
- ld [$d528], a
+ ld [wd528], a
ld a, $9c
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
ld a, $3
- ld [$d42f], a
+ ld [wd42f], a
ld a, $5
ld [W_SAFARIZONEENTRANCECURSCRIPT], a
- ld hl, $d790
+ ld hl, wd790
set 6, [hl]
ld a, $1
- ld [$da46], a
+ ld [wda46], a
ret
PrintSafariGameOverText: ; 1e9ed (7:69ed)
@@ -100,7 +100,7 @@
SafariGameOverText: ; 1e9f7 (7:69f7)
db $08 ; asm
- ld a, [W_NUMSAFARIBALLS] ; $da47
+ ld a, [W_NUMSAFARIBALLS] ; W_NUMSAFARIBALLS
and a
jr z, .asm_1ea04
ld hl, TimesUpText
@@ -119,7 +119,7 @@
db "@"
PrintCinnabarQuiz: ; 1ea17 (7:6a17)
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4
ret nz
call EnableAutoTextBoxDrawing
@@ -129,8 +129,8 @@
CinnabarGymQuiz: ; 1ea25 (7:6a25)
db $08 ; asm
xor a
- ld [$da38], a
- ld a, [wWhichTrade] ; $cd3d
+ ld [wda38], a
+ ld a, [wWhichTrade] ; wWhichTrade
push af
and $f
ld [$ffdb], a
@@ -152,7 +152,7 @@
ld l, a
call PrintText
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
call CinnabarGymQuiz_1ea92
jp TextScriptEnd
@@ -193,7 +193,7 @@
db "@"
CinnabarGymQuiz_1ea8a: ; 1ea8a (7:6a8a)
- ld hl, $d79c
+ ld hl, wd79c
ld a, $10 ; FlagActionPredef
jp Predef
@@ -201,10 +201,10 @@
call YesNoChoice
ld a, [$ffdc]
ld c, a
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
cp c
jr nz, .asm_1eab8
- ld hl, $d126
+ ld hl, wd126
set 5, [hl]
ld a, [$ffdb]
ld [$ffe0], a
@@ -226,7 +226,7 @@
add $2
ld c, a
ld b, $2
- ld hl, $d79a
+ ld hl, wd79a
ld a, $10 ; FlagActionPredef
call Predef
ld a, c
@@ -234,7 +234,7 @@
ret nz
ld a, [$ffdb]
add $2
- ld [$da38], a
+ ld [wda38], a
ret
CinnabarGymQuizCorrectText: ; 1eae3 (7:6ae3)
@@ -276,7 +276,7 @@
ld c, a
inc hl
ld a, [hl]
- ld [$d12f], a
+ ld [wd12f], a
push bc
ld a, [$ffdb]
ld [$ffe0], a
@@ -286,13 +286,13 @@
ld a, c
and a
jr nz, .asm_1eb36
- ld a, [$d12f]
+ ld a, [wd12f]
jr .asm_1eb38
.asm_1eb36
ld a, $e
.asm_1eb38
pop bc
- ld [$d09f], a
+ ld [wd09f], a
ld a, $17
call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
ld hl, $ffdb
@@ -322,10 +322,10 @@
BillsHousePC: ; 1eb6e (7:6b6e)
call EnableAutoTextBoxDrawing
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4
ret nz
- ld a, [$d7f2]
+ ld a, [wd7f2]
bit 7, a
jr nz, .asm_1ebd2
bit 3, a
@@ -337,7 +337,7 @@
jp PrintPredefTextID
.asm_1eb8b
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
ld a, $2e
call PrintPredefTextID
ld c, $20
@@ -361,12 +361,12 @@
call PlaySound
call WaitForSoundToFinish
call Func_2307
- ld hl, $d7f2
+ ld hl, wd7f2
set 3, [hl]
ret
.asm_1ebd2
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
ld a, $2f
call PrintPredefTextID
ret
@@ -380,7 +380,7 @@
db $06
db $08 ; asm
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
ld c, $10
call DelayFrames
@@ -397,25 +397,25 @@
ld hl, BillsHousePokemonListText1
call PrintText
xor a
- ld [$d07c], a
- ld [$cc26], a
- ld [$cc2a], a
+ ld [W_ANIMATIONID], a
+ ld [wCurrentMenuItem], a
+ ld [wLastMenuItem], a
ld a, $3
- ld [$cc29], a
+ ld [wMenuWatchedKeys], a
ld a, $4
- ld [$cc28], a
+ ld [wMaxMenuItem], a
ld a, $2
- ld [$cc24], a
+ ld [wTopMenuItemY], a
ld a, $1
- ld [$cc25], a
+ ld [wTopMenuItemX], a
.asm_1ec2d
- ld hl, $d730
+ ld hl, wd730
set 6, [hl]
ld hl, wTileMap
ld b, $a
ld c, $9
call TextBoxBorder
- ld hl, $c3ca
+ ld hl, wTileMap + $2a
ld de, BillsMonListText
call PlaceString
ld hl, BillsHousePokemonListText2
@@ -424,7 +424,7 @@
call HandleMenuInput
bit 1, a
jr nz, .asm_1ec74
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
add EEVEE
cp EEVEE
jr z, .asm_1ec6c
@@ -440,7 +440,7 @@
call LoadScreenTilesFromBuffer2
jr .asm_1ec2d
.asm_1ec74
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
call LoadScreenTilesFromBuffer2
jp TextScriptEnd
@@ -461,7 +461,7 @@
db "@"
DisplayOakLabEmailText: ; 1ecaf (7:6caf)
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4
ret nz
call EnableAutoTextBoxDrawing
--- a/engine/hp_bar.asm
+++ b/engine/hp_bar.asm
@@ -202,13 +202,13 @@
UpdateHPBar_PrintHPNumber: ; faf5 (3:7af5)
push af
push de
- ld a, [wListMenuID] ; $cf94
+ ld a, [wListMenuID] ; wListMenuID
and a
jr z, .asm_fb2d
ld a, [wHPBarOldHP]
- ld [$cef1], a
+ ld [wcef1], a
ld a, [wHPBarOldHP+1]
- ld [$cef0], a
+ ld [wcef0], a
push hl
ld a, [$fff6]
bit 0, a
@@ -225,7 +225,7 @@
ld [hli], a
ld [hli], a
pop hl
- ld de, $cef0
+ ld de, wcef0
ld bc, $203
call PrintNumber
call DelayFrame
--- a/engine/in_game_trades.asm
+++ b/engine/in_game_trades.asm
@@ -11,12 +11,12 @@
ld b,$0
add hl,bc
ld a,[hli]
- ld [$cd0f],a
+ ld [wcd0f],a
ld a,[hli]
- ld [$cd34],a
+ ld [wcd34],a
ld a,[hli]
push af
- ld de,$cd29
+ ld de,wcd29
ld bc,$000b
call CopyData
pop af
@@ -26,16 +26,16 @@
add hl,hl
add hl,de
ld a,[hli]
- ld [$cd10],a
+ ld [wcd10],a
ld a,[hl]
- ld [$cd11],a
- ld a,[$cd0f]
- ld de,$cd13
+ ld [wcd11],a
+ ld a,[wcd0f]
+ ld de,wcd13
call Func_71b6a
- ld a,[$cd34]
- ld de,$cd1e
+ ld a,[wcd34]
+ ld de,wPlayerMonAccuracyMod
call Func_71b6a
- ld hl,$d737
+ ld hl,wd737
ld a,[wWhichTrade]
ld c,a
ld b,$2
@@ -44,15 +44,15 @@
ld a,c
and a
ld a,$4
- ld [$cd12],a
+ ld [wcd12],a
jr nz,.asm_99bca ; 0x71b36 $20
xor a
- ld [$cd12],a
+ ld [wcd12],a
call .asm_99bca
ld a,$1
- ld [$cd12],a
+ ld [wcd12],a
call YesNoChoice
- ld a,[$cc26]
+ ld a,[wCurrentMenuItem]
and a
jr nz,.asm_99bca ; 0x71b4b $b
call Func_71c07
@@ -60,7 +60,7 @@
ld hl, TradedForText
call PrintText
.asm_99bca ; 0x71b58
- ld hl,$cd12
+ ld hl,wcd12
ld a,[hld]
ld e,a
ld d,$0
@@ -76,9 +76,9 @@
Func_71b6a: ; 71b6a (1c:5b6a)
push de
- ld [$d11e],a
+ ld [wd11e],a
call GetMonName
- ld hl,$cd6d
+ ld hl,wcd6d
pop de
ld bc,$b
jp CopyData
@@ -87,9 +87,9 @@
Func_71c07: ; 71c07 (1c:5c07)
xor a
- ld [$d07d],a
+ ld [wd07d],a
dec a
- ld [$cfcb],a
+ ld [wcfcb],a
call DisplayPartyMenu
push af
call Func_71ca2
@@ -96,19 +96,19 @@
pop af
ld a,$1
jp c,.asm_c4bc2
- ld a,[$cd0f]
+ ld a,[wcd0f]
ld b,a
- ld a,[$cf91]
+ ld a,[wcf91]
cp b
ld a,$2
jr nz,.asm_c4bc2 ; 0x71c26 $75
ld a,[wWhichPokemon]
- ld hl,$d18c
+ ld hl,W_PARTYMON1_LEVEL
ld bc,$002c
call AddNTimes
ld a,[hl]
- ld [$d127],a
- ld hl,$d737
+ ld [W_CURENEMYLVL],a
+ ld hl,wd737
ld a,[wWhichTrade]
ld c,a
ld b,$1
@@ -118,7 +118,7 @@
call PrintText
ld a,[wWhichPokemon]
push af
- ld a,[$d127]
+ ld a,[W_CURENEMYLVL]
push af
call LoadHpBarAndStatusTilePatterns
call Func_71cc1
@@ -125,17 +125,17 @@
ld a,$38
call Predef
pop af
- ld [$d127],a
+ ld [W_CURENEMYLVL],a
pop af
ld [wWhichPokemon],a
- ld a,[$cd34]
- ld [$cf91],a
+ ld a,[wcd34]
+ ld [wcf91],a
xor a
- ld [$cc49],a
- ld [$cf95],a
+ ld [wcc49],a
+ ld [wcf95],a
call RemovePokemon
ld a,$80
- ld [$cc49],a
+ ld [wcc49],a
call AddPokemonToParty
call Func_71d19
callab EvolveTradeMon
@@ -148,7 +148,7 @@
.asm_c4bc2 ; 0x71c9d
scf
.asm_ee803 ; 0x71c9e
- ld [$cd12],a
+ ld [wcd12],a
ret
Func_71ca2: ; 71ca2 (1c:5ca2)
@@ -165,33 +165,33 @@
jp Bankswitch
Func_71cc1: ; 71cc1 (1c:5cc1)
- ld hl, wWhichTrade ; $cd3d
- ld a, [$cd0f]
+ ld hl, wWhichTrade ; wWhichTrade
+ ld a, [wcd0f]
ld [hli], a
- ld a, [$cd34]
+ ld a, [wcd34]
ld [hl], a
- ld hl, W_PARTYMON1OT ; $d273
+ ld hl, W_PARTYMON1OT ; wd273
ld bc, $b
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
call AddNTimes
- ld de, $cd41
+ ld de, wTrainerScreenX
ld bc, $b
call Func_71d11
ld hl, String_71d59 ; $5d59
- ld de, $cd4e
+ ld de, wcd4e
call Func_71d11
- ld de, W_GRASSRATE ; $d887
+ ld de, W_GRASSRATE ; W_GRASSRATE
call Func_71d11
- ld hl, W_PARTYMON1_OTID ; $d177
+ ld hl, W_PARTYMON1_OTID ; W_PARTYMON1_OTID
ld bc, $2c
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
call AddNTimes
- ld de, $cd4c
+ ld de, wcd4c
ld bc, $2
call Func_71d11
call Random
ld hl, hRandomAdd
- ld de, $cd59
+ ld de, wcd59
jp CopyData
Func_71d11: ; 71d11 (1c:5d11)
@@ -203,27 +203,27 @@
ret
Func_71d19: ; 71d19 (1c:5d19)
- ld hl, W_PARTYMON1NAME ; $d2b5
+ ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
ld bc, $b
call Func_71d4f
- ld hl, $cd29
+ ld hl, wcd29
ld bc, $b
call CopyData
- ld hl, W_PARTYMON1OT ; $d273
+ ld hl, W_PARTYMON1OT ; wd273
ld bc, $b
call Func_71d4f
ld hl, String_71d59 ; $5d59
ld bc, $b
call CopyData
- ld hl, W_PARTYMON1_OTID ; $d177
+ ld hl, W_PARTYMON1_OTID ; W_PARTYMON1_OTID
ld bc, $2c
call Func_71d4f
- ld hl, $cd59
+ ld hl, wcd59
ld bc, $2
jp CopyData
Func_71d4f: ; 71d4f (1c:5d4f)
- ld a, [W_NUMINPARTY] ; $d163
+ ld a, [W_NUMINPARTY] ; W_NUMINPARTY
dec a
call AddNTimes
ld e, l
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -38,7 +38,7 @@
ld a, (SFX_1f_5f - SFX_Headers_1f) / 3
call PlaySound
xor a
- ld [$d09f], a
+ ld [wd09f], a
ld de, IntroNidorinoAnimation1
call AnimateIntroNidorino
; hop
@@ -86,7 +86,7 @@
ld a, (SFX_1f_5f - SFX_Headers_1f) / 3
call PlaySound
ld a, $24
- ld [$d09f], a
+ ld [wd09f], a
ld de, IntroNidorinoAnimation3
call AnimateIntroNidorino
ld c, $1e
@@ -105,7 +105,7 @@
ld a, (SFX_1f_5f - SFX_Headers_1f) / 3
call PlaySound
xor a
- ld [$d09f], a
+ ld [wd09f], a
ld de, IntroNidorinoAnimation4 ; $5931
call AnimateIntroNidorino
; hop
@@ -118,7 +118,7 @@
ret c
ld a, $24
- ld [$d09f], a
+ ld [wd09f], a
ld de, IntroNidorinoAnimation6 ; $5947
call AnimateIntroNidorino
ld c, $1e
@@ -129,7 +129,7 @@
ld a, (SFX_1f_5e - SFX_Headers_1f) / 3
call PlaySound
ld a, $48
- ld [$d09f], a
+ ld [wd09f], a
ld de, IntroNidorinoAnimation7 ; $5950
jp AnimateIntroNidorino
@@ -137,10 +137,10 @@
ld a, [de]
cp $50
ret z
- ld [W_BASECOORDY], a ; $d082
+ ld [W_BASECOORDY], a ; wd082
inc de
ld a, [de]
- ld [W_BASECOORDX], a ; $d081
+ ld [W_BASECOORDX], a ; wd081
push de
ld c, $24
call Func_417ae
@@ -152,13 +152,13 @@
Func_417ae: ; 417ae (10:57ae)
ld hl, wOAMBuffer
- ld a, [$d09f]
+ ld a, [wd09f]
ld d, a
.asm_417b5
- ld a, [W_BASECOORDY] ; $d082
+ ld a, [W_BASECOORDY] ; wd082
add [hl]
ld [hli], a
- ld a, [W_BASECOORDX] ; $d081
+ ld a, [W_BASECOORDX] ; wd081
add [hl]
ld [hli], a
ld a, d
@@ -174,7 +174,7 @@
ld d, $0
.asm_417cc
push bc
- ld a, [W_BASECOORDY] ; $d082
+ ld a, [W_BASECOORDY] ; wd082
ld e, a
.asm_417d1
ld a, e
@@ -181,7 +181,7 @@
add $8
ld e, a
ld [hli], a
- ld a, [W_BASECOORDX] ; $d081
+ ld a, [W_BASECOORDX] ; wd081
ld [hli], a
ld a, d
ld [hli], a
@@ -190,9 +190,9 @@
inc d
dec c
jr nz, .asm_417d1
- ld a, [W_BASECOORDX] ; $d081
+ ld a, [W_BASECOORDX] ; wd081
add $8
- ld [W_BASECOORDX], a ; $d081
+ ld [W_BASECOORDX], a ; wd081
pop bc
dec b
jr nz, .asm_417cc
@@ -204,7 +204,7 @@
jr asm_417fe
Func_417f8: ; 417f8 (10:57f8)
- FuncCoord 0, 4 ; $c3f0
+ FuncCoord 0, 4
ld hl, Coord
ld bc, $c8
asm_417fe: ; 417fe (10:57fe)
@@ -237,9 +237,9 @@
.asm_4181d
push de
ld a, $2
- ld [W_BASECOORDX], a ; $d081
+ ld [W_BASECOORDX], a ; wd081
xor a
- ld [W_BASECOORDY], a ; $d082
+ ld [W_BASECOORDY], a ; wd082
ld c, $24
call Func_417ae
pop de
@@ -259,7 +259,7 @@
ret
Func_4183f: ; 4183f (10:583f)
- FuncCoord 13, 7 ; $c439
+ FuncCoord 13, 7
ld hl, Coord
Func_41842: ; 41842 (10:5842)
@@ -306,7 +306,7 @@
call ClearScreen
call DisableLCD
xor a
- ld [W_CUROPPONENT], a ; $d059
+ ld [W_CUROPPONENT], a ; wd059
call Func_418e9
call LoadIntroGraphics
call EnableLCD
@@ -323,10 +323,10 @@
call DelayFrames
.asm_418d0
ld a, Bank(Func_7d8ea)
- ld [$c0ef], a
- ld [$c0f0], a
+ ld [wc0ef], a
+ ld [wc0f0], a
ld a, MUSIC_INTRO_BATTLE
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
call Func_417f8
call ClearSprites
@@ -337,7 +337,7 @@
ld hl, wTileMap
ld c, $50
call Func_41807
- FuncCoord 0, 14 ; $c4b8
+ FuncCoord 0, 14
ld hl, Coord
ld c, $50
call Func_41807
--- a/engine/items/itemfinder.asm
+++ b/engine/items/itemfinder.asm
@@ -8,7 +8,7 @@
ret nc ; return if current map has no hidden items
push bc
push hl
- ld hl, $d6f0
+ ld hl, wd6f0
ld c, b
ld b, $2
ld a, $10 ; FlagActionPredef
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -1,7 +1,7 @@
UseItem_: ; d5c7 (3:55c7)
ld a,1
- ld [$cd6a],a
- ld a,[$cf91] ;contains item_ID
+ ld [wcd6a],a
+ ld a,[wcf91] ;contains item_ID
cp a,HM_01
jp nc,ItemUseTMHM
ld hl,ItemUsePtrTable
@@ -118,7 +118,7 @@
.UseBall ;$56a7
;ok, you can use a ball
xor a
- ld [$d11c],a
+ ld [wd11c],a
ld a,[W_BATTLETYPE]
cp a,2 ;SafariBattle
jr nz,.skipSafariZoneCode
@@ -129,7 +129,7 @@
.skipSafariZoneCode ;$56b6
call GoPAL_SET_CF1C
ld a,$43
- ld [$d11e],a
+ ld [wd11e],a
call LoadScreenTilesFromBuffer1 ;restore screenBuffer from Backup
ld hl,ItemUseText00
call PrintText
@@ -158,7 +158,7 @@
.loop ;$56fa
call Random
ld b,a
- ld hl,$cf91
+ ld hl,wcf91
ld a,[hl]
cp a,MASTER_BALL
jp z,.BallSuccess ;$578b
@@ -202,7 +202,7 @@
ld a,255
ld [H_MULTIPLIER],a
call Multiply ; MaxHP * 255
- ld a,[$cf91]
+ ld a,[wcf91]
cp a,GREAT_BALL
ld a,12 ;any other BallFactor
jr nz,.next7
@@ -237,7 +237,7 @@
ld [H_QUOTIENT + 3],a
.next9 ;$5776
pop bc
- ld a,[$d007] ;enemy: Catch Rate
+ ld a,[wd007] ;enemy: Catch Rate
cp b
jr c,.next10
ld a,[H_QUOTIENT + 2]
@@ -252,16 +252,16 @@
jr .BallSuccess2
.next10 ;$578d
ld a,[H_QUOTIENT + 3]
- ld [$d11e],a
+ ld [wd11e],a
xor a
ld [H_MULTIPLICAND],a
ld [H_MULTIPLICAND + 1],a
- ld a,[$d007] ;enemy: Catch Rate
+ ld a,[wd007] ;enemy: Catch Rate
ld [H_MULTIPLICAND + 2],a
ld a,100
ld [H_MULTIPLIER],a
call Multiply ; CatchRate * 100
- ld a,[$cf91]
+ ld a,[wcf91]
ld b,255
cp a,POKE_BALL
jr z,.next11
@@ -280,7 +280,7 @@
and a
ld b,$63
jr nz,.next12
- ld a,[$d11e]
+ ld a,[wd11e]
ld [H_MULTIPLIER],a
call Multiply
ld a,255
@@ -312,7 +312,7 @@
ld b,$63
.next12 ;$5801
ld a,b
- ld [$d11e],a
+ ld [wd11e],a
.BallSuccess2 ;$5805
ld c,20
call DelayFrames
@@ -320,19 +320,19 @@
ld [W_ANIMATIONID],a
xor a
ld [$fff3],a
- ld [$cc5b],a
- ld [$d05b],a
+ ld [wcc5b],a
+ ld [wd05b],a
ld a,[wWhichPokemon]
push af
- ld a,[$cf91]
+ ld a,[wcf91]
push af
ld a,$08 ;probably animations
call Predef
pop af
- ld [$cf91],a
+ ld [wcf91],a
pop af
ld [wWhichPokemon],a
- ld a,[$d11e]
+ ld a,[wd11e]
cp a,$10
ld hl,ItemUseBallText00
jp z,.printText0
@@ -348,7 +348,7 @@
cp a,$63
ld hl,ItemUseBallText04
jp z,.printText0
- ld hl,$cfe6 ;current HP
+ ld hl,W_ENEMYMONCURHP ;current HP
ld a,[hli]
push af
ld a,[hli]
@@ -357,7 +357,7 @@
ld a,[hl]
push af ;...and status ailments
push hl
- ld hl,$d069
+ ld hl,W_ENEMYBATTSTATUS3
bit 3,[hl]
jr z,.next15
ld a,$4c
@@ -365,21 +365,21 @@
jr .next16
.next15 ;$5871
set 3,[hl]
- ld hl,$cceb
- ld a,[$cff1]
+ ld hl,wcceb
+ ld a,[W_ENEMYMONATKDEFIV]
ld [hli],a
- ld a,[$cff2]
+ ld a,[W_ENEMYMONSPDSPCIV]
ld [hl],a
.next16 ;$587e
- ld a,[$cf91]
+ ld a,[wcf91]
push af
ld a,[W_ENEMYMONID]
- ld [$cf91],a
- ld a,[$cff3]
- ld [$d127],a
+ ld [wcf91],a
+ ld a,[W_ENEMYMONLEVEL]
+ ld [W_CURENEMYLVL],a
callab Func_3eb01
pop af
- ld [$cf91],a
+ ld [wcf91],a
pop hl
pop af
ld [hld],a
@@ -388,10 +388,10 @@
ld [hld],a
pop af
ld [hl],a
- ld a,[$cfe5] ;enemy
- ld [$d11c],a
- ld [$cf91],a
- ld [$d11e],a
+ ld a,[wcfe5] ;enemy
+ ld [wd11c],a
+ ld [wcf91],a
+ ld [wd11e],a
ld a,[W_BATTLETYPE]
dec a
jr z,.printText1
@@ -399,7 +399,7 @@
call PrintText
ld a,$3a ;convert order: Internal->Dex
call Predef
- ld a,[$d11e]
+ ld a,[wd11e]
dec a
ld c,a
ld b,2
@@ -408,7 +408,7 @@
call Predef ;check Dex flag (own already or not)
ld a,c
push af
- ld a,[$d11e]
+ ld a,[wd11e]
dec a
ld c,a
ld b,1
@@ -420,8 +420,8 @@
ld hl,ItemUseBallText06
call PrintText
call ClearSprites
- ld a,[$cfe5] ;caught mon_ID
- ld [$d11e],a
+ ld a,[wcfe5] ;caught mon_ID
+ ld [wd11e],a
ld a,$3d
call Predef
.checkParty ;$58f4
@@ -429,7 +429,7 @@
cp a,6 ;is party full?
jr z,.sendToBox
xor a
- ld [$cc49],a
+ ld [wcc49],a
call ClearSprites
call AddPokemonToParty ;add mon to Party
jr .End
@@ -437,7 +437,7 @@
call ClearSprites
call Func_e7a4
ld hl,ItemUseBallText07
- ld a,[$d7f1]
+ ld a,[wd7f1]
bit 0,a ;already met Bill?
jr nz,.sendToBox2
ld hl,ItemUseBallText08
@@ -453,9 +453,9 @@
ld a,[W_BATTLETYPE]
and a
ret nz
- ld hl,$d31d
+ ld hl,wNumBagItems
inc a
- ld [$cf96],a
+ ld [wcf96],a
jp RemoveItemFromInventory ;remove ITEM (XXX)
ItemUseBallText00: ; d937 (3:5937)
;"It dodged the thrown ball!"
@@ -512,8 +512,8 @@
ld a,[W_ISINBATTLE]
and a
jp nz,ItemUseNotTime
- ld a,[$d700]
- ld [$d11a],a
+ ld a,[wd700]
+ ld [wd11a],a
cp a,2 ; is the player surfing?
jp z,ItemUseNotTime
dec a ; is player already bicycling?
@@ -521,7 +521,7 @@
.getOffBike
call ItemUseReloadOverworldData
xor a
- ld [$d700],a ; change player state to walking
+ ld [wd700],a ; change player state to walking
call Func_2307 ; play walking music
ld hl,GotOffBicycleText
jr .printText
@@ -532,7 +532,7 @@
xor a ; no keys pressed
ld [hJoyHeld],a ; current joypad state
inc a
- ld [$d700],a ; change player state to bicycling
+ ld [wd700],a ; change player state to bicycling
ld hl,GotOnBicycleText
call Func_2307 ; play bike riding music
.printText
@@ -540,8 +540,8 @@
; used for Surf out-of-battle effect
ItemUseSurfboard: ; d9b4 (3:59b4)
- ld a,[$d700]
- ld [$d11a],a
+ ld a,[wd700]
+ ld [wd11a],a
cp a,2 ; is the player already surfing?
jr z,.tryToStopSurfing
.tryToSurf
@@ -552,10 +552,10 @@
jp c,SurfingAttemptFailed
.surf
call .makePlayerMoveForward
- ld hl,$d730
+ ld hl,wd730
set 7,[hl]
ld a,2
- ld [$d700],a ; change player state to surfing
+ ld [wd700],a ; change player state to surfing
call Func_2307 ; play surfing music
ld hl,SurfingGotOnText
jp PrintText
@@ -571,11 +571,11 @@
ld hl,TilePairCollisionsWater
call CheckForTilePairCollisions
jr c,.cannotStopSurfing
- ld hl,$d530 ; pointer to list of passable tiles
+ ld hl,W_TILESETCOLLISIONPTR ; pointer to list of passable tiles
ld a,[hli]
ld h,[hl]
ld l,a ; hl now points to passable tiles
- ld a,[$cfc6] ; tile in front of the player
+ ld a,[wcfc6] ; tile in front of the player
ld b,a
.passableTileLoop
ld a,[hli]
@@ -588,10 +588,10 @@
jp PrintText
.stopSurfing
call .makePlayerMoveForward
- ld hl,$d730
+ ld hl,wd730
set 7,[hl]
xor a
- ld [$d700],a ; change player state to walking
+ ld [wd700],a ; change player state to walking
dec a
ld [wJoyIgnore],a
call Func_2307 ; play walking music
@@ -598,7 +598,7 @@
jp LoadWalkingPlayerSpriteGraphics
; uses a simulated button press to make the player move forward
.makePlayerMoveForward
- ld a,[$d52a] ; direction the player is going
+ ld a,[wd52a] ; direction the player is going
bit 3,a
ld b,%01000000 ; Up key
jr nz,.storeSimulatedButtonPress
@@ -611,11 +611,11 @@
ld b,%00010000 ; Right key
.storeSimulatedButtonPress
ld a,b
- ld [$ccd3],a ; base address of simulated button presses
+ ld [wccd3],a ; base address of simulated button presses
xor a
- ld [$cd39],a
+ ld [wcd39],a
inc a
- ld [$cd38],a ; index of current simulated button press
+ ld [wcd38],a ; index of current simulated button press
ret
SurfingGotOnText: ; da4c (3:5a4c)
@@ -636,25 +636,25 @@
jp nz,ItemUseNotTime
ld a,[wWhichPokemon]
push af
- ld a,[$cf91]
- ld [$d156],a
+ ld a,[wcf91]
+ ld [wd156],a
push af
ld a,$05 ; evolution stone party menu
- ld [$d07d],a
+ ld [wd07d],a
ld a,$ff
- ld [$cfcb],a
+ ld [wcfcb],a
call DisplayPartyMenu
pop bc
jr c,.canceledItemUse
ld a,b
- ld [$cf91],a
+ ld [wcf91],a
ld a,$01
- ld [$ccd4],a
+ ld [wccd4],a
ld a,(SFX_02_3e - SFX_Headers_02) / 3
call PlaySoundWaitForCurrent ; play sound
call WaitForSoundToFinish ; wait for sound to end
callab Func_3ad0e ; try to evolve pokemon
- ld a,[$d121]
+ ld a,[wd121]
and a
jr z,.noEffect
pop af
@@ -661,13 +661,13 @@
ld [wWhichPokemon],a
ld hl,wNumBagItems
ld a,1 ; remove 1 stone
- ld [$cf96],a
+ ld [wcf96],a
jp RemoveItemFromInventory
.noEffect
call ItemUseNoEffect
.canceledItemUse
xor a
- ld [$cd6a],a
+ ld [wcd6a],a
pop af
ret
@@ -682,13 +682,13 @@
jp z,.emptyParty
ld a,[wWhichPokemon]
push af
- ld a,[$cf91]
+ ld a,[wcf91]
push af
ld a,$01
- ld [$d07d],a ; item use party menu
+ ld [wd07d],a ; item use party menu
ld a,$ff
- ld [$cfcb],a
- ld a,[$d152]
+ ld [wcfcb],a
+ ld a,[wd152]
and a ; using Softboiled?
jr z,.notUsingSoftboiled
; if using softboiled
@@ -697,7 +697,7 @@
.emptyParty
ld hl,.emptyPartyText
xor a
- ld [$cd6a],a ; item use failed
+ ld [wcd6a],a ; item use failed
jp PrintText
.emptyPartyText
text "You don't have"
@@ -712,16 +712,16 @@
ld a,[wWhichPokemon]
call AddNTimes
ld a,[wWhichPokemon]
- ld [$cf06],a
+ ld [wcf06],a
ld d,a
- ld a,[$cf91]
+ ld a,[wcf91]
ld e,a
- ld [$d0b5],a
+ ld [wd0b5],a
pop af
- ld [$cf91],a
+ ld [wcf91],a
pop af
ld [wWhichPokemon],a
- ld a,[$d152]
+ ld a,[wd152]
and a ; using Softboiled?
jr z,.checkItemType
; if using softboiled
@@ -729,7 +729,7 @@
cp d ; is the pokemon trying to use softboiled on itself?
jr z,ItemUseMedicine ; if so, force another choice
.checkItemType
- ld a,[$cf91]
+ ld a,[wcf91]
cp a,REVIVE
jr nc,.healHP ; if it's a Revive or Max Revive
cp a,FULL_HEAL
@@ -742,7 +742,7 @@
.cureStatusAilment
ld bc,4
add hl,bc ; hl now points to status
- ld a,[$cf91]
+ ld a,[wcf91]
ld bc,$f008
cp a,ANTIDOTE
jr z,.checkMonStatus
@@ -767,7 +767,7 @@
xor a
ld [hl],a ; remove the status ailment in the party data
ld a,b
- ld [$d07d],a ; the message to display for the item used
+ ld [wd07d],a ; the message to display for the item used
ld a,[wPlayerMonNumber]
cp d ; is pokemon the item was used on active in battle?
jp nz,.doneHealing
@@ -793,11 +793,11 @@
ld [wHPBarOldHP+1],a
ld a,[hl]
ld c,a
- ld [wHPBarOldHP],a ; current HP stored at $ceeb (2 bytes, big-endian)
+ ld [wHPBarOldHP],a ; current HP stored at wHPBarOldHP (2 bytes, big-endian)
or b
jr nz,.notFainted
.fainted
- ld a,[$cf91]
+ ld a,[wcf91]
cp a,REVIVE
jr z,.updateInBattleFaintedData
cp a,MAX_REVIVE
@@ -810,9 +810,9 @@
push hl
push de
push bc
- ld a,[$cf06]
+ ld a,[wcf06]
ld c,a
- ld hl,$ccf5
+ ld hl,wccf5
ld b,$02
ld a,$10
call Predef
@@ -819,7 +819,7 @@
ld a,c
and a
jr z,.next
- ld a,[$cf06]
+ ld a,[wcf06]
ld c,a
ld hl,W_PLAYERMONSALIVEFLAGS
ld b,$01
@@ -831,7 +831,7 @@
pop hl
jr .compareCurrentHPToMaxHP
.notFainted
- ld a,[$cf91]
+ ld a,[wcf91]
cp a,REVIVE
jp z,.healingItemNoEffect
cp a,MAX_REVIVE
@@ -851,7 +851,7 @@
pop hl
jr nz,.notFullHP
.fullHP ; if the pokemon's current HP equals its max HP
- ld a,[$cf91]
+ ld a,[wcf91]
cp a,FULL_RESTORE
jp nz,.healingItemNoEffect
inc hl
@@ -860,7 +860,7 @@
and a ; does the pokemon have a status ailment?
jp z,.healingItemNoEffect
ld a,FULL_HEAL
- ld [$cf91],a
+ ld [wcf91],a
dec hl
dec hl
dec hl
@@ -867,8 +867,8 @@
jp .cureStatusAilment
.notFullHP ; if the pokemon's current HP doesn't equal its max HP
xor a
- ld [$d083],a
- ld [$c02a],a
+ ld [wd083],a
+ ld [wc02a],a
push hl
push de
ld bc,32
@@ -876,8 +876,8 @@
ld a,[hli]
ld [wHPBarMaxHP+1],a
ld a,[hl]
- ld [wHPBarMaxHP],a ; max HP stored at $cee9 (2 bytes, big-endian)
- ld a,[$d152]
+ ld [wHPBarMaxHP],a ; max HP stored at wHPBarMaxHP (2 bytes, big-endian)
+ ld a,[wd152]
and a ; using Softboiled?
jp z,.notUsingSoftboiled2
; if using softboiled
@@ -895,7 +895,7 @@
ld bc,44
call AddNTimes
ld a,[hli]
- ld [$ceea],a
+ ld [wHPBarMaxHP + 1],a
ld [H_DIVIDEND],a
ld a,[hl]
ld [wHPBarMaxHP],a
@@ -922,7 +922,7 @@
sbc b
ld [hl],a
ld [wHPBarNewHP+1],a
- FuncCoord 4, 1 ; $c3b8
+ FuncCoord 4, 1
ld hl,Coord
ld a,[wWhichPokemon]
ld bc,2 * 20
@@ -933,7 +933,7 @@
set 0,a
ld [$fff6],a
ld a,$02
- ld [$cf94],a
+ ld [wListMenuID],a
ld a,$48
call Predef ; animate HP bar decrease of pokemon that used Softboiled
ld a,[$fff6]
@@ -941,7 +941,7 @@
ld [$fff6],a
pop af
ld b,a ; store heal amount (1/5 of max HP)
- ld hl,$ceec
+ ld hl,wHPBarOldHP + 1
pop af
ld [hld],a
pop af
@@ -952,7 +952,7 @@
ld [hl],a
jr .addHealAmount
.notUsingSoftboiled2
- ld a,[$cf91]
+ ld a,[wcf91]
cp a,SODA_POP
ld b,60 ; Soda Pop heal amount
jr z,.addHealAmount
@@ -979,7 +979,7 @@
jr nc,.noCarry
inc [hl]
ld a,[hl]
- ld [$ceee],a
+ ld [wHPBarNewHP + 1],a
.noCarry
push de
inc hl
@@ -987,7 +987,7 @@
ld e,l ; de now points to current HP
ld hl,33
add hl,de ; hl now points to max HP
- ld a,[$cf91]
+ ld a,[wcf91]
cp a,REVIVE
jr z,.setCurrentHPToHalfMaxHP
ld a,[hld]
@@ -999,7 +999,7 @@
ld a,[de]
sbc b
jr nc,.setCurrentHPToMaxHp ; if current HP exceeds max HP after healing
- ld a,[$cf91]
+ ld a,[wcf91]
cp a,HYPER_POTION
jr c,.setCurrentHPToMaxHp ; if using a Full Restore or Max Potion
cp a,MAX_REVIVE
@@ -1029,7 +1029,7 @@
ld [wHPBarNewHP],a
dec de
.doneHealingPartyHP ; done updating the pokemon's current HP in the party data structure
- ld a,[$cf91]
+ ld a,[wcf91]
cp a,FULL_RESTORE
jr nz,.updateInBattleData
ld bc,-31
@@ -1048,13 +1048,13 @@
ld [W_PLAYERMONCURHP],a
ld a,[hld]
ld [W_PLAYERMONCURHP + 1],a
- ld a,[$cf91]
+ ld a,[wcf91]
cp a,FULL_RESTORE
jr nz,.calculateHPBarCoords
xor a
ld [W_PLAYERMONSTATUS],a ; remove the status ailment in the in-battle pokemon data
.calculateHPBarCoords
- ld hl,$c390
+ ld hl,wOAMBuffer + $90
ld bc,2 * 20
inc d
.calculateHPBarCoordsLoop
@@ -1066,7 +1066,7 @@
call ItemUseNoEffect
jp .done
.doneHealing
- ld a,[$d152]
+ ld a,[wd152]
and a ; using Softboiled?
jr nz,.skipRemovingItem ; no item to remove if using Softboiled
push hl
@@ -1073,7 +1073,7 @@
call RemoveUsedItem
pop hl
.skipRemovingItem
- ld a,[$cf91]
+ ld a,[wcf91]
cp a,FULL_RESTORE
jr c,.playStatusAilmentCuringSound
cp a,FULL_HEAL
@@ -1084,7 +1084,7 @@
set 0,a
ld [$fff6],a
ld a,$02
- ld [$cf94],a
+ ld [wListMenuID],a
ld a,$48
call Predef ; animate the HP bar lengthening
ld a,[$fff6]
@@ -1091,14 +1091,14 @@
res 0,a
ld [$fff6],a
ld a,$f7 ; revived message
- ld [$d07d],a
- ld a,[$cf91]
+ ld [wd07d],a
+ ld a,[wcf91]
cp a,REVIVE
jr z,.showHealingItemMessage
cp a,MAX_REVIVE
jr z,.showHealingItemMessage
ld a,$f5 ; standard HP healed message
- ld [$d07d],a
+ ld [wd07d],a
jr .showHealingItemMessage
.playStatusAilmentCuringSound
ld a,(SFX_02_3e - SFX_Headers_02) / 3 ; status ailment curing sound
@@ -1108,7 +1108,7 @@
ld [H_AUTOBGTRANSFERENABLED],a
call ClearScreen
dec a
- ld [$cfcb],a
+ ld [wcfcb],a
call RedrawPartyMenu ; redraws the party menu and displays the message
ld a,1
ld [H_AUTOBGTRANSFERENABLED],a
@@ -1118,11 +1118,11 @@
jr .done
.canceledItemUse
xor a
- ld [$cd6a],a ; item use failed
+ ld [wcd6a],a ; item use failed
pop af
pop af
.done
- ld a,[$d152]
+ ld a,[wd152]
and a ; using Softboiled?
ret nz ; if so, return
call GBPalWhiteOut
@@ -1134,12 +1134,12 @@
.useVitamin
push hl
ld a,[hl]
- ld [$d0b5],a
- ld [$d11e],a
+ ld [wd0b5],a
+ ld [wd11e],a
ld bc,33
add hl,bc ; hl now points to level
ld a,[hl] ; a = level
- ld [$d127],a ; store level
+ ld [W_CURENEMYLVL],a ; store level
call GetMonHeader
push de
ld a,d
@@ -1147,7 +1147,7 @@
call GetPartyMonName
pop de
pop hl
- ld a,[$cf91]
+ ld a,[wcf91]
cp a,RARE_CANDY
jp z,.useRareCandy
push hl
@@ -1173,7 +1173,7 @@
pop hl
call .recalculateStats
ld hl,VitaminText
- ld a,[$cf91]
+ ld a,[wcf91]
sub a,HP_UP - 1
ld c,a
.statNameLoop ; loop to get the address of the name of the stat the vitamin increases
@@ -1187,9 +1187,9 @@
jr nz,.statNameInnerLoop
jr .statNameLoop
.gotStatName
- ld de,$cf4b
+ ld de,wcf4b
ld bc,10
- call CopyData ; copy the stat's name to $cf4b
+ call CopyData ; copy the stat's name to wcf4b
ld a,(SFX_02_3e - SFX_Headers_02) / 3
call PlaySound ; play sound
ld hl,VitaminStatRoseText
@@ -1218,7 +1218,7 @@
jr z,.vitaminNoEffect ; can't raise level above 100
inc a
ld [hl],a ; store incremented level
- ld [$d127],a
+ ld [W_CURENEMYLVL],a
push hl
push de
ld d,a
@@ -1237,7 +1237,7 @@
pop hl
ld a,[wWhichPokemon]
push af
- ld a,[$cf91]
+ ld a,[wcf91]
push af
push de
push hl
@@ -1270,30 +1270,30 @@
adc b
ld [hl],a
ld a,$f8 ; level up message
- ld [$d07d],a
+ ld [wd07d],a
call RedrawPartyMenu
pop de
ld a,d
ld [wWhichPokemon],a
ld a,e
- ld [$d11e],a
+ ld [wd11e],a
xor a
- ld [$cc49],a ; load from player's party
+ ld [wcc49],a ; load from player's party
call LoadMonData
ld d,$01
callab PrintStatsBox ; display new stats text box
call WaitForTextScrollButtonPress ; wait for button press
xor a
- ld [$cc49],a
+ ld [wcc49],a
ld a,$1a
call Predef ; learn level up move, if any
xor a
- ld [$ccd4],a
+ ld [wccd4],a
callab Func_3ad0e ; evolve pokemon, if appropriate
ld a,$01
- ld [$cfcb],a
+ ld [wcfcb],a
pop af
- ld [$cf91],a
+ ld [wcf91],a
pop af
ld [wWhichPokemon],a
jp RemoveUsedItem
@@ -1316,17 +1316,17 @@
ItemUseBait: ; df52 (3:5f52)
ld hl,ThrewBaitText
call PrintText
- ld hl,$d007 ; catch rate
+ ld hl,wd007 ; catch rate
srl [hl] ; halve catch rate
ld a,BAIT_ANIM
- ld hl,$cce9 ; bait factor
- ld de,$cce8 ; escape factor
+ ld hl,wcce9 ; bait factor
+ ld de,wcce8 ; escape factor
jr BaitRockCommon
ItemUseRock: ; df67 (3:5f67)
ld hl,ThrewRockText
call PrintText
- ld hl,$d007 ; catch rate
+ ld hl,wd007 ; catch rate
ld a,[hl]
add a ; double catch rate
jr nc,.noCarry
@@ -1334,13 +1334,13 @@
.noCarry
ld [hl],a
ld a,ROCK_ANIM
- ld hl,$cce8 ; escape factor
- ld de,$cce9 ; bait factor
+ ld hl,wcce8 ; escape factor
+ ld de,wcce9 ; bait factor
BaitRockCommon: ; df7f (3:5f7f)
ld [W_ANIMATIONID],a
xor a
- ld [$cc5b],a
+ ld [wcc5b],a
ld [H_WHOSETURN],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
@@ -1386,20 +1386,20 @@
jr z,.notUsable
cp b
jr nz,.loop
- ld hl,$d732
+ ld hl,wd732
set 3,[hl]
set 6,[hl]
- ld hl,$d72e
+ ld hl,wd72e
res 4,[hl]
- ld hl,$d790
+ ld hl,wd790
res 7,[hl] ; unset Safari Zone bit
xor a
- ld [$da47],a
+ ld [W_NUMSAFARIBALLS],a
ld [W_SAFARIZONEENTRANCECURSCRIPT],a
inc a
- ld [$d078],a
- ld [$cd6a],a ; item used
- ld a,[$d152]
+ ld [wd078],a
+ ld [wcd6a],a ; item used
+ ld a,[wd152]
and a ; using Dig?
ret nz ; if so, return
call ItemUseReloadOverworldData
@@ -1421,7 +1421,7 @@
and a
jp nz,ItemUseNotTime
ld a,b
- ld [$d0db],a
+ ld [wd0db],a
jp PrintItemUseTextAndRemoveItem
; handles X Accuracy item
@@ -1437,7 +1437,7 @@
; The Card Key is handled in a different way.
ItemUseCardKey: ; e022 (3:6022)
xor a
- ld [$d71f],a
+ ld [wd71f],a
call Func_c586
ld a,[Func_c586] ; $4586
cp a,$18
@@ -1469,7 +1469,7 @@
cp e
jr nz,.nextEntry3
ld a,[hl]
- ld [$d71f],a
+ ld [wd71f],a
jr .done
.nextEntry1
inc hl
@@ -1481,7 +1481,7 @@
.done
ld hl,ItemUseText00
call PrintText
- ld hl,$d728
+ ld hl,wd728
set 7,[hl]
ret
@@ -1531,7 +1531,7 @@
dec a
jp nz,ItemUseNotTime
ld a,$01
- ld [$d078],a
+ ld [wd078],a
jp PrintItemUseTextAndRemoveItem
ItemUseGuardSpec: ; e0dc (3:60dc)
@@ -1564,7 +1564,7 @@
jr nz,.inBattle
call ItemUseNotTime
ld a,2
- ld [$cd6a],a ; item not used
+ ld [wcd6a],a ; item not used
ret
.inBattle
ld hl,W_PLAYERMOVENUM
@@ -1573,7 +1573,7 @@
ld a,[hl]
push af ; save [W_PLAYERMOVEEFFECT]
push hl
- ld a,[$cf91]
+ ld a,[wcf91]
sub a,X_ATTACK - ATTACK_UP1_EFFECT
ld [hl],a ; store player move effect
call PrintItemUseTextAndRemoveItem
@@ -1600,7 +1600,7 @@
ld a,[W_CURMAP]
cp a,ROUTE_12
jr nz,.notRoute12
- ld a,[$d7d8]
+ ld a,[wd7d8]
bit 7,a ; has the player beaten Route 12 Snorlax yet?
jr nz,.noSnorlaxToWakeUp
; if the player hasn't beaten Route 12 Snorlax
@@ -1609,13 +1609,13 @@
jr nc,.noSnorlaxToWakeUp
ld hl,PlayedFluteHadEffectText
call PrintText
- ld hl,$d7d8
+ ld hl,wd7d8
set 6,[hl] ; trigger Snorlax fight (handled by map script)
ret
.notRoute12
cp a,ROUTE_16
jr nz,.noSnorlaxToWakeUp
- ld a,[$d7e0]
+ ld a,[wd7e0]
bit 1,a ; has the player beaten Route 16 Snorlax yet?
jr nz,.noSnorlaxToWakeUp
; if the player hasn't beaten Route 16 Snorlax
@@ -1624,7 +1624,7 @@
jr nc,.noSnorlaxToWakeUp
ld hl,PlayedFluteHadEffectText
call PrintText
- ld hl,$d7e0
+ ld hl,wd7e0
set 0,[hl] ; trigger Snorlax fight (handled by map script)
ret
.noSnorlaxToWakeUp
@@ -1632,7 +1632,7 @@
jp PrintText
.inBattle
xor a
- ld [$cd3d],a ; initialize variable that indicates if any pokemon were woken up to zero
+ ld [wWhichTrade],a ; initialize variable that indicates if any pokemon were woken up to zero
ld b,~SLP & $FF
ld hl,W_PARTYMON1_STATUS
call WakeUpEntireParty
@@ -1640,7 +1640,7 @@
dec a ; is it a trainer battle?
jr z,.skipWakingUpEnemyParty
; if it's a trainer battle
- ld hl,$d8a8 ; enemy party pokemon 1 status
+ ld hl,wd8a8 ; enemy party pokemon 1 status
call WakeUpEntireParty
.skipWakingUpEnemyParty
ld hl,W_PLAYERMONSTATUS
@@ -1652,7 +1652,7 @@
and b ; remove Sleep status
ld [hl],a
call LoadScreenTilesFromBuffer2 ; restore saved screen
- ld a,[$cd3d]
+ ld a,[wWhichTrade]
and a ; were any pokemon asleep before playing the flute?
ld hl,PlayedFluteNoEffectText
jp z,PrintText ; if no pokemon were asleep
@@ -1659,13 +1659,13 @@
; if some pokemon were asleep
ld hl,PlayedFluteHadEffectText
call PrintText
- ld a,[$d083]
+ ld a,[wd083]
and a,$80
jr nz,.skipMusic
call WaitForSoundToFinish ; wait for sound to end
callba Music_PokeFluteInBattle ; play in-battle pokeflute music
.musicWaitLoop ; wait for music to finish playing
- ld a,[$c02c]
+ ld a,[wc02c]
and a ; music off?
jr nz,.musicWaitLoop
.skipMusic
@@ -1676,9 +1676,9 @@
; INPUT:
; hl must point to status of first pokemon in party (player's or enemy's)
; b must equal ~SLP
-; [$cd3d] should be initialized to 0
+; [wWhichTrade] should be initialized to 0
; OUTPUT:
-; [$cd3d]: set to 1 if any pokemon were asleep
+; [wWhichTrade]: set to 1 if any pokemon were asleep
WakeUpEntireParty: ; e1e5 (3:61e5)
ld de,44
ld c,6
@@ -1688,7 +1688,7 @@
and a,SLP ; is pokemon asleep?
jr z,.notAsleep
ld a,1
- ld [$cd3d],a ; indicate that a pokemon had to be woken up
+ ld [wWhichTrade],a ; indicate that a pokemon had to be woken up
.notAsleep
pop af
and b ; remove Sleep status
@@ -1738,7 +1738,7 @@
ld c, BANK(SFX_02_5e)
call PlayMusic ; play music
.musicWaitLoop ; wait for music to finish playing
- ld a,[$c028]
+ ld a,[wc028]
cp a,$b8
jr z,.musicWaitLoop
call Func_2307 ; start playing normal music again
@@ -1797,13 +1797,13 @@
call ReadSuperRodData ; 0xe8ea
ld a, e
RodResponse: ; e28d (3:628d)
- ld [$CD3D], a
+ ld [wWhichTrade], a
dec a ; is there a bite?
jr nz, .next
; if yes, store level and species data
ld a, 1
- ld [$D05F], a
+ ld [W_MOVEMISSED], a
ld a, b ; level
ld [W_CURENEMYLVL], a
ld a, c ; species
@@ -1810,7 +1810,7 @@
ld [W_CUROPPONENT], a
.next
- ld hl, $D700
+ ld hl, wd700
ld a, [hl] ; store the value in a
push af
push hl
@@ -1832,7 +1832,7 @@
.notInBattle
call IsNextTileShoreOrWater
ret c
- ld a,[$d700]
+ ld a,[wd700]
cp a,2 ; Surfing?
jr z,.surfing
call ItemUseReloadOverworldData
@@ -1887,24 +1887,24 @@
ItemUsePPRestore: ; e31e (3:631e)
ld a,[wWhichPokemon]
push af
- ld a,[$cf91]
- ld [$cd3d],a
+ ld a,[wcf91]
+ ld [wWhichTrade],a
.chooseMon
xor a
- ld [$cfcb],a
+ ld [wcfcb],a
ld a,$01 ; item use party menu
- ld [$d07d],a
+ ld [wd07d],a
call DisplayPartyMenu
jr nc,.chooseMove
jp .itemNotUsed
.chooseMove
- ld a,[$cd3d]
+ ld a,[wWhichTrade]
cp a,ELIXER
jp nc,.useElixir ; if Elixir or Max Elixir
ld a,$02
ld [wMoveMenuType],a
ld hl,RaisePPWhichTechniqueText
- ld a,[$cd3d]
+ ld a,[wWhichTrade]
cp a,ETHER ; is it a PP Up?
jr c,.printWhichTechniqueMessage ; if so, print the raise PP message
ld hl,RestorePPWhichTechniqueText ; otherwise, print the restore PP message
@@ -1911,10 +1911,10 @@
.printWhichTechniqueMessage
call PrintText
xor a
- ld [$cc2e],a
+ ld [wPlayerMoveListIndex],a
callab MoveSelectionMenu ; move selection menu
ld a,0
- ld [$cc2e],a
+ ld [wPlayerMoveListIndex],a
jr nz,.chooseMon
ld hl,W_PARTYMON1_MOVE1
ld bc,44
@@ -1921,11 +1921,11 @@
call GetSelectedMoveOffset
push hl
ld a,[hl]
- ld [$d11e],a
+ ld [wd11e],a
call GetMoveName
- call CopyStringToCF4B ; copy name to $cf4b
+ call CopyStringToCF4B ; copy name to wcf4b
pop hl
- ld a,[$cd3d]
+ ld a,[wWhichTrade]
cp a,ETHER
jr nc,.useEther ; if Ether or Max Ether
.usePPUp
@@ -1942,7 +1942,7 @@
add a,1 << 6 ; increase PP Up count by 1
ld [hl],a
ld a,1 ; 1 PP Up used
- ld [$d11e],a
+ ld [wd11e],a
call RestoreBonusPP ; add the bonus PP to current PP
ld hl,PPIncreasedText
call PrintText
@@ -1978,7 +1978,7 @@
; however, this is bugged for Max Ethers and Max Elixirs (see below)
.restorePP
xor a
- ld [$cc49],a ; party pokemon
+ ld [wcc49],a ; party pokemon
call GetMaxPP
ld hl,W_PARTYMON1_MOVE1
ld bc,44
@@ -1985,9 +1985,9 @@
call GetSelectedMoveOffset
ld bc,21
add hl,bc ; hl now points to move's PP
- ld a,[$d11e]
+ ld a,[wd11e]
ld b,a ; b = max PP
- ld a,[$cd3d]
+ ld a,[wWhichTrade]
cp a,MAX_ETHER
jr z,.fullyRestorePP
ld a,[hl] ; move PP
@@ -2019,7 +2019,7 @@
jr .storeNewAmount
.useElixir
; decrement the item ID so that ELIXER becomes ETHER and MAX_ELIXER becomes MAX_ETHER
- ld hl,$cd3d
+ ld hl,wWhichTrade
dec [hl]
dec [hl]
xor a
@@ -2039,7 +2039,7 @@
call .restorePP
jr z,.nextMove
; if some PP was restored
- ld hl,$cc27 ; counter for number of moves that had their PP restored
+ ld hl,wTileBehindCursor ; counter for number of moves that had their PP restored
inc [hl]
.nextMove
ld hl,wCurrentMenuItem
@@ -2047,7 +2047,7 @@
pop bc
dec b
jr nz,.elixirLoop
- ld a,[$cc27]
+ ld a,[wTileBehindCursor]
and a ; did any moves have their PP restored?
jp nz,.afterRestoringPP
.noEffect
@@ -2057,7 +2057,7 @@
call GoPAL_SET_CF1C
pop af
xor a
- ld [$cd6a],a ; item use failed
+ ld [wcd6a],a ; item use failed
ret
RaisePPWhichTechniqueText: ; e45d (3:645d)
@@ -2088,7 +2088,7 @@
ld a,[W_ISINBATTLE]
and a
jp nz,ItemUseNotTime
- ld a,[$cf91]
+ ld a,[wcf91]
sub a,TM_01
push af
jr nc,.skipAdding
@@ -2095,13 +2095,13 @@
add a,55 ; if item is an HM, add 55
.skipAdding
inc a
- ld [$d11e],a
+ ld [wd11e],a
ld a,$44
call Predef ; get move ID from TM/HM ID
- ld a,[$d11e]
- ld [$d0e0],a
+ ld a,[wd11e]
+ ld [wd0e0],a
call GetMoveName
- call CopyStringToCF4B ; copy name to $cf4b
+ call CopyStringToCF4B ; copy name to wcf4b
pop af
ld hl,BootedUpTMText
jr nc,.printBootedUpMachineText
@@ -2114,32 +2114,32 @@
ld hl,Coord
ld bc,$080f
ld a,$14
- ld [$d125],a
+ ld [wd125],a
call DisplayTextBoxID ; yes/no menu
ld a,[wCurrentMenuItem]
and a
jr z,.useMachine
ld a,2
- ld [$cd6a],a ; item not used
+ ld [wcd6a],a ; item not used
ret
.useMachine
ld a,[wWhichPokemon]
push af
- ld a,[$cf91]
+ ld a,[wcf91]
push af
.chooseMon
- ld hl,$cf4b
- ld de,$d036
+ ld hl,wcf4b
+ ld de,wd036
ld bc,14
call CopyData
ld a,$ff
- ld [$cfcb],a
+ ld [wcfcb],a
ld a,$03 ; teach TM/HM party menu
- ld [$d07d],a
+ ld [wd07d],a
call DisplayPartyMenu
push af
- ld hl,$d036
- ld de,$cf4b
+ ld hl,wd036
+ ld de,wcf4b
ld bc,14
call CopyData
pop af
@@ -2174,13 +2174,13 @@
ld a,$1b
call Predef ; teach move
pop af
- ld [$cf91],a
+ ld [wcf91],a
pop af
ld [wWhichPokemon],a
ld a,b
and a
ret z
- ld a,[$cf91]
+ ld a,[wcf91]
call IsItemHM
ret c
jp RemoveUsedItem
@@ -2211,7 +2211,7 @@
RemoveUsedItem: ; e571 (3:6571)
ld hl,wNumBagItems
ld a,1 ; one item
- ld [$cf96],a ; store quantity
+ ld [wcf96],a ; store quantity
jp RemoveItemFromInventory
ItemUseNoEffect: ; e57c (3:657c)
@@ -2253,7 +2253,7 @@
ItemUseFailed: ; e5b9 (3:65b9)
xor a
- ld [$cd6a],a ; item use failed
+ ld [wcd6a],a ; item use failed
jp PrintText
ItemUseNotTimeText: ; e5c0 (3:65c0)
@@ -2310,7 +2310,7 @@
; also, when a PP Up is used, it increases the current PP by one PP Up bonus
; INPUT:
; [wWhichPokemon] = index of pokemon in party
-; [$d11e] = mode
+; [wd11e] = mode
; 0: Pokemon Center healing
; 1: using a PP Up
; [wCurrentMenuItem] = index of move (when using a PP Up)
@@ -2320,14 +2320,14 @@
ld a,[wWhichPokemon]
call AddNTimes
push hl
- ld de,$cd78 - 1
+ ld de,wcd78 - 1
ld a,$5e
- call Predef ; loads the normal max PP of each of the pokemon's moves to $cd78
+ call Predef ; loads the normal max PP of each of the pokemon's moves to wcd78
pop hl
ld c,21
ld b,0
add hl,bc ; hl now points to move 1 PP
- ld de,$cd78
+ ld de,wcd78
ld b,0 ; initialize move counter to zero
; loop through the pokemon's moves
.loop
@@ -2335,7 +2335,7 @@
ld a,b
cp a,5 ; reached the end of the pokemon's moves?
ret z ; if so, return
- ld a,[$d11e]
+ ld a,[wd11e]
dec a ; using a PP Up?
jr nz,.skipMenuItemIDCheck
; if using a PP Up, check if this is the move it's being used on
@@ -2357,7 +2357,7 @@
; INPUT:
; [de] = normal max PP
; [hl] = move PP
-; [$d11e] = max number of times to add bonus
+; [wd11e] = max number of times to add bonus
; set to 1 when using a PP Up, set to 255 otherwise
AddBonusPP: ; e642 (3:6642)
push bc
@@ -2386,7 +2386,7 @@
.addAmount
add b
ld b,a
- ld a,[$d11e]
+ ld a,[wd11e]
dec a
jr z,.done
dec c
@@ -2399,7 +2399,7 @@
; gets max PP of a pokemon's move (including PP from PP Ups)
; INPUT:
; [wWhichPokemon] = index of pokemon within party/box
-; [$cc49] = pokemon source
+; [wcc49] = pokemon source
; 00: player's party
; 01: enemy's party
; 02: current box
@@ -2407,21 +2407,21 @@
; 04: player's in-battle pokemon
; [wCurrentMenuItem] = move index
; OUTPUT:
-; [$d11e] = max PP
+; [wd11e] = max PP
GetMaxPP: ; e677 (3:6677)
- ld a,[$cc49]
+ ld a,[wcc49]
and a
ld hl,W_PARTYMON1_MOVE1
ld bc,44
jr z,.sourceWithMultipleMon
- ld hl,$d8ac ; enemy party
+ ld hl,wd8ac ; enemy party
dec a
jr z,.sourceWithMultipleMon
- ld hl,$da9e ; current box
+ ld hl,wda9e ; current box
ld bc,33
dec a
jr z,.sourceWithMultipleMon
- ld hl,$da67 ; daycare
+ ld hl,wda67 ; daycare
dec a
jr z,.sourceWithOneMon
ld hl,W_PLAYERMONMOVES ; player's in-battle pokemon
@@ -2437,16 +2437,16 @@
ld hl,Moves
ld bc,6
call AddNTimes
- ld de,$cd6d
+ ld de,wcd6d
ld a,BANK(Moves)
call FarCopyData
- ld de,$cd72
+ ld de,wcd72
ld a,[de]
ld b,a ; b = normal max PP
pop hl
push bc
ld bc,21 ; PP offset if not player's in-battle pokemon data
- ld a,[$cc49]
+ ld a,[wcc49]
cp a,4 ; player's in-battle pokemon?
jr nz,.addPPOffset
ld bc,17 ; PP offset if player's in-battle pokemon data
@@ -2458,14 +2458,14 @@
or b ; place normal max PP in 6 lower bits of a
ld h,d
ld l,e
- inc hl ; hl = $cd73
+ inc hl ; hl = wcd73
ld [hl],a
xor a
- ld [$d11e],a ; no limit on PP Up amount
+ ld [wd11e],a ; no limit on PP Up amount
call AddBonusPP ; add bonus PP from PP Ups
ld a,[hl]
and a,%00111111 ; mask out the PP Up count
- ld [$d11e],a ; store max PP
+ ld [wd11e],a ; store max PP
ret
GetSelectedMoveOffset: ; e6e3 (3:66e3)
@@ -2482,28 +2482,28 @@
; confirms the item toss and then tosses the item
; INPUT:
; hl = address of inventory (either wNumBagItems or wNumBoxItems)
-; [$cf91] = item ID
+; [wcf91] = item ID
; [wWhichPokemon] = index of item within inventory
-; [$cf96] = quantity to toss
+; [wcf96] = quantity to toss
; OUTPUT:
; clears carry flag if the item is tossed, sets carry flag if not
TossItem_: ; e6f1 (3:66f1)
push hl
- ld a,[$cf91]
+ ld a,[wcf91]
call IsItemHM
pop hl
jr c,.tooImportantToToss
push hl
call IsKeyItem_
- ld a,[$d124]
+ ld a,[wd124]
pop hl
and a
jr nz,.tooImportantToToss
push hl
- ld a,[$cf91]
- ld [$d11e],a
+ ld a,[wcf91]
+ ld [wd11e],a
call GetItemName
- call CopyStringToCF4B ; copy name to $cf4b
+ call CopyStringToCF4B ; copy name to wcf4b
ld hl,IsItOKToTossItemText
call PrintText
FuncCoord 14,7
@@ -2510,9 +2510,9 @@
ld hl,Coord
ld bc,$080f
ld a,$14
- ld [$d125],a
+ ld [wd125],a
call DisplayTextBoxID ; yes/no menu
- ld a,[$d12e]
+ ld a,[wd12e]
cp a,2
pop hl
scf
@@ -2521,10 +2521,10 @@
push hl
ld a,[wWhichPokemon]
call RemoveItemFromInventory
- ld a,[$cf91]
- ld [$d11e],a
+ ld a,[wcf91]
+ ld [wd11e],a
call GetItemName
- call CopyStringToCF4B ; copy name to $cf4b
+ call CopyStringToCF4B ; copy name to wcf4b
ld hl,ThrewAwayItemText
call PrintText
pop hl
@@ -2552,27 +2552,27 @@
; checks if an item is a key item
; INPUT:
-; [$cf91] = item ID
+; [wcf91] = item ID
; OUTPUT:
-; [$d124] = result
+; [wd124] = result
; 00: item is not key item
; 01: item is key item
IsKeyItem_: ; e764 (3:6764)
ld a,$01
- ld [$d124],a
- ld a,[$cf91]
+ ld [wd124],a
+ ld a,[wcf91]
cp a,HM_01 ; is the item an HM or TM?
jr nc,.checkIfItemIsHM
; if the item is not an HM or TM
push af
ld hl,KeyItemBitfield
- ld de,$cee9
+ ld de,wHPBarMaxHP
ld bc,15 ; only 11 bytes are actually used
call CopyData
pop af
dec a
ld c,a
- ld hl,$cee9
+ ld hl,wHPBarMaxHP
ld b,$02 ; test bit
ld a,$10
call Predef ; bitfield operation function
@@ -2580,22 +2580,22 @@
and a
ret nz
.checkIfItemIsHM
- ld a,[$cf91]
+ ld a,[wcf91]
call IsItemHM
ret c
xor a
- ld [$d124],a
+ ld [wd124],a
ret
INCLUDE "data/key_items.asm"
Func_e7a4: ; e7a4 (3:67a4)
- ld de, W_NUMINBOX ; $da80
+ ld de, W_NUMINBOX ; wda80
ld a, [de]
inc a
ld [de], a
- ld a, [$cf91]
- ld [$d0b5], a
+ ld a, [wcf91]
+ ld [wd0b5], a
ld c, a
.asm_e7b1
inc de
@@ -2609,7 +2609,7 @@
call GetMonHeader
ld hl, W_BOXMON1OT
ld bc, $b
- ld a, [W_NUMINBOX] ; $da80
+ ld a, [W_NUMINBOX] ; wda80
dec a
jr z, .asm_e7ee
dec a
@@ -2620,7 +2620,7 @@
ld d, h
ld e, l
pop hl
- ld a, [W_NUMINBOX] ; $da80
+ ld a, [W_NUMINBOX] ; wda80
dec a
ld b, a
.asm_e7db
@@ -2637,11 +2637,11 @@
dec b
jr nz, .asm_e7db
.asm_e7ee
- ld hl, W_PLAYERNAME ; $d158
+ ld hl, W_PLAYERNAME ; wd158
ld de, W_BOXMON1OT
ld bc, $b
call CopyData
- ld a, [W_NUMINBOX] ; $da80
+ ld a, [W_NUMINBOX] ; wda80
dec a
jr z, .asm_e82a
ld hl, W_BOXMON1NAME
@@ -2654,7 +2654,7 @@
ld d, h
ld e, l
pop hl
- ld a, [W_NUMINBOX] ; $da80
+ ld a, [W_NUMINBOX] ; wda80
dec a
ld b, a
.asm_e817
@@ -2673,10 +2673,10 @@
.asm_e82a
ld hl, W_BOXMON1NAME
ld a, $2
- ld [$d07d], a
+ ld [wd07d], a
ld a, $4e
call Predef ; indirect jump to Func_64eb (64eb (1:64eb))
- ld a, [W_NUMINBOX] ; $da80
+ ld a, [W_NUMINBOX] ; wda80
dec a
jr z, .asm_e867
ld hl, W_BOXMON1DATA
@@ -2689,7 +2689,7 @@
ld d, h
ld e, l
pop hl
- ld a, [W_NUMINBOX] ; $da80
+ ld a, [W_NUMINBOX] ; wda80
dec a
ld b, a
.asm_e854
@@ -2706,13 +2706,13 @@
dec b
jr nz, .asm_e854
.asm_e867
- ld a, [W_ENEMYMONLEVEL] ; $cff3
- ld [W_ENEMYMONNUMBER], a ; $cfe8
- ld hl, $cfe5
+ ld a, [W_ENEMYMONLEVEL] ; W_ENEMYMONLEVEL
+ ld [W_ENEMYMONNUMBER], a ; W_ENEMYMONNUMBER
+ ld hl, wcfe5
ld de, W_BOXMON1DATA
ld bc, $c
call CopyData
- ld hl, wPlayerID ; $d359
+ ld hl, wPlayerID ; wPlayerID
ld a, [hli]
ld [de], a
inc de
@@ -2720,7 +2720,7 @@
ld [de], a
inc de
push de
- ld a, [W_CURENEMYLVL] ; $d127
+ ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL
ld d, a
callab CalcExperience
pop de
@@ -2740,13 +2740,13 @@
inc de
dec b
jr nz, .asm_e89f
- ld hl, $cff1
+ ld hl, W_ENEMYMONATKDEFIV
ld a, [hli]
ld [de], a
inc de
ld a, [hli]
ld [de], a
- ld hl, W_ENEMYMONPP ; $cffe
+ ld hl, W_ENEMYMONPP ; wcffe
ld b, $4
.asm_e8b1
ld a, [hli]
@@ -2767,7 +2767,7 @@
jr nc, .notShoreOrWater
ld a, [W_CURMAPTILESET]
cp SHIP_PORT ; Vermilion Dock tileset
- ld a, [$cfc6] ; tile in front of player
+ ld a, [wcfc6] ; tile in front of player
jr z, .skipShoreTiles ; if it's the Vermilion Dock tileset
cp $48 ; eastern shore tile in Safari Zone
jr z, .shoreOrWater
@@ -2843,7 +2843,7 @@
Func_e9cb: ; e9cb (3:69cb)
ld hl, WildDataPointers ; $4eeb
- ld de, $cee9
+ ld de, wHPBarMaxHP
ld c, $0
.asm_e9d3
inc hl
@@ -2874,7 +2874,7 @@
inc hl
ld b, $a
.asm_e9f3
- ld a, [$d11e]
+ ld a, [wd11e]
cp [hl]
jr nz, .asm_e9fc
ld a, c
--- a/engine/items/tm_prices.asm
+++ b/engine/items/tm_prices.asm
@@ -1,5 +1,5 @@
GetMachinePrice: ; 7bf86 (1e:7f86)
- ld a, [$cf91]
+ ld a, [wcf91]
sub TM_01
ret c
ld d, a
--- a/engine/items/tmhm.asm
+++ b/engine/items/tmhm.asm
@@ -1,10 +1,10 @@
-; checks if the mon in wWhichPokemon already knows the move in $d0e0
+; checks if the mon in wWhichPokemon already knows the move in wd0e0
CheckIfMoveIsKnown: ; 2fe18 (b:7e18)
ld a, [wWhichPokemon]
ld hl, W_PARTYMON1_MOVE1
ld bc, $2c
call AddNTimes
- ld a, [$d0e0]
+ ld a, [wd0e0]
ld b, a
ld c, $4 ; nubmer of moves
.loop
--- a/engine/items/tms.asm
+++ b/engine/items/tms.asm
@@ -1,11 +1,11 @@
-; tests if mon [$cf91] can learn move [$d0e0]
+; tests if mon [wcf91] can learn move [wd0e0]
TestMonMoveCompatibility: ; 1373e (4:773e)
- ld a, [$cf91]
- ld [$d0b5], a
+ ld a, [wcf91]
+ ld [wd0b5], a
call GetMonHeader
ld hl, W_MONHLEARNSET
push hl
- ld a, [$d0e0]
+ ld a, [wd0e0]
ld b, a
ld c, $0
ld hl, TechnicalMachines
@@ -21,10 +21,10 @@
ld a, $10 ; FlagActionPredef
jp Predef
-; converts TM/HM number in $d11e into move number
+; converts TM/HM number in wd11e into move number
; HMs start at 51
TMToMove: ; 13763 (4:7763)
- ld a, [$d11e]
+ ld a, [wd11e]
dec a
ld hl, TechnicalMachines
ld b, $0
@@ -31,7 +31,7 @@
ld c, a
add hl, bc
ld a, [hl]
- ld [$d11e], a
+ ld [wd11e], a
ret
INCLUDE "data/tms.asm"
--- a/engine/learn_move.asm
+++ b/engine/learn_move.asm
@@ -1,17 +1,17 @@
LearnMove: ; 6e43 (1:6e43)
call SaveScreenTilesToBuffer1
- ld a, [wWhichPokemon] ; $cf92
- ld hl, W_PARTYMON1NAME ; $d2b5
+ ld a, [wWhichPokemon] ; wWhichPokemon
+ ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
call GetPartyMonName
- ld hl, $cd6d
- ld de, $d036
+ ld hl, wcd6d
+ ld de, wd036
ld bc, $b
call CopyData
DontAbandonLearning: ; 6e5b (1:6e5b)
- ld hl, W_PARTYMON1_MOVE1 ; $d173
+ ld hl, W_PARTYMON1_MOVE1 ; W_PARTYMON1_MOVE1
ld bc, $2c
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
call AddNTimes
ld d, h
ld e, l
@@ -29,7 +29,7 @@
jp c, AbandonLearning
push hl
push de
- ld [$d11e], a
+ ld [wd11e], a
call GetMoveName
ld hl, OneTwoAndText
call PrintText
@@ -36,7 +36,7 @@
pop de
pop hl
.asm_6e8b
- ld a, [$d0e0]
+ ld a, [wd0e0]
ld [hl], a
ld bc, $15
add hl, bc
@@ -46,19 +46,19 @@
ld hl, Moves ; $4000
ld bc, $6
call AddNTimes
- ld de, $cee9
+ ld de, wHPBarMaxHP
ld a, BANK(Moves)
call FarCopyData
- ld a, [$ceee]
+ ld a, [wHPBarNewHP + 1]
pop de
pop hl
ld [hl], a
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
and a
jp z, PrintLearnedMove
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
ld b, a
- ld a, [wPlayerMonNumber] ; $cc2f
+ ld a, [wPlayerMonNumber] ; wPlayerMonNumber
cp b
jp nz, PrintLearnedMove
ld h, d
@@ -68,7 +68,7 @@
call CopyData
ld bc, $11
add hl, bc
- ld de, W_PLAYERMONPP ; $d02d
+ ld de, W_PLAYERMONPP ; W_PLAYERMONPP
ld bc, $4
call CopyData
jp PrintLearnedMove
@@ -76,13 +76,13 @@
AbandonLearning: ; 6eda (1:6eda)
ld hl, AbandonLearningText
call PrintText
- FuncCoord 14, 7 ; $c43a
+ FuncCoord 14, 7
ld hl, Coord
ld bc, $80f
ld a, $14
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
and a
jp nz, DontAbandonLearning
ld hl, DidNotLearnText
@@ -100,20 +100,20 @@
push hl
ld hl, TryingToLearnText
call PrintText
- FuncCoord 14, 7 ; $c43a
+ FuncCoord 14, 7
ld hl, Coord
ld bc, $80f
ld a, $14
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
pop hl
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
rra
ret c
ld bc, $fffc
add hl, bc
push hl
- ld de, $d0dc
+ ld de, wd0dc
ld bc, $4
call CopyData
callab Func_39b87
@@ -122,14 +122,14 @@
push hl
ld hl, WhichMoveToForgetText
call PrintText
- FuncCoord 4, 7 ; $c430
+ FuncCoord 4, 7
ld hl, Coord
ld b, $4
ld c, $e
call TextBoxBorder
- FuncCoord 6, 8 ; $c446
+ FuncCoord 6, 8
ld hl, Coord
- ld de, $d0e1
+ ld de, wd0e1
ld a, [$fff6]
set 2, a
ld [$fff6], a
@@ -137,7 +137,7 @@
ld a, [$fff6]
res 2, a
ld [$fff6], a
- ld hl, wTopMenuItemY ; $cc24
+ ld hl, wTopMenuItemY ; wTopMenuItemY
ld a, $8
ld [hli], a
ld a, $5
@@ -145,7 +145,7 @@
xor a
ld [hli], a
inc hl
- ld a, [$cd6c]
+ ld a, [wcd6c]
ld [hli], a
ld a, $3
ld [hli], a
@@ -162,7 +162,7 @@
bit 1, a
jr nz, .asm_6fab
push hl
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
ld c, a
ld b, $0
add hl, bc
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -2,13 +2,13 @@
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
call SaveScreenTilesToBuffer2
- ld a, [$d5a2]
+ ld a, [wd5a2]
and a
jr nz, .asm_213f3
- ld a, [$d74b]
+ ld a, [wd74b]
bit 5, a
jr z, .asm_213ea
- ld a, [$d5a2]
+ ld a, [wd5a2]
and a
jr nz, .asm_213f3
ld hl, wTileMap
@@ -28,70 +28,70 @@
call TextBoxBorder
call UpdateSprites
ld a, $3
- ld [wMaxMenuItem], a ; $cc28
- ld a, [$d7f1]
+ ld [wMaxMenuItem], a ; wMaxMenuItem
+ ld a, [wd7f1]
bit 0, a
jr nz, .asm_21414
- FuncCoord 2, 2 ; $c3ca
+ FuncCoord 2, 2
ld hl, Coord
ld de, SomeonesPCText ; $548b
jr .asm_2141a
.asm_21414
- FuncCoord 2, 2 ; $c3ca
+ FuncCoord 2, 2
ld hl, Coord
ld de, BillsPCText ; $5497
.asm_2141a
call PlaceString
- FuncCoord 2, 4 ; $c3f2
+ FuncCoord 2, 4
ld hl, Coord
- ld de, W_PLAYERNAME ; $d158
+ ld de, W_PLAYERNAME ; wd158
call PlaceString
ld l, c
ld h, b
ld de, PlayersPCText ; $54a0
call PlaceString
- ld a, [$d74b]
+ ld a, [wd74b]
bit 5, a
jr z, .asm_21462
- FuncCoord 2, 6 ; $c41a
+ FuncCoord 2, 6
ld hl, Coord
ld de, OaksPCText ; $54a5
call PlaceString
- ld a, [$d5a2]
+ ld a, [wd5a2]
and a
jr z, .asm_2145a
ld a, $4
- ld [wMaxMenuItem], a ; $cc28
- FuncCoord 2, 8 ; $c442
+ ld [wMaxMenuItem], a ; wMaxMenuItem
+ FuncCoord 2, 8
ld hl, Coord
ld de, PKMNLeaguePCText ; $54b2
call PlaceString
- FuncCoord 2, 10 ; $c46a
+ FuncCoord 2, 10
ld hl, Coord
ld de, LogOffPCText ; $54ba
jr .asm_2146d
.asm_2145a
- FuncCoord 2, 8 ; $c442
+ FuncCoord 2, 8
ld hl, Coord
ld de, LogOffPCText ; $54ba
jr .asm_2146d
.asm_21462
ld a, $2
- ld [wMaxMenuItem], a ; $cc28
- FuncCoord 2, 6 ; $c41a
+ ld [wMaxMenuItem], a ; wMaxMenuItem
+ FuncCoord 2, 6
ld hl, Coord
ld de, LogOffPCText ; $54ba
.asm_2146d
call PlaceString
ld a, $3
- ld [wMenuWatchedKeys], a ; $cc29
+ ld [wMenuWatchedKeys], a ; wMenuWatchedKeys
ld a, $2
- ld [wTopMenuItemY], a ; $cc24
+ ld [wTopMenuItemY], a ; wTopMenuItemY
ld a, $1
- ld [wTopMenuItemX], a ; $cc25
+ ld [wTopMenuItemX], a ; wTopMenuItemX
xor a
- ld [wCurrentMenuItem], a ; $cc26
- ld [wLastMenuItem], a ; $cc2a
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld [wLastMenuItem], a ; wLastMenuItem
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
ret
@@ -116,14 +116,14 @@
Func_214c2:: ; 214c2 (8:54c2)
BillsPC_:: ; 0x214c2
- ld hl, $d730
+ ld hl, wd730
set 6, [hl]
xor a
- ld [$ccd3], a
+ ld [wccd3], a
inc a ; MONSTER_NAME
ld [W_LISTTYPE], a
call LoadHpBarAndStatusTilePatterns
- ld a, [wListScrollOffset] ; $cc36
+ ld a, [wListScrollOffset] ; wcc36
push af
ld a, [wFlags_0xcd60]
bit 3, a
@@ -135,8 +135,8 @@
Func_214e8: ; 214e8 (8:54e8)
BillsPCMenu:
- ld a, [$ccd3]
- ld [wCurrentMenuItem], a ; $cc26
+ ld a, [wccd3]
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
ld hl, $9780
ld de, PokeballTileGraphics ; $697e
ld bc, (BANK(PokeballTileGraphics) << 8) + $01
@@ -146,11 +146,11 @@
ld b, $a
ld c, $c
call TextBoxBorder
- FuncCoord 2, 2 ; $c3ca
+ FuncCoord 2, 2
ld hl, Coord
ld de, BillsPCMenuText ; $56e1
call PlaceString
- ld hl, wTopMenuItemY ; $cc24
+ ld hl, wTopMenuItemY ; wTopMenuItemY
ld a, $2
ld [hli], a
dec a
@@ -164,23 +164,23 @@
xor a
ld [hli], a
ld [hli], a
- ld hl, wListScrollOffset ; $cc36
+ ld hl, wListScrollOffset ; wcc36
ld [hli], a
ld [hl], a
- ld [wPlayerMonNumber], a ; $cc2f
+ ld [wPlayerMonNumber], a ; wPlayerMonNumber
ld hl, WhatText
call PrintText
- FuncCoord 9, 14 ; $c4c1
+ FuncCoord 9, 14
ld hl, Coord
ld b, $2
ld c, $9
call TextBoxBorder
- ld a, [$d5a0]
+ ld a, [wd5a0]
and $7f
cp $9
jr c, .asm_2154f
sub $9
- FuncCoord 17, 16 ; $c4f1
+ FuncCoord 17, 16
ld hl, Coord
ld [hl], $f7
add $f6
@@ -188,9 +188,9 @@
.asm_2154f
add $f7
.asm_21551
- FuncCoord 18, 16 ; $c4f2
+ FuncCoord 18, 16
ld [Coord], a
- FuncCoord 10, 16 ; $c4ea
+ FuncCoord 10, 16
ld hl, Coord
ld de, BoxNoPCText ; $5713
call PlaceString
@@ -201,8 +201,8 @@
bit 1, a
jp nz, Func_21588 ; b button
call PlaceUnfilledArrowMenuCursor
- ld a, [wCurrentMenuItem] ; $cc26
- ld [$ccd3], a
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+ ld [wccd3], a
and a
jp z, Func_21618 ; withdraw
cp $1
@@ -225,14 +225,14 @@
res 5, [hl]
call LoadScreenTilesFromBuffer2
pop af
- ld [wListScrollOffset], a ; $cc36
- ld hl, $d730
+ ld [wListScrollOffset], a ; wcc36
+ ld hl, wd730
res 6, [hl]
ret
Func_215ac: ; 215ac (8:55ac)
BillsPCDeposit:
- ld a, [W_NUMINPARTY] ; $d163
+ ld a, [W_NUMINPARTY] ; W_NUMINPARTY
dec a
jr nz, .asm_215bb
ld hl, CantDepositLastMonText
@@ -239,7 +239,7 @@
call PrintText
jp BillsPCMenu
.asm_215bb
- ld a, [W_NUMINBOX] ; $da80
+ ld a, [W_NUMINBOX] ; wda80
cp $14
jr nz, .asm_215cb
ld hl, BoxFullText ; $5802
@@ -246,23 +246,23 @@
call PrintText
jp BillsPCMenu
.asm_215cb
- ld hl, W_NUMINPARTY ; $d163
+ ld hl, W_NUMINPARTY ; W_NUMINPARTY
call Func_216be
jp c, BillsPCMenu
call Func_2174b
jp nc, BillsPCMenu
- ld a, [$cf91]
+ ld a, [wcf91]
call GetCryData
call PlaySoundWaitForCurrent
ld a, $1
- ld [$cf95], a
+ ld [wcf95], a
call Func_3a68
xor a
- ld [$cf95], a
+ ld [wcf95], a
call RemovePokemon
call WaitForSoundToFinish
- ld hl, wWhichTrade ; $cd3d
- ld a, [$d5a0]
+ ld hl, wWhichTrade ; wWhichTrade
+ ld a, [wd5a0]
and $7f
cp $9
jr c, .asm_2160a
@@ -281,7 +281,7 @@
jp BillsPCMenu
Func_21618: ; 21618 (8:5618)
- ld a, [W_NUMINBOX] ; $da80
+ ld a, [W_NUMINBOX] ; wda80
and a
jr nz, .asm_21627
ld hl, NoMonText ; $580c
@@ -288,7 +288,7 @@
call PrintText
jp Func_214e8
.asm_21627
- ld a, [W_NUMINPARTY] ; $d163
+ ld a, [W_NUMINPARTY] ; W_NUMINPARTY
cp $6
jr nz, .asm_21637
ld hl, CantTakeMonText ; $5811
@@ -295,22 +295,22 @@
call PrintText
jp Func_214e8
.asm_21637
- ld hl, W_NUMINBOX ; $da80
+ ld hl, W_NUMINBOX ; wda80
call Func_216be
jp c, Func_214e8
call Func_2174b
jp nc, Func_214e8
- ld a, [wWhichPokemon] ; $cf92
- ld hl, $de06
+ ld a, [wWhichPokemon] ; wWhichPokemon
+ ld hl, W_BOXMON1NAME
call GetPartyMonName
- ld a, [$cf91]
+ ld a, [wcf91]
call GetCryData
call PlaySoundWaitForCurrent
xor a
- ld [$cf95], a
+ ld [wcf95], a
call Func_3a68
ld a, $1
- ld [$cf95], a
+ ld [wcf95], a
call RemovePokemon
call WaitForSoundToFinish
ld hl, MonIsTakenOutText ; $5807
@@ -318,7 +318,7 @@
jp Func_214e8
Func_21673: ; 21673 (8:5673)
- ld a, [W_NUMINBOX] ; $da80
+ ld a, [W_NUMINBOX] ; wda80
and a
jr nz, .asm_21682
ld hl, NoMonText ; $580c
@@ -325,20 +325,20 @@
call PrintText
jp Func_214e8
.asm_21682
- ld hl, W_NUMINBOX ; $da80
+ ld hl, W_NUMINBOX ; wda80
call Func_216be
jp c, Func_214e8
ld hl, OnceReleasedText ; $581b
call PrintText
call YesNoChoice
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
and a
jr nz, .asm_21682
inc a
- ld [$cf95], a
+ ld [wcf95], a
call RemovePokemon
call WaitForSoundToFinish
- ld a, [$cf91]
+ ld a, [wcf91]
call PlayCry
ld hl, MonWasReleasedText ; $5820
call PrintText
@@ -350,19 +350,19 @@
Func_216be: ; 216be (8:56be)
ld a, l
- ld [$cf8b], a
+ ld [wcf8b], a
ld a, h
- ld [$cf8c], a
+ ld [wcf8c], a
xor a
- ld [$cf93], a
- ld [wListMenuID], a ; $cf94
+ ld [wcf93], a
+ ld [wListMenuID], a ; wListMenuID
inc a ; MONSTER_NAME
ld [W_LISTTYPE], a
- ld a, [$cc2b]
- ld [wCurrentMenuItem], a ; $cc26
+ ld a, [wcc2b]
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
call DisplayListMenuID
- ld a, [wCurrentMenuItem] ; $cc26
- ld [$cc2b], a
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+ ld [wcc2b], a
ret
BillsPCMenuText: ; 216e1 (8:56e1)
@@ -372,13 +372,13 @@
db "BOX No.@"
Func_2171b:: ; 2171b (8:571b)
- ld hl, $d173
+ ld hl, W_PARTYMON1_MOVE1
ld bc, $002c
jr .asm_21729 ; 0x21721 $6
- ld hl, $da9e
+ ld hl, wda9e
ld bc, $0021
.asm_21729
- ld a, [$cf92]
+ ld a, [wWhichPokemon]
call AddNTimes
ld b, $4
.asm_21731
@@ -405,25 +405,25 @@
db $ff
Func_2174b: ; 2174b (8:574b)
- FuncCoord 9, 10 ; $c471
+ FuncCoord 9, 10
ld hl, Coord
ld b, $6
ld c, $9
call TextBoxBorder
- ld a, [$ccd3]
+ ld a, [wccd3]
and a
ld de, DepositPCText ; $57cb
jr nz, .asm_21761
ld de, WithdrawPCText ; $57d3
.asm_21761
- FuncCoord 11, 12 ; $c49b
+ FuncCoord 11, 12
ld hl, Coord
call PlaceString
- FuncCoord 11, 14 ; $c4c3
+ FuncCoord 11, 14
ld hl, Coord
ld de, StatsCancelPCText ; $57dc
call PlaceString
- ld hl, wTopMenuItemY ; $cc24
+ ld hl, wTopMenuItemY ; wTopMenuItemY
ld a, $c
ld [hli], a
ld a, $a
@@ -437,16 +437,16 @@
ld [hli], a
xor a
ld [hl], a
- ld hl, wListScrollOffset ; $cc36
+ ld hl, wListScrollOffset ; wcc36
ld [hli], a
ld [hl], a
- ld [wPlayerMonNumber], a ; $cc2f
- ld [$cc2b], a
+ ld [wPlayerMonNumber], a ; wPlayerMonNumber
+ ld [wcc2b], a
.asm_2178f
call HandleMenuInput
bit 1, a
jr nz, .asm_2179f
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
and a
jr z, .asm_217a1
dec a
@@ -459,13 +459,13 @@
ret
.asm_217a3
call SaveScreenTilesToBuffer1
- ld a, [$ccd3]
+ ld a, [wccd3]
and a
ld a, $0
jr nz, .asm_217b0
ld a, $2
.asm_217b0
- ld [$cc49], a
+ ld [wcc49], a
ld a, $36
call Predef ; indirect jump to StatusScreen (12953 (4:6953))
ld a, $37
@@ -537,16 +537,16 @@
ld a, [$ffaa]
cp $1
ret z
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $c
ret nz
- ld a, [$d35e]
+ ld a, [W_CURMAP]
cp $ef
ld a, $2
jr z, .asm_2183a
inc a
.asm_2183a
- ld [$d12b], a
+ ld [W_ISLINKBATTLE], a
call EnableAutoTextBoxDrawing
ld a, $22
jp PrintPredefTextID
@@ -555,16 +555,16 @@
ld a, [$ffaa]
cp $2
ret z
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $8
ret nz
- ld a, [$d35e]
+ ld a, [W_CURMAP]
cp $ef
ld a, $2
jr z, .asm_2185a
inc a
.asm_2185a
- ld [$d12b], a
+ ld [W_ISLINKBATTLE], a
call EnableAutoTextBoxDrawing
ld a, $22
jp PrintPredefTextID
@@ -573,7 +573,7 @@
TX_FAR _JustAMomentText
db "@"
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4
ret nz
call EnableAutoTextBoxDrawing
--- a/engine/menu/diploma.asm
+++ b/engine/menu/diploma.asm
@@ -3,8 +3,8 @@
call GBPalWhiteOutWithDelay3
call ClearScreen
xor a
- ld [$cfcb], a
- ld hl, $d730
+ ld [wcfcb], a
+ ld hl, wd730
set 6, [hl]
call DisableLCD
ld hl, CircleTile ; $7d88
@@ -34,12 +34,12 @@
pop bc
dec c
jr nz, .asm_56715 ; 0x56725 $ee
- FuncCoord 10, 4 ; $c3fa
+ FuncCoord 10, 4
ld hl, Coord
ld de, W_PLAYERNAME
call PlaceString
callba Func_44dd
- ld hl, $c301
+ ld hl, wOAMBuffer + $01
ld bc, $8028
.asm_5673e
ld a, [hl]
@@ -60,7 +60,7 @@
ld a, $90
ld [$ff48], a
call WaitForTextScrollButtonPress
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
call GBPalWhiteOutWithDelay3
call Func_3dbe
@@ -79,15 +79,15 @@
DiplomaTextPointersAndCoords: ; 56784 (15:6784)
dw DiplomaText
- dw $c3cd
+ dw wTileMap + $2d
dw DiplomaPlayer
- dw $c3f3
+ dw wTileMap + $53
dw DiplomaEmptyText
- dw $c3ff
+ dw wTileMap + $5f
dw DiplomaCongrats
- dw $c41a
+ dw wTileMap + $7a
dw DiplomaGameFreak
- dw $c4e9
+ dw wTileMap + $149
DiplomaText:
db $70,"Diploma",$70,"@"
--- a/engine/menu/league_pc.asm
+++ b/engine/menu/league_pc.asm
@@ -1,10 +1,10 @@
PKMNLeaguePC: ; 0x7657e
ld hl, AccessedHoFPCText
call PrintText
- ld hl, $D730
+ ld hl, wd730
set 6, [hl]
push hl
- ld a, [$CFCB]
+ ld a, [wcfcb]
push af
ld a, [$ffD7]
push af
@@ -11,27 +11,27 @@
xor a
ld [$ffD7], a
ld [W_SPRITEFLIPPED], a
- ld [$CFCB], a
- ld [$CD41], a
- ld [$CD42], a
- ld a, [$D5A2]
+ ld [wcfcb], a
+ ld [wTrainerScreenX], a
+ ld [wcd42], a
+ ld a, [wd5a2]
ld b, a
cp a, $33
jr c, .first
ld b, $32
sub b
- ld [$CD42], a
+ ld [wcd42], a
.first
- ld hl, $CD42
+ ld hl, wcd42
inc [hl]
push bc
- ld a, [$CD41]
- ld [$CD3D], a
+ ld a, [wTrainerScreenX]
+ ld [wWhichTrade], a
callba Func_73b3f
call Func_765e5
pop bc
jr c, .second
- ld hl, $CD41
+ ld hl, wTrainerScreenX
inc [hl]
ld a, [hl]
cp b
@@ -40,7 +40,7 @@
pop af
ld [$ffD7], a
pop af
- ld [$CFCB], a
+ ld [wcfcb], a
pop hl
res 6, [hl]
call GBPalWhiteOutWithDelay3
@@ -57,12 +57,12 @@
ld a, [hJoyHeld]
bit 1, a
jr nz, .fifth
- ld hl, $CC6B
- ld de, $CC5B
+ ld hl, wcc6b
+ ld de, wcc5b
ld bc, $0050
call CopyData
pop bc
- ld a, [$CC5B]
+ ld a, [wcc5b]
cp a, $FF
jr z, .fourth
dec c
@@ -78,38 +78,38 @@
Func_76610: ; 76610 (1d:6610)
call GBPalWhiteOutWithDelay3
call ClearScreen
- ld hl, $CC5B
+ ld hl, wcc5b
ld a, [hli]
- ld [$CD3D], a
- ld [$CF91], a
- ld [$D0B5], a
- ld [$CFD9], a
- ld [$CF1D], a
+ ld [wWhichTrade], a
+ ld [wcf91], a
+ ld [wd0b5], a
+ ld [wcfd9], a
+ ld [wcf1d], a
ld a, [hli]
- ld [$CD3F], a
- ld de, $CD6D
+ ld [wTrainerFacingDirection], a
+ ld de, wcd6d
ld bc, $000B
call CopyData
ld b, $0B
ld c, 0
call GoPAL_SET
- FuncCoord 12, 5 ; $c410
+ FuncCoord 12, 5
ld hl, Coord
call GetMonHeader
call LoadFrontSpriteByMonIndex
call GBPalNormal
- FuncCoord 0, 13 ; $c4a4
+ FuncCoord 0, 13
ld hl, Coord
ld b, 2
ld c, $12
call TextBoxBorder
- FuncCoord 1, 15 ; $c4cd
+ FuncCoord 1, 15
ld hl, Coord
ld de, HallOfFameNoText
call PlaceString
- FuncCoord 16, 15 ; $c4dc
+ FuncCoord 16, 15
ld hl, Coord
- ld de, $CD42
+ ld de, wcd42
ld bc, $0103
call PrintNumber
ld b, BANK(Func_702f0)
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -2,9 +2,9 @@
; Check save file
call Func_5bff
xor a
- ld [$D08A],a
+ ld [wd08a],a
inc a
- ld [$D088],a
+ ld [wd088],a
call Func_609e
jr nc,.next0
@@ -16,22 +16,22 @@
ld c,20
call DelayFrames
xor a
- ld [$D12B],a
- ld hl,$CC2B
+ ld [W_ISLINKBATTLE],a
+ ld hl,wcc2b
ld [hli],a
ld [hli],a
ld [hli],a
ld [hl],a
- ld [$D07C],a
- ld hl,$D72E
+ ld [W_ANIMATIONID],a
+ ld hl,wd72e
res 6,[hl]
call ClearScreen
call GoPAL_SET_CF1C
call LoadTextBoxTilePatterns
call LoadFontTilePatterns
- ld hl,$D730
+ ld hl,wd730
set 6,[hl]
- ld a,[$D088]
+ ld a,[wd088]
cp a,1
jr z,.next1
FuncCoord 0,0
@@ -55,29 +55,29 @@
ld de,NewGameText
call PlaceString
.next2
- ld hl,$D730
+ ld hl,wd730
res 6,[hl]
call UpdateSprites ; OAM?
xor a
- ld [$CC26],a
- ld [$CC2A],a
- ld [$CC34],a
+ ld [wCurrentMenuItem],a
+ ld [wLastMenuItem],a
+ ld [wMenuJoypadPollCount],a
inc a
- ld [$CC25],a
+ ld [wTopMenuItemX],a
inc a
- ld [$CC24],a
+ ld [wTopMenuItemY],a
ld a,$B
- ld [$CC29],a
- ld a,[$D088]
- ld [$CC28],a
+ ld [wMenuWatchedKeys],a
+ ld a,[wd088]
+ ld [wMaxMenuItem],a
call HandleMenuInput
bit 1,a
jp nz,LoadTitlescreenGraphics ; load title screen (gfx and arrangement)
ld c,20
call DelayFrames
- ld a,[$CC26]
+ ld a,[wCurrentMenuItem]
ld b,a
- ld a,[$D088]
+ ld a,[wd088]
cp a,2
jp z,.next3
inc b ; adjust MenuArrow_Counter
@@ -89,11 +89,11 @@
jp z,Func_5d52 ; if press_A on NewGame
call DisplayOptionMenu ; if press_a on Options
ld a,1
- ld [$D08A],a
+ ld [wd08a],a
jp .next0
.next4
call ContinueGame
- ld hl,$D126
+ ld hl,wd126
set 5,[hl]
.next6
xor a
@@ -111,10 +111,10 @@
call GBPalWhiteOutWithDelay3
call ClearScreen
ld a,4
- ld [$D52A],a
+ ld [wd52a],a
ld c,10
call DelayFrames
- ld a,[$D5A2]
+ ld a,[wd5a2]
and a
jp z,Func_5d5f
ld a,[W_CURMAP] ; map ID
@@ -121,22 +121,22 @@
cp a,HALL_OF_FAME
jp nz,Func_5d5f
xor a
- ld [$D71A],a
- ld hl,$D732
+ ld [wd71a],a
+ ld hl,wd732
set 2,[hl]
call Func_62ce
jp Func_5d5f
Func_5bff: ; 5bff (1:5bff)
ld a,1
- ld [$D358],a
+ ld [wd358],a
ld a,3
- ld [$D355],a
+ ld [W_OPTIONS],a
ret
LinkMenu: ; 5c0a (1:5c0a)
xor a
- ld [$d358], a
- ld hl, $d72e
+ ld [wd358], a
+ ld hl, wd72e
set 6, [hl]
ld hl, TextTerminator_6b20 ; $6b20
call PrintText
@@ -143,20 +143,20 @@
call SaveScreenTilesToBuffer1
ld hl, WhereWouldYouLikeText
call PrintText
- FuncCoord 5, 5 ; $c409
+ FuncCoord 5, 5
ld hl, Coord
ld b, $6
ld c, $d
call TextBoxBorder
call UpdateSprites
- FuncCoord 7, 7 ; $c433
+ FuncCoord 7, 7
ld hl, Coord
ld de, TradeCenterText
call PlaceString
xor a
- ld [$cd37], a
- ld [$d72d], a
- ld hl, wTopMenuItemY ; $cc24
+ ld [wcd37], a
+ ld [wd72d], a
+ ld hl, wTopMenuItemY ; wTopMenuItemY
ld a, $7
ld [hli], a
ld a, $6
@@ -176,19 +176,19 @@
add a
add a
ld b, a
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
add b
add $d0
- ld [$cc42], a
- ld [$cc43], a
+ ld [wcc42], a
+ ld [wcc43], a
.asm_5c66
call Func_2247
- ld a, [$cc3d]
+ ld a, [wcc3d]
ld b, a
and $f0
cp $d0
jr z, .asm_5c7d
- ld a, [$cc3e]
+ ld a, [wcc3e]
ld b, a
and $f0
cp $d0
@@ -197,12 +197,12 @@
ld a, b
and $c
jr nz, .asm_5c8b
- ld a, [$cc42]
+ ld a, [wcc42]
and $c
jr z, .asm_5c52
jr .asm_5ca1
.asm_5c8b
- ld a, [$cc42]
+ ld a, [wcc42]
and $c
jr z, .asm_5c98
ld a, [$ffaa]
@@ -210,9 +210,9 @@
jr z, .asm_5ca1
.asm_5c98
ld a, b
- ld [$cc42], a
+ ld [wcc42], a
and $3
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
.asm_5ca1
ld a, [$ffaa]
cp $2
@@ -225,10 +225,10 @@
ld b, $7f
ld c, $7f
ld d, $ec
- ld a, [$cc42]
+ ld a, [wcc42]
and $8
jr nz, .asm_5ccc
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
cp $2
jr z, .asm_5ccc
ld c, d
@@ -239,58 +239,58 @@
ld c, d
.asm_5ccc
ld a, b
- FuncCoord 6, 7 ; $c432
+ FuncCoord 6, 7
ld [Coord], a
ld a, c
- FuncCoord 6, 9 ; $c45a
+ FuncCoord 6, 9
ld [Coord], a
ld a, d
- FuncCoord 6, 11 ; $c482
+ FuncCoord 6, 11
ld [Coord], a
ld c, $28
call DelayFrames
call LoadScreenTilesFromBuffer1
- ld a, [$cc42]
+ ld a, [wcc42]
and $8
jr nz, .asm_5d2d
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
cp $2
jr z, .asm_5d2d
xor a
- ld [$d700], a
- ld a, [wCurrentMenuItem] ; $cc26
+ ld [wd700], a
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
and a
ld a, TRADE_CENTER
jr nz, .asm_5cfc
ld a, BATTLE_CENTER
.asm_5cfc
- ld [$d72d], a
+ ld [wd72d], a
ld hl, PleaseWaitText
call PrintText
ld c, $32
call DelayFrames
- ld hl, $d732
+ ld hl, wd732
res 1, [hl]
- ld a, [W_ANIMATIONID] ; $d07c
- ld [$d71a], a
+ ld a, [W_ANIMATIONID] ; W_ANIMATIONID
+ ld [wd71a], a
call Func_62ce
ld c, $14
call DelayFrames
xor a
- ld [wMenuJoypadPollCount], a ; $cc34
- ld [$cc42], a
+ ld [wMenuJoypadPollCount], a ; wMenuJoypadPollCount
+ ld [wcc42], a
inc a
- ld [W_ISLINKBATTLE], a ; $d12b
- ld [$cc47], a
+ ld [W_ISLINKBATTLE], a ; W_ISLINKBATTLE
+ ld [wcc47], a
jr Func_5d5f
.asm_5d2d
xor a
- ld [wMenuJoypadPollCount], a ; $cc34
+ ld [wMenuJoypadPollCount], a ; wMenuJoypadPollCount
call Delay3
call Func_72d7
ld hl, LinkCanceledText
call PrintText
- ld hl, $d72e
+ ld hl, wd72e
res 6, [hl]
ret
@@ -307,7 +307,7 @@
db "@"
Func_5d52: ; 5d52 (1:5d52)
- ld hl, $d732
+ ld hl, wd732
res 1, [hl]
call OakSpeech
ld c, $14
@@ -318,13 +318,13 @@
ld [hJoyPressed], a
ld [hJoyHeld], a
ld [$ffb5], a
- ld [$d72d], a
- ld hl, $d732
+ ld [wd72d], a
+ ld hl, wd732
set 0, [hl]
call ResetPlayerSpriteData
ld c, $14
call DelayFrames
- ld a, [$cc47]
+ ld a, [wcc47]
and a
ret nz
jp EnterMap
@@ -344,26 +344,26 @@
ContinueGame: ; 5db5 (1:5db5)
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
- FuncCoord 4, 7 ; $c430
+ FuncCoord 4, 7
ld hl, Coord
ld b, $8
ld c, $e
call TextBoxBorder
- FuncCoord 5, 9 ; $c459
+ FuncCoord 5, 9
ld hl, Coord
ld de, SaveScreenInfoText
call PlaceString
- FuncCoord 12, 9 ; $c460
+ FuncCoord 12, 9
ld hl, Coord
- ld de, W_PLAYERNAME ; $d158
+ ld de, W_PLAYERNAME ; wd158
call PlaceString
- FuncCoord 17, 11 ; $c48d
+ FuncCoord 17, 11
ld hl, Coord
call Func_5e2f
- FuncCoord 16, 13 ; $c4b4
+ FuncCoord 16, 13
ld hl, Coord
call Func_5e42
- FuncCoord 13, 15 ; $c4d9
+ FuncCoord 13, 15
ld hl, Coord
call Func_5e55
ld a, $1
@@ -374,23 +374,23 @@
PrintSaveScreenText: ; 5def (1:5def)
xor a
ld [H_AUTOBGTRANSFERENABLED], a
- ld hl, $c3a4
+ ld hl, wTileMap + $4
ld b, $8
ld c, $e
call TextBoxBorder
call LoadTextBoxTilePatterns
call UpdateSprites
- ld hl, $c3cd
+ ld hl, wTileMap + $2d
ld de, SaveScreenInfoText
call PlaceString
- ld hl, $c3d4
+ ld hl, wTileMap + $34
ld de, W_PLAYERNAME
call PlaceString
- ld hl, $c401
+ ld hl, wTileMap + $61
call Func_5e2f
- ld hl, $c428
+ ld hl, wTileMap + $88
call Func_5e42
- ld hl, $c44d
+ ld hl, wTileMap + $ad
call Func_5e55
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a
@@ -403,27 +403,27 @@
ld b, $1
call CountSetBits
pop hl
- ld de, $d11e
+ ld de, wd11e
ld bc, $102
jp PrintNumber
Func_5e42: ; 5e42 (1:5e42)
push hl
- ld hl, wPokedexOwned ; $d2f7
+ ld hl, wPokedexOwned ; wPokedexOwned
ld b, wPokedexOwnedEnd - wPokedexOwned
call CountSetBits
pop hl
- ld de, $d11e
+ ld de, wd11e
ld bc, $103
jp PrintNumber
Func_5e55: ; 5e55 (1:5e55)
- ld de, $da41
+ ld de, W_PLAYTIMEHOURS + 1
ld bc, $103
call PrintNumber
ld [hl], $6d
inc hl
- ld de, $da43
+ ld de, W_PLAYTIMEMINUTES + 1
ld bc, $8102
jp PrintNumber
@@ -469,12 +469,12 @@
ld [wCurrentMenuItem],a
ld [wLastMenuItem],a
inc a
- ld [$d358],a
- ld [$cd40],a
+ ld [wd358],a
+ ld [wTrainerScreenY],a
ld a,3 ; text speed cursor Y coordinate
ld [wTopMenuItemY],a
call SetCursorPositionsFromOptions
- ld a,[$cd3d] ; text speed cursor X coordinate
+ ld a,[wWhichTrade] ; text speed cursor X coordinate
ld [wTopMenuItemX],a
ld a,$01
ld [H_AUTOBGTRANSFERENABLED],a ; enable auto background transfer
@@ -524,7 +524,7 @@
.downPressed
cp a,16
ld b,-13
- ld hl,$cd3d
+ ld hl,wWhichTrade
jr z,.updateMenuVariables
ld b,5
cp a,3
@@ -539,7 +539,7 @@
.upPressed
cp a,8
ld b,-5
- ld hl,$cd3d
+ ld hl,wWhichTrade
jr z,.updateMenuVariables
cp a,13
inc hl
@@ -558,17 +558,17 @@
call PlaceUnfilledArrowMenuCursor
jp .loop
.cursorInBattleAnimation
- ld a,[$cd3e] ; battle animation cursor X coordinate
+ ld a,[wTrainerEngageDistance] ; battle animation cursor X coordinate
xor a,$0b ; toggle between 1 and 10
- ld [$cd3e],a
+ ld [wTrainerEngageDistance],a
jp .eraseOldMenuCursor
.cursorInBattleStyle
- ld a,[$cd3f] ; battle style cursor X coordinate
+ ld a,[wTrainerFacingDirection] ; battle style cursor X coordinate
xor a,$0b ; toggle between 1 and 10
- ld [$cd3f],a
+ ld [wTrainerFacingDirection],a
jp .eraseOldMenuCursor
.pressedLeftInTextSpeed
- ld a,[$cd3d] ; text speed cursor X coordinate
+ ld a,[wWhichTrade] ; text speed cursor X coordinate
cp a,1
jr z,.updateTextSpeedXCoord
cp a,7
@@ -579,7 +579,7 @@
sub a,7
jr .updateTextSpeedXCoord
.pressedRightInTextSpeed
- ld a,[$cd3d] ; text speed cursor X coordinate
+ ld a,[wWhichTrade] ; text speed cursor X coordinate
cp a,14
jr z,.updateTextSpeedXCoord
cp a,7
@@ -589,7 +589,7 @@
.fromFastToMedium
add a,6
.updateTextSpeedXCoord
- ld [$cd3d],a ; text speed cursor X coordinate
+ ld [wWhichTrade],a ; text speed cursor X coordinate
jp .eraseOldMenuCursor
TextSpeedOptionText: ; 5fc0 (1:5fc0)
@@ -610,7 +610,7 @@
; sets the options variable according to the current placement of the menu cursors in the options menu
SetOptionsFromCursorPositions: ; 601f (1:601f)
ld hl,TextSpeedOptionData
- ld a,[$cd3d] ; text speed cursor X coordinate
+ ld a,[wWhichTrade] ; text speed cursor X coordinate
ld c,a
.loop
ld a,[hli]
@@ -621,7 +621,7 @@
.textSpeedMatchFound
ld a,[hl]
ld d,a
- ld a,[$cd3e] ; battle animation cursor X coordinate
+ ld a,[wTrainerEngageDistance] ; battle animation cursor X coordinate
dec a
jr z,.battleAnimationOn
.battleAnimationOff
@@ -630,7 +630,7 @@
.battleAnimationOn
res 7,d
.checkBattleStyle
- ld a,[$cd3f] ; battle style cursor X coordinate
+ ld a,[wTrainerFacingDirection] ; battle style cursor X coordinate
dec a
jr z,.battleStyleShift
.battleStyleSet
@@ -655,7 +655,7 @@
pop bc
dec hl
ld a,[hl]
- ld [$cd3d],a ; text speed cursor X coordinate
+ ld [wWhichTrade],a ; text speed cursor X coordinate
FuncCoord 0,3
ld hl,Coord
call .placeUnfilledRightArrow
@@ -664,7 +664,7 @@
jr nc,.storeBattleAnimationCursorX
ld a,10 ; Off
.storeBattleAnimationCursorX
- ld [$cd3e],a ; battle animation cursor X coordinate
+ ld [wTrainerEngageDistance],a ; battle animation cursor X coordinate
FuncCoord 0,8
ld hl,Coord
call .placeUnfilledRightArrow
@@ -673,7 +673,7 @@
jr nc,.storeBattleStyleCursorX
ld a,10
.storeBattleStyleCursorX
- ld [$cd3f],a ; battle style cursor X coordinate
+ ld [wTrainerFacingDirection],a ; battle style cursor X coordinate
FuncCoord 0,13
ld hl,Coord
call .placeUnfilledRightArrow
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -2,36 +2,36 @@
call SaveScreenTilesToBuffer1
call GetPredefRegisters
push hl
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
dec a
ld hl, wTileMap
ld b, $4
ld c, $b
call z, ClearScreenArea ; only if in wild batle
- ld a, [$cf91]
- ld [$d11e], a
+ ld a, [wcf91]
+ ld [wd11e], a
call GetMonName
ld hl, DoYouWantToNicknameText
call PrintText
- FuncCoord 14, 7 ; $c43a
+ FuncCoord 14, 7
ld hl, Coord
ld bc, $80f
ld a, $14
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
pop hl
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
and a
jr nz, .asm_654c
- ld a, [$cfcb]
+ ld a, [wcfcb]
push af
xor a
- ld [$cfcb], a
+ ld [wcfcb], a
push hl
ld a, $2
- ld [$d07d], a
+ ld [wd07d], a
call DisplayNamingScreen
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
and a
jr nz, .asm_653e
call Func_3e08
@@ -39,14 +39,14 @@
call LoadScreenTilesFromBuffer1
pop hl
pop af
- ld [$cfcb], a
- ld a, [$cf4b]
+ ld [wcfcb], a
+ ld a, [wcf4b]
cp $50
ret nz
.asm_654c
ld d, h
ld e, l
- ld hl, $cd6d
+ ld hl, wcd6d
ld bc, $000b
jp CopyData
@@ -55,25 +55,25 @@
db "@"
Func_655c: ; 655c (1:655c)
- ld hl, $cee9
+ ld hl, wHPBarMaxHP
xor a
- ld [$cfcb], a
+ ld [wcfcb], a
ld a, $2
- ld [$d07d], a
+ ld [wd07d], a
call DisplayNamingScreen
call GBPalWhiteOutWithDelay3
call Func_3dbe
call LoadGBPal
- ld a, [$cf4b]
+ ld a, [wcf4b]
cp $50
jr z, .asm_6594
- ld hl, W_PARTYMON1NAME ; $d2b5
+ ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
ld bc, $b
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
call AddNTimes
ld e, l
ld d, h
- ld hl, $cee9
+ ld hl, wHPBarMaxHP
ld bc, $b
call CopyData
and a
@@ -84,7 +84,7 @@
DisplayNamingScreen: ; 6596 (1:6596)
push hl
- ld hl, $d730
+ ld hl, wd730
set 6, [hl]
call GBPalWhiteOutWithDelay3
call ClearScreen
@@ -94,7 +94,7 @@
call LoadHpBarAndStatusTilePatterns
call LoadEDTile
callba Func_7176c
- FuncCoord 0, 4 ; $c3f0
+ FuncCoord 0, 4
ld hl, Coord
ld b, $9
ld c, $12
@@ -101,27 +101,27 @@
call TextBoxBorder
call PrintNamingText
ld a, $3
- ld [wTopMenuItemY], a ; $cc24
+ ld [wTopMenuItemY], a ; wTopMenuItemY
ld a, $1
- ld [wTopMenuItemX], a ; $cc25
- ld [wLastMenuItem], a ; $cc2a
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wTopMenuItemX], a ; wTopMenuItemX
+ ld [wLastMenuItem], a ; wLastMenuItem
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
ld a, $ff
- ld [wMenuWatchedKeys], a ; $cc29
+ ld [wMenuWatchedKeys], a ; wMenuWatchedKeys
ld a, $7
- ld [wMaxMenuItem], a ; $cc28
+ ld [wMaxMenuItem], a ; wMaxMenuItem
ld a, $50
- ld [$cf4b], a
+ ld [wcf4b], a
xor a
- ld hl, $ceea
+ ld hl, wHPBarMaxHP + 1
ld [hli], a
ld [hli], a
- ld [W_SUBANIMTRANSFORM], a ; $d08b
+ ld [W_SUBANIMTRANSFORM], a ; W_SUBANIMTRANSFORM
.asm_65ed
call PrintAlphabet
call GBPalNormal
.asm_65f3
- ld a, [$ceea]
+ ld a, [wHPBarMaxHP + 1]
and a
jr nz, .asm_662d
call Func_680e
@@ -128,11 +128,11 @@
.asm_65fc
call PlaceMenuCursor
.asm_65ff
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
push af
callba AnimatePartyMon_ForceSpeed1
pop af
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
call JoypadLowSensitivity
ld a, [hJoyPressed]
and a
@@ -158,7 +158,7 @@
jp [hl]
.asm_662d
pop de
- ld hl, $cf4b
+ ld hl, wcf4b
ld bc, $b
call CopyData
call GBPalWhiteOutWithDelay3
@@ -167,10 +167,10 @@
call GoPAL_SET_CF1C
call GBPalNormal
xor a
- ld [W_SUBANIMTRANSFORM], a ; $d08b
- ld hl, $d730
+ ld [W_SUBANIMTRANSFORM], a ; W_SUBANIMTRANSFORM
+ ld hl, wd730
res 6, [hl]
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
and a
jp z, LoadTextBoxTilePatterns
ld hl, Func_3ee5b
@@ -200,38 +200,38 @@
ld de, .asm_65ed ; $65ed
push de
.asm_6683
- ld a, [$ceeb]
+ ld a, [wHPBarOldHP]
xor $1
- ld [$ceeb], a
+ ld [wHPBarOldHP], a
ret
.asm_668c
ld a, $1
- ld [$ceea], a
+ ld [wHPBarMaxHP + 1], a
ret
.asm_6692
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
cp $5
jr nz, .asm_66a0
- ld a, [wTopMenuItemX] ; $cc25
+ ld a, [wTopMenuItemX] ; wTopMenuItemX
cp $11
jr z, .asm_668c
.asm_66a0
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
cp $6
jr nz, .asm_66ae
- ld a, [wTopMenuItemX] ; $cc25
+ ld a, [wTopMenuItemX] ; wTopMenuItemX
cp $1
jr z, .asm_667e
.asm_66ae
- ld hl, wMenuCursorLocation ; $cc30
+ ld hl, wMenuCursorLocation ; wMenuCursorLocation
ld a, [hli]
ld h, [hl]
ld l, a
inc hl
ld a, [hl]
- ld [$ceed], a
+ ld [wHPBarNewHP], a
call CalcStringLength
- ld a, [$ceed]
+ ld a, [wHPBarNewHP]
cp $e5
ld de, Dakutens ; $6885
jr z, .asm_66e3
@@ -238,14 +238,14 @@
cp $e4
ld de, Handakutens ; $68d6
jr z, .asm_66e3
- ld a, [$d07d]
+ ld a, [wd07d]
cp $2
jr nc, .checkMonNameLength
- ld a, [$cee9]
+ ld a, [wHPBarMaxHP]
cp $7 ; max length of player/rival names
jr .checkNameLength
.checkMonNameLength
- ld a, [$cee9]
+ ld a, [wHPBarMaxHP]
cp $a ; max length of pokemon nicknames
.checkNameLength
jr c, .addLetter
@@ -257,7 +257,7 @@
ret nc
dec hl
.addLetter
- ld a, [$ceed]
+ ld a, [wHPBarNewHP]
ld [hli], a
ld [hl], $50
ld a, (SFX_02_40 - SFX_Headers_02) / 3
@@ -264,7 +264,7 @@
call PlaySound
ret
.deleteLetter
- ld a, [$cee9]
+ ld a, [wHPBarMaxHP]
and a
ret z
call CalcStringLength
@@ -272,10 +272,10 @@
ld [hl], $50
ret
.asm_6702
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
cp $6
ret z
- ld a, [wTopMenuItemX] ; $cc25
+ ld a, [wTopMenuItemX] ; wTopMenuItemX
cp $11
jp z, .asm_6714
inc a
@@ -285,10 +285,10 @@
ld a, $1
jr .asm_6755
.asm_6718
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
cp $6
ret z
- ld a, [wTopMenuItemX] ; $cc25
+ ld a, [wTopMenuItemX] ; wTopMenuItemX
dec a
jp z, .asm_6728
dec a
@@ -297,23 +297,23 @@
ld a, $11
jr .asm_6755
.asm_672c
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
dec a
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
and a
ret nz
ld a, $6
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
ld a, $1
jr .asm_6755
.asm_673e
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
inc a
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
cp $7
jr nz, .asm_6750
ld a, $1
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
jr .asm_6755
.asm_6750
cp $6
@@ -320,7 +320,7 @@
ret nz
ld a, $1
.asm_6755
- ld [wTopMenuItemX], a ; $cc25
+ ld [wTopMenuItemX], a ; wTopMenuItemX
jp EraseMenuCursor
LoadEDTile: ; 675b (1:675b)
@@ -335,13 +335,13 @@
PrintAlphabet: ; 676f (1:676f)
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
- ld a, [$ceeb]
+ ld a, [wHPBarOldHP]
and a
ld de, LowerCaseAlphabet ; $679e
jr nz, .asm_677e
ld de, UpperCaseAlphabet ; $67d6
.asm_677e
- FuncCoord 2, 5 ; $c406
+ FuncCoord 2, 5
ld hl, Coord
ld bc, $509
.asm_6784
@@ -372,18 +372,18 @@
Func_680e: ; 680e (1:680e)
call CalcStringLength
ld a, c
- ld [$cee9], a
- FuncCoord 10, 2 ; $c3d2
+ ld [wHPBarMaxHP], a
+ FuncCoord 10, 2
ld hl, Coord
ld bc, $10a
call ClearScreenArea
- FuncCoord 10, 2 ; $c3d2
+ FuncCoord 10, 2
ld hl, Coord
- ld de, $cf4b
+ ld de, wcf4b
call PlaceString
- FuncCoord 10, 3 ; $c3e6
+ FuncCoord 10, 3
ld hl, Coord
- ld a, [$d07d]
+ ld a, [wd07d]
cp $2
jr nc, .asm_6835
ld b, $7
@@ -396,9 +396,9 @@
ld [hli], a
dec b
jr nz, .asm_6839
- ld a, [$d07d]
+ ld a, [wd07d]
cp $2
- ld a, [$cee9]
+ ld a, [wHPBarMaxHP]
jr nc, .asm_684b
cp $7
jr .asm_684d
@@ -408,10 +408,10 @@
jr nz, .asm_6867
call EraseMenuCursor
ld a, $11
- ld [wTopMenuItemX], a ; $cc25
+ ld [wTopMenuItemX], a ; wTopMenuItemX
ld a, $5
- ld [wCurrentMenuItem], a ; $cc26
- ld a, [$d07d]
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld a, [wd07d]
cp $2
ld a, $9
jr nc, .asm_6867
@@ -419,7 +419,7 @@
.asm_6867
ld c, a
ld b, $0
- FuncCoord 10, 3 ; $c3e6
+ FuncCoord 10, 3
ld hl, Coord
add hl, bc
ld [hl], $77
@@ -436,7 +436,7 @@
ret nc
inc hl
ld a, [hl]
- ld [$ceed], a
+ ld [wHPBarNewHP], a
ret
Dakutens: ; 6885 (1:6885)
@@ -455,9 +455,9 @@
db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
db $ff
-; calculates the length of the string at $cf4b and stores it in c
+; calculates the length of the string at wcf4b and stores it in c
CalcStringLength: ; 68eb (1:68eb)
- ld hl, $cf4b
+ ld hl, wcf4b
ld c, $0
.asm_68f0
ld a, [hl]
@@ -468,9 +468,9 @@
jr .asm_68f0
PrintNamingText: ; 68f8 (1:68f8)
- FuncCoord 0, 1 ; $c3b4
+ FuncCoord 0, 1
ld hl, Coord
- ld a, [$d07d]
+ ld a, [wd07d]
ld de, YourTextString ; $693f
and a
jr z, .notNickname
@@ -477,20 +477,20 @@
ld de, RivalsTextString ; $6945
dec a
jr z, .notNickname
- ld a, [$cf91]
- ld [$cd5d], a
+ ld a, [wcf91]
+ ld [wcd5d], a
push af
callba Func_71882
pop af
- ld [$d11e], a
+ ld [wd11e], a
call GetMonName
- FuncCoord 4, 1 ; $c3b8
+ FuncCoord 4, 1
ld hl, Coord
call PlaceString
ld hl, $1
add hl, bc
ld [hl], $c9
- FuncCoord 1, 3 ; $c3dd
+ FuncCoord 1, 3
ld hl, Coord
ld de, NicknameTextString ; $6953
jr .placeString
--- a/engine/menu/oaks_pc.asm
+++ b/engine/menu/oaks_pc.asm
@@ -5,7 +5,7 @@
ld hl, GetDexRatedText
call PrintText
call YesNoChoice
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
and a
jr nz, .asm_1e932
ld a, $56
--- a/engine/menu/party_menu.asm
+++ b/engine/menu/party_menu.asm
@@ -1,4 +1,4 @@
-; [$D07D] = menu type / message ID
+; [wd07d] = menu type / message ID
; if less than $F0, it is a menu type
; menu types:
; 00: normal pokemon menu (e.g. Start menu)
@@ -25,11 +25,11 @@
callba Func_71791 ; load pokemon icon graphics
RedrawPartyMenu_: ; 12ce3 (4:6ce3)
- ld a,[$D07D]
+ ld a,[wd07d]
cp a,$04
jp z,.printMessage
call ErasePartyMenuCursors
- callba SendBlkPacket_PartyMenu ; loads some data to $cf2e
+ callba SendBlkPacket_PartyMenu ; loads some data to wcf2e
FuncCoord 3,0
ld hl,Coord
ld de,W_PARTYMON1
@@ -36,7 +36,7 @@
xor a
ld c,a
ld [$FF8C],a ; loop counter
- ld [$CF2D],a
+ ld [wcf2d],a
.loop
ld a,[de]
cp a,$FF ; reached the terminator?
@@ -58,7 +58,7 @@
call LoadMonData
pop hl
push hl
- ld a,[$CC35]
+ ld a,[wcc35]
and a ; is the player swapping pokemon positions?
jr z,.skipUnfilledRightArrow
; if the player is swapping pokemon positions
@@ -76,7 +76,7 @@
inc hl
inc hl
.skipUnfilledRightArrow
- ld a,[$D07D] ; menu type
+ ld a,[wd07d] ; menu type
cp a,$03
jr z,.teachMoveMenu
cp a,$05
@@ -84,7 +84,7 @@
push hl
ld bc,14 ; 14 columns to the right
add hl,bc
- ld de,$CF9C
+ ld de,wcf9c
call PrintStatusCondition
pop hl
push hl
@@ -137,25 +137,25 @@
push hl
ld hl,EvosMovesPointerTable
ld b,0
- ld a,[$CF98] ; pokemon ID
+ ld a,[wcf98] ; pokemon ID
dec a
add a
rl b
ld c,a
add hl,bc
- ld de,$CD6D
+ ld de,wcd6d
ld a,BANK(EvosMovesPointerTable)
ld bc,2
call FarCopyData
- ld hl,$CD6D
+ ld hl,wcd6d
ld a,[hli]
ld h,[hl]
ld l,a
- ld de,$CD6D
+ ld de,wcd6d
ld a,BANK(EvosMovesPointerTable)
ld bc,13
call FarCopyData
- ld hl,$CD6D
+ ld hl,wcd6d
ld de,.notAbleToEvolveText
; loop through the pokemon's evolution entries
.checkEvolutionsLoop
@@ -170,7 +170,7 @@
dec hl
dec hl
ld b,[hl]
- ld a,[$D156] ; evolution stone item ID
+ ld a,[wd156] ; evolution stone item ID
inc hl
inc hl
inc hl
@@ -194,12 +194,12 @@
ld b,$0A
call GoPAL_SET
.printMessage
- ld hl,$D730
+ ld hl,wd730
ld a,[hl]
push af
push hl
set 6,[hl] ; turn off letter printing delay
- ld a,[$D07D] ; message ID
+ ld a,[wd07d] ; message ID
cp a,$F0
jr nc,.printItemUseMessage
add a
@@ -230,7 +230,7 @@
ld h,[hl]
ld l,a
push hl
- ld a,[$CF06]
+ ld a,[wcf06]
ld hl,W_PARTYMON1NAME
call GetPartyMonName
pop hl
@@ -315,8 +315,8 @@
db "@"
SetPartyMenuHealthBarColor: ; 12ec7 (4:6ec7)
- ld hl, $cf1f
- ld a, [$cf2d]
+ ld hl, wcf1f
+ ld a, [wcf2d]
ld c, a
ld b, $0
add hl, bc
@@ -323,6 +323,6 @@
call GetHealthBarColor
ld b, $fc
call GoPAL_SET
- ld hl, $cf2d
+ ld hl, wcf2d
inc [hl]
ret
--- a/engine/menu/pc.asm
+++ b/engine/menu/pc.asm
@@ -74,7 +74,7 @@
ld a, (SFX_02_47 - SFX_Headers_02) / 3
call PlaySound ;XXX: play sound or stop music
call WaitForSoundToFinish ;XXX: wait for sound to be done
- ld a, [$D7F1] ;has to do with having met Bill
+ ld a, [wd7f1] ;has to do with having met Bill
bit 0, a
jr nz, .billsPC ;if you've met bill, use that bill's instead of someone's
ld hl, AccessedSomeonesPCText
@@ -86,7 +86,7 @@
callba BillsPC_
ReloadMainMenu: ; 17f06 (5:7f06)
xor a
- ld [$CC3C], a
+ ld [wcc3c], a
call ReloadMapData
call UpdateSprites ;XXX: moves sprites
jp PCMainMenu
@@ -117,7 +117,7 @@
; removes one of the specified item ID [$FFdb] from bag (if existent)
RemoveItemByID: ; 17f37 (5:7f37)
- ld hl, wBagItems ; $d31e
+ ld hl, wBagItems ; wd31e
ld a, [$ffdb]
ld b, a
xor a
@@ -135,8 +135,8 @@
jr .asm_17f40
.asm_17f4f
ld a, $1
- ld [$cf96], a
+ ld [wcf96], a
ld a, [$ffdc]
- ld [wWhichPokemon], a ; $cf92
- ld hl, wNumBagItems ; $d31d
+ ld [wWhichPokemon], a ; wWhichPokemon
+ ld hl, wNumBagItems ; wNumBagItems
jp RemoveItemFromInventory
--- a/engine/menu/players_pc.asm
+++ b/engine/menu/players_pc.asm
@@ -1,12 +1,12 @@
PlayerPC: ; 78e6 (1:78e6)
- ld hl, $d730
+ ld hl, wd730
set 6, [hl]
ld a, ITEM_NAME
ld [W_LISTTYPE], a
call SaveScreenTilesToBuffer1
xor a
- ld [$cc2c], a
- ld [$ccd3], a
+ ld [wcc2c], a
+ ld [wccd3], a
ld a, [wFlags_0xcd60]
bit 3, a
jr nz, Func_790c
@@ -16,8 +16,8 @@
call PrintText
Func_790c: ; 790c (1:790c)
- ld a, [$ccd3]
- ld [wCurrentMenuItem], a ; $cc26
+ ld a, [wccd3]
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
ld hl, wFlags_0xcd60
set 5, [hl]
call LoadScreenTilesFromBuffer2
@@ -26,11 +26,11 @@
ld c, $e
call TextBoxBorder
call UpdateSprites
- FuncCoord 2, 2 ; $c3ca
+ FuncCoord 2, 2
ld hl, Coord
ld de, PlayersPCMenuEntries ; $7af5
call PlaceString
- ld hl, wTopMenuItemY ; $cc24
+ ld hl, wTopMenuItemY ; wTopMenuItemY
ld a, $2
ld [hli], a
dec a
@@ -43,10 +43,10 @@
ld [hli], a
xor a
ld [hl], a
- ld hl, wListScrollOffset ; $cc36
+ ld hl, wListScrollOffset ; wcc36
ld [hli], a
ld [hl], a
- ld [wPlayerMonNumber], a ; $cc2f
+ ld [wPlayerMonNumber], a ; wPlayerMonNumber
ld hl, WhatDoYouWantText
call PrintText
call HandleMenuInput
@@ -53,8 +53,8 @@
bit 1, a
jp nz, Func_796d
call PlaceUnfilledArrowMenuCursor
- ld a, [wCurrentMenuItem] ; $cc26
- ld [$ccd3], a
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+ ld [wccd3], a
and a
jp z, Func_7a12
dec a
@@ -74,19 +74,19 @@
res 5, [hl]
call LoadScreenTilesFromBuffer2
xor a
- ld [wListScrollOffset], a ; $cc36
- ld [$cc2c], a
- ld hl, $d730
+ ld [wListScrollOffset], a ; wcc36
+ ld [wcc2c], a
+ ld hl, wd730
res 6, [hl]
xor a
- ld [$cc3c], a
+ ld [wcc3c], a
ret
Func_7995: ; 7995 (1:7995)
xor a
- ld [wCurrentMenuItem], a ; $cc26
- ld [wListScrollOffset], a ; $cc36
- ld a, [wNumBagItems] ; $d31d
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld [wListScrollOffset], a ; wcc36
+ ld a, [wNumBagItems] ; wNumBagItems
and a
jr nz, Func_79ab
ld hl, NothingToDepositText
@@ -96,21 +96,21 @@
Func_79ab: ; 79ab (1:79ab)
ld hl, WhatToDepositText
call PrintText
- ld hl, wNumBagItems ; $d31d
+ ld hl, wNumBagItems ; wNumBagItems
ld a, l
- ld [$cf8b], a
+ ld [wcf8b], a
ld a, h
- ld [$cf8c], a
+ ld [wcf8c], a
xor a
- ld [$cf93], a
+ ld [wcf93], a
ld a, $3
- ld [wListMenuID], a ; $cf94
+ ld [wListMenuID], a ; wListMenuID
call DisplayListMenuID
jp c, Func_790c
call IsKeyItem
ld a, $1
- ld [$cf96], a
- ld a, [$d124]
+ ld [wcf96], a
+ ld a, [wd124]
and a
jr nz, .asm_79e7
ld hl, DepositHowManyText
@@ -119,7 +119,7 @@
cp $ff
jp z, Func_79ab
.asm_79e7
- ld hl, wNumBoxItems ; $d53a
+ ld hl, wNumBoxItems ; wNumBoxItems
call AddItemToInventory
jr c, .asm_79f8
ld hl, NoRoomToStoreText
@@ -126,7 +126,7 @@
call PrintText
jp Func_79ab
.asm_79f8
- ld hl, wNumBagItems ; $d31d
+ ld hl, wNumBagItems ; wNumBagItems
call RemoveItemFromInventory
call WaitForSoundToFinish
ld a, (SFX_02_55 - SFX_Headers_02) / 3
@@ -138,9 +138,9 @@
Func_7a12: ; 7a12 (1:7a12)
xor a
- ld [wCurrentMenuItem], a ; $cc26
- ld [wListScrollOffset], a ; $cc36
- ld a, [wNumBoxItems] ; $d53a
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld [wListScrollOffset], a ; wcc36
+ ld a, [wNumBoxItems] ; wNumBoxItems
and a
jr nz, Func_7a28
ld hl, NothingStoredText
@@ -150,21 +150,21 @@
Func_7a28: ; 7a28 (1:7a28)
ld hl, WhatToWithdrawText
call PrintText
- ld hl, wNumBoxItems ; $d53a
+ ld hl, wNumBoxItems ; wNumBoxItems
ld a, l
- ld [$cf8b], a
+ ld [wcf8b], a
ld a, h
- ld [$cf8c], a
+ ld [wcf8c], a
xor a
- ld [$cf93], a
+ ld [wcf93], a
ld a, $3
- ld [wListMenuID], a ; $cf94
+ ld [wListMenuID], a ; wListMenuID
call DisplayListMenuID
jp c, Func_790c
call IsKeyItem
ld a, $1
- ld [$cf96], a
- ld a, [$d124]
+ ld [wcf96], a
+ ld a, [wd124]
and a
jr nz, .asm_7a64
ld hl, WithdrawHowManyText
@@ -173,7 +173,7 @@
cp $ff
jp z, Func_7a28
.asm_7a64
- ld hl, wNumBagItems ; $d31d
+ ld hl, wNumBagItems ; wNumBagItems
call AddItemToInventory
jr c, .asm_7a75
ld hl, CantCarryMoreText
@@ -180,7 +180,7 @@
call PrintText
jp Func_7a28
.asm_7a75
- ld hl, wNumBoxItems ; $d53a
+ ld hl, wNumBoxItems ; wNumBoxItems
call RemoveItemFromInventory
call WaitForSoundToFinish
ld a, (SFX_02_55 - SFX_Headers_02) / 3
@@ -192,9 +192,9 @@
Func_7a8f: ; 7a8f (1:7a8f)
xor a
- ld [wCurrentMenuItem], a ; $cc26
- ld [wListScrollOffset], a ; $cc36
- ld a, [wNumBoxItems] ; $d53a
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld [wListScrollOffset], a ; wcc36
+ ld a, [wNumBoxItems] ; wNumBoxItems
and a
jr nz, Func_7aa5
ld hl, NothingStoredText
@@ -204,15 +204,15 @@
Func_7aa5: ; 7aa5 (1:7aa5)
ld hl, WhatToTossText
call PrintText
- ld hl, wNumBoxItems ; $d53a
+ ld hl, wNumBoxItems ; wNumBoxItems
ld a, l
- ld [$cf8b], a
+ ld [wcf8b], a
ld a, h
- ld [$cf8c], a
+ ld [wcf8c], a
xor a
- ld [$cf93], a
+ ld [wcf93], a
ld a, $3
- ld [wListMenuID], a ; $cf94
+ ld [wListMenuID], a ; wListMenuID
push hl
call DisplayListMenuID
pop hl
@@ -221,11 +221,11 @@
call IsKeyItem
pop hl
ld a, $1
- ld [$cf96], a
- ld a, [$d124]
+ ld [wcf96], a
+ ld a, [wd124]
and a
jr nz, .asm_7aef
- ld a, [$cf91]
+ ld a, [wcf91]
call IsItemHM
jr c, .asm_7aef
push hl
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -9,7 +9,7 @@
ld [wListScrollOffset],a
ld [wLastMenuItem],a
inc a
- ld [$d11e],a
+ ld [wd11e],a
ld [$ffb7],a
.setUpGraphics
ld b,$08
@@ -22,7 +22,7 @@
xor a
ld [hli],a ; top menu item X
inc a
- ld [$cc37],a
+ ld [wcc37],a
inc hl
inc hl
ld a,6
@@ -32,12 +32,12 @@
jr c,.goToSideMenu ; if the player chose a pokemon from the list
.exitPokedex
xor a
- ld [$cc37],a
+ ld [wcc37],a
ld [wCurrentMenuItem],a
ld [wLastMenuItem],a
ld [$ffb7],a
- ld [$cd3a],a
- ld [$cd3b],a
+ ld [wcd3a],a
+ ld [wcd3b],a
pop af
ld [wListScrollOffset],a
call GBPalWhiteOutWithDelay3
@@ -68,10 +68,10 @@
push af
add b
inc a
- ld [$d11e],a
- ld a,[$d11e]
+ ld [wd11e],a
+ ld a,[wd11e]
push af
- ld a,[$cd3d]
+ ld a,[wWhichTrade]
push af
ld hl,wPokedexSeen
call IsPokemonBitSet
@@ -91,7 +91,7 @@
ld [hli],a ; menu watched keys (A button and B button)
xor a
ld [hli],a ; old menu item ID
- ld [$cc37],a
+ ld [wcc37],a
.handleMenuInput
call HandleMenuInput
bit 1,a ; was the B button pressed?
@@ -108,9 +108,9 @@
ld b,1
.exitSideMenu
pop af
- ld [$cd3d],a
+ ld [wWhichTrade],a
pop af
- ld [$d11e],a
+ ld [wd11e],a
pop af
ld [wListScrollOffset],a
pop af
@@ -140,7 +140,7 @@
jr .exitSideMenu
; play pokemon cry
.choseCry
- ld a,[$d11e]
+ ld a,[wd11e]
call GetCryData ; get cry data
call PlaySound ; play sound
jr .handleMenuInput
@@ -176,7 +176,7 @@
ld hl,wPokedexSeen
ld b,wPokedexSeenEnd - wPokedexSeen
call CountSetBits
- ld de,$d11e
+ ld de,wd11e
FuncCoord 16,3
ld hl,Coord
ld bc,$0103
@@ -184,7 +184,7 @@
ld hl,wPokedexOwned
ld b,wPokedexOwnedEnd - wPokedexOwned
call CountSetBits
- ld de,$d11e
+ ld de,wd11e
FuncCoord 16,6
ld hl,Coord
ld bc,$0103
@@ -220,7 +220,7 @@
jr .maxSeenPokemonLoop
.storeMaxSeenPokemon
ld a,b
- ld [$cd3d],a ; max seen pokemon
+ ld [wWhichTrade],a ; max seen pokemon
.loop
xor a
ld [H_AUTOBGTRANSFERENABLED],a
@@ -231,9 +231,9 @@
FuncCoord 1,3
ld hl,Coord
ld a,[wListScrollOffset]
- ld [$d11e],a
+ ld [wd11e],a
ld d,7
- ld a,[$cd3d]
+ ld a,[wWhichTrade]
cp a,7
jr nc,.printPokemonLoop
ld d,a
@@ -242,15 +242,15 @@
; loop to print pokemon pokedex numbers and names
; if the player has owned the pokemon, it puts a pokeball beside the name
.printPokemonLoop
- ld a,[$d11e]
+ ld a,[wd11e]
inc a
- ld [$d11e],a
+ ld [wd11e],a
push af
push de
push hl
ld de,-20
add hl,de
- ld de,$d11e
+ ld de,wd11e
ld bc,$8103
call PrintNumber ; print the pokedex number
ld de,20
@@ -285,7 +285,7 @@
add hl,bc
pop de
pop af
- ld [$d11e],a
+ ld [wd11e],a
dec d
jr nz,.printPokemonLoop
ld a,01
@@ -309,7 +309,7 @@
bit 7,a ; was Down pressed?
jr z,.checkIfRightPressed
.downPressed ; scroll down one row
- ld a,[$cd3d]
+ ld a,[wWhichTrade]
cp a,7
jp c,.loop
sub a,7
@@ -324,7 +324,7 @@
bit 4,a ; was Right pressed?
jr z,.checkIfLeftPressed
.rightPressed ; scroll down 7 rows
- ld a,[$cd3d]
+ ld a,[wWhichTrade]
cp a,7
jp c,.loop
sub a,6
@@ -385,10 +385,10 @@
; tests if a pokemon's bit is set in the seen or owned pokemon bit fields
; INPUT:
-; [$d11e] = pokedex number
+; [wd11e] = pokedex number
; hl = address of bit field
IsPokemonBitSet: ; 402c2 (10:42c2)
- ld a,[$d11e]
+ ld a,[wd11e]
dec a
ld c,a
ld b,2
@@ -407,19 +407,19 @@
; function to display pokedex data from inside the pokedex
ShowPokedexDataInternal: ; 402e2 (10:42e2)
- ld hl,$d72c
+ ld hl,wd72c
set 1,[hl]
ld a,$33 ; 3/7 volume
ld [$ff24],a
call GBPalWhiteOut ; zero all palettes
call ClearScreen
- ld a,[$d11e] ; pokemon ID
- ld [$cf91],a
+ ld a,[wd11e] ; pokemon ID
+ ld [wcf91],a
push af
ld b,04
call GoPAL_SET
pop af
- ld [$d11e],a
+ ld [wd11e],a
ld a,[$ffd7]
push af
xor a
@@ -467,7 +467,7 @@
ld hl,Coord
call PlaceString
ld hl,PokedexEntryPointers
- ld a,[$d11e]
+ ld a,[wd11e]
dec a
ld e,a
ld d,0
@@ -482,7 +482,7 @@
ld h,b
ld l,c
push de
- ld a,[$d11e]
+ ld a,[wd11e]
push af
call IndexToPokedex
FuncCoord 2,8
@@ -491,15 +491,15 @@
ld [hli],a
ld a,$f2
ld [hli],a
- ld de,$d11e
+ ld de,wd11e
ld bc,$8103
call PrintNumber ; print pokedex number
ld hl,wPokedexOwned
call IsPokemonBitSet
pop af
- ld [$d11e],a
- ld a,[$cf91]
- ld [$d0b5],a
+ ld [wd11e],a
+ ld a,[wcf91]
+ ld [wd0b5],a
pop de
push af
push bc
@@ -511,7 +511,7 @@
FuncCoord 1,1
ld hl,Coord
call LoadFlippedFrontSpriteByMonIndex ; draw pokemon picture
- ld a,[$cf91]
+ ld a,[wcf91]
call PlayCry ; play pokemon cry
pop hl
pop de
@@ -595,7 +595,7 @@
call GoPAL_SET_CF1C
call LoadTextBoxTilePatterns
call GBPalNormal
- ld hl,$d72c
+ ld hl,wd72c
res 1,[hl]
ld a,$77 ; max volume
ld [$ff24],a
@@ -637,10 +637,10 @@
INCLUDE "data/pokedex_entries.asm"
PokedexToIndex: ; 40ff9 (10:4ff9)
- ; converts the Pokédex number at $D11E to an index
+ ; converts the Pokédex number at wd11e to an index
push bc
push hl
- ld a,[$D11E]
+ ld a,[wd11e]
ld b,a
ld c,0
ld hl,PokedexOrder
@@ -652,16 +652,16 @@
jr nz,.loop
ld a,c
- ld [$D11E],a
+ ld [wd11e],a
pop hl
pop bc
ret
IndexToPokedex: ; 41010 (10:5010)
- ; converts the indexédex number at $D11E to a Pokédex number
+ ; converts the indexédex number at wd11e to a Pokédex number
push bc
push hl
- ld a,[$D11E]
+ ld a,[wd11e]
dec a
ld hl,PokedexOrder
ld b,0
@@ -668,7 +668,7 @@
ld c,a
add hl,bc
ld a,[hl]
- ld [$D11E],a
+ ld [wd11e],a
pop hl
pop bc
ret
--- a/engine/menu/prize_menu.asm
+++ b/engine/menu/prize_menu.asm
@@ -5,22 +5,22 @@
ld hl,RequireCoinCaseTextPtr
jp PrintText
.havingCoinCase
- ld hl,$D730
+ ld hl,wd730
set 6,[hl]
ld hl,ExchangeCoinsForPrizesTextPtr
call PrintText
; the following are the menu settings
xor a
- ld [$CC26],a
- ld [$CC2A],a
+ ld [wCurrentMenuItem],a
+ ld [wLastMenuItem],a
ld a,$03
- ld [$CC29],a
+ ld [wMenuWatchedKeys],a
ld a,$03
- ld [$CC28],a
+ ld [wMaxMenuItem],a
ld a,$04
- ld [$CC24],a
+ ld [wTopMenuItemY],a
ld a,$01
- ld [$CC25],a
+ ld [wTopMenuItemX],a
call PrintPrizePrice ; 687A
FuncCoord 0,2
ld hl,Coord
@@ -34,12 +34,12 @@
call HandleMenuInput ; menu choice handler
bit 1,a ; keypress = B (Cancel)
jr nz,.NoChoice
- ld a,[$CC26]
+ ld a,[wCurrentMenuItem]
cp a,$03 ; "NO,THANKS" choice
jr z,.NoChoice
call HandlePrizeChoice ; 14:68C6
.NoChoice
- ld hl,$D730
+ ld hl,wd730
res 6,[hl]
ret
@@ -60,14 +60,14 @@
; determine which one among the three
; prize-texts has been selected
; using the text ID (stored in [$FF8C])
-; load the three prizes at $D13D-$D13F
-; load the three prices at $D141-$D146
+; load the three prizes at wd13d-wd13f
+; load the three prices at wd141-wd146
; display the three prizes' names
; (distinguishing between Pokemon names
; and Items (specifically TMs) names)
ld a,[$FF8C]
sub a,$03 ; prize-texts' id are 3, 4 and 5
- ld [$D12F],a ; prize-texts' id (relative, i.e. 0, 1 or 2)
+ ld [wd12f],a ; prize-texts' id (relative, i.e. 0, 1 or 2)
add a
add a
ld d,$00
@@ -85,26 +85,26 @@
ld a,[hli]
ld h,[hl]
ld l,a
- ld de,$D141
+ ld de,wd141
ld bc,$0006
call CopyData
- ld a,[$D12F]
+ ld a,[wd12f]
cp a,$02 ;is TM_menu?
jr nz,.putMonName
ld a,[W_PRIZE1]
- ld [$D11E],a
+ ld [wd11e],a
call GetItemName
FuncCoord 2,4
ld hl,Coord
call PlaceString
ld a,[W_PRIZE2]
- ld [$D11E],a
+ ld [wd11e],a
call GetItemName
FuncCoord 2,6
ld hl,Coord
call PlaceString
ld a,[W_PRIZE3]
- ld [$D11E],a
+ ld [wd11e],a
call GetItemName
FuncCoord 2,8
ld hl,Coord
@@ -112,19 +112,19 @@
jr .putNoThanksText
.putMonName ; 14:67EC
ld a,[W_PRIZE1]
- ld [$D11E],a
+ ld [wd11e],a
call GetMonName
FuncCoord 2,4
ld hl,Coord
call PlaceString
ld a,[W_PRIZE2]
- ld [$D11E],a
+ ld [wd11e],a
call GetMonName
FuncCoord 2,6
ld hl,Coord
call PlaceString
ld a,[W_PRIZE3]
- ld [$D11E],a
+ ld [wd11e],a
call GetMonName
FuncCoord 2,8
ld hl,Coord
@@ -135,7 +135,7 @@
ld de,NoThanksText
call PlaceString
; put prices on the right side of the textbox
- ld de,$D141
+ ld de,wd141
FuncCoord 13,5
ld hl,Coord
; reg. c:
@@ -145,12 +145,12 @@
; Function $15CD displays BCD value (same routine
; used by text-command $02)
call PrintBCDNumber ; Print_BCD
- ld de,$D143
+ ld de,wd143
FuncCoord 13,7
ld hl,Coord
ld c,(%1 << 7 | 2)
call PrintBCDNumber
- ld de,$D145
+ ld de,wd145
FuncCoord 13,9
ld hl,Coord
ld c,(1 << 7 | 2)
@@ -187,11 +187,11 @@
db " @"
LoadCoinsToSubtract: ; 528b1 (14:68b1)
- ld a,[$D139] ; backup of selected menu_entry
+ ld a,[wd139] ; backup of selected menu_entry
add a
ld d,$00
ld e,a
- ld hl,$D141 ; first prize's price
+ ld hl,wd141 ; first prize's price
add hl,de ; get selected prize's price
xor a
ld [$FF9F],a
@@ -202,15 +202,15 @@
ret
HandlePrizeChoice: ; 528c6 (14:68c6)
- ld a,[$CC26] ; selected menu_entry
- ld [$D139],a
+ ld a,[wCurrentMenuItem] ; selected menu_entry
+ ld [wd139],a
ld d,$00
ld e,a
ld hl,W_PRIZE1
add hl,de
ld a,[hl]
- ld [$D11E],a
- ld a,[$D12F]
+ ld [wd11e],a
+ ld a,[wd12f]
cp a,$02 ; is prize a TM?
jr nz,.GetMonName
call GetItemName
@@ -221,16 +221,16 @@
ld hl,SoYouWantPrizeTextPtr
call PrintText
call YesNoChoice ; yes/no textbox
- ld a,[$CC26] ; yes/no answer (Y=0, N=1)
+ ld a,[wCurrentMenuItem] ; yes/no answer (Y=0, N=1)
and a
jr nz,.PrintOhFineThen
call LoadCoinsToSubtract
call HasEnoughCoins
jr c,.NotEnoughCoins
- ld a,[$D12F]
+ ld a,[wd12f]
cp a,$02
jr nz,.GiveMon
- ld a,[$D11E]
+ ld a,[wd11e]
ld b,a
ld a,1
ld c,a
@@ -238,8 +238,8 @@
jr nc,.BagFull
jr .SubtractCoins
.GiveMon ; 14:6912
- ld a,[$D11E]
- ld [$CF91],a
+ ld a,[wd11e]
+ ld [wcf91],a
push af
call GetPrizeMonLevel ; 14:6977
ld c,a
@@ -247,7 +247,7 @@
ld b,a
call GivePokemon
push af
- ld a,[$CCD3] ; XXX is there room?
+ ld a,[wccd3] ; XXX is there room?
and a
call z,WaitForTextScrollButtonPress
pop af
@@ -299,7 +299,7 @@
db "@"
GetPrizeMonLevel: ; 52977 (14:6977)
- ld a,[$CF91]
+ ld a,[wcf91]
ld b,a
ld hl,PrizeMonLevelDictionary
.loop ; 14:697E
@@ -310,7 +310,7 @@
jr .loop
.matchFound ; 14:6985
ld a,[hl]
- ld [$D127],a
+ ld [W_CURENEMYLVL],a
ret
INCLUDE "data/prize_mon_levels.asm"
--- a/engine/menu/start_menu.asm
+++ b/engine/menu/start_menu.asm
@@ -2,8 +2,8 @@
ld a,$04 ; hardcoded Bank, not sure what's it refers to
ld [H_LOADEDROMBANK],a
ld [$2000],a ; ROM bank 4
- ld a,[$d700] ; walking/biking/surfing
- ld [$d11a],a
+ ld a,[wd700] ; walking/biking/surfing
+ ld [wd11a],a
ld a, (SFX_02_3f - SFX_Headers_02) / 3 ; Start menu sound
call PlaySound
@@ -24,7 +24,7 @@
and a
jr nz,.loop
; if the player pressed tried to go past the top item, wrap around to the bottom
- ld a,[$d74b]
+ ld a,[wd74b]
bit 5,a ; does the player have the pokedex?
ld a,6 ; there are 7 menu items with the pokedex, so the max index is 6
jr nz,.wrapMenuItemId
@@ -37,7 +37,7 @@
bit 7,a
jr z,.buttonPressed
; if the player pressed tried to go past the bottom item, wrap around to the top
- ld a,[$d74b]
+ ld a,[wd74b]
bit 5,a ; does the player have the pokedex?
ld a,[wCurrentMenuItem]
ld c,7 ; there are 7 menu items with the pokedex
@@ -54,12 +54,12 @@
.buttonPressed ; A, B, or Start button pressed
call PlaceUnfilledArrowMenuCursor
ld a,[wCurrentMenuItem]
- ld [$cc2d],a ; save current menu item ID
+ ld [wcc2d],a ; save current menu item ID
ld a,b
and a,%00001010 ; was the Start button or B button pressed?
jp nz,CloseStartMenu
call SaveScreenTilesToBuffer2 ; copy background from wTileMap to wTileMapBackup2
- ld a,[$d74b]
+ ld a,[wd74b]
bit 5,a ; does the player have the pokedex?
ld a,[wCurrentMenuItem]
jr nz,.displayMenuItem
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -12,15 +12,15 @@
and a
jp z,RedisplayStartMenu
xor a
- ld [$cc35],a
- ld [$d07d],a
- ld [$cfcb],a
+ ld [wcc35],a
+ ld [wd07d],a
+ ld [wcfcb],a
call DisplayPartyMenu
jr .checkIfPokemonChosen
.loop
xor a
- ld [$cc35],a
- ld [$d07d],a
+ ld [wcc35],a
+ ld [wd07d],a
call GoBackToPartyMenu
.checkIfPokemonChosen
jr nc,.chosePokemon
@@ -32,9 +32,9 @@
.chosePokemon
call SaveScreenTilesToBuffer1 ; save screen
ld a,$04
- ld [$d125],a
+ ld [wd125],a
call DisplayTextBoxID ; display pokemon menu options
- ld hl,$cd3d
+ ld hl,wWhichTrade
ld bc,$020c ; max menu item ID, top menu item Y
ld e,5
.adjustMenuVariablesLoop
@@ -82,7 +82,7 @@
jp z,.choseStats
ld c,a
ld b,0
- ld hl,$cd3d
+ ld hl,wWhichTrade
add hl,bc
jp .choseOutOfBattleMove
.choseSwitch
@@ -91,13 +91,13 @@
jp c,StartMenu_Pokemon ; if not, no switching
call SwitchPartyMon_Stats
ld a,$04 ; swap pokemon positions menu
- ld [$d07d],a
+ ld [wd07d],a
call GoBackToPartyMenu
jp .checkIfPokemonChosen
.choseStats
call ClearSprites
xor a
- ld [$cc49],a
+ ld [wcc49],a
ld a,$36
call Predef
ld a,$37
@@ -145,11 +145,11 @@
jp .loop
.canFly
call ChooseFlyDestination
- ld a,[$d732]
+ ld a,[wd732]
bit 3,a ; did the player decide to fly?
jp nz,.goBackToMap
call LoadFontTilePatterns
- ld hl,$d72e
+ ld hl,wd72e
set 1,[hl]
jp StartMenu_Pokemon
.cut
@@ -157,7 +157,7 @@
jp z,.newBadgeRequired
ld a,$3c
call Predef
- ld a,[$cd6a]
+ ld a,[wcd6a]
and a
jp z,.loop
jp CloseTextDisplay
@@ -165,15 +165,15 @@
bit 4,a ; does the player have the Soul Badge?
jp z,.newBadgeRequired
callba CheckForForcedBikeSurf
- ld hl,$d728
+ ld hl,wd728
bit 1,[hl]
res 1,[hl]
jp z,.loop
ld a,SURFBOARD
- ld [$cf91],a
- ld [$d152],a
+ ld [wcf91],a
+ ld [wd152],a
call UseItem
- ld a,[$cd6a]
+ ld a,[wcd6a]
and a
jp z,.loop
call GBPalWhiteOutWithDelay3
@@ -189,7 +189,7 @@
bit 0,a ; does the player have the Boulder Badge?
jp z,.newBadgeRequired
xor a
- ld [$d35d],a
+ ld [wd35d],a
ld hl,.flashLightsAreaText
call PrintText
call GBPalWhiteOutWithDelay3
@@ -199,10 +199,10 @@
db "@"
.dig
ld a,ESCAPE_ROPE
- ld [$cf91],a
- ld [$d152],a
+ ld [wcf91],a
+ ld [wd152],a
call UseItem
- ld a,[$cd6a]
+ ld a,[wcd6a]
and a
jp z,.loop
call GBPalWhiteOutWithDelay3
@@ -219,10 +219,10 @@
.canTeleport
ld hl,.warpToLastPokemonCenterText
call PrintText
- ld hl,$d732
+ ld hl,wd732
set 3,[hl]
set 6,[hl]
- ld hl,$d72e
+ ld hl,wd72e
set 1,[hl]
res 4,[hl]
ld c,60
@@ -261,14 +261,14 @@
ld a,[H_QUOTIENT + 2]
sbc b
jp nc,.notHealthyEnough
- ld a,[$cc2b]
+ ld a,[wcc2b]
push af
ld a,POTION
- ld [$cf91],a
- ld [$d152],a
+ ld [wcf91],a
+ ld [wd152],a
call UseItem
pop af
- ld [$cc2b],a
+ ld [wcc2b],a
jp .loop
.notHealthyEnough ; if current HP is less than 1/5 of max HP
ld hl,.notHealthyEnoughText
@@ -314,19 +314,19 @@
jr .exitMenu
.notInLinkBattle
ld bc,wNumBagItems
- ld hl,$cf8b
+ ld hl,wcf8b
ld a,c
ld [hli],a
- ld [hl],b ; store item bag pointer at $cf8b (for DisplayListMenuID)
+ ld [hl],b ; store item bag pointer at wcf8b (for DisplayListMenuID)
xor a
- ld [$cf93],a
+ ld [wcf93],a
ld a,ITEMLISTMENU
ld [wListMenuID],a
- ld a,[$cc2c]
+ ld a,[wcc2c]
ld [wCurrentMenuItem],a
call DisplayListMenuID
ld a,[wCurrentMenuItem]
- ld [$cc2c],a
+ ld [wcc2c],a
jr nc,.choseItem
.exitMenu
call LoadScreenTilesFromBuffer2 ; restore saved screen
@@ -346,13 +346,13 @@
ld [Coord],a
call PlaceUnfilledArrowMenuCursor
xor a
- ld [$cc35],a
- ld a,[$cf91]
+ ld [wcc35],a
+ ld a,[wcf91]
cp a,BICYCLE
jp z,.useOrTossItem
.notBicycle1
ld a,$06 ; use/toss menu
- ld [$d125],a
+ ld [wd125],a
call DisplayTextBoxID
ld hl,wTopMenuItemY
ld a,11
@@ -374,14 +374,14 @@
jr z,.useOrTossItem
jp ItemMenuLoop
.useOrTossItem ; if the player made the choice to use or toss the item
- ld a,[$cf91]
- ld [$d11e],a
+ ld a,[wcf91]
+ ld [wd11e],a
call GetItemName
- call CopyStringToCF4B ; copy name to $cf4b
- ld a,[$cf91]
+ call CopyStringToCF4B ; copy name to wcf4b
+ ld a,[wcf91]
cp a,BICYCLE
jr nz,.notBicycle2
- ld a,[$d732]
+ ld a,[wd732]
bit 5,a
jr z,.useItem_closeMenu
ld hl,CannotGetOffHereText
@@ -392,8 +392,8 @@
and a
jr nz,.tossItem
.useItem
- ld [$d152],a
- ld a,[$cf91]
+ ld [wd152],a
+ ld a,[wcf91]
cp a,HM_01
jr nc,.useItem_partyMenu
ld hl,UsableItems_CloseMenu
@@ -400,7 +400,7 @@
ld de,1
call IsInArray
jr c,.useItem_closeMenu
- ld a,[$cf91]
+ ld a,[wcf91]
ld hl,UsableItems_PartyMenu
ld de,1
call IsInArray
@@ -409,34 +409,34 @@
jp ItemMenuLoop
.useItem_closeMenu
xor a
- ld [$d152],a
+ ld [wd152],a
call UseItem
- ld a,[$cd6a]
+ ld a,[wcd6a]
and a
jp z,ItemMenuLoop
jp CloseStartMenu
.useItem_partyMenu
- ld a,[$cfcb]
+ ld a,[wcfcb]
push af
call UseItem
- ld a,[$cd6a]
+ ld a,[wcd6a]
cp a,$02
jp z,.partyMenuNotDisplayed
call GBPalWhiteOutWithDelay3
call Func_3dbe
pop af
- ld [$cfcb],a
+ ld [wcfcb],a
jp StartMenu_Item
.partyMenuNotDisplayed
pop af
- ld [$cfcb],a
+ ld [wcfcb],a
jp ItemMenuLoop
.tossItem
call IsKeyItem
- ld a,[$d124]
+ ld a,[wd124]
and a
jr nz,.skipAskingQuantity
- ld a,[$cf91]
+ ld a,[wcf91]
call IsItemHM
jr c,.skipAskingQuantity
call DisplayChooseQuantityMenu
@@ -580,7 +580,7 @@
ld de,$8d70
call TrainerInfo_FarCopyData
call EnableLCD
- ld hl,$cd3d
+ ld hl,wWhichTrade
ld a,18 + 1
ld [hli],a
dec a
@@ -589,7 +589,7 @@
FuncCoord 0,0
ld hl,Coord
call TrainerInfo_DrawTextBox
- ld hl,$cd3d
+ ld hl,wWhichTrade
ld a,16 + 1
ld [hli],a
dec a
@@ -624,12 +624,12 @@
call PrintBCDNumber
FuncCoord 9,6
ld hl,Coord
- ld de,$da41 ; hours
+ ld de,W_PLAYTIMEHOURS + 1 ; hours
ld bc,$4103
call PrintNumber
ld [hl],$d6 ; colon tile ID
inc hl
- ld de,$da43 ; minutes
+ ld de,W_PLAYTIMEMINUTES + 1 ; minutes
ld bc,$8102
jp PrintNumber
@@ -650,15 +650,15 @@
; height is always 6
; INPUT:
; hl = destination address
-; [$cd3d] = width + 1
-; [$cd3e] = width
-; [$cd3f] = distance from the end of a text box row to the start of the next
+; [wWhichTrade] = width + 1
+; [wTrainerEngageDistance] = width
+; [wTrainerFacingDirection] = distance from the end of a text box row to the start of the next
TrainerInfo_DrawTextBox: ; 135a0 (4:75a0)
ld a,$79 ; upper left corner tile ID
ld de,$7a7b ; top edge and upper right corner tile ID's
call TrainerInfo_DrawHorizontalEdge ; draw top edge
call TrainerInfo_NextTextBoxRow
- ld a,[$cd3d] ; width of the text box plus one
+ ld a,[wWhichTrade] ; width of the text box plus one
ld e,a
ld d,0
ld c,6 ; height of the text box
@@ -674,7 +674,7 @@
TrainerInfo_DrawHorizontalEdge: ; 135c3 (4:75c3)
ld [hli],a ; place left corner tile
- ld a,[$cd3e] ; width of the text box
+ ld a,[wTrainerEngageDistance] ; width of the text box
ld c,a
ld a,d
.loop
@@ -686,7 +686,7 @@
ret
TrainerInfo_NextTextBoxRow: ; 135d0 (4:75d0)
- ld a,[$cd3f] ; distance to the start of the next row
+ ld a,[wTrainerFacingDirection] ; distance to the start of the next row
.loop
inc hl
dec a
@@ -708,7 +708,7 @@
ret
StartMenu_SaveReset: ; 135e3 (4:75e3)
- ld a,[$d72e]
+ ld a,[wd72e]
bit 6,a ; is the player using the link feature?
jp nz,Init
ld a,$3f
@@ -729,9 +729,9 @@
SwitchPartyMon: ; 13613 (4:7613)
call SwitchPartyMon_Stats
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
call SwitchPartyMon_OAM
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
call SwitchPartyMon_OAM
jp RedrawPartyMenu_
@@ -762,42 +762,42 @@
jp PlaySound
SwitchPartyMon_Stats: ; 13653 (4:7653)
- ld a, [$cc35]
+ ld a, [wcc35]
and a
jr nz, .asm_13661
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
inc a
- ld [$cc35], a
+ ld [wcc35], a
ret
.asm_13661
xor a
- ld [$d07d], a
- ld a, [$cc35]
+ ld [wd07d], a
+ ld a, [wcc35]
dec a
ld b, a
- ld a, [wCurrentMenuItem] ; $cc26
- ld [wWhichTrade], a ; $cd3d
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+ ld [wWhichTrade], a ; wWhichTrade
cp b
jr nz, .asm_1367b
xor a
- ld [$cc35], a
- ld [$d07d], a
+ ld [wcc35], a
+ ld [wd07d], a
ret
.asm_1367b
ld a, b
- ld [$cc35], a
+ ld [wcc35], a
push hl
push de
- ld hl, W_PARTYMON1 ; $d164
+ ld hl, W_PARTYMON1 ; W_PARTYMON1
ld d, h
ld e, l
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
add l
ld l, a
jr nc, .asm_1368e
inc h
.asm_1368e
- ld a, [$cc35]
+ ld a, [wcc35]
add e
ld e, a
jr nc, .asm_13696
@@ -809,17 +809,17 @@
ld [hl], a
ld a, [H_DIVIDEND] ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT)
ld [de], a
- ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA)
+ ld hl, W_PARTYMON1_NUM ; W_PARTYMON1_NUM (aliases: W_PARTYMON1DATA)
ld bc, $2c
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
call AddNTimes
push hl
- ld de, $cc97
+ ld de, wcc97
ld bc, $2c
call CopyData
- ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA)
+ ld hl, W_PARTYMON1_NUM ; W_PARTYMON1_NUM (aliases: W_PARTYMON1DATA)
ld bc, $2c
- ld a, [$cc35]
+ ld a, [wcc35]
call AddNTimes
pop de
push hl
@@ -826,18 +826,18 @@
ld bc, $2c
call CopyData
pop de
- ld hl, $cc97
+ ld hl, wcc97
ld bc, $2c
call CopyData
- ld hl, W_PARTYMON1OT ; $d273
- ld a, [wCurrentMenuItem] ; $cc26
+ ld hl, W_PARTYMON1OT ; wd273
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
call SkipFixedLengthTextEntries
push hl
- ld de, $cc97
+ ld de, wcc97
ld bc, $b
call CopyData
- ld hl, W_PARTYMON1OT ; $d273
- ld a, [$cc35]
+ ld hl, W_PARTYMON1OT ; wd273
+ ld a, [wcc35]
call SkipFixedLengthTextEntries
pop de
push hl
@@ -844,18 +844,18 @@
ld bc, $b
call CopyData
pop de
- ld hl, $cc97
+ ld hl, wcc97
ld bc, $b
call CopyData
- ld hl, W_PARTYMON1NAME ; $d2b5
- ld a, [wCurrentMenuItem] ; $cc26
+ ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
call SkipFixedLengthTextEntries
push hl
- ld de, $cc97
+ ld de, wcc97
ld bc, $b
call CopyData
- ld hl, W_PARTYMON1NAME ; $d2b5
- ld a, [$cc35]
+ ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
+ ld a, [wcc35]
call SkipFixedLengthTextEntries
pop de
push hl
@@ -862,14 +862,14 @@
ld bc, $b
call CopyData
pop de
- ld hl, $cc97
+ ld hl, wcc97
ld bc, $b
call CopyData
- ld a, [$cc35]
- ld [wWhichTrade], a ; $cd3d
+ ld a, [wcc35]
+ ld [wWhichTrade], a ; wWhichTrade
xor a
- ld [$cc35], a
- ld [$d07d], a
+ ld [wcc35], a
+ ld [wd07d], a
pop de
pop hl
ret
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -1,18 +1,18 @@
; Predef 0x37
StatusScreen: ; 12953 (4:6953)
call LoadMonData
- ld a, [$cc49]
+ ld a, [wcc49]
cp $2 ; 2 means we're in a PC box
jr c, .DontRecalculate ; 0x1295b $14
- ld a, [$cf9b]
- ld [$cfb9], a
- ld [$d127], a
- ld hl, $cfa8
- ld de, $cfba
+ ld a, [wcf9b]
+ ld [wcfb9], a
+ ld [W_CURENEMYLVL], a
+ ld hl, wcfa8
+ ld de, wcfba
ld b, $1
call CalcStats ; Recalculate stats
.DontRecalculate
- ld hl, $d72c
+ ld hl, wd72c
set 1, [hl]
ld a, $33
ld [$ff24], a ; Reduce the volume
@@ -60,13 +60,13 @@
FuncCoord 11,3
ld hl, Coord
PREDEF DrawHPBarPredef ; predef $5f
- ld hl, $cf25
+ ld hl, wcf25
call GetHealthBarColor
ld b, $3
call GoPAL_SET ; SGB palette
FuncCoord 16,6
ld hl, Coord
- ld de, $cf9c
+ ld de, wcf9c
call PrintStatusCondition
jr nz, .StatusWritten ; 0x129fc $9
FuncCoord 16,6
@@ -81,14 +81,14 @@
FuncCoord 14,2
ld hl, Coord
call PrintLevel ; Pokémon level
- ld a, [$d0b8]
- ld [$d11e], a
- ld [$d0b5], a
+ ld a, [W_MONHDEXNUM]
+ ld [wd11e], a
+ ld [wd0b5], a
ld a, $3a
call Predef
FuncCoord 3,7
ld hl, Coord
- ld de, $d11e
+ ld de, wd11e
ld bc, $8103 ; Zero-padded, 3
call PrintNumber ; Pokémon no.
FuncCoord 11,10
@@ -111,7 +111,7 @@
call PlaceString ; OT
FuncCoord 12,14
ld hl, Coord
- ld de, $cfa4
+ ld de, wcfa4
ld bc, $8205 ; 5
call PrintNumber ; ID Number
ld d, $0
@@ -118,10 +118,10 @@
call PrintStatsBox
call Delay3
call GBPalNormal
- FuncCoord 1, 0 ; $c3a1
+ FuncCoord 1, 0
ld hl, Coord
call LoadFlippedFrontSpriteByMonIndex ; draw Pokémon picture
- ld a, [$cf91]
+ ld a, [wcf91]
call PlayCry ; play Pokémon cry
call WaitForTextScrollButtonPress ; wait for button
pop af
@@ -128,7 +128,7 @@
ld [$ffd7], a
ret
.unk_12a7e ; 0x12a7e ; I don't know what this does, iterates over pointers?
- ld a, [$cc49]
+ ld a, [wcc49]
add a
ld c, a
ld b, $0
@@ -136,7 +136,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- ld a, [$cc49]
+ ld a, [wcc49]
cp $3
ret z
ld a, [wWhichPokemon]
@@ -212,7 +212,7 @@
ld b, $8
ld c, $9
call TextBoxBorder
- FuncCoord 11, 3 ; $c3e7
+ FuncCoord 11, 3
ld hl, Coord
ld bc, $0018
.PrintStats
@@ -223,14 +223,14 @@
pop hl
pop bc
add hl, bc
- ld de, $cfbc
+ ld de, wcfbc
ld bc, $0203 ; three digits
call PrintStat
- ld de, $cfbe
+ ld de, wcfbe
call PrintStat
- ld de, $cfc0
+ ld de, wcfc0
call PrintStat
- ld de, $cfc2
+ ld de, wcfc2
jp PrintNumber
PrintStat
push hl
@@ -253,10 +253,10 @@
ld [$ffd7], a
ld [$ffba], a
ld bc, $0005
- ld hl, $d0dc
+ ld hl, wd0dc
call FillMemory
- ld hl, $cfa0
- ld de, $d0dc
+ ld hl, wcfa0
+ ld de, wd0dc
ld bc, $0004
call CopyData
callab Func_39b87
@@ -264,7 +264,7 @@
ld hl, Coord
ld bc, $050a
call ClearScreenArea ; Clear under name
- FuncCoord 19, 3 ; $c3ef
+ FuncCoord 19, 3
ld hl, Coord
ld [hl], $78
FuncCoord 0,8
@@ -274,9 +274,9 @@
call TextBoxBorder ; Draw move container
FuncCoord 2,9
ld hl, Coord
- ld de, $d0e1
+ ld de, wd0e1
call PlaceString ; Print moves
- ld a, [$cd6c]
+ ld a, [wcd6c]
inc a
ld c, a
ld a, $4
@@ -294,7 +294,7 @@
ld a, "-"
call Func_12ccb ; Fill the rest with --
.InitPP ; 12bbb
- ld hl, $cfa0
+ ld hl, wcfa0
FuncCoord 14,10
ld de, Coord
ld b, $0
@@ -322,16 +322,16 @@
add hl, bc
ld a, [hl]
and $3f
- ld [$cd71], a
+ ld [wcd71], a
ld h, d
ld l, e
push hl
- ld de, $cd71
+ ld de, wcd71
ld bc, $0102
call PrintNumber
ld a, "/"
ld [hli], a
- ld de, $d11e
+ ld de, wd11e
ld bc, $0102
call PrintNumber
pop hl
@@ -350,12 +350,12 @@
ld hl, Coord
ld de, EXPPointsText
call PlaceString
- ld a, [$cfb9] ; level
+ ld a, [wcfb9] ; level
push af
cp 100
jr z, .Level100 ; 0x12c20 $4
inc a
- ld [$cfb9], a ; Increase temporarily if not 100
+ ld [wcfb9], a ; Increase temporarily if not 100
.Level100
FuncCoord 14,6
ld hl, Coord
@@ -364,14 +364,14 @@
inc hl
call PrintLevel
pop af
- ld [$cfb9], a
- ld de, $cfa6
+ ld [wcfb9], a
+ ld de, wcfa6
FuncCoord 12,4
ld hl, Coord
ld bc, $0307
call PrintNumber ; exp
call .asm_12c86
- ld de, $cfa6
+ ld de, wcfa6
FuncCoord 7,6
ld hl, Coord
ld bc, $0307
@@ -382,8 +382,8 @@
FuncCoord 9,1
ld hl, Coord
call Func_12cc3
- ld a, [$d0b8]
- ld [$d11e], a
+ ld a, [W_MONHDEXNUM]
+ ld [wd11e], a
call GetMonName
FuncCoord 9,1
ld hl, Coord
@@ -394,7 +394,7 @@
call WaitForTextScrollButtonPress ; wait for button
pop af
ld [$ffd7], a
- ld hl, $d72c
+ ld hl, wd72c
res 1, [hl]
ld a, $77
ld [$ff24], a
@@ -401,13 +401,13 @@
call GBPalWhiteOut
jp ClearScreen
.asm_12c86 ; This does some magic with lvl/exp?
- ld a, [$cfb9] ; Load level
+ ld a, [wcfb9] ; Load level
cp $64
jr z, .asm_12ca7 ; 0x12c8b $1a ; If 100
inc a
ld d, a
callab CalcExperience
- ld hl, $cfa8
+ ld hl, wcfa8
ld a, [$ff98]
sub [hl]
ld [hld], a
@@ -419,7 +419,7 @@
ld [hld], a
ret
.asm_12ca7
- ld hl, $cfa6
+ ld hl, wcfa6
xor a
ld [hli], a
ld [hli], a
--- a/engine/menu/vending_machine.asm
+++ b/engine/menu/vending_machine.asm
@@ -2,41 +2,41 @@
ld hl, VendingMachineText1
call PrintText
ld a, $13
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
xor a
- ld [wCurrentMenuItem], a ; $cc26
- ld [wLastMenuItem], a ; $cc2a
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld [wLastMenuItem], a ; wLastMenuItem
ld a, $3
- ld [wMenuWatchedKeys], a ; $cc29
+ ld [wMenuWatchedKeys], a ; wMenuWatchedKeys
ld a, $3
- ld [wMaxMenuItem], a ; $cc28
+ ld [wMaxMenuItem], a ; wMaxMenuItem
ld a, $5
- ld [wTopMenuItemY], a ; $cc24
+ ld [wTopMenuItemY], a ; wTopMenuItemY
ld a, $1
- ld [wTopMenuItemX], a ; $cc25
- ld hl, $d730
+ ld [wTopMenuItemX], a ; wTopMenuItemX
+ ld hl, wd730
set 6, [hl]
- FuncCoord 0, 3 ; $c3dc
+ FuncCoord 0, 3
ld hl, Coord
ld b, $8
ld c, $c
call TextBoxBorder
call UpdateSprites
- FuncCoord 2, 5 ; $c406
+ FuncCoord 2, 5
ld hl, Coord
ld de, DrinkText
call PlaceString
- FuncCoord 9, 6 ; $c421
+ FuncCoord 9, 6
ld hl, Coord
ld de, DrinkPriceText
call PlaceString
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
call HandleMenuInput
bit 1, a
jr nz, .asm_74f93
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
cp $3
jr z, .asm_74f93
xor a
@@ -69,12 +69,12 @@
ld hl, VendingMachineText5
call PrintText
ld hl, $ffde
- ld de, wPlayerMoney + 2 ; $d349
+ ld de, wPlayerMoney + 2 ; wd349
ld c, $3
ld a, $c ; SubtractBCDPredef
call Predef
ld a, $13
- ld [$d125], a
+ ld [wd125], a
jp DisplayTextBoxID
.BagFull
ld hl, VendingMachineText6
@@ -116,7 +116,7 @@
Func_74fe7: ; 74fe7 (1d:4fe7)
ld hl, VendingPrices
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
add a
add a
ld d, $0
--- a/engine/mon_party_sprites.asm
+++ b/engine/mon_party_sprites.asm
@@ -1,16 +1,16 @@
AnimatePartyMon_ForceSpeed1: ; 716f7 (1c:56f7)
xor a
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
ld b, a
inc a
jr GetAnimationSpeed
-; $cf1f contains the party mon's health bar colors
+; wcf1f contains the party mon's health bar colors
; 0: green
; 1: yellow
; 2: red
AnimatePartyMon: ; 716ff (1c:56ff)
- ld hl, $cf1f
+ ld hl, wcf1f
ld a, [wCurrentMenuItem]
ld c, a
ld b, $0
@@ -21,13 +21,13 @@
ld c, a
ld hl, PartyMonSpeeds
add hl, bc
- ld a, [$cf1b]
+ ld a, [wcf1b]
xor $1
add [hl]
ld c, a
add a
ld b, a
- ld a, [W_SUBANIMTRANSFORM] ; $d08b
+ ld a, [W_SUBANIMTRANSFORM] ; W_SUBANIMTRANSFORM
and a
jr z, .resetSprites
cp c
@@ -38,11 +38,11 @@
jr nz, .resetTimer
xor a
.resetTimer
- ld [W_SUBANIMTRANSFORM], a ; $d08b
+ ld [W_SUBANIMTRANSFORM], a ; W_SUBANIMTRANSFORM
jp DelayFrame
.resetSprites
push bc
- ld hl, $cc5b
+ ld hl, wcc5b
ld de, wOAMBuffer
ld bc, $60
call CopyData
@@ -51,7 +51,7 @@
jr .incTimer
.animateSprite
push bc
- ld hl, $c302 ; OAM tile id
+ ld hl, wOAMBuffer + $02 ; OAM tile id
ld bc, $10
ld a, [wCurrentMenuItem]
call AddNTimes
@@ -298,13 +298,13 @@
push de
push bc
ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c
- ld hl, W_PARTYMON1 ; $d164
+ ld hl, W_PARTYMON1 ; W_PARTYMON1
ld e, a
ld d, $0
add hl, de
ld a, [hl]
call GetPartyMonSpriteID
- ld [$cd5b], a
+ ld [wcd5b], a
call Func_718c3
pop bc
pop de
@@ -314,13 +314,13 @@
Func_71882: ; 71882 (1c:5882)
xor a
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
- ld a, [$cd5d]
+ ld a, [wcd5d]
call GetPartyMonSpriteID
- ld [$cd5b], a
+ ld [wcd5b], a
jr Func_718c3
Func_71890: ; 71890 (1c:5890)
- ld a, [$cf91]
+ ld a, [wcf91]
call GetPartyMonSpriteID
push af
ld hl, $8000
@@ -330,7 +330,7 @@
ld hl, $8040
call Func_718ac
xor a
- ld [$cd5d], a
+ ld [wcd5d], a
jr Func_71882
Func_718ac: ; 718ac (1c:58ac)
@@ -371,15 +371,15 @@
call Func_71281
.asm_718dd
ld hl, wOAMBuffer
- ld de, $cc5b
+ ld de, wcc5b
ld bc, $60
jp CopyData
GetPartyMonSpriteID: ; 718e9 (1c:58e9)
- ld [$d11e], a
+ ld [wd11e], a
ld a, $3a
call Predef ; indirect jump to IndexToPokedex (41010 (10:5010))
- ld a, [$d11e]
+ ld a, [wd11e]
ld c, a
dec a
srl a
--- a/engine/oak_speech.asm
+++ b/engine/oak_speech.asm
@@ -1,11 +1,11 @@
SetDefaultNames: ; 60ca (1:60ca)
- ld a, [$d358]
+ ld a, [wd358]
push af
- ld a, [W_OPTIONS] ; $d355
+ ld a, [W_OPTIONS] ; W_OPTIONS
push af
- ld a, [$d732]
+ ld a, [wd732]
push af
- ld hl, W_PLAYERNAME ; $d158
+ ld hl, W_PLAYERNAME ; wd158
ld bc, $d8a
xor a
call FillMemory
@@ -14,20 +14,20 @@
xor a
call FillMemory
pop af
- ld [$d732], a
+ ld [wd732], a
pop af
- ld [W_OPTIONS], a ; $d355
+ ld [W_OPTIONS], a ; W_OPTIONS
pop af
- ld [$d358], a
- ld a, [$d08a]
+ ld [wd358], a
+ ld a, [wd08a]
and a
call z, Func_5bff
ld hl, NintenText
- ld de, W_PLAYERNAME ; $d158
+ ld de, W_PLAYERNAME ; wd158
ld bc, $b
call CopyData
ld hl, SonyText
- ld de, W_RIVALNAME ; $d34a
+ ld de, W_RIVALNAME ; wd34a
ld bc, $b
jp CopyData
@@ -43,18 +43,18 @@
call SetDefaultNames
ld a,$18
call Predef ; indirect jump to InitializePlayerData
- ld hl,$D53A
+ ld hl,wNumBoxItems
ld a,POTION
- ld [$CF91],a
+ ld [wcf91],a
ld a,1
- ld [$CF96],a
+ ld [wcf96],a
call AddItemToInventory ; give one potion
- ld a,[$D07C]
- ld [$D71A],a
+ ld a,[W_ANIMATIONID]
+ ld [wd71a],a
call Func_62ce
xor a
ld [$FFD7],a
- ld a,[$D732]
+ ld a,[wd732]
bit 1,a ; XXX when is bit 1 set?
jp nz,Func_61bc ; easter egg: skip the intro
ld de,ProfOakPic
@@ -66,10 +66,10 @@
call GBFadeOut2
call ClearScreen
ld a,NIDORINO
- ld [$D0B5],a ; pic displayed is stored at this location
- ld [$CF91],a
+ ld [wd0b5],a ; pic displayed is stored at this location
+ ld [wcf91],a
call GetMonHeader ; this is also related to the pic
- FuncCoord 6, 4 ; $c3f6
+ FuncCoord 6, 4
ld hl,Coord ; position on tilemap the pic is displayed
call LoadFlippedFrontSpriteByMonIndex ; displays pic?
call MovePicLeft
@@ -101,7 +101,7 @@
ld bc,(Bank(RedPicFront) << 8) | $00
call IntroPredef3B
call GBFadeIn2
- ld a,[$D72D]
+ ld a,[wd72d]
and a
jr nz,.next
ld hl,OakSpeechText3
@@ -132,12 +132,12 @@
ld a,[H_LOADEDROMBANK]
push af
ld a,2
- ld [$C0EF],a
- ld [$C0F0],a
+ ld [wc0ef],a
+ ld [wc0f0],a
ld a,$A
ld [wMusicHeaderPointer],a
ld a,$FF
- ld [$C0EE],a
+ ld [wc0ee],a
call PlaySound ; stop music
pop af
ld [H_LOADEDROMBANK],a
@@ -144,7 +144,7 @@
ld [$2000],a
ld c,$14
call DelayFrames
- FuncCoord 6, 5 ; $c40a
+ FuncCoord 6, 5
ld hl,Coord
ld b,7
ld c,7
@@ -151,7 +151,7 @@
call ClearScreenArea
call LoadTextBoxTilePatterns
ld a,1
- ld [$CFCB],a
+ ld [wcfcb],a
ld c,$32
call DelayFrames
call GBFadeOut2
@@ -226,10 +226,10 @@
pop bc
ld a,c
and a
- FuncCoord 15, 1 ; $c3c3
+ FuncCoord 15, 1
ld hl,Coord
jr nz,.next
- FuncCoord 6, 4 ; $c3f6
+ FuncCoord 6, 4
ld hl,Coord
.next
xor a
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -2,20 +2,20 @@
call Func_6a12
ld de, DefaultNamesPlayer ; $6aa8
call DisplayIntroNameTextBox
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
and a
jr z, .asm_697a
ld hl, DefaultNamesPlayerList ; $6af2
call Func_6ad6
- ld de, W_PLAYERNAME ; $d158
+ ld de, W_PLAYERNAME ; wd158
call Func_69ec
jr .asm_6999
.asm_697a
- ld hl, W_PLAYERNAME ; $d158
+ ld hl, W_PLAYERNAME ; wd158
xor a
- ld [$d07d], a
+ ld [wd07d], a
call DisplayNamingScreen
- ld a, [$cf4b]
+ ld a, [wcf4b]
cp $50
jr z, .asm_697a
call ClearScreen
@@ -35,20 +35,20 @@
call Func_6a12 ; 0x69a4 call 0x6a12
ld de, DefaultNamesRival
call DisplayIntroNameTextBox
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
and a
jr z, .asm_69c1
ld hl, DefaultNamesRivalList
call Func_6ad6
- ld de, W_RIVALNAME ; $d34a
+ ld de, W_RIVALNAME ; wd34a
call Func_69ec
jr .asm_69e1
.asm_69c1
- ld hl, W_RIVALNAME ; $d34a
+ ld hl, W_RIVALNAME ; wd34a
ld a, $1
- ld [$d07d], a
+ ld [wd07d], a
call DisplayNamingScreen
- ld a, [$cf4b]
+ ld a, [wcf4b]
cp $50
jr z, .asm_69c1
call ClearScreen
@@ -72,11 +72,11 @@
ld c, $a
call DelayFrames
pop de
- ld hl, $cd6d
+ ld hl, wcd6d
ld bc, $b
call CopyData
call Delay3
- FuncCoord 12, 4 ; $c3fc
+ FuncCoord 12, 4
ld hl, Coord
ld de, $67d
ld a, $ff
@@ -83,7 +83,7 @@
jr asm_6a19
Func_6a12: ; 6a12 (1:6a12)
- FuncCoord 5, 4 ; $c3f5
+ FuncCoord 5, 4
ld hl, Coord
ld de, $67d
xor a
@@ -161,25 +161,25 @@
ld b, $a
ld c, $9
call TextBoxBorder
- FuncCoord 3, 0 ; $c3a3
+ FuncCoord 3, 0
ld hl, Coord
ld de, .namestring ; $6aa3
call PlaceString
pop de
- FuncCoord 2, 2 ; $c3ca
+ FuncCoord 2, 2
ld hl, Coord
call PlaceString
call UpdateSprites
xor a
- ld [wCurrentMenuItem], a ; $cc26
- ld [wLastMenuItem], a ; $cc2a
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld [wLastMenuItem], a ; wLastMenuItem
inc a
- ld [wTopMenuItemX], a ; $cc25
- ld [wMenuWatchedKeys], a ; $cc29
+ ld [wTopMenuItemX], a ; wTopMenuItemX
+ ld [wMenuWatchedKeys], a ; wMenuWatchedKeys
inc a
- ld [wTopMenuItemY], a ; $cc24
+ ld [wTopMenuItemY], a ; wTopMenuItemY
inc a
- ld [wMaxMenuItem], a ; $cc28
+ ld [wMaxMenuItem], a ; wMaxMenuItem
jp HandleMenuInput
.namestring ; 6aa3 (1:6aa3)
@@ -235,7 +235,7 @@
.asm_6ae7
ld h, d
ld l, e
- ld de, $cd6d
+ ld de, wcd6d
ld bc, $14
jp CopyData
IF _RED
--- a/engine/overworld/cable_club_npc.asm
+++ b/engine/overworld/cable_club_npc.asm
@@ -1,7 +1,7 @@
CableClubNPC: ; 71c5 (1:71c5)
ld hl, CableClubNPCText1
call PrintText
- ld a, [$d74b]
+ ld a, [wd74b]
bit 5, a
jp nz, Func_71e1
ld c, $3c
@@ -12,9 +12,9 @@
Func_71e1: ; 71e1 (1:71e1)
ld a, $1
- ld [$cc34], a
+ ld [wMenuJoypadPollCount], a
ld a, $5a
- ld [$cc47], a
+ ld [wcc47], a
.asm_71eb
ld a, [$ffaa]
cp $2
@@ -29,9 +29,9 @@
ld [$ffad], a
ld a, $80
ld [$ff02], a
- ld a, [$cc47]
+ ld a, [wcc47]
dec a
- ld [$cc47], a
+ ld [wcc47], a
jr z, .asm_7287 ; 0x720b $7a
ld a, $1
ld [$ff01], a
@@ -48,11 +48,11 @@
ld hl, CableClubNPCText2
call PrintText
xor a
- ld [$cc34], a
+ ld [wMenuJoypadPollCount], a
call YesNoChoice
ld a, $1
- ld [$cc34], a
- ld a, [$cc26]
+ ld [wMenuJoypadPollCount], a
+ ld a, [wCurrentMenuItem]
and a
jr nz, .asm_728f ; 0x723e $4f
callab SaveSAVtoSRAM
@@ -61,15 +61,15 @@
call PlaySoundWaitForCurrent
ld hl, CableClubNPCText3
call PrintText
- ld hl, $cc47
+ ld hl, wcc47
ld a, $3
ld [hli], a
xor a
ld [hl], a
ld [$ffa9], a
- ld [$cc42], a
+ ld [wcc42], a
call Func_227f
- ld hl, $cc47
+ ld hl, wcc47
ld a, [hli]
inc a
jr nz, Func_72a8 ; 0x726b $3b
@@ -98,13 +98,13 @@
Func_7298: ; 7298 (1:7298)
xor a
- ld hl, $cc47
+ ld hl, wcc47
ld [hli], a
ld [hl], a
- ld hl, $d72e
+ ld hl, wd72e
res 6, [hl]
xor a
- ld [$cc34], a
+ ld [wMenuJoypadPollCount], a
ret
Func_72a8: ; 72a8 (1:72a8)
--- a/engine/overworld/card_key.asm
+++ b/engine/overworld/card_key.asm
@@ -10,7 +10,7 @@
jr nz, .asm_5267a
ld a, $35
call Predef ; indirect jump to Func_c586 (c586 (3:4586))
- ld a, [$cfc6]
+ ld a, [wcfc6]
cp $18
jr z, .asm_5269c
cp $24
@@ -35,12 +35,12 @@
srl d
ld a, d
ld b, a
- ld [$d73f], a
+ ld [wd73f], a
srl e
ld a, e
ld c, a
- ld [$d740], a
- ld a, [W_CURMAP] ; $d35e
+ ld [wd740], a
+ ld a, [W_CURMAP] ; W_CURMAP
cp SILPH_CO_11F
jr nz, .asm_526c8
ld a, $3
@@ -48,10 +48,10 @@
.asm_526c8
ld a, $e
.asm_526ca
- ld [$d09f], a
+ ld [wd09f], a
ld a, $17
call Predef ; indirect jump to Func_ee9e
- ld hl, $d126
+ ld hl, wd126
set 5, [hl]
ld a, (SFX_1f_57 - SFX_Headers_1f) / 3
jp PlaySound
@@ -84,11 +84,11 @@
db "@"
Func_526fd: ; 526fd (14:66fd)
- ld a, [W_YCOORD] ; $d361
+ ld a, [W_YCOORD] ; wd361
ld d, a
- ld a, [W_XCOORD] ; $d362
+ ld a, [W_XCOORD] ; wd362
ld e, a
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
and a
jr nz, .asm_5270d
inc d
--- a/engine/overworld/cinnabar_lab.asm
+++ b/engine/overworld/cinnabar_lab.asm
@@ -1,18 +1,18 @@
GiveFossilToCinnabarLab: ; 61006 (18:5006)
- ld hl, $d730
+ ld hl, wd730
set 6, [hl]
xor a
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
ld a, $3
- ld [wMenuWatchedKeys], a ; $cc29
- ld a, [$cd37]
+ ld [wMenuWatchedKeys], a ; wMenuWatchedKeys
+ ld a, [wcd37]
dec a
- ld [wMaxMenuItem], a ; $cc28
+ ld [wMaxMenuItem], a ; wMaxMenuItem
ld a, $2
- ld [wTopMenuItemY], a ; $cc24
+ ld [wTopMenuItemY], a ; wTopMenuItemY
ld a, $1
- ld [wTopMenuItemX], a ; $cc25
- ld a, [$cd37]
+ ld [wTopMenuItemX], a ; wTopMenuItemX
+ ld a, [wcd37]
dec a
ld bc, $2
ld hl, $3
@@ -24,13 +24,13 @@
call TextBoxBorder
call UpdateSprites
call Func_610c2
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
call HandleMenuInput
bit 1, a
jr nz, .asm_610a7
- ld hl, $cc5b
- ld a, [wCurrentMenuItem] ; $cc26
+ ld hl, wcc5b
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
ld d, $0
ld e, a
add hl, de
@@ -55,7 +55,7 @@
ld hl, LabFossil_610ae
call PrintText
call YesNoChoice
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
and a
jr nz, .asm_610a7
ld hl, LabFossil_610b3
@@ -65,7 +65,7 @@
callba RemoveItemByID
ld hl, LabFossil_610b8
call PrintText
- ld hl, $d7a3
+ ld hl, wd7a3
set 0, [hl]
set 1, [hl]
ret
@@ -91,7 +91,7 @@
db "@"
Func_610c2: ; 610c2 (18:50c2)
- ld hl, $cc5b
+ ld hl, wcc5b
xor a
ld [$ffdb], a
.asm_610c8
@@ -99,14 +99,14 @@
cp $ff
ret z
push hl
- ld [$d11e], a
+ ld [wd11e], a
call GetItemName
- FuncCoord 2, 2 ; $c3ca
+ FuncCoord 2, 2
ld hl, Coord
ld a, [$ffdb]
ld bc, $28
call AddNTimes
- ld de, $cd6d
+ ld de, wcd6d
call PlaceString
ld hl, $ffdb
inc [hl]
@@ -116,10 +116,10 @@
; loads the names of the fossil item and the resulting mon
LoadFossilItemAndMonName: ; 610eb (18:50eb)
ld a, [W_FOSSILMON]
- ld [$d11e], a
+ ld [wd11e], a
call GetMonName
call CopyStringToCF4B
ld a, [W_FOSSILITEM]
- ld [$d11e], a
+ ld [wd11e], a
call GetItemName
ret
--- a/engine/overworld/cut.asm
+++ b/engine/overworld/cut.asm
@@ -1,18 +1,18 @@
UsedCut: ; ef54 (3:6f54)
xor a
- ld [$cd6a], a
- ld a, [W_CURMAPTILESET] ; $d367
+ ld [wcd6a], a
+ ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
and a ; OVERWORLD
jr z, .asm_ef6b
cp GYM
jr nz, .asm_ef77
- ld a, [$cfc6]
+ ld a, [wcfc6]
cp $50 ; gym cut tree
jr nz, .asm_ef77
jr asm_ef82
.asm_ef6b
dec a
- ld a, [$cfc6]
+ ld a, [wcfc6]
cp $3d ; cut tree
jr z, asm_ef82
cp $52 ; grass
@@ -26,13 +26,13 @@
db "@"
asm_ef82: ; ef82 (3:6f82)
- ld [$cd4d], a
+ ld [wcd4d], a
ld a, $1
- ld [$cd6a], a
- ld a, [wWhichPokemon] ; $cf92
- ld hl, W_PARTYMON1NAME ; $d2b5
+ ld [wcd6a], a
+ ld a, [wWhichPokemon] ; wWhichPokemon
+ ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
call GetPartyMonName
- ld hl, $d730
+ ld hl, wd730
set 6, [hl]
call GBPalWhiteOutWithDelay3
call ClearSprites
@@ -49,10 +49,10 @@
ld hl, UsedCutText
call PrintText
call LoadScreenTilesFromBuffer2
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
ld a, $ff
- ld [$cfcb], a
+ ld [wcfcb], a
call AnimateCutTree
ld de, CutTreeBlockSwaps ; $7100
call Func_f09f
@@ -59,7 +59,7 @@
call Func_eedc
callba Func_79e96
ld a, $1
- ld [$cfcb], a
+ ld [wcfcb], a
ld a, (SFX_02_56 - SFX_Headers_02) / 3
call PlaySound
ld a, $90
@@ -73,10 +73,10 @@
AnimateCutTree: ; eff7 (3:6ff7)
xor a
- ld [$cd50], a
+ ld [wcd50], a
ld a, $e4
ld [rOBP1], a ; $ff49
- ld a, [$cd4d]
+ ld a, [wcd4d]
cp $52
jr z, .asm_f020
ld de, Overworld_GFX + $2d0 ; $42d0 ; cuttable tree sprite top row
@@ -98,7 +98,7 @@
ld hl, $8ff0
call LoadCutTreeOAM
call asm_f055
- ld hl, $c393
+ ld hl, wOAMBuffer + $93
ld de, $4
ld a, $30
ld c, e
@@ -125,7 +125,7 @@
db $FE,$10,$FF,$10
Func_f068: ; f068 (3:7068)
- ld hl, $c104
+ ld hl, wSpriteStateData1 + 4
ld a, [hli]
ld b, a
inc hl
@@ -137,7 +137,7 @@
srl a
ld e, a
ld d, $0 ; de holds direction (00: down, 02: up, 04: left, 06: right)
- ld a, [$cd50]
+ ld a, [wcd50]
and a
ld hl, CutTreeAnimationOffsets ; $708f
jr z, .asm_f084
@@ -173,17 +173,17 @@
Func_f09f: ; f09f (3:709f)
push de
- ld a, [W_CURMAPWIDTH] ; $d369
+ ld a, [W_CURMAPWIDTH] ; wd369
add $6
ld c, a
ld b, $0
ld d, $0
- ld hl, $d35f
+ ld hl, wd35f
ld a, [hli]
ld h, [hl]
ld l, a
add hl, bc
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
and a
jr z, .asm_f0c7
cp $4
@@ -190,22 +190,22 @@
jr z, .asm_f0cf
cp $8
jr z, .asm_f0d7
- ld a, [W_XBLOCKCOORD] ; $d364
+ ld a, [W_XBLOCKCOORD] ; wd364
and a
jr z, .asm_f0e0
jr .asm_f0ec
.asm_f0c7
- ld a, [W_YBLOCKCOORD] ; $d363
+ ld a, [W_YBLOCKCOORD] ; wd363
and a
jr z, .asm_f0e0
jr .asm_f0df
.asm_f0cf
- ld a, [W_YBLOCKCOORD] ; $d363
+ ld a, [W_YBLOCKCOORD] ; wd363
and a
jr z, .asm_f0e1
jr .asm_f0e0
.asm_f0d7
- ld a, [W_XBLOCKCOORD] ; $d364
+ ld a, [W_XBLOCKCOORD] ; wd364
and a
jr z, .asm_f0e6
jr .asm_f0e0
--- a/engine/overworld/cut2.asm
+++ b/engine/overworld/cut2.asm
@@ -1,18 +1,18 @@
Func_79e96: ; 79e96 (1e:5e96)
- ld a, [$cd4d]
+ ld a, [wcd4d]
cp $52
jr z, .asm_79ec8
ld c, $8
.asm_79e9f
push bc
- ld hl, $c391
+ ld hl, wOAMBuffer + $91
ld a, $1
- ld [$d08a], a
+ ld [wd08a], a
ld c, $2
call Func_79339
- ld hl, $c399
+ ld hl, wOAMBuffer + $99
ld a, $ff
- ld [$d08a], a
+ ld [wd08a], a
ld c, $2
call Func_79339
ld a, [rOBP1] ; $ff49
@@ -33,9 +33,9 @@
ld c, $8
call Func_79eed
call Func_79f30
- ld hl, $c390
+ ld hl, wOAMBuffer + $90
ld a, $2
- ld [$d08a], a
+ ld [wd08a], a
ld c, $4
call Func_79352
pop bc
@@ -45,24 +45,24 @@
Func_79eed: ; 79eed (1e:5eed)
push bc
- ld hl, $c391
+ ld hl, wOAMBuffer + $91
ld a, $1
- ld [$d08a], a
+ ld [wd08a], a
ld c, $1
call Func_79339
- ld hl, $c395
+ ld hl, wOAMBuffer + $95
ld a, $2
- ld [$d08a], a
+ ld [wd08a], a
ld c, $1
call Func_79339
- ld hl, $c399
+ ld hl, wOAMBuffer + $99
ld a, $fe
- ld [$d08a], a
+ ld [wd08a], a
ld c, $1
call Func_79339
- ld hl, $c39d
+ ld hl, wOAMBuffer + $9d
ld a, $ff
- ld [$d08a], a
+ ld [wd08a], a
ld c, $1
call Func_79339
ld a, [rOBP1] ; $ff49
@@ -75,15 +75,15 @@
ret
Func_79f30: ; 79f30 (1e:5f30)
- ld hl, $c390
- ld de, $cee9
+ ld hl, wOAMBuffer + $90
+ ld de, wHPBarMaxHP
ld bc, $8
call CopyData
- ld hl, $c398
- ld de, $c390
+ ld hl, wOAMBuffer + $98
+ ld de, wOAMBuffer + $90
ld bc, $8
call CopyData
- ld hl, $cee9
- ld de, $c398
+ ld hl, wHPBarMaxHP
+ ld de, wOAMBuffer + $98
ld bc, $8
jp CopyData
--- a/engine/overworld/doors.asm
+++ b/engine/overworld/doors.asm
@@ -1,7 +1,7 @@
HandleDoors: ; 1a609 (6:6609)
push de
ld hl, DoorTileIDPointers ; $662c
- ld a, [W_CURMAPTILESET] ; $d367
+ ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
ld de, $3
call IsInArray
pop de
@@ -10,7 +10,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- FuncCoord 8, 9 ; $c45c
+ FuncCoord 8, 9
ld a, [Coord]
ld b, a
.asm_1a621
--- a/engine/overworld/elevator.asm
+++ b/engine/overworld/elevator.asm
@@ -34,7 +34,7 @@
ld a, (SFX_02_5f - SFX_Headers_02) / 3
call PlayMusic
.asm_7bf57
- ld a, [$c02a]
+ ld a, [wc02a]
cp $b9
jr z, .asm_7bf57
call UpdateSprites
@@ -41,7 +41,7 @@
jp Func_2307
Func_7bf64: ; 7bf64 (1e:7f64)
- ld hl, $d527
+ ld hl, wd527
ld a, [hld]
push af
ld a, [hl]
--- a/engine/overworld/emotion_bubbles.asm
+++ b/engine/overworld/emotion_bubbles.asm
@@ -1,5 +1,5 @@
PrintEmotionBubble: ; 17c47 (5:7c47)
- ld a, [$cd50]
+ ld a, [wcd50]
ld c, a
ld b, $0
ld hl, EmotionBubblesPointerTable ; $7caf
@@ -11,17 +11,17 @@
ld hl, $8f80
ld bc, (BANK(EmotionBubblesPointerTable) << 8) + $04
call CopyVideoData
- ld a, [$cfcb]
+ ld a, [wcfcb]
push af
ld a, $ff
- ld [$cfcb], a
- ld a, [$d736]
+ ld [wcfcb], a
+ ld a, [wd736]
bit 6, a
- ld hl, $c38f
- ld de, $c39f
+ ld hl, wOAMBuffer + $8f
+ ld de, wOAMBuffer + $9f
jr z, .asm_17c7a
- ld hl, $c37f
- ld de, $c38f
+ ld hl, wOAMBuffer + $7f
+ ld de, wOAMBuffer + $8f
.asm_17c7a
ld bc, $90
.asm_17c7d
@@ -33,8 +33,8 @@
ld a, c
or b
jr nz, .asm_17c7d
- ld hl, $c104
- ld a, [$cd4f]
+ ld hl, wSpriteStateData1 + 4
+ ld a, [wcd4f]
swap a
ld c, a
ld b, $0
@@ -51,7 +51,7 @@
ld c, $3c
call DelayFrames
pop af
- ld [$cfcb], a
+ ld [wcfcb], a
call DelayFrame
jp UpdateSprites
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
@@ -3,7 +3,7 @@
ld hl, $87c0
ld bc, (BANK(PokeCenterFlashingMonitorAndHealBall) << 8) + $03
call CopyVideoData
- ld hl, $cfcb
+ ld hl, wcfcb
ld a, [hl]
push af
ld [hl], $ff
@@ -12,19 +12,19 @@
push af
ld a, $e0
ld [rOBP1], a ; $ff49
- ld hl, $c384
+ ld hl, wOAMBuffer + $84
ld de, PokeCenterOAMData ; $44d7
call Func_70503
ld a, $4
ld [wMusicHeaderPointer], a
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
.asm_70464
ld a, [wMusicHeaderPointer]
and a
jr nz, .asm_70464
- ld a, [W_NUMINPARTY] ; $d163
+ ld a, [W_NUMINPARTY] ; W_NUMINPARTY
ld b, a
.asm_7046e
call Func_70503
@@ -34,23 +34,23 @@
call DelayFrames
dec b
jr nz, .asm_7046e
- ld a, [$c0ef]
+ ld a, [wc0ef]
cp $1f
- ld [$c0f0], a
+ ld [wc0f0], a
jr nz, .asm_70495
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
ld a, Bank(Func_9876)
- ld [$c0ef], a
+ ld [wc0ef], a
.asm_70495
ld a, MUSIC_PKMN_HEALED
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
ld d, $28
call Func_704f3
.asm_704a2
- ld a, [$c026]
+ ld a, [wc026]
cp MUSIC_PKMN_HEALED
jr z, .asm_704a2
ld c, $20
--- a/engine/overworld/hidden_items.asm
+++ b/engine/overworld/hidden_items.asm
@@ -1,9 +1,9 @@
HiddenItems: ; 76688 (1d:6688)
ld hl, HiddenItemCoords
call Func_76857
- ld [$cd41], a
- ld hl, $d6f0
- ld a, [$cd41]
+ ld [wTrainerScreenX], a
+ ld hl, wd6f0
+ ld a, [wTrainerScreenX]
ld c, a
ld b, $2
ld a, $10
@@ -13,9 +13,9 @@
ret nz
call EnableAutoTextBoxDrawing
ld a, $1
- ld [$cc3c], a
- ld a, [$cd3d] ; item ID
- ld [$d11e], a
+ ld [wcc3c], a
+ ld a, [wWhichTrade] ; item ID
+ ld [wd11e], a
call GetItemName
ld a, $24
jp PrintPredefTextID
@@ -26,13 +26,13 @@
; XXX where is the pointer to this?
TX_FAR _FoundHiddenItemText
db $8
- ld a, [$cd3d] ; item ID
+ ld a, [wWhichTrade] ; item ID
ld b, a
ld c, 1
call GiveItem
jr nc, .BagFull
- ld hl, $d6f0
- ld a, [$cd41]
+ ld hl, wd6f0
+ ld a, [wTrainerScreenX]
ld c, a
ld b, $1
ld a, $10
@@ -44,7 +44,7 @@
.BagFull
call WaitForTextScrollButtonPress ; wait for button press
xor a
- ld [$cc3c], a
+ ld [wcc3c], a
ld hl, HiddenItemBagFullText
call PrintText
jp TextScriptEnd
@@ -62,9 +62,9 @@
ret z
ld hl, HiddenCoinCoords
call Func_76857
- ld [$cd41], a
- ld hl, $d6fe
- ld a, [$cd41]
+ ld [wTrainerScreenX], a
+ ld hl, wd6fe
+ ld a, [wTrainerScreenX]
ld c, a
ld b, $2
ld a, $10
@@ -76,7 +76,7 @@
ld [$ff9f], a
ld [$ffa0], a
ld [$ffa1], a
- ld a, [$cd3d]
+ ld a, [wWhichTrade]
sub COIN
cp 10
jr z, .bcd10
@@ -101,13 +101,13 @@
ld a, $1
ld [$ffa0], a
.bcddone
- ld de, $d5a5
+ ld de, wPlayerCoins + 1
ld hl, $ffa1
ld c, $2
ld a, $b ; AddBCDPredef
call Predef
- ld hl, $d6fe
- ld a, [$cd41]
+ ld hl, wd6fe
+ ld a, [wTrainerScreenX]
ld c, a
ld b, $1
ld a, $10
@@ -139,9 +139,9 @@
db "@"
Func_76857: ; 76857 (1d:6857)
- ld a, [$cd40]
+ ld a, [wTrainerScreenY]
ld d, a
- ld a, [$cd41]
+ ld a, [wTrainerScreenX]
ld e, a
ld a, [W_CURMAP]
ld b, a
--- a/engine/overworld/hidden_objects.asm
+++ b/engine/overworld/hidden_objects.asm
@@ -1,16 +1,16 @@
Func_46981: ; 46981 (11:6981)
xor a
- ld [$d71e], a
- ld a, [$d72d]
+ ld [wd71e], a
+ ld a, [wd72d]
bit 4, a
ret nz
call ArePlayerCoordsInArray
ret nc
- ld a, [wWhichTrade] ; $cd3d
- ld [$d71e], a
- ld hl, $d72d
+ ld a, [wWhichTrade] ; wWhichTrade
+ ld [wd71e], a
+ ld hl, wd72d
set 4, [hl]
- ld hl, $d732
+ ld hl, wd732
set 4, [hl]
ret
@@ -28,7 +28,7 @@
ld b, a
cp $ff
jr z, .asm_469fc
- ld a, [W_CURMAP] ; $d35e
+ ld a, [W_CURMAP] ; W_CURMAP
cp b
jr z, .asm_469be
inc de
@@ -41,7 +41,7 @@
ld h, [hl]
ld l, a
push hl
- ld hl, wWhichTrade ; $cd3d
+ ld hl, wWhichTrade ; wWhichTrade
xor a
ld [hli], a
ld [hli], a
@@ -51,10 +51,10 @@
ld a, [hli]
cp $ff
jr z, .asm_469fc
- ld [$cd40], a
+ ld [wTrainerScreenY], a
ld b, a
ld a, [hli]
- ld [$cd41], a
+ ld [wTrainerScreenX], a
ld c, a
call Func_46a01
ld a, [$ffea]
@@ -65,15 +65,15 @@
inc hl
inc hl
push hl
- ld hl, $cd3f
+ ld hl, wTrainerFacingDirection
inc [hl]
pop hl
jr .asm_469ce
.asm_469f0
ld a, [hli]
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
ld a, [hli]
- ld [$cd3e], a
+ ld [wTrainerEngageDistance], a
ld a, [hli]
ld h, [hl]
ld l, a
@@ -84,7 +84,7 @@
ret
Func_46a01: ; 46a01 (11:6a01)
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4
jr z, .asm_46a16
cp $8
@@ -91,30 +91,30 @@
jr z, .asm_46a25
cp $c
jr z, .asm_46a2b
- ld a, [W_YCOORD] ; $d361
+ ld a, [W_YCOORD] ; wd361
inc a
jr .asm_46a1a
.asm_46a16
- ld a, [W_YCOORD] ; $d361
+ ld a, [W_YCOORD] ; wd361
dec a
.asm_46a1a
cp b
jr nz, .asm_46a3b
- ld a, [W_XCOORD] ; $d362
+ ld a, [W_XCOORD] ; wd362
cp c
jr nz, .asm_46a3b
jr .asm_46a38
.asm_46a25
- ld a, [W_XCOORD] ; $d362
+ ld a, [W_XCOORD] ; wd362
dec a
jr .asm_46a2f
.asm_46a2b
- ld a, [W_XCOORD] ; $d362
+ ld a, [W_XCOORD] ; wd362
inc a
.asm_46a2f
cp c
jr nz, .asm_46a3b
- ld a, [W_YCOORD] ; $d361
+ ld a, [W_YCOORD] ; wd361
cp b
jr nz, .asm_46a3b
.asm_46a38
--- a/engine/overworld/item.asm
+++ b/engine/overworld/item.asm
@@ -31,11 +31,11 @@
jr nc, .BagFull
ld a, [$ffdb]
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11 ; RemoveMissableObject
call Predef
ld a, 1
- ld [$cc3c], a
+ ld [wcc3c], a
ld hl, FoundItemText
jr .print
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -1,18 +1,18 @@
HandleLedges: ; 1a672 (6:6672)
- ld a, [$d736]
+ ld a, [wd736]
bit 6, a
ret nz
- ld a, [W_CURMAPTILESET] ; $d367
+ ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
and a ; OVERWORLD
ret nz
ld a, $35
call Predef ; indirect jump to Func_c586 (c586 (3:4586))
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
ld b, a
- FuncCoord 8, 9 ; $c45c
+ FuncCoord 8, 9
ld a, [Coord]
ld c, a
- ld a, [$cfc6]
+ ld a, [wcfc6]
ld d, a
ld hl, LedgeTiles ; $66cf
.asm_1a691
@@ -43,14 +43,14 @@
ret z
ld a, $ff
ld [wJoyIgnore], a
- ld hl, $d736
+ ld hl, wd736
set 6, [hl]
call Func_3486
ld a, e
- ld [$ccd3], a
- ld [$ccd4], a
+ ld [wccd3], a
+ ld [wccd4], a
ld a, $2
- ld [$cd38], a
+ ld [wcd38], a
call LoadHoppingShadowOAM
ld a, (SFX_02_4e - SFX_Headers_02) / 3
call PlaySound
--- a/engine/overworld/map_sprites.asm
+++ b/engine/overworld/map_sprites.asm
@@ -4,7 +4,7 @@
; This is also called after displaying text because loading
; text tile patterns overwrites half of the sprite tile pattern data.
; Note on notation:
-; $C1X* and $C2X* are used to denote $C100-$C1FF and $C200-$C2FF sprite slot
+; $C1X* and $C2X* are used to denote wSpriteStateData1-wSpriteStateData1 + $ff and wSpriteStateData2 + $00-wSpriteStateData2 + $ff sprite slot
; fields, respectively, within loops. The X is the loop index.
; If there is an inner loop, Y is the inner loop index, i.e. $C1Y* and $C2Y*
; denote fields of the sprite slots interated over in the inner loop.
@@ -13,7 +13,7 @@
ret c ; return if the map is an outside map (already handled by above call)
; if the map is an inside map (i.e. mapID >= $25)
ld hl,wSpriteStateData1
- ld de,$c20d
+ ld de,wSpriteStateData2 + $0d
; Loop to copy picture ID's from $C1X0 to $C2XD for LoadMapSpriteTilePatterns.
.copyPictureIDLoop
ld a,[hl] ; $C1X0 (picture ID)
@@ -37,7 +37,7 @@
.spritesExist
ld c,a ; c = [W_NUMSPRITES]
ld b,$10 ; number of sprite slots
- ld hl,$c20d
+ ld hl,wSpriteStateData2 + $0d
xor a
ld [$ff8e],a ; 4-tile sprite counter
.copyPictureIDLoop ; loop to copy picture ID from $C2XD to $C2XE
@@ -48,9 +48,9 @@
ld l,a
dec b
jr nz,.copyPictureIDLoop
- ld hl,$c21e
+ ld hl,wSpriteStateData2 + $1e
.loadTilePatternLoop
- ld de,$c21d
+ ld de,wSpriteStateData2 + $1d
; Check if the current picture ID has already had its tile patterns loaded.
; This done by looping through the previous sprite slots and seeing if any of
; their picture ID's match that of the current sprite slot.
@@ -70,7 +70,7 @@
ld e,a
jr .checkIfAlreadyLoadedLoop
.notAlreadyLoaded
- ld de,$c20e
+ ld de,wSpriteStateData2 + $0e
ld b,$01
; loop to find the highest tile pattern VRAM slot (among the first 10 slots) used by a previous sprite slot
; this is done in order to find the first free VRAM slot available
@@ -159,7 +159,7 @@
ld l,e
pop de
ld b,a
- ld a,[$cfc4]
+ ld a,[wcfc4]
bit 0,a ; reloading upper half of tile patterns after displaying text?
jr nz,.skipFirstLoad ; if so, skip loading data into the lower half
ld a,b
@@ -180,7 +180,7 @@
jr nc,.noCarry3
inc d
.noCarry3
- ld a,[$cfc4]
+ ld a,[wcfc4]
bit 0,a ; reloading upper half of tile patterns after displaying text?
jr nz,.loadWhileLCDOn
pop af
@@ -216,7 +216,7 @@
ld l,a
dec c
jp nz,.loadTilePatternLoop
- ld hl,$c20d
+ ld hl,wSpriteStateData2 + $0d
ld b,$10
; the pictures ID's stored at $C2XD are no longer needed, so zero them
.zeroStoredPictureIDLoop
@@ -264,7 +264,7 @@
cp a,$f0 ; does the map have 2 sprite sets?
call nc,GetSplitMapSpriteSetID ; if so, choose the appropriate one
ld b,a ; b = spriteSetID
- ld a,[$cfc4]
+ ld a,[wcfc4]
bit 0,a ; reloading upper half of tile patterns after displaying text?
jr nz,.loadSpriteSet ; if so, forcibly reload the sprite set
ld a,[W_SPRITESETID]
@@ -288,7 +288,7 @@
jr nc,.noCarry2
inc d
.noCarry2
- ld hl,$c20d
+ ld hl,wSpriteStateData2 + $0d
ld a,SPRITE_RED
ld [hl],a
ld bc,W_SPRITESET
@@ -324,7 +324,7 @@
call LoadMapSpriteTilePatterns
pop af
ld [W_NUMSPRITES],a ; restore number of sprites
- ld hl,$c21e
+ ld hl,wSpriteStateData2 + $1e
ld b,$0f
; The VRAM tile pattern slots that LoadMapSpriteTilePatterns set are in the
; order of the map's sprite set, not the order of the actual sprites loaded
@@ -338,7 +338,7 @@
dec b
jr nz,.zeroVRAMSlotsLoop
.skipLoadingSpriteSet
- ld hl,$c110
+ ld hl,wSpriteStateData1 + $10
; This loop stores the correct VRAM tile pattern slots according the sprite
; data from the map's header. Since the VRAM tile pattern slots are filled in
; the order of the sprite set, in order to find the VRAM tile pattern slot
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -8,7 +8,7 @@
ld [wSpriteStateData2], a
jr .asm_4e4a
.asm_4e41
- FuncCoord 8, 9 ; $c45c
+ FuncCoord 8, 9
ld a, [Coord]
ld [$ff93], a
cp $60
@@ -15,15 +15,15 @@
jr c, .asm_4e50
.asm_4e4a
ld a, $ff
- ld [$c102], a
+ ld [wSpriteStateData1 + 2], a
ret
.asm_4e50
call Func_4c70
ld h, $c1
- ld a, [wWalkCounter] ; $cfc5
+ ld a, [wWalkCounter] ; wcfc5
and a
jr nz, .asm_4e90
- ld a, [$d528]
+ ld a, [wd528]
bit 2, a
jr z, .asm_4e65
xor a
@@ -45,16 +45,16 @@
jr .asm_4e86
.asm_4e7d
xor a
- ld [$c107], a
- ld [$c108], a
+ ld [wSpriteStateData1 + 7], a
+ ld [wSpriteStateData1 + 8], a
jr .asm_4eab
.asm_4e86
- ld [$c109], a
- ld a, [$cfc4]
+ ld [wSpriteStateData1 + 9], a
+ ld a, [wcfc4]
bit 0, a
jr nz, .asm_4e7d
.asm_4e90
- ld a, [$d736]
+ ld a, [wd736]
bit 7, a
jr nz, .asm_4eb6
ld a, [H_CURRENTSPRITEOFFSET]
@@ -73,11 +73,11 @@
and $3
ld [hl], a
.asm_4eab
- ld a, [$c108]
+ ld a, [wSpriteStateData1 + 8]
ld b, a
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
add b
- ld [$c102], a
+ ld [wSpriteStateData1 + 2], a
.asm_4eb6
ld a, [$ff93]
ld c, a
@@ -87,7 +87,7 @@
jr nz, .asm_4ec3
ld a, $80
.asm_4ec3
- ld [$c207], a
+ ld [wSpriteStateData2 + $07], a
ret
Func_4ec7: ; 4ec7 (1:4ec7)
@@ -106,7 +106,7 @@
swap a
dec a
add a
- ld hl, W_MAPSPRITEDATA ; $d4e4
+ ld hl, W_MAPSPRITEDATA ; wd4e4
add l
ld l, a
ld a, [hl] ; read movement byte 2
@@ -128,7 +128,7 @@
bit 7, a
jp nz, InitializeSpriteFacingDirection ; c1x1 >= $80
ld b, a
- ld a, [$cfc4]
+ ld a, [wcfc4]
bit 0, a
jp nz, notYetMoving
ld a, b
@@ -136,7 +136,7 @@
jp z, UpdateSpriteMovementDelay ; c1x1 == 2
cp $3
jp z, UpdateSpriteInWalkingAnimation ; c1x1 == 3
- ld a, [wWalkCounter] ; $cfc5
+ ld a, [wWalkCounter] ; wcfc5
and a
ret nz ; don't do anything yet if player is currently moving (redundant, already tested in CheckSpriteAvailability)
call InitializeSpriteScreenPosition
@@ -153,28 +153,28 @@
ld [hl], a ; (temporarily) increment movement byte 1
dec a
push hl
- ld hl, $cf0f
- dec [hl] ; decrement $cf0f
+ ld hl, wcf0f
+ dec [hl] ; decrement wcf0f
pop hl
- ld de, $cc5b
- call LoadDEPlusA ; a = [$cc5b + movement byte 1]
+ ld de, wcc5b
+ call LoadDEPlusA ; a = [wcc5b + movement byte 1]
cp $e0
jp z, ChangeFacingDirection
cp $ff
jr nz, .asm_4f4b
ld [hl], a ; reset movement byte 1 to initial value
- ld hl, $d730
+ ld hl, wd730
res 0, [hl]
xor a
- ld [$cd38], a
- ld [$cd3a], a
+ ld [wcd38], a
+ ld [wcd3a], a
ret
.asm_4f4b
cp $fe
jr nz, .asm_4f5f
ld [hl], $1 ; set movement byte 1 to $1
- ld de, $cc5b
- call LoadDEPlusA ; a = [$cc5b + $fe] (?)
+ ld de, wcc5b
+ call LoadDEPlusA ; a = [wcc5b + $fe] (?)
jr .asm_4f5f
.asm_4f59
call getTileSpriteStandsOn
@@ -391,11 +391,11 @@
jp UpdateSpriteImage
InitializeSpriteFacingDirection: ; 507f (1:507f)
- ld a, [$d72d]
+ ld a, [wd72d]
bit 5, a
jr nz, notYetMoving
res 7, [hl]
- ld a, [$d52a]
+ ld a, [wd52a]
bit 3, a
jr z, .notFacingDown
ld c, $0 ; make sprite face down
@@ -438,7 +438,7 @@
ld a, [H_CURRENTSPRITEOFFSET]
add $4
ld l, a
- ld a, [W_YCOORD] ; $d361
+ ld a, [W_YCOORD] ; wd361
ld b, a
ld a, [hl] ; c2x4 (Y position + 4)
sub b ; relative to player position
@@ -447,7 +447,7 @@
dec h
ld [hli], a ; c1x4 (screen Y position)
inc h
- ld a, [W_XCOORD] ; $d362
+ ld a, [W_XCOORD] ; wd362
ld b, a
ld a, [hli] ; c2x6 (X position + 4)
sub b ; relative to player position
@@ -474,7 +474,7 @@
add $4
ld l, a
ld b, [hl] ; c2x4: Y pos (+4)
- ld a, [W_YCOORD] ; $d361
+ ld a, [W_YCOORD] ; wd361
cp b
jr z, .skipYVisibilityTest
jr nc, .spriteInvisible ; above screen region
@@ -484,7 +484,7 @@
.skipYVisibilityTest
inc l
ld b, [hl] ; c2x5: X pos (+4)
- ld a, [W_XCOORD] ; $d362
+ ld a, [W_XCOORD] ; wd362
cp b
jr z, .skipXVisibilityTest
jr nc, .spriteInvisible ; left of screen region
@@ -518,7 +518,7 @@
jr .done
.spriteVisible
ld c, a
- ld a, [wWalkCounter] ; $cfc5
+ ld a, [wWalkCounter] ; wcfc5
and a
jr nz, .done ; if player is currently walking, we're done
call UpdateSpriteImage
@@ -711,15 +711,15 @@
ret
Func_5236: ; 5236 (1:5236)
- ld a, [$d730]
+ ld a, [wd730]
bit 7, a
ret z
- ld hl, $d72e
+ ld hl, wd72e
bit 7, [hl]
set 7, [hl]
jp z, Func_52a6
- ld hl, $cc97
- ld a, [$cd37]
+ ld hl, wcc97
+ ld a, [wcd37]
add l
ld l, a
jr nc, .asm_5251
@@ -767,20 +767,20 @@
ld a, c
ld [hl], a
call Func_52c3
- ld hl, $cf18
+ ld hl, wcf18
dec [hl]
ret nz
ld a, $8
- ld [$cf18], a
- ld hl, $cd37
+ ld [wcf18], a
+ ld hl, wcd37
inc [hl]
ret
Func_52a6: ; 52a6 (1:52a6)
xor a
- ld [$cd37], a
+ ld [wcd37], a
ld a, $8
- ld [$cf18], a
+ ld [wcf18], a
jp Func_52c3
Func_52b2: ; 52b2 (1:52b2)
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -1,47 +1,47 @@
Func_1a3e0: ; 1a3e0 (6:63e0)
- ld hl, $d730
+ ld hl, wd730
res 1, [hl]
call HandleDoors
jr nc, .asm_1a406
ld a, $fc
ld [wJoyIgnore], a
- ld hl, $d736
+ ld hl, wd736
set 1, [hl]
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
ld a, $80
- ld [$ccd3], a
+ ld [wccd3], a
xor a
- ld [$c102], a
+ ld [wSpriteStateData1 + 2], a
call Func_3486
ret
.asm_1a406
xor a
- ld [$cd3a], a
- ld [$cd38], a
- ld [$ccd3], a
- ld hl, $d736
+ ld [wcd3a], a
+ ld [wcd38], a
+ ld [wccd3], a
+ ld hl, wd736
res 0, [hl]
res 1, [hl]
- ld hl, $d730
+ ld hl, wd730
res 7, [hl]
ret
Func_1a41d: ; 1a41d (6:641d)
- ld hl, $d730
+ ld hl, wd730
res 7, [hl]
- ld hl, $d72e
+ ld hl, wd72e
res 7, [hl]
- ld hl, $d736
+ ld hl, wd736
res 0, [hl]
res 1, [hl]
xor a
- ld [$cf17], a
- ld [$cc57], a
- ld [$cf10], a
- ld [$cd3a], a
- ld [$cd38], a
- ld [$ccd3], a
+ ld [wcf17], a
+ ld [wcc57], a
+ ld [wcf10], a
+ ld [wcd3a], a
+ ld [wcd38], a
+ ld [wccd3], a
ret
PointerTable_1a442: ; 1a442 (6:6442)
@@ -52,26 +52,26 @@
dw Func_1a4f4
Func_1a44c: ; 1a44c (6:644c)
- ld a, [W_XCOORD] ; $d362
+ ld a, [W_XCOORD] ; wd362
sub $a
- ld [$cca1], a
+ ld [wcca1], a
jr z, .asm_1a475
ld b, $0
ld c, a
- ld hl, $cc97
+ ld hl, wcc97
ld a, $80
call FillMemory
ld [hl], $ff
- ld a, [$cf13]
+ ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
- ld de, $cc97
+ ld de, wcc97
call MoveSprite
ld a, $1
- ld [$cf10], a
+ ld [wcf10], a
jr .asm_1a47a
.asm_1a475
ld a, $3
- ld [$cf10], a
+ ld [wcf10], a
.asm_1a47a
ld hl, W_FLAGS_D733
set 1, [hl]
@@ -80,46 +80,46 @@
ret
Func_1a485: ; 1a485 (6:6485)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
- ld a, [$cca1]
- ld [$cd38], a
+ ld a, [wcca1]
+ ld [wcd38], a
ld [$ff95], a
ld a, $23
call Predef
call Func_3486
ld a, $2
- ld [$cf10], a
+ ld [wcf10], a
ret
Func_1a4a1: ; 1a4a1 (6:64a1)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
Func_1a4a6: ; 1a4a6 (6:64a6)
xor a
- ld [$cd3b], a
- ld a, [$cf13]
+ ld [wcd3b], a
+ ld a, [wcf13]
swap a
- ld [$cf17], a
+ ld [wcf17], a
xor a
- ld [$c206], a
- ld hl, $ccd3
+ ld [wSpriteStateData2 + $06], a
+ ld hl, wccd3
ld de, RLEList_1a4e9
call DecodeRLEList
dec a
- ld [$cd38], a
- ld hl, $cc97
+ ld [wcd38], a
+ ld hl, wcc97
ld de, RLEList_1a4dc
call DecodeRLEList
- ld hl, $d72e
+ ld hl, wd72e
res 7, [hl]
- ld hl, $d730
+ ld hl, wd730
set 7, [hl]
ld a, $4
- ld [$cf10], a
+ ld [wcf10], a
ret
RLEList_1a4dc: ; 1a4dc (6:64dc)
@@ -140,16 +140,16 @@
db $FF
Func_1a4f4: ; 1a4f4 (6:64f4)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
ld a, $0
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
- ld hl, $d730
+ ld hl, wd730
res 7, [hl]
- ld hl, $d72e
+ ld hl, wd72e
res 7, [hl]
jp Func_314e
@@ -159,31 +159,31 @@
Func_1a514: ; 1a514 (6:6514)
ld a, Bank(Func_9876)
- ld [$c0ef], a
- ld [$c0f0], a
+ ld [wc0ef], a
+ ld [wc0f0], a
ld a, MUSIC_MUSEUM_GUY
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
- ld a, [$cf13]
+ ld a, [wcf13]
swap a
- ld [$cf17], a
+ ld [wcf17], a
call Func_3486
- ld hl, $ccd3
+ ld hl, wccd3
ld de, RLEList_PewterMuseumPlayer
call DecodeRLEList
dec a
- ld [$cd38], a
+ ld [wcd38], a
xor a
- ld [$d12f], a
+ ld [wd12f], a
ld a, $4f
call Predef
- ld hl, $cc97
+ ld hl, wcc97
ld de, RLEList_PewterMuseumGuy
call DecodeRLEList
- ld hl, $d72e
+ ld hl, wd72e
res 7, [hl]
ld a, $1
- ld [$cf10], a
+ ld [wcf10], a
ret
RLEList_PewterMuseumPlayer: ; 1a559 (6:6559)
@@ -201,12 +201,12 @@
db $FF
Func_1a56b: ; 1a56b (6:656b)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
- ld hl, $d730
+ ld hl, wd730
res 7, [hl]
- ld hl, $d72e
+ ld hl, wd72e
res 7, [hl]
jp Func_314e
@@ -216,34 +216,34 @@
Func_1a581: ; 1a581 (6:6581)
ld a, Bank(Func_9876)
- ld [$c0ef], a
- ld [$c0f0], a
+ ld [wc0ef], a
+ ld [wc0f0], a
ld a, MUSIC_MUSEUM_GUY
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
- ld a, [$cf13]
+ ld a, [wcf13]
swap a
- ld [$cf17], a
+ ld [wcf17], a
xor a
- ld [$c206], a
- ld hl, $ccd3
+ ld [wSpriteStateData2 + $06], a
+ ld hl, wccd3
ld de, RLEList_PewterGymPlayer
call DecodeRLEList
dec a
- ld [$cd38], a
+ ld [wcd38], a
ld a, $1
- ld [$d12f], a
+ ld [wd12f], a
ld a, $4f
call Predef
- ld hl, $cc97
+ ld hl, wcc97
ld de, RLEList_PewterGymGuy
call DecodeRLEList
- ld hl, $d72e
+ ld hl, wd72e
res 7, [hl]
- ld hl, $d730
+ ld hl, wd730
set 7, [hl]
ld a, $1
- ld [$cf10], a
+ ld [wcf10], a
ret
RLEList_PewterGymPlayer: ; 1a5cd (6:65cd)
@@ -266,7 +266,7 @@
; XXX why would this function want to return on POKEMONTOWER_7?
Func_1a5e7: ; 1a5e7 (6:65e7)
- ld a, [W_CURMAP] ; $d35e
+ ld a, [W_CURMAP] ; W_CURMAP
cp POKEMONTOWER_7
ret z
ld hl, RivalIDs ; $6605
@@ -280,7 +280,7 @@
ret z
jr .loop
.notRival
- ld a, [$cf13]
+ ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
jp SetSpriteMovementBytesToFF
--- a/engine/overworld/oaks_aide.asm
+++ b/engine/overworld/oaks_aide.asm
@@ -2,13 +2,13 @@
ld hl, OaksAideHiText
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .asm_59086 ; 0x59042 $42
ld hl, wPokedexOwned
ld b, wPokedexOwnedEnd - wPokedexOwned
call CountSetBits
- ld a, [$d11e]
+ ld a, [wd11e]
ld [$ffdd], a
ld b, a
ld a, [$ffdb]
--- a/engine/overworld/oam.asm
+++ b/engine/overworld/oam.asm
@@ -2,13 +2,13 @@
; Determine OAM data for currently visible
; sprites and write it to wOAMBuffer.
- ld a, [$cfcb]
+ ld a, [wcfcb]
dec a
jr z, .asm_4b1e
cp 0 - 1
ret nz
- ld [$cfcb], a
+ ld [wcfcb], a
jp HideSprites
.asm_4b1e
@@ -27,7 +27,7 @@
inc e
inc e
ld a, [de] ; c1x2 (facing/anim)
- ld [$d5cd], a
+ ld [wd5cd], a
cp $ff ; off-screen (don't draw)
jr nz, .visible
@@ -92,7 +92,7 @@
push bc
ld b, a
- ld a, [$d5cd] ; temp copy of c1x2
+ ld a, [wd5cd] ; temp copy of c1x2
swap a ; high nybble determines sprite used (0 is always player sprite, next are some npcs)
and $f
@@ -143,7 +143,7 @@
ld h, wOAMBuffer / $100
ld de, $4
ld b, $a0
- ld a, [$d736]
+ ld a, [wd736]
bit 6, a
ld a, $a0
jr z, .clear
--- a/engine/overworld/pewter_guys.asm
+++ b/engine/overworld/pewter_guys.asm
@@ -1,8 +1,8 @@
PewterGuys: ; 37ca1 (d:7ca1)
- ld hl, $ccd3
- ld a, [$cd38]
+ ld hl, wccd3
+ ld a, [wcd38]
dec a
- ld [$cd38], a
+ ld [wcd38], a
ld d, 0
ld e, a
add hl, de
@@ -9,7 +9,7 @@
ld d, h
ld e, l
ld hl, PointerTable_37ce6
- ld a, [$d12f]
+ ld a, [wd12f]
add a
ld b, 0
ld c, a
@@ -37,9 +37,9 @@
ret z
ld [de], a
inc de
- ld a, [$cd38]
+ ld a, [wcd38]
inc a
- ld [$cd38], a
+ ld [wcd38], a
jr .asm_37cd2
.asm_37ce1
inc hl
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -1,7 +1,7 @@
Func_70510: ; 70510 (1c:4510)
call Func_706ef
ld a, $ec
- ld [$c104], a
+ ld [wSpriteStateData1 + 4], a
call Delay3
push hl
call GBFadeIn2
@@ -11,7 +11,7 @@
jr nz, .asm_70568
ld a, (SFX_02_4c - SFX_Headers_02) / 3
call PlaySound
- ld hl, $d732
+ ld hl, wd732
bit 4, [hl]
res 4, [hl]
pop hl
@@ -23,7 +23,7 @@
ld a, b
and a
jr nz, .asm_7055b
- ld hl, wWhichTrade ; $cd3d
+ ld hl, wWhichTrade ; wWhichTrade
xor a
ld [hli], a
inc a
@@ -31,7 +31,7 @@
ld a, $8
ld [hli], a
ld [hl], $ff
- ld hl, $cd48
+ ld hl, wcd48
call Func_70730
.asm_70558
call Func_2307
@@ -51,7 +51,7 @@
call Func_706d7
ld a, (SFX_02_50 - SFX_Headers_02) / 3
call PlaySound
- ld hl, wWhichTrade ; $cd3d
+ ld hl, wWhichTrade ; wWhichTrade
xor a
ld [hli], a
ld a, $c
@@ -80,7 +80,7 @@
db $3C, $40
Func_705aa: ; 705aa (1c:45aa)
- ld hl, wWhichTrade ; $cd3d
+ ld hl, wWhichTrade ; wWhichTrade
ld a, $10
ld [hli], a
ld a, $3c
@@ -100,7 +100,7 @@
.asm_705c8
ld a, (SFX_02_4b - SFX_Headers_02) / 3
call PlaySound
- ld hl, wWhichTrade ; $cd3d
+ ld hl, wWhichTrade ; wWhichTrade
ld a, $f0
ld [hli], a
ld a, $ec
@@ -120,10 +120,10 @@
.asm_705ef
ld a, $4
call StopMusic
- ld a, [$d732]
+ ld a, [wd732]
bit 6, a
jr z, .asm_70610
- ld hl, wWhichTrade ; $cd3d
+ ld hl, wWhichTrade ; wWhichTrade
ld a, $10
ld [hli], a
ld a, $ff
@@ -131,12 +131,12 @@
xor a
ld [hli], a
ld [hl], $a1
- ld hl, $cd48
+ ld hl, wcd48
call Func_70730
jr .asm_705c8
.asm_70610
call Func_706d7
- ld hl, wWhichTrade ; $cd3d
+ ld hl, wWhichTrade ; wWhichTrade
ld a, $ff
ld [hli], a
ld a, $8
@@ -145,7 +145,7 @@
call Func_706ae
ld a, (SFX_02_50 - SFX_Headers_02) / 3
call PlaySound
- ld hl, wWhichTrade ; $cd3d
+ ld hl, wWhichTrade ; wWhichTrade
xor a
ld [hli], a
ld a, $c
@@ -155,7 +155,7 @@
call Func_706ae
ld c, $28
call DelayFrames
- ld hl, $cd3e
+ ld hl, wTrainerEngageDistance
ld a, $b
ld [hli], a
ld [hl], $8
@@ -200,34 +200,34 @@
Func_7067d: ; 7067d (1c:467d)
ld a, $ff
- ld [$cfcb], a
- ld a, [$c302]
- ld [$c30a], a
- ld a, [$c306]
- ld [$c30e], a
+ ld [wcfcb], a
+ ld a, [wOAMBuffer + $02]
+ ld [wOAMBuffer + $0a], a
+ ld a, [wOAMBuffer + $06]
+ ld [wOAMBuffer + $0e], a
ld a, $a0
ld [wOAMBuffer], a
- ld [$c304], a
+ ld [wOAMBuffer + $04], a
ld c, $2
call DelayFrames
ld a, $a0
- ld [$c308], a
- ld [$c30c], a
+ ld [wOAMBuffer + $08], a
+ ld [wOAMBuffer + $0c], a
call GBFadeOut2
ld a, $1
- ld [$cfcb], a
+ ld [wcfcb], a
jp Func_70772
Func_706ae: ; 706ae (1c:46ae)
- ld a, [$cd3f]
+ ld a, [wTrainerFacingDirection]
xor $1
- ld [$cd3f], a
- ld [$c102], a
+ ld [wTrainerFacingDirection], a
+ ld [wSpriteStateData1 + 2], a
call Delay3
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
cp $ff
jr z, .asm_706cd
- ld hl, $c104
+ ld hl, wSpriteStateData1 + 4
ld a, [de]
inc de
ld [hli], a
@@ -236,9 +236,9 @@
inc de
ld [hl], a
.asm_706cd
- ld a, [$cd3e]
+ ld a, [wTrainerEngageDistance]
dec a
- ld [$cd3e], a
+ ld [wTrainerEngageDistance], a
jr nz, Func_706ae
ret
@@ -253,16 +253,16 @@
jp CopyVideoData
Func_706ef: ; 706ef (1c:46ef)
- ld a, [$c102]
- ld [$cd50], a
- ld a, [$c104]
- ld [$cd4f], a
+ ld a, [wSpriteStateData1 + 2]
+ ld [wcd50], a
+ ld a, [wSpriteStateData1 + 4]
+ ld [wcd4f], a
ld hl, PlayerSpinningFacingOrder ; $4713
- ld de, $cd48
+ ld de, wcd48
ld bc, $4
call CopyData
- ld a, [$c102]
- ld hl, $cd48
+ ld a, [wSpriteStateData1 + 2]
+ ld hl, wcd48
.asm_7070d
cp [hl]
inc hl
@@ -277,32 +277,32 @@
Func_70717: ; 70717 (1c:4717)
ld a, [hl]
- ld [$c102], a
+ ld [wSpriteStateData1 + 2], a
push hl
- ld hl, $cd48
- ld de, $cd47
+ ld hl, wcd48
+ ld de, wcd47
ld bc, $4
call CopyData
- ld a, [$cd47]
- ld [$cd4b], a
+ ld a, [wcd47]
+ ld [wcd4b], a
pop hl
ret
Func_70730: ; 70730 (1c:4730)
call Func_70717
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
ld c, a
and $3
jr nz, .asm_70743
- ld a, [$cd40]
+ ld a, [wTrainerScreenY]
cp $ff
call nz, PlaySound
.asm_70743
- ld a, [$cd3e]
+ ld a, [wTrainerEngageDistance]
add c
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
ld c, a
- ld a, [$cd3f]
+ ld a, [wTrainerFacingDirection]
cp c
ret z
call DelayFrames
@@ -310,29 +310,29 @@
Func_70755: ; 70755 (1c:4755)
call Func_70717
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
ld c, a
- ld a, [$c104]
+ ld a, [wSpriteStateData1 + 4]
add c
- ld [$c104], a
+ ld [wSpriteStateData1 + 4], a
ld c, a
- ld a, [$cd3e]
+ ld a, [wTrainerEngageDistance]
cp c
ret z
- ld a, [$cd3f]
+ ld a, [wTrainerFacingDirection]
ld c, a
call DelayFrames
jr Func_70755
Func_70772: ; 70772 (1c:4772)
- ld a, [$cd4f]
- ld [$c104], a
- ld a, [$cd50]
- ld [$c102], a
+ ld a, [wcd4f]
+ ld [wSpriteStateData1 + 4], a
+ ld a, [wcd50]
+ ld [wSpriteStateData1 + 2], a
ret
Func_7077f: ; 7077f (1c:477f)
- ld a, [$cf1b]
+ ld a, [wcf1b]
xor $1
inc a
inc a
@@ -341,7 +341,7 @@
Func_70787: ; 70787 (1c:4787)
ld b, 0
ld hl, DataTable_707a9 ; $47a9
- ld a, [W_CURMAPTILESET] ; $d367
+ ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
ld c, a
.asm_70790
ld a, [hli]
@@ -349,7 +349,7 @@
jr z, .asm_707a4
cp c
jr nz, .asm_7079e
- FuncCoord 8, 9 ; $c45c
+ FuncCoord 8, 9
ld a, [Coord]
cp [hl]
jr z, .asm_707a2
@@ -362,10 +362,10 @@
ld b, [hl]
.asm_707a4
ld a, b
- ld [$cd5b], a
+ ld [wcd5b], a
ret
-; format: db tileset id, tile id, value to be put in $cd5b
+; format: db tileset id, tile id, value to be put in wcd5b
DataTable_707a9: ; 707a9 (1c:47a9)
db FACILITY, $20, 1 ; warp pad
db FACILITY, $11, 2 ; hole
@@ -376,7 +376,7 @@
Func_707b6: ; 707b6 (1c:47b6)
ld c, $a
call DelayFrames
- ld hl, $d736
+ ld hl, wd736
set 6, [hl]
ld de, RedSprite ; $4180
ld hl, $8000
@@ -385,17 +385,17 @@
ld a, $4
ld hl, RedFishingTiles ; $4866
call Func_71771
- ld a, [$c102]
+ ld a, [wSpriteStateData1 + 2]
ld c, a
ld b, $0
ld hl, FishingRodGfxProperties ; $4856
add hl, bc
- ld de, $c39c
+ ld de, wOAMBuffer + $9c
ld bc, $4
call CopyData
ld c, $64
call DelayFrames
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
and a
ld hl, NoNibbleText
jr z, .asm_70836
@@ -404,35 +404,35 @@
jr z, .asm_70836
ld b, $a
.asm_707fe
- ld hl, $c104
+ ld hl, wSpriteStateData1 + 4
call Func_70842
- ld hl, $c39c
+ ld hl, wOAMBuffer + $9c
call Func_70842
call Delay3
dec b
jr nz, .asm_707fe
- ld a, [$c102]
+ ld a, [wSpriteStateData1 + 2]
cp $4
jr nz, .asm_7081c
ld a, $a0
- ld [$c39c], a
+ ld [wOAMBuffer + $9c], a
.asm_7081c
- ld hl, $cd4f
+ ld hl, wcd4f
xor a
ld [hli], a
ld [hl], a
ld a, $4c
call Predef ; indirect jump to PrintEmotionBubble (17c47 (5:7c47))
- ld a, [$c102]
+ ld a, [wSpriteStateData1 + 2]
cp $4
jr nz, .asm_70833
ld a, $44
- ld [$c39c], a
+ ld [wOAMBuffer + $9c], a
.asm_70833
ld hl, ItsABiteText
.asm_70836
call PrintText
- ld hl, $d736
+ ld hl, wd736
res 6, [hl]
call LoadFontTilePatterns
ret
@@ -484,20 +484,20 @@
dw $8FD0
_HandleMidJump: ; 7087e (1c:487e)
- ld a, [$d714]
+ ld a, [wd714]
ld c, a
inc a
cp $10
jr nc, .asm_70895
- ld [$d714], a
+ ld [wd714], a
ld b, $0
ld hl, PlayerJumpingYScreenCoords ; $48ba
add hl, bc
ld a, [hl]
- ld [$c104], a ; player's sprite y coordinate
+ ld [wSpriteStateData1 + 4], a ; player's sprite y coordinate
ret
.asm_70895
- ld a, [wWalkCounter] ; $cfc5
+ ld a, [wWalkCounter] ; wcfc5
cp $0
ret nz
call UpdateSprites
@@ -506,10 +506,10 @@
ld [hJoyHeld], a
ld [hJoyPressed], a
ld [hJoyReleased], a
- ld [$d714], a
- ld hl, $d736
+ ld [wd714], a
+ ld hl, wd736
res 6, [hl]
- ld hl, $d730
+ ld hl, wd730
res 7, [hl]
xor a
ld [wJoyIgnore], a
--- a/engine/overworld/pokecenter.asm
+++ b/engine/overworld/pokecenter.asm
@@ -2,7 +2,7 @@
call SaveScreenTilesToBuffer1 ; save screen
ld hl, PokemonCenterWelcomeText
call PrintText
- ld hl, $d72e
+ ld hl, wd72e
bit 2, [hl]
set 1, [hl]
set 2, [hl]
@@ -19,22 +19,22 @@
ld hl, NeedYourPokemonText
call PrintText
ld a, $18
- ld [$c112], a ; make the nurse turn to face the machine
+ ld [wSpriteStateData1 + $12], a ; make the nurse turn to face the machine
call Delay3
PREDEF HealPartyPredef
callba AnimateHealingMachine ; do the healing machine animation
xor a
ld [wMusicHeaderPointer], a
- ld a, [$c0f0]
- ld [$c0ef], a
- ld a, [$d35b]
- ld [$cfca], a
- ld [$c0ee], a
+ ld a, [wc0f0]
+ ld [wc0ef], a
+ ld a, [wd35b]
+ ld [wcfca], a
+ ld [wc0ee], a
call PlaySound
ld hl, PokemonFightingFitText
call PrintText
ld a, $14
- ld [$c112], a ; make the nurse bow
+ ld [wSpriteStateData1 + $12], a ; make the nurse bow
ld c, a
call DelayFrames
jr .done
--- a/engine/overworld/pokemart.asm
+++ b/engine/overworld/pokemart.asm
@@ -1,30 +1,30 @@
DisplayPokemartDialogue_: ; 6c20 (1:6c20)
ld a,[wListScrollOffset]
- ld [$d07e],a
+ ld [wd07e],a
call UpdateSprites ; move sprites
xor a
- ld [$cf0a],a ; flag that is set if something is sold or bought
+ ld [wcf0a],a ; flag that is set if something is sold or bought
.loop
xor a
ld [wListScrollOffset],a
ld [wCurrentMenuItem],a
- ld [$cc2f],a
+ ld [wPlayerMonNumber],a
inc a
- ld [$cf93],a
+ ld [wcf93],a
ld a,$13
- ld [$d125],a
+ ld [wd125],a
call DisplayTextBoxID ; draw money text box
ld a,$15
- ld [$d125],a
+ ld [wd125],a
call DisplayTextBoxID ; do buy/sell/quit menu
- ld hl,$d128 ; pointer to this pokemart's inventory
+ ld hl,wd128 ; pointer to this pokemart's inventory
ld a,[hli]
ld l,[hl]
ld h,a ; hl = address of inventory
- ld a,[$d12e]
+ ld a,[wd12e]
cp a,$02
jp z,.done
- ld a,[$d12d] ; ID of the chosen menu item
+ ld a,[wd12d] ; ID of the chosen menu item
and a ; buying?
jp z,.buyMenu
dec a ; selling?
@@ -33,9 +33,9 @@
jp z,.done
.sellMenu
xor a
- ld [$cf93],a
+ ld [wcf93],a
ld a,$02
- ld [$d11b],a
+ ld [wd11b],a
callab Func_39bd5
ld a,[wNumBagItems]
and a
@@ -46,15 +46,15 @@
.sellMenuLoop
call LoadScreenTilesFromBuffer1 ; restore saved screen
ld a,$13
- ld [$d125],a
+ ld [wd125],a
call DisplayTextBoxID ; draw money text box
ld hl,wNumBagItems
ld a,l
- ld [$cf8b],a
+ ld [wcf8b],a
ld a,h
- ld [$cf8c],a
+ ld [wcf8c],a
xor a
- ld [$cf93],a
+ ld [wcf93],a
ld [wCurrentMenuItem],a
ld a,ITEMLISTMENU
ld [wListMenuID],a
@@ -62,10 +62,10 @@
jp c,.returnToMainPokemartMenu ; if the player closed the menu
.confirmItemSale ; if the player is trying to sell a specific item
call IsKeyItem ; check if item is unsellable
- ld a,[$d124]
+ ld a,[wd124]
and a
jr nz,.unsellableItem
- ld a,[$cf91]
+ ld a,[wcf91]
call IsItemHM
jr c,.unsellableItem
ld a,PRICEDITEMLISTMENU
@@ -81,20 +81,20 @@
ld hl,Coord
ld bc,$080f
ld a,$14
- ld [$d125],a
+ ld [wd125],a
call DisplayTextBoxID ; yes/no menu
- ld a,[$d12e]
+ ld a,[wd12e]
cp a,$02
jr z,.sellMenuLoop ; if the player pressed the B button
- ld a,[$d12d] ; ID of the chosen menu item
+ ld a,[wd12d] ; ID of the chosen menu item
dec a
jr z,.sellMenuLoop ; if the player chose No
.sellItem
- ld a,[$cf0a] ; flag that is set if something is sold or bought
+ ld a,[wcf0a] ; flag that is set if something is sold or bought
and a
jr nz,.skipSettingFlag1
inc a
- ld [$cf0a],a
+ ld [wcf0a],a
.skipSettingFlag1
call AddAmountSoldToMoney
ld hl,wNumBagItems
@@ -111,9 +111,9 @@
jp .returnToMainPokemartMenu
.buyMenu
ld a,$01
- ld [$cf93],a
+ ld [wcf93],a
ld a,$03
- ld [$d11b],a
+ ld [wd11b],a
callab Func_39bd5
ld hl,PokemartBuyingGreetingText
call PrintText
@@ -121,32 +121,32 @@
.buyMenuLoop
call LoadScreenTilesFromBuffer1 ; restore saved screen
ld a,$13
- ld [$d125],a
+ ld [wd125],a
call DisplayTextBoxID ; draw money text box
- ld hl,$cf7b
+ ld hl,wStringBuffer2 + 11
ld a,l
- ld [$cf8b],a
+ ld [wcf8b],a
ld a,h
- ld [$cf8c],a
+ ld [wcf8c],a
xor a
ld [wCurrentMenuItem],a
inc a
- ld [$cf93],a
+ ld [wcf93],a
inc a ; a = 2 (PRICEDITEMLISTMENU)
ld [wListMenuID],a
call DisplayListMenuID
jr c,.returnToMainPokemartMenu ; if the player closed the menu
ld a,$63
- ld [$cf97],a
+ ld [wcf97],a
xor a
ld [$ff8e],a
call DisplayChooseQuantityMenu
inc a
jr z,.buyMenuLoop ; if the player closed the choose quantity menu with the B button
- ld a,[$cf91] ; item ID
- ld [$d11e],a ; store item ID for GetItemName
+ ld a,[wcf91] ; item ID
+ ld [wd11e],a ; store item ID for GetItemName
call GetItemName
- call CopyStringToCF4B ; copy name to $cf4b
+ call CopyStringToCF4B ; copy name to wcf4b
ld hl,PokemartTellBuyPriceText
call PrintText
FuncCoord 14,7
@@ -153,12 +153,12 @@
ld hl,Coord
ld bc,$080f
ld a,$14
- ld [$d125],a
+ ld [wd125],a
call DisplayTextBoxID ; yes/no menu
- ld a,[$d12e]
+ ld a,[wd12e]
cp a,$02
jp z,.buyMenuLoop ; if the player pressed the B button
- ld a,[$d12d] ; ID of the chosen menu item
+ ld a,[wd12d] ; ID of the chosen menu item
dec a
jr z,.buyMenuLoop ; if the player chose No
.buyItem
@@ -168,11 +168,11 @@
call AddItemToInventory
jr nc,.bagFull
call SubtractAmountPaidFromMoney
- ld a,[$cf0a] ; flag that is set if something is sold or bought
+ ld a,[wcf0a] ; flag that is set if something is sold or bought
and a
jr nz,.skipSettingFlag2
ld a,$01
- ld [$cf0a],a
+ ld [wcf0a],a
.skipSettingFlag2
ld a,(SFX_02_5a - SFX_Headers_02) / 3
call PlaySoundWaitForCurrent ; play sound
@@ -183,7 +183,7 @@
.returnToMainPokemartMenu
call LoadScreenTilesFromBuffer1 ; restore save screen
ld a,$13
- ld [$d125],a
+ ld [wd125],a
call DisplayTextBoxID ; draw money text box
ld hl,PokemartAnythingElseText
call PrintText
@@ -205,9 +205,9 @@
ld hl,PokemartThankYouText
call PrintText
ld a,$01
- ld [$cfcb],a
+ ld [wcfcb],a
call UpdateSprites ; move sprites
- ld a,[$d07e]
+ ld a,[wd07e]
ld [wListScrollOffset],a
ret
--- a/engine/overworld/ssanne.asm
+++ b/engine/overworld/ssanne.asm
@@ -1,10 +1,10 @@
Func_79f54: ; 79f54 (1e:5f54)
ld a, $1
- ld [$cd50], a
- ld a, [$cfcb]
+ ld [wcd50], a
+ ld a, [wcfcb]
push af
ld a, $ff
- ld [$cfcb], a
+ ld [wcfcb], a
ld a, $e4
ld [rOBP1], a ; $ff49
call LoadSmokeTileFourTimes
@@ -26,17 +26,17 @@
dec c
jr nz, .asm_79f73
pop af
- ld [$cfcb], a
+ ld [wcfcb], a
jp LoadPlayerSpriteGraphics
Func_79f92: ; 79f92 (1e:5f92)
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
ld hl, PointerTable_79fb0 ; $5fb0
ld c, a
ld b, $0
add hl, bc
ld a, [hli]
- ld [$d08a], a
+ ld [wd08a], a
ld a, [hli]
ld e, a
ld a, [hli]
@@ -43,7 +43,7 @@
ld h, [hl]
ld l, a
push hl
- ld hl, $c390
+ ld hl, wOAMBuffer + $90
ld d, $0
add hl, de
ld e, l
--- a/engine/overworld/trainers.asm
+++ b/engine/overworld/trainers.asm
@@ -1,7 +1,7 @@
Func_567f9: ; 567f9 (15:67f9)
ld hl, wSpriteStateData1
ld de, $4
- ld a, [$cf13]
+ ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call Func_56903
ld a, [hli]
@@ -20,26 +20,26 @@
Func_56819: ; 56819 (15:6819)
ld hl, wSpriteStateData1
ld de, $0004
- ld a, [$cf13]
+ ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call Func_56903
ld a, [hli]
- ld [$d130], a
+ ld [wd130], a
inc hl
ld a, [hl]
- ld [$d131], a
+ ld [wd131], a
ld de, $00fe
add hl, de
ld a, [hli]
- ld [$d132], a
+ ld [wd132], a
ld a, [hl]
- ld [$d133], a
+ ld [wd133], a
ret
Func_5683d: ; 5683d (15:683d)
ld hl, wSpriteStateData1
ld de, $4
- ld a, [$cf13]
+ ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call Func_56903
ld a, [$ffeb]
@@ -58,26 +58,26 @@
Func_5685d: ; 5685d (15:685d)
ld hl, wSpriteStateData1
ld de, $0004
- ld a, [$cf13]
+ ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call Func_56903
- ld a, [$d130]
+ ld a, [wd130]
ld [hli], a
inc hl
- ld a, [$d131]
+ ld a, [wd131]
ld [hl], a
ld de, $00fe
add hl, de
- ld a, [$d132]
+ ld a, [wd132]
ld [hli], a
- ld a, [$d133]
+ ld a, [wd133]
ld [hl], a
ret
TrainerWalkUpToPlayer: ; 56881 (15:6881)
- ld a, [$cf13]
+ ld a, [wcf13]
swap a
- ld [wTrainerSpriteOffset], a ; $cd3d
+ ld [wTrainerSpriteOffset], a ; wWhichTrade
call ReadTrainerScreenPosition
ld a, [wTrainerFacingDirection]
and a
@@ -127,7 +127,7 @@
ld a, $c0 ; a = direction to go to
jr .writeWalkScript
.facingLeft
- ld a, [$cd41]
+ ld a, [wTrainerScreenX]
ld b, a
ld a, $40 ; (fixed) player screen X pos
call CalcDifference
@@ -139,11 +139,11 @@
ld b, $0
ld a, $80 ; a = direction to go to
.writeWalkScript
- ld hl, $cc97
- ld de, $cc97
+ ld hl, wcc97
+ ld de, wcc97
call FillMemory ; write the necessary steps to reach player
ld [hl], $ff ; write end of list sentinel
- ld a, [$cf13]
+ ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
jp MoveSprite_
@@ -162,7 +162,7 @@
CheckEngagePlayer: ; 5690f (15:690f)
push hl
push de
- ld a, [wTrainerSpriteOffset] ; $cd3d
+ ld a, [wTrainerSpriteOffset] ; wWhichTrade
add $2
ld d, $0
ld e, a
@@ -173,7 +173,7 @@
jr nz, .spriteOnScreen ; test if sprite is on screen
jp .noEngage
.spriteOnScreen
- ld a, [wTrainerSpriteOffset] ; $cd3d
+ ld a, [wTrainerSpriteOffset] ; wWhichTrade
add $9
ld d, $0
ld e, a
@@ -180,14 +180,14 @@
ld hl, wSpriteStateData1
add hl, de
ld a, [hl] ; c1x9: facing direction
- ld [$cd3f], a
+ ld [wTrainerFacingDirection], a
call ReadTrainerScreenPosition
- ld a, [$cd40] ; sprite screen Y pos
+ ld a, [wTrainerScreenY] ; sprite screen Y pos
ld b, a
ld a, $3c
cp b
jr z, .linedUpY
- ld a, [$cd41] ; sprite screen X pos
+ ld a, [wTrainerScreenX] ; sprite screen X pos
ld b, a
ld a, $40
cp b
@@ -195,7 +195,7 @@
xor a
jp .noEngage
.linedUpY
- ld a, [$cd41] ; sprite screen X pos
+ ld a, [wTrainerScreenX] ; sprite screen X pos
ld b, a
ld a, $40 ; (fixed) player X position
call CalcDifference ; calc distance
@@ -205,7 +205,7 @@
xor a
jr .noEngage
.linedUpX
- ld a, [$cd40] ; sprite screen Y pos
+ ld a, [wTrainerScreenY] ; sprite screen Y pos
ld b, a
ld a, $3c ; (fixed) player Y position
call CalcDifference ; calc distance
@@ -216,7 +216,7 @@
jp .noEngage
.engage
call CheckPlayerIsInFrontOfSprite
- ld a, [wTrainerSpriteOffset] ; $cd3d
+ ld a, [wTrainerSpriteOffset] ; wWhichTrade
and a
jr z, .noEngage
ld hl, wFlags_0xcd60
@@ -224,14 +224,14 @@
call EngageMapTrainer
ld a, $ff
.noEngage: ; 56988 (15:6988)
- ld [wTrainerSpriteOffset], a ; $cd3d
+ ld [wTrainerSpriteOffset], a ; wWhichTrade
pop de
pop hl
ret
-; reads trainer's Y position to $cd40 and X position to $cd41
+; reads trainer's Y position to wTrainerScreenY and X position to wTrainerScreenX
ReadTrainerScreenPosition: ; 5698e (15:698e)
- ld a, [wTrainerSpriteOffset] ; $cd3d
+ ld a, [wTrainerSpriteOffset] ; wWhichTrade
add $4
ld d, $0
ld e, a
@@ -238,8 +238,8 @@
ld hl, wSpriteStateData1
add hl, de
ld a, [hl]
- ld [$cd40], a
- ld a, [wTrainerSpriteOffset] ; $cd3d
+ ld [wTrainerScreenY], a
+ ld a, [wTrainerSpriteOffset] ; wWhichTrade
add $6
ld d, $0
ld e, a
@@ -246,7 +246,7 @@
ld hl, wSpriteStateData1
add hl, de
ld a, [hl]
- ld [$cd41], a
+ ld [wTrainerScreenX], a
ret
; checks if the sprite is properly lined up with the player with respect to the direction it's looking. Also checks the distance between player and sprite
@@ -259,7 +259,7 @@
jr nc, .checkIfLinedUp
jr .notInLine ; player too far away
.checkIfLinedUp
- ld a, [$cd3f] ; sprite facing direction
+ ld a, [wTrainerFacingDirection] ; sprite facing direction
cp $0 ; down
jr z, .checkXCoord
cp $4 ; up
@@ -270,13 +270,13 @@
jr z, .checkYCoord
jr .notInLine
.checkXCoord
- ld a, [$cd41] ; sprite screen X position
+ ld a, [wTrainerScreenX] ; sprite screen X position
ld b, a
cp $40
jr z, .inLine
jr .notInLine
.checkYCoord
- ld a, [$cd40] ; sprite screen Y position
+ ld a, [wTrainerScreenY] ; sprite screen Y position
ld b, a
cp $3c
jr nz, .notInLine
@@ -289,10 +289,10 @@
; tests if the player is in front of the sprite (rather than behind it)
CheckPlayerIsInFrontOfSprite: ; 569e3 (15:69e3)
- ld a, [W_CURMAP] ; $d35e
+ ld a, [W_CURMAP] ; W_CURMAP
cp POWER_PLANT
jp z, .engage ; XXX not sure why bypass this for power plant (maybe to get voltorb fake items to work?)
- ld a, [wTrainerSpriteOffset] ; $cd3d
+ ld a, [wTrainerSpriteOffset] ; wWhichTrade
add $4
ld d, $0
ld e, a
@@ -303,8 +303,8 @@
jr nz, .notOnTopmostTile ; special case if sprite is on topmost tile (Y = $fc (-4)), make it come down a block
ld a, $c
.notOnTopmostTile
- ld [$cd40], a
- ld a, [wTrainerSpriteOffset] ; $cd3d
+ ld [wTrainerScreenY], a
+ ld a, [wTrainerSpriteOffset] ; wWhichTrade
add $6
ld d, $0
ld e, a
@@ -311,11 +311,11 @@
ld hl, wSpriteStateData1
add hl, de
ld a, [hl] ; c1x6 (sprite screen X pos)
- ld [$cd41], a
- ld a, [$cd3f] ; facing direction
+ ld [wTrainerScreenX], a
+ ld a, [wTrainerFacingDirection] ; facing direction
cp $0
jr nz, .notFacingDown
- ld a, [$cd40] ; sprite screen Y pos
+ ld a, [wTrainerScreenY] ; sprite screen Y pos
cp $3c
jr c, .engage ; sprite above player
jr .noEngage ; sprite below player
@@ -322,7 +322,7 @@
.notFacingDown
cp $4
jr nz, .notFacingUp
- ld a, [$cd40] ; sprite screen Y pos
+ ld a, [wTrainerScreenY] ; sprite screen Y pos
cp $3c
jr nc, .engage ; sprite below player
jr .noEngage ; sprite above player
@@ -329,12 +329,12 @@
.notFacingUp
cp $8
jr nz, .notFacingLeft
- ld a, [$cd41] ; sprite screen X pos
+ ld a, [wTrainerScreenX] ; sprite screen X pos
cp $40
jr nc, .engage ; sprite right of player
jr .noEngage ; sprite left of player
.notFacingLeft
- ld a, [$cd41] ; sprite screen X pos
+ ld a, [wTrainerScreenX] ; sprite screen X pos
cp $40
jr nc, .noEngage ; sprite right of player
.engage
@@ -343,5 +343,5 @@
.noEngage
xor a
.done
- ld [wTrainerSpriteOffset], a ; $cd3d
+ ld [wTrainerSpriteOffset], a ; wWhichTrade
ret
--- a/engine/palettes.asm
+++ b/engine/palettes.asm
@@ -3,7 +3,7 @@
ld a, b
cp $ff
jr nz, .asm_71dea
- ld a, [$cf1c]
+ ld a, [wcf1c]
.asm_71dea
cp $fc
jp z, Func_71fc2
@@ -27,7 +27,7 @@
; uses PalPacket_Empty to build a packet based on mon IDs and health color
BuildBattlePalPacket: ; 71e06 (1c:5e06)
ld hl, PalPacket_Empty
- ld de, $cf2d
+ ld de, wcf2d
ld bc, $10
call CopyData
ld a, [W_PLAYERBATTSTATUS3]
@@ -38,12 +38,12 @@
ld hl, W_ENEMYMONID
call DeterminePaletteID
ld c, a
- ld hl, $cf2e
- ld a, [$cf1d]
+ ld hl, wcf2e
+ ld a, [wcf1d]
add PAL_GREENBAR
ld [hli], a
inc hl
- ld a, [$cf1e]
+ ld a, [wcf1e]
add PAL_GREENBAR
ld [hli], a
inc hl
@@ -52,10 +52,10 @@
inc hl
ld a, c
ld [hl], a
- ld hl, $cf2d
+ ld hl, wcf2d
ld de, BlkPacket_Battle
ld a, $1
- ld [$cf1c], a
+ ld [wcf1c], a
ret
SendPalPacket_TownMap: ; 71e48 (1c:5e48)
@@ -66,10 +66,10 @@
; uses PalPacket_Empty to build a packet based the mon ID
BuildStatusScreenPalPacket: ; 71e4f (1c:5e4f)
ld hl, PalPacket_Empty
- ld de, $cf2d
+ ld de, wcf2d
ld bc, $10
call CopyData
- ld a, [$cf91]
+ ld a, [wcf91]
cp VICTREEBEL + 1
jr c, .pokemon
ld a, $1 ; not pokemon
@@ -76,32 +76,32 @@
.pokemon
call DeterminePaletteIDOutOfBattle
push af
- ld hl, $cf2e
- ld a, [$cf25]
+ ld hl, wcf2e
+ ld a, [wcf25]
add $1f
ld [hli], a
inc hl
pop af
ld [hl], a
- ld hl, $cf2d
+ ld hl, wcf2d
ld de, BlkPacket_StatusScreen
ret
SendPalPacket_PartyMenu: ; 71e7b (1c:5e7b)
ld hl, PalPacket_PartyMenu
- ld de, $cf2e
+ ld de, wcf2e
ret
SendPalPacket_Pokedex: ; 71e82 (1c:5e82)
ld hl, PalPacket_Pokedex
- ld de, $cf2d
+ ld de, wcf2d
ld bc, $10
call CopyData
- ld a, [$cf91]
+ ld a, [wcf91]
call DeterminePaletteIDOutOfBattle
- ld hl, $cf30
+ ld hl, wcf30
ld [hl], a
- ld hl, $cf2d
+ ld hl, wcf2d
ld de, BlkPacket_Pokedex
ret
@@ -130,13 +130,13 @@
ld hl, PalPacket_GameFreakIntro
ld de, BlkPacket_GameFreakIntro
ld a, $8
- ld [$cf1c], a
+ ld [wcf1c], a
ret
; uses PalPacket_Empty to build a packet based on the current map
BuildOverworldPalPacket: ; 71ec7 (1c:5ec7)
ld hl, PalPacket_Empty
- ld de, $cf2d
+ ld de, wcf2d
ld bc, $10
call CopyData
ld a, [W_CURMAPTILESET]
@@ -163,11 +163,11 @@
ld a, PAL_ROUTE - 1
.town
inc a ; a town's pallete ID is its map ID + 1
- ld hl, $cf2e
+ ld hl, wcf2e
ld [hld], a
ld de, BlkPacket_WholeScreen
ld a, $9
- ld [$cf1c], a
+ ld [wcf1c], a
ret
.PokemonTowerOrAgatha
ld a, PAL_GREYMON - 1
@@ -184,7 +184,7 @@
SendPokemonPalette_WholeScreen: ; 71f17 (1c:5f17)
push bc
ld hl, PalPacket_Empty
- ld de, $cf2d
+ ld de, wcf2d
ld bc, $10
call CopyData
pop bc
@@ -192,21 +192,21 @@
and a
ld a, $1e
jr nz, .asm_71f31
- ld a, [$cf1d]
+ ld a, [wcf1d]
call DeterminePaletteIDOutOfBattle
.asm_71f31
- ld [$cf2e], a
- ld hl, $cf2d
+ ld [wcf2e], a
+ ld hl, wcf2d
ld de, BlkPacket_WholeScreen
ret
BuildTrainerCardPalPacket: ; 71f3b (1c:5f3b)
ld hl, BlkPacket_TrainerCard
- ld de, $cc5b
+ ld de, wcc5b
ld bc, $40
call CopyData
ld de, LoopCounts_71f8f
- ld hl, $cc5d
+ ld hl, wcc5d
ld a, [W_OBTAINEDBADGES]
ld c, $8
.asm_71f52
@@ -235,7 +235,7 @@
dec c
jr nz, .asm_71f52
ld hl, PalPacket_TrainerCard
- ld de, $cc5b
+ ld de, wcc5b
ret
PointerTable_71f73: ; 71f73 (1c:5f73)
@@ -264,7 +264,7 @@
ret nz
ld a, [hl]
DeterminePaletteIDOutOfBattle: ; 71f9d (1c:5f9d)
- ld [$D11E], a
+ ld [wd11e], a
and a
jr z, .idZero
push bc
@@ -271,7 +271,7 @@
ld a, $3A
call Predef ; turn Pokemon ID number into Pokedex number
pop bc
- ld a, [$D11E]
+ ld a, [wd11e]
.idZero
ld e, a
ld d, $00
@@ -282,13 +282,13 @@
SendBlkPacket_PartyMenu: ; 71fb6 (1c:5fb6)
ld hl, BlkPacket_PartyMenu ; $62f4
- ld de, $cf2e
+ ld de, wcf2e
ld bc, $30
jp CopyData
Func_71fc2: ; 71fc2 (1c:5fc2)
- ld hl, $cf1f
- ld a, [$cf2d]
+ ld hl, wcf1f
+ ld a, [wcf2d]
ld e, a
ld d, $0
add hl, de
@@ -304,9 +304,9 @@
ld e, $f
.asm_71fdb
push de
- ld hl, $cf37
+ ld hl, wcf37
ld bc, $6
- ld a, [$cf2d]
+ ld a, [wcf2d]
call AddNTimes
pop de
ld [hl], e
@@ -381,12 +381,12 @@
LoadSGBBorderAndPalettes: ; 7202b (1c:602b)
xor a
- ld [$cf1b], a
+ ld [wcf1b], a
call Func_7209b
ret nc
ld a, $1
- ld [$cf1b], a
- ld a, [$cf1a]
+ ld [wcf1b], a
+ ld a, [wGBC]
and a
jr z, .asm_7203f
ret
@@ -395,17 +395,17 @@
call Func_72075
ei
ld a, $1
- ld [$cf2d], a
+ ld [wcf2d], a
ld de, PalPacket_72508
ld hl, SGBBorderGraphics
call Func_7210b
xor a
- ld [$cf2d], a
+ ld [wcf2d], a
ld de, PalPacket_72518
ld hl, BorderPalettes
call Func_7210b
xor a
- ld [$cf2d], a
+ ld [wcf2d], a
ld de, PalPacket_724d8
ld hl, SuperPalettes
call Func_7210b
@@ -504,7 +504,7 @@
ld a, $e4
ld [rBGP], a ; $ff47
ld de, $8800
- ld a, [$cf2d]
+ ld a, [wcf2d]
and a
jr z, .asm_72122
call Func_72188
@@ -551,7 +551,7 @@
ret
Func_72156: ; 72156 (1c:6156)
- ld a, [$cf1a]
+ ld a, [wGBC]
and a
jr z, .asm_72165
push de
--- a/engine/play_time.asm
+++ b/engine/play_time.asm
@@ -1,43 +1,43 @@
Func_18dee: ; 18dee (6:4dee)
call Func_18e36
- ld a, [$d732]
+ ld a, [wd732]
bit 0, a
ret z
- ld a, [W_PLAYTIMEMINUTES] ; $da42
+ ld a, [W_PLAYTIMEMINUTES] ; wda42
and a
ret nz
- ld a, [W_PLAYTIMEFRAMES] ; $da45
+ ld a, [W_PLAYTIMEFRAMES] ; wda45
inc a
- ld [W_PLAYTIMEFRAMES], a ; $da45
+ ld [W_PLAYTIMEFRAMES], a ; wda45
cp 60
ret nz
xor a
- ld [W_PLAYTIMEFRAMES], a ; $da45
- ld a, [W_PLAYTIMESECONDS] ; $da44
+ ld [W_PLAYTIMEFRAMES], a ; wda45
+ ld a, [W_PLAYTIMESECONDS] ; wda44
inc a
- ld [W_PLAYTIMESECONDS], a ; $da44
+ ld [W_PLAYTIMESECONDS], a ; wda44
cp 60
ret nz
xor a
- ld [W_PLAYTIMESECONDS], a ; $da44
- ld a, [$da43]
+ ld [W_PLAYTIMESECONDS], a ; wda44
+ ld a, [W_PLAYTIMEMINUTES + 1]
inc a
- ld [$da43], a
+ ld [W_PLAYTIMEMINUTES + 1], a
cp 60
ret nz
xor a
- ld [$da43], a
- ld a, [$da41]
+ ld [W_PLAYTIMEMINUTES + 1], a
+ ld a, [W_PLAYTIMEHOURS + 1]
inc a
- ld [$da41], a
+ ld [W_PLAYTIMEHOURS + 1], a
cp $ff
ret nz
ld a, $ff
- ld [W_PLAYTIMEMINUTES], a ; $da42
+ ld [W_PLAYTIMEMINUTES], a ; wda42
ret
Func_18e36: ; 18e36 (6:4e36)
- ld a, [$d13a]
+ ld a, [wd13a]
and a
jr nz, .asm_18e40
ld a, $ff
@@ -45,15 +45,15 @@
.asm_18e40
dec a
.asm_18e41
- ld [$d13a], a
+ ld [wd13a], a
and a
ret nz
- ld a, [$d730]
+ ld a, [wd730]
res 1, a
res 2, a
bit 5, a
res 5, a
- ld [$d730], a
+ ld [wd730], a
ret z
xor a
ld [hJoyPressed], a
--- a/engine/pokedex_rating.asm
+++ b/engine/pokedex_rating.asm
@@ -2,12 +2,12 @@
ld hl, wPokedexSeen
ld b, wPokedexSeenEnd - wPokedexSeen
call CountSetBits
- ld a, [$D11E] ; result of CountSetBits (seen count)
+ ld a, [wd11e] ; result of CountSetBits (seen count)
ld [$FFDB], a
ld hl, wPokedexOwned
ld b, wPokedexOwnedEnd - wPokedexOwned
call CountSetBits
- ld a, [$D11E] ; result of CountSetBits (own count)
+ ld a, [wd11e] ; result of CountSetBits (own count)
ld [$FFDC], a
ld hl, DexRatingsTable
.findRating
@@ -23,10 +23,10 @@
ld a, [hli]
ld h, [hl]
ld l, a ; load text pointer into hl
- ld a, [$D747]
+ ld a, [wd747]
bit 3, a
res 3, a
- ld [$D747], a
+ ld [wd747], a
jr nz, .label3
push hl
ld hl, PokedexRatingText_441cc
@@ -36,7 +36,7 @@
callba Func_7d13b
jp WaitForTextScrollButtonPress ; wait for button press
.label3
- ld de, $CC5B
+ ld de, wcc5b
ld a, [$FFDB]
ld [de], a
inc de
--- a/engine/predefs.asm
+++ b/engine/predefs.asm
@@ -1,25 +1,20 @@
-GetPredefPointer: ; 4fe49 (13:7e49)
-; stores hl in $CC4F,$CC50
-; stores de in $CC51,$CC52
-; stores bc in $CC53,$CC54
-; grabs a byte "n" from $CC4E,
-; and gets the nth (3-byte) pointer in PredefPointers
-; stores the bank of said pointer in [$D0B7]
-; stores the pointer in hl and returns
- ; ld $CC4F,hl
+GetPredefPointer:
+; Store the contents of the register
+; pairs (hl, de, bc) at wPredefRegisters.
+; Then put the bank and address of predef
+; wPredefID in [wPredefBank] and hl.
+
ld a,h
- ld [$CC4F],a
+ ld [wPredefRegisters],a
ld a,l
- ld [$CC50],a
+ ld [wPredefRegisters + 1],a
- ; ld $CC51,de
- ld hl,$CC51
+ ld hl,wPredefRegisters + 2
ld a,d
ld [hli],a
ld a,e
ld [hli],a
- ; ld $CC53,bc
ld a,b
ld [hli],a
ld [hl],c
@@ -27,11 +22,10 @@
ld hl,PredefPointers
ld de,0
- ; de = 3 * [$CC4E]
- ld a,[$CC4E]
+ ld a,[wPredefID]
ld e,a
- add a,a
- add a,e
+ add a
+ add e
ld e,a
jr nc,.next
inc d
@@ -43,7 +37,7 @@
; get bank of predef routine
ld a,[de]
- ld [$D0B7],a
+ ld [wPredefBank],a
; get pointer
inc de
--- a/engine/predefs12.asm
+++ b/engine/predefs12.asm
@@ -13,7 +13,7 @@
Func_480ff: ; 480ff (12:40ff)
call GetPredefRegisters
ld a, $1
- ld [$d0a0], a
+ ld [wd0a0], a
xor a
.asm_48108
ld [H_NUMTOPRINT], a ; $ff96 (aliases: H_MULTIPLICAND)
@@ -23,7 +23,7 @@
ld a, b
jr nz, .asm_48108
xor a
- ld [$d0a0], a
+ ld [wd0a0], a
ret
Func_48119: ; 48119 (12:4119)
--- a/engine/predefs17.asm
+++ b/engine/predefs17.asm
@@ -2,9 +2,9 @@
; so that the full Pokedex information gets displayed in Oak's lab
DisplayStarterMonDex: ; 5c0dc (17:40dc)
ld a, %01001011 ; set starter flags
- ld [wPokedexOwned], a ; $d2f7
+ ld [wPokedexOwned], a ; wPokedexOwned
ld a, $3d
call Predef ; indirect jump to ShowPokedexData (402d1 (10:42d1))
xor a ; unset starter flags
- ld [wPokedexOwned], a ; $d2f7
+ ld [wPokedexOwned], a ; wPokedexOwned
ret
--- a/engine/predefs17_2.asm
+++ b/engine/predefs17_2.asm
@@ -1,10 +1,10 @@
-; updates the types of a party mon (pointed to in hl) to the ones of the mon specified in $d11e
+; updates the types of a party mon (pointed to in hl) to the ones of the mon specified in wd11e
SetPartyMonTypes: ; 5db5e (17:5b5e)
call GetPredefRegisters
ld bc, W_PARTYMON1_TYPE1 - W_PARTYMON1DATA ; $5
add hl, bc
- ld a, [$d11e]
- ld [$d0b5], a
+ ld a, [wd11e]
+ ld [wd0b5], a
push hl
call GetMonHeader
pop hl
--- a/engine/predefs7.asm
+++ b/engine/predefs7.asm
@@ -1,28 +1,28 @@
Func_1c9c6: ; 1c9c6 (7:49c6)
ld hl, WhichFloorText
call PrintText
- ld hl, $cf7b
+ ld hl, wStringBuffer2 + 11
ld a, l
- ld [$cf8b], a
+ ld [wcf8b], a
ld a, h
- ld [$cf8c], a
- ld a, [wListScrollOffset] ; $cc36
+ ld [wcf8c], a
+ ld a, [wListScrollOffset] ; wcc36
push af
xor a
- ld [wCurrentMenuItem], a ; $cc26
- ld [wListScrollOffset], a ; $cc36
- ld [$cf93], a
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld [wListScrollOffset], a ; wcc36
+ ld [wcf93], a
ld a, $4
- ld [wListMenuID], a ; $cf94
+ ld [wListMenuID], a ; wListMenuID
call DisplayListMenuID
pop bc
ld a, b
- ld [wListScrollOffset], a ; $cc36
+ ld [wListScrollOffset], a ; wcc36
ret c
- ld hl, $d126
+ ld hl, wd126
set 7, [hl]
- ld hl, $cc5b
- ld a, [wWhichPokemon] ; $cf92
+ ld hl, wcc5b
+ ld a, [wWhichPokemon] ; wWhichPokemon
add a
ld d, $0
ld e, a
@@ -31,7 +31,7 @@
ld b, a
ld a, [hl]
ld c, a
- ld hl, $d3af
+ ld hl, wd3af
call Func_1ca0d
Func_1ca0d: ; 1ca0d (7:4a0d)
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -13,7 +13,7 @@
ld a, $2 ; good checksum
jr .goodsum
.badsum
- ld hl, $d730
+ ld hl, wd730
push hl
set 6, [hl]
ld hl, FileDataDestroyedText
@@ -24,7 +24,7 @@
res 6, [hl]
ld a, $1 ; bad checksum
.goodsum
- ld [$d088], a ; checksum flag
+ ld [wd088], a ; checksum flag
ret
FileDataDestroyedText: ; 7361e (1c:761e)
@@ -54,14 +54,14 @@
.Func_73652 ; 73652 (1c:7652)
ld hl, $a598
- ld de, W_PLAYERNAME ; $d158
+ ld de, W_PLAYERNAME ; wd158
ld bc, $b
call CopyData
ld hl, $a5a3
- ld de, wPokedexOwned ; $d2f7
+ ld de, wPokedexOwned ; wPokedexOwned
ld bc, $789
call CopyData
- ld hl, W_CURMAPTILESET ; $d367
+ ld hl, W_CURMAPTILESET ; W_CURMAPTILESET
set 7, [hl]
ld hl, $ad2c
ld de, wSpriteStateData1
@@ -70,7 +70,7 @@
ld a, [$b522]
ld [$ffd7], a
ld hl, $b0c0
- ld de, W_NUMINBOX ; $da80
+ ld de, W_NUMINBOX ; wda80
ld bc, $462
call CopyData
and a
@@ -90,7 +90,7 @@
cp c
jr nz, SAVBadCheckSum
ld hl, $b0c0
- ld de, W_NUMINBOX ; $da80
+ ld de, W_NUMINBOX ; wda80
ld bc, $462
call CopyData
and a
@@ -110,11 +110,11 @@
cp c
jp nz, SAVBadCheckSum
ld hl, $af2c
- ld de, W_NUMINPARTY ; $d163
+ ld de, W_NUMINPARTY ; W_NUMINPARTY
ld bc, $194
call CopyData
ld hl, $a5a3
- ld de, wPokedexOwned ; $d2f7
+ ld de, wPokedexOwned ; wPokedexOwned
ld bc, wPokedexSeenEnd - wPokedexOwned
call CopyData
and a
@@ -140,7 +140,7 @@
call SaveSAVConfirm
and a ;|0 = Yes|1 = No|
ret nz
- ld a,[$d088]
+ ld a,[wd088]
dec a
jr z,.save
call SAVCheckRandomID
@@ -178,9 +178,9 @@
ld hl,Coord
ld bc,$0801 ;arrow's coordinates |b = Y|c = X|
ld a,$14 ;one line shifting ($28 = 2 lines)
- ld [$d125],a
+ ld [wd125],a
call DisplayTextBoxID ;handle Yes/No KeyPress
- ld a,[$cc26]
+ ld a,[wCurrentMenuItem]
ret
WouldYouLikeToSaveText: ; 0x7377d
@@ -201,11 +201,11 @@
ld a, $1
ld [$6000], a
ld [$4000], a
- ld hl, W_PLAYERNAME ; $d158
+ ld hl, W_PLAYERNAME ; wd158
ld de, $a598
ld bc, $b
call CopyData
- ld hl, wPokedexOwned ; $d2f7
+ ld hl, wPokedexOwned ; wPokedexOwned
ld de, $a5a3
ld bc, $789
call CopyData
@@ -213,7 +213,7 @@
ld de, $ad2c
ld bc, $200
call CopyData
- ld hl, W_NUMINBOX ; $da80
+ ld hl, W_NUMINBOX ; wda80
ld de, $b0c0
ld bc, $462
call CopyData
@@ -235,7 +235,7 @@
ld a, $1
ld [$6000], a
ld [$4000], a
- ld hl, W_NUMINBOX ; $da80
+ ld hl, W_NUMINBOX ; wda80
ld de, $b0c0
ld bc, $462
call CopyData
@@ -254,7 +254,7 @@
ld a, $1
ld [$6000], a
ld [$4000], a
- ld hl, W_NUMINPARTY ; $d163
+ ld hl, W_NUMINPARTY ; W_NUMINPARTY
ld de, $af2c
ld bc, $194
call CopyData
@@ -273,7 +273,7 @@
SaveSAVtoSRAM: ; 73848 (1c:7848)
ld a, $2
- ld [$d088], a
+ ld [wd088], a
call SaveSAVtoSRAM0
call SaveSAVtoSRAM1
jp SaveSAVtoSRAM2
@@ -312,7 +312,7 @@
Func_7387b: ; 7387b (1c:787b)
ld hl, PointerTable_73895 ; $7895
- ld a, [$d5a0]
+ ld a, [wd5a0]
and $7f
cp $6
ld b, $2
@@ -341,10 +341,10 @@
ld hl, WhenYouChangeBoxText
call PrintText
call YesNoChoice
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
and a
ret nz
- ld hl, $d5a0
+ ld hl, wd5a0
bit 7, [hl]
call z, Func_73a29
call Func_7393f
@@ -359,16 +359,16 @@
call Func_7387b
ld e, l
ld d, h
- ld hl, W_NUMINBOX ; $da80
+ ld hl, W_NUMINBOX ; wda80
call Func_7390e
- ld a, [wCurrentMenuItem] ; $cc26
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
set 7, a
- ld [$d5a0], a
+ ld [wd5a0], a
call Func_7387b
- ld de, W_NUMINBOX ; $da80
+ ld de, W_NUMINBOX ; wda80
call Func_7390e
- ld hl, W_MAPTEXTPTR ; $d36c
- ld de, wWhichTrade ; $cd3d
+ ld hl, W_MAPTEXTPTR ; wd36c
+ ld de, wWhichTrade ; wWhichTrade
ld a, [hli]
ld [de], a
inc de
@@ -376,7 +376,7 @@
ld [de], a
call Func_3f05
call SaveSAVtoSRAM
- ld hl, wWhichTrade ; $cd3d
+ ld hl, wWhichTrade ; wWhichTrade
call Func_3f0f
ld a, (SFX_02_5d - SFX_Headers_02) / 3
call PlaySoundWaitForCurrent
@@ -416,19 +416,19 @@
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
ld a, $3
- ld [wMenuWatchedKeys], a ; $cc29
+ ld [wMenuWatchedKeys], a ; wMenuWatchedKeys
ld a, $b
- ld [wMaxMenuItem], a ; $cc28
+ ld [wMaxMenuItem], a ; wMaxMenuItem
ld a, $1
- ld [wTopMenuItemY], a ; $cc24
+ ld [wTopMenuItemY], a ; wTopMenuItemY
ld a, $c
- ld [wTopMenuItemX], a ; $cc25
+ ld [wTopMenuItemX], a ; wTopMenuItemX
xor a
- ld [$cc37], a
- ld a, [$d5a0]
+ ld [wcc37], a
+ ld a, [wd5a0]
and $7f
- ld [wCurrentMenuItem], a ; $cc26
- ld [wLastMenuItem], a ; $cc2a
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld [wLastMenuItem], a ; wLastMenuItem
ld hl, wTileMap
ld b, $2
ld c, $9
@@ -435,7 +435,7 @@
call TextBoxBorder
ld hl, ChooseABoxText
call PrintText
- FuncCoord 11, 0 ; $c3ab
+ FuncCoord 11, 0
ld hl, Coord
ld b, $c
ld c, $7
@@ -443,17 +443,17 @@
ld hl, $fff6
set 2, [hl]
ld de, BoxNames ; $79d9
- FuncCoord 13, 1 ; $c3c1
+ FuncCoord 13, 1
ld hl, Coord
call PlaceString
ld hl, $fff6
res 2, [hl]
- ld a, [$d5a0]
+ ld a, [wd5a0]
and $7f
cp $9
jr c, .asm_739a6
sub $9
- FuncCoord 8, 2 ; $c3d0
+ FuncCoord 8, 2
ld hl, Coord
ld [hl], $f7
add $f6
@@ -461,16 +461,16 @@
.asm_739a6
add $f7
.asm_739a8
- FuncCoord 9, 2 ; $c3d1
+ FuncCoord 9, 2
ld [Coord], a
- FuncCoord 1, 2 ; $c3c9
+ FuncCoord 1, 2
ld hl, Coord
ld de, BoxNoText
call PlaceString
call Func_73a84
- FuncCoord 18, 1 ; $c3c6
+ FuncCoord 18, 1
ld hl, Coord
- ld de, wWhichTrade ; $cd3d
+ ld de, wWhichTrade ; wWhichTrade
ld bc, $14
ld a, $c
.asm_739c2
@@ -554,7 +554,7 @@
ret
Func_73a84: ; 73a84 (1c:7a84)
- ld hl, wWhichTrade ; $cd3d
+ ld hl, wWhichTrade ; wWhichTrade
push hl
ld a, $a
ld [$0], a
@@ -570,12 +570,12 @@
ld [$6000], a
ld [$0], a
pop hl
- ld a, [$d5a0]
+ ld a, [wd5a0]
and $7f
ld c, a
ld b, $0
add hl, bc
- ld a, [W_NUMINBOX] ; $da80
+ ld a, [W_NUMINBOX] ; wda80
ld [hl], a
ret
@@ -597,7 +597,7 @@
SAVCheckRandomID: ;$7ad1
;checks if Sav file is the same by checking player's name 1st letter ($a598)
; and the two random numbers generated at game beginning
-;(which are stored at $d359-d35a)
+;(which are stored at wPlayerID)
ld a,$0a
ld [$0000],a
ld a,$01
@@ -617,10 +617,10 @@
ld a,[hli]
ld h,[hl]
ld l,a
- ld a,[$d359]
+ ld a,[wPlayerID]
cp l
jr nz,.next
- ld a,[$d35a]
+ ld a,[wPlayerID + 1]
cp h
.next
ld a,$00
@@ -629,7 +629,7 @@
ret
Func_73b0d: ; 73b0d (1c:7b0d)
- ld a, [$d5a2]
+ ld a, [wd5a2]
dec a
cp $32
jr nc, .asm_73b28
@@ -638,7 +638,7 @@
call AddNTimes
ld e, l
ld d, h
- ld hl, $cc5b
+ ld hl, wcc5b
ld bc, $60
jr CopyToSRAM0
.asm_73b28
@@ -646,7 +646,7 @@
ld de, $a598
ld bc, $1260
call CopyToSRAM0
- ld hl, $cc5b
+ ld hl, wcc5b
ld de, $b7f8
ld bc, $60
jr CopyToSRAM0
@@ -654,9 +654,9 @@
Func_73b3f: ; 73b3f (1c:7b3f)
ld hl, $a598
ld bc, $60
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
call AddNTimes
- ld de, $cc5b
+ ld de, wcc5b
ld bc, $60
; fallthrough
CopyToSRAM0: ; 73b51 (1c:7b51)
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -1,7 +1,7 @@
PromptUserToPlaySlots: ; 3730e (d:730e)
call SaveScreenTilesToBuffer2
ld a, BANK(DisplayTextIDInit)
- ld [$cf0c], a
+ ld [wcf0c], a
ld b, a
ld hl, DisplayTextIDInit
call Bankswitch
@@ -12,8 +12,8 @@
and a
jr nz, .skip
dec a
- ld [$cfcb], a
- ld hl, $cd4f
+ ld [wcfcb], a
+ ld hl, wcd4f
xor a
ld [hli], a
ld [hl], $2
@@ -27,7 +27,7 @@
call GBPalNormal
ld a, $e4
ld [$ff48], a
- ld hl, $d730
+ ld hl, wd730
set 6, [hl]
xor a
ld [W_SUBANIMSUBENTRYADDR], a
@@ -35,13 +35,13 @@
ld bc, $0014
call FillMemory
call MainSlotMachineLoop
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
xor a
ld [W_SUBANIMSUBENTRYADDR], a
call GBPalWhiteOutWithDelay3
ld a, $1
- ld [$cfcb], a
+ ld [wcfcb], a
call GoPAL_SET_CF1C
call Func_3e08
call ReloadTilesetTilePatterns
@@ -49,7 +49,7 @@
call LoadScreenTilesFromBuffer2
call Delay3
call GBPalNormal
- ld a, [$cc5e]
+ ld a, [wcc5e]
push af
jp CloseTextDisplay
@@ -60,7 +60,7 @@
MainSlotMachineLoop: ; 37395 (d:7395)
call SlotMachine_37754
xor a
- ld hl, $cd4a
+ ld hl, wcd4a
ld [hli], a
ld [hl], a
call SlotMachine_3775f
@@ -79,12 +79,12 @@
xor a
ld [wCurrentMenuItem], a
ld [wLastMenuItem], a
- ld [$cc37], a
- ld hl, $c48a
+ ld [wcc37], a
+ ld hl, wTileMap + $ea
ld b, $5
ld c, $4
call TextBoxBorder
- ld hl, $c4a0
+ ld hl, wTileMap + $100
ld de, CoinMultiplierSlotMachineText
call PlaceString
call HandleMenuInput
@@ -94,7 +94,7 @@
ld b, a
ld a, $3
sub b
- ld [$cd50], a
+ ld [wcd50], a
ld hl, wPlayerCoins
ld c, a
ld a, [hli]
@@ -112,7 +112,7 @@
call SlotMachine_377d5
call SlotMachine_37480
ld a, $4
- ld hl, $cd4d
+ ld hl, wcd4d
ld [hli], a
ld [hli], a
ld [hl], a
@@ -134,12 +134,12 @@
.skip2
ld hl, OneMoreGoSlotMachineText
call PrintText
- ld hl, $c49e
+ ld hl, wTileMap + $fe
ld bc, $0d0f
xor a
- ld [$d12c], a
+ ld [wd12c], a
ld a, $14
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
ld a, [wCurrentMenuItem]
and a
@@ -173,7 +173,7 @@
db "@"
SlotMachine_37480: ; 37480 (d:7480)
- ld hl, $cd4c
+ ld hl, wcd4c
bit 7, [hl]
ret nz
ld a, [W_SUBANIMSUBENTRYADDR]
@@ -183,7 +183,7 @@
and a
jr z, .skip2
ld b, a
- ld a, [$cc5b]
+ ld a, [wcc5b]
cp b
jr c, .skip3
ld a, $d2
@@ -222,7 +222,7 @@
call SlotMachine_374fb
call SlotMachine_37517
ret c
- ld a, [$cf1b]
+ ld a, [wcf1b]
xor $1
inc a
ld c, a
@@ -237,7 +237,7 @@
ld a, [de]
rra
jr nc, .skip
- ld hl, $cd4d
+ ld hl, wcd4d
ld a, [hl]
and a
ret z
@@ -255,7 +255,7 @@
ld a, [de]
rra
jr nc, .skip
- ld hl, $cd4e
+ ld hl, wcd4e
ld a, [hl]
and a
ret z
@@ -283,7 +283,7 @@
SlotMachine_3752c: ; 3752c (d:752c)
call SlotMachine_GetWheelOneTile
ld hl, wTrainerScreenX
- ld a, [$cd4c]
+ ld a, [wcd4c]
and $80
jr nz, .skip1
inc hl
@@ -302,13 +302,13 @@
ret
.skip2
inc a
- ld hl, $cd4d
+ ld hl, wcd4d
ld [hl], $0
ret
SlotMachine_37552: ; 37552 (d:7552)
call SlotMachine_GetWheelTwoTile
- ld a, [$cd4c]
+ ld a, [wcd4c]
and $80
jr nz, .skip1
call SlotMachine_3756e
@@ -321,12 +321,12 @@
ret nc
.skip2
xor a
- ld [$cd4e], a
+ ld [wcd4e], a
ret
SlotMachine_3756e: ; 3756e (d:756e)
ld hl, wTrainerScreenX
- ld de, $cd44
+ ld de, wcd44
ld a, [de]
cp [hl]
ret z
@@ -350,42 +350,42 @@
SlotMachine_37588: ; 37588 (d:7588)
call SlotMachine_GetWheelThreeTile
- ld a, [$cd50]
+ ld a, [wcd50]
cp $2
jr z, .skip1
cp $1
jr z, .skip2
ld hl, wTrainerScreenX
- ld de, $cd45
- ld bc, $cd49
+ ld de, wcd45
+ ld bc, wcd49
call SlotMachine_CheckForMatch
jp z, .skip5
- ld hl, $cd43
- ld de, $cd45
- ld bc, $cd47
+ ld hl, wcd43
+ ld de, wcd45
+ ld bc, wcd47
call SlotMachine_CheckForMatch
jr z, .skip5
.skip1
- ld hl, $cd43
- ld de, $cd46
- ld bc, $cd49
+ ld hl, wcd43
+ ld de, wcd46
+ ld bc, wcd49
call SlotMachine_CheckForMatch
jr z, .skip5
ld hl, wTrainerScreenX
- ld de, $cd44
- ld bc, $cd47
+ ld de, wcd44
+ ld bc, wcd47
call SlotMachine_CheckForMatch
jr z, .skip5
.skip2
- ld hl, $cd42
- ld de, $cd45
- ld bc, $cd48
+ ld hl, wcd42
+ ld de, wcd45
+ ld bc, wcd48
call SlotMachine_CheckForMatch
jr z, .skip5
- ld a, [$cd4c]
+ ld a, [wcd4c]
and $c0
jr z, .skip3
- ld hl, $cd4f
+ ld hl, wcd4f
dec [hl]
jr nz, .skip4
.skip3
@@ -393,7 +393,7 @@
call PrintText
.loop
xor a
- ld [$c002], a
+ ld [wc002], a
ret
.skip4
call SlotMachine_37833
@@ -402,7 +402,7 @@
call DelayFrame
jp SlotMachine_37588
.skip5
- ld a, [$cd4c]
+ ld a, [wcd4c]
and $c0
jr z, .skip4
and $80
@@ -426,7 +426,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- ld de, $cf4b
+ ld de, wcf4b
ld bc, $0004
call CopyData
pop hl
@@ -442,7 +442,7 @@
call DelayFrames
dec b
jr nz, .asm_37638
- ld hl, $cd4a
+ ld hl, wcd4a
ld [hl], d
inc hl
ld [hl], e
@@ -512,13 +512,13 @@
ret
SlotMachine_GetWheelThreeTile: ; 376a8 (d:76a8)
- ld de, $cd47
+ ld de, wcd47
ld hl, SlotMachineWheel3
ld a, [wTrainerScreenY]
call SlotMachine_GetWheelTile
SlotMachine_GetWheelTwoTile: ; 376b4 (d:76b4)
- ld de, $cd44
+ ld de, wcd44
ld hl, SlotMachineWheel2
ld a, [wTrainerFacingDirection]
call SlotMachine_GetWheelTile
@@ -568,7 +568,7 @@
ld a, (SFX_1f_42 - SFX_Headers_1f) / 3
call PlaySound
xor a
- ld [$cd4c], a
+ ld [wcd4c], a
ld b, $8
ld de, 100
ret
@@ -582,7 +582,7 @@
cp $80
ld a, $0
jr c, .skip
- ld [$cd4c], a
+ ld [wcd4c], a
.skip
ld [W_SUBANIMSUBENTRYADDR], a
ld b, $14
@@ -594,7 +594,7 @@
db $0a, "@"
SlotMachine_37728: ; 37728 (d:7728)
- ld hl, $c4ba
+ ld hl, wTileMap + $11a
ld a, [wTrainerScreenX]
add $25
ld [hli], a
@@ -606,38 +606,38 @@
ld [hli], a
inc a
ld [hl], a
- ld hl, $c4f2
+ ld hl, wTileMap + $152
ld [hl], $ee
ret
SlotMachine_37741: ; 37741 (d:7741)
- ld hl, $cd4b
- ld a, [$cd50]
+ ld hl, wcd4b
+ ld a, [wcd50]
ld [hld], a
xor a
ld [hli], a
- ld de, $d5a5
+ ld de, wPlayerCoins + 1
ld c, $2
ld a, $c ; SubtractBCDPredef
call Predef
SlotMachine_37754: ; 37754 (d:7754)
- ld hl, $c3b9
+ ld hl, wTileMap + $19
ld de, wPlayerCoins
ld c, $2
jp PrintBCDNumber
SlotMachine_3775f: ; 3775f (d:775f)
- ld hl, $c3bf
- ld de, $cd4a
+ ld hl, wTileMap + $1f
+ ld de, wcd4a
ld bc, $8204
jp PrintNumber
SlotMachine_3776b: ; 3776b (d:776b)
ld a, $1
- ld [$c002], a
+ ld [wc002], a
call WaitForSoundToFinish
- ld hl, $cd46
+ ld hl, wcd46
xor a
ld [hli], a
inc a
@@ -645,9 +645,9 @@
ld a, $5
ld [W_SUBANIMTRANSFORM], a
.loop
- ld a, [$cd4b]
+ ld a, [wcd4b]
ld l, a
- ld a, [$cd4a]
+ ld a, [wcd4a]
ld h, a
or l
ret z
@@ -654,11 +654,11 @@
ld de, $ffff
add hl, de
ld a, l
- ld [$cd4b], a
+ ld [wcd4b], a
ld a, h
- ld [$cd4a], a
- ld hl, $cd47
- ld de, $d5a5
+ ld [wcd4a], a
+ ld hl, wcd47
+ ld de, wPlayerCoins + 1
ld c, $2
ld a, $b ; AddBCDPredef
call Predef
@@ -686,13 +686,13 @@
SlotMachine_377ce: ; 377ce (d:77ce)
ld a, $23
- ld [$d08a], a
+ ld [wd08a], a
jr SlotMachine_377e3
SlotMachine_377d5: ; 377d5 (d:77d5)
ld a, $14
- ld [$d08a], a
- ld a, [$cd50]
+ ld [wd08a], a
+ ld a, [wcd50]
dec a
jr z, SlotMachine_377fb
dec a
@@ -699,22 +699,22 @@
jr z, SlotMachine_377ef
SlotMachine_377e3: ; 377e3 (d:77e3)
- ld hl, $c3cb
+ ld hl, wTileMap + $2b
call SlotMachine_377fe
- ld hl, $c46b
+ ld hl, wTileMap + $cb
call SlotMachine_377fe
SlotMachine_377ef: ; 377ef (d:77ef)
- ld hl, $c3f3
+ ld hl, wTileMap + $53
call SlotMachine_377fe
- ld hl, $c443
+ ld hl, wTileMap + $a3
call SlotMachine_377fe
SlotMachine_377fb: ; 377fb (d:77fb)
- ld hl, $c41b
+ ld hl, wTileMap + $7b
SlotMachine_377fe: ; 377fe (d:77fe)
- ld a, [$d08a]
+ ld a, [wd08a]
ld [hl], a
ld bc, $000d
add hl, bc
@@ -739,7 +739,7 @@
SlotMachine_37823: ; 37823 (d:7823)
ld bc, SlotMachineWheel2
ld de, wTrainerFacingDirection
- ld hl, $c330
+ ld hl, wOAMBuffer + $30
ld a, $50
ld [W_BASECOORDX], a
jr SlotMachine_37841
@@ -747,7 +747,7 @@
SlotMachine_37833: ; 37833 (d:7833)
ld bc, SlotMachineWheel3
ld de, wTrainerScreenY
- ld hl, $c360
+ ld hl, wOAMBuffer + $60
ld a, $70
ld [W_BASECOORDX], a
@@ -806,10 +806,10 @@
ld hl, wTrainerSpriteOffset
ld a, [hl]
dec a
- ld de, $cd4d
+ ld de, wcd4d
jr z, .skip
dec a
- ld de, $cd4e
+ ld de, wcd4e
jr z, .skip
.loop
inc [hl]
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -5,21 +5,21 @@
SetDefaultNamesBeforeTitlescreen: ; 42b7 (1:42b7)
ld hl, NintenText
- ld de, W_PLAYERNAME ; $d158
+ ld de, W_PLAYERNAME ; wd158
call CopyFixedLengthText
ld hl, SonyText
- ld de, W_RIVALNAME ; $d34a
+ ld de, W_RIVALNAME ; wd34a
call CopyFixedLengthText
xor a
ld [$ffb0], a
- ld [$d358], a
- ld hl, $d732
+ ld [wd358], a
+ ld hl, wd732
ld [hli], a
ld [hli], a
ld [hl], a
ld a, Bank(Func_7d8ea)
- ld [$c0ef], a
- ld [$c0f0], a
+ ld [wc0ef], a
+ ld [wc0f0], a
LoadTitlescreenGraphics: ; 42dd (1:42dd)
call GBPalWhiteOut
@@ -68,7 +68,7 @@
ld a, BANK(Version_GFX)
call FarCopyDataDouble
call Func_4519
- FuncCoord 2, 1 ; $c3b6
+ FuncCoord 2, 1
ld hl, Coord
ld a, $80
ld de, $14
@@ -85,7 +85,7 @@
add hl, de
dec c
jr nz, .asm_434d
- FuncCoord 2, 7 ; $c42e
+ FuncCoord 2, 7
ld hl, Coord
ld a, $31
ld b, $10
@@ -95,10 +95,10 @@
dec b
jr nz, .asm_4361
call Func_44dd
- ld hl, $c328
+ ld hl, wOAMBuffer + $28
ld a, $74
ld [hl], a
- FuncCoord 2, 17 ; $c4f6
+ FuncCoord 2, 17
ld hl, Coord
ld de, .titlescreenTilemap ; $437f
ld b, $10
@@ -124,7 +124,7 @@
ld a,SQUIRTLE ; which Pokemon to show first on the title screen
ENDC
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
call Func_4524
ld a, $9b
call Func_4533
@@ -206,10 +206,10 @@
call Delay3
call WaitForSoundToFinish
ld a, MUSIC_TITLE_SCREEN
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
xor a
- ld [$cc5b], a
+ ld [wcc5b], a
.asm_443b
ld c, $c8
call CheckForUserInterruption
@@ -222,7 +222,7 @@
call Func_4496
jr .asm_443b
.asm_4459
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
call PlayCry
call WaitForSoundToFinish
call GBPalWhiteOutWithDelay3
@@ -263,7 +263,7 @@
ld hl, TitleMons
add hl, bc
ld a, [hl]
- ld hl, wWhichTrade ; $cd3d
+ ld hl, wWhichTrade ; wWhichTrade
; Can't be the same as before.
cp [hl]
@@ -308,7 +308,7 @@
call FarCopyData2
call ClearSprites
xor a
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
ld hl, wOAMBuffer
ld de, $605a
ld b, $7
@@ -322,10 +322,10 @@
ld [hli], a
add $8
ld e, a
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
ld [hli], a
inc a
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
inc hl
dec c
jr nz, .asm_44fd
@@ -344,9 +344,9 @@
jp FillMemory
Func_4524: ; 4524 (1:4524)
- ld [$cf91], a
- ld [$d0b5], a
- FuncCoord 5, 10 ; $c46d
+ ld [wcf91], a
+ ld [wd0b5], a
+ FuncCoord 5, 10
ld hl, Coord
call GetMonHeader
jp LoadFrontSpriteByMonIndex
@@ -366,7 +366,7 @@
ld hl, $9600
ld bc, (BANK(NintendoCopyrightLogoGraphics) << 8) + $1c
call CopyVideoData
- FuncCoord 2, 7 ; $c42e
+ FuncCoord 2, 7
ld hl, Coord
ld de, CopyrightTextString ; $4556
jp PlaceString
@@ -381,7 +381,7 @@
; prints version text (red, blue)
PrintGameVersionOnTitleScreen: ; 4598 (1:4598)
- FuncCoord 7, 8 ; $c447
+ FuncCoord 7, 8
ld hl, Coord
ld de, VersionOnTitleScreenText
jp PlaceString
--- a/engine/titlescreen2.asm
+++ b/engine/titlescreen2.asm
@@ -89,7 +89,7 @@
Func_372ac: ; 372ac (d:72ac)
; Animate the TitleBall if a starter just got scrolled out.
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
cp STARTER1
jr z, .ok
cp STARTER2
@@ -115,6 +115,6 @@
pop de
and a
ret z
- ld [$c328], a
+ ld [wOAMBuffer + $28], a
inc e
ret
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -1,6 +1,6 @@
DisplayTownMap: ; 70e3e (1c:4e3e)
call LoadTownMap
- ld hl, $cfcb
+ ld hl, wcfcb
ld a, [hl]
push af
ld [hl], $ff
@@ -7,13 +7,13 @@
push hl
ld a, $1
ld [$ffb7], a
- ld a, [W_CURMAP] ; $d35e
+ ld a, [W_CURMAP] ; W_CURMAP
push af
ld b, $0
call Func_711c4
- FuncCoord 1, 0 ; $c3a1
+ FuncCoord 1, 0
ld hl, Coord
- ld de, $cd6d
+ ld de, wcd6d
call PlaceString
ld hl, wOAMBuffer
ld de, wTileMapBackup
@@ -24,7 +24,7 @@
ld bc, (BANK(TownMapCursor) << 8) + $04
call CopyVideoDataDouble
xor a
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
pop af
jr Func_70e92
@@ -33,7 +33,7 @@
ld bc, $114
call ClearScreenArea
ld hl, TownMapOrder ; $4f11
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
ld c, a
ld b, $0
add hl, bc
@@ -40,17 +40,17 @@
ld a, [hl]
Func_70e92: ; 70e92 (1c:4e92)
- ld de, $cee9
+ ld de, wHPBarMaxHP
call Func_712f1
ld a, [de]
push hl
call Func_71258
ld a, $4
- ld [$cd5b], a
- ld hl, $c310
+ ld [wcd5b], a
+ ld hl, wOAMBuffer + $10
call Func_71279
pop hl
- ld de, $cd6d
+ ld de, wcd6d
.asm_70eac
ld a, [hli]
ld [de], a
@@ -57,12 +57,12 @@
inc de
cp $50
jr nz, .asm_70eac
- FuncCoord 1, 0 ; $c3a1
+ FuncCoord 1, 0
ld hl, Coord
- ld de, $cd6d
+ ld de, wcd6d
call PlaceString
- ld hl, $c310
- ld de, $c518
+ ld hl, wOAMBuffer + $10
+ ld de, wTileMapBackup + 16
ld bc, $10
call CopyData
.asm_70ec8
@@ -79,9 +79,9 @@
bit 7, b
jr nz, .asm_70f01
xor a
- ld [$d09b], a
+ ld [wd09b], a
ld [$ffb7], a
- ld [W_SUBANIMTRANSFORM], a ; $d08b
+ ld [W_SUBANIMTRANSFORM], a ; W_SUBANIMTRANSFORM
call Func_711ab
pop hl
pop af
@@ -88,22 +88,22 @@
ld [hl], a
ret
.asm_70ef2
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
inc a
cp $2f
jr nz, .asm_70efb
xor a
.asm_70efb
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
jp Func_70e7e
.asm_70f01
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
dec a
cp $ff
jr nz, .asm_70f0b
ld a, $2e
.asm_70f0b
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
jp Func_70e7e
INCLUDE "data/town_map_order.asm"
@@ -113,7 +113,7 @@
LoadTownMap_Nest: ; 70f60 (1c:4f60)
call LoadTownMap
- ld hl, $cfcb
+ ld hl, wcfcb
ld a, [hl]
push af
ld [hl], $ff
@@ -120,7 +120,7 @@
push hl
call Func_711ef
call GetMonName
- FuncCoord 1, 0 ; $c3a1
+ FuncCoord 1, 0
ld hl, Coord
call PlaceString
ld h, b
@@ -151,7 +151,7 @@
ld bc, (BANK(TownMapUpArrow) << 8) + $01
call CopyVideoDataDouble
call Func_71070
- ld hl, $cfcb
+ ld hl, wcfcb
ld a, [hl]
push af
ld [hl], $ff
@@ -159,11 +159,11 @@
ld hl, wTileMap
ld de, ToText
call PlaceString
- ld a, [W_CURMAP] ; $d35e
+ ld a, [W_CURMAP] ; W_CURMAP
ld b, $0
call Func_711c4
- ld hl, $cd3e
- FuncCoord 18, 0 ; $c3b2
+ ld hl, wTrainerEngageDistance
+ FuncCoord 18, 0
ld de, Coord
.townMapFlyLoop
@@ -171,7 +171,7 @@
ld [de], a
push hl
push hl
- FuncCoord 3, 0 ; $c3a3
+ FuncCoord 3, 0
ld hl, Coord
ld bc, $10f
call ClearScreenArea
@@ -179,16 +179,16 @@
ld a, [hl]
ld b, $4
call Func_711c4
- FuncCoord 3, 0 ; $c3a3
+ FuncCoord 3, 0
ld hl, Coord
- ld de, $cd6d
+ ld de, wcd6d
call PlaceString
ld c, $f
call DelayFrames
- FuncCoord 18, 0 ; $c3b2
+ FuncCoord 18, 0
ld hl, Coord
ld [hl], $ed
- FuncCoord 19, 0 ; $c3b3
+ FuncCoord 19, 0
ld hl, Coord
ld [hl], $ee
pop hl
@@ -214,14 +214,14 @@
ld a, (SFX_02_3e - SFX_Headers_02) / 3
call PlaySound
ld a, [hl]
- ld [$d71a], a
- ld hl, $d732
+ ld [wd71a], a
+ ld hl, wd732
set 3, [hl]
inc hl
set 7, [hl]
.asm_71037
xor a
- ld [$d09b], a
+ ld [wd09b], a
call GBPalWhiteOutWithDelay3
pop hl
pop af
@@ -228,7 +228,7 @@
ld [hl], a
ret
.asm_71042
- FuncCoord 18, 0 ; $c3b2
+ FuncCoord 18, 0
ld de, Coord
inc hl
ld a, [hl]
@@ -238,10 +238,10 @@
jr z, .asm_71042
jp .townMapFlyLoop
.asm_71052
- ld hl, $cd3e
+ ld hl, wTrainerEngageDistance
jp .townMapFlyLoop
.asm_71058
- FuncCoord 19, 0 ; $c3b3
+ FuncCoord 19, 0
ld de, Coord
dec hl
ld a, [hl]
@@ -251,7 +251,7 @@
jr z, .asm_71058
jp .townMapFlyLoop
.asm_71068
- ld hl, $cd49
+ ld hl, wcd49
jr .asm_71058
ToText: ; 7106d (1c:506d)
@@ -258,12 +258,12 @@
db "To@"
Func_71070: ; 71070 (1c:5070)
- ld hl, wWhichTrade ; $cd3d
+ ld hl, wWhichTrade ; wWhichTrade
ld [hl], $ff
inc hl
- ld a, [$d70b]
+ ld a, [W_TOWNVISITEDFLAG]
ld e, a
- ld a, [$d70c]
+ ld a, [W_TOWNVISITEDFLAG + 1]
ld d, a
ld bc, $b
.asm_71081
@@ -329,9 +329,9 @@
call Delay3
call GBPalNormal
xor a
- ld [W_SUBANIMTRANSFORM], a ; $d08b
+ ld [W_SUBANIMTRANSFORM], a ; W_SUBANIMTRANSFORM
inc a
- ld [$d09b], a
+ ld [wd09b], a
ret
CompressedMap: ; 71100 (1c:5100)
@@ -340,7 +340,7 @@
Func_711ab: ; 711ab (1c:51ab)
xor a
- ld [$d09b], a
+ ld [wd09b], a
call GBPalWhiteOut
call ClearScreen
call ClearSprites
@@ -352,9 +352,9 @@
Func_711c4: ; 711c4 (1c:51c4)
push af
ld a, b
- ld [$cd5b], a
+ ld [wcd5b], a
pop af
- ld de, $cee9
+ ld de, wHPBarMaxHP
call Func_712f1
ld a, [de]
push hl
@@ -361,7 +361,7 @@
call Func_71258
call Func_7126d
pop hl
- ld de, $cd6d
+ ld de, wcd6d
.asm_711dc
ld a, [hli]
ld [de], a
@@ -377,7 +377,7 @@
callba Func_e9cb
call Func_712d9
ld hl, wOAMBuffer
- ld de, $cee9
+ ld de, wHPBarMaxHP
.asm_71200
ld a, [de]
cp $ff
@@ -402,18 +402,18 @@
ld a, l
and a
jr nz, .asm_71236
- FuncCoord 1, 7 ; $c42d
+ FuncCoord 1, 7
ld hl, Coord
ld b, $2
ld c, $f
call TextBoxBorder
- FuncCoord 2, 9 ; $c456
+ FuncCoord 2, 9
ld hl, Coord
ld de, AreaUnknownText
call PlaceString
jr .asm_7123e
.asm_71236
- ld a, [W_CURMAP] ; $d35e
+ ld a, [W_CURMAP] ; W_CURMAP
ld b, $0
call Func_711c4
.asm_7123e
@@ -442,11 +442,11 @@
ret
Func_7126d: ; 7126d (1c:526d)
- ld a, [$cd5b]
+ ld a, [wcd5b]
and a
- ld hl, $c390
+ ld hl, wOAMBuffer + $90
jr z, Func_71279
- ld hl, $c380
+ ld hl, wOAMBuffer + $80
Func_71279: ; 71279 (1c:5279)
push hl
@@ -466,10 +466,10 @@
ld [hli], a
ld a, c
ld [hli], a
- ld a, [$cd5b]
+ ld a, [wcd5b]
ld [hli], a
inc a
- ld [$cd5b], a
+ ld [wcd5b], a
xor a
ld [hli], a
inc d
@@ -489,7 +489,7 @@
Func_712a6: ; 712a6 (1c:52a6)
xor a
- ld [$cd5c], a
+ ld [wcd5c], a
ld de, $202
.asm_712ad
push de
@@ -499,12 +499,12 @@
ld [hli], a
ld a, c
ld [hli], a
- ld a, [$cd5b]
+ ld a, [wcd5b]
ld [hli], a
- ld a, [$cd5c]
+ ld a, [wcd5c]
ld [hli], a
xor $20
- ld [$cd5c], a
+ ld [wcd5c], a
inc d
ld a, $8
add c
@@ -514,7 +514,7 @@
pop bc
pop de
push hl
- ld hl, $cd5b
+ ld hl, wcd5b
inc [hl]
inc [hl]
pop hl
@@ -526,7 +526,7 @@
ret
Func_712d9: ; 712d9 (1c:52d9)
- ld de, $cee9
+ ld de, wHPBarMaxHP
.asm_712dc
ld a, [de]
inc de
@@ -583,7 +583,7 @@
INCBIN "gfx/mon_nest_icon.1bpp"
Func_716c6: ; 716c6 (1c:56c6)
- ld a, [W_SUBANIMTRANSFORM] ; $d08b
+ ld a, [W_SUBANIMTRANSFORM] ; W_SUBANIMTRANSFORM
inc a
cp $19
jr z, .asm_716e1
@@ -606,5 +606,5 @@
jr nz, .asm_716e9
ld a, $19
.asm_716f1
- ld [W_SUBANIMTRANSFORM], a ; $d08b
+ ld [W_SUBANIMTRANSFORM], a ; W_SUBANIMTRANSFORM
jp DelayFrame
--- a/engine/trade.asm
+++ b/engine/trade.asm
@@ -1,20 +1,20 @@
Func_410e2: ; 410e2 (10:50e2)
- ld a, [wWhichTrade] ; $cd3d
- ld [$cd5e], a
+ ld a, [wWhichTrade] ; wWhichTrade
+ ld [wcd5e], a
ld a, [wTrainerEngageDistance]
- ld [$cd5f], a
+ ld [wcd5f], a
ld de, PointerIDs_41138 ; $5138
jr Func_41102
Func_410f3: ; 410f3 (10:50f3)
ld a, [wTrainerEngageDistance]
- ld [$cd5e], a
+ ld [wcd5e], a
ld a, [wTrainerSpriteOffset]
- ld [$cd5f], a
+ ld [wcd5f], a
ld de, PointerIDs_41149
Func_41102: ; 41102 (10:5102)
- ld a, [W_OPTIONS] ; $d355
+ ld a, [W_OPTIONS] ; W_OPTIONS
push af
ld a, [$ffaf]
push af
@@ -21,7 +21,7 @@
ld a, [$ffae]
push af
xor a
- ld [W_OPTIONS], a ; $d355
+ ld [W_OPTIONS], a ; W_OPTIONS
ld [$ffaf], a
ld [$ffae], a
push de
@@ -49,7 +49,7 @@
pop af
ld [$ffaf], a
pop af
- ld [W_OPTIONS], a ; $d355
+ ld [W_OPTIONS], a ; W_OPTIONS
ret
; these bytes refer to the $00th through $10th pointer of PointerTable_4115f
@@ -119,10 +119,10 @@
call FillMemory
call ClearSprites
ld a, $ff
- ld [$cfcb], a
- ld hl, $d730
+ ld [wcfcb], a
+ ld hl, wd730
set 6, [hl]
- ld a, [$cf1b]
+ ld a, [wcf1b]
and a
ld a, $e4
jr z, .asm_411e5
@@ -132,15 +132,15 @@
call EnableLCD
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
- ld a, [wWhichTrade] ; $cd3d
- ld [$d11e], a
+ ld a, [wWhichTrade] ; wWhichTrade
+ ld [wd11e], a
call GetMonName
- ld hl, $cd6d
- ld de, $cf4b
+ ld hl, wcd6d
+ ld de, wcf4b
ld bc, $b
call CopyData
- ld a, [$cd3e]
- ld [$d11e], a
+ ld a, [wTrainerEngageDistance]
+ ld [wd11e], a
jp GetMonName
Func_4120b: ; 4120b (10:520b)
@@ -167,7 +167,7 @@
Func_4123b: ; 4123b (10:523b)
xor a
call LoadGBPal
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
ret
@@ -181,7 +181,7 @@
ld [$ffae], a
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
- FuncCoord 4, 0 ; $c3a4
+ FuncCoord 4, 0
ld hl, Coord
ld b, $6
ld c, $a
@@ -190,7 +190,7 @@
ld b, $98
call CopyScreenTileBufferToVRAM
call ClearScreen
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
call Func_415a4
ld a, $7e
.asm_41273
@@ -208,7 +208,7 @@
call Func_41676
ld a, $aa
call Func_41676
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
call PlayCry
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@@ -227,7 +227,7 @@
call DelayFrame
ld a, $8b
ld [rLCDC], a ; $ff40
- FuncCoord 6, 2 ; $c3ce
+ FuncCoord 6, 2
ld hl, Coord
ld b, $7
call Func_41842
@@ -251,7 +251,7 @@
ld a, $e4
ld [rOBP0], a ; $ff48
xor a
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $2060
.asm_412e7
push bc
@@ -258,11 +258,11 @@
xor a
ld de, UnknownOAM_4132e ; $532e
call WriteOAMBlock
- ld a, [$d09f]
+ ld a, [wd09f]
xor $1
- ld [$d09f], a
+ ld [wd09f], a
add $7e
- ld hl, $c302
+ ld hl, wOAMBuffer + $02
ld de, $4
ld c, e
.asm_41300
@@ -300,7 +300,7 @@
ld a, $ac
call Func_41676
call Func_415c8
- FuncCoord 4, 10 ; $c46c
+ FuncCoord 4, 10
ld hl, Coord
ld b, $6
ld c, $a
@@ -309,16 +309,16 @@
call Func_41186
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
- ld a, [$cd3e]
+ ld a, [wTrainerEngageDistance]
call Func_415a4
ld a, $ad
call Func_41676
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
- ld a, [$cd3e]
+ ld a, [wTrainerEngageDistance]
call PlayCry
call Func_41181
- FuncCoord 4, 10 ; $c46c
+ FuncCoord 4, 10
ld hl, Coord
ld bc, $80c
call ClearScreenArea
@@ -327,15 +327,15 @@
Func_41376: ; 41376 (10:5376)
call Func_41411
ld a, $1
- ld [$d08a], a
+ ld [wd08a], a
ld a, $e4
ld [rOBP0], a ; $ff48
ld a, $54
- ld [W_BASECOORDX], a ; $d081
+ ld [W_BASECOORDX], a ; wd081
ld a, $1c
- ld [W_BASECOORDY], a ; $d082
- ld a, [$cd5e]
- ld [$cd5d], a
+ ld [W_BASECOORDY], a ; wd082
+ ld a, [wcd5e]
+ ld [wcd5d], a
call Func_41505
call Func_4142d
call Func_41186
@@ -360,13 +360,13 @@
Func_413c6: ; 413c6 (10:53c6)
call Func_41411
xor a
- ld [$d08a], a
+ ld [wd08a], a
ld a, $64
- ld [W_BASECOORDX], a ; $d081
+ ld [W_BASECOORDX], a ; wd081
ld a, $44
- ld [W_BASECOORDY], a ; $d082
- ld a, [$cd5f]
- ld [$cd5d], a
+ ld [W_BASECOORDY], a ; wd082
+ ld a, [wcd5f]
+ ld [wcd5d], a
call Func_41505
call Func_4145c
call Func_41186
@@ -406,7 +406,7 @@
Func_4142d: ; 4142d (10:542d)
call Func_41196
- FuncCoord 11, 4 ; $c3fb
+ FuncCoord 11, 4
ld hl, Coord
ld a, $5d
ld [hli], a
@@ -416,24 +416,24 @@
ld [hli], a
dec c
jr nz, .asm_4143a
- FuncCoord 5, 3 ; $c3e1
+ FuncCoord 5, 3
ld hl, Coord
ld b, $6
call Func_41842
- FuncCoord 4, 12 ; $c494
+ FuncCoord 4, 12
ld hl, Coord
ld b, $2
ld c, $7
call TextBoxBorder
- FuncCoord 5, 14 ; $c4bd
+ FuncCoord 5, 14
ld hl, Coord
- ld de, W_PLAYERNAME ; $d158
+ ld de, W_PLAYERNAME ; wd158
call PlaceString
jp DelayFrame
Func_4145c: ; 4145c (10:545c)
call Func_41196
- FuncCoord 0, 4 ; $c3f0
+ FuncCoord 0, 4
ld hl, Coord
ld a, $5e
ld c, $e
@@ -458,24 +458,24 @@
ld [hld], a
ld a, $5d
ld [hl], a
- FuncCoord 7, 8 ; $c447
+ FuncCoord 7, 8
ld hl, Coord
ld b, $6
call Func_41842
- FuncCoord 6, 0 ; $c3a6
+ FuncCoord 6, 0
ld hl, Coord
ld b, $2
ld c, $7
call TextBoxBorder
- FuncCoord 7, 2 ; $c3cf
+ FuncCoord 7, 2
ld hl, Coord
- ld de, W_GRASSRATE ; $d887
+ ld de, W_GRASSRATE ; W_GRASSRATE
call PlaceString
jp DelayFrame
Func_4149f: ; 4149f (10:549f)
call Func_41196
- FuncCoord 0, 4 ; $c3f0
+ FuncCoord 0, 4
ld hl, Coord
ld a, $5e
ld c, $14
@@ -487,7 +487,7 @@
Func_414ae: ; 414ae (10:54ae)
push hl
- FuncCoord 0, 4 ; $c3f0
+ FuncCoord 0, 4
ld hl, Coord
call ScheduleRowRedrawHelper
pop hl
@@ -501,7 +501,7 @@
jp DelayFrames
Func_414c5: ; 414c5 (10:54c5)
- ld a, [$d08a]
+ ld a, [wd08a]
ld e, a
ld d, $8
.asm_414cb
@@ -531,7 +531,7 @@
ld a, [rBGP] ; $ff47
xor $3c
ld [rBGP], a ; $ff47
- ld hl, $c302
+ ld hl, wOAMBuffer + $02
ld de, $4
ld c, $14
.asm_414f9
@@ -554,10 +554,10 @@
ld hl, wOAMBuffer
ld c, $14
.asm_41515
- ld a, [W_BASECOORDY] ; $d082
+ ld a, [W_BASECOORDY] ; wd082
add [hl]
ld [hli], a
- ld a, [W_BASECOORDX] ; $d081
+ ld a, [W_BASECOORDX] ; wd081
add [hl]
ld [hli], a
inc hl
@@ -567,7 +567,7 @@
ret
Func_41525: ; 41525 (10:5525)
- ld a, [$d08a]
+ ld a, [wd08a]
and a
jr z, .asm_41536
ld bc, $400
@@ -580,9 +580,9 @@
ld bc, $fc00
.asm_4153f
ld a, b
- ld [W_BASECOORDX], a ; $d081
+ ld [W_BASECOORDX], a ; wd081
ld a, c
- ld [W_BASECOORDY], a ; $d082
+ ld [W_BASECOORDY], a ; wd082
ld d, $4
.asm_41549
call Func_41510
@@ -645,9 +645,9 @@
db $39,$70,$38,$70
Func_415a4: ; 415a4 (10:55a4)
- ld [$cf91], a
- ld [$d0b5], a
- ld [$cf1d], a
+ ld [wcf91], a
+ ld [wd0b5], a
+ ld [wcf1d], a
ld b, $b
ld c, $0
call GoPAL_SET
@@ -655,7 +655,7 @@
xor $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
call GetMonHeader
- FuncCoord 7, 2 ; $c3cf
+ FuncCoord 7, 2
ld hl, Coord
call LoadFlippedFrontSpriteByMonIndex
ld c, $a
@@ -763,8 +763,8 @@
db "@"
Func_41676: ; 41676 (10:5676)
- ld [W_ANIMATIONID], a ; $d07c
+ ld [W_ANIMATIONID], a ; W_ANIMATIONID
xor a
- ld [$cc5b], a
+ ld [wcc5b], a
ld a, $8
jp Predef ; indirect jump to MoveAnimation (78d5e (1e:4d5e))
--- a/engine/trade2.asm
+++ b/engine/trade2.asm
@@ -3,26 +3,26 @@
ld hl,Coord
ld de,OTString67E5
call PlaceString
- ld a,[$CD3D]
- ld [$D11E],a
+ ld a,[wWhichTrade]
+ ld [wd11e],a
ld a,$3A
call Predef
- FuncCoord 9, 0 ; $c3a9
+ FuncCoord 9, 0
ld hl,Coord
- ld de,$D11E
+ ld de,wd11e
ld bc,$8103
call PrintNumber
FuncCoord 5,2
ld hl,Coord
- ld de,$CF4B
+ ld de,wcf4b
call PlaceString
FuncCoord 8,4
ld hl,Coord
- ld de,$CD41
+ ld de,wTrainerScreenX
call PlaceString
- FuncCoord 8, 6 ; $c420
+ FuncCoord 8, 6
ld hl,Coord
- ld de,$CD4C
+ ld de,wcd4c
ld bc,$8205
jp PrintNumber
@@ -31,26 +31,26 @@
ld hl,Coord
ld de,OTString67E5
call PlaceString
- ld a,[$CD3E]
- ld [$D11E],a
+ ld a,[wTrainerEngageDistance]
+ ld [wd11e],a
ld a,$3A
call Predef
- FuncCoord 9, 10 ; $c471
+ FuncCoord 9, 10
ld hl,Coord
- ld de,$D11E
+ ld de,wd11e
ld bc,$8103
call PrintNumber
FuncCoord 5,12
ld hl,Coord
- ld de,$CD6D
+ ld de,wcd6d
call PlaceString
FuncCoord 8,14
ld hl,Coord
- ld de,$CD4E
+ ld de,wcd4e
call PlaceString
- FuncCoord 8, 16 ; $c4e8
+ FuncCoord 8, 16
ld hl,Coord
- ld de,$CD59
+ ld de,wcd59
ld bc,$8205
jp PrintNumber
--- a/home.asm
+++ b/home.asm
@@ -180,18 +180,18 @@
ld [wJoyIgnore], a
call LoadMapData
callba Func_c335 ; initialize map variables
- ld hl, $d72c
+ ld hl, wd72c
bit 0, [hl]
jr z, .doNotCountSteps
ld a, 3
- ld [$d13c], a ; some kind of step counter (counts up to 3 steps?)
+ ld [wd13c], a ; some kind of step counter (counts up to 3 steps?)
.doNotCountSteps
- ld hl, $d72e
+ ld hl, wd72e
bit 5, [hl] ; did a battle happen immediately before this?
res 5, [hl] ; unset the "battle just happened" flag
call z, Func_12e7
call nz, MapEntryAfterBattle
- ld hl, $d732
+ ld hl, wd732
ld a, [hl]
and 1 << 4 | 1 << 3
jr z, .didNotFlyOrTeleportIn
@@ -200,10 +200,10 @@
call UpdateSprites
.didNotFlyOrTeleportIn
callba CheckForceBikeOrSurf ; handle currents in SF islands and forced bike riding in cycling road
- ld hl, $d72d
+ ld hl, wd72d
res 5, [hl]
call UpdateSprites
- ld hl, $d126
+ ld hl, wd126
set 5, [hl]
set 6, [hl]
xor a
@@ -214,7 +214,7 @@
OverworldLoopLessDelay::
call DelayFrame
call LoadGBPal
- ld a,[$d736]
+ ld a,[wd736]
bit 6,a ; jumping down a ledge?
call nz, HandleMidJump
ld a,[wWalkCounter]
@@ -222,20 +222,20 @@
jp nz,.moveAhead ; if the player sprite has not yet completed the walking animation
call JoypadOverworld ; get joypad state (which is possibly simulated)
callba SafariZoneCheck
- ld a,[$da46]
+ ld a,[wda46]
and a
jp nz,WarpFound2
- ld hl,$d72d
+ ld hl,wd72d
bit 3,[hl]
res 3,[hl]
jp nz,WarpFound2
- ld a,[$d732]
+ ld a,[wd732]
and a,$18
jp nz,HandleFlyOrTeleportAway
ld a,[W_CUROPPONENT]
and a
jp nz,.newBattle
- ld a,[$d730]
+ ld a,[wd730]
bit 7,a ; are we simulating button presses?
jr z,.notSimulating
ld a,[hJoyHeld]
@@ -253,7 +253,7 @@
bit 0,a ; A button
jp z,.checkIfDownButtonIsPressed
; if A is pressed
- ld a,[$d730]
+ ld a,[wd730]
bit 2,a
jp nz,.noDirectionButtonsPressed
call Func_30fd
@@ -275,25 +275,25 @@
jr nz,.checkForOpponent
bit 0,a
jr nz,.checkForOpponent
- FuncCoord 8, 9 ; $c45c
+ FuncCoord 8, 9
ld a,[Coord]
- ld [$cf0e],a
+ ld [wcf0e],a
call DisplayTextID ; display either the start menu or the NPC/sign text
- ld a,[$cc47]
+ ld a,[wcc47]
and a
jr z,.checkForOpponent
dec a
ld a,$00
- ld [$cc47],a
+ ld [wcc47],a
jr z,.changeMap
ld a,$52
call Predef
ld a,[W_CURMAP]
- ld [$d71a],a
+ ld [wd71a],a
call Func_62ce
ld a,[W_CURMAP]
call SwitchToMapRomBank ; switch to the ROM bank of the current map
- ld hl,$d367
+ ld hl,W_CURMAPTILESET
set 7,[hl]
.changeMap
jp EnterMap
@@ -307,14 +307,14 @@
res 2,[hl]
call UpdateSprites ; move sprites
ld a,$01
- ld [$cc4b],a
- ld a,[$d528] ; the direction that was pressed last time
+ ld [wcc4b],a
+ ld a,[wd528] ; the direction that was pressed last time
and a
jp z,OverworldLoop
; if a direction was pressed last time
- ld [$d529],a ; save the last direction
+ ld [wd529],a ; save the last direction
xor a
- ld [$d528],a ; zero the direction
+ ld [wd528],a ; zero the direction
jp OverworldLoop
.checkIfDownButtonIsPressed
ld a,[hJoyHeld] ; current joypad state
@@ -321,7 +321,7 @@
bit 7,a ; down button
jr z,.checkIfUpButtonIsPressed
ld a,$01
- ld [$c103],a
+ ld [wSpriteStateData1 + 3],a
ld a,$04
jr .handleDirectionButtonPress
.checkIfUpButtonIsPressed
@@ -328,7 +328,7 @@
bit 6,a ; up button
jr z,.checkIfLeftButtonIsPressed
ld a,$ff
- ld [$c103],a
+ ld [wSpriteStateData1 + 3],a
ld a,$08
jr .handleDirectionButtonPress
.checkIfLeftButtonIsPressed
@@ -335,7 +335,7 @@
bit 5,a ; left button
jr z,.checkIfRightButtonIsPressed
ld a,$ff
- ld [$c105],a
+ ld [wSpriteStateData1 + 5],a
ld a,$02
jr .handleDirectionButtonPress
.checkIfRightButtonIsPressed
@@ -342,18 +342,18 @@
bit 4,a ; right button
jr z,.noDirectionButtonsPressed
ld a,$01
- ld [$c105],a
+ ld [wSpriteStateData1 + 5],a
.handleDirectionButtonPress
- ld [$d52a],a ; new direction
- ld a,[$d730]
+ ld [wd52a],a ; new direction
+ ld a,[wd730]
bit 7,a ; are we simulating button presses?
jr nz,.noDirectionChange ; ignore direction changes if we are
- ld a,[$cc4b]
+ ld a,[wcc4b]
and a
jr z,.noDirectionChange
- ld a,[$d52a] ; new direction
+ ld a,[wd52a] ; new direction
ld b,a
- ld a,[$d529] ; old direction
+ ld a,[wd529] ; old direction
cp b
jr z,.noDirectionChange
; the code below is strange
@@ -364,41 +364,41 @@
cp a,$48 ; change dir from down to up
jr nz,.notDownToUp
ld a,$02
- ld [$d528],a
+ ld [wd528],a
jr .oddLoop
.notDownToUp
cp a,$84 ; change dir from up to down
jr nz,.notUpToDown
ld a,$01
- ld [$d528],a
+ ld [wd528],a
jr .oddLoop
.notUpToDown
cp a,$12 ; change dir from right to left
jr nz,.notRightToLeft
ld a,$04
- ld [$d528],a
+ ld [wd528],a
jr .oddLoop
.notRightToLeft
cp a,$21 ; change dir from left to right
jr nz,.oddLoop
ld a,$08
- ld [$d528],a
+ ld [wd528],a
.oddLoop
ld hl,wFlags_0xcd60
set 2,[hl]
- ld hl,$cc4b
+ ld hl,wcc4b
dec [hl]
jr nz,.oddLoop
- ld a,[$d52a]
- ld [$d528],a
+ ld a,[wd52a]
+ ld [wd528],a
call NewBattle
jp c,.battleOccurred
jp OverworldLoop
.noDirectionChange
- ld a,[$d52a] ; current direction
- ld [$d528],a ; save direction
+ ld a,[wd52a] ; current direction
+ ld [wd528],a ; save direction
call UpdateSprites ; move sprites
- ld a,[$d700]
+ ld a,[wd700]
cp a,$02 ; surfing
jr z,.surfing
; not surfing
@@ -405,7 +405,7 @@
call CollisionCheckOnLand
jr nc,.noCollision
push hl
- ld hl,$d736
+ ld hl,wd736
bit 2,[hl]
pop hl
jp z,OverworldLoop
@@ -422,7 +422,7 @@
ld [wWalkCounter],a
jr .moveAhead2
.moveAhead
- ld a,[$d736]
+ ld a,[wd736]
bit 7,a
jr z,.noSpinning
callba LoadSpinnerArrowTiles ; spin while moving
@@ -431,10 +431,10 @@
.moveAhead2
ld hl,wFlags_0xcd60
res 2,[hl]
- ld a,[$d700]
+ ld a,[wd700]
dec a ; riding a bike?
jr nz,.normalPlayerSpriteAdvancement
- ld a,[$d736]
+ ld a,[wd736]
bit 6,a ; jumping a ledge?
jr nz,.normalPlayerSpriteAdvancement
call BikeSpeedup ; if riding a bike and not jumping a ledge
@@ -444,26 +444,26 @@
and a
jp nz,CheckMapConnections ; it seems like this check will never succeed (the other place where CheckMapConnections is run works)
; walking animation finished
- ld a,[$d730]
+ ld a,[wd730]
bit 7,a
jr nz,.doneStepCounting ; if button presses are being simulated, don't count steps
; step counting
- ld hl,$d13b ; step counter
+ ld hl,wd13b ; step counter
dec [hl]
- ld a,[$d72c]
+ ld a,[wd72c]
bit 0,a
jr z,.doneStepCounting
- ld hl,$d13c
+ ld hl,wd13c
dec [hl]
jr nz,.doneStepCounting
- ld hl,$d72c
+ ld hl,wd72c
res 0,[hl]
.doneStepCounting
- ld a,[$d790]
+ ld a,[wd790]
bit 7,a ; in the safari zone?
jr z,.notSafariZone
callba SafariZoneCheckSteps
- ld a,[$da46]
+ ld a,[wda46]
and a
jp nz,WarpFound2
.notSafariZone
@@ -472,20 +472,20 @@
jp nz,CheckWarpsNoCollision
ld a,$13
call Predef ; decrement HP of poisoned pokemon
- ld a,[$d12d]
+ ld a,[wd12d]
and a
jp nz,HandleBlackOut ; if all pokemon fainted
.newBattle
call NewBattle
- ld hl,$d736
+ ld hl,wd736
res 2,[hl]
jp nc,CheckWarpsNoCollision ; check for warps if there was no battle
.battleOccurred
- ld hl,$d72d
+ ld hl,wd72d
res 6,[hl]
ld hl,W_FLAGS_D733
res 3,[hl]
- ld hl,$d126
+ ld hl,wd126
set 5,[hl]
set 6,[hl]
xor a
@@ -493,10 +493,10 @@
ld a,[W_CURMAP]
cp a,CINNABAR_GYM
jr nz,.notCinnabarGym
- ld hl,$d79b
+ ld hl,wd79b
set 7,[hl]
.notCinnabarGym
- ld hl,$d72e
+ ld hl,wd72e
set 5,[hl]
ld a,[W_CURMAP]
cp a,OAKS_LAB
@@ -511,7 +511,7 @@
jp EnterMap
.allPokemonFainted
ld a,$ff
- ld [$d057],a
+ ld [W_ISINBATTLE],a
call RunMapScript
jp HandleBlackOut
@@ -518,12 +518,12 @@
; function to determine if there will be a battle and execute it (either a trainer battle or wild battle)
; sets carry if a battle occurred and unsets carry if not
NewBattle:: ; 0683 (0:0683)
- ld a,[$d72d]
+ ld a,[wd72d]
bit 4,a
jr nz,.noBattle
call Func_30fd
jr nz,.noBattle
- ld a,[$d72e]
+ ld a,[wd72e]
bit 4,a
jr nz,.noBattle
ld b, BANK(InitBattle)
@@ -535,7 +535,7 @@
; function to make bikes twice as fast as walking
BikeSpeedup:: ; 06a0 (0:06a0)
- ld a,[$cc57]
+ ld a,[wcc57]
and a
ret nz
ld a,[W_CURMAP]
@@ -549,10 +549,10 @@
; check if the player has stepped onto a warp after having not collided
CheckWarpsNoCollision:: ; 06b4 (0:06b4)
- ld a,[$d3ae] ; number of warps
+ ld a,[wd3ae] ; number of warps
and a
jp z,CheckMapConnections
- ld a,[$d3ae] ; number of warps
+ ld a,[wd3ae] ; number of warps
ld b,$00
ld c,a
ld a,[W_YCOORD]
@@ -559,7 +559,7 @@
ld d,a
ld a,[W_XCOORD]
ld e,a
- ld hl,$d3af ; start of warp entries
+ ld hl,wd3af ; start of warp entries
CheckWarpsNoCollisionLoop:: ; 06cc (0:06cc)
ld a,[hli] ; check if the warp's Y position matches
cp d
@@ -570,7 +570,7 @@
; if a match was found
push hl
push bc
- ld hl,$d736
+ ld hl,wd736
set 2,[hl]
callba Func_c49d ; check if the player sprite is standing on a "door" tile
pop bc
@@ -598,9 +598,9 @@
; check if the player has stepped onto a warp after having collided
CheckWarpsCollision:: ; 0706 (0:0706)
- ld a,[$d3ae] ; number of warps
+ ld a,[wd3ae] ; number of warps
ld c,a
- ld hl,$d3af ; start of warp entries
+ ld hl,wd3af ; start of warp entries
.loop
ld a,[hli] ; Y coordinate of warp
ld b,a
@@ -613,7 +613,7 @@
cp b
jr nz,.retry2
ld a,[hli]
- ld [$d42f],a ; save target warp ID
+ ld [wd42f],a ; save target warp ID
ld a,[hl]
ld [$ff8b],a ; save target map
jr WarpFound2
@@ -635,16 +635,16 @@
WarpFound1:: ; 0735 (0:0735)
ld a,[hli]
- ld [$d42f],a ; save target warp ID
+ ld [wd42f],a ; save target warp ID
ld a,[hli]
ld [$ff8b],a ; save target map
WarpFound2:: ; 073c (0:073c)
- ld a,[$d3ae] ; number of warps
+ ld a,[wd3ae] ; number of warps
sub c
- ld [$d73b],a ; save ID of used warp
+ ld [wd73b],a ; save ID of used warp
ld a,[W_CURMAP]
- ld [$d73c],a
+ ld [wd73c],a
call CheckIfInOutsideMap
jr nz,.indoorMaps
; this is for handling "outside" maps that can't have the 0xFF destination map
@@ -651,13 +651,13 @@
ld a,[W_CURMAP]
ld [wLastMap],a
ld a,[W_CURMAPWIDTH]
- ld [$d366],a
+ ld [wd366],a
ld a,[$ff8b] ; destination map number
ld [W_CURMAP],a ; change current map to destination map
cp a,ROCK_TUNNEL_1
jr nz,.notRockTunnel
ld a,$06
- ld [$d35d],a
+ ld [wd35d],a
call GBFadeIn1
.notRockTunnel
call PlayMapChangeSound
@@ -670,11 +670,11 @@
; if not going back to the previous map
ld [W_CURMAP],a ; current map number
callba Func_70787 ; check if the warp was a Silph Co. teleporter
- ld a,[$cd5b]
+ ld a,[wcd5b]
dec a
jr nz,.notTeleporter
; if it's a Silph Co. teleporter
- ld hl,$d732
+ ld hl,wd732
set 3,[hl]
call DoFlyOrTeleportAwayGraphics
jr .skipMapChangeSound
@@ -681,7 +681,7 @@
.notTeleporter
call PlayMapChangeSound
.skipMapChangeSound
- ld hl,$d736
+ ld hl,wd736
res 0,[hl]
res 1,[hl]
jr .done
@@ -690,9 +690,9 @@
ld [W_CURMAP],a
call PlayMapChangeSound
xor a
- ld [$d35d],a
+ ld [wd35d],a
.done
- ld hl,$d736
+ ld hl,wd736
set 0,[hl]
call Func_12da
jp EnterMap
@@ -708,24 +708,24 @@
ld a,[W_XCOORD]
cp a,$ff
jr nz,.checkEastMap
- ld a,[$d387]
+ ld a,[W_MAPCONN3PTR]
ld [W_CURMAP],a
- ld a,[$d38f] ; new X coordinate upon entering west map
+ ld a,[wd38f] ; new X coordinate upon entering west map
ld [W_XCOORD],a
ld a,[W_YCOORD]
ld c,a
- ld a,[$d38e] ; Y adjustment upon entering west map
+ ld a,[wd38e] ; Y adjustment upon entering west map
add c
ld c,a
ld [W_YCOORD],a
- ld a,[$d390] ; pointer to upper left corner of map without adjustment for Y position
+ ld a,[wd390] ; pointer to upper left corner of map without adjustment for Y position
ld l,a
- ld a,[$d391]
+ ld a,[wd391]
ld h,a
srl c
jr z,.savePointer1
.pointerAdjustmentLoop1
- ld a,[$d38d] ; width of connected map
+ ld a,[wd38d] ; width of connected map
add a,$06
ld e,a
ld d,$00
@@ -735,33 +735,33 @@
jr nz,.pointerAdjustmentLoop1
.savePointer1
ld a,l
- ld [$d35f],a ; pointer to upper left corner of current tile block map section
+ ld [wd35f],a ; pointer to upper left corner of current tile block map section
ld a,h
- ld [$d360],a
+ ld [wd360],a
jp .loadNewMap
.checkEastMap
ld b,a
- ld a,[$d525] ; map width
+ ld a,[wd525] ; map width
cp b
jr nz,.checkNorthMap
- ld a,[$d392]
+ ld a,[W_MAPCONN4PTR]
ld [W_CURMAP],a
- ld a,[$d39a] ; new X coordinate upon entering east map
+ ld a,[wd39a] ; new X coordinate upon entering east map
ld [W_XCOORD],a
ld a,[W_YCOORD]
ld c,a
- ld a,[$d399] ; Y adjustment upon entering east map
+ ld a,[wd399] ; Y adjustment upon entering east map
add c
ld c,a
ld [W_YCOORD],a
- ld a,[$d39b] ; pointer to upper left corner of map without adjustment for Y position
+ ld a,[wd39b] ; pointer to upper left corner of map without adjustment for Y position
ld l,a
- ld a,[$d39c]
+ ld a,[wd39c]
ld h,a
srl c
jr z,.savePointer2
.pointerAdjustmentLoop2
- ld a,[$d398]
+ ld a,[wd398]
add a,$06
ld e,a
ld d,$00
@@ -771,62 +771,62 @@
jr nz,.pointerAdjustmentLoop2
.savePointer2
ld a,l
- ld [$d35f],a ; pointer to upper left corner of current tile block map section
+ ld [wd35f],a ; pointer to upper left corner of current tile block map section
ld a,h
- ld [$d360],a
+ ld [wd360],a
jp .loadNewMap
.checkNorthMap
ld a,[W_YCOORD]
cp a,$ff
jr nz,.checkSouthMap
- ld a,[$d371]
+ ld a,[W_MAPCONN1PTR]
ld [W_CURMAP],a
- ld a,[$d378] ; new Y coordinate upon entering north map
+ ld a,[wd378] ; new Y coordinate upon entering north map
ld [W_YCOORD],a
ld a,[W_XCOORD]
ld c,a
- ld a,[$d379] ; X adjustment upon entering north map
+ ld a,[wd379] ; X adjustment upon entering north map
add c
ld c,a
ld [W_XCOORD],a
- ld a,[$d37a] ; pointer to upper left corner of map without adjustment for X position
+ ld a,[wd37a] ; pointer to upper left corner of map without adjustment for X position
ld l,a
- ld a,[$d37b]
+ ld a,[wd37b]
ld h,a
ld b,$00
srl c
add hl,bc
ld a,l
- ld [$d35f],a ; pointer to upper left corner of current tile block map section
+ ld [wd35f],a ; pointer to upper left corner of current tile block map section
ld a,h
- ld [$d360],a
+ ld [wd360],a
jp .loadNewMap
.checkSouthMap
ld b,a
- ld a,[$d524]
+ ld a,[wd524]
cp b
jr nz,.didNotEnterConnectedMap
- ld a,[$d37c]
+ ld a,[W_MAPCONN2PTR]
ld [W_CURMAP],a
- ld a,[$d383] ; new Y coordinate upon entering south map
+ ld a,[wd383] ; new Y coordinate upon entering south map
ld [W_YCOORD],a
ld a,[W_XCOORD]
ld c,a
- ld a,[$d384] ; X adjustment upon entering south map
+ ld a,[wd384] ; X adjustment upon entering south map
add c
ld c,a
ld [W_XCOORD],a
- ld a,[$d385] ; pointer to upper left corner of map without adjustment for X position
+ ld a,[wd385] ; pointer to upper left corner of map without adjustment for X position
ld l,a
- ld a,[$d386]
+ ld a,[wd386]
ld h,a
ld b,$00
srl c
add hl,bc
ld a,l
- ld [$d35f],a ; pointer to upper left corner of current tile block map section
+ ld [wd35f],a ; pointer to upper left corner of current tile block map section
ld a,h
- ld [$d360],a
+ ld [wd360],a
.loadNewMap ; load the connected map that was entered
call LoadMapHeader
call Func_2312 ; music
@@ -842,7 +842,7 @@
; function to play a sound when changing maps
PlayMapChangeSound:: ; 08c9 (0:08c9)
- FuncCoord 8, 8 ; $c448
+ FuncCoord 8, 8
ld a,[Coord] ; upper left tile of the 4x4 square the player's sprite is standing on
cp a,$0b ; door tile in tileset 0
jr nz,.didNotGoThroughDoor
@@ -852,7 +852,7 @@
ld a,(SFX_02_5c - SFX_Headers_02) / 3
.playSound
call PlaySound
- ld a,[$d35d]
+ ld a,[wd35d]
and a
ret nz
jp GBFadeIn1
@@ -903,7 +903,7 @@
MapEntryAfterBattle:: ; 091f (0:091f)
callba Func_c35f ; function that appears to disable warp testing after collisions if the player is standing on a warp
- ld a,[$d35d]
+ ld a,[wd35d]
and a
jp z,GBFadeIn2
jp LoadGBPal
@@ -915,7 +915,7 @@
call GBFadeIn1
ld a, $08
call StopMusic
- ld hl, $d72e
+ ld hl, wd72e
res 5, [hl]
ld a, Bank(Func_40b0) ; also Bank(Func_62ce) and Bank(Func_5d5f)
ld [H_LOADEDROMBANK], a
@@ -928,7 +928,7 @@
StopMusic::
ld [wMusicHeaderPointer], a
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
.wait
ld a, [wMusicHeaderPointer]
@@ -940,11 +940,11 @@
call UpdateSprites
call Delay3
xor a
- ld [$cf0b], a
- ld [$d700], a
- ld [$d057], a
- ld [$d35d], a
- ld hl, $d732
+ ld [wcf0b], a
+ ld [wd700], a
+ ld [W_ISINBATTLE], a
+ ld [wd35d], a
+ ld hl, wd732
set 2, [hl]
res 5, [hl]
call DoFlyOrTeleportAwayGraphics
@@ -966,7 +966,7 @@
; 1: biking
; 2: surfing
- ld a, [$d700]
+ ld a, [wd700]
dec a
jr z, .ridingBike
@@ -983,12 +983,12 @@
.startWalking
xor a
- ld [$d700], a
- ld [$d11a], a
+ ld [wd700], a
+ ld [wd11a], a
jp LoadWalkingPlayerSpriteGraphics
.determineGraphics
- ld a, [$d700]
+ ld a, [wd700]
and a
jp z, LoadWalkingPlayerSpriteGraphics
dec a
@@ -1028,13 +1028,13 @@
; load the tile pattern data of the current tileset into VRAM
LoadTilesetTilePatternData:: ; 09e8 (0:09e8)
- ld a,[$d52e]
+ ld a,[W_TILESETGFXPTR]
ld l,a
- ld a,[$d52f]
+ ld a,[W_TILESETGFXPTR + 1]
ld h,a
ld de,$9000
ld bc,$0600
- ld a,[$d52b]
+ ld a,[W_TILESETBANK]
jp FarCopyData2
; this loads the current maps complete tile map (which references blocks, not individual tiles) to C6E8
@@ -1041,8 +1041,8 @@
; it can also load partial tile maps of connected maps into a border of length 3 around the current map
LoadTileBlockMap:: ; 09fc (0:09fc)
; fill C6E8-CBFB with the background tile
- ld hl,$c6e8
- ld a,[$d3ad] ; background tile number
+ ld hl,wOverworldMap
+ ld a,[wd3ad] ; background tile number
ld d,a
ld bc,$0514
.backgroundTileLoop
@@ -1054,7 +1054,7 @@
jr nz,.backgroundTileLoop
; load tile map of current map (made of tile block IDs)
; a 3-byte border at the edges of the map is kept so that there is space for map connections
- ld hl,$c6e8
+ ld hl,wOverworldMap
ld a,[W_CURMAPWIDTH]
ld [$ff8c],a
add a,$06 ; border (east and west)
@@ -1067,9 +1067,9 @@
add hl,bc
ld c,$03
add hl,bc ; this puts us past the (west) border
- ld a,[$d36a] ; tile map pointer
+ ld a,[W_MAPDATAPTR] ; tile map pointer
ld e,a
- ld a,[$d36b]
+ ld a,[W_MAPDATAPTR + 1]
ld d,a ; de = tile map pointer
ld a,[W_CURMAPHEIGHT]
ld b,a
@@ -1094,75 +1094,75 @@
dec b
jr nz,.rowLoop
.northConnection
- ld a,[$d371]
+ ld a,[W_MAPCONN1PTR]
cp a,$ff
jr z,.southConnection
call SwitchToMapRomBank
- ld a,[$d372]
+ ld a,[wd372]
ld l,a
- ld a,[$d373]
+ ld a,[wd373]
ld h,a
- ld a,[$d374]
+ ld a,[wd374]
ld e,a
- ld a,[$d375]
+ ld a,[wd375]
ld d,a
- ld a,[$d376]
+ ld a,[wd376]
ld [$ff8b],a
- ld a,[$d377]
+ ld a,[wd377]
ld [$ff8c],a
call LoadNorthSouthConnectionsTileMap
.southConnection
- ld a,[$d37c]
+ ld a,[W_MAPCONN2PTR]
cp a,$ff
jr z,.westConnection
call SwitchToMapRomBank
- ld a,[$d37d]
+ ld a,[wd37d]
ld l,a
- ld a,[$d37e]
+ ld a,[wd37e]
ld h,a
- ld a,[$d37f]
+ ld a,[wd37f]
ld e,a
- ld a,[$d380]
+ ld a,[wd380]
ld d,a
- ld a,[$d381]
+ ld a,[wd381]
ld [$ff8b],a
- ld a,[$d382]
+ ld a,[wd382]
ld [$ff8c],a
call LoadNorthSouthConnectionsTileMap
.westConnection
- ld a,[$d387]
+ ld a,[W_MAPCONN3PTR]
cp a,$ff
jr z,.eastConnection
call SwitchToMapRomBank
- ld a,[$d388]
+ ld a,[wd388]
ld l,a
- ld a,[$d389]
+ ld a,[wd389]
ld h,a
- ld a,[$d38a]
+ ld a,[wd38a]
ld e,a
- ld a,[$d38b]
+ ld a,[wd38b]
ld d,a
- ld a,[$d38c]
+ ld a,[wd38c]
ld b,a
- ld a,[$d38d]
+ ld a,[wd38d]
ld [$ff8b],a
call LoadEastWestConnectionsTileMap
.eastConnection
- ld a,[$d392]
+ ld a,[W_MAPCONN4PTR]
cp a,$ff
jr z,.done
call SwitchToMapRomBank
- ld a,[$d393]
+ ld a,[wd393]
ld l,a
- ld a,[$d394]
+ ld a,[wd394]
ld h,a
- ld a,[$d395]
+ ld a,[wd395]
ld e,a
- ld a,[$d396]
+ ld a,[wd396]
ld d,a
- ld a,[$d397]
+ ld a,[wd397]
ld b,a
- ld a,[$d398]
+ ld a,[wd398]
ld [$ff8b],a
call LoadEastWestConnectionsTileMap
.done
@@ -1235,14 +1235,14 @@
IsSpriteOrSignInFrontOfPlayer:: ; 0b23 (0:0b23)
xor a
ld [$ff8c],a
- ld a,[$d4b0] ; number of signs in the map
+ ld a,[wd4b0] ; number of signs in the map
and a
jr z,.extendRangeOverCounter
; if there are signs
ld a,$35
call Predef ; get the coordinates in front of the player in de
- ld hl,$d4b1 ; start of sign coordinates
- ld a,[$d4b0] ; number of signs in the map
+ ld hl,wd4b1 ; start of sign coordinates
+ ld a,[wd4b0] ; number of signs in the map
ld b,a
ld c,$00
.signLoop
@@ -1260,7 +1260,7 @@
; found sign
push hl
push bc
- ld hl,$d4d1 ; start of sign text ID's
+ ld hl,wd4d1 ; start of sign text ID's
ld b,$00
dec c
add hl,bc
@@ -1276,7 +1276,7 @@
.extendRangeOverCounter
ld a,$35
call Predef ; get the tile in front of the player in c
- ld hl,$d532 ; list of tiles that extend talking range (counter tiles)
+ ld hl,W_TILESETTALKINGOVERTILES ; list of tiles that extend talking range (counter tiles)
ld b,$03
ld d,$20 ; talking range in pixels (long range)
.counterTilesLoop
@@ -1292,7 +1292,7 @@
ld d,$10 ; talking range in pixels (normal range)
IsSpriteInFrontOfPlayer2:: ; 0b6d (0:0b6d)
ld bc,$3c40 ; Y and X position of player sprite
- ld a,[$c109] ; direction the player is facing
+ ld a,[wSpriteStateData1 + 9] ; direction the player is facing
.checkIfPlayerFacingUp
cp a,$04
jr nz,.checkIfPlayerFacingDown
@@ -1327,12 +1327,12 @@
ld c,a
ld a,$02
.doneCheckingDirection
- ld [$d52a],a
- ld a,[$d4e1] ; number of sprites
+ ld [wd52a],a
+ ld a,[W_NUMSPRITES] ; number of sprites
and a
ret z
; if there are sprites
- ld hl,$c110
+ ld hl,wSpriteStateData1 + $10
ld d,a
ld e,$01
.spriteLoop
@@ -1375,16 +1375,16 @@
; function to check if the player will jump down a ledge and check if the tile ahead is passable (when not surfing)
; sets the carry flag if there is a collision, and unsets it if there isn't a collision
CollisionCheckOnLand:: ; 0bd1 (0:0bd1)
- ld a,[$d736]
+ ld a,[wd736]
bit 6,a ; is the player jumping?
jr nz,.noCollision
; if not jumping a ledge
- ld a,[$cd38]
+ ld a,[wcd38]
and a
jr nz,.noCollision
- ld a,[$d52a] ; the direction that the player is trying to go in
+ ld a,[wd52a] ; the direction that the player is trying to go in
ld d,a
- ld a,[$c10c] ; the player sprite's collision data (bit field) (set in the sprite movement code)
+ ld a,[wSpriteStateData1 + 12] ; the player sprite's collision data (bit field) (set in the sprite movement code)
and d ; check if a sprite is in the direction the player is trying to go
jr nz,.collision
xor a
@@ -1400,7 +1400,7 @@
call CheckTilePassable
jr nc,.noCollision
.collision
- ld a,[$c02a]
+ ld a,[wc02a]
cp a,(SFX_02_5b - SFX_Headers_02) / 3 ; check if collision sound is already playing
jr z,.setCarry
ld a,(SFX_02_5b - SFX_Headers_02) / 3
@@ -1417,9 +1417,9 @@
CheckTilePassable:: ; 0c10 (0:0c10)
ld a,$35
call Predef ; get tile in front of player
- ld a,[$cfc6] ; tile in front of player
+ ld a,[wcfc6] ; tile in front of player
ld c,a
- ld hl,$d530 ; pointer to list of passable tiles
+ ld hl,W_TILESETCOLLISIONPTR ; pointer to list of passable tiles
ld a,[hli]
ld h,[hl]
ld l,a ; hl now points to passable tiles
@@ -1449,18 +1449,18 @@
pop de
pop hl
and a
- ld a,[$d736]
+ ld a,[wd736]
bit 6,a ; is the player jumping?
ret nz
; if not jumping
Func_c44:: ; 0c44 (0:0c44)
- FuncCoord 8, 9 ; $c45c
+ FuncCoord 8, 9
ld a,[Coord] ; tile the player is on
- ld [$cf0e],a
+ ld [wcf0e],a
CheckForTilePairCollisions:: ; 0c4a (0:0c4a)
- ld a,[$cfc6] ; tile in front of the player
+ ld a,[wcfc6] ; tile in front of the player
ld c,a
.tilePairCollisionLoop
ld a,[W_CURMAPTILESET] ; tileset number
@@ -1475,7 +1475,7 @@
inc hl
jr .tilePairCollisionLoop
.tilesetMatches
- ld a,[$cf0e] ; tile the player is on
+ ld a,[wcf0e] ; tile the player is on
ld b,a
ld a,[hl]
cp b
@@ -1533,12 +1533,12 @@
LoadCurrentMapView:: ; 0caa (0:0caa)
ld a,[H_LOADEDROMBANK]
push af
- ld a,[$d52b] ; tile data ROM bank
+ ld a,[W_TILESETBANK] ; tile data ROM bank
ld [H_LOADEDROMBANK],a
ld [$2000],a ; switch to ROM bank that contains tile data
- ld a,[$d35f] ; address of upper left corner of current map view
+ ld a,[wd35f] ; address of upper left corner of current map view
ld e,a
- ld a,[$d360]
+ ld a,[wd360]
ld d,a
ld hl,wTileMapBackup
ld b,$05
@@ -1621,9 +1621,9 @@
ret
AdvancePlayerSprite:: ; 0d27 (0:0d27)
- ld a,[$c103] ; delta Y
+ ld a,[wSpriteStateData1 + 3] ; delta Y
ld b,a
- ld a,[$c105] ; delta X
+ ld a,[wSpriteStateData1 + 5] ; delta X
ld c,a
ld hl,wWalkCounter ; walking animation counter
dec [hl]
@@ -1644,7 +1644,7 @@
cp a,$01
jr nz,.checkIfMovingWest
; moving east
- ld a,[$d526]
+ ld a,[wd526]
ld e,a
and a,$e0
ld d,a
@@ -1652,13 +1652,13 @@
add a,$02
and a,$1f
or d
- ld [$d526],a
+ ld [wd526],a
jr .adjustXCoordWithinBlock
.checkIfMovingWest
cp a,$ff
jr nz,.checkIfMovingSouth
; moving west
- ld a,[$d526]
+ ld a,[wd526]
ld e,a
and a,$e0
ld d,a
@@ -1666,7 +1666,7 @@
sub a,$02
and a,$1f
or d
- ld [$d526],a
+ ld [wd526],a
jr .adjustXCoordWithinBlock
.checkIfMovingSouth
ld a,b
@@ -1673,29 +1673,29 @@
cp a,$01
jr nz,.checkIfMovingNorth
; moving south
- ld a,[$d526]
+ ld a,[wd526]
add a,$40
- ld [$d526],a
+ ld [wd526],a
jr nc,.adjustXCoordWithinBlock
- ld a,[$d527]
+ ld a,[wd527]
inc a
and a,$03
or a,$98
- ld [$d527],a
+ ld [wd527],a
jr .adjustXCoordWithinBlock
.checkIfMovingNorth
cp a,$ff
jr nz,.adjustXCoordWithinBlock
; moving north
- ld a,[$d526]
+ ld a,[wd526]
sub a,$40
- ld [$d526],a
+ ld [wd526],a
jr nc,.adjustXCoordWithinBlock
- ld a,[$d527]
+ ld a,[wd527]
dec a
and a,$03
or a,$98
- ld [$d527],a
+ ld [wd527],a
.adjustXCoordWithinBlock
ld a,c
and a
@@ -1710,9 +1710,9 @@
; moved into the tile block to the east
xor a
ld [hl],a
- ld hl,$d4e3
+ ld hl,wd4e3
inc [hl]
- ld de,$d35f
+ ld de,wd35f
call MoveTileBlockMapPointerEast
jr .updateMapView
.checkForMoveToWestBlock
@@ -1721,9 +1721,9 @@
; moved into the tile block to the west
ld a,$01
ld [hl],a
- ld hl,$d4e3
+ ld hl,wd4e3
dec [hl]
- ld de,$d35f
+ ld de,wd35f
call MoveTileBlockMapPointerWest
jr .updateMapView
.adjustYCoordWithinBlock
@@ -1736,9 +1736,9 @@
; moved into the tile block to the south
xor a
ld [hl],a
- ld hl,$d4e2
+ ld hl,wd4e2
inc [hl]
- ld de,$d35f
+ ld de,wd35f
ld a,[W_CURMAPWIDTH]
call MoveTileBlockMapPointerSouth
jr .updateMapView
@@ -1748,14 +1748,14 @@
; moved into the tile block to the north
ld a,$01
ld [hl],a
- ld hl,$d4e2
+ ld hl,wd4e2
dec [hl]
- ld de,$d35f
+ ld de,wd35f
ld a,[W_CURMAPWIDTH]
call MoveTileBlockMapPointerNorth
.updateMapView
call LoadCurrentMapView
- ld a,[$c103] ; delta Y
+ ld a,[wSpriteStateData1 + 3] ; delta Y
cp a,$01
jr nz,.checkIfMovingNorth2
; if moving south
@@ -1768,7 +1768,7 @@
call ScheduleNorthRowRedraw
jr .scrollBackgroundAndSprites
.checkIfMovingEast2
- ld a,[$c105] ; delta X
+ ld a,[wSpriteStateData1 + 5] ; delta X
cp a,$01
jr nz,.checkIfMovingWest2
; if moving east
@@ -1780,9 +1780,9 @@
; if moving west
call ScheduleWestColumnRedraw
.scrollBackgroundAndSprites
- ld a,[$c103] ; delta Y
+ ld a,[wSpriteStateData1 + 3] ; delta Y
ld b,a
- ld a,[$c105] ; delta X
+ ld a,[wSpriteStateData1 + 5] ; delta X
ld c,a
sla b
sla c
@@ -1794,8 +1794,8 @@
ld [$ffae],a ; update background scroll X
; shift all the sprites in the direction opposite of the player's motion
; so that the player appears to move relative to them
- ld hl,$c114
- ld a,[$d4e1] ; number of sprites
+ ld hl,wSpriteStateData1 + $14
+ ld a,[W_NUMSPRITES] ; number of sprites
and a ; are there any sprites?
jr z,.done
ld e,a
@@ -1873,9 +1873,9 @@
FuncCoord 0, 0
ld hl,Coord
call ScheduleRowRedrawHelper
- ld a,[$d526]
+ ld a,[wd526]
ld [H_SCREENEDGEREDRAWADDR],a
- ld a,[$d527]
+ ld a,[wd527]
ld [H_SCREENEDGEREDRAWADDR + 1],a
ld a,REDRAWROW
ld [H_SCREENEDGEREDRAW],a
@@ -1896,9 +1896,9 @@
FuncCoord 0,16
ld hl,Coord
call ScheduleRowRedrawHelper
- ld a,[$d526]
+ ld a,[wd526]
ld l,a
- ld a,[$d527]
+ ld a,[wd527]
ld h,a
ld bc,$0200
add hl,bc
@@ -1916,7 +1916,7 @@
FuncCoord 18,0
ld hl,Coord
call ScheduleColumnRedrawHelper
- ld a,[$d526]
+ ld a,[wd526]
ld c,a
and a,$e0
ld b,a
@@ -1925,7 +1925,7 @@
and a,$1f
or b
ld [H_SCREENEDGEREDRAWADDR],a
- ld a,[$d527]
+ ld a,[wd527]
ld [H_SCREENEDGEREDRAWADDR + 1],a
ld a,REDRAWCOL
ld [H_SCREENEDGEREDRAW],a
@@ -1955,9 +1955,9 @@
FuncCoord 0,0
ld hl,Coord
call ScheduleColumnRedrawHelper
- ld a,[$d526]
+ ld a,[wd526]
ld [H_SCREENEDGEREDRAWADDR],a
- ld a,[$d527]
+ ld a,[wd527]
ld [H_SCREENEDGEREDRAWADDR + 1],a
ld a,REDRAWCOL
ld [H_SCREENEDGEREDRAW],a
@@ -1967,9 +1967,9 @@
; Input: c = tile block ID, hl = destination address
DrawTileBlock:: ; 0f1d (0:0f1d)
push hl
- ld a,[$d52c] ; pointer to tiles
+ ld a,[W_TILESETBLOCKSPTR] ; pointer to tiles
ld l,a
- ld a,[$d52d]
+ ld a,[W_TILESETBLOCKSPTR + 1]
ld h,a
ld a,c
swap a
@@ -2008,8 +2008,8 @@
; function to update joypad state and simulate button presses
JoypadOverworld:: ; 0f4d (0:0f4d)
xor a
- ld [$c103],a
- ld [$c105],a
+ ld [wSpriteStateData1 + 3],a
+ ld [wSpriteStateData1 + 5],a
call RunMapScript
call Joypad
ld a,[W_FLAGS_D733]
@@ -2024,21 +2024,21 @@
ld a,%10000000 ; down pressed
ld [hJoyHeld],a ; on the cycling road, if there isn't a trainer and the player isn't pressing buttons, simulate a down press
.notForcedDownwards
- ld a,[$d730]
+ ld a,[wd730]
bit 7,a
ret z
; if simulating button presses
ld a,[hJoyHeld] ; current joypad state
ld b,a
- ld a,[$cd3b] ; bit mask for button presses that override simulated ones
+ ld a,[wcd3b] ; bit mask for button presses that override simulated ones
and b
ret nz ; return if the simulated button presses are overridden
- ld hl,$cd38 ; index of current simulated button press
+ ld hl,wcd38 ; index of current simulated button press
dec [hl]
ld a,[hl]
cp a,$ff
jr z,.doneSimulating ; if the end of the simulated button presses has been reached
- ld hl,$ccd3 ; base address of simulated button presses
+ ld hl,wccd3 ; base address of simulated button presses
; add offset to base address
add l
ld l,a
@@ -2055,16 +2055,16 @@
; if done simulating button presses
.doneSimulating
xor a
- ld [$cd3a],a
- ld [$cd38],a
- ld [$ccd3],a
+ ld [wcd3a],a
+ ld [wcd38],a
+ ld [wccd3],a
ld [wJoyIgnore],a
ld [hJoyHeld],a
- ld hl,$d736
+ ld hl,wd736
ld a,[hl]
and a,$f8
ld [hl],a
- ld hl,$d730
+ ld hl,wd730
res 7,[hl]
ret
@@ -2078,12 +2078,12 @@
; and 2429 always sets c to 0xF0. There is no 0xF0 background tile, so it
; is considered impassable and it is detected as a collision.
CollisionCheckOnWater:: ; 0fb7 (0:0fb7)
- ld a,[$d730]
+ ld a,[wd730]
bit 7,a
jp nz,.noCollision ; return and clear carry if button presses are being simulated
- ld a,[$d52a] ; the direction that the player is trying to go in
+ ld a,[wd52a] ; the direction that the player is trying to go in
ld d,a
- ld a,[$c10c] ; the player sprite's collision data (bit field) (set in the sprite movement code)
+ ld a,[wSpriteStateData1 + 12] ; the player sprite's collision data (bit field) (set in the sprite movement code)
and d ; check if a sprite is in the direction the player is trying to go
jr nz,.checkIfNextTileIsPassable ; bug?
ld hl,TilePairCollisionsWater
@@ -2090,8 +2090,8 @@
call CheckForJumpingAndTilePairCollisions
jr c,.collision
ld a,$35
- call Predef ; get tile in front of player (puts it in c and [$CFC6])
- ld a,[$cfc6] ; tile in front of player
+ call Predef ; get tile in front of player (puts it in c and [wcfc6])
+ ld a,[wcfc6] ; tile in front of player
cp a,$14 ; water tile
jr z,.noCollision ; keep surfing if it's a water tile
cp a,$32 ; either the left tile of the S.S. Anne boarding platform or the tile on eastern coastlines (depending on the current tileset)
@@ -2100,7 +2100,7 @@
jr z,.noCollision ; keep surfing
; check if the [land] tile in front of the player is passable
.checkIfNextTileIsPassable
- ld hl,$d530 ; pointer to list of passable tiles
+ ld hl,W_TILESETCOLLISIONPTR ; pointer to list of passable tiles
ld a,[hli]
ld h,[hl]
ld l,a
@@ -2112,7 +2112,7 @@
jr z,.stopSurfing ; stop surfing if the tile is passable
jr .loop
.collision
- ld a,[$c02a]
+ ld a,[wc02a]
cp a,(SFX_02_5b - SFX_Headers_02) / 3 ; check if collision sound is already playing
jr z,.setCarry
ld a,(SFX_02_5b - SFX_Headers_02) / 3
@@ -2126,7 +2126,7 @@
ret
.stopSurfing
xor a
- ld [$d700],a
+ ld [wd700],a
call LoadPlayerSpriteGraphics
call Func_2307
jr .noCollision
@@ -2198,7 +2198,7 @@
LoadMapHeader:: ; 107c (0:107c)
callba Func_f113
ld a,[W_CURMAPTILESET]
- ld [$d119],a
+ ld [wd119],a
ld a,[W_CURMAP]
call SwitchToMapRomBank
ld a,[W_CURMAPTILESET]
@@ -2223,7 +2223,7 @@
ld h,[hl]
ld l,a ; hl = base of map header
; copy the first 10 bytes (the fixed area) of the map data to D367-D370
- ld de,$d367
+ ld de,W_CURMAPTILESET
ld c,$0a
.copyFixedHeaderLoop
ld a,[hli]
@@ -2233,10 +2233,10 @@
jr nz,.copyFixedHeaderLoop
; initialize all the connected maps to disabled at first, before loading the actual values
ld a,$ff
- ld [$d371],a
- ld [$d37c],a
- ld [$d387],a
- ld [$d392],a
+ ld [W_MAPCONN1PTR],a
+ ld [W_MAPCONN2PTR],a
+ ld [W_MAPCONN3PTR],a
+ ld [W_MAPCONN4PTR],a
; copy connection data (if any) to WRAM
ld a,[W_MAPCONNECTIONS]
ld b,a
@@ -2262,24 +2262,24 @@
call CopyMapConnectionHeader
.getObjectDataPointer
ld a,[hli]
- ld [$d3a9],a
+ ld [wd3a9],a
ld a,[hli]
- ld [$d3aa],a
+ ld [wd3aa],a
push hl
- ld a,[$d3a9]
+ ld a,[wd3a9]
ld l,a
- ld a,[$d3aa]
+ ld a,[wd3aa]
ld h,a ; hl = base of object data
- ld de,$d3ad ; background tile ID
+ ld de,wd3ad ; background tile ID
ld a,[hli]
ld [de],a ; save background tile ID
.loadWarpData
ld a,[hli] ; number of warps
- ld [$d3ae],a ; save the number of warps
+ ld [wd3ae],a ; save the number of warps
and a ; are there any warps?
jr z,.loadSignData ; if not, skip this
ld c,a
- ld de,$d3af ; base address of warps
+ ld de,wd3af ; base address of warps
.warpLoop ; one warp per loop iteration
ld b,$04
.warpInnerLoop
@@ -2292,16 +2292,16 @@
jr nz,.warpLoop
.loadSignData
ld a,[hli] ; number of signs
- ld [$d4b0],a ; save the number of signs
+ ld [wd4b0],a ; save the number of signs
and a ; are there any signs?
jr z,.loadSpriteData ; if not, skip this
ld c,a
- ld de,$d4d1 ; base address of sign text IDs
+ ld de,wd4d1 ; base address of sign text IDs
ld a,d
ld [$ff95],a
ld a,e
ld [$ff96],a
- ld de,$d4b1 ; base address of sign coordinates
+ ld de,wd4b1 ; base address of sign coordinates
.signLoop
ld a,[hli]
ld [de],a
@@ -2325,15 +2325,15 @@
dec c
jr nz,.signLoop
.loadSpriteData
- ld a,[$d72e]
+ ld a,[wd72e]
bit 5,a ; did a battle happen immediately before this?
jp nz,.finishUp ; if so, skip this because battles don't destroy this data
ld a,[hli]
- ld [$d4e1],a ; save the number of sprites
+ ld [W_NUMSPRITES],a ; save the number of sprites
push hl
; zero C110-C1FF and C210-C2FF
- ld hl,$c110
- ld de,$c210
+ ld hl,wSpriteStateData1 + $10
+ ld de,wSpriteStateData2 + $10
xor a
ld b,$f0
.zeroSpriteDataLoop
@@ -2343,7 +2343,7 @@
dec b
jr nz,.zeroSpriteDataLoop
; initialize all C100-C1FF sprite entries to disabled (other than player's)
- ld hl,$c112
+ ld hl,wSpriteStateData1 + $12
ld de,$0010
ld c,$0f
.disableSpriteEntriesLoop
@@ -2352,8 +2352,8 @@
dec c
jr nz,.disableSpriteEntriesLoop
pop hl
- ld de,$c110
- ld a,[$d4e1] ; number of sprites
+ ld de,wSpriteStateData1 + $10
+ ld a,[W_NUMSPRITES] ; number of sprites
and a ; are there any sprites?
jp z,.finishUp ; if there are no sprites, skip the rest
ld b,a
@@ -2449,10 +2449,10 @@
pop hl ; restore hl from before going to the warp/sign/sprite data (this value was saved for seemingly no purpose)
ld a,[W_CURMAPHEIGHT] ; map height in 4x4 tile blocks
add a ; double it
- ld [$d524],a ; store map height in 2x2 tile blocks
+ ld [wd524],a ; store map height in 2x2 tile blocks
ld a,[W_CURMAPWIDTH] ; map width in 4x4 tile blocks
add a ; double it
- ld [$d525],a ; map width in 2x2 tile blocks
+ ld [wd525],a ; map width in 2x2 tile blocks
ld a,[W_CURMAP]
ld c,a
ld b,$00
@@ -2465,9 +2465,9 @@
add hl,bc
add hl,bc
ld a,[hli]
- ld [$d35b],a ; music 1
+ ld [wd35b],a ; music 1
ld a,[hl]
- ld [$d35c],a ; music 2
+ ld [wd35c],a ; music 2
pop af
ld [H_LOADEDROMBANK],a
ld [$2000],a
@@ -2491,15 +2491,15 @@
push af
call DisableLCD
ld a,$98
- ld [$d527],a
+ ld [wd527],a
xor a
- ld [$d526],a
+ ld [wd526],a
ld [$ffaf],a
ld [$ffae],a
ld [wWalkCounter],a
- ld [$d119],a
- ld [$d11a],a
- ld [$d3a8],a
+ ld [wd119],a
+ ld [wd11a],a
+ ld [W_SPRITESETID],a
call LoadTextBoxTilePatterns
call LoadMapHeader
callba InitMapSprites ; load tile pattern data for sprites
@@ -2527,12 +2527,12 @@
dec b
jr nz,.vramCopyLoop
ld a,$01
- ld [$cfcb],a
+ ld [wcfcb],a
call EnableLCD
ld b,$09
call GoPAL_SET
call LoadPlayerSpriteGraphics
- ld a,[$d732]
+ ld a,[wd732]
and a,$18 ; did the player fly or teleport in?
jr nz,.restoreRomBank
ld a,[W_FLAGS_D733]
@@ -2569,8 +2569,8 @@
Func_12da:: ; 12da (0:12da)
ld a, $1e
- ld [$d13a], a
- ld hl, $d730
+ ld [wd13a], a
+ ld hl, wd730
ld a, [hl]
or $26
ld [hl], a
@@ -2577,7 +2577,7 @@
ret
Func_12e7:: ; 12e7 (0:12e7)
- ld hl, $d728
+ ld hl, wd728
res 0, [hl]
ret
@@ -2630,7 +2630,7 @@
ld b,0
add hl,bc
ld bc,4
- ld de,$d35f
+ ld de,wd35f
call CopyData
pop af
ld [H_LOADEDROMBANK],a
@@ -2655,7 +2655,7 @@
ld [hli],a
dec d
jr nz,.drawEmptyBarLoop
- ld a,[$cf94]
+ ld a,[wListMenuID]
dec a ; what should the right of HP bar tile be?
ld a,$6d ; right of HP bar tile, in status screen and battles
jr z,.writeTile
@@ -2694,27 +2694,27 @@
pop hl
ret
-; loads pokemon data from one of multiple sources to $cf98
-; loads base stats to $d0b8
+; loads pokemon data from one of multiple sources to wcf98
+; loads base stats to W_MONHDEXNUM
; INPUT:
-; [$cf92] = index of pokemon within party/box
-; [$cc49] = source
+; [wWhichPokemon] = index of pokemon within party/box
+; [wcc49] = source
; 00: player's party
; 01: enemy's party
; 02: current box
; 03: daycare
; OUTPUT:
-; [$cf91] = pokemon ID
-; $cf98 = base address of pokemon data
-; $d0b8 = base address of base stats
+; [wcf91] = pokemon ID
+; wcf98 = base address of pokemon data
+; W_MONHDEXNUM = base address of base stats
LoadMonData:: ; 1372 (0:1372)
ld hl,LoadMonData_
ld b,BANK(LoadMonData_)
jp Bankswitch
-; writes c to $d0dc+b
+; writes c to wd0dc+b
Func_137a:: ; 137a (0:137a)
- ld hl, $d0dc
+ ld hl, wd0dc
ld e, b
ld d, $0
add hl, de
@@ -2728,13 +2728,13 @@
LoadFrontSpriteByMonIndex:: ; 1389 (0:1389)
push hl
- ld a, [$d11e]
+ ld a, [wd11e]
push af
- ld a, [$cf91]
- ld [$d11e], a
+ ld a, [wcf91]
+ ld [wd11e], a
ld a, $3a
call Predef ; indirect jump to IndexToPokedex (41010 (10:5010))
- ld hl, $d11e
+ ld hl, wd11e
ld a, [hl]
pop bc
ld [hl], b
@@ -2745,7 +2745,7 @@
jr c, .validDexNumber ; dex >#151 invalid
.invalidDexNumber
ld a, RHYDON ; $1
- ld [$cf91], a
+ ld [wcf91], a
ret
.validDexNumber
push hl
@@ -2791,9 +2791,9 @@
ld a,[hli]
ld b,a
ld a,[hli]
- ld [$c0f1],a
+ ld [wc0f1],a
ld a,[hl]
- ld [$c0f2],a
+ ld [wc0f2],a
call BankswitchBack
ld a,b ; a = cryID
ld c,$14 ; base sound ID for pokemon cries
@@ -2826,17 +2826,17 @@
ld a,$01
call BankswitchHome
call LoadHpBarAndStatusTilePatterns
- ld hl,$d730
+ ld hl,wd730
set 6,[hl] ; turn off letter printing delay
xor a
- ld [$cc49],a
- ld [$cc37],a
+ ld [wcc49],a
+ ld [wcc37],a
ld hl,wTopMenuItemY
inc a
ld [hli],a ; top menu item Y
xor a
ld [hli],a ; top menu item X
- ld a,[$cc2b]
+ ld a,[wcc2b]
push af
ld [hli],a ; current menu item ID
inc hl
@@ -2848,12 +2848,12 @@
; otherwise, it is 0
.storeMaxMenuItemID
ld [hli],a ; max menu item ID
- ld a,[$d11f]
+ ld a,[wd11f]
and a
ld a,%00000011 ; A button and B button
jr z,.next
xor a
- ld [$d11f],a
+ ld [wd11f],a
inc a
.next
ld [hli],a ; menu watched keys
@@ -2863,19 +2863,19 @@
HandlePartyMenuInput:: ; 145a (0:145a)
ld a,1
- ld [$cc4a],a
+ ld [wMenuWrappingEnabled],a
ld a,$40
- ld [$d09b],a
+ ld [wd09b],a
call HandleMenuInputPokemonSelection
call PlaceUnfilledArrowMenuCursor
ld b,a
xor a
- ld [$d09b],a
+ ld [wd09b],a
ld a,[wCurrentMenuItem]
- ld [$cc2b],a
- ld hl,$d730
+ ld [wcc2b],a
+ ld hl,wd730
res 6,[hl] ; turn on letter printing delay
- ld a,[$cc35]
+ ld a,[wcc35]
and a
jp nz,.swappingPokemon
pop af
@@ -2892,8 +2892,8 @@
ld c,a
add hl,bc
ld a,[hl]
- ld [$cf91],a
- ld [$cfd9],a
+ ld [wcf91],a
+ ld [wcfd9],a
call BankswitchBack
and a
ret
@@ -2907,8 +2907,8 @@
.cancelSwap ; if the B button was pressed
callba ErasePartyMenuCursors
xor a
- ld [$cc35],a
- ld [$d07d],a
+ ld [wcc35],a
+ ld [wd07d],a
call RedrawPartyMenu
jr HandlePartyMenuInput
.handleSwap
@@ -2967,12 +2967,12 @@
; function to print pokemon level, leaving off the ":L" if the level is at least 100
; INPUT:
; hl = destination address
-; [$cfb9] = level
+; [wcfb9] = level
PrintLevel:: ; 150b (0:150b)
ld a,$6e ; ":L" tile ID
ld [hli],a
ld c,2 ; number of digits
- ld a,[$cfb9] ; level
+ ld a,[wcfb9] ; level
cp a,100
jr c,PrintLevelCommon
; if level at least 100, write over the ":L" tile
@@ -2983,21 +2983,21 @@
; prints the level without leaving off ":L" regardless of level
; INPUT:
; hl = destination address
-; [$cfb9] = level
+; [wcfb9] = level
PrintLevelFull:: ; 151b (0:151b)
ld a,$6e ; ":L" tile ID
ld [hli],a
ld c,3 ; number of digits
- ld a,[$cfb9] ; level
+ ld a,[wcfb9] ; level
PrintLevelCommon:: ; 1523 (0:1523)
- ld [$d11e],a
- ld de,$d11e
+ ld [wd11e],a
+ ld de,wd11e
ld b,$41 ; no leading zeroes, left-aligned, one byte
jp PrintNumber
Func_152e:: ; 152e (0:152e)
- ld hl,$d0dc
+ ld hl,wd0dc
ld c,a
ld b,0
add hl,bc
@@ -3004,9 +3004,9 @@
ld a,[hl]
ret
-; copies the base stat data of a pokemon to $D0B8 (W_MONHEADER)
+; copies the base stat data of a pokemon to W_MONHDEXNUM (W_MONHEADER)
; INPUT:
-; [$D0B5] = pokemon ID
+; [wd0b5] = pokemon ID
GetMonHeader:: ; 1537 (0:1537)
ld a,[H_LOADEDROMBANK]
push af
@@ -3016,10 +3016,10 @@
push bc
push de
push hl
- ld a,[$d11e]
+ ld a,[wd11e]
push af
- ld a,[$d0b5]
- ld [$d11e],a
+ ld a,[wd0b5]
+ ld [wd11e],a
ld de,FossilKabutopsPic
ld b,$66 ; size of Kabutops fossil and Ghost sprites
cp a,FOSSIL_KABUTOPS ; Kabutops fossil
@@ -3034,8 +3034,8 @@
cp a,MEW
jr z,.mew
ld a,$3a
- call Predef ; convert pokemon ID in [$D11E] to pokedex number
- ld a,[$d11e]
+ call Predef ; convert pokemon ID in [wd11e] to pokedex number
+ ld a,[wd11e]
dec a
ld bc,28
ld hl,BaseStats
@@ -3059,10 +3059,10 @@
ld a,BANK(MewBaseStats)
call FarCopyData
.done
- ld a,[$d0b5]
- ld [$d0b8],a
+ ld a,[wd0b5]
+ ld [W_MONHDEXNUM],a
pop af
- ld [$d11e],a
+ ld [wd11e],a
pop hl
pop de
pop bc
@@ -3071,7 +3071,7 @@
ld [$2000],a
ret
-; copy party pokemon's name to $CD6D
+; copy party pokemon's name to wcd6d
GetPartyMonName2:: ; 15b4 (0:15b4)
ld a,[wWhichPokemon] ; index within party
ld hl,W_PARTYMON1NAME
@@ -3081,7 +3081,7 @@
push hl
push bc
call SkipFixedLengthTextEntries ; add 11 to hl, a times
- ld de,$cd6d
+ ld de,wcd6d
push de
ld bc,11
call CopyData
@@ -3186,7 +3186,7 @@
; $4A ≤ index < $74, bank $B
; $74 ≤ index < $99, bank $C
; $99 ≤ index, bank $D
- ld a,[$CF91] ; XXX name for this ram location
+ ld a,[wcf91] ; XXX name for this ram location
ld b,a
cp MEW
ld a,BANK(MewPicFront)
@@ -3410,7 +3410,7 @@
INCBIN "gfx/tilesets/plateau.tilecoll"
; does the same thing as FarCopyData at 009D
-; only difference is that it uses [$ff8b] instead of [$cee9] for a temp value
+; only difference is that it uses [$ff8b] instead of [wHPBarMaxHP] for a temp value
; copy bc bytes of data from a:hl to de
FarCopyData2:: ; 17f7 (0:17f7)
ld [$ff8b],a
@@ -3589,11 +3589,11 @@
call InitScreenTileBufferTransferParameters
call DelayFrame
ld hl, $600
- ld de, wTileMap + 20 * 6 ; $c418
+ ld de, wTileMap + 20 * 6
call InitScreenTileBufferTransferParameters
call DelayFrame
ld hl, $c00
- ld de, wTileMap + 20 * 12 ; $c490
+ ld de, wTileMap + 20 * 12
call InitScreenTileBufferTransferParameters
jp DelayFrame
@@ -3707,7 +3707,7 @@
cp $4F
jr nz,.next3
pop hl
- FuncCoord 1, 16 ; $c4e1
+ FuncCoord 1, 16
ld hl,Coord
push hl
jp Next19E8
@@ -3897,17 +3897,17 @@
ret
Char58:: ; 1a95 (0:1a95)
- ld a,[$D12B]
+ ld a,[W_ISLINKBATTLE]
cp 4
jp z,Next1AA2
ld a,$EE
- FuncCoord 18, 16 ; $c4f2
+ FuncCoord 18, 16
ld [Coord],a
Next1AA2:: ; 1aa2 (0:1aa2)
call ProtectedDelay3
call ManualTextScroll
ld a,$7F
- FuncCoord 18, 16 ; $c4f2
+ FuncCoord 18, 16
ld [Coord],a
Char57:: ; 1aad (0:1aad)
pop hl
@@ -3921,11 +3921,11 @@
Char51:: ; 1ab4 (0:1ab4)
push de
ld a,$EE
- FuncCoord 18, 16 ; $c4f2
+ FuncCoord 18, 16
ld [Coord],a
call ProtectedDelay3
call ManualTextScroll
- FuncCoord 1, 13 ; $c4a5
+ FuncCoord 1, 13
ld hl,Coord
ld bc,$0412
call ClearScreenArea
@@ -3932,7 +3932,7 @@
ld c,$14
call DelayFrames
pop de
- FuncCoord 1, 14 ; $c4b9
+ FuncCoord 1, 14
ld hl,Coord
jp Next19E8
@@ -3939,11 +3939,11 @@
Char49:: ; 1ad5 (0:1ad5)
push de
ld a,$EE
- FuncCoord 18, 16 ; $c4f2
+ FuncCoord 18, 16
ld [Coord],a
call ProtectedDelay3
call ManualTextScroll
- FuncCoord 1, 10 ; $c469
+ FuncCoord 1, 10
ld hl,Coord
ld bc,$0712
call ClearScreenArea
@@ -3951,7 +3951,7 @@
call DelayFrames
pop de
pop hl
- FuncCoord 1, 11 ; $c47d
+ FuncCoord 1, 11
ld hl,Coord
push hl
jp Next19E8
@@ -3958,7 +3958,7 @@
Char4B:: ; 1af8 (0:1af8)
ld a,$EE
- FuncCoord 18, 16 ; $c4f2
+ FuncCoord 18, 16
ld [Coord],a
call ProtectedDelay3
push de
@@ -3965,7 +3965,7 @@
call ManualTextScroll
pop de
ld a,$7F
- FuncCoord 18, 16 ; $c4f2
+ FuncCoord 18, 16
ld [Coord],a
;fall through
Char4C:: ; 1b0a (0:1b0a)
@@ -3972,15 +3972,15 @@
push de
call Next1B18
call Next1B18
- FuncCoord 1, 16 ; $c4e1
+ FuncCoord 1, 16
ld hl,Coord
pop de
jp Next19E8
Next1B18:: ; 1b18 (0:1b18)
- FuncCoord 0, 14 ; $c4b8
+ FuncCoord 0, 14
ld hl,Coord
- FuncCoord 0, 13 ; $c4a4
+ FuncCoord 0, 13
ld de,Coord
ld b,$3C
.next
@@ -3989,7 +3989,7 @@
inc de
dec b
jr nz,.next
- FuncCoord 1, 16 ; $c4e1
+ FuncCoord 1, 16
ld hl,Coord
ld a,$7F
ld b,$12
@@ -4014,17 +4014,17 @@
ret
TextCommandProcessor:: ; 1b40 (0:1b40)
- ld a,[$d358]
+ ld a,[wd358]
push af
set 1,a
ld e,a
ld a,[$fff4]
xor e
- ld [$d358],a
+ ld [wd358],a
ld a,c
- ld [$cc3a],a
+ ld [wcc3a],a
ld a,b
- ld [$cc3b],a
+ ld [wcc3b],a
NextTextCommand:: ; 1b55 (0:1b55)
ld a,[hli]
@@ -4031,7 +4031,7 @@
cp a, "@" ; terminator
jr nz,.doTextCommand
pop af
- ld [$d358],a
+ ld [wd358],a
ret
.doTextCommand
push hl
@@ -4133,10 +4133,10 @@
TextCommand03:: ; 1bb7 (0:1bb7)
pop hl
ld a,[hli]
- ld [$cc3a],a
+ ld [wcc3a],a
ld c,a
ld a,[hli]
- ld [$cc3b],a
+ ld [wcc3b],a
ld b,a
jp NextTextCommand
@@ -4145,7 +4145,7 @@
; (no arguments)
TextCommand05:: ; 1bc5 (0:1bc5)
pop hl
- FuncCoord 1, 16 ; $c4e1
+ FuncCoord 1, 16
ld bc,Coord ; address of second line of dialogue text box
jp NextTextCommand
@@ -4157,13 +4157,13 @@
cp a,$04
jp z,TextCommand0D
ld a,$ee ; down arrow
- FuncCoord 18, 16 ; $c4f2
+ FuncCoord 18, 16
ld [Coord],a ; place down arrow in lower right corner of dialogue text box
push bc
call ManualTextScroll ; blink arrow and wait for A or B to be pressed
pop bc
ld a," "
- FuncCoord 18, 16 ; $c4f2
+ FuncCoord 18, 16
ld [Coord],a ; overwrite down arrow with blank space
pop hl
jp NextTextCommand
@@ -4173,12 +4173,12 @@
; (no arguments)
TextCommand07:: ; 1be7 (0:1be7)
ld a," "
- FuncCoord 18, 16 ; $c4f2
+ FuncCoord 18, 16
ld [Coord],a ; place blank space in lower right corner of dialogue text box
call Next1B18 ; scroll up text
call Next1B18
pop hl
- FuncCoord 1, 16 ; $c4e1
+ FuncCoord 1, 16
ld bc,Coord ; address of second line of dialogue text box
jp NextTextCommand
@@ -4798,10 +4798,10 @@
ld hl, $9140
ld c, $10
- ld a, [$d085]
+ ld a, [wd085]
inc a
and 7
- ld [$d085], a
+ ld [wd085], a
and 4
jr nz, .left
@@ -4830,7 +4830,7 @@
xor a
ld [$ffd8], a
- ld a, [$d085]
+ ld a, [wd085]
and 3
cp 2
ld hl, FlowerTile1
@@ -4897,7 +4897,7 @@
ld sp, wStack
- ld hl, $c000 ; start of WRAM
+ ld hl, wc000 ; start of WRAM
ld bc, $2000 ; size of WRAM
.loop
ld [hl], 0
@@ -4955,14 +4955,14 @@
call Predef
ld a, $1f
- ld [$c0ef], a
- ld [$c0f0], a
+ ld [wc0ef], a
+ ld [wc0f0], a
ld a, $9c
ld [$ffbd], a
xor a
ld [$ffbc], a
dec a
- ld [$cfcb], a
+ ld [wcfcb], a
ld a, $32 ; PREDEF_INTRO
call Predef
@@ -4985,12 +4985,12 @@
StopAllSounds::
ld a, Bank(Func_9876)
- ld [$c0ef], a
- ld [$c0f0], a
+ ld [wc0ef], a
+ ld [wc0f0], a
xor a
ld [wMusicHeaderPointer], a
- ld [$c0ee], a
- ld [$cfca], a
+ ld [wc0ee], a
+ ld [wcfca], a
dec a
jp PlaySound
@@ -5003,7 +5003,7 @@
push hl
ld a, [H_LOADEDROMBANK]
- ld [$d122], a
+ ld [wd122], a
ld a, [$ffae]
ld [rSCX], a
@@ -5010,7 +5010,7 @@
ld a, [$ffaf]
ld [rSCY], a
- ld a, [$d0a0]
+ ld a, [wd0a0]
and a
jr nz, .ok
ld a, [$ffb0]
@@ -5049,7 +5049,7 @@
call Func_28cb
- ld a, [$c0ef] ; music ROM bank
+ ld a, [wc0ef] ; music ROM bank
ld [H_LOADEDROMBANK], a
ld [MBC3RomBank], a
@@ -5075,7 +5075,7 @@
and a
call z, ReadJoypad
- ld a, [$d122]
+ ld a, [wd122]
ld [H_LOADEDROMBANK], a
ld [MBC3RomBank], a
@@ -5108,7 +5108,7 @@
; These routines manage gradual fading
; (e.g., entering a doorway)
LoadGBPal:: ; 20ba (0:20ba)
- ld a,[$d35d] ;tells if cur.map is dark (requires HM5_FLASH?)
+ ld a,[wd35d] ;tells if cur.map is dark (requires HM5_FLASH?)
ld b,a
ld hl,GBPalTable_00 ;16
ld a,l
@@ -5306,7 +5306,7 @@
jr z, .asm_21cc
call Func_2231
push hl
- ld hl, $cc48
+ ld hl, wcc48
inc [hl]
jr nz, .asm_21c3
dec hl
@@ -5321,13 +5321,13 @@
and $f
cp $8
jr nz, .asm_21a7
- ld a, [W_NUMHITS] ; $d074
+ ld a, [W_NUMHITS] ; wd074
dec a
- ld [W_NUMHITS], a ; $d074
+ ld [W_NUMHITS], a ; wd074
jr nz, .asm_21a7
- ld a, [$d075]
+ ld a, [wd075]
dec a
- ld [$d075], a
+ ld [wd075], a
jr nz, .asm_21a7
ld a, [$ffaa]
cp $1
@@ -5343,9 +5343,9 @@
and $f
sub $8
jr nz, .asm_2204
- ld [W_NUMHITS], a ; $d074
+ ld [W_NUMHITS], a ; wd074
ld a, $50
- ld [$d075], a
+ ld [wd075], a
.asm_2204
ld a, [$ffad]
cp $fe
@@ -5353,7 +5353,7 @@
call Func_2237
jr z, .asm_221f
push hl
- ld hl, $cc48
+ ld hl, wcc48
ld a, [hl]
dec a
ld [hld], a
@@ -5384,7 +5384,7 @@
Func_2237:: ; 2237 (0:2237)
push hl
- ld hl, $cc47
+ ld hl, wcc47
ld a, [hli]
or [hl]
pop hl
@@ -5392,13 +5392,13 @@
Func_223f:: ; 223f (0:223f)
dec a
- ld [$cc47], a
- ld [$cc48], a
+ ld [wcc47], a
+ ld [wcc48], a
ret
Func_2247:: ; 2247 (0:2247)
- ld hl, $cc42
- ld de, $cc3d
+ ld hl, wcc42
+ ld de, wcc3d
ld c, $2
ld a, $1
ld [$ffab], a
@@ -5429,7 +5429,7 @@
Func_227f:: ; 227f (0:227f)
ld a, $ff
- ld [$cc3e], a
+ ld [wcc3e], a
.asm_2284
call Func_22c3
call DelayFrame
@@ -5436,7 +5436,7 @@
call Func_2237
jr z, .asm_22a0
push hl
- ld hl, $cc48
+ ld hl, wcc48
dec [hl]
jr nz, .asm_229f
dec hl
@@ -5448,7 +5448,7 @@
.asm_229f
pop hl
.asm_22a0
- ld a, [$cc3e]
+ ld a, [wcc3e]
inc a
jr z, .asm_2284
ld b, $a
@@ -5463,13 +5463,13 @@
call Func_22ed
dec b
jr nz, .asm_22b3
- ld a, [$cc3e]
- ld [$cc3d], a
+ ld a, [wcc3e]
+ ld [wcc3d], a
ret
Func_22c3:: ; 22c3 (0:22c3)
call asm_22d7
- ld a, [$cc42]
+ ld a, [wcc42]
add $60
ld [$ffac], a
ld a, [$ffaa]
@@ -5479,15 +5479,15 @@
ld [$ff02], a
asm_22d7:: ; 22d7 (0:22d7)
ld a, [$ffad]
- ld [$cc3d], a
+ ld [wcc3d], a
and $f0
cp $60
ret nz
xor a
ld [$ffad], a
- ld a, [$cc3d]
+ ld a, [wcc3d]
and $f
- ld [$cc3e], a
+ ld [wcc3e], a
ret
Func_22ed:: ; 22ed (0:22ed)
@@ -5518,21 +5518,21 @@
xor a
ld c, a
ld d, a
- ld [$cfca], a
+ ld [wcfca], a
jr asm_2324
Func_2312:: ; 2312 (0:2312)
ld c, $a
ld d, $0
- ld a, [$d72e]
+ ld a, [wd72e]
bit 5, a
jr z, asm_2324
xor a
- ld [$cfca], a
+ ld [wcfca], a
ld c, $8
ld d, c
asm_2324:: ; 2324 (0:2324)
- ld a, [$d700]
+ ld a, [wd700]
and a
jr z, .asm_2343
cp $2
@@ -5547,17 +5547,17 @@
and a
ld a, Bank(Func_7d8ea)
jr nz, .asm_233e
- ld [$c0ef], a
+ ld [wc0ef], a
.asm_233e
- ld [$c0f0], a
+ ld [wc0f0], a
jr .asm_234c
.asm_2343
- ld a, [$d35b]
+ ld a, [wd35b]
ld b, a
call Func_2385
jr c, .asm_2351
.asm_234c
- ld a, [$cfca]
+ ld a, [wcfca]
cp b
ret z
.asm_2351
@@ -5564,12 +5564,12 @@
ld a, c
ld [wMusicHeaderPointer], a
ld a, b
- ld [$cfca], a
- ld [$c0ee], a
+ ld [wcfca], a
+ ld [wc0ee], a
jp PlaySound
Func_235f:: ; 235f (0:235f)
- ld a, [$c0ef]
+ ld a, [wc0ef]
ld b, a
cp $2
jr nz, .checkForBank08
@@ -5597,12 +5597,12 @@
ret
Func_2385:: ; 2385 (0:2385)
- ld a, [$d35c]
+ ld a, [wd35c]
ld e, a
- ld a, [$c0ef]
+ ld a, [wc0ef]
cp e
jr nz, .asm_2394
- ld [$c0f0], a
+ ld [wc0f0], a
and a
ret
.asm_2394
@@ -5610,20 +5610,20 @@
and a
ld a, e
jr nz, .asm_239c
- ld [$c0ef], a
+ ld [wc0ef], a
.asm_239c
- ld [$c0f0], a
+ ld [wc0f0], a
scf
ret
PlayMusic:: ; 23a1 (0:23a1)
ld b, a
- ld [$c0ee], a
+ ld [wc0ee], a
xor a
ld [wMusicHeaderPointer], a
ld a, c
- ld [$c0ef], a
- ld [$c0f0], a
+ ld [wc0ef], a
+ ld [wc0f0], a
ld a, b
; plays music specified by a. If value is $ff, music is stopped
@@ -5632,24 +5632,24 @@
push de
push bc
ld b, a
- ld a, [$c0ee]
+ ld a, [wc0ee]
and a
jr z, .asm_23c8
xor a
- ld [$c02a], a
- ld [$c02b], a
- ld [$c02c], a
- ld [$c02d], a
+ ld [wc02a], a
+ ld [wc02b], a
+ ld [wc02c], a
+ ld [wc02d], a
.asm_23c8
ld a, [wMusicHeaderPointer]
and a
jr z, .asm_23e3
- ld a, [$c0ee]
+ ld a, [wc0ee]
and a
jr z, .asm_2425
xor a
- ld [$c0ee], a
- ld a, [$cfca]
+ ld [wc0ee], a
+ ld a, [wcfca]
cp $ff
jr nz, .asm_2414
xor a
@@ -5656,10 +5656,10 @@
ld [wMusicHeaderPointer], a
.asm_23e3
xor a
- ld [$c0ee], a
+ ld [wc0ee], a
ld a, [H_LOADEDROMBANK]
ld [$ffb9], a
- ld a, [$c0ef]
+ ld a, [wc0ef]
ld [H_LOADEDROMBANK], a
ld [$2000], a
cp $2
@@ -5685,10 +5685,10 @@
jr .asm_2425
.asm_2414
ld a, b
- ld [$cfca], a
+ ld [wcfca], a
ld a, [wMusicHeaderPointer]
- ld [$cfc8], a
- ld [$cfc9], a
+ ld [wcfc8], a
+ ld [wcfc9], a
ld a, b
ld [wMusicHeaderPointer], a
.asm_2425
@@ -5698,7 +5698,7 @@
ret
UpdateSprites:: ; 2429 (0:2429)
- ld a, [$cfcb]
+ ld a, [wcfcb]
dec a
ret nz
ld a, [H_LOADEDROMBANK]
@@ -5780,7 +5780,7 @@
xor a
ld [W_SPRITECURPOSX], a
ld [W_SPRITECURPOSY], a
- ld [W_SPRITELOADFLAGS], a ; $d0a8
+ ld [W_SPRITELOADFLAGS], a ; wd0a8
call ReadNextInputByte ; first byte of input determines sprite width (high nybble) and height (low nybble) in tiles (8x8 pixels)
ld b, a
and $f
@@ -5801,18 +5801,18 @@
; bit 0 decides in which one the first chunk is placed
; fall through
-; uncompresses a chunk from the sprite input data stream (pointed to at $d0da) into S_SPRITEBUFFER1 or S_SPRITEBUFFER2
+; uncompresses a chunk from the sprite input data stream (pointed to at wd0da) into S_SPRITEBUFFER1 or S_SPRITEBUFFER2
; each chunk is a 1bpp sprite. A 2bpp sprite consist of two chunks which are merged afterwards
; note that this is an endless loop which is terminated during a call to MoveToNextBufferPosition by manipulating the stack
UncompressSpriteDataLoop:: ; 2556 (0:2556)
ld hl, S_SPRITEBUFFER1
- ld a, [W_SPRITELOADFLAGS] ; $d0a8
+ ld a, [W_SPRITELOADFLAGS] ; wd0a8
bit 0, a
jr z, .useSpriteBuffer1 ; check which buffer to use
ld hl, S_SPRITEBUFFER2
.useSpriteBuffer1
call StoreSpriteOutputPointer
- ld a, [W_SPRITELOADFLAGS] ; $d0a8
+ ld a, [W_SPRITELOADFLAGS] ; wd0a8
bit 1, a
jr z, .startDecompression ; check if last iteration
call ReadNextInputBit ; if last chunk, read 1-2 bit unpacking mode
@@ -5944,12 +5944,12 @@
pop hl
xor a
ld [W_SPRITECURPOSX], a
- ld a, [W_SPRITELOADFLAGS] ; $d0a8
+ ld a, [W_SPRITELOADFLAGS] ; wd0a8
bit 1, a
jr nz, .done ; test if there is one more sprite to go
xor $1
set 1, a
- ld [W_SPRITELOADFLAGS], a ; $d0a8
+ ld [W_SPRITELOADFLAGS], a ; wd0a8
jp UncompressSpriteDataLoop
.done
jp UnpackSprite
@@ -6288,7 +6288,7 @@
; resets sprite buffer pointers to buffer 1 and 2, depending on W_SPRITELOADFLAGS
ResetSpriteBufferPointers:: ; 2841 (0:2841)
- ld a, [W_SPRITELOADFLAGS] ; $d0a8
+ ld a, [W_SPRITELOADFLAGS] ; wd0a8
bit 0, a
jr nz, .buffer2Selected
ld de, S_SPRITEBUFFER1
@@ -6346,8 +6346,8 @@
call ResetPlayerSpriteData_ClearSpriteData
ld a, $1
ld [wSpriteStateData1], a
- ld [$c20e], a
- ld hl, $c104
+ ld [wSpriteStateData2 + $0e], a
+ ld hl, wSpriteStateData1 + 4
ld [hl], $3c ; set Y screen pos
inc hl
inc hl
@@ -6364,7 +6364,7 @@
ld a, [wMusicHeaderPointer]
and a
jr nz, .asm_28dc
- ld a, [$d72c]
+ ld a, [wd72c]
bit 1, a
ret nz
ld a, $77
@@ -6371,15 +6371,15 @@
ld [$ff24], a
ret
.asm_28dc
- ld a, [$cfc9]
+ ld a, [wcfc9]
and a
jr z, .asm_28e7
dec a
- ld [$cfc9], a
+ ld [wcfc9], a
ret
.asm_28e7
- ld a, [$cfc8]
- ld [$cfc9], a
+ ld a, [wcfc8]
+ ld [wcfc9], a
ld a, [$ff24]
and a
jr z, .asm_2903
@@ -6401,12 +6401,12 @@
xor a
ld [wMusicHeaderPointer], a
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
- ld a, [$c0f0]
- ld [$c0ef], a
+ ld a, [wc0f0]
+ ld [wc0ef], a
ld a, b
- ld [$c0ee], a
+ ld [wc0ee], a
jp PlaySound
; this function is used to display sign messages, sprite dialog, etc.
@@ -6415,7 +6415,7 @@
ld a,[H_LOADEDROMBANK]
push af
callba DisplayTextIDInit ; initialization
- ld hl,$cf11
+ ld hl,wcf11
bit 0,[hl]
res 0,[hl]
jr nz,.skipSwitchToMapBank
@@ -6430,7 +6430,7 @@
ld l,a ; hl = map text pointer
ld d,$00
ld a,[$ff8c] ; text ID
- ld [$cf13],a
+ ld [wcf13],a
and a
jp z,DisplayStartMenu
cp a,$d3 ; safari game over
@@ -6441,7 +6441,7 @@
jp z,DisplayPlayerBlackedOutText
cp a,$d2 ; repel wore off
jp z,DisplayRepelWoreOffText
- ld a,[$d4e1] ; number of sprites
+ ld a,[W_NUMSPRITES] ; number of sprites
ld e,a
ld a,[$ff8c] ; sprite ID
cp e
@@ -6501,12 +6501,12 @@
jr AfterDisplayingTextID
.notSpecialCase
call Func_3c59 ; display the text
- ld a,[$cc3c]
+ ld a,[wcc3c]
and a
jr nz,HoldTextDisplayOpen
AfterDisplayingTextID:: ; 29d6 (0:29d6)
- ld a,[$cc47]
+ ld a,[wcc47]
and a
jr nz,HoldTextDisplayOpen
call WaitForTextScrollButtonPress ; wait for a button press after displaying all the text
@@ -6528,7 +6528,7 @@
xor a
ld [H_AUTOBGTRANSFERENABLED],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,$c219
+ ld hl,wSpriteStateData2 + $19
ld c,$0f
ld de,$0010
.restoreSpriteFacingDirectionLoop
@@ -6543,9 +6543,9 @@
ld [H_LOADEDROMBANK],a
ld [$2000],a
call InitMapSprites ; reload sprite tile pattern data (since it was partially overwritten by text tile patterns)
- ld hl,$cfc4
+ ld hl,wcfc4
res 0,[hl]
- ld a,[$d732]
+ ld a,[wd732]
bit 3,a
call z,LoadPlayerSpriteGraphics
call LoadCurrentMapView
@@ -6562,7 +6562,7 @@
inc hl
call LoadItemList
ld a,$02
- ld [$cf94],a ; selects between subtypes of menus
+ ld [wListMenuID],a ; selects between subtypes of menus
ld a,[H_LOADEDROMBANK]
push af
ld a,Bank(DisplayPokemartDialogue_)
@@ -6580,12 +6580,12 @@
LoadItemList:: ; 2a5a (0:2a5a)
ld a,$01
- ld [$cfcb],a
+ ld [wcfcb],a
ld a,h
- ld [$d128],a
+ ld [wd128],a
ld a,l
- ld [$d129],a
- ld de,$cf7b
+ ld [wd129],a
+ ld de,wStringBuffer2 + 11
.loop
ld a,[hli]
ld [de],a
@@ -6627,9 +6627,9 @@
DisplayPlayerBlackedOutText:: ; 2aa9 (0:2aa9)
ld hl,PlayerBlackedOutText
call PrintText
- ld a,[$d732]
+ ld a,[wd732]
res 5,a
- ld [$d732],a
+ ld [wd732],a
jp HoldTextDisplayOpen
PlayerBlackedOutText:: ; 2aba (0:2aba)
@@ -6652,7 +6652,7 @@
; hl = address of string of bytes
; b = length of string of bytes
; OUTPUT:
-; [$D11E] = number of set bits
+; [wd11e] = number of set bits
CountSetBits:: ; 2b7f (0:2b7f)
ld c,0
.loop
@@ -6669,7 +6669,7 @@
dec b
jr nz,.loop
ld a,c
- ld [$d11e],a ; store number of set bits
+ ld [wd11e],a ; store number of set bits
ret
; subtracts the amount the player paid from their money
@@ -6687,7 +6687,7 @@
ld a,$0b
call Predef ; add total price to money
ld a,$13
- ld [$d125],a
+ ld [wd125],a
call DisplayTextBoxID ; redraw money text box
ld a, (SFX_02_5a - SFX_Headers_02) / 3
call PlaySoundWaitForCurrent ; play sound
@@ -6696,8 +6696,8 @@
; function to remove an item (in varying quantities) from the player's bag or PC box
; INPUT:
; HL = address of inventory (either wNumBagItems or wNumBoxItems)
-; [$CF92] = index (within the inventory) of the item to remove
-; [$CF96] = quantity to remove
+; [wWhichPokemon] = index (within the inventory) of the item to remove
+; [wcf96] = quantity to remove
RemoveItemFromInventory:: ; 2bbb (0:2bbb)
ld a,[H_LOADEDROMBANK]
push af
@@ -6713,8 +6713,8 @@
; function to add an item (in varying quantities) to the player's bag or PC box
; INPUT:
; HL = address of inventory (either wNumBagItems or wNumBoxItems)
-; [$CF91] = item ID
-; [$CF96] = item quantity
+; [wcf91] = item ID
+; [wcf96] = item quantity
; sets carry flag if successful, unsets carry flag if unsuccessful
AddItemToInventory:: ; 2bcf (0:2bcf)
push bc
@@ -6733,7 +6733,7 @@
; INPUT:
; [wListMenuID] = list menu ID
-; [$cf8b] = address of the list (2 bytes)
+; [wcf8b] = address of the list (2 bytes)
DisplayListMenuID:: ; 2be6 (0:2be6)
xor a
ld [H_AUTOBGTRANSFERENABLED],a ; disable auto-transfer
@@ -6748,19 +6748,19 @@
ld a, Bank(OldManItemList)
.bankswitch
call BankswitchHome
- ld hl,$d730
+ ld hl,wd730
set 6,[hl] ; turn off letter printing delay
xor a
- ld [$cc35],a ; 0 means no item is currently being swapped
- ld [$d12a],a
- ld a,[$cf8b]
+ ld [wcc35],a ; 0 means no item is currently being swapped
+ ld [wd12a],a
+ ld a,[wcf8b]
ld l,a
- ld a,[$cf8c]
+ ld a,[wcf8c]
ld h,a ; hl = address of the list
ld a,[hl]
- ld [$d12a],a ; [$d12a] = number of list entries
+ ld [wd12a],a ; [wd12a] = number of list entries
ld a,$0d ; list menu text box ID
- ld [$d125],a
+ ld [wd125],a
call DisplayTextBoxID ; draw the menu text box
call UpdateSprites ; move sprites
FuncCoord 4,2 ; coordinates of upper left corner of menu text box
@@ -6772,8 +6772,8 @@
call UpdateSprites ; move sprites
.skipMovingSprites
ld a,1 ; max menu item ID is 1 if the list has less than 2 entries
- ld [$cc37],a
- ld a,[$d12a]
+ ld [wcc37],a
+ ld a,[wd12a]
cp a,2 ; does the list have less than 2 entries?
jr c,.setMenuVariables
ld a,2 ; max menu item ID is 2 if the list has at least 2 entries
@@ -6824,16 +6824,16 @@
ld a,[wCurrentMenuItem]
call PlaceUnfilledArrowMenuCursor
ld a,$01
- ld [$d12e],a
- ld [$d12d],a
+ ld [wd12e],a
+ ld [wd12d],a
xor a
- ld [$cc37],a
+ ld [wcc37],a
ld a,[wCurrentMenuItem]
ld c,a
ld a,[wListScrollOffset]
add c
ld c,a
- ld a,[$d12a] ; number of list entries
+ ld a,[wd12a] ; number of list entries
and a ; is the list empty?
jp z,ExitListMenu ; if so, exit the menu
dec a
@@ -6847,15 +6847,15 @@
; if it's an item menu
sla c ; item entries are 2 bytes long, so multiply by 2
.skipMultiplying
- ld a,[$cf8b]
+ ld a,[wcf8b]
ld l,a
- ld a,[$cf8c]
+ ld a,[wcf8c]
ld h,a
inc hl ; hl = beginning of list entries
ld b,0
add hl,bc
ld a,[hl]
- ld [$cf91],a
+ ld [wcf91],a
ld a,[wListMenuID]
and a ; is it a PC pokemon list?
jr z,.pokemonList
@@ -6868,17 +6868,17 @@
; if it's an item menu
inc hl
ld a,[hl] ; a = item quantity
- ld [$cf97],a
+ ld [wcf97],a
.skipGettingQuantity
- ld a,[$cf91]
- ld [$d0b5],a
+ ld a,[wcf91]
+ ld [wd0b5],a
ld a,$01
- ld [$d0b7],a
+ ld [wPredefBank],a
call GetName
jr .storeChosenEntry
.pokemonList
ld hl,W_NUMINPARTY
- ld a,[$cf8b]
+ ld a,[wcf8b]
cp l ; is it a list of party pokemon or box pokemon?
ld hl,W_PARTYMON1NAME
jr z,.getPokemonName
@@ -6887,15 +6887,15 @@
ld a,[wWhichPokemon]
call GetPartyMonName
.storeChosenEntry ; store the menu entry that the player chose and return
- ld de,$cd6d
- call CopyStringToCF4B ; copy name to $cf4b
+ ld de,wcd6d
+ call CopyStringToCF4B ; copy name to wcf4b
ld a,$01
- ld [$d12e],a
+ ld [wd12e],a
ld a,[wCurrentMenuItem]
- ld [$d12d],a
+ ld [wd12d],a
xor a
ld [$ffb7],a ; joypad state update flag
- ld hl,$d730
+ ld hl,wd730
res 6,[hl] ; turn on letter printing delay
jp BankswitchBack
.checkOtherKeys ; check B, SELECT, Up, and Down keys
@@ -6911,7 +6911,7 @@
ld a,[hl]
add a,3
ld b,a
- ld a,[$d12a] ; number of list entries
+ ld a,[wd12a] ; number of list entries
cp b ; will going down scroll past the Cancel button?
jp c,DisplayListMenuIDLoop
inc [hl] ; if not, go down
@@ -6950,7 +6950,7 @@
ld de,InitialQuantityText
call PlaceString
xor a
- ld [$cf96],a ; initialize current quantity to 0
+ ld [wcf96],a ; initialize current quantity to 0
jp .incrementQuantity
.waitForKeyPressLoop
call JoypadLowSensitivity
@@ -6965,10 +6965,10 @@
jr nz,.decrementQuantity
jr .waitForKeyPressLoop
.incrementQuantity
- ld a,[$cf97] ; max quantity
+ ld a,[wcf97] ; max quantity
inc a
ld b,a
- ld hl,$cf96 ; current quantity
+ ld hl,wcf96 ; current quantity
inc [hl]
ld a,[hl]
cp b
@@ -6978,11 +6978,11 @@
ld [hl],a
jr .handleNewQuantity
.decrementQuantity
- ld hl,$cf96 ; current quantity
+ ld hl,wcf96 ; current quantity
dec [hl]
jr nz,.handleNewQuantity
; wrap to the max quantity if the player goes below 1
- ld a,[$cf97] ; max quantity
+ ld a,[wcf97] ; max quantity
ld [hl],a
.handleNewQuantity
FuncCoord 17,10
@@ -6992,7 +6992,7 @@
jr nz,.printQuantity
.printPrice
ld c,$03
- ld a,[$cf96]
+ ld a,[wcf96]
ld b,a
ld hl,$ff9f ; total price
; initialize total price to 0
@@ -7037,17 +7037,17 @@
FuncCoord 9,10
ld hl,Coord
.printQuantity
- ld de,$cf96 ; current quantity
+ ld de,wcf96 ; current quantity
ld bc,$8102 ; print leading zeroes, 1 byte, 2 digits
call PrintNumber
jp .waitForKeyPressLoop
.buttonAPressed ; the player chose to make the transaction
xor a
- ld [$cc35],a ; 0 means no item is currently being swapped
+ ld [wcc35],a ; 0 means no item is currently being swapped
ret
.buttonBPressed ; the player chose to cancel the transaction
xor a
- ld [$cc35],a ; 0 means no item is currently being swapped
+ ld [wcc35],a ; 0 means no item is currently being swapped
ld a,$ff
ret
@@ -7059,29 +7059,29 @@
ExitListMenu:: ; 2e3b (0:2e3b)
ld a,[wCurrentMenuItem]
- ld [$d12d],a
+ ld [wd12d],a
ld a,$02
- ld [$d12e],a
- ld [$cc37],a
+ ld [wd12e],a
+ ld [wcc37],a
xor a
ld [$ffb7],a
- ld hl,$d730
+ ld hl,wd730
res 6,[hl]
call BankswitchBack
xor a
- ld [$cc35],a ; 0 means no item is currently being swapped
+ ld [wcc35],a ; 0 means no item is currently being swapped
scf
ret
PrintListMenuEntries:: ; 2e5a (0:2e5a)
- FuncCoord 5, 3 ; $c3e1
+ FuncCoord 5, 3
ld hl,Coord
ld b,$09
ld c,$0e
call ClearScreenArea
- ld a,[$cf8b]
+ ld a,[wcf8b]
ld e,a
- ld a,[$cf8c]
+ ld a,[wcf8c]
ld d,a
inc de ; de = beginning of list entries
ld a,[wListScrollOffset]
@@ -7107,7 +7107,7 @@
ld a,b
ld [wWhichPokemon],a
ld a,[de]
- ld [$d11e],a
+ ld [wd11e],a
cp a,$ff
jp z,.printCancelMenuItem
push bc
@@ -7126,7 +7126,7 @@
.pokemonPCMenu
push hl
ld hl,W_NUMINPARTY
- ld a,[$cf8b]
+ ld a,[wcf8b]
cp l ; is it a list of party pokemon or box pokemon?
ld hl,W_PARTYMON1NAME
jr z,.getPokemonName
@@ -7148,7 +7148,7 @@
call PlaceString
pop de
pop hl
- ld a,[$cf93]
+ ld a,[wcf93]
and a ; should prices be printed?
jr z,.skipPrintingItemPrice
.printItemPrice
@@ -7155,7 +7155,7 @@
push hl
ld a,[de]
ld de,ItemPrices
- ld [$cf91],a
+ ld [wcf91],a
call GetItemPrice ; get price
pop hl
ld bc,20 + 5 ; 1 row down and 5 columns right
@@ -7167,17 +7167,17 @@
and a
jr nz,.skipPrintingPokemonLevel
.printPokemonLevel
- ld a,[$d11e]
+ ld a,[wd11e]
push af
push hl
ld hl,W_NUMINPARTY
- ld a,[$cf8b]
+ ld a,[wcf8b]
cp l ; is it a list of party pokemon or box pokemon?
ld a,$00
jr z,.next
ld a,$02
.next
- ld [$cc49],a
+ ld [wcc49],a
ld hl,wWhichPokemon
ld a,[hl]
ld b,a
@@ -7188,12 +7188,12 @@
add b
ld [hl],a
call LoadMonData ; load pokemon info
- ld a,[$cc49]
+ ld a,[wcc49]
and a ; is it a list of party pokemon or box pokemon?
jr z,.skipCopyingLevel
.copyLevel
- ld a,[$cf9b]
- ld [$cfb9],a
+ ld a,[wcf9b]
+ ld [wcfb9],a
.skipCopyingLevel
pop hl
ld bc,$001c
@@ -7200,7 +7200,7 @@
add hl,bc
call PrintLevel ; print level
pop af
- ld [$d11e],a
+ ld [wd11e],a
.skipPrintingPokemonLevel
pop hl
pop de
@@ -7209,10 +7209,10 @@
cp a,ITEMLISTMENU
jr nz,.nextListEntry
.printItemQuantity
- ld a,[$d11e]
- ld [$cf91],a
+ ld a,[wd11e]
+ ld [wcf91],a
call IsKeyItem ; check if item is unsellable
- ld a,[$d124]
+ ld a,[wd124]
and a ; is the item unsellable?
jr nz,.skipPrintingItemQuantity ; if so, don't print the quantity
push hl
@@ -7220,18 +7220,18 @@
add hl,bc
ld a,"×"
ldi [hl],a
- ld a,[$d11e]
+ ld a,[wd11e]
push af
ld a,[de]
- ld [$cf97],a
+ ld [wcf97],a
push de
- ld de,$d11e
+ ld de,wd11e
ld [de],a
ld bc,$0102
call PrintNumber
pop de
pop af
- ld [$d11e],a
+ ld [wd11e],a
pop hl
.skipPrintingItemQuantity
inc de
@@ -7239,7 +7239,7 @@
inc c
push bc
inc c
- ld a,[$cc35] ; ID of item chosen for swapping (counts from 1)
+ ld a,[wcc35] ; ID of item chosen for swapping (counts from 1)
and a ; is an item being swapped?
jr z,.nextListEntry
sla a
@@ -7274,17 +7274,17 @@
ld a,BANK(MonsterNames) ; 07
ld [H_LOADEDROMBANK],a
ld [$2000],a
- ld a,[$d11e]
+ ld a,[wd11e]
dec a
ld hl,MonsterNames ; 421E
ld c,10
ld b,0
call AddNTimes
- ld de,$cd6d
+ ld de,wcd6d
push de
ld bc,10
call CopyData
- ld hl,$cd77
+ ld hl,wcd77
ld [hl], "@"
pop de
pop af
@@ -7294,19 +7294,19 @@
ret
GetItemName:: ; 2fcf (0:2fcf)
-; given an item ID at [$D11E], store the name of the item into a string
-; starting at $CD6D
+; given an item ID at [wd11e], store the name of the item into a string
+; starting at wcd6d
push hl
push bc
- ld a,[$D11E]
+ ld a,[wd11e]
cp HM_01 ; is this a TM/HM?
jr nc,.Machine
- ld [$D0B5],a
+ ld [wd0b5],a
ld a,ITEM_NAME
ld [W_LISTTYPE],a
ld a,BANK(ItemNames)
- ld [$D0B7],a
+ ld [wPredefBank],a
call GetName
jr .Finish
@@ -7313,17 +7313,17 @@
.Machine
call GetMachineName
.Finish
- ld de,$CD6D ; pointer to where item name is stored in RAM
+ ld de,wcd6d ; pointer to where item name is stored in RAM
pop bc
pop hl
ret
GetMachineName:: ; 2ff3 (0:2ff3)
-; copies the name of the TM/HM in [$D11E] to $CD6D
+; copies the name of the TM/HM in [wd11e] to wcd6d
push hl
push de
push bc
- ld a,[$D11E]
+ ld a,[wd11e]
push af
cp TM_01 ; is this a TM? [not HM]
jr nc,.WriteTM
@@ -7330,7 +7330,7 @@
; if HM, then write "HM" and add 5 to the item ID, so we can reuse the
; TM printing code
add 5
- ld [$D11E],a
+ ld [wd11e],a
ld hl,HiddenPrefix ; points to "HM"
ld bc,2
jr .WriteMachinePrefix
@@ -7338,11 +7338,11 @@
ld hl,TechnicalPrefix ; points to "TM"
ld bc,2
.WriteMachinePrefix
- ld de,$CD6D
+ ld de,wcd6d
call CopyData
; now get the machine number and convert it to text
- ld a,[$D11E]
+ ld a,[wd11e]
sub TM_01 - 1
ld b,$F6 ; "0"
.FirstDigit
@@ -7365,7 +7365,7 @@
ld [de],a
pop af
- ld [$D11E],a
+ ld [wd11e],a
pop bc
pop de
pop hl
@@ -7402,12 +7402,12 @@
push hl
ld a,MOVE_NAME
ld [W_LISTTYPE],a
- ld a,[$d11e]
- ld [$d0b5],a
+ ld a,[wd11e]
+ ld [wd0b5],a
ld a,BANK(MoveNames)
- ld [$d0b7],a
+ ld [wPredefBank],a
call GetName
- ld de,$cd6d ; pointer to where move name is stored in RAM
+ ld de,wcd6d ; pointer to where move name is stored in RAM
pop hl
ret
@@ -7443,7 +7443,7 @@
; shows the town map and lets the player choose a destination to fly to
ChooseFlyDestination:: ; 30a9 (0:30a9)
- ld hl,$d72e
+ ld hl,wd72e
res 4,[hl]
ld b, BANK(LoadTownMap_Fly)
ld hl, LoadTownMap_Fly
@@ -7452,15 +7452,15 @@
; causes the text box to close waithout waiting for a button press after displaying text
DisableWaitingAfterTextDisplay:: ; 30b6 (0:30b6)
ld a,$01
- ld [$cc3c],a
+ ld [wcc3c],a
ret
; uses an item
; UseItem is used with dummy items to perform certain other functions as well
; INPUT:
-; [$cf91] = item ID
+; [wcf91] = item ID
; OUTPUT:
-; [$cd6a] = success
+; [wcd6a] = success
; 00: unsucessful
; 01: successful
; 02: not able to be used right now, no extra menu displayed (only certain items use this)
@@ -7472,9 +7472,9 @@
; confirms the item toss and then tosses the item
; INPUT:
; hl = address of inventory (either wNumBagItems or wNumBoxItems)
-; [$cf91] = item ID
-; [$cf92] = index of item within inventory
-; [$cf96] = quantity to toss
+; [wcf91] = item ID
+; [wWhichPokemon] = index of item within inventory
+; [wcf96] = quantity to toss
; OUTPUT:
; clears carry flag if the item is tossed, sets carry flag if not
TossItem:: ; 30c4 (0:30c4)
@@ -7492,9 +7492,9 @@
; checks if an item is a key item
; INPUT:
-; [$cf91] = item ID
+; [wcf91] = item ID
; OUTPUT:
-; [$d124] = result
+; [wd124] = result
; 00: item is not key item
; 01: item is key item
IsKeyItem:: ; 30d9 (0:30d9)
@@ -7509,7 +7509,7 @@
; function to draw various text boxes
; INPUT:
-; [$D125] = text box ID
+; [wd125] = text box ID
DisplayTextBoxID:: ; 30e8 (0:30e8)
ld a,[H_LOADEDROMBANK]
push af
@@ -7524,22 +7524,22 @@
ret
Func_30fd:: ; 30fd (0:30fd)
- ld a, [$cc57]
+ ld a, [wcc57]
and a
ret nz
- ld a, [$d736]
+ ld a, [wd736]
bit 1, a
ret nz
- ld a, [$d730]
+ ld a, [wd730]
and $80
ret
Func_310e:: ; 310e (0:310e)
- ld hl, $d736
+ ld hl, wd736
bit 0, [hl]
res 0, [hl]
jr nz, .asm_3146
- ld a, [$cc57]
+ ld a, [wcc57]
and a
ret z
dec a
@@ -7553,10 +7553,10 @@
ld l, a
ld a, [H_LOADEDROMBANK]
push af
- ld a, [$cc58]
+ ld a, [wcc58]
ld [H_LOADEDROMBANK], a
ld [$2000], a
- ld a, [$cf10]
+ ld a, [wcf10]
call CallFunctionInTable
pop af
ld [H_LOADEDROMBANK], a
@@ -7588,7 +7588,7 @@
ret
; executes the current map script from the function pointer array provided in hl.
-; a: map script index to execute (unless overridden by [$d733] bit 4)
+; a: map script index to execute (unless overridden by [wd733] bit 4)
ExecuteCurMapScriptInTable:: ; 3160 (0:3160)
push af
push de
@@ -7709,19 +7709,19 @@
; checks if any trainers are seeing the player and wanting to fight
CheckFightingMapTrainers:: ; 3219 (0:3219)
call CheckForEngagingTrainers
- ld a, [$cf13]
+ ld a, [wcf13]
cp $ff
jr nz, .trainerEngaging
xor a
- ld [$cf13], a
+ ld [wcf13], a
ld [wTrainerHeaderFlagBit], a
ret
.trainerEngaging
ld hl, W_FLAGS_D733
set 3, [hl]
- ld [$cd4f], a
+ ld [wcd4f], a
xor a
- ld [$cd50], a
+ ld [wcd50], a
ld a, $4c
call Predef
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
@@ -7734,11 +7734,11 @@
ret
Func_324c:: ; 324c (0:324c)
- ld a, [$d730]
+ ld a, [wd730]
and $1
ret nz
ld [wJoyIgnore], a
- ld a, [$cf13]
+ ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
@@ -7746,10 +7746,10 @@
xor a
ld [wJoyIgnore], a
call InitBattleEnemyParameters
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
- ld hl, $d72e
+ ld hl, wd72e
set 1, [hl]
ld hl, W_CURMAPSCRIPT
inc [hl] ; progress to battle phase 2 (battling)
@@ -7756,14 +7756,14 @@
ret
EndTrainerBattle:: ; 3275 (0:3275)
- ld hl, $d126
+ ld hl, wd126
set 5, [hl]
set 6, [hl]
- ld hl, $d72d
+ ld hl, wd72d
res 7, [hl]
ld hl, wFlags_0xcd60
res 0, [hl] ; player is no longer engaged by any trainer
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, ResetButtonPressedAndMapScript
ld a, $2
@@ -7777,15 +7777,15 @@
jr nc, .skipRemoveSprite ; test if trainer was fought (in that case skip removing the corresponding sprite)
ld hl, W_MISSABLEOBJECTLIST
ld de, $2
- ld a, [$cf13]
+ ld a, [wcf13]
call IsInArray ; search for sprite ID
inc hl
ld a, [hl]
- ld [$cc4d], a ; load corresponding missable object index and remove it
+ ld [wcc4d], a ; load corresponding missable object index and remove it
ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
.skipRemoveSprite
- ld hl, $d730
+ ld hl, wd730
bit 4, [hl]
res 4, [hl]
ret nz
@@ -7808,15 +7808,15 @@
; sets opponent type and mon set/lvl based on the engaging trainer data
InitBattleEnemyParameters:: ; 32d7 (0:32d7)
ld a, [wEngagedTrainerClass]
- ld [W_CUROPPONENT], a ; $d059
+ ld [W_CUROPPONENT], a ; wd059
ld [W_ENEMYMONORTRAINERCLASS], a
cp $c8
- ld a, [wEngagedTrainerSet] ; $cd2e
+ ld a, [wEngagedTrainerSet] ; wcd2e
jr c, .noTrainer
- ld [W_TRAINERNO], a ; $d05d
+ ld [W_TRAINERNO], a ; wd05d
ret
.noTrainer
- ld [W_CURENEMYLVL], a ; $d127
+ ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
ret
Func_32ef:: ; 32ef (0:32ef)
@@ -7845,7 +7845,7 @@
.trainerLoop
call StoreTrainerHeaderPointer ; set trainer header pointer to current trainer
ld a, [de]
- ld [$cf13], a ; store trainer flag's bit
+ ld [wcf13], a ; store trainer flag's bit
ld [wTrainerHeaderFlagBit], a
cp $ff
ret z
@@ -7867,14 +7867,14 @@
ld a, [hl] ; read trainer engage distance
pop hl
ld [wTrainerEngageDistance], a
- ld a, [$cf13]
+ ld a, [wcf13]
swap a
- ld [wTrainerSpriteOffset], a ; $cd3d
+ ld [wTrainerSpriteOffset], a ; wWhichTrade
ld a, $39
call Predef ; indirect jump to CheckEngagePlayer (5690f (15:690f))
pop de
pop hl
- ld a, [wTrainerSpriteOffset] ; $cd3d
+ ld a, [wTrainerSpriteOffset] ; wWhichTrade
and a
ret nz ; break if the trainer is engaging
.trainerAlreadyFought
@@ -7899,11 +7899,11 @@
ret
; loads data of some trainer on the current map and plays pre-battle music
-; [$cf13]: sprite ID of trainer who is engaged
+; [wcf13]: sprite ID of trainer who is engaged
EngageMapTrainer:: ; 336a (0:336a)
ld hl, W_MAPSPRITEEXTRADATA
ld d, $0
- ld a, [$cf13]
+ ld a, [wcf13]
dec a
add a
ld e, a
@@ -7911,12 +7911,12 @@
ld a, [hli] ; load trainer class
ld [wEngagedTrainerClass], a
ld a, [hl] ; load trainer mon set
- ld [wEnemyMonAttackMod], a ; $cd2e
+ ld [wEnemyMonAttackMod], a ; wcd2e
jp PlayTrainerMusic
Func_3381:: ; 3381 (0:3381)
push hl
- ld hl, $d72d
+ ld hl, wd72d
bit 7, [hl]
res 7, [hl]
pop hl
@@ -7938,7 +7938,7 @@
jp WaitForSoundToFinish
Func_33b7:: ; 33b7 (0:33b7)
- ld a, [$cf0b]
+ ld a, [wcf0b]
and a
jr nz, .asm_33c6
ld a, [W_PBSTOREDREGISTERH]
@@ -7978,7 +7978,7 @@
ret z
cp $c8 + SONY3
ret z
- ld a, [W_GYMLEADERNO] ; $d05c
+ ld a, [W_GYMLEADERNO] ; W_GYMLEADERNO
and a
ret nz
xor a
@@ -7986,8 +7986,8 @@
ld a, $ff
call PlaySound ; stop music
ld a, BANK(Music_MeetEvilTrainer)
- ld [$c0ef], a
- ld [$c0f0], a
+ ld [wc0ef], a
+ ld [wc0f0], a
ld a, [wEngagedTrainerClass]
ld b, a
ld hl, EvilTrainerList
@@ -8012,7 +8012,7 @@
.maleTrainer
ld a, MUSIC_MEET_MALE_TRAINER
.PlaySound
- ld [$c0ee], a
+ ld [wc0ee], a
jp PlaySound
INCLUDE "data/trainer_types.asm"
@@ -8029,10 +8029,10 @@
ld a, [hli]
ld d, [hl]
ld e, a
- ld hl, $ccd3
+ ld hl, wccd3
call DecodeRLEList
dec a
- ld [$cd38], a
+ ld [wcd38], a
ret
.asm_345b
inc hl
@@ -8069,9 +8069,9 @@
Func_3486:: ; 3486 (0:3486)
xor a
- ld [$cd3b], a
- ld [$c206], a
- ld hl, $d730
+ ld [wcd3b], a
+ ld [wSpriteStateData2 + $06], a
+ ld hl, wd730
set 7, [hl]
ret
@@ -8087,7 +8087,7 @@
ret
DisplayPokedex:: ; 349b (0:349b)
- ld [$d11e], a
+ ld [wd11e], a
ld b, BANK(Func_7c18)
ld hl, Func_7c18
jp Bankswitch
@@ -8115,7 +8115,7 @@
; INPUT:
; hl = address of array
; OUTPUT:
-; [$cd3d] = if there is match, the matching array index
+; [wWhichTrade] = if there is match, the matching array index
; sets carry if the coordinates are in the array, clears carry if not
ArePlayerCoordsInArray:: ; 34bf (0:34bf)
ld a,[W_YCOORD]
@@ -8126,13 +8126,13 @@
CheckCoords:: ; 34c7 (0:34c7)
xor a
- ld [$cd3d],a
+ ld [wWhichTrade],a
.loop
ld a,[hli]
cp a,$ff ; reached terminator?
jr z,.notInArray
push hl
- ld hl,$cd3d
+ ld hl,wWhichTrade
inc [hl]
pop hl
.compareYCoord
@@ -8156,11 +8156,11 @@
; hl = address of array
; ff8c = which boulder to check? XXX
; OUTPUT:
-; [$cd3d] = if there is match, the matching array index
+; [wWhichTrade] = if there is match, the matching array index
; sets carry if the coordinates are in the array, clears carry if not
CheckBoulderCoords:: ; 34e4 (0:34e4)
push hl
- ld hl, $c204
+ ld hl, wSpriteStateData2 + $04
ld a, [$ff8c]
swap a
ld d, $0
@@ -8266,23 +8266,23 @@
GetTrainerInformation:: ; 3566 (0:3566)
call GetTrainerName
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
and a
jr nz, .linkBattle
ld a, Bank(TrainerPicAndMoneyPointers)
call BankswitchHome
- ld a, [W_TRAINERCLASS] ; $d031
+ ld a, [W_TRAINERCLASS] ; wd031
dec a
ld hl, TrainerPicAndMoneyPointers
ld bc, $5
call AddNTimes
- ld de, $d033
+ ld de, wd033
ld a, [hli]
ld [de], a
inc de
ld a, [hli]
ld [de], a
- ld de, $d046
+ ld de, wd046
ld a, [hli]
ld [de], a
inc de
@@ -8290,7 +8290,7 @@
ld [de], a
jp BankswitchBack
.linkBattle
- ld hl, $d033
+ ld hl, wd033
ld de, RedPicFront
ld [hl], e
inc hl
@@ -8323,10 +8323,10 @@
BankswitchHome:: ; 35bc (0:35bc)
; switches to bank # in a
; Only use this when in the home bank!
- ld [$CF09],a
+ ld [wcf09],a
ld a,[H_LOADEDROMBANK]
- ld [$CF08],a
- ld a,[$CF09]
+ ld [wcf08],a
+ ld a,[wcf09]
ld [H_LOADEDROMBANK],a
ld [$2000],a
ret
@@ -8333,7 +8333,7 @@
BankswitchBack:: ; 35cd (0:35cd)
; returns from BankswitchHome
- ld a,[$CF08]
+ ld a,[wcf08]
ld [H_LOADEDROMBANK],a
ld [$2000],a
ret
@@ -8365,14 +8365,14 @@
Func_35f4:: ; 35f4 (0:35f4)
ld a, $14
- ld [$d125], a
+ ld [wd125], a
call InitYesNoTextBoxParameters
jp DisplayTextBoxID
InitYesNoTextBoxParameters:: ; 35ff (0:35ff)
xor a
- ld [$d12c], a
- FuncCoord 14, 7 ; $c43a
+ ld [wd12c], a
+ FuncCoord 14, 7
ld hl, Coord
ld bc, $80f
ret
@@ -8380,8 +8380,8 @@
YesNoChoicePokeCenter:: ; 360a (0:360a)
call SaveScreenTilesToBuffer1
ld a, $6
- ld [$d12c], a
- FuncCoord 11, 6 ; $c423
+ ld [wd12c], a
+ FuncCoord 11, 6
ld hl, Coord
ld bc, $80c
jr DisplayYesNoChoice
@@ -8389,13 +8389,13 @@
Func_361a:: ; 361a (0:361a)
call SaveScreenTilesToBuffer1
ld a, $3
- ld [$d12c], a
- FuncCoord 12, 7 ; $c438
+ ld [wd12c], a
+ FuncCoord 12, 7
ld hl, Coord
ld bc, $080d
DisplayYesNoChoice:: ; 3628 (0:3628)
ld a, $14
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
jp LoadScreenTilesFromBuffer1
@@ -8410,7 +8410,7 @@
MoveSprite:: ; 363a (0:363a)
; move the sprite [$FF8C] with the movement pointed to by de
-; actually only copies the movement data to $CC5B for later
+; actually only copies the movement data to wcc5b for later
call SetSpriteMovementBytesToFF
MoveSprite_:: ; 363d (0:363d)
push hl
@@ -8418,7 +8418,7 @@
call GetSpriteMovementByte1Pointer
xor a
ld [hl],a
- ld hl,$CC5B
+ ld hl,wcc5b
ld c,0
.loop
@@ -8430,18 +8430,18 @@
jr nz,.loop
ld a,c
- ld [$CF0F],a ; number of steps taken
+ ld [wcf0f],a ; number of steps taken
pop bc
- ld hl,$D730
+ ld hl,wd730
set 0,[hl]
pop hl
xor a
- ld [$CD3B],a
- ld [$CCD3],a
+ ld [wcd3b],a
+ ld [wccd3],a
dec a
ld [wJoyIgnore],a
- ld [$CD3A],a
+ ld [wcd3a],a
ret
Func_366b:: ; 366b (0:366b)
@@ -8594,12 +8594,12 @@
; Wait for sound to finish playing
WaitForSoundToFinish:: ; 3748 (0:3748)
- ld a, [$d083]
+ ld a, [wd083]
and $80
ret nz
push hl
.asm_374f
- ld hl, $c02a
+ ld hl, wc02a
xor a
or [hl]
inc hl
@@ -8622,13 +8622,13 @@
GetName:: ; 376b (0:376b)
; arguments:
-; [$D0B5] = which name
-; [$D0B6] = which list (W_LISTTYPE)
-; [$D0B7] = bank of list
+; [wd0b5] = which name
+; [wd0b6] = which list (W_LISTTYPE)
+; [wPredefBank] = bank of list
;
; returns pointer to name in de
- ld a,[$d0b5]
- ld [$d11e],a
+ ld a,[wd0b5]
+ ld [wd11e],a
cp a,$C4 ;it's TM/HM
jp nc,GetMachineName
ld a,[H_LOADEDROMBANK]
@@ -8648,7 +8648,7 @@
jr .gotPtr
.otherEntries ; $378d
;2-7 = OTHER ENTRIES
- ld a,[$d0b7]
+ ld a,[wPredefBank]
ld [H_LOADEDROMBANK],a
ld [$2000],a
ld a,[W_LISTTYPE] ;VariousNames' entryID
@@ -8669,7 +8669,7 @@
ld h,a
ld a,[$ff96]
ld l,a
- ld a,[$d0b5]
+ ld a,[wd0b5]
ld b,a
ld c,0
.nextName
@@ -8685,14 +8685,14 @@
jr nz,.nextName
ld h,d
ld l,e
- ld de,$cd6d
+ ld de,wcd6d
ld bc,$0014
call CopyData
.gotPtr ; $37cd
ld a,e
- ld [$cf8d],a
+ ld [wcf8d],a
ld a,d
- ld [$cf8e],a
+ ld [wcf8e],a
pop de
pop bc
pop hl
@@ -8704,7 +8704,7 @@
GetItemPrice:: ; 37df (0:37df)
ld a, [H_LOADEDROMBANK]
push af
- ld a, [wListMenuID] ; $cf94
+ ld a, [wListMenuID] ; wListMenuID
cp $1
ld a, $1 ; hardcoded Bank
jr nz, .asm_37ed
@@ -8712,11 +8712,11 @@
.asm_37ed
ld [H_LOADEDROMBANK], a
ld [$2000], a
- ld hl, $cf8f
+ ld hl, wcf8f
ld a, [hli]
ld h, [hl]
ld l, a
- ld a, [$cf91]
+ ld a, [wcf91]
cp HM_01
jr nc, .asm_3812
ld bc, $3
@@ -8744,9 +8744,9 @@
ld [$2000], a
ret
-; copies a string from [de] to [$cf4b]
+; copies a string from [de] to [wcf4b]
CopyStringToCF4B:: ; 3826 (0:3826)
- ld hl, $cf4b
+ ld hl, wcf4b
; fall through
; copies a string from [de] to [hl]
@@ -8823,12 +8823,12 @@
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
.asm_3872
push hl
- ld a, [$d09b]
+ ld a, [wd09b]
and a
jr z, .asm_387c
call Func_716c6
.asm_387c
- FuncCoord 18, 16 ; $c4f2
+ FuncCoord 18, 16
ld hl, Coord
call HandleDownArrowBlinkTiming
pop hl
@@ -8846,7 +8846,7 @@
; (unlass in link battle) waits for A or B being pressed and outputs the scrolling sound effect
ManualTextScroll:: ; 3898 (0:3898)
- ld a, [W_ISLINKBATTLE] ; $d12b
+ ld a, [W_ISLINKBATTLE] ; W_ISLINKBATTLE
cp $4
jr z, .inLinkBattle
call WaitForTextScrollButtonPress
@@ -8900,21 +8900,21 @@
; This function is used to wait a short period after printing a letter to the
; screen unless the player presses the A/B button or the delay is turned off
-; through the [$d730] or [$d358] flags.
+; through the [wd730] or [wd358] flags.
PrintLetterDelay:: ; 38d3 (0:38d3)
- ld a,[$d730]
+ ld a,[wd730]
bit 6,a
ret nz
- ld a,[$d358]
+ ld a,[wd358]
bit 1,a
ret z
push hl
push de
push bc
- ld a,[$d358]
+ ld a,[wd358]
bit 0,a
jr z,.waitOneFrame
- ld a,[$d355]
+ ld a,[W_OPTIONS]
and a,$0f
ld [H_FRAMECOUNTER],a
jr .checkButtons
@@ -8961,8 +8961,8 @@
; Function to remove a pokemon from the party or the current box.
; wWhichPokemon determines the pokemon.
-; [$cf95] == 0 specifies the party.
-; [$cf95] != 0 specifies the current box.
+; [wcf95] == 0 specifies the party.
+; [wcf95] != 0 specifies the current box.
RemovePokemon:: ; 391f (0:391f)
ld hl, _RemovePokemon
ld b, BANK(_RemovePokemon)
@@ -9120,7 +9120,7 @@
ld [H_MULTIPLICAND+1], a
xor a
ld [H_MULTIPLICAND], a
- ld a, [W_CURENEMYLVL] ; $d127
+ ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL
ld [H_MULTIPLIER], a
call Multiply ; ((Base + IV) * 2 + ceil(Sqrt(stat exp)) / 4) * Level
ld a, [H_MULTIPLICAND]
@@ -9138,7 +9138,7 @@
cp $1
ld a, $5
jr nz, .notHPStat
- ld a, [W_CURENEMYLVL] ; $d127
+ ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL
ld b, a
ld a, [H_MULTIPLICAND+2]
add b
@@ -9277,7 +9277,7 @@
HandleMenuInput:: ; 3abe (0:3abe)
xor a
- ld [$d09b],a
+ ld [wd09b],a
HandleMenuInputPokemonSelection:: ; 3ac2 (0:3ac2)
ld a,[H_DOWNARROWBLINKCNT1]
@@ -9290,12 +9290,12 @@
ld [H_DOWNARROWBLINKCNT2],a ; blinking down arrow timing value 2
.loop1
xor a
- ld [$d08b],a ; counter for pokemon shaking animation
+ ld [W_SUBANIMTRANSFORM],a ; counter for pokemon shaking animation
call PlaceMenuCursor
call Delay3
.loop2
push hl
- ld a,[$d09b]
+ ld a,[wd09b]
and a ; is it a pokemon selection menu?
jr z,.getJoypadState
callba AnimatePartyMon ; shake mini sprite of selected pokemon
@@ -9325,7 +9325,7 @@
ret
.keyPressed
xor a
- ld [$cc4b],a
+ ld [wcc4b],a
ld a,[$ffb5]
ld b,a
bit 6,a ; pressed Up key?
@@ -9389,7 +9389,7 @@
ld a,[$ffb5]
ret
.noWrappingAround
- ld a,[$cc37]
+ ld a,[wcc37]
and a ; should we return if the user tried to go past the top or bottom?
jr z,.checkOtherKeys
jr .checkIfAButtonOrBButtonPressed
@@ -9543,7 +9543,7 @@
; The following code either enables or disables the automatic drawing of
; text boxes by DisplayTextID. Both functions cause DisplayTextID to wait
-; for a button press after displaying text (unless [$cc47] is set).
+; for a button press after displaying text (unless [wcc47] is set).
EnableAutoTextBoxDrawing:: ; 3c3c (0:3c3c)
xor a
@@ -9553,9 +9553,9 @@
ld a,$01
AutoTextBoxDrawingCommon:: ; 3c41 (0:3c41)
- ld [$cf0c],a ; control text box drawing
+ ld [wcf0c],a ; control text box drawing
xor a
- ld [$cc3c],a ; make DisplayTextID wait for button press
+ ld [wcc3c],a ; make DisplayTextID wait for button press
ret
PrintText:: ; 3c49 (0:3c49)
@@ -9562,7 +9562,7 @@
; given a pointer in hl, print the text there
push hl
ld a,1
- ld [$D125],a
+ ld [wd125],a
call DisplayTextBoxID
call UpdateSprites
call Delay3
@@ -9569,7 +9569,7 @@
pop hl
Func_3c59:: ; 3c59 (0:3c59)
FuncCoord 1,14
- ld bc,Coord ;$C4B9
+ ld bc,Coord
jp TextCommandProcessor
; converts a big-endian binary number into decimal and prints it
@@ -9861,7 +9861,7 @@
Func_3dbe:: ; 3dbe (0:3dbe)
call ClearSprites
ld a, $1
- ld [$cfcb], a
+ ld [wcfcb], a
call Func_3e08
call LoadScreenTilesFromBuffer2
call LoadTextBoxTilePatterns
@@ -9898,7 +9898,7 @@
GoPAL_SET_CF1C:: ; 3ded (0:3ded)
ld b,$ff
GoPAL_SET:: ; 3def (0:3def)
- ld a,[$cf1b]
+ ld a,[wcf1b]
and a
ret z
ld a,$45
@@ -9920,13 +9920,13 @@
ret
Func_3e08:: ; 3e08 (0:3e08)
- ld hl, $cfc4
+ ld hl, wcfc4
ld a, [hl]
push af
res 0, [hl]
push hl
xor a
- ld [W_SPRITESETID], a ; $d3a8
+ ld [W_SPRITESETID], a ; W_SPRITESETID
call DisableLCD
callba InitMapSprites
call EnableLCD
@@ -9940,13 +9940,13 @@
GiveItem::
; Give player quantity c of item b,
-; and copy the item's name to $cf4b.
+; and copy the item's name to wcf4b.
; Return carry on success.
ld a, b
- ld [$d11e], a
- ld [$cf91], a
+ ld [wd11e], a
+ ld [wcf91], a
ld a, c
- ld [$cf96], a
+ ld [wcf96], a
ld hl,wNumBagItems
call AddItemToInventory
ret nc
@@ -9958,11 +9958,11 @@
GivePokemon::
; Give the player monster b at level c.
ld a, b
- ld [$cf91], a
+ ld [wcf91], a
ld a, c
- ld [$d127], a
+ ld [W_CURENEMYLVL], a
xor a
- ld [$cc49], a
+ ld [wcc49], a
ld b, BANK(_GivePokemon)
ld hl, _GivePokemon
jp Bankswitch
@@ -10052,7 +10052,7 @@
ld a, [$ffee]
and a
jr nz, .asm_3edd
- ld a, [$cd3e]
+ ld a, [wTrainerEngageDistance]
ld [$2000], a
ld [H_LOADEDROMBANK], a
ld de, .asm_3eda
@@ -10079,12 +10079,12 @@
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
ld hl, PointerTable_3f22
call Func_3f0f
- ld hl, $cf11
+ ld hl, wcf11
set 0, [hl]
call DisplayTextID
Func_3f05:: ; 3f05 (0:3f05)
- ld hl, W_MAPTEXTPTR ; $d36c
+ ld hl, W_MAPTEXTPTR ; wd36c
ld a, [$ffec]
ld [hli], a
ld a, [$ffed]
@@ -10092,14 +10092,14 @@
ret
Func_3f0f:: ; 3f0f (0:3f0f)
- ld a, [W_MAPTEXTPTR] ; $d36c
+ ld a, [W_MAPTEXTPTR] ; wd36c
ld [$ffec], a
- ld a, [$d36d]
+ ld a, [W_MAPTEXTPTR + 1]
ld [$ffed], a
ld a, l
- ld [W_MAPTEXTPTR], a ; $d36c
+ ld [W_MAPTEXTPTR], a ; wd36c
ld a, h
- ld [$d36d], a
+ ld [W_MAPTEXTPTR + 1], a
ret
PointerTable_3f22:: ; 3f22 (0:3f22)
--- a/main.asm
+++ b/main.asm
@@ -11,13 +11,13 @@
Func_40b0::
; Reset player status on blackout.
xor a
- ld [$cf0b], a
- ld [$d700], a
+ ld [wcf0b], a
+ ld [wd700], a
ld [W_ISINBATTLE], a
- ld [$d35d], a
- ld [$cf10], a
+ ld [wd35d], a
+ ld [wcf10], a
ld [hJoyHeld], a
- ld [$cc57], a
+ ld [wcc57], a
ld [wFlags_0xcd60], a
ld [$ff9f], a
@@ -48,7 +48,7 @@
ld [wPlayerMoney + 2], a
.lostmoney
- ld hl, $d732
+ ld hl, wd732
set 2, [hl]
res 3, [hl]
set 6, [hl]
@@ -71,17 +71,17 @@
LoadMonData_:
-; Load monster [wWhichPokemon] from list [$cc49]:
+; Load monster [wWhichPokemon] from list [wcc49]:
; 0: partymon
; 1: enemymon
; 2: boxmon
; 3: daycaremon
-; Return monster id at $cf91 and its data at $cf98.
-; Also load base stats at $d0b8 for convenience.
+; Return monster id at wcf91 and its data at wcf98.
+; Also load base stats at W_MONHDEXNUM for convenience.
ld a, [W_DAYCAREMONDATA]
- ld [$cf91], a
- ld a, [$cc49]
+ ld [wcf91], a
+ ld a, [wcc49]
cp 3
jr z, .GetMonHeader
@@ -90,13 +90,13 @@
callab Func_39c37 ; get pokemon ID
.GetMonHeader
- ld a, [$cf91]
- ld [$d0b5], a ; input for GetMonHeader
+ ld a, [wcf91]
+ ld [wd0b5], a ; input for GetMonHeader
call GetMonHeader
ld hl, W_PARTYMON1DATA
ld bc, 44
- ld a, [$cc49]
+ ld a, [wcc49]
cp 1
jr c, .getMonEntry
@@ -116,7 +116,7 @@
call AddNTimes
.copyMonData
- ld de, $cf98
+ ld de, wcf98
ld bc, 44
jp CopyData
@@ -175,7 +175,7 @@
_UpdateSprites: ; 4c34 (1:4c34)
ld h, $c1
inc h
- ld a, $e ; $c20e
+ ld a, $e ; wSpriteStateData2 + $0e
.spriteLoop
ld l, a
sub $e
@@ -206,7 +206,7 @@
dec a
swap a
ld [$ff93], a ; $10 * sprite#
- ld a, [$cf17] ; some sprite offset?
+ ld a, [wcf17] ; some sprite offset?
ld b, a
ld a, [H_CURRENTSPRITEOFFSET]
cp b
@@ -219,9 +219,9 @@
Func_4c70:
nop
- ld h, $c100 / $100
+ ld h, wSpriteStateData1 / $100
ld a, [H_CURRENTSPRITEOFFSET]
- add $c100 % $100
+ add wSpriteStateData1 % $100
ld l, a
ld a, [hl]
@@ -470,11 +470,11 @@
; Give the player a
; level 20 Rhydon.
ld a, RHYDON
- ld [$cf91], a
+ ld [wcf91], a
ld a, 20
ld [W_CURENEMYLVL], a
xor a
- ld [$cc49], a
+ ld [wcc49], a
ld [W_CURMAP], a
call AddPokemonToParty
@@ -489,7 +489,7 @@
; When the battle ends,
; do it all again.
ld a, 1
- ld [$cfcb], a
+ ld [wcfcb], a
ld [H_AUTOBGTRANSFERENABLED], a
jr .loop
@@ -512,11 +512,11 @@
call Func_62ff
ld a,$19
call Predef
- ld hl,$D732
+ ld hl,wd732
bit 2,[hl]
res 2,[hl]
jr z,.next
- ld a,[$D71A]
+ ld a,[wd71a]
jr .next2
.next
bit 1,[hl]
@@ -526,12 +526,12 @@
ld a,0
.next2
ld b,a
- ld a,[$D72D]
+ ld a,[wd72d]
and a
jr nz,.next4
ld a,b
.next4
- ld hl,$D732
+ ld hl,wd732
bit 4,[hl]
ret nz
ld [wLastMap],a
@@ -538,7 +538,7 @@
ret
Func_62ff: ; 62ff (1:62ff)
- ld a, [$d72d]
+ ld a, [wd72d]
cp BATTLE_CENTER
jr nz, .asm_6314
ld hl, BattleCenterSpec1 ; $6428
@@ -557,7 +557,7 @@
ld hl, TradeCenterSpec2 ; $6440
jr .asm_6334
.asm_6326
- ld a, [$d732]
+ ld a, [wd732]
bit 1, a
jr nz, .asm_6346
bit 2, a
@@ -564,7 +564,7 @@
jr nz, .asm_6346
ld hl, FirstMapSpec ; $6420
.asm_6334
- ld de, W_CURMAP ; $d35e
+ ld de, W_CURMAP ; W_CURMAP
ld c, $7
.asm_6339
ld a, [hli]
@@ -573,12 +573,12 @@
dec c
jr nz, .asm_6339
ld a, [hli]
- ld [W_CURMAPTILESET], a ; $d367
+ ld [W_CURMAPTILESET], a ; W_CURMAPTILESET
xor a
jr .asm_63b3
.asm_6346
ld a, [wLastMap]
- ld hl, $d732
+ ld hl, wd732
bit 4, [hl]
jr nz, .asm_635b
bit 6, [hl]
@@ -587,17 +587,17 @@
ld a, [wLastBlackoutMap]
jr .asm_6391
.asm_635b
- ld hl, $d72d
+ ld hl, wd72d
res 4, [hl]
- ld a, [$d71d]
+ ld a, [wd71d]
ld b, a
- ld [W_CURMAP], a ; $d35e
- ld a, [$d71e]
+ ld [W_CURMAP], a ; W_CURMAP
+ ld a, [wd71e]
ld c, a
ld hl, DungeonWarpList ; $63bf
ld de, $0
ld a, $6
- ld [$d12f], a
+ ld [wd12f], a
.asm_6376
ld a, [hli]
cp b
@@ -609,7 +609,7 @@
cp c
jr z, .asm_6388
.asm_6381
- ld a, [$d12f]
+ ld a, [wd12f]
add e
ld e, a
jr .asm_6376
@@ -618,10 +618,10 @@
add hl, de
jr .asm_63a4
.asm_638e
- ld a, [$d71a]
+ ld a, [wd71a]
.asm_6391
ld b, a
- ld [W_CURMAP], a ; $d35e
+ ld [W_CURMAP], a ; W_CURMAP
ld hl, FlyWarpDataPtr ; $6448
.asm_6398
ld a, [hli]
@@ -636,7 +636,7 @@
ld h, [hl]
ld l, a
.asm_63a4
- ld de, $d35f
+ ld de, wd35f
ld c, $6
.asm_63a9
ld a, [hli]
@@ -645,12 +645,12 @@
dec c
jr nz, .asm_63a9
xor a
- ld [W_CURMAPTILESET], a ; $d367
+ ld [W_CURMAPTILESET], a ; W_CURMAPTILESET
.asm_63b3
- ld [$d4e2], a
- ld [$d4e3], a
+ ld [wd4e2], a
+ ld [wd4e3], a
ld a, $ff
- ld [$d42f], a
+ ld [wd42f], a
ret
INCLUDE "data/special_warps.asm"
@@ -670,7 +670,7 @@
ld a, [de]
cp $ff
ret z
- ld [$cf91], a
+ ld [wcf91], a
inc de
ld a, [de]
ld [W_CURENEMYLVL], a
@@ -707,7 +707,7 @@
ld a,$0c
call Predef ; subtract total price from money
ld a,$13
- ld [$d125],a
+ ld [wd125],a
call DisplayTextBoxID ; redraw money text box
and a
ret
@@ -717,7 +717,7 @@
cp a,ITEMLISTMENU
jp nz,DisplayListMenuIDLoop ; only rearrange item list menus
push hl
- ld hl,$cf8b
+ ld hl,wcf8b
ld a,[hli]
ld h,[hl]
ld l,a
@@ -734,7 +734,7 @@
pop hl
inc a
jp z,DisplayListMenuIDLoop ; ignore attempts to swap the Cancel menu item
- ld a,[$cc35] ; ID of item chosen for swapping (counts from 1)
+ ld a,[wcc35] ; ID of item chosen for swapping (counts from 1)
and a ; has the first item to swap already been chosen?
jr nz,.swapItems
; if not, set the currently selected item as the first item
@@ -743,7 +743,7 @@
ld b,a
ld a,[wListScrollOffset] ; index of top (visible) menu item within the list
add b
- ld [$cc35],a ; ID of item chosen for swapping (counts from 1)
+ ld [wcc35],a ; ID of item chosen for swapping (counts from 1)
ld c,20
call DelayFrames
jp DisplayListMenuIDLoop
@@ -754,16 +754,16 @@
ld a,[wListScrollOffset]
add b
ld b,a
- ld a,[$cc35] ; ID of item chosen for swapping (counts from 1)
+ ld a,[wcc35] ; ID of item chosen for swapping (counts from 1)
cp b ; is the currently selected item the same as the first item to swap?
jp z,DisplayListMenuIDLoop ; ignore attempts to swap an item with itself
dec a
- ld [$cc35],a ; ID of item chosen for swapping (counts from 1)
+ ld [wcc35],a ; ID of item chosen for swapping (counts from 1)
ld c,20
call DelayFrames
push hl
push de
- ld hl,$cf8b
+ ld hl,wcf8b
ld a,[hli]
ld h,[hl]
ld l,a
@@ -778,7 +778,7 @@
ld c,a
ld b,0
add hl,bc ; hl = address of currently selected item entry
- ld a,[$cc35] ; ID of item chosen for swapping (counts from 1)
+ ld a,[wcc35] ; ID of item chosen for swapping (counts from 1)
add a
add e
ld e,a
@@ -805,7 +805,7 @@
ld a,[$ff95]
ld [de],a ; put second item ID in first item slot
xor a
- ld [$cc35],a ; 0 means no item is currently being swapped
+ ld [wcc35],a ; 0 means no item is currently being swapped
pop de
pop hl
jp DisplayListMenuIDLoop
@@ -825,13 +825,13 @@
jr .done
.combineItemSlots
ld [hl],a ; put the sum in the second item slot
- ld hl,$cf8b
+ ld hl,wcf8b
ld a,[hli]
ld h,[hl]
ld l,a
dec [hl] ; decrease the number of items
ld a,[hl]
- ld [$d12a],a ; update number of items variable
+ ld [wd12a],a ; update number of items variable
cp a,1
jr nz,.skipSettingMaxMenuItemID
ld [wMaxMenuItem],a ; if the number of items is only one now, update the max menu item ID
@@ -857,7 +857,7 @@
ld [wCurrentMenuItem],a
.done
xor a
- ld [$cc35],a ; 0 means no item is currently being swapped
+ ld [wcc35],a ; 0 means no item is currently being swapped
pop de
pop hl
jp DisplayListMenuIDLoop
@@ -901,8 +901,8 @@
; function that performs initialization for DisplayTextID
DisplayTextIDInit: ; 7096 (1:7096)
xor a
- ld [$cf94],a
- ld a,[$cf0c]
+ ld [wListMenuID],a
+ ld a,[wcf0c]
bit 0,a
jr nz,.skipDrawingTextBoxBorder
ld a,[$ff8c] ; text ID (or sprite ID)
@@ -911,16 +911,16 @@
; if text ID is 0 (i.e. the start menu)
; Note that the start menu text border is also drawn in the function directly
; below this, so this seems unnecessary.
- ld a,[$d74b]
+ ld a,[wd74b]
bit 5,a ; does the player have the pokedex?
; start menu with pokedex
- FuncCoord 10, 0 ; $c3aa
+ FuncCoord 10, 0
ld hl,Coord
ld b,$0e
ld c,$08
jr nz,.drawTextBoxBorder
; start menu without pokedex
- FuncCoord 10, 0 ; $c3aa
+ FuncCoord 10, 0
ld hl,Coord
ld b,$0c
ld c,$08
@@ -927,7 +927,7 @@
jr .drawTextBoxBorder
; if text ID is not 0 (i.e. not the start menu) then do a standard dialogue text box
.notStartMenu
- FuncCoord 0, 12 ; $c490
+ FuncCoord 0, 12
ld hl,Coord
ld b,$04
ld c,$12
@@ -934,7 +934,7 @@
.drawTextBoxBorder
call TextBoxBorder
.skipDrawingTextBoxBorder
- ld hl,$cfc4
+ ld hl,wcfc4
set 0,[hl]
ld hl,wFlags_0xcd60
bit 4,[hl]
@@ -945,7 +945,7 @@
; loop to copy C1X9 (direction the sprite is facing) to C2X9 for each sprite
; this is done because when you talk to an NPC, they turn to look your way
; the original direction they were facing must be restored after the dialogue is over
- ld hl,$c119
+ ld hl,wSpriteStateData1 + $19
ld c,$0f
ld de,$0010
.spriteFacingDirectionCopyLoop
@@ -958,7 +958,7 @@
jr nz,.spriteFacingDirectionCopyLoop
; loop to force all the sprites in the middle of animation to stand still
; (so that they don't like they're frozen mid-step during the dialogue)
- ld hl,$c102
+ ld hl,wSpriteStateData1 + 2
ld de,$0010
ld c,e
.spriteStandStillLoop
@@ -983,16 +983,16 @@
; function that displays the start menu
DrawStartMenu: ; 710b (1:710b)
- ld a,[$d74b]
+ ld a,[wd74b]
bit 5,a ; does the player have the pokedex?
; menu with pokedex
- FuncCoord 10, 0 ; $c3aa
+ FuncCoord 10, 0
ld hl,Coord
ld b,$0e
ld c,$08
jr nz,.drawTextBoxBorder
; shorter menu if the player doesn't have the pokedex
- FuncCoord 10, 0 ; $c3aa
+ FuncCoord 10, 0
ld hl,Coord
ld b,$0c
ld c,$08
@@ -999,21 +999,21 @@
.drawTextBoxBorder
call TextBoxBorder
ld a,%11001011 ; bit mask for down, up, start, B, and A buttons
- ld [$cc29],a
+ ld [wMenuWatchedKeys],a
ld a,$02
- ld [$cc24],a ; Y position of first menu choice
+ ld [wTopMenuItemY],a ; Y position of first menu choice
ld a,$0b
- ld [$cc25],a ; X position of first menu choice
- ld a,[$cc2d] ; remembered menu selection from last time
- ld [$cc26],a
- ld [$cc2a],a
+ ld [wTopMenuItemX],a ; X position of first menu choice
+ ld a,[wcc2d] ; remembered menu selection from last time
+ ld [wCurrentMenuItem],a
+ ld [wLastMenuItem],a
xor a
- ld [$cc37],a
- ld hl,$d730
+ ld [wcc37],a
+ ld hl,wd730
set 6,[hl] ; no pauses between printing each letter
- FuncCoord 12, 2 ; $c3d4
+ FuncCoord 12, 2
ld hl,Coord
- ld a,[$d74b]
+ ld a,[wd74b]
bit 5,a ; does the player have the pokedex?
; case for not having pokdex
ld a,$06
@@ -1023,7 +1023,7 @@
call PrintStartMenuItem
ld a,$07
.storeMenuItemCount
- ld [$cc28],a ; number of menu items
+ ld [wMaxMenuItem],a ; number of menu items
ld de,StartMenuPokemonText
call PrintStartMenuItem
ld de,StartMenuItemText
@@ -1030,7 +1030,7 @@
call PrintStartMenuItem
ld de,W_PLAYERNAME ; player's name
call PrintStartMenuItem
- ld a,[$d72e]
+ ld a,[wd72e]
bit 6,a ; is the player using the link feature?
; case for not using link feature
ld de,StartMenuSaveText
@@ -1043,7 +1043,7 @@
call PrintStartMenuItem
ld de,StartMenuExitText
call PlaceString
- ld hl,$d730
+ ld hl,wd730
res 6,[hl] ; turn pauses between printing letters back on
ret
@@ -1080,9 +1080,9 @@
; function to draw various text boxes
; INPUT:
-; [$D125] = text box ID
+; [wd125] = text box ID
DisplayTextBoxID_: ; 72ea (1:72ea)
- ld a,[$d125] ; a = text box ID
+ ld a,[wd125] ; a = text box ID
cp a,$14
jp z,DisplayYesNoTextBox
ld c,a
@@ -1119,14 +1119,14 @@
call TextBoxBorder
pop hl
call GetTextBoxIDText
- ld a,[$d730]
+ ld a,[wd730]
push af
- ld a,[$d730]
+ ld a,[wd730]
set 6,a ; no pauses between printing each letter
- ld [$d730],a
+ ld [wd730],a
call PlaceString
pop af
- ld [$d730],a
+ ld [wd730],a
call UpdateSprites ; move sprites
ret
@@ -1349,22 +1349,22 @@
next "キャンセル@"
Func_74ba: ; 74ba (1:74ba)
- ld hl, $d730
+ ld hl, wd730
set 6, [hl]
ld a, $f
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
- FuncCoord 13, 1 ; $c3c1
+ FuncCoord 13, 1
ld hl, Coord
ld b, $1
ld c, $6
call ClearScreenArea
- FuncCoord 12, 1 ; $c3c0
+ FuncCoord 12, 1
ld hl, Coord
- ld de, wPlayerMoney ; $d347
+ ld de, wPlayerMoney ; wPlayerMoney
ld c, $a3
call PrintBCDNumber
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
ret
@@ -1372,29 +1372,29 @@
db " ¥@"
Func_74ea: ; 74ea (1:74ea)
- ld a, [$d730]
+ ld a, [wd730]
set 6, a
- ld [$d730], a
+ ld [wd730], a
xor a
- ld [$d12d], a
+ ld [wd12d], a
ld a, $e
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
ld a, $3
- ld [wMenuWatchedKeys], a ; $cc29
+ ld [wMenuWatchedKeys], a ; wMenuWatchedKeys
ld a, $2
- ld [wMaxMenuItem], a ; $cc28
+ ld [wMaxMenuItem], a ; wMaxMenuItem
ld a, $1
- ld [wTopMenuItemY], a ; $cc24
+ ld [wTopMenuItemY], a ; wTopMenuItemY
ld a, $1
- ld [wTopMenuItemX], a ; $cc25
+ ld [wTopMenuItemX], a ; wTopMenuItemX
xor a
- ld [wCurrentMenuItem], a ; $cc26
- ld [wLastMenuItem], a ; $cc2a
- ld [$cc37], a
- ld a, [$d730]
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld [wLastMenuItem], a ; wLastMenuItem
+ ld [wcc37], a
+ ld a, [wd730]
res 6, a
- ld [$d730], a
+ ld [wd730], a
call HandleMenuInput
call PlaceUnfilledArrowMenuCursor
bit 0, a
@@ -1402,58 +1402,58 @@
bit 1, a
jr z, .asm_7539
ld a, $2
- ld [$d12e], a
+ ld [wd12e], a
jr .asm_754c
.asm_7539
ld a, $1
- ld [$d12e], a
- ld a, [wCurrentMenuItem] ; $cc26
- ld [$d12d], a
+ ld [wd12e], a
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+ ld [wd12d], a
ld b, a
- ld a, [wMaxMenuItem] ; $cc28
+ ld a, [wMaxMenuItem] ; wMaxMenuItem
cp b
jr z, .asm_754c
ret
.asm_754c
ld a, $2
- ld [$d12e], a
- ld a, [wCurrentMenuItem] ; $cc26
- ld [$d12d], a
+ ld [wd12e], a
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+ ld [wd12d], a
scf
ret
DisplayYesNoTextBox: ; 7559 (1:7559)
push hl
- ld a, [$d730]
+ ld a, [wd730]
set 6, a
- ld [$d730], a
+ ld [wd730], a
xor a
- ld [$d12d], a
- ld [$d12e], a
+ ld [wd12d], a
+ ld [wd12e], a
ld a, $3
- ld [wMenuWatchedKeys], a ; $cc29
+ ld [wMenuWatchedKeys], a ; wMenuWatchedKeys
ld a, $1
- ld [wMaxMenuItem], a ; $cc28
+ ld [wMaxMenuItem], a ; wMaxMenuItem
ld a, b
- ld [wTopMenuItemY], a ; $cc24
+ ld [wTopMenuItemY], a ; wTopMenuItemY
ld a, c
- ld [wTopMenuItemX], a ; $cc25
+ ld [wTopMenuItemX], a ; wTopMenuItemX
xor a
- ld [wLastMenuItem], a ; $cc2a
- ld [$cc37], a
+ ld [wLastMenuItem], a ; wLastMenuItem
+ ld [wcc37], a
push hl
- ld hl, $d12c
+ ld hl, wd12c
bit 7, [hl]
res 7, [hl]
jr z, .asm_758d
inc a
.asm_758d
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
pop hl
push hl
push hl
call Func_763e
- ld a, [$d12c]
+ ld a, [wd12c]
ld hl, MenuStrings ; $7671
ld e, a
ld d, $0
@@ -1470,7 +1470,7 @@
ld d, h
pop hl
push de
- ld a, [$d12c]
+ ld a, [wd12c]
cp $5
jr nz, .asm_75b9
call Func_5ab3
@@ -1493,13 +1493,13 @@
pop hl
add hl, bc
call PlaceString
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
- ld a, [$d12c]
+ ld a, [wd12c]
cp $7
jr nz, .asm_7603
xor a
- ld [$d12c], a
+ ld [wd12c], a
ld a, [wFlags_0xcd60]
push af
push hl
@@ -1519,18 +1519,18 @@
jr .asm_760f
.asm_7603
xor a
- ld [$d12c], a
+ ld [wd12c], a
call HandleMenuInput
pop hl
bit 1, a
jr nz, .asm_7627
.asm_760f
- ld a, [wCurrentMenuItem] ; $cc26
- ld [$d12d], a
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
+ ld [wd12d], a
and a
jr nz, .asm_7627
ld a, $1
- ld [$d12e], a
+ ld [wd12e], a
ld c, $f
call DelayFrames
call Func_7656
@@ -1538,10 +1538,10 @@
ret
.asm_7627
ld a, $1
- ld [wCurrentMenuItem], a ; $cc26
- ld [$d12d], a
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld [wd12d], a
ld a, $2
- ld [$d12e], a
+ ld [wd12e], a
ld c, $f
call DelayFrames
call Func_7656
@@ -1549,7 +1549,7 @@
ret
Func_763e: ; 763e (1:763e)
- ld de, $cee9
+ ld de, wHPBarMaxHP
ld bc, $506
.asm_7644
ld a, [hli]
@@ -1567,7 +1567,7 @@
ret
Func_7656: ; 7656 (1:7656)
- ld de, $cee9
+ ld de, wHPBarMaxHP
ld bc, $506
.asm_765c
ld a, [de]
@@ -1620,7 +1620,7 @@
Func_76e1: ; 76e1 (1:36e1)
xor a
- ld hl, wWhichTrade ; $cd3d
+ ld hl, wWhichTrade ; wWhichTrade
ld [hli], a
ld [hli], a
ld [hli], a
@@ -1628,10 +1628,10 @@
ld [hli], a
ld [hl], $c
call GetMonFieldMoves
- ld a, [$cd41]
+ ld a, [wTrainerScreenX]
and a
jr nz, .asm_770f
- FuncCoord 11, 11 ; $c487
+ FuncCoord 11, 11
ld hl, Coord
ld b, $5
ld c, $7
@@ -1639,15 +1639,15 @@
call UpdateSprites
ld a, $c
ld [$fff7], a
- FuncCoord 13, 12 ; $c49d
+ FuncCoord 13, 12
ld hl, Coord
ld de, PokemonMenuEntries ; $77c2
jp PlaceString
.asm_770f
push af
- FuncCoord 0, 11 ; $c47c
+ FuncCoord 0, 11
ld hl, Coord
- ld a, [$cd42]
+ ld a, [wcd42]
dec a
ld e, a
ld d, $0
@@ -1669,22 +1669,22 @@
inc b
call TextBoxBorder
call UpdateSprites
- FuncCoord 0, 12 ; $c490
+ FuncCoord 0, 12
ld hl, Coord
- ld a, [$cd42]
+ ld a, [wcd42]
inc a
ld e, a
ld d, $0
add hl, de
ld de, $ffd8
- ld a, [$cd41]
+ ld a, [wTrainerScreenX]
.asm_7747
add hl, de
dec a
jr nz, .asm_7747
xor a
- ld [$cd41], a
- ld de, wWhichTrade ; $cd3d
+ ld [wTrainerScreenX], a
+ ld de, wWhichTrade ; wWhichTrade
.asm_7752
push hl
ld hl, FieldMoveNames ; $778d
@@ -1715,11 +1715,11 @@
jr .asm_7752
.asm_7776
pop hl
- ld a, [$cd42]
+ ld a, [wcd42]
ld [$fff7], a
- FuncCoord 0, 12 ; $c490
+ FuncCoord 0, 12
ld hl, Coord
- ld a, [$cd42]
+ ld a, [wcd42]
inc a
ld e, a
ld d, $0
@@ -1744,14 +1744,14 @@
next "CANCEL@"
GetMonFieldMoves: ; 77d6 (1:77d6)
- ld a, [wWhichPokemon] ; $cf92
- ld hl, W_PARTYMON1_MOVE1 ; $d173
+ ld a, [wWhichPokemon] ; wWhichPokemon
+ ld hl, W_PARTYMON1_MOVE1 ; W_PARTYMON1_MOVE1
ld bc, $2c
call AddNTimes
ld d, h
ld e, l
ld c, $5
- ld hl, wWhichTrade ; $cd3d
+ ld hl, wWhichTrade ; wWhichTrade
.asm_77e9
push hl
.asm_77ea
@@ -1774,21 +1774,21 @@
jr .asm_77f6
.asm_7802
ld a, b
- ld [$cd43], a
+ ld [wcd43], a
ld a, [hli]
ld b, [hl]
pop hl
ld [hli], a
- ld a, [$cd41]
+ ld a, [wTrainerScreenX]
inc a
- ld [$cd41], a
- ld a, [$cd42]
+ ld [wTrainerScreenX], a
+ ld a, [wcd42]
cp b
jr c, .asm_781b
ld a, b
- ld [$cd42], a
+ ld [wcd42], a
.asm_781b
- ld a, [$cd43]
+ ld a, [wcd43]
ld b, a
jr .asm_77e9
.asm_7821
@@ -1819,16 +1819,16 @@
INCLUDE "engine/menu/players_pc.asm"
_RemovePokemon: ; 7b68 (1:7b68)
- ld hl, W_NUMINPARTY ; $d163
- ld a, [$cf95]
+ ld hl, W_NUMINPARTY ; W_NUMINPARTY
+ ld a, [wcf95]
and a
jr z, .asm_7b74
- ld hl, W_NUMINBOX ; $da80
+ ld hl, W_NUMINBOX ; wda80
.asm_7b74
ld a, [hl]
dec a
ld [hli], a
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
ld c, a
ld b, $0
add hl, bc
@@ -1841,17 +1841,17 @@
ld [hli], a
inc a
jr nz, .asm_7b81
- ld hl, W_PARTYMON1OT ; $d273
+ ld hl, W_PARTYMON1OT ; wd273
ld d, $5
- ld a, [$cf95]
+ ld a, [wcf95]
and a
jr z, .asm_7b97
ld hl, W_BOXMON1OT
ld d, $13
.asm_7b97
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
call SkipFixedLengthTextEntries
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
cp d
jr nz, .asm_7ba6
ld [hl], $ff
@@ -1861,26 +1861,26 @@
ld e, l
ld bc, $b
add hl, bc
- ld bc, W_PARTYMON1NAME ; $d2b5
- ld a, [$cf95]
+ ld bc, W_PARTYMON1NAME ; W_PARTYMON1NAME
+ ld a, [wcf95]
and a
jr z, .asm_7bb8
ld bc, W_BOXMON1NAME
.asm_7bb8
call CopyDataUntil
- ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA)
+ ld hl, W_PARTYMON1_NUM ; W_PARTYMON1_NUM (aliases: W_PARTYMON1DATA)
ld bc, $2c
- ld a, [$cf95]
+ ld a, [wcf95]
and a
jr z, .asm_7bcd
ld hl, W_BOXMON1DATA
ld bc, $21
.asm_7bcd
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
call AddNTimes
ld d, h
ld e, l
- ld a, [$cf95]
+ ld a, [wcf95]
and a
jr z, .asm_7be4
ld bc, $21
@@ -1890,36 +1890,36 @@
.asm_7be4
ld bc, $2c
add hl, bc
- ld bc, W_PARTYMON1OT ; $d273
+ ld bc, W_PARTYMON1OT ; wd273
.asm_7beb
call CopyDataUntil
- ld hl, W_PARTYMON1NAME ; $d2b5
- ld a, [$cf95]
+ ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
+ ld a, [wcf95]
and a
jr z, .asm_7bfa
ld hl, W_BOXMON1NAME
.asm_7bfa
ld bc, $b
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
call AddNTimes
ld d, h
ld e, l
ld bc, $b
add hl, bc
- ld bc, wPokedexOwned ; $d2f7
- ld a, [$cf95]
+ ld bc, wPokedexOwned ; wPokedexOwned
+ ld a, [wcf95]
and a
jr z, .asm_7c15
- ld bc, $dee2
+ ld bc, wdee2
.asm_7c15
jp CopyDataUntil
Func_7c18: ; 7c18 (1:7c18)
- ld hl, $d730
+ ld hl, wd730
set 6, [hl]
ld a, $3d
call Predef
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
call ReloadMapData
ld c, $a
@@ -1926,7 +1926,7 @@
call DelayFrames
ld a, $3a
call Predef
- ld a, [$d11e]
+ ld a, [wd11e]
dec a
ld c, a
ld b, $1
@@ -1934,7 +1934,7 @@
ld a, $10
call Predef
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
ret
@@ -1956,7 +1956,7 @@
ld [hJoyPressed], a
ld a, b
ld [hJoyHeldLast], a
- ld a, [$d730]
+ ld a, [wd730]
bit 5, a
jr nz, DiscardButtonPresses
ld a, [hJoyHeldLast]
@@ -2002,41 +2002,41 @@
ld [rWY], a ; $ff4a
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
- ld [$d13b], a
- ld [W_LONEATTACKNO], a ; $d05c
+ ld [wd13b], a
+ ld [W_LONEATTACKNO], a ; W_GYMLEADERNO
ld [hJoyPressed], a
ld [hJoyReleased], a
ld [hJoyHeld], a
- ld [$cd6a], a
- ld [$d5a3], a
- ld hl, $d73f
+ ld [wcd6a], a
+ ld [wd5a3], a
+ ld hl, wd73f
ld [hli], a
ld [hl], a
- ld hl, wWhichTrade ; $cd3d
+ ld hl, wWhichTrade ; wWhichTrade
ld bc, $1e
call FillMemory
ret
Func_c35f: ; c35f (3:435f)
- ld a, [$d3ae]
+ ld a, [wd3ae]
and a
ret z
ld c, a
- ld hl, $d3af
+ ld hl, wd3af
.asm_c368
- ld a, [W_YCOORD] ; $d361
+ ld a, [W_YCOORD] ; wd361
cp [hl]
jr nz, .asm_c383
inc hl
- ld a, [W_XCOORD] ; $d362
+ ld a, [W_XCOORD] ; wd362
cp [hl]
jr nz, .asm_c384
inc hl
ld a, [hli]
- ld [$d42f], a
+ ld [wd42f], a
ld a, [hl]
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
- ld hl, $d736
+ ld hl, wd736
set 2, [hl]
ret
.asm_c383
@@ -2050,7 +2050,7 @@
ret
CheckForceBikeOrSurf: ; c38b (3:438b)
- ld hl, $D732
+ ld hl, wd732
bit 5, [hl]
ret nz
ld hl, ForcedBikeOrSurfMaps
@@ -2083,11 +2083,11 @@
ld [W_SEAFOAMISLANDS5CURSCRIPT], a
jr z, .forceSurfing
;force bike riding
- ld hl, $d732
+ ld hl, wd732
set 5, [hl]
ld a, $1
- ld [$d700], a
- ld [$d11a], a
+ ld [wd700], a
+ ld [wd11a], a
jp ForceBikeOrSurf
.incorrectMap
inc hl
@@ -2096,8 +2096,8 @@
jr .loop
.forceSurfing
ld a, $2
- ld [$d700], a
- ld [$d11a], a
+ ld [wd700], a
+ ld [wd11a], a
jp ForceBikeOrSurf
INCLUDE "data/force_bike_surf.asm"
@@ -2106,7 +2106,7 @@
push hl
push de
push bc
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
srl a
ld c, a
ld b, $0
@@ -2115,9 +2115,9 @@
ld a, [hli]
ld h, [hl]
ld l, a
- ld a, [W_YCOORD] ; $d361
+ ld a, [W_YCOORD] ; wd361
ld b, a
- ld a, [W_XCOORD] ; $d362
+ ld a, [W_XCOORD] ; wd362
ld c, a
ld de, .asm_c41e ; $441e
push de
@@ -2135,7 +2135,7 @@
dw .asm_4440
.asm_c42a
- ld a, [W_CURMAPHEIGHT] ; $d368
+ ld a, [W_CURMAPHEIGHT] ; wd368
add a
dec a
cp b
@@ -2155,7 +2155,7 @@
jr .resetCarry
.asm_4440
- ld a, [W_CURMAPWIDTH] ; $d369
+ ld a, [W_CURMAPWIDTH] ; wd369
add a
dec a
cp c
@@ -2173,10 +2173,10 @@
push de
push bc
call Func_c589
- ld a, [W_CURMAP] ; $d35e
+ ld a, [W_CURMAP] ; W_CURMAP
cp SS_ANNE_5
jr z, .ssAnne5
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
srl a
ld c, a
ld b, $0
@@ -2185,7 +2185,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- ld a, [$cfc6]
+ ld a, [wcfc6]
ld de, $1
call IsInArray
.asm_c473
@@ -2213,7 +2213,7 @@
db $0F,$4E,$FF
.ssAnne5
- ld a, [$cfc6]
+ ld a, [wcfc6]
cp $15
jr nz, .asm_c49a
scf
@@ -2228,7 +2228,7 @@
push bc
callba HandleDoors
jr c, .asm_c4c8
- ld a, [W_CURMAPTILESET] ; $d367
+ ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
add a
ld c, a
ld b, $0
@@ -2238,11 +2238,11 @@
ld h, [hl]
ld l, a
ld de, $1
- FuncCoord 8, 9 ; $c45c
+ FuncCoord 8, 9
ld a, [Coord]
call IsInArray
jr nc, .asm_c4c8
- ld hl, $d736
+ ld hl, wd736
res 2, [hl]
.asm_c4c8
pop bc
@@ -2253,7 +2253,7 @@
INCLUDE "data/warp_tile_ids.asm"
PrintSafariZoneSteps: ; c52f (3:452f)
- ld a, [W_CURMAP] ; $d35e
+ ld a, [W_CURMAP] ; W_CURMAP
cp SAFARI_ZONE_EAST
ret c
cp UNKNOWN_DUNGEON_2
@@ -2262,30 +2262,30 @@
ld b, $3
ld c, $7
call TextBoxBorder
- FuncCoord 1, 1 ; $c3b5
+ FuncCoord 1, 1
ld hl, Coord
- ld de, wSafariSteps ; $d70d
+ ld de, wSafariSteps ; wd70d
ld bc, $203
call PrintNumber
- FuncCoord 4, 1 ; $c3b8
+ FuncCoord 4, 1
ld hl, Coord
ld de, SafariSteps ; $4579
call PlaceString
- FuncCoord 1, 3 ; $c3dd
+ FuncCoord 1, 3
ld hl, Coord
ld de, SafariBallText
call PlaceString
- ld a, [W_NUMSAFARIBALLS] ; $da47
+ ld a, [W_NUMSAFARIBALLS] ; W_NUMSAFARIBALLS
cp $a
jr nc, .asm_c56d
- FuncCoord 5, 3 ; $c3e1
+ FuncCoord 5, 3
ld hl, Coord
ld a, $7f
ld [hl], a
.asm_c56d
- FuncCoord 6, 3 ; $c3e2
+ FuncCoord 6, 3
ld hl, Coord
- ld de, W_NUMSAFARIBALLS ; $da47
+ ld de, W_NUMSAFARIBALLS ; W_NUMSAFARIBALLS
ld bc, $102
jp PrintNumber
@@ -2299,14 +2299,14 @@
call GetPredefRegisters
Func_c589: ; c589 (3:4589)
- ld a, [W_YCOORD] ; $d361
+ ld a, [W_YCOORD] ; wd361
ld d, a
- ld a, [W_XCOORD] ; $d362
+ ld a, [W_XCOORD] ; wd362
ld e, a
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
and a
jr nz, .asm_c59d
- FuncCoord 8, 11 ; $c484
+ FuncCoord 8, 11
ld a, [Coord]
inc d
jr .asm_c5b9
@@ -2313,7 +2313,7 @@
.asm_c59d
cp $4
jr nz, .asm_c5a7
- FuncCoord 8, 7 ; $c434
+ FuncCoord 8, 7
ld a, [Coord]
dec d
jr .asm_c5b9
@@ -2320,7 +2320,7 @@
.asm_c5a7
cp $8
jr nz, .asm_c5b1
- FuncCoord 6, 9 ; $c45a
+ FuncCoord 6, 9
ld a, [Coord]
dec e
jr .asm_c5b9
@@ -2327,27 +2327,27 @@
.asm_c5b1
cp $c
jr nz, .asm_c5b9
- FuncCoord 10, 9 ; $c45e
+ FuncCoord 10, 9
ld a, [Coord]
inc e
.asm_c5b9
ld c, a
- ld [$cfc6], a
+ ld [wcfc6], a
ret
Func_c5be: ; c5be (3:45be)
xor a
ld [$ffdb], a
- ld hl, W_YCOORD ; $d361
+ ld hl, W_YCOORD ; wd361
ld a, [hli]
ld d, a
ld e, [hl]
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
and a
jr nz, .asm_c5d8
ld hl, $ffdb
set 0, [hl]
- FuncCoord 8, 13 ; $c4ac
+ FuncCoord 8, 13
ld a, [Coord]
inc d
jr .asm_c603
@@ -2356,7 +2356,7 @@
jr nz, .asm_c5e7
ld hl, $ffdb
set 1, [hl]
- FuncCoord 8, 5 ; $c40c
+ FuncCoord 8, 5
ld a, [Coord]
dec d
jr .asm_c603
@@ -2365,7 +2365,7 @@
jr nz, .asm_c5f6
ld hl, $ffdb
set 2, [hl]
- FuncCoord 4, 9 ; $c458
+ FuncCoord 4, 9
ld a, [Coord]
dec e
jr .asm_c603
@@ -2374,18 +2374,18 @@
jr nz, .asm_c603
ld hl, $ffdb
set 3, [hl]
- FuncCoord 12, 9 ; $c460
+ FuncCoord 12, 9
ld a, [Coord]
inc e
.asm_c603
ld c, a
- ld [$d71c], a
- ld [$cfc6], a
+ ld [wd71c], a
+ ld [wcfc6], a
ret
Func_c60b: ; c60b (3:460b)
call Func_c5be
- ld hl, $d530
+ ld hl, W_TILESETCOLLISIONPTR
ld a, [hli]
ld h, [hl]
ld l, a
@@ -2399,31 +2399,31 @@
call Func_c44
ld a, $ff
jr c, .asm_c632
- ld a, [$d71c]
+ ld a, [wd71c]
cp $15
ld a, $ff
jr z, .asm_c632
call Func_c636
.asm_c632
- ld [$d71c], a
+ ld [wd71c], a
ret
Func_c636: ; c636 (3:4636)
- ld a, [$d718]
+ ld a, [wd718]
dec a
swap a
ld d, $0
ld e, a
- ld hl, $c214
+ ld hl, wSpriteStateData2 + $14
add hl, de
ld a, [hli]
ld [$ffdc], a
ld a, [hl]
ld [$ffdd], a
- ld a, [W_NUMSPRITES] ; $d4e1
+ ld a, [W_NUMSPRITES] ; W_NUMSPRITES
ld c, a
ld de, $f
- ld hl, $c214
+ ld hl, wSpriteStateData2 + $14
ld a, [$ffdb]
and $3
jr z, .asm_c678
@@ -2484,19 +2484,19 @@
ret
Func_c69c: ; c69c (3:469c)
- ld a, [$d730]
+ ld a, [wd730]
add a
jp c, .asm_c74f
- ld a, [W_NUMINPARTY] ; $d163
+ ld a, [W_NUMINPARTY] ; W_NUMINPARTY
and a
jp z, .asm_c74f
call Func_c8de
- ld a, [$d13b]
+ ld a, [wd13b]
and $3
jp nz, .asm_c74f
- ld [wWhichPokemon], a ; $cf92
- ld hl, W_PARTYMON1_STATUS ; $d16f
- ld de, W_PARTYMON1 ; $d164
+ ld [wWhichPokemon], a ; wWhichPokemon
+ ld hl, W_PARTYMON1_STATUS ; W_PARTYMON1_STATUS
+ ld de, W_PARTYMON1 ; W_PARTYMON1
.asm_c6be
ld a, [hl]
and $8
@@ -2525,10 +2525,10 @@
inc hl
ld [hl], a
ld a, [de]
- ld [$d11e], a
+ ld [wd11e], a
push de
- ld a, [wWhichPokemon] ; $cf92
- ld hl, W_PARTYMON1NAME ; $d2b5
+ ld a, [wWhichPokemon] ; wWhichPokemon
+ ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
call GetPartyMonName
xor a
ld [wJoyIgnore], a
@@ -2549,13 +2549,13 @@
ld bc, $2c
add hl, bc
push hl
- ld hl, wWhichPokemon ; $cf92
+ ld hl, wWhichPokemon ; wWhichPokemon
inc [hl]
pop hl
jr .asm_c6be
.asm_c70e
- ld hl, W_PARTYMON1_STATUS ; $d16f
- ld a, [W_NUMINPARTY] ; $d163
+ ld hl, W_PARTYMON1_STATUS ; W_PARTYMON1_STATUS
+ ld a, [W_NUMINPARTY] ; W_NUMINPARTY
ld d, a
ld e, $0
.asm_c717
@@ -2585,7 +2585,7 @@
ld a, $d1
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld hl, $d72e
+ ld hl, wd72e
set 5, [hl]
ld a, $ff
jr .asm_c750
@@ -2592,7 +2592,7 @@
.asm_c74f
xor a
.asm_c750
- ld [$d12d], a
+ ld [wd12d], a
ret
Func_c754: ; c754 (3:4754)
@@ -2599,7 +2599,7 @@
call GetPredefRegisters
push hl
ld d, $0
- ld a, [W_CURMAPTILESET] ; $d367
+ ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
add a
add a
ld b, a
@@ -2611,7 +2611,7 @@
ld e, a
ld hl, Tilesets
add hl, de
- ld de, $d52b
+ ld de, W_TILESETBANK
ld c, $b
.asm_c76f
ld a, [hli]
@@ -2624,7 +2624,7 @@
xor a
ld [$ffd8], a
pop hl
- ld a, [W_CURMAPTILESET] ; $d367
+ ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
push hl
push de
ld hl, DungeonTilesets ; $47b2
@@ -2633,22 +2633,22 @@
pop de
pop hl
jr c, .asm_c797
- ld a, [W_CURMAPTILESET] ; $d367
+ ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
ld b, a
ld a, [H_DOWNARROWBLINKCNT1] ; $ff8b
cp b
jr z, .asm_c7b1
.asm_c797
- ld a, [$d42f]
+ ld a, [wd42f]
cp $ff
jr z, .asm_c7b1
call LoadDestinationWarpPosition
- ld a, [W_YCOORD] ; $d361
+ ld a, [W_YCOORD] ; wd361
and $1
- ld [W_YBLOCKCOORD], a ; $d363
- ld a, [W_XCOORD] ; $d362
+ ld [W_YBLOCKCOORD], a ; wd363
+ ld a, [W_XCOORD] ; wd362
and $1
- ld [W_XBLOCKCOORD], a ; $d364
+ ld [W_XBLOCKCOORD], a ; wd364
.asm_c7b1
ret
@@ -2660,7 +2660,7 @@
ld a, [W_DAYCARE_IN_USE]
and a
ret z
- ld hl, $da6f
+ ld hl, wda6f
inc [hl]
ret nz
dec hl
@@ -2678,7 +2678,7 @@
INCLUDE "data/hide_show_data.asm"
PrintUsedStrengthText: ; cd99 (3:4d99)
- ld hl, $d728
+ ld hl, wd728
set 0, [hl]
ld hl, UsedStrengthText
call PrintText
@@ -2688,7 +2688,7 @@
UsedStrengthText: ; cdaa (3:4daa)
TX_FAR _UsedStrengthText
db $08 ; asm
- ld a, [$cf91]
+ ld a, [wcf91]
call PlayCry
call Delay3
jp TextScriptEnd
@@ -2698,15 +2698,15 @@
db "@"
CheckForForcedBikeSurf: ; cdc0 (3:4dc0)
- ld hl, $d728
+ ld hl, wd728
set 1, [hl]
- ld a, [$d732]
+ ld a, [wd732]
bit 5, a
jr nz, .asm_cdec
- ld a, [W_CURMAP] ; $d35e
+ ld a, [W_CURMAP] ; W_CURMAP
cp SEAFOAM_ISLANDS_5
ret nz
- ld a, [$d881]
+ ld a, [wd881]
and $3
cp $3
ret z
@@ -2713,12 +2713,12 @@
ld hl, CoordsData_cdf7 ; $4df7
call ArePlayerCoordsInArray
ret nc
- ld hl, $d728
+ ld hl, wd728
res 1, [hl]
ld hl, CurrentTooFastText
jp PrintText
.asm_cdec
- ld hl, $d728
+ ld hl, wd728
res 1, [hl]
ld hl, CyclingIsFunText
jp PrintText
@@ -2737,11 +2737,11 @@
; function to add an item (in varying quantities) to the player's bag or PC box
; INPUT:
; hl = address of inventory (either wNumBagItems or wNumBoxItems)
-; [$CF91] = item ID
-; [$CF96] = item quantity
+; [wcf91] = item ID
+; [wcf96] = item quantity
; sets carry flag if successful, unsets carry flag if unsuccessful
AddItemToInventory_: ; ce04 (3:4e04)
- ld a,[$cf96] ; a = item quantity
+ ld a,[wcf96] ; a = item quantity
push af
push bc
push de
@@ -2766,7 +2766,7 @@
.loop
ld a,[hli]
ld b,a ; b = ID of current item in table
- ld a,[$cf91] ; a = ID of item being added
+ ld a,[wcf91] ; a = ID of item being added
cp b ; does the current item in the table match the item being added?
jp z,.increaseItemQuantity ; if so, increase the item's quantity
inc hl
@@ -2786,14 +2786,14 @@
ld c,a
ld b,0
add hl,bc ; hl = address to store the item
- ld a,[$cf91]
+ ld a,[wcf91]
ld [hli],a ; store item ID
- ld a,[$cf96]
+ ld a,[wcf96]
ld [hli],a ; store item quantity
ld [hl],$ff ; store terminator
jp .success
.increaseItemQuantity ; increase the quantity of an item already in the inventory
- ld a,[$cf96]
+ ld a,[wcf96]
ld b,a ; b = quantity to add
ld a,[hl] ; a = existing item quantity
add b ; a = new item quantity
@@ -2802,7 +2802,7 @@
; if the new quantity is greater than or equal to 100,
; try to max out the current slot and add the rest in a new slot
sub a,99
- ld [$cf96],a ; a = amount left over (to put in the new slot)
+ ld [wcf96],a ; a = amount left over (to put in the new slot)
ld a,d
and a ; is there room for a new item slot?
jr z,.increaseItemQuantityFailed
@@ -2825,14 +2825,14 @@
pop bc
pop bc
ld a,b
- ld [$cf96],a ; restore the initial value from when the function was called
+ ld [wcf96],a ; restore the initial value from when the function was called
ret
; function to remove an item (in varying quantities) from the player's bag or PC box
; INPUT:
; hl = address of inventory (either wNumBagItems or wNumBoxItems)
-; [$CF92] = index (within the inventory) of the item to remove
-; [$CF96] = quantity to remove
+; [wWhichPokemon] = index (within the inventory) of the item to remove
+; [wcf96] = quantity to remove
RemoveItemFromInventory_: ; ce74 (3:4e74)
push hl
inc hl
@@ -2844,12 +2844,12 @@
inc h
.noCarry
inc hl
- ld a,[$cf96] ; quantity being removed
+ ld a,[wcf96] ; quantity being removed
ld e,a
ld a,[hl] ; a = current quantity
sub e
ld [hld],a ; store new quantity
- ld [$cf97],a
+ ld [wcf97],a
and a
jr nz,.skipMovingUpSlots
; if the remaining quantity is 0,
@@ -2869,13 +2869,13 @@
xor a
ld [wListScrollOffset],a
ld [wCurrentMenuItem],a
- ld [$cc2c],a
- ld [$d07e],a
+ ld [wcc2c],a
+ ld [wd07e],a
pop hl
ld a,[hl] ; a = number of items in inventory
dec a ; decrement the number of items
ld [hl],a ; store new number of items
- ld [$d12a],a
+ ld [wd12a],a
cp a,2
jr c,.done
ld [wMaxMenuItem],a
@@ -2931,20 +2931,20 @@
; Instead of removing relevant code, the name graphics were erased.
; Tile ids for face/badge graphics.
- ld de, $cd3f
+ ld de, wTrainerFacingDirection
ld hl, .FaceBadgeTiles
ld bc, 8
call CopyData
; Booleans for each badge.
- ld hl, $cd49
+ ld hl, wcd49
ld bc, 8
xor a
call FillMemory
; Alter these based on owned badges.
- ld de, $cd49
- ld hl, $cd3f
+ ld de, wcd49
+ ld hl, wTrainerFacingDirection
ld a, [W_OBTAINEDBADGES]
ld b, a
ld c, 8
@@ -2963,7 +2963,7 @@
jr nz, .CheckBadge
; Draw two rows of badges.
- ld hl, $cd3d
+ ld hl, wWhichTrade
ld a, $d8 ; [1]
ld [hli], a
ld [hl], $60 ; First name
@@ -2970,12 +2970,12 @@
FuncCoord 2, 11
ld hl, Coord
- ld de, $cd49
+ ld de, wcd49
call .DrawBadgeRow
FuncCoord 2, 14
ld hl, Coord
- ld de, $cd49 + 4
+ ld de, wcd49 + 4
; call .DrawBadgeRow
; ret
@@ -2988,15 +2988,15 @@
push hl
; Badge no.
- ld a, [$cd3d]
+ ld a, [wWhichTrade]
ld [hli], a
inc a
- ld [$cd3d], a
+ ld [wWhichTrade], a
; Names aren't printed if the badge is owned.
ld a, [de]
and a
- ld a, [$cd3e]
+ ld a, [wTrainerEngageDistance]
jr nz, .SkipName
call .PlaceTiles
jr .PlaceBadge
@@ -3007,10 +3007,10 @@
inc hl
.PlaceBadge
- ld [$cd3e], a
+ ld [wTrainerEngageDistance], a
ld de, 20 - 1
add hl, de
- ld a, [$cd3f]
+ ld a, [wTrainerFacingDirection]
call .PlaceTiles
add hl, de
call .PlaceTiles
@@ -3017,8 +3017,8 @@
; Shift badge array back one byte.
push bc
- ld hl, $cd3f + 1
- ld de, $cd3f
+ ld hl, wTrainerFacingDirection + 1
+ ld de, wTrainerFacingDirection
ld bc, 8
call CopyData
pop bc
@@ -3048,8 +3048,8 @@
Func_ee9e: ; ee9e (3:6e9e)
call GetPredefRegisters
- ld hl, $c6e8
- ld a, [W_CURMAPWIDTH] ; $d369
+ ld hl, wOverworldMap
+ ld a, [W_CURMAPWIDTH] ; wd369
add $6
ld e, a
ld d, $0
@@ -3068,11 +3068,11 @@
jr nz, .asm_eeb7
.asm_eebb
add hl, bc
- ld a, [$d09f]
+ ld a, [wd09f]
ld [hl], a
- ld a, [$d35f]
+ ld a, [wd35f]
ld c, a
- ld a, [$d360]
+ ld a, [wd360]
ld b, a
call Func_ef4e
ret c
@@ -3090,7 +3090,7 @@
ret c
Func_eedc: ; eedc (3:6edc)
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
inc a
ret z
ld a, [H_AUTOBGTRANSFERENABLED] ; $ffba
@@ -3102,7 +3102,7 @@
ld [$ffd7], a
call LoadCurrentMapView
call GoPAL_SET_CF1C
- ld hl, $d526
+ ld hl, wd526
ld a, [hli]
ld h, [hl]
ld l, a
@@ -3112,9 +3112,9 @@
and $3
or $98
ld a, l
- ld [$cee9], a
+ ld [wHPBarMaxHP], a
ld a, h
- ld [$ceea], a
+ ld [wHPBarMaxHP + 1], a
ld a, $2
ld [$ffbe], a
ld c, $9
@@ -3122,7 +3122,7 @@
push bc
push hl
push hl
- ld hl, $c378
+ ld hl, wOAMBuffer + $78
ld de, $14
ld a, [$ffbe]
.asm_ef1a
@@ -3171,7 +3171,7 @@
INCLUDE "engine/overworld/cut.asm"
Func_f113: ; f113 (3:7113)
- ld a, [W_CURMAP] ; $d35e
+ ld a, [W_CURMAP] ; W_CURMAP
cp ROUTE_1
jr nc, .notInTown
ld c, a
@@ -3181,7 +3181,7 @@
call Predef
.notInTown
ld hl, MapHSPointers
- ld a, [W_CURMAP] ; $d35e
+ ld a, [W_CURMAP] ; W_CURMAP
ld b, $0
ld c, a
add hl, bc
@@ -3213,7 +3213,7 @@
ld [H_DIVISOR], a
ld b, $2
call Divide ; divide difference by 3, resulting in the global offset (number of missable items before ours)
- ld a, [W_CURMAP] ; $d35e
+ ld a, [W_CURMAP] ; W_CURMAP
ld b, a
ld a, [H_DIVIDEND+3]
ld c, a ; store global offset in c
@@ -3246,7 +3246,7 @@
call FillMemory ; clear missable objects flags
ld hl, MapHS00
xor a
- ld [$d048], a
+ ld [wd048], a
.missableObjectsLoop
ld a, [hli]
cp $ff ; end of list
@@ -3257,12 +3257,12 @@
cp Hide
jr nz, .asm_f19d
ld hl, W_MISSABLEOBJECTFLAGS
- ld a, [$d048]
+ ld a, [wd048]
ld c, a
ld b, $1
call MissableObjectFlagAction ; set flag iff Item is hidden
.asm_f19d
- ld hl, $d048
+ ld hl, wd048
inc [hl]
pop hl
inc hl
@@ -3296,10 +3296,10 @@
ret
; adds missable object (items, leg. pokemon, etc.) to the map
-; [$cc4d]: index of the missable object to be added (global index)
+; [wcc4d]: index of the missable object to be added (global index)
AddMissableObject: ; f1c8 (3:71c8)
ld hl, W_MISSABLEOBJECTFLAGS
- ld a, [$cc4d]
+ ld a, [wcc4d]
ld c, a
ld b, $0
call MissableObjectFlagAction ; reset "removed" flag
@@ -3306,10 +3306,10 @@
jp UpdateSprites
; removes missable object (items, leg. pokemon, etc.) from the map
-; [$cc4d]: index of the missable object to be removed (global index)
+; [wcc4d]: index of the missable object to be removed (global index)
RemoveMissableObject: ; f1d7 (3:71d7)
ld hl, W_MISSABLEOBJECTFLAGS
- ld a, [$cc4d]
+ ld a, [wcc4d]
ld c, a
ld b, $1
call MissableObjectFlagAction ; set "removed" flag
@@ -3386,7 +3386,7 @@
ret
Func_f225: ; f225 (3:7225)
- ld a, [$d728]
+ ld a, [wd728]
bit 0, a
ret z
ld a, [wFlags_0xcd60]
@@ -3396,10 +3396,10 @@
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call IsSpriteInFrontOfPlayer
ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c
- ld [$d718], a
+ ld [wd718], a
and a
jp z, Func_f2dd
- ld hl, $c101
+ ld hl, wSpriteStateData1 + 1
ld d, $0
ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c
swap a
@@ -3419,12 +3419,12 @@
ret z
ld a, $5a
call Predef ; indirect jump to Func_c60b (c60b (3:460b))
- ld a, [$d71c]
+ ld a, [wd71c]
and a
jp nz, Func_f2dd
ld a, [hJoyHeld]
ld b, a
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4
jr z, .asm_f289
cp $8
@@ -3470,7 +3470,7 @@
db $C0,$FF
Func_f2b5: ; f2b5 (3:72b5)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
callab Func_79f54
@@ -3478,7 +3478,7 @@
ld [wJoyIgnore], a
call Func_f2dd
set 7, [hl]
- ld a, [$d718]
+ ld a, [wd718]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call GetSpriteMovementByte2Pointer
ld [hl], $10
@@ -3492,11 +3492,11 @@
ret
_AddPokemonToParty: ; f2e5 (3:72e5)
- ld de, W_NUMINPARTY ; $d163
- ld a, [$cc49]
+ ld de, W_NUMINPARTY ; W_NUMINPARTY
+ ld a, [wcc49]
and $f
jr z, .asm_f2f2
- ld de, wEnemyPartyCount ; $d89c
+ ld de, wEnemyPartyCount ; wEnemyPartyCount
.asm_f2f2
ld a, [de]
inc a
@@ -3510,13 +3510,13 @@
jr nc, .asm_f300
inc d
.asm_f300
- ld a, [$cf91]
+ ld a, [wcf91]
ld [de], a
inc de
ld a, $ff
ld [de], a
- ld hl, W_PARTYMON1OT ; $d273
- ld a, [$cc49]
+ ld hl, W_PARTYMON1OT ; wd273
+ ld a, [wcc49]
and $f
jr z, .asm_f315
ld hl, W_ENEMYMON1OT
@@ -3526,26 +3526,26 @@
call SkipFixedLengthTextEntries
ld d, h
ld e, l
- ld hl, W_PLAYERNAME ; $d158
+ ld hl, W_PLAYERNAME ; wd158
ld bc, $b
call CopyData
- ld a, [$cc49]
+ ld a, [wcc49]
and a
jr nz, .asm_f33f
- ld hl, W_PARTYMON1NAME ; $d2b5
+ ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
ld a, [$ffe4]
dec a
call SkipFixedLengthTextEntries
ld a, $2
- ld [$d07d], a
+ ld [wd07d], a
ld a, $4e
call Predef ; indirect jump to Func_64eb (64eb (1:64eb))
.asm_f33f
- ld hl, W_PARTYMON1_NUM ; $d16b (aliases: W_PARTYMON1DATA)
- ld a, [$cc49]
+ ld hl, W_PARTYMON1_NUM ; W_PARTYMON1_NUM (aliases: W_PARTYMON1DATA)
+ ld a, [wcc49]
and $f
jr z, .asm_f34c
- ld hl, wEnemyMons ; $d8a4
+ ld hl, wEnemyMons ; wEnemyMon1Species
.asm_f34c
ld a, [$ffe4]
dec a
@@ -3554,8 +3554,8 @@
ld e, l
ld d, h
push hl
- ld a, [$cf91]
- ld [$d0b5], a
+ ld a, [wcf91]
+ ld [wd0b5], a
call GetMonHeader
ld hl, W_MONHEADER
ld a, [hli]
@@ -3563,26 +3563,26 @@
inc de
pop hl
push hl
- ld a, [$cc49]
+ ld a, [wcc49]
and $f
ld a, $98 ; set enemy trainer mon IVs to fixed average values
ld b, $88
jr nz, .writeFreshMonData
- ld a, [$cf91]
- ld [$d11e], a
+ ld a, [wcf91]
+ ld [wd11e], a
push de
ld a, $3a
call Predef ; indirect jump to IndexToPokedex (41010 (10:5010))
pop de
- ld a, [$d11e]
+ ld a, [wd11e]
dec a
ld c, a
ld b, $2
- ld hl, wPokedexOwned ; $d2f7
+ ld hl, wPokedexOwned ; wPokedexOwned
call FlagAction
ld a, c
- ld [$d153], a
- ld a, [$d11e]
+ ld [wd153], a
+ ld a, [wd11e]
dec a
ld c, a
ld b, $1
@@ -3589,11 +3589,11 @@
push bc
call FlagAction
pop bc
- ld hl, wPokedexSeen ; $d30a
+ ld hl, wPokedexSeen ; wd30a
call FlagAction
pop hl
push hl
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
and a
jr nz, .copyEnemyMonData
call Random ; generate random IVs
@@ -3673,7 +3673,7 @@
dec de
dec de
xor a
- ld [$cee9], a
+ ld [wHPBarMaxHP], a
ld a, $3e
call Predef ; indirect jump to WriteMonMoves (3afb8 (e:6fb8))
pop de
@@ -3709,13 +3709,13 @@
pop hl
call AddPokemonToParty_WriteMovePP
inc de
- ld a, [W_CURENEMYLVL] ; $d127
+ ld a, [W_CURENEMYLVL] ; W_CURENEMYLVL
ld [de], a
inc de
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
dec a
jr nz, .calcFreshStats
- ld hl, W_ENEMYMONMAXHP ; $cff4
+ ld hl, W_ENEMYMONMAXHP ; W_ENEMYMONMAXHP
ld bc, $a
call CopyData ; copy stats of cur enemy mon
pop hl
@@ -3746,13 +3746,13 @@
ld hl, Moves
ld bc, $6
call AddNTimes
- ld de, $cd6d
+ ld de, wcd6d
ld a, BANK(Moves)
call FarCopyData
pop bc
pop de
pop hl
- ld a, [$cd72] ; sixth move byte = pp
+ ld a, [wcd72] ; sixth move byte = pp
.empty
inc de
ld [de], a
@@ -3760,7 +3760,7 @@
jr nz, .pploop ; there are still moves to read
ret
-; adds enemy mon [$cf91] (at position [$cf92] in enemy list) to own party
+; adds enemy mon [wcf91] (at position [wWhichPokemon] in enemy list) to own party
; used in the cable club trade center
_AddEnemyMonToPlayerParty: ; f49d (3:749d)
ld hl, W_NUMINPARTY
@@ -3773,7 +3773,7 @@
ld c, a
ld b, $0
add hl, bc
- ld a, [$cf91]
+ ld a, [wcf91]
ld [hli], a ; add mon as last list entry
ld [hl], $ff ; write new sentinel
ld hl, W_PARTYMON1DATA
@@ -3783,8 +3783,8 @@
call AddNTimes
ld e, l
ld d, h
- ld hl, $cf98
- call CopyData ; write new mon's data (from $cf98)
+ ld hl, wcf98
+ call CopyData ; write new mon's data (from wcf98)
ld hl, W_PARTYMON1OT
ld a, [W_NUMINPARTY]
dec a
@@ -3807,11 +3807,11 @@
call SkipFixedLengthTextEntries
ld bc, $000b
call CopyData ; write new mon's nickname (from an enemy mon)
- ld a, [$cf91]
- ld [$d11e], a
+ ld a, [wcf91]
+ ld [wd11e], a
ld a, $3a
call Predef
- ld a, [$d11e]
+ ld a, [wd11e]
dec a
ld c, a
ld b, $1
@@ -3825,7 +3825,7 @@
ret ; return success
Func_f51e: ; f51e (3:751e)
- ld a, [$cf95]
+ ld a, [wcf95]
and a
jr z, .checkPartyMonSlots
cp $2
@@ -3833,13 +3833,13 @@
cp $3
ld hl, W_DAYCAREMONDATA
jr z, .asm_f575
- ld hl, W_NUMINBOX ; $da80
+ ld hl, W_NUMINBOX ; wda80
ld a, [hl]
cp $14
jr nz, .partyOrBoxNotFull
jr .boxFull
.checkPartyMonSlots
- ld hl, W_NUMINPARTY ; $d163
+ ld hl, W_NUMINPARTY ; W_NUMINPARTY
ld a, [hl]
cp $6
jr nz, .partyOrBoxNotFull
@@ -3852,23 +3852,23 @@
ld c, a
ld b, $0
add hl, bc
- ld a, [$cf95]
+ ld a, [wcf95]
cp $2
ld a, [W_DAYCAREMONDATA]
jr z, .asm_f556
- ld a, [$cf91]
+ ld a, [wcf91]
.asm_f556
ld [hli], a ; write new mon ID
ld [hl], $ff ; write new sentinel
- ld a, [$cf95]
+ ld a, [wcf95]
dec a
- ld hl, W_PARTYMON1DATA ; $d16b
+ ld hl, W_PARTYMON1DATA ; W_PARTYMON1_NUM
ld bc, W_PARTYMON2DATA - W_PARTYMON1DATA ; $2c
- ld a, [W_NUMINPARTY] ; $d163
+ ld a, [W_NUMINPARTY] ; W_NUMINPARTY
jr nz, .skipToNewMonEntry
ld hl, W_BOXMON1DATA
ld bc, W_BOXMON2DATA - W_BOXMON1DATA ; $21
- ld a, [W_NUMINBOX] ; $da80
+ ld a, [W_NUMINBOX] ; wda80
.skipToNewMonEntry
dec a
call AddNTimes
@@ -3876,7 +3876,7 @@
push hl
ld e, l
ld d, h
- ld a, [$cf95]
+ ld a, [wcf95]
and a
ld hl, W_BOXMON1DATA
ld bc, W_BOXMON2DATA - W_BOXMON1DATA ; $21
@@ -3884,10 +3884,10 @@
cp $2
ld hl, W_DAYCAREMONDATA
jr z, .asm_f597
- ld hl, W_PARTYMON1DATA ; $d16b
+ ld hl, W_PARTYMON1DATA ; W_PARTYMON1_NUM
ld bc, W_PARTYMON2DATA - W_PARTYMON1DATA ; $2c
.asm_f591
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
call AddNTimes
.asm_f597
push hl
@@ -3896,7 +3896,7 @@
call CopyData
pop de
pop hl
- ld a, [$cf95]
+ ld a, [wcf95]
and a
jr z, .asm_f5b4
cp $2
@@ -3909,16 +3909,16 @@
inc de
ld [de], a
.asm_f5b4
- ld a, [$cf95]
+ ld a, [wcf95]
cp $3
ld de, W_DAYCAREMONOT
jr z, .asm_f5d3
dec a
- ld hl, W_PARTYMON1OT ; $d273
- ld a, [W_NUMINPARTY] ; $d163
+ ld hl, W_PARTYMON1OT ; wd273
+ ld a, [W_NUMINPARTY] ; W_NUMINPARTY
jr nz, .asm_f5cd
ld hl, W_BOXMON1OT
- ld a, [W_NUMINBOX] ; $da80
+ ld a, [W_NUMINBOX] ; wda80
.asm_f5cd
dec a
call SkipFixedLengthTextEntries
@@ -3926,29 +3926,29 @@
ld e, l
.asm_f5d3
ld hl, W_BOXMON1OT
- ld a, [$cf95]
+ ld a, [wcf95]
and a
jr z, .asm_f5e6
ld hl, W_DAYCAREMONOT
cp $2
jr z, .asm_f5ec
- ld hl, W_PARTYMON1OT ; $d273
+ ld hl, W_PARTYMON1OT ; wd273
.asm_f5e6
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
call SkipFixedLengthTextEntries
.asm_f5ec
ld bc, $b
call CopyData
- ld a, [$cf95]
+ ld a, [wcf95]
cp $3
ld de, W_DAYCAREMONNAME
jr z, .asm_f611
dec a
- ld hl, W_PARTYMON1NAME ; $d2b5
- ld a, [W_NUMINPARTY] ; $d163
+ ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
+ ld a, [W_NUMINPARTY] ; W_NUMINPARTY
jr nz, .asm_f60b
ld hl, W_BOXMON1NAME
- ld a, [W_NUMINBOX] ; $da80
+ ld a, [W_NUMINBOX] ; wda80
.asm_f60b
dec a
call SkipFixedLengthTextEntries
@@ -3956,21 +3956,21 @@
ld e, l
.asm_f611
ld hl, W_BOXMON1NAME
- ld a, [$cf95]
+ ld a, [wcf95]
and a
jr z, .asm_f624
ld hl, W_DAYCAREMONNAME
cp $2
jr z, .asm_f62a
- ld hl, W_PARTYMON1NAME ; $d2b5
+ ld hl, W_PARTYMON1NAME ; W_PARTYMON1NAME
.asm_f624
- ld a, [wWhichPokemon] ; $cf92
+ ld a, [wWhichPokemon] ; wWhichPokemon
call SkipFixedLengthTextEntries
.asm_f62a
ld bc, $b
call CopyData
pop hl
- ld a, [$cf95]
+ ld a, [wcf95]
cp $1
jr z, .asm_f664
cp $3
@@ -3978,11 +3978,11 @@
push hl
srl a
add $2
- ld [$cc49], a
+ ld [wcc49], a
call LoadMonData
callba Func_58f43
ld a, d
- ld [W_CURENEMYLVL], a ; $d127
+ ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
pop hl
ld bc, $21
add hl, bc
@@ -4112,10 +4112,10 @@
ld hl, Moves
ld bc, $0006
call AddNTimes
- ld de, $cd6d
+ ld de, wcd6d
ld a, BANK(Moves)
call FarCopyData
- ld a, [$cd72] ; default pp
+ ld a, [wcd72] ; default pp
pop bc
pop de
@@ -4159,7 +4159,7 @@
.done
xor a
ld [wWhichPokemon], a
- ld [$d11e], a
+ ld [wd11e], a
ld a, [W_NUMINPARTY]
ld b, a
@@ -4396,7 +4396,7 @@
ld [wPlayerID + 1], a
ld a, $ff
- ld [$d71b], a ; XXX what's this?
+ ld [wd71b], a ; XXX what's this?
ld hl, W_NUMINPARTY
call InitializeEmptyList
@@ -4416,7 +4416,7 @@
inc hl
ld [hl], a
- ld [$cc49], a
+ ld [wcc49], a
ld hl, W_OBTAINEDBADGES
ld [hli], a
@@ -4443,7 +4443,7 @@
IsItemInBag_: ; f8a5 (3:78a5)
call GetPredefRegisters
- ld hl, wNumBagItems ; $d31d
+ ld hl, wNumBagItems ; wNumBagItems
.asm_f8ab
inc hl
ld a, [hli]
@@ -4465,7 +4465,7 @@
ld [hli], a
ld [hli], a
ld [hl], a
- ld hl, $cc97
+ ld hl, wcc97
ld de, $0
Func_f8c8: ; f8c8 (3:78c8)
@@ -4535,9 +4535,9 @@
Func_f929: ; f929 (3:7929)
xor a
ld [$ff9d], a
- ld a, [$c104]
+ ld a, [wSpriteStateData1 + 4]
ld d, a
- ld a, [$c106]
+ ld a, [wSpriteStateData1 + 6]
ld e, a
ld hl, wSpriteStateData1
ld a, [H_DIVIDEND] ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT)
@@ -4609,10 +4609,10 @@
Func_f9a0: ; f9a0 (3:79a0)
ld a, [$ff95]
- ld [$cd37], a
+ ld [wcd37], a
dec a
- ld de, $ccd3
- ld hl, $cc97
+ ld de, wccd3
+ ld hl, wcc97
add l
ld l, a
jr nc, .asm_f9b1
--- a/scripts/agatha.asm
+++ b/scripts/agatha.asm
@@ -9,11 +9,11 @@
ret
AgathaScript_76443: ; 76443 (1d:6443)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
- ld a, [$d865]
+ ld a, [wd865]
bit 1, a
jr z, .asm_76457
ld a, $e
@@ -22,7 +22,7 @@
ld a, $3b
AgathaScript_76459: ; 76459 (1d:6459)
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $2
ld a, $17
jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -42,7 +42,7 @@
AgathaScript4: ; 76473 (1d:6473)
ret
asm_76474: ; 76474 (1d:6474)
- ld hl, $ccd3
+ ld hl, wccd3
ld a, $40
ld [hli], a
ld [hli], a
@@ -51,7 +51,7 @@
ld [hli], a
ld [hl], a
ld a, $6
- ld [$cd38], a
+ ld [wcd38], a
call Func_3486
ld a, $3
ld [W_AGATHACURSCRIPT], a
@@ -65,12 +65,12 @@
xor a
ld [hJoyPressed], a
ld [hJoyHeld], a
- ld [$ccd3], a
- ld [$cd38], a
- ld a, [wWhichTrade] ; $cd3d
+ ld [wccd3], a
+ ld [wcd38], a
+ ld a, [wWhichTrade] ; wWhichTrade
cp $3
jr c, .asm_764b4
- ld hl, $d865
+ ld hl, wd865
bit 6, [hl]
set 6, [hl]
jr z, asm_76474
@@ -79,9 +79,9 @@
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
ld a, $40
- ld [$ccd3], a
+ ld [wccd3], a
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
call Func_3486
ld a, $3
ld [W_AGATHACURSCRIPT], a
@@ -96,7 +96,7 @@
db $FF
AgathaScript3: ; 764da (1d:64da)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
call Delay3
@@ -108,7 +108,7 @@
AgathaScript2: ; 764ed (1d:64ed)
call EndTrainerBattle
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, AgathaScript_76464
ld a, $1
@@ -126,7 +126,7 @@
AgathaTrainerHeader0: ; 76509 (1d:6509)
db $1 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d865 ; flag's byte
+ dw wd865 ; flag's byte
dw AgathaBeforeBattleText ; 0x6520 TextBeforeBattle
dw AgathaAfterBattleText ; 0x652a TextAfterBattle
dw AgathaEndBattleText ; 0x6525 TextEndBattle
--- a/scripts/battlecenterm.asm
+++ b/scripts/battlecenterm.asm
@@ -10,24 +10,24 @@
ld a, $1
ld [$ff8c], a
call Func_34ae
- ld hl, $d72d
+ ld hl, wd72d
bit 0, [hl]
set 0, [hl]
ret nz
- ld hl, $c214
+ ld hl, wSpriteStateData2 + $14
ld a, $8
ld [hli], a
ld a, $a
ld [hl], a
ld a, $8
- ld [$c119], a
+ ld [wSpriteStateData1 + $19], a
ld a, [$ffaa]
cp $2
ret z
ld a, $7
- ld [$c215], a
+ ld [wSpriteStateData2 + $15], a
ld a, $c
- ld [$c119], a
+ ld [wSpriteStateData1 + $19], a
ret
BattleCenterMTextPointers: ; 4fd4c (13:7d4c)
--- a/scripts/bikeshop.asm
+++ b/scripts/bikeshop.asm
@@ -8,7 +8,7 @@
BikeShopText1: ; 1d745 (7:5745)
db $08 ; asm
- ld a, [$d75f]
+ ld a, [wd75f]
bit 0, a
jr z, .asm_260d4 ; 0x1d74b
ld hl, BikeShopText_1d82f
@@ -26,7 +26,7 @@
ld a, BIKE_VOUCHER
ldh [$db], a
callba RemoveItemByID
- ld hl, $d75f
+ ld hl, wd75f
set 0, [hl]
ld hl, BikeShopText_1d824
call PrintText
@@ -39,17 +39,17 @@
ld hl, BikeShopText_1d810
call PrintText
xor a
- ld [$cc26], a
- ld [$cc2a], a
+ ld [wCurrentMenuItem], a
+ ld [wLastMenuItem], a
ld a, $3
- ld [$cc29], a
+ ld [wMenuWatchedKeys], a
ld a, $1
- ld [$cc28], a
+ ld [wMaxMenuItem], a
ld a, $2
- ld [$cc24], a
+ ld [wTopMenuItemY], a
ld a, $1
- ld [$cc25], a
- ld hl, $d730
+ ld [wTopMenuItemX], a
+ ld hl, wd730
set 6, [hl]
ld hl, wTileMap
ld b, $4
@@ -56,11 +56,11 @@
ld c, $f
call TextBoxBorder
call UpdateSprites
- FuncCoord 2, 2 ; $c3ca
+ FuncCoord 2, 2
ld hl, Coord
ld de, BikeShopMenuText
call PlaceString
- FuncCoord 8, 3 ; $c3e4
+ FuncCoord 8, 3
ld hl, Coord
ld de, BikeShopMenuPrice
call PlaceString
@@ -69,9 +69,9 @@
call HandleMenuInput
bit 1, a
jr nz, .asm_b7579 ; 0x1d7dc
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .asm_b7579 ; 0x1d7e7
ld hl, BikeShopText_1d81a
@@ -133,7 +133,7 @@
BikeShopText3: ; 1d848 (7:5848)
db $08 ; asm
- ld a, [$d75f]
+ ld a, [wd75f]
bit 0, a
ld hl, BikeShopText_1d861
jr nz, .asm_34d2d ; 0x1d851
--- a/scripts/billshouse.asm
+++ b/scripts/billshouse.asm
@@ -16,7 +16,7 @@
ret
BillsHouseScript1: ; 1e783 (7:6783)
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
and a
ld de, MovementData_1e79c
jr nz, .asm_1e78f ; 0x1e78a $3
@@ -36,14 +36,14 @@
db $C0,$40,$40,$80,$40,$FF
BillsHouseScript2: ; 1e7a6 (7:67a6)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
ld a, $61
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
- ld hl, $d7f2
+ ld hl, wd7f2
set 6, [hl]
xor a
ld [wJoyIgnore], a
@@ -52,13 +52,13 @@
ret
BillsHouseScript3: ; 1e7c5 (7:67c5)
- ld a, [$d7f2]
+ ld a, [wd7f2]
bit 3, a
ret z
ld a, $f0
ld [wJoyIgnore], a
ld a, $2
- ld [$cf13], a
+ ld [wcf13], a
ld a, $c
ld [$ffeb], a
ld a, $40
@@ -69,7 +69,7 @@
ld [$ffee], a
call Func_32f9
ld a, $62
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef
ld c, $8
@@ -86,14 +86,14 @@
db $00,$C0,$C0,$C0,$00,$FF
BillsHouseScript4: ; 1e80d (7:680d)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
xor a
ld [wJoyIgnore], a
- ld hl, $d7f2
+ ld hl, wd7f2
set 5, [hl]
- ld hl, $d7f1
+ ld hl, wd7f1
set 0, [hl]
ld a, $0
ld [W_BILLSHOUSECURSCRIPT], a
@@ -121,7 +121,7 @@
ld hl, BillsHouseText_1e865
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, asm_6b196 ; 0x1e84b $d
asm_4d03c: ; 1e84d (7:684d)
@@ -151,7 +151,7 @@
BillsHouseText2: ; 1e874 (7:6874)
db $08 ; asm
- ld a, [$d7f2]
+ ld a, [wd7f2]
bit 4, a
jr nz, .asm_5491f ; 0x1e87a
ld hl, BillThankYouText
@@ -161,14 +161,14 @@
jr nc, .BagFull
ld hl, SSTicketReceivedText
call PrintText
- ld hl, $d7f2
+ ld hl, wd7f2
set 4, [hl]
ld a, $7
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef
ld a, $9
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
.asm_5491f ; 0x1e8a9
--- a/scripts/blueshouse.asm
+++ b/scripts/blueshouse.asm
@@ -9,7 +9,7 @@
dw BluesHouseScript1
BluesHouseScript0: ; 19b4b (6:5b4b)
- ld hl,$D74A
+ ld hl,wd74a
set 1,[hl]
; trigger the next script
@@ -27,10 +27,10 @@
BluesHouseText1: ; 19b5d (6:5b5d)
db 8
- ld a,[$D74A]
+ ld a,[wd74a]
bit 0,a
jr nz,.GotMap
- ld a,[$D74B]
+ ld a,[wd74b]
bit 5,a
jr nz,.GiveMap
ld hl,DaisyInitialText
@@ -43,12 +43,12 @@
call GiveItem
jr nc, .BagFull
ld a,$29
- ld [$CC4D],a
+ ld [wcc4d],a
ld a,$11
call Predef ; hide table map object
ld hl,GotMapText
call PrintText
- ld hl,$D74A
+ ld hl,wd74a
set 0,[hl]
jr .done
.GotMap
--- a/scripts/bruno.asm
+++ b/scripts/bruno.asm
@@ -9,11 +9,11 @@
ret
BrunoScript_762ec: ; 762ec (1d:62ec)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
- ld a, [$d864]
+ ld a, [wd864]
bit 1, a
jr z, .asm_76300
ld a, $5
@@ -22,7 +22,7 @@
ld a, $24
BrunoScript_76302: ; 76302 (1d:6302)
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $2
ld a, $17
jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -42,7 +42,7 @@
BrunoScript4: ; 7631c (1d:631c)
ret
asm_7631d: ; 7631d (1d:631d)
- ld hl, $ccd3
+ ld hl, wccd3
ld a, $40
ld [hli], a
ld [hli], a
@@ -51,7 +51,7 @@
ld [hli], a
ld [hl], a
ld a, $6
- ld [$cd38], a
+ ld [wcd38], a
call Func_3486
ld a, $3
ld [W_BRUNOCURSCRIPT], a
@@ -65,12 +65,12 @@
xor a
ld [hJoyPressed], a
ld [hJoyHeld], a
- ld [$ccd3], a
- ld [$cd38], a
- ld a, [wWhichTrade] ; $cd3d
+ ld [wccd3], a
+ ld [wcd38], a
+ ld a, [wWhichTrade] ; wWhichTrade
cp $3
jr c, .asm_7635d
- ld hl, $d864
+ ld hl, wd864
bit 6, [hl]
set 6, [hl]
jr z, asm_7631d
@@ -79,9 +79,9 @@
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
ld a, $40
- ld [$ccd3], a
+ ld [wccd3], a
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
call Func_3486
ld a, $3
ld [W_BRUNOCURSCRIPT], a
@@ -96,7 +96,7 @@
db $FF
BrunoScript3: ; 76383 (1d:6383)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
call Delay3
@@ -108,7 +108,7 @@
BrunoScript2: ; 76396 (1d:6396)
call EndTrainerBattle
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, BrunoScript_7630d
ld a, $1
@@ -123,7 +123,7 @@
BrunoTrainerHeader0: ; 763ac (1d:63ac)
db $1 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d864 ; flag's byte
+ dw wd864 ; flag's byte
dw BrunoBeforeBattleText ; 0x63c3 TextBeforeBattle
dw BrunoAfterBattleText ; 0x63cd TextAfterBattle
dw BrunoEndBattleText ; 0x63c8 TextEndBattle
--- a/scripts/celadoncity.asm
+++ b/scripts/celadoncity.asm
@@ -1,9 +1,9 @@
CeladonCityScript: ; 19956 (6:5956)
call EnableAutoTextBoxDrawing
- ld hl, $d77e
+ ld hl, wd77e
res 0, [hl]
res 7, [hl]
- ld hl, $d816
+ ld hl, wd816
res 7, [hl]
ret
@@ -45,7 +45,7 @@
CeladonCityText5: ; 1999e (6:599e)
db $08 ; asm
- ld a, [$d777]
+ ld a, [wd777]
bit 0, a
jr nz, .asm_7053f ; 0x199a4
ld hl, TM41PreText
@@ -59,7 +59,7 @@
.Success
ld hl, ReceivedTM41Text
call PrintText
- ld hl, $d777
+ ld hl, wd777
set 0, [hl]
jr .Done
.asm_7053f ; 0x199c9
--- a/scripts/celadondiner.asm
+++ b/scripts/celadondiner.asm
@@ -27,7 +27,7 @@
CeladonDinerText5: ; 49173 (12:5173)
db $08 ; asm
- ld a, [$d783]
+ ld a, [wd783]
bit 0, a
jr nz, .asm_eb14d ; 0x49179
ld hl, CeladonDinerText_491a7
@@ -35,7 +35,7 @@
ld bc, (COIN_CASE << 8) | 1
call GiveItem
jr nc, .BagFull
- ld hl, $d783
+ ld hl, wd783
set 0, [hl]
ld hl, ReceivedCoinCaseText
call PrintText
--- a/scripts/celadongamecorner.asm
+++ b/scripts/celadongamecorner.asm
@@ -7,7 +7,7 @@
jp CallFunctionInTable
CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf)
- ld hl, $d126
+ ld hl, wd126
bit 6, [hl]
res 6, [hl]
ret z
@@ -20,19 +20,19 @@
srl a
srl a
srl a
- ld [$cd05], a
+ ld [wcd05], a
ret
CeladonGameCornerScript_48bec: ; 48bec (12:4bec)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
- ld a, [$d77e]
+ ld a, [wd77e]
bit 1, a
ret nz
ld a, $2a
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $0208
ld a, $17
jp Predef
@@ -90,16 +90,16 @@
db $C0,$C0,$C0,$C0,$C0,$FF
CeladonGameCornerScript2: ; 48c69 (12:4c69)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
xor a
ld [wJoyIgnore], a
ld a, $46
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
- ld hl, $d126
+ ld hl, wd126
set 5, [hl]
set 6, [hl]
ld a, $0
@@ -131,7 +131,7 @@
ld hl, CeladonGameCornerText_48d22
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .asm_c650b ; 0x48cba
ld b,COIN_CASE
@@ -155,7 +155,7 @@
ld a, $10
ldh [$a0], a
ld hl, $ffa1
- ld de, $d349
+ ld de, wPlayerMoney + 2
ld c, $3
ld a, $c ; SubtractBCDPredef
call Predef
@@ -164,7 +164,7 @@
ldh [$a0], a
ld a, $50
ldh [$a1], a
- ld de, $d5a5
+ ld de, wPlayerCoins + 1
ld hl, $ffa1
ld c, $2
ld a, $b ; AddBCDPredef
@@ -218,7 +218,7 @@
CeladonGameCornerText5: ; 48d4a (12:4d4a)
db $08 ; asm
- ld a, [$d77e]
+ ld a, [wd77e]
bit 2, a
jr nz, .asm_d0957 ; 0x48d50
ld hl, CeladonGameCornerText_48d9c
@@ -233,15 +233,15 @@
ldh [$a0], a
ld a, $10
ldh [$a1], a
- ld de, $d5a5
+ ld de, wPlayerCoins + 1
ld hl, $ffa1
ld c, $2
ld a, $b ; AddBCDPredef
call Predef
- ld hl, $d77e
+ ld hl, wd77e
set 2, [hl]
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
ld hl, Received10CoinsText
jr .asm_c7d1a ; 0x48d87
.asm_d0957 ; 0x48d89
@@ -278,7 +278,7 @@
CeladonGameCornerText7: ; 48db6 (12:4db6)
db $08 ; asm
- ld a, [$d77c]
+ ld a, [wd77c]
bit 1, a
ld hl, CeladonGameCornerText_48dca ; $4dca
jr z, .asm_be3fd ; 0x48dbf
@@ -301,7 +301,7 @@
CeladonGameCornerText9: ; 48dd9 (12:4dd9)
db $08 ; asm
- ld a, [$d77e]
+ ld a, [wd77e]
bit 4, a
jr nz, .asm_ed8bc ; 0x48ddf
ld hl, CeladonGameCornerText_48e26
@@ -316,12 +316,12 @@
ldh [$a0], a
ld a, $20
ldh [$a1], a
- ld de, $d5a5
+ ld de, wPlayerCoins + 1
ld hl, $ffa1
ld c, $2
ld a, $b ; AddBCDPredef
call Predef
- ld hl, $d77e
+ ld hl, wd77e
set 4, [hl]
ld hl, Received20CoinsText
jr .asm_0ddc2 ; 0x48e11
@@ -355,7 +355,7 @@
CeladonGameCornerText10: ; 48e3b (12:4e3b)
db $08 ; asm
- ld a, [$d77e]
+ ld a, [wd77e]
bit 3, a
jr nz, .asm_ff080 ; 0x48e41
ld hl, CeladonGameCornerText_48e88 ; $4e88
@@ -370,12 +370,12 @@
ldh [$a0], a
ld a, $20
ldh [$a1], a
- ld de, $d5a5
+ ld de, wPlayerCoins + 1
ld hl, $ffa1
ld c, $2
ld a, $b ; AddBCDPredef
call Predef
- ld hl, $d77e
+ ld hl, wd77e
set 3, [hl]
ld hl, CeladonGameCornerText_48e8d
jr .asm_78d65 ; 0x48e73
@@ -411,7 +411,7 @@
db $08 ; asm
ld hl, CeladonGameCornerText_48ece
call PrintText
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, CeladonGameCornerText_48ed3
@@ -418,7 +418,7 @@
ld de, CeladonGameCornerText_48ed3
call PreBattleSaveRegisters
ldh a, [$8c]
- ld [$cf13], a
+ ld [wcf13], a
call EngageMapTrainer
call InitBattleEnemyParameters
xor a
@@ -444,7 +444,7 @@
CeladonGameCornerText12: ; 48edd (12:4edd)
db $08 ; asm
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
ld hl, CeladonGameCornerText_48f09
call PrintText
call WaitForSoundToFinish
@@ -451,10 +451,10 @@
ld a, (SFX_02_57 - SFX_Headers_02) / 3
call PlaySound
call WaitForSoundToFinish
- ld hl, $d77e
+ ld hl, wd77e
set 1, [hl]
ld a, $43
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $0208
ld a, $17
call Predef
@@ -473,46 +473,46 @@
db "@"
CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e)
- ld hl, $d730
+ ld hl, wd730
set 6, [hl]
- FuncCoord 11, 0 ; $c3ab
+ FuncCoord 11, 0
ld hl, Coord
ld b, $5
ld c, $7
call TextBoxBorder
call UpdateSprites
- FuncCoord 12, 1 ; $c3c0
+ FuncCoord 12, 1
ld hl, Coord
ld b, $4
ld c, $7
call ClearScreenArea
- FuncCoord 12, 2 ; $c3d4
+ FuncCoord 12, 2
ld hl, Coord
ld de, GameCornerMoneyText
call PlaceString
- FuncCoord 12, 3 ; $c3e8
+ FuncCoord 12, 3
ld hl, Coord
ld de, GameCornerBlankText1
call PlaceString
- FuncCoord 12, 3 ; $c3e8
+ FuncCoord 12, 3
ld hl, Coord
- ld de, $d347
+ ld de, wPlayerMoney
ld c, $a3
call PrintBCDNumber
- FuncCoord 12, 4 ; $c3fc
+ FuncCoord 12, 4
ld hl, Coord
ld de, GameCornerCoinText
call PlaceString
- FuncCoord 12, 5 ; $c410
+ FuncCoord 12, 5
ld hl, Coord
ld de, GameCornerBlankText2
call PlaceString
- FuncCoord 15, 5 ; $c413
+ FuncCoord 15, 5
ld hl, Coord
- ld de, $d5a4
+ ld de, wPlayerCoins
ld c, $82
call PrintBCDNumber
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
ret
--- a/scripts/celadongym.asm
+++ b/scripts/celadongym.asm
@@ -1,5 +1,5 @@
CeladonGymScript: ; 4890a (12:490a)
- ld hl, $d126
+ ld hl, wd126
bit 6, [hl]
res 6, [hl]
call nz, CeladonGymScript_48927
@@ -36,7 +36,7 @@
dw CeladonGymScript3
CeladonGymScript3: ; 48956 (12:4956)
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, CeladonGymText_48943
ld a, $f0
@@ -46,7 +46,7 @@
ld a, $9
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld hl, $d77c
+ ld hl, wd77c
set 1, [hl]
ld bc, (TM_21 << 8) | 1
call GiveItem
@@ -54,7 +54,7 @@
ld a, $a
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld hl, $d77c
+ ld hl, wd77c
set 0, [hl]
jr .asm_4898c
.BagFull
@@ -64,14 +64,14 @@
.asm_4898c
ld hl, W_OBTAINEDBADGES
set 3, [hl]
- ld hl, $d72a
+ ld hl, wd72a
set 3, [hl]
; deactivate gym trainers
- ld a, [$d77c]
+ ld a, [wd77c]
or %11111100
- ld [$d77c], a
- ld hl, $d77d
+ ld [wd77c], a
+ ld hl, wd77d
set 0, [hl]
jp CeladonGymText_48943
@@ -93,7 +93,7 @@
CeladonGymTrainerHeader0: ; 489bc (12:49bc)
db $2 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d77c ; flag's byte
+ dw wd77c ; flag's byte
dw CeladonGymBattleText2 ; 0x4a8b TextBeforeBattle
dw CeladonGymAfterBattleText2 ; 0x4a95 TextAfterBattle
dw CeladonGymEndBattleText2 ; 0x4a90 TextEndBattle
@@ -102,7 +102,7 @@
CeladonGymTrainerHeader2: ; 489c8 (12:49c8)
db $3 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d77c ; flag's byte
+ dw wd77c ; flag's byte
dw CeladonGymBattleText3 ; 0x4aa4 TextBeforeBattle
dw CeladonGymAfterBattleText3 ; 0x4aae TextAfterBattle
dw CeladonGymEndBattleText3 ; 0x4aa9 TextEndBattle
@@ -111,7 +111,7 @@
CeladonGymTrainerHeader3: ; 489d4 (12:49d4)
db $4 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d77c ; flag's byte
+ dw wd77c ; flag's byte
dw CeladonGymBattleText4 ; 0x4abd TextBeforeBattle
dw CeladonGymAfterBattleText4 ; 0x4ac7 TextAfterBattle
dw CeladonGymEndBattleText4 ; 0x4ac2 TextEndBattle
@@ -120,7 +120,7 @@
CeladonGymTrainerHeader4: ; 489e0 (12:49e0)
db $5 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d77c ; flag's byte
+ dw wd77c ; flag's byte
dw CeladonGymBattleText5 ; 0x4ad6 TextBeforeBattle
dw CeladonGymAfterBattleText5 ; 0x4ae0 TextAfterBattle
dw CeladonGymEndBattleText5 ; 0x4adb TextEndBattle
@@ -129,7 +129,7 @@
CeladonGymTrainerHeader5: ; 489ec (12:49ec)
db $6 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d77c ; flag's byte
+ dw wd77c ; flag's byte
dw CeladonGymBattleText6 ; 0x4aef TextBeforeBattle
dw CeladonGymAfterBattleText6 ; 0x4af9 TextAfterBattle
dw CeladonGymEndBattleText6 ; 0x4af4 TextEndBattle
@@ -138,7 +138,7 @@
CeladonGymTrainerHeader6: ; 489f8 (12:49f8)
db $7 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d77c ; flag's byte
+ dw wd77c ; flag's byte
dw CeladonGymBattleText7 ; 0x4b08 TextBeforeBattle
dw CeladonGymAfterBattleText7 ; 0x4b12 TextAfterBattle
dw CeladonGymEndBattleText7 ; 0x4b0d TextEndBattle
@@ -147,7 +147,7 @@
CeladonGymTrainerHeader7: ; 48a04 (12:4a04)
db $8 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d77c ; flag's byte
+ dw wd77c ; flag's byte
dw CeladonGymBattleText8 ; 0x4b21 TextBeforeBattle
dw CeladonGymAfterBattleText8 ; 0x4b2b TextAfterBattle
dw CeladonGymEndBattleText8 ; 0x4b26 TextEndBattle
@@ -157,7 +157,7 @@
CeladonGymText1: ; 48a11 (12:4a11)
db $08 ; asm
- ld a, [$d77c]
+ ld a, [wd77c]
bit 1, a
jr z, .asm_16064 ; 0x48a17
bit 0, a
@@ -172,7 +172,7 @@
.asm_16064 ; 0x48a2d
ld hl, CeladonGymText_48a5e
call PrintText
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, CeladonGymText_48a63
@@ -179,11 +179,11 @@
ld de, CeladonGymText_48a63
call PreBattleSaveRegisters
ldh a, [$8c]
- ld [$cf13], a
+ ld [wcf13], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $4
- ld [$d05c], a
+ ld [W_GYMLEADERNO], a
ld a, $3
ld [W_CELADONGYMCURSCRIPT], a
ld [W_CURMAPSCRIPT], a
--- a/scripts/celadonmansion3.asm
+++ b/scripts/celadonmansion3.asm
@@ -30,7 +30,7 @@
ld hl, wPokedexOwned
ld b, wPokedexOwnedEnd - wPokedexOwned
call CountSetBits
- ld a, [$d11e]
+ ld a, [wd11e]
cp 150
jr nc, .CompletedDex
ld hl, .GameDesigner
@@ -51,7 +51,7 @@
db $8 ; asm
callab DisplayDiploma
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
jp TextScriptEnd
GameFreakPCText1: ; 487eb (12:47eb)
--- a/scripts/celadonmansion5.asm
+++ b/scripts/celadonmansion5.asm
@@ -15,7 +15,7 @@
call GivePokemon
jr nc, .asm_24365 ; 0x1dd4d
ld a, $45
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
.asm_24365 ; 0x1dd59
--- a/scripts/celadonmart3.asm
+++ b/scripts/celadonmart3.asm
@@ -22,7 +22,7 @@
CeladonMart3Text1: ; 4824a (12:424a)
db $08 ; asm
- ld a, [$d778]
+ ld a, [wd778]
bit 7, a
jr nz, .asm_a5463 ; 0x48250
ld hl, TM18PreReceiveText
@@ -30,7 +30,7 @@
ld bc, (TM_18 << 8) | 1
call GiveItem
jr nc, .BagFull
- ld hl, $d778
+ ld hl, wd778
set 7, [hl]
ld hl, ReceivedTM18Text
jr .asm_81359 ; 0x48268
--- a/scripts/celadonmartelevator.asm
+++ b/scripts/celadonmartelevator.asm
@@ -1,5 +1,5 @@
CeladonMartElevatorScript: ; 48600 (12:4600)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
push hl
@@ -9,16 +9,16 @@
res 7, [hl]
call nz, CeladonMartElevatorScript_48654
xor a
- ld [$cf0c], a
+ ld [wcf0c], a
inc a
- ld [$cc3c], a
+ ld [wcc3c], a
ret
CeladonMartElevatorScript_4861c: ; 4861c (12:461c)
- ld hl, $d3af
- ld a, [$d73b]
+ ld hl, wd3af
+ ld a, [wd73b]
ld b, a
- ld a, [$d73c]
+ ld a, [wd73c]
ld c, a
call CeladonMartElevatorScript_4862a
@@ -35,7 +35,7 @@
ld hl, CeladonMartElavatorFloors ; $4643
call LoadItemList
ld hl, CeldaonMartElevatorWarpMaps ; $464a
- ld de, $cc5b
+ ld de, wcc5b
ld bc, $000a
jp CopyData
--- a/scripts/celadonmartroof.asm
+++ b/scripts/celadonmartroof.asm
@@ -3,8 +3,8 @@
CeladonMartRoofScript_483d8: ; 483d8 (12:43d8)
xor a
- ld [$cd37], a
- ld de, $cc5b
+ ld [wcd37], a
+ ld de, wcc5b
ld hl, CeladonMartRoofDrinkList ; $4408
.asm_483e2
ld a, [hli]
@@ -12,7 +12,7 @@
jr z, .asm_48404
push hl
push de
- ld [$d11e], a
+ ld [wd11e], a
ld b, a
ld a, $1c
call Predef ; indirect jump to Func_f8a5 (f8a5 (3:78a5))
@@ -21,11 +21,11 @@
ld a, b
and a
jr z, .asm_483e2
- ld a, [$d11e]
+ ld a, [wd11e]
ld [de], a
inc de
push hl
- ld hl, $cd37
+ ld hl, wcd37
inc [hl]
pop hl
jr .asm_483e2
@@ -41,22 +41,22 @@
db $00
CeladonMartRoofScript_4840c: ; 4840c (12:440c)
- ld hl, $d730
+ ld hl, wd730
set 6, [hl]
ld hl, CeladonMartRoofText_484ee ; $44ee
call PrintText
xor a
- ld [wCurrentMenuItem], a ; $cc26
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
ld a, $3
- ld [wMenuWatchedKeys], a ; $cc29
- ld a, [$cd37]
+ ld [wMenuWatchedKeys], a ; wMenuWatchedKeys
+ ld a, [wcd37]
dec a
- ld [wMaxMenuItem], a ; $cc28
+ ld [wMaxMenuItem], a ; wMaxMenuItem
ld a, $2
- ld [wTopMenuItemY], a ; $cc24
+ ld [wTopMenuItemY], a ; wTopMenuItemY
ld a, $1
- ld [wTopMenuItemX], a ; $cc25
- ld a, [$cd37]
+ ld [wTopMenuItemX], a ; wTopMenuItemX
+ ld a, [wcd37]
dec a
ld bc, $2
ld hl, $3
@@ -68,13 +68,13 @@
call TextBoxBorder
call UpdateSprites
call CeladonMartRoofScript_48532
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
call HandleMenuInput
bit 1, a
ret nz
- ld hl, $cc5b
- ld a, [wCurrentMenuItem] ; $cc26
+ ld hl, wcc5b
+ ld a, [wCurrentMenuItem] ; wCurrentMenuItem
ld d, $0
ld e, a
add hl, de
@@ -84,7 +84,7 @@
jr z, .asm_484b6
cp SODA_POP
jr z, .asm_48492
- ld a, [$d778]
+ ld a, [wd778]
bit 6, a
jr nz, .asm_484e0
ld hl, CeladonMartRoofText_48515 ; $4515
@@ -95,11 +95,11 @@
jr nc, .BagFull
ld hl, ReceivedTM49Text
call PrintText
- ld hl, $d778
+ ld hl, wd778
set 6, [hl]
ret
.asm_48492
- ld a, [$d778]
+ ld a, [wd778]
bit 5, a
jr nz, .asm_484e0
ld hl, CeladonMartRoofText_48504 ; $4504
@@ -110,11 +110,11 @@
jr nc, .BagFull
ld hl, CeladonMartRoofText_4850a ; $450a
call PrintText
- ld hl, $d778
+ ld hl, wd778
set 5, [hl]
ret
.asm_484b6
- ld a, [$d778]
+ ld a, [wd778]
bit 4, a
jr nz, .asm_484e0
ld hl, CeladonMartRoofText_484f3 ; $44f3
@@ -125,7 +125,7 @@
jr nc, .BagFull
ld hl, CeladonMartRoofText_484f9 ; $44f9
call PrintText
- ld hl, $d778
+ ld hl, wd778
set 4, [hl]
ret
.BagFull
@@ -191,7 +191,7 @@
db "@"
CeladonMartRoofScript_48532: ; 48532 (12:4532)
- ld hl, $cc5b
+ ld hl, wcc5b
xor a
ld [$ffdb], a
.asm_48538
@@ -199,14 +199,14 @@
cp $ff
ret z
push hl
- ld [$d11e], a
+ ld [wd11e], a
call GetItemName
- FuncCoord 2, 2 ; $c3ca
+ FuncCoord 2, 2
ld hl, Coord
ld a, [$ffdb]
ld bc, $28
call AddNTimes
- ld de, $cd6d
+ ld de, wcd6d
call PlaceString
ld hl, $ffdb
inc [hl]
@@ -228,15 +228,15 @@
CeladonMartRoofText2: ; 4856c (12:456c)
db $08 ; asm
call CeladonMartRoofScript_483d8
- ld a, [$cd37]
+ ld a, [wcd37]
and a
jr z, .asm_914b9 ; 0x48574
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
ld hl, CeladonMartRoofText4
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .asm_05aa4 ; 0x48588
call CeladonMartRoofScript_4840c
--- a/scripts/ceruleancity.asm
+++ b/scripts/ceruleancity.asm
@@ -9,7 +9,7 @@
ld [wJoyIgnore], a
ld [W_CERULEANCITYCURSCRIPT], a
ld a, $5
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
jp Predef
@@ -26,7 +26,7 @@
jp z, CeruleanCityScript_1948c
ld a, $f0
ld [wJoyIgnore], a
- ld hl, $d75b
+ ld hl, wd75b
set 7, [hl]
ld a, $2
ld [$ff8c], a
@@ -37,13 +37,13 @@
ret
CeruleanCityScript0: ; 194c8 (6:54c8)
- ld a, [$d75b]
+ ld a, [wd75b]
bit 7, a
jr nz, .asm_194f7 ; 0x194cd $28
ld hl, CeruleanCityCoords1
call ArePlayerCoordsInArray
jr nc, .asm_194f7 ; 0x194d5 $20
- ld a, [$cd3d]
+ ld a, [wWhichTrade]
cp $1
ld a, $8
ld b, $0
@@ -51,25 +51,25 @@
ld a, $4
ld b, $4
.asm_194e6
- ld [$d528], a
+ ld [wd528], a
ld a, b
- ld [$c129], a
+ ld [wSpriteStateData1 + $29], a
call Delay3
ld a, $2
ld [$ff8c], a
jp DisplayTextID
.asm_194f7
- ld a, [$d75a]
+ ld a, [wd75a]
bit 0, a
ret nz
ld hl, CeruleanCityCoords2
call ArePlayerCoordsInArray
ret nc
- ld a, [$d700]
+ ld a, [wd700]
and a
jr z, .asm_19512 ; 0x19508 $8
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
.asm_19512
ld c, BANK(Music_MeetRival)
@@ -90,7 +90,7 @@
ld [hl], $19
.asm_19535
ld a, $5
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef
ld de, CeruleanCityMovement1
@@ -122,7 +122,7 @@
jp Func_34a6 ; face object
CeruleanCityScript1: ; 19567 (6:5567)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
xor a
@@ -130,7 +130,7 @@
ld a, $1
ld [$ff8c], a
call DisplayTextID
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, CeruleanCityText_1966d
@@ -163,19 +163,19 @@
ret
CeruleanCityScript2: ; 195b1 (6:55b1)
- ld a, [$d057]
+ ld a, [W_ISINBATTLE]
cp $ff
jp z, CeruleanCityScript_1948c
call CeruleanCityScript_1955d
ld a, $f0
ld [wJoyIgnore], a
- ld hl, $d75a
+ ld hl, wd75a
set 0, [hl]
ld a, $1
ld [$ff8c], a
call DisplayTextID
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
callba Music_RivalAlternateStart
ld a, $1
@@ -203,11 +203,11 @@
db $c0,$00,$00,$00,$00,$00,$00,$FF
CeruleanCityScript3: ; 19610 (6:5610)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
ld a, $5
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
xor a
@@ -238,7 +238,7 @@
CeruleanCityText1: ; 1964f (6:564f)
db $08 ; asm
- ld a, [$d75a] ; rival battle flag
+ ld a, [wd75a] ; rival battle flag
bit 0, a
; do pre-battle text
jr z, .PreBattleText
@@ -270,12 +270,12 @@
CeruleanCityText2: ; 1967c (6:567c)
db $8
- ld a, [$d75b]
+ ld a, [wd75b]
bit 7, a
jr nz, .asm_4ca20 ; 0x19682 $29
ld hl, CeruleanCityText_196d9
call PrintText
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, CeruleanCityText_196ee
@@ -282,7 +282,7 @@
ld de, CeruleanCityText_196ee
call PreBattleSaveRegisters
ld a, [$ff8c]
- ld [$cf13], a
+ ld [wcf13], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $4
@@ -299,7 +299,7 @@
jr .Done
.Success
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
ld hl, ReceivedTM28Text
call PrintText
callba Func_74872
--- a/scripts/ceruleancity2.asm
+++ b/scripts/ceruleancity2.asm
@@ -4,15 +4,15 @@
; the screen then fades out, he disappears, and fades back in
call GBFadeIn1
ld a, $07
- ld [$CC4D], a
+ ld [wcc4d], a
ld a, $15
call Predef
ld a, $09
- ld [$CC4D], a
+ ld [wcc4d], a
ld a, $11
call Predef
ld a, $06
- ld [$CC4D], a
+ ld [wcc4d], a
ld a, $11
call Predef
call GBFadeOut1
--- a/scripts/ceruleangym.asm
+++ b/scripts/ceruleangym.asm
@@ -1,5 +1,5 @@
CeruleanGymScript: ; 5c6b3 (17:46b3)
- ld hl, $d126
+ ld hl, wd126
bit 6, [hl]
res 6, [hl]
call nz, CeruleanGymScript_5c6d0
@@ -36,7 +36,7 @@
dw CeruleanGymScript3
CeruleanGymScript3: ; 5c700 (17:4700)
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, CeruleanGymScript_5c6ed
ld a, $f0
@@ -46,7 +46,7 @@
ld a, $5
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld hl, $d75e
+ ld hl, wd75e
set 7, [hl]
ld bc, (TM_11 << 8) | 1
call GiveItem
@@ -54,7 +54,7 @@
ld a, $6
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld hl, $d75e
+ ld hl, wd75e
set 6, [hl]
jr .asm_5c736
.BagFull
@@ -64,11 +64,11 @@
.asm_5c736
ld hl, W_OBTAINEDBADGES
set 1, [hl]
- ld hl, $d72a
+ ld hl, wd72a
set 1, [hl]
; deactivate gym trainers
- ld hl, $d75e
+ ld hl, wd75e
set 2, [hl]
set 3, [hl]
@@ -87,7 +87,7 @@
CeruleanGymTrainerHeader0: ; 5c758 (17:4758)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d75e ; flag's byte
+ dw wd75e ; flag's byte
dw CeruleanGymBattleText1 ; 0x47e9 TextBeforeBattle
dw CeruleanGymAfterBattleText1 ; 0x47f3 TextAfterBattle
dw CeruleanGymEndBattleText1 ; 0x47ee TextEndBattle
@@ -96,7 +96,7 @@
CeruleanGymTrainerHeader1: ; 5c764 (17:4764)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d75e ; flag's byte
+ dw wd75e ; flag's byte
dw CeruleanGymBattleText2 ; 0x4802 TextBeforeBattle
dw CeruleanGymAfterBattleText2 ; 0x480c TextAfterBattle
dw CeruleanGymEndBattleText2 ; 0x4807 TextEndBattle
@@ -106,7 +106,7 @@
CeruleanGymText1: ; 5c771 (17:4771)
db $08 ; asm
- ld a, [$d75e]
+ ld a, [wd75e]
bit 7, a
jr z, .asm_10854 ; 0x5c777
bit 6, a
@@ -121,7 +121,7 @@
.asm_10854 ; 0x5c78d
ld hl, CeruleanGymText_5c7be
call PrintText
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, CeruleanGymText_5c7d8
@@ -128,11 +128,11 @@
ld de, CeruleanGymText_5c7d8
call PreBattleSaveRegisters
ldh a, [$8c]
- ld [$cf13], a
+ ld [wcf13], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $2
- ld [$d05c], a
+ ld [W_GYMLEADERNO], a
xor a
ldh [$b4], a
ld a, $3
@@ -203,7 +203,7 @@
CeruleanGymText4: ; 5c811 (17:4811)
db $08 ; asm
- ld a, [$d75e]
+ ld a, [wd75e]
bit 7, a
jr nz, .asm_f80ce ; 0x5c817
ld hl, CeruleanGymText_5c82a
--- a/scripts/ceruleanhouse2.asm
+++ b/scripts/ceruleanhouse2.asm
@@ -1,8 +1,8 @@
CeruleanHouse2Script: ; 74e09 (1d:4e09)
ld a, $1
- ld [$cf0c], a
+ ld [wcf0c], a
dec a
- ld [$cc3c], a
+ ld [wcc3c], a
ret
CeruleanHouse2TextPointers: ; 74e13 (1d:4e13)
@@ -20,20 +20,20 @@
call PrintText
ld hl, BadgeItemList
call LoadItemList
- ld hl, $cf7b
+ ld hl, wStringBuffer2 + 11
ld a, l
- ld [$cf8b], a
+ ld [wcf8b], a
ld a, h
- ld [$cf8c], a
+ ld [wcf8c], a
xor a
- ld [$cf93], a
- ld [$cc35], a
+ ld [wcf93], a
+ ld [wcc35], a
ld a, SPECIALLISTMENU
ld [wListMenuID], a
call DisplayListMenuID
jr c, .asm_74e60 ; 0x74e49 $15
ld hl, TextPointers_74e86
- ld a, [$cf91]
+ ld a, [wcf91]
sub $15
add a
ld d, $0
--- a/scripts/cinnabargym.asm
+++ b/scripts/cinnabargym.asm
@@ -6,7 +6,7 @@
jp CallFunctionInTable
CinnabarGymScript_75759: ; 75759 (1d:5759)
- ld hl, $D126
+ ld hl, wd126
bit 6, [hl]
res 6, [hl]
push hl
@@ -15,7 +15,7 @@
bit 5, [hl]
res 5, [hl]
call nz, Func_3ead
- ld hl, $D79B
+ ld hl, wd79b
res 7, [hl]
ret
CinnabarGymScript_75772: ; 75772 (1d:5772)
@@ -33,7 +33,7 @@
ld [wJoyIgnore], a
ld [W_CINNABARGYMCURSCRIPT], a
ld [W_CURMAPSCRIPT], a
- ld [$da38], a
+ ld [wda38], a
ret
CinnabarGymScript_757a0: ; 757a0 (1d:57a0)
@@ -48,7 +48,7 @@
dw CinnabarGymScript3
CinnabarGymScript0: ; 757ae (1d:57ae)
- ld a, [$da38]
+ ld a, [wda38]
and a
ret z
ld [$ff8c], a
@@ -55,13 +55,13 @@
cp $4
jr nz, .asm_757c3 ; 0x757b7 $a
ld a, $4
- ld [$d528], a
+ ld [wd528], a
ld de, MovementData_757d7
jr .asm_757cb ; 0x757c1 $8
.asm_757c3
ld de, MovementData_757da
ld a, $1
- ld [$d528], a
+ ld [wd528], a
.asm_757cb
call MoveSprite
ld a, $1
@@ -76,12 +76,12 @@
db $80,$FF
CinnabarGymScript1: ; 757dc (1d:57dc)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
xor a
ld [wJoyIgnore], a
- ld a, [$da38]
+ ld a, [wda38]
ld [wTrainerHeaderFlagBit], a
ld [$ff8c], a
jp DisplayTextID
@@ -91,7 +91,7 @@
jp Predef
CinnabarGymScript2: ; 757f6 (1d:57f6)
- ld a, [$d057]
+ ld a, [W_ISINBATTLE]
cp $ff
jp z, CinnabarGymScript_75792
ld a, [wTrainerHeaderFlagBit]
@@ -98,7 +98,7 @@
ld [$ffdb], a
ld c, a
ld b, $2
- ld hl, $d79a
+ ld hl, wd79a
call CinnabarGymScript_757f1
ld a, c
and a
@@ -112,18 +112,18 @@
ld [$ffdb], a
ld c, a
ld b, $1
- ld hl, $d79a
+ ld hl, wd79a
call CinnabarGymScript_757f1
ld a, [wTrainerHeaderFlagBit]
sub $2
ld c, a
ld b, $1
- ld hl, $d79c
+ ld hl, wd79c
call CinnabarGymScript_757f1
call Func_3ead
xor a
ld [wJoyIgnore], a
- ld [$da38], a
+ ld [wda38], a
ld a, $0
ld [W_CINNABARGYMCURSCRIPT], a
ld [W_CURMAPSCRIPT], a
@@ -130,7 +130,7 @@
ret
CinnabarGymScript3: ; 7584a (1d:584a)
- ld a, [$d057]
+ ld a, [W_ISINBATTLE]
cp $ff
jp z, CinnabarGymScript_75792
ld a, $f0
@@ -139,7 +139,7 @@
ld a, $a
ld [$ff8c], a
call DisplayTextID
- ld hl, $d79a
+ ld hl, wd79a
set 1, [hl]
ld bc, (TM_38 << 8) | 1
call GiveItem
@@ -147,7 +147,7 @@
ld a, $b
ld [$ff8c], a
call DisplayTextID
- ld hl, $d79a
+ ld hl, wd79a
set 0, [hl]
jr .asm_75880 ; 0x75877 $7
.BagFull
@@ -157,17 +157,17 @@
.asm_75880
ld hl, W_OBTAINEDBADGES
set 6, [hl]
- ld hl, $d72a
+ ld hl, wd72a
set 6, [hl]
; deactivate gym trainers
- ld a, [$d79a]
+ ld a, [wd79a]
or %11111100
- ld [$d79a], a
- ld hl, $d79b
+ ld [wd79a], a
+ ld hl, wd79b
set 0, [hl]
- ld hl, $d126
+ ld hl, wd126
set 5, [hl]
jp CinnabarGymScript_75792
@@ -188,13 +188,13 @@
CinnabarGymScript_758b7: ; 758b7 (1d:58b7)
ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c
- ld [$cf13], a
+ ld [wcf13], a
call EngageMapTrainer
call InitBattleEnemyParameters
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
- ld a, [$cf13]
+ ld a, [wcf13]
cp $1
jr z, .asm_758d4
ld a, $2
@@ -208,7 +208,7 @@
CinnabarGymText1: ; 758df (1d:58df)
db $8
- ld a, [$d79a]
+ ld a, [wd79a]
bit 1, a
jr z, .asm_d9332 ; 0x758e5 $16
bit 0, a
@@ -227,7 +227,7 @@
ld de, BlaineEndBattleText
call PreBattleSaveRegisters
ld a, $7
- ld [$d05c], a
+ ld [W_GYMLEADERNO], a
jp CinnabarGymScript_758b7
BlaineBattleText: ; 75914 (1d:5914)
@@ -261,7 +261,7 @@
CinnabarGymText2: ; 75939 (1d:5939)
db $08 ; asm
call CinnabarGymScript_757a0
- ld a, [$d79a]
+ ld a, [wd79a]
bit 2, a
jr nz, .asm_46bb4 ; 0x75942
ld hl, CinnabarGymText_7595f
@@ -290,7 +290,7 @@
CinnabarGymText3: ; 7596e (1d:596e)
db $08 ; asm
call CinnabarGymScript_757a0
- ld a, [$d79a]
+ ld a, [wd79a]
bit 3, a
jr nz, .asm_4b406 ; 0x75977
ld hl, CinnabarGymText_75994
@@ -319,7 +319,7 @@
CinnabarGymText4: ; 759a3 (1d:59a3)
db $08 ; asm
call CinnabarGymScript_757a0
- ld a, [$d79a]
+ ld a, [wd79a]
bit 4, a
jr nz, .asm_c0673 ; 0x759ac
ld hl, CinnabarGymText_759c9
@@ -348,7 +348,7 @@
CinnabarGymText5: ; 759d8 (1d:59d8)
db $08 ; asm
call CinnabarGymScript_757a0
- ld a, [$d79a]
+ ld a, [wd79a]
bit 5, a
jr nz, .asm_5cfd7 ; 0x759e1
ld hl, CinnabarGymText_759fe
@@ -377,7 +377,7 @@
CinnabarGymText6: ; 75a0d (1d:5a0d)
db $08 ; asm
call CinnabarGymScript_757a0
- ld a, [$d79a]
+ ld a, [wd79a]
bit 6, a
jr nz, .asm_776b4 ; 0x75a16
ld hl, CinnabarGymText_75a33
@@ -406,7 +406,7 @@
CinnabarGymText7: ; 75a42 (1d:5a42)
db $08 ; asm
call CinnabarGymScript_757a0
- ld a, [$d79a]
+ ld a, [wd79a]
bit 7, a
jr nz, .asm_2f755 ; 0x75a4b
ld hl, CinnabarGymText_75a68
@@ -435,7 +435,7 @@
CinnabarGymText8: ; 75a77 (1d:5a77)
db $08 ; asm
call CinnabarGymScript_757a0
- ld a, [$d79b]
+ ld a, [wd79b]
bit 0, a
jr nz, .asm_d87be ; 0x75a80
ld hl, CinnabarGymText_75a9d
@@ -463,7 +463,7 @@
CinnabarGymText9: ; 75aac (1d:5aac)
db $08 ; asm
- ld a, [$d79a]
+ ld a, [wd79a]
bit 1, a
jr nz, .asm_627d9 ; 0x75ab2
ld hl, CinnabarGymText_75ac2
--- a/scripts/cinnabarisland.asm
+++ b/scripts/cinnabarisland.asm
@@ -1,10 +1,10 @@
CinnabarIslandScript: ; 1ca19 (7:4a19)
call EnableAutoTextBoxDrawing
- ld hl, $d126
+ ld hl, wd126
set 5, [hl]
- ld hl, $d796
+ ld hl, wd796
res 0, [hl]
- ld hl, $d7a3
+ ld hl, wd7a3
res 1, [hl]
ld hl, CinnabarIslandScriptPointers
ld a, [W_CINNABARISLANDCURSCRIPT]
@@ -25,7 +25,7 @@
cp $12
ret nz
ld a, $8
- ld [$d528], a
+ ld [wd528], a
ld a, $8
ld [$ff8c], a
call DisplayTextID
@@ -32,12 +32,12 @@
xor a
ld [hJoyHeld], a
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
ld a, $80
- ld [$ccd3], a
+ ld [wccd3], a
call Func_3486
xor a
- ld [$c109], a
+ ld [wSpriteStateData1 + 9], a
ld [wJoyIgnore], a
ld a, $1
ld [W_CINNABARISLANDCURSCRIPT], a
@@ -44,7 +44,7 @@
ret
CinnabarIslandScript1: ; 1ca73 (7:4a73)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
call Delay3
--- a/scripts/copycatshouse2f.asm
+++ b/scripts/copycatshouse2f.asm
@@ -12,11 +12,11 @@
CopycatsHouse2FText1: ; 5cc82 (17:4c82)
db $08 ; asm
- ld a, [$d7af]
+ ld a, [wd7af]
bit 0, a
jr nz, .asm_7ccf3 ; 0x5cc88
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
ld hl, CopycatsHouse2FText_5ccd4
call PrintText
ld b, POKE_DOLL
@@ -32,7 +32,7 @@
ld a, POKE_DOLL
ldh [$db], a
callba RemoveItemByID
- ld hl, $d7af
+ ld hl, wd7af
set 0, [hl]
jr .asm_62ecd ; 0x5ccc1
.BagFull
@@ -84,7 +84,7 @@
CopycatsHouse2FText7: ; 5cd03 (17:4d03)
db $08 ; asm
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4
ld hl, CopycatsHouse2FText_5cd1c
jr nz, .asm_399a4 ; 0x5cd0c
--- a/scripts/daycarem.asm
+++ b/scripts/daycarem.asm
@@ -13,11 +13,11 @@
ld hl, DayCareMText_5640f
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
ld hl, DayCareMText_5643b
jp nz, DayCareMScript_56409
- ld a, [$d163]
+ ld a, [W_NUMINPARTY]
dec a
ld hl, DayCareMText_56445
jp z, DayCareMScript_56409
@@ -24,9 +24,9 @@
ld hl, DayCareMText_56414
call PrintText
xor a
- ld [$cfcb], a
- ld [$d07d], a
- ld [$cc35], a
+ ld [wcfcb], a
+ ld [wd07d], a
+ ld [wcc35], a
call DisplayPartyMenu
push af
call GBPalWhiteOutWithDelay3
@@ -39,9 +39,9 @@
ld hl, DayCareMText_5644a
jp c, DayCareMScript_56409
xor a
- ld [$cc2b], a
+ ld [wcc2b], a
ld a, [wWhichPokemon]
- ld hl, $d2b5
+ ld hl, W_PARTYMON1NAME
call GetPartyMonName
ld hl, DayCareMText_56419
call PrintText
@@ -48,12 +48,12 @@
ld a, $1
ld [W_DAYCARE_IN_USE], a
ld a, $3
- ld [$cf95], a
+ ld [wcf95], a
call Func_3a68
xor a
- ld [$cf95], a
+ ld [wcf95], a
call RemovePokemon
- ld a, [$cf91]
+ ld a, [wcf91]
call PlayCry
ld hl, DayCareMText_5641e
jp DayCareMScript_56409
@@ -63,7 +63,7 @@
ld hl, W_DAYCAREMONNAME
call GetPartyMonName
ld a, $3
- ld [$cc49], a
+ ld [wcc49], a
call LoadMonData
callab Func_58f43
ld a, d
@@ -71,7 +71,7 @@
jr c, .asm_56315
ld d, $64
callab CalcExperience
- ld hl, $da6d
+ ld hl, wda6d
ld a, [H_NUMTOPRINT]
ld [hli], a
ld a, [$ff97]
@@ -83,7 +83,7 @@
.asm_56315
xor a
ld [wTrainerEngageDistance], a
- ld hl, $da62
+ ld hl, wda62
ld a, [hl]
ld [wTrainerSpriteOffset], a
cp d
@@ -130,7 +130,7 @@
ld hl, DayCareMText_56428
call PrintText
ld a, $13
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
call YesNoChoice
ld hl, DayCareMText_56437
@@ -154,7 +154,7 @@
ld hl, wTrainerEngageDistance
ld [hli], a
inc hl
- ld de, $d349
+ ld de, wPlayerMoney + 2
ld c, $3
ld a, $c ; SubtractBCDPredef
call Predef
@@ -161,15 +161,15 @@
ld a, (SFX_02_5a - SFX_Headers_02) / 3
call PlaySoundWaitForCurrent
ld a, $13
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
ld hl, DayCareMText_5644f
call PrintText
ld a, $2
- ld [$cf95], a
+ ld [wcf95], a
call Func_3a68
ld a, [W_DAYCAREMONDATA]
- ld [$cf91], a
+ ld [wcf91], a
ld a, [W_NUMINPARTY]
dec a
push af
@@ -196,7 +196,7 @@
inc de
ld a, [hl]
ld [de], a
- ld a, [$cf91]
+ ld a, [wcf91]
call PlayCry
ld hl, DayCareMText_5642d
jr DayCareMScript_56409
@@ -203,7 +203,7 @@
.asm_56403
ld a, [wTrainerSpriteOffset]
- ld [$da62], a
+ ld [wda62], a
DayCareMScript_56409: ; 56409 (15:6409)
call PrintText
--- a/scripts/fanclub.asm
+++ b/scripts/fanclub.asm
@@ -3,7 +3,7 @@
FanClubBikeInBag:
; check if any bike paraphernalia in bag
- ld a, [$d771]
+ ld a, [wd771]
bit 1, a ; got bike voucher?
ret nz
ld b, BICYCLE
@@ -25,18 +25,18 @@
FanClubText1:
; pikachu fan
db $08 ; asm
- ld a, [$d771]
+ ld a, [wd771]
bit 7, a
jr nz, .mineisbetter
ld hl, .normaltext
call PrintText
- ld hl, $d771
+ ld hl, wd771
set 6, [hl]
jr .done
.mineisbetter
ld hl, .bettertext
call PrintText
- ld hl, $d771
+ ld hl, wd771
res 7, [hl]
.done
jp TextScriptEnd
@@ -52,18 +52,18 @@
FanClubText2:
; seel fan
db $08 ; asm
- ld a, [$d771]
+ ld a, [wd771]
bit 6, a
jr nz, .mineisbetter
ld hl, .normaltext
call PrintText
- ld hl, $d771
+ ld hl, wd771
set 7, [hl]
jr .done
.mineisbetter
ld hl, .bettertext
call PrintText
- ld hl, $d771
+ ld hl, wd771
res 6, [hl]
.done
jp TextScriptEnd
@@ -113,7 +113,7 @@
ld hl, .meetchairtext
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .nothanks
@@ -125,7 +125,7 @@
jr nc, .BagFull
ld hl, .receivedvouchertext
call PrintText
- ld hl, $d771
+ ld hl, wd771
set 1, [hl]
jr .done
.BagFull
--- a/scripts/fightingdojo.asm
+++ b/scripts/fightingdojo.asm
@@ -9,9 +9,9 @@
FightingDojoScript_5cd70: ; 5cd70 (17:4d70)
xor a
- ld [$cd6b], a
- ld [$d642], a
- ld [$da39], a
+ ld [wJoyIgnore], a
+ ld [W_FIGHTINGDOJOCURSCRIPT], a
+ ld [W_CURMAPSCRIPT], a
ret
FightingDojoScriptPointers: ; 5cd7b (17:4d7b)
@@ -21,7 +21,7 @@
dw FightingDojoScript3
FightingDojoScript1: ; 5cd83 (17:4d83)
- ld a, [$d7b1]
+ ld a, [wd7b1]
bit 0, a
ret nz
call CheckFightingMapTrainers
@@ -28,12 +28,12 @@
ld a, [wTrainerHeaderFlagBit]
and a
ret nz
- ld a, [$d7b1]
+ ld a, [wd7b1]
bit 1, a
ret nz
xor a
ld [hJoyHeld], a
- ld [$cf0d], a
+ ld [wcf0d], a
ld a, [W_YCOORD]
cp $3
ret nz
@@ -41,9 +41,9 @@
cp $4
ret nz
ld a, $1
- ld [$cf0d], a
+ ld [wcf0d], a
ld a, $1
- ld [$d528], a
+ ld [wd528], a
ld a, $1
ld [$ff8c], a
ld a, $8
@@ -55,14 +55,14 @@
ret
FightingDojoScript3: ; 5cdc6 (17:4dc6)
- ld a, [$d057]
+ ld a, [W_ISINBATTLE]
cp $ff
jp z, FightingDojoScript_5cd70
- ld a, [$cf0d]
+ ld a, [wcf0d]
and a
jr z, .asm_5cde4
ld a, $1
- ld [$d528], a
+ ld [wd528], a
ld a, $1
ld [$ff8c], a
ld a, $8
@@ -71,17 +71,17 @@
.asm_5cde4
ld a, $f0
- ld [$cd6b], a
- ld a, [$d7b1]
+ ld [wJoyIgnore], a
+ ld a, [wd7b1]
or $3e
- ld [$d7b1], a
+ ld [wd7b1], a
ld a, $8
ld [$ff8c], a
call DisplayTextID
xor a
- ld [$cd6b], a
- ld [$d642], a
- ld [$da39], a
+ ld [wJoyIgnore], a
+ ld [W_FIGHTINGDOJOCURSCRIPT], a
+ ld [W_CURMAPSCRIPT], a
ret
FightingDojoTextPointers: ; 5ce03 (17:4e03)
@@ -98,7 +98,7 @@
FightingDojoTrainerHeader0: ; 5ce13 (17:4e13)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7b1 ; flag's byte
+ dw wd7b1 ; flag's byte
dw FightingDojoBattleText1 ; 0x4eac TextBeforeBattle
dw FightingDojoAfterBattleText1 ; 0x4eb6 TextAfterBattle
dw FightingDojoEndBattleText1 ; 0x4eb1 TextEndBattle
@@ -107,7 +107,7 @@
FightingDojoTrainerHeader1: ; 5ce1f (17:4e1f)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7b1 ; flag's byte
+ dw wd7b1 ; flag's byte
dw FightingDojoBattleText2 ; 0x4ec5 TextBeforeBattle
dw FightingDojoAfterBattleText2 ; 0x4ecf TextAfterBattle
dw FightingDojoEndBattleText2 ; 0x4eca TextEndBattle
@@ -116,7 +116,7 @@
FightingDojoTrainerHeader2: ; 5ce2b (17:4e2b)
db $4 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7b1 ; flag's byte
+ dw wd7b1 ; flag's byte
dw FightingDojoBattleText3 ; 0x4ede TextBeforeBattle
dw FightingDojoAfterBattleText3 ; 0x4ee8 TextAfterBattle
dw FightingDojoEndBattleText3 ; 0x4ee3 TextEndBattle
@@ -125,7 +125,7 @@
FightingDojoTrainerHeader3: ; 5ce37 (17:4e37)
db $5 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7b1 ; flag's byte
+ dw wd7b1 ; flag's byte
dw FightingDojoBattleText4 ; 0x4ef7 TextBeforeBattle
dw FightingDojoAfterBattleText4 ; 0x4f01 TextAfterBattle
dw FightingDojoEndBattleText4 ; 0x4efc TextEndBattle
@@ -135,7 +135,7 @@
FightingDojoText1: ; 5ce44 (17:4e44)
db $08 ; asm
- ld a, [$d7b1]
+ ld a, [wd7b1]
bit 0, a
jp nz, .continue1
bit 1, a
@@ -142,7 +142,7 @@
jp nz, .continue2
ld hl, FightingDojoText_5ce8e
call PrintText
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, FightingDojoText_5ce93
@@ -149,7 +149,7 @@
ld de, FightingDojoText_5ce93
call PreBattleSaveRegisters
ldh a, [$8c]
- ld [$cf13], a
+ ld [wcf13], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $3
@@ -257,7 +257,7 @@
FightingDojoText6: ; 5cf06 (17:4f06)
; Hitmonlee Poké Ball
db $08 ; asm
- ld a, [$d7b1]
+ ld a, [wd7b1]
and %11000000
jr z, .GetMon
ld hl, OtherHitmonText
@@ -269,10 +269,10 @@
ld hl, WantHitmonleeText
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .done
- ld a, [$cf91]
+ ld a, [wcf91]
ld b, a
ld c, 30
call GivePokemon
@@ -280,10 +280,10 @@
; once Poké Ball is taken, hide sprite
ld a, $4a
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
- ld hl, $d7b1
+ ld hl, wd7b1
set 6, [hl]
set 0, [hl]
.done
@@ -296,7 +296,7 @@
FightingDojoText7: ; 5cf4e (17:4f4e)
; Hitmonchan Poké Ball
db $08 ; asm
- ld a, [$d7b1]
+ ld a, [wd7b1]
and %11000000
jr z, .GetMon
ld hl, OtherHitmonText
@@ -308,21 +308,21 @@
ld hl, WantHitmonchanText
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .done
- ld a, [$cf91]
+ ld a, [wcf91]
ld b, a
ld c,30
call GivePokemon
jr nc, .done
- ld hl, $d7b1
+ ld hl, wd7b1
set 7, [hl]
set 0, [hl]
; once Poké Ball is taken, hide sprite
ld a, $4b
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
.done
--- a/scripts/fuchsiacity.asm
+++ b/scripts/fuchsiacity.asm
@@ -135,7 +135,7 @@
FuchsiaCityText24: ; 19af4 (6:5af4)
db $08 ; asm
- ld a, [$d7f6]
+ ld a, [wd7f6]
bit 6, a
jr nz, .asm_3b4e8 ; 0x19afa
bit 7, a
--- a/scripts/fuchsiagym.asm
+++ b/scripts/fuchsiagym.asm
@@ -9,7 +9,7 @@
ret
FuchsiaGymScript_75453: ; 75453 (1d:5453)
- ld hl, $D126
+ ld hl, wd126
bit 6, [hl]
res 6, [hl]
ret z
@@ -37,7 +37,7 @@
dw FuchsiaGymScript3
FuchsiaGymScript3: ; 7548a (1d:548a)
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, FuchsiaGymScript_75477
ld a, $f0
@@ -46,7 +46,7 @@
ld a, $9
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld hl, $d792
+ ld hl, wd792
set 1, [hl]
ld bc, (TM_06 << 8) | 1
call GiveItem
@@ -54,7 +54,7 @@
ld a, $a
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld hl, $d792
+ ld hl, wd792
set 0, [hl]
jr .asm_754c0
.BagFull
@@ -64,13 +64,13 @@
.asm_754c0
ld hl, W_OBTAINEDBADGES
set 4, [hl]
- ld hl, $d72a
+ ld hl, wd72a
set 4, [hl]
; deactivate gym trainers
- ld a, [$d792]
+ ld a, [wd792]
or %11111100
- ld [$d792], a
+ ld [wd792], a
jp FuchsiaGymScript_75477
@@ -91,7 +91,7 @@
FuchsiaGymTrainerHeader0: ; 754eb (1d:54eb)
db $2 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d792 ; flag's byte
+ dw wd792 ; flag's byte
dw FuchsiaGymBattleText1 ; 0x55ae TextBeforeBattle
dw FuchsiaGymAfterBattleText1 ; 0x55b8 TextAfterBattle
dw FuchsiaGymEndBattleText1 ; 0x55b3 TextEndBattle
@@ -100,7 +100,7 @@
FuchsiaGymTrainerHeader2: ; 754f7 (1d:54f7)
db $3 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d792 ; flag's byte
+ dw wd792 ; flag's byte
dw FuchsiaGymBattleText2 ; 0x55c7 TextBeforeBattle
dw FuchsiaGymAfterBattleText2 ; 0x55d1 TextAfterBattle
dw FuchsiaGymEndBattleText2 ; 0x55cc TextEndBattle
@@ -109,7 +109,7 @@
FuchsiaGymTrainerHeader3: ; 75503 (1d:5503)
db $4 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d792 ; flag's byte
+ dw wd792 ; flag's byte
dw FuchsiaGymBattleText3 ; 0x55e0 TextBeforeBattle
dw FuchsiaGymAfterBattleText3 ; 0x55ea TextAfterBattle
dw FuchsiaGymEndBattleText3 ; 0x55e5 TextEndBattle
@@ -118,7 +118,7 @@
FuchsiaGymTrainerHeader4: ; 7550f (1d:550f)
db $5 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d792 ; flag's byte
+ dw wd792 ; flag's byte
dw FuchsiaGymBattleText4 ; 0x55f9 TextBeforeBattle
dw FuchsiaGymAfterBattleText4 ; 0x5603 TextAfterBattle
dw FuchsiaGymEndBattleText4 ; 0x55fe TextEndBattle
@@ -127,7 +127,7 @@
FuchsiaGymTrainerHeader5: ; 7551b (1d:551b)
db $6 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d792 ; flag's byte
+ dw wd792 ; flag's byte
dw FuchsiaGymBattleText5 ; 0x5612 TextBeforeBattle
dw FuchsiaGymAfterBattleText5 ; 0x561c TextAfterBattle
dw FuchsiaGymEndBattleText5 ; 0x5617 TextEndBattle
@@ -136,7 +136,7 @@
FuchsiaGymTrainerHeader6: ; 75527 (1d:5527)
db $7 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d792 ; flag's byte
+ dw wd792 ; flag's byte
dw FuchsiaGymBattleText6 ; 0x562b TextBeforeBattle
dw FuchsiaGymAfterBattleText6 ; 0x5635 TextAfterBattle
dw FuchsiaGymEndBattleText6 ; 0x5630 TextEndBattle
@@ -146,7 +146,7 @@
FuchsiaGymText1: ; 75534 (1d:5534)
db $08 ; asm
- ld a, [$d792]
+ ld a, [wd792]
bit 1, a
jr z, .asm_181b6 ; 0x7553a
bit 0, a
@@ -161,7 +161,7 @@
.asm_181b6 ; 0x75550
ld hl, UnnamedText_75581
call PrintText
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, UnnamedText_75586
@@ -168,11 +168,11 @@
ld de, UnnamedText_75586
call PreBattleSaveRegisters
ldh a, [$8c]
- ld [$cf13], a
+ ld [wcf13], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $5
- ld [$d05c], a
+ ld [W_GYMLEADERNO], a
xor a
ldh [$b4], a
ld a, $3
@@ -318,7 +318,7 @@
FuchsiaGymText8: ; 7563a (1d:563a)
db $08 ; asm
- ld a, [$d792]
+ ld a, [wd792]
bit 1, a
ld hl, UnnamedText_75653
jr nz, .asm_50671 ; 0x75643
--- a/scripts/fuchsiahouse2.asm
+++ b/scripts/fuchsiahouse2.asm
@@ -10,19 +10,19 @@
FuchsiaHouse2Text1: ; 750c2 (1d:50c2)
db $08 ; asm
- ld a, [$d78e]
+ ld a, [wd78e]
bit 0, a
jr nz, .subtract ; 0x750c8
ld b,GOLD_TEETH
call IsItemInBag
jr nz, .asm_3f30f ; 0x750cf
- ld a, [$d78e]
+ ld a, [wd78e]
bit 1, a
jr nz, .asm_60cba ; 0x750d6
ld hl, WardenGibberishText1
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
ld hl, WardenGibberishText3
jr nz, .asm_61238 ; 0x750e8
@@ -36,7 +36,7 @@
ld a, GOLD_TEETH
ldh [$db], a
callba RemoveItemByID
- ld hl, $d78e
+ ld hl, wd78e
set 1, [hl]
.asm_60cba ; 0x75109
ld hl, WardenThankYouText
@@ -46,7 +46,7 @@
jr nc, .BagFull
ld hl, ReceivedHM04Text
call PrintText
- ld hl, $d78e
+ ld hl, wd78e
set 0, [hl]
jr .asm_52039 ; 0x75122
.subtract ; 0x75124
--- a/scripts/fuchsiahouse3.asm
+++ b/scripts/fuchsiahouse3.asm
@@ -6,7 +6,7 @@
FuchsiaHouse3Text1: ; 56181 (15:6181)
db $08 ; asm
- ld a, [$d728]
+ ld a, [wd728]
bit 4, a
jr nz, .after
@@ -14,7 +14,7 @@
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .refused
@@ -22,7 +22,7 @@
call GiveItem
jr nc, .full
- ld hl, $d728
+ ld hl, wd728
set 4, [hl]
ld hl, FuchsiaHouse3Text_561c2
--- a/scripts/gary.asm
+++ b/scripts/gary.asm
@@ -29,11 +29,11 @@
GaryScript1: ; 75f48 (1d:5f48)
ld a, $ff
ld [wJoyIgnore], a
- ld hl, $ccd3
+ ld hl, wccd3
ld de, RLEMovement75f63
call DecodeRLEList
dec a
- ld [$cd38], a
+ ld [wcd38], a
call Func_3486
ld a, $2
ld [W_GARYCURSCRIPT], a
@@ -46,19 +46,19 @@
db $ff
GaryScript2: ; 75f6a (1d:5f6a)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
call Delay3
xor a
ld [wJoyIgnore], a
- ld hl, $d355
+ ld hl, W_OPTIONS
res 7, [hl]
ld a, $1
ld [$ff8c], a
call DisplayTextID
call Delay3
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, GaryText_760f9
@@ -94,7 +94,7 @@
cp $ff
jp z, GaryScript_75f29
call UpdateSprites ; move sprites
- ld hl, $d867
+ ld hl, wd867
set 1, [hl]
ld a, $f0
ld [wJoyIgnore], a
@@ -121,7 +121,7 @@
ld [$ff8c], a
call MoveSprite
ld a, $d6
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef
ld a, $5
@@ -132,11 +132,11 @@
db $40,$40,$40,$40,$40,$FF
GaryScript5: ; 7601a (1d:601a)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
ld a, $2
- ld [$d528], a
+ ld [wd528], a
ld a, $1
ld [$ff8c], a
ld a, $8
@@ -188,11 +188,11 @@
db $40,$40,$FF
GaryScript8: ; 76083 (1d:6083)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
ld a, $d6
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
ld a, $9
@@ -202,11 +202,11 @@
GaryScript9: ; 76099 (1d:6099)
ld a, $ff
ld [wJoyIgnore], a
- ld hl, $ccd3
+ ld hl, wccd3
ld de, RLEMovement760b4
call DecodeRLEList
dec a
- ld [$cd38], a
+ ld [wcd38], a
call Func_3486
ld a, $a
ld [W_GARYCURSCRIPT], a
@@ -218,7 +218,7 @@
db $ff
GaryScript10: ; 760b9 (1d:60b9)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
xor a
@@ -244,7 +244,7 @@
GaryText1: ; 760e0 (1d:60e0)
db $08 ; asm
- ld a, [$d867]
+ ld a, [wd867]
bit 1, a
ld hl, GaryText_760f4
jr z, .asm_17e9f ; 0x760e9
@@ -275,8 +275,8 @@
GaryText3: ; 7610d (1d:610d)
db $8
- ld a, [$d717]
- ld [$d11e], a
+ ld a, [W_PLAYERSTARTER]
+ ld [wd11e], a
call GetMonName
ld hl, GaryText_76120
call PrintText
--- a/scripts/halloffameroom.asm
+++ b/scripts/halloffameroom.asm
@@ -21,7 +21,7 @@
HallofFameRoomScript2: ; 5a4bb (16:64bb)
call Delay3
- ld a, [$d358]
+ ld a, [wd358]
push af
xor a
ld [wJoyIgnore], a
@@ -28,7 +28,7 @@
ld a, $55
call Predef
pop af
- ld [$d358], a
+ ld [wd358], a
ld hl, W_FLAGS_D733
res 1, [hl]
inc hl
@@ -40,7 +40,7 @@
ld [hl], a
ld [W_LANCECURSCRIPT], a
ld [W_HALLOFFAMEROOMCURSCRIPT], a
- ld hl, $d863
+ ld hl, wd863
ld [hli], a
ld [hli], a
ld [hli], a
@@ -63,11 +63,11 @@
HallofFameRoomScript0: ; 5a50d (16:650d)
ld a, $ff
ld [wJoyIgnore], a
- ld hl, $ccd3
+ ld hl, wccd3
ld de, RLEMovement5a528
call DecodeRLEList
dec a
- ld [$cd38], a
+ ld [wcd38], a
call Func_3486
ld a, $1
ld [W_HALLOFFAMEROOMCURSCRIPT], a
@@ -78,11 +78,11 @@
db $ff
HallofFameRoomScript1: ; 5a52b (16:652b)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
ld a, $1
- ld [$d528], a
+ ld [wd528], a
ld a, $1
ld [$ff8c], a
call SetSpriteMovementBytesToFF
@@ -93,7 +93,7 @@
xor a
ld [wJoyIgnore], a
inc a
- ld [$d528], a
+ ld [wd528], a
ld a, $1
ld [$ff8c], a
call DisplayTextID
@@ -100,7 +100,7 @@
ld a, $ff
ld [wJoyIgnore], a
ld a, $8
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
ld a, $2
--- a/scripts/indigoplateaulobby.asm
+++ b/scripts/indigoplateaulobby.asm
@@ -1,17 +1,17 @@
IndigoPlateauLobbyScript: ; 19c5b (6:5c5b)
call Func_22fa
call EnableAutoTextBoxDrawing
- ld hl, $d126
+ ld hl, wd126
bit 6, [hl]
res 6, [hl]
ret z
- ld hl, $d869
+ ld hl, wd869
res 7, [hl]
- ld hl, $d734
+ ld hl, wd734
bit 1, [hl]
res 1, [hl]
ret z
- ld hl, $d863
+ ld hl, wd863
xor a
ld [hli], a
ld [hli], a
--- a/scripts/lab3.asm
+++ b/scripts/lab3.asm
@@ -10,7 +10,7 @@
Lab3Text1: ; 75c94 (1d:5c94)
db $08 ; asm
- ld a, [$d7a1]
+ ld a, [wd7a1]
bit 7, a
jr nz, .asm_e551a ; 0x75c9a
ld hl, TM35PreReceiveText
@@ -20,7 +20,7 @@
jr nc, .BagFull
ld hl, ReceivedTM35Text
call PrintText
- ld hl, $d7a1
+ ld hl, wd7a1
set 7, [hl]
jr .asm_eb896 ; 0x75cb5
.BagFull
--- a/scripts/lab4.asm
+++ b/scripts/lab4.asm
@@ -7,8 +7,8 @@
Lab4Script_75d38: ; 75d38 (1d:5d38)
xor a
- ld [$cd37], a
- ld de, $cc5b
+ ld [wcd37], a
+ ld de, wcc5b
ld hl, FossilsList
.asm_75d42
ld a, [hli]
@@ -16,7 +16,7 @@
jr z, .asm_75d64
push hl
push de
- ld [$d11e], a
+ ld [wd11e], a
ld b, a
ld a, $1c
call Predef ; indirect jump to Func_f8a5 (f8a5 (3:78a5))
@@ -25,11 +25,11 @@
ld a, b
and a
jr z, .asm_75d42
- ld a, [$d11e]
+ ld a, [wd11e]
ld [de], a
inc de
push hl
- ld hl, $cd37
+ ld hl, wcd37
inc [hl]
pop hl
jr .asm_75d42
@@ -46,13 +46,13 @@
Lab4Text1: ; 75d6c (1d:5d6c)
db $8
- ld a, [$d7a3]
+ ld a, [wd7a3]
bit 0, a
jr nz, .asm_75d96 ; 0x75d72 $22
ld hl, Lab4Text_75dc6
call PrintText
call Lab4Script_75d38
- ld a, [$cd37]
+ ld a, [wcd37]
and a
jr z, .asm_75d8d ; 0x75d81 $a
callba GiveFossilToCinnabarLab
@@ -72,7 +72,7 @@
call LoadFossilItemAndMonNameBank1D
ld hl, Lab4Text_75dd5
call PrintText
- ld hl, $d7a3
+ ld hl, wd7a3
set 2, [hl]
ld a, [W_FOSSILMON]
ld b, a
@@ -79,7 +79,7 @@
ld c, $1e
call GivePokemon
jr nc, .asm_75d93 ; 0x75db9 $d8
- ld hl, $d7a3
+ ld hl, wd7a3
res 0, [hl]
res 1, [hl]
res 2, [hl]
--- a/scripts/lance.asm
+++ b/scripts/lance.asm
@@ -9,11 +9,11 @@
ret
LanceScript_5a2c4: ; 5a2c4 (16:62c4)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
- ld a, [$d866]
+ ld a, [wd866]
bit 7, a
jr nz, .asm_5a2da
ld a, $31
@@ -25,12 +25,12 @@
LanceScript_5a2de: ; 5a2de (16:62de)
push bc
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $602
call LanceScript_5a2f0
pop bc
ld a, b
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $603
LanceScript_5a2f0: ; 5a2f0 (16:62f0)
@@ -53,7 +53,7 @@
ret
LanceScript0: ; 5a305 (16:6305)
- ld a, [$d866]
+ ld a, [wd866]
bit 6, a
ret nz
ld hl, CoordsData_5a33e
@@ -61,7 +61,7 @@
jp nc, CheckFightingMapTrainers
xor a
ld [hJoyHeld], a
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
cp $3
jr nc, .asm_5a325
ld a, $1
@@ -70,11 +70,11 @@
.asm_5a325
cp $5
jr z, LanceScript_5a35b
- ld hl, $d866
+ ld hl, wd866
bit 7, [hl]
set 7, [hl]
ret nz
- ld hl, $d126
+ ld hl, wd126
set 5, [hl]
ld a, (SFX_02_57 - SFX_Headers_02) / 3
call PlaySound
@@ -90,7 +90,7 @@
LanceScript2: ; 5a349 (16:6349)
call EndTrainerBattle
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, LanceScript_5a2f5
ld a, $1
@@ -100,11 +100,11 @@
LanceScript_5a35b: ; 5a35b (16:635b)
ld a, $ff
ld [wJoyIgnore], a
- ld hl, $ccd3
+ ld hl, wccd3
ld de, RLEList_5a379
call DecodeRLEList
dec a
- ld [$cd38], a
+ ld [wcd38], a
call Func_3486
ld a, $3
ld [W_LANCECURSCRIPT], a
@@ -119,7 +119,7 @@
db $FF
LanceScript3: ; 5a382 (16:6382)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
call Delay3
@@ -136,7 +136,7 @@
LanceTrainerHeader0: ; 5a397 (16:6397)
db $1 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d866 ; flag's byte
+ dw wd866 ; flag's byte
dw LanceBeforeBattleText ; 0x63ae TextBeforeBattle
dw LanceAfterBattleText ; 0x63b8 TextAfterBattle
dw LanceEndBattleText ; 0x63b3 TextEndBattle
@@ -161,6 +161,6 @@
LanceAfterBattleText: ; 5a3b8 (16:63b8)
TX_FAR _LanceAfterBattleText
db $8
- ld hl, $d866
+ ld hl, wd866
set 6, [hl]
jp TextScriptEnd
--- a/scripts/lavenderhouse1.asm
+++ b/scripts/lavenderhouse1.asm
@@ -12,7 +12,7 @@
LavenderHouse1Text1: ; 1d8b8 (7:58b8)
db $08 ; asm
- ld a, [$d7e0]
+ ld a, [wd7e0]
bit 7, a
jr nz, .asm_72e5d ; 0x1d8be
ld hl, LavenderHouse1Text_1d8d1
@@ -34,7 +34,7 @@
LavenderHouse1Text2: ; 1d8db (7:58db)
db $08 ; asm
- ld a, [$d7e0]
+ ld a, [wd7e0]
bit 7, a
jr nz, .asm_06470 ; 0x1d8e1
ld hl, LavenderHouse1Text_1d8f4
@@ -70,7 +70,7 @@
LavenderHouse1Text5: ; 1d918 (7:5918)
db $08 ; asm
- ld a, [$d76c]
+ ld a, [wd76c]
bit 0, a
jr nz, .asm_15ac2 ; 0x1d91e
ld hl, LavenderHouse1Text_1d94c
@@ -80,7 +80,7 @@
jr nc, .BagFull
ld hl, ReceivedFluteText
call PrintText
- ld hl, $d76c
+ ld hl, wd76c
set 0, [hl]
jr .asm_da749 ; 0x1d939
.BagFull
--- a/scripts/lavenderhouse2.asm
+++ b/scripts/lavenderhouse2.asm
@@ -15,7 +15,7 @@
LavenderHouse2Text2: ; 1d9c3 (7:59c3)
db $08 ; asm
- ld a, [$d7e0]
+ ld a, [wd7e0]
bit 7, a
jr nz, .asm_65711 ; 0x1d9c9
ld hl, LavenderHouse2Text_1d9dc
--- a/scripts/lavendermart.asm
+++ b/scripts/lavendermart.asm
@@ -12,7 +12,7 @@
LavenderMartText3: ; 5c93a (17:493a)
db $08 ; asm
- ld a, [$d7e0]
+ ld a, [wd7e0]
bit 7, a
jr nz, .asm_c88d4 ; 0x5c940
ld hl, LavenderMart_5c953
--- a/scripts/lavendertown.asm
+++ b/scripts/lavendertown.asm
@@ -17,7 +17,7 @@
ld hl, LavenderTownText_4413c
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
ld hl, LavenderTownText_44146
jr nz, .asm_40831 ; 0x44131
--- a/scripts/lorelei.asm
+++ b/scripts/lorelei.asm
@@ -9,13 +9,13 @@
ret
LoreleiScript_76191: ; 76191 (1d:6191)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
- ld hl, $d734
+ ld hl, wd734
set 1, [hl]
- ld a, [$d863]
+ ld a, [wd863]
bit 1, a
jr z, .asm_761a9
ld a, $5
@@ -23,7 +23,7 @@
.asm_761a9
ld a, $24
.asm_761ab
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $2
ld a, $17
jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -43,7 +43,7 @@
LoreleiScript4: ; 761c5 (1d:61c5)
ret
asm_761c6: ; 761c6 (1d:61c6)
- ld hl, $ccd3
+ ld hl, wccd3
ld a, $40
ld [hli], a
ld [hli], a
@@ -52,7 +52,7 @@
ld [hli], a
ld [hl], a
ld a, $6
- ld [$cd38], a
+ ld [wcd38], a
call Func_3486
ld a, $3
ld [W_LORELEICURSCRIPT], a
@@ -65,12 +65,12 @@
xor a
ld [hJoyPressed], a
ld [hJoyHeld], a
- ld [$ccd3], a
- ld [$cd38], a
- ld a, [wWhichTrade] ; $cd3d
+ ld [wccd3], a
+ ld [wcd38], a
+ ld a, [wWhichTrade] ; wWhichTrade
cp $3
jr c, .asm_76206
- ld hl, $d863
+ ld hl, wd863
bit 6, [hl]
set 6, [hl]
jr z, asm_761c6
@@ -79,9 +79,9 @@
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
ld a, $40
- ld [$ccd3], a
+ ld [wccd3], a
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
call Func_3486
ld a, $3
ld [W_LORELEICURSCRIPT], a
@@ -96,7 +96,7 @@
db $FF
LoreleiScript3: ; 7622c (1d:622c)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
call Delay3
@@ -107,7 +107,7 @@
ret
LoreleiScript2: ; 7623f (1d:623f)
call EndTrainerBattle
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, LoreleiScript_761b6
ld a, $1
@@ -122,7 +122,7 @@
LoreleiTrainerHeader0: ; 76255 (1d:6255)
db $1 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d863 ; flag's byte
+ dw wd863 ; flag's byte
dw LoreleiBeforeBattleText ; 0x626c TextBeforeBattle
dw LoreleiAfterBattleText ; 0x6276 TextAfterBattle
dw LoreleiEndBattleText ; 0x6271 TextEndBattle
--- a/scripts/mansion1.asm
+++ b/scripts/mansion1.asm
@@ -9,11 +9,11 @@
ret
Mansion1Subscript1: ; 442c5 (11:42c5)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
- ld a, [$d796]
+ ld a, [wd796]
bit 0, a
jr nz, .asm_442ec ; 0x442d2 $18
ld bc, $060c
@@ -36,12 +36,12 @@
Mansion1Script_44304: ; 44304 (11:4304)
ld a, $2d
- ld [$d09f], a
+ ld [wd09f], a
jr asm_44310
Mansion1Script_4430b: ; 4430b (11:430b)
ld a, $e
- ld [$d09f], a
+ ld [wd09f], a
asm_44310: ; 44310 (11:4310)
ld a, $17
call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -48,7 +48,7 @@
ret
Mansion1Script_Switches: ; 44316 (11:4316)
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4
ret nz
xor a
@@ -72,7 +72,7 @@
Mansion1TrainerHeader0: ; 44334 (11:4334)
db $1 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d798 ; flag's byte
+ dw wd798 ; flag's byte
dw Mansion1BattleText2 ; 0x434b TextBeforeBattle
dw Mansion1AfterBattleText2 ; 0x4355 TextAfterBattle
dw Mansion1EndBattleText2 ; 0x4350 TextEndBattle
@@ -103,18 +103,18 @@
ld hl, MansionSwitchText
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .asm_4438c ; 0x44368 $22
ld a, $1
- ld [$cc3c], a
- ld hl, $d126
+ ld [wcc3c], a
+ ld hl, wd126
set 5, [hl]
ld hl, MansionSwitchPressedText
call PrintText
ld a, (SFX_02_57 - SFX_Headers_02) / 3
call PlaySound
- ld hl, $d796
+ ld hl, wd796
bit 0, [hl]
set 0, [hl]
jr z, .asm_44392 ; 0x44386 $a
--- a/scripts/mansion2.asm
+++ b/scripts/mansion2.asm
@@ -9,11 +9,11 @@
ret
Mansion2Script_51fee: ; 51fee (14:5fee)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
- ld a, [$d796]
+ ld a, [wd796]
bit 0, a
jr nz, .asm_52016
ld a, $e
@@ -39,12 +39,12 @@
ret
Mansion2Script_5202f: ; 5202f (14:602f)
- ld [$d09f], a
+ ld [wd09f], a
ld a, $17
jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
Mansion2Script_Switches: ; 52037 (14:6037)
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4
ret nz
xor a
@@ -69,7 +69,7 @@
Mansion2TrainerHeader0: ; 52057 (14:6057)
db $1 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d847 ; flag's byte
+ dw wd847 ; flag's byte
dw Mansion2BattleText1 ; 0x606e TextBeforeBattle
dw Mansion2AfterBattleText1 ; 0x6078 TextAfterBattle
dw Mansion2EndBattleText1 ; 0x6073 TextEndBattle
@@ -109,18 +109,18 @@
ld hl, Mansion2Text_520c2
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .asm_520b9 ; 0x52095 $22
ld a, $1
- ld [$cc3c], a
- ld hl, $d126
+ ld [wcc3c], a
+ ld hl, wd126
set 5, [hl]
ld hl, Mansion2Text_520c7
call PrintText
ld a, (SFX_02_57 - SFX_Headers_02) / 3
call PlaySound
- ld hl, $d796
+ ld hl, wd796
bit 0, [hl]
set 0, [hl]
jr z, .asm_520bf ; 0x520b3 $a
--- a/scripts/mansion3.asm
+++ b/scripts/mansion3.asm
@@ -9,11 +9,11 @@
ret
Mansion3Script_52204: ; 52204 (14:6204)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
- ld a, [$d796]
+ ld a, [wd796]
bit 0, a
jr nz, .asm_52224
ld a, $e
@@ -40,7 +40,7 @@
Mansion3Script0: ; 5223b (14:623b)
ld hl, CoordsData_52254
call Mansion3Script_5225b
- ld a, [$d71e]
+ ld a, [wd71e]
and a
jp z, CheckFightingMapTrainers
cp $3
@@ -48,7 +48,7 @@
jr nz, .asm_52250
ld a, $d6
.asm_52250
- ld [$d71d], a
+ ld [wd71d], a
ret
CoordsData_52254: ; 52254 (14:6254)
@@ -59,22 +59,22 @@
Mansion3Script_5225b: ; 5225b (14:625b)
xor a
- ld [$d71e], a
- ld a, [$d72d]
+ ld [wd71e], a
+ ld a, [wd72d]
bit 4, a
ret nz
call ArePlayerCoordsInArray
ret nc
- ld a, [wWhichTrade] ; $cd3d
- ld [$d71e], a
- ld hl, $d72d
+ ld a, [wWhichTrade] ; wWhichTrade
+ ld [wd71e], a
+ ld hl, wd72d
set 4, [hl]
- ld hl, $d732
+ ld hl, wd732
set 4, [hl]
ret
Mansion3Script_Switches: ; 5227a (14:627a)
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4
ret nz
xor a
@@ -95,7 +95,7 @@
Mansion3TrainerHeader0: ; 52296 (14:6296)
db $1 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d849 ; flag's byte
+ dw wd849 ; flag's byte
dw Mansion3BattleText1 ; 0x62c3 TextBeforeBattle
dw Mansion3AfterBattleText1 ; 0x62cd TextAfterBattle
dw Mansion3EndBattleText1 ; 0x62c8 TextEndBattle
@@ -104,7 +104,7 @@
Mansion3TrainerHeader2: ; 522a2 (14:62a2)
db $2 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d849 ; flag's byte
+ dw wd849 ; flag's byte
dw Mansion3BattleText2 ; 0x62d2 TextBeforeBattle
dw Mansion3AfterBattleText2 ; 0x62dc TextAfterBattle
dw Mansion3EndBattleText2 ; 0x62d7 TextEndBattle
--- a/scripts/mansion4.asm
+++ b/scripts/mansion4.asm
@@ -9,11 +9,11 @@
ret
Mansion4Script_523cf: ; 523cf (14:63cf)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
- ld a, [$d796]
+ ld a, [wd796]
bit 0, a
jr nz, .asm_523ff
ld a, $e
@@ -45,7 +45,7 @@
ret
Mansion4Script_Switches: ; 52420 (14:6420)
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4
ret nz
xor a
@@ -74,7 +74,7 @@
Mansion4TrainerHeader0: ; 52448 (14:6448)
db $1 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d84b ; flag's byte
+ dw wd84b ; flag's byte
dw Mansion4BattleText1 ; 0x6475 TextBeforeBattle
dw Mansion4AfterBattleText1 ; 0x647f TextAfterBattle
dw Mansion4EndBattleText1 ; 0x647a TextEndBattle
@@ -83,7 +83,7 @@
Mansion4TrainerHeader2: ; 52454 (14:6454)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d84b ; flag's byte
+ dw wd84b ; flag's byte
dw Mansion4BattleText2 ; 0x6484 TextBeforeBattle
dw Mansion4AfterBattleText2 ; 0x648e TextAfterBattle
dw Mansion4EndBattleText2 ; 0x6489 TextEndBattle
--- a/scripts/mtmoon1.asm
+++ b/scripts/mtmoon1.asm
@@ -32,7 +32,7 @@
MtMoon1TrainerHeader0: ; 499fd (12:59fd)
db $1 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7f5 ; flag's byte
+ dw wd7f5 ; flag's byte
dw MtMoon1BattleText2 ; 0x5a98 TextBeforeBattle
dw MtMoon1AfterBattleText2 ; 0x5aa2 TextAfterBattle
dw MtMoon1EndBattleText2 ; 0x5a9d TextEndBattle
@@ -41,7 +41,7 @@
MtMoon1TrainerHeader2: ; 49a09 (12:5a09)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7f5 ; flag's byte
+ dw wd7f5 ; flag's byte
dw MtMoon1BattleText3 ; 0x5aa7 TextBeforeBattle
dw MtMoon1AfterBattleText3 ; 0x5ab1 TextAfterBattle
dw MtMoon1EndBattleText3 ; 0x5aac TextEndBattle
@@ -50,7 +50,7 @@
MtMoon1TrainerHeader3: ; 49a15 (12:5a15)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7f5 ; flag's byte
+ dw wd7f5 ; flag's byte
dw MtMoon1BattleText4 ; 0x5ab6 TextBeforeBattle
dw MtMoon1AfterBattleText4 ; 0x5ac0 TextAfterBattle
dw MtMoon1EndBattleText4 ; 0x5abb TextEndBattle
@@ -59,7 +59,7 @@
MtMoon1TrainerHeader4: ; 49a21 (12:5a21)
db $4 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7f5 ; flag's byte
+ dw wd7f5 ; flag's byte
dw MtMoon1BattleText5 ; 0x5ac5 TextBeforeBattle
dw MtMoon1AfterBattleText5 ; 0x5acf TextAfterBattle
dw MtMoon1EndBattleText5 ; 0x5aca TextEndBattle
@@ -68,7 +68,7 @@
MtMoon1TrainerHeader5: ; 49a2d (12:5a2d)
db $5 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7f5 ; flag's byte
+ dw wd7f5 ; flag's byte
dw MtMoon1BattleText6 ; 0x5ad4 TextBeforeBattle
dw MtMoon1AfterBattleText6 ; 0x5ade TextAfterBattle
dw MtMoon1EndBattleText6 ; 0x5ad9 TextEndBattle
@@ -77,7 +77,7 @@
MtMoon1TrainerHeader6: ; 49a39 (12:5a39)
db $6 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7f5 ; flag's byte
+ dw wd7f5 ; flag's byte
dw MtMoon1BattleText7 ; 0x5ae3 TextBeforeBattle
dw MtMoon1AfterBattleText7 ; 0x5aed TextAfterBattle
dw MtMoon1EndBattleText7 ; 0x5ae8 TextEndBattle
@@ -86,7 +86,7 @@
MtMoon1TrainerHeader7: ; 49a45 (12:5a45)
db $7 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7f5 ; flag's byte
+ dw wd7f5 ; flag's byte
dw MtMoon1BattleText8 ; 0x5af2 TextBeforeBattle
dw MtMoon1AfterBattleText8 ; 0x5afc TextAfterBattle
dw MtMoon1EndBattleText8 ; 0x5af7 TextEndBattle
--- a/scripts/mtmoon3.asm
+++ b/scripts/mtmoon3.asm
@@ -5,17 +5,17 @@
ld a, [W_MTMOON3CURSCRIPT]
call ExecuteCurMapScriptInTable
ld [W_MTMOON3CURSCRIPT], a
- ld a, [$d7f6]
+ ld a, [wd7f6]
bit 1, a
ret z
ld hl, CoordsData_49d37
call ArePlayerCoordsInArray
jr nc, .asm_49d31 ; 0x49d29 $6
- ld hl, $d72e
+ ld hl, wd72e
set 4, [hl]
ret
.asm_49d31
- ld hl, $d72e
+ ld hl, wd72e
res 4, [hl]
ret
@@ -54,13 +54,13 @@
dw MtMoon3Script5
MtMoon3Script0: ; 49d6f (12:5d6f)
- ld a, [$d7f6]
+ ld a, [wd7f6]
bit 1, a
jp nz, MtMoon3Script_49d91
- ld a, [W_YCOORD] ; $d361
+ ld a, [W_YCOORD] ; wd361
cp $8
jp nz, MtMoon3Script_49d91
- ld a, [W_XCOORD] ; $d362
+ ld a, [W_XCOORD] ; wd362
cp $d
jp nz, MtMoon3Script_49d91
xor a
@@ -70,18 +70,18 @@
jp DisplayTextID
MtMoon3Script_49d91: ; 49d91 (12:5d91)
- ld a, [$d7f6]
+ ld a, [wd7f6]
and $c0
jp z, CheckFightingMapTrainers
ret
MtMoon3Script3: ; 49d9a (12:5d9a)
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, MtMoon3Script_49d58
call UpdateSprites
call Delay3
- ld hl, $d7f6
+ ld hl, wd7f6
set 1, [hl]
xor a
ld [wJoyIgnore], a
@@ -132,17 +132,17 @@
db $40,$FF
MtMoon3Script5: ; 49dfb (12:5dfb)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
ld a, $f0
ld [wJoyIgnore], a
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
ld a, $a
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld a, [$d7f6]
+ ld a, [wd7f6]
bit 6, a
jr z, .asm_49e1d
ld a, $6e
@@ -150,7 +150,7 @@
.asm_49e1d
ld a, $6d
.asm_49e1f
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
xor a
@@ -176,7 +176,7 @@
MtMoon3TrainerHeader0: ; 49e48 (12:5e48)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7f6 ; flag's byte
+ dw wd7f6 ; flag's byte
dw MtMoon3BattleText2 ; 0x5f9f TextBeforeBattle
dw MtMoon3AfterBattleText2 ; 0x5fa9 TextAfterBattle
dw MtMoon3EndBattleText2 ; 0x5fa4 TextEndBattle
@@ -185,7 +185,7 @@
MtMoon3TrainerHeader2: ; 49e54 (12:5e54)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7f6 ; flag's byte
+ dw wd7f6 ; flag's byte
dw MtMoon3BattleText3 ; 0x5fae TextBeforeBattle
dw MtMoon3AfterBattleText3 ; 0x5fb8 TextAfterBattle
dw MtMoon3EndBattleText3 ; 0x5fb3 TextEndBattle
@@ -194,7 +194,7 @@
MtMoon3TrainerHeader3: ; 49e60 (12:5e60)
db $4 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7f6 ; flag's byte
+ dw wd7f6 ; flag's byte
dw MtMoon3BattleText4 ; 0x5fbd TextBeforeBattle
dw MtMoon3AfterBattleText4 ; 0x5fc7 TextAfterBattle
dw MtMoon3EndBattleText4 ; 0x5fc2 TextEndBattle
@@ -203,7 +203,7 @@
MtMoon3TrainerHeader4: ; 49e6c (12:5e6c)
db $5 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7f6 ; flag's byte
+ dw wd7f6 ; flag's byte
dw MtMoon3BattleText5 ; 0x5fcc TextBeforeBattle
dw MtMoon3AfterBattleText5 ; 0x5fd6 TextAfterBattle
dw MtMoon3EndBattleText5 ; 0x5fd1 TextEndBattle
@@ -213,7 +213,7 @@
MtMoon3Text1: ; 49e79 (12:5e79)
db $08 ; asm
- ld a, [$d7f6]
+ ld a, [wd7f6]
bit 1, a
jr z, .asm_be1e0 ; 0x49e7f
and $c0
@@ -224,7 +224,7 @@
.asm_be1e0 ; 0x49e8d
ld hl, MtMoon3Text_49f85
call PrintText
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, MtMoon3Text_49f8a
@@ -231,7 +231,7 @@
ld de, MtMoon3Text_49f8a
call PreBattleSaveRegisters
ldh a, [$8c]
- ld [$cf13], a
+ ld [wcf13], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $3
@@ -271,11 +271,11 @@
MtMoon3Text6: ; 49ee9 (12:5ee9)
db $08 ; asm
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
ld hl, MtMoon3Text_49f24
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .asm_1fa5e ; 0x49efc
ld bc,(DOME_FOSSIL << 8) | 1
@@ -283,10 +283,10 @@
jp nc, MtMoon3Script_49f76
call MtMoon3Script_49f69
ld a, $6d
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
- ld hl, $d7f6
+ ld hl, wd7f6
set 6, [hl]
ld a, $4
ld [W_MTMOON3CURSCRIPT], a
@@ -301,11 +301,11 @@
MtMoon3Text7: ; 49f29 (12:5f29)
db $08 ; asm
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
ld hl, MtMoon3Text_49f64
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .asm_8e988 ; 0x49f3c
ld bc, (HELIX_FOSSIL << 8) | 1
@@ -313,10 +313,10 @@
jp nc, MtMoon3Script_49f76
call MtMoon3Script_49f69
ld a, $6e
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
- ld hl, $d7f6
+ ld hl, wd7f6
set 7, [hl]
ld a, $4
ld [W_MTMOON3CURSCRIPT], a
--- a/scripts/mtmoonpokecenter.asm
+++ b/scripts/mtmoonpokecenter.asm
@@ -23,16 +23,16 @@
MtMoonPokecenterText4: ; 492ec (12:52ec)
db $08 ; asm
- ld a, [$d7c6]
+ ld a, [wd7c6]
add a
jp c, .asm_49353
ld hl, MtMoonPokecenterText_4935c
call PrintText
ld a, $13
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jp nz, .asm_4934e
ldh [$9f], a
@@ -49,18 +49,18 @@
jr nc, .asm_49359 ; 0x49324
xor a
ld [wWhichTrade], a
- ld [$cd3f], a
+ ld [wTrainerFacingDirection], a
ld a, $5
- ld [$cd3e], a
- ld hl, $cd3f
- ld de, $d349
+ ld [wTrainerEngageDistance], a
+ ld hl, wTrainerFacingDirection
+ ld de, wPlayerMoney + 2
ld c, $3
ld a, $c ; SubtractBCDPredef
call Predef
ld a, $13
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
- ld hl, $d7c6
+ ld hl, wd7c6
set 7, [hl]
jr .asm_49359 ; 0x4934c
.asm_4934e ; 0x4934e
--- a/scripts/museum1f.asm
+++ b/scripts/museum1f.asm
@@ -1,8 +1,8 @@
Museum1FScript: ; 5c0f7 (17:40f7)
ld a, $1
- ld [$cf0c], a
+ ld [wcf0c], a
xor a
- ld [$cc3c], a
+ ld [wcc3c], a
ld hl, Museum1FScriptPointers
ld a, [W_MUSEUM1FCURSCRIPT]
jp CallFunctionInTable
@@ -54,7 +54,7 @@
cp $c
jp z, Museum1FScript_5c1f9
.asm_d49e7
- ld a, [$d754]
+ ld a, [wd754]
bit 0, a
jr nz, .asm_31a16
ld hl, Museum1FText_5c23d
@@ -61,7 +61,7 @@
call PrintText
jp asm_d1145
.asm_b8709
- ld a, [$d754]
+ ld a, [wd754]
bit 0, a
jr z, .asm_3ded4
.asm_31a16
@@ -70,7 +70,7 @@
jp asm_d1145
.asm_3ded4
ld a, $13
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
xor a
ld [hJoyHeld], a
@@ -77,7 +77,7 @@
ld hl, Museum1FText_5c21f
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .asm_de133
xor a
@@ -93,20 +93,20 @@
.asm_0f3e3
ld hl, Museum1FText_5c224
call PrintText
- ld hl, $d754
+ ld hl, wd754
set 0, [hl]
xor a
- ld [$cd3d], a
- ld [$cd3e], a
+ ld [wWhichTrade], a
+ ld [wTrainerEngageDistance], a
ld a, $50
- ld [$cd3f], a
- ld hl, $cd3f
- ld de, $d349
+ ld [wTrainerFacingDirection], a
+ ld hl, wTrainerFacingDirection
+ ld de, wPlayerMoney + 2
ld c, $3
ld a, $c ; SubtractBCDPredef
call Predef
ld a, $13
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
ld a, (SFX_02_5a - SFX_Headers_02) / 3
call PlaySoundWaitForCurrent
@@ -116,9 +116,9 @@
ld hl, Museum1FText_5c21a ; $421a
call PrintText
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
ld a, $80
- ld [$ccd3], a
+ ld [wccd3], a
call Func_3486
call UpdateSprites
jr asm_d1145
@@ -131,7 +131,7 @@
ld hl, Museum1FText_5c22e
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
cp $0
jr nz, .asm_d1144
ld hl, Museum1FText_5c233
@@ -191,7 +191,7 @@
Museum1FText3: ; 5c256 (17:4256)
db $08 ; asm
- ld a, [$d754]
+ ld a, [wd754]
bit 1, a
jr nz, .asm_16599 ; 0x5c25c
ld hl, Museum1FText_5c28e
@@ -199,10 +199,10 @@
ld bc, (OLD_AMBER << 8) | 1
call GiveItem
jr nc, .BagFull
- ld hl, $d754
+ ld hl, wd754
set 1, [hl]
ld a, $34
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
ld hl, ReceivedOldAmberText
--- a/scripts/namerater.asm
+++ b/scripts/namerater.asm
@@ -4,7 +4,7 @@
NameRaterScript_1da15: ; 1da15 (7:5a15)
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
ret
@@ -17,11 +17,11 @@
ld c, $b
call .asm_1da47
jr c, .asm_1da52 ; 0x1da34 $1c
- ld hl, $d177
+ ld hl, W_PARTYMON1_OTID
ld bc, $002c
ld a, [wWhichPokemon]
call AddNTimes
- ld de, $d359
+ ld de, wPlayerID
ld c, $2
.asm_1da47
ld a, [de]
@@ -49,9 +49,9 @@
ld hl, NameRaterText_1dab8
call PrintText
xor a
- ld [$d07d], a
- ld [$cfcb], a
- ld [$cc35], a
+ ld [wd07d], a
+ ld [wcfcb], a
+ ld [wcc35], a
call DisplayPartyMenu
push af
call GBPalWhiteOutWithDelay3
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -1,11 +1,11 @@
OaksLabScript: ; 1cb0e (7:4b0e)
- ld a, [$d74b]
+ ld a, [wd74b]
bit 6, a
call nz, OaksLabScript_1d076
ld a, $1
- ld [$cf0c], a
+ ld [wcf0c], a
xor a
- ld [$cc3c], a
+ ld [wcc3c], a
ld hl, OaksLabScriptPointers
ld a, [W_OAKSLABCURSCRIPT]
jp CallFunctionInTable
@@ -32,17 +32,17 @@
dw OaksLabScript18
OaksLabScript0: ; 1cb4e (7:4b4e)
- ld a, [$d74b]
+ ld a, [wd74b]
bit 7, a
ret z
- ld a, [$cf10]
+ ld a, [wcf10]
and a
ret nz
ld a, $31
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef
- ld hl, $d72e
+ ld hl, wd72e
res 4, [hl]
ld a, $1
@@ -63,15 +63,15 @@
db $40,$40,$40,$FF
OaksLabScript2: ; 1cb82 (7:4b82)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
ld a, $31
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
ld a, $2e
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef
@@ -81,11 +81,11 @@
OaksLabScript3: ; 1cba2 (7:4ba2)
call Delay3
- ld hl, $ccd3
+ ld hl, wccd3
ld de, PlayerEntryMovementRLE
call DecodeRLEList
dec a
- ld [$cd38], a
+ ld [wcd38], a
call Func_3486
ld a, $1
ld [$ff8c], a
@@ -106,12 +106,12 @@
db $40, $8, $ff
OaksLabScript4: ; 1cbd2 (7:4bd2)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
- ld hl, $d747
+ ld hl, wd747
set 0, [hl]
- ld hl, $d74b
+ ld hl, wd74b
set 0, [hl]
ld a, $1
ld [$ff8c], a
@@ -145,7 +145,7 @@
ld a, $14
ld [$ff8c], a
call DisplayTextID
- ld hl, $d74b
+ ld hl, wd74b
set 1, [hl]
xor a
ld [wJoyIgnore], a
@@ -173,12 +173,12 @@
ld [$ff8c], a
call DisplayTextID
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
ld a, $40
- ld [$ccd3], a
+ ld [wccd3], a
call Func_3486
ld a, $8
- ld [$d528], a
+ ld [wd528], a
ld a, $7
ld [W_OAKSLABCURSCRIPT], a
@@ -185,7 +185,7 @@
ret
OaksLabScript7: ; 1cc72 (7:4c72)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
call Delay3
@@ -267,7 +267,7 @@
ret
OaksLabScript9: ; 1cd00 (7:4d00)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
ld a, $fc
@@ -280,7 +280,7 @@
ld a, $d
ld [$ff8c], a
call DisplayTextID
- ld a, [$cd3e]
+ ld a, [wTrainerEngageDistance]
cp $2
jr nz, .asm_1cd28 ; 0x1cd22 $4
ld a, $2b
@@ -293,14 +293,14 @@
.asm_1cd30
ld a, $2d
.asm_1cd32
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
call Delay3
- ld a, [$cd3d]
+ ld a, [wWhichTrade]
ld [W_RIVALSTARTER], a
- ld [$cf91], a
- ld [$d11e], a
+ ld [wcf91], a
+ ld [wd11e], a
call GetMonName
ld a, $1
ld [$ff8c], a
@@ -310,7 +310,7 @@
ld a, $e
ld [$ff8c], a
call DisplayTextID
- ld hl, $d74b
+ ld hl, wd74b
set 2, [hl]
xor a
ld [wJoyIgnore], a
@@ -329,7 +329,7 @@
ld [$ff8d], a
call Func_34a6 ; face object
ld a, $8
- ld [$d528], a
+ ld [wd528], a
ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic ; play music
@@ -348,7 +348,7 @@
ld [$ff95], a
ld a, $20
call Predef
- ld de, $cc97
+ ld de, wcc97
ld a, $1
ld [$ff8c], a
call MoveSprite
@@ -358,7 +358,7 @@
ret
OaksLabScript11: ; 1cdb9 (7:4db9)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
@@ -380,18 +380,18 @@
.done
ld [W_TRAINERNO], a
ld a, $1
- ld [$cf13], a
+ ld [wcf13], a
call Func_32ef
ld hl, OaksLabText_1d3be
ld de, OaksLabText_1d3c3
call PreBattleSaveRegisters
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
xor a
ld [wJoyIgnore], a
ld a, $8
- ld [$d528], a
+ ld [wd528], a
ld a, $c
ld [W_OAKSLABCURSCRIPT], a
ret
@@ -400,10 +400,10 @@
ld a, $f0
ld [wJoyIgnore], a
ld a, $8
- ld [$d528], a
+ ld [wd528], a
call UpdateSprites
ld a, $1
- ld [$cf13], a
+ ld [wcf13], a
call Func_32f9
ld a, $1
ld [$ff8c], a
@@ -412,7 +412,7 @@
call Func_34a6 ; face object
ld a, $7
call Predef
- ld hl, $d74b
+ ld hl, wd74b
set 3, [hl]
ld a, $d
@@ -439,7 +439,7 @@
.asm_1ce5b
ld a, $80
.asm_1ce5d
- ld [$cc5b], a
+ ld [wcc5b], a
ld a, $e
ld [W_OAKSLABCURSCRIPT], a
@@ -449,11 +449,11 @@
db $E0,$00,$00,$00,$00,$00,$FF
OaksLabScript14: ; 1ce6d (7:4e6d)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
jr nz, .asm_1ce8c ; 0x1ce72 $18
ld a, $2a
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
xor a
@@ -463,7 +463,7 @@
ld [W_OAKSLABCURSCRIPT], a
jr .done ; 0x1ce8a $23
.asm_1ce8c
- ld a, [$cf0f]
+ ld a, [wcf0f]
cp $5
jr nz, .asm_1cea8 ; 0x1ce91 $15
ld a, [W_XCOORD]
@@ -470,17 +470,17 @@
cp $4
jr nz, .asm_1cea1 ; 0x1ce98 $7
ld a, $c
- ld [$c109], a
+ ld [wSpriteStateData1 + 9], a
jr .done ; 0x1ce9f $e
.asm_1cea1
ld a, $8
- ld [$c109], a
+ ld [wSpriteStateData1 + 9], a
jr .done ; 0x1cea6 $7
.asm_1cea8
cp $4
ret nz
xor a
- ld [$c109], a
+ ld [wSpriteStateData1 + 9], a
.done
ret
@@ -489,7 +489,7 @@
ld [hJoyHeld], a
call EnableAutoTextBoxDrawing
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
callba Music_RivalAlternateStart
ld a, $15
@@ -497,20 +497,20 @@
call DisplayTextID
call OaksLabScript_1d02b
ld a, $2a
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef
- ld a, [$cd37]
- ld [$d157], a
+ ld a, [wcd37]
+ ld [wd157], a
ld b, $0
ld c, a
- ld hl, $cc97
+ ld hl, wcc97
ld a, $40
call FillMemory
ld [hl], $ff
ld a, $1
ld [$ff8c], a
- ld de, $cc97
+ ld de, wcc97
call MoveSprite
ld a, $10
@@ -530,7 +530,7 @@
jp Func_34a6 ; face object
OaksLabScript16: ; 1cf12 (7:4f12)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
call EnableAutoTextBoxDrawing
@@ -557,11 +557,11 @@
call DisplayTextID
call Delay3
ld a, $2f
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
ld a, $30
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
call OaksLabScript_1cefd
@@ -577,32 +577,32 @@
ld a, $1b
ld [$ff8c], a
call DisplayTextID
- ld hl, $d74b
+ ld hl, wd74b
set 5, [hl]
- ld hl, $d74e
+ ld hl, wd74e
set 0, [hl]
ld a, $1
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
ld a, $2
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef
- ld a, [$d157]
+ ld a, [wd157]
ld b, $0
ld c, a
- ld hl, $cc97
+ ld hl, wcc97
xor a
call FillMemory
ld [hl], $ff
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
callba Music_RivalAlternateStart
ld a, $1
ld [$ff8c], a
- ld de, $cc97
+ ld de, wcc97
call MoveSprite
ld a, $11
@@ -610,20 +610,20 @@
ret
OaksLabScript17: ; 1cfd4 (7:4fd4)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
call Func_2307
ld a, $2a
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
- ld hl, $d7eb
+ ld hl, wd7eb
set 0, [hl]
res 1, [hl]
set 7, [hl]
ld a, $22
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef
ld a, $5
@@ -651,11 +651,11 @@
inc c
jr .asm_1d010 ; 0x1d01a $f4
.GotParcel
- ld hl, $d31d
+ ld hl, wNumBagItems
ld a, c
ld [wWhichPokemon], a
ld a, $1
- ld [$cf96], a
+ ld [wcf96], a
jp RemoveItemFromInventory
OaksLabScript_1d02b: ; 1d02b (7:502b)
@@ -667,7 +667,7 @@
cp $3
jr nz, .asm_1d045 ; 0x1d038 $b
ld a, $4
- ld [$cd37], a
+ ld [wcd37], a
ld a, $30
ld b, $b
jr .asm_1d068 ; 0x1d043 $23
@@ -675,13 +675,13 @@
cp $1
jr nz, .asm_1d054 ; 0x1d047 $b
ld a, $2
- ld [$cd37], a
+ ld [wcd37], a
ld a, $30
ld b, $9
jr .asm_1d068 ; 0x1d052 $14
.asm_1d054
ld a, $3
- ld [$cd37], a
+ ld [wcd37], a
ld b, $a
ld a, [W_XCOORD]
cp $4
@@ -695,7 +695,7 @@
ld a, b
ld [$ffed], a
ld a, $1
- ld [$cf13], a
+ ld [wcf13], a
call Func_32f9
ret
@@ -750,7 +750,7 @@
OaksLabText28: ; 1d0ce (7:50ce)
OaksLabText1: ; 1d0ce (7:50ce)
db $08 ; asm
- ld a, [$d74b]
+ ld a, [wd74b]
bit 0, a
jr nz, .asm_1d0de ; 0x1d0d4
ld hl, OaksLabGaryText1
@@ -784,9 +784,9 @@
OaksLabText2: ; 1d102 (7:5102)
db $8
ld a, STARTER2
- ld [$cd3d], a
+ ld [wWhichTrade], a
ld a, $3
- ld [$cd3e], a
+ ld [wTrainerEngageDistance], a
ld a, STARTER1
ld b, $2
jr OaksLabScript_1d133 ; 0x1d111 $20
@@ -795,9 +795,9 @@
OaksLabText3: ; 1d113 (7:5113)
db $8
ld a, STARTER3
- ld [$cd3d], a
+ ld [wWhichTrade], a
ld a, $4
- ld [$cd3e], a
+ ld [wTrainerEngageDistance], a
ld a, STARTER2
ld b, $3
jr OaksLabScript_1d133 ; 0x1d122 $f
@@ -806,18 +806,18 @@
OaksLabText4: ; 1d124 (7:5124)
db $8
ld a, STARTER1
- ld [$cd3d], a
+ ld [wWhichTrade], a
ld a, $2
- ld [$cd3e], a
+ ld [wTrainerEngageDistance], a
ld a, STARTER3
ld b, $4
OaksLabScript_1d133: ; 1d133 (7:5133)
- ld [$cf91], a
- ld [$d11e], a
+ ld [wcf91], a
+ ld [wd11e], a
ld a, b
- ld [$cf13], a
- ld a, [$d74b]
+ ld [wcf13], a
+ ld a, [wd74b]
bit 2, a
jp nz, OaksLabScript_1d22d
bit 1, a
@@ -844,16 +844,16 @@
ld [$ff8b], a
call Func_34fc
ld [hl], $c
- ld hl, $d730
+ ld hl, wd730
set 6, [hl]
ld a, $46
call Predef ; DisplayStarterMonDex
- ld hl, $d730
+ ld hl, wd730
res 6, [hl]
call ReloadMapData
ld c, $a
call DelayFrames
- ld a, [$cf13]
+ ld a, [wcf13]
cp $2
jr z, OaksLabLookAtCharmander
cp $3
@@ -884,16 +884,16 @@
OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3)
call PrintText
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
call YesNoChoice ; yes/no menu
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, OaksLabMonChoiceEnd
- ld a, [$cf91]
- ld [$d717], a
- ld [$d11e], a
+ ld a, [wcf91]
+ ld [W_PLAYERSTARTER], a
+ ld [wd11e], a
call GetMonName
- ld a, [$cf13]
+ ld a, [wcf13]
cp $2
jr nz, asm_1d1db ; 0x1d1d5 $4
ld a, $2b
@@ -906,23 +906,23 @@
asm_1d1e3: ; 1d1e3 (7:51e3)
ld a, $2d
asm_1d1e5: ; 1d1e5 (7:51e5)
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
ld hl, OaksLabMonEnergeticText
call PrintText
ld hl, OaksLabReceivedMonText
call PrintText
xor a
- ld [$cc49], a
+ ld [wcc49], a
ld a, $5
- ld [$d127], a
- ld a, [$cf91]
- ld [$d11e], a
+ ld [W_CURENEMYLVL], a
+ ld a, [wcf91]
+ ld [wd11e], a
call AddPokemonToParty
- ld hl, $d72e
+ ld hl, wd72e
set 3, [hl]
ld a, $fc
ld [wJoyIgnore], a
@@ -957,16 +957,16 @@
OaksLabText32: ; 1d248 (7:5248)
OaksLabText5: ; 1d248 (7:5248)
db $08 ; asm
- ld a, [$d747]
+ ld a, [wd747]
bit 6, a
jr nz, .asm_50e81 ; 0x1d24e
- ld hl, $d2f7
+ ld hl, wPokedexOwned
ld b, $13
call CountSetBits
- ld a, [$d11e]
+ ld a, [wd11e]
cp $2
jr c, .asm_b28b0 ; 0x1d25d
- ld a, [$d74b]
+ ld a, [wd74b]
bit 5, a
jr z, .asm_b28b0 ; 0x1d264
.asm_50e81 ; 0x1d266
@@ -973,7 +973,7 @@
ld hl, OaksLabText_1d31d
call PrintText
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
ld a, $56
call Predef
jp .asm_0f042
@@ -981,15 +981,15 @@
ld b,POKE_BALL
call IsItemInBag
jr nz, .asm_17c30 ; 0x1d27e
- ld a, [$d7eb]
+ ld a, [wd7eb]
bit 5, a
jr nz, .asm_f1adc ; 0x1d285
- ld a, [$d74b]
+ ld a, [wd74b]
bit 5, a
jr nz, .asm_333a2 ; 0x1d28c
bit 3, a
jr nz, .asm_76269 ; 0x1d290
- ld a, [$d72e]
+ ld a, [wd72e]
bit 3, a
jr nz, .asm_4a5e0 ; 0x1d297
ld hl, OaksLabText_1d2f0
@@ -1018,7 +1018,7 @@
call PrintText
jr .asm_0f042 ; 0x1d2ce
.asm_f1adc ; 0x1d2d0
- ld hl, $d74b
+ ld hl, wd74b
bit 4, [hl]
set 4, [hl]
jr nz, .asm_17c30 ; 0x1d2d7
--- a/scripts/pallettown.asm
+++ b/scripts/pallettown.asm
@@ -1,8 +1,8 @@
PalletTownScript: ; 18e5b (6:4e5b)
- ld a,[$D74B]
+ ld a,[wd74b]
bit 4,a
jr z,.next
- ld hl,$D747
+ ld hl,wd747
set 6,[hl]
.next
call EnableAutoTextBoxDrawing
@@ -20,7 +20,7 @@
dw PalletTownScript6
PalletTownScript0: ; 18e81 (6:4e81)
- ld a,[$D747]
+ ld a,[wd747]
bit 0,a
ret nz
ld a,[W_YCOORD]
@@ -29,7 +29,7 @@
xor a
ld [hJoyHeld],a
ld a,4
- ld [$D528],a
+ ld [wd528],a
ld a,$FF
call PlaySound ; stop music
ld a, BANK(Music_MeetProfOak)
@@ -38,7 +38,7 @@
call PlayMusic ; plays music
ld a,$FC
ld [wJoyIgnore],a
- ld hl,$D74B
+ ld hl,wd74b
set 7,[hl]
; trigger the next script
@@ -48,7 +48,7 @@
PalletTownScript1: ; 18eb2 (6:4eb2)
xor a
- ld [$CF0D],a
+ ld [wcf0d],a
ld a,1
ld [$FF8C],a
call DisplayTextID
@@ -55,7 +55,7 @@
ld a,$FF
ld [wJoyIgnore],a
ld a,0
- ld [$CC4D],a
+ ld [wcc4d],a
ld a,$15
call Predef
@@ -83,8 +83,8 @@
ld hl,$FF95
dec [hl]
ld a,$20
- call Predef ; load Oak’s movement into $CC97
- ld de,$CC97
+ call Predef ; load Oak’s movement into wcc97
+ ld de,wcc97
ld a,1 ; oak
ld [$FF8C],a
call MoveSprite
@@ -97,13 +97,13 @@
ret
PalletTownScript3: ; 18f12 (6:4f12)
- ld a,[$D730]
+ ld a,[wd730]
bit 0,a
ret nz
xor a
- ld [$C109],a
+ ld [wSpriteStateData1 + 9],a
ld a,1
- ld [$CF0D],a
+ ld [wcf0d],a
ld a,$FC
ld [wJoyIgnore],a
ld a,1
@@ -112,13 +112,13 @@
ld a,$FF
ld [wJoyIgnore],a
ld a,1
- ld [$CF13],a
+ ld [wcf13],a
xor a
- ld [$CF10],a
+ ld [wcf10],a
ld a,1
- ld [$CC57],a
+ ld [wcc57],a
ld a,[H_LOADEDROMBANK]
- ld [$CC58],a
+ ld [wcc58],a
; trigger the next script
ld a,4
@@ -126,7 +126,7 @@
ret
PalletTownScript4: ; 18f4b (6:4f4b)
- ld a,[$CC57]
+ ld a,[wcc57]
and a
ret nz
@@ -136,27 +136,27 @@
ret
PalletTownScript5: ; 18f56 (6:4f56)
- ld a,[$D74A]
+ ld a,[wd74a]
bit 2,a
jr nz,.next
and 3
cp 3
jr nz,.next
- ld hl,$D74A
+ ld hl,wd74a
set 2,[hl]
ld a,$27
- ld [$CC4D],a
+ ld [wcc4d],a
ld a,$11
call Predef
ld a,$28
- ld [$CC4D],a
+ ld [wcc4d],a
ld a,$15
jp Predef
.next
- ld a,[$D74B]
+ ld a,[wd74b]
bit 4,a
ret z
- ld hl,$D74B
+ ld hl,wd74b
set 6,[hl]
PalletTownScript6: ; 18f87 (6:4f87)
ret
@@ -172,11 +172,11 @@
PalletTownText1: ; 18f96 (6:4f96)
db 8
- ld a,[$CF0D]
+ ld a,[wcf0d]
and a
jr nz,.next
ld a,1
- ld [$CC3C],a
+ ld [wcc3c],a
ld hl,OakAppearsText
jr .done
.next
@@ -191,12 +191,12 @@
ld c,10
call DelayFrames
xor a
- ld [$CD4F],a
- ld [$CD50],a
+ ld [wcd4f],a
+ ld [wcd50],a
ld a,$4C
call Predef ; display ! over head
ld a,4
- ld [$D528],a
+ ld [wd528],a
jp TextScriptEnd
OakWalksUpText: ; 18fce (6:4fce)
--- a/scripts/pewtercity.asm
+++ b/scripts/pewtercity.asm
@@ -16,13 +16,13 @@
PewterCityScript0: ; 19251 (6:5251)
xor a
ld [W_MUSEUM1FCURSCRIPT], a
- ld hl, $d754
+ ld hl, wd754
res 0, [hl]
call PewterCityScript_1925e
ret
PewterCityScript_1925e: ; 1925e (6:525e)
- ld a, [$d755]
+ ld a, [wd755]
bit 7, a
ret nz
ld hl, CoordsData_19277
@@ -42,7 +42,7 @@
db $ff
PewterCityScript1: ; 19280 (6:5280)
- ld a, [$cc57]
+ ld a, [wcc57]
and a
ret nz
ld a, $3
@@ -68,7 +68,7 @@
ld a, $11
ld [$ffee], a
ld a, $3
- ld [$cf13], a
+ ld [wcf13], a
call Func_32f9
ld a, $3
ld [$ff8c], a
@@ -82,11 +82,11 @@
db $00,$00,$00,$00,$FF
PewterCityScript2: ; 192d3 (6:52d3)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
ld a, $3
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
ld a, $3
@@ -95,10 +95,10 @@
PewterCityScript3: ; 192e9 (6:52e9)
ld a, $3
- ld [$cf13], a
+ ld [wcf13], a
call Func_32fe
ld a, $3
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef
xor a
@@ -108,7 +108,7 @@
ret
PewterCityScript4: ; 19305 (6:5305)
- ld a, [$cc57]
+ ld a, [wcc57]
and a
ret nz
ld a, $5
@@ -134,7 +134,7 @@
ld a, $10
ld [$ffee], a
ld a, $5
- ld [$cf13], a
+ ld [wcf13], a
call Func_32f9
ld a, $5
ld [$ff8c], a
@@ -148,11 +148,11 @@
db $C0,$C0,$C0,$C0,$C0,$FF
PewterCityScript5: ; 19359 (6:5359)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
ld a, $4
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
ld a, $6
@@ -161,10 +161,10 @@
PewterCityScript6: ; 1936f (6:536f)
ld a, $5
- ld [$cf13], a
+ ld [wcf13], a
call Func_32fe
ld a, $4
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef
xor a
@@ -202,7 +202,7 @@
ld hl, PewterCityText_193f1
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .asm_f46a9 ; 0x193bf
ld hl, PewterCityText_193f6
@@ -214,13 +214,13 @@
xor a
ldh [$b3], a
ldh [$b4], a
- ld [$cf10], a
+ ld [wcf10], a
ld a, $2
- ld [$cc57], a
+ ld [wcc57], a
ldh a, [$b8]
- ld [$cc58], a
+ ld [wcc58], a
ld a, $3
- ld [$cf13], a
+ ld [wcf13], a
call Func_32f4
ld a, $1
ld [W_PEWTERCITYCURSCRIPT], a
@@ -248,7 +248,7 @@
ld hl, PewterCityText_19427
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
cp $0
jr nz, .asm_e4603
ld hl, PewterCityText_1942c
@@ -278,13 +278,13 @@
call PrintText
xor a
ldh [$b4], a
- ld [$cf10], a
+ ld [wcf10], a
ld a, $3
- ld [$cc57], a
+ ld [wcc57], a
ldh a, [$b8]
- ld [$cc58], a
+ ld [wcc58], a
ld a, $5
- ld [$cf13], a
+ ld [wcf13], a
call Func_32f4
ld a, $4
ld [W_PEWTERCITYCURSCRIPT], a
--- a/scripts/pewtergym.asm
+++ b/scripts/pewtergym.asm
@@ -1,5 +1,5 @@
PewterGymScript: ; 5c387 (17:4387)
- ld hl, $d126
+ ld hl, wd126
bit 6, [hl]
res 6, [hl]
call nz, PewterGymScript_5c3a4
@@ -36,7 +36,7 @@
dw PewterGymScript3
PewterGymScript3: ; 5c3d2 (17:43d2)
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, PewterGymScript_5c3bf
ld a, $f0
@@ -46,7 +46,7 @@
ld a, $4
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld hl, $d755
+ ld hl, wd755
set 7, [hl]
ld bc, (TM_34 << 8) | 1
call GiveItem
@@ -54,7 +54,7 @@
ld a, $5
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld hl, $d755
+ ld hl, wd755
set 6, [hl]
jr .asm_5c408
.BagFull
@@ -64,24 +64,24 @@
.asm_5c408
ld hl, W_OBTAINEDBADGES
set 0, [hl]
- ld hl, $d72a
+ ld hl, wd72a
set 0, [hl]
ld a, $4
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
ld a, $22
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
- ld hl, $d7eb
+ ld hl, wd7eb
res 0, [hl]
res 7, [hl]
; deactivate gym trainers
- ld hl, $d755
+ ld hl, wd755
set 2, [hl]
jp PewterGymScript_5c3bf
@@ -98,7 +98,7 @@
PewterGymTrainerHeader0: ; 5c441 (17:4441)
db $2 ; flag's bit
db ($5 << 4) ; trainer's view range
- dw $d755 ; flag's byte
+ dw wd755 ; flag's byte
dw PewterGymBattleText1 ; 0x44d0 TextBeforeBattle
dw PewterGymAfterBattleText1 ; 0x44da TextAfterBattle
dw PewterGymEndBattleText1 ; 0x44d5 TextEndBattle
@@ -108,7 +108,7 @@
PewterGymText1: ; 5c44e (17:444e)
db $08 ; asm
- ld a, [$d755]
+ ld a, [wd755]
bit 7, a
jr z, .asm_4a735 ; 0x5c454
bit 6, a
@@ -123,7 +123,7 @@
.asm_4a735 ; 0x5c46a
ld hl, PewterGymText_5c49e
call PrintText
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, PewterGymText_5c4bc
@@ -130,11 +130,11 @@
ld de, PewterGymText_5c4bc
call PreBattleSaveRegisters
ldh a, [$8c]
- ld [$cf13], a
+ ld [wcf13], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $1
- ld [$d05c], a
+ ld [W_GYMLEADERNO], a
xor a
ldh [$b4], a
ld a, $3
@@ -191,13 +191,13 @@
PewterGymText3: ; 5c4df (17:44df)
db $08 ; asm
- ld a, [$d72a]
+ ld a, [wd72a]
bit 0, a
jr nz, .asm_71369 ; 0x5c4e5
ld hl, PewterGymText_5c515
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .asm_6123a ; 0x5c4f4
ld hl, PewterGymText_5c51a
--- a/scripts/pewtermart.asm
+++ b/scripts/pewtermart.asm
@@ -1,7 +1,7 @@
PewterMartScript: ; 74cad (1d:4cad)
call EnableAutoTextBoxDrawing
ld a, $1
- ld [$cf0c], a
+ ld [wcf0c], a
ret
PewterMartTextPointers: ; 74cb6 (1d:4cb6)
--- a/scripts/pewterpokecenter.asm
+++ b/scripts/pewterpokecenter.asm
@@ -18,7 +18,7 @@
PewterPokecenterText3: ; 5c59b (17:459b)
db $8
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
ld hl, PewterPokecenterText5
call PrintText
ld a, $ff
@@ -26,11 +26,11 @@
ld c, $20
call DelayFrames
ld hl, Unknown_5c608 ; $4608
- ld de, $cd3f
+ ld de, wTrainerFacingDirection
ld bc, $0004
call CopyData
- ld a, [$c132]
- ld hl, $cd3f
+ ld a, [wSpriteStateData1 + $32]
+ ld hl, wTrainerFacingDirection
.asm_5c5c3
cp [hl]
inc hl
@@ -43,20 +43,20 @@
pop hl
.asm_5c5d1
ld a, [hl]
- ld [$c132], a
+ ld [wSpriteStateData1 + $32], a
push hl
- ld hl, $cd3f
- ld de, $cd3e
+ ld hl, wTrainerFacingDirection
+ ld de, wTrainerEngageDistance
ld bc, $0004
call CopyData
- ld a, [$cd3e]
- ld [$cd42], a
+ ld a, [wTrainerEngageDistance]
+ ld [wcd42], a
pop hl
ld c, $18
call DelayFrames
- ld a, [$c026]
+ ld a, [wc026]
ld b, a
- ld a, [$c027]
+ ld a, [wc027]
or b
jr nz, .asm_5c5d1 ; 0x5c5f6 $d9
ld c, $30
--- a/scripts/pokemontower2.asm
+++ b/scripts/pokemontower2.asm
@@ -17,7 +17,7 @@
dw PokemonTower2Script2
PokemonTower2Script0: ; 6050f (18:450f)
- ld a, [$d764]
+ ld a, [wd764]
bit 7, a
ret nz
ld hl, CoordsData_6055e ; $455e
@@ -24,24 +24,24 @@
call ArePlayerCoordsInArray
ret nc
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
- ld hl, $d764
+ ld hl, wd764
res 6, [hl]
- ld a, [$cd3d]
+ ld a, [wWhichTrade]
cp $1
ld a, $8
ld b, $0
jr nz, .asm_60544 ; 0x60539 $9
- ld hl, $d764
+ ld hl, wd764
set 6, [hl]
ld a, $2
ld b, $c
.asm_60544
- ld [$d528], a
+ ld [wd528], a
ld a, $1
ld [$ff8c], a
ld a, b
@@ -61,18 +61,18 @@
db $0F ; isn't this supposed to end in $ff?
PokemonTower2Script1: ; 60563 (18:4563)
- ld a, [$d057]
+ ld a, [W_ISINBATTLE]
cp $ff
jp z, PokemonTower2Script_604fe
ld a, $f0
ld [wJoyIgnore], a
- ld hl, $d764
+ ld hl, wd764
set 7, [hl]
ld a, $1
ld [$ff8c], a
call DisplayTextID
ld de, MovementData_605b2
- ld a, [$d764]
+ ld a, [wd764]
bit 6, a
jr nz, .asm_60589 ; 0x60584 $3
ld de, MovementData_605a9
@@ -81,7 +81,7 @@
ld [$ff8c], a
call MoveSprite
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
callba Music_RivalAlternateStart
ld a, $2
@@ -96,11 +96,11 @@
db $00,$00,$C0,$C0,$C0,$C0,$00,$00,$FF
PokemonTower2Script2: ; 605bb (18:45bb)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
ld a, $38
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
xor a
@@ -117,7 +117,7 @@
PokemonTower2Text1: ; 605df (18:45df)
db $08 ; asm
- ld a, [$d764]
+ ld a, [wd764]
bit 7, a
jr z, .asm_16f24 ; 0x605e5
ld hl, PokemonTower2Text_6063c
@@ -126,7 +126,7 @@
.asm_16f24 ; 0x605ef
ld hl, PokemonTower2Text_6062d
call PrintText
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, PokemonTower2Text_60632
--- a/scripts/pokemontower3.asm
+++ b/scripts/pokemontower3.asm
@@ -22,7 +22,7 @@
PokemonTower3TrainerHeader0: ; 606ed (18:46ed)
db $1 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d765 ; flag's byte
+ dw wd765 ; flag's byte
dw PokemonTower3BattleText1 ; 0x4730 TextBeforeBattle
dw PokemonTower3AfterBattleText1 ; 0x473a TextAfterBattle
dw PokemonTower3EndBattleText1 ; 0x4735 TextEndBattle
@@ -31,7 +31,7 @@
PokemonTower3TrainerHeader1: ; 606f9 (18:46f9)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d765 ; flag's byte
+ dw wd765 ; flag's byte
dw PokemonTower3BattleText2 ; 0x473f TextBeforeBattle
dw PokemonTower3AfterBattleText2 ; 0x4749 TextAfterBattle
dw PokemonTower3EndBattleText2 ; 0x4744 TextEndBattle
@@ -40,7 +40,7 @@
PokemonTower3TrainerHeader2: ; 60705 (18:4705)
db $3 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d765 ; flag's byte
+ dw wd765 ; flag's byte
dw PokemonTower3BattleText3 ; 0x474e TextBeforeBattle
dw PokemonTower3AfterBattleText3 ; 0x4758 TextAfterBattle
dw PokemonTower3EndBattleText3 ; 0x4753 TextEndBattle
--- a/scripts/pokemontower4.asm
+++ b/scripts/pokemontower4.asm
@@ -24,7 +24,7 @@
PokemonTower4TrainerHeader0: ; 6081b (18:481b)
db $1 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d766 ; flag's byte
+ dw wd766 ; flag's byte
dw PokemonTower4BattleText1 ; 0x485e TextBeforeBattle
dw PokemonTower4AfterBattleText1 ; 0x4868 TextAfterBattle
dw PokemonTower4EndBattleText1 ; 0x4863 TextEndBattle
@@ -33,7 +33,7 @@
PokemonTower4TrainerHeader1: ; 60827 (18:4827)
db $2 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d766 ; flag's byte
+ dw wd766 ; flag's byte
dw PokemonTower4BattleText2 ; 0x486d TextBeforeBattle
dw PokemonTower4AfterBattleText2 ; 0x4877 TextAfterBattle
dw PokemonTower4EndBattleText2 ; 0x4872 TextEndBattle
@@ -42,7 +42,7 @@
PokemonTower4TrainerHeader2: ; 60833 (18:4833)
db $3 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d766 ; flag's byte
+ dw wd766 ; flag's byte
dw PokemonTower4BattleText3 ; 0x487c TextBeforeBattle
dw PokemonTower4AfterBattleText3 ; 0x4886 TextAfterBattle
dw PokemonTower4EndBattleText3 ; 0x4881 TextEndBattle
--- a/scripts/pokemontower5.asm
+++ b/scripts/pokemontower5.asm
@@ -16,13 +16,13 @@
ld hl, CoordsData_60992 ; $4992
call ArePlayerCoordsInArray
jr c, .asm_60960
- ld hl, $d72e
+ ld hl, wd72e
res 4, [hl]
- ld hl, $d767
+ ld hl, wd767
res 7, [hl]
jp CheckFightingMapTrainers
.asm_60960
- ld hl, $d767
+ ld hl, wd767
bit 7, [hl]
set 7, [hl]
ret nz
@@ -30,7 +30,7 @@
ld [hJoyHeld], a
ld a, $f0
ld [wJoyIgnore], a
- ld hl, $d72e
+ ld hl, wd72e
set 4, [hl]
ld a, $7
call Predef ; indirect jump to HealParty (f6a5 (3:76a5))
@@ -65,7 +65,7 @@
PokemonTower5TrainerHeader0: ; 609a9 (18:49a9)
db $2 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d767 ; flag's byte
+ dw wd767 ; flag's byte
dw PokemonTower5BattleText1 ; 0x49e9 TextBeforeBattle
dw PokemonTower5AfterBattleText1 ; 0x49f3 TextAfterBattle
dw PokemonTower5EndBattleText1 ; 0x49ee TextEndBattle
@@ -74,7 +74,7 @@
PokemonTower5TrainerHeader1: ; 609b5 (18:49b5)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d767 ; flag's byte
+ dw wd767 ; flag's byte
dw PokemonTower5BattleText2 ; 0x4a02 TextBeforeBattle
dw PokemonTower5AfterBattleText2 ; 0x4a0c TextAfterBattle
dw PokemonTower5EndBattleText2 ; 0x4a07 TextEndBattle
@@ -83,7 +83,7 @@
PokemonTower5TrainerHeader2: ; 609c1 (18:49c1)
db $4 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d767 ; flag's byte
+ dw wd767 ; flag's byte
dw PokemonTower5BattleText3 ; 0x4a1b TextBeforeBattle
dw PokemonTower5AfterBattleText3 ; 0x4a25 TextAfterBattle
dw PokemonTower5EndBattleText3 ; 0x4a20 TextEndBattle
@@ -92,7 +92,7 @@
PokemonTower5TrainerHeader3: ; 609cd (18:49cd)
db $5 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d767 ; flag's byte
+ dw wd767 ; flag's byte
dw PokemonTower5BattleText4 ; 0x4a34 TextBeforeBattle
dw PokemonTower5AfterBattleText4 ; 0x4a3e TextAfterBattle
dw PokemonTower5EndBattleText4 ; 0x4a39 TextEndBattle
--- a/scripts/pokemontower6.asm
+++ b/scripts/pokemontower6.asm
@@ -22,7 +22,7 @@
dw PokemonTower6Script4
PokemonTower6Script0: ; 60b17 (18:4b17)
- ld a, [$d768]
+ ld a, [wd768]
bit 7, a
jp nz, CheckFightingMapTrainers
ld hl, CoordsData_60b45 ; $4b45
@@ -34,9 +34,9 @@
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
ld a, MAROWAK
- ld [W_CUROPPONENT], a ; $d059
+ ld [W_CUROPPONENT], a ; wd059
ld a, 30
- ld [W_CURENEMYLVL], a ; $d127
+ ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
ld a, $4
ld [W_POKEMONTOWER6CURSCRIPT], a
ld [W_CURMAPSCRIPT], a
@@ -46,21 +46,21 @@
db $10,$0A,$FF
PokemonTower6Script4: ; 60b48 (18:4b48)
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, Func_60b02
ld a, $ff
ld [wJoyIgnore], a
- ld a, [$d72d]
+ ld a, [wd72d]
bit 6, a
ret nz
call UpdateSprites
ld a, $f0
ld [wJoyIgnore], a
- ld a, [$cf0b]
+ ld a, [wcf0b]
and a
jr nz, .asm_60b82
- ld hl, $d768
+ ld hl, wd768
set 7, [hl]
ld a, $7
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
@@ -73,13 +73,13 @@
ret
.asm_60b82
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
ld a, $10
- ld [$ccd3], a
+ ld [wccd3], a
xor a
- ld [$c206], a
- ld [$cd3b], a
- ld hl, $d730
+ ld [wSpriteStateData2 + $06], a
+ ld [wcd3b], a
+ ld hl, wd730
set 7, [hl]
ld a, $3
ld [W_POKEMONTOWER6CURSCRIPT], a
@@ -87,7 +87,7 @@
ret
PokemonTower6Script3: ; 60ba1 (18:4ba1)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
call Delay3
@@ -109,7 +109,7 @@
PokemonTower6TrainerHeader0: ; 60bbf (18:4bbf)
db $1 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d768 ; flag's byte
+ dw wd768 ; flag's byte
dw PokemonTower6BattleText1 ; 0x4c29 TextBeforeBattle
dw PokemonTower6AfterBattleText1 ; 0x4c33 TextAfterBattle
dw PokemonTower6EndBattleText1 ; 0x4c2e TextEndBattle
@@ -118,7 +118,7 @@
PokemonTower6TrainerHeader1: ; 60bcb (18:4bcb)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d768 ; flag's byte
+ dw wd768 ; flag's byte
dw PokemonTower6BattleText2 ; 0x4c38 TextBeforeBattle
dw PokemonTower6AfterBattleText2 ; 0x4c42 TextAfterBattle
dw PokemonTower6EndBattleText2 ; 0x4c3d TextEndBattle
@@ -127,7 +127,7 @@
PokemonTower6TrainerHeader2: ; 60bd7 (18:4bd7)
db $3 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d768 ; flag's byte
+ dw wd768 ; flag's byte
dw PokemonTower6BattleText3 ; 0x4c47 TextBeforeBattle
dw PokemonTower6AfterBattleText3 ; 0x4c51 TextAfterBattle
dw PokemonTower6EndBattleText3 ; 0x4c4c TextEndBattle
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@@ -24,13 +24,13 @@
PokemonTower7Script2: ; 60d23 (18:4d23)
ld hl, wFlags_0xcd60
res 0, [hl]
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, PokemonTower7Script_60d18
call EndTrainerBattle
ld a, $f0
ld [wJoyIgnore], a
- ld a, [$cf13]
+ ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
call PokemonTower7Script_60db6
@@ -40,11 +40,11 @@
ret
PokemonTower7Script3: ; 60d56 (18:4d56)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
ld hl, W_MISSABLEOBJECTLIST
- ld a, [$cf13]
+ ld a, [wcf13]
ld b, a
.missableObjectsListLoop
ld a, [hli]
@@ -51,14 +51,14 @@
cp b ; search for sprite ID in missing objects list
ld a, [hli]
jr nz, .missableObjectsListLoop
- ld [$cc4d], a ; remove missable object
+ ld [wcc4d], a ; remove missable object
ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
xor a
ld [wJoyIgnore], a
- ld [$cf13], a
+ ld [wcf13], a
ld [wTrainerHeaderFlagBit], a
- ld [$da38], a
+ ld [wda38], a
ld a, $0
ld [W_POKEMONTOWER7CURSCRIPT], a
ld [W_CURMAPSCRIPT], a
@@ -68,18 +68,18 @@
ld a, $ff
ld [wJoyIgnore], a
ld a, $43
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
ld a, $4
- ld [$c109], a
+ ld [wSpriteStateData1 + 9], a
ld a, $95
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
ld a, $1
- ld [$d42f], a
+ ld [wd42f], a
ld a, LAVENDER_TOWN
ld [wLastMap], a
- ld hl, $d72d
+ ld hl, wd72d
set 3, [hl]
ld a, $0
ld [W_POKEMONTOWER7CURSCRIPT], a
@@ -88,15 +88,15 @@
PokemonTower7Script_60db6: ; 60db6 (18:4db6)
ld hl, CoordsData_60de3 ; $4de3
- ld a, [$cf13]
+ ld a, [wcf13]
dec a
swap a
ld d, $0
ld e, a
add hl, de
- ld a, [W_YCOORD] ; $d361
+ ld a, [W_YCOORD] ; wd361
ld b, a
- ld a, [W_XCOORD] ; $d362
+ ld a, [W_XCOORD] ; wd362
ld c, a
.asm_60dcb
ld a, [hli]
@@ -108,7 +108,7 @@
ld a, [hli]
ld d, [hl]
ld e, a
- ld a, [$cf13]
+ ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
jp MoveSprite
.asm_60dde
@@ -172,7 +172,7 @@
PokemonTower7TrainerHeader0: ; 60e47 (18:4e47)
db $1 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d769 ; flag's byte
+ dw wd769 ; flag's byte
dw PokemonTower7BattleText1 ; 0x4ec9 TextBeforeBattle
dw PokemonTower7AfterBattleText1 ; 0x4ed3 TextAfterBattle
dw PokemonTower7EndBattleText1 ; 0x4ece TextEndBattle
@@ -181,7 +181,7 @@
PokemonTower7TrainerHeader1: ; 60e53 (18:4e53)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d769 ; flag's byte
+ dw wd769 ; flag's byte
dw PokemonTower7BattleText2 ; 0x4ed8 TextBeforeBattle
dw PokemonTower7AfterBattleText2 ; 0x4ee2 TextAfterBattle
dw PokemonTower7EndBattleText2 ; 0x4edd TextEndBattle
@@ -190,7 +190,7 @@
PokemonTower7TrainerHeader2: ; 60e5f (18:4e5f)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d769 ; flag's byte
+ dw wd769 ; flag's byte
dw PokemonTower7BattleText3 ; 0x4ee7 TextBeforeBattle
dw PokemonTower7AfterBattleText3 ; 0x4ef1 TextAfterBattle
dw PokemonTower7EndBattleText3 ; 0x4eec TextEndBattle
@@ -220,20 +220,20 @@
db $08 ; asm
ld hl, PokemonTower7Text_60ec4
call PrintText
- ld hl, $d7e0
+ ld hl, wd7e0
set 7, [hl]
- ld hl, $d769
+ ld hl, wd769
set 7, [hl]
ld a, $44
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef
ld a, $17
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
ld a, $18
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef
ld a, $4
--- a/scripts/powerplant.asm
+++ b/scripts/powerplant.asm
@@ -32,7 +32,7 @@
PowerPlantTrainerHeader0: ; 1e2fb (7:62fb)
db 1 ; flag's bit
db 0 ; view range
- dw $d7d3 ; flag's byte
+ dw wd7d3 ; flag's byte
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
@@ -41,7 +41,7 @@
PowerPlantTrainerHeader1: ; 1e307 (7:6307)
db 2 ; flag's bit
db 0 ; view range
- dw $d7d3 ; flag's byte
+ dw wd7d3 ; flag's byte
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
@@ -50,7 +50,7 @@
PowerPlantTrainerHeader2: ; 1e313 (7:6313)
db 3 ; flag's bit
db 0 ; view range
- dw $d7d3 ; flag's byte
+ dw wd7d3 ; flag's byte
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
@@ -59,7 +59,7 @@
PowerPlantTrainerHeader3: ; 1e31f (7:631f)
db 4 ; flag's bit
db 0 ; view range
- dw $d7d3 ; flag's byte
+ dw wd7d3 ; flag's byte
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
@@ -68,7 +68,7 @@
PowerPlantTrainerHeader4: ; 1e32b (7:632b)
db 5 ; flag's bit
db 0 ; view range
- dw $d7d3 ; flag's byte
+ dw wd7d3 ; flag's byte
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
@@ -77,7 +77,7 @@
PowerPlantTrainerHeader5: ; 1e337 (7:6337)
db 6 ; flag's bit
db 0 ; view range
- dw $d7d3 ; flag's byte
+ dw wd7d3 ; flag's byte
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
@@ -86,7 +86,7 @@
PowerPlantTrainerHeader6: ; 1e343 (7:6343)
db 7 ; flag's bit
db 0 ; view range
- dw $d7d3 ; flag's byte
+ dw wd7d3 ; flag's byte
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
@@ -95,7 +95,7 @@
PowerPlantTrainerHeader7: ; 1e34f (7:634f)
db 8 ; flag's bit
db 0 ; view range
- dw $d7d3 ; flag's byte
+ dw wd7d3 ; flag's byte
dw VoltorbBattleText ; TextBeforeBattle
dw VoltorbBattleText ; TextAfterBattle
dw VoltorbBattleText ; TextEndBattle
@@ -104,7 +104,7 @@
PowerPlantTrainerHeader8: ; 1e35b (7:635b)
db 9 ; flag's bit
db 0 ; view range
- dw $d7d3 ; flag's byte
+ dw wd7d3 ; flag's byte
dw ZapdosBattleText ; TextBeforeBattle
dw ZapdosBattleText ; TextAfterBattle
dw ZapdosBattleText ; TextEndBattle
--- a/scripts/redshouse1f.asm
+++ b/scripts/redshouse1f.asm
@@ -7,7 +7,7 @@
RedsHouse1FText1: ; 4816f (12:416f) ; 416F Mom
db 8
- ld a, [$D72E]
+ ld a, [wd72e]
bit 3, a
jr nz, .heal ; if player has received a Pokémon from Oak, heal team
ld hl, MomWakeUpText
@@ -29,14 +29,14 @@
call ReloadMapData
PREDEF HealPartyPredef
ld a, MUSIC_PKMN_HEALED
- ld [$C0EE], a
+ ld [wc0ee], a
call PlaySound ; play sound?
.next
- ld a, [$C026]
+ ld a, [wc026]
cp MUSIC_PKMN_HEALED
jr z, .next
- ld a, [$D35B]
- ld [$C0EE], a
+ ld a, [wd35b]
+ ld [wc0ee], a
call PlaySound
call GBFadeIn2
ld hl, MomHealText2
@@ -51,7 +51,7 @@
RedsHouse1FText2: ; 0x481c6 TV
db 8
- ld a,[$C109]
+ ld a,[wSpriteStateData1 + 9]
cp 4
ld hl,TVWrongSideText
jr nz,.done ; if player is not facing up
--- a/scripts/redshouse2f.asm
+++ b/scripts/redshouse2f.asm
@@ -12,7 +12,7 @@
xor a
ld [hJoyHeld],a
ld a,8
- ld [$D528],a
+ ld [wd528],a
ld a,1
ld [W_REDSHOUSE2CURSCRIPT],a
ret
--- a/scripts/rockethideout1.asm
+++ b/scripts/rockethideout1.asm
@@ -9,11 +9,11 @@
ret
RocketHideout1Script_44be0: ; 44be0 (11:4be0)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
- ld a, [$d815]
+ ld a, [wd815]
bit 7, a
jr nz, .asm_44c01
bit 5, a
@@ -23,12 +23,12 @@
.asm_44bf7
ld a, (SFX_02_57 - SFX_Headers_02) / 3
call PlaySound
- ld hl, $d815
+ ld hl, wd815
bit 7, [hl]
.asm_44c01
ld a, $e
.asm_44c03
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $080c
ld a, $17
jp Predef
@@ -51,7 +51,7 @@
RocketHideout1TrainerHeader0: ; 44c22 (11:4c22)
db $1 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d815 ; flag's byte
+ dw wd815 ; flag's byte
dw RocketHideout1BattleText2 ; 0x4ca1 TextBeforeBattle
dw RocketHideout1AfterBattleTxt2 ; 0x4cab TextAfterBattle
dw RocketHideout1EndBattleText2 ; 0x4ca6 TextEndBattle
@@ -60,7 +60,7 @@
RocketHideout1TrainerHeader2: ; 44c2e (11:4c2e)
db $2 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d815 ; flag's byte
+ dw wd815 ; flag's byte
dw RocketHideout1BattleText3 ; 0x4cb0 TextBeforeBattle
dw RocketHideout1AfterBattleTxt3 ; 0x4cba TextAfterBattle
dw RocketHideout1EndBattleText3 ; 0x4cb5 TextEndBattle
@@ -69,7 +69,7 @@
RocketHideout1TrainerHeader3: ; 44c3a (11:4c3a)
db $3 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d815 ; flag's byte
+ dw wd815 ; flag's byte
dw RocketHideout1BattleText4 ; 0x4cbf TextBeforeBattle
dw RocketHideout1AfterBattleTxt4 ; 0x4cc9 TextAfterBattle
dw RocketHideout1EndBattleText4 ; 0x4cc4 TextEndBattle
@@ -78,7 +78,7 @@
RocketHideout1TrainerHeader4: ; 44c46 (11:4c46)
db $4 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d815 ; flag's byte
+ dw wd815 ; flag's byte
dw RocketHideout1BattleText5 ; 0x4cce TextBeforeBattle
dw RocketHideout1AfterBattleTxt5 ; 0x4cd8 TextAfterBattle
dw RocketHideout1EndBattleText5 ; 0x4cd3 TextEndBattle
@@ -87,7 +87,7 @@
RocketHideout1TrainerHeader5: ; 44c52 (11:4c52)
db $5 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d815 ; flag's byte
+ dw wd815 ; flag's byte
dw RocketHideout1BattleText6 ; 0x4cdd TextBeforeBattle
dw RocketHideout1AfterBattleTxt6 ; 0x4ce2 TextAfterBattle
dw RocketHideout1EndBattleText6 ; 0x4c91 TextEndBattle
@@ -128,7 +128,7 @@
RocketHideout1EndBattleText6: ; 44c91 (11:4c91)
TX_FAR _RocketHideout1EndBattleText6
db $8
- ld hl, $d815
+ ld hl, wd815
set 5, [hl]
ld hl, RocketHideout1Text_44c9f
ret
--- a/scripts/rockethideout2.asm
+++ b/scripts/rockethideout2.asm
@@ -22,7 +22,7 @@
call Func_3442
cp $ff
jp z, CheckFightingMapTrainers
- ld hl, $d736
+ ld hl, wd736
set 7, [hl]
call Func_3486
ld a, (SFX_02_52 - SFX_Headers_02) / 3
@@ -306,12 +306,12 @@
db $FF
RocketHideout2Script3: ; 44fc2 (11:4fc2)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
jr nz, LoadSpinnerArrowTiles
xor a
ld [wJoyIgnore], a
- ld hl, $d736
+ ld hl, wd736
res 7, [hl]
ld a, $0
ld [W_CURMAPSCRIPT], a
@@ -318,7 +318,7 @@
ret
LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7)
- ld a, [$c102]
+ ld a, [wSpriteStateData1 + 2]
srl a
srl a
ld hl, SpinnerPlayerFacingDirections ; $5083
@@ -326,14 +326,14 @@
ld b, $0
add hl, bc
ld a, [hl]
- ld [$c102], a
- ld a, [W_CURMAPTILESET] ; $d367
+ ld [wSpriteStateData1 + 2], a
+ ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
cp FACILITY
ld hl, SpinnerArrowTilePointers1 ; $5023
jr z, .asm_44ff6
ld hl, SpinnerArrowTilePointers2 ; $5053
.asm_44ff6
- ld a, [$cd38]
+ ld a, [wcd38]
bit 0, a
jr nz, .asm_45001
ld de, $18
@@ -474,7 +474,7 @@
RocketHideout2TrainerHeader0: ; 450d1 (11:50d1)
db $1 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d817 ; flag's byte
+ dw wd817 ; flag's byte
dw RocketHideout2BattleText2 ; 0x50e8 TextBeforeBattle
dw RocketHideout2AfterBattleTxt2 ; 0x50f2 TextAfterBattle
dw RocketHideout2EndBattleText2 ; 0x50ed TextEndBattle
--- a/scripts/rockethideout3.asm
+++ b/scripts/rockethideout3.asm
@@ -22,7 +22,7 @@
call Func_3442
cp $ff
jp z, CheckFightingMapTrainers
- ld hl, $d736
+ ld hl, wd736
set 7, [hl]
call Func_3486
ld a, (SFX_02_52 - SFX_Headers_02) / 3
@@ -136,12 +136,12 @@
db $FF
RocketHideout3Script3 ; 452e4 (11:452e4)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
jp nz, LoadSpinnerArrowTiles
xor a
ld [wJoyIgnore], a
- ld hl, $d736
+ ld hl, wd736
res 7, [hl]
ld a, $0
ld [W_CURMAPSCRIPT], a
@@ -157,7 +157,7 @@
RocketHideout3TrainerHeader0: ; 45302 (11:5302)
db $1 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d819 ; flag's byte
+ dw wd819 ; flag's byte
dw RocketHideout3BattleText2 ; 0x5325 TextBeforeBattle
dw RocketHideout3AfterBattleTxt2 ; 0x532f TextAfterBattle
dw RocketHideout3EndBattleText2 ; 0x532a TextEndBattle
@@ -166,7 +166,7 @@
RocketHideout3TrainerHeader2: ; 4530e (11:530e)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d819 ; flag's byte
+ dw wd819 ; flag's byte
dw RocketHideout3BattleTxt ; 0x533e TextBeforeBattle
dw RocketHideout3AfterBattleText3 ; 0x5348 TextAfterBattle
dw RocketHideout3EndBattleText3 ; 0x5343 TextEndBattle
--- a/scripts/rockethideout4.asm
+++ b/scripts/rockethideout4.asm
@@ -9,11 +9,11 @@
ret
RocketHideout4Script_45473: ; 45473 (11:5473)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
- ld a, [$d81b]
+ ld a, [wd81b]
bit 5, a
jr nz, .asm_45496
and $c
@@ -24,12 +24,12 @@
.asm_4548c
ld a, (SFX_02_57 - SFX_Headers_02) / 3
call PlaySound
- ld hl, $d81b
+ ld hl, wd81b
set 5, [hl]
.asm_45496
ld a, $e
.asm_45498
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $050c
ld a, $17
jp Predef
@@ -54,7 +54,7 @@
call UpdateSprites
ld a, $f0
ld [wJoyIgnore], a
- ld hl, $d81b
+ ld hl, wd81b
set 7, [hl]
ld a, $a
ld [H_SPRITEHEIGHT], a
@@ -61,11 +61,11 @@
call DisplayTextID
call GBFadeIn1
ld a, $83
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
ld a, $87
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef
call UpdateSprites
@@ -72,7 +72,7 @@
call GBFadeOut1
xor a
ld [wJoyIgnore], a
- ld hl, $d126
+ ld hl, wd126
set 5, [hl]
ld a, $0
ld [W_ROCKETHIDEOUT4CURSCRIPT], a
@@ -95,7 +95,7 @@
RocketHideout4TrainerHeader0: ; 45515 (11:5515)
db $2 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d81b ; flag's byte
+ dw wd81b ; flag's byte
dw RocketHideout4BattleText2 ; 0x5593 TextBeforeBattle
dw RocketHideout4AfterBattleText2 ; 0x559d TextAfterBattle
dw RocketHideout4EndBattleText2 ; 0x5598 TextEndBattle
@@ -104,7 +104,7 @@
RocketHideout4TrainerHeader2: ; 45521 (11:5521)
db $3 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d81b ; flag's byte
+ dw wd81b ; flag's byte
dw RocketHideout4BattleText3 ; 0x55ac TextBeforeBattle
dw RocketHideout4AfterBattleText3 ; 0x55b6 TextAfterBattle
dw RocketHideout4EndBattleText3 ; 0x55b1 TextEndBattle
@@ -113,7 +113,7 @@
RocketHideout4TrainerHeader3: ; 4552d (11:552d)
db $4 ; flag's bit
db ($1 << 4) ; trainer's view range
- dw $d81b ; flag's byte
+ dw wd81b ; flag's byte
dw RocketHideout4BattleText4 ; 0x55c5 TextBeforeBattle
dw RocketHideout4AfterBattleText4 ; 0x55cf TextAfterBattle
dw RocketHideout4EndBattleText4 ; 0x55ca TextEndBattle
@@ -123,12 +123,12 @@
RocketHideout4Text1: ; 4553a (11:553a)
db $08 ; asm
- ld a, [$d81b]
+ ld a, [wd81b]
bit 7, a
jp nz, .asm_545571
ld hl, RocketHideout4Text_4557a
call PrintText
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, RocketHideout4Text_4557f
@@ -135,7 +135,7 @@
ld de, RocketHideout4Text_4557f
call PreBattleSaveRegisters
ldh a, [$8c]
- ld [$cf13], a
+ ld [wcf13], a
call EngageMapTrainer
call InitBattleEnemyParameters
xor a
@@ -216,12 +216,12 @@
db $8
ld hl, RocketHideout4Text_455ec ; $55ec
call PrintText
- ld hl, $d81b
+ ld hl, wd81b
bit 6, [hl]
set 6, [hl]
jr nz, .asm_455e9 ; 0x455dd $a
ld a, $88
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef
.asm_455e9
--- a/scripts/rockethideoutelevator.asm
+++ b/scripts/rockethideoutelevator.asm
@@ -1,5 +1,5 @@
RocketHideoutElevatorScript: ; 45710 (11:5710)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
push hl
@@ -9,16 +9,16 @@
res 7, [hl]
call nz, RocketHideoutElevatorScript_4575f
xor a
- ld [$cf0c], a
+ ld [wcf0c], a
inc a
- ld [$cc3c], a
+ ld [wcc3c], a
ret
RocketHideoutElevatorScript_4572c: ; 4572c (11:572c)
- ld hl, $d3af
- ld a, [$d73b]
+ ld hl, wd3af
+ ld a, [wd73b]
ld b, a
- ld a, [$d73c]
+ ld a, [wd73c]
ld c, a
call RocketHideoutElevatorScript_4573a
@@ -35,7 +35,7 @@
ld hl, RocketHideoutElavatorFloors ; $5754
call LoadItemList
ld hl, RocketHideoutElevatorWarpMaps ; $5759
- ld de, $cc5b
+ ld de, wcc5b
ld bc, $0006
call CopyData
ret
--- a/scripts/rocktunnel1.asm
+++ b/scripts/rocktunnel1.asm
@@ -26,7 +26,7 @@
RockTunnel1TrainerHeader1: ; 44505 (11:4505)
db $1 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d2 ; flag's byte
+ dw wd7d2 ; flag's byte
dw RockTunnel1BattleText1 ; 0x4588 TextBeforeBattle
dw RockTunnel1AfterBattleText1 ; 0x4592 TextAfterBattle
dw RockTunnel1EndBattleText1 ; 0x458d TextEndBattle
@@ -35,7 +35,7 @@
RockTunnel1TrainerHeader2: ; 44511 (11:4511)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d2 ; flag's byte
+ dw wd7d2 ; flag's byte
dw RockTunnel1BattleText2 ; 0x4597 TextBeforeBattle
dw RockTunnel1AfterBattleText2 ; 0x45a1 TextAfterBattle
dw RockTunnel1EndBattleText2 ; 0x459c TextEndBattle
@@ -44,7 +44,7 @@
RockTunnel1TrainerHeader3: ; 4451d (11:451d)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7d2 ; flag's byte
+ dw wd7d2 ; flag's byte
dw RockTunnel1BattleText3 ; 0x45a6 TextBeforeBattle
dw RockTunnel1AfterBattleText3 ; 0x45b0 TextAfterBattle
dw RockTunnel1EndBattleText3 ; 0x45ab TextEndBattle
@@ -53,7 +53,7 @@
RockTunnel1TrainerHeader4: ; 44529 (11:4529)
db $4 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7d2 ; flag's byte
+ dw wd7d2 ; flag's byte
dw RockTunnel1BattleText4 ; 0x45b5 TextBeforeBattle
dw RockTunnel1AfterBattleText4 ; 0x45bf TextAfterBattle
dw RockTunnel1EndBattleText4 ; 0x45ba TextEndBattle
@@ -62,7 +62,7 @@
RockTunnel1TrainerHeader5: ; 44535 (11:4535)
db $5 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d2 ; flag's byte
+ dw wd7d2 ; flag's byte
dw RockTunnel1BattleText5 ; 0x45c4 TextBeforeBattle
dw RockTunnel1AfterBattleText5 ; 0x45ce TextAfterBattle
dw RockTunnel1EndBattleText5 ; 0x45c9 TextEndBattle
@@ -71,7 +71,7 @@
RockTunnel1TrainerHeader6: ; 44541 (11:4541)
db $6 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d2 ; flag's byte
+ dw wd7d2 ; flag's byte
dw RockTunnel1BattleText6 ; 0x45d3 TextBeforeBattle
dw RockTunnel1AfterBattleText6 ; 0x45dd TextAfterBattle
dw RockTunnel1EndBattleText6 ; 0x45d8 TextEndBattle
@@ -80,7 +80,7 @@
RockTunnel1TrainerHeader7: ; 4454d (11:454d)
db $7 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d2 ; flag's byte
+ dw wd7d2 ; flag's byte
dw RockTunnel1BattleText7 ; 0x45e2 TextBeforeBattle
dw RockTunnel1AfterBattleText7 ; 0x45ec TextAfterBattle
dw RockTunnel1EndBattleText7 ; 0x45e7 TextEndBattle
--- a/scripts/rocktunnel2.asm
+++ b/scripts/rocktunnel2.asm
@@ -26,7 +26,7 @@
RockTunnel2TrainerHeader0: ; 46014 (11:6014)
db $1 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d87d ; flag's byte
+ dw wd87d ; flag's byte
dw RockTunnel2BattleText2 ; 0x60c5 TextBeforeBattle
dw RockTunnel2AfterBattleText2 ; 0x60cf TextAfterBattle
dw RockTunnel2EndBattleText2 ; 0x60ca TextEndBattle
@@ -35,7 +35,7 @@
RockTunnel2TrainerHeader2: ; 46020 (11:6020)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d87d ; flag's byte
+ dw wd87d ; flag's byte
dw RockTunnel2BattleText3 ; 0x60d4 TextBeforeBattle
dw RockTunnel2AfterBattleText3 ; 0x60de TextAfterBattle
dw RockTunnel2EndBattleText3 ; 0x60d9 TextEndBattle
@@ -44,7 +44,7 @@
RockTunnel2TrainerHeader3: ; 4602c (11:602c)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d87d ; flag's byte
+ dw wd87d ; flag's byte
dw RockTunnel2BattleText4 ; 0x60e3 TextBeforeBattle
dw RockTunnel2AfterBattleText4 ; 0x60ed TextAfterBattle
dw RockTunnel2EndBattleText4 ; 0x60e8 TextEndBattle
@@ -53,7 +53,7 @@
RockTunnel2TrainerHeader4: ; 46038 (11:6038)
db $4 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d87d ; flag's byte
+ dw wd87d ; flag's byte
dw RockTunnel2BattleText5 ; 0x60f2 TextBeforeBattle
dw RockTunnel2AfterBattleText5 ; 0x60fc TextAfterBattle
dw RockTunnel2EndBattleText5 ; 0x60f7 TextEndBattle
@@ -62,7 +62,7 @@
RockTunnel2TrainerHeader5: ; 46044 (11:6044)
db $5 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d87d ; flag's byte
+ dw wd87d ; flag's byte
dw RockTunnel2BattleText6 ; 0x6101 TextBeforeBattle
dw RockTunnel2AfterBattleText6 ; 0x610b TextAfterBattle
dw RockTunnel2EndBattleText6 ; 0x6106 TextEndBattle
@@ -71,7 +71,7 @@
RockTunnel2TrainerHeader6: ; 46050 (11:6050)
db $6 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d87d ; flag's byte
+ dw wd87d ; flag's byte
dw RockTunnel2BattleText7 ; 0x6110 TextBeforeBattle
dw RockTunnel2AfterBattleText7 ; 0x611a TextAfterBattle
dw RockTunnel2EndBattleText7 ; 0x6115 TextEndBattle
@@ -80,7 +80,7 @@
RockTunnel2TrainerHeader7: ; 4605c (11:605c)
db $7 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d87d ; flag's byte
+ dw wd87d ; flag's byte
dw RockTunnel2BattleText8 ; 0x611f TextBeforeBattle
dw RockTunnel2AfterBattleText8 ; 0x6129 TextAfterBattle
dw RockTunnel2EndBattleText8 ; 0x6124 TextEndBattle
@@ -89,7 +89,7 @@
RockTunnel2TrainerHeader8: ; 46068 (11:6068)
db $8 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d87d ; flag's byte
+ dw wd87d ; flag's byte
dw RockTunnel2BattleText9 ; 0x612e TextBeforeBattle
dw RockTunnel2AfterBattleText9 ; 0x6138 TextAfterBattle
dw RockTunnel2EndBattleText9 ; 0x6133 TextEndBattle
--- a/scripts/route1.asm
+++ b/scripts/route1.asm
@@ -8,7 +8,7 @@
Route1Text1: ; 1cab8 (7:4ab8)
db $08 ; asm
- ld hl, $d7bf
+ ld hl, wd7bf
bit 0, [hl]
set 0, [hl]
jr nz, .asm_02840 ; 0x1cac0
--- a/scripts/route10.asm
+++ b/scripts/route10.asm
@@ -28,7 +28,7 @@
Route10TrainerHeader0: ; 59363 (16:5363)
db $1 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d1 ; flag's byte
+ dw wd7d1 ; flag's byte
dw Route10BattleText1 ; 0x53b6 TextBeforeBattle
dw Route10AfterBattleText1 ; 0x53c0 TextAfterBattle
dw Route10EndBattleText1 ; 0x53bb TextEndBattle
@@ -37,7 +37,7 @@
Route10TrainerHeader1: ; 5936f (16:536f)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7d1 ; flag's byte
+ dw wd7d1 ; flag's byte
dw Route10BattleText2 ; 0x53cf TextBeforeBattle
dw Route10AfterBattleText2 ; 0x53d9 TextAfterBattle
dw Route10EndBattleText2 ; 0x53d4 TextEndBattle
@@ -46,7 +46,7 @@
Route10TrainerHeader2: ; 5937b (16:537b)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d1 ; flag's byte
+ dw wd7d1 ; flag's byte
dw Route10BattleText3 ; 0x53e8 TextBeforeBattle
dw Route10AfterBattleText3 ; 0x53f2 TextAfterBattle
dw Route10EndBattleText3 ; 0x53ed TextEndBattle
@@ -55,7 +55,7 @@
Route10TrainerHeader3: ; 59387 (16:5387)
db $4 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7d1 ; flag's byte
+ dw wd7d1 ; flag's byte
dw Route10BattleText4 ; 0x5401 TextBeforeBattle
dw Route10AfterBattleText4 ; 0x540b TextAfterBattle
dw Route10EndBattleText4 ; 0x5406 TextEndBattle
@@ -64,7 +64,7 @@
Route10TrainerHeader4: ; 59393 (16:5393)
db $5 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7d1 ; flag's byte
+ dw wd7d1 ; flag's byte
dw Route10BattleText5 ; 0x541a TextBeforeBattle
dw Route10AfterBattleText5 ; 0x5424 TextAfterBattle
dw Route10EndBattleText5 ; 0x541f TextEndBattle
@@ -73,7 +73,7 @@
Route10TrainerHeader5: ; 5939f (16:539f)
db $6 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7d1 ; flag's byte
+ dw wd7d1 ; flag's byte
dw Route10BattleText6 ; 0x5433 TextBeforeBattle
dw Route10AfterBattleText6 ; 0x543d TextAfterBattle
dw Route10EndBattleText6 ; 0x5438 TextEndBattle
--- a/scripts/route11.asm
+++ b/scripts/route11.asm
@@ -29,7 +29,7 @@
Route11TrainerHeader0: ; 5947b (16:547b)
db $1 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7d5 ; flag's byte
+ dw wd7d5 ; flag's byte
dw Route11BattleText1 ; 0x54fe TextBeforeBattle
dw Route11AfterBattleText1 ; 0x5508 TextAfterBattle
dw Route11EndBattleText1 ; 0x5503 TextEndBattle
@@ -38,7 +38,7 @@
Route11TrainerHeader1: ; 59487 (16:5487)
db $2 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7d5 ; flag's byte
+ dw wd7d5 ; flag's byte
dw Route11BattleText2 ; 0x5517 TextBeforeBattle
dw Route11AfterBattleText2 ; 0x5521 TextAfterBattle
dw Route11EndBattleText2 ; 0x551c TextEndBattle
@@ -47,7 +47,7 @@
Route11TrainerHeader2: ; 59493 (16:5493)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7d5 ; flag's byte
+ dw wd7d5 ; flag's byte
dw Route11BattleText3 ; 0x5530 TextBeforeBattle
dw Route11AfterBattleText3 ; 0x553a TextAfterBattle
dw Route11EndBattleText3 ; 0x5535 TextEndBattle
@@ -56,7 +56,7 @@
Route11TrainerHeader3: ; 5949f (16:549f)
db $4 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7d5 ; flag's byte
+ dw wd7d5 ; flag's byte
dw Route11BattleText4 ; 0x5549 TextBeforeBattle
dw Route11AfterBattleText4 ; 0x5553 TextAfterBattle
dw Route11EndBattleText4 ; 0x554e TextEndBattle
@@ -65,7 +65,7 @@
Route11TrainerHeader4: ; 594ab (16:54ab)
db $5 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d5 ; flag's byte
+ dw wd7d5 ; flag's byte
dw Route11BattleText5 ; 0x5562 TextBeforeBattle
dw Route11AfterBattleText5 ; 0x556c TextAfterBattle
dw Route11EndBattleText5 ; 0x5567 TextEndBattle
@@ -74,7 +74,7 @@
Route11TrainerHeader5: ; 594b7 (16:54b7)
db $6 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7d5 ; flag's byte
+ dw wd7d5 ; flag's byte
dw Route11BattleText6 ; 0x557b TextBeforeBattle
dw Route11AfterBattleText6 ; 0x5585 TextAfterBattle
dw Route11EndBattleText6 ; 0x5580 TextEndBattle
@@ -83,7 +83,7 @@
Route11TrainerHeader6: ; 594c3 (16:54c3)
db $7 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7d5 ; flag's byte
+ dw wd7d5 ; flag's byte
dw Route11BattleText7 ; 0x5594 TextBeforeBattle
dw Route11AfterBattleText7 ; 0x559e TextAfterBattle
dw Route11EndBattleText7 ; 0x5599 TextEndBattle
@@ -92,7 +92,7 @@
Route11TrainerHeader7: ; 594cf (16:54cf)
db $8 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d5 ; flag's byte
+ dw wd7d5 ; flag's byte
dw Route11BattleText8 ; 0x55ad TextBeforeBattle
dw Route11AfterBattleText8 ; 0x55b7 TextAfterBattle
dw Route11EndBattleText8 ; 0x55b2 TextEndBattle
@@ -101,7 +101,7 @@
Route11TrainerHeader8: ; 594db (16:54db)
db $9 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7d5 ; flag's byte
+ dw wd7d5 ; flag's byte
dw Route11BattleText9 ; 0x55c6 TextBeforeBattle
dw Route11AfterBattleText9 ; 0x55d0 TextAfterBattle
dw Route11EndBattleText9 ; 0x55cb TextEndBattle
@@ -110,7 +110,7 @@
Route11TrainerHeader9: ; 594e7 (16:54e7)
db $a ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d5 ; flag's byte
+ dw wd7d5 ; flag's byte
dw Route11BattleText10 ; 0x55df TextBeforeBattle
dw Route11AfterBattleText10 ; 0x55e9 TextAfterBattle
dw Route11EndBattleText10 ; 0x55e4 TextEndBattle
--- a/scripts/route11gateupstairs.asm
+++ b/scripts/route11gateupstairs.asm
@@ -18,7 +18,7 @@
Route11GateUpstairsText2: ; 4946c (12:546c)
db $8
- ld a, [$d7d6]
+ ld a, [wd7d6]
add a
jr c, .asm_4949b ; 0x49471 $28
ld a, 30 ; pokemon needed
@@ -25,11 +25,11 @@
ld [$ffdb], a
ld a, ITEMFINDER ; oak's aide reward
ld [$ffdc], a
- ld [$d11e], a
+ ld [wd11e], a
call GetItemName
ld h, d
ld l, e
- ld de, $cc5b
+ ld de, wcc5b
ld bc, $000d
call CopyData
ld a, $62
@@ -37,7 +37,7 @@
ld a, [$ffdb]
dec a
jr nz, .asm_494a1 ; 0x49494 $b
- ld hl, $d7d6
+ ld hl, wd7d6
set 7, [hl]
.asm_4949b
ld hl, Route11GateUpstairsText_494a3
@@ -51,10 +51,10 @@
Route11GateUpstairsText3: ; 494a8 (12:54a8)
db $08 ; asm
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4
jp nz, Route12GateUpstairsScript_495c9
- ld a, [$d7d8]
+ ld a, [wd7d8]
bit 7, a ; fought snorlax?
ld hl, BinocularsSnorlaxText
jr z, .print
--- a/scripts/route12.asm
+++ b/scripts/route12.asm
@@ -21,7 +21,7 @@
dw Route12Script3
Route12Script0: ; 59619 (16:5619)
- ld hl, $d7d8
+ ld hl, wd7d8
bit 7, [hl]
jp nz, CheckFightingMapTrainers
bit 6, [hl]
@@ -31,11 +31,11 @@
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
ld a, SNORLAX
- ld [W_CUROPPONENT], a ; $d059
+ ld [W_CUROPPONENT], a ; wd059
ld a, 30
- ld [W_CURENEMYLVL], a ; $d127
+ ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
ld a, $1d
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
ld a, $3
@@ -44,11 +44,11 @@
ret
Route12Script3: ; 5964c (16:564c)
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jr z, Route12Script_59606
call UpdateSprites
- ld a, [$cf0b]
+ ld a, [wcf0b]
cp $2
jr z, .asm_59664
ld a, $e
@@ -55,7 +55,7 @@
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
.asm_59664
- ld hl, $d7d8
+ ld hl, wd7d8
set 7, [hl]
call Delay3
ld a, $0
@@ -83,7 +83,7 @@
Route12TrainerHeader0: ; 59691 (16:5691)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d7 ; flag's byte
+ dw wd7d7 ; flag's byte
dw Route12BattleText1 ; 0x56ff TextBeforeBattle
dw Route12AfterBattleText1 ; 0x5709 TextAfterBattle
dw Route12EndBattleText1 ; 0x5704 TextEndBattle
@@ -92,7 +92,7 @@
Route12TrainerHeader1: ; 5969d (16:569d)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d7 ; flag's byte
+ dw wd7d7 ; flag's byte
dw Route12BattleText2 ; 0x5718 TextBeforeBattle
dw Route12AfterBattleText2 ; 0x5722 TextAfterBattle
dw Route12EndBattleText2 ; 0x571d TextEndBattle
@@ -101,7 +101,7 @@
Route12TrainerHeader2: ; 596a9 (16:56a9)
db $4 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d7 ; flag's byte
+ dw wd7d7 ; flag's byte
dw Route12BattleText3 ; 0x5731 TextBeforeBattle
dw Route12AfterBattleText3 ; 0x573b TextAfterBattle
dw Route12EndBattleText3 ; 0x5736 TextEndBattle
@@ -110,7 +110,7 @@
Route12TrainerHeader3: ; 596b5 (16:56b5)
db $5 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d7 ; flag's byte
+ dw wd7d7 ; flag's byte
dw Route12BattleText4 ; 0x574a TextBeforeBattle
dw Route12AfterBattleText4 ; 0x5754 TextAfterBattle
dw Route12EndBattleText4 ; 0x574f TextEndBattle
@@ -119,7 +119,7 @@
Route12TrainerHeader4: ; 596c1 (16:56c1)
db $6 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d7 ; flag's byte
+ dw wd7d7 ; flag's byte
dw Route12BattleText5 ; 0x5763 TextBeforeBattle
dw Route12AfterBattleText5 ; 0x576d TextAfterBattle
dw Route12EndBattleText5 ; 0x5768 TextEndBattle
@@ -128,7 +128,7 @@
Route12TrainerHeader5: ; 596cd (16:56cd)
db $7 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d7 ; flag's byte
+ dw wd7d7 ; flag's byte
dw Route12BattleText6 ; 0x577c TextBeforeBattle
dw Route12AfterBattleText6 ; 0x5786 TextAfterBattle
dw Route12EndBattleText6 ; 0x5781 TextEndBattle
@@ -137,7 +137,7 @@
Route12TrainerHeader6: ; 596d9 (16:56d9)
db $8 ; flag's bit
db ($1 << 4) ; trainer's view range
- dw $d7d7 ; flag's byte
+ dw wd7d7 ; flag's byte
dw Route12BattleText7 ; 0x5795 TextBeforeBattle
dw Route12AfterBattleText7 ; 0x579f TextAfterBattle
dw Route12EndBattleText7 ; 0x579a TextEndBattle
--- a/scripts/route12gateupstairs.asm
+++ b/scripts/route12gateupstairs.asm
@@ -8,7 +8,7 @@
Route12GateUpstairsText1: ; 49569 (12:5569)
db $08 ; asm
- ld a, [$d7d7]
+ ld a, [wd7d7]
rrca
jr c, .asm_0ad3c ; 0x4956e
ld hl, TM39PreReceiveText
@@ -18,7 +18,7 @@
jr nc, .BagFull
ld hl, ReceivedTM39Text
call PrintText
- ld hl, $d7d7
+ ld hl, wd7d7
set 0, [hl]
jr .asm_4ba56 ; 0x49589
.BagFull
@@ -66,7 +66,7 @@
db "@"
Route12GateUpstairsScript_495c9: ; 495c9 (12:55c9)
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $4
jr z, .asm_495d4 ; 0x495ce $4
ld a, $1
@@ -75,5 +75,5 @@
call PrintText
xor a
.asm_495d8
- ld [$cc3c], a
+ ld [wcc3c], a
jp TextScriptEnd
--- a/scripts/route12house.asm
+++ b/scripts/route12house.asm
@@ -6,19 +6,19 @@
Route12HouseText1: ; 56484 (15:6484)
db $08 ; asm
- ld a, [$d728]
+ ld a, [wd728]
bit 5, a
jr nz, .asm_b4cad
ld hl, Route12HouseText_564c0
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .asm_a2d76
ld bc, (SUPER_ROD << 8) | 1
call GiveItem
jr nc, .BagFull
- ld hl, $d728
+ ld hl, wd728
set 5, [hl]
ld hl, Route12HouseText_564c5
jr .asm_df984
--- a/scripts/route13.asm
+++ b/scripts/route13.asm
@@ -31,7 +31,7 @@
Route13TrainerHeader0: ; 55851 (15:5851)
db $1 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7d9 ; flag's byte
+ dw wd7d9 ; flag's byte
dw Route13BattleText2 ; 0x58d4 TextBeforeBattle
dw Route13AfterBattleText2 ; 0x58de TextAfterBattle
dw Route13EndBattleText2 ; 0x58d9 TextEndBattle
@@ -40,7 +40,7 @@
Route13TrainerHeader2: ; 5585d (15:585d)
db $2 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7d9 ; flag's byte
+ dw wd7d9 ; flag's byte
dw Route13BattleText3 ; 0x58ed TextBeforeBattle
dw Route13AfterBattleText3 ; 0x58f7 TextAfterBattle
dw Route13EndBattleText3 ; 0x58f2 TextEndBattle
@@ -49,7 +49,7 @@
Route13TrainerHeader3: ; 55869 (15:5869)
db $3 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7d9 ; flag's byte
+ dw wd7d9 ; flag's byte
dw Route13BattleText4 ; 0x5906 TextBeforeBattle
dw Route13AfterBattleText4 ; 0x5910 TextAfterBattle
dw Route13EndBattleText4 ; 0x590b TextEndBattle
@@ -58,7 +58,7 @@
Route13TrainerHeader4: ; 55875 (15:5875)
db $4 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7d9 ; flag's byte
+ dw wd7d9 ; flag's byte
dw Route13BattleText5 ; 0x591f TextBeforeBattle
dw Route13AfterBattleText5 ; 0x5929 TextAfterBattle
dw Route13EndBattleText5 ; 0x5924 TextEndBattle
@@ -67,7 +67,7 @@
Route13TrainerHeader5: ; 55881 (15:5881)
db $5 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d9 ; flag's byte
+ dw wd7d9 ; flag's byte
dw Route13BattleText6 ; 0x5938 TextBeforeBattle
dw Route13AfterBattleText6 ; 0x5942 TextAfterBattle
dw Route13EndBattleText6 ; 0x593d TextEndBattle
@@ -76,7 +76,7 @@
Route13TrainerHeader6: ; 5588d (15:588d)
db $6 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7d9 ; flag's byte
+ dw wd7d9 ; flag's byte
dw Route13BattleText7 ; 0x5951 TextBeforeBattle
dw Route13AfterBattleText7 ; 0x595b TextAfterBattle
dw Route13EndBattleText7 ; 0x5956 TextEndBattle
@@ -85,7 +85,7 @@
Route13TrainerHeader7: ; 55899 (15:5899)
db $7 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d9 ; flag's byte
+ dw wd7d9 ; flag's byte
dw Route13BattleText8 ; 0x596a TextBeforeBattle
dw Route13AfterBattleText8 ; 0x5974 TextAfterBattle
dw Route13EndBattleText8 ; 0x596f TextEndBattle
@@ -94,7 +94,7 @@
Route13TrainerHeader8: ; 558a5 (15:58a5)
db $8 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7d9 ; flag's byte
+ dw wd7d9 ; flag's byte
dw Route13BattleText9 ; 0x5983 TextBeforeBattle
dw Route13AfterBattleText9 ; 0x598d TextAfterBattle
dw Route13EndBattleText9 ; 0x5988 TextEndBattle
@@ -103,7 +103,7 @@
Route13TrainerHeader9: ; 558b1 (15:58b1)
db $9 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7d9 ; flag's byte
+ dw wd7d9 ; flag's byte
dw Route13BattleText10 ; 0x599c TextBeforeBattle
dw Route13AfterBattleText10 ; 0x59a6 TextAfterBattle
dw Route13EndBattleText10 ; 0x59a1 TextEndBattle
@@ -112,7 +112,7 @@
Route13TrainerHeader10: ; 558bd (15:58bd)
db $a ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7d9 ; flag's byte
+ dw wd7d9 ; flag's byte
dw Route13BattleText11 ; 0x59b5 TextBeforeBattle
dw Route13AfterBattleText11 ; 0x59bf TextAfterBattle
dw Route13EndBattleText11 ; 0x59ba TextEndBattle
--- a/scripts/route14.asm
+++ b/scripts/route14.asm
@@ -29,7 +29,7 @@
Route14TrainerHeader0: ; 55a02 (15:5a02)
db $1 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7db ; flag's byte
+ dw wd7db ; flag's byte
dw Route14BattleText1 ; 0x5a85 TextBeforeBattle
dw Route14AfterBattleText1 ; 0x5a8f TextAfterBattle
dw Route14EndBattleText1 ; 0x5a8a TextEndBattle
@@ -38,7 +38,7 @@
Route14TrainerHeader1: ; 55a0e (15:5a0e)
db $2 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7db ; flag's byte
+ dw wd7db ; flag's byte
dw Route14BattleText2 ; 0x5a9e TextBeforeBattle
dw Route14AfterBattleText2 ; 0x5aa8 TextAfterBattle
dw Route14EndBattleText2 ; 0x5aa3 TextEndBattle
@@ -47,7 +47,7 @@
Route14TrainerHeader2: ; 55a1a (15:5a1a)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7db ; flag's byte
+ dw wd7db ; flag's byte
dw Route14BattleText3 ; 0x5ab7 TextBeforeBattle
dw Route14AfterBattleText3 ; 0x5ac1 TextAfterBattle
dw Route14EndBattleText3 ; 0x5abc TextEndBattle
@@ -56,7 +56,7 @@
Route14TrainerHeader3: ; 55a26 (15:5a26)
db $4 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7db ; flag's byte
+ dw wd7db ; flag's byte
dw Route14BattleText4 ; 0x5ad0 TextBeforeBattle
dw Route14AfterBattleText4 ; 0x5ada TextAfterBattle
dw Route14EndBattleText4 ; 0x5ad5 TextEndBattle
@@ -65,7 +65,7 @@
Route14TrainerHeader4: ; 55a32 (15:5a32)
db $5 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7db ; flag's byte
+ dw wd7db ; flag's byte
dw Route14BattleText5 ; 0x5ae9 TextBeforeBattle
dw Route14AfterBattleText5 ; 0x5af3 TextAfterBattle
dw Route14EndBattleText5 ; 0x5aee TextEndBattle
@@ -74,7 +74,7 @@
Route14TrainerHeader5: ; 55a3e (15:5a3e)
db $6 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7db ; flag's byte
+ dw wd7db ; flag's byte
dw Route14BattleText6 ; 0x5b02 TextBeforeBattle
dw Route14AfterBattleText6 ; 0x5b0c TextAfterBattle
dw Route14EndBattleText6 ; 0x5b07 TextEndBattle
@@ -83,7 +83,7 @@
Route14TrainerHeader6: ; 55a4a (15:5a4a)
db $7 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7db ; flag's byte
+ dw wd7db ; flag's byte
dw Route14BattleText7 ; 0x5b1b TextBeforeBattle
dw Route14AfterBattleText7 ; 0x5b25 TextAfterBattle
dw Route14EndBattleText7 ; 0x5b20 TextEndBattle
@@ -92,7 +92,7 @@
Route14TrainerHeader7: ; 55a56 (15:5a56)
db $8 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7db ; flag's byte
+ dw wd7db ; flag's byte
dw Route14BattleText8 ; 0x5b34 TextBeforeBattle
dw Route14AfterBattleText8 ; 0x5b3e TextAfterBattle
dw Route14EndBattleText8 ; 0x5b39 TextEndBattle
@@ -101,7 +101,7 @@
Route14TrainerHeader8: ; 55a62 (15:5a62)
db $9 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7db ; flag's byte
+ dw wd7db ; flag's byte
dw Route14BattleText9 ; 0x5b4d TextBeforeBattle
dw Route14AfterBattleText9 ; 0x5b57 TextAfterBattle
dw Route14EndBattleText9 ; 0x5b52 TextEndBattle
@@ -110,7 +110,7 @@
Route14TrainerHeader9: ; 55a6e (15:5a6e)
db $a ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7db ; flag's byte
+ dw wd7db ; flag's byte
dw Route14BattleText10 ; 0x5b66 TextBeforeBattle
dw Route14AfterBattleText10 ; 0x5b70 TextAfterBattle
dw Route14EndBattleText10 ; 0x5b6b TextEndBattle
--- a/scripts/route15.asm
+++ b/scripts/route15.asm
@@ -30,7 +30,7 @@
Route15TrainerHeader0: ; 597df (16:57df)
db $1 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText1 ; 0x5898 TextBeforeBattle
dw Route15AfterBattleText1 ; 0x58a2 TextAfterBattle
dw Route15EndBattleText1 ; 0x589d TextEndBattle
@@ -39,7 +39,7 @@
Route15TrainerHeader1: ; 597eb (16:57eb)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText2 ; 0x58a7 TextBeforeBattle
dw Route15AfterBattleText2 ; 0x58b1 TextAfterBattle
dw Route15EndBattleText2 ; 0x58ac TextEndBattle
@@ -48,7 +48,7 @@
Route15TrainerHeader2: ; 597f7 (16:57f7)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText3 ; 0x58b6 TextBeforeBattle
dw Route15AfterBattleText3 ; 0x58c0 TextAfterBattle
dw Route15EndBattleText3 ; 0x58bb TextEndBattle
@@ -57,7 +57,7 @@
Route15TrainerHeader3: ; 59803 (16:5803)
db $4 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText4 ; 0x58c5 TextBeforeBattle
dw Route15AfterBattleText4 ; 0x58cf TextAfterBattle
dw Route15EndBattleText4 ; 0x58ca TextEndBattle
@@ -66,7 +66,7 @@
Route15TrainerHeader4: ; 5980f (16:580f)
db $5 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText5 ; 0x58d4 TextBeforeBattle
dw Route15AfterBattleText5 ; 0x58de TextAfterBattle
dw Route15EndBattleText5 ; 0x58d9 TextEndBattle
@@ -75,7 +75,7 @@
Route15TrainerHeader5: ; 5981b (16:581b)
db $6 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText6 ; 0x58e3 TextBeforeBattle
dw Route15AfterBattleText6 ; 0x58ed TextAfterBattle
dw Route15EndBattleText6 ; 0x58e8 TextEndBattle
@@ -84,7 +84,7 @@
Route15TrainerHeader6: ; 59827 (16:5827)
db $7 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText7 ; 0x58f2 TextBeforeBattle
dw Route15AfterBattleText7 ; 0x58fc TextAfterBattle
dw Route15EndBattleText7 ; 0x58f7 TextEndBattle
@@ -93,7 +93,7 @@
Route15TrainerHeader7: ; 59833 (16:5833)
db $8 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText8 ; 0x5901 TextBeforeBattle
dw Route15AfterBattleText8 ; 0x590b TextAfterBattle
dw Route15EndBattleText8 ; 0x5906 TextEndBattle
@@ -102,7 +102,7 @@
Route15TrainerHeader8: ; 5983f (16:583f)
db $9 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText9 ; 0x5910 TextBeforeBattle
dw Route15AfterBattleText9 ; 0x591a TextAfterBattle
dw Route15EndBattleText9 ; 0x5915 TextEndBattle
@@ -111,7 +111,7 @@
Route15TrainerHeader9: ; 5984b (16:584b)
db $a ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7dd ; flag's byte
+ dw wd7dd ; flag's byte
dw Route15BattleText10 ; 0x591f TextBeforeBattle
dw Route15AfterBattleText10 ; 0x5929 TextAfterBattle
dw Route15EndBattleText10 ; 0x5924 TextEndBattle
--- a/scripts/route15gateupstairs.asm
+++ b/scripts/route15gateupstairs.asm
@@ -7,7 +7,7 @@
Route15GateUpstairsText1: ; 49651 (12:5651)
db $8
- ld a, [$d7dd]
+ ld a, [wd7dd]
bit 0, a
jr nz, .asm_49683 ; 0x49657 $2a
ld a, 50 ; pokemon needed
@@ -14,10 +14,10 @@
ld [$ffdb], a
ld a, EXP__ALL ; oak's aide reward
ld [$ffdc], a
- ld [$d11e], a
+ ld [wd11e], a
call GetItemName
- ld hl, $cd6d
- ld de, $cc5b
+ ld hl, wcd6d
+ ld de, wcc5b
ld bc, $000d
call CopyData
ld a, $62
@@ -25,7 +25,7 @@
ld a, [$ffdb]
cp $1
jr nz, .asm_49689 ; 0x4967c $b
- ld hl, $d7dd
+ ld hl, wd7dd
set 0, [hl]
.asm_49683
ld hl, Route15GateUpstairsText_4968c
--- a/scripts/route16.asm
+++ b/scripts/route16.asm
@@ -21,7 +21,7 @@
dw Route16Script3
Route16Script0: ; 59959 (16:5959)
- ld hl, $d7e0
+ ld hl, wd7e0
bit 1, [hl]
jp nz, CheckFightingMapTrainers
bit 0, [hl]
@@ -31,11 +31,11 @@
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
ld a, SNORLAX
- ld [W_CUROPPONENT], a ; $d059
+ ld [W_CUROPPONENT], a ; wd059
ld a, 30
- ld [W_CURENEMYLVL], a ; $d127
+ ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
ld a, $21
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
call UpdateSprites
@@ -45,11 +45,11 @@
ret
Route16Script3: ; 5998f (16:598f)
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, Func_59946
call UpdateSprites
- ld a, [$cf0b]
+ ld a, [wcf0b]
cp $2
jr z, .asm_599a8
ld a, $b
@@ -56,7 +56,7 @@
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
.asm_599a8
- ld hl, $d7e0
+ ld hl, wd7e0
set 1, [hl]
call Delay3
ld a, $0
@@ -81,7 +81,7 @@
Route16TrainerHeader0: ; 599cf (16:59cf)
db $1 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7df ; flag's byte
+ dw wd7df ; flag's byte
dw Route16BattleText1 ; 0x5a22 TextBeforeBattle
dw Route16AfterBattleText1 ; 0x5a2c TextAfterBattle
dw Route16EndBattleText1 ; 0x5a27 TextEndBattle
@@ -90,7 +90,7 @@
Route16TrainerHeader1: ; 599db (16:59db)
db $2 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7df ; flag's byte
+ dw wd7df ; flag's byte
dw Route16BattleText2 ; 0x5a3b TextBeforeBattle
dw Route16AfterBattleText2 ; 0x5a45 TextAfterBattle
dw Route16EndBattleText2 ; 0x5a40 TextEndBattle
@@ -99,7 +99,7 @@
Route16TrainerHeader2: ; 599e7 (16:59e7)
db $3 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7df ; flag's byte
+ dw wd7df ; flag's byte
dw Route16BattleText3 ; 0x5a54 TextBeforeBattle
dw Route16AfterBattleText3 ; 0x5a5e TextAfterBattle
dw Route16EndBattleText3 ; 0x5a59 TextEndBattle
@@ -108,7 +108,7 @@
Route16TrainerHeader3: ; 599f3 (16:59f3)
db $4 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7df ; flag's byte
+ dw wd7df ; flag's byte
dw Route16BattleText4 ; 0x5a6d TextBeforeBattle
dw Route16AfterBattleText4 ; 0x5a77 TextAfterBattle
dw Route16EndBattleText4 ; 0x5a72 TextEndBattle
@@ -117,7 +117,7 @@
Route16TrainerHeader4: ; 599ff (16:59ff)
db $5 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7df ; flag's byte
+ dw wd7df ; flag's byte
dw Route16BattleText5 ; 0x5a86 TextBeforeBattle
dw Route16AfterBattleText5 ; 0x5a90 TextAfterBattle
dw Route16EndBattleText5 ; 0x5a8b TextEndBattle
@@ -126,7 +126,7 @@
Route16TrainerHeader5: ; 59a0b (16:5a0b)
db $6 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7df ; flag's byte
+ dw wd7df ; flag's byte
dw Route16BattleText6 ; 0x5a9f TextBeforeBattle
dw Route16AfterBattleText6 ; 0x5aa9 TextAfterBattle
dw Route16EndBattleText6 ; 0x5aa4 TextEndBattle
--- a/scripts/route16gate.asm
+++ b/scripts/route16gate.asm
@@ -1,5 +1,5 @@
Route16GateScript: ; 496be (12:56be)
- ld hl, $d732
+ ld hl, wd732
res 5, [hl]
call EnableAutoTextBoxDrawing
ld a, [W_ROUTE16GATECURSCRIPT]
@@ -23,16 +23,16 @@
call DisplayTextID
xor a
ld [hJoyHeld], a
- ld a, [$cd3d]
+ ld a, [wWhichTrade]
cp $1
jr z, .asm_4970e ; 0x496f1 $1b
- ld a, [$cd3d]
+ ld a, [wWhichTrade]
dec a
- ld [$cd38], a
+ ld [wcd38], a
ld b, $0
ld c, a
ld a, $40
- ld hl, $ccd3
+ ld hl, wccd3
call FillMemory
call Func_3486
ld a, $1
@@ -51,7 +51,7 @@
db $FF
Route16GateScript1: ; 4971d (12:571d)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
ld a, $f0
@@ -62,9 +62,9 @@
ld [H_SPRITEHEIGHT], a
call DisplayTextID
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
ld a, $10
- ld [$ccd3], a
+ ld [wccd3], a
call Func_3486
ld a, $3
ld [W_ROUTE16GATECURSCRIPT], a
@@ -71,12 +71,12 @@
ret
Route16GateScript3: ; 49741 (12:5741)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
xor a
ld [wJoyIgnore], a
- ld hl, $d730
+ ld hl, wd730
res 7, [hl]
ld a, $0
ld [W_ROUTE16GATECURSCRIPT], a
--- a/scripts/route16house.asm
+++ b/scripts/route16house.asm
@@ -7,7 +7,7 @@
Route16HouseText1: ; 1e5ff (7:65ff)
db $08 ; asm
- ld a, [$d7e0]
+ ld a, [wd7e0]
bit 6, a
ld hl, HM02ExplanationText
jr nz, .asm_13616 ; 0x1e608
@@ -16,7 +16,7 @@
ld bc, (HM_02 << 8) | 1
call GiveItem
jr nc, .BagFull
- ld hl, $d7e0
+ ld hl, wd7e0
set 6, [hl]
ld hl, ReceivedHM02Text
jr .asm_13616 ; 0x1e620
--- a/scripts/route17.asm
+++ b/scripts/route17.asm
@@ -34,7 +34,7 @@
Route17TrainerHeader0: ; 55bb3 (15:5bb3)
db $1 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7e1 ; flag's byte
+ dw wd7e1 ; flag's byte
dw Route17BattleText1 ; 0x5c36 TextBeforeBattle
dw Route17AfterBattleText1 ; 0x5c40 TextAfterBattle
dw Route17EndBattleText1 ; 0x5c3b TextEndBattle
@@ -43,7 +43,7 @@
Route17TrainerHeader1: ; 55bbf (15:5bbf)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e1 ; flag's byte
+ dw wd7e1 ; flag's byte
dw Route17BattleText2 ; 0x5c4f TextBeforeBattle
dw Route17AfterBattleText2 ; 0x5c59 TextAfterBattle
dw Route17EndBattleText2 ; 0x5c54 TextEndBattle
@@ -52,7 +52,7 @@
Route17TrainerHeader2: ; 55bcb (15:5bcb)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e1 ; flag's byte
+ dw wd7e1 ; flag's byte
dw Route17BattleText3 ; 0x5c68 TextBeforeBattle
dw Route17AfterBattleText3 ; 0x5c72 TextAfterBattle
dw Route17EndBattleText3 ; 0x5c6d TextEndBattle
@@ -61,7 +61,7 @@
Route17TrainerHeader3: ; 55bd7 (15:5bd7)
db $4 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e1 ; flag's byte
+ dw wd7e1 ; flag's byte
dw Route17BattleText4 ; 0x5c81 TextBeforeBattle
dw Route17AfterBattleText4 ; 0x5c8b TextAfterBattle
dw Route17EndBattleText4 ; 0x5c86 TextEndBattle
@@ -70,7 +70,7 @@
Route17TrainerHeader4: ; 55be3 (15:5be3)
db $5 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7e1 ; flag's byte
+ dw wd7e1 ; flag's byte
dw Route17BattleText5 ; 0x5c9a TextBeforeBattle
dw Route17AfterBattleText5 ; 0x5ca4 TextAfterBattle
dw Route17EndBattleText5 ; 0x5c9f TextEndBattle
@@ -79,7 +79,7 @@
Route17TrainerHeader5: ; 55bef (15:5bef)
db $6 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7e1 ; flag's byte
+ dw wd7e1 ; flag's byte
dw Route17BattleText6 ; 0x5cb3 TextBeforeBattle
dw Route17AfterBattleText6 ; 0x5cbd TextAfterBattle
dw Route17EndBattleText6 ; 0x5cb8 TextEndBattle
@@ -88,7 +88,7 @@
Route17TrainerHeader6: ; 55bfb (15:5bfb)
db $7 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e1 ; flag's byte
+ dw wd7e1 ; flag's byte
dw Route17BattleText7 ; 0x5ccc TextBeforeBattle
dw Route17AfterBattleText7 ; 0x5cd6 TextAfterBattle
dw Route17EndBattleText7 ; 0x5cd1 TextEndBattle
@@ -97,7 +97,7 @@
Route17TrainerHeader7: ; 55c07 (15:5c07)
db $8 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7e1 ; flag's byte
+ dw wd7e1 ; flag's byte
dw Route17BattleText8 ; 0x5ce5 TextBeforeBattle
dw Route17AfterBattleText8 ; 0x5cef TextAfterBattle
dw Route17EndBattleText8 ; 0x5cea TextEndBattle
@@ -106,7 +106,7 @@
Route17TrainerHeader8: ; 55c13 (15:5c13)
db $9 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7e1 ; flag's byte
+ dw wd7e1 ; flag's byte
dw Route17BattleText9 ; 0x5cfe TextBeforeBattle
dw Route17AfterBattleText9 ; 0x5d08 TextAfterBattle
dw Route17EndBattleText9 ; 0x5d03 TextEndBattle
@@ -115,7 +115,7 @@
Route17TrainerHeader9: ; 55c1f (15:5c1f)
db $a ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e1 ; flag's byte
+ dw wd7e1 ; flag's byte
dw Route17BattleText10 ; 0x5d17 TextBeforeBattle
dw Route17AfterBattleText10 ; 0x5d21 TextAfterBattle
dw Route17EndBattleText10 ; 0x5d1c TextEndBattle
--- a/scripts/route18.asm
+++ b/scripts/route18.asm
@@ -23,7 +23,7 @@
Route18TrainerHeader0: ; 59aea (16:5aea)
db $1 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7e3 ; flag's byte
+ dw wd7e3 ; flag's byte
dw Route18BattleText1 ; 0x5b19 TextBeforeBattle
dw Route18AfterBattleText1 ; 0x5b23 TextAfterBattle
dw Route18EndBattleText1 ; 0x5b1e TextEndBattle
@@ -32,7 +32,7 @@
Route18TrainerHeader1: ; 59af6 (16:5af6)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7e3 ; flag's byte
+ dw wd7e3 ; flag's byte
dw Route18BattleText2 ; 0x5b32 TextBeforeBattle
dw Route18AfterBattleText2 ; 0x5b3c TextAfterBattle
dw Route18EndBattleText2 ; 0x5b37 TextEndBattle
@@ -41,7 +41,7 @@
Route18TrainerHeader2: ; 59b02 (16:5b02)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e3 ; flag's byte
+ dw wd7e3 ; flag's byte
dw Route18BattleText3 ; 0x5b4b TextBeforeBattle
dw Route18AfterBattleText3 ; 0x5b55 TextAfterBattle
dw Route18EndBattleText3 ; 0x5b50 TextEndBattle
--- a/scripts/route18gate.asm
+++ b/scripts/route18gate.asm
@@ -1,5 +1,5 @@
Route18GateScript: ; 49876 (12:5876)
- ld hl, $d732
+ ld hl, wd732
res 5, [hl]
call EnableAutoTextBoxDrawing
ld a, [W_ROUTE18GATECURSCRIPT]
@@ -23,16 +23,16 @@
call DisplayTextID
xor a
ld [hJoyHeld], a
- ld a, [$cd3d]
+ ld a, [wWhichTrade]
cp $1
jr z, .asm_498c6 ; 0x498a9 $1b
- ld a, [$cd3d]
+ ld a, [wWhichTrade]
dec a
- ld [$cd38], a
+ ld [wcd38], a
ld b, $0
ld c, a
ld a, $40
- ld hl, $ccd3
+ ld hl, wccd3
call FillMemory
call Func_3486
ld a, $1
@@ -51,7 +51,7 @@
db $FF
Route18GateScript1: ; 498d5 (12:58d5)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
ld a, $f0
@@ -62,9 +62,9 @@
ld [H_SPRITEHEIGHT], a
call DisplayTextID
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
ld a, $10
- ld [$ccd3], a
+ ld [wccd3], a
call Func_3486
ld a, $3
ld [W_ROUTE18GATECURSCRIPT], a
@@ -71,12 +71,12 @@
ret
Route18GateScript3: ; 498f9 (12:58f9)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
xor a
ld [wJoyIgnore], a
- ld hl, $d730
+ ld hl, wd730
res 7, [hl]
ld a, $0
ld [W_ROUTE18GATECURSCRIPT], a
--- a/scripts/route19.asm
+++ b/scripts/route19.asm
@@ -29,7 +29,7 @@
Route19TrainerHeader0: ; 55d73 (15:5d73)
db $1 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e5 ; flag's byte
+ dw wd7e5 ; flag's byte
dw Route19BattleText1 ; 0x5e50 TextBeforeBattle
dw Route19AfterBattleText1 ; 0x5e5a TextAfterBattle
dw Route19EndBattleText1 ; 0x5e55 TextEndBattle
@@ -38,7 +38,7 @@
Route19TrainerHeader1: ; 55d7f (15:5d7f)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7e5 ; flag's byte
+ dw wd7e5 ; flag's byte
dw Route19BattleText2 ; 0x5e5f TextBeforeBattle
dw Route19AfterBattleText2 ; 0x5e69 TextAfterBattle
dw Route19EndBattleText2 ; 0x5e64 TextEndBattle
@@ -47,7 +47,7 @@
Route19TrainerHeader2: ; 55d8b (15:5d8b)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7e5 ; flag's byte
+ dw wd7e5 ; flag's byte
dw Route19BattleText3 ; 0x5e6e TextBeforeBattle
dw Route19AfterBattleText3 ; 0x5e78 TextAfterBattle
dw Route19EndBattleText3 ; 0x5e73 TextEndBattle
@@ -56,7 +56,7 @@
Route19TrainerHeader3: ; 55d97 (15:5d97)
db $4 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e5 ; flag's byte
+ dw wd7e5 ; flag's byte
dw Route19BattleText4 ; 0x5e7d TextBeforeBattle
dw Route19AfterBattleText4 ; 0x5e87 TextAfterBattle
dw Route19EndBattleText4 ; 0x5e82 TextEndBattle
@@ -65,7 +65,7 @@
Route19TrainerHeader4: ; 55da3 (15:5da3)
db $5 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e5 ; flag's byte
+ dw wd7e5 ; flag's byte
dw Route19BattleText5 ; 0x5e8c TextBeforeBattle
dw Route19AfterBattleText5 ; 0x5e96 TextAfterBattle
dw Route19EndBattleText5 ; 0x5e91 TextEndBattle
@@ -74,7 +74,7 @@
Route19TrainerHeader5: ; 55daf (15:5daf)
db $6 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e5 ; flag's byte
+ dw wd7e5 ; flag's byte
dw Route19BattleText6 ; 0x5e9b TextBeforeBattle
dw Route19AfterBattleText6 ; 0x5ea5 TextAfterBattle
dw Route19EndBattleText6 ; 0x5ea0 TextEndBattle
@@ -83,7 +83,7 @@
Route19TrainerHeader6: ; 55dbb (15:5dbb)
db $7 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7e5 ; flag's byte
+ dw wd7e5 ; flag's byte
dw Route19BattleText7 ; 0x5eaa TextBeforeBattle
dw Route19AfterBattleText7 ; 0x5eb4 TextAfterBattle
dw Route19EndBattleText7 ; 0x5eaf TextEndBattle
@@ -92,7 +92,7 @@
Route19TrainerHeader7: ; 55dc7 (15:5dc7)
db $8 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e5 ; flag's byte
+ dw wd7e5 ; flag's byte
dw Route19BattleText8 ; 0x5eb9 TextBeforeBattle
dw Route19AfterBattleText8 ; 0x5ec3 TextAfterBattle
dw Route19EndBattleText8 ; 0x5ebe TextEndBattle
@@ -101,7 +101,7 @@
Route19TrainerHeader8: ; 55dd3 (15:5dd3)
db $9 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e5 ; flag's byte
+ dw wd7e5 ; flag's byte
dw Route19BattleText9 ; 0x5ec8 TextBeforeBattle
dw Route19AfterBattleText9 ; 0x5ed2 TextAfterBattle
dw Route19EndBattleText9 ; 0x5ecd TextEndBattle
@@ -110,7 +110,7 @@
Route19TrainerHeader9: ; 55ddf (15:5ddf)
db $a ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e5 ; flag's byte
+ dw wd7e5 ; flag's byte
dw Route19BattleText10 ; 0x5ed7 TextBeforeBattle
dw Route19AfterBattleText10 ; 0x5ee1 TextAfterBattle
dw Route19EndBattleText10 ; 0x5edc TextEndBattle
--- a/scripts/route20.asm
+++ b/scripts/route20.asm
@@ -1,5 +1,5 @@
Route20Script: ; 50ca9 (14:4ca9)
- ld hl, $d7e7
+ ld hl, wd7e7
bit 0, [hl]
res 0, [hl]
call nz, Route20Script_50cc6
@@ -12,7 +12,7 @@
ret
Route20Script_50cc6: ; 50cc6 (14:4cc6)
- ld a, [$d880]
+ ld a, [wd880]
and $3
cp $3
jr z, .asm_50cef
@@ -34,7 +34,7 @@
db $D9,$DA,$DB,$DC,$DF,$E0,$FF
.asm_50cef
- ld a, [$d881]
+ ld a, [wd881]
and $3
cp $3
ret z
@@ -49,12 +49,12 @@
ret
Route20Script_50d0c: ; 50d0c (14:4d0c)
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
jp Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8))
Route20Script_50d14: ; 50d14 (14:4d14)
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
jp Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
@@ -81,7 +81,7 @@
Route20TrainerHeader0: ; 50d3a (14:4d3a)
db $1 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e7 ; flag's byte
+ dw wd7e7 ; flag's byte
dw Route20BattleText1 ; 0x4e17 TextBeforeBattle
dw Route20AfterBattleText1 ; 0x4e21 TextAfterBattle
dw Route20EndBattleText1 ; 0x4e1c TextEndBattle
@@ -90,7 +90,7 @@
Route20TrainerHeader2: ; 50d46 (14:4d46)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e7 ; flag's byte
+ dw wd7e7 ; flag's byte
dw Route20BattleText2 ; 0x4e26 TextBeforeBattle
dw Route20AfterBattleText2 ; 0x4e30 TextAfterBattle
dw Route20EndBattleText2 ; 0x4e2b TextEndBattle
@@ -99,7 +99,7 @@
Route20TrainerHeader3: ; 50d52 (14:4d52)
db $3 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7e7 ; flag's byte
+ dw wd7e7 ; flag's byte
dw Route20BattleText3 ; 0x4e35 TextBeforeBattle
dw Route20AfterBattleText3 ; 0x4e3f TextAfterBattle
dw Route20EndBattleText3 ; 0x4e3a TextEndBattle
@@ -108,7 +108,7 @@
Route20TrainerHeader4: ; 50d5e (14:4d5e)
db $4 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e7 ; flag's byte
+ dw wd7e7 ; flag's byte
dw Route20BattleText4 ; 0x4e44 TextBeforeBattle
dw Route20AfterBattleText4 ; 0x4e4e TextAfterBattle
dw Route20EndBattleText4 ; 0x4e49 TextEndBattle
@@ -117,7 +117,7 @@
Route20TrainerHeader5: ; 50d6a (14:4d6a)
db $5 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7e7 ; flag's byte
+ dw wd7e7 ; flag's byte
dw Route20BattleText5 ; 0x4e53 TextBeforeBattle
dw Route20AfterBattleText5 ; 0x4e5d TextAfterBattle
dw Route20EndBattleText5 ; 0x4e58 TextEndBattle
@@ -126,7 +126,7 @@
Route20TrainerHeader6: ; 50d76 (14:4d76)
db $6 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e7 ; flag's byte
+ dw wd7e7 ; flag's byte
dw Route20BattleText6 ; 0x4e62 TextBeforeBattle
dw Route20AfterBattleText6 ; 0x4e6c TextAfterBattle
dw Route20EndBattleText6 ; 0x4e67 TextEndBattle
@@ -135,7 +135,7 @@
Route20TrainerHeader7: ; 50d82 (14:4d82)
db $7 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7e7 ; flag's byte
+ dw wd7e7 ; flag's byte
dw Route20BattleText7 ; 0x4e71 TextBeforeBattle
dw Route20AfterBattleText7 ; 0x4e7b TextAfterBattle
dw Route20EndBattleText7 ; 0x4e76 TextEndBattle
@@ -144,7 +144,7 @@
Route20TrainerHeader8: ; 50d8e (14:4d8e)
db $8 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e7 ; flag's byte
+ dw wd7e7 ; flag's byte
dw Route20BattleText8 ; 0x4e80 TextBeforeBattle
dw Route20AfterBattleText8 ; 0x4e8a TextAfterBattle
dw Route20EndBattleText8 ; 0x4e85 TextEndBattle
@@ -153,7 +153,7 @@
Route20TrainerHeader9: ; 50d9a (14:4d9a)
db $9 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7e7 ; flag's byte
+ dw wd7e7 ; flag's byte
dw Route20BattleText9 ; 0x4e8f TextBeforeBattle
dw Route20AfterBattleText9 ; 0x4e99 TextAfterBattle
dw Route20EndBattleText9 ; 0x4e94 TextEndBattle
@@ -162,7 +162,7 @@
Route20TrainerHeader10: ; 50da6 (14:4da6)
db $a ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e7 ; flag's byte
+ dw wd7e7 ; flag's byte
dw Route20BattleText10 ; 0x4e9e TextBeforeBattle
dw Route20AfterBattleText10 ; 0x4ea8 TextAfterBattle
dw Route20EndBattleText10 ; 0x4ea3 TextEndBattle
--- a/scripts/route21.asm
+++ b/scripts/route21.asm
@@ -27,7 +27,7 @@
Route21TrainerHeader0: ; 55f16 (15:5f16)
db $1 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText1 ; 0x5fdd TextBeforeBattle
dw Route21AfterBattleText1 ; 0x5fe7 TextAfterBattle
dw Route21EndBattleText1 ; 0x5fe2 TextEndBattle
@@ -36,7 +36,7 @@
Route21TrainerHeader1: ; 55f22 (15:5f22)
db $2 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText2 ; 0x5fec TextBeforeBattle
dw Route21AfterBattleText2 ; 0x5ff6 TextAfterBattle
dw Route21EndBattleText2 ; 0x5ff1 TextEndBattle
@@ -45,7 +45,7 @@
Route21TrainerHeader2: ; 55f2e (15:5f2e)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText3 ; 0x5ffb TextBeforeBattle
dw Route21AfterBattleText3 ; 0x6005 TextAfterBattle
dw Route21EndBattleText3 ; 0x6000 TextEndBattle
@@ -54,7 +54,7 @@
Route21TrainerHeader3: ; 55f3a (15:5f3a)
db $4 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText4 ; 0x600a TextBeforeBattle
dw Route21AfterBattleText4 ; 0x6014 TextAfterBattle
dw Route21EndBattleText4 ; 0x600f TextEndBattle
@@ -63,7 +63,7 @@
Route21TrainerHeader4: ; 55f46 (15:5f46)
db $5 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText5 ; 0x6019 TextBeforeBattle
dw Route21AfterBattleText5 ; 0x6023 TextAfterBattle
dw Route21EndBattleText5 ; 0x601e TextEndBattle
@@ -72,7 +72,7 @@
Route21TrainerHeader5: ; 55f52 (15:5f52)
db $6 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText6 ; 0x6028 TextBeforeBattle
dw Route21AfterBattleText6 ; 0x6032 TextAfterBattle
dw Route21EndBattleText6 ; 0x602d TextEndBattle
@@ -81,7 +81,7 @@
Route21TrainerHeader6: ; 55f5e (15:5f5e)
db $7 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText7 ; 0x6037 TextBeforeBattle
dw Route21AfterBattleText7 ; 0x6041 TextAfterBattle
dw Route21EndBattleText7 ; 0x603c TextEndBattle
@@ -90,7 +90,7 @@
Route21TrainerHeader7: ; 55f6a (15:5f6a)
db $8 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText8 ; 0x6046 TextBeforeBattle
dw Route21AfterBattleText8 ; 0x6050 TextAfterBattle
dw Route21EndBattleText8 ; 0x604b TextEndBattle
@@ -99,7 +99,7 @@
Route21TrainerHeader8: ; 55f76 (15:5f76)
db $9 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d7e9 ; flag's byte
+ dw wd7e9 ; flag's byte
dw Route21BattleText9 ; 0x6055 TextBeforeBattle
dw Route21AfterBattleText9 ; 0x605f TextAfterBattle
dw Route21EndBattleText9 ; 0x605a TextEndBattle
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@@ -22,7 +22,7 @@
ret
Route22Script_50ed6: ; 50ed6 (14:4ed6)
- ld a, [W_RIVALSTARTER] ; $d715
+ ld a, [W_RIVALSTARTER] ; wd715
ld b, a
.asm_50eda
ld a, [hli]
@@ -32,12 +32,12 @@
jr .asm_50eda
.asm_50ee1
ld a, [hl]
- ld [W_TRAINERNO], a ; $d05d
+ ld [W_TRAINERNO], a ; wd05d
ret
Route22MoveRivalSprite: ; 50ee6 (14:4ee6)
ld de, Route22RivalMovementData ; $4efb
- ld a, [$cf0d]
+ ld a, [wcf0d]
cp $1
jr z, .asm_50ef1
inc de
@@ -51,21 +51,21 @@
db $C0,$C0,$C0,$C0,$FF ; move right 4 times
Route22Script0: ; 50f00 (14:4f00)
- ld a, [$d7eb]
+ ld a, [wd7eb]
bit 7, a
ret z
ld hl, .Route22RivalBattleCoords ; $4f2d
call ArePlayerCoordsInArray
ret nc
- ld a, [$cd3d]
- ld [$cf0d], a
+ ld a, [wWhichTrade]
+ ld [wcf0d], a
xor a
ld [hJoyHeld], a
ld a, $f0
ld [wJoyIgnore], a
ld a, $2
- ld [$d528], a
- ld a, [$d7eb]
+ ld [wd528], a
+ ld a, [wd7eb]
bit 0, a ; is this the rival battle at the beginning of the game?
jr nz, .firstRivalBattle ; 0x50f25 $b
bit 1, a ; is this the rival at the end of the game?
@@ -79,16 +79,16 @@
.firstRivalBattle
ld a, $1
- ld [$cd4f], a
+ ld [wcd4f], a
xor a
- ld [$cd50], a
+ ld [wcd50], a
ld a, $4c
call Predef
- ld a, [$d700]
+ ld a, [wd700]
and a
jr z, .asm_50f4e ; 0x50f44 $8
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
.asm_50f4e
ld c, BANK(Music_MeetRival)
@@ -102,14 +102,14 @@
ret
Route22Script1: ; 50f62 (14:4f62)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
- ld a, [$cf0d]
+ ld a, [wcf0d]
cp $1
jr nz, .asm_50f78 ; 0x50f6d $9
ld a, $4
- ld [$d528], a
+ ld [wd528], a
ld a, $4
jr .asm_50f7a ; 0x50f76 $2
.asm_50f78
@@ -124,7 +124,7 @@
ld a, $1
ld [$ff8c], a
call DisplayTextID
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, Route22RivalDefeatedText1
@@ -145,10 +145,10 @@
db STARTER1,$06
Route22Script2: ; 50fb5 (14:4fb5)
- ld a, [$d057]
+ ld a, [W_ISINBATTLE]
cp $ff
jp z, Route22Script_50ece
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
and a
jr nz, .asm_50fc7 ; 0x50fc1 $4
ld a, $4
@@ -162,16 +162,16 @@
call Func_34a6
ld a, $f0
ld [wJoyIgnore], a
- ld hl, $d7eb
+ ld hl, wd7eb
set 5, [hl]
ld a, $1
ld [$ff8c], a
call DisplayTextID
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
callba Music_RivalAlternateStart
- ld a, [$cf0d]
+ ld a, [wcf0d]
cp $1
jr nz, .asm_50fff ; 0x50ff8 $5
call Route22Script_51008
@@ -201,17 +201,17 @@
db $40,$C0,$C0,$C0,$00,$00,$00,$00,$00,$00,$FF
Route22Script3: ; 5102a (14:502a)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
xor a
ld [wJoyIgnore], a
ld a, $22
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
call Func_2307
- ld hl, $d7eb
+ ld hl, wd7eb
res 0, [hl]
res 7, [hl]
ld a, $0
@@ -220,20 +220,20 @@
Route22Script_5104e: ; 5104e (14:504e)
ld a, $2
- ld [$cd4f], a
+ ld [wcd4f], a
xor a
- ld [$cd50], a
+ ld [wcd50], a
ld a, $4c
call Predef ; indirect jump to PrintEmotionBubble (17c47 (5:7c47))
- ld a, [$d700]
+ ld a, [wd700]
and a
jr z, .skipYVisibilityTesta
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
.skipYVisibilityTesta
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
callba Music_RivalAlternateTempo
ld a, $2
@@ -244,21 +244,21 @@
ret
Route22Script4: ; 51087 (14:5087)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
- ld a, [$cf0d]
+ ld a, [wcf0d]
cp $1
jr nz, .asm_510a1
ld a, $4
- ld [$d528], a
+ ld [wd528], a
ld a, $4
jr .asm_510a8
.asm_510a1
ld a, $2
- ld [$d528], a
+ ld [wd528], a
ld a, $c
.asm_510a8
ld [$ff8d], a
@@ -268,7 +268,7 @@
ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, Route22RivalDefeatedText2 ; $51cb
@@ -275,7 +275,7 @@
ld de, Route22Text_511d0 ; $51d0
call PreBattleSaveRegisters
ld a, SONY2 + $c8
- ld [W_CUROPPONENT], a ; $d059
+ ld [W_CUROPPONENT], a ; wd059
ld hl, StarterMons_510d9 ; $50d9
call Route22Script_50ed6
ld a, $5
@@ -288,21 +288,21 @@
db STARTER1,$0c
Route22Script5: ; 510df (14:50df)
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, Route22Script_50ece
ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
- ld a, [$cf0d]
+ ld a, [wcf0d]
cp $1
jr nz, .asm_510fb
ld a, $4
- ld [$d528], a
+ ld [wd528], a
ld a, $4
jr .asm_51102
.asm_510fb
ld a, $2
- ld [$d528], a
+ ld [wd528], a
ld a, $c
.asm_51102
ld [$ff8d], a
@@ -309,16 +309,16 @@
call Func_34a6
ld a, $f0
ld [wJoyIgnore], a
- ld hl, $d7eb
+ ld hl, wd7eb
set 6, [hl]
ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
callba Music_RivalAlternateStartAndTempo
- ld a, [$cf0d]
+ ld a, [wcf0d]
cp $1
jr nz, .asm_51134
call Route22Script_5113d
@@ -348,17 +348,17 @@
db $80,$80,$80,$FF ; left x3
Route22Script6: ; 51151 (14:5151)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
xor a
ld [wJoyIgnore], a
ld a, $23
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
call Func_2307
- ld hl, $d7eb
+ ld hl, wd7eb
res 1, [hl]
res 7, [hl]
ld a, $7
@@ -372,7 +372,7 @@
Route22Text1: ; 5117b (14:517b)
db $08 ; asm
- ld a, [$d7eb]
+ ld a, [wd7eb]
bit 5, a
jr z, .asm_a88cf ; 0x51181
ld hl, Route22RivalAfterBattleText1
@@ -386,7 +386,7 @@
Route22Text2: ; 51194 (14:5194)
db $08 ; asm
- ld a, [$d7eb]
+ ld a, [wd7eb]
bit 6, a
jr z, .asm_58c0a ; 0x5119a
ld hl, Route22RivalAfterBattleText2
--- a/scripts/route22gate.asm
+++ b/scripts/route22gate.asm
@@ -34,15 +34,15 @@
Route22GateScript_1e6ba: ; 1e6ba (7:66ba)
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
ld a, $80
- ld [$ccd3], a
- ld [$c109], a
+ ld [wccd3], a
+ ld [wSpriteStateData1 + 9], a
ld [wJoyIgnore], a
jp Func_3486
Route22GateScript1: ; 1e6cd (7:66cd)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
xor a
--- a/scripts/route23.asm
+++ b/scripts/route23.asm
@@ -6,22 +6,22 @@
jp CallFunctionInTable
Route23Script_511e9: ; 511e9 (14:51e9)
- ld hl, $d126
+ ld hl, wd126
bit 6, [hl]
res 6, [hl]
ret z
- ld hl, $d7ee
+ ld hl, wd7ee
res 0, [hl]
res 7, [hl]
- ld hl, $d813
+ ld hl, wd813
res 0, [hl]
res 6, [hl]
ld a, $7a
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8))
ld a, $60
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
jp Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
@@ -53,9 +53,9 @@
ld a, e
ld [$ff8c], a
ld a, c
- ld [$cd3d], a
+ ld [wWhichTrade], a
ld b, $2
- ld hl, $d7ed
+ ld hl, wd7ed
ld a, $10
call Predef
ld a, c
@@ -72,7 +72,7 @@
Route23Script_5125d: ; 5125d (14:525d)
ld hl, BadgeTextPointers ; $5276
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
ld c, a
ld b, $0
add hl, bc
@@ -80,7 +80,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- ld de, $cd6d
+ ld de, wcd6d
.asm_5126e
ld a, [hli]
ld [de], a
@@ -121,16 +121,16 @@
Route23Script_512d8: ; 512d8 (14:52d8)
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
ld a, $80
- ld [$ccd3], a
+ ld [wccd3], a
xor a
- ld [$c109], a
+ ld [wSpriteStateData1 + 9], a
ld [wJoyIgnore], a
jp Func_3486
Route23Script1: ; 512ec (14:52ec)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
Route23Script2: ; 512f1 (14:52f1)
@@ -191,9 +191,9 @@
jp TextScriptEnd
Route23Script_51346: ; 51346 (14:5346)
- ld [wWhichTrade], a ; $cd3d
+ ld [wWhichTrade], a ; wWhichTrade
call Route23Script_5125d
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
inc a
ld c, a
ld b, $2
@@ -212,10 +212,10 @@
.asm_5136e
ld hl, VictoryRoadGuardText2
call PrintText
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
ld c, a
ld b, $1
- ld hl, $d7ed
+ ld hl, wd7ed
ld a, $10 ; FlagActionPredef
call Predef
ld a, $2
--- a/scripts/route24.asm
+++ b/scripts/route24.asm
@@ -22,7 +22,7 @@
dw Route24Script4
Route24Script0: ; 513d5 (14:53d5)
- ld a, [$d7ef]
+ ld a, [wd7ef]
bit 0, a
jp nz, CheckFightingMapTrainers
ld hl, CoordsData_5140e ; $540e
@@ -33,14 +33,14 @@
ld a, $1
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld hl, $d7f0
+ ld hl, wd7f0
bit 1, [hl]
res 1, [hl]
ret z
ld a, $80
- ld [$ccd3], a
+ ld [wccd3], a
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
call Func_3486
ld a, $4
ld [W_ROUTE24CURSCRIPT], a
@@ -51,7 +51,7 @@
db $0F,$0A,$FF
Route24Script4: ; 51411 (14:5411)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
call Delay3
@@ -61,13 +61,13 @@
ret
Route24Script3: ; 51422 (14:5422)
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, Route24Script_513c0
call UpdateSprites
ld a, $f0
ld [wJoyIgnore], a
- ld hl, $d7ef
+ ld hl, wd7ef
set 1, [hl]
ld a, $1
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
@@ -93,7 +93,7 @@
Route24TrainerHeader0: ; 5145b (14:545b)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7ef ; flag's byte
+ dw wd7ef ; flag's byte
dw Route24BattleText1 ; 0x5571 TextBeforeBattle
dw Route24AfterBattleText1 ; 0x557b TextAfterBattle
dw Route24EndBattleText1 ; 0x5576 TextEndBattle
@@ -102,7 +102,7 @@
Route24TrainerHeader2: ; 51467 (14:5467)
db $3 ; flag's bit
db ($1 << 4) ; trainer's view range
- dw $d7ef ; flag's byte
+ dw wd7ef ; flag's byte
dw Route24BattleText2 ; 0x5580 TextBeforeBattle
dw Route24AfterBattleText2 ; 0x558a TextAfterBattle
dw Route24EndBattleText2 ; 0x5585 TextEndBattle
@@ -111,7 +111,7 @@
Route24TrainerHeader3: ; 51473 (14:5473)
db $4 ; flag's bit
db ($1 << 4) ; trainer's view range
- dw $d7ef ; flag's byte
+ dw wd7ef ; flag's byte
dw Route24BattleText3 ; 0x558f TextBeforeBattle
dw Route24AfterBattleText3 ; 0x5599 TextAfterBattle
dw Route24EndBattleText3 ; 0x5594 TextEndBattle
@@ -120,7 +120,7 @@
Route24TrainerHeader4: ; 5147f (14:547f)
db $5 ; flag's bit
db ($1 << 4) ; trainer's view range
- dw $d7ef ; flag's byte
+ dw wd7ef ; flag's byte
dw Route24BattleText4 ; 0x559e TextBeforeBattle
dw Route24AfterBattleText4 ; 0x55a8 TextAfterBattle
dw Route24EndBattleText4 ; 0x55a3 TextEndBattle
@@ -129,7 +129,7 @@
Route24TrainerHeader5: ; 5148b (14:548b)
db $6 ; flag's bit
db ($1 << 4) ; trainer's view range
- dw $d7ef ; flag's byte
+ dw wd7ef ; flag's byte
dw Route24BattleText5 ; 0x55ad TextBeforeBattle
dw Route24AfterBattleText5 ; 0x55b7 TextAfterBattle
dw Route24EndBattleText5 ; 0x55b2 TextEndBattle
@@ -138,7 +138,7 @@
Route24TrainerHeader6: ; 51497 (14:5497)
db $7 ; flag's bit
db ($1 << 4) ; trainer's view range
- dw $d7ef ; flag's byte
+ dw wd7ef ; flag's byte
dw Route24BattleText6 ; 0x55bc TextBeforeBattle
dw Route24AfterBattleText6 ; 0x55c6 TextAfterBattle
dw Route24EndBattleText6 ; 0x55c1 TextEndBattle
@@ -148,9 +148,9 @@
Route24Text1: ; 514a4 (14:54a4)
db $8
- ld hl, $d7f0
+ ld hl, wd7f0
res 1, [hl]
- ld a, [$d7ef]
+ ld a, [wd7ef]
bit 0, a
jr nz, .asm_a03f5 ; 0x514af $48
ld hl, Route24Text_51510
@@ -158,13 +158,13 @@
ld bc, (NUGGET << 8) | 1
call GiveItem
jr nc, .BagFull
- ld hl, $d7ef
+ ld hl, wd7ef
set 0, [hl]
ld hl, Route24Text_5151a
call PrintText
ld hl, Route24Text_51526
call PrintText
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, Route24Text_5152b
@@ -171,7 +171,7 @@
ld de, Route24Text_5152b
call PreBattleSaveRegisters
ld a, [$ff8c]
- ld [$cf13], a
+ ld [wcf13], a
call EngageMapTrainer
call InitBattleEnemyParameters
xor a
@@ -187,7 +187,7 @@
.BagFull
ld hl, Route24Text_51521
call PrintText
- ld hl, $d7f0
+ ld hl, wd7f0
set 1, [hl]
jp TextScriptEnd
--- a/scripts/route25.asm
+++ b/scripts/route25.asm
@@ -9,11 +9,11 @@
ret
Route25Script_515e1: ; 515e1 (14:55e1)
- ld hl, $d126
+ ld hl, wd126
bit 6, [hl]
res 6, [hl]
ret z
- ld hl, $d7f2
+ ld hl, wd7f2
bit 7, [hl]
ret nz
bit 5, [hl]
@@ -20,7 +20,7 @@
jr nz, .asm_515ff
res 6, [hl]
ld a, $61
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
jp Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8))
.asm_515ff
@@ -28,15 +28,15 @@
ret z
set 7, [hl]
ld a, $24
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
ld a, $62
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
ld a, $63
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
jp Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8))
@@ -62,7 +62,7 @@
Route25TrainerHeader0: ; 5163e (14:563e)
db $1 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7f1 ; flag's byte
+ dw wd7f1 ; flag's byte
dw Route25BattleText1 ; 0x5705 TextBeforeBattle
dw Route25AfterBattleText1 ; 0x570f TextAfterBattle
dw Route25EndBattleText1 ; 0x570a TextEndBattle
@@ -71,7 +71,7 @@
Route25TrainerHeader2: ; 5164a (14:564a)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7f1 ; flag's byte
+ dw wd7f1 ; flag's byte
dw Route25BattleText2 ; 0x5714 TextBeforeBattle
dw Route25AfterBattleText2 ; 0x571e TextAfterBattle
dw Route25EndBattleText2 ; 0x5719 TextEndBattle
@@ -80,7 +80,7 @@
Route25TrainerHeader3: ; 51656 (14:5656)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7f1 ; flag's byte
+ dw wd7f1 ; flag's byte
dw Route25BattleText3 ; 0x5723 TextBeforeBattle
dw Route25AfterBattleText3 ; 0x572d TextAfterBattle
dw Route25EndBattleText3 ; 0x5728 TextEndBattle
@@ -89,7 +89,7 @@
Route25TrainerHeader4: ; 51662 (14:5662)
db $4 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7f1 ; flag's byte
+ dw wd7f1 ; flag's byte
dw Route25BattleText4 ; 0x5732 TextBeforeBattle
dw Route25AfterBattleText4 ; 0x573c TextAfterBattle
dw Route25EndBattleText4 ; 0x5737 TextEndBattle
@@ -98,7 +98,7 @@
Route25TrainerHeader5: ; 5166e (14:566e)
db $5 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7f1 ; flag's byte
+ dw wd7f1 ; flag's byte
dw Route25BattleText5 ; 0x5741 TextBeforeBattle
dw Route25AfterBattleText5 ; 0x574b TextAfterBattle
dw Route25EndBattleText5 ; 0x5746 TextEndBattle
@@ -107,7 +107,7 @@
Route25TrainerHeader6: ; 5167a (14:567a)
db $6 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7f1 ; flag's byte
+ dw wd7f1 ; flag's byte
dw Route25BattleText6 ; 0x5750 TextBeforeBattle
dw Route25AfterBattleText6 ; 0x575a TextAfterBattle
dw Route25EndBattleText6 ; 0x5755 TextEndBattle
@@ -116,7 +116,7 @@
Route25TrainerHeader7: ; 51686 (14:5686)
db $7 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7f1 ; flag's byte
+ dw wd7f1 ; flag's byte
dw Route25BattleText7 ; 0x575f TextBeforeBattle
dw Route25AfterBattleText7 ; 0x5769 TextAfterBattle
dw Route25EndBattleText7 ; 0x5764 TextEndBattle
@@ -125,7 +125,7 @@
Route25TrainerHeader8: ; 51692 (14:5692)
db $8 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7f1 ; flag's byte
+ dw wd7f1 ; flag's byte
dw Route25BattleText8 ; 0x576e TextBeforeBattle
dw Route25AfterBattleText8 ; 0x5778 TextAfterBattle
dw Route25EndBattleText8 ; 0x5773 TextEndBattle
@@ -134,7 +134,7 @@
Route25TrainerHeader9: ; 5169e (14:569e)
db $9 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7f1 ; flag's byte
+ dw wd7f1 ; flag's byte
dw Route25BattleText9 ; 0x577d TextBeforeBattle
dw Route25AfterBattleText9 ; 0x5787 TextAfterBattle
dw Route25EndBattleText9 ; 0x5782 TextEndBattle
--- a/scripts/route2gate.asm
+++ b/scripts/route2gate.asm
@@ -7,7 +7,7 @@
Route2GateText1: ; 5d5db (17:55db)
db $08 ; asm
- ld a, [$d7c2]
+ ld a, [wd7c2]
bit 0, a
jr nz, .asm_6592c ; 0x5d5e1
ld a, 10 ; pokemon needed
@@ -14,10 +14,10 @@
ldh [$db], a
ld a, HM_05 ; oak's aide reward
ldh [$dc], a
- ld [$d11e], a
+ ld [wd11e], a
call GetItemName ; $2fcf
- ld hl, $cd6d
- ld de, $cc5b
+ ld hl, wcd6d
+ ld de, wcc5b
ld bc, $000d
call CopyData
ld a, $62
@@ -25,7 +25,7 @@
ldh a, [$db]
cp $1
jr nz, .asm_ad646 ; 0x5d606
- ld hl, $d7c2
+ ld hl, wd7c2
set 0, [hl]
.asm_6592c ; 0x5d60d
ld hl, Route2GateText_5d616
--- a/scripts/route3.asm
+++ b/scripts/route3.asm
@@ -28,7 +28,7 @@
Route3TrainerHeader0: ; 55525 (15:5525)
db $2 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7c3 ; flag's byte
+ dw wd7c3 ; flag's byte
dw Route3BattleText1 ; 0x5595 TextBeforeBattle
dw Route3AfterBattleText1 ; 0x559f TextAfterBattle
dw Route3EndBattleText1 ; 0x559a TextEndBattle
@@ -37,7 +37,7 @@
Route3TrainerHeader2: ; 55531 (15:5531)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7c3 ; flag's byte
+ dw wd7c3 ; flag's byte
dw Route3BattleText2 ; 0x55ae TextBeforeBattle
dw Route3AfterBattleText2 ; 0x55b8 TextAfterBattle
dw Route3EndBattleText2 ; 0x55b3 TextEndBattle
@@ -46,7 +46,7 @@
Route3TrainerHeader3: ; 5553d (15:553d)
db $4 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7c3 ; flag's byte
+ dw wd7c3 ; flag's byte
dw Route3BattleText3 ; 0x55c7 TextBeforeBattle
dw Route3AfterBattleText3 ; 0x55d1 TextAfterBattle
dw Route3EndBattleText3 ; 0x55cc TextEndBattle
@@ -55,7 +55,7 @@
Route3TrainerHeader4: ; 55549 (15:5549)
db $5 ; flag's bit
db ($1 << 4) ; trainer's view range
- dw $d7c3 ; flag's byte
+ dw wd7c3 ; flag's byte
dw Route3BattleText4 ; 0x55e0 TextBeforeBattle
dw Route3AfterBattleText4 ; 0x55ea TextAfterBattle
dw Route3EndBattleText4 ; 0x55e5 TextEndBattle
@@ -64,7 +64,7 @@
Route3TrainerHeader5: ; 55555 (15:5555)
db $6 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7c3 ; flag's byte
+ dw wd7c3 ; flag's byte
dw Route3BattleText5 ; 0x55f9 TextBeforeBattle
dw Route3AfterBattleText5 ; 0x5603 TextAfterBattle
dw Route3EndBattleText5 ; 0x55fe TextEndBattle
@@ -73,7 +73,7 @@
Route3TrainerHeader6: ; 55561 (15:5561)
db $7 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7c3 ; flag's byte
+ dw wd7c3 ; flag's byte
dw Route3BattleText6 ; 0x5612 TextBeforeBattle
dw Route3AfterBattleText6 ; 0x561c TextAfterBattle
dw Route3EndBattleText6 ; 0x5617 TextEndBattle
@@ -82,7 +82,7 @@
Route3TrainerHeader7: ; 5556d (15:556d)
db $8 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7c3 ; flag's byte
+ dw wd7c3 ; flag's byte
dw Route3BattleText7 ; 0x562b TextBeforeBattle
dw Route3AfterBattleText7 ; 0x5635 TextAfterBattle
dw Route3EndBattleText7 ; 0x5630 TextEndBattle
@@ -91,7 +91,7 @@
Route3TrainerHeader8: ; 55579 (15:5579)
db $9 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7c3 ; flag's byte
+ dw wd7c3 ; flag's byte
dw Route3BattleText8 ; 0x5644 TextBeforeBattle
dw Route3AfterBattleText8 ; 0x564e TextAfterBattle
dw Route3EndBattleText8 ; 0x5649 TextEndBattle
--- a/scripts/route4.asm
+++ b/scripts/route4.asm
@@ -24,7 +24,7 @@
Route4TrainerHeader0: ; 5567d (15:567d)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7c5 ; flag's byte
+ dw wd7c5 ; flag's byte
dw Route4BattleText1 ; 0x5699 TextBeforeBattle
dw Route4AfterBattleText1 ; 0x56a3 TextAfterBattle
dw Route4EndBattleText1 ; 0x569e TextEndBattle
--- a/scripts/route5gate.asm
+++ b/scripts/route5gate.asm
@@ -10,13 +10,13 @@
Route5GateScript_1df43: ; 1df43 (7:5f43)
ld a, $40
- ld [$ccd3], a
+ ld [wccd3], a
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
jp Func_3486
Route5GateScript0: ; 1df50 (7:5f50)
- ld a, [$d728]
+ ld a, [wd728]
bit 6, a
ret nz
ld hl, CoordsData_1df8f
@@ -23,7 +23,7 @@
call ArePlayerCoordsInArray
ret nc
ld a, $2
- ld [$d528], a
+ ld [wd528], a
xor a
ld [hJoyHeld], a
callba RemoveGuardDrink
@@ -41,7 +41,7 @@
ld a, $3
ld [$ff00+$8c], a
call DisplayTextID
- ld hl, $d728
+ ld hl, wd728
set 6, [hl]
ret
@@ -51,7 +51,7 @@
db $ff
Route5GateScript1: ; 1df94 (7:5f94)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
call Delay3
@@ -70,7 +70,7 @@
Route6GateText1: ; 1dfaa (7:5faa)
Route5GateText1: ; 1dfaa (7:5faa)
db $8
- ld a, [$d728]
+ ld a, [wd728]
bit 6, a
jr nz, .asm_88856 ; 0x1dfb0 $2c
callba RemoveGuardDrink
@@ -86,7 +86,7 @@
.asm_768a2 ; 0x1dfd0
ld hl, Route5GateText3
call PrintText
- ld hl, $d728
+ ld hl, wd728
set 6, [hl]
jp TextScriptEnd
.asm_88856 ; 0x1dfde
--- a/scripts/route6.asm
+++ b/scripts/route6.asm
@@ -25,7 +25,7 @@
Route6TrainerHeader0: ; 590d7 (16:50d7)
db $1 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d7c9 ; flag's byte
+ dw wd7c9 ; flag's byte
dw Route6BattleText1 ; 0x512a TextBeforeBattle
dw Route6AfterBattleText1 ; 0x5134 TextAfterBattle
dw Route6EndBattleText1 ; 0x512f TextEndBattle
@@ -34,7 +34,7 @@
Route6TrainerHeader1: ; 590e3 (16:50e3)
db $2 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d7c9 ; flag's byte
+ dw wd7c9 ; flag's byte
dw Route6BattleText2 ; 0x5143 TextBeforeBattle
dw Route6AfterBattleText1 ; 0x5134 TextAfterBattle
dw Route6EndBattleText2 ; 0x5148 TextEndBattle
@@ -43,7 +43,7 @@
Route6TrainerHeader2: ; 590ef (16:50ef)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7c9 ; flag's byte
+ dw wd7c9 ; flag's byte
dw Route6BattleText3 ; 0x5157 TextBeforeBattle
dw Route6AfterBattleText3 ; 0x5161 TextAfterBattle
dw Route6EndBattleText3 ; 0x515c TextEndBattle
@@ -52,7 +52,7 @@
Route6TrainerHeader3: ; 590fb (16:50fb)
db $4 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7c9 ; flag's byte
+ dw wd7c9 ; flag's byte
dw Route6BattleText4 ; 0x5170 TextBeforeBattle
dw Route6AfterBattleText4 ; 0x517a TextAfterBattle
dw Route6EndBattleText4 ; 0x5175 TextEndBattle
@@ -61,7 +61,7 @@
Route6TrainerHeader4: ; 59107 (16:5107)
db $5 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7c9 ; flag's byte
+ dw wd7c9 ; flag's byte
dw Route6BattleText5 ; 0x5189 TextBeforeBattle
dw Route6AfterBattleText5 ; 0x5193 TextAfterBattle
dw Route6EndBattleText5 ; 0x518e TextEndBattle
@@ -70,7 +70,7 @@
Route6TrainerHeader5: ; 59113 (16:5113)
db $6 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7c9 ; flag's byte
+ dw wd7c9 ; flag's byte
dw Route6BattleText6 ; 0x51a2 TextBeforeBattle
dw Route6AfterBattleText6 ; 0x51ac TextAfterBattle
dw Route6EndBattleText6 ; 0x51a7 TextEndBattle
--- a/scripts/route6gate.asm
+++ b/scripts/route6gate.asm
@@ -10,7 +10,7 @@
dw Route6GateScript1
Route6GateScript0: ; 1e04e (7:604e)
- ld a, [$d728]
+ ld a, [wd728]
bit 6, a
ret nz
ld hl, CoordsData_1e08c
@@ -17,7 +17,7 @@
call ArePlayerCoordsInArray
ret nc
ld a, $1
- ld [$d528], a
+ ld [wd528], a
xor a
ld [hJoyHeld], a
callba RemoveGuardDrink
@@ -32,7 +32,7 @@
ld [W_ROUTE6GATECURSCRIPT], a
ret
.asm_1e080
- ld hl, $d728
+ ld hl, wd728
set 6, [hl]
ld a, $3
ld [$ff8c], a
@@ -43,7 +43,7 @@
db $02,$04,$FF
Route6GateScript1: ; 1e091 (7:6091)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
call Delay3
@@ -53,15 +53,15 @@
ret
Route6GateScript_1e0a1: ; 1e0a1 (7:60a1)
- ld hl, $d730
+ ld hl, wd730
set 7, [hl]
ld a, $80
- ld [$ccd3], a
+ ld [wccd3], a
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
xor a
- ld [$c206], a
- ld [$cd3b], a
+ ld [wSpriteStateData2 + $06], a
+ ld [wcd3b], a
ret
Route6GateTextPointers: ; 1e0b8 (7:60b8)
--- a/scripts/route7gate.asm
+++ b/scripts/route7gate.asm
@@ -10,19 +10,19 @@
dw Route7GateScript1
Route7GateScript_1e111: ; 1e111 (7:6111)
- ld hl, $d730
+ ld hl, wd730
set 7, [hl]
ld a, $20
- ld [$ccd3], a
+ ld [wccd3], a
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
xor a
- ld [$c206], a
- ld [$cd3b], a
+ ld [wSpriteStateData2 + $06], a
+ ld [wcd3b], a
ret
Route7GateScript0: ; 1e128 (7:6128)
- ld a, [$d728]
+ ld a, [wd728]
bit 6, a
ret nz
ld hl, CoordsData_1e167
@@ -29,7 +29,7 @@
call ArePlayerCoordsInArray
ret nc
ld a, $8
- ld [$d528], a
+ ld [wd528], a
xor a
ld [hJoyHeld], a
callba RemoveGuardDrink
@@ -47,7 +47,7 @@
ld a, $3
ld [$ff8c], a
call DisplayTextID
- ld hl, $d728
+ ld hl, wd728
set 6, [hl]
ret
@@ -57,7 +57,7 @@
db $ff
Route7GateScript1: ; 1e16c (7:616c)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
call Delay3
--- a/scripts/route8.asm
+++ b/scripts/route8.asm
@@ -28,7 +28,7 @@
Route8TrainerHeader0: ; 591e3 (16:51e3)
db $1 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7cd ; flag's byte
+ dw wd7cd ; flag's byte
dw Route8BattleText1 ; 0x525a TextBeforeBattle
dw Route8AfterBattleText1 ; 0x5264 TextAfterBattle
dw Route8EndBattleText1 ; 0x525f TextEndBattle
@@ -37,7 +37,7 @@
Route8TrainerHeader1: ; 591ef (16:51ef)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7cd ; flag's byte
+ dw wd7cd ; flag's byte
dw Route8BattleText2 ; 0x5273 TextBeforeBattle
dw Route8AfterBattleText2 ; 0x527d TextAfterBattle
dw Route8EndBattleText2 ; 0x5278 TextEndBattle
@@ -46,7 +46,7 @@
Route8TrainerHeader2: ; 591fb (16:51fb)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7cd ; flag's byte
+ dw wd7cd ; flag's byte
dw Route8BattleText3 ; 0x528c TextBeforeBattle
dw Route8AfterBattleText3 ; 0x5296 TextAfterBattle
dw Route8EndBattleText3 ; 0x5291 TextEndBattle
@@ -55,7 +55,7 @@
Route8TrainerHeader3: ; 59207 (16:5207)
db $4 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7cd ; flag's byte
+ dw wd7cd ; flag's byte
dw Route8BattleText4 ; 0x52a5 TextBeforeBattle
dw Route8AfterBattleText4 ; 0x52af TextAfterBattle
dw Route8EndBattleText4 ; 0x52aa TextEndBattle
@@ -64,7 +64,7 @@
Route8TrainerHeader4: ; 59213 (16:5213)
db $5 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7cd ; flag's byte
+ dw wd7cd ; flag's byte
dw Route8BattleText5 ; 0x52be TextBeforeBattle
dw Route8AfterBattleText5 ; 0x52c8 TextAfterBattle
dw Route8EndBattleText5 ; 0x52c3 TextEndBattle
@@ -73,7 +73,7 @@
Route8TrainerHeader5: ; 5921f (16:521f)
db $6 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7cd ; flag's byte
+ dw wd7cd ; flag's byte
dw Route8BattleText6 ; 0x52d7 TextBeforeBattle
dw Route8AfterBattleText6 ; 0x52e1 TextAfterBattle
dw Route8EndBattleText6 ; 0x52dc TextEndBattle
@@ -82,7 +82,7 @@
Route8TrainerHeader6: ; 5922b (16:522b)
db $7 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7cd ; flag's byte
+ dw wd7cd ; flag's byte
dw Route8BattleText7 ; 0x52f0 TextBeforeBattle
dw Route8AfterBattleText7 ; 0x52fa TextAfterBattle
dw Route8EndBattleText7 ; 0x52f5 TextEndBattle
@@ -91,7 +91,7 @@
Route8TrainerHeader7: ; 59237 (16:5237)
db $8 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7cd ; flag's byte
+ dw wd7cd ; flag's byte
dw Route8BattleText8 ; 0x5309 TextBeforeBattle
dw Route8AfterBattleText8 ; 0x5313 TextAfterBattle
dw Route8EndBattleText8 ; 0x530e TextEndBattle
@@ -100,7 +100,7 @@
Route8TrainerHeader8: ; 59243 (16:5243)
db $9 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7cd ; flag's byte
+ dw wd7cd ; flag's byte
dw Route8BattleText9 ; 0x5322 TextBeforeBattle
dw Route8AfterBattleText9 ; 0x532c TextAfterBattle
dw Route8EndBattleText9 ; 0x5327 TextEndBattle
--- a/scripts/route8gate.asm
+++ b/scripts/route8gate.asm
@@ -9,19 +9,19 @@
dw Route8GateScript1
Route8GateScript_1e1d7: ; 1e1d7 (7:61d7)
- ld hl, $d730
+ ld hl, wd730
set 7, [hl]
ld a, $10
- ld [$ccd3], a
+ ld [wccd3], a
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
xor a
- ld [$c206], a
- ld [$cd3b], a
+ ld [wSpriteStateData2 + $06], a
+ ld [wcd3b], a
ret
Route8GateScript0: ; 1e1ee (7:61ee)
- ld a, [$d728]
+ ld a, [wd728]
bit 6, a
ret nz
ld hl, CoordsData_1e22c
@@ -28,7 +28,7 @@
call ArePlayerCoordsInArray
ret nc
ld a, $2
- ld [$d528], a
+ ld [wd528], a
xor a
ld [hJoyHeld], a
callba RemoveGuardDrink
@@ -43,7 +43,7 @@
ld [W_ROUTE8GATECURSCRIPT], a
ret
.asm_1e220
- ld hl, $d728
+ ld hl, wd728
set 6, [hl]
ld a, $3
ld [$ff8c], a
@@ -55,7 +55,7 @@
db $ff
Route8GateScript1: ; 1e231 (7:6231)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
call Delay3
--- a/scripts/route9.asm
+++ b/scripts/route9.asm
@@ -29,7 +29,7 @@
Route9TrainerHeader0: ; 556eb (15:56eb)
db $1 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7cf ; flag's byte
+ dw wd7cf ; flag's byte
dw Route9BattleText1 ; 0x5792 TextBeforeBattle
dw Route9AfterBattleText1 ; 0x579c TextAfterBattle
dw Route9EndBattleText1 ; 0x5797 TextEndBattle
@@ -38,7 +38,7 @@
Route9TrainerHeader2: ; 556f7 (15:56f7)
db $2 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7cf ; flag's byte
+ dw wd7cf ; flag's byte
dw Route9BattleText2 ; 0x57a1 TextBeforeBattle
dw Route9AfterBattleText2 ; 0x57ab TextAfterBattle
dw Route9EndBattleText2 ; 0x57a6 TextEndBattle
@@ -47,7 +47,7 @@
Route9TrainerHeader3: ; 55703 (15:5703)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7cf ; flag's byte
+ dw wd7cf ; flag's byte
dw Route9BattleText3 ; 0x57b0 TextBeforeBattle
dw Route9AfterBattleText3 ; 0x57ba TextAfterBattle
dw Route9EndBattleText3 ; 0x57b5 TextEndBattle
@@ -56,7 +56,7 @@
Route9TrainerHeader4: ; 5570f (15:570f)
db $4 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7cf ; flag's byte
+ dw wd7cf ; flag's byte
dw Route9BattleText4 ; 0x57bf TextBeforeBattle
dw Route9AfterBattleText4 ; 0x57c9 TextAfterBattle
dw Route9EndBattleText4 ; 0x57c4 TextEndBattle
@@ -65,7 +65,7 @@
Route9TrainerHeader5: ; 5571b (15:571b)
db $5 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7cf ; flag's byte
+ dw wd7cf ; flag's byte
dw Route9BattleText5 ; 0x57ce TextBeforeBattle
dw Route9AfterBattleText5 ; 0x57d8 TextAfterBattle
dw Route9EndBattleText5 ; 0x57d3 TextEndBattle
@@ -74,7 +74,7 @@
Route9TrainerHeader6: ; 55727 (15:5727)
db $6 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7cf ; flag's byte
+ dw wd7cf ; flag's byte
dw Route9BattleText6 ; 0x57dd TextBeforeBattle
dw Route9AfterBattleText6 ; 0x57e7 TextAfterBattle
dw Route9EndBattleText6 ; 0x57e2 TextEndBattle
@@ -83,7 +83,7 @@
Route9TrainerHeader7: ; 55733 (15:5733)
db $7 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7cf ; flag's byte
+ dw wd7cf ; flag's byte
dw Route9BattleText7 ; 0x57ec TextBeforeBattle
dw Route9AfterBattleText7 ; 0x57f6 TextAfterBattle
dw Route9EndBattleText7 ; 0x57f1 TextEndBattle
@@ -92,7 +92,7 @@
Route9TrainerHeader8: ; 5573f (15:573f)
db $8 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7cf ; flag's byte
+ dw wd7cf ; flag's byte
dw Route9BattleText8 ; 0x57fb TextBeforeBattle
dw Route9AfterBattleText8 ; 0x5805 TextAfterBattle
dw Route9EndBattleText8 ; 0x5800 TextEndBattle
@@ -101,7 +101,7 @@
Route9TrainerHeader9: ; 5574b (15:574b)
db $9 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d7cf ; flag's byte
+ dw wd7cf ; flag's byte
dw Route9BattleText9 ; 0x580a TextBeforeBattle
dw Route9AfterBattleText9 ; 0x5814 TextAfterBattle
dw Route9EndBattleText9 ; 0x580f TextEndBattle
--- a/scripts/safarizoneentrance.asm
+++ b/scripts/safarizoneentrance.asm
@@ -25,8 +25,8 @@
xor a
ld [hJoyHeld], a
ld a, $c
- ld [$c109], a
- ld a, [$cd3d]
+ ld [wSpriteStateData1 + 9], a
+ ld a, [wWhichTrade]
cp $1
jr z, .asm_7520f ; 0x75207 $6
ld a, $2
@@ -73,8 +73,8 @@
SafariZoneEntranceScript5: ; 7524e (1d:524e)
ld a, $4
- ld [$d528], a
- ld hl, $d790
+ ld [wd528], a
+ ld hl, wd790
bit 6, [hl]
res 6, [hl]
jr z, .asm_7527f ; 0x7525a $23
@@ -86,7 +86,7 @@
ld [$ff8c], a
call DisplayTextID
xor a
- ld [$da47], a
+ ld [W_NUMSAFARIBALLS], a
ld a, $80
ld c, $3
call SafariZoneEntranceScript_752a3
@@ -113,7 +113,7 @@
call SafariZoneEntranceScript_752b4
ret nz
call Delay3
- ld a, [$cf0d]
+ ld a, [wcf0d]
ld [W_SAFARIZONEENTRANCECURSCRIPT], a
ret
@@ -121,14 +121,14 @@
push af
ld b, $0
ld a, c
- ld [$cd38], a
- ld hl, $ccd3
+ ld [wcd38], a
+ ld hl, wccd3
pop af
call FillMemory
jp Func_3486
SafariZoneEntranceScript_752b4: ; 752b4 (1d:52b4)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret
@@ -149,10 +149,10 @@
TX_FAR SafariZoneEntranceText_9e6e4 ; 0x9e6e4
db $8
ld a, $13
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jp nz, .asm_75346
xor a
@@ -168,23 +168,23 @@
jr .asm_7534c ; 0x752f7 $53
.asm_752f9
xor a
- ld [$cd3d], a
+ ld [wWhichTrade], a
ld a, $5
- ld [$cd3e], a
+ ld [wTrainerEngageDistance], a
ld a, $0
- ld [$cd3f], a
- ld hl, $cd3f
- ld de, $d349
+ ld [wTrainerFacingDirection], a
+ ld hl, wTrainerFacingDirection
+ ld de, wPlayerMoney + 2
ld c, $3
ld a, $c ; SubtractBCDPredef
call Predef
ld a, $13
- ld [$d125], a
+ ld [wd125], a
call DisplayTextBoxID
ld hl, SafariZoneEntranceText_7535b
call PrintText
ld a, $1e
- ld [$da47], a
+ ld [W_NUMSAFARIBALLS], a
ld a, 502 / $100
ld [wSafariSteps], a
ld a, 502 % $100
@@ -192,7 +192,7 @@
ld a, $40
ld c, $3
call SafariZoneEntranceScript_752a3
- ld hl, $d790
+ ld hl, wd790
set 7, [hl]
res 6, [hl]
ld a, $3
@@ -230,32 +230,32 @@
TX_FAR SafariZoneEntranceText_9e814 ; 0x9e814
db $8
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .asm_7539c ; 0x7537b $1f
ld hl, SafariZoneEntranceText_753bb
call PrintText
xor a
- ld [$c109], a
+ ld [wSpriteStateData1 + 9], a
ld a, $80
ld c, $3
call SafariZoneEntranceScript_752a3
- ld hl, $d790
+ ld hl, wd790
res 6, [hl]
res 7, [hl]
ld a, $0
- ld [$cf0d], a
+ ld [wcf0d], a
jr .asm_753b3 ; 0x7539a $17
.asm_7539c
ld hl, SafariZoneEntranceText_753c0
call PrintText
ld a, $4
- ld [$c109], a
+ ld [wSpriteStateData1 + 9], a
ld a, $40
ld c, $1
call SafariZoneEntranceScript_752a3
ld a, $5
- ld [$cf0d], a
+ ld [wcf0d], a
.asm_753b3
ld a, $6
ld [W_SAFARIZONEENTRANCECURSCRIPT], a
@@ -278,7 +278,7 @@
ld hl, SafariZoneEntranceText_753e6
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
ld hl, SafariZoneEntranceText_753f0
jr nz, .asm_278a6 ; 0x753db
--- a/scripts/safarizonesecrethouse.asm
+++ b/scripts/safarizonesecrethouse.asm
@@ -6,7 +6,7 @@
SafariZoneSecretHouseText1: ; 4a31c (12:631c)
db $08 ; asm
- ld a, [$d857]
+ ld a, [wd857]
bit 0, a
jr nz, .asm_20a9b ; 0x4a322
ld hl, SafariZoneSecretHouseText_4a350
@@ -16,7 +16,7 @@
jr nc, .BagFull
ld hl, ReceivedHM03Text
call PrintText
- ld hl, $d857
+ ld hl, wd857
set 0, [hl]
jr .asm_8f1fc ; 0x4a33d
.BagFull
--- a/scripts/saffrongym.asm
+++ b/scripts/saffrongym.asm
@@ -1,5 +1,5 @@
SaffronGymScript: ; 5d00d (17:500d)
- ld hl, $d126
+ ld hl, wd126
bit 6, [hl]
res 6, [hl]
call nz, .extra
@@ -36,7 +36,7 @@
dw SaffronGymScript3
SaffronGymScript3: ; 5d05b (17:505b)
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, SaffronGymText_5d048
ld a, $f0
@@ -46,7 +46,7 @@
ld a, $a
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld hl, $d7b3
+ ld hl, wd7b3
set 1, [hl]
ld bc, (TM_46 << 8) | 1
call GiveItem
@@ -54,7 +54,7 @@
ld a, $b
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld hl, $d7b3
+ ld hl, wd7b3
set 0, [hl]
jr .asm_5d091
.BagFull
@@ -64,14 +64,14 @@
.asm_5d091
ld hl, W_OBTAINEDBADGES
set 5, [hl]
- ld hl, $d72a
+ ld hl, wd72a
set 5, [hl]
; deactivate gym trainers
- ld a, [$d7b3]
+ ld a, [wd7b3]
or %11111100
- ld [$d7b3], a
- ld hl, $d7b4
+ ld [wd7b3], a
+ ld hl, wd7b4
set 0, [hl]
jp SaffronGymText_5d048
@@ -94,7 +94,7 @@
SaffronGymTrainerHeader0: ; 5d0c3 (17:50c3)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7b3 ; flag's byte
+ dw wd7b3 ; flag's byte
dw SaffronGymBattleText1 ; 0x51f0 TextBeforeBattle
dw SaffronGymAfterBattleText1 ; 0x51fa TextAfterBattle
dw SaffronGymEndBattleText1 ; 0x51f5 TextEndBattle
@@ -103,7 +103,7 @@
SaffronGymTrainerHeader1: ; 5d0cf (17:50cf)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7b3 ; flag's byte
+ dw wd7b3 ; flag's byte
dw SaffronGymBattleText2 ; 0x51ff TextBeforeBattle
dw SaffronGymAfterBattleText2 ; 0x5209 TextAfterBattle
dw SaffronGymEndBattleText2 ; 0x5204 TextEndBattle
@@ -112,7 +112,7 @@
SaffronGymTrainerHeader2: ; 5d0db (17:50db)
db $4 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7b3 ; flag's byte
+ dw wd7b3 ; flag's byte
dw SaffronGymBattleText3 ; 0x520e TextBeforeBattle
dw SaffronGymAfterBattleText3 ; 0x5218 TextAfterBattle
dw SaffronGymEndBattleText3 ; 0x5213 TextEndBattle
@@ -121,7 +121,7 @@
SaffronGymTrainerHeader3: ; 5d0e7 (17:50e7)
db $5 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7b3 ; flag's byte
+ dw wd7b3 ; flag's byte
dw SaffronGymBattleText4 ; 0x521d TextBeforeBattle
dw SaffronGymAfterBattleText4 ; 0x5227 TextAfterBattle
dw SaffronGymEndBattleText4 ; 0x5222 TextEndBattle
@@ -130,7 +130,7 @@
SaffronGymTrainerHeader4: ; 5d0f3 (17:50f3)
db $6 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7b3 ; flag's byte
+ dw wd7b3 ; flag's byte
dw SaffronGymBattleText5 ; 0x522c TextBeforeBattle
dw SaffronGymAfterBattleText5 ; 0x5236 TextAfterBattle
dw SaffronGymEndBattleText5 ; 0x5231 TextEndBattle
@@ -139,7 +139,7 @@
SaffronGymTrainerHeader5: ; 5d0ff (17:50ff)
db $7 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7b3 ; flag's byte
+ dw wd7b3 ; flag's byte
dw SaffronGymBattleText6 ; 0x523b TextBeforeBattle
dw SaffronGymAfterBattleText6 ; 0x5245 TextAfterBattle
dw SaffronGymEndBattleText6 ; 0x5240 TextEndBattle
@@ -148,7 +148,7 @@
SaffronGymTrainerHeader6: ; 5d10b (17:510b)
db $8 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7b3 ; flag's byte
+ dw wd7b3 ; flag's byte
dw SaffronGymBattleText7 ; 0x524a TextBeforeBattle
dw SaffronGymAfterBattleText7 ; 0x5254 TextAfterBattle
dw SaffronGymEndBattleText7 ; 0x524f TextEndBattle
@@ -158,7 +158,7 @@
SaffronGymText1: ; 5d118 (17:5118)
db $08 ; asm
- ld a, [$d7b3]
+ ld a, [wd7b3]
bit 1, a
jr z, .asm_e3544 ; 0x5d11e
bit 0, a
@@ -173,7 +173,7 @@
.asm_e3544 ; 0x5d134
ld hl, SaffronGymText_5d162
call PrintText
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, SaffronGymText_5d167
@@ -180,11 +180,11 @@
ld de, SaffronGymText_5d167
call PreBattleSaveRegisters
ldh a, [$8c]
- ld [$cf13], a
+ ld [wcf13], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $6
- ld [$d05c], a
+ ld [W_GYMLEADERNO], a
ld a, $3
ld [W_SAFFRONGYMCURSCRIPT], a
.asm_34c2c ; 0x5d15f
@@ -262,7 +262,7 @@
SaffronGymText9: ; 5d1cd (17:51cd)
db $08 ; asm
- ld a, [$d7b3]
+ ld a, [wd7b3]
bit 1, a
jr nz, .asm_13f3c ; 0x5d1d3
ld hl, SaffronGymText_5d1e6
--- a/scripts/saffronhouse2.asm
+++ b/scripts/saffronhouse2.asm
@@ -6,7 +6,7 @@
SaffronHouse2Text1: ; 1de41 (7:5e41)
db $08 ; asm
- ld a, [$d7bd]
+ ld a, [wd7bd]
bit 0, a
jr nz, .asm_9e72b ; 0x1de47
ld hl, TM29PreReceiveText
@@ -16,7 +16,7 @@
jr nc, .BagFull
ld hl, ReceivedTM29Text
call PrintText
- ld hl, $d7bd
+ ld hl, wd7bd
set 0, [hl]
jr .asm_fe4e1 ; 0x1de62
.BagFull
--- a/scripts/seafoamislands1.asm
+++ b/scripts/seafoamislands1.asm
@@ -1,6 +1,6 @@
SeafoamIslands1Script: ; 447e9 (11:47e9)
call EnableAutoTextBoxDrawing
- ld hl, $d7e7
+ ld hl, wd7e7
set 0, [hl]
ld hl, wFlags_0xcd60
bit 7, [hl]
@@ -9,34 +9,34 @@
ld hl, Seafoam1HolesCoords
call CheckBoulderCoords
ret nc
- ld hl, $d7e8
- ld a, [$cd3d]
+ ld hl, wd7e8
+ ld a, [wWhichTrade]
cp $1
jr nz, .asm_44819 ; 0x44809 $e
set 6, [hl]
ld a, $d7
- ld [$d079], a
+ ld [wd079], a
ld a, $d9
- ld [$d07a], a
+ ld [wd07a], a
jr .asm_44825 ; 0x44817 $c
.asm_44819
set 7, [hl]
ld a, $d8
- ld [$d079], a
+ ld [wd079], a
ld a, $da
- ld [$d07a], a
+ ld [wd07a], a
.asm_44825
- ld a, [$d079]
- ld [$cc4d], a
+ ld a, [wd079]
+ ld [wcc4d], a
ld a, $11
call Predef
- ld a, [$d07a]
- ld [$cc4d], a
+ ld a, [wd07a]
+ ld [wcc4d], a
ld a, $15
jp Predef
.asm_4483b
ld a, $9f
- ld [$d71d], a
+ ld [wd71d], a
ld hl, Seafoam1HolesCoords
jp Func_46981
--- a/scripts/seafoamislands2.asm
+++ b/scripts/seafoamislands2.asm
@@ -7,34 +7,34 @@
ld hl, Seafoam2HolesCoords
call CheckBoulderCoords
ret nc
- ld hl, $d87f
- ld a, [$cd3d]
+ ld hl, wd87f
+ ld a, [wWhichTrade]
cp $1
jr nz, .asm_46340 ; 0x46330 $e
set 0, [hl]
ld a, $d9
- ld [$d079], a
+ ld [wd079], a
ld a, $db
- ld [$d07a], a
+ ld [wd07a], a
jr .asm_4634c ; 0x4633e $c
.asm_46340
set 1, [hl]
ld a, $da
- ld [$d079], a
+ ld [wd079], a
ld a, $dc
- ld [$d07a], a
+ ld [wd07a], a
.asm_4634c
- ld a, [$d079]
- ld [$cc4d], a
+ ld a, [wd079]
+ ld [wcc4d], a
ld a, $11
call Predef
- ld a, [$d07a]
- ld [$cc4d], a
+ ld a, [wd07a]
+ ld [wcc4d], a
ld a, $15
jp Predef
.asm_46362
ld a, $a0
- ld [$d71d], a
+ ld [wd71d], a
ld hl, Seafoam2HolesCoords
jp Func_46981
--- a/scripts/seafoamislands3.asm
+++ b/scripts/seafoamislands3.asm
@@ -7,34 +7,34 @@
ld hl, Seafoam3HolesCoords
call CheckBoulderCoords
ret nc
- ld hl, $d880
- ld a, [$cd3d]
+ ld hl, wd880
+ ld a, [wWhichTrade]
cp $1
jr nz, .asm_4647c ; 0x4646c $e
set 0, [hl]
ld a, $db
- ld [$d079], a
+ ld [wd079], a
ld a, $df
- ld [$d07a], a
+ ld [wd07a], a
jr .asm_46488 ; 0x4647a $c
.asm_4647c
set 1, [hl]
ld a, $dc
- ld [$d079], a
+ ld [wd079], a
ld a, $e0
- ld [$d07a], a
+ ld [wd07a], a
.asm_46488
- ld a, [$d079]
- ld [$cc4d], a
+ ld a, [wd079]
+ ld [wcc4d], a
ld a, $11
call Predef
- ld a, [$d07a]
- ld [$cc4d], a
+ ld a, [wd07a]
+ ld [wcc4d], a
ld a, $15
jp Predef
.asm_4649e
ld a, $a1
- ld [$d71d], a
+ ld [wd71d], a
ld hl, Seafoam3HolesCoords
jp Func_46981
--- a/scripts/seafoamislands4.asm
+++ b/scripts/seafoamislands4.asm
@@ -7,38 +7,38 @@
ld hl, Seafoam4HolesCoords
call CheckBoulderCoords
ret nc
- ld hl, $d881
- ld a, [$cd3d]
+ ld hl, wd881
+ ld a, [wWhichTrade]
cp $1
jr nz, .asm_465b8 ; 0x465a8 $e
set 0, [hl]
ld a, $dd
- ld [$d079], a
+ ld [wd079], a
ld a, $e1
- ld [$d07a], a
+ ld [wd07a], a
jr .asm_465c4 ; 0x465b6 $c
.asm_465b8
set 1, [hl]
ld a, $de
- ld [$d079], a
+ ld [wd079], a
ld a, $e2
- ld [$d07a], a
+ ld [wd07a], a
.asm_465c4
- ld a, [$d079]
- ld [$cc4d], a
+ ld a, [wd079]
+ ld [wcc4d], a
ld a, $11
call Predef
- ld a, [$d07a]
- ld [$cc4d], a
+ ld a, [wd07a]
+ ld [wcc4d], a
ld a, $15
call Predef
jr .asm_465ed ; 0x465da $11
.asm_465dc
ld a, $a2
- ld [$d71d], a
+ ld [wd71d], a
ld hl, Seafoam4HolesCoords
call Func_46981
- ld a, [$d732]
+ ld a, [wd732]
bit 4, a
ret nz
.asm_465ed
@@ -58,7 +58,7 @@
dw SeafoamIslands4Script3
SeafoamIslands4Script0: ; 46603 (11:6603)
- ld a, [$d880]
+ ld a, [wd880]
and $3
cp $3
ret z
@@ -68,11 +68,11 @@
ld a, [W_XCOORD]
cp $f
ret nz
- ld hl, $ccd3
+ ld hl, wccd3
ld de, RLEMovement46632
call DecodeRLEList
dec a
- ld [$cd38], a
+ ld [wcd38], a
call Func_3486
ld hl, W_FLAGS_D733
set 2, [hl]
@@ -87,7 +87,7 @@
db $ff
SeafoamIslands4Script1: ; 46639 (11:6639)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
ld a, $0
@@ -95,7 +95,7 @@
ret
SeafoamIslands4Script2: ; 46644 (11:6644)
- ld a, [$d880]
+ ld a, [wd880]
and $3
cp $3
ret z
@@ -110,13 +110,13 @@
.asm_4665e
ld de, RLEData_46688
.asm_46661
- ld hl, $ccd3
+ ld hl, wccd3
call DecodeRLEList
dec a
- ld [$cd38], a
+ ld [wcd38], a
xor a
- ld [$c206], a
- ld hl, $d730
+ ld [wSpriteStateData2 + $06], a
+ ld hl, wd730
set 7, [hl]
ld hl, W_FLAGS_D733
set 2, [hl]
@@ -132,7 +132,7 @@
db $80,$06,$10,$02,$80,$04,$FF
SeafoamIslands4Script3: ; 4668f (11:668f)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
ld a, $0
--- a/scripts/seafoamislands5.asm
+++ b/scripts/seafoamislands5.asm
@@ -27,7 +27,7 @@
ret
SeafoamIslands5Script0: ; 467c7 (11:67c7)
- ld a, [$d880]
+ ld a, [wd880]
and $3
cp $3
ret z
@@ -34,19 +34,19 @@
ld hl, CoordsData_467fe
call ArePlayerCoordsInArray
ret nc
- ld a, [$cd3d]
+ ld a, [wWhichTrade]
cp $3
jr nc, .asm_467e6
ld a, $40
- ld [$ccd4], a
+ ld [wccd4], a
ld a, $2
jr .asm_467e8
.asm_467e6
ld a, $1
.asm_467e8
- ld [$cd38], a
+ ld [wcd38], a
ld a, $40
- ld [$ccd3], a
+ ld [wccd3], a
call Func_3486
ld hl, W_FLAGS_D733
res 2, [hl]
@@ -62,7 +62,7 @@
db $FF
SeafoamIslands5Script1: ; 46807 (11:6807)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
xor a
@@ -72,7 +72,7 @@
ret
SeafoamIslands5Script2: ; 46816 (11:6816)
- ld a, [$d881]
+ ld a, [wd881]
and $3
cp $3
ld a, $0
@@ -81,7 +81,7 @@
call ArePlayerCoordsInArray
ld a, $0
jr nc, .asm_46849
- ld a, [$cd3d]
+ ld a, [wWhichTrade]
cp $1
jr nz, .asm_46837
ld de, RLEMovementData_46859
@@ -89,10 +89,10 @@
.asm_46837
ld de, RLEMovementData_46852
.asm_4683a
- ld hl, $ccd3
+ ld hl, wccd3
call DecodeRLEList
dec a
- ld [$cd38], a
+ ld [wcd38], a
call Func_3486
ld a, $3
.asm_46849
@@ -117,7 +117,7 @@
db $FF
SeafoamIslands5Script3: ; 46860 (11:6860)
- ld a, [$cd38]
+ ld a, [wcd38]
ld b, a
cp $1
call z, SeaFoamIslands5Script_46872
@@ -130,8 +130,8 @@
SeaFoamIslands5Script_46872: ; 46872 (11:6872)
xor a
- ld [$d700], a
- ld [$d11a], a
+ ld [wd700], a
+ ld [wd11a], a
jp ForceBikeOrSurf
SeafoamIslands5TextPointers: ; 4687c (11:687c)
@@ -145,7 +145,7 @@
SeafoamIslands5TrainerHeader0: ; 46886 (11:6886)
db $2 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d882 ; flag's byte
+ dw wd882 ; flag's byte
dw SeafoamIslands5BattleText2 ; 0x68a2 TextBeforeBattle
dw SeafoamIslands5BattleText2 ; 0x68a2 TextAfterBattle
dw SeafoamIslands5BattleText2 ; 0x68a2 TextEndBattle
--- a/scripts/silphco1.asm
+++ b/scripts/silphco1.asm
@@ -1,14 +1,14 @@
SilphCo1Script: ; 5d44e (17:544e)
call EnableAutoTextBoxDrawing
- ld a, [$d838]
+ ld a, [wd838]
bit 7, a
ret z
- ld hl, $d7b9
+ ld hl, wd7b9
bit 7, [hl]
set 7, [hl]
ret nz
ld a, $4c
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
jp Predef
--- a/scripts/silphco10.asm
+++ b/scripts/silphco10.asm
@@ -9,7 +9,7 @@
ret
SilphCo10Script_5a14f: ; 5a14f (16:614f)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
@@ -16,11 +16,11 @@
ld hl, DataTable_5a173 ; $6173
call SilphCo2Script_59d43
call SilphCo10Text_5a176
- ld a, [$d836]
+ ld a, [wd836]
bit 0, a
ret nz
ld a, $54
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $405
ld a, $17
jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -32,7 +32,7 @@
ld a, [$ffe0]
and a
ret z
- ld hl, $d836
+ ld hl, wd836
set 0, [hl]
ret
@@ -53,7 +53,7 @@
SilphCo10TrainerHeader0: ; 5a192 (16:6192)
db $1 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d835 ; flag's byte
+ dw wd835 ; flag's byte
dw SilphCo10BattleText1 ; 0x61dd TextBeforeBattle
dw SilphCo10AfterBattleText1 ; 0x61e7 TextAfterBattle
dw SilphCo10EndBattleText1 ; 0x61e2 TextEndBattle
@@ -62,7 +62,7 @@
SilphCo10TrainerHeader1: ; 5a19e (16:619e)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d835 ; flag's byte
+ dw wd835 ; flag's byte
dw SilphCo10BattleText2 ; 0x61ec TextBeforeBattle
dw SilphCo10AfterBattleText2 ; 0x61f6 TextAfterBattle
dw SilphCo10EndBattleText2 ; 0x61f1 TextEndBattle
@@ -84,7 +84,7 @@
SilphCo10Text3: ; 5a1bf (16:61bf)
db $08 ; asm
- ld a, [$d838]
+ ld a, [wd838]
bit 7, a
ld hl, SilphCo10Text_5a1d8
jr nz, .asm_cf85f
--- a/scripts/silphco11.asm
+++ b/scripts/silphco11.asm
@@ -9,7 +9,7 @@
ret
SilphCo11Script_62110: ; 62110 (18:6110)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
@@ -16,11 +16,11 @@
ld hl, DataTable_62134 ; $6134
call SilphCo11Script_62137
call SilphCo11Script_62163
- ld a, [$d838]
+ ld a, [wd838]
bit 0, a
ret nz
ld a, $20
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $603
ld a, $17
jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -30,7 +30,7 @@
SilphCo11Script_62137: ; 62137 (18:6137)
push hl
- ld hl, $d73f
+ ld hl, wd73f
ld a, [hli]
ld b, a
ld a, [hl]
@@ -54,7 +54,7 @@
ld a, [hli]
cp c
jr nz, .asm_62143
- ld hl, $d73f
+ ld hl, wd73f
xor a
ld [hli], a
ld [hl], a
@@ -68,7 +68,7 @@
ld a, [$ffe0]
and a
ret z
- ld hl, $d838
+ ld hl, wd838
set 0, [hl]
ret
@@ -79,7 +79,7 @@
cp $ff
jr z, .asm_62181
push hl
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
pop hl
@@ -91,7 +91,7 @@
cp $ff
ret z
push hl
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8))
pop hl
@@ -126,14 +126,14 @@
dw SilphCo11Script5
SilphCo11Script0: ; 621db (18:61db)
- ld a, [$d838]
+ ld a, [wd838]
bit 7, a
ret nz
ld hl, CoordsData_62211 ; $6211
call ArePlayerCoordsInArray
jp nc, CheckFightingMapTrainers
- ld a, [wWhichTrade] ; $cd3d
- ld [$cf0d], a
+ ld a, [wWhichTrade] ; wWhichTrade
+ ld [wcf0d], a
xor a
ld [hJoyHeld], a
ld a, $f0
@@ -158,7 +158,7 @@
db $00,$00,$00,$FF
SilphCo11Script_6221a: ; 6221a (18:621a)
- ld [$d528], a
+ ld [wd528], a
ld a, $3
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
ld a, b
@@ -166,10 +166,10 @@
jp Func_34a6
SilphCo11Script5: ; 62227 (18:6227)
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, SilphCo11Script_621c4
- ld a, [$cf0d]
+ ld a, [wcf0d]
cp $1
jr z, .asm_6223c
ld a, $2
@@ -190,7 +190,7 @@
call UpdateSprites
call Delay3
call GBFadeOut1
- ld hl, $d838
+ ld hl, wd838
set 7, [hl]
xor a
ld [wJoyIgnore], a
@@ -197,13 +197,13 @@
jp SilphCo11Script_621c8
SilphCo11Script3: ; 6226a (18:626a)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
ld a, $3
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call SetSpriteMovementBytesToFF
- ld a, [$cf0d]
+ ld a, [wcf0d]
cp $1
jr z, .asm_62284
ld a, $2
@@ -219,7 +219,7 @@
jp SilphCo11Script_621c8
SilphCo11Script4: ; 62293 (18:6293)
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, SilphCo10Text_62330 ; $6330
@@ -226,7 +226,7 @@
ld de, SilphCo10Text_62330 ; $6330
call PreBattleSaveRegisters
ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c
- ld [$cf13], a
+ ld [wcf13], a
call EngageMapTrainer
call InitBattleEnemyParameters
xor a
@@ -246,7 +246,7 @@
SilphCo11TrainerHeader0: ; 622c3 (18:62c3)
db $4 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d837 ; flag's byte
+ dw wd837 ; flag's byte
dw SilphCo11BattleText1 ; 0x6344 TextBeforeBattle
dw SilphCo11AfterBattleText1 ; 0x634e TextAfterBattle
dw SilphCo11EndBattleText1 ; 0x6349 TextEndBattle
@@ -255,7 +255,7 @@
SilphCo11TrainerHeader1: ; 622cf (18:62cf)
db $5 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d837 ; flag's byte
+ dw wd837 ; flag's byte
dw SilphCo11BattleText2 ; 0x635d TextBeforeBattle
dw SilphCo11AfterBattleText2 ; 0x6367 TextAfterBattle
dw SilphCo11EndBattleText2 ; 0x6362 TextEndBattle
@@ -265,7 +265,7 @@
SilphCo11Text1: ; 622dc (18:62dc)
db $08 ; asm
- ld a, [$d838]
+ ld a, [wd838]
bit 5, a
jp nz, .asm_62308
ld hl, SilphCoPresidentText
@@ -275,7 +275,7 @@
jr nc, .BagFull
ld hl, ReceivedSilphCoMasterBallText
call PrintText
- ld hl, $d838
+ ld hl, wd838
set 5, [hl]
jr .asm_fd405 ; 0x622fe
.BagFull
--- a/scripts/silphco2.asm
+++ b/scripts/silphco2.asm
@@ -9,7 +9,7 @@
ret
SilphCo2Script_59d07: ; 59d07 (16:5d07)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
@@ -16,12 +16,12 @@
ld hl, DataTable_59d3e
call SilphCo2Script_59d43
call SilphCo2Script_59d6f
- ld a, [$d826]
+ ld a, [wd826]
bit 5, a
jr nz, .asm_59d2e
push af
ld a, $54
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $0202
ld a, $17
call Predef
@@ -30,7 +30,7 @@
bit 6, a
ret nz
ld a, $54
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $0502
ld a, $17
jp Predef
@@ -40,7 +40,7 @@
SilphCo2Script_59d43: ; 59d43 (16:5d43)
push hl
- ld hl, $d73f
+ ld hl, wd73f
ld a, [hli]
ld b, a
ld a, [hl]
@@ -64,7 +64,7 @@
ld a, [hli]
cp c
jr nz, .asm_59d4f
- ld hl, $d73f
+ ld hl, wd73f
xor a
ld [hli], a
ld [hl], a
@@ -75,7 +75,7 @@
ret
SilphCo2Script_59d6f: ; 59d6f (16:5d6f)
- ld hl, $d826
+ ld hl, wd826
ld a, [$ffe0]
and a
ret z
@@ -103,7 +103,7 @@
SilphCo2TrainerHeader0: ; 59d90 (16:5d90)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d825 ; flag's byte
+ dw wd825 ; flag's byte
dw SilphCo2BattleText1 ; 0x5e2a TextBeforeBattle
dw SilphCo2AfterBattleText1 ; 0x5e34 TextAfterBattle
dw SilphCo2EndBattleText1 ; 0x5e2f TextEndBattle
@@ -112,7 +112,7 @@
SilphCo2TrainerHeader1: ; 59d9c (16:5d9c)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d825 ; flag's byte
+ dw wd825 ; flag's byte
dw SilphCo2BattleText2 ; 0x5e39 TextBeforeBattle
dw SilphCo2AfterBattleText2 ; 0x5e43 TextAfterBattle
dw SilphCo2EndBattleText2 ; 0x5e3e TextEndBattle
@@ -121,7 +121,7 @@
SilphCo2TrainerHeader2: ; 59da8 (16:5da8)
db $4 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d825 ; flag's byte
+ dw wd825 ; flag's byte
dw SilphCo2BattleText3 ; 0x5e48 TextBeforeBattle
dw SilphCo2AfterBattleText3 ; 0x5e52 TextAfterBattle
dw SilphCo2EndBattleText3 ; 0x5e4d TextEndBattle
@@ -130,7 +130,7 @@
SilphCo2TrainerHeader3: ; 59db4 (16:5db4)
db $5 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d825 ; flag's byte
+ dw wd825 ; flag's byte
dw SilphCo2BattleText4 ; 0x5e57 TextBeforeBattle
dw SilphCo2AfterBattleText4 ; 0x5e61 TextAfterBattle
dw SilphCo2EndBattleText4 ; 0x5e5c TextEndBattle
@@ -140,7 +140,7 @@
SilphCo2Text1: ; 59dc1 (16:5dc1)
db $08 ; asm
- ld a, [$d826]
+ ld a, [wd826]
bit 7, a
jr nz, asm_b8a0d ; 0x59dc7
ld hl, SilphCo2Text_59ded
@@ -149,7 +149,7 @@
call GiveItem
ld hl, TM36NoRoomText
jr nc, asm_2c1e0 ; 0x59dd8
- ld hl, $d826
+ ld hl, wd826
set 7, [hl]
ld hl, ReceivedTM36Text
jr asm_2c1e0 ; 0x59de2
--- a/scripts/silphco3.asm
+++ b/scripts/silphco3.asm
@@ -9,7 +9,7 @@
ret
SilphCo3Script_59f71: ; 59f71 (16:5f71)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
@@ -16,12 +16,12 @@
ld hl, DataTable_59fa8 ; $5fa8
call SilphCo2Script_59d43
call SilphCo3Script_59fad
- ld a, [$d828]
+ ld a, [wd828]
bit 0, a
jr nz, .asm_59f98
push af
ld a, $5f
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $404
ld a, $17
call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -30,7 +30,7 @@
bit 1, a
ret nz
ld a, $5f
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $408
ld a, $17
jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -39,7 +39,7 @@
db $04,$04,$04,$08,$FF
SilphCo3Script_59fad: ; 59fad (16:5fad)
- ld hl, $d828
+ ld hl, wd828
ld a, [$ffe0]
and a
ret z
@@ -66,7 +66,7 @@
SilphCo3TrainerHeader0: ; 59fcc (16:5fcc)
db $2 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d827 ; flag's byte
+ dw wd827 ; flag's byte
dw SilphCo3BattleText1 ; 0x600d TextBeforeBattle
dw SilphCo3AfterBattleText1 ; 0x6017 TextAfterBattle
dw SilphCo3EndBattleText1 ; 0x6012 TextEndBattle
@@ -75,7 +75,7 @@
SilphCo3TrainerHeader1: ; 59fd8 (16:5fd8)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d827 ; flag's byte
+ dw wd827 ; flag's byte
dw SilphCo3BattleText2 ; 0x6026 TextBeforeBattle
dw SilphCo3AfterBattleText2 ; 0x6030 TextAfterBattle
dw SilphCo3EndBattleText2 ; 0x602b TextEndBattle
@@ -85,7 +85,7 @@
SilphCo3Text1: ; 59fe5 (16:5fe5)
db $08 ; asm
- ld a, [$d838]
+ ld a, [wd838]
bit 7, a
ld hl, SilphCo3Text_59ffe
jr nz, asm_8c56f ; 0x59fee
--- a/scripts/silphco4.asm
+++ b/scripts/silphco4.asm
@@ -9,7 +9,7 @@
ret
SilphCo4Script_19d21: ; 19d21 (6:5d21)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
@@ -16,12 +16,12 @@
ld hl, SilphCo4Data19d58
call SilphCo4Script_19d5d
call SilphCo4Script_19d89
- ld a, [$d82a]
+ ld a, [wd82a]
bit 0, a
jr nz, .asm_19d48
push af
ld a, $54
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $0602
ld a, $17
call Predef
@@ -30,7 +30,7 @@
bit 1, a
ret nz
ld a, $54
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $0406
ld a, $17
jp Predef
@@ -40,7 +40,7 @@
SilphCo4Script_19d5d: ; 19d5d (6:5d5d)
push hl
- ld hl, $d73f
+ ld hl, wd73f
ld a, [hli]
ld b, a
ld a, [hl]
@@ -64,7 +64,7 @@
ld a, [hli]
cp c
jr nz, .asm_19d69 ; 0x19d7c $eb
- ld hl, $d73f
+ ld hl, wd73f
xor a
ld [hli], a
ld [hl], a
@@ -75,7 +75,7 @@
ret
SilphCo4Script_19d89: ; 19d89 (6:5d89)
- ld hl, $d82a
+ ld hl, wd82a
ld a, [$ffe0]
and a
ret z
@@ -105,7 +105,7 @@
SilphCo4TrainerHeader0: ; 19dae (6:5dae)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d829 ; flag's byte
+ dw wd829 ; flag's byte
dw SilphCo4BattleText2 ; 0x5df4 TextBeforeBattle
dw SilphCo4AfterBattleText2 ; 0x5dfe TextAfterBattle
dw SilphCo4EndBattleText2 ; 0x5df9 TextEndBattle
@@ -114,7 +114,7 @@
SilphCo4TrainerHeader2: ; 19dba (6:5dba)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d829 ; flag's byte
+ dw wd829 ; flag's byte
dw SilphCo4BattleText3 ; 0x5e0d TextBeforeBattle
dw SilphCo4AfterBattleText3 ; 0x5e17 TextAfterBattle
dw SilphCo4EndBattleText3 ; 0x5e12 TextEndBattle
@@ -123,7 +123,7 @@
SilphCo4TrainerHeader3: ; 19dc6 (6:5dc6)
db $4 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d829 ; flag's byte
+ dw wd829 ; flag's byte
dw SilphCo4BattleText4 ; 0x5e26 TextBeforeBattle
dw SilphCo4AfterBattleText4 ; 0x5e30 TextAfterBattle
dw SilphCo4EndBattleText4 ; 0x5e2b TextEndBattle
--- a/scripts/silphco5.asm
+++ b/scripts/silphco5.asm
@@ -9,7 +9,7 @@
ret
SilphCo5Script_19f4d: ; 19f4d (6:5f4d)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
@@ -16,12 +16,12 @@
ld hl, SilphCo5Coords
call SilphCo4Script_19d5d
call SilphCo5Script_19f9e
- ld a, [$d82c]
+ ld a, [wd82c]
bit 0, a
jr nz, .asm_19f74 ; 0x19f63 $f
push af
ld a, $5f
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $0203
ld a, $17
call Predef
@@ -31,7 +31,7 @@
jr nz, .asm_19f87 ; 0x19f76 $f
push af
ld a, $5f
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $0603
ld a, $17
call Predef
@@ -40,7 +40,7 @@
bit 2, a
ret nz
ld a, $5f
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $0507
ld a, $17
jp Predef
@@ -49,7 +49,7 @@
db $02, $03, $06, $03, $05, $07, $ff
SilphCo5Script_19f9e: ; 19f9e (6:5f9e)
- ld hl, $d82c
+ ld hl, wd82c
ld a, [$ffe0]
and a
ret z
@@ -88,7 +88,7 @@
Silphco5TrainerHeader0: ; 19fd2 (6:5fd2)
db $2 ; flag's bit
db ($1 << 4) ; trainer's view range
- dw $d82b ; flag's byte
+ dw wd82b ; flag's byte
dw SilphCo5BattleText2 ; 0x6024 TextBeforeBattle
dw SilphCo5AfterBattleText2 ; 0x602e TextAfterBattle
dw SilphCo5EndBattleText2 ; 0x6029 TextEndBattle
@@ -97,7 +97,7 @@
Silphco5TrainerHeader2: ; 19fde (6:5fde)
db $3 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d82b ; flag's byte
+ dw wd82b ; flag's byte
dw SilphCo5BattleText3 ; 0x603d TextBeforeBattle
dw SilphCo5AfterBattleText3 ; 0x6047 TextAfterBattle
dw SilphCo5EndBattleText3 ; 0x6042 TextEndBattle
@@ -106,7 +106,7 @@
Silphco5TrainerHeader3: ; 19fea (6:5fea)
db $4 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d82b ; flag's byte
+ dw wd82b ; flag's byte
dw SilphCo5BattleText4 ; 0x6056 TextBeforeBattle
dw SilphCo5AfterBattleText4 ; 0x6060 TextAfterBattle
dw SilphCo5EndBattleText4 ; 0x605b TextEndBattle
@@ -115,7 +115,7 @@
Silphco5TrainerHeader4: ; 19ff6 (6:5ff6)
db $5 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d82b ; flag's byte
+ dw wd82b ; flag's byte
dw SilphCo5BattleText5 ; 0x606f TextBeforeBattle
dw SilphCo5AfterBattleText5 ; 0x6079 TextAfterBattle
dw SilphCo5EndBattleText5 ; 0x6074 TextEndBattle
--- a/scripts/silphco6.asm
+++ b/scripts/silphco6.asm
@@ -9,7 +9,7 @@
ret
SilphCo6Script_1a1bf: ; 1a1bf (6:61bf)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
@@ -16,11 +16,11 @@
ld hl, SilphCo6Coords1
call SilphCo4Script_19d5d
call SilphCo6Script_1a1e6
- ld a, [$d82e]
+ ld a, [wd82e]
bit 7, a
ret nz
ld a, $5f
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $0602
ld a, $17
jp Predef
@@ -33,7 +33,7 @@
ld a, [$ffe0]
and a
ret z
- ld hl, $d82e
+ ld hl, wd82e
set 7, [hl]
ret
@@ -58,7 +58,7 @@
SilphCo6TrainerHeader0: ; 1a20a (6:620a)
db $6 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d82d ; flag's byte
+ dw wd82d ; flag's byte
dw SilphCo6BattleText2 ; 0x62ba TextBeforeBattle
dw SilphCo6AfterBattleText2 ; 0x62c4 TextAfterBattle
dw SilphCo6EndBattleText2 ; 0x62bf TextEndBattle
@@ -67,7 +67,7 @@
SilphCo6TrainerHeader2: ; 1a216 (6:6216)
db $7 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d82d ; flag's byte
+ dw wd82d ; flag's byte
dw SilphCo6BattleText3 ; 0x62d3 TextBeforeBattle
dw SilphCo6AfterBattleText3 ; 0x62dd TextAfterBattle
dw SilphCo6EndBattleText3 ; 0x62d8 TextEndBattle
@@ -76,7 +76,7 @@
SilphCo6TrainerHeader3: ; 1a222 (6:6222)
db $8 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d82d ; flag's byte
+ dw wd82d ; flag's byte
dw SilphCo6BattleText4 ; 0x62ec TextBeforeBattle
dw SilphCo6AfterBattleText4 ; 0x62f6 TextAfterBattle
dw SilphCo6EndBattleText4 ; 0x62f1 TextEndBattle
@@ -85,7 +85,7 @@
db $ff
SilphCo6Script_1a22f: ; 1a22f (6:622f)
- ld a, [$d838]
+ ld a, [wd838]
bit 7, a
jr nz, .asm_1a238 ; 0x1a234 $2
jr .asm_1a23a ; 0x1a236 $2
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@@ -9,7 +9,7 @@
ret
SilphCo7Script_51b77: ; 51b77 (14:5b77)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
@@ -16,12 +16,12 @@
ld hl, DataTable_51bc1 ; $5bc1
call SilphCo7Text_51bc8
call SilphCo7Text_51bf4
- ld a, [$d830]
+ ld a, [wd830]
bit 4, a
jr nz, .asm_51b9e
push af
ld a, $54
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $305
ld a, $17
call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -31,7 +31,7 @@
jr nz, .asm_51bb1
push af
ld a, $54
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $20a
ld a, $17
call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -40,7 +40,7 @@
bit 6, a
ret nz
ld a, $54
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $60a
ld a, $17
jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -50,7 +50,7 @@
SilphCo7Text_51bc8: ; 51bc8 (14:5bc8)
push hl
- ld hl, $d73f
+ ld hl, wd73f
ld a, [hli]
ld b, a
ld a, [hl]
@@ -74,7 +74,7 @@
ld a, [hli]
cp c
jr nz, .asm_51bd4
- ld hl, $d73f
+ ld hl, wd73f
xor a
ld [hli], a
ld [hl], a
@@ -85,7 +85,7 @@
ret
SilphCo7Text_51bf4: ; 51bf4 (14:5bf4)
- ld hl, $d830
+ ld hl, wd830
ld a, [$ffe0]
and a
ret z
@@ -120,7 +120,7 @@
dw SilphCo7Script5
SilphCo7Script0: ; 51c23 (14:5c23)
- ld a, [$d82f]
+ ld a, [wd82f]
bit 0, a
jp nz, CheckFightingMapTrainers
ld hl, CoordsData_51c78
@@ -131,9 +131,9 @@
ld a, $f0
ld [wJoyIgnore], a
ld a, $4
- ld [$d528], a
+ ld [wd528], a
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
@@ -145,8 +145,8 @@
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call SetSpriteMovementBytesToFF
ld de, MovementData_51c7d
- ld a, [wWhichTrade] ; $cd3d
- ld [$cf0d], a
+ ld a, [wWhichTrade] ; wWhichTrade
+ ld [wcf0d], a
cp $1
jr z, .asm_51c6c
inc de
@@ -166,7 +166,7 @@
db $40,$40,$40,$40,$FF
SilphCo7Script3: ; 51c82 (14:5c82)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
xor a
@@ -175,7 +175,7 @@
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
call Delay3
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, SilphCo7Text14 ; $5ec8
@@ -182,8 +182,8 @@
ld de, SilphCo7Text_51ecd ; $5ecd
call PreBattleSaveRegisters
ld a, SONY2 + $c8
- ld [W_CUROPPONENT], a ; $d059
- ld a, [W_RIVALSTARTER] ; $d715
+ ld [W_CUROPPONENT], a ; wd059
+ ld a, [W_RIVALSTARTER] ; wd715
cp STARTER2
jr nz, .asm_51cb6
ld a, $7
@@ -196,20 +196,20 @@
.asm_51cbe
ld a, $9
.asm_51cc0
- ld [W_TRAINERNO], a ; $d05d
+ ld [W_TRAINERNO], a ; wd05d
ld a, $4
jp SilphCo7Text_51c10
SilphCo7Script4: ; 51cc8 (14:5cc8)
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, SilphCo7Text_51c0c
ld a, $f0
ld [wJoyIgnore], a
- ld hl, $d82f
+ ld hl, wd82f
set 0, [hl]
ld a, $4
- ld [$d528], a
+ ld [wd528], a
ld a, $9
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
ld a, $4
@@ -219,11 +219,11 @@
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
callba Music_RivalAlternateStart
ld de, MovementData_51d1d
- ld a, [$cf0d]
+ ld a, [wcf0d]
cp $1
jr nz, .asm_51d0e
ld de, MovementData_51d1a
@@ -241,11 +241,11 @@
db $80,$40,$40,$C0,$C0,$C0,$00,$FF
SilphCo7Script5: ; 51d25 (14:5d25)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
ld a, $a7
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
call Func_2307
@@ -274,7 +274,7 @@
SilphCo7TrainerHeader0: ; 51d5d (14:5d5d)
db $5 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d82f ; flag's byte
+ dw wd82f ; flag's byte
dw SilphCo7BattleText1 ; 0x5e5a TextBeforeBattle
dw SilphCo7AfterBattleText1 ; 0x5e64 TextAfterBattle
dw SilphCo7EndBattleText1 ; 0x5e5f TextEndBattle
@@ -283,7 +283,7 @@
SilphCo7TrainerHeader2: ; 51d69 (14:5d69)
db $6 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d82f ; flag's byte
+ dw wd82f ; flag's byte
dw SilphCo7BattleText2 ; 0x5e73 TextBeforeBattle
dw SilphCo7AfterBattleText2 ; 0x5e7d TextAfterBattle
dw SilphCo7EndBattleText2 ; 0x5e78 TextEndBattle
@@ -292,7 +292,7 @@
SilphCo7TrainerHeader3: ; 51d75 (14:5d75)
db $7 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d82f ; flag's byte
+ dw wd82f ; flag's byte
dw SilphCo7BattleText3 ; 0x5e8c TextBeforeBattle
dw SilphCo7AfterBattleText3 ; 0x5e96 TextAfterBattle
dw SilphCo7EndBattleText3 ; 0x5e91 TextEndBattle
@@ -301,7 +301,7 @@
SilphCo7TrainerHeader4: ; 51d81 (14:5d81)
db $8 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d82f ; flag's byte
+ dw wd82f ; flag's byte
dw SilphCo7BattleText4 ; 0x5ea5 TextBeforeBattle
dw SilphCo7AfterBattleText4 ; 0x5eaf TextAfterBattle
dw SilphCo7EndBattleText4 ; 0x5eaa TextEndBattle
@@ -312,10 +312,10 @@
SilphCo7Text1:
; lapras guy
db $08 ; asm
- ld a, [$d72e]
+ ld a, [wd72e]
bit 0, a ; got lapras?
jr z, .givelapras
- ld a, [$d838]
+ ld a, [wd838]
bit 7, a ; saved silph?
jr nz, .savedsilph
ld hl, .LaprasGuyText
@@ -327,13 +327,13 @@
ld bc, (LAPRAS << 8) | 15
call GivePokemon
jr nc, .done
- ld a, [$ccd3]
+ ld a, [wccd3]
and a
call z, WaitForTextScrollButtonPress
call EnableAutoTextBoxDrawing
ld hl, .HeresYourLaprasText
call PrintText
- ld hl, $d72e
+ ld hl, wd72e
set 0, [hl]
jr .done
.savedsilph
@@ -360,7 +360,7 @@
SilphCo7Text2:
db $8
- ld a, [$d838]
+ ld a, [wd838]
bit 7, a ; saved silph?
jr nz, .savedsilph
ld hl, .rockettext
@@ -382,7 +382,7 @@
SilphCo7Text3:
db $08 ; asm
- ld a, [$d838]
+ ld a, [wd838]
bit 7, a ; saved silph?
jr nz, .savedsilph
ld hl, .rockettext
@@ -404,7 +404,7 @@
SilphCo7Text4:
db $08 ; asm
- ld a, [$d838]
+ ld a, [wd838]
bit 7, a ; saved silph?
jr nz, .savedsilph
ld hl, .rockettext
--- a/scripts/silphco8.asm
+++ b/scripts/silphco8.asm
@@ -9,7 +9,7 @@
ret
SilphCo8Script_5651a: ; 5651a (15:651a)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
@@ -16,11 +16,11 @@
ld hl, DataTable_5653e ; $653e
call SilphCo8Script_56541
call SilphCo8Script_5656d
- ld a, [$d832]
+ ld a, [wd832]
bit 0, a
ret nz
ld a, $5f
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $403
ld a, $17
jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -30,7 +30,7 @@
SilphCo8Script_56541: ; 56541 (15:6541)
push hl
- ld hl, $d73f
+ ld hl, wd73f
ld a, [hli]
ld b, a
ld a, [hl]
@@ -54,7 +54,7 @@
ld a, [hli]
cp c
jr nz, .asm_5654d
- ld hl, $d73f
+ ld hl, wd73f
xor a
ld [hli], a
ld [hl], a
@@ -68,7 +68,7 @@
ld a, [$ffe0]
and a
ret z
- ld hl, $d832
+ ld hl, wd832
set 0, [hl]
ret
@@ -87,7 +87,7 @@
SilphCo8TrainerHeader0: ; 56585 (15:6585)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d831 ; flag's byte
+ dw wd831 ; flag's byte
dw SilphCo8BattleText1 ; 0x65e6 TextBeforeBattle
dw SilphCo8AfterBattleText1 ; 0x65f0 TextAfterBattle
dw SilphCo8EndBattleText1 ; 0x65eb TextEndBattle
@@ -96,7 +96,7 @@
SilphCo8TrainerHeader1: ; 56591 (15:6591)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d831 ; flag's byte
+ dw wd831 ; flag's byte
dw SilphCo8BattleText2 ; 0x65f5 TextBeforeBattle
dw SilphCo8AfterBattleText2 ; 0x65ff TextAfterBattle
dw SilphCo8EndBattleText2 ; 0x65fa TextEndBattle
@@ -105,7 +105,7 @@
SilphCo8TrainerHeader2: ; 5659d (15:659d)
db $4 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d831 ; flag's byte
+ dw wd831 ; flag's byte
dw SilphCo8BattleText3 ; 0x6604 TextBeforeBattle
dw SilphCo8AfterBattleText3 ; 0x660e TextAfterBattle
dw SilphCo8EndBattleText3 ; 0x6609 TextEndBattle
@@ -115,7 +115,7 @@
SilphCo8Text1: ; 565aa (15:65aa)
db $08 ; asm
- ld a, [$d838]
+ ld a, [wd838]
bit 7, a
ld hl, SilphCo8Text_565c3
jr nz, asm_a468f ; 0x565b3
--- a/scripts/silphco9.asm
+++ b/scripts/silphco9.asm
@@ -9,7 +9,7 @@
ret
SilphCo9Script_5d7d1: ; 5d7d1 (17:57d1)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
@@ -16,12 +16,12 @@
ld hl, DataTable_5d82e ; $582e
call SilphCo9Script_5d837
call SilphCo9Script_5d863
- ld a, [$d834]
+ ld a, [wd834]
bit 0, a
jr nz, .asm_5d7f8
push af
ld a, $5f
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $401
ld a, $17
call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -31,7 +31,7 @@
jr nz, .asm_5d80b
push af
ld a, $54
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $209
ld a, $17
call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -41,7 +41,7 @@
jr nz, .asm_5d81e
push af
ld a, $54
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $509
ld a, $17
call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -50,7 +50,7 @@
bit 3, a
ret nz
ld a, $5f
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $605
ld a, $17
jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -60,7 +60,7 @@
SilphCo9Script_5d837: ; 5d837 (17:5837)
push hl
- ld hl, $d73f
+ ld hl, wd73f
ld a, [hli]
ld b, a
ld a, [hl]
@@ -84,7 +84,7 @@
ld a, [hli]
cp c
jr nz, .asm_5d843
- ld hl, $d73f
+ ld hl, wd73f
xor a
ld [hli], a
ld [hl], a
@@ -95,7 +95,7 @@
ret
SilphCo9Script_5d863: ; 5d863 (17:5863)
- ld hl, $d834
+ ld hl, wd834
ld a, [$ffe0]
and a
ret z
@@ -134,7 +134,7 @@
SilphCo9TrainerHeader0: ; 5d893 (17:5893)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d833 ; flag's byte
+ dw wd833 ; flag's byte
dw SilphCo9BattleText1 ; 0x5912 TextBeforeBattle
dw SilphCo9AfterBattleText1 ; 0x591c TextAfterBattle
dw SilphCo9EndBattleText1 ; 0x5917 TextEndBattle
@@ -143,7 +143,7 @@
SilphCo9TrainerHeader1: ; 5d89f (17:589f)
db $3 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d833 ; flag's byte
+ dw wd833 ; flag's byte
dw SilphCo9BattleText2 ; 0x5921 TextBeforeBattle
dw SilphCo9AfterBattleText2 ; 0x592b TextAfterBattle
dw SilphCo9EndBattleText2 ; 0x5926 TextEndBattle
@@ -152,7 +152,7 @@
SilphCo9TrainerHeader2: ; 5d8ab (17:58ab)
db $4 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d833 ; flag's byte
+ dw wd833 ; flag's byte
dw SilphCo9BattleText3 ; 0x5930 TextBeforeBattle
dw SilphCo9AfterBattleText3 ; 0x593a TextAfterBattle
dw SilphCo9EndBattleText3 ; 0x5935 TextEndBattle
@@ -162,7 +162,7 @@
SilphCo9Text1: ; 5d8b8 (17:58b8)
db $08 ; asm
- ld a, [$d838]
+ ld a, [wd838]
bit 7, a
jr nz, .asm_a14c3 ; 0x5d8be
ld hl, SilphCo9Text_5d8e5
--- a/scripts/silphcoelevator.asm
+++ b/scripts/silphcoelevator.asm
@@ -1,5 +1,5 @@
SilphCoElevatorScript: ; 457c0 (11:57c0)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
push hl
@@ -9,16 +9,16 @@
res 7, [hl]
call nz, SilphCoElevatorScript_45827
xor a
- ld [$cf0c], a
+ ld [wcf0c], a
inc a
- ld [$cc3c], a
+ ld [wcc3c], a
ret
SilphCoElevatorScript_457dc: ; 457dc (11:57dc)
- ld hl, $d3af
- ld a, [$d73b]
+ ld hl, wd3af
+ ld a, [wd73b]
ld b, a
- ld a, [$d73c]
+ ld a, [wd73c]
ld c, a
call SilphCoElevatorScript_457ea
@@ -35,7 +35,7 @@
ld hl, SilphCoElavatorFloors ; $5804
call LoadItemList
ld hl, SilphCoElevatorWarpMaps ; $5811
- ld de, $cc5b
+ ld de, wcc5b
ld bc, $16
call CopyData
ret
--- a/scripts/ssanne10.asm
+++ b/scripts/ssanne10.asm
@@ -29,7 +29,7 @@
SSAnne10TrainerHeader0: ; 61d84 (18:5d84)
db $1 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d809 ; flag's byte
+ dw wd809 ; flag's byte
dw SSAnne10BattleText1 ; 0x5e16 TextBeforeBattle
dw SSAnne10AfterBattleText1 ; 0x5e20 TextAfterBattle
dw SSAnne10EndBattleText1 ; 0x5e1b TextEndBattle
@@ -38,7 +38,7 @@
SSAnne10TrainerHeader1: ; 61d90 (18:5d90)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d809 ; flag's byte
+ dw wd809 ; flag's byte
dw SSAnne10BattleText2 ; 0x5e25 TextBeforeBattle
dw SSAnne10AfterBattleText2 ; 0x5e2f TextAfterBattle
dw SSAnne10EndBattleText2 ; 0x5e2a TextEndBattle
@@ -47,7 +47,7 @@
SSAnne10TrainerHeader2: ; 61d9c (18:5d9c)
db $3 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d809 ; flag's byte
+ dw wd809 ; flag's byte
dw SSAnne10BattleText3 ; 0x5e34 TextBeforeBattle
dw SSAnne10AfterBattleText3 ; 0x5e3e TextAfterBattle
dw SSAnne10EndBattleText3 ; 0x5e39 TextEndBattle
@@ -56,7 +56,7 @@
SSAnne10TrainerHeader3: ; 61da8 (18:5da8)
db $4 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d809 ; flag's byte
+ dw wd809 ; flag's byte
dw SSAnne10BattleText4 ; 0x5e43 TextBeforeBattle
dw SSAnne10AfterBattleText4 ; 0x5e4d TextAfterBattle
dw SSAnne10EndBattleText4 ; 0x5e48 TextEndBattle
@@ -65,7 +65,7 @@
SSAnne10TrainerHeader4: ; 61db4 (18:5db4)
db $5 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d809 ; flag's byte
+ dw wd809 ; flag's byte
dw SSAnne10BattleText5 ; 0x5e52 TextBeforeBattle
dw SSAnne10AfterBattleText5 ; 0x5e5c TextAfterBattle
dw SSAnne10EndBattleText5 ; 0x5e57 TextEndBattle
@@ -74,7 +74,7 @@
SSAnne10TrainerHeader5: ; 61dc0 (18:5dc0)
db $6 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d809 ; flag's byte
+ dw wd809 ; flag's byte
dw SSAnne10BattleText6 ; 0x5e61 TextBeforeBattle
dw SSAnne10AfterBattleText6 ; 0x5e6b TextAfterBattle
dw SSAnne10EndBattleText6 ; 0x5e66 TextEndBattle
--- a/scripts/ssanne2.asm
+++ b/scripts/ssanne2.asm
@@ -25,15 +25,15 @@
call ArePlayerCoordsInArray
ret nc
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
ld c, BANK(Music_MeetRival)
ld a, MUSIC_MEET_RIVAL
call PlayMusic
- ld a, [$cd3d]
+ ld a, [wWhichTrade]
ld [$ffdb], a
ld a, $71
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef
call Delay3
@@ -67,11 +67,11 @@
db $08,$24,$08,$25,$FF
SSAnne2Script_61416: ; 61416 (18:5416)
- ld a, [W_XCOORD] ; $d362
+ ld a, [W_XCOORD] ; wd362
cp $25
jr nz, .asm_61426
ld a, $2
- ld [$d528], a
+ ld [wd528], a
ld a, $c
jr .asm_61427
.asm_61426
@@ -83,7 +83,7 @@
jp Func_34a6
SSAnne2Script1: ; 61430 (18:5430)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
call SSAnne2Script_61416
@@ -118,7 +118,7 @@
ret
SSAnne2Script2: ; 6146d (18:546d)
- ld a, [$d057]
+ ld a, [W_ISINBATTLE]
cp $ff
jp z, SSAnne2Script_613ab
call SSAnne2Script_61416
@@ -142,7 +142,7 @@
ld [$ff8c], a
call MoveSprite
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
callba Music_RivalAlternateStart
ld a, $3
@@ -156,13 +156,13 @@
db $00,$00,$00,$00,$FF
SSAnne2Script3: ; 614be (18:54be)
- ld a, [$d730]
+ ld a, [wd730]
bit 0, a
ret nz
xor a
ld [wJoyIgnore], a
ld a, $71
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
call Func_2307
@@ -183,7 +183,7 @@
db $8
ld hl, SSAnneRivalBeforeBattleText
call PrintText
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, SSAnneRivalDefeatedText
--- a/scripts/ssanne5.asm
+++ b/scripts/ssanne5.asm
@@ -23,7 +23,7 @@
SSAnne5TrainerHeader0: ; 616d1 (18:56d1)
db $4 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7ff ; flag's byte
+ dw wd7ff ; flag's byte
dw SSAnne5BattleText1 ; 0x5703 TextBeforeBattle
dw SSAnne5AfterBattleText1 ; 0x570d TextAfterBattle
dw SSAnne5EndBattleText1 ; 0x5708 TextEndBattle
@@ -32,7 +32,7 @@
SSAnne5TrainerHeader1: ; 616dd (18:56dd)
db $5 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7ff ; flag's byte
+ dw wd7ff ; flag's byte
dw SSAnne5BattleText2 ; 0x571c TextBeforeBattle
dw SSAnne5AfterBattleText2 ; 0x5726 TextAfterBattle
dw SSAnne5EndBattleText2 ; 0x5721 TextEndBattle
--- a/scripts/ssanne7.asm
+++ b/scripts/ssanne7.asm
@@ -3,10 +3,10 @@
jp EnableAutoTextBoxDrawing
SSAnne7Script_6189b: ; 6189b (18:589b)
- ld a, [$d803]
+ ld a, [wd803]
bit 1, a
ret nz
- ld hl, $d72d
+ ld hl, wd72d
set 5, [hl]
ret
@@ -17,7 +17,7 @@
SSAnne7Text1: ; 618ad (18:58ad)
db $08 ; asm
- ld a, [$d803]
+ ld a, [wd803]
bit 0, a
jr nz, .asm_797c4 ; 0x618b3
ld hl, SSAnne7RubText
@@ -29,13 +29,13 @@
jr nc, .BagFull
ld hl, ReceivedHM01Text
call PrintText
- ld hl, $d803
+ ld hl, wd803
set 0, [hl]
jr .asm_0faf5 ; 0x618d4
.BagFull
ld hl, HM01NoRoomText
call PrintText
- ld hl, $d72d
+ ld hl, wd72d
set 5, [hl]
jr .asm_0faf5 ; 0x618e1
.asm_797c4 ; 0x618e3
@@ -47,27 +47,27 @@
SSAnne7RubText: ; 618ec (18:58ec)
TX_FAR _SSAnne7RubText
db $8
- ld a, [$c0ef]
+ ld a, [wc0ef]
cp $1f
- ld [$c0f0], a
+ ld [wc0f0], a
jr nz, .asm_61908 ; 0x618f9 $d
ld a, $ff
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
ld a, Bank(Func_9876)
- ld [$c0ef], a
+ ld [wc0ef], a
.asm_61908
ld a, MUSIC_PKMN_HEALED
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
.asm_61910
- ld a, [$c026]
+ ld a, [wc026]
cp MUSIC_PKMN_HEALED
jr z, .asm_61910 ; 0x61915 $f9
call Func_2307
- ld hl, $d803
+ ld hl, wd803
set 1, [hl]
- ld hl, $d72d
+ ld hl, wd72d
res 5, [hl]
jp TextScriptEnd
--- a/scripts/ssanne8.asm
+++ b/scripts/ssanne8.asm
@@ -29,7 +29,7 @@
SSAnne8TrainerHeader0: ; 619a5 (18:59a5)
db $1 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d805 ; flag's byte
+ dw wd805 ; flag's byte
dw SSAnne8BattleText1 ; 0x5a0b TextBeforeBattle
dw SSAnne8AfterBattleText1 ; 0x5a15 TextAfterBattle
dw SSAnne8EndBattleText1 ; 0x5a10 TextEndBattle
@@ -38,7 +38,7 @@
SSAnne8TrainerHeader1: ; 619b1 (18:59b1)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d805 ; flag's byte
+ dw wd805 ; flag's byte
dw SSAnne8BattleText2 ; 0x5a1a TextBeforeBattle
dw SSAnne8AfterBattleText2 ; 0x5a24 TextAfterBattle
dw SSAnne8EndBattleText2 ; 0x5a1f TextEndBattle
@@ -47,7 +47,7 @@
SSAnne8TrainerHeader2: ; 619bd (18:59bd)
db $3 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d805 ; flag's byte
+ dw wd805 ; flag's byte
dw SSAnne8BattleText3 ; 0x5a29 TextBeforeBattle
dw SSAnne8AfterBattleText3 ; 0x5a33 TextAfterBattle
dw SSAnne8EndBattleText3 ; 0x5a2e TextEndBattle
@@ -56,7 +56,7 @@
SSAnne8TrainerHeader3: ; 619c9 (18:59c9)
db $4 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d805 ; flag's byte
+ dw wd805 ; flag's byte
dw SSAnne8BattleText4 ; 0x5a38 TextBeforeBattle
dw SSAnne8AfterBattleText4 ; 0x5a42 TextAfterBattle
dw SSAnne8EndBattleText4 ; 0x5a3d TextEndBattle
--- a/scripts/ssanne9.asm
+++ b/scripts/ssanne9.asm
@@ -1,8 +1,8 @@
SSAnne9Script: ; 61b4b (18:5b4b)
ld a, $1
- ld [$cf0c], a
+ ld [wcf0c], a
xor a
- ld [$cc3c], a
+ ld [wcc3c], a
ld hl, SSAnne9TrainerHeaders
ld de, SSAnne9ScriptPointers
ld a, [W_SSANNE9CURSCRIPT]
@@ -34,7 +34,7 @@
SSAnne9TrainerHeader0: ; 61b84 (18:5b84)
db $1 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d807 ; flag's byte
+ dw wd807 ; flag's byte
dw SSAnne9BattleText1 ; 0x5c51 TextBeforeBattle
dw SSAnne9AfterBattleText1 ; 0x5c5b TextAfterBattle
dw SSAnne9EndBattleText1 ; 0x5c56 TextEndBattle
@@ -43,7 +43,7 @@
SSAnne9TrainerHeader1: ; 61b90 (18:5b90)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d807 ; flag's byte
+ dw wd807 ; flag's byte
dw SSAnne9BattleText2 ; 0x5c60 TextBeforeBattle
dw SSAnne9AfterBattleText2 ; 0x5c6a TextAfterBattle
dw SSAnne9EndBattleText2 ; 0x5c65 TextEndBattle
@@ -52,7 +52,7 @@
SSAnne9TrainerHeader2: ; 61b9c (18:5b9c)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d807 ; flag's byte
+ dw wd807 ; flag's byte
dw SSAnne9BattleText3 ; 0x5c6f TextBeforeBattle
dw SSAnne9AfterBattleText3 ; 0x5c79 TextAfterBattle
dw SSAnne9EndBattleText3 ; 0x5c74 TextEndBattle
@@ -61,7 +61,7 @@
SSAnne9TrainerHeader3: ; 61ba8 (18:5ba8)
db $4 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d807 ; flag's byte
+ dw wd807 ; flag's byte
dw SSAnne9BattleText4 ; 0x5c7e TextBeforeBattle
dw SSAnne9AfterBattleText4 ; 0x5c88 TextAfterBattle
dw SSAnne9EndBattleText4 ; 0x5c83 TextEndBattle
--- a/scripts/unknowndungeon3.asm
+++ b/scripts/unknowndungeon3.asm
@@ -21,7 +21,7 @@
UnknownDungeon3TrainerHeader0: ; 45f0f (11:5f0f)
db $1 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d85f ; flag's byte
+ dw wd85f ; flag's byte
dw UnknownDungeon3MewtwoText ; 0x5f26 TextBeforeBattle
dw UnknownDungeon3MewtwoText ; 0x5f26 TextAfterBattle
dw UnknownDungeon3MewtwoText ; 0x5f26 TextEndBattle
--- a/scripts/vermilioncity.asm
+++ b/scripts/vermilioncity.asm
@@ -1,6 +1,6 @@
VermilionCityScript: ; 197a1 (6:57a1)
call EnableAutoTextBoxDrawing
- ld hl, $d126
+ ld hl, wd126
bit 6, [hl]
res 6, [hl]
push hl
@@ -17,11 +17,11 @@
call Random
ld a, [$ffd4]
and $e
- ld [$d743], a
+ ld [wd743], a
ret
VermilionCityScript_197cb: ; 197cb (6:57cb)
- ld hl, $d803
+ ld hl, wd803
bit 2, [hl]
ret z
bit 3, [hl]
@@ -39,7 +39,7 @@
dw VermilionCityScript4
VermilionCityScript0: ; 197e6 (6:57e6)
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
and a
ret nz
ld hl, CoordsData_19823
@@ -47,11 +47,11 @@
ret nc
xor a
ld [hJoyHeld], a
- ld [$cf0d], a
+ ld [wcf0d], a
ld a, $3
ld [$ff8c], a
call DisplayTextID
- ld a, [$d803]
+ ld a, [wd803]
bit 2, a
jr nz, .asm_19810 ; 0x19804 $a
ld b, $3f
@@ -62,9 +62,9 @@
ret nz
.asm_19810
ld a, $40
- ld [$ccd3], a
+ ld [wccd3], a
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
call Func_3486
ld a, $1
ld [W_VERMILIONCITYCURSCRIPT], a
@@ -86,10 +86,10 @@
ld a, $ff
ld [wJoyIgnore], a
ld a, $40
- ld [$ccd3], a
- ld [$ccd4], a
+ ld [wccd3], a
+ ld [wccd4], a
ld a, $2
- ld [$cd38], a
+ ld [wcd38], a
call Func_3486
ld a, $3
ld [W_VERMILIONCITYCURSCRIPT], a
@@ -96,7 +96,7 @@
ret
VermilionCityScript3: ; 1984e (6:584e)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
xor a
@@ -107,7 +107,7 @@
ret
VermilionCityScript1: ; 1985f (6:585f)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
ld c, $a
@@ -137,7 +137,7 @@
VermilionCityText2: ; 1988e (6:588e)
db $08 ; asm
- ld a, [$d803]
+ ld a, [wd803]
bit 2, a
jr nz, .asm_359bd ; 0x19894
ld hl, VermilionCityText_198a7
@@ -159,10 +159,10 @@
VermilionCityText3: ; 198b1 (6:58b1)
db $08 ; asm
- ld a, [$d803]
+ ld a, [wd803]
bit 2, a
jr nz, .asm_3e0e9 ; 0x198b7
- ld a, [$c109]
+ ld a, [wSpriteStateData1 + 9]
cp $c
jr z, .asm_07af3 ; 0x198be
ld hl, VermilionCityCoords1
--- a/scripts/vermiliondock.asm
+++ b/scripts/vermiliondock.asm
@@ -1,11 +1,11 @@
VermilionDockScript: ; 1db52 (7:5b52)
call EnableAutoTextBoxDrawing
- ld hl, $d803
+ ld hl, wd803
bit 4, [hl]
jr nz, .asm_1db8d ; 0x1db5a $31
bit 0, [hl]
ret z
- ld a, [$d42f]
+ ld a, [wd42f]
cp $1
ret nz
bit 2, [hl]
@@ -12,18 +12,18 @@
jp z, VermilionDock_1db9b
set 4, [hl]
call Delay3
- ld hl, $d730
+ ld hl, wd730
set 7, [hl]
- ld hl, $ccd3
+ ld hl, wccd3
ld a, $40
ld [hli], a
ld [hli], a
ld [hl], a
ld a, $3
- ld [$cd38], a
+ ld [wcd38], a
xor a
- ld [$c206], a
- ld [$cd3b], a
+ ld [wSpriteStateData2 + $06], a
+ ld [wcd3b], a
dec a
ld [wJoyIgnore], a
ret
@@ -30,7 +30,7 @@
.asm_1db8d
bit 5, [hl]
ret nz
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
ld [wJoyIgnore], a
@@ -41,7 +41,7 @@
set 2, [hl]
ld a, $ff
ld [wJoyIgnore], a
- ld [$c0ee], a
+ ld [wc0ee], a
call PlaySound
ld c, BANK(Music_Surfing)
ld a, MUSIC_SURFING
@@ -48,12 +48,12 @@
call PlayMusic
callba LoadSmokeTileFourTimes
xor a
- ld [$c102], a
+ ld [wSpriteStateData1 + 2], a
ld c, $78
call DelayFrames
ld b, $9c
call CopyScreenTileBufferToVRAM
- FuncCoord 0, 10 ; $c468
+ FuncCoord 0, 10
ld hl, Coord
ld bc, $0078
ld a, $14
@@ -63,11 +63,11 @@
call Delay3
xor a
ld [$ffba], a
- ld [$cd3d], a
+ ld [wWhichTrade], a
ld [$ff49], a
ld a, $58
- ld [$cd3e], a
- ld hl, $d526
+ ld [wTrainerEngageDistance], a
+ ld hl, wd526
ld c, [hl]
inc hl
ld b, [hl]
@@ -76,7 +76,7 @@
ld a, (SFX_02_54 - SFX_Headers_02) / 3
call PlaySoundWaitForCurrent
ld a, $ff
- ld [$cfcb], a
+ ld [wcfcb], a
ld d, $0
ld e, $8
.asm_1dbfa
@@ -83,9 +83,9 @@
ld hl, $0002
add hl, bc
ld a, l
- ld [$d526], a
+ ld [wd526], a
ld a, h
- ld [$d527], a
+ ld [wd527], a
push hl
push de
call ScheduleEastColumnRedraw
@@ -112,7 +112,7 @@
ld a, $90
ld [$ffb0], a
ld a, $1
- ld [$cfcb], a
+ ld [wcfcb], a
pop hl
pop bc
ld [hl], b
@@ -119,7 +119,7 @@
dec hl
ld [hl], c
call LoadPlayerSpriteGraphics
- ld hl, $d3ae
+ ld hl, wd3ae
dec [hl]
ret
@@ -126,8 +126,8 @@
VermilionDock_1dc42: ; 1dc42 (7:5c42)
push bc
push de
- ld hl, $c311
- ld a, [$cd3d]
+ ld hl, wOAMBuffer + $11
+ ld a, [wWhichTrade]
swap a
ld c, a
ld de, $0004
@@ -142,14 +142,14 @@
ret
VermilionDock_1dc59: ; 1dc59 (7:5c59)
- ld a, [$cd3e]
+ ld a, [wTrainerEngageDistance]
sub $10
- ld [$cd3e], a
+ ld [wTrainerEngageDistance], a
ld c, a
ld b, $64
- ld a, [$cd3d]
+ ld a, [wWhichTrade]
inc a
- ld [$cd3d], a
+ ld [wWhichTrade], a
ld a, $1
ld de, VermilionDockOAMBlock
call WriteOAMBlock
@@ -180,15 +180,15 @@
ret
VermilionDock_1dc94: ; 1dc94 (7:5c94)
- ld hl, $cc5b
+ ld hl, wcc5b
ld bc, $00b4
ld a, $14
call FillMemory
ld hl, $9940
- ld de, $cc5b
+ ld de, wcc5b
ld bc, $000c
call CopyVideoData
- ld hl, $c754
+ ld hl, wOverworldMap + 10 + 7 * VERMILION_DOCK_WIDTH ; 10, 7
ld a, $d
ld [hli], a
ld [hli], a
--- a/scripts/vermiliongym.asm
+++ b/scripts/vermiliongym.asm
@@ -1,5 +1,5 @@
VermilionGymScript: ; 5ca26 (17:4a26)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
push hl
@@ -28,7 +28,7 @@
db "LT.SURGE@"
VermilionGymScript_5ca6d: ; 5ca6d (17:4a6d)
- ld a, [$d773]
+ ld a, [wd773]
bit 0, a
jr nz, .asm_5ca78
ld a, $24
@@ -38,7 +38,7 @@
call PlaySound
ld a, $5
.asm_5ca7f
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $202
ld a, $17
jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -57,7 +57,7 @@
dw VermilionGymScript3
VermilionGymScript3: ; 5ca9d (17:4a9d)
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, VermilionGymScript_5ca8a
ld a, $f0
@@ -67,7 +67,7 @@
ld a, $6
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld hl, $d773
+ ld hl, wd773
set 7, [hl]
ld bc, (TM_24 << 8) | 1
call GiveItem
@@ -75,7 +75,7 @@
ld a, $7
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld hl, $d773
+ ld hl, wd773
set 6, [hl]
jr .asm_5cad3
.BagFull
@@ -85,13 +85,13 @@
.asm_5cad3
ld hl, W_OBTAINEDBADGES
set 2, [hl]
- ld hl, $d72a
+ ld hl, wd72a
set 2, [hl]
; deactivate gym trainers
- ld a, [$d773]
+ ld a, [wd773]
or %00011100
- ld [$d773], a
+ ld [wd773], a
jp VermilionGymScript_5ca8a
@@ -109,7 +109,7 @@
VermilionGymTrainerHeader0: ; 5caf8 (17:4af8)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d773 ; flag's byte
+ dw wd773 ; flag's byte
dw VermilionGymBattleText1 ; 0x4b9a TextBeforeBattle
dw VermilionGymAfterBattleText1 ; 0x4ba4 TextAfterBattle
dw VermilionGymEndBattleText1 ; 0x4b9f TextEndBattle
@@ -118,7 +118,7 @@
VermilionGymTrainerHeader1: ; 5cb04 (17:4b04)
db $3 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d773 ; flag's byte
+ dw wd773 ; flag's byte
dw VermilionGymBattleText2 ; 0x4bb3 TextBeforeBattle
dw VermilionGymAfterBattleText2 ; 0x4bbd TextAfterBattle
dw VermilionGymEndBattleText2 ; 0x4bb8 TextEndBattle
@@ -127,7 +127,7 @@
VermilionGymTrainerHeader2: ; 5cb10 (17:4b10)
db $4 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d773 ; flag's byte
+ dw wd773 ; flag's byte
dw VermilionGymBattleText3 ; 0x4bcc TextBeforeBattle
dw VermilionGymAfterBattleText3 ; 0x4bd6 TextAfterBattle
dw VermilionGymEndBattleText3 ; 0x4bd1 TextEndBattle
@@ -137,7 +137,7 @@
VermilionGymText1: ; 5cb1d (17:4b1d)
db $08 ; asm
- ld a, [$d773]
+ ld a, [wd773]
bit 7, a
jr z, .asm_7cc29 ; 0x5cb23
bit 6, a
@@ -152,7 +152,7 @@
.asm_7cc29 ; 0x5cb39
ld hl, VermilionGymText_5cb6d
call PrintText
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, ReceivedThunderbadgeText
@@ -159,11 +159,11 @@
ld de, ReceivedThunderbadgeText
call PreBattleSaveRegisters
ldh a, [$8c]
- ld [$cf13], a
+ ld [wcf13], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $3
- ld [$d05c], a
+ ld [W_GYMLEADERNO], a
xor a
ldh [$b4], a
ld a, $3
@@ -254,7 +254,7 @@
VermilionGymText5: ; 5cbdb (17:4bdb)
db $08 ; asm
- ld a, [$d72a]
+ ld a, [wd72a]
bit 2, a
jr nz, .asm_13b67 ; 0x5cbe1
ld hl, VermilionGymText_5cbf4
--- a/scripts/vermilionhouse2.asm
+++ b/scripts/vermilionhouse2.asm
@@ -6,19 +6,19 @@
VermilionHouse2Text1: ; 56075 (15:6075)
db $08 ; asm
- ld a, [$d728]
+ ld a, [wd728]
bit 3, a
jr nz, .asm_03ef5
ld hl, VermilionHouse2Text_560b1
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .asm_eb1b7
ld bc, (OLD_ROD << 8) | 1
call GiveItem
jr nc, .BagFull
- ld hl, $d728
+ ld hl, wd728
set 3, [hl]
ld hl, VermilionHouse2Text_560b6
jr .asm_5dd95
--- a/scripts/victoryroad1.asm
+++ b/scripts/victoryroad1.asm
@@ -1,5 +1,5 @@
VictoryRoad1Script: ; 5da0a (17:5a0a)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
call nz, .next
@@ -11,11 +11,11 @@
ld [W_VICTORYROAD1CURSCRIPT], a
ret
.next
- ld a, [$d869]
+ ld a, [wd869]
bit 7, a
ret z
ld a, $1d
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $604
ld a, $17
jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -26,15 +26,15 @@
dw EndTrainerBattle
VictoryRoad1Script0: ; 5da40 (17:5a40)
- ld a, [$d869]
+ ld a, [wd869]
bit 7, a
jp nz, CheckFightingMapTrainers
ld hl, CoordsData_5da5c ; $5a5c
call CheckBoulderCoords
jp nc, CheckFightingMapTrainers
- ld hl, $d126
+ ld hl, wd126
set 5, [hl]
- ld hl, $d869
+ ld hl, wd869
set 7, [hl]
ret
@@ -54,7 +54,7 @@
VictoryRoad1TrainerHeader0: ; 5da6d (17:5a6d)
db $1 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d869 ; flag's byte
+ dw wd869 ; flag's byte
dw VictoryRoad1BattleText1 ; 0x5a9a TextBeforeBattle
dw VictoryRoad1AfterBattleText1 ; 0x5aa4 TextAfterBattle
dw VictoryRoad1EndBattleText1 ; 0x5a9f TextEndBattle
@@ -63,7 +63,7 @@
VictoryRoad1TrainerHeader1: ; 5da79 (17:5a79)
db $2 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d869 ; flag's byte
+ dw wd869 ; flag's byte
dw VictoryRoad1BattleText2 ; 0x5aa9 TextBeforeBattle
dw VictoryRoad1AfterBattleText2 ; 0x5ab3 TextAfterBattle
dw VictoryRoad1EndBattleText2 ; 0x5aae TextEndBattle
--- a/scripts/victoryroad2.asm
+++ b/scripts/victoryroad2.asm
@@ -1,9 +1,9 @@
VictoryRoad2Script: ; 5179d (14:579d)
- ld hl, $d126
+ ld hl, wd126
bit 6, [hl]
res 6, [hl]
call nz, VictoryRoad2Script_517c4
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
call nz, VictoryRoad2Script_517c9
@@ -16,11 +16,11 @@
ret
VictoryRoad2Script_517c4: ; 517c4 (14:57c4)
- ld hl, $d869
+ ld hl, wd869
res 7, [hl]
VictoryRoad2Script_517c9: ; 517c9 (14:57c9)
- ld a, [$d7ee]
+ ld a, [wd7ee]
bit 0, a
jr z, .asm_517da
push af
@@ -35,7 +35,7 @@
ld bc, $70b
VictoryRoad2Script_517e2: ; 517e2 (14:57e2)
- ld [$d09f], a
+ ld [wd09f], a
ld a, $17
call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
ret
@@ -49,8 +49,8 @@
ld hl, CoordsData_51816 ; $5816
call CheckBoulderCoords
jp nc, CheckFightingMapTrainers
- ld hl, $d7ee
- ld a, [wWhichTrade] ; $cd3d
+ ld hl, wd7ee
+ ld a, [wWhichTrade] ; wWhichTrade
cp $2
jr z, .asm_5180b
bit 0, [hl]
@@ -62,7 +62,7 @@
set 7, [hl]
ret nz
.asm_51810
- ld hl, $d126
+ ld hl, wd126
set 5, [hl]
ret
@@ -90,7 +90,7 @@
VictoryRoad2TrainerHeader0: ; 51835 (14:5835)
db $1 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7ee ; flag's byte
+ dw wd7ee ; flag's byte
dw VictoryRoad2BattleText1 ; 0x58ca TextBeforeBattle
dw VictoryRoad2AfterBattleText1 ; 0x58d4 TextAfterBattle
dw VictoryRoad2EndBattleText1 ; 0x58cf TextEndBattle
@@ -99,7 +99,7 @@
VictoryRoad2TrainerHeader2: ; 51841 (14:5841)
db $2 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7ee ; flag's byte
+ dw wd7ee ; flag's byte
dw VictoryRoad2BattleText2 ; 0x58d9 TextBeforeBattle
dw VictoryRoad2AfterBattleText2 ; 0x58e3 TextAfterBattle
dw VictoryRoad2EndBattleText2 ; 0x58de TextEndBattle
@@ -108,7 +108,7 @@
VictoryRoad2TrainerHeader3: ; 5184d (14:584d)
db $3 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7ee ; flag's byte
+ dw wd7ee ; flag's byte
dw VictoryRoad2BattleText3 ; 0x58e8 TextBeforeBattle
dw VictoryRoad2AfterBattleText3 ; 0x58f2 TextAfterBattle
dw VictoryRoad2EndBattleText3 ; 0x58ed TextEndBattle
@@ -117,7 +117,7 @@
VictoryRoad2TrainerHeader4: ; 51859 (14:5859)
db $4 ; flag's bit
db ($1 << 4) ; trainer's view range
- dw $d7ee ; flag's byte
+ dw wd7ee ; flag's byte
dw VictoryRoad2BattleText4 ; 0x58f7 TextBeforeBattle
dw VictoryRoad2AfterBattleText4 ; 0x5901 TextAfterBattle
dw VictoryRoad2EndBattleText4 ; 0x58fc TextEndBattle
@@ -126,7 +126,7 @@
VictoryRoad2TrainerHeader5: ; 51865 (14:5865)
db $5 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d7ee ; flag's byte
+ dw wd7ee ; flag's byte
dw VictoryRoad2BattleText5 ; 0x5906 TextBeforeBattle
dw VictoryRoad2AfterBattleText5 ; 0x5910 TextAfterBattle
dw VictoryRoad2EndBattleText5 ; 0x590b TextEndBattle
@@ -135,7 +135,7 @@
VictoryRoad2TrainerHeader6: ; 51871 (14:5871)
db $6 ; flag's bit
db ($0 << 4) ; trainer's view range
- dw $d7ee ; flag's byte
+ dw wd7ee ; flag's byte
dw VictoryRoad2BattleText6 ; 0x58ba TextBeforeBattle
dw VictoryRoad2BattleText6 ; 0x58ba TextAfterBattle
dw VictoryRoad2BattleText6 ; 0x58ba TextEndBattle
--- a/scripts/victoryroad3.asm
+++ b/scripts/victoryroad3.asm
@@ -9,15 +9,15 @@
ret
VictoryRoad3Script_44996: ; 44996 (11:4996)
- ld hl, $d126
+ ld hl, wd126
bit 5, [hl]
res 5, [hl]
ret z
- ld hl, $d813
+ ld hl, wd813
bit 0, [hl]
ret z
ld a, $1d
- ld [$d09f], a
+ ld [wd09f], a
ld bc, $503
ld a, $17
jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
@@ -35,25 +35,25 @@
ld hl, .coordsData_449f9 ; $49f9
call CheckBoulderCoords
jp nc, .asm_449fe
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
cp $1
jr nz, .asm_449dc
- ld hl, $d126
+ ld hl, wd126
set 5, [hl]
- ld hl, $d813
+ ld hl, wd813
set 0, [hl]
ret
.asm_449dc
- ld hl, $d813
+ ld hl, wd813
bit 6, [hl]
set 6, [hl]
jr nz, .asm_449fe
ld a, $7a
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
ld a, $60
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
jp Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8))
@@ -64,19 +64,19 @@
.asm_449fe
ld a, $c2
- ld [$d71d], a
+ ld [wd71d], a
ld hl, .coordsData_449f9 ; $49f9
call Func_46981
- ld a, [wWhichTrade] ; $cd3d
+ ld a, [wWhichTrade] ; wWhichTrade
cp $1
jr nz, .asm_44a1b
- ld hl, $d72d
+ ld hl, wd72d
res 4, [hl]
- ld hl, $d732
+ ld hl, wd732
res 4, [hl]
ret
.asm_44a1b
- ld a, [$d72d]
+ ld a, [wd72d]
bit 4, a
jp z, CheckFightingMapTrainers
ret
@@ -97,7 +97,7 @@
VictoryRoad3TrainerHeader0: ; 44a38 (11:4a38)
db $1 ; flag's bit
db ($1 << 4) ; trainer's view range
- dw $d813 ; flag's byte
+ dw wd813 ; flag's byte
dw VictoryRoad3BattleText2 ; 0x4a91 TextBeforeBattle
dw VictoryRoad3AfterBattleText2 ; 0x4a9b TextAfterBattle
dw VictoryRoad3EndBattleText2 ; 0x4a96 TextEndBattle
@@ -106,7 +106,7 @@
VictoryRoad3TrainerHeader2: ; 44a44 (11:4a44)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d813 ; flag's byte
+ dw wd813 ; flag's byte
dw VictoryRoad3BattleText3 ; 0x4aa0 TextBeforeBattle
dw VictoryRoad3AfterBattleText3 ; 0x4aaa TextAfterBattle
dw VictoryRoad3EndBattleText3 ; 0x4aa5 TextEndBattle
@@ -115,7 +115,7 @@
VictoryRoad3TrainerHeader3: ; 44a50 (11:4a50)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d813 ; flag's byte
+ dw wd813 ; flag's byte
dw VictoryRoad3BattleText4 ; 0x4aaf TextBeforeBattle
dw VictoryRoad3AfterBattleText4 ; 0x4ab9 TextAfterBattle
dw VictoryRoad3EndBattleText4 ; 0x4ab4 TextEndBattle
@@ -124,7 +124,7 @@
VictoryRoad3TrainerHeader4: ; 44a5c (11:4a5c)
db $4 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d813 ; flag's byte
+ dw wd813 ; flag's byte
dw VictoryRoad3BattleText5 ; 0x4abe TextBeforeBattle
dw VictoryRoad3AfterBattleText5 ; 0x4ac8 TextAfterBattle
dw VictoryRoad3EndBattleText5 ; 0x4ac3 TextEndBattle
--- a/scripts/viridiancity.asm
+++ b/scripts/viridiancity.asm
@@ -15,13 +15,13 @@
jp ViridianCityScript_1903d
ViridianCityScript_1900b: ; 1900b (6:500b)
- ld a, [$d74c]
+ ld a, [wd74c]
bit 0, a
ret nz
ld a, [W_OBTAINEDBADGES]
cp %01111111
jr nz, .asm_1901e ; 0x19016 $6
- ld hl, $d74c
+ ld hl, wd74c
set 0, [hl]
ret
.asm_1901e
@@ -42,7 +42,7 @@
ret
ViridianCityScript_1903d: ; 1903d (6:503d)
- ld a, [$d74b]
+ ld a, [wd74b]
bit 5, a
ret nz
ld a, [W_YCOORD]
@@ -62,13 +62,13 @@
ret
ViridianCityScript1: ; 19062 (6:5062)
- ld a, [$c134]
+ ld a, [wSpriteStateData1 + $34]
ld [$ffeb], a
- ld a, [$c136]
+ ld a, [wSpriteStateData1 + $36]
ld [$ffec], a
- ld a, [$c234]
+ ld a, [wSpriteStateData2 + $34]
ld [$ffed], a
- ld a, [$c235]
+ ld a, [wSpriteStateData2 + $35]
ld [$ffee], a
xor a
ld [wListScrollOffset], a
@@ -86,13 +86,13 @@
ViridianCityScript2: ; 1908f (6:508f)
ld a, [$ffeb]
- ld [$c134], a
+ ld [wSpriteStateData1 + $34], a
ld a, [$ffec]
- ld [$c136], a
+ ld [wSpriteStateData1 + $36], a
ld a, [$ffed]
- ld [$c234], a
+ ld [wSpriteStateData2 + $34], a
ld a, [$ffee]
- ld [$c235], a
+ ld [wSpriteStateData2 + $35], a
call UpdateSprites
call Delay3
xor a
@@ -108,7 +108,7 @@
ret
ViridianCityScript3: ; 190c1 (6:50c1)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
call Delay3
@@ -119,11 +119,11 @@
ViridianCityScript_190cf: ; 190cf (6:50cf)
call Func_3486
ld a, $1
- ld [$cd38], a
+ ld [wcd38], a
ld a, $80
- ld [$ccd3], a
+ ld [wccd3], a
xor a
- ld [$c109], a
+ ld [wSpriteStateData1 + 9], a
ld [wJoyIgnore], a
ret
@@ -154,7 +154,7 @@
cp %01111111
ld hl, ViridianCityText_19127
jr z, .asm_ae9fe ; 0x19110
- ld a, [$d751]
+ ld a, [wd751]
bit 1, a
jr nz, .asm_ae9fe ; 0x19117
ld hl, ViridianCityText_19122
@@ -175,7 +175,7 @@
ld hl, ViridianCityText_1914d
call PrintText
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr nz, .asm_6dfea ; 0x1913a
ld hl, ViridianCityText_19157
@@ -201,7 +201,7 @@
ViridianCityText4: ; 1915c (6:515c)
db $08 ; asm
- ld a, [$d74b]
+ ld a, [wd74b]
bit 5, a
jr nz, .asm_83894 ; 0x19162
ld hl, ViridianCityText_19175
@@ -236,7 +236,7 @@
ViridianCityText6: ; 19196 (6:5196)
db $08 ; asm
- ld a, [$d74c]
+ ld a, [wd74c]
bit 1, a
jr nz, .asm_4e5a0 ; 0x1919c
ld hl, ViridianCityText_191ca
@@ -246,7 +246,7 @@
jr nc, .BagFull
ld hl, ReceivedTM42Text
call PrintText
- ld hl, $d74c
+ ld hl, wd74c
set 1, [hl]
jr .asm_3c73c ; 0x191b7
.BagFull
@@ -282,7 +282,7 @@
ld c, $2
call DelayFrames
call YesNoChoice
- ld a, [$cc26]
+ ld a, [wCurrentMenuItem]
and a
jr z, .asm_42f68 ; 0x191f2
ld hl, ViridianCityText_1920f
--- a/scripts/viridianforest.asm
+++ b/scripts/viridianforest.asm
@@ -32,7 +32,7 @@
ViridianForestTrainerHeader0: ; 61142 (18:5142)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7f3 ; flag's byte
+ dw wd7f3 ; flag's byte
dw ViridianForestBattleText1 ; 0x518a TextBeforeBattle
dw ViridianForestAfterBattleText1 ; 0x5194 TextAfterBattle
dw ViridianForestEndBattleText1 ; 0x518f TextEndBattle
@@ -41,7 +41,7 @@
ViridianForestTrainerHeader1: ; 6114e (18:514e)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d7f3 ; flag's byte
+ dw wd7f3 ; flag's byte
dw ViridianForestBattleText2 ; 0x5199 TextBeforeBattle
dw ViridianForestAfterBattleText2 ; 0x51a3 TextAfterBattle
dw ViridianForestEndBattleText2 ; 0x519e TextEndBattle
@@ -50,7 +50,7 @@
ViridianForestTrainerHeader2: ; 6115a (18:515a)
db $4 ; flag's bit
db ($1 << 4) ; trainer's view range
- dw $d7f3 ; flag's byte
+ dw wd7f3 ; flag's byte
dw ViridianForestBattleText3 ; 0x51a8 TextBeforeBattle
dw ViridianForestAfterBattleText3 ; 0x51b2 TextAfterBattle
dw ViridianForestEndBattleText3 ; 0x51ad TextEndBattle
--- a/scripts/viridiangym.asm
+++ b/scripts/viridiangym.asm
@@ -30,9 +30,9 @@
dw ViridianGymScript4
ViridianGymScript0: ; 748eb (1d:48eb)
- ld a, [W_YCOORD] ; $d361
+ ld a, [W_YCOORD] ; wd361
ld b, a
- ld a, [W_XCOORD] ; $d362
+ ld a, [W_XCOORD] ; wd362
ld c, a
ld hl, ViridianGymArrowTilePlayerMovement
call Func_3442
@@ -39,7 +39,7 @@
cp $ff
jp z, CheckFightingMapTrainers
call Func_3486
- ld hl, $d736
+ ld hl, wd736
set 7, [hl]
ld a, (SFX_02_52 - SFX_Headers_02) / 3
call PlaySound
@@ -121,12 +121,12 @@
db $20,$0C,$FF
ViridianGymScript4: ; 7496b (1d:496b)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
jr nz, .asm_74980
xor a
ld [wJoyIgnore], a
- ld hl, $d736
+ ld hl, wd736
res 7, [hl]
ld a, $0
ld [W_CURMAPSCRIPT], a
@@ -137,7 +137,7 @@
jp Bankswitch
ViridianGymScript3: ; 74988 (1d:4988)
- ld a, [W_ISINBATTLE] ; $d057
+ ld a, [W_ISINBATTLE] ; W_ISINBATTLE
cp $ff
jp z, ViridianGymScript_748d6
ld a, $f0
@@ -146,7 +146,7 @@
ld a, $c
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld hl, $d751
+ ld hl, wd751
set 1, [hl]
ld bc, (TM_27 << 8) | 1
call GiveItem
@@ -154,7 +154,7 @@
ld a, $d
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
- ld hl, $d751
+ ld hl, wd751
set 0, [hl]
jr .asm_749be
.BagFull
@@ -164,22 +164,22 @@
.asm_749be
ld hl, W_OBTAINEDBADGES
set 7, [hl]
- ld hl, $d72a
+ ld hl, wd72a
set 7, [hl]
; deactivate gym trainers
- ld a, [$d751]
+ ld a, [wd751]
or %11111100
- ld [$d751], a
- ld a, [$d752]
+ ld [wd751], a
+ ld a, [wd752]
or %00000011
- ld [$d752], a
+ ld [wd752], a
ld a, $23
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $15
call Predef ; indirect jump to AddMissableObject (f1c8 (3:71c8))
- ld hl, $d7eb
+ ld hl, wd7eb
set 1, [hl]
set 7, [hl]
jp ViridianGymScript_748d6
@@ -204,7 +204,7 @@
ViridianGymTrainerHeader0: ; 74a08 (1d:4a08)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d751 ; flag's byte
+ dw wd751 ; flag's byte
dw ViridianGymBattleText1 ; 0x4afd TextBeforeBattle
dw ViridianGymAfterBattleText1 ; 0x4b07 TextAfterBattle
dw ViridianGymEndBattleText1 ; 0x4b02 TextEndBattle
@@ -213,7 +213,7 @@
ViridianGymTrainerHeader1: ; 74a14 (1d:4a14)
db $3 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d751 ; flag's byte
+ dw wd751 ; flag's byte
dw ViridianGymBattleText2 ; 0x4b16 TextBeforeBattle
dw ViridianGymAfterBattleText2 ; 0x4b20 TextAfterBattle
dw ViridianGymEndBattleText2 ; 0x4b1b TextEndBattle
@@ -222,7 +222,7 @@
ViridianGymTrainerHeader2: ; 74a20 (1d:4a20)
db $4 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d751 ; flag's byte
+ dw wd751 ; flag's byte
dw ViridianGymBattleText3 ; 0x4b2f TextBeforeBattle
dw ViridianGymAfterBattleText3 ; 0x4b39 TextAfterBattle
dw ViridianGymEndBattleText3 ; 0x4b34 TextEndBattle
@@ -231,7 +231,7 @@
ViridianGymTrainerHeader3: ; 74a2c (1d:4a2c)
db $5 ; flag's bit
db ($2 << 4) ; trainer's view range
- dw $d751 ; flag's byte
+ dw wd751 ; flag's byte
dw ViridianGymBattleText4 ; 0x4b48 TextBeforeBattle
dw ViridianGymAfterBattleText4 ; 0x4b52 TextAfterBattle
dw ViridianGymEndBattleText4 ; 0x4b4d TextEndBattle
@@ -240,7 +240,7 @@
ViridianGymTrainerHeader4: ; 74a38 (1d:4a38)
db $6 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d751 ; flag's byte
+ dw wd751 ; flag's byte
dw ViridianGymBattleText5 ; 0x4b61 TextBeforeBattle
dw ViridianGymAfterBattleText5 ; 0x4b6b TextAfterBattle
dw ViridianGymEndBattleText5 ; 0x4b66 TextEndBattle
@@ -249,7 +249,7 @@
ViridianGymTrainerHeader5: ; 74a44 (1d:4a44)
db $7 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d751 ; flag's byte
+ dw wd751 ; flag's byte
dw ViridianGymBattleText6 ; 0x4b7a TextBeforeBattle
dw ViridianGymAfterBattleText6 ; 0x4b84 TextAfterBattle
dw ViridianGymEndBattleText6 ; 0x4b7f TextEndBattle
@@ -258,7 +258,7 @@
ViridianGymTrainerHeader6: ; 74a50 (1d:4a50)
db $8 ; flag's bit
db ($3 << 4) ; trainer's view range
- dw $d751 ; flag's byte
+ dw wd751 ; flag's byte
dw ViridianGymBattleText7 ; 0x4b93 TextBeforeBattle
dw ViridianGymAfterBattleText7 ; 0x4b9d TextAfterBattle
dw ViridianGymEndBattleText7 ; 0x4b98 TextEndBattle
@@ -267,7 +267,7 @@
ViridianGymTrainerHeader7: ; 74a5c (1d:4a5c)
db $9 ; flag's bit
db ($4 << 4) ; trainer's view range
- dw $d751 ; flag's byte
+ dw wd751 ; flag's byte
dw ViridianGymBattleText8 ; 0x4bac TextBeforeBattle
dw ViridianGymAfterBattleText8 ; 0x4bb6 TextAfterBattle
dw ViridianGymEndBattleText8 ; 0x4bb1 TextEndBattle
@@ -277,7 +277,7 @@
ViridianGymText1: ; 74a69 (1d:4a69)
db $08 ; asm
- ld a, [$d751]
+ ld a, [wd751]
bit 1, a
jr z, .asm_6de66 ; 0x74a6f
bit 0, a
@@ -287,12 +287,12 @@
jr .asm_6dff7 ; 0x74a7b
.asm_9fc95 ; 0x74a7d
ld a, $1
- ld [$cc3c], a
+ ld [wcc3c], a
ld hl, ViridianGymText_74ad9
call PrintText
call GBFadeIn1
ld a, $32
- ld [$cc4d], a
+ ld [wcc4d], a
ld a, $11
call Predef
call UpdateSprites
@@ -302,7 +302,7 @@
.asm_6de66 ; 0x74aa0
ld hl, ViridianGymText_74ace
call PrintText
- ld hl, $d72d
+ ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld hl, ViridianGymText_74ad3
@@ -309,11 +309,11 @@
ld de, ViridianGymText_74ad3
call PreBattleSaveRegisters
ldh a, [$8c]
- ld [$cf13], a
+ ld [wcf13], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $8
- ld [$d05c], a
+ ld [W_GYMLEADERNO], a
ld a, $3
ld [W_VIRIDIANGYMCURSCRIPT], a
.asm_6dff7 ; 0x74acb
@@ -493,7 +493,7 @@
ViridianGymText10: ; 74bbb (1d:4bbb)
db $08 ; asm
- ld a, [$d751]
+ ld a, [wd751]
bit 1, a
jr nz, .asm_1abd1 ; 0x74bc1
ld hl, ViridianGymText_74bd4
--- a/scripts/viridianmart.asm
+++ b/scripts/viridianmart.asm
@@ -6,7 +6,7 @@
jp CallFunctionInTable
ViridianMartScript_1d47d: ; 1d47d (7:547d)
- ld a, [$d74e]
+ ld a, [wd74e]
bit 0, a
jr nz, .asm_1d489 ; 0x1d482 $5
ld hl, ViridianMartTextPointers ; $54e0
@@ -30,11 +30,11 @@
ld a, $4
ld [$ff8c], a
call DisplayTextID
- ld hl, $ccd3
+ ld hl, wccd3
ld de, RLEMovement1d4bb
call DecodeRLEList
dec a
- ld [$cd38], a
+ ld [wcd38], a
call Func_3486
ld a, $1
ld [W_VIRIDIANMARKETCURSCRIPT], a
@@ -46,7 +46,7 @@
db $ff
ViridianMartScript1: ; 1d4c0 (7:54c0)
- ld a, [$cd38]
+ ld a, [wcd38]
and a
ret nz
call Delay3
@@ -55,7 +55,7 @@
call DisplayTextID
ld bc, (OAKS_PARCEL << 8) + 1
call GiveItem
- ld hl, $d74e
+ ld hl, wd74e
set 1, [hl]
ld a, $2
ld [W_VIRIDIANMARKETCURSCRIPT], a
--- a/text.asm
+++ b/text.asm
@@ -35,7 +35,7 @@
done
_TrainerNameText:: ; 80045 (20:4045)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text ": @@"
_NoNibbleText:: ; 8004d (20:404d)
@@ -80,7 +80,7 @@
_FoundItemText:: ; 80119 (20:4119)
text $52, " found"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_NoMoreRoomForItemText:: ; 8012a (20:412a)
@@ -100,7 +100,7 @@
cont "I'm supposed to"
cont "give you an"
cont "@"
- TX_RAM $cc5b
+ TX_RAM wcc5b
text "!"
para "So, ", $52, "! Have"
@@ -124,7 +124,7 @@
text " kinds"
line "if you want the"
cont "@"
- TX_RAM $cc5b
+ TX_RAM wcc5b
text "."
done
@@ -136,7 +136,7 @@
db $0
line "kinds, come back"
cont "for @"
- TX_RAM $cc5b
+ TX_RAM wcc5b
text "."
done
@@ -154,7 +154,7 @@
_OaksAideGotItemText:: ; 802d9 (20:42d9)
text $52, " got the"
line "@"
- TX_RAM $cc5b
+ TX_RAM wcc5b
text "!@@"
_OaksAideNoRoomText:: ; 802ec (20:42ec)
@@ -162,7 +162,7 @@
line "don't have any"
cont "room for the"
cont "@"
- TX_RAM $cc5b
+ TX_RAM wcc5b
text "."
done
@@ -247,7 +247,7 @@
TX_RAM W_TRAINERNAME
db $0
line "used @"
- TX_RAM $CD6D
+ TX_RAM wcd6d
db $0
cont "on @"
TX_RAM W_ENEMYMONNAME
@@ -255,10 +255,10 @@
prompt
_TradeWentToText:: ; 880ef (22:40ef)
- TX_RAM $cf4b
+ TX_RAM wcf4b
text " went"
line "to @"
- TX_RAM $d887
+ TX_RAM W_GRASSRATE
text "."
done
@@ -265,26 +265,26 @@
_TradeForText:: ; 88103 (22:4103)
text "For ", $52, "'s"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text ","
done
_TradeSendsText:: ; 88112 (22:4112)
- TX_RAM $d887
+ TX_RAM W_GRASSRATE
text " sends"
line "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "."
done
_TradeWavesFarewellText:: ; 88124 (22:4124)
- TX_RAM $d887
+ TX_RAM W_GRASSRATE
text " waves"
line "farewell as"
done
_TradeTransferredText:: ; 8813b (22:413b)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " is"
line "transferred."
done
@@ -292,15 +292,15 @@
_TradeTakeCareText:: ; 88150 (22:4150)
text "Take good care of"
line "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "."
done
_TradeWillTradeText:: ; 8816a (22:416a)
- TX_RAM $d887
+ TX_RAM W_GRASSRATE
text " will"
line "trade @"
- TX_RAM $cd6d
+ TX_RAM wcd6d
db $0
done
@@ -307,7 +307,7 @@
_TradeforText:: ; 88180 (22:4180)
text "for ", $52, "'s"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "."
done
@@ -343,7 +343,7 @@
_LinedUpText:: ; 88206 (22:4206)
text " lined up!"
line "Scored @"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text " coins!"
done
@@ -356,10 +356,10 @@
_DexSeenOwnedText:: ; 8823e (22:423e)
text "#DEX Seen:@"
- TX_NUM $cc5b, 1, 3
+ TX_NUM wcc5b, 1, 3
db $0
line " Owned:@"
- TX_NUM $cc5c, 1, 3
+ TX_NUM wcc5c, 1, 3
db "@"
_DexRatingText:: ; 88267 (22:4267)
@@ -980,7 +980,7 @@
_FoundHiddenItemText:: ; 894d0 (22:54d0)
text $52, " found"
line "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "!@@"
_HiddenItemBagFullText:: ; 894e1 (22:54e1)
@@ -1296,7 +1296,7 @@
_MoveIsDisabledText:: ; 89a29 (22:5a29)
text $5a, "'s"
line "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " is"
cont "disabled!"
prompt
@@ -1317,7 +1317,7 @@
cont "@@"
_CF4BText:: ; 89a62 (22:5a62)
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "@"
_ExclamationPoint1Text:: ; 89a67 (22:5a67)
@@ -1422,12 +1422,12 @@
_HitXTimesText:: ; 89baf (22:5baf)
text "Hit @"
- TX_NUM $cd05, 1, 1
+ TX_NUM wcd05, 1, 1
text " times!"
prompt
_GainedText:: ; 89bc2 (22:5bc2)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " gained"
line "@@"
@@ -1439,15 +1439,15 @@
text "a boosted"
cont "@@"
_ExpPointsText:: ; 89bee (22:5bee)
- TX_NUM $cf4b, 2, 4
+ TX_NUM wcf4b, 2, 4
text " EXP. Points!"
prompt
_GrewLevelText:: ; 89c01 (22:5c01)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " grew"
line "to level @"
- TX_NUM $d127, 1, 3
+ TX_NUM W_CURENEMYLVL, 1, 3
text "!@@"
_WildMonAppearedText:: ; 89c1d (22:5c1d)
@@ -1593,7 +1593,7 @@
done
_PotionText:: ; 89e31 (22:5e31)
- TX_RAM $cd6d
+ TX_RAM wcd6d
db $0
line "recovered by @"
TX_NUM wHPBarHPDifference, 2, 3
@@ -1601,52 +1601,52 @@
done
_AntidoteText:: ; 89e4b (22:5e4b)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " was"
line "cured of poison!"
done
_ParlyzHealText:: ; 89e65 (22:5e65)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "'s"
line "rid of paralysis!"
done
_BurnHealText:: ; 89e7d (22:5e7d)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "'s"
line "burn was healed!"
done
_IceHealText:: ; 89e94 (22:5e94)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " was"
line "defrosted!"
done
_AwakeningText:: ; 89ea8 (22:5ea8)
- TX_RAM $cd6d
+ TX_RAM wcd6d
db $0
line "woke up!"
done
_FullHealText:: ; 89eb6 (22:5eb6)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "'s"
line "health returned!"
done
_ReviveText:: ; 89ecd (22:5ecd)
- TX_RAM $cd6d
+ TX_RAM wcd6d
db $0
line "is revitalized!"
done
_RareCandyText:: ; 89ee2 (22:5ee2)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " grew"
line "to level @"
- TX_NUM $d127, $1,$3
+ TX_NUM W_CURENEMYLVL, $1,$3
text "!@@"
_TurnedOnPC1Text:: ; 89efe (22:5efe)
@@ -1697,7 +1697,7 @@
done
_ItemWasStoredText:: ; 8a000 (22:6000)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " was"
line "stored via PC."
prompt
@@ -1724,7 +1724,7 @@
_WithdrewItemText:: ; 8a07e (22:607e)
text "Withdrew"
line "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "."
prompt
@@ -1769,10 +1769,10 @@
done
_MonWasStoredText:: ; 0x8a159
- TX_RAM $cf4b
+ TX_RAM wcf4b
text " was"
line "stored in Box @"
- TX_RAM $cd3d
+ TX_RAM wWhichTrade
text "."
prompt
@@ -1787,11 +1787,11 @@
prompt
_MonIsTakenOutText:: ; 0x8a1b9
- TX_RAM $cf4b
+ TX_RAM wcf4b
text " is"
line "taken out."
cont "Got @"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "."
prompt
@@ -1816,19 +1816,19 @@
_OnceReleasedText:: ; 0x8a23d
text "Once released,"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text " is"
cont "gone forever. OK?"
done
_MonWasReleasedText:: ; 0x8a268
- TX_RAM $cf4b
+ TX_RAM wcf4b
text " was"
line "released outside."
cont "Bye @"
_CF4BExclamationText:: ; 8a288 (22:6288)
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!"
prompt
@@ -1852,7 +1852,7 @@
_SoYouWantPrizeText:: ; 8a2f6 (22:62f6)
text "So, you want"
line "@"
- TX_RAM $CD6D
+ TX_RAM wcd6d
text "?"
done
@@ -1905,7 +1905,7 @@
text "Do you want to"
line "give a nickname"
cont "to @"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "?"
done
@@ -1921,10 +1921,10 @@
prompt
_WillBeTradedText:: ; 8a677 (22:6677)
- TX_RAM $cd3f
+ TX_RAM wTrainerFacingDirection
text " and"
line "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " will"
cont "be traded."
done
@@ -2044,7 +2044,7 @@
line $4a, " BOX.@@"
_EvolvedText:: ; 946c2 (25:46c2)
- TX_RAM $cf4b
+ TX_RAM wcf4b
text " evolved"
done
@@ -2051,13 +2051,13 @@
_IntoText:: ; 946cf (25:46cf)
db $0
line "into @"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "!"
done
_StoppedEvolvingText:: ; 946dd (25:46dd)
text "Huh? @"
- TX_RAM $cf4b
+ TX_RAM wcf4b
db $0
line "stopped evolving!"
prompt
@@ -2064,7 +2064,7 @@
_IsEvolvingText:: ; 946fb (25:46fb)
text "What? @"
- TX_RAM $cf4b
+ TX_RAM wcf4b
db $0
line "is evolving!"
done
@@ -2107,7 +2107,7 @@
_MonsStatsRoseText:: ; 94795 (25:4795)
text $5a, "'s"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "@@"
_GreatlyRoseText:: ; 947a0 (25:47a0)
@@ -2120,7 +2120,7 @@
_MonsStatsFellText:: ; 947b3 (25:47b3)
text $59, "'s"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "@@"
_GreatlyFellText:: ; 947be (25:47be)
@@ -2187,7 +2187,7 @@
text $5a
line "learned"
cont "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "!"
prompt
@@ -2194,7 +2194,7 @@
_MoveWasDisabledText:: ; 9489e (25:489e)
text $59, "'s"
line "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " was"
cont "disabled!"
prompt
@@ -2297,7 +2297,7 @@
text $5a
line "transformed into"
cont "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "!"
prompt
@@ -2441,7 +2441,7 @@
done
_PokemonFaintedText:: ; a25b7 (28:65b7)
- TX_RAM $cd6d
+ TX_RAM wcd6d
db $0
line "fainted!"
done
@@ -2464,7 +2464,7 @@
done
_PokemartTellBuyPriceText:: ; a2619 (28:6619)
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "?"
line "That will be"
cont "¥@"
@@ -2519,10 +2519,10 @@
done
_LearnedMove1Text:: ; a273b (28:673b)
- TX_RAM $d036
+ TX_RAM wd036
text " learned"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_WhichMoveToForgetText:: ; a2750 (28:6750)
@@ -2533,29 +2533,29 @@
_AbandonLearningText:: ; a2771 (28:6771)
text "Abandon learning"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "?"
done
_DidNotLearnText:: ; a278a (28:678a)
- TX_RAM $d036
+ TX_RAM wd036
db $0
line "did not learn"
cont "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!"
prompt
_TryingToLearnText:: ; a27a4 (28:67a4)
- TX_RAM $d036
+ TX_RAM wd036
text " is"
line "trying to learn"
cont "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!"
para "But, @"
- TX_RAM $d036
+ TX_RAM wd036
db $0
line "can't learn more"
cont "than 4 moves!"
@@ -2563,7 +2563,7 @@
para "Delete an older"
line "move to make room"
cont "for @"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "?"
done
@@ -2576,10 +2576,10 @@
_ForgotAndText:: ; a2830 (28:6830)
db $0
para "@"
- TX_RAM $d036
+ TX_RAM wd036
text " forgot"
line "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "!"
para "And..."
@@ -2667,12 +2667,12 @@
done
_UsedStrengthText:: ; a403c (29:403c)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " used"
line "STRENGTH.@@"
_CanMoveBouldersText:: ; a4051 (29:4051)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " can"
line "move boulders."
prompt
@@ -2698,13 +2698,13 @@
done
_CannotUseTeleportNowText:: ; a40eb (29:40eb)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " can't"
line "use TELEPORT now."
prompt
_CannotFlyHereText:: ; a4107 (29:4107)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " can't"
line "FLY here."
prompt
@@ -2732,7 +2732,7 @@
_GotMonText:: ; a4180 (29:4180)
text $52, " got"
line "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "!@@"
_SetToBoxText:: ; a418f (29:418f)
@@ -2743,7 +2743,7 @@
text " was"
cont "sent to #MON"
cont "BOX @"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text " on PC!"
done
@@ -2829,7 +2829,7 @@
_SurfingGotOnText:: ; a685e (29:685e)
text $52, " got on"
line "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "!"
prompt
@@ -2839,10 +2839,10 @@
prompt
_VitaminStatRoseText:: ; a688c (29:688c)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "'s"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text " rose."
prompt
@@ -2907,13 +2907,13 @@
done
_PPMaxedOutText:: ; a69e2 (29:69e2)
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "'s PP"
line "is maxed out."
prompt
_PPIncreasedText:: ; a69f9 (29:69f9)
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "'s PP"
line "increased."
prompt
@@ -2933,26 +2933,26 @@
_TeachMachineMoveText:: ; a6a42 (29:6a42)
text "It contained"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!"
para "Teach @"
- TX_RAM $cf4b
+ TX_RAM wcf4b
db $0
line "to a #MON?"
done
_MonCannotLearnMachineMoveText:: ; a6a6e (29:6a6e)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " is not"
line "compatible with"
cont "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "."
para "It can't learn"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "."
prompt
@@ -2989,7 +2989,7 @@
_NoSurfingHereText:: ; a6b4e (29:6b4e)
text "No SURFing on"
line "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " here!"
prompt
@@ -3006,7 +3006,7 @@
text $52," used@@"
_ItemUseText002:: ; a8009 (2a:4009)
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!"
done
@@ -3014,7 +3014,7 @@
text $52, " got on the@@"
_GotOnBicycleText2:: ; a801e (2a:401e)
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!"
prompt
@@ -3023,7 +3023,7 @@
_GotOffBicycleText2:: ; a8030 (2a:4030)
text "the @"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "."
prompt
@@ -3030,7 +3030,7 @@
_ThrewAwayItemText:: ; a803c (2a:403c)
text "Threw away"
line "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "."
prompt
@@ -3037,7 +3037,7 @@
_IsItOKToTossItemText:: ; a804f (2a:404f)
text "Is it OK to toss"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "?"
prompt
@@ -3047,10 +3047,10 @@
prompt
_AlreadyKnowsText:: ; a8088 (2a:4088)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " knows"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!"
prompt
@@ -3062,21 +3062,21 @@
_TradedForText:: ; a80bc (2a:40bc)
text $52, " traded"
line "@"
- TX_RAM $cd13
+ TX_RAM wcd13
text " for"
cont "@"
- TX_RAM $cd1e
+ TX_RAM wPlayerMonAccuracyMod
text "!@@"
_WannaTrade1Text:: ; a80d8 (2a:40d8)
text "I'm looking for"
line "@"
- TX_RAM $cd13
+ TX_RAM wcd13
text "! Wanna"
para "trade one for"
line "@"
- TX_RAM $cd1e
+ TX_RAM wPlayerMonAccuracyMod
text "? "
done
@@ -3088,7 +3088,7 @@
_WrongMon1Text:: ; a811d (2a:411d)
text "What? That's not"
line "@"
- TX_RAM $cd13
+ TX_RAM wcd13
text "!"
para "If you get one,"
@@ -3102,7 +3102,7 @@
_AfterTrade1Text:: ; a8162 (2a:4162)
text "Isn't my old"
line "@"
- TX_RAM $cd1e
+ TX_RAM wPlayerMonAccuracyMod
text " great?"
done
@@ -3111,10 +3111,10 @@
line "you want to trade"
para "your @"
- TX_RAM $cd13
+ TX_RAM wcd13
db $0
line "for @"
- TX_RAM $cd1e
+ TX_RAM wPlayerMonAccuracyMod
text "?"
done
@@ -3126,7 +3126,7 @@
_WrongMon2Text:: ; a81d3 (2a:41d3)
text "Hmmm? This isn't"
line "@"
- TX_RAM $cd13
+ TX_RAM wcd13
text "."
para "Think of me when"
@@ -3139,7 +3139,7 @@
_AfterTrade2Text:: ; a8212 (2a:4212)
text "The @"
- TX_RAM $cd13
+ TX_RAM wcd13
text " you"
line "traded to me"
@@ -3149,12 +3149,12 @@
_WannaTrade3Text:: ; a8240 (2a:4240)
text "Hi! Do you have"
line "@"
- TX_RAM $cd13
+ TX_RAM wcd13
text "?"
para "Want to trade it"
line "for @"
- TX_RAM $cd1e
+ TX_RAM wPlayerMonAccuracyMod
text "?"
done
@@ -3165,7 +3165,7 @@
_WrongMon3Text:: ; a8284 (2a:4284)
text "...This is no"
line "@"
- TX_RAM $cd13
+ TX_RAM wcd13
text "."
para "If you get one,"
@@ -3179,11 +3179,11 @@
_AfterTrade3Text:: ; a82c9 (2a:42c9)
text "How is my old"
line "@"
- TX_RAM $cd1e
+ TX_RAM wPlayerMonAccuracyMod
text "?"
para "My @"
- TX_RAM $cd13
+ TX_RAM wcd13
text " is"
line "doing great!"
done
@@ -3194,7 +3194,7 @@
prompt
_UsedCutText:: ; a8315 (2a:4315)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " hacked"
line "away with CUT!"
prompt
--- a/text/maps/bills_house.asm
+++ b/text/maps/bills_house.asm
@@ -56,7 +56,7 @@
_SSTicketReceivedText:: ; 8d499 (23:5499)
text $52, " received"
line "an @"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_SSTicketNoRoomText:: ; 8d4b0 (23:54b0)
--- a/text/maps/blues_house.asm
+++ b/text/maps/blues_house.asm
@@ -14,7 +14,7 @@
_GotMapText::
text $52," got a"
line "@"
- TX_RAM $CF4B
+ TX_RAM wcf4b
text "!@@"
_DaisyBagFullText::
--- a/text/maps/celadon_city.asm
+++ b/text/maps/celadon_city.asm
@@ -42,7 +42,7 @@
_ReceivedTM41Text:: ; a5b5a (29:5b5a)
text $52, " received"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_TM41ExplanationText:: ; a5b6e (29:5b6e)
--- a/text/maps/celadon_dept_store_3f.asm
+++ b/text/maps/celadon_dept_store_3f.asm
@@ -10,7 +10,7 @@
_ReceivedTM18Text:: ; 9c85a (27:485a)
text $52, " received"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_TM18ExplanationText:: ; 9c86e (27:486e)
--- a/text/maps/celadon_dept_store_roof.asm
+++ b/text/maps/celadon_dept_store_roof.asm
@@ -16,13 +16,13 @@
_CeladonMartRoofText_484f9:: ; 9cc06 (27:4c06)
text $52, " received"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_CeladonMartRoofText_484fe:: ; 9cc1a (27:4c1a)
db $0
para "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text " contains"
line "ICE BEAM!"
@@ -42,13 +42,13 @@
_CeladonMartRoofText_4850a:: ; 9cc91 (27:4c91)
text $52, " received"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_CeladonMartRoofText_4850f:: ; 9cca5 (27:4ca5)
db $0
para "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text " contains"
line "ROCK SLIDE!"
@@ -123,7 +123,7 @@
done
_VendingMachineText5:: ; 9ceaf (27:4eaf)
- TX_RAM $cf4b
+ TX_RAM wcf4b
db $0
line "popped out!"
done
--- a/text/maps/celadon_diner.asm
+++ b/text/maps/celadon_diner.asm
@@ -44,7 +44,7 @@
_ReceivedCoinCaseText:: ; 9e07a (27:607a)
text $52, " received"
line "a @"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_CoinCaseNoRoomText:: ; 9e090 (27:6090)
--- a/text/maps/celadon_gym.asm
+++ b/text/maps/celadon_gym.asm
@@ -64,7 +64,7 @@
_ReceivedTM21Text:: ; 9d50c (27:550c)
text $52, " received"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_TM21ExplanationText:: ; 9d520 (27:5520)
--- a/text/maps/champion.asm
+++ b/text/maps/champion.asm
@@ -96,7 +96,7 @@
line "much since you"
cont "first left with"
cont "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "!"
para $52, ", you have"
--- a/text/maps/cinnabar_gym.asm
+++ b/text/maps/cinnabar_gym.asm
@@ -44,7 +44,7 @@
_ReceivedTM38Text:: ; a09a8 (28:49a8)
text $52, " received"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_TM38ExplanationText:: ; a09bc (28:49bc)
--- a/text/maps/cinnabar_lab_fossil_room.asm
+++ b/text/maps/cinnabar_lab_fossil_room.asm
@@ -30,7 +30,7 @@
line "back to life!"
para "It was @"
- TX_RAM $cf4b
+ TX_RAM wcf4b
db $0
line "like I think!"
prompt
@@ -38,12 +38,12 @@
_Lab4Text_610ae:: ; a11d6 (28:51d6)
text "Oh! That is"
line "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "!"
para "It is fossil of"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text ", a"
cont "#MON that is"
cont "already extinct!"
@@ -60,7 +60,7 @@
para $52, " handed"
line "over @"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "!"
prompt
--- a/text/maps/cinnabar_lab_metronome_room.asm
+++ b/text/maps/cinnabar_lab_metronome_room.asm
@@ -9,7 +9,7 @@
_ReceivedTM35Text:: ; a0f48 (28:4f48)
text $52, " received "
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_TM35ExplanationText:: ; a0f5d (28:4f5d)
--- a/text/maps/copycats_house_2f.asm
+++ b/text/maps/copycats_house_2f.asm
@@ -29,7 +29,7 @@
_ReceivedTM31Text:: ; a1675 (28:5675)
text $52, " received"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_TM31ExplanationText1:: ; a1689 (28:5689)
--- a/text/maps/daycare_1.asm
+++ b/text/maps/daycare_1.asm
@@ -13,7 +13,7 @@
_DayCareMText_56419:: ; 8abf0 (22:6bf0)
text "Fine, I'll look"
line "after @"
- TX_RAM $cd6d
+ TX_RAM wcd6d
db $0
cont "for a while."
prompt
@@ -25,7 +25,7 @@
_DayCareMText_56423:: ; 8ac32 (22:6c32)
text "Your @"
- TX_RAM $cd6d
+ TX_RAM wcd6d
db $0
line "has grown a lot!"
@@ -33,7 +33,7 @@
line "grown by @"
DayCareMText_8ac67:: ; 8ac67 (22:6c67)
- TX_NUM $cd3e,$1,$3
+ TX_NUM wTrainerEngageDistance,$1,$3
text "!"
para "Aren't I great?"
@@ -57,7 +57,7 @@
_DayCareMText_56432:: ; 8acc1 (22:6cc1)
text "Back already?"
line "Your @"
- TX_RAM $cd6d
+ TX_RAM wcd6d
db $0
cont "needs some more"
cont "time with me."
--- a/text/maps/fan_club.asm
+++ b/text/maps/fan_club.asm
@@ -85,7 +85,7 @@
ReceivedBikeVoucherText::
text $52, " received"
line "a @"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
ExplainBikeVoucherText::
--- a/text/maps/fuchsia_fishing_house.asm
+++ b/text/maps/fuchsia_fishing_house.asm
@@ -19,7 +19,7 @@
para $52, " received"
line "a @"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_FuchsiaHouse3Text_56212:: ; a0737 (28:4737)
--- a/text/maps/fuchsia_gym_2.asm
+++ b/text/maps/fuchsia_gym_2.asm
@@ -27,7 +27,7 @@
_ReceivedTM06Text:: ; a00eb (28:40eb)
text $52, " received"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_TM06ExplanationText:: ; a00ff (28:40ff)
--- a/text/maps/fujis_house.asm
+++ b/text/maps/fujis_house.asm
@@ -48,7 +48,7 @@
_ReceivedFluteText:: ; 99ffb (26:5ffb)
text $52, " received"
line "a @"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_FluteExplanationText:: ; 9a011 (26:6011)
--- a/text/maps/mr_psychics_house.asm
+++ b/text/maps/mr_psychics_house.asm
@@ -8,7 +8,7 @@
_ReceivedTM29Text:: ; a252a (28:652a)
text $52, " received"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_TM29ExplanationText:: ; a253e (28:653e)
--- a/text/maps/mt_moon_b2f.asm
+++ b/text/maps/mt_moon_b2f.asm
@@ -11,7 +11,7 @@
_MtMoon3Text_49f6f:: ; 80995 (20:4995)
text $52, " got the"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_MtMoon3Text_49f7f:: ; 809a8 (20:49a8)
--- a/text/maps/name_rater.asm
+++ b/text/maps/name_rater.asm
@@ -14,7 +14,7 @@
prompt
_NameRaterText_1dabd:: ; 9a37f (26:637f)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text ", is it?"
line "That is a decent"
cont "nickname!"
@@ -35,7 +35,7 @@
text "OK! This #MON"
line "has been renamed"
cont "@"
- TX_RAM $cee9
+ TX_RAM wHPBarMaxHP
text "!"
para "That's a better"
@@ -48,7 +48,7 @@
done
_NameRaterText_1dad1:: ; 9a46b (26:646b)
- TX_RAM $cd6d
+ TX_RAM wcd6d
text ", is it?"
line "That is a truly"
cont "impeccable name!"
@@ -55,7 +55,7 @@
para "Take good care of"
line "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "!"
done
--- a/text/maps/oaks_lab.asm
+++ b/text/maps/oaks_lab.asm
@@ -51,7 +51,7 @@
_OaksLabReceivedMonText:: ; 94ea0 (25:4ea0)
text $52, " received"
line "a @"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "!@@"
_OaksLabLastMonText:: ; 94eb6 (25:4eb6)
@@ -240,7 +240,7 @@
_OaksLabRivalReceivedMonText:: ; 95461 (25:5461)
text $53, " received"
line "a @"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "!@@"
_OaksLabRivalChallengeText:: ; 95477 (25:5477)
--- a/text/maps/route_1.asm
+++ b/text/maps/route_1.asm
@@ -15,7 +15,7 @@
_Route1Text_1cae8:: ; 8d643 (23:5643)
text $52, " got"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_Route1Text_1caee:: ; 8d652 (23:5652)
--- a/text/maps/route_12_house.asm
+++ b/text/maps/route_12_house.asm
@@ -18,7 +18,7 @@
para $52, " received"
line "a @"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_Route12HouseText_564ca:: ; 8ca4f (23:4a4f)
--- a/text/maps/route_23.asm
+++ b/text/maps/route_23.asm
@@ -2,12 +2,12 @@
text "You can pass here"
line "only if you have"
cont "the @"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "!"
para "You don't have the"
line "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text " yet!"
para "You have to have"
@@ -18,12 +18,12 @@
text "You can pass here"
line "only if you have"
cont "the @"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "!"
para "Oh! That is the"
line "@"
- TX_RAM $cd6d
+ TX_RAM wcd6d
text "!@@"
_VictoryRoadGuardText_513a3:: ; 926dd (24:66dd)
--- a/text/maps/route_24_1.asm
+++ b/text/maps/route_24_1.asm
@@ -12,7 +12,7 @@
_Route24Text_5151a:: ; 92779 (24:6779)
text $52, " received"
line "a @"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_Route24Text_51521:: ; 9278f (24:678f)
--- a/text/maps/safari_zone_secret_house.asm
+++ b/text/maps/safari_zone_secret_house.asm
@@ -17,7 +17,7 @@
_ReceivedHM03Text:: ; 85943 (21:5943)
text $52, " received"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_HM03ExplanationText:: ; 85957 (21:5957)
--- a/text/maps/silph_co_11f.asm
+++ b/text/maps/silph_co_11f.asm
@@ -22,7 +22,7 @@
_ReceivedSilphCoMasterBallText:: ; 84f63 (21:4f63)
text $52, " got a"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_SilphCo10Text_6231c:: ; 84f74 (21:4f74)
--- a/text/maps/silph_co_2f.asm
+++ b/text/maps/silph_co_2f.asm
@@ -12,7 +12,7 @@
_ReceivedTM36Text:: ; 824ba (20:64ba)
text $52, " got"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_TM36ExplanationText:: ; 824c9 (20:64c9)
--- a/text/maps/ss_anne_7.asm
+++ b/text/maps/ss_anne_7.asm
@@ -33,7 +33,7 @@
_ReceivedHM01Text:: ; 8140d (20:540d)
text $52, " got"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_SSAnne7Text_61932:: ; 8141c (20:541c)
--- a/text/maps/vermilion_fishing_house.asm
+++ b/text/maps/vermilion_fishing_house.asm
@@ -18,7 +18,7 @@
para $52, " received"
line "an @"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_VermilionHouse2Text_560bb:: ; 9c5a4 (27:45a4)
--- a/text/maps/vermilion_gym_2.asm
+++ b/text/maps/vermilion_gym_2.asm
@@ -26,7 +26,7 @@
_ReceivedTM24Text:: ; 9c0e0 (27:40e0)
text $52, " received "
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_TM24ExplanationText:: ; 9c0f5 (27:40f5)
--- a/text/maps/wardens_house.asm
+++ b/text/maps/wardens_house.asm
@@ -44,7 +44,7 @@
_ReceivedHM04Text:: ; 9e5a2 (27:65a2)
text $52, " received"
line "@"
- TX_RAM $cf4b
+ TX_RAM wcf4b
text "!@@"
_HM04ExplanationText:: ; 9e5b6 (27:65b6)
--- a/wram.asm
+++ b/wram.asm
@@ -1,10 +1,73 @@
INCLUDE "constants/wram_constants.asm"
+flag_array: MACRO
+ ds ((\1) + 7) / 8
+ENDM
+
SECTION "WRAM Bank 0", WRAM0
- ds 256
+wc000:: ds 1
+wc001:: ds 1
+wc002:: ds 1
+wc003:: ds 1
+wc004:: ds 1
+wc005:: ds 1
+wc006:: ds 8
+wc00e:: ds 4
+wc012:: ds 4
+wc016:: ds 16
+wc026:: ds 1
+wc027:: ds 1
+wc028:: ds 2
+wc02a:: ds 1
+wc02b:: ds 1
+wc02c:: ds 1
+wc02d:: ds 1
+wc02e:: ds 8
+wc036:: ds 8
+wc03e:: ds 8
+wc046:: ds 8
+wc04e:: ds 8
+wc056:: ds 8
+wc05e:: ds 8
+wc066:: ds 8
+wc06e:: ds 8
+wc076:: ds 8
+wc07e:: ds 8
+wc086:: ds 8
+wc08e:: ds 8
+wc096:: ds 8
+wc09e:: ds 8
+wc0a6:: ds 8
+wc0ae:: ds 8
+wc0b6:: ds 8
+wc0be:: ds 8
+wc0c6:: ds 8
+wc0ce:: ds 1
+wc0cf:: ds 1
+wc0d0:: ds 1
+wc0d1:: ds 1
+wc0d2:: ds 1
+wc0d3:: ds 1
+wc0d4:: ds 1
+wc0d5:: ds 1
+wc0d6:: ds 8
+wc0de:: ds 8
+wc0e6:: ds 1
+wc0e7:: ds 1
+wc0e8:: ds 1
+wc0e9:: ds 1
+wc0ea:: ds 1
+wc0eb:: ds 1
+wc0ec:: ds 1
+wc0ed:: ds 1
+wc0ee:: ds 1
+wc0ef:: ds 1
+wc0f0:: ds 1
+wc0f1:: ds 1
+wc0f2:: ds 14
SECTION "Sprite State Data", WRAM0[$c100]
@@ -72,9 +135,11 @@
; (e.g. if menus are drawn on top)
ds 20 * 18
-; c670
+ ds 120
- ds 1420
+wTempPic::
+wOverworldMap:: ; c6e8
+ ds 1300
wScreenEdgeTiles:: ; cbfc
; the tiles of the row or column to be redrawn by RedrawExposedScreenEdge
@@ -109,10 +174,10 @@
; id of previously selected menu item
ds 1
-; cc2b
+wcc2b:: ds 1
+wcc2c:: ds 1
+wcc2d:: ds 1
- ds 3
-
wPlayerMoveListIndex:: ; cc2e
ds 1
@@ -129,7 +194,7 @@
; how many times should HandleMenuInput poll the joypad state before it returns?
ds 1
- ds 1
+wcc35:: ds 1
wListScrollOffset:: ; cc36
; offset of the current top menu item from the beginning of the list
@@ -136,7 +201,18 @@
; keeps track of what section of the list is on screen
ds 1
- ds 19
+wcc37:: ds 1
+wcc38:: ds 2
+wcc3a:: ds 1
+wcc3b:: ds 1
+wcc3c:: ds 1
+wcc3d:: ds 1
+wcc3e:: ds 4
+wcc42:: ds 1
+wcc43:: ds 4
+wcc47:: ds 1
+wcc48:: ds 1
+wcc49:: ds 1
wMenuWrappingEnabled:: ; cc4a
; set to 1 if you can go from the bottom to the top or top to bottom of a menu
@@ -143,7 +219,8 @@
; set to 0 if you can't go past the top or bottom of the menu
ds 1
- ds 3
+wcc4b:: ds 2
+wcc4d:: ds 1
wPredefID:: ; cc4e
ds 1
@@ -153,14 +230,25 @@
wTrainerHeaderFlagBit:: ; cc55
ds 1
-; cc56
+ ds 1
- ds 124
+wcc57:: ds 1
+wcc58:: ds 3
+wcc5b:: ds 1
+wcc5c:: ds 1
+wcc5d:: ds 1
+wcc5e:: ds 13
+wcc6b:: ds 14
+wcc79:: ds 30
+wcc97:: ds 10
+wcca1:: ds 49
wRLEByteCount:: ; ccd2
ds 1
- ds 4
+wccd3:: ds 1
+wccd4:: ds 1
+wccd5:: ds 2
; current HP of player and enemy substitutes
wPlayerSubstituteHP:: ; ccd7
@@ -168,7 +256,7 @@
wEnemySubstituteHP:: ; ccd8
ds 1
- ds 2
+wccd9:: ds 2
wMoveMenuType:: ; ccdb
; 0=regular, 1=mimic, 2=above message box (relearn, heal pp..)
@@ -179,7 +267,7 @@
wEnemySelectedMove:: ; ccdd
ds 1
- ds 1
+wccde:: ds 1
wAICount:: ; ccdf
; number of times remaining that AI action can occur
@@ -190,10 +278,33 @@
wEnemyMoveListIndex:: ; cce2
ds 1
-; cce3
+wcce3:: ds 1
+wcce4:: ds 1
+wcce5:: ds 2
+wcce7:: ds 1
+wcce8:: ds 1
+wcce9:: ds 2
+wcceb:: ds 1
+wccec:: ds 1
+wcced:: ds 1
+wccee:: ds 1
+wccef:: ds 1
+wccf0:: ds 1
+wccf1:: ds 1
+wccf2:: ds 1
+wccf3:: ds 1
+wccf4:: ds 1
+wccf5:: ds 1
+wccf6:: ds 1
+wccf7:: ds 14
+wcd05:: ds 1
+wcd06:: ds 9
+wcd0f:: ds 1
+wcd10:: ds 1
+wcd11:: ds 1
+wcd12:: ds 1
+wcd13:: ds 7
- ds 55
-
; stat modifiers for the player's current pokemon
; value can range from 1 - 13 ($1 to $D)
; 7 is normal
@@ -212,8 +323,12 @@
wPlayerMonEvasionMod:: ; cd1f
ds 1
- ds 13
+ ds 3
+wcd23:: ds 3
+wcd26:: ds 3
+wcd29:: ds 4
+
wEngagedTrainerClass:: ; cd2d
ds 1
wEngagedTrainerSet:: ; cd2e
@@ -237,7 +352,12 @@
wEnemyMonEvasionMod:: ; cd33
ds 1
- ds 9
+wcd34:: ds 3
+wcd37:: ds 1
+wcd38:: ds 1
+wcd39:: ds 1
+wcd3a:: ds 1
+wcd3b:: ds 2
wWhichTrade:: ; cd3d
; which entry from TradeMons to select
@@ -254,19 +374,47 @@
wTrainerScreenX:: ; cd41
ds 1
- ds 30
+wcd42:: ds 1
+wcd43:: ds 1
+wcd44:: ds 1
+wcd45:: ds 1
+wcd46:: ds 1
+wcd47:: ds 1
+wcd48:: ds 1
+wcd49:: ds 1
+wcd4a:: ds 1
+wcd4b:: ds 1
+wcd4c:: ds 1
+wcd4d:: ds 1
+wcd4e:: ds 1
+wcd4f:: ds 1
+wcd50:: ds 9
+wcd59:: ds 1
+wcd5a:: ds 1
+wcd5b:: ds 1
+wcd5c:: ds 1
+wcd5d:: ds 1
+wcd5e:: ds 1
+wcd5f:: ds 1
wFlags_0xcd60:: ; cd60
-; bit 0: is player engaged by trainer (to avoid being engaged by multiple trainers simultaniously)
+; bit 0: is player engaged by trainer (to avoid being engaged by multiple trainers simultaneously)
ds 1
- ds 10
+ ds 9
+wcd6a:: ds 1
+
wJoyIgnore:: ; cd6b
; Set buttons are ignored.
ds 1
- ds 21
+wcd6c:: ds 1
+wcd6d:: ds 4
+wcd71:: ds 1
+wcd72:: ds 5
+wcd77:: ds 1
+wcd78:: ds 9
wTileMapBackup2:: ; cd81
; second buffer for temporarily saving and restoring current screen's tiles (e.g. if menus are drawn on top)
@@ -282,32 +430,62 @@
ds 2
wHPBarDelta:: ; ceef
ds 1
- ds 13
+
+wcef0:: ds 1
+wcef1:: ds 12
+
wHPBarHPDifference:: ; cefd
ds 1
- ds 9
+ ds 7
+wcf05:: ds 1
+wcf06:: ds 1
+
wAnimSoundID:: ; cf07
; sound ID during battle animations
ds 1
- ds 10
+wcf08:: ds 1
+wcf09:: ds 1
+wcf0a:: ds 1
+wcf0b:: ds 1
+wcf0c:: ds 1
+wcf0d:: ds 1
+wcf0e:: ds 1
+wcf0f:: ds 1
+wcf10:: ds 1
+wcf11:: ds 1
wPredefParentBank:: ; cf12
ds 1
- ds 1
+wcf13:: ds 1
wCurSpriteMovement2:: ; cf14
; movement byte 2 of current sprite
ds 1
- ds 5
+ ds 2
+wcf17:: ds 1
+wcf18:: ds 2
+
wGBC:: ; cf1a
ds 1
- ds 68
+wcf1b:: ds 1
+wcf1c:: ds 1
+wcf1d:: ds 1
+wcf1e:: ds 1
+wcf1f:: ds 6
+wcf25:: ds 8
+wcf2d:: ds 1
+wcf2e:: ds 2
+wcf30:: ds 7
+wcf37:: ds 20
+wcf4b:: ds 1
+wcf4c:: ds 1
+wcf4d:: ds 18
wGymCityName:: ; cf5f
wStringBuffer1:: ; cf5f
@@ -316,31 +494,62 @@
wStringBuffer2:: ; cf70
ds 16 + 1
wStringBuffer3:: ; cf81
- ds 16 + 1
+ ds 9 + 1
+wcf8b:: ds 1
+wcf8c:: ds 1
+wcf8d:: ds 1
+wcf8e:: ds 1
+wcf8f:: ds 1
+wcf90:: ds 1
+wcf91:: ds 1
+
wWhichPokemon:: ; cf92
; which pokemon you selected
ds 1
- ds 1
+wcf93:: ds 1
wListMenuID:: ; cf94
; ID used by DisplayListMenuID
ds 1
- ds 48
+wcf95:: ds 1
+wcf96:: ds 1
+wcf97:: ds 1
+wcf98:: ds 1
+wcf99:: ds 1
+wcf9a:: ds 1
+wcf9b:: ds 1
+wcf9c:: ds 4
+wcfa0:: ds 4
+wcfa4:: ds 2
+wcfa6:: ds 2
+wcfa8:: ds 7
+wcfaf:: ds 10
+wcfb9:: ds 1
+wcfba:: ds 1
+wcfbb:: ds 1
+wcfbc:: ds 2
+wcfbe:: ds 2
+wcfc0:: ds 2
+wcfc2:: ds 2
+wcfc4:: ds 1
wWalkCounter:: ; cfc5
; walk animation counter
ds 1
- ds 1
+wcfc6:: ds 1
wMusicHeaderPointer:: ; cfc7
; (the current music channel address - $4000) / 3
ds 1
- ds 4
+wcfc8:: ds 1
+wcfc9:: ds 1
+wcfca:: ds 1
+wcfcb:: ds 1
W_ENEMYMOVENUM:: ; cfcc
ds 1
@@ -370,12 +579,12 @@
W_ENEMYMONID:: ; cfd8
ds 1
- ds 1
+wcfd9:: ds 1
W_ENEMYMONNAME:: ; cfda
ds 11
- ds 1
+wcfe5:: ds 1
W_ENEMYMONCURHP:: ; cfe6
; active opponent's hp (16 bits)
@@ -420,7 +629,9 @@
ds 2 ; W_ENEMYMONPP
- ds 7
+wd002:: ds 5
+wd007:: ds 1
+wd008:: ds 1
W_PLAYERMONNAME:: ; d009
ds 11
@@ -460,13 +671,18 @@
W_PLAYERMONPP:: ; d02d
ds 4
-
-
W_TRAINERCLASS:: ; d031
ds 1
- ds 24
+ ds 1
+wd033:: ds 1
+wd034:: ds 2
+wd036:: ds 16
+wd046:: ds 1
+wd047:: ds 1
+wd048:: ds 2
+
W_TRAINERNAME:: ; d04a
; 13 bytes for the letters of the opposing trainer
; the name is terminated with $50 with possible
@@ -494,7 +710,7 @@
; in safari battle, this is 2
ds 1
- ds 1
+wd05b:: ds 1
W_LONEATTACKNO:: ; d05c
; which entry in LoneAttacks to use
@@ -505,12 +721,13 @@
; which instance of [youngster, lass, etc] is this?
ds 1
- ds 1
+wd05e:: ds 1
W_MOVEMISSED:: ; d05f
ds 1
- ds 2
+wd060:: ds 1
+wd061:: ds 1
W_PLAYERBATTSTATUS1:: ; d062
; bit 0 - bide
@@ -540,7 +757,8 @@
; bit 3 - tranformed
ds 1
- ds 2
+wd065:: ds 1
+wd066:: ds 1
W_ENEMYBATTSTATUS1:: ; d067
ds 1
@@ -549,7 +767,8 @@
W_ENEMYBATTSTATUS3:: ; d069
ds 1
- ds 2
+wd06a:: ds 1
+wd06b:: ds 1
W_PLAYERTOXICCOUNTER:: ; d06c
ds 1
@@ -556,8 +775,11 @@
W_PLAYERDISABLEDMOVE:: ; d06d
ds 1
- ds 3
+ ds 1
+wd06f:: ds 1
+wd070:: ds 1
+
W_ENEMYTOXICCOUNTER:: ; d071
ds 1
W_ENEMYDISABLEDMOVE:: ; d072
@@ -569,13 +791,18 @@
; number of hits in attacks like Doubleslap, etc.
ds 1
- ds 7
+wd075:: ds 3
+wd078:: ds 1
+wd079:: ds 1
+wd07a:: ds 1
+wd07b:: ds 1
W_ANIMATIONID:: ; d07c
; ID number of the current battle animation
ds 1
- ds 4
+wd07d:: ds 1
+wd07e:: ds 3
; base coordinates of frame block
W_BASECOORDX:: ; d081
@@ -583,13 +810,13 @@
W_BASECOORDY:: ; d082
ds 1
- ds 1
+wd083:: ds 1
W_FBTILECOUNTER:: ; d084
; counts how many tiles of the current frame block have been drawn
ds 1
- ds 1
+wd085:: ds 1
W_SUBANIMFRAMEDELAY:: ; d086
; duration of each frame of the current subanimation in terms of screen refreshes
@@ -598,13 +825,13 @@
; counts the number of subentries left in the current subanimation
ds 1
- ds 1
+wd088:: ds 1
W_NUMFBTILES:: ; d089
; number of tiles in current battle animation frame block
ds 1
- ds 1
+wd08a:: ds 1
W_SUBANIMTRANSFORM:: ; d08b
; controls what transformations are applied to the subanimation
@@ -637,8 +864,11 @@
; the address of the current subentry of the current subanimation
ds 2
- ds 4
+ ds 2
+wd09a:: ds 1
+wd09b:: ds 1
+
W_FBDESTADDR:: ; d09c
; current destination address in OAM for frame blocks (big endian)
ds 2
@@ -655,20 +885,9 @@
; contain the upper and lower bit of each of the 8 pixels, respectively
ds 1
- ds 2
+wd09f:: ds 1
+wd0a0:: ds 1
-SECTION "Sprite Buffers", SRAM
-
-S_SPRITEBUFFER0:: ; a000
- ds SPRITEBUFFERSIZE
-S_SPRITEBUFFER1:: ; a188
- ds SPRITEBUFFERSIZE
-S_SPRITEBUFFER2:: ; a310
- ds SPRITEBUFFERSIZE
-
-
-SECTION "Sprites", WRAMX, BANK[1]
-
W_SPRITECURPOSX:: ; d0a1
ds 1
W_SPRITECURPOSY:: ; d0a2
@@ -716,7 +935,7 @@
; pointer to differential decoding table (assuming initial value 1)
ds 2
- ds 1
+wd0b5:: ds 1
W_LISTTYPE:: ; d0b6
ds 1
@@ -765,9 +984,10 @@
W_MONHLEARNSET:: ; d0cc
; bit field
- ds 7
+ flag_array 50 + 5
+ ds 1
- ds 4
+wd0d4:: ds 3
W_MONHPADDING:: ; d0d7
@@ -775,17 +995,47 @@
W_DAMAGE:: ; d0d7
ds 1
- ds 79
+wd0d8:: ds 3
+wd0db:: ds 1
+wd0dc:: ds 4
+wd0e0:: ds 1
+wd0e1:: ds 56
+wd119:: ds 1
+wd11a:: ds 1
+wd11b:: ds 1
+wd11c:: ds 1
+wd11d:: ds 1
+wd11e:: ds 1
+wd11f:: ds 1
+wd120:: ds 1
+wd121:: ds 1
+wd122:: ds 2
+wd124:: ds 1
+wd125:: ds 1
+wd126:: ds 1
W_CURENEMYLVL:: ; d127
ds 1
- ds 3
+wd128:: ds 1
+wd129:: ds 1
+wd12a:: ds 1
W_ISLINKBATTLE:: ; d12b
ds 1
- ds 17
+wd12c:: ds 1
+wd12d:: ds 1
+wd12e:: ds 1
+wd12f:: ds 1
+wd130:: ds 1
+wd131:: ds 1
+wd132:: ds 1
+wd133:: ds 6
+wd139:: ds 1
+wd13a:: ds 1
+wd13b:: ds 1
+wd13c:: ds 1
W_PRIZE1:: ; d13d
ds 1
@@ -794,8 +1044,17 @@
W_PRIZE3:: ; d13f
ds 1
- ds 24
+ ds 1
+wd141:: ds 2
+wd143:: ds 2
+wd145:: ds 3
+wd148:: ds 10
+wd152:: ds 1
+wd153:: ds 3
+wd156:: ds 1
+wd157:: ds 1
+
W_PLAYERNAME:: ; d158
ds 11
@@ -914,10 +1173,6 @@
ds 11
-flag_array: MACRO
- ds ((\1) + 7) / 8
-ENDM
-
wPokedexOwned:: ; d2f7
flag_array 151
wPokedexOwnedEnd::
@@ -956,17 +1211,22 @@
W_OBTAINEDBADGES:: ; d356
ds 1
- ds 2
+ ds 1
+wd358:: ds 1
+
wPlayerID:: ; d359
ds 2
- ds 3
+wd35b:: ds 1
+wd35c:: ds 1
+wd35d:: ds 1
W_CURMAP:: ; d35e
ds 1
- ds 2
+wd35f:: ds 1
+wd360:: ds 1
W_YCOORD:: ; d361
; player’s position on the current map
@@ -985,7 +1245,7 @@
wLastMap:: ; d365
ds 1
- ds 1
+wd366:: ds 1
W_CURMAPTILESET:: ; d367
ds 1
@@ -1012,21 +1272,61 @@
ds 1
W_MAPCONN1PTR:: ; d371
- ds 2
- ds 9
+ ds 1
+wd372:: ds 1
+wd373:: ds 1
+wd374:: ds 1
+wd375:: ds 1
+wd376:: ds 1
+wd377:: ds 1
+wd378:: ds 1
+wd379:: ds 1
+wd37a:: ds 1
+wd37b:: ds 1
+
W_MAPCONN2PTR:: ; d37c
- ds 2
- ds 9
+ ds 1
+wd37d:: ds 1
+wd37e:: ds 1
+wd37f:: ds 1
+wd380:: ds 1
+wd381:: ds 1
+wd382:: ds 1
+wd383:: ds 1
+wd384:: ds 1
+wd385:: ds 1
+wd386:: ds 1
+
W_MAPCONN3PTR:: ; d387
- ds 2
- ds 9
+ ds 1
+wd388:: ds 1
+wd389:: ds 1
+wd38a:: ds 1
+wd38b:: ds 1
+wd38c:: ds 1
+wd38d:: ds 1
+wd38e:: ds 1
+wd38f:: ds 1
+wd390:: ds 1
+wd391:: ds 1
+
W_MAPCONN4PTR:: ; d392
- ds 2
- ds 9
+ ds 1
+wd393:: ds 1
+wd394:: ds 1
+wd395:: ds 1
+wd396:: ds 1
+wd397:: ds 1
+wd398:: ds 1
+wd399:: ds 1
+wd39a:: ds 1
+wd39b:: ds 1
+wd39c:: ds 1
+
W_SPRITESET:: ; d39d
; sprite set for the current map (11 sprite picture ID's)
ds 11
@@ -1035,20 +1335,39 @@
; sprite set ID for the current map
ds 1
- ds 312
+wd3a9:: ds 1
+wd3aa:: ds 3
+wd3ad:: ds 1
+wd3ae:: ds 1
+wd3af:: ds 128
+wd42f:: ds 129
+wd4b0:: ds 1
+wd4b1:: ds 32
+wd4d1:: ds 16
W_NUMSPRITES:: ; d4e1
; number of sprites on the current map
; two bytes per sprite (movement byte 2 , text ID)
- ds 3
+ ds 1
+wd4e2:: ds 1
+wd4e3:: ds 1
+
W_MAPSPRITEDATA:: ; d4e4
; two bytes per sprite (trainer class/item ID , trainer set ID)
ds 32
W_MAPSPRITEEXTRADATA:: ; d504
- ds 39
+ ds 32
+wd524:: ds 1
+wd525:: ds 1
+wd526:: ds 1
+wd527:: ds 1
+wd528:: ds 1
+wd529:: ds 1
+wd52a:: ds 1
+
W_TILESETBANK:: ; d52b
ds 1
@@ -1078,7 +1397,9 @@
ds 50 * 2
ds 1 ; end
- ds 4
+wd5a0:: ds 2
+wd5a2:: ds 1
+wd5a3:: ds 1
wPlayerCoins:: ; d5a4
ds 2 ; BCD
@@ -1085,8 +1406,10 @@
W_MISSABLEOBJECTFLAGS:: ; d5a6
; bit array of missable objects. set = removed
- ds 40
+ ds 39
+wd5cd:: ds 1
+
W_MISSABLEOBJECTLIST:: ; d5ce
; each entry consists of 2 bytes
; * the sprite ID (depending on the current map)
@@ -1308,11 +1631,14 @@
W_ROUTE18GATECURSCRIPT:: ; d669
ds 1
- ds 161
+ ds 134
+wd6f0:: ds 14
+wd6fe:: ds 2
+wd700:: ds 11
+
W_TOWNVISITEDFLAG:: ; d70b
-; 2 bytes bit array, 1 means visited
- ds 2
+ flag_array 13
wSafariSteps:: ; d70d
; starts at 502
@@ -1332,7 +1658,7 @@
; trainer classes start at $c8
ds 1
- ds 1
+wd714:: ds 1
W_RIVALSTARTER:: ; d715
ds 1
@@ -1342,18 +1668,166 @@
W_PLAYERSTARTER:: ; d717
ds 1
- ds 1
+wd718:: ds 1
wLastBlackoutMap:: ; d719
ds 1
- ds 25
+wd71a:: ds 1
+wd71b:: ds 1
+wd71c:: ds 1
+wd71d:: ds 1
+wd71e:: ds 1
+wd71f:: ds 9
+wd728:: ds 2
+wd72a:: ds 2
+wd72c:: ds 1
+wd72d:: ds 1
+wd72e:: ds 2
+wd730:: ds 2
+wd732:: ds 1
-
W_FLAGS_D733:: ; d733
; bit 4: use variable [W_CURMAPSCRIPT] instead of the provided index for next frame's map script (used to start battle when talking to trainers)
- ds 340
+ ds 1
+wd734:: ds 2
+wd736:: ds 1
+wd737:: ds 4
+wd73b:: ds 1
+wd73c:: ds 3
+wd73f:: ds 1
+wd740:: ds 3
+wd743:: ds 1
+wd744:: ds 3
+wd747:: ds 3
+wd74a:: ds 1
+wd74b:: ds 1
+wd74c:: ds 2
+wd74e:: ds 3
+wd751:: ds 1
+wd752:: ds 2
+wd754:: ds 1
+wd755:: ds 5
+wd75a:: ds 1
+wd75b:: ds 3
+wd75e:: ds 1
+wd75f:: ds 5
+wd764:: ds 1
+wd765:: ds 1
+wd766:: ds 1
+wd767:: ds 1
+wd768:: ds 1
+wd769:: ds 3
+wd76c:: ds 5
+wd771:: ds 2
+wd773:: ds 4
+wd777:: ds 1
+wd778:: ds 4
+wd77c:: ds 1
+wd77d:: ds 1
+wd77e:: ds 5
+wd783:: ds 11
+wd78e:: ds 2
+wd790:: ds 2
+wd792:: ds 4
+wd796:: ds 2
+wd798:: ds 2
+wd79a:: ds 1
+wd79b:: ds 1
+wd79c:: ds 5
+wd7a1:: ds 2
+wd7a3:: ds 12
+wd7af:: ds 2
+wd7b1:: ds 2
+wd7b3:: ds 1
+wd7b4:: ds 5
+wd7b9:: ds 4
+wd7bd:: ds 2
+wd7bf:: ds 3
+wd7c2:: ds 1
+wd7c3:: ds 2
+wd7c5:: ds 1
+wd7c6:: ds 3
+wd7c9:: ds 4
+wd7cd:: ds 2
+wd7cf:: ds 2
+wd7d1:: ds 1
+wd7d2:: ds 1
+wd7d3:: ds 2
+wd7d5:: ds 1
+wd7d6:: ds 1
+wd7d7:: ds 1
+wd7d8:: ds 1
+wd7d9:: ds 2
+wd7db:: ds 2
+wd7dd:: ds 2
+wd7df:: ds 1
+wd7e0:: ds 1
+wd7e1:: ds 2
+wd7e3:: ds 2
+wd7e5:: ds 2
+wd7e7:: ds 1
+wd7e8:: ds 1
+wd7e9:: ds 2
+wd7eb:: ds 2
+wd7ed:: ds 1
+wd7ee:: ds 1
+wd7ef:: ds 1
+wd7f0:: ds 1
+wd7f1:: ds 1
+wd7f2:: ds 1
+wd7f3:: ds 2
+wd7f5:: ds 1
+wd7f6:: ds 9
+wd7ff:: ds 4
+wd803:: ds 2
+wd805:: ds 2
+wd807:: ds 2
+wd809:: ds 10
+wd813:: ds 2
+wd815:: ds 1
+wd816:: ds 1
+wd817:: ds 2
+wd819:: ds 2
+wd81b:: ds 10
+wd825:: ds 1
+wd826:: ds 1
+wd827:: ds 1
+wd828:: ds 1
+wd829:: ds 1
+wd82a:: ds 1
+wd82b:: ds 1
+wd82c:: ds 1
+wd82d:: ds 1
+wd82e:: ds 1
+wd82f:: ds 1
+wd830:: ds 1
+wd831:: ds 1
+wd832:: ds 1
+wd833:: ds 1
+wd834:: ds 1
+wd835:: ds 1
+wd836:: ds 1
+wd837:: ds 1
+wd838:: ds 15
+wd847:: ds 2
+wd849:: ds 2
+wd84b:: ds 12
+wd857:: ds 8
+wd85f:: ds 4
+wd863:: ds 1
+wd864:: ds 1
+wd865:: ds 1
+wd866:: ds 1
+wd867:: ds 2
+wd869:: ds 20
+wd87d:: ds 2
+wd87f:: ds 1
+wd880:: ds 1
+wd881:: ds 1
+wd882:: ds 5
+
W_GRASSRATE:: ; d887
ds 1
@@ -1375,10 +1849,17 @@
W_ENEMYMON1HP:: ; d8a5
ds 2
- ds 7
+ ds 1
+wd8a8:: ds 4
+wd8ac:: ds 2
+
W_ENEMYMON1MOVE3:: ; d8ae
- ds 44
+ ds 19
+wd8c1:: ds 4
+wd8c5:: ds 1
+wd8c6:: ds 20
+
W_ENEMYMON2MOVE3:: ; d8da
ds 44
W_ENEMYMON3MOVE3:: ; d906
@@ -1388,7 +1869,8 @@
W_ENEMYMON5MOVE3:: ; d95e
ds 44
W_ENEMYMON6MOVE3:: ; d98a
- ds 34
+ ds 22
+wd9a0:: ds 12
W_ENEMYMON1OT:: ; d9ac
ds 11
@@ -1419,8 +1901,10 @@
W_TRAINERHEADERPTR:: ; da30
ds 2
- ds 7
+ ds 6
+wda38:: ds 1
+
W_CURMAPSCRIPT:: ; da39
; index of current map script, mostly used as index for function pointer array
; mostly copied from map-specific map script pointer and wirtten back later
@@ -1437,7 +1921,7 @@
W_PLAYTIMEFRAMES:: ; da45
ds 1
- ds 1
+wda46:: ds 1
W_NUMSAFARIBALLS:: ; da47
ds 1
@@ -1454,14 +1938,23 @@
ds 11
W_DAYCAREMONDATA:: ; da5f
- ds 33
+ ds 3
+wda62:: ds 5
+wda67:: ds 6
+wda6d:: ds 2
+wda6f:: ds 17
+
W_NUMINBOX:: ; da80
; number of mons in current box
- ds 22
+ ds 1
+wda81::
+ ds 20
+ ds 1
W_BOXMON1DATA:: ; da96
- ds 33
+ ds 8
+wda9e:: ds 25
W_BOXMON2DATA:: ; dab7
ds 33 * 19
@@ -1475,8 +1968,20 @@
W_BOXMON2NAME:: ; de11
ds 11 * 19
-; dee2
+wdee2::
+ ds 1
-SECTION "Stack", WRAMX[$dfff]
+SECTION "Stack", WRAMX[$dfff], BANK[1]
wStack:: ; dfff
ds -$100
+
+
+SECTION "Sprite Buffers", SRAM
+
+S_SPRITEBUFFER0:: ; a000
+ ds SPRITEBUFFERSIZE
+S_SPRITEBUFFER1:: ; a188
+ ds SPRITEBUFFERSIZE
+S_SPRITEBUFFER2:: ; a310
+ ds SPRITEBUFFERSIZE
+