mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-08-01 08:27:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Actor Docs (#270)

Browse Source 
* Docs

* actor timer_04C -> work_04C

* Actor & Boss unk_04A -> work_04A

* actor & boss unk_048 -> work_048

* actor & boss unk_046 -> work_046

* boss unk_044 -> work_044

* actor event docs

* ActorEvent docs

* name all Event Actor IDs

* EVID names in EventActorInfo comments

* refactor EVC_PASSED_ALL_RINGS by @inspectredc

* clarification comment

* some option docs

* audio enums and macros

* some audio renamings
This commit is contained in:
Alejandro Asenjo Nitti
2024-08-24 19:36:53 -03:00
committed by GitHub
parent 669fff8759
commit e82019fa2b
95 changed files with 2126 additions and 1960 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/fox_option.h
+47 -49
View File
@@ -3,46 +3,43 @@
#include "global.h"
//! TODO: RENAME. Member names inferred by Option_DrawCardLabel.
typedef struct {
/* 0x00 */ s32 unk_00; // type
/* 0x00 */ s32 type;
/* 0x04 */ s32 unk_04;
/* 0x08 */ void* unk_08; // texture
/* 0x0C */ u16* unk_0C; // palette
/* 0x10 */ s32 unk_10; // width
/* 0x14 */ s32 unk_14; // height
/* 0x18 */ f32 unk_18; // xPos
/* 0x1C */ f32 unk_1C; // yPos
/* 0x20 */ f32 unk_20; // xScale
/* 0x24 */ f32 unk_24; // yScale
/* 0x28 */ s32 unk_28; // red
/* 0x2C */ s32 unk_2C; // green
/* 0x30 */ s32 unk_30; // blue
/* 0x34 */ s32 unk_34; // alpha
/* 0x08 */ void* texture;
/* 0x0C */ u16* palette;
/* 0x10 */ s32 width;
/* 0x14 */ s32 height;
/* 0x18 */ f32 xPos;
/* 0x1C */ f32 yPos;
/* 0x20 */ f32 xScale;
/* 0x24 */ f32 yScale;
/* 0x28 */ s32 red;
/* 0x2C */ s32 green;
/* 0x30 */ s32 blue;
/* 0x34 */ s32 alpha;
} OptionTexture; // size = 0x38
//! TODO: RENAME. Member names inferred by Option_DrawMenuCard
typedef struct {
/* 0x00 */ f32 unk_00; // x
/* 0x04 */ f32 unk_04; // y
/* 0x08 */ f32 unk_08; // z
/* 0x0C */ f32 unk_0C; // xScale
/* 0x10 */ f32 unk_10; // yScale
/* 0x00 */ f32 x;
/* 0x04 */ f32 y;
/* 0x08 */ f32 z;
/* 0x0C */ f32 xScale;
/* 0x10 */ f32 yScale;
} MenuContext_38; // size = 0x14
//! TODO: RENAME. Member names inferred by Option_DrawMenuArwing
typedef struct {
/* 0x0 */ f32 unk_0; // x
/* 0x4 */ f32 unk_4; // y
/* 0x8 */ f32 unk_8; // range
/* 0x0 */ f32 x;
/* 0x4 */ f32 y;
/* 0x8 */ f32 range;
} ArwingPosition; // size = 0xC
typedef struct {
/* 0x00 */ OptionTexture unk_00;
/* 0x38 */ MenuContext_38 unk_38;
/* 0x4C */ ArwingPosition unk_4C;
/* 0x58 */ s32 unk_58;
/* 0x5C */ s32 unk_5C;
/* 0x58 */ bool unk_58;
/* 0x5C */ bool unk_5C;
} OptionEntry; // size = 0x60
typedef struct {
@@ -57,22 +54,22 @@ typedef struct {
} UnkStruct_D_menu_801B9250;
typedef enum OptionId {
OPTION_MAIN_MENU = 1000,
OPTION_VERSUS_STAGE = 2000,
OPTION_MAP = 0,
OPTION_TRAINING = 1,
OPTION_VERSUS = 2,
OPTION_RANKING = 3,
OPTION_SOUND = 4,
OPTION_DATA = 5,
OPTION_EXPERT_SOUND = 6,
OPTION_POINT_MATCH = 10,
OPTION_BR_MATCH = 20,
OPTION_TT_MATCH = 30,
OPTION_NAME = 200,
OPTION_SCORE = 300,
OPTION_INVOICE = 400,
OPTION_MAX,
/* 1000 */ OPTION_MAIN_MENU = 1000,
/* 2000 */ OPTION_VERSUS_STAGE = 2000,
/* 0 */ OPTION_MAP = 0,
/* 1 */ OPTION_TRAINING = 1,
/* 2 */ OPTION_VERSUS = 2,
/* 3 */ OPTION_RANKING = 3,
/* 4 */ OPTION_SOUND = 4,
/* 5 */ OPTION_DATA = 5,
/* 6 */ OPTION_EXPERT_SOUND = 6,
/* 10 */ OPTION_POINT_MATCH = 10,
/* 20 */ OPTION_BR_MATCH = 20,
/* 30 */ OPTION_TT_MATCH = 30,
/* 200 */ OPTION_NAME = 200,
/* 300 */ OPTION_SCORE = 300,
/* 400 */ OPTION_INVOICE = 400,
/* 401 */ OPTION_MAX,
} OptionId;
#define OPTION_COUNT ARRAY_COUNT(sOptionCardList)
@@ -81,7 +78,7 @@ extern u8* D_menu_801B68B0[];
extern u8* D_menu_801B68D4[];
extern s32 D_menu_801B8220[]; // total hits ranking? see Option_80197DE4
extern s32 D_menu_801B827C; // engine
extern s32 D_menu_801B827C; // engine
extern s32 D_menu_801B8280;
extern s32 D_menu_801B8284;
extern s32 D_menu_801B8288;
@@ -98,7 +95,7 @@ extern u8 D_menu_801C9010[96 * 96];
extern u8 D_menu_801CB410[96 * 96];
void Title_UpdateEntry(void);
s32 Title_80187ABC(void);
s32 Title_80187ABC(void);
void Title_80187B00(void);
void Title_80187E28(void);
void Title_801888E8(void);
@@ -194,14 +191,15 @@ void Option_8019B8A0(s32 arg0);
void Option_8019B8C8(void);
void Option_DrawMenuLabel(void);
void Option_DrawMenuCard(MenuContext_38 arg0);
void Option_DrawMenuArwing(ArwingPosition arg0);
void Option_8019BC44(f32, f32, f32, f32, f32, f32);
void Option_DrawMenuArwing(ArwingPosition arwing);
void Option_DrawArwing(f32, f32, f32, f32, f32, f32);
void Option_8019BDF0(void);
void Option_8019BE7C(f32, f32, f32, f32 *, f32 *, f32 *);
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, bool arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, UnkStruct_D_menu_801B9250* arg8);
void Option_DrawCardLabel(OptionTexture tex);
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
+2 -2
View File
@@ -87,7 +87,7 @@ void Cutscene_DrawGreatFox(void);
// fox_display
void Display_ArwingWings(ArwingInfo*);
void Display_DrawEngineGlow(s32);
void Display_DrawEngineGlow(EngineGlowColor);
void Display_SetupPlayerSfxPos(Player*);
void Display_Update(void);
@@ -112,7 +112,7 @@ void CoBuilding9_Draw(Scenery*);
void CoBuilding10_Draw(Scenery*);
void ActorDebris_Draw(Actor*);
void Actor_DrawEngineAndContrails(Actor*);
void Actor_DrawEngineGlow(Actor*, s32);
void Actor_DrawEngineGlow(Actor*, EngineGlowColor);
void ActorTeamArwing_Draw(Actor*);
void MeMolarRock_Draw(Actor*);
void MeMeteor2_Draw(MeMeteor2*);
include/i6.h
+1 -1
View File
@@ -22,7 +22,7 @@ void SectorY_LevelComplete(Player*);
void SectorY_8019FF00(Actor*);
void SectorY_801A0AC0(Player*);
void Andross_8018769C(Actor*);
void Andross_Gate_Draw(Actor*);
void OvlI6_CallFunction(u32 mode, void* ptr);
void Andross_801878A8(void);
void Andross_801888F4(Actor *);
include/prevent_context_reordering.h
+3 -3
View File
@@ -1,7 +1,7 @@
#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;};
@@ -14,8 +14,8 @@
// struct Dummy9 {int x;};
// struct Dummy10 {int x;};
// struct Dummy11 {int x;};
struct Dummy12 {int x;};
struct Dummy13 {int x;};
// struct Dummy12 {int x;};
// struct Dummy13 {int x;};
struct Dummy14 {int x;};
struct Dummy15 {int x;};
struct Dummy16 {int x;};
include/sf64event.h
+125 -96
View File
@@ -1,3 +1,32 @@
/**
* Glossary:
* EVID: Event ID
* EVACT: Event Action
* EVOP: Event Opcode
* EVC: Event Condition
* EVSTATE: Event State
*
* Level Prefixes:
* CO: Corneria
* ME: Meteo
* SX: Sector X
* SY: Sector Y
* SZ: Sector Z
* KA: Katina
* AQ: Aquas
* A6: Area 6
* FO: Fortuna
* SO: Solar
* MA: Macbeth
* TI: Titania
* BO: Bolse
* ZO: Zoness
* VE1: Venom 1
* VE2: Venom 2
* AND: Venom Andross
* WZ: Warpzone
*/
#ifndef SF64_EVENT
#define SF64_EVENT
@@ -300,118 +329,118 @@ typedef enum EventAction {
/* 16 */ EVACT_16,
/* 17 */ EVACT_17,
/* 18 */ EVACT_GFOX_COVER_FIRE,
/* 19 */ EVACT_19,
/* 19 */ EVACT_19, // projectile ring used by bee enemies
} EventAction;
typedef enum EventActorId {
/* 0 */ EVID_0,
/* 1 */ EVID_1,
/* 2 */ EVID_SLIPPY_METEO,
/* 3 */ EVID_3,
/* 4 */ EVID_4,
/* 5 */ EVID_5,
/* 6 */ EVID_6,
/* 7 */ EVID_7,
/* 8 */ EVID_8,
/* 9 */ EVID_9,
/* 10 */ EVID_10,
/* 11 */ EVID_11,
/* 12 */ EVID_12,
/* 13 */ EVID_13,
/* 14 */ EVID_14,
/* 15 */ EVID_15,
/* 16 */ EVID_16,
/* 17 */ EVID_17,
/* 18 */ EVID_18,
/* 19 */ EVID_19,
/* 20 */ EVID_20,
/* 21 */ EVID_A6_MISSILE,
/* 0 */ EVID_VENOM_FIGHTER_1,
/* 1 */ EVID_VENOM_FIGHTER_2,
/* 2 */ EVID_ME_SLIPPY,
/* 3 */ EVID_SPY_EYE, // jp name: Sunfish II
/* 4 */ EVID_GRANGA_FIGHTER_1, // jp name: Dragon
/* 5 */ EVID_GRANGA_FIGHTER_2, // jp name: Dragon II
/* 6 */ EVID_FIREBIRD, // Handles Firebird from Corneria and Gore from Solar
/* 7 */ EVID_CORNERIAN_FIGHTER, // Seems unused?
/* 8 */ EVID_VENOM_TANK,
/* 9 */ EVID_TRIPOD, // jp name: Butterfly
/* 10 */ EVID_ATTACKER_1,
/* 11 */ EVID_ATTACKER_2,
/* 12 */ EVID_ATTACKER_3,
/* 13 */ EVID_ME_METEOR_1,
/* 14 */ EVID_ME_METEOR_2,
/* 15 */ EVID_COMMANDER,
/* 16 */ EVID_SPIDER,
/* 17 */ EVID_ZERAM_CLASS_CRUISER,
/* 18 */ EVID_SX_SPY_EYE, // jp name: Sunfish I
/* 19 */ EVID_SX_CANINE,
/* 20 */ EVID_SPACE_MINE,
/* 21 */ EVID_A6_NINJIN_MISSILE,
/* 22 */ EVID_A6_ROCKET,
/* 23 */ EVID_23,
/* 24 */ EVID_24,
/* 25 */ EVID_25,
/* 26 */ EVID_26,
/* 27 */ EVID_27,
/* 28 */ EVID_28,
/* 29 */ EVID_29,
/* 30 */ EVID_30,
/* 31 */ EVID_31,
/* 32 */ EVID_32,
/* 33 */ EVID_33,
/* 34 */ EVID_34,
/* 35 */ EVID_35,
/* 36 */ EVID_36,
/* 37 */ EVID_37,
/* 23 */ EVID_VENOM_FIGHTER_3,
/* 24 */ EVID_SX_BASE_DEBRIS_1,
/* 25 */ EVID_SX_BASE_WALL_1,
/* 26 */ EVID_SX_BASE_DEBRIS_2,
/* 27 */ EVID_SX_LASER,
/* 28 */ EVID_SX_WATCH_POST, // Invented name
/* 29 */ EVID_SX_SPACE_MINE,
/* 30 */ EVID_A6_HARLOCK_FRIGATE,
/* 31 */ EVID_A6_UMBRA_STATION,
/* 32 */ EVID_SX_BASE_FLOOR_1,
/* 33 */ EVID_CRUISER_GUN, // Guns located on Zeram-class Cruisers
/* 34 */ EVID_SX_BASE_WALL_2,
/* 35 */ EVID_SX_BASE_WALL_3,
/* 36 */ EVID_TI_BOMBER, // Bird-like ship that drops land mines
/* 37 */ EVID_SX_BORZOI_FIGHTER,
/* 38 */ EVID_SX_WARP_GATE,
/* 39 */ EVID_39,
/* 39 */ EVID_SX_BASE_WALL_TILE_1,
/* 40 */ EVID_EVENT_HANDLER,
/* 41 */ EVID_41,
/* 42 */ EVID_42,
/* 41 */ EVID_SY_SHIP_1,
/* 42 */ EVID_SY_SHIP_2,
/* 43 */ EVID_TEAMMATE,
/* 44 */ EVID_44,
/* 45 */ EVID_45,
/* 46 */ EVID_46,
/* 47 */ EVID_47,
/* 48 */ EVID_48,
/* 49 */ EVID_49,
/* 50 */ EVID_50,
/* 51 */ EVID_51,
/* 52 */ EVID_52,
/* 53 */ EVID_53,
/* 54 */ EVID_54,
/* 55 */ EVID_55,
/* 56 */ EVID_56,
/* 57 */ EVID_57,
/* 58 */ EVID_58,
/* 59 */ EVID_59,
/* 60 */ EVID_60,
/* 61 */ EVID_61,
/* 62 */ EVID_62,
/* 63 */ EVID_63,
/* 64 */ EVID_64,
/* 65 */ EVID_65,
/* 66 */ EVID_66,
/* 67 */ EVID_METEO_PYRAMID_SHIP,
/* 68 */ EVID_68,
/* 69 */ EVID_69,
/* 70 */ EVID_70,
/* 71 */ EVID_WING_REPAIR,
/* 72 */ EVID_72,
/* 73 */ EVID_73,
/* 74 */ EVID_74,
/* 75 */ EVID_75,
/* 76 */ EVID_76,
/* 77 */ EVID_77,
/* 44 */ EVID_SY_SHIP_3,
/* 45 */ EVID_ME_METEOR_3,
/* 46 */ EVID_ZO_PATROL_BOAT,
/* 47 */ EVID_ME_SECRET_MARKER_1, // Metal spheres that mark secret items. Invented name
/* 48 */ EVID_SY_ROBOT_1,
/* 49 */ EVID_SY_ROBOT_2,
/* 50 */ EVID_SY_ROBOT_3,
/* 51 */ EVID_SY_ROBOT_4, // Unclear as to whether it's used or not, only it's hitbox gets used in code
/* 52 */ EVID_SARUMARINE_PERISCOPE,
/* 53 */ EVID_SX_BASE_WALL_4,
/* 54 */ EVID_GAMMA_ON, // Andross Army Gamma-Off Formation Leader (Orange Andross Fighter)
/* 55 */ EVID_GAMMA_OFF, // Blue Andross Fighter
/* 56 */ EVID_TI_GREAT_FOX, // Great Fox that flees after the intro cutscene
/* 57 */ EVID_SY_SHIP_3_2, // Another variant of EVID_SY_SHIP_3 without a hitbox, seems unused?
/* 58 */ EVID_SY_SARUZIN, // flagship of Sector Y, base of the Shogun Boss
/* 59 */ EVID_SY_ROBOT_SPRITE_SIDE, // Robot sprites that appear in Sector Y's background, side variant
/* 60 */ EVID_SY_ROBOT_SPRITE_FRONT, // Robot sprites that appear in Sector Y's background, front variant
/* 61 */ EVID_ME_METEOR_4,
/* 62 */ EVID_ME_METEOR_5,
/* 63 */ EVID_ME_BIG_METEOR, // Big meteor that bounces in Meteo
/* 64 */ EVID_ME_ROCK_GULL, // Enemy laser turret inside a meteorite
/* 65 */ EVID_ME_METEOR_6,
/* 66 */ EVID_ME_SECRET_MARKER_2, // Metal spheres that mark secret items. Invented name
/* 67 */ EVID_ME_FLIP_BOT,
/* 68 */ EVID_SY_LASER_TURRET,
/* 69 */ EVID_SY_SHIP_DESTROYED,
/* 70 */ EVID_SY_DEBRIS, // Sprite portraying small pieces of debris. Seems unused
/* 71 */ EVID_ITEM_WING_REPAIR,
/* 72 */ EVID_SY_SHIP_WINDOWS,
/* 73 */ EVID_SY_SHIP_4,
/* 74 */ EVID_SY_SHIP_4_DESTROYED,
/* 75 */ EVID_SY_SHIP_2_SPRITE, // Unused
/* 76 */ EVID_SY_SHIP_3_SPRITE, // Unused
/* 77 */ EVID_SY_SHIP_MISSILE,
/* 78 */ EVID_SUPPLY_CRATE,
/* 79 */ EVID_79,
/* 80 */ EVID_80,
/* 81 */ EVID_81,
/* 82 */ EVID_82,
/* 83 */ EVID_AQ_CLAM,
/* 84 */ EVID_84,
/* 79 */ EVID_ZO_BIRD,
/* 80 */ EVID_VE1_PILLAR,
/* 81 */ EVID_VE1_BLOCKER,
/* 82 */ EVID_MA_LASER_TURRET,
/* 83 */ EVID_AQ_OYSTER,
/* 84 */ EVID_VE1_PILLAR_5,
/* 85 */ EVID_BILL,
/* 86 */ EVID_KATT,
/* 87 */ EVID_87,
/* 87 */ EVID_VE1_TEMPLE_BG, // Background used inside Venom 1 temple to hide drawing popup
/* 88 */ EVID_AQ_STARFISH,
/* 89 */ EVID_89,
/* 90 */ EVID_90,
/* 91 */ EVID_91,
/* 92 */ EVID_92,
/* 93 */ EVID_93,
/* 94 */ EVID_94,
/* 95 */ EVID_95,
/* 96 */ EVID_96,
/* 97 */ EVID_97,
/* 98 */ EVID_98,
/* 99 */ EVID_99,
/* 100 */ EVID_100,
/* 101 */ EVID_101,
/* 89 */ EVID_AQ_SHELL,
/* 90 */ EVID_MA_RAILROAD_CART,
/* 91 */ EVID_MA_GUILLOTINE_1,
/* 92 */ EVID_WZ_PILLAR_1,
/* 93 */ EVID_WZ_PILLAR_2,
/* 94 */ EVID_WZ_METEOR_1,
/* 95 */ EVID_WZ_METEOR_2,
/* 96 */ EVID_WZ_GATE,
/* 97 */ EVID_ME_METEOR_7,
/* 98 */ EVID_MA_BOULDER,
/* 99 */ EVID_VE1_ENEMY_GATE, // Gate in Venom 1 for outcoming enemies
/* 100 */ EVID_ENEMY_GATE_DOOR_RIGHT,
/* 101 */ EVID_ENEMY_GATE_DOOR_LEFT,
/* 102 */ EVID_TR_BARRIER,
/* 103 */ EVID_ANDROSS_GATE,
/* 104 */ EVID_ANDROSS_GATE_2,
/* 105 */ EVID_SX_WARP_ENMY,
/* 106 */ EVID_KILLER_BEE,
/* 107 */ EVID_MA_SHOT_GATE,
/* 107 */ EVID_MA_GUILLOTINE_2, // Variant of the Macbeth Guillotine that can be shot at to be opened
/* 200 */ EVID_200 = 200,
/* 300 */ EVID_300 = 300,
/* 4095*/ EVID_FFF = 4095,
include/sf64level.h
-2
View File
@@ -8,8 +8,6 @@
typedef enum LevelType {
/* 0 */ LEVELTYPE_PLANET,
/* 1 */ LEVELTYPE_SPACE,
/* 2 */ LEVELTYPE_UNK2,
/* 3 */ LEVELTYPE_UNK3,
} LevelType;
typedef enum MissionStatus {
include/sf64object.h
+10 -10
View File
@@ -227,10 +227,10 @@ typedef struct Boss {
/* 0x000 */ Object obj;
/* 0x01C */ ObjectInfo info;
/* 0x040 */ s32 index;
/* 0x044 */ s16 unk_044;
/* 0x046 */ s16 unk_046;
/* 0x048 */ s16 unk_048;
/* 0x04A */ s16 unk_04A;
/* 0x044 */ s16 work_044;
/* 0x046 */ s16 work_046;
/* 0x048 */ s16 work_048;
/* 0x04A */ s16 work_04A;
/* 0x04C */ s16 animFrame;
/* 0x04E */ s16 state;
/* 0x050 */ s16 timer_050;
@@ -268,10 +268,10 @@ typedef struct Actor {
/* 0x01C */ ObjectInfo info;
/* 0x040 */ s32 index;
/* 0x044 */ u8 itemDrop;
/* 0x046 */ s16 unk_046;
/* 0x048 */ s16 unk_048;
/* 0x04A */ s16 unk_04A;
/* 0x04C */ s16 timer_04C;
/* 0x046 */ s16 work_046;
/* 0x048 */ s16 work_048;
/* 0x04A */ s16 work_04A;
/* 0x04C */ s16 work_04C;
/* 0x04E */ s16 counter_04E;
/* 0x050 */ s32 iwork[25];
/* 0x0B4 */ s16 eventType;
@@ -421,7 +421,7 @@ typedef enum ObjectId {
/* 112 */ OBJ_SCENERY_SY_SHIP_2_DESTROYED,
/* 113 */ OBJ_SPRITE_SY_SHIP_2, // Unused
/* 114 */ OBJ_SPRITE_SY_SHIP_3, // Unused
/* 115 */ OBJ_SCENERY_SY_SHIP_PROJECTILE,
/* 115 */ OBJ_SCENERY_SY_SHIP_MISSILE,
/* 116 */ OBJ_SCENERY_SY_SHIP_WINDOWS,
/* 117 */ OBJ_SCENERY_AQ_CORAL_REEF_1,
/* 118 */ OBJ_SCENERY_AQ_TUNNEL_1,
@@ -623,7 +623,7 @@ typedef enum ObjectId {
/* 314 */ OBJ_BOSS_SY_SHOGUN,
/* 315 */ OBJ_BOSS_SO_VULKAIN,
/* 316 */ OBJ_BOSS_KA_SAUCERER,
/* 317 */ OBJ_BOSS_KA_FLBASE,
/* 317 */ OBJ_BOSS_KA_FLBASE, // Katina FrontLine Base
/* 318 */ OBJ_BOSS_AQ_BACOON,
/* 319 */ OBJ_BOSS_VE1_GOLEMECH,
/* 320 */ OBJ_BOSS_AND_ANDROSS,
include/sf64player.h
+7
View File
@@ -51,6 +51,13 @@ typedef enum DrawMode {
/* 9 */ DRAW_MAX,
} DrawMode;
typedef enum EngineGlowColor {
/* 0 */ EG_RED,
/* 1 */ EG_BLUE,
/* 2 */ EG_GREEN,
/* 3 */ EG_ORANGE
} EngineGlowColor;
typedef enum LevelMode {
/* 0 */ LEVELMODE_ON_RAILS,
/* 1 */ LEVELMODE_ALL_RANGE,
include/variables.h
+4 -4
View File
@@ -43,10 +43,10 @@ extern f32 gActorMissileSeekHitbox[];
extern f32 gMeMoraHitbox[];
extern f32 gTeamHitbox[];
extern f32 gActorAllRangeHItbox[];
extern f32 gWarpZoneEvent94Hitbox[];
extern f32 gWarpZoneEvent96Hitbox[];
extern f32 gWarpZoneEvent92Hitbox[];
extern f32 gWarpZoneEvent93Hitbox[];
extern f32 aWzMeteor1Hitbox[];
extern f32 aWzGateHitbox[];
extern f32 aWzPillar1Hitbox[];
extern f32 aWzPillar2Hitbox[];
extern ObjectInfo gObjectInfo[];
extern f32* D_edata_800CF964[];