Merge branch 'master' into fix-eventobj
This commit is contained in:
@@ -296,32 +296,32 @@ LilycoveCity_EventScript_DeclineBrendanBattle:: @ 81E2ECD
|
||||
end
|
||||
|
||||
LilycoveCity_EventScript_BattleMayTreecko:: @ 81E2EDE
|
||||
trainerbattle_no_intro TRAINER_MAY_12, LilycoveCity_Text_MayDefeat
|
||||
trainerbattle_no_intro TRAINER_MAY_LILYCOVE_TREECKO, LilycoveCity_Text_MayDefeat
|
||||
goto LilycoveCity_EventScript_DefeatedMay
|
||||
end
|
||||
|
||||
LilycoveCity_EventScript_BattleMayTorchic:: @ 81E2EEE
|
||||
trainerbattle_no_intro TRAINER_MAY_13, LilycoveCity_Text_MayDefeat
|
||||
trainerbattle_no_intro TRAINER_MAY_LILYCOVE_TORCHIC, LilycoveCity_Text_MayDefeat
|
||||
goto LilycoveCity_EventScript_DefeatedMay
|
||||
end
|
||||
|
||||
LilycoveCity_EventScript_BattleMayMudkip:: @ 81E2EFE
|
||||
trainerbattle_no_intro TRAINER_MAY_11, LilycoveCity_Text_MayDefeat
|
||||
trainerbattle_no_intro TRAINER_MAY_LILYCOVE_MUDKIP, LilycoveCity_Text_MayDefeat
|
||||
goto LilycoveCity_EventScript_DefeatedMay
|
||||
end
|
||||
|
||||
LilycoveCity_EventScript_BattleBrendanTreecko:: @ 81E2F0E
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_14, LilycoveCity_Text_BrendanDefeat
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_LILYCOVE_TREECKO, LilycoveCity_Text_BrendanDefeat
|
||||
goto LilycoveCity_EventScript_DefeatedBrendan
|
||||
end
|
||||
|
||||
LilycoveCity_EventScript_BattleBrendanTorchic:: @ 81E2F1E
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_15, LilycoveCity_Text_BrendanDefeat
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_LILYCOVE_TORCHIC, LilycoveCity_Text_BrendanDefeat
|
||||
goto LilycoveCity_EventScript_DefeatedBrendan
|
||||
end
|
||||
|
||||
LilycoveCity_EventScript_BattleBrendanMudkip:: @ 81E2F2E
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_13, LilycoveCity_Text_BrendanDefeat
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_LILYCOVE_MUDKIP, LilycoveCity_Text_BrendanDefeat
|
||||
goto LilycoveCity_EventScript_DefeatedBrendan
|
||||
end
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ MagmaHideout_4F_EventScript_Maxie:: @ 823A560
|
||||
waitmovement 0
|
||||
msgbox MagmaHideout_4F_Text_MaxieOhItWasYou, MSGBOX_DEFAULT
|
||||
closemessage
|
||||
trainerbattle_no_intro TRAINER_MAXIE_1, MagmaHideout_4F_Text_MaxieDefeat
|
||||
trainerbattle_no_intro TRAINER_MAXIE_MAGMA_HIDEOUT, MagmaHideout_4F_Text_MaxieDefeat
|
||||
msgbox MagmaHideout_4F_Text_MaxieImGoingAfterGroudon, MSGBOX_DEFAULT
|
||||
closemessage
|
||||
clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN
|
||||
@@ -121,7 +121,7 @@ MagmaHideout_4F_EventScript_Grunt13:: @ 823A6BA
|
||||
end
|
||||
|
||||
MagmaHideout_4F_EventScript_Tabitha:: @ 823A6D1
|
||||
trainerbattle_single TRAINER_TABITHA_3, MagmaHideout_4F_Text_TabithaIntro, MagmaHideout_4F_Text_TabithaDefeat
|
||||
trainerbattle_single TRAINER_TABITHA_MAGMA_HIDEOUT, MagmaHideout_4F_Text_TabithaIntro, MagmaHideout_4F_Text_TabithaDefeat
|
||||
msgbox MagmaHideout_4F_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
|
||||
@@ -204,7 +204,7 @@ MauvilleCity_EventScript_ScottExitEast:: @ 81DF628
|
||||
|
||||
MauvilleCity_EventScript_BattleWally:: @ 81DF63A
|
||||
msgbox MauvilleCity_Text_WallyHereICome, MSGBOX_DEFAULT
|
||||
trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_WallyDefeat
|
||||
trainerbattle_no_intro TRAINER_WALLY_MAUVILLE, MauvilleCity_Text_WallyDefeat
|
||||
applymovement 6, Common_Movement_WalkInPlaceFastestRight
|
||||
waitmovement 0
|
||||
msgbox MauvilleCity_Text_WallyIllGoBackToVerdanturf, MSGBOX_DEFAULT
|
||||
|
||||
@@ -337,11 +337,11 @@ MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerWest:: @ 8224152
|
||||
return
|
||||
|
||||
MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer:: @ 8224157
|
||||
trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_3, 0, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand
|
||||
trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_MOSSDEEP, 0, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand
|
||||
end
|
||||
|
||||
MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer:: @ 8224166
|
||||
trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_1, 0, MossdeepCity_SpaceCenter_Text_TabithaDefeat, MossdeepCity_SpaceCenter_Text_TabithaDefeat
|
||||
trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_MOSSDEEP, 0, MossdeepCity_SpaceCenter_Text_TabithaDefeat, MossdeepCity_SpaceCenter_Text_TabithaDefeat
|
||||
end
|
||||
|
||||
MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall:: @ 8224175
|
||||
|
||||
@@ -43,7 +43,7 @@ MtChimney_EventScript_Maxie:: @ 822EE0B
|
||||
applymovement 2, Common_Movement_Delay48
|
||||
waitmovement 0
|
||||
msgbox MtChimney_Text_MaxieIntro, MSGBOX_DEFAULT
|
||||
trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_MaxieDefeat
|
||||
trainerbattle_no_intro TRAINER_MAXIE_MT_CHIMNEY, MtChimney_Text_MaxieDefeat
|
||||
msgbox MtChimney_Text_MaxieYouHaventSeenLastOfMagma, MSGBOX_DEFAULT
|
||||
closemessage
|
||||
delay 30
|
||||
@@ -415,7 +415,7 @@ MtChimney_EventScript_BusyAquaGrunt3:: @ 822F065
|
||||
end
|
||||
|
||||
MtChimney_EventScript_Tabitha:: @ 822F06E
|
||||
trainerbattle_single TRAINER_TABITHA_2, MtChimney_Text_TabithaIntro, MtChimney_Text_TabithaDefeat
|
||||
trainerbattle_single TRAINER_TABITHA_MT_CHIMNEY, MtChimney_Text_TabithaIntro, MtChimney_Text_TabithaDefeat
|
||||
msgbox MtChimney_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
|
||||
@@ -61,32 +61,32 @@ Route103_EventScript_RivalBrendan:: @ 81EC434
|
||||
end
|
||||
|
||||
Route103_EventScript_StartMayBattleTreecko:: @ 81EC48E
|
||||
trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_MayDefeated
|
||||
trainerbattle_no_intro TRAINER_MAY_ROUTE_103_TREECKO, Route103_Text_MayDefeated
|
||||
goto Route103_EventScript_AfterMayBattle
|
||||
end
|
||||
|
||||
Route103_EventScript_StartMayBattleTorchic:: @ 81EC49E
|
||||
trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_MayDefeated
|
||||
trainerbattle_no_intro TRAINER_MAY_ROUTE_103_TORCHIC, Route103_Text_MayDefeated
|
||||
goto Route103_EventScript_AfterMayBattle
|
||||
end
|
||||
|
||||
Route103_EventScript_StartMayBattleMudkip:: @ 81EC4AE
|
||||
trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_MayDefeated
|
||||
trainerbattle_no_intro TRAINER_MAY_ROUTE_103_MUDKIP, Route103_Text_MayDefeated
|
||||
goto Route103_EventScript_AfterMayBattle
|
||||
end
|
||||
|
||||
Route103_EventScript_StartBrendanBattleTreecko:: @ 81EC4BE
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_BrendanDefeated
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_103_TREECKO, Route103_Text_BrendanDefeated
|
||||
goto Route103_EventScript_AfterBrendanBattle
|
||||
end
|
||||
|
||||
Route103_EventScript_StartBrendanBattleTorchic:: @ 81EC4CE
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_BrendanDefeated
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_103_TORCHIC, Route103_Text_BrendanDefeated
|
||||
goto Route103_EventScript_AfterBrendanBattle
|
||||
end
|
||||
|
||||
Route103_EventScript_StartBrendanBattleMudkip:: @ 81EC4DE
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_BrendanDefeated
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_103_MUDKIP, Route103_Text_BrendanDefeated
|
||||
goto Route103_EventScript_AfterBrendanBattle
|
||||
end
|
||||
|
||||
|
||||
@@ -167,19 +167,19 @@ Route104_EventScript_RestoreMusic:: @ 81ECE31
|
||||
return
|
||||
|
||||
Route104_EventScript_BattleMayTreecko:: @ 81ECE36
|
||||
trainerbattle_no_intro TRAINER_MAY_14, Route104_Text_MayDefeat
|
||||
trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TREECKO, Route104_Text_MayDefeat
|
||||
setflag FLAG_DEFEATED_RIVAL_ROUTE_104
|
||||
goto Route104_EventScript_MayDefeated
|
||||
end
|
||||
|
||||
Route104_EventScript_BattleMayTorchic:: @ 81ECE49
|
||||
trainerbattle_no_intro TRAINER_MAY_15, Route104_Text_MayDefeat
|
||||
trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TORCHIC, Route104_Text_MayDefeat
|
||||
setflag FLAG_DEFEATED_RIVAL_ROUTE_104
|
||||
goto Route104_EventScript_MayDefeated
|
||||
end
|
||||
|
||||
Route104_EventScript_BattleMayMudkip:: @ 81ECE5C
|
||||
trainerbattle_no_intro TRAINER_MAY_10, Route104_Text_MayDefeat
|
||||
trainerbattle_no_intro TRAINER_MAY_RUSTBORO_MUDKIP, Route104_Text_MayDefeat
|
||||
setflag FLAG_DEFEATED_RIVAL_ROUTE_104
|
||||
goto Route104_EventScript_MayDefeated
|
||||
end
|
||||
@@ -237,19 +237,19 @@ Route104_EventScript_BrendanDefeated:: @ 81ECF38
|
||||
end
|
||||
|
||||
Route104_EventScript_BattleBrendanTreecko:: @ 81ECF4D
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_10, Route104_Text_BrendanDefeat
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TREECKO, Route104_Text_BrendanDefeat
|
||||
setflag FLAG_DEFEATED_RIVAL_ROUTE_104
|
||||
goto Route104_EventScript_BrendanDefeated
|
||||
end
|
||||
|
||||
Route104_EventScript_BattleBrendanTorchic:: @ 81ECF60
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_12, Route104_Text_BrendanDefeat
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TORCHIC, Route104_Text_BrendanDefeat
|
||||
setflag FLAG_DEFEATED_RIVAL_ROUTE_104
|
||||
goto Route104_EventScript_BrendanDefeated
|
||||
end
|
||||
|
||||
Route104_EventScript_BattleBrendanMudkip:: @ 81ECF73
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_11, Route104_Text_BrendanDefeat
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_MUDKIP, Route104_Text_BrendanDefeat
|
||||
setflag FLAG_DEFEATED_RIVAL_ROUTE_104
|
||||
goto Route104_EventScript_BrendanDefeated
|
||||
end
|
||||
|
||||
@@ -421,17 +421,17 @@ Route110_EventScript_MayBattle:: @ 81EF7EB
|
||||
end
|
||||
|
||||
Route110_EventScript_MayBattleTreecko:: @ 81EF81A
|
||||
trainerbattle_no_intro TRAINER_MAY_5, Route110_Text_MayDefeated
|
||||
trainerbattle_no_intro TRAINER_MAY_ROUTE_110_TREECKO, Route110_Text_MayDefeated
|
||||
goto Route110_EventScript_MayDefeated
|
||||
end
|
||||
|
||||
Route110_EventScript_MayBattleTorchic:: @ 81EF82A
|
||||
trainerbattle_no_intro TRAINER_MAY_8, Route110_Text_MayDefeated
|
||||
trainerbattle_no_intro TRAINER_MAY_ROUTE_110_TORCHIC, Route110_Text_MayDefeated
|
||||
goto Route110_EventScript_MayDefeated
|
||||
end
|
||||
|
||||
Route110_EventScript_MayBattleMudkip:: @ 81EF83A
|
||||
trainerbattle_no_intro TRAINER_MAY_2, Route110_Text_MayDefeated
|
||||
trainerbattle_no_intro TRAINER_MAY_ROUTE_110_MUDKIP, Route110_Text_MayDefeated
|
||||
goto Route110_EventScript_MayDefeated
|
||||
end
|
||||
|
||||
@@ -451,17 +451,17 @@ Route110_EventScript_BrendanBattle:: @ 81EF865
|
||||
end
|
||||
|
||||
Route110_EventScript_BrendanBattleTreecko:: @ 81EF894
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_5, Route110_Text_BrendanDefeated
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_110_TREECKO, Route110_Text_BrendanDefeated
|
||||
goto Route110_EventScript_BrendanDefeated
|
||||
end
|
||||
|
||||
Route110_EventScript_BrendanBattleTorchic:: @ 81EF8A4
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_8, Route110_Text_BrendanDefeated
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_110_TORCHIC, Route110_Text_BrendanDefeated
|
||||
goto Route110_EventScript_BrendanDefeated
|
||||
end
|
||||
|
||||
Route110_EventScript_BrendanBattleMudkip:: @ 81EF8B4
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_2, Route110_Text_BrendanDefeated
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_110_MUDKIP, Route110_Text_BrendanDefeated
|
||||
goto Route110_EventScript_BrendanDefeated
|
||||
end
|
||||
|
||||
|
||||
@@ -86,17 +86,17 @@ Route119_EventScript_BattleMay:: @ 81F450B
|
||||
end
|
||||
|
||||
Route119_EventScript_BattleMayTreecko:: @ 81F453A
|
||||
trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_MayDefeat
|
||||
trainerbattle_no_intro TRAINER_MAY_ROUTE_119_TREECKO, Route119_Text_MayDefeat
|
||||
goto Route119_EventScript_DefeatedMay
|
||||
end
|
||||
|
||||
Route119_EventScript_BattleMayTorchic:: @ 81F454A
|
||||
trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_MayDefeat
|
||||
trainerbattle_no_intro TRAINER_MAY_ROUTE_119_TORCHIC, Route119_Text_MayDefeat
|
||||
goto Route119_EventScript_DefeatedMay
|
||||
end
|
||||
|
||||
Route119_EventScript_BattleMayMudkip:: @ 81F455A
|
||||
trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_MayDefeat
|
||||
trainerbattle_no_intro TRAINER_MAY_ROUTE_119_MUDKIP, Route119_Text_MayDefeat
|
||||
goto Route119_EventScript_DefeatedMay
|
||||
end
|
||||
|
||||
@@ -116,17 +116,17 @@ Route119_EventScript_BattleBrendan:: @ 81F4585
|
||||
end
|
||||
|
||||
Route119_EventScript_BattleBrendanTreecko:: @ 81F45B4
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_BrendanDefeat
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_119_TREECKO, Route119_Text_BrendanDefeat
|
||||
goto Route119_EventScript_DefeatedBrendan
|
||||
end
|
||||
|
||||
Route119_EventScript_BattleBrendanTorchic:: @ 81F45C4
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_BrendanDefeat
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_119_TORCHIC, Route119_Text_BrendanDefeat
|
||||
goto Route119_EventScript_DefeatedBrendan
|
||||
end
|
||||
|
||||
Route119_EventScript_BattleBrendanMudkip:: @ 81F45D4
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_BrendanDefeat
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_119_MUDKIP, Route119_Text_BrendanDefeat
|
||||
goto Route119_EventScript_DefeatedBrendan
|
||||
end
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ Route119_WeatherInstitute_2F_EventScript_Grunt3:: @ 826FF96
|
||||
end
|
||||
|
||||
Route119_WeatherInstitute_2F_EventScript_Shelly:: @ 826FFAD
|
||||
trainerbattle_single TRAINER_SHELLY_1, Route119_WeatherInstitute_2F_Text_ShellyIntro, Route119_WeatherInstitute_2F_Text_ShellyDefeat, Route119_WeatherInstitute_2F_EventScript_ShellyDefeated
|
||||
trainerbattle_single TRAINER_SHELLY_WEATHER_INSTITUTE, Route119_WeatherInstitute_2F_Text_ShellyIntro, Route119_WeatherInstitute_2F_Text_ShellyDefeat, Route119_WeatherInstitute_2F_EventScript_ShellyDefeated
|
||||
msgbox Route119_WeatherInstitute_2F_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
|
||||
@@ -896,19 +896,19 @@ RustboroCity_EventScript_RestoreBgm:: @ 81E10D6
|
||||
return
|
||||
|
||||
RustboroCity_EventScript_BattleMayTreecko:: @ 81E10DB
|
||||
trainerbattle_no_intro TRAINER_MAY_14, RustboroCity_Text_MayDefeat
|
||||
trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TREECKO, RustboroCity_Text_MayDefeat
|
||||
setflag FLAG_DEFEATED_RIVAL_RUSTBORO
|
||||
goto RustboroCity_EventScript_MayBrineyHint
|
||||
end
|
||||
|
||||
RustboroCity_EventScript_BattleMayTorchic:: @ 81E10EE
|
||||
trainerbattle_no_intro TRAINER_MAY_15, RustboroCity_Text_MayDefeat
|
||||
trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TORCHIC, RustboroCity_Text_MayDefeat
|
||||
setflag FLAG_DEFEATED_RIVAL_RUSTBORO
|
||||
goto RustboroCity_EventScript_MayBrineyHint
|
||||
end
|
||||
|
||||
RustboroCity_EventScript_BattleMayMudkip:: @ 81E1101
|
||||
trainerbattle_no_intro TRAINER_MAY_10, RustboroCity_Text_MayDefeat
|
||||
trainerbattle_no_intro TRAINER_MAY_RUSTBORO_MUDKIP, RustboroCity_Text_MayDefeat
|
||||
setflag FLAG_DEFEATED_RIVAL_RUSTBORO
|
||||
goto RustboroCity_EventScript_MayBrineyHint
|
||||
end
|
||||
@@ -960,19 +960,19 @@ RustboroCity_EventScript_BrendanBrineyHint:: @ 81E11C0
|
||||
end
|
||||
|
||||
RustboroCity_EventScript_BattleBrendanTreecko:: @ 81E11D5
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_10, RustboroCity_Text_BrendanDefeat
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TREECKO, RustboroCity_Text_BrendanDefeat
|
||||
setflag FLAG_DEFEATED_RIVAL_RUSTBORO
|
||||
goto RustboroCity_EventScript_BrendanBrineyHint
|
||||
end
|
||||
|
||||
RustboroCity_EventScript_BattleBrendanTorchic:: @ 81E11E8
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_12, RustboroCity_Text_BrendanDefeat
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TORCHIC, RustboroCity_Text_BrendanDefeat
|
||||
setflag FLAG_DEFEATED_RIVAL_RUSTBORO
|
||||
goto RustboroCity_EventScript_BrendanBrineyHint
|
||||
end
|
||||
|
||||
RustboroCity_EventScript_BattleBrendanMudkip:: @ 81E11FB
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_11, RustboroCity_Text_BrendanDefeat
|
||||
trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_MUDKIP, RustboroCity_Text_BrendanDefeat
|
||||
setflag FLAG_DEFEATED_RIVAL_RUSTBORO
|
||||
goto RustboroCity_EventScript_BrendanBrineyHint
|
||||
end
|
||||
|
||||
@@ -2,7 +2,7 @@ SeafloorCavern_Room3_MapScripts:: @ 8234937
|
||||
.byte 0
|
||||
|
||||
SeafloorCavern_Room3_EventScript_Shelly:: @ 8234938
|
||||
trainerbattle_single TRAINER_SHELLY_2, SeafloorCavern_Room3_Text_ShellyIntro, SeafloorCavern_Room3_Text_ShellyDefeat
|
||||
trainerbattle_single TRAINER_SHELLY_SEAFLOOR_CAVERN, SeafloorCavern_Room3_Text_ShellyIntro, SeafloorCavern_Room3_Text_ShellyDefeat
|
||||
msgbox SeafloorCavern_Room3_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ VictoryRoad_1F_EventScript_WallyEntranceBattle:: @ 8235DE1
|
||||
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
|
||||
waitmovement 0
|
||||
msgbox VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore, MSGBOX_DEFAULT
|
||||
trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_WallyEntranceDefeat
|
||||
trainerbattle_no_intro TRAINER_WALLY_VR_1, VictoryRoad_1F_Text_WallyEntranceDefeat
|
||||
msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_DEFAULT
|
||||
clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
|
||||
copyobjectxytoperm 4
|
||||
@@ -84,7 +84,7 @@ VictoryRoad_1F_EventScript_EntranceWally:: @ 8235E2C
|
||||
|
||||
@ This Wally appears and remains at the exit after the Hall of Fame is entered
|
||||
VictoryRoad_1F_EventScript_ExitWally:: @ 8235E35
|
||||
trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
|
||||
trainerbattle_single TRAINER_WALLY_VR_2, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
|
||||
specialvar VAR_RESULT, ShouldTryRematchBattle
|
||||
compare VAR_RESULT, TRUE
|
||||
goto_if_eq VictoryRoad_1F_EventScript_RematchWally
|
||||
@@ -92,7 +92,7 @@ VictoryRoad_1F_EventScript_ExitWally:: @ 8235E35
|
||||
end
|
||||
|
||||
VictoryRoad_1F_EventScript_RematchWally:: @ 8235E5C
|
||||
trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
|
||||
trainerbattle_rematch TRAINER_WALLY_VR_2, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
|
||||
msgbox VictoryRoad_1F_Text_WallyPostBattle, MSGBOX_AUTOCLOSE
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user