diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-23 09:05:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-23 09:05:26 -0400 |
| commit | 6e36c229200e083ca005cbc448e99210d111f3b2 (patch) | |
| tree | aec86bd0f081a7ff207f68cba33315991b629be1 /data/maps/OneIsland | |
| parent | 4bc284ff2c7d0ec3f24df8d94a77860fbaed588b (diff) | |
| parent | 3efd2e1210b4149628197446d063df0fc11281ab (diff) | |
Merge pull request #130 from PikalaxALT/trainers
Trainers, event flags, mystery_event_msg, map object gfx
Diffstat (limited to 'data/maps/OneIsland')
| -rw-r--r-- | data/maps/OneIsland/map.json | 8 | ||||
| -rw-r--r-- | data/maps/OneIsland/scripts.inc | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index 0bd30ba71..fb1e43775 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "73", + "graphics_id": "MAP_OBJ_GFX_BILL", "x": 12, "y": 16, "elevation": 3, @@ -35,10 +35,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "113" + "flag": "FLAG_HIDE_ONE_ISLAND_BILL" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 16, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 13, "y": 9, "elevation": 3, diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 540980a3e..16830e056 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -83,10 +83,10 @@ Movement_167514:: @ 8167514 OneIsland_EventScript_167517:: @ 8167517 lock faceplayer - checkflag FLAG_0x844 - goto_if_eq EventScript_16753F - checkflag FLAG_0x2A1 - goto_if_eq EventScript_167535 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + goto_if TRUE, EventScript_16753F + checkflag FLAG_SEVII_DETOUR_FINISHED + goto_if TRUE, EventScript_167535 msgbox gUnknown_818174E release end |