Merge remote-tracking branch 'pret/master'

This commit is contained in:
Diegoisawesome
2017-09-09 20:54:41 -05:00
211 changed files with 149330 additions and 147270 deletions

View File

@@ -323,10 +323,10 @@ gUnknown_03001204: @ 3001204
gUnknown_03001208: @ 3001208
.space 0x2
gUnknown_0300120A: @ 300120A
sTestingTransitionId: @ 300120A
.space 0x1
gUnknown_0300120B: @ 300120B
sTestingTransitionState: @ 300120B
.space 0x5
gUnknown_03001210: @ 3001210