Merge remote-tracking branch 'upstream/master'

This commit is contained in:
paul
2018-10-06 17:51:44 +02:00
179 changed files with 23676 additions and 28736 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
.section script_data, "aw", %progbits
gUnknown_81D9BF4:: @ 81D9BF4
BattleAIs:: @ 81D9BF4
.incbin "baserom.gba", 0x1D9BF4, 0x20FC
+7 -5728
View File
File diff suppressed because it is too large Load Diff
+5711
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -1,9 +1,9 @@
.section script_data, "aw", %progbits
gUnknown_815F9B4:: @ 815F9B4
gScriptCmdTable:: @ 815F9B4
.incbin "baserom.gba", 0x15F9B4, 0x354
gUnknown_815FD08:: @ 815FD08
gScriptCmdTableEnd:: @ 815FD08
.incbin "baserom.gba", 0x15FD08, 0x4
gUnknown_815FD0C:: @ 815FD0C
+2 -2
View File
@@ -3,7 +3,7 @@
voicegroup_pokemon_cry:: @ 8489C8C
.incbin "baserom.gba", 0x489C8C, 0x2C88
gUnknown_848C914:: @ 848C914
gCryTable:: @ 848C914
.incbin "baserom.gba", 0x48C914, 0x600
gUnknown_848CF14:: @ 848CF14
@@ -15,7 +15,7 @@ gUnknown_848D514:: @ 848D514
gUnknown_848DB14:: @ 848DB14
.incbin "baserom.gba", 0x48DB14, 0x30
gUnknown_848DB44:: @ 848DB44
gCryTable2:: @ 848DB44
.incbin "baserom.gba", 0x48DB44, 0x600
gUnknown_848E144:: @ 848E144