diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
| commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
| tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /common_syms | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'common_syms')
| -rw-r--r-- | common_syms/m4a_2.txt | 8 | ||||
| -rw-r--r-- | common_syms/trainer_see.txt | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/common_syms/m4a_2.txt b/common_syms/m4a_2.txt index b9281c718..0d6b13a79 100644 --- a/common_syms/m4a_2.txt +++ b/common_syms/m4a_2.txt @@ -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 diff --git a/common_syms/trainer_see.txt b/common_syms/trainer_see.txt new file mode 100644 index 000000000..2d0514325 --- /dev/null +++ b/common_syms/trainer_see.txt @@ -0,0 +1,5 @@ +gUnknown_03006080 +gUnknown_03006084 +gApproachingTrainers +gNoOfApproachingTrainers +gUnknown_030060AC |