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

merge bike with master, fix conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-12-24 00:08:55 +01:00
parent 6b5157b2a3 841ee0f2b2
commit 8cd4908fa3
1429 changed files with 532566 additions and 21602 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/specials.inc
+3 -3
View File
@@ -7,7 +7,7 @@
.set __special__, 0
.align 2
gSpecials:: @ 81DBA64
def_special sp000_heal_pokemon
def_special HealPlayerParty
def_special sub_809D2BC
def_special sub_80AF948
def_special sub_80AF9F8
@@ -65,7 +65,7 @@ gSpecials:: @ 81DBA64
def_special ShowTrainerIntroSpeech
def_special ShowTrainerCantBattleSpeech
def_special GetTrainerFlag
def_special sub_80B45AC
def_special EndTrainerApproach
def_special SetUpTrainerEncounterMusic
def_special ShouldTryRematchBattle
def_special IsTrainerReadyForRematch
@@ -218,7 +218,7 @@ gSpecials:: @ 81DBA64
def_special EnterSafariMode
def_special ExitSafariMode
def_special GetPokeblockFeederInFront
def_special sub_8135908
def_special OpenPokeblockCaseOnFeeder
def_special sub_813793C
def_special sub_8137988
def_special sub_8137A0C