Skip to content

magic: import and decompile tornado, whirl #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
j3lee wants to merge 3 commits into from
Closed

magic: import and decompile tornado, whirl #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3887c8
tornado: import and decompile the overlay
j3lee Oct 12, 2026
a04deaa
whirl: import and decompile the overlay
j3lee Oct 12, 2026
5fdd5f3
magic: use getScratchAddr for the scratchpad pointers in tornado and …
j3lee Oct 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ set(FF7_MAGIC
src/magic/mabaria.c
src/magic/sennkoku.c
src/magic/thunder.c
src/magic/tornado.c
src/magic/whirl.c
)

add_executable(str tools/str.c)
Expand Down
12 changes: 12 additions & 0 deletions config/symbols.magic-tornado.us.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
MAGIC_Tornado = 0x801B0000;
TornadoSpriteParticleAlloc = 0x801B0020;
TornadoSpriteParticleTick = 0x801B0098;
TornadoRibbonParticleTick = 0x801B03AC;
TornadoRibbonParticleAlloc = 0x801B07E0;
TornadoSpriteDriverTick = 0x801B0858;
TornadoRibbonDriverTick = 0x801B0924;
TornadoModelTick = 0x801B0A1C;
TornadoTargetTick = 0x801B0C8C;
TornadoTargetSetup = 0x801B0F60;
TornadoDoubleBufferFlip = 0x801B1070;
TornadoStart = 0x801B10F4;
12 changes: 12 additions & 0 deletions config/symbols.magic-whirl.us.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
MAGIC_Whirl = 0x801B0000;
WhirlSpriteParticleAlloc = 0x801B0020;
WhirlSpriteParticleTick = 0x801B0098;
WhirlRibbonParticleTick = 0x801B0398;
WhirlRibbonParticleAlloc = 0x801B07CC;
WhirlSpriteDriverTick = 0x801B0844;
WhirlRibbonDriverTick = 0x801B0910;
WhirlModelTick = 0x801B0A08;
WhirlTargetTick = 0x801B0C78;
WhirlTargetSetup = 0x801B0F4C;
WhirlDoubleBufferFlip = 0x801B105C;
WhirlStart = 0x801B10E0;
26 changes: 26 additions & 0 deletions config/us.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,3 +807,29 @@ overlays:
- [0, c, sennkoku]
- [0x930, data, sennkoku_model]
- [0x559C, data, sennkoku_buffers]
# TORNADO.BIN -- effect overlay
- name: tornado
disk_path: disks/us/MAGIC/TORNADO.BIN
sha1: c9ca61f5c400f2f5be76ca310f449f32cdee8db9
base_path: magic
imports: [main, battle]
vram_start: 0x801B0000
symbol_addrs_path:
- config/symbols.magic-tornado.us.txt
segments:
- [0, c, tornado]
- [0x1164, data, tornado_model]
- [0x12F10, data, tornado_buffers]
# WHIRL.BIN -- effect overlay
- name: whirl
disk_path: disks/us/MAGIC/WHIRL.BIN
sha1: 9b34335281ec8a5bead8d231ad0654ba9b0c3b61
base_path: magic
imports: [main, battle]
vram_start: 0x801B0000
symbol_addrs_path:
- config/symbols.magic-whirl.us.txt
segments:
- [0, c, whirl]
- [0x1150, data, whirl_model]
- [0x12EFC, data, whirl_buffers]
Loading
Loading