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

wip on sf_A4B50 (probably fox_play), also names and cleanup (#43)

Browse Source 
* objects?

* objects2?

* more stuff

* format

* even more cleanup

* RCP function names

* format

* NO U

* makerom too
This commit is contained in:
petrie911
2023-12-04 15:50:52 -03:00
committed by GitHub
parent b035b53569
commit 3a38f87ea5
34 changed files with 4987 additions and 1626 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -261,7 +261,7 @@ decompress: $(BASEROM)
extract:
@$(RM) -r asm/$(VERSION) bin/$(VERSION)
@echo "Unifying yamls..."
@$(CAT) yamls/$(VERSION)/header.yaml yamls/$(VERSION)/makerom.yaml yamls/$(VERSION)/main.yaml yamls/$(VERSION)/assets.yaml yamls/$(VERSION)/overlays.yaml > $(SPLAT_YAML)
@$(CAT) yamls/$(VERSION)/header.yaml yamls/$(VERSION)/main.yaml yamls/$(VERSION)/assets.yaml yamls/$(VERSION)/overlays.yaml > $(SPLAT_YAML)
@echo "Extracting..."
@$(SPLAT) $(SPLAT_YAML)
include/fox_option.h
+2 -2
View File
@@ -80,7 +80,7 @@ extern u8* D_EBFBE0_801AECF8[];
extern UnkStruct_D_EBFBE0_801AED4C D_EBFBE0_801AED4C[24];
extern s8* D_EBFBE0_801AEEAC[];
extern const char* D_EBFBE0_801AEEAC[];
extern Gfx D_EBFBE0_801AEF30[];
@@ -89,7 +89,7 @@ extern f32 D_EBFBE0_801AEF84[];
extern f32 D_EBFBE0_801AEF90[];
extern f32 D_EBFBE0_801AEF9C[];
extern s8* D_EBFBE0_801AF0C4[];
extern const char* D_EBFBE0_801AF0C4[];
extern s32 D_EBFBE0_801AF0D0[];
extern s32 D_EBFBE0_801AF0DC[];
extern s32 D_EBFBE0_801AF0E8[];
include/functions.h
+62 -53
View File
@@ -1,6 +1,7 @@
#ifndef FUNCTIONS_H
#define FUNCTIONS_H
#include "libc/stdbool.h"
#include "structs.h"
#include "fox_option.h"
@@ -67,31 +68,34 @@ void Fault_ThreadEntry(void*);
void func_80007FE4(FrameBuffer*, u16, u16);
void Fault_Init(void);
void func_8000FFCC(void);
u8* func_8001C3EC(void);
void func_80016A50(void);
void func_800182F4(s32);
void func_80019218(u32, Vec3f*, u8, f32*, f32*, s8*);
void func_8001A500(Vec3f*);
void func_8001A55C(f32*, u32);
void func_8001A838(u32 arg0);
void func_8001A838(u32);
void func_8001ACDC(s32);
void func_8001AE58(void);
s32 func_8001AE78(void);
s32 func_8001AED4(void);
void func_8001AF40(s32 arg0);
void func_8001AF40(s32);
void func_8001D1C8(s32, s32);
void func_8001D400(s32);
void func_8001D444(u8, u16, u8, u8);
void func_8001DA90(u8);
void func_8001DBD0(s32);
void func_8001DC6C(u8, u16);
void func_8000FFCC(void);
void func_8001D8A8(u8, u8);
void func_8001D8F4(u8);
void func_8001DCE0(void);
void func_8001DECC(void);
SPTask* func_8001DF50(void);
void func_8001EE00(void);
f32 func_8001FE60(f32);
f64 func_8001FE6C(f64);
s32 func_8001FE78(f32);
@@ -112,7 +116,6 @@ f32 func_8001FF40(f32);
f64 func_8001FF5C(f64);
s32 func_8001FF7C(f32);
s32 func_8001FF9C(f64);
f32 func_8001FAE4(f32);
f32 func_8001FB04(f32);
f64 func_8001FB24(f64);
@@ -139,39 +142,47 @@ s64 __ull_div(s64, s64);
s64 __ll_mul(s64, s64);
s64 __ll_rshift(s64, s64);
void func_8002E3E0(Object_2F4 *arg0);
void func_8002E3E0(Object_2F4 *);
void func_8002E548(void);
void func_8002F5F4(void);
void func_80035E48(Object_70 *);
void func_8003DAF0(void);
void func_8003DE68(s32, s32);
void func_80040CDC(void);
void func_80042FAC(Object_408 *);
void func_80042FD0(Object_408 *);
void func_800444BC(UnkStruct_D_80178280 *);
void func_80053658(UnkStruct_D_80161630 *);
void func_8005465C(s32);
u8 Overlay_Load(u8 arg0, u8 arg1);
void Overlay_InitDma(void);
void func_8005980C(f32 arg0);
void func_80057D00(void);
void func_8005980C(f32);
void func_8005F030(Vec3f*);
void func_8005F0E8(Vec3f*, Vec3f*);
void func_8005F1EC(Vec3f*);
void func_8005F290(Vec3f*, Vec3f*);
void func_8005F670(Vec3f*);
s32 func_8005F9DC(Vec3f*);
void func_80060FBC(Object*, Vec3f*);
s32 func_80060FE4(Vec3f* arg0, f32 arg1);
s32 func_80060FE4(Vec3f*, f32);
void func_800612B8(ObjectStruct_1C*, u32);
void func_80061364(Object_80*);
void func_80061394(Object_4C*);
void func_800613C4(Object_2F4*);
void func_80061474(Object_8C* arg0);
void func_80061404(Object_408*);
void func_80061444(Object_6C*);
void func_80061474(Object_8C*);
void func_80061B68(void);
void func_80061CD0(void);
void func_80061E48(Object_2F4* arg0, f32 arg1, f32 arg2, f32 arg3);
void func_80061F0C(Object_2F4* arg0, ObjectInit* arg1, s32 arg2);
void func_80062180(ObjectInit* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4);
s32 func_800631A8(Vec3f*, f32*, Vec3f*);
s32 func_8006326C(Vec3f* arg0, s32 arg1, s32 arg2, Object* arg3);
s32 func_8006326C(Vec3f* arg0, Vec3f* arg1, s32 arg2, Object* arg3);
void func_800652CC(Object_80*);
void func_800654E4(Object *);
void func_800656D4(Object_2F4*);
@@ -182,7 +193,8 @@ void func_8006684C(Object_2F4*);
void func_800669A0(Object_2F4*);
void func_80066A80(Object_2F4*);
void func_80066C00(Object_80*);
void func_80066EF0(Object_6C *); /* extern */
void func_80066EA8(Object_80*);
void func_80066EF0(Object_6C *);
void func_800671D0(Object_6C *);
void func_800674B4(f32, f32, f32, f32, f32, f32, f32, f32);
void func_8006753C(Object_2F4*);
@@ -214,19 +226,25 @@ void func_80069F30(Object_6C *);
void func_80069FD4(Object_8C *);
void func_8006A06C(UnkStruct_D_80174750*);
void func_8006A38C(void);
void func_8006A3E8(void);
void func_8006B0A0(Object_2F4 *, s32);
void func_8006B74C(Object_2F4 *);
void func_8006EEFC(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
void func_800763A4(Object_2F4 *, s32);
void func_8007717C(Object_2F4 *, s32);
void func_80077240(f32, f32, f32, s32);
void func_80078E50(f32, f32, f32, f32);
void func_800794CC(f32, f32, f32, f32);
void func_8007A6F0(Vec3f *, u32);
void func_8007ACE0(f32, f32, f32, f32, f32, f32);
void func_8007AFD0(f32, f32, f32, s32, f32);
void func_8007B228(f32, f32, f32, f32);
void func_8007BC7C(f32, f32, f32, f32);
void func_8007BFFC(f32, f32, f32, f32, f32, f32, f32, s32);
void func_8007C120(f32, f32, f32, f32, f32, f32, f32, s32);
void func_8007C484(f32, f32, f32, f32, f32, f32, f32, s32);
void func_8007D074(f32, f32, f32, f32);
void func_8007D0E0(f32, f32, f32, f32);
void func_8007D10C(f32, f32, f32, f32);
@@ -237,12 +255,13 @@ void func_80084370(s32);
void func_800843FC(s32);
void func_80084488(s32);
void func_80084688(s32, s32);
void func_80084B94(s32 arg0);
void func_80084B94(s32);
void func_800857DC(f32, f32, f32, f32);
void func_80085890(f32, f32, f32, f32);
void func_80086110(f32 arg0, f32 arg1, s32 arg2);
void func_80086110(f32, f32, s32);
void func_80086664(f32, f32);
void func_800869A0(f32 arg0, f32 arg1, s32 k, f32 arg3, s32 arg4, s32 arg5);
void func_800869A0(f32, f32, s32, f32, s32, s32);
void func_80087530(f32, f32, s32);
void func_8008865C(void);
void func_8008AD94(void);
@@ -252,23 +271,24 @@ void func_8008BD00(u8*, s32, s32, u8);
void func_8008C390(f32, f32, f32, s32);
void func_8008C5C8(f32, f32, f32, s32);
void func_8008C6F4(s32, s32);
s32 func_8008BCBC(s32 arg0);
s32 func_8008BCBC(s32);
void func_8008CA44(void);
s32 func_8008CB8C(void);
void func_8008D0DC(f32, f32, f32, f32, f32);
void func_8008DE68(void);
void func_8008E51C(s32* arg0, f32 arg1);
void func_8008E9EC(f32 arg0, f32 arg1);
void func_8008E51C(s32* , f32);
void func_8008E9EC(f32, f32);
void func_8008EA14(f32, f32);
void func_8008FA84(void);
void func_8008FFF0(Object_408* arg0, s32);
s32 func_8009092C(Object_2F4*);
void func_8008FFF0(Object_408*, s32);
bool func_8009092C(Object_2F4*);
s32 func_800915FC(Object_2F4*);
void func_80092D48(Object_2F4 *);
void func_80094D20(f32, f32);
s32 func_800998FC(Vec3f*, Vec3f*, Vec3f*, s32, Vec3f*, f32*);
void func_800A18B0(void);
void func_800A1980(void);
s32 func_800A1B6C(void);
bool func_800A1B6C(void);
void func_800A1C14(Gfx **);
void func_800A1E68(Gfx **);
void func_800A1F44(void);
@@ -276,10 +296,10 @@ void func_800A1FB0(Gfx **, u8 , u8);
void func_800A24DC(s32);
void func_800A26C0(void);
void func_800A25DC(void);
Object_2F4 *func_800A3608(s32 arg0);
Object_2F4 *func_800A3608(s32);
s32 func_800A3690(Vec3f*, Vec3f*, s32, Vec3f*);
void func_800A3CA0(void);
s32 func_800A3F50(s32);
s32 func_800A3F50(u16);
void func_800A5844(void);
void func_800A5D6C(void);
void func_800A6148(void);
@@ -291,28 +311,17 @@ void func_800BA808(u16*, s32);
void func_800BB5D0(void);
void Graphics_NMIWipe(void);
void func_800B6F50(f32, f32, f32, f32, f32, f32);
void func_800B9358(void);
void RCP_SetupDL_36(void);
void func_800C1ED4(void);
void func_800C20B0(void);
void func_800C2190(void);
u16* Message_PtrFromId(u16 msgId);
u16 Message_IdFromPtr(u16*);
s32 Message_GetWidth(u16* msgPtr);
s32 Message_GetCharCount(u16* msgPtr);
void Message_DisplayChar(Gfx** gfxPtr, u16 msgChar, s32 xpos, s32 ypos);
s32 Message_DisplayText(Gfx** gfxPtr, u16* msgPtr, s32 xPos, s32 yPos, s32 len);
void Message_DisplayScrollingText(Gfx** gfxPtr, u16* msgPtr, s32 xPos, s32 yPos, s32 yRangeHi, s32 yRangeLo, s32 len);
s32 Message_NotWhitespace(u16*, s32);
s32 Save_Write(void);
s32 Save_Read(void);
void func_EFFA40_80187520(s32, void*);
void func_DF4260_80198310(Object_408 *);
void func_DF4260_801878D8(Object_408 *);
void func_DF4260_801988E0(void);
void func_DF4260_8018B0B4(Object_2F4 *);
void func_DF4260_8018BE7C(Object_408 *);
void func_DF4260_8019250C(Object_2F4 *);
@@ -320,11 +329,16 @@ void func_DF4260_80192CB0(Object_2F4 *);
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_801988E0(void);
void func_E08400_80187B08(Object_2F4 *, s32);
void func_E08400_80188A40(Object_408 *);
void func_E16C50_80190F08(Object_2F4 *);
void func_E16C50_80187754(Object_408 *);
void func_E16C50_80190F08(Object_2F4 *);
void func_E16C50_801915A4(Object_2F4 *);
void func_E16C50_80191BB8(Object_2F4 *);
void func_E16C50_801932AC(Object_408 *);
void func_E16C50_8019B1F0(Object_2F4 *);
void func_E16C50_8019B810(Object_2F4 *);
@@ -339,20 +353,22 @@ 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_801915A4(Object_2F4 *);
void func_E16C50_80191BB8(Object_2F4 *);
void func_E51970_80193CA4(Object_408 *);
void func_E51970_80198594(Object_408 *, s32);
void func_E6A810_80189B80(Object_2F4 *);
void func_E6A810_8018ADC4(Object_2F4 *);
void func_E6A810_8018B720(Object_2F4 *, s32);
void func_E6A810_8018B96C(Object_2F4 *);
void func_E6A810_8018BFB0(Object_2F4 *);
void func_E6A810_8018E3B0(Object_2F4 *);
void func_E6A810_8018E3CC(Object_2F4 *);
void func_E6A810_8018E5E8(Object_2F4 *);
void func_E6A810_8018EFF0(Object_4C *);
void func_E6A810_8018F0D8(Object_80 *);
void func_E6A810_8018FA48(Object_408 *);
void func_E6A810_801990DC(Object_408 *, s32);
void func_E6A810_80199F8C(Object_2F4 *);
void func_E6A810_801A3E70(Object_2F4 *);
void func_E6A810_801A4660(Object_2F4 *);
@@ -364,18 +380,11 @@ void func_E6A810_801A7D98(Object_2F4 *);
s32 func_E6A810_801B6AEC(f32, f32, f32);
void func_E6A810_801B6E20(f32, f32, f32 *, f32 *, f32 *);
void func_E9F1D0_80197CC4(Object_408 *);
void func_E9F1D0_8018D16C(Object_408 *);
void func_E9F1D0_801888F4(Object_2F4 *, s32);
void func_E9F1D0_8018D16C(Object_408 *);
void func_E9F1D0_80197CC4(Object_408 *);
void func_EF0260_8018A96C(void);
void func_EF0260_8018AAC4(void);
void func_E08400_80187B08(Object_2F4 *, s32);
void func_E9F1D0_801888F4(Object_2F4 *, s32);
void func_E6A810_8018B720(Object_2F4 *, s32);
void func_E51970_80198594(Object_408 *, s32);
void func_E6A810_801990DC(Object_408 *, s32);
void func_E6A810_8018E3B0(Object_2F4 *);
#endif
include/gfx.h
+53 -53
View File
@@ -197,58 +197,58 @@ 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 RCP_SetupDL(Gfx** gfxP, s16 i);
void func_800B8E14(Gfx** gfxP, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void func_800B8F18(void);
void func_800B8F48(void);
void func_800B8F78(void);
void func_800B8FA8(void);
void func_800B8FD8(void);
void func_800B9008(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void func_800B9120(void);
void func_800B9150(void);
void func_800B9180(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void func_800B9298(void);
void func_800B92C8(void);
void func_800B92F8(void);
void func_800B9328(void);
void func_800B9358(void);
void func_800B9388(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void func_800B94A0(void);
void func_800B94D0(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void func_800B95E8(void);
void func_800B9618(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void func_800B9730(void);
void func_800B9760(void);
void func_800B9790(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void func_800B98A8(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void func_800B99C0(void);
void func_800B99F0(void);
void func_800B9A20(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void func_800B9B38(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void func_800B9C50(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void func_800B9D68(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void func_800B9E80(void);
void func_800B9EB0(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void func_800B9FC8(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void func_800BA0E0(void);
void func_800BA110(void);
void func_800BA140(void);
void func_800BA170(void);
void func_800BA1A0(void);
void func_800BA1D0(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void func_800BA2E8(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void func_800BA400(void);
void func_800BA430(void);
void func_800BA460(void);
void func_800BA490(void);
void func_800BA4C0(void);
void func_800BA4F0(void);
void func_800BA520(void);
void func_800BA550(void);
void func_800BA580(void);
void func_800BA5B0(void);
void func_800BA5E0(void);
void func_800BA610(void);
void func_800BA640(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void RCP_SetFog(Gfx** gfxP, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void RCP_SetupDL_0(void);
void RCP_SetupDL_1(void);
void RCP_SetupDL_11(void);
void RCP_SetupDL_12(void);
void RCP_SetupDL_2(void);
void RCP_SetupDL_3(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void RCP_SetupDL_4(void);
void RCP_SetupDL_7(void);
void RCP_SetupDL_9(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void RCP_SetupDL_8(void);
void RCP_SetupDL_13(void);
void RCP_SetupDL_14(void);
void RCP_SetupDL_17(void);
void RCP_SetupDL_36(void);
void RCP_SetupDL_52(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void RCP_SetupDL_62(void);
void RCP_SetupDL_37(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void RCP_SetupDL_18(void);
void RCP_SetupDL_20(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void RCP_SetupDL_19(void);
void RCP_SetupDL_21(void);
void RCP_SetupDL_33(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void RCP_SetupDL_34(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void RCP_SetupDL_40(void);
void RCP_SetupDL_42(void);
void RCP_SetupDL_43(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void RCP_SetupDL_60(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void RCP_SetupDL_47(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void RCP_SetupDL_66(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void RCP_SetupDL_55(void);
void RCP_SetupDL_57(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void RCP_SetupDL_45(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void RCP_SetupDL_46(void);
void RCP_SetupDL_41(void);
void RCP_SetupDL_64(void);
void RCP_SetupDL_64_2(void);
void RCP_SetupDL_23(void);
void RCP_SetupDL_29(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void RCP_SetupDL_30(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
void RCP_SetupDL_27(void);
void RCP_SetupDL_32(void);
void RCP_SetupDL_73(void);
void RCP_SetupDL_76(void);
void RCP_SetupDL_74(void);
void RCP_SetupDL_78(void);
void RCP_SetupDL_81(void);
void RCP_SetupDL_48(void);
void RCP_SetupDL_68(void);
void RCP_SetupDL_49(void);
void RCP_SetupDL_44(void);
void RCP_SetupDL_50(void);
void RCP_SetupDL_61(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far);
#endif
include/global.h
+1
View File
@@ -16,6 +16,7 @@
#include "structs.h"
#include "macros.h"
#include "sf64math.h"
#include "sf64mesg.h"
#include "gfx.h"
typedef enum {
include/sf64dma.h
+3
View File
@@ -64,6 +64,9 @@
#define SEGMENT_BSS_END(segment) (segment ## _BSS_END)
#define SEGMENT_BSS_SIZE(segment) ((uintptr_t)SEGMENT_BSS_END(segment) - (uintptr_t)SEGMENT_BSS_START(segment))
u8 Overlay_Load(u8, u8);
void Overlay_InitDma(void);
typedef struct {
/* 0x0 */ void* start;
/* 0x4 */ void* end;
include/sf64mesg.h
+903
View File
File diff suppressed because it is too large Load Diff
include/structs.h
+110 -35
View File
@@ -6,11 +6,6 @@
#define UNK_TYPE s32
typedef struct {
s32 msgId;
u16* msgPtr;
} MsgLookup;
typedef void (*TimerAction)(s32*, s32);
typedef struct {
@@ -115,15 +110,6 @@ typedef struct {
/* 0x3 */ s8 unk_3;
} UnkStruct_D_8017797C; // size = 0x4
typedef struct {
/* 0x00 */ u8 unk_00;
/* 0x01 */ char pad01[0x1];
/* 0x02 */ u16 unk_02;
/* 0x04 */ Vec3f pos;
/* 0x10 */ f32 unk_10;
/* 0x14 */ char pad14[0x14];
} UnkStruct_D_80175A10; // size = 0x28
typedef struct {
/* 0x00 */ u8 unk_00;
/* 0x01 */ u8 unk_01;
@@ -143,6 +129,28 @@ typedef struct {
/* 0x38 */ f32 unk_38;
} UnkStruct_D_80161630; // size = 0x3C
typedef struct {
/* 0x00 */ s32 unk_00;
/* 0x04 */ s32 unk_04;
/* 0x08 */ u16 unk_08;
/* 0x0A */ u16 unk_0A;
/* 0x0C */ s32 unk_0C;
/* 0x10 */ s32 unk_10;
/* 0x14 */ s32 unk_14;
/* 0x18 */ s32 unk_18;
/* 0x1C */ s32 unk_1C;
/* 0x20 */ f32 unk_20;
/* 0x24 */ f32 unk_24;
/* 0x28 */ f32 unk_28;
/* 0x2C */ s32 unk_2C;
/* 0x30 */ s32 unk_30;
/* 0x34 */ s32 unk_34;
/* 0x38 */ s32 unk_38;
/* 0x3C */ s32 unk_3C;
/* 0x40 */ s32 unk_40;
/* 0x44 */ char pad44[0x60];
} UnkStruct_D_80161A68; // size = 0x44?
typedef struct UnkStruct_D_80178280 {
/* 0x000 */ char pad0[0xC];
/* 0x00C */ f32 unk_00C;
@@ -153,21 +161,39 @@ typedef struct UnkStruct_D_80178280 {
/* 0x04C */ Vec3f unk_04C;
/* 0x058 */ f32 unk_058;
/* 0x05C */ f32 unk_05C;
/* 0x060 */ char pad060[0x14];
/* 0x05C */ f32 unk_060;
/* 0x064 */ char pad064[0x10];
/* 0x074 */ f32 unk_074;
/* 0x078 */ f32 unk_078;
/* 0x07C */ f32 unk_07C;
/* 0x080 */ char pad80[0x2C];
/* 0x080 */ f32 unk_080;
/* 0x084 */ char pad84[4];
/* 0x088 */ f32 unk_088;
/* 0x08C */ char pad8C[4];
/* 0x090 */ f32 unk_090;
/* 0x094 */ f32 unk_094;
/* 0x098 */ f32 unk_098;
/* 0x09C */ char pad9C[0x10];
/* 0x0AC */ f32 unk_0AC;
/* 0x0B0 */ f32 unk_0B0;
/* 0x0B4 */ f32 unk_0B4;
/* 0x0B8 */ f32 unk_0B8;
/* 0x0BC */ f32 unk_0BC;
/* 0x0C0 */ f32 unk_0C0;
/* 0x0C4 */ f32 unk_0C4;
/* 0x0C8 */ char padC8[8];
/* 0x0C0 */ Vec3f unk_0C0;
/* 0x0CC */ char padCC[4];
/* 0x0D0 */ f32 unk_0D0;
/* 0x0D4 */ char padD4[0x3C];
/* 0x0D4 */ char padD4[4];
/* 0x0D8 */ Vec3f unk_0D8;
/* 0x0E4 */ f32 unk_0E4;
/* 0x0E8 */ f32 unk_0E8;
/* 0x0EC */ char padEC[4];
/* 0x0F0 */ f32 unk_0F0;
/* 0x0F4 */ f32 unk_0F4;
/* 0x0F8 */ f32 unk_0F8;
/* 0x0FC */ char padFC[8];
/* 0x104 */ f32 unk_104;
/* 0x108 */ char pad108[4];
/* 0x10C */ f32 unk_10C;
/* 0x110 */ f32 unk_110;
/* 0x114 */ f32 unk_114;
/* 0x118 */ f32 unk_118;
@@ -176,41 +202,63 @@ typedef struct UnkStruct_D_80178280 {
/* 0x124 */ f32 unk_124;
/* 0x128 */ char pad128[0x10];
/* 0x138 */ f32 unk_138;
/* 0x13C */ char pad13C[8];
/* 0x13C */ char pad13C[4];
/* 0x140 */ f32 unk_140;
/* 0x144 */ f32 unk_144;
/* 0x148 */ char pad148[0x54];
/* 0x19C */ s32 unk_19C;
/* 0x1A0 */ char pad1A0[0x28];
/* 0x1A0 */ char pad1A0[4];
/* 0x1A4 */ s32 unk_1A4;
/* 0x1A8 */ char pad1A8[0x1C];
/* 0x1C4 */ s32 unk_1C4;
/* 0x1C8 */ s32 unk_1C8;
/* 0x1CC */ s32 unk_1CC;
/* 0x1D0 */ s32 unk_1D0;
/* 0x1D4 */ char pad1D4[0x20];
/* 0x1D4 */ s32 unk_1D4;
/* 0x1D8 */ char pad1D8[0x1C];
/* 0x1F4 */ s32 unk_1F4;
/* 0x1F8 */ char pad1F8[0xC];
/* 0x1F8 */ s32 unk_1F8;
/* 0x1FC */ s32 unk_1FC;
/* 0x200 */ char pad200[4];
/* 0x204 */ s32 unk_204;
/* 0x208 */ char pad208[8];
/* 0x210 */ s32 unk_210;
/* 0x214 */ char pad214[0x10];
/* 0x214 */ char pad214[8];
/* 0x21C */ s32 unk_21C;
/* 0x220 */ s32 unk_220;
/* 0x224 */ s32 unk_224;
/* 0x228 */ s32 unk_228;
/* 0x22C */ char pad22C[0xC];
/* 0x22C */ s32 unk_22C;
/* 0x230 */ char pad230[8];
/* 0x238 */ s32 unk_238;
/* 0x23C */ char pad23C[0x28];
/* 0x23C */ s32 unk_23C;
/* 0x240 */ char pad240[0x24];
/* 0x264 */ s32 unk_264;
/* 0x268 */ char pad268[0x4];
/* 0x268 */ s32 unk_268;
/* 0x26C */ s32 unk_26C;
/* 0x270 */ char pad270[0xC];
/* 0x27C */ s32 unk_27C;
/* 0x280 */ char pad280[0x34];
/* 0x280 */ char pad280[4];
/* 0x284 */ s32 unk_284;
/* 0x288 */ s32 unk_288;
/* 0x28C */ char pad28C[0x28];
/* 0x2B4 */ s32 unk_2B4;
/* 0x2B8 */ char pad2B8[0x4];
/* 0x2BC */ f32 unk_2BC;
/* 0x2C0 */ char pad2C0[0x1A0];
/* 0x2C0 */ char pad2C0[8];
/* 0x2C8 */ Vec3f unk_2C8;
/* 0x2D4 */ Vec3f unk_2D4;
/* 0x2E0 */ Vec3f unk_2E0;
/* 0x2EC */ Vec3f unk_2EC;
/* 0x2F8 */ char pad2F8[0x168];
/* 0x460 */ Vec3f unk_460[1];
/* 0x46C */ char pad46C[0x30];
/* 0x46C */ char pad46C[0x2C];
/* 0x498 */ s32 unk_498;
/* 0x49C */ u8 unk_49C; // could be array
/* 0x49C */ u8 unk_49D;
/* 0x49E */ char pad49E[0x42];
/* 0x49E */ char pad49E[0x3A];
/* 0x4D8 */ f32 unk_4D8;
/* 0x4DC */ s32 unk_4DC;
} UnkStruct_D_80178280; // size = 0x4E0 Might be Player
typedef struct {
@@ -245,6 +293,28 @@ typedef struct {
/* 0x20 */ u8 unk_20;
} ObjectStruct_1C; // size = 0x24
typedef struct {
/* 0x00 */ u8 unk_00;
/* 0x01 */ char pad01[0x1];
/* 0x02 */ u16 unk_02;
/* 0x04 */ Vec3f pos;
/* 0x10 */ f32 unk_10;
/* 0x14 */ char pad14[0x14];
} UnkStruct_D_80175A10; // size = 0x28
typedef struct {
char unk_00[0x1C];
} UnkStruct_D_80176438;
typedef struct {
/* 0x00 */ Object obj;
/* 0x1C */ char pad1C[0x1C];
/* 0x38 */ Vec3f unk_38;
/* 0x44 */ char pad44[0x1C];
/* 0x60 */ s32 unk_60;
/* 0x64 */ char pad64[0xC];
} Object_70; // size = 0x70
typedef struct {
/* 0x00 */ Object obj;
/* 0x1C */ ObjectStruct_1C unk_1C;
@@ -359,17 +429,22 @@ typedef struct {
/* 0x074 */ f32 unk_074;
/* 0x078 */ char pad78[0xC];
/* 0x084 */ f32 unk_084;
/* 0x088 */ char pad88[0x3E];
/* 0x088 */ char pad88[0x1E];
/* 0x0A6 */ s16 unk_0A6;
/* 0x0A8 */ char padA8[0x1E];
/* 0x0C6 */ u16 unk_0C6;
/* 0x0C8 */ char padC8[1];
/* 0x0C9 */ u8 unk_0C9;
/* 0x0CA */ char padCA[0x12];
/* 0x0CA */ char padCA[6];
/* 0x0D0 */ s16 unk_0D0;
/* 0x0D2 */ char padD2[0xA];
/* 0x0DC */ f32 unk_0DC;
/* 0x0E0 */ f32 unk_0E0;
/* 0x0E4 */ f32 unk_0E4;
/* 0x0E8 */ char padE8[0x28];
/* 0x110 */ f32 unk_110;
/* 0x114 */ char pad114[0x1F4];
/* 0x114 */ f32 unk_114;
/* 0x118 */ char pad118[0x1F0];
/* 0x308 */ Vec3f unk_308;
/* 0x314 */ char pad314[0xE4];
/* 0x3F8 */ f32 unk_3F8;
include/variables.h
+80 -28
View File
@@ -151,8 +151,7 @@ extern OSMesg D_80156608[4];
extern OSMesg D_80156618[1];
extern OSMesg D_8015661C[1];
extern Gfx D_8015DF0[];
extern u16 D_800C9C3C[16];
extern f32 D_800CBF18[];
extern ObjectStruct_1C D_800CC124[];
extern f32 D_800CF9B0[];
@@ -211,10 +210,11 @@ extern s32 D_800D2884[];
extern s32 D_800D2894[];
extern s32 D_800D28A4[];
extern s32 D_800D28B4[];
extern u8 D_800D3180[0x1E];
extern u8 D_800D3180[0x1E]; // might be bigger? at least 0x21
extern s32 D_800D4A70;
extern Save gDefaultSave;
extern s32 D_8015F90C;
extern s32 D_8015F924;
extern s32 D_8015F928;
extern s32 D_8015F930[3];
@@ -274,7 +274,13 @@ extern f32 D_80161A44;
extern u8 D_80161A50;
extern f32 D_80161A54;
extern s32 D_80161A5C;
extern u16 D_80161A60;
extern u16 D_80161A62;
extern s32 D_80161A64;
extern UnkStruct_D_80161A68* D_80161A68;
extern s32 D_80161A70;
extern s32 D_80161A74;
extern s32 D_80161A78;
extern s32 D_80161A88;
extern s32 D_80161A8C;
extern u8 D_80161A90[];
@@ -289,11 +295,10 @@ extern Object_2F4 D_80163FE0[60];
extern Object_408 D_8016F110[4];
extern Object_8C D_80170130[100];
extern Object_6C D_801737E0[20];
// extern size_70 D_80174050[16]
extern Object_70 D_80174050[16];
extern UnkStruct_D_80174750 D_80174750[100];
extern UnkStruct_D_80175A10 D_80175A10[64];
extern UnkStruct_D_80175A10 D_80176410;
// extern size_1C D_80176438[10]
extern UnkStruct_D_80175A10 D_80175A10[65];
extern UnkStruct_D_80176438 D_80176438[10];
extern s32 D_80176550[2];
extern f32 D_80176558[2][100];
extern f32 D_80176878[2][100];
@@ -353,7 +358,10 @@ extern s32 D_801779F8;
extern s32 D_80177A80;
extern s8 D_80177A98;
extern u8 D_80177AB0;
extern f32 D_80177AB8[];
extern s32 D_80177AD0[];
extern s32 D_80177AE0;
extern s32 D_80177AE8[];
extern s32 D_80177AF8;
extern s32 D_80177B40;
extern s32 D_80177B50[];
@@ -365,6 +373,7 @@ extern u16 D_80177C30[];
extern s32 D_80177C50;
extern u8 D_80177C74;
extern s32 D_80177C80[];
extern u16 D_80177C90;
extern s32 D_80177C94;
extern u8 D_80177C98;
extern s32 D_80177C9C;
@@ -377,12 +386,15 @@ extern s32 D_80177CBC;
extern s32 D_80177CC4;
extern f32 D_80177D08;
extern s32 D_80177D10[];
extern u16 D_8017D138;
extern f32 D_80177D20;
extern s32 D_80177D28[];
extern s32 D_80177D40[];
extern f32 D_80177D50;
extern s32 D_80177D58[];
extern f32 D_80177D68;
extern s32 D_80177D70[];
extern s32 D_80177D88[];
extern s32 D_80177DA0[];
extern s32 D_80177DB0;
extern s32 D_80177DC8;
@@ -390,21 +402,35 @@ extern s32 D_80177E70;
extern s32 D_80177E78;
extern s32 D_80177E80;
extern Vec3f D_80177E88;
extern Vec3f D_80177E98[];
extern Vec3f D_80177E98[10];
extern Vec3f D_80177F10;
extern s32 D_8017812C;
extern s32 D_80178234;
extern s32 D_8017827C;
extern UnkStruct_D_80178280* D_80178280;
extern s32 D_80178284;
extern f32* D_80178288;
extern s32 D_8017828C;
extern f32* D_80178290;
extern s32 D_80178294;
extern u32* D_80178298;
extern s32 D_8017829C;
extern s32 D_801782A4;
extern Object_58 *D_801782A8;
extern s32 D_801782B8;
extern s32 D_801782BC;
extern s32 D_801782C0;
extern f32 *D_801782C4;
extern f32 *D_801782CC;
extern s32 D_801782D0;
extern f32* D_801782D4;
extern s32 D_801782D8;
extern f32 *D_801782DC;
extern f32 *D_801782E4;
extern s32 D_801782E8;
extern f32 *D_801782EC;
extern s32 D_801782F8;
extern s32 D_801782FC;
extern s32 D_80178300;
extern u16* D_80178308;
extern ObjectInit* D_80178310;
@@ -416,6 +442,8 @@ extern s32 D_80178340;
extern s32 D_80178348;
extern s32 D_80178350;
extern s32 D_80178354;
extern s32 D_80178358;
extern s32 D_8017835C;
extern s32 D_80178360;
extern s32 D_80178364;
extern s32 D_80178368;
@@ -442,15 +470,39 @@ extern s32 D_80178480;
extern s32 D_80178488;
extern s32 D_801784A4;
extern s32 D_801784AC;
extern f32 D_801784B8;
extern f32 D_801784BC;
extern f32 D_801784C0;
extern f32 D_801784C4;
extern f32 D_801784C8;
extern f32 D_801784CC;
extern f32 D_801784D0;
extern f32 D_801784D4;
extern f32 D_801784D8;
extern s32 D_801784DC;
extern s32 D_801784E0;
extern s32 D_801784E4;
extern f32 D_801784F8;
extern f32 D_801784FC;
extern f32 D_80178500;
extern f32 D_80178520;
extern f32 D_80178524;
extern f32 D_80178528;
extern f32 D_8017853C;
extern s32 D_80178540;
extern s32 D_80178544;
extern s32 D_80178548;
extern s32 D_8017854C;
extern s32 D_80178550;
extern s32 D_80178554;
extern s32 D_80178558;
extern s32 D_8017855C;
extern s32 D_80178564;
extern s32 D_80178568;
extern s32 D_8017856C;
extern s32 D_80178570;
extern s32 D_80178574;
extern s32 D_80178578;
extern s32 D_80178580;
extern s32 *D_80178710;
extern u16** D_80178720;
@@ -473,26 +525,6 @@ extern Gfx D_Gfx_800DBAA0[];
extern Gfx D_Gfx_800DAC20[];
extern Gfx D_Gfx_800D9688[];
extern u8 gTextCharTextures[24][16 * 13 / 2];
extern u16 D_8017A0F4[];
extern u16 D_80182544[];
extern u16 D_80183CA8[];
extern u16 D_80183CF0[];
extern u16 D_80183D3C[];
extern u16 D_80183630[];
extern u16 D_8018366C[];
extern u16 D_80183690[];
extern u16 D_801836B0[];
extern u16 D_801836F8[];
extern u16 D_80183724[];
extern u16 D_80183900[];
extern u16 D_80183950[];
extern u16 D_8018398C[];
extern u16 D_801839B8[];
extern u16 D_80183A08[];
extern u16 D_80183A64[];
extern MsgLookup gMsgLookup[];
extern Gfx* D_DF4260_8019A008[];
extern Matrix D_E51970_8019EE80;
extern Gfx* D_E6A810_801B769C[];
@@ -653,6 +685,13 @@ extern Gfx D_3015D80[];
extern Gfx D_3016660[];
extern Gfx D_3011720[];
extern Gfx D_3005980[];
extern ObjectInit D_302DE3C[];
extern ObjectInit D_302E0E4[];
extern ObjectInit D_302E170[];
extern ObjectInit D_302E378[];
extern UnkStruct_D_80161A68 D_302DD70[];
extern UnkStruct_D_80161A68 D_302DDB4[];
extern UnkStruct_D_80161A68 D_302DDF8[];
extern Gfx D_40018A0[];
extern Gfx D_4003BD0[];
@@ -784,6 +823,18 @@ extern u16 D_6025500[];
extern u16 D_6026420[];
extern u16 D_6027340[];
extern Gfx D_605C230[];
extern Vtx D_6001C50[];
extern Vtx D_6004500[];
extern Vtx D_6009ED0[];
extern Vtx D_600C780[];
extern u16 D_6022760[];
extern u16 D_602AC50[];
extern f32 D_6032328[];
extern ObjectInit D_603B074[];
extern ObjectInit D_6030B14[];
extern Gfx D_6020760[];
extern UnkStruct_D_80161A68 D_602E584[];
extern u8 D_7000F10[];
extern u8 D_7001030[];
@@ -817,6 +868,7 @@ extern u8 D_80076E0[];
extern u8 D_800CD90[];
extern u8 D_800D070[];
extern u8 D_800D170[];
extern Gfx D_8015DF0[];
extern Gfx D_900D180[];
extern Gfx D_9010FD0[];
linker_scripts/us/symbol_addr_mesg.txt
+921
View File
File diff suppressed because it is too large Load Diff
linker_scripts/us/symbol_addrs.txt
+11 -2
View File
@@ -8,13 +8,22 @@ D_800C57EC = 0x800C57EC;
D_800C7380 = 0x800C7380;
D_800C5FF4 = 0x800C5FF4; //type:u16 size:5000
D_80163FE0 = 0x80163FE0; //size:0xB130
gZBuffer = 0x80282000;
gFrameBuffers = 0x8038F800;
gDmaTable = 0x80178A70; //size:0x5A0
D_80178A70 = 0x80178A78; //ignore:true
D_80161B00 = 0x80161B00; //size:0x1900
D_80163400 = 0x80163400; //size:0xBE0
D_80163FE0 = 0x80163FE0; //size:0xB130
D_8016F110 = 0x8016F110; //size:0x1020
D_80170130 = 0x80170130; //size:0x36B0
D_801737E0 = 0x801737E0; //size:0x870
D_80174050 = 0x80174050; //size:0x700
D_80174750 = 0x80174750;//size:0x12C0
D_80175A10 = 0x80175A10;//size:0xA28
D_80176438 = 0x80176438;//size:0x18
D_800D3180 = 0x800D3180; // size:0x1E
gSetupDLs = 0x800D31B0; // size:0x18C0
linker_scripts/us/symbol_addrs_engine.txt
+56 -1
View File
@@ -44,9 +44,64 @@ Graphics_DisplaySmallText = 0x800A1200;
Graphics_GetSmallTextWidth = 0x800A13EC;
func_800A1540 = 0x800A1540;
func_800A1558 = 0x800A1558;
RCP_SetupDL = 0x800B8DD0;
RCP_SetFog = 0x800B8E14;
RCP_SetupDL_0 = 0x800b8f18;
RCP_SetupDL_1 = 0x800b8f48;
RCP_SetupDL_11 = 0x800b8f78;
RCP_SetupDL_12 = 0x800b8fa8;
RCP_SetupDL_2 = 0x800b8fd8;
RCP_SetupDL_3 = 0x800b9008;
RCP_SetupDL_4 = 0x800b9120;
RCP_SetupDL_7 = 0x800b9150;
RCP_SetupDL_9 = 0x800b9180;
RCP_SetupDL_8 = 0x800b9298;
RCP_SetupDL_13 = 0x800b92c8;
RCP_SetupDL_14 = 0x800b92f8;
RCP_SetupDL_17 = 0x800b9328;
RCP_SetupDL_36 = 0x800b9358;
RCP_SetupDL_52 = 0x800b9388;
RCP_SetupDL_62 = 0x800b94a0;
RCP_SetupDL_37 = 0x800b94d0;
RCP_SetupDL_18 = 0x800b95e8;
RCP_SetupDL_20 = 0x800b9618;
RCP_SetupDL_19 = 0x800b9730;
RCP_SetupDL_21 = 0x800b9760;
RCP_SetupDL_33 = 0x800b9790;
RCP_SetupDL_34 = 0x800b98a8;
RCP_SetupDL_40 = 0x800b99c0;
RCP_SetupDL_42 = 0x800b99f0;
RCP_SetupDL_43 = 0x800b9a20;
RCP_SetupDL_60 = 0x800b9b38;
RCP_SetupDL_47 = 0x800b9c50;
RCP_SetupDL_66 = 0x800b9d68;
RCP_SetupDL_55 = 0x800b9e80;
RCP_SetupDL_57 = 0x800b9eb0;
RCP_SetupDL_45 = 0x800b9fc8;
RCP_SetupDL_46 = 0x800ba0e0;
RCP_SetupDL_41 = 0x800ba110;
RCP_SetupDL_64 = 0x800ba140;
RCP_SetupDL_64_2 = 0x800ba170;
RCP_SetupDL_23 = 0x800BA1A0;
RCP_SetupDL_29 = 0x800BA1D0;
RCP_SetupDL_30 = 0x800BA2E8;
RCP_SetupDL_27 = 0x800BA400;
RCP_SetupDL_32 = 0x800BA430;
RCP_SetupDL_73 = 0x800BA460;
RCP_SetupDL_76 = 0x800BA490;
RCP_SetupDL_74 = 0x800BA4C0;
RCP_SetupDL_78 = 0x800BA4F0;
RCP_SetupDL_81 = 0x800BA520;
RCP_SetupDL_48 = 0x800BA550;
RCP_SetupDL_68 = 0x800BA580;
RCP_SetupDL_49 = 0x800BA5B0;
RCP_SetupDL_44 = 0x800BA5E0;
RCP_SetupDL_50 = 0x800BA610;
RCP_SetupDL_61 = 0x800BA640;
gTextCharTextures = 0x80179010;
gMsgLookup = 0x80185CBC;
gDefaultSave = 0x800D4D10;
@@ -57,4 +112,4 @@ Message_GetCharCount = 0x800C2928;
Message_DisplayChar = 0x800C295C;
Message_DisplayText = 0x800C2AF0;
Message_DisplayScrollingText = 0x800C2D3C;
Message_NotWhitespace = 0x800C2F30;
Message_IsPrintingChar = 0x800C2F30;
src/assets/ast_DE5D50.c
+977 -976
View File
File diff suppressed because it is too large Load Diff
src/main/fox_2EFE0.c
+2 -2
View File
@@ -36,9 +36,9 @@ void func_8002E3E0(Object_2F4* arg0) {
s32 func_8002E4F8(u16* arg0, s32 arg1) {
if ((D_8017829C == 0) && (D_80178280[0].unk_1C8 != 0)) {
func_800BA808(arg0, arg1);
return 1;
return true;
} else {
return 0;
return false;
}
}
src/main/fox_84F70.c
+1 -1
View File
@@ -13,7 +13,7 @@ void func_800843FC(s32 arg0) {
void func_80084488(s32 arg0) {
s32 var_s1;
func_800B8FA8();
RCP_SetupDL_12();
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -150.0f, 0);
for (var_s1 = 0; var_s1 < MIN(360, arg0 * 15); var_s1 += 15) {
src/main/fox_A24B0.c
+5 -4
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "sf64dma.h"
extern void func_80187520(s32, void*);
@@ -82,7 +83,7 @@ void func_800A1980(void) {
func_8001D400(0);
}
s32 func_800A1B6C(void) {
bool func_800A1B6C(void) {
static u8 sHoldTimer = 0;
static u8 sOverlaySelect = 99;
static u8 sCurrentOverlay = 99;
@@ -100,9 +101,9 @@ s32 func_800A1B6C(void) {
if (sHoldTimer) {
sHoldTimer--;
return 1;
return true;
}
return 0;
return false;
}
void func_800A1C14(Gfx** arg0) {
@@ -291,7 +292,7 @@ void func_800A26C0(void) {
}
func_800A1C14(&gUnkDisp1);
func_800A25DC();
if (func_800A1B6C() != 1) {
if (func_800A1B6C() != true) {
Lib_Perspective(&gUnkDisp1);
func_800A1FB0(&gUnkDisp1, D_801778A8, 0);
if (D_8017783C != 0) {
src/main/fox_display.c
+14 -14
View File
@@ -161,9 +161,9 @@ void Animation_DrawLimb(s32 mode, Limb* limb, Limb** skeleton, Vec3f* jointTable
}
if (!override) {
Matrix_Translate(gCalcMatrix, trans.x, trans.y, trans.z, 1);
Matrix_RotateZ(gCalcMatrix, rot.z * 0.017453292f, 1);
Matrix_RotateY(gCalcMatrix, rot.y * 0.017453292f, 1);
Matrix_RotateX(gCalcMatrix, rot.x * 0.017453292f, 1);
Matrix_RotateZ(gCalcMatrix, rot.z * M_DTOR, 1);
Matrix_RotateY(gCalcMatrix, rot.y * M_DTOR, 1);
Matrix_RotateX(gCalcMatrix, rot.x * M_DTOR, 1);
if (dList != NULL) {
if (mode >= 2) {
Matrix_MultVec3f(gCalcMatrix, &origin, &pos);
@@ -224,9 +224,9 @@ void Animation_DrawSkeleton(s32 mode, Limb** skeletonSegment, Vec3f* jointTable,
}
if (override == 0) {
Matrix_Translate(gCalcMatrix, baseTrans.x, baseTrans.y, baseTrans.z, 1);
Matrix_RotateZ(gCalcMatrix, baseRot.z * 0.017453292f, 1);
Matrix_RotateY(gCalcMatrix, baseRot.y * 0.017453292f, 1);
Matrix_RotateX(gCalcMatrix, baseRot.x * 0.017453292f, 1);
Matrix_RotateZ(gCalcMatrix, baseRot.z * M_DTOR, 1);
Matrix_RotateY(gCalcMatrix, baseRot.y * M_DTOR, 1);
Matrix_RotateX(gCalcMatrix, baseRot.x * M_DTOR, 1);
if (dList != NULL) {
Matrix_Mult(gGfxMatrix, gCalcMatrix, 1);
Matrix_SetGfxMtx(&gMasterDisp);
@@ -360,19 +360,19 @@ void Animation_GetSkeletonBoundingBox(Limb** skeletonSegment, AnimationHeader* a
} else {
var_t6 = frameData[(s16) key[1].z];
}
Matrix_RotateZ(gGfxMatrix, (((s32) var_t6 * 360.0f) / 65536.0f) * 0.017453292f, 0);
Matrix_RotateZ(gGfxMatrix, (((s32) var_t6 * 360.0f) / 65536.0f) * M_DTOR, 0);
if (frame < (s16) key[1].yLen) {
var_t6 = frameData[(s16) key[1].y + frame];
} else {
var_t6 = frameData[(s16) key[1].y];
}
Matrix_RotateY(gGfxMatrix, (((s32) var_t6 * 360.0f) / 65536.0f) * 0.017453292f, 1);
Matrix_RotateY(gGfxMatrix, (((s32) var_t6 * 360.0f) / 65536.0f) * M_DTOR, 1);
if (frame < (s16) key[1].xLen) {
var_t6 = frameData[(s16) key[1].x + frame];
} else {
var_t6 = frameData[(s16) key[1].x];
}
Matrix_RotateX(gGfxMatrix, (((s32) var_t6 * 360.0f) / 65536.0f) * 0.017453292f, 1);
Matrix_RotateX(gGfxMatrix, (((s32) var_t6 * 360.0f) / 65536.0f) * M_DTOR, 1);
vtxFound = false;
if (limb->dList != NULL) {
Animation_FindBoundingBox(limb->dList, 0x2000, min, max, &vtxFound, &vtxCount, &vtxList);
@@ -516,8 +516,8 @@ s32 Math_PursueVec3f(Vec3f* pos, Vec3f* target, Vec3f* rot, f32 stepSize, f32 sc
targetRotX = Math_RadToDeg(-Math_Atan2F(diff.y, sqrtf(SQ(diff.x) + SQ(diff.z))));
Math_SmoothStepToAngle(&rot->y, targetRotY, scaleTurn, maxTurn, 0.0f);
Math_SmoothStepToAngle(&rot->x, targetRotX, scaleTurn, maxTurn, 0.0f);
Matrix_RotateY(&worldTransform, rot->y * 0.017453292f, 0);
Matrix_RotateX(&worldTransform, rot->x * 0.017453292f, 1);
Matrix_RotateY(&worldTransform, rot->y * M_DTOR, 0);
Matrix_RotateX(&worldTransform, rot->x * M_DTOR, 1);
localStep.z = stepSize;
Matrix_MultVec3fNoTranslate(&worldTransform, &localStep, &worldStep);
@@ -705,15 +705,15 @@ void Graphics_FillRectangle(Gfx** gfxPtr, s32 ulx, s32 uly, s32 lrx, s32 lry, u8
void Math_Vec3fFromAngles(Vec3f* step, f32 xRot, f32 yRot, f32 stepsize) {
Vec3f sp1C;
Matrix_RotateY(gCalcMatrix, yRot * 0.017453292f, 0);
Matrix_RotateX(gCalcMatrix, xRot * 0.017453292f, 1);
Matrix_RotateY(gCalcMatrix, yRot * M_DTOR, 0);
Matrix_RotateX(gCalcMatrix, xRot * M_DTOR, 1);
sp1C.x = sp1C.y = 0.0f;
sp1C.z = stepsize;
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp1C, step);
}
f32 Math_RadToDeg(f32 rAngle) {
rAngle *= 57.295776f;
rAngle *= M_RTOD;
while (rAngle < 0.0f) {
rAngle += 360.0f;
src/main/fox_edata.c
+4 -4
View File
@@ -1,19 +1,19 @@
#include "global.h"
void func_800594F0(Object_80* arg0) {
func_800B9EB0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_57(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
Matrix_RotateY(gGfxMatrix, M_PI, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6007D90);
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
void func_800595D0(Object_80* arg0) {
func_800B9EB0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_57(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
Matrix_RotateY(gGfxMatrix, M_PI, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6007CF0);
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
void func_800596B0(Object_2F4* arg0) {
src/main/fox_edisplay.c
+42 -42
View File
@@ -25,16 +25,16 @@ void func_8005980C(f32 arg0) {
void func_80059850(Object_4C* arg0) {
RCP_SetupDL(&gMasterDisp, 0x40);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 60);
func_800B9B38(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
void func_800598DC(s32 arg0) {
}
void func_800598E8(Object_2F4* arg0) {
func_800B9B38(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
gSPDisplayList(gMasterDisp++, D_6025B50);
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
void func_800599A4(s32 arg0, Vec3f* arg1, s32* arg2) {
@@ -51,11 +51,10 @@ void func_800599A4(s32 arg0, Vec3f* arg1, s32* arg2) {
}
f32 D_800CF9B0[] = {
-12.32422638f, -12.00849533f, -11.08310699f, -9.561470032f, -7.440753937f, -4.713317871f, -1.393303037f,
2.485869884f, 6.872662067f, 11.66899109f, 16.7521019f, 21.98126984f, 27.19302368f, 32.21533966f,
36.87569427f, 41.0078125f, 44.46230316f, 47.09422302f, 48.7610054f, 49.34596634f, 47.64530182f,
42.98818588f, 36.06262207f, 27.66272163f, 18.64647293f, 9.883304596f, 2.113918066f, -4.157948017f,
-8.673706055f, -11.39522171f, -12.32422638f,
-12.324226f, -12.008495f, -11.083107f, -9.56147f, -7.440754f, -4.713318f, -1.393303f, 2.48587f,
6.872662f, 11.668991f, 16.752102f, 21.98127f, 27.193024f, 32.21534f, 36.875694f, 41.007812f,
44.462303f, 47.094223f, 48.761005f, 49.345966f, 47.6453f, 42.988186f, 36.062622f, 27.662722f,
18.646473f, 9.883305f, 2.113918f, -4.157948f, -8.673706f, -11.395222f, -12.324226f,
};
f32 D_800CFA2C[] = {
1.0f, 1.0f, 0.95f, 0.9f, 0.85f, 0.8f, 0.75f, 0.7f, 0.65f, 0.6f,
@@ -104,7 +103,7 @@ void func_80059C34(Object_4C* arg0) {
}
void func_80059C40(Object_4C* arg0) {
func_800B9C50(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_47(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 180);
switch (arg0->unk_45) {
case 0x0:
@@ -139,7 +138,7 @@ void func_80059C40(Object_4C* arg0) {
gSPDisplayList(gMasterDisp++, D_6034B90);
break;
}
func_800B9B38(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
void func_80059F68(Object_6C* arg0) {
@@ -432,11 +431,11 @@ void func_8005ADAC(Object_2F4* arg0) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1);
Matrix_Scale(gGfxMatrix, sp5C, sp5C * 0.7f, sp5C, 1);
Matrix_RotateZ(gGfxMatrix, -arg0->obj.rot.z * M_DTOR, 1U);
Matrix_RotateX(gGfxMatrix, -arg0->obj.rot.x * M_DTOR, 1U);
Matrix_RotateY(gGfxMatrix, -arg0->obj.rot.y * M_DTOR, 1U);
Matrix_RotateY(gGfxMatrix, -D_80178280[D_801778A0].unk_058, 1U);
Matrix_RotateX(gGfxMatrix, D_80178280[D_801778A0].unk_05C, 1U);
Matrix_RotateZ(gGfxMatrix, -arg0->obj.rot.z * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, -arg0->obj.rot.x * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, -arg0->obj.rot.y * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, -D_80178280[D_801778A0].unk_058, 1);
Matrix_RotateX(gGfxMatrix, D_80178280[D_801778A0].unk_05C, 1);
Matrix_SetGfxMtx(&gMasterDisp);
func_8005465C(D_80177C98);
Matrix_Pop(&gGfxMatrix);
@@ -447,7 +446,7 @@ void func_8005ADAC(Object_2F4* arg0) {
if (D_80177DB0 & 1) {
sp54 = 180.0f;
}
func_800BA170();
RCP_SetupDL_64_2();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 100);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 70.0f, -10.0f, -100.0f, 1);
@@ -549,14 +548,14 @@ void func_8005B6A4(Object_2F4* arg0) {
}
void func_8005B71C(Object_2F4* arg0) {
func_800BA1D0(arg0->unk_046, D_80178328, D_80178330, D_80178338, arg0->unk_048, D_801783DC);
RCP_SetupDL_29(arg0->unk_046, D_80178328, D_80178330, D_80178338, arg0->unk_048, D_801783DC);
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6018C00);
}
void func_8005B7CC(Object_2F4* arg0) {
func_800BA1D0(arg0->unk_046, D_80178328, D_80178330, D_80178338, arg0->unk_048, D_801783DC);
RCP_SetupDL_29(arg0->unk_046, D_80178328, D_80178330, D_80178338, arg0->unk_048, D_801783DC);
gSPDisplayList(gMasterDisp++, D_6022920);
}
@@ -593,7 +592,7 @@ void func_8005B9A4(Object_2F4* arg0) {
void func_8005BA30(Object_2F4* arg0) {
if (arg0->unk_0BC != 0) {
func_800BA400();
RCP_SetupDL_27();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
gSPDisplayList(gMasterDisp++, D_6020B40);
@@ -695,7 +694,7 @@ void func_8005BAB4(s32 arg0, s32 arg1) {
gSPDisplayList(gMasterDisp++, D_6034B90);
break;
case 0xE6:
func_800BA550();
RCP_SetupDL_48();
RCP_SetupDL(&gMasterDisp, 0x45);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
@@ -729,12 +728,12 @@ void func_8005BAB4(s32 arg0, s32 arg1) {
Matrix_RotateZ(gGfxMatrix, D_80163FE0[arg1].unk_11C, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 0.0f, 1);
Matrix_Scale(gGfxMatrix, 1.2f, 1.0f, 1.2f, 1);
Matrix_RotateX(gGfxMatrix, -M_PI / 2.0f, 1U);
Matrix_RotateX(gGfxMatrix, -M_PI / 2.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_1024AC0);
break;
case 0xD7:
func_800BA550();
RCP_SetupDL_48();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 255);
Matrix_Scale(gGfxMatrix, 4.0f, 4.0f, 4.0f, 1);
@@ -845,7 +844,7 @@ void func_8005CDA8(Object_6C* arg0) {
RCP_SetupDL(&gMasterDisp, 0x29);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, arg0->unk_44);
} else {
func_800B9B38(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK | G_LIGHTING); // wrong order?
for (i = 0; i < 7; i++) {
@@ -933,19 +932,19 @@ void func_8005D654(Object_80* arg0, s32 arg1) {
arg0->obj.pos.y -= D_8017847C;
if (arg0->unk_1C.unk_04 == 0) {
if ((arg0->obj.id == 0x13) || (arg0->obj.id == 0x37) || (arg0->obj.id == 9) || (arg0->obj.id == 0x32)) {
func_800B9EB0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_57(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
if (arg1 < 0) {
func_800596C0();
}
gSPDisplayList(gMasterDisp++, arg0->unk_1C.unk_00);
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
} else {
if (arg0->obj.id == 8) {
if (arg1 < 0) {
return; // weird control flow
}
func_800B9B38(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
func_800597C0(arg1);
if (arg1 < 0) {
@@ -953,7 +952,7 @@ void func_8005D654(Object_80* arg0, s32 arg1) {
}
gSPDisplayList(gMasterDisp++, arg0->unk_1C.unk_00);
if (arg0->obj.id == 8) {
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
}
} else if (arg0->unk_1C.unk_00 != NULL) {
@@ -1511,7 +1510,7 @@ void func_8005F670(Vec3f* arg0) {
}
#ifdef NON_MATCHING
s32 func_8005F9DC(Vec3f* arg0) {
bool func_8005F9DC(Vec3f* arg0) {
Vec3f sp2C;
Vec3f sp20;
@@ -1523,11 +1522,12 @@ s32 func_8005F9DC(Vec3f* arg0) {
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp2C, &sp20);
if ((sp20.z < 1000.0f) && (sp20.z > -13000.0f) && (fabsf(sp20.x) < (fabsf(sp20.z * 0.4f) + 2000.0f)) &&
(fabsf(sp20.y) < (fabsf(sp20.y * 0.4f) + 2000.0f))) {
return 1;
return true;
}
return 0;
return false;
}
#else
bool func_8005F9DC(Vec3f* arg0);
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/fox_edisplay/func_8005F9DC.s")
#endif
@@ -1543,7 +1543,7 @@ void func_8005FB70(s32 arg0) {
Object_80* var_s0_2;
if ((D_80177880 == 1) && (D_80178234 != 0x10)) {
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
if (D_80177AB0 == 5) {
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
}
@@ -1562,7 +1562,7 @@ void func_8005FB70(s32 arg0) {
}
}
} else {
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
for (i = 0, var_s0_2 = D_80161B00; i < ARRAY_COUNT(D_80161B00); i++, var_s0_2++) {
if (var_s0_2->obj.status >= 2) {
if (arg0 > 0) {
@@ -1578,9 +1578,9 @@ void func_8005FB70(s32 arg0) {
for (i = 0, var_s0_3 = D_8016F110; i < ARRAY_COUNT(D_8016F110); i++, var_s0_3++) {
if ((var_s0_3->obj.status >= 2) && (var_s0_3->obj.id != 0x136)) {
if (!(var_s0_3->unk_05C & 1)) {
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
} else {
func_800BA400();
RCP_SetupDL_27();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 64, 64, 255, 255);
}
func_800597C0(arg0);
@@ -1600,9 +1600,9 @@ void func_8005FB70(s32 arg0) {
if ((var_s0_4->obj.status >= 2) && (func_80060FE4(&var_s0_4->obj.pos, -12000.0f) != 0)) {
Matrix_Push(&gGfxMatrix);
if ((var_s0_4->obj.id == 0xA5) || (var_s0_4->obj.id == 0xA6)) {
func_800B9EB0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_57(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
} else {
func_800B9B38(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_60(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
func_8005D8B8(var_s0_4, arg0);
Matrix_Pop(&gGfxMatrix);
@@ -1612,12 +1612,12 @@ void func_8005FB70(s32 arg0) {
if (var_s0_5->obj.status >= 2) {
if (!(var_s0_5->unk_0C6 & 1)) {
if (D_80178234 == 0xF) {
func_800BA1A0();
RCP_SetupDL_23();
} else {
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
}
} else {
func_800BA400();
RCP_SetupDL_27();
if (var_s0_5->unk_110 >= 0.0f) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
} else {
@@ -1702,9 +1702,9 @@ void func_8006046C(s32 arg0) {
for (i = 0, var_s0_2 = D_8016F110; i < ARRAY_COUNT(D_8016F110); i++, var_s0_2++) {
if ((var_s0_2->obj.status >= 2) && (var_s0_2->obj.id == 0x136)) {
if (!(var_s0_2->unk_05C & 1)) {
func_800BA1D0(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
RCP_SetupDL_29(D_80178320, D_80178328, D_80178330, D_80178338, D_801783D8, D_801783DC);
} else {
func_800BA400();
RCP_SetupDL_27();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 64, 64, 255, 255);
}
Matrix_Push(&gGfxMatrix);
@@ -1767,7 +1767,7 @@ void func_80060968(void) {
} else if ((D_80178234 == 0xD) || (D_80178234 == 9)) {
RCP_SetupDL(&gMasterDisp, 0x29);
} else {
func_800B92F8();
RCP_SetupDL_14();
}
for (i = 0; i < ARRAY_COUNT(D_80174750); i++) {
if (D_80174750[i].unk_00 != 0) {
src/main/fox_enmy1.c
+32 -31
View File
@@ -43,7 +43,7 @@ s32 func_80060FE4(Vec3f* arg0, f32 arg1) {
Vec3f sp20;
if ((D_80177880 != 1) && (D_80178280[0].unk_1C8 != 2)) {
return 1;
return true;
}
Matrix_RotateY(gCalcMatrix, D_80178280[D_801778A0].unk_058, 0);
sp2C.x = arg0->x - D_80178280[D_801778A0].unk_040.x;
@@ -52,9 +52,9 @@ s32 func_80060FE4(Vec3f* arg0, f32 arg1) {
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp2C, &sp20);
if ((sp20.z < 1000.0f) && (arg1 < sp20.z) && (fabsf(sp20.x) < (fabsf(sp20.z * 0.5f) + 2000.0f))) {
return 1;
return true;
}
return 0;
return false;
}
s32 func_80061148(Vec3f* arg0, f32 arg1) {
@@ -62,7 +62,7 @@ s32 func_80061148(Vec3f* arg0, f32 arg1) {
Vec3f sp20;
if (D_80177880 != 1) {
return 1;
return true;
}
if (D_80178280[0].unk_1C8 == 7) {
return func_80060FE4(arg0, arg1);
@@ -74,9 +74,9 @@ s32 func_80061148(Vec3f* arg0, f32 arg1) {
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp2C, &sp20);
if ((sp20.z < 0.0f) && (arg1 < sp20.z) && (fabsf(sp20.x) < (fabsf(sp20.z * 0.5f) + 500.0f))) {
return 1;
return true;
}
return 0;
return false;
}
void func_800612B8(ObjectStruct_1C* arg0, u32 arg1) {
@@ -246,9 +246,9 @@ void func_80061A4C(void) {
for (i = 0; i < ARRAY_COUNT(D_80170130); i++) {
if (D_80170130[i].obj.status == 0) {
sp1C = (Rand_ZeroOne() - 0.5f);
sp28 = D_80178280[0].unk_074 + (sp1C * 400.0f) + (5.0f * D_80178280[0].unk_0C0);
sp28 = D_80178280[0].unk_074 + (sp1C * 400.0f) + (5.0f * D_80178280[0].unk_0C0.x);
sp1C = (Rand_ZeroOne() - 0.5f);
sp24 = D_80178280[0].unk_078 + (sp1C * 400.0f) + (5.0f * D_80178280[0].unk_0C4);
sp24 = D_80178280[0].unk_078 + (sp1C * 400.0f) + (5.0f * D_80178280[0].unk_0C0.y);
sp20 = -D_80177D20 - 500.0f;
if (D_80177D08 < 0.0f) {
sp20 = -D_80177D20 + 500.0f;
@@ -270,11 +270,11 @@ void func_80061B68(void) {
if (D_80170130[i].obj.status == 0) {
sp1C = (Rand_ZeroOne() - 0.5f);
sp28 = D_80178280[0].unk_074 + (sp1C * 2000.0f) + (5.0f * D_80178280[0].unk_0C0);
sp28 = D_80178280[0].unk_074 + (sp1C * 2000.0f) + (5.0f * D_80178280[0].unk_0C0.x);
sp24 = 0;
while (sp24 <= D_80177940) {
sp1C = (Rand_ZeroOne() - 0.5f);
sp24 = D_80178280[0].unk_078 + (sp1C * 2000.0f) + (5.0f * D_80178280[0].unk_0C4);
sp24 = D_80178280[0].unk_078 + (sp1C * 2000.0f) + (5.0f * D_80178280[0].unk_0C0.y);
}
sp20 = -D_80177D20 - 3000.0f;
if (D_80177D08 < 0.0f) {
@@ -296,9 +296,10 @@ void func_80061CD0(void) {
for (i = 0; i < ARRAY_COUNT(D_80170130); i++) {
if (D_80170130[i].obj.status == 0) {
sp1C = (Rand_ZeroOne() - 0.5f);
sp28 = D_80178280[D_801778A0].unk_074 + (sp1C * 3000.0f) + (5.0f * D_80178280[D_801778A0].unk_0C0);
sp28 = D_80178280[D_801778A0].unk_074 + (sp1C * 3000.0f) + (5.0f * D_80178280[D_801778A0].unk_0C0.x);
sp1C = (Rand_ZeroOne() - 0.5f);
sp24 = D_80178280[D_801778A0].unk_078 + 1000.0f + (sp1C * 500.0f) + (5.0f * D_80178280[D_801778A0].unk_0C4);
sp24 =
D_80178280[D_801778A0].unk_078 + 1000.0f + (sp1C * 500.0f) + (5.0f * D_80178280[D_801778A0].unk_0C0.y);
sp20 = -D_80177D20 - 2000.0f * Rand_ZeroOne();
if (D_80177D08 < 0.0f) {
sp20 = -D_80177D20 + 1000.0f;
@@ -666,39 +667,39 @@ s32 func_80062DBC(Vec3f* arg0, f32* var_s0, Object* arg2, f32 arg3, f32 arg4, f3
if ((var_s0[1] + 20.0f) > (fabsf((var_s0[0] + arg2->pos.z) - var_ft5)) &&
((var_s0[5] + 20.0f) > fabsf((var_s0[4] + arg2->pos.x) - var_fa1)) &&
((var_s0[3] + 10.0f) > fabsf((var_s0[2] + arg2->pos.y) - var_ft4))) {
return 1;
return true;
}
var_s0 += 6;
}
}
return 0;
return false;
}
s32 func_800631A8(Vec3f* arg0, f32* arg1, Vec3f* arg2) {
if (((s32) arg1[0] != 0) && (fabsf((arg1[1] + arg2->z) - arg0->z) < (arg1[2] + 20.0f)) &&
(fabsf((arg1[5] + arg2->x) - arg0->x) < (arg1[6] + 20.0f)) &&
(fabsf((arg1[3] + arg2->y) - arg0->y) < (arg1[4] + 20.0f))) {
return 1;
return true;
}
return 0;
return false;
}
s32 func_8006326C(Vec3f* arg0, s32 arg1, s32 arg2, Object* arg3) {
s32 func_8006326C(Vec3f* arg0, Vec3f* arg1, s32 arg2, Object* arg3) {
Vec3f sp74;
Vec3f sp68;
Vec3f sp5C;
Vec3f sp50;
Vec3f sp44;
s32 var_s1;
s32 pad1;
Vec3f sp30;
s32 pad1[3];
f32 sp30;
s32 pad2;
sp74.x = arg0->x - arg3->pos.x;
sp74.z = arg0->z - arg3->pos.z;
if (((fabsf(sp74.x) < 1100.0f) && (fabsf(sp74.z) < 1100.0f)) || (arg2 == 0xB4)) {
sp74.y = arg0->y - arg3->pos.y;
Matrix_RotateY(gCalcMatrix, -arg3->rot.y * M_DTOR, 0U);
Matrix_RotateY(gCalcMatrix, -arg3->rot.y * M_DTOR, 0);
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp74, &sp68);
sp5C.x = arg3->pos.x + sp68.x;
sp5C.y = arg3->pos.y + sp68.y;
@@ -726,7 +727,7 @@ s32 func_8006326C(Vec3f* arg0, s32 arg1, s32 arg2, Object* arg3) {
var_s1 = 8;
}
if (func_800998FC(&sp5C, &sp50, arg1, var_s1, &sp44, &sp30) > 0) {
return 1;
return true;
}
} else {
var_s1 = 0;
@@ -748,14 +749,14 @@ s32 func_8006326C(Vec3f* arg0, s32 arg1, s32 arg2, Object* arg3) {
var_s1 = 1;
}
if (func_800A3690(&sp5C, &sp50, var_s1, &sp44) != 0) {
return 1;
return true;
}
}
}
return 0;
return false;
}
s32 func_8006351C(s32 arg0, Vec3f* arg1, s32 arg2, s32 arg3) {
s32 func_8006351C(s32 arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3) {
Object_58* var_s0;
Object_80* var_s0_2;
Object_4C* var_s0_3;
@@ -879,13 +880,13 @@ s32 func_8006351C(s32 arg0, Vec3f* arg1, s32 arg2, s32 arg3) {
var_s0_5->unk_0D8.x = arg1->x;
var_s0_5->unk_0D8.y = arg1->y;
var_s0_5->unk_0D8.z = arg1->z;
return 1;
return true;
}
}
}
}
}
return 0;
return false;
}
void func_80063CAC(Object_80* arg0) {
@@ -1528,7 +1529,7 @@ void func_800656D4(Object_2F4* arg0) {
sp8C.x = arg0->unk_0E8;
sp8C.y = arg0->unk_0EC;
sp8C.z = arg0->unk_0F0;
if ((func_8006351C(arg0->unk_040, &arg0->obj.pos, (s32) &sp8C, 1) != 0) || (arg0->unk_0D0 != 0) ||
if ((func_8006351C(arg0->unk_040, &arg0->obj.pos, &sp8C, 1) != 0) || (arg0->unk_0D0 != 0) ||
(arg0->obj.pos.y < (D_80177940 + 10.0f)) || (D_80178280[0].unk_1C8 == 7)) {
func_8007D2C8(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, 3.0f);
func_80060FBC(&arg0->obj, &arg0->unk_100);
@@ -1608,7 +1609,7 @@ void func_80066254(Object_2F4* arg0) {
switch (D_80161A62) {
case 9:
if (D_80178234 == 0x10) {
func_800BA808(D_80182544, 0xAA);
func_800BA808(gMsg_ID_18031, 0xAA);
}
/* fallthrough */
case 4:
@@ -1641,11 +1642,11 @@ void func_80066254(Object_2F4* arg0) {
func_80019218(0x4900000C, &D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
} else if (arg0->unk_044 == 0x18) {
if (D_801778B0[3] > 0) {
func_800BA808(D_80183CA8, 0x1E);
func_800BA808(gMsg_ID_20261, 0x1E);
} else if (D_801778B0[2] > 0) {
func_800BA808(D_80183D3C, 0x14);
func_800BA808(gMsg_ID_20263, 0x14);
} else if (D_801778B0[1] > 0) {
func_800BA808(D_80183CF0, 0xA);
func_800BA808(gMsg_ID_20262, 0xA);
}
} else if (Rand_ZeroOne() <= D_800CFE5C[arg0->unk_044]) {
func_800660F0(arg0);

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