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

export configuration for ast_corneria (#184)

Browse Source 
* complete?

* done

* remove header

* ast_corneria.yaml prepared

* progress

* more progress

* progress

* finished?

* fix duplicated symbol

* matchpoint

* add torch.hash.yml to git ignore

* progress replacing symbol use

* Ready ?

* fix bss reordering issues

* remove redundant entry in gitignore

* remove externs

* we don't need these anymore, libultra is finished
This commit is contained in:
Alejandro Asenjo Nitti
2024-03-29 14:09:14 -05:00
committed by GitHub
parent 09541d8ad3
commit 7ee062df9e
25 changed files with 748 additions and 1348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/yaml/us/ast_corneria.yaml
+569
View File
File diff suppressed because it is too large Load Diff
include/assets.h
-107
View File
@@ -16,7 +16,6 @@
* ast_katina, ast_macbeth, ast_title, ast_map, ast_training
*/
extern Gfx D_60005B0[]; // fox_bg
extern Gfx D_6000E00[]; // fox_edata_1C
extern Gfx D_6001360[]; // fox_bg, fox_demo, fox_edata_1C. Possible symbol collision
extern Gfx D_6001530[]; // fox_360, fox_demo, fox_ka
extern Gfx D_6001A60[]; // fox_effect
@@ -28,15 +27,12 @@ extern Gfx D_6002E60[]; // fox_bg
extern Gfx D_6003000[]; // fox_edata_1C
extern Gfx D_60030F0[]; // fox_edata_1C
extern Gfx D_60038E0[];
extern u16 D_60038F8[];
extern Gfx D_6004170[];
extern Vtx D_6004500[];
extern Gfx D_60046F0[];
extern Gfx D_6004900[];
extern u16 D_6005710[];
extern Gfx D_6005780[];
extern Gfx D_6005880[];
extern Gfx D_60059F0[];
extern Gfx D_6006140[];
extern Gfx D_6006310[];
extern Animation D_600636C;
@@ -44,7 +40,6 @@ extern Limb* D_6006558[];
extern Gfx D_60066D0[];
extern u16 D_6006750[];
extern EnvSettings D_6006A60;
extern Gfx D_6006A80[];
extern Gfx D_6006BE0[];
extern u16 D_6006EA0[];
extern Gfx D_6006F50[];
@@ -83,7 +78,6 @@ extern u16 D_600C6A0[];
extern Gfx D_600C740[];
extern Vtx D_600C780[];
extern Gfx D_600CAA0[];
extern u16 D_600CBD8[];
extern Gfx D_600D190[];
extern Animation D_600D3DC;
extern u16 D_600D5C0[];
@@ -133,8 +127,6 @@ extern u16 D_6010198[];
extern CollisionPoly D_6010294[];
extern u8 D_60106B0[];
extern Gfx D_6010960[];
extern Gfx D_6010A50[];
extern Gfx D_6010E00[];
extern u8 D_6010FA0[];
extern EnvSettings D_KA_6011000;
extern f32 D_6011058[];
@@ -149,33 +141,21 @@ extern f32 D_6011C80[];
extern u8 D_6012310[];
extern u8 D_60123F0[];
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_6013B50[];
extern u8 D_6014140[];
extern Gfx D_60143E0[];
extern Gfx D_6014500[];
extern u16 D_6014510[];
extern Animation D_6014658;
extern Gfx D_6014670[];
extern u16 D_60147C0[];
extern u8 D_60147E0[];
extern u8 D_60148B0[];
extern Gfx D_60148D0[];
extern Gfx D_6014A20[];
extern Gfx D_6014B50[];
extern EnvSettings D_VE2_6014D50;
extern CollisionPoly D_6014FEC[];
extern Gfx D_60153B0[];
extern u16 D_6015430[];
extern Gfx D_6015F00[];
extern Gfx D_6016270[];
extern Vec3s D_6016374[];
extern Gfx D_60164F0[];
extern Gfx D_6016580[];
extern f32 D_601668C[];
extern f32 D_60166F4[];
extern f32 D_6016714[];
@@ -185,21 +165,16 @@ extern Gfx D_6017370[];
extern Gfx D_6018450[];
extern Gfx D_6018C00[]; // possible collision
extern Gfx D_6018D40[];
extern Gfx D_6018E80[];
extern Gfx D_601A7D0[];
extern Gfx D_601AE40[];
extern u16* D_VE1_601B1E4[];
extern f32 D_601B4C4[];
extern f32 D_601B4E0[];
extern f32 D_601B4FC[];
extern f32 D_601B518[];
extern Gfx D_601B560[];
extern f32 D_601B584[];
extern f32 D_601B5F4[];
extern Gfx D_601B640[];
extern f32 D_601B644[];
extern f32 D_601B678[];
extern u16 D_601B6C0[];
extern f32 D_601B6C4[];
extern f32 D_F32_601B710[];
extern f32 D_601B75C[];
@@ -208,11 +183,9 @@ extern f32 D_601B830[];
extern f32 D_601B868[];
extern f32 D_601B8A0[];
extern f32 D_601B8D8[];
extern Gfx D_601BEC0[];
extern Gfx D_601C7C0[];
extern Gfx D_601C820[];
extern u16 D_601C8E0[];
extern Gfx D_601C9B0[];
extern u8 D_601D750[];
extern u16 D_601D800[];
extern u16 D_601DB50[];
@@ -220,18 +193,13 @@ extern Gfx D_601E150[];
extern u16 D_601E1E8[];
extern Animation D_601E8C4;
extern Limb* D_601E9D0[];
extern Gfx D_601EAA0[];
extern EnvSettings D_SO_601F1F0;
extern Gfx D_601F500[];
extern Gfx D_601F5A0[];
extern Animation D_601F874;
extern Limb* D_601F920[];
extern Gfx D_601FCB0[];
extern Gfx D_601FF80[];
extern Gfx D_60200E0[];
extern Gfx D_6020760[];
extern Gfx D_6020A30[];
extern Gfx D_6020B40[];
extern u16* D_SO_600631C[];
extern Gfx D_6020E60[];
extern u16 D_6020F60[];
@@ -239,21 +207,11 @@ extern u16 D_6022760[];
extern Gfx D_6022920[];
extern u16 D_60229A4[];
extern f32 D_60231A4[];
extern Gfx D_6023AC0[];
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 u16 D_6026420[];
extern EnvSettings D_ZO_60266D0;
extern EnvSettings D_ME_6026C80;
extern u16 D_6027340[];
extern u16 D_6028260[];
extern u16 D_6028A60[];
extern Animation D_6029528;
extern Limb* D_6029674[];
extern Gfx D_602A720[];
extern u16* D_ZO_602AAC0[];
extern u16 D_602AC50[];
@@ -277,14 +235,7 @@ extern f32 D_602C2B0[];
extern u16 D_602C2CC[];
extern Triangle D_602CACC[];
extern Vec3f D_602CB80[];
extern Gfx D_602D5F0[];
extern Gfx D_602DA20[];
extern Gfx D_602DCA0[];
extern Gfx D_602E080[];
extern Gfx D_602E380[];
extern Gfx D_602E570[];
extern Gfx D_602E7A0[];
extern Gfx D_602E9E0[];
extern u16* D_ME_602F3AC[];
extern f32 D_602F638[];
extern f32 D_602F684[];
@@ -294,7 +245,6 @@ extern f32 D_602F708[];
extern f32 D_602F724[];
extern f32 D_602F740[];
extern f32 D_602F75C[];
extern Gfx D_602F7C0[];
extern f32 D_602FA50[];
extern CollisionPoly D_602FA9C[];
extern Vec3s D_60300C8[];
@@ -304,31 +254,8 @@ extern CollisionPoly D_60305DC[];
extern Vec3s D_603184C[];
extern Gfx D_60320E0[];
extern Gfx D_6032580[];
extern Gfx D_6032BC0[];
extern Gfx D_6033000[];
extern Vec3s D_6033E08[];
extern Gfx D_6034B90[];
extern Gfx D_6035DA0[];
extern Gfx D_6035F10[];
extern Gfx D_60361F0[]; // possible collision
extern Gfx D_60363B0[];
extern Gfx D_6036840[];
extern Gfx D_6036CD0[];
extern EnvSettings D_CO_6037160;
extern Gfx D_6037CF0[];
extern ObjectInit D_603B074[];
extern u16* D_CO_603D9E8[];
extern f32 D_603DCA4[];
extern f32 D_603DD40[];
extern f32 D_603DDF0[];
extern f32 D_603DE8C[];
extern f32 D_603DEF4[];
extern f32 D_603DF8C[];
extern f32 D_603DFDC[];
extern f32 D_603E014[];
extern f32 D_603E030[];
extern f32 D_603E09C[];
extern f32 D_603E0EC[];
extern Gfx D_60084C0[];
extern Gfx D_6008D40[];
extern Gfx D_6007C40[];
@@ -338,40 +265,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[];
extern f32 D_603E21C[];
extern f32 D_603E3E0[];
extern f32 D_603E468[];
extern f32 D_603E484[];
extern f32 D_603E4A0[];
extern f32 D_603E4A4[];
extern f32 D_603E4DC[];
extern f32 D_603E514[];
extern f32 D_603E54C[];
extern f32 D_603E598[];
extern f32 D_603E5B4[];
extern f32 D_603E5D0[];
extern f32 D_603E604[];
extern f32 D_603E620[];
extern f32 D_603E714[];
extern f32 D_603E748[];
extern f32 D_603E7C4[];
extern f32 D_603E840[];
extern f32 D_603E88C[];
extern f32 D_603E8A8[];
extern f32 D_603E98C[];
extern f32 D_603E9EC[];
extern f32 D_603EA08[];
extern f32 D_603EA74[];
extern f32 D_603EAE0[];
extern f32 D_603EB0C[];
extern u16 D_603EB38[];
extern Triangle D_603F338[];
extern Vec3f D_603F388[];
extern Triangle D_603F40C[];
extern Vec3f D_603F4E4[];
extern Gfx D_6041070[];
#endif // ASSETS_H
include/assets/ast_corneria.h
-8
View File
@@ -1,8 +0,0 @@
#ifndef AST_CORNERIA_H
#define AST_CORNERIA_H
#include "gfx.h"
#include "sf64object.h"
#include "structs.h"
#endif
include/fox_edisplay_assets.h
-2
View File
@@ -17,7 +17,6 @@ extern Gfx D_602DE70[];
extern Gfx D_602DC40[];
extern Gfx D_602D830[];
extern Gfx D_602D340[];
extern Gfx D_6031280[];
extern Gfx D_6031130[];
extern Gfx D_6030850[];
extern Gfx D_6030FD0[];
@@ -56,7 +55,6 @@ extern Gfx D_60165D0[];
extern Gfx D_6016880[];
extern Gfx D_6016B50[];
extern Gfx D_6000C40[];
extern Gfx D_6018E80[];
extern Gfx D_601F620[];
extern Gfx D_601F420[];
extern Gfx D_6018C80[];
include/fox_enmy2_assets.h
-1
View File
@@ -5,7 +5,6 @@
// Displaylists
extern Gfx D_6011F90[];
extern Gfx D_601F2A0[];
extern Gfx D_6017B60[];
extern Gfx D_6004D00[];
include/fox_enmy_assets.h
-1
View File
@@ -3,7 +3,6 @@
#include "sf64object.h"
extern ObjectInit D_CO_60371A4[];
extern ObjectInit D_ME_6026CC4[];
extern ObjectInit D_VE1_6007E74[];
extern ObjectInit D_SO_601F234[];
linker_scripts/us/undefined_syms.ld
-155
View File
@@ -129,7 +129,6 @@ D_500A5F0 = 0x0500A5F0;
D_500A6E0 = 0x0500A6E0;
D_500A7D0 = 0x0500A7D0;
D_6000E00 = 0x06000E00;
D_6001360 = 0x06001360;
D_KA_60012A0 = 0x060012A0;
D_ZO_60012A0 = 0x060012A0;
@@ -165,7 +164,6 @@ D_TI_6006890_Gfx = 0x06006890;
D_TI_60068BC = 0x060068BC;
D_TI_60068F0 = 0x060068F0;
D_TI_6006A3C = 0x06006A3C;
D_6006A80 = 0x06006A80;
D_TI_6006BF0 = 0x06006BF0;
D_TI_6006C44 = 0x06006C44;
D_6006F50 = 0x06006F50;
@@ -203,8 +201,6 @@ D_600FFC0 = 0x0600FFC0;
D_600FFE0 = 0x0600FFE0;
D_6010294 = 0x06010294;
D_6010960 = 0x06010960;
D_6010A50 = 0x06010A50;
D_6010E00 = 0x06010E00;
D_6011058 = 0x06011058;
D_601115C = 0x0601115C;
D_601115C = 0x0601115C;
@@ -219,38 +215,23 @@ D_AQ_6011EE0 = 0x06011EE0;
D_AQ_60120F0 = 0x060120F0;
D_MA_6012C00 = 0x06012C00;
D_6012C00_Anim = 0x06012C00;
D_60132B0 = 0x060132B0;
D_60137B0 = 0x060137B0;
D_MA_6013960 = 0x06013960;
D_6013B50 = 0x06013B50;
D_60143E0 = 0x060143E0;
D_6014500 = 0x06014500;
D_6014670 = 0x06014670;
D_6014A20 = 0x06014A20;
D_6014B50 = 0x06014B50;
D_6014FEC = 0x06014FEC;
D_60153B0 = 0x060153B0;
D_AQ_6015730 = 0x06015730;
D_6015CE0 = 0x06015CE0;
D_6015F00 = 0x06015F00;
D_AQ_6015FF0 = 0x06015FF0;
D_AQ_6015DD0 = 0x06015DD0;
D_6016270 = 0x06016270;
D_6016374 = 0x06016374;
D_60164F0 = 0x060164F0;
D_6016580 = 0x06016580;
D_601668C = 0x0601668C;
D_60166F4 = 0x060166F4;
D_6016714 = 0x06016714;
D_6018450 = 0x06018450;
D_6018C00 = 0x06018C00;
D_6018E80 = 0x06018E80;
D_601A7D0 = 0x0601A7D0;
D_MA_601B0D0 = 0x0601B0D0;
D_601B4E0 = 0x0601B4E0;
D_601B4FC = 0x0601B4FC;
D_601B518 = 0x0601B518;
D_601B560 = 0x0601B560;
D_601B584 = 0x0601B584;
D_601B5F4 = 0x0601B5F4;
D_601B644 = 0x0601B644;
@@ -264,12 +245,8 @@ D_601B830 = 0x0601B830;
D_601B868 = 0x0601B868;
D_601B8A0 = 0x0601B8A0;
D_601B8D8 = 0x0601B8D8;
D_601BEC0 = 0x0601BEC0;
D_601C9B0 = 0x0601C9B0;
D_AQ_601DE60 = 0x0601DE60;
D_MA_601F1D0 = 0x0601F1D0;
D_601F500 = 0x0601F500;
D_601F5A0 = 0x0601F5A0;
D_601FCB0 = 0x0601FCB0;
D_6022340 = 0x06022340;
D_AQ_6022110 = 0x06022110;
@@ -278,7 +255,6 @@ D_MA_60238F0 = 0x060238F0;
D_60239E0 = 0x060239E0;
D_6023730 = 0x06023730;
D_MA_6024010 = 0x06024010;
D_60244A0 = 0x060244A0;
D_60247E0 = 0x060247E0;
D_6024AC0 = 0x06024AC0;
D_6026C90 = 0x06026C90;
@@ -309,16 +285,10 @@ D_602C2B0 = 0x0602C2B0;
D_602CACC = 0x0602CACC;
D_602CB80 = 0x0602CB80;
D_MA_602CB80 = 0x0602CB80;
D_602D5F0 = 0x0602D5F0;
D_602DAD0 = 0x0602DAD0;
D_MA_602DAE0 = 0x0602DAE0;
D_MA_602DB80 = 0x0602DB80;
D_MA_602DC20 = 0x0602DC20;
D_602DCA0 = 0x0602DCA0;
D_602E080 = 0x0602E080;
D_602E570 = 0x0602E570;
D_602E7A0 = 0x0602E7A0;
D_602E9E0 = 0x0602E9E0;
D_602F684 = 0x0602F684;
D_602F6A0 = 0x0602F6A0;
D_602F6EC = 0x0602F6EC;
@@ -326,7 +296,6 @@ D_602F708 = 0x0602F708;
D_602F724 = 0x0602F724;
D_602F740 = 0x0602F740;
D_602F75C = 0x0602F75C;
D_602F7C0 = 0x0602F7C0;
D_602FA50 = 0x0602FA50;
D_602FA9C = 0x0602FA9C;
D_602FF60 = 0x0602FF60;
@@ -392,10 +361,8 @@ D_MA_6035A48 = 0x06035A48;
D_MA_6035AE0 = 0x06035AE0;
D_MA_6035D9C = 0x06035D9C;
D_MA_6035E04 = 0x06035E04;
D_6035F10 = 0x06035F10;
D_MA_60360C0 = 0x060360C0;
D_MA_6036154 = 0x06036154;
D_60361F0 = 0x060361F0;
D_MA_6036204 = 0x06036204;
D_MA_603626C = 0x0603626C;
D_MA_6036288 = 0x06036288;
@@ -426,50 +393,6 @@ D_MA_60368E0 = 0x060368E0;
D_MA_6036930 = 0x06036930;
D_MA_603694C = 0x0603694C;
D_MA_6036968 = 0x06036968;
D_603DCA4 = 0x0603DCA4;
D_603DD40 = 0x0603DD40;
D_603DDF0 = 0x0603DDF0;
D_603DE8C = 0x0603DE8C;
D_603DEF4 = 0x0603DEF4;
D_603DF8C = 0x0603DF8C;
D_603DFDC = 0x0603DFDC;
D_603E014 = 0x0603E014;
D_603E030 = 0x0603E030;
D_603E09C = 0x0603E09C;
D_603E0EC = 0x0603E0EC;
D_603E118 = 0x0603E118;
D_603E14C = 0x0603E14C;
D_603E1B4 = 0x0603E1B4;
D_603E21C = 0x0603E21C;
D_603E3E0 = 0x0603E3E0;
D_603E468 = 0x0603E468;
D_603E484 = 0x0603E484;
D_603E4A0 = 0x0603E4A0;
D_603E4A4 = 0x0603E4A4;
D_603E4DC = 0x0603E4DC;
D_603E514 = 0x0603E514;
D_603E54C = 0x0603E54C;
D_603E598 = 0x0603E598;
D_603E5B4 = 0x0603E5B4;
D_603E5D0 = 0x0603E5D0;
D_603E604 = 0x0603E604;
D_603E620 = 0x0603E620;
D_603E714 = 0x0603E714;
D_603E748 = 0x0603E748;
D_603E7C4 = 0x0603E7C4;
D_603E840 = 0x0603E840;
D_603E88C = 0x0603E88C;
D_603E8A8 = 0x0603E8A8;
D_603E98C = 0x0603E98C;
D_603E9EC = 0x0603E9EC;
D_603EA08 = 0x0603EA08;
D_603EA74 = 0x0603EA74;
D_603EAE0 = 0x0603EAE0;
D_603EB0C = 0x0603EB0C;
D_603F338 = 0x0603F338;
D_603F388 = 0x0603F388;
D_603F40C = 0x0603F40C;
D_603F4E4 = 0x0603F4E4;
D_6049F80 = 0x06049F80;
D_604A190 = 0x0604A190;
D_604A400 = 0x0604A400;
@@ -480,7 +403,6 @@ D_TI_60034E0 = 0x060034E0;
D_TI_6003580 = 0x06003580;
D_TI_6003620 = 0x06003620;
D_TI_60036C0 = 0x060036C0;
D_CO_6037160 = 0x06037160;
D_601E424 = 0x0601E424;
D_6026C80 = 0x06026C80;
D_6029BE4 = 0x06029BE4;
@@ -718,9 +640,6 @@ D_602DE70 = 0x0602DE70;
D_602DC40 = 0x0602DC40;
D_602D830 = 0x0602D830;
D_602D340 = 0x0602D340;
D_6031280 = 0x06031280;
D_6031130 = 0x06031130;
D_6030850 = 0x06030850;
D_602DD40 = 0x0602DD40;
D_6033AF0 = 0x06033AF0;
D_60186E0 = 0x060186E0;
@@ -744,9 +663,6 @@ D_602DE70 = 0x0602DE70;
D_602DC40 = 0x0602DC40;
D_602D830 = 0x0602D830;
D_602D340 = 0x0602D340;
D_6031280 = 0x06031280;
D_6031130 = 0x06031130;
D_6030850 = 0x06030850;
D_602DD40 = 0x0602DD40;
D_6033AF0 = 0x06033AF0;
D_60186E0 = 0x060186E0;
@@ -782,7 +698,6 @@ D_60165D0 = 0x060165D0;
D_6016880 = 0x06016880;
D_6016B50 = 0x06016B50;
D_6000C40 = 0x06000C40;
D_6018E80 = 0x06018E80;
D_601F620 = 0x0601F620;
D_601F420 = 0x0601F420;
D_6018C80 = 0x06018C80;
@@ -827,7 +742,6 @@ D_6026DA0 = 0x06026DA0;
D_6026D10 = 0x06026D10;
D_6026C80 = 0x06026C80;
D_ME_6026C80 = 0x06026C80;
D_CO_6000000 = 0x06000000;
D_ME_6000000 = 0x06000000;
D_FO_6000000 = 0x06000000;
D_KA_6000000 = 0x06000000;
@@ -990,7 +904,6 @@ D_1010920 = 0x01010920;
D_1010970 = 0x01010970;
// fox_enmy
D_CO_60371A4 = 0x0060371A4;
D_ME_6026CC4 = 0x006026CC4;
D_SX_602A164 = 0x00602A164;
D_A6_6023F64 = 0x006023F64;
@@ -1009,7 +922,6 @@ D_BO_600FF74 = 0x00600FF74;
D_VE2_600FF74 = 0x006014D94;
// fox_enmy2
D_6011F90 = 0x06011F90;
D_601F2A0 = 0x0601F2A0;
D_A6_6016190 = 0x06016190;
D_SX_6023500 = 0x06023500;
@@ -1485,16 +1397,13 @@ D_6003090 = 0x6003090;
D_MA_6003370 = 0x6003370;
D_A6_60038C0 = 0x60038C0;
D_60038E0 = 0x60038E0;
D_60038F8 = 0x60038F8;
D_6004380 = 0x6004380;
D_MA_6004440 = 0x6004440;
D_6004500 = 0x6004500;
D_60046F0 = 0x60046F0;
D_6004900 = 0x6004900;
D_A6_6005700 = 0x6005700;
D_6005710 = 0x6005710;
D_AQ_6005954 = 0x6005954;
D_60059F0 = 0x60059F0;
D_AQ_6005A80 = 0x6005A80;
D_TI_600631C = 0x600631C;
D_6006360 = 0x6006360;
@@ -1590,7 +1499,6 @@ D_600C6A0 = 0x600C6A0;
D_600C740 = 0x600C740;
D_600C780 = 0x600C780;
D_600CAA0 = 0x600CAA0;
D_600CBD8 = 0x600CBD8;
D_MA_600CD18 = 0x600CD18;
D_600CD60 = 0x600CD60;
D_600CDC0 = 0x600CDC0;
@@ -1743,7 +1651,6 @@ D_A6_6019730 = 0x6019730;
D_6019738 = 0x6019738;
D_AQ_6019880 = 0x6019880;
D_601996C = 0x601996C;
D_60199D0 = 0x60199D0;
D_6019E18 = 0x6019E18;
D_AQ_6019E80 = 0x6019E80;
D_6019EB0 = 0x6019EB0;
@@ -1763,8 +1670,6 @@ D_VE1_601B1E4 = 0x601B1E4;
D_A6_601B2B0 = 0x601B2B0;
D_601B4B0 = 0x601B4B0;
D_601B4C4 = 0x601B4C4;
D_601B640 = 0x601B640;
D_601B6C0 = 0x601B6C0;
D_601BAD0 = 0x601BAD0;
D_A6_601BB40 = 0x601BB40;
D_601BCC0 = 0x601BCC0;
@@ -1796,7 +1701,6 @@ D_601E8C4 = 0x601E8C4;
D_601E9A0 = 0x601E9A0;
D_601E9D0 = 0x601E9D0;
D_MA_601EA28 = 0x601EA28;
D_601EAA0 = 0x601EAA0;
D_MA_601EAB0 = 0x601EAB0;
D_MA_601EBBC = 0x601EBBC;
D_AQ_601EC68 = 0x601EC68;
@@ -1809,24 +1713,13 @@ D_601FBC4 = 0x601FBC4;
D_601FC90 = 0x601FC90;
D_601FF80 = 0x601FF80;
D_60200E0 = 0x60200E0;
D_SX_60206DC = 0x60206DC;
D_6020760 = 0x6020760;
D_6020810 = 0x6020810;
D_6020A30 = 0x6020A30;
D_AQ_6020A40 = 0x6020A40;
D_6020B40 = 0x6020B40;
D_SX_6020C68 = 0x6020C68;
D_AQ_6020C6C = 0x6020C6C;
D_SX_6020D20 = 0x6020D20;
D_SO_600631C = 0x6020DD0;
D_6020E60 = 0x6020E60;
D_6020F60 = 0x6020F60;
D_SX_6020FB0 = 0x6020FB0;
D_6021ABC = 0x6021ABC;
D_6021B88 = 0x6021B88;
D_SX_6021ED0 = 0x6021ED0;
D_AQ_602201C = 0x602201C;
D_AQ_60220E8 = 0x60220E8;
D_MA_6022200 = 0x6022200;
D_MA_60223C0 = 0x60223C0;
D_MA_6022450 = 0x6022450;
@@ -1840,83 +1733,50 @@ D_60231A4 = 0x60231A4;
D_MA_6023228 = 0x6023228;
D_MA_6023388 = 0x6023388;
D_60236F0 = 0x60236F0;
D_AQ_6023780 = 0x6023780;
D_6023810 = 0x6023810;
D_AQ_602390C = 0x602390C;
D_MA_60239D0 = 0x60239D0;
D_6023AC0 = 0x6023AC0;
D_6023D50 = 0x6023D50;
D_60240B0 = 0x60240B0;
D_6024220 = 0x6024220;
D_60245E0 = 0x60245E0;
D_MA_6024670 = 0x6024670;
D_60246F8 = 0x60246F8;
D_AQ_6024A50 = 0x6024A50;
D_6024AD0 = 0x6024AD0;
D_6024B60 = 0x6024B60;
D_AQ_6024F80 = 0x6024F80;
D_AQ_602512C = 0x602512C;
D_MA_60251A0 = 0x60251A0;
D_MA_60253E0 = 0x60253E0;
D_6025500 = 0x6025500;
D_MA_60257B0 = 0x60257B0;
D_MA_6025850 = 0x6025850;
D_MA_6025B50 = 0x6025B50;
D_MA_6025CA0 = 0x6025CA0;
D_MA_6025DAC = 0x6025DAC;
D_6025E60 = 0x6025E60;
D_AQ_60260EC = 0x60260EC;
D_60263F0 = 0x60263F0;
D_AQ_60263F8 = 0x60263F8;
D_6026420 = 0x6026420;
D_MA_6026860 = 0x6026860;
D_MA_60269E0 = 0x60269E0;
D_MA_6027320 = 0x6027320;
D_6027340 = 0x6027340;
D_MA_602742C = 0x602742C;
D_MA_6027A04 = 0x6027A04;
D_MA_6027AF0 = 0x6027AF0;
D_MA_6027BF0 = 0x6027BF0;
D_MA_6027D40 = 0x6027D40;
D_MA_6027EB0 = 0x6027EB0;
D_A6_6027F50 = 0x6027F50;
D_6028260 = 0x6028260;
D_A6_6028454 = 0x6028454;
D_A6_6028578 = 0x6028578;
D_MA_60288A0 = 0x60288A0;
D_A6_60289FC = 0x60289FC;
D_6028A60 = 0x6028A60;
D_6029528 = 0x6029528;
D_6029674 = 0x6029674;
D_SX_6029890 = 0x6029890;
D_MA_6029890 = 0x6029890;
D_602991C = 0x602991C;
D_6029A48 = 0x6029A48;
D_602A520 = 0x602A520;
D_602A720 = 0x602A720;
D_602AA04 = 0x602AA04;
D_602AA7C = 0x602AA7C;
D_ZO_602AAC0 = 0x602AAC0;
D_602AB48 = 0x602AB48;
D_AQ_602AC28 = 0x602AC28;
D_AQ_602AC40 = 0x602AC40;
D_602AC50 = 0x602AC50;
D_AQ_602ACC0 = 0x602ACC0;
D_602B148 = 0x602B148;
D_AQ_602B4C0 = 0x602B4C0;
D_602BC18 = 0x602BC18;
D_602BC58 = 0x602BC58;
D_AQ_602BD60 = 0x602BD60;
D_602BE64 = 0x602BE64;
D_602C028 = 0x602C028;
D_AQ_602C030 = 0x602C030;
D_AQ_602C088 = 0x602C088;
D_602C0D0 = 0x602C0D0;
D_602C2CC = 0x602C2CC;
D_MA_602D380 = 0x602D380;
D_602D400 = 0x602D400;
D_602D5AC = 0x602D5AC;
D_602DA20 = 0x602DA20;
D_MA_602DCB8 = 0x602DCB8;
D_602E380 = 0x602E380;
D_AQ_602E584 = 0x602E584;
@@ -1954,18 +1814,13 @@ D_6032580 = 0x6032580;
D_SX_603265C = 0x603265C;
D_SX_6032768 = 0x6032768;
D_SX_60328CC = 0x60328CC;
D_60329C0 = 0x60329C0;
D_6032BC0 = 0x6032BC0;
D_6033000 = 0x6033000;
D_60338DC = 0x60338DC;
D_6034B90 = 0x6034B90;
D_603531C = 0x603531C;
D_MA_6035678 = 0x6035678;
D_MA_60357CC = 0x60357CC;
D_MA_6035920 = 0x6035920;
D_MA_60359AC = 0x60359AC;
D_MA_6035A94 = 0x6035A94;
D_6035DA0 = 0x6035DA0;
D_MA_6035DD0 = 0x6035DD0;
D_MA_6035E68 = 0x6035E68;
D_MA_6035ECC = 0x6035ECC;
@@ -1973,23 +1828,13 @@ D_MA_6035F30 = 0x6035F30;
D_MA_6035F94 = 0x6035F94;
D_MA_6035FF8 = 0x6035FF8;
D_MA_603605C = 0x603605C;
D_60361F0 = 0x60361F0;
D_6036278 = 0x6036278;
D_60363B0 = 0x60363B0;
D_MA_603648C = 0x603648C;
D_MA_6036520 = 0x6036520;
D_MA_603677C = 0x603677C;
D_MA_6036818 = 0x6036818;
D_6036840 = 0x6036840;
D_6036CD0 = 0x6036CD0;
D_6037CF0 = 0x6037CF0;
D_MA_60381D8 = 0x60381D8;
D_603B074 = 0x603B074;
D_CO_603D9E8 = 0x603D9E8;
D_603E748 = 0x603E748;
D_603E7C4 = 0x603E7C4;
D_603E924 = 0x603E924;
D_603EB38 = 0x603EB38;
D_6041070 = 0x6041070;
D_60447A0 = 0x60447A0;
D_6044820 = 0x6044820;
src/main/fox_A4290_colheaders.c
+5 -4
View File
@@ -3,6 +3,7 @@
#include "variables.h"
#include "assets.h"
#include "assets/ast_aquas.h"
#include "assets/ast_corneria.h"
#include "assets/ast_macbeth.h"
#include "assets/ast_sector_y.h"
#include "assets/ast_sector_z.h"
@@ -115,15 +116,15 @@ CollisionHeader2 D_800D2CA0[19] = {
{ -1220.0f, 0.0f, -1315.0f },
{ 1403.0f, 174.0f, 1308.0f },
13,
D_603F338,
D_603F388,
D_CO_603F338,
D_CO_603F388,
},
{
{ -1311.0f, 0.0f, -1120.0f },
{ 1266.0f, 1465.0f, 1266.0f },
36,
D_603F40C,
D_603F4E4,
D_CO_603F40C,
D_CO_603F4E4,
},
{
{ -435.0f, -10.0f, -435.0f },
src/main/fox_bg.c
+11 -10
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;
@@ -19,6 +19,7 @@ f32 D_80161394; // can be static
#include "assets/ast_bg_planet.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_sector_y.h"
@@ -326,7 +327,7 @@ void func_8003E1E8(void) {
Matrix_SetGfxMtx(&gMasterDisp);
switch (gCurrentLevel) {
case LEVEL_CORNERIA:
gSPDisplayList(gMasterDisp++, D_60059F0);
gSPDisplayList(gMasterDisp++, D_CO_60059F0);
break;
case LEVEL_VENOM_1:
gSPDisplayList(gMasterDisp++, D_60046F0);
@@ -336,7 +337,7 @@ void func_8003E1E8(void) {
Matrix_SetGfxMtx(&gMasterDisp);
switch (gCurrentLevel) {
case LEVEL_CORNERIA:
gSPDisplayList(gMasterDisp++, D_60059F0);
gSPDisplayList(gMasterDisp++, D_CO_60059F0);
break;
case LEVEL_VENOM_1:
gSPDisplayList(gMasterDisp++, D_60046F0);
@@ -875,24 +876,24 @@ void func_80040CE4(void) {
RCP_SetupDL_20(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
}
if (gLevelMode == LEVELMODE_ON_RAILS) {
gDPSetTextureImage(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, SEGMENTED_TO_VIRTUAL(D_601B6C0));
gDPSetTextureImage(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, SEGMENTED_TO_VIRTUAL(D_CO_601B6C0));
temp_s0 = fabsf(Math_ModF(2.0f * (D_80177CE8 * 0.2133333f), 128.0f));
temp_fv0 = Math_ModF((10000.0f - gPlayer[gPlayerNum].unk_0AC) * 0.32f, 128.0f);
gDPSetupTile(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, temp_fv0, temp_s0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, G_TX_NOLOD, G_TX_NOLOD);
switch (D_80161A88) {
case 0:
gDPLoadTileTexture(gMasterDisp++, D_601B6C0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
gDPLoadTileTexture(gMasterDisp++, D_CO_601B6C0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
gBgColor = 0x845; // 8, 8, 32
break;
case 1:
gDPLoadTileTexture(gMasterDisp++, D_6028260, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
gDPLoadTileTexture(gMasterDisp++, D_CO_6028260, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
gBgColor = 0x845; // 8, 8, 32
break;
case 2:
RCP_SetupDL_45(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 128);
gDPLoadTileTexture(gMasterDisp++, D_6028A60, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
gDPLoadTileTexture(gMasterDisp++, D_CO_6028A60, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32);
gBgColor = 0x190F; // 24, 32, 56
break;
}
@@ -900,12 +901,12 @@ void func_80040CE4(void) {
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -3000.0f, 1);
Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_601B640);
gSPDisplayList(gMasterDisp++, D_CO_601B640);
Matrix_Pop(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 3000.0f, 1);
Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_601B640);
gSPDisplayList(gMasterDisp++, D_CO_601B640);
} else {
D_80161A88 = 0;
gBgColor = 0x845; // 8, 8, 32
@@ -913,7 +914,7 @@ void func_80040CE4(void) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, D_800C9E64[i], 0.0f, D_800C9E74[i], 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_601EAA0);
gSPDisplayList(gMasterDisp++, D_CO_601EAA0);
Matrix_Pop(&gGfxMatrix);
}
}
src/main/fox_demo.c
-1
View File
@@ -28,7 +28,6 @@ extern f32 D_80178478;
extern Gfx D_6000D80[];
extern Gfx D_600BAA0[];
extern Gfx D_60132B0[];
extern Gfx D_6020810[];
extern Animation D_AQ_6020A40;
src/main/fox_edata_1C.c
+52 -51
View File
@@ -3,6 +3,7 @@
#include "assets/ast_vs_player.h"
#include "assets/ast_arwing.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_sector_y.h"
@@ -85,35 +86,35 @@ f32 D_800CC0F0[] = {
// clang-format off
ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_0, */ {(void*) D_6015F00, 0, (ObjectFunc) NULL, D_603E3E0, 800.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_1, */ {(void*) D_602E9E0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_2, */ {(void*) D_601BEC0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_3, */ {(void*) D_602E7A0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_4, */ {(void*) D_60244A0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_5, */ {(void*) D_602E570, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_6, */ {(void*) D_60132B0, 0, (ObjectFunc) NULL, D_603DCA4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_7, */ {(void*) D_602E080, 0, (ObjectFunc) NULL, D_603DD40, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_8, */ {(void*) D_60164F0, 0, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_9, */ {(void*) D_6014500, 0, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_10, */ {(void*) D_602D5F0, 0, (ObjectFunc) NULL, D_603DDF0, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_11, */ {(void*) D_601A7D0, 0, (ObjectFunc) NULL, D_603DE8C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_12, */ {(void*) D_6014B50, 0, (ObjectFunc) NULL, D_603DEF4, 500.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_13, */ {(void*) D_6016580, 0, (ObjectFunc) NULL, D_603DF8C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_14, */ {(void*) D_601B560, 0, (ObjectFunc) func_80066EA8, D_603DFDC, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_15, */ {(void*) D_60361F0, 0, (ObjectFunc) func_80066EA8, D_603E014, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_16, */ {(void*) D_6018E80, 0, (ObjectFunc) func_80066EA8, D_603E030, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_17, */ {(void*) D_6035F10, 0, (ObjectFunc) func_80066EA8, D_603E09C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_18, */ {(void*) func_i1_8018753C, 1, (ObjectFunc) func_i1_80187530, D_603E98C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_19, */ {(void*) D_60153B0, 0, (ObjectFunc) NULL, D_603E118, 100.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_20, */ {(void*) D_601F5A0, 0, (ObjectFunc) NULL, D_603E14C, 500.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_21, */ {(void*) D_60137B0, 0, (ObjectFunc) NULL, D_603E1B4, 400.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_22, */ {(void*) D_6006A80, 0, (ObjectFunc) NULL, D_603E21C, 400.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_23, */ {(void*) D_6016270, 0, (ObjectFunc) NULL, D_603E4A0, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_24, */ {(void*) D_6010E00, 0, (ObjectFunc) NULL, D_603E9EC, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_25, */ {(void*) D_6014670, 0, (ObjectFunc) NULL, D_603EA08, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* 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_0, */ {(void*) D_CO_6015F00, 0, (ObjectFunc) NULL, D_CO_603E3E0, 800.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_1, */ {(void*) D_CO_602E9E0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_2, */ {(void*) D_CO_601BEC0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_3, */ {(void*) D_CO_602E7A0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_4, */ {(void*) D_CO_60244A0, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_5, */ {(void*) D_CO_602E570, 0, (ObjectFunc) NULL, D_800CBF34, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_6, */ {(void*) D_CO_60132B0, 0, (ObjectFunc) NULL, D_CO_603DCA4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_7, */ {(void*) D_CO_602E080, 0, (ObjectFunc) NULL, D_CO_603DD40, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_8, */ {(void*) D_CO_60164F0, 0, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_9, */ {(void*) D_CO_6014500, 0, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_10, */ {(void*) D_CO_602D5F0, 0, (ObjectFunc) NULL, D_CO_603DDF0, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_11, */ {(void*) D_CO_601A7D0, 0, (ObjectFunc) NULL, D_CO_603DE8C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_12, */ {(void*) D_CO_6014B50, 0, (ObjectFunc) NULL, D_CO_603DEF4, 500.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_13, */ {(void*) D_CO_6016580, 0, (ObjectFunc) NULL, D_CO_603DF8C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_14, */ {(void*) D_CO_601B560, 0, (ObjectFunc) func_80066EA8, D_CO_603DFDC, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_15, */ {(void*) D_CO_60361F0, 0, (ObjectFunc) func_80066EA8, D_CO_603E014, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_16, */ {(void*) D_CO_6018E80, 0, (ObjectFunc) func_80066EA8, D_CO_603E030, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_17, */ {(void*) D_CO_6035F10, 0, (ObjectFunc) func_80066EA8, D_CO_603E09C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_18, */ {(void*) func_i1_8018753C, 1, (ObjectFunc) func_i1_80187530, D_CO_603E98C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_19, */ {(void*) D_CO_60153B0, 0, (ObjectFunc) NULL, D_CO_603E118, 100.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_20, */ {(void*) D_CO_601F5A0, 0, (ObjectFunc) NULL, D_CO_603E14C, 500.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_21, */ {(void*) D_CO_60137B0, 0, (ObjectFunc) NULL, D_CO_603E1B4, 400.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_22, */ {(void*) D_CO_6006A80, 0, (ObjectFunc) NULL, D_CO_603E21C, 400.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_23, */ {(void*) D_6016270, 0, (ObjectFunc) NULL, D_CO_603E4A0, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_24, */ {(void*) D_CO_6010E00, 0, (ObjectFunc) NULL, D_CO_603E9EC, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_25, */ {(void*) D_CO_6014670, 0, (ObjectFunc) NULL, D_CO_603EA08, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_26, */ {(void*) D_CO_6010A50, 0, (ObjectFunc) NULL, D_CO_603EA74, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_27, */ {(void*) D_CO_60143E0, 0, (ObjectFunc) NULL, D_CO_603EAE0, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_28, */ {(void*) D_CO_6014A20, 0, (ObjectFunc) NULL, D_CO_603EB0C, 2500.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 },
@@ -125,9 +126,9 @@ ObjectInfo D_800CC124[0x190] = {
/* 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 },
/* OBJ_80_42, */ {(void*) func_80059BBC, 1, (ObjectFunc) func_8006B95C, D_603E514, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_40, */ {(void*) func_80059F68, 1, (ObjectFunc) func_80066D5C, D_CO_603E4A4, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_41, */ {(void*) func_80059FDC, 1, (ObjectFunc) func_80066EA8, D_CO_603E4DC, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_42, */ {(void*) func_80059BBC, 1, (ObjectFunc) func_8006B95C, D_CO_603E514, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_43, */ {(void*) D_6024AC0, 0, (ObjectFunc) NULL, D_602B9EC, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_44, */ {(void*) D_600F560, 0, (ObjectFunc) NULL, D_602BA20, 1500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_45, */ {(void*) D_600EC90, 0, (ObjectFunc) NULL, D_602BAE4, 1500.0f, 0, 0, 40, 0, 0.0f, 0 },
@@ -139,9 +140,9 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_51, */ {(void*) D_6006F50, 0, (ObjectFunc) NULL, D_601B584, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_52, */ {(void*) D_6005780, 0, (ObjectFunc) func_i1_80193540, D_601B5F4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_53, */ {(void*) D_AQ_6003610, 0, (ObjectFunc) NULL, D_601B644, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* 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_54, */ {(void*) D_CO_6000E00, 0, (ObjectFunc) func_8006AA98, D_CO_603E0EC, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_55, */ {(void*) D_CO_6013B50, 0, (ObjectFunc) NULL, D_CO_603E88C, 1000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_56, */ {(void*) func_i1_8018F31C, 2, (ObjectFunc) func_i1_8018F044, D_CO_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_MA_6024010, 0, (ObjectFunc) NULL, D_MA_603626C, 300.0f, 0, 0, 5, 0, 0.0f, 0 },
@@ -246,12 +247,12 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_158 */ {(void*) D_SZ_6001360, 0, (ObjectFunc) NULL, D_SZ_60092E8, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_159 */ {(void*) D_6008370, 0, (ObjectFunc) NULL, D_601668C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_160 */ {(void*) D_6010960, 0, (ObjectFunc) NULL, D_6016714, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_161 */ {(void*) D_602F7C0, 0, (ObjectFunc) func_80068FE0, D_603E468, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_162 */ {(void*) D_601C9B0, 0, (ObjectFunc) func_80068FE0, D_603E484, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_161 */ {(void*) D_CO_602F7C0, 0, (ObjectFunc) func_80068FE0, D_CO_603E468, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_162 */ {(void*) D_CO_601C9B0, 0, (ObjectFunc) func_80068FE0, D_CO_603E484, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_163 */ {(void*) D_600A420, 0, (ObjectFunc) func_80068FE0, D_600FE9C, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_164 */ {(void*) func_80059C40, 1, (ObjectFunc) NULL, D_800CBF34, 1800.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_165 */ {(void*) D_602DCA0, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_166 */ {(void*) D_601F500, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_165 */ {(void*) D_CO_602DCA0, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_166 */ {(void*) D_CO_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_TI_60023B0, 0, (ObjectFunc) func_i5_8018F038, D_TI_60068BC, 100.0f, 0, 0, 0, 0, 0.0f, 0 },
@@ -261,10 +262,10 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_4C_173 */ {(void*) NULL, 1, (ObjectFunc) func_i1_801923C0, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_174 */ {(void*) NULL, 1, (ObjectFunc) func_i1_8019243C, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_175 */ {(void*) NULL, 1, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_176 */ {(void*) func_i1_8018BAAC, 2, (ObjectFunc) func_i1_8018AED0, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_177 */ {(void*) func_i1_8018BBA4, 2, (ObjectFunc) func_i1_8018B15C, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_178 */ {(void*) func_i1_8018BBF8, 2, (ObjectFunc) func_i1_8018B418, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_179 */ {(void*) func_i1_8018BD7C, 2, (ObjectFunc) func_i1_8018B58C, D_603E604, 500.0f, 0, 0, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_176 */ {(void*) func_i1_8018BAAC, 2, (ObjectFunc) func_i1_8018AED0, D_CO_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_177 */ {(void*) func_i1_8018BBA4, 2, (ObjectFunc) func_i1_8018B15C, D_CO_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_178 */ {(void*) func_i1_8018BBF8, 2, (ObjectFunc) func_i1_8018B418, D_CO_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_179 */ {(void*) func_i1_8018BD7C, 2, (ObjectFunc) func_i1_8018B58C, D_CO_603E604, 500.0f, 0, 0, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_180 */ {(void*) func_8005B6A4, 1, (ObjectFunc) func_80066A80, D_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_181 */ {(void*) D_6018C00, 0, (ObjectFunc) func_i2_8018756C, D_602F6EC, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_182 */ {(void*) func_8005B71C, 1, (ObjectFunc) func_i2_80187650, D_602F708, 100.0f, 0, 1, 39, 0, 1.0f, 1 },
@@ -277,11 +278,11 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_ACTOR_189 */ {(void*) func_8005A094, 1, (ObjectFunc) func_8006C008, D_800CBF34, 0.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_190 */ {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_191 */ {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_192 */ {(void*) func_8005B9A4, 1, (ObjectFunc) func_8006654C, D_603E54C, 200.0f, 0, 1, 39, 0, 50.0f, 1 },
/* OBJ_ACTOR_193 */ {(void*) func_8005BA30, 1, (ObjectFunc) func_800669A0, D_603E598, 100.0f, 0, 1, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_192 */ {(void*) func_8005B9A4, 1, (ObjectFunc) func_8006654C, D_CO_603E54C, 200.0f, 0, 1, 39, 0, 50.0f, 1 },
/* OBJ_ACTOR_193 */ {(void*) func_8005BA30, 1, (ObjectFunc) func_800669A0, D_CO_603E598, 100.0f, 0, 1, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_194 */ {(void*) func_8006B74C, 1, (ObjectFunc) func_8006B094, D_800CC000, 200.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_195 */ {(void*) func_8004FEC0, 1, (ObjectFunc) func_8004F8AC, D_800CBF34, 20000.0f, 0, 1, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_196 */ {(void*) func_80059BF0, 1, (ObjectFunc) func_8006BB78, D_603E5B4, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_196 */ {(void*) func_80059BF0, 1, (ObjectFunc) func_8006BB78, D_CO_603E5B4, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_197 */ {(void*) func_80035448, 1, (ObjectFunc) func_800319AC, D_800CC038, 20000.0f, 0, 1, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_198 */ {(void*) func_80035448, 1, (ObjectFunc) func_80092EC0, D_800CC01C, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_199 */ {(void*) func_i6_80188448, 1, (ObjectFunc) func_i6_801880E4, D_800CBF34, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
@@ -377,11 +378,11 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_ACTOR_289 */ {(void*) func_800596B0, 1, (ObjectFunc) func_i6_80189470, D_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
/* OBJ_ACTOR_290 */ {(void*) NULL, 1, (ObjectFunc) func_i6_8018933C, D_800CBF34, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_ACTOR_291 */ {(void*) func_80067874, 1, (ObjectFunc) func_8006753C, D_800CBEA8, 1000.0f, 0, 0, 0, 0, 1.0f, 0 },
/* OBJ_BOSS_292 */ {(void*) func_i1_8018AA74, 2, (ObjectFunc) func_i1_80189058, D_603E620, 20000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_293 */ {(void*) func_i1_8018ECAC, 1, (ObjectFunc) func_i1_8018C19C, D_603E840, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_294 */ {(void*) func_i1_8018ED78, 1, (ObjectFunc) func_i1_8018DDAC, D_603E714, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_295 */ {(void*) func_i1_8018EE84, 1, (ObjectFunc) func_i1_8018E290, D_603E748, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_296 */ {(void*) func_i1_8018EF90, 1, (ObjectFunc) func_i1_8018E76C, D_603E7C4, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_292 */ {(void*) func_i1_8018AA74, 2, (ObjectFunc) func_i1_80189058, D_CO_603E620, 20000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_293 */ {(void*) func_i1_8018ECAC, 1, (ObjectFunc) func_i1_8018C19C, D_CO_603E840, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_294 */ {(void*) func_i1_8018ED78, 1, (ObjectFunc) func_i1_8018DDAC, D_CO_603E714, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_295 */ {(void*) func_i1_8018EE84, 1, (ObjectFunc) func_i1_8018E290, D_CO_603E748, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_296 */ {(void*) func_i1_8018EF90, 1, (ObjectFunc) func_i1_8018E76C, D_CO_603E7C4, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_297 */ {(void*) func_i2_8018BACC, 1, (ObjectFunc) func_i2_8018978C, D_602F75C, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_298 */ {(void*) func_i2_801887D0, 1, (ObjectFunc) func_i2_80188344, D_602FA50, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_299 */ {(void*) func_80042FC4, 2, (ObjectFunc) func_80042FB8, D_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
src/main/fox_edisplay.c
+25 -23
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;
@@ -9,6 +9,7 @@ Matrix D_801615F0;
WingInfo D_80161630;
#include "fox_edisplay_assets.h"
#include "assets/ast_corneria.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_aquas.h"
#include "assets/ast_macbeth.h"
@@ -109,12 +110,12 @@ void func_80059BB0(void* arg0) {
}
void func_80059BBC(Object_80* obj80) {
gSPDisplayList(gMasterDisp++, D_6023AC0);
gSPDisplayList(gMasterDisp++, D_CO_6023AC0);
}
void func_80059BF0(Actor* actor) {
if (actor->unk_0B6 != 0) {
gSPDisplayList(gMasterDisp++, D_6032BC0);
gSPDisplayList(gMasterDisp++, D_CO_6032BC0);
}
}
@@ -131,12 +132,12 @@ void func_80059C40(Object_4C* obj4C) {
case 0:
Matrix_Scale(gGfxMatrix, 2.0f, 1.0f, 0.7f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6034B90);
gSPDisplayList(gMasterDisp++, D_CO_6034B90);
break;
case 21:
Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.7f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6034B90);
gSPDisplayList(gMasterDisp++, D_CO_6034B90);
break;
case 6:
case 7:
@@ -147,17 +148,17 @@ void func_80059C40(Object_4C* obj4C) {
case 56:
Matrix_Scale(gGfxMatrix, 1.6f, 1.0f, 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6034B90);
gSPDisplayList(gMasterDisp++, D_CO_6034B90);
break;
case 20:
Matrix_Scale(gGfxMatrix, 1.2f, 1.0f, 1.3f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6034B90);
gSPDisplayList(gMasterDisp++, D_CO_6034B90);
break;
case 22:
Matrix_Scale(gGfxMatrix, 2.2f, 1.0f, 1.4f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6034B90);
gSPDisplayList(gMasterDisp++, D_CO_6034B90);
break;
}
RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
@@ -166,18 +167,18 @@ void func_80059C40(Object_4C* obj4C) {
void func_80059F68(Item* item) {
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -95.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_602DA20);
gSPDisplayList(gMasterDisp++, D_CO_602DA20);
}
void func_80059FDC(Item* item) {
gSPDisplayList(gMasterDisp++, D_6035DA0);
gSPDisplayList(gMasterDisp++, D_CO_6035DA0);
}
void func_8005A010(Object_4C* obj4C) {
if (obj4C->unk_48 == 0) {
Matrix_RotateY(gGfxMatrix, M_PI / 2, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_60361F0);
gSPDisplayList(gMasterDisp++, D_CO_60361F0);
}
}
@@ -188,9 +189,10 @@ void func_8005A088(void* arg0) {
}
Gfx* D_800CFA54[] = {
D_6027960, D_60273A0, D_60183B0, D_60121E0, D_602A2E0, D_602A720, D_602B8F0, D_602A8C0, D_6028E70, D_602E0A0,
D_602DE70, D_602DC40, D_602D830, D_602D340, D_6031280, D_6031130, D_6030850, D_6030FD0, D_602DD40, D_6033AF0,
D_60186E0, D_6024160, D_6033290, D_6017F10, D_60074E0, D_6007590, D_6007730, D_6005CC0,
D_6027960, D_60273A0, D_60183B0, D_60121E0, D_602A2E0, D_602A720, D_602B8F0,
D_602A8C0, D_6028E70, D_602E0A0, D_602DE70, D_602DC40, D_602D830, D_602D340,
D_CO_6031280, D_CO_6031130, D_CO_6030850, D_CO_6030FD0, D_602DD40, D_6033AF0, D_60186E0,
D_6024160, D_6033290, D_6017F10, D_60074E0, D_6007590, D_6007730, D_6005CC0,
};
Gfx* D_800CFAC4[] = {
D_60176D0, D_6017810, D_6017770, D_6016D90, D_6016E30, D_60178B0,
@@ -201,7 +203,7 @@ Gfx* D_800CFADC[] = {
};
Gfx* D_800CFB08[] = { D_6020F10, D_6021100, D_60214B0 };
Gfx* D_800CFB14[] = { D_60163E0, D_60165D0, D_6016880, D_6016B50, D_6000C40 };
Gfx* D_800CFB28[] = { D_6018E80, D_601F620, D_601F420, D_6018C80, D_601F940, D_601F260 };
Gfx* D_800CFB28[] = { D_CO_6018E80, D_601F620, D_601F420, D_6018C80, D_601F940, D_601F260 };
Gfx* D_800CFB40[] = {
D_6014DB0, D_60146D0, D_6014B80, D_6014470, D_6014930, D_60138A0, D_60151A0, D_600F750, D_6015810,
};
@@ -591,8 +593,8 @@ void func_8005B848(Actor* actor) {
void func_8005B9A4(Actor* actor) {
Matrix_Translate(gGfxMatrix, 0.0f, -124.0f, 0.0f, 1);
Animation_GetFrameData(&D_6029528, actor->unk_0B6, actor->vwork);
Animation_DrawSkeleton(1, D_6029674, actor->vwork, NULL, NULL, actor, &gIdentityMatrix);
Animation_GetFrameData(&D_CO_6029528, actor->unk_0B6, actor->vwork);
Animation_DrawSkeleton(1, D_CO_6029674, actor->vwork, NULL, NULL, actor, &gIdentityMatrix);
}
void func_8005BA30(Actor* actor) {
@@ -600,7 +602,7 @@ void func_8005BA30(Actor* actor) {
RCP_SetupDL_27();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
gSPDisplayList(gMasterDisp++, D_6020B40);
gSPDisplayList(gMasterDisp++, D_CO_6020B40);
}
void func_8005BAAC(void) {
@@ -658,7 +660,7 @@ void func_8005BAB4(ObjectId objId, s32 index) {
}
break;
case OBJ_BOSS_292:
gSPDisplayList(gMasterDisp++, D_6034B90);
gSPDisplayList(gMasterDisp++, D_CO_6034B90);
break;
case OBJ_BOSS_316:
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_0) {
@@ -681,14 +683,14 @@ void func_8005BAB4(ObjectId objId, s32 index) {
}
switch (objId) {
case OBJ_BOSS_293:
gSPDisplayList(gMasterDisp++, D_6036840);
gSPDisplayList(gMasterDisp++, D_CO_6036840);
break;
case OBJ_BOSS_294:
gSPDisplayList(gMasterDisp++, D_6036CD0);
gSPDisplayList(gMasterDisp++, D_CO_6036CD0);
break;
case OBJ_BOSS_295:
case OBJ_BOSS_296:
gSPDisplayList(gMasterDisp++, D_60363B0);
gSPDisplayList(gMasterDisp++, D_CO_60363B0);
break;
}
break;
@@ -696,7 +698,7 @@ void func_8005BAB4(ObjectId objId, s32 index) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 150);
Matrix_Scale(gGfxMatrix, 0.4f, 0.4f, gActors[index].scale, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6034B90);
gSPDisplayList(gMasterDisp++, D_CO_6034B90);
break;
case OBJ_ACTOR_230:
RCP_SetupDL_48();
src/main/fox_effect.c
+3 -3
View File
@@ -6,7 +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_6004900[];
extern Gfx D_6016880[];
extern Gfx D_6018AF0[];
extern Gfx D_601BAD0[];
@@ -15,6 +14,7 @@ extern Gfx D_601BAD0[];
#include "assets/ast_arwing.h"
#include "assets/ast_bg_space.h"
#include "assets/ast_bg_planet.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_sector_y.h"
@@ -492,7 +492,7 @@ void func_80078C84(Effect* effect) {
void func_80078CE8(Effect* effect) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_4A);
Graphics_SetScaleMtx(effect->scale2);
gSPDisplayList(gMasterDisp++, D_6033000);
gSPDisplayList(gMasterDisp++, D_CO_6033000);
}
void func_80078D60(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 scale2) {
@@ -2166,7 +2166,7 @@ void func_8007DA58(Effect* effect) {
void func_8007DAE4(Effect* effect) {
Graphics_SetScaleMtx(effect->scale2);
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gSPDisplayList(gMasterDisp++, D_6004900);
gSPDisplayList(gMasterDisp++, D_CO_6004900);
RCP_SetupDL(&gMasterDisp, 0x40);
}
src/main/fox_enmy.c
+2 -1
View File
@@ -1,6 +1,7 @@
#include "prevent_bss_reordering.h"
#include "global.h"
#include "assets.h"
#include "assets/ast_corneria.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_sector_y.h"
#include "assets/ast_sector_z.h"
@@ -1707,7 +1708,7 @@ void func_8006654C(Actor* actor) {
actor->fwork[0] += 0.5f;
}
actor->unk_0B6++;
if (Animation_GetFrameCount(&D_6029528) < actor->unk_0B6) {
if (Animation_GetFrameCount(&D_CO_6029528) < actor->unk_0B6) {
actor->unk_0B6 = 0;
}
if ((actor->obj.rot.z < 15.0f) && (actor->unk_0B6 < 0x14)) {
src/main/fox_enmy2.c
+3 -2
View File
@@ -8,6 +8,7 @@ s32 D_80161690;
#include "fox_enmy2_assets.h"
#include "assets/ast_arwing.h"
#include "assets/ast_training.h"
#include "assets/ast_corneria.h"
#include "assets/ast_warp_zone.h"
#include "assets/ast_allies.h"
#include "assets/ast_sector_x.h"
@@ -104,7 +105,7 @@ void func_8006AA98(Object_80* obj80) {
Vec3f sp24;
Vec3f sp18;
Texture_Scroll(D_60038F8, 32, 32, 1);
Texture_Scroll(D_CO_60038F8, 32, 32, 1);
if ((gGameFrameCount % 4) == 0) {
Matrix_RotateY(gCalcMatrix, obj80->obj.rot.y * M_DTOR, 0);
@@ -874,7 +875,7 @@ UnkStruct_D003C D_800D003C[108] = {
{ D_ENMY_PLANET_40073C0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_ENMY_PLANET_4007AF0, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ NULL, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 },
{ D_6011F90, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 },
{ D_CO_6011F90, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 },
{ D_ENMY_PLANET_4000710, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 2, 0, 1, 1, 1.0f, 1 },
{ NULL, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 },
{ D_ENMY_SPACE_400BD20, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
src/main/fox_hud.c
+1 -1
View File
@@ -79,6 +79,7 @@ s32 D_80161900[20];
#include "assets/ast_blue_marine.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_font.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
#include "assets/ast_area_6.h"
#include "assets/ast_aquas.h"
@@ -95,7 +96,6 @@ void func_80087788(void);
// Segmented addresses
extern u8 D_CO_6000000[];
extern u8 D_ME_6000000[];
extern u8 D_FO_6000000[];
extern u8 D_KA_6000000[];
src/main/fox_play.c
+5 -4
View File
@@ -2,6 +2,7 @@
#include "global.h"
#include "assets.h"
#include "fox_map.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_sector_y.h"
@@ -330,7 +331,7 @@ void func_800A5338(void) {
s32 i;
s32 j;
D_80178310 = SEGMENTED_TO_VIRTUAL(D_603B074);
D_80178310 = SEGMENTED_TO_VIRTUAL(D_CO_603B074);
for (j = 0, obj58 = gObjects58; j < 200; j++) {
if (D_80178310[j].id <= OBJ_INVALID) {
@@ -346,7 +347,7 @@ void func_800A5338(void) {
obj58->obj.rot.y = D_80178310[j].rot.y;
Object_SetInfo(&obj58->info, obj58->obj.id);
if (obj58->obj.id == OBJ_80_1) {
obj58->info.dList = D_6020760;
obj58->info.dList = D_CO_6020760;
}
obj58++;
}
@@ -6172,9 +6173,9 @@ void func_800B79B0(void) {
}
break;
case LEVEL_CORNERIA:
func_8008C104(D_603EB38, D_6028A60);
func_8008C104(D_CO_603EB38, D_CO_6028A60);
if (gGameFrameCount & 1) {
Texture_Scroll(D_600CBD8, 64, 32, 3);
Texture_Scroll(D_CO_600CBD8, 64, 32, 3);
}
break;
case LEVEL_AQUAS:
src/main/fox_radio.c
+5 -4
View File
@@ -14,6 +14,7 @@ s32 D_80178744;
s32 D_80178748;
#include "assets/ast_allies.h"
#include "assets/ast_corneria.h"
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_sector_y.h"
@@ -258,16 +259,16 @@ void func_800BAAE8(void) {
sp44 = D_STAR_WOLF_F002D60;
break;
case RCID_BOSS_CORNERIA:
sp44 = D_6026420;
sp44 = D_CO_6026420;
break;
case RCID_BOSS_CORNERIA_OPEN:
sp44 = D_6027340;
sp44 = D_CO_6027340;
break;
case RCID_BOSS_CORNERIA2:
sp44 = D_60245E0;
sp44 = D_CO_60245E0;
break;
case RCID_BOSS_CORNERIA2_OPEN:
sp44 = D_6025500;
sp44 = D_CO_6025500;
break;
case RCID_BOSS_METEO:
sp44 = D_601C8E0;
src/overlays/ovl_i1/fox_co.c
+58 -68
View File
@@ -1,6 +1,7 @@
#include "global.h"
#include "assets.h"
#include "assets/ast_arwing.h"
#include "assets/ast_corneria.h"
// bss
u8 D_i1_8019B6D0;
@@ -9,12 +10,10 @@ f32 D_i1_8019B6D8[68];
void func_i1_80187530(Object_80* obj80) {
}
extern Gfx D_60199D0[];
void func_i1_8018753C(Object_80* obj80) {
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_60199D0);
gSPDisplayList(gMasterDisp++, D_CO_60199D0);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
}
@@ -528,9 +527,6 @@ void func_i1_80188D50(Boss* boss) {
}
}
extern Animation D_602BC18;
extern Animation D_602C0D0;
void func_i1_80189058(Boss* boss) {
Vec3f sp21C = { 0.0f, 0.0f, 0.0f };
s32 sp218;
@@ -572,7 +568,7 @@ void func_i1_80189058(Boss* boss) {
D_i1_8019B6D8[66] = 0.0f;
D_i1_8019B6D8[67] = 10000.0f;
boss->timer_050 = 30;
Animation_GetFrameData(&D_602C0D0, 0, boss->vwork);
Animation_GetFrameData(&D_CO_602C0D0, 0, boss->vwork);
gBossFrameCount = 0;
}
gBossFrameCount++;
@@ -714,7 +710,7 @@ void func_i1_80189058(Boss* boss) {
break;
}
}
Animation_GetFrameData(&D_602C0D0, boss->unk_04C, sp84);
Animation_GetFrameData(&D_CO_602C0D0, boss->unk_04C, sp84);
if (boss->timer_052 == 0) {
boss->timer_052 = 150;
boss->swork[30] = 1;
@@ -726,10 +722,10 @@ void func_i1_80189058(Boss* boss) {
D_i1_8019B6D8[19] = D_i1_8019B6D8[67] = gPlayer[0].unk_138;
boss->unk_04C += 2;
if (boss->unk_04C >= Animation_GetFrameCount(&D_602BC18)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_CO_602BC18)) {
boss->unk_04C = 0;
}
Animation_GetFrameData(&D_602BC18, boss->unk_04C, sp84);
Animation_GetFrameData(&D_CO_602BC18, boss->unk_04C, sp84);
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp1EC, &sp21C);
if (boss->timer_052 == 0) {
boss->timer_052 = 150;
@@ -746,7 +742,7 @@ void func_i1_80189058(Boss* boss) {
if (boss->unk_04C < 0) {
boss->unk_04C = 100;
}
Animation_GetFrameData(&D_602BC18, boss->unk_04C, sp84);
Animation_GetFrameData(&D_CO_602BC18, boss->unk_04C, sp84);
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp6C, &sp21C);
if (boss->timer_052 == 0) {
boss->timer_052 = 30;
@@ -767,7 +763,7 @@ void func_i1_80189058(Boss* boss) {
if (boss->unk_04C >= 101) {
boss->unk_04C = 0;
}
Animation_GetFrameData(&D_602BC18, boss->unk_04C, sp84);
Animation_GetFrameData(&D_CO_602BC18, boss->unk_04C, sp84);
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp21C);
if (boss->timer_052 == 0) {
boss->timer_052 = 30;
@@ -788,7 +784,7 @@ void func_i1_80189058(Boss* boss) {
if (boss->unk_04C >= 101) {
boss->unk_04C = 0;
}
Animation_GetFrameData(&D_602BC18, boss->unk_04C, sp84);
Animation_GetFrameData(&D_CO_602BC18, boss->unk_04C, sp84);
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp78, &sp21C);
func_i1_80188A18(boss);
break;
@@ -848,7 +844,7 @@ void func_i1_80189058(Boss* boss) {
if (!(gGameFrameCount & 0xF)) {
boss->unk_04C = RAND_INT(100.0f);
}
Animation_GetFrameData(&D_602BC18, boss->unk_04C, sp84);
Animation_GetFrameData(&D_CO_602BC18, boss->unk_04C, sp84);
boss->fwork[14] = 0.03f;
break;
case 7:
@@ -917,10 +913,10 @@ void func_i1_80189058(Boss* boss) {
if (boss->timer_050 == 0) {
Object_Kill(&boss->obj, boss->sfxSource);
}
Animation_GetFrameData(&D_602BC18, 0, sp84);
Animation_GetFrameData(&D_CO_602BC18, 0, sp84);
break;
default:
Animation_GetFrameData(&D_602C0D0, boss->unk_04C, sp84);
Animation_GetFrameData(&D_CO_602C0D0, boss->unk_04C, sp84);
break;
}
Math_SmoothStepToF(&boss->vel.x, sp21C.x, 0.3f, 5.0f, 0.0f);
@@ -1083,11 +1079,9 @@ void func_i1_8018A730(s32 limbIndex, Vec3f* rot, void* data) {
}
}
extern Limb* D_602BE64[];
void func_i1_8018AA74(Boss* boss) {
Matrix_Translate(gCalcMatrix, 0.0f, 700.0f, 0.0f, (u8) 1);
Animation_DrawSkeleton(2, D_602BE64, boss->vwork, func_i1_8018A434, func_i1_8018A730, boss, gCalcMatrix);
Matrix_Translate(gCalcMatrix, 0.0f, 700.0f, 0.0f, 1);
Animation_DrawSkeleton(2, D_CO_602BE64, boss->vwork, func_i1_8018A434, func_i1_8018A730, boss, gCalcMatrix);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
}
@@ -1156,17 +1150,14 @@ void func_i1_8018ACE0(Actor* actor) {
}
}
extern Animation D_602991C;
extern Gfx D_60329C0[];
void func_i1_8018AED0(Actor* actor) {
Vec3f sp40[20];
f32 temp_sin;
f32 temp_cos;
func_i1_8018ACE0(actor);
Math_SmoothStepToVec3fArray(sp40, actor->vwork, 0, Animation_GetFrameData(&D_602991C, actor->unk_0B6, sp40), 1.0f,
1.0f, 1.0f);
Math_SmoothStepToVec3fArray(sp40, actor->vwork, 0, Animation_GetFrameData(&D_CO_602991C, actor->unk_0B6, sp40),
1.0f, 1.0f, 1.0f);
temp_sin = SIN_DEG(actor->obj.rot.y);
actor->vel.x = actor->fwork[0] * temp_sin;
temp_cos = COS_DEG(actor->obj.rot.y);
@@ -1174,7 +1165,7 @@ void func_i1_8018AED0(Actor* actor) {
switch (actor->state) {
case 0:
actor->fwork[1] += 20.0f;
Texture_Scroll(&D_60329C0, 16, 16, 1);
Texture_Scroll(&D_CO_60329C0, 16, 16, 1);
actor->unk_0B6 = 0;
actor->fwork[0] += 1.0f;
if (actor->fwork[0] > 10.0f) {
@@ -1194,7 +1185,7 @@ void func_i1_8018AED0(Actor* actor) {
if (actor->unk_0B6 == 50) {
gObjects80[actor->iwork[0] - 1].state = 1;
}
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_602991C)) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_CO_602991C)) {
actor->state++;
}
break;
@@ -1224,8 +1215,6 @@ void func_i1_8018B0B4(Actor* actor) {
}
}
extern Animation D_602AA04;
void func_i1_8018B15C(Actor* actor) {
Vec3f sp60[20];
Vec3f sp54;
@@ -1235,37 +1224,43 @@ void func_i1_8018B15C(Actor* actor) {
f32 temp_cos;
func_i1_8018ACE0(actor);
obj80 = &gObjects80[actor->iwork[0]];
temp_sin = SIN_DEG(actor->obj.rot.y);
actor->vel.x = actor->fwork[0] * temp_sin;
temp_cos = COS_DEG(actor->obj.rot.y);
actor->vel.z = actor->fwork[0] * temp_cos;
Matrix_RotateY(gCalcMatrix, actor->obj.rot.y * M_DTOR, 0);
switch (actor->state) {
case 3:
break;
case 0:
actor->timer_0BC = 40;
actor->state = 1;
actor->unk_0B6 = 0;
break;
case 1:
actor->fwork[0] = -10.0f;
Texture_Scroll(&D_60329C0, 16, 16, 1);
Texture_Scroll(&D_CO_60329C0, 16, 16, 1);
if (actor->timer_0BC == 0) {
actor->state = 2;
actor->iwork[2] = RAND_INT(10.0f) + 10;
}
break;
case 2:
actor->fwork[0] = -10.0f;
Texture_Scroll(&D_60329C0, 16, 16, 1);
Texture_Scroll(&D_CO_60329C0, 16, 16, 1);
actor->unk_0B6++;
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_602AA04)) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_CO_602AA04)) {
actor->state = 3;
}
if (actor->unk_0B6 == (Animation_GetFrameCount(&D_602AA04) - actor->iwork[2])) {
if (actor->unk_0B6 == (Animation_GetFrameCount(&D_CO_602AA04) - actor->iwork[2])) {
actor->iwork[1] = 1;
obj80->state = 1;
sp54.x = 0.0f;
@@ -1279,6 +1274,7 @@ void func_i1_8018B15C(Actor* actor) {
}
break;
}
if (actor->iwork[1] == 0) {
obj80->obj.pos.x = actor->fwork[2];
obj80->obj.pos.y = actor->fwork[6];
@@ -1286,11 +1282,10 @@ void func_i1_8018B15C(Actor* actor) {
obj80->obj.rot.y = actor->obj.rot.y;
obj80->vel.y = 0.0f;
}
Math_SmoothStepToVec3fArray(sp60, actor->vwork, 0, Animation_GetFrameData(&D_602AA04, actor->unk_0B6, sp60), 1.0f,
1.0f, 1.0f);
}
extern Animation D_602A520;
Math_SmoothStepToVec3fArray(sp60, actor->vwork, 0, Animation_GetFrameData(&D_CO_602AA04, actor->unk_0B6, sp60),
1.0f, 1.0f, 1.0f);
}
void func_i1_8018B418(Actor* actor) {
s32 pad;
@@ -1301,24 +1296,28 @@ void func_i1_8018B418(Actor* actor) {
s32 pad2[4];
func_i1_8018ACE0(actor);
temp_sin = SIN_DEG(actor->obj.rot.y);
actor->vel.x = actor->fwork[0] * temp_sin;
temp_cos = COS_DEG(actor->obj.rot.y);
actor->vel.z = actor->fwork[0] * temp_cos;
switch (actor->state) {
case 0:
actor->state = 1;
break;
case 1:
actor->fwork[0] = 5.0f;
actor->fwork[1] += 5.0f;
Texture_Scroll(&D_60329C0, 16, 16, 1);
Texture_Scroll(&D_CO_60329C0, 16, 16, 1);
actor->unk_0B6++;
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_602A520)) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_CO_602A520)) {
actor->unk_0B6 = 0;
}
break;
}
if (actor->iwork[1] == 0) {
temp_v0_2 = &gObjects80[actor->iwork[0]];
temp_v0_2->obj.pos.x = actor->fwork[2];
@@ -1327,8 +1326,9 @@ void func_i1_8018B418(Actor* actor) {
temp_v0_2->obj.rot.y = actor->fwork[1];
temp_v0_2->vel.y = 0.0f;
}
Math_SmoothStepToVec3fArray(sp54, actor->vwork, 0, Animation_GetFrameData(&D_602A520, actor->unk_0B6, sp54), 1.0f,
1.0f, 1.0f);
Math_SmoothStepToVec3fArray(sp54, actor->vwork, 0, Animation_GetFrameData(&D_CO_602A520, actor->unk_0B6, sp54),
1.0f, 1.0f, 1.0f);
}
void func_i1_8018B58C(Actor* actor) {
@@ -1386,10 +1386,8 @@ void func_i1_8018B58C(Actor* actor) {
}
}
extern Limb* D_6029A48[];
void func_i1_8018BAAC(Actor* actor) {
Animation_DrawSkeleton(3, D_6029A48, actor->vwork, func_i1_8018AB08, NULL, actor, gCalcMatrix);
Animation_DrawSkeleton(3, D_CO_6029A48, actor->vwork, func_i1_8018AB08, NULL, actor, gCalcMatrix);
}
void func_i1_8018BAFC(s32 limbIndex, Vec3f* rot, void* data) {
@@ -1409,11 +1407,11 @@ void func_i1_8018BAFC(s32 limbIndex, Vec3f* rot, void* data) {
}
void func_i1_8018BBA4(Actor* actor) {
Animation_DrawSkeleton(3, D_6029A48, actor->vwork, NULL, func_i1_8018BAFC, actor, gCalcMatrix);
Animation_DrawSkeleton(3, D_CO_6029A48, actor->vwork, NULL, func_i1_8018BAFC, actor, gCalcMatrix);
}
void func_i1_8018BBF8(Actor* actor) {
Animation_DrawSkeleton(3, D_6029A48, actor->vwork, func_i1_8018AB08, func_i1_8018BAFC, actor, gCalcMatrix);
Animation_DrawSkeleton(3, D_CO_6029A48, actor->vwork, func_i1_8018AB08, func_i1_8018BAFC, actor, gCalcMatrix);
}
s32 func_i1_8018BC50(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) {
@@ -1456,7 +1454,7 @@ void func_i1_8018BC84(s32 limbIndex, Vec3f* rot, void* data) {
}
void func_i1_8018BD7C(Actor* actor) {
Animation_DrawSkeleton(3, D_6029A48, actor->vwork, func_i1_8018BC50, func_i1_8018BC84, actor, gCalcMatrix);
Animation_DrawSkeleton(3, D_CO_6029A48, actor->vwork, func_i1_8018BC50, func_i1_8018BC84, actor, gCalcMatrix);
}
void func_i1_8018BDD4(Boss* boss, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5, s32 arg6) {
@@ -2003,8 +2001,8 @@ void func_i1_8018C19C(Boss* boss) {
}
break;
}
temp_a0 = SEGMENTED_TO_VIRTUAL(D_603E748);
temp_a1 = SEGMENTED_TO_VIRTUAL(D_603E7C4);
temp_a0 = SEGMENTED_TO_VIRTUAL(D_CO_603E748);
temp_a1 = SEGMENTED_TO_VIRTUAL(D_CO_603E7C4);
temp_a0[9] = -100000.0f;
temp_a0[3] = 172.0f;
temp_a1[9] = -100000.0f;
@@ -2330,13 +2328,10 @@ s32 func_i1_8018EC54(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
return false;
}
extern Animation D_602D400;
extern Limb* D_602D5AC[];
void func_i1_8018ECAC(Boss* boss) {
Animation_GetFrameData(&D_602D400, 0, boss->vwork);
Animation_DrawSkeleton(1, D_602D5AC, boss->vwork, func_i1_8018EC54, NULL, &boss->index, &gIdentityMatrix);
Animation_GetFrameData(&D_CO_602D400, 0, boss->vwork);
Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, func_i1_8018EC54, NULL, &boss->index, &gIdentityMatrix);
}
s32 func_i1_8018ED1C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) {
@@ -2353,8 +2348,8 @@ void func_i1_8018ED78(Boss* boss) {
Matrix_Translate(gGfxMatrix, -D_i1_80199A78.x, -D_i1_80199A78.y, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
Animation_GetFrameData(&D_602D400, 0, boss->vwork);
Animation_DrawSkeleton(1, D_602D5AC, boss->vwork, func_i1_8018ED1C, NULL, &boss->index, &gIdentityMatrix);
Animation_GetFrameData(&D_CO_602D400, 0, boss->vwork);
Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, func_i1_8018ED1C, NULL, &boss->index, &gIdentityMatrix);
}
s32 func_i1_8018EE2C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) {
@@ -2371,8 +2366,8 @@ void func_i1_8018EE84(Boss* boss) {
Matrix_Translate(gGfxMatrix, -D_i1_80199A90.x, -D_i1_80199A90.y, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
Animation_GetFrameData(&D_602D400, 0, boss->vwork);
Animation_DrawSkeleton(1, D_602D5AC, boss->vwork, func_i1_8018EE2C, NULL, &boss->index, &gIdentityMatrix);
Animation_GetFrameData(&D_CO_602D400, 0, boss->vwork);
Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, func_i1_8018EE2C, NULL, &boss->index, &gIdentityMatrix);
}
s32 func_i1_8018EF38(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) {
@@ -2389,12 +2384,10 @@ void func_i1_8018EF90(Boss* boss) {
Matrix_Translate(gGfxMatrix, -D_i1_80199AA8.x, -D_i1_80199AA8.y, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
Animation_GetFrameData(&D_602D400, 0, boss->vwork);
Animation_DrawSkeleton(1, D_602D5AC, boss->vwork, func_i1_8018EF38, NULL, &boss->index, &gIdentityMatrix);
Animation_GetFrameData(&D_CO_602D400, 0, boss->vwork);
Animation_DrawSkeleton(1, D_CO_602D5AC, boss->vwork, func_i1_8018EF38, NULL, &boss->index, &gIdentityMatrix);
}
extern f32 D_603E924[];
void func_i1_8018F044(Object_80* obj80) {
switch (obj80->state) {
@@ -2408,7 +2401,7 @@ void func_i1_8018F044(Object_80* obj80) {
obj80->vel.y += 2.0f;
if (obj80->unk_44 >= 3) {
obj80->state = 1;
obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_603E924);
obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_CO_603E924);
AUDIO_PLAY_SFX(0x1900000D, obj80->sfxSource, 0);
return;
}
@@ -2444,14 +2437,11 @@ s32 func_i1_8018F1C8(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
return 0;
}
extern Animation D_602AA7C;
extern Limb* D_602AB48[];
void func_i1_8018F31C(Object_80* obj80) {
Vec3f sp28[10];
Animation_GetFrameData(&D_602AA7C, 0, sp28);
Animation_DrawSkeleton(3, D_602AB48, sp28, func_i1_8018F1C8, NULL, obj80, gCalcMatrix);
Animation_GetFrameData(&D_CO_602AA7C, 0, sp28);
Animation_DrawSkeleton(3, D_CO_602AB48, sp28, func_i1_8018F1C8, NULL, obj80, gCalcMatrix);
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
}
src/overlays/ovl_i4/fox_bo.c
+1 -1
View File
@@ -1,5 +1,5 @@
#include "prevent_bss_reordering.h"
#include "prevent_bss_reordering2.h"
// #include "prevent_bss_reordering2.h"
#include "global.h"
#include "assets.h"

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