diff options
| author | Tetrable <atifhuss386@gmail.com> | 2019-01-02 21:25:14 +0000 |
|---|---|---|
| committer | Tetrable <atifhuss386@gmail.com> | 2019-01-02 21:25:14 +0000 |
| commit | a3ebca4d814adcf245212cb549f72812f2cf39c6 (patch) | |
| tree | 88fddcd03a5f19cf84b6199863f95fd06f1954bf /data/maps/Route104 | |
| parent | 1e3da62d24ad91e4d69ac6974476fd5ea47cae9b (diff) | |
| parent | a0ff38d0be4f618822d96cc7833e7c331ee78b5f (diff) | |
Fix merge conflicts
Diffstat (limited to 'data/maps/Route104')
| -rw-r--r-- | data/maps/Route104/events.inc | 2 | ||||
| -rw-r--r-- | data/maps/Route104/header.inc | 2 | ||||
| -rw-r--r-- | data/maps/Route104/scripts.inc | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc index 889ef3595..53e868559 100644 --- a/data/maps/Route104/events.inc +++ b/data/maps/Route104/events.inc @@ -32,7 +32,7 @@ Route104_EventObjects: @ 85282E4 object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D26, FLAG_ITEM_ROUTE_104_POTION object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED057, 0 object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0 - object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, FLAG_HIDE_ROUTE_104_RIVAL + object_event 34, EVENT_OBJ_GFX_VAR_0, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, FLAG_HIDE_ROUTE_104_RIVAL Route104_MapWarps: @ 8528614 warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index df6f0d34a..101e690d5 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -10,6 +10,6 @@ Route104: @ 84826CC .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/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 6cddd613f..e904f69b7 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -72,9 +72,9 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 Route104_EventScript_1ECD11:: @ 81ECD11 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq Route104_EventScript_1ECD29 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq Route104_EventScript_1ECD2E return @@ -88,9 +88,9 @@ Route104_EventScript_1ECD2E:: @ 81ECD2E Route104_EventScript_1ECD33:: @ 81ECD33 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE goto_if_eq Route104_EventScript_1ECD4B - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE goto_if_eq Route104_EventScript_1ECE6F end |