Match a batch (#252)

* Squashed commit of the following:

commit 3ab4716110
Author: Fazana <52551480+FazanaJ@users.noreply.github.com>
Date:   Mon May 23 23:11:46 2022 +0100

    Mostly misc labelling, but also weather too (#232)

    * bit more labelling

    * identify some weather stuff

    * Update sound_ids.h

    * yum

    * more random identification

    * last weather stuff for now

    * Update README.md

    * Update README.md

    * Fix non equivalent

* I found the 60fps button

* match func_80052B64

* match racer_attack_handler

* match func_80048C7C

* buncha function declaring

* e

* tweak

* match func_8004DE38

oh man oh man

* Small bit of labelling

* Merge remote-tracking branch 'upstream/master' into the-many-against-the-few

* Update README.md

* Fix monumentally poor bout of misinformation in the readme

we wouldn't want to mislead the readers, would we?

* github please

* Update README.md

* requested changes

kinda funny because I knew this struct existed, and knew it was used for this, but never made the connection lol

* Update objects.c

* match racer_enter_door

A nice easy one after the pure hellscape of the last few days :)

* names

* renames

* match func_8005250C

* heehee

* Update racer.c

* identify some misc asset calls

* identify some surface types

* match func_8005492C

* Delete func_8005492C.s

* match func_80052D7C

* move some enums

* label all existing misc asset calls

granted I know what almost none of them are lmao, buut will make things slightly easier in the long run

* Update README.md

* requested changes

pain

* Update README.md

* just a bit of labelling

* labbel

* more

* Update structs.h

* file select

* file struct

* Update menu.c

* multiplayer box

* texture naming

* realised why there's 3 indices lol

* rounding

* Update menu.c

* identify textures

* pain

* fix non equiv

* Update src/menu.c

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>

* Update src/unknown_078050.c

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>

* Update src/menu.c

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>

* more texture identification

* character select bytes

actually hate this so much

* Update menu.c

* I aged about 50 years doing this

* character select data

* fix conflicts

* match func_8007A98C

* fix video.c warnings

* rename func

* more video.c labels

* Update video.c

* blacklist windows script files

Mostly a me thing, so I can have some scripts in the root directory without them getting in the way. Since the repo operates exclusively on Linux, this shouldn't have any consequense

* fix build warnings in unknown_078050.c

* More.

* Update sched.c

* object name enum

* match gParticlePtrList_flush

* Update objects.c

* match func_8000E2B4

* Update .gitignore

* object ID enum

* match func_8000B290

* main game loop (and friends)

* Update racer.c

* match render_textured_rectangle

* match various funcs

* fix non equiv

* requested changes

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
This commit is contained in:
Fazana
2022-10-16 19:55:59 +01:00
committed by GitHub
co-authored by Ryan Myers
parent ec98ac4c24
commit 028cfd01bb
57 changed files with 8026 additions and 9431 deletions
+5
View File
@@ -1,5 +1,6 @@
# Baseroms is where the user will place their ROM files.
baseroms/*
nonmatchings/*
# Ignore pycache
__pycache__
@@ -23,3 +24,7 @@ ctx.c.m2c
# Ignore .deb packages
*.deb
# Ignore batch and executable files.
*.exe
*.bat
+23 -23
View File
@@ -115,29 +115,29 @@ s32 is_drumstick_unlocked(void) {
As of October 3rd, 2022, this is our current score:
```
========================================================
ADVENTURE ONE (ASM -> C Decompilation)
------------------- 32.49% Complete --------------------
# Decompiled functions: 1283
# GLOBAL_ASM remaining: 550
# NON_MATCHING functions: 14
# NON_EQUIVALENT WIP functions: 99
--------------------- Game Status ----------------------
Balloons: 17/47, Keys: 2/4, Trophies: 1/5
T.T. Amulets: 1/4, Wizpig Amulets: 1/4
--------------------------------------------------------
We are racing the walrus boss Bluey.
========================================================
ADVENTURE TWO (Cleanup & Documentation)
------------------- 5.48% Complete --------------------
# Documented functions: 197
# Undocumented remaining: 1636
--------------------- Game Status ----------------------
Balloons: 3/47, Keys: 0/4, Trophies: 0/5
T.T. Amulets: 0/4, Wizpig Amulets: 0/4
--------------------------------------------------------
We are collecting the fourth balloon on Timber's Island.
========================================================
==========================================
ADVENTURE ONE (ASM -> C Decompilation)
------------ 33.19% Complete -------------
# Decompiled functions: 1292
# GLOBAL_ASM remaining: 541
# NON_MATCHING functions: 12
# NON_EQUIVALENT WIP functions: 94
-------------- Game Status ---------------
Balloons: 17/47, Keys: 2/4, Trophies: 1/5
T.T. Amulets: 1/4, Wizpig Amulets: 1/4
------------------------------------------
We are racing the walrus boss Bluey.
==========================================
ADVENTURE TWO (Cleanup & Documentation)
------------ 6.13% Complete -------------
# Documented functions: 210
# Undocumented remaining: 1623
-------------- Game Status ---------------
Balloons: 4/47, Keys: 0/4, Trophies: 0/5
T.T. Amulets: 0/4, Wizpig Amulets: 0/4
------------------------------------------
We are racing in Ancient Lake. (Lap 1/3)
==========================================
```
---
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -8,8 +8,8 @@ glabel jpt_800E8488
.text
glabel func_80087734
/* 088334 80087734 3C068012 */ lui $a2, %hi(D_801263BC) # $a2, 0x8012
/* 088338 80087738 8CC663BC */ lw $a2, %lo(D_801263BC)($a2)
/* 088334 80087734 3C068012 */ lui $a2, %hi(gOptionBlinkTimer) # $a2, 0x8012
/* 088338 80087738 8CC663BC */ lw $a2, %lo(gOptionBlinkTimer)($a2)
/* 08833C 8008773C 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 088340 80087740 000670C0 */ sll $t6, $a2, 3
/* 088344 80087744 29C10100 */ slti $at, $t6, 0x100
File diff suppressed because it is too large Load Diff
+12 -12
View File
@@ -1,8 +1,8 @@
glabel func_80093D40
/* 094940 80093D40 27BDFFB8 */ addiu $sp, $sp, -0x48
/* 094944 80093D44 AFB3002C */ sw $s3, 0x2c($sp)
/* 094948 80093D48 3C13800E */ lui $s3, %hi(D_800E0984) # $s3, 0x800e
/* 09494C 80093D4C 26730984 */ addiu $s3, %lo(D_800E0984) # addiu $s3, $s3, 0x984
/* 094948 80093D48 3C13800E */ lui $s3, %hi(gMenuOptionCap) # $s3, 0x800e
/* 09494C 80093D4C 26730984 */ addiu $s3, %lo(gMenuOptionCap) # addiu $s3, $s3, 0x984
/* 094950 80093D50 8E620000 */ lw $v0, ($s3)
/* 094954 80093D54 AFB10024 */ sw $s1, 0x24($sp)
/* 094958 80093D58 AFBF0034 */ sw $ra, 0x34($sp)
@@ -13,8 +13,8 @@ glabel func_80093D40
/* 09496C 80093D6C 00008825 */ move $s1, $zero
/* 094970 80093D70 18400013 */ blez $v0, .L80093DC0
/* 094974 80093D74 240800A0 */ li $t0, 160
/* 094978 80093D78 3C108012 */ lui $s0, %hi(D_80126A40) # $s0, 0x8012
/* 09497C 80093D7C 26106A40 */ addiu $s0, %lo(D_80126A40) # addiu $s0, $s0, 0x6a40
/* 094978 80093D78 3C108012 */ lui $s0, %hi(gMenuOptionText) # $s0, 0x8012
/* 09497C 80093D7C 26106A40 */ addiu $s0, %lo(gMenuOptionText) # addiu $s0, $s0, 0x6a40
.L80093D80:
/* 094980 80093D80 8E040000 */ lw $a0, ($s0)
/* 094984 80093D84 00002825 */ move $a1, $zero
@@ -101,9 +101,9 @@ glabel func_80093D40
/* 094AB8 80093EB8 24040007 */ li $a0, 7
/* 094ABC 80093EBC 0C031400 */ jal set_current_text_colour
/* 094AC0 80093EC0 AFAD0010 */ sw $t5, 0x10($sp)
/* 094AC4 80093EC4 3C148012 */ lui $s4, %hi(D_801263BC) # $s4, 0x8012
/* 094AC8 80093EC8 8E9463BC */ lw $s4, %lo(D_801263BC)($s4)
/* 094ACC 80093ECC 3C12800E */ lui $s2, %hi(D_800E0988) # $s2, 0x800e
/* 094AC4 80093EC4 3C148012 */ lui $s4, %hi(gOptionBlinkTimer) # $s4, 0x8012
/* 094AC8 80093EC8 8E9463BC */ lw $s4, %lo(gOptionBlinkTimer)($s4)
/* 094ACC 80093ECC 3C12800E */ lui $s2, %hi(gMenuSubOption) # $s2, 0x800e
/* 094AD0 80093ED0 001478C0 */ sll $t7, $s4, 3
/* 094AD4 80093ED4 29E10100 */ slti $at, $t7, 0x100
/* 094AD8 80093ED8 14200003 */ bnez $at, .L80093EE8
@@ -111,7 +111,7 @@ glabel func_80093D40
/* 094AE0 80093EE0 241801FF */ li $t8, 511
/* 094AE4 80093EE4 030FA023 */ subu $s4, $t8, $t7
.L80093EE8:
/* 094AE8 80093EE8 26520988 */ addiu $s2, %lo(D_800E0988) # addiu $s2, $s2, 0x988
/* 094AE8 80093EE8 26520988 */ addiu $s2, %lo(gMenuSubOption) # addiu $s2, $s2, 0x988
/* 094AEC 80093EEC 8E590000 */ lw $t9, ($s2)
/* 094AF0 80093EF0 24040007 */ li $a0, 7
/* 094AF4 80093EF4 13200060 */ beqz $t9, .L80094078
@@ -232,11 +232,11 @@ glabel func_80093D40
/* 094CA4 800940A4 00008825 */ move $s1, $zero
/* 094CA8 800940A8 19C00027 */ blez $t6, .L80094148
/* 094CAC 800940AC 24120020 */ li $s2, 32
/* 094CB0 800940B0 3C108012 */ lui $s0, %hi(D_80126A40) # $s0, 0x8012
/* 094CB4 800940B4 26106A40 */ addiu $s0, %lo(D_80126A40) # addiu $s0, $s0, 0x6a40
/* 094CB0 800940B0 3C108012 */ lui $s0, %hi(gMenuOptionText) # $s0, 0x8012
/* 094CB4 800940B4 26106A40 */ addiu $s0, %lo(gMenuOptionText) # addiu $s0, $s0, 0x6a40
.L800940B8:
/* 094CB8 800940B8 3C0F8012 */ lui $t7, %hi(D_80126A68) # $t7, 0x8012
/* 094CBC 800940BC 8DEF6A68 */ lw $t7, %lo(D_80126A68)($t7)
/* 094CB8 800940B8 3C0F8012 */ lui $t7, %hi(gMenuOption) # $t7, 0x8012
/* 094CBC 800940BC 8DEF6A68 */ lw $t7, %lo(gMenuOption)($t7)
/* 094CC0 800940C0 24040007 */ li $a0, 7
/* 094CC4 800940C4 162F000B */ bne $s1, $t7, .L800940F4
/* 094CC8 800940C8 240500FF */ li $a1, 255
+6 -6
View File
@@ -98,24 +98,24 @@ glabel func_80094688
.L800947EC:
/* 0953EC 800947EC 3C018012 */ lui $at, %hi(D_80126CC0) # $at, 0x8012
/* 0953F0 800947F0 AC206CC0 */ sw $zero, %lo(D_80126CC0)($at)
/* 0953F4 800947F4 3C018012 */ lui $at, %hi(D_801263BC) # $at, 0x8012
/* 0953F8 800947F8 AC2063BC */ sw $zero, %lo(D_801263BC)($at)
/* 0953F4 800947F4 3C018012 */ lui $at, %hi(gOptionBlinkTimer) # $at, 0x8012
/* 0953F8 800947F8 AC2063BC */ sw $zero, %lo(gOptionBlinkTimer)($at)
/* 0953FC 800947FC 3C018012 */ lui $at, %hi(D_801263D8) # $at, 0x8012
/* 095400 80094800 AC2063D8 */ sw $zero, %lo(D_801263D8)($at)
/* 095404 80094804 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e
/* 095408 80094808 AC20F47C */ sw $zero, %lo(gMenuDelay)($at)
/* 09540C 8009480C 3C01800E */ lui $at, %hi(D_800DF460) # $at, 0x800e
/* 095410 80094810 AC20F460 */ sw $zero, %lo(D_800DF460)($at)
/* 095414 80094814 3C018012 */ lui $at, %hi(D_80126A68) # $at, 0x8012
/* 095418 80094818 AC206A68 */ sw $zero, %lo(D_80126A68)($at)
/* 095414 80094814 3C018012 */ lui $at, %hi(gMenuOption) # $at, 0x8012
/* 095418 80094818 AC206A68 */ sw $zero, %lo(gMenuOption)($at)
/* 09541C 8009481C 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012
/* 095420 80094820 240C0001 */ li $t4, 1
/* 095424 80094824 AC2C63C4 */ sw $t4, %lo(gIgnorePlayerInput)($at)
/* 095428 80094828 3C018012 */ lui $at, %hi(D_80126C54) # $at, 0x8012
/* 09542C 8009482C 240EFFFF */ li $t6, -1
/* 095430 80094830 AC2E6C54 */ sw $t6, %lo(D_80126C54)($at)
/* 095434 80094834 3C01800E */ lui $at, %hi(D_800E0988) # $at, 0x800e
/* 095438 80094838 AC200988 */ sw $zero, %lo(D_800E0988)($at)
/* 095434 80094834 3C01800E */ lui $at, %hi(gMenuSubOption) # $at, 0x800e
/* 095438 80094838 AC200988 */ sw $zero, %lo(gMenuSubOption)($at)
/* 09543C 8009483C 3C018012 */ lui $at, %hi(D_80126C1C) # $at, 0x8012
/* 095440 80094840 AC206C1C */ sw $zero, %lo(D_80126C1C)($at)
/* 095444 80094844 8FAD0028 */ lw $t5, 0x28($sp)
+6 -6
View File
@@ -28,8 +28,8 @@ glabel func_80094D28
/* 095970 80094D70 00002025 */ move $a0, $zero
/* 095974 80094D74 0C019A25 */ jal func_80066894
/* 095978 80094D78 24050001 */ li $a1, 1
/* 09597C 80094D7C 3C138012 */ lui $s3, %hi(D_801263BC) # $s3, 0x8012
/* 095980 80094D80 8E7363BC */ lw $s3, %lo(D_801263BC)($s3)
/* 09597C 80094D7C 3C138012 */ lui $s3, %hi(gOptionBlinkTimer) # $s3, 0x8012
/* 095980 80094D80 8E7363BC */ lw $s3, %lo(gOptionBlinkTimer)($s3)
/* 095984 80094D84 3C198012 */ lui $t9, %hi(D_801263E0) # $t9, 0x8012
/* 095988 80094D88 001378C0 */ sll $t7, $s3, 3
/* 09598C 80094D8C 29E10100 */ slti $at, $t7, 0x100
@@ -434,9 +434,9 @@ glabel L800951CC
/* 095F3C 8009533C 00000000 */ nop
.L80095340:
/* 095F40 80095340 8C4D0000 */ lw $t5, ($v0)
/* 095F44 80095344 3C11800E */ lui $s1, %hi(D_800E0988) # $s1, 0x800e
/* 095F44 80095344 3C11800E */ lui $s1, %hi(gMenuSubOption) # $s1, 0x800e
/* 095F48 80095348 11A00020 */ beqz $t5, .L800953CC
/* 095F4C 8009534C 26310988 */ addiu $s1, %lo(D_800E0988) # addiu $s1, $s1, 0x988
/* 095F4C 8009534C 26310988 */ addiu $s1, %lo(gMenuSubOption) # addiu $s1, $s1, 0x988
/* 095F50 80095350 3C0E8012 */ lui $t6, %hi(D_80126C24) # $t6, 0x8012
/* 095F54 80095354 8DCE6C24 */ lw $t6, %lo(D_80126C24)($t6)
/* 095F58 80095358 2412000C */ li $s2, 12
@@ -545,8 +545,8 @@ glabel L800951CC
/* 0960E0 800954E0 3C118012 */ lui $s1, %hi(D_80126BF0) # $s1, 0x8012
/* 0960E4 800954E4 26316BF0 */ addiu $s1, %lo(D_80126BF0) # addiu $s1, $s1, 0x6bf0
.L800954E8:
/* 0960E8 800954E8 3C0B8012 */ lui $t3, %hi(D_80126A68) # $t3, 0x8012
/* 0960EC 800954EC 8D6B6A68 */ lw $t3, %lo(D_80126A68)($t3)
/* 0960E8 800954E8 3C0B8012 */ lui $t3, %hi(gMenuOption) # $t3, 0x8012
/* 0960EC 800954EC 8D6B6A68 */ lw $t3, %lo(gMenuOption)($t3)
/* 0960F0 800954F0 24040007 */ li $a0, 7
/* 0960F4 800954F4 160B000B */ bne $s0, $t3, .L80095524
/* 0960F8 800954F8 240500FF */ li $a1, 255
File diff suppressed because it is too large Load Diff
+8 -8
View File
@@ -119,8 +119,8 @@ glabel func_80096978
/* 09773C 80096B3C 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 097740 80096B40 1500000E */ bnez $t0, .L80096B7C
/* 097744 80096B44 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 097748 80096B48 3C028012 */ lui $v0, %hi(D_801263BC) # $v0, 0x8012
/* 09774C 80096B4C 8C4263BC */ lw $v0, %lo(D_801263BC)($v0)
/* 097748 80096B48 3C028012 */ lui $v0, %hi(gOptionBlinkTimer) # $v0, 0x8012
/* 09774C 80096B4C 8C4263BC */ lw $v0, %lo(gOptionBlinkTimer)($v0)
/* 097750 80096B50 00000000 */ nop
/* 097754 80096B54 28410020 */ slti $at, $v0, 0x20
/* 097758 80096B58 10200005 */ beqz $at, .L80096B70
@@ -441,9 +441,9 @@ glabel func_80096978
/* 097C08 80097008 00003825 */ move $a3, $zero
/* 097C0C 8009700C 0C031414 */ jal set_current_text_background_colour
/* 097C10 80097010 AFA00010 */ sw $zero, 0x10($sp)
/* 097C14 80097014 3C028012 */ lui $v0, %hi(D_801263BC) # $v0, 0x8012
/* 097C18 80097018 8C4263BC */ lw $v0, %lo(D_801263BC)($v0)
/* 097C1C 8009701C 3C10800E */ lui $s0, %hi(D_800E0988) # $s0, 0x800e
/* 097C14 80097014 3C028012 */ lui $v0, %hi(gOptionBlinkTimer) # $v0, 0x8012
/* 097C18 80097018 8C4263BC */ lw $v0, %lo(gOptionBlinkTimer)($v0)
/* 097C1C 8009701C 3C10800E */ lui $s0, %hi(gMenuSubOption) # $s0, 0x800e
/* 097C20 80097020 000248C0 */ sll $t1, $v0, 3
/* 097C24 80097024 29210100 */ slti $at, $t1, 0x100
/* 097C28 80097028 14200003 */ bnez $at, .L80097038
@@ -451,7 +451,7 @@ glabel func_80096978
/* 097C30 80097030 240801FF */ li $t0, 511
/* 097C34 80097034 01091023 */ subu $v0, $t0, $t1
.L80097038:
/* 097C38 80097038 26100988 */ addiu $s0, %lo(D_800E0988) # addiu $s0, $s0, 0x988
/* 097C38 80097038 26100988 */ addiu $s0, %lo(gMenuSubOption) # addiu $s0, $s0, 0x988
/* 097C3C 8009703C 8E0A0000 */ lw $t2, ($s0)
/* 097C40 80097040 8FB900A8 */ lw $t9, 0xa8($sp)
/* 097C44 80097044 11400055 */ beqz $t2, .L8009719C
@@ -550,8 +550,8 @@ glabel func_80096978
/* 097DA4 800971A4 1B20002E */ blez $t9, .L80097260
/* 097DA8 800971A8 AFAA00A8 */ sw $t2, 0xa8($sp)
/* 097DAC 800971AC 3C108012 */ lui $s0, %hi(D_80126BF0) # $s0, 0x8012
/* 097DB0 800971B0 3C128012 */ lui $s2, %hi(D_80126A68) # $s2, 0x8012
/* 097DB4 800971B4 26526A68 */ addiu $s2, %lo(D_80126A68) # addiu $s2, $s2, 0x6a68
/* 097DB0 800971B0 3C128012 */ lui $s2, %hi(gMenuOption) # $s2, 0x8012
/* 097DB4 800971B4 26526A68 */ addiu $s2, %lo(gMenuOption) # addiu $s2, $s2, 0x6a68
/* 097DB8 800971B8 26106BF0 */ addiu $s0, %lo(D_80126BF0) # addiu $s0, $s0, 0x6bf0
/* 097DBC 800971BC AFA200A0 */ sw $v0, 0xa0($sp)
.L800971C0:
+2 -2
View File
@@ -1,6 +1,6 @@
glabel func_80098EBC
/* 099ABC 80098EBC 3C028012 */ lui $v0, %hi(D_801263BC) # $v0, 0x8012
/* 099AC0 80098EC0 244263BC */ addiu $v0, %lo(D_801263BC) # addiu $v0, $v0, 0x63bc
/* 099ABC 80098EBC 3C028012 */ lui $v0, %hi(gOptionBlinkTimer) # $v0, 0x8012
/* 099AC0 80098EC0 244263BC */ addiu $v0, %lo(gOptionBlinkTimer) # addiu $v0, $v0, 0x63bc
/* 099AC4 80098EC4 8C4E0000 */ lw $t6, ($v0)
/* 099AC8 80098EC8 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 099ACC 80098ECC 01C47821 */ addu $t7, $t6, $a0
File diff suppressed because it is too large Load Diff
@@ -1,6 +1,6 @@
glabel menu_audio_options_loop
/* 085874 80084C74 3C038012 */ lui $v1, %hi(D_801263BC) # $v1, 0x8012
/* 085878 80084C78 246363BC */ addiu $v1, %lo(D_801263BC) # addiu $v1, $v1, 0x63bc
/* 085874 80084C74 3C038012 */ lui $v1, %hi(gOptionBlinkTimer) # $v1, 0x8012
/* 085878 80084C78 246363BC */ addiu $v1, %lo(gOptionBlinkTimer) # addiu $v1, $v1, 0x63bc
/* 08587C 80084C7C 8C6E0000 */ lw $t6, ($v1)
/* 085880 80084C80 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e
/* 085884 80084C84 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
@@ -25,8 +25,8 @@ glabel menu_magic_codes_list_loop
/* 08B580 8008A980 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0)
/* 08B584 8008A984 00000000 */ nop
.L8008A988:
/* 08B588 8008A988 3C038012 */ lui $v1, %hi(D_801263BC) # $v1, 0x8012
/* 08B58C 8008A98C 246363BC */ addiu $v1, %lo(D_801263BC) # addiu $v1, $v1, 0x63bc
/* 08B588 8008A988 3C038012 */ lui $v1, %hi(gOptionBlinkTimer) # $v1, 0x8012
/* 08B58C 8008A98C 246363BC */ addiu $v1, %lo(gOptionBlinkTimer) # addiu $v1, $v1, 0x63bc
/* 08B590 8008A990 8C780000 */ lw $t8, ($v1)
/* 08B594 8008A994 2841FFED */ slti $at, $v0, -0x13
/* 08B598 8008A998 0304C821 */ addu $t9, $t8, $a0
@@ -19,9 +19,9 @@ glabel menu_magic_codes_loop
.L80089D1C:
/* 08A91C 80089D1C 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e
/* 08A920 80089D20 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0)
/* 08A924 80089D24 3C038012 */ lui $v1, %hi(D_801263BC) # $v1, 0x8012
/* 08A924 80089D24 3C038012 */ lui $v1, %hi(gOptionBlinkTimer) # $v1, 0x8012
/* 08A928 80089D28 1040000F */ beqz $v0, .L80089D68
/* 08A92C 80089D2C 246363BC */ addiu $v1, %lo(D_801263BC) # addiu $v1, $v1, 0x63bc
/* 08A92C 80089D2C 246363BC */ addiu $v1, %lo(gOptionBlinkTimer) # addiu $v1, $v1, 0x63bc
/* 08A930 80089D30 18400008 */ blez $v0, .L80089D54
/* 08A934 80089D34 0044C823 */ subu $t9, $v0, $a0
/* 08A938 80089D38 0044C021 */ addu $t8, $v0, $a0
+2 -2
View File
@@ -1,6 +1,6 @@
glabel menu_options_loop
/* 084F5C 8008435C 3C038012 */ lui $v1, %hi(D_801263BC) # $v1, 0x8012
/* 084F60 80084360 246363BC */ addiu $v1, %lo(D_801263BC) # addiu $v1, $v1, 0x63bc
/* 084F5C 8008435C 3C038012 */ lui $v1, %hi(gOptionBlinkTimer) # $v1, 0x8012
/* 084F60 80084360 246363BC */ addiu $v1, %lo(gOptionBlinkTimer) # addiu $v1, $v1, 0x63bc
/* 084F64 80084364 8C6E0000 */ lw $t6, ($v1)
/* 084F68 80084368 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e
/* 084F6C 8008436C 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84

Some files were not shown because too many files have changed in this diff Show More