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/MossdeepCity_SpaceCenter_2F/header.inc
View File

@@ -10,6 +10,6 @@ MossdeepCity_SpaceCenter_2F: @ 84839D4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -349,9 +349,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_224166:: @ 8224166
MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175
lockall
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_224193
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22419A
closemessage
clearflag FLAG_DEFEATED_MAGMA_SPACE_CENTER