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

None of woman born Shall export Macbeth (#183)

Browse Source 
* macbeth

* fix

* forgot header
This commit is contained in:
petrie911
2024-03-29 14:40:09 -03:00
committed by GitHub
parent 1b72918e7f
commit 09541d8ad3
22 changed files with 1338 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vscode/settings.json
Vendored
+5 -1
View File
@@ -111,7 +111,11 @@
"ast_titania.h": "c",
"ast_bg_planet.h": "c",
"assets.h": "c",
"ast_title.h": "c"
"ast_title.h": "c",
"any": "c",
"memory_resource": "c",
"ast_andross.h": "c",
"sf64object.h": "c"
},
"C_Cpp_Runner.msvcBatchPath": ""
}
assets/yaml/us/ast_A_ti.yaml
+15 -15
View File
@@ -10,7 +10,7 @@
- '#include "structs.h"'
D_TI_A000000:
{type: "GFX", offset: 0xA000000, symbol: D_TI_A000000}
{type: GFX, offset: 0xA000000, symbol: D_TI_A000000}
D_TI_A0000C8:
{ type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x0A0000C8, symbol: D_TI_A0000C8, tlut: 0x0A0001C8 }
@@ -19,44 +19,44 @@ D_TI_A0001C8:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 60, offset: 0x0A0001C8, symbol: D_TI_A0001C8 }
D_TI_A0002BC:
{type: "SF64:ANIM", offset: 0xA0002BC, symbol: D_TI_A0002BC}
{type: SF64:ANIM, offset: 0xA0002BC, symbol: D_TI_A0002BC}
D_TI_A00047C:
{type: "SF64:ANIM", offset: 0xA00047C, symbol: D_TI_A00047C}
{type: SF64:ANIM, offset: 0xA00047C, symbol: D_TI_A00047C}
D_TI_A000568:
{type: "SF64:SKELETON", offset: 0xA000568, symbol: D_TI_A000568}
{type: SF64:SKELETON, offset: 0xA000568, symbol: D_TI_A000568}
D_TI_A000858:
{type: "SF64:ANIM", offset: 0xA000858, symbol: D_TI_A000858}
{type: SF64:ANIM, offset: 0xA000858, symbol: D_TI_A000858}
D_TI_A000934:
{type: "SF64:ANIM", offset: 0xA000934, symbol: D_TI_A000934}
{type: SF64:ANIM, offset: 0xA000934, symbol: D_TI_A000934}
D_TI_A000D50:
{type: "SF64:ANIM", offset: 0xA000D50, symbol: D_TI_A000D50}
{type: SF64:ANIM, offset: 0xA000D50, symbol: D_TI_A000D50}
D_TI_A000EDC:
{type: "SF64:SKELETON", offset: 0xA000EDC, symbol: D_TI_A000EDC}
{type: SF64:SKELETON, offset: 0xA000EDC, symbol: D_TI_A000EDC}
D_TI_A001A70:
{type: "SF64:SKELETON", offset: 0xA001A70, symbol: D_TI_A001A70}
{type: SF64:SKELETON, offset: 0xA001A70, symbol: D_TI_A001A70}
D_TI_A001BE0:
{type: "GFX", offset: 0xA001BE0, symbol: D_TI_A001BE0}
{type: GFX, offset: 0xA001BE0, symbol: D_TI_A001BE0}
D_TI_A001DB0:
{type: "GFX", offset: 0xA001DB0, symbol: D_TI_A001DB0}
{type: GFX, offset: 0xA001DB0, symbol: D_TI_A001DB0}
D_TI_A001EC0:
{type: "GFX", offset: 0xA001EC0, symbol: D_TI_A001EC0}
{type: GFX, offset: 0xA001EC0, symbol: D_TI_A001EC0}
D_TI_A001FA0:
{type: "GFX", offset: 0xA001FA0, symbol: D_TI_A001FA0}
{type: GFX, offset: 0xA001FA0, symbol: D_TI_A001FA0}
D_TI_A002170:
{type: "GFX", offset: 0xA002170, symbol: D_TI_A002170}
{type: GFX, offset: 0xA002170, symbol: D_TI_A002170}
D_TI_A009990:
{type: "SF64:ANIM", offset: 0xA009990, symbol: D_TI_A009990}
{type: SF64:ANIM, offset: 0xA009990, symbol: D_TI_A009990}
assets/yaml/us/ast_macbeth.yaml
+908
View File
File diff suppressed because it is too large Load Diff
assets/yaml/us/ast_vs_player.yaml
+4 -4
View File
@@ -723,16 +723,16 @@ D_vs_player_302EE9C:
{ type: SF64:HITBOX, offset: 0x302EE9C, symbol: D_vs_player_302EE9C}
D_vs_player_302EEE8:
{ type: SF64:TRIANGLE, count: 4, offset: 0x302EEE8, symbol: D_vs_player_302EEE8, mesh_symbol: "D_vs_player_OFFSET"}
{ type: SF64:TRIANGLE, count: 4, offset: 0x302EEE8, symbol: D_vs_player_302EEE8, mesh_symbol: D_vs_player_OFFSET}
D_vs_player_302EF6C:
{ type: SF64:TRIANGLE, count: 4, offset: 0x302EF6C, symbol: D_vs_player_302EF6C, mesh_symbol: "D_vs_player_OFFSET"}
{ type: SF64:TRIANGLE, count: 4, offset: 0x302EF6C, symbol: D_vs_player_302EF6C, mesh_symbol: D_vs_player_OFFSET}
D_vs_player_302EFF0:
{ type: SF64:TRIANGLE, count: 4, offset: 0x302EFF0, symbol: D_vs_player_302EFF0, mesh_symbol: "D_vs_player_OFFSET"}
{ type: SF64:TRIANGLE, count: 4, offset: 0x302EFF0, symbol: D_vs_player_302EFF0, mesh_symbol: D_vs_player_OFFSET}
D_vs_player_302F044:
{ type: SF64:TRIANGLE, count: 14, offset: 0x302F044, symbol: D_vs_player_302F044, mesh_symbol: "D_vs_player_OFFSET"}
{ type: SF64:TRIANGLE, count: 14, offset: 0x302F044, symbol: D_vs_player_302F044, mesh_symbol: D_vs_player_OFFSET}
D_vs_player_302E56C:
{type: VEC3F, count: 20, offset: 0x302E56C, symbol: D_vs_player_302E56C}
include/assets.h
-84
View File
@@ -49,7 +49,6 @@ extern Gfx D_6006BE0[];
extern u16 D_6006EA0[];
extern Gfx D_6006F50[];
extern Gfx D_6007410[];
extern Gfx D_60075D0[];
extern Gfx D_6007650[];
extern Gfx D_60079B0[];
extern Gfx D_6007CF0[];
@@ -70,7 +69,6 @@ extern Vtx D_6009ED0[];
extern Gfx D_6009F90[];
extern Gfx D_600A420[];
extern Gfx D_600A810[];
extern Gfx D_600AF40[];
extern Gfx D_600B0E0[];
extern Animation D_600B1B4;
extern Gfx D_600B4B0[];
@@ -92,7 +90,6 @@ extern u16 D_600D5C0[];
extern Gfx D_600D730[];
extern u16 D_600D990[];
extern Gfx D_600D9F0[];
extern Gfx D_600DA10[];
extern Gfx D_600DBC0[];
extern u8 D_600DDC0[];
extern Gfx D_600DDF0[];
@@ -135,10 +132,8 @@ extern u8 D_6010090[];
extern u16 D_6010198[];
extern CollisionPoly D_6010294[];
extern u8 D_60106B0[];
extern Gfx D_6010700[];
extern Gfx D_6010960[];
extern Gfx D_6010A50[];
extern u16 D_6010C20[];
extern Gfx D_6010E00[];
extern u8 D_6010FA0[];
extern EnvSettings D_KA_6011000;
@@ -147,21 +142,18 @@ extern f32 D_601115C[];
extern Vec3s D_601170C[];
extern u8 D_6011890[];
extern f32 D_6011B24[];
extern u16 D_6011B40[];
extern f32 D_6011BF4[];
extern f32 D_6011C10[];
extern f32 D_6011C48[];
extern f32 D_6011C80[];
extern u8 D_6012310[];
extern u8 D_60123F0[];
extern Gfx D_6012C00_Gfx[];
extern Animation D_6012C00_Anim;
extern Gfx D_60132B0[];
extern u8 D_6013470[];
extern Gfx D_6013480[];
extern Gfx D_60137B0[];
extern Animation D_601388C;
extern Gfx D_6013960[];
extern Gfx D_6013B50[];
extern u8 D_6014140[];
extern Gfx D_60143E0[];
@@ -194,11 +186,8 @@ extern Gfx D_6018450[];
extern Gfx D_6018C00[]; // possible collision
extern Gfx D_6018D40[];
extern Gfx D_6018E80[];
extern Gfx D_6019220[];
extern Gfx D_601A7A0[];
extern Gfx D_601A7D0[];
extern Gfx D_601AE40[];
extern Gfx D_601B0D0[];
extern u16* D_VE1_601B1E4[];
extern f32 D_601B4C4[];
extern f32 D_601B4E0[];
@@ -214,7 +203,6 @@ extern u16 D_601B6C0[];
extern f32 D_601B6C4[];
extern f32 D_F32_601B710[];
extern f32 D_601B75C[];
extern Gfx D_601B7C0[];
extern f32 D_601B7F8[];
extern f32 D_601B830[];
extern f32 D_601B868[];
@@ -233,7 +221,6 @@ extern u16 D_601E1E8[];
extern Animation D_601E8C4;
extern Limb* D_601E9D0[];
extern Gfx D_601EAA0[];
extern Gfx D_601F1D0[];
extern EnvSettings D_SO_601F1F0;
extern Gfx D_601F500[];
extern Gfx D_601F5A0[];
@@ -248,37 +235,25 @@ extern Gfx D_6020B40[];
extern u16* D_SO_600631C[];
extern Gfx D_6020E60[];
extern u16 D_6020F60[];
extern Gfx D_60223C0[];
extern Gfx D_6022450[];
extern Gfx D_6022530[];
extern u16 D_6022760[];
extern Gfx D_6022920[];
extern u16 D_60229A4[];
extern f32 D_60231A4[];
extern Gfx D_60238F0[];
extern Gfx D_6023AC0[];
extern Gfx D_6024010[];
extern Gfx D_6024220[];
extern Gfx D_60244A0[];
extern u16 D_60245E0[];
extern Gfx D_6024AC0[];
extern Gfx D_6024B60[];
extern u16 D_6025500[];
extern Gfx D_6025B50[];
extern u16 D_6026420[];
extern EnvSettings D_ZO_60266D0;
extern EnvSettings D_ME_6026C80;
extern Gfx D_60270E0[];
extern Gfx D_6027180[];
extern Animation D_6027320;
extern u16 D_6027340[];
extern Limb* D_602742C[];
extern Gfx D_6027900[];
extern u16 D_6028260[];
extern u16 D_6028A60[];
extern Animation D_6029528;
extern Limb* D_6029674[];
extern Gfx D_6029890[];
extern Gfx D_602A720[];
extern u16* D_ZO_602AAC0[];
extern u16 D_602AC50[];
@@ -304,11 +279,7 @@ extern Triangle D_602CACC[];
extern Vec3f D_602CB80[];
extern Gfx D_602D5F0[];
extern Gfx D_602DA20[];
extern Gfx D_602DAE0[];
extern Gfx D_602DB80[];
extern Gfx D_602DC20[];
extern Gfx D_602DCA0[];
extern u16 D_602DCB8[];
extern Gfx D_602E080[];
extern Gfx D_602E380[];
extern Gfx D_602E570[];
@@ -328,23 +299,8 @@ extern f32 D_602FA50[];
extern CollisionPoly D_602FA9C[];
extern Vec3s D_60300C8[];
extern CollisionPoly D_6030208[];
extern Gfx D_6030500[];
extern Vec3s D_6030550[];
extern CollisionPoly D_60305DC[];
extern Gfx D_6030630[];
extern Gfx D_60306D0[];
extern EnvSettings D_MA_6030E30;
extern Triangle D_6030E74[];
extern Vec3f D_6030E80[];
extern Triangle D_6030EB0[];
extern Vec3f D_6030EBC[];
extern Triangle D_6030EEC[];
extern Vec3f D_6030EF8[];
extern Triangle D_6030F28[];
extern Vec3f D_6030F34[];
extern Triangle D_6030F64[];
extern Vec3f D_6030F7C[];
extern Triangle D_6030FC4[];
extern Vec3s D_603184C[];
extern Gfx D_60320E0[];
extern Gfx D_6032580[];
@@ -352,53 +308,14 @@ extern Gfx D_6032BC0[];
extern Gfx D_6033000[];
extern Vec3s D_6033E08[];
extern Gfx D_6034B90[];
extern f32 D_60359C8[];
extern f32 D_6035A14[];
extern f32 D_6035A48[];
extern f32 D_6035AE0[];
extern f32 D_6035D9C[];
extern Gfx D_6035DA0[];
extern f32 D_6035E04[];
extern Gfx D_6035F10[];
extern f32 D_60360C0[];
extern f32 D_6036154[];
extern Gfx D_60361F0[]; // possible collision
extern f32 D_6036204[];
extern f32 D_603626C[];
extern f32 D_6036288[];
extern f32 D_60362A4[];
extern f32 D_60362D8[];
extern f32 D_60362F4[];
extern f32 D_6036328[];
extern f32 D_6036344[];
extern f32 D_6036370[];
extern f32 D_603638C[];
extern Gfx D_60363B0[];
extern f32 D_60363B8[];
extern f32 D_60363E4[];
extern f32 D_6036410[];
extern f32 D_603643C[];
extern f32 D_6036458[];
extern f32 D_60364C0[];
extern f32 D_60364DC[];
extern f32 D_6036594[];
extern f32 D_60366EC[];
extern f32 D_6036708[];
extern f32 D_6036724[];
extern f32 D_6036728[];
extern f32 D_6036744[];
extern f32 D_6036760[];
extern f32 D_603677C[];
extern Gfx D_6036840[];
extern f32 D_6036894[];
extern f32 D_60368E0[];
extern f32 D_6036930[];
extern f32 D_603694C[];
extern f32 D_6036968[];
extern Gfx D_6036CD0[];
extern EnvSettings D_CO_6037160;
extern Gfx D_6037CF0[];
extern u16* D_MA_60381D8[];
extern ObjectInit D_603B074[];
extern u16* D_CO_603D9E8[];
extern f32 D_603DCA4[];
@@ -421,7 +338,6 @@ extern Gfx D_601A700[];
extern Gfx D_6019670[];
extern Gfx D_60185E0[];
extern Gfx D_6017550[];
extern f32 D_603E118[];
extern f32 D_603E14C[];
extern f32 D_603E1B4[];
include/assets/ast_macbeth.h
-8
View File
@@ -1,8 +0,0 @@
#ifndef AST_MACBETH_H
#define AST_MACBETH_H
#include "gfx.h"
#include "sf64object.h"
#include "structs.h"
#endif
include/fox_enmy2_assets.h
-10
View File
@@ -15,25 +15,15 @@ extern Gfx D_6018960[];
extern Gfx D_6009F50[];
extern Gfx D_600C2A0[];
extern Gfx D_600BD40[];
extern Gfx D_601C520[];
extern Gfx D_600AF40[];
extern Gfx D_600AC70[];
extern Gfx D_601A2B0[];
extern Gfx D_6002500[];
extern Gfx D_60043F0[];
extern Gfx D_6004310[];
extern Gfx D_6002890[];
extern f32 D_602C1A0[];
extern f32 D_602F604[];
extern f32 D_602C294[];
extern f32 D_601B474[];
extern f32 D_601B43C[];
extern f32 D_60368FC[];
extern f32 D_60368E0[];
extern f32 D_60364C0[];
extern f32 D_601B944[];
extern f32 D_6009D18[];
extern f32 D_60368E0[];
#endif
include/fox_enmy_assets.h
-1
View File
@@ -8,7 +8,6 @@ extern ObjectInit D_ME_6026CC4[];
extern ObjectInit D_VE1_6007E74[];
extern ObjectInit D_SO_601F234[];
extern ObjectInit D_ZO_6026714[];
extern ObjectInit D_MA_6031000[];
extern ObjectInit D_FO_600EAD4[];
extern ObjectInit D_KA_6011044[];
extern ObjectInit D_BO_600FF74[];
linker_scripts/us/undefined_syms.ld
+188 -181
View File
File diff suppressed because it is too large Load Diff
src/main/fox_A4290_colheaders.c
+13 -14
View File
@@ -3,12 +3,11 @@
#include "variables.h"
#include "assets.h"
#include "assets/ast_aquas.h"
#include "assets/ast_macbeth.h"
#include "assets/ast_sector_y.h"
#include "assets/ast_sector_z.h"
#include "assets/ast_vs_player.h"
extern Vec3f D_6030FD0[];
static Vec3f D_800D2920[16] = {
{ 1075.0f, 0.0f, 0.0f }, { 746.0f, 0.0f, -746.0f }, { 202.0f, 361.0f, -202.0f }, { 0.0f, 0.0f, -1075.0f },
{ 291.0f, 558.0f, 0.0f }, { 0.0f, 354.0f, -291.0f }, { 202.0f, 594.0f, 202.0f }, { 772.0f, 0.0f, 622.0f },
@@ -165,43 +164,43 @@ CollisionHeader2 D_800D2CA0[19] = {
{ -900.0f, -110.0f, -1900.0f },
{ 900.0f, 190.0f, 100.0f },
2,
D_6030E74,
D_6030E80,
D_MA_6030E74,
D_MA_6030E80,
},
{
{ -900.0f, -100.0f, -1000.0f },
{ 900.0f, 250.0f, 100.0f },
2,
D_6030EB0,
D_6030EBC,
D_MA_6030EB0,
D_MA_6030EBC,
},
{
{ -900.0f, -190.0f, -1900.0f },
{ 900.0f, 100.0f, 100.0f },
2,
D_6030EEC,
D_6030EF8,
D_MA_6030EEC,
D_MA_6030EF8,
},
{
{ -500.0f, -250.0f, -1010.0f },
{ 500.0f, 100.0f, 100.0f },
2,
D_6030F28,
D_6030F34,
D_MA_6030F28,
D_MA_6030F34,
},
{
{ -1200.0f, 0.0f, -1800.0f },
{ 0.0f, 900.0f, 1500.0f },
4,
D_6030F64,
D_6030F7C,
D_MA_6030F64,
D_MA_6030F7C,
},
{
{ -400.0f, 0.0f, -900.0f },
{ 400.0f, 0.0f, 0.0f },
2,
D_6030FC4,
D_6030FD0,
D_MA_6030FC4,
D_MA_6030FD0,
},
{
{ -74.0f, 0.0f, -84.0f },
src/main/fox_bg.c
+7 -6
View File
@@ -1,6 +1,6 @@
#include "global.h"
#include "assets.h"
// #include "prevent_bss_reordering.h"
#include "prevent_bss_reordering.h"
extern f32 D_i3_801C4188;
@@ -25,6 +25,7 @@ f32 D_80161394; // can be static
#include "assets/ast_sector_z.h"
#include "assets/ast_aquas.h"
#include "assets/ast_titania.h"
#include "assets/ast_macbeth.h"
#include "assets/ast_andross.h"
#include "assets/ast_warp_zone.h"
#include "assets/ast_area_6.h"
@@ -466,7 +467,7 @@ void func_8003E1E8(void) {
if (gCurrentLevel == LEVEL_TITANIA) {
gSPDisplayList(gMasterDisp++, D_TI_6000A80);
} else if (gCurrentLevel == LEVEL_MACBETH) {
gSPDisplayList(gMasterDisp++, D_6019220);
gSPDisplayList(gMasterDisp++, D_MA_6019220);
} else if (gCurrentLevel == LEVEL_ZONESS) {
gSPDisplayList(gMasterDisp++, D_6013480);
} else if (gCurrentLevel == LEVEL_SOLAR) {
@@ -482,7 +483,7 @@ void func_8003E1E8(void) {
if (gCurrentLevel == LEVEL_TITANIA) {
gSPDisplayList(gMasterDisp++, D_TI_6000A80);
} else if (gCurrentLevel == LEVEL_MACBETH) {
gSPDisplayList(gMasterDisp++, D_6019220);
gSPDisplayList(gMasterDisp++, D_MA_6019220);
} else if (gCurrentLevel == LEVEL_ZONESS) {
gSPDisplayList(gMasterDisp++, D_6013480);
} else if (gCurrentLevel == LEVEL_SOLAR) {
@@ -929,8 +930,8 @@ void func_80040CE4(void) {
G_TX_NOLOD);
break;
case LEVEL_MACBETH:
sp1C4 = D_602DCB8;
sp1C0 = D_60306D0;
sp1C4 = D_MA_602DCB8;
sp1C0 = D_MA_60306D0;
gDPLoadTextureBlock(gMasterDisp++, sp1C4, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD,
G_TX_NOLOD);
@@ -1063,7 +1064,7 @@ void func_80040CE4(void) {
} else if (gCurrentLevel == LEVEL_BOLSE) {
gSPDisplayList(gMasterDisp++, D_600A810);
} else if (gCurrentLevel == LEVEL_VENOM_2) {
gSPDisplayList(gMasterDisp++, D_6010700);
gSPDisplayList(gMasterDisp++, D_MA_6010700);
}
Matrix_Pop(&gGfxMatrix);
}
src/main/fox_edata_1C.c
+41 -40
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_macbeth.h"
#include "assets/ast_titania.h"
#include "assets/ast_7_ti_1.h"
#include "assets/ast_andross.h"
@@ -143,25 +144,25 @@ ObjectInfo D_800CC124[0x190] = {
/* 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_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 },
/* OBJ_80_62, */ {(void*) D_60270E0, 0, (ObjectFunc) NULL, D_800CBF34, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_63, */ {(void*) D_6013960, 0, (ObjectFunc) NULL, D_6036894, 500.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_64, */ {(void*) D_600AF40, 0, (ObjectFunc) NULL, D_60368E0, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_65, */ {(void*) func_i5_801A6608, 1, (ObjectFunc) NULL, D_6036724, 400.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_66, */ {(void*) D_601F1D0, 0, (ObjectFunc) NULL, D_60362D8, 2500.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_67, */ {(void*) D_60238F0, 0, (ObjectFunc) NULL, D_6036328, 2000.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_68, */ {(void*) D_601B7C0, 0, (ObjectFunc) NULL, D_60362F4, 2500.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_69, */ {(void*) D_6030500, 0, (ObjectFunc) NULL, D_6036370, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_70, */ {(void*) D_602DAE0, 0, (ObjectFunc) NULL, D_603638C, 1900.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_71, */ {(void*) D_6027900, 0, (ObjectFunc) NULL, D_60363B8, 1900.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_72, */ {(void*) D_602DB80, 0, (ObjectFunc) NULL, D_60363E4, 1100.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_73, */ {(void*) D_6030630, 0, (ObjectFunc) NULL, D_6036410, 1100.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_74, */ {(void*) D_602DC20, 0, (ObjectFunc) NULL, D_603643C, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_75, */ {(void*) D_601B0D0, 0, (ObjectFunc) NULL, D_6036760, 3000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_76, */ {(void*) D_60075D0, 0, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_77, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_6036344, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_59, */ {(void*) D_MA_6024010, 0, (ObjectFunc) NULL, D_MA_603626C, 300.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_60, */ {(void*) D_MA_6027180, 0, (ObjectFunc) NULL, D_MA_6036288, 400.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_61, */ {(void*) func_i5_801A2A78, 1, (ObjectFunc) NULL, D_MA_60362A4, 200.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_62, */ {(void*) D_MA_60270E0, 0, (ObjectFunc) NULL, D_800CBF34, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_63, */ {(void*) D_MA_6013960, 0, (ObjectFunc) NULL, D_MA_6036894, 500.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_64, */ {(void*) D_MA_600AF40, 0, (ObjectFunc) NULL, D_MA_60368E0, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_65, */ {(void*) func_i5_801A6608, 1, (ObjectFunc) NULL, D_MA_6036724, 400.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_66, */ {(void*) D_MA_601F1D0, 0, (ObjectFunc) NULL, D_MA_60362D8, 2500.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_67, */ {(void*) D_MA_60238F0, 0, (ObjectFunc) NULL, D_MA_6036328, 2000.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_68, */ {(void*) D_MA_601B7C0, 0, (ObjectFunc) NULL, D_MA_60362F4, 2500.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_69, */ {(void*) D_MA_6030500, 0, (ObjectFunc) NULL, D_MA_6036370, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_70, */ {(void*) D_MA_602DAE0, 0, (ObjectFunc) NULL, D_MA_603638C, 1900.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_71, */ {(void*) D_MA_6027900, 0, (ObjectFunc) NULL, D_MA_60363B8, 1900.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_72, */ {(void*) D_MA_602DB80, 0, (ObjectFunc) NULL, D_MA_60363E4, 1100.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_73, */ {(void*) D_MA_6030630, 0, (ObjectFunc) NULL, D_MA_6036410, 1100.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_74, */ {(void*) D_MA_602DC20, 0, (ObjectFunc) NULL, D_MA_603643C, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_75, */ {(void*) D_MA_601B0D0, 0, (ObjectFunc) NULL, D_MA_6036760, 3000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_76, */ {(void*) D_MA_60075D0, 0, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_77, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_MA_6036344, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_78, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_79, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_80, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
@@ -188,8 +189,8 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_101 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_102 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_103 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_104 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) func_i5_801A0BD8, D_6036594, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_105 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_6036204, 1300.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_104 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) func_i5_801A0BD8, D_MA_6036594, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_105 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_MA_6036204, 1300.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_106 */ {(void*) D_SY_60097E0, 0, (ObjectFunc) NULL, D_SY_6034478, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_107 */ {(void*) D_SY_601D730, 0, (ObjectFunc) NULL, D_SY_603450C, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_108 */ {(void*) D_SY_60102C0, 0, (ObjectFunc) NULL, D_SY_6034588, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
@@ -289,25 +290,25 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_ACTOR_202 */ {(void*) func_80059A24, 1, (ObjectFunc) func_8006AD18, D_602F6A0, 100.0f, 0, 1, 39, 0, 180.0f, 1 },
/* OBJ_ACTOR_203 */ {(void*) func_i2_8018F884, 1, (ObjectFunc) func_i2_8018F330, D_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_204 */ {(void*) func_i6_801A4CB0, 1, (ObjectFunc) func_i6_801A3BD4, D_SY_603405C, 1000.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_205 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019C778, D_60359C8, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_206 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_801AC438, D_6035A48, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_207 */ {(void*) func_i5_801AC294, 2, (ObjectFunc) func_i5_801A7E7C, D_603677C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_208 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019EA60, D_6035A14, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_209 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019D700, D_6035AE0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_210 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019CE88, D_6035D9C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_211 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019E410, D_6035E04, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_212 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019FF9C, D_60360C0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_213 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019EE68, D_6036154, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_214 */ {(void*) func_i5_801A43BC, 1, (ObjectFunc) func_i5_801A3E98, D_6036458, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_215 */ {(void*) func_i5_801A4A64, 1, (ObjectFunc) func_i5_801A46A0, D_60364C0, 300.0f, 0, 1, 40, 1, 0.0f, 1 },
/* OBJ_ACTOR_216 */ {(void*) func_i5_801A5F90, 1, (ObjectFunc) func_i5_801A5E54, D_60366EC, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_217 */ {(void*) func_i5_801A6100, 1, (ObjectFunc) func_i5_801A5FD0, D_6036708, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_218 */ {(void*) func_i5_801A6540, 1, (ObjectFunc) func_i5_801A6144, D_6036728, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_219 */ {(void*) func_i5_801A68EC, 1, (ObjectFunc) func_i5_801A67C8, D_6036744, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_220 */ {(void*) func_i5_801ADAC8, 1, (ObjectFunc) func_i5_801AD6F0, D_6036930, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_221 */ {(void*) func_i5_801AE2C0, 1, (ObjectFunc) func_i5_801ADD68, D_603694C, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
/* 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_205 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019C778, D_MA_60359C8, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_206 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_801AC438, D_MA_6035A48, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_207 */ {(void*) func_i5_801AC294, 2, (ObjectFunc) func_i5_801A7E7C, D_MA_603677C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_208 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019EA60, D_MA_6035A14, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_209 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019D700, D_MA_6035AE0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_210 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019CE88, D_MA_6035D9C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_211 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019E410, D_MA_6035E04, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_212 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019FF9C, D_MA_60360C0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_213 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019EE68, D_MA_6036154, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_214 */ {(void*) func_i5_801A43BC, 1, (ObjectFunc) func_i5_801A3E98, D_MA_6036458, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_215 */ {(void*) func_i5_801A4A64, 1, (ObjectFunc) func_i5_801A46A0, D_MA_60364C0, 300.0f, 0, 1, 40, 1, 0.0f, 1 },
/* OBJ_ACTOR_216 */ {(void*) func_i5_801A5F90, 1, (ObjectFunc) func_i5_801A5E54, D_MA_60366EC, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_217 */ {(void*) func_i5_801A6100, 1, (ObjectFunc) func_i5_801A5FD0, D_MA_6036708, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_218 */ {(void*) func_i5_801A6540, 1, (ObjectFunc) func_i5_801A6144, D_MA_6036728, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_219 */ {(void*) func_i5_801A68EC, 1, (ObjectFunc) func_i5_801A67C8, D_MA_6036744, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_220 */ {(void*) func_i5_801ADAC8, 1, (ObjectFunc) func_i5_801AD6F0, D_MA_6036930, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_221 */ {(void*) func_i5_801AE2C0, 1, (ObjectFunc) func_i5_801ADD68, D_MA_603694C, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
/* OBJ_ACTOR_222 */ {(void*) func_i5_801AEEFC, 1, (ObjectFunc) func_i5_801AEC04, D_MA_6036968, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
/* OBJ_ACTOR_223 */ {(void*) func_i5_801A54E8, 1, (ObjectFunc) func_i5_801A4B24, D_MA_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_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 },
src/main/fox_edisplay.c
+4 -3
View File
@@ -1,7 +1,7 @@
#include "global.h"
#include "assets.h"
// #include "prevent_bss_reordering.h"
#include "prevent_bss_reordering.h"
Vec3f D_801615D0;
Vec3f D_801615E0;
s32 D_801615EC;
@@ -11,6 +11,7 @@ WingInfo D_80161630;
#include "fox_edisplay_assets.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_aquas.h"
#include "assets/ast_macbeth.h"
#include "assets/ast_7_ti_1.h"
#include "assets/ast_andross.h"
#include "assets/ast_star_wolf.h"
@@ -54,7 +55,7 @@ void func_800598DC(s32 arg0) {
void func_800598E8(Actor* actor) {
RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gSPDisplayList(gMasterDisp++, D_6025B50);
gSPDisplayList(gMasterDisp++, D_MA_6025B50);
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
}
@@ -1792,7 +1793,7 @@ void TexturedLine_Draw(void) {
} else {
Matrix_SetGfxMtx(&gMasterDisp);
if (gCurrentLevel == LEVEL_MACBETH) {
gSPDisplayList(gMasterDisp++, D_6012C00_Gfx);
gSPDisplayList(gMasterDisp++, D_MA_6012C00);
} else {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, texLine->unk_2C, texLine->unk_2D, texLine->unk_2E,
texLine->unk_2F);
src/main/fox_effect.c
+7 -6
View File
@@ -19,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_macbeth.h"
#include "assets/ast_titania.h"
#include "assets/ast_area_6.h"
#include "assets/ast_A_ti.h"
@@ -730,25 +731,25 @@ void func_800798F0(Effect* effect) {
switch (effect->unk_44) {
case 1:
if (effect->index & 1) {
gSPDisplayList(gMasterDisp++, D_6022530);
gSPDisplayList(gMasterDisp++, D_MA_6022530);
} else {
gSPDisplayList(gMasterDisp++, D_6022450);
gSPDisplayList(gMasterDisp++, D_MA_6022450);
}
break;
case 2:
RCP_SetupDL(&gMasterDisp, 0x39);
if (effect->index & 1) {
gSPDisplayList(gMasterDisp++, D_601A7A0);
gSPDisplayList(gMasterDisp++, D_MA_601A7A0);
} else {
gSPDisplayList(gMasterDisp++, D_60223C0);
gSPDisplayList(gMasterDisp++, D_MA_60223C0);
}
RCP_SetupDL(&gMasterDisp, 0x1D);
break;
case 7:
Animation_GetFrameData(&D_6027320, 0, frameJointTable);
Animation_DrawSkeleton(1, D_602742C, frameJointTable, func_800798C4, NULL, effect,
Animation_GetFrameData(&D_MA_6027320, 0, frameJointTable);
Animation_DrawSkeleton(1, D_MA_602742C, frameJointTable, func_800798C4, NULL, effect,
&gIdentityMatrix);
break;
src/main/fox_enmy.c
+1
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_macbeth.h"
#include "assets/ast_titania.h"
#include "assets/ast_andross.h"
#include "assets/ast_area_6.h"
src/main/fox_enmy2.c
+6 -5
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_macbeth.h"
#include "assets/ast_titania.h"
#include "assets/ast_7_ti_1.h"
#include "assets/ast_andross.h"
@@ -956,15 +957,15 @@ UnkStruct_D003C D_800D003C[108] = {
{ D_VE1_900EFC0, D_800CBF34, 1.0f, 100.0f, 3000.0f, 1, 1, 0, 0, 0.0f, 1 },
{ NULL, D_AQ_6030B30, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 },
{ NULL, D_AQ_6030B14_f32, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 },
{ D_601C520, D_60368FC, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 },
{ D_600AF40, D_60368E0, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 },
{ D_MA_601C520, D_MA_60368FC, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 },
{ D_MA_600AF40, D_MA_60368E0, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 },
{ D_WZ_7000C40, D_800CC0D4, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_WZ_70010E0, D_800CC0F0, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_WZ_7000E80, D_800CC054, 2.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 },
{ D_WZ_70008F0, D_800CBE8C, -1.0f, 100.0f, 8000.0f, 1, 0, 0, 0, 0.0f, 0 },
{ D_WZ_7000280, D_800CC070, -1.0f, 1000.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 0 },
{ D_600AC70, D_800CBE8C, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 },
{ D_601A2B0, D_60364C0, 1.0f, 100.0f, 3000.0f, 1, 1, 0, 0, 0.0f, 1 },
{ D_MA_601A2B0, D_MA_60364C0, 1.0f, 100.0f, 3000.0f, 1, 1, 0, 0, 0.0f, 1 },
{ D_6002500, D_601B944, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_60043F0, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_6004310, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
@@ -973,7 +974,7 @@ UnkStruct_D003C D_800D003C[108] = {
{ NULL, D_800CBF34, -1.0f, 500.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 0 },
{ NULL, D_800CBEC4, 1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 1.0f, 1 },
{ NULL, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 0, 0, 6, 0, 0.0f, 0 },
{ D_6002890, D_60368E0, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 },
{ D_MA_6002890, D_MA_60368E0, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 },
};
u8 D_800D0DBC[6][4] = {
// could be in-function
@@ -4035,7 +4036,7 @@ void func_80074FF0(Actor* actor) {
case 82:
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_600DA10);
gSPDisplayList(gMasterDisp++, D_MA_600DA10);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
break;
src/main/fox_hud.c
+1 -1
View File
@@ -82,6 +82,7 @@ s32 D_80161900[20];
#include "assets/ast_training.h"
#include "assets/ast_area_6.h"
#include "assets/ast_aquas.h"
#include "assets/ast_macbeth.h"
#include "assets/ast_titania.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_sector_y.h"
@@ -96,7 +97,6 @@ void func_80087788(void);
extern u8 D_CO_6000000[];
extern u8 D_ME_6000000[];
extern u8 D_MA_6000000[];
extern u8 D_FO_6000000[];
extern u8 D_KA_6000000[];
extern u8 D_SO_6000000[];
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_macbeth.h"
#include "assets/ast_titania.h"
#include "assets/ast_andross.h"
#include "assets/ast_arwing.h"
src/main/fox_radio.c
+3 -3
View File
@@ -17,7 +17,7 @@ s32 D_80178748;
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_sector_y.h"
#include "assets/ast_aquas.h"
#include "assets/ast_macbeth.h"
#include "assets/ast_star_wolf.h"
#include "assets/ast_great_fox.h"
#include "assets/ast_area_6.h"
@@ -306,10 +306,10 @@ void func_800BAAE8(void) {
sp44 = D_SY_6019E50;
break;
case RCID_BOSS_MACBETH:
sp44 = D_6010C20;
sp44 = D_MA_6010C20;
break;
case RCID_BOSS_MACBETH_OPEN:
sp44 = D_6011B40;
sp44 = D_MA_6011B40;
break;
case RCID_ROB64_RED:
D_80178744 = 1;
src/overlays/ovl_i5/fox_ma.c
+128 -226
View File
File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More