battle anim file is decompiled

This commit is contained in:
DizzyEggg 2017-10-15 23:21:59 +02:00
parent ebb2999c03
commit dd0f19476c
13 changed files with 911 additions and 1458 deletions

File diff suppressed because it is too large Load Diff

View File

@ -26,9 +26,9 @@ sub_80A9C70: @ 80A9C70
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, =gUnknown_08524F84
ldr r0, =gBattleAnimPicTable + 0x440
bl LoadCompressedObjectPicUsingHeap
ldr r0, =gUnknown_0852588C
ldr r0, =gBattleAnimPaletteTable + 0x440
bl LoadCompressedObjectPaletteUsingHeap
ldr r1, =gTasks
mov r2, r8

View File

@ -732,7 +732,7 @@ _080FEE36:
_080FEE3E:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -8335,7 +8335,7 @@ _08102A9A:
str r0, [r6]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -8376,7 +8376,7 @@ sub_8102AE0: @ 8102AE0
bne _08102B32
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -12777,7 +12777,7 @@ sub_8104E74: @ 8104E74
bl sub_80A861C
strh r0, [r5, 0x26]
ldrb r0, [r4]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -33069,7 +33069,7 @@ _0810F22E:
lsrs r4, r0, 24
adds r7, r4, 0
adds r0, r4, 0
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@ -33445,7 +33445,7 @@ sub_810F524: @ 810F524
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@ -34592,7 +34592,7 @@ _0810FE86:
_0810FE92:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -38512,7 +38512,7 @@ sub_8111E78: @ 8111E78
adds r5, r0, r1
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r6, r0, 24
movs r1, 0x26
@ -38866,7 +38866,7 @@ sub_8112170: @ 8112170
adds r4, r0, r1
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r6, r0, 24
movs r1, 0x26
@ -41108,7 +41108,7 @@ sub_81133E8: @ 81133E8
adds r4, r1, r0
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -41480,7 +41480,7 @@ sub_81136E8: @ 81136E8
movs r0, 0x52
bl SetGpuReg
adds r0, r4, 0
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -41663,7 +41663,7 @@ sub_8113888: @ 8113888
bl SetGpuReg
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -42098,7 +42098,7 @@ _08113C1E:
strh r0, [r5, 0x18]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0xE]
@ -42417,7 +42417,7 @@ _08113EBC:
_08113EF8:
ldr r0, =gAnimBankTarget
ldrb r0, [r0]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0xE]
@ -43016,7 +43016,7 @@ sub_81143C0: @ 81143C0
mov r10, r0
ldr r6, =gAnimBankAttacker
ldrb r0, [r6]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@ -43093,7 +43093,7 @@ sub_8114470: @ 8114470
lsrs r6, r0, 24
ldr r4, =gAnimBankAttacker
ldrb r0, [r4]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@ -44098,7 +44098,7 @@ _08114D3C:
strh r0, [r4, 0x1C]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1E]
@ -44291,7 +44291,7 @@ sub_8114EB4: @ 8114EB4
strh r4, [r1, 0x26]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -44444,7 +44444,7 @@ _08115018:
strh r0, [r4, 0x1C]
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1E]

View File

@ -1629,7 +1629,7 @@ _0815ADDE:
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r7, r0, 24
adds r0, r6, 0
@ -2935,7 +2935,7 @@ _0815B81C:
bl SetGpuReg
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -3211,7 +3211,7 @@ _0815BA82:
bl SetGpuReg
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -6123,7 +6123,7 @@ _0815D2B4:
lsrs r0, 24
strh r0, [r4, 0x26]
adds r0, r5, 0
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -6218,7 +6218,7 @@ sub_815D398: @ 815D398
ldr r1, =gTasks
adds r6, r0, r1
ldrb r0, [r6, 0x12]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1

View File

@ -4951,7 +4951,7 @@ _08172DC0:
_08172DC6:
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -5134,9 +5134,9 @@ _08172F4E:
lsrs r0, 16
cmp r0, r7
bne _08172F6E
ldr r0, =gUnknown_0852528C
ldr r0, =gBattleAnimPicTable + 0x748
bl LoadCompressedObjectPicUsingHeap
ldr r0, =gUnknown_08525B94
ldr r0, =gBattleAnimPaletteTable + 0x748
bl LoadCompressedObjectPaletteUsingHeap
_08172F6E:
ldr r5, =sub_8172FEC
@ -5533,9 +5533,9 @@ sub_81732B0: @ 81732B0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_085253AC
ldr r0, =gBattleAnimPicTable + 0x868
bl LoadCompressedObjectPicUsingHeap
ldr r0, =gUnknown_08525CB4
ldr r0, =gBattleAnimPaletteTable + 0x868
bl LoadCompressedObjectPaletteUsingHeap
ldr r0, =0x0000281d
bl IndexOfSpritePaletteTag

View File

@ -36,7 +36,7 @@ sub_8158B30: @ 8158B30
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x2
bl sub_80A5314
bl CalculatePanIncrement
strh r4, [r6, 0xC]
strh r5, [r6, 0xE]
lsls r0, 24
@ -193,7 +193,7 @@ mas_80DCF38: @ 8158C58
adds r0, r4, 0
adds r1, r5, 0
adds r2, r6, 0
bl sub_80A5314
bl CalculatePanIncrement
ldr r2, =gTasks
mov r3, r8
lsls r1, r3, 2
@ -924,7 +924,7 @@ sub_8159278: @ 8159278
adds r0, r4, 0
adds r1, r5, 0
adds r2, r6, 0
bl sub_80A5314
bl CalculatePanIncrement
ldr r2, =gTasks
mov r3, r8
lsls r1, r3, 2

View File

@ -1958,9 +1958,9 @@ task_intro_13: @ 816DD28
ldr r0, =gUnknown_08D8A818
ldr r1, =0x0600e000
bl LZDecompressVram
ldr r0, =gUnknown_08524D14
ldr r0, =gBattleAnimPicTable + 0x1D0
bl LoadCompressedObjectPicUsingHeap
ldr r0, =gUnknown_0852561C
ldr r0, =gBattleAnimPaletteTable + 0x1D0
bl LoadCompressedObjectPaletteUsingHeap
ldr r0, =gUnknown_08D85CD0
ldr r1, =gPlttBufferUnfaded

View File

@ -2063,7 +2063,7 @@ sub_80A6BFC: @ 80A6BFC
_080A6C30:
ldr r0, =gAnimBankAttacker
ldrb r0, [r0]
bl GetBankIdentity_permutated
bl sub_80A8364
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x1
@ -5083,8 +5083,8 @@ _080A835C:
bx r1
thumb_func_end sub_80A8328
thumb_func_start GetBankIdentity_permutated
GetBankIdentity_permutated: @ 80A8364
thumb_func_start sub_80A8364
sub_80A8364: @ 80A8364
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@ -5109,7 +5109,7 @@ _080A838C:
pop {r4}
pop {r1}
bx r1
thumb_func_end GetBankIdentity_permutated
thumb_func_end sub_80A8364
thumb_func_start sub_80A8394
sub_80A8394: @ 80A8394

View File

@ -353,9 +353,6 @@ gBattleAnimPicTable:: @ 8524B44
obj_tiles 0x08c0a8bc, 0x0200, 0x2747
obj_tiles 0x08c0a3ec, 0x1000, 0x2748
obj_tiles 0x08c0a980, 0x0180, 0x2749
.align 2
gUnknown_08524D14:: @ 8524D14
obj_tiles 0x08c0aa2c, 0x0c00, 0x274a
obj_tiles 0x08c0aebc, 0x0100, 0x274b
obj_tiles 0x08c0af38, 0x0040, 0x274c
@ -434,9 +431,6 @@ gUnknown_08524D14:: @ 8524D14
obj_tiles 0x08c14b78, 0x0100, 0x2795
obj_tiles 0x08c14c1c, 0x0200, 0x2796
obj_tiles 0x08c1a3a0, 0x0200, 0x2797
.align 2
gUnknown_08524F84:: @ 8524F84
obj_tiles 0x08c1a540, 0x0020, 0x2798
obj_tiles 0x08c1a58c, 0x0a00, 0x2799
obj_tiles 0x08c1ab40, 0x0800, 0x279a
@ -534,9 +528,6 @@ gUnknown_08524F84:: @ 8524F84
obj_tiles 0x08c258b8, 0x0800, 0x27f6
obj_tiles 0x08c28394, 0x0380, 0x27f7
obj_tiles 0x08c27e34, 0x0800, 0x27f8
.align 2
gUnknown_0852528C:: @ 852528C
obj_tiles 0x08c28564, 0x00c0, 0x27f9
obj_tiles 0x08c28610, 0x0800, 0x27fa
obj_tiles 0x08c28880, 0x0060, 0x27fb
@ -573,9 +564,6 @@ gUnknown_0852528C:: @ 852528C
obj_tiles 0x08d93b9c, 0x0080, 0x281a
obj_tiles 0x08c2407c, 0x0800, 0x281b
obj_tiles 0x08d8ea54, 0x0020, 0x281c
.align 2
gUnknown_085253AC:: @ 85253AC
obj_tiles 0x08d8ef2c, 0x0080, 0x281d
obj_tiles 0x08dba378, 0x0400, 0x281e
obj_tiles 0x08dba4b8, 0x0080, 0x281f
@ -657,9 +645,6 @@ gBattleAnimPaletteTable:: @ 852544C
obj_pal 0x08c09fd8, 0x2747
obj_pal 0x08c0a894, 0x2748
obj_pal 0x08c0aa08, 0x2749
.align 2
gUnknown_0852561C:: @ 852561C
obj_pal 0x08c0ae94, 0x274a
obj_pal 0x08c0af1c, 0x274b
obj_pal 0x08c0af60, 0x274c
@ -738,9 +723,6 @@ gUnknown_0852561C:: @ 852561C
obj_pal 0x08c14bf4, 0x2795
obj_pal 0x08c14bf4, 0x2796
obj_pal 0x08c1a478, 0x2797
.align 2
gUnknown_0852588C:: @ 852588C
obj_pal 0x08c1a564, 0x2798
obj_pal 0x08c1a478, 0x2799
obj_pal 0x08c1a478, 0x279a
@ -838,9 +820,6 @@ gUnknown_0852588C:: @ 852588C
obj_pal 0x08c25890, 0x27f6
obj_pal 0x08c2836c, 0x27f7
obj_pal 0x08c2836c, 0x27f8
.align 2
gUnknown_08525B94:: @ 8525B94
obj_pal 0x08c285e8, 0x27f9
obj_pal 0x08c287d0, 0x27fa
obj_pal 0x08c288d0, 0x27fb
@ -877,9 +856,6 @@ gUnknown_08525B94:: @ 8525B94
obj_pal 0x08d93bdc, 0x281a
obj_pal 0x08d93bf4, 0x281b
obj_pal 0x08d93c0c, 0x281c
.align 2
gUnknown_08525CB4:: @ 8525CB4
obj_pal 0x08d8ef80, 0x281d
obj_pal 0x08dba35c, 0x281e
obj_pal 0x08dba4a0, 0x281f
@ -930,105 +906,3 @@ gBattleAnimBackgroundTable:: @ 8525D54
.4byte 0x08c25bec, 0x08d91074, 0x08c26958
.4byte 0x08c25bec, 0x08d91074, 0x08c26e54
.4byte 0x08c25bec, 0x08d91074, 0x08c27324
.align 2
sScriptCmdTable:: @ 8525E98
.4byte ScriptCmd_loadspritegfx
.4byte ScriptCmd_unloadspritegfx
.4byte ScriptCmd_createsprite
.4byte ScriptCmd_createvisualtask
.4byte ScriptCmd_delay
.4byte ScriptCmd_waitforvisualfinish
.4byte ScriptCmd_hang1
.4byte ScriptCmd_hang2
.4byte ScriptCmd_end
.4byte ScriptCmd_playse
.4byte ScriptCmd_monbg
.4byte ScriptCmd_clearmonbg
.4byte ScriptCmd_setalpha
.4byte ScriptCmd_blendoff
.4byte ScriptCmd_call
.4byte ScriptCmd_return
.4byte ScriptCmd_setarg
.4byte ScriptCmd_choosetwoturnanim
.4byte ScriptCmd_jumpifmoveturn
.4byte ScriptCmd_jump
.4byte ScriptCmd_fadetobg
.4byte ScriptCmd_restorebg
.4byte ScriptCmd_waitbgfadeout
.4byte ScriptCmd_waitbgfadein
.4byte ScriptCmd_changebg
.4byte ScriptCmd_playsewithpan
.4byte ScriptCmd_setpan
.4byte ma1B_8073C2C
.4byte ma1C_8073ED0
.4byte ma1D_08073FB4
.4byte ScriptCmd_setbldcnt
.4byte sub_80A57F8
.4byte ma20_wait_for_something
.4byte ma21_08074164
.4byte ScriptCmd_monbg_22
.4byte ScriptCmd_clearmonbg_23
.4byte sub_80A5944
.4byte ScriptCmd_fadetobgfromset
.4byte sub_80A5508
.4byte sub_80A559C
.4byte sub_80A5984
.4byte sub_80A59DC
.4byte sub_80A5A0C
.4byte ma2B_make_side_invisible
.4byte ma2C_make_side_visible
.4byte sub_80A5AFC
.4byte sub_80A5BAC
.4byte ma2F_stop_music
.align 2
gUnknown_08525F58:: @ 8525F58
.byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00
.byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00
.byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00
.byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00
.align 2
gCastformFrontSpriteCoords:: @ 8525F78
.byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00
.byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00
.align 2
gUnknown_08525F88:: @ 8525F88
.byte 0x0d, 0x0e, 0x0d, 0x0d
.align 2
gUnknown_08525F8C:: @ 8525F8C
.byte 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_08525F90:: @ 8525F90
spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08525FC0:: @ 8525FC0
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756
.align 2
@ the mother of all baserom includes
.incbin "baserom.gba", 0x525fd0, 0x18f60
.align 2
gUnknown_0853EF30:: @ 853EF30
.byte 0xf0, 0xf0, 0x0c, 0x80, 0xf0, 0x30, 0x0d, 0x84, 0x30, 0xf0, 0x0e, 0x86, 0x30, 0x30, 0x08, 0x88
.align 2
gUnknown_0853EF40:: @ 853EF40
.4byte 0x00000004, gUnknown_0853EF30
.align 2
gUnknown_0853EF48:: @ 853EF48
spr_template 0x271a, 0x271a, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0853EF60:: @ 853EF60
spr_template 0x2798, 0x2798, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9E44

57
data/rom_8525F58.s Normal file
View File

@ -0,0 +1,57 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_08525F58:: @ 8525F58
.byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00
.byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00
.byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00
.byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00
.align 2
gCastformFrontSpriteCoords:: @ 8525F78
.byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00
.byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00
.align 2
gUnknown_08525F88:: @ 8525F88
.byte 0x0d, 0x0e, 0x0d, 0x0d
.align 2
gUnknown_08525F8C:: @ 8525F8C
.byte 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_08525F90:: @ 8525F90
spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_08525FC0:: @ 8525FC0
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755
obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756
.align 2
@ the mother of all baserom includes
.incbin "baserom.gba", 0x525fd0, 0x18f60
.align 2
gUnknown_0853EF30:: @ 853EF30
.byte 0xf0, 0xf0, 0x0c, 0x80, 0xf0, 0x30, 0x0d, 0x84, 0x30, 0xf0, 0x0e, 0x86, 0x30, 0x30, 0x08, 0x88
.align 2
gUnknown_0853EF40:: @ 853EF40
.4byte 0x00000004, gUnknown_0853EF30
.align 2
gUnknown_0853EF48:: @ 853EF48
spr_template 0x271a, 0x271a, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0853EF60:: @ 853EF60
spr_template 0x2798, 0x2798, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9E44

View File

@ -37,6 +37,24 @@ struct BattleAnimBackground
void *tilemap;
};
#define ANIM_ARGS_COUNT 8
extern void (*gAnimScriptCallback)(void);
extern bool8 gAnimScriptActive;
extern u8 gAnimVisualTaskCount;
extern u8 gAnimSoundTaskCount;
extern struct DisableStruct *gAnimDisableStructPtr;
extern u32 gAnimMoveDmg;
extern u16 gAnimMovePower;
extern u8 gAnimFriendship;
extern u16 gWeatherMoveAnim;
extern s16 gBattleAnimArgs[ANIM_ARGS_COUNT];
extern u8 gAnimMoveTurn;
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
extern u16 gAnimSpeciesByBanks[BATTLE_BANKS_COUNT];
extern u8 gUnknown_02038440;
void ClearBattleAnimationVars(void);
void DoMoveAnim(u16 move);
void DoBattleAnim(const u8 *const animsTable[], u16 tableId, bool8 isMoveAnim);
@ -49,7 +67,7 @@ bool8 IsContest(void);
s8 BattleAnimAdjustPanning(s8 pan);
s8 BattleAnimAdjustPanning2(s8 pan);
s16 sub_80A52EC(s16 a);
s16 sub_80A5314(s16 a, s16 b, s16 c);
s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan);
// battle_anim_80FE840.s
void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value);

View File

@ -114,7 +114,6 @@ SECTIONS {
src/palette.o(.text);
src/sound.o(.text);
src/battle_anim.o(.text);
asm/battle_anim.o(.text);
asm/rom_80A5C6C.o(.text);
src/task.o(.text);
src/reshow_battle_screen.o(.text);
@ -364,6 +363,8 @@ SECTIONS {
src/palette.o(.rodata);
data/fanfares.o(.rodata);
data/battle_anims.o(.rodata);
src/battle_anim.o(.rodata);
data/rom_8525F58.o(.rodata);
data/title_screen.o(.rodata);
data/field_screen.o(.rodata);
data/battle_setup.o(.rodata);

File diff suppressed because it is too large Load Diff