mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-07-29 15:45:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Last Titania asset, fix to hibox exporter, more cleanup (#180)

Browse Source 
* yaml

* ti

* hud

* a

* torch

* forgot header

* fix?

* format
This commit is contained in:
petrie911
2024-03-28 09:13:34 -05:00
committed by GitHub
parent 7a43255fea
commit bb7b2b19ca
23 changed files with 366 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/fox_bg.c
+3 -2
View File
@@ -24,6 +24,7 @@ f32 D_80161394; // can be static
#include "assets/ast_sector_y.h"
#include "assets/ast_sector_z.h"
#include "assets/ast_aquas.h"
#include "assets/ast_titania.h"
#include "assets/ast_andross.h"
#include "assets/ast_warp_zone.h"
#include "assets/ast_area_6.h"
@@ -463,7 +464,7 @@ void func_8003E1E8(void) {
}
Matrix_SetGfxMtx(&gMasterDisp);
if (gCurrentLevel == LEVEL_TITANIA) {
gSPDisplayList(gMasterDisp++, D_6000A80);
gSPDisplayList(gMasterDisp++, D_TI_6000A80);
} else if (gCurrentLevel == LEVEL_MACBETH) {
gSPDisplayList(gMasterDisp++, D_6019220);
} else if (gCurrentLevel == LEVEL_ZONESS) {
@@ -479,7 +480,7 @@ void func_8003E1E8(void) {
Matrix_Translate(gGfxMatrix, 7280.0f * sp13C, 0.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
if (gCurrentLevel == LEVEL_TITANIA) {
gSPDisplayList(gMasterDisp++, D_6000A80);
gSPDisplayList(gMasterDisp++, D_TI_6000A80);
} else if (gCurrentLevel == LEVEL_MACBETH) {
gSPDisplayList(gMasterDisp++, D_6019220);
} else if (gCurrentLevel == LEVEL_ZONESS) {
src/main/fox_edata_1C.c
+25 -24
View File
@@ -8,6 +8,7 @@
#include "assets/ast_sector_y.h"
#include "assets/ast_sector_z.h"
#include "assets/ast_aquas.h"
#include "assets/ast_titania.h"
#include "assets/ast_7_ti_1.h"
#include "assets/ast_andross.h"
#include "assets/ast_ve1_boss.h"
@@ -112,16 +113,16 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_26, */ {(void*) D_6010A50, 0, (ObjectFunc) NULL, D_603EA74, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_27, */ {(void*) D_60143E0, 0, (ObjectFunc) NULL, D_603EAE0, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_28, */ {(void*) D_6014A20, 0, (ObjectFunc) NULL, D_603EB0C, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_29, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_60064FC, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_30, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006518, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_31, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006564, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_32, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_60065B0, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_33, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_60065FC, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_34, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006648, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_35, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006694, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_36, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_60066E0_f32, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_37, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_600672C, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_38, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_6006778, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_29, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_60064FC, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_30, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006518, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_31, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006564, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_32, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_60065B0, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_33, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_60065FC, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_34, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006648, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_35, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006694, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_36, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_60066E0, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_37, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_600672C, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_38, */ {(void*) func_80059B20, 1, (ObjectFunc) func_800652CC, D_TI_6006778, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_39, */ {(void*) func_80059AEC, 1, (ObjectFunc) func_8006D350, D_800CBF34, 6000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_40, */ {(void*) func_80059F68, 1, (ObjectFunc) func_80066D5C, D_603E4A4, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_41, */ {(void*) func_80059FDC, 1, (ObjectFunc) func_80066EA8, D_603E4DC, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
@@ -140,8 +141,8 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_54, */ {(void*) D_6000E00, 0, (ObjectFunc) func_8006AA98, D_603E0EC, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_55, */ {(void*) D_6013B50, 0, (ObjectFunc) NULL, D_603E88C, 1000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_56, */ {(void*) func_i1_8018F31C, 2, (ObjectFunc) func_i1_8018F044, D_603E8A8, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_57, */ {(void*) func_i5_8018F8B8, 1, (ObjectFunc) func_i5_8018F4D8, D_6006BF0, 800.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_58, */ {(void*) D_TI1_700BE00, 0, (ObjectFunc) NULL, D_6006C44, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_57, */ {(void*) func_i5_8018F8B8, 1, (ObjectFunc) func_i5_8018F4D8, D_TI_6006BF0, 800.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_58, */ {(void*) D_TI1_700BE00, 0, (ObjectFunc) NULL, D_TI_6006C44, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_59, */ {(void*) D_6024010, 0, (ObjectFunc) NULL, D_603626C, 300.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_60, */ {(void*) D_6027180, 0, (ObjectFunc) NULL, D_6036288, 400.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_61, */ {(void*) func_i5_801A2A78, 1, (ObjectFunc) NULL, D_60362A4, 200.0f, 0, 0, 5, 0, 0.0f, 0 },
@@ -218,7 +219,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_132 */ {(void*) func_i6_8019350C, 1, (ObjectFunc) func_i6_80193380, D_C038A48, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_133 */ {(void*) D_TR_60030F0, 0, (ObjectFunc) NULL, D_TR_6009CC4, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_80_134 */ {(void*) D_6003000, 0, (ObjectFunc) NULL, D_C038BA4, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_135 */ {(void*) D_6006890_Gfx, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_135 */ {(void*) D_TI_6006890, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_136 */ {(void*) D_6002990, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_137 */ {(void*) D_6004170, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 0, 1, 0.0f, 0 },
/* OBJ_80_138 */ {(void*) D_vs_player_3017600, 0, (ObjectFunc) NULL, D_vs_player_302EE64, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
@@ -234,7 +235,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_148 */ {(void*) D_60079B0, 0, (ObjectFunc) NULL, D_600FF80, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_149 */ {(void*) D_6007D80, 0, (ObjectFunc) NULL, D_600FFA0, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_150 */ {(void*) D_6006310, 0, (ObjectFunc) NULL, D_600FFC0, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_151 */ {(void*) D_60066E0_Gfx, 0, (ObjectFunc) NULL, D_600FEB8, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_151 */ {(void*) D_TI_60066E0, 0, (ObjectFunc) NULL, D_600FEB8, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_152 */ {(void*) D_600F4C0, 0, (ObjectFunc) NULL, D_6011C10, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_153 */ {(void*) D_600B8B0, 0, (ObjectFunc) NULL, D_6011C48, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_154 */ {(void*) D_600BAF0, 0, (ObjectFunc) NULL, D_601115C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
@@ -252,7 +253,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_4C_166 */ {(void*) D_601F500, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_167 */ {(void*) func_80059C34, 1, (ObjectFunc) func_80066E8C, D_800CBF34, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_168 */ {(void*) func_80059850, 1, (ObjectFunc) NULL, D_800CBF34, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_169 */ {(void*) D_60023B0, 0, (ObjectFunc) func_i5_8018F038, D_60068BC, 100.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_169 */ {(void*) D_TI_60023B0, 0, (ObjectFunc) func_i5_8018F038, D_TI_60068BC, 100.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_170 */ {(void*) NULL, 1, (ObjectFunc) func_i1_801875A4, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_171 */ {(void*) NULL, 1, (ObjectFunc) func_i1_801922DC, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_172 */ {(void*) NULL, 1, (ObjectFunc) func_i1_80192358, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
@@ -308,15 +309,15 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_ACTOR_222 */ {(void*) func_i5_801AEEFC, 1, (ObjectFunc) func_i5_801AEC04, D_6036968, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
/* OBJ_ACTOR_223 */ {(void*) func_i5_801A54E8, 1, (ObjectFunc) func_i5_801A4B24, D_60364DC, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_224 */ {(void*) NULL, 1, (ObjectFunc) func_i5_80189194, D_800CBF34, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_225 */ {(void*) D_TI1_700AB70, 0, (ObjectFunc) func_i5_8018AB44, D_60064AC, 50.0f, 0, 0, 39, 1, 1.0f, 0 },
/* OBJ_ACTOR_226 */ {(void*) func_i5_80189AFC, 1, (ObjectFunc) func_i5_801895B8, D_60064C8, 300.0f, 0, 0, 39, 1, 70.0f, 1 },
/* OBJ_ACTOR_227 */ {(void*) func_i5_8018E5B4, 1, (ObjectFunc) func_i5_8018E54C, D_60067C4, 0.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_228 */ {(void*) func_i5_8018EF14, 1, (ObjectFunc) func_i5_8018E5F8, D_6006808, 0.0f, 0, 0, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_229 */ {(void*) func_i5_8018E2D8, 1, (ObjectFunc) func_i5_8018C8A8, D_6006A3C, 1000.0f, 0, 0, 20, 1, 0.0f, 1 },
/* OBJ_ACTOR_230 */ {(void*) func_i5_8018AABC, 1, (ObjectFunc) func_i5_8018A544, D_600683C, 0.0f, 0, 1, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_231 */ {(void*) func_i5_8018BE84, 1, (ObjectFunc) func_i5_8018B9D0, D_6006858, 0.0f, 0, 0, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_232 */ {(void*) func_i5_8018B6AC, 1, (ObjectFunc) func_i5_8018B268, D_6006890_f32, 0.0f, 0, 0, 39, 1, 20.0f, 1 },
/* OBJ_ACTOR_233 */ {(void*) func_i5_8018A1C0, 1, (ObjectFunc) func_i5_80189CC8, D_60068F0, 200.0f, 0, 0, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_225 */ {(void*) D_TI1_700AB70, 0, (ObjectFunc) func_i5_8018AB44, D_TI_60064AC, 50.0f, 0, 0, 39, 1, 1.0f, 0 },
/* OBJ_ACTOR_226 */ {(void*) func_i5_80189AFC, 1, (ObjectFunc) func_i5_801895B8, D_TI_60064C8, 300.0f, 0, 0, 39, 1, 70.0f, 1 },
/* OBJ_ACTOR_227 */ {(void*) func_i5_8018E5B4, 1, (ObjectFunc) func_i5_8018E54C, D_TI_60067C4, 0.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_228 */ {(void*) func_i5_8018EF14, 1, (ObjectFunc) func_i5_8018E5F8, D_TI_6006808, 0.0f, 0, 0, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_229 */ {(void*) func_i5_8018E2D8, 1, (ObjectFunc) func_i5_8018C8A8, D_TI_6006A3C, 1000.0f, 0, 0, 20, 1, 0.0f, 1 },
/* OBJ_ACTOR_230 */ {(void*) func_i5_8018AABC, 1, (ObjectFunc) func_i5_8018A544, D_TI_600683C, 0.0f, 0, 1, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_231 */ {(void*) func_i5_8018BE84, 1, (ObjectFunc) func_i5_8018B9D0, D_TI_6006858, 0.0f, 0, 0, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_232 */ {(void*) func_i5_8018B6AC, 1, (ObjectFunc) func_i5_8018B268, D_TI_6006890, 0.0f, 0, 0, 39, 1, 20.0f, 1 },
/* OBJ_ACTOR_233 */ {(void*) func_i5_8018A1C0, 1, (ObjectFunc) func_i5_80189CC8, D_TI_60068F0, 200.0f, 0, 0, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_234 */ {(void*) func_80077218, 1, (ObjectFunc) func_800771CC, D_800CBF34, 2000.0f, 0, 0, 39, 0, 0.0f, 5 },
/* OBJ_ACTOR_235 */ {(void*) func_i3_80190430, 2, (ObjectFunc) func_i3_801904CC, D_602C294, 1000.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_236 */ {(void*) func_i3_80190F08, 1, (ObjectFunc) func_i3_80190A00, D_602BC58, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
src/main/fox_effect.c
+3 -7
View File
@@ -6,11 +6,6 @@ const char D_800D7230[] = "Enm->wrk3=<%d>\n";
const char D_800D7240[] = "a=<%d>\n";
const char D_800D7248[] = "a=<%d>\n";
extern Gfx D_6003440[];
extern Gfx D_60034E0[];
extern Gfx D_6003580[];
extern Gfx D_6003620[];
extern Gfx D_60036C0[];
extern Gfx D_6004900[];
extern Gfx D_6016880[];
extern Gfx D_6018AF0[];
@@ -24,6 +19,7 @@ extern Gfx D_601BAD0[];
#include "assets/ast_sector_x.h"
#include "assets/ast_sector_y.h"
#include "assets/ast_aquas.h"
#include "assets/ast_titania.h"
#include "assets/ast_area_6.h"
#include "assets/ast_A_ti.h"
#include "assets/ast_ve1_boss.h"
@@ -489,7 +485,7 @@ void func_80078BE0(Effect* effect) {
void func_80078C84(Effect* effect) {
Graphics_SetScaleMtx(effect->scale2);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 192);
gSPDisplayList(gMasterDisp++, D_6000A80);
gSPDisplayList(gMasterDisp++, D_TI_6000A80);
}
void func_80078CE8(Effect* effect) {
@@ -1047,7 +1043,7 @@ void func_8007A994(Effect* effect) {
effect->unk_4A++;
}
Gfx* D_800D178C[] = { D_6003440, D_60034E0, D_6003580, D_6003620, D_60036C0, D_TR_6003760 };
Gfx* D_800D178C[] = { D_TI_6003440, D_TI_60034E0, D_TI_6003580, D_TI_6003620, D_TI_60036C0, D_TR_6003760 };
void func_8007AA60(Effect* effect) {
RCP_SetupDL(&gMasterDisp, 0x44);
src/main/fox_enmy.c
+13 -12
View File
@@ -5,6 +5,7 @@
#include "assets/ast_sector_y.h"
#include "assets/ast_sector_z.h"
#include "assets/ast_aquas.h"
#include "assets/ast_titania.h"
#include "assets/ast_andross.h"
#include "assets/ast_area_6.h"
#include "assets/ast_training.h"
@@ -17,9 +18,9 @@ u8 D_80161684;
#include "fox_enmy_assets.h"
ObjectInit* D_800CFDA0[] = {
D_60371A4, D_6026CC4, D_SX_602A164, D_A6_6023F64, D_A6_60287A4, D_SY_602E4F4, D_6007E74,
D_601F234, D_6026714, D_C035154, D_TR_6006AA4, D_6031000, D_6006C60, D_602E5C8,
D_600EAD4, NULL, D_6011044, D_600FF74, D_SZ_6006EB4, D_6014D94, D_vs_player_302DE3C,
D_CO_60371A4, D_ME_6026CC4, D_SX_602A164, D_A6_6023F64, D_A6_60287A4, D_SY_602E4F4, D_VE1_6007E74,
D_SO_601F234, D_ZO_6026714, D_C035154, D_TR_6006AA4, D_MA_6031000, D_TI_6006C60, D_AQ_602E5C8,
D_FO_600EAD4, NULL, D_KA_6011044, D_BO_600FF74, D_SZ_6006EB4, D_VE2_600FF74, D_vs_player_302DE3C,
};
s32 D_800CFDF4[] = {
OBJ_80_0,
@@ -1031,31 +1032,31 @@ void Object_Init(s32 index, ObjectId objId) {
}
break;
case OBJ_80_30:
func_80063E5C(&gObjects80[index], D_6006940);
func_80063E5C(&gObjects80[index], D_TI_6006940);
break;
case OBJ_80_31:
func_80063E5C(&gObjects80[index], D_600695C);
func_80063E5C(&gObjects80[index], D_TI_600695C);
break;
case OBJ_80_32:
func_80063E5C(&gObjects80[index], D_6006978);
func_80063E5C(&gObjects80[index], D_TI_6006978);
break;
case OBJ_80_33:
func_80063E5C(&gObjects80[index], D_6006994);
func_80063E5C(&gObjects80[index], D_TI_6006994);
break;
case OBJ_80_34:
func_80063E5C(&gObjects80[index], D_60069B0);
func_80063E5C(&gObjects80[index], D_TI_60069B0);
break;
case OBJ_80_35:
func_80063E5C(&gObjects80[index], D_60069CC);
func_80063E5C(&gObjects80[index], D_TI_60069CC);
break;
case OBJ_80_36:
func_80063E5C(&gObjects80[index], D_60069E8);
func_80063E5C(&gObjects80[index], D_TI_60069E8);
break;
case OBJ_80_37:
func_80063E5C(&gObjects80[index], D_6006A04);
func_80063E5C(&gObjects80[index], D_TI_6006A04);
break;
case OBJ_80_38:
func_80063E5C(&gObjects80[index], D_6006A20);
func_80063E5C(&gObjects80[index], D_TI_6006A20);
break;
case OBJ_80_23:
func_80063CAC(&gObjects80[index]);
src/main/fox_enmy2.c
+1
View File
@@ -13,6 +13,7 @@ s32 D_80161690;
#include "assets/ast_sector_x.h"
#include "assets/ast_sector_y.h"
#include "assets/ast_aquas.h"
#include "assets/ast_titania.h"
#include "assets/ast_7_ti_1.h"
#include "assets/ast_andross.h"
#include "assets/ast_area_6.h"
src/main/fox_hud.c
+25 -35
View File
@@ -72,20 +72,23 @@ s32 D_80161900[20];
#include "global.h"
#include "assets.h"
#include "assets/ast_blue_marine.h"
#include "assets/ast_landmaster.h"
#include "assets/ast_training.h"
#include "assets/ast_andross.h"
#include "assets/ast_star_wolf.h"
#include "assets/ast_font.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_bg_planet.h"
#include "assets/ast_bg_space.h"
#include "assets/ast_bg_planet.h"
#include "assets/ast_arwing.h"
#include "assets/ast_landmaster.h"
#include "assets/ast_blue_marine.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_font.h"
#include "assets/ast_training.h"
#include "assets/ast_area_6.h"
#include "assets/ast_aquas.h"
#include "assets/ast_titania.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_sector_y.h"
#include "assets/ast_sector_z.h"
#include "assets/ast_andross.h"
#include "assets/ast_allies.h"
#include "assets/ast_star_wolf.h"
void func_80087788(void);
@@ -98,23 +101,14 @@ extern u8 D_FO_6000000[];
extern u8 D_KA_6000000[];
extern u8 D_SO_6000000[];
extern u8 D_ZO_6000000[];
extern u8 D_TI_6000000[];
extern u8 D_BO_6000000[];
extern u16 D_6000C80[];
extern u8 D_VE1_6000D80[];
extern u8 D_6001260[];
extern u8 D_VE2_60012D0[];
extern u8 D_6000C80[];
extern u8 D_6001260[];
extern u8 D_6002890[];
extern Gfx D_6003090[];
#include "assets/ast_blue_marine.h"
#include "assets/ast_arwing.h"
#include "assets/ast_bg_space.h"
#include "assets/ast_bg_planet.h"
#include "assets/ast_allies.h"
#include "assets/ast_font.h"
// DATA SECTION START
s16 D_800D1970 = 0;
@@ -2024,17 +2018,18 @@ s32 func_8008A4DC(void) {
f32 z1;
f32 x;
f32 y;
s32 pad;
f32 temp;
s32 ret = 0;
f32 temp2, temp3;
f32 temp2;
f32 temp3;
if (!gVersusMode) {
if (gLevelMode != LEVELMODE_ALL_RANGE) {
return ret;
return 0;
}
if (D_80177AB0 >= 5) {
return ret;
return 0;
}
if (D_80177838) {
@@ -2044,7 +2039,7 @@ s32 func_8008A4DC(void) {
}
if (D_800D1E10 == 60.0f) {
return ret;
return 0;
}
switch (gCurrentLevel) {
@@ -2088,11 +2083,9 @@ s32 func_8008A4DC(void) {
x = 254.000f + D_800D1E10;
y = 162.000f;
x1 += D_800D1E10 * temp3;
}
else {
} else {
if ((D_80177E7C == 0) || (D_80178750 != 0)) {
return ret;
return 0;
}
temp2 = 13000.00f;
@@ -2150,7 +2143,7 @@ s32 func_8008A4DC(void) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, x1, y1, z1, 1);
if ((gCurrentLevel == LEVEL_SECTOR_Z) && (D_80161710)) {
if ((gCurrentLevel == LEVEL_SECTOR_Z) && (D_80161710 != 0)) {
Matrix_Push(&gGfxMatrix);
func_80089D28();
Matrix_Pop(&gGfxMatrix);
@@ -2158,11 +2151,8 @@ s32 func_8008A4DC(void) {
}
for (i = 64; i >= 0; i--) {
if (gRadarMarks[i].unk_00 == 0) {
continue;
}
if (fabsf(gRadarMarks[i].pos.x) >= (temp2 + 1000.0f) || fabsf(gRadarMarks[i].pos.z) >= (temp2 + 1000.0f)) {
if ((gRadarMarks[i].unk_00 == 0) || (fabsf(gRadarMarks[i].pos.x) >= (temp2 + 1000.0f)) ||
(fabsf(gRadarMarks[i].pos.z) >= (temp2 + 1000.0f))) {
continue;
}
@@ -2184,7 +2174,7 @@ s32 func_8008A4DC(void) {
}
Matrix_Pop(&gGfxMatrix);
return ret;
return 0;
}
s32 func_8008AC54(s32 arg0) {
src/main/fox_play.c
+1
View File
@@ -7,6 +7,7 @@
#include "assets/ast_sector_y.h"
#include "assets/ast_sector_z.h"
#include "assets/ast_aquas.h"
#include "assets/ast_titania.h"
#include "assets/ast_andross.h"
#include "assets/ast_arwing.h"
#include "assets/ast_vs_player.h"
src/main/fox_tank.c
+3 -3
View File
@@ -1,6 +1,6 @@
#include "global.h"
#include "assets.h"
#include "assets/ast_landmaster.h"
#include "assets/ast_titania.h"
void func_80047754(Player* player);
void func_80047D38(Player* player, f32);
@@ -491,7 +491,7 @@ void func_80044868(Player* player) {
if (player->unk_0D0 > 0.0f) {
Texture_Scroll(D_landmaster_3002E80, 0x20, 0x20, 0);
if ((gCurrentLevel == LEVEL_TITANIA) && (gBossActive == 0)) {
func_80043280(D_landmaster_3005EA8, D_6009BB8, gGameFrameCount * -55.0f);
func_80043280(D_landmaster_3005EA8, D_TI_6009BB8, gGameFrameCount * -55.0f);
}
if ((gCurrentLevel == LEVEL_MACBETH) && (player->state_1C8 == PLAYERSTATE_1C8_7)) {
func_80043280(D_landmaster_3005EA8, *D_Unk_800DACB8, gGameFrameCount * -55.0f);
@@ -500,7 +500,7 @@ void func_80044868(Player* player) {
if (player->unk_0D0 > 10.0f) {
Texture_Scroll(D_landmaster_3002E80, 0x20, 0x20, 0);
if ((gCurrentLevel == LEVEL_TITANIA) && (gBossActive == 0)) {
func_80043280(D_landmaster_3005EA8, D_6009BB8, gGameFrameCount * -55.0f);
func_80043280(D_landmaster_3005EA8, D_TI_6009BB8, gGameFrameCount * -55.0f);
}
}
func_800A46A0(player);
src/overlays/ovl_i3/fox_so.c
+1 -2
View File
@@ -1,5 +1,6 @@
#include "global.h"
#include "assets.h"
#include "assets/ast_bg_planet.h"
typedef void (*BossSOfunc)(Boss*);
@@ -166,8 +167,6 @@ s32 D_i3_801C2740[10];
f32 D_i3_801C2768[14];
s32 D_i3_801C27A0[8]; // unused? part of previous?
#include "assets/ast_bg_planet.h"
void func_i3_8019E7F0(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) {
Effect_Initialize(effect);
effect->obj.status = OBJ_ACTIVE;
src/overlays/ovl_i4/fox_sz.c
+11 -4
View File
@@ -1,13 +1,20 @@
#include "global.h"
#include "assets.h"
#include "assets/ast_sector_z.h"
s32 D_i4_801A0560;
s32 D_i4_801A0564;
Vec3f D_i4_8019F4C0[] = { 0.0f, 0.0f, 35000.0f, -2000.0f, 0.0f, 35000.0f, 2000.0f, 0.0f, 35000.0f };
Vec3f D_i4_8019F4E4[] = { -700.0f, -200.0f, 200.0f, 500.0f, 200.0f, -300.0f,
300.0f, -300.0f, -200.0f, 200.0f, 400.0f, 500.0f };
Vec3f D_i4_8019F4C0[] = {
{ 0.0f, 0.0f, 35000.0f },
{ -2000.0f, 0.0f, 35000.0f },
{ 2000.0f, 0.0f, 35000.0f },
};
Vec3f D_i4_8019F4E4[] = {
{ -700.0f, -200.0f, 200.0f },
{ 500.0f, 200.0f, -300.0f },
{ 300.0f, -300.0f, -200.0f },
{ 200.0f, 400.0f, 500.0f },
};
extern s32 D_80161710;
src/overlays/ovl_i5/fox_ground.c
+4 -5
View File
@@ -1,12 +1,11 @@
// #include "prevent_bss_reordering.h"
#include "prevent_bss_reordering.h"
#include "global.h"
#include "assets/ast_titania.h"
void func_i5_801B5244(s32 arg0, s32 arg1);
void func_i5_801B5FE0(s32 arg0, s32 arg1, s32 arg2);
void func_i5_801B68A8(Gfx** dlist, s32 arg1, s32 arg2);
extern u16 D_6001BA8[];
typedef struct {
/* 0x00 */ s32 unk_00;
/* 0x04 */ s32 unk_04;
@@ -372,7 +371,7 @@ void func_i5_801B58AC(Gfx** dList, f32 arg1) {
if (D_i5_801C5C14 & 2) {
gDPSetupTile((*dList)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPLoadTileTexture((*dList)++, D_6001BA8, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
gDPLoadTileTexture((*dList)++, D_TI_6001BA8, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
gSPMatrix((*dList)++, &gIdentityMtx, G_MTX_PUSH | G_MTX_MUL | G_MTX_MODELVIEW);
Matrix_Translate(gGfxMatrix, D_i5_801C62D8.x, D_i5_801C62D8.y, D_i5_801C62D8.z + D_i5_801C5C10, 0);
Matrix_ToMtx(gGfxMtx);
@@ -563,7 +562,7 @@ void func_i5_801B68A8(Gfx** dlist, s32 arg1, s32 arg2) {
gDPSetupTile((*dlist)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, 0, G_TX_MIRROR | G_TX_WRAP,
G_TX_MIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
gDPLoadTileTexture((*dlist)++, D_6001BA8, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
gDPLoadTileTexture((*dlist)++, D_TI_6001BA8, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
Matrix_Translate(gGfxMatrix, D_i5_801C62D8.x, D_i5_801C62D8.y, D_i5_801C62D8.z + D_i5_801C5C10, 0);
Matrix_ToMtx(gGfxMtx);
gSPMatrix((*dlist)++, gGfxMtx++, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
src/overlays/ovl_i5/fox_ti.c
+6 -10
View File
@@ -1,7 +1,7 @@
// #include "prevent_bss_reordering.h"
#include "global.h"
#include "assets.h"
#include "assets/ast_bg_planet.h"
#include "assets/ast_titania.h"
#include "assets/ast_7_ti_1.h"
#include "assets/ast_7_ti_2.h"
#include "assets/ast_8_ti.h"
@@ -12,10 +12,6 @@
extern Gfx D_Gfx_800D94D0[];
extern f32 D_6006924[];
extern f32 D_6006C0C[];
extern f32 D_6006C28[];
s32* D_i5_801BBEF0;
f32* D_i5_801BBEF4;
s32* D_i5_801BBEF8;
@@ -317,7 +313,7 @@ void func_i5_80189B80(Actor* actor) {
func_i5_801B6E20(actor->obj.pos.x, actor->obj.pos.z + D_80177D20, &sp2C, &actor->obj.pos.y, &sp2C);
actor->health = 10;
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_60068F0);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_TI_60068F0);
Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 0);
Matrix_RotateX(gCalcMatrix, actor->obj.rot.x * M_DTOR, 1);
Matrix_RotateZ(gCalcMatrix, actor->obj.rot.z * M_DTOR, 1);
@@ -348,7 +344,7 @@ void func_i5_80189CC8(Actor* actor) {
actor->info.unk_1C = 0.0f;
func_80066254(actor);
actor->info.bonus = 0;
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6006924);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_TI_6006924);
func_8007D0E0(actor->fwork[0], actor->fwork[1], actor->fwork[2], 2.0f);
}
}
@@ -2113,13 +2109,13 @@ void func_i5_8018F4D8(Object_80* obj80) {
if (obj80->unk_44 != 0) {
if (obj80->obj.rot.z == 0.0f) {
obj80->obj.pos.x = obj80->vel.z;
obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6006BF0);
obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_TI_6006BF0);
} else if (obj80->obj.rot.z > 0.0f) {
obj80->obj.pos.x = obj80->vel.z - 75.0f;
obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6006C28);
obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_TI_6006C28);
} else {
obj80->obj.pos.x = obj80->vel.z + 75.0f;
obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6006C0C);
obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_TI_6006C0C);
}
}
}
src/overlays/ovl_i6/fox_sy.c
-3
View File
@@ -1,9 +1,6 @@
#include "global.h"
#include "assets.h"
#include "assets/ast_sector_y.h"
extern f32 D_6034124[];
void func_i6_80198244(Boss*);
void func_i6_80198ABC(Boss*);
void func_i6_80199D64(Boss*);
src/overlays/ovl_menu/fox_title.c
+1 -1
View File
@@ -4,7 +4,7 @@
* Description: Starfox Title Handler
*/
#include "prevent_bss_reordering.h"
// #include "prevent_bss_reordering2.h"
#include "prevent_bss_reordering2.h"
#include "global.h"
#include "assets.h"
#include "fox_title.h"