izzy/Starship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Starship.git synced 2026-07-05 15:19:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

torch update, ast_area_6 and ast_vs_player, new names (#169)

Browse Source 
* split up

* format

* torch

* headers

* just keep going

* torch

* names and such

* format

* remove headers
This commit is contained in:
petrie911
2024-03-17 01:06:28 -03:00
committed by GitHub
parent 60a64d402f
commit a7aac0753d
68 changed files with 2395 additions and 1407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/assets.h
+23 -27
View File
@@ -23,13 +23,13 @@ extern Gfx D_4007AF0[];
*/
extern Gfx D_60005B0[]; // fox_bg
extern Gfx D_6000A80[]; // fox_bg, fox_effect
extern u16 D_6000B60[]; // fox_radio
extern u16 D_A6_6000B60[]; // fox_radio
extern Gfx D_6000E00[]; // fox_edata_1C
extern Gfx D_6001360[]; // fox_bg, fox_demo, fox_edata_1C
extern Gfx D_6001530[]; // fox_360, fox_demo, fox_ka
extern Gfx D_6001840[]; // fox_bg
extern Gfx D_6001A60[]; // fox_effect
extern u16 D_6001A80[]; // fox_radio
extern u16 D_A6_6001A80[]; // fox_radio
extern u8 D_6001B80[]; // fox_hud
extern Vtx D_6001C50[]; // fox_play
extern u8 D_6001C80[]; // fox_map
@@ -38,7 +38,7 @@ extern u8 D_60020D0[]; // fox_hud
extern u8 D_6002160[]; // fox_map
extern Gfx D_60023B0[]; // fox_edata_1C
extern Gfx D_6002990[]; // fox_edata_1C
extern u16 D_60029A0[]; // fox_radio
extern u16 D_A6_60029A0[]; // fox_radio
extern Gfx D_6002E60[]; // fox_bg
extern Gfx D_6002F80[]; // fox_bg
extern Gfx D_6003000[]; // fox_edata_1C
@@ -47,7 +47,7 @@ extern Gfx D_60030F0[]; // fox_edata_1C
extern Gfx D_60034D0[]; // fox_edata_1C, fox_enmy2
extern Gfx D_60036A0[]; // fox_edata_1C, fox_enmy2
extern Gfx D_6003760[];
extern u16 D_60038C0[];
extern u16 D_A6_60038C0[];
extern Gfx D_60038E0[];
extern u16 D_60038F8[];
extern u8 D_6003B50[];
@@ -56,13 +56,13 @@ extern Gfx D_6004330[];
extern Vtx D_6004500[];
extern Gfx D_6004570[];
extern Gfx D_60046F0[];
extern u16 D_60047E0[];
extern u16 D_A6_60047E0[];
extern Gfx D_6004900[];
extern u8 D_6004AC0[];
extern Gfx D_6004FE0[];
extern EnvSettings D_6005000;
extern Gfx D_6005360[];
extern u16 D_6005700[];
extern u16 D_A6_6005700[];
extern u16 D_6005710[];
extern u8 D_6005740[];
extern Gfx D_6005780[];
@@ -180,7 +180,7 @@ extern Gfx D_600DBC0[];
extern u8 D_600DDC0[];
extern Gfx D_600DDF0[];
extern Gfx D_600E050[];
extern Gfx D_600E0C0[];
extern Gfx D_A6_600E0C0[];
extern u8 D_600E210[];
extern Animation D_600E2C4;
extern u8 D_600E360[];
@@ -194,7 +194,7 @@ extern Gfx D_600EFF0[];
extern Gfx D_600F160[];
extern Gfx D_600F1D0[];
extern CollisionPoly D_600F1DC[];
extern Gfx D_600F1F0[];
extern Gfx D_A6_600F1F0[];
extern Gfx D_600F2F0[];
extern u8 D_600F390[];
extern Vec3s D_600F394[];
@@ -239,7 +239,7 @@ extern f32 D_601115C[];
extern u8 D_TEX_6011660[];
extern Vec3s D_601170C[];
extern u8 D_6011890[];
extern Gfx D_6011910[];
extern Gfx D_A6_6011910[];
extern f32 D_6011B24[];
extern u16 D_6011B40[];
extern f32 D_6011BF4[];
@@ -279,7 +279,7 @@ extern CollisionPoly D_6014FEC[];
extern Gfx D_60153B0[];
extern u16 D_6015430[];
extern u8 D_6015CE0[];
extern Gfx D_6015EE0[];
extern Gfx D_A6_6015EE0[];
extern Gfx D_6015F00[];
extern Gfx D_6016270[];
extern Vec3s D_6016374[];
@@ -296,25 +296,25 @@ extern u8 D_6017640[];
extern u8 D_6018280[];
extern Gfx D_6018450[];
extern Gfx D_60188D0[];
extern Animation D_6018994;
extern Limb* D_6018BA0[];
extern Gfx D_6018BF0[];
extern Animation D_A6_6018994;
extern Limb* D_A6_6018BA0[];
extern Gfx D_A6_6018BF0[];
extern Gfx D_6018C00[]; // possible collision
extern Gfx D_6018D40[];
extern Gfx D_6018E80[];
extern u16 D_6018F30[];
extern u8 D_60190B0[];
extern Gfx D_6019220[];
extern Gfx D_6019730[];
extern Gfx D_A6_6019730[];
extern u16 D_6019E50[];
extern Gfx D_601A120[];
extern Gfx D_A6_601A120[];
extern Gfx D_601A7A0[];
extern Gfx D_601A7D0[];
extern Gfx D_601AD70[];
extern Gfx D_601AE40[];
extern Gfx D_601B0D0[];
extern u16* D_601B1E4[];
extern Gfx D_601B2B0[];
extern Gfx D_A6_601B2B0[];
extern u16 D_601B4B0[];
extern f32 D_601B4C4[];
extern f32 D_601B4E0[];
@@ -337,7 +337,7 @@ extern f32 D_601B830[];
extern f32 D_601B868[];
extern f32 D_601B8A0[];
extern f32 D_601B8D8[];
extern Gfx D_601BB40[];
extern Gfx D_A6_601BB40[];
extern Gfx D_601BEC0[];
extern Gfx D_601C0D0[];
extern Gfx D_601C6A0[];
@@ -385,7 +385,7 @@ extern u16 D_60229A4[];
extern f32 D_60231A4[];
extern Gfx D_60238F0[];
extern Gfx D_6023AC0[];
extern EnvSettings D_6023F20;
extern EnvSettings D_A6_6023F20;
extern Gfx D_6024010[];
extern Gfx D_6024220[];
extern Gfx D_60244A0[];
@@ -407,12 +407,12 @@ extern Animation D_6027320;
extern u16 D_6027340[];
extern Limb* D_602742C[];
extern Gfx D_6027900[];
extern u16* D_6027F50[];
extern u16* D_A6_6027F50[];
extern u16 D_6028260[];
extern f32 D_6028454[];
extern f32 D_6028578[];
extern EnvSettings D_6028760;
extern u16* D_60289FC[];
extern f32 D_A6_6028454[];
extern f32 D_A6_6028578[];
extern EnvSettings D_A6_6028760;
extern u16* D_A6_60289FC[];
extern u16 D_6028A60[];
extern u16 D_6029170[];
extern u8 D_6029220[];
@@ -494,12 +494,8 @@ extern Triangle D_6030F64[];
extern Vec3f D_6030F7C[];
extern Triangle D_6030FC4[];
extern Vec3s D_603184C[];
extern Vec3f D_6031FE0[];
extern Vec3f D_603204C[];
extern Gfx D_60320E0[];
extern Vec3f D_603216C[];
extern u16 D_60323D0[];
extern Vec3f D_6032430[];
extern u16 D_6032440[];
extern Gfx D_6032580[];
extern u16 D_6032A60[];
include/assets/ast_7_ti_2.h
+1 -1
View File
@@ -5,7 +5,7 @@
#include "sf64object.h"
#include "structs.h"
extern Animation D_7003EE8;
extern Animation D_TI2_7003EE8;
extern Animation D_70084CC;
extern Animation D_70096EC;
extern Animation D_700E244;
include/assets/ast_andross.h
+1
View File
@@ -44,6 +44,7 @@ extern Animation D_C030244;
extern Animation D_C033780;
extern Animation D_C033D98;
extern EnvSettings D_C035110;
extern ObjectInit D_C035154[];
extern ObjectInit D_C0356A4[];
extern ObjectInit D_C0356CC[];
extern ObjectInit D_C036310[];
include/assets/ast_area_6.h
-11
View File
@@ -1,11 +0,0 @@
#ifndef AST_AREA_6_H
#define AST_AREA_6_H
#include "gfx.h"
#include "sf64object.h"
#include "structs.h"
extern f32 D_6028454[];
extern f32 D_6028578[];
#endif
include/assets/ast_vs_player.h
-119
View File
@@ -1,119 +0,0 @@
#ifndef AST_VS_PLAYER_H
#define AST_VS_PLAYER_H
#include "gfx.h"
#include "sf64object.h"
#include "sf64level.h"
#include "structs.h"
extern u8 D_3000000[];
extern u16 D_3000080[];
extern u8 D_30001E0[];
extern u16 D_3000380[];
extern u8 D_30003A0[];
extern u16 D_30004E0[];
extern u8 D_3000510[];
extern u16 D_30006A0[];
extern u8 D_30006D0[];
extern u16 D_3000810[];
extern u16 D_3000B20[];
extern u16 D_3000BC0[];
extern u8 D_30013E0[];
extern u8 D_3001420[];
extern u16 D_3003E20[];
extern u8 D_3004010[];
extern u16 D_3004D58[];
extern u8 D_3004F60[];
extern u16 D_3005E38[];
extern u8 D_3006040[];
extern u16 D_3006A68[];
extern u8 D_3006C60[];
extern u16 D_3007500[];
extern u8 D_30076C0[];
extern u16 D_3008598[];
extern u8 D_30087A0[];
extern u16 D_3008DE0[];
extern u8 D_3008EC0[];
extern u16 D_30098C0[];
extern u8 D_3009990[];
extern u16 D_300A390[];
extern u8 D_300A470[];
extern u16 D_300B218[];
extern u8 D_300B3F0[];
extern u16 D_300C458[];
extern u8 D_300D350[];
extern u16 D_300D398[];
extern u8 D_300D3C0[];
extern u16 D_300D408[];
extern u8 D_300D440[];
extern u16 D_300D500[];
extern Gfx D_300D550[];
extern Gfx D_300EE80[];
extern Gfx D_300FB80[];
extern Gfx D_3010A90[];
extern Gfx D_3011470[];
extern Gfx D_3011E40[];
extern Gfx D_3012ED0[];
extern Gfx D_3013580[];
extern Gfx D_3013780[];
extern Gfx D_30146B0[];
extern Gfx D_30155E0[];
extern Gfx D_3015740[];
extern Gfx D_30160A0[];
extern Gfx D_3016660[];
extern Gfx D_3016B00[];
extern Gfx D_30173C0[];
extern Gfx D_30174E0[];
extern Gfx D_3017600[];
extern Gfx D_3017600[];
extern Gfx D_3018800[];
extern Gfx D_301AD60[];
extern Gfx D_301AEF0[];
extern Gfx D_301B080[];
extern Gfx D_301B6E0[];
extern Animation D_301C3A8;
extern Limb* D_301C614[];
extern Animation D_301CFEC;
extern Limb* D_301D258[];
extern Animation D_301D888;
extern Limb* D_301DB94[];
extern Animation D_301E19C;
extern Limb* D_301E3E8[];
extern Gfx D_301E570[];
extern Gfx D_301F140[];
extern Gfx D_301FD20[];
extern Gfx D_302D120[];
extern Gfx D_302D240[];
extern Gfx D_302D4D0[];
extern EnvSettings D_302DD70;
extern EnvSettings D_302DDB4;
extern EnvSettings D_302DDF8;
extern ObjectInit D_302DE3C[];
extern ObjectInit D_302E0E4[];
extern ObjectInit D_302E170[];
extern ObjectInit D_302E378[];
extern Vec3f D_302E56C[];
extern Vec3f D_302E65C[];
extern Vec3f D_302E74C[];
extern Vec3f D_302E830[];
extern Vec3f D_302E95C[];
extern Vec3f D_302EA4C[];
extern Vec3f D_302EB3C[];
extern Vec3f D_302EC20[];
extern f32 D_302ED4C[];
extern f32 D_302ED98[];
extern f32 D_302EDB4[];
extern f32 D_302EE00[];
extern f32 D_302EE64[];
extern f32 D_302EE80[];
extern f32 D_302EE9C[];
extern Triangle D_302EEE8[];
extern Vec3f D_302EF00[];
extern Triangle D_302EF6C[];
extern Vec3f D_302EF84[];
extern Triangle D_302EFF0[];
extern Vec3f D_302F008[];
extern Triangle D_302F044[];
extern Vec3f D_302F098[];
#endif
include/context.h
+2 -2
View File
@@ -236,8 +236,8 @@ extern Boss gBosses[4];
extern Effect gEffects[100];
extern Item gItems[20];
extern PlayerShot gPlayerShots[16];
extern UnkEntity30 gUnkEntities30[100];
extern UnkEntity28 gUnkEntities28[65];
extern TexturedLine gTexturedLines[100];
extern RadarMark gRadarMarks[65];
extern BonusText gBonusText[10];
extern s32 D_80176550[2];
extern f32 D_80176558[2][100];
include/fox_enmy2_assets.h
-5
View File
@@ -19,9 +19,7 @@ extern Gfx D_4001310[];
extern Gfx D_601F2A0[];
extern Gfx D_400AAE0[];
extern Gfx D_4000650[];
extern Gfx D_6016190[];
extern Gfx D_4008FA0[];
extern Gfx D_6012A40[];
extern Gfx D_60102C0[];
extern Gfx D_6017B60[];
extern Gfx D_6004D00[];
@@ -56,9 +54,6 @@ extern Gfx D_60043F0[];
extern Gfx D_6004310[];
extern Gfx D_6002890[];
extern f32 D_60282A0[];
extern f32 D_6028254[];
extern f32 D_60280E0[];
extern f32 D_6034478[];
extern f32 D_603450C[];
extern f32 D_6034588[];
include/fox_enmy_assets.h
-6
View File
@@ -5,15 +5,10 @@
extern ObjectInit D_60371A4[];
extern ObjectInit D_6026CC4[];
extern ObjectInit D_SX_602A164[];
extern ObjectInit D_6023F64[];
extern ObjectInit D_60287A4[];
extern ObjectInit D_602E4F4[];
extern ObjectInit D_6007E74[];
extern ObjectInit D_601F234[];
extern ObjectInit D_6026714[];
extern ObjectInit D_0C035154[];
extern ObjectInit D_TR_6006AA4[];
extern ObjectInit D_6031000[];
extern ObjectInit D_6006C60[];
extern ObjectInit D_602E5C8[];
@@ -22,6 +17,5 @@ extern ObjectInit D_6011044[];
extern ObjectInit D_600FF74[];
extern ObjectInit D_6006EB4[];
extern ObjectInit D_6014D94[];
extern ObjectInit D_0302DE3C[];
#endif
include/functions.h
+3 -3
View File
@@ -136,7 +136,7 @@ s32 func_8005F9DC(Vec3f*);
// fox_enmy
void func_80060714(s32 );
void func_8006089C(u8 );
void func_80060968(void);
void TexturedLine_Draw(void);
void func_80060D94(s32);
void func_80060F30(f32* , u32 , s32 );
void Object_Kill(Object*, f32*);
@@ -204,8 +204,8 @@ void Object_80_Update(Object_80*);
void Object_4C_Update(Object_4C*);
void Item_Update(Item*);
void Effect_Update(Effect*);
void func_8006A06C(UnkEntity30*);
void func_8006A38C(void);
void TexturedLine_Update(TexturedLine*);
void TexturedLine_UpdateAll(void);
void Object_UpdateAll(void);
//fox_6B3B0
include/prevent_context_reordering.h
+2 -2
View File
@@ -1,10 +1,10 @@
#ifndef PREVENT_CONTEXT_REORDERING_H
#define PREVENT_CONTEXT_REORDERING_H
extern int Dummyhalf;
// extern int Dummyhalf;
// struct Dummy0 {int x;};
// struct Dummy1 {int x;};
struct Dummy2 {int x;};
// struct Dummy2 {int x;};
struct Dummy3 {int x;};
struct Dummy4 {int x;};
struct Dummy5 {int x;};
include/sf64audio_external.h
+7
View File
@@ -7,6 +7,13 @@
#define AUDIO_PLAY_SFX(sfxId, srcPos, token) (Audio_PlaySfx((sfxId),(srcPos),(token),&gDefaultMod,&gDefaultMod,&gDefaultReverb))
#define AUDIO_PLAY_BGM(seqId) Audio_PlaySequence(SEQ_PLAYER_BGM, (seqId), 0, -1)
typedef enum {
/* 0 */ SOUNDMODE_STEREO,
/* 1 */ SOUNDMODE_HEADSET,
/* 2 */ SOUNDMODE_SURROUND,
/* 3 */ SOUNDMODE_MONO
} SoundMode;
typedef enum {
SEQ_ID_0,
SEQ_ID_1,
include/sf64dma.h
+1 -1
View File
@@ -97,7 +97,7 @@ extern OverlayInit sOvlending_Ending[6]; // overlay EF0260
extern OverlayInit sOvlmenu_Title[1]; // EBFBE0
extern OverlayInit sOvlmenu_Option[1]; // EBFBE0
extern OverlayInit sOvlmenu_Map[1]; // EBFBE0
extern OverlayInit sOvlmenu_State5[1]; // EBFBE0
extern OverlayInit sOvlmenu_GameOver[1]; // EBFBE0
extern OverlayInit sOvli1_Corneria[1]; // fox_i1
extern OverlayInit sOvli2_Meteo[2]; // fox_i2
extern OverlayInit sOvli5_Titania[6]; // E6A810
include/sf64level.h
+1 -1
View File
@@ -37,7 +37,7 @@ typedef enum {
/* 0 */ OVL_SETUP_TITLE,
/* 1 */ OVL_SETUP_MENU,
/* 2 */ OVL_SETUP_MAP,
/* 3 */ OVL_SETUP_STATE_5,
/* 3 */ OVL_SETUP_GAME_OVER,
/* 4 */ OVL_SETUP_CREDITS,
/* 5 */ OVL_SETUP_CORNERIA,
/* 6 */ OVL_SETUP_METEO,
include/structs.h
+9 -2
View File
@@ -10,7 +10,7 @@ typedef struct {
/* 0x04 */ Vec3f pos;
/* 0x10 */ f32 unk_10;
/* 0x14 */ char pad14[0x14];
} UnkEntity28; // size = 0x28
} RadarMark; // size = 0x28
typedef struct {
/* 0x00 */ u8 mode;
@@ -25,7 +25,7 @@ typedef struct {
/* 0x2D */ u8 unk_2D;
/* 0x2E */ u8 unk_2E;
/* 0x2F */ u8 unk_2F;
} UnkEntity30; // size = 0x30
} TexturedLine; // size = 0x30
typedef struct {
/* 0x00 */ u8 hits;
@@ -66,4 +66,11 @@ typedef enum OptionState {
OPTION_UPDATE
} OptionState;
typedef enum OptionSoundMode {
OPTIONSOUND_STEREO,
OPTIONSOUND_MONO,
OPTIONSOUND_HEADSET,
OPTIONSOUND_MAX,
} OptionSoundMode;
#endif