decomp mapanim_staffeffect

This commit is contained in:
MokhaLeee 2024-03-04 09:33:22 +00:00
parent 4c0954df90
commit ba2a5bbb05
20 changed files with 1370 additions and 3147 deletions

File diff suppressed because it is too large Load Diff

View File

@ -332,7 +332,7 @@ sub_8080498: @ 0x08080498
mov r1, r9
movs r2, #0
movs r3, #0
bl sub_800159C
bl AddAttr2dBitMap
movs r0, #4
bl BG_EnableSyncByMask
movs r2, #4
@ -401,7 +401,7 @@ sub_8080530: @ 0x08080530
adds r1, r4, #0
movs r2, #0
movs r3, #0
bl sub_800159C
bl AddAttr2dBitMap
movs r0, #4
bl BG_EnableSyncByMask
add sp, #4
@ -1585,7 +1585,7 @@ _08080E3A:
str r0, [sp]
adds r0, r1, #0
adds r1, r6, #0
bl sub_800159C
bl AddAttr2dBitMap
movs r0, #4
bl BG_EnableSyncByMask
ldrh r0, [r5]
@ -1782,7 +1782,7 @@ _08080FBE:
str r0, [sp]
adds r0, r1, #0
adds r1, r6, #0
bl sub_800159C
bl AddAttr2dBitMap
movs r0, #4
bl BG_EnableSyncByMask
ldrh r0, [r5]
@ -1999,7 +1999,7 @@ _08081160:
str r0, [sp]
adds r0, r1, #0
adds r1, r6, #0
bl sub_800159C
bl AddAttr2dBitMap
movs r0, #4
bl BG_EnableSyncByMask
ldrh r0, [r5]

View File

@ -1,21 +1,5 @@
.section .rodata
.global gUnknown_08205824
gUnknown_08205824: @ 0x08205824
.incbin "baserom.gba", 0x205824, 0xF
.global gUnknown_08205833
gUnknown_08205833: @ 0x08205833
.incbin "baserom.gba", 0x205833, 0x13
.global gUnknown_08205846
gUnknown_08205846: @ 0x08205846
.incbin "baserom.gba", 0x205846, 0xF
.global gUnknown_08205855
gUnknown_08205855: @ 0x08205855
.incbin "baserom.gba", 0x205855, 0x2F
.global gUnknown_08205884
gUnknown_08205884: @ 0x08205884
.incbin "baserom.gba", 0x205884, 0x8

View File

@ -1,7 +1,7 @@
.section .data
.global gUnknown_089A52FC
gUnknown_089A52FC: @ 0x089A52FC
.global ProcScr_ManimShiftingSineWaveScanlineBuf
ProcScr_ManimShiftingSineWaveScanlineBuf: @ 0x089A52FC
@ PROC_CALL
.short 0x2, 0x0
.word sub_80825B0
@ -21,8 +21,8 @@ SpriteAnim_ManimStatGain: @ 0x089A5314
gUnknown_089A5A6C: @ 0x089A5A6C
.incbin "baserom.gba", 0x9A5A6C, 0x78C
.global gUnknown_089A61F8
gUnknown_089A61F8: @ 0x089A61F8
.global ApConf_MapAnimTorchfx
ApConf_MapAnimTorchfx: @ 0x089A61F8
.incbin "baserom.gba", 0x9A61F8, 0x5C
.global ApConf_089A6254
@ -225,84 +225,84 @@ Pal_089AFFB8: @ 0x089AFFB8
gUnknown_089AFFF8: @ 0x089AFFF8
.incbin "baserom.gba", 0x9AFFF8, 0x3DC
.global gUnknown_089B03D4
gUnknown_089B03D4: @ 0x089B03D4
.global Img_MapAnimTorchfx
Img_MapAnimTorchfx: @ 0x089B03D4
.incbin "baserom.gba", 0x9B03D4, 0x2B8
.global gUnknown_089B068C
gUnknown_089B068C: @ 0x089B068C
.global Pal_MapAnimTorchfx
Pal_MapAnimTorchfx: @ 0x089B068C
.incbin "baserom.gba", 0x9B068C, 0x20
.global Img_089B06AC
Img_089B06AC: @ 0x089B06AC
.global Img_MapAnimUnlockObjfx
Img_MapAnimUnlockObjfx: @ 0x089B06AC
.incbin "baserom.gba", 0x9B06AC, 0x54
.global Pal_089B0700
Pal_089B0700: @ 0x089B0700
.global Pal_MapAnimUnlockObjfx
Pal_MapAnimUnlockObjfx: @ 0x089B0700
.incbin "baserom.gba", 0x9B0700, 0x20
.global gUnknown_089B0720
gUnknown_089B0720: @ 0x089B0720
.global Img_MapAnimUnlockBgfx
Img_MapAnimUnlockBgfx: @ 0x089B0720
.incbin "baserom.gba", 0x9B0720, 0x100
.global gUnknown_089B0820
gUnknown_089B0820: @ 0x089B0820
.global Pal_MapAnimUnlockObjfx_Unk
Pal_MapAnimUnlockObjfx_Unk: @ 0x089B0820
.incbin "baserom.gba", 0x9B0820, 0x20
.global gUnknown_089B0840
gUnknown_089B0840: @ 0x089B0840
.global Tsa_MapAnimUnlockBgfx
Tsa_MapAnimUnlockBgfx: @ 0x089B0840
.incbin "baserom.gba", 0x9B0840, 0x24
.global gUnknown_089B0864
gUnknown_089B0864: @ 0x089B0864
.global Tsa_089B0864
Tsa_089B0864: @ 0x089B0864
.incbin "baserom.gba", 0x9B0864, 0x26C
.global gUnknown_089B0AD0
gUnknown_089B0AD0: @ 0x089B0AD0
.global Img_MapAnimRepairfx
Img_MapAnimRepairfx: @ 0x089B0AD0
.incbin "baserom.gba", 0x9B0AD0, 0xCD4
.global gUnknown_089B17A4
gUnknown_089B17A4: @ 0x089B17A4
.global Tsa_089B17A4
Tsa_089B17A4: @ 0x089B17A4
.incbin "baserom.gba", 0x9B17A4, 0x26C
.global gUnknown_089B1A10
gUnknown_089B1A10: @ 0x089B1A10
.global ApConf_MapAnimSleep
ApConf_MapAnimSleep: @ 0x089B1A10
.incbin "baserom.gba", 0x9B1A10, 0x400
.global gUnknown_089B1E10
gUnknown_089B1E10: @ 0x089B1E10
.global Img_MapAnimBerserkfx
Img_MapAnimBerserkfx: @ 0x089B1E10
.incbin "baserom.gba", 0x9B1E10, 0x2D8
.global gUnknown_089B20E8
gUnknown_089B20E8: @ 0x089B20E8
.global Pal_MapAnimBerserkfx
Pal_MapAnimBerserkfx: @ 0x089B20E8
.incbin "baserom.gba", 0x9B20E8, 0x20
.global gUnknown_089B2108
gUnknown_089B2108: @ 0x089B2108
.global ApConf_MapAnimBerserkfx
ApConf_MapAnimBerserkfx: @ 0x089B2108
.incbin "baserom.gba", 0x9B2108, 0xD0
.global gUnknown_089B21D8
gUnknown_089B21D8: @ 0x089B21D8
.global Img_ManimSilenceObjfx
Img_ManimSilenceObjfx: @ 0x089B21D8
.incbin "baserom.gba", 0x9B21D8, 0x440
.global gUnknown_089B2618
gUnknown_089B2618: @ 0x089B2618
.global Img_ManimSilenceBgfx
Img_ManimSilenceBgfx: @ 0x089B2618
.incbin "baserom.gba", 0x9B2618, 0x110
.global gUnknown_089B2728
gUnknown_089B2728: @ 0x089B2728
.global Pal_ManimSilencefx
Pal_ManimSilencefx: @ 0x089B2728
.incbin "baserom.gba", 0x9B2728, 0x20
.global gUnknown_089B2748
gUnknown_089B2748: @ 0x089B2748
.global ApConf_ManimSilencefx
ApConf_ManimSilencefx: @ 0x089B2748
.incbin "baserom.gba", 0x9B2748, 0x138
.global gUnknown_089B2880
gUnknown_089B2880: @ 0x089B2880
.global Img_ManimBarrierBgfx
Img_ManimBarrierBgfx: @ 0x089B2880
.incbin "baserom.gba", 0x9B2880, 0xBBC
.global gUnknown_089B343C
gUnknown_089B343C: @ 0x089B343C
.global Tsa_089B343C
Tsa_089B343C: @ 0x089B343C
.incbin "baserom.gba", 0x9B343C, 0x194
.global Img_NightMareMapAnimfx
@ -445,13 +445,53 @@ Tsa_NightMareMapAnimfx32:
Tsa_NightMareMapAnimfx33:
.incbin "baserom.gba", 0x9B69BC, 0x9B6AA0 - 0x9B69BC
.global gUnknown_089B6AA0
gUnknown_089B6AA0: @ 0x089B6AA0
.global Img_MonsterStoneMapAnimfx
Img_MonsterStoneMapAnimfx: @ 0x089B6AA0
.incbin "baserom.gba", 0x9B6AA0, 0x934
.global gUnknown_089B73D4
gUnknown_089B73D4: @ 0x089B73D4
.incbin "baserom.gba", 0x9B73D4, 0x23C
.global Pal_MonsterStoneMapAnimfx
Pal_MonsterStoneMapAnimfx: @ 0x089B73D4
.incbin "baserom.gba", 0x9B73D4, 0x20
.global Tsa1_MonsterStoneMapAnimfx
Tsa1_MonsterStoneMapAnimfx:
.incbin "baserom.gba", 0x9B73F4, 0x9B7414 - 0x9B73F4
.global Tsa2_MonsterStoneMapAnimfx
Tsa2_MonsterStoneMapAnimfx:
.incbin "baserom.gba", 0x9B7414, 0x9B743C - 0x9B7414
.global Tsa3_MonsterStoneMapAnimfx
Tsa3_MonsterStoneMapAnimfx:
.incbin "baserom.gba", 0x9B743C, 0x9B7468 - 0x9B743C
.global Tsa4_MonsterStoneMapAnimfx
Tsa4_MonsterStoneMapAnimfx:
.incbin "baserom.gba", 0x9B7468, 0x9B749C - 0x9B7468
.global Tsa5_MonsterStoneMapAnimfx
Tsa5_MonsterStoneMapAnimfx:
.incbin "baserom.gba", 0x9B749C, 0x9B74D4 - 0x9B749C
.global Tsa6_MonsterStoneMapAnimfx
Tsa6_MonsterStoneMapAnimfx:
.incbin "baserom.gba", 0x9B74D4, 0x9B7514 - 0x9B74D4
.global Tsa7_MonsterStoneMapAnimfx
Tsa7_MonsterStoneMapAnimfx:
.incbin "baserom.gba", 0x9B7514, 0x9B7554 - 0x9B7514
.global Tsa8_MonsterStoneMapAnimfx
Tsa8_MonsterStoneMapAnimfx:
.incbin "baserom.gba", 0x9B7554, 0x9B759C - 0x9B7554
.global Tsa9_MonsterStoneMapAnimfx
Tsa9_MonsterStoneMapAnimfx:
.incbin "baserom.gba", 0x9B759C, 0x9B75D8 - 0x9B759C
.global Tsa10_MonsterStoneMapAnimfx
Tsa10_MonsterStoneMapAnimfx:
.incbin "baserom.gba", 0x9B75D8, 0x9B7610 - 0x9B75D8
.global Img_GorgonHatchCloud
Img_GorgonHatchCloud: @ 0x089B7610

View File

@ -29298,8 +29298,8 @@ Img_0867A828: @ 0x0867A828
Img_0867AE48: @ 0x0867AE48
.incbin "baserom.gba", 0x67AE48, 0x75C @ 0x67B5A4 - 0x67AE48
.global gUnknown_0867B5A4
gUnknown_0867B5A4: @ 0x0867B5A4
.global Pal_MapAnimRestore
Pal_MapAnimRestore: @ 0x0867B5A4
.incbin "baserom.gba", 0x67B5A4, 0x20 @ 0x67B5C4 - 0x67B5A4
.global Tsa_0867B5C4
@ -29357,47 +29357,47 @@ Tsa_0867C09C: @ 0x0867C09C
.global gUnknown_0867EE04
gUnknown_0867EE04: @ 0x0867EE04
@ Replacing .incbin "baserom.gba", 0x67EE04, 0xB0
.4byte gUnknown_0867B5A4 + 0xc3a
.4byte gUnknown_0867B5A4 + 0xc52
.4byte gUnknown_0867B5A4 + 0xc76
.4byte gUnknown_0867B5A4 + 0xcb2
.4byte gUnknown_0867B5A4 + 0xd06
.4byte gUnknown_0867B5A4 + 0xd72
.4byte gUnknown_0867B5A4 + 0xdf6
.4byte gUnknown_0867B5A4 + 0xe92
.4byte gUnknown_0867B5A4 + 0xf52
.4byte gUnknown_0867B5A4 + 0x1036
.4byte gUnknown_0867B5A4 + 0x113e
.4byte gUnknown_0867B5A4 + 0x126a
.4byte gUnknown_0867B5A4 + 0x13ba
.4byte gUnknown_0867B5A4 + 0x1522
.4byte gUnknown_0867B5A4 + 0x16a2
.4byte gUnknown_0867B5A4 + 0x1846
.4byte gUnknown_0867B5A4 + 0x1a02
.4byte gUnknown_0867B5A4 + 0x1bd6
.4byte gUnknown_0867B5A4 + 0x1db6
.4byte gUnknown_0867B5A4 + 0x1fa2
.4byte gUnknown_0867B5A4 + 0x218e
.4byte gUnknown_0867B5A4 + 0x236e
.4byte gUnknown_0867B5A4 + 0x2542
.4byte gUnknown_0867B5A4 + 0x270a
.4byte gUnknown_0867B5A4 + 0x28ae
.4byte gUnknown_0867B5A4 + 0x2a2e
.4byte gUnknown_0867B5A4 + 0x2b96
.4byte gUnknown_0867B5A4 + 0x2ce6
.4byte gUnknown_0867B5A4 + 0x2e12
.4byte gUnknown_0867B5A4 + 0x2f1a
.4byte gUnknown_0867B5A4 + 0x300a
.4byte gUnknown_0867B5A4 + 0x30e2
.4byte gUnknown_0867B5A4 + 0x31a2
.4byte gUnknown_0867B5A4 + 0x323e
.4byte gUnknown_0867B5A4 + 0x32ce
.4byte gUnknown_0867B5A4 + 0x3346
.4byte gUnknown_0867B5A4 + 0x33a6
.4byte gUnknown_0867B5A4 + 0x33ee
.4byte gUnknown_0867B5A4 + 0x342a
.4byte gUnknown_0867B5A4 + 0x345a
.4byte gUnknown_0867B5A4 + 0x347e
.4byte Pal_MapAnimRestore + 0xc3a
.4byte Pal_MapAnimRestore + 0xc52
.4byte Pal_MapAnimRestore + 0xc76
.4byte Pal_MapAnimRestore + 0xcb2
.4byte Pal_MapAnimRestore + 0xd06
.4byte Pal_MapAnimRestore + 0xd72
.4byte Pal_MapAnimRestore + 0xdf6
.4byte Pal_MapAnimRestore + 0xe92
.4byte Pal_MapAnimRestore + 0xf52
.4byte Pal_MapAnimRestore + 0x1036
.4byte Pal_MapAnimRestore + 0x113e
.4byte Pal_MapAnimRestore + 0x126a
.4byte Pal_MapAnimRestore + 0x13ba
.4byte Pal_MapAnimRestore + 0x1522
.4byte Pal_MapAnimRestore + 0x16a2
.4byte Pal_MapAnimRestore + 0x1846
.4byte Pal_MapAnimRestore + 0x1a02
.4byte Pal_MapAnimRestore + 0x1bd6
.4byte Pal_MapAnimRestore + 0x1db6
.4byte Pal_MapAnimRestore + 0x1fa2
.4byte Pal_MapAnimRestore + 0x218e
.4byte Pal_MapAnimRestore + 0x236e
.4byte Pal_MapAnimRestore + 0x2542
.4byte Pal_MapAnimRestore + 0x270a
.4byte Pal_MapAnimRestore + 0x28ae
.4byte Pal_MapAnimRestore + 0x2a2e
.4byte Pal_MapAnimRestore + 0x2b96
.4byte Pal_MapAnimRestore + 0x2ce6
.4byte Pal_MapAnimRestore + 0x2e12
.4byte Pal_MapAnimRestore + 0x2f1a
.4byte Pal_MapAnimRestore + 0x300a
.4byte Pal_MapAnimRestore + 0x30e2
.4byte Pal_MapAnimRestore + 0x31a2
.4byte Pal_MapAnimRestore + 0x323e
.4byte Pal_MapAnimRestore + 0x32ce
.4byte Pal_MapAnimRestore + 0x3346
.4byte Pal_MapAnimRestore + 0x33a6
.4byte Pal_MapAnimRestore + 0x33ee
.4byte Pal_MapAnimRestore + 0x342a
.4byte Pal_MapAnimRestore + 0x345a
.4byte Pal_MapAnimRestore + 0x347e
.4byte 0x7867ea3b
.4byte 0x84000013
.4byte 0x81000000

View File

@ -1,378 +0,0 @@
.section .data
.global gUnknown_089A3B84
gUnknown_089A3B84: @ 0x089A3B84
@ PROC_SLEEP
.short 0xe, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807D818
@ PROC_SLEEP
.short 0xe, 0x64
.word 0x0
@ PROC_END
.short 0x0, 0x0
.word 0x0
.global gUnknown_089A3BA4
gUnknown_089A3BA4: @ 0x089A3BA4
@ PROC_SLEEP
.short 0xe, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807D860
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807D944
@ PROC_SLEEP
.short 0xe, 0x1e
.word 0x0
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807D9B8
@ PROC_CALL
.short 0x2, 0x0
.word MapSpellAnim_CommonEnd
@ PROC_END
.short 0x0, 0x0
.word 0x0
.global gUnknown_089A3BDC
gUnknown_089A3BDC: @ 0x089A3BDC
@ PROC_SLEEP
.short 0xe, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807DAE8
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807DB30
@ PROC_SLEEP
.short 0xe, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word MapSpellAnim_CommonEnd
@ PROC_END
.short 0x0, 0x0
.word 0x0
.global gUnknown_089A3C0C
gUnknown_089A3C0C: @ 0x089A3C0C
@ Replacing .incbin "baserom.gba", 0x9A3C0C, 0x18
.4byte 0x03020100
.4byte 0x03030303
.4byte 0x03030303
.4byte 0x04030303
.4byte 0x08070605
.4byte 0x0000ff09
.global gUnknown_089A3C24
gUnknown_089A3C24: @ 0x089A3C24
@ PROC_SLEEP
.short 0xe, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807DBE4
@ PROC_SLEEP
.short 0xe, 0x1e
.word 0x0
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807DCA8
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807DD0C
@ PROC_SLEEP
.short 0xe, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807DD74
@ PROC_CALL
.short 0x2, 0x0
.word sub_807DA68
@ PROC_END
.short 0x0, 0x0
.word 0x0
.global gUnknown_089A3C6C
gUnknown_089A3C6C: @ 0x089A3C6C
@ PROC_SLEEP
.short 0xe, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807DDC8
@ PROC_SLEEP
.short 0xe, 0x78
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word MapSpellAnim_CommonEnd
@ PROC_END
.short 0x0, 0x0
.word 0x0
.global gUnknown_089A3C94
gUnknown_089A3C94: @ 0x089A3C94
@ PROC_SLEEP
.short 0xe, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807DE80
@ PROC_CALL
.short 0x2, 0x0
.word sub_807DE70
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807DEDC
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807DF5C
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807DFAC
@ PROC_CALL
.short 0x2, 0x0
.word MapSpellAnim_CommonEnd
@ PROC_END
.short 0x0, 0x0
.word 0x0
.global gUnknown_089A3CD4
gUnknown_089A3CD4: @ 0x089A3CD4
@ PROC_SLEEP
.short 0xe, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807DE80
@ PROC_CALL
.short 0x2, 0x0
.word sub_807E038
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807E054
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807DF5C
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807DFAC
@ PROC_CALL
.short 0x2, 0x0
.word MapSpellAnim_CommonEnd
@ PROC_END
.short 0x0, 0x0
.word 0x0
.global gUnknown_089A3D14
gUnknown_089A3D14: @ 0x089A3D14
@ PROC_SLEEP
.short 0xe, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807E118
@ PROC_SLEEP
.short 0xe, 0x32
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807E17C
@ PROC_SLEEP
.short 0xe, 0x32
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807E1B0
@ PROC_CALL
.short 0x2, 0x0
.word MapSpellAnim_CommonEnd
@ PROC_END
.short 0x0, 0x0
.word 0x0
.global gUnknown_089A3D54
gUnknown_089A3D54: @ 0x089A3D54
@ PROC_SLEEP
.short 0xe, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807E22C
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807E28C
@ PROC_CALL
.short 0x2, 0x0
.word sub_807E334
@ PROC_SLEEP
.short 0xe, 0x3c
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word MapSpellAnim_CommonEnd
@ PROC_END
.short 0x0, 0x0
.word 0x0
.global gUnknown_089A3D8C
gUnknown_089A3D8C: @ 0x089A3D8C
@ replacing .incbin "baserom.gba", 0x009a3d8c, 0x28
.4byte gUnknown_089B73D4 + 0x20
.4byte gUnknown_089B73D4 + 0x40
.4byte gUnknown_089B73D4 + 0x68
.4byte gUnknown_089B73D4 + 0x94
.4byte gUnknown_089B73D4 + 0xc8
.4byte gUnknown_089B73D4 + 0x100
.4byte gUnknown_089B73D4 + 0x140
.4byte gUnknown_089B73D4 + 0x180
.4byte gUnknown_089B73D4 + 0x1c8
.4byte gUnknown_089B73D4 + 0x204
.global gUnknown_089A3DB4
gUnknown_089A3DB4: @ 0x089A3DB4
@ PROC_SLEEP
.short 0xe, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807E390
@ PROC_SLEEP
.short 0xe, 0xa
.word 0x0
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807E404
@ PROC_SLEEP
.short 0xe, 0x3c
.word 0x0
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807E448
@ PROC_SLEEP
.short 0xe, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807DA68
@ PROC_END
.short 0x0, 0x0
.word 0x0
.global gUnknown_089A3DFC
gUnknown_089A3DFC: @ 0x089A3DFC
@ Replacing .incbin "baserom.gba", 0x9A3DFC, 0x8
.4byte 0x08070604
.4byte 0x00ff0908
.global gUnknown_089A3E04
gUnknown_089A3E04: @ 0x089A3E04
@ PROC_SLEEP
.short 0xe, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807E4D0
@ PROC_SLEEP
.short 0xe, 0x32
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807E584
@ PROC_SLEEP
.short 0xe, 0x28
.word 0x0
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807E5F0
@ PROC_CALL
.short 0x2, 0x0
.word MapSpellAnim_CommonEnd
@ PROC_END
.short 0x0, 0x0
.word 0x0
.global gUnknown_089A3E44
gUnknown_089A3E44: @ 0x089A3E44
@ PROC_SLEEP
.short 0xe, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807E67C
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807E6E0
@ PROC_CALL
.short 0x2, 0x0
.word MapSpellAnim_CommonEnd
@ PROC_END
.short 0x0, 0x0
.word 0x0
.global gUnknown_089A3E6C
gUnknown_089A3E6C: @ 0x089A3E6C
@ PROC_SLEEP
.short 0xe, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807E7E0
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807E8B0
@ PROC_SLEEP
.short 0xe, 0x50
.word 0x0
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807E934
@ PROC_SLEEP
.short 0xe, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_807DA68
@ PROC_CALL
.short 0x2, 0x0
.word HideUnitUnlockDoor
@ PROC_SLEEP
.short 0xe, 0x4
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word UnhideUnit
@ PROC_END
.short 0x0, 0x0
.word 0x0
.global gUnknown_089A3EC4
gUnknown_089A3EC4: @ 0x089A3EC4
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_807EA60
@ PROC_END
.short 0x0, 0x0
.word 0x0

View File

@ -39,6 +39,8 @@ enum
BGCHR_MANIM_1 = 1,
BGCHR_MANIM_140 = 0x140,
BGCHR_MANIM_160 = 0x160,
OBCHR_MANIM_1C0 = 0x1C0,
BGCHR_MANIM_200 = 0x200,
};

View File

@ -1593,7 +1593,7 @@ extern u16 Img_08679B04[];
extern u16 Img_0867A130[];
extern u16 Img_0867A828[];
extern u16 Img_0867AE48[];
extern u16 gUnknown_0867B5A4[];
extern u16 Pal_MapAnimRestore[];
extern u16 Tsa_0867B5C4[];
extern u16 Tsa_0867B670[];
extern u16 Tsa_0867B724[];

View File

@ -388,7 +388,7 @@ void sub_800151C(u8 a, u8 b);
void sub_800151C(u8 a, u8 b);
void sub_8001530(u16 *a, u16 *b);
void sub_800154C(void* outTm, void const* inData, u8 base, u8 linebits);
void sub_800159C(u16 *a1, u16 *a2, s16 a3, s16 a4, u16 a5);
void AddAttr2dBitMap(u16 * _dst, u16 * _src, s16 ix, s16 iy, u16 chr);
// ??? sub_80016C4(???);
void MaybeResetSomePal(void);
void MaybeSmoothChangeSomePal(u16 *src, int b, int c, int d);

View File

@ -108,7 +108,7 @@ struct MAEffectProc {
STRUCT_PAD(0x46, 0x48);
/* 48 */ short unk48;
/* 4A */ short unk4A;
/* 4A */ short frame_idx;
/* 4C */ short unk4C;
STRUCT_PAD(0x4E, 0x50);
@ -317,24 +317,22 @@ extern CONST_DATA struct ProcCmd ProcScr_MapLatonaShiningfx[];
extern CONST_DATA struct ProcCmd ProcScr_NightMarefx[];
extern CONST_DATA void * TsaSet_NightMareMapAnimfx[];
extern CONST_DATA struct ProcCmd ProcScr_MapAnimAntitoxinPureWaterfx[];
// extern ??? gUnknown_089A3B6C
// extern ??? gUnknown_089A3B84
// extern ??? gUnknown_089A3BA4
// extern ??? gUnknown_089A3BDC
// extern ??? gUnknown_089A3C0C
// extern ??? gUnknown_089A3C24
// extern ??? gUnknown_089A3C6C
// extern ??? gUnknown_089A3C94
// extern ??? gUnknown_089A3CD4
// extern ??? gUnknown_089A3D14
// extern ??? gUnknown_089A3D54
// extern ??? gUnknown_089A3D8C
// extern ??? gUnknown_089A3DB4
// extern ??? gUnknown_089A3DFC
// extern ??? gUnknown_089A3E04
// extern ??? gUnknown_089A3E44
// extern ??? gUnknown_089A3E6C
// extern ??? gUnknown_089A3EC4
extern CONST_DATA struct ProcCmd ProcScr_089A3B84[];
extern CONST_DATA struct ProcCmd ProcScr_MapAnimEffectAnimator[];
extern CONST_DATA struct ProcCmd ProcScr_MapAnimWarpFlashy[];
extern CONST_DATA struct ProcCmd ProcScr_MapAnimTorch[];
extern CONST_DATA struct ProcCmd ProcScr_MapAnimBerserk[];
extern CONST_DATA struct ProcCmd ProcScr_MapAnimRepair[];
extern CONST_DATA struct ProcCmd ProcScr_MapAnimRestore[];
extern CONST_DATA struct ProcCmd ProcScr_MapAnimSleep[];
extern CONST_DATA struct ProcCmd ProcScr_MapAnimMonsterStone[];
extern CONST_DATA void * TsaSet_MonsterStoneMapAnimfx[];
extern CONST_DATA struct ProcCmd ProcScr_MapAnimEffect_Unk_089A3DB4[];
extern CONST_DATA u8 gUnknown_089A3DFC[];
extern CONST_DATA struct ProcCmd ProcScr_MapAnimSilencefx[];
extern CONST_DATA struct ProcCmd ProcScr_MapAnimBarrierfx[];
extern CONST_DATA struct ProcCmd ProcScr_MapAnimUnlock[];
extern CONST_DATA struct ProcCmd ProcScr_MapAnimEffect_Unk_089A3EC4[];
// extern ??? gManimLevelUpLabelInfoList
extern CONST_DATA struct ProcCmd ProcScr_ManimLevelUpStatGainLabel[];
extern CONST_DATA struct ProcCmd ProcScr_ManimLevelUpLabelColor[];
@ -386,10 +384,10 @@ extern CONST_DATA struct ProcCmd ProcScr_EggDmgMapEffect2[];
extern CONST_DATA struct ProcCmd ProcScr_CritAtkMapEffect[];
extern CONST_DATA struct ProcCmd ProcScr_SpellAssocBarrier[];
extern CONST_DATA struct ProcCmd ProcScr_SpellAssocWarp[];
// extern ??? gUnknown_089A52FC
extern CONST_DATA struct ProcCmd ProcScr_ManimShiftingSineWaveScanlineBuf[];
extern u16 SpriteAnim_ManimStatGain[];
extern u16 gUnknown_089A5A6C[];
// extern ??? gUnknown_089A61F8
extern u16 ApConf_MapAnimTorchfx[];
extern u16 ApConf_089A6254[];
extern u16 CONST_DATA Obj_PoisonAnim[];
extern u16 CONST_DATA Obj_WallBreakAnim[];
@ -425,13 +423,13 @@ extern u16 CONST_DATA Pal_WallBreakAnim[];
extern const u8 Img_GmapSoguSprites[];
extern u16 CONST_DATA Img_PoisonAnim[];
extern u16 CONST_DATA Pal_PoisonAnim[];
// extern ??? gUnknown_089AE224
// extern ??? gUnknown_089AE484
// extern ??? gUnknown_089AE4A4
extern u16 CONST_DATA gUnknown_089AE224[];
extern u16 CONST_DATA gUnknown_089AE484[];
extern u16 CONST_DATA gUnknown_089AE4A4[];
extern u8 Img_089AE7A4[];
extern u16 Pal_089AE7C4[];
extern u8 CONST_DATA Img_MapAnimAntitoxinPureWater[];
// extern ??? gUnknown_089AF310
extern u16 CONST_DATA gUnknown_089AF310[];
extern u16 CONST_DATA Pal_MapAnimPureWater[];
extern u16 CONST_DATA Pal_MapAnimAntitoxin[];
extern u8 CONST_DATA gUnknown_089AF950[];
@ -440,26 +438,26 @@ extern u8 CONST_DATA gUnknown_089AFCBC[];
extern u16 CONST_DATA Pal_089AFF78[];
extern u16 CONST_DATA Pal_089AFFB8[];
extern u8 CONST_DATA gUnknown_089AFFF8[];
// extern ??? gUnknown_089B03D4
// extern ??? gUnknown_089B068C
extern u8 Img_089B06AC[];
extern u16 Pal_089B0700[];
// extern ??? gUnknown_089B0720
// extern ??? gUnknown_089B0820
// extern ??? gUnknown_089B0840
// extern ??? gUnknown_089B0864
// extern ??? gUnknown_089B0AD0
// extern ??? gUnknown_089B17A4
// extern ??? gUnknown_089B1A10
// extern ??? gUnknown_089B1E10
// extern ??? gUnknown_089B20E8
// extern ??? gUnknown_089B2108
// extern ??? gUnknown_089B21D8
// extern ??? gUnknown_089B2618
// extern ??? gUnknown_089B2728
// extern ??? gUnknown_089B2748
// extern ??? gUnknown_089B2880
// extern ??? gUnknown_089B343C
extern u8 CONST_DATA Img_MapAnimTorchfx[];
extern u16 CONST_DATA Pal_MapAnimTorchfx[];
extern u8 Img_MapAnimUnlockObjfx[];
extern u16 Pal_MapAnimUnlockObjfx[];
extern u8 Img_MapAnimUnlockBgfx[];
extern u16 Pal_MapAnimUnlockObjfx_Unk[];
extern u8 Tsa_MapAnimUnlockBgfx[];
extern u8 Tsa_089B0864[];
extern u8 Img_MapAnimRepairfx[];
extern u8 Tsa_089B17A4[];
extern u16 ApConf_MapAnimSleep[];
extern u8 Img_MapAnimBerserkfx[];
extern u16 Pal_MapAnimBerserkfx[];
extern u16 ApConf_MapAnimBerserkfx[];
extern u8 Img_ManimSilenceObjfx[];
extern u8 Img_ManimSilenceBgfx[];
extern u16 Pal_ManimSilencefx[];
extern u16 ApConf_ManimSilencefx[];
extern u8 Img_ManimBarrierBgfx[];
extern u8 Tsa_089B343C[];
extern u16 Img_NightMareMapAnimfx[];
extern u16 Pal_NightMareMapAnimfx[];
extern u8 Tsa_NightMareMapAnimfx1[];
@ -495,8 +493,18 @@ extern u8 Tsa_NightMareMapAnimfx30[];
extern u8 Tsa_NightMareMapAnimfx31[];
extern u8 Tsa_NightMareMapAnimfx32[];
extern u8 Tsa_NightMareMapAnimfx33[];
// extern ??? gUnknown_089B6AA0
// extern ??? gUnknown_089B73D4
extern u8 Img_MonsterStoneMapAnimfx[];
extern u16 Pal_MonsterStoneMapAnimfx[];
extern u8 Tsa1_MonsterStoneMapAnimfx[];
extern u8 Tsa2_MonsterStoneMapAnimfx[];
extern u8 Tsa3_MonsterStoneMapAnimfx[];
extern u8 Tsa4_MonsterStoneMapAnimfx[];
extern u8 Tsa5_MonsterStoneMapAnimfx[];
extern u8 Tsa6_MonsterStoneMapAnimfx[];
extern u8 Tsa7_MonsterStoneMapAnimfx[];
extern u8 Tsa8_MonsterStoneMapAnimfx[];
extern u8 Tsa9_MonsterStoneMapAnimfx[];
extern u8 Tsa10_MonsterStoneMapAnimfx[];
extern u16 Img_GorgonHatchCloud[];
extern u16 Pal_GorgonHatchCloud[];
extern u16 Tsa_GorgonHatchCloud_A[];
@ -626,62 +634,94 @@ void NightMarefx_End(struct MAEffectProc * proc);
void MapAnimCallSpellAssocAntitoxinPureWaterfx(struct Unit * unit, u8 * img, u16 * pal);
void AntitoxinPureWaterfx_Init(struct MAEffectProc * proc);
void AntitoxinPureWaterfx_Loop(struct MAEffectProc * proc);
// ??? sub_807D7D8(???);
// ??? sub_807D818(???);
void NewMapAnimEffectAnimator(struct Unit * unit, u8 * unk1, u16 * unk2, int unk3);
// ??? sub_807D860(???);
// ??? sub_807D944(???);
// ??? sub_807D9B8(???);
void MapSpellAnim_CommonEnd(void);
// ??? sub_807DA68(???);
void New6C_SomethingFlashy(struct Unit * unit, int x, int y);
// ??? sub_807DAE8(???);
// ??? sub_807DB30(???);
void sub_807DBA8(struct Unit * unit);
// ??? sub_807DBE4(???);
// ??? sub_807DCA8(???);
// ??? sub_807DD0C(???);
// ??? sub_807DD74(???);
void sub_807DD80(struct Unit * unit);
// ??? sub_807DDC8(???);
void sub_807DE30(struct Unit * unit);
// ??? sub_807DE70(???);
// ??? sub_807DE80(???);
// ??? sub_807DEDC(???);
// ??? sub_807DF5C(???);
// ??? sub_807DFAC(???);
void sub_807DFF4(struct Unit * unit);
// ??? sub_807E038(???);
// ??? sub_807E054(???);
void sub_807E0D4(struct Unit * unit);
// ??? sub_807E118(???);
// ??? sub_807E17C(???);
// ??? sub_807E1B0(???);
void sub_807E1E4(struct Unit * unit);
// ??? sub_807E22C(???);
// ??? sub_807E28C(???);
// ??? sub_807E334(???);
// ??? sub_807E34C(???);
// ??? sub_807E390(???);
// ??? sub_807E404(???);
// ??? sub_807E448(???);
/* Unused mapanim effect? */
void sub_807D7D8(struct Unit * unit);
void sub_807D818(struct MAEffectProc * proc);
/* This is just the same as MAEffectProc */
struct ProcMapAnimator {
/* 00 */ PROC_HEADER;
/* 2C */ struct Unit * unit;
/* 30 */ u8 pad_30[0x40 - 0x30];
/* 40 */ u16 ca;
/* 42 */ u16 cb;
/* 44 */ u8 pad_44[0x50 - 0x44];
/* 50 */ void const * img;
/* 54 */ void const * pal;
/* 58 */ u16 song;
};
void NewMapAnimEffectAnimator(struct Unit * unit, void const * img, void const * pal, u16 song);
void MapAnimEffectAnimator_Init(struct ProcMapAnimator * proc);
void MapAnimEffectAnimator_Loop1(struct ProcMapAnimator * proc);
void MapAnimEffectAnimator_Loop2(struct ProcMapAnimator * proc);
void MapSpellAnim_CommonEnd(ProcPtr proc);
void MapSpellAnim_EndWithHBlank(ProcPtr proc);
void StartWarpFlashy(struct Unit * unit, int x, int y);
void WarpFlashy_Init(struct MAEffectProc * proc);
void WarpFlashy_Loop(struct MAEffectProc * proc);
void MapAnimTorchEffect(struct Unit * unit);
void MapAnimTorch_Init(struct MAEffectProc * proc);
void MapAnimTorch_Loop1(struct MAEffectProc * proc);
void MapAnimTorch_Loop2(struct MAEffectProc * proc);
void MapAnimTorch_ResetHBlank(struct MAEffectProc * proc);
void MapAnimBerserkEffect(struct Unit * unit);
void MapAnimBerserk_Loop(struct MAEffectProc * proc);
void MapAnimRepairEffect(struct Unit * unit);
void MapAnimRepair_Init(struct MAEffectProc * proc);
void MapAnimRepair_Init0(struct MAEffectProc * proc);
void MapAnimRepair_Loop1(struct MAEffectProc * proc);
void MapAnimRepair_Loop2(struct MAEffectProc * proc);
void MapAnimRepair_Loop3(struct MAEffectProc * proc);
void MapAnimRestoreEffect(struct Unit * unit);
void MapAnimRestore_Init(struct MAEffectProc * proc);
void MapAnimRestore_Loop(struct MAEffectProc * proc);
void MapAnimSleepEffect(struct Unit * unit);
void MapAnimSleep_Init(struct MAEffectProc * proc);
void MapAnimSleep_Anim1(struct MAEffectProc * proc);
void MapAnimSleep_Anim2(struct MAEffectProc * proc);
void MapAnimMonsterStoneEffect(struct Unit * unit);
void MapAnimMonsterStone_Init(struct MAEffectProc * proc);
void MapAnimMonsterStone_Loop1(struct MAEffectProc * proc);
void MapAnimMonsterStone_Resetfx(struct MAEffectProc * proc);
/* Unused mapanim effect? */
void StartMapAnimEffect_Unk_089A3DB4(struct Unit * unit);
void MapAnim_Init_807E390(struct MAEffectProc * proc);
void MapAnim_Loop1_807E404(struct MAEffectProc * proc);
void MapAnim_Loop2_807E448(struct MAEffectProc * proc);
void MapAnimCallSpellAssocSilencefx(struct Unit * unit);
// ??? sub_807E4D0(???);
// ??? sub_807E584(???);
// ??? sub_807E5F0(???);
void MapAnimSilence_InitGfx(struct MAEffectProc * proc);
void MapAnimSilence_InitScreenConf(struct MAEffectProc * proc);
void MapAnimSilence_Loop(struct MAEffectProc * proc);
void MapAnimCallSpellAssocBarrierfx(struct Unit * unit);
// ??? sub_807E67C(???);
// ??? sub_807E6E0(???);
void sub_807E760(int, int);
void MapAnimBarrierfx_Init(struct MAEffectProc * proc);
void MapAnimBarrierfx_Loop(struct MAEffectProc * proc);
void MapAnimUnlockEffect(int, int);
void HideUnitUnlockDoor(void);
void UnhideUnit(void);
// ??? sub_807E7E0(???);
// ??? sub_807E8B0(???);
// ??? sub_807E934(???);
void MapAnimUnlock_Init(struct MAEffectProc * proc);
void MapAnimUnlock_Loop1(struct MAEffectProc * proc);
void MapAnimUnlock_Loop2(struct MAEffectProc * proc);
void SetDefaultMapAnimScreenConf(void);
// ??? sub_807EA20(???);
// ??? sub_807EA50(???);
// ??? sub_807EA60(???);
struct ManimSomethingProc_08067498
{
/* 00 */ PROC_HEADER;
/* 29 */ STRUCT_PAD(0x29, 0x58);
/* 58 */ int bg;
/* 5C */ STRUCT_PAD(0x5C, 0x64);
/* 64 */ s16 x;
/* 66 */ s16 x_inc;
/* 68 */ s16 y;
/* 6A */ s16 y_inc;
};
void StartMapAnimEffect_Unk_089A3EC4(int bg, int x_inc, int y_inc, ProcPtr parent);
void sub_807EA50(void);
void sub_807EA60(struct ManimSomethingProc_08067498 * proc);
void PutManimLevelUpFrame(int actor_id, int x, int y);
void PutManimLevelUpStat(int actor_id, int x, int y, int stat_num, bool after_gain);
int GetManimLevelUpStatGain(int actor_id, int stat_num);
@ -826,16 +866,16 @@ void MapAnimSpellAssocResetPal(ProcPtr proc);
void sub_8081E60(ProcPtr proc);
void InitScanline();
// ??? sub_8081EAC(???);
// ??? sub_8081F24(???);
// ??? sub_8081F58(???);
void sub_8081EAC(void);
void UpdateMapAnimScanline(int x, int y, int arg3);
void MapAnimResetHBlank(void);
void sub_8081F64(void);
// ??? sub_8081FA8(???);
// ??? sub_8081FFC(???);
// ??? sub_8082050(???);
// ??? sub_8082094(???);
void HBlank_MapAnimEffect_Unk_8081FA8(void);
void sub_8081FFC(void);
void sub_8082050(void);
void sub_8082094(void);
void StartManimFrameGradientScanlineEffect(u16, u16, u16, u16);
// ??? sub_808218C(???);
void sub_808218C(int x, int y, int a, int b, const u8 * unk);
// ??? PrepareSineWaveScanlineBuf(???);
// ??? sub_8082268(???);
// ??? sub_80822AC(???);
@ -845,7 +885,7 @@ void SwapScanlineBufs(void);
void InitScanlineBuf(u16 *);
void SetScanlineBufWinL(u16 * buf, int x, int y);
void SetScanlineBufWinR(u16 * buf, int x, int y);
void sub_80823FC(u16 *, int, int, int);
void MapAnimScanlineCore(u16 *, int, int, int);
void PrepareGradientScanlineBuf(u16 *, u16, u16, u16, u16);
// ??? sub_80825B0(???);
// ??? sub_80825B8(???);

View File

@ -272,10 +272,10 @@ extern u8 gTsa_StoneShatter_081C1CDC[];
extern const u8 gUnknown_08205714[4];
// extern ??? NigtMarefxConf
// extern ??? gUnknown_08205824
// extern ??? gUnknown_08205833
// extern ??? gUnknown_08205846
// extern ??? gUnknown_08205855
extern const u8 gUnknown_08205824[];
extern const u8 gUnknown_08205833[];
extern const u8 gUnknown_08205846[];
extern const u8 gUnknown_08205855[];
extern const int gUnknown_08205884[];
extern const u8 gUnknown_0820588C[];
extern const u8 gUnknown_0820588E[];

View File

@ -495,7 +495,6 @@ SECTIONS
src/mapanim_eventbattle.o(.text);
src/mapanim_specialeffect.o(.text);
src/mapanim_staffeffect.o(.text);
asm/mapanim_807CDD0.o(.text);
src/mapanim_lvupfx.o(.text);
src/mapanim_lvup.o(.text);
src/mapanim_spellassocfx.o(.text);
@ -1073,7 +1072,6 @@ SECTIONS
. = ALIGN(4); src/mapanim_eventbattle.o(.data);
. = ALIGN(4); src/mapanim_specialeffect.o(.data);
. = ALIGN(4); src/mapanim_staffeffect.o(.data);
. = ALIGN(4); data/mapanim_89A398C.o(.data);
. = ALIGN(4); src/mapanim_lvupfx.o(.data);
. = ALIGN(4); src/mapanim_lvup.o(.data);
. = ALIGN(4); src/mapanim_spellassocfx.o(.data);

View File

@ -1789,7 +1789,7 @@ void StartSubSpell_efxRestBG(struct Anim * anim)
proc->img = ImgArray_RestoreBg;
SpellFx_RegisterBgPal(gUnknown_0867B5A4, PLTT_SIZE_4BPP);
SpellFx_RegisterBgPal(Pal_MapAnimRestore, PLTT_SIZE_4BPP);
SpellFx_SetSomeColorEffect();
return;

View File

@ -35,8 +35,8 @@ void Eventfx_SetScreenConfig(void)
void ShinningStonefx_InitGfx(struct ProcShinningStonefx * proc)
{
PlaySeSpacial(0x8D, proc->x);
Decompress(Img_089B06AC, OBJ_VRAM0 + 0x3800);
ApplyPalette(Pal_089B0700, 0x14);
Decompress(Img_MapAnimUnlockObjfx, OBJ_VRAM0 + 0x3800);
ApplyPalette(Pal_MapAnimUnlockObjfx, 0x14);
proc->timer = 1;
}

View File

@ -465,65 +465,64 @@ void sub_800154C(void* outTm, void const* inData, u8 base, u8 linebits)
}
}
void sub_800159C(u16 *a1, u16 *a2, s16 a3, s16 a4, u16 a5) // TODO: handle type of a1
void AddAttr2dBitMap(u16 * _dst, u16 * _src, s16 ix, s16 iy, u16 chr) // TODO: handle type of a1
{
u16 *dst;
s16 r4, r5;
s16 ip;
s16 sp04;
s16 sp08;
s16 sp0C;
s16 width, height;
s16 _width;
s16 _height;
s16 _ix, _iy;
r4 = ((u8 *)a2)[0] + 1;
sp04 = ((u8 *)a2)[1];
r5 = sp04 + 1;
ip = r4;
sp04 = r5;
++a2;
sp0C = 0;
sp08 = 0;
width = ((u8 *)_src)[0] + 1;
_height = ((u8 *)_src)[1];
height = _height + 1;
_width = width;
_height = height;
++_src;
_iy = 0;
_ix = 0;
if (a3 + r4 > 0x20)
r4 = 0x20 - a3;
if (ix + width > 0x20)
width = 0x20 - ix;
if (a3 < 0)
if (ix < 0)
{
sp08 = -a3;
r4 -= sp08;
a3 = 0;
_ix = -ix;
width -= _ix;
ix = 0;
}
if (r4 > 0)
if (width > 0)
{
int i, j;
if (a4 + r5 > 0x20)
r5 = 0x20 - a4;
if (iy + height > 0x20)
height = 0x20 - iy;
if (a4 < 0)
if (iy < 0)
{
sp0C = -a4;
r5 -= sp0C;
a4 = 0;
_iy = -iy;
height -= _iy;
iy = 0;
}
if (r5 > 0)
if (height > 0)
{
a2 += ip * (sp04 - (sp0C + r5));
dst = a1 + (a4 + r5 - 1) * 0x20 + a3;
_src += _width * (_height - (_iy + height));
dst = _dst + (iy + height - 1) * 0x20 + ix;
for (i = r5 - 1; i >= 0; --i)
for (i = height - 1; i >= 0; --i)
{
const u16 *src = a2 + sp08;
const u16 *src = _src + _ix;
u16 *dst2 = dst;
for (j = 0; r4 > j; ++j)
for (j = 0; width > j; ++j)
{
*dst2 = *src + a5;
*dst2 = *src + chr;
++src;
++dst2;
}
a2 += ip;
_src += _width;
dst -= 0x20;
}
}
@ -928,7 +927,7 @@ void SetBlendBackdropB(int a)
void SetDefaultColorEffects(void)
{
SetBlendConfig(0, 16, 0, 0);
SetBlendNone();
}
void EnablePaletteSync(void)

View File

@ -385,7 +385,7 @@ void sub_807F964(struct MAEffectProc * proc)
MapAnimfxConf_089A40AC[proc->frame].tsa,
gGenericBuffer);
sub_800159C(
AddAttr2dBitMap(
gBG2TilemapBuffer,
(u16 *)gGenericBuffer,
0, 0,
@ -416,7 +416,7 @@ void sub_807FAA0(struct MAEffectProc * proc)
MapAnimfxConf_089A419C[proc->frame].tsa,
gGenericBuffer);
sub_800159C(
AddAttr2dBitMap(
gBG2TilemapBuffer,
(u16 *)gGenericBuffer,
0, 0,
@ -597,7 +597,7 @@ void sub_807FE0C(struct MAEffectProc * proc)
MapAnimfxConf_089A42BC[proc->frame].tsa,
gGenericBuffer);
sub_800159C(
AddAttr2dBitMap(
gBG2TilemapBuffer,
(u16*) gGenericBuffer,
0, 0,
@ -611,7 +611,7 @@ void sub_807FE0C(struct MAEffectProc * proc)
EnablePaletteSync();
}
proc->unk4A = proc->frame;
proc->frame_idx = proc->frame;
proc->frame++;
proc->timer = 4;
@ -626,7 +626,7 @@ void sub_807FE0C(struct MAEffectProc * proc)
{
int i, addedBrightness = proc->unk48 * 32 / 240;
const u16 * const in = MapAnimfxConf_089A42BC[proc->unk4A].pal;
const u16 * const in = MapAnimfxConf_089A42BC[proc->frame_idx].pal;
u16 * const out = &gPaletteBuffer[0x10 * gUnknown_0820588C[proc->unk4C]];
for (i = 1; i < 16; ++i)
@ -727,7 +727,7 @@ void sub_8080138(struct MAEffectProc* proc)
gUnknown_089A43D4[v0].tsa,
gGenericBuffer);
sub_800159C(
AddAttr2dBitMap(
gBG2TilemapBuffer,
(u16*) gGenericBuffer,
0, 0,

View File

@ -37,19 +37,17 @@ void sub_8081EAC(void)
}
//! FE8U = 0x08081F24
void sub_8081F24(int x, int y, int arg3)
void UpdateMapAnimScanline(int x, int y, int arg3)
{
InitScanlineBuf(gManimScanlineBufs[1]);
sub_80823FC(gManimScanlineBufs[1], x, y, arg3);
MapAnimScanlineCore(gManimScanlineBufs[1], x, y, arg3);
SwapScanlineBufs();
return;
}
//! FE8U = 0x08081F58
void sub_8081F58(void)
void MapAnimResetHBlank(void)
{
SetPrimaryHBlankHandler(NULL);
return;
}
//! FE8U = 0x08081F64
@ -73,7 +71,7 @@ void sub_8081F64(void)
}
//! FE8U = 0x08081FA8
void sub_8081FA8(void)
void HBlank_MapAnimEffect_Unk_8081FA8(void)
{
u16 vcount = REG_VCOUNT;
@ -180,7 +178,7 @@ void StartManimFrameGradientScanlineEffect(u16 yTop, u16 yBottom, u16 colorArg3,
}
//! FE8U = 0x0808218C
void sub_808218C(int x, int y, int a, int b, u8 * unk)
void sub_808218C(int x, int y, int a, int b, const u8 * unk)
{
int var;
@ -359,7 +357,7 @@ void SetScanlineBufWinR(u16 * buf, int x, int y)
}
//! FE8U = 0x080823FC
void sub_80823FC(u16 * buf, int x, int y, int arg4)
void MapAnimScanlineCore(u16 * buf, int x, int y, int arg4)
{
int i;
@ -385,8 +383,6 @@ void sub_80823FC(u16 * buf, int x, int y, int arg4)
var = var - 1;
}
}
return;
}
//! FE8U = 0x080824C4

View File

@ -243,7 +243,7 @@ void MapAnim_GorgonHatch_Loop(struct MAEffectProc * proc)
TsaLut_GorgonHatchCloud[proc->frame],
gGenericBuffer);
sub_800159C(
AddAttr2dBitMap(
gBG2TilemapBuffer,
(void *)gGenericBuffer,
proc->xDisplay / 8 - 8,

View File

@ -426,14 +426,14 @@ void SpellWarpStartFlashy(ProcPtr proc)
gManimSt.ytarget = gBattleTarget.changePow;
unit = gManimSt.actor[gManimSt.targetActorId].unit;
New6C_SomethingFlashy(unit, unit->xPos, unit->yPos);
StartWarpFlashy(unit, unit->xPos, unit->yPos);
}
void SpellWarpStartFlashyAtNewPos(ProcPtr proc)
{
struct Unit * unit;
unit = gManimSt.actor[gManimSt.targetActorId].unit;
New6C_SomethingFlashy(
StartWarpFlashy(
gManimSt.actor[gManimSt.targetActorId].unit,
gManimSt.xtarget,
gManimSt.ytarget
@ -442,37 +442,37 @@ void SpellWarpStartFlashyAtNewPos(ProcPtr proc)
void MapAnimCallSpellAssocTorch(ProcPtr proc)
{
sub_807DBA8(gManimSt.actor[gManimSt.subjectActorId].unit);
MapAnimTorchEffect(gManimSt.actor[gManimSt.subjectActorId].unit);
}
void MapAnimCallSpellAssocUnlock(ProcPtr proc)
{
sub_807E760(gManimSt.xtarget, gManimSt.ytarget);
MapAnimUnlockEffect(gManimSt.xtarget, gManimSt.ytarget);
}
void MapAnimCallSpellAssocBerserk(ProcPtr proc)
{
sub_807DD80(gManimSt.actor[gManimSt.targetActorId].unit);
MapAnimBerserkEffect(gManimSt.actor[gManimSt.targetActorId].unit);
}
void MapAnimCallSpellAssocRestore(ProcPtr proc)
{
sub_807DFF4(gManimSt.actor[gManimSt.targetActorId].unit);
MapAnimRestoreEffect(gManimSt.actor[gManimSt.targetActorId].unit);
}
void MapAnimCallSpellAssocSleep(ProcPtr proc)
{
sub_807E0D4(gManimSt.actor[gManimSt.targetActorId].unit);
MapAnimSleepEffect(gManimSt.actor[gManimSt.targetActorId].unit);
}
void MapAnimCallSpellAssocMonsterStone(ProcPtr proc)
{
sub_807E1E4(gManimSt.actor[gManimSt.targetActorId].unit);
MapAnimMonsterStoneEffect(gManimSt.actor[gManimSt.targetActorId].unit);
}
void MapAnimCallSpellAssocRepair(ProcPtr proc)
{
sub_807DE30(gManimSt.actor[gManimSt.targetActorId].unit);
MapAnimRepairEffect(gManimSt.actor[gManimSt.targetActorId].unit);
}
void SpellWarpStartFlashFade(ProcPtr proc)

File diff suppressed because it is too large Load Diff