diff options
Diffstat (limited to 'data/scripts/maps/SlateportCity_Harbor.inc')
| -rw-r--r-- | data/scripts/maps/SlateportCity_Harbor.inc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 34d927753..ae19d0326 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -7,19 +7,19 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 setvar 0x4001, 0 compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR call_if 1, SlateportCity_Harbor_EventScript_155F85 end SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 - clearflag 860 + clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR return SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 savebgm BGM_EVIL_TEAM setobjectxyperm 4, 12, 13 setobjectmovementtype 4, 9 - setflag 905 + setflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR return SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B @@ -73,8 +73,8 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closemessage - setflag 821 - setflag 822 + setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT + setflag FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT moveobjectoffscreen 4 setobjectmovementtype 4, 10 releaseall @@ -159,7 +159,7 @@ SlateportCity_Harbor_Movement_1560C2:: @ 81560C2 SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 lock faceplayer - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_Harbor_EventScript_1560D9 msgbox SlateportCity_Harbor_Text_17FA0A, 4 release @@ -268,11 +268,11 @@ SlateportCity_Harbor_EventScript_156208:: @ 8156208 SlateportCity_Harbor_EventScript_156211:: @ 8156211 lock faceplayer - checkflag 2061 + checkflag FLAG_BADGE07_GET goto_if_eq SlateportCity_Harbor_EventScript_15626F - checkflag 271 + checkflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE goto_if_eq SlateportCity_Harbor_EventScript_156265 - checkflag 112 + checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq SlateportCity_Harbor_EventScript_156258 compare 0x40a0, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E @@ -289,7 +289,7 @@ SlateportCity_Harbor_EventScript_15624E:: @ 815624E end SlateportCity_Harbor_EventScript_156258:: @ 8156258 - setflag 271 + setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE msgbox SlateportCity_Harbor_Text_17FF35, 4 release end @@ -305,7 +305,7 @@ SlateportCity_Harbor_EventScript_15626F:: @ 815626F checkitem ITEM_SCANNER, 1 compare RESULT, 1 goto_if_eq SlateportCity_Harbor_EventScript_1562A7 - checkflag 2052 + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_Harbor_EventScript_15629D msgbox SlateportCity_Harbor_Text_18017B, 4 release @@ -340,7 +340,7 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 - setflag 294 + setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 end @@ -353,7 +353,7 @@ SlateportCity_Harbor_EventScript_15632A:: @ 815632A goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 - setflag 294 + setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 end |