Skip to content

Commit 46e21b3

Browse files
MokhaLeeeMokhaLeee
authored
Merge pull request #53 from MokhaLeee/main
banim-main decomped
2 parents 3dfe5ca + 0b92145 commit 46e21b3

22 files changed

+1440
-1916
lines changed

‎asm/banim_efxmagic.s‎

Lines changed: 0 additions & 174 deletions
Original file line numberDiff line numberDiff line change
@@ -1,180 +1,6 @@
11
.include "macro.inc"
22
.syntax unified
33

4-
thumb_func_start StartSpellAnimFimbulvetr
5-
StartSpellAnimFimbulvetr: @ 0x0804F5C4
6-
push {r4, r5, lr}
7-
adds r5, r0, #0
8-
bl SpellFx_Begin
9-
bl NewEfxSpellCast
10-
bl SpellFx_SetBG1Position
11-
ldr r0, .L0804F5FC @ =ProcScr_EfxFimbulvetr
12-
movs r1, #3
13-
bl SpawnProc
14-
adds r4, r0, #0
15-
str r5, [r4, #0x5c]
16-
movs r0, #0
17-
strh r0, [r4, #0x2c]
18-
adds r0, r5, #0
19-
bl GetAnimRoundTypeAnotherSide
20-
lsls r0, r0, #0x10
21-
asrs r0, r0, #0x10
22-
bl CheckRoundMiss
23-
adds r4, #0x29
24-
strb r0, [r4]
25-
pop {r4, r5}
26-
pop {r0}
27-
bx r0
28-
.align 2, 0
29-
.L0804F5FC: .4byte ProcScr_EfxFimbulvetr
30-
31-
thumb_func_start EfxFimbulvetr_Loop
32-
EfxFimbulvetr_Loop: @ 0x0804F600
33-
push {r4, r5, r6, r7, lr}
34-
mov r7, r8
35-
push {r7}
36-
sub sp, #8
37-
adds r4, r0, #0
38-
ldr r0, [r4, #0x5c]
39-
bl GetAnimAnotherSide
40-
adds r5, r0, #0
41-
bl EfxGetCamMovDuration
42-
adds r6, r0, #0
43-
ldrh r0, [r4, #0x2c]
44-
adds r0, #1
45-
movs r1, #0
46-
mov r8, r1
47-
movs r7, #0
48-
strh r0, [r4, #0x2c]
49-
lsls r0, r0, #0x10
50-
asrs r0, r0, #0x10
51-
cmp r0, #1
52-
bne .L0804F636
53-
ldr r0, [r4, #0x5c]
54-
movs r1, #1
55-
rsbs r1, r1, #0
56-
bl NewEfxFarAttackWithDistance
57-
.L0804F636:
58-
movs r2, #0x2c
59-
ldrsh r1, [r4, r2]
60-
adds r0, r6, #1
61-
cmp r1, r0
62-
bne .L0804F692
63-
adds r0, r5, #0
64-
bl NewEfxFimbulvetrBGTR
65-
adds r0, r5, #0
66-
bl NewEfxFimbulvetrOBJ2
67-
ldr r3, .L0804F6A8 @ =gDispIo
68-
adds r2, r3, #0
69-
adds r2, #0x3c
70-
movs r0, #0x3f
71-
ldrb r1, [r2]
72-
ands r0, r1
73-
movs r1, #0x40
74-
orrs r0, r1
75-
strb r0, [r2]
76-
adds r0, r3, #0
77-
adds r0, #0x44
78-
mov r2, r8
79-
strb r2, [r0]
80-
adds r0, #1
81-
movs r1, #0x10
82-
strb r1, [r0]
83-
adds r0, #1
84-
strb r2, [r0]
85-
str r1, [sp]
86-
str r7, [sp, #4]
87-
adds r0, r5, #0
88-
movs r1, #0
89-
movs r2, #0x10
90-
movs r3, #0
91-
bl NewEfxALPHA
92-
movs r0, #0x91
93-
lsls r0, r0, #1
94-
movs r1, #0x80
95-
lsls r1, r1, #1
96-
movs r3, #2
97-
ldrsh r2, [r5, r3]
98-
movs r3, #1
99-
bl PlaySFX
100-
.L0804F692:
101-
movs r0, #0x2c
102-
ldrsh r1, [r4, r0]
103-
adds r0, r6, #0
104-
adds r0, #0x52
105-
cmp r1, r0
106-
bne .L0804F6AC
107-
ldr r0, [r4, #0x5c]
108-
movs r1, #4
109-
bl NewEfxFlashBgWhite
110-
b .L0804F72C
111-
.align 2, 0
112-
.L0804F6A8: .4byte gDispIo
113-
.L0804F6AC:
114-
adds r0, r6, #0
115-
adds r0, #0x55
116-
cmp r1, r0
117-
bne .L0804F6E8
118-
adds r0, r5, #0
119-
bl NewEfxFimbulvetrBG
120-
adds r0, r5, #0
121-
bl NewEfxFimbulvetrOBJ
122-
str r7, [sp]
123-
str r7, [sp, #4]
124-
adds r0, r5, #0
125-
movs r1, #0x18
126-
movs r2, #0x10
127-
movs r3, #0x10
128-
bl NewEfxALPHA
129-
ldr r0, .L0804F6E4 @ =0x00000123
130-
movs r1, #0x80
131-
lsls r1, r1, #1
132-
movs r3, #2
133-
ldrsh r2, [r5, r3]
134-
movs r3, #1
135-
bl PlaySFX
136-
b .L0804F72C
137-
.align 2, 0
138-
.L0804F6E4: .4byte 0x00000123
139-
.L0804F6E8:
140-
adds r0, r6, #0
141-
adds r0, #0x58
142-
cmp r1, r0
143-
bne .L0804F710
144-
movs r0, #9
145-
ldrh r1, [r5, #0x10]
146-
orrs r0, r1
147-
strh r0, [r5, #0x10]
148-
adds r4, #0x29
149-
ldrb r1, [r4]
150-
adds r0, r5, #0
151-
bl StartBattleAnimHitEffectsDefault
152-
ldrb r0, [r4]
153-
cmp r0, #0
154-
bne .L0804F72C
155-
adds r0, r5, #0
156-
bl EfxPlayHittedSFX
157-
b .L0804F72C
158-
.L0804F710:
159-
adds r0, r6, #0
160-
adds r0, #0x88
161-
cmp r1, r0
162-
beq .L0804F72C
163-
adds r0, #0x19
164-
cmp r1, r0
165-
bne .L0804F72C
166-
bl SpellFx_Finish
167-
bl EndEfxSpellCastAsync
168-
adds r0, r4, #0
169-
bl Proc_Break
170-
.L0804F72C:
171-
add sp, #8
172-
pop {r3}
173-
mov r8, r3
174-
pop {r4, r5, r6, r7}
175-
pop {r0}
176-
bx r0
177-
1784
thumb_func_start NewEfxFimbulvetrBGTR
1795
NewEfxFimbulvetrBGTR: @ 0x0804F738
1806
push {r4, r5, lr}

‎asm/banim_ekrbattleintrofx.s‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ NewEkrBaseKaiten: @ 0x08048574
322322
ldr r0, [r0]
323323
cmp r0, #1
324324
bne .L0804878E
325-
ldr r1, .L080487A4 @ =gUnk_081122D0
325+
ldr r1, .L080487A4 @ =BanimLeftDefaultPos
326326
ldr r0, .L080487A8 @ =gEkrDistanceType
327327
movs r3, #0
328328
ldrsh r0, [r0, r3]
@@ -341,7 +341,7 @@ NewEkrBaseKaiten: @ 0x08048574
341341
.L08048798: .4byte ProcScr_EkrBaseKaiten
342342
.L0804879C: .4byte gEkrBmLocation
343343
.L080487A0: .4byte gEkrInitPosReal
344-
.L080487A4: .4byte gUnk_081122D0
344+
.L080487A4: .4byte BanimLeftDefaultPos
345345
.L080487A8: .4byte gEkrDistanceType
346346
.L080487AC: .4byte AnimScrs_EkrBaseKaiten2
347347
.L080487B0:
@@ -414,7 +414,7 @@ NewEkrBaseKaiten: @ 0x08048574
414414
ldr r0, [r0]
415415
cmp r0, #0
416416
bne .L0804884C
417-
ldr r1, .L08048868 @ =gUnk_081122D0
417+
ldr r1, .L08048868 @ =BanimLeftDefaultPos
418418
ldr r0, .L0804886C @ =gEkrDistanceType
419419
movs r3, #0
420420
ldrsh r0, [r0, r3]
@@ -434,7 +434,7 @@ NewEkrBaseKaiten: @ 0x08048574
434434
.L0804885C: .4byte ProcScr_EkrBaseKaiten
435435
.L08048860: .4byte gEkrBmLocation
436436
.L08048864: .4byte gEkrInitPosReal
437-
.L08048868: .4byte gUnk_081122D0
437+
.L08048868: .4byte BanimLeftDefaultPos
438438
.L0804886C: .4byte gEkrDistanceType
439439
.L08048870: .4byte AnimScrs_EkrBaseKaiten3
440440
.L08048874:
@@ -695,12 +695,12 @@ NewEkrUnitKakudai: @ 0x080489E8
695695
func_fe6_08048A64: @ 0x08048A64
696696
push {r4, r5, r6, lr}
697697
adds r4, r0, #0
698-
ldr r1, .L08048B74 @ =gUnk_081122C0
698+
ldr r1, .L08048B74 @ =BanimDefaultStandingTypes
699699
ldr r0, .L08048B78 @ =gEkrDistanceType
700700
movs r2, #0
701701
ldrsh r0, [r0, r2]
702702
adds r0, r0, r1
703-
ldr r1, .L08048B7C @ =gUnk_08112298
703+
ldr r1, .L08048B7C @ =BanimDefaultModeConfig
704704
ldrb r0, [r0]
705705
lsls r0, r0, #2
706706
adds r0, r0, r1
@@ -724,30 +724,30 @@ func_fe6_08048A64: @ 0x08048A64
724724
ldrh r3, [r5]
725725
cmp r3, #1
726726
bne .L08048AC2
727-
ldr r0, .L08048B8C @ =gUnk_Banim_02000054
727+
ldr r0, .L08048B8C @ =gpBanimModesLeft
728728
ldr r1, [r0]
729729
lsls r0, r6, #2
730730
adds r0, r0, r1
731731
ldr r1, [r0]
732-
ldr r0, .L08048B90 @ =gUnk_Banim_0200F1C0
732+
ldr r0, .L08048B90 @ =gBanimScrs
733733
adds r1, r1, r0
734734
ldr r0, [r1, #4]
735735
ldr r1, [r1, #8]
736-
ldr r2, .L08048B94 @ =gUnk_Banim_020041C0
736+
ldr r2, .L08048B94 @ =gBanimOamBufs
737737
adds r1, r1, r2
738738
str r1, [r4, #0x54]
739-
ldr r1, .L08048B98 @ =gUnk_Banim_02000080
739+
ldr r1, .L08048B98 @ =gBanimImgSheetBufs
740740
bl LZ77UnCompWram
741741
.L08048AC2:
742742
ldrh r5, [r5, #2]
743743
cmp r5, #1
744744
bne .L08048AE6
745-
ldr r0, .L08048B9C @ =gUnk_Banim_02000058
745+
ldr r0, .L08048B9C @ =gpBanimModesRight
746746
ldr r1, [r0]
747747
lsls r0, r6, #2
748748
adds r0, r0, r1
749749
ldr r1, [r0]
750-
ldr r0, .L08048BA0 @ =gUnk_Banim_02011BC0
750+
ldr r0, .L08048BA0 @ =gBanimScrs + 0x2A00
751751
adds r1, r1, r0
752752
ldr r0, [r1, #4]
753753
ldr r1, [r1, #8]
@@ -771,7 +771,7 @@ func_fe6_08048A64: @ 0x08048A64
771771
bl LZ77UnCompWram
772772
.L08048B00:
773773
ldr r1, .L08048BB8 @ =0x06014000
774-
ldr r0, .L08048B98 @ =gUnk_Banim_02000080
774+
ldr r0, .L08048B98 @ =gBanimImgSheetBufs
775775
movs r2, #0x80
776776
lsls r2, r2, #7
777777
bl RegisterDataMove
@@ -817,7 +817,7 @@ func_fe6_08048A64: @ 0x08048A64
817817
ldr r0, [r0]
818818
cmp r0, #0
819819
bne .L08048BD0
820-
ldr r0, .L08048BCC @ =gUnk_081122D0
820+
ldr r0, .L08048BCC @ =BanimLeftDefaultPos
821821
movs r5, #0
822822
ldrsh r1, [r2, r5]
823823
lsls r1, r1, #1
@@ -827,18 +827,18 @@ func_fe6_08048A64: @ 0x08048A64
827827
strh r0, [r4, #0x38]
828828
b .L08048BE0
829829
.align 2, 0
830-
.L08048B74: .4byte gUnk_081122C0
830+
.L08048B74: .4byte BanimDefaultStandingTypes
831831
.L08048B78: .4byte gEkrDistanceType
832-
.L08048B7C: .4byte gUnk_08112298
832+
.L08048B7C: .4byte BanimDefaultModeConfig
833833
.L08048B80: .4byte gBattleSt
834834
.L08048B84: .4byte gPal
835835
.L08048B88: .4byte gBanimValid
836-
.L08048B8C: .4byte gUnk_Banim_02000054
837-
.L08048B90: .4byte gUnk_Banim_0200F1C0
838-
.L08048B94: .4byte gUnk_Banim_020041C0
839-
.L08048B98: .4byte gUnk_Banim_02000080
840-
.L08048B9C: .4byte gUnk_Banim_02000058
841-
.L08048BA0: .4byte gUnk_Banim_02011BC0
836+
.L08048B8C: .4byte gpBanimModesLeft
837+
.L08048B90: .4byte gBanimScrs
838+
.L08048B94: .4byte gBanimOamBufs
839+
.L08048B98: .4byte gBanimImgSheetBufs
840+
.L08048B9C: .4byte gpBanimModesRight
841+
.L08048BA0: .4byte gBanimScrs + 0x2A00
842842
.L08048BA4: .4byte gUnk_Banim_020099C0
843843
.L08048BA8: .4byte gUnk_Banim_02002080
844844
.L08048BAC: .4byte gBanimUnitChgForceImg
@@ -849,9 +849,9 @@ func_fe6_08048A64: @ 0x08048A64
849849
.L08048BC0: .4byte BanimTypesPosLeft
850850
.L08048BC4: .4byte BanimTypesPosRight
851851
.L08048BC8: .4byte gEkrInitPosReal
852-
.L08048BCC: .4byte gUnk_081122D0
852+
.L08048BCC: .4byte BanimLeftDefaultPos
853853
.L08048BD0:
854-
ldr r0, .L08048BEC @ =gUnk_081122D0
854+
ldr r0, .L08048BEC @ =BanimLeftDefaultPos
855855
movs r3, #0
856856
ldrsh r1, [r2, r3]
857857
lsls r1, r1, #1
@@ -866,7 +866,7 @@ func_fe6_08048A64: @ 0x08048A64
866866
pop {r0}
867867
bx r0
868868
.align 2, 0
869-
.L08048BEC: .4byte gUnk_081122D0
869+
.L08048BEC: .4byte BanimLeftDefaultPos
870870

871871
thumb_func_start func_fe6_08048BF0
872872
func_fe6_08048BF0: @ 0x08048BF0

0 commit comments

Comments
 (0)