Merge branch 'master' into link

This commit is contained in:
scnorton
2018-01-18 12:53:31 -05:00
3620 changed files with 632656 additions and 52484 deletions
+4 -4
View File
@@ -1,12 +1,12 @@
gSoundInfo
gPokemonCrySongs
gPokemonCryMusicPlayers
gMPlay_BGM
gMPlayInfo_BGM
gMPlayJumpTable
gCgbChans
gMPlay_SE1
gMPlay_SE2
gMPlayInfo_SE1
gMPlayInfo_SE2
gPokemonCryTracks
gPokemonCrySong
gMPlayMemAccArea
gMPlay_SE3
gMPlayInfo_SE3
+5
View File
@@ -0,0 +1,5 @@
gUnknown_03006080
gUnknown_03006084
gApproachingTrainers
gNoOfApproachingTrainers
gUnknown_030060AC