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

Event Actor docs that kind of ballooned into a bunch of stuff (#200)

Browse Source 
* stuff

* too much

* Torch commit

* torch again
This commit is contained in:
petrie911
2024-04-05 17:11:36 -03:00
committed by GitHub
parent ac41c180a9
commit 126a55aa0e
108 changed files with 5009 additions and 5101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/context.h
+17 -18
View File
@@ -35,8 +35,8 @@ extern f32 gCsCamEyeZ;
extern f32 gCsCamAtX;
extern f32 gCsCamAtY;
extern f32 gCsCamAtZ;
extern Vec3f D_ctx_801779D8;
extern Vec3f D_ctx_801779E8;
extern Vec3f gPlayerCamEye;
extern Vec3f gPlayerCamAt;
extern bool gExpertMode;
extern s32 D_ctx_80177A10[10];
extern f32 D_ctx_80177A48[10];
@@ -57,7 +57,7 @@ extern s32 D_ctx_80177C38[6];
extern s32 D_ctx_80177C58[6];
extern u8 gSoundMode;
extern s32 gVolumeSettings[3];
extern u16 D_ctx_80177C90;
extern u16 gBgmSeqId;
extern u8 gLevelType;
extern s32 D_ctx_80177CA0;
extern UNK_TYPE F_80177CA8;
@@ -91,7 +91,6 @@ extern s32 gRadioState;
extern s32 D_ctx_801782A4;
extern s32 D_Timer_801782AC;
extern s32 D_Timer_801782B4;
// extern s32 D_ctx_801782B8;
extern s32 D_ctx_801782C0;
extern s32 D_ctx_801782C8;
extern s32 D_ctx_801782D0;
@@ -124,8 +123,8 @@ extern s32 D_ctx_8017837C;
extern u32 D_ctx_80178380[4]; // player alphas
extern s32 D_ctx_80178390[4]; // player reds
extern s32 D_ctx_801783A0[4]; // player greens
extern s32 D_ctx_801783B0[4]; // player alphas
extern UNK_TYPE D_ctx_801783C0[4];
extern s32 D_ctx_801783B0[4]; // player blues
extern s32 D_ctx_801783C0[4];
extern f32 D_ctx_801783D0; // something x translate
extern f32 D_ctx_801783D4; // something y translate
extern s32 gFogNear; //near
@@ -149,8 +148,8 @@ extern f32 D_ctx_80178448;
extern f32 D_ctx_80178450[3];
extern f32 D_ctx_80178460[3];
extern f32 D_ctx_80178470[3];
extern f32 D_ctx_8017847C;
extern s32 D_ctx_80178480;
extern f32 gCameraShakeY;
extern s32 gCameraShake;
extern s32 D_ctx_80178484;
extern bool D_ctx_80178488;
extern UNK_TYPE F_8017848C;
@@ -213,21 +212,21 @@ extern s32 gLight2B;
extern s32 D_ctx_80178570; // Color32 light color 2 modifier?
extern s32 D_ctx_80178574;
extern s32 D_ctx_80178578;
extern s32 D_80161A70; // Color32?
extern s32 D_80161A74;
extern s32 D_80161A78;
extern s32 D_80161A7C;
extern s32 D_80161A80;
extern s32 D_80161A84;
extern s32 D_80161A88;
extern s32 D_80161A8C;
extern s32 D_ctx_80161A70; // Color32?
extern s32 D_ctx_80161A74;
extern s32 D_ctx_80161A78;
extern s32 D_ctx_80161A7C;
extern s32 D_ctx_80161A80;
extern s32 D_ctx_80161A84;
extern s32 D_ctx_80161A88;
extern s32 D_ctx_80161A8C;
extern u8 gGoldRingCount[4];
extern u8 D_80161A94[4];
extern u8 D_ctx_80161A94[4];
extern s32 gHitCount;
extern s32 gSavedHitCount;
extern s16 gLifeCount[4];
extern LaserStrength gLaserStrength[4];
extern s32 D_80161AB8;
extern s32 D_ctx_80161AB8;
extern UNK_TYPE F_80161AC0[16];
extern Object_80 gObjects80[50];
extern Object_4C gObjects4C[40];
include/fox_option.h
+1 -1
View File
@@ -201,7 +201,7 @@ void Option_8019BE7C(f32, f32, f32, f32 *, f32 *, f32 *);
void Option_8019BF34(void);
void Option_8019C04C(void);
void Option_DrawCardLabel(OptionTexture arg0);
bool Option_8019C418(s32* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, UnkStruct_D_menu_801B9250* arg8);
bool Option_8019C418(s32* arg0, s32 arg1, bool arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, UnkStruct_D_menu_801B9250* arg8);
s32 Option_8019C5A0(s32*);
bool Option_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_menu_801B9250* arg3);
void Option_8019C824(f32*);
include/functions.h
+63 -63
View File
@@ -29,8 +29,8 @@ void func_360_8002F69C(Actor*);
void func_360_8002FC00(Actor*);
void func_360_8003088C(Actor*);
bool func_360_80031900(Actor*);
void func_360_800319AC(Actor* this);
void func_360_80035448(Actor* actor);
void ActorAllRange_Update(Actor* this);
void ActorAllRange_Draw(Actor* actor);
//fox_beam
void func_beam_80038140(PlayerShot* shot);
@@ -53,12 +53,12 @@ void func_bg_80042D38(void);
// fox_boss
void func_boss_80042EC0(Boss* boss);
void func_boss_80042FAC(Boss* boss);
void func_boss_80042FB8(Boss* boss);
void func_boss_80042FC4(Boss* boss);
void func_boss_80042FD0(Boss* boss);
void func_boss_80042FDC(Boss* boss);
void func_boss_80042FE8(Boss* boss);
void Boss299_Init(Boss* boss);
void Boss299_Update(Boss* boss);
void Boss299_Draw(Boss* boss);
void Boss300_Init(Boss* boss);
void Boss300_Update(Boss* boss);
void Boss300_Draw(Boss* boss);
void func_boss_800430DC(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32);
void func_boss_8004319C(Player* player, f32 arg1, f32 arg2, f32 arg3);
@@ -102,17 +102,17 @@ void func_edata_800596B0(Actor*);
// fox_edisplay
void Graphics_SetScaleMtx(f32);
void func_edisplay_80059850(Object_4C*);
void func_edisplay_800598E8(Actor*);
void func_edisplay_80059A24(Actor*);
void func_edisplay_80059AEC(Object_80*);
void Actor201_Draw(Actor*);
void Actor202_Draw(Actor*);
void Obj39_Draw(Object_80*);
void func_edisplay_80059B20(Object_80*);
void func_edisplay_80059BBC(Object_80*);
void func_edisplay_80059BF0(Actor*);
void Obj42_Draw(Object_80*);
void Actor196_Draw(Actor*);
void func_edisplay_80059C34(Object_4C*);
void func_edisplay_80059C40(Object_4C*);
void func_edisplay_80059F68(Item*);
void func_edisplay_80059FDC(Item*);
void func_edisplay_8005A094(Actor*);
void func_edisplay_80059F68(Object_80*);
void func_edisplay_80059FDC(Object_80*);
void Actor189_Draw(Actor*);
void func_edisplay_8005ADAC(Actor*);
void func_edisplay_8005B1E8(Actor*, s32);
void func_edisplay_8005B388(Actor*);
@@ -122,14 +122,14 @@ void func_edisplay_8005B7CC(Actor*);
void func_edisplay_8005B848(Actor*);
void func_edisplay_8005B9A4(Actor*);
void func_edisplay_8005BA30(Actor*);
void func_edisplay_8005C5F0(Item*);
void func_edisplay_8005C900(Item*);
void func_edisplay_8005C9C0(Item*);
void func_edisplay_8005CA80(Item*);
void func_edisplay_8005CB44(Item*);
void func_edisplay_8005CC9C(Item*);
void func_edisplay_8005CDA8(Item*);
void func_edisplay_8005F030(f32*);
void ItemCheckpoint_Draw(Item*);
void ItemSilverRing_Draw(Item*);
void ItemSilverStar_Draw(Item*);
void ItemGoldRing_Draw(Item*);
void ItemBomb_Draw(Item*);
void ItemLasers_Draw(Item*);
void ItemMeteoWarp_Draw(Item*);
void Object_ClampSfxSource(f32*);
void func_edisplay_8005F0E8(f32*, Vec3f*);
void func_edisplay_8005F1EC(f32*);
void func_edisplay_8005F290(f32*, Vec3f*);
@@ -137,10 +137,10 @@ void func_edisplay_8005F670(Vec3f*);
bool func_edisplay_8005F9DC(Vec3f*);
// fox_enmy
void func_edisplay_80060714(s32 );
void func_edisplay_8006089C(u8 );
void Object_Draw(s32 );
void Effect_Draw(u8 );
void TexturedLine_Draw(void);
void func_edisplay_80060D94(s32);
void TexturedLine_DrawPath(s32);
void func_enmy_80060F30(f32* , u32 , s32 );
void Object_Kill(Object*, f32*);
bool func_enmy_80060FE4(Vec3f*, f32);
@@ -179,22 +179,22 @@ void func_enmy_80066EA8(Object_80*);
void func_enmy_80066EF0(Item*);
void func_enmy_800671D0(Item*);
void func_enmy_800674B4(f32, f32, f32, f32, f32, f32, f32, f32);
void func_enmy_8006753C(Actor*);
void func_enmy_80067874(Actor*);
void ActorSupplies_Update(Actor*);
void ActorSupplies_Draw(Actor*);
void func_enmy_80067A40(void);
void func_enmy_80067B1C(Item*);
void func_enmy_80067BEC(Item*);
void func_enmy_80067F6C(Item*);
void func_enmy_80068020(Item*);
void func_enmy_800685D8(Item*);
void func_enmy_800685F8(Item*);
void func_enmy_80068618(Item*);
void func_enmy_80068688(Item*);
void func_enmy_80068914(Item*);
void Item1up_Update(Item*);
void ItemPickup_Update(Item*);
void ItemLasers_Update(Item*);
void ItemSupplyRing_Update(Item*);
void ItemSilverStar_Update(Item*);
void ItemGoldRing_Update(Item*);
void ItemWingRepair_Update(Item*);
void ItemMeteoWarp_Update(Item*);
void ItemCheckpoint_Update(Item*);
void func_enmy_80068C48(Item*);
void func_enmy_80068C88(Item*);
void func_enmy_80068FE0(Object_4C*);
void func_enmy_800690D0(s32, ObjectId);
void Object_Dying(s32, ObjectId);
void func_enmy_80069924(Effect*);
void func_enmy_800693E8(Actor*);
void func_enmy_80069658(Boss*);
@@ -212,31 +212,31 @@ void TexturedLine_UpdateAll(void);
void Object_UpdateAll(void);
//fox_enmy2
void func_enmy2_8006A96C(Actor*);
void func_enmy2_8006A978(Actor*);
void func_enmy2_8006AA98(Object_80*);
void func_enmy2_8006AC08(Actor*);
void func_enmy2_8006AD18(Actor*);
void func_enmy2_8006B094(Actor*);
void func_enmy2_8006B0A0(Actor*);
void func_enmy2_8006B74C(Actor*);
void func_enmy2_8006B95C(Object_80*);
void func_enmy2_8006BB78(Actor*);
void func_enmy2_8006C008(Actor*);
void func_enmy2_8006D350(Object_80*);
void Actor237_Update(Actor*);
void Actor237_Draw(Actor*);
void Obj54_Update(Object_80*);
void Actor201_Update(Actor*);
void Actor202_Update(Actor*);
void Actor194_Update(Actor*);
void Actor194_Init(Actor*);
void Actor194_Draw(Actor*);
void Obj42_Update(Object_80*);
void Actor196_Update(Actor*);
void Actor189_Update(Actor*);
void Obj39_Update(Object_80*);
void func_enmy2_8006ECBC(PlayerShotId, PlayerShot*, s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
void func_enmy2_8006EEFC(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
void func_enmy2_8006EFA0(s32 unk0E4, f32 xPos, f32 yPos, f32 zPos, f32 arg4, f32 arg5, f32 arg6, f32 xRot, f32 yRot,
f32 zRot);
void func_enmy2_8006F0D8(f32 xPos, f32 yPos, f32 zPos, f32 arg3);
void func_enmy2_8006F254(Actor*);
void func_enmy2_80072594(Actor*);
s32 func_enmy2_80074F90(Object_80*);
void func_enmy2_80074FF0(Actor*);
void ActorEvent_8006F0D8(f32 xPos, f32 yPos, f32 zPos, f32 arg3);
void ActorEvent_8006F254(Actor*);
void ActorEvent_Update(Actor*);
s32 Obj111_Draw(Object_80*);
void ActorEvent_Draw(Actor*);
void func_enmy2_800763A4(Actor*);
void func_enmy2_8007717C(Actor*);
void func_enmy2_800771CC(Actor*);
void func_enmy2_80077218(Actor*);
void ActorEvent_Dying(Actor*);
void Actor234_Update(Actor*);
void Actor234_Draw(Actor*);
// fox_effect
s32 func_effect_80081B24(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
@@ -416,9 +416,9 @@ bool func_hud_8009092C(Actor*);
void func_hud_800907C4(Boss*);
bool func_hud_800915FC(Actor*);
bool func_hud_800924E0(Actor*);
bool func_hud_800927A0(Actor*);
void func_hud_80092D48(Actor*);
void func_hud_80092EC0(Actor* actor);
void ActorTeamBoss_Init(Actor*);
void ActorTeamBoss_Update(Actor* actor);
void func_hud_80093164(Actor*);
void func_hud_800935E8(Player*);
void func_hud_800953A0(Actor*, s32);
@@ -470,7 +470,7 @@ void func_play_800B2130(Player*);
void func_play_800B2574(Player*);
void func_play_800B56BC(Player*);
void func_play_800B5D30(Player*, s32);
void func_play_800B5FBC(Player*, s32 , s32 );
void func_play_800B5FBC(Player*, s32 , bool );
void func_play_800B63BC(Player*, s32);
void func_play_800B6848(Player*, s32 );
void func_play_800B6BFC(Player*, s32 );
include/gfx.h
+2 -1
View File
@@ -3,6 +3,7 @@
#include "libultra/ultra64.h"
#include "sf64math.h"
#include "libc/stdbool.h"
#define SCREEN_WIDTH 320
#define SCREEN_HEIGHT 240
@@ -72,7 +73,7 @@ typedef union {
u16 array[SCREEN_HEIGHT][SCREEN_WIDTH];
} FrameBuffer; // size = 0x25800
typedef s32 (*OverrideLimbDraw)(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* this);
typedef bool (*OverrideLimbDraw)(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* this);
typedef void (*PostLimbDraw)(s32, Vec3f*, void*);
typedef struct {
include/i1.h
+4 -4
View File
@@ -49,21 +49,21 @@ void Venom1_801934D0(Actor*);
void Venom1_80193540(Object_80*);
void Venom1_80194398(Boss*);
void Venom1_801985E4(Boss*);
void Training_80198968(Item*);
void Training_ItemRing_Update(Item*);
void OvlI1_CallFunction(s32, void*);
void Corneria_80187530(Object_80*);
void Corneria_8018753C(Object_80*);
void Corneria_801878D8(Boss *);
void Corneria_Boss292_Init(Boss *);
void Corneria_8018B0B4(Actor *);
void Corneria_8018BE7C(Boss *);
void Corneria_Boss293_Init(Boss *);
void Corneria_8018ED78(Boss*);
void Venom1_801924A8(Object_80* );
void Venom1_8019250C(Actor *);
void Venom1_80192CB0(Actor *);
void Venom1_80192EA4(Actor *);
void Venom1_801933B4(Actor *);
void Venom1_801935CC(Boss *);
void Venom1_Boss319_Init(Boss *);
void Venom1_80198310(Boss *);
void Venom1_80198594(Boss *);
void Training_801988E0(void);
include/i2.h
+1 -1
View File
@@ -16,7 +16,7 @@ void SectorX_80194728(Player*);
void OvlI2_CallFunction(s32, void*);
void Meteo_80187B08(Actor *);
void Meteo_80188A40(Boss *);
void Meteo_Boss297_Init(Boss *);
void Meteo_8018CCF8(Actor *);
void Meteo_8018756C(Actor*);
include/i3.h
+4 -4
View File
@@ -19,7 +19,7 @@ void Aquas_801AB9B0(Player*);
void Aquas_801BE0F0(Actor*);
void OvlI3_CallFunction(s32, void*);
void Area6_80187754(Boss *);
void Area6_BossA6_Init(Boss *);
void Area6_80187944(Boss*);
void Area6_8018C54C(Boss*);
void Area6_8018DF74(Player *player);
@@ -45,7 +45,7 @@ void Zoness_80192834(Actor* actor);
void Zoness_80192C18(Actor* actor);
void Zoness_80192E64(Actor* actor);
void Zoness_80193240(Actor* actor);
void Zoness_801932AC(Boss* bossZO);
void Zoness_BossZo_Init(Boss* bossZO);
void Zoness_801949DC(Boss* bossZO);
void Zoness_80194A84(Boss* bossZO);
void Zoness_8019969C(Actor* actor);
@@ -69,7 +69,7 @@ void Zoness_8019C454(Actor* actor);
void Zoness_8019C83C(Actor* actor);
void Zoness_8019CBEC(Actor* actor);
void Zoness_8019CE58(Actor* actor);
void Zoness_8019D060(Actor* actor);
void Zoness_Actor247_Init(Actor* actor);
void Zoness_8019D15C(Actor* actor);
void Zoness_8019D3C4(Actor* actor);
void Zoness_8019D428(Player* player);
@@ -111,7 +111,7 @@ void Aquas_801AFA5C(Actor*);
void Aquas_801B099C(Actor*);
void Aquas_801B0B60(Actor*);
void Aquas_801B0EC0(Actor*);
void Aquas_801B10F8(Boss*);
void Aquas_BossAq_Init(Boss*);
void Aquas_801B134C(Boss*);
void Aquas_801B4D84(Boss*);
void Aquas_801B504C(Actor*);
include/i4.h
+1 -1
View File
@@ -26,7 +26,7 @@ void Fortuna_8018BA2C(void);
void Bolse_8018C158(Actor*);
void Bolse_80191ED8(void);
void Bolse_80192264(void);
void Katina_80193CA4(Boss *);
void Katina_Boss316_Init(Boss *);
void Katina_80198594(Actor*);
void Katina_80198930(void);
void SectorZ_80199900(Actor *, s32);
include/i5.h
+4 -4
View File
@@ -30,14 +30,14 @@ void Titania_80188F30(void);
void Titania_80189B80(Actor *);
void Titania_8018ADC4(Actor *);
void Titania_8018B720(Actor *);
void Titania_8018B96C(Actor *);
void Titania_Actor231_Init(Actor *);
void Titania_8018BFB0(Actor *);
void Titania_8018E3B0(Actor *);
void Titania_8018E3CC(Actor *);
void Titania_8018E5E8(Actor *);
void Titania_8018EFF0(Object_4C *);
void Titania_8018F0D8(Object_80 *);
void Titania_8018FA48(Boss *);
void Titania_Boss306_Init(Boss *);
void Titania_801990DC(Boss *);
void Macbeth_80199920(void);
void Macbeth_80199F8C(Actor *);
@@ -57,8 +57,8 @@ s32 Ground_801B6E20(f32, f32, f32 *, f32 *, f32 *);
void Macbeth_801AD144(PlayerShot*);
void Titania_80189120(f32, f32, f32, f32, f32);
bool Macbeth_801A3C20(f32);
s32 Macbeth_801A3300(Player*, f32, f32);
s32 Macbeth_801A3790(Player*, f32, f32);
bool Macbeth_801A3300(Player*, f32, f32);
bool Macbeth_801A3790(Player*, f32, f32);
void Titania_80188F60(Effect*);
void Titania_80188FA8(Effect*);
include/i6.h
+4 -4
View File
@@ -30,13 +30,13 @@ void Andross_801888F4(Actor *);
void Andross_80189214(void);
void Andross_8018BDD8(void);
void Andross_8018C390(Player*);
void Andross_8018D16C(Boss *);
void Andross_Boss320_Init(Boss *);
void Andross_801961AC(void);
void Venom2_80196314(Actor*);
void Venom2_80196968(void);
void SectorY_80197CC4(Boss *);
void SectorY_801A3BD4(Actor*);
void SectorY_801A4CB0(Actor*);
void SectorY_Boss314_Init(Boss *);
void SectorY_Actor204_Update(Actor*);
void SectorY_Actor204_Draw(Actor*);
void Turret_801A5AD4(Player*);
void Turret_801A5FC0(Player*);
void Turret_801A6164(Player *);
include/libc/stdbool.h
+3 -1
View File
@@ -1,11 +1,13 @@
#ifndef LIBC_STDBOOL_H
#define LIBC_STDBOOL_H
#include "PR/ultratypes.h"
#define __bool_true_false_are_defined 1
#ifndef __cplusplus
#define bool s32
typedef int bool;
#define false 0
#define true 1
include/prevent_context_reordering.h
+13 -13
View File
@@ -10,19 +10,19 @@ extern int Dummyhalf;
// struct Dummy5 {int x;};
// struct Dummy6 {int x;};
// struct Dummy7 {int x;};
struct Dummy8 {int x;};
struct Dummy9 {int x;};
struct Dummy10 {int x;};
struct Dummy11 {int x;};
struct Dummy12 {int x;};
struct Dummy13 {int x;};
struct Dummy14 {int x;};
struct Dummy15 {int x;};
struct Dummy16 {int x;};
struct Dummy17 {int x;};
struct Dummy18 {int x;};
struct Dummy19 {int x;};
struct Dummy20 {int x;};
// struct Dummy8 {int x;};
// struct Dummy9 {int x;};
// struct Dummy10 {int x;};
// struct Dummy11 {int x;};
// struct Dummy12 {int x;};
// struct Dummy13 {int x;};
// struct Dummy14 {int x;};
// struct Dummy15 {int x;};
// struct Dummy16 {int x;};
// struct Dummy17 {int x;};
// struct Dummy18 {int x;};
// struct Dummy19 {int x;};
// struct Dummy20 {int x;};
struct Dummy21 {int x;};
struct Dummy22 {int x;};
struct Dummy23 {int x;};
include/sf64audio_external.h
+74 -74
View File
@@ -14,79 +14,79 @@ typedef enum {
/* 3 */ SOUNDMODE_MONO
} SoundMode;
typedef enum {
SEQ_ID_0,
SEQ_ID_1,
SEQ_ID_2,
SEQ_ID_3,
SEQ_ID_4,
SEQ_ID_5,
SEQ_ID_6,
SEQ_ID_7,
SEQ_ID_8,
SEQ_ID_9,
SEQ_ID_10,
SEQ_ID_11,
SEQ_ID_12,
SEQ_ID_13,
SEQ_ID_14,
SEQ_ID_15,
SEQ_ID_16,
SEQ_ID_17,
SEQ_ID_18,
SEQ_ID_19,
SEQ_ID_20,
SEQ_ID_21,
SEQ_ID_22,
SEQ_ID_23,
SEQ_ID_24,
SEQ_ID_25,
SEQ_ID_26,
SEQ_ID_27,
SEQ_ID_28,
SEQ_ID_29,
SEQ_ID_30,
SEQ_ID_31,
SEQ_ID_32,
SEQ_ID_33,
SEQ_ID_34,
SEQ_ID_35,
SEQ_ID_36,
SEQ_ID_37,
SEQ_ID_38,
SEQ_ID_39,
SEQ_ID_40,
SEQ_ID_41,
SEQ_ID_42,
SEQ_ID_43,
SEQ_ID_44,
SEQ_ID_45,
SEQ_ID_46,
SEQ_ID_47,
SEQ_ID_48,
SEQ_ID_49,
SEQ_ID_50,
SEQ_ID_51,
SEQ_ID_52,
SEQ_ID_53,
SEQ_ID_54,
SEQ_ID_55,
SEQ_ID_56,
SEQ_ID_57,
SEQ_ID_58,
SEQ_ID_59,
SEQ_ID_60,
SEQ_ID_61,
SEQ_ID_62,
SEQ_ID_63,
SEQ_ID_64,
SEQ_ID_65,
SEQ_ID_66,
SEQ_ID_67,
SEQ_ID_68,
SEQ_ID_69,
typedef enum BgmSeqIds {
/* 0 */ SEQ_ID_SFX,
/* 1 */ SEQ_ID_VOICE,
/* 2 */ SEQ_ID_CORNERIA,
/* 3 */ SEQ_ID_METEO,
/* 4 */ SEQ_ID_TITANIA,
/* 5 */ SEQ_ID_SECTOR_X,
/* 6 */ SEQ_ID_ZONESS,
/* 7 */ SEQ_ID_AREA_6,
/* 8 */ SEQ_ID_VENOM_1,
/* 9 */ SEQ_ID_SECTOR_Y,
/* 10 */ SEQ_ID_FORTUNA,
/* 11 */ SEQ_ID_SOLAR,
/* 12 */ SEQ_ID_BOLSE,
/* 13 */ SEQ_ID_KATINA,
/* 14 */ SEQ_ID_AQUAS,
/* 15 */ SEQ_ID_SECTOR_Z,
/* 16 */ SEQ_ID_MACBETH,
/* 17 */ SEQ_ID_ANDROSS,
/* 18 */ SEQ_ID_CO_BOSS_1,
/* 19 */ SEQ_ID_ME_BOSS,
/* 20 */ SEQ_ID_TI_BOSS,
/* 21 */ SEQ_ID_SX_BOSS,
/* 22 */ SEQ_ID_ZO_BOSS,
/* 23 */ SEQ_ID_A6_BOSS,
/* 24 */ SEQ_ID_VE_BOSS,
/* 25 */ SEQ_ID_SY_BOSS,
/* 26 */ SEQ_ID_UNK_26,
/* 27 */ SEQ_ID_SO_BOSS,
/* 28 */ SEQ_ID_BO_BOSS,
/* 29 */ SEQ_ID_KA_BOSS,
/* 30 */ SEQ_ID_AQ_BOSS,
/* 31 */ SEQ_ID_SZ_BOSS,
/* 32 */ SEQ_ID_MA_BOSS,
/* 33 */ SEQ_ID_AND_BOSS,
/* 34 */ SEQ_ID_TITLE,
/* 35 */ SEQ_ID_OPENING,
/* 36 */ SEQ_ID_MENU,
/* 37 */ SEQ_ID_CO_INTRO,
/* 38 */ SEQ_ID_GOOD_END,
/* 39 */ SEQ_ID_DEATH,
/* 40 */ SEQ_ID_GAME_OVER,
/* 41 */ SEQ_ID_UNK_41,
/* 42 */ SEQ_ID_ENDING,
/* 43 */ SEQ_ID_STAR_WOLF,
/* 44 */ SEQ_ID_INTRO_44,
/* 45 */ SEQ_ID_INTRO_45,
/* 46 */ SEQ_ID_VERSUS,
/* 47 */ SEQ_ID_VS_HURRY,
/* 48 */ SEQ_ID_CO_BOSS_2,
/* 49 */ SEQ_ID_BAD_END,
/* 50 */ SEQ_ID_ME_INTRO,
/* 51 */ SEQ_ID_INTRO_51,
/* 52 */ SEQ_ID_UNK_52,
/* 53 */ SEQ_ID_UNK_53,
/* 54 */ SEQ_ID_KATT,
/* 55 */ SEQ_ID_BILL,
/* 56 */ SEQ_ID_VS_MENU,
/* 57 */ SEQ_ID_UNK_57,
/* 58 */ SEQ_ID_WARP_ZONE,
/* 59 */ SEQ_ID_UNK_59,
/* 60 */ SEQ_ID_WORLD_MAP,
/* 61 */ SEQ_ID_AND_BRAIN,
/* 62 */ SEQ_ID_TO_ANDROSS,
/* 63 */ SEQ_ID_TRAINING,
/* 64 */ SEQ_ID_VE_CLEAR,
/* 65 */ SEQ_ID_BOSS_RESUME,
/* 66 */ SEQ_ID_MAX,
/* -1 */ SEQ_ID_NONE = 0xFFFF,
} BgmSeqIds;
#define SEQ_FLAG 0x8000
extern f32 gDefaultSfxSource[];
extern f32 gDefaultMod;
extern s8 gDefaultReverb;
@@ -118,8 +118,8 @@ void func_8001D0B4(f32* sfxSource, u32 sfxId, f32 freqMod);
void func_8001D10C(f32* sfxSource, u32 sfxId);
void func_8001D15C(u8 arg0);
void func_8001D1C8(u8 arg0, u8 arg1);
void func_8001D2FC(f32* sfxSource, u16 arg1);
void func_8001D3A0(f32* sfxSource, u16 arg1);
void Audio_PlayEventSfx(f32* sfxSource, u16 arg1);
void Audio_StopEventSfx(f32* sfxSource, u16 arg1);
void Audio_SetBaseSfxReverb(s8 reverb);
void Audio_SetBgmParam(s8 bgmParam);
void Audio_PlaySequence(u8 seqPlayId, u16 seqId, u8 fadeinTime, u8 bgmParam);
@@ -129,7 +129,7 @@ void func_8001D638(u8 arg0);
void func_8001D6DC(u8 arg0);
void func_8001D8A8(u8 audioType, u8 volume);
void Audio_PlaySoundTest(u8 enable);
void Audio_PlaySequenceDistorted(u8 seqPlayId, u16 seqId, u16 distortion, u8 duration, u8 unused);
void Audio_PlaySequenceDistorted(u8 seqPlayId, u16 seqId, u16 distortion, u8 fadeinTime, u8 unused);
void Audio_PlaySoundTestTrack(u8 trackNumber);
void Audio_FadeOutAll(u8 fadeoutTime);
void Audio_KillAllSfx(void);
include/sf64audio_provisional.h
+24 -346
View File
File diff suppressed because it is too large Load Diff
include/sf64level.h
+332 -78
View File
@@ -115,78 +115,113 @@ typedef enum VsStage {
/* 2 */ VS_STAGE_SECTOR_Z,
} VsStage;
#define EVENT_CMD(opcode, arg1, arg2) ((((opcode) & 0x7F) << 9) | ((arg1) & 0x1FF)), (arg2)
#define EV_OPC(opcode) (((opcode) & 0x7F) << 9)
#define EV_OPC_MASK(cmd) ((cmd) & (0x7F << 9))
#define EVENT_CMD(opcode, arg1, arg2) (EV_OPC(opcode) | ((s16) (arg1) & 0x1FF)), (arg2)
#define EV_ZMODE(zmode) (((zmode) & 3) << 7)
#define EV_ZMODE_MASK(cmd) ((cmd) & (3 << 7))
#define EVENT_PLAY_MSG(rcid, msg) EVENT_CMD(EVOP_PLAY_MSG, rcid, msg)
#define EVENT_STOP_SCRIPT() EVENT_CMD(EVOP_STOP_SCRIPT, 0, 0)
#define EVENT_MAKE_TEXLINE(color) EVENT_CMD(EVOP_MAKE_TEXLINE, 0, color)
#define EVENT_STOP_TEXLINE() EVENT_CMD(EVOP_STOP_TEXLINE, 0, 0)
#define EVENT_INIT_ACTOR(health, info) EVENT_CMD(EVOP_INIT_ACTOR, health, info)
#define EVENT_SET_SPEED(speed, time, flag1, flag2) EVENT_CMD(EVOP_SET_SPEED, (((flag1) & 1) << 8) | (((flag2) & 1) << 7) | ((speed) & 0x7F), time)
#define EVENT_SET_ACCEL(speedTarget, time, flag1, flag2) EVENT_CMD(EVOP_SET_ACCEL, (((flag1) & 1) << 8) | (((flag2) & 1) << 7) | ((speedTarget) & 0x7F), time)
#define EVENT_INIT_ACTOR(info, health) EVENT_CMD(EVOP_INIT_ACTOR, health, info)
#define EVENT_SET_SPEED(speed, zmode, time) EVENT_CMD(EVOP_SET_SPEED, EV_ZMODE(zmode) | ((speed) & 0x7F), time)
#define EVENT_SET_ACCEL(speedTarget, zmode, time) EVENT_CMD(EVOP_SET_ACCEL, EV_ZMODE(zmode) | ((speedTarget) & 0x7F), time)
#define EVENT_SET_ROTATE() EVENT_CMD(EVOP_SET_ROTATE, 0, 0)
#define EVENT_STOP_ROTATE() EVENT_CMD(EVOP_STOP_ROTATE, 0, 0)
#define EVENT_BRANCH(cond, cmd) EVENT_CMD(EVOP_BRANCH, cmd, cond)
#define EVENT_SET_TRIGGER(cond, cmd) EVENT_CMD(EVOP_SET_TRIGGER, cmd, cond)
#define EVENT_CLEAR_TRIGGER(cmd) EVENT_SET_TRIGGER(EVC_NONE, cmd)
#define EVENT_LOOP(cmd, count) EVENT_CMD(EVOP_LOOP, cmd, count)
#define EVENT_SET_GROUND(type) EVENT_CMD(EVOP_SET_GROUND, 0, type)
#define EVENT_DROP_ITEM(item) EVENT_CMD(EVOP_DROP_ITEM, 0, item)
#define EVENT_ADD_TO_GROUP(num, flags) EVENT_CMD(EVOP_ADD_TO_GROUP, flags, num)
#define EVENT_SET_REVERB(reverb) EVENT_CMD(EVOP_SET_REVERB, 0, reverb)
#define EVENT_STOP_BGM() EVENT_CMD(EVOP_STOP_BGM, 0, 0)
#define EVENT_SET_ACTION(action) EVENT_CMD(EVOP_SET_ACTION, 0, action)
#define EVENT_RESTORE_TEAM(teammate) EVENT_CMD(EVOP_RESTORE_TEAM, 0, teammate)
#define EVENT_PLAY_SFX(sfx) EVENT_CMD(EVOP_PLAY_SFX, 0, sfx)
#define EVENT_STOP_SFX(sfx) EVENT_CMD(EVOP_STOP_SFX, 0, sfx)
#define EVENT_SET_CALL(duration, voiceParam) EVENT_CMD(EVOP_SET_CALL, voiceParam, duration)
#define EVENT_ROT_PLUS_X(rot, rotVel) EVENT_CMD(EVOP_ROT_PLUS_X, rotVel * 10, rot)
#define EVENT_ROT_MINUS_X(rot, rotVel) EVENT_CMD(EVOP_ROT_MINUS_X, rotVel * 10, rot)
#define EVENT_ROT_PLUS_Y(rot, rotVel) EVENT_CMD(EVOP_ROT_PLUS_Y, rotVel * 10, rot)
#define EVENT_ROT_MINUS_Y(rot, rotVel) EVENT_CMD(EVOP_ROT_MINUS_Y, rotVel * 10, rot)
#define EVENT_ROT_PLUS_Z(rot, rotVel) EVENT_CMD(EVOP_ROT_PLUS_Z, rotVel * 10, rot)
#define EVENT_ROT_MINUS_Z(rot, rotVel) EVENT_CMD(EVOP_ROT_MINUS_Z, rotVel * 10, rot)
#define EVENT_F4_PLUS_X(rot, rotVel) EVENT_CMD(EVOP_F4_PLUS_X, rotVel * 10, rot)
#define EVENT_F4_MINUS_X(rot, rotVel) EVENT_CMD(EVOP_F4_MINUS_X, rotVel * 10, rot)
#define EVENT_F4_PLUS_Y(rot, rotVel) EVENT_CMD(EVOP_F4_PLUS_Y, rotVel * 10, rot)
#define EVENT_F4_MINUS_Y(rot, rotVel) EVENT_CMD(EVOP_F4_MINUS_Y, rotVel * 10, rot)
#define EVENT_SET_BASE_ZVEL(zvel) EVENT_CMD(EVOP_SET_BASE_ZVEL, 0, zvel)
typedef enum EventModeZ {
EMZ_REST,
EMZ_RELATIVE,
EMZ_PLAYER,
EMZ_3,
} EventModeZ;
typedef enum EventOpcode {
/* 0 */ EVOP_SET_SPEED,
/* 1 */ EVOP_SET_ACCEL,
/* 2 */ EVOP_2,
/* 3 */ EVOP_3,
/* 4 */ EVOP_4,
/* 8 */ EVOP_8 = 8,
/* 9 */ EVOP_9,
/* 10 */ EVOP_10,
/* 11 */ EVOP_11,
/* 12 */ EVOP_12,
/* 16 */ EVOP_16 = 16,
/* 17 */ EVOP_17,
/* 18 */ EVOP_18,
/* 19 */ EVOP_19,
/* 20 */ EVOP_20,
/* 21 */ EVOP_21,
/* 2 */ EVOP_SET_BASE_ZVEL,
/* 3 */ EVOP_SET_TO_IWORK_9,
/* 4 */ EVOP_SET_IWORK_13,
/* 8 */ EVOP_CLEAR_IWORK_13 = 8,
/* 9 */ EVOP_F4_PLUS_X,
/* 10 */ EVOP_F4_MINUS_X,
/* 11 */ EVOP_F4_PLUS_Y,
/* 12 */ EVOP_F4_MINUS_Y,
/* 16 */ EVOP_ROT_PLUS_X = 16,
/* 17 */ EVOP_ROT_MINUS_X,
/* 18 */ EVOP_ROT_PLUS_Y,
/* 19 */ EVOP_ROT_MINUS_Y,
/* 20 */ EVOP_ROT_PLUS_Z,
/* 21 */ EVOP_ROT_MINUS_Z,
/* 24 */ EVOP_SET_ROTATE = 24,
/* 25 */ EVOP_STOP_ROTATE,
/* 40 */ EVOP_40 = 40,
/* 41 */ EVOP_41,
/* 42 */ EVOP_42,
/* 43 */ EVOP_43,
/* 44 */ EVOP_44,
/* 45 */ EVOP_45,
/* 46 */ EVOP_46,
/* 47 */ EVOP_47,
/* 48 */ EVOP_48,
/* 56 */ EVOP_56 = 56,
/* 57 */ EVOP_57,
/* 58 */ EVOP_58,
/* 59 */ EVOP_59,
/* 96 */ EVOP_BRANCH = 96,
/* 40 */ EVOP_SET_STATE_6 = 40,
/* 41 */ EVOP_SET_STATE_7,
/* 42 */ EVOP_SET_STATE_8,
/* 43 */ EVOP_SET_STATE_9,
/* 44 */ EVOP_SET_STATE_13,
/* 45 */ EVOP_SET_IWORK_1_TO_IWORK_12,
/* 46 */ EVOP_SET_STATE_14,
/* 47 */ EVOP_SET_STATE_15,
/* 48 */ EVOP_SET_STATE_1,
/* 56 */ EVOP_SET_CALL = 56,
/* 57 */ EVOP_RESTORE_TEAM,
/* 58 */ EVOP_PLAY_SFX,
/* 59 */ EVOP_STOP_SFX,
/* 96 */ EVOP_SET_TRIGGER = 96,
/* 104 */ EVOP_INIT_ACTOR = 104,
/* 105 */ EVOP_105,
/* 112 */ EVOP_112 = 112,
/* 113 */ EVOP_113,
/* 116 */ EVOP_116 = 116,
/* 118 */ EVOP_118 = 118,
/* 119 */ EVOP_119,
/* 120 */ EVOP_PLAY_MSG, // play message. arg1 is portrait, arg2 is message ID
/* 121 */ EVOP_121,
/* 122 */ EVOP_122,
/* 105 */ EVOP_SET_IWORK_12,
/* 112 */ EVOP_SET_ACTION = 112,
/* 113 */ EVOP_ADD_TO_GROUP,
/* 116 */ EVOP_DROP_ITEM = 116,
/* 118 */ EVOP_SET_REVERB = 118,
/* 119 */ EVOP_SET_GROUND,
/* 120 */ EVOP_PLAY_MSG,
/* 121 */ EVOP_DAMAGE_TEAM,
/* 122 */ EVOP_STOP_BGM,
/* 124 */ EVOP_MAKE_TEXLINE = 124,
/* 125 */ EVOP_STOP_TEXLINE,
/* 126 */ EVOP_LOOP,
/* 127 */ EVOP_STOP_SCRIPT, // stop script
/* 127 */ EVOP_STOP_SCRIPT,
} EventOpcode;
typedef enum EventCondition {
/* 0 */ EVC_0,
/* 0 */ EVC_NONE,
/* 1 */ EVC_1,
/* 2 */ EVC_2,
/* 3 */ EVC_3,
/* 4 */ EVC_4,
/* 5 */ EVC_5,
/* 6 */ EVC_6,
/* 7 */ EVC_7,
/* 8 */ EVC_8,
/* 2 */ EVC_TEAM_COUNT_3,
/* 3 */ EVC_TEAM_COUNT_2,
/* 4 */ EVC_TEAM_COUNT_1,
/* 5 */ EVC_TEAM_COUNT_0,
/* 6 */ EVC_FALCO_ACTIVE,
/* 7 */ EVC_PEPPY_ACTIVE,
/* 8 */ EVC_SLIPPY_ACTIVE,
/* 9 */ EVC_9,
/* 10 */ EVC_10,
/* 11 */ EVC_11,
@@ -203,20 +238,20 @@ typedef enum EventCondition {
/* 22 */ EVC_22,
/* 23 */ EVC_23,
/* 24 */ EVC_24,
/* 25 */ EVC_25,
/* 26 */ EVC_26,
/* 27 */ EVC_27,
/* 28 */ EVC_28,
/* 29 */ EVC_29,
/* 25 */ EVC_HEALTH_100p,
/* 26 */ EVC_HEALTH_75p,
/* 27 */ EVC_HEALTH_50p,
/* 28 */ EVC_HEALTH_25p,
/* 29 */ EVC_HEALTH_0p,
/* 30 */ EVC_30,
/* 31 */ EVC_31,
/* 32 */ EVC_32,
/* 33 */ EVC_33,
/* 34 */ EVC_34,
/* 35 */ EVC_35,
/* 36 */ EVC_36,
/* 37 */ EVC_37,
/* 38 */ EVC_38,
/* 35 */ EVC_SINGLE_LASER,
/* 36 */ EVC_TWIN_LASER,
/* 37 */ EVC_HYPER_LASER,
/* 38 */ EVC_UNK3_LASER,
/* 39 */ EVC_39,
/* 40 */ EVC_40,
/* 41 */ EVC_41,
@@ -225,32 +260,215 @@ typedef enum EventCondition {
/* 44 */ EVC_44,
/* 45 */ EVC_45,
/* 46 */ EVC_46,
/* 47 */ EVC_47,
/* 48 */ EVC_48,
/* 49 */ EVC_49,
/* 50 */ EVC_50,
/* 51 */ EVC_51,
/* 52 */ EVC_52,
/* 53 */ EVC_53,
/* 54 */ EVC_54,
/* 55 */ EVC_55,
/* 56 */ EVC_56,
/* 57 */ EVC_57,
/* 58 */ EVC_58,
/* 59 */ EVC_59,
/* 60 */ EVC_60,
/* 61 */ EVC_61,
/* 47 */ EVC_PRESS_CRIGHT,
/* 48 */ EVC_WING_BROKEN,
/* 49 */ EVC_ME_CLEAR,
/* 50 */ EVC_FO_CLEAR,
/* 51 */ EVC_SX_CLEAR,
/* 52 */ EVC_TI_CLEAR,
/* 53 */ EVC_BO_CLEAR,
/* 54 */ EVC_SY_CLEAR,
/* 55 */ EVC_KA_CLEAR,
/* 56 */ EVC_SO_CLEAR,
/* 57 */ EVC_MA_CLEAR,
/* 58 */ EVC_AQ_CLEAR,
/* 59 */ EVC_ZO_CLEAR,
/* 60 */ EVC_SZ_CLEAR,
/* 61 */ EVC_A6_CLEAR,
/* 62 */ EVC_62,
/* 63 */ EVC_63,
/* 64 */ EVC_64,
/* 65 */ EVC_65,
/* 66 */ EVC_66,
/* 67 */ EVC_67,
/* 65 */ EVC_30_HITS,
/* 66 */ EVC_80_HITS,
/* 67 */ EVC_EXPERT_MODE,
/* 68 */ EVC_68,
/* 69 */ EVC_69,
/* 100 */ EVC_100=100,
} EventCondition;
typedef enum EventState {
/* 0 */ EVSTATE_0,
/* 1 */ EVSTATE_1,
/* 2 */ EVSTATE_F4_PLUS_X,
/* 3 */ EVSTATE_F4_MINUS_X,
/* 4 */ EVSTATE_F4_PLUS_Y,
/* 5 */ EVSTATE_F4_MINUS_Y,
/* 6 */ EVSTATE_6,
/* 7 */ EVSTATE_7,
/* 8 */ EVSTATE_8,
/* 9 */ EVSTATE_9,
/* 10 */ EVSTATE_10,
/* 11 */ EVSTATE_11,
/* 12 */ EVSTATE_TEAM_RETREAT,
/* 13 */ EVSTATE_13,
/* 14 */ EVSTATE_14,
/* 15 */ EVSTATE_15,
/* 200 */ EVSTATE_SCRIPT_END = 200,
/* 1000 */ EVSTATE_1000 = 1000,
} EventState;
typedef enum EventAction {
/* 0 */ EVACT_0,
/* 1 */ EVACT_1,
/* 2 */ EVACT_2,
/* 3 */ EVACT_3,
/* 4 */ EVACT_4,
/* 5 */ EVACT_5,
/* 6 */ EVACT_6,
/* 7 */ EVACT_7,
/* 8 */ EVACT_8,
/* 9 */ EVACT_9,
/* 10 */ EVACT_10,
/* 11 */ EVACT_11,
/* 12 */ EVACT_12,
/* 13 */ EVACT_13,
/* 14 */ EVACT_14,
/* 15 */ EVACT_15,
/* 16 */ EVACT_16,
/* 17 */ EVACT_17,
/* 18 */ EVACT_18,
/* 19 */ EVACT_19,
} EventAction;
typedef enum EventActorInfo {
/* 0 */ EINFO_0,
/* 1 */ EINFO_1,
/* 2 */ EINFO_2,
/* 3 */ EINFO_3,
/* 4 */ EINFO_4,
/* 5 */ EINFO_5,
/* 6 */ EINFO_6,
/* 7 */ EINFO_7,
/* 8 */ EINFO_8,
/* 9 */ EINFO_9,
/* 10 */ EINFO_10,
/* 11 */ EINFO_11,
/* 12 */ EINFO_12,
/* 13 */ EINFO_13,
/* 14 */ EINFO_14,
/* 15 */ EINFO_15,
/* 16 */ EINFO_16,
/* 17 */ EINFO_17,
/* 18 */ EINFO_18,
/* 19 */ EINFO_19,
/* 20 */ EINFO_20,
/* 21 */ EINFO_21,
/* 22 */ EINFO_22,
/* 23 */ EINFO_23,
/* 24 */ EINFO_24,
/* 25 */ EINFO_25,
/* 26 */ EINFO_26,
/* 27 */ EINFO_27,
/* 28 */ EINFO_28,
/* 29 */ EINFO_29,
/* 30 */ EINFO_30,
/* 31 */ EINFO_31,
/* 32 */ EINFO_32,
/* 33 */ EINFO_33,
/* 34 */ EINFO_34,
/* 35 */ EINFO_35,
/* 36 */ EINFO_36,
/* 37 */ EINFO_37,
/* 38 */ EINFO_38,
/* 39 */ EINFO_39,
/* 40 */ EINFO_40,
/* 41 */ EINFO_41,
/* 42 */ EINFO_42,
/* 43 */ EINFO_43,
/* 44 */ EINFO_44,
/* 45 */ EINFO_45,
/* 46 */ EINFO_46,
/* 47 */ EINFO_47,
/* 48 */ EINFO_48,
/* 49 */ EINFO_49,
/* 50 */ EINFO_50,
/* 51 */ EINFO_51,
/* 52 */ EINFO_52,
/* 53 */ EINFO_53,
/* 54 */ EINFO_54,
/* 55 */ EINFO_55,
/* 56 */ EINFO_56,
/* 57 */ EINFO_57,
/* 58 */ EINFO_58,
/* 59 */ EINFO_59,
/* 60 */ EINFO_60,
/* 61 */ EINFO_61,
/* 62 */ EINFO_62,
/* 63 */ EINFO_63,
/* 64 */ EINFO_64,
/* 65 */ EINFO_65,
/* 66 */ EINFO_66,
/* 67 */ EINFO_67,
/* 68 */ EINFO_68,
/* 69 */ EINFO_69,
/* 70 */ EINFO_70,
/* 71 */ EINFO_71,
/* 72 */ EINFO_72,
/* 73 */ EINFO_73,
/* 74 */ EINFO_74,
/* 75 */ EINFO_75,
/* 76 */ EINFO_76,
/* 77 */ EINFO_77,
/* 78 */ EINFO_78,
/* 79 */ EINFO_79,
/* 80 */ EINFO_80,
/* 81 */ EINFO_81,
/* 82 */ EINFO_82,
/* 83 */ EINFO_83,
/* 84 */ EINFO_84,
/* 85 */ EINFO_85,
/* 86 */ EINFO_86,
/* 87 */ EINFO_87,
/* 88 */ EINFO_88,
/* 89 */ EINFO_89,
/* 90 */ EINFO_90,
/* 91 */ EINFO_91,
/* 92 */ EINFO_92,
/* 93 */ EINFO_93,
/* 94 */ EINFO_94,
/* 95 */ EINFO_95,
/* 96 */ EINFO_96,
/* 97 */ EINFO_97,
/* 98 */ EINFO_98,
/* 99 */ EINFO_99,
/* 100 */ EINFO_100,
/* 101 */ EINFO_101,
/* 102 */ EINFO_102,
/* 103 */ EINFO_103,
/* 104 */ EINFO_104,
/* 105 */ EINFO_105,
/* 106 */ EINFO_106,
/* 107 */ EINFO_107,
/* 200 */ EINFO_200 = 200,
/* 300 */ EINFO_300 = 300,
} EventActorInfo;
typedef enum EventSfx {
/* 0 */ EVSFX_0,
/* 1 */ EVSFX_1,
/* 2 */ EVSFX_2,
/* 3 */ EVSFX_3,
/* 4 */ EVSFX_4,
/* 5 */ EVSFX_5,
/* 6 */ EVSFX_6,
/* 7 */ EVSFX_7,
/* 8 */ EVSFX_8,
/* 9 */ EVSFX_9,
/* 10 */ EVSFX_10,
/* 11 */ EVSFX_11,
/* 12 */ EVSFX_12,
/* 13 */ EVSFX_13,
/* 14 */ EVSFX_14,
/* 15 */ EVSFX_15,
/* 16 */ EVSFX_16,
/* 17 */ EVSFX_17,
/* 18 */ EVSFX_18,
/* 19 */ EVSFX_19,
/* 20 */ EVSFX_20,
/* 21 */ EVSFX_21,
/* 22 */ EVSFX_22,
} EventSfx;
typedef enum TexLineColor {
/* 0 */ TXLC_WHITE,
/* 1 */ TXLC_LIGHT_BLUE,
@@ -260,4 +478,40 @@ typedef enum TexLineColor {
/* 5 */ TXLC_YELLOW,
} TexLineColor;
typedef enum GroundType {
/* 0 */ GROUNDTYPE_GRASS,
/* 1 */ GROUNDTYPE_ROCK,
/* 2 */ GROUNDTYPE_WATER,
} GroundType;
typedef enum ItemDrop {
/* 0 */ DROP_NONE,
/* 1 */ DROP_SILVER_RING,
/* 2 */ DROP_SILVER_RING_50p,
/* 3 */ DROP_SILVER_RING_33p,
/* 4 */ DROP_SILVER_RING_25p,
/* 5 */ DROP_BOMB,
/* 6 */ DROP_BOMB_50p,
/* 7 */ DROP_BOMB_33p,
/* 8 */ DROP_BOMB_25p,
/* 9 */ DROP_LASERS,
/* 10 */ DROP_LASERS_50p,
/* 11 */ DROP_LASERS_33p,
/* 12 */ DROP_LASERS_25p,
/* 13 */ DROP_1UP,
/* 14 */ DROP_GOLD_RING_1,
/* 15 */ DROP_GOLD_RING_2,
/* 16 */ DROP_GOLD_RING_3,
/* 17 */ DROP_GOLD_RING_4,
/* 18 */ DROP_GOLD_RING_GROUP,
/* 19 */ DROP_LASERS_GROUP,
/* 20 */ DROP_BOMB_GROUP,
/* 21 */ DROP_SILVER_RING_GROUP,
/* 22 */ DROP_SILVER_RING_10p,
/* 23 */ DROP_WING_REPAIR,
/* 24 */ DROP_TEAM_MESG,
/* 25 */ DROP_SILVER_STAR,
/* 26 */ DROP_MAX,
} ItemDrop;
#endif
include/sf64object.h
+34 -17
View File
@@ -44,7 +44,7 @@ typedef enum {
/* 0 */ COL1_0, // OBJ_ACTOR_180
/* 1 */ COL1_1, // OBJ_80_39
/* 2 */ COL1_2,
/* 3 */ COL1_3, // OBJ_UNK_1000
/* 3 */ COL1_3, // ACTOR_EVENT_ID
/* 4 */ COL1_4, // OBJ_BOSS_308
/* 5 */ COL1_5, // OBJ_80_149
/* 6 */ COL1_6, // OBJ_80_150
@@ -134,7 +134,8 @@ typedef struct {
typedef struct {
/* 0x00 */ Object obj;
/* 0x1C */ ObjectInfo info;
/* 0x40 */ char unk40[0x8];
/* 0x40 */ u8 unk_40;
/* 0x41 */ char unk_41[7];
/* 0x48 */ f32 sfxSource[3];
/* 0x54 */ f32 unk_54;
} Object_58; // size = 0x58
@@ -249,7 +250,7 @@ typedef struct {
/* 0x000 */ Object obj;
/* 0x01C */ ObjectInfo info;
/* 0x040 */ s32 index;
/* 0x044 */ u8 unk_044;
/* 0x044 */ u8 itemDrop;
/* 0x046 */ s16 unk_046;
/* 0x048 */ s16 unk_048;
/* 0x04A */ s16 unk_04A;
@@ -485,13 +486,13 @@ typedef enum ObjectId {
/* 194 */ OBJ_ACTOR_194,
/* 195 */ OBJ_ACTOR_195,
/* 196 */ OBJ_ACTOR_196,
/* 197 */ OBJ_ACTOR_197,
/* 198 */ OBJ_ACTOR_198,
/* 197 */ OBJ_ACTOR_ALLRANGE,
/* 198 */ OBJ_ACTOR_TEAM_BOSS,
/* 199 */ OBJ_ACTOR_199,
/* 200 */ OBJ_ACTOR_200,
/* 200 */ OBJ_ACTOR_EVENT,
/* 201 */ OBJ_ACTOR_201,
/* 202 */ OBJ_ACTOR_202,
/* 203 */ OBJ_ACTOR_203,
/* 203 */ OBJ_ACTOR_SLIPPY_SX,
/* 204 */ OBJ_ACTOR_204,
/* 205 */ OBJ_ACTOR_205,
/* 206 */ OBJ_ACTOR_206,
@@ -579,7 +580,7 @@ typedef enum ObjectId {
/* 288 */ OBJ_ACTOR_288,
/* 289 */ OBJ_ACTOR_289,
/* 290 */ OBJ_ACTOR_290,
/* 291 */ OBJ_ACTOR_291,
/* 291 */ OBJ_ACTOR_SUPPLIES,
/* 292 */ OBJ_BOSS_292,
/* 293 */ OBJ_BOSS_293,
/* 294 */ OBJ_BOSS_294,
@@ -688,18 +689,34 @@ typedef enum ObjectId {
/* 397 */ OBJ_EFFECT_397,
/* 398 */ OBJ_EFFECT_398,
/* 399 */ OBJ_EFFECT_399,
/* 400 */ OBJ_ID_MAX,
/* 400 */ OBJ_UNK_400,
/* 401 */ OBJ_UNK_401,
/* 402 */ OBJ_UNK_402,
/* 403 */ OBJ_UNK_403,
/* 404 */ OBJ_UNK_404,
/* 405 */ OBJ_UNK_405,
/* 406 */ OBJ_UNK_406,
/* 407 */ OBJ_ID_MAX,
} ObjectId;
#define OBJ_UNK_400 400
#define OBJ_UNK_401 401
#define OBJ_UNK_402 402
#define OBJ_UNK_403 403
#define OBJ_UNK_404 404
#define OBJ_UNK_405 405
#define OBJ_UNK_406 406
#define ACTOR_EVENT_ID 1000
#define OBJ_UNK_1000 1000
typedef enum AllRangeAi {
/* 0 */ AI360_FOX,
/* 1 */ AI360_FALCO,
/* 2 */ AI360_SLIPPY,
/* 3 */ AI360_PEPPY,
/* 4 */ AI360_WOLF,
/* 5 */ AI360_LEON,
/* 6 */ AI360_PIGMA,
/* 7 */ AI360_ANDREW,
/* 8 */ AI360_KATT,
/* 9 */ AI360_BILL,
/* 10 */ AI360_10,
/* 100 */ AI360_GREAT_FOX = 100,
/* 200 */ AI360_MISSILE = 200,
/* 200 */ AI360_EVENT_HANDLER = 1000,
} AllRangeAi;
Actor* func_game_800A3608(ObjectId);
include/sf64player.h
+1 -1
View File
@@ -251,7 +251,7 @@ typedef struct Player {
/* 0x21C */ s32 unk_21C;
/* 0x220 */ s32 timer_220;
/* 0x224 */ s32 timer_224;
/* 0x228 */ s32 unk_228;
/* 0x228 */ s32 flags_228;
/* 0x22C */ s32 unk_22C;
/* 0x230 */ s32 unk_230;
/* 0x234 */ s32 unk_234;
include/variables.h
+3 -3
View File
@@ -159,7 +159,7 @@ extern s32 D_hud_8016170C;
extern s32 D_hud_80161710;
extern s32 gTotalHits; // 0x80161714 gTotalGameScore
extern f32 D_hud_80161720[3];
extern s32 D_hud_8016172C;
extern s32 gDisplayedHitCount;
extern s32 D_hud_80161730;
extern s32 gShowBossHealth; // 0x80161734
@@ -168,8 +168,8 @@ extern u8 D_play_80161A50;
extern f32 D_play_80161A54;
extern s32 D_play_80161A58;
extern s32 D_play_80161A5C;
extern u16 D_play_Timer_80161A60;
extern u16 D_play_80161A62;
extern u16 gScreenFlashTimer;
extern u16 gDropHitCountItem;
//fox_radio
extern u16** D_radio_80178720;