summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-09-02 00:37:02 -0700
committerYamaArashi <shadow962@live.com>2016-09-02 00:37:02 -0700
commit4e9af89700b7dfd032427cc9d59cd68989fedd2b (patch)
tree90cbf1ad00dab2eb9cf78a9b52281abcabde5296
parenteba3a64ddf5ce0d3191db43687a32ebe09a35797 (diff)
subsprite tables
-rw-r--r--asm/rom5.s2
-rw-r--r--data/data2.s37
-rw-r--r--ewram_syms.txt2
3 files changed, 38 insertions, 3 deletions
diff --git a/asm/rom5.s b/asm/rom5.s
index bf379d547..7a6d41461 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -426155,7 +426155,7 @@ _0814AA98:
_0814AAA8: .4byte gUnknown_0842F790
_0814AAAC: .4byte 0x0203a3d0
_0814AAB0: .4byte 0x02020004
-_0814AAB4: .4byte gUnknown_0842F5C0
+_0814AAB4: .4byte gSubspriteTables_842F5C0
_0814AAB8: .4byte 0x0203a3d1
thumb_func_end sub_814A958
diff --git a/data/data2.s b/data/data2.s
index 76b07be3e..471a37ed4 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -32177,11 +32177,44 @@ Unknown_842F558: @ 842F558
.4byte Unknown_842F4F0
.4byte Unknown_842F520
+ .align 2
gUnknown_0842F5BC:: @ 842F5BC
.4byte Unknown_842F558
-gUnknown_0842F5C0:: @ 842F5C0
- .incbin "baserom.gba", 0x0042f5c0, 0x100
+ .align 2
+gSubspriteTables_842F5C0:: @ 842F5C0
+ .4byte 1, gSubspriteTable_203A380
+ .4byte 1, gSubspriteTable_203A380
+ .4byte 2, gSubspriteTable_203A380
+ .4byte 3, gSubspriteTable_203A380
+ .4byte 4, gSubspriteTable_203A380
+ .4byte 5, gSubspriteTable_203A380
+ .4byte 6, gSubspriteTable_203A380
+ .4byte 7, gSubspriteTable_203A380
+ .4byte 8, gSubspriteTable_203A380
+ .4byte 9, gSubspriteTable_203A380
+ .4byte 10, gSubspriteTable_203A380
+ .4byte 11, gSubspriteTable_203A380
+ .4byte 12, gSubspriteTable_203A380
+ .4byte 13, gSubspriteTable_203A380
+ .4byte 14, gSubspriteTable_203A380
+ .4byte 15, gSubspriteTable_203A380
+ .4byte 1, gSubspriteTable_203A380
+ .4byte 17, gSubspriteTable_203A380
+ .4byte 18, gSubspriteTable_203A380
+ .4byte 19, gSubspriteTable_203A380
+ .4byte 20, gSubspriteTable_203A380
+ .4byte 21, gSubspriteTable_203A380
+ .4byte 22, gSubspriteTable_203A380
+ .4byte 23, gSubspriteTable_203A380
+ .4byte 24, gSubspriteTable_203A380
+ .4byte 25, gSubspriteTable_203A380
+ .4byte 26, gSubspriteTable_203A380
+ .4byte 27, gSubspriteTable_203A380
+ .4byte 28, gSubspriteTable_203A380
+ .4byte 29, gSubspriteTable_203A380
+ .4byte 30, gSubspriteTable_203A380
+ .4byte 31, gSubspriteTable_203A380
.align 2
gUnknown_0842F6C0:: @ 842F6C0
diff --git a/ewram_syms.txt b/ewram_syms.txt
index effd87696..5ccfe75e4 100644
--- a/ewram_syms.txt
+++ b/ewram_syms.txt
@@ -17,3 +17,5 @@ word_203855E = 0x203855E;
gUnknown_0203869A = 0x203869A;
gTileBuffer = 0x2039360;
+
+gSubspriteTable_203A380 = 0x203A380;