summaryrefslogtreecommitdiff
path: root/engine/events
diff options
context:
space:
mode:
Diffstat (limited to 'engine/events')
-rw-r--r--engine/events/bug_contest/caught_mon.asm4
-rw-r--r--engine/events/bug_contest/display_stats.asm2
-rw-r--r--engine/events/bug_contest/judging.asm6
-rw-r--r--engine/events/haircut.asm2
-rw-r--r--engine/events/halloffame.asm4
-rw-r--r--engine/events/happiness_egg.asm4
-rw-r--r--engine/events/lucky_number.asm2
-rw-r--r--engine/events/misc_scripts.asm4
-rw-r--r--engine/events/mom_phone.asm2
-rw-r--r--engine/events/move_deleter.asm2
-rw-r--r--engine/events/name_rater.asm2
-rw-r--r--engine/events/npc_trade.asm30
-rw-r--r--engine/events/pokecenter_pc.asm32
-rw-r--r--engine/events/specials.asm8
14 files changed, 52 insertions, 52 deletions
diff --git a/engine/events/bug_contest/caught_mon.asm b/engine/events/bug_contest/caught_mon.asm
index b2cc044a..533eae2b 100644
--- a/engine/events/bug_contest/caught_mon.asm
+++ b/engine/events/bug_contest/caught_mon.asm
@@ -2,7 +2,7 @@ BugContest_SetCaughtContestMon:
ld a, [wContestMon]
and a
jr z, .firstcatch
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
farcall DisplayAlreadyCaughtText
farcall DisplayCaughtContestMonStats
lb bc, 14, 7
@@ -12,7 +12,7 @@ BugContest_SetCaughtContestMon:
.firstcatch
call .generatestats
ld a, [wTempEnemyMonSpecies]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetPokemonName
ld hl, .ContestCaughtMonText
call PrintText
diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm
index bfa6d90b..2507dfab 100644
--- a/engine/events/bug_contest/display_stats.asm
+++ b/engine/events/bug_contest/display_stats.asm
@@ -36,7 +36,7 @@ DisplayCaughtContestMonStats:
call PlaceString
ld a, [wContestMon]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetPokemonName
ld de, wStringBuffer1
hlcoord 1, 2
diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm
index da48eb96..e0eca385 100644
--- a/engine/events/bug_contest/judging.asm
+++ b/engine/events/bug_contest/judging.asm
@@ -4,21 +4,21 @@ _BugContestJudging:
ld a, [wBugContestThirdPlaceWinnerID]
call LoadContestantName
ld a, [wBugContestThirdPlaceMon]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetPokemonName
ld hl, ContestJudging_ThirdPlaceText
call PrintText
ld a, [wBugContestSecondPlaceWinnerID]
call LoadContestantName
ld a, [wBugContestSecondPlaceMon]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetPokemonName
ld hl, ContestJudging_SecondPlaceText
call PrintText
ld a, [wBugContestFirstPlaceWinnerID]
call LoadContestantName
ld a, [wBugContestFirstPlaceMon]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetPokemonName
ld hl, ContestJudging_FirstPlaceText
call PrintText
diff --git a/engine/events/haircut.asm b/engine/events/haircut.asm
index 32043af1..d03e6a09 100644
--- a/engine/events/haircut.asm
+++ b/engine/events/haircut.asm
@@ -3,7 +3,7 @@ BillsGrandfather:
jr c, .cancel
ld a, [wCurPartySpecies]
ld [wScriptVar], a
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetPokemonName
jp CopyPokemonName_Buffer1_Buffer3
diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm
index acc73d48..cbce608c 100644
--- a/engine/events/halloffame.asm
+++ b/engine/events/halloffame.asm
@@ -459,7 +459,7 @@ DisplayHOFMon:
call Textbox
ld a, [wTempMonSpecies]
ld [wCurPartySpecies], a
- ld [wDeciramBuffer], a
+ ld [wTextDecimalByte], a
ld hl, wTempMonDVs
predef GetUnownLetter
xor a
@@ -474,7 +474,7 @@ DisplayHOFMon:
ld [hli], a
ld [hl], "."
hlcoord 3, 13
- ld de, wDeciramBuffer
+ ld de, wTextDecimalByte
lb bc, PRINTNUM_LEADINGZEROS | 1, 3
call PrintNum
call GetBasePokemonName
diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm
index bb2e949c..ac3e165b 100644
--- a/engine/events/happiness_egg.asm
+++ b/engine/events/happiness_egg.asm
@@ -11,7 +11,7 @@ GetFirstPokemonHappiness:
jr .loop
.done
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
ld a, [hl]
ld [wScriptVar], a
call GetPokemonName
@@ -19,7 +19,7 @@ GetFirstPokemonHappiness:
CheckFirstMonIsEgg:
ld a, [wPartySpecies]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
cp EGG
ld a, TRUE
jr z, .egg
diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm
index 8f4e7fdc..e4189245 100644
--- a/engine/events/lucky_number.asm
+++ b/engine/events/lucky_number.asm
@@ -110,7 +110,7 @@ CheckForLuckyNumberWinners:
and a
push af
ld a, [wCurPartySpecies]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetPokemonName
ld hl, .LuckyNumberMatchPartyText
pop af
diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm
index e9006332..24e4088e 100644
--- a/engine/events/misc_scripts.asm
+++ b/engine/events/misc_scripts.asm
@@ -39,14 +39,14 @@ FindItemInBallScript::
xor a
ld [wScriptVar], a
ld a, [wItemBallItemID]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetItemName
ld hl, wStringBuffer3
call CopyName2
ld a, [wItemBallItemID]
ld [wCurItem], a
ld a, [wItemBallQuantity]
- ld [wItemQuantityChangeBuffer], a
+ ld [wItemQuantityChange], a
ld hl, wNumItems
call ReceiveItem
ret nc
diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm
index 697a47a6..930eaac1 100644
--- a/engine/events/mom_phone.asm
+++ b/engine/events/mom_phone.asm
@@ -146,7 +146,7 @@ Mom_GiveItemOrDoll:
ld a, [hl]
ld [wCurItem], a
ld a, 1
- ld [wItemQuantityChangeBuffer], a
+ ld [wItemQuantityChange], a
ld hl, wNumPCItems
call ReceiveItem
ret
diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm
index f9f83fab..2d6841e4 100644
--- a/engine/events/move_deleter.asm
+++ b/engine/events/move_deleter.asm
@@ -28,7 +28,7 @@ MoveDeletion:
ld a, [wMenuCursorY]
push af
ld a, [wCurSpecies]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetMoveName
ld hl, .AskDeleteMoveText
call PrintText
diff --git a/engine/events/name_rater.asm b/engine/events/name_rater.asm
index e2b24c4c..d3a1dc58 100644
--- a/engine/events/name_rater.asm
+++ b/engine/events/name_rater.asm
@@ -29,7 +29,7 @@ _NameRater:
xor a ; PARTYMON
ld [wMonType], a
ld a, [wCurPartySpecies]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
ld [wCurSpecies], a
call GetBaseData
ld b, NAME_MON
diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm
index 94773f2f..b4393ebd 100644
--- a/engine/events/npc_trade.asm
+++ b/engine/events/npc_trade.asm
@@ -21,7 +21,7 @@ NPCTrade::
jr c, .done
ld e, NPCTRADE_GIVEMON
- call GetTradeAttribute
+ call GetTradeAttr
ld a, [wCurPartySpecies]
cp [hl]
ld a, TRADE_DIALOG_WRONG
@@ -72,7 +72,7 @@ CheckTradeGender:
ld [wMonType], a
ld e, NPCTRADE_GENDER
- call GetTradeAttribute
+ call GetTradeAttr
ld a, [hl]
and a ; TRADE_GENDER_EITHER
jr z, .matching
@@ -106,19 +106,19 @@ TradeFlagAction:
Trade_GetDialog:
ld e, NPCTRADE_DIALOG
- call GetTradeAttribute
+ call GetTradeAttr
ld a, [hl]
ld [wTradeDialog], a
ret
DoNPCTrade:
ld e, NPCTRADE_GIVEMON
- call GetTradeAttribute
+ call GetTradeAttr
ld a, [hl]
ld [wPlayerTrademonSpecies], a
ld e, NPCTRADE_GETMON
- call GetTradeAttribute
+ call GetTradeAttr
ld a, [hl]
ld [wOTTrademonSpecies], a
@@ -168,7 +168,7 @@ DoNPCTrade:
predef TryAddMonToParty
ld e, NPCTRADE_NICK
- call GetTradeAttribute
+ call GetTradeAttr
ld de, wOTTrademonNickname
call CopyTradeName
@@ -179,7 +179,7 @@ DoNPCTrade:
call CopyTradeName
ld e, NPCTRADE_OT_NAME
- call GetTradeAttribute
+ call GetTradeAttr
push hl
ld de, wOTTrademonOTName
call CopyTradeName
@@ -194,7 +194,7 @@ DoNPCTrade:
call CopyTradeName
ld e, NPCTRADE_DVS
- call GetTradeAttribute
+ call GetTradeAttr
ld de, wOTTrademonDVs
call Trade_CopyTwoBytes
@@ -205,7 +205,7 @@ DoNPCTrade:
call Trade_CopyTwoBytes
ld e, NPCTRADE_OT_ID
- call GetTradeAttribute
+ call GetTradeAttr
ld de, wOTTrademonID + 1
call Trade_CopyTwoBytesReverseEndian
@@ -216,7 +216,7 @@ DoNPCTrade:
call Trade_CopyTwoBytes
ld e, NPCTRADE_ITEM
- call GetTradeAttribute
+ call GetTradeAttr
push hl
ld hl, wPartyMon1Item
ld bc, PARTYMON_STRUCT_LENGTH
@@ -243,7 +243,7 @@ DoNPCTrade:
pop af
ret
-GetTradeAttribute:
+GetTradeAttr:
ld d, 0
push de
ld a, [wJumptableIndex]
@@ -273,7 +273,7 @@ Trade_GetAttributeOfLastPartymon:
GetTradeMonName:
push de
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetBasePokemonName
ld hl, wStringBuffer1
pop de
@@ -316,7 +316,7 @@ Trade_CopyTwoBytesReverseEndian:
GetTradeMonNames:
ld e, NPCTRADE_GETMON
- call GetTradeAttribute
+ call GetTradeAttr
ld a, [hl]
call GetTradeMonName
@@ -324,7 +324,7 @@ GetTradeMonNames:
call CopyTradeName
ld e, NPCTRADE_GIVEMON
- call GetTradeAttribute
+ call GetTradeAttr
ld a, [hl]
call GetTradeMonName
@@ -340,7 +340,7 @@ GetTradeMonNames:
dec hl
push hl
ld e, NPCTRADE_GENDER
- call GetTradeAttribute
+ call GetTradeAttr
ld a, [hl]
pop hl
and a ; TRADE_GENDER_EITHER
diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm
index 74645a92..9a8a3334 100644
--- a/engine/events/pokecenter_pc.asm
+++ b/engine/events/pokecenter_pc.asm
@@ -342,13 +342,13 @@ PlayerWithdrawItemMenu:
.Submenu:
; check if the item has a quantity
farcall _CheckTossableItem
- ld a, [wItemAttributeParamBuffer]
+ ld a, [wItemAttributeValue]
and a
jr z, .askquantity
; items without quantity are always ×1
ld a, 1
- ld [wItemQuantityChangeBuffer], a
+ ld [wItemQuantityChange], a
jr .withdraw
.askquantity
@@ -360,15 +360,15 @@ PlayerWithdrawItemMenu:
jr c, .done
.withdraw
- ld a, [wItemQuantityChangeBuffer]
- ld [wPCItemQuantityChangeBuffer], a
+ ld a, [wItemQuantityChange]
+ ld [wPCItemQuantityChange], a
ld a, [wCurItemQuantity]
ld [wPCItemQuantity], a
ld hl, wNumItems
call ReceiveItem
jr nc, .PackFull
- ld a, [wPCItemQuantityChangeBuffer]
- ld [wItemQuantityChangeBuffer], a
+ ld a, [wPCItemQuantityChange]
+ ld [wItemQuantityChange], a
ld a, [wPCItemQuantity]
ld [wCurItemQuantity], a
ld hl, wNumPCItems
@@ -469,7 +469,7 @@ PlayerDepositItemMenu:
ld a, FALSE
ld [wSpriteUpdatesEnabled], a
farcall CheckItemMenu
- ld a, [wItemAttributeParamBuffer]
+ ld a, [wItemAttributeValue]
ld hl, .dw
rst JumpTable
pop af
@@ -490,7 +490,7 @@ PlayerDepositItemMenu:
ret
.tossable
- ld a, [wPCItemQuantityChangeBuffer]
+ ld a, [wPCItemQuantityChange]
push af
ld a, [wPCItemQuantity]
push af
@@ -498,16 +498,16 @@ PlayerDepositItemMenu:
pop af
ld [wPCItemQuantity], a
pop af
- ld [wPCItemQuantityChangeBuffer], a
+ ld [wPCItemQuantityChange], a
ret
.DepositItem:
farcall _CheckTossableItem
- ld a, [wItemAttributeParamBuffer]
+ ld a, [wItemAttributeValue]
and a
jr z, .AskQuantity
ld a, 1
- ld [wItemQuantityChangeBuffer], a
+ ld [wItemQuantityChange], a
jr .ContinueDeposit
.AskQuantity:
@@ -521,15 +521,15 @@ PlayerDepositItemMenu:
jr c, .DeclinedToDeposit
.ContinueDeposit:
- ld a, [wItemQuantityChangeBuffer]
- ld [wPCItemQuantityChangeBuffer], a
+ ld a, [wItemQuantityChange]
+ ld [wPCItemQuantityChange], a
ld a, [wCurItemQuantity]
ld [wPCItemQuantity], a
ld hl, wNumPCItems
call ReceiveItem
jr nc, .NoRoomInPC
- ld a, [wPCItemQuantityChangeBuffer]
- ld [wItemQuantityChangeBuffer], a
+ ld a, [wPCItemQuantityChange]
+ ld [wItemQuantityChange], a
ld a, [wPCItemQuantity]
ld [wCurItemQuantity], a
ld hl, wNumItems
@@ -580,7 +580,7 @@ PCItemsJoypad:
ld c, 18
call Textbox
ld a, [wPCItemsCursor]
- ld [wMenuCursorBuffer], a
+ ld [wMenuCursorPosition], a
ld a, [wPCItemsScrollPosition]
ld [wMenuScrollPosition], a
call ScrollingMenu
diff --git a/engine/events/specials.asm b/engine/events/specials.asm
index efa99822..913bf0bc 100644
--- a/engine/events/specials.asm
+++ b/engine/events/specials.asm
@@ -28,7 +28,7 @@ GameCornerPrizeMonCheckDex:
call SetSeenAndCaughtMon
call FadeToMenu
ld a, [wScriptVar]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
farcall NewPokedexEntry
call ExitAllMenus
ret
@@ -142,7 +142,7 @@ GetMysteryGiftItem:
ld a, [sMysteryGiftItem]
ld [wCurItem], a
ld a, 1
- ld [wItemQuantityChangeBuffer], a
+ ld [wItemQuantityChange], a
ld hl, wNumItems
call ReceiveItem
jr nc, .no_room
@@ -150,7 +150,7 @@ GetMysteryGiftItem:
ld [sMysteryGiftItem], a
call CloseSRAM
ld a, [wCurItem]
- ld [wNamedObjectIndexBuffer], a
+ ld [wNamedObjectIndex], a
call GetItemName
ld hl, .ReceiveItemText
call PrintText
@@ -350,7 +350,7 @@ SelectApricornForKurt:
ret z
ld [wCurItem], a
ld a, 1
- ld [wItemQuantityChangeBuffer], a
+ ld [wItemQuantityChange], a
ld hl, wNumItems
call TossItem
ret
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 16:11:39 +0000