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

None of woman born Shall export Macbeth (#183)

Browse Source 
* macbeth

* fix

* forgot header
This commit is contained in:
petrie911
2024-03-29 12:40:09 -05: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
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
@@ -1,108 +1,10 @@
#include "global.h"
#include "assets.h"
#include "prevent_bss_reordering.h"
#include "assets/ast_macbeth.h"
#include "assets/ast_landmaster.h"
#include "assets/ast_enmy_planet.h"
extern u8 D_6023228[];
extern u8 D_6023388[];
extern u8 D_Unk_800DB4B8[];
extern f32 D_6035DD0[];
extern f32 D_60359AC[];
extern f32 D_6035E68[];
extern f32 D_6035ECC[];
extern f32 D_6035F30[];
extern f32 D_6035F94[];
extern f32 D_6035FF8[];
extern f32 D_603605C[];
extern Gfx D_6010470[];
extern Gfx D_6003370[];
extern Gfx D_6004440[];
extern Animation D_600FEC4;
extern Animation D_6010144;
extern Animation D_6010220;
extern Limb* D_601042C[];
extern Gfx D_6017720[];
extern Gfx D_601BE90[];
extern Animation D_601EAB0;
extern Limb* D_601EBBC;
extern Gfx D_6022200[];
extern Gfx D_60227F0[];
extern Gfx D_60239D0[];
extern Gfx D_6024670[];
extern Gfx D_60269E0[];
extern Animation D_6027A04;
extern Limb* D_6027AF0[];
extern Gfx D_6027BF0[];
extern Gfx D_6027D40[];
extern Gfx D_6027EB0[];
extern Gfx D_60288A0[];
extern Animation D_602EA0C;
extern Limb* D_602EBB8[];
extern Gfx D_6001180[];
extern Gfx D_60014A0[];
extern Gfx D_601C170[];
extern Gfx D_6022610[];
extern Animation D_6025CA0;
extern Limb* D_6025DAC[];
extern Gfx D_6026860[];
extern Gfx D_602D380[];
extern Gfx D_602FBF0[];
extern Gfx D_6030750[];
extern Gfx D_60309D0[];
extern Gfx D_601C000[];
extern Gfx D_60253E0[];
extern Gfx D_6003070[];
extern Gfx D_60066A0[];
extern Gfx D_60071C0[];
extern Gfx D_6007290[];
extern Gfx D_6007360[];
extern Gfx D_6007430[];
extern Gfx D_6007500[];
extern Gfx D_6009C50[];
extern Gfx D_6009F10[];
extern Gfx D_600A1F0[];
extern Gfx D_600A4D0[];
extern Gfx D_600A7D0[];
extern Gfx D_600AA70[];
extern Gfx D_600AD50[];
extern Animation D_600C4D0;
extern Limb* D_600C65C[];
extern f32 D_603648C[];
extern Gfx D_602F380[];
extern Animation D_602FEB4;
extern Limb* D_602FFA0[];
extern Gfx D_602FFC0[];
extern Gfx D_601A2B0[];
extern f32 D_6036520[];
extern Animation D_602F098;
extern Limb* D_602F264[];
extern Animation D_602F2E0;
extern Limb* D_602F36C[];
extern Gfx D_601A840[];
extern Gfx D_6012A60[];
extern Gfx D_60251A0[];
extern Gfx D_6025850[];
extern Gfx D_60257B0[];
extern Gfx D_601F270[];
extern u16 D_6012C98[];
extern Animation D_600CD18;
extern Animation D_6015C24;
extern Animation D_6016040;
extern Animation D_60163F0;
extern Animation D_6016B2C;
extern Animation D_6017714;
extern Animation D_601D188;
extern f32 D_6036818[];
extern Limb* D_600D1E4[];
extern Animation D_601EA28;
extern f32 D_6035A94[];
extern ObjectInit D_6035678[];
extern ObjectInit D_60357CC[];
extern ObjectInit D_6035920[];
extern Gfx D_600D480[];
extern Gfx D_6013060[];
extern Gfx D_6012F50[];
extern Gfx D_6015510[];
void func_i5_80199A40(u8*, u8*, f32);
void func_i5_80199C20(u8*, s32, s32, s32, s32);
@@ -515,8 +417,8 @@ void func_i5_80199F8C(Actor* actor) {
}
void func_i5_8019A128(void) {
func_i5_80199C20(D_6023228, 16, 16, 0, 8);
func_i5_80199A40(D_6023388, D_Unk_800DB4B8, gGameFrameCount * -20.0f);
func_i5_80199C20(D_MA_6023228, 16, 16, 0, 8);
func_i5_80199A40(D_MA_6023388, D_Unk_800DB4B8, gGameFrameCount * -20.0f);
}
void func_i5_8019A198(Actor* actor) {
@@ -1097,7 +999,7 @@ void func_i5_8019D048(Actor* actor) {
actor->obj.pos.y + actor->fwork[8] + 290.0f, actor->obj.pos.z + 175.0f,
actor->iwork[4] * 35.0f, actor->vel.z, actor->iwork[4] * -35.0f, 0.0f, 14, 5);
actor->iwork[3]++;
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6035DD0);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035DD0);
}
break;
case 2:
@@ -1284,27 +1186,27 @@ void func_i5_8019D910(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
actor->iwork[22] |= (var_v0);
switch (actor->iwork[22]) {
case 1:
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6035E68);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035E68);
break;
case 2:
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6035ECC);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035ECC);
break;
case 3:
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6035F30);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035F30);
break;
case 4:
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6035F94);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035F94);
break;
case 5:
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6035FF8);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035FF8);
break;
case 6:
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603605C);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603605C);
break;
case 7:
actor->state = 1;
actor->timer_0BC = 60;
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_60359AC);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_60359AC);
break;
}
(*arg1)++;
@@ -1417,7 +1319,7 @@ void func_i5_8019E624(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
case 3:
func_i5_8019A8C8(actor, 1);
*arg6 = 2;
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_60359AC);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_60359AC);
(*arg1)++;
actor->state = 1;
break;
@@ -1495,7 +1397,7 @@ void func_i5_8019EBF8(Actor* actor, s32* arg1, s32* arg2, s32 arg3, f32 arg4, f3
case 1:
func_i5_8019AF34(actor);
*arg6 = 2;
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_60359AC);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_60359AC);
(*arg1)++;
return;
case 2:
@@ -1751,7 +1653,7 @@ void func_i5_8019FC54(Actor* actor, s32* arg1, s32* arg2, s32 arg3, s32 arg4, f3
0.0f, 0.0f, 20.0f, 20);
}
*arg7 = 2;
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_60359AC);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_60359AC);
(*arg1)++;
actor->state = 1;
break;
@@ -2100,7 +2002,7 @@ bool func_i5_801A0EB8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
if (limbIndex == 5) {
RCP_SetupDL(&gMasterDisp, 0x22);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, D_i5_801BE368[20], D_i5_801BE368[21], D_i5_801BE368[22], 255);
gSPDisplayList(gMasterDisp++, D_6010470);
gSPDisplayList(gMasterDisp++, D_MA_6010470);
RCP_SetupDL(&gMasterDisp, 0x1D);
}
}
@@ -2148,12 +2050,12 @@ void func_i5_801A12C4(Actor* actor) {
if ((actor->obj.id != OBJ_ACTOR_206) && (actor->obj.id != OBJ_ACTOR_205)) {
if (((gPlayer[0].unk_138 - actor->obj.pos.z) > 3000.0f) && (D_i5_801BE310 != actor->iwork[5])) {
gSPDisplayList(gMasterDisp++, D_6027BF0);
gSPDisplayList(gMasterDisp++, D_601BE90);
gSPDisplayList(gMasterDisp++, D_MA_6027BF0);
gSPDisplayList(gMasterDisp++, D_MA_601BE90);
} else {
Matrix_Scale(gGfxMatrix, actor->scale, actor->scale, actor->scale, 1);
Animation_GetFrameData(&D_602EA0C, 0, spD0);
Animation_DrawSkeleton(1, D_602EBB8, spD0, func_i5_801A0A74, NULL, actor, &gIdentityMatrix);
Animation_GetFrameData(&D_MA_602EA0C, 0, spD0);
Animation_DrawSkeleton(1, D_MA_602EBB8, spD0, func_i5_801A0A74, NULL, actor, &gIdentityMatrix);
}
}
switch (actor->obj.id) {
@@ -2166,14 +2068,14 @@ void func_i5_801A12C4(Actor* actor) {
if (actor->iwork[7] > 0) {
actor->iwork[7]--;
}
Animation_GetFrameData(&D_6027320, 0, spD0);
Animation_DrawSkeleton(1, D_602742C, spD0, func_i5_801A0B20, NULL, actor, &gIdentityMatrix);
Animation_GetFrameData(&D_MA_6027320, 0, spD0);
Animation_DrawSkeleton(1, D_MA_602742C, spD0, func_i5_801A0B20, NULL, actor, &gIdentityMatrix);
}
break;
case OBJ_ACTOR_210:
if (actor->iwork[13] == 0) {
Animation_GetFrameData(&D_6027A04, 0, spD0);
Animation_DrawSkeleton(1, D_6027AF0, spD0, func_i5_801A0B00, NULL, actor, &gIdentityMatrix);
Animation_GetFrameData(&D_MA_6027A04, 0, spD0);
Animation_DrawSkeleton(1, D_MA_6027AF0, spD0, func_i5_801A0B00, NULL, actor, &gIdentityMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, 205.0f, 0.0f, 1);
Matrix_RotateZ(gGfxMatrix, actor->fwork[4] * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
@@ -2185,9 +2087,9 @@ void func_i5_801A12C4(Actor* actor) {
actor->iwork[7]--;
}
if (actor->iwork[3] >= 3) {
gSPDisplayList(gMasterDisp++, D_6027EB0);
gSPDisplayList(gMasterDisp++, D_MA_6027EB0);
} else {
gSPDisplayList(gMasterDisp++, D_60288A0);
gSPDisplayList(gMasterDisp++, D_MA_60288A0);
}
}
break;
@@ -2202,7 +2104,7 @@ void func_i5_801A12C4(Actor* actor) {
if (actor->iwork[8] > 0) {
actor->iwork[8]--;
}
gSPDisplayList(gMasterDisp++, D_6029890);
gSPDisplayList(gMasterDisp++, D_MA_6029890);
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
}
break;
@@ -2219,11 +2121,11 @@ void func_i5_801A12C4(Actor* actor) {
}
if (actor->iwork[17] == 0) {
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_6004440);
gSPDisplayList(gMasterDisp++, D_MA_6004440);
} else {
RCP_SetupDL(&gMasterDisp, 0x39);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_6022200);
gSPDisplayList(gMasterDisp++, D_MA_6022200);
RCP_SetupDL(&gMasterDisp, 0x1D);
}
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
@@ -2241,7 +2143,7 @@ void func_i5_801A12C4(Actor* actor) {
if (actor->iwork[7] > 0) {
actor->iwork[7]--;
}
gSPDisplayList(gMasterDisp++, D_6024670);
gSPDisplayList(gMasterDisp++, D_MA_6024670);
RCP_SetupDL(&gMasterDisp, 0x1D);
}
break;
@@ -2257,33 +2159,33 @@ void func_i5_801A12C4(Actor* actor) {
if (actor->iwork[13] == 0) {
Matrix_Translate(gGfxMatrix, 0.0f, -5.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_60269E0);
gSPDisplayList(gMasterDisp++, D_MA_60269E0);
} else {
Matrix_Translate(gGfxMatrix, 0.0f, -5.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6017720);
gSPDisplayList(gMasterDisp++, D_MA_6017720);
}
gDPSetTextureFilter(gMasterDisp++, G_TF_BILERP);
}
break;
case OBJ_ACTOR_206:
Animation_GetFrameData(&D_601EAB0, 0, spD0);
Animation_DrawSkeleton(1, &D_601EBBC, spD0, func_i5_801AC5AC, NULL, actor, &gIdentityMatrix);
Animation_GetFrameData(&D_MA_601EAB0, 0, spD0);
Animation_DrawSkeleton(1, D_MA_601EBBC, spD0, func_i5_801AC5AC, NULL, actor, &gIdentityMatrix);
break;
case OBJ_ACTOR_205:
Matrix_Translate(gGfxMatrix, actor->fwork[3], 0.0f, 0.0f, 1);
if (D_i5_801BE320[21] == 0) {
Animation_GetFrameData(&D_6010220, 0, spD0);
Animation_GetFrameData(&D_MA_6010220, 0, spD0);
} else if (D_i5_801BE320[21] == 1) {
Animation_GetFrameData(&D_600FEC4, D_i5_801BE320[22], spD0);
Animation_GetFrameData(&D_MA_600FEC4, D_i5_801BE320[22], spD0);
} else {
Animation_GetFrameData(&D_6010144, D_i5_801BE320[22], spD0);
Animation_GetFrameData(&D_MA_6010144, D_i5_801BE320[22], spD0);
}
Animation_DrawSkeleton(1, D_601042C, spD0, func_i5_801A0EB8, func_i5_801A1268, actor, &gIdentityMatrix);
Animation_DrawSkeleton(1, D_MA_601042C, spD0, func_i5_801A0EB8, func_i5_801A1268, actor, &gIdentityMatrix);
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) {
RCP_SetupDL(&gMasterDisp, 0x1D);
gSPClearGeometryMode(gMasterDisp++, G_TEXTURE_GEN);
gSPDisplayList(gMasterDisp++, D_6003370);
gSPDisplayList(gMasterDisp++, D_MA_6003370);
}
break;
}
@@ -2295,11 +2197,11 @@ void func_i5_801A12C4(Actor* actor) {
Matrix_SetGfxMtx(&gMasterDisp);
Matrix_Scale(gGfxMatrix, actor->scale, actor->scale, actor->scale, 1);
if ((gPlayer[0].unk_138 - actor->obj.pos.z) > 3000.0f) {
gSPDisplayList(gMasterDisp++, D_6027D40);
gSPDisplayList(gMasterDisp++, D_MA_6027D40);
} else if (actor->vel.z > -2.0f) {
gSPDisplayList(gMasterDisp++, D_60227F0);
gSPDisplayList(gMasterDisp++, D_MA_60227F0);
} else {
gSPDisplayList(gMasterDisp++, D_60239D0);
gSPDisplayList(gMasterDisp++, D_MA_60239D0);
}
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
@@ -2310,11 +2212,11 @@ void func_i5_801A12C4(Actor* actor) {
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x1D);
if ((gPlayer[0].unk_138 - actor->obj.pos.z) > 3000.0f) {
gSPDisplayList(gMasterDisp++, D_6027D40);
gSPDisplayList(gMasterDisp++, D_MA_6027D40);
} else if (actor->vel.z > -2.0f) {
gSPDisplayList(gMasterDisp++, D_60227F0);
gSPDisplayList(gMasterDisp++, D_MA_60227F0);
} else {
gSPDisplayList(gMasterDisp++, D_60239D0);
gSPDisplayList(gMasterDisp++, D_MA_60239D0);
}
Matrix_Pop(&gGfxMatrix);
id = actor->obj.id;
@@ -2334,11 +2236,11 @@ void func_i5_801A12C4(Actor* actor) {
}
if (actor->iwork[13] == 0) {
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_6004440);
gSPDisplayList(gMasterDisp++, D_MA_6004440);
} else {
RCP_SetupDL(&gMasterDisp, 0x39);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_6022200);
gSPDisplayList(gMasterDisp++, D_MA_6022200);
RCP_SetupDL(&gMasterDisp, 0x1D);
}
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
@@ -2359,11 +2261,11 @@ void func_i5_801A12C4(Actor* actor) {
}
if (actor->iwork[21] == 0) {
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_6004440);
gSPDisplayList(gMasterDisp++, D_MA_6004440);
} else {
RCP_SetupDL(&gMasterDisp, 0x39);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_6022200);
gSPDisplayList(gMasterDisp++, D_MA_6022200);
RCP_SetupDL(&gMasterDisp, 0x1D);
}
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
@@ -2382,35 +2284,35 @@ void func_i5_801A23AC(Object_80* obj80) {
if ((gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) && ((gPlayer[0].unk_138 - obj80->obj.pos.z) < -2500.0f)) {
Object_Kill(&obj80->obj, obj80->sfxSource);
}
gSPDisplayList(gMasterDisp++, D_6026860);
gSPDisplayList(gMasterDisp++, D_MA_6026860);
break;
case OBJ_80_95:
case OBJ_80_98:
if ((gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7) && ((gPlayer[0].unk_138 - obj80->obj.pos.z) < -2500.0f)) {
Object_Kill(&obj80->obj, obj80->sfxSource);
}
gSPDisplayList(gMasterDisp++, D_602FBF0);
gSPDisplayList(gMasterDisp++, D_MA_602FBF0);
break;
case OBJ_80_96:
case OBJ_80_99:
gSPDisplayList(gMasterDisp++, D_6022610);
gSPDisplayList(gMasterDisp++, D_MA_6022610);
break;
case OBJ_80_100:
case OBJ_80_102:
gSPDisplayList(gMasterDisp++, D_60309D0);
gSPDisplayList(gMasterDisp++, D_MA_60309D0);
break;
case OBJ_80_101:
case OBJ_80_103:
gSPDisplayList(gMasterDisp++, D_6030750);
gSPDisplayList(gMasterDisp++, D_MA_6030750);
break;
case OBJ_80_105:
RCP_SetupDL(&gMasterDisp, 0x1D);
gSPDisplayList(gMasterDisp++, D_602D380);
gSPDisplayList(gMasterDisp++, D_MA_602D380);
break;
case OBJ_80_104:
Matrix_Push(&gGfxMatrix);
Animation_GetFrameData(&D_6025CA0, 0, sp78);
Animation_DrawSkeleton(1, D_6025DAC, sp78, func_i5_801A0DD8, func_i5_801A0E2C, obj80, &gIdentityMatrix);
Animation_GetFrameData(&D_MA_6025CA0, 0, sp78);
Animation_DrawSkeleton(1, D_MA_6025DAC, sp78, func_i5_801A0DD8, func_i5_801A0E2C, obj80, &gIdentityMatrix);
Matrix_Pop(&gGfxMatrix);
if ((obj80->state == 1) && (obj80->timer_4C <= 0)) {
Matrix_Push(&gGfxMatrix);
@@ -2451,22 +2353,22 @@ void func_i5_801A23AC(Object_80* obj80) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -1800.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_601C170);
gSPDisplayList(gMasterDisp++, D_MA_601C170);
Matrix_Pop(&gGfxMatrix);
} else {
Matrix_Push(&gGfxMatrix);
Matrix_RotateY(gGfxMatrix, -(D_PI / 18), 1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -1800.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_601C170);
gSPDisplayList(gMasterDisp++, D_MA_601C170);
Matrix_Pop(&gGfxMatrix);
}
break;
case OBJ_80_92:
gSPDisplayList(gMasterDisp++, D_60014A0);
gSPDisplayList(gMasterDisp++, D_MA_60014A0);
break;
case OBJ_80_93:
gSPDisplayList(gMasterDisp++, D_6001180);
gSPDisplayList(gMasterDisp++, D_MA_6001180);
break;
}
RCP_SetupDL(&gMasterDisp, 0x1D);
@@ -2475,8 +2377,8 @@ void func_i5_801A23AC(Object_80* obj80) {
void func_i5_801A2A78(Object_80* obj80) {
RCP_SetupDL(&gMasterDisp, 0x39);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_60253E0);
gSPDisplayList(gMasterDisp++, D_601C000);
gSPDisplayList(gMasterDisp++, D_MA_60253E0);
gSPDisplayList(gMasterDisp++, D_MA_601C000);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
RCP_SetupDL(&gMasterDisp, 0x1D);
}
@@ -2488,46 +2390,46 @@ void func_i5_801A2B24(Object_80* obj80) {
RCP_SetupDL(&gMasterDisp, 0x39);
switch (obj80->obj.id) {
case OBJ_80_77:
gSPDisplayList(gMasterDisp++, D_60066A0);
gSPDisplayList(gMasterDisp++, D_MA_60066A0);
break;
case OBJ_80_78:
gSPDisplayList(gMasterDisp++, D_6007430);
gSPDisplayList(gMasterDisp++, D_MA_6007430);
break;
case OBJ_80_79:
gSPDisplayList(gMasterDisp++, D_6007360);
gSPDisplayList(gMasterDisp++, D_MA_6007360);
break;
case OBJ_80_80:
gSPDisplayList(gMasterDisp++, D_6007290);
gSPDisplayList(gMasterDisp++, D_MA_6007290);
break;
case OBJ_80_81:
gSPDisplayList(gMasterDisp++, D_60071C0);
gSPDisplayList(gMasterDisp++, D_MA_60071C0);
break;
case OBJ_80_82:
gSPDisplayList(gMasterDisp++, D_6007500);
gSPDisplayList(gMasterDisp++, D_MA_6007500);
break;
case OBJ_80_84:
gSPDisplayList(gMasterDisp++, D_600AD50);
gSPDisplayList(gMasterDisp++, D_MA_600AD50);
break;
case OBJ_80_85:
gSPDisplayList(gMasterDisp++, D_600AA70);
gSPDisplayList(gMasterDisp++, D_MA_600AA70);
break;
case OBJ_80_86:
gSPDisplayList(gMasterDisp++, D_6003070);
gSPDisplayList(gMasterDisp++, D_MA_6003070);
break;
case OBJ_80_87:
gSPDisplayList(gMasterDisp++, D_600A7D0);
gSPDisplayList(gMasterDisp++, D_MA_600A7D0);
break;
case OBJ_80_88:
gSPDisplayList(gMasterDisp++, D_600A4D0);
gSPDisplayList(gMasterDisp++, D_MA_600A4D0);
break;
case OBJ_80_89:
gSPDisplayList(gMasterDisp++, D_600A1F0);
gSPDisplayList(gMasterDisp++, D_MA_600A1F0);
break;
case OBJ_80_90:
gSPDisplayList(gMasterDisp++, D_6009F10);
gSPDisplayList(gMasterDisp++, D_MA_6009F10);
break;
case OBJ_80_91:
gSPDisplayList(gMasterDisp++, D_6009C50);
gSPDisplayList(gMasterDisp++, D_MA_6009C50);
break;
}
RCP_SetupDL(&gMasterDisp, 0x1D);
@@ -2600,8 +2502,8 @@ void func_i5_801A3240(Object_80* obj80) {
RCP_SetupDL(&gMasterDisp, 0x1D);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
Animation_GetFrameData(&D_600C4D0, 0, sp38);
Animation_DrawSkeleton(1, D_600C65C, sp38, NULL, func_i5_801A30B8, obj80, &gIdentityMatrix);
Animation_GetFrameData(&D_MA_600C4D0, 0, sp38);
Animation_DrawSkeleton(1, D_MA_600C65C, sp38, NULL, func_i5_801A30B8, obj80, &gIdentityMatrix);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
}
@@ -2865,7 +2767,7 @@ void func_i5_801A3E98(Actor* actor) {
Math_SmoothStepToF(&actor->fwork[1], -181.0f, 0.6f, 20.0f, 0.0f);
if (actor->fwork[1] <= -180.0f) {
AUDIO_PLAY_SFX(0x19033008, actor->sfxSource, 0);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603648C);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603648C);
actor->iwork[0] = 2;
actor->state = 2;
}
@@ -2923,15 +2825,15 @@ void func_i5_801A43BC(Actor* actor) {
Vec3f sp50[50];
Matrix_Push(&gGfxMatrix);
Animation_GetFrameData(&D_602FEB4, 0, sp50);
Animation_DrawSkeleton(1, D_602FFA0, sp50, func_i5_801A41B0, NULL, actor, &gIdentityMatrix);
Animation_GetFrameData(&D_MA_602FEB4, 0, sp50);
Animation_DrawSkeleton(1, D_MA_602FFA0, sp50, func_i5_801A41B0, NULL, actor, &gIdentityMatrix);
Matrix_Pop(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x1D);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, actor->fwork[2] + 204.0f, 0.0f, 1);
Matrix_RotateY(gGfxMatrix, actor->fwork[1] * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_602FFC0);
gSPDisplayList(gMasterDisp++, D_MA_602FFC0);
Matrix_Pop(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x22);
gDPSetTextureFilter(gMasterDisp++, G_TF_POINT);
@@ -2940,7 +2842,7 @@ void func_i5_801A43BC(Actor* actor) {
Matrix_Translate(gGfxMatrix, 0.0f, actor->fwork[2] + 204.0f, 0.0f, 1);
Matrix_RotateY(gGfxMatrix, actor->fwork[1] * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_602F380);
gSPDisplayList(gMasterDisp++, D_MA_602F380);
gDPSetTextureFilter(gMasterDisp++, G_TF_BILERP);
Matrix_Pop(&gGfxMatrix);
}
@@ -3037,7 +2939,7 @@ void func_i5_801A4A64(Actor* actor) {
Matrix_Scale(gGfxMatrix, actor->scale, actor->scale, actor->scale, 1);
Matrix_SetGfxMtx(&gMasterDisp);
}
gSPDisplayList(gMasterDisp++, D_601A2B0);
gSPDisplayList(gMasterDisp++, D_MA_601A2B0);
}
}
@@ -3077,7 +2979,7 @@ void func_i5_801A4B24(Actor* actor) {
break;
case 1:
if ((gPlayer[0].unk_138 - actor->obj.pos.z) < 2000.0f) {
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6036520);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6036520);
actor->state = 2;
}
break;
@@ -3196,12 +3098,12 @@ void func_i5_801A54E8(Actor* actor) {
Vec3f sp28[50];
Matrix_Push(&gGfxMatrix);
Animation_GetFrameData(&D_602F2E0, 0, sp28);
Animation_DrawSkeleton(1, D_602F36C, sp28, func_i5_801A54AC, NULL, actor, &gIdentityMatrix);
Animation_GetFrameData(&D_MA_602F2E0, 0, sp28);
Animation_DrawSkeleton(1, D_MA_602F36C, sp28, func_i5_801A54AC, NULL, actor, &gIdentityMatrix);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
Animation_GetFrameData(&D_602F098, 0, sp28);
Animation_DrawSkeleton(1, D_602F264, sp28, func_i5_801A5124, NULL, actor, &gIdentityMatrix);
Animation_GetFrameData(&D_MA_602F098, 0, sp28);
Animation_DrawSkeleton(1, D_MA_602F264, sp28, func_i5_801A5124, NULL, actor, &gIdentityMatrix);
Matrix_Pop(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x1D);
}
@@ -3294,7 +3196,7 @@ void func_i5_801A57D0(Effect* effect) {
void func_i5_801A5AF0(Effect* effect) {
RCP_SetupDL(&gMasterDisp, 0x3C);
gSPDisplayList(gMasterDisp++, D_601A840);
gSPDisplayList(gMasterDisp++, D_MA_601A840);
RCP_SetupDL(&gMasterDisp, 0x40);
}
@@ -3337,7 +3239,7 @@ void func_i5_801A5D68(Effect* effect) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 112, 255, 243, effect->unk_44);
gDPSetEnvColor(gMasterDisp++, 255, 255, 255, effect->unk_44);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6012A60);
gSPDisplayList(gMasterDisp++, D_MA_6012A60);
RCP_SetupDL(&gMasterDisp, 0x40);
}
@@ -3366,7 +3268,7 @@ void func_i5_801A5E54(Actor* actor) {
}
void func_i5_801A5F90(Actor* actor) {
gSPDisplayList(gMasterDisp++, D_60251A0);
gSPDisplayList(gMasterDisp++, D_MA_60251A0);
}
void func_i5_801A5FC4(s32 arg0) {
@@ -3390,7 +3292,7 @@ void func_i5_801A5FD0(Actor* actor) {
}
void func_i5_801A6100(Actor* actor) {
gSPDisplayList(gMasterDisp++, D_6025850);
gSPDisplayList(gMasterDisp++, D_MA_6025850);
}
void func_i5_801A6134(Actor* actor) {
@@ -3448,7 +3350,7 @@ void func_i5_801A6540(Actor* actor) {
RCP_SetupDL(&gMasterDisp, 0x3A);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
gSPDisplayList(gMasterDisp++, D_60257B0);
gSPDisplayList(gMasterDisp++, D_MA_60257B0);
RCP_SetupDL(&gMasterDisp, 0x1D);
}
@@ -3470,9 +3372,9 @@ void func_i5_801A6608(Object_80* obj80) {
RCP_SetupDL(&gMasterDisp, 0x22);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, obj80->vel.x, 0, 0, 255);
}
gSPDisplayList(gMasterDisp++, D_6010700);
gSPDisplayList(gMasterDisp++, D_MA_6010700);
RCP_SetupDL(&gMasterDisp, 0x1D);
gSPDisplayList(gMasterDisp++, D_601F270);
gSPDisplayList(gMasterDisp++, D_MA_601F270);
}
void func_i5_801A67BC(s32 arg0) {
@@ -3570,7 +3472,7 @@ void func_i5_801A6984(Actor* actor) {
spA0 = temp_fs3_2;
sp9C = temp_fs4;
}
func_i5_80199D88(D_6012C98, 4, 8);
func_i5_80199D88(D_MA_6012C98, 4, 8);
}
void func_i5_801A6C78(Actor* actor) {
@@ -3911,7 +3813,7 @@ void func_i5_801A7E7C(Actor* actor) {
D_i5_801BE320[7] = 1;
if ((actor->fwork[5] + 500.0f) <= actor->obj.pos.y) {
Radio_PlayMessage(gMsg_ID_17430, RCID_BOSS_MACBETH);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603677C);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C);
actor->state = 3;
}
}
@@ -4055,16 +3957,16 @@ void func_i5_801A7E7C(Actor* actor) {
break;
case 7:
if ((gPlayer[0].unk_138 - actor->obj.pos.z) < 1200.0f) {
if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_601D188) - 1)) {
if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_601D188) - 1)) {
D_i5_801BE320[3] = (s16) (D_i5_801BE320[3] + 1);
if ((D_i5_801BE320[3] == 26) && (D_i5_801BE320[10] > 0)) {
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6036818);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6036818);
AUDIO_PLAY_SFX(0x2902405E, actor->sfxSource, 4);
}
} else {
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_800CBF34);
if ((gPlayer[0].pos.y + 1200.0f) < actor->obj.pos.y) {
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603677C);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C);
D_i5_801BE320[3] = 0;
D_i5_801BE320[2] = 1;
D_i5_801BE320[31] = 30;
@@ -4111,7 +4013,7 @@ void func_i5_801A7E7C(Actor* actor) {
}
func_i5_801A74C4(actor);
func_i5_801A6984(actor);
if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_6017714) - 1)) {
if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_6017714) - 1)) {
D_i5_801BE320[3] = (s16) (D_i5_801BE320[3] + 1);
} else {
D_i5_801BE320[3] = 0;
@@ -4233,7 +4135,7 @@ void func_i5_801A7E7C(Actor* actor) {
func_i5_801A6FB4(actor);
func_i5_801A6984(actor);
if (actor->timer_0BC == 0) {
if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_6016B2C) - 1)) {
if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_6016B2C) - 1)) {
D_i5_801BE320[3]++;
} else {
D_i5_801BE320[3] = 0;
@@ -4263,7 +4165,7 @@ void func_i5_801A7E7C(Actor* actor) {
D_i5_801BE368[0] * 0.8f, -10.0f, 8.0f);
D_i5_801BE320[11]++;
if (D_i5_801BE320[11] >= var_s0) {
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603677C);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C);
D_i5_801BE320[3] = 0;
D_i5_801BE320[2] = 1;
D_i5_801BE320[31] = 30;
@@ -4298,7 +4200,7 @@ void func_i5_801A7E7C(Actor* actor) {
Math_SmoothStepToAngle(&actor->obj.rot.y, 0.0f, 0.1f, 20.0f, 0.01f);
Math_SmoothStepToAngle(&actor->obj.rot.x, 0.0f, 0.1f, 20.0f, 0.01f);
Math_SmoothStepToAngle(&actor->obj.rot.z, 0.0f, 0.1f, 20.0f, 0.01f);
if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_60163F0) - 1)) {
if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_60163F0) - 1)) {
D_i5_801BE320[3]++;
} else {
D_i5_801BE320[3] = 0;
@@ -4340,7 +4242,7 @@ void func_i5_801A7E7C(Actor* actor) {
Math_SmoothStepToAngle(&actor->obj.rot.y, 0.0f, 0.1f, 20.0f, 0.01f);
Math_SmoothStepToAngle(&actor->obj.rot.x, 0.0f, 0.1f, 20.0f, 0.01f);
Math_SmoothStepToAngle(&actor->obj.rot.z, 0.0f, 0.1f, 20.0f, 0.01f);
if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_6016040) - 1)) {
if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_6016040) - 1)) {
D_i5_801BE320[3]++;
}
func_i5_8019A198(actor);
@@ -4375,7 +4277,7 @@ void func_i5_801A7E7C(Actor* actor) {
Math_SmoothStepToAngle(&actor->obj.rot.y, 0.0f, 0.1f, 20.0f, 0.01f);
Math_SmoothStepToAngle(&actor->obj.rot.x, 0.0f, 0.1f, 20.0f, 0.01f);
Math_SmoothStepToAngle(&actor->obj.rot.z, 0.0f, 0.1f, 20.0f, 0.01f);
if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_6016040) - 1)) {
if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_6016040) - 1)) {
D_i5_801BE320[3]++;
}
func_i5_8019A198(actor);
@@ -4385,7 +4287,7 @@ void func_i5_801A7E7C(Actor* actor) {
D_i5_801BE320[8] = 1;
if (actor->timer_0BC == 0) {
actor->vel.y = 0.0f;
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603677C);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C);
D_i5_801BE320[3] = 0;
D_i5_801BE320[2] = 1;
D_i5_801BE320[31] = 30;
@@ -4447,7 +4349,7 @@ void func_i5_801A7E7C(Actor* actor) {
Math_SmoothStepToAngle(&actor->obj.rot.z, 0.0f, 0.1f, 20.0f, 0.01f);
Math_SmoothStepToF(&actor->obj.pos.z, gPlayer[0].unk_138 - 250.0f, 0.1f, 15.0f, 0.01f);
Math_SmoothStepToF(&actor->obj.pos.y, 250.0f, 0.1f, 10.0f, 0.01f);
if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_6015C24) - 1)) {
if (D_i5_801BE320[3] < (Animation_GetFrameCount(&D_MA_6015C24) - 1)) {
D_i5_801BE320[3]++;
}
func_i5_8019A198(actor);
@@ -4525,7 +4427,7 @@ void func_i5_801A7E7C(Actor* actor) {
}
if (actor->timer_0BC == 0) {
Audio_KillSfxBySourceAndId(actor->sfxSource, 0x19006035);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603677C);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_603677C);
D_i5_801BE320[3] = 0;
D_i5_801BE320[2] = 1;
D_i5_801BE320[31] = 30;
@@ -4736,15 +4638,15 @@ void func_i5_801A7E7C(Actor* actor) {
switch (D_i5_801BE320[2]) {
case 1:
temp_a3 = Animation_GetFrameData(&D_600CD18, D_i5_801BE320[3], spD4);
temp_a3 = Animation_GetFrameData(&D_MA_600CD18, D_i5_801BE320[3], spD4);
Math_SmoothStepToVec3fArray(spD4, D_i5_801BE430, 1, temp_a3, 0.2f, 100.0f, 0.01f);
break;
case 2:
temp_a3 = Animation_GetFrameData(&D_601D188, D_i5_801BE320[3], spD4);
temp_a3 = Animation_GetFrameData(&D_MA_601D188, D_i5_801BE320[3], spD4);
Math_SmoothStepToVec3fArray(spD4, D_i5_801BE430, 1, temp_a3, 0.15f, 100.0f, 0.01f);
break;
case 3:
temp_a3 = Animation_GetFrameData(&D_6017714, D_i5_801BE320[3], spD4);
temp_a3 = Animation_GetFrameData(&D_MA_6017714, D_i5_801BE320[3], spD4);
if (D_i5_801BE320[31] != 0) {
Math_SmoothStepToVec3fArray(spD4, D_i5_801BE430, 1, temp_a3, 0.1f, 100.0f, 0.01f);
} else {
@@ -4752,19 +4654,19 @@ void func_i5_801A7E7C(Actor* actor) {
}
break;
case 4:
temp_a3 = Animation_GetFrameData(&D_6016B2C, D_i5_801BE320[3], spD4);
temp_a3 = Animation_GetFrameData(&D_MA_6016B2C, D_i5_801BE320[3], spD4);
Math_SmoothStepToVec3fArray(spD4, D_i5_801BE430, 1, temp_a3, 0.2f, 50.0f, 0.01f);
break;
case 5:
temp_a3 = Animation_GetFrameData(&D_60163F0, D_i5_801BE320[3], spD4);
temp_a3 = Animation_GetFrameData(&D_MA_60163F0, D_i5_801BE320[3], spD4);
Math_SmoothStepToVec3fArray(spD4, D_i5_801BE430, 1, temp_a3, 0.2f, 100.0f, 0.01f);
break;
case 6:
temp_a3 = Animation_GetFrameData(&D_6016040, D_i5_801BE320[3], spD4);
temp_a3 = Animation_GetFrameData(&D_MA_6016040, D_i5_801BE320[3], spD4);
Math_SmoothStepToVec3fArray(spD4, D_i5_801BE430, 1, temp_a3, 0.1f, 50.0f, 0.01f);
break;
case 7:
temp_a3 = Animation_GetFrameData(&D_6015C24, D_i5_801BE320[3], spD4);
temp_a3 = Animation_GetFrameData(&D_MA_6015C24, D_i5_801BE320[3], spD4);
Math_SmoothStepToVec3fArray(spD4, D_i5_801BE430, 1, temp_a3, 0.1f, 50.0f, 0.01f);
break;
}
@@ -4926,9 +4828,9 @@ void func_i5_801AC294(Actor* actor) {
Matrix_Translate(gCalcMatrix, actor->fwork[25], 0.0f, 0.0f, 1);
Matrix_RotateY(gCalcMatrix, actor->fwork[26] * M_DTOR, 1);
Matrix_RotateX(gCalcMatrix, actor->fwork[29] * M_DTOR, 1);
Animation_GetFrameData(&D_601EA28, D_i5_801BE320[3], D_i5_801BE430);
Animation_GetFrameData(&D_MA_601EA28, D_i5_801BE320[3], D_i5_801BE430);
}
Animation_DrawSkeleton(3, D_600D1E4, D_i5_801BE430, func_i5_801ABC14, func_i5_801AC1C0, actor, gCalcMatrix);
Animation_DrawSkeleton(3, D_MA_600D1E4, D_i5_801BE430, func_i5_801ABC14, func_i5_801AC1C0, actor, gCalcMatrix);
}
void func_i5_801AC42C(s32 arg0) {
@@ -4943,7 +4845,7 @@ void func_i5_801AC438(Actor* actor) {
if (actor->iwork[1] != 0) {
Radio_PlayMessage(gMsg_ID_17420, RCID_BOSS_MACBETH);
AUDIO_PLAY_SFX(0x19034066, actor->sfxSource, 4);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6035A94);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_MA_6035A94);
actor->state += 1;
}
func_i5_8019A830(actor);
@@ -5007,7 +4909,7 @@ void func_i5_801AC754(Player* player) {
switch (player->unk_1D0) {
case 0:
var_s0 = D_80178310 = SEGMENTED_TO_VIRTUAL(D_6035678);
var_s0 = D_80178310 = SEGMENTED_TO_VIRTUAL(D_MA_6035678);
for (i = 0; var_s0->id != OBJ_INVALID; i++, var_s0++) {
Object_Load(var_s0, 4000.0f, -4000.0f, 4000.0f, -4000.0f);
@@ -5150,7 +5052,7 @@ void func_i5_801ACF6C(void) {
void func_i5_801ACFBC(void) {
ObjectInit* var_s0;
for (var_s0 = D_80178310 = SEGMENTED_TO_VIRTUAL(D_60357CC); var_s0->id != OBJ_INVALID; var_s0++) {
for (var_s0 = D_80178310 = SEGMENTED_TO_VIRTUAL(D_MA_60357CC); var_s0->id != OBJ_INVALID; var_s0++) {
Object_Load(var_s0, 4000.0f, -4000.0f, 4000.0f, -4000.0f);
}
}
@@ -5158,7 +5060,7 @@ void func_i5_801ACFBC(void) {
void func_i5_801AD080(void) {
ObjectInit* var_s0;
for (var_s0 = D_80178310 = SEGMENTED_TO_VIRTUAL(D_6035920); var_s0->id != OBJ_INVALID; var_s0++) {
for (var_s0 = D_80178310 = SEGMENTED_TO_VIRTUAL(D_MA_6035920); var_s0->id != OBJ_INVALID; var_s0++) {
Object_Load(var_s0, 4000.0f, -4000.0f, 4000.0f, -4000.0f);
}
}
@@ -5482,7 +5384,7 @@ void func_i5_801AE2C0(Actor* actor) {
gDPSetEnvColor(gMasterDisp++, 255, 48, 0, actor->iwork[0]);
Matrix_Scale(gGfxMatrix, 1.0f, actor->fwork[2], 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6013060);
gSPDisplayList(gMasterDisp++, D_MA_6013060);
RCP_SetupDL(&gMasterDisp, 0x43);
Matrix_Scale(gGfxMatrix, 1.0f, actor->fwork[2], 1.0f, 1);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 53, 53, 53, 255 - actor->iwork[0]);
@@ -5497,7 +5399,7 @@ void func_i5_801AE2C0(Actor* actor) {
actor->iwork[7]--;
}
}
gSPDisplayList(gMasterDisp++, D_600D480);
gSPDisplayList(gMasterDisp++, D_MA_600D480);
}
}
@@ -5698,7 +5600,7 @@ void func_i5_801AEC04(Actor* actor) {
}
void func_i5_801AEEFC(Actor* actor) {
gSPDisplayList(gMasterDisp++, D_6015510);
gSPDisplayList(gMasterDisp++, D_MA_6015510);
Matrix_Scale(gGfxMatrix, actor->fwork[0], actor->fwork[2], 1.0f, 1);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, -10.0f, 0.0f, 1);
@@ -5706,7 +5608,7 @@ void func_i5_801AEEFC(Actor* actor) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 111, 175, 64, actor->fwork[1]);
gDPSetEnvColor(gMasterDisp++, 255, 255, 208, actor->fwork[1]);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6012F50);
gSPDisplayList(gMasterDisp++, D_MA_6012F50);
Matrix_Pop(&gGfxMatrix);
}
src/overlays/ovl_menu/fox_title.c
+1 -1
View File
@@ -3,7 +3,7 @@
* System: Title
* Description: Starfox Title Handler
*/
#include "prevent_bss_reordering.h"
// #include "prevent_bss_reordering.h"
#include "prevent_bss_reordering2.h"
#include "global.h"
#include "assets.h"