diff options
| -rw-r--r-- | asm/rom3.s | 2 | ||||
| -rw-r--r-- | asm/rom5.s | 12 | ||||
| -rw-r--r-- | asm/rom_8074BAC.s | 2 | ||||
| -rw-r--r-- | data/data2.s | 805 |
4 files changed, 532 insertions, 289 deletions
diff --git a/asm/rom3.s b/asm/rom3.s index 68209eeb9..6309a7d91 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -100732,7 +100732,7 @@ gpu_pal_obj_decompress_and_apply: @ 803C56C .align 2, 0 _0803C594: .4byte 0x02024e8c _0803C598: .4byte gSpriteTemplate_8208288 -_0803C59C: .4byte gUnknown_081E7C64 +_0803C59C: .4byte gSpriteAnimTable_81E7C64 thumb_func_end gpu_pal_obj_decompress_and_apply thumb_func_start sub_803C5A0 diff --git a/asm/rom5.s b/asm/rom5.s index f95089a22..0e6fdb085 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -46386,7 +46386,7 @@ sub_8091878: @ 8091878 _080918A0: .4byte 0x02024e8c _080918A4: .4byte gUnknown_083B57A4 _080918A8: .4byte gUnknown_083B5794 -_080918AC: .4byte gUnknown_081E7C64 +_080918AC: .4byte gSpriteAnimTable_81E7C64 thumb_func_end sub_8091878 thumb_func_start sub_80918B0 @@ -105563,7 +105563,7 @@ _080AE9E8: .4byte gMonPaletteTable _080AE9EC: .4byte 0x02024e8c _080AE9F0: .4byte 0x02020004 _080AE9F4: .4byte SpriteCallbackDummy -_080AE9F8: .4byte gUnknown_081E7C18 +_080AE9F8: .4byte gSpriteAffineAnimTable_81E7C18 thumb_func_end unref_sub_80AE908 thumb_func_start sub_80AE9FC @@ -105670,7 +105670,7 @@ _080AEAD4: .4byte gUnknown_081FAF4C _080AEAD8: .4byte 0x02024e8c _080AEADC: .4byte 0x02020004 _080AEAE0: .4byte SpriteCallbackDummy -_080AEAE4: .4byte gUnknown_081E7C18 +_080AEAE4: .4byte gSpriteAffineAnimTable_81E7C18 _080AEAE8: mov r0, r8 adds r0, 0x10 @@ -367642,7 +367642,7 @@ _0812D9DC: .4byte 0x84000200 _0812D9E0: .4byte 0x02019348 _0812D9E4: .4byte 0x02020004 _0812D9E8: .4byte 0x02024be0 -_0812D9EC: .4byte gUnknown_081E7C18 +_0812D9EC: .4byte gSpriteAffineAnimTable_81E7C18 _0812D9F0: ldr r3, _0812DA34 ldr r4, _0812DA38 @@ -375138,7 +375138,7 @@ _081313E8: _081313F4: .4byte 0x0202f7c8 _081313F8: .4byte 0x02020004 _081313FC: .4byte 0x02024be0 -_08131400: .4byte gUnknown_081E7C18 +_08131400: .4byte gSpriteAffineAnimTable_81E7C18 _08131404: .4byte sub_8131408 thumb_func_end sub_81312E4 @@ -411726,7 +411726,7 @@ sub_8143648: @ 8143648 _08143670: .4byte 0x02024e8c _08143674: .4byte gUnknown_0840B6B8 _08143678: .4byte gUnknown_0840B69C -_0814367C: .4byte gUnknown_081E7C64 +_0814367C: .4byte gSpriteAnimTable_81E7C64 thumb_func_end sub_8143648 thumb_func_start sub_8143680 diff --git a/asm/rom_8074BAC.s b/asm/rom_8074BAC.s index aacd440e7..dbf623a43 100644 --- a/asm/rom_8074BAC.s +++ b/asm/rom_8074BAC.s @@ -11274,7 +11274,7 @@ _0807A0D0: _0807A0E4: .4byte gSpriteTemplate_837F5B0 _0807A0E8: .4byte gUnknown_081E9114 _0807A0EC: .4byte 0x02020004 -_0807A0F0: .4byte gUnknown_081E7C18 +_0807A0F0: .4byte gSpriteAffineAnimTable_81E7C18 thumb_func_end sub_8079F44 thumb_func_start sub_807A0F4 diff --git a/data/data2.s b/data/data2.s index a0f2123cd..352c07d82 100644 --- a/data/data2.s +++ b/data/data2.s @@ -89,7 +89,14 @@ gSpriteImageTable_81E7A70:: @ 81E7A70 obj_frame_tiles 0x200F800, 0x800 .align 2 - .incbin "baserom.gba", 0x1e7a90, 0x10 +gSpriteAnim_81E7A90:: @ 81E7A90 + obj_image_anim_frame 0, 0 + obj_image_anim_end + + .align 2 +gSpriteAnim_81E7A98:: @ 81E7A98 + obj_image_anim_frame 3, 0 + obj_image_anim_end .align 2 gSpriteAffineAnim_81E7AA0:: @ 81E7AA0 @@ -97,7 +104,9 @@ gSpriteAffineAnim_81E7AA0:: @ 81E7AA0 obj_rot_scal_anim_end .align 2 - .incbin "baserom.gba", 0x1e7ab0, 0x10 +gSpriteAffineAnim_81E7AB0:: @ 81E7AB0 + obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 + obj_rot_scal_anim_end .align 2 gSpriteAffineAnim_81E7AC0:: @ 81E7AC0 @@ -194,24 +203,46 @@ gSpriteAffineAnimTable_81E7BEC:: @ 81E7BEC .4byte gSpriteAffineAnim_81E7B30 .4byte gSpriteAffineAnim_81E7BDC -gUnknown_081E7C18:: @ 81E7C18 - .incbin "baserom.gba", 0x001e7c18, 0x2c + .align 2 +gSpriteAffineAnimTable_81E7C18:: @ 81E7C18 + .4byte gSpriteAffineAnim_81E7AB0 + .4byte gSpriteAffineAnim_81E7AC0 + .4byte gSpriteAffineAnim_81E7AD8 + .4byte gSpriteAffineAnim_81E7AF0 + .4byte gSpriteAffineAnim_81E7B10 + .4byte gSpriteAffineAnim_81E7B20 + .4byte gSpriteAffineAnim_81E7B94 + .4byte gSpriteAffineAnim_81E7BA4 + .4byte gSpriteAffineAnim_81E7BBC + .4byte gSpriteAffineAnim_81E7B30 + .4byte gSpriteAffineAnim_81E7BDC + + .align 2 +gSpriteAnim_81E7C44:: @ 81E7C44 + obj_image_anim_frame 0, 0 + obj_image_anim_end + + .align 2 +gSpriteAnim_81E7C4C:: @ 81E7C4C + obj_image_anim_frame 1, 0 + obj_image_anim_end + + .align 2 +gSpriteAnim_81E7C54:: @ 81E7C54 + obj_image_anim_frame 2, 0 + obj_image_anim_end -Unknown_81E7C44: - .incbin "baserom.gba", 0x001e7c44, 0x8 -Unknown_81E7C4C: - .incbin "baserom.gba", 0x001e7c4c, 0x8 -Unknown_81E7C54: - .incbin "baserom.gba", 0x001e7c54, 0x8 -Unknown_81E7C5C: - .incbin "baserom.gba", 0x001e7c5c, 0x8 + .align 2 +gSpriteAnim_81E7C5C:: @ 81E7C5C + obj_image_anim_frame 3, 0 + obj_image_anim_end .align 2 -gUnknown_081E7C64:: @ 81E7C64 - .4byte Unknown_81E7C44 - .4byte Unknown_81E7C4C - .4byte Unknown_81E7C54 - .4byte Unknown_81E7C5C +gSpriteAnimTable_81E7C64:: @ 81E7C64 + .4byte gSpriteAnim_81E7C44 + .4byte gSpriteAnim_81E7C4C + .4byte gSpriteAnim_81E7C54 + .4byte gSpriteAnim_81E7C5C gUnknown_081E7C74:: @ 81E7C74 .incbin "baserom.gba", 0x001e7c74, 0x6e0 @@ -231,261 +262,441 @@ gUnknown_081E9114:: @ 81E9114 @ 81EB374 .include "data/graphics/pokemon/shiny_palette_table.s" -@ 81EC134 -Unknown_81EC134: - .incbin "baserom.gba", 0x001EC134, 0x18 -Unknown_81EC14C: - .incbin "baserom.gba", 0x001EC14C, 0x4 -Unknown_81EC150: - .incbin "baserom.gba", 0x001EC150, 0x4 -Unknown_81EC154: - .incbin "baserom.gba", 0x001EC154, 0x8 -Unknown_81EC15C: - .incbin "baserom.gba", 0x001EC15C, 0x4 -Unknown_81EC160: - .incbin "baserom.gba", 0x001EC160, 0x4 -Unknown_81EC164: - .incbin "baserom.gba", 0x001EC164, 0x4 -Unknown_81EC168: - .incbin "baserom.gba", 0x001EC168, 0x4 -Unknown_81EC16C: - .incbin "baserom.gba", 0x001EC16C, 0x8 -Unknown_81EC174: - .incbin "baserom.gba", 0x001EC174, 0x8 -Unknown_81EC17C: - .incbin "baserom.gba", 0x001EC17C, 0x4 -Unknown_81EC180: - .incbin "baserom.gba", 0x001EC180, 0x4 -Unknown_81EC184: - .incbin "baserom.gba", 0x001EC184, 0x4 -Unknown_81EC188: - .incbin "baserom.gba", 0x001EC188, 0x4 -Unknown_81EC18C: - .incbin "baserom.gba", 0x001EC18C, 0x4 -Unknown_81EC190: - .incbin "baserom.gba", 0x001EC190, 0x4 -Unknown_81EC194: - .incbin "baserom.gba", 0x001EC194, 0x4 -Unknown_81EC198: - .incbin "baserom.gba", 0x001EC198, 0x4 -Unknown_81EC19C: - .incbin "baserom.gba", 0x001EC19C, 0x4 -Unknown_81EC1A0: - .incbin "baserom.gba", 0x001EC1A0, 0x4 -Unknown_81EC1A4: - .incbin "baserom.gba", 0x001EC1A4, 0x4 -Unknown_81EC1A8: - .incbin "baserom.gba", 0x001EC1A8, 0x4 -Unknown_81EC1AC: - .incbin "baserom.gba", 0x001EC1AC, 0x4 -Unknown_81EC1B0: - .incbin "baserom.gba", 0x001EC1B0, 0x4 -Unknown_81EC1B4: - .incbin "baserom.gba", 0x001EC1B4, 0x4 -Unknown_81EC1B8: - .incbin "baserom.gba", 0x001EC1B8, 0x4 -Unknown_81EC1BC: - .incbin "baserom.gba", 0x001EC1BC, 0x4 -Unknown_81EC1C0: - .incbin "baserom.gba", 0x001EC1C0, 0x4 -Unknown_81EC1C4: - .incbin "baserom.gba", 0x001EC1C4, 0x4 -Unknown_81EC1C8: - .incbin "baserom.gba", 0x001EC1C8, 0x4 -Unknown_81EC1CC: - .incbin "baserom.gba", 0x001EC1CC, 0x4 -Unknown_81EC1D0: - .incbin "baserom.gba", 0x001EC1D0, 0x4 -Unknown_81EC1D4: - .incbin "baserom.gba", 0x001EC1D4, 0x4 -Unknown_81EC1D8: - .incbin "baserom.gba", 0x001EC1D8, 0x4 -Unknown_81EC1DC: - .incbin "baserom.gba", 0x001EC1DC, 0x4 -Unknown_81EC1E0: - .incbin "baserom.gba", 0x001EC1E0, 0x4 -Unknown_81EC1E4: - .incbin "baserom.gba", 0x001EC1E4, 0x4 -Unknown_81EC1E8: - .incbin "baserom.gba", 0x001EC1E8, 0x4 -Unknown_81EC1EC: - .incbin "baserom.gba", 0x001EC1EC, 0x4 -Unknown_81EC1F0: - .incbin "baserom.gba", 0x001EC1F0, 0x4 -Unknown_81EC1F4: - .incbin "baserom.gba", 0x001EC1F4, 0x4 -Unknown_81EC1F8: - .incbin "baserom.gba", 0x001EC1F8, 0x4 -Unknown_81EC1FC: - .incbin "baserom.gba", 0x001EC1FC, 0x4 -Unknown_81EC200: - .incbin "baserom.gba", 0x001EC200, 0x4 -Unknown_81EC204: - .incbin "baserom.gba", 0x001EC204, 0x4 -Unknown_81EC208: - .incbin "baserom.gba", 0x001EC208, 0x4 -Unknown_81EC20C: - .incbin "baserom.gba", 0x001EC20C, 0x4 -Unknown_81EC210: - .incbin "baserom.gba", 0x001EC210, 0x4 -Unknown_81EC214: - .incbin "baserom.gba", 0x001EC214, 0x4 -Unknown_81EC218: - .incbin "baserom.gba", 0x001EC218, 0x4 -Unknown_81EC21C: - .incbin "baserom.gba", 0x001EC21C, 0x4 -Unknown_81EC220: - .incbin "baserom.gba", 0x001EC220, 0x4 -Unknown_81EC224: - .incbin "baserom.gba", 0x001EC224, 0x4 -Unknown_81EC228: - .incbin "baserom.gba", 0x001EC228, 0x4 -Unknown_81EC22C: - .incbin "baserom.gba", 0x001EC22C, 0x4 -Unknown_81EC230: - .incbin "baserom.gba", 0x001EC230, 0x4 -Unknown_81EC234: - .incbin "baserom.gba", 0x001EC234, 0x4 -Unknown_81EC238: - .incbin "baserom.gba", 0x001EC238, 0x4 -Unknown_81EC23C: - .incbin "baserom.gba", 0x001EC23C, 0x4 -Unknown_81EC240: - .incbin "baserom.gba", 0x001EC240, 0x4 -Unknown_81EC244: - .incbin "baserom.gba", 0x001EC244, 0x4 -Unknown_81EC248: - .incbin "baserom.gba", 0x001EC248, 0x4 -Unknown_81EC24C: - .incbin "baserom.gba", 0x001EC24C, 0x4 -Unknown_81EC250: - .incbin "baserom.gba", 0x001EC250, 0x4 -Unknown_81EC254: - .incbin "baserom.gba", 0x001EC254, 0x4 -Unknown_81EC258: - .incbin "baserom.gba", 0x001EC258, 0x4 -Unknown_81EC25C: - .incbin "baserom.gba", 0x001EC25C, 0x4 -Unknown_81EC260: - .incbin "baserom.gba", 0x001EC260, 0x4 -Unknown_81EC264: - .incbin "baserom.gba", 0x001EC264, 0x4 -Unknown_81EC268: - .incbin "baserom.gba", 0x001EC268, 0x4 -Unknown_81EC26C: - .incbin "baserom.gba", 0x001EC26C, 0x4 -Unknown_81EC270: - .incbin "baserom.gba", 0x001EC270, 0x4 -Unknown_81EC274: - .incbin "baserom.gba", 0x001EC274, 0x4 -Unknown_81EC278: - .incbin "baserom.gba", 0x001EC278, 0x4 -Unknown_81EC27C: - .incbin "baserom.gba", 0x001EC27C, 0x4 -Unknown_81EC280: - .incbin "baserom.gba", 0x001EC280, 0x4 -Unknown_81EC284: - .incbin "baserom.gba", 0x001EC284, 0x4 -Unknown_81EC288: - .incbin "baserom.gba", 0x001EC288, 0x4 -Unknown_81EC28C: - .incbin "baserom.gba", 0x001EC28C, 0x4 -Unknown_81EC290: - .incbin "baserom.gba", 0x001EC290, 0x4 -Unknown_81EC294: - .incbin "baserom.gba", 0x001EC294, 0x4 -Unknown_81EC298: - .incbin "baserom.gba", 0x001EC298, 0x4 -Unknown_81EC29C: - .incbin "baserom.gba", 0x001EC29C, 0x4 -Unknown_81EC2A0: - .incbin "baserom.gba", 0x001EC2A0, 0x4 + .align 2 +gSpriteAnim_81EC134:: @ 81EC134 + obj_image_anim_frame 0, 7 + obj_image_anim_end + + .align 2 +gSpriteAnim_81EC13C:: @ 81EC13C + obj_image_anim_frame 0, 2 + obj_image_anim_end + + .align 2 +gSpriteAnim_81EC144:: @ 81EC144 + obj_image_anim_frame 0, 2 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_81EC14C:: @ 81EC14C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC150:: @ 81EC150 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC154:: @ 81EC154 + .4byte gSpriteAnim_81E7A90 + .4byte gSpriteAnim_81EC134 + + .align 2 +gSpriteAnimTable_81EC15C:: @ 81EC15C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC160:: @ 81EC160 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC164:: @ 81EC164 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC168:: @ 81EC168 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC16C:: @ 81EC16C + .4byte gSpriteAnim_81E7A90 + .4byte gSpriteAnim_81EC13C + + .align 2 +gSpriteAnimTable_81EC174:: @ 81EC174 + .4byte gSpriteAnim_81E7A90 + .4byte gSpriteAnim_81EC144 + + .align 2 +gSpriteAnimTable_81EC17C:: @ 81EC17C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC180:: @ 81EC180 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC184:: @ 81EC184 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC188:: @ 81EC188 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC18C:: @ 81EC18C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC190:: @ 81EC190 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC194:: @ 81EC194 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC198:: @ 81EC198 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC19C:: @ 81EC19C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1A0:: @ 81EC1A0 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1A4:: @ 81EC1A4 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1A8:: @ 81EC1A8 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1AC:: @ 81EC1AC + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1B0:: @ 81EC1B0 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1B4:: @ 81EC1B4 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1B8:: @ 81EC1B8 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1BC:: @ 81EC1BC + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1C0:: @ 81EC1C0 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1C4:: @ 81EC1C4 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1C8:: @ 81EC1C8 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1CC:: @ 81EC1CC + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1D0:: @ 81EC1D0 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1D4:: @ 81EC1D4 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1D8:: @ 81EC1D8 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1DC:: @ 81EC1DC + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1E0:: @ 81EC1E0 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1E4:: @ 81EC1E4 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1E8:: @ 81EC1E8 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1EC:: @ 81EC1EC + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1F0:: @ 81EC1F0 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1F4:: @ 81EC1F4 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1F8:: @ 81EC1F8 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC1FC:: @ 81EC1FC + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC200:: @ 81EC200 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC204:: @ 81EC204 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC208:: @ 81EC208 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC20C:: @ 81EC20C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC210:: @ 81EC210 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC214:: @ 81EC214 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC218:: @ 81EC218 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC21C:: @ 81EC21C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC220:: @ 81EC220 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC224:: @ 81EC224 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC228:: @ 81EC228 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC22C:: @ 81EC22C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC230:: @ 81EC230 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC234:: @ 81EC234 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC238:: @ 81EC238 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC23C:: @ 81EC23C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC240:: @ 81EC240 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC244:: @ 81EC244 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC248:: @ 81EC248 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC24C:: @ 81EC24C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC250:: @ 81EC250 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC254:: @ 81EC254 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC258:: @ 81EC258 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC25C:: @ 81EC25C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC260:: @ 81EC260 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC264:: @ 81EC264 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC268:: @ 81EC268 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC26C:: @ 81EC26C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC270:: @ 81EC270 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC274:: @ 81EC274 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC278:: @ 81EC278 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC27C:: @ 81EC27C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC280:: @ 81EC280 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC284:: @ 81EC284 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC288:: @ 81EC288 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC28C:: @ 81EC28C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC290:: @ 81EC290 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC294:: @ 81EC294 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC298:: @ 81EC298 + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC29C:: @ 81EC29C + .4byte gSpriteAnim_81E7A90 + + .align 2 +gSpriteAnimTable_81EC2A0:: @ 81EC2A0 + .4byte gSpriteAnim_81E7A90 .align 2 gUnknown_081EC2A4:: @ 81EC2A4 - .4byte Unknown_81EC14C - .4byte Unknown_81EC150 - .4byte Unknown_81EC154 - .4byte Unknown_81EC15C - .4byte Unknown_81EC160 - .4byte Unknown_81EC164 - .4byte Unknown_81EC168 - .4byte Unknown_81EC16C - .4byte Unknown_81EC174 - .4byte Unknown_81EC17C - .4byte Unknown_81EC180 - .4byte Unknown_81EC184 - .4byte Unknown_81EC188 - .4byte Unknown_81EC18C - .4byte Unknown_81EC190 - .4byte Unknown_81EC194 - .4byte Unknown_81EC198 - .4byte Unknown_81EC19C - .4byte Unknown_81EC1A0 - .4byte Unknown_81EC1A4 - .4byte Unknown_81EC1A8 - .4byte Unknown_81EC1AC - .4byte Unknown_81EC1B0 - .4byte Unknown_81EC1B4 - .4byte Unknown_81EC1B8 - .4byte Unknown_81EC1BC - .4byte Unknown_81EC1C0 - .4byte Unknown_81EC1C4 - .4byte Unknown_81EC1C8 - .4byte Unknown_81EC1CC - .4byte Unknown_81EC1D0 - .4byte Unknown_81EC1D4 - .4byte Unknown_81EC1D8 - .4byte Unknown_81EC1DC - .4byte Unknown_81EC1E0 - .4byte Unknown_81EC1E4 - .4byte Unknown_81EC1E8 - .4byte Unknown_81EC1EC - .4byte Unknown_81EC1F0 - .4byte Unknown_81EC1F4 - .4byte Unknown_81EC1F8 - .4byte Unknown_81EC1FC - .4byte Unknown_81EC200 - .4byte Unknown_81EC204 - .4byte Unknown_81EC208 - .4byte Unknown_81EC20C - .4byte Unknown_81EC210 - .4byte Unknown_81EC214 - .4byte Unknown_81EC218 - .4byte Unknown_81EC21C - .4byte Unknown_81EC220 - .4byte Unknown_81EC224 - .4byte Unknown_81EC228 - .4byte Unknown_81EC22C - .4byte Unknown_81EC230 - .4byte Unknown_81EC234 - .4byte Unknown_81EC238 - .4byte Unknown_81EC23C - .4byte Unknown_81EC240 - .4byte Unknown_81EC244 - .4byte Unknown_81EC248 - .4byte Unknown_81EC24C - .4byte Unknown_81EC250 - .4byte Unknown_81EC254 - .4byte Unknown_81EC258 - .4byte Unknown_81EC25C - .4byte Unknown_81EC260 - .4byte Unknown_81EC264 - .4byte Unknown_81EC268 - .4byte Unknown_81EC26C - .4byte Unknown_81EC270 - .4byte Unknown_81EC274 - .4byte Unknown_81EC278 - .4byte Unknown_81EC27C - .4byte Unknown_81EC280 - .4byte Unknown_81EC284 - .4byte Unknown_81EC288 - .4byte Unknown_81EC28C - .4byte Unknown_81EC290 - .4byte Unknown_81EC294 - .4byte Unknown_81EC298 - .4byte Unknown_81EC29C - .4byte Unknown_81EC2A0 + .4byte gSpriteAnimTable_81EC14C + .4byte gSpriteAnimTable_81EC150 + .4byte gSpriteAnimTable_81EC154 + .4byte gSpriteAnimTable_81EC15C + .4byte gSpriteAnimTable_81EC160 + .4byte gSpriteAnimTable_81EC164 + .4byte gSpriteAnimTable_81EC168 + .4byte gSpriteAnimTable_81EC16C + .4byte gSpriteAnimTable_81EC174 + .4byte gSpriteAnimTable_81EC17C + .4byte gSpriteAnimTable_81EC180 + .4byte gSpriteAnimTable_81EC184 + .4byte gSpriteAnimTable_81EC188 + .4byte gSpriteAnimTable_81EC18C + .4byte gSpriteAnimTable_81EC190 + .4byte gSpriteAnimTable_81EC194 + .4byte gSpriteAnimTable_81EC198 + .4byte gSpriteAnimTable_81EC19C + .4byte gSpriteAnimTable_81EC1A0 + .4byte gSpriteAnimTable_81EC1A4 + .4byte gSpriteAnimTable_81EC1A8 + .4byte gSpriteAnimTable_81EC1AC + .4byte gSpriteAnimTable_81EC1B0 + .4byte gSpriteAnimTable_81EC1B4 + .4byte gSpriteAnimTable_81EC1B8 + .4byte gSpriteAnimTable_81EC1BC + .4byte gSpriteAnimTable_81EC1C0 + .4byte gSpriteAnimTable_81EC1C4 + .4byte gSpriteAnimTable_81EC1C8 + .4byte gSpriteAnimTable_81EC1CC + .4byte gSpriteAnimTable_81EC1D0 + .4byte gSpriteAnimTable_81EC1D4 + .4byte gSpriteAnimTable_81EC1D8 + .4byte gSpriteAnimTable_81EC1DC + .4byte gSpriteAnimTable_81EC1E0 + .4byte gSpriteAnimTable_81EC1E4 + .4byte gSpriteAnimTable_81EC1E8 + .4byte gSpriteAnimTable_81EC1EC + .4byte gSpriteAnimTable_81EC1F0 + .4byte gSpriteAnimTable_81EC1F4 + .4byte gSpriteAnimTable_81EC1F8 + .4byte gSpriteAnimTable_81EC1FC + .4byte gSpriteAnimTable_81EC200 + .4byte gSpriteAnimTable_81EC204 + .4byte gSpriteAnimTable_81EC208 + .4byte gSpriteAnimTable_81EC20C + .4byte gSpriteAnimTable_81EC210 + .4byte gSpriteAnimTable_81EC214 + .4byte gSpriteAnimTable_81EC218 + .4byte gSpriteAnimTable_81EC21C + .4byte gSpriteAnimTable_81EC220 + .4byte gSpriteAnimTable_81EC224 + .4byte gSpriteAnimTable_81EC228 + .4byte gSpriteAnimTable_81EC22C + .4byte gSpriteAnimTable_81EC230 + .4byte gSpriteAnimTable_81EC234 + .4byte gSpriteAnimTable_81EC238 + .4byte gSpriteAnimTable_81EC23C + .4byte gSpriteAnimTable_81EC240 + .4byte gSpriteAnimTable_81EC244 + .4byte gSpriteAnimTable_81EC248 + .4byte gSpriteAnimTable_81EC24C + .4byte gSpriteAnimTable_81EC250 + .4byte gSpriteAnimTable_81EC254 + .4byte gSpriteAnimTable_81EC258 + .4byte gSpriteAnimTable_81EC25C + .4byte gSpriteAnimTable_81EC260 + .4byte gSpriteAnimTable_81EC264 + .4byte gSpriteAnimTable_81EC268 + .4byte gSpriteAnimTable_81EC26C + .4byte gSpriteAnimTable_81EC270 + .4byte gSpriteAnimTable_81EC274 + .4byte gSpriteAnimTable_81EC278 + .4byte gSpriteAnimTable_81EC27C + .4byte gSpriteAnimTable_81EC280 + .4byte gSpriteAnimTable_81EC284 + .4byte gSpriteAnimTable_81EC288 + .4byte gSpriteAnimTable_81EC28C + .4byte gSpriteAnimTable_81EC290 + .4byte gSpriteAnimTable_81EC294 + .4byte gSpriteAnimTable_81EC298 + .4byte gSpriteAnimTable_81EC29C + .4byte gSpriteAnimTable_81EC2A0 gUnknown_081EC3F0:: @ 81EC3F0 .incbin "baserom.gba", 0x001ec3f0, 0x14c @@ -496,21 +707,53 @@ gUnknown_081EC3F0:: @ 81EC3F0 @ 81EC7D4 .include "data/graphics/trainers/front_pic_palette_table.s" -@ 81ECA6C -Unknown_81ECA6C: - .incbin "baserom.gba", 0x1ECA6C, 0x48 -Unknown_81ECAB4: - .incbin "baserom.gba", 0x1ECAB4, 0x8 -Unknown_81ECABC: - .incbin "baserom.gba", 0x1ECABC, 0x8 -Unknown_81ECAC4: - .incbin "baserom.gba", 0x1ECAC4, 0x8 + .align 2 +gSpriteAnim_81ECA6C:: @ 81ECA6C + obj_image_anim_frame 0, 24 + obj_image_anim_frame 1, 9 + obj_image_anim_frame 2, 24 + obj_image_anim_frame 0, 9 + obj_image_anim_frame 3, 50 + obj_image_anim_end + + .align 2 +gSpriteAnim_81ECA84:: @ 81ECA84 + obj_image_anim_frame 0, 24 + obj_image_anim_frame 1, 9 + obj_image_anim_frame 2, 24 + obj_image_anim_frame 0, 9 + obj_image_anim_frame 3, 50 + obj_image_anim_end + + .align 2 +gSpriteAnim_81ECA9C:: @ 81ECA9C + obj_image_anim_frame 0, 24 + obj_image_anim_frame 1, 9 + obj_image_anim_frame 2, 24 + obj_image_anim_frame 0, 9 + obj_image_anim_frame 3, 50 + obj_image_anim_end + + .align 2 +gSpriteAnimTable_81ECAB4:: @ 81ECAB4 + .4byte gSpriteAnim_81E7A98 + .4byte gSpriteAnim_81ECA6C + + .align 2 +gSpriteAnimTable_81ECABC:: @ 81ECABC + .4byte gSpriteAnim_81E7A98 + .4byte gSpriteAnim_81ECA84 + + .align 2 +gSpriteAnimTable_81ECAC4:: @ 81ECAC4 + .4byte gSpriteAnim_81E7A98 + .4byte gSpriteAnim_81ECA9C .align 2 gUnknown_081ECACC:: @ 81ECACC - .4byte Unknown_81ECAB4 - .4byte Unknown_81ECABC - .4byte Unknown_81ECAC4 + .4byte gSpriteAnimTable_81ECAB4 + .4byte gSpriteAnimTable_81ECABC + .4byte gSpriteAnimTable_81ECAC4 gUnknown_081ECAD8:: @ 81ECAD8 .incbin "baserom.gba", 0x001ecad8, 0xc |