dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions 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
Download Patch File Download Diff File Expand all files Collapse all files

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