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

Merge branch 'master' into otr

Browse Source
This commit is contained in:
KiritoDv
2024-09-17 19:14:09 -03:00
committed by Sonic Dreamcaster
parent ed2a45796b 0a8c61789e
commit 3892bcefa2
507 changed files with 120579 additions and 57909 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/variables.h
+80 -78
View File
@@ -2,53 +2,52 @@
#define VARIABLES_H
#include "sys.h"
#include "structs.h"
#include "sf64level.h"
#include "sf64object.h"
#include "sf64player.h"
// fox_360
extern s32 D_360_800C9B4C;
extern s32 gAllRangeSpawnEvent;
// fox_bg
extern u16 D_bg_800C9C3C[16];
extern u16 gStarColors[16];
// fox_boss
extern s32 D_boss_800C9E90[];
extern s32 gBossBgms[];
// fox_tank
extern Vec3f D_tank_800C9F2C;
// fox_display
extern s32 D_display_800CA220;
extern f32 D_display_800CA230;
extern Actor* D_display_800CA234;
extern s32 D_display_Timer_800CA238;
extern f32 gCamDistortion;
extern Actor* gTeamHelpActor;
extern s32 gTeamHelpTimer;
// fox_edata
extern f32 D_edata_800CBE70[];
extern f32 D_edata_800CBE8C[];
extern f32 D_edata_800CBEA8[];
extern f32 D_edata_800CBEC4[];
extern f32 D_edata_800CBEE0[];
extern f32 D_edata_800CBEFC[];
extern f32 D_edata_800CBF18[];
extern f32 D_edata_800CBF34[];
extern f32 D_edata_800CBF38[];
extern f32 D_edata_800CBF54[];
extern f32 D_edata_800CBF70[];
extern f32 D_edata_800CBF8C[];
extern f32 D_edata_800CBFA8[];
extern f32 D_edata_800CBFC8[];
extern f32 D_edata_800CBFE4[];
extern f32 D_edata_800CC000[];
extern f32 D_edata_800CC01C[];
extern f32 D_edata_800CC038[];
extern f32 D_edata_800CC054[];
extern f32 D_edata_800CC070[];
extern f32 D_edata_800CC0D4[];
extern f32 D_edata_800CC0F0[];
extern ObjectInfo D_edata_800CC124[];
extern f32 gZoEnergyBallHitbox[];
extern f32 gCubeHitbox100[];
extern f32 gCubeHitbox150[];
extern f32 gCubeHitbox200[];
extern f32 gCubeHitbox300[];
extern f32 gCubeHitbox400[];
extern f32 gItemRingCheckHitbox[];
extern f32 gNoHitbox[];
extern f32 gItemCheckpointHitbox[];
extern f32 gItemSupplyRingHitbox[];
extern f32 gMeteoWarpHitbox[];
extern f32 gItemPathChangeHitbox[];
extern f32 gItemLasersHitbox[];
extern f32 gItemBombHitbox[];
extern f32 gActorMissileSeekHitbox[];
extern f32 gMeMoraHitbox[];
extern f32 gTeamHitbox[];
extern f32 gActorAllRangeHItbox[];
extern f32 aWzMeteor1Hitbox[];
extern f32 aWzGateHitbox[];
extern f32 aWzPillar1Hitbox[];
extern f32 aWzPillar2Hitbox[];
extern ObjectInfo gObjectInfo[];
extern f32* D_edata_800CF964[];
// fox_edisplay
@@ -74,49 +73,49 @@ extern f32 D_edisplay_800CFCCC[];
extern Gfx D_edisplay_800CFD80[];
// fox_enmy
extern ObjectInit* D_enmy_800CFDA0[];
extern u32 D_enmy_800CFF54[9];
extern ObjectInit* gLevelObjectInits[];
extern u32 gWarpRingSfx[9];
// fox_enmy2
extern s32 D_enmy2_800CFF80[4];
extern s32 D_enmy2_800CFF90;
extern s32 gTeamEventActorIndex[4];
extern s32 gCallVoiceParam;
// fox_hud
extern s16 D_hud_800D1970;
// fox_A4290
// fox_col2
extern CollisionHeader D_800D2B38[];
extern CollisionHeader2 D_800D2CA0[];
// fox_play
extern u8 D_play_800D2F68;
extern u8 D_play_800D3180[30];
extern u8 gVenomHardClear;
extern u8 gLeveLClearStatus[30];
// fox_radio
extern s32 gCurrentMsgPri;
extern s32 gRadioMsgPri;
// fox_360
extern s32 D_360_8015F900;
extern s32 D_360_8015F904;
extern s16 D_360_8015F908;
extern s32 D_360_8015F90C;
extern s32 D_360_8015F910;
extern f32 D_360_8015F914;
extern f32 D_360_8015F918;
extern f32 D_360_8015F91C;
extern u8 D_360_8015F920;
extern u8 D_360_8015F921;
extern s32 D_360_8015F924;
extern s32 D_360_8015F928;
extern s32 D_360_8015F930[3];
extern s32 D_360_8015F93C;
extern s32 D_360_8015F940;
extern f32 D_360_8015F944;
extern s32 gAllRangeSupplyTimer;
extern s32 sStarWolfKillTimer;
extern s16 gStarWolfMsgTimer;
extern s32 gAllRangeWingRepairTimer;
extern s32 gAllRangeSuppliesSent;
extern f32 gSzMissileR;
extern f32 gSzMissileG;
extern f32 gSzMissileB;
extern u8 gKaKilledAlly;
extern u8 gKaAllyKillCount;
extern s32 gAllRangeCheckpoint;
extern s32 gAllRangeEventTimer;
extern s32 gAllRangeCountdown[3];
extern bool gShowAllRangeCountdown;
extern s32 gAllRangeFrameCount;
extern f32 gAllRangeCountdownScale;
// fox_bg
extern f32 D_bg_800C9C30;
extern u16 D_bg_800C9C34;
extern f32 D_bg_8015F960;
extern f32 gAndrossUnkAlpha;
extern u16 gBolseDynamicGround;
extern f32 gWarpZoneBgAlpha;
extern u8 D_bg_8015F964;
extern f32 D_bg_8015F968;
extern f32 D_bg_8015F96C;
@@ -133,11 +132,11 @@ extern s32 gBossFrameCount;
// fox_display
extern Vec3f D_display_801613B0[]; // static, here for reordering
extern Vec3f D_display_801613E0[]; // static, here for reordering
extern s16 D_display_80161410;
extern s16 gReflectY;
extern Matrix D_display_80161418[]; // static, here for reordering
extern Vec3f D_display_80161518[]; // static, here for reordering
extern Vec3f D_display_80161548[]; // static, here for reordering
extern Vec3f D_display_80161578[];
extern Vec3f gLockOnTargetViewPos[];
extern f32 D_display_801615A8[];
extern f32 D_display_801615B8[];
@@ -146,11 +145,11 @@ extern Vec3f D_edisplay_801615D0;
// fox_enmy
extern s32 D_enmy_Timer_80161670[4];
extern s32 D_enmy_80161680;
extern u8 D_enmy_80161684;
extern s32 gLastPathChange;
extern u8 gMissedZoSearchlight;
// fox_enmy2
extern s32 D_enmy2_80161690;
extern s32 gCallTimer;
// fox_hud
extern s32 D_hud_80161704;
@@ -163,39 +162,42 @@ extern s32 gDisplayedHitCount;
extern s32 D_hud_80161730;
extern s32 gShowBossHealth; // 0x80161734
// fox_std_lib
extern char D_801619A0[];
// fox_play
extern u8 D_play_80161A50;
extern f32 D_play_80161A54;
extern u8 gSavedZoSearchlightStatus;
extern f32 gArwingSpeed;
extern s32 D_play_80161A58;
extern s32 D_play_80161A5C;
extern u16 gScreenFlashTimer;
extern u16 gDropHitCountItem;
//fox_radio
extern u16** D_radio_80178720;
extern s32 D_radio_80178724;
extern s32 D_radio_80178728;
extern s32 D_radio_8017872C;
extern f32 D_radio_80178730;
extern f32 D_radio_80178734;
extern f32 D_radio_80178738;
extern f32 D_radio_8017873C;
extern f32 D_radio_80178740;
extern u16** gRadioMsgList;
extern s32 gRadioMsgListIndex;
extern s32 gRadioPrintPosX;
extern s32 gRadioPrintPosY;
extern f32 gRadioTextBoxPosX;
extern f32 gRadioTextBoxPosY;
extern f32 gRadioTextBoxScaleX;
extern f32 gRadioPortraitPosX;
extern f32 gRadioPortraitPosY;
// fox_versus
extern s32 D_versus_80178750;
extern s32 D_versus_80178754;
extern bool gVsMatchOver;
extern s32 gVsMatchState;
extern s32 D_versus_80178758;
extern s32 sUnlockLandmaster; // sUnlockLandmaster
extern s32 sUnlockOnFoot; // sUnlockOnFoot
extern s32 D_versus_80178768[];
extern s32 gVsCountdown[];
// gfx_data
extern u16 D_Tex_800DACB8[][32];
extern u16 D_Tex_800DACB8[];
extern u16 D_Tex_800D99F8[];
extern u16 gTextCharPalettes[];
extern Gfx gRcpInitDL[];
extern Gfx D_Gfx_800DAC20[];
extern Gfx aCoHighwayShadowDL[];
extern Gfx D_Gfx_800D9688[];
extern u8 D_Tex_800DB4B8[];
extern Gfx D_Gfx_800D94D0[];