ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-25 19:24:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

More misc event names

Browse Source
This commit is contained in:
Phlosioneer 2019-02-22 20:21:26 -05:00 committed by huderlem
parent 0de831fd29
commit 04db99bb0a
21 changed files with 53 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
data/event_scripts.s
View File

@ -1205,8 +1205,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE
RustboroCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE
SlateportCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE
VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE
goto_if_unset FLAG_RECEIVED_POKENAV, OldaleTown_PokemonCenter_1F_EventScript_27374E
goto_if_set FLAG_DEFEATED_PETALBURG_GYM, OldaleTown_PokemonCenter_1F_EventScript_27374E
goto_if_unset FLAG_RECEIVED_POKENAV, Common_EventScript_NopReturn
goto_if_set FLAG_DEFEATED_PETALBURG_GYM, Common_EventScript_NopReturn
goto_if_unset FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT, OldaleTown_PokemonCenter_1F_EventScript_27190C
goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, OldaleTown_PokemonCenter_1F_EventScript_271912
goto_if_unset FLAG_HIDE_ROUTE_108_MR_BRINEY, OldaleTown_PokemonCenter_1F_EventScript_271918
@ -1948,7 +1948,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_2720AD:: @ 82720AD
Route101_EventScript_2720AD:: @ 82720AD
Route103_EventScript_2720AD:: @ 82720AD
compare VAR_0x4085, 0
goto_if_eq Route101_EventScript_27374E
goto_if_eq Common_EventScript_NopReturn
goto_if_set FLAG_SYS_GAME_CLEAR, Route101_EventScript_27211A
compare VAR_BIRCH_STATE, 0
call_if_eq Route101_EventScript_27211A
@ -2029,7 +2029,7 @@ Route101_EventScript_272184:: @ 8272184
msgbox gUnknown_082A5D2C, MSGBOX_DEFAULT
call Route101_EventScript_272179
compare VAR_0x800A, 0
goto_if_eq Route101_EventScript_27374E
goto_if_eq Common_EventScript_NopReturn
setvar VAR_0x8004, 1
specialvar VAR_RESULT, ScriptGetPokedexInfo
copyvar VAR_0x8008, VAR_0x8005
@ -2768,28 +2768,7 @@ EventScript_2736F8:: @ 82736F8
waitstate
end
AncientTomb_EventScript_27374E:: @ 827374E
AquaHideout_B1F_EventScript_27374E:: @ 827374E
BattleFrontier_BattleDomeBattleRoom_EventScript_27374E:: @ 827374E
BattleFrontier_OutsideEast_EventScript_27374E:: @ 827374E
BirthIsland_Exterior_EventScript_27374E:: @ 827374E
DesertRuins_EventScript_27374E:: @ 827374E
EverGrandeCity_PokemonCenter_1F_EventScript_27374E:: @ 827374E
FarawayIsland_Interior_EventScript_27374E:: @ 827374E
IslandCave_EventScript_27374E:: @ 827374E
LilycoveCity_Harbor_EventScript_27374E:: @ 827374E
MarineCave_End_EventScript_27374E:: @ 827374E
NavelRock_Bottom_EventScript_27374E:: @ 827374E
NavelRock_Top_EventScript_27374E:: @ 827374E
NewMauville_Inside_EventScript_27374E:: @ 827374E
OldaleTown_PokemonCenter_1F_EventScript_27374E:: @ 827374E
PacifidlogTown_House2_EventScript_27374E:: @ 827374E
Route101_EventScript_27374E:: @ 827374E
Route119_EventScript_27374E:: @ 827374E
Route120_EventScript_27374E:: @ 827374E
SkyPillar_Top_EventScript_27374E:: @ 827374E
SouthernIsland_Interior_EventScript_27374E:: @ 827374E
TerraCave_End_EventScript_27374E:: @ 827374E
Common_EventScript_NopReturn:: @ 827374E
return
EventScript_27374F:: @ 827374F
@ -6652,7 +6631,7 @@ SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16
goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A
msgbox SlateportCity_PokemonFanClub_Text_2C6F66, MSGBOX_DEFAULT
setvar VAR_0x8005, 23
call SlateportCity_PokemonFanClub_EventScript_2C8326
call EventScript_ShowPartyMenu
compare VAR_RESULT, 0
goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A
setflag FLAG_MOVE_TUTOR_TAUGHT_SWAGGER
@ -6681,7 +6660,7 @@ MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E
goto_if_eq MauvilleCity_EventScript_2C7FD2
msgbox MauvilleCity_Text_2C70F3, MSGBOX_DEFAULT
setvar VAR_0x8005, 16
call MauvilleCity_EventScript_2C8326
call EventScript_ShowPartyMenu
compare VAR_RESULT, 0
goto_if_eq MauvilleCity_EventScript_2C7FD2
setflag FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT
@ -6710,7 +6689,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6
goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A
msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7243, MSGBOX_DEFAULT
setvar VAR_0x8005, 29
call VerdanturfTown_PokemonCenter_1F_EventScript_2C8326
call EventScript_ShowPartyMenu
compare VAR_RESULT, 0
goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A
setflag FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER
@ -6739,7 +6718,7 @@ LavaridgeTown_House_EventScript_2C804E:: @ 82C804E
goto_if_eq LavaridgeTown_House_EventScript_2C80A2
msgbox LavaridgeTown_House_Text_2C73B1, MSGBOX_DEFAULT
setvar VAR_0x8005, 7
call LavaridgeTown_House_EventScript_2C8326
call EventScript_ShowPartyMenu
compare VAR_RESULT, 0
goto_if_eq LavaridgeTown_House_EventScript_2C80A2
setflag FLAG_MOVE_TUTOR_TAUGHT_MIMIC
@ -6768,7 +6747,7 @@ FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6
goto_if_eq FallarborTown_Mart_EventScript_2C810A
msgbox FallarborTown_Mart_Text_2C7582, MSGBOX_DEFAULT
setvar VAR_0x8005, 8
call FallarborTown_Mart_EventScript_2C8326
call EventScript_ShowPartyMenu
compare VAR_RESULT, 0
goto_if_eq FallarborTown_Mart_EventScript_2C810A
setflag FLAG_MOVE_TUTOR_TAUGHT_METRONOME
@ -6797,7 +6776,7 @@ FortreeCity_House2_EventScript_2C811E:: @ 82C811E
goto_if_eq FortreeCity_House2_EventScript_2C8172
msgbox FortreeCity_House2_Text_2C7721, MSGBOX_DEFAULT
setvar VAR_0x8005, 24
call FortreeCity_House2_EventScript_2C8326
call EventScript_ShowPartyMenu
compare VAR_RESULT, 0
goto_if_eq FortreeCity_House2_EventScript_2C8172
setflag FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK
@ -6826,7 +6805,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186
goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA
msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C7911, MSGBOX_DEFAULT
setvar VAR_0x8005, 14
call LilycoveCity_DepartmentStoreRooftop_EventScript_2C8326
call EventScript_ShowPartyMenu
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA
setflag FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE
@ -6855,7 +6834,7 @@ MossdeepCity_EventScript_2C81EE:: @ 82C81EE
goto_if_eq MossdeepCity_EventScript_2C8242
msgbox MossdeepCity_Text_2C7B0D, MSGBOX_DEFAULT
setvar VAR_0x8005, 15
call MossdeepCity_EventScript_2C8326
call EventScript_ShowPartyMenu
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_EventScript_2C8242
setflag FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH
@ -6884,7 +6863,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256
goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA
msgbox SootopolisCity_PokemonCenter_1F_Text_2C7C98, MSGBOX_DEFAULT
setvar VAR_0x8005, 4
call SootopolisCity_PokemonCenter_1F_EventScript_2C8326
call EventScript_ShowPartyMenu
compare VAR_RESULT, 0
goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA
setflag FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE
@ -6913,7 +6892,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE
goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312
msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7E40, MSGBOX_DEFAULT
setvar VAR_0x8005, 12
call PacifidlogTown_PokemonCenter_1F_EventScript_2C8326
call EventScript_ShowPartyMenu
compare VAR_RESULT, 0
goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312
setflag FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION
@ -6930,16 +6909,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C831C:: @ 82C831C
release
end
FallarborTown_Mart_EventScript_2C8326:: @ 82C8326
FortreeCity_House2_EventScript_2C8326:: @ 82C8326
LavaridgeTown_House_EventScript_2C8326:: @ 82C8326
LilycoveCity_DepartmentStoreRooftop_EventScript_2C8326:: @ 82C8326
MauvilleCity_EventScript_2C8326:: @ 82C8326
MossdeepCity_EventScript_2C8326:: @ 82C8326
PacifidlogTown_PokemonCenter_1F_EventScript_2C8326:: @ 82C8326
SlateportCity_PokemonFanClub_EventScript_2C8326:: @ 82C8326
SootopolisCity_PokemonCenter_1F_EventScript_2C8326:: @ 82C8326
VerdanturfTown_PokemonCenter_1F_EventScript_2C8326:: @ 82C8326
EventScript_ShowPartyMenu:: @ 82C8326
special sub_81B892C
waitstate
lock

2
data/maps/AncientTomb/scripts.inc
View File

@ -11,7 +11,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3
AncientTomb_EventScript_238FCD:: @ 8238FCD
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne AncientTomb_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return

2
data/maps/AquaHideout_B1F/scripts.inc
View File

@ -10,7 +10,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne AquaHideout_B1F_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return

4
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
View File

@ -966,14 +966,14 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919
random 2
copyvar VAR_TEMP_D, VAR_RESULT
compare VAR_TEMP_D, 0
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
goto_if_eq Common_EventScript_NopReturn
setobjectxyperm 6, 2, 0
setobjectmovementtype 6, MOVEMENT_TYPE_FACE_RIGHT
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938
compare VAR_TEMP_D, 0
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
goto_if_eq Common_EventScript_NopReturn
applymovement 6, BattleFrontier_BattleDomeBattleRoom_Movement_24C95E
return

2
data/maps/BattleFrontier_OutsideEast/scripts.inc
View File

@ -10,7 +10,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F
BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne BattleFrontier_OutsideEast_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return

4
data/maps/BirthIsland_Exterior/scripts.inc
View File

@ -23,7 +23,7 @@ BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E
return
BirthIsland_Exterior_EventScript_267F55:: @ 8267F55
goto_if_set FLAG_DEFEATED_DEOXYS, BirthIsland_Exterior_EventScript_27374E
goto_if_set FLAG_DEFEATED_DEOXYS, Common_EventScript_NopReturn
clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
clearflag FLAG_DEOXYS_ROCK_COMPLETE
return
@ -35,7 +35,7 @@ BirthIsland_Exterior_MapScript1_267F65: @ 8267F65
BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne BirthIsland_Exterior_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject 2
return

2
data/maps/DesertRuins/scripts.inc
View File

@ -11,7 +11,7 @@ DesertRuins_MapScript1_22D96B: @ 822D96B
DesertRuins_EventScript_22D975:: @ 822D975
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne DesertRuins_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return

2
data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
View File

@ -9,7 +9,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
end
EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C
goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonCenter_1F_EventScript_27374E
goto_if_unset FLAG_BADGE06_GET, Common_EventScript_NopReturn
clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
return

4
data/maps/FarawayIsland_Interior/scripts.inc
View File

@ -33,7 +33,7 @@ FarawayIsland_Interior_MapScript1_267D54: @ 8267D54
FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne FarawayIsland_Interior_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return
@ -44,7 +44,7 @@ FarawayIsland_Interior_MapScript1_267D72: @ 8267D72
end
FarawayIsland_Interior_EventScript_267D86:: @ 8267D86
goto_if_set FLAG_DEFEATED_MEW, FarawayIsland_Interior_EventScript_27374E
goto_if_set FLAG_DEFEATED_MEW, Common_EventScript_NopReturn
clearflag FLAG_HIDE_MEW
setvar VAR_TEMP_1, 0
return

2
data/maps/IslandCave/scripts.inc
View File

@ -11,7 +11,7 @@ IslandCave_MapScript1_238E3A: @ 8238E3A
IslandCave_EventScript_238E44:: @ 8238E44
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne IslandCave_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return

24
data/maps/LilycoveCity_Harbor/scripts.inc
View File

@ -107,45 +107,45 @@ LilycoveCity_Harbor_EventScript_21E171:: @ 821E171
LilycoveCity_Harbor_EventScript_21E194:: @ 821E194
setvar VAR_TEMP_E, 0
goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E
goto_if_unset FLAG_SYS_HAS_EON_TICKET, Common_EventScript_NopReturn
checkitem ITEM_EON_TICKET, 1
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_Harbor_EventScript_27374E
goto_if_eq Common_EventScript_NopReturn
setvar VAR_TEMP_E, 1
goto_if_set FLAG_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E
goto_if_set FLAG_HAS_EON_TICKET, Common_EventScript_NopReturn
setvar VAR_TEMP_E, 2
return
LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6
setvar VAR_TEMP_D, 0
goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, LilycoveCity_Harbor_EventScript_27374E
goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, Common_EventScript_NopReturn
checkitem ITEM_AURORA_TICKET, 1
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_Harbor_EventScript_27374E
goto_if_eq Common_EventScript_NopReturn
setvar VAR_TEMP_D, 1
goto_if_set FLAG_HAS_AURORA_TICKET, LilycoveCity_Harbor_EventScript_27374E
goto_if_set FLAG_HAS_AURORA_TICKET, Common_EventScript_NopReturn
setvar VAR_TEMP_D, 2
return
LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8
setvar VAR_TEMP_C, 0
goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, LilycoveCity_Harbor_EventScript_27374E
goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, Common_EventScript_NopReturn
checkitem ITEM_OLD_SEA_MAP, 1
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_Harbor_EventScript_27374E
goto_if_eq Common_EventScript_NopReturn
setvar VAR_TEMP_C, 1
goto_if_set FLAG_HAS_OLD_SEA_MAP, LilycoveCity_Harbor_EventScript_27374E
goto_if_set FLAG_HAS_OLD_SEA_MAP, Common_EventScript_NopReturn
setvar VAR_TEMP_C, 2
return
LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A
setvar VAR_TEMP_9, 0
goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, LilycoveCity_Harbor_EventScript_27374E
goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, Common_EventScript_NopReturn
checkitem ITEM_MYSTIC_TICKET, 1
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_Harbor_EventScript_27374E
goto_if_eq Common_EventScript_NopReturn
setvar VAR_TEMP_9, 1
goto_if_set FLAG_HAS_MYSTIC_TICKET, LilycoveCity_Harbor_EventScript_27374E
goto_if_set FLAG_HAS_MYSTIC_TICKET, Common_EventScript_NopReturn
setvar VAR_TEMP_9, 2
return

2
data/maps/MarineCave_End/scripts.inc
View File

@ -10,7 +10,7 @@ MarineCave_End_MapScript1_23AFEA: @ 823AFEA
MarineCave_End_EventScript_23AFF4:: @ 823AFF4
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne MarineCave_End_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject 1
return

4
data/maps/NavelRock_Bottom/scripts.inc
View File

@ -13,7 +13,7 @@ NavelRock_Bottom_EventScript_269273:: @ 8269273
return
NavelRock_Bottom_EventScript_269277:: @ 8269277
goto_if_set FLAG_DEFEATED_LUGIA, NavelRock_Bottom_EventScript_27374E
goto_if_set FLAG_DEFEATED_LUGIA, Common_EventScript_NopReturn
clearflag FLAG_HIDE_LUGIA
return
@ -24,7 +24,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284
NavelRock_Bottom_EventScript_26928E:: @ 826928E
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne NavelRock_Bottom_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject 1
return

4
data/maps/NavelRock_Top/scripts.inc
View File

@ -15,7 +15,7 @@ NavelRock_Top_EventScript_269131:: @ 8269131
NavelRock_Top_EventScript_26913A:: @ 826913A
setvar VAR_TEMP_1, 1
goto_if_set FLAG_DEFEATED_HO_OH, NavelRock_Top_EventScript_27374E
goto_if_set FLAG_DEFEATED_HO_OH, Common_EventScript_NopReturn
setvar VAR_TEMP_1, 0
clearflag FLAG_HIDE_HO_OH
return
@ -27,7 +27,7 @@ NavelRock_Top_MapScript1_269151: @ 8269151
NavelRock_Top_EventScript_26915B:: @ 826915B
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne NavelRock_Top_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject 1
return

2
data/maps/NewMauville_Inside/scripts.inc
View File

@ -15,7 +15,7 @@ NewMauville_Inside_MapScript1_2373E7: @ 82373E7
NewMauville_Inside_EventScript_237407:: @ 8237407
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne NewMauville_Inside_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return

2
data/maps/PacifidlogTown_House2/scripts.inc
View File

@ -20,7 +20,7 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792
end
PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE
goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_27374E
goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, Common_EventScript_NopReturn
specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable
compare VAR_RESULT, 0
call_if_eq PacifidlogTown_House2_EventScript_203812

2
data/maps/Route119/scripts.inc
View File

@ -10,7 +10,7 @@ Route119_MapScript1_1F442F: @ 81F442F
Route119_EventScript_1F4439:: @ 81F4439
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne Route119_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return

4
data/maps/Route120/scripts.inc
View File

@ -26,7 +26,7 @@ Route120_EventScript_1F5406:: @ 81F5406
Route120_EventScript_1F5449:: @ 81F5449
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne Route120_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject 30
removeobject 36
return
@ -34,7 +34,7 @@ Route120_EventScript_1F5449:: @ 81F5449
Route120_EventScript_1F5460:: @ 81F5460
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne Route120_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return

2
data/maps/SkyPillar_Top/scripts.inc
View File

@ -11,7 +11,7 @@ SkyPillar_Top_MapScript1_2396C8: @ 82396C8
SkyPillar_Top_EventScript_2396D2:: @ 82396D2
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne SkyPillar_Top_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED
return

2
data/maps/SouthernIsland_Interior/scripts.inc
View File

@ -10,7 +10,7 @@ SouthernIsland_Interior_MapScript1_242A50: @ 8242A50
SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne SouthernIsland_Interior_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject 2
return

2
data/maps/TerraCave_End/scripts.inc
View File

@ -10,7 +10,7 @@ TerraCave_End_MapScript1_23B0BB: @ 823B0BB
TerraCave_End_EventScript_23B0C5:: @ 823B0C5
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
goto_if_ne TerraCave_End_EventScript_27374E
goto_if_ne Common_EventScript_NopReturn
removeobject 1
return