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/FourIsland/scripts.inc
+10 -12
View File
@@ -6,7 +6,7 @@ FourIsland_MapScripts:: @ 8167CAE
FourIsland_OnTransition:: @ 8167CB9
setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND
compare VAR_MAP_SCENE_FOUR_ISLAND, 0
call_if eq, EventScript_167CCD
call_if_eq EventScript_167CCD
call EventScript_167CD1
end
@@ -15,8 +15,7 @@ EventScript_167CCD:: @ 8167CCD
return
EventScript_167CD1:: @ 8167CD1
checkflag FLAG_PENDING_DAYCARE_EGG
goto_if FALSE, EventScript_167CE1
goto_if_unset FLAG_PENDING_DAYCARE_EGG, EventScript_167CE1
setobjectxyperm 1, 16, 14
EventScript_167CE1:: @ 8167CE1
@@ -73,18 +72,18 @@ Movement_167D52:: @ 8167D52
FourIsland_EventScript_167D55:: @ 8167D55
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
special sub_8112364
lock
faceplayer
special GetDaycareMonNicknames
specialvar VAR_RESULT, GetDaycareState
compare VAR_RESULT, 1
goto_if eq, EventScript_167D9B
goto_if_eq EventScript_167D9B
compare VAR_RESULT, 2
goto_if eq, EventScript_167E0C
goto_if_eq EventScript_167E0C
compare VAR_RESULT, 3
goto_if eq, EventScript_167E19
goto_if_eq EventScript_167E19
msgbox gUnknown_81BF555
release
end
@@ -92,10 +91,10 @@ FourIsland_EventScript_167D55:: @ 8167D55
EventScript_167D9B:: @ 8167D9B
msgbox gUnknown_81BF5E3, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_167DD1
goto_if_eq EventScript_167DD1
msgbox gUnknown_81BF7B6, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if eq, EventScript_167DD1
goto_if_eq EventScript_167DD1
msgbox gUnknown_81BF6CF
clearflag FLAG_PENDING_DAYCARE_EGG
special RejectEggFromDayCare
@@ -105,7 +104,7 @@ EventScript_167D9B:: @ 8167D9B
EventScript_167DD1:: @ 8167DD1
specialvar VAR_RESULT, CalculatePlayerPartyCount
compare VAR_RESULT, 6
goto_if ne, EventScript_167DEB
goto_if_ne EventScript_167DEB
msgbox gUnknown_81BF6F0
release
end
@@ -142,8 +141,7 @@ EventScript_167E19:: @ 8167E19
FourIsland_EventScript_167E2E:: @ 8167E2E
lock
faceplayer
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_167E43
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167E43
msgbox gUnknown_8182A2B
release
end