Change a variety of constants to defines (#257)

* Change a variety of constants to defines

* Add notes regarding menu columns

* Change unknown type to known types
This commit is contained in:
coco875
2022-09-19 05:54:14 +02:00
committed by GitHub
parent 2c57c81f3a
commit 32358c30fd
38 changed files with 3064 additions and 2923 deletions
+6 -6
View File
@@ -50,7 +50,7 @@ void func_80290CAC(uintptr_t arg0) {
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
extern ? D_80152300;
extern u16 D_80152300;
s16 gCurrentCourseId; /* unable to generate initializer */
void load_surface_map(u32 arg0, struct UnkStruct_800DC5EC *arg1) {
@@ -196,8 +196,8 @@ void func_802911C4(void) {
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
s32 func_80290C20(Camera *); /* extern */
f32 func_802AAB4C(Player *); /* extern */
? init_rdp(); /* extern */
? load_surface_map(? *, struct UnkStruct_800DC5EC *, Gfx **); /* extern */
void init_rdp(); /* extern */
void load_surface_map(? *, struct UnkStruct_800DC5EC *, Gfx **); /* extern */
extern ? D_06009228;
extern ? D_060164B8;
extern ? D_06019578;
@@ -379,7 +379,7 @@ block_9:
temp_t7 = gCurrentCourseId;
switch (temp_t7) { /* switch 1 */
case 2: /* switch 1 */
if ((gActiveScreenMode == 0) && ((s32) (u16) sp21A >= 6) && ((s32) (u16) sp21A < 0xA) && (((u16) sp21A != 9) || (((s32) (u16) sp218 >= 0xA000) && ((s32) (u16) sp218 < 0xE001)))) {
if ((gActiveScreenMode == SCREEN_MODE_1P) && ((s32) (u16) sp21A >= 6) && ((s32) (u16) sp21A < 0xA) && (((u16) sp21A != 9) || (((s32) (u16) sp218 >= 0xA000) && ((s32) (u16) sp218 < 0xE001)))) {
temp_v1_7 = gDisplayListHead;
gDisplayListHead = temp_v1_7 + 8;
temp_v1_7->words.w1 = (u32) &D_06009228;
@@ -1281,7 +1281,7 @@ void render_luigi_raceway(struct UnkStruct_800DC5EC *arg0) {
D_800DC5DC = 88;
D_800DC5E0 = 72;
if ((gActiveScreenMode == 0) && (sp22 >= 10) && (sp22 < 17)) {
if ((gActiveScreenMode == SCREEN_MODE_1P) && (sp22 >= 10) && (sp22 < 17)) {
prevFrame = (s16)sRenderedFramebuffer - 1;
@@ -1497,7 +1497,7 @@ void render_wario_stadium(struct UnkStruct_800DC5EC *arg0) {
D_800DC5DC = 88;
D_800DC5E0 = 72;
if (gActiveScreenMode == 0) {
if (gActiveScreenMode == SCREEN_MODE_1P) {
prevFrame = (s16) sRenderedFramebuffer - 1;
if (prevFrame < 0) {
prevFrame = 2;