falso
/
mk64
mirror of https://github.com/n64decomp/mk64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some rename

This commit is contained in:
coco875 2024-09-17 09:44:18 +02:00
parent 6da6598cc6
commit 4915880dd5
7 changed files with 635 additions and 628 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
asm/non_matchings/code_80091750/func_8009F5E0.s
View File

@ -443,7 +443,7 @@ glabel L8009F904
/* 0A067C 8009FA7C 240500A0 */ li $a1, 160
/* 0A0680 8009FA80 00003825 */ move $a3, $zero
/* 0A0684 8009FA84 E7A00010 */ swc1 $f0, 0x10($sp)
/* 0A0688 8009FA88 0C024CC9 */ jal func_80093324
/* 0A0688 8009FA88 0C024CC9 */ jal print_text_mode_1
/* 0A068C 8009FA8C E7A00014 */ swc1 $f0, 0x14($sp)
/* 0A0690 8009FA90 02202025 */ move $a0, $s1
/* 0A0694 8009FA94 0C029E51 */ jal get_time_record_seconds
@ -465,7 +465,7 @@ glabel L8009F904
/* 0A06D4 8009FAD4 240500A0 */ li $a1, 160
/* 0A06D8 8009FAD8 00003825 */ move $a3, $zero
/* 0A06DC 8009FADC E7A00010 */ swc1 $f0, 0x10($sp)
/* 0A06E0 8009FAE0 0C024CC9 */ jal func_80093324
/* 0A06E0 8009FAE0 0C024CC9 */ jal print_text_mode_1
/* 0A06E4 8009FAE4 E7A00014 */ swc1 $f0, 0x14($sp)
/* 0A06E8 8009FAE8 02202025 */ move $a0, $s1
/* 0A06EC 8009FAEC 0C029E69 */ jal get_time_record_centiseconds
@ -1039,15 +1039,15 @@ glabel L800A02DC
/* 0A0F18 800A0318 C4261AF8 */ lwc1 $f6, %lo(D_800F1AF8)($at)
/* 0A0F1C 800A031C 8E24000C */ lw $a0, 0xc($s1)
/* 0A0F20 800A0320 8E250010 */ lw $a1, 0x10($s1)
/* 0A0F24 800A0324 3C06800E */ lui $a2, %hi(D_800E7728 - 0x194)
/* 0A0F24 800A0324 3C06800E */ lui $a2, %hi(gBestTimeText - 0x194)
/* 0A0F28 800A0328 000B6080 */ sll $t4, $t3, 2
/* 0A0F2C 800A032C 00CC3021 */ addu $a2, $a2, $t4
/* 0A0F30 800A0330 8CC67594 */ lw $a2, %lo(D_800E7728 - 0x194)($a2)
/* 0A0F30 800A0330 8CC67594 */ lw $a2, %lo(gBestTimeText - 0x194)($a2)
/* 0A0F34 800A0334 00003825 */ move $a3, $zero
/* 0A0F38 800A0338 E7A00010 */ swc1 $f0, 0x10($sp)
/* 0A0F3C 800A033C E7A60014 */ swc1 $f6, 0x14($sp)
/* 0A0F40 800A0340 24840008 */ addiu $a0, $a0, 8
/* 0A0F44 800A0344 0C024CC9 */ jal func_80093324
/* 0A0F44 800A0344 0C024CC9 */ jal print_text_mode_1
/* 0A0F48 800A0348 24A50010 */ addiu $a1, $a1, 0x10
/* 0A0F4C 800A034C 0C02A1D3 */ jal func_800A874C
/* 0A0F50 800A0350 02202025 */ move $a0, $s1
@ -1236,7 +1236,7 @@ glabel L800A05C4
/* 0A11F4 800A05F4 8E27001C */ lw $a3, 0x1c($s1)
/* 0A11F8 800A05F8 8CC67524 */ lw $a2, %lo(gCourseNames)($a2)
/* 0A11FC 800A05FC E7B20014 */ swc1 $f18, 0x14($sp)
/* 0A1200 800A0600 0C024CC9 */ jal func_80093324
/* 0A1200 800A0600 0C024CC9 */ jal print_text_mode_1
/* 0A1204 800A0604 E7B00010 */ swc1 $f16, 0x10($sp)
/* 0A1208 800A0608 100000AF */ b .L800A08C8
/* 0A120C 800A060C 8FBF0034 */ lw $ra, 0x34($sp)

36
asm/non_matchings/code_80091750/func_800A1FB0.s
View File

@ -110,7 +110,7 @@ glabel L800A2054
/* 0A2C90 800A2090 8E260000 */ lw $a2, ($s1)
/* 0A2C94 800A2094 00003825 */ move $a3, $zero
/* 0A2C98 800A2098 E7B40010 */ swc1 $f20, 0x10($sp)
/* 0A2C9C 800A209C 0C024CC9 */ jal func_80093324
/* 0A2C9C 800A209C 0C024CC9 */ jal print_text_mode_1
/* 0A2CA0 800A20A0 E7B60014 */ swc1 $f22, 0x14($sp)
/* 0A2CA4 800A20A4 3C048019 */ lui $a0, %hi(D_8018EDEC) # $a0, 0x8019
/* 0A2CA8 800A20A8 8084EDEC */ lb $a0, %lo(D_8018EDEC)($a0)
@ -158,7 +158,7 @@ glabel L800A2118
/* 0A2D44 800A2144 8E260000 */ lw $a2, ($s1)
/* 0A2D48 800A2148 00003825 */ move $a3, $zero
/* 0A2D4C 800A214C E7B60010 */ swc1 $f22, 0x10($sp)
/* 0A2D50 800A2150 0C024CC9 */ jal func_80093324
/* 0A2D50 800A2150 0C024CC9 */ jal print_text_mode_1
/* 0A2D54 800A2154 E7B60014 */ swc1 $f22, 0x14($sp)
/* 0A2D58 800A2158 26310004 */ addiu $s1, $s1, 4
/* 0A2D5C 800A215C 0232082B */ sltu $at, $s1, $s2
@ -180,7 +180,7 @@ glabel L800A2118
/* 0A2D98 800A2198 8E260000 */ lw $a2, ($s1)
/* 0A2D9C 800A219C 00003825 */ move $a3, $zero
/* 0A2DA0 800A21A0 E7B60010 */ swc1 $f22, 0x10($sp)
/* 0A2DA4 800A21A4 0C024CC9 */ jal func_80093324
/* 0A2DA4 800A21A4 0C024CC9 */ jal print_text_mode_1
/* 0A2DA8 800A21A8 E7B60014 */ swc1 $f22, 0x14($sp)
/* 0A2DAC 800A21AC 3C038019 */ lui $v1, %hi(D_8018EDEC) # $v1, 0x8019
/* 0A2DB0 800A21B0 8063EDEC */ lb $v1, %lo(D_8018EDEC)($v1)
@ -213,7 +213,7 @@ glabel L800A21E4
/* 0A2E10 800A2210 8E260000 */ lw $a2, ($s1)
/* 0A2E14 800A2214 00003825 */ move $a3, $zero
/* 0A2E18 800A2218 E7B60010 */ swc1 $f22, 0x10($sp)
/* 0A2E1C 800A221C 0C024CC9 */ jal func_80093324
/* 0A2E1C 800A221C 0C024CC9 */ jal print_text_mode_1
/* 0A2E20 800A2220 E7B60014 */ swc1 $f22, 0x14($sp)
/* 0A2E24 800A2224 26310004 */ addiu $s1, $s1, 4
/* 0A2E28 800A2228 1632FFF7 */ bne $s1, $s2, .L800A2208
@ -243,7 +243,7 @@ glabel L800A223C
/* 0A2E80 800A2280 8E260000 */ lw $a2, ($s1)
/* 0A2E84 800A2284 00003825 */ move $a3, $zero
/* 0A2E88 800A2288 E7B40010 */ swc1 $f20, 0x10($sp)
/* 0A2E8C 800A228C 0C024CC9 */ jal func_80093324
/* 0A2E8C 800A228C 0C024CC9 */ jal print_text_mode_1
/* 0A2E90 800A2290 E7B40014 */ swc1 $f20, 0x14($sp)
/* 0A2E94 800A2294 26100014 */ addiu $s0, $s0, 0x14
/* 0A2E98 800A2298 1612FFF7 */ bne $s0, $s2, .L800A2278
@ -271,7 +271,7 @@ glabel L800A22AC
/* 0A2EE8 800A22E8 8E260000 */ lw $a2, ($s1)
/* 0A2EEC 800A22EC 00003825 */ move $a3, $zero
/* 0A2EF0 800A22F0 E7B40010 */ swc1 $f20, 0x10($sp)
/* 0A2EF4 800A22F4 0C024CC9 */ jal func_80093324
/* 0A2EF4 800A22F4 0C024CC9 */ jal print_text_mode_1
/* 0A2EF8 800A22F8 E7B40014 */ swc1 $f20, 0x14($sp)
/* 0A2EFC 800A22FC 26100014 */ addiu $s0, $s0, 0x14
/* 0A2F00 800A2300 1612FFF7 */ bne $s0, $s2, .L800A22E0
@ -301,7 +301,7 @@ glabel L800A2314
/* 0A2F58 800A2358 8E260000 */ lw $a2, ($s1)
/* 0A2F5C 800A235C 00003825 */ move $a3, $zero
/* 0A2F60 800A2360 E7B40010 */ swc1 $f20, 0x10($sp)
/* 0A2F64 800A2364 0C024CC9 */ jal func_80093324
/* 0A2F64 800A2364 0C024CC9 */ jal print_text_mode_1
/* 0A2F68 800A2368 E7B40014 */ swc1 $f20, 0x14($sp)
/* 0A2F6C 800A236C 26100014 */ addiu $s0, $s0, 0x14
/* 0A2F70 800A2370 1612FFF7 */ bne $s0, $s2, .L800A2350
@ -325,7 +325,7 @@ glabel L800A2384
/* 0A2FB0 800A23B0 8E260000 */ lw $a2, ($s1)
/* 0A2FB4 800A23B4 00003825 */ move $a3, $zero
/* 0A2FB8 800A23B8 E7B60010 */ swc1 $f22, 0x10($sp)
/* 0A2FBC 800A23BC 0C024CC9 */ jal func_80093324
/* 0A2FBC 800A23BC 0C024CC9 */ jal print_text_mode_1
/* 0A2FC0 800A23C0 E7B60014 */ swc1 $f22, 0x14($sp)
/* 0A2FC4 800A23C4 26310004 */ addiu $s1, $s1, 4
/* 0A2FC8 800A23C8 1632FFF7 */ bne $s1, $s2, .L800A23A8
@ -456,7 +456,7 @@ glabel L800A23DC
/* 0A318C 800A258C 27A600B9 */ addiu $a2, $sp, 0xb9
/* 0A3190 800A2590 00003825 */ move $a3, $zero
/* 0A3194 800A2594 E7B60010 */ swc1 $f22, 0x10($sp)
/* 0A3198 800A2598 0C024CC9 */ jal func_80093324
/* 0A3198 800A2598 0C024CC9 */ jal print_text_mode_1
/* 0A319C 800A259C E7B60014 */ swc1 $f22, 0x14($sp)
/* 0A31A0 800A25A0 2401002A */ li $at, 42
/* 0A31A4 800A25A4 16610006 */ bne $s3, $at, .L800A25C0
@ -482,7 +482,7 @@ glabel L800A23DC
/* 0A31EC 800A25EC 02402825 */ move $a1, $s2
/* 0A31F0 800A25F0 00003825 */ move $a3, $zero
/* 0A31F4 800A25F4 E7B40010 */ swc1 $f20, 0x10($sp)
/* 0A31F8 800A25F8 0C024CC9 */ jal func_80093324
/* 0A31F8 800A25F8 0C024CC9 */ jal print_text_mode_1
/* 0A31FC 800A25FC E7B40014 */ swc1 $f20, 0x14($sp)
/* 0A3200 800A2600 10000019 */ b .L800A2668
/* 0A3204 800A2604 24010002 */ li $at, 2
@ -510,7 +510,7 @@ glabel L800A23DC
/* 0A3250 800A2650 00003825 */ move $a3, $zero
/* 0A3254 800A2654 000D7080 */ sll $t6, $t5, 2
/* 0A3258 800A2658 00CE3021 */ addu $a2, $a2, $t6
/* 0A325C 800A265C 0C024CC9 */ jal func_80093324
/* 0A325C 800A265C 0C024CC9 */ jal print_text_mode_1
/* 0A3260 800A2660 8CC675C4 */ lw $a2, %lo(gCourseNamesDup2)($a2)
/* 0A3264 800A2664 24010002 */ li $at, 2
.L800A2668:
@ -649,7 +649,7 @@ glabel L800A26A8
/* 0A3448 800A2848 27A600A9 */ addiu $a2, $sp, 0xa9
/* 0A344C 800A284C 00003825 */ move $a3, $zero
/* 0A3450 800A2850 E7B60010 */ swc1 $f22, 0x10($sp)
/* 0A3454 800A2854 0C024CC9 */ jal func_80093324
/* 0A3454 800A2854 0C024CC9 */ jal print_text_mode_1
/* 0A3458 800A2858 E7B60014 */ swc1 $f22, 0x14($sp)
/* 0A345C 800A285C 2401002A */ li $at, 42
/* 0A3460 800A2860 16610006 */ bne $s3, $at, .L800A287C
@ -675,7 +675,7 @@ glabel L800A26A8
/* 0A34A8 800A28A8 02402825 */ move $a1, $s2
/* 0A34AC 800A28AC 00003825 */ move $a3, $zero
/* 0A34B0 800A28B0 E7B40010 */ swc1 $f20, 0x10($sp)
/* 0A34B4 800A28B4 0C024CC9 */ jal func_80093324
/* 0A34B4 800A28B4 0C024CC9 */ jal print_text_mode_1
/* 0A34B8 800A28B8 E7B40014 */ swc1 $f20, 0x14($sp)
/* 0A34BC 800A28BC 10000019 */ b .L800A2924
/* 0A34C0 800A28C0 24010002 */ li $at, 2
@ -703,7 +703,7 @@ glabel L800A26A8
/* 0A350C 800A290C 00003825 */ move $a3, $zero
/* 0A3510 800A2910 00085080 */ sll $t2, $t0, 2
/* 0A3514 800A2914 00CA3021 */ addu $a2, $a2, $t2
/* 0A3518 800A2918 0C024CC9 */ jal func_80093324
/* 0A3518 800A2918 0C024CC9 */ jal print_text_mode_1
/* 0A351C 800A291C 8CC675C4 */ lw $a2, %lo(gCourseNamesDup2)($a2)
/* 0A3520 800A2920 24010002 */ li $at, 2
.L800A2924:
@ -742,7 +742,7 @@ glabel L800A26A8
/* 0A359C 800A299C 8E660000 */ lw $a2, ($s3)
/* 0A35A0 800A29A0 00003825 */ move $a3, $zero
/* 0A35A4 800A29A4 E7B80010 */ swc1 $f24, 0x10($sp)
/* 0A35A8 800A29A8 0C024CC9 */ jal func_80093324
/* 0A35A8 800A29A8 0C024CC9 */ jal print_text_mode_1
/* 0A35AC 800A29AC E7B80014 */ swc1 $f24, 0x14($sp)
/* 0A35B0 800A29B0 26520001 */ addiu $s2, $s2, 1
/* 0A35B4 800A29B4 24010002 */ li $at, 2
@ -867,7 +867,7 @@ glabel L800A29D0
/* 0A3764 800A2B64 27A60099 */ addiu $a2, $sp, 0x99
/* 0A3768 800A2B68 00003825 */ move $a3, $zero
/* 0A376C 800A2B6C E7B60010 */ swc1 $f22, 0x10($sp)
/* 0A3770 800A2B70 0C024CC9 */ jal func_80093324
/* 0A3770 800A2B70 0C024CC9 */ jal print_text_mode_1
/* 0A3774 800A2B74 E7B60014 */ swc1 $f22, 0x14($sp)
/* 0A3778 800A2B78 2401002A */ li $at, 42
/* 0A377C 800A2B7C 16610006 */ bne $s3, $at, .L800A2B98
@ -893,7 +893,7 @@ glabel L800A29D0
/* 0A37C4 800A2BC4 02402825 */ move $a1, $s2
/* 0A37C8 800A2BC8 00003825 */ move $a3, $zero
/* 0A37CC 800A2BCC E7B40010 */ swc1 $f20, 0x10($sp)
/* 0A37D0 800A2BD0 0C024CC9 */ jal func_80093324
/* 0A37D0 800A2BD0 0C024CC9 */ jal print_text_mode_1
/* 0A37D4 800A2BD4 E7B40014 */ swc1 $f20, 0x14($sp)
/* 0A37D8 800A2BD8 10000019 */ b .L800A2C40
/* 0A37DC 800A2BDC 24010002 */ li $at, 2
@ -921,7 +921,7 @@ glabel L800A29D0
/* 0A3828 800A2C28 00003825 */ move $a3, $zero
/* 0A382C 800A2C2C 00194080 */ sll $t0, $t9, 2
/* 0A3830 800A2C30 00C83021 */ addu $a2, $a2, $t0
/* 0A3834 800A2C34 0C024CC9 */ jal func_80093324
/* 0A3834 800A2C34 0C024CC9 */ jal print_text_mode_1
/* 0A3838 800A2C38 8CC675C4 */ lw $a2, %lo(gCourseNamesDup2)($a2)
/* 0A383C 800A2C3C 24010002 */ li $at, 2
.L800A2C40:

4
asm/non_matchings/code_80091750/func_800A474C.s
View File

@ -152,7 +152,7 @@ glabel func_800A474C
/* 0A552C 800A492C 00003825 */ move $a3, $zero
/* 0A5530 800A4930 E7B40010 */ swc1 $f20, 0x10($sp)
/* 0A5534 800A4934 E7B40014 */ swc1 $f20, 0x14($sp)
/* 0A5538 800A4938 0C024CC9 */ jal func_80093324
/* 0A5538 800A4938 0C024CC9 */ jal print_text_mode_1
/* 0A553C 800A493C 24840032 */ addiu $a0, $a0, 0x32
/* 0A5540 800A4940 8FA4002C */ lw $a0, 0x2c($sp)
/* 0A5544 800A4944 0C029E51 */ jal get_time_record_seconds
@ -172,7 +172,7 @@ glabel func_800A474C
/* 0A557C 800A497C 00003825 */ move $a3, $zero
/* 0A5580 800A4980 E7B40010 */ swc1 $f20, 0x10($sp)
/* 0A5584 800A4984 E7B40014 */ swc1 $f20, 0x14($sp)
/* 0A5588 800A4988 0C024CC9 */ jal func_80093324
/* 0A5588 800A4988 0C024CC9 */ jal print_text_mode_1
/* 0A558C 800A498C 24840046 */ addiu $a0, $a0, 0x46
/* 0A5590 800A4990 8FA4002C */ lw $a0, 0x2c($sp)
/* 0A5594 800A4994 0C029E69 */ jal get_time_record_centiseconds

21
include/defines.h
View File

@ -269,12 +269,14 @@ enum { COURSE_ONE, COURSE_TWO, COURSE_THREE, COURSE_FOUR };
* flashing between 2 colors, but also cause individual characters
* to be cutoff on their right side
*/
#define TEXT_BLUE 0
#define TEXT_GREEN 1
#define TEXT_RED 2
#define TEXT_YELLOW 3
#define TEXT_BLUE_GREEN_RED_CYCLE_1 4
#define TEXT_BLUE_GREEN_RED_CYCLE_2 5
enum COLOR_ID {
TEXT_BLUE,
TEXT_GREEN,
TEXT_RED,
TEXT_YELLOW,
TEXT_BLUE_GREEN_RED_CYCLE_1,
TEXT_BLUE_GREEN_RED_CYCLE_2,
}
/**
* @brief Sound mode options
@ -336,12 +338,7 @@ enum KART_AI_BEHAVIOURS {
BEHAVIOUR_MAX_SPEED
};
enum DIRECTION {
NORTH,
EAST,
SOUTH,
WEST
};
enum DIRECTION { NORTH, EAST, SOUTH, WEST };
/**
* @brief Balloon status

1142
src/code_80091750.c
View File

File diff suppressed because it is too large Load Diff

26
src/code_80091750.h
View File

@ -22,9 +22,9 @@ it last longer See `func_80096CD8` for the actual drawing of the static
*/
typedef struct {
/* 0x00 */ s32 type; // id maybe?
/* 0x04 */ s32 cursor; // sound mode, maybe some other stuff
/* 0x08 */ s32 unk8; // This is used but I can't tell what for
/* 0x00 */ s32 type; // id maybe?
/* 0x04 */ s32 state; // sound mode, maybe some other stuff
/* 0x08 */ s32 unk8; // This is used but I can't tell what for
/* 0x0C */ s32 column;
/* 0x10 */ s32 row;
/* 0x14 */ u8 priority; // priority/depth/z-level. Higher values are drawn on top of lower values
@ -124,8 +124,8 @@ s32 get_string_width(char*);
void set_text_color(s32);
void func_800930E4(s32, s32, char*);
void print_text0(s32, s32, char*, s32, f32, f32, s32);
void func_80093324(s32, s32, char*, s32, f32, f32);
void func_80093358(s32, s32, char*, s32, f32, f32);
void print_text_mode_1(s32, s32, char*, s32, f32, f32);
void print_text_mode_2(s32, s32, char*, s32, f32, f32);
void print_text1(s32, s32, char*, s32, f32, f32, s32);
void func_800936B8(s32, s32, char*, s32, f32, f32);
void draw_text(s32, s32, char*, s32, f32, f32);
@ -494,7 +494,7 @@ extern char* gDebugCourseNames[];
extern const s8 gPerCupIndexByCourseId[]; // D_800EFD50
extern const s8 D_800EFD64[];
extern s8 gCupSelectionByCourseId[];
extern char* D_800E7678[];
extern char* gCupText[];
extern char* gDebugCharacterNames[];
extern char* D_800E76A8[];
extern char* D_800E76CC[];
@ -502,12 +502,12 @@ extern char* D_800E76DC[];
extern char* gDebugScreenModeNames[];
extern char* gDebugSoundModeNames[];
extern char* gSoundModeNames[]; // D_800E7710
extern char* D_800E7720[];
extern char* D_800E7728[];
extern char* D_800E7730;
extern char* D_800E7734[];
extern char* gWinLoseText[];
extern char* gBestTimeText[];
extern char* gLapTimeText;
extern char* gPrefixTimeText[];
extern char* D_800E7744[];
extern char* gTextPauseButton[];
extern char* gMenuText[];
extern char* D_800E7778[];
extern char D_800E7780[];
extern char* D_800E77A0[];
@ -517,7 +517,7 @@ extern char D_800E77D8[];
extern char* sCourseLengths[];
extern char* D_800E7834[];
extern char* D_800E7840[];
extern char* D_800E7848[];
extern char* gEraseBestGhostText[];
extern char* D_800E7860[];
extern char* D_800E7868[];
extern char* D_800E7878[];
@ -545,7 +545,7 @@ extern char* D_800E7A80[];
extern char* D_800E7A88[];
extern char* D_800E7A98;
extern char* D_800E7A9C[];
extern char* D_800E7AA4[];
extern char* gPlaceText[];
extern const s8 gGPPointRewards[];
extern const s8 D_800F0B1C[];
extern const s8 D_800F0B28[];

22
src/menus.c
View File

@ -252,20 +252,20 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
sp2C = true;
sp38->unk8 = -1;
}
if (sp2C && gSoundMode != sp38->cursor) {
if (sp2C && gSoundMode != sp38->state) {
gSaveData.main.saveInfo.soundMode = gSoundMode;
write_save_data_grand_prix_points_and_sound_mode();
update_save_data_backup();
sp38->cursor = gSoundMode;
sp38->state = gSoundMode;
}
if (btnAndStick & B_BUTTON) {
func_8009E280();
play_sound2(SOUND_MENU_GO_BACK);
if (gSoundMode != sp38->cursor) {
if (gSoundMode != sp38->state) {
gSaveData.main.saveInfo.soundMode = gSoundMode;
write_save_data_grand_prix_points_and_sound_mode();
update_save_data_backup();
sp38->cursor = gSoundMode;
sp38->state = gSoundMode;
}
return;
}
@ -305,7 +305,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
switch (sp2C) {
case PFS_INVALID_DATA:
D_8018EDEC = 0x46;
sp38->cursor = 0;
sp38->state = 0;
play_sound2(SOUND_MENU_SELECT);
break;
case PFS_NO_ERROR:
@ -482,7 +482,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
D_8018EDEC = 0x38;
} else {
D_8018EDEC = 0x3A;
sp38->cursor = 0;
sp38->state = 0;
}
play_sound2(SOUND_MENU_SELECT);
}
@ -534,7 +534,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
} else {
D_8018EDEC = 0x3A;
play_sound2(SOUND_MENU_SELECT);
sp38->cursor = 0;
sp38->state = 0;
}
}
// return?
@ -542,9 +542,9 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
}
case 0x3A: {
if (arg1 == 0) {
sp38->cursor += 1;
sp38->state += 1;
}
if (sp38->cursor >= 3) {
if (sp38->state >= 3) {
D_8018EDEC = 0x3B;
}
break;
@ -576,9 +576,9 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
}
case 0x46: {
if (arg1 == 0) {
sp38->cursor += 1;
sp38->state += 1;
}
if (sp38->cursor >= 3) {
if (sp38->state >= 3) {
D_8018EDEC = 0x47;
}
break;