Skip to content

Commit dd85a60

Browse files
MokhaLeeeMokhaLeee
authored
Merge pull request #51 from MokhaLeee/main
efxmagic in process
2 parents 59c6699 + d479b29 commit dd85a60

16 files changed

+3189
-4030
lines changed

‎asm/banim_efxmagic.s‎

Lines changed: 72 additions & 2975 deletions
Large diffs are not rendered by default.

‎data/banim_085D3474.s‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,10 @@ AnimScr_EfxTeyariObjType1Right: @ 085D4998
146146
AnimScr_EfxTeyariObjType1Left: @ 085D4BF8
147147
.incbin "fe6-base.gba", 0x5D4BF8, (0x5D4CFC - 0x5D4BF8) @ length: 0104
148148

149-
.global gUnk_085D4CFC
150-
gUnk_085D4CFC: @ 085D4CFC
149+
.global AnimScr_EfxShooterOBJ_L
150+
AnimScr_EfxShooterOBJ_L: @ 085D4CFC
151151
.incbin "fe6-base.gba", 0x5D4CFC, (0x5D4D98 - 0x5D4CFC) @ length: 009C
152152

153-
.global gUnk_085D4D98
154-
gUnk_085D4D98: @ 085D4D98
153+
.global AnimScr_EfxShooterOBJ_R
154+
AnimScr_EfxShooterOBJ_R: @ 085D4D98
155155
.incbin "fe6-base.gba", 0x5D4D98, (0x5D4DB0 - 0x5D4D98) @ length: 07F8

‎data/banim_efxmagic.s‎

Lines changed: 8 additions & 164 deletions
Original file line numberDiff line numberDiff line change
@@ -3,162 +3,6 @@
33
.include "gba_sprites.inc"
44
.section .data
55

6-
.global ProcScr_EfxSongBG
7-
ProcScr_EfxSongBG: @ 085D1054
8-
.incbin "fe6-base.gba", 0x5D1054, (0x5D106C - 0x5D1054) @ length: 0018
9-
10-
.global ProcScr_EfxSongOBJ
11-
ProcScr_EfxSongOBJ: @ 085D106C
12-
.incbin "fe6-base.gba", 0x5D106C, (0x5D108C - 0x5D106C) @ length: 0020
13-
14-
.global gUnk_085D108C
15-
gUnk_085D108C: @ 085D108C
16-
.incbin "fe6-base.gba", 0x5D108C, (0x5D10A4 - 0x5D108C) @ length: 0018
17-
18-
.global gUnk_085D10A4
19-
gUnk_085D10A4: @ 085D10A4
20-
.incbin "fe6-base.gba", 0x5D10A4, (0x5D10BC - 0x5D10A4) @ length: 0018
21-
22-
.global gUnk_085D10BC
23-
gUnk_085D10BC: @ 085D10BC
24-
.incbin "fe6-base.gba", 0x5D10BC, (0x5D10D4 - 0x5D10BC) @ length: 0018
25-
26-
.global gUnk_085D10D4
27-
gUnk_085D10D4: @ 085D10D4
28-
.incbin "fe6-base.gba", 0x5D10D4, (0x5D10EC - 0x5D10D4) @ length: 0018
29-
30-
.global gUnk_085D10EC
31-
gUnk_085D10EC: @ 085D10EC
32-
.incbin "fe6-base.gba", 0x5D10EC, (0x5D1104 - 0x5D10EC) @ length: 0018
33-
34-
.global gUnk_085D1104
35-
gUnk_085D1104: @ 085D1104
36-
.incbin "fe6-base.gba", 0x5D1104, (0x5D111C - 0x5D1104) @ length: 0018
37-
38-
.global gUnk_085D111C
39-
gUnk_085D111C: @ 085D111C
40-
.incbin "fe6-base.gba", 0x5D111C, (0x5D113C - 0x5D111C) @ length: 0020
41-
42-
.global ProcScr_EfxHurtmut
43-
ProcScr_EfxHurtmut: @ 085D113C
44-
.incbin "fe6-base.gba", 0x5D113C, (0x5D1154 - 0x5D113C) @ length: 0018
45-
46-
.global ProcScr_EfxHurtmutOBJ
47-
ProcScr_EfxHurtmutOBJ: @ 085D1154
48-
.incbin "fe6-base.gba", 0x5D1154, (0x5D116C - 0x5D1154) @ length: 0018
49-
50-
.global ProcScr_EfxFirebreath
51-
ProcScr_EfxFirebreath: @ 085D116C
52-
.incbin "fe6-base.gba", 0x5D116C, (0x5D1184 - 0x5D116C) @ length: 0018
53-
54-
.global ProcScr_EfxFirebreathOBJ
55-
ProcScr_EfxFirebreathOBJ: @ 085D1184
56-
.incbin "fe6-base.gba", 0x5D1184, (0x5D119C - 0x5D1184) @ length: 0018
57-
58-
.global ProcScr_EfxFirebreathBG
59-
ProcScr_EfxFirebreathBG: @ 085D119C
60-
.incbin "fe6-base.gba", 0x5D119C, (0x5D11B4 - 0x5D119C) @ length: 0018
61-
62-
.global gUnk_085D11B4
63-
gUnk_085D11B4: @ 085D11B4
64-
.incbin "fe6-base.gba", 0x5D11B4, (0x5D11D4 - 0x5D11B4) @ length: 0020
65-
66-
.global ProcScr_EfxIcebreath
67-
ProcScr_EfxIcebreath: @ 085D11D4
68-
.incbin "fe6-base.gba", 0x5D11D4, (0x5D11EC - 0x5D11D4) @ length: 0018
69-
70-
.global ProcScr_EfxIcebreathOBJ
71-
ProcScr_EfxIcebreathOBJ: @ 085D11EC
72-
.incbin "fe6-base.gba", 0x5D11EC, (0x5D120C - 0x5D11EC) @ length: 0020
73-
74-
.global ProcScr_EfxDarkbreath
75-
ProcScr_EfxDarkbreath: @ 085D120C
76-
.incbin "fe6-base.gba", 0x5D120C, (0x5D1224 - 0x5D120C) @ length: 0018
77-
78-
.global ProcScr_EfxDarkbreathBG
79-
ProcScr_EfxDarkbreathBG: @ 085D1224
80-
.incbin "fe6-base.gba", 0x5D1224, (0x5D123C - 0x5D1224) @ length: 0018
81-
82-
.global Tsa_EfxDarkbreathBG
83-
Tsa_EfxDarkbreathBG: @ 085D123C
84-
.incbin "fe6-base.gba", 0x5D123C, (0x5D126C - 0x5D123C) @ length: 0030
85-
86-
.global ProcScr_EfxDarkbreathBGCOL
87-
ProcScr_EfxDarkbreathBGCOL: @ 085D126C
88-
.incbin "fe6-base.gba", 0x5D126C, (0x5D128C - 0x5D126C) @ length: 0020
89-
90-
.global ProcScr_EfxDarkbreathOBJ
91-
ProcScr_EfxDarkbreathOBJ: @ 085D128C
92-
.incbin "fe6-base.gba", 0x5D128C, (0x5D12A4 - 0x5D128C) @ length: 0018
93-
94-
.global ProcScr_EfxThunder
95-
ProcScr_EfxThunder: @ 085D12A4
96-
.incbin "fe6-base.gba", 0x5D12A4, (0x5D12BC - 0x5D12A4) @ length: 0018
97-
98-
.global ProcScr_EfxThunderBG
99-
ProcScr_EfxThunderBG: @ 085D12BC
100-
.incbin "fe6-base.gba", 0x5D12BC, (0x5D12D4 - 0x5D12BC) @ length: 0018
101-
102-
.global TsaLut_EfxThunderBG_L
103-
TsaLut_EfxThunderBG_L: @ 085D12D4
104-
.incbin "fe6-base.gba", 0x5D12D4, (0x5D12DC - 0x5D12D4) @ length: 0008
105-
106-
.global TsaLut_EfxThunderBG_R
107-
TsaLut_EfxThunderBG_R: @ 085D12DC
108-
.incbin "fe6-base.gba", 0x5D12DC, (0x5D12E4 - 0x5D12DC) @ length: 0008
109-
110-
.global ProcScr_EfxThunderBGCOL
111-
ProcScr_EfxThunderBGCOL: @ 085D12E4
112-
.incbin "fe6-base.gba", 0x5D12E4, (0x5D1304 - 0x5D12E4) @ length: 0020
113-
114-
.global ProcScr_EfxThunderOBJ
115-
ProcScr_EfxThunderOBJ: @ 085D1304
116-
.incbin "fe6-base.gba", 0x5D1304, (0x5D131C - 0x5D1304) @ length: 0018
117-
118-
.global ProcScr_EfxFire
119-
ProcScr_EfxFire: @ 085D131C
120-
.incbin "fe6-base.gba", 0x5D131C, (0x5D1334 - 0x5D131C) @ length: 0018
121-
122-
.global ProcScr_EfxFireBG
123-
ProcScr_EfxFireBG: @ 085D1334
124-
.incbin "fe6-base.gba", 0x5D1334, (0x5D134C - 0x5D1334) @ length: 0018
125-
126-
.global TsaLut_EfxFireBG_L
127-
TsaLut_EfxFireBG_L: @ 085D134C
128-
.incbin "fe6-base.gba", 0x5D134C, (0x5D137C - 0x5D134C) @ length: 0030
129-
130-
.global TsaLut_EfxFireBG_R
131-
TsaLut_EfxFireBG_R: @ 085D137C
132-
.incbin "fe6-base.gba", 0x5D137C, (0x5D13AC - 0x5D137C) @ length: 0030
133-
134-
.global ProcScr_EfxFireOBJ
135-
ProcScr_EfxFireOBJ: @ 085D13AC
136-
.incbin "fe6-base.gba", 0x5D13AC, (0x5D13C4 - 0x5D13AC) @ length: 0018
137-
138-
.global ProcScr_EfxFireHITBG
139-
ProcScr_EfxFireHITBG: @ 085D13C4
140-
.incbin "fe6-base.gba", 0x5D13C4, (0x5D13DC - 0x5D13C4) @ length: 0018
141-
142-
.global ImgLut_EfxFireHITBG
143-
ImgLut_EfxFireHITBG: @ 085D13DC
144-
.incbin "fe6-base.gba", 0x5D13DC, (0x5D1430 - 0x5D13DC) @ length: 0054
145-
146-
.global TsaLut_EfxFireHITBG
147-
TsaLut_EfxFireHITBG: @ 085D1430
148-
.incbin "fe6-base.gba", 0x5D1430, (0x5D1484 - 0x5D1430) @ length: 0054
149-
150-
.global ProcScr_EfxElfireBG
151-
ProcScr_EfxElfireBG: @ 085D1484
152-
.incbin "fe6-base.gba", 0x5D1484, (0x5D149C - 0x5D1484) @ length: 0018
153-
154-
.global ProcScr_EfxElfireBGCOL
155-
ProcScr_EfxElfireBGCOL: @ 085D149C
156-
.incbin "fe6-base.gba", 0x5D149C, (0x5D14BC - 0x5D149C) @ length: 0020
157-
158-
.global ProcScr_EfxElfireOBJ
159-
ProcScr_EfxElfireOBJ: @ 085D14BC
160-
.incbin "fe6-base.gba", 0x5D14BC, (0x5D14D4 - 0x5D14BC) @ length: 0018
161-
1626
.global gUnk_085D14D4
1637
gUnk_085D14D4: @ 085D14D4
1648
.incbin "fe6-base.gba", 0x5D14D4, (0x5D14EC - 0x5D14D4) @ length: 0018
@@ -347,20 +191,20 @@ gUnk_085D2120: @ 085D2120
347191
gUnk_085D2158: @ 085D2158
348192
.incbin "fe6-base.gba", 0x5D2158, (0x5D2178 - 0x5D2158) @ length: 0020
349193

350-
.global gUnk_085D2178
351-
gUnk_085D2178: @ 085D2178
194+
.global ProcScr_EfxForblaze
195+
ProcScr_EfxForblaze: @ 085D2178
352196
.incbin "fe6-base.gba", 0x5D2178, (0x5D2190 - 0x5D2178) @ length: 0018
353197

354-
.global gUnk_085D2190
355-
gUnk_085D2190: @ 085D2190
198+
.global ProcScr_EfxForblazeBG1
199+
ProcScr_EfxForblazeBG1: @ 085D2190
356200
.incbin "fe6-base.gba", 0x5D2190, (0x5D21A8 - 0x5D2190) @ length: 0018
357201

358-
.global gUnk_085D21A8
359-
gUnk_085D21A8: @ 085D21A8
202+
.global Tsas_EfxForblazeBG1
203+
Tsas_EfxForblazeBG1: @ 085D21A8
360204
.incbin "fe6-base.gba", 0x5D21A8, (0x5D21DC - 0x5D21A8) @ length: 0034
361205

362-
.global gUnk_085D21DC
363-
gUnk_085D21DC: @ 085D21DC
206+
.global Img_EfxForblazeBG1
207+
Img_EfxForblazeBG1: @ 085D21DC
364208
.incbin "fe6-base.gba", 0x5D21DC, (0x5D2210 - 0x5D21DC) @ length: 0034
365209

366210
.global gUnk_085D2210

‎data/banim_efxmagic_.s‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,41 @@ gEkrSpellAnimLut: @ 0x005D0DA0
1818
.4byte 0x00000000
1919
.4byte 0x00000000
2020
.4byte StartSpellAnimSong
21-
.4byte func_fe6_0804DE4C
21+
.4byte StartSpellAnimDance
2222
.4byte StartSpellAnimBallista
23-
.4byte func_fe6_0804E0E8
23+
.4byte StartSpellAnimEckesachs
2424
.4byte StartSpellAnimBindingBlade
2525
.4byte StartSpellAnimFireBreath
2626
.4byte StartSpellAnimIceBreath
2727
.4byte StartSpellAnimDarkBreath
2828
.4byte StartSpellAnimFire
2929
.4byte StartSpellAnimElfire
30-
.4byte func_fe6_080513AC
30+
.4byte StartSpellAnimForblaze
3131
.4byte StartSpellAnimThunder
32-
.4byte func_fe6_0804FC28
33-
.4byte func_fe6_0804F5C4
34-
.4byte func_fe6_0805007C
35-
.4byte func_fe6_080503BC
36-
.4byte func_fe6_08050860
37-
.4byte func_fe6_08050DE0
38-
.4byte func_fe6_0805100C
39-
.4byte func_fe6_08052090
40-
.4byte func_fe6_08051CD0
41-
.4byte func_fe6_080529EC
42-
.4byte func_fe6_08053764
43-
.4byte func_fe6_08053DC8
44-
.4byte func_fe6_08054558
45-
.4byte func_fe6_080546A8
46-
.4byte func_fe6_08054848
47-
.4byte func_fe6_080549E8
48-
.4byte func_fe6_08055234
49-
.4byte func_fe6_08055264
50-
.4byte func_fe6_080556BC
51-
.4byte func_fe6_0805595C
52-
.4byte func_fe6_08055BF4
53-
.4byte func_fe6_08055F24
54-
.4byte func_fe6_080561A0
55-
.4byte func_fe6_080567AC
32+
.4byte StartSpellAnimBolting
33+
.4byte StartSpellAnimFimbulvetr
34+
.4byte StartSpellAnimAircalibur
35+
.4byte StartSpellAnimFlux
36+
.4byte StartSpellAnimNosferatu
37+
.4byte StartSpellAnimLightning
38+
.4byte StartSpellAnimPurge
39+
.4byte StartSpellAnimAureola
40+
.4byte StartSpellAnimDivine
41+
.4byte StartSpellAnimApocalypse
42+
.4byte StartSpellAnimEclipse
43+
.4byte StartSpellAnimFenrir
44+
.4byte StartSpellAnimHeal
45+
.4byte StartSpellAnimMend
46+
.4byte StartSpellAnimRecover
47+
.4byte StartSpellAnimPhysic
48+
.4byte StartSpellAnimFortify
49+
.4byte StartSpellAnimLatona
50+
.4byte StartSpellAnimRestore
51+
.4byte StartSpellAnimSilence
52+
.4byte StartSpellAnimSleep
53+
.4byte StartSpellAnimHammerne
54+
.4byte StartSpellAnimBerserk
55+
.4byte StartSpellAnimBarrier
5656
.4byte 0x00000000
5757
.4byte 0x00000000
5858
.4byte 0x00000000

0 commit comments

Comments
 (0)