Skip to content

Commit

Permalink
Merge pull request #547 from Eebit/magic-gleipnir
Browse files Browse the repository at this point in the history 
Decompile Gleipnir spell anim
  • Loading branch information
@RevoSucks
RevoSucks authored Jan 9, 2024
2 parents 1da0d39 + 50f777d commit 37acbc6
Show file tree
Hide file tree
Showing 15 changed files with 2,412 additions and 2,877 deletions.
2,513 changes: 0 additions & 2,513 deletions asm/banim-efxmagic-66514.s
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions asm/banim-ekrcheckenable.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,7 @@ _08057A18:
strh r4, [r0, #2]
strh r4, [r0]
_08057A1E:
ldr r5, _08057A40 @ gBanimGackgroundIndex
ldr r5, _08057A40 @ gBanimBackgroundIndex
movs r0, #0
strh r0, [r5]
bl GetBattleAnimType
Expand All @@ -1302,7 +1302,7 @@ _08057A1E:
b _08057A50
.align 2, 0
_08057A3C: .4byte gUnknown_0203E1DC
_08057A40: .4byte gBanimGackgroundIndex
_08057A40: .4byte gBanimBackgroundIndex
_08057A44: .4byte gEkrPairSideVaild
_08057A48: .4byte gEkrPairTerrainID
_08057A4C:
Expand All @@ -1322,7 +1322,7 @@ _08057A66:
bl CheckBanimHensei
cmp r0, #1
bne _08057A74
ldr r1, _08057C80 @ gBanimGackgroundIndex
ldr r1, _08057C80 @ gBanimBackgroundIndex
movs r0, #0x3c
strh r0, [r1]
_08057A74:
Expand Down Expand Up @@ -1589,7 +1589,7 @@ _08057C72:
.align 2, 0
_08057C78: .4byte gEkrPairTerrainID
_08057C7C: .4byte gPlaySt
_08057C80: .4byte gBanimGackgroundIndex
_08057C80: .4byte gBanimBackgroundIndex
_08057C84: .4byte gEkrDistanceType
_08057C88: .4byte gEkrPairSideVaild
_08057C8C: .4byte gEkrPairBanimID2
Expand Down
251 changes: 0 additions & 251 deletions data/banim-efxdevilatk.s
View file
Original file line number Diff line number Diff line change
@@ -1,256 +1,5 @@
.section .data

.global gUnknown_085D8318
gUnknown_085D8318: @ 0x085D8318
@ PROC_NAME
.short 0x1, 0x0
.word 0x80ded94
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_8068BB8
@ PROC_END
.short 0x0, 0x0
.word 0x0


.global gUnknown_085D8330
gUnknown_085D8330: @ 0x085D8330
@ PROC_NAME
.short 0x1, 0x0
.word 0x80deda4
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_8068D20
@ PROC_END
.short 0x0, 0x0
.word 0x0


.global gUnknown_085D8348
gUnknown_085D8348: @ 0x085D8348
.4byte gUnknown_086A66D8 + 0x20
.4byte gUnknown_086A66D8 + 0x1c8
.4byte gUnknown_086A66D8 + 0x33c
.4byte gUnknown_086A66D8 + 0x4b0
.4byte gUnknown_086A66D8 + 0x5f8
.4byte gUnknown_086A66D8 + 0x704
.4byte gUnknown_086A66D8 + 0x7e4
.4byte gUnknown_086A66D8 + 0x8bc
.4byte gUnknown_086A66D8 + 0x980
.4byte gUnknown_086A66D8 + 0xa3c
.4byte gUnknown_086A66D8 + 0xae0

.global gUnknown_085D8374
gUnknown_085D8374: @ 0x085D8374
.4byte gUnknown_086A2EAC + 0x14
.4byte gUnknown_086A2EAC + 0x624
.4byte gUnknown_086A2EAC + 0xcf4
.4byte gUnknown_086A2EAC + 0x13c4
.4byte gUnknown_086A2EAC + 0x1a2c
.4byte gUnknown_086A2EAC + 0x1ff0
.4byte gUnknown_086A2EAC + 0x24e0
.4byte gUnknown_086A2EAC + 0x28c0
.4byte gUnknown_086A2EAC + 0x2ca0
.4byte gUnknown_086A2EAC + 0x3080
.4byte gUnknown_086A2EAC + 0x3458

.global ProcScr_efxDarkGradoBG01
ProcScr_efxDarkGradoBG01: @ 0x085D83A0
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dede8
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_8069100
@ PROC_END
.short 0x0, 0x0
.word 0x0


.global gUnknown_085D83B8
gUnknown_085D83B8: @ 0x085D83B8
.4byte gUnknown_086A66D8 + 0xc3a0
.4byte gUnknown_086A66D8 + 0xc458
.4byte gUnknown_086A66D8 + 0xc51c
.4byte gUnknown_086A66D8 + 0xc5f4
.4byte gUnknown_086A66D8 + 0xc6e0
.4byte gUnknown_086A66D8 + 0xc7e4
.4byte gUnknown_086A66D8 + 0xc900
.4byte gUnknown_086A66D8 + 0xca3c
.4byte gUnknown_086A66D8 + 0xcb94
.4byte gUnknown_086A66D8 + 0xcd08
.4byte gUnknown_086A66D8 + 0xcea0
.4byte gUnknown_086A66D8 + 0xd05c
.4byte gUnknown_086A66D8 + 0xd224
.4byte gUnknown_086A66D8 + 0xd414
.4byte gUnknown_086A66D8 + 0xd610
.4byte gUnknown_086A66D8 + 0xd828

.global gUnknown_085D83F8
gUnknown_085D83F8: @ 0x085D83F8
.4byte gUnknown_086A66D8 + 0xb80
.4byte gUnknown_086A66D8 + 0xfe8
.4byte gUnknown_086A66D8 + 0x14ec
.4byte gUnknown_086A66D8 + 0x1aa4
.4byte gUnknown_086A66D8 + 0x2114
.4byte gUnknown_086A66D8 + 0x2870
.4byte gUnknown_086A66D8 + 0x30d0
.4byte gUnknown_086A66D8 + 0x3a64
.4byte gUnknown_086A66D8 + 0x4508
.4byte gUnknown_086A66D8 + 0x50b8
.4byte gUnknown_086A66D8 + 0x5dd8
.4byte gUnknown_086A66D8 + 0x6be0
.4byte gUnknown_086A66D8 + 0x7b48
.4byte gUnknown_086A66D8 + 0x8b94
.4byte gUnknown_086A66D8 + 0x9cc0
.4byte gUnknown_086A66D8 + 0xaeec

.global gUnknown_085D8438
gUnknown_085D8438: @ 0x085D8438
.4byte gUnknown_086A66D8 + 0xc1a0
.4byte gUnknown_086A66D8 + 0xc1c0
.4byte gUnknown_086A66D8 + 0xc1e0
.4byte gUnknown_086A66D8 + 0xc200
.4byte gUnknown_086A66D8 + 0xc220
.4byte gUnknown_086A66D8 + 0xc240
.4byte gUnknown_086A66D8 + 0xc260
.4byte gUnknown_086A66D8 + 0xc280
.4byte gUnknown_086A66D8 + 0xc2a0
.4byte gUnknown_086A66D8 + 0xc2c0
.4byte gUnknown_086A66D8 + 0xc2e0
.4byte gUnknown_086A66D8 + 0xc300
.4byte gUnknown_086A66D8 + 0xc320
.4byte gUnknown_086A66D8 + 0xc340
.4byte gUnknown_086A66D8 + 0xc360
.4byte gUnknown_086A66D8 + 0xc380

.global gUnknown_085D8478
gUnknown_085D8478: @ 0x085D8478
.4byte gUnknown_086B52CC + 0x20

.global gUnknown_085D847C
gUnknown_085D847C: @ 0x085D847C
.4byte gUnknown_086A66D8 + 0xda44
.4byte gUnknown_086B52CC

.global ProcScr_efxDarkGradoBG02
ProcScr_efxDarkGradoBG02: @ 0x085D8484
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dee48
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_806935C
@ PROC_SLEEP
.short 0xe, 0xe
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_80693CC
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_8069400
@ PROC_END
.short 0x0, 0x0
.word 0x0


.global gUnknown_085D84B4
gUnknown_085D84B4: @ 0x085D84B4
@ PROC_CALL
.short 0x2, 0x0
.word sub_8069528
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_8069530
@ PROC_CALL
.short 0x2, 0x0
.word EnablePaletteSync
@ PROC_END
.short 0x0, 0x0
.word 0x0


.global gUnknown_085D84D4
gUnknown_085D84D4: @ 0x085D84D4
.incbin "baserom.gba", 0x5D84D4, 0x50

.global gUnknown_085D8524
gUnknown_085D8524: @ 0x085D8524
.incbin "baserom.gba", 0x5D8524, 0x50

.global gUnknown_085D8574
gUnknown_085D8574: @ 0x085D8574
.incbin "baserom.gba", 0x5D8574, 0x50

.global gUnknown_085D85C4
gUnknown_085D85C4: @ 0x085D85C4
.incbin "baserom.gba", 0x5D85C4, 0x50

.global gUnknown_085D8614
gUnknown_085D8614: @ 0x085D8614
.incbin "baserom.gba", 0x5D8614, 0x50

.global gUnknown_085D8664
gUnknown_085D8664: @ 0x085D8664
.incbin "baserom.gba", 0x5D8664, 0x50

.global gUnknown_085D86B4
gUnknown_085D86B4: @ 0x085D86B4
.incbin "baserom.gba", 0x5D86B4, 0x50

.global gUnknown_085D8704
gUnknown_085D8704: @ 0x085D8704
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dee5c
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_80697F4
@ PROC_END
.short 0x0, 0x0
.word 0x0


.global ProcScr_efxDarkGradoOBJ01
ProcScr_efxDarkGradoOBJ01: @ 0x085D871C
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dee74
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_80699A8
@ PROC_END
.short 0x0, 0x0
.word 0x0


.global ProcScr_efxDarkGradoOBJ02piece
ProcScr_efxDarkGradoOBJ02piece: @ 0x085D8734
@ PROC_NAME
.short 0x1, 0x0
.word 0x80dee88
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_8069AFC
@ PROC_END
.short 0x0, 0x0
.word 0x0


.global ProcScr_efxDarkGradoOBJ02
ProcScr_efxDarkGradoOBJ02: @ 0x085D874C
@ PROC_NAME
.short 0x1, 0x0
.word 0x80deea0
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_8069CDC
@ PROC_END
.short 0x0, 0x0
.word 0x0


.global ProcScr_efxCrimsonEye
ProcScr_efxCrimsonEye: @ 0x085D8764
@ PROC_NAME
Expand Down
18 changes: 1 addition & 17 deletions data/const_data_efxmagic.s
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,6 @@
.section .rodata

.asciz "efxDarkGrado"
.align 2, 0

.asciz "efxDarkGradoMapFadeOut"
.align 2, 0

.global gUnknown_080DEDBC
gUnknown_080DEDBC: @ 0x080DEDBC
.incbin "baserom.gba", 0xDEDBC, 0x3E

.global gUnknown_080DEDFA
gUnknown_080DEDFA: @ 0x080DEDFA
.incbin "baserom.gba", 0xDEDFA, 0x46

.global gUnknown_080DEE40
gUnknown_080DEE40: @ 0x080DEE40
.incbin "baserom.gba", 0xDEE40, 0x82
.asciz "efxCrimsonEye"

.global gUnknown_080DEEC2
gUnknown_080DEEC2: @ 0x080DEEC2
Expand Down
Loading

0 comments on commit 37acbc6

Please sign in to comment.