summaryrefslogtreecommitdiff
path: root/mobile
diff options
context:
space:
mode:
Diffstat (limited to 'mobile')
-rwxr-xr-xmobile/fixed_words.asm20
-rwxr-xr-xmobile/mobile_12.asm10
-rwxr-xr-xmobile/mobile_12_2.asm70
-rw-r--r--mobile/mobile_22.asm150
-rw-r--r--mobile/mobile_22_2.asm14
-rw-r--r--mobile/mobile_40.asm444
-rwxr-xr-xmobile/mobile_41.asm12
-rw-r--r--mobile/mobile_42.asm66
-rw-r--r--mobile/mobile_45.asm250
-rwxr-xr-xmobile/mobile_45_sprite_engine.asm46
-rwxr-xr-xmobile/mobile_46.asm162
-rwxr-xr-xmobile/mobile_5b.asm28
-rwxr-xr-xmobile/mobile_5c.asm16
-rw-r--r--mobile/mobile_5e.asm24
-rw-r--r--mobile/mobile_5f.asm168
-rwxr-xr-xmobile/mobile_menu.asm26
16 files changed, 753 insertions, 753 deletions
diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm
index 71474f236..602639b82 100755
--- a/mobile/fixed_words.asm
+++ b/mobile/fixed_words.asm
@@ -269,7 +269,7 @@ CopyMobileEZChatToC608: ; 11c156
ld a, e
ld [wd265], a
call GetPokemonName
- ld hl, StringBuffer1
+ ld hl, wStringBuffer1
ld bc, MON_NAME_LENGTH - 1
jr .copy_string
; 11c1ab
@@ -337,7 +337,7 @@ Function11c1b9: ; 11c1b9
ld a, $5
ld [rSVBK], a
ld hl, $c6d0
- ld de, LYOverrides
+ ld de, wLYOverrides
ld bc, $100
call CopyBytes
pop af
@@ -711,11 +711,11 @@ Function11c4a5: ; 11c4a5 (47:44a5)
Function11c4be: ; 11c4be (47:44be)
ld a, $1
- hlcoord 0, 6, AttrMap
+ hlcoord 0, 6, wAttrMap
ld bc, $a0
call ByteFill
ld a, $7
- hlcoord 0, 14, AttrMap
+ hlcoord 0, 14, wAttrMap
ld bc, $28
call ByteFill
farcall ReloadMapPart
@@ -914,7 +914,7 @@ EZChat_PlaceCategoryNames: ; 11c5f0 (47:45f0)
Function11c618: ; 11c618 (47:4618)
ld a, $2
- hlcoord 0, 6, AttrMap
+ hlcoord 0, 6, wAttrMap
ld bc, $c8
call ByteFill
farcall ReloadMapPart
@@ -1526,7 +1526,7 @@ Function11c992: ; 11c992 (47:4992)
Function11c9ab: ; 11c9ab (47:49ab)
ld a, $7
- hlcoord 0, 6, AttrMap
+ hlcoord 0, 6, wAttrMap
ld bc, $c8
call ByteFill
farcall ReloadMapPart
@@ -1583,7 +1583,7 @@ Function11c9c3: ; 11c9c3 (47:49c3)
ret
Function11ca01: ; 11ca01 (47:4a01)
- hlcoord 14, 7, AttrMap
+ hlcoord 14, 7, wAttrMap
ld de, $14
ld a, $5
ld c, a
@@ -1602,7 +1602,7 @@ Function11ca01: ; 11ca01 (47:4a01)
jr nz, .asm_11ca0a
Function11ca19: ; 11ca19 (47:4a19)
- hlcoord 0, 12, AttrMap
+ hlcoord 0, 12, wAttrMap
ld de, $14
ld a, $6
ld c, a
@@ -2035,11 +2035,11 @@ Function11cd54: ; 11cd54 (47:4d54)
Function11cdaa: ; 11cdaa (47:4daa)
ld a, $2
- hlcoord 0, 6, AttrMap
+ hlcoord 0, 6, wAttrMap
ld bc, 6 * SCREEN_WIDTH
call ByteFill
ld a, $7
- hlcoord 0, 12, AttrMap
+ hlcoord 0, 12, wAttrMap
ld bc, 4 * SCREEN_WIDTH
call ByteFill
farcall ReloadMapPart
diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm
index cfad0f8d4..c9f4f56e0 100755
--- a/mobile/mobile_12.asm
+++ b/mobile/mobile_12.asm
@@ -38,11 +38,11 @@ InitMobileProfile: ; 4802f (12:402f)
jr .asm_480d7
.asm_4808a
ld a, $5
- ld [MusicFade], a
+ ld [wMusicFade], a
ld a, LOW(MUSIC_MOBILE_ADAPTER_MENU)
- ld [MusicFadeID], a
+ ld [wMusicFadeID], a
ld a, HIGH(MUSIC_MOBILE_ADAPTER_MENU)
- ld [MusicFadeID + 1], a
+ ld [wMusicFadeID + 1], a
ld c, 20
call DelayFrames
ld b, $1
@@ -459,7 +459,7 @@ Function483bb: ; 483bb (12:43bb)
Function483e8: ; 483e8
push de
ld hl, Prefectures
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
cp $ff
jr nz, .asm_483f8
ld hl, Wakayama ; last string
@@ -1681,7 +1681,7 @@ Function48cdc: ; 48cdc (12:4cdc)
call Function48cfd
pop hl
pop bc
- ld de, AttrMap - TileMap
+ ld de, wAttrMap - wTileMap
add hl, de
inc b
inc b
diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm
index 3b1da1f93..47eb2f3bf 100755
--- a/mobile/mobile_12_2.asm
+++ b/mobile/mobile_12_2.asm
@@ -2,14 +2,14 @@ MobileCheckOwnMonAnywhere: ; 4a843
; Like CheckOwnMonAnywhere, but only check for species.
; OT/ID don't matter.
- ld a, [PartyCount]
+ ld a, [wPartyCount]
and a
ret z
ld d, a
ld e, 0
- ld hl, PartyMon1Species
- ld bc, PartyMonOT
+ ld hl, wPartyMon1Species
+ ld bc, wPartyMonOT
.asm_4a851
call .CheckMatch
ret c
@@ -111,7 +111,7 @@ MobileCheckOwnMonAnywhere: ; 4a843
push de
ld d, b
ld e, c
- ld a, [ScriptVar]
+ ld a, [wScriptVar]
ld b, [hl]
cp b
jr nz, .no_match
@@ -160,25 +160,25 @@ MobileCheckOwnMonAnywhere: ; 4a843
; 4a927
UnusedFindItemInPCOrBag: ; 4a927
- ld a, [ScriptVar]
- ld [CurItem], a
- ld hl, PCItems
+ ld a, [wScriptVar]
+ ld [wCurItem], a
+ ld hl, wPCItems
call CheckItem
jr c, .found
- ld a, [ScriptVar]
- ld [CurItem], a
- ld hl, NumItems
+ ld a, [wScriptVar]
+ ld [wCurItem], a
+ ld hl, wNumItems
call CheckItem
jr c, .found
xor a
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
.found
ld a, 1
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
; 4a94e
@@ -272,15 +272,15 @@ Function4a9c3: ; 4a9c3
Function4a9d7: ; 4a9d7
ld a, [wd002]
- ld hl, PartyMonNicknames
+ ld hl, wPartyMonNicknames
call GetNick
ld h, d
ld l, e
- ld de, EndFlypoint
+ ld de, wEndFlypoint
ld bc, 6
call CopyBytes
ld a, [wd003]
- ld hl, PartyMonNicknames
+ ld hl, wPartyMonNicknames
call GetNick
ld h, d
ld l, e
@@ -288,7 +288,7 @@ Function4a9d7: ; 4a9d7
ld bc, 6
call CopyBytes
ld a, [wd004]
- ld hl, PartyMonNicknames
+ ld hl, wPartyMonNicknames
call GetNick
ld h, d
ld l, e
@@ -317,10 +317,10 @@ Function4aa25: ; 4aa25
Function4aa34: ; 4aa34
ld a, PARTYMENUACTION_MOBILE
- ld [PartyMenuActionText], a
+ ld [wPartyMenuActionText], a
farcall WritePartyMenuTilemap
xor a
- ld [PartyMenuActionText], a
+ ld [wPartyMenuActionText], a
farcall PrintPartyMenuText
call Function4aab6
call WaitBGMap
@@ -431,7 +431,7 @@ Function4aab6: ; 4aab6
; 4aad3
Function4aad3: ; 4aad3
- ld hl, PartyCount
+ ld hl, wPartyCount
ld a, [hli]
and a
ret z ; Nothing in your party
@@ -458,7 +458,7 @@ Function4aad3: ; 4aad3
; 4aafb
Function4aafb: ; 4aafb
- ld a, [CurPartySpecies]
+ ld a, [wCurPartySpecies]
cp EGG
jr z, .egg
and a
@@ -470,9 +470,9 @@ Function4aafb: ; 4aafb
; 4ab06
Function4ab06: ; 4ab06
- ld a, [CurPartyMon]
+ ld a, [wCurPartyMon]
ld bc, PARTYMON_STRUCT_LENGTH
- ld hl, PartyMon1HP
+ ld hl, wPartyMon1HP
call AddNTimes
ld a, [hli]
ld b, a
@@ -503,7 +503,7 @@ Function4ab1a: ; 4ab1a
pop af
bit 1, a
jr nz, .asm_4ab6d
- ld a, [PartyCount]
+ ld a, [wPartyCount]
inc a
ld b, a
ld a, [wMenuCursorY]
@@ -512,13 +512,13 @@ Function4ab1a: ; 4ab1a
jr z, .asm_4ab7e
ld a, [wMenuCursorY]
dec a
- ld [CurPartyMon], a
+ ld [wCurPartyMon], a
ld c, a
ld b, $0
- ld hl, PartySpecies
+ ld hl, wPartySpecies
add hl, bc
ld a, [hl]
- ld [CurPartySpecies], a
+ ld [wCurPartySpecies], a
ld de, SFX_READ_TEXT_2
call PlaySFX
call WaitSFX
@@ -591,7 +591,7 @@ Function4aba8: ; 4aba8
Function4abc3: ; 4abc3
bit 3, a
jr z, .asm_4abd5
- ld a, [PartyCount]
+ ld a, [wPartyCount]
inc a
ld [wMenuCursorY], a
ld a, $1
@@ -605,7 +605,7 @@ Function4abc3: ; 4abc3
ld [wMenuCursorY], a
and a
jr nz, .asm_4ac29
- ld a, [PartyCount]
+ ld a, [wPartyCount]
inc a
ld [wMenuCursorY], a
jr .asm_4ac29
@@ -615,7 +615,7 @@ Function4abc3: ; 4abc3
jr z, .asm_4ac08
ld a, [wMenuCursorY]
ld [wMenuCursorY], a
- ld a, [PartyCount]
+ ld a, [wPartyCount]
inc a
inc a
ld b, a
@@ -635,7 +635,7 @@ Function4abc3: ; 4abc3
.asm_4ac10
ld a, [wMenuCursorY]
ld b, a
- ld a, [PartyCount]
+ ld a, [wPartyCount]
inc a
cp b
jr nz, .asm_4ac29
@@ -653,7 +653,7 @@ Function4abc3: ; 4abc3
lb bc, 13, 1
call ClearBox
call Function4aab6
- ld a, [PartyCount]
+ ld a, [wPartyCount]
hlcoord 6, 1
.asm_4ac3b
ld bc, $28
@@ -663,7 +663,7 @@ Function4abc3: ; 4abc3
ld [hl], $7f
ld a, [wMenuCursorY]
ld b, a
- ld a, [PartyCount]
+ ld a, [wPartyCount]
inc a
cp b
jr z, .asm_4ac54
@@ -800,7 +800,7 @@ Function4ad17: ; 4ad17
ret
.asm_4ad39
- ld a, [CurPartyMon]
+ ld a, [wCurPartyMon]
ld [hl], a
call Function4a9c3
ret c
@@ -876,7 +876,7 @@ String_4ada7: ; 4ada7
Function4adb2: ; 4adb2
ld hl, wd002
- ld a, [CurPartyMon]
+ ld a, [wCurPartyMon]
cp [hl]
ret z
inc hl
@@ -923,7 +923,7 @@ Function4adf7: ; 4adf7
ld a, [wd019]
bit 0, a
ret z
- ld a, [PartyCount]
+ ld a, [wPartyCount]
inc a
ld [wMenuCursorY], a
ld a, $1
diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm
index a4e0a8fb6..99963bceb 100644
--- a/mobile/mobile_22.asm
+++ b/mobile/mobile_22.asm
@@ -133,7 +133,7 @@ Function891d3: ; 891d3 (22:51d3)
Function891de: ; 891de
call Mobile22_SetBGMapMode0
call ClearPalettes
- hlcoord 0, 0, AttrMap
+ hlcoord 0, 0, wAttrMap
ld a, $7
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
@@ -169,7 +169,7 @@ Function8920f: ; 8920f
Function89215: ; 89215
push hl
push bc
- ld bc, AttrMap - TileMap
+ ld bc, wAttrMap - wTileMap
add hl, bc
ld [hl], a
pop bc
@@ -345,12 +345,12 @@ Function892b7: ; 892b7
Function89305: ; 89305 (22:5305)
xor a
- ld [MenuSelection], a
+ ld [wMenuSelection], a
ld c, 40
.loop
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
inc a
- ld [MenuSelection], a
+ ld [wMenuSelection], a
push bc
call Function892b4
pop bc
@@ -361,7 +361,7 @@ Function89305: ; 89305 (22:5305)
Function8931b: ; 8931b
push hl
ld hl, $a03b ; 4:a03b
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
dec a
ld bc, 37
call AddNTimes
@@ -568,9 +568,9 @@ Function8942b: ; 8942b (22:542b)
ret
Function89448: ; 89448 (22:5448)
-; Clears the Sprites array
+; Clears the sprite array
push af
- ld hl, Sprites
+ ld hl, wVirtualOAM
ld d, 24 * SPRITEOAMSTRUCT_LENGTH
xor a
.loop
@@ -778,7 +778,7 @@ Function8956f: ; 8956f
ld c, l
farcall GetMobileOTTrainerClass
ld a, c
- ld [TrainerClass], a
+ ld [wTrainerClass], a
ld a, [rSVBK]
push af
ld a, 5
@@ -790,7 +790,7 @@ Function8956f: ; 8956f
ld [hl], a
pop af
ld [rSVBK], a
- ld a, [TrainerClass]
+ ld a, [wTrainerClass]
ld h, 0
ld l, a
add hl, hl
@@ -845,7 +845,7 @@ Palette_895de: ; 895de
Function895e6: ; 895e6
ld a, 7
- hlcoord 0, 0, AttrMap
+ hlcoord 0, 0, wAttrMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
ret
@@ -854,7 +854,7 @@ Function895e6: ; 895e6
Function895f2: ; 895f2
push bc
xor a
- hlcoord 0, 0, AttrMap
+ hlcoord 0, 0, wAttrMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
call Function89605
@@ -864,7 +864,7 @@ Function895f2: ; 895f2
; 89605
Function89605: ; 89605
- hlcoord 19, 2, AttrMap
+ hlcoord 19, 2, wAttrMap
ld a, 1
ld de, SCREEN_WIDTH
ld c, 14
@@ -881,7 +881,7 @@ Function89605: ; 89605
jr nz, .loop
.done
- hlcoord 0, 16, AttrMap
+ hlcoord 0, 16, wAttrMap
ld c, 10
ld a, 2
.loop2
@@ -891,7 +891,7 @@ Function89605: ; 89605
inc a
dec c
jr nz, .loop2
- hlcoord 1, 11, AttrMap
+ hlcoord 1, 11, wAttrMap
ld a, 4
ld bc, 4
call ByteFill
@@ -902,7 +902,7 @@ Function89605: ; 89605
; 8963d
Function8963d: ; 8963d
- hlcoord 12, 3, AttrMap
+ hlcoord 12, 3, wAttrMap
ld a, 6
ld de, SCREEN_WIDTH
lb bc, 7, 7
@@ -921,7 +921,7 @@ Function8963d: ; 8963d
; 89655
Function89655: ; 89655
- hlcoord 1, 12, AttrMap
+ hlcoord 1, 12, wAttrMap
ld de, SCREEN_WIDTH
ld a, 5
ld b, 4
@@ -1223,9 +1223,9 @@ Function897af: ; 897af
ld c, l
farcall GetMobileOTTrainerClass
ld a, c
- ld [TrainerClass], a
+ ld [wTrainerClass], a
xor a
- ld [CurPartySpecies], a
+ ld [wCurPartySpecies], a
ld de, vTiles2 tile $37
farcall GetTrainerPic
pop bc
@@ -1236,7 +1236,7 @@ Function897d5: ; 897d5
push bc
call Function8934a
jr nc, .asm_897f3
- hlcoord 12, 3, AttrMap
+ hlcoord 12, 3, wAttrMap
xor a
ld de, SCREEN_WIDTH
lb bc, 7, 7
@@ -1354,12 +1354,12 @@ Function8987f: ; 8987f (22:587f)
ret
Function898aa: ; 898aa
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
and a
ret z
push bc
hlcoord 6, 1
- ld de, MenuSelection
+ ld de, wMenuSelection
lb bc, PRINTNUM_LEADINGZEROS | 1, 2
call PrintNum
pop bc
@@ -1376,7 +1376,7 @@ Function898be: ; 898be
.asm_898cd
hlcoord 9, 1
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
and a
jr nz, .asm_898d7
dec hl
@@ -1544,7 +1544,7 @@ Function8998b: ; 8998b
Function8999c: ; 8999c (22:599c)
- ld de, PlayerName
+ ld de, wPlayerName
call PlaceString
inc bc
ld h, b
@@ -1559,10 +1559,10 @@ String_899ac: ; 899ac
; 899b2
Function899b2: ; 899b2 (22:59b2)
- ld bc, PlayerName
+ ld bc, wPlayerName
call Function89346
jr c, .asm_899bf
- ld de, PlayerName
+ ld de, wPlayerName
jr .asm_899c2
.asm_899bf
ld de, String_89116
@@ -1572,7 +1572,7 @@ Function899b2: ; 899b2 (22:59b2)
ret
Function899c9: ; 899c9 (22:59c9)
- ld de, PlayerID
+ ld de, wPlayerID
lb bc, PRINTNUM_LEADINGZEROS | 2, 5
call PrintNum
ret
@@ -1716,11 +1716,11 @@ Function89a57: ; 89a57
; 89aa3
.ApplyCursorMovement: ; 89aa3
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
ld c, a
push bc
.loop
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
cp d
jr z, .equal_to_d
add e
@@ -1728,10 +1728,10 @@ Function89a57: ; 89a57
inc a
.not_zero
- ld [MenuSelection], a
+ ld [wMenuSelection], a
call .Function89ac7 ; BCD conversion of data in SRAM?
jr nc, .loop
- call .Function89ae6 ; split [MenuSelection] into [wd030] + [wd031] where [wd030] <= 5
+ call .Function89ae6 ; split [wMenuSelection] into [wd030] + [wd031] where [wd030] <= 5
pop bc
and a
ret
@@ -1739,7 +1739,7 @@ Function89a57: ; 89a57
.equal_to_d
pop bc
ld a, c
- ld [MenuSelection], a
+ ld [wMenuSelection], a
scf
ret
; 89ac7
@@ -1773,7 +1773,7 @@ Function89a57: ; 89a57
ld hl, wd031
xor a
ld [hl], a
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
.loop2
cp 6
jr c, .load_and_ret
@@ -1923,7 +1923,7 @@ Function89b97: ; 89b97 (22:5b97)
ld a, [hli]
ld h, [hl]
ld l, a
- ld de, Sprite01
+ ld de, wVirtualOAMSprite00
.asm_89bb4
ld a, [hli]
cp $ff
@@ -2013,7 +2013,7 @@ Function89c44: ; 89c44 (22:5c44)
pop de
ret
.asm_89c4f
- ld hl, Sprite01
+ ld hl, wVirtualOAMSprite00
push de
ld a, b
ld [hli], a ; y
@@ -2123,7 +2123,7 @@ Function89cdf: ; 89cdf (22:5cdf)
ld c, a
ld e, $2
ld a, $2
- ld hl, Sprite01
+ ld hl, wVirtualOAMSprite00
.asm_89cee
push af
push bc
@@ -2378,10 +2378,10 @@ Function89e6f: ; 89e6f (22:5e6f)
hlcoord 7, 4
call Function8a58d
ld a, $5
- hlcoord 7, 4, AttrMap
+ hlcoord 7, 4, wAttrMap
call Function8a5a3
ld a, $6
- hlcoord 10, 4, AttrMap
+ hlcoord 10, 4, wAttrMap
call Function8a5a3
call Function891ab
call SetPalettes
@@ -2415,10 +2415,10 @@ Function89eb9: ; 89eb9 (22:5eb9)
hlcoord 7, 4
call Function8a58d
ld a, $5
- hlcoord 7, 4, AttrMap
+ hlcoord 7, 4, wAttrMap
call Function8a5a3
ld a, $6
- hlcoord 10, 4, AttrMap
+ hlcoord 10, 4, wAttrMap
call Function8a5a3
call Function891ab
call SetPalettes
@@ -2550,7 +2550,7 @@ Function89f77: ; 89f77 (22:5f77)
Function89f9a: ; 89f9a (22:5f9a)
dec a
- ld hl, Sprites
+ ld hl, wVirtualOAM
and a
ret z
.asm_89fa0
@@ -2595,10 +2595,10 @@ Function89fa5: ; 89fa5 (22:5fa5)
Function89fce: ; 89fce (22:5fce)
call Function8a5b6
ld a, $5
- hlcoord 7, 4, AttrMap
+ hlcoord 7, 4, wAttrMap
call Function8a5a3
ld a, $6
- hlcoord 10, 4, AttrMap
+ hlcoord 10, 4, wAttrMap
call Function8a5a3
call Function89448
call SetPalettes
@@ -2678,11 +2678,11 @@ Function8a055: ; 8a055 (22:6055)
hlcoord 12, 4
call Function8a58d
ld a, $5
- hlcoord 12, 4, AttrMap
+ hlcoord 12, 4, wAttrMap
call Function8a5a3
pop hl
ld a, $6
- hlcoord 15, 4, AttrMap
+ hlcoord 15, 4, wAttrMap
call Function8a5a3
call CGBOnly_CopyTilemapAtOnce
jp Function89e36
@@ -2710,7 +2710,7 @@ Function8a0a1: ; 8a0a1 (22:60a1)
Function8a0c1: ; 8a0c1 (22:60c1)
push hl
- ld bc, AttrMap - TileMap
+ ld bc, wAttrMap - wTileMap
add hl, bc
ld a, [hl]
pop hl
@@ -2736,7 +2736,7 @@ Function8a0c9: ; 8a0c9 (22:60c9)
Function8a0de: ; 8a0de (22:60de)
call Function8a0c9
- ld de, AttrMap - TileMap
+ ld de, wAttrMap - wTileMap
add hl, de
ret
@@ -2962,10 +2962,10 @@ Function8a262: ; 8a262 (22:6262)
hlcoord 12, 4
call Function8a58d
ld a, $5
- hlcoord 12, 4, AttrMap
+ hlcoord 12, 4, wAttrMap
call Function8a5a3
ld a, $6
- hlcoord 15, 4, AttrMap
+ hlcoord 15, 4, wAttrMap
call Function8a5a3
xor a
ld [wd02e], a
@@ -3058,7 +3058,7 @@ Function8a31c: ; 8a31c (22:631c)
pop bc
ld a, c
ld [wMenuCursorBuffer], a
- ld [MenuSelection], a
+ ld [wMenuSelection], a
call PlaceVerticalMenuItems
call InitVerticalMenuCursor
ld hl, w2DMenuFlags1
@@ -3083,7 +3083,7 @@ Function8a31c: ; 8a31c (22:631c)
call Function89448
call PlaceHollowCursor
call Function8a3a2
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
cp $ff
jr z, .asm_8a36a
ld e, a
@@ -3118,12 +3118,12 @@ Function8a3a2: ; 8a3a2 (22:63a2)
ld d, $0
add hl, de
ld a, [hl]
- ld [MenuSelection], a
+ ld [wMenuSelection], a
ret
Function8a3b2: ; 8a3b2 (22:63b2)
ld a, $1
- ld [MenuSelection], a
+ ld [wMenuSelection], a
call Function8a4fc
call Function8a3df
jr nc, .asm_8a3ce
@@ -3210,7 +3210,7 @@ Function8a453: ; 8a453 (22:6453)
call TextBox
hlcoord 1, 14
ld de, String_8a476
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
cp $ff
jr z, .asm_8a472
ld de, Strings_8a483
@@ -3238,27 +3238,27 @@ Strings_8a483: ; 8a483
; 8a4d3
Function8a4d3: ; 8a4d3 (22:64d3)
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
cp $1
jr nz, .asm_8a4eb
ld a, $5
- hlcoord 12, 4, AttrMap
+ hlcoord 12, 4, wAttrMap
call Function8a5a3
ld a, $7
- hlcoord 15, 4, AttrMap
+ hlcoord 15, 4, wAttrMap
call Function8a5a3
ret
.asm_8a4eb
ld a, $7
- hlcoord 12, 4, AttrMap
+ hlcoord 12, 4, wAttrMap
call Function8a5a3
ld a, $6
- hlcoord 15, 4, AttrMap
+ hlcoord 15, 4, wAttrMap
call Function8a5a3
ret
Function8a4fc: ; 8a4fc (22:64fc)
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
cp $3
jr nz, asm_8a529
ld hl, wd012
@@ -3293,7 +3293,7 @@ asm_8a529: ; 8a529 (22:6529)
ld [hli], a
ld a, $ff
ld [hli], a
- ld hl, Sprites
+ ld hl, wVirtualOAM
xor a
ld bc, 8 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
@@ -3476,7 +3476,7 @@ Function8a62c: ; 8a62c (22:662c)
ld a, c
and a
jr z, .asm_8a66a
- ld [MenuSelection], a
+ ld [wMenuSelection], a
ld b, a
ld a, [wScrollingMenuCursorPosition]
inc a
@@ -3489,7 +3489,7 @@ Function8a62c: ; 8a62c (22:662c)
ld c, a
ld hl, Jumptable_8a671
ld a, b
- ld [MenuSelection], a
+ ld [wMenuSelection], a
ld a, c
dec a
rst JumpTable
@@ -3674,7 +3674,7 @@ Function8a78c: ; 8a78c (22:678c)
ret
Function8a7cb: ; 8a7cb (22:67cb)
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
push af
call Function891de
ld de, wd008
@@ -3692,7 +3692,7 @@ Function8a7cb: ; 8a7cb (22:67cb)
call Function89193
.asm_8a7f4
pop af
- ld [MenuSelection], a
+ ld [wMenuSelection], a
call Function891de
call ClearBGPalettes
call Function893cc
@@ -3829,7 +3829,7 @@ String_8a926: ; 8a926
; 8a930
Function8a930: ; 8a930 (22:6930)
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
push af
xor a
ld [wd032], a
@@ -3853,7 +3853,7 @@ Function8a930: ; 8a930 (22:6930)
cp c
jr z, .asm_8a995
push bc
- ld [MenuSelection], a
+ ld [wMenuSelection], a
call Function8931b
push bc
ld h, b
@@ -3864,7 +3864,7 @@ Function8a930: ; 8a930 (22:6930)
pop de
pop bc
ld a, c
- ld [MenuSelection], a
+ ld [wMenuSelection], a
call Function8931b
push bc
ld h, b
@@ -4013,7 +4013,7 @@ Jumptable_8aa6d: ; 8aa6d (22:6a6d)
Function8aa73: ; 8aa73 (22:6a73)
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
ld e, a
push de
call Function891de
@@ -4039,7 +4039,7 @@ Function8aa73: ; 8aa73 (22:6a73)
call Function894ca
pop de
ld a, e
- ld [MenuSelection], a
+ ld [wMenuSelection], a
and a
ret
@@ -4168,7 +4168,7 @@ Function8aba9: ; 8aba9
call Function8b7bd
jr z, .asm_8abdf
ld a, c
- ld [MenuSelection], a
+ ld [wMenuSelection], a
call OpenSRAMBank4
call Function8931b
ld hl, $0011
@@ -4220,7 +4220,7 @@ Function8aba9: ; 8aba9
ld a, $1
call Function8925e
jp c, .asm_8abb3
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
ld c, a
ret
; 8ac3b
@@ -4232,7 +4232,7 @@ String_8ac3b: ; 8ac3b
Function8ac4e: ; 8ac4e
xor a
- ld [MenuSelection], a
+ ld [wMenuSelection], a
push de
call Function891de
call ClearBGPalettes
@@ -4261,7 +4261,7 @@ Function8ac7c: ; 8ac7c
jr z, .asm_8acf0
ld a, c
ld [wd02f], a
- ld [MenuSelection], a
+ ld [wMenuSelection], a
call OpenSRAMBank4
call Function8931b
call Function8932d
@@ -4341,7 +4341,7 @@ UnknownText_0x8ad06: ; 0x8ad06
Function8ad0b: ; 8ad0b
.asm_8ad0b
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
ld [wd02f], a
call Function891de
call ClearBGPalettes
diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm
index c6ee2b243..974836b88 100644
--- a/mobile/mobile_22_2.asm
+++ b/mobile/mobile_22_2.asm
@@ -645,11 +645,11 @@ Palette_8b6d5: ; 8b6d5
; 8b6ed
Function8b6ed: ; 8b6ed
- hlcoord 0, 0, AttrMap
+ hlcoord 0, 0, wAttrMap
ld bc, $012c
xor a
call ByteFill
- hlcoord 0, 14, AttrMap
+ hlcoord 0, 14, wAttrMap
ld bc, $0050
ld a, $7
call ByteFill
@@ -709,7 +709,7 @@ Function8b73e: ; 8b73e
; 8b744
Function8b744: ; 8b744
- ld de, AttrMap - TileMap
+ ld de, wAttrMap - wTileMap
add hl, de
inc b
inc b
@@ -781,10 +781,10 @@ Function8b788: ; 8b788
; 8b79e
Function8b79e: ; 8b79e
- hlcoord 0, 1, AttrMap
+ hlcoord 0, 1, wAttrMap
ld a, $1
ld [hli], a
- hlcoord 9, 1, AttrMap
+ hlcoord 9, 1, wAttrMap
ld e, $b
.asm_8b7a9
ld a, $2
@@ -853,7 +853,7 @@ Function8b7bd: ; 8b7bd
jr .asm_8b7ea
.asm_8b81c
- ld a, [MenuSelection]
+ ld a, [wMenuSelection]
cp $ff
jr nz, .asm_8b824
@@ -931,7 +931,7 @@ MenuData_0x8b870: ; 0x8b870
Function8b880: ; 8b880
ld h, d
ld l, e
- ld de, MenuSelection
+ ld de, wMenuSelection
lb bc, PRINTNUM_LEADINGZEROS | 1, 2
call PrintNum
ret
diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm
index 2ad8fff7b..dbb682b56 100644
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -43,7 +43,7 @@ Function100022: ; 100022
farcall Stubbed_Function106462
farcall Function106464 ; load broken gfx
farcall Function11615a ; init RAM
- ld hl, VramState
+ ld hl, wVramState
set 1, [hl]
ret
; 100057
@@ -51,14 +51,14 @@ Function100022: ; 100022
Function100057: ; 100057
call DisableMobile
call ReturnToMapFromSubmenu
- ld hl, VramState
+ ld hl, wVramState
res 1, [hl]
ret
; 100063
SetRAMStateForMobile: ; 100063
xor a
- ld hl, BGMapBuffer
+ ld hl, wBGMapBuffer
ld bc, $65
call ByteFill
xor a
@@ -66,7 +66,7 @@ SetRAMStateForMobile: ; 100063
ld bc, $100
call ByteFill
ld a, [rIE]
- ld [BGMapBuffer], a
+ ld [wBGMapBuffer], a
xor a
ld [hMapAnims], a
ld [hLCDCPointer], a
@@ -75,8 +75,8 @@ SetRAMStateForMobile: ; 100063
EnableMobile: ; 100082
xor a
- ld hl, OverworldMap
- ld bc, OverworldMapEnd - OverworldMap
+ ld hl, wOverworldMap
+ ld bc, wOverworldMapEnd - wOverworldMap
call ByteFill
di
@@ -106,7 +106,7 @@ DisableMobile: ; 1000a4
call NormalSpeed
xor a
ld [rIF], a
- ld a, [BGMapBuffer]
+ ld a, [wBGMapBuffer]
ld [rIE], a
ei
ret
@@ -590,7 +590,7 @@ Function1003d8: ; 1003d8
ld b, 0
push hl
add hl, bc
- ld a, [BGMapPalBuffer]
+ ld a, [wBGMapPalBuffer]
ld [hl], a
pop hl
inc bc
@@ -630,7 +630,7 @@ Function100406: ; 100406
cp d
jr nz, .asm_100426
dec hl
- ld a, [BGMapPalBuffer]
+ ld a, [wBGMapPalBuffer]
cp [hl]
jr nz, .asm_10042d
xor a
@@ -692,7 +692,7 @@ Jumptable_10044e: ; 10044e (40:444e)
dw Function1004a4
Function10046a: ; 10046a
- ld hl, BGMapPalBuffer
+ ld hl, wBGMapPalBuffer
inc [hl]
call Function1003d8
call Function1003ba
@@ -1355,7 +1355,7 @@ Function100826: ; 100826
.asm_100830
ld [hld], a
ccf
- ld a, [BGMapBufferPtrs]
+ ld a, [wBGMapBufferPtrs]
adc [hl]
sub $3c
jr nc, .asm_10083c
@@ -1384,18 +1384,18 @@ Function100846: ; 100846
add $3c
.asm_100858
- ld [StringBuffer2 + 2], a
+ ld [wStringBuffer2 + 2], a
ld a, [wcd6d]
ld c, a
ld a, $0a
sbc c
- ld [StringBuffer2 + 1], a
+ ld [wStringBuffer2 + 1], a
xor a
- ld [StringBuffer2], a
+ ld [wStringBuffer2], a
ld de, String_10088e
hlcoord 1, 14
call PlaceString
- ld de, StringBuffer2
+ ld de, wStringBuffer2
hlcoord 4, 16
call Function100697
ret
@@ -1425,13 +1425,13 @@ Function1008a6: ; 1008a6
ld hl, $a800
call GetSRAMBank
ld a, [hli]
- ld [StringBuffer2], a
+ ld [wStringBuffer2], a
ld a, [hli]
- ld [StringBuffer2 + 1], a
+ ld [wStringBuffer2 + 1], a
ld a, [hli]
- ld [StringBuffer2 + 2], a
+ ld [wStringBuffer2 + 2], a
call CloseSRAM
- ld a, [StringBuffer2 + 2]
+ ld a, [wStringBuffer2 + 2]
ld b, a
ld a, 0
sub b
@@ -1440,13 +1440,13 @@ Function1008a6: ; 1008a6
.asm_1008c8
ld b, a
- ld a, [StringBuffer2 + 1]
+ ld a, [wStringBuffer2 + 1]
ld c, a
ld a, $0a
sbc c
ld c, a
jr c, .asm_1008da
- ld a, [StringBuffer2]
+ ld a, [wStringBuffer2]
and a
jr nz, .asm_1008da
ret
@@ -1489,14 +1489,14 @@ Function100902: ; 100902
ld c, a
ld a, $0a
sub c
- ld [StringBuffer2], a
+ ld [wStringBuffer2], a
jr z, .asm_10093f
ld de, .string_100966
hlcoord 4, 11
call PlaceString
hlcoord 8, 11
lb bc, 1, 2
- ld de, StringBuffer2
+ ld de, wStringBuffer2
call PrintNum
ld de, SFX_TWO_PC_BEEPS
call PlaySFX
@@ -1528,7 +1528,7 @@ Function100970: ; 100970
hlcoord 0, 0
ld de, w3_dc00
call Function1009a5
- hlcoord 0, 0, AttrMap
+ hlcoord 0, 0, wAttrMap
ld de, w3_dd68
call Function1009a5
call Function1009d2
@@ -1543,7 +1543,7 @@ Function100989: ; 100989
call Function1009ae
farcall ReloadMapPart
ld hl, w3_dd68
- decoord 0, 0, AttrMap
+ decoord 0, 0, wAttrMap
call Function1009a5
ret
; 1009a5
@@ -1562,7 +1562,7 @@ Function1009ae: ; 1009ae
ld [rSVBK], a
ld hl, w3_d800
- decoord 0, 0, AttrMap
+ decoord 0, 0, wAttrMap
ld c, SCREEN_WIDTH
ld b, SCREEN_HEIGHT
.loop_row
@@ -1646,21 +1646,21 @@ _LinkBattleSendReceiveAction: ; 100a09
; 100a2e
.StageForSend: ; 100a2e
- ld a, [wPlayerAction]
+ ld a, [wBattlePlayerAction]
and a
jr nz, .switch
- ld a, [CurPlayerMove]
+ ld a, [wCurPlayerMove]
ld b, BATTLEACTION_E
cp STRUGGLE
jr z, .struggle
ld b, BATTLEACTION_D
cp $ff
jr z, .struggle
- ld a, [CurMoveNum]
+ ld a, [wCurMoveNum]
jr .use_move
.switch
- ld a, [CurPartyMon]
+ ld a, [wCurPartyMon]
add BATTLEACTION_SWITCH1
jr .use_move
@@ -1925,7 +1925,7 @@ MobileMoveSelectionScreen: ; 100b9f
.b_button
ld a, [wMenuCursorY]
dec a
- ld [CurMoveNum], a
+ ld [wCurMoveNum], a
ld a, $01
and a
ret
@@ -1933,17 +1933,17 @@ MobileMoveSelectionScreen: ; 100b9f
.a_button
ld a, [wMenuCursorY]
dec a
- ld [CurMoveNum], a
+ ld [wCurMoveNum], a
ld a, [wMenuCursorY]
dec a
ld c, a
ld b, 0
- ld hl, BattleMonPP
+ ld hl, wBattleMonPP
add hl, bc
ld a, [hl]
and $3f
jr z, .no_pp_left
- ld a, [PlayerDisableCount]
+ ld a, [wPlayerDisableCount]
swap a
and $0f
dec a
@@ -1953,10 +1953,10 @@ MobileMoveSelectionScreen: ; 100b9f
dec a
ld c, a
ld b, 0
- ld hl, BattleMonMoves
+ ld hl, wBattleMonMoves
add hl, bc
ld a, [hl]
- ld [CurPlayerMove], a
+ ld [wCurPlayerMove], a
xor a
ret
@@ -1978,12 +1978,12 @@ Function100c74: ; 100c74
ld b, 8
ld c, 8
call TextBox
- ld hl, BattleMonMoves
+ ld hl, wBattleMonMoves
ld de, wListMoves_MoveIndicesBuffer
ld bc, NUM_MOVES
call CopyBytes
ld a, SCREEN_WIDTH * 2
- ld [Buffer1], a
+ ld [wBuffer1], a
hlcoord 2, 10
predef ListMoves
ret
@@ -1995,7 +1995,7 @@ Function100c98: ; 100c98
ld a, [wNumMoves]
inc a
ld [w2DMenuNumRows], a
- ld a, [CurMoveNum]
+ ld a, [wCurMoveNum]
inc a
ld [wMenuCursorY], a
ret
@@ -2027,7 +2027,7 @@ Mobile_PartyMenuSelect: ; 100cb5
and c
jr z, .loop
call PlaceHollowCursor
- ld a, [PartyCount]
+ ld a, [wPartyCount]
inc a
ld b, a
ld a, [wMenuCursorY]
@@ -2040,13 +2040,13 @@ Mobile_PartyMenuSelect: ; 100cb5
jr nz, .done
ld a, [wMenuCursorY]
dec a
- ld [CurPartyMon], a
+ ld [wCurPartyMon], a
ld c, a
ld b, 0
- ld hl, PartySpecies
+ ld hl, wPartySpecies
add hl, bc
ld a, [hl]
- ld [CurPartySpecies], a
+ ld [wCurPartySpecies], a
ld de, SFX_READ_TEXT_2
call PlaySFX
call WaitSFX
@@ -2173,7 +2173,7 @@ Function100dc0: ; 100dc0
Mobile_SetOverworldDelay: ; 100dd2
ld a, 30
- ld [OverworldDelay], a
+ ld [wOverworldDelay], a
ret
; 100dd8
@@ -2199,7 +2199,7 @@ Function100dd8: ; 100dd8
; 100dfd
MobileComms_CheckInactivityTimer: ; 100dfd
- ld a, [OverworldDelay]
+ ld a, [wOverworldDelay]
ld c, a
ld a, 30
sub c
@@ -2227,7 +2227,7 @@ MobileComms_CheckInactivityTimer: ; 100dfd
; 100e2d
Function100e2d: ; 100e2d
- ld a, [OverworldDelay]
+ ld a, [wOverworldDelay]
ld c, a
ld a, 30
sub c
@@ -2378,21 +2378,21 @@ Function100efb: ; 100efb
asm_100f02:
ld a, c
- ld [StringBuffer2], a
+ ld [wStringBuffer2], a
; someting that was previously stored in de gets backed up to here
ld a, e
- ld [StringBuffer2 + 1], a
+ ld [wStringBuffer2 + 1], a
ld a, d
- ld [StringBuffer2 + 2], a
+ ld [wStringBuffer2 + 2], a
; empty this
xor a
- ld [StringBuffer2 + 4], a
- ld [StringBuffer2 + 5], a
+ ld [wStringBuffer2 + 4], a
+ ld [wStringBuffer2 + 5], a
.loop
ld a, [hl]
cp $ff
jr z, .done
- ld [StringBuffer2 + 3], a ; bank
+ ld [wStringBuffer2 + 3], a ; bank
push hl
inc hl
; addr 1
@@ -2418,16 +2418,16 @@ asm_100f02:
.done
; recover the values into bc
- ld a, [StringBuffer2 + 4]
+ ld a, [wStringBuffer2 + 4]
ld c, a
- ld a, [StringBuffer2 + 5]
+ ld a, [wStringBuffer2 + 5]
ld b, a
ret
; 100f3d
Function100f3d: ; 100f3d
; parameter
- ld a, [StringBuffer2]
+ ld a, [wStringBuffer2]
cp $02
jr z, .two
cp $01
@@ -2440,15 +2440,15 @@ Function100f3d: ; 100f3d
; what was once in de gets copied to hl,
; modified by Function100f8d, and put back
; into this backup
- ld a, [StringBuffer2 + 1]
+ ld a, [wStringBuffer2 + 1]
ld l, a
- ld a, [StringBuffer2 + 2]
+ ld a, [wStringBuffer2 + 2]
ld h, a
call Function100f8d
ld a, l
- ld [StringBuffer2 + 1], a
+ ld [wStringBuffer2 + 1], a
ld a, h
- ld [StringBuffer2 + 2], a
+ ld [wStringBuffer2 + 2], a
ret
.two
@@ -2456,15 +2456,15 @@ Function100f3d: ; 100f3d
; do the same as in .three
ld d, h
ld e, l
- ld a, [StringBuffer2 + 1]
+ ld a, [wStringBuffer2 + 1]
ld l, a
- ld a, [StringBuffer2 + 2]
+ ld a, [wStringBuffer2 + 2]
ld h, a
call Function100f8d
ld a, l
- ld [StringBuffer2 + 1], a
+ ld [wStringBuffer2 + 1], a
ld a, h
- ld [StringBuffer2 + 2], a
+ ld [wStringBuffer2 + 2], a
ret
.one
@@ -2474,31 +2474,31 @@ Function100f3d: ; 100f3d
; and store the de result
ld h, d
ld l, e
- ld a, [StringBuffer2 + 1]
+ ld a, [wStringBuffer2 + 1]
ld e, a
- ld a, [StringBuffer2 + 2]
+ ld a, [wStringBuffer2 + 2]
ld d, a
call Function100f8d
ld a, e
- ld [StringBuffer2 + 1], a
+ ld [wStringBuffer2 + 1], a
ld a, d
- ld [StringBuffer2 + 2], a
+ ld [wStringBuffer2 + 2], a
ret
; 100f8d
Function100f8d: ; 100f8d
push hl
- ld a, [StringBuffer2 + 4]
+ ld a, [wStringBuffer2 + 4]
ld l, a
- ld a, [StringBuffer2 + 5]
+ ld a, [wStringBuffer2 + 5]
ld h, a
add hl, bc
ld a, l
- ld [StringBuffer2 + 4], a
+ ld [wStringBuffer2 + 4], a
ld a, h
- ld [StringBuffer2 + 5], a
+ ld [wStringBuffer2 + 5], a
pop hl
- ld a, [StringBuffer2 + 3]
+ ld a, [wStringBuffer2 + 3]
bit 7, a
res 7, a
jr z, .sram
@@ -2524,12 +2524,12 @@ Unknown_100fc0: ; 100fc0
; Bit 7 set: Not SRAM
; Lower 7 bits: Bank
; Address, size (dw), address
- dbwww $80, PlayerName, NAME_LENGTH, OTPlayerName
- dbwww $80, PartyCount, 1 + PARTY_LENGTH + 1, OTPartyCount
- dbwww $80, PlayerID, 2, OTPlayerID
- dbwww $80, PartyMons, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH, OTPartyMons
- dbwww $80, PartyMonOT, NAME_LENGTH * PARTY_LENGTH, OTPartyMonOT
- dbwww $80, PartyMonNicknames, MON_NAME_LENGTH * PARTY_LENGTH, OTPartyMonNicknames
+ dbwww $80, wPlayerName, NAME_LENGTH, wOTPlayerName
+ dbwww $80, wPartyCount, 1 + PARTY_LENGTH + 1, wOTPartyCount
+ dbwww $80, wPlayerID, 2, wOTPlayerID
+ dbwww $80, wPartyMons, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH, wOTPartyMons
+ dbwww $80, wPartyMonOT, NAME_LENGTH * PARTY_LENGTH, wOTPartyMonOT
+ dbwww $80, wPartyMonNicknames, MON_NAME_LENGTH * PARTY_LENGTH, wOTPartyMonNicknames
db -1
Unknown_100feb: ; 100feb
@@ -2538,9 +2538,9 @@ Unknown_100feb: ; 100feb
Unknown_100ff3: ; 100ff3
dbwww $80, wdc41, 1, NULL
- dbwww $80, PlayerName, NAME_LENGTH, NULL
- dbwww $80, PlayerName, NAME_LENGTH, NULL
- dbwww $80, PlayerID, 2, NULL
+ dbwww $80, wPlayerName, NAME_LENGTH, NULL
+ dbwww $80, wPlayerName, NAME_LENGTH, NULL
+ dbwww $80, wPlayerID, 2, NULL
dbwww $80, wSecretID, 2, NULL
dbwww $80, wPlayerGender, 1, NULL
dbwww $04, $a603, 8, NULL
@@ -2548,17 +2548,17 @@ Unknown_100ff3: ; 100ff3
db -1
Unknown_10102c: ; 10102c
- dbwww $80, OTPlayerName, NAME_LENGTH, NULL
- dbwww $80, OTPlayerID, 2, NULL
- dbwww $80, OTPartyMonNicknames, MON_NAME_LENGTH * PARTY_LENGTH, NULL
- dbwww $80, OTPartyMonOT, NAME_LENGTH * PARTY_LENGTH, NULL
- dbwww $80, OTPartyMons, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH, NULL
+ dbwww $80, wOTPlayerName, NAME_LENGTH, NULL
+ dbwww $80, wOTPlayerID, 2, NULL
+ dbwww $80, wOTPartyMonNicknames, MON_NAME_LENGTH * PARTY_LENGTH, NULL
+ dbwww $80, wOTPartyMonOT, NAME_LENGTH * PARTY_LENGTH, NULL
+ dbwww $80, wOTPartyMons, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH, NULL
db -1
; 10104f
Function101050: ; 101050
call Function10107d
- ld a, [OTPartyCount]
+ ld a, [wOTPartyCount]
rept 2 ; ???
ld hl, wc608
endr
@@ -2583,7 +2583,7 @@ Function10107d: ; 10107d
ld hl, wc608
ld bc, wc7bd - wc608
call ByteFill
- ld hl, OTPlayerName
+ ld hl, wOTPlayerName
ld de, wc608
ld bc, NAME_LENGTH
call CopyBytes
@@ -2592,15 +2592,15 @@ Function10107d: ; 10107d
ld [wc608 + 11], a
ld a, [hl]
ld [wc608 + 12], a
- ld hl, OTPartyMonNicknames
+ ld hl, wOTPartyMonNicknames
ld de, wc608 + 13
ld bc, NAME_LENGTH
call .CopyAllFromOT
- ld hl, OTPartyMonOT
- ld de, OTClassName + 1
+ ld hl, wOTPartyMonOT
+ ld de, wOTClassName + 1
ld bc, NAME_LENGTH
call .CopyAllFromOT
- ld hl, OTPartyMon1Species
+ ld hl, wOTPartyMon1Species
ld de, $c699
ld bc, PARTYMON_STRUCT_LENGTH
call .CopyAllFromOT
@@ -2614,7 +2614,7 @@ Function10107d: ; 10107d
.CopyAllFromOT: ; 1010cd
push hl
ld hl, 0
- ld a, [OTPartyCount]
+ ld a, [wOTPartyCount]
call AddNTimes
ld b, h
ld c, l
@@ -2645,32 +2645,32 @@ Function1010de: ; 1010de
LoadSelectedPartiesForColosseum: ; 1010f2
xor a
- ld hl, StringBuffer2
+ ld hl, wStringBuffer2
ld bc, 9
call ByteFill
ld hl, wPlayerMonSelection
- ld de, PartyCount
+ ld de, wPartyCount
call .CopyThreeSpecies
ld hl, wPlayerMonSelection
- ld de, PartyMon1Species
+ ld de, wPartyMon1Species
call .CopyPartyStruct
ld hl, wPlayerMonSelection
- ld de, PartyMonOT
+ ld de, wPartyMonOT
call .CopyName
ld hl, wPlayerMonSelection
- ld de, PartyMonNicknames
+ ld de, wPartyMonNicknames
call .CopyName
ld hl, wOTMonSelection
- ld de, OTPartyCount
+ ld de, wOTPartyCount
call .CopyThreeSpecies
ld hl, wOTMonSelection
- ld de, OTPartyMon1Species
+ ld de, wOTPartyMon1Species
call .CopyPartyStruct
ld hl, wOTMonSelection
- ld de, OTPartyMonOT
+ ld de, wOTPartyMonOT
call .CopyName
ld hl, wOTMonSelection
- ld de, OTPartyMonNicknames
+ ld de, wOTPartyMonNicknames
call .CopyName
ret
; 101145
@@ -2678,7 +2678,7 @@ LoadSelectedPartiesForColosseum: ; 1010f2
.CopyThreeSpecies: ; 101145
; Load the 3 choices to the buffer
push de
- ld bc, StringBuffer2 + NAME_LENGTH_JAPANESE
+ ld bc, wStringBuffer2 + NAME_LENGTH_JAPANESE
xor a
.party_loop
push af
@@ -2694,7 +2694,7 @@ LoadSelectedPartiesForColosseum: ; 1010f2
ld a, 3
ld [de], a
inc de
- ld hl, StringBuffer2 + NAME_LENGTH_JAPANESE
+ ld hl, wStringBuffer2 + NAME_LENGTH_JAPANESE
ld bc, 3
call CopyBytes
ld a, $ff
@@ -2736,19 +2736,19 @@ LoadSelectedPartiesForColosseum: ; 1010f2
.ContinueCopy:
; Copy, via wc608...
ld a, LOW(wc608)
- ld [StringBuffer2], a
+ ld [wStringBuffer2], a
ld a, HIGH(wc608)
- ld [StringBuffer2 + 1], a
+ ld [wStringBuffer2 + 1], a
; ... bc bytes...
ld a, c
- ld [StringBuffer2 + 2], a
+ ld [wStringBuffer2 + 2], a
ld a, b
- ld [StringBuffer2 + 3], a
+ ld [wStringBuffer2 + 3], a
; ... to de...
ld a, e
- ld [StringBuffer2 + 4], a
+ ld [wStringBuffer2 + 4], a
ld a, d
- ld [StringBuffer2 + 5], a
+ ld [wStringBuffer2 + 5], a
; ... 3 times.
ld a, 3
.big_copy_loop
@@ -2760,15 +2760,15 @@ LoadSelectedPartiesForColosseum: ; 1010f2
call .GetCopySize
pop af
call AddNTimes
- ld a, [StringBuffer2]
+ ld a, [wStringBuffer2]
ld e, a
- ld a, [StringBuffer2 + 1]
+ ld a, [wStringBuffer2 + 1]
ld d, a
call CopyBytes
ld a, e
- ld [StringBuffer2], a
+ ld [wStringBuffer2], a
ld a, d
- ld [StringBuffer2 + 1], a
+ ld [wStringBuffer2 + 1], a
pop hl
pop af
dec a
@@ -2788,17 +2788,17 @@ LoadSelectedPartiesForColosseum: ; 1010f2
; 1011df
.GetDestinationAddress: ; 1011df
- ld a, [StringBuffer2 + 4]
+ ld a, [wStringBuffer2 + 4]
ld l, a
- ld a, [StringBuffer2 + 5]
+ ld a, [wStringBuffer2 + 5]
ld h, a
ret
; 1011e8
.GetCopySize: ; 1011e8
- ld a, [StringBuffer2 + 2]
+ ld a, [wStringBuffer2 + 2]
ld c, a
- ld a, [StringBuffer2 + 3]
+ ld a, [wStringBuffer2 + 3]
ld b, a
ret
; 1011f1
@@ -2849,7 +2849,7 @@ Function101231: ; 101231
Function10123d: ; 10123d
xor a
- ld [ScriptVar], a
+ ld [wScriptVar], a
ld a, c
ld hl, Jumptable_101247
rst JumpTable
@@ -3922,7 +3922,7 @@ Function1018fb: ; 1018fb
ld hl, wccb5
.asm_101909
- ld de, LinkBattleRNs
+ ld de, wLinkBattleRNs
ld bc, 10
call CopyBytes
ret
@@ -4045,9 +4045,9 @@ _StartMobileBattle: ; 1019ab
ld [rSVBK], a
ld a, c
- ld [OtherTrainerClass], a
- ld hl, OTPlayerName
- ld de, OTClassName
+ ld [wOtherTrainerClass], a
+ ld hl, wOTPlayerName
+ ld de, wOTClassName
ld bc, NAME_LENGTH
call CopyBytes
ld a, [wcd2f]
@@ -4062,7 +4062,7 @@ _StartMobileBattle: ; 1019ab
StartMobileBattle: ; 101a21
; force stereo and fast text speed
- ld hl, Options
+ ld hl, wOptions
ld a, [hl]
push af
and (1 << STEREO)
@@ -4078,7 +4078,7 @@ StartMobileBattle: ; 101a21
ld a, CONNECTION_NOT_ESTABLISHED
ld [hSerialConnectionStatus], a
pop af
- ld [Options], a
+ ld [wOptions], a
ret
; 101a4f
@@ -5053,7 +5053,7 @@ Function102142: ; 102142
Function102180: ; 102180
ld hl, wc608 + 1
- ld de, StringBuffer2
+ ld de, wStringBuffer2
ld bc, 11
call CopyBytes
ret
@@ -5086,7 +5086,7 @@ Function1021b8: ; 1021b8
ld de, wPlayerMoveStruct
farcall Function8ac70
ld a, c
- ld [StringBuffer1], a
+ ld [wStringBuffer1], a
push af
call Function1013aa
pop af
@@ -5215,7 +5215,7 @@ Function102274: ; 102274
Function102283: ; 102283
ld a, $01
- ld [AttrMapEnd], a
+ ld [wAttrMapEnd], a
ld hl, wcd4b
set 0, [hl]
ret
@@ -5223,7 +5223,7 @@ Function102283: ; 102283
Function10228e: ; 10228e
xor a
- ld [AttrMapEnd], a
+ ld [wAttrMapEnd], a
ld hl, wcd4b
res 0, [hl]
ret
@@ -5255,13 +5255,13 @@ Function102298: ; 102298
.asm_1022c1
call Function10304f
ld a, $01
- ld [AttrMapEnd], a
+ ld [wAttrMapEnd], a
ret
; 1022ca
Function1022ca: ; 1022ca
ld a, 30
- ld [OverworldDelay], a
+ ld [wOverworldDelay], a
ret
; 1022d0
@@ -5271,7 +5271,7 @@ Function1022d0: ; 1022d0
and a
jr nz, .asm_1022f3
call Function102298
- ld a, [OverworldDelay]
+ ld a, [wOverworldDelay]
ld c, a
ld a, 30
sub c
@@ -5409,18 +5409,18 @@ Function1023c6: ; 1023c6
call Function102c87
ld a, [wcd4c]
dec a
- ld [CurPartyMon], a
+ ld [wCurPartyMon], a
xor a
ld [wPokemonWithdrawDepositParameter], a
farcall RemoveMonFromPartyOrBox
- ld hl, PartyCount
+ ld hl, wPartyCount
inc [hl]
ld a, [hli]
ld c, a
ld b, 0
add hl, bc
ld [hl], $ff
- ld a, [PartyCount]
+ ld a, [wPartyCount]
ld [wcd4c], a
call Function102c07
call Function102d48
@@ -5749,11 +5749,11 @@ Function1025ff: ; 1025ff
.d_up
ld a, [wMenuCursorY]
ld b, a
- ld a, [OTPartyCount]
+ ld a, [wOTPartyCount]
cp b
ret nz
call HideCursor
- ld a, [PartyCount]
+ ld a, [wPartyCount]
ld [wMenuCursorY], a
ld a, $1d ; Function102652
ld [wcd49], a
@@ -5820,7 +5820,7 @@ Function10266b: ; 10266b
.d_up
ld a, [wMenuCursorY]
ld b, a
- ld a, [PartyCount]
+ ld a, [wPartyCount]
cp b
ret nz
ld a, $23 ; Function1026b7
@@ -5886,7 +5886,7 @@ Function1026f3: ; 1026f3
.asm_102712
hlcoord 9, 17
ld [hl], " "
- ld a, [OTPartyCount]
+ ld a, [wOTPartyCount]
ld [wMenuCursorY], a
ld a, $1f ; Function1025e9
ld [wcd49], a
@@ -6128,7 +6128,7 @@ Function1028bf: ; 1028bf
Function1028c6: ; 1028c6
xor a
- ld [MonType], a
+ ld [wMonType], a
call Function102bac
ld a, $1d ; Function102652
ld [wcd49], a
@@ -6142,7 +6142,7 @@ Function1028d3: ; 1028d3
Function1028da: ; 1028da
ld a, OTPARTYMON
- ld [MonType], a
+ ld [wMonType], a
call Function102bac
ld a, $1f ; Function1025e9
ld [wcd49], a
@@ -6204,7 +6204,7 @@ Function102933: ; 102933
call LoadMenuHeader
call Function102e07
ld a, $32
- ld [TextDelayFrames], a
+ ld [wTextDelayFrames], a
ld hl, wcd4b
set 1, [hl]
ld a, [wcd4a]
@@ -6215,7 +6215,7 @@ Function102933: ; 102933
; 10294f
Function10294f: ; 10294f
- ld a, [TextDelayFrames]
+ ld a, [wTextDelayFrames]
and a
ret nz
ld a, [wcd4a]
@@ -6367,7 +6367,7 @@ MenuData3_102a33:
Function102a3b: ; 102a3b
ld a, [wcd30]
ld [wc74e], a
- ld hl, PlayerName
+ ld hl, wPlayerName
ld de, wPlayerTrademonSenderName
ld bc, NAME_LENGTH
call CopyBytes
@@ -6375,20 +6375,20 @@ Function102a3b: ; 102a3b
dec a
ld c, a
ld b, 0
- ld hl, PartySpecies
+ ld hl, wPartySpecies
add hl, bc
ld a, [hl]
ld [wPlayerTrademonSpecies], a
ld a, [wcd4c]
dec a
- ld hl, PartyMonOT
+ ld hl, wPartyMonOT
call SkipNames
ld de, wPlayerTrademonOTName
ld bc, NAME_LENGTH
call CopyBytes
ld a, [wcd4c]
dec a
- ld hl, PartyMon1ID
+ ld hl, wPartyMon1ID
call GetPartyLocation
ld a, [hli]
ld [wPlayerTrademonID], a
@@ -6396,7 +6396,7 @@ Function102a3b: ; 102a3b
ld [wPlayerTrademonID + 1], a
ld a, [wcd4c]
dec a
- ld hl, PartyMon1DVs
+ ld hl, wPartyMon1DVs
call GetPartyLocation
ld a, [hli]
ld [wPlayerTrademonDVs], a
@@ -6404,14 +6404,14 @@ Function102a3b: ; 102a3b
ld [wPlayerTrademonDVs + 1], a
ld a, [wcd4c]
dec a
- ld hl, PartyMon1Species
+ ld hl, wPartyMon1Species
call GetPartyLocation
ld b, h
ld c, l
farcall GetCaughtGender
ld a, c
ld [wPlayerTrademonCaughtData], a
- ld hl, OTPlayerName
+ ld hl, wOTPlayerName
ld de, wOTTrademonSenderName
ld bc, NAME_LENGTH
call CopyBytes
@@ -6420,20 +6420,20 @@ Function102a3b: ; 102a3b
dec a
ld c, a
ld b, 0
- ld hl, OTPartySpecies
+ ld hl, wOTPartySpecies
add hl, bc
ld a, [hl]
ld [wOTTrademonSpecies], a
ld a, [wcd4d]
dec a
- ld hl, OTPartyMonOT
+ ld hl, wOTPartyMonOT
call SkipNames
ld de, wOTTrademonOTName
ld bc, NAME_LENGTH
call CopyBytes
ld a, [wcd4d]
dec a
- ld hl, OTPartyMon1ID
+ ld hl, wOTPartyMon1ID
call GetPartyLocation
ld a, [hli]
ld [wOTTrademonID], a
@@ -6441,7 +6441,7 @@ Function102a3b: ; 102a3b
ld [wOTTrademonID + 1], a
ld a, [wcd4d]
dec a
- ld hl, OTPartyMon1DVs
+ ld hl, wOTPartyMon1DVs
call GetPartyLocation
ld a, [hli]
ld [wOTTrademonDVs], a
@@ -6449,7 +6449,7 @@ Function102a3b: ; 102a3b
ld [wOTTrademonDVs + 1], a
ld a, [wcd4d]
dec a
- ld hl, OTPartyMon1Species
+ ld hl, wOTPartyMon1Species
call GetPartyLocation
ld b, h
ld c, l
@@ -6480,7 +6480,7 @@ Function102b12: ; 102b12
Function102b32: ; 102b32
ld a, [wcd4c]
dec a
- ld [CurPartyMon], a
+ ld [wCurPartyMon], a
ld a, $01
ld [wForceEvolution], a
farcall EvolvePokemon
@@ -6492,14 +6492,14 @@ Function102b32: ; 102b32
Function102b4e: ; 102b4e
ld a, OTPARTYMON
- ld [MonType], a
+ ld [wMonType], a
ld a, [wMenuCursorY]
push af
ld de, Unknown_102b73
call SetMenuAttributes
pop af
ld [wMenuCursorY], a
- ld a, [OTPartyCount]
+ ld a, [wOTPartyCount]
ld [w2DMenuNumRows], a
ret
; 102b68
@@ -6521,14 +6521,14 @@ Unknown_102b73:
Function102b7b: ; 102b7b
xor a
- ld [MonType], a
+ ld [wMonType], a
ld a, [wMenuCursorY]
push af
ld de, Unknown_102b94
call SetMenuAttributes
pop af
ld [wMenuCursorY], a
- ld a, [PartyCount]
+ ld a, [wPartyCount]
ld [w2DMenuNumRows], a
ret
; 102b94
@@ -6553,11 +6553,11 @@ Function102b9c: ; 102b9c
Function102bac: ; 102bac
ld a, [wMenuCursorY]
dec a
- ld [CurPartyMon], a
+ ld [wCurPartyMon], a
call LowVolume
call ClearSprites
farcall _MobileStatsScreenInit
- ld a, [CurPartyMon]
+ ld a, [wCurPartyMon]
inc a
ld [wMenuCursorY], a
call Function102d9a
@@ -6573,13 +6573,13 @@ Function102bac: ; 102bac
Function102bdc: ; 102bdc
ld a, [wcd4d]
dec a
- ld hl, OTPartyMon1Species
+ ld hl, wOTPartyMon1Species
call GetPartyLocation
push hl
ld a, [wcd4d]
ld c, a
ld b, 0
- ld hl, OTPartyCount
+ ld hl, wOTPartyCount
add hl, bc
ld a, [hl]
pop hl
@@ -6611,32 +6611,32 @@ Function102c07: ; 102c07
; 102c14
Function102c14: ; 102c14
- ld hl, PartySpecies
- ld de, OTPartySpecies
+ ld hl, wPartySpecies
+ ld de, wOTPartySpecies
ld bc, 1
call Function102c71
ret
; 102c21
Function102c21: ; 102c21
- ld hl, PartyMonNicknames
- ld de, OTPartyMonNicknames
+ ld hl, wPartyMonNicknames
+ ld de, wOTPartyMonNicknames
ld bc, 11
call Function102c71
ret
; 102c2e
Function102c2e: ; 102c2e
- ld hl, PartyMonOT
- ld de, OTPartyMonOT
+ ld hl, wPartyMonOT
+ ld de, wOTPartyMonOT
ld bc, 11
call Function102c71
ret
; 102c3b
Function102c3b: ; 102c3b
- ld hl, PartyMon1
- ld de, OTPartyMon1
+ ld hl, wPartyMon1
+ ld de, wOTPartyMon1
ld bc, $30
call Function102c71
ret
@@ -6681,7 +6681,7 @@ Function102c87: ; 102c87
push af
ld a, [wcd4c]
ld [wJumptableIndex], a
- ld a, [PartyCount]
+ ld a, [wPartyCount]
ld [wcf64], a
ld a, 0
ld hl, $a600
@@ -6696,7 +6696,7 @@ Function102c87: ; 102c87
call Function102d3e
ld a, [wcd4d]
ld [wJumptableIndex], a
- ld a, [OTPartyCount]
+ ld a, [wOTPartyCount]
ld [wcf64], a
ld a, $05
ld hl, w5_da00
@@ -6770,7 +6770,7 @@ Function102d48: ; 102d48
ld a, [wcd4c]
ld e, a
ld d, 0
- ld hl, PartyCount
+ ld hl, wPartyCount
add hl, de
ld a, [hl]
ld [wd265], a
@@ -6781,7 +6781,7 @@ Function102d48: ; 102d48
ld a, [wcd4c]
dec a
ld bc, PARTYMON_STRUCT_LENGTH
- ld hl, PartyMon1Happiness
+ ld hl, wPartyMon1Happiness
call AddNTimes
ld [hl], BASE_HAPPINESS
@@ -6792,14 +6792,14 @@ Function102d48: ; 102d48
ld a, [wcd4c]
dec a
ld bc, PARTYMON_STRUCT_LENGTH
- ld hl, PartyMon1DVs
+ ld hl, wPartyMon1DVs
call AddNTimes
predef GetUnownLetter
farcall UpdateUnownDex
ld a, [wFirstUnownSeen]
and a
jr nz, .asm_102d98
- ld a, [UnownLetter]
+ ld a, [wUnownLetter]
ld [wFirstUnownSeen], a
.asm_102d98
@@ -6813,7 +6813,7 @@ Function102d9a: ; 102d9a
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
ld a, $07
- hlcoord 0, 0, AttrMap
+ hlcoord 0, 0, wAttrMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
farcall HDMATransferAttrMapAndTileMapToWRAMBank3
@@ -6905,21 +6905,21 @@ Function102e3e: ; 102e3e
Function102e4f: ; 102e4f
farcall Function16d42e
farcall _InitMG_Mobile_LinkTradePalMap
- ld de, PlayerName
+ ld de, wPlayerName
hlcoord 4, 0
call PlaceString
ld a, $14
ld [bc], a
- ld de, OTPlayerName
+ ld de, wOTPlayerName
hlcoord 4, 8
call PlaceString
ld a, $14
ld [bc], a
hlcoord 7, 1
- ld de, PartySpecies
+ ld de, wPartySpecies
call .PlaceSpeciesNames
hlcoord 7, 9
- ld de, OTPartySpecies
+ ld de, wOTPartySpecies
call .PlaceSpeciesNames
ret
; 102e86
@@ -6956,20 +6956,20 @@ Function102ea8: ; 102ea8
dec a
ld c, a
ld b, 0
- ld hl, PartySpecies
+ ld hl, wPartySpecies
add hl, bc
ld a, [hl]
ld [wd265], a
call GetPokemonName
- ld hl, StringBuffer1
- ld de, StringBuffer2
+ ld hl, wStringBuffer1
+ ld de, wStringBuffer2
ld bc, 11
call CopyBytes
ld a, [wcd4d]
dec a
ld c, a
ld b, 0
- ld hl, OTPartySpecies
+ ld hl, wOTPartySpecies
add hl, bc
ld a, [hl]
ld [wd265], a
@@ -7049,7 +7049,7 @@ Function102f85: ; 102f85
ld a, [wd003]
ld c, a
ld b, 0
- ld hl, OTPartySpecies
+ ld hl, wOTPartySpecies
add hl, bc
ld a, [hl]
ld [wd265], a
@@ -7058,7 +7058,7 @@ Function102f85: ; 102f85
ld de, String_102fb2
hlcoord 1, 14
call PlaceString
- ld de, StringBuffer1
+ ld de, wStringBuffer1
hlcoord 13, 14
call PlaceString
ld de, String_102fcc
@@ -7120,7 +7120,7 @@ String_10302e: ; 10302e
Function10304f: ; 10304f
xor a
- ld [AttrMapEnd], a
+ ld [wAttrMapEnd], a
ld [wcf42], a
ld [wcf44], a
ld [wcf45], a
@@ -7129,7 +7129,7 @@ Function10304f: ; 10304f
Function10305d: ; 10305d
nop
- ld a, [AttrMapEnd]
+ ld a, [wAttrMapEnd]
and a
ret z
call Function10307f
@@ -7143,7 +7143,7 @@ Function10306e: ; 10306e
ld a, $01
ld [hOAMUpdate], a
call ClearSprites
- ld de, Sprites
+ ld de, wVirtualOAM
call Function1030cd
xor a
ld [hOAMUpdate], a
@@ -7361,7 +7361,7 @@ Function103302: ; 103302
Function103309: ; 103309
xor a
ld [hBGMapMode], a
- ld hl, Buffer1
+ ld hl, wBuffer1
ld bc, 10
xor a
call ByteFill
@@ -7369,7 +7369,7 @@ Function103309: ; 103309
call GetSRAMBank
ld a, [wdc41]
ld [$a60c], a
- ld [Buffer1], a
+ ld [wBuffer1], a
call CloseSRAM
call Function1035c6
ld a, [hli]
@@ -7412,15 +7412,15 @@ Function103362: ; 103362
call Function10339a
call Function10342c
farcall HDMATransferTileMapToWRAMBank3
- ld a, [Buffer2]
+ ld a, [wBuffer2]
bit 7, a
jr z, .asm_103362
- ld hl, Buffer2
+ ld hl, wBuffer2
bit 6, [hl]
jr z, .asm_103398
ld a, $04
call GetSRAMBank
- ld a, [Buffer1]
+ ld a, [wBuffer1]
ld [$a60c], a
ld [wdc41], a
call CloseSRAM
@@ -7488,7 +7488,7 @@ Function1033af: ; 1033af
.b
call PlayClickSFX
- ld hl, Buffer2
+ ld hl, wBuffer2
set 7, [hl]
ret
@@ -7498,9 +7498,9 @@ Function1033af: ; 1033af
jr nz, .a_return
ld de, SFX_TRANSACTION
call PlaySFX
- ld hl, Buffer2
+ ld hl, wBuffer2
set 7, [hl]
- ld hl, Buffer2
+ ld hl, wBuffer2
set 6, [hl]
ret
@@ -7514,9 +7514,9 @@ Function1033af: ; 1033af
call PlaySFX
ld bc, 8
call Function10350f
- ld a, [Buffer1]
+ ld a, [wBuffer1]
xor e
- ld [Buffer1], a
+ ld [wBuffer1], a
ret
; 10342c
@@ -7554,7 +7554,7 @@ Function10343c: ; 10343c
call Function103487
ld bc, 8
call Function10350f
- ld a, [Buffer1]
+ ld a, [wBuffer1]
and e
ld bc, 2
jr z, .asm_10347d
@@ -7628,7 +7628,7 @@ Function1034e0: ; 1034e0
push hl
call ClearBox
pop hl
- ld bc, AttrMap - TileMap
+ ld bc, wAttrMap - wTileMap
add hl, bc
pop bc
ld a, $06
@@ -7768,7 +7768,7 @@ AskMobileOrCable: ; 103612
call CloseWindow
jr c, .pressed_b
ld a, [wMenuCursorY]
- ld [ScriptVar], a
+ ld [wScriptVar], a
ld c, a
ld a, [wMobileOrCable_LastSelection]
and $f0
@@ -7778,7 +7778,7 @@ AskMobileOrCable: ; 103612
.pressed_b
xor a
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
; 103640
@@ -7826,12 +7826,12 @@ Mobile_SelectThreeMons: ; 10366e
.asm_103690
ld a, $01
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
.asm_103696
xor a
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
.asm_10369b
@@ -7871,7 +7871,7 @@ Mobile_SelectThreeMons: ; 10366e
.asm_1036e6
ld a, $01
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
.asm_1036ec
@@ -7881,7 +7881,7 @@ Mobile_SelectThreeMons: ; 10366e
.asm_1036f4
xor a
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
; 1036f9
@@ -7900,8 +7900,8 @@ Function103700: ; 103700
.asm_10370f
ld a, c
- ld [StringBuffer2], a
- ld a, [StringBuffer2]
+ ld [wStringBuffer2], a
+ ld a, [wStringBuffer2]
cp $05
jr nc, .asm_103724
cp $02
@@ -8003,7 +8003,7 @@ Function10378c: ; 10378c
pop bc
jr c, .failed_to_save
ld a, 1
- ld [ScriptVar], a
+ ld [wScriptVar], a
ld a, c
and a
ret z
@@ -8012,7 +8012,7 @@ Function10378c: ; 10378c
.failed_to_save
xor a
- ld [ScriptVar], a
+ ld [wScriptVar], a
ld a, c
and a
ret z
@@ -8032,13 +8032,13 @@ Function1037c2: ; 1037c2
call YesNoBox
jr c, .nope
ld a, $01
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
.nope
xor a
ld [wdc5f], a
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
; 1037e6
@@ -8057,7 +8057,7 @@ Function1037eb: ; 1037eb
call PrintText
call JoyWaitAorB
xor a
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
.asm_103807
@@ -8065,12 +8065,12 @@ Function1037eb: ; 1037eb
and a
jr nz, .asm_103813
ld a, $01
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
.asm_103813
ld a, $02
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
; 103819
@@ -8121,12 +8121,12 @@ Function10383c: ; 10383c
ld bc, 3
call CopyBytes
xor a
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
.asm_103870
ld a, $01
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
; 103876
@@ -8141,7 +8141,7 @@ Function10387b: ; 10387b
ret nz
farcall Function1008a6
ld a, c
- ld [StringBuffer2], a
+ ld [wStringBuffer2], a
ld hl, UnknownText_0x103898
call PrintText
call JoyWaitAorB
diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm
index 57692d8a8..93c5a6f88 100755
--- a/mobile/mobile_41.asm
+++ b/mobile/mobile_41.asm
@@ -7,7 +7,7 @@ StubbedTrainerRankings_HallOfFame2:: ; 0x105ef6
ld a, BANK(sTrainerRankingGameTimeHOF)
call GetSRAMBank
- ld hl, GameTimeHours
+ ld hl, wGameTimeHours
ld de, sTrainerRankingGameTimeHOF
ld bc, 4
call CopyBytes
@@ -38,7 +38,7 @@ StubbedTrainerRankings_MagikarpLength: ; 105f33
ret
ld a, BANK(sTrainerRankingLongestMagikarp)
call GetSRAMBank
- ld de, Buffer1
+ ld de, wBuffer1
ld hl, sTrainerRankingLongestMagikarp
; Is this Magikarp the longest measured?
@@ -270,7 +270,7 @@ StubbedTrainerRankings_TMsHMsTaught: ; 106049
StubbedTrainerRankings_Battles: ; 106050
ret
- ld a, [BattleType]
+ ld a, [wBattleType]
cp BATTLETYPE_TUTORIAL ; Exclude the Dude’s tutorial battle
ret z
ld hl, sTrainerRankingBattles
@@ -278,7 +278,7 @@ StubbedTrainerRankings_Battles: ; 106050
StubbedTrainerRankings_WildBattles: ; 10605d
ret
- ld a, [BattleType]
+ ld a, [wBattleType]
cp BATTLETYPE_TUTORIAL ; Exclude the Dude’s tutorial battle
ret z
ld hl, sTrainerRankingWildBattles
@@ -814,7 +814,7 @@ endr
Mobile_DummyReturnFalse: ; 10630f
xor a
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
; 106314
@@ -1071,7 +1071,7 @@ Function106464:: ; 106464
; 10649b
Function10649b: ; 10649b
- ld a, [TextBoxFrame]
+ ld a, [wTextBoxFrame]
maskbits NUM_FRAMES
ld bc, 6 * LEN_1BPP_TILE
ld hl, Frames
diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm
index ff815df3e..eeedffb5a 100644
--- a/mobile/mobile_42.asm
+++ b/mobile/mobile_42.asm
@@ -91,11 +91,11 @@ RunMobileTradeAnim_Frontpics: ; 10805b
push af
xor a
ld [hMapAnims], a
- ld hl, VramState
+ ld hl, wVramState
ld a, [hl]
push af
res 0, [hl]
- ld hl, Options
+ ld hl, wOptions
ld a, [hl]
push af
set NO_TEXT_SCROLL, [hl]
@@ -104,9 +104,9 @@ RunMobileTradeAnim_Frontpics: ; 10805b
call MobileTradeAnim_JumptableLoop
jr nc, .loop
pop af
- ld [Options], a
+ ld [wOptions], a
pop af
- ld [VramState], a
+ ld [wVramState], a
pop af
ld [hMapAnims], a
ret
@@ -121,11 +121,11 @@ RunMobileTradeAnim_NoFrontpics: ; 108089
push af
xor a
ld [hMapAnims], a
- ld hl, VramState
+ ld hl, wVramState
ld a, [hl]
push af
res 0, [hl]
- ld hl, Options
+ ld hl, wOptions
ld a, [hl]
push af
set NO_TEXT_SCROLL, [hl]
@@ -134,9 +134,9 @@ RunMobileTradeAnim_NoFrontpics: ; 108089
call MobileTradeAnim_JumptableLoop
jr nc, .loop
pop af
- ld [Options], a
+ ld [wOptions], a
pop af
- ld [VramState], a
+ ld [wVramState], a
pop af
ld [hMapAnims], a
ret
@@ -292,8 +292,8 @@ MobileTradeAnim_GetFrontpic: ; 1081e9
push af
predef GetUnownLetter
pop af
- ld [CurPartySpecies], a
- ld [CurSpecies], a
+ ld [wCurPartySpecies], a
+ ld [wCurSpecies], a
call GetBaseData
pop de
predef GetMonFrontpic
@@ -305,8 +305,8 @@ Function108201: ; 108201
push af
predef GetUnownLetter
pop af
- ld [CurPartySpecies], a
- ld [CurSpecies], a
+ ld [wCurPartySpecies], a
+ ld [wCurSpecies], a
call GetBaseData
pop de
predef GetAnimatedFrontpic
@@ -314,7 +314,7 @@ Function108201: ; 108201
; 108219
Function108219: ; 108219
- ld [CurPartySpecies], a
+ ld [wCurPartySpecies], a
hlcoord 7, 2
ld d, $0
ld e, ANIM_MON_TRADE
@@ -323,7 +323,7 @@ Function108219: ; 108219
; 108229
Function108229: ; 108229
- ld [CurPartySpecies], a
+ ld [wCurPartySpecies], a
hlcoord 7, 2
ld d, $0
ld e, ANIM_MON_TRADE
@@ -335,7 +335,7 @@ MobileTradeAnim_InitSpeciesName: ; 108239
push de
ld [wd265], a
call GetPokemonName
- ld hl, StringBuffer1
+ ld hl, wStringBuffer1
pop de
ld bc, MON_NAME_LENGTH
call CopyBytes
@@ -485,12 +485,12 @@ MobileTradeAnim_ShowPlayerMonToBeSent: ; 10830e
ld [hWY], a
call MobileTradeAnim_DisplayMonToBeSent
ld a, [wPlayerTrademonSpecies]
- ld [CurPartySpecies], a
+ ld [wCurPartySpecies], a
call Function10895e
ld a, [wPlayerTrademonDVs]
- ld [TempMonDVs], a
+ ld [wTempMonDVs], a
ld a, [wPlayerTrademonDVs + 1]
- ld [TempMonDVs + 1], a
+ ld [wTempMonDVs + 1], a
ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld a, %11100100 ; 3,2,1,0
@@ -546,7 +546,7 @@ MobileTradeAnim_ShowOTMonFromTrade: ; 10839b
call DisableLCD
call MobileTradeAnim_ClearBGMap
ld a, [wOTTrademonSpecies]
- ld [CurPartySpecies], a
+ ld [wCurPartySpecies], a
ld hl, wOTTrademonDVs
ld de, vTiles2
call Function108201
@@ -579,11 +579,11 @@ MobileTradeAnim_ShowOTMonFromTrade: ; 10839b
ld a, $50
ld [hWY], a
ld a, [wOTTrademonSpecies]
- ld [CurPartySpecies], a
+ ld [wCurPartySpecies], a
ld a, [wOTTrademonDVs]
- ld [TempMonDVs], a
+ ld [wTempMonDVs], a
ld a, [wOTTrademonDVs + 1]
- ld [TempMonDVs + 1], a
+ ld [wTempMonDVs + 1], a
ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld a, %11100100 ; 3,2,1,0
@@ -610,7 +610,7 @@ MobileTradeAnim_ShowPlayerMonForGTS: ; 10842c
ld [hWY], a
call MobileTradeAnim_DisplayMonToBeSent
ld a, [wPlayerTrademonSpecies]
- ld [CurPartySpecies], a
+ ld [wCurPartySpecies], a
ld hl, wPlayerTrademonDVs
call Function10898a
call DelayFrame
@@ -623,9 +623,9 @@ MobileTradeAnim_ShowPlayerMonForGTS: ; 10842c
lb bc, BANK(TradePoofGFX), 12
call Request2bpp
ld a, [wPlayerTrademonDVs]
- ld [TempMonDVs], a
+ ld [wTempMonDVs], a
ld a, [wPlayerTrademonDVs + 1]
- ld [TempMonDVs + 1], a
+ ld [wTempMonDVs + 1], a
ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld a, %11100100 ; 3,2,1,0
@@ -681,7 +681,7 @@ MobileTradeAnim_ShowOTMonFromGTS: ; 1084d7
call DisableLCD
call MobileTradeAnim_ClearBGMap
ld a, [wOTTrademonSpecies]
- ld [CurPartySpecies], a
+ ld [wCurPartySpecies], a
ld hl, wOTTrademonDVs
ld de, vTiles2
call Function108201
@@ -723,11 +723,11 @@ MobileTradeAnim_ShowOTMonFromGTS: ; 1084d7
ld a, $50
ld [hWY], a
ld a, [wOTTrademonSpecies]
- ld [CurPartySpecies], a
+ ld [wCurPartySpecies], a
ld a, [wOTTrademonDVs]
- ld [TempMonDVs], a
+ ld [wTempMonDVs], a
ld a, [wOTTrademonDVs + 1]
- ld [TempMonDVs + 1], a
+ ld [wTempMonDVs + 1], a
ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld a, %11100100 ; 3,2,1,0
@@ -750,7 +750,7 @@ MobileTradeAnim_GetOddEgg: ; 108589
call DisableLCD
call MobileTradeAnim_ClearBGMap
ld a, [wOTTrademonSpecies]
- ld [CurPartySpecies], a
+ ld [wCurPartySpecies], a
ld hl, wOTTrademonDVs
ld de, vTiles2
call Function108201
@@ -792,11 +792,11 @@ MobileTradeAnim_GetOddEgg: ; 108589
ld a, $50
ld [hWY], a
ld a, [wOTTrademonSpecies]
- ld [CurPartySpecies], a
+ ld [wCurPartySpecies], a
ld a, [wOTTrademonDVs]
- ld [TempMonDVs], a
+ ld [wTempMonDVs], a
ld a, [wOTTrademonDVs + 1]
- ld [TempMonDVs + 1], a
+ ld [wTempMonDVs + 1], a
ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld a, %11100100 ; 3,2,1,0
diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm
index b3b6fef12..6bcced09e 100644
--- a/mobile/mobile_45.asm
+++ b/mobile/mobile_45.asm
@@ -650,7 +650,7 @@ Function1144d1: ; 1144d1
ld a, [de]
ld [hl], a
xor a
- ld [BigDoll], a
+ ld [wDecoBigDoll], a
ld [$dc17], a
ld a, $2
ld [$dc0e], a
@@ -691,7 +691,7 @@ Function1144d1: ; 1144d1
ld a, [$dc0d]
ld [de], a
ld b, $0
- ld a, [BigDoll]
+ ld a, [wDecoBigDoll]
and a
jr z, .asm_114537
ld b, $1
@@ -753,7 +753,7 @@ Function114561: ; 114561
Function114576: ; 114576
xor a
- ld [Bed], a
+ ld [wDecoBed], a
ld b, $7
call Function1143f3
cp $2
@@ -802,7 +802,7 @@ Function114576: ; 114576
.asm_1145bf
ld a, $1
- ld [Bed], a
+ ld [wDecoBed], a
ret
; 1145c5
@@ -895,7 +895,7 @@ Function1145c5: ; 1145c5
.asm_114636
ld a, b
- ld [PartyMon5Defense], a
+ ld [wPartyMon5Defense], a
xor a
ret
@@ -906,7 +906,7 @@ Function11463c: ; 11463c
push af
push de
ld hl, $ddc8
- ld a, [PartyMon5Defense]
+ ld a, [wPartyMon5Defense]
ld b, a
.asm_114648
ld a, [de]
@@ -924,7 +924,7 @@ Function11463c: ; 11463c
cp $d
jr nz, .asm_11468a
xor a
- ld [Carpet], a
+ ld [wDecoCarpet], a
.asm_114662
inc e
call z, Function11469b
@@ -947,7 +947,7 @@ Function11463c: ; 11463c
inc e
call z, Function11469b
ld a, $1
- ld [Carpet], a
+ ld [wDecoCarpet], a
ld a, [de]
cp $d
jr z, .asm_114662
@@ -959,7 +959,7 @@ Function11463c: ; 11463c
ld [hFF8C], a
ld [MBC3SRamBank], a
xor a
- ld [Carpet], a
+ ld [wDecoCarpet], a
ld a, $1
ret
@@ -1021,7 +1021,7 @@ Function1146a4: ; 1146a4
and a
jr z, .asm_1146f5
ld a, $1
- ld [BigDoll], a
+ ld [wDecoBigDoll], a
jr .asm_1146da
.asm_1146f5
@@ -1057,7 +1057,7 @@ Function1146fa: ; 1146fa
ld [hFF8C], a
ld [MBC3SRamBank], a
ld a, $1
- ld [RightOrnament], a
+ ld [wDecoRightOrnament], a
call Function1147cd
and a
jp nz, .asm_1147b7
@@ -1069,13 +1069,13 @@ Function1146fa: ; 1146fa
and a
jr z, .asm_114794
ld a, $1
- ld [BigDoll], a
+ ld [wDecoBigDoll], a
.asm_114749
call Function11494d
and a
jr nz, .asm_11478a
- ld a, [BigDoll]
+ ld a, [wDecoBigDoll]
and a
jr nz, .asm_114786
ld hl, $dc03
@@ -1102,7 +1102,7 @@ Function1146fa: ; 1146fa
ld a, [$dc0d]
inc a
ld [$dc0d], a
- ld a, [BigDoll]
+ ld a, [wDecoBigDoll]
and a
jr z, .asm_114799
@@ -1127,7 +1127,7 @@ Function1146fa: ; 1146fa
ret
.asm_114799
- ld a, [Carpet]
+ ld a, [wDecoCarpet]
and a
jr z, .asm_114737
jr .asm_1147cb
@@ -1141,14 +1141,14 @@ Function1146fa: ; 1146fa
and a
jr z, .asm_1147cb
xor a
- ld [BigDoll], a
+ ld [wDecoBigDoll], a
.asm_1147b7
ld a, [$dc17]
and a
jr z, .asm_114794
ld a, $1
- ld [BigDoll], a
+ ld [wDecoBigDoll], a
ld a, [$dc0d]
cp $1
jr nz, .asm_114773
@@ -1162,7 +1162,7 @@ Function1146fa: ; 1146fa
Function1147cd: ; 1147cd
ld bc, NULL
- ld a, [RightOrnament]
+ ld a, [wDecoRightOrnament]
and a
jr nz, .asm_11480c
.asm_1147d6
@@ -1364,7 +1364,7 @@ Function1148c2: ; 1148c2
call z, Function114944
cp $3
jr nz, .asm_114904
- ld hl, Plant
+ ld hl, wDecoPlant
ld a, [hli]
ld [de], a
inc e
@@ -1458,7 +1458,7 @@ Function11494d: ; 11494d
call z, Function1149c3
cp $3
jr nz, .asm_114983
- ld hl, Plant
+ ld hl, wDecoPlant
ld a, [hli]
ld [de], a
inc e
@@ -1810,7 +1810,7 @@ Function114acf: ; 114acf
call z, Function114b4c
.asm_114b26
- ld hl, Plant
+ ld hl, wDecoPlant
ld a, [$dc00]
ld [hli], a
ld [hl], e
@@ -2050,7 +2050,7 @@ Function114c55: ; 114c55
; 114c5e
Function114c5e: ; 114c5e
- ld de, PartyMon5Defense
+ ld de, wPartyMon5Defense
push hl
.asm_114c62
ld a, [hli]
@@ -2133,7 +2133,7 @@ Function114c5e: ; 114c5e
.asm_114cc6
ld [de], a
pop hl
- ld de, PartyMon5Defense
+ ld de, wPartyMon5Defense
ld bc, NULL
.asm_114cce
inc bc
@@ -2194,7 +2194,7 @@ endr
ld e, a
ld a, [hli]
ld d, a
- ld hl, PartyMon5Defense
+ ld hl, wPartyMon5Defense
call Function115d6a
xor a
jp Function11425c
@@ -2287,7 +2287,7 @@ Function114d39: ; 114d39
; 114d99
Function114d99: ; 114d99
- ld de, PartyMon5Defense
+ ld de, wPartyMon5Defense
xor a
ld [de], a
.asm_114d9e
@@ -2321,17 +2321,17 @@ Function114d99: ; 114d99
.asm_114dc4
pop hl
- ld a, [PartyMon5Defense]
+ ld a, [wPartyMon5Defense]
and a
jr z, .asm_114dd2
ld a, $2c
inc de
ld [de], a
- ld a, [PartyMon5Defense]
+ ld a, [wPartyMon5Defense]
.asm_114dd2
inc a
- ld [PartyMon5Defense], a
+ ld [wPartyMon5Defense], a
.asm_114dd6
inc de
ld a, [hli]
@@ -2453,14 +2453,14 @@ Function114e62: ; 114e62
ld a, c
and a
jr nz, .asm_114e6f
- ld a, [wStartDay]
+ ld a, [wTimerEventStartDay]
and a
jp z, Function11425c
jr .asm_114e76
.asm_114e6f
xor a
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
call Function114ee9
.asm_114e76
@@ -2532,7 +2532,7 @@ Function114ea0: ; 114ea0
ld [hli], a
ld [hl], b
xor a
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
ret
.asm_114edb
@@ -2656,7 +2656,7 @@ Function114f39: ; 114f39
; 114f59
Function114f59: ; 114f59
- ld a, [wStartDay]
+ ld a, [wTimerEventStartDay]
and a
jr nz, .asm_114f7c
ld a, [$dc03]
@@ -2674,7 +2674,7 @@ Function114f59: ; 114f59
and a
jr nz, .asm_114fe7
ld a, $1
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
.asm_114f7c
ld a, [$dc03]
@@ -2703,7 +2703,7 @@ Function114f59: ; 114f59
ret
.asm_114fa7
- ld hl, Bed
+ ld hl, wDecoBed
ld c, [hl]
inc hl
ld a, [hli]
@@ -2842,7 +2842,7 @@ Function115059: ; 115059
; 115062
Function115062: ; 115062
- ld hl, Bed
+ ld hl, wDecoBed
ld a, [hli]
and a
jr z, .asm_1150ae
@@ -2856,7 +2856,7 @@ Function115062: ; 115062
ld d, [hl]
ld b, $0
ld hl, $dc24
- ld a, [wStartDay]
+ ld a, [wTimerEventStartDay]
cp $1
jr z, .asm_11509b
cp $2
@@ -2881,14 +2881,14 @@ Function115062: ; 115062
call Function115d53
call Function1150b3
call Function115136
- ld a, [wStartDay]
+ ld a, [wTimerEventStartDay]
inc a
cp $4
jr nz, .asm_1150ae
ld a, $2
.asm_1150ae
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
xor a
.asm_1150b2
@@ -2898,7 +2898,7 @@ Function115062: ; 115062
Function1150b3: ; 1150b3
ld hl, $dc24
- ld de, PartyMon5Defense
+ ld de, wPartyMon5Defense
ld b, $0
.asm_1150bb
ld c, $0
@@ -2948,9 +2948,9 @@ Function1150b3: ; 1150b3
.asm_1150f8
ld a, l
- ld [Console], a
+ ld [wDecoConsole], a
ld a, h
- ld [LeftOrnament], a
+ ld [wDecoLeftOrnament], a
ld hl, String_114232
.asm_115103
ld a, [hli]
@@ -2987,9 +2987,9 @@ Function1150b3: ; 1150b3
ld a, $3d
ld [de], a
inc de
- ld a, [Console]
+ ld a, [wDecoConsole]
ld l, a
- ld a, [LeftOrnament]
+ ld a, [wDecoLeftOrnament]
ld h, a
jr .asm_1150bb
@@ -3014,7 +3014,7 @@ Function115136: ; 115136
ld c, a
ld a, [hli]
ld b, a
- ld hl, PartyMon5Defense
+ ld hl, wPartyMon5Defense
.asm_11514d
ld a, [hli]
and a
@@ -3275,7 +3275,7 @@ Function115286: ; 115286
; 11528f
Function11528f: ; 11528f
- ld hl, Bed
+ ld hl, wDecoBed
ld c, [hl]
inc hl
ld a, [hli]
@@ -3383,7 +3383,7 @@ Function1152b8: ; 1152b8
call Function114ea0
and a
jr nz, .asm_1152f9
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
ld a, [$dc03]
cp $6
jr nz, .asm_1152ca
@@ -3391,7 +3391,7 @@ Function1152b8: ; 1152b8
.asm_115335
call Function1153b5
xor a
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
call Function114f59
and a
jr nz, .asm_1152f9
@@ -3409,7 +3409,7 @@ Function1152b8: ; 1152b8
jr z, .asm_11536b
call Function1153b5
xor a
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
call Function114f59
and a
jr nz, .asm_1152f9
@@ -3458,7 +3458,7 @@ Function11537d: ; 11537d
ld a, b
ld [hli], a
inc de
- ld hl, RightOrnament
+ ld hl, wDecoRightOrnament
ld a, [de]
ld [hli], a
inc de
@@ -3480,7 +3480,7 @@ Function11537d: ; 11537d
ld [hl], d
xor a
ld [$dc03], a
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
ret
; 1153b5
@@ -3502,7 +3502,7 @@ Function1153b5: ; 1153b5
ld [hl], a
inc de
ld a, [de]
- ld [Bed], a
+ ld [wDecoBed], a
inc de
ld hl, $dc0d
ld [hl], e
@@ -3522,9 +3522,9 @@ Function1153d2: ; 1153d2
ld [$dc03], a
ld [$dc04], a
ld a, $24
- ld [Console], a
+ ld [wDecoConsole], a
ld a, $dc
- ld [LeftOrnament], a
+ ld [wDecoLeftOrnament], a
push bc
jr .asm_1153f4
@@ -3548,9 +3548,9 @@ Function1153d2: ; 1153d2
ld c, [hl]
inc hl
push hl
- ld a, [Console]
+ ld a, [wDecoConsole]
ld l, a
- ld a, [LeftOrnament]
+ ld a, [wDecoLeftOrnament]
ld h, a
push bc
ld b, $0
@@ -3560,10 +3560,10 @@ Function1153d2: ; 1153d2
pop bc
ld a, l
ld e, a
- ld [Console], a
+ ld [wDecoConsole], a
ld a, h
ld d, a
- ld [LeftOrnament], a
+ ld [wDecoLeftOrnament], a
dec b
jr z, .asm_11542b
pop hl
@@ -3582,9 +3582,9 @@ Function1153d2: ; 1153d2
.asm_115430
ld a, l
- ld [Console], a
+ ld [wDecoConsole], a
ld a, h
- ld [LeftOrnament], a
+ ld [wDecoLeftOrnament], a
xor a
ld [de], a
ld hl, $dc24
@@ -3670,7 +3670,7 @@ Function1153d2: ; 1153d2
inc de
ld a, h
ld [de], a
- ld hl, RightOrnament
+ ld hl, wDecoRightOrnament
ld a, [hli]
ld [wCurrMapBGEventCount], a
ld [hFF8C], a
@@ -3680,15 +3680,15 @@ Function1153d2: ; 1153d2
ld d, [hl]
ld hl, $ddc8
call Function115d6a
- ld hl, RightOrnament
+ ld hl, wDecoRightOrnament
ld a, [wCurrMapBGEventCount]
ld [hli], a
ld [hl], e
inc hl
ld [hl], d
- ld a, [Console]
+ ld a, [wDecoConsole]
ld e, a
- ld a, [LeftOrnament]
+ ld a, [wDecoLeftOrnament]
ld d, a
pop hl
ld a, h
@@ -3702,15 +3702,15 @@ Function1153d2: ; 1153d2
Function1154d4: ; 1154d4
xor a
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
call Function1155af
call Function11560a
and a
jr nz, .asm_11552c
call Function1155d1
- ld a, [RightOrnament]
+ ld a, [wDecoRightOrnament]
dec a
- ld [RightOrnament], a
+ ld [wDecoRightOrnament], a
and a
jp z, .asm_115577
cp $1
@@ -3718,7 +3718,7 @@ Function1154d4: ; 1154d4
xor a
ld [wDailyResetTimer], a
.asm_1154f7
- ld a, [BigDoll]
+ ld a, [wDecoBigDoll]
cp $2
jr z, .asm_115502
cp $3
@@ -3822,9 +3822,9 @@ Function1154d4: ; 1154d4
jp Function11425c
.asm_1155a0
- ld a, [RightOrnament]
+ ld a, [wDecoRightOrnament]
dec a
- ld [RightOrnament], a
+ ld [wDecoRightOrnament], a
and a
jr z, .asm_115560
call Function1155d1
@@ -3854,7 +3854,7 @@ Function1155af: ; 1155af
ld [hli], a
inc de
ld a, [de]
- ld [RightOrnament], a
+ ld [wDecoRightOrnament], a
inc de
ld a, e
ld [hli], a
@@ -3870,10 +3870,10 @@ Function1155d1: ; 1155d1
ld a, [$dc0e]
ld h, a
ld a, [hli]
- ld [BigDoll], a
+ ld [wDecoBigDoll], a
cp $3
jr nz, .asm_1155f0
- ld de, Carpet
+ ld de, wDecoCarpet
ld a, [hli]
ld [de], a
inc de
@@ -3883,7 +3883,7 @@ Function1155d1: ; 1155d1
ld a, [hli]
ld [de], a
ld a, [hli]
- ld [Bed], a
+ ld [wDecoBed], a
.asm_1155f0
ld de, $dc17
@@ -4038,7 +4038,7 @@ Function11560a: ; 11560a
; 1156cc
Function1156cc: ; 1156cc
- ld a, [wStartDay]
+ ld a, [wTimerEventStartDay]
and a
jp z, Function11425c
cp $2
@@ -4056,9 +4056,9 @@ Function1156cc: ; 1156cc
call Function115732
call Function11575c
ld a, h
- ld [Poster], a
+ ld [wDecoPoster], a
ld a, l
- ld [Plant], a
+ ld [wDecoPlant], a
.asm_1156fa
call Function1157d0
@@ -4067,12 +4067,12 @@ Function1156cc: ; 1156cc
call Function11581e
and a
jr nz, .asm_11572b
- ld a, [wStartDay]
+ ld a, [wTimerEventStartDay]
cp $5
jr z, .asm_115716
- ld a, [Poster]
+ ld a, [wDecoPoster]
ld h, a
- ld a, [Plant]
+ ld a, [wDecoPlant]
ld l, a
xor a
jp Function11425c
@@ -4091,7 +4091,7 @@ Function1156cc: ; 1156cc
ld l, a
add hl, de
xor a
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
jp Function11425c
.asm_11572b
@@ -4228,7 +4228,7 @@ Function11575c: ; 11575c
pop hl
add hl, bc
ld a, $2
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
ret
; 1157d0
@@ -4240,7 +4240,7 @@ Function1157d0: ; 1157d0
ld l, a
ld a, [$dc0e]
ld c, a
- ld a, [Bed]
+ ld a, [wDecoBed]
ld b, a
cp h
jr c, .asm_1157eb
@@ -4275,9 +4275,9 @@ Function1157d0: ; 1157d0
ld a, c
ld [$dc0e], a
ld a, b
- ld [Bed], a
+ ld [wDecoBed], a
ld a, $4
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
ret
.asm_11580f
@@ -4285,20 +4285,20 @@ Function1157d0: ; 1157d0
ld a, c
ld [$dc0e], a
ld a, b
- ld [Bed], a
+ ld [wDecoBed], a
ld a, $3
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
ret
; 11581e
Function11581e: ; 11581e
- ld a, [wStartDay]
+ ld a, [wTimerEventStartDay]
and a
ret z
ld a, [$dc0e]
ld c, a
- ld a, [Bed]
+ ld a, [wDecoBed]
ld b, a
ld hl, $dc02
ld a, [hli]
@@ -4319,9 +4319,9 @@ Function11581e: ; 11581e
inc hl
ld [hl], d
ld hl, $dc24
- ld de, PartyMon5Defense
+ ld de, wPartyMon5Defense
call Function1158c2
- ld hl, PartyMon5Defense
+ ld hl, wPartyMon5Defense
ld c, [hl]
inc hl
ld b, [hl]
@@ -4362,7 +4362,7 @@ Function11581e: ; 11581e
ld e, [hl]
inc hl
ld d, [hl]
- ld hl, PartyMon5Speed
+ ld hl, wPartyMon5Speed
call Function115d6a
ld hl, wCurrMapSceneScriptCount
ld a, [wCurrMapBGEventCount]
@@ -4370,7 +4370,7 @@ Function11581e: ; 11581e
ld a, e
ld [hli], a
ld [hl], d
- ld a, [wStartDay]
+ ld a, [wTimerEventStartDay]
cp $3
jr z, .asm_1158b4
cp $4
@@ -4379,12 +4379,12 @@ Function11581e: ; 11581e
.asm_1158ad
ld a, $5
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
jr .asm_1158b9
.asm_1158b4
ld a, $2
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
.asm_1158b9
xor a
@@ -4395,7 +4395,7 @@ Function11581e: ; 11581e
.asm_1158bc
ld a, $ff
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
ret
; 1158c2
@@ -4641,7 +4641,7 @@ Function1159dc: ; 1159dc
; 1159fb
Function1159fb: ; 1159fb
- ld a, [wStartDay]
+ ld a, [wTimerEventStartDay]
and a
jp z, Function11425c
cp $2
@@ -4659,9 +4659,9 @@ Function1159fb: ; 1159fb
call Function115732
call Function115a5f
ld a, h
- ld [Plant], a
+ ld [wDecoPlant], a
ld a, l
- ld [Poster], a
+ ld [wDecoPoster], a
.asm_115a29
call Function115ab0
@@ -4670,12 +4670,12 @@ Function1159fb: ; 1159fb
call Function115b00
and a
jr nz, .asm_115a5a
- ld a, [wStartDay]
+ ld a, [wTimerEventStartDay]
cp $5
jr z, .asm_115a45
- ld a, [Poster]
+ ld a, [wDecoPoster]
ld h, a
- ld a, [Plant]
+ ld a, [wDecoPlant]
ld l, a
xor a
jp Function11425c
@@ -4694,7 +4694,7 @@ Function1159fb: ; 1159fb
ld l, a
add hl, de
xor a
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
jp Function11425c
.asm_115a5a
@@ -4759,7 +4759,7 @@ Function115a5f: ; 115a5f
rl b
add hl, bc
ld a, $2
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
ret
; 115ab0
@@ -4771,7 +4771,7 @@ Function115ab0: ; 115ab0
ld l, a
ld a, [$dc0e]
ld c, a
- ld a, [Bed]
+ ld a, [wDecoBed]
ld b, a
cp h
jr c, .asm_115acb
@@ -4806,9 +4806,9 @@ Function115ab0: ; 115ab0
ld a, c
ld [$dc0e], a
ld a, b
- ld [Bed], a
+ ld [wDecoBed], a
ld a, $4
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
xor a
ret
@@ -4817,21 +4817,21 @@ Function115ab0: ; 115ab0
ld a, c
ld [$dc0e], a
ld a, b
- ld [Bed], a
+ ld [wDecoBed], a
ld a, $3
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
xor a
ret
; 115b00
Function115b00: ; 115b00
- ld a, [wStartDay]
+ ld a, [wTimerEventStartDay]
and a
ret z
ld a, [$dc0e]
ld c, a
- ld a, [Bed]
+ ld a, [wDecoBed]
ld b, a
ld hl, $dc02
ld a, [hli]
@@ -4841,7 +4841,7 @@ Function115b00: ; 115b00
ld e, [hl]
inc hl
ld d, [hl]
- ld hl, PartyMon5Defense
+ ld hl, wPartyMon5Defense
push bc
call Function115bc8
pop hl
@@ -4849,7 +4849,7 @@ Function115b00: ; 115b00
jr z, .asm_115b43
cp $2
jr z, .asm_115b3b
- ld a, [wStartDay]
+ ld a, [wTimerEventStartDay]
cp $4
jr z, .asm_115b43
inc hl
@@ -4866,11 +4866,11 @@ Function115b00: ; 115b00
.asm_115b3d
ld a, $ff
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
ret
.asm_115b43
- ld a, [Carpet]
+ ld a, [wDecoCarpet]
add a
cpl
ld c, a
@@ -4885,7 +4885,7 @@ Function115b00: ; 115b00
ld [hl], e
inc hl
ld [hl], d
- ld hl, PartyMon5Defense
+ ld hl, wPartyMon5Defense
ld de, $dc24
call Function115c49
ld hl, $dc24
@@ -4937,7 +4937,7 @@ Function115b00: ; 115b00
ld a, e
ld [hli], a
ld [hl], d
- ld a, [wStartDay]
+ ld a, [wTimerEventStartDay]
cp $3
jr z, .asm_115bc1
cp $4
@@ -4946,12 +4946,12 @@ Function115b00: ; 115b00
.asm_115bba
ld a, $5
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
jr .asm_115bc6
.asm_115bc1
ld a, $2
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
.asm_115bc6
xor a
@@ -4961,7 +4961,7 @@ Function115b00: ; 115b00
Function115bc8: ; 115bc8
xor a
- ld [Carpet], a
+ ld [wDecoCarpet], a
.asm_115bcc
ld a, [de]
ld [hli], a
@@ -5009,16 +5009,16 @@ Function115bc8: ; 115bc8
ld a, b
or c
jr z, .asm_115c46
- ld a, [Carpet]
+ ld a, [wDecoCarpet]
inc a
- ld [Carpet], a
+ ld [wDecoCarpet], a
dec bc
ld a, b
or c
jr nz, .asm_115bcc
.asm_115c1b
- ld a, [wStartDay]
+ ld a, [wTimerEventStartDay]
cp $4
jr z, .asm_115c33
ld a, [de]
@@ -5122,7 +5122,7 @@ endr
.asm_115c99
ld a, $ff
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
ret
.asm_115c9f
@@ -5226,7 +5226,7 @@ Function115cfd: ; 115cfd
pop hl
pop hl
ld a, $ff
- ld [wStartDay], a
+ ld [wTimerEventStartDay], a
ret
.asm_115d2f
@@ -7030,7 +7030,7 @@ Function1177b7: ; 1177b7 (45:77b7)
Function1177cb: ; 1177cb (45:77cb)
ld a, $80
ld [wcd49], a
- ld [ScriptVar], a
+ ld [wScriptVar], a
jp MobilePassword_IncrementJumptable
Function117764_b_button: ; 1177d6 (45:77d6)
diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm
index 9a9df1309..1edafb47c 100755
--- a/mobile/mobile_45_sprite_engine.asm
+++ b/mobile/mobile_45_sprite_engine.asm
@@ -22,7 +22,7 @@ Function115dc3: ; 115dc3
xor a
ld [wc305], a
ld a, $a0
- ld hl, Sprite32
+ ld hl, wVirtualOAMSprite31
ld bc, 8 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
ret
@@ -34,7 +34,7 @@ Function115dd3: ; 115dd3
and a
ret z
ld a, $a0
- ld hl, Sprite32
+ ld hl, wVirtualOAMSprite31
ld bc, 8 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
call Function115e22
@@ -50,7 +50,7 @@ Function115dd3: ; 115dd3
ld d, a
push de
pop hl
- ld de, Sprite32
+ ld de, wVirtualOAMSprite31
ld a, [wc307]
ld c, a
ld a, [wc308]
@@ -360,7 +360,7 @@ Function11619d: ; 11619d
cp $2
jr c, .asm_1161b4
ld a, $a0
- ld hl, Sprites
+ ld hl, wVirtualOAM
ld bc, 25 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
@@ -493,12 +493,12 @@ Function1161d5: ; 1161d5
farcall ReloadMapPart
ld a, $8
- ld [MusicFade], a
+ ld [wMusicFade], a
ld de, MUSIC_MOBILE_ADAPTER
ld a, e
- ld [MusicFadeID], a
+ ld [wMusicFadeID], a
ld a, d
- ld [MusicFadeID + 1], a
+ ld [wMusicFadeID + 1], a
ld a, [$c319]
inc a
ld [$c319], a
@@ -585,7 +585,7 @@ Function1162f2: ; 1162f2
ld e, a
ld a, [hli]
sub e
- ld de, Sprite10
+ ld de, wVirtualOAMSprite09
.asm_116321
push af
ld a, [hli]
@@ -626,7 +626,7 @@ Function1162f2: ; 1162f2
ld e, a
ld a, [hli]
sub e
- ld de, Sprite01
+ ld de, wVirtualOAMSprite00
.asm_11635a
push af
ld a, [hli]
@@ -667,7 +667,7 @@ Function11636e: ; 11636e
ld a, $1
ld [rSVBK], a
ld a, $a0
- ld hl, Sprites
+ ld hl, wVirtualOAM
ld bc, 16 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
ld a, $90
@@ -677,11 +677,11 @@ Function11636e: ; 11636e
ld [rSVBK], a
farcall ReloadMapPart
ld a, $8
- ld [MusicFade], a
+ ld [wMusicFade], a
ld a, [wMapMusic]
- ld [MusicFadeID], a
+ ld [wMusicFadeID], a
xor a
- ld [MusicFadeID + 1], a
+ ld [wMusicFadeID + 1], a
xor a
ld [$c319], a
ld [wc30d], a
@@ -695,7 +695,7 @@ Function1163c0: ; 1163c0
ld a, $1
ld [rSVBK], a
ld a, $a0
- ld hl, Sprites
+ ld hl, wVirtualOAM
ld bc, 16 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
call DelayFrame
@@ -725,20 +725,20 @@ Function1163c0: ; 1163c0
cp $4
jr z, .asm_11642a
ld a, $8
- ld [MusicFade], a
+ ld [wMusicFade], a
ld a, [wMapMusic]
- ld [MusicFadeID], a
+ ld [wMusicFadeID], a
xor a
- ld [MusicFadeID + 1], a
+ ld [wMusicFadeID + 1], a
jr .asm_116439
.asm_11642a
ld a, $8
- ld [MusicFade], a
+ ld [wMusicFade], a
ld a, $0
- ld [MusicFadeID], a
+ ld [wMusicFadeID], a
ld a, $0
- ld [MusicFadeID + 1], a
+ ld [wMusicFadeID + 1], a
.asm_116439
xor a
@@ -754,11 +754,11 @@ Function116441: ; 116441
ld [hWY], a
farcall ReloadMapPart
ld a, $8
- ld [MusicFade], a
+ ld [wMusicFade], a
ld a, [wMapMusic]
- ld [MusicFadeID], a
+ ld [wMusicFadeID], a
xor a
- ld [MusicFadeID + 1], a
+ ld [wMusicFadeID + 1], a
xor a
ld [$c319], a
ld [wc30d], a
diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm
index fae3f099f..e8a69a7de 100755
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -183,7 +183,7 @@ Function118125: ; 118125
; 118180
Function118180: ; 118180
- ld a, [ScriptVar]
+ ld a, [wScriptVar]
and a
ret nz
ld a, [wcd38]
@@ -224,7 +224,7 @@ Function118180: ; 118180
.return_d3
ld a, $d3
ld [wc300], a
- ld [ScriptVar], a
+ ld [wScriptVar], a
jr .reset_banks
; 1181da
@@ -477,7 +477,7 @@ BattleTowerRoomMenu_InitRAM: ; 1183cb
ld [wc3ed], a
ld [wc3ee], a
ld [wc3ef], a
- ld hl, VramState
+ ld hl, wVramState
ld a, [hl]
ld [wcd7f], a
set 1, [hl]
@@ -524,9 +524,9 @@ BattleTowerRoomMenu_Cleanup: ; 118452
ld [rIE], a
ei
ld a, [wcd7f]
- ld [VramState], a
+ ld [wVramState], a
ld a, [wc300]
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
; 118473
@@ -1062,7 +1062,7 @@ Function11886e:
xor a
asm_11886f
- ld [BGMapPalBuffer], a
+ ld [wBGMapPalBuffer], a
ld a, $0
ld [wcd3c], a
call BattleTowerRoomMenu_IncrementJumptable
@@ -1189,7 +1189,7 @@ BattleTowerRoomMenu_PlacePickLevelMenu:
call MenuBox
call MenuBoxCoord2Tile
call ApplyTilemap
- hlcoord 16, 8, AttrMap
+ hlcoord 16, 8, wAttrMap
ld a, $40
or [hl]
ld [hl], a
@@ -1246,7 +1246,7 @@ BattleTowerRoomMenu_UpdatePickLevelMenu:
push af
ld a, $1
ld [rSVBK], a
- ld bc, StringBuffer3
+ ld bc, wStringBuffer3
.asm_1189b5
ld a, [hli]
cp $50
@@ -1799,7 +1799,7 @@ Function118e92: ; 118e92
Function118eb0: ; 118eb0
call Function118440
ld hl, $d802
- ld de, BGMapBuffer
+ ld de, wBGMapBuffer
ld bc, $000c
call CopyBytes
call Function1192cc
@@ -2045,7 +2045,7 @@ Function119054: ; 119054
ld [$b1b3], a
ld a, [wcd50]
ld [$b1b4], a
- ld hl, BGMapBuffer
+ ld hl, wBGMapBuffer
ld de, $aa7f
ld bc, $000c
call CopyBytes
@@ -2083,7 +2083,7 @@ Function1190d0: ; 1190d0
Function1190ec: ; 1190ec
ld a, $5
call GetSRAMBank
- ld hl, BGMapBuffer
+ ld hl, wBGMapBuffer
ld de, $aa73
ld bc, $000c
call CopyBytes
@@ -2137,12 +2137,12 @@ Function11914e: ; 11914e
Function11915d: ; 11915d
ld hl, $d802
- ld de, BGMapBuffer
+ ld de, wBGMapBuffer
ld bc, $000c
call CopyBytes
ld a, $5
call GetSRAMBank
- ld hl, BGMapBuffer
+ ld hl, wBGMapBuffer
ld de, $aa7f
ld c, $c
.asm_119176
@@ -2393,7 +2393,7 @@ Function1192cc: ; 1192cc
call CopyBytes
call CloseSRAM
ld hl, $c608
- ld de, BGMapBuffer
+ ld de, wBGMapBuffer
ld c, $c
.asm_1192e8
ld a, [de]
@@ -4005,8 +4005,8 @@ BattleTower_LevelCheck: ; 119d93 (46:5d93)
ld hl, wcd50
ld [hl], a
ld bc, PARTYMON_STRUCT_LENGTH
- ld de, PartyMon1Level
- ld a, [PartyCount]
+ ld de, wPartyMon1Level
+ ld a, [wPartyCount]
.party_loop
push af
ld a, [de]
@@ -4046,10 +4046,10 @@ BattleTower_UbersCheck: ; 119dd1 (46:5dd1)
jr nc, .level_70_or_more
ld a, $1
ld [rSVBK], a
- ld hl, PartyMon1Level
+ ld hl, wPartyMon1Level
ld bc, PARTYMON_STRUCT_LENGTH
- ld de, PartySpecies
- ld a, [PartyCount]
+ ld de, wPartySpecies
+ ld a, [wPartyCount]
.loop
push af
ld a, [de]
@@ -4082,7 +4082,7 @@ BattleTower_UbersCheck: ; 119dd1 (46:5dd1)
ld a, [de]
ld [wd265], a
call GetPokemonName
- ld hl, StringBuffer1
+ ld hl, wStringBuffer1
ld de, wcd49
ld bc, MON_NAME_LENGTH
call CopyBytes
@@ -4355,9 +4355,9 @@ Function119f98: ; 119f98
call ExitMenu
call Function11a63c
xor a
- ld [ScriptVar], a
+ ld [wScriptVar], a
call Function11a00e
- ld a, [ScriptVar]
+ ld a, [wScriptVar]
and a
jr z, .asm_119fd4
call ExitMenu
@@ -4412,7 +4412,7 @@ Function11a00e: ; 11a00e
.asm_11a02a
call CloseSRAM
- ld a, [BGMapPalBuffer]
+ ld a, [wBGMapPalBuffer]
and a
jr z, .asm_11a039
dec a
@@ -5160,7 +5160,7 @@ Function11a5b9: ; 11a5b9
ld a, $5
ld [wMenuBorderBottomCoord], a
call PushWindow
- hlcoord 0, 0, AttrMap
+ hlcoord 0, 0, wAttrMap
ld b, $6
ld c, $14
hlcoord 0, 0
@@ -5186,7 +5186,7 @@ Function11a5f5: ; 11a5f5
ld a, $a
ld [wMenuBorderBottomCoord], a
call PushWindow
- hlcoord 14, 6, AttrMap
+ hlcoord 14, 6, wAttrMap
ld b, $5
ld c, $6
hlcoord 14, 6
@@ -5519,7 +5519,7 @@ Function11a971: ; 11a971
ret
.asm_11a97f
- ld a, [Options]
+ ld a, [wOptions]
and $7
ld [hl], a
ld hl, wcd8d
@@ -5713,10 +5713,10 @@ Text_WhichBattleRoom: ; 0x11ac0b
; 0x11ac1f
Text_ThisBattleRoomPleaseWait: ; 0x11ac1f
- text_from_ram StringBuffer3
+ text_from_ram wStringBuffer3
text "'s ROOM"
line "@"
- text_from_ram StringBuffer4
+ text_from_ram wStringBuffer4
text "?"
cont "Please wait…"
done
@@ -5734,14 +5734,14 @@ Function11ac3e: ; 11ac3e
Function11ac51: ; 11ac51
xor a
ld [hBGMapMode], a
- ld hl, Options
+ ld hl, wOptions
ld a, [hl]
push af
set 4, [hl]
- ld a, [VramState]
+ ld a, [wVramState]
push af
xor a
- ld [VramState], a
+ ld [wVramState], a
ld a, [hInMenu]
push af
ld a, $1
@@ -5774,9 +5774,9 @@ Function11ac51: ; 11ac51
pop af
ld [hInMenu], a
pop af
- ld [VramState], a
+ ld [wVramState], a
pop af
- ld [Options], a
+ ld [wOptions], a
ret
; 11acb7
@@ -5906,7 +5906,7 @@ Function11ad95: ; 11ad95
hlcoord 12, 12
ld de, String_11ae40
call PlaceString
- hlcoord 10, 10, AttrMap
+ hlcoord 10, 10, wAttrMap
lb bc, 8, 8
call Function11afd6
farcall ReloadMapPart
@@ -6019,10 +6019,10 @@ Function11ae4e: ; 11ae4e
hlcoord 16, 8
ld de, String_11b01b
call PlaceString
- hlcoord 14, 7, AttrMap
+ hlcoord 14, 7, wAttrMap
lb bc, 5, 6
call Function11afd6
- hlcoord 9, 12, AttrMap
+ hlcoord 9, 12, wAttrMap
lb bc, 6, 11
call Function11afd6
farcall ReloadMapPart
@@ -6086,7 +6086,7 @@ Function11ae98:
cp $2
jr z, .asm_11aeb4
ld a, [wcd4b]
- ld [ScriptVar], a
+ ld [wScriptVar], a
call Function11b022
call Function11ad8a
@@ -6110,10 +6110,10 @@ Function11af04: ; 11af04
hlcoord 16, 8
ld de, String_11b01b
call PlaceString
- hlcoord 14, 7, AttrMap
+ hlcoord 14, 7, wAttrMap
lb bc, 5, 6
call Function11afd6
- hlcoord 9, 12, AttrMap
+ hlcoord 9, 12, wAttrMap
lb bc, 6, 11
call Function11afd6
farcall ReloadMapPart
@@ -6179,7 +6179,7 @@ Function11af4e:
ld a, $6
ld [wJumptableIndex], a
xor a
- ld [ScriptVar], a
+ ld [wScriptVar], a
.asm_11afaa
call ExitMenu
@@ -6271,7 +6271,7 @@ Function11b022: ; 11b022
ld a, [wcd2e]
and a
jr z, .asm_11b02e
- ld hl, StringBuffer3
+ ld hl, wStringBuffer3
call Function11b03d
.asm_11b02e
@@ -6280,7 +6280,7 @@ Function11b022: ; 11b022
ret z
cp $3
ret z
- ld hl, StringBuffer4
+ ld hl, wStringBuffer4
call Function11b03d
ret
; 11b03d
@@ -6682,13 +6682,13 @@ Function11b239: ; 11b239
Function11b242: ; 11b242
hlcoord 3, 4
- ld de, StringBuffer3
+ ld de, wStringBuffer3
call PlaceString
xor a
- ld [MonType], a
+ ld [wMonType], a
farcall GetGender
hlcoord 1, 4
- ld a, [CurPartySpecies]
+ ld a, [wCurPartySpecies]
ld bc, wcd2f
ld [bc], a
dec bc
@@ -6723,11 +6723,11 @@ Function11b275: ; 11b275
Function11b279: ; 11b279
ld a, [wd265]
- ld [CurSpecies], a
+ ld [wCurSpecies], a
call CheckSeenMemMon
jr z, .asm_11b28f
call GetBaseData
- ld a, [BaseGender]
+ ld a, [wBaseGender]
ld [wcf65], a
jr .asm_11b294
@@ -6781,7 +6781,7 @@ Function11b295: ; 11b295
.asm_11b2e7
ld a, $6
- ld bc, StringBuffer4
+ ld bc, wStringBuffer4
.asm_11b2ec
push af
ld a, [de]
@@ -6793,7 +6793,7 @@ Function11b295: ; 11b295
and a
jr nz, .asm_11b2ec
pop hl
- ld de, StringBuffer4
+ ld de, wStringBuffer4
call PlaceString
ret
; 11b2fe
@@ -6919,7 +6919,7 @@ Function11b31b: ; 11b31b
db $39 ; 13
Function11b397: ; 11b397
- ld de, Sprite01
+ ld de, wVirtualOAMSprite00
.loop
ld a, [hl]
cp $ff
@@ -6977,7 +6977,7 @@ Unreferenced_Function11b3b6: ; 11b3b6
; 11b3d9
Function11b3d9: ; 11b3d9
- ld de, Sprite29
+ ld de, wVirtualOAMSprite28
push de
ld a, [wc7d2]
dec a
@@ -7090,7 +7090,7 @@ Mobile46_RunJumptable: ; 11b45c
Function11b483: ; 11b483
call .InitRAM
- ld hl, PlayerName
+ ld hl, wPlayerName
ld a, NAME_LENGTH_JAPANESE - 1
.loop1
push af
@@ -7103,7 +7103,7 @@ Function11b483: ; 11b483
jr nz, .loop1
ld de, PARTYMON_STRUCT_LENGTH
- ld hl, PartyMon1Species
+ ld hl, wPartyMon1Species
ld a, [wcd82]
dec a
push af
@@ -7130,12 +7130,12 @@ Function11b483: ; 11b483
pop de
push bc
ld a, [de]
- ld [CurSpecies], a
+ ld [wCurSpecies], a
call GetBaseData
ld hl, MON_LEVEL
add hl, de
ld a, [hl]
- ld [CurPartyLevel], a
+ ld [wCurPartyLevel], a
ld hl, MON_MAXHP
add hl, de
push hl
@@ -7157,7 +7157,7 @@ Function11b483: ; 11b483
ld [hl], a
pop bc
ld de, NAME_LENGTH
- ld hl, PartyMonOT
+ ld hl, wPartyMonOT
pop af
push af
.loop4
@@ -7179,7 +7179,7 @@ Function11b483: ; 11b483
and a
jr nz, .loop5
ld de, NAME_LENGTH
- ld hl, PartyMonNicknames
+ ld hl, wPartyMonNicknames
pop af
push af
.loop6
@@ -7228,12 +7228,12 @@ Function11b483: ; 11b483
.InitRAM:
ld bc, $c626
- ld a, [PlayerID]
+ ld a, [wPlayerID]
ld [wcd2a], a
ld [bc], a
inc bc
- ld a, [PlayerID + 1]
+ ld a, [wPlayerID + 1]
ld [wcd2b], a
ld [bc], a
inc bc
@@ -7268,7 +7268,7 @@ Function11b483: ; 11b483
Function11b570: ; 11b570
call Function118007
- ld a, [ScriptVar]
+ ld a, [wScriptVar]
and a
jr nz, .exit
call .SaveData
@@ -7320,7 +7320,7 @@ Function11b570: ; 11b570
Function11b5c0: ; 11b5c0
ld a, [wcd82]
dec a
- ld [CurPartyMon], a
+ ld [wCurPartyMon], a
xor a
ld [wPokemonWithdrawDepositParameter], a
farcall RemoveMonFromPartyOrBox
@@ -7331,7 +7331,7 @@ Function11b5c0: ; 11b5c0
Function11b5e0: ; 11b5e0
xor a
- ld [ScriptVar], a
+ ld [wScriptVar], a
jp Function11ad8a
; 11b5e7
@@ -7394,7 +7394,7 @@ Function11b5e8: ; 11b5e8
Function11b66d: ; 11b66d
call Function1180b8
- ld a, [ScriptVar]
+ ld a, [wScriptVar]
and a
jr nz, .asm_11b6b0
ld a, [rSVBK]
@@ -7415,11 +7415,11 @@ Function11b66d: ; 11b66d
.asm_11b691
farcall Function17081d
- ld a, [ScriptVar]
+ ld a, [wScriptVar]
and a
jr z, .asm_11b6b0
xor a
- ld [ScriptVar], a
+ ld [wScriptVar], a
ld a, [rSVBK]
push af
ld a, $3
@@ -7543,7 +7543,7 @@ Function11b6b4: ; 11b6b4
.item_okay
ld a, [wcd31]
ld [$c60d], a
- ld [CurSpecies], a
+ ld [wCurSpecies], a
call GetBaseData
ld hl, $c60d + MON_LEVEL
@@ -7558,7 +7558,7 @@ Function11b6b4: ; 11b6b4
.replace_level
ld [hl], a
.done_level
- ld [CurPartyLevel], a
+ ld [wCurPartyLevel], a
ld hl, $c60d + MON_STAT_EXP - 1
ld de, $c60d + MON_MAXHP
@@ -7578,7 +7578,7 @@ Function11b6b4: ; 11b6b4
Function11b7e5: ; 11b7e5
ld a, [$c60d] ; species
ld [wOTTrademonSpecies], a
- ld [CurPartySpecies], a
+ ld [wCurPartySpecies], a
ld a, [wcd81]
ld [wc74e], a
ld hl, $c63d ; OT
@@ -7617,9 +7617,9 @@ Function11b7e5: ; 11b7e5
ld a, $5
ld [$a800], a
call CloseSRAM
- ld a, [MapGroup]
+ ld a, [wMapGroup]
ld b, a
- ld a, [MapNumber]
+ ld a, [wMapNumber]
ld c, a
call GetMapSceneID
ld a, d
@@ -7636,13 +7636,13 @@ Function11b7e5: ; 11b7e5
Function11b879: ; 11b879
farcall BattleTower_CheckSaveFileExistsAndIsYours
- ld a, [ScriptVar]
+ ld a, [wScriptVar]
and a
ret z
ld a, $5
call GetSRAMBank
ld a, [$a800]
- ld [ScriptVar], a
+ ld [wScriptVar], a
ld a, [$a890]
ld [wcd49], a
ld a, [$a891]
@@ -7652,7 +7652,7 @@ Function11b879: ; 11b879
ld a, [$a893]
ld [wcd4c], a
call CloseSRAM
- ld a, [ScriptVar]
+ ld a, [wScriptVar]
and a
ret z
ld hl, wcd4c
@@ -7723,7 +7723,7 @@ Function11b879: ; 11b879
bit 7, h
ret z
ld a, $2
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
; 11b920
@@ -7781,7 +7781,7 @@ Function11b93b: ; 11b93b
; 11b98f
AddMobileMonToParty: ; 11b98f
- ld hl, PartyCount
+ ld hl, wPartyCount
ld a, [hl]
ld e, a
inc [hl]
@@ -7791,21 +7791,21 @@ AddMobileMonToParty: ; 11b98f
ld a, [wMobileMonSpeciesPointerBuffer + 1]
ld h, a
inc hl
- ld bc, PartySpecies
+ ld bc, wPartySpecies
ld d, e
.loop1
inc bc
dec d
jr nz, .loop1
ld a, e
- ld [CurPartyMon], a
+ ld [wCurPartyMon], a
ld a, [hl]
ld [bc], a
inc bc
ld a, -1
ld [bc], a
- ld hl, PartyMon1Species
+ ld hl, wPartyMon1Species
ld bc, PARTYMON_STRUCT_LENGTH
ld a, e
ld [wMobileMonSpeciesBuffer], a
@@ -7823,7 +7823,7 @@ AddMobileMonToParty: ; 11b98f
ld bc, PARTYMON_STRUCT_LENGTH
call CopyBytes
- ld hl, PartyMonOT
+ ld hl, wPartyMonOT
ld bc, NAME_LENGTH
ld a, [wMobileMonSpeciesBuffer]
.loop3
@@ -7842,7 +7842,7 @@ AddMobileMonToParty: ; 11b98f
ld a, "@"
ld [de], a
- ld hl, PartyMonNicknames
+ ld hl, wPartyMonNicknames
ld bc, MON_NAME_LENGTH
ld a, [wMobileMonSpeciesBuffer]
.loop4
@@ -7888,7 +7888,7 @@ Function11ba38: ; 11ba38
farcall CheckCurPartyMonFainted
ret c
xor a
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
; 11ba44
diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm
index 4c72661a5..a1bd0ae35 100755
--- a/mobile/mobile_5b.asm
+++ b/mobile/mobile_5b.asm
@@ -83,7 +83,7 @@ Unreferenced_Function16c000: ; 16c000
Function16c089: ; 16c089
ld a, $1
- ld [Buffer2], a
+ ld [wBuffer2], a
ld [wd1f1], a
xor a
ld [hWY], a
@@ -103,7 +103,7 @@ Function16c09e: ; 16c09e
Function16c0a8: ; 16c0a8
xor a
- ld [Buffer2], a
+ ld [wBuffer2], a
ld [wd1f1], a
call ClearSprites
ld a, $90
@@ -200,7 +200,7 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
ld bc, 20
xor a
call ByteFill
- ld hl, .TileMap
+ ld hl, .wTileMap
decoord 0, 1
ld bc, $0154
call CopyBytes
@@ -208,12 +208,12 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
; 16c15c
.LoadAttrMap: ; 16c15c
- hlcoord 0, 0, AttrMap
+ hlcoord 0, 0, wAttrMap
ld bc, SCREEN_WIDTH
xor a
call ByteFill
- ld hl, .AttrMap
- decoord 0, 1, AttrMap
+ ld hl, .wAttrMap
+ decoord 0, 1, wAttrMap
ld bc, 17 * SCREEN_WIDTH
call CopyBytes
ret
@@ -222,10 +222,10 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
.Tiles:
INCBIN "gfx/mobile/mobile_splash.2bpp"
-.TileMap:
+.wTileMap:
INCBIN "gfx/mobile/mobile_splash.tilemap"
-.AttrMap:
+.wAttrMap:
INCBIN "gfx/mobile/mobile_splash.attrmap"
UnknownMobilePalettes_16c903: ; 16c903
@@ -543,8 +543,8 @@ Function16cb08: ; 16cb08
Function16cb0f: ; 16cb0f
xor a
- ld [Buffer1], a
- ld [Buffer2], a
+ ld [wBuffer1], a
+ ld [wBuffer2], a
xor a
ld [wd1ec], a
ld a, $70
@@ -559,12 +559,12 @@ Function16cb0f: ; 16cb0f
; 16cb2e
Function16cb2e: ; 16cb2e
- ld a, [Buffer2]
+ ld a, [wBuffer2]
and a
ret z
call Function16cb40
ld hl, Unknown_16cb86
- ld de, Sprites
+ ld de, wVirtualOAM
call Function16cb5d
ret
; 16cb40
@@ -754,7 +754,7 @@ Function16cc5a: ; 16cc5a
; 16cc62
Function16cc62: ; 16cc62
- hlcoord 0, 15, AttrMap
+ hlcoord 0, 15, wAttrMap
ld bc, $0028
ld a, $1
call ByteFill
@@ -776,7 +776,7 @@ Function16cc73:
pop hl
ld a, $1
ld [rVBK], a
- decoord 0, 0, AttrMap
+ decoord 0, 0, wAttrMap
call Function16cc90
pop af
ld [rVBK], a
diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm
index b0d2e00e3..3f7dcbc43 100755
--- a/mobile/mobile_5c.asm
+++ b/mobile/mobile_5c.asm
@@ -131,7 +131,7 @@ Function170c06: ; 170c06
xor a
ld [wd265], a
.asm_170c30
- ld hl, PartyMon1HP
+ ld hl, wPartyMon1HP
ld a, [wd265]
call GetPartyLocation
ld a, [hli]
@@ -181,7 +181,7 @@ Function170c06: ; 170c06
ld b, $0
ld c, $0
.asm_170c6f
- ld hl, PartyMon1HP
+ ld hl, wPartyMon1HP
ld a, b
push bc
call GetPartyLocation
@@ -206,7 +206,7 @@ Function170c06: ; 170c06
; 170c8b
Function170c8b: ; 170c8b
- ld hl, LastEnemyCounterMove
+ ld hl, wLastEnemyCounterMove
ld b, $5
.asm_170c90
ld a, [hl]
@@ -698,7 +698,7 @@ Function171c87: ; 171c87 (5c:5c87)
ld bc, $168
call CopyBytes
ld hl, Attrmap_1727ed
- decoord 0, 0, AttrMap
+ decoord 0, 0, wAttrMap
ld bc, $168
call CopyBytes
hlcoord 3, 2
@@ -718,7 +718,7 @@ Function171ccd: ; 171ccd (5c:5ccd)
ld de, wBGPals1
ld bc, 8 palettes
call CopyBytes
- ld hl, EngineBuffer5
+ ld hl, wEngineBuffer5
ld a, $ff
ld [hli], a
ld a, $7f
@@ -770,7 +770,7 @@ Function171d2b: ; 171d2b (5c:5d2b)
ld bc, $168
call CopyBytes
ld hl, Attrmap_172955
- decoord 0, 0, AttrMap
+ decoord 0, 0, wAttrMap
ld bc, $168
call CopyBytes
hlcoord 2, 2
@@ -856,7 +856,7 @@ Function172e78: ; 172e78 (5c:6e78)
ld bc, $168
call ByteFill
ld a, $7
- hlcoord 0, 0, AttrMap
+ hlcoord 0, 0, wAttrMap
ld bc, $168
call ByteFill
call DisableLCD
@@ -870,7 +870,7 @@ Function172e78: ; 172e78 (5c:6e78)
ld bc, $168
call CopyBytes
ld hl, Attrmap_173517
- decoord 0, 0, AttrMap
+ decoord 0, 0, wAttrMap
ld bc, $168
call CopyBytes
ret
diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm
index d4ad45fc0..850096705 100644
--- a/mobile/mobile_5e.asm
+++ b/mobile/mobile_5e.asm
@@ -7,7 +7,7 @@ Function17a68f:: ; 17a68f (5e:668f)
ld hl, $d088
bit 5, [hl]
jr z, .asm_17a6a6
- ld de, StringBuffer1 ; $d073
+ ld de, wStringBuffer1 ; $d073
push de
call Function17a721
pop de
@@ -21,11 +21,11 @@ Function17a68f:: ; 17a68f (5e:668f)
Function17a6a8: ; 17a6a8 (5e:66a8)
push de
push bc
- ld hl, StringBuffer2 ; $d086
+ ld hl, wStringBuffer2 ; $d086
ld bc, $a
xor a
call ByteFill
- ld hl, Buffer1
+ ld hl, wBuffer1
ld bc, $10
ld a, $ff
call ByteFill
@@ -50,7 +50,7 @@ Function17a6a8: ; 17a6a8 (5e:66a8)
ret
Function17a6f5: ; 17a6f5 (5e:66f5)
- ld hl, Buffer1
+ ld hl, wBuffer1
ld c, $0
ld b, $8
.asm_17a6fc
@@ -91,7 +91,7 @@ Function17a721: ; 17a721 (5e:6721)
ld a, $ff
call ByteFill
pop de
- ld hl, Buffer1
+ ld hl, wBuffer1
ld b, $8
.asm_17a732
ld c, $0
@@ -443,7 +443,7 @@ Function17a943: ; 17a943 (5e:6943)
ld [$d08c], a
ld c, a
ld b, $0
- ld hl, Buffer1
+ ld hl, wBuffer1
add hl, bc
ld [hl], $ff
ld a, $2
@@ -465,7 +465,7 @@ Function17a964: ; 17a964 (5e:6964)
ld b, $0
inc a
ld [$d08c], a
- ld hl, Buffer1
+ ld hl, wBuffer1
add hl, bc
ld [hl], e
and a
@@ -480,7 +480,7 @@ Function17a97b: ; 17a97b (5e:697b)
lb bc, 2, 18
call ClearBox
hlcoord 3, 2
- ld de, Buffer1
+ ld de, wBuffer1
ld a, [$d08c]
and a
ret z
@@ -517,7 +517,7 @@ String_17a9b2: ; 17a9b2
; 17a9cb
Function17a9cb: ; 17a9cb (5e:69cb)
- ld de, Sprites ; $c400
+ ld de, wVirtualOAM ; $c400
ld hl, $d088
bit 6, [hl]
jr nz, .bit_6_set
@@ -663,7 +663,7 @@ Function17aaa9: ; 17aaa9 (5e:6aa9)
call Function17aae3
ld c, a
ld b, $0
- hlcoord 0, 0, AttrMap
+ hlcoord 0, 0, wAttrMap
add hl, bc
push hl
ld a, $4
@@ -806,10 +806,10 @@ Function17ac1d: ; 17ac1d (5e:6c1d)
Function17ac2a: ; 17ac2a (5e:6c2a)
ld hl, Tilemap_17ae3d
- decoord 0, 4, AttrMap
+ decoord 0, 4, wAttrMap
ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH
call CopyBytes
- hlcoord 0, 4, AttrMap
+ hlcoord 0, 4, wAttrMap
ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH
.loop
ld a, [hl]
diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm
index 9588802f1..fc32032c0 100644
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -11,7 +11,7 @@ Function17c000: ; 17c000
ld hl, HaveWantMap
decoord 0, 0
- bccoord 0, 0, AttrMap
+ bccoord 0, 0, wAttrMap
ld a, SCREEN_HEIGHT
.y
@@ -271,7 +271,7 @@ CheckStringForErrors_IgnoreTerminator: ; 17d0b3
Function17d0f3: ; 17d0f3
ld a, [$c608 + 5]
ld [wOTTrademonSpecies], a
- ld [CurPartySpecies], a
+ ld [wCurPartySpecies], a
ld a, [wcd81]
ld [$c74e], a
ld hl, $c63d
@@ -310,9 +310,9 @@ Function17d0f3: ; 17d0f3
ld a, $5
ld [$a800], a
call CloseSRAM
- ld a, [MapGroup]
+ ld a, [wMapGroup]
ld b, a
- ld a, [MapNumber]
+ ld a, [wMapNumber]
ld c, a
call GetMapSceneID
ld a, d
@@ -399,16 +399,16 @@ CheckStringContainsLessThanBNextCharacters: ; 17d1e1
; 17d1f1
Function17d1f1: ; 17d1f1
- ld a, [CurPartySpecies]
+ ld a, [wCurPartySpecies]
dec a
call SetSeenAndCaughtMon
- ld a, [CurPartySpecies]
+ ld a, [wCurPartySpecies]
cp UNOWN
jr nz, .asm_17d223
- ld hl, PartyMon1DVs
- ld a, [PartyCount]
+ ld hl, wPartyMon1DVs
+ ld a, [wPartyCount]
dec a
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
@@ -418,7 +418,7 @@ Function17d1f1: ; 17d1f1
and a
jr nz, .asm_17d223
- ld a, [UnownLetter]
+ ld a, [wUnownLetter]
ld [wFirstUnownSeen], a
.asm_17d223
@@ -427,26 +427,26 @@ Function17d1f1: ; 17d1f1
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Parameter: [ScriptVar] = 0..1
+; Parameter: [wScriptVar] = 0..1
;
-; if [ScriptVar] == FALSE
+; if [wScriptVar] == FALSE
; Show japanese menu options
; - News - News - ??? - Cancel
-; if [ScriptVar] == TRUE
+; if [wScriptVar] == TRUE
; Show BattleTower-Menu with 3 options in english language
; - Challenge - Explanation - Cancel
Menu_ChallengeExplanationCancel: ; 17d224
- ld a, [ScriptVar]
+ ld a, [wScriptVar]
and a
jr nz, .English
ld a, $4
- ld [ScriptVar], a
+ ld [wScriptVar], a
ld hl, MenuHeader_17d26a ; Japanese Menu, where you can choose 'News' as an option
jr .Load_Interpret
.English:
ld a, $4
- ld [ScriptVar], a
+ ld [wScriptVar], a
ld hl, MenuHeader_ChallengeExplanationCancel ; English Menu
.Load_Interpret:
@@ -459,7 +459,7 @@ Menu_ChallengeExplanationCancel: ; 17d224
Function17d246: ; 17d246
call VerticalMenu
jr c, .Exit
- ld a, [ScriptVar]
+ ld a, [wScriptVar]
cp $5
jr nz, .UsewMenuCursorY
ld a, [wMenuCursorY]
@@ -473,12 +473,12 @@ Function17d246: ; 17d246
ld a, [wMenuCursorY]
.LoadToScriptVar:
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
.Exit:
ld a, $4
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
; 17d26a
@@ -534,7 +534,7 @@ Function17d2ce: ; 17d2ce
and a
jr nz, .asm_17d2e2
ld a, $1
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
.asm_17d2e2
@@ -553,9 +553,9 @@ Function17d2ce: ; 17d2ce
ld de, MUSIC_MOBILE_CENTER
ld a, e
ld [wMapMusic], a
- ld [MusicFadeID], a
+ ld [wMusicFadeID], a
ld a, d
- ld [MusicFadeID + 1], a
+ ld [wMusicFadeID + 1], a
call PlayMusic
call ReturnToMapFromSubmenu
call CloseSubmenu
@@ -610,7 +610,7 @@ Function17d314: ; 17d314
call ByteFill
call CloseSRAM
ld a, $2
- ld [ScriptVar], a
+ ld [wScriptVar], a
scf
ret
; 17d370
@@ -654,7 +654,7 @@ Function17d370: ; 17d370
call EnableLCD
call Function17d60b
ld a, $0
- ld [BGMapBuffer], a
+ ld [wBGMapBuffer], a
ld a, $d0
ld [wcd21], a
ld a, $6
@@ -722,7 +722,7 @@ Function17d45a: ; 17d45a
.asm_17d46f
xor a
- ld [ScriptVar], a
+ ld [wScriptVar], a
ret
; 17d474
@@ -745,7 +745,7 @@ Function17d48d: ; 17d48d
call CopyBytes
ld hl, TileAttrmap_17eb8e
decoord 0, 0
- bccoord 0, 0, AttrMap
+ bccoord 0, 0, wAttrMap
ld a, $12
.asm_17d4a4
push af
@@ -775,7 +775,7 @@ Function17d48d: ; 17d48d
pop af
dec a
jr nz, .asm_17d4a4
- ld a, [BGMapBuffer]
+ ld a, [wBGMapBuffer]
ld l, a
ld a, [wcd21]
ld h, a
@@ -869,7 +869,7 @@ Function17d48d: ; 17d48d
pop af
dec a
jr nz, .asm_17d53a
- ld de, CreditsTimer
+ ld de, wCreditsTimer
ld bc, $c
call CopyBytes
xor a
@@ -1079,7 +1079,7 @@ Function17d6a1: ; 17d6a1
ld a, [hli]
ld [wcd47], a
ld a, [hl]
- ld [BGMapPalBuffer], a
+ ld [wBGMapPalBuffer], a
ld hl, $b1b3
add hl, bc
add hl, bc
@@ -1483,7 +1483,7 @@ Function17d93a: ; 17d93a
ld a, [$c70c]
call Function17e6de
ld a, [$c70a]
- ld [CurPartySpecies], a
+ ld [wCurPartySpecies], a
ld a, [$c70c]
ld e, a
farcall LoadMonPaletteAsNthBGPal
@@ -1519,7 +1519,7 @@ Function17d98b: ; 17d98b
ld a, [$c70b]
call Function17e6de
ld a, [$c70a]
- ld [TrainerClass], a
+ ld [wTrainerClass], a
ld a, [$c70b]
ld e, a
farcall LoadTrainerClassPaletteAsNthBGPal
@@ -2324,17 +2324,17 @@ Function17ded9: ; 17ded9
ld [rSVBK], a
ld hl, $c708
ld a, [hli]
- ld [CurPartySpecies], a
- ld [TempEnemyMonSpecies], a
+ ld [wCurPartySpecies], a
+ ld [wTempEnemyMonSpecies], a
ld a, [hli]
- ld [CurPartyLevel], a
+ ld [wCurPartyLevel], a
ld a, [hli]
ld b, a
- ld a, [PartyCount]
+ ld a, [wPartyCount]
cp $6
jp nc, Function17e026
xor a
- ld [MonType], a
+ ld [wMonType], a
push hl
push bc
predef TryAddMonToParty
@@ -2345,9 +2345,9 @@ Function17ded9: ; 17ded9
jr z, .asm_17df33
push bc
push hl
- ld a, [PartyCount]
+ ld a, [wPartyCount]
dec a
- ld hl, PartyMonNicknames
+ ld hl, wPartyMonNicknames
call SkipNames
ld d, h
ld e, l
@@ -2365,9 +2365,9 @@ Function17ded9: ; 17ded9
jr z, .asm_17df5a
push bc
push hl
- ld a, [PartyCount]
+ ld a, [wPartyCount]
dec a
- ld hl, PartyMonOT
+ ld hl, wPartyMonOT
call SkipNames
ld d, h
ld e, l
@@ -2390,9 +2390,9 @@ Function17ded9: ; 17ded9
jr z, .asm_17df79
push bc
push hl
- ld a, [PartyCount]
+ ld a, [wPartyCount]
dec a
- ld hl, PartyMon1ID
+ ld hl, wPartyMon1ID
call GetPartyLocation
ld d, h
ld e, l
@@ -2414,9 +2414,9 @@ Function17ded9: ; 17ded9
jr z, .asm_17dfd0
push bc
push hl
- ld a, [PartyCount]
+ ld a, [wPartyCount]
dec a
- ld hl, PartyMon1DVs
+ ld hl, wPartyMon1DVs
call GetPartyLocation
ld d, h
ld e, l
@@ -2427,25 +2427,25 @@ Function17ded9: ; 17ded9
ld a, [hli]
ld [de], a
push hl
- ld a, [PartyCount]
+ ld a, [wPartyCount]
dec a
- ld hl, PartyMon1Species
+ ld hl, wPartyMon1Species
call GetPartyLocation
ld a, [hl]
- ld [CurSpecies], a
+ ld [wCurSpecies], a
call GetBaseData
- ld a, [PartyCount]
+ ld a, [wPartyCount]
dec a
- ld hl, PartyMon1MaxHP
+ ld hl, wPartyMon1MaxHP
call GetPartyLocation
ld d, h
ld e, l
push hl
ld b, $0
farcall CalcPkmnStats
- ld a, [PartyCount]
+ ld a, [wPartyCount]
dec a
- ld hl, PartyMon1HP
+ ld hl, wPartyMon1HP
call GetPartyLocation
ld d, h
ld e, l
@@ -2468,9 +2468,9 @@ Function17ded9: ; 17ded9
jr z, .asm_17dfea
push bc
push hl
- ld a, [PartyCount]
+ ld a, [wPartyCount]
dec a
- ld hl, PartyMon1Item
+ ld hl, wPartyMon1Item
call GetPartyLocation
ld d, h
ld e, l
@@ -2488,9 +2488,9 @@ Function17ded9: ; 17ded9
jr z, .asm_17e01f
push bc
push hl
- ld a, [PartyCount]
+ ld a, [wPartyCount]
dec a
- ld hl, PartyMon1Moves
+ ld hl, wPartyMon1Moves
call GetPartyLocation
ld d, h
ld e, l
@@ -2501,9 +2501,9 @@ Function17ded9: ; 17ded9
pop de
push hl
push de
- ld a, [PartyCount]
+ ld a, [wPartyCount]
dec a
- ld hl, PartyMon1PP
+ ld hl, wPartyMon1PP
call GetPartyLocation
ld d, h
ld e, l
@@ -2664,11 +2664,11 @@ Function17e0fd: ; 17e0fd
ld [rSVBK], a
ld hl, $c708
ld a, [hli]
- ld [CurItem], a
+ ld [wCurItem], a
ld a, [hli]
ld [wItemQuantityChangeBuffer], a
push hl
- ld hl, NumItems
+ ld hl, wNumItems
call ReceiveItem
pop hl
jr c, .asm_17e127
@@ -2698,7 +2698,7 @@ Function17e133: ; 17e133
ld [rSVBK], a
ld hl, $c708
ld a, [hli]
- ld [ScriptVar], a
+ ld [wScriptVar], a
push hl
farcall MobileCheckOwnMonAnywhere
pop hl
@@ -2729,14 +2729,14 @@ Function17e165: ; 17e165
ld [rSVBK], a
ld hl, $c708
ld a, [hli]
- ld [CurItem], a
+ ld [wCurItem], a
push hl
- ld hl, NumItems
+ ld hl, wNumItems
call CheckItem
pop hl
jr c, .asm_17e195
push hl
- ld hl, PCItems
+ ld hl, wPCItems
call CheckItem
pop hl
jr c, .asm_17e195
@@ -3012,7 +3012,7 @@ Function17e32b: ; 17e32b
ld de, $b0b1
ld bc, $40
call CopyBytes
- ld hl, BGMapBuffer
+ ld hl, wBGMapBuffer
ld bc, $5b
call CopyBytes
call CloseSRAM
@@ -3026,7 +3026,7 @@ Function17e349: ; 17e349
ld de, $c608
ld bc, $40
call CopyBytes
- ld de, BGMapBuffer
+ ld de, wBGMapBuffer
ld bc, $5b
call CopyBytes
call CloseSRAM
@@ -3142,7 +3142,7 @@ Function17e438: ; 17e438
; 17e43d
Function17e43d: ; 17e43d
- ld a, [BGMapBuffer]
+ ld a, [wBGMapBuffer]
ld l, a
ld a, [wcd21]
ld h, a
@@ -3151,7 +3151,7 @@ Function17e43d: ; 17e43d
; 17e447
Function17e447: ; 17e447
- ld a, [BGMapBuffer]
+ ld a, [wBGMapBuffer]
ld l, a
ld a, [wcd21]
ld h, a
@@ -3182,7 +3182,7 @@ Function17e451: ; 17e451
ld bc, $14
ld a, [wcd23]
call AddNTimes
- ld a, [CreditsTimer]
+ ld a, [wCreditsTimer]
ld c, a
ld b, $0
add hl, bc
@@ -3203,7 +3203,7 @@ Function17e451: ; 17e451
ld d, a
push bc
push hl
- ld a, [BGMapBuffer]
+ ld a, [wBGMapBuffer]
ld l, a
ld a, [wcd21]
ld h, a
@@ -3289,7 +3289,7 @@ Function17e4dd: ; 17e4dd
Function17e51b: ; 17e51b
ld a, [wcd28]
- ld hl, CreditsTimer
+ ld hl, wCreditsTimer
sub [hl]
inc a
ld [wcd4f], a
@@ -3298,7 +3298,7 @@ Function17e51b: ; 17e51b
ld a, [wcd23]
dec a
call AddNTimes
- ld a, [CreditsTimer]
+ ld a, [wCreditsTimer]
ld c, a
ld b, $0
add hl, bc
@@ -3347,7 +3347,7 @@ Function17e571: ; 17e571
ld bc, $14
ld a, [wcd23]
call AddNTimes
- ld a, [CreditsTimer]
+ ld a, [wCreditsTimer]
ld c, a
ld b, $0
add hl, bc
@@ -3407,7 +3407,7 @@ Function17e5af: ; 17e5af
ld e, a
ld a, [hli]
ld d, a
- ld a, [BGMapBuffer]
+ ld a, [wBGMapBuffer]
ld l, a
ld a, [wcd21]
ld h, a
@@ -3590,7 +3590,7 @@ Function17e691: ; 17e691
.asm_17e6c7
pop hl
- bccoord 0, 0, AttrMap
+ bccoord 0, 0, wAttrMap
add hl, bc
ld [hl], a
pop hl
@@ -3614,7 +3614,7 @@ Function17e6de: ; 17e6de
ld l, a
ld a, [$c709]
ld h, a
- decoord 0, 0, AttrMap
+ decoord 0, 0, wAttrMap
add hl, de
pop af
ld b, $7
@@ -4197,7 +4197,7 @@ Function17f2ff: ; 17f2ff
push bc
ld a, $1
ld [rSVBK], a
- ld hl, PlayerName
+ ld hl, wPlayerName
ld de, $c608
ld bc, $6
call CopyBytes
@@ -4374,7 +4374,7 @@ Function17f41d: ; 17f41d
push af
ld l, c
ld h, b
- ld bc, -TileMap + $10000
+ ld bc, -wTileMap + $10000
add hl, bc
ld de, -SCREEN_WIDTH
ld c, $1
@@ -4532,7 +4532,7 @@ Function17f4f6: ; 17f4f6
ld h, a
ld a, [wcd47]
ld c, a
- ld a, [BGMapPalBuffer]
+ ld a, [wBGMapPalBuffer]
ld b, a
ld a, [wcd2e]
.asm_17f509
@@ -4688,18 +4688,18 @@ Function17f5d2: ; 17f5d2
Function17f5e4: ; 17f5e4
ld a, $8
- ld [MusicFade], a
+ ld [wMusicFade], a
ld de, MUSIC_NONE
ld a, e
- ld [MusicFadeID], a
+ ld [wMusicFadeID], a
ld a, d
- ld [MusicFadeID + 1], a
+ ld [wMusicFadeID + 1], a
ld a, " "
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
ld a, $6
- hlcoord 0, 0, AttrMap
+ hlcoord 0, 0, wAttrMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
hlcoord 2, 1
@@ -5235,11 +5235,11 @@ Function17ff23: ; 17ff23
and a
ret z
ld a, $8
- ld [MusicFade], a
+ ld [wMusicFade], a
ld a, [wMapMusic]
- ld [MusicFadeID], a
+ ld [wMusicFadeID], a
xor a
- ld [MusicFadeID + 1], a
+ ld [wMusicFadeID + 1], a
ld hl, wc303
set 7, [hl]
ret
diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm
index eb52eb981..a60091d4c 100755
--- a/mobile/mobile_menu.asm
+++ b/mobile/mobile_menu.asm
@@ -190,8 +190,8 @@ Function4a0c2: ; 4a0c2 (12:60c2)
call MenuClickSound
ld a, BANK(sPlayerData)
call GetSRAMBank
- ld hl, sPlayerData + PlayerName - wPlayerData
- ld de, PlayerName
+ ld hl, sPlayerData + wPlayerName - wPlayerData
+ ld de, wPlayerName
ld bc, NAME_LENGTH_JAPANESE
call CopyBytes
call CloseSRAM
@@ -637,13 +637,13 @@ Function4a492: ; 4a492 (12:6492)
MainMenu_MobileStudium: ; 4a496
- ld a, [StartDay]
+ ld a, [wStartDay]
ld b, a
- ld a, [StartHour]
+ ld a, [wStartHour]
ld c, a
- ld a, [StartMinute]
+ ld a, [wStartMinute]
ld d, a
- ld a, [StartSecond]
+ ld a, [wStartSecond]
ld e, a
push bc
push de
@@ -652,13 +652,13 @@ MainMenu_MobileStudium: ; 4a496
pop de
pop bc
ld a, b
- ld [StartDay], a
+ ld [wStartDay], a
ld a, c
- ld [StartHour], a
+ ld [wStartHour], a
ld a, d
- ld [StartMinute], a
+ ld [wStartMinute], a
ld a, e
- ld [StartSecond], a
+ ld [wStartSecond], a
ret
; 4a4c4
@@ -852,11 +852,11 @@ Function4a6ab: ; 4a6ab (12:66ab)
Function4a6c5: ; 4a6c5 (12:66c5)
ld a, $5
- ld [MusicFade], a
+ ld [wMusicFade], a
ld a, e
- ld [MusicFadeID], a
+ ld [wMusicFadeID], a
ld a, d
- ld [MusicFadeID + 1], a
+ ld [wMusicFadeID + 1], a
ld c, 22
call DelayFrames
ret
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-19 00:34:03 +0000