dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Tetrable
2019-01-02 21:25:14 +00:00
parent 1e3da62d24 a0ff38d0be
commit a3ebca4d81
773 changed files with 11252 additions and 23425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/maps/SouthernIsland_Interior/events.inc
View File

@@ -1,6 +1,6 @@
SouthernIsland_Interior_EventObjects: @ 853B89C
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 13, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE
object_event 2, EVENT_OBJ_GFX_TRADER, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON
object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 13, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE
object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON
SouthernIsland_Interior_MapWarps: @ 853B8CC
warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR

2
data/maps/SouthernIsland_Interior/header.inc
View File

@@ -10,6 +10,6 @@ SouthernIsland_Interior: @ 8485254
.byte WEATHER_SHADE
.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

4
data/maps/SouthernIsland_Interior/scripts.inc
View File

@@ -34,9 +34,9 @@ SouthernIsland_Interior_EventScript_242A95:: @ 8242A95
SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq SouthernIsland_Interior_EventScript_242AB8
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq SouthernIsland_Interior_EventScript_242ABE
end