From 1de830aa949fc96d09cf4245f13c9d5b6faedfdc Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 23 Mar 2020 23:34:26 +1000 Subject: [PATCH] Decompile func0f0fd548 --- src/boot/boot.c | 8 +- src/game/game_01bea0.c | 16 +- src/game/game_0f09f0.c | 270 ++++++++++----------- src/game/game_107fb0.c | 4 +- src/game/game_10ccd0.c | 8 +- src/game/game_167ae0.c | 4 +- src/game/mplayer.c | 4 +- src/game/pak/pak.c | 4 +- src/gvars/gvars.c | 406 ------------------------------- src/include/game/game_0f09f0.h | 2 +- src/include/gvars/gvars.h | 1 - src/include/types.h | 425 ++++++++++++++++++++++++++++++++- 12 files changed, 573 insertions(+), 579 deletions(-) diff --git a/src/boot/boot.c b/src/boot/boot.c index 9815a73bf..c8d3957d8 100644 --- a/src/boot/boot.c +++ b/src/boot/boot.c @@ -2113,8 +2113,8 @@ glabel func00002c8c GLOBAL_ASM( glabel func00002d90 -/* 2d90: 3c04800a */ lui $a0,0x800a -/* 2d94: 248419c0 */ addiu $a0,$a0,6592 +/* 2d90: 3c04800a */ lui $a0,%hi(g_MenuData) +/* 2d94: 248419c0 */ addiu $a0,$a0,%lo(g_MenuData) /* 2d98: 90820016 */ lbu $v0,0x16($a0) /* 2d9c: 27bdffe8 */ addiu $sp,$sp,-24 /* 2da0: 24050001 */ addiu $a1,$zero,0x1 @@ -2127,8 +2127,8 @@ glabel func00002d90 /* 2dbc: 300200ff */ andi $v0,$zero,0xff /* 2dc0: 0fc381dc */ jal func0f0e0770 /* 2dc4: 00000000 */ sll $zero,$zero,0x0 -/* 2dc8: 3c04800a */ lui $a0,0x800a -/* 2dcc: 248419c0 */ addiu $a0,$a0,6592 +/* 2dc8: 3c04800a */ lui $a0,%hi(g_MenuData) +/* 2dcc: 248419c0 */ addiu $a0,$a0,%lo(g_MenuData) /* 2dd0: 300200ff */ andi $v0,$zero,0xff .L00002dd4: /* 2dd4: 00401825 */ or $v1,$v0,$zero diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index dfd52def7..d840571e5 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -131,12 +131,12 @@ glabel var7f1a863c .L0f01bf7c: /* f01bf7c: 0fc01a77 */ jal func0f0069dc /* f01bf80: 00000000 */ sll $zero,$zero,0x0 -/* f01bf84: 3c15800a */ lui $s5,0x800a +/* f01bf84: 3c15800a */ lui $s5,%hi(g_MenuData) /* f01bf88: 0fc06fb8 */ jal menuCountDialogs -/* f01bf8c: 26b519c0 */ addiu $s5,$s5,6592 +/* f01bf8c: 26b519c0 */ addiu $s5,$s5,%lo(g_MenuData) /* f01bf90: 3c03800a */ lui $v1,0x800a -/* f01bf94: 3c05800a */ lui $a1,0x800a -/* f01bf98: 24a519c0 */ addiu $a1,$a1,6592 +/* f01bf94: 3c05800a */ lui $a1,%hi(g_MenuData) +/* f01bf98: 24a519c0 */ addiu $a1,$a1,%lo(g_MenuData) /* f01bf9c: 2463e000 */ addiu $v1,$v1,-8192 /* f01bfa0: 9062083c */ lbu $v0,0x83c($v1) .L0f01bfa4: @@ -175,8 +175,8 @@ glabel var7f1a863c /* f01c018: 00003025 */ or $a2,$zero,$zero /* f01c01c: 11e00024 */ beqz $t7,.L0f01c0b0 /* f01c020: 3c04800a */ lui $a0,0x800a -/* f01c024: 3c05800a */ lui $a1,0x800a -/* f01c028: 24a519c0 */ addiu $a1,$a1,6592 +/* f01c024: 3c05800a */ lui $a1,%hi(g_MenuData) +/* f01c028: 24a519c0 */ addiu $a1,$a1,%lo(g_MenuData) /* f01c02c: 2484e000 */ addiu $a0,$a0,-8192 /* f01c030: 24090002 */ addiu $t1,$zero,0x2 /* f01c034: 8c8304f8 */ lw $v1,0x4f8($a0) @@ -1020,10 +1020,10 @@ glabel var7f1a863c .L0f01cbc0: /* f01cbc0: 3c018007 */ lui $at,%hi(g_MpPlayerNum) /* f01cbc4: 3c03800a */ lui $v1,0x800a -/* f01cbc8: 3c02800a */ lui $v0,0x800a +/* f01cbc8: 3c02800a */ lui $v0,%hi(g_MenuData) /* f01cbcc: ac201448 */ sw $zero,%lo(g_MpPlayerNum)($at) /* f01cbd0: 00002025 */ or $a0,$zero,$zero -/* f01cbd4: 244219c0 */ addiu $v0,$v0,6592 +/* f01cbd4: 244219c0 */ addiu $v0,$v0,%lo(g_MenuData) /* f01cbd8: 2463e000 */ addiu $v1,$v1,-8192 /* f01cbdc: 8c6d04f8 */ lw $t5,0x4f8($v1) .L0f01cbe0: diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index a0c6833b6..53c87c3db 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -523,8 +523,8 @@ glabel var7f1b27fc GLOBAL_ASM( glabel func0f0f0b90 -/* f0f0b90: 3c02800a */ lui $v0,0x800a -/* f0f0b94: 8c4219c4 */ lw $v0,6596($v0) +/* f0f0b90: 3c02800a */ lui $v0,%hi(g_MenuData+0x4) +/* f0f0b94: 8c4219c4 */ lw $v0,%lo(g_MenuData+0x4)($v0) /* f0f0b98: 24010002 */ addiu $at,$zero,0x2 /* f0f0b9c: 3c0e800a */ lui $t6,%hi(g_Vars+0x4b4) /* f0f0ba0: 10410005 */ beq $v0,$at,.L0f0f0bb8 @@ -592,8 +592,8 @@ glabel func0f0f0bec GLOBAL_ASM( glabel func0f0f0c68 -/* f0f0c68: 3c02800a */ lui $v0,0x800a -/* f0f0c6c: 244219c0 */ addiu $v0,$v0,6592 +/* f0f0c68: 3c02800a */ lui $v0,%hi(g_MenuData) +/* f0f0c6c: 244219c0 */ addiu $v0,$v0,%lo(g_MenuData) /* f0f0c70: 904e0014 */ lbu $t6,0x14($v0) /* f0f0c74: 15c00006 */ bnez $t6,.L0f0f0c90 /* f0f0c78: 00000000 */ sll $zero,$zero,0x0 @@ -614,9 +614,9 @@ GLOBAL_ASM( glabel func0f0f0ca0 /* f0f0ca0: 10a00004 */ beqz $a1,.L0f0f0cb4 /* f0f0ca4: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) -/* f0f0ca8: 3c01800a */ lui $at,%hi(var800a19d8+0x3) +/* f0f0ca8: 3c01800a */ lui $at,%hi(g_MenuData+0x1b) /* f0f0cac: 03e00008 */ jr $ra -/* f0f0cb0: a02419db */ sb $a0,%lo(var800a19d8+0x3)($at) +/* f0f0cb0: a02419db */ sb $a0,%lo(g_MenuData+0x1b)($at) .L0f0f0cb4: /* f0f0cb4: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) /* f0f0cb8: 3c01800a */ lui $at,%hi(g_MenuStack+0xdf8) @@ -1977,12 +1977,12 @@ glabel func0f0f1ef4 /* f0f1f1c: 8c8d0020 */ lw $t5,0x20($a0) /* f0f1f20: 00803025 */ or $a2,$a0,$zero /* f0f1f24: 8dcf0010 */ lw $t7,0x10($t6) -/* f0f1f28: 3c19800a */ lui $t9,0x800a +/* f0f1f28: 3c19800a */ lui $t9,%hi(g_MenuData+0x4) /* f0f1f2c: 25adfff4 */ addiu $t5,$t5,-12 /* f0f1f30: 31f80040 */ andi $t8,$t7,0x40 /* f0f1f34: 57000076 */ bnezl $t8,.L0f0f2110 /* f0f1f38: 8fb00008 */ lw $s0,0x8($sp) -/* f0f1f3c: 8f3919c4 */ lw $t9,6596($t9) +/* f0f1f3c: 8f3919c4 */ lw $t9,%lo(g_MenuData+0x4)($t9) /* f0f1f40: 2401000d */ addiu $at,$zero,0xd /* f0f1f44: 53210072 */ beql $t9,$at,.L0f0f2110 /* f0f1f48: 8fb00008 */ lw $s0,0x8($sp) @@ -2235,8 +2235,8 @@ glabel func0f0f2134 /* f0f22c4: afa00014 */ sw $zero,0x14($sp) /* f0f22c8: 0fc55cbe */ jal func0f1572f8 /* f0f22cc: afac0010 */ sw $t4,0x10($sp) -/* f0f22d0: 3c02800a */ lui $v0,0x800a -/* f0f22d4: 8c4219c4 */ lw $v0,6596($v0) +/* f0f22d0: 3c02800a */ lui $v0,%hi(g_MenuData+0x4) +/* f0f22d4: 8c4219c4 */ lw $v0,%lo(g_MenuData+0x4)($v0) /* f0f22d8: 24010003 */ addiu $at,$zero,0x3 /* f0f22dc: 24030008 */ addiu $v1,$zero,0x8 /* f0f22e0: 10410008 */ beq $v0,$at,.L0f0f2304 @@ -2974,8 +2974,8 @@ glabel var7f1b2928 /* f0f2d08: afb00014 */ sw $s0,0x14($sp) /* f0f2d0c: afa60070 */ sw $a2,0x70($sp) /* f0f2d10: aca40000 */ sw $a0,0x0($a1) -/* f0f2d14: 3c02800a */ lui $v0,0x800a -/* f0f2d18: 8c4219c4 */ lw $v0,6596($v0) +/* f0f2d14: 3c02800a */ lui $v0,%hi(g_MenuData+0x4) +/* f0f2d18: 8c4219c4 */ lw $v0,%lo(g_MenuData+0x4)($v0) /* f0f2d1c: 00a08825 */ or $s1,$a1,$zero /* f0f2d20: 24010002 */ addiu $at,$zero,0x2 /* f0f2d24: 1041000d */ beq $v0,$at,.L0f0f2d5c @@ -3323,9 +3323,9 @@ glabel menuPushDialog GLOBAL_ASM( glabel func0f0f3220 -/* f0f3220: 3c03800a */ lui $v1,%hi(var800a2028+0x1) +/* f0f3220: 3c03800a */ lui $v1,%hi(g_MenuData+0x669) /* f0f3224: 00641821 */ addu $v1,$v1,$a0 -/* f0f3228: 90632029 */ lbu $v1,%lo(var800a2028+0x1)($v1) +/* f0f3228: 90632029 */ lbu $v1,%lo(g_MenuData+0x669)($v1) /* f0f322c: 27bdffd8 */ addiu $sp,$sp,-40 /* f0f3230: 24010004 */ addiu $at,$zero,0x4 /* f0f3234: afbf0014 */ sw $ra,0x14($sp) @@ -3424,11 +3424,11 @@ glabel func0f0f3220 /* f0f338c: acf90000 */ sw $t9,0x0($a3) .L0f0f3390: /* f0f3390: 11000005 */ beqz $t0,.L0f0f33a8 -/* f0f3394: 3c0a800a */ lui $t2,%hi(var800a202c+0x2) -/* f0f3398: 814a202e */ lb $t2,%lo(var800a202c+0x2)($t2) -/* f0f339c: 3c01800a */ lui $at,%hi(var800a202c+0x2) +/* f0f3394: 3c0a800a */ lui $t2,%hi(g_MenuData+0x66e) +/* f0f3398: 814a202e */ lb $t2,%lo(g_MenuData+0x66e)($t2) +/* f0f339c: 3c01800a */ lui $at,%hi(g_MenuData+0x66e) /* f0f33a0: 254bffff */ addiu $t3,$t2,-1 -/* f0f33a4: a02b202e */ sb $t3,%lo(var800a202c+0x2)($at) +/* f0f33a4: a02b202e */ sb $t3,%lo(g_MenuData+0x66e)($at) .L0f0f33a8: /* f0f33a8: 8fbf0014 */ lw $ra,0x14($sp) /* f0f33ac: 27bd0028 */ addiu $sp,$sp,0x28 @@ -3550,8 +3550,8 @@ glabel func0f0f33bc /* f0f3558: 01098821 */ addu $s1,$t0,$t1 /* f0f355c: 862304f4 */ lh $v1,0x4f4($s1) .L0f0f3560: -/* f0f3560: 3c02800a */ lui $v0,%hi(var800a202c+0x2) -/* f0f3564: 8042202e */ lb $v0,%lo(var800a202c+0x2)($v0) +/* f0f3560: 3c02800a */ lui $v0,%hi(g_MenuData+0x66e) +/* f0f3564: 8042202e */ lb $v0,%lo(g_MenuData+0x66e)($v0) /* f0f3568: 18400017 */ blez $v0,.L0f0f35c8 /* f0f356c: 00000000 */ sll $zero,$zero,0x0 /* f0f3570: 14600015 */ bnez $v1,.L0f0f35c8 @@ -3857,8 +3857,8 @@ glabel var7f1b2948 /* f0f38d8: afa60448 */ sw $a2,0x448($sp) /* f0f38dc: 2401005c */ addiu $at,$zero,0x5c /* f0f38e0: 1041001a */ beq $v0,$at,.L0f0f394c -/* f0f38e4: 3c0e800a */ lui $t6,%hi(var800a1f94+0x1) -/* f0f38e8: 81cf1f95 */ lb $t7,%lo(var800a1f94+0x1)($t6) +/* f0f38e4: 3c0e800a */ lui $t6,%hi(g_MenuData+0x5d5) +/* f0f38e8: 81cf1f95 */ lb $t7,%lo(g_MenuData+0x5d5)($t6) /* f0f38ec: 24010001 */ addiu $at,$zero,0x1 /* f0f38f0: 05e30008 */ bgezl $t7,.L0f0f3914 /* f0f38f4: 8e190004 */ lw $t9,0x4($s0) @@ -4154,8 +4154,8 @@ glabel var7f1b2948 /* f0f3d20: afaf003c */ sw $t7,0x3c($sp) /* f0f3d24: 2b010003 */ slti $at,$t8,0x3 /* f0f3d28: 1020001b */ beqz $at,.L0f0f3d98 -/* f0f3d2c: 3c19800a */ lui $t9,%hi(var800a1f94) -/* f0f3d30: 8f391f94 */ lw $t9,%lo(var800a1f94)($t9) +/* f0f3d2c: 3c19800a */ lui $t9,%hi(g_MenuData+0x5d4) +/* f0f3d30: 8f391f94 */ lw $t9,%lo(g_MenuData+0x5d4)($t9) /* f0f3d34: 00195a80 */ sll $t3,$t9,0xa /* f0f3d38: 05630018 */ bgezl $t3,.L0f0f3d9c /* f0f3d3c: 8faa0440 */ lw $t2,0x440($sp) @@ -4164,12 +4164,12 @@ glabel var7f1b2948 /* f0f3d48: afa20440 */ sw $v0,0x440($sp) /* f0f3d4c: 0c002c74 */ jal func0000b1d0 /* f0f3d50: 00402025 */ or $a0,$v0,$zero -/* f0f3d54: 3c0e800a */ lui $t6,%hi(var800a1f94+0x1) -/* f0f3d58: 91ce1f95 */ lbu $t6,%lo(var800a1f94+0x1)($t6) +/* f0f3d54: 3c0e800a */ lui $t6,%hi(g_MenuData+0x5d5) +/* f0f3d58: 91ce1f95 */ lbu $t6,%lo(g_MenuData+0x5d5)($t6) /* f0f3d5c: 8fac0448 */ lw $t4,0x448($sp) -/* f0f3d60: 3c01800a */ lui $at,%hi(var800a1f94+0x1) +/* f0f3d60: 3c01800a */ lui $at,%hi(g_MenuData+0x5d5) /* f0f3d64: 31cdffdf */ andi $t5,$t6,0xffdf -/* f0f3d68: a02d1f95 */ sb $t5,%lo(var800a1f94+0x1)($at) +/* f0f3d68: a02d1f95 */ sb $t5,%lo(g_MenuData+0x5d5)($at) /* f0f3d6c: 24010002 */ addiu $at,$zero,0x2 /* f0f3d70: 11810003 */ beq $t4,$at,.L0f0f3d80 /* f0f3d74: afa20440 */ sw $v0,0x440($sp) @@ -5169,8 +5169,8 @@ glabel var7f1b2948 /* f0f4c10: 24050001 */ addiu $a1,$zero,0x1 /* f0f4c14: 1040003f */ beqz $v0,.L0f0f4d14 /* f0f4c18: 00402025 */ or $a0,$v0,$zero -/* f0f4c1c: 3c02800a */ lui $v0,0x800a -/* f0f4c20: 8c4219c4 */ lw $v0,6596($v0) +/* f0f4c1c: 3c02800a */ lui $v0,%hi(g_MenuData+0x4) +/* f0f4c20: 8c4219c4 */ lw $v0,%lo(g_MenuData+0x4)($v0) /* f0f4c24: 24010002 */ addiu $at,$zero,0x2 /* f0f4c28: 10410007 */ beq $v0,$at,.L0f0f4c48 /* f0f4c2c: 24010006 */ addiu $at,$zero,0x6 @@ -6035,14 +6035,14 @@ glabel func0f0f5360 /* f0f5850: 240f03e8 */ addiu $t7,$zero,0x3e8 /* f0f5854: ac2fde94 */ sw $t7,%lo(var8009de94)($at) /* f0f5858: 8cee0000 */ lw $t6,0x0($a3) -/* f0f585c: 3c03800a */ lui $v1,0x800a +/* f0f585c: 3c03800a */ lui $v1,%hi(g_MenuData+0x4) /* f0f5860: 8dc40010 */ lw $a0,0x10($t6) /* f0f5864: 308d0100 */ andi $t5,$a0,0x100 /* f0f5868: 11a00002 */ beqz $t5,.L0f0f5874 /* f0f586c: 01a02025 */ or $a0,$t5,$zero /* f0f5870: 2673000b */ addiu $s3,$s3,0xb .L0f0f5874: -/* f0f5874: 8c6319c4 */ lw $v1,6596($v1) +/* f0f5874: 8c6319c4 */ lw $v1,%lo(g_MenuData+0x4)($v1) /* f0f5878: 24010003 */ addiu $at,$zero,0x3 /* f0f587c: 10610060 */ beq $v1,$at,.L0f0f5a00 /* f0f5880: 24010004 */ addiu $at,$zero,0x4 @@ -6144,8 +6144,8 @@ glabel func0f0f5360 /* f0f59fc: 01602025 */ or $a0,$t3,$zero .L0f0f5a00: /* f0f5a00: 148000e3 */ bnez $a0,.L0f0f5d90 -/* f0f5a04: 3c03800a */ lui $v1,0x800a -/* f0f5a08: 8c6319c4 */ lw $v1,6596($v1) +/* f0f5a04: 3c03800a */ lui $v1,%hi(g_MenuData+0x4) +/* f0f5a08: 8c6319c4 */ lw $v1,%lo(g_MenuData+0x4)($v1) /* f0f5a0c: 24010003 */ addiu $at,$zero,0x3 /* f0f5a10: 10610002 */ beq $v1,$at,.L0f0f5a1c /* f0f5a14: 2401000b */ addiu $at,$zero,0xb @@ -6336,8 +6336,8 @@ glabel func0f0f5360 /* f0f5ce0: afb80018 */ sw $t8,0x18($sp) /* f0f5ce4: 0fc5580f */ jal func0f15603c /* f0f5ce8: afb9001c */ sw $t9,0x1c($sp) -/* f0f5cec: 3c03800a */ lui $v1,0x800a -/* f0f5cf0: 8c6319c4 */ lw $v1,6596($v1) +/* f0f5cec: 3c03800a */ lui $v1,%hi(g_MenuData+0x4) +/* f0f5cf0: 8c6319c4 */ lw $v1,%lo(g_MenuData+0x4)($v1) /* f0f5cf4: 24010003 */ addiu $at,$zero,0x3 /* f0f5cf8: afa201e8 */ sw $v0,0x1e8($sp) /* f0f5cfc: 10610007 */ beq $v1,$at,.L0f0f5d1c @@ -6382,14 +6382,14 @@ glabel func0f0f5360 .L0f0f5d90: /* f0f5d90: 8fa201ec */ lw $v0,0x1ec($sp) /* f0f5d94: 8fb501dc */ lw $s5,0x1dc($sp) -/* f0f5d98: 3c0f800a */ lui $t7,0x800a +/* f0f5d98: 3c0f800a */ lui $t7,%hi(g_MenuData+0x4) /* f0f5d9c: c4400048 */ lwc1 $f0,0x48($v0) /* f0f5da0: 26b5000b */ addiu $s5,$s5,0xb /* f0f5da4: 4614003c */ c.lt.s $f0,$f20 /* f0f5da8: 00000000 */ sll $zero,$zero,0x0 /* f0f5dac: 4503001b */ bc1tl .L0f0f5e1c /* f0f5db0: 904b0060 */ lbu $t3,0x60($v0) -/* f0f5db4: 8def19c4 */ lw $t7,6596($t7) +/* f0f5db4: 8def19c4 */ lw $t7,%lo(g_MenuData+0x4)($t7) /* f0f5db8: 24010004 */ addiu $at,$zero,0x4 /* f0f5dbc: 51e1001e */ beql $t7,$at,.L0f0f5e38 /* f0f5dc0: 8fac0084 */ lw $t4,0x84($sp) @@ -7778,8 +7778,8 @@ glabel func0f0f5360 /* f0f7224: e7a0001c */ swc1 $f0,0x1c($sp) /* f0f7228: 0fc38cc9 */ jal func0f0e3324 /* f0f722c: 24a50005 */ addiu $a1,$a1,0x5 -/* f0f7230: 3c03800a */ lui $v1,0x800a -/* f0f7234: 8c6319c4 */ lw $v1,6596($v1) +/* f0f7230: 3c03800a */ lui $v1,%hi(g_MenuData+0x4) +/* f0f7234: 8c6319c4 */ lw $v1,%lo(g_MenuData+0x4)($v1) /* f0f7238: 24010002 */ addiu $at,$zero,0x2 /* f0f723c: afa201e8 */ sw $v0,0x1e8($sp) /* f0f7240: 10610007 */ beq $v1,$at,.L0f0f7260 @@ -7969,8 +7969,8 @@ glabel var7f1b2968 glabel var7f1b296c .word func0f0f74a8+0x3c # f0f74e4 .text -/* f0f74a8: 3c0e800a */ lui $t6,0x800a -/* f0f74ac: 8dce19c4 */ lw $t6,6596($t6) +/* f0f74a8: 3c0e800a */ lui $t6,%hi(g_MenuData+0x4) +/* f0f74ac: 8dce19c4 */ lw $t6,%lo(g_MenuData+0x4)($t6) /* f0f74b0: 27bdffe8 */ addiu $sp,$sp,-24 /* f0f74b4: afbf0014 */ sw $ra,0x14($sp) /* f0f74b8: 25cffffd */ addiu $t7,$t6,-3 @@ -8038,8 +8038,8 @@ u32 var800714d8 = 0x00000001; GLOBAL_ASM( glabel func0f0f7594 -/* f0f7594: 3c0e800a */ lui $t6,0x800a -/* f0f7598: 8dce19c4 */ lw $t6,6596($t6) +/* f0f7594: 3c0e800a */ lui $t6,%hi(g_MenuData+0x4) +/* f0f7598: 8dce19c4 */ lw $t6,%lo(g_MenuData+0x4)($t6) /* f0f759c: 24010003 */ addiu $at,$zero,0x3 /* f0f75a0: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f0f75a4: 55c1005d */ bnel $t6,$at,.L0f0f771c @@ -8270,8 +8270,8 @@ glabel var7f1b2990 /* f0f7870: 2463fff8 */ addiu $v1,$v1,-8 /* f0f7874: 24840004 */ addiu $a0,$a0,0x4 .L0f0f7878: -/* f0f7878: 3c02800a */ lui $v0,0x800a -/* f0f787c: 244219c0 */ addiu $v0,$v0,6592 +/* f0f7878: 3c02800a */ lui $v0,%hi(g_MenuData) +/* f0f787c: 244219c0 */ addiu $v0,$v0,%lo(g_MenuData) /* f0f7880: 8c4f0004 */ lw $t7,0x4($v0) /* f0f7884: 25f8fffd */ addiu $t8,$t7,-3 /* f0f7888: 2f010009 */ sltiu $at,$t8,0x9 @@ -8845,8 +8845,8 @@ glabel func0f0f8040 /* f0f8064: 01ee7823 */ subu $t7,$t7,$t6 /* f0f8068: 000f7900 */ sll $t7,$t7,0x4 /* f0f806c: 01f81021 */ addu $v0,$t7,$t8 -/* f0f8070: 3c04800a */ lui $a0,0x800a -/* f0f8074: 248419c0 */ addiu $a0,$a0,6592 +/* f0f8070: 3c04800a */ lui $a0,%hi(g_MenuData) +/* f0f8074: 248419c0 */ addiu $a0,$a0,%lo(g_MenuData) /* f0f8078: 8c830004 */ lw $v1,0x4($a0) /* f0f807c: 27bdffe8 */ addiu $sp,$sp,-24 /* f0f8080: 24050004 */ addiu $a1,$zero,0x4 @@ -8879,8 +8879,8 @@ glabel func0f0f8040 /* f0f80e8: 55a10005 */ bnel $t5,$at,.L0f0f8100 /* f0f80ec: 24010007 */ addiu $at,$zero,0x7 /* f0f80f0: a04e0250 */ sb $t6,0x250($v0) -/* f0f80f4: 3c03800a */ lui $v1,0x800a -/* f0f80f8: 8c6319c4 */ lw $v1,6596($v1) +/* f0f80f4: 3c03800a */ lui $v1,%hi(g_MenuData+0x4) +/* f0f80f8: 8c6319c4 */ lw $v1,%lo(g_MenuData+0x4)($v1) .L0f0f80fc: /* f0f80fc: 24010007 */ addiu $at,$zero,0x7 .L0f0f8100: @@ -8908,8 +8908,8 @@ glabel func0f0f8120 /* f0f8140: afb10018 */ sw $s1,0x18($sp) /* f0f8144: 3c11800a */ lui $s1,0x800a /* f0f8148: 2631e000 */ addiu $s1,$s1,-8192 -/* f0f814c: 3c04800a */ lui $a0,%hi(var800a202c+0x2) -/* f0f8150: 8084202e */ lb $a0,%lo(var800a202c+0x2)($a0) +/* f0f814c: 3c04800a */ lui $a0,%hi(g_MenuData+0x66e) +/* f0f8150: 8084202e */ lb $a0,%lo(g_MenuData+0x66e)($a0) /* f0f8154: afbf0024 */ sw $ra,0x24($sp) /* f0f8158: afb00014 */ sw $s0,0x14($sp) /* f0f815c: 00007812 */ mflo $t7 @@ -8994,9 +8994,9 @@ glabel func0f0f820c /* f0f8270: 8fbf0024 */ lw $ra,0x24($sp) /* f0f8274: 8fb90034 */ lw $t9,0x34($sp) /* f0f8278: 8fa80030 */ lw $t0,0x30($sp) -/* f0f827c: 3c02800a */ lui $v0,0x800a +/* f0f827c: 3c02800a */ lui $v0,%hi(g_MenuData) /* f0f8280: ae780000 */ sw $t8,0x0($s3) -/* f0f8284: 244219c0 */ addiu $v0,$v0,6592 +/* f0f8284: 244219c0 */ addiu $v0,$v0,%lo(g_MenuData) /* f0f8288: 8fb30020 */ lw $s3,0x20($sp) /* f0f828c: 8fb00014 */ lw $s0,0x14($sp) /* f0f8290: 8fb10018 */ lw $s1,0x18($sp) @@ -9009,30 +9009,30 @@ glabel func0f0f820c bool func0f0f82a8(s32 arg0) { - bool pass = g_MenuData.unk14 == 0; + bool pass = g_MenuData.unk014 == 0; - if (g_MenuData.unk15 == 1 || g_MenuData.unk15 == 4) { + if (g_MenuData.unk015 == 1 || g_MenuData.unk015 == 4) { pass = false; } - if (g_MenuData.unk14 != arg0) { - g_MenuData.unk15 = arg0; + if (g_MenuData.unk014 != arg0) { + g_MenuData.unk015 = arg0; } - if (pass && g_MenuData.unk14 == 0) { - g_MenuData.unk16 = 1; + if (pass && g_MenuData.unk014 == 0) { + g_MenuData.unk016 = 1; } } GLOBAL_ASM( glabel func0f0f8300 -/* f0f8300: 3c0e800a */ lui $t6,0x800a -/* f0f8304: 8dce19c0 */ lw $t6,6592($t6) -/* f0f8308: 3c03800a */ lui $v1,0x800a -/* f0f830c: 246319c0 */ addiu $v1,$v1,6592 +/* f0f8300: 3c0e800a */ lui $t6,%hi(g_MenuData) +/* f0f8304: 8dce19c0 */ lw $t6,%lo(g_MenuData)($t6) +/* f0f8308: 3c03800a */ lui $v1,%hi(g_MenuData) +/* f0f830c: 246319c0 */ addiu $v1,$v1,%lo(g_MenuData) /* f0f8310: 15c00005 */ bnez $t6,.L0f0f8328 -/* f0f8314: 3c02800a */ lui $v0,0x800a -/* f0f8318: 244219c4 */ addiu $v0,$v0,6596 +/* f0f8314: 3c02800a */ lui $v0,%hi(g_MenuData+0x4) +/* f0f8318: 244219c4 */ addiu $v0,$v0,%lo(g_MenuData+0x4) .L0f0f831c: /* f0f831c: 24630001 */ addiu $v1,$v1,0x1 /* f0f8320: 1462fffe */ bne $v1,$v0,.L0f0f831c @@ -9100,8 +9100,8 @@ glabel var7f1b29f8 .text /* f0f8330: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0f8334: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) -/* f0f8338: 3c03800a */ lui $v1,0x800a -/* f0f833c: 246319c0 */ addiu $v1,$v1,6592 +/* f0f8338: 3c03800a */ lui $v1,%hi(g_MenuData) +/* f0f833c: 246319c0 */ addiu $v1,$v1,%lo(g_MenuData) /* f0f8340: 000e78c0 */ sll $t7,$t6,0x3 /* f0f8344: 01ee7823 */ subu $t7,$t7,$t6 /* f0f8348: 000f7880 */ sll $t7,$t7,0x2 @@ -9129,8 +9129,8 @@ glabel var7f1b29f8 /* f0f83a0: ac200750 */ sw $zero,%lo(g_PlayersWithControl)($at) /* f0f83a4: 0fc3c525 */ jal func0f0f1494 /* f0f83a8: afa50024 */ sw $a1,0x24($sp) -/* f0f83ac: 3c03800a */ lui $v1,0x800a -/* f0f83b0: 246319c0 */ addiu $v1,$v1,6592 +/* f0f83ac: 3c03800a */ lui $v1,%hi(g_MenuData) +/* f0f83b0: 246319c0 */ addiu $v1,$v1,%lo(g_MenuData) /* f0f83b4: 8c6d0000 */ lw $t5,0x0($v1) /* f0f83b8: 8fa50024 */ lw $a1,0x24($sp) /* f0f83bc: 24010008 */ addiu $at,$zero,0x8 @@ -9222,8 +9222,8 @@ glabel var7f1b29f8 /* f0f84fc: 0fc3cbd3 */ jal menuPushDialog /* f0f8500: afa60018 */ sw $a2,0x18($sp) /* f0f8504: 8fa60018 */ lw $a2,0x18($sp) -/* f0f8508: 3c03800a */ lui $v1,0x800a -/* f0f850c: 246319c0 */ addiu $v1,$v1,6592 +/* f0f8508: 3c03800a */ lui $v1,%hi(g_MenuData) +/* f0f850c: 246319c0 */ addiu $v1,$v1,%lo(g_MenuData) /* f0f8510: 24cbffff */ addiu $t3,$a2,-1 /* f0f8514: 2d61000d */ sltiu $at,$t3,0xd /* f0f8518: 10200027 */ beqz $at,.L0f0f85b8 @@ -9239,8 +9239,8 @@ glabel var7f1b29f8 /* f0f8540: 00000000 */ sll $zero,$zero,0x0 /* f0f8544: 0fc5b6c5 */ jal func0f16db14 /* f0f8548: 00000000 */ sll $zero,$zero,0x0 -/* f0f854c: 3c03800a */ lui $v1,0x800a -/* f0f8550: 246319c0 */ addiu $v1,$v1,6592 +/* f0f854c: 3c03800a */ lui $v1,%hi(g_MenuData) +/* f0f8550: 246319c0 */ addiu $v1,$v1,%lo(g_MenuData) /* f0f8554: 240c0009 */ addiu $t4,$zero,0x9 /* f0f8558: 10000017 */ beqz $zero,.L0f0f85b8 /* f0f855c: a06c0014 */ sb $t4,0x14($v1) @@ -9263,8 +9263,8 @@ glabel var7f1b29f8 /* f0f859c: 00000000 */ sll $zero,$zero,0x0 /* f0f85a0: 0fc5b6c5 */ jal func0f16db14 /* f0f85a4: 00000000 */ sll $zero,$zero,0x0 -/* f0f85a8: 3c03800a */ lui $v1,0x800a -/* f0f85ac: 246319c0 */ addiu $v1,$v1,6592 +/* f0f85a8: 3c03800a */ lui $v1,%hi(g_MenuData) +/* f0f85ac: 246319c0 */ addiu $v1,$v1,%lo(g_MenuData) /* f0f85b0: 24190005 */ addiu $t9,$zero,0x5 /* f0f85b4: a0790014 */ sb $t9,0x14($v1) .L0f0f85b8: @@ -9367,8 +9367,8 @@ glabel func0f0f86a8 /* f0f86e8: afbf0034 */ sw $ra,0x34($sp) /* f0f86ec: afa40098 */ sw $a0,0x98($sp) /* f0f86f0: 1200012a */ beqz $s0,.L0f0f8b9c -/* f0f86f4: 3c02800a */ lui $v0,0x800a -/* f0f86f8: 8c4219c4 */ lw $v0,6596($v0) +/* f0f86f4: 3c02800a */ lui $v0,%hi(g_MenuData+0x4) +/* f0f86f8: 8c4219c4 */ lw $v0,%lo(g_MenuData+0x4)($v0) /* f0f86fc: 24010004 */ addiu $at,$zero,0x4 /* f0f8700: 10410005 */ beq $v0,$at,.L0f0f8718 /* f0f8704: 24010008 */ addiu $at,$zero,0x8 @@ -9571,13 +9571,13 @@ glabel func0f0f86a8 /* f0f89dc: 51e10070 */ beql $t7,$at,.L0f0f8ba0 /* f0f89e0: 8fbf0034 */ lw $ra,0x34($sp) /* f0f89e4: 8e3904f8 */ lw $t9,0x4f8($s1) -/* f0f89e8: 3c0b800a */ lui $t3,0x800a +/* f0f89e8: 3c0b800a */ lui $t3,%hi(g_MenuData) /* f0f89ec: 8f380000 */ lw $t8,0x0($t9) /* f0f89f0: 8f0e0010 */ lw $t6,0x10($t8) /* f0f89f4: 31cd0080 */ andi $t5,$t6,0x80 /* f0f89f8: 55a00069 */ bnezl $t5,.L0f0f8ba0 /* f0f89fc: 8fbf0034 */ lw $ra,0x34($sp) -/* f0f8a00: 8d6b19c0 */ lw $t3,6592($t3) +/* f0f8a00: 8d6b19c0 */ lw $t3,%lo(g_MenuData)($t3) /* f0f8a04: 27a40080 */ addiu $a0,$sp,0x80 /* f0f8a08: 27a5007c */ addiu $a1,$sp,0x7c /* f0f8a0c: 29610002 */ slti $at,$t3,0x2 @@ -9790,8 +9790,8 @@ glabel var7f1b2a0c /* f0f8cd4: 3c01800a */ lui $at,%hi(var8009dfbc) /* f0f8cd8: ac22dfbc */ sw $v0,%lo(var8009dfbc)($at) .L0f0f8cdc: -/* f0f8cdc: 3c11800a */ lui $s1,0x800a -/* f0f8ce0: 263119c0 */ addiu $s1,$s1,6592 +/* f0f8cdc: 3c11800a */ lui $s1,%hi(g_MenuData) +/* f0f8ce0: 263119c0 */ addiu $s1,$s1,%lo(g_MenuData) /* f0f8ce4: 922f05d5 */ lbu $t7,0x5d5($s1) /* f0f8ce8: 3c12800b */ lui $s2,%hi(var800ab5a8) /* f0f8cec: 2652b5a8 */ addiu $s2,$s2,%lo(var800ab5a8) @@ -9854,8 +9854,8 @@ glabel var7f1b2a0c .L0f0f8dc8: /* f0f8dc8: 3c04800a */ lui $a0,%hi(g_Vars+0x4b4) /* f0f8dcc: 3c02800a */ lui $v0,0x800a -/* f0f8dd0: 3c03800a */ lui $v1,0x800a -/* f0f8dd4: 246319c0 */ addiu $v1,$v1,6592 +/* f0f8dd0: 3c03800a */ lui $v1,%hi(g_MenuData) +/* f0f8dd4: 246319c0 */ addiu $v1,$v1,%lo(g_MenuData) /* f0f8dd8: 2442e000 */ addiu $v0,$v0,-8192 /* f0f8ddc: 8c84a474 */ lw $a0,%lo(g_Vars+0x4b4)($a0) .L0f0f8de0: @@ -9917,9 +9917,9 @@ glabel var7f1b2a0c /* f0f8ea0: 3c188009 */ lui $t8,%hi(g_Is4Mb) /* f0f8ea4: 93180af0 */ lbu $t8,%lo(g_Is4Mb)($t8) /* f0f8ea8: 24010001 */ addiu $at,$zero,0x1 -/* f0f8eac: 3c04800a */ lui $a0,%hi(var800a19dc) +/* f0f8eac: 3c04800a */ lui $a0,%hi(g_MenuData+0x1c) /* f0f8eb0: 13010004 */ beq $t8,$at,.L0f0f8ec4 -/* f0f8eb4: 248419dc */ addiu $a0,$a0,%lo(var800a19dc) +/* f0f8eb4: 248419dc */ addiu $a0,$a0,%lo(g_MenuData+0x1c) /* f0f8eb8: 3405c800 */ dli $a1,0xc800 /* f0f8ebc: 0fc3e2ed */ jal func0f0f8bb4 /* f0f8ec0: 24060001 */ addiu $a2,$zero,0x1 @@ -9966,12 +9966,12 @@ glabel var7f1b2a0c .L0f0f8f60: /* f0f8f60: 922a05d5 */ lbu $t2,0x5d5($s1) /* f0f8f64: 3c02800a */ lui $v0,0x800a -/* f0f8f68: 3c03800a */ lui $v1,0x800a +/* f0f8f68: 3c03800a */ lui $v1,%hi(g_MenuData) /* f0f8f6c: 314bfff7 */ andi $t3,$t2,0xfff7 /* f0f8f70: 44800000 */ mtc1 $zero,$f0 /* f0f8f74: a22005d4 */ sb $zero,0x5d4($s1) /* f0f8f78: a22b05d5 */ sb $t3,0x5d5($s1) -/* f0f8f7c: 246319c0 */ addiu $v1,$v1,6592 +/* f0f8f7c: 246319c0 */ addiu $v1,$v1,%lo(g_MenuData) /* f0f8f80: 2442e000 */ addiu $v0,$v0,-8192 /* f0f8f84: 2404ffff */ addiu $a0,$zero,-1 .L0f0f8f88: @@ -9991,7 +9991,7 @@ glabel var7f1b2a0c /* f0f8fbc: ac40fff8 */ sw $zero,-0x8($v0) /* f0f8fc0: 922c05d5 */ lbu $t4,0x5d5($s1) /* f0f8fc4: 240500ff */ addiu $a1,$zero,0xff -/* f0f8fc8: 3c02800a */ lui $v0,0x800a +/* f0f8fc8: 3c02800a */ lui $v0,%hi(g_MenuData) /* f0f8fcc: 3c03800a */ lui $v1,%hi(g_MenuData+0x5) /* f0f8fd0: 318dfffb */ andi $t5,$t4,0xfffb /* f0f8fd4: a2240668 */ sb $a0,0x668($s1) @@ -10005,7 +10005,7 @@ glabel var7f1b2a0c /* f0f8ff4: a2250015 */ sb $a1,0x15($s1) /* f0f8ff8: a224001b */ sb $a0,0x1b($s1) /* f0f8ffc: 246319c5 */ addiu $v1,$v1,%lo(g_MenuData+0x5) -/* f0f9000: 244219c0 */ addiu $v0,$v0,6592 +/* f0f9000: 244219c0 */ addiu $v0,$v0,%lo(g_MenuData) .L0f0f9004: /* f0f9004: 24420001 */ addiu $v0,$v0,0x1 /* f0f9008: 1443fffe */ bne $v0,$v1,.L0f0f9004 @@ -10436,7 +10436,7 @@ glabel var7f1b2a64 /* f0f959c: afb10124 */ sw $s1,0x124($sp) /* f0f95a0: 44807000 */ mtc1 $zero,$f14 /* f0f95a4: 10400007 */ beqz $v0,.L0f0f95c4 -/* f0f95a8: 3c0e800a */ lui $t6,0x800a +/* f0f95a8: 3c0e800a */ lui $t6,%hi(g_MenuData+0x4) /* f0f95ac: 8fcb0000 */ lw $t3,0x0($s8) /* f0f95b0: 8d6c0010 */ lw $t4,0x10($t3) /* f0f95b4: 318d0010 */ andi $t5,$t4,0x10 @@ -10444,13 +10444,13 @@ glabel var7f1b2a64 /* f0f95bc: 00000000 */ sll $zero,$zero,0x0 /* f0f95c0: 24100002 */ addiu $s0,$zero,0x2 .L0f0f95c4: -/* f0f95c4: 8dce19c4 */ lw $t6,6596($t6) +/* f0f95c4: 8dce19c4 */ lw $t6,%lo(g_MenuData+0x4)($t6) /* f0f95c8: 24010001 */ addiu $at,$zero,0x1 /* f0f95cc: 3c07800a */ lui $a3,%hi(g_Vars) /* f0f95d0: 15c10017 */ bne $t6,$at,.L0f0f9630 /* f0f95d4: 24e79fc0 */ addiu $a3,$a3,%lo(g_Vars) -/* f0f95d8: 3c02800a */ lui $v0,0x800a -/* f0f95dc: 904219d4 */ lbu $v0,6612($v0) +/* f0f95d8: 3c02800a */ lui $v0,%hi(g_MenuData+0x14) +/* f0f95dc: 904219d4 */ lbu $v0,%lo(g_MenuData+0x14)($v0) /* f0f95e0: 24010008 */ addiu $at,$zero,0x8 /* f0f95e4: 3c0f8008 */ lui $t7,%hi(g_StageIndex) /* f0f95e8: 10410004 */ beq $v0,$at,.L0f0f95fc @@ -10500,18 +10500,18 @@ glabel var7f1b2a64 /* f0f967c: 10000068 */ beqz $zero,.L0f0f9820 /* f0f9680: 24120003 */ addiu $s2,$zero,0x3 .L0f0f9684: -/* f0f9684: 3c02800a */ lui $v0,0x800a -/* f0f9688: 8c4219c4 */ lw $v0,6596($v0) +/* f0f9684: 3c02800a */ lui $v0,%hi(g_MenuData+0x4) +/* f0f9688: 8c4219c4 */ lw $v0,%lo(g_MenuData+0x4)($v0) /* f0f968c: 24010001 */ addiu $at,$zero,0x1 /* f0f9690: 3c0a8008 */ lui $t2,%hi(g_StageIndex) /* f0f9694: 54410017 */ bnel $v0,$at,.L0f0f96f4 /* f0f9698: 24010001 */ addiu $at,$zero,0x1 /* f0f969c: 8d4afc00 */ lw $t2,%lo(g_StageIndex)($t2) /* f0f96a0: 24010019 */ addiu $at,$zero,0x19 -/* f0f96a4: 3c0b800a */ lui $t3,0x800a +/* f0f96a4: 3c0b800a */ lui $t3,%hi(g_MenuData+0x14) /* f0f96a8: 55410012 */ bnel $t2,$at,.L0f0f96f4 /* f0f96ac: 24010001 */ addiu $at,$zero,0x1 -/* f0f96b0: 916b19d4 */ lbu $t3,6612($t3) +/* f0f96b0: 916b19d4 */ lbu $t3,%lo(g_MenuData+0x14)($t3) /* f0f96b4: 24120003 */ addiu $s2,$zero,0x3 /* f0f96b8: 3c0c800a */ lui $t4,%hi(g_MenuData+0x15) /* f0f96bc: 524b000d */ beql $s2,$t3,.L0f0f96f4 @@ -10524,18 +10524,18 @@ glabel var7f1b2a64 /* f0f96d8: 51a00006 */ beqzl $t5,.L0f0f96f4 /* f0f96dc: 24010001 */ addiu $at,$zero,0x1 /* f0f96e0: a3ce003d */ sb $t6,0x3d($s8) -/* f0f96e4: 3c02800a */ lui $v0,0x800a -/* f0f96e8: 8c4219c4 */ lw $v0,6596($v0) +/* f0f96e4: 3c02800a */ lui $v0,%hi(g_MenuData+0x4) +/* f0f96e8: 8c4219c4 */ lw $v0,%lo(g_MenuData+0x4)($v0) /* f0f96ec: c7c00040 */ lwc1 $f0,0x40($s8) /* f0f96f0: 24010001 */ addiu $at,$zero,0x1 .L0f0f96f4: /* f0f96f4: 14410011 */ bne $v0,$at,.L0f0f973c /* f0f96f8: 24120003 */ addiu $s2,$zero,0x3 /* f0f96fc: 93cf003c */ lbu $t7,0x3c($s8) -/* f0f9700: 3c02800a */ lui $v0,0x800a +/* f0f9700: 3c02800a */ lui $v0,%hi(g_MenuData+0x14) /* f0f9704: 164f000d */ bne $s2,$t7,.L0f0f973c /* f0f9708: 00000000 */ sll $zero,$zero,0x0 -/* f0f970c: 904219d4 */ lbu $v0,6612($v0) +/* f0f970c: 904219d4 */ lbu $v0,%lo(g_MenuData+0x14)($v0) /* f0f9710: 24010008 */ addiu $at,$zero,0x8 /* f0f9714: 10410002 */ beq $v0,$at,.L0f0f9720 /* f0f9718: 24010007 */ addiu $at,$zero,0x7 @@ -10816,8 +10816,8 @@ glabel var7f1b2a64 /* f0f9b08: 24e79fc0 */ addiu $a3,$a3,%lo(g_Vars) /* f0f9b0c: 11010004 */ beq $t0,$at,.L0f0f9b20 /* f0f9b10: 8fb10124 */ lw $s1,0x124($sp) -/* f0f9b14: 3c09800a */ lui $t1,0x800a -/* f0f9b18: 912919d4 */ lbu $t1,6612($t1) +/* f0f9b14: 3c09800a */ lui $t1,%hi(g_MenuData+0x14) +/* f0f9b18: 912919d4 */ lbu $t1,%lo(g_MenuData+0x14)($t1) /* f0f9b1c: 11200006 */ beqz $t1,.L0f0f9b38 .L0f0f9b20: /* f0f9b20: 3c013f00 */ lui $at,0x3f00 @@ -10878,8 +10878,8 @@ glabel var7f1b2a64 /* f0f9be4: 03c02025 */ or $a0,$s8,$zero /* f0f9be8: 0fc3c7bd */ jal func0f0f1ef4 /* f0f9bec: 03c02025 */ or $a0,$s8,$zero -/* f0f9bf0: 3c02800a */ lui $v0,0x800a -/* f0f9bf4: 8c4219c4 */ lw $v0,6596($v0) +/* f0f9bf0: 3c02800a */ lui $v0,%hi(g_MenuData+0x4) +/* f0f9bf4: 8c4219c4 */ lw $v0,%lo(g_MenuData+0x4)($v0) /* f0f9bf8: 24010004 */ addiu $at,$zero,0x4 /* f0f9bfc: 10410005 */ beq $v0,$at,.L0f0f9c14 /* f0f9c00: 24010008 */ addiu $at,$zero,0x8 @@ -11135,8 +11135,8 @@ glabel var7f1b2a64 /* f0f9f8c: 10000007 */ beqz $zero,.L0f0f9fac /* f0f9f90: 02c08825 */ or $s1,$s6,$zero .L0f0f9f94: -/* f0f9f94: 3c08800a */ lui $t0,0x800a -/* f0f9f98: 8d0819c4 */ lw $t0,6596($t0) +/* f0f9f94: 3c08800a */ lui $t0,%hi(g_MenuData+0x4) +/* f0f9f98: 8d0819c4 */ lw $t0,%lo(g_MenuData+0x4)($t0) /* f0f9f9c: 2401000c */ addiu $at,$zero,0xc /* f0f9fa0: 55010003 */ bnel $t0,$at,.L0f0f9fb0 /* f0f9fa4: 828204ff */ lb $v0,0x4ff($s4) @@ -11688,8 +11688,8 @@ glabel var7f1b2ac8 /* f0fa724: afb60030 */ sw $s6,0x30($sp) /* f0fa728: 3c16800a */ lui $s6,0x800a /* f0fa72c: 26d6e000 */ addiu $s6,$s6,-8192 -/* f0fa730: 3c19800a */ lui $t9,0x800a -/* f0fa734: 8f3919c4 */ lw $t9,6596($t9) +/* f0fa730: 3c19800a */ lui $t9,%hi(g_MenuData+0x4) +/* f0fa734: 8f3919c4 */ lw $t9,%lo(g_MenuData+0x4)($t9) /* f0fa738: afb5002c */ sw $s5,0x2c($sp) /* f0fa73c: 24010004 */ addiu $at,$zero,0x4 /* f0fa740: afbf003c */ sw $ra,0x3c($sp) @@ -11729,13 +11729,13 @@ glabel var7f1b2ac8 /* f0fa7c4: a3a0010b */ sb $zero,0x10b($sp) /* f0fa7c8: 00005025 */ or $t2,$zero,$zero /* f0fa7cc: 00005825 */ or $t3,$zero,$zero -/* f0fa7d0: 3c0f800a */ lui $t7,0x800a +/* f0fa7d0: 3c0f800a */ lui $t7,%hi(g_MenuData+0x4) /* f0fa7d4: 0000c012 */ mflo $t8 /* f0fa7d8: 02d8c821 */ addu $t9,$s6,$t8 /* f0fa7dc: 8f2e04f8 */ lw $t6,0x4f8($t9) /* f0fa7e0: 51c0031e */ beqzl $t6,.L0f0fb45c /* f0fa7e4: 8fbf003c */ lw $ra,0x3c($sp) -/* f0fa7e8: 8def19c4 */ lw $t7,6596($t7) +/* f0fa7e8: 8def19c4 */ lw $t7,%lo(g_MenuData+0x4)($t7) /* f0fa7ec: 24010007 */ addiu $at,$zero,0x7 /* f0fa7f0: afa000f8 */ sw $zero,0xf8($sp) /* f0fa7f4: 15e1000b */ bne $t7,$at,.L0f0fa824 @@ -12574,8 +12574,8 @@ glabel var7f1b2ac8 /* f0fb308: 1420ffc9 */ bnez $at,.L0f0fb230 /* f0fb30c: afae0044 */ sw $t6,0x44($sp) .L0f0fb310: -/* f0fb310: 3c0f800a */ lui $t7,0x800a -/* f0fb314: 8def19c4 */ lw $t7,6596($t7) +/* f0fb310: 3c0f800a */ lui $t7,%hi(g_MenuData+0x4) +/* f0fb314: 8def19c4 */ lw $t7,%lo(g_MenuData+0x4)($t7) /* f0fb318: 25f9ffff */ addiu $t9,$t7,-1 /* f0fb31c: 2f21000d */ sltiu $at,$t9,0xd /* f0fb320: 1020004d */ beqz $at,.L0f0fb458 @@ -13261,10 +13261,10 @@ glabel var7f1b2afc /* f0fbc90: 0fc351e7 */ jal func0f0d479c /* f0fbc94: 02a02025 */ or $a0,$s5,$zero /* f0fbc98: 3c138006 */ lui $s3,%hi(var800613a0) -/* f0fbc9c: 3c17800a */ lui $s7,0x800a +/* f0fbc9c: 3c17800a */ lui $s7,%hi(g_MenuData) /* f0fbca0: 267313a0 */ addiu $s3,$s3,%lo(var800613a0) /* f0fbca4: 3c180600 */ lui $t8,0x600 -/* f0fbca8: 26f719c0 */ addiu $s7,$s7,6592 +/* f0fbca8: 26f719c0 */ addiu $s7,$s7,%lo(g_MenuData) /* f0fbcac: ac580000 */ sw $t8,0x0($v0) /* f0fbcb0: ac530004 */ sw $s3,0x4($v0) /* f0fbcb4: 92e30015 */ lbu $v1,0x15($s7) @@ -13486,11 +13486,11 @@ glabel var7f1b2afc /* f0fbfd0: 3c188007 */ lui $t8,%hi(var800714f4) /* f0fbfd4: 8f1814f4 */ lw $t8,%lo(var800714f4)($t8) /* f0fbfd8: 02a02025 */ or $a0,$s5,$zero -/* f0fbfdc: 3c05800a */ lui $a1,%hi(var800a19dc) +/* f0fbfdc: 3c05800a */ lui $a1,%hi(g_MenuData+0x1c) /* f0fbfe0: 1300000f */ beqz $t8,.L0f0fc020 /* f0fbfe4: 00000000 */ sll $zero,$zero,0x0 /* f0fbfe8: 92f905d5 */ lbu $t9,0x5d5($s7) -/* f0fbfec: 24a519dc */ addiu $a1,$a1,%lo(var800a19dc) +/* f0fbfec: 24a519dc */ addiu $a1,$a1,%lo(g_MenuData+0x1c) /* f0fbff0: 24060001 */ addiu $a2,$zero,0x1 /* f0fbff4: 332affdf */ andi $t2,$t9,0xffdf /* f0fbff8: 0fc3ce2c */ jal func0f0f38b0 @@ -14215,8 +14215,8 @@ glabel func0f0fc9f4 /* f0fca0c: 24040049 */ addiu $a0,$zero,0x49 /* f0fca10: 2404001b */ addiu $a0,$zero,0x1b .L0f0fca14: -/* f0fca14: 3c02800a */ lui $v0,0x800a -/* f0fca18: 8c4219c4 */ lw $v0,6596($v0) +/* f0fca14: 3c02800a */ lui $v0,%hi(g_MenuData+0x4) +/* f0fca18: 8c4219c4 */ lw $v0,%lo(g_MenuData+0x4)($v0) /* f0fca1c: 24010001 */ addiu $at,$zero,0x1 /* f0fca20: 3c03800a */ lui $v1,%hi(g_Vars) /* f0fca24: 14410010 */ bne $v0,$at,.L0f0fca68 @@ -14364,8 +14364,8 @@ glabel func0f0fc9f4 GLOBAL_ASM( glabel func0f0fcc0c -/* f0fcc0c: 3c03800a */ lui $v1,0x800a -/* f0fcc10: 246319c0 */ addiu $v1,$v1,6592 +/* f0fcc0c: 3c03800a */ lui $v1,%hi(g_MenuData) +/* f0fcc10: 246319c0 */ addiu $v1,$v1,%lo(g_MenuData) /* f0fcc14: 8c6e0000 */ lw $t6,0x0($v1) /* f0fcc18: 55c00004 */ bnezl $t6,.L0f0fcc2c /* f0fcc1c: 8c620004 */ lw $v0,0x4($v1) @@ -14848,7 +14848,7 @@ glabel func0f0fd1f4 /* f0fd260: 00992021 */ addu $a0,$a0,$t9 /* f0fd264: 8c84e4f8 */ lw $a0,%lo(g_MenuStack+0x4f8)($a0) /* f0fd268: 8fbf0014 */ lw $ra,0x14($sp) -/* f0fd26c: 3c02800a */ lui $v0,0x800a +/* f0fd26c: 3c02800a */ lui $v0,%hi(g_MenuData) /* f0fd270: 1080001d */ beqz $a0,.L0f0fd2e8 /* f0fd274: 27bd0018 */ addiu $sp,$sp,0x18 /* f0fd278: 8c830000 */ lw $v1,0x0($a0) @@ -14881,7 +14881,7 @@ glabel func0f0fd1f4 /* f0fd2e0: 1000000d */ beqz $zero,.L0f0fd318 /* f0fd2e4: 00002825 */ or $a1,$zero,$zero .L0f0fd2e8: -/* f0fd2e8: 244219c0 */ addiu $v0,$v0,6592 +/* f0fd2e8: 244219c0 */ addiu $v0,$v0,%lo(g_MenuData) /* f0fd2ec: 90580015 */ lbu $t8,0x15($v0) /* f0fd2f0: 240100ff */ addiu $at,$zero,0xff /* f0fd2f4: 57010008 */ bnel $t8,$at,.L0f0fd318 @@ -15016,8 +15016,8 @@ GLOBAL_ASM( glabel func0f0fd494 /* f0fd494: 27bdffc8 */ addiu $sp,$sp,-56 /* f0fd498: afb00018 */ sw $s0,0x18($sp) -/* f0fd49c: 3c10800a */ lui $s0,0x800a -/* f0fd4a0: 261019c0 */ addiu $s0,$s0,6592 +/* f0fd49c: 3c10800a */ lui $s0,%hi(g_MenuData) +/* f0fd4a0: 261019c0 */ addiu $s0,$s0,%lo(g_MenuData) /* f0fd4a4: 920f05d5 */ lbu $t7,0x5d5($s0) /* f0fd4a8: afbf001c */ sw $ra,0x1c($sp) /* f0fd4ac: afa40038 */ sw $a0,0x38($sp) @@ -15063,19 +15063,11 @@ glabel func0f0fd494 /* f0fd544: 27bd0038 */ addiu $sp,$sp,0x38 ); -GLOBAL_ASM( -glabel func0f0fd548 -/* f0fd548: 3c02800a */ lui $v0,0x800a -/* f0fd54c: 244219c0 */ addiu $v0,$v0,6592 -/* f0fd550: 804e066e */ lb $t6,0x66e($v0) -/* f0fd554: 004e7821 */ addu $t7,$v0,$t6 -/* f0fd558: a1e40669 */ sb $a0,0x669($t7) -/* f0fd55c: 8058066e */ lb $t8,0x66e($v0) -/* f0fd560: a040066f */ sb $zero,0x66f($v0) -/* f0fd564: 27190001 */ addiu $t9,$t8,0x1 -/* f0fd568: 03e00008 */ jr $ra -/* f0fd56c: a059066e */ sb $t9,0x66e($v0) -); +void func0f0fd548(s32 arg0) +{ + g_MenuData.unk669[g_MenuData.unk66e++] = arg0; + g_MenuData.unk66f = 0; +} GLOBAL_ASM( glabel func0f0fd570 diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index bec37142a..4e559a033 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -3033,11 +3033,11 @@ glabel func0f10a97c /* f10a9d0: 0fc3f55c */ jal func0f0fd570 /* f10a9d4: 24844f34 */ addiu $a0,$a0,%lo(menudialog_fileselect2) /* f10a9d8: 10400003 */ beqz $v0,.L0f10a9e8 -/* f10a9dc: 3c09800a */ lui $t1,0x800a +/* f10a9dc: 3c09800a */ lui $t1,%hi(g_MenuData+0x4) /* f10a9e0: 10000038 */ beqz $zero,.L0f10aac4 /* f10a9e4: 00001025 */ or $v0,$zero,$zero .L0f10a9e8: -/* f10a9e8: 8d2919c4 */ lw $t1,6596($t1) +/* f10a9e8: 8d2919c4 */ lw $t1,%lo(g_MenuData+0x4)($t1) /* f10a9ec: 24010006 */ addiu $at,$zero,0x6 /* f10a9f0: 3c02800a */ lui $v0,%hi(var800a22c0) /* f10a9f4: 15210003 */ bne $t1,$at,.L0f10aa04 diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c index 44ef5e31b..370e298a6 100644 --- a/src/game/game_10ccd0.c +++ b/src/game/game_10ccd0.c @@ -1505,9 +1505,9 @@ glabel func0f10e620 /* f10e650: 000f7900 */ sll $t7,$t7,0x4 /* f10e654: 2718e000 */ addiu $t8,$t8,-8192 /* f10e658: 01f84021 */ addu $t0,$t7,$t8 -/* f10e65c: 3c03800a */ lui $v1,0x800a +/* f10e65c: 3c03800a */ lui $v1,%hi(g_MenuData+0x4) /* f10e660: ad060e2c */ sw $a2,0xe2c($t0) -/* f10e664: 8c6319c4 */ lw $v1,6596($v1) +/* f10e664: 8c6319c4 */ lw $v1,%lo(g_MenuData+0x4)($v1) /* f10e668: 27bdffc8 */ addiu $sp,$sp,-56 /* f10e66c: 24010001 */ addiu $at,$zero,0x1 /* f10e670: 10610183 */ beq $v1,$at,.L0f10ec80 @@ -1919,8 +1919,8 @@ glabel func0f10e620 /* f10ec6c: 00002825 */ or $a1,$zero,$zero /* f10ec70: 0fc42539 */ jal func0f1094e4 /* f10ec74: 00003025 */ or $a2,$zero,$zero -/* f10ec78: 3c03800a */ lui $v1,0x800a -/* f10ec7c: 8c6319c4 */ lw $v1,6596($v1) +/* f10ec78: 3c03800a */ lui $v1,%hi(g_MenuData+0x4) +/* f10ec7c: 8c6319c4 */ lw $v1,%lo(g_MenuData+0x4)($v1) .L0f10ec80: /* f10ec80: 24010001 */ addiu $at,$zero,0x1 .L0f10ec84: diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index d23e91116..2874dcbfa 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -2104,10 +2104,10 @@ glabel var7f1b7868 /* f169ba8: 55e1000a */ bnel $t7,$at,.L0f169bd4 /* f169bac: 8e6b000c */ lw $t3,0xc($s3) /* f169bb0: 8f187260 */ lw $t8,%lo(var80087260)($t8) -/* f169bb4: 3c0a800a */ lui $t2,0x800a +/* f169bb4: 3c0a800a */ lui $t2,%hi(g_MenuData+0x4) /* f169bb8: 5f00001a */ bgtzl $t8,.L0f169c24 /* f169bbc: 8e700284 */ lw $s0,0x284($s3) -/* f169bc0: 8d4a19c4 */ lw $t2,6596($t2) +/* f169bc0: 8d4a19c4 */ lw $t2,%lo(g_MenuData+0x4)($t2) /* f169bc4: 24010003 */ addiu $at,$zero,0x3 /* f169bc8: 51410016 */ beql $t2,$at,.L0f169c24 /* f169bcc: 8e700284 */ lw $s0,0x284($s3) diff --git a/src/game/mplayer.c b/src/game/mplayer.c index 7253832ee..6d53da85b 100644 --- a/src/game/mplayer.c +++ b/src/game/mplayer.c @@ -6648,8 +6648,8 @@ glabel func0f18d2b8 /* f18d368: 10c00021 */ beqz $a2,.L0f18d3f0 /* f18d36c: 97a70054 */ lhu $a3,0x54($sp) /* f18d370: 10e0001f */ beqz $a3,.L0f18d3f0 -/* f18d374: 3c02800a */ lui $v0,0x800a -/* f18d378: 244219c0 */ addiu $v0,$v0,6592 +/* f18d374: 3c02800a */ lui $v0,%hi(g_MenuData) +/* f18d378: 244219c0 */ addiu $v0,$v0,%lo(g_MenuData) /* f18d37c: 80450668 */ lb $a1,0x668($v0) /* f18d380: 28a1000b */ slti $at,$a1,0xb /* f18d384: 10200025 */ beqz $at,.L0f18d41c diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index 60374d443..a8c35a659 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -7652,8 +7652,8 @@ glabel func0f11ca30 /* f11ca64: afb1001c */ sw $s1,0x1c($sp) /* f11ca68: 15c10005 */ bne $t6,$at,.L0f11ca80 /* f11ca6c: afb00018 */ sw $s0,0x18($sp) -/* f11ca70: 3c0f800a */ lui $t7,0x800a -/* f11ca74: 8def19c0 */ lw $t7,6592($t7) +/* f11ca70: 3c0f800a */ lui $t7,%hi(g_MenuData) +/* f11ca74: 8def19c0 */ lw $t7,%lo(g_MenuData)($t7) /* f11ca78: 59e0003d */ blezl $t7,.L0f11cb70 /* f11ca7c: 8fbf003c */ lw $ra,0x3c($sp) .L0f11ca80: diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index fc2827d4a..13c925f73 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -16122,412 +16122,6 @@ u32 var8009dfe4 = 0; struct missionconfig g_MissionConfig = {0}; struct menustackitem g_MenuStack[4] = {0, 0, 0, 0}; struct menudata g_MenuData = {0}; -u32 var800a19d8 = 0; -u32 var800a19dc = 0; -u32 var800a19e0 = 0; -u32 var800a19e4 = 0; -u32 var800a19e8 = 0; -u32 var800a19ec = 0; -u32 var800a19f0 = 0; -u32 var800a19f4 = 0; -u32 var800a19f8 = 0; -u32 var800a19fc = 0; -u32 var800a1a00 = 0; -u32 var800a1a04 = 0; -u32 var800a1a08 = 0; -u32 var800a1a0c = 0; -u32 var800a1a10 = 0; -u32 var800a1a14 = 0; -u32 var800a1a18 = 0; -u32 var800a1a1c = 0; -u32 var800a1a20 = 0; -u32 var800a1a24 = 0; -u32 var800a1a28 = 0; -u32 var800a1a2c = 0; -u32 var800a1a30 = 0; -u32 var800a1a34 = 0; -u32 var800a1a38 = 0; -u32 var800a1a3c = 0; -u32 var800a1a40 = 0; -u32 var800a1a44 = 0; -u32 var800a1a48 = 0; -u32 var800a1a4c = 0; -u32 var800a1a50 = 0; -u32 var800a1a54 = 0; -u32 var800a1a58 = 0; -u32 var800a1a5c = 0; -u32 var800a1a60 = 0; -u32 var800a1a64 = 0; -u32 var800a1a68 = 0; -u32 var800a1a6c = 0; -u32 var800a1a70 = 0; -u32 var800a1a74 = 0; -u32 var800a1a78 = 0; -u32 var800a1a7c = 0; -u32 var800a1a80 = 0; -u32 var800a1a84 = 0; -u32 var800a1a88 = 0; -u32 var800a1a8c = 0; -u32 var800a1a90 = 0; -u32 var800a1a94 = 0; -u32 var800a1a98 = 0; -u32 var800a1a9c = 0; -u32 var800a1aa0 = 0; -u32 var800a1aa4 = 0; -u32 var800a1aa8 = 0; -u32 var800a1aac = 0; -u32 var800a1ab0 = 0; -u32 var800a1ab4 = 0; -u32 var800a1ab8 = 0; -u32 var800a1abc = 0; -u32 var800a1ac0 = 0; -u32 var800a1ac4 = 0; -u32 var800a1ac8 = 0; -u32 var800a1acc = 0; -u32 var800a1ad0 = 0; -u32 var800a1ad4 = 0; -u32 var800a1ad8 = 0; -u32 var800a1adc = 0; -u32 var800a1ae0 = 0; -u32 var800a1ae4 = 0; -u32 var800a1ae8 = 0; -u32 var800a1aec = 0; -u32 var800a1af0 = 0; -u32 var800a1af4 = 0; -u32 var800a1af8 = 0; -u32 var800a1afc = 0; -u32 var800a1b00 = 0; -u32 var800a1b04 = 0; -u32 var800a1b08 = 0; -u32 var800a1b0c = 0; -u32 var800a1b10 = 0; -u32 var800a1b14 = 0; -u32 var800a1b18 = 0; -u32 var800a1b1c = 0; -u32 var800a1b20 = 0; -u32 var800a1b24 = 0; -u32 var800a1b28 = 0; -u32 var800a1b2c = 0; -u32 var800a1b30 = 0; -u32 var800a1b34 = 0; -u32 var800a1b38 = 0; -u32 var800a1b3c = 0; -u32 var800a1b40 = 0; -u32 var800a1b44 = 0; -u32 var800a1b48 = 0; -u32 var800a1b4c = 0; -u32 var800a1b50 = 0; -u32 var800a1b54 = 0; -u32 var800a1b58 = 0; -u32 var800a1b5c = 0; -u32 var800a1b60 = 0; -u32 var800a1b64 = 0; -u32 var800a1b68 = 0; -u32 var800a1b6c = 0; -u32 var800a1b70 = 0; -u32 var800a1b74 = 0; -u32 var800a1b78 = 0; -u32 var800a1b7c = 0; -u32 var800a1b80 = 0; -u32 var800a1b84 = 0; -u32 var800a1b88 = 0; -u32 var800a1b8c = 0; -u32 var800a1b90 = 0; -u32 var800a1b94 = 0; -u32 var800a1b98 = 0; -u32 var800a1b9c = 0; -u32 var800a1ba0 = 0; -u32 var800a1ba4 = 0; -u32 var800a1ba8 = 0; -u32 var800a1bac = 0; -u32 var800a1bb0 = 0; -u32 var800a1bb4 = 0; -u32 var800a1bb8 = 0; -u32 var800a1bbc = 0; -u32 var800a1bc0 = 0; -u32 var800a1bc4 = 0; -u32 var800a1bc8 = 0; -u32 var800a1bcc = 0; -u32 var800a1bd0 = 0; -u32 var800a1bd4 = 0; -u32 var800a1bd8 = 0; -u32 var800a1bdc = 0; -u32 var800a1be0 = 0; -u32 var800a1be4 = 0; -u32 var800a1be8 = 0; -u32 var800a1bec = 0; -u32 var800a1bf0 = 0; -u32 var800a1bf4 = 0; -u32 var800a1bf8 = 0; -u32 var800a1bfc = 0; -u32 var800a1c00 = 0; -u32 var800a1c04 = 0; -u32 var800a1c08 = 0; -u32 var800a1c0c = 0; -u32 var800a1c10 = 0; -u32 var800a1c14 = 0; -u32 var800a1c18 = 0; -u32 var800a1c1c = 0; -u32 var800a1c20 = 0; -u32 var800a1c24 = 0; -u32 var800a1c28 = 0; -u32 var800a1c2c = 0; -u32 var800a1c30 = 0; -u32 var800a1c34 = 0; -u32 var800a1c38 = 0; -u32 var800a1c3c = 0; -u32 var800a1c40 = 0; -u32 var800a1c44 = 0; -u32 var800a1c48 = 0; -u32 var800a1c4c = 0; -u32 var800a1c50 = 0; -u32 var800a1c54 = 0; -u32 var800a1c58 = 0; -u32 var800a1c5c = 0; -u32 var800a1c60 = 0; -u32 var800a1c64 = 0; -u32 var800a1c68 = 0; -u32 var800a1c6c = 0; -u32 var800a1c70 = 0; -u32 var800a1c74 = 0; -u32 var800a1c78 = 0; -u32 var800a1c7c = 0; -u32 var800a1c80 = 0; -u32 var800a1c84 = 0; -u32 var800a1c88 = 0; -u32 var800a1c8c = 0; -u32 var800a1c90 = 0; -u32 var800a1c94 = 0; -u32 var800a1c98 = 0; -u32 var800a1c9c = 0; -u32 var800a1ca0 = 0; -u32 var800a1ca4 = 0; -u32 var800a1ca8 = 0; -u32 var800a1cac = 0; -u32 var800a1cb0 = 0; -u32 var800a1cb4 = 0; -u32 var800a1cb8 = 0; -u32 var800a1cbc = 0; -u32 var800a1cc0 = 0; -u32 var800a1cc4 = 0; -u32 var800a1cc8 = 0; -u32 var800a1ccc = 0; -u32 var800a1cd0 = 0; -u32 var800a1cd4 = 0; -u32 var800a1cd8 = 0; -u32 var800a1cdc = 0; -u32 var800a1ce0 = 0; -u32 var800a1ce4 = 0; -u32 var800a1ce8 = 0; -u32 var800a1cec = 0; -u32 var800a1cf0 = 0; -u32 var800a1cf4 = 0; -u32 var800a1cf8 = 0; -u32 var800a1cfc = 0; -u32 var800a1d00 = 0; -u32 var800a1d04 = 0; -u32 var800a1d08 = 0; -u32 var800a1d0c = 0; -u32 var800a1d10 = 0; -u32 var800a1d14 = 0; -u32 var800a1d18 = 0; -u32 var800a1d1c = 0; -u32 var800a1d20 = 0; -u32 var800a1d24 = 0; -u32 var800a1d28 = 0; -u32 var800a1d2c = 0; -u32 var800a1d30 = 0; -u32 var800a1d34 = 0; -u32 var800a1d38 = 0; -u32 var800a1d3c = 0; -u32 var800a1d40 = 0; -u32 var800a1d44 = 0; -u32 var800a1d48 = 0; -u32 var800a1d4c = 0; -u32 var800a1d50 = 0; -u32 var800a1d54 = 0; -u32 var800a1d58 = 0; -u32 var800a1d5c = 0; -u32 var800a1d60 = 0; -u32 var800a1d64 = 0; -u32 var800a1d68 = 0; -u32 var800a1d6c = 0; -u32 var800a1d70 = 0; -u32 var800a1d74 = 0; -u32 var800a1d78 = 0; -u32 var800a1d7c = 0; -u32 var800a1d80 = 0; -u32 var800a1d84 = 0; -u32 var800a1d88 = 0; -u32 var800a1d8c = 0; -u32 var800a1d90 = 0; -u32 var800a1d94 = 0; -u32 var800a1d98 = 0; -u32 var800a1d9c = 0; -u32 var800a1da0 = 0; -u32 var800a1da4 = 0; -u32 var800a1da8 = 0; -u32 var800a1dac = 0; -u32 var800a1db0 = 0; -u32 var800a1db4 = 0; -u32 var800a1db8 = 0; -u32 var800a1dbc = 0; -u32 var800a1dc0 = 0; -u32 var800a1dc4 = 0; -u32 var800a1dc8 = 0; -u32 var800a1dcc = 0; -u32 var800a1dd0 = 0; -u32 var800a1dd4 = 0; -u32 var800a1dd8 = 0; -u32 var800a1ddc = 0; -u32 var800a1de0 = 0; -u32 var800a1de4 = 0; -u32 var800a1de8 = 0; -u32 var800a1dec = 0; -u32 var800a1df0 = 0; -u32 var800a1df4 = 0; -u32 var800a1df8 = 0; -u32 var800a1dfc = 0; -u32 var800a1e00 = 0; -u32 var800a1e04 = 0; -u32 var800a1e08 = 0; -u32 var800a1e0c = 0; -u32 var800a1e10 = 0; -u32 var800a1e14 = 0; -u32 var800a1e18 = 0; -u32 var800a1e1c = 0; -u32 var800a1e20 = 0; -u32 var800a1e24 = 0; -u32 var800a1e28 = 0; -u32 var800a1e2c = 0; -u32 var800a1e30 = 0; -u32 var800a1e34 = 0; -u32 var800a1e38 = 0; -u32 var800a1e3c = 0; -u32 var800a1e40 = 0; -u32 var800a1e44 = 0; -u32 var800a1e48 = 0; -u32 var800a1e4c = 0; -u32 var800a1e50 = 0; -u32 var800a1e54 = 0; -u32 var800a1e58 = 0; -u32 var800a1e5c = 0; -u32 var800a1e60 = 0; -u32 var800a1e64 = 0; -u32 var800a1e68 = 0; -u32 var800a1e6c = 0; -u32 var800a1e70 = 0; -u32 var800a1e74 = 0; -u32 var800a1e78 = 0; -u32 var800a1e7c = 0; -u32 var800a1e80 = 0; -u32 var800a1e84 = 0; -u32 var800a1e88 = 0; -u32 var800a1e8c = 0; -u32 var800a1e90 = 0; -u32 var800a1e94 = 0; -u32 var800a1e98 = 0; -u32 var800a1e9c = 0; -u32 var800a1ea0 = 0; -u32 var800a1ea4 = 0; -u32 var800a1ea8 = 0; -u32 var800a1eac = 0; -u32 var800a1eb0 = 0; -u32 var800a1eb4 = 0; -u32 var800a1eb8 = 0; -u32 var800a1ebc = 0; -u32 var800a1ec0 = 0; -u32 var800a1ec4 = 0; -u32 var800a1ec8 = 0; -u32 var800a1ecc = 0; -u32 var800a1ed0 = 0; -u32 var800a1ed4 = 0; -u32 var800a1ed8 = 0; -u32 var800a1edc = 0; -u32 var800a1ee0 = 0; -u32 var800a1ee4 = 0; -u32 var800a1ee8 = 0; -u32 var800a1eec = 0; -u32 var800a1ef0 = 0; -u32 var800a1ef4 = 0; -u32 var800a1ef8 = 0; -u32 var800a1efc = 0; -u32 var800a1f00 = 0; -u32 var800a1f04 = 0; -u32 var800a1f08 = 0; -u32 var800a1f0c = 0; -u32 var800a1f10 = 0; -u32 var800a1f14 = 0; -u32 var800a1f18 = 0; -u32 var800a1f1c = 0; -u32 var800a1f20 = 0; -u32 var800a1f24 = 0; -u32 var800a1f28 = 0; -u32 var800a1f2c = 0; -u32 var800a1f30 = 0; -u32 var800a1f34 = 0; -u32 var800a1f38 = 0; -u32 var800a1f3c = 0; -u32 var800a1f40 = 0; -u32 var800a1f44 = 0; -u32 var800a1f48 = 0; -u32 var800a1f4c = 0; -u32 var800a1f50 = 0; -u32 var800a1f54 = 0; -u32 var800a1f58 = 0; -u32 var800a1f5c = 0; -u32 var800a1f60 = 0; -u32 var800a1f64 = 0; -u32 var800a1f68 = 0; -u32 var800a1f6c = 0; -u32 var800a1f70 = 0; -u32 var800a1f74 = 0; -u32 var800a1f78 = 0; -u32 var800a1f7c = 0; -u32 var800a1f80 = 0; -u32 var800a1f84 = 0; -u32 var800a1f88 = 0; -u32 var800a1f8c = 0; -u32 var800a1f90 = 0; -u32 var800a1f94 = 0; -u32 var800a1f98 = 0; -u32 var800a1f9c = 0; -u32 var800a1fa0 = 0; -u32 var800a1fa4 = 0; -u32 var800a1fa8 = 0; -u32 var800a1fac = 0; -u32 var800a1fb0 = 0; -u32 var800a1fb4 = 0; -u32 var800a1fb8 = 0; -u32 var800a1fbc = 0; -u32 var800a1fc0 = 0; -u32 var800a1fc4 = 0; -u32 var800a1fc8 = 0; -u32 var800a1fcc = 0; -u32 var800a1fd0 = 0; -u32 var800a1fd4 = 0; -u32 var800a1fd8 = 0; -u32 var800a1fdc = 0; -u32 var800a1fe0 = 0; -u32 var800a1fe4 = 0; -u32 var800a1fe8 = 0; -u32 var800a1fec = 0; -u32 var800a1ff0 = 0; -u32 var800a1ff4 = 0; -u32 var800a1ff8 = 0; -u32 var800a1ffc = 0; -u32 var800a2000 = 0; -u32 var800a2004 = 0; -u32 var800a2008 = 0; -u32 var800a200c = 0; -u32 var800a2010 = 0; -u32 var800a2014 = 0; -u32 var800a2018 = 0; -u32 var800a201c = 0; -u32 var800a2020 = 0; -u32 var800a2024 = 0; -u32 var800a2028 = 0; -u32 var800a202c = 0; u32 var800a2030 = 0; u32 var800a2034 = 0; u32 var800a2038 = 0; diff --git a/src/include/game/game_0f09f0.h b/src/include/game/game_0f09f0.h index 8ee02a181..95c193460 100644 --- a/src/include/game/game_0f09f0.h +++ b/src/include/game/game_0f09f0.h @@ -76,7 +76,7 @@ u32 func0f0fd118(void); u32 func0f0fd1f4(void); u32 func0f0fd320(void); u32 func0f0fd494(void); -u32 func0f0fd548(void); +void func0f0fd548(s32 arg0); u32 func0f0fd570(void); bool currentPlayerIsInTraining(void); diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 737b2d886..955fe717e 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -637,7 +637,6 @@ extern u16 var8009dfe0[2]; extern struct missionconfig g_MissionConfig; extern struct menustackitem g_MenuStack[4]; extern struct menudata g_MenuData; -extern u32 var800a19dc; extern u32 var800a2038; extern u32 var800a203c; extern u32 var800a2040; diff --git a/src/include/types.h b/src/include/types.h index 3fa53c10b..a185aadce 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -5636,14 +5636,423 @@ struct frdata { }; struct menudata { - /*0x00*/ u32 count; - /*0x04*/ u32 root; - /*0x08*/ u32 unk08; - /*0x0c*/ u32 unk0c; - /*0x10*/ u32 unk10; - /*0x14*/ u8 unk14; - /*0x15*/ u8 unk15; - /*0x16*/ u8 unk16; + /*0x000*/ u32 count; + /*0x004*/ u32 root; + /*0x008*/ u32 unk008; + /*0x00c*/ u32 unk00c; + /*0x010*/ u32 unk010; + /*0x014*/ u8 unk014; + /*0x015*/ u8 unk015; + /*0x016*/ u8 unk016; + /*0x018*/ u32 unk018; + /*0x01c*/ u32 unk01c; + /*0x020*/ u32 unk020; + /*0x024*/ u32 unk024; + /*0x028*/ u32 unk028; + /*0x02c*/ u32 unk02c; + /*0x030*/ u32 unk030; + /*0x034*/ u32 unk034; + /*0x038*/ u32 unk038; + /*0x03c*/ u32 unk03c; + /*0x040*/ u32 unk040; + /*0x044*/ u32 unk044; + /*0x048*/ u32 unk048; + /*0x04c*/ u32 unk04c; + /*0x050*/ u32 unk050; + /*0x054*/ u32 unk054; + /*0x058*/ u32 unk058; + /*0x05c*/ u32 unk05c; + /*0x060*/ u32 unk060; + /*0x064*/ u32 unk064; + /*0x068*/ u32 unk068; + /*0x06c*/ u32 unk06c; + /*0x070*/ u32 unk070; + /*0x074*/ u32 unk074; + /*0x078*/ u32 unk078; + /*0x07c*/ u32 unk07c; + /*0x080*/ u32 unk080; + /*0x084*/ u32 unk084; + /*0x088*/ u32 unk088; + /*0x08c*/ u32 unk08c; + /*0x090*/ u32 unk090; + /*0x094*/ u32 unk094; + /*0x098*/ u32 unk098; + /*0x09c*/ u32 unk09c; + /*0x0a0*/ u32 unk0a0; + /*0x0a4*/ u32 unk0a4; + /*0x0a8*/ u32 unk0a8; + /*0x0ac*/ u32 unk0ac; + /*0x0b0*/ u32 unk0b0; + /*0x0b4*/ u32 unk0b4; + /*0x0b8*/ u32 unk0b8; + /*0x0bc*/ u32 unk0bc; + /*0x0c0*/ u32 unk0c0; + /*0x0c4*/ u32 unk0c4; + /*0x0c8*/ u32 unk0c8; + /*0x0cc*/ u32 unk0cc; + /*0x0d0*/ u32 unk0d0; + /*0x0d4*/ u32 unk0d4; + /*0x0d8*/ u32 unk0d8; + /*0x0dc*/ u32 unk0dc; + /*0x0e0*/ u32 unk0e0; + /*0x0e4*/ u32 unk0e4; + /*0x0e8*/ u32 unk0e8; + /*0x0ec*/ u32 unk0ec; + /*0x0f0*/ u32 unk0f0; + /*0x0f4*/ u32 unk0f4; + /*0x0f8*/ u32 unk0f8; + /*0x0fc*/ u32 unk0fc; + /*0x100*/ u32 unk100; + /*0x104*/ u32 unk104; + /*0x108*/ u32 unk108; + /*0x10c*/ u32 unk10c; + /*0x110*/ u32 unk110; + /*0x114*/ u32 unk114; + /*0x118*/ u32 unk118; + /*0x11c*/ u32 unk11c; + /*0x120*/ u32 unk120; + /*0x124*/ u32 unk124; + /*0x128*/ u32 unk128; + /*0x12c*/ u32 unk12c; + /*0x130*/ u32 unk130; + /*0x134*/ u32 unk134; + /*0x138*/ u32 unk138; + /*0x13c*/ u32 unk13c; + /*0x140*/ u32 unk140; + /*0x144*/ u32 unk144; + /*0x148*/ u32 unk148; + /*0x14c*/ u32 unk14c; + /*0x150*/ u32 unk150; + /*0x154*/ u32 unk154; + /*0x158*/ u32 unk158; + /*0x15c*/ u32 unk15c; + /*0x160*/ u32 unk160; + /*0x164*/ u32 unk164; + /*0x168*/ u32 unk168; + /*0x16c*/ u32 unk16c; + /*0x170*/ u32 unk170; + /*0x174*/ u32 unk174; + /*0x178*/ u32 unk178; + /*0x17c*/ u32 unk17c; + /*0x180*/ u32 unk180; + /*0x184*/ u32 unk184; + /*0x188*/ u32 unk188; + /*0x18c*/ u32 unk18c; + /*0x190*/ u32 unk190; + /*0x194*/ u32 unk194; + /*0x198*/ u32 unk198; + /*0x19c*/ u32 unk19c; + /*0x1a0*/ u32 unk1a0; + /*0x1a4*/ u32 unk1a4; + /*0x1a8*/ u32 unk1a8; + /*0x1ac*/ u32 unk1ac; + /*0x1b0*/ u32 unk1b0; + /*0x1b4*/ u32 unk1b4; + /*0x1b8*/ u32 unk1b8; + /*0x1bc*/ u32 unk1bc; + /*0x1c0*/ u32 unk1c0; + /*0x1c4*/ u32 unk1c4; + /*0x1c8*/ u32 unk1c8; + /*0x1cc*/ u32 unk1cc; + /*0x1d0*/ u32 unk1d0; + /*0x1d4*/ u32 unk1d4; + /*0x1d8*/ u32 unk1d8; + /*0x1dc*/ u32 unk1dc; + /*0x1e0*/ u32 unk1e0; + /*0x1e4*/ u32 unk1e4; + /*0x1e8*/ u32 unk1e8; + /*0x1ec*/ u32 unk1ec; + /*0x1f0*/ u32 unk1f0; + /*0x1f4*/ u32 unk1f4; + /*0x1f8*/ u32 unk1f8; + /*0x1fc*/ u32 unk1fc; + /*0x200*/ u32 unk200; + /*0x204*/ u32 unk204; + /*0x208*/ u32 unk208; + /*0x20c*/ u32 unk20c; + /*0x210*/ u32 unk210; + /*0x214*/ u32 unk214; + /*0x218*/ u32 unk218; + /*0x21c*/ u32 unk21c; + /*0x220*/ u32 unk220; + /*0x224*/ u32 unk224; + /*0x228*/ u32 unk228; + /*0x22c*/ u32 unk22c; + /*0x230*/ u32 unk230; + /*0x234*/ u32 unk234; + /*0x238*/ u32 unk238; + /*0x23c*/ u32 unk23c; + /*0x240*/ u32 unk240; + /*0x244*/ u32 unk244; + /*0x248*/ u32 unk248; + /*0x24c*/ u32 unk24c; + /*0x250*/ u32 unk250; + /*0x254*/ u32 unk254; + /*0x258*/ u32 unk258; + /*0x25c*/ u32 unk25c; + /*0x260*/ u32 unk260; + /*0x264*/ u32 unk264; + /*0x268*/ u32 unk268; + /*0x26c*/ u32 unk26c; + /*0x270*/ u32 unk270; + /*0x274*/ u32 unk274; + /*0x278*/ u32 unk278; + /*0x27c*/ u32 unk27c; + /*0x280*/ u32 unk280; + /*0x284*/ u32 unk284; + /*0x288*/ u32 unk288; + /*0x28c*/ u32 unk28c; + /*0x290*/ u32 unk290; + /*0x294*/ u32 unk294; + /*0x298*/ u32 unk298; + /*0x29c*/ u32 unk29c; + /*0x2a0*/ u32 unk2a0; + /*0x2a4*/ u32 unk2a4; + /*0x2a8*/ u32 unk2a8; + /*0x2ac*/ u32 unk2ac; + /*0x2b0*/ u32 unk2b0; + /*0x2b4*/ u32 unk2b4; + /*0x2b8*/ u32 unk2b8; + /*0x2bc*/ u32 unk2bc; + /*0x2c0*/ u32 unk2c0; + /*0x2c4*/ u32 unk2c4; + /*0x2c8*/ u32 unk2c8; + /*0x2cc*/ u32 unk2cc; + /*0x2d0*/ u32 unk2d0; + /*0x2d4*/ u32 unk2d4; + /*0x2d8*/ u32 unk2d8; + /*0x2dc*/ u32 unk2dc; + /*0x2e0*/ u32 unk2e0; + /*0x2e4*/ u32 unk2e4; + /*0x2e8*/ u32 unk2e8; + /*0x2ec*/ u32 unk2ec; + /*0x2f0*/ u32 unk2f0; + /*0x2f4*/ u32 unk2f4; + /*0x2f8*/ u32 unk2f8; + /*0x2fc*/ u32 unk2fc; + /*0x300*/ u32 unk300; + /*0x304*/ u32 unk304; + /*0x308*/ u32 unk308; + /*0x30c*/ u32 unk30c; + /*0x310*/ u32 unk310; + /*0x314*/ u32 unk314; + /*0x318*/ u32 unk318; + /*0x31c*/ u32 unk31c; + /*0x320*/ u32 unk320; + /*0x324*/ u32 unk324; + /*0x328*/ u32 unk328; + /*0x32c*/ u32 unk32c; + /*0x330*/ u32 unk330; + /*0x334*/ u32 unk334; + /*0x338*/ u32 unk338; + /*0x33c*/ u32 unk33c; + /*0x340*/ u32 unk340; + /*0x344*/ u32 unk344; + /*0x348*/ u32 unk348; + /*0x34c*/ u32 unk34c; + /*0x350*/ u32 unk350; + /*0x354*/ u32 unk354; + /*0x358*/ u32 unk358; + /*0x35c*/ u32 unk35c; + /*0x360*/ u32 unk360; + /*0x364*/ u32 unk364; + /*0x368*/ u32 unk368; + /*0x36c*/ u32 unk36c; + /*0x370*/ u32 unk370; + /*0x374*/ u32 unk374; + /*0x378*/ u32 unk378; + /*0x37c*/ u32 unk37c; + /*0x380*/ u32 unk380; + /*0x384*/ u32 unk384; + /*0x388*/ u32 unk388; + /*0x38c*/ u32 unk38c; + /*0x390*/ u32 unk390; + /*0x394*/ u32 unk394; + /*0x398*/ u32 unk398; + /*0x39c*/ u32 unk39c; + /*0x3a0*/ u32 unk3a0; + /*0x3a4*/ u32 unk3a4; + /*0x3a8*/ u32 unk3a8; + /*0x3ac*/ u32 unk3ac; + /*0x3b0*/ u32 unk3b0; + /*0x3b4*/ u32 unk3b4; + /*0x3b8*/ u32 unk3b8; + /*0x3bc*/ u32 unk3bc; + /*0x3c0*/ u32 unk3c0; + /*0x3c4*/ u32 unk3c4; + /*0x3c8*/ u32 unk3c8; + /*0x3cc*/ u32 unk3cc; + /*0x3d0*/ u32 unk3d0; + /*0x3d4*/ u32 unk3d4; + /*0x3d8*/ u32 unk3d8; + /*0x3dc*/ u32 unk3dc; + /*0x3e0*/ u32 unk3e0; + /*0x3e4*/ u32 unk3e4; + /*0x3e8*/ u32 unk3e8; + /*0x3ec*/ u32 unk3ec; + /*0x3f0*/ u32 unk3f0; + /*0x3f4*/ u32 unk3f4; + /*0x3f8*/ u32 unk3f8; + /*0x3fc*/ u32 unk3fc; + /*0x400*/ u32 unk400; + /*0x404*/ u32 unk404; + /*0x408*/ u32 unk408; + /*0x40c*/ u32 unk40c; + /*0x410*/ u32 unk410; + /*0x414*/ u32 unk414; + /*0x418*/ u32 unk418; + /*0x41c*/ u32 unk41c; + /*0x420*/ u32 unk420; + /*0x424*/ u32 unk424; + /*0x428*/ u32 unk428; + /*0x42c*/ u32 unk42c; + /*0x430*/ u32 unk430; + /*0x434*/ u32 unk434; + /*0x438*/ u32 unk438; + /*0x43c*/ u32 unk43c; + /*0x440*/ u32 unk440; + /*0x444*/ u32 unk444; + /*0x448*/ u32 unk448; + /*0x44c*/ u32 unk44c; + /*0x450*/ u32 unk450; + /*0x454*/ u32 unk454; + /*0x458*/ u32 unk458; + /*0x45c*/ u32 unk45c; + /*0x460*/ u32 unk460; + /*0x464*/ u32 unk464; + /*0x468*/ u32 unk468; + /*0x46c*/ u32 unk46c; + /*0x470*/ u32 unk470; + /*0x474*/ u32 unk474; + /*0x478*/ u32 unk478; + /*0x47c*/ u32 unk47c; + /*0x480*/ u32 unk480; + /*0x484*/ u32 unk484; + /*0x488*/ u32 unk488; + /*0x48c*/ u32 unk48c; + /*0x490*/ u32 unk490; + /*0x494*/ u32 unk494; + /*0x498*/ u32 unk498; + /*0x49c*/ u32 unk49c; + /*0x4a0*/ u32 unk4a0; + /*0x4a4*/ u32 unk4a4; + /*0x4a8*/ u32 unk4a8; + /*0x4ac*/ u32 unk4ac; + /*0x4b0*/ u32 unk4b0; + /*0x4b4*/ u32 unk4b4; + /*0x4b8*/ u32 unk4b8; + /*0x4bc*/ u32 unk4bc; + /*0x4c0*/ u32 unk4c0; + /*0x4c4*/ u32 unk4c4; + /*0x4c8*/ u32 unk4c8; + /*0x4cc*/ u32 unk4cc; + /*0x4d0*/ u32 unk4d0; + /*0x4d4*/ u32 unk4d4; + /*0x4d8*/ u32 unk4d8; + /*0x4dc*/ u32 unk4dc; + /*0x4e0*/ u32 unk4e0; + /*0x4e4*/ u32 unk4e4; + /*0x4e8*/ u32 unk4e8; + /*0x4ec*/ u32 unk4ec; + /*0x4f0*/ u32 unk4f0; + /*0x4f4*/ u32 unk4f4; + /*0x4f8*/ u32 unk4f8; + /*0x4fc*/ u32 unk4fc; + /*0x500*/ u32 unk500; + /*0x504*/ u32 unk504; + /*0x508*/ u32 unk508; + /*0x50c*/ u32 unk50c; + /*0x510*/ u32 unk510; + /*0x514*/ u32 unk514; + /*0x518*/ u32 unk518; + /*0x51c*/ u32 unk51c; + /*0x520*/ u32 unk520; + /*0x524*/ u32 unk524; + /*0x528*/ u32 unk528; + /*0x52c*/ u32 unk52c; + /*0x530*/ u32 unk530; + /*0x534*/ u32 unk534; + /*0x538*/ u32 unk538; + /*0x53c*/ u32 unk53c; + /*0x540*/ u32 unk540; + /*0x544*/ u32 unk544; + /*0x548*/ u32 unk548; + /*0x54c*/ u32 unk54c; + /*0x550*/ u32 unk550; + /*0x554*/ u32 unk554; + /*0x558*/ u32 unk558; + /*0x55c*/ u32 unk55c; + /*0x560*/ u32 unk560; + /*0x564*/ u32 unk564; + /*0x568*/ u32 unk568; + /*0x56c*/ u32 unk56c; + /*0x570*/ u32 unk570; + /*0x574*/ u32 unk574; + /*0x578*/ u32 unk578; + /*0x57c*/ u32 unk57c; + /*0x580*/ u32 unk580; + /*0x584*/ u32 unk584; + /*0x588*/ u32 unk588; + /*0x58c*/ u32 unk58c; + /*0x590*/ u32 unk590; + /*0x594*/ u32 unk594; + /*0x598*/ u32 unk598; + /*0x59c*/ u32 unk59c; + /*0x5a0*/ u32 unk5a0; + /*0x5a4*/ u32 unk5a4; + /*0x5a8*/ u32 unk5a8; + /*0x5ac*/ u32 unk5ac; + /*0x5b0*/ u32 unk5b0; + /*0x5b4*/ u32 unk5b4; + /*0x5b8*/ u32 unk5b8; + /*0x5bc*/ u32 unk5bc; + /*0x5c0*/ u32 unk5c0; + /*0x5c4*/ u32 unk5c4; + /*0x5c8*/ u32 unk5c8; + /*0x5cc*/ u32 unk5cc; + /*0x5d0*/ u32 unk5d0; + /*0x5d4*/ u32 unk5d4; + /*0x5d8*/ u32 unk5d8; + /*0x5dc*/ u32 unk5dc; + /*0x5e0*/ u32 unk5e0; + /*0x5e4*/ u32 unk5e4; + /*0x5e8*/ u32 unk5e8; + /*0x5ec*/ u32 unk5ec; + /*0x5f0*/ u32 unk5f0; + /*0x5f4*/ u32 unk5f4; + /*0x5f8*/ u32 unk5f8; + /*0x5fc*/ u32 unk5fc; + /*0x600*/ u32 unk600; + /*0x604*/ u32 unk604; + /*0x608*/ u32 unk608; + /*0x60c*/ u32 unk60c; + /*0x610*/ u32 unk610; + /*0x614*/ u32 unk614; + /*0x618*/ u32 unk618; + /*0x61c*/ u32 unk61c; + /*0x620*/ u32 unk620; + /*0x624*/ u32 unk624; + /*0x628*/ u32 unk628; + /*0x62c*/ u32 unk62c; + /*0x630*/ u32 unk630; + /*0x634*/ u32 unk634; + /*0x638*/ u32 unk638; + /*0x63c*/ u32 unk63c; + /*0x640*/ u32 unk640; + /*0x644*/ u32 unk644; + /*0x648*/ u32 unk648; + /*0x64c*/ u32 unk64c; + /*0x650*/ u32 unk650; + /*0x654*/ u32 unk654; + /*0x658*/ u32 unk658; + /*0x65c*/ u32 unk65c; + /*0x660*/ u32 unk660; + /*0x664*/ u32 unk664; + /*0x668*/ u8 unk668; + /*0x669*/ u8 unk669[4]; + /*0x66d*/ u8 unk66d; + /*0x66e*/ s8 unk66e; // index into 669 + /*0x66f*/ u8 unk66f; }; #endif