diff options
| -rw-r--r-- | data/battle_anim_812C144.s | 635 | ||||
| -rw-r--r-- | ld_script.txt | 1 | ||||
| -rw-r--r-- | src/battle/battle_anim_812C144.c | 191 |
3 files changed, 102 insertions, 725 deletions
diff --git a/data/battle_anim_812C144.s b/data/battle_anim_812C144.s deleted file mode 100644 index 5198681fe..000000000 --- a/data/battle_anim_812C144.s +++ /dev/null @@ -1,635 +0,0 @@ - .include "include/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gSpriteAnimTable_840217C:: @ 840217C - .4byte gSpriteAnim_8402164 - - .align 2 -gBattleAnimSpriteTemplate_8402180:: @ 8402180 - spr_template 10137, 10137, gOamData_837E054, gSpriteAnimTable_840217C, NULL, gDummySpriteAffineAnimTable, sub_80793C4 - - .align 2 -gBattleAnimSpriteTemplate_8402198:: @ 8402198 - spr_template 10016, 10016, gOamData_837DF54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812C144 - - .align 2 -gBattleAnimSpriteTemplate_84021B0:: @ 84021B0 - spr_template 10017, 10017, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80794A8 - - .align 2 -gSpriteAnim_84021C8:: @ 84021C8 - obj_image_anim_frame 0, 40 - obj_image_anim_frame 16, 8 - obj_image_anim_frame 32, 40 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_84021D8:: @ 84021D8 - .4byte gSpriteAnim_84021C8 - - .align 2 -gBattleAnimSpriteTemplate_84021DC:: @ 84021DC - spr_template 10190, 10190, gOamData_837DF34, gSpriteAnimTable_84021D8, NULL, gDummySpriteAffineAnimTable, sub_80793C4 - - .align 2 -gBattleAnimSpriteTemplate_84021F4:: @ 84021F4 - spr_template 10191, 10191, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812C220 - - .align 2 -gBattleAnimSpriteTemplate_840220C:: @ 840220C - spr_template 10189, 10189, gOamData_837DF94, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812C2BC - - .align 2 -gSpriteAffineAnim_8402224:: @ 8402224 - obj_rot_scal_anim_frame 0x180, 0x180, 0, 0 - obj_rot_scal_anim_frame 0xFFE0, 0x18, 0, 5 - obj_rot_scal_anim_frame 0x18, 0xFFE0, 0, 5 - obj_rot_scal_anim_jump 1 - - .align 2 -gSpriteAffineAnim_8402244:: @ 8402244 - obj_rot_scal_anim_frame 0x30, 0x30, 0, 0 - obj_rot_scal_anim_frame 0x20, 0x20, 0, 6 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_840225C:: @ 840225C - .4byte gSpriteAffineAnim_8402224 - .4byte gSpriteAffineAnim_8402244 - - .align 2 -gBattleAnimSpriteTemplate_8402264:: @ 8402264 - spr_template 10187, 10187, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_840225C, sub_812C358 - - .align 2 -gBattleAnimSpriteTemplate_840227C:: @ 840227C - spr_template 10152, 10152, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812C720 - - .align 2 -gSpriteAnim_8402294:: @ 8402294 - obj_image_anim_frame 0, 3 - obj_image_anim_frame 16, 3 - obj_image_anim_frame 32, 3 - obj_image_anim_frame 48, 3 - obj_image_anim_frame 64, 3 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_84022AC:: @ 84022AC - .4byte gSpriteAnim_8402294 - - .align 2 -gBattleAnimSpriteTemplate_84022B0:: @ 84022B0 - spr_template 10027, 10027, gOamData_837DF34, gSpriteAnimTable_84022AC, NULL, gDummySpriteAffineAnimTable, sub_812C80C - - .align 2 -gSpriteAnim_84022C8:: @ 84022C8 - obj_image_anim_frame 0, 3 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_84022D0:: @ 84022D0 - .4byte gSpriteAnim_84022C8 - - .align 2 -gSpriteAffineAnim_84022D4:: @ 84022D4 - obj_rot_scal_anim_frame 0xFFF9, 0xFFF9, -3, 16 - obj_rot_scal_anim_frame 0x7, 0x7, 3, 16 - obj_rot_scal_anim_jump 0 - - .align 2 -gSpriteAffineAnimTable_84022EC:: @ 84022EC - .4byte gSpriteAffineAnim_84022D4 - - .align 2 -gBattleAnimSpriteTemplate_84022F0:: @ 84022F0 - spr_template 10228, 10228, gOamData_837DF94, gSpriteAnimTable_84022D0, NULL, gSpriteAffineAnimTable_84022EC, sub_812C848 - - .align 2 -gSpriteAnim_8402308:: @ 8402308 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 16, 16 - obj_image_anim_frame 32, 4 - obj_image_anim_frame 48, 4 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_840231C:: @ 840231C - .4byte gSpriteAnim_8402308 - - .align 2 -gSpriteAffineAnim_8402320:: @ 8402320 - obj_rot_scal_anim_frame 0x200, 0x200, 0, 0 - obj_rot_scal_anim_frame 0xFFE0, 0xFFE0, 0, 8 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_8402338:: @ 8402338 - .4byte gSpriteAffineAnim_8402320 - - .align 2 -gBattleAnimSpriteTemplate_840233C:: @ 840233C - spr_template 10192, 10192, gOamData_837DFF4, gSpriteAnimTable_840231C, NULL, gSpriteAffineAnimTable_8402338, sub_812C908 - - .align 2 -gSpriteAffineAnim_8402354:: @ 8402354 - obj_rot_scal_anim_frame 0x0, 0x180, 0, 0 - obj_rot_scal_anim_frame 0x10, 0x0, 0, 20 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_840236C:: @ 840236C - obj_rot_scal_anim_frame 0x140, 0x180, 0, 0 - obj_rot_scal_anim_frame 0xFFF0, 0x0, 0, 19 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_8402384:: @ 8402384 - .4byte gSpriteAffineAnim_8402354 - .4byte gSpriteAffineAnim_840236C - - .align 2 -gBattleAnimSpriteTemplate_840238C:: @ 840238C - spr_template 10227, 10227, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8402384, sub_812C990 - - .align 2 -gBattleAnimSpriteTemplate_84023A4:: @ 84023A4 - spr_template 10247, 10247, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812CAFC - - .align 2 -gBattleAnimSpriteTemplate_84023BC:: @ 84023BC - spr_template 10247, 10247, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812CC28 - - .align 2 -gSpriteAnim_84023D4:: @ 84023D4 - obj_image_anim_frame 0, 2 - obj_image_anim_frame 8, 2 - obj_image_anim_frame 16, 2 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_84023E4:: @ 84023E4 - .4byte gSpriteAnim_84023D4 - - .align 2 -gBattleAnimSpriteTemplate_84023E8:: @ 84023E8 - spr_template 10229, 10229, gOamData_837DF54, gSpriteAnimTable_84023E4, NULL, gDummySpriteAffineAnimTable, sub_812CCE8 - - .align 2 -gUnknown_08402400:: @ 8402400 - obj_rot_scal_anim_frame -12, 8, 0, 4 - obj_rot_scal_anim_frame 20, -20, 0, 4 - obj_rot_scal_anim_frame -8, 12, 0, 4 - obj_rot_scal_anim_end 0 - - .align 2 -gSpriteAnim_8402420:: @ 8402420 - obj_image_anim_frame 0, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8402428:: @ 8402428 - .4byte gSpriteAnim_8402420 - - .align 2 -gSpriteAffineAnim_840242C:: @ 840242C - obj_rot_scal_anim_frame 0x0, 0x0, 5, 40 - obj_rot_scal_anim_frame 0x0, 0x0, 10, 10 - obj_rot_scal_anim_frame 0x0, 0x0, 15, 10 - obj_rot_scal_anim_frame 0x0, 0x0, 20, 40 - obj_rot_scal_anim_jump 0 - - .align 2 -gSpriteAffineAnimTable_8402454:: @ 8402454 - .4byte gSpriteAffineAnim_840242C - - .align 2 -gBattleAnimSpriteTemplate_8402458:: @ 8402458 - spr_template 10230, 10230, gOamData_837DFFC, gSpriteAnimTable_8402428, NULL, gSpriteAffineAnimTable_8402454, sub_812D294 - - .align 2 -gSpriteAnim_8402470:: @ 8402470 - obj_image_anim_frame 0, 3 - obj_image_anim_frame 16, 3 - obj_image_anim_frame 32, 3 - obj_image_anim_frame 48, 3 - obj_image_anim_frame 32, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 16, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_loop 1 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8402494:: @ 8402494 - .4byte gSpriteAnim_8402470 - - .align 2 -gBattleAnimSpriteTemplate_8402498:: @ 8402498 - spr_template 10234, 10234, gOamData_837DF34, gSpriteAnimTable_8402494, NULL, gDummySpriteAffineAnimTable, sub_80793C4 - - .align 2 -gUnknown_084024B0:: @ 84024B0 - obj_rot_scal_anim_frame -12, 20, 0, 8 - obj_rot_scal_anim_frame 12, -20, 0, 8 - obj_rot_scal_anim_loop 2 - obj_rot_scal_anim_end 0 - - .align 2 -gBattleAnimSpriteTemplate_84024D0:: @ 84024D0 - spr_template 10226, 10226, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812D3AC - - .align 2 -gBattleAnimSpriteTemplate_84024E8:: @ 84024E8 - spr_template 10233, 10233, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812D4B4 - - .align 2 -gSpriteTemplate_8402500:: @ 8402500 - spr_template 10233, 10233, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812D588 - - .align 2 -gUnknown_08402518:: @ 8402518 - obj_rot_scal_anim_frame 8, -8, 0, 12 - obj_rot_scal_anim_frame -16, 16, 0, 12 - obj_rot_scal_anim_frame 8, -8, 0, 12 - obj_rot_scal_anim_loop 1 - obj_rot_scal_anim_end 0 - - .align 2 -gUnknown_08402540:: @ 8402540 - obj_rot_scal_anim_frame 0, 6, 0, 20 - obj_rot_scal_anim_frame 0, 0, 0, 20 - obj_rot_scal_anim_frame 0, -18, 0, 6 - obj_rot_scal_anim_frame -18, -18, 0, 3 - obj_rot_scal_anim_frame 0, 0, 0, 15 - obj_rot_scal_anim_frame 4, 4, 0, 13 - obj_rot_scal_anim_end 0 - - .align 2 -gBattleAnimSpriteTemplate_8402578:: @ 8402578 - spr_template 10236, 10236, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812D724 - - .align 2 -gUnknown_08402590:: @ 8402590 - obj_rot_scal_anim_frame 0, 6, 0, 20 - obj_rot_scal_anim_frame 0, 0, 0, 20 - obj_rot_scal_anim_frame 7, -30, 0, 6 - obj_rot_scal_anim_frame 0, 0, 0, 20 - obj_rot_scal_anim_frame -2, 3, 0, 20 - obj_rot_scal_anim_end 0 - - .align 2 -gUnknown_084025C0:: @ 84025C0 - .byte 0xE8, 0x18, 0xFC, 0x00 @ last could be align padding - - .align 2 -gSpriteAnim_84025C4:: @ 84025C4 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 4, 6 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_84025D0:: @ 84025D0 - obj_image_anim_frame 8, 6 - obj_image_anim_end - - .align 2 -gSpriteAnim_84025D8:: @ 84025D8 - obj_image_anim_frame 12, 6 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_84025E0:: @ 84025E0 - .4byte gSpriteAnim_84025C4 - .4byte gSpriteAnim_84025D0 - .4byte gSpriteAnim_84025D8 - - .align 2 -gBattleAnimSpriteTemplate_84025EC:: @ 84025EC - spr_template 10241, 10241, gOamData_837DF2C, gSpriteAnimTable_84025E0, NULL, gDummySpriteAffineAnimTable, sub_812DEAC - - .align 2 -gUnknown_08402604:: @ 8402604 - .byte 0x78, 0x50, 0x28, 0x00 @ last could be align padding - - .align 2 -gUnknown_08402608:: @ 8402608 - .byte 0, 0, 0, 0, 50 - - .align 2 -gUnknown_08402610:: @ 8402610 - obj_rot_scal_anim_frame 0, -15, 0, 7 - obj_rot_scal_anim_frame 0, 15, 0, 7 - obj_rot_scal_anim_loop 2 - obj_rot_scal_anim_end 0 - - .align 2 -gBattleAnimSpriteTemplate_8402630:: @ 8402630 - spr_template 10087, 10087, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812E4F0 - - .align 2 -gSpriteAnim_8402648:: @ 8402648 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_frame 1, 8, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_840266C:: @ 840266C - obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 8, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_8402690:: @ 8402690 - obj_image_anim_frame 0, 8 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8402698:: @ 8402698 - .4byte gSpriteAnim_8402648 - .4byte gSpriteAnim_840266C - .4byte gSpriteAnim_8402690 - - .align 2 -gBattleAnimSpriteTemplate_84026A4:: @ 84026A4 - spr_template 10238, 10238, gOamData_837DF24, gSpriteAnimTable_8402698, NULL, gDummySpriteAffineAnimTable, sub_812E7A0 - - .align 2 -@ probably unknown palette - .incbin "graphics/unknown/unknown_4026BC.gbapal" - - .align 2 -gSpriteAnim_84026DC:: @ 84026DC - obj_image_anim_frame 0, 5 - obj_image_anim_frame 4, 9 - obj_image_anim_frame 8, 5 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_84026EC:: @ 84026EC - .4byte gSpriteAnim_84026DC - - .align 2 -gBattleAnimSpriteTemplate_84026F0:: @ 84026F0 - spr_template 10239, 10239, gOamData_837DF2C, gSpriteAnimTable_84026EC, NULL, gDummySpriteAffineAnimTable, sub_812EA4C - - .align 2 -gBattleAnimSpriteTemplate_8402708:: @ 8402708 - spr_template 10240, 10240, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812EC78 - - .align 2 -gBattleAnimSpriteTemplate_8402720:: @ 8402720 - spr_template 10227, 10227, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8402384, sub_812ED84 - - .align 2 -gBattleAnimSpriteTemplate_8402738:: @ 8402738 - spr_template 10236, 10236, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812EEA4 - - .align 2 -gUnknown_08402750:: @ 8402750 - obj_rot_scal_anim_frame 16, 0, 0, 4 - obj_rot_scal_anim_frame 0, -3, 0, 16 - obj_rot_scal_anim_frame 4, 0, 0, 4 - obj_rot_scal_anim_frame 0, 0, 0, 24 - obj_rot_scal_anim_frame -5, 3, 0, 16 - obj_rot_scal_anim_end 0 - - .align 2 -gSpriteAffineAnim_8402780:: @ 8402780 - obj_rot_scal_anim_frame 0x80, 0x80, 0, 0 - obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 8 - obj_rot_scal_anim_frame 0x8, 0x8, 0, 8 - obj_rot_scal_anim_jump 0 - - .align 2 -gSpriteAffineAnim_84027A0:: @ 84027A0 - obj_rot_scal_anim_frame 0xC0, 0xC0, 0, 0 - obj_rot_scal_anim_frame 0x8, 0x8, 0, 8 - obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 8 - obj_rot_scal_anim_jump 0 - - .align 2 -gSpriteAffineAnim_84027C0:: @ 84027C0 - obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 - obj_rot_scal_anim_frame 0x8, 0x8, 0, 8 - obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 8 - obj_rot_scal_anim_jump 0 - - .align 2 -gSpriteAffineAnimTable_84027E0:: @ 84027E0 - .4byte gSpriteAffineAnim_8402780 - .4byte gSpriteAffineAnim_84027A0 - .4byte gSpriteAffineAnim_84027C0 - - .align 2 -gBattleAnimSpriteTemplate_84027EC:: @ 84027EC - spr_template 10242, 10242, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_84027E0, sub_812F88C - - .align 2 -gSpriteAffineAnim_8402804:: @ 8402804 - obj_rot_scal_anim_frame 0x80, 0x80, 0, 0 - obj_rot_scal_anim_frame 0xFFFC, 0xFFFA, 0, 16 - obj_rot_scal_anim_frame 0x4, 0x6, 0, 16 - obj_rot_scal_anim_jump 0 - - .align 2 -gSpriteAffineAnim_8402824:: @ 8402824 - obj_rot_scal_anim_frame 0xC0, 0xC0, 0, 0 - obj_rot_scal_anim_frame 0x4, 0x6, 0, 16 - obj_rot_scal_anim_frame 0xFFFC, 0xFFFA, 0, 16 - obj_rot_scal_anim_jump 0 - - .align 2 -gSpriteAffineAnim_8402844:: @ 8402844 - obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 - obj_rot_scal_anim_frame 0x4, 0x6, 0, 16 - obj_rot_scal_anim_frame 0xFFFC, 0xFFFA, 0, 16 - obj_rot_scal_anim_jump 0 - - .align 2 -gSpriteAffineAnim_8402864:: @ 8402864 - obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 - obj_rot_scal_anim_frame 0x8, 0xA, 0, 30 - obj_rot_scal_anim_frame 0xFFF8, 0xFFF6, 0, 16 - obj_rot_scal_anim_jump 0 - - .align 2 -gSpriteAffineAnimTable_8402884:: @ 8402884 - .4byte gSpriteAffineAnim_8402804 - .4byte gSpriteAffineAnim_8402824 - .4byte gSpriteAffineAnim_8402844 - .4byte gSpriteAffineAnim_8402864 - - .align 2 -gBattleAnimSpriteTemplate_8402894:: @ 8402894 - spr_template 10242, 10242, gOamData_837DFF4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8402884, sub_812F948 - - .align 2 -gUnknown_084028AC:: @ 84028AC - obj_rot_scal_anim_frame -16, 16, 0, 6 - obj_rot_scal_anim_frame 16, -16, 0, 12 - obj_rot_scal_anim_frame -16, 16, 0, 6 - obj_rot_scal_anim_end 0 - - .align 2 -gSpriteTemplate_84028CC:: @ 84028CC - spr_template 10243, 10243, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812FF94 - - .align 2 -gUnknown_084028E4:: @ 84028E4 - .incbin "graphics/battle_anims/sprites/effect.gbapal" - - .align 2 -gSpriteAnim_8402914:: @ 8402914 - obj_image_anim_frame 0, 3 - obj_image_anim_frame 16, 3 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnim_8402920:: @ 8402920 - obj_image_anim_frame 32, 3 - obj_image_anim_frame 48, 3 - obj_image_anim_jump 0 - - .align 2 -gSpriteAnimTable_840292C:: @ 840292C - .4byte gSpriteAnim_8402914 - .4byte gSpriteAnim_8402920 - - .align 2 -gBattleAnimSpriteTemplate_8402934:: @ 8402934 - spr_template 10053, 10053, gOamData_837DF34, gSpriteAnimTable_840292C, NULL, gDummySpriteAffineAnimTable, sub_81300F4 - - .align 2 -gSpriteTemplate_840294C:: @ 840294C - spr_template 10248, 10248, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81304DC - - .align 2 -gBattleAnimSpriteTemplate_8402964:: @ 8402964 - spr_template 10252, 10252, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_813051C - - .align 2 -gSpriteAffineAnim_840297C:: @ 840297C - obj_rot_scal_anim_frame 0x0, 0x0, -4, 24 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_840298C:: @ 840298C - obj_rot_scal_anim_frame 0x100, 0x100, -64, 0 - obj_rot_scal_anim_frame 0x0, 0x0, 4, 24 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_84029A4:: @ 84029A4 - .4byte gSpriteAffineAnim_840297C - .4byte gSpriteAffineAnim_840298C - - .align 2 -gSpriteTemplate_84029AC:: @ 84029AC - spr_template 10254, 10254, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_84029A4, SpriteCallbackDummy - - .align 2 -gBattleAnimSpriteTemplate_84029C4:: @ 84029C4 - spr_template 10247, 10247, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81307B0 - - .align 2 -gUnknown_084029DC:: @ 84029DC - obj_rot_scal_anim_frame 0, -16, 0, 6 - obj_rot_scal_anim_frame 0, 16, 0, 6 - obj_rot_scal_anim_end 0 - - .align 2 -gBattleAnimSpriteTemplate_84029F4:: @ 84029F4 - spr_template 10255, 10255, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8130A2C - - .align 2 -gBattleAnimSpriteTemplate_8402A0C:: @ 8402A0C - spr_template 10247, 10247, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8130AEC - - .align 2 -gBattleAnimSpriteTemplate_8402A24:: @ 8402A24 - spr_template 10258, 10258, gOamData_837E054, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8130F5C - - .align 2 -gBattleAnimSpriteTemplate_8402A3C:: @ 8402A3C - spr_template 10233, 10233, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8131264 - - .align 2 -gSpriteTemplate_8402A54:: @ 8402A54 - spr_template 10233, 10233, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D1FDC - - .align 2 -gBattleAnimSpriteTemplate_8402A6C:: @ 8402A6C - spr_template 10250, 10250, gOamData_837DF3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8131564 - - .align 2 -gSpriteTemplate_8402A84:: @ 8402A84 - spr_template 10224, 10224, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8131EB8 - - .align 2 -gSpriteAnim_8402A9C:: @ 8402A9C - obj_image_anim_frame 0, 4 - obj_image_anim_frame 64, 4 - obj_image_anim_end - - .align 2 -gSpriteAnimTable_8402AA8:: @ 8402AA8 - .4byte gSpriteAnim_8402A9C - - .align 2 -gSpriteAffineAnim_8402AAC:: @ 8402AAC - obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 - obj_rot_scal_anim_frame 0x0, 0x0, -4, 8 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnim_8402AC4:: @ 8402AC4 - obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 - obj_rot_scal_anim_frame 0x0, 0x0, 4, 8 - obj_rot_scal_anim_end - - .align 2 -gSpriteAffineAnimTable_8402ADC:: @ 8402ADC - .4byte gSpriteAffineAnim_8402AAC - .4byte gSpriteAffineAnim_8402AC4 - - .align 2 -gBattleAnimSpriteTemplate_8402AE4:: @ 8402AE4 - spr_template 10277, 10277, gOamData_837DF9C, gSpriteAnimTable_8402AA8, NULL, gSpriteAffineAnimTable_8402ADC, sub_8132370 - - .align 2 -gSpriteAffineAnim_8402AFC:: @ 8402AFC - obj_rot_scal_anim_frame 0x0, 0x0, -4, 64 - obj_rot_scal_anim_jump 0 - - .align 2 -gSpriteAffineAnimTable_8402B0C:: @ 8402B0C - .4byte gSpriteAffineAnim_8402AFC - - .align 2 -gBattleAnimSpriteTemplate_8402B10:: @ 8402B10 - spr_template 10278, 10278, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_8402B0C, sub_81323E0 - - .align 2 -gUnknown_08402B28:: @ 8402B28 - obj_rot_scal_anim_frame 0, 16, 0, 4 - obj_rot_scal_anim_frame -2, 0, 0, 8 - obj_rot_scal_anim_frame 0, 4, 0, 4 - obj_rot_scal_anim_frame 0, 0, 0, 24 - obj_rot_scal_anim_frame 1, -5, 0, 16 - obj_rot_scal_anim_end 0 - diff --git a/ld_script.txt b/ld_script.txt index 037e62c56..14a390c83 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -735,7 +735,6 @@ SECTIONS { src/contest_ai.o(.rodata); src/battle/battle_controller_safari.o(.rodata); src/battle/battle_anim_812C144.o(.rodata); - data/battle_anim_812C144.o(.rodata); src/move_tutor_menu.o(.rodata); src/decoration_inventory.o(.rodata); src/roamer.o(.rodata); diff --git a/src/battle/battle_anim_812C144.c b/src/battle/battle_anim_812C144.c index a7a92c376..4614f9aa9 100644 --- a/src/battle/battle_anim_812C144.c +++ b/src/battle/battle_anim_812C144.c @@ -31,35 +31,17 @@ extern u16 gBattle_BG2_X; extern u16 gBattle_BG2_Y; extern const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7220; -extern const struct SpriteTemplate gSpriteTemplate_8402500; -extern const struct SpriteTemplate gSpriteTemplate_84028CC; -extern const struct SpriteTemplate gSpriteTemplate_840294C; -extern const struct SpriteTemplate gSpriteTemplate_84029AC; extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7C18[]; extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E7BEC[]; -extern const union AffineAnimCmd gUnknown_08402400[]; -extern const union AffineAnimCmd gUnknown_084024B0[]; -extern const union AffineAnimCmd gUnknown_08402518[]; -extern const union AffineAnimCmd gUnknown_08402540[]; -extern const union AffineAnimCmd gUnknown_08402590[]; -/**/extern const union AffineAnimCmd gUnknown_08402610[]; -/**/extern const union AffineAnimCmd gUnknown_08402750[]; -extern const union AffineAnimCmd gUnknown_084028AC[]; -extern const union AffineAnimCmd gUnknown_084029DC[]; extern const u32 gUnknown_08D2AA98[]; extern const u32 gUnknown_08D2A9E0[]; extern const u16 gUnknown_08D2AA80[]; -/**/extern const s8 gUnknown_084025C0[]; -/**/extern const s8 gUnknown_08402604[]; -/**/extern const u8 gUnknown_08402608[]; -extern const struct SpriteTemplate gBattleAnimSpriteTemplate_84025EC; extern const u8 gUnknown_08D2E014[]; extern const u8 gUnknown_08D2E170[]; extern const u16 gUnknown_08D2E150[]; extern u8 gBattleMonForms[]; extern u8 gBankSpriteIds[]; extern u16 gBattlerPartyIndexes[]; -/**/extern s16 gUnknown_084028E4[]; extern u8 sub_8046234(s16 x, s16 y, u8 a3); extern void sub_80DA48C(struct Sprite *); @@ -116,6 +98,47 @@ static void sub_8131408(u8 taskId); static void sub_81315C8(struct Sprite *sprite); static void sub_8131810(u8 taskId); static void sub_8131838(struct Sprite *sprite); +static void sub_812C144(struct Sprite *sprite); +static void sub_812C220(struct Sprite *sprite); +static void sub_812C2BC(struct Sprite *sprite); +static void sub_812C358(struct Sprite *sprite); +static void sub_812C720(struct Sprite *sprite); +static void sub_812C80C(struct Sprite *sprite); +static void sub_812C848(struct Sprite *sprite); +static void sub_812C908(struct Sprite *sprite); +static void sub_812C990(struct Sprite *sprite); +static void sub_812CAFC(struct Sprite *sprite); +static void sub_812CC28(struct Sprite *sprite); +static void sub_812CCE8(struct Sprite *sprite); +static void sub_812D294(struct Sprite *sprite); +static void sub_812D3AC(struct Sprite *sprite); +static void sub_812D4B4(struct Sprite *sprite); +static void sub_812D588(struct Sprite *sprite); +static void sub_812DEAC(struct Sprite *sprite); +static void sub_812D724(struct Sprite *sprite); +static void sub_812E4F0(struct Sprite *sprite); +static void sub_812E7A0(struct Sprite *sprite); +static void sub_812EA4C(struct Sprite *sprite); +static void sub_812EC78(struct Sprite *sprite); +static void sub_812ED84(struct Sprite *sprite); +static void sub_812EEA4(struct Sprite *sprite); +static void sub_812F88C(struct Sprite *sprite); +static void sub_812F948(struct Sprite *sprite); +static void sub_812FF94(struct Sprite *sprite); +static void sub_81300F4(struct Sprite *sprite); +static void sub_81304DC(struct Sprite *sprite); +static void sub_813051C(struct Sprite *sprite); +static void sub_81307B0(struct Sprite *sprite); +static void sub_8130A2C(struct Sprite *sprite); +static void sub_8130AEC(struct Sprite *sprite); +static void sub_8130F5C(struct Sprite *sprite); +static void sub_8131264(struct Sprite *sprite); +extern void sub_80D1FDC(struct Sprite *sprite);// kiss_fountain.c +static void sub_8131564(struct Sprite *sprite); + +/*static*/ void sub_8131EB8(struct Sprite *sprite);// rest not yet decompiled +/*static*/ void sub_8132370(struct Sprite *sprite); +/*static*/ void sub_81323E0(struct Sprite *sprite); const union AnimCmd gSpriteAnim_8402164[] = { @@ -127,8 +150,6 @@ const union AnimCmd gSpriteAnim_8402164[] = ANIMCMD_END, }; -/* - const union AnimCmd *const gSpriteAnimTable_840217C[] = { gSpriteAnim_8402164, @@ -430,7 +451,6 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84023E8 = .callback = sub_812CCE8, }; -// wat const union AffineAnimCmd gUnknown_08402400[] = { AFFINEANIMCMD_FRAME(-12, 8, 0, 4), @@ -481,9 +501,9 @@ const union AnimCmd gSpriteAnim_8402470[] = ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(32, 3), ANIMCMD_FRAME(48, 3), - ANIMCMD_FRAME(32, 3, OBJ_IMAGE_ANIM_H_FLIP), - ANIMCMD_FRAME(16, 3, OBJ_IMAGE_ANIM_H_FLIP), - ANIMCMD_FRAME(0, 3, OBJ_IMAGE_ANIM_H_FLIP), + ANIMCMD_FRAME(32, 3, .hFlip = TRUE), + ANIMCMD_FRAME(16, 3, .hFlip = TRUE), + ANIMCMD_FRAME(0, 3, .hFlip = TRUE), ANIMCMD_LOOP(1), ANIMCMD_END, }; @@ -504,13 +524,12 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_8402498 = .callback = sub_80793C4, }; -// unknwon const union AffineAnimCmd gUnknown_084024B0[] = { AFFINEANIMCMD_FRAME(-12, 20, 0, 8), AFFINEANIMCMD_FRAME(12, -20, 0, 8), AFFINEANIMCMD_LOOP(2), - AFFINEANIMCMD_END,// 0? + AFFINEANIMCMD_END, }; const struct SpriteTemplate gBattleAnimSpriteTemplate_84024D0 = @@ -552,7 +571,7 @@ const union AffineAnimCmd gUnknown_08402518[] = AFFINEANIMCMD_FRAME(-16, 16, 0, 12), AFFINEANIMCMD_FRAME(8, -8, 0, 12), AFFINEANIMCMD_LOOP(1), - AFFINEANIMCMD_END, //0 + AFFINEANIMCMD_END, }; const union AffineAnimCmd gUnknown_08402540[] = @@ -563,7 +582,7 @@ const union AffineAnimCmd gUnknown_08402540[] = AFFINEANIMCMD_FRAME(-18, -18, 0, 3), AFFINEANIMCMD_FRAME(0, 0, 0, 15), AFFINEANIMCMD_FRAME(4, 4, 0, 13), - AFFINEANIMCMD_END,//0 + AFFINEANIMCMD_END, }; const struct SpriteTemplate gBattleAnimSpriteTemplate_8402578 = @@ -584,7 +603,7 @@ const union AffineAnimCmd gUnknown_08402590[] = AFFINEANIMCMD_FRAME(7, -30, 0, 6), AFFINEANIMCMD_FRAME(0, 0, 0, 20), AFFINEANIMCMD_FRAME(-2, 3, 0, 20), - AFFINEANIMCMD_END,//0 + AFFINEANIMCMD_END, }; const s8 gUnknown_084025C0[] = @@ -654,7 +673,7 @@ const union AffineAnimCmd gUnknown_08402610[] = AFFINEANIMCMD_FRAME(0, -15, 0, 7), AFFINEANIMCMD_FRAME(0, 15, 0, 7), AFFINEANIMCMD_LOOP(2), - AFFINEANIMCMD_END,//0 + AFFINEANIMCMD_END, }; const struct SpriteTemplate gBattleAnimSpriteTemplate_8402630 = @@ -674,23 +693,23 @@ const union AnimCmd gSpriteAnim_8402648[] = ANIMCMD_FRAME(1, 8), ANIMCMD_FRAME(2, 8), ANIMCMD_FRAME(3, 8), - ANIMCMD_FRAME(3, 8, OBJ_IMAGE_ANIM_V_FLIP), - ANIMCMD_FRAME(2, 8, OBJ_IMAGE_ANIM_V_FLIP), - ANIMCMD_FRAME(0, 8, OBJ_IMAGE_ANIM_V_FLIP), - ANIMCMD_FRAME(1, 8, OBJ_IMAGE_ANIM_V_FLIP), + ANIMCMD_FRAME(3, 8, .vFlip = TRUE), + ANIMCMD_FRAME(2, 8, .vFlip = TRUE), + ANIMCMD_FRAME(0, 8, .vFlip = TRUE), + ANIMCMD_FRAME(1, 8, .vFlip = TRUE), ANIMCMD_JUMP(0), }; const union AnimCmd gSpriteAnim_840266C[] = { - ANIMCMD_FRAME(0, 8, OBJ_IMAGE_ANIM_H_FLIP), - ANIMCMD_FRAME(1, 8, OBJ_IMAGE_ANIM_H_FLIP), - ANIMCMD_FRAME(2, 8, OBJ_IMAGE_ANIM_H_FLIP), - ANIMCMD_FRAME(3, 8, OBJ_IMAGE_ANIM_H_FLIP), - ANIMCMD_FRAME(3, 8, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP), - ANIMCMD_FRAME(2, 8, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP), - ANIMCMD_FRAME(0, 8, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP), - ANIMCMD_FRAME(1, 8, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP), + ANIMCMD_FRAME(0, 8, .hFlip = TRUE), + ANIMCMD_FRAME(1, 8, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .hFlip = TRUE), + ANIMCMD_FRAME(3, 8, .hFlip = TRUE), + ANIMCMD_FRAME(3, 8, .vFlip = TRUE, .hFlip = TRUE), + ANIMCMD_FRAME(2, 8, .vFlip = TRUE, .hFlip = TRUE), + ANIMCMD_FRAME(0, 8, .vFlip = TRUE, .hFlip = TRUE), + ANIMCMD_FRAME(1, 8, .vFlip = TRUE, .hFlip = TRUE), ANIMCMD_JUMP(0), }; @@ -718,9 +737,6 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_84026A4 = .callback = sub_812E7A0, }; -//@ probably unknown palette -// .incbin "graphics/unknown/unknown_4026BC.gbapal" -// or maybe asm(.incbin "graphics/unknown/unknown_4026BC.gbapal") const u16 gUnknown_4026BC[] = INCBIN_U16("graphics/unknown/unknown_4026BC.gbapal"); const union AnimCmd gSpriteAnim_84026DC[] = @@ -787,7 +803,7 @@ const union AffineAnimCmd gUnknown_08402750[] = AFFINEANIMCMD_FRAME(4, 0, 0, 4), AFFINEANIMCMD_FRAME(0, 0, 0, 24), AFFINEANIMCMD_FRAME(-5, 3, 0, 16), - AFFINEANIMCMD_END,//0 + AFFINEANIMCMD_END, }; const union AffineAnimCmd gSpriteAffineAnim_8402780[] = @@ -888,7 +904,7 @@ const union AffineAnimCmd gUnknown_084028AC[] = AFFINEANIMCMD_FRAME(-16, 16, 0, 6), AFFINEANIMCMD_FRAME(16, -16, 0, 12), AFFINEANIMCMD_FRAME(-16, 16, 0, 6), - AFFINEANIMCMD_END,//0 + AFFINEANIMCMD_END, }; const struct SpriteTemplate gSpriteTemplate_84028CC = @@ -902,8 +918,7 @@ const struct SpriteTemplate gSpriteTemplate_84028CC = .callback = sub_812FF94, }; -// s16? -const s16 gUnknown_084028E4[] = INCBIN_S16("graphics/battle_anims/sprites/effect.gbapal"); +const u16 gUnknown_084028E4[] = INCBIN_U16("graphics/battle_anims/sprites/effect.gbapal"); const union AnimCmd gSpriteAnim_8402914[] = { @@ -1135,7 +1150,7 @@ const union AffineAnimCmd gSpriteAffineAnim_8402AFC[] = const union AffineAnimCmd *const gSpriteAffineAnimTable_8402B0C[] = { gSpriteAffineAnim_8402AFC, -} +}; const struct SpriteTemplate gBattleAnimSpriteTemplate_8402B10 = { @@ -1155,12 +1170,10 @@ const union AffineAnimCmd gUnknown_08402B28[] = AFFINEANIMCMD_FRAME(0, 4, 0, 4), AFFINEANIMCMD_FRAME(0, 0, 0, 24), AFFINEANIMCMD_FRAME(1, -5, 0, 16), - AFFINEANIMCMD_END,//0 + AFFINEANIMCMD_END, }; -*/ - -void sub_812C144(struct Sprite *sprite) +static void sub_812C144(struct Sprite *sprite) { sprite->pos1.x += gBattleAnimArgs[0]; sprite->pos1.y += gBattleAnimArgs[1]; @@ -1199,7 +1212,7 @@ void sub_812C1D0(u8 taskId) } -void sub_812C220(struct Sprite *sprite) +static void sub_812C220(struct Sprite *sprite) { sprite->data[0] = 90; sprite->callback = WaitAnimForDuration; @@ -1226,7 +1239,7 @@ static void sub_812C2A4(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_812C2BC(struct Sprite *sprite) +static void sub_812C2BC(struct Sprite *sprite) { u16 rotation; u8 x = GetBattlerSpriteCoord(gAnimBankTarget, 2); @@ -1248,7 +1261,7 @@ void sub_812C2BC(struct Sprite *sprite) StoreSpriteCallbackInData(sprite, DestroyAnimSprite); } -void sub_812C358(struct Sprite *sprite) +static void sub_812C358(struct Sprite *sprite) { REG_BLDCNT = 0x3F40; REG_BLDALPHA = 0x1000; @@ -1408,7 +1421,7 @@ static void sub_812C64C(u8 taskId) DestroyTask(taskId); } -void sub_812C720(struct Sprite *sprite) +static void sub_812C720(struct Sprite *sprite) { u16 x; u16 y; @@ -1448,7 +1461,7 @@ static void sub_812C7C8(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_812C80C(struct Sprite *sprite) +static void sub_812C80C(struct Sprite *sprite) { sub_8078650(sprite); sub_807867C(sprite, gBattleAnimArgs[0]); @@ -1458,7 +1471,7 @@ void sub_812C80C(struct Sprite *sprite) } // This is likely fakematching due to some strange type casting behavior. -void sub_812C848(struct Sprite *sprite) +static void sub_812C848(struct Sprite *sprite) { int var0; int var1; @@ -1501,7 +1514,7 @@ void sub_812C848(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_812C908(struct Sprite *sprite) +static void sub_812C908(struct Sprite *sprite) { if (sprite->animEnded) DestroyAnimSprite(sprite); @@ -1527,7 +1540,7 @@ void sub_812C960(u8 taskId) DestroyAnimVisualTask(taskId); } -void sub_812C990(struct Sprite *sprite) +static void sub_812C990(struct Sprite *sprite) { REG_WINOUT = 0x1F3F; REG_DISPCNT |= DISPCNT_OBJWIN_ON; @@ -1592,7 +1605,7 @@ static void sub_812CAD0(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_812CAFC(struct Sprite *sprite) +static void sub_812CAFC(struct Sprite *sprite) { if (gBattleAnimArgs[3] == 0) { @@ -1653,7 +1666,7 @@ static void sub_812CBB4(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_812CC28(struct Sprite *sprite) +static void sub_812CC28(struct Sprite *sprite) { sprite->oam.objMode = ST_OAM_OBJ_WINDOW; sprite->data[3] = 255; @@ -1686,7 +1699,7 @@ void sub_812CCA8(u8 taskId) DestroyAnimVisualTask(taskId); } -void sub_812CCE8(struct Sprite *sprite) +static void sub_812CCE8(struct Sprite *sprite) { int var0; if (gBattleAnimArgs[0] == 0) @@ -1997,7 +2010,7 @@ static void sub_812D254(struct Sprite *sprite) } } -void sub_812D294(struct Sprite *sprite) +static void sub_812D294(struct Sprite *sprite) { if (sprite->data[0] == 0) InitAnimSpritePos(sprite, 0); @@ -2044,7 +2057,7 @@ void sub_812D350(u8 taskId) } } -void sub_812D3AC(struct Sprite *sprite) +static void sub_812D3AC(struct Sprite *sprite) { u8 spriteId = GetAnimBattlerSpriteId(0); @@ -2087,7 +2100,7 @@ void sub_812D3AC(struct Sprite *sprite) } } -void sub_812D4B4(struct Sprite *sprite) +static void sub_812D4B4(struct Sprite *sprite) { if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) sprite->pos1.x = -16; @@ -2125,7 +2138,7 @@ static void sub_812D4EC(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_812D588(struct Sprite *sprite) +static void sub_812D588(struct Sprite *sprite) { u8 rand; s8 y; @@ -2200,7 +2213,7 @@ void sub_812D6CC(u8 taskId) } } -void sub_812D724(struct Sprite *sprite) +static void sub_812D724(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -2456,7 +2469,7 @@ void sub_812DB84(u8 taskId) } } -void sub_812DEAC(struct Sprite *sprite) +static void sub_812DEAC(struct Sprite *sprite) { s16 var0; u8 spriteId1; @@ -2677,7 +2690,7 @@ void sub_812E498(u8 taskId) } } -void sub_812E4F0(struct Sprite *sprite) +static void sub_812E4F0(struct Sprite *sprite) { if (sprite->data[0] == 0) { @@ -2794,7 +2807,7 @@ static void sub_812E638(u8 taskId) } } -void sub_812E7A0(struct Sprite *sprite) +static void sub_812E7A0(struct Sprite *sprite) { if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_PLAYER) { @@ -2925,7 +2938,7 @@ static void sub_812E8B4(u8 taskId) } } -void sub_812EA4C(struct Sprite *sprite) +static void sub_812EA4C(struct Sprite *sprite) { if (sprite->data[0] == 0) { @@ -3016,7 +3029,7 @@ void sub_812EB10(u8 taskId) } } -void sub_812EC78(struct Sprite *sprite) +static void sub_812EC78(struct Sprite *sprite) { u8 tileOffset; int rand1; @@ -3069,7 +3082,7 @@ static void sub_812ED24(struct Sprite *sprite) DestroyAnimSprite(sprite); } -void sub_812ED84(struct Sprite *sprite) +static void sub_812ED84(struct Sprite *sprite) { REG_WINOUT = 0x1F3F; REG_DISPCNT |= DISPCNT_OBJWIN_ON; @@ -3116,7 +3129,7 @@ static void sub_812EE00(struct Sprite *sprite) } } -void sub_812EEA4(struct Sprite *sprite) +static void sub_812EEA4(struct Sprite *sprite) { sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 2); sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 3); @@ -3799,7 +3812,7 @@ void sub_812F86C(struct Sprite *sprite) sprite->pos1.y = sprite->data[5] >> 4; } -void sub_812F88C(struct Sprite *sprite) +static void sub_812F88C(struct Sprite *sprite) { s16 x = sprite->pos1.x; s16 y = sprite->pos1.y; @@ -3832,7 +3845,7 @@ static void sub_812F8DC(struct Sprite *sprite) } } -void sub_812F948(struct Sprite *sprite) +static void sub_812F948(struct Sprite *sprite) { sprite->data[0] = gBattleAnimArgs[3]; StartSpriteAffineAnim(sprite, gBattleAnimArgs[0]); @@ -4081,7 +4094,7 @@ static void sub_812FEB8(u8 taskId, bool8 arg1) } } -void sub_812FF94(struct Sprite *sprite) +static void sub_812FF94(struct Sprite *sprite) { sprite->pos1.x += sprite->data[1]; sprite->pos1.y += sprite->data[2]; @@ -4136,7 +4149,7 @@ void sub_81300A4(u8 taskId) gUnknown_08D2E150); } -void sub_81300F4(struct Sprite *sprite) +static void sub_81300F4(struct Sprite *sprite) { if (GetBattlerSide(gAnimBankAttacker) == B_SIDE_OPPONENT) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; @@ -4301,7 +4314,7 @@ static void sub_8130424(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u8 arg4, u8 arg5 *y = y2 >> 8; } -void sub_81304DC(struct Sprite *sprite) +static void sub_81304DC(struct Sprite *sprite) { if (++sprite->data[0] > 36) { @@ -4310,7 +4323,7 @@ void sub_81304DC(struct Sprite *sprite) } } -void sub_813051C(struct Sprite *sprite) +static void sub_813051C(struct Sprite *sprite) { sprite->pos1.x = gBattleAnimArgs[0]; sprite->pos1.y = gBattleAnimArgs[1]; @@ -4391,7 +4404,7 @@ static void sub_81306A4(u8 taskId) } } -void sub_81307B0(struct Sprite *sprite) +static void sub_81307B0(struct Sprite *sprite) { u8 battler; @@ -4507,7 +4520,7 @@ static void sub_8130970(u8 taskId) } } -void sub_8130A2C(struct Sprite *sprite) +static void sub_8130A2C(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { @@ -4542,7 +4555,7 @@ static void sub_8130A94(struct Sprite *sprite) } } -void sub_8130AEC(struct Sprite *sprite) +static void sub_8130AEC(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { @@ -4757,7 +4770,7 @@ static void sub_8130DBC(u8 taskId) } } -void sub_8130F5C(struct Sprite *sprite) +static void sub_8130F5C(struct Sprite *sprite) { if (gBattleAnimArgs[0] == 0) { @@ -4897,7 +4910,7 @@ static void sub_81311E4(struct Sprite *sprite) sprite->data[5]++; } -void sub_8131264(struct Sprite *sprite) +static void sub_8131264(struct Sprite *sprite) { GetBattlerSpriteCoord(gAnimBankTarget, 2); // unused local variable GetBattlerSpriteCoord(gAnimBankTarget, 3); // unused local variable @@ -5015,7 +5028,7 @@ static void sub_8131408(u8 taskId) } } -void sub_8131564(struct Sprite *sprite) +static void sub_8131564(struct Sprite *sprite) { s16 y2; |