diff options
Diffstat (limited to 'data/maps/NavelRock_Base')
| -rw-r--r-- | data/maps/NavelRock_Base/map.json | 4 | ||||
| -rw-r--r-- | data/maps/NavelRock_Base/scripts.inc | 50 |
2 files changed, 27 insertions, 27 deletions
diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index aa97091ec..0441624ed 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "144", + "graphics_id": "MAP_OBJ_GFX_LUGIA", "x": 10, "y": 15, "elevation": 3, @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "NavelRock_Base_EventScript_165134", - "flag": "155" + "flag": "FLAG_HIDE_LUGIA" } ], "warp_events": [ diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 78c468022..98bb6f920 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -4,38 +4,38 @@ NavelRock_Base_MapScripts:: @ 81650E7 .byte 0 NavelRock_Base_MapScript1_1650F2:: @ 81650F2 - checkflag FLAG_0x2F2 - call_if 1, EventScript_165105 - checkflag FLAG_0x2F2 - call_if 0, EventScript_165109 + checkflag FLAG_FOUGHT_LUGIA + call_if TRUE, EventScript_165105 + checkflag FLAG_FOUGHT_LUGIA + call_if FALSE, EventScript_165109 end EventScript_165105:: @ 8165105 - setflag FLAG_0x09B + setflag FLAG_HIDE_LUGIA return EventScript_165109:: @ 8165109 - checkflag FLAG_0x2F5 - goto_if_eq EventScript_1A77A9 - clearflag FLAG_0x09B + checkflag FLAG_LUGIA_FLEW_AWAY + goto_if TRUE, EventScript_1A77A9 + clearflag FLAG_HIDE_LUGIA return NavelRock_Base_MapScript2_165116:: @ 8165116 - checkflag FLAG_0x807 - call_if 1, EventScript_165120 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_165120 end EventScript_165120:: @ 8165120 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + goto_if ne, EventScript_1A77A9 removeobject 1 return NavelRock_Base_EventScript_165134:: @ 8165134 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -64,23 +64,23 @@ NavelRock_Base_EventScript_165134:: @ 8165134 setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 special CreateObedientEnemyMon - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_807F9D8 waitstate - clearflag FLAG_0x807 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1651D9 - compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_1651E7 - compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_1651E7 - setflag FLAG_0x2F2 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_WON + goto_if eq, EventScript_1651D9 + compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + goto_if eq, EventScript_1651E7 + compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if eq, EventScript_1651E7 + setflag FLAG_FOUGHT_LUGIA release end EventScript_1651D9:: @ 81651D9 - setflag FLAG_0x2F5 + setflag FLAG_LUGIA_FLEW_AWAY setvar VAR_0x8004, SPECIES_LUGIA goto EventScript_1A9236 end |