dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

fix pokeblock conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-12-18 16:58:14 +01:00
parent c3abe2863f 6a674e1e83
commit cb229f56e8
174 changed files with 5529 additions and 7226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/cable_club.inc
+2 -2
View File
@@ -409,7 +409,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F23:: @ 8276F23
end
OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E
special sub_80F92F8
special HasEnoughMonsForDoubleBattle
compare_var_to_value VAR_RESULT, 0
goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_276F47
setvar VAR_0x8004, 2
@@ -1194,7 +1194,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E
end
OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899
special sub_80F92F8
special HasEnoughMonsForDoubleBattle
compare_var_to_value VAR_RESULT, 0
goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_2778B2
setvar VAR_0x8004, 1