summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/maps/SootopolisCity/scripts.inc4
-rw-r--r--data/script_cmd_table.inc2
-rw-r--r--data/scripts/cable_club.inc10
-rw-r--r--data/scripts/mevent_altering_cave.inc2
-rw-r--r--data/scripts/mevent_aurora_ticket.inc4
-rw-r--r--data/scripts/mevent_battle_card.inc2
-rw-r--r--data/scripts/mevent_mystic_ticket.inc4
-rw-r--r--data/scripts/mevent_old_sea_map.inc4
-rw-r--r--data/scripts/mevent_pichu.inc12
-rw-r--r--data/scripts/mevent_trainer.inc2
-rw-r--r--data/specials.inc2
11 files changed, 24 insertions, 24 deletions
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index 6b80168b9..8a4c6ea4e 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -547,7 +547,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E
fadenewbgm MUS_RUNECITY
delay 120
clearflag FLAG_HIDE_MAP_NAME_POPUP
- warp8 MAP_SOOTOPOLIS_CITY, 255, 43, 32
+ warpsootopolislegend MAP_SOOTOPOLIS_CITY, 255, 43, 32
waitstate
end
@@ -600,7 +600,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE
fadenewbgm MUS_NAMINORI
delay 120
clearflag FLAG_HIDE_MAP_NAME_POPUP
- warp8 MAP_SOOTOPOLIS_CITY, 255, 29, 53
+ warpsootopolislegend MAP_SOOTOPOLIS_CITY, 255, 29, 53
waitstate
end
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc
index 006167443..f447d5f25 100644
--- a/data/script_cmd_table.inc
+++ b/data/script_cmd_table.inc
@@ -224,7 +224,7 @@ gScriptCmdTable:: @ 81DB67C
.4byte ScrCmd_buffertrainerclassname
.4byte ScrCmd_buffertrainername
.4byte ScrCmd_pokenavcall
- .4byte ScrCmd_warpE0
+ .4byte ScrCmd_warpsootopolislegend
.4byte ScrCmd_buffercontesttype
.4byte ScrCmd_bufferitemnameplural
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 2da5fa6b6..f27692448 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -391,7 +391,7 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD
goto_if_eq CableClub_EventScript_WarpTo4PColosseum
special SetCableClubWarp
warp MAP_BATTLE_COLOSSEUM_2P, 255, 6, 8
- special sub_80AF948
+ special DoCableClubWarp
waitstate
end
@@ -404,7 +404,7 @@ CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 827702B
CableClub_EventScript_WarpTo4PColosseum:: @ 8277036
special SetCableClubWarp
warp MAP_BATTLE_COLOSSEUM_4P, 255, 5, 8
- special sub_80AF948
+ special DoCableClubWarp
waitstate
end
@@ -494,7 +494,7 @@ CableClub_EventScript_EnterTradeCenter:: @ 827713A
release
special SetCableClubWarp
setwarp MAP_TRADE_CENTER, 255, 5, 8
- special sub_80AF948
+ special DoCableClubWarp
waitstate
end
@@ -569,7 +569,7 @@ CableClub_EventScript_EnterRecordCorner:: @ 827724C
release
special SetCableClubWarp
setwarp MAP_RECORD_CORNER, 255, 8, 9
- special sub_80AF948
+ special DoCableClubWarp
waitstate
end
@@ -618,7 +618,7 @@ MossdeepCity_GameCorner_1F_EventScript_AbortMinigame:: @ 82772F9
@ Unused
CableClub_EventScript_CableClubWarp:: @ 8277306
special SetCableClubWarp
- special sub_80AF948
+ special DoCableClubWarp
waitstate
end
diff --git a/data/scripts/mevent_altering_cave.inc b/data/scripts/mevent_altering_cave.inc
index 072005934..499907edd 100644
--- a/data/scripts/mevent_altering_cave.inc
+++ b/data/scripts/mevent_altering_cave.inc
@@ -1,7 +1,7 @@
MysteryEventScript_AlteringCave:: @ 86756E3
setvaddress MysteryEventScript_AlteringCave
addvar VAR_ALTERING_CAVE_WILD_SET, 1
- compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10
+ compare VAR_ALTERING_CAVE_WILD_SET, 10
vgoto_if_ne MysteryEventScript_AlteringCave_
setvar VAR_ALTERING_CAVE_WILD_SET, 0
MysteryEventScript_AlteringCave_: @ 86756FD
diff --git a/data/scripts/mevent_aurora_ticket.inc b/data/scripts/mevent_aurora_ticket.inc
index 811c840aa..177d69681 100644
--- a/data/scripts/mevent_aurora_ticket.inc
+++ b/data/scripts/mevent_aurora_ticket.inc
@@ -7,13 +7,13 @@ MysteryEventScript_AuroraTicket:: @ 867533C
checkflag FLAG_BATTLED_DEOXYS
vgoto_if_eq AuroraTicket_Obtained
checkitem ITEM_AURORA_TICKET, 1
- compare_var_to_value VAR_RESULT, TRUE
+ compare VAR_RESULT, TRUE
vgoto_if_eq AuroraTicket_Obtained
vmessage sText_AuroraTicketForYou
waitmessage
waitbuttonpress
checkitemspace ITEM_AURORA_TICKET, 1
- compare_var_to_value VAR_RESULT, FALSE
+ compare VAR_RESULT, FALSE
vgoto_if_eq AuroraTicket_NoBagSpace
giveitem_std ITEM_AURORA_TICKET
setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND
diff --git a/data/scripts/mevent_battle_card.inc b/data/scripts/mevent_battle_card.inc
index 8c36ed63a..77f9a9b24 100644
--- a/data/scripts/mevent_battle_card.inc
+++ b/data/scripts/mevent_battle_card.inc
@@ -4,7 +4,7 @@ MysteryEventScript_BattleCard:: @ 867513C
vgoto_if_eq MysteryEventScript_BattleCardInfo
setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON
specialvar VAR_0x8008, GetMysteryEventCardVal
- compare_var_to_value VAR_0x8008, REQUIRED_CARD_BATTLES
+ compare VAR_0x8008, REQUIRED_CARD_BATTLES
vgoto_if_ne MysteryEventScript_BattleCardInfo
lock
faceplayer
diff --git a/data/scripts/mevent_mystic_ticket.inc b/data/scripts/mevent_mystic_ticket.inc
index 0264fb77f..9d532b043 100644
--- a/data/scripts/mevent_mystic_ticket.inc
+++ b/data/scripts/mevent_mystic_ticket.inc
@@ -9,13 +9,13 @@ MysteryEventScript_MysticTicket:: @ 867550B
checkflag FLAG_CAUGHT_HO_OH
vgoto_if_eq MysticTicket_Obtained
checkitem ITEM_MYSTIC_TICKET, 1
- compare_var_to_value VAR_RESULT, TRUE
+ compare VAR_RESULT, TRUE
vgoto_if_eq MysticTicket_Obtained
vmessage sText_MysticTicketForYou
waitmessage
waitbuttonpress
checkitemspace ITEM_MYSTIC_TICKET, 1
- compare_var_to_value VAR_RESULT, FALSE
+ compare VAR_RESULT, FALSE
vgoto_if_eq MysticTicket_NoBagSpace
giveitem_std ITEM_MYSTIC_TICKET
setflag FLAG_ENABLE_SHIP_NAVEL_ROCK
diff --git a/data/scripts/mevent_old_sea_map.inc b/data/scripts/mevent_old_sea_map.inc
index dffb56caa..45c5f6728 100644
--- a/data/scripts/mevent_old_sea_map.inc
+++ b/data/scripts/mevent_old_sea_map.inc
@@ -7,13 +7,13 @@ MysteryEventScript_OldSeaMap:: @ 86757F4
checkflag FLAG_CAUGHT_MEW
vgoto_if_eq OldSeaMap_Obtained
checkitem ITEM_OLD_SEA_MAP, 1
- compare_var_to_value VAR_RESULT, TRUE
+ compare VAR_RESULT, TRUE
vgoto_if_eq OldSeaMap_Obtained
vmessage sText_MysteryGiftOldSeaMapForYou
waitmessage
waitbuttonpress
checkitemspace ITEM_OLD_SEA_MAP, 1
- compare_var_to_value VAR_RESULT, FALSE
+ compare VAR_RESULT, FALSE
vgoto_if_eq OldSeaMap_NoBagSpace
giveitem_std ITEM_OLD_SEA_MAP
setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND
diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc
index 4df317564..4f5c739af 100644
--- a/data/scripts/mevent_pichu.inc
+++ b/data/scripts/mevent_pichu.inc
@@ -6,7 +6,7 @@ MysteryEventScript_SurfPichu:: @ 8674D3D
SurfPichu_GiveIfPossible: @ 8674D4C
specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount
- compare_var_to_value VAR_EVENT_PICHU_SLOT, PARTY_SIZE
+ compare VAR_EVENT_PICHU_SLOT, PARTY_SIZE
vgoto_if_eq SurfPichu_FullParty
setflag FLAG_MYSTERY_EVENT_DONE
vcall SurfPichu_GiveEgg
@@ -33,15 +33,15 @@ SurfPichu_GiveEgg: @ 8674D7E
giveegg SPECIES_PICHU
setmonobedient VAR_EVENT_PICHU_SLOT
setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER
- compare_var_to_value VAR_EVENT_PICHU_SLOT, 1
+ compare VAR_EVENT_PICHU_SLOT, 1
vgoto_if_eq SurfPichu_Slot1
- compare_var_to_value VAR_EVENT_PICHU_SLOT, 2
+ compare VAR_EVENT_PICHU_SLOT, 2
vgoto_if_eq SurfPichu_Slot2
- compare_var_to_value VAR_EVENT_PICHU_SLOT, 3
+ compare VAR_EVENT_PICHU_SLOT, 3
vgoto_if_eq SurfPichu_Slot3
- compare_var_to_value VAR_EVENT_PICHU_SLOT, 4
+ compare VAR_EVENT_PICHU_SLOT, 4
vgoto_if_eq SurfPichu_Slot4
- compare_var_to_value VAR_EVENT_PICHU_SLOT, 5
+ compare VAR_EVENT_PICHU_SLOT, 5
vgoto_if_eq SurfPichu_Slot5
return
diff --git a/data/scripts/mevent_trainer.inc b/data/scripts/mevent_trainer.inc
index 1b0117078..4114750d8 100644
--- a/data/scripts/mevent_trainer.inc
+++ b/data/scripts/mevent_trainer.inc
@@ -1,7 +1,7 @@
MysteryEventScript_VisitingTrainer:: @ 8674EC1
setvaddress MysteryEventScript_VisitingTrainer
special ValidateEReaderTrainer
- compare_var_to_value VAR_RESULT, 0
+ compare VAR_RESULT, 0
vgoto_if_eq MysteryEventScript_VisitingTrainerArrived
lock
faceplayer
diff --git a/data/specials.inc b/data/specials.inc
index 4df6c5399..17f459a1f 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -10,7 +10,7 @@
gSpecials:: @ 81DBA64
def_special HealPlayerParty
def_special SetCableClubWarp
- def_special sub_80AF948
+ def_special DoCableClubWarp
def_special ReturnFromLinkRoom
def_special CleanupLinkRoomState
def_special ExitLinkRoom
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 11:30:13 +0000