diff options
| author | Tyler McGavran <tyler.taggerung@gmail.com> | 2023-10-27 22:00:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-27 20:00:52 -0600 |
| commit | 716b92626025c092da3a65ff4e66d83a2510d906 (patch) | |
| tree | 379c68eca0c9bf25e965c5c9496fdfaaff24e905 /src/code_800029B0.h | |
| parent | 6e9f0ae130967c9252be9232b2ab2f70c8b0f384 (diff) | |
Place variables from data_0DD0A0 to code_800029B0 (#477)
They match when placed there, although its not immediately clear
that they truly belong there. But a match is a match.
Also cleaned up a bunch of .h files that had references to the
newly matched variables.
Signed-off-by: Taggerung <tyler.taggerung@email.com>
Diffstat (limited to 'src/code_800029B0.h')
| -rw-r--r-- | src/code_800029B0.h | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/src/code_800029B0.h b/src/code_800029B0.h index a3849c98c..24aca26fa 100644 --- a/src/code_800029B0.h +++ b/src/code_800029B0.h @@ -3,6 +3,7 @@ #include <macros.h> #include <ultra64.h> +#include <types.h> #include <actor_types.h> /* Function Prototypes */ @@ -13,11 +14,37 @@ void func_80002DAC(void); void clear_nmi_buffer(void); void func_80003040(void); +extern s16 gCurrentCourseId; // D_800DC5A0 +extern s16 gCurrentlyLoadedCourseId; +extern u16 D_800DC5A8; +extern s32 D_800DC5AC; +extern u16 D_800DC5B0; +extern u16 D_800DC5B4; +extern u16 D_800DC5B8; +extern u16 D_800DC5BC; +extern u16 gIsInQuitToMenuTransition; +extern u16 gQuitToMenuTransitionCounter; +extern u16 D_800DC5C8; +extern u16 D_800DC5CC; +extern s32 D_800DC5D0; +extern s32 D_800DC5D4; +extern s32 D_800DC5D8; +extern s32 D_800DC5DC; +extern s32 D_800DC5E0; +// This is tracking which credit "state" we're in, decides which credits are shown (and probably other stuff) +extern u16 D_800DC5E4; +extern s32 gPlayerWinningIndex; + +extern struct UnkStruct_800DC5EC D_8015F480[4]; extern struct UnkStruct_800DC5EC *D_800DC5EC; extern struct UnkStruct_800DC5EC *D_800DC5F0; extern struct UnkStruct_800DC5EC *D_800DC5F4; extern struct UnkStruct_800DC5EC *D_800DC5F8; extern u16 gIsGamePaused; +extern u8 *pAppNmiBuffer; +extern s32 gIsMirrorMode; // D_800DC604 +extern s16 gCreditsCourseId; +extern s16 gPlaceItemBoxes; extern mk64_surface_map_ram *gSurfaceMap; extern u16 *D_8015F584; @@ -71,7 +98,6 @@ extern u16 D_8015F892; extern u16 D_8015F894; extern f32 gTimePlayerLastTouchedFinishLine[]; -extern u8 *pAppNmiBuffer; extern u8 *gNmiUnknown1; extern u8 *gNmiUnknown2; extern u8 *gNmiUnknown3; @@ -79,8 +105,6 @@ extern u8 *gNmiUnknown4; extern u8 *gNmiUnknown5; extern u8 *gNmiUnknown6; -extern s32 gIsMirrorMode; // D_800DC604 - extern Vec3f D_8015F8D0; extern s32 D_8015F8DC; @@ -89,7 +113,6 @@ extern f32 D_8015F8E4; extern f32 D_8015F8E8; extern s16 gPlayerPositionLUT[]; // Player index at each position extern u16 gNumPermanentActors; -extern struct Actor gActorList[]; extern UNUSED u8 D_80162578[]; extern s16 gDebugPathCount; |