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

fox_zo decomped, work buffer enums for bosses implemented, changed overlay name to i3, various docs (#78)

Browse Source 
* zo

* more

* more stuff

* hitboxes suck

* i3 test

* i3

* names

* remove extras

* whoops symbols

* more cleaning

* oh god it comes

* one last thing
This commit is contained in:
petrie911
2024-01-13 22:09:13 -03:00
committed by GitHub
parent 31bfc1ecdd
commit 56c2bd3e10
43 changed files with 9234 additions and 2949 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/fox_map.h
+1 -18
View File
@@ -1,24 +1,7 @@
#ifndef FOX_MAP_H
#define FOX_MAP_H
typedef enum PlanetId {
/* 0 */ PLANET_METEO,
/* 1 */ PLANET_AREA_6,
/* 2 */ PLANET_BOLSE,
/* 3 */ PLANET_SECTOR_Z,
/* 4 */ PLANET_SECTOR_X,
/* 5 */ PLANET_SECTOR_Y,
/* 6 */ PLANET_KATINA,
/* 7 */ PLANET_MACBETH,
/* 8 */ PLANET_ZONESS,
/* 9 */ PLANET_CORNERIA,
/* 10 */ PLANET_TITANIA,
/* 11 */ PLANET_AQUAS,
/* 12 */ PLANET_FORTUNA,
/* 13 */ PLANET_VENOM,
/* 14 */ PLANET_SOLAR,
/* 15 */ PLANET_MAX,
} PlanetId;
#include "PR/ultratypes.h"
typedef struct {
/* 0x0 */ f32 angle;
include/functions.h
+130 -129
View File
@@ -233,6 +233,7 @@ void Object_Load(ObjectInit* , f32 , f32 , f32 , f32 );
void func_80062568(void);
void func_80062B60(f32 xPos, f32 zPos, s32 arg2, f32 arg3);
void func_80062C38(f32, f32);
bool func_80062DBC(Vec3f* pos, f32* hitboxData, Object* obj, f32 xRot, f32 yRot, f32 zRot);
s32 func_800631A8(Vec3f*, f32*, Vec3f*);
s32 func_8006326C(Vec3f* , Vec3f* , ObjectId , Object* );
s32 func_8006351C(s32 , Vec3f* , Vec3f* , s32 );
@@ -608,138 +609,138 @@ void func_E08400_80187B08(Actor *);
void func_E08400_80188A40(Boss *);
void func_E08400_8018CCF8(Actor *);
void func_E16C50_80187520(s32, void*);
void func_E16C50_80187754(Boss *);
void func_E16C50_80187944(Boss*);
void func_E16C50_8018C54C(Boss*);
void func_E16C50_8018DF74(Player *player);
void func_E16C50_8018ED78(Player*);
void func_i3_80187520(s32, void*);
void func_i3_80187754(Boss *);
void func_i3_80187944(Boss*);
void func_i3_8018C54C(Boss*);
void func_i3_8018DF74(Player *player);
void func_i3_8018ED78(Player*);
void func_E16C50_801900FC(Vec3f*, Vec3f*, f32, f32, f32, s32, f32, s32, s32);
void func_E16C50_80190430(Actor *);
void func_E16C50_801904CC(Actor*);
void func_E16C50_80190A00(Actor*);
void func_E16C50_80190F08(Actor *);
void func_E16C50_80191010(Actor*);
void func_E16C50_801914C4(Actor*);
void func_E16C50_801915A4(Actor *);
void func_E16C50_80191680(Actor*);
void func_E16C50_80191B4C(Actor*);
void func_E16C50_80191BB8(Actor *);
void func_E16C50_80191BC4(Actor*);
void func_E16C50_80191DB0(Actor*);
void func_E16C50_80191DB0(Actor*);
void func_E16C50_80191FFC(Actor*);
void func_E16C50_80192094(Actor*);
void func_E16C50_80192834(Actor*);
void func_E16C50_80192C18(Actor*);
void func_E16C50_80192E64(Actor*);
void func_E16C50_80193240(Actor*);
void func_E16C50_801932AC(Boss*);
void func_E16C50_801949DC(Boss*);
void func_E16C50_80194A84(Boss*);
void func_E16C50_8019969C(Actor*);
void func_E16C50_8019983C(Actor*);
void func_E16C50_80199A28(Actor*);
void func_E16C50_80199E24(Actor*);
void func_E16C50_80199F10(Actor*);
void func_E16C50_8019A1FC(Actor*);
void func_E16C50_8019A5D4(Actor*);
void func_E16C50_8019ACCC(Actor*);
void func_E16C50_8019B1F0(Actor *);
void func_E16C50_8019B548(Actor*);
void func_E16C50_8019B7DC(Actor*);
void func_E16C50_8019B810(Actor *);
void func_E16C50_8019B854(Actor*);
void func_E16C50_8019BDE0(Actor*);
void func_E16C50_8019BE48(Actor*);
void func_E16C50_8019C1CC(Actor*);
void func_E16C50_8019C200(Actor *);
void func_E16C50_8019C454(Actor*);
void func_E16C50_8019C83C(Actor*);
void func_E16C50_8019CBEC(Actor*);
void func_E16C50_8019CE58(Actor*);
void func_E16C50_8019D060(Actor *);
void func_E16C50_8019D15C(Actor*);
void func_E16C50_8019D3C4(Actor*);
void func_E16C50_8019D428(Player* player);
void func_E16C50_8019D76C(Player* player);
void func_i3_801900FC(Vec3f*, Vec3f*, f32, f32, f32, s32, f32, s32, s32);
void func_i3_80190430(Actor* actor);
void func_i3_801904CC(Actor* actor);
void func_i3_80190A00(Actor* actor);
void func_i3_80190F08(Actor* actor);
void func_i3_80191010(Actor* actor);
void func_i3_801914C4(Actor* actor);
void func_i3_801915A4(Actor* actor);
void func_i3_80191680(Actor* actor);
void func_i3_80191B4C(Actor* actor);
void func_i3_80191BB8(Actor* actor);
void func_i3_80191BC4(Actor* actor);
void func_i3_80191DB0(Actor* actor);
void func_i3_80191DB0(Actor* actor);
void func_i3_80191FFC(Actor* actor);
void func_i3_80192094(Actor* actor);
void func_i3_80192834(Actor* actor);
void func_i3_80192C18(Actor* actor);
void func_i3_80192E64(Actor* actor);
void func_i3_80193240(Actor* actor);
void func_i3_801932AC(Boss* bossZO);
void func_i3_801949DC(Boss* bossZO);
void func_i3_80194A84(Boss* bossZO);
void func_i3_8019969C(Actor* actor);
void func_i3_8019983C(Actor* actor);
void func_i3_80199A28(Actor* actor);
void func_i3_80199E24(Actor* actor);
void func_i3_80199F10(Actor* actor);
void func_i3_8019A1FC(Actor* actor);
void func_i3_8019A5D4(Actor* actor);
void func_i3_8019ACCC(Actor* actor);
void func_i3_8019B1F0(Actor* actor);
void func_i3_8019B548(Actor* actor);
void func_i3_8019B7DC(Actor* actor);
void func_i3_8019B810(Actor* actor);
void func_i3_8019B854(Actor* actor);
void func_i3_8019BDE0(Actor* actor);
void func_i3_8019BE48(Actor* actor);
void func_i3_8019C1CC(Actor* actor);
void func_i3_8019C200(Actor* actor);
void func_i3_8019C454(Actor* actor);
void func_i3_8019C83C(Actor* actor);
void func_i3_8019CBEC(Actor* actor);
void func_i3_8019CE58(Actor* actor);
void func_i3_8019D060(Actor* actor);
void func_i3_8019D15C(Actor* actor);
void func_i3_8019D3C4(Actor* actor);
void func_i3_8019D428(Player* player);
void func_i3_8019D76C(Player* player);
void func_E16C50_8019E8B8(f32, f32, f32, f32);
void func_E16C50_8019E9F4(f32, f32, f32, f32, f32, f32, f32, s32);
void func_E16C50_8019EA7C(Actor*);
void func_E16C50_8019F20C(Actor*);
void func_E16C50_8019F7AC(Actor*);
void func_E16C50_801A003C(Actor*);
void func_E16C50_801A0120(Effect*);
void func_E16C50_801A0AF0(Effect*);
void func_E16C50_801A10F4(Player* player);
void func_E16C50_801A5B3C(Boss*);
void func_E16C50_801A71B8(Boss*);
void func_E16C50_801A8BE8(Player* player);
void func_E16C50_801A7930(Player* player);
void func_i3_8019E8B8(f32, f32, f32, f32);
void func_i3_8019E9F4(f32, f32, f32, f32, f32, f32, f32, s32);
void func_i3_8019EA7C(Actor*);
void func_i3_8019F20C(Actor*);
void func_i3_8019F7AC(Actor*);
void func_i3_801A003C(Actor*);
void func_i3_801A0120(Effect*);
void func_i3_801A0AF0(Effect*);
void func_i3_801A10F4(Player* player);
void func_i3_801A5B3C(Boss*);
void func_i3_801A71B8(Boss*);
void func_i3_801A8BE8(Actor*);
void func_i3_801A7930(Player* player);
void func_E16C50_801A9824(void);
void func_E16C50_801AA20C(void);
void func_E16C50_801AA8E8(Player*);
void func_E16C50_801AACF8(Player*);
void func_E16C50_801ABA40(PlayerShot*);
void func_E16C50_801AC274(Player*);
void func_E16C50_801AC8A8(f32, f32, f32, f32, s32);
void func_E16C50_801AC8A8(f32, f32, f32, f32, s32);
void func_E16C50_801AC918(Effect*);
void func_E16C50_801ACBB4(void);
void func_E16C50_801ACE50(Player*);
void func_E16C50_801AD328(Player*);
void func_E16C50_801AD688(Actor *);
void func_E16C50_801AD6C0(Actor*);
void func_E16C50_801AE168(Actor*);
void func_E16C50_801AE3AC(Actor *);
void func_E16C50_801AE3D8(Actor*);
void func_E16C50_801AEB44(Actor*);
void func_E16C50_801AF9FC(Actor *);
void func_E16C50_801AFA5C(Actor*);
void func_E16C50_801B099C(Actor*);
void func_E16C50_801B0B60(Actor*);
void func_E16C50_801B0EC0(Actor*);
void func_E16C50_801B10F8(Boss*);
void func_E16C50_801B134C(Boss*);
void func_E16C50_801B4D84(Boss*);
void func_E16C50_801B504C(Actor*);
void func_E16C50_801B50E8(Actor*);
void func_E16C50_801B619C(Actor*);
void func_E16C50_801B6344(Actor *);
void func_E16C50_801B638C(Actor*);
void func_E16C50_801B6E54(Actor *);
void func_E16C50_801B6FF8(Actor*);
void func_E16C50_801B7A24(Actor*);
void func_E16C50_801B7AF0(Actor *);
void func_E16C50_801B7C78(Actor*);
void func_E16C50_801B90DC(Actor*);
void func_E16C50_801B91A4(Actor*);
void func_E16C50_801BA108(Actor*);
void func_E16C50_801BA26C(Actor*);
void func_E16C50_801BA4E4(Actor*);
void func_E16C50_801BA57C(Actor *);
void func_E16C50_801BA6A4(Actor*);
void func_E16C50_801BAD7C(Actor*);
void func_E16C50_801BADF8(Actor*);
void func_E16C50_801BB204(Actor*);
void func_E16C50_801BB26C(Actor *);
void func_E16C50_801BB79C(Actor*);
void func_E16C50_801BC930(Actor*);
void func_E16C50_801BC9A0(Actor*);
void func_E16C50_801BD264(Actor*);
void func_E16C50_801BD54C(Actor*);
void func_E16C50_801BDE6C(Actor*);
void func_E16C50_801BE1FC(Object_80*);
void func_E16C50_801BE3F8(Actor*);
void func_E16C50_801BEB1C(Actor*);
void func_E16C50_801BEC50(Boss*);
void func_E16C50_801BEC5C(Boss*);
void func_E16C50_801BEC68(Actor*);
void func_E16C50_801BEC74(Actor*);
void func_E16C50_801BEC80(Player*);
void func_i3_801A9824(void);
void func_i3_801AA20C(void);
void func_i3_801AA8E8(Player*);
void func_i3_801AACF8(Player*);
void func_i3_801ABA40(PlayerShot*);
void func_i3_801AC274(Player*);
void func_i3_801AC8A8(f32, f32, f32, f32, s32);
void func_i3_801AC8A8(f32, f32, f32, f32, s32);
void func_i3_801AC918(Effect*);
void func_i3_801ACBB4(void);
void func_i3_801ACE50(Player*);
void func_i3_801AD328(Player*);
void func_i3_801AD688(Actor *);
void func_i3_801AD6C0(Actor*);
void func_i3_801AE168(Actor*);
void func_i3_801AE3AC(Actor *);
void func_i3_801AE3D8(Actor*);
void func_i3_801AEB44(Actor*);
void func_i3_801AF9FC(Actor *);
void func_i3_801AFA5C(Actor*);
void func_i3_801B099C(Actor*);
void func_i3_801B0B60(Actor*);
void func_i3_801B0EC0(Actor*);
void func_i3_801B10F8(Boss*);
void func_i3_801B134C(Boss*);
void func_i3_801B4D84(Boss*);
void func_i3_801B504C(Actor*);
void func_i3_801B50E8(Actor*);
void func_i3_801B619C(Actor*);
void func_i3_801B6344(Actor *);
void func_i3_801B638C(Actor*);
void func_i3_801B6E54(Actor *);
void func_i3_801B6FF8(Actor*);
void func_i3_801B7A24(Actor*);
void func_i3_801B7AF0(Actor *);
void func_i3_801B7C78(Actor*);
void func_i3_801B90DC(Actor*);
void func_i3_801B91A4(Actor*);
void func_i3_801BA108(Actor*);
void func_i3_801BA26C(Actor*);
void func_i3_801BA4E4(Actor*);
void func_i3_801BA57C(Actor *);
void func_i3_801BA6A4(Actor*);
void func_i3_801BAD7C(Actor*);
void func_i3_801BADF8(Actor*);
void func_i3_801BB204(Actor*);
void func_i3_801BB26C(Actor *);
void func_i3_801BB79C(Actor*);
void func_i3_801BC930(Actor*);
void func_i3_801BC9A0(Actor*);
void func_i3_801BD264(Actor*);
void func_i3_801BD54C(Actor*);
void func_i3_801BDE6C(Actor*);
void func_i3_801BE1FC(Object_80*);
void func_i3_801BE3F8(Actor*);
void func_i3_801BEB1C(Actor*);
void func_i3_801BEC50(Boss*);
void func_i3_801BEC5C(Boss*);
void func_i3_801BEC68(Actor*);
void func_i3_801BEC74(Actor*);
void func_i3_801BEC80(Player*);
void func_E51970_80187520(s32, void*);
include/sf64dma.h
+6 -6
View File
@@ -103,13 +103,13 @@ extern OverlayInit sOvlE08400_Meteo[2]; // E08400
extern OverlayInit sOvlE6A810_Titania[6]; // E6A810
extern OverlayInit sOvlE08400_SectorX[2]; // E08400
extern OverlayInit sOvlE51970_SectorZ[1]; // E51970
extern OverlayInit sOvlE16C50_Aquas[1]; // E16C50
extern OverlayInit sOvlE16C50_Area6[1]; // E16C50
extern OverlayInit sOvli3_Aquas[1]; // i3
extern OverlayInit sOvli3_Area6[1]; // i3
extern OverlayInit sOvlE51970_Fortuna[2]; // E51970
extern OverlayInit sOvlE16C50_Unk4[1]; // E16C50
extern OverlayInit sOvli3_Unk4[1]; // i3
extern OverlayInit sOvlE9F1D0_SectorY[1]; // E9F1D0
extern OverlayInit sOvlE16C50_Solar[1]; // E16C50
extern OverlayInit sOvlE16C50_Zoness[1]; // E16C50
extern OverlayInit sOvli3_Solar[1]; // i3
extern OverlayInit sOvli3_Zoness[1]; // i3
extern OverlayInit sOvlDF4260_Venom1[1]; // DF4260
extern OverlayInit sOvlE9F1D0_Venom2[1]; // E9F1D0
extern OverlayInit sOvlE9F1D0_VenomSW[2]; // E9F1D0
@@ -178,7 +178,7 @@ DECLARE_SEGMENT(ast_DDC010);
DECLARE_SEGMENT(ast_DE5D50);
DECLARE_SEGMENT(ovl_DF4260);
DECLARE_SEGMENT(ovl_E08400);
DECLARE_SEGMENT(ovl_E16C50);
DECLARE_SEGMENT(ovl_i3);
DECLARE_SEGMENT(ovl_E51970);
DECLARE_SEGMENT(ovl_E6A810);
DECLARE_SEGMENT(ovl_E9F1D0);
include/sf64level.h
+19
View File
@@ -88,6 +88,25 @@ typedef enum LevelId {
/* 77 */ LEVEL_WARP_ZONE = 77,
} LevelId;
typedef enum PlanetId {
/* 0 */ PLANET_METEO,
/* 1 */ PLANET_AREA_6,
/* 2 */ PLANET_BOLSE,
/* 3 */ PLANET_SECTOR_Z,
/* 4 */ PLANET_SECTOR_X,
/* 5 */ PLANET_SECTOR_Y,
/* 6 */ PLANET_KATINA,
/* 7 */ PLANET_MACBETH,
/* 8 */ PLANET_ZONESS,
/* 9 */ PLANET_CORNERIA,
/* 10 */ PLANET_TITANIA,
/* 11 */ PLANET_AQUAS,
/* 12 */ PLANET_FORTUNA,
/* 13 */ PLANET_VENOM,
/* 14 */ PLANET_SOLAR,
/* 15 */ PLANET_MAX,
} PlanetId;
typedef enum VsStage {
/* 0 */ VS_STAGE_CORNERIA,
/* 1 */ VS_STAGE_KATINA,
include/sf64object.h
+165 -10
View File
@@ -208,9 +208,9 @@ typedef struct {
/* 0x01C */ ObjectInfo info;
/* 0x040 */ s32 index;
/* 0x044 */ s16 unk_044;
/* 0x046 */ char unk_46[0x6];
/* 0x046 */ char unk_46[6];
/* 0x04C */ s16 unk_04C;
/* 0x04E */ s16 unk_04E;
/* 0x04E */ s16 actionState;
/* 0x050 */ s16 timer_050;
/* 0x052 */ s16 timer_052;
/* 0x054 */ s16 timer_054;
@@ -219,15 +219,13 @@ typedef struct {
/* 0x05A */ s16 timer_05A;
/* 0x05C */ s16 timer_05C;
/* 0x05E */ u8 unk_05E;
/* 0x060 */ s16 unk_060;
/* 0x062 */ s8 unk_062;
/* 0x064 */ s16 unk_064;
/* 0x066 */ s16 unk_066;
/* 0x060 */ s16 health;
/* 0x062 */ s8 dmgType;
/* 0x064 */ s16 damage;
/* 0x066 */ s16 dmgPart;
/* 0x068 */ f32 unk_068;
/* 0x06C */ Vec3f vel;
/* 0x078 */ f32 unk_078;
/* 0x07C */ f32 unk_07C;
/* 0x080 */ char pad80[4];
/* 0x078 */ Vec3f unk_078;
/* 0x084 */ f32 gravity;
/* 0x088 */ s16 swork[40];
/* 0x0D8 */ f32 fwork[50];
@@ -236,6 +234,10 @@ typedef struct {
/* 0x3FC */ Vec3f sfxPos;
} Boss; // size = 0x408
#define DMG_BEAM 1
#define DMG_NONE 0
#define DMG_BOMB -1
typedef struct {
/* 0x000 */ Object obj;
/* 0x01C */ ObjectInfo info;
@@ -262,7 +264,6 @@ typedef struct {
/* 0x0CA */ u8 timer_0CA[4];
/* 0x0CE */ s16 unk_0CE;
/* 0x0D0 */ s8 unk_0D0;
/* 0x0D1 */ char pad0D1[0x1];
/* 0x0D2 */ s16 unk_0D2;
/* 0x0D4 */ s16 unk_0D4;
/* 0x0D6 */ u16 unk_0D6;
@@ -693,4 +694,158 @@ typedef enum{
#define OBJ_UNK_1000 1000
// template enums for boss work buffers
typedef enum {
/* 0 */ LN_SWK_0,
/* 1 */ LN_SWK_1,
/* 2 */ LN_SWK_2,
/* 3 */ LN_SWK_3,
/* 4 */ LN_SWK_4,
/* 5 */ LN_SWK_5,
/* 6 */ LN_SWK_6,
/* 7 */ LN_SWK_7,
/* 8 */ LN_SWK_8,
/* 9 */ LN_SWK_9,
/* 10 */ LN_SWK_10,
/* 11 */ LN_SWK_11,
/* 12 */ LN_SWK_12,
/* 13 */ LN_SWK_13,
/* 14 */ LN_SWK_14,
/* 15 */ LN_SWK_15,
/* 16 */ LN_SWK_16,
/* 17 */ LN_SWK_17,
/* 18 */ LN_SWK_18,
/* 19 */ LN_SWK_19,
/* 20 */ LN_SWK_20,
/* 21 */ LN_SWK_21,
/* 22 */ LN_SWK_22,
/* 23 */ LN_SWK_23,
/* 24 */ LN_SWK_24,
/* 25 */ LN_SWK_25,
/* 26 */ LN_SWK_26,
/* 27 */ LN_SWK_27,
/* 28 */ LN_SWK_28,
/* 29 */ LN_SWK_29,
/* 30 */ LN_SWK_30,
/* 31 */ LN_SWK_31,
/* 32 */ LN_SWK_32,
/* 33 */ LN_SWK_33,
/* 34 */ LN_SWK_34,
/* 35 */ LN_SWK_35,
/* 36 */ LN_SWK_36,
/* 37 */ LN_SWK_37,
/* 38 */ LN_SWK_38,
/* 39 */ LN_SWK_39,
/* 40 */ LN_SWK_MAX,
} BossLNswork;
typedef enum {
/* 0 */ LN_FWK_0,
/* 1 */ LN_FWK_1,
/* 2 */ LN_FWK_2,
/* 3 */ LN_FWK_3,
/* 4 */ LN_FWK_4,
/* 5 */ LN_FWK_5,
/* 6 */ LN_FWK_6,
/* 7 */ LN_FWK_7,
/* 8 */ LN_FWK_8,
/* 9 */ LN_FWK_9,
/* 10 */ LN_FWK_10,
/* 11 */ LN_FWK_11,
/* 12 */ LN_FWK_12,
/* 13 */ LN_FWK_13,
/* 14 */ LN_FWK_14,
/* 15 */ LN_FWK_15,
/* 16 */ LN_FWK_16,
/* 17 */ LN_FWK_17,
/* 18 */ LN_FWK_18,
/* 19 */ LN_FWK_19,
/* 20 */ LN_FWK_20,
/* 21 */ LN_FWK_21,
/* 22 */ LN_FWK_22,
/* 23 */ LN_FWK_23,
/* 24 */ LN_FWK_24,
/* 25 */ LN_FWK_25,
/* 26 */ LN_FWK_26,
/* 27 */ LN_FWK_27,
/* 28 */ LN_FWK_28,
/* 29 */ LN_FWK_29,
/* 30 */ LN_FWK_30,
/* 31 */ LN_FWK_31,
/* 32 */ LN_FWK_32,
/* 33 */ LN_FWK_33,
/* 34 */ LN_FWK_34,
/* 35 */ LN_FWK_35,
/* 36 */ LN_FWK_36,
/* 37 */ LN_FWK_37,
/* 38 */ LN_FWK_38,
/* 39 */ LN_FWK_39,
/* 40 */ LN_FWK_40,
/* 41 */ LN_FWK_41,
/* 42 */ LN_FWK_42,
/* 43 */ LN_FWK_43,
/* 44 */ LN_FWK_44,
/* 45 */ LN_FWK_45,
/* 46 */ LN_FWK_46,
/* 47 */ LN_FWK_47,
/* 48 */ LN_FWK_48,
/* 49 */ LN_FWK_49,
/* 50 */ LN_FWK_MAX,
} BossLNfwork;
typedef enum {
/* 0 */ LN_VWK_0,
/* 1 */ LN_VWK_1,
/* 2 */ LN_VWK_2,
/* 3 */ LN_VWK_3,
/* 4 */ LN_VWK_4,
/* 5 */ LN_VWK_5,
/* 6 */ LN_VWK_6,
/* 7 */ LN_VWK_7,
/* 8 */ LN_VWK_8,
/* 9 */ LN_VWK_9,
/* 10 */ LN_VWK_10,
/* 11 */ LN_VWK_11,
/* 12 */ LN_VWK_12,
/* 13 */ LN_VWK_13,
/* 14 */ LN_VWK_14,
/* 15 */ LN_VWK_15,
/* 16 */ LN_VWK_16,
/* 17 */ LN_VWK_17,
/* 18 */ LN_VWK_18,
/* 19 */ LN_VWK_19,
/* 20 */ LN_VWK_20,
/* 21 */ LN_VWK_21,
/* 22 */ LN_VWK_22,
/* 23 */ LN_VWK_23,
/* 24 */ LN_VWK_24,
/* 25 */ LN_VWK_25,
/* 26 */ LN_VWK_26,
/* 27 */ LN_VWK_27,
/* 28 */ LN_VWK_28,
/* 29 */ LN_VWK_29,
/* 30 */ LN_VWK_30,
/* 31 */ LN_VWK_31,
/* 32 */ LN_VWK_32,
/* 33 */ LN_VWK_33,
/* 34 */ LN_VWK_34,
/* 35 */ LN_VWK_35,
/* 36 */ LN_VWK_36,
/* 37 */ LN_VWK_37,
/* 38 */ LN_VWK_38,
/* 39 */ LN_VWK_39,
/* 40 */ LN_VWK_40,
/* 41 */ LN_VWK_41,
/* 42 */ LN_VWK_42,
/* 43 */ LN_VWK_43,
/* 44 */ LN_VWK_44,
/* 45 */ LN_VWK_45,
/* 46 */ LN_VWK_46,
/* 47 */ LN_VWK_47,
/* 48 */ LN_VWK_48,
/* 49 */ LN_VWK_49,
/* 50 */ LN_VWK_MAX,
} BossLNvwork;
#endif
include/variables.h
+191 -155
View File
File diff suppressed because it is too large Load Diff
linker_scripts/us/symbol_addrs.txt
+9 -4
View File
@@ -3,6 +3,7 @@ __libm_qnan_f = 0x800C9570;
D_1 = 0x1; //ignore:true
D_80120000 = 0x80120000;//ignore:true
D_80130001 = 0x80130001;//ignore:true
D_80150000 = 0x80150000;//ignore:true
D_80000000 = 0x80000000;//ignore:true
D_80000001 = 0x80000001;//ignore:true
D_80000002 = 0x80000002;//ignore:true
@@ -19,6 +20,10 @@ D_8000000C = 0x8000000C;//ignore:true
D_8000000D = 0x8000000D;//ignore:true
D_8000000E = 0x8000000E;//ignore:true
D_8000000F = 0x8000000F;//ignore:true
D_80000014 = 0x80000014;//ignore:true
D_80000018 = 0x80000018;//ignore:true
D_8000001C = 0x8000001C;//ignore:true
D_80000024 = 0x80000024;//ignore:true
D_800C45E0 = 0x800C45E0;
@@ -87,10 +92,10 @@ D_800C93EC = 0x800C93EC; // force_migration:True
D_DF4260_8019B1EC = 0x8019B1EC; // force_migration:True segment:ovl_DF4260
D_DF4260_8019B6D8 = 0x8019B6D8; // size:0x110 segment:ovl_DF4260
D_E16C50_801C171C = 0x801C171C; // force_migration:True segment:ovl_E16C50
D_E16C50_801C1728 = 0x801C1728; // force_migration:True segment:ovl_E16C50
D_E16C50_801C1730 = 0x801C1730; // force_migration:True segment:ovl_E16C50
D_E16C50_801C1758 = 0x801C1758; // force_migration:True segment:ovl_E16C50
D_i3_801C171C = 0x801C171C; // force_migration:True segment:ovl_i3
D_i3_801C1728 = 0x801C1728; // force_migration:True segment:ovl_i3
D_i3_801C1730 = 0x801C1730; // force_migration:True segment:ovl_i3
D_i3_801C1758 = 0x801C1758; // force_migration:True segment:ovl_i3
D_E6A810_801BB83C = 0x801BB83C; // force_migration:True segment:ovl_E6A810
D_E6A810_801BB808 = 0x801BB808; // force_migration:True segment:ovl_E6A810
D_E6A810_801BBAD0 = 0x801BBAD0; // force_migration:True segment:ovl_E6A810
linker_scripts/us/symbol_addrs_engine.txt
+9 -4
View File
@@ -151,6 +151,9 @@ Message_IsPrintingChar = 0x800C2F30;
D_800C9CC4 = 0x800C9CC4;
D_800C9CF8 = 0x800C9CF8;
// fox_43AC0
gBossFrameCount = 0x801613A0;
// fox_save
gDefaultSave = 0x800D4D10;
gSaveFile = 0x80178870; //size:0x200
@@ -355,11 +358,13 @@ func_800A25DC = 0x800A25DC;
func_800A26C0 = 0x800A26C0;
func_800A3608 = 0x800A3608;
gTotalHits = 0x80161714;
// sf_hud
gMedalFlashTimer = 0x801617B8;
gTotalHits = 0x80161714;
gShowBossHealth = 0x80161734;
gMedalStatus = 0x801617B4;
gMedalFlashTimer = 0x801617B8;
// fox_play
D_80161A50 = 0x80161A50;
@@ -410,7 +415,7 @@ gGameState = 0x80177834;
D_80177838 = 0x80177838;
D_Timer_8017783C = 0x8017783C;
D_80177840 = 0x80177840;
D_80177848 = 0x80177848;
gBossHealthBar = 0x80177848;
D_8017784C = 0x8017784C;
D_80177850 = 0x80177850;
D_80177854 = 0x80177854;
@@ -436,7 +441,7 @@ gTeamDamage = 0x80177910;
gBrakeButton = 0x80177928;
D_80177930 = 0x80177930;
gShootButton = 0x80177938;
D_80177940 = 0x80177940;
gGroundLevel = 0x80177940;
gBombButton = 0x80177948;
D_80177950 = 0x80177950;
D_80177958 = 0x80177958;
linker_scripts/us/symbol_addrs_overlays.txt
+58 -58
View File
@@ -30,66 +30,66 @@ D_EBFBE0_801AEE6C = 0x801AEE6C; // type:s32 size:0x58 force_migration:True segme
D_EBFBE0_801AF25C = 0x801AF25C; // type:f32 size:0x18 force_migration:True segment:ovl_menu
D_EBFBE0_801AF274 = 0x801AF274; // type:f32 size:0x18 force_migration:True segment:ovl_menu
func_E16C50_80187754 = 0x80187754;
func_E16C50_801932AC = 0x801932AC;
func_E16C50_8019B1F0 = 0x8019B1F0;
func_E16C50_8019B810 = 0x8019B810;
func_E16C50_8019C200 = 0x8019C200;
func_E16C50_8019D060 = 0x8019D060;
func_E16C50_801AD688 = 0x801AD688;
func_E16C50_801AE3AC = 0x801AE3AC;
func_E16C50_801AF9FC = 0x801AF9FC;
func_E16C50_801B10F8 = 0x801B10F8;
func_E16C50_801B6344 = 0x801B6344;
func_E16C50_801B6E54 = 0x801B6E54;
func_E16C50_801B7AF0 = 0x801B7AF0;
func_E16C50_801BA57C = 0x801BA57C;
func_E16C50_801BB26C = 0x801BB26C;
func_E16C50_801915A4 = 0x801915A4;
func_E16C50_80191BB8 = 0x80191BB8;
D_E16C50_801C2240 = 0x801C2240;
D_E16C50_801C4188 = 0x801C4188;
D_E16C50_801C2250 = 0x801C2250;//size:0xA0 segment:ovl_E16C50
D_E16C50_801C22F0 = 0x801C22F0;//size:0x40 segment:ovl_E16C50
D_E16C50_801BF1F0 = 0x801BF1F0;//size:0x30 type:f32 segment:ovl_E16C50
D_E16C50_801BF220 = 0x801BF220;//size:0x30 type:f32 segment:ovl_E16C50
D_E16C50_801BF250 = 0x801BF250;//size:0x30 type:f32 segment:ovl_E16C50
D_E16C50_801BF280 = 0x801BF280;//size:0x30 type:f32 segment:ovl_E16C50
D_E16C50_801BF2B0 = 0x801BF2B0;//size:0x30 type:f32 segment:ovl_E16C50
D_E16C50_801BF2E0 = 0x801BF2E0;//size:0x30 type:f32 segment:ovl_E16C50
D_E16C50_801BF8AC = 0x801BF8AC;//size:0xC type:Vec3f segment:ovl_E16C50
D_E16C50_801BF8B8 = 0x801BF8B8;//size:0xC type:Vec3f segment:ovl_E16C50
D_E16C50_801BF8C4 = 0x801BF8C4;//size:0x8 type:f32 segment:ovl_E16C50
D_E16C50_801BED10 = 0x801BED10;//size:0xC type:Vec3f segment:ovl_E16C50
D_E16C50_801BED1C = 0x801BED1C;//size:0xC type:Vec3f segment:ovl_E16C50
D_E16C50_801BED70 = 0x801BED70;//size:0x90 type:Vec3f segment:ovl_E16C50
D_E16C50_801BEE00 = 0x801BEE00;//size:0x90 type:Vec3f segment:ovl_E16C50
D_E16C50_801BEEF0 = 0x801BEEF0;//size:0x90 type:Vec3f segment:ovl_E16C50
D_E16C50_801BEF80 = 0x801BEF80;//size:0x90 type:Vec3f segment:ovl_E16C50
D_E16C50_801BF070 = 0x801BF070;//size:0x90 type:Vec3f segment:ovl_E16C50
D_E16C50_801BF100 = 0x801BF100;//size:0x90 type:Vec3f segment:ovl_E16C50
D_E16C50_801BF190 = 0x801BF190;//size:0x30 type:f32 segment:ovl_E16C50
func_i3_80187754 = 0x80187754;
func_i3_801932AC = 0x801932AC;
func_i3_8019B1F0 = 0x8019B1F0;
func_i3_8019B810 = 0x8019B810;
func_i3_8019C200 = 0x8019C200;
func_i3_8019D060 = 0x8019D060;
func_i3_801AD688 = 0x801AD688;
func_i3_801AE3AC = 0x801AE3AC;
func_i3_801AF9FC = 0x801AF9FC;
func_i3_801B10F8 = 0x801B10F8;
func_i3_801B6344 = 0x801B6344;
func_i3_801B6E54 = 0x801B6E54;
func_i3_801B7AF0 = 0x801B7AF0;
func_i3_801BA57C = 0x801BA57C;
func_i3_801BB26C = 0x801BB26C;
func_i3_801915A4 = 0x801915A4;
func_i3_80191BB8 = 0x80191BB8;
D_i3_801C2240 = 0x801C2240;
D_i3_801C4188 = 0x801C4188;
D_i3_801C2250 = 0x801C2250;//size:0xA0 segment:ovl_i3
D_i3_801C22F0 = 0x801C22F0;//size:0x40 segment:ovl_i3
D_i3_801BF1F0 = 0x801BF1F0;//size:0x30 type:f32 segment:ovl_i3
D_i3_801BF220 = 0x801BF220;//size:0x30 type:f32 segment:ovl_i3
D_i3_801BF250 = 0x801BF250;//size:0x30 type:f32 segment:ovl_i3
D_i3_801BF280 = 0x801BF280;//size:0x30 type:f32 segment:ovl_i3
D_i3_801BF2B0 = 0x801BF2B0;//size:0x30 type:f32 segment:ovl_i3
D_i3_801BF2E0 = 0x801BF2E0;//size:0x30 type:f32 segment:ovl_i3
D_i3_801BF8AC = 0x801BF8AC;//size:0xC type:Vec3f segment:ovl_i3
D_i3_801BF8B8 = 0x801BF8B8;//size:0xC type:Vec3f segment:ovl_i3
D_i3_801BF8C4 = 0x801BF8C4;//size:0x8 type:f32 segment:ovl_i3
D_i3_801BED10 = 0x801BED10;//size:0xC type:Vec3f segment:ovl_i3
D_i3_801BED1C = 0x801BED1C;//size:0xC type:Vec3f segment:ovl_i3
D_i3_801BED70 = 0x801BED70;//size:0x90 type:Vec3f segment:ovl_i3
D_i3_801BEE00 = 0x801BEE00;//size:0x90 type:Vec3f segment:ovl_i3
D_i3_801BEEF0 = 0x801BEEF0;//size:0x90 type:Vec3f segment:ovl_i3
D_i3_801BEF80 = 0x801BEF80;//size:0x90 type:Vec3f segment:ovl_i3
D_i3_801BF070 = 0x801BF070;//size:0x90 type:Vec3f segment:ovl_i3
D_i3_801BF100 = 0x801BF100;//size:0x90 type:Vec3f segment:ovl_i3
D_i3_801BF190 = 0x801BF190;//size:0x30 type:f32 segment:ovl_i3
D_E16C50_801C2330 = 0x801C2330;//segment:ovl_E16C50 type:s32 size:0xA0
D_E16C50_801C23D0 = 0x801C23D0;//segment:ovl_E16C50 type:s32 size:0x118
D_E16C50_801C24E8 = 0x801C24E8;//segment:ovl_E16C50 type:f32 size:0x258
sZoLimbTimers = 0x801C2330;//segment:ovl_i3 type:s32 size:0xA0
sZoSwork = 0x801C23D0;//segment:ovl_i3 type:s32 size:0x118
sZoFwork = 0x801C24E8;//segment:ovl_i3 type:f32 size:0x258
D_E16C50_801C27C8 = 0x801C27C8; //segment:ovl_E16C50 size:0x12C0
D_E16C50_801C3A88 = 0x801C3A88; //segment:ovl_E16C50 size:0x700
D_E16C50_801C4190 = 0x801C4190; //segment:ovl_E16C50 size:0x28
D_E16C50_801C41B8 = 0x801C41B8; //segment:ovl_E16C50 size:0x78
D_E16C50_801C4230 = 0x801C4230; //segment:ovl_E16C50 size:0x70
D_E16C50_801C42A0 = 0x801C42A0; //segment:ovl_E16C50 size:0x68
D_E16C50_801C4308 = 0x801C4308; //segment:ovl_E16C50 size:0x148
D_E16C50_801C0060 = 0x801C0060; //segment:ovl_E16C50 type:f32
D_E16C50_801BFE14 = 0x801BFE14; //segment:ovl_E16C50 type:s32
D_E16C50_801C0264 = 0x801C0264; //segment:ovl_E16C50 type:s32
D_E16C50_801C02C8 = 0x801C02C8; //segment:ovl_E16C50 type:f32
D_E16C50_801C02D0 = 0x801C02D0; //segment:ovl_E16C50 type:s32
D_E16C50_801C0130 = 0x801C0130; //segment:ovl_E16C50 ignore:True
D_E16C50_801C2740 = 0x801C2740; //segment:ovl_E16C50 size:0x28
D_E16C50_801C2768 = 0x801C2768; //segment:ovl_E16C50 size:0x38
D_E16C50_801C27A0 = 0x801C27A0; //segment:ovl_E16C50 size:0x20
D_i3_801C27C8 = 0x801C27C8; //segment:ovl_i3 size:0x12C0
D_i3_801C3A88 = 0x801C3A88; //segment:ovl_i3 size:0x700
D_i3_801C4190 = 0x801C4190; //segment:ovl_i3 size:0x28
D_i3_801C41B8 = 0x801C41B8; //segment:ovl_i3 size:0x78
D_i3_801C4230 = 0x801C4230; //segment:ovl_i3 size:0x70
D_i3_801C42A0 = 0x801C42A0; //segment:ovl_i3 size:0x68
D_i3_801C4308 = 0x801C4308; //segment:ovl_i3 size:0x148
D_i3_801C0060 = 0x801C0060; //segment:ovl_i3 type:f32
D_i3_801BFE14 = 0x801BFE14; //segment:ovl_i3 type:s32
D_i3_801C0264 = 0x801C0264; //segment:ovl_i3 type:s32
D_i3_801C02C8 = 0x801C02C8; //segment:ovl_i3 type:f32
D_i3_801C02D0 = 0x801C02D0; //segment:ovl_i3 type:s32
D_i3_801C0130 = 0x801C0130; //segment:ovl_i3 ignore:True
D_i3_801C2740 = 0x801C2740; //segment:ovl_i3 size:0x28
D_i3_801C2768 = 0x801C2768; //segment:ovl_i3 size:0x38
D_i3_801C27A0 = 0x801C27A0; //segment:ovl_i3 size:0x20
func_E51970_80198594 = 0x80198594;
func_E51970_80193CA4 = 0x80193CA4;
linker_scripts/us/undefined_syms.ld
+64 -40
View File
@@ -357,6 +357,7 @@ D_5000480 = 0x05000480;
D_6000E00 = 0x06000E00;
D_6001360 = 0x06001360;
D_6001DA0 = 0x06001DA0;
D_60012A0 = 0x060012A0;
D_60023B0 = 0x060023B0;
D_6002990 = 0x06002990;
D_6003000 = 0x06003000;
@@ -431,7 +432,7 @@ D_600F6C0 = 0x0600F6C0;
D_600FD50 = 0x0600FD50;
D_600FE9C = 0x0600FE9C;
D_600FEB8 = 0x0600FEB8;
D_600FF30 = 0x0600FF30;
D_600FF30_Hitbox = 0x0600FF30;
D_600FF80 = 0x0600FF80;
D_600FFA0 = 0x0600FFA0;
D_600FFC0 = 0x0600FFC0;
@@ -467,6 +468,8 @@ D_60153B0 = 0x060153B0;
D_6015730 = 0x06015730;
D_6015CE0 = 0x06015CE0;
D_6015F00 = 0x06015F00;
D_6015FF0 = 0x06015FF0;
D_6015DD0 = 0x06015DD0;
D_6016270 = 0x06016270;
D_6016374 = 0x06016374;
D_60164F0 = 0x060164F0;
@@ -508,8 +511,11 @@ D_601F500 = 0x0601F500;
D_601F5A0 = 0x0601F5A0;
D_601FCB0 = 0x0601FCB0;
D_6022340 = 0x06022340;
D_6022110 = 0x06022110;
D_60231C0 = 0x060231C0;
D_60238F0 = 0x060238F0;
D_60239E0 = 0x060239E0;
D_6023730 = 0x06023730;
D_6024010 = 0x06024010;
D_60244A0 = 0x060244A0;
D_60247E0 = 0x060247E0;
@@ -580,7 +586,7 @@ D_6030D20 = 0x06030D20;
D_6030D74 = 0x06030D74;
D_6030DF8 = 0x06030DF8;
D_6030E14 = 0x06030E14;
D_6030E30 = 0x06030E30;
D_6030E30_Hitbox = 0x06030E30;
D_6030E4C = 0x06030E4C;
D_6030E68 = 0x06030E68;
D_6030E74 = 0x06030E74;
@@ -714,6 +720,7 @@ D_603F338 = 0x0603F338;
D_603F388 = 0x0603F388;
D_603F40C = 0x0603F40C;
D_603F4E4 = 0x0603F4E4;
D_6049F80 = 0x06049F80;
D_604A190 = 0x0604A190;
D_604A400 = 0x0604A400;
D_604A710 = 0x0604A710;
@@ -723,6 +730,25 @@ D_60034E0 = 0x060034E0;
D_6003580 = 0x06003580;
D_6003620 = 0x06003620;
D_60036C0 = 0x060036C0;
D_6037160 = 0x06037160;
D_6026C80 = 0x06026C80;
D_602A120 = 0x0602A120;
D_6023F20 = 0x06023F20;
D_6028760 = 0x06028760;
D_602E4B0 = 0x0602E4B0;
D_6007E30 = 0x06007E30;
D_601F1F0 = 0x0601F1F0;
D_60266D0 = 0x060266D0;
D_C035110 = 0x0C035110;
D_6006A60 = 0x06006A60;
D_6030E30_Env = 0x06030E30;
D_6005000 = 0x06005000;
D_602E540 = 0x0602E540;
D_600EA90 = 0x0600EA90;
D_6011000 = 0x06011000;
D_600FF30_Env = 0x0600FF30;
D_6006E70 = 0x06006E70;
D_6014D50 = 0x06014D50;
D_700AB70 = 0x0700AB70;
D_700BE00 = 0x0700BE00;
@@ -747,59 +773,57 @@ D_D00B5C0 = 0x0D00B5C0;
D_D00B720 = 0x0D00B720;
// fox_map, to be ordered later
D_60030D0 = 0x060030D0;
D_600B9B0 = 0x0600B9B0;
D_6010010 = 0x06010010;
D_600E210 = 0x0600E210;
D_6006320 = 0x06006320;
D_60131A0 = 0x060131A0;
D_6001C80 = 0x06001C80;
D_6017640 = 0x06017640;
D_6014360 = 0x06014360;
D_6002160 = 0x06002160;
D_60030D0 = 0x060030D0;
D_6003B50 = 0x06003B50;
D_6005740 = 0x06005740;
D_6006320 = 0x06006320;
D_6006E80 = 0x06006E80;
D_6008990 = 0x06008990;
D_600AD30 = 0x0600AD30;
D_6011EA0 = 0x06011EA0;
D_6016760 = 0x06016760;
D_6005740 = 0x06005740;
D_6003B50 = 0x06003B50;
D_600B9B0 = 0x0600B9B0;
D_600CC10 = 0x0600CC10;
D_60105C0 = 0x060105C0;
D_600E210 = 0x0600E210;
D_600F390 = 0x0600F390;
D_6006E80 = 0x06006E80;
D_6010010 = 0x06010010;
D_60105C0 = 0x060105C0;
D_6011EA0 = 0x06011EA0;
D_60131A0 = 0x060131A0;
D_60139E0 = 0x060139E0;
D_6002160 = 0x06002160;
D_6018280 = 0x06018280;
D_6014360 = 0x06014360;
D_6014BA0 = 0x06014BA0;
D_6055F20 = 0x06055F20;
D_6051D20 = 0x06051D20;
D_6016760 = 0x06016760;
D_6017640 = 0x06017640;
D_6018280 = 0x06018280;
D_60190B0 = 0x060190B0;
D_601C0D0 = 0x0601C0D0;
D_601C960 = 0x0601C960;
D_601DE80 = 0x0601DE80;
D_601F6B0 = 0x0601F6B0;
D_601FF40 = 0x0601FF40;
D_602B6D0 = 0x0602B6D0;
D_6026D70 = 0x06026D70;
D_602FFD0 = 0x0602FFD0;
D_60223E0 = 0x060223E0;
D_6024890 = 0x06024890;
D_60190B0 = 0x060190B0;
D_6026D70 = 0x06026D70;
D_602B6D0 = 0x0602B6D0;
D_602DB60 = 0x0602DB60;
D_6060610 = 0x06060610;
D_601C0D0 = 0x0601C0D0;
D_601DE80 = 0x0601DE80;
D_601C960 = 0x0601C960;
D_604B750 = 0x0604B750;
D_604DB10 = 0x0604DB10;
D_601F6B0 = 0x0601F6B0;
D_6041A80 = 0x06041A80;
D_603F380 = 0x0603F380;
D_602FFD0 = 0x0602FFD0;
D_6032440 = 0x06032440;
D_6032A60 = 0x06032A60;
D_6033080 = 0x06033080;
D_6035780 = 0x06035780;
D_6037E80 = 0x06037E80;
D_6033080 = 0x06033080;
D_603CC80 = 0x0603CC80;
D_603A580 = 0x0603A580;
D_6032A60 = 0x06032A60;
D_603CC80 = 0x0603CC80;
D_603F380 = 0x0603F380;
D_6041A80 = 0x06041A80;
D_6044180 = 0x06044180;
D_6032440 = 0x06032440;
D_604B750 = 0x0604B750;
D_604DB10 = 0x0604DB10;
D_6051D20 = 0x06051D20;
D_6055F20 = 0x06055F20;
D_6060610 = 0x06060610;
D_9006AE0 = 0x09006AE0;
D_9000570 = 0x09000570;
D_90086F0 = 0x090086F0;
src/main/dmatable.c
+1 -1
View File
@@ -63,7 +63,7 @@ DmaEntry gDmaTable[90] = {
{ SEGMENT_ROM_START(ast_DE5D50), { SEGMENT_ROM_START(ast_DE5D50), SEGMENT_ROM_END(ast_DE5D50) }, false },
{ SEGMENT_ROM_START(ovl_DF4260), { SEGMENT_ROM_START(ovl_DF4260), SEGMENT_ROM_END(ovl_DF4260) }, false },
{ SEGMENT_ROM_START(ovl_E08400), { SEGMENT_ROM_START(ovl_E08400), SEGMENT_ROM_END(ovl_E08400) }, false },
{ SEGMENT_ROM_START(ovl_E16C50), { SEGMENT_ROM_START(ovl_E16C50), SEGMENT_ROM_END(ovl_E16C50) }, false },
{ SEGMENT_ROM_START(ovl_i3), { SEGMENT_ROM_START(ovl_i3), SEGMENT_ROM_END(ovl_i3) }, false },
{ SEGMENT_ROM_START(ovl_E51970), { SEGMENT_ROM_START(ovl_E51970), SEGMENT_ROM_END(ovl_E51970) }, false },
{ SEGMENT_ROM_START(ovl_E6A810), { SEGMENT_ROM_START(ovl_E6A810), SEGMENT_ROM_END(ovl_E6A810) }, false },
{ SEGMENT_ROM_START(ovl_E9F1D0), { SEGMENT_ROM_START(ovl_E9F1D0), SEGMENT_ROM_END(ovl_E9F1D0) }, false },
src/main/fox_360.c
+13 -13
View File
@@ -226,7 +226,7 @@ void func_8002E700(Player* player) {
player->unk_014 = 0;
player->unk_018 = 0;
player->unk_01C = 0;
gActors->unk_0B8 = 2;
gActors[0].unk_0B8 = 2;
}
break;
}
@@ -1025,7 +1025,7 @@ void func_8003088C(Actor* arg0) {
arg0->fwork[14] = sp3C.y;
arg0->fwork[12] = sp3C.z;
}
if ((gRadioState == 0) && (gActors->obj.status == 2)) {
if ((gRadioState == 0) && (gActors[0].obj.status == 2)) {
if (arg0->unk_0D0 == 3) {
switch (arg0->unk_0E4) {
case 1:
@@ -1375,7 +1375,7 @@ void func_800319AC(Actor* this) {
case 0:
if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_9) {
this->fwork[0] = this->fwork[1] = 40.0f;
if (gActors->unk_0B8 == 5) {
if (gActors[0].unk_0B8 == 5) {
Math_SmoothStepToF(&this->unk_0F4.x, 30.0f, 0.1f, 0.5f, 0.0f);
this->fwork[1] = 200.0f;
}
@@ -1462,7 +1462,7 @@ void func_800319AC(Actor* this) {
this->fwork[6] = gPlayer[0].unk_138 + spC4;
this->fwork[1] = gPlayer[0].unk_0D0 + 10.0f;
}
if ((gActors->unk_0B8 == 6) && (this->unk_0E4 < 4)) {
if ((gActors[0].unk_0B8 == 6) && (this->unk_0E4 < 4)) {
this->fwork[3] = 3.0f;
this->fwork[1] = gPlayer[0].unk_0D0 - 5.0f;
this->iwork[11] = 2;
@@ -1508,7 +1508,7 @@ void func_800319AC(Actor* this) {
this->fwork[6] = gBosses[0].obj.pos.z;
this->fwork[1] = 40.0f;
}
if ((this->unk_0E6 >= 0) && (this->unk_0E6 != 100) && (gActors->unk_0B8 != 6)) {
if ((this->unk_0E6 >= 0) && (this->unk_0E6 != 100) && (gActors[0].unk_0B8 != 6)) {
if (spE8 < spF8) {
if (spEC < spF8) {
if (this->unk_0E6 != 0) {
@@ -1529,7 +1529,7 @@ void func_800319AC(Actor* this) {
this->iwork[4]++;
this->iwork[5] = 1;
if (!((this->index + gFrameCount) & sp10F) && (Rand_ZeroOne() < spF0) && func_80031900(this) &&
((gActors->unk_0B8 == 2) || (gCurrentLevel == LEVEL_TRAINING))) {
((gActors[0].unk_0B8 == 2) || (gCurrentLevel == LEVEL_TRAINING))) {
if ((this->unk_0E6 == 0) && (gCurrentLevel != LEVEL_TRAINING)) {
if ((this->iwork[4] > 250) && (gCurrentLevel != LEVEL_VENOM_ANDROSS)) {
if ((Rand_ZeroOne() < 0.5f) || (gCurrentLevel == LEVEL_VENOM_2)) {
@@ -1558,7 +1558,7 @@ void func_800319AC(Actor* this) {
}
}
if ((gRadioState == 0) && (this->timer_0C4 == 0) && (D_8015F928 > 700) && (D_8015F908 == 0) &&
(gActors->obj.status == 2)) {
(gActors[0].obj.status == 2)) {
this->timer_0C4 = 600;
if (Rand_ZeroOne() < 0.5f) {
gActors[this->unk_0E6].iwork[6]++;
@@ -1745,7 +1745,7 @@ void func_800319AC(Actor* this) {
this->fwork[3] = 1.0f;
this->fwork[1] = 38.0f;
}
if ((gCurrentLevel == LEVEL_SECTOR_Z) && (gActors->unk_0B8 == 0xA)) {
if ((gCurrentLevel == LEVEL_SECTOR_Z) && (gActors[0].unk_0B8 == 0xA)) {
this->fwork[10] = 30.0f;
}
if ((gLevelType == LEVELTYPE_SPACE) && (gCurrentLevel != LEVEL_BOLSE)) {
@@ -1905,7 +1905,7 @@ void func_800319AC(Actor* this) {
if (spD8 < 0.0f) {
spD8 += 360.0f;
}
} else if ((this->obj.pos.y < (D_80177940 + 50.0f)) && (spD8 > 180.0f)) {
} else if ((this->obj.pos.y < (gGroundLevel + 50.0f)) && (spD8 > 180.0f)) {
spD8 = 0.0f;
this->unk_0F4.x = 0.0f;
}
@@ -1967,8 +1967,8 @@ void func_800319AC(Actor* this) {
this->fwork[13] -= (this->fwork[13] * 0.1f);
this->fwork[14] -= (this->fwork[14] * 0.1f);
this->fwork[12] -= (this->fwork[12] * 0.1f);
if ((this->obj.pos.y < D_80177940 + 40.0f) && (this->vel.y < 0.0f)) {
this->obj.pos.y = D_80177940 + 40.0f;
if ((this->obj.pos.y < gGroundLevel + 40.0f) && (this->vel.y < 0.0f)) {
this->obj.pos.y = gGroundLevel + 40.0f;
this->vel.y = 0.0f;
}
if (this->iwork[0] != 0) {
@@ -2022,7 +2022,7 @@ void func_800319AC(Actor* this) {
temp_v1->unk_10 = this->unk_0F4.y + 180.0f;
if (this->iwork[1] != 0) {
this->iwork[1]--;
if ((this->iwork[1] == 0) && (gActors->unk_0B8 == 2) && (gRadioState == 0)) {
if ((this->iwork[1] == 0) && (gActors[0].unk_0B8 == 2) && (gRadioState == 0)) {
switch (this->unk_0E4) {
case 1:
func_8002F5F4(gMsg_ID_9220, RCID_FALCO);
@@ -2125,7 +2125,7 @@ void func_80035098(Actor* actor) {
Matrix_RotateX(gGfxMatrix, -actor->obj.rot.x * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, M_DTOR * -actor->obj.rot.y - gPlayer[0].unk_058, 1);
Matrix_RotateX(gGfxMatrix, gPlayer[0].unk_05C, 1);
Matrix_RotateZ(gGfxMatrix, gFrameCount * 20.0f * (*actor).iwork[15] * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gFrameCount * 20.0f * actor->iwork[15] * M_DTOR, 1);
if (actor->iwork[15] < 0) {
Matrix_RotateX(gGfxMatrix, M_PI, 1);
}
src/main/fox_43AC0.c
+5 -5
View File
@@ -1,6 +1,6 @@
#include "global.h"
s32 D_801613A0;
s32 gBossFrameCount;
s32 D_800C9E90[28] = {
0x8012, 0x8013, 0x8015, 0x8017, 0x8017, 0x8019, 0x8018, 0x801B, 0x8016, 0x8018, 0x8012, 0x8020, 0x8014, 0x801E,
@@ -13,13 +13,13 @@ void func_80042EC0(Boss* boss) {
s32 var_a3;
f32 var_fv0;
if (D_801613A0 < 0xF00) {
if (gBossFrameCount < 0xF00) {
var_a3 = 10;
} else if (D_801613A0 < 0x1680) {
} else if (gBossFrameCount < 0x1680) {
var_a3 = 5;
} else if (D_801613A0 < 0x1E00) {
} else if (gBossFrameCount < 0x1E00) {
var_a3 = 2;
} else if (D_801613A0 < 0x2580) {
} else if (gBossFrameCount < 0x2580) {
var_a3 = 1;
} else {
var_a3 = 0;
src/main/sf_43E80.c → src/main/fox_43E80.c
+4 -4
View File
@@ -326,12 +326,12 @@ void func_800444BC(Player* player) {
sp30 = 0.0f;
}
sp40 = sp3C = 0.0f;
sp38 = D_80177940;
sp38 = gGroundLevel;
if (D_801784AC == 4) {
func_E6A810_801B6E20(player->pos.x, player->unk_138 + player->unk_144, &sp40, &sp38, &sp3C);
}
if (gCurrentLevel == LEVEL_MACBETH) {
D_E6A810_801BE250.unk_6C = D_80177940;
D_E6A810_801BE250.unk_6C = gGroundLevel;
D_E6A810_801BE250.unk_70 = D_E6A810_801BE250.unk_74 = 0.0f;
D_800C9F10 = 0.0f;
func_80047754(player);
@@ -828,7 +828,7 @@ void func_80046358(Player* player) {
player->unk_064 = player->pos.x;
player->unk_06C = player->unk_138 + -20.0f;
player->unk_068 = D_80177940 + 3.0f;
player->unk_068 = gGroundLevel + 3.0f;
player->unk_248 = 0.0f;
player->unk_24C = 0.0f;
player->unk_070 = 0.0f;
@@ -1164,7 +1164,7 @@ void func_80047504(Player* player) {
} else {
player->unk_064 = player->pos.x;
player->unk_06C = player->unk_138 + -10.0f;
player->unk_068 = D_80177940 - 4.0f;
player->unk_068 = gGroundLevel - 4.0f;
player->unk_248 = 0.0f;
player->unk_24C = 0.0f;
player->unk_070 = 0.0f;
src/main/fox_beam.c
+52 -51
View File
@@ -54,16 +54,17 @@ void func_80035E78(PlayerShot* shot) {
shot->unk_58 = 150;
func_8001CE28(shot->playerNum, &shot->sfxPos);
D_Timer_80161A60 = 4;
if (shot->obj.pos.y < (D_80177940 + 450.0f)) {
if (shot->obj.pos.y < (gGroundLevel + 450.0f)) {
D_80178480 = 15;
if (D_80161A88 == 2) {
func_8007D9DC(shot->obj.pos.x, D_80177940 + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
func_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
shot->unk_48 * 3.0f, 0);
func_8007D9DC(shot->obj.pos.x, D_80177940 + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
func_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
shot->unk_48 * 3.0f, 5);
func_8007D9DC(shot->obj.pos.x, D_80177940 + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
func_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
shot->unk_48 * 3.0f, 10);
func_8007ADF4(shot->obj.pos.x, D_80177940, shot->obj.pos.z, shot->unk_48 * 0.05f, shot->unk_48 * 0.5f);
func_8007ADF4(shot->obj.pos.x, gGroundLevel, shot->obj.pos.z, shot->unk_48 * 0.05f,
shot->unk_48 * 0.5f);
func_8007A6F0(&shot->obj.pos, 0x19000014);
} else {
func_80062B60(shot->obj.pos.x, shot->obj.pos.z, 0, shot->unk_48 * 3.0f);
@@ -78,7 +79,7 @@ void func_80035E78(PlayerShot* shot) {
if (var_fv1 > 2.0f) {
var_fv1 = 2.0f;
}
func_8007B550(shot->obj.pos.x, D_80177940 + 6.0f, shot->obj.pos.z, shot->unk_48 * (1.5f + var_fv1),
func_8007B550(shot->obj.pos.x, gGroundLevel + 6.0f, shot->obj.pos.z, shot->unk_48 * (1.5f + var_fv1),
var_fv0);
}
@@ -950,7 +951,7 @@ void func_80038140(PlayerShot* shot) {
if (shot->obj.id == PLAYERSHOT_4) {
Object_Kill(&shot->obj, &shot->sfxPos);
} else {
boss->unk_062 = 1;
boss->dmgType = DMG_BEAM;
func_80036318(shot);
Audio_PlaySfx(0x29001062, &shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
@@ -964,8 +965,8 @@ void func_80038140(PlayerShot* shot) {
if (shot->obj.id == PLAYERSHOT_4) {
Object_Kill(&shot->obj, &shot->sfxPos);
} else {
boss->unk_062 = 1;
boss->unk_066 = 100;
boss->dmgType = DMG_BEAM;
boss->dmgPart = 100;
Audio_PlaySfx(0x29121007, &shot->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
func_80036318(shot);
}
@@ -976,25 +977,25 @@ void func_80038140(PlayerShot* shot) {
if (shot->obj.id == PLAYERSHOT_4) {
Object_Kill(&shot->obj, &shot->sfxPos);
} else if (!((boss->obj.id == OBJ_BOSS_316) && (shot->playerNum != 0))) {
boss->unk_062 = 1;
boss->dmgType = DMG_BEAM;
if (shot->obj.id == PLAYERSHOT_3) {
boss->unk_062 = -1;
boss->unk_064 = 20;
boss->dmgType = DMG_BOMB;
boss->damage = 20;
} else if (shot->obj.id == PLAYERSHOT_8) {
if (gCurrentLevel == LEVEL_AQUAS) {
boss->unk_064 = 31;
boss->damage = 31;
} else {
boss->unk_064 = 30;
boss->damage = 30;
}
} else {
boss->unk_064 = 10;
boss->damage = 10;
if (shot->playerNum < 4) {
switch (gLaserStrength[shot->playerNum]) {
case LASERS_SINGLE:
case LASERS_TWIN:
break;
case LASERS_HYPER:
boss->unk_064 = 15;
boss->damage = 15;
break;
}
}
@@ -1002,7 +1003,7 @@ void func_80038140(PlayerShot* shot) {
if (boss->obj.id == OBJ_BOSS_314) {
boss->swork[19] = shot->playerNum;
}
boss->unk_066 = temp_v0 - 1;
boss->dmgPart = temp_v0 - 1;
if (boss->obj.id == OBJ_BOSS_301) {
boss->swork[5] = shot->obj.id;
} else if (boss->obj.id == OBJ_BOSS_319) {
@@ -1385,7 +1386,7 @@ void func_80039A50(PlayerShot* shot) {
gSPDisplayList(gMasterDisp++, D_600DB80);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, shot->obj.pos.x, D_80177940, shot->obj.pos.z + D_80177D20, 1);
Matrix_Translate(gGfxMatrix, shot->obj.pos.x, gGroundLevel, shot->obj.pos.z + D_80177D20, 1);
Matrix_Scale(gGfxMatrix, shot->unk_2C, shot->unk_30, shot->unk_34, 1);
RCP_SetupDL(&gMasterDisp, 0x31);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 32, 32, 0, shot->unk_58);
@@ -1525,9 +1526,9 @@ void func_8003B00C(PlayerShot* shot, Player* player) {
Matrix_Push(&gCalcMatrix);
func_80038140(shot);
Matrix_Pop(&gCalcMatrix);
if (shot->obj.pos.y < D_80177940) {
if (shot->obj.pos.y < gGroundLevel) {
shot->unk_5C = 0;
func_80036770(shot->obj.pos.x, D_80177940 + 2.0f, shot->obj.pos.z, shot->obj.rot.y, 2.0f);
func_80036770(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->obj.rot.y, 2.0f);
break;
} else if (shot->unk_5C == 2) {
shot->unk_5C = 0;
@@ -1566,9 +1567,9 @@ void func_8003B00C(PlayerShot* shot, Player* player) {
Object_Kill(&shot->obj, &shot->sfxPos);
}
if (shot->unk_5C == 1) {
if (shot->obj.pos.y < D_80177940) {
if (shot->obj.pos.y < gGroundLevel) {
func_80036318(shot);
func_80036770(shot->obj.pos.x, D_80177940 + 2.0f, shot->obj.pos.z, shot->obj.rot.y, 2.0f);
func_80036770(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->obj.rot.y, 2.0f);
if (gCurrentLevel == LEVEL_FORTUNA) {
func_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
func_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
@@ -1583,13 +1584,13 @@ void func_8003B55C(PlayerShot* shot, s32 index) {
Vec3f sp44;
Vec3f sp38;
if ((D_80161A88 == 2) && (shot->obj.pos.y < (D_80177940 + 50.0f)) && (index == 0)) {
func_8007ACE0(shot->obj.pos.x, D_80177940, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y + 20.0f);
func_8007ACE0(shot->obj.pos.x, D_80177940, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y - 20.0f);
if ((D_80161A88 == 2) && (shot->obj.pos.y < (gGroundLevel + 50.0f)) && (index == 0)) {
func_8007ACE0(shot->obj.pos.x, gGroundLevel, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y + 20.0f);
func_8007ACE0(shot->obj.pos.x, gGroundLevel, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y - 20.0f);
}
if ((shot->obj.pos.y < D_80177940) && (D_801784AC != 4)) {
if ((shot->obj.pos.y < gGroundLevel) && (D_801784AC != 4)) {
func_80036318(shot);
shot->obj.pos.y = D_80177940 + 2;
shot->obj.pos.y = gGroundLevel + 2;
if (gCurrentLevel == LEVEL_BOLSE) {
func_8007A6F0(&shot->obj.pos, 0x29121007);
}
@@ -1602,14 +1603,14 @@ void func_8003B55C(PlayerShot* shot, s32 index) {
sp44.y = sp44.z = 0.0f;
sp44.x = 40.0f;
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp44, &sp38);
func_80036770(shot->obj.pos.x + sp38.x, D_80177940 + 2.0f, shot->obj.pos.z + sp38.z, shot->obj.rot.y,
func_80036770(shot->obj.pos.x + sp38.x, gGroundLevel + 2.0f, shot->obj.pos.z + sp38.z, shot->obj.rot.y,
2.0f);
sp44.x = -40.0f;
Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp44, &sp38);
func_80036770(shot->obj.pos.x + sp38.x, D_80177940 + 2.0f, shot->obj.pos.z + sp38.z, shot->obj.rot.y,
func_80036770(shot->obj.pos.x + sp38.x, gGroundLevel + 2.0f, shot->obj.pos.z + sp38.z, shot->obj.rot.y,
2.0f);
} else {
func_80036770(shot->obj.pos.x, D_80177940 + 2.0f, shot->obj.pos.z, shot->obj.rot.y, 2.0f);
func_80036770(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->obj.rot.y, 2.0f);
}
}
if (D_80161A88 == 2) {
@@ -1625,12 +1626,12 @@ void func_8003B55C(PlayerShot* shot, s32 index) {
func_8007B8F8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
func_8007B8F8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
func_8007B8F8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
func_E16C50_801AC8A8(((Rand_ZeroOne() - 0.5f) * 10.0f) + shot->obj.pos.x,
((Rand_ZeroOne() - 0.5f) * 10.0f) + shot->obj.pos.y, shot->obj.pos.z, 0.8f, 0);
func_E16C50_801AC8A8(((Rand_ZeroOne() - 0.5f) * 10.0f) + shot->obj.pos.x,
((Rand_ZeroOne() - 0.5f) * 10.0f) + shot->obj.pos.y, shot->obj.pos.z, 0.8f, 0);
func_E16C50_801AC8A8(((Rand_ZeroOne() - 0.5f) * 10.0f) + shot->obj.pos.x,
((Rand_ZeroOne() - 0.5f) * 10.0f) + shot->obj.pos.y, shot->obj.pos.z, 0.8f, 0);
func_i3_801AC8A8(((Rand_ZeroOne() - 0.5f) * 10.0f) + shot->obj.pos.x,
((Rand_ZeroOne() - 0.5f) * 10.0f) + shot->obj.pos.y, shot->obj.pos.z, 0.8f, 0);
func_i3_801AC8A8(((Rand_ZeroOne() - 0.5f) * 10.0f) + shot->obj.pos.x,
((Rand_ZeroOne() - 0.5f) * 10.0f) + shot->obj.pos.y, shot->obj.pos.z, 0.8f, 0);
func_i3_801AC8A8(((Rand_ZeroOne() - 0.5f) * 10.0f) + shot->obj.pos.x,
((Rand_ZeroOne() - 0.5f) * 10.0f) + shot->obj.pos.y, shot->obj.pos.z, 0.8f, 0);
}
}
if (shot->unk_64 == 0) {
@@ -1724,12 +1725,12 @@ bool func_8003BB4C(PlayerShot* shot) {
void func_8003BEF4(PlayerShot* shot) {
if (gVersusMode) {
if ((shot->obj.pos.y < D_80177940) || func_8003BB4C(shot) ||
if ((shot->obj.pos.y < gGroundLevel) || func_8003BB4C(shot) ||
!(gControllerHold[shot->playerNum].button & A_BUTTON) || (shot->unk_64 == 0)) {
Object_Kill(&shot->obj, &shot->sfxPos);
}
} else {
if ((shot->obj.pos.y < D_80177940) || func_8003BB4C(shot) ||
if ((shot->obj.pos.y < gGroundLevel) || func_8003BB4C(shot) ||
!(gControllerHold[gMainController].button & A_BUTTON) || (shot->unk_64 == 0)) {
Object_Kill(&shot->obj, &shot->sfxPos);
}
@@ -1790,9 +1791,9 @@ void func_8003C008(PlayerShot* shot) {
var_fa1 *= 0.6f;
}
if (sqrtf(SQ(temp_ft4) + SQ(temp_ft5) + SQ(var_fa1)) < var_fs2) {
boss->unk_066 = j;
boss->unk_062 = -1;
boss->unk_064 = 20;
boss->dmgPart = j;
boss->dmgType = DMG_BOMB;
boss->damage = 20;
}
}
}
@@ -1987,7 +1988,7 @@ void func_8003CC08(PlayerShot* shot) {
func_80035E78(shot);
break;
}
if ((shot->obj.pos.y < D_80177940) && (D_801784AC != 4)) {
if ((shot->obj.pos.y < gGroundLevel) && (D_801784AC != 4)) {
func_80035E78(shot);
break;
}
@@ -2009,7 +2010,7 @@ void func_8003CC08(PlayerShot* shot) {
}
}
if (!((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (gBosses[0].obj.status == 2) &&
(gBosses[0].unk_04E == 17))) {
(gBosses[0].actionState == 17))) {
func_80038140(shot);
}
func_8003C3D8(shot);
@@ -2059,14 +2060,14 @@ void func_8003CF90(PlayerShot* shot) {
Actor* actor;
Player* player;
if ((shot->obj.pos.y < D_80177940) || (shot->unk_64 == 1)) {
if ((D_80161A88 == 2) && (shot->obj.pos.y < D_80177940)) {
if ((shot->obj.pos.y < gGroundLevel) || (shot->unk_64 == 1)) {
if ((D_80161A88 == 2) && (shot->obj.pos.y < gGroundLevel)) {
shot->unk_48 = 10.0f;
func_8007D9DC(shot->obj.pos.x, D_80177940 + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f, shot->unk_48 * 3.0f,
0);
func_8007D9DC(shot->obj.pos.x, D_80177940 + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f, shot->unk_48 * 3.0f,
5);
func_8007ADF4(shot->obj.pos.x, D_80177940, shot->obj.pos.z, shot->unk_48 * 0.05f, shot->unk_48 * 0.5f);
func_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
shot->unk_48 * 3.0f, 0);
func_8007D9DC(shot->obj.pos.x, gGroundLevel + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
shot->unk_48 * 3.0f, 5);
func_8007ADF4(shot->obj.pos.x, gGroundLevel, shot->obj.pos.z, shot->unk_48 * 0.05f, shot->unk_48 * 0.5f);
func_8007A6F0(&shot->obj.pos, 0x19000014);
}
func_80036318(shot);
@@ -2221,7 +2222,7 @@ void func_8003D54C(PlayerShot* shot, s32 index) {
Object_Kill(&shot->obj, &shot->sfxPos);
func_8007A6F0(&shot->obj.pos, 0x0903502E);
} else if (gCurrentLevel == LEVEL_AQUAS) {
func_E16C50_801ABA40(shot);
func_i3_801ABA40(shot);
} else {
func_8003CF90(shot);
}
src/main/fox_bg.c
+4 -4
View File
@@ -1,7 +1,7 @@
// #include "prevent_bss_reordering.h"
#include "global.h"
#include "prevent_bss_reordering.h"
extern f32 D_E16C50_801C4188;
extern f32 D_i3_801C4188;
f32 D_8015F960;
u8 D_8015F964;
@@ -115,7 +115,7 @@ void func_8003DAF0(void) {
sp5C = D_80178290;
sp58 = D_80178298;
if (gGameState != 7) {
if (gGameState != GSTATE_PLAY) {
var_s2 = 1000;
}
sp70 = __cosf(D_80178428);
@@ -1051,7 +1051,7 @@ void func_80040CE4(void) {
} else if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, D_8015F974, D_8015F978, D_8015F97C, D_8015F980);
} else {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) D_E16C50_801C4188);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) D_i3_801C4188);
}
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, D_8015F970, -3000.0f, 1);
src/main/fox_demo.c
+28 -28
View File
@@ -348,9 +348,9 @@ void func_80048E40(Player* player) {
player->timer_1F8 = 0;
D_8017837C = 4;
if (gCurrentLevel == LEVEL_METEO) {
D_800D3180[1] = Play_CheckMedalStatus(0xC8U) + 1;
D_800D3180[LEVEL_METEO] = Play_CheckMedalStatus(200) + 1;
} else {
D_800D3180[2] = Play_CheckMedalStatus(0x96U) + 1;
D_800D3180[LEVEL_SECTOR_X] = Play_CheckMedalStatus(150) + 1;
}
D_80177930 = 2;
}
@@ -717,7 +717,7 @@ void func_8004A52C(Player* player) {
break;
case LEVEL_ZONESS:
func_E16C50_8019D428(player);
func_i3_8019D428(player);
break;
case LEVEL_MACBETH:
@@ -729,7 +729,7 @@ void func_8004A52C(Player* player) {
break;
case LEVEL_SOLAR:
func_E16C50_801A10F4(player);
func_i3_801A10F4(player);
break;
case LEVEL_VENOM_1:
@@ -742,7 +742,7 @@ void func_8004A52C(Player* player) {
break;
case LEVEL_AREA_6:
func_E16C50_8018DF74(player);
func_i3_8018DF74(player);
break;
}
func_8004990C(player);
@@ -872,10 +872,10 @@ void func_8004AAF4(Player* player) {
func_8001D444(0, 0x803DU, 0, 0xFFU);
} else if (gCurrentLevel != LEVEL_TRAINING) {
func_800BA808(gMsg_ID_20180, RCID_FOX);
if (gCurrentLevel == 5) {
func_8001D444(0, D_800C9E90[gCurrentLevel], 0, 2U);
if (gCurrentLevel == LEVEL_SECTOR_Y) {
func_8001D444(0, D_800C9E90[gCurrentLevel], 0, 2);
} else {
func_8001D444(0, D_800C9E90[gCurrentLevel], 0, 0xFFU);
func_8001D444(0, D_800C9E90[gCurrentLevel], 0, 0xFF);
}
}
}
@@ -939,7 +939,7 @@ void func_8004AAF4(Player* player) {
D_801779A8[player->num] = 70.0f;
if ((gCurrentLevel != 9) && (gCurrentLevel != 0xA)) {
if ((gCurrentLevel != LEVEL_VENOM_ANDROSS) && (gCurrentLevel != LEVEL_TRAINING)) {
D_800D1970 = 0;
for (i = 0, var_s0 = &gActors[2]; i < 3; i++, var_s0++) {
Actor_Initialize(var_s0);
@@ -1345,7 +1345,7 @@ void func_8004B368(Player* player) {
player->timer_1F8 = 0;
D_8017837C = 4;
func_8001DBD0(0xA);
D_800D3180[gCurrentLevel] = Play_CheckMedalStatus(0x96U) + 1;
D_800D3180[gCurrentLevel] = Play_CheckMedalStatus(150) + 1;
}
break;
}
@@ -1423,7 +1423,7 @@ void func_8004C930(Player* player) {
func_80048E40(player);
}
} else if (gCurrentLevel == LEVEL_AREA_6) {
func_E16C50_8018ED78(player);
func_i3_8018ED78(player);
} else if (gCurrentLevel == LEVEL_FORTUNA) {
func_8004C90C(player);
func_800AA800(player);
@@ -1439,10 +1439,10 @@ void func_8004C930(Player* player) {
func_8019EE60(player);
func_800AA800(player);
} else if (gCurrentLevel == LEVEL_SOLAR) {
func_E16C50_801A7930(player);
func_i3_801A7930(player);
func_800AA800(player);
} else if (gCurrentLevel == LEVEL_ZONESS) {
func_E16C50_8019D76C(player);
func_i3_8019D76C(player);
func_800AA800(player);
} else if (gCurrentLevel == LEVEL_VENOM_2) {
func_80196D88(player);
@@ -1753,7 +1753,8 @@ void func_8004D828(Player* player) {
player->pos.x += player->vel.x;
player->pos.y += player->vel.y;
if ((gCurrentLevel != 6 || D_80178284 == 0) && (gLevelType == LEVELTYPE_PLANET || gCurrentLevel == LEVEL_BOLSE)) {
if ((gCurrentLevel != LEVEL_VENOM_1 || D_80178284 == 0) &&
(gLevelType == LEVELTYPE_PLANET || gCurrentLevel == LEVEL_BOLSE)) {
player->vel.y -= 0.5f;
player->unk_0E4 -= 2.0f;
}
@@ -1917,7 +1918,7 @@ void func_8004DEF8(Player* player) {
} else if ((((player->timer_220 > 0) || (player->pos.y < player->unk_0A4)) || (player->timer_1FC == 0)) &&
(player->timer_1F8 == 0)) {
if (player->pos.y < player->unk_0A4) {
func_8007C688(player->pos.x, D_80177940 + 20.0f, player->unk_138 - (2.0f * player->vel.z), 3.0f, 0x320);
func_8007C688(player->pos.x, gGroundLevel + 20.0f, player->unk_138 - (2.0f * player->vel.z), 3.0f, 0x320);
func_80062C38(player->pos.x, player->pos.z);
}
func_8007D0E0(player->pos.x, player->pos.y - (2.0f * player->vel.y), player->unk_138 - (2.0f * player->vel.z),
@@ -1943,8 +1944,8 @@ void func_8004DEF8(Player* player) {
}
if ((D_80161A88 == 2) && (player->pos.y <= player->unk_0A4)) {
func_8007D9DC(player->pos.x, D_80177940 + 2.0f, player->unk_138, 3.0f, 20.0f, 0);
func_8007ADF4(player->pos.x, D_80177940, player->unk_138, 0.1f, 2.0f);
func_8007D9DC(player->pos.x, gGroundLevel + 2.0f, player->unk_138, 3.0f, 20.0f, 0);
func_8007ADF4(player->pos.x, gGroundLevel, player->unk_138, 0.1f, 2.0f);
}
}
@@ -2483,9 +2484,9 @@ void func_8004F8AC(Actor* actor) {
}
D_8017836C = actor->iwork[0] / 255.0f;
D_80178370 = gActors->obj.pos.x + 10.0f;
D_80178374 = gActors->obj.pos.y - 40.0f;
D_80178378 = gActors->obj.pos.z - 70.0f;
D_80178370 = gActors[0].obj.pos.x + 10.0f;
D_80178374 = gActors[0].obj.pos.y - 40.0f;
D_80178378 = gActors[0].obj.pos.z - 70.0f;
D_80178360 = 255;
D_80178364 = 255;
D_80178368 = 0x50;
@@ -2680,12 +2681,12 @@ void func_8004FEC0(Actor* actor) {
for (sp2D0 = 0; sp2D0 < 30; sp2D0++) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, ((Rand_ZeroOneSeeded() - 0.5f) * 3000.0f) * (*actor).fwork[20],
((Rand_ZeroOneSeeded() - 0.5f) * 3000.0f) * (*actor).fwork[20],
((Rand_ZeroOneSeeded() - 0.5f) * 3000.0f) * (*actor).fwork[20], 1);
Matrix_RotateY(gGfxMatrix, 2.0f * (Rand_ZeroOneSeeded() * 3.1415927f), 1);
Matrix_Translate(gGfxMatrix, ((Rand_ZeroOneSeeded() - 0.5f) * 3000.0f) * actor->fwork[20],
((Rand_ZeroOneSeeded() - 0.5f) * 3000.0f) * actor->fwork[20],
((Rand_ZeroOneSeeded() - 0.5f) * 3000.0f) * actor->fwork[20], 1);
Matrix_RotateY(gGfxMatrix, 2.0f * (Rand_ZeroOneSeeded() * M_PI), 1);
Matrix_RotateZ(gGfxMatrix, (2.0f * gFrameCount) * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, 2.0f * (Rand_ZeroOneSeeded() * 3.1415927f), 1);
Matrix_RotateX(gGfxMatrix, 2.0f * (Rand_ZeroOneSeeded() * M_PI), 1);
switch (sp2D0 & 3) {
case 0:
@@ -2833,9 +2834,8 @@ void func_8004FEC0(Actor* actor) {
case 37:
RCP_SetupDL_49();
gDPSetPrimColor(gMasterDisp++, 0, 0, (*actor).iwork[0], (*actor).iwork[1], (*actor).iwork[2],
(*actor).iwork[3]);
gDPSetEnvColor(gMasterDisp++, (*actor).iwork[4], (*actor).iwork[5], (*actor).iwork[6], (*actor).iwork[7]);
gDPSetPrimColor(gMasterDisp++, 0, 0, actor->iwork[0], actor->iwork[1], actor->iwork[2], actor->iwork[3]);
gDPSetEnvColor(gMasterDisp++, actor->iwork[4], actor->iwork[5], actor->iwork[6], actor->iwork[7]);
Matrix_Scale(gGfxMatrix, actor->scale, actor->fwork[4], 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_1024AC0);
src/main/fox_display.c
+2 -2
View File
@@ -689,7 +689,7 @@ void func_80054280(Player* player, s32 arg1) {
func_80052884(player);
return;
case FORM_BLUE_MARINE:
func_E16C50_801ACBB4();
func_i3_801ACBB4();
return;
case FORM_ON_FOOT:
func_800526B8(player);
@@ -1672,7 +1672,7 @@ void func_80057D00(void) {
}
}
if ((gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3)) {
func_E16C50_801AA20C();
func_i3_801AA20C();
}
if (((gCurrentLevel == LEVEL_CORNERIA) || (gCurrentLevel == LEVEL_VENOM_ANDROSS)) &&
((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_7) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2))) {
src/main/fox_edata_1C.c
+50 -50
View File
@@ -546,11 +546,11 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_119 */ {(void*) D_6015730, 0, (ObjectFunc) NULL, D_6030D74, 2000.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_120 */ {(void*) D_601DE60, 0, (ObjectFunc) NULL, D_6030DF8, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_121 */ {(void*) D_602B4C0, 0, (ObjectFunc) NULL, D_6030E14, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_122 */ {(void*) D_600EE10, 0, (ObjectFunc) NULL, D_6030E30, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_122 */ {(void*) D_600EE10, 0, (ObjectFunc) NULL, D_6030E30_Hitbox, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_123 */ {(void*) D_60120F0, 0, (ObjectFunc) NULL, D_6030E4C, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_124 */ {(void*) D_600EEF0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_125 */ {(void*) D_600BF80, 0, (ObjectFunc) NULL, D_6030E68, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_126 */ {(void*) func_E16C50_801BE1FC, 1, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_126 */ {(void*) func_i3_801BE1FC, 1, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_127 */ {(void*) D_9005C80, 0, (ObjectFunc) func_DF4260_801924A8, D_601B678, 1000.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_128 */ {(void*) D_9003F50, 0, (ObjectFunc) NULL, D_601B6C4, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_129 */ {(void*) D_900F060, 0, (ObjectFunc) NULL, D_601B710, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
@@ -612,7 +612,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_ACTOR_185 */ {(void*) func_8018DB6C, 1, (ObjectFunc) func_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_186 */ {(void*) func_8005B7CC, 1, (ObjectFunc) func_8018795C, D_602F724, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_187 */ {(void*) D_6018450, 0, (ObjectFunc) func_801877C4, D_602F740, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_188 */ {(void*) func_E16C50_801BEC74, 1, (ObjectFunc) func_E16C50_801BEC68, D_6030BE0, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_188 */ {(void*) func_i3_801BEC74, 1, (ObjectFunc) func_i3_801BEC68, D_6030BE0, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_189 */ {(void*) func_8005A094, 1, (ObjectFunc) func_8006C008, D_800CBF34, 0.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_190 */ {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_191 */ {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
@@ -659,51 +659,51 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_ACTOR_232 */ {(void*) func_8018B6AC, 1, (ObjectFunc) func_8018B268, D_6006890_f32, 0.0f, 0, 0, 39, 1, 20.0f, 1 },
/* OBJ_ACTOR_233 */ {(void*) func_8018A1C0, 1, (ObjectFunc) func_80189CC8, D_60068F0, 200.0f, 0, 0, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_234 */ {(void*) func_80077218, 1, (ObjectFunc) func_800771CC, D_800CBF34, 2000.0f, 0, 0, 39, 0, 0.0f, 5 },
/* OBJ_ACTOR_235 */ {(void*) func_E16C50_80190430, 2, (ObjectFunc) func_E16C50_801904CC, D_602C294, 1000.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_236 */ {(void*) func_E16C50_80190F08, 1, (ObjectFunc) func_E16C50_80190A00, D_602BC58, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_235 */ {(void*) func_i3_80190430, 2, (ObjectFunc) func_i3_801904CC, D_602C294, 1000.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_236 */ {(void*) func_i3_80190F08, 1, (ObjectFunc) func_i3_80190A00, D_602BC58, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_237 */ {(void*) func_8006A978, 1, (ObjectFunc) func_8006A96C, D_800CBF34, 200.0f, 0, 0, 40, 0, 0.0f, 2 },
/* OBJ_ACTOR_238 */ {(void*) func_E16C50_801914C4, 2, (ObjectFunc) func_E16C50_80191010, D_800CBE8C, 200.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_238 */ {(void*) func_i3_801914C4, 2, (ObjectFunc) func_i3_80191010, D_800CBE8C, 200.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_239 */ {(void*) NULL, 1, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_240 */ {(void*) func_E16C50_80191B4C, 1, (ObjectFunc) func_E16C50_80191680, D_800CBE8C, 1500.0f, 0, 1, 40, 0, 20.0f, 0 },
/* OBJ_ACTOR_241 */ {(void*) func_E16C50_80191DB0, 1, (ObjectFunc) func_E16C50_80191BC4, D_800CBE70, 1500.0f, 0, 1, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_242 */ {(void*) func_E16C50_80191FFC, 2, (ObjectFunc) func_E16C50_80192094, D_602BE3C, 500.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_243 */ {(void*) func_E16C50_80192C18, 2, (ObjectFunc) func_E16C50_80192834, D_800CBE8C, 0.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_244 */ {(void*) func_E16C50_80193240, 2, (ObjectFunc) func_E16C50_80192E64, D_602BE58, 2000.0f, 0, 0, 40, 0, 50.0f, 0 },
/* OBJ_ACTOR_245 */ {(void*) func_E16C50_8019983C, 1, (ObjectFunc) func_E16C50_8019969C, D_800CBE8C, 200.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_246 */ {(void*) func_E16C50_80199E24, 1, (ObjectFunc) func_E16C50_80199A28, D_800CBE8C, 2000.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_247 */ {(void*) func_E16C50_8019D3C4, 1, (ObjectFunc) func_E16C50_8019D15C, D_602BFC4, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_248 */ {(void*) func_E16C50_8019A1FC, 1, (ObjectFunc) func_E16C50_80199F10, D_800CBEA8, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_249 */ {(void*) func_E16C50_8019ACCC, 1, (ObjectFunc) func_E16C50_8019A5D4, D_800CBEC4, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_250 */ {(void*) func_E16C50_8019B7DC, 1, (ObjectFunc) func_E16C50_8019B548, D_602C1D4, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_251 */ {(void*) func_E16C50_8019BDE0, 2, (ObjectFunc) func_E16C50_8019B854, D_602C218, 1000.0f, 0, 0, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_252 */ {(void*) func_E16C50_8019C1CC, 1, (ObjectFunc) func_E16C50_8019BE48, D_602C234, 200.0f, 0, 0, 40, 0, 80.0f, 1 },
/* OBJ_ACTOR_253 */ {(void*) func_E16C50_8019C83C, 1, (ObjectFunc) func_E16C50_8019C454, D_602C250, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_254 */ {(void*) func_E16C50_8019CE58, 1, (ObjectFunc) func_E16C50_8019CBEC, D_602C2B0, 300.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_255 */ {(void*) func_E16C50_801AE168, 1, (ObjectFunc) func_E16C50_801AD6C0, D_6030BFC, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_256 */ {(void*) func_E16C50_801AEB44, 1, (ObjectFunc) func_E16C50_801AE3D8, D_6030C18, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_257 */ {(void*) func_E16C50_801B099C, 1, (ObjectFunc) func_E16C50_801AFA5C, D_6030C44, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_258 */ {(void*) func_E16C50_801B0EC0, 1, (ObjectFunc) func_E16C50_801B0B60, D_800CBE8C, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_259 */ {(void*) func_E16C50_801B619C, 2, (ObjectFunc) func_E16C50_801B638C, D_6031398, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_260 */ {(void*) func_E16C50_801B90DC, 2, (ObjectFunc) func_E16C50_801B7C78, D_60313CC, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_261 */ {(void*) func_E16C50_801B504C, 2, (ObjectFunc) func_E16C50_801B50E8, D_6031400, 300.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_262 */ {(void*) func_E16C50_801B7A24, 2, (ObjectFunc) func_E16C50_801B6FF8, D_603144C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_263 */ {(void*) func_E16C50_801BA108, 2, (ObjectFunc) func_E16C50_801B91A4, D_6031480, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_264 */ {(void*) func_E16C50_801BA4E4, 1, (ObjectFunc) func_E16C50_801BA26C, D_800CBE8C, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_265 */ {(void*) func_E16C50_801BAD7C, 1, (ObjectFunc) func_E16C50_801BA6A4, D_6031500, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_266 */ {(void*) func_E16C50_801BB204, 2, (ObjectFunc) func_E16C50_801BADF8, D_6031538, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_267 */ {(void*) func_E16C50_801BC930, 2, (ObjectFunc) func_E16C50_801BB79C, D_6031554, 800.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_268 */ {(void*) func_E16C50_801BDE6C, 1, (ObjectFunc) func_E16C50_801BD54C, D_6031570, 10000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_269 */ {(void*) func_E16C50_801BD264, 1, (ObjectFunc) func_E16C50_801BC9A0, D_6030D20, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_270 */ {(void*) func_E16C50_801BEB1C, 1, (ObjectFunc) func_E16C50_801BE3F8, D_60314C8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_240 */ {(void*) func_i3_80191B4C, 1, (ObjectFunc) func_i3_80191680, D_800CBE8C, 1500.0f, 0, 1, 40, 0, 20.0f, 0 },
/* OBJ_ACTOR_241 */ {(void*) func_i3_80191DB0, 1, (ObjectFunc) func_i3_80191BC4, D_800CBE70, 1500.0f, 0, 1, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_242 */ {(void*) func_i3_80191FFC, 2, (ObjectFunc) func_i3_80192094, D_602BE3C, 500.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_243 */ {(void*) func_i3_80192C18, 2, (ObjectFunc) func_i3_80192834, D_800CBE8C, 0.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_244 */ {(void*) func_i3_80193240, 2, (ObjectFunc) func_i3_80192E64, D_602BE58, 2000.0f, 0, 0, 40, 0, 50.0f, 0 },
/* OBJ_ACTOR_245 */ {(void*) func_i3_8019983C, 1, (ObjectFunc) func_i3_8019969C, D_800CBE8C, 200.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_246 */ {(void*) func_i3_80199E24, 1, (ObjectFunc) func_i3_80199A28, D_800CBE8C, 2000.0f, 0, 0, 40, 0, 1.0f, 0 },
/* OBJ_ACTOR_247 */ {(void*) func_i3_8019D3C4, 1, (ObjectFunc) func_i3_8019D15C, D_602BFC4, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_248 */ {(void*) func_i3_8019A1FC, 1, (ObjectFunc) func_i3_80199F10, D_800CBEA8, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_249 */ {(void*) func_i3_8019ACCC, 1, (ObjectFunc) func_i3_8019A5D4, D_800CBEC4, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_250 */ {(void*) func_i3_8019B7DC, 1, (ObjectFunc) func_i3_8019B548, D_602C1D4, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_251 */ {(void*) func_i3_8019BDE0, 2, (ObjectFunc) func_i3_8019B854, D_602C218, 1000.0f, 0, 0, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_252 */ {(void*) func_i3_8019C1CC, 1, (ObjectFunc) func_i3_8019BE48, D_602C234, 200.0f, 0, 0, 40, 0, 80.0f, 1 },
/* OBJ_ACTOR_253 */ {(void*) func_i3_8019C83C, 1, (ObjectFunc) func_i3_8019C454, D_602C250, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_254 */ {(void*) func_i3_8019CE58, 1, (ObjectFunc) func_i3_8019CBEC, D_602C2B0, 300.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_255 */ {(void*) func_i3_801AE168, 1, (ObjectFunc) func_i3_801AD6C0, D_6030BFC, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_256 */ {(void*) func_i3_801AEB44, 1, (ObjectFunc) func_i3_801AE3D8, D_6030C18, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_257 */ {(void*) func_i3_801B099C, 1, (ObjectFunc) func_i3_801AFA5C, D_6030C44, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_258 */ {(void*) func_i3_801B0EC0, 1, (ObjectFunc) func_i3_801B0B60, D_800CBE8C, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_259 */ {(void*) func_i3_801B619C, 2, (ObjectFunc) func_i3_801B638C, D_6031398, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_260 */ {(void*) func_i3_801B90DC, 2, (ObjectFunc) func_i3_801B7C78, D_60313CC, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_261 */ {(void*) func_i3_801B504C, 2, (ObjectFunc) func_i3_801B50E8, D_6031400, 300.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_262 */ {(void*) func_i3_801B7A24, 2, (ObjectFunc) func_i3_801B6FF8, D_603144C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_263 */ {(void*) func_i3_801BA108, 2, (ObjectFunc) func_i3_801B91A4, D_6031480, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_264 */ {(void*) func_i3_801BA4E4, 1, (ObjectFunc) func_i3_801BA26C, D_800CBE8C, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_265 */ {(void*) func_i3_801BAD7C, 1, (ObjectFunc) func_i3_801BA6A4, D_6031500, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_266 */ {(void*) func_i3_801BB204, 2, (ObjectFunc) func_i3_801BADF8, D_6031538, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_267 */ {(void*) func_i3_801BC930, 2, (ObjectFunc) func_i3_801BB79C, D_6031554, 800.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_268 */ {(void*) func_i3_801BDE6C, 1, (ObjectFunc) func_i3_801BD54C, D_6031570, 10000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_269 */ {(void*) func_i3_801BD264, 1, (ObjectFunc) func_i3_801BC9A0, D_6030D20, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_270 */ {(void*) func_i3_801BEB1C, 1, (ObjectFunc) func_i3_801BE3F8, D_60314C8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_271 */ {(void*) func_8002E694, 2, (ObjectFunc) func_8002E670, D_6011B24, 0.0f, 0, 0, 39, 0, 730.0f, 1 },
/* OBJ_ACTOR_272 */ {(void*) func_8002E6DC, 1, (ObjectFunc) func_8002E6B8, D_6011BF4, 0.0f, 0, 0, 39, 0, 150.0f, 1 },
/* OBJ_ACTOR_273 */ {(void*) func_80188FE4, 2, (ObjectFunc) func_80188AD0, D_600FF30, 0.0f, 0, 0, 39, 0, 220.0f, 1 },
/* OBJ_ACTOR_273 */ {(void*) func_80188FE4, 2, (ObjectFunc) func_80188AD0, D_600FF30_Hitbox, 0.0f, 0, 0, 39, 0, 220.0f, 1 },
/* OBJ_ACTOR_274 */ {(void*) func_8019E3A8, 1, (ObjectFunc) func_8019E234, D_800CBEC4, 0.0f, 0, 0, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_275 */ {(void*) func_E16C50_8019F7AC, 1, (ObjectFunc) func_E16C50_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_276 */ {(void*) func_E16C50_8019F7AC, 1, (ObjectFunc) func_E16C50_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_277 */ {(void*) func_E16C50_8019F7AC, 1, (ObjectFunc) func_E16C50_8019F20C, D_800CBEC4, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_278 */ {(void*) NULL, 1, (ObjectFunc) func_E16C50_8019EA7C, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 1 },
/* OBJ_ACTOR_279 */ {(void*) NULL, 1, (ObjectFunc) func_E16C50_801A003C, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 1 },
/* OBJ_ACTOR_275 */ {(void*) func_i3_8019F7AC, 1, (ObjectFunc) func_i3_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_276 */ {(void*) func_i3_8019F7AC, 1, (ObjectFunc) func_i3_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_277 */ {(void*) func_i3_8019F7AC, 1, (ObjectFunc) func_i3_8019F20C, D_800CBEC4, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_278 */ {(void*) NULL, 1, (ObjectFunc) func_i3_8019EA7C, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 1 },
/* OBJ_ACTOR_279 */ {(void*) NULL, 1, (ObjectFunc) func_i3_801A003C, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 1 },
/* OBJ_ACTOR_280 */ {(void*) D_900DD20, 0, (ObjectFunc) func_80192518, D_601B7F8, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_281 */ {(void*) func_80192E2C, 1, (ObjectFunc) func_80192CD4, D_601B830, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_282 */ {(void*) D_901DA50, 0, (ObjectFunc) func_80192CD4, D_601B868, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
@@ -725,13 +725,13 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_BOSS_298 */ {(void*) func_801887D0, 1, (ObjectFunc) func_80188344, D_602FA50, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_299 */ {(void*) func_80042FC4, 2, (ObjectFunc) func_80042FB8, D_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_300 */ {(void*) func_80042FE8, 1, (ObjectFunc) func_80042FDC, D_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_301 */ {(void*) func_E16C50_801BEC5C, 1, (ObjectFunc) func_E16C50_801BEC50, D_6030B10, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_A6 */ {(void*) func_E16C50_8018C54C, 1, (ObjectFunc) func_E16C50_80187944, D_6028454, 2000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_301 */ {(void*) func_i3_801BEC5C, 1, (ObjectFunc) func_i3_801BEC50, D_6030B10, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_A6 */ {(void*) func_i3_8018C54C, 1, (ObjectFunc) func_i3_80187944, D_6028454, 2000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_303 */ {(void*) func_80193434, 2, (ObjectFunc) func_80190078, D_6032550, 20000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_304 */ {(void*) func_8018FF84, 2, (ObjectFunc) func_8018FE38, D_6032488, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_305 */ {(void*) func_80190020, 2, (ObjectFunc) func_8018FF20, D_60324EC, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_306 */ {(void*) func_801982A8, 1, (ObjectFunc) func_80197A94,D_E6A810_801B83A8, 1000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_ZO */ {(void*) func_E16C50_801949DC, 2, (ObjectFunc) func_E16C50_80194A84, D_602C044, 1000.0f, 0, 0, 40, 0, 1.0f, 10 },
/* OBJ_BOSS_ZO */ {(void*) func_i3_801949DC, 2, (ObjectFunc) func_i3_80194A84, D_602C044, 1000.0f, 0, 0, 40, 0, 1.0f, 10 },
/* OBJ_BOSS_308 */ {(void*) func_8008FE78, 1, (ObjectFunc) func_800907C4, D_600FFE0, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_309 */ {(void*) func_8002E604, 1, (ObjectFunc) func_8002E5E0, D_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_310 */ {(void*) func_8002E64C, 1, (ObjectFunc) func_8002E628, D_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
@@ -739,10 +739,10 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_BOSS_312 */ {(void*) func_80196288, 2, (ObjectFunc) func_80196210, D_60166F4, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_313 */ {(void*) func_8019E98C, 1, (ObjectFunc) func_8019E454, D_6009388, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_314 */ {(void*) func_8019E2C4, 2, (ObjectFunc) func_8019C888, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_SO */ {(void*) func_E16C50_801A71B8, 2, (ObjectFunc) func_E16C50_801A5B3C, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_SO */ {(void*) func_i3_801A71B8, 2, (ObjectFunc) func_i3_801A5B3C, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_316 */ {(void*) func_801968F4, 1, (ObjectFunc) func_801946C4, D_6011058, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_317 */ {(void*) func_80193B1C, 1, (ObjectFunc) func_80193718, D_601115C, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_AQ */ {(void*) func_E16C50_801B4D84, 2, (ObjectFunc) func_E16C50_801B134C, D_6030F74, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_AQ */ {(void*) func_i3_801B4D84, 2, (ObjectFunc) func_i3_801B134C, D_6030F74, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_319 */ {(void*) func_801985E4, 1, (ObjectFunc) func_80194398,D_DF4260_8019A9B8, 3000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_320 */ {(void*) func_801928C8, 2, (ObjectFunc) func_8018DBF0, D_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_321 */ {(void*) func_8018B8C0, 1, (ObjectFunc) func_80189B70, D_C038F24, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
@@ -790,7 +790,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_EFFECT_363 */ {(void*) func_80094BBC, 1, (ObjectFunc) func_80094954, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_364 */ {(void*) func_8007B9DC, 1, (ObjectFunc) func_8007B960, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_365 */ {(void*) func_8007E5CC, 1, (ObjectFunc) func_8007E45C, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_366 */ {(void*) func_80078550, 1, (ObjectFunc) func_E16C50_801AC918, NULL, 100.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_366 */ {(void*) func_80078550, 1, (ObjectFunc) func_i3_801AC918, NULL, 100.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_367 */ {(void*) func_80078604, 1, (ObjectFunc) func_8007E648, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_368 */ {(void*) func_80188FA8, 1, (ObjectFunc) func_80188F60, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_369 */ {(void*) func_8018DCE4, 1, (ObjectFunc) func_80188CAC, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 },
@@ -816,7 +816,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_EFFECT_389 */ {(void*) func_800780F8, 1, (ObjectFunc) func_8007B67C, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_390 */ {(void*) NULL, 1, (ObjectFunc) func_8007C50C, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_391 */ {(void*) func_80083B8C, 1, (ObjectFunc) func_800837EC, NULL, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_392 */ {(void*) func_E16C50_801A0AF0, 1, (ObjectFunc) func_E16C50_801A0120, NULL, 300.0f, 1, 2, 10, 0, 0.0f, 0 },
/* OBJ_EFFECT_392 */ {(void*) func_i3_801A0AF0, 1, (ObjectFunc) func_i3_801A0120, NULL, 300.0f, 1, 2, 10, 0, 0.0f, 0 },
/* OBJ_EFFECT_393 */ {(void*) func_80078F78, 1, (ObjectFunc) func_80078EBC, NULL, 300.0f, 1, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_394 */ {(void*) func_80080D04, 1, (ObjectFunc) func_80080ACC, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_395 */ {(void*) func_80082F78, 1, (ObjectFunc) func_80081C5C, NULL, 300.0f, 0, 1, 40, 0, 0.0f, 0 },
src/main/fox_edisplay.c
+6 -5
View File
@@ -1,4 +1,5 @@
#include "global.h"
// #include "prevent_bss_reordering.h"
Vec3f D_801615D0;
Vec3f D_801615E0;
@@ -993,7 +994,7 @@ void Actor_Draw2(Actor* actor) {
func_8006B74C(actor);
return;
case OBJ_ACTOR_236:
func_E16C50_80190F08(actor);
func_i3_80190F08(actor);
return;
}
if ((actor->obj.id == OBJ_ACTOR_200) && (actor->unk_0B4 == 200)) {
@@ -1313,19 +1314,19 @@ void func_8005ECD8(s32 index, Object* obj) {
} else {
switch (obj->id) {
case OBJ_ACTOR_230:
Matrix_Translate(gGfxMatrix, obj->pos.x, D_80177940 + 2.0f + gActors[index].fwork[1],
Matrix_Translate(gGfxMatrix, obj->pos.x, gGroundLevel + 2.0f + gActors[index].fwork[1],
obj->pos.z + D_80177D20, 1);
break;
case OBJ_ACTOR_229:
case OBJ_ACTOR_231:
Matrix_Translate(gGfxMatrix, obj->pos.x, D_80177940 + 2.0f + gActors[index].fwork[0],
Matrix_Translate(gGfxMatrix, obj->pos.x, gGroundLevel + 2.0f + gActors[index].fwork[0],
obj->pos.z + D_80177D20, 1);
break;
case OBJ_BOSS_316:
Matrix_Translate(gGfxMatrix, obj->pos.x, D_80177940 + 2.0f + D_8017847C, obj->pos.z, 1);
Matrix_Translate(gGfxMatrix, obj->pos.x, gGroundLevel + 2.0f + D_8017847C, obj->pos.z, 1);
break;
default:
Matrix_Translate(gGfxMatrix, obj->pos.x, D_80177940 + 2.0f, obj->pos.z + D_80177D20, 1);
Matrix_Translate(gGfxMatrix, obj->pos.x, gGroundLevel + 2.0f, obj->pos.z + D_80177D20, 1);
break;
}
if ((D_801784AC != 4) || (obj->id == OBJ_ACTOR_200) || (obj->id == OBJ_ACTOR_195) ||

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