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

@@ -10,6 +10,6 @@ BattleFrontier_Lounge6: @ 848567C
.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

8
data/maps/BattleFrontier_Lounge6/scripts.inc
View File

@@ -7,7 +7,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_265083
setvar VAR_0x8008, 3
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_807E73C
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO
compare VAR_RESULT, 0
@@ -18,14 +18,14 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
compare VAR_0x8004, 255
goto_if_eq BattleFrontier_Lounge6_EventScript_26506B
copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_807E9D4
specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009
goto_if_ne BattleFrontier_Lounge6_EventScript_265075
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
special sub_807EA10
special sub_807F0E4
special CreateInGameTradePokemon
special DoInGameTradeScene
waitstate
msgbox BattleFrontier_Lounge6_Text_265128, MSGBOX_DEFAULT
setflag FLAG_BATTLE_FRONTIER_TRADE_DONE