summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/battle/misc.asm2
-rw-r--r--engine/battle/read_trainer_party.asm2
-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/remove_mon.asm2
10 files changed, 27 insertions, 27 deletions
diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm
index 33af6f6f..524ec161 100644
--- a/engine/battle/misc.asm
+++ b/engine/battle/misc.asm
@@ -113,7 +113,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/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm
index a0132a4f..a9e09a30 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/events/give_pokemon.asm b/engine/events/give_pokemon.asm
index ef01ef99..14dcea42 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 0448866e..38ea37c0 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -120,7 +120,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
@@ -2638,7 +2638,7 @@ IsKeyItem_::
INCLUDE "data/items/key_items.asm"
SendNewMonToBox:
- ld de, wNumInBox
+ ld de, wBoxCount
ld a, [de]
inc a
ld [de], a
@@ -2657,7 +2657,7 @@ SendNewMonToBox:
call GetMonHeader
ld hl, wBoxMonOT
ld bc, NAME_LENGTH
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
dec a
jr z, .asm_e7ee
dec a
@@ -2668,7 +2668,7 @@ SendNewMonToBox:
ld d, h
ld e, l
pop hl
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
dec a
ld b, a
.asm_e7db
@@ -2689,7 +2689,7 @@ SendNewMonToBox:
ld de, wBoxMonOT
ld bc, NAME_LENGTH
call CopyData
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
dec a
jr z, .asm_e82a
ld hl, wBoxMonNicks
@@ -2702,7 +2702,7 @@ SendNewMonToBox:
ld d, h
ld e, l
pop hl
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
dec a
ld b, a
.asm_e817
@@ -2723,7 +2723,7 @@ SendNewMonToBox:
ld a, NAME_MON_SCREEN
ld [wNamingScreenType], a
predef AskName
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
dec a
jr z, .asm_e867
ld hl, wBoxMons
@@ -2736,7 +2736,7 @@ SendNewMonToBox:
ld d, h
ld e, l
pop hl
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
dec a
ld b, a
.asm_e854
diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm
index b6389fe3..f3bf3b5d 100644
--- a/engine/link/cable_club.asm
+++ b/engine/link/cable_club.asm
@@ -648,7 +648,7 @@ TradeCenter_DrawPartyLists:
ld de, wPartySpecies
call TradeCenter_PrintPartyListNames
hlcoord 2, 9
- ld de, wEnemyPartyMons
+ ld de, wEnemyPartySpecies
; fall through
TradeCenter_PrintPartyListNames:
@@ -701,7 +701,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
@@ -798,7 +798,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
@@ -818,7 +818,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 dc2e27c2..07eb5acb 100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -580,7 +580,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 53ca24f3..f722ebff 100644
--- a/engine/movie/oak_speech/init_player_data.asm
+++ b/engine/movie/oak_speech/init_player_data.asm
@@ -14,7 +14,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 46a8b2b9..611aebf4 100644
--- a/engine/pokemon/add_mon.asm
+++ b/engine/pokemon/add_mon.asm
@@ -348,7 +348,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
@@ -385,7 +385,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
@@ -435,7 +435,7 @@ _MoveMon::
ld a, [wPartyCount]
jr nz, .addOToffset
ld hl, wBoxMonOT
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
.addOToffset
dec a
call SkipFixedLengthTextEntries
@@ -466,7 +466,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 f83ed434..7aba8001 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -212,7 +212,7 @@ BillsPCDeposit:
call PrintText
jp BillsPCMenu
.partyLargeEnough
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
cp MONS_PER_BOX
jr nz, .boxNotFull
ld hl, BoxFullText
@@ -254,7 +254,7 @@ BillsPCDeposit:
jp BillsPCMenu
BillsPCWithdraw:
- ld a, [wNumInBox]
+ ld a, [wBoxCount]
and a
jr nz, .boxNotEmpty
ld hl, NoMonText
@@ -268,7 +268,7 @@ BillsPCWithdraw:
call PrintText
jp BillsPCMenu
.partyNotFull
- ld hl, wNumInBox
+ ld hl, wBoxCount
call DisplayMonListMenu
jp c, BillsPCMenu
call DisplayDepositWithdrawMenu
@@ -291,14 +291,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
ld hl, OnceReleasedText
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-10-31 11:50:10 +0000