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/PalletTown_GarysHouse/scripts.inc
+14 -16
View File
@@ -4,9 +4,9 @@ PalletTown_GarysHouse_MapScripts:: @ 8168D27
PalletTown_GarysHouse_OnTransition:: @ 8168D2D
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
call_if lt, EventScript_168D44
call_if_lt EventScript_168D44
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
call_if ge, EventScript_168D50
call_if_ge EventScript_168D50
end
EventScript_168D44:: @ 8168D44
@@ -22,16 +22,15 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56
lock
faceplayer
famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
checkflag FLAG_SYS_GAME_CLEAR
goto_if TRUE, EventScript_168DB9
goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_168DB9
compare VAR_TEMP_1, 1
goto_if eq, EventScript_168EEC
goto_if_eq EventScript_168EEC
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
goto_if eq, EventScript_168F59
goto_if_eq EventScript_168F59
compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1
goto_if eq, EventScript_168EF6
goto_if_eq EventScript_168EF6
compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
goto_if ge, EventScript_168DAF
goto_if_ge EventScript_168DAF
msgbox gUnknown_818D58C
closemessage
applymovement 1, Movement_FaceOriginalDirection
@@ -47,23 +46,23 @@ EventScript_168DAF:: @ 8168DAF
EventScript_168DB9:: @ 8168DB9
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500
goto_if lt, EventScript_168E46
goto_if_lt EventScript_168E46
msgbox gUnknown_818D7D3, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if eq, EventScript_168E3C
goto_if_eq EventScript_168E3C
msgbox gUnknown_818D8B2
special Special_ChooseMonFromParty
waitstate
lock
faceplayer
compare VAR_0x8004, 6
goto_if ge, EventScript_168E3C
goto_if_ge EventScript_168E3C
specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
compare VAR_RESULT, SPECIES_EGG
goto_if eq, EventScript_168E32
goto_if_eq EventScript_168E32
msgbox gUnknown_818D8CC
closemessage
fadescreen 1
@@ -144,7 +143,7 @@ EventScript_168EF6:: @ 8168EF6
closemessage
checkitemspace ITEM_TOWN_MAP, 1
compare VAR_RESULT, 0
goto_if eq, EventScript_168F4F
goto_if_eq EventScript_168F4F
applymovement 1, Movement_WalkInPlaceFastestRight
waitmovement 0
removeobject 2
@@ -153,8 +152,7 @@ EventScript_168EF6:: @ 8168EF6
applymovement 1, Movement_FacePlayer
waitmovement 0
delay 12
additem ITEM_TOWN_MAP, 1
giveitemfanfaremsg gUnknown_818D661, ITEM_TOWN_MAP, 1, MUS_FAN5
giveitem_msg gUnknown_818D661, ITEM_TOWN_MAP, 1, MUS_FAN5
release
end