summaryrefslogtreecommitdiff
path: root/engine/items
diff options
context:
space:
mode:
Diffstat (limited to 'engine/items')
-rw-r--r--engine/items/item_effects.asm55
-rw-r--r--engine/items/mart.asm6
-rw-r--r--engine/items/pack.asm6
-rw-r--r--engine/items/print_item_description.asm2
-rw-r--r--engine/items/switch_items.asm1
-rw-r--r--engine/items/tmhm2.asm1
6 files changed, 4 insertions, 67 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index cf2071952..1439b2c6d 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -11,7 +11,6 @@ _DoItemEffect::
rst JumpTable
ret
-
ItemEffects:
; entries correspond to item ids
dw PokeBallEffect ; MASTER_BALL
@@ -194,7 +193,6 @@ ItemEffects:
dw NoEffect ; RAINBOW_WING
dw NoEffect ; ITEM_B3
-
PokeBallEffect:
ld a, [wBattleMode]
dec a
@@ -486,8 +484,8 @@ PokeBallEffect:
ld de, wEnemyMonPP
ld bc, NUM_MOVES
call CopyBytes
-.Transformed:
+.Transformed:
ld a, [wEnemyMonSpecies]
ld [wWildMon], a
ld [wCurPartySpecies], a
@@ -562,8 +560,8 @@ PokeBallEffect:
ld a, FRIEND_BALL_HAPPINESS
ld [hl], a
-.SkipPartyMonFriendBall:
+.SkipPartyMonFriendBall:
ld hl, Text_AskNicknameNewlyCaughtMon
call PrintText
@@ -712,7 +710,6 @@ PokeBallEffect:
dec [hl]
ret
-
BallMultiplierFunctionTable:
; table of routines that increase or decrease the catch rate based on
; which ball is used in a certain situation.
@@ -1137,12 +1134,10 @@ TownMapEffect:
farcall PokegearMap
ret
-
BicycleEffect:
farcall BikeFunction
ret
-
EvoStoneEffect:
ld b, PARTYMENUACTION_EVO_STONE
call UseItem_SelectMon
@@ -1174,7 +1169,6 @@ EvoStoneEffect:
ld [wItemEffectSucceeded], a
ret
-
VitaminEffect:
ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon
@@ -1218,13 +1212,11 @@ VitaminEffect:
jp UseDisposableItem
-
NoEffectMessage:
ld hl, WontHaveAnyEffectText
call PrintText
jp ClearPalettes
-
UpdateStatsAfterItem:
ld a, MON_MAXHP
call GetPartyParamLocation
@@ -1240,13 +1232,11 @@ RareCandy_StatBooster_ExitMenu:
ld [wItemEffectSucceeded], a
jp ClearPalettes
-
Text_StatRose:
; 's @ rose.
text_jump UnknownText_0x1c5b9a
db "@"
-
StatStrings:
dw .health
dw .attack
@@ -1260,7 +1250,6 @@ StatStrings:
.speed db "SPEED@"
.special db "SPECIAL@"
-
GetStatExpRelativePointer:
ld a, [wCurItem]
ld hl, Table_eeeb
@@ -1284,7 +1273,6 @@ Table_eeeb:
db CARBOS, MON_SPD_EXP - MON_STAT_EXP
db CALCIUM, MON_SPC_EXP - MON_STAT_EXP
-
RareCandy_StatBooster_GetParameters:
ld a, [wCurPartySpecies]
ld [wCurSpecies], a
@@ -1299,7 +1287,6 @@ RareCandy_StatBooster_GetParameters:
call GetNick
ret
-
RareCandyEffect:
ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon
@@ -1390,7 +1377,6 @@ RareCandyEffect:
jp UseDisposableItem
-
HealPowderEffect:
ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon
@@ -1411,7 +1397,6 @@ HealPowderEffect:
.asm_efc9
jp StatusHealer_Jumptable
-
StatusHealingEffect:
ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon
@@ -1421,7 +1406,6 @@ FullyHealStatus:
call UseStatusHealer
jp StatusHealer_Jumptable
-
UseStatusHealer:
call IsMonFainted
ld a, $1
@@ -1529,7 +1513,6 @@ StatusHealer_Jumptable:
dw StatusHealer_NoEffect
dw StatusHealer_ExitMenu
-
RevivalHerbEffect:
ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon
@@ -1547,7 +1530,6 @@ RevivalHerbEffect:
.asm_f0c5
jp StatusHealer_Jumptable
-
ReviveEffect:
ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon
@@ -1556,7 +1538,6 @@ ReviveEffect:
call RevivePokemon
jp StatusHealer_Jumptable
-
RevivePokemon:
call IsMonFainted
ld a, 1
@@ -1603,7 +1584,6 @@ RevivePokemon:
ld a, 0
ret
-
FullRestoreEffect:
ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon
@@ -1621,7 +1601,6 @@ FullRestoreEffect:
call .FullRestore
jp StatusHealer_Jumptable
-
.FullRestore:
xor a
ld [wLowHealthAlarm], a
@@ -1641,7 +1620,6 @@ FullRestoreEffect:
ld a, 0
ret
-
BitterBerryEffect:
ld hl, wPlayerSubStatus3
bit SUBSTATUS_CONFUSED, [hl]
@@ -1661,12 +1639,10 @@ BitterBerryEffect:
.done
jp StatusHealer_Jumptable
-
RestoreHPEffect:
call ItemRestoreHP
jp StatusHealer_Jumptable
-
EnergypowderEffect:
ld c, HAPPINESS_BITTERPOWDER
jr EnergypowderEnergyRootCommon
@@ -1688,7 +1664,6 @@ EnergypowderEnergyRootCommon:
.skip_happiness
jp StatusHealer_Jumptable
-
ItemRestoreHP:
ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon
@@ -2090,7 +2065,6 @@ Softboiled_MilkDrinkFunction:
text_jump UnknownText_0x1c5bac
db "@"
-
EscapeRopeEffect:
xor a
ld [wItemEffectSucceeded], a
@@ -2101,7 +2075,6 @@ EscapeRopeEffect:
call z, UseDisposableItem
ret
-
SuperRepelEffect:
ld b, 200
jr UseRepel
@@ -2123,13 +2096,11 @@ UseRepel:
ld [wRepelEffect], a
jp UseItemText
-
TextJump_RepelUsedEarlierIsStillInEffect:
; The REPEL used earlier is still in effect.
text_jump Text_RepelUsedEarlierIsStillInEffect
db "@"
-
XAccuracyEffect:
ld hl, wPlayerSubStatus4
bit SUBSTATUS_X_ACCURACY, [hl]
@@ -2137,7 +2108,6 @@ XAccuracyEffect:
set SUBSTATUS_X_ACCURACY, [hl]
jp UseItemText
-
PokeDollEffect:
ld a, [wBattleMode]
dec a
@@ -2155,7 +2125,6 @@ PokeDollEffect:
ld [wItemEffectSucceeded], a
ret
-
GuardSpecEffect:
ld hl, wPlayerSubStatus4
bit SUBSTATUS_MIST, [hl]
@@ -2163,7 +2132,6 @@ GuardSpecEffect:
set SUBSTATUS_MIST, [hl]
jp UseItemText
-
DireHitEffect:
ld hl, wPlayerSubStatus4
bit SUBSTATUS_FOCUS_ENERGY, [hl]
@@ -2171,7 +2139,6 @@ DireHitEffect:
set SUBSTATUS_FOCUS_ENERGY, [hl]
jp UseItemText
-
XItemEffect:
call UseItemText
@@ -2206,7 +2173,6 @@ XItemEffect:
INCLUDE "data/items/x_stats.asm"
-
PokeFluteEffect:
ld a, [wBattleMode]
and a
@@ -2251,7 +2217,6 @@ PokeFluteEffect:
ld hl, .AllSleepingMonWokeUp
jp PrintText
-
.CureSleep:
ld de, PARTYMON_STRUCT_LENGTH
ld c, PARTY_LENGTH
@@ -2272,7 +2237,6 @@ PokeFluteEffect:
jr nz, .loop
ret
-
.CatchyTune:
; Played the # FLUTE. Now, that's a catchy tune!
text_jump UnknownText_0x1c5bf9
@@ -2300,7 +2264,6 @@ PokeFluteEffect:
.battle
jp PokeFluteTerminatorCharacter
-
BlueCardEffect:
ld hl, .bluecardtext
jp MenuTextBoxWaitButton
@@ -2309,7 +2272,6 @@ BlueCardEffect:
text_jump UnknownText_0x1c5c5e
db "@"
-
CoinCaseEffect:
ld hl, .coincasetext
jp MenuTextBoxWaitButton
@@ -2318,7 +2280,6 @@ CoinCaseEffect:
text_jump UnknownText_0x1c5c7b
db "@"
-
OldRodEffect:
ld e, $0
jr UseRod
@@ -2335,12 +2296,10 @@ UseRod:
farcall FishFunction
ret
-
ItemfinderEffect:
farcall ItemFinder
ret
-
RestorePPEffect:
ld a, [wCurItem]
ld [wd002], a
@@ -2596,22 +2555,18 @@ UnknownText_0xf739:
text_jump UnknownText_0x1c5cf1
db "@"
-
SquirtbottleEffect:
farcall _Squirtbottle
ret
-
CardKeyEffect:
farcall _CardKey
ret
-
BasementKeyEffect:
farcall _BasementKey
ret
-
SacredAshEffect:
farcall _SacredAsh
ld a, [wItemEffectSucceeded]
@@ -2620,7 +2575,6 @@ SacredAshEffect:
call UseDisposableItem
ret
-
NormalBoxEffect:
ld c, DECOFLAG_SILVER_TROPHY_DOLL
jr OpenBox
@@ -2643,7 +2597,6 @@ OpenBox:
NoEffect:
jp IsntTheTimeMessage
-
Play_SFX_FULL_HEAL:
push de
ld de, SFX_FULL_HEAL
@@ -2796,7 +2749,6 @@ GotOffTheItemText:
text_jump UnknownText_0x1c5e90
db "@"
-
ApplyPPUp:
ld a, MON_MOVES
call GetPartyParamLocation
@@ -2832,8 +2784,6 @@ ApplyPPUp:
inc de
jr .loop
-
-
ComputeMaxPP:
push bc
; Divide the base PP by 5.
@@ -2918,7 +2868,6 @@ RestoreAllPP:
jr nz, .loop
ret
-
GetMaxPPOfMove:
ld a, [wStringBuffer1 + 0]
push af
diff --git a/engine/items/mart.asm b/engine/items/mart.asm
index a683a4b44..7e185662b 100644
--- a/engine/items/mart.asm
+++ b/engine/items/mart.asm
@@ -331,7 +331,6 @@ ReadMart:
INCLUDE "data/items/bargain_shop.asm"
-
BuyMenu:
call FadeToMenu
farcall BlankScreen
@@ -425,7 +424,6 @@ GetMartDialogGroup:
dw Text_Pharmacy_HereYouGo
dw BuyMenuLoop
-
BuyMenuLoop:
farcall PlaceMoneyTopRight
call UpdateSprites
@@ -581,7 +579,6 @@ RooftopSaleAskPurchaseQuantity:
ld d, [hl]
ret
-
Text_Mart_HowMany:
; How many?
text_jump UnknownText_0x1c4bfd
@@ -730,7 +727,6 @@ Text_Pharmacist_ComeAgain:
text_jump UnknownText_0x1c4ef6
db "@"
-
SellMenu:
call DisableSpriteUpdates
farcall DepositSellInitPackBuffers
@@ -758,7 +754,6 @@ SellMenu:
text_jump UnknownText_0x1c4f12
db "@"
-
.TryToSellItem:
farcall CheckItemMenu
ld a, [wItemAttributeParamBuffer]
@@ -778,7 +773,6 @@ SellMenu:
.cant_buy
ret
-
.try_sell
farcall _CheckTossableItem
ld a, [wItemAttributeParamBuffer]
diff --git a/engine/items/pack.asm b/engine/items/pack.asm
index d20d54111..67e9fe900 100644
--- a/engine/items/pack.asm
+++ b/engine/items/pack.asm
@@ -38,7 +38,6 @@ Pack:
call Pack_GetJumptablePointer
jp hl
-
.Jumptable:
; entries correspond to PACKSTATE_* constants
dw .InitGFX ; 0
@@ -174,7 +173,6 @@ Pack:
dw .UseItem
dw QuitItemSubmenu
-
.MenuHeader2:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
@@ -424,7 +422,6 @@ Jumptable_GiveTossQuit:
dw TossMenu
dw QuitItemSubmenu
-
UseItem:
farcall CheckItemMenu
ld a, [wItemAttributeParamBuffer]
@@ -651,7 +648,6 @@ BattlePack:
call Pack_GetJumptablePointer
jp hl
-
.Jumptable:
; entries correspond to PACKSTATE_* constants
dw .InitGFX ; 0
@@ -943,7 +939,6 @@ DepositSellPack:
call Pack_GetJumptablePointer
jp hl
-
.Jumptable:
; entries correspond to *_POCKET constants
dw .ItemsPocket
@@ -1088,7 +1083,6 @@ TutorialPack:
call Pack_GetJumptablePointer
jp hl
-
.dw
; entries correspond to *_POCKET constants
dw .Items
diff --git a/engine/items/print_item_description.asm b/engine/items/print_item_description.asm
index b6ab6c957..b0a3a0b33 100644
--- a/engine/items/print_item_description.asm
+++ b/engine/items/print_item_description.asm
@@ -28,3 +28,5 @@ PrintItemDescription:
ld d, [hl]
pop hl
jp PlaceString
+
+INCLUDE "data/items/descriptions.asm"
diff --git a/engine/items/switch_items.asm b/engine/items/switch_items.asm
index b5fa0f178..81b5ac6a5 100644
--- a/engine/items/switch_items.asm
+++ b/engine/items/switch_items.asm
@@ -239,7 +239,6 @@ ItemSwitch_ConvertSpacingToDW:
pop hl
ret
-
.spacing_dws
dw 0, 1, 2
diff --git a/engine/items/tmhm2.asm b/engine/items/tmhm2.asm
index bb98d8ab8..10206d36b 100644
--- a/engine/items/tmhm2.asm
+++ b/engine/items/tmhm2.asm
@@ -43,5 +43,4 @@ GetTMHMMove:
ld [wd265], a
ret
-
INCLUDE "data/moves/tmhm_moves.asm"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-24 14:47:02 +0000