diff --git a/actorsmenu.html b/actorsmenu.html index b91851270..7dbf4c584 100644 --- a/actorsmenu.html +++ b/actorsmenu.html @@ -177,7 +177,7 @@ $(function(){initNavTree('actorsmenu.html',''); initResizable(true); });

-

Actors Objects Vehicles Items

+

Actors Objects Vehicles Items

diff --git a/actorsmenu.js b/actorsmenu.js index a1f7e0e44..03d6a6bce 100644 --- a/actorsmenu.js +++ b/actorsmenu.js @@ -4,7 +4,7 @@ var actorsmenu = [ "Actors", "actors.html#actors", null ] ] ], [ "Objects", "objects.html", [ - [ "Objects", "objects.html#objects-1", null ] + [ "Objects", "objects.html#objects", null ] ] ], [ "Vehicles", "vehicles.html", [ [ "Trains", "vehicles.html#trains", null ], diff --git a/basics.js b/basics.js index 256a27b47..d8ca81661 100644 --- a/basics.js +++ b/basics.js @@ -26,7 +26,7 @@ var basics = [ "Menus", "controlflow.html#menus", null ], [ "Players", "controlflow.html#players", null ], [ "Actors", "controlflow.html#actors-1", null ], - [ "Objects", "controlflow.html#objects", null ], + [ "Objects", "controlflow.html#objects-1", null ], [ "Courses", "controlflow.html#courses", [ [ "Course Folder", "controlflow.html#course-folder", null ] ] ], diff --git a/bug.html b/bug.html index 9f6eb6fee..596512a1f 100644 --- a/bug.html +++ b/bug.html @@ -118,15 +118,15 @@ $(function(){initNavTree('bug.html',''); initResizable(true); });
Global func_8001969C (UNUSED s32 playerId, UNUSED f32 arg1, s32 cameraId, UNUSED s16 pathIndex)
Adding an (f32) cast changes asm, why?
Global func_800B9BE4 (f32, f32, u16 *)
-
they probably meant to store the value to tmp[i] and tmp[8 + i]
+
they probably meant to store the value to tmp[i] and tmp[8 + i]
Global func_800BB388 (s32 bankId, s32 instId, s32 arg2)
-
missing return
+
missing return
Global init_sequence_players (void)
Size of wrong array. Zeroes out second half of gSequenceChannels[0], all of gSequenceChannels[1..31], and part of gSequenceLayers[0]. However, this is only called at startup, so it's harmless.
Global load_ceremony_cutscene (void)
these segmented addresses need to be symbols for mobility
Global load_sequence_internal (u32, u32, s32)
-
This should set the last bank (i.e. the first in the JSON) as default, not the missing one. This code path never gets taken, though – all sequence loading is synchronous.
+
This should set the last bank (i.e. the first in the JSON) as default, not the missing one. This code path never gets taken, though – all sequence loading is synchronous.
Global new_actor (ActorInitParams *)

No null check.

@@ -134,7 +134,7 @@ $(function(){initNavTree('bug.html',''); initResizable(true); });
Global note_set_vel_pan_reverb (struct Note *note, f32 velocity, u8 pan, u8 reverbVol)
for the change to UQ0.7, the if statement should also have been changed accordingly
Global preload_sequence (u32, u8)
-
should be IS_SEQ_LOAD_COMPLETE
+
should be IS_SEQ_LOAD_COMPLETE
Global update_gamestate (void)
Reloading this segment makes random_u16() deterministic for player spawn order. In laymens terms, random_u16() outputs the same value every time.
diff --git a/choco__mountain_2course__offsets_8c.html b/choco__mountain_2course__offsets_8c.html index 1c0db2ef1..0b8677521 100644 --- a/choco__mountain_2course__offsets_8c.html +++ b/choco__mountain_2course__offsets_8c.html @@ -197,7 +197,7 @@ Variables
{ gTexture64647C, 0x0829, 0x1000, 0x0 },
{ gTexture647F4C, 0x05BC, 0x1000, 0x0 },
{ gTexture64FBF4, 0x0274, 0x0800, 0x0 },
-
{ gTexture653DB0, 0x06AE, 0x0800, 0x0 },
+
{ gTexture653DB0, 0x06AE, 0x0800, 0x0 },
{ gTexture652B54, 0x0606, 0x0800, 0x0 },
{ gTexture65315C, 0x04A9, 0x0800, 0x0 },
{ gTexture6684F8, 0x010D, 0x0800, 0x0 },
@@ -216,6 +216,7 @@ Variables
{ 0x00000000, 0x0000, 0x0000, 0x0 },
}
gTexture64FBF4
u8 gTexture64FBF4[]
+
gTexture653DB0
u8 gTexture653DB0[]
gTexture67B864
u8 gTexture67B864[]
gTexture65315C
u8 gTexture65315C[]
gTexture679C04
u8 gTexture679C04[]
@@ -231,7 +232,6 @@ Variables
gTexture64619C
u8 gTexture64619C[]
gTextureSignBackside
u8 gTextureSignBackside[]
gTexture6774D8
u8 gTexture6774D8[]
-
gTexture653DB0
u8 gTexture653DB0[]
gTextureSignFallingRocks
u8 gTextureSignFallingRocks[]
gTexture647F4C
u8 gTexture647F4C[]
gTexture67DC20
u8 gTexture67DC20[]
diff --git a/code__800029B0_8c.html b/code__800029B0_8c.html index 977c1e0f1..7cc5764ac 100644 --- a/code__800029B0_8c.html +++ b/code__800029B0_8c.html @@ -313,12 +313,12 @@ Variables   f32 gTimePlayerLastTouchedFinishLine [8]   -u8 * gNmiUnknown1 -  -u8 * gNmiUnknown2 -  -u8 * gNmiUnknown3 -  +u8 * nmi_gVersusResults2P +  +u8 * nmi_gVersusResults3P +  +u8 * nmi_gVersusResults4P +  u8 * gNmiUnknown4   u8 * gNmiUnknown5 @@ -1675,48 +1675,6 @@ Here is the caller graph for this function:
-
- - -

◆ gNmiUnknown1

- -
-
- - - - -
u8* gNmiUnknown1
-
- -
-
- -

◆ gNmiUnknown2

- -
-
- - - - -
u8* gNmiUnknown2
-
- -
-
- -

◆ gNmiUnknown3

- -
-
- - - - -
u8* gNmiUnknown3
-
-
@@ -1873,6 +1831,48 @@ Here is the caller graph for this function:
+
+ + +

◆ nmi_gVersusResults2P

+ +
+
+ + + + +
u8* nmi_gVersusResults2P
+
+ +
+
+ +

◆ nmi_gVersusResults3P

+ +
+
+ + + + +
u8* nmi_gVersusResults3P
+
+ +
+
+ +

◆ nmi_gVersusResults4P

+ +
+
+ + + + +
u8* nmi_gVersusResults4P
+
+
diff --git a/code__800029B0_8c.js b/code__800029B0_8c.js index bd66003d3..99821430f 100644 --- a/code__800029B0_8c.js +++ b/code__800029B0_8c.js @@ -88,9 +88,6 @@ var code__800029B0_8c = [ "gIsInQuitToMenuTransition", "code__800029B0_8c.html#a2e7d63dbfdabad69a70a95734822fe41", null ], [ "gIsMirrorMode", "code__800029B0_8c.html#abf3ecec3eda7109a8cd4cfd8f6826330", null ], [ "gNextFreeMemoryAddress", "code__800029B0_8c.html#acd2abe1d3f00f9dee4d679d14074480e", null ], - [ "gNmiUnknown1", "code__800029B0_8c.html#ad46f5cbdc056c4a5b9f5e6ef16dafb61", null ], - [ "gNmiUnknown2", "code__800029B0_8c.html#a0672d4666c6da2bd972d9999291133bb", null ], - [ "gNmiUnknown3", "code__800029B0_8c.html#a650e14abec4a1117c9600f7817f00f90", null ], [ "gNmiUnknown4", "code__800029B0_8c.html#a996dcce6c6d768308ca3a69e2c8c49b2", null ], [ "gNmiUnknown5", "code__800029B0_8c.html#ac9a865b3bfdbf78679ed655f58c61e70", null ], [ "gNmiUnknown6", "code__800029B0_8c.html#afae1f3d4c1a73f29eeea7c146836ee26", null ], @@ -102,6 +99,9 @@ var code__800029B0_8c = [ "gPlayerWinningIndex", "code__800029B0_8c.html#a8a6a0e5ed8709356fba948d0beeb6a95", null ], [ "gQuitToMenuTransitionCounter", "code__800029B0_8c.html#a5018fabd53fbeb5f453f5d76a8620c84", null ], [ "gTimePlayerLastTouchedFinishLine", "code__800029B0_8c.html#a8c78a0be98c8aca4ff6b7d66c6f1096a", null ], + [ "nmi_gVersusResults2P", "code__800029B0_8c.html#a57bf421655aecac9699dcacdd927878b", null ], + [ "nmi_gVersusResults3P", "code__800029B0_8c.html#a766f70a07bd1a860308f6fea6e3e1c59", null ], + [ "nmi_gVersusResults4P", "code__800029B0_8c.html#af1fb26553f6131bd8c37a94b38c50497", null ], [ "pad_800029B0", "code__800029B0_8c.html#aea825b8f6ea6bd888583c5c22e27c427", null ], [ "pAppNmiBuffer", "code__800029B0_8c.html#a1b736c2cce57eb258b8e704e9424a9b4", null ], [ "sIsController1Unplugged", "code__800029B0_8c.html#a432e0d50767ea0e8ac6ce5eb757ce1a8", null ], diff --git a/code__800029B0_8h.html b/code__800029B0_8h.html index 273894a0a..34947a94a 100644 --- a/code__800029B0_8h.html +++ b/code__800029B0_8h.html @@ -293,12 +293,12 @@ Variables   f32 gTimePlayerLastTouchedFinishLine []   -u8 * gNmiUnknown1 -  -u8 * gNmiUnknown2 -  -u8 * gNmiUnknown3 -  +u8 * nmi_gVersusResults2P +  +u8 * nmi_gVersusResults3P +  +u8 * nmi_gVersusResults4P +  u8 * gNmiUnknown4   u8 * gNmiUnknown5 @@ -2141,72 +2141,6 @@ Here is the caller graph for this function:
-
- - -

◆ gNmiUnknown1

- -
-
- - - - - -
- - - - -
u8* gNmiUnknown1
- 		-extern
-
- -
-
- -

◆ gNmiUnknown2

- -
-
- - - - - -
- - - - -
u8* gNmiUnknown2
- 		-extern
-
- -
-
- -

◆ gNmiUnknown3

- -
-
- - - - - -
- - - - -
u8* gNmiUnknown3
- 		-extern
-
-
@@ -2451,6 +2385,72 @@ Here is the caller graph for this function:
+
+ + +

◆ nmi_gVersusResults2P

+ +
+
+ + + + + +
+ + + + +
u8* nmi_gVersusResults2P
+ 		+extern
+
+ +
+
+ +

◆ nmi_gVersusResults3P

+ +
+
+ + + + + +
+ + + + +
u8* nmi_gVersusResults3P
+ 		+extern
+
+ +
+
+ +

◆ nmi_gVersusResults4P

+ +
+
+ + + + + +
+ + + + +
u8* nmi_gVersusResults4P
+ 		+extern
+
+
diff --git a/code__800029B0_8h.js b/code__800029B0_8h.js index 16b6b95f3..7453923b6 100644 --- a/code__800029B0_8h.js +++ b/code__800029B0_8h.js @@ -82,9 +82,6 @@ var code__800029B0_8h = [ "gIsInQuitToMenuTransition", "code__800029B0_8h.html#a2e7d63dbfdabad69a70a95734822fe41", null ], [ "gIsMirrorMode", "code__800029B0_8h.html#abf3ecec3eda7109a8cd4cfd8f6826330", null ], [ "gNextFreeMemoryAddress", "code__800029B0_8h.html#acd2abe1d3f00f9dee4d679d14074480e", null ], - [ "gNmiUnknown1", "code__800029B0_8h.html#ad46f5cbdc056c4a5b9f5e6ef16dafb61", null ], - [ "gNmiUnknown2", "code__800029B0_8h.html#a0672d4666c6da2bd972d9999291133bb", null ], - [ "gNmiUnknown3", "code__800029B0_8h.html#a650e14abec4a1117c9600f7817f00f90", null ], [ "gNmiUnknown4", "code__800029B0_8h.html#a996dcce6c6d768308ca3a69e2c8c49b2", null ], [ "gNmiUnknown5", "code__800029B0_8h.html#ac9a865b3bfdbf78679ed655f58c61e70", null ], [ "gNmiUnknown6", "code__800029B0_8h.html#afae1f3d4c1a73f29eeea7c146836ee26", null ], @@ -96,6 +93,9 @@ var code__800029B0_8h = [ "gPlayerWinningIndex", "code__800029B0_8h.html#a8a6a0e5ed8709356fba948d0beeb6a95", null ], [ "gQuitToMenuTransitionCounter", "code__800029B0_8h.html#a5018fabd53fbeb5f453f5d76a8620c84", null ], [ "gTimePlayerLastTouchedFinishLine", "code__800029B0_8h.html#ac94b9ded4f026071618320e4ac6a0c54", null ], + [ "nmi_gVersusResults2P", "code__800029B0_8h.html#a57bf421655aecac9699dcacdd927878b", null ], + [ "nmi_gVersusResults3P", "code__800029B0_8h.html#a766f70a07bd1a860308f6fea6e3e1c59", null ], + [ "nmi_gVersusResults4P", "code__800029B0_8h.html#af1fb26553f6131bd8c37a94b38c50497", null ], [ "pAppNmiBuffer", "code__800029B0_8h.html#a1b736c2cce57eb258b8e704e9424a9b4", null ], [ "sIsController1Unplugged", "code__800029B0_8h.html#a432e0d50767ea0e8ac6ce5eb757ce1a8", null ], [ "vtxBuffer", "code__800029B0_8h.html#a3a6a06fba59b75eba6032889f42330a2", null ] diff --git a/code__800029B0_8h_source.html b/code__800029B0_8h_source.html index 777d952fe..dc8cf4bd4 100644 --- a/code__800029B0_8h_source.html +++ b/code__800029B0_8h_source.html @@ -230,9 +230,9 @@ $(function(){initNavTree('code__800029B0_8h_source.html',''); initResizable(true
118extern u16 D_8015F894;
119extern f32 gTimePlayerLastTouchedFinishLine[];
120
-
121extern u8* gNmiUnknown1;
-
122extern u8* gNmiUnknown2;
-
123extern u8* gNmiUnknown3;
+
121extern u8* nmi_gVersusResults2P;
+
122extern u8* nmi_gVersusResults3P;
+
123extern u8* nmi_gVersusResults4P;
124extern u8* gNmiUnknown4;
125extern u8* gNmiUnknown5;
126extern u8* gNmiUnknown6;
@@ -261,7 +261,6 @@ $(function(){initNavTree('code__800029B0_8h_source.html',''); initResizable(true
gCourseMaxY
s16 gCourseMaxY
Definition code_800029B0.c:91
D_800DC5D0
s32 D_800DC5D0
Definition code_800029B0.c:43
gCollisionIndices
u16 * gCollisionIndices
Definition code_800029B0.c:76
-
gNmiUnknown2
u8 * gNmiUnknown2
Definition code_800029B0.c:134
clear_nmi_buffer
void clear_nmi_buffer(void)
Definition code_800029B0.c:290
gCourseMinZ
s16 gCourseMinZ
Definition code_800029B0.c:95
D_8015F58C
u32 D_8015F58C
Definition code_800029B0.c:79
@@ -294,17 +293,18 @@ $(function(){initNavTree('code__800029B0_8h_source.html',''); initResizable(true
D_8015F894
u16 D_8015F894
Definition code_800029B0.c:129
D_8015F6F4
s16 D_8015F6F4
Definition code_800029B0.c:97
D_8015F890
u16 D_8015F890
Definition code_800029B0.c:127
+
nmi_gVersusResults2P
u8 * nmi_gVersusResults2P
Definition code_800029B0.c:133
gNumPermanentActors
u16 gNumPermanentActors
Definition code_800029B0.c:147
D_8015F480
struct UnkStruct_800DC5EC D_8015F480[4]
Definition code_800029B0.c:56
D_8015F788
s32 D_8015F788
Definition code_800029B0.c:125
D_8015F59C
s32 D_8015F59C
Definition code_800029B0.c:82
D_8015F8E0
s32 D_8015F8E0
Definition code_800029B0.c:143
D_8015F702
u16 D_8015F702
Definition code_800029B0.c:109
-
gNmiUnknown3
u8 * gNmiUnknown3
Definition code_800029B0.c:135
D_8015F8E8
f32 D_8015F8E8
Definition code_800029B0.c:145
D_8015F6FC
s16 D_8015F6FC
Definition code_800029B0.c:101
D_801625EC
s32 D_801625EC
Definition code_800029B0.c:156
gCurrentlyLoadedCourseId
s16 gCurrentlyLoadedCourseId
Definition code_800029B0.c:32
+
nmi_gVersusResults3P
u8 * nmi_gVersusResults3P
Definition code_800029B0.c:134
D_800DC5B0
u16 D_800DC5B0
Definition code_800029B0.c:35
D_8015F5A0
s32 D_8015F5A0
Definition code_800029B0.c:83
D_800DC5D4
s32 D_800DC5D4
Definition code_800029B0.c:44
@@ -342,7 +342,6 @@ $(function(){initNavTree('code__800029B0_8h_source.html',''); initResizable(true
gCollisionMeshCount
u16 gCollisionMeshCount
Definition code_800029B0.c:77
gCollisionMesh
CollisionTriangle * gCollisionMesh
Definition code_800029B0.c:75
D_800DC5B4
u16 D_800DC5B4
Definition code_800029B0.c:36
-
gNmiUnknown1
u8 * gNmiUnknown1
Definition code_800029B0.c:133
D_8015F768
Vec3f D_8015F768
Definition code_800029B0.c:121
D_8015F8D0
Vec3f D_8015F8D0
Definition code_800029B0.c:140
D_8015F700
u16 D_8015F700
Definition code_800029B0.c:108
@@ -352,6 +351,7 @@ $(function(){initNavTree('code__800029B0_8h_source.html',''); initResizable(true
D_8015F718
UNUSED u32 D_8015F718[3]
Definition code_800029B0.c:112
func_80003040
void func_80003040(void)
Definition code_800029B0.c:297
D_8015F590
Vec3f D_8015F590
Definition code_800029B0.c:81
+
nmi_gVersusResults4P
u8 * nmi_gVersusResults4P
Definition code_800029B0.c:135
D_8015F6F8
u16 D_8015F6F8
Definition code_800029B0.c:99
gNmiUnknown6
u8 * gNmiUnknown6
Definition code_800029B0.c:138
gDebugPathCount
s16 gDebugPathCount
Definition code_800029B0.c:154
diff --git a/controlflow.html b/controlflow.html index 9be31c2c1..f53013d1b 100644 --- a/controlflow.html +++ b/controlflow.html @@ -116,7 +116,7 @@ $(function(){initNavTree('controlflow.html',''); initResizable(true); });
  • Code Breakdown