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
data/maps/LittlerootTown/events.inc
+1 -1
View File
@@ -5,7 +5,7 @@ LittlerootTown_EventObjects: @ 85276A8
object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK
object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK
object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
object_event 7, EVENT_OBJ_GFX_VAR_0, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
LittlerootTown_MapWarps: @ 8527768
data/maps/LittlerootTown/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ LittlerootTown: @ 84825B4
.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
data/maps/LittlerootTown/scripts.inc
+16 -16
View File
@@ -68,9 +68,9 @@ LittlerootTown_EventScript_1E7E92:: @ 81E7E92
clearflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
setobjectmovementtype 4, 8
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_1E7EB1
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_1E7EB9
return
@@ -381,9 +381,9 @@ LittlerootTown_EventScript_1E815A:: @ 81E815A
LittlerootTown_EventScript_1E8163:: @ 81E8163
lockall
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_1E817D
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_1E8186
releaseall
end
@@ -399,9 +399,9 @@ LittlerootTown_EventScript_1E8186:: @ 81E8186
LittlerootTown_EventScript_1E818F:: @ 81E818F
lockall
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_1E81A9
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_1E81B2
releaseall
end
@@ -454,27 +454,27 @@ LittlerootTown_EventScript_1E8205:: @ 81E8205
LittlerootTown_EventScript_1E8211:: @ 81E8211
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_1E8297
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_1E82A2
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_1E8281
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_1E828C
msgbox LittlerootTown_Text_1E87E1, MSGBOX_DEFAULT
closemessage
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_1E82AD
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_1E82F0
call LittlerootTown_EventScript_1E8693
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_1E8405
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_1E8448
goto LittlerootTown_EventScript_1E8686
end
@@ -889,9 +889,9 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D
lock
faceplayer
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_1E8281
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_1E828C
call LittlerootTown_EventScript_1E8693
applymovement 4, LittlerootTown_Movement_2725A6