diff options
Diffstat (limited to 'data/maps/Route111')
| -rw-r--r-- | data/maps/Route111/events.inc | 2 | ||||
| -rw-r--r-- | data/maps/Route111/header.inc | 2 | ||||
| -rw-r--r-- | data/maps/Route111/scripts.inc | 22 |
3 files changed, 13 insertions, 13 deletions
diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc index 46e3b067b..975141b73 100644 --- a/data/maps/Route111/events.inc +++ b/data/maps/Route111/events.inc @@ -43,7 +43,7 @@ Route111_EventObjects: @ 85291F0 object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route111_EventScript_290DC2, FLAG_ITEM_ROUTE_111_ELIXIR object_event 43, EVENT_OBJ_GFX_HIKER, 0, 14, 56, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 0, 0, Route111_EventScript_1F119B, 0 object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_DESERT_FOSSIL - object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_DESERT_RIVAL + object_event 45, EVENT_OBJ_GFX_VAR_0, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_PLAYER_DESCENT object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1F11E4, FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY Route111_MapWarps: @ 8529640 diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index 449498ed4..cb975e74a 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -10,6 +10,6 @@ Route111: @ 8482790 .byte WEATHER_SUNNY .byte MAP_TYPE_ROUTE .2byte 0 - .byte 13 + map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 98132b37f..ad6a16572 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -39,8 +39,8 @@ Route111_EventScript_1F0CE4:: @ 81F0CE4 Route111_MapScript1_1F0D87: @ 81F0D87 setvar VAR_0x40D6, 0 - special sub_81BE79C - call_if_unset FLAG_0x14E, Route111_EventScript_1F0E3C + special SetMirageTowerVisibility + call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C compare VAR_0x40CB, 1 call_if_eq Route111_EventScript_1F0DC2 compare VAR_0x40CB, 2 @@ -53,18 +53,18 @@ Route111_MapScript1_1F0D87: @ 81F0D87 Route111_EventScript_1F0DC2:: @ 81F0DC2 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq Route111_EventScript_1F0DDA - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq Route111_EventScript_1F0DE0 return Route111_EventScript_1F0DDA:: @ 81F0DDA - setvar VAR_OBJ_GFX_ID_0, 100 + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return Route111_EventScript_1F0DE0:: @ 81F0DE0 - setvar VAR_OBJ_GFX_ID_0, 105 + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return Route111_EventScript_1F0DE6:: @ 81F0DE6 @@ -118,21 +118,21 @@ Route111_MapScript2_1F0E56: @ 81F0E56 Route111_EventScript_1F0E60:: @ 81F0E60 lockall - special sub_81BEB68 + special StartMirageTowerShake waitstate delay 24 playse SE_RU_HYUU addobject 45 - special sub_81BE7F4 + special StartPlayerDescendMirageTower waitstate showobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN removeobject 45 delay 16 turnobject EVENT_OBJ_ID_PLAYER, 2 delay 16 - special sub_81BEB54 + special StartMirageTowerDisintegration waitstate - special sub_81BEB7C + special StartMirageTowerFossilFallAndSink waitstate setvar VAR_0x40CB, 2 clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL @@ -415,7 +415,7 @@ Route111_EventScript_1F119B:: @ 81F119B goto_if_eq Route111_EventScript_1F11C6 compare VAR_0x40CB, 2 goto_if_eq Route111_EventScript_1F11D0 - goto_if_set FLAG_0x14E, Route111_EventScript_1F11DA + goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F11DA msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT release end |