falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spin_attack

This commit is contained in:
Dragorn421 2025-06-08 21:03:02 +02:00
parent 17dce8c606
commit 432d977cb1
No known key found for this signature in database
GPG Key ID: 381AEBAF3D429335
8 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/objects/gameplay_keep/gameplay_keep.h
View File

@ -34,7 +34,7 @@
#include "gDoorAdultOpeningRightAnim.h"
#include "eff_dust.h"
#include "eff_flash.h"
#include "gameplay_keep_0x11230.h"
#include "spin_attack.h"
#include "gameplay_keep_0x13700.h"
#include "fairy_anim.h"
#include "fairy_skel.h"

30
assets/objects/gameplay_keep/gameplay_keep_0x11230.h
View File

@ -1,30 +0,0 @@
#ifndef GAMEPLAY_KEEP_0x11230_H
#define GAMEPLAY_KEEP_0x11230_H
#include "tex_len.h"
#include "ultra64.h"
#define gTorchFlameTex_WIDTH 64
#define gTorchFlameTex_HEIGHT 32
extern u64 gTorchFlameTex[TEX_LEN(u64, gTorchFlameTex_WIDTH, gTorchFlameTex_HEIGHT, 8)];
#define gEffUnknown1Tex_WIDTH 64
#define gEffUnknown1Tex_HEIGHT 32
extern u64 gEffUnknown1Tex[TEX_LEN(u64, gEffUnknown1Tex_WIDTH, gEffUnknown1Tex_HEIGHT, 8)];
extern Vtx gSpinAttack1Vtx[];
extern Vtx gSpinAttack2Vtx[];
extern Gfx gSpinAttack1DL[36];
extern Gfx gSpinAttack2DL[36];
extern Vtx gSpinAttack3Vtx[];
extern Vtx gSpinAttack4Vtx[];
extern Gfx gSpinAttack3DL[36];
extern Gfx gSpinAttack4DL[36];
#define gFlameWall1Tex_WIDTH 32
#define gFlameWall1Tex_HEIGHT 32
extern u64 gFlameWall1Tex[TEX_LEN(u64, gFlameWall1Tex_WIDTH, gFlameWall1Tex_HEIGHT, 8)];
#define gFlameWall2Tex_WIDTH 32
#define gFlameWall2Tex_HEIGHT 32
extern u64 gFlameWall2Tex[TEX_LEN(u64, gFlameWall2Tex_WIDTH, gFlameWall2Tex_HEIGHT, 8)];
extern Vtx gSpinAttackChargingVtx[];
extern Gfx gSpinAttackChargingDL[29];
#endif

18
assets/objects/gameplay_keep/gameplay_keep_0x11230.c → assets/objects/gameplay_keep/spin_attack.c
View File

@ -1,12 +1,12 @@
#include "gameplay_keep_0x11230.h"
#include "spin_attack.h"
#include "gfx.h"
u64 gTorchFlameTex[TEX_LEN(u64, gTorchFlameTex_WIDTH, gTorchFlameTex_HEIGHT, 8)] = {
#include "assets/objects/gameplay_keep/gTorchFlameTex.i8.inc.c"
u64 gSpinAttackFireTex[TEX_LEN(u64, gSpinAttackFireTex_WIDTH, gSpinAttackFireTex_HEIGHT, 8)] = {
#include "assets/objects/gameplay_keep/gSpinAttackFireTex.i8.inc.c"
};
u64 gEffUnknown1Tex[TEX_LEN(u64, gEffUnknown1Tex_WIDTH, gEffUnknown1Tex_HEIGHT, 8)] = {
#include "assets/objects/gameplay_keep/gEffUnknown1Tex.i8.inc.c"
u64 gSpinAttackMagicTex[TEX_LEN(u64, gSpinAttackMagicTex_WIDTH, gSpinAttackMagicTex_HEIGHT, 8)] = {
#include "assets/objects/gameplay_keep/gSpinAttackMagicTex.i8.inc.c"
};
Vtx gSpinAttack1Vtx[] = {
@ -41,12 +41,12 @@ Gfx gSpinAttack4DL[36] = {
#include "assets/objects/gameplay_keep/gSpinAttack4DL.inc.c"
};
u64 gFlameWall1Tex[TEX_LEN(u64, gFlameWall1Tex_WIDTH, gFlameWall1Tex_HEIGHT, 8)] = {
#include "assets/objects/gameplay_keep/gFlameWall1Tex.i8.inc.c"
u64 gSpinAttackCharging1Tex[TEX_LEN(u64, gSpinAttackCharging1Tex_WIDTH, gSpinAttackCharging1Tex_HEIGHT, 8)] = {
#include "assets/objects/gameplay_keep/gSpinAttackCharging1Tex.i8.inc.c"
};
u64 gFlameWall2Tex[TEX_LEN(u64, gFlameWall2Tex_WIDTH, gFlameWall2Tex_HEIGHT, 8)] = {
#include "assets/objects/gameplay_keep/gFlameWall2Tex.i8.inc.c"
u64 gSpinAttackCharging2Tex[TEX_LEN(u64, gSpinAttackCharging2Tex_WIDTH, gSpinAttackCharging2Tex_HEIGHT, 8)] = {
#include "assets/objects/gameplay_keep/gSpinAttackCharging2Tex.i8.inc.c"
};
Vtx gSpinAttackChargingVtx[] = {

30
assets/objects/gameplay_keep/spin_attack.h Normal file
View File

@ -0,0 +1,30 @@
#ifndef GAMEPLAY_KEEP_SPIN_ATTACK_H
#define GAMEPLAY_KEEP_SPIN_ATTACK_H
#include "tex_len.h"
#include "ultra64.h"
#define gSpinAttackFireTex_WIDTH 64
#define gSpinAttackFireTex_HEIGHT 32
extern u64 gSpinAttackFireTex[TEX_LEN(u64, gSpinAttackFireTex_WIDTH, gSpinAttackFireTex_HEIGHT, 8)];
#define gSpinAttackMagicTex_WIDTH 64
#define gSpinAttackMagicTex_HEIGHT 32
extern u64 gSpinAttackMagicTex[TEX_LEN(u64, gSpinAttackMagicTex_WIDTH, gSpinAttackMagicTex_HEIGHT, 8)];
extern Vtx gSpinAttack1Vtx[];
extern Vtx gSpinAttack2Vtx[];
extern Gfx gSpinAttack1DL[36];
extern Gfx gSpinAttack2DL[36];
extern Vtx gSpinAttack3Vtx[];
extern Vtx gSpinAttack4Vtx[];
extern Gfx gSpinAttack3DL[36];
extern Gfx gSpinAttack4DL[36];
#define gSpinAttackCharging1Tex_WIDTH 32
#define gSpinAttackCharging1Tex_HEIGHT 32
extern u64 gSpinAttackCharging1Tex[TEX_LEN(u64, gSpinAttackCharging1Tex_WIDTH, gSpinAttackCharging1Tex_HEIGHT, 8)];
#define gSpinAttackCharging2Tex_WIDTH 32
#define gSpinAttackCharging2Tex_HEIGHT 32
extern u64 gSpinAttackCharging2Tex[TEX_LEN(u64, gSpinAttackCharging2Tex_WIDTH, gSpinAttackCharging2Tex_HEIGHT, 8)];
extern Vtx gSpinAttackChargingVtx[];
extern Gfx gSpinAttackChargingDL[29];
#endif

8
assets/xml/objects/gameplay_keep.xml
View File

@ -753,8 +753,8 @@
<DList Name="gEffFlash1DL" Offset="0x105D0"/>
<DList Name="gEffFlash2DL" Offset="0x10648"/>
<Texture Name="gFlashTex" Format="i8" Width="64" Height="64" Offset="0x106C8"/>
<Texture Name="gTorchFlameTex" Format="i8" Width="64" Height="32" Offset="0x116D0"/>
<Texture Name="gEffUnknown1Tex" Format="i8" Width="64" Height="32" Offset="0x11ED0"/>
<Texture Name="gSpinAttackFireTex" Format="i8" Width="64" Height="32" Offset="0x116D0"/>
<Texture Name="gSpinAttackMagicTex" Format="i8" Width="64" Height="32" Offset="0x11ED0"/>
<Array Name="gSpinAttack1Vtx" Count="26" Offset="0x126D0">
<Vtx/>
</Array>
@ -771,8 +771,8 @@
</Array>
<DList Name="gSpinAttack3DL" Offset="0x12F90"/>
<DList Name="gSpinAttack4DL" Offset="0x130B0"/>
<Texture Name="gFlameWall1Tex" Format="i8" Width="32" Height="32" Offset="0x131D0"/>
<Texture Name="gFlameWall2Tex" Format="i8" Width="32" Height="32" Offset="0x135D0"/>
<Texture Name="gSpinAttackCharging1Tex" Format="i8" Width="32" Height="32" Offset="0x131D0"/>
<Texture Name="gSpinAttackCharging2Tex" Format="i8" Width="32" Height="32" Offset="0x135D0"/>
<Array Name="gSpinAttackChargingVtx" Count="14" Offset="0x139D0">
<Vtx/>
</Array>

8
assets/xml/objects/gameplay_keep_pal.xml
View File

@ -745,8 +745,8 @@
<DList Name="gEffFlash1DL" Offset="0x10130"/>
<DList Name="gEffFlash2DL" Offset="0x101A8"/>
<Texture Name="gFlashTex" Format="i8" Width="64" Height="64" Offset="0x10228"/>
<Texture Name="gTorchFlameTex" Format="i8" Width="64" Height="32" Offset="0x11230"/>
<Texture Name="gEffUnknown1Tex" Format="i8" Width="64" Height="32" Offset="0x11A30"/>
<Texture Name="gSpinAttackFireTex" Format="i8" Width="64" Height="32" Offset="0x11230"/>
<Texture Name="gSpinAttackMagicTex" Format="i8" Width="64" Height="32" Offset="0x11A30"/>
<Array Name="gSpinAttack1Vtx" Count="26" Offset="0x12230">
<Vtx/>
</Array>
@ -763,8 +763,8 @@
</Array>
<DList Name="gSpinAttack3DL" Offset="0x12AF0"/>
<DList Name="gSpinAttack4DL" Offset="0x12C10"/>
<Texture Name="gFlameWall1Tex" Format="i8" Width="32" Height="32" Offset="0x12D30"/>
<Texture Name="gFlameWall2Tex" Format="i8" Width="32" Height="32" Offset="0x13130"/>
<Texture Name="gSpinAttackCharging1Tex" Format="i8" Width="32" Height="32" Offset="0x12D30"/>
<Texture Name="gSpinAttackCharging2Tex" Format="i8" Width="32" Height="32" Offset="0x13130"/>
<Array Name="gSpinAttackChargingVtx" Count="14" Offset="0x13530">
<Vtx/>
</Array>

2
spec/spec
View File

@ -1031,7 +1031,7 @@ beginseg
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gDoorAdultOpeningRightAnim.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_dust.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/eff_flash.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x11230.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/spin_attack.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/gameplay_keep_0x13700.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/fairy_anim.o"
include "$(BUILD_DIR)/assets/objects/gameplay_keep/fairy_skel.o"

2
src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
View File

@ -12,7 +12,7 @@
#include "player.h"
#include "save.h"
#include "assets/objects/gameplay_keep/gameplay_keep_0x11230.h"
#include "assets/objects/gameplay_keep/spin_attack.h"
#define FLAGS 0