diff --git a/asm/non_matchings/memory/get_memory_color_tag_count.s b/asm/non_matchings/memory/get_memory_colour_tag_count.s similarity index 98% rename from asm/non_matchings/memory/get_memory_color_tag_count.s rename to asm/non_matchings/memory/get_memory_colour_tag_count.s index c8904487..50d98469 100644 --- a/asm/non_matchings/memory/get_memory_color_tag_count.s +++ b/asm/non_matchings/memory/get_memory_colour_tag_count.s @@ -1,4 +1,4 @@ -glabel get_memory_color_tag_count +glabel get_memory_colour_tag_count /* 072624 80071A24 3C028012 */ lui $v0, %hi(gMemoryPools+8) # $v0, 0x8012 /* 072628 80071A28 8C423588 */ lw $v0, %lo(gMemoryPools+8)($v0) /* 07262C 80071A2C 00001825 */ move $v1, $zero diff --git a/asm/non_matchings/menu/calculate_and_display_rom_checksum.s b/asm/non_matchings/menu/calculate_and_display_rom_checksum.s index ba5899af..71cdd5cd 100644 --- a/asm/non_matchings/menu/calculate_and_display_rom_checksum.s +++ b/asm/non_matchings/menu/calculate_and_display_rom_checksum.s @@ -80,7 +80,7 @@ glabel calculate_and_display_rom_checksum /* 08BA5C 8008AE5C 00002025 */ move $a0, $zero /* 08BA60 8008AE60 00002825 */ move $a1, $zero /* 08BA64 8008AE64 00003025 */ move $a2, $zero -/* 08BA68 8008AE68 0C02D8AD */ jal set_render_printf_background_color +/* 08BA68 8008AE68 0C02D8AD */ jal set_render_printf_background_colour /* 08BA6C 8008AE6C 24070080 */ li $a3, 128 /* 08BA70 8008AE70 24040020 */ li $a0, 32 /* 08BA74 8008AE74 0C02D8D7 */ jal set_render_printf_position diff --git a/asm/non_matchings/menu/draw_menu_elements.s b/asm/non_matchings/menu/draw_menu_elements.s index 3a4db169..e6233292 100644 --- a/asm/non_matchings/menu/draw_menu_elements.s +++ b/asm/non_matchings/menu/draw_menu_elements.s @@ -141,14 +141,14 @@ glabel L800823E8 /* 082FEC 800823EC 8605001A */ lh $a1, 0x1a($s0) /* 082FF0 800823F0 8606001C */ lh $a2, 0x1c($s0) /* 082FF4 800823F4 8607001E */ lh $a3, 0x1e($s0) -/* 082FF8 800823F8 0C0310F3 */ jal set_text_background_color +/* 082FF8 800823F8 0C0310F3 */ jal set_text_background_colour /* 082FFC 800823FC 00000000 */ nop /* 083000 80082400 920D0010 */ lbu $t5, 0x10($s0) /* 083004 80082404 9204000C */ lbu $a0, 0xc($s0) /* 083008 80082408 9205000D */ lbu $a1, 0xd($s0) /* 08300C 8008240C 9206000E */ lbu $a2, 0xe($s0) /* 083010 80082410 9207000F */ lbu $a3, 0xf($s0) -/* 083014 80082414 0C0310E1 */ jal set_text_color +/* 083014 80082414 0C0310E1 */ jal set_text_colour /* 083018 80082418 AFAD0010 */ sw $t5, 0x10($sp) /* 08301C 8008241C 92040011 */ lbu $a0, 0x11($s0) /* 083020 80082420 0C0310BB */ jal set_text_font diff --git a/asm/non_matchings/menu/func_80083098.s b/asm/non_matchings/menu/func_80083098.s index e9f7b04b..fcb4f0fa 100644 --- a/asm/non_matchings/menu/func_80083098.s +++ b/asm/non_matchings/menu/func_80083098.s @@ -34,7 +34,7 @@ glabel func_80083098 /* 083D18 80083118 00002025 */ move $a0, $zero /* 083D1C 8008311C 00002825 */ move $a1, $zero /* 083D20 80083120 00003025 */ move $a2, $zero -/* 083D24 80083124 0C0310F3 */ jal set_text_background_color +/* 083D24 80083124 0C0310F3 */ jal set_text_background_colour /* 083D28 80083128 00003825 */ move $a3, $zero /* 083D2C 8008312C 3C12800E */ lui $s2, %hi(D_800DF9F4) # $s2, 0x800e /* 083D30 80083130 2652F9F4 */ addiu $s2, %lo(D_800DF9F4) # addiu $s2, $s2, -0x60c @@ -59,7 +59,7 @@ glabel func_80083098 /* 083D78 80083178 90450001 */ lbu $a1, 1($v0) /* 083D7C 8008317C 90460002 */ lbu $a2, 2($v0) /* 083D80 80083180 90470003 */ lbu $a3, 3($v0) -/* 083D84 80083184 0C0310E1 */ jal set_text_color +/* 083D84 80083184 0C0310E1 */ jal set_text_colour /* 083D88 80083188 AFB90010 */ sw $t9, 0x10($sp) /* 083D8C 8008318C 86050004 */ lh $a1, 4($s0) /* 083D90 80083190 86060006 */ lh $a2, 6($s0) @@ -288,7 +288,7 @@ glabel func_80083098 .L800834E8: /* 0840E8 800834E8 240D00FF */ li $t5, 255 /* 0840EC 800834EC AFAD0010 */ sw $t5, 0x10($sp) -/* 0840F0 800834F0 0C0310E1 */ jal set_text_color +/* 0840F0 800834F0 0C0310E1 */ jal set_text_colour /* 0840F4 800834F4 240400FF */ li $a0, 255 /* 0840F8 800834F8 8FA50068 */ lw $a1, 0x68($sp) /* 0840FC 800834FC 8FA60064 */ lw $a2, 0x64($sp) diff --git a/asm/non_matchings/menu/func_8008377C.s b/asm/non_matchings/menu/func_8008377C.s index 6513bd9c..cee8d981 100644 --- a/asm/non_matchings/menu/func_8008377C.s +++ b/asm/non_matchings/menu/func_8008377C.s @@ -86,7 +86,7 @@ glabel func_8008377C /* 0844C0 800838C0 00002025 */ move $a0, $zero /* 0844C4 800838C4 00002825 */ move $a1, $zero /* 0844C8 800838C8 00003025 */ move $a2, $zero -/* 0844CC 800838CC 0C0310F3 */ jal set_text_background_color +/* 0844CC 800838CC 0C0310F3 */ jal set_text_background_colour /* 0844D0 800838D0 00003825 */ move $a3, $zero /* 0844D4 800838D4 3C0E800E */ lui $t6, %hi(gTitleMenuStrings) # $t6, 0x800e /* 0844D8 800838D8 8DCEF7A4 */ lw $t6, %lo(gTitleMenuStrings)($t6) @@ -119,7 +119,7 @@ glabel func_8008377C .L8008393C: /* 08453C 8008393C 8EEA0000 */ lw $t2, ($s7) /* 084540 80083940 240600FF */ li $a2, 255 -/* 084544 80083944 0C0310E1 */ jal set_text_color +/* 084544 80083944 0C0310E1 */ jal set_text_colour /* 084548 80083948 AFAA0010 */ sw $t2, 0x10($sp) /* 08454C 8008394C 8E070000 */ lw $a3, ($s0) /* 084550 80083950 240B000C */ li $t3, 12 diff --git a/asm/non_matchings/menu/func_80084854.s b/asm/non_matchings/menu/func_80084854.s index 58de7a46..65f30c1a 100644 --- a/asm/non_matchings/menu/func_80084854.s +++ b/asm/non_matchings/menu/func_80084854.s @@ -197,7 +197,7 @@ glabel func_80084854 /* 085744 80084B44 00002025 */ move $a0, $zero /* 085748 80084B48 00002825 */ move $a1, $zero /* 08574C 80084B4C 00003025 */ move $a2, $zero -/* 085750 80084B50 0C0310F3 */ jal set_text_background_color +/* 085750 80084B50 0C0310F3 */ jal set_text_background_colour /* 085754 80084B54 00003825 */ move $a3, $zero /* 085758 80084B58 3C0C8012 */ lui $t4, %hi(D_801263E0) # $t4, 0x8012 /* 08575C 80084B5C 8D8C63E0 */ lw $t4, %lo(D_801263E0)($t4) @@ -245,7 +245,7 @@ glabel func_80084854 /* 0857F4 80084BF4 240900FF */ li $t1, 255 /* 0857F8 80084BF8 AFA90010 */ sw $t1, 0x10($sp) /* 0857FC 80084BFC 240600FF */ li $a2, 255 -/* 085800 80084C00 0C0310E1 */ jal set_text_color +/* 085800 80084C00 0C0310E1 */ jal set_text_colour /* 085804 80084C04 02603825 */ move $a3, $s3 /* 085808 80084C08 10000009 */ b .L80084C30 /* 08580C 80084C0C 860A000A */ lh $t2, 0xa($s0) @@ -255,7 +255,7 @@ glabel func_80084854 /* 085818 80084C18 92050005 */ lbu $a1, 5($s0) /* 08581C 80084C1C 92060006 */ lbu $a2, 6($s0) /* 085820 80084C20 92070007 */ lbu $a3, 7($s0) -/* 085824 80084C24 0C0310E1 */ jal set_text_color +/* 085824 80084C24 0C0310E1 */ jal set_text_colour /* 085828 80084C28 AFAB0010 */ sw $t3, 0x10($sp) /* 08582C 80084C2C 860A000A */ lh $t2, 0xa($s0) .L80084C30: diff --git a/asm/non_matchings/menu/func_800853D0.s b/asm/non_matchings/menu/func_800853D0.s index 5a83ac16..068e3208 100644 --- a/asm/non_matchings/menu/func_800853D0.s +++ b/asm/non_matchings/menu/func_800853D0.s @@ -457,7 +457,7 @@ glabel L80085828 /* 086670 80085A70 00002025 */ move $a0, $zero /* 086674 80085A74 00002825 */ move $a1, $zero /* 086678 80085A78 00003025 */ move $a2, $zero -/* 08667C 80085A7C 0C0310E1 */ jal set_text_color +/* 08667C 80085A7C 0C0310E1 */ jal set_text_colour /* 086680 80085A80 240700FF */ li $a3, 255 /* 086684 80085A84 8FA50084 */ lw $a1, 0x84($sp) /* 086688 80085A88 8FA60088 */ lw $a2, 0x88($sp) @@ -474,7 +474,7 @@ glabel L80085828 /* 0866B4 80085AB4 240400FF */ li $a0, 255 /* 0866B8 80085AB8 24050040 */ li $a1, 64 /* 0866BC 80085ABC 240600FF */ li $a2, 255 -/* 0866C0 80085AC0 0C0310E1 */ jal set_text_color +/* 0866C0 80085AC0 0C0310E1 */ jal set_text_colour /* 0866C4 80085AC4 24070040 */ li $a3, 64 /* 0866C8 80085AC8 8FA50084 */ lw $a1, 0x84($sp) /* 0866CC 80085ACC 8FA60088 */ lw $a2, 0x88($sp) @@ -498,7 +498,7 @@ glabel L80085828 /* 086710 80085B10 00002025 */ move $a0, $zero /* 086714 80085B14 00002825 */ move $a1, $zero /* 086718 80085B18 00003025 */ move $a2, $zero -/* 08671C 80085B1C 0C0310E1 */ jal set_text_color +/* 08671C 80085B1C 0C0310E1 */ jal set_text_colour /* 086720 80085B20 240700FF */ li $a3, 255 /* 086724 80085B24 8FA50084 */ lw $a1, 0x84($sp) /* 086728 80085B28 8FA60088 */ lw $a2, 0x88($sp) @@ -515,7 +515,7 @@ glabel L80085828 /* 086754 80085B54 240400FF */ li $a0, 255 /* 086758 80085B58 240500FF */ li $a1, 255 /* 08675C 80085B5C 240600FF */ li $a2, 255 -/* 086760 80085B60 0C0310E1 */ jal set_text_color +/* 086760 80085B60 0C0310E1 */ jal set_text_colour /* 086764 80085B64 240700FF */ li $a3, 255 /* 086768 80085B68 8FA60088 */ lw $a2, 0x88($sp) /* 08676C 80085B6C 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 diff --git a/asm/non_matchings/menu/func_80085B9C.s b/asm/non_matchings/menu/func_80085B9C.s index 925765af..13ef785b 100644 --- a/asm/non_matchings/menu/func_80085B9C.s +++ b/asm/non_matchings/menu/func_80085B9C.s @@ -64,7 +64,7 @@ glabel L80085C30 /* 086860 80085C60 00002025 */ move $a0, $zero /* 086864 80085C64 00002825 */ move $a1, $zero /* 086868 80085C68 00003025 */ move $a2, $zero -/* 08686C 80085C6C 0C0310F3 */ jal set_text_background_color +/* 08686C 80085C6C 0C0310F3 */ jal set_text_background_colour /* 086870 80085C70 00003825 */ move $a3, $zero /* 086874 80085C74 0C0310BB */ jal set_text_font /* 086878 80085C78 24040002 */ li $a0, 2 @@ -73,7 +73,7 @@ glabel L80085C30 /* 086884 80085C84 00002025 */ move $a0, $zero /* 086888 80085C88 00002825 */ move $a1, $zero /* 08688C 80085C8C 00003025 */ move $a2, $zero -/* 086890 80085C90 0C0310E1 */ jal set_text_color +/* 086890 80085C90 0C0310E1 */ jal set_text_colour /* 086894 80085C94 240700FF */ li $a3, 255 /* 086898 80085C98 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e /* 08689C 80085C9C 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9) @@ -90,7 +90,7 @@ glabel L80085C30 /* 0868C8 80085CC8 240400FF */ li $a0, 255 /* 0868CC 80085CCC 240500FF */ li $a1, 255 /* 0868D0 80085CD0 240600FF */ li $a2, 255 -/* 0868D4 80085CD4 0C0310E1 */ jal set_text_color +/* 0868D4 80085CD4 0C0310E1 */ jal set_text_colour /* 0868D8 80085CD8 00003825 */ move $a3, $zero /* 0868DC 80085CDC 3C0C800E */ lui $t4, %hi(gMenuText) # $t4, 0x800e /* 0868E0 80085CE0 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4) @@ -305,7 +305,7 @@ glabel L80085C30 /* 086BF0 80085FF0 240400FF */ li $a0, 255 /* 086BF4 80085FF4 240500FF */ li $a1, 255 /* 086BF8 80085FF8 240600FF */ li $a2, 255 -/* 086BFC 80085FFC 0C0310E1 */ jal set_text_color +/* 086BFC 80085FFC 0C0310E1 */ jal set_text_colour /* 086C00 80086000 00003825 */ move $a3, $zero /* 086C04 80086004 8FAF0044 */ lw $t7, 0x44($sp) /* 086C08 80086008 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 diff --git a/asm/non_matchings/menu/func_80088938.s b/asm/non_matchings/menu/func_80088938.s index 79b0a784..313993a6 100644 --- a/asm/non_matchings/menu/func_80088938.s +++ b/asm/non_matchings/menu/func_80088938.s @@ -13,7 +13,7 @@ glabel func_80088938 /* 089564 80088964 00002025 */ move $a0, $zero /* 089568 80088968 00002825 */ move $a1, $zero /* 08956C 8008896C 00003025 */ move $a2, $zero -/* 089570 80088970 0C0310F3 */ jal set_text_background_color +/* 089570 80088970 0C0310F3 */ jal set_text_background_colour /* 089574 80088974 00003825 */ move $a3, $zero /* 089578 80088978 3C168012 */ lui $s6, %hi(D_801263BC) # $s6, 0x8012 /* 08957C 8008897C 8ED663BC */ lw $s6, %lo(D_801263BC)($s6) @@ -47,7 +47,7 @@ glabel func_80088938 /* 0895E4 800889E4 00002025 */ move $a0, $zero /* 0895E8 800889E8 00002825 */ move $a1, $zero /* 0895EC 800889EC 00003025 */ move $a2, $zero -/* 0895F0 800889F0 0C0310E1 */ jal set_text_color +/* 0895F0 800889F0 0C0310E1 */ jal set_text_colour /* 0895F4 800889F4 240700FF */ li $a3, 255 /* 0895F8 800889F8 3C17800E */ lui $s7, %hi(gMenuText) # $s7, 0x800e /* 0895FC 800889FC 26F7F4A0 */ addiu $s7, %lo(gMenuText) # addiu $s7, $s7, -0xb60 @@ -65,7 +65,7 @@ glabel func_80088938 /* 08962C 80088A2C 240400FF */ li $a0, 255 /* 089630 80088A30 240500FF */ li $a1, 255 /* 089634 80088A34 240600FF */ li $a2, 255 -/* 089638 80088A38 0C0310E1 */ jal set_text_color +/* 089638 80088A38 0C0310E1 */ jal set_text_colour /* 08963C 80088A3C 00003825 */ move $a3, $zero /* 089640 80088A40 8EEC0000 */ lw $t4, ($s7) /* 089644 80088A44 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -339,7 +339,7 @@ glabel func_80088938 /* 089A50 80088E50 240400FF */ li $a0, 255 /* 089A54 80088E54 240500FF */ li $a1, 255 /* 089A58 80088E58 240600FF */ li $a2, 255 -/* 089A5C 80088E5C 0C0310E1 */ jal set_text_color +/* 089A5C 80088E5C 0C0310E1 */ jal set_text_colour /* 089A60 80088E60 02C03825 */ move $a3, $s6 /* 089A64 80088E64 10000007 */ b .L80088E84 /* 089A68 80088E68 8EE90000 */ lw $t1, ($s7) @@ -347,7 +347,7 @@ glabel func_80088938 /* 089A6C 80088E6C 240800FF */ li $t0, 255 /* 089A70 80088E70 AFA80010 */ sw $t0, 0x10($sp) /* 089A74 80088E74 240600FF */ li $a2, 255 -/* 089A78 80088E78 0C0310E1 */ jal set_text_color +/* 089A78 80088E78 0C0310E1 */ jal set_text_colour /* 089A7C 80088E7C 00003825 */ move $a3, $zero /* 089A80 80088E80 8EE90000 */ lw $t1, ($s7) .L80088E84: @@ -474,7 +474,7 @@ glabel func_80088938 /* 089C40 80089040 241900FF */ li $t9, 255 /* 089C44 80089044 AFB90010 */ sw $t9, 0x10($sp) /* 089C48 80089048 240600FF */ li $a2, 255 -/* 089C4C 8008904C 0C0310E1 */ jal set_text_color +/* 089C4C 8008904C 0C0310E1 */ jal set_text_colour /* 089C50 80089050 00003825 */ move $a3, $zero /* 089C54 80089054 0C0310BB */ jal set_text_font /* 089C58 80089058 24040002 */ li $a0, 2 diff --git a/asm/non_matchings/menu/func_8008FA54.s b/asm/non_matchings/menu/func_8008FA54.s index 1c4b4a69..7cc8785d 100644 --- a/asm/non_matchings/menu/func_8008FA54.s +++ b/asm/non_matchings/menu/func_8008FA54.s @@ -34,7 +34,7 @@ glabel func_8008FA54 /* 0906B4 8008FAB4 00002025 */ move $a0, $zero /* 0906B8 8008FAB8 00002825 */ move $a1, $zero /* 0906BC 8008FABC 00003025 */ move $a2, $zero -/* 0906C0 8008FAC0 0C0310F3 */ jal set_text_background_color +/* 0906C0 8008FAC0 0C0310F3 */ jal set_text_background_colour /* 0906C4 8008FAC4 00003825 */ move $a3, $zero /* 0906C8 8008FAC8 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e /* 0906CC 8008FACC 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) @@ -71,7 +71,7 @@ glabel func_8008FA54 /* 090740 8008FB40 26210001 */ addiu $at, $s1, 1 /* 090744 8008FB44 00015043 */ sra $t2, $at, 1 .L8008FB48: -/* 090748 8008FB48 0C0310E1 */ jal set_text_color +/* 090748 8008FB48 0C0310E1 */ jal set_text_colour /* 09074C 8008FB4C AFAA0010 */ sw $t2, 0x10($sp) /* 090750 8008FB50 8FAB006C */ lw $t3, 0x6c($sp) /* 090754 8008FB54 3C138012 */ lui $s3, %hi(D_801263A0) # $s3, 0x8012 @@ -88,7 +88,7 @@ glabel func_8008FA54 /* 090780 8008FB80 240500FF */ li $a1, 255 /* 090784 8008FB84 240600FF */ li $a2, 255 /* 090788 8008FB88 00003825 */ move $a3, $zero -/* 09078C 8008FB8C 0C0310E1 */ jal set_text_color +/* 09078C 8008FB8C 0C0310E1 */ jal set_text_colour /* 090790 8008FB90 AFB10010 */ sw $s1, 0x10($sp) /* 090794 8008FB94 240D000C */ li $t5, 12 /* 090798 8008FB98 AFAD0010 */ sw $t5, 0x10($sp) @@ -108,7 +108,7 @@ glabel func_8008FA54 /* 0907CC 8008FBCC 240500FF */ li $a1, 255 /* 0907D0 8008FBD0 240600FF */ li $a2, 255 /* 0907D4 8008FBD4 00003825 */ move $a3, $zero -/* 0907D8 8008FBD8 0C0310E1 */ jal set_text_color +/* 0907D8 8008FBD8 0C0310E1 */ jal set_text_colour /* 0907DC 8008FBDC AFB10010 */ sw $s1, 0x10($sp) /* 0907E0 8008FBE0 8FAE006C */ lw $t6, 0x6c($sp) /* 0907E4 8008FBE4 8FA7008C */ lw $a3, 0x8c($sp) diff --git a/asm/non_matchings/menu/func_80092E94.s b/asm/non_matchings/menu/func_80092E94.s index c899695f..11fb5e04 100644 --- a/asm/non_matchings/menu/func_80092E94.s +++ b/asm/non_matchings/menu/func_80092E94.s @@ -58,14 +58,14 @@ glabel func_80092E94 /* 093B70 80092F70 00002025 */ move $a0, $zero /* 093B74 80092F74 00002825 */ move $a1, $zero /* 093B78 80092F78 00003025 */ move $a2, $zero -/* 093B7C 80092F7C 0C0310F3 */ jal set_text_background_color +/* 093B7C 80092F7C 0C0310F3 */ jal set_text_background_colour /* 093B80 80092F80 00003825 */ move $a3, $zero /* 093B84 80092F84 240C0080 */ li $t4, 128 /* 093B88 80092F88 AFAC0010 */ sw $t4, 0x10($sp) /* 093B8C 80092F8C 00002025 */ move $a0, $zero /* 093B90 80092F90 00002825 */ move $a1, $zero /* 093B94 80092F94 00003025 */ move $a2, $zero -/* 093B98 80092F98 0C0310E1 */ jal set_text_color +/* 093B98 80092F98 0C0310E1 */ jal set_text_colour /* 093B9C 80092F9C 240700FF */ li $a3, 255 /* 093BA0 80092FA0 240D000C */ li $t5, 12 /* 093BA4 80092FA4 AFAD0010 */ sw $t5, 0x10($sp) @@ -79,7 +79,7 @@ glabel func_80092E94 /* 093BC4 80092FC4 240400FF */ li $a0, 255 /* 093BC8 80092FC8 240500FF */ li $a1, 255 /* 093BCC 80092FCC 240600FF */ li $a2, 255 -/* 093BD0 80092FD0 0C0310E1 */ jal set_text_color +/* 093BD0 80092FD0 0C0310E1 */ jal set_text_colour /* 093BD4 80092FD4 00003825 */ move $a3, $zero /* 093BD8 80092FD8 240F000C */ li $t7, 12 /* 093BDC 80092FDC AFAF0010 */ sw $t7, 0x10($sp) @@ -128,7 +128,7 @@ glabel func_80092E94 /* 093C84 80093084 240400FF */ li $a0, 255 /* 093C88 80093088 24050040 */ li $a1, 64 /* 093C8C 8009308C 24060040 */ li $a2, 64 -/* 093C90 80093090 0C0310E1 */ jal set_text_color +/* 093C90 80093090 0C0310E1 */ jal set_text_colour /* 093C94 80093094 24070060 */ li $a3, 96 /* 093C98 80093098 3C0C800E */ lui $t4, %hi(gMenuText) # $t4, 0x800e /* 093C9C 8009309C 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4) @@ -157,7 +157,7 @@ glabel func_80092E94 /* 093CF8 800930F8 240400FF */ li $a0, 255 /* 093CFC 800930FC 24050080 */ li $a1, 128 /* 093D00 80093100 240600FF */ li $a2, 255 -/* 093D04 80093104 0C0310E1 */ jal set_text_color +/* 093D04 80093104 0C0310E1 */ jal set_text_colour /* 093D08 80093108 24070060 */ li $a3, 96 /* 093D0C 8009310C 3C098012 */ lui $t1, %hi(gPlayerSelectVehicle) # $t1, 0x8012 /* 093D10 80093110 812969C0 */ lb $t1, %lo(gPlayerSelectVehicle)($t1) @@ -404,14 +404,14 @@ glabel func_80092E94 /* 0940B8 800934B8 00002025 */ move $a0, $zero /* 0940BC 800934BC 00002825 */ move $a1, $zero /* 0940C0 800934C0 00003025 */ move $a2, $zero -/* 0940C4 800934C4 0C0310F3 */ jal set_text_background_color +/* 0940C4 800934C4 0C0310F3 */ jal set_text_background_colour /* 0940C8 800934C8 00003825 */ move $a3, $zero /* 0940CC 800934CC 240800FF */ li $t0, 255 /* 0940D0 800934D0 AFA80010 */ sw $t0, 0x10($sp) /* 0940D4 800934D4 240400FF */ li $a0, 255 /* 0940D8 800934D8 240500FF */ li $a1, 255 /* 0940DC 800934DC 240600FF */ li $a2, 255 -/* 0940E0 800934E0 0C0310E1 */ jal set_text_color +/* 0940E0 800934E0 0C0310E1 */ jal set_text_colour /* 0940E4 800934E4 00003825 */ move $a3, $zero /* 0940E8 800934E8 8FA60060 */ lw $a2, 0x60($sp) /* 0940EC 800934EC 3C07800F */ lui $a3, %hi(D_800E8240) # $a3, 0x800f @@ -430,14 +430,14 @@ glabel func_80092E94 /* 09411C 8009351C 00002025 */ move $a0, $zero /* 094120 80093520 00002825 */ move $a1, $zero /* 094124 80093524 00003025 */ move $a2, $zero -/* 094128 80093528 0C0310F3 */ jal set_text_background_color +/* 094128 80093528 0C0310F3 */ jal set_text_background_colour /* 09412C 8009352C 00003825 */ move $a3, $zero /* 094130 80093530 241800FF */ li $t8, 255 /* 094134 80093534 AFB80010 */ sw $t8, 0x10($sp) /* 094138 80093538 240400FF */ li $a0, 255 /* 09413C 8009353C 240500FF */ li $a1, 255 /* 094140 80093540 240600FF */ li $a2, 255 -/* 094144 80093544 0C0310E1 */ jal set_text_color +/* 094144 80093544 0C0310E1 */ jal set_text_colour /* 094148 80093548 00003825 */ move $a3, $zero /* 09414C 8009354C 8FB00060 */ lw $s0, 0x60($sp) /* 094150 80093550 00000000 */ nop diff --git a/asm/non_matchings/menu/func_80096978.s b/asm/non_matchings/menu/func_80096978.s index b3c0fd93..463af79c 100644 --- a/asm/non_matchings/menu/func_80096978.s +++ b/asm/non_matchings/menu/func_80096978.s @@ -66,14 +66,14 @@ glabel func_80096978 /* 09766C 80096A6C 00002025 */ move $a0, $zero /* 097670 80096A70 00002825 */ move $a1, $zero /* 097674 80096A74 00003025 */ move $a2, $zero -/* 097678 80096A78 0C0310F3 */ jal set_text_background_color +/* 097678 80096A78 0C0310F3 */ jal set_text_background_colour /* 09767C 80096A7C 00003825 */ move $a3, $zero /* 097680 80096A80 8E190000 */ lw $t9, ($s0) /* 097684 80096A84 240400FF */ li $a0, 255 /* 097688 80096A88 240500FF */ li $a1, 255 /* 09768C 80096A8C 240600FF */ li $a2, 255 /* 097690 80096A90 00003825 */ move $a3, $zero -/* 097694 80096A94 0C0310E1 */ jal set_text_color +/* 097694 80096A94 0C0310E1 */ jal set_text_colour /* 097698 80096A98 AFB90010 */ sw $t9, 0x10($sp) /* 09769C 80096A9C 3C08800E */ lui $t0, %hi(gMenuText) # $t0, 0x800e /* 0976A0 80096AA0 8D08F4A0 */ lw $t0, %lo(gMenuText)($t0) @@ -208,7 +208,7 @@ glabel func_80096978 /* 09788C 80096C8C 00002825 */ move $a1, $zero /* 097890 80096C90 00003025 */ move $a2, $zero /* 097894 80096C94 240700FF */ li $a3, 255 -/* 097898 80096C98 0C0310E1 */ jal set_text_color +/* 097898 80096C98 0C0310E1 */ jal set_text_colour /* 09789C 80096C9C 0000B025 */ move $s6, $zero /* 0978A0 80096CA0 8FAB0078 */ lw $t3, 0x78($sp) /* 0978A4 80096CA4 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -224,7 +224,7 @@ glabel func_80096978 /* 0978CC 80096CCC 240400FF */ li $a0, 255 /* 0978D0 80096CD0 240500FF */ li $a1, 255 /* 0978D4 80096CD4 240600C0 */ li $a2, 192 -/* 0978D8 80096CD8 0C0310E1 */ jal set_text_color +/* 0978D8 80096CD8 0C0310E1 */ jal set_text_colour /* 0978DC 80096CDC 24070060 */ li $a3, 96 /* 0978E0 80096CE0 8FAE0078 */ lw $t6, 0x78($sp) /* 0978E4 80096CE4 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 diff --git a/asm/non_matchings/menu/func_80097918.s b/asm/non_matchings/menu/func_80097918.s index 547a4587..d653a0ac 100644 --- a/asm/non_matchings/menu/func_80097918.s +++ b/asm/non_matchings/menu/func_80097918.s @@ -40,7 +40,7 @@ glabel func_80097918 /* 0985B0 800979B0 00002825 */ move $a1, $zero /* 0985B4 800979B4 00003025 */ move $a2, $zero /* 0985B8 800979B8 00003825 */ move $a3, $zero -/* 0985BC 800979BC 0C0310F3 */ jal set_text_background_color +/* 0985BC 800979BC 0C0310F3 */ jal set_text_background_colour /* 0985C0 800979C0 AFA2005C */ sw $v0, 0x5c($sp) /* 0985C4 800979C4 0C0310BB */ jal set_text_font /* 0985C8 800979C8 00002025 */ move $a0, $zero @@ -49,7 +49,7 @@ glabel func_80097918 /* 0985D4 800979D4 00002025 */ move $a0, $zero /* 0985D8 800979D8 00002825 */ move $a1, $zero /* 0985DC 800979DC 00003025 */ move $a2, $zero -/* 0985E0 800979E0 0C0310E1 */ jal set_text_color +/* 0985E0 800979E0 0C0310E1 */ jal set_text_colour /* 0985E4 800979E4 240700FF */ li $a3, 255 /* 0985E8 800979E8 3C11800E */ lui $s1, %hi(gMenuText) # $s1, 0x800e /* 0985EC 800979EC 2631F4A0 */ addiu $s1, %lo(gMenuText) # addiu $s1, $s1, -0xb60 @@ -71,7 +71,7 @@ glabel func_80097918 /* 09862C 80097A2C 240400FF */ li $a0, 255 /* 098630 80097A30 24050080 */ li $a1, 128 /* 098634 80097A34 240600FF */ li $a2, 255 -/* 098638 80097A38 0C0310E1 */ jal set_text_color +/* 098638 80097A38 0C0310E1 */ jal set_text_colour /* 09863C 80097A3C 24070060 */ li $a3, 96 /* 098640 80097A40 8E2D0000 */ lw $t5, ($s1) /* 098644 80097A44 8E060000 */ lw $a2, ($s0) @@ -132,12 +132,12 @@ glabel func_80097918 /* 098708 80097B08 240400FF */ li $a0, 255 /* 09870C 80097B0C 240500FF */ li $a1, 255 /* 098710 80097B10 240600FF */ li $a2, 255 -/* 098714 80097B14 0C0310E1 */ jal set_text_color +/* 098714 80097B14 0C0310E1 */ jal set_text_colour /* 098718 80097B18 00003825 */ move $a3, $zero /* 09871C 80097B1C 10000004 */ b .L80097B30 /* 098720 80097B20 2A01001C */ slti $at, $s0, 0x1c .L80097B24: -/* 098724 80097B24 0C0310E1 */ jal set_text_color +/* 098724 80097B24 0C0310E1 */ jal set_text_colour /* 098728 80097B28 AFA90010 */ sw $t1, 0x10($sp) /* 09872C 80097B2C 2A01001C */ slti $at, $s0, 0x1c .L80097B30: @@ -226,7 +226,7 @@ glabel func_80097918 /* 098860 80097C60 00002025 */ move $a0, $zero /* 098864 80097C64 00002825 */ move $a1, $zero /* 098868 80097C68 00003025 */ move $a2, $zero -/* 09886C 80097C6C 0C0310E1 */ jal set_text_color +/* 09886C 80097C6C 0C0310E1 */ jal set_text_colour /* 098870 80097C70 240700FF */ li $a3, 255 /* 098874 80097C74 3C11800E */ lui $s1, %hi(D_800E0F94) # $s1, 0x800e /* 098878 80097C78 3C12800E */ lui $s2, %hi(D_800E0F98) # $s2, 0x800e @@ -246,7 +246,7 @@ glabel func_80097918 /* 0988B0 80097CB0 240400FF */ li $a0, 255 /* 0988B4 80097CB4 240500FF */ li $a1, 255 /* 0988B8 80097CB8 240600FF */ li $a2, 255 -/* 0988BC 80097CBC 0C0310E1 */ jal set_text_color +/* 0988BC 80097CBC 0C0310E1 */ jal set_text_colour /* 0988C0 80097CC0 00003825 */ move $a3, $zero /* 0988C4 80097CC4 8E250000 */ lw $a1, ($s1) /* 0988C8 80097CC8 8E460000 */ lw $a2, ($s2) diff --git a/asm/non_matchings/menu/func_80099E8C.s b/asm/non_matchings/menu/func_80099E8C.s index d86ca3c8..7c2ab3d1 100644 --- a/asm/non_matchings/menu/func_80099E8C.s +++ b/asm/non_matchings/menu/func_80099E8C.s @@ -39,14 +39,14 @@ glabel func_80099E8C /* 09AB04 80099F04 00002025 */ move $a0, $zero /* 09AB08 80099F08 00002825 */ move $a1, $zero /* 09AB0C 80099F0C 00003025 */ move $a2, $zero -/* 09AB10 80099F10 0C0310F3 */ jal set_text_background_color +/* 09AB10 80099F10 0C0310F3 */ jal set_text_background_colour /* 09AB14 80099F14 00003825 */ move $a3, $zero /* 09AB18 80099F18 24190080 */ li $t9, 128 /* 09AB1C 80099F1C AFB90010 */ sw $t9, 0x10($sp) /* 09AB20 80099F20 00002025 */ move $a0, $zero /* 09AB24 80099F24 00002825 */ move $a1, $zero /* 09AB28 80099F28 00003025 */ move $a2, $zero -/* 09AB2C 80099F2C 0C0310E1 */ jal set_text_color +/* 09AB2C 80099F2C 0C0310E1 */ jal set_text_colour /* 09AB30 80099F30 240700FF */ li $a3, 255 /* 09AB34 80099F34 3C09800E */ lui $t1, %hi(gMenuText) # $t1, 0x800e /* 09AB38 80099F38 8D29F4A0 */ lw $t1, %lo(gMenuText)($t1) @@ -62,7 +62,7 @@ glabel func_80099E8C /* 09AB60 80099F60 240400FF */ li $a0, 255 /* 09AB64 80099F64 240500FF */ li $a1, 255 /* 09AB68 80099F68 240600FF */ li $a2, 255 -/* 09AB6C 80099F6C 0C0310E1 */ jal set_text_color +/* 09AB6C 80099F6C 0C0310E1 */ jal set_text_colour /* 09AB70 80099F70 00003825 */ move $a3, $zero /* 09AB74 80099F74 3C0C800E */ lui $t4, %hi(gMenuText) # $t4, 0x800e /* 09AB78 80099F78 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4) @@ -83,7 +83,7 @@ glabel func_80099E8C /* 09ABB4 80099FB4 240400FF */ li $a0, 255 /* 09ABB8 80099FB8 240500FF */ li $a1, 255 /* 09ABBC 80099FBC 240600FF */ li $a2, 255 -/* 09ABC0 80099FC0 0C0310E1 */ jal set_text_color +/* 09ABC0 80099FC0 0C0310E1 */ jal set_text_colour /* 09ABC4 80099FC4 00003825 */ move $a3, $zero /* 09ABC8 80099FC8 3C18800E */ lui $t8, %hi(gMenuText) # $t8, 0x800e /* 09ABCC 80099FCC 8F18F4A0 */ lw $t8, %lo(gMenuText)($t8) @@ -249,7 +249,7 @@ glabel func_80099E8C /* 09AE28 8009A228 00002025 */ move $a0, $zero /* 09AE2C 8009A22C 00002825 */ move $a1, $zero /* 09AE30 8009A230 00003025 */ move $a2, $zero -/* 09AE34 8009A234 0C0310E1 */ jal set_text_color +/* 09AE34 8009A234 0C0310E1 */ jal set_text_colour /* 09AE38 8009A238 240700FF */ li $a3, 255 /* 09AE3C 8009A23C 00105040 */ sll $t2, $s0, 1 .L8009A240: @@ -275,7 +275,7 @@ glabel func_80099E8C /* 09AE8C 8009A28C 240400C8 */ li $a0, 200 /* 09AE90 8009A290 240500E4 */ li $a1, 228 /* 09AE94 8009A294 24060050 */ li $a2, 80 -/* 09AE98 8009A298 0C0310E1 */ jal set_text_color +/* 09AE98 8009A298 0C0310E1 */ jal set_text_colour /* 09AE9C 8009A29C 240700FF */ li $a3, 255 /* 09AEA0 8009A2A0 86250000 */ lh $a1, ($s1) /* 09AEA4 8009A2A4 86290002 */ lh $t1, 2($s1) diff --git a/asm/non_matchings/menu/menu_character_select_loop.s b/asm/non_matchings/menu/menu_character_select_loop.s index 23dd58e1..90e0e6b8 100644 --- a/asm/non_matchings/menu/menu_character_select_loop.s +++ b/asm/non_matchings/menu/menu_character_select_loop.s @@ -114,7 +114,7 @@ glabel menu_character_select_loop /* 08CAC8 8008BEC8 24420001 */ addiu $v0, $v0, 1 /* 08CACC 8008BECC 1449FFF0 */ bne $v0, $t1, .L8008BE90 /* 08CAD0 8008BED0 24630001 */ addiu $v1, $v1, 1 -/* 08CAD4 8008BED4 0C022ECF */ jal randomize_ai_racer_slots +/* 08CAD4 8008BED4 0C022ECF */ jal randomise_ai_racer_slots /* 08CAD8 8008BED8 AFAB0024 */ sw $t3, 0x24($sp) /* 08CADC 8008BEDC 3C048012 */ lui $a0, %hi(gActivePlayersArray) # $a0, 0x8012 /* 08CAE0 8008BEE0 0C01A916 */ jal assign_player_ids diff --git a/asm/non_matchings/menu/randomize_ai_racer_slots.s b/asm/non_matchings/menu/randomise_ai_racer_slots.s similarity index 99% rename from asm/non_matchings/menu/randomize_ai_racer_slots.s rename to asm/non_matchings/menu/randomise_ai_racer_slots.s index db9e1802..2a486db6 100644 --- a/asm/non_matchings/menu/randomize_ai_racer_slots.s +++ b/asm/non_matchings/menu/randomise_ai_racer_slots.s @@ -1,4 +1,4 @@ -glabel randomize_ai_racer_slots +glabel randomise_ai_racer_slots /* 08C73C 8008BB3C 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 08C740 8008BB40 AFBF0034 */ sw $ra, 0x34($sp) /* 08C744 8008BB44 AFB60030 */ sw $s6, 0x30($sp) diff --git a/asm/non_matchings/menu/render_file_select_menu.s b/asm/non_matchings/menu/render_file_select_menu.s index 90bc01d5..43a4173d 100644 --- a/asm/non_matchings/menu/render_file_select_menu.s +++ b/asm/non_matchings/menu/render_file_select_menu.s @@ -84,7 +84,7 @@ glabel render_file_select_menu /* 08DAA8 8008CEA8 00002025 */ move $a0, $zero /* 08DAAC 8008CEAC 00002825 */ move $a1, $zero /* 08DAB0 8008CEB0 00003025 */ move $a2, $zero -/* 08DAB4 8008CEB4 0C0310F3 */ jal set_text_background_color +/* 08DAB4 8008CEB4 0C0310F3 */ jal set_text_background_colour /* 08DAB8 8008CEB8 00003825 */ move $a3, $zero /* 08DABC 8008CEBC 3C118012 */ lui $s1, %hi(gSavefileInfo) # $s1, 0x8012 /* 08DAC0 8008CEC0 3C10800E */ lui $s0, %hi(D_800E03CC) # $s0, 0x800e @@ -215,7 +215,7 @@ glabel render_file_select_menu /* 08DC98 8008D098 240D00FF */ li $t5, 255 /* 08DC9C 8008D09C AFAD0010 */ sw $t5, 0x10($sp) /* 08DCA0 8008D0A0 240600FF */ li $a2, 255 -/* 08DCA4 8008D0A4 0C0310E1 */ jal set_text_color +/* 08DCA4 8008D0A4 0C0310E1 */ jal set_text_colour /* 08DCA8 8008D0A8 24070040 */ li $a3, 64 /* 08DCAC 8008D0AC 3C09800E */ lui $t1, %hi(gMenuText) # $t1, 0x800e /* 08DCB0 8008D0B0 8D29F4A0 */ lw $t1, %lo(gMenuText)($t1) @@ -255,14 +255,14 @@ glabel render_file_select_menu /* 08DD2C 8008D12C 00002025 */ move $a0, $zero /* 08DD30 8008D130 00002825 */ move $a1, $zero /* 08DD34 8008D134 00003025 */ move $a2, $zero -/* 08DD38 8008D138 0C0310F3 */ jal set_text_background_color +/* 08DD38 8008D138 0C0310F3 */ jal set_text_background_colour /* 08DD3C 8008D13C 00003825 */ move $a3, $zero /* 08DD40 8008D140 240E00FF */ li $t6, 255 /* 08DD44 8008D144 AFAE0010 */ sw $t6, 0x10($sp) /* 08DD48 8008D148 240400FF */ li $a0, 255 /* 08DD4C 8008D14C 240500FF */ li $a1, 255 /* 08DD50 8008D150 240600FF */ li $a2, 255 -/* 08DD54 8008D154 0C0310E1 */ jal set_text_color +/* 08DD54 8008D154 0C0310E1 */ jal set_text_colour /* 08DD58 8008D158 00003825 */ move $a3, $zero /* 08DD5C 8008D15C 00009825 */ move $s3, $zero /* 08DD60 8008D160 27B50064 */ addiu $s5, $sp, 0x64 @@ -395,7 +395,7 @@ glabel render_file_select_menu /* 08DF38 8008D338 00002025 */ move $a0, $zero /* 08DF3C 8008D33C 00002825 */ move $a1, $zero /* 08DF40 8008D340 00003025 */ move $a2, $zero -/* 08DF44 8008D344 0C0310E1 */ jal set_text_color +/* 08DF44 8008D344 0C0310E1 */ jal set_text_colour /* 08DF48 8008D348 240700FF */ li $a3, 255 /* 08DF4C 8008D34C 3C0E800E */ lui $t6, %hi(gMenuText) # $t6, 0x800e /* 08DF50 8008D350 8DCEF4A0 */ lw $t6, %lo(gMenuText)($t6) @@ -411,7 +411,7 @@ glabel render_file_select_menu /* 08DF78 8008D378 240400FF */ li $a0, 255 /* 08DF7C 8008D37C 240500FF */ li $a1, 255 /* 08DF80 8008D380 240600FF */ li $a2, 255 -/* 08DF84 8008D384 0C0310E1 */ jal set_text_color +/* 08DF84 8008D384 0C0310E1 */ jal set_text_colour /* 08DF88 8008D388 00003825 */ move $a3, $zero /* 08DF8C 8008D38C 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e /* 08DF90 8008D390 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9) @@ -427,7 +427,7 @@ glabel render_file_select_menu /* 08DFB8 8008D3B8 240400FF */ li $a0, 255 /* 08DFBC 8008D3BC 240500FF */ li $a1, 255 /* 08DFC0 8008D3C0 240600FF */ li $a2, 255 -/* 08DFC4 8008D3C4 0C0310E1 */ jal set_text_color +/* 08DFC4 8008D3C4 0C0310E1 */ jal set_text_colour /* 08DFC8 8008D3C8 00003825 */ move $a3, $zero /* 08DFCC 8008D3CC 3C0A8012 */ lui $t2, %hi(D_80126484) # $t2, 0x8012 /* 08DFD0 8008D3D0 8D4A6484 */ lw $t2, %lo(D_80126484)($t2) @@ -522,7 +522,7 @@ glabel render_file_select_menu /* 08E120 8008D520 240D00FF */ li $t5, 255 /* 08E124 8008D524 AFAD0010 */ sw $t5, 0x10($sp) /* 08E128 8008D528 240500FF */ li $a1, 255 -/* 08E12C 8008D52C 0C0310E1 */ jal set_text_color +/* 08E12C 8008D52C 0C0310E1 */ jal set_text_colour /* 08E130 8008D530 240600FF */ li $a2, 255 .L8008D534: /* 08E134 8008D534 3C0E800E */ lui $t6, %hi(gMenuText) # $t6, 0x800e @@ -544,7 +544,7 @@ glabel render_file_select_menu /* 08E174 8008D574 AFB90010 */ sw $t9, 0x10($sp) /* 08E178 8008D578 240400FF */ li $a0, 255 /* 08E17C 8008D57C 240500FF */ li $a1, 255 -/* 08E180 8008D580 0C0310E1 */ jal set_text_color +/* 08E180 8008D580 0C0310E1 */ jal set_text_colour /* 08E184 8008D584 240600FF */ li $a2, 255 /* 08E188 8008D588 10000007 */ b .L8008D5A8 /* 08E18C 8008D58C 00000000 */ nop @@ -553,7 +553,7 @@ glabel render_file_select_menu /* 08E194 8008D594 AFA80010 */ sw $t0, 0x10($sp) /* 08E198 8008D598 240500FF */ li $a1, 255 /* 08E19C 8008D59C 240600FF */ li $a2, 255 -/* 08E1A0 8008D5A0 0C0310E1 */ jal set_text_color +/* 08E1A0 8008D5A0 0C0310E1 */ jal set_text_colour /* 08E1A4 8008D5A4 00003825 */ move $a3, $zero .L8008D5A8: /* 08E1A8 8008D5A8 3C09800E */ lui $t1, %hi(gMenuText) # $t1, 0x800e diff --git a/asm/non_matchings/menu/render_magic_codes_list_menu_text.s b/asm/non_matchings/menu/render_magic_codes_list_menu_text.s index c8439aae..7f755f03 100644 --- a/asm/non_matchings/menu/render_magic_codes_list_menu_text.s +++ b/asm/non_matchings/menu/render_magic_codes_list_menu_text.s @@ -14,7 +14,7 @@ glabel render_magic_codes_list_menu_text /* 08B19C 8008A59C 00002025 */ move $a0, $zero /* 08B1A0 8008A5A0 00002825 */ move $a1, $zero /* 08B1A4 8008A5A4 00003025 */ move $a2, $zero -/* 08B1A8 8008A5A8 0C0310F3 */ jal set_text_background_color +/* 08B1A8 8008A5A8 0C0310F3 */ jal set_text_background_colour /* 08B1AC 8008A5AC 00003825 */ move $a3, $zero /* 08B1B0 8008A5B0 0C0310BB */ jal set_text_font /* 08B1B4 8008A5B4 24040002 */ li $a0, 2 @@ -23,7 +23,7 @@ glabel render_magic_codes_list_menu_text /* 08B1C0 8008A5C0 00002025 */ move $a0, $zero /* 08B1C4 8008A5C4 00002825 */ move $a1, $zero /* 08B1C8 8008A5C8 00003025 */ move $a2, $zero -/* 08B1CC 8008A5CC 0C0310E1 */ jal set_text_color +/* 08B1CC 8008A5CC 0C0310E1 */ jal set_text_colour /* 08B1D0 8008A5D0 240700FF */ li $a3, 255 /* 08B1D4 8008A5D4 3C17800E */ lui $s7, %hi(gMenuText) # $s7, 0x800e /* 08B1D8 8008A5D8 26F7F4A0 */ addiu $s7, %lo(gMenuText) # addiu $s7, $s7, -0xb60 @@ -42,7 +42,7 @@ glabel render_magic_codes_list_menu_text /* 08B20C 8008A60C 240400FF */ li $a0, 255 /* 08B210 8008A610 240500FF */ li $a1, 255 /* 08B214 8008A614 240600FF */ li $a2, 255 -/* 08B218 8008A618 0C0310E1 */ jal set_text_color +/* 08B218 8008A618 0C0310E1 */ jal set_text_colour /* 08B21C 8008A61C 00003825 */ move $a3, $zero /* 08B220 8008A620 8EE80000 */ lw $t0, ($s7) /* 08B224 8008A624 2409000C */ li $t1, 12 @@ -89,7 +89,7 @@ glabel render_magic_codes_list_menu_text /* 08B2BC 8008A6BC 240400FF */ li $a0, 255 /* 08B2C0 8008A6C0 240500FF */ li $a1, 255 /* 08B2C4 8008A6C4 240600FF */ li $a2, 255 -/* 08B2C8 8008A6C8 0C0310E1 */ jal set_text_color +/* 08B2C8 8008A6C8 0C0310E1 */ jal set_text_colour /* 08B2CC 8008A6CC 00003825 */ move $a3, $zero /* 08B2D0 8008A6D0 3C038012 */ lui $v1, %hi(D_801263E0) # $v1, 0x8012 /* 08B2D4 8008A6D4 3C198012 */ lui $t9, %hi(D_80126C70) # $t9, 0x8012 @@ -118,7 +118,7 @@ glabel render_magic_codes_list_menu_text /* 08B32C 8008A72C 240B00FF */ li $t3, 255 /* 08B330 8008A730 AFAB0010 */ sw $t3, 0x10($sp) /* 08B334 8008A734 240600FF */ li $a2, 255 -/* 08B338 8008A738 0C0310E1 */ jal set_text_color +/* 08B338 8008A738 0C0310E1 */ jal set_text_colour /* 08B33C 8008A73C 03C03825 */ move $a3, $fp .L8008A740: /* 08B340 8008A740 862D0000 */ lh $t5, ($s1) @@ -165,7 +165,7 @@ glabel render_magic_codes_list_menu_text /* 08B3DC 8008A7DC 241800FF */ li $t8, 255 /* 08B3E0 8008A7E0 AFB80010 */ sw $t8, 0x10($sp) /* 08B3E4 8008A7E4 240600FF */ li $a2, 255 -/* 08B3E8 8008A7E8 0C0310E1 */ jal set_text_color +/* 08B3E8 8008A7E8 0C0310E1 */ jal set_text_colour /* 08B3EC 8008A7EC 00003825 */ move $a3, $zero .L8008A7F0: /* 08B3F0 8008A7F0 3C198012 */ lui $t9, %hi(D_801263E0) # $t9, 0x8012 @@ -193,7 +193,7 @@ glabel render_magic_codes_list_menu_text /* 08B444 8008A844 240A00FF */ li $t2, 255 /* 08B448 8008A848 AFAA0010 */ sw $t2, 0x10($sp) /* 08B44C 8008A84C 240600FF */ li $a2, 255 -/* 08B450 8008A850 0C0310E1 */ jal set_text_color +/* 08B450 8008A850 0C0310E1 */ jal set_text_colour /* 08B454 8008A854 03C03825 */ move $a3, $fp .L8008A858: /* 08B458 8008A858 8EEB0000 */ lw $t3, ($s7) diff --git a/asm/non_matchings/menu/render_magic_codes_ui.s b/asm/non_matchings/menu/render_magic_codes_ui.s index 40be4168..d47062c7 100644 --- a/asm/non_matchings/menu/render_magic_codes_ui.s +++ b/asm/non_matchings/menu/render_magic_codes_ui.s @@ -14,7 +14,7 @@ glabel render_magic_codes_ui /* 08A2D4 800896D4 00002025 */ move $a0, $zero /* 08A2D8 800896D8 00002825 */ move $a1, $zero /* 08A2DC 800896DC 00003025 */ move $a2, $zero -/* 08A2E0 800896E0 0C0310F3 */ jal set_text_background_color +/* 08A2E0 800896E0 0C0310F3 */ jal set_text_background_colour /* 08A2E4 800896E4 00003825 */ move $a3, $zero /* 08A2E8 800896E8 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 08A2EC 800896EC 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 @@ -29,7 +29,7 @@ glabel render_magic_codes_ui /* 08A310 80089710 00002025 */ move $a0, $zero /* 08A314 80089714 00002825 */ move $a1, $zero /* 08A318 80089718 00003025 */ move $a2, $zero -/* 08A31C 8008971C 0C0310E1 */ jal set_text_color +/* 08A31C 8008971C 0C0310E1 */ jal set_text_colour /* 08A320 80089720 240700FF */ li $a3, 255 /* 08A324 80089724 3C0F800E */ lui $t7, %hi(gMenuText) # $t7, 0x800e /* 08A328 80089728 8DEFF4A0 */ lw $t7, %lo(gMenuText)($t7) @@ -46,7 +46,7 @@ glabel render_magic_codes_ui /* 08A354 80089754 240400FF */ li $a0, 255 /* 08A358 80089758 240500FF */ li $a1, 255 /* 08A35C 8008975C 240600FF */ li $a2, 255 -/* 08A360 80089760 0C0310E1 */ jal set_text_color +/* 08A360 80089760 0C0310E1 */ jal set_text_colour /* 08A364 80089764 00003825 */ move $a3, $zero /* 08A368 80089768 3C09800E */ lui $t1, %hi(gMenuText) # $t1, 0x800e /* 08A36C 8008976C 8D29F4A0 */ lw $t1, %lo(gMenuText)($t1) @@ -66,7 +66,7 @@ glabel render_magic_codes_ui /* 08A3A4 800897A4 240400FF */ li $a0, 255 /* 08A3A8 800897A8 240500FF */ li $a1, 255 /* 08A3AC 800897AC 240600FF */ li $a2, 255 -/* 08A3B0 800897B0 0C0310E1 */ jal set_text_color +/* 08A3B0 800897B0 0C0310E1 */ jal set_text_colour /* 08A3B4 800897B4 00003825 */ move $a3, $zero /* 08A3B8 800897B8 3C168012 */ lui $s6, %hi(gCheatInputCurrentRow) # $s6, 0x8012 /* 08A3BC 800897BC 3C158012 */ lui $s5, %hi(gCheatInputCurrentColumn) # $s5, 0x8012 @@ -105,7 +105,7 @@ glabel render_magic_codes_ui /* 08A434 80089834 240900FF */ li $t1, 255 /* 08A438 80089838 27270080 */ addiu $a3, $t9, 0x80 /* 08A43C 8008983C AFA90010 */ sw $t1, 0x10($sp) -/* 08A440 80089840 0C0310E1 */ jal set_text_color +/* 08A440 80089840 0C0310E1 */ jal set_text_colour /* 08A444 80089844 240600C0 */ li $a2, 192 .L80089848: /* 08A448 80089848 2A61005B */ slti $at, $s3, 0x5b @@ -163,7 +163,7 @@ glabel render_magic_codes_ui /* 08A508 80089908 241800FF */ li $t8, 255 /* 08A50C 8008990C AFB80010 */ sw $t8, 0x10($sp) /* 08A510 80089910 240600FF */ li $a2, 255 -/* 08A514 80089914 0C0310E1 */ jal set_text_color +/* 08A514 80089914 0C0310E1 */ jal set_text_colour /* 08A518 80089918 00003825 */ move $a3, $zero .L8008991C: /* 08A51C 8008991C 26730001 */ addiu $s3, $s3, 1 @@ -224,7 +224,7 @@ glabel render_magic_codes_ui /* 08A5E4 800899E4 AFB90010 */ sw $t9, 0x10($sp) /* 08A5E8 800899E8 240500FF */ li $a1, 255 /* 08A5EC 800899EC 240600FF */ li $a2, 255 -/* 08A5F0 800899F0 0C0310E1 */ jal set_text_color +/* 08A5F0 800899F0 0C0310E1 */ jal set_text_colour /* 08A5F4 800899F4 02003825 */ move $a3, $s0 /* 08A5F8 800899F8 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 08A5FC 800899FC 8E270000 */ lw $a3, ($s1) @@ -249,12 +249,12 @@ glabel render_magic_codes_ui /* 08A644 80089A44 240400FF */ li $a0, 255 /* 08A648 80089A48 240500FF */ li $a1, 255 /* 08A64C 80089A4C 24060080 */ li $a2, 128 -/* 08A650 80089A50 0C0310E1 */ jal set_text_color +/* 08A650 80089A50 0C0310E1 */ jal set_text_colour /* 08A654 80089A54 24070080 */ li $a3, 128 /* 08A658 80089A58 00002025 */ move $a0, $zero /* 08A65C 80089A5C 00002825 */ move $a1, $zero /* 08A660 80089A60 24060080 */ li $a2, 128 -/* 08A664 80089A64 0C0310F3 */ jal set_text_background_color +/* 08A664 80089A64 0C0310F3 */ jal set_text_background_colour /* 08A668 80089A68 24070080 */ li $a3, 128 /* 08A66C 80089A6C 3C028012 */ lui $v0, %hi(gOptionsMenuItemIndex) # $v0, 0x8012 /* 08A670 80089A70 84426C46 */ lh $v0, %lo(gOptionsMenuItemIndex)($v0) diff --git a/asm/non_matchings/menu/render_track_select_setup_ui.s b/asm/non_matchings/menu/render_track_select_setup_ui.s index 430154f4..f2ef20ad 100644 --- a/asm/non_matchings/menu/render_track_select_setup_ui.s +++ b/asm/non_matchings/menu/render_track_select_setup_ui.s @@ -144,12 +144,12 @@ glabel render_track_select_setup_ui /* 091D2C 8009112C 240500C0 */ li $a1, 192 /* 091D30 80091130 240600FF */ li $a2, 255 /* 091D34 80091134 00003825 */ move $a3, $zero -/* 091D38 80091138 0C0310E1 */ jal set_text_color +/* 091D38 80091138 0C0310E1 */ jal set_text_colour /* 091D3C 8009113C AFAB0010 */ sw $t3, 0x10($sp) /* 091D40 80091140 00002025 */ move $a0, $zero /* 091D44 80091144 00002825 */ move $a1, $zero /* 091D48 80091148 00003025 */ move $a2, $zero -/* 091D4C 8009114C 0C0310F3 */ jal set_text_background_color +/* 091D4C 8009114C 0C0310F3 */ jal set_text_background_colour /* 091D50 80091150 00003825 */ move $a3, $zero /* 091D54 80091154 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 091D58 80091158 240C000C */ li $t4, 12 @@ -267,7 +267,7 @@ glabel render_track_select_setup_ui /* 091EFC 800912FC AFAC0010 */ sw $t4, 0x10($sp) /* 091F00 80091300 00002825 */ move $a1, $zero /* 091F04 80091304 00003025 */ move $a2, $zero -/* 091F08 80091308 0C0310E1 */ jal set_text_color +/* 091F08 80091308 0C0310E1 */ jal set_text_colour /* 091F0C 8009130C 240700FF */ li $a3, 255 /* 091F10 80091310 1000000C */ b .L80091344 /* 091F14 80091314 00000000 */ nop @@ -282,7 +282,7 @@ glabel render_track_select_setup_ui /* 091F30 80091330 8FCE0000 */ lw $t6, ($fp) /* 091F34 80091334 240600FF */ li $a2, 255 /* 091F38 80091338 02A03825 */ move $a3, $s5 -/* 091F3C 8009133C 0C0310E1 */ jal set_text_color +/* 091F3C 8009133C 0C0310E1 */ jal set_text_colour /* 091F40 80091340 AFAE0010 */ sw $t6, 0x10($sp) .L80091344: /* 091F44 80091344 3C0F800E */ lui $t7, %hi(gMenuText) # $t7, 0x800e @@ -319,7 +319,7 @@ glabel render_track_select_setup_ui /* 091FBC 800913BC 24050040 */ li $a1, 64 /* 091FC0 800913C0 24060040 */ li $a2, 64 /* 091FC4 800913C4 24070060 */ li $a3, 96 -/* 091FC8 800913C8 0C0310E1 */ jal set_text_color +/* 091FC8 800913C8 0C0310E1 */ jal set_text_colour /* 091FCC 800913CC AFAA0010 */ sw $t2, 0x10($sp) /* 091FD0 800913D0 3C09800E */ lui $t1, %hi(gMenuText) # $t1, 0x800e /* 091FD4 800913D4 8D29F4A0 */ lw $t1, %lo(gMenuText)($t1) @@ -350,7 +350,7 @@ glabel render_track_select_setup_ui /* 092038 80091438 24050080 */ li $a1, 128 /* 09203C 8009143C 240600FF */ li $a2, 255 /* 092040 80091440 24070060 */ li $a3, 96 -/* 092044 80091444 0C0310E1 */ jal set_text_color +/* 092044 80091444 0C0310E1 */ jal set_text_colour /* 092048 80091448 AFAE0010 */ sw $t6, 0x10($sp) /* 09204C 8009144C 3C188012 */ lui $t8, %hi(gPlayerSelectVehicle) # $t8, 0x8012 /* 092050 80091450 831869C0 */ lb $t8, %lo(gPlayerSelectVehicle)($t8) @@ -964,7 +964,7 @@ glabel render_track_select_setup_ui /* 092950 80091D50 00002025 */ move $a0, $zero /* 092954 80091D54 00002825 */ move $a1, $zero /* 092958 80091D58 00003025 */ move $a2, $zero -/* 09295C 80091D5C 0C0310E1 */ jal set_text_color +/* 09295C 80091D5C 0C0310E1 */ jal set_text_colour /* 092960 80091D60 240700FF */ li $a3, 255 /* 092964 80091D64 864F000E */ lh $t7, 0xe($s2) /* 092968 80091D68 864E0002 */ lh $t6, 2($s2) @@ -989,7 +989,7 @@ glabel render_track_select_setup_ui /* 0929B4 80091DB4 240400FF */ li $a0, 255 /* 0929B8 80091DB8 240500FF */ li $a1, 255 /* 0929BC 80091DBC 240600FF */ li $a2, 255 -/* 0929C0 80091DC0 0C0310E1 */ jal set_text_color +/* 0929C0 80091DC0 0C0310E1 */ jal set_text_colour /* 0929C4 80091DC4 00003825 */ move $a3, $zero /* 0929C8 80091DC8 8658000E */ lh $t8, 0xe($s2) /* 0929CC 80091DCC 864F0002 */ lh $t7, 2($s2) @@ -1212,7 +1212,7 @@ glabel render_track_select_setup_ui /* 092CF4 800920F4 240500FF */ li $a1, 255 /* 092CF8 800920F8 240600FF */ li $a2, 255 /* 092CFC 800920FC 00003825 */ move $a3, $zero -/* 092D00 80092100 0C0310E1 */ jal set_text_color +/* 092D00 80092100 0C0310E1 */ jal set_text_colour /* 092D04 80092104 AFAA0010 */ sw $t2, 0x10($sp) /* 092D08 80092108 3C088012 */ lui $t0, %hi(D_801269C8) # $t0, 0x8012 /* 092D0C 8009210C 8D0869C8 */ lw $t0, %lo(D_801269C8)($t0) diff --git a/asm/non_matchings/menu/tt_menu_loop.s b/asm/non_matchings/menu/tt_menu_loop.s index 69a093d5..14899740 100644 --- a/asm/non_matchings/menu/tt_menu_loop.s +++ b/asm/non_matchings/menu/tt_menu_loop.s @@ -68,10 +68,10 @@ glabel tt_menu_loop /* 09E814 8009DC14 3C018012 */ lui $at, %hi(sDialogueOptionMax) # $at, 0x8012 /* 09E818 8009DC18 A0206504 */ sb $zero, %lo(sDialogueOptionMax)($at) /* 09E81C 8009DC1C 3C088012 */ lui $t0, %hi(sCurrentMenuID) # $t0, 0x8012 -/* 09E820 8009DC20 3C018012 */ lui $at, %hi(gDialogOptionYOffset) # $at, 0x8012 +/* 09E820 8009DC20 3C018012 */ lui $at, %hi(gDialogueOptionYOffset) # $at, 0x8012 /* 09E824 8009DC24 240E0020 */ li $t6, 32 /* 09E828 8009DC28 250864E2 */ addiu $t0, %lo(sCurrentMenuID) # addiu $t0, $t0, 0x64e2 -/* 09E82C 8009DC2C A02E650E */ sb $t6, %lo(gDialogOptionYOffset)($at) +/* 09E82C 8009DC2C A02E650E */ sb $t6, %lo(gDialogueOptionYOffset)($at) /* 09E830 8009DC30 81030000 */ lb $v1, ($t0) /* 09E834 8009DC34 00402025 */ move $a0, $v0 /* 09E838 8009DC38 2C61000B */ sltiu $at, $v1, 0xb diff --git a/asm/non_matchings/particles/func_800AF1E0.s b/asm/non_matchings/particles/func_800AF1E0.s index 60a98f1c..1ef4d1f0 100644 --- a/asm/non_matchings/particles/func_800AF1E0.s +++ b/asm/non_matchings/particles/func_800AF1E0.s @@ -1,12 +1,12 @@ glabel func_800AF1E0 -/* 0AFDE0 800AF1E0 3C0E800E */ lui $t6, %hi(gParticleBehaviorsAssetTableCount) # $t6, 0x800e -/* 0AFDE4 800AF1E4 8DCE2CF4 */ lw $t6, %lo(gParticleBehaviorsAssetTableCount)($t6) +/* 0AFDE0 800AF1E0 3C0E800E */ lui $t6, %hi(gParticleBehavioursAssetTableCount) # $t6, 0x800e +/* 0AFDE4 800AF1E4 8DCE2CF4 */ lw $t6, %lo(gParticleBehavioursAssetTableCount)($t6) /* 0AFDE8 800AF1E8 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 0AFDEC 800AF1EC 00AE082A */ slt $at, $a1, $t6 /* 0AFDF0 800AF1F0 10200026 */ beqz $at, .L800AF28C /* 0AFDF4 800AF1F4 AFBF001C */ sw $ra, 0x1c($sp) -/* 0AFDF8 800AF1F8 3C0F800E */ lui $t7, %hi(gParticleBehaviorsAssetTable) # $t7, 0x800e -/* 0AFDFC 800AF1FC 8DEF2CFC */ lw $t7, %lo(gParticleBehaviorsAssetTable)($t7) +/* 0AFDF8 800AF1F8 3C0F800E */ lui $t7, %hi(gParticleBehavioursAssetTable) # $t7, 0x800e +/* 0AFDFC 800AF1FC 8DEF2CFC */ lw $t7, %lo(gParticleBehavioursAssetTable)($t7) /* 0AFE00 800AF200 4448F800 */ cfc1 $t0, $31 /* 0AFE04 800AF204 0005C080 */ sll $t8, $a1, 2 /* 0AFE08 800AF208 01F8C821 */ addu $t9, $t7, $t8 diff --git a/asm/non_matchings/particles/init_particle_assets.s b/asm/non_matchings/particles/init_particle_assets.s index 0badad9a..825c1820 100644 --- a/asm/non_matchings/particles/init_particle_assets.s +++ b/asm/non_matchings/particles/init_particle_assets.s @@ -62,10 +62,10 @@ glabel init_particle_assets /* 0AF210 800AE610 0C01DB16 */ jal load_asset_section_from_rom /* 0AF214 800AE614 2404002A */ li $a0, 42 /* 0AF218 800AE618 2406FFFF */ li $a2, -1 -/* 0AF21C 800AE61C 3C12800E */ lui $s2, %hi(gParticleBehaviorsAssetTableCount) # $s2, 0x800e -/* 0AF220 800AE620 3C13800E */ lui $s3, %hi(gParticleBehaviorsAssetTable) # $s3, 0x800e -/* 0AF224 800AE624 26732CFC */ addiu $s3, %lo(gParticleBehaviorsAssetTable) # addiu $s3, $s3, 0x2cfc -/* 0AF228 800AE628 26522CF4 */ addiu $s2, %lo(gParticleBehaviorsAssetTableCount) # addiu $s2, $s2, 0x2cf4 +/* 0AF21C 800AE61C 3C12800E */ lui $s2, %hi(gParticleBehavioursAssetTableCount) # $s2, 0x800e +/* 0AF220 800AE620 3C13800E */ lui $s3, %hi(gParticleBehavioursAssetTable) # $s3, 0x800e +/* 0AF224 800AE624 26732CFC */ addiu $s3, %lo(gParticleBehavioursAssetTable) # addiu $s3, $s3, 0x2cfc +/* 0AF228 800AE628 26522CF4 */ addiu $s2, %lo(gParticleBehavioursAssetTableCount) # addiu $s2, $s2, 0x2cf4 /* 0AF22C 800AE62C 0006C880 */ sll $t9, $a2, 2 /* 0AF230 800AE630 AE620000 */ sw $v0, ($s3) /* 0AF234 800AE634 AE460000 */ sw $a2, ($s2) @@ -87,8 +87,8 @@ glabel init_particle_assets /* 0AF26C 800AE66C 0C01DB16 */ jal load_asset_section_from_rom /* 0AF270 800AE670 2404002B */ li $a0, 43 /* 0AF274 800AE674 8E4E0000 */ lw $t6, ($s2) -/* 0AF278 800AE678 3C15800E */ lui $s5, %hi(gParticleBehaviorsAssets) # $s5, 0x800e -/* 0AF27C 800AE67C 26B52CF8 */ addiu $s5, %lo(gParticleBehaviorsAssets) # addiu $s5, $s5, 0x2cf8 +/* 0AF278 800AE678 3C15800E */ lui $s5, %hi(gParticleBehavioursAssets) # $s5, 0x800e +/* 0AF27C 800AE67C 26B52CF8 */ addiu $s5, %lo(gParticleBehavioursAssets) # addiu $s5, $s5, 0x2cf8 /* 0AF280 800AE680 19C00020 */ blez $t6, .L800AE704 /* 0AF284 800AE684 AEA20000 */ sw $v0, ($s5) /* 0AF288 800AE688 00008025 */ move $s0, $zero diff --git a/asm/non_matchings/printf/func_800B3E64.s b/asm/non_matchings/printf/func_800B3E64.s index 048977fb..3995cd5c 100644 --- a/asm/non_matchings/printf/func_800B3E64.s +++ b/asm/non_matchings/printf/func_800B3E64.s @@ -467,13 +467,13 @@ glabel func_800B3E64 /* 0B5170 800B4570 03E00008 */ jr $ra /* 0B5174 800B4574 00000000 */ nop -/* 0B5178 800B4578 3C03800E */ lui $v1, %hi(gParticleBehaviorsAssetTableCount) # $v1, 0x800e -/* 0B517C 800B457C 8C632CF4 */ lw $v1, %lo(gParticleBehaviorsAssetTableCount)($v1) -/* 0B5180 800B4580 3C0E800E */ lui $t6, %hi(gParticleBehaviorsAssetTable) # $t6, 0x800e +/* 0B5178 800B4578 3C03800E */ lui $v1, %hi(gParticleBehavioursAssetTableCount) # $v1, 0x800e +/* 0B517C 800B457C 8C632CF4 */ lw $v1, %lo(gParticleBehavioursAssetTableCount)($v1) +/* 0B5180 800B4580 3C0E800E */ lui $t6, %hi(gParticleBehavioursAssetTable) # $t6, 0x800e /* 0B5184 800B4584 0083082A */ slt $at, $a0, $v1 /* 0B5188 800B4588 10200007 */ beqz $at, .L800B45A8 -/* 0B518C 800B458C 3C19800E */ lui $t9, %hi(gParticleBehaviorsAssetTable) # $t9, 0x800e -/* 0B5190 800B4590 8DCE2CFC */ lw $t6, %lo(gParticleBehaviorsAssetTable)($t6) +/* 0B518C 800B458C 3C19800E */ lui $t9, %hi(gParticleBehavioursAssetTable) # $t9, 0x800e +/* 0B5190 800B4590 8DCE2CFC */ lw $t6, %lo(gParticleBehavioursAssetTable)($t6) /* 0B5194 800B4594 00047880 */ sll $t7, $a0, 2 /* 0B5198 800B4598 01CFC021 */ addu $t8, $t6, $t7 /* 0B519C 800B459C 8F020000 */ lw $v0, ($t8) @@ -481,7 +481,7 @@ glabel func_800B3E64 /* 0B51A4 800B45A4 00000000 */ nop .L800B45A8: -/* 0B51A8 800B45A8 8F392CFC */ lw $t9, %lo(gParticleBehaviorsAssetTable)($t9) +/* 0B51A8 800B45A8 8F392CFC */ lw $t9, %lo(gParticleBehavioursAssetTable)($t9) /* 0B51AC 800B45AC 00034080 */ sll $t0, $v1, 2 /* 0B51B0 800B45B0 03284821 */ addu $t1, $t9, $t0 /* 0B51B4 800B45B4 8D22FFFC */ lw $v0, -4($t1) @@ -490,12 +490,12 @@ glabel func_800B3E64 /* 0B51C0 800B45C0 00000000 */ nop /* 0B51C4 800B45C4 8C8E0000 */ lw $t6, ($a0) -/* 0B51C8 800B45C8 3C05800E */ lui $a1, %hi(gParticleBehaviorsAssetTableCount) # $a1, 0x800e +/* 0B51C8 800B45C8 3C05800E */ lui $a1, %hi(gParticleBehavioursAssetTableCount) # $a1, 0x800e /* 0B51CC 800B45CC 25C30001 */ addiu $v1, $t6, 1 -/* 0B51D0 800B45D0 24A52CF4 */ addiu $a1, %lo(gParticleBehaviorsAssetTableCount) # addiu $a1, $a1, 0x2cf4 +/* 0B51D0 800B45D0 24A52CF4 */ addiu $a1, %lo(gParticleBehavioursAssetTableCount) # addiu $a1, $a1, 0x2cf4 /* 0B51D4 800B45D4 AC830000 */ sw $v1, ($a0) /* 0B51D8 800B45D8 8CA20000 */ lw $v0, ($a1) -/* 0B51DC 800B45DC 3C19800E */ lui $t9, %hi(gParticleBehaviorsAssetTable) # $t9, 0x800e +/* 0B51DC 800B45DC 3C19800E */ lui $t9, %hi(gParticleBehavioursAssetTable) # $t9, 0x800e /* 0B51E0 800B45E0 0062082A */ slt $at, $v1, $v0 /* 0B51E4 800B45E4 14200007 */ bnez $at, .L800B4604 /* 0B51E8 800B45E8 0062C023 */ subu $t8, $v1, $v0 @@ -507,7 +507,7 @@ glabel func_800B3E64 /* 0B51FC 800B45FC 1020FFFB */ beqz $at, .L800B45EC /* 0B5200 800B4600 0062C023 */ subu $t8, $v1, $v0 .L800B4604: -/* 0B5204 800B4604 8F392CFC */ lw $t9, %lo(gParticleBehaviorsAssetTable)($t9) +/* 0B5204 800B4604 8F392CFC */ lw $t9, %lo(gParticleBehavioursAssetTable)($t9) /* 0B5208 800B4608 00034080 */ sll $t0, $v1, 2 /* 0B520C 800B460C 03284821 */ addu $t1, $t9, $t0 /* 0B5210 800B4610 8D220000 */ lw $v0, ($t1) @@ -515,12 +515,12 @@ glabel func_800B3E64 /* 0B5218 800B4618 00000000 */ nop /* 0B521C 800B461C 8C8E0000 */ lw $t6, ($a0) -/* 0B5220 800B4620 3C08800E */ lui $t0, %hi(gParticleBehaviorsAssetTable) # $t0, 0x800e +/* 0B5220 800B4620 3C08800E */ lui $t0, %hi(gParticleBehavioursAssetTable) # $t0, 0x800e /* 0B5224 800B4624 25C3FFFF */ addiu $v1, $t6, -1 /* 0B5228 800B4628 04610009 */ bgez $v1, .L800B4650 /* 0B522C 800B462C AC830000 */ sw $v1, ($a0) -/* 0B5230 800B4630 3C02800E */ lui $v0, %hi(gParticleBehaviorsAssetTableCount) # $v0, 0x800e -/* 0B5234 800B4634 24422CF4 */ addiu $v0, %lo(gParticleBehaviorsAssetTableCount) # addiu $v0, $v0, 0x2cf4 +/* 0B5230 800B4630 3C02800E */ lui $v0, %hi(gParticleBehavioursAssetTableCount) # $v0, 0x800e +/* 0B5234 800B4634 24422CF4 */ addiu $v0, %lo(gParticleBehavioursAssetTableCount) # addiu $v0, $v0, 0x2cf4 .L800B4638: /* 0B5238 800B4638 8C580000 */ lw $t8, ($v0) /* 0B523C 800B463C 00000000 */ nop @@ -529,7 +529,7 @@ glabel func_800B3E64 /* 0B5248 800B4648 0720FFFB */ bltz $t9, .L800B4638 /* 0B524C 800B464C 03201825 */ move $v1, $t9 .L800B4650: -/* 0B5250 800B4650 8D082CFC */ lw $t0, %lo(gParticleBehaviorsAssetTable)($t0) +/* 0B5250 800B4650 8D082CFC */ lw $t0, %lo(gParticleBehavioursAssetTable)($t0) /* 0B5254 800B4654 00034880 */ sll $t1, $v1, 2 /* 0B5258 800B4658 01095021 */ addu $t2, $t0, $t1 /* 0B525C 800B465C 8D420000 */ lw $v0, ($t2) diff --git a/asm/non_matchings/textures_sprites/func_8007C12C.s b/asm/non_matchings/textures_sprites/func_8007C12C.s index 9a83a4d6..7deafd99 100644 --- a/asm/non_matchings/textures_sprites/func_8007C12C.s +++ b/asm/non_matchings/textures_sprites/func_8007C12C.s @@ -159,8 +159,8 @@ glabel func_8007C12C /* 07CF74 8007C374 AE780008 */ sw $t8, 8($s3) /* 07CF78 8007C378 1AA0001E */ blez $s5, .L8007C3F4 /* 07CF7C 8007C37C 00001825 */ move $v1, $zero -/* 07CF80 8007C380 3C12800E */ lui $s2, %hi(gTexColorTag) # $s2, 0x800e -/* 07CF84 8007C384 2652E7C0 */ addiu $s2, %lo(gTexColorTag) # addiu $s2, $s2, -0x1840 +/* 07CF80 8007C380 3C12800E */ lui $s2, %hi(gTexColourTag) # $s2, 0x800e +/* 07CF84 8007C384 2652E7C0 */ addiu $s2, %lo(gTexColourTag) # addiu $s2, $s2, -0x1840 /* 07CF88 8007C388 00008825 */ move $s1, $zero .L8007C38C: /* 07CF8C 8007C38C 3C0B00FF */ lui $t3, (0x00FF0163 >> 16) # lui $t3, 0xff diff --git a/asm/non_matchings/textures_sprites/load_texture.s b/asm/non_matchings/textures_sprites/load_texture.s index 2f256038..f59504ed 100644 --- a/asm/non_matchings/textures_sprites/load_texture.s +++ b/asm/non_matchings/textures_sprites/load_texture.s @@ -80,8 +80,8 @@ glabel load_texture /* 07BB94 8007AF94 01608825 */ move $s1, $t3 /* 07BB98 8007AF98 000B6880 */ sll $t5, $t3, 2 /* 07BB9C 8007AF9C 01AB6823 */ subu $t5, $t5, $t3 -/* 07BBA0 8007AFA0 3C05800E */ lui $a1, %hi(gTexColorTag) # $a1, 0x800e -/* 07BBA4 8007AFA4 8CA5E7C0 */ lw $a1, %lo(gTexColorTag)($a1) +/* 07BBA0 8007AFA0 3C05800E */ lui $a1, %hi(gTexColourTag) # $a1, 0x800e +/* 07BBA4 8007AFA4 8CA5E7C0 */ lw $a1, %lo(gTexColourTag)($a1) /* 07BBA8 8007AFA8 000D6940 */ sll $t5, $t5, 5 /* 07BBAC 8007AFAC 01AE2021 */ addu $a0, $t5, $t6 /* 07BBB0 8007AFB0 0C01C344 */ jal allocate_from_main_pool @@ -105,9 +105,9 @@ glabel load_texture /* 07BBF0 8007AFF0 0011C080 */ sll $t8, $s1, 2 /* 07BBF4 8007AFF4 0311C023 */ subu $t8, $t8, $s1 /* 07BBF8 8007AFF8 0018C140 */ sll $t8, $t8, 5 -/* 07BBFC 8007AFFC 3C05800E */ lui $a1, %hi(gTexColorTag) # $a1, 0x800e +/* 07BBFC 8007AFFC 3C05800E */ lui $a1, %hi(gTexColourTag) # $a1, 0x800e /* 07BC00 8007B000 244F0020 */ addiu $t7, $v0, 0x20 -/* 07BC04 8007B004 8CA5E7C0 */ lw $a1, %lo(gTexColorTag)($a1) +/* 07BC04 8007B004 8CA5E7C0 */ lw $a1, %lo(gTexColourTag)($a1) /* 07BC08 8007B008 03022021 */ addu $a0, $t8, $v0 /* 07BC0C 8007B00C AFAF003C */ sw $t7, 0x3c($sp) /* 07BC10 8007B010 24840020 */ addiu $a0, $a0, 0x20 diff --git a/asm/non_matchings/unknown_043920/func_8004DE38.s b/asm/non_matchings/unknown_043920/func_8004DE38.s index e5f10c4a..05175cc1 100644 --- a/asm/non_matchings/unknown_043920/func_8004DE38.s +++ b/asm/non_matchings/unknown_043920/func_8004DE38.s @@ -252,7 +252,7 @@ glabel func_8004DE38 .L8004E168: /* 04ED68 8004E168 00002825 */ move $a1, $zero /* 04ED6C 8004E16C 00003025 */ move $a2, $zero -/* 04ED70 8004E170 0C02D8AD */ jal set_render_printf_background_color +/* 04ED70 8004E170 0C02D8AD */ jal set_render_printf_background_colour /* 04ED74 8004E174 24070080 */ li $a3, 128 /* 04ED78 8004E178 0C008D07 */ jal func_8002341C /* 04ED7C 8004E17C 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800A277C.s b/asm/non_matchings/unknown_09F8F0/func_800A277C.s index 94521038..12dc2f5f 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A277C.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A277C.s @@ -940,7 +940,7 @@ glabel func_800A277C /* 0A40F0 800A34F0 00002025 */ move $a0, $zero /* 0A40F4 800A34F4 00002825 */ move $a1, $zero /* 0A40F8 800A34F8 00003025 */ move $a2, $zero -/* 0A40FC 800A34FC 0C0310E1 */ jal set_text_color +/* 0A40FC 800A34FC 0C0310E1 */ jal set_text_colour /* 0A4100 800A3500 240700FF */ li $a3, 255 /* 0A4104 800A3504 3C108012 */ lui $s0, %hi(D_8012718C) # $s0, 0x8012 /* 0A4108 800A3508 3C118012 */ lui $s1, %hi(D_80126D24) # $s1, 0x8012 @@ -998,7 +998,7 @@ glabel func_800A277C /* 0A41D8 800A35D8 90440010 */ lbu $a0, 0x10($v0) /* 0A41DC 800A35DC 90450011 */ lbu $a1, 0x11($v0) /* 0A41E0 800A35E0 90460012 */ lbu $a2, 0x12($v0) -/* 0A41E4 800A35E4 0C0310E1 */ jal set_text_color +/* 0A41E4 800A35E4 0C0310E1 */ jal set_text_colour /* 0A41E8 800A35E8 AFAE0010 */ sw $t6, 0x10($sp) /* 0A41EC 800A35EC 8E190000 */ lw $t9, ($s0) /* 0A41F0 800A35F0 8E2B0000 */ lw $t3, ($s1) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A5F18.s b/asm/non_matchings/unknown_09F8F0/func_800A5F18.s index 0a9ba68e..8034f21b 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A5F18.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A5F18.s @@ -72,7 +72,7 @@ glabel func_800A5F18 /* 0A6C00 800A6000 240400FF */ li $a0, 255 /* 0A6C04 800A6004 240500FF */ li $a1, 255 /* 0A6C08 800A6008 240600FF */ li $a2, 255 -/* 0A6C0C 800A600C 0C0310E1 */ jal set_text_color +/* 0A6C0C 800A600C 0C0310E1 */ jal set_text_colour /* 0A6C10 800A6010 00003825 */ move $a3, $zero /* 0A6C14 800A6014 3C028012 */ lui $v0, %hi(D_80126CDC) # $v0, 0x8012 /* 0A6C18 800A6018 8C426CDC */ lw $v0, %lo(D_80126CDC)($v0) diff --git a/lib/asm/exception/__osException.s b/lib/asm/exception/__osException.s index 6eed695b..29647fc3 100644 --- a/lib/asm/exception/__osException.s +++ b/lib/asm/exception/__osException.s @@ -191,8 +191,8 @@ glabel __osException /* 0D3B2C 800D2F2C 3C01800E */ lui $at, %hi(__osHwIntTable) # $at, 0x800e /* 0D3B30 800D2F30 002A0821 */ addu $at, $at, $t2 /* 0D3B34 800D2F34 8C2A48A0 */ lw $t2, %lo(__osHwIntTable)($at) -/* 0D3B38 800D2F38 3C1D8013 */ lui $sp, %hi(leoDiskStack) # $sp, 0x8013 -/* 0D3B3C 800D2F3C 27BDAAE0 */ addiu $sp, %lo(leoDiskStack) # addiu $sp, $sp, -0x5520 +/* 0D3B38 800D2F38 3C1D8013 */ lui $sp, %hi(leoDiscStack) # $sp, 0x8013 +/* 0D3B3C 800D2F3C 27BDAAE0 */ addiu $sp, %lo(leoDiscStack) # addiu $sp, $sp, -0x5520 /* 0D3B40 800D2F40 24040010 */ li $a0, 16 /* 0D3B44 800D2F44 11400007 */ beqz $t2, .L800D2F64 /* 0D3B48 800D2F48 27BD0FF0 */ addiu $sp, $sp, 0xff0 diff --git a/src/font.c b/src/font.c index 098ec934..ebec4531 100644 --- a/src/font.c +++ b/src/font.c @@ -238,7 +238,7 @@ GLOBAL_ASM("asm/non_matchings/font/func_800C4318.s") /** * Sets the colour of the current dialogue box's text. */ -void set_text_color(s32 red, s32 green, s32 blue, s32 alpha, s32 opacity) { +void set_text_colour(s32 red, s32 green, s32 blue, s32 alpha, s32 opacity) { (*gDialogueBoxBackground)[0].textColourR = red; (*gDialogueBoxBackground)[0].textColourG = green; (*gDialogueBoxBackground)[0].textColourB = blue; @@ -249,7 +249,7 @@ void set_text_color(s32 red, s32 green, s32 blue, s32 alpha, s32 opacity) { /** * Sets the colour of the current dialogue box's text background. */ -void set_text_background_color(s32 red, s32 green, s32 blue, s32 alpha) { +void set_text_background_colour(s32 red, s32 green, s32 blue, s32 alpha) { (*gDialogueBoxBackground)[0].textBGColourR = red; (*gDialogueBoxBackground)[0].textBGColourG = green; (*gDialogueBoxBackground)[0].textBGColourB = blue; diff --git a/src/font.h b/src/font.h index a77b7508..dfde6e4c 100644 --- a/src/font.h +++ b/src/font.h @@ -159,8 +159,8 @@ void load_fonts(void); void func_800C4164(s32 arg0); void set_text_font(s32 arg0); void render_dialogue_box(Gfx **dlist, Gfx *mat, VertexList *verts, s32 index); -void set_text_color(s32 red, s32 green, s32 blue, s32 alpha, s32 opacity); -void set_text_background_color(s32 red, s32 green, s32 blue, s32 alpha); +void set_text_colour(s32 red, s32 green, s32 blue, s32 alpha, s32 opacity); +void set_text_background_colour(s32 red, s32 green, s32 blue, s32 alpha); void func_800C4404(Gfx** displayList, char *text, s32 alignmentFlags); void draw_text(Gfx** displayList, s32 xpos, s32 ypos, char *text, s32 alignmentFlags); void func_800C44C0(Gfx** displayList, s32 arg1, char *text, s32 alignmentFlags); diff --git a/src/memory.c b/src/memory.c index daa8fd50..68d29efa 100644 --- a/src/memory.c +++ b/src/memory.c @@ -548,7 +548,7 @@ u8 *align4(u8 *address) { GLOBAL_ASM("asm/non_matchings/memory/func_800718A4.s") #ifdef NON_EQUIVALENT -s32 get_memory_color_tag_count(s32 arg0) { +s32 get_memory_colour_tag_count(s32 arg0) { s32 i, count; count = 0; for (i = 0; i < 80; i++) { // Issue with this loop @@ -559,23 +559,23 @@ s32 get_memory_color_tag_count(s32 arg0) { return count; } #else -GLOBAL_ASM("asm/non_matchings/memory/get_memory_color_tag_count.s") +GLOBAL_ASM("asm/non_matchings/memory/get_memory_colour_tag_count.s") #endif /** * Prints out the counts for each color tag in the main pool. * Unused. */ -void print_memory_color_tags(void) { - stubbed_printf("RED %d\n", get_memory_color_tag_count(COLOR_TAG_RED)); - stubbed_printf("GREEN %d\n", get_memory_color_tag_count(COLOR_TAG_GREEN)); - stubbed_printf("BLUE %d\n", get_memory_color_tag_count(COLOR_TAG_BLUE)); - stubbed_printf("YELLOW %d\n", get_memory_color_tag_count(COLOR_TAG_YELLOW)); - stubbed_printf("MAGENTA %d\n", get_memory_color_tag_count(COLOR_TAG_MAGENTA)); - stubbed_printf("CYAN %d\n", get_memory_color_tag_count(COLOR_TAG_CYAN)); - stubbed_printf("WHITE %d\n", get_memory_color_tag_count(COLOR_TAG_WHITE)); - stubbed_printf("GREY %d\n", get_memory_color_tag_count(COLOR_TAG_GRAY)); - stubbed_printf("ORANGE %d\n\n", get_memory_color_tag_count(COLOR_TAG_ORANGE)); +void print_memory_colour_tags(void) { + stubbed_printf("RED %d\n", get_memory_colour_tag_count(COLOR_TAG_RED)); + stubbed_printf("GREEN %d\n", get_memory_colour_tag_count(COLOR_TAG_GREEN)); + stubbed_printf("BLUE %d\n", get_memory_colour_tag_count(COLOR_TAG_BLUE)); + stubbed_printf("YELLOW %d\n", get_memory_colour_tag_count(COLOR_TAG_YELLOW)); + stubbed_printf("MAGENTA %d\n", get_memory_colour_tag_count(COLOR_TAG_MAGENTA)); + stubbed_printf("CYAN %d\n", get_memory_colour_tag_count(COLOR_TAG_CYAN)); + stubbed_printf("WHITE %d\n", get_memory_colour_tag_count(COLOR_TAG_WHITE)); + stubbed_printf("GREY %d\n", get_memory_colour_tag_count(COLOR_TAG_GRAY)); + stubbed_printf("ORANGE %d\n\n", get_memory_colour_tag_count(COLOR_TAG_ORANGE)); } /** @@ -583,17 +583,17 @@ void print_memory_color_tags(void) { * Unused. * See: https://tcrf.net/Diddy_Kong_Racing#Current_Colors */ -void render_memory_color_tags(void) { - set_render_printf_background_color(0, 0, 0, 128); - render_printf("RED %d\n", get_memory_color_tag_count(COLOR_TAG_RED)); - render_printf("GREEN %d\n", get_memory_color_tag_count(COLOR_TAG_GREEN)); - render_printf("BLUE %d\n", get_memory_color_tag_count(COLOR_TAG_BLUE)); - render_printf("YELLOW %d\n", get_memory_color_tag_count(COLOR_TAG_YELLOW)); - render_printf("MAGENTA %d\n", get_memory_color_tag_count(COLOR_TAG_MAGENTA)); - render_printf("CYAN %d\n", get_memory_color_tag_count(COLOR_TAG_CYAN)); - render_printf("WHITE %d\n", get_memory_color_tag_count(COLOR_TAG_WHITE)); - render_printf("GREY %d\n", get_memory_color_tag_count(COLOR_TAG_GRAY)); - render_printf("ORANGE %d\n\n", get_memory_color_tag_count(COLOR_TAG_ORANGE)); +void render_memory_colour_tags(void) { + set_render_printf_background_colour(0, 0, 0, 128); + render_printf("RED %d\n", get_memory_colour_tag_count(COLOR_TAG_RED)); + render_printf("GREEN %d\n", get_memory_colour_tag_count(COLOR_TAG_GREEN)); + render_printf("BLUE %d\n", get_memory_colour_tag_count(COLOR_TAG_BLUE)); + render_printf("YELLOW %d\n", get_memory_colour_tag_count(COLOR_TAG_YELLOW)); + render_printf("MAGENTA %d\n", get_memory_colour_tag_count(COLOR_TAG_MAGENTA)); + render_printf("CYAN %d\n", get_memory_colour_tag_count(COLOR_TAG_CYAN)); + render_printf("WHITE %d\n", get_memory_colour_tag_count(COLOR_TAG_WHITE)); + render_printf("GREY %d\n", get_memory_colour_tag_count(COLOR_TAG_GRAY)); + render_printf("ORANGE %d\n\n", get_memory_colour_tag_count(COLOR_TAG_ORANGE)); } #ifdef NON_EQUIVALENT diff --git a/src/memory.h b/src/memory.h index 794068f9..0f8d6154 100644 --- a/src/memory.h +++ b/src/memory.h @@ -91,8 +91,8 @@ s32 get_memory_pool_index_containing_address(u8 *address); u8 *align16(u8 *address); u8 *align8(u8 *address); u8 *align4(u8 *address); -void print_memory_color_tags(void); -void render_memory_color_tags(void); +void print_memory_colour_tags(void); +void render_memory_colour_tags(void); void func_80071CE8(void); MemoryPoolSlot *allocate_from_memory_pool(s32 memoryPoolIndex, s32 size, u32 colorTag); // Non Matching @@ -100,6 +100,6 @@ MemoryPoolSlot *new_memory_pool(MemoryPoolSlot *slots, s32 poolSize, s32 numSlot void free_memory_pool_slot(s32 poolIndex, s32 slotIndex); // Non Matching void *allocate_at_address_in_main_pool(s32 size, u8 *address, u32 colorTag); // Non Matching void free_slot_containing_address(u8 *address); // Non Matching -s32 get_memory_color_tag_count(s32 arg0); // Non Matching +s32 get_memory_colour_tag_count(s32 arg0); // Non Matching #endif diff --git a/src/menu.c b/src/menu.c index 9b4faef6..31d19877 100644 --- a/src/menu.c +++ b/src/menu.c @@ -125,7 +125,7 @@ s32 D_80126500; s8 sDialogueOptionMax; s32 D_80126508; s16 D_8012650C; -s8 gDialogOptionYOffset; +s8 gDialogueOptionYOffset; s32 D_80126510; s16 D_80126514; s8 D_80126516; @@ -336,7 +336,7 @@ s8 D_800DF4E4[4] = { }; s32 D_800DF4E8 = 0; // Currently unknown, might be a different type. -s8 gDialogOptionTangible = FALSE; +s8 gDialogueOptionTangible = FALSE; // Unused? s32 D_800DF4F0[] = { @@ -1986,8 +1986,8 @@ void draw_menu_elements(s32 arg0, MenuElement *elem, f32 arg2) { } switch (elem->elementType) { case 0: - set_text_background_color(elem->backgroundRed, elem->backgroundGreen, elem->backgroundBlue, elem->backgroundAlpha); - set_text_color(elem->filterRed, elem->filterGreen, elem->filterBlue, elem->filterAlpha, elem->opacity); + set_text_background_colour(elem->backgroundRed, elem->backgroundGreen, elem->backgroundBlue, elem->backgroundAlpha); + set_text_colour(elem->filterRed, elem->filterGreen, elem->filterBlue, elem->filterAlpha, elem->opacity); set_text_font(elem->textFont); draw_text(&D_801263A0, xPos, yPos + D_800DF79C, elem->unk14_a.asciiText, elem->textAlignFlags); break; @@ -2149,8 +2149,8 @@ void print_missing_controller_text(Gfx *dl, s32 updateRate) { if (D_800DF46C & 0x10) { load_menu_text(get_language()); set_text_font(FONT_COLOURFUL); - set_text_color(255, 255, 255, 0, 0xFF); - set_text_background_color(0, 0, 0, 0); + set_text_colour(255, 255, 255, 0, 0xFF); + set_text_background_colour(0, 0, 0, 0); posY = 208; if (osTvType == TV_TYPE_PAL) { posY = 234; @@ -2210,7 +2210,7 @@ s32 menu_logo_screen_loop(s32 updateRate) { // This uses doubles instead of floats for precision in the counting. if (sBootScreenTimer < 8.5) { set_text_font(FONT_SMALL); - set_text_background_color(0, 0, 0, 0); + set_text_background_colour(0, 0, 0, 0); if ((sBootScreenTimer < 8.0) && (sBootScreenTimer >= 7.5)) { opacity = (8.0 - sBootScreenTimer) * 510.0; } else { @@ -2221,7 +2221,7 @@ s32 menu_logo_screen_loop(s32 updateRate) { } } if (opacity != 0) { - set_text_color(0xFF, 0xFF, 0, 0xFF, opacity); + set_text_colour(0xFF, 0xFF, 0, 0xFF, opacity); draw_text(&D_801263A0, 159, yOffset + 212, gRareCopyrightString, 0xC); draw_text(&D_801263A0, 161, yOffset + 212, gRareCopyrightString, 0xC); draw_text(&D_801263A0, POS_CENTRED, yOffset + 211, gRareCopyrightString, 0xC); @@ -2233,7 +2233,7 @@ s32 menu_logo_screen_loop(s32 updateRate) { } else { opacity = 0xFF; } - set_text_color(0xFF, 0xFF, 0xFF, 0xFF, opacity); + set_text_colour(0xFF, 0xFF, 0xFF, 0xFF, opacity); draw_text(&D_801263A0, POS_CENTRED, yOffsetShadow, gRareCopyrightString, 0xC); } return 0; @@ -2341,10 +2341,10 @@ void func_800841B8(UNUSED s32 arg0) { s32 yPos; set_text_font(FONT_LARGE); - set_text_background_color(0, 0, 0, 0); - set_text_color(0, 0, 0, 255, 128); + set_text_background_colour(0, 0, 0, 0); + set_text_colour(0, 0, 0, 255, 128); draw_text(&D_801263A0, 161, 35, gMenuText[36], 0xC); // OPTIONS - set_text_color(255, 255, 255, 0, 255); + set_text_colour(255, 255, 255, 0, 255); draw_text(&D_801263A0, 160, 32, gMenuText[36], 0xC); // OPTIONS optionMenuTextIndex = 0; @@ -2361,7 +2361,7 @@ void func_800841B8(UNUSED s32 arg0) { } else { alpha = 0; } - set_text_color(255, 255, 255, alpha, 255); + set_text_colour(255, 255, 255, alpha, 255); draw_text(&D_801263A0, POS_CENTRED, yPos, gOptionMenuStrings[optionMenuTextIndex], 0xC); optionMenuTextIndex++; @@ -3119,7 +3119,7 @@ void func_80088938(s32 arg0) { s32 yPos = 48; //s32 yPos; - set_text_background_color(0, 0, 0, 0); + set_text_background_colour(0, 0, 0, 0); alpha = D_801263BC << 3; if (alpha >= 256) { alpha = 511 - alpha; @@ -3128,9 +3128,9 @@ void func_80088938(s32 arg0) { draw_menu_elements(1, D_800DFCB4, 1.0f); } else if (gShowControllerPakMenu != 0) { set_text_font(2); - set_text_color(0, 0, 0, 255, 128); + set_text_colour(0, 0, 0, 255, 128); draw_text(&D_801263A0, 161, 33, gMenuText[35], 12); - set_text_color(255, 255, 255, 0, 255); + set_text_colour(255, 255, 255, 0, 255); draw_text(&D_801263A0, 160, 30, gMenuText[35], 12); assign_dialogue_box_id(6); @@ -3192,9 +3192,9 @@ void func_80088938(s32 arg0) { } else { set_text_font(0); if (D_800DF460 == 16) { - set_text_color(255, 255, 255, alpha, 255); + set_text_colour(255, 255, 255, alpha, 255); } else { - set_text_color(255, 255, 255, 0, 255); + set_text_colour(255, 255, 255, 0, 255); } draw_text(&D_801263A0, POS_CENTRED, yPos, gMenuText[51], 4); } @@ -3227,7 +3227,7 @@ void func_80088938(s32 arg0) { render_dialogue_box(&D_801263A0, NULL, NULL, 6); } if (D_80126C10 != 0) { - set_text_color(255, 255, 255, 0, 255); + set_text_colour(255, 255, 255, 0, 255); set_text_font(2); draw_text(&D_801263A0, 160, 128, gMenuText[124], 12); } @@ -3273,15 +3273,15 @@ void render_magic_codes_ui(s32 arg0) { s32 temp, alpha, green; char c; - set_text_background_color(0, 0, 0, 0); + set_text_background_colour(0, 0, 0, 0); render_dialogue_box(&D_801263A0, 0, 0, 7); set_text_font(FONT_LARGE); - set_text_color(0, 0, 0, 0xFF, 0x80); + set_text_colour(0, 0, 0, 0xFF, 0x80); draw_text(&D_801263A0, 0xA1, 0x23, gMenuText[17], 0xC); // gMenuText[17] = "MAGIC CODES" - set_text_color(0xFF, 0xFF, 0xFF, 0, 0xFF); + set_text_colour(0xFF, 0xFF, 0xFF, 0, 0xFF); draw_text(&D_801263A0, 0xA0, 0x20, gMenuText[17], 0xC); // gMenuText[17] = "MAGIC CODES" set_text_font(FONT_COLOURFUL); - set_text_color(0xFF, 0xFF, 0xFF, 0, 0xFF); + set_text_colour(0xFF, 0xFF, 0xFF, 0, 0xFF); c = 'A'; yPos = 60; @@ -3294,7 +3294,7 @@ void render_magic_codes_ui(s32 arg0) { if (temp >= 0x100) { temp = 0x1FF - temp; } - set_text_color(0x80, 0xFF, 0xC0, (temp >> 1) + 0x80, 0xFF); + set_text_colour(0x80, 0xFF, 0xC0, (temp >> 1) + 0x80, 0xFF); } if (c < '[') { draw_text(&D_801263A0, xPos, yPos, &c, 0xC); // Draw the character @@ -3304,7 +3304,7 @@ void render_magic_codes_ui(s32 arg0) { draw_text(&D_801263A0, xPos, yPos, &D_800E8214, 0xC); // D_800E8214 = "OK" } if ((5 == gOptionsMenuItemIndex) && (j == gCheatInputCurrentColumn) && (i == gCheatInputCurrentRow)) { - set_text_color(0xFF, 0xFF, 0xFF, 0, 0xFF); + set_text_colour(0xFF, 0xFF, 0xFF, 0, 0xFF); } c++; c &= 0xFF; @@ -3329,13 +3329,13 @@ void render_magic_codes_ui(s32 arg0) { if (i == gOptionsMenuItemIndex && D_801263E0 == 0) { alpha = temp; } - set_text_color(0xFF, 0xFF, 0xFF, alpha, 0xFF); + set_text_colour(0xFF, 0xFF, 0xFF, alpha, 0xFF); draw_text(&D_801263A0, POS_CENTRED, yPos, gMagicCodeMenuStrings[i], 0xC); yPos += yIncr; } set_text_font(FONT_COLOURFUL); - set_text_color(0xFF, 0xFF, 0x80, 0x80, 0xFF); - set_text_background_color(0, 0, 0x80, 0x80); + set_text_colour(0xFF, 0xFF, 0x80, 0x80, 0xFF); + set_text_background_colour(0, 0, 0x80, 0x80); if (gOptionsMenuItemIndex == 4) { if (D_80126C4C == -1) { draw_text(&D_801263A0, POS_CENTRED, 0x90, gMenuText[18], 0xC); // gMenuText[18] = "Sorry, the code was incorrect" @@ -3420,11 +3420,11 @@ void render_magic_codes_list_menu_text(s32 arg0) { s32 s2; s32 i; - set_text_background_color(0, 0, 0, 0); + set_text_background_colour(0, 0, 0, 0); set_text_font(FONT_LARGE); - set_text_color(0, 0, 0, 0xFF, 0x80); + set_text_colour(0, 0, 0, 0xFF, 0x80); draw_text(&D_801263A0, 0xA1, 0x23, gMenuText[20], 0xC); // MAGIC CODES LIST - set_text_color(0xFF, 0xFF, 0xFF, 0, 0xFF); + set_text_colour(0xFF, 0xFF, 0xFF, 0, 0xFF); draw_text(&D_801263A0, 0xA0, 0x20, gMenuText[20], 0xC); // MAGIC CODES LIST numOfUnlockedCheats = 0; phi_v0 = 1; @@ -3442,10 +3442,10 @@ void render_magic_codes_list_menu_text(s32 arg0) { fp = 0x1FF - fp; } set_text_font(FONT_COLOURFUL); - set_text_color(0xFF, 0xFF, 0xFF, 0, 0xFF); + set_text_colour(0xFF, 0xFF, 0xFF, 0, 0xFF); for (i = D_801263E0; (i < D_801263E0 + D_80126C70) && (i < numOfUnlockedCheats); i++) { if (i == gOptionsMenuItemIndex) { - set_text_color(0xFF, 0xFF, 0xFF, fp, 0xFF); + set_text_colour(0xFF, 0xFF, 0xFF, fp, 0xFF); } draw_text(&D_801263A0, 0x30, s2, (char *)(*gCheatsAssetData) + ((*gCheatsAssetData + 1)[D_80126C80[i] * 2 + 1]), 0); if ((1 << D_80126C80[i]) & gActiveMagicCodes) { @@ -3454,13 +3454,13 @@ void render_magic_codes_list_menu_text(s32 arg0) { draw_text(&D_801263A0, 0x100, s2, gMenuText[22], 0); // OFF } if (i == gOptionsMenuItemIndex) { - set_text_color(0xFF, 0xFF, 0xFF, 0, 0xFF); + set_text_colour(0xFF, 0xFF, 0xFF, 0, 0xFF); } s2 += 0x10; } if (i < D_801263E0 + D_80126C70) { if (numOfUnlockedCheats == gOptionsMenuItemIndex) { - set_text_color(0xFF, 0xFF, 0xFF, fp, 0xFF); + set_text_colour(0xFF, 0xFF, 0xFF, fp, 0xFF); } draw_text(&D_801263A0, POS_CENTRED, s2, gMenuText[5], 4); // RETURN return; @@ -3628,7 +3628,7 @@ void calculate_and_display_rom_checksum(void) { D_800E1E18 = TRUE; } - set_render_printf_background_color(0, 0, 0, 0x80); + set_render_printf_background_colour(0, 0, 0, 0x80); set_render_printf_position(0x20, 0x88); render_printf(D_800E8218, D_800E1E14, &__ROM_END); // D_800E8218 = "ROM checksum %08X,%d\n" } @@ -3732,11 +3732,11 @@ void draw_character_select_text(UNUSED s32 arg0) { s32 yPos; if (gMenuDelay >= -0x16 && gMenuDelay < 0x17) { set_text_font(FONT_LARGE); - set_text_background_color(0, 0, 0, 0); - set_text_color(0, 0, 0, 0xFF, 0x80); + set_text_background_colour(0, 0, 0, 0); + set_text_colour(0, 0, 0, 0xFF, 0x80); // Draw "Player Select" text drop shadow draw_text(&D_801263A0, 0xA1, 0x23, gMenuText[135], 0xC); - set_text_color(255, 255, 255, 0, 0xFF); + set_text_colour(255, 255, 255, 0, 0xFF); // Draw "Player Select" text draw_text(&D_801263A0, 0xA0, 0x20, gMenuText[135], 0xC); if (gNumberOfReadyPlayers == gNumberOfActivePlayers && gNumberOfActivePlayers > 0) { @@ -3758,7 +3758,7 @@ GLOBAL_ASM("asm/non_matchings/menu/func_8008B758.s") #ifdef NON_EQUIVALENT // Should be functionally equivalent -void randomize_ai_racer_slots(s32 arg0) { +void randomise_ai_racer_slots(s32 arg0) { s32 i, j; s32 numCharacters; s32 s1; @@ -3799,7 +3799,7 @@ void randomize_ai_racer_slots(s32 arg0) { } } #else -GLOBAL_ASM("asm/non_matchings/menu/randomize_ai_racer_slots.s") +GLOBAL_ASM("asm/non_matchings/menu/randomise_ai_racer_slots.s") #endif #ifdef NON_EQUIVALENT @@ -3851,7 +3851,7 @@ s32 menu_character_select_loop(s32 updateRate) { phi_a0++; } } - randomize_ai_racer_slots(phi_a0); + randomise_ai_racer_slots(phi_a0); assign_player_ids(gActivePlayersArray); gIsInTracksMode = 1; @@ -4250,7 +4250,7 @@ void render_file_select_menu(UNUSED s32 updateRate) { func_80080BC8(&D_801263A0); if (D_801263D8 == 0) { set_text_font(FONT_LARGE); - set_text_background_color(0, 0, 0, 0); + set_text_background_colour(0, 0, 0, 0); s5 = 10; for (i = 0; i < 3; i++) { if (gSavefileInfo[i].isStarted != 0) { @@ -4273,7 +4273,7 @@ void render_file_select_menu(UNUSED s32 updateRate) { sMenuGuiColourB = 0xFF; func_8007BF1C(1); } else { - set_text_color(255, 255, 255, 64, 255); + set_text_colour(255, 255, 255, 64, 255); draw_text(&D_801263A0, D_800E03FC[4] + D_800E03CC[i].unk0, D_800E03FC[5] + D_800E03CC[i].unk2 + y, gMenuText[75], 0xC); } } @@ -4283,8 +4283,8 @@ void render_file_select_menu(UNUSED s32 updateRate) { phi_v0_2 = 0x1FF - phi_v0_2; } set_text_font(FONT_COLOURFUL); - set_text_background_color(0, 0, 0, 0); - set_text_color(255, 255, 255, 0, 255); + set_text_background_colour(0, 0, 0, 0); + set_text_colour(255, 255, 255, 0, 255); for (i = 0; i < 3; i++) { s2 = FALSE; if (D_80126484 != 0) { @@ -4314,11 +4314,11 @@ void render_file_select_menu(UNUSED s32 updateRate) { } } set_text_font(FONT_LARGE); - set_text_color(0, 0, 0, 255, 128); + set_text_colour(0, 0, 0, 255, 128); draw_text(&D_801263A0, 0xA1, 0x13, gMenuText[76], 4); - set_text_color(255, 255, 255, 0, 255); + set_text_colour(255, 255, 255, 0, 255); draw_text(&D_801263A0, 0xA0, 0x10, gMenuText[76], 4); - set_text_color(255, 255, 255, 0, 255); + set_text_colour(255, 255, 255, 0, 255); y += 0xBB; if (D_80126484 != 0) { if (D_80126494 == 0) { @@ -4343,13 +4343,13 @@ void render_file_select_menu(UNUSED s32 updateRate) { } if (D_80126CC0 == 0) { if (D_801263E0 == 1) { - set_text_color(255, 255, 255, phi_v0_2, 255); + set_text_colour(255, 255, 255, phi_v0_2, 255); } draw_text(&D_801263A0, 0x5A, y, gMenuText[80], 0xC); if (D_801263E0 == 2) { - set_text_color(255, 255, 255, phi_v0_2, 255); + set_text_colour(255, 255, 255, phi_v0_2, 255); } else { - set_text_color(255, 255, 255, 0, 255); + set_text_colour(255, 255, 255, 0, 255); } draw_text(&D_801263A0, 0xE6, y, gMenuText[81], 0xC); return; @@ -4645,8 +4645,8 @@ void render_track_select_setup_ui(s32 arg0) { } sp7C = func_8006B0F8(gTrackIdForPreview); set_text_font(FONT_LARGE); - set_text_color(0xC0, 0xC0, 0xFF, 0, sMenuGuiOpacity); - set_text_background_color(0, 0, 0, 0); + set_text_colour(0xC0, 0xC0, 0xFF, 0, sMenuGuiOpacity); + set_text_background_colour(0, 0, 0, 0); draw_text(&D_801263A0, POS_CENTRED, 0x2B, func_8006BDDC(gTrackIdForPreview), 0xC); // Draw track name? sp84 = D_801263BC * 8; if (sp84 >= 0x100) { @@ -4673,13 +4673,13 @@ void render_track_select_setup_ui(s32 arg0) { for (i = 0; i < 2; i++) { for (j = 0; j < 4; j += 2) { if (j == 0) { - set_text_color(0, 0, 0, 0xFF, sMenuGuiOpacity >> 1); + set_text_colour(0, 0, 0, 0xFF, sMenuGuiOpacity >> 1); } else { s32 alpha = i; if (i == D_800E0418) { alpha = sp84; } - set_text_color(0xFF, 0xFF, 0xFF, alpha, sMenuGuiOpacity); + set_text_colour(0xFF, 0xFF, 0xFF, alpha, sMenuGuiOpacity); } // gMenuText[146] = "ADVENTURE", gMenuText[147] = "ADVENTURE TWO" draw_text(&D_801263A0, 0xA1 - j, s7 - j, gMenuText[146 + i], 0xC); @@ -4689,10 +4689,10 @@ void render_track_select_setup_ui(s32 arg0) { } if (D_801269C8 < 4) { set_text_font(FONT_COLOURFUL); - set_text_color(0xFF, 0x40, 0x40, 0x60, sMenuGuiOpacity); + set_text_colour(0xFF, 0x40, 0x40, 0x60, sMenuGuiOpacity); draw_text(&D_801263A0, 0x38, 0x48 + sp80, gMenuText[9], 8); // gMenuText[9] = "BEST TIME" draw_text(&D_801263A0, 0x38, 0x5C + sp80, gMenuText[10], 8); // gMenuText[10] = "BEST LAP" - set_text_color(0xFF, 0x80, 0xFF, 0x60, sMenuGuiOpacity); + set_text_colour(0xFF, 0x80, 0xFF, 0x60, sMenuGuiOpacity); decompress_filename_string(settings->courseInitialsPtr[gPlayerSelectVehicle[0]][gTrackIdForPreview], &sp78, 3); draw_text(&D_801263A0, 0xFA, 0x48 + sp80, &sp78, 0xC); decompress_filename_string(settings->flapInitialsPtr[gPlayerSelectVehicle[0]][gTrackIdForPreview], &sp78, 3); @@ -4815,9 +4815,9 @@ void render_track_select_setup_ui(s32 arg0) { func_80080580(&D_801263A0, -(s4 >> 1), 0x78 - D_800E06E4[1], s4, D_800E06E4[3], D_800E06E4[4], D_800E06E4[5], 0xB0E0C0FF, D_8012665C); func_80080E6C(); set_text_font(FONT_COLOURFUL); - set_text_color(0, 0, 0, 0xFF, 0x80); + set_text_colour(0, 0, 0, 0xFF, 0x80); draw_text(&D_801263A0, D_800E06E4[6] + D_800E06E4[0] + 1, D_800E06E4[7] + D_800E06E4[1] + 1, gMenuText[136], 0xC); - set_text_color(0xFF, 0xFF, 0xFF, 0, 0xFF); + set_text_colour(0xFF, 0xFF, 0xFF, 0, 0xFF); draw_text(&D_801263A0, D_800E06E4[6] + D_800E06E4[0] - 1, D_800E06E4[7] + D_800E06E4[1] - 1, gMenuText[136], 0xC); // gMenuText[136] = "NUMBER OF RACERS" func_80068508(1); @@ -4873,7 +4873,7 @@ void render_track_select_setup_ui(s32 arg0) { if (D_801269C8 != 5) { if (((D_801263E0 == 2) && !sp74) || ((D_801263E0 == 3) && sp74) || (D_801263E0 == 4)) { set_text_font(FONT_LARGE); - set_text_color(0xFF, 0xFF, 0xFF, 0, sMenuGuiOpacity); + set_text_colour(0xFF, 0xFF, 0xFF, 0, sMenuGuiOpacity); if (D_801269C8 >= 4) { sp80 += 0x18; } @@ -5523,12 +5523,12 @@ void func_800983C0(UNUSED s32 arg0) { sp28 = func_8006BDDC(func_8006B1D4(gTrophyRaceWorldId)); sp24 = func_8006BDDC(sp20[((gTrophyRaceWorldId - 1) * 6) + D_800E0FEC]); - set_text_background_color(0, 0, 0, 0); + set_text_background_colour(0, 0, 0, 0); set_text_font(FONT_LARGE); - set_text_color(0, 0, 0, 255, 128); + set_text_colour(0, 0, 0, 255, 128); draw_text(&D_801263A0, 161, 35, sp28, 0xC); draw_text(&D_801263A0, 161, 67, gMenuText[70], 0xC); // TROPHY RACE - set_text_color(255, 255, 255, 0, 255); + set_text_colour(255, 255, 255, 0, 255); draw_text(&D_801263A0, 160, 32, sp28, 0xC); draw_text(&D_801263A0, 160, 64, gMenuText[70], 0xC); // TROPHY RACE draw_text(&D_801263A0, 160, yPos + 176, gMenuText[138 + D_800E0FEC], 0xC); // ROUND ONE / ROUND TWO / ROUND THREE / ROUND FOUR @@ -6357,13 +6357,13 @@ s32 func_8009CFEC(u32 dialogueOption) { void set_option_text_colour(s32 condition) { if (condition == FALSE) { set_current_text_colour(1, 0, 0, 0x7F, 0x5A, 0xFF); // Normal - if (gDialogOptionTangible != FALSE) { + if (gDialogueOptionTangible != FALSE) { set_current_text_colour(1, 0, 0, 0x7F, 0x5A, 0x78); //Locked } } else { set_current_text_colour(1, 0xCF, 0xCF, 0xCF, 0x5A, 0xFF); // Selected Option } - gDialogOptionTangible = (u8)FALSE; + gDialogueOptionTangible = (u8)FALSE; } /** @@ -6374,8 +6374,8 @@ void render_dialogue_option(char *text, s32 yOffset, s32 optionID) { if (sDialogueOption == sDialogueOptionMax) { D_80126516 = optionID; } - render_dialogue_text(1, POS_CENTRED, gDialogOptionYOffset, text, 1, 4); - gDialogOptionYOffset = (s8)(gDialogOptionYOffset + yOffset); + render_dialogue_text(1, POS_CENTRED, gDialogueOptionYOffset, text, 1, 4); + gDialogueOptionYOffset = (s8)(gDialogueOptionYOffset + yOffset); sDialogueOptionMax = (s8)(sDialogueOptionMax + 1); } @@ -6445,7 +6445,7 @@ s32 taj_menu_loop(void) { case 2: case 0x62: render_dialogue_text(1, POS_CENTRED, 6, gMenuText[40], 1, 4); // VEHICLE SELECT - gDialogOptionYOffset = 30; + gDialogueOptionYOffset = 30; render_dialogue_option(gMenuText[41], 20, 0); // CAR render_dialogue_option(gMenuText[42], 20, 1); // HOVERCRAFT render_dialogue_option(gMenuText[43], 20, 2); // PLANE @@ -6454,17 +6454,17 @@ s32 taj_menu_loop(void) { case 3: case 0x63: render_dialogue_text(1, POS_CENTRED, 6, gMenuText[45], 1, 4); // CHALLENGE SELECT - gDialogOptionYOffset = 30; + gDialogueOptionYOffset = 30; if (settings->tajFlags & TAJ_FLAGS_CAR_CHAL_UNLOCKED) { - gDialogOptionTangible = settings->tajFlags & TAJ_FLAGS_CAR_CHAL_COMPLETED; + gDialogueOptionTangible = settings->tajFlags & TAJ_FLAGS_CAR_CHAL_COMPLETED; render_dialogue_option(gMenuText[46], 0x14, 0); // CAR CHALLENGE } if (settings->tajFlags & TAJ_FLAGS_HOVER_CHAL_UNLOCKED) { - gDialogOptionTangible = settings->tajFlags & TAJ_FLAGS_HOVER_CHAL_COMPLETED; + gDialogueOptionTangible = settings->tajFlags & TAJ_FLAGS_HOVER_CHAL_COMPLETED; render_dialogue_option(gMenuText[47], 0x14, 1); // HOVER CHALLENGE } if (settings->tajFlags & TAJ_FLAGS_PLANE_CHAL_UNLOCKED) { - gDialogOptionTangible = settings->tajFlags & TAJ_FLAGS_PLANE_CHAL_COMPLETED; + gDialogueOptionTangible = settings->tajFlags & TAJ_FLAGS_PLANE_CHAL_COMPLETED; render_dialogue_option(gMenuText[48], 0x14, 2); // PLANE CHALLENGE } render_dialogue_option(gMenuText[44], 0x14, 3); // MAIN MENU @@ -6480,7 +6480,7 @@ s32 taj_menu_loop(void) { case 1: D_800DF4DC = 0; render_dialogue_text(1, POS_CENTRED, 6, gMenuText[36], 1, 4); // OPTIONS - gDialogOptionYOffset = 30; + gDialogueOptionYOffset = 30; render_dialogue_option(gMenuText[37], 0x14, 0); // CHANGE VEHICLE if (settings->tajFlags & TAJ_FLAGS_UNLOCKED_A_CHALLENGE) { render_dialogue_option(gMenuText[39], 0x14, 1); // CHALLENGES @@ -6604,7 +6604,7 @@ s32 dialogue_race_defeat(void) { D_800DF4DC = 0; render_dialogue_text(1, POS_CENTRED, 6, gMenuText[49], 1, 4); // BETTER LUCK render_dialogue_text(1, POS_CENTRED, 20, gMenuText[50], 1, 4); // NEXT TIME! - gDialogOptionYOffset = 50; + gDialogueOptionYOffset = 50; render_dialogue_option(gMenuText[23], 20, 0); // TRY AGAIN render_dialogue_option(gMenuText[51], 20, 1); // EXIT handle_menu_joystick_input(); @@ -6655,7 +6655,7 @@ s32 tt_menu_loop(void) { currentOption = 0; buttonsPressed = get_buttons_pressed_from_player(0); sDialogueOptionMax = 0; - gDialogOptionYOffset = 32; + gDialogueOptionYOffset = 32; switch (sCurrentMenuID) { case TT_MENU_ROOT: case TT_MENU_EXIT: diff --git a/src/menu.h b/src/menu.h index 5f6ed10b..c0ec0fb9 100644 --- a/src/menu.h +++ b/src/menu.h @@ -270,7 +270,7 @@ extern s8 D_800DF4DC; extern s8 D_800DF4E0; extern s8 D_800DF4E4[4]; extern s32 D_800DF4E8; -extern s8 gDialogOptionTangible; +extern s8 gDialogueOptionTangible; // Unused? extern s32 D_800DF4F0[]; @@ -774,7 +774,7 @@ void menu_magic_codes_init(void); void render_magic_codes_list_menu_text(s32 arg0); s32 menu_magic_codes_list_loop(s32 arg0); void calculate_and_display_rom_checksum(void); -void randomize_ai_racer_slots(s32 arg0); +void randomise_ai_racer_slots(s32 arg0); void menu_game_select_init(void); void func_8008C698(s32 arg0); s32 menu_game_select_loop(s32 arg0); diff --git a/src/particles.c b/src/particles.c index ceae9e6e..7abc74d1 100644 --- a/src/particles.c +++ b/src/particles.c @@ -61,9 +61,9 @@ s32 gParticlesAssetTableCount = 0; s32 *gParticlesAssets = NULL; unk800E2CF0 **gParticlesAssetTable = NULL; -s32 gParticleBehaviorsAssetTableCount = 0; -s32 *gParticleBehaviorsAssets = NULL; -ParticleBehavior **gParticleBehaviorsAssetTable = NULL; +s32 gParticleBehavioursAssetTableCount = 0; +s32 *gParticleBehavioursAssets = NULL; +ParticleBehavior **gParticleBehavioursAssetTable = NULL; s32 D_800E2D00[2] = { 0, 0 }; // Are these just Triangles? @@ -261,13 +261,13 @@ void func_800AE490(void) { free_from_memory_pool(gParticlesAssetTable); gParticlesAssetTable = NULL; } - if (gParticleBehaviorsAssets != NULL) { - free_from_memory_pool(gParticleBehaviorsAssets); - gParticleBehaviorsAssets = NULL; + if (gParticleBehavioursAssets != NULL) { + free_from_memory_pool(gParticleBehavioursAssets); + gParticleBehavioursAssets = NULL; } - if (gParticleBehaviorsAssetTable != NULL) { - free_from_memory_pool(gParticleBehaviorsAssetTable); - gParticleBehaviorsAssetTable = NULL; + if (gParticleBehavioursAssetTable != NULL) { + free_from_memory_pool(gParticleBehavioursAssetTable); + gParticleBehavioursAssetTable = NULL; } } #ifdef NON_EQUIVALENT @@ -283,14 +283,14 @@ void init_particle_assets(void) { for (i = 0; i < gParticlesAssetTableCount; i++) { gParticlesAssetTable[i] = (u8 *)gParticlesAssets + (s32)gParticlesAssetTable[i]; } - gParticleBehaviorsAssetTable = load_asset_section_from_rom(ASSET_PARTICLE_BEHAVIORS_TABLE); - for (gParticleBehaviorsAssetTableCount = -1; (s32)gParticleBehaviorsAssetTable[gParticleBehaviorsAssetTableCount + 1] != -1; gParticleBehaviorsAssetTableCount++) { + gParticleBehavioursAssetTable = load_asset_section_from_rom(ASSET_PARTICLE_BEHAVIORS_TABLE); + for (gParticleBehavioursAssetTableCount = -1; (s32)gParticleBehavioursAssetTable[gParticleBehavioursAssetTableCount + 1] != -1; gParticleBehavioursAssetTableCount++) { } - gParticleBehaviorsAssets = load_asset_section_from_rom(ASSET_PARTICLE_BEHAVIORS); - for (i = 0; i < gParticleBehaviorsAssetTableCount; i++) { - gParticleBehaviorsAssetTable[i] = (u8 *)gParticleBehaviorsAssets + (s32)gParticleBehaviorsAssetTable[i]; - if ((s32)gParticleBehaviorsAssetTable[i]->unk9C != -1) { - gParticleBehaviorsAssetTable[i]->unk9C = get_misc_asset(gParticleBehaviorsAssetTable[i]->unk9C); + gParticleBehavioursAssets = load_asset_section_from_rom(ASSET_PARTICLE_BEHAVIORS); + for (i = 0; i < gParticleBehavioursAssetTableCount; i++) { + gParticleBehavioursAssetTable[i] = (u8 *)gParticleBehavioursAssets + (s32)gParticleBehavioursAssetTable[i]; + if ((s32)gParticleBehavioursAssetTable[i]->unk9C != -1) { + gParticleBehavioursAssetTable[i]->unk9C = get_misc_asset(gParticleBehavioursAssetTable[i]->unk9C); } } } @@ -456,10 +456,10 @@ void func_800AF134(unk800B2260 *arg0, s32 arg1, s32 arg2, s16 arg3, s16 arg4, s1 if (arg2 >= gParticlesAssetTableCount) { arg2 = 0; } - if (arg1 >= gParticleBehaviorsAssetTableCount) { + if (arg1 >= gParticleBehavioursAssetTableCount) { arg1 = 0; } - temp = gParticleBehaviorsAssetTable[arg1]; + temp = gParticleBehavioursAssetTable[arg1]; if ((arg0->unk8 != arg2) || (temp != arg0->unk0)) { func_800B2260(arg0); func_800AF29C(arg0, arg1, arg2, arg3, arg4, arg5); @@ -469,8 +469,8 @@ void func_800AF134(unk800B2260 *arg0, s32 arg1, s32 arg2, s16 arg3, s16 arg4, s1 void func_800AF1E0(unk800AF29C *arg0, s32 arg1, s32 arg2) { ParticleBehavior *temp_v0; - if (arg1 < gParticleBehaviorsAssetTableCount) { - temp_v0 = (ParticleBehavior *)gParticleBehaviorsAssetTable[arg1]; + if (arg1 < gParticleBehavioursAssetTableCount) { + temp_v0 = (ParticleBehavior *)gParticleBehavioursAssetTable[arg1]; func_800AF29C(arg0, arg1, arg2, temp_v0->unk4, temp_v0->unk8, temp_v0->unkC); } } @@ -480,7 +480,7 @@ void func_800AF29C(unk800AF29C *arg0, s32 arg1, s32 arg2, s16 arg3, s16 arg4, s1 s32 temp_v0_2; s32 flags; - temp_v1 = gParticleBehaviorsAssetTable[arg1]; + temp_v1 = gParticleBehavioursAssetTable[arg1]; arg0->unk8 = arg2; arg0->unk18 = arg3; arg0->unk0 = temp_v1; diff --git a/src/printf.c b/src/printf.c index 53bc8e8f..090be582 100644 --- a/src/printf.c +++ b/src/printf.c @@ -124,14 +124,14 @@ GLOBAL_ASM("asm/non_matchings/printf/print_debug_strings.s") /** * Set the colour of the current debug text. */ -void set_render_printf_color(u8 red, u8 green, u8 blue, u8 alpha) { +void set_render_printf_colour(u8 red, u8 green, u8 blue, u8 alpha) { RENDER_PRINTF_CMD_SET_COLOR(red, green, blue, alpha) } /** * Set the background colour of the current debug text. */ -void set_render_printf_background_color(u8 red, u8 green, u8 blue, u8 alpha) { +void set_render_printf_background_colour(u8 red, u8 green, u8 blue, u8 alpha) { RENDER_PRINTF_CMD_SET_BACKGROUND_COLOR(red, green, blue, alpha) } diff --git a/src/printf.h b/src/printf.h index be90e947..582e83a1 100644 --- a/src/printf.h +++ b/src/printf.h @@ -34,8 +34,8 @@ void func_800B4A08(s32 arg0); void func_800B5E88(void); -void set_render_printf_color(u8 red, u8 green, u8 blue, u8 alpha); -void set_render_printf_background_color(u8 red, u8 green, u8 blue, u8 alpha); +void set_render_printf_colour(u8 red, u8 green, u8 blue, u8 alpha); +void set_render_printf_background_colour(u8 red, u8 green, u8 blue, u8 alpha); void set_render_printf_position(u16 xpos, u16 ypos); // Non Matching diff --git a/src/textures_sprites.c b/src/textures_sprites.c index 6cc66ac0..56f5a739 100644 --- a/src/textures_sprites.c +++ b/src/textures_sprites.c @@ -8,7 +8,7 @@ /************ .data ************/ -u32 gTexColorTag = COLOR_TAG_MAGENTA; +u32 gTexColourTag = COLOR_TAG_MAGENTA; s32 D_800DE7C4 = 1; // See "include/f3ddkr.h" for the defines @@ -962,7 +962,7 @@ TextureHeader *load_texture(s32 arg0) { numberOfTextures = (gTempTextureHeader->header.numOfTextures >> 8) & 0xFFFF; if (!gTempTextureHeader->header.isCompressed) { - tex = allocate_from_main_pool((numberOfTextures * 0x60) + assetSize, gTexColorTag); + tex = allocate_from_main_pool((numberOfTextures * 0x60) + assetSize, gTexColourTag); if (tex == NULL) { return NULL; } @@ -971,7 +971,7 @@ TextureHeader *load_texture(s32 arg0) { temp_v0_5 = byteswap32(&gTempTextureHeader->uncompressedSize); temp_a0 = (numberOfTextures * 0x60) + temp_v0_5; sp3C = temp_v0_5 + 0x20; - tex = allocate_from_main_pool(temp_a0 + 0x20, gTexColorTag); + tex = allocate_from_main_pool(temp_a0 + 0x20, gTexColourTag); if (tex == NULL) { return NULL; } @@ -1054,7 +1054,7 @@ GLOBAL_ASM("asm/non_matchings/textures_sprites/free_texture.s") #endif void func_8007B374(s32 arg0) { - gTexColorTag = arg0; + gTexColourTag = arg0; } #ifdef NON_EQUIVALENT diff --git a/src/textures_sprites.h b/src/textures_sprites.h index 5bdd4565..13723370 100644 --- a/src/textures_sprites.h +++ b/src/textures_sprites.h @@ -7,7 +7,7 @@ #include "structs.h" #include "macros.h" -extern u32 gTexColorTag; +extern u32 gTexColourTag; extern s32 D_800DE7C4; /* Size: 8 bytes */ diff --git a/src/thread30.c b/src/thread30.c index 814a52d0..e502d57f 100644 --- a/src/thread30.c +++ b/src/thread30.c @@ -19,7 +19,7 @@ s32 gThread30LoadDelay = 0; /************ .bss ************/ // Used for __osException, but .bss file order is weird. Need to fix later. -u8 leoDiskStack[16]; //technically should have a OS_LEO_STACKSIZE or something. This is something like 4096 in libreultra... +u8 leoDiscStack[16]; //technically should have a OS_LEO_STACKSIZE or something. This is something like 4096 in libreultra... OSThread gThread30; OSMesgQueue gThread30MesgQueue; OSMesg gThread30Message;