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/FortreeCity_House1/scripts.inc
+4 -4
View File
@@ -7,7 +7,7 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB
goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_216355
setvar VAR_0x8008, 1
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_807E73C
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
msgbox FortreeCity_House1_Text_21637B, MSGBOX_YESNO
compare VAR_RESULT, 0
@@ -18,14 +18,14 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB
compare VAR_0x8004, 255
goto_if_eq FortreeCity_House1_EventScript_21633D
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 FortreeCity_House1_EventScript_216347
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
special sub_807EA10
special sub_807F0E4
special CreateInGameTradePokemon
special DoInGameTradeScene
waitstate
bufferspeciesname 0, VAR_0x8009
msgbox FortreeCity_House1_Text_216440, MSGBOX_DEFAULT