Merge pull request #591 from MokhaLeee/animreview0306

Animreview0306
FireEmblemUniverse · Mar 15, 2024 · 2929412 · 2929412
2 parents 8bb14d3 + a0e44ee
commit 2929412
Show file tree

Hide file tree

Showing 28 changed files with 7,489 additions and 10,636 deletions.
diff --git a/asm/banim-ekrdragon.s b/asm/banim-ekrdragon.s
diff --git a/data/banim-efxhit.s b/data/banim-efxhit.s
@@ -1,40 +1,5 @@
 	.section .data
 
-	.global ProcScr_efxYushaSpinShield
-ProcScr_efxYushaSpinShield:  @ 0x085D8EC4
-        @ PROC_NAME
-        .short 0x1, 0x0
-        .word 0x80df308
-        @ PROC_REPEAT
-        .short 0x3, 0x0
-        .word EfxYushaSpinShieldMain
-        @ PROC_END
-        .short 0x0, 0x0
-        .word 0x0
-
-
-	.global ProcScr_efxYushaSpinShieldOBJ
-ProcScr_efxYushaSpinShieldOBJ:  @ 0x085D8EDC
-        @ PROC_NAME
-        .short 0x1, 0x0
-        .word 0x80df31c
-        @ PROC_REPEAT
-        .short 0x3, 0x0
-        .word efxYushaSpinShieldOBJ_806CD14
-        @ PROC_REPEAT
-        .short 0x3, 0x0
-        .word efxYushaSpinShieldOBJ_806CD7C
-        @ PROC_REPEAT
-        .short 0x3, 0x0
-        .word efxYushaSpinShieldOBJ_806CDA4
-        @ PROC_REPEAT
-        .short 0x3, 0x0
-        .word efxYushaSpinShieldOBJ_806CE08
-        @ PROC_END
-        .short 0x0, 0x0
-        .word 0x0
-
-
 	.global ProcScr_efxHurtmutEff00
 ProcScr_efxHurtmutEff00:  @ 0x085D8F0C
         @ PROC_NAME

diff --git a/data/const_data_banimekrdk.s b/data/const_data_banimekrdk.s
@@ -1,11 +1,5 @@
     .section .rodata
 
-	.asciz "ekrDragonQuake"
-	.align 2, 0
-
-	.asciz "ekrWhiteINOUT"
-	.align 2, 0
-
 	.incbin "baserom.gba", 0xDFA2C, 0xE1164 - 0xDFA2C
 
 	.global Pal_080E1164

diff --git a/data/const_data_efxhit.s b/data/const_data_efxhit.s
@@ -1,6 +1,6 @@
     .section .rodata
 
-	.incbin "baserom.gba", 0xDF308, 0xDF386 - 0xDF308
+	.incbin "baserom.gba", 0xDF334, 0xDF386 - 0xDF334
 
 	.global gUnknown_080DF386
 gUnknown_080DF386:  @ 0x080DF386

diff --git a/data/data-ekrdragon.s b/data/data-ekrdragon.s
@@ -1,29 +1,7 @@
 	.section .data
 
-	.global ProcScr_ekrWhiteINOUT
-ProcScr_ekrWhiteINOUT:  @ 0x087586F0
-        @ PROC_NAME
-        .short 0x1, 0x0
-        .word 0x80dfa1c
-        @ PROC_REPEAT
-        .short 0x3, 0x0
-        .word sub_80705A8
-        @ PROC_REPEAT
-        .short 0x3, 0x0
-        .word sub_8070618
-        @ PROC_REPEAT
-        .short 0x3, 0x0
-        .word sub_8070670
-        @ PROC_REPEAT
-        .short 0x3, 0x0
-        .word sub_80706E0
-        @ PROC_END
-        .short 0x0, 0x0
-        .word 0x0
-
-
-	.global gUnknown_08758720
-gUnknown_08758720:  @ 0x08758720
+	.global ProcScr_EkrDragon_08758720
+ProcScr_EkrDragon_08758720:  @ 0x08758720
         @ PROC_YIELD
         .short 0xe, 0x0
         .word 0x0