summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/berry_blender.inc12
-rw-r--r--data/scripts/berry_tree.inc4
-rw-r--r--data/scripts/cable_club.inc16
-rw-r--r--data/scripts/gift_aurora_ticket.inc4
-rw-r--r--data/scripts/gift_mystic_ticket.inc4
-rw-r--r--data/scripts/gift_old_sea_map.inc4
-rw-r--r--data/scripts/kecleon.inc4
-rw-r--r--data/scripts/lilycove_lady.inc2
-rw-r--r--data/scripts/obtain_item.inc77
-rw-r--r--data/scripts/roulette.inc4
-rw-r--r--data/scripts/std_msgbox.inc3
11 files changed, 68 insertions, 66 deletions
diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc
index 1d833f470..71f3a1276 100644
--- a/data/scripts/berry_blender.inc
+++ b/data/scripts/berry_blender.inc
@@ -296,7 +296,7 @@ BerryBlender_EventScript_ExplainBlending1:
end
BerryBlender_EventScript_TryUseBerryBlender1:
- checkitem ITEM_POKEBLOCK_CASE, 1
+ checkitem ITEM_POKEBLOCK_CASE
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_Blender1NoCase
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
@@ -370,7 +370,7 @@ BerryBlender_EventScript_TryUseBerryBlender2:
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_Blender2NoBerries
- checkitem ITEM_POKEBLOCK_CASE, 1
+ checkitem ITEM_POKEBLOCK_CASE
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_Blender2NoCase
msgbox BerryBlender_Text_Okay, MSGBOX_DEFAULT
@@ -436,7 +436,7 @@ BerryBlender_EventScript_TryUseBlender3:
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_Blender3NoBerries
- checkitem ITEM_POKEBLOCK_CASE, 1
+ checkitem ITEM_POKEBLOCK_CASE
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_Blender3NoCase
msgbox BerryBlender_Text_OhDear, MSGBOX_DEFAULT
@@ -473,7 +473,7 @@ BerryBlender_EventScript_BlendMasterNoBerries:
end
BerryBlender_EventScript_TryBlendWithBlendMaster:
- checkitem ITEM_POKEBLOCK_CASE, 1
+ checkitem ITEM_POKEBLOCK_CASE
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_BlendMasterNoCase
specialvar VAR_RESULT, PlayerHasBerries
@@ -542,7 +542,7 @@ BerryBlender_EventScript_ExpertMPlayerHasBerries:
end
BerryBlender_EventScript_ExpertMNoBerries:
- checkitem ITEM_POKEBLOCK_CASE, 1
+ checkitem ITEM_POKEBLOCK_CASE
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_ExpertMNoSpareBerries
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
@@ -575,7 +575,7 @@ BerryBlender_EventScript_BerryBlenderLink::
specialvar VAR_RESULT, PlayerHasBerries
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_LinkBlenderNoBerries
- checkitem ITEM_POKEBLOCK_CASE, 1
+ checkitem ITEM_POKEBLOCK_CASE
compare VAR_RESULT, FALSE
goto_if_eq BerryBlender_EventScript_LinkBlenderNoCase
specialvar VAR_RESULT, GetFirstFreePokeblockSlot
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index e415d0c65..9602d3b77 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -154,8 +154,8 @@ BerryTree_EventScript_ItemUsePlantBerry::
end
BerryTree_EventScript_WantToWater::
- checkitem ITEM_WAILMER_PAIL, 1
- compare VAR_RESULT, 0
+ checkitem ITEM_WAILMER_PAIL
+ compare VAR_RESULT, FALSE
goto_if_eq BerryTree_EventScript_DontWater
special ObjectEventInteractionGetBerryName
msgbox BerryTree_Text_WantToWater, MSGBOX_YESNO
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index d6ea1a707..ea9a2b4e3 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -24,22 +24,20 @@ CableClub_EventScript_MysteryGiftMan::
specialvar VAR_RESULT, ShouldDistributeEonTicket
compare VAR_RESULT, TRUE
goto_if_eq CableClub_EventScript_DistributeEonTicket
- goto CableClub_EventScript_AlreadyGotEonTicket
+ goto CableClub_EventScript_TryWonderCardScript
end
-CableClub_EventScript_AlreadyGotEonTicket::
- gotoram
-
-@ Unused?
+CableClub_EventScript_TryWonderCardScript::
+ gotowondercardscript
CableClub_EventScript_MysteryGiftThankYou::
msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_NPC
end
CableClub_EventScript_DistributeEonTicket::
- checkitem ITEM_EON_TICKET, 1
+ checkitem ITEM_EON_TICKET
compare VAR_RESULT, TRUE
- goto_if_eq CableClub_EventScript_AlreadyGotEonTicket
- goto_if_set FLAG_ENABLE_SHIP_SOUTHERN_ISLAND, CableClub_EventScript_AlreadyGotEonTicket
+ goto_if_eq CableClub_EventScript_TryWonderCardScript
+ goto_if_set FLAG_ENABLE_SHIP_SOUTHERN_ISLAND, CableClub_EventScript_TryWonderCardScript
msgbox MysteryGift_Text_TheresATicketForYou, MSGBOX_DEFAULT
giveitem ITEM_EON_TICKET
setflag FLAG_ENABLE_SHIP_SOUTHERN_ISLAND
@@ -1035,7 +1033,7 @@ CableClub_EventScript_DirectCornerAttendant::
end
CableClub_EventScript_DirectCornerSelectService::
- checkitem ITEM_POWDER_JAR, 1
+ checkitem ITEM_POWDER_JAR
compare VAR_RESULT, FALSE
goto_if_eq CableClub_EventScript_DirectCornerNoBerry
goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_DirectCornerSelectAllServices
diff --git a/data/scripts/gift_aurora_ticket.inc b/data/scripts/gift_aurora_ticket.inc
index c9250b9f9..760bea939 100644
--- a/data/scripts/gift_aurora_ticket.inc
+++ b/data/scripts/gift_aurora_ticket.inc
@@ -4,13 +4,13 @@ MysteryGiftScript_AuroraTicket::
faceplayer
vgoto_if_set FLAG_RECEIVED_AURORA_TICKET, AuroraTicket_Obtained
vgoto_if_set FLAG_BATTLED_DEOXYS, AuroraTicket_Obtained
- checkitem ITEM_AURORA_TICKET, 1
+ checkitem ITEM_AURORA_TICKET
compare VAR_RESULT, TRUE
vgoto_if_eq AuroraTicket_Obtained
vmessage sText_AuroraTicketForYou
waitmessage
waitbuttonpress
- checkitemspace ITEM_AURORA_TICKET, 1
+ checkitemspace ITEM_AURORA_TICKET
compare VAR_RESULT, FALSE
vgoto_if_eq AuroraTicket_NoBagSpace
giveitem ITEM_AURORA_TICKET
diff --git a/data/scripts/gift_mystic_ticket.inc b/data/scripts/gift_mystic_ticket.inc
index 29c325f72..1a28dd4ce 100644
--- a/data/scripts/gift_mystic_ticket.inc
+++ b/data/scripts/gift_mystic_ticket.inc
@@ -5,13 +5,13 @@ MysteryGiftScript_MysticTicket::
vgoto_if_set FLAG_RECEIVED_MYSTIC_TICKET, MysticTicket_Obtained
vgoto_if_set FLAG_CAUGHT_LUGIA, MysticTicket_Obtained
vgoto_if_set FLAG_CAUGHT_HO_OH, MysticTicket_Obtained
- checkitem ITEM_MYSTIC_TICKET, 1
+ checkitem ITEM_MYSTIC_TICKET
compare VAR_RESULT, TRUE
vgoto_if_eq MysticTicket_Obtained
vmessage sText_MysticTicketForYou
waitmessage
waitbuttonpress
- checkitemspace ITEM_MYSTIC_TICKET, 1
+ checkitemspace ITEM_MYSTIC_TICKET
compare VAR_RESULT, FALSE
vgoto_if_eq MysticTicket_NoBagSpace
giveitem ITEM_MYSTIC_TICKET
diff --git a/data/scripts/gift_old_sea_map.inc b/data/scripts/gift_old_sea_map.inc
index 5e47a10df..b0f258807 100644
--- a/data/scripts/gift_old_sea_map.inc
+++ b/data/scripts/gift_old_sea_map.inc
@@ -4,13 +4,13 @@ MysteryGiftScript_OldSeaMap::
faceplayer
vgoto_if_set FLAG_RECEIVED_OLD_SEA_MAP, OldSeaMap_Obtained
vgoto_if_set FLAG_CAUGHT_MEW, OldSeaMap_Obtained
- checkitem ITEM_OLD_SEA_MAP, 1
+ checkitem ITEM_OLD_SEA_MAP
compare VAR_RESULT, TRUE
vgoto_if_eq OldSeaMap_Obtained
vmessage sText_MysteryGiftOldSeaMapForYou
waitmessage
waitbuttonpress
- checkitemspace ITEM_OLD_SEA_MAP, 1
+ checkitemspace ITEM_OLD_SEA_MAP
compare VAR_RESULT, FALSE
vgoto_if_eq OldSeaMap_NoBagSpace
giveitem ITEM_OLD_SEA_MAP
diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc
index 82eca777d..355e9ad4a 100644
--- a/data/scripts/kecleon.inc
+++ b/data/scripts/kecleon.inc
@@ -48,8 +48,8 @@ Route119_EventScript_Kecleon2::
end
EventScript_Kecleon::
- checkitem ITEM_DEVON_SCOPE, 1
- compare VAR_RESULT, 1
+ checkitem ITEM_DEVON_SCOPE
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_AskUseDevonScope
msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_DEFAULT
release
diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc
index 576fa28ad..6c11da105 100644
--- a/data/scripts/lilycove_lady.inc
+++ b/data/scripts/lilycove_lady.inc
@@ -405,7 +405,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_GivenPokeblock::
LilycoveCity_PokemonCenter_1F_EventScript_AskForPokeblock::
special Script_BufferContestLadyCategoryAndMonName
msgbox LilycoveCity_PokemonCenter_1F_Text_MyFriendDisplaysQuality, MSGBOX_DEFAULT
- checkitem ITEM_POKEBLOCK_CASE, 1
+ checkitem ITEM_POKEBLOCK_CASE
compare VAR_RESULT, FALSE
goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoPokeblockCase
msgbox LilycoveCity_PokemonCenter_1F_Text_AskingForOnePokeblock, MSGBOX_YESNO
diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc
index 382f5ce32..8e24d4709 100644
--- a/data/scripts/obtain_item.inc
+++ b/data/scripts/obtain_item.inc
@@ -1,55 +1,58 @@
+.set ITEMID, VAR_0x8000
+.set AMOUNT, VAR_0x8001
+
Std_ObtainItem::
- additem VAR_0x8000, VAR_0x8001
+ additem ITEMID, AMOUNT
copyvar VAR_0x8007, VAR_RESULT
call EventScript_ObtainItemMessage
return
EventScript_ObtainItemMessage::
- bufferitemnameplural 1, VAR_0x8000, VAR_0x8001
- checkitemtype VAR_0x8000
+ bufferitemnameplural 1, ITEMID, AMOUNT
+ checkitemtype ITEMID
call EventScript_BufferPocketNameAndTryFanfare
- compare VAR_0x8007, 1
+ compare VAR_0x8007, TRUE
call_if_eq EventScript_ObtainedItem
- compare VAR_0x8007, 0
+ compare VAR_0x8007, FALSE
call_if_eq EventScript_NoRoomForItem
return
EventScript_BufferPocketNameAndTryFanfare::
switch VAR_RESULT
- case POCKET_ITEMS, EventScript_BufferItemsPocket
- case POCKET_KEY_ITEMS, EventScript_BufferKeyItemsPocket
+ case POCKET_ITEMS, EventScript_BufferItemsPocket
+ case POCKET_KEY_ITEMS, EventScript_BufferKeyItemsPocket
case POCKET_POKE_BALLS, EventScript_BufferPokeballsPocket
- case POCKET_TM_HM, EventScript_BufferTMHMsPocket
- case POCKET_BERRIES, EventScript_BufferBerriesPocket
+ case POCKET_TM_HM, EventScript_BufferTMHMsPocket
+ case POCKET_BERRIES, EventScript_BufferBerriesPocket
end
EventScript_BufferItemsPocket::
bufferstdstring 2, STDSTRING_ITEMS
- compare VAR_0x8007, 1
+ compare VAR_0x8007, TRUE
call_if_eq EventScript_PlayFanfareObtainedItem
return
EventScript_BufferKeyItemsPocket::
bufferstdstring 2, STDSTRING_KEYITEMS
- compare VAR_0x8007, 1
+ compare VAR_0x8007, TRUE
call_if_eq EventScript_PlayFanfareObtainedItem
return
EventScript_BufferPokeballsPocket::
bufferstdstring 2, STDSTRING_POKEBALLS
- compare VAR_0x8007, 1
+ compare VAR_0x8007, TRUE
call_if_eq EventScript_PlayFanfareObtainedItem
return
EventScript_BufferTMHMsPocket::
bufferstdstring 2, STDSTRING_TMHMS
- compare VAR_0x8007, 1
+ compare VAR_0x8007, TRUE
call_if_eq EventScript_PlayFanfareObtainedTMHM
return
EventScript_BufferBerriesPocket::
bufferstdstring 2, STDSTRING_BERRIES
- compare VAR_0x8007, 1
+ compare VAR_0x8007, TRUE
call_if_eq EventScript_PlayFanfareObtainedItem
return
@@ -57,11 +60,11 @@ EventScript_ObtainedItem::
message gText_ObtainedTheItem
waitfanfare
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
- setvar VAR_RESULT, 1
+ setvar VAR_RESULT, TRUE
return
EventScript_NoRoomForItem::
- setvar VAR_RESULT, 0
+ setvar VAR_RESULT, FALSE
return
EventScript_PlayFanfareObtainedItem::
@@ -73,16 +76,16 @@ EventScript_PlayFanfareObtainedTMHM::
return
Std_ObtainDecoration::
- adddecoration VAR_0x8000
+ adddecoration ITEMID
copyvar VAR_0x8007, VAR_RESULT
call EventScript_ObtainDecorationMessage
return
EventScript_ObtainDecorationMessage::
- bufferdecorationname 1, VAR_0x8000
- compare VAR_0x8007, 1
+ bufferdecorationname 1, ITEMID
+ compare VAR_0x8007, TRUE
call_if_eq EventScript_ObtainedDecor
- compare VAR_0x8007, 0
+ compare VAR_0x8007, FALSE
call_if_eq EventScript_NoRoomForDecor
return
@@ -91,27 +94,27 @@ EventScript_ObtainedDecor::
message gText_ObtainedTheDecor
waitfanfare
msgbox gText_TheDecorWasTransferredToThePC, MSGBOX_DEFAULT
- setvar VAR_RESULT, 1
+ setvar VAR_RESULT, TRUE
return
EventScript_NoRoomForDecor::
- setvar VAR_RESULT, 0
+ setvar VAR_RESULT, FALSE
return
Std_FindItem::
lock
faceplayer
waitse
- copyvar VAR_0x8004, VAR_0x8000
- copyvar VAR_0x8005, VAR_0x8001
- checkitemspace VAR_0x8000, VAR_0x8001
+ copyvar VAR_0x8004, ITEMID
+ copyvar VAR_0x8005, AMOUNT
+ checkitemspace ITEMID, AMOUNT
copyvar VAR_0x8007, VAR_RESULT
- bufferitemnameplural 1, VAR_0x8000, VAR_0x8001
- checkitemtype VAR_0x8000
+ bufferitemnameplural 1, ITEMID, AMOUNT
+ checkitemtype ITEMID
call EventScript_BufferPocketNameAndTryFanfare
- compare VAR_0x8007, 1
+ compare VAR_0x8007, TRUE
call_if_eq EventScript_PickUpItem
- compare VAR_0x8007, 0
+ compare VAR_0x8007, FALSE
call_if_eq EventScript_NoRoomToPickUpItem
release
return
@@ -121,15 +124,15 @@ EventScript_PickUpItem::
additem VAR_0x8004, VAR_0x8005
specialvar VAR_RESULT, BufferTMHMMoveName
copyvar VAR_0x8008, VAR_RESULT
- compare VAR_0x8008, 1
+ compare VAR_0x8008, TRUE
call_if_eq EventScript_FoundTMHM
- compare VAR_0x8008, 0
+ compare VAR_0x8008, FALSE
call_if_eq EventScript_FoundItem
waitfanfare
waitmessage
bufferitemnameplural 1, VAR_0x8004, VAR_0x8005
pyramid_inchallenge
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_PutBattlePyramidItemInBag
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
return
@@ -150,7 +153,7 @@ EventScript_FoundItem::
EventScript_NoRoomToPickUpItem::
msgbox gText_ObtainedTheItem, MSGBOX_DEFAULT
msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
- setvar VAR_RESULT, 0
+ setvar VAR_RESULT, FALSE
return
EventScript_HiddenItemScript::
@@ -161,9 +164,9 @@ EventScript_HiddenItemScript::
bufferitemnameplural 1, VAR_0x8005, 1
checkitemtype VAR_0x8005
call EventScript_BufferPocketNameAndTryFanfare
- compare VAR_0x8007, 1
+ compare VAR_0x8007, TRUE
goto_if_eq EventScript_PickUpHiddenItem
- compare VAR_0x8007, 0
+ compare VAR_0x8007, FALSE
goto_if_eq EventScript_NoRoomForHiddenItem
end
@@ -171,9 +174,9 @@ EventScript_PickUpHiddenItem::
copyvar VAR_0x8008, VAR_0x8004
copyvar VAR_0x8004, VAR_0x8005
specialvar VAR_RESULT, BufferTMHMMoveName
- compare VAR_RESULT, 1
+ compare VAR_RESULT, TRUE
goto_if_eq EventScript_FoundHiddenTMHM
- compare VAR_RESULT, 0
+ compare VAR_RESULT, FALSE
goto_if_eq EventScript_FoundHiddenItem
end
diff --git a/data/scripts/roulette.inc b/data/scripts/roulette.inc
index 1167a765b..241b0d31c 100644
--- a/data/scripts/roulette.inc
+++ b/data/scripts/roulette.inc
@@ -1,5 +1,5 @@
Roulette_EventScript_Table1::
- checkitem ITEM_COIN_CASE, 1
+ checkitem ITEM_COIN_CASE
compare VAR_RESULT, FALSE
goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 0
@@ -11,7 +11,7 @@ Roulette_EventScript_Table1::
end
Roulette_EventScript_Table2::
- checkitem ITEM_COIN_CASE, 1
+ checkitem ITEM_COIN_CASE
compare VAR_RESULT, FALSE
goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
setvar VAR_0x8004, 1
diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc
index 941cc0e96..f94d28ba0 100644
--- a/data/scripts/std_msgbox.inc
+++ b/data/scripts/std_msgbox.inc
@@ -34,7 +34,8 @@ Std_MsgboxGetPoints:
waitmessage
return
-Std_10:
+@ Never used, pokenavcall is always used directly instead
+Std_MsgboxPokenav:
pokenavcall 0x0
waitmessage
return
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-05 15:54:15 +0000