mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-09-12 03:59:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Finish bss (#527)

Browse Source 
* Finish importing bss
This commit is contained in:
coco875
2024-01-02 22:53:51 +01:00
committed by GitHub
parent 21a639a480
commit 7c44252daa
59 changed files with 1091 additions and 1781 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/audio/external.c
-1
View File
@@ -3,7 +3,6 @@
#include <defines.h>
#include "camera.h"
#include "math_util_2.h"
#include "variables.h"
#include "audio/external.h"
#include "audio/load.h"
#include "audio/data.h"
src/camera.c
-1
View File
@@ -9,7 +9,6 @@
#include "math_util.h"
#include "racing/memory.h"
#include "waypoints.h"
#include "variables.h"
#include "render_player.h"
#include "collision.h"
#include "code_80057C60.h"
src/code_800029B0.c
-1
View File
@@ -4,7 +4,6 @@
#include "code_800029B0.h"
#include "types.h"
#include "memory.h"
#include "variables.h"
#include "waypoints.h"
#include "actors.h"
#include "actor_types.h"
src/code_80004740.c
+1 -1
View File
@@ -6,8 +6,8 @@
#include "code_80004740.h"
#include "memory.h"
#include <main.h>
#include <variables.h>
#include <PR/gbi.h>
#include "code_80057C60.h"
Vec3s D_80162D70;
s16 D_80162D76;
src/code_80005FD0.c
-1
View File
@@ -14,7 +14,6 @@
#include "player_controller.h"
#include "code_80071F00.h"
#include "collision.h"
#include "variables.h"
#include <actor_types.h>
#include "vehicles.h"
#include "hud_renderer.h"
src/code_80057C60.c
+334 -3
View File
@@ -7,7 +7,6 @@
#include "actors.h"
#include "code_800029B0.h"
#include "racing/memory.h"
#include <variables.h>
#include <config.h>
#include <defines.h>
#include "math_util.h"
@@ -33,6 +32,338 @@
//! @warning this macro is undef'd at the end of this file
#define MAKE_RGB(r,g,b) (((r) << 0x10) | ((g) << 0x08) | (b << 0x00))
//! @warning there is to many variable here
s32 D_80165590;
s32 D_80165594;
s32 D_80165598;
s32 D_8016559C;
UNUSED s32 D_801655A0;
s32 D_801655A4;
UNUSED s32 D_801655A8;
s32 D_801655AC;
UNUSED s32 D_801655B0;
s32 D_801655B4;
UNUSED s32 D_801655B8;
s32 D_801655BC;
s32 D_801655C0;
s32 D_801655C4;
s32 D_801655C8;
s32 D_801655CC;
UNUSED s32 D_801655D0[2];
s32 D_801655D8;
UNUSED s32 D_801655DC[2];
s32 D_801655E8;
UNUSED s32 D_801655EC;
s32 D_801655F0;
UNUSED s32 D_801655F4;
s32 D_801655F8;
UNUSED s32 D_80165600[2];
s32 D_80165608;
UNUSED s32 D_80165610[2];
s32 D_80165618;
UNUSED s32 D_80165620[2];
s32 D_80165628;
UNUSED s32 D_80165630[2];
s32 D_80165638;
UNUSED s32 D_80165640[2];
u32 D_80165648;
UNUSED u32 D_80165650[2];
u32 D_80165658[8];
s32 D_80165678;
UNUSED s32 D_80165680[12];
u16 D_801656B0;
UNUSED s32 D_801656B8[2];
u16 D_801656C0;
UNUSED s32 D_801656C8[2];
u16 D_801656D0;
UNUSED s32 D_801656D8[2];
u16 D_801656E0;
UNUSED s32 D_801656E8[2];
s16 D_801656F0;
UNUSED s32 D_801656F8[4];
s16 D_80165708;
UNUSED s32 D_8016570C;
s16 D_80165710;
UNUSED s32 D_80165714;
s16 D_80165718;
UNUSED s32 D_8016571C;
s16 D_80165720;
UNUSED s32 D_80165724;
s16 D_80165728;
UNUSED s32 D_8016572C;
s16 D_80165730;
UNUSED s32 D_80165734;
//! Tracking a count of some object type, don't know what object type yet
s16 D_80165738;
UNUSED s32 D_8016573C;
s16 D_80165740;
UNUSED s32 D_80165744;
s16 D_80165748;
UNUSED s32 D_8016574C;
s16 gNumActiveThwomps;
s32 D_80165754;
ThwompSpawn *gThowmpSpawnList;
Vec4s D_80165760;
UNUSED s16 D_80165768;
s8 D_8016576A;
Vec4s D_80165770;
UNUSED s32 D_80165778;
Vec4s D_80165780;
UNUSED s32 D_80165788;
s16 D_8016578C;
UNUSED s16 D_8016578E;
s16 D_80165790;
UNUSED s16 D_80165792;
s16 D_80165794;
UNUSED s32 D_80165798;
s8 D_8016579C;
u16 D_8016579E;
UNUSED s16 D_801657A0;
//! Something related to the rotation(?) of ice in Sherbet Land
u16 D_801657A2;
UNUSED s32 D_801657A4;
UNUSED s16 D_801657A8[3];
s8 D_801657AE;
UNUSED s8 D_801657AF;
s8 D_801657B0;
UNUSED s8 D_801657B1;
s8 D_801657B2;
UNUSED s8 D_801657B3;
s8 D_801657B4;
s8 D_801657B8[16];
s8 D_801657C8;
s8 D_801657D0[8];
s8 D_801657D8;
UNUSED s16 D_801657DA[2];
UNUSED s8 D_801657E0;
s8 D_801657E1;
s8 D_801657E2;
s8 D_801657E3;
s8 D_801657E4;
s8 D_801657E5;
bool8 D_801657E6;
u8 D_801657E7;
bool8 D_801657E8;
UNUSED s32 D_801657EC;
bool8 D_801657F0;
UNUSED s32 D_801657F4;
bool8 D_801657F8;
s32 D_801657FC;
s8 D_80165800[2];
s32 D_80165804;
s8 D_80165808;
s32 D_8016580C;
bool8 D_80165810;
s32 D_80165814;
bool8 D_80165818;
s32 D_8016581C;
s8 D_80165820;
UNUSED s32 D_80165824;
s8 D_80165828;
Vec3su D_8016582C;
s8 D_80165832[2];
Vec3su D_80165834;
UNUSED s32 D_8016583A;
s8 D_80165840[3];
UNUSED s32 D_80165848[6];
s32 D_80165860;
UNUSED s32 D_80165864;
UNUSED s32 D_80165868;
s32 D_8016586C;
UNUSED s32 D_80165870[2];
s32 D_80165878;
s32 D_8016587C;
u8 *D_80165880;
UNUSED s32 D_80165884;
s8 D_80165888;
UNUSED s32 D_8016588C;
s8 D_80165890;
UNUSED s32 D_80165894;
s8 D_80165898;
s32 D_8016589C;
UNUSED s32 D_801658A0[2];
s8 D_801658A8;
UNUSED s32 D_801658B0[3];
s8 D_801658BC;
UNUSED s32 D_801658C0;
UNUSED s16 D_801658C4;
s8 D_801658C6;
UNUSED s32 D_801658C8;
UNUSED s16 D_801658CC;
s8 D_801658CE;
UNUSED s32 D_801658D0;
UNUSED s16 D_801658D4;
s8 D_801658D6;
UNUSED s32 D_801658D8;
s8 D_801658DC;
UNUSED s32 D_801658E0;
s8 D_801658E4;
UNUSED s32 D_801658E8;
s8 D_801658EC;
UNUSED s32 D_801658F0;
s8 D_801658F4;
UNUSED s32 D_801658F8;
UNUSED s8 D_801658FC;
u8 sRandomItemIndex;
s8 D_801658FE;
u8 gControllerRandom;
s16 D_80165900;
UNUSED s32 D_80165904;
s8 D_80165908;
UNUSED s32 D_80165910[96];
s8 D_80165A90;
UNUSED s32 D_80165AA0[95];
UNUSED s32 D_80165C14;
Objects gObjectList[OBJECT_LIST_SIZE];
UNUSED s32 D_80183D58;
s32 objectListSize;
Mtx D_80183D60;
/**
* Use unknown. An object is reserved and its index is saved to
* this variable, but it appears to go unreferenced
**/
s32 D_80183DA0;
f32 D_80183DA8[4];
//! Lakitu?
s32 D_80183DB8[4];
f32 D_80183DC8[4];
//! Indexes for the objects associated with the Bomb Karts
s32 D_80183DD8[NUM_BOMB_KARTS_MAX];
UNUSED s32 D_80183DF8[16];
//! Next free spot in D_8018C1B0? Wraps back around to 0 if it gets bigger than D_8018C1B0_SIZE
s32 D_80183E38;
Vec3f D_80183E40;
//! Next free spot in D_8018C3F0? Wraps back around to 0 if it gets bigger than D_8018C3F0_SIZE
s32 D_80183E4C;
Vec3f D_80183E50;
//! Next free spot in D_8018C630?
s32 D_80183E5C;
UNUSED s32 D_80183E60[3];
//! Next free spot in D_8018C870? Wraps back around to 0 if it gets bigger than D_8018C870_SIZE
s32 D_80183E6C;
Vec3f D_80183E70;
//! Next free spot in D_8018C970? Wraps back around to 0 if it gets bigger than D_8018C970_SIZE
s32 D_80183E7C;
Vec3su D_80183E80;
//! Appears to be a list of object list indices for the Item Window part of the HUD
s32 gItemWindowObjectByPlayerId[4];
Vec3su D_80183E98;
/**
* Snowmen bodies in FrappeSnowland
* Crabs in Koopa Troopa Beach
* Hot air balloon in Luigi Raceway?
* Neon signs in Rainbow Road?
* Thwomps in Bower's Castle?
* Penguins in Sherbet Land?
* Flag Poles in Yoshi Valley?
*/
s32 indexObjectList1[32];
UNUSED s32 D_80183F20[2];
/**
* Snowmen heads in Frappe Snowland
* Chain Chomps in RaindbowRoad?
* Trophy in award ceremony?
* Seagulls in Koopa Troopa Beach?
* Hedgehogs in Yoshi Valley?
* Spawn for big fire breath in Bowser's Castle
*/
s32 indexObjectList2[32];
/**
* Seemingly a list of textures for Lakitu
* Never explicitly given data, data appears to be placed here
* via some type of DMA.
* I'm also not certain about its dimensions
* I think the entires in this array are way over-sized
*/
u8 D_80183FA8[4][0x2000];
/**
* Boos in Banshee Boardwalk
* Spawners for the 4 small fire breaths inside Bowser's Castle
*/
s32 indexObjectList3[32];
//! Seemingly a pointer to Lakitu texture(s)
u8 *D_8018C028;
/**
* Unused list of object indices
*/
s32 indexObjectList4[32];
//! Array of (4) Collisions?
Collision D_8018C0B0[4];
/**
* List of object list indices used for:
* Moles in Moo Moo Farm
* Snow flakes in Frappe Snowland
* Segments of the fire breath from the statues in Bowser's Castle
* Potentially other things
*/
s32 D_8018C1B0[D_8018C3F0_SIZE];
Collision D_8018C3B0;
/**
* List of object list indices used for:
* Bats in Banshee's Boardwalk (but only 1 player mode?)
*/
s32 D_8018C3F0[D_8018C3F0_SIZE];
// Maybe some unused Collision?
UNUSED Collision D_8018C5F0;
s32 D_8018C630[D_8018C630_SIZE];
Collision D_8018C830;
/**
* List of object list indices. Used both for the fires in the DK Jungle cave
* and, seemingly for the trail that shells leave behind them.
* I think they're using the same texture, which would explain the dual use
*/
s32 D_8018C870[D_8018C870_SIZE];
/**
* Seemingly a list of object list indices used for the leaves that sometimes fall
* trees when you bonk into them
*/
s32 D_8018C970[D_8018C970_SIZE];
hud_player playerHUD[4];
/**
* List of object list indices used by the clouds and stars in some stages
* Also used for snowflakes like D_8018C1B0? Not sure what's up with that
*/
s32 D_8018CC80[D_8018CC80_SIZE];
struct_D_8018CE10 D_8018CE10[8];
//! Unknown object index, only set for Kalimari Desert, never read
s32 D_8018CF10;
Camera *D_8018CF14;
s16 D_8018CF18;
Player *D_8018CF1C;
s16 D_8018CF20;
UNUSED s32 D_8018CF24;
Player *D_8018CF28[4];
UNUSED s32 D_8018CF38[4];
s16 D_8018CF48;
s16 D_8018CF50[8];
s16 D_8018CF60;
//! This may be a list of tilemap flags on a per-camera basis
s16 D_8018CF68[8];
s16 D_8018CF78;
/**
* List of half-word character IDs indicating each character's
* place in the current Grand Prix race's standings
*/
s16 gGPCurrentRaceCharacterIdByRank[8];
s16 D_8018CF90;
s16 D_8018CF98[8];
s16 D_8018CFA8;
s32 D_8018CFAC;
s16 D_8018CFB0;
s32 D_8018CFB4;
s16 D_8018CFB8;
s32 D_8018CFBC;
s16 D_8018CFC0;
s32 D_8018CFC4;
s16 D_8018CFC8;
f32 D_8018CFCC;
s16 D_8018CFD0;
f32 D_8018CFD4;
s16 D_8018CFD8;
s16 D_800E4730[] = {
0x00ff, 0x0000, 0x0000,
0x00ff, 0x00ff, 0x0000,
@@ -96,7 +427,7 @@ s32 D_800E480C[] = {
void func_80057C60(void) {
gSPViewport(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(D_802B8880));
gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(D_80183D60), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&D_80183D60), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
}
void func_80057CE4(void) {
@@ -2245,7 +2576,7 @@ void func_8005CB60(s32 playerId, s32 lapCount) {
}
func_800C90F4(0U, (player->characterId * 0x10) + 0x2900800D);
D_80165638 = playerHUD[playerId].someTimer1;
D_80165654[lapCount] = 1;
D_80165658[lapCount-1] = 1;
D_801657E3 = 1;
}
if ((lapCount == 3) && ((u32) playerHUD[playerId].someTimer < (u32) D_80165648)) {
src/code_80057C60.h
+224 -35
View File
@@ -2,9 +2,19 @@
#define CODE_80057C60_H
#include "common_structs.h"
#include "objects.h"
#include "camera.h"
// code_80057C60
typedef struct {
char unk_00[0x4];
Vec3f unk_04;
char unk_10[0x4];
s32 objectIndex;
char unk_18[0x8];
} struct_D_8018CE10; // size = 0x20
void func_8005C674(s8 arg0, s16 *arg1, s16 *arg2, s16 *arg3);
void func_80057C60(void);
void func_80057CE4(void);
@@ -233,6 +243,7 @@ void func_8006E8C4(Player*, s8, s8);
void func_8006E940(Player*, s8, s8);
// data/data_code_80071F00_2.s
extern Vtx gBalloonVertexPlane1[];
extern Vtx gBalloonVertexPlane2[];
@@ -258,10 +269,6 @@ extern u16 D_800E69F4[][4];
extern u8 D_800E6F30[][3];
extern u8 D_800E6F48[][3];
// BSS, presumably
extern f32 D_801652A0[];
extern s32 D_80165590;
@@ -286,22 +293,47 @@ extern s32 D_80165618;
extern s32 D_80165628;
extern s32 D_80165638;
extern u32 D_80165648;
extern u32 D_80165654[];
extern u32 D_80165658[];
extern s32 D_80165678;
extern u16 D_801656B0;
extern u16 D_801656C0;
extern u16 D_801656D0;
extern u16 D_801656E0;
extern s16 D_801656F0;
extern s16 D_80165708;
extern s16 D_80165710;
// extern s16 D_80165730; -> objects.h
// extern s16 D_80165738; -> objects.h
extern s16 D_80165740;
extern s16 D_80165748;
extern s16 D_80165718;
extern s16 D_80165720;
extern s16 D_80165728;
// extern s16 gNumActiveThwomps; -> objects.h
extern s32 D_80165754;
// extern ThwompSpawn *gThowmpSpawnList; -> objects.h
extern Vec4s D_80165760;
extern s8 D_8016576A;
extern Vec4s D_80165770;
extern s16 D_8016578C;
extern Vec4s D_80165780;
extern s16 D_80165790;
extern s16 D_80165794;
extern s8 D_8016579C;
extern u16 D_8016579E;
extern u16 D_801657A2;
extern s8 D_801657AE;
extern s8 D_801657B0;
extern s8 D_801657B2;
extern s8 D_801657AE;
extern s8 D_801657B4;
extern s8 D_801657B8[];
extern s8 D_801657C8;
extern s8 D_801657D0[];
extern s8 D_801657D8;
extern s8 D_801657E2;
extern s8 D_801657E3;
@@ -311,60 +343,193 @@ extern bool8 D_801657E6;
extern u8 D_801657E7;
extern bool8 D_801657E8;
extern bool8 D_801657F0;
extern s8 D_801657F8;
extern bool8 D_801657F8;
extern s32 D_801657FC;
extern s8 D_80165800[2];
extern s32 D_80165804;
extern s8 D_80165808;
extern s32 D_8016580C;
extern bool8 D_80165810;
extern s32 D_80165814;
extern bool8 D_80165818;
extern s32 D_8016581C;
extern s8 D_80165820;
extern s8 D_80165828;
extern Vec3su D_8016582C;
extern s8 D_80165832[2];
extern Vec3su D_80165834;
extern s8 D_80165840[];
extern s32 D_80165860;
extern s32 D_8016586C;
extern s32 D_80165878;
extern s32 D_8016587C;
extern u8 *D_80165880;
extern s8 D_80165888;
extern s8 D_80165890;
extern s8 D_80165898;
extern s32 D_8016589C;
extern s8 D_801658A8;
extern s8 D_801658BC;
extern s8 D_801658C6;
extern s8 D_801658CE;
extern s8 D_801658D6;
extern u8 sRandomItemIndex; // 801658fd
extern u8 gControllerRandom; // 801658ff
extern s8 D_801658DC;
extern s8 D_801658E4;
extern s8 D_801658EC;
extern s8 D_801658F4;
extern u8 sRandomItemIndex;
extern s8 D_801658FE;
extern u8 gControllerRandom;
extern s16 D_80165900;
extern s8 D_80165908;
extern s8 D_80165A90;
// extern Objects gObjectList[]; -> objects.h
extern s8 D_8018CAE0;
extern s32 objectListSize;
extern Mtx D_80183D60;
// extern s32 D_80183DA0; -> objects.h
extern f32 D_80183DA8[];
// extern s32 D_80183DB8[]; -> objects.h
extern f32 D_80183DC8[];
// extern s32 D_80183DD8[]; -> bomb_kart.h
// extern s32 D_80183E38; -> objects.h
extern Vec3f D_80183E40;
// extern s32 D_80183E4C; -> objects.h
extern Vec3f D_80183E50;
// extern s32 D_80183E5C; -> objects.h
// extern s32 D_80183E6C; -> objects.h
extern Vec3f D_80183E70;
// extern s32 D_80183E7C; -> objects.h
extern Vec3su D_80183E80;
// extern s32 gItemWindowObjectByPlayerId[]; -> objects.h
extern Vec3su D_80183E98;
// extern s32 indexObjectList1[]; -> objects.h
// extern s32 indexObjectList2[]; -> objects.h
extern u8 D_80183FA8[4][0x2000];
// extern s32 indexObjectList3[]; -> objects.h
extern u8 *D_8018C028;
// extern s32 indexObjectList4[]; -> objects.h
// extern Collision D_8018C0B0[]; -> objects.h
// extern s32 D_8018C1B0[]; -> objects.h
extern Collision D_8018C3B0;
// extern s32 D_8018C3F0[]; -> objects.h
// extern s32 D_8018C630[]; -> objects.h
extern Collision D_8018C830;
// extern s32 D_8018C870[]; -> objects.h
// extern s32 D_8018C970[]; -> objects.h
extern hud_player playerHUD[];
// extern s32 D_8018CC80[]; -> objects.h
extern struct_D_8018CE10 D_8018CE10[];
// extern s32 D_8018CF10; -> objects.h
extern Camera *D_8018CF14;
extern s16 D_8018CF18;
extern Player *D_8018CF1C;
extern s16 D_8018CF20;
extern Player *D_8018CF28[];
extern s16 D_8018CF48;
extern s16 D_8018CF50[];
extern s16 gGPCurrentRaceCharacterIdByRank[]; // 8018cf80
extern s16 D_8018CF60;
extern s16 D_8018CF68[];
extern s16 D_8018CF78;
extern s16 gGPCurrentRaceCharacterIdByRank[];
extern s16 D_8018CF90;
extern s16 D_8018CF98[];
extern s16 D_8018CFA8;
extern s16 D_8018CFB0;
extern s16 D_8018CFB8;
extern s16 D_8018CFC0;
extern s16 D_8018CFC8;
extern f32 D_8018CFCC;
extern s16 D_8018CFD0;
extern f32 D_8018CFD4;
extern s16 D_8018CFD8;
extern s16 D_8018CFE0;
extern f32 D_8018CFE4;
extern s16 D_8018CFE8;
extern f32 D_8018CFEC;
extern s16 D_8018CFF0;
extern f32 D_8018CFF4;
extern f32 D_8018D028[8];
extern f32 D_8018D050[8];
extern f32 D_8018D078[8];
extern s16 D_8018CFF8;
extern s16 D_8018D000;
extern s16 D_8018D008;
extern f32 D_8018D00C;
extern s16 D_8018D010;
extern s16 D_8018D018;
extern f32 xOrientation;
extern s16 D_8018D020;
extern f32 D_8018D028[];
extern s16 D_8018D048;
extern f32 D_8018D050[];
extern s16 D_8018D070;
extern f32 D_8018D078[];
extern s16 D_8018D098;
extern f32 D_8018D0A0[];
extern f32 D_8018D0C8[8];
extern s16 D_8018D0C0;
extern f32 D_8018D0C8[];
extern s16 D_8018D0E8;
extern f32 D_8018D0F0[];
extern s32 gMatrixHudCount; // 8018d120
extern s16 D_8018D110;
extern s32 D_8018D114;
extern s32 gMatrixHudCount;
extern s32 D_8018D140;
extern s32 D_8018D150;
extern s32 D_8018D158;
extern s32 D_8018D160;
extern s32 D_8018D168;
extern s16 D_8018D16C;
extern s32 D_8018D170;
extern s32 D_8018D178;
extern s32 D_8018D180;
extern s32 gIsHUDVisible; // 8018d188
extern s32 D_8018D190;
extern s32 D_8018D1A0;
extern s32 D_8018D1B4;
extern s32 D_8018D1D4;
extern s32 D_8018D1CC;
extern f32 D_8018D1E8;
extern s32 D_8018D1FC;
// extern s16 D_8018D174; -> objects.h
extern s32 D_8018D178;
// extern s16 D_8018D17C; -> objects.h
extern s32 D_8018D180;
extern s16 D_8018D184;
extern s32 gIsHUDVisible;
extern s16 D_8018D18C;
extern s32 D_8018D190;
// extern s8 D_8018D198[]; -> objects.h
extern s32 D_8018D1A0;
// extern s8 D_8018D1A8[]; -> objects.h
extern s32 D_8018D1B4;
// extern s8 D_8018D1B8[]; -> objects.h
extern s32 D_8018D1C4;
// extern s32 D_8018D1C8; -> objects.h
extern s32 D_8018D1CC;
// extern s32 D_8018D1D0; -> objects.h
extern s32 D_8018D1D4;
// extern s32 D_8018D1D8; -> objects.h
extern s32 D_8018D1DC;
extern u8 *D_8018D1E0;
extern f32 D_8018D1E8;
extern s32 D_8018D1EC;
// extern s32 D_8018D1F0; -> objects.h
// extern s32 D_8018D1F8; -> objects.h
extern s32 D_8018D1FC;
extern s16 D_8018D200;
extern s32 D_8018D204;
extern s16 D_8018D208;
@@ -373,28 +538,52 @@ extern s16 D_8018D210;
extern bool D_8018D214;
extern s16 D_8018D218;
extern s32 D_8018D21C;
extern u8 (*D_8018D220)[1024];
extern s32 D_8018D224;
extern u8 D_8018D228;
extern s32 D_8018D22C;
// extern s8 D_8018D230; -> objects.h
extern s32 D_8018D240;
extern u8 *D_8018D248[];
extern f32 D_8018D2A0;
extern s32 D_8018D2A4;
extern s32 D_8018D2AC;
extern s16 D_8018D2B0;
extern s32 D_8018D2B4;
extern s16 D_8018D2B8;
extern s32 D_8018D2BC;
extern s16 D_8018D2C0[];
extern s32 D_8018D2C8[];
extern s16 D_8018D2D8[];
extern s16 D_8018D2E0;
extern s16 D_8018D2E8;
extern s16 D_8018D2F0;
extern s16 D_8018D2F8;
extern u16 D_8018D300;
extern u16 D_8018D308;
extern u16 D_8018D310;
extern s32 D_8018D314;
extern u16 D_8018D318;
extern s32 D_8018D320;
extern s32 D_8018D380;
extern s32 D_8018D384;
extern s32 D_8018D388;
// extern s32 D_8018D3BC; -> objects.h
// extern s32 D_8018D3C0; -> objects.h
// extern s32 D_8018D3C4; -> objects.h
extern s32 D_8018D3D4;
extern s32 D_8018D3D8;
extern s32 D_8018D3DC;
extern s32 D_8018D3E0;
extern s32 D_8018D3E4;
extern s32 D_8018D3E8;
extern s32 D_8018D3EC;
extern s32 D_8018D3F0;
extern s32 D_8018D3F4;
extern s32 D_8018D3F8;
extern s32 gRaceFrameCounter; // 8018d3fc
extern s32 gRaceFrameCounter;
extern s32 D_8018D400;
extern s32 D_8018D40C;
extern s32 D_8018D410;
@@ -419,11 +608,13 @@ extern u8 *D_8018D464;
extern u8 *D_8018D468;
extern u8 *D_8018D46C;
extern u8 *D_8018D470;
extern u8 *D_8018D474;
extern u8 *D_8018D478;
extern u8 *D_8018D480;
extern u8 *D_8018D484;
extern u8 *D_8018D488;
extern u8 *D_8018D48C;
extern u8* D_8018D490;
extern u8 *D_8018D494;
extern u8 *D_8018D498;
extern u8 *D_8018D49C;
@@ -439,11 +630,9 @@ extern u8 *D_8018D4C0;
extern u8 *D_8018D4C4;
extern u8 *D_8018D4C8;
extern Vec3f D_8018D4D0[];
extern Vec3f D_8018D530[];
extern Vec3f D_8018D590[];
extern u16 gPlayerBalloonStatus[8][3]; // D_8018D5F0
extern u16 gPlayerBalloonStatus[8][3];
extern Vec3s D_8018D620[];
extern Vec3f D_8018D650[];
extern Vec3f D_8018D6B0[];
@@ -457,7 +646,7 @@ extern Vec3s D_8018D800[];
extern Vec3s D_8018D830[];
extern Vec3s D_8018D860[];
extern Vec3s D_8018D890[];
extern Vec3s D_8018D8D0[];
extern s16 gPlayerBalloonCount[]; // D_8018D8C0
extern Vec3s D_8018D8D0[];
#endif
src/code_80057C60_var.c
+233
View File
@@ -0,0 +1,233 @@
#include <ultra64.h>
#include <macros.h>
#include "code_80057C60.h"
s16 D_8018CFE0;
f32 D_8018CFE4;
s16 D_8018CFE8;
f32 D_8018CFEC;
s16 D_8018CFF0;
f32 D_8018CFF4;
s16 D_8018CFF8;
UNUSED s32 D_8018CFFC;
s16 D_8018D000;
UNUSED s32 D_8018D004;
s16 D_8018D008;
f32 D_8018D00C;
s16 D_8018D010;
UNUSED s32 D_8018D014;
s16 D_8018D018;
f32 xOrientation;
s16 D_8018D020;
f32 D_8018D028[8];
s16 D_8018D048;
f32 D_8018D050[8];
s16 D_8018D070;
f32 D_8018D078[8];
s16 D_8018D098;
f32 D_8018D0A0[8];
s16 D_8018D0C0;
f32 D_8018D0C8[8];
s16 D_8018D0E8;
f32 D_8018D0F0[8];
s16 D_8018D110;
s32 D_8018D114;
UNUSED s32 D_8018D118[2];
s32 gMatrixHudCount;
UNUSED s32 D_8018D128[6];
s32 D_8018D140;
UNUSED s32 D_8018D148[2];
s32 D_8018D150;
UNUSED s32 D_8018D154;
s32 D_8018D158;
UNUSED s32 D_8018D15C;
s32 D_8018D160;
UNUSED s32 D_8018D164;
s32 D_8018D168;
s16 D_8018D16C;
s32 D_8018D170;
//! Used for cycling through snowflakes in func_80078790
s16 D_8018D174;
s32 D_8018D178;
//! Also next free spot in D_8018CC80?
s16 D_8018D17C;
s32 D_8018D180;
s16 D_8018D184;
s32 gIsHUDVisible;
s16 D_8018D18C;
s32 D_8018D190;
/**
* Exact use unknown, something related to the mole groups
* Maybe be indicating that a given mole in a given group is active?
*/
s8 D_8018D198[NUM_GROUP1_MOLES];
s32 D_8018D1A0;
s8 D_8018D1A8[NUM_GROUP2_MOLES];
s32 D_8018D1B4;
s8 D_8018D1B8[NUM_GROUP3_MOLES];
s32 D_8018D1C4;
/**
* These seem to be limits on different object types in Moo Moo Farm
* See init_course_object in code_8006E9C0.c
* Maybe max number of active moles in a given group of moles?
*/
s32 D_8018D1C8;
s32 D_8018D1CC;
s32 D_8018D1D0;
s32 D_8018D1D4;
s32 D_8018D1D8;
s32 D_8018D1DC;
u8 *D_8018D1E0;
UNUSED s32 D_8018D1E4;
f32 D_8018D1E8;
s32 D_8018D1EC;
//! Number of used spots in D_8018CC80?
s32 D_8018D1F0;
UNUSED s32 D_8018D1F4;
//! Next free spot in D_8018CC80?
s32 D_8018D1F8;
s32 D_8018D1FC;
s16 D_8018D200;
s32 D_8018D204;
s16 D_8018D208;
s32 D_8018D20C;
s16 D_8018D210;
bool D_8018D214;
s16 D_8018D218;
s32 D_8018D21C;
/**
* Destination for decompressed exhaust textures (I think)
* I'm not how much I like this "pointer to an array" setup, but if it matches it matches
*/
u8 (*D_8018D220)[1024];
s32 D_8018D224;
u8 D_8018D228;
s32 D_8018D22C;
//! Something related to the display of the clouds/stars?
s8 D_8018D230;
UNUSED s32 D_8018D238[2];
s32 D_8018D240;
u8 *D_8018D248[22];
f32 D_8018D2A0;
s32 D_8018D2A4;
UNUSED s32 D_8018D2A8;
s32 D_8018D2AC;
s16 D_8018D2B0;
s32 D_8018D2B4;
s16 D_8018D2B8;
s32 D_8018D2BC;
s16 D_8018D2C0[4];
s32 D_8018D2C8[4];
s16 D_8018D2D8[4];
s16 D_8018D2E0;
UNUSED s32 D_8018D2E4;
s16 D_8018D2E8;
UNUSED s32 D_8018D2EC;
s16 D_8018D2F0;
UNUSED s32 D_8018D2F4;
s16 D_8018D2F8;
UNUSED s32 D_8018D2FC;
u16 D_8018D300;
UNUSED s32 D_8018D304;
u16 D_8018D308;
UNUSED s32 D_8018D30C;
u16 D_8018D310;
s32 D_8018D314;
u16 D_8018D318;
UNUSED s32 D_8018D31C;
s32 D_8018D320;
UNUSED s32 D_8018D328[22];
s32 D_8018D380;
s32 D_8018D384;
s32 D_8018D388;
UNUSED s32 D_8018D390[11];
//! Controls number of come object type placed into D_8018C3F0 on Frappe Snowland. So, maybe snowmen/snowflakes?
s32 D_8018D3BC;
//! Limit on some object type (ice chips?) in Sherbet Land
s32 D_8018D3C0;
//! Some sort of limiter on how many of some object type can spawn
s32 D_8018D3C4;
UNUSED s32 D_8018D3C8[3];
s32 D_8018D3D4;
s32 D_8018D3D8;
s32 D_8018D3DC;
//! some alpha
s32 D_8018D3E0;
//! some red
s32 D_8018D3E4;
//! some green
s32 D_8018D3E8;
//! some blue
s32 D_8018D3EC;
s32 D_8018D3F0;
s32 D_8018D3F4;
s32 D_8018D3F8;
s32 gRaceFrameCounter;
s32 D_8018D400;
UNUSED s32 D_8018D404;
UNUSED s32 D_8018D408;
s32 D_8018D40C;
s32 D_8018D410;
UNUSED s32 D_8018D418[2];
u8 *D_8018D420;
u8 *D_8018D424;
u8 *D_8018D428;
u8 *D_8018D42C;
u8 *D_8018D430;
u8 *D_8018D434;
u8 *D_8018D438;
u8 *D_8018D43C;
u8 *D_8018D440;
u8 *D_8018D444;
u8 *D_8018D448;
u8 *D_8018D44C;
u8 *D_8018D450;
u8 *D_8018D454;
u8 *D_8018D458;
u8 *D_8018D45C;
u8 *D_8018D460;
u8 *D_8018D464;
u8 *D_8018D468;
u8 *D_8018D46C;
u8 *D_8018D470;
u8 *D_8018D474;
u8 *D_8018D478;
UNUSED u8 *D_8018D47C;
u8 *D_8018D480;
u8 *D_8018D484;
u8 *D_8018D488;
u8 *D_8018D48C;
u8* D_8018D490;
u8 *D_8018D494;
u8 *D_8018D498;
u8 *D_8018D49C;
u8 *D_8018D4A0;
u8 *D_8018D4A4;
u8 *D_8018D4A8;
u8 *D_8018D4AC;
u8 *D_8018D4B0;
u8 *D_8018D4B4;
u8 *D_8018D4B8;
u8 *D_8018D4BC;
u8 *D_8018D4C0;
u8 *D_8018D4C4;
u8 *D_8018D4C8;
Vec3f D_8018D4D0[8];
Vec3f D_8018D530[8];
Vec3f D_8018D590[8];
u16 gPlayerBalloonStatus[8][3];
Vec3s D_8018D620[8];
Vec3f D_8018D650[8];
Vec3f D_8018D6B0[8];
Vec3f D_8018D710[8];
Vec3s D_8018D770[8];
Vec3s D_8018D7A0[8];
Vec3s D_8018D7D0[8];
Vec3s D_8018D800[8];
Vec3s D_8018D830[8];
Vec3s D_8018D860[8];
Vec3s D_8018D890[8];
s16 gPlayerBalloonCount[8];
Vec3s D_8018D8D0[8];
src/code_8006E9C0.c
+1 -1
View File
@@ -11,7 +11,6 @@
#include "code_80071F00.h"
#include "objects.h"
#include "bomb_kart.h"
#include "variables.h"
#include "save.h"
#include "common_textures.h"
#include <sounds.h>
@@ -22,6 +21,7 @@
#include "menus.h"
#include "data/other_textures.h"
#include "hud_renderer.h"
#include "code_80091750.h"
void init_object_list(void) {
src/code_8006E9C0.h
-66
View File
@@ -35,72 +35,6 @@ extern s16 D_800E5520[];
extern s16 D_800E5548[];
extern u8 *gCourseOutlineTextures[0x14]; // 800e54d0
extern s16 D_80165730;
extern s16 D_80165740;
extern s16 D_80165748;
extern s8 D_801657E4;
extern bool8 D_801657E6;
extern bool8 D_801657E8;
extern bool8 D_801657F0;
extern s8 D_801657F8;
extern s8 D_80165800[2];
extern s8 D_80165808;
extern bool8 D_80165810;
extern bool8 D_80165818;
extern s8 D_80165820;
extern s8 D_80165828;
extern s8 D_80165832[2];
// Destination for decompressed exhaust textures (I think)
// I'm not how much I like this "pointer to an array" setup, but if it matches it matches
extern u8 (*D_8018D220)[1024];
extern s32 D_8018D240;
extern u8 *D_8018D248[];
extern s16 D_8018D2B0;
extern s16 D_8018D2B8;
extern s32 D_80183DA0;
extern s32 D_80183DBC;
extern hud_player playerHUD[]; // 8018CA70 - 8018CC70
extern s16 D_8018CF18;
extern s16 D_8018CF20;
extern s16 D_8018CF48;
extern s16 D_8018CF60;
extern s16 D_8018CF78;
extern s16 D_8018CF90;
extern s16 D_8018CFA8;
extern s16 D_8018CFB0;
extern s16 D_8018CFB8;
extern s16 D_8018CFC0;
extern s16 D_8018CFC8;
extern s16 D_8018CFD0;
extern s16 D_8018CFD8;
extern s16 D_8018CFE0;
extern s16 D_8018CFF0;
extern s16 D_8018CFF8;
extern s16 D_8018D000;
extern s16 D_8018D008;
extern s16 D_8018D010;
extern s16 D_8018D018;
extern s16 D_8018D020;
extern s16 D_8018D048;
extern s16 D_8018D070;
extern s16 D_8018D098;
extern s16 D_8018D0C0;
extern s16 D_8018D0E8;
extern s16 D_8018D110;
extern u8 *D_8018D1E0;
extern intptr_t D_8018D9B0;
// These are found in data_code_80071F00
extern StarSpawn D_800E6A38[]; /* unable to generate initializer */
extern StarSpawn D_800E6AA8[]; /* unable to generate initializer */
src/code_80071F00.c
-1
View File
@@ -12,7 +12,6 @@
#include "hud_renderer.h"
#include "objects.h"
#include "waypoints.h"
#include "variables.h"
#include "code_800029B0.h"
#include "code_80005FD0.h"
#include "code_80057C60.h"
src/code_80071F00.h
-32
View File
@@ -383,46 +383,14 @@ extern u8 *D_800E4570[];
extern u8 *gPortraitTLUTs[];
extern u8 *gPortraitTextures[];
// Seemingly a pointer to Lakitu texture(s)
extern u8 *D_8018C028;
// Seemingly a list of textures for Lakitu
// Never explicitly given data, data appears to be placed here
// via some type of DMA.
// I'm also not certain about its dimensions
// I think the entires in this array are way over-sized
extern u8 D_80183FA8[4][0x2000];
// Something related to the rotation(?) of ice in Sherbet Land
extern u16 D_801657A2;
extern s8 D_801658CE;
extern s32 D_80162DF8;
extern s16 D_8016347C;
extern s32 D_80165594;
extern s32 D_80165598;
extern s16 D_80165740;
extern s8 D_801657B4;
extern Vec3su D_8016582C;
extern s8 D_80165888;
extern s8 D_801658C6;
extern s8 D_801658DC;
extern s8 D_801658F4;
extern s32 objectListSize;
extern s16 D_8018CFB0;
extern s16 D_8018CFE8;
extern s16 D_8018CFF0;
extern s16 D_8018D018;
extern f32 xOrientation;
extern s16 D_8018D048;
extern s16 D_8018D110;
extern s32 D_8018D140;
extern s32 D_8018D158;
extern s8 D_8018D198[];
extern s8 D_8018D1A8[];
extern s8 D_8018D1B8[];
extern s32 D_8018D1EC;
extern s32 D_8018D224;
extern u8* D_8018D490;
// This is either 3 Vec3s as separate variables or an array of s16's or an array of vec3s.
// The other entries appear to be unused.
src/code_80086E70.c
+2 -1
View File
@@ -12,8 +12,9 @@
#include "code_80071F00.h"
#include "collision.h"
#include "audio/external.h"
#include "variables.h"
#include "main.h"
#include "code_80057C60.h"
#include "defines.h"
void func_80086E70(s32 objectIndex) {
gObjectList[objectIndex].unk_0AE = 1;// * 0xE0)) = 1;
src/code_80086E70.h
-12
View File
@@ -165,18 +165,6 @@ void func_8008BFFC(s32);
void func_8008C1B8(s32);
void func_8008C1C0(s32);
// This may be a list of tilemap flags on a per-camera basis
extern s16 D_8018CF68[];
extern f32 D_80183DA8[];
extern f32 D_80183DC8[];
extern Collision D_8018C3B0;
extern s16 gCurrentCourseId;
extern Vec4s D_80165760;
extern Vec4s D_80165770;
extern Vec4s D_80165780;
extern Vec3f D_80183E40;
extern Vec3su D_80183E80;
#endif
src/code_8008C1D0.c
+7 -1
View File
@@ -2,7 +2,6 @@
#include <macros.h>
#include <types.h>
#include <functions.h>
#include <variables.h>
#include <defines.h>
#include <sounds.h>
#include "code_800029B0.h"
@@ -18,6 +17,13 @@
#include "audio/external.h"
#include "spawn_players.h"
s32 D_8018D900[8];
s16 D_8018D920[8];
s32 D_8018D930[8];
s32 D_8018D950[8];
s32 D_8018D970[8];
s32 D_8018D990[8];
UNUSED void func_unnamed(void) {
}
src/code_8008C1D0.h
+7 -7
View File
@@ -123,6 +123,13 @@ void func_800CA984(u8);
void func_800CAFC0(u8);
void func_800CB064(u8);
extern s32 D_8018D900[];
extern s16 D_8018D920[];
extern s32 D_8018D930[];
extern s32 D_8018D950[];
extern s32 D_8018D970[];
extern s32 D_8018D990[];
/* This is where I'd put my static data, if I had any */
extern f32 D_800E3710[];
@@ -136,12 +143,5 @@ extern f32 D_800E37F0[];
extern s16 D_80165190[4][8];
extern f32 D_80165280[];
extern s32 gFrameSinceLastACombo[];
extern s8 D_801658BC;
extern s32 D_8018D900[];
extern s16 D_8018D920[];
extern s32 D_8018D930[];
extern s32 D_8018D950[];
extern s32 D_8018D970[];
extern s32 D_8018D990[];
#endif
src/code_80091440.c
-1
View File
@@ -1,4 +1,3 @@
#include <variables.h>
#include <actor_types.h>
#include "main.h"
#include "code_800029B0.h"
src/code_80091750.c
+51 -7
View File
@@ -3,7 +3,6 @@
#include <defines.h>
#include <PR/ultratypes.h>
#include <config.h>
#include <variables.h>
#include <sounds.h>
#include "code_800029B0.h"
#include "code_80091750.h"
@@ -31,14 +30,62 @@
#include "racing/race_logic.h"
#include "ending/code_80281C40.h"
#include "spawn_players.h"
#include "render_player.h"
//! @todo Move gGfxPool out of main.h
// Unfortunately that's not a small effort due to weird import structure in this project
#include "main.h"
intptr_t D_8018D9B0;
u8 *D_8018D9B4;
uintptr_t *D_8018D9B8;
u8 *D_8018D9BC;
struct_8018EE10_entry_cont *D_8018D9C0;
/**
* List of bytes indexed by character ID
* Indicates number of Grand Prix points that character
* has scored
*/
s8 gGPPointsByCharacterId[8];
s8 gCharacterIdByGPOverallRank[8];
s8 D_8018D9D8;
s8 D_8018D9D9;
struct_8018D9E0_entry D_8018D9E0[D_8018D9E0_SIZE];
struct_8018DEE0_entry D_8018DEE0[D_8018DEE0_SIZE];
s32 D_8018E060;
UNUSED s32 D_8018E068[32];
struct_8018E0E8_entry D_8018E0E8[D_8018E0E8_SIZE];
s32 gD_8018E118TotalSize;
struct_8018E118_entry D_8018E118[D_8018E118_SIZE];
s32 gNumD_8018E118Entries;
Gfx *D_8018E75C;
s32 gNumD_8018E768Entries;
struct_8018E768_entry D_8018E768[D_8018E768_SIZE];
s32 gCycleFlashMenu;
s8 D_8018E7AC[4];
s8 D_8018E7B0;
s32 D_8018E7B8[4];
u32 D_8018E7C8;
u32 D_8018E7D0[4];
s32 D_8018E7E0;
struct UnkStruct_8018E7E8 D_8018E7E8[1];
s16 D_8018E7F0;
UNUSED s32 D_8018E7F4;
s16 D_8018E7F8;
//! @todo Unknown type
s16 D_8018E7FA;
UNUSED s32 D_8018E7FC;
//! @todo Unknown type
s16 D_8018E800;
s16 D_8018E802;
UNUSED s32 D_8018E808[2];
struct UnkStruct_8018E7E8 D_8018E810[1];
s16 D_8018E818;
//! @todo Unknown type
s16 D_8018E81A;
UNUSED s32 D_8018E81C;
//! @todo these are likely arrays.
s16 D_8018E820;
s16 D_8018E820;
//! @todo This may not be the right file for them.
s16 D_8018E822;
s16 D_8018E822;
s32 code_80091750_pad_1;
s16 D_8018E828;
s16 D_8018E82A;
@@ -1503,8 +1550,6 @@ void swap_values(s32 *arg0, s32 *arg1) {
}
extern s8 D_800E852C;
extern uintptr_t *D_8018D9B4;
extern uintptr_t *D_8018D9B8;
void func_80091B78(void) {
s32 why = 0;
@@ -5967,7 +6012,6 @@ void func_8009CA6C(s32 arg0) {
GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009CA6C.s")
#endif
extern u32 D_8018E7D0[];
extern struct UnkStruct_8018E7E8 D_8018E7E8[];
extern struct UnkStruct_8018E7E8 D_8018E810[];
src/code_80091750.h
+33 -20
View File
@@ -366,6 +366,11 @@ void func_800AF740(struct_8018D9E0_entry*);
// This really, really shouldn't be in this header file, but I don't know where else to put it
void rmonPrintf(const char *, ...);
typedef struct struct_8018EE10_entry_cont {
struct_8018EE10_entry arr[1];
} struct_8018EE10_entry_cont;
/* File specific defines */
#define D_8018D9E0_SIZE 0x20
@@ -378,32 +383,40 @@ void rmonPrintf(const char *, ...);
extern s32 D_800DDB24;
extern s16 D_80164478[];
extern u8 *D_8018D9BC;
extern s32 D_80165754;
extern intptr_t D_8018D9B0;
extern s8 gGPPointsByCharacterId[8]; // D_8018D9C8
extern s8 D_8018D9D8;
extern s8 D_8018D9D9;
extern struct_8018D9E0_entry D_8018D9E0[D_8018D9E0_SIZE]; // D_8018D9E0
extern struct_8018DEE0_entry D_8018DEE0[D_8018DEE0_SIZE]; // D_8018DEE0
extern u8 *D_8018D9B4;
extern uintptr_t *D_8018D9B8;
extern u8 *D_8018D9BC;
extern struct_8018EE10_entry_cont *D_8018D9C0;
extern s8 gGPPointsByCharacterId[8];
extern s8 gCharacterIdByGPOverallRank[];
extern s8 D_8018D9D8;
extern s8 D_8018D9D9;
extern struct_8018D9E0_entry D_8018D9E0[D_8018D9E0_SIZE];
extern struct_8018DEE0_entry D_8018DEE0[D_8018DEE0_SIZE];
extern s32 D_8018E060;
extern struct_8018E0E8_entry D_8018E0E8[D_8018E0E8_SIZE];
extern s32 gD_8018E118TotalSize; // D_8018E110
extern struct_8018E118_entry D_8018E118[D_8018E118_SIZE]; // D_8018E118
extern s32 gNumD_8018E118Entries; // D_8018E758
extern Gfx *D_8018E75C; // D_8018E75C
extern s32 gNumD_8018E768Entries; // D_8018E760
extern struct_8018E768_entry D_8018E768[D_8018E768_SIZE]; // D_8018E768
extern s32 gCycleFlashMenu; // maybe?
extern s8 D_8018E7AC[];
extern s8 D_8018E7B0; // maybe?
extern s32 gD_8018E118TotalSize;
extern struct_8018E118_entry D_8018E118[D_8018E118_SIZE];
extern s32 gNumD_8018E118Entries;
extern Gfx *D_8018E75C;
extern s32 gNumD_8018E768Entries;
extern struct_8018E768_entry D_8018E768[D_8018E768_SIZE];
extern s32 gCycleFlashMenu;
extern s8 D_8018E7AC[];
extern s8 D_8018E7B0;
extern s32 D_8018E7B8[];
extern u32 D_8018E7C8;
extern u32 D_8018E7D0[];
extern s32 D_8018E7E0;
extern s8 gTextColor; // D_8018E860
extern u8 D_8018ED90;
extern u8 D_8018ED91;
extern s8 D_8018E838[];
extern s16 D_8018E7F0;
extern s16 D_8018E7F8;
extern s8 gTextColor;
extern u8 D_8018ED90;
extern u8 D_8018ED91;
extern s8 D_8018E838[];
extern s32 D_8018E840[];
extern s32 D_8018E850[];
extern s32 D_8018E854;
src/code_800AF9B0.c
-1
View File
@@ -1,7 +1,6 @@
#include <ultra64.h>
#include <macros.h>
#include <defines.h>
#include "global.h"
#include "code_800AF9B0.h"
src/debug/all_variables.h
-2
View File
@@ -57,7 +57,6 @@
#include <debug.h>
#include <defines.h>
#include <functions.h>
#include <global.h>
#include <kart_attributes.h>
#include <macros.h>
#include <mk64.h>
@@ -68,7 +67,6 @@
#include <trig_tables.h>
#include <types.h>
#include <ultra64.h>
#include <variables.h>
#include <vehicles.h>
#include <waypoints.h>
src/ending/ceremony_and_credits.c
+2 -1
View File
@@ -8,7 +8,6 @@
#include <macros.h>
#include <types.h>
#include <common_structs.h>
#include "variables.h"
#include "math_util.h"
#include "ceremony_and_credits.h"
#include "code_800029B0.h"
@@ -20,6 +19,8 @@
#include <sounds.h>
#include "podium_ceremony_actors.h"
#include "code_80091750.h"
#include "code_80057C60.h"
#include "defines.h"
f32 D_802856B0 = 98.0f;
f32 D_802856B4 = 12.0f;
src/ending/code_80280000.c
+1 -1
View File
@@ -6,7 +6,6 @@
#include <main.h>
#include <code_800029B0.h>
#include <variables.h>
#include <types.h>
#include "camera.h"
#include "memory.h"
@@ -25,6 +24,7 @@
#include "actors.h"
#include "render_courses.h"
#include "main.h"
#include "render_player.h"
s32 D_802874A0;
src/ending/code_80280000.h
-2
View File
@@ -11,8 +11,6 @@ void func_80280268(s32 arg0);
void credits_loop(void);
void load_credits(void);
extern s16 gMatrixEffectCount;
extern s32 D_802874A0;
extern u16 D_80164714, D_80164716, D_80164718;
src/ending/code_80281780.c
-1
View File
@@ -5,7 +5,6 @@
#include "code_80281780.h"
#include "types.h"
#include "variables.h"
#include "memory.h"
#include "camera.h"
#include "camera_junk.h"
src/ending/podium_ceremony_actors.c
-1
View File
@@ -7,7 +7,6 @@
#include <common_structs.h>
#include "main.h"
#include "memory.h"
#include "variables.h"
#include "common_textures.h"
#include "render_player.h"
#include "hud_renderer.h"
src/ending/podium_ceremony_actors.h
-1
View File
@@ -117,6 +117,5 @@ extern ActorInitParams initBurst;
extern Gfx *D_802874D4;
extern s32 D_802874FC;
extern Mat4 D_80287500;
extern s16 gMatrixEffectCount;
#endif
src/hud_renderer.c
-1
View File
@@ -14,7 +14,6 @@
#include "math_util.h"
#include "math_util_2.h"
#include "objects.h"
#include "variables.h"
#include "waypoints.h"
#include "bomb_kart.h"
#include "common_textures.h"
src/hud_renderer.h
-36
View File
@@ -434,52 +434,16 @@ extern f32 D_801637F0;
extern s32 D_80163814;
extern u16 D_801656B0;
extern u16 D_801656C0;
extern s32 D_801655CC;
extern u16 D_801656D0;
extern u16 D_801656E0;
extern s16 D_80165708;
extern s16 D_80165710;
extern s8 D_801657D0[];
extern u16 D_8016579E;
extern s8 D_801657B8[16];
extern s32 D_80165860;
extern s32 D_8016586C;
extern s32 D_80165878;
extern s32 D_8016589C;
extern Camera *D_8018CF14;
extern s32 D_80183DD8[];
extern Vec3f D_80183E40;
extern Vec3f D_80183E50;
extern Vec3f D_80183E70;
extern Vec3su D_80183E80;
extern Vec3su D_80183E98;
extern Collision D_8018C830;
extern u8 *D_8018D1E0;
extern f32 D_8018CFEC;
extern f32 D_8018CFF4;
extern f32 D_8018D00C;
extern u8 D_8018D228;
extern f32 D_8018D2A0;
extern s16 D_8018D2C0[];
extern s16 D_8018D2D8[];
extern s16 D_8018D2E0;
extern s16 D_8018D2E8;
extern s16 D_8018D2F0;
extern s16 D_8018D2F8;
extern u16 D_8018D300;
extern u16 D_8018D308;
extern u16 D_8018D310;
extern u16 D_8018D318;
extern s32 D_8018D3E0; // some alpha
extern s32 D_8018D3E4; // some red
extern s32 D_8018D3E8; // some green
extern s32 D_8018D3EC; // some blue
extern s32 D_8018D400;
extern u8* D_8018D4BC;
src/kart_dma.c
+1 -1
View File
@@ -1,10 +1,10 @@
#include <ultra64.h>
#include <macros.h>
#include "main.h"
#include "variables.h"
#include "framebuffers.h"
#include "common_structs.h"
#include "kart_dma.h"
#include "defines.h"
// Seemingly the largest compressed size for a frame for a given character
// They seem slightly oversized too, either an alignemnt or safety thing
src/main.h
-2
View File
@@ -241,6 +241,4 @@ extern u8 _common_texturesSegmentRomEnd[];
extern u8 _data_802BA370SegmentRomStart[];
extern u32 *D_801978D0; // Segment? Keeps track of segmented addresses?
extern s16 gMatrixEffectCount;
#endif
src/math_util_2.c
+3 -4
View File
@@ -3,13 +3,14 @@
#include <common_structs.h>
#include "math_util_2.h"
#include "main.h"
#include "variables.h"
#include "math_util.h"
#include "objects.h"
#include "memory.h"
#include "collision.h"
#include "render_player.h"
#include "code_80057C60.h"
#include "defines.h"
#pragma intrinsic (sqrtf)
@@ -605,10 +606,9 @@ void func_80041D24(void) {
void guOrtho(Mtx *, f32, f32, f32, f32, f32, f32, f32); /* extern */
extern s8 D_801658FE;
extern Mtx D_80183D60[];
void func_80041D34(void) {
guOrtho((Mtx *)D_80183D60, 0.0f, 320.0f, 240.0f, 0.0f, -1.0f, 1.0f, 1.0f);
guOrtho(&D_80183D60, 0.0f, 320.0f, 240.0f, 0.0f, -1.0f, 1.0f, 1.0f);
switch (gActiveScreenMode) {
case SCREEN_MODE_1P:
guOrtho(&gGfxPool->mtxOrtho, 0.0f, 320.0f, 240.0f, 0.0f, -1.0f, 1.0f, 1.0f);
@@ -635,7 +635,6 @@ void func_80041EF4(void) {
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxOrtho), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
}
extern s32 gMatrixHudCount;
//void convert_to_fixed_point_matrix(Mtx*, Mat4);
UNUSED void func_80041F54(s32 x, s32 y) {
src/math_util_2.h
-4
View File
@@ -81,10 +81,6 @@ void rsp_set_matrix_transl_rot_scale(Vec3f, Vec3f, f32);
void rsp_set_matrix_gObjectList(s32);
/* This is where I'd put my static data, if I had any */
extern Vec3su D_80165834;
extern s8 D_80165840[];
extern s8 D_801658FE;
extern s32 gMatrixHudCount;
#endif // MATH_UTIL_2_H
src/menus.c
-1
View File
@@ -1,7 +1,6 @@
#include <ultra64.h>
#include <macros.h>
#include <defines.h>
#include <global.h>
#include <common_structs.h>
#include "menus.h"
src/player_controller.c
+4 -3
View File
@@ -2,7 +2,6 @@
#include <macros.h>
#include <defines.h>
#include <mk64.h>
#include <variables.h>
#include "player_controller.h"
#include "code_800029B0.h"
@@ -18,8 +17,9 @@
#include "main.h"
#include "camera.h"
#include "spawn_players.h"
#include "code_80057C60.h"
#include "code_80005FD0.h"
extern s16 D_801633F8;
extern s32 D_8018D168;
s16 gCPUforMario[] = {
@@ -646,7 +646,8 @@ void func_80028864(Player *player, Camera *camera, s8 arg2, s8 arg3) {
(gModeSelection == BATTLE) ||
((player->unk_0CA & 2) != 0) ||
(player->unk_0CA & 8) ||
((*((&D_801633F8) + (arg2))) == ((s16) 1U))) {
//! @todo make a proper match
((*(D_801633F8 + (arg2))) == ((s16) 1U))) {
player->effects &= ~0x1000;
if (((player->effects & 0x80) == 0x80) ||
((player->effects & 0x40) == 0x40) ||
src/player_controller.h
-3
View File
@@ -189,9 +189,6 @@ extern s16 *gListCPUforPeach[];
extern s16 *gListCPUforBowser[];
extern s16 **gCPUforTwoPlayer[];
extern s16 gMatrixEffectCount;
extern s16 D_801656F0;
extern s32 gRaceFrameCounter;
#endif
src/racing/collision.c
-1
View File
@@ -8,7 +8,6 @@
#include "memory.h"
#include "collision.h"
#include "math_util.h"
#include "variables.h"
#include "code_800029B0.h"
#pragma intrinsic (sqrtf)
src/racing/math_util.c
-1
View File
@@ -2,7 +2,6 @@
#include <mk64.h>
#include <macros.h>
#include <math_util.h>
#include <variables.h>
#include <main.h>
#include "framebuffers.h"
#include <PR/rcp.h>
src/racing/memory.c
+1 -1
View File
@@ -3,7 +3,6 @@
#include <macros.h>
#include <types.h>
#include <common_structs.h>
#include <variables.h>
#include <segments.h>
#include "memory.h"
@@ -11,6 +10,7 @@
#include "code_800029B0.h"
#include "math_util.h"
#include "courses/courseTable.h"
#include "defines.h"
s32 sGfxSeekPosition;
s32 sPackedSeekPosition;
src/racing/skybox_and_splitscreen.c
-1
View File
@@ -2,7 +2,6 @@
#include <macros.h>
#include <PR/gbi.h>
#include <types.h>
#include <variables.h>
#include <config.h>
#include "skybox_and_splitscreen.h"
src/render_player.c
-1
View File
@@ -3,7 +3,6 @@
#include <common_structs.h>
#include <defines.h>
#include <types.h>
#include <variables.h>
#include "code_800029B0.h"
#include "math_util.h"
#include "math_util_2.h"
src/render_player.h
+1 -1
View File
@@ -76,6 +76,7 @@ extern s16 D_80164AB0[];
extern s16 D_80164ABE[];
extern s16 D_80164AC0[];
extern Player *D_80164AD0[];
extern s16 gMatrixEffectCount;
extern u16 gPlayerRedEffect[];
extern u16 gPlayerGreenEffect[];
extern u16 gPlayerBlueEffect[];
@@ -84,7 +85,6 @@ extern u16 gPlayerMagentaEffect[];
extern u16 gPlayerYellowEffect[];
extern s32 D_80164B80[];
extern u8 *D_8018D474;
extern s32 D_8018D930[];
extern Gfx common_square_plain_render[];
src/save.c
+1 -1
View File
@@ -1,7 +1,6 @@
#include <ultra64.h>
#include <macros.h>
#include <defines.h>
#include "global.h"
#include "save.h"
@@ -9,6 +8,7 @@
#include "menus.h"
#include "save_data.h"
#include "staff_ghosts.h"
#include "code_80057C60.h"
/*** macros ***/
#define PFS_COMPANY_CODE(c0, c1) ((u16)(((c0) << 8) | ((c1))))
src/save.h
-7
View File
@@ -87,18 +87,11 @@ s32 func_800B6A68(void);
/* data */
// these might not be in this file, but for now...
typedef struct struct_8018EE10_entry_cont
{
struct_8018EE10_entry arr[1];
} struct_8018EE10_entry_cont;
extern u32* D_800DC714;
extern u16 gCompanyCode;
extern u32 gGameCode; // osPfs gamecode
extern s8 gControllerPak1State; // Current state of Controller Pak 1
extern struct_8018EE10_entry_cont *D_8018D9C0;
extern s8 sControllerPak2State; // Current state of the Controller Pak 2
extern const u8 D_800F2E60[];
src/spawn_players.c
+2 -1
View File
@@ -1,4 +1,3 @@
#include <global.h>
#include <defines.h>
#include "spawn_players.h"
@@ -21,6 +20,8 @@
#include "main.h"
#include "menus.h"
#include "render_player.h"
#include "code_80091750.h"
#include "code_8008C1D0.h"
f32 D_80165210[8];
f32 D_80165230[8];
src/staff_ghosts.c
+1
View File
@@ -11,6 +11,7 @@
#include "staff_ghosts.h"
#include "code_8006E9C0.h"
#include "code_80091750.h"
#include "code_80057C60.h"
extern s32 mio0encode(s32 input, s32, s32);
extern s32 func_80040174(void *, s32, s32);