diff options
| author | YamaArashi <shadow962@live.com> | 2016-07-06 00:27:14 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-07-06 00:27:14 -0700 |
| commit | 730d65166d177c8f1265c71ac5cb675ae8ad9230 (patch) | |
| tree | 059fa6a8bc4b610775387690b6bb91167eec5d31 | |
| parent | 20f7c470e16477e389c7c0ba0c796001d9268ec9 (diff) | |
sprite template macro
| -rw-r--r-- | asm/macros.s | 10 | ||||
| -rw-r--r-- | data/data2.s | 2640 | ||||
| -rw-r--r-- | data/graphics/field_objects/field_effect_objects.s | 288 |
3 files changed, 374 insertions, 2564 deletions
diff --git a/asm/macros.s b/asm/macros.s index 15d5270fb..65b795722 100644 --- a/asm/macros.s +++ b/asm/macros.s @@ -33,8 +33,14 @@ .2byte 0 @ padding .endm - .macro zero_fill count - .fill \count + .macro spr_template tile_tag, pal_tag, oam, anims, images, affine_anims, callback + .2byte \tile_tag + .2byte \pal_tag + .4byte \oam + .4byte \anims + .4byte \images + .4byte \affine_anims + .4byte \callback .endm @ Berry trees have a table defining the palette slot used for each of their 5 diff --git a/data/data2.s b/data/data2.s index f5cb546da..635f717aa 100644 --- a/data/data2.s +++ b/data/data2.s @@ -5668,23 +5668,11 @@ gSpriteAnimTable_83930A4:: @ 83930A4 .align 2 gBattleAnimSpriteTemplate_83930A8:: @ 83930A8 - .2byte 10283 @ tiles tag - .2byte 10283 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83930A4 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_807A908 + spr_template 10283, 10283, gOamData_837DF34, gSpriteAnimTable_83930A4, NULL, gDummySpriteAffineAnimTable, sub_807A908 .align 2 gBattleAnimSpriteTemplate_83930C0:: @ 83930C0 - .2byte 10283 @ tiles tag - .2byte 10283 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83930A4 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_807A9BC + spr_template 10283, 10283, gOamData_837DF34, gSpriteAnimTable_83930A4, NULL, gDummySpriteAffineAnimTable, sub_807A9BC .align 2 gSpriteAnim_83930D8:: @ 83930D8 @@ -5701,13 +5689,7 @@ gSpriteAnimTable_83930F0:: @ 83930F0 .align 2 gBattleAnimSpriteTemplate_83930F4:: @ 83930F4 - .2byte 10071 @ tiles tag - .2byte 10071 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83930F0 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_807A63C + spr_template 10071, 10071, gOamData_837DF34, gSpriteAnimTable_83930F0, NULL, gDummySpriteAffineAnimTable, sub_807A63C .incbin "baserom.gba", 0x39310c, 0xcc @@ -7040,13 +7022,7 @@ gFieldEffectObjectPaletteInfo6:: @ 83C15F8 .align 2 gSpriteTemplate_CutGrass:: @ 83C1600 - .2byte 0xFFFF @ tiles tag - .2byte 0x1000 @ palette tag - .4byte gOamData_CutGrass - .4byte gSpriteAnimTable_CutGrass - .4byte gSpriteImageTable_CutGrass - .4byte gDummySpriteAffineAnimTable - .4byte sub_80A2A48 + spr_template 0xFFFF, 0x1000, gOamData_CutGrass, gSpriteAnimTable_CutGrass, gSpriteImageTable_CutGrass, gDummySpriteAffineAnimTable, sub_80A2A48 gUnknown_083C1618:: @ 83C1618 .incbin "baserom.gba", 0x003c1618, 0x28 @@ -7152,53 +7128,23 @@ gUnknown_083C1F98:: @ 83C1F98 .align 2 gBattleAnimSpriteTemplate_83C1FB0:: @ 83C1FB0 - .2byte 0 @ tiles tag - .2byte 0 @ palette tag - .4byte gDummyOamData - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80A8530 + spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8530 .align 2 gBattleAnimSpriteTemplate_83C1FC8:: @ 83C1FC8 - .2byte 0 @ tiles tag - .2byte 0 @ palette tag - .4byte gDummyOamData - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80A85C8 + spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A85C8 .align 2 gBattleAnimSpriteTemplate_83C1FE0:: @ 83C1FE0 - .2byte 0 @ tiles tag - .2byte 0 @ palette tag - .4byte gDummyOamData - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80A8638 + spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8638 .align 2 gBattleAnimSpriteTemplate_83C1FF8:: @ 83C1FF8 - .2byte 0 @ tiles tag - .2byte 0 @ palette tag - .4byte gDummyOamData - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80A8764 + spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8764 .align 2 gBattleAnimSpriteTemplate_83C2010:: @ 83C2010 - .2byte 0 @ tiles tag - .2byte 0 @ palette tag - .4byte gDummyOamData - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80A8818 + spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A8818 @ 83C2028 .include "data/text/item_descriptions.s" @@ -8334,33 +8280,15 @@ gSpriteAnimTable_83D6220:: @ 83D6220 .align 2 gBattleAnimSpriteTemplate_83D6224:: @ 83D6224 - .2byte 10067 @ tiles tag - .2byte 10067 @ palette tag - .4byte gOamData_837DF64 - .4byte gSpriteAnimTable_83D6220 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CA710 + spr_template 10067, 10067, gOamData_837DF64, gSpriteAnimTable_83D6220, NULL, gDummySpriteAffineAnimTable, sub_80CA710 .align 2 gBattleAnimSpriteTemplate_83D623C:: @ 83D623C - .2byte 10068 @ tiles tag - .2byte 10068 @ palette tag - .4byte gOamData_837DF64 - .4byte gSpriteAnimTable_83D6220 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CA710 + spr_template 10068, 10068, gOamData_837DF64, gSpriteAnimTable_83D6220, NULL, gDummySpriteAffineAnimTable, sub_80CA710 .align 2 gBattleAnimSpriteTemplate_83D6254:: @ 83D6254 - .2byte 10065 @ tiles tag - .2byte 10065 @ palette tag - .4byte gOamData_837DF64 - .4byte gSpriteAnimTable_83D6220 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CA710 + spr_template 10065, 10065, gOamData_837DF64, gSpriteAnimTable_83D6220, NULL, gDummySpriteAffineAnimTable, sub_80CA710 .align 2 gSpriteAnim_83D626C:: @ 83D626C @@ -8433,23 +8361,11 @@ gSpriteAffineAnimTable_83D62E8:: @ 83D62E8 .align 2 gBattleAnimSpriteTemplate_83D62EC:: @ 83D62EC - .2byte 10147 @ tiles tag - .2byte 10147 @ palette tag - .4byte gOamData_837E0AC - .4byte gSpriteAnimTable_83D62D4 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D62E8 - .4byte sub_80CA7B0 + spr_template 10147, 10147, gOamData_837E0AC, gSpriteAnimTable_83D62D4, NULL, gSpriteAffineAnimTable_83D62E8, sub_80CA7B0 .align 2 gBattleAnimSpriteTemplate_83D6304:: @ 83D6304 - .2byte 10147 @ tiles tag - .2byte 10147 @ palette tag - .4byte gOamData_837DF24 - .4byte gSpriteAnimTable_83D62B4 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CA800 + spr_template 10147, 10147, gOamData_837DF24, gSpriteAnimTable_83D62B4, NULL, gDummySpriteAffineAnimTable, sub_80CA800 .align 2 gUnknown_083D631C:: @ 83D631C @@ -8467,13 +8383,7 @@ gSpriteAffineAnimTable_83D634C:: @ 83D634C .align 2 gBattleAnimSpriteTemplate_83D6350:: @ 83D6350 - .2byte 10235 @ tiles tag - .2byte 10235 @ palette tag - .4byte gOamData_837DFE4 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D634C - .4byte sub_80CA7B0 + spr_template 10235, 10235, gOamData_837DFE4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D634C, sub_80CA7B0 .align 2 gSpriteAffineAnim_83D6368:: @ 83D6368 @@ -8486,23 +8396,11 @@ gSpriteAffineAnimTable_83D6378:: @ 83D6378 .align 2 gBattleAnimSpriteTemplate_83D637C:: @ 83D637C - .2byte 10147 @ tiles tag - .2byte 10147 @ palette tag - .4byte gOamData_837E0AC - .4byte gSpriteAnimTable_83D62D4 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D6378 - .4byte sub_80CA9A8 + spr_template 10147, 10147, gOamData_837E0AC, gSpriteAnimTable_83D62D4, NULL, gSpriteAffineAnimTable_83D6378, sub_80CA9A8 .align 2 gBattleAnimSpriteTemplate_83D6394:: @ 83D6394 - .2byte 10147 @ tiles tag - .2byte 10147 @ palette tag - .4byte gOamData_837DF24 - .4byte gSpriteAnimTable_83D62B4 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CAA14 + spr_template 10147, 10147, gOamData_837DF24, gSpriteAnimTable_83D62B4, NULL, gDummySpriteAffineAnimTable, sub_80CAA14 .align 2 gSpriteAnim_83D63AC:: @ 83D63AC @@ -8522,13 +8420,7 @@ gSpriteAnimTable_83D63C0:: @ 83D63C0 .align 2 gBattleAnimSpriteTemplate_83D63C8:: @ 83D63C8 - .2byte 10006 @ tiles tag - .2byte 10006 @ palette tag - .4byte gOamData_837DF2C - .4byte gSpriteAnimTable_83D63C0 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CAB18 + spr_template 10006, 10006, gOamData_837DF2C, gSpriteAnimTable_83D63C0, NULL, gDummySpriteAffineAnimTable, sub_80CAB18 .align 2 gSpriteAnim_83D63E0:: @ 83D63E0 @@ -8547,13 +8439,7 @@ gSpriteAnimTable_83D63F0:: @ 83D63F0 .align 2 gBattleAnimSpriteTemplate_83D63F8:: @ 83D63F8 - .2byte 10158 @ tiles tag - .2byte 10158 @ palette tag - .4byte gOamData_837DF2C - .4byte gSpriteAnimTable_83D63F0 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CABF8 + spr_template 10158, 10158, gOamData_837DF2C, gSpriteAnimTable_83D63F0, NULL, gDummySpriteAffineAnimTable, sub_80CABF8 .align 2 gSpriteAnim_83D6410:: @ 83D6410 @@ -8575,23 +8461,11 @@ gSpriteAnimTable_83D6424:: @ 83D6424 .align 2 gBattleAnimSpriteTemplate_83D6428:: @ 83D6428 - .2byte 10159 @ tiles tag - .2byte 10159 @ palette tag - .4byte gOamData_837DF2C - .4byte gSpriteAnimTable_83D6420 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CAD54 + spr_template 10159, 10159, gOamData_837DF2C, gSpriteAnimTable_83D6420, NULL, gDummySpriteAffineAnimTable, sub_80CAD54 .align 2 gBattleAnimSpriteTemplate_83D6440:: @ 83D6440 - .2byte 10159 @ tiles tag - .2byte 10159 @ palette tag - .4byte gOamData_837DF24 - .4byte gSpriteAnimTable_83D6424 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CAE20 + spr_template 10159, 10159, gOamData_837DF24, gSpriteAnimTable_83D6424, NULL, gDummySpriteAffineAnimTable, sub_80CAE20 .align 2 gSpriteAnim_83D6458:: @ 83D6458 @@ -8621,23 +8495,11 @@ gSpriteAnimTable_83D6494:: @ 83D6494 .align 2 gBattleAnimSpriteTemplate_83D649C:: @ 83D649C - .2byte 10063 @ tiles tag - .2byte 10063 @ palette tag - .4byte gOamData_837DF2C - .4byte gSpriteAnimTable_83D6494 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CAED8 + spr_template 10063, 10063, gOamData_837DF2C, gSpriteAnimTable_83D6494, NULL, gDummySpriteAffineAnimTable, sub_80CAED8 .align 2 gBattleAnimSpriteTemplate_83D64B4:: @ 83D64B4 - .2byte 10063 @ tiles tag - .2byte 10063 @ palette tag - .4byte gOamData_837DF2C - .4byte gSpriteAnimTable_83D6494 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CB144 + spr_template 10063, 10063, gOamData_837DF2C, gSpriteAnimTable_83D6494, NULL, gDummySpriteAffineAnimTable, sub_80CB144 .align 2 gSpriteAnim_83D64CC:: @ 83D64CC @@ -8653,13 +8515,7 @@ gSpriteAnimTable_83D64E0:: @ 83D64E0 .align 2 gBattleAnimSpriteTemplate_83D64E4:: @ 83D64E4 - .2byte 10160 @ tiles tag - .2byte 10160 @ palette tag - .4byte gOamData_837DF54 - .4byte gSpriteAnimTable_83D64E0 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CAFD0 + spr_template 10160, 10160, gOamData_837DF54, gSpriteAnimTable_83D64E0, NULL, gDummySpriteAffineAnimTable, sub_80CAFD0 .align 2 gSpriteAffineAnim_83D64FC:: @ 83D64FC @@ -8672,13 +8528,7 @@ gSpriteAffineAnimTable_83D650C:: @ 83D650C .align 2 gBattleAnimSpriteTemplate_83D6510:: @ 83D6510 - .2byte 10174 @ tiles tag - .2byte 10174 @ palette tag - .4byte gOamData_837DF94 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D650C - .4byte sub_80CAFD0 + spr_template 10174, 10174, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D650C, sub_80CAFD0 .align 2 gSpriteAnim_83D6528:: @ 83D6528 @@ -8722,13 +8572,7 @@ gSpriteAffineAnimTable_83D6598:: @ 83D6598 .align 2 gBattleAnimSpriteTemplate_83D65A0:: @ 83D65A0 - .2byte 10186 @ tiles tag - .2byte 10186 @ palette tag - .4byte gOamData_837DFBC - .4byte gSpriteAnimTable_83D6550 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D6598 - .4byte sub_80CB25C + spr_template 10186, 10186, gOamData_837DFBC, gSpriteAnimTable_83D6550, NULL, gSpriteAffineAnimTable_83D6598, sub_80CB25C .align 2 gSpriteAffineAnim_83D65B8:: @ 83D65B8 @@ -8748,13 +8592,7 @@ gSpriteAffineAnimTable_83D65E0:: @ 83D65E0 .align 2 gBattleAnimSpriteTemplate_83D65E8:: @ 83D65E8 - .2byte 10147 @ tiles tag - .2byte 10147 @ palette tag - .4byte gOamData_837DFEC - .4byte gSpriteAnimTable_83D62D4 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D65E0 - .4byte sub_80CB4CC + spr_template 10147, 10147, gOamData_837DFEC, gSpriteAnimTable_83D62D4, NULL, gSpriteAffineAnimTable_83D65E0, sub_80CB4CC .align 2 gSpriteAnim_83D6600:: @ 83D6600 @@ -8795,23 +8633,11 @@ gSpriteAnimTable_83D6648:: @ 83D6648 .align 2 gBattleAnimSpriteTemplate_83D6658:: @ 83D6658 - .2byte 10223 @ tiles tag - .2byte 10223 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D6648 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CB59C + spr_template 10223, 10223, gOamData_837DF34, gSpriteAnimTable_83D6648, NULL, gDummySpriteAffineAnimTable, sub_80CB59C .align 2 gBattleAnimSpriteTemplate_83D6670:: @ 83D6670 - .2byte 10223 @ tiles tag - .2byte 10223 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D6648 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CB620 + spr_template 10223, 10223, gOamData_837DF34, gSpriteAnimTable_83D6648, NULL, gDummySpriteAffineAnimTable, sub_80CB620 .align 2 gSpriteAnim_83D6688:: @ 83D6688 @@ -8825,13 +8651,7 @@ gSpriteAnimTable_83D6694:: @ 83D6694 .align 2 gBattleAnimSpriteTemplate_83D6698:: @ 83D6698 - .2byte 10147 @ tiles tag - .2byte 10147 @ palette tag - .4byte gOamData_837DF24 - .4byte gSpriteAnimTable_83D6694 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CB768 + spr_template 10147, 10147, gOamData_837DF24, gSpriteAnimTable_83D6694, NULL, gDummySpriteAffineAnimTable, sub_80CB768 .align 2 gSpriteAnim_83D66B0:: @ 83D66B0 @@ -8866,23 +8686,11 @@ gSpriteAffineAnimTable_83D6714:: @ 83D6714 .align 2 gBattleAnimSpriteTemplate_83D671C:: @ 83D671C - .2byte 10224 @ tiles tag - .2byte 10224 @ palette tag - .4byte gOamData_837DF94 - .4byte gSpriteAnimTable_83D66B8 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D6714 - .4byte sub_80CB94C + spr_template 10224, 10224, gOamData_837DF94, gSpriteAnimTable_83D66B8, NULL, gSpriteAffineAnimTable_83D6714, sub_80CB94C .align 2 gBattleAnimSpriteTemplate_83D6734:: @ 83D6734 - .2byte 10224 @ tiles tag - .2byte 10224 @ palette tag - .4byte gOamData_837DF94 - .4byte gSpriteAnimTable_83D66B8 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D6714 - .4byte sub_80CBA28 + spr_template 10224, 10224, gOamData_837DF94, gSpriteAnimTable_83D66B8, NULL, gSpriteAffineAnimTable_83D6714, sub_80CBA28 .align 2 gSpriteAnim_83D674C:: @ 83D674C @@ -8898,23 +8706,11 @@ gSpriteAnimTable_83D6760:: @ 83D6760 .align 2 gBattleAnimSpriteTemplate_83D6764:: @ 83D6764 - .2byte 10195 @ tiles tag - .2byte 10195 @ palette tag - .4byte gOamData_837DF2C - .4byte gSpriteAnimTable_83D6760 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CBAA4 + spr_template 10195, 10195, gOamData_837DF2C, gSpriteAnimTable_83D6760, NULL, gDummySpriteAffineAnimTable, sub_80CBAA4 .align 2 gBattleAnimSpriteTemplate_83D677C:: @ 83D677C - .2byte 10224 @ tiles tag - .2byte 10224 @ palette tag - .4byte gOamData_837DF94 - .4byte gSpriteAnimTable_83D66B8 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D6714 - .4byte sub_80CBAE8 + spr_template 10224, 10224, gOamData_837DF94, gSpriteAnimTable_83D66B8, NULL, gSpriteAffineAnimTable_83D6714, sub_80CBAE8 .align 2 gSpriteAffineAnim_83D6794:: @ 83D6794 @@ -8941,13 +8737,7 @@ gSpriteAffineAnimTable_83D67E4:: @ 83D67E4 .align 2 gBattleAnimSpriteTemplate_83D67F4:: @ 83D67F4 - .2byte 10224 @ tiles tag - .2byte 10224 @ palette tag - .4byte gOamData_837DF94 - .4byte gSpriteAnimTable_83D66B8 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D67E4 - .4byte sub_80CBBF0 + spr_template 10224, 10224, gOamData_837DF94, gSpriteAnimTable_83D66B8, NULL, gSpriteAffineAnimTable_83D67E4, sub_80CBBF0 .align 2 gUnknown_083D680C:: @ 83D680C @@ -8968,23 +8758,11 @@ gSpriteAffineAnimTable_83D68B4:: @ 83D68B4 .align 2 gBattleAnimSpriteTemplate_83D68B8:: @ 83D68B8 - .2byte 10159 @ tiles tag - .2byte 10159 @ palette tag - .4byte gOamData_837DF24 - .4byte gSpriteAnimTable_83D6424 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CC474 + spr_template 10159, 10159, gOamData_837DF24, gSpriteAnimTable_83D6424, NULL, gDummySpriteAffineAnimTable, sub_80CC474 .align 2 gBattleAnimSpriteTemplate_83D68D0:: @ 83D68D0 - .2byte 10159 @ tiles tag - .2byte 10159 @ palette tag - .4byte gOamData_837DF8C - .4byte gSpriteAnimTable_83D6420 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D68B4 - .4byte sub_80CC474 + spr_template 10159, 10159, gOamData_837DF8C, gSpriteAnimTable_83D6420, NULL, gSpriteAffineAnimTable_83D68B4, sub_80CC474 .align 2 gSpriteAffineAnim_83D68E8:: @ 83D68E8 @@ -9018,33 +8796,15 @@ gSpriteAffineAnimTable_83D6938:: @ 83D6938 .align 2 gBattleAnimSpriteTemplate_83D693C:: @ 83D693C - .2byte 10271 @ tiles tag - .2byte 10271 @ palette tag - .4byte gOamData_837DF8C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D6930 - .4byte sub_80CC474 + spr_template 10271, 10271, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D6930, sub_80CC474 .align 2 gBattleAnimSpriteTemplate_83D6954:: @ 83D6954 - .2byte 10271 @ tiles tag - .2byte 10271 @ palette tag - .4byte gOamData_837DF8C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D6934 - .4byte sub_80CC474 + spr_template 10271, 10271, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D6934, sub_80CC474 .align 2 gBattleAnimSpriteTemplate_83D696C:: @ 83D696C - .2byte 10271 @ tiles tag - .2byte 10271 @ palette tag - .4byte gOamData_837DF8C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D6938 - .4byte sub_80CC474 + spr_template 10271, 10271, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D6938, sub_80CC474 .align 2 gUnknown_083D6984:: @ 83D6984 @@ -9052,13 +8812,7 @@ gUnknown_083D6984:: @ 83D6984 .align 2 gBattleAnimSpriteTemplate_83D6994:: @ 83D6994 - .2byte 10266 @ tiles tag - .2byte 10266 @ palette tag - .4byte gOamData_837DF8C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CC6CC + spr_template 10266, 10266, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CC6CC .align 2 gSpriteAnim_83D69AC:: @ 83D69AC @@ -9083,23 +8837,11 @@ gSpriteAnimTable_83D69D4:: @ 83D69D4 .align 2 gBattleAnimSpriteTemplate_83D69DC:: @ 83D69DC - .2byte 10056 @ tiles tag - .2byte 10056 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D69D4 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CC884 + spr_template 10056, 10056, gOamData_837DF34, gSpriteAnimTable_83D69D4, NULL, gDummySpriteAffineAnimTable, sub_80CC884 .align 2 gBattleAnimSpriteTemplate_83D69F4:: @ 83D69F4 - .2byte 10287 @ tiles tag - .2byte 10287 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D69D4 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CC884 + spr_template 10287, 10287, gOamData_837DF34, gSpriteAnimTable_83D69D4, NULL, gDummySpriteAffineAnimTable, sub_80CC884 .align 2 .incbin "baserom.gba", 0x3d6a0c, 0x104 @@ -9118,36 +8860,18 @@ gSpriteAnimTable_83D6B24:: @ 83D6B24 .align 2 gBattleAnimSpriteTemplate_83D6B28:: @ 83D6B28 - .2byte 10138 @ tiles tag - .2byte 10138 @ palette tag - .4byte gOamData_837E054 - .4byte gSpriteAnimTable_83D6B24 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CC914 + spr_template 10138, 10138, gOamData_837E054, gSpriteAnimTable_83D6B24, NULL, gDummySpriteAffineAnimTable, sub_80CC914 .align 2 gBattleAnimSpriteTemplate_83D6B40:: @ 83D6B40 - .2byte 10138 @ tiles tag - .2byte 10138 @ palette tag - .4byte gOamData_837E054 - .4byte gSpriteAnimTable_83D6B24 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CC9BC + spr_template 10138, 10138, gOamData_837E054, gSpriteAnimTable_83D6B24, NULL, gDummySpriteAffineAnimTable, sub_80CC9BC .align 2 .incbin "baserom.gba", 0x3d6b58, 0x90 .align 2 gBattleAnimSpriteTemplate_83D6BE8:: @ 83D6BE8 - .2byte 10280 @ tiles tag - .2byte 10280 @ palette tag - .4byte gOamData_837E05C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CCD24 + spr_template 10280, 10280, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CCD24 .align 2 gSpriteAffineAnim_83D6C00:: @ 83D6C00 @@ -9170,13 +8894,7 @@ gSpriteAffineAnimTable_83D6C40:: @ 83D6C40 .align 2 gBattleAnimSpriteTemplate_83D6C48:: @ 83D6C48 - .2byte 10099 @ tiles tag - .2byte 10099 @ palette tag - .4byte gOamData_837E0B4 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D6C40 - .4byte sub_80CCF04 + spr_template 10099, 10099, gOamData_837E0B4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D6C40, sub_80CCF04 .align 2 gSpriteAnim_83D6C60:: @ 83D6C60 @@ -9196,23 +8914,11 @@ gSpriteAnimTable_83D6C84:: @ 83D6C84 .align 2 gBattleAnimSpriteTemplate_83D6C88:: @ 83D6C88 - .2byte 10049 @ tiles tag - .2byte 10049 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D6C84 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CD140 + spr_template 10049, 10049, gOamData_837DF34, gSpriteAnimTable_83D6C84, NULL, gDummySpriteAffineAnimTable, sub_80CD140 .align 2 gBattleAnimSpriteTemplate_83D6CA0:: @ 83D6CA0 - .2byte 10049 @ tiles tag - .2byte 10049 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D6C84 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CD190 + spr_template 10049, 10049, gOamData_837DF34, gSpriteAnimTable_83D6C84, NULL, gDummySpriteAffineAnimTable, sub_80CD190 .align 2 .incbin "baserom.gba", 0x3d6cb8, 0x68 @@ -9251,33 +8957,15 @@ gSpriteAffineAnimTable_83D6D8C:: @ 83D6D8C .align 2 gBattleAnimSpriteTemplate_83D6D94:: @ 83D6D94 - .2byte 10228 @ tiles tag - .2byte 10228 @ palette tag - .4byte gOamData_837DF94 - .4byte gSpriteAnimTable_83D6D28 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D6D8C - .4byte sub_80CD328 + spr_template 10228, 10228, gOamData_837DF94, gSpriteAnimTable_83D6D28, NULL, gSpriteAffineAnimTable_83D6D8C, sub_80CD328 .align 2 gBattleAnimSpriteTemplate_83D6DAC:: @ 83D6DAC - .2byte 10014 @ tiles tag - .2byte 10014 @ palette tag - .4byte gOamData_837DF34 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CD3E0 + spr_template 10014, 10014, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CD3E0 .align 2 gBattleAnimSpriteTemplate_83D6DC4:: @ 83D6DC4 - .2byte 10014 @ tiles tag - .2byte 10014 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CD6CC + spr_template 10014, 10014, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CD6CC .align 2 gUnknown_083D6DDC:: @ 83D6DDC @@ -9285,13 +8973,7 @@ gUnknown_083D6DDC:: @ 83D6DDC .align 2 gBattleAnimSpriteTemplate_83D6DE4:: @ 83D6DE4 - .2byte 0 @ tiles tag - .2byte 0 @ palette tag - .4byte gDummyOamData - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CD774 + spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CD774 .align 2 .incbin "baserom.gba", 0x3d6dfc, 0x18 @@ -9316,33 +8998,15 @@ gSpriteAnimTable_83D6E30:: @ 83D6E30 .align 2 gBattleAnimSpriteTemplate_83D6E38:: @ 83D6E38 - .2byte 10183 @ tiles tag - .2byte 10183 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D6E30 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CDD74 + spr_template 10183, 10183, gOamData_837DF34, gSpriteAnimTable_83D6E30, NULL, gDummySpriteAffineAnimTable, sub_80CDD74 .align 2 gBattleAnimSpriteTemplate_83D6E50:: @ 83D6E50 - .2byte 10286 @ tiles tag - .2byte 10286 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D6E30 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CDDDC + spr_template 10286, 10286, gOamData_837DF34, gSpriteAnimTable_83D6E30, NULL, gDummySpriteAffineAnimTable, sub_80CDDDC .align 2 gBattleAnimSpriteTemplate_83D6E68:: @ 83D6E68 - .2byte 10286 @ tiles tag - .2byte 10286 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D6E30 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CDE24 + spr_template 10286, 10286, gOamData_837DF34, gSpriteAnimTable_83D6E30, NULL, gDummySpriteAffineAnimTable, sub_80CDE24 .align 2 gSpriteAnim_83D6E80:: @ 83D6E80 @@ -9358,13 +9022,7 @@ gSpriteAnimTable_83D6E94:: @ 83D6E94 .align 2 gBattleAnimSpriteTemplate_83D6E98:: @ 83D6E98 - .2byte 10184 @ tiles tag - .2byte 10184 @ palette tag - .4byte gOamData_837DF74 - .4byte gSpriteAnimTable_83D6E94 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CDF0C + spr_template 10184, 10184, gOamData_837DF74, gSpriteAnimTable_83D6E94, NULL, gDummySpriteAffineAnimTable, sub_80CDF0C .align 2 gSpriteAnim_83D6EB0:: @ 83D6EB0 @@ -9390,23 +9048,11 @@ gSpriteAnimTable_83D6EEC:: @ 83D6EEC .align 2 gBattleAnimSpriteTemplate_83D6EF0:: @ 83D6EF0 - .2byte 10185 @ tiles tag - .2byte 10185 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D6EEC - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CDFB0 + spr_template 10185, 10185, gOamData_837DF34, gSpriteAnimTable_83D6EEC, NULL, gDummySpriteAffineAnimTable, sub_80CDFB0 .align 2 gBattleAnimSpriteTemplate_83D6F08:: @ 83D6F08 - .2byte 10017 @ tiles tag - .2byte 10017 @ palette tag - .4byte gOamData_837DF24 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_807941C + spr_template 10017, 10017, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807941C .align 2 gSpriteAnim_83D6F20:: @ 83D6F20 @@ -9423,13 +9069,7 @@ gSpriteAnimTable_83D6F38:: @ 83D6F38 .align 2 gBattleAnimSpriteTemplate_83D6F3C:: @ 83D6F3C - .2byte 10030 @ tiles tag - .2byte 10030 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D6F38 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80793C4 + spr_template 10030, 10030, gOamData_837DF34, gSpriteAnimTable_83D6F38, NULL, gDummySpriteAffineAnimTable, sub_80793C4 .align 2 gSpriteAnim_83D6F54:: @ 83D6F54 @@ -9454,13 +9094,7 @@ gSpriteAffineAnimTable_83D6F7C:: @ 83D6F7C .align 2 gBattleAnimSpriteTemplate_83D6F80:: @ 83D6F80 - .2byte 10018 @ tiles tag - .2byte 10018 @ palette tag - .4byte gOamData_837E104 - .4byte gSpriteAnimTable_83D6F68 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D6F7C - .4byte sub_80CE09C + spr_template 10018, 10018, gOamData_837E104, gSpriteAnimTable_83D6F68, NULL, gSpriteAffineAnimTable_83D6F7C, sub_80CE09C .align 2 gSpriteAnim_83D6F98:: @ 83D6F98 @@ -9476,23 +9110,11 @@ gSpriteAnimTable_83D6FAC:: @ 83D6FAC .align 2 gBattleAnimSpriteTemplate_83D6FB0:: @ 83D6FB0 - .2byte 10018 @ tiles tag - .2byte 10018 @ palette tag - .4byte gOamData_837E104 - .4byte gSpriteAnimTable_83D6FAC - .4byte NULL - .4byte gSpriteAffineAnimTable_83D6F7C - .4byte sub_80CE17C + spr_template 10018, 10018, gOamData_837E104, gSpriteAnimTable_83D6FAC, NULL, gSpriteAffineAnimTable_83D6F7C, sub_80CE17C .align 2 gBattleAnimSpriteTemplate_83D6FC8:: @ 83D6FC8 - .2byte 10194 @ tiles tag - .2byte 10194 @ palette tag - .4byte gOamData_837E05C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CE30C + spr_template 10194, 10194, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CE30C .align 2 gSpriteAnim_83D6FE0:: @ 83D6FE0 @@ -9508,13 +9130,7 @@ gSpriteAnimTable_83D6FF4:: @ 83D6FF4 .align 2 gBattleAnimSpriteTemplate_83D6FF8:: @ 83D6FF8 - .2byte 10195 @ tiles tag - .2byte 10195 @ palette tag - .4byte gOamData_837DF2C - .4byte gSpriteAnimTable_83D6FF4 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CE36C + spr_template 10195, 10195, gOamData_837DF2C, gSpriteAnimTable_83D6FF4, NULL, gDummySpriteAffineAnimTable, sub_80CE36C .align 2 gSpriteAnim_83D7010:: @ 83D7010 @@ -9534,23 +9150,11 @@ gSpriteAnimTable_83D7034:: @ 83D7034 .align 2 gBattleAnimSpriteTemplate_83D7038:: @ 83D7038 - .2byte 10031 @ tiles tag - .2byte 10031 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D7034 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80793C4 + spr_template 10031, 10031, gOamData_837DF34, gSpriteAnimTable_83D7034, NULL, gDummySpriteAffineAnimTable, sub_80793C4 .align 2 gBattleAnimSpriteTemplate_83D7050:: @ 83D7050 - .2byte 10020 @ tiles tag - .2byte 10020 @ palette tag - .4byte gOamData_837DF34 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CE670 + spr_template 10020, 10020, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CE670 .align 2 gSpriteAnim_83D7068:: @ 83D7068 @@ -9566,13 +9170,7 @@ gSpriteAnimTable_83D707C:: @ 83D707C .align 2 gBattleAnimSpriteTemplate_83D7080:: @ 83D7080 - .2byte 10192 @ tiles tag - .2byte 10192 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D707C - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CEA04 + spr_template 10192, 10192, gOamData_837DF34, gSpriteAnimTable_83D707C, NULL, gDummySpriteAffineAnimTable, sub_80CEA04 .align 2 gSpriteAnim_83D7098:: @ 83D7098 @@ -9637,13 +9235,7 @@ gSpriteAffineAnimTable_83D7110:: @ 83D7110 .align 2 gBattleAnimSpriteTemplate_83D7114:: @ 83D7114 - .2byte 10072 @ tiles tag - .2byte 10072 @ palette tag - .4byte gOamData_837DFEC - .4byte gSpriteAnimTable_83D70D8 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D7110 - .4byte sub_80CEB0C + spr_template 10072, 10072, gOamData_837DFEC, gSpriteAnimTable_83D70D8, NULL, gSpriteAffineAnimTable_83D7110, sub_80CEB0C .align 2 gUnknown_083D712C:: @ 83D712C @@ -9651,23 +9243,11 @@ gUnknown_083D712C:: @ 83D712C .align 2 gBattleAnimSpriteTemplate_83D715C:: @ 83D715C - .2byte 10072 @ tiles tag - .2byte 10072 @ palette tag - .4byte gOamData_837DFEC - .4byte gSpriteAnimTable_83D70D8 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D7110 - .4byte sub_80CECE8 + spr_template 10072, 10072, gOamData_837DFEC, gSpriteAnimTable_83D70D8, NULL, gSpriteAffineAnimTable_83D7110, sub_80CECE8 .align 2 gBattleAnimSpriteTemplate_83D7174:: @ 83D7174 - .2byte 10193 @ tiles tag - .2byte 10193 @ palette tag - .4byte gOamData_837DF34 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CEDF0 + spr_template 10193, 10193, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CEDF0 .align 2 gSpriteAffineAnim_83D718C:: @ 83D718C @@ -9681,13 +9261,7 @@ gSpriteAffineAnimTable_83D71A4:: @ 83D71A4 .align 2 gBattleAnimSpriteTemplate_83D71A8:: @ 83D71A8 - .2byte 10072 @ tiles tag - .2byte 10072 @ palette tag - .4byte gOamData_837DFEC - .4byte gSpriteAnimTable_83D70D8 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D71A4 - .4byte sub_80CEE60 + spr_template 10072, 10072, gOamData_837DFEC, gSpriteAnimTable_83D70D8, NULL, gSpriteAffineAnimTable_83D71A4, sub_80CEE60 .align 2 gSpriteAnim_83D71C0:: @ 83D71C0 @@ -9730,13 +9304,7 @@ gSpriteAnimTable_83D7210:: @ 83D7210 .align 2 gBattleAnimSpriteTemplate_83D7220:: @ 83D7220 - .2byte 10209 @ tiles tag - .2byte 10209 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D7210 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CEF9C + spr_template 10209, 10209, gOamData_837DF34, gSpriteAnimTable_83D7210, NULL, gDummySpriteAffineAnimTable, sub_80CEF9C .align 2 gSpriteAffineAnim_83D7238:: @ 83D7238 @@ -9762,23 +9330,11 @@ gSpriteAffineAnimTable_83D72C0:: @ 83D72C0 .align 2 gBattleAnimSpriteTemplate_83D72C8:: @ 83D72C8 - .2byte 10064 @ tiles tag - .2byte 10064 @ palette tag - .4byte gOamData_837DFF4 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D72C0 - .4byte sub_80CF040 + spr_template 10064, 10064, gOamData_837DFF4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D72C0, sub_80CF040 .align 2 gBattleAnimSpriteTemplate_83D72E0:: @ 83D72E0 - .2byte 10064 @ tiles tag - .2byte 10064 @ palette tag - .4byte gOamData_837DF94 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D72C0 - .4byte sub_80CF0BC + spr_template 10064, 10064, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D72C0, sub_80CF0BC .align 2 gSpriteAnim_83D72F8:: @ 83D72F8 @@ -9821,13 +9377,7 @@ gSpriteAnimTable_83D7348:: @ 83D7348 .align 2 gBattleAnimSpriteTemplate_83D7358:: @ 83D7358 - .2byte 10214 @ tiles tag - .2byte 10214 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D7348 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CF1C8 + spr_template 10214, 10214, gOamData_837DF34, gSpriteAnimTable_83D7348, NULL, gDummySpriteAffineAnimTable, sub_80CF1C8 .align 2 .incbin "baserom.gba", 0x3d7370, 0xb8 @@ -9850,13 +9400,7 @@ gSpriteAnimTable_83D744C:: @ 83D744C .align 2 gBattleAnimSpriteTemplate_83D7450:: @ 83D7450 - .2byte 10075 @ tiles tag - .2byte 10075 @ palette tag - .4byte gOamData_837DF54 - .4byte gSpriteAnimTable_83D744C - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CF610 + spr_template 10075, 10075, gOamData_837DF54, gSpriteAnimTable_83D744C, NULL, gDummySpriteAffineAnimTable, sub_80CF610 .align 2 gSpriteAffineAnim_83D7468:: @ 83D7468 @@ -9871,23 +9415,11 @@ gSpriteAffineAnimTable_83D7488:: @ 83D7488 .align 2 gBattleAnimSpriteTemplate_83D748C:: @ 83D748C - .2byte 10005 @ tiles tag - .2byte 10005 @ palette tag - .4byte gOamData_837E0FC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D7488 - .4byte sub_80CF690 + spr_template 10005, 10005, gOamData_837E0FC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7488, sub_80CF690 .align 2 gBattleAnimSpriteTemplate_83D74A4:: @ 83D74A4 - .2byte 10003 @ tiles tag - .2byte 10003 @ palette tag - .4byte gOamData_837E134 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CF6DC + spr_template 10003, 10003, gOamData_837E134, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CF6DC .align 2 gUnknown_083D74BC:: @ 83D74BC @@ -9920,53 +9452,23 @@ gSpriteAffineAnimTable_83D7530:: @ 83D7530 .align 2 gBattleAnimSpriteTemplate_83D7534:: @ 83D7534 - .2byte 10163 @ tiles tag - .2byte 10163 @ palette tag - .4byte gOamData_837E034 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D752C - .4byte sub_807941C + spr_template 10163, 10163, gOamData_837E034, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D752C, sub_807941C .align 2 gBattleAnimSpriteTemplate_83D754C:: @ 83D754C - .2byte 10164 @ tiles tag - .2byte 10164 @ palette tag - .4byte gOamData_837E034 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D752C - .4byte sub_807941C + spr_template 10164, 10164, gOamData_837E034, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D752C, sub_807941C .align 2 gBattleAnimSpriteTemplate_83D7564:: @ 83D7564 - .2byte 10260 @ tiles tag - .2byte 10260 @ palette tag - .4byte gOamData_837E03C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D752C - .4byte sub_807941C + spr_template 10260, 10260, gOamData_837E03C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D752C, sub_807941C .align 2 gBattleAnimSpriteTemplate_83D757C:: @ 83D757C - .2byte 10288 @ tiles tag - .2byte 10288 @ palette tag - .4byte gOamData_837E034 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D7530 - .4byte sub_80D4CA4 + spr_template 10288, 10288, gOamData_837E034, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7530, sub_80D4CA4 .align 2 gBattleAnimSpriteTemplate_83D7594:: @ 83D7594 - .2byte 10175 @ tiles tag - .2byte 10175 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80794A8 + spr_template 10175, 10175, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80794A8 .align 2 gUnknown_083D75AC:: @ 83D75AC @@ -9992,23 +9494,11 @@ gSpriteAffineAnimTable_83D75E0:: @ 83D75E0 .align 2 gBattleAnimSpriteTemplate_83D75E4:: @ 83D75E4 - .2byte 10100 @ tiles tag - .2byte 10100 @ palette tag - .4byte gOamData_837DF8C - .4byte gSpriteAnimTable_83D75CC - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80CFE9C + spr_template 10100, 10100, gOamData_837DF8C, gSpriteAnimTable_83D75CC, NULL, gDummySpriteAffineAnimTable, sub_80CFE9C .align 2 gBattleAnimSpriteTemplate_83D75FC:: @ 83D75FC - .2byte 10100 @ tiles tag - .2byte 10100 @ palette tag - .4byte gOamData_837DF8C - .4byte gSpriteAnimTable_83D75CC - .4byte NULL - .4byte gSpriteAffineAnimTable_83D75E0 - .4byte sub_80CFF50 + spr_template 10100, 10100, gOamData_837DF8C, gSpriteAnimTable_83D75CC, NULL, gSpriteAffineAnimTable_83D75E0, sub_80CFF50 .align 2 gSpriteAffineAnim_83D7614:: @ 83D7614 @@ -10021,13 +9511,7 @@ gSpriteAffineAnimTable_83D7624:: @ 83D7624 .align 2 gBattleAnimSpriteTemplate_83D7628:: @ 83D7628 - .2byte 10006 @ tiles tag - .2byte 10006 @ palette tag - .4byte gOamData_837DF8C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D7624 - .4byte sub_80CFFD8 + spr_template 10006, 10006, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7624, sub_80CFFD8 .align 2 gSpriteAffineAnim_83D7640:: @ 83D7640 @@ -10041,13 +9525,7 @@ gSpriteAffineAnimTable_83D7658:: @ 83D7658 .align 2 gBattleAnimSpriteTemplate_83D765C:: @ 83D765C - .2byte 10009 @ tiles tag - .2byte 10009 @ palette tag - .4byte gOamData_837DFDC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D7658 - .4byte sub_80D0118 + spr_template 10009, 10009, gOamData_837DFDC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7658, sub_80D0118 .align 2 gSpriteAnim_83D7674:: @ 83D7674 @@ -10070,13 +9548,7 @@ gSpriteAnimTable_83D7694:: @ 83D7694 .align 2 gBattleAnimSpriteTemplate_83D769C:: @ 83D769C - .2byte 10138 @ tiles tag - .2byte 10138 @ palette tag - .4byte gOamData_837E054 - .4byte gSpriteAnimTable_83D7694 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D0178 + spr_template 10138, 10138, gOamData_837E054, gSpriteAnimTable_83D7694, NULL, gDummySpriteAffineAnimTable, sub_80D0178 .align 2 gSpriteAnim_83D76B4:: @ 83D76B4 @@ -10099,13 +9571,7 @@ gSpriteAnimTable_83D76D4:: @ 83D76D4 .align 2 gBattleAnimSpriteTemplate_83D76DC:: @ 83D76DC - .2byte 10138 @ tiles tag - .2byte 10138 @ palette tag - .4byte gOamData_837E054 - .4byte gSpriteAnimTable_83D76D4 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D0228 + spr_template 10138, 10138, gOamData_837E054, gSpriteAnimTable_83D76D4, NULL, gDummySpriteAffineAnimTable, sub_80D0228 .align 2 gUnknown_083D76F4:: @ 83D76F4 @@ -10137,13 +9603,7 @@ gSpriteAnimTable_83D775C:: @ 83D775C .align 2 gBattleAnimSpriteTemplate_83D7764:: @ 83D7764 - .2byte 10086 @ tiles tag - .2byte 10086 @ palette tag - .4byte gOamData_837DF2C - .4byte gSpriteAnimTable_83D775C - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D0930 + spr_template 10086, 10086, gOamData_837DF2C, gSpriteAnimTable_83D775C, NULL, gDummySpriteAffineAnimTable, sub_80D0930 .align 2 gSpriteAffineAnim_83D777C:: @ 83D777C @@ -10157,13 +9617,7 @@ gSpriteAffineAnimTable_83D7794:: @ 83D7794 .align 2 gBattleAnimSpriteTemplate_83D7798:: @ 83D7798 - .2byte 10087 @ tiles tag - .2byte 10087 @ palette tag - .4byte gOamData_837DF8C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D7794 - .4byte sub_80D09C0 + spr_template 10087, 10087, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7794, sub_80D09C0 .align 2 gUnknown_083D77B0:: @ 83D77B0 @@ -10171,23 +9625,11 @@ gUnknown_083D77B0:: @ 83D77B0 .align 2 gBattleAnimSpriteTemplate_83D77E0:: @ 83D77E0 - .2byte 10002 @ tiles tag - .2byte 10002 @ palette tag - .4byte gOamData_837DF34 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D0E30 + spr_template 10002, 10002, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D0E30 .align 2 gBattleAnimSpriteTemplate_83D77F8:: @ 83D77F8 - .2byte 10197 @ tiles tag - .2byte 10197 @ palette tag - .4byte gOamData_837DF34 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_8079534 + spr_template 10197, 10197, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8079534 .align 2 gSpriteAnim_83D7810:: @ 83D7810 @@ -10203,13 +9645,7 @@ gSpriteAnimTable_83D7824:: @ 83D7824 .align 2 gBattleAnimSpriteTemplate_83D7828:: @ 83D7828 - .2byte 10198 @ tiles tag - .2byte 10198 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D7824 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80793C4 + spr_template 10198, 10198, gOamData_837DF34, gSpriteAnimTable_83D7824, NULL, gDummySpriteAffineAnimTable, sub_80793C4 .align 2 gSpriteAffineAnim_83D7840:: @ 83D7840 @@ -10242,13 +9678,7 @@ gSpriteAffineAnimTable_83D78B0:: @ 83D78B0 .align 2 gBattleAnimSpriteTemplate_83D78BC:: @ 83D78BC - .2byte 10202 @ tiles tag - .2byte 10202 @ palette tag - .4byte gOamData_837E114 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D78B0 - .4byte sub_80D1368 + spr_template 10202, 10202, gOamData_837E114, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D78B0, sub_80D1368 .align 2 gSpriteAffineAnim_83D78D4:: @ 83D78D4 @@ -10279,13 +9709,7 @@ gSpriteAffineAnimTable_83D7924:: @ 83D7924 .align 2 gBattleAnimSpriteTemplate_83D7928:: @ 83D7928 - .2byte 10203 @ tiles tag - .2byte 10203 @ palette tag - .4byte gOamData_837DFFC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D791C - .4byte sub_80793C4 + spr_template 10203, 10203, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D791C, sub_80793C4 .align 2 gSpriteAffineAnim_83D7940:: @ 83D7940 @@ -10299,43 +9723,19 @@ gSpriteAffineAnimTable_83D7958:: @ 83D7958 .align 2 gBattleAnimSpriteTemplate_83D795C:: @ 83D795C - .2byte 10203 @ tiles tag - .2byte 10203 @ palette tag - .4byte gOamData_837E11C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D7958 - .4byte sub_80793C4 + spr_template 10203, 10203, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7958, sub_80793C4 .align 2 gBattleAnimSpriteTemplate_83D7974:: @ 83D7974 - .2byte 10203 @ tiles tag - .2byte 10203 @ palette tag - .4byte gOamData_837E11C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D791C - .4byte sub_80D0FD8 + spr_template 10203, 10203, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D791C, sub_80D0FD8 .align 2 gBattleAnimSpriteTemplate_83D798C:: @ 83D798C - .2byte 10203 @ tiles tag - .2byte 10203 @ palette tag - .4byte gOamData_837E11C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D7924 - .4byte sub_80D10B8 + spr_template 10203, 10203, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7924, sub_80D10B8 .align 2 gBattleAnimSpriteTemplate_83D79A4:: @ 83D79A4 - .2byte 10203 @ tiles tag - .2byte 10203 @ palette tag - .4byte gOamData_837E11C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D791C - .4byte sub_80D1318 + spr_template 10203, 10203, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D791C, sub_80D1318 .align 2 gUnknown_083D79BC:: @ 83D79BC @@ -10370,13 +9770,7 @@ gSpriteAnimTable_83D7A40:: @ 83D7A40 .align 2 gBattleAnimSpriteTemplate_83D7A44:: @ 83D7A44 - .2byte 10205 @ tiles tag - .2byte 10205 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D7A40 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80793C4 + spr_template 10205, 10205, gOamData_837DF34, gSpriteAnimTable_83D7A40, NULL, gDummySpriteAffineAnimTable, sub_80793C4 .align 2 gUnknown_083D7A5C:: @ 83D7A5C @@ -10384,23 +9778,11 @@ gUnknown_083D7A5C:: @ 83D7A5C .align 2 gBattleAnimSpriteTemplate_83D7A68:: @ 83D7A68 - .2byte 10206 @ tiles tag - .2byte 10206 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D1C08 + spr_template 10206, 10206, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D1C08 .align 2 gBattleAnimSpriteTemplate_83D7A80:: @ 83D7A80 - .2byte 10210 @ tiles tag - .2byte 10210 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D1C80 + spr_template 10210, 10210, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D1C80 .align 2 gUnknown_083D7A98:: @ 83D7A98 @@ -10408,33 +9790,15 @@ gUnknown_083D7A98:: @ 83D7A98 .align 2 gBattleAnimSpriteTemplate_83D7AB0:: @ 83D7AB0 - .2byte 10216 @ tiles tag - .2byte 10216 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D1F58 + spr_template 10216, 10216, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D1F58 .align 2 gBattleAnimSpriteTemplate_83D7AC8:: @ 83D7AC8 - .2byte 10216 @ tiles tag - .2byte 10216 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D1FDC + spr_template 10216, 10216, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D1FDC .align 2 gBattleAnimSpriteTemplate_83D7AE0:: @ 83D7AE0 - .2byte 10216 @ tiles tag - .2byte 10216 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D2064 + spr_template 10216, 10216, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D2064 .align 2 gSpriteAffineAnim_83D7AF8:: @ 83D7AF8 @@ -10448,23 +9812,11 @@ gSpriteAffineAnimTable_83D7B10:: @ 83D7B10 .align 2 gBattleAnimSpriteTemplate_83D7B14:: @ 83D7B14 - .2byte 10217 @ tiles tag - .2byte 10217 @ palette tag - .4byte gOamData_837DF8C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D7B10 - .4byte sub_80D26A4 + spr_template 10217, 10217, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7B10, sub_80D26A4 .align 2 gBattleAnimSpriteTemplate_83D7B2C:: @ 83D7B2C - .2byte 10217 @ tiles tag - .2byte 10217 @ palette tag - .4byte gOamData_837DFEC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D7B10 - .4byte sub_80D27E0 + spr_template 10217, 10217, gOamData_837DFEC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7B10, sub_80D27E0 .align 2 gSpriteAffineAnim_83D7B44:: @ 83D7B44 @@ -10478,13 +9830,7 @@ gSpriteAffineAnimTable_83D7B5C:: @ 83D7B5C .align 2 gBattleAnimSpriteTemplate_83D7B60:: @ 83D7B60 - .2byte 10237 @ tiles tag - .2byte 10237 @ palette tag - .4byte gOamData_837DFE4 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D7B5C - .4byte sub_80D28AC + spr_template 10237, 10237, gOamData_837DFE4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7B5C, sub_80D28AC .align 2 gSpriteAnim_83D7B78:: @ 83D7B78 @@ -10501,13 +9847,7 @@ gSpriteAnimTable_83D7B90:: @ 83D7B90 .align 2 gBattleAnimSpriteTemplate_83D7B94:: @ 83D7B94 - .2byte 10218 @ tiles tag - .2byte 10218 @ palette tag - .4byte gOamData_837DF2C - .4byte gSpriteAnimTable_83D7B90 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D2920 + spr_template 10218, 10218, gOamData_837DF2C, gSpriteAnimTable_83D7B90, NULL, gDummySpriteAffineAnimTable, sub_80D2920 .align 2 gSpriteAnim_83D7BAC:: @ 83D7BAC @@ -10520,23 +9860,11 @@ gSpriteAnimTable_83D7BB4:: @ 83D7BB4 .align 2 gBattleAnimSpriteTemplate_83D7BB8:: @ 83D7BB8 - .2byte 10220 @ tiles tag - .2byte 10220 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D7BB4 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D2938 + spr_template 10220, 10220, gOamData_837DF34, gSpriteAnimTable_83D7BB4, NULL, gDummySpriteAffineAnimTable, sub_80D2938 .align 2 gBattleAnimSpriteTemplate_83D7BD0:: @ 83D7BD0 - .2byte 10219 @ tiles tag - .2byte 10219 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D2A38 + spr_template 10219, 10219, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D2A38 .align 2 gSpriteAnim_83D7BE8:: @ 83D7BE8 @@ -10555,13 +9883,7 @@ gSpriteAnimTable_83D7BF8:: @ 83D7BF8 .align 2 gBattleAnimSpriteTemplate_83D7C00:: @ 83D7C00 - .2byte 10221 @ tiles tag - .2byte 10221 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D7BF8 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D2ABC + spr_template 10221, 10221, gOamData_837DF34, gSpriteAnimTable_83D7BF8, NULL, gDummySpriteAffineAnimTable, sub_80D2ABC .align 2 gSpriteAnim_83D7C18:: @ 83D7C18 @@ -10586,13 +9908,7 @@ gSpriteAnimTable_83D7C40:: @ 83D7C40 .align 2 gBattleAnimSpriteTemplate_83D7C48:: @ 83D7C48 - .2byte 10222 @ tiles tag - .2byte 10222 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D7C40 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D2BE8 + spr_template 10222, 10222, gOamData_837DF34, gSpriteAnimTable_83D7C40, NULL, gDummySpriteAffineAnimTable, sub_80D2BE8 .align 2 gSpriteAnim_83D7C60:: @ 83D7C60 @@ -10617,13 +9933,7 @@ gSpriteAnimTable_83D7C88:: @ 83D7C88 .align 2 gBattleAnimSpriteTemplate_83D7C90:: @ 83D7C90 - .2byte 10215 @ tiles tag - .2byte 10215 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D7C88 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D2C38 + spr_template 10215, 10215, gOamData_837DF34, gSpriteAnimTable_83D7C88, NULL, gDummySpriteAffineAnimTable, sub_80D2C38 .align 2 gUnknown_083D7CA8:: @ 83D7CA8 @@ -10631,13 +9941,7 @@ gUnknown_083D7CA8:: @ 83D7CA8 .align 2 gBattleAnimSpriteTemplate_83D7CC8:: @ 83D7CC8 - .2byte 10225 @ tiles tag - .2byte 10225 @ palette tag - .4byte gOamData_837DF34 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D2D68 + spr_template 10225, 10225, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D2D68 .align 2 gSpriteAffineAnim_83D7CE0:: @ 83D7CE0 @@ -10662,23 +9966,11 @@ gSpriteAffineAnimTable_83D7D10:: @ 83D7D10 .align 2 gBattleAnimSpriteTemplate_83D7D1C:: @ 83D7D1C - .2byte 10206 @ tiles tag - .2byte 10206 @ palette tag - .4byte gOamData_837DF8C - .4byte gSpriteAnimTable_83D70D8 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D7D10 - .4byte sub_80D2EC8 + spr_template 10206, 10206, gOamData_837DF8C, gSpriteAnimTable_83D70D8, NULL, gSpriteAffineAnimTable_83D7D10, sub_80D2EC8 .align 2 gBattleAnimSpriteTemplate_83D7D34:: @ 83D7D34 - .2byte 10206 @ tiles tag - .2byte 10206 @ palette tag - .4byte gOamData_837DF8C - .4byte gSpriteAnimTable_83D70D8 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D7D10 - .4byte sub_80D2E68 + spr_template 10206, 10206, gOamData_837DF8C, gSpriteAnimTable_83D70D8, NULL, gSpriteAffineAnimTable_83D7D10, sub_80D2E68 .align 2 gSpriteAffineAnim_83D7D4C:: @ 83D7D4C @@ -10697,13 +9989,7 @@ gSpriteAffineAnimTable_83D7D6C:: @ 83D7D6C .align 2 gBattleAnimSpriteTemplate_83D7D74:: @ 83D7D74 - .2byte 10244 @ tiles tag - .2byte 10244 @ palette tag - .4byte gOamData_837E13C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D7D6C - .4byte sub_80D3014 + spr_template 10244, 10244, gOamData_837E13C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7D6C, sub_80D3014 .align 2 .incbin "baserom.gba", 0x3d7d8c, 0x13a4 @@ -10734,13 +10020,7 @@ gSpriteAnimTable_83D9174:: @ 83D9174 .align 2 gBattleAnimSpriteTemplate_83D9178:: @ 83D9178 - .2byte 10146 @ tiles tag - .2byte 10146 @ palette tag - .4byte gOamData_837E0AC - .4byte gSpriteAnimTable_83D9174 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D9160 - .4byte sub_80D31C8 + spr_template 10146, 10146, gOamData_837E0AC, gSpriteAnimTable_83D9174, NULL, gSpriteAffineAnimTable_83D9160, sub_80D31C8 .align 2 gSpriteAnim_83D9190:: @ 83D9190 @@ -10769,13 +10049,7 @@ gSpriteAffineAnimTable_83D91C0:: @ 83D91C0 .align 2 gBattleAnimSpriteTemplate_83D91C4:: @ 83D91C4 - .2byte 10140 @ tiles tag - .2byte 10140 @ palette tag - .4byte gOamData_837E024 - .4byte gSpriteAnimTable_83D91A0 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D91C0 - .4byte sub_80D33B4 + spr_template 10140, 10140, gOamData_837E024, gSpriteAnimTable_83D91A0, NULL, gSpriteAffineAnimTable_83D91C0, sub_80D33B4 .align 2 gSpriteAnim_83D91DC:: @ 83D91DC @@ -10791,43 +10065,19 @@ gSpriteAnimTable_83D91F0:: @ 83D91F0 .align 2 gBattleAnimSpriteTemplate_83D91F4:: @ 83D91F4 - .2byte 10149 @ tiles tag - .2byte 10149 @ palette tag - .4byte gOamData_837E04C - .4byte gSpriteAnimTable_83D91F0 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D3554 + spr_template 10149, 10149, gOamData_837E04C, gSpriteAnimTable_83D91F0, NULL, gDummySpriteAffineAnimTable, sub_80D3554 .align 2 gBattleAnimSpriteTemplate_83D920C:: @ 83D920C - .2byte 10259 @ tiles tag - .2byte 10259 @ palette tag - .4byte gOamData_837E04C - .4byte gSpriteAnimTable_83D91F0 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D3554 + spr_template 10259, 10259, gOamData_837E04C, gSpriteAnimTable_83D91F0, NULL, gDummySpriteAffineAnimTable, sub_80D3554 .align 2 gBattleAnimSpriteTemplate_83D9224:: @ 83D9224 - .2byte 10264 @ tiles tag - .2byte 10264 @ palette tag - .4byte gOamData_837DF24 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D3554 + spr_template 10264, 10264, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D3554 .align 2 gBattleAnimSpriteTemplate_83D923C:: @ 83D923C - .2byte 10265 @ tiles tag - .2byte 10265 @ palette tag - .4byte gOamData_837DF24 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D3554 + spr_template 10265, 10265, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D3554 .align 2 gSpriteAnim_83D9254:: @ 83D9254 @@ -10842,23 +10092,11 @@ gSpriteAnimTable_83D9264:: @ 83D9264 .align 2 gBattleAnimSpriteTemplate_83D9268:: @ 83D9268 - .2byte 10029 @ tiles tag - .2byte 10029 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D9264 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D3554 + spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D9264, NULL, gDummySpriteAffineAnimTable, sub_80D3554 .align 2 gBattleAnimSpriteTemplate_83D9280:: @ 83D9280 - .2byte 10165 @ tiles tag - .2byte 10165 @ palette tag - .4byte gOamData_837E034 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D752C - .4byte sub_80D3554 + spr_template 10165, 10165, gOamData_837E034, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D752C, sub_80D3554 .align 2 gSpriteAffineAnim_83D9298:: @ 83D9298 @@ -10882,23 +10120,11 @@ gSpriteAffineAnimTable_83D92CC:: @ 83D92CC .align 2 gBattleAnimSpriteTemplate_83D92D0:: @ 83D92D0 - .2byte 10149 @ tiles tag - .2byte 10149 @ palette tag - .4byte gOamData_837E10C - .4byte gSpriteAnimTable_83D91F0 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D92C8 - .4byte sub_80D3698 + spr_template 10149, 10149, gOamData_837E10C, gSpriteAnimTable_83D91F0, NULL, gSpriteAffineAnimTable_83D92C8, sub_80D3698 .align 2 gBattleAnimSpriteTemplate_83D92E8:: @ 83D92E8 - .2byte 10149 @ tiles tag - .2byte 10149 @ palette tag - .4byte gOamData_837E10C - .4byte gSpriteAnimTable_83D91F0 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D92CC - .4byte sub_80D3728 + spr_template 10149, 10149, gOamData_837E10C, gSpriteAnimTable_83D91F0, NULL, gSpriteAffineAnimTable_83D92CC, sub_80D3728 .align 2 gSpriteAnim_83D9300:: @ 83D9300 @@ -10920,43 +10146,19 @@ gSpriteAnimTable_83D9314:: @ 83D9314 .align 2 gBattleAnimSpriteTemplate_83D9318:: @ 83D9318 - .2byte 10155 @ tiles tag - .2byte 10155 @ palette tag - .4byte gOamData_837E04C - .4byte gSpriteAnimTable_83D9310 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80794A8 + spr_template 10155, 10155, gOamData_837E04C, gSpriteAnimTable_83D9310, NULL, gDummySpriteAffineAnimTable, sub_80794A8 .align 2 gBattleAnimSpriteTemplate_83D9330:: @ 83D9330 - .2byte 10155 @ tiles tag - .2byte 10155 @ palette tag - .4byte gOamData_837E10C - .4byte gSpriteAnimTable_83D9314 - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA318 - .4byte sub_80D37FC + spr_template 10155, 10155, gOamData_837E10C, gSpriteAnimTable_83D9314, NULL, gSpriteAffineAnimTable_83DA318, sub_80D37FC .align 2 gBattleAnimSpriteTemplate_83D9348:: @ 83D9348 - .2byte 10141 @ tiles tag - .2byte 10141 @ palette tag - .4byte gOamData_837DF24 - .4byte gSpriteAnimTable_83D9BC8 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D3838 + spr_template 10141, 10141, gOamData_837DF24, gSpriteAnimTable_83D9BC8, NULL, gDummySpriteAffineAnimTable, sub_80D3838 .align 2 gBattleAnimSpriteTemplate_83D9360:: @ 83D9360 - .2byte 10155 @ tiles tag - .2byte 10155 @ palette tag - .4byte gOamData_837DF24 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D4044 + spr_template 10155, 10155, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D4044 .align 2 gUnknown_083D9378:: @ 83D9378 @@ -11004,13 +10206,7 @@ gSpriteAffineAnimTable_83D9404:: @ 83D9404 .align 2 gBattleAnimSpriteTemplate_83D9408:: @ 83D9408 - .2byte 10155 @ tiles tag - .2byte 10155 @ palette tag - .4byte gOamData_837DF24 - .4byte gSpriteAnimTable_83D93A8 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D4BF0 + spr_template 10155, 10155, gOamData_837DF24, gSpriteAnimTable_83D93A8, NULL, gDummySpriteAffineAnimTable, sub_80D4BF0 .align 2 gUnknown_083D9420:: @ 83D9420 @@ -11018,13 +10214,7 @@ gUnknown_083D9420:: @ 83D9420 .align 2 gBattleAnimSpriteTemplate_83D9438:: @ 83D9438 - .2byte 10155 @ tiles tag - .2byte 10155 @ palette tag - .4byte gOamData_837DF8C - .4byte gSpriteAnimTable_83D93B0 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D9404 - .4byte sub_807A9BC + spr_template 10155, 10155, gOamData_837DF8C, gSpriteAnimTable_83D93B0, NULL, gSpriteAffineAnimTable_83D9404, sub_807A9BC .align 2 gSpriteAnim_83D9450:: @ 83D9450 @@ -11047,23 +10237,11 @@ gSpriteAnimTable_83D9470:: @ 83D9470 .align 2 gBattleAnimSpriteTemplate_83D9478:: @ 83D9478 - .2byte 10029 @ tiles tag - .2byte 10029 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D9470 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D4ED8 + spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D9470, NULL, gDummySpriteAffineAnimTable, sub_80D4ED8 .align 2 gBattleAnimSpriteTemplate_83D9490:: @ 83D9490 - .2byte 10029 @ tiles tag - .2byte 10029 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D9470 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D4F18 + spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D9470, NULL, gDummySpriteAffineAnimTable, sub_80D4F18 .align 2 gSpriteAnim_83D94A8:: @ 83D94A8 @@ -11106,33 +10284,15 @@ gSpriteAffineAnimTable_83D9504:: @ 83D9504 .align 2 gBattleAnimSpriteTemplate_83D9508:: @ 83D9508 - .2byte 10033 @ tiles tag - .2byte 10033 @ palette tag - .4byte gOamData_837DF94 - .4byte gSpriteAnimTable_83D94CC - .4byte NULL - .4byte gSpriteAffineAnimTable_83D9504 - .4byte sub_80D4FCC + spr_template 10033, 10033, gOamData_837DF94, gSpriteAnimTable_83D94CC, NULL, gSpriteAffineAnimTable_83D9504, sub_80D4FCC .align 2 gBattleAnimSpriteTemplate_83D9520:: @ 83D9520 - .2byte 10033 @ tiles tag - .2byte 10033 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D94CC - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D4FCC + spr_template 10033, 10033, gOamData_837DF34, gSpriteAnimTable_83D94CC, NULL, gDummySpriteAffineAnimTable, sub_80D4FCC .align 2 gBattleAnimSpriteTemplate_83D9538:: @ 83D9538 - .2byte 10035 @ tiles tag - .2byte 10035 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D94E8 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D4F5C + spr_template 10035, 10035, gOamData_837DF34, gSpriteAnimTable_83D94E8, NULL, gDummySpriteAffineAnimTable, sub_80D4F5C .align 2 .incbin "baserom.gba", 0x3d9550, 0x44 @@ -11149,13 +10309,7 @@ gSpriteAffineAnimTable_83D95AC:: @ 83D95AC .align 2 gBattleAnimSpriteTemplate_83D95B0:: @ 83D95B0 - .2byte 10157 @ tiles tag - .2byte 10157 @ palette tag - .4byte gOamData_837E0B4 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D95AC - .4byte sub_80D517C + spr_template 10157, 10157, gOamData_837E0B4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D95AC, sub_80D517C .align 2 gSpriteAnim_83D95C8:: @ 83D95C8 @@ -11172,43 +10326,19 @@ gSpriteAnimTable_83D95E0:: @ 83D95E0 .align 2 gBattleAnimSpriteTemplate_83D95E4:: @ 83D95E4 - .2byte 10029 @ tiles tag - .2byte 10029 @ palette tag - .4byte gOamData_837DF34 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_807941C + spr_template 10029, 10029, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807941C .align 2 gBattleAnimSpriteTemplate_83D95FC:: @ 83D95FC - .2byte 10029 @ tiles tag - .2byte 10029 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D95E0 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D51A8 + spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D95E0, NULL, gDummySpriteAffineAnimTable, sub_80D51A8 .align 2 gBattleAnimSpriteTemplate_83D9614:: @ 83D9614 - .2byte 10029 @ tiles tag - .2byte 10029 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D95E0 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D5210 + spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D95E0, NULL, gDummySpriteAffineAnimTable, sub_80D5210 .align 2 gBattleAnimSpriteTemplate_83D962C:: @ 83D962C - .2byte 10029 @ tiles tag - .2byte 10029 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D95E0 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D522C + spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D95E0, NULL, gDummySpriteAffineAnimTable, sub_80D522C .align 2 gSpriteAnim_83D9644:: @ 83D9644 @@ -11225,33 +10355,15 @@ gSpriteAnimTable_83D9650:: @ 83D9650 .align 2 gBattleAnimSpriteTemplate_83D967C:: @ 83D967C - .2byte 10029 @ tiles tag - .2byte 10029 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D9650 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D5374 + spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D9650, NULL, gDummySpriteAffineAnimTable, sub_80D5374 .align 2 gBattleAnimSpriteTemplate_83D9694:: @ 83D9694 - .2byte 10029 @ tiles tag - .2byte 10029 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D95E0 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D53B4 + spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D95E0, NULL, gDummySpriteAffineAnimTable, sub_80D53B4 .align 2 gBattleAnimSpriteTemplate_83D96AC:: @ 83D96AC - .2byte 10029 @ tiles tag - .2byte 10029 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D95E0 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_807A9BC + spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D95E0, NULL, gDummySpriteAffineAnimTable, sub_807A9BC .align 2 gUnknown_083D96C4:: @ 83D96C4 @@ -11265,13 +10377,7 @@ gUnknown_083D96DE:: @ 83D96DE .align 2 gBattleAnimSpriteTemplate_83D96F8:: @ 83D96F8 - .2byte 10201 @ tiles tag - .2byte 10201 @ palette tag - .4byte gOamData_837DF34 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D5A20 + spr_template 10201, 10201, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5A20 .align 2 gSpriteAnim_83D9710:: @ 83D9710 @@ -11305,13 +10411,7 @@ gSpriteAnimTable_83D973C:: @ 83D973C .align 2 gBattleAnimSpriteTemplate_83D974C:: @ 83D974C - .2byte 10231 @ tiles tag - .2byte 10231 @ palette tag - .4byte gOamData_837DF2C - .4byte gSpriteAnimTable_83D973C - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D5B0C + spr_template 10231, 10231, gOamData_837DF2C, gSpriteAnimTable_83D973C, NULL, gDummySpriteAffineAnimTable, sub_80D5B0C .align 2 gSpriteAnim_83D9764:: @ 83D9764 @@ -11327,13 +10427,7 @@ gSpriteAnimTable_83D9778:: @ 83D9778 .align 2 gBattleAnimSpriteTemplate_83D977C:: @ 83D977C - .2byte 10232 @ tiles tag - .2byte 10232 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D9778 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D5CC0 + spr_template 10232, 10232, gOamData_837DF34, gSpriteAnimTable_83D9778, NULL, gDummySpriteAffineAnimTable, sub_80D5CC0 .align 2 gUnknown_083D9794:: @ 83D9794 @@ -11357,36 +10451,18 @@ gSpriteAnimTable_83D97CC:: @ 83D97CC .align 2 gBattleAnimSpriteTemplate_83D97D0:: @ 83D97D0 - .2byte 10037 @ tiles tag - .2byte 10037 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D97CC - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D61C8 + spr_template 10037, 10037, gOamData_837DF34, gSpriteAnimTable_83D97CC, NULL, gDummySpriteAffineAnimTable, sub_80D61C8 .align 2 .incbin "baserom.gba", 0x3d97e8, 0x74 .align 2 gBattleAnimSpriteTemplate_83D985C:: @ 83D985C - .2byte 10011 @ tiles tag - .2byte 10011 @ palette tag - .4byte gOamData_837DF8C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D6328 + spr_template 10011, 10011, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D6328 .align 2 gBattleAnimSpriteTemplate_83D9874:: @ 83D9874 - .2byte 10171 @ tiles tag - .2byte 10171 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_807941C + spr_template 10171, 10171, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807941C .align 2 gSpriteAffineAnim_83D988C:: @ 83D988C @@ -11399,13 +10475,7 @@ gSpriteAffineAnimTable_83D989C:: @ 83D989C .align 2 gBattleAnimSpriteTemplate_83D98A0:: @ 83D98A0 - .2byte 10011 @ tiles tag - .2byte 10011 @ palette tag - .4byte gOamData_837DF8C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D989C - .4byte sub_80D648C + spr_template 10011, 10011, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D989C, sub_80D648C .align 2 gSpriteAnim_83D98B8:: @ 83D98B8 @@ -11431,33 +10501,15 @@ gSpriteAffineAnimTable_83D98EC:: @ 83D98EC .align 2 gBattleAnimSpriteTemplate_83D98F0:: @ 83D98F0 - .2byte 10282 @ tiles tag - .2byte 10282 @ palette tag - .4byte gOamData_837DF94 - .4byte gSpriteAnimTable_83D98C8 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D98EC - .4byte sub_80D65DC + spr_template 10282, 10282, gOamData_837DF94, gSpriteAnimTable_83D98C8, NULL, gSpriteAffineAnimTable_83D98EC, sub_80D65DC .align 2 gBattleAnimSpriteTemplate_83D9908:: @ 83D9908 - .2byte 10011 @ tiles tag - .2byte 10011 @ palette tag - .4byte gOamData_837DF8C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D989C - .4byte sub_80D6658 + spr_template 10011, 10011, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D989C, sub_80D6658 .align 2 gBattleAnimSpriteTemplate_83D9920:: @ 83D9920 - .2byte 10011 @ tiles tag - .2byte 10011 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D679C + spr_template 10011, 10011, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D679C .align 2 gUnknown_083D9938:: @ 83D9938 @@ -11465,13 +10517,7 @@ gUnknown_083D9938:: @ 83D9938 .align 2 gBattleAnimSpriteTemplate_83D9950:: @ 83D9950 - .2byte 10173 @ tiles tag - .2byte 10173 @ palette tag - .4byte gOamData_837DF54 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D6A6C + spr_template 10173, 10173, gOamData_837DF54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D6A6C .align 2 gUnknown_083D9968:: @ 83D9968 @@ -11515,13 +10561,7 @@ gSpriteAffineAnimTable_83D9A60:: @ 83D9A60 .align 2 gBattleAnimSpriteTemplate_83D9A6C:: @ 83D9A6C - .2byte 10212 @ tiles tag - .2byte 10212 @ palette tag - .4byte gOamData_837E0BC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D9A60 - .4byte sub_80D6D18 + spr_template 10212, 10212, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D9A60, sub_80D6D18 .align 2 gSpriteAnim_83D9A84:: @ 83D9A84 @@ -11537,23 +10577,11 @@ gSpriteAnimTable_83D9A98:: @ 83D9A98 .align 2 gBattleAnimSpriteTemplate_83D9A9C:: @ 83D9A9C - .2byte 10213 @ tiles tag - .2byte 10213 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D9A98 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D6D70 + spr_template 10213, 10213, gOamData_837DF34, gSpriteAnimTable_83D9A98, NULL, gDummySpriteAffineAnimTable, sub_80D6D70 .align 2 gBattleAnimSpriteTemplate_83D9AB4:: @ 83D9AB4 - .2byte 10212 @ tiles tag - .2byte 10212 @ palette tag - .4byte gOamData_837E0BC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D9A60 - .4byte sub_80D6DD8 + spr_template 10212, 10212, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D9A60, sub_80D6DD8 .align 2 .incbin "baserom.gba", 0x3d9acc, 0x44 @@ -11563,13 +10591,7 @@ gUnknown_083D9B10:: @ 83D9B10 .align 2 gBattleAnimSpriteTemplate_83D9B28:: @ 83D9B28 - .2byte 10212 @ tiles tag - .2byte 10212 @ palette tag - .4byte gOamData_837E0BC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D9A60 - .4byte sub_80D727C + spr_template 10212, 10212, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D9A60, sub_80D727C .align 2 gUnknown_083D9B40:: @ 83D9B40 @@ -11635,23 +10657,11 @@ gSpriteAffineAnimTable_83D9BDC:: @ 83D9BDC .align 2 gBattleAnimSpriteTemplate_83D9BE0:: @ 83D9BE0 - .2byte 10141 @ tiles tag - .2byte 10141 @ palette tag - .4byte gOamData_837E144 - .4byte gSpriteAnimTable_83D9BB8 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D9BDC - .4byte sub_80D78EC + spr_template 10141, 10141, gOamData_837E144, gSpriteAnimTable_83D9BB8, NULL, gSpriteAffineAnimTable_83D9BDC, sub_80D78EC .align 2 gBattleAnimSpriteTemplate_83D9BF8:: @ 83D9BF8 - .2byte 10141 @ tiles tag - .2byte 10141 @ palette tag - .4byte gOamData_837E044 - .4byte gSpriteAnimTable_83D9BBC - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D78EC + spr_template 10141, 10141, gOamData_837E044, gSpriteAnimTable_83D9BBC, NULL, gDummySpriteAffineAnimTable, sub_80D78EC .align 2 gSpriteAffineAnim_83D9C10:: @ 83D9C10 @@ -11664,23 +10674,11 @@ gSpriteAffineAnimTable_83D9C20:: @ 83D9C20 .align 2 gBattleAnimSpriteTemplate_83D9C24:: @ 83D9C24 - .2byte 10141 @ tiles tag - .2byte 10141 @ palette tag - .4byte gOamData_837E0E4 - .4byte gSpriteAnimTable_83D9BB8 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D9C20 - .4byte sub_80D792C + spr_template 10141, 10141, gOamData_837E0E4, gSpriteAnimTable_83D9BB8, NULL, gSpriteAffineAnimTable_83D9C20, sub_80D792C .align 2 gBattleAnimSpriteTemplate_83D9C3C:: @ 83D9C3C - .2byte 10141 @ tiles tag - .2byte 10141 @ palette tag - .4byte gOamData_837E044 - .4byte gSpriteAnimTable_83D9BBC - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D792C + spr_template 10141, 10141, gOamData_837E044, gSpriteAnimTable_83D9BBC, NULL, gDummySpriteAffineAnimTable, sub_80D792C .align 2 gSpriteAffineAnim_83D9C54:: @ 83D9C54 @@ -11695,53 +10693,23 @@ gSpriteAffineAnimTable_83D9C74:: @ 83D9C74 .align 2 gBattleAnimSpriteTemplate_83D9C78:: @ 83D9C78 - .2byte 10141 @ tiles tag - .2byte 10141 @ palette tag - .4byte gOamData_837E0E4 - .4byte gSpriteAnimTable_83D9BB8 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D9C74 - .4byte sub_80D79B4 + spr_template 10141, 10141, gOamData_837E0E4, gSpriteAnimTable_83D9BB8, NULL, gSpriteAffineAnimTable_83D9C74, sub_80D79B4 .align 2 gBattleAnimSpriteTemplate_83D9C90:: @ 83D9C90 - .2byte 10141 @ tiles tag - .2byte 10141 @ palette tag - .4byte gOamData_837E0A4 - .4byte gSpriteAnimTable_83D9BBC - .4byte NULL - .4byte gSpriteAffineAnimTable_83D9C74 - .4byte sub_80D79B4 + spr_template 10141, 10141, gOamData_837E0A4, gSpriteAnimTable_83D9BBC, NULL, gSpriteAffineAnimTable_83D9C74, sub_80D79B4 .align 2 gBattleAnimSpriteTemplate_83D9CA8:: @ 83D9CA8 - .2byte 10141 @ tiles tag - .2byte 10141 @ palette tag - .4byte gOamData_837DF24 - .4byte gSpriteAnimTable_83D9BC0 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D7A64 + spr_template 10141, 10141, gOamData_837DF24, gSpriteAnimTable_83D9BC0, NULL, gDummySpriteAffineAnimTable, sub_80D7A64 .align 2 gBattleAnimSpriteTemplate_83D9CC0:: @ 83D9CC0 - .2byte 10141 @ tiles tag - .2byte 10141 @ palette tag - .4byte gOamData_837DF2C - .4byte gSpriteAnimTable_83D9BC4 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D7CD4 + spr_template 10141, 10141, gOamData_837DF2C, gSpriteAnimTable_83D9BC4, NULL, gDummySpriteAffineAnimTable, sub_80D7CD4 .align 2 gBattleAnimSpriteTemplate_83D9CD8:: @ 83D9CD8 - .2byte 10141 @ tiles tag - .2byte 10141 @ palette tag - .4byte gOamData_837DF24 - .4byte gSpriteAnimTable_83D9BC0 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D7CD4 + spr_template 10141, 10141, gOamData_837DF24, gSpriteAnimTable_83D9BC0, NULL, gDummySpriteAffineAnimTable, sub_80D7CD4 .align 2 gSpriteAnim_83D9CF0:: @ 83D9CF0 @@ -11760,13 +10728,7 @@ gSpriteAnimTable_83D9D10:: @ 83D9D10 .align 2 gBattleAnimSpriteTemplate_83D9D14:: @ 83D9D14 - .2byte 10142 @ tiles tag - .2byte 10142 @ palette tag - .4byte gOamData_837E084 - .4byte gSpriteAnimTable_83D9D10 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D7E88 + spr_template 10142, 10142, gOamData_837E084, gSpriteAnimTable_83D9D10, NULL, gDummySpriteAffineAnimTable, sub_80D7E88 .align 2 gSpriteAnim_83D9D2C:: @ 83D9D2C @@ -11780,23 +10742,11 @@ gSpriteAnimTable_83D9D38:: @ 83D9D38 .align 2 gBattleAnimSpriteTemplate_83D9D3C:: @ 83D9D3C - .2byte 10144 @ tiles tag - .2byte 10144 @ palette tag - .4byte gOamData_837E074 - .4byte gSpriteAnimTable_83D9D38 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D7F10 + spr_template 10144, 10144, gOamData_837E074, gSpriteAnimTable_83D9D38, NULL, gDummySpriteAffineAnimTable, sub_80D7F10 .align 2 gBattleAnimSpriteTemplate_83D9D54:: @ 83D9D54 - .2byte 10172 @ tiles tag - .2byte 10172 @ palette tag - .4byte gOamData_837E074 - .4byte gSpriteAnimTable_83D9D38 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D7F10 + spr_template 10172, 10172, gOamData_837E074, gSpriteAnimTable_83D9D38, NULL, gDummySpriteAffineAnimTable, sub_80D7F10 .align 2 gUnknown_083D9D6C:: @ 83D9D6C @@ -11804,13 +10754,7 @@ gUnknown_083D9D6C:: @ 83D9D6C .align 2 gBattleAnimSpriteTemplate_83D9D80:: @ 83D9D80 - .2byte 10155 @ tiles tag - .2byte 10155 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D83E0 + spr_template 10155, 10155, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D83E0 .align 2 gUnknown_083D9D98:: @ 83D9D98 @@ -11818,13 +10762,7 @@ gUnknown_083D9D98:: @ 83D9D98 .align 2 gBattleAnimSpriteTemplate_83D9DAC:: @ 83D9DAC - .2byte 10172 @ tiles tag - .2byte 10172 @ palette tag - .4byte gOamData_837E074 - .4byte gSpriteAnimTable_83D9D38 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D8700 + spr_template 10172, 10172, gOamData_837E074, gSpriteAnimTable_83D9D38, NULL, gDummySpriteAffineAnimTable, sub_80D8700 .align 2 gUnknown_083D9DC4:: @ 83D9DC4 @@ -11848,13 +10786,7 @@ gUnknown_083D9E3C:: @ 83D9E3C .align 2 gBattleAnimSpriteTemplate_83D9E54:: @ 83D9E54 - .2byte 10263 @ tiles tag - .2byte 10263 @ palette tag - .4byte gOamData_837DF8C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83D9E38 - .4byte sub_807A9BC + spr_template 10263, 10263, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D9E38, sub_807A9BC .align 2 gSpriteAnim_83D9E6C:: @ 83D9E6C @@ -11909,23 +10841,11 @@ gSpriteAffineAnimTable_83D9EE0:: @ 83D9EE0 .align 2 gBattleAnimSpriteTemplate_83D9EF4:: @ 83D9EF4 - .2byte 10043 @ tiles tag - .2byte 10043 @ palette tag - .4byte gOamData_837DFF4 - .4byte gSpriteAnimTable_83D9E88 - .4byte NULL - .4byte gSpriteAffineAnimTable_83D9EE0 - .4byte unc_080B06FC + spr_template 10043, 10043, gOamData_837DFF4, gSpriteAnimTable_83D9E88, NULL, gSpriteAffineAnimTable_83D9EE0, unc_080B06FC .align 2 gBattleAnimSpriteTemplate_83D9F0C:: @ 83D9F0C - .2byte 10141 @ tiles tag - .2byte 10141 @ palette tag - .4byte gOamData_837DF24 - .4byte gSpriteAnimTable_83D9BBC - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D8F10 + spr_template 10141, 10141, gOamData_837DF24, gSpriteAnimTable_83D9BBC, NULL, gDummySpriteAffineAnimTable, sub_80D8F10 .align 2 .incbin "baserom.gba", 0x3d9f24, 0x18 @@ -11971,63 +10891,27 @@ gSpriteAnimTable_83D9F70:: @ 83D9F70 .align 2 gBattleAnimSpriteTemplate_83D9F78:: @ 83D9F78 - .2byte 10143 @ tiles tag - .2byte 10143 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D9F64 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D902C + spr_template 10143, 10143, gOamData_837DF34, gSpriteAnimTable_83D9F64, NULL, gDummySpriteAffineAnimTable, sub_80D902C .align 2 gBattleAnimSpriteTemplate_83D9F90:: @ 83D9F90 - .2byte 10143 @ tiles tag - .2byte 10143 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D9F64 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D9078 + spr_template 10143, 10143, gOamData_837DF34, gSpriteAnimTable_83D9F64, NULL, gDummySpriteAffineAnimTable, sub_80D9078 .align 2 gBattleAnimSpriteTemplate_83D9FA8:: @ 83D9FA8 - .2byte 10143 @ tiles tag - .2byte 10143 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D9F64 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D90A4 + spr_template 10143, 10143, gOamData_837DF34, gSpriteAnimTable_83D9F64, NULL, gDummySpriteAffineAnimTable, sub_80D90A4 .align 2 gBattleAnimSpriteTemplate_83D9FC0:: @ 83D9FC0 - .2byte 10143 @ tiles tag - .2byte 10143 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D9F64 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D90F4 + spr_template 10143, 10143, gOamData_837DF34, gSpriteAnimTable_83D9F64, NULL, gDummySpriteAffineAnimTable, sub_80D90F4 .align 2 gBattleAnimSpriteTemplate_83D9FD8:: @ 83D9FD8 - .2byte 10143 @ tiles tag - .2byte 10143 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D9F70 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D92D0 + spr_template 10143, 10143, gOamData_837DF34, gSpriteAnimTable_83D9F70, NULL, gDummySpriteAffineAnimTable, sub_80D92D0 .align 2 gBattleAnimSpriteTemplate_83D9FF0:: @ 83D9FF0 - .2byte 10143 @ tiles tag - .2byte 10143 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D9F68 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D9378 + spr_template 10143, 10143, gOamData_837DF34, gSpriteAnimTable_83D9F68, NULL, gDummySpriteAffineAnimTable, sub_80D9378 .align 2 gSpriteAffineAnim_83DA008:: @ 83DA008 @@ -12041,13 +10925,7 @@ gSpriteAffineAnimTable_83DA020:: @ 83DA020 .align 2 gBattleAnimSpriteTemplate_83DA024:: @ 83DA024 - .2byte 10143 @ tiles tag - .2byte 10143 @ palette tag - .4byte gOamData_837DFF4 - .4byte gSpriteAnimTable_83D9F64 - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA020 - .4byte sub_80D943C + spr_template 10143, 10143, gOamData_837DFF4, gSpriteAnimTable_83D9F64, NULL, gSpriteAffineAnimTable_83DA020, sub_80D943C .align 2 gSpriteAffineAnim_83DA03C:: @ 83DA03C @@ -12061,53 +10939,23 @@ gSpriteAffineAnimTable_83DA054:: @ 83DA054 .align 2 gBattleAnimSpriteTemplate_83DA058:: @ 83DA058 - .2byte 10143 @ tiles tag - .2byte 10143 @ palette tag - .4byte gOamData_837DFF4 - .4byte gSpriteAnimTable_83D9F64 - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA054 - .4byte sub_80D943C + spr_template 10143, 10143, gOamData_837DFF4, gSpriteAnimTable_83D9F64, NULL, gSpriteAffineAnimTable_83DA054, sub_80D943C .align 2 gBattleAnimSpriteTemplate_83DA070:: @ 83DA070 - .2byte 10143 @ tiles tag - .2byte 10143 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D9F68 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D94A8 + spr_template 10143, 10143, gOamData_837DF34, gSpriteAnimTable_83D9F68, NULL, gDummySpriteAffineAnimTable, sub_80D94A8 .align 2 gBattleAnimSpriteTemplate_83DA088:: @ 83DA088 - .2byte 10073 @ tiles tag - .2byte 10073 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D9540 + spr_template 10073, 10073, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D9540 .align 2 gBattleAnimSpriteTemplate_83DA0A0:: @ 83DA0A0 - .2byte 10167 @ tiles tag - .2byte 10167 @ palette tag - .4byte gOamData_837E05C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D95D0 + spr_template 10167, 10167, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D95D0 .align 2 gBattleAnimSpriteTemplate_83DA0B8:: @ 83DA0B8 - .2byte 10208 @ tiles tag - .2byte 10208 @ palette tag - .4byte gOamData_837DF34 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D96B8 + spr_template 10208, 10208, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D96B8 .align 2 gSpriteAffineAnim_83DA0D0:: @ 83DA0D0 @@ -12123,43 +10971,19 @@ gSpriteAffineAnimTable_83DA0F8:: @ 83DA0F8 .align 2 gBattleAnimSpriteTemplate_83DA0FC:: @ 83DA0FC - .2byte 10212 @ tiles tag - .2byte 10212 @ palette tag - .4byte gOamData_837E11C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA0F8 - .4byte sub_80D97CC + spr_template 10212, 10212, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA0F8, sub_80D97CC .align 2 gBattleAnimSpriteTemplate_83DA114:: @ 83DA114 - .2byte 10257 @ tiles tag - .2byte 10257 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D98D8 + spr_template 10257, 10257, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D98D8 .align 2 gBattleAnimSpriteTemplate_83DA12C:: @ 83DA12C - .2byte 10256 @ tiles tag - .2byte 10256 @ palette tag - .4byte gOamData_837DF3C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D9A38 + spr_template 10256, 10256, gOamData_837DF3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D9A38 .align 2 gBattleAnimSpriteTemplate_83DA144:: @ 83DA144 - .2byte 10143 @ tiles tag - .2byte 10143 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D9F64 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D9B48 + spr_template 10143, 10143, gOamData_837DF34, gSpriteAnimTable_83D9F64, NULL, gDummySpriteAffineAnimTable, sub_80D9B48 .align 2 gSpriteAnim_83DA15C:: @ 83DA15C @@ -12190,13 +11014,7 @@ gSpriteAnimTable_83DA18C:: @ 83DA18C .align 2 gBattleAnimSpriteTemplate_83DA198:: @ 83DA198 - .2byte 10245 @ tiles tag - .2byte 10245 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83DA18C - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D9BD4 + spr_template 10245, 10245, gOamData_837DF34, gSpriteAnimTable_83DA18C, NULL, gDummySpriteAffineAnimTable, sub_80D9BD4 .align 2 gSpriteAnim_83DA1B0:: @ 83DA1B0 @@ -12224,13 +11042,7 @@ gSpriteAnimTable_83DA1D4:: @ 83DA1D4 .align 2 gBattleAnimSpriteTemplate_83DA1E0:: @ 83DA1E0 - .2byte 10246 @ tiles tag - .2byte 10246 @ palette tag - .4byte gOamData_837DF3C - .4byte gSpriteAnimTable_83DA1D4 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80D9BD4 + spr_template 10246, 10246, gOamData_837DF3C, gSpriteAnimTable_83DA1D4, NULL, gDummySpriteAffineAnimTable, sub_80D9BD4 .align 2 gSpriteAffineAnim_83DA1F8:: @ 83DA1F8 @@ -12244,13 +11056,7 @@ gSpriteAffineAnimTable_83DA210:: @ 83DA210 .align 2 gBattleAnimSpriteTemplate_83DA214:: @ 83DA214 - .2byte 10143 @ tiles tag - .2byte 10143 @ palette tag - .4byte gOamData_837DFF4 - .4byte gSpriteAnimTable_83D9F64 - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA210 - .4byte sub_80D9C40 + spr_template 10143, 10143, gOamData_837DFF4, gSpriteAnimTable_83D9F64, NULL, gSpriteAffineAnimTable_83DA210, sub_80D9C40 .align 2 gSpriteAnim_83DA22C:: @ 83DA22C @@ -12266,13 +11072,7 @@ gSpriteAnimTable_83DA240:: @ 83DA240 .align 2 gBattleAnimSpriteTemplate_83DA244:: @ 83DA244 - .2byte 10151 @ tiles tag - .2byte 10151 @ palette tag - .4byte gOamData_837DF74 - .4byte gSpriteAnimTable_83DA240 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80793C4 + spr_template 10151, 10151, gOamData_837DF74, gSpriteAnimTable_83DA240, NULL, gDummySpriteAffineAnimTable, sub_80793C4 .align 2 gSpriteAnim_83DA25C:: @ 83DA25C @@ -12323,33 +11123,15 @@ gSpriteAffineAnimTable_83DA2B4:: @ 83DA2B4 .align 2 gBattleAnimSpriteTemplate_83DA2B8:: @ 83DA2B8 - .2byte 10150 @ tiles tag - .2byte 10150 @ palette tag - .4byte gOamData_837DFEC - .4byte gSpriteAnimTable_83DA274 - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA2B0 - .4byte sub_80D9D70 + spr_template 10150, 10150, gOamData_837DFEC, gSpriteAnimTable_83DA274, NULL, gSpriteAffineAnimTable_83DA2B0, sub_80D9D70 .align 2 gBattleAnimSpriteTemplate_83DA2D0:: @ 83DA2D0 - .2byte 10150 @ tiles tag - .2byte 10150 @ palette tag - .4byte gOamData_837DFEC - .4byte gSpriteAnimTable_83DA274 - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA2B0 - .4byte sub_80D9DF0 + spr_template 10150, 10150, gOamData_837DFEC, gSpriteAnimTable_83DA274, NULL, gSpriteAffineAnimTable_83DA2B0, sub_80D9DF0 .align 2 gBattleAnimSpriteTemplate_83DA2E8:: @ 83DA2E8 - .2byte 10150 @ tiles tag - .2byte 10150 @ palette tag - .4byte gOamData_837DF8C - .4byte gSpriteAnimTable_83DA27C - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA2B4 - .4byte sub_80D9E94 + spr_template 10150, 10150, gOamData_837DF8C, gSpriteAnimTable_83DA27C, NULL, gSpriteAffineAnimTable_83DA2B4, sub_80D9E94 .align 2 gSpriteAffineAnim_83DA300:: @ 83DA300 @@ -12363,13 +11145,7 @@ gSpriteAffineAnimTable_83DA318:: @ 83DA318 .align 2 gBattleAnimSpriteTemplate_83DA31C:: @ 83DA31C - .2byte 10150 @ tiles tag - .2byte 10150 @ palette tag - .4byte gOamData_837DFEC - .4byte gSpriteAnimTable_83DA278 - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA318 - .4byte sub_80D9F14 + spr_template 10150, 10150, gOamData_837DFEC, gSpriteAnimTable_83DA278, NULL, gSpriteAffineAnimTable_83DA318, sub_80D9F14 .align 2 gSpriteAffineAnim_83DA334:: @ 83DA334 @@ -12383,33 +11159,15 @@ gSpriteAffineAnimTable_83DA34C:: @ 83DA34C .align 2 gBattleAnimSpriteTemplate_83DA350:: @ 83DA350 - .2byte 10150 @ tiles tag - .2byte 10150 @ palette tag - .4byte gOamData_837DF8C - .4byte gSpriteAnimTable_83DA274 - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA34C - .4byte sub_80D9F88 + spr_template 10150, 10150, gOamData_837DF8C, gSpriteAnimTable_83DA274, NULL, gSpriteAffineAnimTable_83DA34C, sub_80D9F88 .align 2 gBattleAnimSpriteTemplate_83DA368:: @ 83DA368 - .2byte 10155 @ tiles tag - .2byte 10155 @ palette tag - .4byte gOamData_837E0AC - .4byte gSpriteAnimTable_83D9310 - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA34C - .4byte sub_80D9F88 + spr_template 10155, 10155, gOamData_837E0AC, gSpriteAnimTable_83D9310, NULL, gSpriteAffineAnimTable_83DA34C, sub_80D9F88 .align 2 gBattleAnimSpriteTemplate_83DA380:: @ 83DA380 - .2byte 10009 @ tiles tag - .2byte 10009 @ palette tag - .4byte gOamData_837DF7C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DA034 + spr_template 10009, 10009, gOamData_837DF7C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DA034 .align 2 gSpriteAffineAnim_83DA398:: @ 83DA398 @@ -12423,13 +11181,7 @@ gSpriteAffineAnimTable_83DA3B0:: @ 83DA3B0 .align 2 gBattleAnimSpriteTemplate_83DA3B4:: @ 83DA3B4 - .2byte 10009 @ tiles tag - .2byte 10009 @ palette tag - .4byte gOamData_837DFDC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA3B0 - .4byte sub_80DA16C + spr_template 10009, 10009, gOamData_837DFDC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA3B0, sub_80DA16C .align 2 gSpriteAnim_83DA3CC:: @ 83DA3CC @@ -12445,13 +11197,7 @@ gSpriteAnimTable_83DA3E0:: @ 83DA3E0 .align 2 gBattleAnimSpriteTemplate_83DA3E4:: @ 83DA3E4 - .2byte 10154 @ tiles tag - .2byte 10154 @ palette tag - .4byte gOamData_837DF54 - .4byte gSpriteAnimTable_83DA3E0 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DA208 + spr_template 10154, 10154, gOamData_837DF54, gSpriteAnimTable_83DA3E0, NULL, gDummySpriteAffineAnimTable, sub_80DA208 .align 2 gSpriteAffineAnim_83DA3FC:: @ 83DA3FC @@ -12482,23 +11228,11 @@ gSpriteAffineAnimTable_83DA448:: @ 83DA448 .align 2 gBattleAnimSpriteTemplate_83DA450:: @ 83DA450 - .2byte 10156 @ tiles tag - .2byte 10156 @ palette tag - .4byte gOamData_837DFFC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA424 - .4byte sub_80DA300 + spr_template 10156, 10156, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA424, sub_80DA300 .align 2 gBattleAnimSpriteTemplate_83DA468:: @ 83DA468 - .2byte 10156 @ tiles tag - .2byte 10156 @ palette tag - .4byte gOamData_837DF9C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA448 - .4byte sub_80DA38C + spr_template 10156, 10156, gOamData_837DF9C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA448, sub_80DA38C .align 2 gSpriteAnim_83DA480:: @ 83DA480 @@ -12517,13 +11251,7 @@ gSpriteAnimTable_83DA490:: @ 83DA490 .align 2 gBattleAnimSpriteTemplate_83DA498:: @ 83DA498 - .2byte 10270 @ tiles tag - .2byte 10270 @ palette tag - .4byte gOamData_837DF94 - .4byte gSpriteAnimTable_83DA490 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DA4D8 + spr_template 10270, 10270, gOamData_837DF94, gSpriteAnimTable_83DA490, NULL, gDummySpriteAffineAnimTable, sub_80DA4D8 .align 2 .incbin "baserom.gba", 0x3da4b0, 0x50 @@ -12543,13 +11271,7 @@ gSpriteAnimTable_83DA518:: @ 83DA518 .align 2 gBattleAnimSpriteTemplate_83DA51C:: @ 83DA51C - .2byte 10162 @ tiles tag - .2byte 10162 @ palette tag - .4byte gOamData_837DF54 - .4byte gSpriteAnimTable_83DA518 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DB000 + spr_template 10162, 10162, gOamData_837DF54, gSpriteAnimTable_83DA518, NULL, gDummySpriteAffineAnimTable, sub_80DB000 .align 2 gSpriteAffineAnim_83DA534:: @ 83DA534 @@ -12566,13 +11288,7 @@ gSpriteAffineAnimTable_83DA564:: @ 83DA564 .align 2 gBattleAnimSpriteTemplate_83DA568:: @ 83DA568 - .2byte 10156 @ tiles tag - .2byte 10156 @ palette tag - .4byte gOamData_837DFFC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA564 - .4byte sub_80DB194 + spr_template 10156, 10156, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA564, sub_80DB194 .align 2 gSpriteAffineAnim_83DA580:: @ 83DA580 @@ -12585,13 +11301,7 @@ gSpriteAffineAnimTable_83DA590:: @ 83DA590 .align 2 gBattleAnimSpriteTemplate_83DA594:: @ 83DA594 - .2byte 10156 @ tiles tag - .2byte 10156 @ palette tag - .4byte gOamData_837DFFC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA590 - .4byte sub_80DB1F4 + spr_template 10156, 10156, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA590, sub_80DB1F4 .align 2 gSpriteAffineAnim_83DA5AC:: @ 83DA5AC @@ -12607,49 +11317,25 @@ gSpriteAffineAnimTable_83DA5D4:: @ 83DA5D4 .align 2 gBattleAnimSpriteTemplate_83DA5D8:: @ 83DA5D8 - .2byte 10156 @ tiles tag - .2byte 10156 @ palette tag - .4byte gOamData_837DFFC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA5D4 - .4byte sub_80DB288 + spr_template 10156, 10156, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA5D4, sub_80DB288 .align 2 .incbin "baserom.gba", 0x3da5f0, 0x24 .align 2 gBattleAnimSpriteTemplate_83DA614:: @ 83DA614 - .2byte 10272 @ tiles tag - .2byte 10272 @ palette tag - .4byte gOamData_837DFFC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DB374 + spr_template 10272, 10272, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DB374 .align 2 gBattleAnimSpriteTemplate_83DA62C:: @ 83DA62C - .2byte 10273 @ tiles tag - .2byte 10273 @ palette tag - .4byte gOamData_837DF24 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DB458 + spr_template 10273, 10273, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DB458 .align 2 .incbin "baserom.gba", 0x3da644, 0x18 .align 2 gBattleAnimSpriteTemplate_83DA65C:: @ 83DA65C - .2byte 10284 @ tiles tag - .2byte 10284 @ palette tag - .4byte gOamData_837DFFC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DB5E4 + spr_template 10284, 10284, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DB5E4 .align 2 gSpriteAffineAnim_83DA674:: @ 83DA674 @@ -12663,63 +11349,27 @@ gSpriteAffineAnimTable_83DA68C:: @ 83DA68C .align 2 gBattleAnimSpriteTemplate_83DA690:: @ 83DA690 - .2byte 10196 @ tiles tag - .2byte 10196 @ palette tag - .4byte gOamData_837E0BC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA68C - .4byte sub_80793C4 + spr_template 10196, 10196, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA68C, sub_80793C4 .align 2 gBattleAnimSpriteTemplate_83DA6A8:: @ 83DA6A8 - .2byte 10166 @ tiles tag - .2byte 10166 @ palette tag - .4byte gOamData_837E05C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DB74C + spr_template 10166, 10166, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DB74C .align 2 gBattleAnimSpriteTemplate_83DA6C0:: @ 83DA6C0 - .2byte 10167 @ tiles tag - .2byte 10167 @ palette tag - .4byte gOamData_837E05C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DB74C + spr_template 10167, 10167, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DB74C .align 2 gBattleAnimSpriteTemplate_83DA6D8:: @ 83DA6D8 - .2byte 10168 @ tiles tag - .2byte 10168 @ palette tag - .4byte gOamData_837E05C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DB74C + spr_template 10168, 10168, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DB74C .align 2 gBattleAnimSpriteTemplate_83DA6F0:: @ 83DA6F0 - .2byte 10169 @ tiles tag - .2byte 10169 @ palette tag - .4byte gOamData_837E05C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DB74C + spr_template 10169, 10169, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DB74C .align 2 gBattleAnimSpriteTemplate_83DA708:: @ 83DA708 - .2byte 10170 @ tiles tag - .2byte 10170 @ palette tag - .4byte gOamData_837E05C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DB74C + spr_template 10170, 10170, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DB74C .align 2 gSpriteAnim_83DA720:: @ 83DA720 @@ -12736,13 +11386,7 @@ gSpriteAnimTable_83DA738:: @ 83DA738 .align 2 gBattleAnimSpriteTemplate_83DA73C:: @ 83DA73C - .2byte 10071 @ tiles tag - .2byte 10071 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83DA738 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DBA4C + spr_template 10071, 10071, gOamData_837DF34, gSpriteAnimTable_83DA738, NULL, gDummySpriteAffineAnimTable, sub_80DBA4C .align 2 gSpriteAnim_83DA754:: @ 83DA754 @@ -12758,23 +11402,11 @@ gSpriteAnimTable_83DA768:: @ 83DA768 .align 2 gBattleAnimSpriteTemplate_83DA76C:: @ 83DA76C - .2byte 10070 @ tiles tag - .2byte 10070 @ palette tag - .4byte gOamData_837DF2C - .4byte gSpriteAnimTable_83DA768 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DBA4C + spr_template 10070, 10070, gOamData_837DF2C, gSpriteAnimTable_83DA768, NULL, gDummySpriteAffineAnimTable, sub_80DBA4C .align 2 gBattleAnimSpriteTemplate_83DA784:: @ 83DA784 - .2byte 10163 @ tiles tag - .2byte 10163 @ palette tag - .4byte gOamData_837DF74 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_807941C + spr_template 10163, 10163, gOamData_837DF74, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807941C .align 2 gSpriteAnim_83DA79C:: @ 83DA79C @@ -12821,13 +11453,7 @@ gSpriteAnimTable_83DA81C:: @ 83DA81C .align 2 gBattleAnimSpriteTemplate_83DA824:: @ 83DA824 - .2byte 10097 @ tiles tag - .2byte 10097 @ palette tag - .4byte gOamData_837DF74 - .4byte gSpriteAnimTable_83DA81C - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DBAF4 + spr_template 10097, 10097, gOamData_837DF74, gSpriteAnimTable_83DA81C, NULL, gDummySpriteAffineAnimTable, sub_80DBAF4 .align 2 gSpriteAnim_83DA83C:: @ 83DA83C @@ -12852,13 +11478,7 @@ gUnknown_083DA888:: @ 83DA888 .align 2 gBattleAnimSpriteTemplate_83DA88C:: @ 83DA88C - .2byte 10093 @ tiles tag - .2byte 10093 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83DA85C - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DBB70 + spr_template 10093, 10093, gOamData_837DF34, gSpriteAnimTable_83DA85C, NULL, gDummySpriteAffineAnimTable, sub_80DBB70 .align 2 gUnknown_083DA8A4:: @ 83DA8A4 @@ -12872,13 +11492,7 @@ gUnknown_083DA8DC:: @ 83DA8DC .align 2 gBattleAnimSpriteTemplate_83DA8F4:: @ 83DA8F4 - .2byte 10250 @ tiles tag - .2byte 10250 @ palette tag - .4byte gOamData_837DF3C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DC068 + spr_template 10250, 10250, gOamData_837DF3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DC068 .align 2 .incbin "baserom.gba", 0x3da90c, 0xa0 @@ -12898,13 +11512,7 @@ gSpriteAffineAnimTable_83DA9DC:: @ 83DA9DC .align 2 gBattleAnimSpriteTemplate_83DA9E0:: @ 83DA9E0 - .2byte 10267 @ tiles tag - .2byte 10267 @ palette tag - .4byte gOamData_837E11C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DA9DC - .4byte sub_80793C4 + spr_template 10267, 10267, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA9DC, sub_80793C4 .align 2 gSpriteAffineAnim_83DA9F8:: @ 83DA9F8 @@ -12932,13 +11540,7 @@ gSpriteAffineAnimTable_83DAA60:: @ 83DAA60 .align 2 gBattleAnimSpriteTemplate_83DAA68:: @ 83DAA68 - .2byte 10212 @ tiles tag - .2byte 10212 @ palette tag - .4byte gOamData_837E11C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DAA60 - .4byte sub_80DC700 + spr_template 10212, 10212, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DAA60, sub_80DC700 .align 2 gSpriteAffineAnim_83DAA80:: @ 83DAA80 @@ -12963,13 +11565,7 @@ gSpriteAffineAnimTable_83DAAB0:: @ 83DAAB0 .align 2 gBattleAnimSpriteTemplate_83DAABC:: @ 83DAABC - .2byte 10153 @ tiles tag - .2byte 10153 @ palette tag - .4byte gOamData_837E014 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DAAB0 - .4byte sub_80DC824 + spr_template 10153, 10153, gOamData_837E014, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DAAB0, sub_80DC824 .align 2 gSpriteAffineAnim_83DAAD4:: @ 83DAAD4 @@ -12994,33 +11590,15 @@ gSpriteAffineAnimTable_83DAB04:: @ 83DAB04 .align 2 gBattleAnimSpriteTemplate_83DAB10:: @ 83DAB10 - .2byte 10161 @ tiles tag - .2byte 10161 @ palette tag - .4byte gOamData_837DF8C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DAB04 - .4byte sub_80DC8F4 + spr_template 10161, 10161, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DAB04, sub_80DC8F4 .align 2 gBattleAnimSpriteTemplate_83DAB28:: @ 83DAB28 - .2byte 10180 @ tiles tag - .2byte 10180 @ palette tag - .4byte gOamData_837DF24 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DC9A0 + spr_template 10180, 10180, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DC9A0 .align 2 gBattleAnimSpriteTemplate_83DAB40:: @ 83DAB40 - .2byte 10179 @ tiles tag - .2byte 10179 @ palette tag - .4byte gOamData_837DF5C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DCA70 + spr_template 10179, 10179, gOamData_837DF5C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DCA70 .align 2 gSpriteAffineAnim_83DAB58:: @ 83DAB58 @@ -13034,43 +11612,19 @@ gSpriteAffineAnimTable_83DAB70:: @ 83DAB70 .align 2 gBattleAnimSpriteTemplate_83DAB74:: @ 83DAB74 - .2byte 10181 @ tiles tag - .2byte 10181 @ palette tag - .4byte gOamData_837E11C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DAB70 - .4byte sub_80DCB38 + spr_template 10181, 10181, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DAB70, sub_80DCB38 .align 2 gBattleAnimSpriteTemplate_83DAB8C:: @ 83DAB8C - .2byte 10161 @ tiles tag - .2byte 10161 @ palette tag - .4byte gOamData_837DF8C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DCBCC + spr_template 10161, 10161, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DCBCC .align 2 gBattleAnimSpriteTemplate_83DABA4:: @ 83DABA4 - .2byte 10161 @ tiles tag - .2byte 10161 @ palette tag - .4byte gOamData_837DF8C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DCCFC + spr_template 10161, 10161, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DCCFC .align 2 gBattleAnimSpriteTemplate_83DABBC:: @ 83DABBC - .2byte 10262 @ tiles tag - .2byte 10262 @ palette tag - .4byte gOamData_837DF94 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DCCFC + spr_template 10262, 10262, gOamData_837DF94, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DCCFC .align 2 gSpriteAffineAnim_83DABD4:: @ 83DABD4 @@ -13088,13 +11642,7 @@ gSpriteAffineAnimTable_83DAC0C:: @ 83DAC0C .align 2 gBattleAnimSpriteTemplate_83DAC10:: @ 83DAC10 - .2byte 10212 @ tiles tag - .2byte 10212 @ palette tag - .4byte gOamData_837E0BC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DAC0C - .4byte sub_80DCE40 + spr_template 10212, 10212, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DAC0C, sub_80DCE40 .align 2 gSpriteAnim_83DAC28:: @ 83DAC28 @@ -13119,33 +11667,15 @@ gSpriteAnimTable_83DAC40:: @ 83DAC40 .align 2 gBattleAnimSpriteTemplate_83DAC4C:: @ 83DAC4C - .2byte 10058 @ tiles tag - .2byte 10058 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83DAC40 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DCE9C + spr_template 10058, 10058, gOamData_837DF34, gSpriteAnimTable_83DAC40, NULL, gDummySpriteAffineAnimTable, sub_80DCE9C .align 2 gBattleAnimSpriteTemplate_83DAC64:: @ 83DAC64 - .2byte 10058 @ tiles tag - .2byte 10058 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83DAC40 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DCF60 + spr_template 10058, 10058, gOamData_837DF34, gSpriteAnimTable_83DAC40, NULL, gDummySpriteAffineAnimTable, sub_80DCF60 .align 2 gBattleAnimSpriteTemplate_83DAC7C:: @ 83DAC7C - .2byte 10074 @ tiles tag - .2byte 10074 @ palette tag - .4byte gOamData_837DF24 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DCFE4 + spr_template 10074, 10074, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DCFE4 .align 2 gSpriteAffineAnim_83DAC94:: @ 83DAC94 @@ -13160,33 +11690,15 @@ gSpriteAffineAnimTable_83DACB4:: @ 83DACB4 .align 2 gBattleAnimSpriteTemplate_83DACB8:: @ 83DACB8 - .2byte 10149 @ tiles tag - .2byte 10149 @ palette tag - .4byte gOamData_837E0AC - .4byte gSpriteAnimTable_83D91F0 - .4byte NULL - .4byte gSpriteAffineAnimTable_83DACB4 - .4byte sub_80DCFE4 + spr_template 10149, 10149, gOamData_837E0AC, gSpriteAnimTable_83D91F0, NULL, gSpriteAffineAnimTable_83DACB4, sub_80DCFE4 .align 2 gBattleAnimSpriteTemplate_83DACD0:: @ 83DACD0 - .2byte 10029 @ tiles tag - .2byte 10029 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83D95E0 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DCFE4 + spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D95E0, NULL, gDummySpriteAffineAnimTable, sub_80DCFE4 .align 2 gBattleAnimSpriteTemplate_83DACE8:: @ 83DACE8 - .2byte 10261 @ tiles tag - .2byte 10261 @ palette tag - .4byte gOamData_837DF54 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DD3AC + spr_template 10261, 10261, gOamData_837DF54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DD3AC .align 2 .incbin "baserom.gba", 0x3dad00, 0x10 @@ -13241,13 +11753,7 @@ gSpriteAnimTable_83DAD58:: @ 83DAD58 .align 2 gBattleAnimSpriteTemplate_83DAD60:: @ 83DAD60 - .2byte 10058 @ tiles tag - .2byte 10058 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83DAD48 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DD490 + spr_template 10058, 10058, gOamData_837DF34, gSpriteAnimTable_83DAD48, NULL, gDummySpriteAffineAnimTable, sub_80DD490 .align 2 gUnknown_083DAD78:: @ 83DAD78 @@ -13258,13 +11764,7 @@ gUnknown_083DAD90:: @ 83DAD90 .align 2 gBattleAnimSpriteTemplate_83DADA8:: @ 83DADA8 - .2byte 10058 @ tiles tag - .2byte 10058 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83DAD48 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DD8E8 + spr_template 10058, 10058, gOamData_837DF34, gSpriteAnimTable_83DAD48, NULL, gDummySpriteAffineAnimTable, sub_80DD8E8 .align 2 gSpriteAffineAnim_83DADC0:: @ 83DADC0 @@ -13283,43 +11783,19 @@ gSpriteAffineAnimTable_83DADE0:: @ 83DADE0 .align 2 gBattleAnimSpriteTemplate_83DADE8:: @ 83DADE8 - .2byte 10058 @ tiles tag - .2byte 10058 @ palette tag - .4byte gOamData_837DF94 - .4byte gSpriteAnimTable_83DAD48 - .4byte NULL - .4byte gSpriteAffineAnimTable_83DADE0 - .4byte sub_80DD978 + spr_template 10058, 10058, gOamData_837DF94, gSpriteAnimTable_83DAD48, NULL, gSpriteAffineAnimTable_83DADE0, sub_80DD978 .align 2 gBattleAnimSpriteTemplate_83DAE00:: @ 83DAE00 - .2byte 10058 @ tiles tag - .2byte 10058 @ palette tag - .4byte gOamData_837DF94 - .4byte gSpriteAnimTable_83DAD48 - .4byte NULL - .4byte gSpriteAffineAnimTable_83DADE0 - .4byte sub_80DD9A4 + spr_template 10058, 10058, gOamData_837DF94, gSpriteAnimTable_83DAD48, NULL, gSpriteAffineAnimTable_83DADE0, sub_80DD9A4 .align 2 gBattleAnimSpriteTemplate_83DAE18:: @ 83DAE18 - .2byte 10058 @ tiles tag - .2byte 10058 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83DAD58 - .4byte NULL - .4byte gSpriteAffineAnimTable_83DADE0 - .4byte sub_80CB144 + spr_template 10058, 10058, gOamData_837DF34, gSpriteAnimTable_83DAD58, NULL, gSpriteAffineAnimTable_83DADE0, sub_80CB144 .align 2 gBattleAnimSpriteTemplate_83DAE30:: @ 83DAE30 - .2byte 10058 @ tiles tag - .2byte 10058 @ palette tag - .4byte gOamData_837DF94 - .4byte gSpriteAnimTable_83DAD50 - .4byte NULL - .4byte gSpriteAffineAnimTable_83DADE0 - .4byte sub_807A9BC + spr_template 10058, 10058, gOamData_837DF94, gSpriteAnimTable_83DAD50, NULL, gSpriteAffineAnimTable_83DADE0, sub_807A9BC .align 2 gSpriteAffineAnim_83DAE48:: @ 83DAE48 @@ -13333,23 +11809,11 @@ gSpriteAffineAnimTable_83DAE60:: @ 83DAE60 .align 2 gBattleAnimSpriteTemplate_83DAE64:: @ 83DAE64 - .2byte 10013 @ tiles tag - .2byte 10013 @ palette tag - .4byte gOamData_837DFEC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DAE60 - .4byte sub_80DDB6C + spr_template 10013, 10013, gOamData_837DFEC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DAE60, sub_80DDB6C .align 2 gBattleAnimSpriteTemplate_83DAE7C:: @ 83DAE7C - .2byte 10013 @ tiles tag - .2byte 10013 @ palette tag - .4byte gOamData_837E04C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DDD58 + spr_template 10013, 10013, gOamData_837E04C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DDD58 .align 2 gSpriteAffineAnim_83DAE94:: @ 83DAE94 @@ -13362,13 +11826,7 @@ gSpriteAffineAnimTable_83DAEA4:: @ 83DAEA4 .align 2 gBattleAnimSpriteTemplate_83DAEA8:: @ 83DAEA8 - .2byte 10176 @ tiles tag - .2byte 10176 @ palette tag - .4byte gOamData_837DF94 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DAEA4 - .4byte sub_80DDF40 + spr_template 10176, 10176, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DAEA4, sub_80DDF40 .align 2 gSpriteAnim_83DAEC0:: @ 83DAEC0 @@ -13385,13 +11843,7 @@ gSpriteAnimTable_83DAED8:: @ 83DAED8 .align 2 gBattleAnimSpriteTemplate_83DAEDC:: @ 83DAEDC - .2byte 10177 @ tiles tag - .2byte 10177 @ palette tag - .4byte gOamData_837DF74 - .4byte gSpriteAnimTable_83DAED8 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DE0FC + spr_template 10177, 10177, gOamData_837DF74, gSpriteAnimTable_83DAED8, NULL, gDummySpriteAffineAnimTable, sub_80DE0FC .align 2 .incbin "baserom.gba", 0x3daef4, 0x14 @@ -13402,33 +11854,15 @@ gUnknown_083DAF08:: @ 83DAF08 .align 2 gBattleAnimSpriteTemplate_83DAF20:: @ 83DAF20 - .2byte 10199 @ tiles tag - .2byte 10199 @ palette tag - .4byte gOamData_837E074 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DEF3C + spr_template 10199, 10199, gOamData_837E074, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DEF3C .align 2 gBattleAnimSpriteTemplate_83DAF38:: @ 83DAF38 - .2byte 10200 @ tiles tag - .2byte 10200 @ palette tag - .4byte gOamData_837E054 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DF0B8 + spr_template 10200, 10200, gOamData_837E054, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DF0B8 .align 2 gBattleAnimSpriteTemplate_83DAF50:: @ 83DAF50 - .2byte 10221 @ tiles tag - .2byte 10221 @ palette tag - .4byte gOamData_837E054 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DF0B8 + spr_template 10221, 10221, gOamData_837E054, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DF0B8 .align 2 .incbin "baserom.gba", 0x3daf68, 0x18 @@ -13451,13 +11885,7 @@ gSpriteAnimTable_83DAFC8:: @ 83DAFC8 .align 2 gBattleAnimSpriteTemplate_83DAFCC:: @ 83DAFCC - .2byte 10029 @ tiles tag - .2byte 10029 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83DAFC8 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DF5A0 + spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83DAFC8, NULL, gDummySpriteAffineAnimTable, sub_80DF5A0 .align 2 gSpriteAnim_83DAFE4:: @ 83DAFE4 @@ -13497,13 +11925,7 @@ gSpriteAffineAnimTable_83DB03C:: @ 83DB03C .align 2 gBattleAnimSpriteTemplate_83DB044:: @ 83DB044 - .2byte 10029 @ tiles tag - .2byte 10029 @ palette tag - .4byte gOamData_837DFF4 - .4byte gSpriteAnimTable_83DB004 - .4byte NULL - .4byte gSpriteAffineAnimTable_83DB03C - .4byte sub_80DF760 + spr_template 10029, 10029, gOamData_837DFF4, gSpriteAnimTable_83DB004, NULL, gSpriteAffineAnimTable_83DB03C, sub_80DF760 .align 2 gSpriteAnim_83DB05C:: @ 83DB05C @@ -13520,13 +11942,7 @@ gSpriteAnimTable_83DB074:: @ 83DB074 .align 2 gBattleAnimSpriteTemplate_83DB078:: @ 83DB078 - .2byte 10035 @ tiles tag - .2byte 10035 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83DB074 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DF6F0 + spr_template 10035, 10035, gOamData_837DF34, gSpriteAnimTable_83DB074, NULL, gDummySpriteAffineAnimTable, sub_80DF6F0 .align 2 gSpriteAnim_83DB090:: @ 83DB090 @@ -13557,33 +11973,15 @@ gSpriteAffineAnimTable_83DB0C8:: @ 83DB0C8 .align 2 gBattleAnimSpriteTemplate_83DB0D0:: @ 83DB0D0 - .2byte 10029 @ tiles tag - .2byte 10029 @ palette tag - .4byte gOamData_837DFF4 - .4byte gSpriteAnimTable_83DB0A0 - .4byte NULL - .4byte gSpriteAffineAnimTable_83DB0C8 - .4byte sub_80DF760 + spr_template 10029, 10029, gOamData_837DFF4, gSpriteAnimTable_83DB0A0, NULL, gSpriteAffineAnimTable_83DB0C8, sub_80DF760 .align 2 gBattleAnimSpriteTemplate_83DB0E8:: @ 83DB0E8 - .2byte 10249 @ tiles tag - .2byte 10249 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DF78C + spr_template 10249, 10249, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DF78C .align 2 gBattleAnimSpriteTemplate_83DB100:: @ 83DB100 - .2byte 10029 @ tiles tag - .2byte 10029 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83DAFC8 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80DFB28 + spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83DAFC8, NULL, gDummySpriteAffineAnimTable, sub_80DFB28 .align 2 .incbin "baserom.gba", 0x3db118, 0x18 @@ -13641,23 +12039,11 @@ gSpriteAffineAnimTable_83DB1B0:: @ 83DB1B0 .align 2 gBattleAnimSpriteTemplate_83DB1D0:: @ 83DB1D0 - .2byte 10139 @ tiles tag - .2byte 10139 @ palette tag - .4byte gOamData_837E0BC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DB1B0 - .4byte sub_80DFF1C + spr_template 10139, 10139, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB1B0, sub_80DFF1C .align 2 gBattleAnimSpriteTemplate_83DB1E8:: @ 83DB1E8 - .2byte 10145 @ tiles tag - .2byte 10145 @ palette tag - .4byte gOamData_837E0BC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DB1B0 - .4byte sub_80DFF1C + spr_template 10145, 10145, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB1B0, sub_80DFF1C .align 2 gSpriteAffineAnim_83DB200:: @ 83DB200 @@ -13678,13 +12064,7 @@ gSpriteAffineAnimTable_83DB230:: @ 83DB230 .align 2 gBattleAnimSpriteTemplate_83DB238:: @ 83DB238 - .2byte 10155 @ tiles tag - .2byte 10155 @ palette tag - .4byte gOamData_837DF8C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DB230 - .4byte sub_80DFFD0 + spr_template 10155, 10155, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB230, sub_80DFFD0 .align 2 gSpriteAnim_83DB250:: @ 83DB250 @@ -13711,13 +12091,7 @@ gSpriteAnimTable_83DB280:: @ 83DB280 .align 2 gBattleAnimSpriteTemplate_83DB288:: @ 83DB288 - .2byte 10039 @ tiles tag - .2byte 10039 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_83DB280 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80E0A10 + spr_template 10039, 10039, gOamData_837DF34, gSpriteAnimTable_83DB280, NULL, gDummySpriteAffineAnimTable, sub_80E0A10 .align 2 gSpriteAffineAnim_83DB2A0:: @ 83DB2A0 @@ -13739,33 +12113,15 @@ gSpriteAffineAnimTable_83DB2C4:: @ 83DB2C4 .align 2 gBattleAnimSpriteTemplate_83DB2C8:: @ 83DB2C8 - .2byte 10000 @ tiles tag - .2byte 10000 @ palette tag - .4byte gOamData_837DF94 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DB2C0 - .4byte sub_80E0F1C + spr_template 10000, 10000, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB2C0, sub_80E0F1C .align 2 gBattleAnimSpriteTemplate_83DB2E0:: @ 83DB2E0 - .2byte 10000 @ tiles tag - .2byte 10000 @ palette tag - .4byte gOamData_837DF94 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DB2C4 - .4byte sub_80E1004 + spr_template 10000, 10000, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB2C4, sub_80E1004 .align 2 gBattleAnimSpriteTemplate_83DB2F8:: @ 83DB2F8 - .2byte 10074 @ tiles tag - .2byte 10074 @ palette tag - .4byte gOamData_837DF24 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80E1078 + spr_template 10074, 10074, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E1078 .align 2 gSpriteAnim_83DB310:: @ 83DB310 @@ -13778,43 +12134,19 @@ gSpriteAnimTable_83DB318:: @ 83DB318 .align 2 gBattleAnimSpriteTemplate_83DB31C:: @ 83DB31C - .2byte 10074 @ tiles tag - .2byte 10074 @ palette tag - .4byte gOamData_837DF2C - .4byte gSpriteAnimTable_83DB318 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80E1078 + spr_template 10074, 10074, gOamData_837DF2C, gSpriteAnimTable_83DB318, NULL, gDummySpriteAffineAnimTable, sub_80E1078 .align 2 gBattleAnimSpriteTemplate_83DB334:: @ 83DB334 - .2byte 10074 @ tiles tag - .2byte 10074 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80E1108 + spr_template 10074, 10074, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E1108 .align 2 gBattleAnimSpriteTemplate_83DB34C:: @ 83DB34C - .2byte 10074 @ tiles tag - .2byte 10074 @ palette tag - .4byte gOamData_837DF24 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80E1728 + spr_template 10074, 10074, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E1728 .align 2 gBattleAnimSpriteTemplate_83DB364:: @ 83DB364 - .2byte 10281 @ tiles tag - .2byte 10281 @ palette tag - .4byte gOamData_837DF54 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80E17CC + spr_template 10281, 10281, gOamData_837DF54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E17CC .align 2 gSpriteAnim_83DB37C:: @ 83DB37C @@ -13839,46 +12171,22 @@ gSpriteAnimTable_83DB3A4:: @ 83DB3A4 .align 2 gBattleAnimSpriteTemplate_83DB3AC:: @ 83DB3AC - .2byte 10073 @ tiles tag - .2byte 10073 @ palette tag - .4byte gOamData_837DF2C - .4byte gSpriteAnimTable_83DB3A4 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80E1CB4 + spr_template 10073, 10073, gOamData_837DF2C, gSpriteAnimTable_83DB3A4, NULL, gDummySpriteAffineAnimTable, sub_80E1CB4 .align 2 gBattleAnimSpriteTemplate_83DB3C4:: @ 83DB3C4 - .2byte 0 @ tiles tag - .2byte 0 @ palette tag - .4byte gDummyOamData - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80E1D84 + spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E1D84 .align 2 gBattleAnimSpriteTemplate_83DB3DC:: @ 83DB3DC - .2byte 0 @ tiles tag - .2byte 0 @ palette tag - .4byte gDummyOamData - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80E1E2C + spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E1E2C .align 2 .incbin "baserom.gba", 0x3db3f4, 0x34 .align 2 gBattleAnimSpriteTemplate_83DB428:: @ 83DB428 - .2byte 0 @ tiles tag - .2byte 0 @ palette tag - .4byte gDummyOamData - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80E24B8 + spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E24B8 .align 2 gSpriteAffineAnim_83DB440:: @ 83DB440 @@ -13912,83 +12220,35 @@ gSpriteAffineAnimTable_83DB498:: @ 83DB498 .align 2 gBattleAnimSpriteTemplate_83DB4A8:: @ 83DB4A8 - .2byte 10135 @ tiles tag - .2byte 10135 @ palette tag - .4byte gOamData_837E0B4 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DB498 - .4byte sub_80E27A0 + spr_template 10135, 10135, gOamData_837E0B4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB498, sub_80E27A0 .align 2 gBattleAnimSpriteTemplate_83DB4C0:: @ 83DB4C0 - .2byte 10135 @ tiles tag - .2byte 10135 @ palette tag - .4byte gOamData_837E0B4 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DB498 - .4byte sub_80E2838 + spr_template 10135, 10135, gOamData_837E0B4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB498, sub_80E2838 .align 2 gBattleAnimSpriteTemplate_83DB4D8:: @ 83DB4D8 - .2byte 10148 @ tiles tag - .2byte 10148 @ palette tag - .4byte gOamData_837E0B4 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DB498 - .4byte sub_80E27A0 + spr_template 10148, 10148, gOamData_837E0B4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB498, sub_80E27A0 .align 2 gBattleAnimSpriteTemplate_83DB4F0:: @ 83DB4F0 - .2byte 10135 @ tiles tag - .2byte 10135 @ palette tag - .4byte gOamData_837E0B4 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DB498 - .4byte sub_80E2870 + spr_template 10135, 10135, gOamData_837E0B4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB498, sub_80E2870 .align 2 gBattleAnimSpriteTemplate_83DB508:: @ 83DB508 - .2byte 10135 @ tiles tag - .2byte 10135 @ palette tag - .4byte gOamData_837E0B4 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DB498 - .4byte sub_80E2908 + spr_template 10135, 10135, gOamData_837E0B4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB498, sub_80E2908 .align 2 gBattleAnimSpriteTemplate_83DB520:: @ 83DB520 - .2byte 10285 @ tiles tag - .2byte 10285 @ palette tag - .4byte gOamData_837E054 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80E2978 + spr_template 10285, 10285, gOamData_837E054, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E2978 .align 2 gBattleAnimSpriteTemplate_83DB538:: @ 83DB538 - .2byte 10135 @ tiles tag - .2byte 10135 @ palette tag - .4byte gOamData_837DF94 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DB498 - .4byte sub_80E29C0 + spr_template 10135, 10135, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB498, sub_80E29C0 .align 2 gBattleAnimSpriteTemplate_83DB550:: @ 83DB550 - .2byte 10135 @ tiles tag - .2byte 10135 @ palette tag - .4byte gOamData_837E0B4 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_83DB498 - .4byte sub_80E27E8 + spr_template 10135, 10135, gOamData_837E0B4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB498, sub_80E27E8 .align 2 gUnknown_083DB568:: @ 83DB568 @@ -16491,33 +14751,15 @@ gSpriteAnimTable_840217C:: @ 840217C .align 2 gBattleAnimSpriteTemplate_8402180:: @ 8402180 - .2byte 10137 @ tiles tag - .2byte 10137 @ palette tag - .4byte gOamData_837E054 - .4byte gSpriteAnimTable_840217C - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80793C4 + spr_template 10137, 10137, gOamData_837E054, gSpriteAnimTable_840217C, NULL, gDummySpriteAffineAnimTable, sub_80793C4 .align 2 gBattleAnimSpriteTemplate_8402198:: @ 8402198 - .2byte 10016 @ tiles tag - .2byte 10016 @ palette tag - .4byte gOamData_837DF54 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_812C144 + spr_template 10016, 10016, gOamData_837DF54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812C144 .align 2 gBattleAnimSpriteTemplate_84021B0:: @ 84021B0 - .2byte 10017 @ tiles tag - .2byte 10017 @ palette tag - .4byte gOamData_837DF24 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80794A8 + spr_template 10017, 10017, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80794A8 .align 2 gSpriteAnim_84021C8:: @ 84021C8 @@ -16532,33 +14774,15 @@ gSpriteAnimTable_84021D8:: @ 84021D8 .align 2 gBattleAnimSpriteTemplate_84021DC:: @ 84021DC - .2byte 10190 @ tiles tag - .2byte 10190 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_84021D8 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80793C4 + spr_template 10190, 10190, gOamData_837DF34, gSpriteAnimTable_84021D8, NULL, gDummySpriteAffineAnimTable, sub_80793C4 .align 2 gBattleAnimSpriteTemplate_84021F4:: @ 84021F4 - .2byte 10191 @ tiles tag - .2byte 10191 @ palette tag - .4byte gOamData_837E05C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_812C220 + spr_template 10191, 10191, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812C220 .align 2 gBattleAnimSpriteTemplate_840220C:: @ 840220C - .2byte 10189 @ tiles tag - .2byte 10189 @ palette tag - .4byte gOamData_837DF94 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_812C2BC + spr_template 10189, 10189, gOamData_837DF94, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812C2BC .align 2 gSpriteAffineAnim_8402224:: @ 8402224 @@ -16580,23 +14804,11 @@ gSpriteAffineAnimTable_840225C:: @ 840225C .align 2 gBattleAnimSpriteTemplate_8402264:: @ 8402264 - .2byte 10187 @ tiles tag - .2byte 10187 @ palette tag - .4byte gOamData_837E11C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_840225C - .4byte sub_812C358 + spr_template 10187, 10187, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_840225C, sub_812C358 .align 2 gBattleAnimSpriteTemplate_840227C:: @ 840227C - .2byte 10152 @ tiles tag - .2byte 10152 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_812C720 + spr_template 10152, 10152, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812C720 .align 2 gSpriteAnim_8402294:: @ 8402294 @@ -16613,13 +14825,7 @@ gSpriteAnimTable_84022AC:: @ 84022AC .align 2 gBattleAnimSpriteTemplate_84022B0:: @ 84022B0 - .2byte 10027 @ tiles tag - .2byte 10027 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_84022AC - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_812C80C + spr_template 10027, 10027, gOamData_837DF34, gSpriteAnimTable_84022AC, NULL, gDummySpriteAffineAnimTable, sub_812C80C .align 2 gSpriteAnim_84022C8:: @ 84022C8 @@ -16642,13 +14848,7 @@ gSpriteAffineAnimTable_84022EC:: @ 84022EC .align 2 gBattleAnimSpriteTemplate_84022F0:: @ 84022F0 - .2byte 10228 @ tiles tag - .2byte 10228 @ palette tag - .4byte gOamData_837DF94 - .4byte gSpriteAnimTable_84022D0 - .4byte NULL - .4byte gSpriteAffineAnimTable_84022EC - .4byte sub_812C848 + spr_template 10228, 10228, gOamData_837DF94, gSpriteAnimTable_84022D0, NULL, gSpriteAffineAnimTable_84022EC, sub_812C848 .align 2 gSpriteAnim_8402308:: @ 8402308 @@ -16674,13 +14874,7 @@ gSpriteAffineAnimTable_8402338:: @ 8402338 .align 2 gBattleAnimSpriteTemplate_840233C:: @ 840233C - .2byte 10192 @ tiles tag - .2byte 10192 @ palette tag - .4byte gOamData_837DFF4 - .4byte gSpriteAnimTable_840231C - .4byte NULL - .4byte gSpriteAffineAnimTable_8402338 - .4byte sub_812C908 + spr_template 10192, 10192, gOamData_837DFF4, gSpriteAnimTable_840231C, NULL, gSpriteAffineAnimTable_8402338, sub_812C908 .align 2 gSpriteAffineAnim_8402354:: @ 8402354 @@ -16701,33 +14895,15 @@ gSpriteAffineAnimTable_8402384:: @ 8402384 .align 2 gBattleAnimSpriteTemplate_840238C:: @ 840238C - .2byte 10227 @ tiles tag - .2byte 10227 @ palette tag - .4byte gOamData_837DFFC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_8402384 - .4byte sub_812C990 + spr_template 10227, 10227, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8402384, sub_812C990 .align 2 gBattleAnimSpriteTemplate_84023A4:: @ 84023A4 - .2byte 10247 @ tiles tag - .2byte 10247 @ palette tag - .4byte gOamData_837DF34 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_812CAFC + spr_template 10247, 10247, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812CAFC .align 2 gBattleAnimSpriteTemplate_84023BC:: @ 84023BC - .2byte 10247 @ tiles tag - .2byte 10247 @ palette tag - .4byte gOamData_837DF34 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_812CC28 + spr_template 10247, 10247, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812CC28 .align 2 gSpriteAnim_84023D4:: @ 84023D4 @@ -16742,13 +14918,7 @@ gSpriteAnimTable_84023E4:: @ 84023E4 .align 2 gBattleAnimSpriteTemplate_84023E8:: @ 84023E8 - .2byte 10229 @ tiles tag - .2byte 10229 @ palette tag - .4byte gOamData_837DF54 - .4byte gSpriteAnimTable_84023E4 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_812CCE8 + spr_template 10229, 10229, gOamData_837DF54, gSpriteAnimTable_84023E4, NULL, gDummySpriteAffineAnimTable, sub_812CCE8 .align 2 gUnknown_08402400:: @ 8402400 @@ -16777,13 +14947,7 @@ gSpriteAffineAnimTable_8402454:: @ 8402454 .align 2 gBattleAnimSpriteTemplate_8402458:: @ 8402458 - .2byte 10230 @ tiles tag - .2byte 10230 @ palette tag - .4byte gOamData_837DFFC - .4byte gSpriteAnimTable_8402428 - .4byte NULL - .4byte gSpriteAffineAnimTable_8402454 - .4byte sub_812D294 + spr_template 10230, 10230, gOamData_837DFFC, gSpriteAnimTable_8402428, NULL, gSpriteAffineAnimTable_8402454, sub_812D294 .align 2 gSpriteAnim_8402470:: @ 8402470 @@ -16803,13 +14967,7 @@ gSpriteAnimTable_8402494:: @ 8402494 .align 2 gBattleAnimSpriteTemplate_8402498:: @ 8402498 - .2byte 10234 @ tiles tag - .2byte 10234 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_8402494 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_80793C4 + spr_template 10234, 10234, gOamData_837DF34, gSpriteAnimTable_8402494, NULL, gDummySpriteAffineAnimTable, sub_80793C4 .align 2 gUnknown_084024B0:: @ 84024B0 @@ -16817,23 +14975,11 @@ gUnknown_084024B0:: @ 84024B0 .align 2 gBattleAnimSpriteTemplate_84024D0:: @ 84024D0 - .2byte 10226 @ tiles tag - .2byte 10226 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_812D3AC + spr_template 10226, 10226, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812D3AC .align 2 gBattleAnimSpriteTemplate_84024E8:: @ 84024E8 - .2byte 10233 @ tiles tag - .2byte 10233 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_812D4B4 + spr_template 10233, 10233, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812D4B4 .align 2 gUnknown_08402500:: @ 8402500 @@ -16849,13 +14995,7 @@ gUnknown_08402540:: @ 8402540 .align 2 gBattleAnimSpriteTemplate_8402578:: @ 8402578 - .2byte 10236 @ tiles tag - .2byte 10236 @ palette tag - .4byte gOamData_837DF24 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_812D724 + spr_template 10236, 10236, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812D724 .align 2 gUnknown_08402590:: @ 8402590 @@ -16889,13 +15029,7 @@ gSpriteAnimTable_84025E0:: @ 84025E0 .align 2 gBattleAnimSpriteTemplate_84025EC:: @ 84025EC - .2byte 10241 @ tiles tag - .2byte 10241 @ palette tag - .4byte gOamData_837DF2C - .4byte gSpriteAnimTable_84025E0 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_812DEAC + spr_template 10241, 10241, gOamData_837DF2C, gSpriteAnimTable_84025E0, NULL, gDummySpriteAffineAnimTable, sub_812DEAC .align 2 gUnknown_08402604:: @ 8402604 @@ -16909,13 +15043,7 @@ gUnknown_08402610:: @ 8402610 .align 2 gBattleAnimSpriteTemplate_8402630:: @ 8402630 - .2byte 10087 @ tiles tag - .2byte 10087 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_812E4F0 + spr_template 10087, 10087, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812E4F0 .align 2 gSpriteAnim_8402648:: @ 8402648 @@ -16954,13 +15082,7 @@ gSpriteAnimTable_8402698:: @ 8402698 .align 2 gBattleAnimSpriteTemplate_84026A4:: @ 84026A4 - .2byte 10238 @ tiles tag - .2byte 10238 @ palette tag - .4byte gOamData_837DF24 - .4byte gSpriteAnimTable_8402698 - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_812E7A0 + spr_template 10238, 10238, gOamData_837DF24, gSpriteAnimTable_8402698, NULL, gDummySpriteAffineAnimTable, sub_812E7A0 .align 2 .incbin "baserom.gba", 0x4026bc, 0x20 @@ -16978,43 +15100,19 @@ gSpriteAnimTable_84026EC:: @ 84026EC .align 2 gBattleAnimSpriteTemplate_84026F0:: @ 84026F0 - .2byte 10239 @ tiles tag - .2byte 10239 @ palette tag - .4byte gOamData_837DF2C - .4byte gSpriteAnimTable_84026EC - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_812EA4C + spr_template 10239, 10239, gOamData_837DF2C, gSpriteAnimTable_84026EC, NULL, gDummySpriteAffineAnimTable, sub_812EA4C .align 2 gBattleAnimSpriteTemplate_8402708:: @ 8402708 - .2byte 10240 @ tiles tag - .2byte 10240 @ palette tag - .4byte gOamData_837DF24 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_812EC78 + spr_template 10240, 10240, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812EC78 .align 2 gBattleAnimSpriteTemplate_8402720:: @ 8402720 - .2byte 10227 @ tiles tag - .2byte 10227 @ palette tag - .4byte gOamData_837DFFC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_8402384 - .4byte sub_812ED84 + spr_template 10227, 10227, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8402384, sub_812ED84 .align 2 gBattleAnimSpriteTemplate_8402738:: @ 8402738 - .2byte 10236 @ tiles tag - .2byte 10236 @ palette tag - .4byte gOamData_837DF24 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_812EEA4 + spr_template 10236, 10236, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812EEA4 .align 2 gUnknown_08402750:: @ 8402750 @@ -17049,13 +15147,7 @@ gSpriteAffineAnimTable_84027E0:: @ 84027E0 .align 2 gBattleAnimSpriteTemplate_84027EC:: @ 84027EC - .2byte 10242 @ tiles tag - .2byte 10242 @ palette tag - .4byte gOamData_837DF94 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_84027E0 - .4byte sub_812F88C + spr_template 10242, 10242, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_84027E0, sub_812F88C .align 2 gSpriteAffineAnim_8402804:: @ 8402804 @@ -17094,13 +15186,7 @@ gSpriteAffineAnimTable_8402884:: @ 8402884 .align 2 gBattleAnimSpriteTemplate_8402894:: @ 8402894 - .2byte 10242 @ tiles tag - .2byte 10242 @ palette tag - .4byte gOamData_837DFF4 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_8402884 - .4byte sub_812F948 + spr_template 10242, 10242, gOamData_837DFF4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8402884, sub_812F948 .align 2 gUnknown_084028AC:: @ 84028AC @@ -17131,13 +15217,7 @@ gSpriteAnimTable_840292C:: @ 840292C .align 2 gBattleAnimSpriteTemplate_8402934:: @ 8402934 - .2byte 10053 @ tiles tag - .2byte 10053 @ palette tag - .4byte gOamData_837DF34 - .4byte gSpriteAnimTable_840292C - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_81300F4 + spr_template 10053, 10053, gOamData_837DF34, gSpriteAnimTable_840292C, NULL, gDummySpriteAffineAnimTable, sub_81300F4 .align 2 gUnknown_0840294C:: @ 840294C @@ -17145,13 +15225,7 @@ gUnknown_0840294C:: @ 840294C .align 2 gBattleAnimSpriteTemplate_8402964:: @ 8402964 - .2byte 10252 @ tiles tag - .2byte 10252 @ palette tag - .4byte gOamData_837DF34 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_813051C + spr_template 10252, 10252, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_813051C .align 2 .incbin "baserom.gba", 0x40297c, 0x30 @@ -17161,13 +15235,7 @@ gUnknown_084029AC:: @ 84029AC .align 2 gBattleAnimSpriteTemplate_84029C4:: @ 84029C4 - .2byte 10247 @ tiles tag - .2byte 10247 @ palette tag - .4byte gOamData_837DF34 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_81307B0 + spr_template 10247, 10247, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81307B0 .align 2 gUnknown_084029DC:: @ 84029DC @@ -17175,56 +15243,26 @@ gUnknown_084029DC:: @ 84029DC .align 2 gBattleAnimSpriteTemplate_84029F4:: @ 84029F4 - .2byte 10255 @ tiles tag - .2byte 10255 @ palette tag - .4byte gOamData_837DF34 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_8130A2C + spr_template 10255, 10255, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8130A2C .align 2 gBattleAnimSpriteTemplate_8402A0C:: @ 8402A0C - .2byte 10247 @ tiles tag - .2byte 10247 @ palette tag - .4byte gOamData_837DF34 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_8130AEC + spr_template 10247, 10247, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8130AEC .align 2 gBattleAnimSpriteTemplate_8402A24:: @ 8402A24 - .2byte 10258 @ tiles tag - .2byte 10258 @ palette tag - .4byte gOamData_837E054 - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_8130F5C + spr_template 10258, 10258, gOamData_837E054, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8130F5C .align 2 gBattleAnimSpriteTemplate_8402A3C:: @ 8402A3C - .2byte 10233 @ tiles tag - .2byte 10233 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_8131264 + spr_template 10233, 10233, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8131264 .align 2 .incbin "baserom.gba", 0x402a54, 0x18 .align 2 gBattleAnimSpriteTemplate_8402A6C:: @ 8402A6C - .2byte 10250 @ tiles tag - .2byte 10250 @ palette tag - .4byte gOamData_837DF3C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_8131564 + spr_template 10250, 10250, gOamData_837DF3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8131564 .align 2 .incbin "baserom.gba", 0x402a84, 0x18 @@ -17258,13 +15296,7 @@ gSpriteAffineAnimTable_8402ADC:: @ 8402ADC .align 2 gBattleAnimSpriteTemplate_8402AE4:: @ 8402AE4 - .2byte 10277 @ tiles tag - .2byte 10277 @ palette tag - .4byte gOamData_837DF9C - .4byte gSpriteAnimTable_8402AA8 - .4byte NULL - .4byte gSpriteAffineAnimTable_8402ADC - .4byte sub_8132370 + spr_template 10277, 10277, gOamData_837DF9C, gSpriteAnimTable_8402AA8, NULL, gSpriteAffineAnimTable_8402ADC, sub_8132370 .align 2 gSpriteAffineAnim_8402AFC:: @ 8402AFC @@ -17277,13 +15309,7 @@ gSpriteAffineAnimTable_8402B0C:: @ 8402B0C .align 2 gBattleAnimSpriteTemplate_8402B10:: @ 8402B10 - .2byte 10278 @ tiles tag - .2byte 10278 @ palette tag - .4byte gOamData_837E0BC - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gSpriteAffineAnimTable_8402B0C - .4byte sub_81323E0 + spr_template 10278, 10278, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8402B0C, sub_81323E0 .align 2 gUnknown_08402B28:: @ 8402B28 @@ -17710,13 +15736,7 @@ gUnknown_0840B4D4:: @ 840B4D4 .align 2 gBattleAnimSpriteTemplate_840B4FC:: @ 840B4FC - .2byte 10269 @ tiles tag - .2byte 10269 @ palette tag - .4byte gOamData_837DF2C - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gDummySpriteAffineAnimTable - .4byte sub_8141C30 + spr_template 10269, 10269, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8141C30 .align 2 gUnknown_0840B514:: @ 840B514 diff --git a/data/graphics/field_objects/field_effect_objects.s b/data/graphics/field_objects/field_effect_objects.s index a704041b0..aa3625435 100644 --- a/data/graphics/field_objects/field_effect_objects.s +++ b/data/graphics/field_objects/field_effect_objects.s @@ -42,46 +42,22 @@ gFieldEffectObjectPicTable_ShadowExtraLarge: @ 8374558 .align 2 gFieldEffectObjectTemplate_ShadowSmall: @ 8374560 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_8x8 - .4byte gFieldEffectObjectImageAnimTable_Shadow - .4byte gFieldEffectObjectPicTable_ShadowSmall - .4byte gDummySpriteAffineAnimTable - .4byte oamc_shadow + spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_8x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowSmall, gDummySpriteAffineAnimTable, oamc_shadow .align 2 gFieldEffectObjectTemplate_ShadowMedium: @ 8374578 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_Shadow - .4byte gFieldEffectObjectPicTable_ShadowMedium - .4byte gDummySpriteAffineAnimTable - .4byte oamc_shadow + spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowMedium, gDummySpriteAffineAnimTable, oamc_shadow .align 2 gFieldEffectObjectTemplate_ShadowLarge: @ 8374590 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_32x8 - .4byte gFieldEffectObjectImageAnimTable_Shadow - .4byte gFieldEffectObjectPicTable_ShadowLarge - .4byte gDummySpriteAffineAnimTable - .4byte oamc_shadow + spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_32x8, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowLarge, gDummySpriteAffineAnimTable, oamc_shadow .align 2 gFieldEffectObjectTemplate_ShadowExtraLarge: @ 83745A8 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_64x32 - .4byte gFieldEffectObjectImageAnimTable_Shadow - .4byte gFieldEffectObjectPicTable_ShadowExtraLarge - .4byte gDummySpriteAffineAnimTable - .4byte oamc_shadow + spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_64x32, gFieldEffectObjectImageAnimTable_Shadow, gFieldEffectObjectPicTable_ShadowExtraLarge, gDummySpriteAffineAnimTable, oamc_shadow .align 2 @@ -110,13 +86,7 @@ gFieldEffectObjectImageAnimTable_TallGrass: @ 8374600 .align 2 gFieldEffectObjectTemplate_TallGrass: @ 8374604 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_TallGrass - .4byte gFieldEffectObjectPicTable_TallGrass - .4byte gDummySpriteAffineAnimTable - .4byte unc_grass_normal + spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_TallGrass, gFieldEffectObjectPicTable_TallGrass, gDummySpriteAffineAnimTable, unc_grass_normal .align 2 @@ -148,13 +118,7 @@ gFieldEffectObjectImageAnimTable_Ripple: @ 8374668 .align 2 gFieldEffectObjectTemplate_Ripple: @ 837466C - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Ripple - .4byte gFieldEffectObjectPicTable_Ripple - .4byte gDummySpriteAffineAnimTable - .4byte sub_8128800 + spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ripple, gFieldEffectObjectPicTable_Ripple, gDummySpriteAffineAnimTable, sub_8128800 .align 2 @@ -183,13 +147,7 @@ gFieldEffectObjectImageAnimTable_Ash: @ 83746C4 .align 2 gFieldEffectObjectTemplate_Ash: @ 83746C8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Ash - .4byte gFieldEffectObjectPicTable_Ash - .4byte gDummySpriteAffineAnimTable - .4byte sub_8127D84 + spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Ash, gFieldEffectObjectPicTable_Ash, gDummySpriteAffineAnimTable, sub_8127D84 .align 2 @@ -233,13 +191,7 @@ gFieldEffectObjectImageAnimTable_SurfBlob: @ 8374718 .align 2 gFieldEffectObjectTemplate_SurfBlob: @ 8374728 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldEffectObjectImageAnimTable_SurfBlob - .4byte gFieldEffectObjectPicTable_SurfBlob - .4byte gDummySpriteAffineAnimTable - .4byte sub_8127F7C + spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, sub_8127F7C .align 2 @@ -292,13 +244,7 @@ gFieldEffectObjectImageAnimTable_Arrow: @ 83747B0 .align 2 gFieldEffectObjectTemplate_Arrow: @ 83747C0 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Arrow - .4byte gFieldEffectObjectPicTable_Arrow - .4byte gDummySpriteAffineAnimTable - .4byte SpriteCallbackDummy + spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Arrow, gFieldEffectObjectPicTable_Arrow, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 @@ -323,13 +269,7 @@ gFieldEffectObjectImageAnimTable_Dust: @ 8374800 .align 2 gFieldEffectObjectTemplate_Dust: @ 8374804 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_Dust - .4byte gFieldEffectObjectPicTable_Dust - .4byte gDummySpriteAffineAnimTable - .4byte sub_81287C4 + spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Dust, gFieldEffectObjectPicTable_Dust, gDummySpriteAffineAnimTable, sub_81287C4 .align 2 @@ -356,13 +296,7 @@ gFieldEffectObjectImageAnimTable_JumpTallGrass: @ 8374850 .align 2 gFieldEffectObjectTemplate_JumpTallGrass: @ 8374854 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_JumpTallGrass - .4byte gFieldEffectObjectPicTable_JumpTallGrass - .4byte gDummySpriteAffineAnimTable - .4byte sub_81287C4 + spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_JumpTallGrass, gFieldEffectObjectPicTable_JumpTallGrass, gDummySpriteAffineAnimTable, sub_81287C4 .align 2 @@ -406,13 +340,7 @@ gFieldEffectObjectImageAnimTable_SandFootprints: @ 837489C .align 2 gFieldEffectObjectTemplate_SandFootprints: @ 83748B0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_SandFootprints - .4byte gFieldEffectObjectPicTable_SandFootprints - .4byte gDummySpriteAffineAnimTable - .4byte sub_8127584 + spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_SandFootprints, gFieldEffectObjectPicTable_SandFootprints, gDummySpriteAffineAnimTable, sub_8127584 .align 2 @@ -456,13 +384,7 @@ gFieldEffectObjectImageAnimTable_DeepSandFootprints: @ 83748F8 .align 2 gFieldEffectObjectTemplate_DeepSandFootprints: @ 837490C - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_DeepSandFootprints - .4byte gFieldEffectObjectPicTable_DeepSandFootprints - .4byte gDummySpriteAffineAnimTable - .4byte sub_8127584 + spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_DeepSandFootprints, gFieldEffectObjectPicTable_DeepSandFootprints, gDummySpriteAffineAnimTable, sub_8127584 .align 2 @@ -536,13 +458,7 @@ gFieldEffectObjectImageAnimTable_BikeTireTracks: @ 8374984 .align 2 gFieldEffectObjectTemplate_BikeTireTracks: @ 83749A8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_BikeTireTracks - .4byte gFieldEffectObjectPicTable_BikeTireTracks - .4byte gDummySpriteAffineAnimTable - .4byte sub_8127584 + spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BikeTireTracks, gFieldEffectObjectPicTable_BikeTireTracks, gDummySpriteAffineAnimTable, sub_8127584 .align 2 @@ -569,13 +485,7 @@ gFieldEffectObjectImageAnimTable_JumpBigSplash: @ 83749F4 .align 2 gFieldEffectObjectTemplate_JumpBigSplash: @ 83749F8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_JumpBigSplash - .4byte gFieldEffectObjectPicTable_JumpBigSplash - .4byte gDummySpriteAffineAnimTable - .4byte sub_81287C4 + spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpBigSplash, gFieldEffectObjectPicTable_JumpBigSplash, gDummySpriteAffineAnimTable, sub_81287C4 .align 2 @@ -612,13 +522,7 @@ gFieldEffectObjectImageAnimTable_Splash: @ 8374A50 .align 2 gFieldEffectObjectTemplate_Splash: @ 8374A58 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_Splash - .4byte gFieldEffectObjectPicTable_Splash - .4byte gDummySpriteAffineAnimTable - .4byte sub_81276B4 + spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Splash, gFieldEffectObjectPicTable_Splash, gDummySpriteAffineAnimTable, sub_81276B4 .align 2 @@ -643,13 +547,7 @@ gFieldEffectObjectImageAnimTable_JumpSmallSplash: @ 8374A98 .align 2 gFieldEffectObjectTemplate_JumpSmallSplash: @ 8374A9C - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_JumpSmallSplash - .4byte gFieldEffectObjectPicTable_JumpSmallSplash - .4byte gDummySpriteAffineAnimTable - .4byte sub_81287C4 + spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_JumpSmallSplash, gFieldEffectObjectPicTable_JumpSmallSplash, gDummySpriteAffineAnimTable, sub_81287C4 .align 2 @@ -679,13 +577,7 @@ gFieldEffectObjectImageAnimTable_LongGrass: @ 8374AF4 .align 2 gFieldEffectObjectTemplate_LongGrass: @ 8374AF8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_LongGrass - .4byte gFieldEffectObjectPicTable_LongGrass - .4byte gDummySpriteAffineAnimTable - .4byte unc_grass_tall + spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_LongGrass, gFieldEffectObjectPicTable_LongGrass, gDummySpriteAffineAnimTable, unc_grass_tall .align 2 @@ -716,13 +608,7 @@ gFieldEffectObjectImageAnimTable_JumpLongGrass: @ 8374B5C .align 2 gFieldEffectObjectTemplate_JumpLongGrass: @ 8374B60 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_JumpLongGrass - .4byte gFieldEffectObjectPicTable_JumpLongGrass - .4byte gDummySpriteAffineAnimTable - .4byte sub_81287C4 + spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_JumpLongGrass, gFieldEffectObjectPicTable_JumpLongGrass, gDummySpriteAffineAnimTable, sub_81287C4 .align 2 @@ -759,13 +645,7 @@ gFieldEffectObjectImageAnimTable_Unknown17: @ 8374BE8 .align 2 gFieldEffectObjectTemplate_Unknown17: @ 8374BEC - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown17 - .4byte gFieldEffectObjectPicTable_Unknown17 - .4byte gDummySpriteAffineAnimTable - .4byte sub_8128800 + spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown17, gFieldEffectObjectPicTable_Unknown17, gDummySpriteAffineAnimTable, sub_8128800 .align 2 @@ -794,13 +674,7 @@ gFieldEffectObjectImageAnimTable_Unknown18: @ 8374C40 .align 2 gFieldEffectObjectTemplate_Unknown18: @ 8374C44 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown18 - .4byte gFieldEffectObjectPicTable_Unknown18 - .4byte gDummySpriteAffineAnimTable - .4byte sub_8128800 + spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown18, gFieldEffectObjectPicTable_Unknown18, gDummySpriteAffineAnimTable, sub_8128800 .align 2 @@ -827,13 +701,7 @@ gFieldEffectObjectImageAnimTable_Unknown19: @ 8374C90 .align 2 gFieldEffectObjectTemplate_Unknown19: @ 8374C94 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown19 - .4byte gFieldEffectObjectPicTable_Unknown19 - .4byte gDummySpriteAffineAnimTable - .4byte sub_8128800 + spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown19, gFieldEffectObjectPicTable_Unknown19, gDummySpriteAffineAnimTable, sub_8128800 .align 2 @@ -858,13 +726,7 @@ gFieldEffectObjectImageAnimTable_Unknown29: @ 8374CD4 .align 2 gFieldEffectObjectTemplate_Unknown29: @ 8374CD8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_Unknown29 - .4byte gFieldEffectObjectPicTable_Unknown29 - .4byte gDummySpriteAffineAnimTable - .4byte sub_81282E0 + spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x8, gFieldEffectObjectImageAnimTable_Unknown29, gFieldEffectObjectPicTable_Unknown29, gDummySpriteAffineAnimTable, sub_81282E0 .align 2 @@ -893,13 +755,7 @@ gFieldEffectObjectImageAnimTable_Unknown20: @ 8374D2C .align 2 gFieldEffectObjectTemplate_Unknown20: @ 8374D30 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown20 - .4byte gFieldEffectObjectPicTable_Unknown20 - .4byte gDummySpriteAffineAnimTable - .4byte sub_8128800 + spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown20, gFieldEffectObjectPicTable_Unknown20, gDummySpriteAffineAnimTable, sub_8128800 .align 2 @@ -938,13 +794,7 @@ gFieldEffectObjectRotScalAnimTable_Unknown21: @ 8374DE8 .align 2 gFieldEffectObjectTemplate_Unknown21: @ 8374DF0 - .2byte 0x0 @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gDummyOamData - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gFieldEffectObjectRotScalAnimTable_Unknown21 - .4byte SpriteCallbackDummy + spr_template 0x0, 0xFFFF, gDummyOamData, gDummySpriteAnimTable, NULL, gFieldEffectObjectRotScalAnimTable_Unknown21, SpriteCallbackDummy .align 2 @@ -989,13 +839,7 @@ gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle: @ 8374E8C .align 2 gFieldEffectObjectTemplate_BerryTreeGrowthSparkle: @ 8374E90 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle - .4byte gFieldEffectObjectPicTable_BerryTreeGrowthSparkle - .4byte gDummySpriteAffineAnimTable - .4byte sub_8128800 + spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle, gFieldEffectObjectPicTable_BerryTreeGrowthSparkle, gDummySpriteAffineAnimTable, sub_8128800 .align 2 @@ -1035,13 +879,7 @@ gFieldEffectObjectImageAnimTable_TreeDisguise: @ 8374F08 .align 2 gFieldEffectObjectTemplate_TreeDisguise: @ 8374F10 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldEffectObjectImageAnimTable_TreeDisguise - .4byte gFieldEffectObjectPicTable_TreeDisguise - .4byte gDummySpriteAffineAnimTable - .4byte sub_81285AC + spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_TreeDisguise, gDummySpriteAffineAnimTable, sub_81285AC .align 2 @@ -1081,13 +919,7 @@ gFieldEffectObjectImageAnimTable_MountainDisguise: @ 8374F88 .align 2 gFieldEffectObjectTemplate_MountainDisguise: @ 8374F90 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldEffectObjectImageAnimTable_MountainDisguise - .4byte gFieldEffectObjectPicTable_MountainDisguise - .4byte gDummySpriteAffineAnimTable - .4byte sub_81285AC + spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_MountainDisguise, gFieldEffectObjectPicTable_MountainDisguise, gDummySpriteAffineAnimTable, sub_81285AC .align 2 @@ -1103,13 +935,7 @@ gFieldEffectObjectPicTable_SandDisguise: @ 8374FA8 .align 2 gFieldEffectObjectTemplate_SandDisguise: @ 8374FE0 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldEffectObjectImageAnimTable_TreeDisguise - .4byte gFieldEffectObjectPicTable_SandDisguise - .4byte gDummySpriteAffineAnimTable - .4byte sub_81285AC + spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_TreeDisguise, gFieldEffectObjectPicTable_SandDisguise, gDummySpriteAffineAnimTable, sub_81285AC .align 2 @@ -1130,13 +956,7 @@ gFieldEffectObjectImageAnimTable_Bird: @ 8375008 .align 2 gFieldEffectObjectTemplate_Bird: @ 837500C - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldEffectObjectImageAnimTable_Bird - .4byte gFieldEffectObjectPicTable_Bird - .4byte gDummySpriteAffineAnimTable - .4byte SpriteCallbackDummy + spr_template 0xFFFF, 0xFFFF, gFieldObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_Bird, gFieldEffectObjectPicTable_Bird, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 2 @@ -1159,13 +979,7 @@ gFieldEffectObjectImageAnimTable_ShortGrass: @ 8375040 .align 2 gFieldEffectObjectTemplate_ShortGrass: @ 8375044 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_ShortGrass - .4byte gFieldEffectObjectPicTable_ShortGrass - .4byte gDummySpriteAffineAnimTable - .4byte sub_8127334 + spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_ShortGrass, gFieldEffectObjectPicTable_ShortGrass, gDummySpriteAffineAnimTable, sub_8127334 .align 2 @@ -1186,13 +1000,7 @@ gFieldEffectObjectImageAnimTable_HotSpringsWater: @ 837506C .align 2 gFieldEffectObjectTemplate_HotSpringsWater: @ 8375070 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_HotSpringsWater - .4byte gFieldEffectObjectPicTable_HotSpringsWater - .4byte gDummySpriteAffineAnimTable - .4byte sub_8127A7C + spr_template 0xFFFF, 0x1005, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_HotSpringsWater, gFieldEffectObjectPicTable_HotSpringsWater, gDummySpriteAffineAnimTable, sub_8127A7C .align 2 @@ -1221,13 +1029,7 @@ gFieldEffectObjectImageAnimTable_PopOutOfAsh: @ 83750C8 .align 2 gFieldEffectObjectTemplate_PopOutOfAsh: @ 83750CC - .2byte 0xFFFF @ tiles tag - .2byte 0x100D @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_PopOutOfAsh - .4byte gFieldEffectObjectPicTable_PopOutOfAsh - .4byte gDummySpriteAffineAnimTable - .4byte sub_808788C + spr_template 0xFFFF, 0x100D, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_PopOutOfAsh, gFieldEffectObjectPicTable_PopOutOfAsh, gDummySpriteAffineAnimTable, sub_808788C .align 2 @@ -1261,13 +1063,7 @@ gFieldEffectObjectImageAnimTable_Unknown33: @ 837512C .align 2 gFieldEffectObjectTemplate_Unknown33: @ 8375130 - .2byte 0xFFFF @ tiles tag - .2byte 0x100D @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown33 - .4byte gFieldEffectObjectPicTable_Unknown33 - .4byte gDummySpriteAffineAnimTable - .4byte sub_8087638 + spr_template 0xFFFF, 0x100D, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown33, gFieldEffectObjectPicTable_Unknown33, gDummySpriteAffineAnimTable, sub_8087638 .align 2 @@ -1302,13 +1098,7 @@ gFieldEffectObjectImageAnimTable_Bubbles: @ 83751AC .align 2 gFieldEffectObjectTemplate_Bubbles: @ 83751B0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldEffectObjectImageAnimTable_Bubbles - .4byte gFieldEffectObjectPicTable_Bubbles - .4byte gDummySpriteAffineAnimTable - .4byte sub_8128410 + spr_template 0xFFFF, 0x1004, gFieldObjectBaseOam_16x32, gFieldEffectObjectImageAnimTable_Bubbles, gFieldEffectObjectPicTable_Bubbles, gDummySpriteAffineAnimTable, sub_8128410 .align 2 @@ -1332,13 +1122,7 @@ gFieldEffectObjectImageAnimTable_Unknown35: @ 83751E8 .align 2 gFieldEffectObjectTemplate_Unknown35: @ 83751EC - .2byte 0xFFFF @ tiles tag - .2byte 0x100F @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown35 - .4byte gFieldEffectObjectPicTable_Unknown35 - .4byte gDummySpriteAffineAnimTable - .4byte sub_8128774 + spr_template 0xFFFF, 0x100F, gFieldObjectBaseOam_16x16, gFieldEffectObjectImageAnimTable_Unknown35, gFieldEffectObjectPicTable_Unknown35, gDummySpriteAffineAnimTable, sub_8128774 .align 2 |