From 44ec3cff15b92ccb57edebe0cace6a21c55482bf Mon Sep 17 00:00:00 2001 From: Fazana <52551480+FazanaJ@users.noreply.github.com> Date: Wed, 27 Apr 2022 16:02:32 +0100 Subject: [PATCH] remove some stray commas from enums because apparently decomp.me doesn't like it --- asm/non_matchings/racer/func_80050850.s | 139 ------------------------ include/enums.h | 46 ++++---- include/structs.h | 5 +- src/camera.h | 2 +- src/fade_transition.h | 2 +- src/menu.h | 2 +- src/save_data.h | 2 +- src/video.h | 2 +- 8 files changed, 31 insertions(+), 169 deletions(-) delete mode 100644 asm/non_matchings/racer/func_80050850.s diff --git a/asm/non_matchings/racer/func_80050850.s b/asm/non_matchings/racer/func_80050850.s deleted file mode 100644 index 9c2d37b6..00000000 --- a/asm/non_matchings/racer/func_80050850.s +++ /dev/null @@ -1,139 +0,0 @@ -glabel func_80050850 -/* 051450 80050850 AFA60008 */ sw $a2, 8($sp) -/* 051454 80050854 AFA7000C */ sw $a3, 0xc($sp) -/* 051458 80050858 908C01F1 */ lbu $t4, 0x1f1($a0) -/* 05145C 8005085C 0007C400 */ sll $t8, $a3, 0x10 -/* 051460 80050860 0018CC03 */ sra $t9, $t8, 0x10 -/* 051464 80050864 00067400 */ sll $t6, $a2, 0x10 -/* 051468 80050868 000E7C03 */ sra $t7, $t6, 0x10 -/* 05146C 8005086C 1580006C */ bnez $t4, .L80050A20 -/* 051470 80050870 03203825 */ move $a3, $t9 -/* 051474 80050874 84830160 */ lh $v1, 0x160($a0) -/* 051478 80050878 34088001 */ li $t0, 32769 -/* 05147C 8005087C 306DFFFF */ andi $t5, $v1, 0xffff -/* 051480 80050880 01ED1023 */ subu $v0, $t7, $t5 -/* 051484 80050884 0048082A */ slt $at, $v0, $t0 -/* 051488 80050888 14200004 */ bnez $at, .L8005089C -/* 05148C 8005088C A4990166 */ sh $t9, 0x166($a0) -/* 051490 80050890 3C09FFFF */ lui $t1, (0xFFFF0001 >> 16) # lui $t1, 0xffff -/* 051494 80050894 35290001 */ ori $t1, (0xFFFF0001 & 0xFFFF) # ori $t1, $t1, 1 -/* 051498 80050898 00491021 */ addu $v0, $v0, $t1 -.L8005089C: -/* 05149C 8005089C 3C09FFFF */ lui $t1, (0xFFFF0001 >> 16) # lui $t1, 0xffff -/* 0514A0 800508A0 28418000 */ slti $at, $v0, -0x8000 -/* 0514A4 800508A4 10200003 */ beqz $at, .L800508B4 -/* 0514A8 800508A8 35290001 */ ori $t1, (0xFFFF0001 & 0xFFFF) # ori $t1, $t1, 1 -/* 0514AC 800508AC 340AFFFF */ li $t2, 65535 -/* 0514B0 800508B0 004A1021 */ addu $v0, $v0, $t2 -.L800508B4: -/* 0514B4 800508B4 1840000B */ blez $v0, .L800508E4 -/* 0514B8 800508B8 340AFFFF */ li $t2, 65535 -/* 0514BC 800508BC 240B0600 */ li $t3, 1536 -/* 0514C0 800508C0 00AB0019 */ multu $a1, $t3 -/* 0514C4 800508C4 00003012 */ mflo $a2 -/* 0514C8 800508C8 00C2082A */ slt $at, $a2, $v0 -/* 0514CC 800508CC 10200003 */ beqz $at, .L800508DC -/* 0514D0 800508D0 00627021 */ addu $t6, $v1, $v0 -/* 0514D4 800508D4 00C01025 */ move $v0, $a2 -/* 0514D8 800508D8 00627021 */ addu $t6, $v1, $v0 -.L800508DC: -/* 0514DC 800508DC 1000000C */ b .L80050910 -/* 0514E0 800508E0 A48E0160 */ sh $t6, 0x160($a0) -.L800508E4: -/* 0514E4 800508E4 0441000A */ bgez $v0, .L80050910 -/* 0514E8 800508E8 240B0600 */ li $t3, 1536 -/* 0514EC 800508EC 00AB0019 */ multu $a1, $t3 -/* 0514F0 800508F0 00003012 */ mflo $a2 -/* 0514F4 800508F4 00063023 */ negu $a2, $a2 -/* 0514F8 800508F8 0046082A */ slt $at, $v0, $a2 -/* 0514FC 800508FC 10200003 */ beqz $at, .L8005090C -/* 051500 80050900 00627821 */ addu $t7, $v1, $v0 -/* 051504 80050904 00C01025 */ move $v0, $a2 -/* 051508 80050908 00627821 */ addu $t7, $v1, $v0 -.L8005090C: -/* 05150C 8005090C A48F0160 */ sh $t7, 0x160($a0) -.L80050910: -/* 051510 80050910 84830162 */ lh $v1, 0x162($a0) -/* 051514 80050914 240B0600 */ li $t3, 1536 -/* 051518 80050918 3078FFFF */ andi $t8, $v1, 0xffff -/* 05151C 8005091C 00F81023 */ subu $v0, $a3, $t8 -/* 051520 80050920 0048082A */ slt $at, $v0, $t0 -/* 051524 80050924 14200003 */ bnez $at, .L80050934 -/* 051528 80050928 28418000 */ slti $at, $v0, -0x8000 -/* 05152C 8005092C 00491021 */ addu $v0, $v0, $t1 -/* 051530 80050930 28418000 */ slti $at, $v0, -0x8000 -.L80050934: -/* 051534 80050934 10200002 */ beqz $at, .L80050940 -/* 051538 80050938 00000000 */ nop -/* 05153C 8005093C 004A1021 */ addu $v0, $v0, $t2 -.L80050940: -/* 051540 80050940 1840000A */ blez $v0, .L8005096C -/* 051544 80050944 00000000 */ nop -/* 051548 80050948 00AB0019 */ multu $a1, $t3 -/* 05154C 8005094C 00003012 */ mflo $a2 -/* 051550 80050950 00C2082A */ slt $at, $a2, $v0 -/* 051554 80050954 10200003 */ beqz $at, .L80050964 -/* 051558 80050958 0062C821 */ addu $t9, $v1, $v0 -/* 05155C 8005095C 00C01025 */ move $v0, $a2 -/* 051560 80050960 0062C821 */ addu $t9, $v1, $v0 -.L80050964: -/* 051564 80050964 1000000C */ b .L80050998 -/* 051568 80050968 A4990162 */ sh $t9, 0x162($a0) -.L8005096C: -/* 05156C 8005096C 0441000A */ bgez $v0, .L80050998 -/* 051570 80050970 00000000 */ nop -/* 051574 80050974 00AB0019 */ multu $a1, $t3 -/* 051578 80050978 00003012 */ mflo $a2 -/* 05157C 8005097C 00063023 */ negu $a2, $a2 -/* 051580 80050980 0046082A */ slt $at, $v0, $a2 -/* 051584 80050984 10200003 */ beqz $at, .L80050994 -/* 051588 80050988 00626021 */ addu $t4, $v1, $v0 -/* 05158C 8005098C 00C01025 */ move $v0, $a2 -/* 051590 80050990 00626021 */ addu $t4, $v1, $v0 -.L80050994: -/* 051594 80050994 A48C0162 */ sh $t4, 0x162($a0) -.L80050998: -/* 051598 80050998 84830164 */ lh $v1, 0x164($a0) -/* 05159C 8005099C 87AD0012 */ lh $t5, 0x12($sp) -/* 0515A0 800509A0 306EFFFF */ andi $t6, $v1, 0xffff -/* 0515A4 800509A4 01AE1023 */ subu $v0, $t5, $t6 -/* 0515A8 800509A8 0048082A */ slt $at, $v0, $t0 -/* 0515AC 800509AC 14200003 */ bnez $at, .L800509BC -/* 0515B0 800509B0 28418000 */ slti $at, $v0, -0x8000 -/* 0515B4 800509B4 00491021 */ addu $v0, $v0, $t1 -/* 0515B8 800509B8 28418000 */ slti $at, $v0, -0x8000 -.L800509BC: -/* 0515BC 800509BC 10200002 */ beqz $at, .L800509C8 -/* 0515C0 800509C0 00000000 */ nop -/* 0515C4 800509C4 004A1021 */ addu $v0, $v0, $t2 -.L800509C8: -/* 0515C8 800509C8 1840000A */ blez $v0, .L800509F4 -/* 0515CC 800509CC 00000000 */ nop -/* 0515D0 800509D0 00AB0019 */ multu $a1, $t3 -/* 0515D4 800509D4 00003012 */ mflo $a2 -/* 0515D8 800509D8 00C2082A */ slt $at, $a2, $v0 -/* 0515DC 800509DC 10200003 */ beqz $at, .L800509EC -/* 0515E0 800509E0 00627821 */ addu $t7, $v1, $v0 -/* 0515E4 800509E4 00C01025 */ move $v0, $a2 -/* 0515E8 800509E8 00627821 */ addu $t7, $v1, $v0 -.L800509EC: -/* 0515EC 800509EC 03E00008 */ jr $ra -/* 0515F0 800509F0 A48F0164 */ sh $t7, 0x164($a0) - -.L800509F4: -/* 0515F4 800509F4 0441000A */ bgez $v0, .L80050A20 -/* 0515F8 800509F8 00000000 */ nop -/* 0515FC 800509FC 00AB0019 */ multu $a1, $t3 -/* 051600 80050A00 00003012 */ mflo $a2 -/* 051604 80050A04 00063023 */ negu $a2, $a2 -/* 051608 80050A08 0046082A */ slt $at, $v0, $a2 -/* 05160C 80050A0C 10200003 */ beqz $at, .L80050A1C -/* 051610 80050A10 0062C021 */ addu $t8, $v1, $v0 -/* 051614 80050A14 00C01025 */ move $v0, $a2 -/* 051618 80050A18 0062C021 */ addu $t8, $v1, $v0 -.L80050A1C: -/* 05161C 80050A1C A4980164 */ sh $t8, 0x164($a0) -.L80050A20: -/* 051620 80050A20 03E00008 */ jr $ra -/* 051624 80050A24 00000000 */ nop - diff --git a/include/enums.h b/include/enums.h index 0eba44f8..34482934 100644 --- a/include/enums.h +++ b/include/enums.h @@ -4,50 +4,50 @@ /* All the enums defined here can be used in asset files */ typedef enum Vehicle { - VEHICLE_CAR, - VEHICLE_HOVERCRAFT, - VEHICLE_PLANE, + VEHICLE_CAR, + VEHICLE_HOVERCRAFT, + VEHICLE_PLANE } Vehicle; typedef enum Language { - LANGUAGE_ENGLISH, - LANGUAGE_GERMAN, - LANGUAGE_FRENCH, - LANGUAGE_JAPANESE, + LANGUAGE_ENGLISH, + LANGUAGE_GERMAN, + LANGUAGE_FRENCH, + LANGUAGE_JAPANESE } Language; typedef enum World { WORLD_NONE = -1, // This enum starts at -1 instead of 0. - WORLD_CENTRAL_AREA, - WORLD_DINO_DOMAIN, - WORLD_SHERBET_ISLAND, - WORLD_SNOWFLAKE_MOUNTAIN, - WORLD_DRAGON_FOREST, - WORLD_FUTURE_FUN_LAND, + WORLD_CENTRAL_AREA, + WORLD_DINO_DOMAIN, + WORLD_SHERBET_ISLAND, + WORLD_SNOWFLAKE_MOUNTAIN, + WORLD_DRAGON_FOREST, + WORLD_FUTURE_FUN_LAND } World; typedef enum RaceType { RACETYPE_DEFAULT = 0, - RACETYPE_HORSESHOE_GULCH = 3, - RACETYPE_HUBWORLD = 5, + RACETYPE_HORSESHOE_GULCH = 3, + RACETYPE_HUBWORLD = 5, RACETYPE_CUTSCENE_1 = 6, // Not sure what the difference between these two are. - RACETYPE_CUTSCENE_2 = 7, - RACETYPE_BOSS = 8, - RACETYPE_CHALLENGE_BATTLE = 64, - RACETYPE_CHALLENGE_BANANAS = 65, - RACETYPE_CHALLENGE_EGGS = 66, + RACETYPE_CUTSCENE_2 = 7, + RACETYPE_BOSS = 8, + RACETYPE_CHALLENGE_BATTLE = 64, + RACETYPE_CHALLENGE_BANANAS = 65, + RACETYPE_CHALLENGE_EGGS = 66 } RaceType; typedef enum HorizontalAlignmentFlags { HORZ_ALIGN_LEFT = 0, HORZ_ALIGN_RIGHT = 1, - HORZ_ALIGN_CENTER = 4, + HORZ_ALIGN_CENTER = 4 } HorizontalAlignmentFlags; typedef enum VerticalAlignmentFlags { VERT_ALIGN_TOP = 0, VERT_ALIGN_BOTTOM = 2, - VERT_ALIGN_MIDDLE = 8, + VERT_ALIGN_MIDDLE = 8 } VerticalAlignmentFlags; typedef enum AlignmentFlags { @@ -59,7 +59,7 @@ typedef enum AlignmentFlags { ALIGN_MIDDLE_RIGHT = VERT_ALIGN_MIDDLE | HORZ_ALIGN_RIGHT, ALIGN_BOTTOM_LEFT = VERT_ALIGN_BOTTOM | HORZ_ALIGN_LEFT, ALIGN_BOTTOM_CENTER = VERT_ALIGN_BOTTOM | HORZ_ALIGN_CENTER, - ALIGN_BOTTOM_RIGHT = VERT_ALIGN_BOTTOM | HORZ_ALIGN_RIGHT, + ALIGN_BOTTOM_RIGHT = VERT_ALIGN_BOTTOM | HORZ_ALIGN_RIGHT } AlignmentFlags; #endif diff --git a/include/structs.h b/include/structs.h index 0c9d6018..3df8e273 100644 --- a/include/structs.h +++ b/include/structs.h @@ -474,7 +474,7 @@ typedef enum { OBJECT_MODEL_TYPE_SPRITE_BILLBOARD, OBJECT_MODEL_TYPE_VEHICLE_PART, OBJECT_MODEL_TYPE_UNKNOWN3, - OBJECT_MODEL_TYPE_UNKNOWN4, + OBJECT_MODEL_TYPE_UNKNOWN4 } ObjectModelType; typedef struct ObjectHeader { @@ -884,7 +884,8 @@ typedef struct Object_Racer { /* 0x1ED */ s8 squish_timer; /* 0x1EE */ u8 pad1EE[0x1]; /* 0x1EF */ u8 boost_sound; - /* 0x1F0 */ u8 pad1F0[0x2]; + /* 0x1F0 */ u8 pad1F0[0x1]; + /* 0x1F1 */ u8 unk1F1; /* 0x1F2 */ u8 unk1F2; /* 0x1F3 */ u8 unk1F3; /* 0x1F4 */ u8 pad1F4[0x1]; diff --git a/src/camera.h b/src/camera.h index c2b9a14b..0e9024eb 100644 --- a/src/camera.h +++ b/src/camera.h @@ -47,7 +47,7 @@ enum ViewPortFlags { VIEWPORT_X_CUSTOM = 0x0008, VIEWPORT_Y_CUSTOM = 0x0010, VIEWPORT_WIDTH_CUSTOM = 0x0020, - VIEWPORT_HEIGHT_CUSTOM = 0x0040, + VIEWPORT_HEIGHT_CUSTOM = 0x0040 }; extern s8 D_800DD060; diff --git a/src/fade_transition.h b/src/fade_transition.h index 47fa1fe2..b500a2e8 100644 --- a/src/fade_transition.h +++ b/src/fade_transition.h @@ -21,7 +21,7 @@ enum TransitionStatus { TRANSITION_LEVELSWAP = -1, TRANSITION_NONE, - TRANSITION_ACTIVE, + TRANSITION_ACTIVE }; /* Size: 8 bytes */ diff --git a/src/menu.h b/src/menu.h index 84217f8e..b362bf2b 100644 --- a/src/menu.h +++ b/src/menu.h @@ -25,7 +25,7 @@ enum DialogueMenuCases { DIALOG_TT, DIALOG_CHALLENGE, DIALOG_TROPHY, - DIALOG_RACERESULT, + DIALOG_RACERESULT }; #define CHEAT(index) 1 << index diff --git a/src/save_data.h b/src/save_data.h index fcc4d721..d9a24dab 100644 --- a/src/save_data.h +++ b/src/save_data.h @@ -31,7 +31,7 @@ typedef enum { CONTROLLER_PAK_UNK6, //Could be another way to mark as full according to tt_menu_loop RUMBLE_PAK, CONTROLLER_PAK_UNK8, // func_80074B34 Sets this, possibly set in func_800860A8 - CONTROLLER_PAK_BAD_DATA, + CONTROLLER_PAK_BAD_DATA } SIDeviceStatus; extern s8 *D_800DE440; diff --git a/src/video.h b/src/video.h index db4aedd9..0dbde27c 100644 --- a/src/video.h +++ b/src/video.h @@ -53,7 +53,7 @@ enum LogicUpdateRates { LOGIC_15FPS, LOGIC_12FPS, LOGIC_10FPS, - LOGIC_5FPS = 12, + LOGIC_5FPS = 12 }; extern s32 gVideoRefreshRate;