izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'DavidSM64:master' into main

Browse Source
This commit is contained in:
Fazana
2022-03-23 12:14:09 +00:00
committed by GitHub
parent aca46f67b5 d2eb45ff48
commit 2dab28b57a
269 changed files with 3480 additions and 6665 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
+1 -1
View File
@@ -1,3 +1,3 @@
[submodule "tools/ido-static-recomp"]
path = tools/ido-static-recomp
url = https://github.com/Emill/ido-static-recomp
url = https://github.com/decompals/ido-static-recomp
Makefile
+18 -12
View File
@@ -18,6 +18,9 @@ endif
ifeq ($(NON_MATCHING),1)
DEFINES += NON_MATCHING=1
endif
ifeq ($(NON_EQUIVALENT),1)
DEFINES += NON_EQUIVALENT=1
endif
# Whether to hide commands or not
VERBOSE ?= 0
@@ -87,7 +90,7 @@ $(foreach p,$(RECOMP_TOOLS_PATHS),$(if $(wildcard $(p)),,$(info $(p) does not ex
# If any of the tools do not exist, then recomp needs to run to build them.
ifeq ($(runRecomp),yes)
DUMMY != cd $(RECOMP_PROJECT) && python3 build.py ido/5.3 -O2 && cd ../../ >&2 || echo FAIL
DUMMY != cd $(RECOMP_PROJECT) && python3 build.py ido/5.3 -O2 && cp build5.3/out/usr/bin/cc build5.3/out/cc && cp build5.3/out/usr/lib/* build5.3/out/ && cd ../../ >&2 || echo FAIL
endif
######## Extract Assets & Microcode ########
@@ -144,16 +147,19 @@ else
endif
MIPSISET := -mips1
OPT_FLAGS := -O2
OPT_FLAGS := -O2 -Xfullwarn #include -Xfullwarn here since it's not supported with -O3
INCLUDE_DIRS := include $(BUILD_DIR) $(BUILD_DIR)/include src include/libc .
C_DEFINES := $(foreach d,$(DEFINES),-D$(d))
DEF_INC_CFLAGS := $(foreach i,$(INCLUDE_DIRS),-I$(i)) $(C_DEFINES)
#IDO Warnings to Ignore. These are coding style warnings we don't follow
IDO_IGNORE_WARNINGS = -woff 838,649,624
ASFLAGS = -mtune=vr4300 -march=vr4300 -mabi=32 $(foreach d,$(DEFINES),--defsym $(d))
INCLUDE_CFLAGS := -I include -I $(BUILD_DIR) -I src -I . -I include/libc
CFLAGS = -c -Wab,-r4300_mul -non_shared -G 0 -Xcpluscomm -Xfullwarn -signed -DNDEBUG $(OPT_FLAGS) $(MIPSISET) $(INCLUDE_CFLAGS) $(DEF_INC_CFLAGS)
CFLAGS = -c -Wab,-r4300_mul -non_shared -G 0 -Xcpluscomm -signed -DNDEBUG $(OPT_FLAGS) $(MIPSISET) $(INCLUDE_CFLAGS) $(DEF_INC_CFLAGS) $(IDO_IGNORE_WARNINGS)
LDFLAGS = undefined_syms.txt -T $(LD_SCRIPT) -Map $(BUILD_DIR)/dkr.map
####################### Other Tools #########################
@@ -308,14 +314,14 @@ ALL_ASSETS_BUILT += $(patsubst $(UCODE_IN_DIR)/%.bin,$(UCODE_OUT_DIR)/%.bin,$(UC
####################### LIBULTRA #########################
$(BUILD_DIR)/lib/%.o: OPT_FLAGS := -O2
$(BUILD_DIR)/lib/%.o: OPT_FLAGS := -O2 -Xfullwarn
$(BUILD_DIR)/lib/src/al/%.o: OPT_FLAGS := -O3
$(BUILD_DIR)/lib/src/os/%.o: OPT_FLAGS := -O1
$(BUILD_DIR)/lib/src/os/osViMgr.o: OPT_FLAGS := -O2
$(BUILD_DIR)/lib/src/os/osCreatePiManager.o: OPT_FLAGS := -O2
$(BUILD_DIR)/lib/src/os/osMotor.o: OPT_FLAGS := -O2
$(BUILD_DIR)/lib/src/os/%.o: OPT_FLAGS := -O1 -Xfullwarn
$(BUILD_DIR)/lib/src/os/osViMgr.o: OPT_FLAGS := -O2 -Xfullwarn
$(BUILD_DIR)/lib/src/os/osCreatePiManager.o: OPT_FLAGS := -O2 -Xfullwarn
$(BUILD_DIR)/lib/src/os/osMotor.o: OPT_FLAGS := -O2 -Xfullwarn
$(BUILD_DIR)/lib/src/libc/xprintf.o : OPT_FLAGS := -O3
$(BUILD_DIR)/lib/src/al/unknown_0C9C90.o: OPT_FLAGS := -O2 -Wo,-loopunroll,0
$(BUILD_DIR)/lib/src/al/unknown_0C9C90.o: OPT_FLAGS := -O2 -Xfullwarn -Wo,-loopunroll,0
#$(BUILD_DIR)/lib/src/libc/llcvt.o: OPT_FLAGS :=
#$(BUILD_DIR)/lib/src/libc/llcvt.o: MIPSISET := -mips3 32
@@ -324,7 +330,7 @@ $(BUILD_DIR)/lib/src/mips1/%.o: MIPSISET := -mips1
$(BUILD_DIR)/lib/src/os/osMotor.o: MIPSISET := -mips1
# asm-processor currently does not support -O3, so this is my workaround.
$(BUILD_DIR)/lib/src/al/global_asm/%.o: OPT_FLAGS := -O2
$(BUILD_DIR)/lib/src/al/global_asm/%.o: OPT_FLAGS := -O2 -Xfullwarn
######################## Targets #############################
@@ -487,12 +493,12 @@ $(BUILD_DIR)/%.o: %.s | $(ALL_ASSETS_BUILT)
$(BUILD_DIR)/%.o: %.c | $(ALL_ASSETS_BUILT)
$(call print,Compiling:,$<,$@)
@$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
$(V)$(CC) -c $(CFLAGS) -o $@ $<
$(V)$(CC) $(CFLAGS) -o $@ $<
$(BUILD_DIR)/%.o: $(BUILD_DIR)/%.c | $(ALL_ASSETS_BUILT)
$(call print,Compiling:,$<,$@)
@$(CC_CHECK) $(CC_CHECK_CFLAGS) -MMD -MP -MT $@ -MF $(BUILD_DIR)/$*.d $<
$(V)$(CC) -c $(CFLAGS) -o $@ $<
$(V)$(CC) $(CFLAGS) -o $@ $<
$(BUILD_DIR)/$(LD_SCRIPT): $(LD_SCRIPT) | $(ALL_ASSETS_BUILT)
$(call print,Preprocessing linker script:,$<,$@)
README.md
+11 -11
View File
@@ -113,31 +113,31 @@ s32 is_drumstick_unlocked(void) {
}
```
As of Feburary 8th, 2022, this is our current score:
As of Feburary 23rd, 2022, this is our current score:
```
=====================================================================
ADVENTURE ONE (ASM -> C Decompilation)
-------------------------- 20.02% Complete --------------------------
# Decompiled functions: 1026
# GLOBAL_ASM remaining: 722
# NON_MATCHING functions: 3
# NON_EQUIVALENT WIP functions: 93
-------------------------- 21.15% Complete --------------------------
# Decompiled functions: 1048
# GLOBAL_ASM remaining: 699
# NON_MATCHING functions: 6
# NON_EQUIVALENT WIP functions: 91
---------------------------- Game Status ----------------------------
Balloons: 11/47, Keys: 1/4, Trophies: 0/5
T.T. Amulets: 1/4, Wizpig Amulets: 0/4
---------------------------------------------------------------------
We are collecting silver coins in Hot Top Volcano. (1/8 silver coins)
We are collecting silver coins in Hot Top Volcano. (8/8 silver coins)
=====================================================================
ADVENTURE TWO (Cleanup & Documentation)
-------------------------- 2.54% Complete --------------------------
# Documented functions: 134
# Undocumented remaining: 1614
-------------------------- 2.73% Complete --------------------------
# Documented functions: 141
# Undocumented remaining: 1606
---------------------------- Game Status ----------------------------
Balloons: 1/47, Keys: 0/4, Trophies: 0/5
T.T. Amulets: 0/4, Wizpig Amulets: 0/4
---------------------------------------------------------------------
We are collecting the second balloon on Timber's Island.
=====================================================================
=====================================================================
```
---
asm/non_matchings/game/func_8006A6B0.s
+4 -4
View File
@@ -233,8 +233,8 @@ glabel func_8006A6B0
/* 06B614 8006AA14 AFA70050 */ sw $a3, 0x50($sp)
/* 06B618 8006AA18 0C01C327 */ jal allocate_from_main_pool_safe
/* 06B61C 8006AA1C 34A500FF */ ori $a1, (0xFFFF00FF & 0xFFFF) # ori $a1, $a1, 0xff
/* 06B620 8006AA20 3C038012 */ lui $v1, %hi(D_8012116C) # $v1, 0x8012
/* 06B624 8006AA24 2463116C */ addiu $v1, %lo(D_8012116C) # addiu $v1, $v1, 0x116c
/* 06B620 8006AA20 3C038012 */ lui $v1, %hi(gLevelNames) # $v1, 0x8012
/* 06B624 8006AA24 2463116C */ addiu $v1, %lo(gLevelNames) # addiu $v1, $v1, 0x116c
/* 06B628 8006AA28 8FA40050 */ lw $a0, 0x50($sp)
/* 06B62C 8006AA2C 3C05FFFF */ lui $a1, (0xFFFF00FF >> 16) # lui $a1, 0xffff
/* 06B630 8006AA30 AC620000 */ sw $v0, ($v1)
@@ -248,8 +248,8 @@ glabel func_8006A6B0
/* 06B650 8006AA50 00402825 */ move $a1, $v0
/* 06B654 8006AA54 0C01DB9A */ jal load_asset_to_address
/* 06B658 8006AA58 00003025 */ move $a2, $zero
/* 06B65C 8006AA5C 3C038012 */ lui $v1, %hi(D_8012116C) # $v1, 0x8012
/* 06B660 8006AA60 2463116C */ addiu $v1, %lo(D_8012116C) # addiu $v1, $v1, 0x116c
/* 06B65C 8006AA5C 3C038012 */ lui $v1, %hi(gLevelNames) # $v1, 0x8012
/* 06B660 8006AA60 2463116C */ addiu $v1, %lo(gLevelNames) # addiu $v1, $v1, 0x116c
/* 06B664 8006AA64 1A200035 */ blez $s1, .L8006AB3C
/* 06B668 8006AA68 00003825 */ move $a3, $zero
/* 06B66C 8006AA6C 32250003 */ andi $a1, $s1, 3
asm/non_matchings/game_ui/func_800A277C.s
+3 -3
View File
@@ -55,7 +55,7 @@ glabel func_800A277C
/* 0A33DC 800A27DC AFA900A8 */ sw $t1, 0xa8($sp)
/* 0A33E0 800A27E0 27A40090 */ addiu $a0, $sp, 0x90
/* 0A33E4 800A27E4 00002825 */ move $a1, $zero
/* 0A33E8 800A27E8 0C003A95 */ jal func_8000EA54
/* 0A33E8 800A27E8 0C003A95 */ jal spawn_object
/* 0A33EC 800A27EC A3AB0090 */ sb $t3, 0x90($sp)
/* 0A33F0 800A27F0 8E0D0000 */ lw $t5, ($s0)
/* 0A33F4 800A27F4 8FA900A8 */ lw $t1, 0xa8($sp)
@@ -90,7 +90,7 @@ glabel func_800A277C
/* 0A3464 800A2864 AFA900A8 */ sw $t1, 0xa8($sp)
/* 0A3468 800A2868 27A40088 */ addiu $a0, $sp, 0x88
/* 0A346C 800A286C 00002825 */ move $a1, $zero
/* 0A3470 800A2870 0C003A95 */ jal func_8000EA54
/* 0A3470 800A2870 0C003A95 */ jal spawn_object
/* 0A3474 800A2874 A3AB0088 */ sb $t3, 0x88($sp)
/* 0A3478 800A2878 8E0D0000 */ lw $t5, ($s0)
/* 0A347C 800A287C 8FA900A8 */ lw $t1, 0xa8($sp)
@@ -477,7 +477,7 @@ glabel func_800A277C
/* 0A3A14 800A2E14 AFA800BC */ sw $t0, 0xbc($sp)
/* 0A3A18 800A2E18 27A500B4 */ addiu $a1, $sp, 0xb4
/* 0A3A1C 800A2E1C 27A600B0 */ addiu $a2, $sp, 0xb0
/* 0A3A20 800A2E20 0C0165E4 */ jal func_80059790
/* 0A3A20 800A2E20 0C0165E4 */ jal get_timestamp_from_frames
/* 0A3A24 800A2E24 27A700AC */ addiu $a3, $sp, 0xac
/* 0A3A28 800A2E28 8FAC003C */ lw $t4, 0x3c($sp)
/* 0A3A2C 800A2E2C 3C01800E */ lui $at, %hi(D_800E2834) # $at, 0x800e
asm/non_matchings/game_ui/func_800A6254.s
+2 -2
View File
@@ -437,7 +437,7 @@ glabel L800A63D8
.L800A6890:
/* 0A7490 800A6890 27A50040 */ addiu $a1, $sp, 0x40
/* 0A7494 800A6894 27A70038 */ addiu $a3, $sp, 0x38
/* 0A7498 800A6898 0C0165E4 */ jal func_80059790
/* 0A7498 800A6898 0C0165E4 */ jal get_timestamp_from_frames
/* 0A749C 800A689C AFA80048 */ sw $t0, 0x48($sp)
/* 0A74A0 800A68A0 3C098012 */ lui $t1, %hi(D_80126CDC) # $t1, 0x8012
/* 0A74A4 800A68A4 25296CDC */ addiu $t1, %lo(D_80126CDC) # addiu $t1, $t1, 0x6cdc
@@ -454,7 +454,7 @@ glabel L800A63D8
/* 0A74D0 800A68D0 27A70038 */ addiu $a3, $sp, 0x38
/* 0A74D4 800A68D4 A30F02FC */ sb $t7, 0x2fc($t8)
/* 0A74D8 800A68D8 8FA40048 */ lw $a0, 0x48($sp)
/* 0A74DC 800A68DC 0C0165E4 */ jal func_80059790
/* 0A74DC 800A68DC 0C0165E4 */ jal get_timestamp_from_frames
/* 0A74E0 800A68E0 00000000 */ nop
/* 0A74E4 800A68E4 3C098012 */ lui $t1, %hi(D_80126CDC) # $t1, 0x8012
/* 0A74E8 800A68E8 25296CDC */ addiu $t1, %lo(D_80126CDC) # addiu $t1, $t1, 0x6cdc
asm/non_matchings/game_ui/func_800A7B68.s
+1 -1
View File
@@ -130,7 +130,7 @@ glabel func_800A7B68
/* 0A8948 800A7D48 27A50054 */ addiu $a1, $sp, 0x54
/* 0A894C 800A7D4C 27A60050 */ addiu $a2, $sp, 0x50
/* 0A8950 800A7D50 27A7004C */ addiu $a3, $sp, 0x4c
/* 0A8954 800A7D54 0C0165E4 */ jal func_80059790
/* 0A8954 800A7D54 0C0165E4 */ jal get_timestamp_from_frames
/* 0A8958 800A7D58 AFA90044 */ sw $t1, 0x44($sp)
/* 0A895C 800A7D5C 8FB80048 */ lw $t8, 0x48($sp)
/* 0A8960 800A7D60 8FA90044 */ lw $t1, 0x44($sp)
asm/non_matchings/game_ui/func_800AA600.s
+1 -1
View File
@@ -93,7 +93,7 @@ glabel func_800AA600
/* 0AB33C 800AA73C A3B8009D */ sb $t8, 0x9d($sp)
/* 0AB340 800AA740 A7A000A0 */ sh $zero, 0xa0($sp)
/* 0AB344 800AA744 A7A000A2 */ sh $zero, 0xa2($sp)
/* 0AB348 800AA748 0C003A95 */ jal func_8000EA54
/* 0AB348 800AA748 0C003A95 */ jal spawn_object
/* 0AB34C 800AA74C 00002825 */ move $a1, $zero
/* 0AB350 800AA750 3C098012 */ lui $t1, %hi(D_80126CF4) # $t1, 0x8012
/* 0AB354 800AA754 860B0006 */ lh $t3, 6($s0)
asm/non_matchings/main/func_80065D98.s
-40
View File
@@ -1,40 +0,0 @@
glabel func_80065D98
/* 066998 80065D98 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 06699C 80065D9C AFBF001C */ sw $ra, 0x1c($sp)
/* 0669A0 80065DA0 0C02DBD4 */ jal func_800B6F50
/* 0669A4 80065DA4 AFA40020 */ sw $a0, 0x20($sp)
/* 0669A8 80065DA8 3C0E8012 */ lui $t6, %hi(gThread3StackPointer) # $t6, 0x8012
/* 0669AC 80065DAC 25CEF758 */ addiu $t6, %lo(gThread3StackPointer) # addiu $t6, $t6, -0x8a8
/* 0669B0 80065DB0 3C048012 */ lui $a0, %hi(gThread3) # $a0, 0x8012
/* 0669B4 80065DB4 3C068007 */ lui $a2, %hi(thread3_main) # $a2, 0x8007
/* 0669B8 80065DB8 240F000A */ li $t7, 10
/* 0669BC 80065DBC AFAF0014 */ sw $t7, 0x14($sp)
/* 0669C0 80065DC0 24C6C330 */ addiu $a2, %lo(thread3_main) # addiu $a2, $a2, -0x3cd0
/* 0669C4 80065DC4 2484F910 */ addiu $a0, %lo(gThread3) # addiu $a0, $a0, -0x6f0
/* 0669C8 80065DC8 AFAE0010 */ sw $t6, 0x10($sp)
/* 0669CC 80065DCC 24050003 */ li $a1, 3
/* 0669D0 80065DD0 0C032214 */ jal osCreateThread
/* 0669D4 80065DD4 00003825 */ move $a3, $zero
/* 0669D8 80065DD8 3C028012 */ lui $v0, %hi(D_8011D758) # $v0, 0x8012
/* 0669DC 80065DDC 2442D758 */ addiu $v0, %lo(D_8011D758) # addiu $v0, $v0, -0x28a8
/* 0669E0 80065DE0 24180000 */ li $t8, 0
/* 0669E4 80065DE4 24190000 */ li $t9, 0
/* 0669E8 80065DE8 24080000 */ li $t0, 0
/* 0669EC 80065DEC 24090000 */ li $t1, 0
/* 0669F0 80065DF0 3C048012 */ lui $a0, %hi(gThread3) # $a0, 0x8012
/* 0669F4 80065DF4 AC592004 */ sw $t9, 0x2004($v0)
/* 0669F8 80065DF8 AC582000 */ sw $t8, 0x2000($v0)
/* 0669FC 80065DFC AC490004 */ sw $t1, 4($v0)
/* 066A00 80065E00 AC480000 */ sw $t0, ($v0)
/* 066A04 80065E04 0C032268 */ jal osStartThread
/* 066A08 80065E08 2484F910 */ addiu $a0, %lo(gThread3) # addiu $a0, $a0, -0x6f0
/* 066A0C 80065E0C 00002025 */ move $a0, $zero
/* 066A10 80065E10 0C033210 */ jal osSetThreadPri
/* 066A14 80065E14 00002825 */ move $a1, $zero
.L80065E18:
/* 066A18 80065E18 1000FFFF */ b .L80065E18
/* 066A1C 80065E1C 00000000 */ nop
/* 066A20 80065E20 8FBF001C */ lw $ra, 0x1c($sp)
/* 066A24 80065E24 27BD0020 */ addiu $sp, $sp, 0x20
/* 066A28 80065E28 03E00008 */ jr $ra
/* 066A2C 80065E2C 00000000 */ nop
asm/non_matchings/main/func_80065E30.s
-31
View File
@@ -1,31 +0,0 @@
glabel func_80065E30
/* 066A30 80065E30 3C028012 */ lui $v0, %hi(D_8011D758) # $v0, 0x8012
/* 066A34 80065E34 2442D758 */ addiu $v0, %lo(D_8011D758) # addiu $v0, $v0, -0x28a8
/* 066A38 80065E38 8C4F2004 */ lw $t7, 0x2004($v0)
/* 066A3C 80065E3C 8C4E2000 */ lw $t6, 0x2000($v0)
/* 066A40 80065E40 8C490004 */ lw $t1, 4($v0)
/* 066A44 80065E44 25F90001 */ addiu $t9, $t7, 1
/* 066A48 80065E48 2F210001 */ sltiu $at, $t9, 1
/* 066A4C 80065E4C 8C480000 */ lw $t0, ($v0)
/* 066A50 80065E50 01C1C021 */ addu $t8, $t6, $at
/* 066A54 80065E54 252B0001 */ addiu $t3, $t1, 1
/* 066A58 80065E58 2D610001 */ sltiu $at, $t3, 1
/* 066A5C 80065E5C 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 066A60 80065E60 01015021 */ addu $t2, $t0, $at
/* 066A64 80065E64 AFBF0014 */ sw $ra, 0x14($sp)
/* 066A68 80065E68 AC582000 */ sw $t8, 0x2000($v0)
/* 066A6C 80065E6C AC592004 */ sw $t9, 0x2004($v0)
/* 066A70 80065E70 AC4A0000 */ sw $t2, ($v0)
/* 066A74 80065E74 170A0002 */ bne $t8, $t2, .L80065E80
/* 066A78 80065E78 AC4B0004 */ sw $t3, 4($v0)
/* 066A7C 80065E7C 132B0003 */ beq $t9, $t3, .L80065E8C
.L80065E80:
/* 066A80 80065E80 3C04800E */ lui $a0, %hi(D_800E6ED0) # $a0, 0x800e
/* 066A84 80065E84 0C032755 */ jal rmonPrintf
/* 066A88 80065E88 24846ED0 */ addiu $a0, %lo(D_800E6ED0) # addiu $a0, $a0, 0x6ed0
.L80065E8C:
/* 066A8C 80065E8C 8FBF0014 */ lw $ra, 0x14($sp)
/* 066A90 80065E90 27BD0018 */ addiu $sp, $sp, 0x18
/* 066A94 80065E94 03E00008 */ jr $ra
/* 066A98 80065E98 00000000 */ nop
/* 066A9C 80065E9C 00000000 */ nop
asm/non_matchings/menu/draw_menu_elements.s
+5 -5
View File
@@ -25,10 +25,10 @@ glabel draw_menu_elements
/* 082E34 80082234 AFA40070 */ sw $a0, 0x70($sp)
/* 082E38 80082238 1081018F */ beq $a0, $at, .L80082878
/* 082E3C 8008223C 0000A825 */ move $s5, $zero
/* 082E40 80082240 3C168012 */ lui $s6, %hi(D_801263A0) # $s6, 0x8012
/* 082E44 80082244 26D663A0 */ addiu $s6, %lo(D_801263A0) # addiu $s6, $s6, 0x63a0
/* 082E48 80082248 3C058012 */ lui $a1, %hi(D_801263A8) # $a1, 0x8012
/* 082E4C 8008224C 24A563A8 */ addiu $a1, %lo(D_801263A8) # addiu $a1, $a1, 0x63a8
/* 082E40 80082240 3C168012 */ lui $s6, %hi(sMenuCurrDisplayList) # $s6, 0x8012
/* 082E44 80082244 26D663A0 */ addiu $s6, %lo(sMenuCurrDisplayList) # addiu $s6, $s6, 0x63a0
/* 082E48 80082248 3C058012 */ lui $a1, %hi(sMenuCurrHudMat) # $a1, 0x8012
/* 082E4C 8008224C 24A563A8 */ addiu $a1, %lo(sMenuCurrHudMat) # addiu $a1, $a1, 0x63a8
/* 082E50 80082250 0C019FCB */ jal func_80067F2C
/* 082E54 80082254 02C02025 */ move $a0, $s6
/* 082E58 80082258 8E110014 */ lw $s1, 0x14($s0)
@@ -186,7 +186,7 @@ glabel L80082454
/* 083098 80082498 01093023 */ subu $a2, $t0, $t1
/* 08309C 8008249C 24C60078 */ addiu $a2, $a2, 0x78
/* 0830A0 800824A0 2645FF60 */ addiu $a1, $s2, -0xa0
/* 0830A4 800824A4 0C020600 */ jal func_80081800
/* 0830A4 800824A4 0C020600 */ jal show_timestamp
/* 0830A8 800824A8 AFAC0018 */ sw $t4, 0x18($sp)
/* 0830AC 800824AC 8FA40070 */ lw $a0, 0x70($sp)
/* 0830B0 800824B0 100000DE */ b .L8008282C
asm/non_matchings/menu/func_80083098.s
+4 -4
View File
@@ -42,10 +42,10 @@ glabel func_80083098
/* 083D38 80083138 00008825 */ move $s1, $zero
/* 083D3C 8008313C 18800044 */ blez $a0, .L80083250
/* 083D40 80083140 3C108012 */ lui $s0, %hi(D_80126878) # $s0, 0x8012
/* 083D44 80083144 3C168012 */ lui $s6, %hi(D_801263A0) # $s6, 0x8012
/* 083D44 80083144 3C168012 */ lui $s6, %hi(sMenuCurrDisplayList) # $s6, 0x8012
/* 083D48 80083148 3C15800E */ lui $s5, %hi(D_800DF9F8) # $s5, 0x800e
/* 083D4C 8008314C 26B5F9F8 */ addiu $s5, %lo(D_800DF9F8) # addiu $s5, $s5, -0x608
/* 083D50 80083150 26D663A0 */ addiu $s6, %lo(D_801263A0) # addiu $s6, $s6, 0x63a0
/* 083D50 80083150 26D663A0 */ addiu $s6, %lo(sMenuCurrDisplayList) # addiu $s6, $s6, 0x63a0
/* 083D54 80083154 26106878 */ addiu $s0, %lo(D_80126878) # addiu $s0, $s0, 0x6878
/* 083D58 80083158 24140005 */ li $s4, 5
.L8008315C:
@@ -118,9 +118,9 @@ glabel func_80083098
/* 083E50 80083250 3C018012 */ lui $at, %hi(D_801268D8) # $at, 0x8012
/* 083E54 80083254 C43068D8 */ lwc1 $f16, %lo(D_801268D8)($at)
/* 083E58 80083258 C6720004 */ lwc1 $f18, 4($s3)
/* 083E5C 8008325C 3C168012 */ lui $s6, %hi(D_801263A0) # $s6, 0x8012
/* 083E5C 8008325C 3C168012 */ lui $s6, %hi(sMenuCurrDisplayList) # $s6, 0x8012
/* 083E60 80083260 4610903E */ c.le.s $f18, $f16
/* 083E64 80083264 26D663A0 */ addiu $s6, %lo(D_801263A0) # addiu $s6, $s6, 0x63a0
/* 083E64 80083264 26D663A0 */ addiu $s6, %lo(sMenuCurrDisplayList) # addiu $s6, $s6, 0x63a0
/* 083E68 80083268 4500008A */ bc1f .L80083494
/* 083E6C 8008326C 240500FF */ li $a1, 255
/* 083E70 80083270 C6680008 */ lwc1 $f8, 8($s3)
asm/non_matchings/menu/func_8008377C.s
+6 -6
View File
@@ -15,10 +15,10 @@ glabel func_8008377C
/* 0843B0 800837B0 AFB10028 */ sw $s1, 0x28($sp)
/* 0843B4 800837B4 11C00073 */ beqz $t6, .L80083984
/* 0843B8 800837B8 AFA40058 */ sw $a0, 0x58($sp)
/* 0843BC 800837BC 3C168012 */ lui $s6, %hi(D_801263A0) # $s6, 0x8012
/* 0843C0 800837C0 26D663A0 */ addiu $s6, %lo(D_801263A0) # addiu $s6, $s6, 0x63a0
/* 0843C4 800837C4 3C058012 */ lui $a1, %hi(D_801263A8) # $a1, 0x8012
/* 0843C8 800837C8 24A563A8 */ addiu $a1, %lo(D_801263A8) # addiu $a1, $a1, 0x63a8
/* 0843BC 800837BC 3C168012 */ lui $s6, %hi(sMenuCurrDisplayList) # $s6, 0x8012
/* 0843C0 800837C0 26D663A0 */ addiu $s6, %lo(sMenuCurrDisplayList) # addiu $s6, $s6, 0x63a0
/* 0843C4 800837C4 3C058012 */ lui $a1, %hi(sMenuCurrHudMat) # $a1, 0x8012
/* 0843C8 800837C8 24A563A8 */ addiu $a1, %lo(sMenuCurrHudMat) # addiu $a1, $a1, 0x63a8
/* 0843CC 800837CC 0C019FCB */ jal func_80067F2C
/* 0843D0 800837D0 02C02025 */ move $a0, $s6
/* 0843D4 800837D4 8E020000 */ lw $v0, ($s0)
@@ -136,10 +136,10 @@ glabel func_8008377C
/* 08457C 8008397C 1000000F */ b .L800839BC
/* 084580 80083980 8FBF0044 */ lw $ra, 0x44($sp)
.L80083984:
/* 084584 80083984 3C028012 */ lui $v0, %hi(D_80126874) # $v0, 0x8012
/* 084584 80083984 3C028012 */ lui $v0, %hi(sTitleScreenDemoIds) # $v0, 0x8012
/* 084588 80083988 3C0D8012 */ lui $t5, %hi(D_80126864) # $t5, 0x8012
/* 08458C 8008398C 8DAD6864 */ lw $t5, %lo(D_80126864)($t5)
/* 084590 80083990 8C426874 */ lw $v0, %lo(D_80126874)($v0)
/* 084590 80083990 8C426874 */ lw $v0, %lo(sTitleScreenDemoIds)($v0)
/* 084594 80083994 00000000 */ nop
/* 084598 80083998 004D7021 */ addu $t6, $v0, $t5
/* 08459C 8008399C 81CF0000 */ lb $t7, ($t6)
asm/non_matchings/menu/func_80084854.s
+4 -4
View File
@@ -47,18 +47,18 @@ glabel func_80084854
/* 0854FC 800848FC 0006000D */ break 6
.L80084900:
/* 085500 80084900 26310001 */ addiu $s1, $s1, 1
/* 085504 80084904 3C128012 */ lui $s2, %hi(D_801263A0) # $s2, 0x8012
/* 085508 80084908 265263A0 */ addiu $s2, %lo(D_801263A0) # addiu $s2, $s2, 0x63a0
/* 085504 80084904 3C128012 */ lui $s2, %hi(sMenuCurrDisplayList) # $s2, 0x8012
/* 085508 80084908 265263A0 */ addiu $s2, %lo(sMenuCurrDisplayList) # addiu $s2, $s2, 0x63a0
/* 08550C 8008490C 3C0F800E */ lui $t7, %hi(D_800DFAC8) # $t7, 0x800e
/* 085510 80084910 00001012 */ mflo $v0
/* 085514 80084914 24590030 */ addiu $t9, $v0, 0x30
/* 085518 80084918 A1190000 */ sb $t9, ($t0)
/* 08551C 8008491C 00440019 */ multu $v0, $a0
/* 085520 80084920 8CAB0000 */ lw $t3, ($a1)
/* 085524 80084924 3C058012 */ lui $a1, %hi(D_801263A8) # $a1, 0x8012
/* 085524 80084924 3C058012 */ lui $a1, %hi(sMenuCurrHudMat) # $a1, 0x8012
/* 085528 80084928 01716021 */ addu $t4, $t3, $s1
/* 08552C 8008492C 3C198012 */ lui $t9, %hi(gAudioOutputStrings) # $t9, 0x8012
/* 085530 80084930 24A563A8 */ addiu $a1, %lo(D_801263A8) # addiu $a1, $a1, 0x63a8
/* 085530 80084930 24A563A8 */ addiu $a1, %lo(sMenuCurrHudMat) # addiu $a1, $a1, 0x63a8
/* 085534 80084934 02402025 */ move $a0, $s2
/* 085538 80084938 00004812 */ mflo $t1
/* 08553C 8008493C 02699823 */ subu $s3, $s3, $t1
asm/non_matchings/menu/func_800853D0.s
+12 -12
View File
@@ -317,7 +317,7 @@ glabel L80085828
/* 086458 80085858 8FA50084 */ lw $a1, 0x84($sp)
.L8008585C:
/* 08645C 8008585C 8FB90088 */ lw $t9, 0x88($sp)
/* 086460 80085860 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 086460 80085860 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 086464 80085864 240A0078 */ li $t2, 120
/* 086468 80085868 240B0040 */ li $t3, 64
/* 08646C 8008586C 240C0004 */ li $t4, 4
@@ -325,7 +325,7 @@ glabel L80085828
/* 086474 80085874 AFAE0018 */ sw $t6, 0x18($sp)
/* 086478 80085878 AFAC0014 */ sw $t4, 0x14($sp)
/* 08647C 8008587C AFAB0010 */ sw $t3, 0x10($sp)
/* 086480 80085880 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 086480 80085880 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 086484 80085884 240700A0 */ li $a3, 160
/* 086488 80085888 AFA9001C */ sw $t1, 0x1c($sp)
/* 08648C 8008588C AFA80020 */ sw $t0, 0x20($sp)
@@ -428,9 +428,9 @@ glabel L80085828
/* 086604 80085A04 00002025 */ move $a0, $zero
/* 086608 80085A08 8FAA0068 */ lw $t2, 0x68($sp)
.L80085A0C:
/* 08660C 80085A0C 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 08660C 80085A0C 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 086610 80085A10 1140000F */ beqz $t2, .L80085A50
/* 086614 80085A14 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 086614 80085A14 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 086618 80085A18 8FA60084 */ lw $a2, 0x84($sp)
/* 08661C 80085A1C 8FA70088 */ lw $a3, 0x88($sp)
/* 086620 80085A20 241900FF */ li $t9, 255
@@ -461,11 +461,11 @@ glabel L80085828
/* 086680 80085A80 240700FF */ li $a3, 255
/* 086684 80085A84 8FA50084 */ lw $a1, 0x84($sp)
/* 086688 80085A88 8FA60088 */ lw $a2, 0x88($sp)
/* 08668C 80085A8C 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 08668C 80085A8C 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 086690 80085A90 8FA70060 */ lw $a3, 0x60($sp)
/* 086694 80085A94 2418000C */ li $t8, 12
/* 086698 80085A98 AFB80010 */ sw $t8, 0x10($sp)
/* 08669C 80085A9C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 08669C 80085A9C 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 0866A0 80085AA0 24A50051 */ addiu $a1, $a1, 0x51
/* 0866A4 80085AA4 0C031110 */ jal draw_text
/* 0866A8 80085AA8 24C60001 */ addiu $a2, $a2, 1
@@ -478,11 +478,11 @@ glabel L80085828
/* 0866C4 80085AC4 24070040 */ li $a3, 64
/* 0866C8 80085AC8 8FA50084 */ lw $a1, 0x84($sp)
/* 0866CC 80085ACC 8FA60088 */ lw $a2, 0x88($sp)
/* 0866D0 80085AD0 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 0866D0 80085AD0 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 0866D4 80085AD4 8FA70060 */ lw $a3, 0x60($sp)
/* 0866D8 80085AD8 2419000C */ li $t9, 12
/* 0866DC 80085ADC AFB90010 */ sw $t9, 0x10($sp)
/* 0866E0 80085AE0 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 0866E0 80085AE0 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 0866E4 80085AE4 24A5004F */ addiu $a1, $a1, 0x4f
/* 0866E8 80085AE8 0C031110 */ jal draw_text
/* 0866EC 80085AEC 24C6FFFF */ addiu $a2, $a2, -1
@@ -502,11 +502,11 @@ glabel L80085828
/* 086720 80085B20 240700FF */ li $a3, 255
/* 086724 80085B24 8FA50084 */ lw $a1, 0x84($sp)
/* 086728 80085B28 8FA60088 */ lw $a2, 0x88($sp)
/* 08672C 80085B2C 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 08672C 80085B2C 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 086730 80085B30 8FA70064 */ lw $a3, 0x64($sp)
/* 086734 80085B34 240E0004 */ li $t6, 4
/* 086738 80085B38 AFAE0010 */ sw $t6, 0x10($sp)
/* 08673C 80085B3C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 08673C 80085B3C 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 086740 80085B40 24A50050 */ addiu $a1, $a1, 0x50
/* 086744 80085B44 0C031110 */ jal draw_text
/* 086748 80085B48 24C60030 */ addiu $a2, $a2, 0x30
@@ -518,11 +518,11 @@ glabel L80085828
/* 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
/* 08676C 80085B6C 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 086770 80085B70 8FA70064 */ lw $a3, 0x64($sp)
/* 086774 80085B74 240F0004 */ li $t7, 4
/* 086778 80085B78 AFAF0010 */ sw $t7, 0x10($sp)
/* 08677C 80085B7C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 08677C 80085B7C 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 086780 80085B80 02002825 */ move $a1, $s0
/* 086784 80085B84 0C031110 */ jal draw_text
/* 086788 80085B88 24C6002F */ addiu $a2, $a2, 0x2f
asm/non_matchings/menu/func_80085B9C.s
+16 -16
View File
@@ -50,12 +50,12 @@ glabel L80085C24
glabel L80085C30
/* 086830 80085C30 306F0008 */ andi $t7, $v1, 8
/* 086834 80085C34 11E00002 */ beqz $t7, .L80085C40
/* 086838 80085C38 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 086838 80085C38 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 08683C 80085C3C 24090001 */ li $t1, 1
.L80085C40:
/* 086840 80085C40 3C058012 */ lui $a1, %hi(D_801263A8) # $a1, 0x8012
/* 086844 80085C44 24A563A8 */ addiu $a1, %lo(D_801263A8) # addiu $a1, $a1, 0x63a8
/* 086848 80085C48 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 086840 80085C40 3C058012 */ lui $a1, %hi(sMenuCurrHudMat) # $a1, 0x8012
/* 086844 80085C44 24A563A8 */ addiu $a1, %lo(sMenuCurrHudMat) # addiu $a1, $a1, 0x63a8
/* 086848 80085C48 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 08684C 80085C4C AFA6004C */ sw $a2, 0x4c($sp)
/* 086850 80085C50 AFA70048 */ sw $a3, 0x48($sp)
/* 086854 80085C54 AFA80044 */ sw $t0, 0x44($sp)
@@ -77,11 +77,11 @@ glabel L80085C30
/* 086894 80085C94 240700FF */ li $a3, 255
/* 086898 80085C98 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e
/* 08689C 80085C9C 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9)
/* 0868A0 80085CA0 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 0868A0 80085CA0 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 0868A4 80085CA4 240A000C */ li $t2, 12
/* 0868A8 80085CA8 8F270294 */ lw $a3, 0x294($t9)
/* 0868AC 80085CAC AFAA0010 */ sw $t2, 0x10($sp)
/* 0868B0 80085CB0 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 0868B0 80085CB0 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 0868B4 80085CB4 240500A1 */ li $a1, 161
/* 0868B8 80085CB8 0C031110 */ jal draw_text
/* 0868BC 80085CBC 24060023 */ li $a2, 35
@@ -94,11 +94,11 @@ glabel L80085C30
/* 0868D8 80085CD8 00003825 */ move $a3, $zero
/* 0868DC 80085CDC 3C0C800E */ lui $t4, %hi(gMenuText) # $t4, 0x800e
/* 0868E0 80085CE0 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4)
/* 0868E4 80085CE4 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 0868E4 80085CE4 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 0868E8 80085CE8 240D000C */ li $t5, 12
/* 0868EC 80085CEC 8D870294 */ lw $a3, 0x294($t4)
/* 0868F0 80085CF0 AFAD0010 */ sw $t5, 0x10($sp)
/* 0868F4 80085CF4 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 0868F4 80085CF4 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 0868F8 80085CF8 240500A0 */ li $a1, 160
/* 0868FC 80085CFC 0C031110 */ jal draw_text
/* 086900 80085D00 24060020 */ li $a2, 32
@@ -121,7 +121,7 @@ glabel L80085C30
/* 08693C 80085D3C 00195043 */ sra $t2, $t9, 1
/* 086940 80085D40 020A8021 */ addu $s0, $s0, $t2
.L80085D44:
/* 086944 80085D44 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 086944 80085D44 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 086948 80085D48 240B00FF */ li $t3, 255
/* 08694C 80085D4C 240C00FF */ li $t4, 255
/* 086950 80085D50 240D00FF */ li $t5, 255
@@ -130,7 +130,7 @@ glabel L80085C30
/* 08695C 80085D5C AFAD0018 */ sw $t5, 0x18($sp)
/* 086960 80085D60 AFAC0014 */ sw $t4, 0x14($sp)
/* 086964 80085D64 AFAB0010 */ sw $t3, 0x10($sp)
/* 086968 80085D68 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 086968 80085D68 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 08696C 80085D6C 02202825 */ move $a1, $s1
/* 086970 80085D70 240600A0 */ li $a2, 160
/* 086974 80085D74 0C01E2AE */ jal render_textured_rectangle
@@ -308,9 +308,9 @@ glabel L80085C30
/* 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
/* 086C08 80086008 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 086C0C 8008600C 11E00008 */ beqz $t7, .L80086030
/* 086C10 80086010 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 086C10 80086010 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 086C14 80086014 3C07800F */ lui $a3, %hi(D_800E8208) # $a3, 0x800f
/* 086C18 80086018 2418000C */ li $t8, 12
/* 086C1C 8008601C AFB80010 */ sw $t8, 0x10($sp)
@@ -320,9 +320,9 @@ glabel L80085C30
/* 086C2C 8008602C 24060080 */ li $a2, 128
.L80086030:
/* 086C30 80086030 8FAA0048 */ lw $t2, 0x48($sp)
/* 086C34 80086034 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 086C34 80086034 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 086C38 80086038 11400009 */ beqz $t2, .L80086060
/* 086C3C 8008603C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 086C3C 8008603C 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 086C40 80086040 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e
/* 086C44 80086044 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9)
/* 086C48 80086048 240B000C */ li $t3, 12
@@ -333,9 +333,9 @@ glabel L80085C30
/* 086C5C 8008605C 24060080 */ li $a2, 128
.L80086060:
/* 086C60 80086060 8FAD0040 */ lw $t5, 0x40($sp)
/* 086C64 80086064 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 086C64 80086064 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 086C68 80086068 11A00005 */ beqz $t5, .L80086080
/* 086C6C 8008606C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 086C6C 8008606C 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 086C70 80086070 00002825 */ move $a1, $zero
/* 086C74 80086074 00003025 */ move $a2, $zero
/* 086C78 80086078 0C0316D6 */ jal render_dialogue_box
asm/non_matchings/menu/func_800862C4.s
+2 -2
View File
@@ -140,8 +140,8 @@ glabel func_800862C4
/* 0870D4 800864D4 1420008B */ bnez $at, .L80086704
/* 0870D8 800864D8 28410007 */ slti $at, $v0, 7
/* 0870DC 800864DC 10200089 */ beqz $at, .L80086704
/* 0870E0 800864E0 3C048012 */ lui $a0, %hi(D_80126A20) # $a0, 0x8012
/* 0870E4 800864E4 24846A20 */ addiu $a0, %lo(D_80126A20) # addiu $a0, $a0, 0x6a20
/* 0870E0 800864E0 3C048012 */ lui $a0, %hi(sControllerPakNotesFree) # $a0, 0x8012
/* 0870E4 800864E4 24846A20 */ addiu $a0, %lo(sControllerPakNotesFree) # addiu $a0, $a0, 0x6a20
/* 0870E8 800864E8 8C8B0000 */ lw $t3, ($a0)
/* 0870EC 800864EC 8E590000 */ lw $t9, ($s2)
/* 0870F0 800864F0 8E8C0000 */ lw $t4, ($s4)
asm/non_matchings/menu/func_80088938.s
+18 -18
View File
@@ -52,11 +52,11 @@ glabel func_80088938
/* 0895F8 800889F8 3C17800E */ lui $s7, %hi(gMenuText) # $s7, 0x800e
/* 0895FC 800889FC 26F7F4A0 */ addiu $s7, %lo(gMenuText) # addiu $s7, $s7, -0xb60
/* 089600 80088A00 8EE90000 */ lw $t1, ($s7)
/* 089604 80088A04 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 089604 80088A04 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 089608 80088A08 240A000C */ li $t2, 12
/* 08960C 80088A0C 8D27008C */ lw $a3, 0x8c($t1)
/* 089610 80088A10 AFAA0010 */ sw $t2, 0x10($sp)
/* 089614 80088A14 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 089614 80088A14 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 089618 80088A18 240500A1 */ li $a1, 161
/* 08961C 80088A1C 0C031110 */ jal draw_text
/* 089620 80088A20 24060021 */ li $a2, 33
@@ -68,11 +68,11 @@ glabel func_80088938
/* 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
/* 089644 80088A44 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 089648 80088A48 240D000C */ li $t5, 12
/* 08964C 80088A4C 8D87008C */ lw $a3, 0x8c($t4)
/* 089650 80088A50 AFAD0010 */ sw $t5, 0x10($sp)
/* 089654 80088A54 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 089654 80088A54 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 089658 80088A58 240500A0 */ li $a1, 160
/* 08965C 80088A5C 0C031110 */ jal draw_text
/* 089660 80088A60 2406001E */ li $a2, 30
@@ -151,8 +151,8 @@ glabel func_80088938
/* 08977C 80088B7C 24060010 */ li $a2, 16
/* 089780 80088B80 0C03145A */ jal render_dialogue_text
/* 089784 80088B84 AFB90010 */ sw $t9, 0x10($sp)
/* 089788 80088B88 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 08978C 80088B8C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 089788 80088B88 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 08978C 80088B8C 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 089790 80088B90 00002825 */ move $a1, $zero
/* 089794 80088B94 00003025 */ move $a2, $zero
/* 089798 80088B98 0C0316D6 */ jal render_dialogue_box
@@ -283,8 +283,8 @@ glabel func_80088938
/* 089978 80088D78 02803825 */ move $a3, $s4
/* 08997C 80088D7C 0C03145A */ jal render_dialogue_text
/* 089980 80088D80 AFB30010 */ sw $s3, 0x10($sp)
/* 089984 80088D84 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 089988 80088D88 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 089984 80088D84 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 089988 80088D88 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 08998C 80088D8C 00002825 */ move $a1, $zero
/* 089990 80088D90 00003025 */ move $a2, $zero
/* 089994 80088D94 0C0316D6 */ jal render_dialogue_box
@@ -304,10 +304,10 @@ glabel func_80088938
/* 0899C8 80088DC8 10200018 */ beqz $at, .L80088E2C
/* 0899CC 80088DCC 3C0B8012 */ lui $t3, %hi(D_801263BC) # $t3, 0x8012
/* 0899D0 80088DD0 8D6B63BC */ lw $t3, %lo(D_801263BC)($t3)
/* 0899D4 80088DD4 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 0899D4 80088DD4 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 0899D8 80088DD8 316A0008 */ andi $t2, $t3, 8
/* 0899DC 80088DDC 11400031 */ beqz $t2, .L80088EA4
/* 0899E0 80088DE0 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 0899E0 80088DE0 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 0899E4 80088DE4 3C05800E */ lui $a1, %hi(D_800E043C) # $a1, 0x800e
/* 0899E8 80088DE8 240C00FF */ li $t4, 255
/* 0899EC 80088DEC 240D00FF */ li $t5, 255
@@ -321,9 +321,9 @@ glabel func_80088938
/* 089A0C 80088E0C 240600A0 */ li $a2, 160
/* 089A10 80088E10 0C01E2AE */ jal render_textured_rectangle
/* 089A14 80088E14 26A70008 */ addiu $a3, $s5, 8
/* 089A18 80088E18 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 089A18 80088E18 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 089A1C 80088E1C 0C01ECF4 */ jal func_8007B3D0
/* 089A20 80088E20 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 089A20 80088E20 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 089A24 80088E24 1000001F */ b .L80088EA4
/* 089A28 80088E28 00000000 */ nop
.L80088E2C:
@@ -351,11 +351,11 @@ glabel func_80088938
/* 089A7C 80088E7C 00003825 */ move $a3, $zero
/* 089A80 80088E80 8EE90000 */ lw $t1, ($s7)
.L80088E84:
/* 089A84 80088E84 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 089A84 80088E84 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 089A88 80088E88 240B0004 */ li $t3, 4
/* 089A8C 80088E8C 8D2700CC */ lw $a3, 0xcc($t1)
/* 089A90 80088E90 AFAB0010 */ sw $t3, 0x10($sp)
/* 089A94 80088E94 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 089A94 80088E94 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 089A98 80088E98 24058000 */ li $a1, -32768
/* 089A9C 80088E9C 0C031110 */ jal draw_text
/* 089AA0 80088EA0 02A03025 */ move $a2, $s5
@@ -459,8 +459,8 @@ glabel func_80088938
/* 089C08 80089008 26310001 */ addiu $s1, $s1, 1
/* 089C0C 8008900C 1632FFCC */ bne $s1, $s2, .L80088F40
/* 089C10 80089010 26100004 */ addiu $s0, $s0, 4
/* 089C14 80089014 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 089C18 80089018 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 089C14 80089014 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 089C18 80089018 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 089C1C 8008901C 00002825 */ move $a1, $zero
/* 089C20 80089020 00003025 */ move $a2, $zero
/* 089C24 80089024 0C0316D6 */ jal render_dialogue_box
@@ -479,11 +479,11 @@ glabel func_80088938
/* 089C54 80089054 0C0310BB */ jal set_text_font
/* 089C58 80089058 24040002 */ li $a0, 2
/* 089C5C 8008905C 8EE80000 */ lw $t0, ($s7)
/* 089C60 80089060 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 089C60 80089060 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 089C64 80089064 2409000C */ li $t1, 12
/* 089C68 80089068 8D0701F0 */ lw $a3, 0x1f0($t0)
/* 089C6C 8008906C AFA90010 */ sw $t1, 0x10($sp)
/* 089C70 80089070 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 089C70 80089070 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 089C74 80089074 240500A0 */ li $a1, 160
/* 089C78 80089078 0C031110 */ jal draw_text
/* 089C7C 8008907C 24060080 */ li $a2, 128
asm/non_matchings/menu/func_8008C698.s
+6 -6
View File
@@ -10,7 +10,7 @@ glabel func_8008C698
/* 08D2B8 8008C6B8 1020003C */ beqz $at, .L8008C7AC
/* 08D2BC 8008C6BC 3C068012 */ lui $a2, %hi(D_801263BC) # $a2, 0x8012
/* 08D2C0 8008C6C0 8CC663BC */ lw $a2, %lo(D_801263BC)($a2)
/* 08D2C4 8008C6C4 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 08D2C4 8008C6C4 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 08D2C8 8008C6C8 000670C0 */ sll $t6, $a2, 3
/* 08D2CC 8008C6CC 29C10100 */ slti $at, $t6, 0x100
/* 08D2D0 8008C6D0 14200003 */ bnez $at, .L8008C6E0
@@ -18,9 +18,9 @@ glabel func_8008C698
/* 08D2D8 8008C6D8 240F01FF */ li $t7, 511
/* 08D2DC 8008C6DC 01EE3023 */ subu $a2, $t7, $t6
.L8008C6E0:
/* 08D2E0 8008C6E0 3C058012 */ lui $a1, %hi(D_801263A8) # $a1, 0x8012
/* 08D2E4 8008C6E4 24A563A8 */ addiu $a1, %lo(D_801263A8) # addiu $a1, $a1, 0x63a8
/* 08D2E8 8008C6E8 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 08D2E0 8008C6E0 3C058012 */ lui $a1, %hi(sMenuCurrHudMat) # $a1, 0x8012
/* 08D2E4 8008C6E4 24A563A8 */ addiu $a1, %lo(sMenuCurrHudMat) # addiu $a1, $a1, 0x63a8
/* 08D2E8 8008C6E8 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
/* 08D2EC 8008C6EC 0C019FCB */ jal func_80067F2C
/* 08D2F0 8008C6F0 AFA6001C */ sw $a2, 0x1c($sp)
/* 08D2F4 8008C6F4 3C048012 */ lui $a0, %hi(D_801263E0) # $a0, 0x8012
@@ -71,9 +71,9 @@ glabel func_8008C698
/* 08D394 8008C794 24040001 */ li $a0, 1
/* 08D398 8008C798 0C02087B */ jal draw_menu_elements
/* 08D39C 8008C79C 3C063F80 */ lui $a2, 0x3f80
/* 08D3A0 8008C7A0 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012
/* 08D3A0 8008C7A0 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 08D3A4 8008C7A4 0C0202F2 */ jal func_80080BC8
/* 08D3A8 8008C7A8 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0
/* 08D3A8 8008C7A8 248463A0 */ addiu $a0, %lo(sMenuCurrDisplayList) # addiu $a0, $a0, 0x63a0
.L8008C7AC:
/* 08D3AC 8008C7AC 8FBF0014 */ lw $ra, 0x14($sp)
/* 08D3B0 8008C7B0 27BD0028 */ addiu $sp, $sp, 0x28
asm/non_matchings/menu/func_8008DC7C.s
-137
View File
@@ -1,137 +0,0 @@
glabel func_8008DC7C
/* 08E87C 8008DC7C 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 08E880 8008DC80 AFBF0014 */ sw $ra, 0x14($sp)
/* 08E884 8008DC84 AFA40020 */ sw $a0, 0x20($sp)
/* 08E888 8008DC88 0C01A955 */ jal get_buttons_pressed_from_player
/* 08E88C 8008DC8C 00002025 */ move $a0, $zero
/* 08E890 8008DC90 3C0E800E */ lui $t6, %hi(gNumberOfActivePlayers) # $t6, 0x800e
/* 08E894 8008DC94 8DCEF4BC */ lw $t6, %lo(gNumberOfActivePlayers)($t6)
/* 08E898 8008DC98 3C058012 */ lui $a1, %hi(gControllersXAxisDirection) # $a1, 0x8012
/* 08E89C 8008DC9C 80A5645C */ lb $a1, %lo(gControllersXAxisDirection)($a1)
/* 08E8A0 8008DCA0 24010002 */ li $at, 2
/* 08E8A4 8008DCA4 15C1000B */ bne $t6, $at, .L8008DCD4
/* 08E8A8 8008DCA8 00401825 */ move $v1, $v0
/* 08E8AC 8008DCAC 24040001 */ li $a0, 1
/* 08E8B0 8008DCB0 AFA2001C */ sw $v0, 0x1c($sp)
/* 08E8B4 8008DCB4 0C01A955 */ jal get_buttons_pressed_from_player
/* 08E8B8 8008DCB8 AFA50018 */ sw $a1, 0x18($sp)
/* 08E8BC 8008DCBC 3C0F8012 */ lui $t7, %hi(gControllersXAxisDirection+1) # $t7, 0x8012
/* 08E8C0 8008DCC0 8FA3001C */ lw $v1, 0x1c($sp)
/* 08E8C4 8008DCC4 8FA50018 */ lw $a1, 0x18($sp)
/* 08E8C8 8008DCC8 81EF645D */ lb $t7, %lo(gControllersXAxisDirection+1)($t7)
/* 08E8CC 8008DCCC 00621825 */ or $v1, $v1, $v0
/* 08E8D0 8008DCD0 00AF2821 */ addu $a1, $a1, $t7
.L8008DCD4:
/* 08E8D4 8008DCD4 3C188012 */ lui $t8, %hi(D_80126494) # $t8, 0x8012
/* 08E8D8 8008DCD8 8F186494 */ lw $t8, %lo(D_80126494)($t8)
/* 08E8DC 8008DCDC 30794000 */ andi $t9, $v1, 0x4000
/* 08E8E0 8008DCE0 17000035 */ bnez $t8, .L8008DDB8
/* 08E8E4 8008DCE4 306F9000 */ andi $t7, $v1, 0x9000
/* 08E8E8 8008DCE8 13200007 */ beqz $t9, .L8008DD08
/* 08E8EC 8008DCEC 30689000 */ andi $t0, $v1, 0x9000
/* 08E8F0 8008DCF0 24040241 */ li $a0, 577
/* 08E8F4 8008DCF4 0C000741 */ jal func_80001D04
/* 08E8F8 8008DCF8 00002825 */ move $a1, $zero
/* 08E8FC 8008DCFC 3C018012 */ lui $at, %hi(D_80126488) # $at, 0x8012
/* 08E900 8008DD00 10000057 */ b .L8008DE60
/* 08E904 8008DD04 AC206488 */ sw $zero, %lo(D_80126488)($at)
.L8008DD08:
/* 08E908 8008DD08 11000017 */ beqz $t0, .L8008DD68
/* 08E90C 8008DD0C 3C068012 */ lui $a2, %hi(D_8012648C) # $a2, 0x8012
/* 08E910 8008DD10 3C068012 */ lui $a2, %hi(D_8012648C) # $a2, 0x8012
/* 08E914 8008DD14 24C6648C */ addiu $a2, %lo(D_8012648C) # addiu $a2, $a2, 0x648c
/* 08E918 8008DD18 8CC90000 */ lw $t1, ($a2)
/* 08E91C 8008DD1C 3C0B8012 */ lui $t3, %hi(gSavefileInfo+1) # $t3, 0x8012
/* 08E920 8008DD20 00095080 */ sll $t2, $t1, 2
/* 08E924 8008DD24 01495023 */ subu $t2, $t2, $t1
/* 08E928 8008DD28 000A5080 */ sll $t2, $t2, 2
/* 08E92C 8008DD2C 016A5821 */ addu $t3, $t3, $t2
/* 08E930 8008DD30 916B64A1 */ lbu $t3, %lo(gSavefileInfo+1)($t3)
/* 08E934 8008DD34 00002825 */ move $a1, $zero
/* 08E938 8008DD38 11600007 */ beqz $t3, .L8008DD58
/* 08E93C 8008DD3C 24040241 */ li $a0, 577
/* 08E940 8008DD40 0C000741 */ jal func_80001D04
/* 08E944 8008DD44 240400EF */ li $a0, 239
/* 08E948 8008DD48 240C0001 */ li $t4, 1
/* 08E94C 8008DD4C 3C018012 */ lui $at, %hi(D_80126494) # $at, 0x8012
/* 08E950 8008DD50 10000043 */ b .L8008DE60
/* 08E954 8008DD54 AC2C6494 */ sw $t4, %lo(D_80126494)($at)
.L8008DD58:
/* 08E958 8008DD58 0C000741 */ jal func_80001D04
/* 08E95C 8008DD5C 00002825 */ move $a1, $zero
/* 08E960 8008DD60 10000040 */ b .L8008DE64
/* 08E964 8008DD64 8FBF0014 */ lw $ra, 0x14($sp)
.L8008DD68:
/* 08E968 8008DD68 24C6648C */ addiu $a2, %lo(D_8012648C) # addiu $a2, $a2, 0x648c
/* 08E96C 8008DD6C 8CC30000 */ lw $v1, ($a2)
/* 08E970 8008DD70 04A10005 */ bgez $a1, .L8008DD88
/* 08E974 8008DD74 00601025 */ move $v0, $v1
/* 08E978 8008DD78 18600003 */ blez $v1, .L8008DD88
/* 08E97C 8008DD7C 246DFFFF */ addiu $t5, $v1, -1
/* 08E980 8008DD80 ACCD0000 */ sw $t5, ($a2)
/* 08E984 8008DD84 01A01825 */ move $v1, $t5
.L8008DD88:
/* 08E988 8008DD88 18A00005 */ blez $a1, .L8008DDA0
/* 08E98C 8008DD8C 28610002 */ slti $at, $v1, 2
/* 08E990 8008DD90 10200003 */ beqz $at, .L8008DDA0
/* 08E994 8008DD94 246E0001 */ addiu $t6, $v1, 1
/* 08E998 8008DD98 ACCE0000 */ sw $t6, ($a2)
/* 08E99C 8008DD9C 01C01825 */ move $v1, $t6
.L8008DDA0:
/* 08E9A0 8008DDA0 1043002F */ beq $v0, $v1, .L8008DE60
/* 08E9A4 8008DDA4 240400EB */ li $a0, 235
/* 08E9A8 8008DDA8 0C000741 */ jal func_80001D04
/* 08E9AC 8008DDAC 00002825 */ move $a1, $zero
/* 08E9B0 8008DDB0 1000002C */ b .L8008DE64
/* 08E9B4 8008DDB4 8FBF0014 */ lw $ra, 0x14($sp)
.L8008DDB8:
/* 08E9B8 8008DDB8 11E00022 */ beqz $t7, .L8008DE44
/* 08E9BC 8008DDBC 240400EF */ li $a0, 239
/* 08E9C0 8008DDC0 0C000741 */ jal func_80001D04
/* 08E9C4 8008DDC4 00002825 */ move $a1, $zero
/* 08E9C8 8008DDC8 3C068012 */ lui $a2, %hi(D_8012648C) # $a2, 0x8012
/* 08E9CC 8008DDCC 24C6648C */ addiu $a2, %lo(D_8012648C) # addiu $a2, $a2, 0x648c
/* 08E9D0 8008DDD0 8CC40000 */ lw $a0, ($a2)
/* 08E9D4 8008DDD4 0C01BB2B */ jal func_8006ECAC
/* 08E9D8 8008DDD8 00000000 */ nop
/* 08E9DC 8008DDDC 3C068012 */ lui $a2, %hi(D_8012648C) # $a2, 0x8012
/* 08E9E0 8008DDE0 24C6648C */ addiu $a2, %lo(D_8012648C) # addiu $a2, $a2, 0x648c
/* 08E9E4 8008DDE4 8CC30000 */ lw $v1, ($a2)
/* 08E9E8 8008DDE8 3C198012 */ lui $t9, %hi(gSavefileInfo) # $t9, 0x8012
/* 08E9EC 8008DDEC 0003C080 */ sll $t8, $v1, 2
/* 08E9F0 8008DDF0 0303C023 */ subu $t8, $t8, $v1
/* 08E9F4 8008DDF4 0018C080 */ sll $t8, $t8, 2
/* 08E9F8 8008DDF8 273964A0 */ addiu $t9, %lo(gSavefileInfo) # addiu $t9, $t9, 0x64a0
/* 08E9FC 8008DDFC 03191021 */ addu $v0, $t8, $t9
/* 08EA00 8008DE00 24080044 */ li $t0, 68
/* 08EA04 8008DE04 2409004B */ li $t1, 75
/* 08EA08 8008DE08 240A0052 */ li $t2, 82
/* 08EA0C 8008DE0C A0400000 */ sb $zero, ($v0)
/* 08EA10 8008DE10 A0400001 */ sb $zero, 1($v0)
/* 08EA14 8008DE14 A4400002 */ sh $zero, 2($v0)
/* 08EA18 8008DE18 A0480004 */ sb $t0, 4($v0)
/* 08EA1C 8008DE1C A0490005 */ sb $t1, 5($v0)
/* 08EA20 8008DE20 A04A0006 */ sb $t2, 6($v0)
/* 08EA24 8008DE24 A0400007 */ sb $zero, 7($v0)
/* 08EA28 8008DE28 3C01800E */ lui $at, %hi(gSaveFileIndex) # $at, 0x800e
/* 08EA2C 8008DE2C AC23F4CC */ sw $v1, %lo(gSaveFileIndex)($at)
/* 08EA30 8008DE30 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 08EA34 8008DE34 AC2063E0 */ sw $zero, %lo(D_801263E0)($at)
/* 08EA38 8008DE38 3C018012 */ lui $at, %hi(D_80126488) # $at, 0x8012
/* 08EA3C 8008DE3C 10000008 */ b .L8008DE60
/* 08EA40 8008DE40 AC206488 */ sw $zero, %lo(D_80126488)($at)
.L8008DE44:
/* 08EA44 8008DE44 306B4000 */ andi $t3, $v1, 0x4000
/* 08EA48 8008DE48 11600005 */ beqz $t3, .L8008DE60
/* 08EA4C 8008DE4C 24040241 */ li $a0, 577
/* 08EA50 8008DE50 0C000741 */ jal func_80001D04
/* 08EA54 8008DE54 00002825 */ move $a1, $zero
/* 08EA58 8008DE58 3C018012 */ lui $at, %hi(D_80126494) # $at, 0x8012
/* 08EA5C 8008DE5C AC206494 */ sw $zero, %lo(D_80126494)($at)
.L8008DE60:
/* 08EA60 8008DE60 8FBF0014 */ lw $ra, 0x14($sp)
.L8008DE64:
/* 08EA64 8008DE64 27BD0020 */ addiu $sp, $sp, 0x20
/* 08EA68 8008DE68 03E00008 */ jr $ra
/* 08EA6C 8008DE6C 00000000 */ nop

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