fox_360 and fox_bg decompiled, two more matches, some names. (#62)

* it begins

* stuff

* remove extra

* matched

* forgot one

* small things

* more matches

* filenames
This commit is contained in:
petrie911
2023-12-27 17:14:13 -03:00
committed by GitHub
parent d7d9e472c3
commit c69978c5eb
25 changed files with 6511 additions and 857 deletions
+49 -39
View File
@@ -89,9 +89,7 @@ void RdRam_CheckIPL3(void);
void Mio0_Decompress(void* header, u8* dst);
s32 vsprintf(char* dst, const char* fmt, va_list args);
// sf_2EFE0
// fox_360
void func_8002E3E0(Object_2F4*);
void func_8002E548(void);
void func_8002E5E0(Object_408*);
@@ -103,17 +101,19 @@ void func_8002E694(Object_2F4*);
void func_8002E6B8(Object_2F4*);
void func_8002E6DC(Object_2F4*);
void func_8002E700(Player *);
void func_8002EE64(Object_2F4 *);
void func_8002EE64(Object_2F4 * obj2F4);
void func_8002F180(void);
void func_8002F5F4(void);
void func_800319AC(Object_2F4*);
void func_80035448(Object_2F4*);
void func_8002F5F4(u16* msg, s32 character);
void func_800319AC(Object_2F4* this);
void func_80035448(Object_2F4* obj2F4);
//sf_36930
//sf_beam
void PlayerShot_Initialize(PlayerShot *);
void func_800365E4(f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32);
void func_8003D9B8(void);
void func_8003DA0C(void);
// fox_bg
void func_8003DAF0(void);
void func_8003DE68(s32, s32);
void func_8003E1E8(void);
@@ -121,6 +121,7 @@ void func_80040450(void);
void func_80040954(void);
void func_80040CDC(void);
void func_80040CE4(void);
void func_80042D38(void);
// fox_43AC0
void func_80042FAC(Object_408 *);
@@ -129,6 +130,8 @@ void func_80042FC4(Object_408*);
void func_80042FD0(Object_408 *);
void func_80042FDC(Object_408*);
void func_80042FE8(Object_408*);
// fox_43E80
void func_80043468(Player* );
void func_800444BC(Player *);
void func_80047504(Player *);
@@ -536,6 +539,7 @@ void func_DF4260_8018753C(Object_80*);
void func_DF4260_801878D8(Object_408 *);
void func_DF4260_8018B0B4(Object_2F4 *);
void func_DF4260_8018BE7C(Object_408 *);
void func_DF4260_8018ED78(Object_408*);
void func_DF4260_801924A8(Object_80* );
void func_DF4260_8019250C(Object_2F4 *);
void func_DF4260_80192CB0(Object_2F4 *);
@@ -543,48 +547,39 @@ void func_DF4260_80192EA4(Object_2F4 *);
void func_DF4260_801933B4(Object_2F4 *);
void func_DF4260_801935CC(Object_408 *);
void func_DF4260_80198310(Object_408 *);
void func_DF4260_80198594(Object_408 *);
void func_DF4260_801988E0(void);
void func_DF4260_8018ED78(Object_408*);
void func_E9F1D0_80189214(void);
void func_E9F1D0_8018BDD8(void);
void func_E9F1D0_8018C390(Player*);
void func_DF4260_80198C50(void);
void func_DF4260_8019949C(void);
void func_E16C50_8019E8B8(f32, f32, f32, f32);
void func_E9F1D0_801A5AD4(Player*);
void func_E9F1D0_801A5FC0(Player*);
void func_E16C50_801AA8E8(Player*);
void func_E16C50_801AACF8(Player*);
void func_E16C50_801AC274(Player*);
void func_E16C50_801ACE50(Player*);
void func_E6A810_801ACFBC(ObjectInit*);
void func_E6A810_801AD080(void);
void func_E16C50_801AD328(Player*);
void func_E16C50_801BEC80(Player*);
void func_E08400_80187B08(Object_2F4 *);
void func_E08400_80188A40(Object_408 *);
void func_E08400_8018CCF8(Object_2F4 *);
void func_E16C50_80191DB0(Object_2F4*);
void func_E16C50_8018ED78(Player*);
void func_E16C50_80187754(Object_408 *);
void func_E16C50_8018ED78(Player*);
void func_E16C50_801900FC(Vec3f*, Vec3f*, f32, f32, f32, s32, f32, s32, s32);
void func_E16C50_80190430(Object_2F4 *);
void func_E16C50_80190F08(Object_2F4 *);
void func_E16C50_801915A4(Object_2F4 *);
void func_E16C50_80191BB8(Object_2F4 *);
void func_E16C50_80191DB0(Object_2F4*);
void func_E16C50_801932AC(Object_408 *);
void func_E16C50_8019B1F0(Object_2F4 *);
void func_E16C50_8019B810(Object_2F4 *);
void func_E16C50_8019C200(Object_2F4 *);
void func_E16C50_8019D060(Object_2F4 *);
void func_E16C50_8019E8B8(f32, f32, f32, f32);
void func_E16C50_8019E9F4(f32, f32, f32, f32, f32, f32, f32, s32);
void func_E16C50_801A9824(void);
void func_E16C50_801AA20C(void);
void func_E16C50_801AA8E8(Player*);
void func_E16C50_801AACF8(Player*);
void func_E16C50_801AC274(Player*);
void func_E16C50_801AC8A8(f32, f32, f32, f32, s32);
void func_E16C50_801ACBB4(void);
void func_E16C50_801ACE50(Player*);
void func_E16C50_801AD328(Player*);
void func_E16C50_801AD688(Object_2F4 *);
void func_E16C50_801AE3AC(Object_2F4 *);
void func_E16C50_801AF9FC(Object_2F4 *);
@@ -594,18 +589,23 @@ void func_E16C50_801B6E54(Object_2F4 *);
void func_E16C50_801B7AF0(Object_2F4 *);
void func_E16C50_801BA57C(Object_2F4 *);
void func_E16C50_801BB26C(Object_2F4 *);
void func_E16C50_801BEC80(Player*);
void func_E51970_80193CA4(Object_408 *);
void func_E51970_80198594(Object_408 *);
void func_E51970_8019EA68(Object_58**);
void func_E51970_80198930(Object_58**);
void func_E51970_80187960(Object_2F4*);
void func_E51970_8018BA2C(Object_58**);
void func_E51970_8018C158(Object_2F4*);
void func_E51970_80191ED8(Object_58**);
void func_E51970_80192264(void);
void func_E51970_80193CA4(Object_408 *);
void func_E51970_80198594(Object_2F4*);
void func_E51970_80198930(Object_58**);
void func_E51970_80199900(Object_2F4 *, s32);
void func_E51970_80199C60(Object_2F4*);
void func_E51970_8019AB8C(Object_2F4*);
void func_E51970_8019EA68(Object_58**);
void func_E6A810_80188F30(void);
void func_E6A810_80199920(void);
void func_E6A810_801B5110(f32, f32, f32);
void func_E6A810_8018769C(Object_2F4 *);
void func_E6A810_80188F30(void);
void func_E6A810_80189B80(Object_2F4 *);
void func_E6A810_8018ADC4(Object_2F4 *);
void func_E6A810_8018B720(Object_2F4 *);
@@ -618,6 +618,7 @@ void func_E6A810_8018EFF0(Object_4C *);
void func_E6A810_8018F0D8(Object_80 *);
void func_E6A810_8018FA48(Object_408 *);
void func_E6A810_801990DC(Object_408 *);
void func_E6A810_80199920(void);
void func_E6A810_80199F8C(Object_2F4 *);
void func_E6A810_801A3E70(Object_2F4 *);
void func_E6A810_801A4660(Object_2F4 *);
@@ -626,18 +627,27 @@ void func_E6A810_801A5E2C(Object_2F4 *);
void func_E6A810_801A6134(Object_2F4 *);
void func_E6A810_801A65E0(Object_80 *);
void func_E6A810_801A7D98(Object_2F4 *);
void func_E6A810_801ACFBC(ObjectInit*);
void func_E6A810_801AD080(void);
void func_E6A810_801B5110(f32, f32, f32);
void func_E6A810_801B58AC(Gfx **, f32);
s32 func_E6A810_801B6AEC(f32, f32, f32);
void func_E6A810_801B6E20(f32, f32, f32 *, f32 *, f32 *);
s32 func_E6A810_801B6AEC(f32, f32, f32);
void func_E6A810_801B6E20(f32, f32, f32 *, f32 *, f32 *);
void func_E9F1D0_80196968(Object_58**);
void func_E9F1D0_801878A8(Object_58**);
void func_E9F1D0_801961AC(Object_58**);
void func_E9F1D0_801A4CB0(Object_2F4*);
void func_E9F1D0_801A3BD4(Object_2F4*);
void func_E9F1D0_801888F4(Object_2F4 *);
void func_E9F1D0_80189214(void);
void func_E9F1D0_8018BDD8(void);
void func_E9F1D0_8018C390(Player*);
void func_E9F1D0_8018D16C(Object_408 *);
void func_E9F1D0_801961AC(Object_58**);
void func_E9F1D0_80196314(Object_2F4*);
void func_E9F1D0_80196968(Object_58**);
void func_E9F1D0_80197CC4(Object_408 *);
void func_E9F1D0_801A3BD4(Object_2F4*);
void func_E9F1D0_801A4CB0(Object_2F4*);
void func_E9F1D0_801A5AD4(Player*);
void func_E9F1D0_801A5FC0(Player*);
void func_E9F1D0_801A6164(Player *);
void func_EF0260_8018A96C(void);
+1 -3
View File
@@ -11,8 +11,6 @@
#define RGBA16_RED(color16) (((color16) >> 0xB) & 0x1F)
#define RGBA16_GRN(color16) (((color16) >> 6) & 0x1F)
#define RGBA16_BLU(color16) (((color16) >> 1) & 0x1F)
// unclear what the right macro for this is
// #define RGBA16_PACK(r, g, b, a) (((u16) ((r) * 0x800) & 0xF800) | ((u16) ((g) * 0x40) & 0x7C0) | ((u16) ((b) * 2) & 0x3E) | ((a) & 1))
// used for convenience while decopming. You should find/replace them with the full macros before PRing
#define GDL(dl) gSPDisplayList(gMasterDisp++, dl) // 06000000 dl
@@ -111,7 +109,7 @@ void Graphics_DisplayLargeNumber(s32 xPos, s32 yPos, s32 number);
void Graphics_DisplaySmallText(s32 xPos, s32 yPos, f32 xScale, f32 yScale, char *text);
s32 Graphics_GetSmallTextWidth(char *text);
void func_800A1540(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
void func_800A1558(f32 weight, u16 size, void *src1, void *src2, void *dst);
void Texture_BlendRGBA16(f32 weight, u16 size, u16 *src1, u16 *src2, u16 *dst);
void RCP_SetupDL(Gfx** gfxP, s16 i);
void RCP_SetFog(Gfx** gfxP, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
+1
View File
@@ -85,6 +85,7 @@ typedef enum LevelId {
/* 18 */ LEVEL_SECTOR_Z,
/* 19 */ LEVEL_VENOM_2,
/* 20 */ LEVEL_VERSUS,
/* 77 */ LEVEL_WARP_ZONE = 77,
} LevelId;
typedef enum {
+4 -4
View File
@@ -48,8 +48,8 @@ typedef enum {
RCID_ANDROSS_RED_OPEN,
RCID_JAMES = 60,
RCID_JAMES_OPEN,
RCID_PEPPER = 70,
RCID_PEPPER_OPEN,
RCID_GEN_PEPPER = 70,
RCID_GEN_PEPPER_OPEN,
RCID_BOSS_CORNERIA = 80,
RCID_BOSS_CORNERIA_OPEN,
RCID_ROB64 = 90,
@@ -94,8 +94,8 @@ typedef enum {
RCID_ANDREW_2_OPEN,
RCID_ROB64_TITLE = 300,
RCID_ROB64_TITLE_OPEN,
RCID_PEPPER_TITLE = 310,
RCID_PEPPER_TITLE_OPEN,
RCID_GEN_PEPPER_TITLE = 310,
RCID_GEN_PEPPER_TITLE_OPEN,
RCID_TRAINING = 350,
RCID_TRAINING_OPEN,
RCID_FOX_EXPERT = 400,
+131 -38
View File
File diff suppressed because it is too large Load Diff
+7 -3
View File
@@ -47,9 +47,9 @@ Graphics_DisplayLargeNumber = 0x800A100C;
Graphics_DisplaySmallText = 0x800A1200;
Graphics_GetSmallTextWidth = 0x800A13EC;
func_800A1540 = 0x800A1540;
func_800A1558 = 0x800A1558;
Texture_BlendRGBA16 = 0x800A1558;
// sf_36930
// sf_beam
PlayerShot_Initialize = 0x80035E48;
// fox_rcp
@@ -120,7 +120,7 @@ D_8017873C = 0x8017873C;
D_80178740 = 0x80178740;
D_80178744 = 0x80178744;
D_80178748 = 0x80178748;
sCurrentMsgPri = 0x800D4A70;
gCurrentMsgPri = 0x800D4A70;
func_800BA760 = 0x800BA760;
func_800BA7BC = 0x800BA7BC;
@@ -142,6 +142,10 @@ Message_DisplayText = 0x800C2AF0;
Message_DisplayScrollingText = 0x800C2D3C;
Message_IsPrintingChar = 0x800C2F30;
// fox_bg
D_800C9CC4 = 0x800C9CC4;
D_800C9CF8 = 0x800C9CF8;
// fox_save
gDefaultSave = 0x800D4D10;
gSaveFile = 0x80178870; //size:0x200
-367
View File
@@ -1,367 +0,0 @@
#include "libultra/ultra64.h"
// clang-format off
u8 gTextCharTextures[][104] = {
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x0F, 0x22, 0xF0, 0x00, 0x00,
0x00, 0x00, 0x00, 0x0F, 0x22, 0xF0, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00,
0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00,
0x00, 0x0F, 0x11, 0xF0, 0x00, 0x0F, 0x44, 0xF0,
0x00, 0x0F, 0x11, 0xF0, 0x00, 0x0F, 0x44, 0xF0,
0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00,
0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x0F, 0x88, 0xF0, 0x00, 0x00,
0x00, 0x00, 0x00, 0x0F, 0x88, 0xF0, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x35, 0x90, 0x00, 0x00, 0x00, 0x00,
0x00, 0x03, 0x35, 0x99, 0x00, 0x00, 0x00, 0x00,
0x00, 0xAA, 0xAF, 0xAA, 0xA0, 0x00, 0x00, 0x00,
0x00, 0x06, 0x65, 0xCC, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x65, 0xC0, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xAE, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00,
0x00, 0x4B, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00,
0x00, 0x5A, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00,
0x00, 0x5A, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00,
0x00, 0x5A, 0x22, 0x29, 0x00, 0x00, 0x00, 0x00,
0x00, 0x5B, 0x11, 0x1B, 0x00, 0x00, 0x00, 0x00,
0x00, 0x5A, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00,
0x00, 0x5A, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00,
0x00, 0xBE, 0xEE, 0xE1, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xB7, 0x77, 0x7B, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF0, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF0, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF0, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
0x00, 0xFB, 0xBB, 0x88, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF0, 0x04, 0x4C, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF0, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF0, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x00,
0x00, 0xB5, 0x55, 0x1D, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xD1, 0x13, 0x36, 0x00, 0x00, 0x00, 0x00,
0x00, 0xC0, 0x10, 0x60, 0x00, 0x00, 0x00, 0x00,
0x00, 0xC0, 0x14, 0x20, 0x00, 0x00, 0x00, 0x00,
0x00, 0xC0, 0x50, 0x20, 0x00, 0x00, 0x00, 0x00,
0x00, 0xC4, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00,
0x00, 0xC0, 0x50, 0x20, 0x00, 0x00, 0x00, 0x00,
0x00, 0xC0, 0x14, 0x20, 0x00, 0x00, 0x00, 0x00,
0x00, 0xE0, 0x10, 0x60, 0x00, 0x00, 0x00, 0x00,
0x00, 0xDB, 0xBB, 0x9C, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xBC, 0xCC, 0xC3, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF1, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF3, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF0, 0x31, 0x0F, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF8, 0x9B, 0x87, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF0, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF0, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF0, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
0x00, 0xB4, 0x44, 0x43, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xAF, 0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00,
0x00, 0x70, 0x80, 0x07, 0x00, 0x00, 0x00, 0x00,
0x00, 0x70, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00,
0x00, 0x70, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00,
0x00, 0x36, 0xE6, 0x61, 0x00, 0x00, 0x00, 0x00,
0x00, 0x30, 0xA0, 0x05, 0x00, 0x00, 0x00, 0x00,
0x00, 0x30, 0x92, 0x05, 0x00, 0x00, 0x00, 0x00,
0x00, 0x70, 0x81, 0x25, 0x00, 0x00, 0x00, 0x00,
0x00, 0x25, 0xD5, 0x52, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF0, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF0, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00,
0x00, 0x78, 0x00, 0x87, 0x00, 0x00, 0x00, 0x00,
0x00, 0x5A, 0x00, 0xA5, 0x00, 0x00, 0x00, 0x00,
0x00, 0x52, 0xCC, 0x25, 0x00, 0x00, 0x00, 0x00,
0x00, 0x5A, 0x44, 0xA5, 0x00, 0x00, 0x00, 0x00,
0x00, 0x5C, 0x22, 0xC5, 0x00, 0x00, 0x00, 0x00,
0x00, 0xD4, 0x22, 0x4D, 0x00, 0x00, 0x00, 0x00,
0x00, 0xC1, 0x33, 0x1C, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xB2, 0x22, 0x32, 0x00, 0x00, 0x00, 0x00,
0x00, 0x90, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00,
0x00, 0x81, 0x01, 0x20, 0x00, 0x00, 0x00, 0x00,
0x00, 0x85, 0xCF, 0xC0, 0x00, 0x00, 0x00, 0x00,
0x00, 0x88, 0x32, 0x0C, 0x00, 0x00, 0x00, 0x00,
0x00, 0x84, 0x74, 0x4C, 0x00, 0x00, 0x00, 0x00,
0x00, 0xC2, 0x10, 0x0C, 0x00, 0x00, 0x00, 0x00,
0x00, 0xE8, 0x10, 0x4C, 0x00, 0x00, 0x00, 0x00,
0x00, 0xA6, 0xFE, 0xA6, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x88, 0x82, 0x00, 0x00, 0x00, 0x00,
0x00, 0x08, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00,
0x00, 0x08, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x0F, 0x77, 0x52, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF8, 0x88, 0x27, 0x00, 0x00, 0x00, 0x00,
0x00, 0x7C, 0x44, 0x46, 0x00, 0x00, 0x00, 0x00,
0x00, 0x78, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x78, 0x00, 0x27, 0x00, 0x00, 0x00, 0x00,
0x00, 0x0F, 0x77, 0x52, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00,
0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x25, 0x7B, 0xA1, 0x00, 0x00, 0x00, 0x00,
0x00, 0x32, 0x40, 0x92, 0x00, 0x00, 0x00, 0x00,
0x00, 0x30, 0x40, 0x92, 0x00, 0x00, 0x00, 0x00,
0x00, 0x21, 0x51, 0x82, 0x00, 0x00, 0x00, 0x00,
0x00, 0x30, 0x40, 0x82, 0x00, 0x00, 0x00, 0x00,
0x00, 0xE5, 0x55, 0xD2, 0x00, 0x00, 0x00, 0x00,
0x00, 0x90, 0x00, 0x81, 0x00, 0x00, 0x00, 0x00,
0x00, 0x09, 0x99, 0x10, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x12, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xD4, 0xAC, 0x90, 0x00, 0x00, 0x00, 0x00,
0x00, 0xD8, 0x61, 0x48, 0x00, 0x00, 0x00, 0x00,
0x00, 0xD1, 0x70, 0x48, 0x00, 0x00, 0x00, 0x00,
0x00, 0xD0, 0x61, 0x48, 0x00, 0x00, 0x00, 0x00,
0x00, 0xD0, 0x60, 0x58, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF2, 0x22, 0x69, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xA5, 0xFF, 0xB4, 0x00, 0x00, 0x00, 0x00,
0x00, 0x7A, 0x00, 0x4F, 0x00, 0x00, 0x00, 0x00,
0x00, 0x78, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
0x00, 0x7A, 0x00, 0x47, 0x00, 0x00, 0x00, 0x00,
0x00, 0x3C, 0x66, 0x25, 0x00, 0x00, 0x00, 0x00,
0x00, 0x29, 0x11, 0x14, 0x00, 0x00, 0x00, 0x00,
0x00, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
0x00, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xE3, 0x33, 0x94, 0x00, 0x00, 0x00, 0x00,
0x00, 0xD2, 0x00, 0x85, 0x00, 0x00, 0x00, 0x00,
0x00, 0xC3, 0x10, 0x84, 0x00, 0x00, 0x00, 0x00,
0x00, 0x4A, 0x09, 0x14, 0x00, 0x00, 0x00, 0x00,
0x00, 0x5A, 0x08, 0x47, 0x00, 0x00, 0x00, 0x00,
0x00, 0x05, 0xF7, 0x34, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xF8, 0x88, 0x9E, 0x00, 0x00, 0x00, 0x00,
0x00, 0x52, 0x00, 0xB4, 0x00, 0x00, 0x00, 0x00,
0x00, 0x50, 0x3A, 0x14, 0x00, 0x00, 0x00, 0x00,
0x00, 0x50, 0xB2, 0x54, 0x00, 0x00, 0x00, 0x00,
0x00, 0x1E, 0x54, 0x34, 0x00, 0x00, 0x00, 0x00,
0x00, 0xA9, 0x89, 0x8E, 0x00, 0x00, 0x00, 0x00,
0x00, 0x40, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
0x00, 0x04, 0x44, 0x40, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x02, 0x23, 0x20, 0x00, 0x00, 0x00, 0x00,
0x00, 0x20, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x20, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x44, 0x45, 0x64, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x88, 0x80, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x8B, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x08, 0xAE, 0x80, 0x00, 0x00, 0x00, 0x00,
0x00, 0x82, 0x44, 0x28, 0x00, 0x00, 0x00, 0x00,
0x00, 0xA4, 0x04, 0x0A, 0x00, 0x00, 0x00, 0x00,
0x00, 0x20, 0x04, 0x0A, 0x00, 0x00, 0x00, 0x00,
0x00, 0x20, 0x04, 0x82, 0x00, 0x00, 0x00, 0x00,
0x00, 0x20, 0x8C, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x28, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x82, 0x05, 0x20, 0x00, 0x00, 0x00, 0x00,
0x00, 0x8C, 0xFF, 0xDC, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x55, 0xDD, 0xF5, 0x00, 0x00, 0x00, 0x00,
0x00, 0x48, 0x02, 0x21, 0x00, 0x00, 0x00, 0x00,
0x00, 0xC0, 0x20, 0x30, 0x00, 0x00, 0x00, 0x00,
0x00, 0xC2, 0x45, 0x60, 0x00, 0x00, 0x00, 0x00,
0x00, 0xE4, 0x99, 0xB4, 0x00, 0x00, 0x00, 0x00,
0x00, 0xA8, 0x00, 0x2D, 0x00, 0x00, 0x00, 0x00,
0x00, 0xA2, 0x22, 0x2F, 0x00, 0x00, 0x00, 0x00,
0x00, 0xD0, 0x00, 0x2D, 0x00, 0x00, 0x00, 0x00,
0x00, 0x0D, 0xDD, 0xF0, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x17, 0xFF, 0xF1, 0x00, 0x00, 0x00, 0x00,
0x00, 0x60, 0x88, 0x07, 0x00, 0x00, 0x00, 0x00,
0x00, 0x68, 0x00, 0x16, 0x00, 0x00, 0x00, 0x00,
0x00, 0x60, 0x01, 0x46, 0x00, 0x00, 0x00, 0x00,
0x00, 0x06, 0x67, 0x24, 0x00, 0x00, 0x00, 0x00,
0x00, 0x20, 0x10, 0x06, 0x00, 0x00, 0x00, 0x00,
0x00, 0x20, 0x10, 0x06, 0x00, 0x00, 0x00, 0x00,
0x00, 0x21, 0x00, 0x42, 0x00, 0x00, 0x00, 0x00,
0x00, 0x07, 0x66, 0x20, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
},
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x08, 0x88, 0x80, 0x00, 0x00, 0x00, 0x00,
0x00, 0x08, 0xA8, 0x90, 0x00, 0x00, 0x00, 0x00,
0x00, 0x08, 0x8B, 0x80, 0x00, 0x00, 0x00, 0x00,
0x00, 0x08, 0x8F, 0x80, 0x00, 0x00, 0x00, 0x00,
0x00, 0x08, 0xDC, 0xE0, 0x00, 0x00, 0x00, 0x00,
0x00, 0x08, 0x9C, 0xA0, 0x00, 0x00, 0x00, 0x00,
0x00, 0x08, 0x98, 0xA0, 0x00, 0x00, 0x00, 0x00,
0x00, 0x08, 0x8B, 0x80, 0x00, 0x00, 0x00, 0x00,
0x00, 0x08, 0x8F, 0x80, 0x00, 0x00, 0x00, 0x00,
0x00, 0x08, 0xEC, 0xD0, 0x00, 0x00, 0x00, 0x00,
0x00, 0x08, 0x8C, 0x80, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
}
};
// clang-format on
File diff suppressed because it is too large Load Diff
+2298
View File
File diff suppressed because it is too large Load Diff
+38
View File
@@ -0,0 +1,38 @@
#include "global.h"
void func_800846F0(FrameBuffer* arg0) {
s32 i;
s32 j;
u16* var_v0;
s32 sp60[5];
s32 sp4C[5];
s32 sp38[5];
for (i = 0; i < gFrameCounter % SCREEN_HEIGHT; i++) {
var_v0 = SCREEN_WIDTH * i + arg0->data;
for (j = 0; j < gFrameCounter % SCREEN_WIDTH; j++, var_v0++) {
sp60[1] = RGBA16_RED(var_v0[0]);
sp4C[1] = RGBA16_GRN(var_v0[0]);
sp38[1] = RGBA16_BLU(var_v0[0]);
sp60[2] = RGBA16_RED(var_v0[1]);
sp4C[2] = RGBA16_GRN(var_v0[1]);
sp38[2] = RGBA16_BLU(var_v0[1]);
sp60[3] = RGBA16_RED(var_v0[SCREEN_WIDTH]);
sp4C[3] = RGBA16_GRN(var_v0[SCREEN_WIDTH]);
sp38[3] = RGBA16_BLU(var_v0[SCREEN_WIDTH]);
sp60[4] = RGBA16_RED(var_v0[SCREEN_WIDTH + 1]);
sp4C[4] = RGBA16_GRN(var_v0[SCREEN_WIDTH + 1]);
sp38[4] = RGBA16_BLU(var_v0[SCREEN_WIDTH + 1]);
sp60[0] = (sp60[1] + sp60[2] + sp60[3] + sp60[4]) / 4;
sp4C[0] = (sp4C[1] + sp4C[2] + sp4C[3] + sp4C[4]) / 4;
sp38[0] = (sp38[1] + sp38[2] + sp38[3] + sp38[4]) / 4;
var_v0[0] = (sp60[0] << 0xB) | (sp4C[0] << 0x6) | (sp38[0] << 0x1);
}
}
osWritebackDCacheAll();
}
+1125
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -2469,7 +2469,7 @@ void func_800690D0(s32 index, s32 objId) {
func_E6A810_8018B720(&gObjects2F4[index]);
break;
case OBJ_408_319:
func_E51970_80198594(&gObjects408[index]);
func_DF4260_80198594(&gObjects408[index]);
break;
}
}
+1 -1
View File
@@ -4044,7 +4044,7 @@ void func_80074FF0(Object_2F4* obj2F4) {
if (obj2F4->unk_150 > 0.001f) {
Matrix_Scale(gGfxMatrix, obj2F4->unk_150, obj2F4->unk_150, obj2F4->unk_150, 1);
Matrix_SetGfxMtx(&gMasterDisp);
func_800A1558(obj2F4->unk_154, 0xB0, D_9003890, D_9003DF0, D_9003330);
Texture_BlendRGBA16(obj2F4->unk_154, 16 * 11, D_9003890, D_9003DF0, D_9003330);
gSPDisplayList(gMasterDisp++, D_9002CF0);
}
break;
+5 -5
View File
@@ -5501,7 +5501,7 @@ void func_800B56BC(Player* player) {
var_fv1 = 0;
}
Math_SmoothStepToF(&player->unk_030, var_fv1 * 1.6f, 0.1f, 3.0f, 0.05f);
if (gLevelType == 1) {
if (gLevelType == LEVELTYPE_SPACE) {
Math_SmoothStepToF(&player->unk_02C, var_fv0 * 0.8f, 0.1f, 3.0f, 0.05f);
} else if (player->pos.y < (D_80177940 + 50.0f)) {
Math_SmoothStepToF(&player->unk_02C, var_fv0 * 0.3f, 0.1f, 3.0f, 0.05f);
@@ -5890,8 +5890,8 @@ void func_800B7184(Player* player, s32 arg1) {
void func_800B71E4(Player* player) {
switch (player->state_1C8) {
case 3:
switch (gLevelMode) { /* switch 1; irregular */
case 0: /* switch 1 */
switch (gLevelMode) {
case LEVELMODE_ON_RAILS:
if (player->form == FORM_ARWING) {
if (player->unk_238 == 0) {
func_800B56BC(player);
@@ -5904,10 +5904,10 @@ void func_800B71E4(Player* player) {
func_E16C50_801AA8E8(player);
}
break;
case 1: /* switch 1 */
case LEVELMODE_ALL_RANGE:
func_800B7184(player, 0);
break;
case 2: /* switch 1 */
case LEVELMODE_UNK_2:
func_E9F1D0_801A5FC0(player);
break;
}
+11 -11
View File
@@ -12,7 +12,7 @@ f32 D_80178740;
s32 D_80178744;
s32 D_80178748;
s32 sCurrentMsgPri = 0;
s32 gCurrentMsgPri = 0;
void func_800BA760(void) {
RCP_SetupDL_36();
@@ -22,16 +22,16 @@ void func_800BA760(void) {
}
s32 func_800BA7BC(u16* msg, s32 priority) {
if (priority == sCurrentMsgPri) {
if (priority == gCurrentMsgPri) {
return 0;
}
if (priority < sCurrentMsgPri) {
if (priority < gCurrentMsgPri) {
return 1;
}
if (sCurrentMsgPri < priority) {
sCurrentMsgPri = priority;
if (gCurrentMsgPri < priority) {
gCurrentMsgPri = priority;
return 2;
}
}
@@ -78,7 +78,7 @@ void func_800BA808(u16* msg, s32 character) {
return;
}
sCurrentMsgPri = priority;
gCurrentMsgPri = priority;
D_80177D68 = character;
if (gExpertMode && ((character == RCID_FOX) || (character == RCID_FOX_RED))) {
@@ -347,10 +347,10 @@ void func_800BAAE8(void) {
case RCID_BILL_OPEN:
sp44 = D_D002ED0;
break;
case RCID_PEPPER:
case RCID_GEN_PEPPER:
sp44 = D_D007A70;
break;
case RCID_PEPPER_OPEN:
case RCID_GEN_PEPPER_OPEN:
sp44 = D_D008990;
break;
case RCID_ROB64_TITLE:
@@ -359,10 +359,10 @@ void func_800BAAE8(void) {
case RCID_ROB64_TITLE_OPEN:
sp44 = D_E00F020;
break;
case RCID_PEPPER_TITLE:
case RCID_GEN_PEPPER_TITLE:
sp44 = D_E00FF40;
break;
case RCID_PEPPER_TITLE_OPEN:
case RCID_GEN_PEPPER_TITLE_OPEN:
sp44 = D_E010E60;
break;
case RCID_TRAINING:
@@ -636,7 +636,7 @@ void func_800BB5D0(void) {
D_80177D38 -= 0.25f;
if (D_80177D38 == 0) {
D_80178300 = 0;
sCurrentMsgPri = 0;
gCurrentMsgPri = 0;
gRadioState = 0;
}
D_801782A4 = 2;
+42 -32
View File
@@ -1183,36 +1183,46 @@ s32 Graphics_GetSmallTextWidth(char* text) {
void func_800A1540(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
}
#ifdef NON_MATCHING
// It's something like this.
// void func_800A1558(f32 weight, u16 size, u16 *src1, u16 *src2, u16 *dst) {
// f32 r1;
// f32 g1;
// f32 b1;
// s32 a1;
// f32 r2;
// f32 g2;
// f32 b2;
// s32 a2;
// s32 i;
// 20 kinds of fake. Try to improve it here: https://decomp.me/scratch/NMQZB
void Texture_BlendRGBA16(f32 weight, u16 size, u16* src1, u16* src2, u16* dst) {
s32 i;
u16* var_a1 = SEGMENTED_TO_VIRTUAL(src1);
u16* var_a2 = SEGMENTED_TO_VIRTUAL(src2);
u16* var_a3 = SEGMENTED_TO_VIRTUAL(dst);
u16 temp1;
u16 temp2;
u16 temp3;
f32 r1;
f32 g1;
f32 b1;
s32 a1;
f32 r2;
f32 g2;
f32 b2;
s32 a2;
f32 red;
f32 grn;
f32 blu;
g2 = RGBA16_GRN(temp2); // mega fake
// src1 = SEGMENTED_TO_VIRTUAL(src1);
// src2 = SEGMENTED_TO_VIRTUAL(src2);
// dst = SEGMENTED_TO_VIRTUAL(dst);
// for(i = 0; i < size; i++) {
// r1 = RGBA16_RED(src1[i]);
// g1 = RGBA16_GRN(src1[i]);
// b1 = RGBA16_BLU(src1[i]);
// a1 = src1[i] & 1;
// r2 = RGBA16_RED(src2[i]);
// g2 = RGBA16_GRN(src2[i]);
// b2 = RGBA16_BLU(src2[i]);
// a2 = src2[i] & 1;
// dst[i] = RGBA16_PACK((r1 - r2) * weight / 100.0f + r2, (g1 - g2) * weight / 100.0f + g2, (b1 - b2) * weight /
// 100.0f + b2, a1 | a2);
// }
// }
#else
void func_800A1558(f32 weight, u16 size, void* src1, void* src2, void* dst);
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/fox_std_lib/func_800A1558.s")
#endif
for (i = 0; i < size; i++) {
temp1 = var_a1[i];
r1 = RGBA16_RED(temp1);
g1 = RGBA16_GRN(temp1);
b1 = RGBA16_BLU(temp1);
temp1 = temp1 & 1; // fake?
if (1) {} // fake?
temp2 = var_a2[i];
r2 = RGBA16_RED(temp2);
g2 = RGBA16_GRN(temp2);
b2 = RGBA16_BLU(temp2);
a2 = temp2 & 1;
red = (r2 - r1) * weight / 100.0f + r1;
grn = (g2 - g1) * weight / 100.0f + g1;
blu = (b2 - b1) * weight / 100.0f + b1;
var_a3[i] = ((u16) (red * 2048.0f) & 0xF800) | ((u16) (grn * 64.0f) & 0x7C0) | ((u16) (blu * 2.0f) & 0x3E) |
(temp1 | a2 & 1);
}
}
-153
View File
@@ -1,153 +0,0 @@
#include "global.h"
void func_80187520(s32, void*);
void func_8002E3E0(Object_2F4* obj2F4) {
s32 hits = 0;
if (gCurrentLevel == LEVEL_VENOM_2) {
if (D_8015F940 < 0xF00) {
hits = 50;
} else if (D_8015F940 < 0x1680) {
hits = 30;
} else if (D_8015F940 < 0x1E00) {
hits = 20;
} else if (D_8015F940 < 0x2580) {
hits = 10;
}
} else {
if (D_8015F940 < 0xF00) {
hits = 10;
} else if (D_8015F940 < 0x1680) {
hits = 5;
} else if (D_8015F940 < 0x1E00) {
hits = 2;
} else if (D_8015F940 < 0x2580) {
hits = 1;
}
}
if (hits != 0) {
func_80077240(obj2F4->obj.pos.x, obj2F4->obj.pos.y, obj2F4->obj.pos.z, hits);
}
gHitCount += hits;
D_80177850 = 15;
}
s32 func_8002E4F8(u16* arg0, s32 arg1) {
if ((gRadioState == 0) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0)) {
func_800BA808(arg0, arg1);
return true;
} else {
return false;
}
}
void func_8002E548(void) {
if (D_8015F93C != 0) {
s32 sp24 = D_8015F930[1];
func_8008E51C(D_8015F930, D_8015F944);
if ((D_8015F930[0] == 0) && (sp24 != D_8015F930[1]) && (D_8015F930[1] < 15)) {
Audio_PlaySfx(0x4900C02A, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
}
}
void func_8002E5E0(Object_408* obj408) {
func_80187520(0x5B, obj408);
}
void func_8002E604(Object_408* obj408) {
func_80187520(0x5C, obj408);
}
void func_8002E628(Object_408* obj408) {
func_80187520(0x5D, obj408);
}
void func_8002E64C(Object_408* obj408) {
func_80187520(0x5E, obj408);
}
void func_8002E670(Object_2F4* obj408) {
func_80187520(0x5F, obj408);
}
void func_8002E694(Object_2F4* obj408) {
func_80187520(0x60, obj408);
}
void func_8002E6B8(Object_2F4* obj408) {
func_80187520(0x61, obj408);
}
void func_8002E6DC(Object_2F4* obj408) {
func_80187520(0x62, obj408);
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002E700.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002ED60.s")
void func_8002EE34(void) {
D_8015F904 = gRadioState = gObjects2F4[1].unk_054 = gObjects2F4[2].unk_054 = gObjects2F4[3].unk_054 = 0;
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002EE64.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002F180.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002F3E0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002F5F4.s")
void func_8002F64C(void) {
if ((D_80177CD0[0] + D_80177CD0[1] + D_80177CD0[2] + D_80177CD0[3]) == 0) {
gRadioState = 0;
}
func_8002F5F4();
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002F69C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002FB4C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002FC00.s")
s32 func_8002FE74(void) {
switch (gCurrentLevel) {
case LEVEL_FORTUNA:
return D_8015F928 == (D_800C9B4C + 0x960);
case LEVEL_BOLSE:
return gObjects408[2].unk_0D0 == 4;
case LEVEL_KATINA:
return gObjects408[1].unk_0A6 == 2;
}
return 0;
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002FEF0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8003010C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_800301F4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8003049C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8003088C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_80031858.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_80031900.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_800319AC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_80034E64.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_80035098.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_800352E0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_80035448.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/D_800D4E10.s")
+39 -38
View File
@@ -1,75 +1,76 @@
#include "common.h"
#include "global.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80035D30.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_80035D30.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80035DEC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_80035DEC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/PlayerShot_Initialize.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/PlayerShot_Initialize.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80035E78.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_80035E78.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80036318.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_80036318.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80036528.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_80036528.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_800365E4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_800365E4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_800366CC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_800366CC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80036770.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_80036770.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80036874.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_80036874.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80036F88.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_80036F88.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80037438.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_80037438.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80037698.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_80037698.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003774C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003774C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80037CF4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_80037CF4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80038140.s")
void func_80038140(PlayerShot* shot);
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_80038140.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80038F34.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_80038F34.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80039210.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_80039210.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80039A50.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_80039A50.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003AF88.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003AF88.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003AFD8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003AFD8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003B00C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003B00C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003B55C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003B55C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003BA80.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003BA80.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003BAA0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003BAA0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003BACC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003BACC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003BB4C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003BB4C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003BEF4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003BEF4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003C008.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003C008.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003C3D8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003C3D8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003C4D0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003C4D0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003CC08.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003CC08.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003CF90.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003CF90.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003D54C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003D54C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003D854.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003D854.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003D9B8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003D9B8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003DA0C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_beam/func_8003DA0C.s")
+1111 -7
View File
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -1316,11 +1316,11 @@ void func_8007BC7C(f32 posX, f32 posY, f32 posZ, f32 arg3) {
}
void func_8007BCE8(Object_8C* arg0) {
if (gPlayer->state_1C8 == 7) {
if (gPlayer->state_1C8 == PLAYERSTATE_1C8_7) {
arg0->obj.rot.x = (gPlayer->unk_05C * 180.0f) / M_PI;
arg0->obj.rot.y = (-gPlayer->unk_058 * 180.0f) / M_PI;
}
if (gPlayer->state_1C8 == 6) {
if (gPlayer->state_1C8 == PLAYERSTATE_1C8_6) {
arg0->unk_46 = 2;
arg0->unk_54.y -= 0.13f;
}
@@ -1529,7 +1529,7 @@ void func_8007C6FC(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4) {
if (Rand_ZeroOne() < 0.5f) {
arg0->unk_48 = -arg0->unk_48;
}
if ((gCurrentLevel == LEVEL_FORTUNA) && (gPlayer->state_1C8 != 6)) {
if ((gCurrentLevel == LEVEL_FORTUNA) && (gPlayer->state_1C8 != PLAYERSTATE_1C8_6)) {
arg0->unk_4A = 180;
} else {
arg0->unk_4A = 255;
@@ -1564,7 +1564,7 @@ void func_8007C8C4(Object_8C* arg0) {
s32 var_v0;
var_v0 = 0;
if ((gCurrentLevel == LEVEL_FORTUNA) && (gPlayer->state_1C8 != 6)) {
if ((gCurrentLevel == LEVEL_FORTUNA) && (gPlayer->state_1C8 != PLAYERSTATE_1C8_6)) {
var_v0 = 3;
}
if (!(arg0->timer_50 & var_v0) && (gLevelType == LEVELTYPE_PLANET)) {

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