dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync event macros

Browse Source
This commit is contained in:
GriffinR
2020-01-10 00:44:57 -05:00
parent 94fbc3ac48
commit 4a6f15ba24
220 changed files with 3209 additions and 3580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+34 -45
View File
@@ -7,9 +7,8 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8
OneIsland_PokemonCenter_1F_OnLoad:: @ 8170C0D
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
call_if ge, EventScript_170C22
checkflag FLAG_SYS_CAN_LINK_WITH_RS
call_if TRUE, EventScript_170C36
call_if_ge EventScript_170C22
call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_170C36
end
EventScript_170C22:: @ 8170C22
@@ -29,11 +28,11 @@ EventScript_170C36:: @ 8170C36
OneIsland_PokemonCenter_1F_OnTransition:: @ 8170C4E
setrespawn SPAWN_ONE_ISLAND
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
call_if eq, EventScript_170C73
call_if_eq EventScript_170C73
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0
call_if eq, EventScript_170C79
call_if_eq EventScript_170C79
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2
call_if eq, EventScript_170C90
call_if_eq EventScript_170C90
end
EventScript_170C73:: @ 8170C73
@@ -84,10 +83,8 @@ EventScript_170CB1:: @ 8170CB1
waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
waitmovement 0
checkflag FLAG_SYS_GAME_CLEAR
call_if TRUE, EventScript_170E34
checkflag FLAG_SYS_GAME_CLEAR
call_if FALSE, EventScript_170E3D
call_if_set FLAG_SYS_GAME_CLEAR, EventScript_170E34
call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_170E3D
applymovement 3, Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox gUnknown_81A0E17
@@ -104,18 +101,17 @@ EventScript_170CB1:: @ 8170CB1
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
waitmovement 0
msgbox gUnknown_81A0FB1
giveitemfanfaremsg gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5
additem ITEM_METEORITE, 1
msgreceiveditem gUnknown_81A10EE, ITEM_METEORITE, 1, MUS_FAN5
additem ITEM_METEORITE
applymovement 3, Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox gUnknown_81A1113
additem ITEM_TRI_PASS, 1
giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5
giveitem_msg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5
msgbox gUnknown_81A1150
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
call_if ge, EventScript_170E46
call_if_ge EventScript_170E46
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
call_if lt, EventScript_170E58
call_if_lt EventScript_170E58
setflag FLAG_SYS_SEVII_MAP_123
msgbox gUnknown_81A1230
closemessage
@@ -148,8 +144,7 @@ EventScript_170E46:: @ 8170E46
EventScript_170E58:: @ 8170E58
setflag FLAG_HIDE_TOWN_MAP
setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
additem ITEM_TOWN_MAP, 1
giveitemfanfaremsg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5
giveitem_msg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5
return
Movement_170E7D:: @ 8170E7D
@@ -192,8 +187,7 @@ OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94
OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D
lock
checkflag FLAG_SEVII_DETOUR_FINISHED
goto_if TRUE, EventScript_170EB1
goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_170EB1
msgbox gUnknown_81A1266
release
end
@@ -209,22 +203,20 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5
lock
faceplayer
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7
goto_if eq, EventScript_170F35
goto_if_eq EventScript_170F35
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6
goto_if eq, EventScript_170F9B
checkflag FLAG_RECOVERED_SAPPHIRE
goto_if TRUE, EventScript_170FA5
goto_if_eq EventScript_170F9B
goto_if_set FLAG_RECOVERED_SAPPHIRE, EventScript_170FA5
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
goto_if eq, EventScript_17103A
checkflag FLAG_GOT_RUBY
goto_if TRUE, EventScript_171044
goto_if_eq EventScript_17103A
goto_if_set FLAG_GOT_RUBY, EventScript_171044
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4
goto_if eq, EventScript_1710F2
goto_if_eq EventScript_1710F2
specialvar VAR_RESULT, IsNationalPokedexEnabled
compare VAR_RESULT, 1
goto_if eq, EventScript_1710FC
goto_if_eq EventScript_1710FC
compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3
goto_if eq, EventScript_171134
goto_if_eq EventScript_171134
msgbox gUnknown_81A1321
closemessage
applymovement 3, Movement_FaceOriginalDirection
@@ -236,9 +228,9 @@ EventScript_170F35:: @ 8170F35
msgbox gUnknown_81A1EBD
random 3
compare VAR_RESULT, 0
goto_if eq, EventScript_170F6D
goto_if_eq EventScript_170F6D
compare VAR_RESULT, 1
goto_if eq, EventScript_170F84
goto_if_eq EventScript_170F84
famechecker FAMECHECKER_BILL, 5
msgbox gUnknown_81A2076
release
@@ -325,14 +317,14 @@ EventScript_171044:: @ 8171044
waitmovement 0
msgbox gUnknown_81A19AA, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_171099
goto_if_eq EventScript_171099
goto EventScript_1710B2
end
EventScript_171099:: @ 8171099
msgbox gUnknown_81A1A08, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_171099
goto_if_eq EventScript_171099
goto EventScript_1710B2
end
@@ -341,7 +333,7 @@ EventScript_1710B2:: @ 81710B2
removeitem ITEM_RUBY, 1
removeitem ITEM_TRI_PASS, 1
setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5
additem ITEM_RAINBOW_PASS, 1
additem ITEM_RAINBOW_PASS
setflag FLAG_SYS_SEVII_MAP_4567
textcolor 3
playfanfare MUS_FAN5
@@ -404,8 +396,7 @@ OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151
OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A
lock
faceplayer
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_17116F
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_17116F
msgbox gUnknown_81A218D
release
end
@@ -417,10 +408,8 @@ EventScript_17116F:: @ 817116F
OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179
lockall
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_1711A0
checkflag FLAG_SEVII_DETOUR_FINISHED
goto_if TRUE, EventScript_171196
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1711A0
goto_if_set FLAG_SEVII_DETOUR_FINISHED, EventScript_171196
msgbox gUnknown_81A223F
releaseall
end
@@ -467,13 +456,13 @@ EventScript_1711DA:: @ 81711DA
msgbox gUnknown_81A13B8
closemessage
compare VAR_TEMP_1, 1
call_if eq, EventScript_1712E4
call_if_eq EventScript_1712E4
compare VAR_TEMP_1, 2
call_if eq, EventScript_1712EF
call_if_eq EventScript_1712EF
compare VAR_TEMP_1, 3
call_if eq, EventScript_1712FA
call_if_eq EventScript_1712FA
compare VAR_TEMP_1, 4
call_if eq, EventScript_171305
call_if_eq EventScript_171305
delay 10
msgbox gUnknown_81A13CB
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown