Merge branch 'master' into battle_dome_cards

This commit is contained in:
PikalaxALT
2017-09-19 20:54:49 -04:00
58 changed files with 7814 additions and 21205 deletions
+4 -4
View File
@@ -654,7 +654,7 @@ gUnknown_02032304: @ 2032304
gUnknown_02032306: @ 2032306
.space 0x2
gUnknown_02032308: @ 2032308
gLinkPlayerMapObjects: @ 2032308
.space 0x10
gUnknown_02032318: @ 2032318
@@ -663,7 +663,7 @@ gUnknown_02032318: @ 2032318
gMapHeader: @ 2037318
.space 0x1C
gUnknown_02037334: @ 2037334
gCamera: @ 2037334
.space 0xC
gUnknown_02037340: @ 2037340
@@ -678,7 +678,7 @@ gUnknown_0203734C: @ 203734C
gMapObjects: @ 2037350
.space 0x240
gUnknown_02037590: @ 2037590
gPlayerAvatar: @ 2037590
.space 0x14
gUnknown_020375A4: @ 20375A4
@@ -902,7 +902,7 @@ gUnknown_02038C00: @ 2038C00
gUnknown_02038C04: @ 2038C04
.space 0x4
gUnknown_02038C08: @ 2038C08
gFieldEffectSpawnParams: @ 2038C08
.space 0x20
gUnknown_02038C28: @ 2038C28