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

2
data/maps/OldaleTown/events.inc
View File

@@ -2,7 +2,7 @@ OldaleTown_EventObjects: @ 8527854
object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0
object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0
object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0
object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, FLAG_HIDE_OLDALE_TOWN_RIVAL
object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, FLAG_HIDE_OLDALE_TOWN_RIVAL
OldaleTown_MapWarps: @ 85278B4
warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1

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

@@ -10,6 +10,6 @@ OldaleTown: @ 84825D0
.byte WEATHER_SUNNY
.byte MAP_TYPE_TOWN
.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/OldaleTown/scripts.inc
View File

@@ -255,9 +255,9 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6
OldaleTown_EventScript_1E90E6:: @ 81E90E6
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq OldaleTown_EventScript_1E90FE
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq OldaleTown_EventScript_1E910C
end