summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/battle/read_trainer_party.asm2
-rw-r--r--engine/debug/debug_menu.asm16
-rw-r--r--engine/events/give_pokemon.asm2
-rw-r--r--engine/items/item_effects.asm16
-rw-r--r--engine/link/cable_club.asm8
-rw-r--r--engine/menus/save.asm2
-rw-r--r--engine/movie/oak_speech/init_player_data.asm2
-rw-r--r--engine/pokemon/add_mon.asm8
-rw-r--r--engine/pokemon/bills_pc.asm10
-rw-r--r--engine/pokemon/load_mon_data.asm2
-rw-r--r--engine/pokemon/remove_mon.asm2
11 files changed, 35 insertions, 35 deletions
diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm
index 02fbfeda..8fa323b5 100644
--- a/engine/battle/read_trainer_party.asm
+++ b/engine/battle/read_trainer_party.asm
@@ -5,7 +5,7 @@ ReadTrainer:
and a
ret nz
-; set [wEnemyPartyCount] to 0, [wEnemyPartyMons] to FF
+; set [wEnemyPartyCount] to 0, [wEnemyPartySpecies] to FF
; XXX first is total enemy pokemon?
; XXX second is species of first pokemon?
ld hl, wEnemyPartyCount
diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm
index 43638be3..4d31265b 100644
--- a/engine/debug/debug_menu.asm
+++ b/engine/debug/debug_menu.asm
@@ -119,7 +119,7 @@ TestBattle:
ld [wGrassMons + 1], a
ld b, a
ld c, a
- ld hl, wEnemyPartyMons
+ ld hl, wEnemyPartySpecies
call Func_fe809
ld hl, wPartyCount
call Func_fe809
@@ -310,7 +310,7 @@ Func_fe8d9:
Func_fe8e2:
ld a, [wWhichPokemon]
push de
- ld de, wEnemyPartyMons
+ ld de, wEnemyPartySpecies
add e
ld e, a
jr nc, .asm_fe8ee
@@ -399,7 +399,7 @@ Func_fe964:
.asm_fe96f
ld a, [hl]
ld b, a
- ld hl, wEnemyPartyMons
+ ld hl, wEnemyPartySpecies
ld a, [wWhichPokemon]
add l
ld l, a
@@ -842,7 +842,7 @@ Func_fec9b:
lb bc, LEADING_ZEROES | 1, 3
call PrintNumber
ld a, [wWhichPokemon]
- ld de, wEnemyPartyMons
+ ld de, wEnemyPartySpecies
add e
ld e, a
jr nc, .asm_fecee
@@ -919,7 +919,7 @@ Data_feded:
db -1 ; end
Func_fedfe:
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
cp 30
jp nc, Func_ff1ad
call ClearScreen
@@ -1445,7 +1445,7 @@ Func_ff1b9:
ld hl, Text_ff28f
call PrintText
callfar EmptyAllSRAMBoxes
- ld hl, wNumInBox
+ ld hl, wBoxCount
xor a
ld [hli], a
dec a
@@ -1553,7 +1553,7 @@ Func_ff295:
call Func_ff2d1
ld e, l
ld d, h
- ld hl, wNumInBox
+ ld hl, wBoxCount
call Func_ff2f3
pop de
ld a, d
@@ -1561,7 +1561,7 @@ Func_ff295:
ld [wCurrentBoxNum], a
push de
call Func_ff2d1
- ld de, wNumInBox
+ ld de, wBoxCount
call Func_ff2f3
ld a, [wLetterPrintingDelayFlags]
push af
diff --git a/engine/events/give_pokemon.asm b/engine/events/give_pokemon.asm
index efc184f8..a65f65cc 100644
--- a/engine/events/give_pokemon.asm
+++ b/engine/events/give_pokemon.asm
@@ -7,7 +7,7 @@ _GivePokemon::
ld a, [wPartyCount]
cp PARTY_LENGTH
jr c, .addToParty
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
cp MONS_PER_BOX
jr nc, .boxFull
; add to box
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 9d6a3c06..ca51cd36 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -122,7 +122,7 @@ ItemUseBall:
ld a, [wPartyCount] ; is party full?
cp PARTY_LENGTH
jr nz, .canUseBall
- ld a, [wNumInBox] ; is box full?
+ ld a, [wBoxCount] ; is box full?
cp MONS_PER_BOX
jp z, BoxFullCannotThrowBall
@@ -2921,7 +2921,7 @@ IsKeyItem_::
INCLUDE "data/items/key_items.asm"
SendNewMonToBox:
- ld de, wNumInBox
+ ld de, wBoxCount
ld a, [de]
inc a
ld [de], a
@@ -2940,7 +2940,7 @@ SendNewMonToBox:
call GetMonHeader
ld hl, wBoxMonOT
ld bc, NAME_LENGTH
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
dec a
jr z, .asm_e732
dec a
@@ -2951,7 +2951,7 @@ SendNewMonToBox:
ld d, h
ld e, l
pop hl
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
dec a
ld b, a
.asm_e71f
@@ -2972,7 +2972,7 @@ SendNewMonToBox:
ld de, wBoxMonOT
ld bc, NAME_LENGTH
call CopyData
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
dec a
jr z, .asm_e76e
ld hl, wBoxMonNicks
@@ -2985,7 +2985,7 @@ SendNewMonToBox:
ld d, h
ld e, l
pop hl
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
dec a
ld b, a
.asm_e75b
@@ -3006,7 +3006,7 @@ SendNewMonToBox:
ld a, NAME_MON_SCREEN
ld [wNamingScreenType], a
predef AskName
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
dec a
jr z, .asm_e7ab
ld hl, wBoxMons
@@ -3019,7 +3019,7 @@ SendNewMonToBox:
ld d, h
ld e, l
pop hl
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
dec a
ld b, a
.asm_e798
diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm
index 5124c744..f9728f47 100644
--- a/engine/link/cable_club.asm
+++ b/engine/link/cable_club.asm
@@ -655,7 +655,7 @@ TradeCenter_DrawPartyLists:
ld de, wPartySpecies
call TradeCenter_PrintPartyListNames
hlcoord 2, 9
- ld de, wEnemyPartyMons
+ ld de, wEnemyPartySpecies
; fall through
TradeCenter_PrintPartyListNames:
@@ -707,7 +707,7 @@ TradeCenter_Trade:
ld bc, NAME_LENGTH
call CopyData
ld a, [wTradingWhichEnemyMon]
- ld hl, wEnemyPartyMons
+ ld hl, wEnemyPartySpecies
ld c, a
ld b, 0
add hl, bc
@@ -803,7 +803,7 @@ TradeCenter_Trade:
ld a, [wTradingWhichEnemyMon]
ld c, a
ld [wWhichPokemon], a
- ld hl, wEnemyPartyMons
+ ld hl, wEnemyPartySpecies
ld d, 0
ld e, a
add hl, de
@@ -823,7 +823,7 @@ TradeCenter_Trade:
ld a, $1
ld [wForceEvolution], a
ld a, [wTradingWhichEnemyMon]
- ld hl, wEnemyPartyMons
+ ld hl, wEnemyPartySpecies
ld b, 0
ld c, a
add hl, bc
diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index 0c53f689..aab29b20 100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -554,7 +554,7 @@ GetMonCountsForAllBoxes:
ld c, a
ld b, 0
add hl, bc
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
ld [hl], a
ret
diff --git a/engine/movie/oak_speech/init_player_data.asm b/engine/movie/oak_speech/init_player_data.asm
index d6745daf..ca7f203d 100644
--- a/engine/movie/oak_speech/init_player_data.asm
+++ b/engine/movie/oak_speech/init_player_data.asm
@@ -19,7 +19,7 @@ InitPlayerData2:
ld hl, wPartyCount
call InitializeEmptyList
- ld hl, wNumInBox
+ ld hl, wBoxCount
call InitializeEmptyList
ld hl, wNumBagItems
call InitializeEmptyList
diff --git a/engine/pokemon/add_mon.asm b/engine/pokemon/add_mon.asm
index e86b7b61..c498f02a 100644
--- a/engine/pokemon/add_mon.asm
+++ b/engine/pokemon/add_mon.asm
@@ -354,7 +354,7 @@ _MoveMon::
ld hl, wDayCareMon
jr z, .findMonDataSrc
; else it's PARTY_TO_BOX
- ld hl, wNumInBox
+ ld hl, wBoxCount
ld a, [hl]
cp MONS_PER_BOX
jr nz, .partyOrBoxNotFull
@@ -391,7 +391,7 @@ _MoveMon::
; if it's PARTY_TO_BOX
ld hl, wBoxMons
ld bc, wBoxMon2 - wBoxMon1 ; $21
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
.addMonOffset
dec a
call AddNTimes
@@ -441,7 +441,7 @@ _MoveMon::
ld a, [wPartyCount]
jr nz, .addOToffset
ld hl, wBoxMonOT
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
.addOToffset
dec a
call SkipFixedLengthTextEntries
@@ -472,7 +472,7 @@ _MoveMon::
ld a, [wPartyCount]
jr nz, .addNickOffset
ld hl, wBoxMonNicks
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
.addNickOffset
dec a
call SkipFixedLengthTextEntries
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm
index 42d4fb07..13ad1b20 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -215,7 +215,7 @@ BillsPCDeposit:
call PrintText
jp BillsPCMenu
.partyLargeEnough
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
cp MONS_PER_BOX
jr nz, .boxNotFull
ld hl, BoxFullText
@@ -276,7 +276,7 @@ SleepingPikachuText2:
text_end
BillsPCWithdraw:
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
and a
jr nz, .boxNotEmpty
ld hl, NoMonText
@@ -290,7 +290,7 @@ BillsPCWithdraw:
call PrintText
jp BillsPCMenu
.partyNotFull
- ld hl, wNumInBox
+ ld hl, wBoxCount
call DisplayMonListMenu
jp c, BillsPCMenu
call DisplayDepositWithdrawMenu
@@ -319,14 +319,14 @@ BillsPCWithdraw:
jp BillsPCMenu
BillsPCRelease:
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
and a
jr nz, .loop
ld hl, NoMonText
call PrintText
jp BillsPCMenu
.loop
- ld hl, wNumInBox
+ ld hl, wBoxCount
call DisplayMonListMenu
jp c, BillsPCMenu
callfar IsThisPartymonStarterPikachu_Box
diff --git a/engine/pokemon/load_mon_data.asm b/engine/pokemon/load_mon_data.asm
index 53840728..3d9417a7 100644
--- a/engine/pokemon/load_mon_data.asm
+++ b/engine/pokemon/load_mon_data.asm
@@ -59,7 +59,7 @@ GetMonSpecies:
ld hl, wBoxSpecies
jr .getSpecies
.enemyParty
- ld hl, wEnemyPartyMons
+ ld hl, wEnemyPartySpecies
.getSpecies
ld d, 0
add hl, de
diff --git a/engine/pokemon/remove_mon.asm b/engine/pokemon/remove_mon.asm
index c85b96bf..60ec8c27 100644
--- a/engine/pokemon/remove_mon.asm
+++ b/engine/pokemon/remove_mon.asm
@@ -3,7 +3,7 @@ _RemovePokemon::
ld a, [wRemoveMonFromBox]
and a
jr z, .usePartyCount
- ld hl, wNumInBox
+ ld hl, wBoxCount
.usePartyCount
ld a, [hl]
dec a
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 13:17:22 +0000