summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/cable_club.inc28
-rw-r--r--data/scripts/cave_of_origin.inc2
-rw-r--r--data/scripts/fame_checker.inc12
-rw-r--r--data/scripts/field_moves.inc24
-rw-r--r--data/scripts/hall_of_fame.inc2
-rw-r--r--data/scripts/itemfinder.inc2
-rw-r--r--data/scripts/move_tutors.inc4
-rw-r--r--data/scripts/mystery_event_club.inc4
-rw-r--r--data/scripts/obtain_item.inc8
-rw-r--r--data/scripts/pc.inc24
-rw-r--r--data/scripts/pkmn_center_nurse.inc2
-rw-r--r--data/scripts/pokedex_rating.inc14
-rw-r--r--data/scripts/pokemon_league.inc2
-rw-r--r--data/scripts/questionnaire.inc2
-rw-r--r--data/scripts/seagallop.inc8
-rw-r--r--data/scripts/silphco_doors.inc480
-rw-r--r--data/scripts/trainer_battle.inc123
-rw-r--r--data/scripts/trainer_card.inc10
-rw-r--r--data/scripts/white_out.inc4
19 files changed, 377 insertions, 378 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index e7eda5271..01b0d9b34 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -19,7 +19,7 @@ CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2
execram
@ Unused
-EventScript_1BB1E4:: @ 81BB1E4
+EventScript_MysteryGiftThankYou:: @ 81BB1E4
msgbox Text_ThankYouForAccessingMysteryGift, MSGBOX_NPC
end
@@ -446,7 +446,7 @@ CableClub_EventScript_CheckPartyTradeRequirements:: @ 81BB79C
specialvar VAR_RESULT, CalculatePlayerPartyCount
compare VAR_RESULT, 2
goto_if_lt CableClub_EventScript_NeedTwoMonsToTrade
- specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty
+ specialvar VAR_RESULT, DoesPartyHaveEnigmaBerry
compare VAR_RESULT, TRUE
goto_if_eq CableClub_EventScript_CantTradeEnigmaBerry
setvar VAR_RESULT, TRUE
@@ -601,7 +601,7 @@ CableClub_EventScript_ShowBattleRecords:: @ 81BB8A7
lockall
fadescreen FADE_TO_BLACK
setvar VAR_0x8004, 0
- special Special_BattleRecords
+ special ShowBattleRecords
waitstate
releaseall
end
@@ -760,7 +760,7 @@ TradeCenter_TerminateLink:: @ 81BB9F0
textcolor 3
messageautoscroll Text_TerminateLinkConfirmation
waitmessage
- special sub_8081770
+ special ExitLinkRoom
end
CableClub_EventScript_DoLinkRoomExit:: @ 81BB9FC
@@ -775,7 +775,7 @@ CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04
lock
faceplayer
goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
- specialvar VAR_RESULT, Special_BadEggInParty
+ specialvar VAR_RESULT, IsBadEggInParty
compare VAR_RESULT, TRUE
goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg
copyvar VAR_0x8007, VAR_LAST_TALKED
@@ -842,7 +842,7 @@ CableClub_EventScript_CheckPartyUnionRoomRequirements:: @ 81BBB1E
specialvar VAR_RESULT, CountPartyNonEggMons
compare VAR_RESULT, 2
goto_if_lt CableClub_EventScript_NeedTwoMonsForUnionRoom
- specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty
+ specialvar VAR_RESULT, DoesPartyHaveEnigmaBerry
compare VAR_RESULT, TRUE
goto_if_eq CableClub_EventScript_NoEnigmaBerryInUnionRoom
setvar VAR_RESULT, TRUE
@@ -885,7 +885,7 @@ CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C
lock
faceplayer
goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
- specialvar VAR_RESULT, Special_BadEggInParty
+ specialvar VAR_RESULT, IsBadEggInParty
compare VAR_RESULT, TRUE
goto_if_eq CableClub_EventScript_AbortLinkPlayerHasBadEgg
specialvar VAR_RESULT, IsWirelessAdapterConnected
@@ -1149,7 +1149,7 @@ CableClub_EventScript_81BBFD8:: @ 81BBFD8
goto_if_eq CableClub_EventScript_AdapterNotConnected
special HelpSystem_Disable
fadescreen FADE_TO_BLACK
- special Special_WirelessCommunicationScreen
+ special ShowWirelessCommunicationScreen
waitstate
msgbox CableClub_Text_ParticipantsStepUpToCounter
special HelpSystem_Enable
@@ -1162,27 +1162,27 @@ CableClub_EventScript_AdapterNotConnected:: @ 81BC016
end
CableClub_EventScript_OpenUnionRoomBarrier:: @ 81BC020
- setmetatile 5, 3, 709, 0
+ setmetatile 5, 3, METATILE_PokemonCenter_Floor_ShadeLeft, 0
return
CableClub_EventScript_CloseUnionRoomBarrier:: @ 81BC02A
- setmetatile 5, 3, 761, 1
+ setmetatile 5, 3, METATILE_PokemonCenter_CounterBarrier, 1
return
CableClub_EventScript_OpenDirectCornerBarrier:: @ 81BC034
- setmetatile 9, 3, 709, 0
+ setmetatile 9, 3, METATILE_PokemonCenter_Floor_ShadeLeft, 0
return
CableClub_EventScript_CloseDirectCornerBarrier:: @ 81BC03E
- setmetatile 9, 3, 761, 1
+ setmetatile 9, 3, METATILE_PokemonCenter_CounterBarrier, 1
return
CableClub_EventScript_OpenGameCornerBarrier:: @ 81BC048
- setmetatile 5, 3, 737, 0
+ setmetatile 5, 3, METATILE_GameCorner_CheckeredFloor_ShadeLeft, 0
return
CableClub_EventScript_CloseGameCornerBarrier:: @ 81BC052
- setmetatile 5, 3, 759, 1
+ setmetatile 5, 3, METATILE_GameCorner_CounterBarrier, 1
return
CableClub_OnResume:: @ 81BC05C
diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc
index 6a1f967f2..88e402ac3 100644
--- a/data/scripts/cave_of_origin.inc
+++ b/data/scripts/cave_of_origin.inc
@@ -22,7 +22,7 @@ CaveOfOrigin_EventScript_Shake:: @ 81A74B7
setvar VAR_0x8005, 1
setvar VAR_0x8006, 8
setvar VAR_0x8007, 5
- special Special_ShakeScreen
+ special ShakeScreen
waitstate
releaseall
end
diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc
index c7dab5b52..76b5d5c81 100644
--- a/data/scripts/fame_checker.inc
+++ b/data/scripts/fame_checker.inc
@@ -8,7 +8,7 @@ ViridianCity_House2_EventScript_PokemonJournal:: @ 81ACD65
release
end
-EventScript_1ACD8D:: @ 81ACD8D
+EventScript_PokemonJournalUnused1:: @ 81ACD8D
lock
faceplayer
famechecker FAMECHECKER_DAISY, 1
@@ -18,7 +18,7 @@ EventScript_1ACD8D:: @ 81ACD8D
release
end
-EventScript_1ACDB5:: @ 81ACDB5
+EventScript_PokemonJournalUnused2:: @ 81ACDB5
lock
faceplayer
famechecker FAMECHECKER_DAISY, 4
@@ -135,11 +135,11 @@ CinnabarIsland_Gym_EventScript_BlaineFujiPhoto:: @ 81ACF07
releaseall
end
-FiveIsland_ResortGorgeous_House_EventScript_1ACF2C:: @ 81ACF2C
+FiveIsland_ResortGorgeous_House_EventScript_PokemonJournal:: @ 81ACF2C
lockall
famechecker FAMECHECKER_BLAINE, 5
textcolor 3
- msgbox gUnknown_81B17E9
+ msgbox PokemonJournal_Text_SpecialFeatureBlaine
releaseall
end
@@ -203,7 +203,7 @@ SixIsland_Mart_EventScript_OldWoman:: @ 81ACFEF
release
end
-EventScript_1AD008:: @ 81AD008
+EventScript_LanceUnused:: @ 81AD008
lock
faceplayer
famechecker FAMECHECKER_LANCE, 0
@@ -211,7 +211,7 @@ EventScript_1AD008:: @ 81AD008
release
end
-EventScript_1AD021:: @ 81AD021
+SaffronCity_EventScript_BattleGirlUnused:: @ 81AD021
lock
faceplayer
famechecker FAMECHECKER_LANCE, 1
diff --git a/data/scripts/field_moves.inc b/data/scripts/field_moves.inc
index 73ee4d947..282071755 100644
--- a/data/scripts/field_moves.inc
+++ b/data/scripts/field_moves.inc
@@ -1,4 +1,4 @@
-EventScript_InteractWithCutTreeObject:: @ 81BDF13
+EventScript_CutTree:: @ 81BDF13
goto_if_questlog EventScript_ReleaseEnd
lockall
goto_if_unset FLAG_BADGE02_GET, EventScript_CantCutTree
@@ -15,24 +15,24 @@ EventScript_InteractWithCutTreeObject:: @ 81BDF13
closemessage
dofieldeffect FLDEFF_USE_CUT_ON_TREE
waitstate
- goto EventScript_CutTree
+ goto EventScript_CutTreeDown
end
EventScript_FldEffCut:: @ 81BDF6B
lockall
dofieldeffect FLDEFF_USE_CUT_ON_TREE
waitstate
- goto EventScript_CutTree
+ goto EventScript_CutTreeDown
end
-EventScript_CutTree:: @ 81BDF76
- applymovement VAR_LAST_TALKED, Movement_CutTree
+EventScript_CutTreeDown:: @ 81BDF76
+ applymovement VAR_LAST_TALKED, Movement_CutTreeDown
waitmovement 0
removeobject VAR_LAST_TALKED
releaseall
end
-Movement_CutTree:: @ 81BDF85
+Movement_CutTreeDown:: @ 81BDF85
cut_tree
step_end
@@ -58,7 +58,7 @@ Text_TreeCanBeCutDown:: @ 81BDFE3
.string "This tree looks like it can be CUT\n"
.string "down!$"
-EventScript_InteractWithRockSmashRockObject:: @ 81BE00C
+EventScript_RockSmash:: @ 81BE00C
goto_if_questlog EventScript_ReleaseEnd
lockall
goto_if_unset FLAG_BADGE06_GET, EventScript_CantSmashRock
@@ -89,7 +89,7 @@ EventScript_UseRockSmash:: @ 81BE06F
applymovement VAR_LAST_TALKED, Movement_BreakRock
waitmovement 0
removeobject VAR_LAST_TALKED
- special ScrSpecial_RockSmashWildEncounter
+ special RockSmashWildEncounter
compare VAR_RESULT, FALSE
goto_if_eq EventScript_RockSmashNoEncounter
waitstate
@@ -121,7 +121,7 @@ Text_MonMaySmashRock:: @ 81BE0E2
.string "It's a rugged rock, but a POKéMON\n"
.string "may be able to smash it.$"
-EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D
+EventScript_StrengthBoulder:: @ 81BE11D
goto_if_questlog EventScript_ReleaseEnd
lockall
goto_if_unset FLAG_BADGE04_GET, EventScript_CantMoveBoulder
@@ -182,7 +182,7 @@ Text_StrengthMadeMovingBouldersPossible:: @ 81BE284
.string "STRENGTH made it possible to move\n"
.string "boulders around.$"
-EventScript_InteractWithWaterfall:: @ 81BE2B7
+EventScript_Waterfall:: @ 81BE2B7
goto_if_questlog EventScript_ReleaseEnd
lockall
checkpartymove MOVE_WATERFALL
@@ -197,7 +197,7 @@ EventScript_InteractWithWaterfall:: @ 81BE2B7
dofieldeffect FLDEFF_USE_WATERFALL
goto EventScript_EndWaterfall
-EventScript_81BE2FF:: @ 81BE2FF
+EventScript_CantUseWaterfall:: @ 81BE2FF
lockall
EventScript_WaterCrashingDown:
msgbox Text_WallOfWaterCrashingDown
@@ -217,7 +217,7 @@ Text_MonUsedWaterfall:: @ 81BE378
.string "{STR_VAR_1} used WATERFALL.$"
@ Unused leftover from R/S
-EventScript_InteractWithDeepWater:: @ 81BE38B
+EventScript_DeepWater:: @ 81BE38B
lockall
checkpartymove MOVE_DIVE
compare VAR_RESULT, PARTY_SIZE
diff --git a/data/scripts/hall_of_fame.inc b/data/scripts/hall_of_fame.inc
index 5ce427a6a..5657ff2dd 100644
--- a/data/scripts/hall_of_fame.inc
+++ b/data/scripts/hall_of_fame.inc
@@ -1,7 +1,7 @@
EventScript_SetDefeatedEliteFourFlagsVars:: @ 81A651A
clearflag FLAG_HIDE_POSTGAME_GOSSIPERS
call EventScript_ResetEliteFour
- special Special_UpdateTrainerFanClubGameClear
+ special Script_UpdateTrainerFanClubGameClear
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare VAR_RESULT, FALSE
call_if_eq EventScript_SetReadyTryGiveNationalDexScene
diff --git a/data/scripts/itemfinder.inc b/data/scripts/itemfinder.inc
index 8b806f815..6eabdc395 100644
--- a/data/scripts/itemfinder.inc
+++ b/data/scripts/itemfinder.inc
@@ -15,7 +15,7 @@ EventScript_DigUpItemPutInPocket::
waitmessage
delay 60
msgbox Text_PutItemAway
- special Special_SetHiddenItemFlag
+ special SetHiddenItemFlag
releaseall
end
diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc
index 744e50199..46d4a7c52 100644
--- a/data/scripts/move_tutors.inc
+++ b/data/scripts/move_tutors.inc
@@ -455,7 +455,7 @@ TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC
goto_if_set FLAG_TEMP_2, CapeBrinkTutor_EventScript_MoveJustTaught
getfirstpartymonname 0
msgbox Text_UltimateMoveThatMon
- specialvar VAR_RESULT, Special_CapeBrinkGetMoveToTeachLeadPokemon
+ specialvar VAR_RESULT, CapeBrinkGetMoveToTeachLeadPokemon
compare VAR_RESULT, FALSE
goto_if_eq CapeBrinkTutor_EventScript_NoLeadStarter
copyvar VAR_0x8009, VAR_0x8005
@@ -496,7 +496,7 @@ CapeBrinkTutor_EventScript_TaughtAllMoves:: @ 81C4EA1
CapeBrinkTutor_EventScript_TaughtMove:: @ 81C4EAB
copyvar VAR_0x8005, VAR_0x8009
- specialvar VAR_RESULT, Special_HasLearnedAllMovesFromCapeBrinkTutor
+ specialvar VAR_RESULT, HasLearnedAllMovesFromCapeBrinkTutor
compare VAR_RESULT, TRUE
goto_if_eq CapeBrinkTutor_EventScript_LearnedAllMoves
msgbox Text_TaughtMove
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index bfc9fbbbd..8034ee0b1 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -45,7 +45,7 @@ EventScript_CancelGiveProfile: @ 81BEE9E
EventScript_GaveProfile: @ 81BEEA8
setvar GAVE_PROFILE, TRUE
setvar VAR_0x8004, 0
- special Special_BufferEasyChatMessage
+ special ShowEasyChatMessage
waitmessage
delay 80
msgbox Text_ProfileSaysSomethingAboutYou
@@ -92,7 +92,7 @@ EventScript_DeclineGiveNewProfile: @ 81BEF35
EventScript_GaveSpecialProfile: @ 81BEF3F
setvar GAVE_PROFILE, TRUE
setvar VAR_0x8004, 0
- special Special_BufferEasyChatMessage
+ special ShowEasyChatMessage
waitmessage
delay 80
msgbox Text_HeardThatBefore
diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc
index a50693292..961be1971 100644
--- a/data/scripts/obtain_item.inc
+++ b/data/scripts/obtain_item.inc
@@ -133,7 +133,7 @@ Std_FindItem:: @ 81A67B3
EventScript_PickUpItem:: @ 81A67EE
removeobject VAR_LAST_TALKED
additem VAR_0x8004, VAR_0x8005
- specialvar VAR_RESULT, Special_ItemIsTM_GetMoveName
+ specialvar VAR_RESULT, BufferTMHMMoveName
copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8008, TRUE
call_if_eq EventScript_FoundTMHM
@@ -187,7 +187,7 @@ EventScript_PickedUpHiddenItem::
waitfanfare
waitmessage
msgbox Text_PutItemAway
- special Special_SetHiddenItemFlag
+ special SetHiddenItemFlag
releaseall
end
@@ -215,7 +215,7 @@ EventScript_NoRoomForHiddenItem::
EventScript_TryPickUpHiddenCoins::
goto_if_unset FLAG_GOT_COIN_CASE, EventScript_NoCaseForHiddenCoins
checkcoins VAR_RESULT
- specialvar VAR_RESULT, Special_CheckAddCoins
+ specialvar VAR_RESULT, CheckAddCoins
compare VAR_RESULT, FALSE
goto_if_eq EventScript_HiddenCoinsButCaseIsFull
addcoins VAR_0x8006
@@ -225,7 +225,7 @@ EventScript_TryPickUpHiddenCoins::
waitfanfare
waitmessage
msgbox Text_PutCoinsAwayInCoinCase
- special Special_SetHiddenItemFlag
+ special SetHiddenItemFlag
releaseall
end
diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc
index 16cb13647..0c71b9c76 100644
--- a/data/scripts/pc.inc
+++ b/data/scripts/pc.inc
@@ -2,10 +2,10 @@ EventScript_PC:: @ 81A6955
goto_if_questlog EventScript_ReleaseEnd
lockall
goto_if_set FLAG_SYS_PC_STORAGE_DISABLED, EventScript_PCDisabled
- setvar VAR_0x8004, 27
- special Special_SetSomeVariable
+ setvar VAR_0x8004, HELPCONTEXT_PC
+ special Script_SetHelpContext
setvar VAR_0x8004, 0
- special Special_AnimatePcTurnOn
+ special AnimatePcTurnOn
playse SE_PC_ON
msgbox Text_BootedUpPC
goto EventScript_PCMainMenu
@@ -20,7 +20,7 @@ EventScript_PCDisabled:: @ 81A698E
EventScript_PCMainMenu:: @ 81A6998
message Text_AccessWhichPC
waitmessage
- special ScrSpecial_CreatePCMenu
+ special CreatePCMenu
waitstate
goto EventScript_ChoosePCMenu
end
@@ -50,8 +50,8 @@ EventScript_AccessPokemonStorage:: @ 81A6A05
msgbox Text_OpenedPkmnStorage
special ShowPokemonStorageSystem
waitstate
- setvar VAR_0x8004, 27
- special Special_SetSomeVariable
+ setvar VAR_0x8004, HELPCONTEXT_PC
+ special Script_SetHelpContext
goto EventScript_PCMainMenu
end
@@ -66,20 +66,20 @@ EventScript_AccessBillsPC:: @ 81A6A3D
EventScript_TurnOffPC:: @ 81A6A46
setvar VAR_0x8004, 0
playse SE_PC_OFF
- special Special_AnimatePcTurnOff
- special sub_812B35C
+ special AnimatePcTurnOff
+ special SetHelpContextForMap
releaseall
end
EventScript_AccessHallOfFame:: @ 81A6A56
goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC
playse SE_PC_LOGIN
- setvar VAR_0x8004, 31
- special HelpSystem_BackupSomeVariable
- special Special_SetSomeVariable
+ setvar VAR_0x8004, HELPCONTEXT_PC_MISC
+ special BackupHelpContext
+ special Script_SetHelpContext
special HallOfFamePCBeginFade
waitstate
- special HelpSystem_RestoreSomeVariable
+ special RestoreHelpContext
goto EventScript_ChoosePCMenu
end
diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc
index fddd3fd72..2d537c3af 100644
--- a/data/scripts/pkmn_center_nurse.inc
+++ b/data/scripts/pkmn_center_nurse.inc
@@ -29,7 +29,7 @@ EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 81A65CE
return
EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom:: @ 81A65EC
- specialvar VAR_RESULT, Special_PlayerIsNotInTrainerTowerLobby
+ specialvar VAR_RESULT, IsPlayerNotInTrainerTowerLobby
compare VAR_RESULT, FALSE
goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn
specialvar VAR_RESULT, BufferUnionRoomPlayerName
diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc
index 8d313d200..79f4ad84c 100644
--- a/data/scripts/pokedex_rating.inc
+++ b/data/scripts/pokedex_rating.inc
@@ -16,7 +16,7 @@ PokedexRating_EventScript_NormalIntro:: @ 81A73AD
PokedexRating_EventScript_ShowRatingMsg:: @ 81A73B6
copyvar VAR_0x8004, VAR_0x8009
- special Special_GetProfOaksRatingMessage
+ special GetProfOaksRatingMessage
waitmessage
compare VAR_RESULT, FALSE
call_if_eq PokedexRating_EventScript_NormalFanfare
@@ -35,11 +35,11 @@ PokedexRating_EventScript_DexCompleteFanfare:: @ 81A73DC
return
PokedexRating_EventScript_Rate:: @ 81A73E0
- setvar VAR_0x8004, 31
- special HelpSystem_BackupSomeVariable
- special Special_SetSomeVariable
+ setvar VAR_0x8004, HELPCONTEXT_PC_MISC
+ special BackupHelpContext
+ special Script_SetHelpContext
setvar VAR_0x8004, 0
- specialvar VAR_RESULT, Special_GetPokedexCount
+ specialvar VAR_RESULT, GetPokedexCount
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
copyvar VAR_0x800A, VAR_RESULT
@@ -51,7 +51,7 @@ PokedexRating_EventScript_Rate:: @ 81A73E0
compare VAR_0x800A, FALSE
goto_if_eq PokedexRating_EventScript_EndRating @ National Dex not enabled
setvar VAR_0x8004, 1
- specialvar VAR_RESULT, Special_GetPokedexCount
+ specialvar VAR_RESULT, GetPokedexCount
copyvar VAR_0x8008, VAR_0x8005
copyvar VAR_0x8009, VAR_0x8006
getnumberstring 0, VAR_0x8008 @ Num National Seen
@@ -80,5 +80,5 @@ PokedexRating_EventScript_DexComplete:: @ 81A747E
end
PokedexRating_EventScript_EndRating:: @ 81A748F
- special HelpSystem_RestoreSomeVariable
+ special RestoreHelpContext
return
diff --git a/data/scripts/pokemon_league.inc b/data/scripts/pokemon_league.inc
index 806e0976a..65baba59a 100644
--- a/data/scripts/pokemon_league.inc
+++ b/data/scripts/pokemon_league.inc
@@ -60,5 +60,5 @@ PokemonLeague_Movement_ForcePlayerIn:: @ 81A75D3
step_end
PokemonLeague_EventScript_DoLightingEffect:: @ 81A75D5
- special Special_PokemonLeagueLightingEffect
+ special DoPokemonLeagueLightingEffect
return
diff --git a/data/scripts/questionnaire.inc b/data/scripts/questionnaire.inc
index 8e28f80db..c7636ce22 100644
--- a/data/scripts/questionnaire.inc
+++ b/data/scripts/questionnaire.inc
@@ -8,7 +8,7 @@ EventScript_Questionnaire:: @ 81A7702
call Common_ShowEasyChatScreen
lock
faceplayer
- specialvar VAR_0x8008, Special_GetMartClerkObjectId
+ specialvar VAR_0x8008, GetMartClerkObjectId
textcolor 0
compare VAR_0x8004, 0
goto_if_eq EventScript_EnableMysteryGift
diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc
index c5489d7ee..51fd0c675 100644
--- a/data/scripts/seagallop.inc
+++ b/data/scripts/seagallop.inc
@@ -138,9 +138,9 @@ VermilionCity_Movement_WalkUp:: @ 81A911C
EventScript_SeviiDestinationsPage1:: @ 81A911E
setvar VAR_0x8005, 0
- special Special_DrawSeagallopDestinationMenu
+ special DrawSeagallopDestinationMenu
waitstate
- specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination
+ specialvar VAR_0x8006, GetSelectedSeagallopDestination
switch VAR_0x8006
case SEAGALLOP_VERMILION_CITY, EventScript_SailToVermilionCity
case SEAGALLOP_ONE_ISLAND, EventScript_SailToOneIsland
@@ -153,9 +153,9 @@ EventScript_SeviiDestinationsPage1:: @ 81A911E
EventScript_SeviiDestinationsPage2:: @ 81A917F
setvar VAR_0x8005, 1
- special Special_DrawSeagallopDestinationMenu
+ special DrawSeagallopDestinationMenu
waitstate
- specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination
+ specialvar VAR_0x8006, GetSelectedSeagallopDestination
switch VAR_0x8006
case SEAGALLOP_FOUR_ISLAND, EventScript_SailToFourIsland
case SEAGALLOP_FIVE_ISLAND, EventScript_SailToFiveIsland
diff --git a/data/scripts/silphco_doors.inc b/data/scripts/silphco_doors.inc
index 5abeb2316..df619b345 100644
--- a/data/scripts/silphco_doors.inc
+++ b/data/scripts/silphco_doors.inc
@@ -9,347 +9,347 @@ EventScript_DoorUnlocked:: @ 81A813F
end
EventScript_Close2FDoor1:: @ 81A8149
- setmetatile 5, 8, 944, 1
- setmetatile 6, 8, 945, 1
- setmetatile 5, 9, 952, 1
- setmetatile 6, 9, 953, 1
- setmetatile 6, 10, 821, 0
+ setmetatile 5, 8, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
+ setmetatile 6, 8, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
+ setmetatile 5, 9, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
+ setmetatile 6, 9, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
+ setmetatile 6, 10, METATILE_SilphCo_Floor_ShadeFull, 0
return
EventScript_Close2FDoor2:: @ 81A8177
- setmetatile 5, 15, 944, 1
- setmetatile 6, 15, 945, 1
- setmetatile 5, 16, 952, 1
- setmetatile 6, 16, 953, 1
- setmetatile 6, 17, 821, 0
+ setmetatile 5, 15, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
+ setmetatile 6, 15, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
+ setmetatile 5, 16, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
+ setmetatile 6, 16, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
+ setmetatile 6, 17, METATILE_SilphCo_Floor_ShadeFull, 0
return
EventScript_Close3FDoor1:: @ 81A81A5
- setmetatile 9, 11, 960, 1
- setmetatile 10, 11, 961, 1
- setmetatile 9, 12, 962, 1
- setmetatile 10, 12, 963, 1
- setmetatile 9, 13, 964, 1
- setmetatile 10, 13, 965, 1
+ setmetatile 9, 11, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
+ setmetatile 10, 11, METATILE_SilphCo_VerticalBarrier_TopRight, 1
+ setmetatile 9, 12, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
+ setmetatile 10, 12, METATILE_SilphCo_VerticalBarrier_MidRight, 1
+ setmetatile 9, 13, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
+ setmetatile 10, 13, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
return
EventScript_Close3FDoor2:: @ 81A81DC
- setmetatile 20, 11, 960, 1
- setmetatile 21, 11, 961, 1
- setmetatile 20, 12, 962, 1
- setmetatile 21, 12, 963, 1
- setmetatile 20, 13, 964, 1
- setmetatile 21, 13, 965, 1
+ setmetatile 20, 11, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
+ setmetatile 21, 11, METATILE_SilphCo_VerticalBarrier_TopRight, 1
+ setmetatile 20, 12, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
+ setmetatile 21, 12, METATILE_SilphCo_VerticalBarrier_MidRight, 1
+ setmetatile 20, 13, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
+ setmetatile 21, 13, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
return
EventScript_Close4FDoor1:: @ 81A8213
- setmetatile 3, 16, 944, 1
- setmetatile 4, 16, 945, 1
- setmetatile 3, 17, 952, 1
- setmetatile 4, 17, 953, 1
- setmetatile 4, 18, 821, 0
+ setmetatile 3, 16, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
+ setmetatile 4, 16, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
+ setmetatile 3, 17, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
+ setmetatile 4, 17, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
+ setmetatile 4, 18, METATILE_SilphCo_Floor_ShadeFull, 0
return
EventScript_Close4FDoor2:: @ 81A8241
- setmetatile 14, 11, 944, 1
- setmetatile 15, 11, 945, 1
- setmetatile 14, 12, 952, 1
- setmetatile 15, 12, 953, 1
- setmetatile 15, 13, 821, 0
+ setmetatile 14, 11, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
+ setmetatile 15, 11, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
+ setmetatile 14, 12, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
+ setmetatile 15, 12, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
+ setmetatile 15, 13, METATILE_SilphCo_Floor_ShadeFull, 0
return
-EventScript_Close5FDoor1:: @ 81A826F
- setmetatile 7, 8, 960, 1
- setmetatile 8, 8, 961, 1
- setmetatile 7, 9, 962, 1
- setmetatile 8, 9, 963, 1
- setmetatile 7, 10, 964, 1
- setmetatile 8, 10, 965, 1
+EventScript_Close5FDoor1:: @ 81AMETATILE_SilphCo_Floor_WallRightCornerF
+ setmetatile 7, 8, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
+ setmetatile 8, 8, METATILE_SilphCo_VerticalBarrier_TopRight, 1
+ setmetatile 7, 9, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
+ setmetatile 8, 9, METATILE_SilphCo_VerticalBarrier_MidRight, 1
+ setmetatile 7, 10, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
+ setmetatile 8, 10, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
return
EventScript_Close5FDoor2:: @ 81A82A6
- setmetatile 7, 17, 960, 1
- setmetatile 8, 17, 961, 1
- setmetatile 7, 18, 962, 1
- setmetatile 8, 18, 963, 1
- setmetatile 7, 19, 964, 1
- setmetatile 8, 19, 965, 1
+ setmetatile 7, 17, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
+ setmetatile 8, 17, METATILE_SilphCo_VerticalBarrier_TopRight, 1
+ setmetatile 7, 18, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
+ setmetatile 8, 18, METATILE_SilphCo_VerticalBarrier_MidRight, 1
+ setmetatile 7, 19, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
+ setmetatile 8, 19, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
return
EventScript_Close5FDoor3:: @ 81A82DD
- setmetatile 18, 12, 960, 1
- setmetatile 19, 12, 961, 1
- setmetatile 18, 13, 962, 1
- setmetatile 19, 13, 963, 1
- setmetatile 18, 14, 964, 1
- setmetatile 19, 14, 965, 1
+ setmetatile 18, 12, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
+ setmetatile 19, 12, METATILE_SilphCo_VerticalBarrier_TopRight, 1
+ setmetatile 18, 13, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
+ setmetatile 19, 13, METATILE_SilphCo_VerticalBarrier_MidRight, 1
+ setmetatile 18, 14, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
+ setmetatile 19, 14, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
return
EventScript_Close6FDoor:: @ 81A8314
- setmetatile 5, 14, 960, 1
- setmetatile 6, 14, 961, 1
- setmetatile 5, 15, 962, 1
- setmetatile 6, 15, 963, 1
- setmetatile 5, 16, 964, 1
- setmetatile 6, 16, 965, 1
+ setmetatile 5, 14, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
+ setmetatile 6, 14, METATILE_SilphCo_VerticalBarrier_TopRight, 1
+ setmetatile 5, 15, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
+ setmetatile 6, 15, METATILE_SilphCo_VerticalBarrier_MidRight, 1
+ setmetatile 5, 16, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
+ setmetatile 6, 16, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
return
EventScript_Close7FDoor1:: @ 81A834B
- setmetatile 11, 8, 944, 1
- setmetatile 12, 8, 945, 1
- setmetatile 11, 9, 952, 1
- setmetatile 12, 9, 953, 1
- setmetatile 12, 10, 821, 0
+ setmetatile 11, 8, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
+ setmetatile 12, 8, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
+ setmetatile 11, 9, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
+ setmetatile 12, 9, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
+ setmetatile 12, 10, METATILE_SilphCo_Floor_ShadeFull, 0
return
EventScript_Close7FDoor2:: @ 81A8379
- setmetatile 24, 7, 944, 1
- setmetatile 25, 7, 945, 1
- setmetatile 24, 8, 952, 1
- setmetatile 25, 8, 953, 1
- setmetatile 25, 9, 821, 0
+ setmetatile 24, 7, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
+ setmetatile 25, 7, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
+ setmetatile 24, 8, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
+ setmetatile 25, 8, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
+ setmetatile 25, 9, METATILE_SilphCo_Floor_ShadeFull, 0
return
EventScript_Close7FDoor3:: @ 81A83A7
- setmetatile 25, 13, 944, 1
- setmetatile 26, 13, 945, 1
- setmetatile 25, 14, 952, 1
- setmetatile 26, 14, 953, 1
- setmetatile 26, 15, 821, 0
+ setmetatile 25, 13, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
+ setmetatile 26, 13, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
+ setmetatile 25, 14, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
+ setmetatile 26, 14, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
+ setmetatile 26, 15, METATILE_SilphCo_Floor_ShadeFull, 0
return
EventScript_Close8FDoor:: @ 81A83D5
- setmetatile 5, 9, 960, 1
- setmetatile 6, 9, 961, 1
- setmetatile 5, 10, 962, 1
- setmetatile 6, 10, 963, 1
- setmetatile 5, 11, 964, 1
- setmetatile 6, 11, 965, 1
+ setmetatile 5, 9, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
+ setmetatile 6, 9, METATILE_SilphCo_VerticalBarrier_TopRight, 1
+ setmetatile 5, 10, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
+ setmetatile 6, 10, METATILE_SilphCo_VerticalBarrier_MidRight, 1
+ setmetatile 5, 11, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
+ setmetatile 6, 11, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
return
EventScript_Close9FDoor1:: @ 81A840C
- setmetatile 2, 9, 960, 1
- setmetatile 3, 9, 961, 1
- setmetatile 2, 10, 962, 1
- setmetatile 3, 10, 963, 1
- setmetatile 2, 11, 964, 1
- setmetatile 3, 11, 965, 1
+ setmetatile 2, 9, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
+ setmetatile 3, 9, METATILE_SilphCo_VerticalBarrier_TopRight, 1
+ setmetatile 2, 10, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
+ setmetatile 3, 10, METATILE_SilphCo_VerticalBarrier_MidRight, 1
+ setmetatile 2, 11, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
+ setmetatile 3, 11, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
return
EventScript_Close9FDoor2:: @ 81A8443
- setmetatile 12, 15, 960, 1
- setmetatile 13, 15, 961, 1
- setmetatile 12, 16, 962, 1
- setmetatile 13, 16, 963, 1
- setmetatile 12, 17, 964, 1
- setmetatile 13, 17, 965, 1
+ setmetatile 12, 15, METATILE_SilphCo_VerticalBarrier_TopLeft, 1
+ setmetatile 13, 15, METATILE_SilphCo_VerticalBarrier_TopRight, 1
+ setmetatile 12, 16, METATILE_SilphCo_VerticalBarrier_MidLeft, 1
+ setmetatile 13, 16, METATILE_SilphCo_VerticalBarrier_MidRight, 1
+ setmetatile 12, 17, METATILE_SilphCo_VerticalBarrier_BottomLeft, 1
+ setmetatile 13, 17, METATILE_SilphCo_VerticalBarrier_BottomRight, 1
return
EventScript_Close9FDoor3:: @ 81A847A
- setmetatile 21, 6, 944, 1
- setmetatile 22, 6, 945, 1
- setmetatile 21, 7, 952, 1
- setmetatile 22, 7, 953, 1
- setmetatile 22, 8, 821, 0
+ setmetatile 21, 6, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
+ setmetatile 22, 6, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
+ setmetatile 21, 7, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
+ setmetatile 22, 7, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
+ setmetatile 22, 8, METATILE_SilphCo_Floor_ShadeFull, 0
return
EventScript_Close9FDoor4:: @ 81A84A8
- setmetatile 21, 12, 944, 1
- setmetatile 22, 12, 945, 1
- setmetatile 21, 13, 952, 1
- setmetatile 22, 13, 953, 1
- setmetatile 22, 14, 821, 0
+ setmetatile 21, 12, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
+ setmetatile 22, 12, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
+ setmetatile 21, 13, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
+ setmetatile 22, 13, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
+ setmetatile 22, 14, METATILE_SilphCo_Floor_ShadeFull, 0
return
EventScript_Close10FDoor:: @ 81A84D6
- setmetatile 12, 11, 944, 1
- setmetatile 13, 11, 945, 1
- setmetatile 12, 12, 952, 1
- setmetatile 13, 12, 953, 1
- setmetatile 13, 13, 821, 0
+ setmetatile 12, 11, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
+ setmetatile 13, 11, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
+ setmetatile 12, 12, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
+ setmetatile 13, 12, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
+ setmetatile 13, 13, METATILE_SilphCo_Floor_ShadeFull, 0
return
EventScript_Close11FDoor:: @ 81A8504
- setmetatile 5, 16, 944, 1
- setmetatile 6, 16, 945, 1
- setmetatile 5, 17, 952, 1
- setmetatile 6, 17, 953, 1
- setmetatile 6, 18, 821, 0
+ setmetatile 5, 16, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1
+ setmetatile 6, 16, METATILE_SilphCo_HorizontalBarrier_TopRight, 1
+ setmetatile 5, 17, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1
+ setmetatile 6, 17, METATILE_SilphCo_HorizontalBarrier_BottomRight, 1
+ setmetatile 6, 18, METATILE_SilphCo_Floor_ShadeFull, 0
return
EventScript_Open2FDoor1:: @ 81A8532
- setmetatile 5, 8, 821, 0
- setmetatile 6, 8, 820, 0
- setmetatile 5, 9, 821, 0
- setmetatile 6, 9, 820, 0
- setmetatile 6, 10, 820, 0
+ setmetatile 5, 8, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 6, 8, METATILE_SilphCo_Floor, 0
+ setmetatile 5, 9, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 6, 9, METATILE_SilphCo_Floor, 0
+ setmetatile 6, 10, METATILE_SilphCo_Floor, 0
return
EventScript_Open2FDoor2:: @ 81A8560
- setmetatile 5, 15, 821, 0
- setmetatile 6, 15, 820, 0
- setmetatile 5, 16, 821, 0
- setmetatile 6, 16, 820, 0
- setmetatile 6, 17, 820, 0
+ setmetatile 5, 15, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 6, 15, METATILE_SilphCo_Floor, 0
+ setmetatile 5, 16, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 6, 16, METATILE_SilphCo_Floor, 0
+ setmetatile 6, 17, METATILE_SilphCo_Floor, 0
return
EventScript_Open3FDoor1:: @ 81A858E
- setmetatile 9, 11, 839, 1
- setmetatile 10, 11, 838, 1
- setmetatile 9, 12, 821, 0
- setmetatile 10, 12, 821, 0
- setmetatile 9, 13, 825, 0
- setmetatile 10, 13, 826, 0
+ setmetatile 9, 11, METATILE_SilphCo_Wall_LeftEdge, 1
+ setmetatile 10, 11, METATILE_SilphCo_Wall_RightEdge, 1
+ setmetatile 9, 12, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 10, 12, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 9, 13, METATILE_SilphCo_Floor_WallLeftCorner, 0
+ setmetatile 10, 13, METATILE_SilphCo_Floor_WallRightCorner, 0
return
EventScript_Open3FDoor2:: @ 81A85C5
- setmetatile 20, 11, 839, 1
- setmetatile 21, 11, 838, 1
- setmetatile 20, 12, 821, 0
- setmetatile 21, 12, 821, 0
- setmetatile 20, 13, 825, 0
- setmetatile 21, 13, 826, 0
+ setmetatile 20, 11, METATILE_SilphCo_Wall_LeftEdge, 1
+ setmetatile 21, 11, METATILE_SilphCo_Wall_RightEdge, 1
+ setmetatile 20, 12, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 21, 12, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 20, 13, METATILE_SilphCo_Floor_WallLeftCorner, 0
+ setmetatile 21, 13, METATILE_SilphCo_Floor_WallRightCorner, 0
return
EventScript_Open4FDoor1:: @ 81A85FC
- setmetatile 3, 16, 821, 0
- setmetatile 4, 16, 820, 0
- setmetatile 3, 17, 821, 0
- setmetatile 4, 17, 820, 0
- setmetatile 4, 18, 820, 0
+ setmetatile 3, 16, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 4, 16, METATILE_SilphCo_Floor, 0
+ setmetatile 3, 17, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 4, 17, METATILE_SilphCo_Floor, 0
+ setmetatile 4, 18, METATILE_SilphCo_Floor, 0
return
EventScript_Open4FDoor2:: @ 81A862A
- setmetatile 14, 11, 821, 0
- setmetatile 15, 11, 820, 0
- setmetatile 14, 12, 821, 0
- setmetatile 15, 12, 820, 0
- setmetatile 15, 13, 820, 0
+ setmetatile 14, 11, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 15, 11, METATILE_SilphCo_Floor, 0
+ setmetatile 14, 12, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 15, 12, METATILE_SilphCo_Floor, 0
+ setmetatile 15, 13, METATILE_SilphCo_Floor, 0
return
EventScript_Open5FDoor1:: @ 81A8658
- setmetatile 7, 8, 839, 1
- setmetatile 8, 8, 838, 1
- setmetatile 7, 9, 821, 0
- setmetatile 8, 9, 821, 0
- setmetatile 7, 10, 825, 0
- setmetatile 8, 10, 826, 0
+ setmetatile 7, 8, METATILE_SilphCo_Wall_LeftEdge, 1
+ setmetatile 8, 8, METATILE_SilphCo_Wall_RightEdge, 1
+ setmetatile 7, 9, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 8, 9, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 7, 10, METATILE_SilphCo_Floor_WallLeftCorner, 0
+ setmetatile 8, 10, METATILE_SilphCo_Floor_WallRightCorner, 0
return
EventScript_Open5FDoor2:: @ 81A868F
- setmetatile 7, 17, 839, 1
- setmetatile 8, 17, 838, 1
- setmetatile 7, 18, 821, 0
- setmetatile 8, 18, 821, 0
- setmetatile 7, 19, 825, 0
- setmetatile 8, 19, 826, 0
+ setmetatile 7, 17, METATILE_SilphCo_Wall_LeftEdge, 1
+ setmetatile 8, 17, METATILE_SilphCo_Wall_RightEdge, 1
+ setmetatile 7, 18, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 8, 18, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 7, 19, METATILE_SilphCo_Floor_WallLeftCorner, 0
+ setmetatile 8, 19, METATILE_SilphCo_Floor_WallRightCorner, 0
return
EventScript_Open5FDoor3:: @ 81A86C6
- setmetatile 18, 12, 839, 1
- setmetatile 19, 12, 838, 1
- setmetatile 18, 13, 821, 0
- setmetatile 19, 13, 821, 0
- setmetatile 18, 14, 825, 0
- setmetatile 19, 14, 826, 0
+ setmetatile 18, 12, METATILE_SilphCo_Wall_LeftEdge, 1
+ setmetatile 19, 12, METATILE_SilphCo_Wall_RightEdge, 1
+ setmetatile 18, 13, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 19, 13, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 18, 14, METATILE_SilphCo_Floor_WallLeftCorner, 0
+ setmetatile 19, 14, METATILE_SilphCo_Floor_WallRightCorner, 0
return
EventScript_Open6FDoor:: @ 81A86FD
- setmetatile 5, 14, 839, 1
- setmetatile 6, 14, 838, 1
- setmetatile 5, 15, 821, 0
- setmetatile 6, 15, 821, 0
- setmetatile 5, 16, 825, 0
- setmetatile 6, 16, 826, 0
+ setmetatile 5, 14, METATILE_SilphCo_Wall_LeftEdge, 1
+ setmetatile 6, 14, METATILE_SilphCo_Wall_RightEdge, 1
+ setmetatile 5, 15, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 6, 15, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 5, 16, METATILE_SilphCo_Floor_WallLeftCorner, 0
+ setmetatile 6, 16, METATILE_SilphCo_Floor_WallRightCorner, 0
return
EventScript_Open7FDoor1:: @ 81A8734
- setmetatile 11, 8, 821, 0
- setmetatile 12, 8, 820, 0
- setmetatile 11, 9, 821, 0
- setmetatile 12, 9, 820, 0
- setmetatile 12, 10, 820, 0
+ setmetatile 11, 8, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 12, 8, METATILE_SilphCo_Floor, 0
+ setmetatile 11, 9, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 12, 9, METATILE_SilphCo_Floor, 0
+ setmetatile 12, 10, METATILE_SilphCo_Floor, 0
return
EventScript_Open7FDoor2:: @ 81A8762
- setmetatile 24, 7, 821, 0
- setmetatile 25, 7, 820, 0
- setmetatile 24, 8, 821, 0
- setmetatile 25, 8, 820, 0
- setmetatile 25, 9, 820, 0
+ setmetatile 24, 7, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 25, 7, METATILE_SilphCo_Floor, 0
+ setmetatile 24, 8, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 25, 8, METATILE_SilphCo_Floor, 0
+ setmetatile 25, 9, METATILE_SilphCo_Floor, 0
return
EventScript_Open7FDoor3:: @ 81A8790
- setmetatile 25, 13, 821, 0
- setmetatile 26, 13, 820, 0
- setmetatile 25, 14, 821, 0
- setmetatile 26, 14, 820, 0
- setmetatile 26, 15, 820, 0
+ setmetatile 25, 13, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 26, 13, METATILE_SilphCo_Floor, 0
+ setmetatile 25, 14, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 26, 14, METATILE_SilphCo_Floor, 0
+ setmetatile 26, 15, METATILE_SilphCo_Floor, 0
return
EventScript_Open8FDoor:: @ 81A87BE
- setmetatile 5, 9, 839, 1
- setmetatile 6, 9, 838, 1
- setmetatile 5, 10, 821, 0
- setmetatile 6, 10, 821, 0
- setmetatile 5, 11, 825, 0
- setmetatile 6, 11, 826, 0
+ setmetatile 5, 9, METATILE_SilphCo_Wall_LeftEdge, 1
+ setmetatile 6, 9, METATILE_SilphCo_Wall_RightEdge, 1
+ setmetatile 5, 10, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 6, 10, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 5, 11, METATILE_SilphCo_Floor_WallLeftCorner, 0
+ setmetatile 6, 11, METATILE_SilphCo_Floor_WallRightCorner, 0
return
EventScript_Open9FDoor1:: @ 81A87F5
- setmetatile 2, 9, 839, 1
- setmetatile 3, 9, 838, 1
- setmetatile 2, 10, 821, 0
- setmetatile 3, 10, 821, 0
- setmetatile 2, 11, 825, 0
- setmetatile 3, 11, 826, 0
+ setmetatile 2, 9, METATILE_SilphCo_Wall_LeftEdge, 1
+ setmetatile 3, 9, METATILE_SilphCo_Wall_RightEdge, 1
+ setmetatile 2, 10, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 3, 10, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 2, 11, METATILE_SilphCo_Floor_WallLeftCorner, 0
+ setmetatile 3, 11, METATILE_SilphCo_Floor_WallRightCorner, 0
return
EventScript_Open9FDoor2:: @ 81A882C
- setmetatile 12, 15, 839, 1
- setmetatile 13, 15, 838, 1
- setmetatile 12, 16, 821, 0
- setmetatile 13, 16, 821, 0
- setmetatile 12, 17, 825, 0
- setmetatile 13, 17, 826, 0
+ setmetatile 12, 15, METATILE_SilphCo_Wall_LeftEdge, 1
+ setmetatile 13, 15, METATILE_SilphCo_Wall_RightEdge, 1
+ setmetatile 12, 16, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 13, 16, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 12, 17, METATILE_SilphCo_Floor_WallLeftCorner, 0
+ setmetatile 13, 17, METATILE_SilphCo_Floor_WallRightCorner, 0
return
EventScript_Open9FDoor3:: @ 81A8863
- setmetatile 21, 6, 821, 0
- setmetatile 22, 6, 820, 0
- setmetatile 21, 7, 821, 0
- setmetatile 22, 7, 820, 0
- setmetatile 22, 8, 820, 0
+ setmetatile 21, 6, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 22, 6, METATILE_SilphCo_Floor, 0
+ setmetatile 21, 7, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 22, 7, METATILE_SilphCo_Floor, 0
+ setmetatile 22, 8, METATILE_SilphCo_Floor, 0
return
EventScript_Open9FDoor4:: @ 81A8891
- setmetatile 21, 12, 821, 0
- setmetatile 22, 12, 820, 0
- setmetatile 21, 13, 821, 0
- setmetatile 22, 13, 820, 0
- setmetatile 22, 14, 820, 0
+ setmetatile 21, 12, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 22, 12, METATILE_SilphCo_Floor, 0
+ setmetatile 21, 13, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 22, 13, METATILE_SilphCo_Floor, 0
+ setmetatile 22, 14, METATILE_SilphCo_Floor, 0
return
EventScript_Open10FDoor:: @ 81A88BF
- setmetatile 12, 11, 821, 0
- setmetatile 13, 11, 820, 0
- setmetatile 12, 12, 821, 0
- setmetatile 13, 12, 820, 0
- setmetatile 13, 13, 820, 0
+ setmetatile 12, 11, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 13, 11, METATILE_SilphCo_Floor, 0
+ setmetatile 12, 12, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 13, 12, METATILE_SilphCo_Floor, 0
+ setmetatile 13, 13, METATILE_SilphCo_Floor, 0
return
EventScript_Open11FDoor:: @ 81A88ED
- setmetatile 5, 16, 821, 0
- setmetatile 6, 16, 820, 0
- setmetatile 5, 17, 821, 0
- setmetatile 6, 17, 820, 0
- setmetatile 6, 18, 820, 0
+ setmetatile 5, 16, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 6, 16, METATILE_SilphCo_Floor, 0
+ setmetatile 5, 17, METATILE_SilphCo_Floor_ShadeFull, 0
+ setmetatile 6, 17, METATILE_SilphCo_Floor, 0
+ setmetatile 6, 18, METATILE_SilphCo_Floor, 0
return
SilphCo_2F_EventScript_Door1:: @ 81A891B
lockall
setvar VAR_TEMP_1, 1
- setvar VAR_0x8004, 634
+ setvar VAR_0x8004, FLAG_SILPH_2F_DOOR_1
goto_if_set FLAG_SILPH_2F_DOOR_1, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -357,7 +357,7 @@ SilphCo_2F_EventScript_Door1:: @ 81A891B
SilphCo_2F_EventScript_Door2:: @ 81A8935
lockall
setvar VAR_TEMP_1, 2
- setvar VAR_0x8004, 635
+ setvar VAR_0x8004, FLAG_SILPH_2F_DOOR_2
goto_if_set FLAG_SILPH_2F_DOOR_2, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -365,7 +365,7 @@ SilphCo_2F_EventScript_Door2:: @ 81A8935
SilphCo_3F_EventScript_Door1:: @ 81A894F
lockall
setvar VAR_TEMP_1, 3
- setvar VAR_0x8004, 636
+ setvar VAR_0x8004, FLAG_SILPH_3F_DOOR_1
goto_if_set FLAG_SILPH_3F_DOOR_1, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -373,7 +373,7 @@ SilphCo_3F_EventScript_Door1:: @ 81A894F
SilphCo_3F_EventScript_Door2:: @ 81A8969
lockall
setvar VAR_TEMP_1, 4
- setvar VAR_0x8004, 637
+ setvar VAR_0x8004, FLAG_SILPH_3F_DOOR_2
goto_if_set FLAG_SILPH_3F_DOOR_2, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -381,7 +381,7 @@ SilphCo_3F_EventScript_Door2:: @ 81A8969
SilphCo_4F_EventScript_Door1:: @ 81A8983
lockall
setvar VAR_TEMP_1, 5
- setvar VAR_0x8004, 638
+ setvar VAR_0x8004, FLAG_SILPH_4F_DOOR_1
goto_if_set FLAG_SILPH_4F_DOOR_1, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -389,7 +389,7 @@ SilphCo_4F_EventScript_Door1:: @ 81A8983
SilphCo_4F_EventScript_Door2:: @ 81A899D
lockall
setvar VAR_TEMP_1, 6
- setvar VAR_0x8004, 639
+ setvar VAR_0x8004, FLAG_SILPH_4F_DOOR_2
goto_if_set FLAG_SILPH_4F_DOOR_2, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -397,7 +397,7 @@ SilphCo_4F_EventScript_Door2:: @ 81A899D
SilphCo_5F_EventScript_Door1:: @ 81A89B7
lockall
setvar VAR_TEMP_1, 7
- setvar VAR_0x8004, 640
+ setvar VAR_0x8004, FLAG_SILPH_5F_DOOR_1
goto_if_set FLAG_SILPH_5F_DOOR_1, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -405,7 +405,7 @@ SilphCo_5F_EventScript_Door1:: @ 81A89B7
SilphCo_5F_EventScript_Door2:: @ 81A89D1
lockall
setvar VAR_TEMP_1, 8
- setvar VAR_0x8004, 641
+ setvar VAR_0x8004, FLAG_SILPH_5F_DOOR_2
goto_if_set FLAG_SILPH_5F_DOOR_2, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -413,7 +413,7 @@ SilphCo_5F_EventScript_Door2:: @ 81A89D1
SilphCo_5F_EventScript_Door3:: @ 81A89EB
lockall
setvar VAR_TEMP_1, 9
- setvar VAR_0x8004, 642
+ setvar VAR_0x8004, FLAG_SILPH_5F_DOOR_3
goto_if_set FLAG_SILPH_5F_DOOR_3, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -421,7 +421,7 @@ SilphCo_5F_EventScript_Door3:: @ 81A89EB
SilphCo_6F_EventScript_Door:: @ 81A8A05
lockall
setvar VAR_TEMP_1, 10
- setvar VAR_0x8004, 643
+ setvar VAR_0x8004, FLAG_SILPH_6F_DOOR
goto_if_set FLAG_SILPH_6F_DOOR, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -429,7 +429,7 @@ SilphCo_6F_EventScript_Door:: @ 81A8A05
SilphCo_7F_EventScript_Door1:: @ 81A8A1F
lockall
setvar VAR_TEMP_1, 11
- setvar VAR_0x8004, 644
+ setvar VAR_0x8004, FLAG_SILPH_7F_DOOR_1
goto_if_set FLAG_SILPH_7F_DOOR_1, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -437,7 +437,7 @@ SilphCo_7F_EventScript_Door1:: @ 81A8A1F
SilphCo_7F_EventScript_Door2:: @ 81A8A39
lockall
setvar VAR_TEMP_1, 12
- setvar VAR_0x8004, 645
+ setvar VAR_0x8004, FLAG_SILPH_7F_DOOR_2
goto_if_set FLAG_SILPH_7F_DOOR_2, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -445,7 +445,7 @@ SilphCo_7F_EventScript_Door2:: @ 81A8A39
SilphCo_7F_EventScript_Door3:: @ 81A8A53
lockall
setvar VAR_TEMP_1, 13
- setvar VAR_0x8004, 646
+ setvar VAR_0x8004, FLAG_SILPH_7F_DOOR_3
goto_if_set FLAG_SILPH_7F_DOOR_3, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -453,7 +453,7 @@ SilphCo_7F_EventScript_Door3:: @ 81A8A53
SilphCo_8F_EventScript_Door:: @ 81A8A6D
lockall
setvar VAR_TEMP_1, 14
- setvar VAR_0x8004, 647
+ setvar VAR_0x8004, FLAG_SILPH_8F_DOOR
goto_if_set FLAG_SILPH_8F_DOOR, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -461,7 +461,7 @@ SilphCo_8F_EventScript_Door:: @ 81A8A6D
SilphCo_9F_EventScript_Door1:: @ 81A8A87
lockall
setvar VAR_TEMP_1, 15
- setvar VAR_0x8004, 648
+ setvar VAR_0x8004, FLAG_SILPH_9F_DOOR_1
goto_if_set FLAG_SILPH_9F_DOOR_1, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -469,7 +469,7 @@ SilphCo_9F_EventScript_Door1:: @ 81A8A87
SilphCo_9F_EventScript_Door2:: @ 81A8AA1
lockall
setvar VAR_TEMP_1, 16
- setvar VAR_0x8004, 649
+ setvar VAR_0x8004, FLAG_SILPH_9F_DOOR_2
goto_if_set FLAG_SILPH_9F_DOOR_2, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -477,7 +477,7 @@ SilphCo_9F_EventScript_Door2:: @ 81A8AA1
SilphCo_9F_EventScript_Door3:: @ 81A8ABB
lockall
setvar VAR_TEMP_1, 17
- setvar VAR_0x8004, 650
+ setvar VAR_0x8004, FLAG_SILPH_9F_DOOR_3
goto_if_set FLAG_SILPH_9F_DOOR_3, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -485,7 +485,7 @@ SilphCo_9F_EventScript_Door3:: @ 81A8ABB
SilphCo_9F_EventScript_Door4:: @ 81A8AD5
lockall
setvar VAR_TEMP_1, 18
- setvar VAR_0x8004, 651
+ setvar VAR_0x8004, FLAG_SILPH_9F_DOOR_4
goto_if_set FLAG_SILPH_9F_DOOR_4, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -493,7 +493,7 @@ SilphCo_9F_EventScript_Door4:: @ 81A8AD5
SilphCo_10F_EventScript_Door:: @ 81A8AEF
lockall
setvar VAR_TEMP_1, 19
- setvar VAR_0x8004, 652
+ setvar VAR_0x8004, FLAG_SILPH_10F_DOOR
goto_if_set FLAG_SILPH_10F_DOOR, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -501,7 +501,7 @@ SilphCo_10F_EventScript_Door:: @ 81A8AEF
SilphCo_11F_EventScript_Door:: @ 81A8B09
lockall
setvar VAR_TEMP_1, 20
- setvar VAR_0x8004, 653
+ setvar VAR_0x8004, FLAG_SILPH_11F_DOOR
goto_if_set FLAG_SILPH_11F_DOOR, EventScript_DoorUnlocked
goto EventScript_TryUnlockDoor
end
@@ -559,6 +559,6 @@ EventScript_OpenDoor:: @ 81A8B32
playse SE_KI_GASYAN
special DrawWholeMapView
waitse
- special Special_SetHiddenItemFlag
+ special SetHiddenItemFlag
releaseall
end
diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc
index ccb279300..6a5dc3345 100644
--- a/data/scripts/trainer_battle.inc
+++ b/data/scripts/trainer_battle.inc
@@ -1,143 +1,142 @@
-gUnknown_81A4EB4:: @ 81A4EB4
+EventScript_DoTrainerBattleFromApproach:: @ 81A4EB4
lock
special PlayTrainerEncounterMusic
- special ScrSpecial_EndTrainerApproach
+ special EndTrainerApproach
waitstate
- goto EventScript_1A4FC7
+ goto EventScript_DoTrainerBattle
EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1
lock
faceplayer
- applymovement VAR_LAST_TALKED, Movement_1A4FC5
+ applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0
- specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
- compare VAR_RESULT, 0
- goto_if_ne EventScript_1A4EE8
+ specialvar VAR_RESULT, Script_HasTrainerBeenFought
+ compare VAR_RESULT, FALSE
+ goto_if_ne EventScript_NoTrainerBattle
special PlayTrainerEncounterMusic
special SetUpTrainerMovement
- goto EventScript_1A4FC7
+ goto EventScript_DoTrainerBattle
-EventScript_1A4EE8:: @ 81A4EE8
+EventScript_NoTrainerBattle:: @ 81A4EE8
ontrainerbattleend
EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9
lock
faceplayer
- call EventScript_1A4FBA
- specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
- compare VAR_RESULT, 0
- goto_if_ne EventScript_1A4F20
+ call EventScript_RevealTrainer
+ specialvar VAR_RESULT, Script_HasTrainerBeenFought
+ compare VAR_RESULT, FALSE
+ goto_if_ne EventScript_NoDoubleTrainerBattle
special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
- goto_if_ne EventScript_1A4F19
+ goto_if_ne EventScript_NotEnoughMonsForDoubleBattle
special PlayTrainerEncounterMusic
special SetUpTrainerMovement
- goto EventScript_1A4FC7
+ goto EventScript_DoTrainerBattle
-EventScript_1A4F19:: @ 81A4F19
- special ScrSpecial_ShowTrainerNonBattlingSpeech
+EventScript_NotEnoughMonsForDoubleBattle:: @ 81A4F19
+ special ShowTrainerCantBattleSpeech
waitmessage
waitbuttonpress
release
end
-EventScript_1A4F20:: @ 81A4F20
+EventScript_NoDoubleTrainerBattle:: @ 81A4F20
ontrainerbattleend
-EventScript_DoTrainerBattle:: @ 81A4F21
- applymovement VAR_LAST_TALKED, Movement_1A4FC5
+EventScript_DoNoIntroTrainerBattle:: @ 81A4F21
+ applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0
special PlayTrainerEncounterMusic
- goto_if_questlog EventScript_1A501A
+ goto_if_questlog EventScript_EndQuestLogBattle
battlebegin
ontrainerbattleend
EventScript_TryDoRematchBattle:: @ 81A4F3E
- call EventScript_1A4FBA
- specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag
- compare VAR_RESULT, 0
- goto_if_eq EventScript_1A4F72
+ call EventScript_RevealTrainer
+ specialvar VAR_RESULT, IsTrainerReadyForRematch
+ compare VAR_RESULT, FALSE
+ goto_if_eq EventScript_NoRematchBattle
special PlayTrainerEncounterMusic
special SetUpTrainerMovement
- special ScrSpecial_ShowTrainerIntroSpeech
+ special ShowTrainerIntroSpeech
waitmessage
waitbuttonpress
- goto_if_questlog EventScript_1A4FB8
- special ScrSpecial_StartTrainerEyeRematch
+ goto_if_questlog EventScript_EndQuestLogRematch
+ special StartRematchBattle
waitstate
releaseall
end
-EventScript_1A4F72:: @ 81A4F72
+EventScript_NoRematchBattle:: @ 81A4F72
ontrainerbattleend
EventScript_TryDoDoubleRematchBattle:: @ 81A4F73
- specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag
- compare VAR_RESULT, 0
- goto_if_eq EventScript_1A4FB0
+ specialvar VAR_RESULT, IsTrainerReadyForRematch
+ compare VAR_RESULT, FALSE
+ goto_if_eq EventScript_NoDoubleRematchBattle
special HasEnoughMonsForDoubleBattle
compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
- goto_if_ne EventScript_1A4FB1
+ goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle
special PlayTrainerEncounterMusic
special SetUpTrainerMovement
- special ScrSpecial_ShowTrainerIntroSpeech
+ special ShowTrainerIntroSpeech
waitmessage
waitbuttonpress
- goto_if_questlog EventScript_1A4FB8
- special ScrSpecial_StartTrainerEyeRematch
+ goto_if_questlog EventScript_EndQuestLogRematch
+ special StartRematchBattle
waitstate
releaseall
end
-EventScript_1A4FB0:: @ 81A4FB0
+EventScript_NoDoubleRematchBattle:: @ 81A4FB0
ontrainerbattleend
-EventScript_1A4FB1:: @ 81A4FB1
- special ScrSpecial_ShowTrainerNonBattlingSpeech
+EventScript_NotEnoughMonsForDoubleRematchBattle:: @ 81A4FB1
+ special ShowTrainerCantBattleSpeech
waitmessage
waitbuttonpress
release
end
-EventScript_1A4FB8:: @ 81A4FB8
+EventScript_EndQuestLogRematch:: @ 81A4FB8
releaseall
end
-EventScript_1A4FBA:: @ 81A4FBA
- applymovement VAR_LAST_TALKED, Movement_1A4FC5
+EventScript_RevealTrainer:: @ 81A4FBA
+ applymovement VAR_LAST_TALKED, Movement_RevealTrainer
waitmovement 0
return
-Movement_1A4FC5:: @ 81A4FC5
- step_67
+Movement_RevealTrainer:: @ 81A4FC5
+ reveal_trainer
step_end
-EventScript_1A4FC7:: @ 81A4FC7
- special ScrSpecial_ShowTrainerIntroSpeech
+EventScript_DoTrainerBattle:: @ 81A4FC7
+ special ShowTrainerIntroSpeech
waitmessage
waitbuttonpress
- goto_if_questlog EventScript_1A501A
+ goto_if_questlog EventScript_EndQuestLogBattle
battlebegin
- specialvar VAR_RESULT, ScrSpecial_GetTrainerBattleMode
- compare VAR_RESULT, 0
- goto_if_eq EventScript_1A5017
- compare VAR_RESULT, 2
- goto_if_eq EventScript_1A5019
- compare VAR_RESULT, 1
- goto_if_eq EventScript_1A5019
- compare VAR_RESULT, 6
- goto_if_eq EventScript_1A5019
- compare VAR_RESULT, 8
- goto_if_eq EventScript_1A5019
-
-EventScript_1A5017:: @ 81A5017
+ specialvar VAR_RESULT, GetTrainerBattleMode
+ compare VAR_RESULT, TRAINER_BATTLE_SINGLE
+ goto_if_eq EventScript_EndTrainerBattle
+ compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT
+ goto_if_eq EventScript_EndTrainerBattleContinueScript
+ compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC
+ goto_if_eq EventScript_EndTrainerBattleContinueScript
+ compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE
+ goto_if_eq EventScript_EndTrainerBattleContinueScript
+ compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC
+ goto_if_eq EventScript_EndTrainerBattleContinueScript
+EventScript_EndTrainerBattle:: @ 81A5017
releaseall
end
-EventScript_1A5019:: @ 81A5019
+EventScript_EndTrainerBattleContinueScript:: @ 81A5019
ontrainerbattleendgoto
-EventScript_1A501A:: @ 81A501A
+EventScript_EndQuestLogBattle:: @ 81A501A
special SetBattledTrainerFlag
releaseall
end
diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc
index 39589cffa..993db55bc 100644
--- a/data/scripts/trainer_card.inc
+++ b/data/scripts/trainer_card.inc
@@ -47,7 +47,7 @@ CeladonCity_GameCorner_EventScript_PrintPhoto:: @ 81B2907
playse MUS_ME_PHOTO
dofieldeffect FLDEFF_UNK_45
delay 60
- special Special_UpdateTrainerCardPhotoIcons
+ special UpdateTrainerCardPhotoIcons
msgbox CeladonCity_GameCorner_Text_PrintIsReadyCheckTrainerCard
hidemoneybox 0, 0
releaseall
@@ -68,7 +68,7 @@ FourIsland_House2_EventScript_StickerMan:: @ 81B2938
lock
specialvar VAR_0x8008, StickerManGetBragFlags
goto_if_unset FLAG_MET_STICKER_MAN, FourIsland_House2_EventScript_MeetStickerMan
- goto_if_set FLAG_MET_STICKER_MAN, EventScript_1B2994
+ goto_if_set FLAG_MET_STICKER_MAN, FourIsland_House2_EventScript_StickerManAskForBrag
end
FourIsland_House2_EventScript_MeetStickerMan:: @ 81B2951
@@ -88,19 +88,19 @@ FourIsland_House2_EventScript_MeetStickerMan:: @ 81B2951
goto FourIsland_House2_EventScript_ChooseBrag
end
-EventScript_1B2994:: @ 81B2994
+FourIsland_House2_EventScript_StickerManAskForBrag:: @ 81B2994
applymovement 1, Movement_FacePlayer
waitmovement 0
goto_if_questlog EventScript_ReleaseEnd
special sub_8112364
compare VAR_0x8008, 0
- goto_if_eq EventScript_1B29C6
+ goto_if_eq FourIsland_House2_EventScript_NothingToBragAbout
message FourIsland_House2_Text_BragAboutWhatToday
waitmessage
goto FourIsland_House2_EventScript_ChooseBrag
end
-EventScript_1B29C6:: @ 81B29C6
+FourIsland_House2_EventScript_NothingToBragAbout:: @ 81B29C6
msgbox FourIsland_House2_Text_BragAboutSomethingForMe
release
end
diff --git a/data/scripts/white_out.inc b/data/scripts/white_out.inc
index b961a6cf2..2758737bc 100644
--- a/data/scripts/white_out.inc
+++ b/data/scripts/white_out.inc
@@ -55,7 +55,7 @@ EventScript_FieldWhiteOutNoMoney:: @ 81A8E2E
end
EventScript_FieldWhiteOutHasMoney:: @ 81A8E3C
- special Special_OverworldWhiteOutGetMoneyLoss
+ special OverworldWhiteOutGetMoneyLoss
msgbox Text_WhitedOutLostMoney
goto EventScript_FieldWhiteOutFade
end
@@ -64,6 +64,6 @@ EventScript_FieldWhiteOutFade:: @ 81A8E4D
special Script_FadeOutMapMusic
waitstate
fadescreen FADE_TO_BLACK
- special SetCB2Whiteout
+ special SetCB2WhiteOut
waitstate
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 22:20:53 +0000