magic: import and decompile hadoho, shaku, re_do

CMakeLists.txt

@@ -89,9 +89,12 @@ set(FF7_MINI
 set(FF7_MAGIC
     src/magic/barrier.c
     src/magic/brizad.c
+    src/magic/hadoho.c
     src/magic/lv5deth.c
     src/magic/mabaria.c
+    src/magic/re_do.c
     src/magic/sennkoku.c
+    src/magic/shaku.c
     src/magic/thunder.c
 )
 

config/symbols.magic-hadoho.us.txt

@@ -0,0 +1,19 @@
+MAGIC_Hadoho = 0x801B0000;
+HadohoTargetCenterCalc = 0x801B0020;
+HadohoSprayVectorCalc = 0x801B01CC;
+HadohoSpriteMatrixSetup = 0x801B02FC;
+HadohoDoubleBufferFlip = 0x801B045C;
+HadohoViewportFlashTick = 0x801B04C8;
+HadohoSparkSpriteTick = 0x801B05B0;
+HadohoEmberTick = 0x801B066C;
+HadohoRisingModelTick = 0x801B0888;
+HadohoGrowingModelTick = 0x801B09E8;
+HadohoShrinkingModelTick = 0x801B0B44;
+HadohoDriftSpriteTick = 0x801B0CC8;
+HadohoPulseSpriteTick = 0x801B0DB4;
+HadohoBeamColumnTick = 0x801B0EB4;
+HadohoBeamHeadTick = 0x801B10A8;
+HadohoMainTick = 0x801B1598;
+HadohoStart = 0x801B1978;
+g_HadohoPrimBuffer = 0x801D5648;
+g_HadohoBufferPtr = 0x801ED648;

config/symbols.magic-re_do.us.txt

@@ -0,0 +1,19 @@
+MAGIC_ReDo = 0x801B0000;
+ReDoTargetCenterCalc = 0x801B0020;
+ReDoSprayVectorCalc = 0x801B01CC;
+ReDoSpriteMatrixSetup = 0x801B02FC;
+ReDoDoubleBufferFlip = 0x801B045C;
+ReDoViewportFlashTick = 0x801B04C8;
+ReDoSparkSpriteTick = 0x801B05A8;
+ReDoEmberTick = 0x801B0664;
+ReDoRisingModelTick = 0x801B0880;
+ReDoGrowingModelTick = 0x801B09E0;
+ReDoShrinkingModelTick = 0x801B0B3C;
+ReDoDriftSpriteTick = 0x801B0CC0;
+ReDoPulseSpriteTick = 0x801B0DAC;
+ReDoBeamColumnTick = 0x801B0EAC;
+ReDoBeamHeadTick = 0x801B10A0;
+ReDoMainTick = 0x801B1590;
+ReDoStart = 0x801B1A54;
+g_ReDoPrimBuffer = 0x801D5738;
+g_ReDoBufferPtr = 0x801ED738;

config/symbols.magic-shaku.us.txt

@@ -0,0 +1,19 @@
+MAGIC_Shaku = 0x801B0000;
+ShakuTargetCenterCalc = 0x801B0020;
+ShakuSprayVectorCalc = 0x801B01CC;
+ShakuSpriteMatrixSetup = 0x801B02FC;
+ShakuDoubleBufferFlip = 0x801B045C;
+ShakuViewportFlashTick = 0x801B04C8;
+ShakuSparkSpriteTick = 0x801B05A8;
+ShakuEmberTick = 0x801B0664;
+ShakuRisingModelTick = 0x801B0880;
+ShakuGrowingModelTick = 0x801B09E0;
+ShakuShrinkingModelTick = 0x801B0B3C;
+ShakuDriftSpriteTick = 0x801B0CC0;
+ShakuPulseSpriteTick = 0x801B0DAC;
+ShakuBeamColumnTick = 0x801B0EAC;
+ShakuBeamHeadTick = 0x801B10A0;
+ShakuMainTick = 0x801B1590;
+ShakuStart = 0x801B1970;
+g_ShakuPrimBuffer = 0x801D5768;
+g_ShakuBufferPtr = 0x801ED768;

config/us.yaml

@@ -807,3 +807,42 @@ overlays:
       - [0, c, sennkoku]
       - [0x930, data, sennkoku_model]
       - [0x559C, data, sennkoku_buffers]
+  # HADOHO.BIN -- effect overlay
+  - name: hadoho
+    disk_path: disks/us/MAGIC/HADOHO.BIN
+    sha1: 850cc7b46911dd9c300f4c0a7928a55cd097d84c
+    base_path: magic
+    imports: [main, battle]
+    vram_start: 0x801B0000
+    symbol_addrs_path:
+      - config/symbols.magic-hadoho.us.txt
+    segments:
+      - [0, c, hadoho]
+      - [0x1B40, data, hadoho_model]
+      - [0x25648, data, hadoho_buffers]
+  # SHAKU.BIN -- effect overlay
+  - name: shaku
+    disk_path: disks/us/MAGIC/SHAKU.BIN
+    sha1: fe2958f8b1b2ac815ba968c1e9979e88daa943c2
+    base_path: magic
+    imports: [main, battle]
+    vram_start: 0x801B0000
+    symbol_addrs_path:
+      - config/symbols.magic-shaku.us.txt
+    segments:
+      - [0, c, shaku]
+      - [0x1B38, data, shaku_model]
+      - [0x25768, data, shaku_buffers]
+  # RE_DO.BIN -- effect overlay
+  - name: re_do
+    disk_path: disks/us/MAGIC/RE_DO.BIN
+    sha1: f27b56b6b0666873bb632a35d345ecbf6b15b52f
+    base_path: magic
+    imports: [main, battle]
+    vram_start: 0x801B0000
+    symbol_addrs_path:
+      - config/symbols.magic-re_do.us.txt
+    segments:
+      - [0, c, re_do]
+      - [0x1B08, data, re_do_model]
+      - [0x25738, data, re_do_buffers]