summaryrefslogtreecommitdiff
path: root/engine/pokemon
diff options
context:
space:
mode:
Diffstat (limited to 'engine/pokemon')
-rw-r--r--engine/pokemon/bills_pc.asm10
-rw-r--r--engine/pokemon/bills_pc_top.asm4
-rw-r--r--engine/pokemon/breeding.asm4
-rw-r--r--engine/pokemon/caught_nickname.asm4
-rw-r--r--engine/pokemon/evolve.asm8
-rw-r--r--engine/pokemon/learn.asm2
-rw-r--r--engine/pokemon/mail.asm4
-rw-r--r--engine/pokemon/mon_menu.asm48
-rw-r--r--engine/pokemon/mon_stats.asm2
-rw-r--r--engine/pokemon/mon_submenu.asm2
-rw-r--r--engine/pokemon/move_mon.asm8
-rw-r--r--engine/pokemon/stats_screen.asm10
-rw-r--r--engine/pokemon/types.asm4
13 files changed, 55 insertions, 55 deletions
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm
index 2ba4c48c..2902d9ef 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -130,7 +130,7 @@ _DepositPKMN:
ld hl, BillsPCDepositMenuHeader
call CopyMenuHeader
ld a, [wMenuCursorY]
- call StoreTo_wMenuCursorBuffer
+ call StoreMenuCursorPosition
call VerticalMenu
jp c, BillsPCDepositFuncCancel
ld a, [wMenuCursorY]
@@ -372,7 +372,7 @@ BillsPC_Withdraw:
ld hl, .MenuHeader
call CopyMenuHeader
ld a, [wMenuCursorY]
- call StoreTo_wMenuCursorBuffer
+ call StoreMenuCursorPosition
call VerticalMenu
jp c, .cancel
ld a, [wMenuCursorY]
@@ -623,7 +623,7 @@ _MovePKMNWithoutMail:
ld hl, .MenuHeader
call CopyMenuHeader
ld a, [wMenuCursorY]
- call StoreTo_wMenuCursorBuffer
+ call StoreMenuCursorPosition
call VerticalMenu
jp c, .Cancel
ld a, [wMenuCursorY]
@@ -2292,9 +2292,9 @@ BillsPC_PrintBoxCountAndCapacity:
ld de, .Pokemon
call PlaceString
call GetBoxCount
- ld [wDeciramBuffer], a
+ ld [wTextDecimalByte], a
hlcoord 13, 11
- ld de, wDeciramBuffer
+ ld de, wTextDecimalByte
lb bc, 1, 2
call PrintNum
ld de, .out_of_20
diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm
index e4d82e41..1e4cf872 100644
--- a/engine/pokemon/bills_pc_top.asm
+++ b/engine/pokemon/bills_pc_top.asm
@@ -47,14 +47,14 @@ _BillsPC:
call LoadMenuHeader
ld a, $1
.loop
- ld [wMenuCursorBuffer], a
+ ld [wMenuCursorPosition], a
call SetPalettes
xor a
ld [wWhichIndexSet], a
ldh [hBGMapMode], a
call DoNthMenu
jr c, .cancel
- ld a, [wMenuCursorBuffer]
+ ld a, [wMenuCursorPosition]
push af
ld a, [wMenuSelection]
ld hl, .Jumptable
diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm
index eba42c0c..4b68a1d3 100644
--- a/engine/pokemon/breeding.asm
+++ b/engine/pokemon/breeding.asm
@@ -248,7 +248,7 @@ HatchEggs:
ld a, [wCurPartySpecies]
dec de
ld [de], a
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
ld [wCurSpecies], a
call GetPokemonName
xor a
@@ -661,7 +661,7 @@ EggHatch_DoAnimFrame:
ret
EggHatch_AnimationSequence:
- ld a, [wNamedObjectIndexBuffer]
+ ld a, [wNamedObjectIndex]
ld [wJumptableIndex], a
ld a, [wCurSpecies]
push af
diff --git a/engine/pokemon/caught_nickname.asm b/engine/pokemon/caught_nickname.asm
index 562702c9..ff26887d 100644
--- a/engine/pokemon/caught_nickname.asm
+++ b/engine/pokemon/caught_nickname.asm
@@ -38,7 +38,7 @@ CheckPartyFullAfterContest:
ld hl, wPlayerName
call CopyBytes
ld a, [wCurPartySpecies]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetPokemonName
ld hl, wStringBuffer1
ld de, wMonOrItemNameBuffer
@@ -89,7 +89,7 @@ CheckPartyFullAfterContest:
call CopyBytes
callfar InsertPokemonIntoBox
ld a, [wCurPartySpecies]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetPokemonName
call GiveANickname_YesNo
ld hl, wStringBuffer1
diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm
index db95a85b..b5ac3074 100644
--- a/engine/pokemon/evolve.asm
+++ b/engine/pokemon/evolve.asm
@@ -235,7 +235,7 @@ EvolveAfterBattle_MasterLoop:
ld [wCurSpecies], a
ld [wTempMonSpecies], a
ld [wEvolutionNewSpecies], a
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetPokemonName
push hl
@@ -348,7 +348,7 @@ UpdateSpeciesNameIfNotNicknamed:
ld a, [wCurSpecies]
push af
ld a, [wBaseDexNo]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetPokemonName
pop af
ld [wCurSpecies], a
@@ -369,7 +369,7 @@ UpdateSpeciesNameIfNotNicknamed:
call AddNTimes
push hl
ld a, [wCurSpecies]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetPokemonName
ld hl, wStringBuffer1
pop de
@@ -462,7 +462,7 @@ LearnLevelMoves:
.learn
ld a, d
ld [wPutativeTMHMMove], a
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetMoveName
call CopyName1
predef LearnMove
diff --git a/engine/pokemon/learn.asm b/engine/pokemon/learn.asm
index 183551bc..2c597c7b 100644
--- a/engine/pokemon/learn.asm
+++ b/engine/pokemon/learn.asm
@@ -36,7 +36,7 @@ LearnMove:
push hl
push de
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
ld b, a
ld a, [wBattleMode]
diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm
index e3b88146..07030da5 100644
--- a/engine/pokemon/mail.asm
+++ b/engine/pokemon/mail.asm
@@ -382,7 +382,7 @@ MailboxPC:
call UpdateSprites
ld a, [wCurMessageIndex]
- ld [wMenuCursorBuffer], a
+ ld [wMenuCursorPosition], a
ld a, [wCurMessageScrollPosition]
ld [wMenuScrollPosition], a
call ScrollingMenu
@@ -439,7 +439,7 @@ MailboxPC:
dec a
call .GetMailType
ld a, 1
- ld [wItemQuantityChangeBuffer], a
+ ld [wItemQuantityChange], a
ld hl, wNumItems
call ReceiveItem
jr c, .put_in_bag
diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm
index aaafad18..5289cb69 100644
--- a/engine/pokemon/mon_menu.asm
+++ b/engine/pokemon/mon_menu.asm
@@ -26,7 +26,7 @@ TossItemFromPC:
push de
call PartyMonItemName
farcall _CheckTossableItem
- ld a, [wItemAttributeParamBuffer]
+ ld a, [wItemAttributeValue]
and a
jr nz, .key_item
ld hl, .ItemsTossOutHowManyText
@@ -93,7 +93,7 @@ ItemsOakWarningText:
PartyMonItemName:
ld a, [wCurItem]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetItemName
call CopyName1
ret
@@ -252,7 +252,7 @@ GiveTakePartyMonItem:
jr z, .next
call CheckTossableItem
- ld a, [wItemAttributeParamBuffer]
+ ld a, [wItemAttributeValue]
and a
jr nz, .next
@@ -296,17 +296,17 @@ TryGiveItemToPartymon:
ret
.already_holding_item
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetItemName
ld hl, PokemonAskSwapItemText
call StartMenuYesNo
jr c, .abort
call GiveItemToPokemon
- ld a, [wNamedObjectIndexBuffer]
+ ld a, [wNamedObjectIndex]
push af
ld a, [wCurItem]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
pop af
ld [wCurItem], a
call ReceiveItemFromPokemon
@@ -314,13 +314,13 @@ TryGiveItemToPartymon:
ld hl, PokemonSwapItemText
call MenuTextboxBackup
- ld a, [wNamedObjectIndexBuffer]
+ ld a, [wNamedObjectIndex]
ld [wCurItem], a
call GivePartyItem
ret
.bag_full
- ld a, [wNamedObjectIndexBuffer]
+ ld a, [wNamedObjectIndex]
ld [wCurItem], a
call ReceiveItemFromPokemon
ld hl, ItemStorageFullText
@@ -355,7 +355,7 @@ TakePartyItem:
farcall ItemIsMail
call GetPartyItemLocation
ld a, [hl]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
ld [hl], NO_ITEM
call GetItemName
ld hl, PokemonTookItemText
@@ -427,13 +427,13 @@ GetPartyItemLocation:
ReceiveItemFromPokemon:
ld a, 1
- ld [wItemQuantityChangeBuffer], a
+ ld [wItemQuantityChange], a
ld hl, wNumItems
jp ReceiveItem
GiveItemToPokemon:
ld a, 1
- ld [wItemQuantityChangeBuffer], a
+ ld [wItemQuantityChange], a
ld hl, wNumItems
jp TossItem
@@ -898,7 +898,7 @@ MoveScreenLoop:
.skip_joy
call PrepareToPlaceMoveData
- ld a, [wMoveSwapBuffer]
+ ld a, [wSwappingMove]
and a
jr nz, .moving_move
call PlaceMoveData
@@ -919,21 +919,21 @@ MoveScreenLoop:
.b_button
call PlayClickSFX
call WaitSFX
- ld a, [wMoveSwapBuffer]
+ ld a, [wSwappingMove]
and a
jp z, .exit
- ld a, [wMoveSwapBuffer]
+ ld a, [wSwappingMove]
ld [wMenuCursorY], a
xor a
- ld [wMoveSwapBuffer], a
+ ld [wSwappingMove], a
hlcoord 1, 2
lb bc, 8, SCREEN_WIDTH - 2
call ClearBox
jp .loop
.d_right
- ld a, [wMoveSwapBuffer]
+ ld a, [wSwappingMove]
and a
jp nz, .joy_loop
@@ -948,7 +948,7 @@ MoveScreenLoop:
jp MoveScreenLoop
.d_left
- ld a, [wMoveSwapBuffer]
+ ld a, [wSwappingMove]
and a
jp nz, .joy_loop
ld a, [wCurPartyMon]
@@ -999,11 +999,11 @@ MoveScreenLoop:
.a_button
call PlayClickSFX
call WaitSFX
- ld a, [wMoveSwapBuffer]
+ ld a, [wSwappingMove]
and a
jr nz, .place_move
ld a, [wMenuCursorY]
- ld [wMoveSwapBuffer], a
+ ld [wSwappingMove], a
call PlaceHollowCursor
jp .moving_move
@@ -1056,7 +1056,7 @@ MoveScreenLoop:
ld d, h
ld e, l
pop hl
- ld a, [wMoveSwapBuffer]
+ ld a, [wSwappingMove]
dec a
ld c, a
ld b, 0
@@ -1070,7 +1070,7 @@ MoveScreenLoop:
.exit
xor a
- ld [wMoveSwapBuffer], a
+ ld [wSwappingMove], a
ld hl, w2DMenuFlags1
res 6, [hl]
call ClearSprites
@@ -1136,7 +1136,7 @@ SetUpMoveScreenBG:
SetUpMoveList:
xor a
ldh [hBGMapMode], a
- ld [wMoveSwapBuffer], a
+ ld [wSwappingMove], a
ld [wMonType], a
predef CopyMonToTempMon
ld hl, wTempMonMoves
@@ -1201,8 +1201,8 @@ PlaceMoveData:
hlcoord 16, 12
cp 2
jr c, .no_power
- ld [wDeciramBuffer], a
- ld de, wDeciramBuffer
+ ld [wTextDecimalByte], a
+ ld de, wTextDecimalByte
lb bc, 1, 3
call PrintNum
jr .description
diff --git a/engine/pokemon/mon_stats.asm b/engine/pokemon/mon_stats.asm
index d54f6c07..c8fbff28 100644
--- a/engine/pokemon/mon_stats.asm
+++ b/engine/pokemon/mon_stats.asm
@@ -435,7 +435,7 @@ ListMoves:
push hl
ld [wCurSpecies], a
ld a, MOVE_NAME
- ld [wNamedObjectTypeBuffer], a
+ ld [wNamedObjectType], a
call GetName
ld de, wStringBuffer1
pop hl
diff --git a/engine/pokemon/mon_submenu.asm b/engine/pokemon/mon_submenu.asm
index 9dc59231..8d7da929 100644
--- a/engine/pokemon/mon_submenu.asm
+++ b/engine/pokemon/mon_submenu.asm
@@ -100,7 +100,7 @@ GetMonMenuString:
jr z, .NotMove
inc hl
ld a, [hl]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetMoveName
ret
diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm
index 941a0697..edd7565e 100644
--- a/engine/pokemon/move_mon.asm
+++ b/engine/pokemon/move_mon.asm
@@ -54,7 +54,7 @@ TryAddMonToParty:
and a
jr nz, .skipnickname
ld a, [wCurPartySpecies]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetPokemonName
ld hl, wPartyMonNicknames
ldh a, [hMoveMon]
@@ -444,7 +444,7 @@ AddTempmonToParty:
call CopyBytes
ld a, [wCurPartySpecies]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
cp EGG
jr z, .egg
dec a
@@ -972,7 +972,7 @@ SendMonIntoBox:
call CopyBytes
ld a, [wCurPartySpecies]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetPokemonName
ld de, sBoxMonNicknames
@@ -1684,7 +1684,7 @@ GivePoke::
.done
ld a, [wCurPartySpecies]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
ld [wTempEnemyMonSpecies], a
call GetPokemonName
ld hl, wStringBuffer1
diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm
index e7c7329b..d35d0d75 100644
--- a/engine/pokemon/stats_screen.asm
+++ b/engine/pokemon/stats_screen.asm
@@ -271,14 +271,14 @@ StatsScreen_InitUpperHalf:
xor a
ldh [hBGMapMode], a
ld a, [wBaseDexNo]
- ld [wDeciramBuffer], a
+ ld [wTextDecimalByte], a
ld [wCurSpecies], a
hlcoord 8, 0
ld [hl], "№"
inc hl
ld [hl], "."
inc hl
- ld de, wDeciramBuffer
+ ld de, wTextDecimalByte
lb bc, PRINTNUM_LEADINGZEROS | 1, 3
call PrintNum
hlcoord 14, 0
@@ -311,7 +311,7 @@ StatsScreen_InitUpperHalf:
ld a, "/"
ld [hli], a
ld a, [wBaseDexNo]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetPokemonName
call PlaceString
call StatsScreen_PlaceHorizontalDivider
@@ -346,7 +346,7 @@ LoadPinkPage:
xor a
ldh [hBGMapMode], a
ld a, [wBaseDexNo]
- ld [wDeciramBuffer], a
+ ld [wTextDecimalByte], a
ld [wCurSpecies], a
ld b, PINK_PAGE
call StatsScreen_LoadPageIndicators
@@ -573,7 +573,7 @@ LoadGreenPage:
ld b, a
farcall TimeCapsule_ReplaceTeruSama
ld a, b
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetItemName
.got_item_name
hlcoord 6, 8
diff --git a/engine/pokemon/types.asm b/engine/pokemon/types.asm
index d546dbca..e925784d 100644
--- a/engine/pokemon/types.asm
+++ b/engine/pokemon/types.asm
@@ -74,9 +74,9 @@ PrintType:
jp PlaceString
GetTypeName:
-; Copy the name of type [wNamedObjectIndexBuffer] to wStringBuffer1.
+; Copy the name of type [wNamedObjectIndex] to wStringBuffer1.
- ld a, [wNamedObjectIndexBuffer]
+ ld a, [wNamedObjectIndex]
ld hl, TypeNames
ld e, a
ld d, 0
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-28 06:03:19 +0000