summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rwxr-xr-xengine/anim_hp_bar.asm12
-rw-r--r--engine/billspctop.asm6
-rwxr-xr-xengine/color.asm6
-rwxr-xr-xengine/events/happiness_egg.asm6
-rwxr-xr-xengine/events/overworld.asm12
-rwxr-xr-xengine/health.asm6
-rwxr-xr-xengine/items.asm38
-rw-r--r--engine/learn.asm6
-rwxr-xr-xengine/main_menu.asm30
-rwxr-xr-xengine/move_mon.asm158
-rw-r--r--engine/namingscreen.asm4
-rwxr-xr-xengine/overworld/player_step.asm4
-rwxr-xr-xengine/pack.asm28
-rwxr-xr-xengine/specials.asm16
14 files changed, 166 insertions, 166 deletions
diff --git a/engine/anim_hp_bar.asm b/engine/anim_hp_bar.asm
index c599a942..29afa8ed 100755
--- a/engine/anim_hp_bar.asm
+++ b/engine/anim_hp_bar.asm
@@ -199,7 +199,7 @@ Functiond6fb: ; d6fb (3:56fb)
Functiond736: ; d736 (3:5736)
call Functiond78a
ld d, $6
- ld a, [wd007]
+ ld a, [wWhichHPBar]
and $1
ld b, a
ld a, [wCurHPBarPixels]
@@ -224,7 +224,7 @@ Functiond74f: ; d74f (3:574f)
call ComputeHPBarPixels
ld c, e
ld d, $6
- ld a, [wd007]
+ ld a, [wWhichHPBar]
and $1
ld b, a
push de
@@ -234,7 +234,7 @@ Functiond74f: ; d74f (3:574f)
ret
Functiond777: ; d777 (3:5777)
- ld a, [wd007]
+ ld a, [wWhichHPBar]
cp $2
jr nz, .asm_d786
ld a, $28
@@ -248,7 +248,7 @@ Functiond777: ; d777 (3:5777)
ret
Functiond78a: ; d78a (3:578a)
- ld a, [wd007]
+ ld a, [wWhichHPBar]
and a
ret z
cp $1
@@ -298,12 +298,12 @@ Functiond7cf: ; d7cf (3:57cf)
ret
.asm_d7db
- ld a, [wd007]
+ ld a, [wWhichHPBar]
and a
jr z, .asm_d82f
cp $1
jr z, .asm_d833
- ld a, [wd005]
+ ld a, [wCurPartyMon]
cp $3
jr nc, .asm_d7f0
ld c, $0
diff --git a/engine/billspctop.asm b/engine/billspctop.asm
index ccf50310..c3fe6322 100644
--- a/engine/billspctop.asm
+++ b/engine/billspctop.asm
@@ -169,7 +169,7 @@ CheckCurPartyMonFainted: ; e513 (3:6513)
ld de, $30
ld b, $0
.asm_e51b
- ld a, [wd005]
+ ld a, [wCurPartyMon]
cp b
jr z, .asm_e526
ld a, [hli]
@@ -244,7 +244,7 @@ Functione566: ; e566 (3:6566)
ret
CopyBoxmonToTempMon
- ld a, [wd005]
+ ld a, [wCurPartyMon]
ld hl, sBoxMon1Species
ld bc, $20
call AddNTimes
@@ -257,7 +257,7 @@ CopyBoxmonToTempMon
ret
Function65b4:
- ld a, [wd8bc]
+ ld a, [wCurBox]
cp b
jr z, .asm_e5cc
ld a, b
diff --git a/engine/color.asm b/engine/color.asm
index b379cdc1..057c48a4 100755
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -252,7 +252,7 @@ ApplyMonOrTrainerPals: ; 91e5 (2:51e5)
ld a, e
and a
jr z, .asm_91f5
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
call Function9be4
jr .asm_91fb
@@ -268,7 +268,7 @@ ApplyMonOrTrainerPals: ; 91e5 (2:51e5)
ret
ApplyHPBarPals:
- ld a, [wd007]
+ ld a, [wWhichHPBar]
and a
jr z, .asm_921a
cp $1
@@ -301,7 +301,7 @@ ApplyHPBarPals:
inc e
hlcoord 11, 1, wAttrMap
ld bc, 2 * SCREEN_WIDTH
- ld a, [wd005]
+ ld a, [wCurPartyMon]
.asm_9241
and a
jr z, .asm_9248
diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm
index fe0710fc..70fca685 100755
--- a/engine/events/happiness_egg.asm
+++ b/engine/events/happiness_egg.asm
@@ -30,7 +30,7 @@ CheckFirstMonIsEgg:
jp CopyPokemonName_Buffer1_Buffer3
ChangeHappiness: ; 72a1 (1:72a1)
- ld a, [wd005]
+ ld a, [wCurPartyMon]
inc a
ld e, a
ld d, $0
@@ -42,7 +42,7 @@ ChangeHappiness: ; 72a1 (1:72a1)
push bc
ld hl, wPartyMon1Happiness
ld bc, $30
- ld a, [wd005]
+ ld a, [wCurPartyMon]
call AddNTimes
pop bc
ld d, h
@@ -84,7 +84,7 @@ ChangeHappiness: ; 72a1 (1:72a1)
ld a, [wBattleMode]
and a
ret z
- ld a, [wd005]
+ ld a, [wCurPartyMon]
ld b, a
ld a, [wPartyMenuCursor]
cp b
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index fc9a1102..68f7dcc3 100755
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -23,7 +23,7 @@ FieldMoveGetPartyNick: ; c74b (3:474b)
ld hl, wPartyMon1Nickname
ld a, $2
ld [wMonType], a
- ld a, [wd005]
+ ld a, [wCurPartyMon]
call GetNick
call Function317b
ld de, wStringBuffer2
@@ -59,7 +59,7 @@ FieldMoveBadgeCheck: ; c776 (3:4776)
FieldMovePartyCheck: ; c787 (3:4787)
ld e, $0
xor a
- ld [wd005], a
+ ld [wCurPartyMon], a
.asm_c78d
ld c, e
ld b, $0
@@ -89,7 +89,7 @@ FieldMovePartyCheck: ; c787 (3:4787)
.asm_c7b6
ld a, e
- ld [wd005], a
+ ld [wCurPartyMon], a
xor a
ret
@@ -434,7 +434,7 @@ AlreadySurfingText:
db "@"
GetSurfType: ; c9d7 (3:49d7)
- ld a, [wd005]
+ ld a, [wCurPartyMon]
ld e, a
ld d, $0
ld hl, wPartySpecies
@@ -760,7 +760,7 @@ TryEscapeFromDungeon:
EscapeFromDungeon:
ld hl, wDigWarpNumber
- ld de, wLastWarpNumber
+ ld de, wNextWarpNumber
ld bc, $3
call CopyBytes
call FieldMoveGetPartyNick
@@ -952,7 +952,7 @@ asm_cd0c
GetStrengthUserSpeciesAndSetFlag:
SetFlag ENGINE_STRENGTH_ACTIVE
- ld a, [wd005]
+ ld a, [wCurPartyMon]
ld e, a
ld d, $0
ld hl, wPartySpecies
diff --git a/engine/health.asm b/engine/health.asm
index 2ef116e6..83fea353 100755
--- a/engine/health.asm
+++ b/engine/health.asm
@@ -1,6 +1,6 @@
HealParty: ; c69d (3:469d)
xor a
- ld [wd005], a
+ ld [wCurPartyMon], a
ld hl, wPartySpecies
.asm_c6a4
ld a, [hli]
@@ -12,9 +12,9 @@ HealParty: ; c69d (3:469d)
call Functionc6bc
pop hl
.asm_c6b2
- ld a, [wd005]
+ ld a, [wCurPartyMon]
inc a
- ld [wd005], a
+ ld [wCurPartyMon], a
jr .asm_c6a4
.asm_c6bb
diff --git a/engine/items.asm b/engine/items.asm
index 387f4ba2..7d69c933 100755
--- a/engine/items.asm
+++ b/engine/items.asm
@@ -4,7 +4,7 @@ ReceiveItem_:: ; d1e2 (3:51e2)
push hl
call CheckItemPocket
pop de
- ld a, [wd03f]
+ ld a, [wItemAttributeParamBuffer]
dec a
ld hl, .Jumptable
rst JumpTable
@@ -44,7 +44,7 @@ TossItem_:: ; d21a (3:521a)
push hl
call CheckItemPocket
pop de
- ld a, [wd03f]
+ ld a, [wItemAttributeParamBuffer]
dec a
ld hl, .Jumptable ; $522d
rst JumpTable
@@ -85,7 +85,7 @@ CheckItem_:: ; d251 (3:5251)
push hl
call CheckItemPocket
pop de
- ld a, [wd03f]
+ ld a, [wItemAttributeParamBuffer]
dec a
ld hl, .Jumptable
rst JumpTable
@@ -165,7 +165,7 @@ PutItemInPocketOrPC: ; d2a9 (3:52a9)
sub [hl]
add b
ld b, a
- ld a, [wd009]
+ ld a, [wItemQuantityChangeBuffer]
cp b
jr z, .asm_d2d3
jr c, .asm_d2d3
@@ -186,8 +186,8 @@ PutItemInPocketOrPC: ; d2a9 (3:52a9)
ld l, e
ld a, [wd002]
ld c, a
- ld a, [wd009]
- ld [wd00a], a
+ ld a, [wItemQuantityChangeBuffer]
+ ld [wItemQuantityBuffer], a
.asm_d2df
inc hl
ld a, [hli]
@@ -195,7 +195,7 @@ PutItemInPocketOrPC: ; d2a9 (3:52a9)
jr z, .asm_d2fc
cp c
jr nz, .asm_d2df
- ld a, [wd00a]
+ ld a, [wItemQuantityBuffer]
add [hl]
cp $64
jr nc, .asm_d2f3
@@ -205,14 +205,14 @@ PutItemInPocketOrPC: ; d2a9 (3:52a9)
.asm_d2f3
ld [hl], $63
sub $63
- ld [wd00a], a
+ ld [wItemQuantityBuffer], a
jr .asm_d2df
.asm_d2fc
dec hl
ld a, [wd002]
ld [hli], a
- ld a, [wd00a]
+ ld a, [wItemQuantityBuffer]
ld [hli], a
ld [hl], $ff
ld h, d
@@ -254,13 +254,13 @@ RemoveItemAndQuantity: ; d30c (3:530c)
jr .asm_d329
.asm_d334
- ld a, [wd009]
+ ld a, [wItemQuantityChangeBuffer]
ld b, a
ld a, [hl]
sub b
jr c, .asm_d354
ld [hl], a
- ld [wd00a], a
+ ld [wItemQuantityBuffer], a
and a
jr nz, .asm_d352
dec hl
@@ -394,7 +394,7 @@ PutItemInTMPocket: ; d3d1 (3:53d1)
ld b, $0
ld hl, wTMsHMs
add hl, bc
- ld a, [wd009]
+ ld a, [wItemQuantityChangeBuffer]
add [hl]
cp $64
jr nc, .asm_d3e3
@@ -411,13 +411,13 @@ RemoveTMorHM: ; d3e5 (3:53e5)
ld b, $0
ld hl, wTMsHMs
add hl, bc
- ld a, [wd009]
+ ld a, [wItemQuantityChangeBuffer]
ld b, a
ld a, [hl]
sub b
jr c, .asm_d406
ld [hl], a
- ld [wd00a], a
+ ld [wItemQuantityBuffer], a
jr nz, .asm_d404
ld a, [wcfd2]
and a
@@ -493,14 +493,14 @@ CheckItemPocket: ; d44a (3:544a)
ld a, $5
call GetItemAttr
and $f
- ld [wd03f], a
+ ld [wItemAttributeParamBuffer], a
ret
CheckItemContext:
ld a, $6
call GetItemAttr
and $f
- ld [wd03f], a
+ ld [wItemAttributeParamBuffer], a
ret
CheckItemMenu:
@@ -508,7 +508,7 @@ CheckItemMenu:
call GetItemAttr
swap a
and $f
- ld [wd03f], a
+ ld [wItemAttributeParamBuffer], a
ret
GetItemAttr: ; d46d (3:546d)
@@ -519,7 +519,7 @@ GetItemAttr: ; d46d (3:546d)
ld b, $0
add hl, bc
xor a
- ld [wd03f], a
+ ld [wItemAttributeParamBuffer], a
ld a, [wd002]
dec a
ld c, a
@@ -533,7 +533,7 @@ GetItemAttr: ; d46d (3:546d)
ItemAttr_ReturnCarry
ld a, $1
- ld [wd03f], a
+ ld [wItemAttributeParamBuffer], a
scf
ret
diff --git a/engine/learn.asm b/engine/learn.asm
index feb02ff1..f6e06572 100644
--- a/engine/learn.asm
+++ b/engine/learn.asm
@@ -1,6 +1,6 @@
LearnMove:
call BackUpTilesToBuffer
- ld a, [wd005]
+ ld a, [wCurPartyMon]
ld hl, wPartyMon1Nickname
call GetNick
ld hl, wStringBuffer1
@@ -10,7 +10,7 @@ LearnMove:
.loop
ld hl, wPartyMon1Moves
ld bc, $30
- ld a, [wd005]
+ ld a, [wCurPartyMon]
call AddNTimes
ld d, h
ld e, l
@@ -64,7 +64,7 @@ LearnMove:
ld a, [wBattleMode]
and a
jp z, .LearnedMove
- ld a, [wd005]
+ ld a, [wCurPartyMon]
ld b, a
ld a, [wCurBattleMon]
cp b
diff --git a/engine/main_menu.asm b/engine/main_menu.asm
index 40acea32..9a829be9 100755
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -85,7 +85,7 @@ Function5ae4: ; 5ae4 (1:5ae4)
nop
nop
nop
- ld a, [wd19a]
+ ld a, [wSaveFileExists]
and a
jr nz, .asm_5af0
ld a, $0
@@ -128,7 +128,7 @@ Function5b0a: ; 5b0a (1:5b0a)
ret
Function5b27: ; 5b27 (1:5b27)
- ld a, [wd19a]
+ ld a, [wSaveFileExists]
and a
ret z
xor a
@@ -160,7 +160,7 @@ Function5b45: ; 5b45 (1:5b45)
ret
Function5b5b: ; 5b5b (1:5b5b)
- ld a, [wd19a]
+ ld a, [wSaveFileExists]
and a
ret z
call CheckRTCStatus
@@ -292,7 +292,7 @@ Function5c41: ; 5c41 (1:5c41)
call Function5d15
xor a
- ld [wd8bc], a
+ ld [wCurBox], a
ld [wSavedAtLeastOnce], a
call Function5d1a
@@ -313,16 +313,16 @@ Function5c41: ; 5c41 (1:5c41)
call Function5d15
xor a
- ld [wdd1a], a
- ld [wdd21], a
- ld [wdd28], a
+ ld [wRoamMon1Species], a
+ ld [wRoamMon2Species], a
+ ld [wRoamMon3Species], a
ld a, $ff
- ld [wdd1c], a
- ld [wdd23], a
- ld [wdd2a], a
- ld [wdd1d], a
- ld [wdd24], a
- ld [wdd2b], a
+ ld [wRoamMon1MapGroup], a
+ ld [wRoamMon2MapGroup], a
+ ld [wRoamMon3MapGroup], a
+ ld [wRoamMon1MapNumber], a
+ ld [wRoamMon2MapNumber], a
+ ld [wRoamMon3MapNumber], a
ld a, BANK(s0_abe2)
call OpenSRAM
@@ -381,7 +381,7 @@ Function5d15: ; 5d15 (1:5d15)
ret
Function5d1a: ; 5d1a (1:5d1a)
- ld hl, wd8bf
+ ld hl, wBoxNames
ld c, $0
.asm_5d1f
push hl
@@ -411,7 +411,7 @@ Function5d1a: ; 5d1a (1:5d1a)
.Box db "BOX@"
InitializeMagikarpHouse: ; 5d47 (1:5d47)
- ld hl, wdd33
+ ld hl, wBestMagikarpLengthFeet
ld a, 3
ld [hli], a
ld a, 6
diff --git a/engine/move_mon.asm b/engine/move_mon.asm
index e1ffa672..4c5a9e94 100755
--- a/engine/move_mon.asm
+++ b/engine/move_mon.asm
@@ -17,7 +17,7 @@ TryAddMonToParty:: ; d892 (3:5892)
jr nc, .asm_d8ad
inc d
.asm_d8ad
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
ld [de], a
inc de
ld a, $ff
@@ -39,7 +39,7 @@ TryAddMonToParty:: ; d892 (3:5892)
ld a, [wMonType]
and a
jr nz, .asm_d8f6
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
ld [wd151], a
call GetPokemonName
ld hl, wPartyMonNicknames
@@ -155,7 +155,7 @@ GeneratePartyMonStats:
jr .asm_d9bb
.asm_d998
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
ld [wd151], a
dec a
push de
@@ -286,7 +286,7 @@ GeneratePartyMonStats:
ld a, [wMonType]
and $f
jr nz, .asm_da71
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
cp $c9
jr nz, .asm_da71
ld hl, wPartyMon1DVs
@@ -359,7 +359,7 @@ AddTempmonToParty: ; da9c (3:5a9c)
ld d, h
ld e, l
ld hl, wOTPartyMon6StatsEnd
- ld a, [wd005]
+ ld a, [wCurPartyMon]
call SkipNames
ld bc, NAME_LENGTH
call CopyBytes
@@ -370,13 +370,13 @@ AddTempmonToParty: ; da9c (3:5a9c)
ld d, h
ld e, l
ld hl, wOTPartyMon1Nickname
- ld a, [wd005]
+ ld a, [wCurPartyMon]
call SkipNames
ld bc, NAME_LENGTH
call CopyBytes
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
ld [wd151], a
- cp $fd
+ cp EGG
jr z, .asm_db18
dec a
call SetSeenAndCaughtMon
@@ -385,10 +385,10 @@ AddTempmonToParty: ; da9c (3:5a9c)
dec a
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
- ld [hl], $46
+ ld [hl], 70
.asm_db18
ld a, [wCurPartySpecies]
- cp $c9
+ cp UNOWN
jr nz, .asm_db43
ld hl, wPartyMon1DVs
ld a, [wPartyCount]
@@ -397,11 +397,11 @@ AddTempmonToParty: ; da9c (3:5a9c)
call AddNTimes
predef GetUnownLetter
callab UpdateUnownDex
- ld a, [wdc3f]
+ ld a, [wFirstUnownSeen]
and a
jr nz, .asm_db43
ld a, [wd11e]
- ld [wdc3f], a
+ ld [wFirstUnownSeen], a
.asm_db43
and a
ret
@@ -409,13 +409,13 @@ AddTempmonToParty: ; da9c (3:5a9c)
SentGetPkmnIntoFromBox: ; db45 (3:5b45)
ld a, $1
call OpenSRAM
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
and a
jr z, .asm_db66
cp $2
jr z, .asm_db66
cp $3
- ld hl, wBreedMon1
+ ld hl, wBreedMon1Species
jr z, .asm_dba1
ld hl, sBoxCount
ld a, [hl]
@@ -434,15 +434,15 @@ SentGetPkmnIntoFromBox: ; db45 (3:5b45)
ld c, a
ld b, $0
add hl, bc
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
cp $2
- ld a, [wBreedMon1]
+ ld a, [wBreedMon1Species]
jr z, .asm_db82
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
.asm_db82
ld [hli], a
ld [hl], $ff
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
dec a
ld hl, wPartyMons
ld bc, PARTYMON_STRUCT_LENGTH
@@ -458,25 +458,25 @@ SentGetPkmnIntoFromBox: ; db45 (3:5b45)
push hl
ld e, l
ld d, h
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
and a
ld hl, sBoxMon1Species
ld bc, BOXMON_STRUCT_LENGTH
jr z, .asm_dbbd
cp $2
- ld hl, wBreedMon1
+ ld hl, wBreedMon1Species
jr z, .asm_dbc3
ld hl, wPartyMon1Species
ld bc, PARTYMON_STRUCT_LENGTH
.asm_dbbd
- ld a, [wd005]
+ ld a, [wCurPartyMon]
call AddNTimes
.asm_dbc3
ld bc, BOXMON_STRUCT_LENGTH
call CopyBytes
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
cp $3
- ld de, wdc4c
+ ld de, wBreedMon1OT
jr z, .asm_dbe8
dec a
ld hl, wPartyMonOT
@@ -491,22 +491,22 @@ SentGetPkmnIntoFromBox: ; db45 (3:5b45)
ld e, l
.asm_dbe8
ld hl, sBoxMonOT
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
and a
jr z, .asm_dbfb
- ld hl, wdc4c
+ ld hl, wBreedMon1OT
cp $2
jr z, .asm_dc01
ld hl, wPartyMon6StatsEnd
.asm_dbfb
- ld a, [wd005]
+ ld a, [wCurPartyMon]
call SkipNames
.asm_dc01
ld bc, NAME_LENGTH
call CopyBytes
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
cp $3
- ld de, wdc41
+ ld de, wBreedMon1Nick
jr z, .asm_dc26
dec a
ld hl, wPartyMon1Nickname
@@ -521,21 +521,21 @@ SentGetPkmnIntoFromBox: ; db45 (3:5b45)
ld e, l
.asm_dc26
ld hl, sBoxMonNicknames
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
and a
jr z, .asm_dc39
- ld hl, wdc41
+ ld hl, wBreedMon1Nick
cp $2
jr z, .asm_dc3f
ld hl, wPartyMon1Nickname
.asm_dc39
- ld a, [wd005]
+ ld a, [wCurPartyMon]
call SkipNames
.asm_dc3f
ld bc, NAME_LENGTH
call CopyBytes
pop hl
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
cp $1
jr z, .asm_dcaa
cp $3
@@ -564,7 +564,7 @@ SentGetPkmnIntoFromBox: ; db45 (3:5b45)
ld b, $1
call CalcPkmnStats
pop bc
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
and a
jr nz, Functiondcb2
ld hl, $20
@@ -575,7 +575,7 @@ SentGetPkmnIntoFromBox: ; db45 (3:5b45)
add hl, bc
ld d, h
ld e, l
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
cp $fd
jr z, .asm_dca4
inc hl
@@ -683,11 +683,11 @@ RetrievePokemonFromDaycareMan:
ld a, e
ld [wCurPartyLevel], a
xor a
- ld [wd008], a
+ ld [wPokemonWithdrawDepositParameter], a
jp Functiondd6a
RetrievePokemonFromDaycareLady:
- ld a, [wBreedMon2]
+ ld a, [wBreedMon2Species]
ld [wCurPartySpecies], a
ld de, SFX_TRANSACTION
call PlaySFX
@@ -698,7 +698,7 @@ RetrievePokemonFromDaycareLady:
ld a, e
ld [wCurPartyLevel], a
ld a, $1
- ld [wd008], a
+ ld [wPokemonWithdrawDepositParameter], a
jp Functiondd6a ; super long jump
Functiondd6a: ; dd6a (3:5d6a)
@@ -715,13 +715,13 @@ Functiondd6a: ; dd6a (3:5d6a)
ld c, a
ld b, $0
add hl, bc
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
and a
- ld a, [wBreedMon1]
- ld de, wdc41
+ ld a, [wBreedMon1Species]
+ ld de, wBreedMon1Nick
jr z, .asm_dd8c
- ld a, [wBreedMon2]
- ld de, wdc7a
+ ld a, [wBreedMon2Species]
+ ld de, wBreedMon2Nick
.asm_dd8c
ld [hli], a
ld [wCurSpecies], a
@@ -779,7 +779,7 @@ Functiondd6a: ; dd6a (3:5d6a)
predef FillMoves
ld a, [wPartyCount]
dec a
- ld [wd005], a
+ ld [wCurPartyMon], a
callba Functionc6bc ; same bank
ld a, [wCurPartyLevel]
ld d, a
@@ -806,28 +806,28 @@ Functionde20: ; de20 (3:5e20)
ld e, l
ret
- ld de, wdc41
+ ld de, wBreedMon1Nick
call Functionde4a
xor a
- ld [wd008], a
+ ld [wPokemonWithdrawDepositParameter], a
jp RemoveMonFromPartyOrBox
- ld de, wdc7a
+ ld de, wBreedMon2Nick
call Functionde4a
xor a
- ld [wd008], a
+ ld [wPokemonWithdrawDepositParameter], a
jp RemoveMonFromPartyOrBox
Functionde4a: ; de4a (3:5e4a)
- ld a, [wd005]
+ ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames
call SkipNames
call CopyBytes
- ld a, [wd005]
+ ld a, [wCurPartyMon]
ld hl, wPartyMon1OT
call SkipNames
call CopyBytes
- ld a, [wd005]
+ ld a, [wCurPartyMon]
ld hl, wPartyMon1
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
@@ -843,7 +843,7 @@ SentPkmnIntoBox: ; de74 (3:5e74)
jp nc, Functiondf48
inc a
ld [de], a
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
ld [wCurSpecies], a
ld c, a
.asm_de8b
@@ -861,7 +861,7 @@ SentPkmnIntoBox: ; de74 (3:5e74)
ld de, sBoxMonOT
ld bc, NAME_LENGTH
call CopyBytes
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
ld [wd151], a
call GetPokemonName
ld de, sBoxMonNicknames
@@ -920,7 +920,7 @@ SentPkmnIntoBox: ; de74 (3:5e74)
inc de
ld a, [wCurPartyLevel]
ld [de], a
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
dec a
call SetSeenAndCaughtMon
ld a, [wCurPartySpecies]
@@ -991,7 +991,7 @@ Functiondf65: ; df65 (3:5f65)
ret
GiveEgg: ; df92 (3:5f92)
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
push af
callab GetPreEvolution
callab GetPreEvolution
@@ -1020,7 +1020,7 @@ GiveEgg: ; df92 (3:5f92)
ld a, c
and a
jr nz, .asm_dfdf
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
dec a
ld c, a
ld d, $0
@@ -1029,13 +1029,13 @@ GiveEgg: ; df92 (3:5f92)
predef FlagPredef
.asm_dfdf
pop af
- ld [wd004], a
+ ld [wCurPartySpecies], a
ld a, [wPokemonData]
dec a
ld bc, PARTYMON_STRUCT_LENGTH
ld hl, wPartyMon1Species
call AddNTimes
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
ld [hl], a
ld hl, wPokemonData
ld a, [hl]
@@ -1078,7 +1078,7 @@ String_Egg:
RemoveMonFromPartyOrBox: ; e03f (3:603f)
ld hl, wPartyCount
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
and a
jr z, .asm_e050
ld a, $1
@@ -1088,7 +1088,7 @@ RemoveMonFromPartyOrBox: ; e03f (3:603f)
ld a, [hl]
dec a
ld [hli], a
- ld a, [wd005]
+ ld a, [wCurPartyMon]
ld c, a
ld b, $0
add hl, bc
@@ -1103,15 +1103,15 @@ RemoveMonFromPartyOrBox: ; e03f (3:603f)
jr nz, .asm_e05d
ld hl, wPartyMon6StatsEnd
ld d, $5
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
and a
jr z, .asm_e073
ld hl, sBoxMonOT
ld d, $13
.asm_e073
- ld a, [wd005]
+ ld a, [wCurPartyMon]
call SkipNames
- ld a, [wd005]
+ ld a, [wCurPartyMon]
cp d
jr nz, .asm_e084
ld [hl], $ff
@@ -1123,7 +1123,7 @@ RemoveMonFromPartyOrBox: ; e03f (3:603f)
ld bc, NAME_LENGTH
add hl, bc
ld bc, wPartyMonNicknames
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
and a
jr z, .asm_e096
ld bc, sBoxMonNicknames
@@ -1131,17 +1131,17 @@ RemoveMonFromPartyOrBox: ; e03f (3:603f)
call Function3231
ld hl, wPartyMon1
ld bc, PARTYMON_STRUCT_LENGTH
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
and a
jr z, .asm_e0ab
ld hl, sBoxMon1Species
ld bc, BOXMON_STRUCT_LENGTH
.asm_e0ab
- ld a, [wd005]
+ ld a, [wCurPartyMon]
call AddNTimes
ld d, h
ld e, l
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
and a
jr z, .asm_e0c2
ld bc, BOXMON_STRUCT_LENGTH
@@ -1156,27 +1156,27 @@ RemoveMonFromPartyOrBox: ; e03f (3:603f)
.asm_e0c9
call Function3231
ld hl, wPartyMonNicknames
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
and a
jr z, .asm_e0d8
ld hl, sBoxMonNicknames
.asm_e0d8
ld bc, NAME_LENGTH
- ld a, [wd005]
+ ld a, [wCurPartyMon]
call AddNTimes
ld d, h
ld e, l
ld bc, NAME_LENGTH
add hl, bc
- ld bc, wdbce
- ld a, [wd008]
+ ld bc, wPartyMonNicknamesEnd
+ ld a, [wPokemonWithdrawDepositParameter]
and a
jr z, .asm_e0f3
ld bc, sBoxEnd
.asm_e0f3
call Function3231
.asm_e0f6
- ld a, [wd008]
+ ld a, [wPokemonWithdrawDepositParameter]
and a
jp nz, CloseSRAM
ld a, [wLinkMode]
@@ -1185,7 +1185,7 @@ RemoveMonFromPartyOrBox: ; e03f (3:603f)
ld a, $0
call OpenSRAM
ld hl, wPokemonData
- ld a, [wd005]
+ ld a, [wCurPartyMon]
cp [hl]
jr z, .asm_e137
ld hl, s0_a600
@@ -1194,7 +1194,7 @@ RemoveMonFromPartyOrBox: ; e03f (3:603f)
push hl
add hl, bc
pop de
- ld a, [wd005]
+ ld a, [wCurPartyMon]
ld b, a
.asm_e120
push bc
@@ -1484,7 +1484,7 @@ GivePoke: ; Give a Pokemon from script
ld hl, wPartyMon1Nickname
ld a, [wPokemonData]
dec a
- ld [wd005], a
+ ld [wCurPartyMon], a
call SkipNames
ld d, h
ld e, l
@@ -1497,7 +1497,7 @@ GivePoke: ; Give a Pokemon from script
ld a, [wd002]
and a
jr z, .asm_e2fa
- ld a, [wd005]
+ ld a, [wCurPartyMon]
ld hl, wPartyMon1Item
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
@@ -1514,7 +1514,7 @@ GivePoke: ; Give a Pokemon from script
ld a, BOXMON
ld [wMonType], a
xor a
- ld [wd005], a
+ ld [wCurPartyMon], a
ld de, wMonOrItemNameBuffer
pop bc
ld a, b
@@ -1528,7 +1528,7 @@ GivePoke: ; Give a Pokemon from script
ld a, [wd002]
ld [sBoxMon1Item], a
.asm_e2fa
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
ld [wd151], a
ld [wTempEnemyMonSpecies], a
call GetPokemonName
@@ -1561,7 +1561,7 @@ GivePoke: ; Give a Pokemon from script
push bc
jr nz, .asm_e360
push hl
- ld a, [wd005]
+ ld a, [wCurPartyMon]
ld hl, wPartyMon1OT
call SkipNames
ld d, h
@@ -1569,7 +1569,7 @@ GivePoke: ; Give a Pokemon from script
pop hl
ld a, [wScriptBank]
call FarCopyBytes
- ld a, [wd005]
+ ld a, [wCurPartyMon]
ld hl, wPartyMon1ID
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm
index a250ade9..54147ee9 100644
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -77,13 +77,13 @@ Function11b09: ; 11b09 (4:5b09)
dw Function11b2a
Function11b2a:
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
ld [wd151], a
ld hl, LoadMenuMonIcon
ld a, BANK(LoadMenuMonIcon)
ld e, $1
rst FarCall
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
ld [wd151], a
call GetPokemonName
hlcoord 5, 2
diff --git a/engine/overworld/player_step.asm b/engine/overworld/player_step.asm
index c856a78a..70947346 100755
--- a/engine/overworld/player_step.asm
+++ b/engine/overworld/player_step.asm
@@ -12,7 +12,7 @@ HandlePlayerStep_::
.asm_d4b6
ld a, $4
- ld [wd03c], a
+ ld [wHandlePlayerStep], a
call Functiond53c
jr .asm_d4c5
@@ -48,7 +48,7 @@ ScrollScreen::
ret
Functiond4f2: ; d4f2 (3:54f2)
- ld hl, wd03c
+ ld hl, wHandlePlayerStep
ld a, [hl]
and a
ret z
diff --git a/engine/pack.asm b/engine/pack.asm
index f923c039..b8e4725e 100755
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -121,7 +121,7 @@ Pack_TMHMPocketMenu:
call Function10cef
ret c
callba CheckTossableItem_
- ld a, [wd03f]
+ ld a, [wItemAttributeParamBuffer]
and a
jr nz, .asm_1053a
ld hl, TMHMPocketSubmenuDataHeader_Give ; $456b
@@ -229,29 +229,29 @@ Pack_BallsPocketMenu:
Function105f5: ; 105f5 (4:45f5)
callba CheckTossableItem_
- ld a, [wd03f]
+ ld a, [wItemAttributeParamBuffer]
and a
jr nz, .asm_10629
callba CheckSelectableItem
- ld a, [wd03f]
+ ld a, [wItemAttributeParamBuffer]
and a
jr nz, .asm_1061b
callba CheckItemMenu
- ld a, [wd03f]
+ ld a, [wItemAttributeParamBuffer]
and a
jr nz, .asm_10637
jr .asm_10657
.asm_1061b
callba CheckItemMenu
- ld a, [wd03f]
+ ld a, [wItemAttributeParamBuffer]
and a
jr nz, .asm_1063f
jr .asm_1065f
.asm_10629
callba CheckSelectableItem
- ld a, [wd03f]
+ ld a, [wItemAttributeParamBuffer]
and a
jr nz, .asm_10647
jr .asm_1064f
@@ -418,7 +418,7 @@ ItemSubmenuJumptable_GiveTossQuit:
UseItem:
callba CheckItemMenu
- ld a, [wd03f]
+ ld a, [wItemAttributeParamBuffer]
ld hl, .Jumptable
rst JumpTable
ret
@@ -522,7 +522,7 @@ Function107cd:
RegisterItem:
callba CheckSelectableItem
- ld a, [wd03f]
+ ld a, [wItemAttributeParamBuffer]
and a
jr nz, .asm_10826
ld a, [wce65]
@@ -534,9 +534,9 @@ RegisterItem:
inc a
and $3f
or b
- ld [wd680], a
+ ld [wWhichRegisteredItem], a
ld a, [wd002]
- ld [wd681], a
+ ld [wRegisteredItem], a
call Function10e38
ld de, SFX_FULL_HEAL
call WaitPlaySFX
@@ -558,7 +558,7 @@ GiveItem:
res 4, a
ld [wOptions], a
ld a, $8
- ld [wd03e], a
+ ld [wPartyMenuActionText], a
call ClearBGPalettes
callba LoadPartyMenuGFX
callba InitPartyMenuWithCancel
@@ -571,7 +571,7 @@ GiveItem:
call DelayFrame
callba PartyMenuSelect
jr c, .asm_108a5
- ld a, [wd004]
+ ld a, [wCurPartySpecies]
cp EGG
jr nz, .asm_10883
ld hl, Text_AnEggCantHoldAnItem
@@ -772,7 +772,7 @@ BattlePack_BallsPocketMenu:
Function10a03: ; 10a03 (4:4a03)
callba CheckItemContext
- ld a, [wd03f]
+ ld a, [wItemAttributeParamBuffer]
Function10a0c: ; 10a0c (4:4a0c)
and a
jr z, .asm_10a17
@@ -829,7 +829,7 @@ BattlePackQuitJumptable:
BattlePack_UseItem:
callba CheckItemContext
- ld a, [wd03f]
+ ld a, [wItemAttributeParamBuffer]
ld hl, $4a67
rst JumpTable
ret
diff --git a/engine/specials.asm b/engine/specials.asm
index 29b6eba9..dd2d427a 100755
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -271,7 +271,7 @@ GetMysteryGiftItem: ; c463 (3:4463)
ld a, [$abe2]
ld [wd002], a
ld a, $1
- ld [wd009], a
+ ld [wItemQuantityChangeBuffer], a
ld hl, wNumItems
call ReceiveItem
jr nc, .asm_c497
@@ -411,14 +411,14 @@ UnusedCheckUnusedTwoDayTimer: ; c549 (3:4549)
ActivateFishingSwarm: ; c556 (3:4556)
ld a, [wScriptVar]
- ld [wdd19], a
+ ld [wFishingSwarmFlag], a
jr .asm_c566
.asm_c55e
ld a, d
- ld [wdd17], a
+ ld [wDunsparceMapGroup], a
ld a, e
- ld [wdd18], a
+ ld [wDunsparceMapNumber], a
.asm_c566
SetFlag ENGINE_SPECIAL_WILDDATA
ret
@@ -434,9 +434,9 @@ Functionc56c:
ld a, $1
ld [wScriptVar], a
xor a
- ld [wdd19], a
- ld [wdd17], a
- ld [wdd18], a
+ ld [wFishingSwarmFlag], a
+ ld [wDunsparceMapGroup], a
+ ld [wDunsparceMapNumber], a
ret
CheckPokerus: ; c588 (3:4588)
@@ -474,7 +474,7 @@ SelectApricornForKurt: ; c5bb (3:45bb)
ret z
ld [wd002], a
ld a, $1
- ld [wd009], a
+ ld [wItemQuantityChangeBuffer], a
ld hl, wNumItems
call TossItem
ret
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 07:41:09 +0000