Skip to content

Commit b0d3f4c

Browse files
MokhaLeeeMokhaLeee
committed
efxmagic in process
1 parent e048325 commit b0d3f4c

File tree

10 files changed

+417
-490
lines changed

10 files changed

+417
-490
lines changed

‎asm/banim_efxmagic.s‎

Lines changed: 124 additions & 295 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: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,28 @@
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
6+
.global ProcScr_EfxShooter
7+
ProcScr_EfxShooter: @ 085D10A4
208
.incbin "fe6-base.gba", 0x5D10A4, (0x5D10BC - 0x5D10A4) @ length: 0018
219

22-
.global gUnk_085D10BC
23-
gUnk_085D10BC: @ 085D10BC
10+
.global ProcScr_EfxShooterOBJ
11+
ProcScr_EfxShooterOBJ: @ 085D10BC
2412
.incbin "fe6-base.gba", 0x5D10BC, (0x5D10D4 - 0x5D10BC) @ length: 0018
2513

26-
.global gUnk_085D10D4
27-
gUnk_085D10D4: @ 085D10D4
14+
.global ProcScr_EfxEckesachs
15+
ProcScr_EfxEckesachs: @ 085D10D4
2816
.incbin "fe6-base.gba", 0x5D10D4, (0x5D10EC - 0x5D10D4) @ length: 0018
2917

30-
.global gUnk_085D10EC
31-
gUnk_085D10EC: @ 085D10EC
18+
.global ProcScr_EfxEckesachsBG
19+
ProcScr_EfxEckesachsBG: @ 085D10EC
3220
.incbin "fe6-base.gba", 0x5D10EC, (0x5D1104 - 0x5D10EC) @ length: 0018
3321

34-
.global gUnk_085D1104
35-
gUnk_085D1104: @ 085D1104
22+
.global ProcScr_EfxEckesachsBGCOL1
23+
ProcScr_EfxEckesachsBGCOL1: @ 085D1104
3624
.incbin "fe6-base.gba", 0x5D1104, (0x5D111C - 0x5D1104) @ length: 0018
3725

38-
.global gUnk_085D111C
39-
gUnk_085D111C: @ 085D111C
26+
.global ProcScr_EfxEckesachsBGCOL2
27+
ProcScr_EfxEckesachsBGCOL2: @ 085D111C
4028
.incbin "fe6-base.gba", 0x5D111C, (0x5D113C - 0x5D111C) @ length: 0020
4129

4230
.global ProcScr_EfxHurtmut
@@ -347,20 +335,20 @@ gUnk_085D2120: @ 085D2120
347335
gUnk_085D2158: @ 085D2158
348336
.incbin "fe6-base.gba", 0x5D2158, (0x5D2178 - 0x5D2158) @ length: 0020
349337

350-
.global gUnk_085D2178
351-
gUnk_085D2178: @ 085D2178
338+
.global ProcScr_EfxForblaze
339+
ProcScr_EfxForblaze: @ 085D2178
352340
.incbin "fe6-base.gba", 0x5D2178, (0x5D2190 - 0x5D2178) @ length: 0018
353341

354-
.global gUnk_085D2190
355-
gUnk_085D2190: @ 085D2190
342+
.global ProcScr_EfxForblazeBG1
343+
ProcScr_EfxForblazeBG1: @ 085D2190
356344
.incbin "fe6-base.gba", 0x5D2190, (0x5D21A8 - 0x5D2190) @ length: 0018
357345

358-
.global gUnk_085D21A8
359-
gUnk_085D21A8: @ 085D21A8
346+
.global Tsas_EfxForblazeBG1
347+
Tsas_EfxForblazeBG1: @ 085D21A8
360348
.incbin "fe6-base.gba", 0x5D21A8, (0x5D21DC - 0x5D21A8) @ length: 0034
361349

362-
.global gUnk_085D21DC
363-
gUnk_085D21DC: @ 085D21DC
350+
.global Img_EfxForblazeBG1
351+
Img_EfxForblazeBG1: @ 085D21DC
364352
.incbin "fe6-base.gba", 0x5D21DC, (0x5D2210 - 0x5D21DC) @ length: 0034
365353

366354
.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

‎data/eodata_banim_efxmagic.s‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
.section .rodata
22

3-
.global FrameLut_EfxSongOBJ
4-
FrameLut_EfxSongOBJ: @ 08119CDC
3+
.global FrameLut_EfxSongBGCOL
4+
FrameLut_EfxSongBGCOL: @ 08119CDC
55
.incbin "fe6-base.gba", 0x119CDC, (0x119D56 - 0x119CDC) @ length: 007A
66

7-
.global gUnk_08119D56
8-
gUnk_08119D56: @ 08119D56
7+
.global FrameConf_EfxEckesachsBGCOL2
8+
FrameConf_EfxEckesachsBGCOL2: @ 08119D56
99
.incbin "fe6-base.gba", 0x119D56, (0x119D78 - 0x119D56) @ length: 0022
1010

1111
.global gUnk_08119D78
@@ -88,8 +88,8 @@ gUnk_0811A27C: @ 0811A27C
8888
gUnk_0811A302: @ 0811A302
8989
.incbin "fe6-base.gba", 0x11A302, (0x11A478 - 0x11A302) @ length: 0176
9090

91-
.global gUnk_0811A478
92-
gUnk_0811A478: @ 0811A478
91+
.global FrameConf_EfxForblazeBG1
92+
FrameConf_EfxForblazeBG1: @ 0811A478
9393
.incbin "fe6-base.gba", 0x11A478, (0x11A50E - 0x11A478) @ length: 0096
9494

9595
.global gUnk_0811A50E

‎data/rodata_banim_0811AE34.s‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,16 @@ Pal_EfxSongBG: @ 0811CD14
125125
Tsa_EfxSongBG: @ 0811D0D4
126126
.incbin "fe6-base.gba", 0x11D0D4, (0x11E36C - 0x11D0D4) @ length: 1298
127127

128-
.global gUnk_0811E36C
129-
gUnk_0811E36C: @ 0811E36C
128+
.global Img_EfxEckesachsBG
129+
Img_EfxEckesachsBG: @ 0811E36C
130130
.incbin "fe6-base.gba", 0x11E36C, (0x11F22C - 0x11E36C) @ length: 0EC0
131131

132-
.global gUnk_0811F22C
133-
gUnk_0811F22C: @ 0811F22C
132+
.global Pal_EfxEckesachsBGCOL2
133+
Pal_EfxEckesachsBGCOL2: @ 0811F22C
134134
.incbin "fe6-base.gba", 0x11F22C, (0x11F32C - 0x11F22C) @ length: 0100
135135

136-
.global gUnk_0811F32C
137-
gUnk_0811F32C: @ 0811F32C
136+
.global Tsa_EfxEckesachsBG
137+
Tsa_EfxEckesachsBG: @ 0811F32C
138138
.incbin "fe6-base.gba", 0x11F32C, (0x11F6F4 - 0x11F32C) @ length: 03C8
139139

140140
.global Img_BreathSprites
@@ -449,8 +449,8 @@ Pal_EfxElfireOBJ: @ 0813BD74
449449
Pal_BoltingBg: @ 0813E75C
450450
.incbin "fe6-base.gba", 0x13E75C, (0x1408CC - 0x13E75C) @ length: 2170
451451

452-
.global gUnk_081408CC
453-
gUnk_081408CC: @ 081408CC
452+
.global Pal_EfxForblazeBG1
453+
Pal_EfxForblazeBG1: @ 081408CC
454454
.incbin "fe6-base.gba", 0x1408CC, (0x141320 - 0x1408CC) @ length: 0A54
455455

456456
.global gUnk_08141320

0 commit comments

Comments
 (0)