mirror of
https://gitlab.com/ryandwyer/perfect-dark
synced 2026-08-20 13:44:53 -04:00
pal-final: Get game segment fully matching
This commit is contained in:
@@ -735,8 +735,8 @@ void amGetSlotDetails(s32 slot, u32 *flags, char *label)
|
||||
if (invGetWeaponNumByIndex(g_AmMenus[g_AmIndex].invindexes[slot]) == WEAPON_CLOAKINGDEVICE) {
|
||||
// Special case: "Cloak %d"
|
||||
qty = currentPlayerGetAmmoCountWithCheck(AMMOTYPE_CLOAK);
|
||||
secs = qty / 60;
|
||||
modulo = (qty - (secs * 60)) * 100 / 60;
|
||||
secs = qty / PALDOWN(60);
|
||||
modulo = (qty - (secs * PALDOWN(60))) * 100 / PALDOWN(60);
|
||||
sprintf(label, langGet(L_OPTIONS_491), secs + (modulo > 0 ? 1 : 0)); // "cloak %d"
|
||||
} else {
|
||||
strcpy(label, invGetShortNameByIndex(g_AmMenus[g_AmIndex].invindexes[slot]));
|
||||
|
||||
@@ -384,7 +384,11 @@ void amTick(void)
|
||||
|
||||
// Update alpha of slots so they fade in
|
||||
if (g_AmMenus[g_AmIndex].alphafrac < 1) {
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
g_AmMenus[g_AmIndex].alphafrac += g_Vars.lvupdate240freal / 30.0f;
|
||||
#else
|
||||
g_AmMenus[g_AmIndex].alphafrac += g_Vars.lvupdate240f / 30.0f;
|
||||
#endif
|
||||
}
|
||||
|
||||
if (g_AmMenus[g_AmIndex].alphafrac > 1) {
|
||||
@@ -392,7 +396,11 @@ void amTick(void)
|
||||
}
|
||||
|
||||
// Make selection border pulsate
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
g_AmMenus[g_AmIndex].selpulse += g_Vars.lvupdate240freal / 5.0f;
|
||||
#else
|
||||
g_AmMenus[g_AmIndex].selpulse += g_Vars.lvupdate240f / 5.0f;
|
||||
#endif
|
||||
|
||||
if (g_AmMenus[g_AmIndex].selpulse > 18.849555969238f) {
|
||||
g_AmMenus[g_AmIndex].selpulse -= 18.849555969238f;
|
||||
|
||||
+1
-1
@@ -167,7 +167,7 @@ void bbikeTryDismountAngle(f32 relativeangle, f32 distance)
|
||||
void bbikeHandleActivate(void)
|
||||
{
|
||||
if (g_Vars.currentplayer->bondvehiclemode == VEHICLEMODE_RUNNING
|
||||
&& g_Vars.lvframe60 - g_Vars.currentplayer->activatetimelast < 25) {
|
||||
&& g_Vars.lvframe60 - g_Vars.currentplayer->activatetimelast < PALDOWN(25)) {
|
||||
struct hoverbikeobj *bike = (struct hoverbikeobj *)g_Vars.currentplayer->hoverbike->obj;
|
||||
struct model08thing *thing = func0f068af4(&bike->base);
|
||||
|
||||
|
||||
@@ -563,7 +563,7 @@ bool eyespyTryLaunch(void)
|
||||
playerpos.y = g_Vars.currentplayer->prop->pos.y;
|
||||
playerpos.z = g_Vars.currentplayer->prop->pos.z;
|
||||
|
||||
chr->soundtimer = FRAMESTOTIME60(10);
|
||||
chr->soundtimer = PALDOWN(10);
|
||||
|
||||
g_Vars.currentplayer->eyespy->init = 0;
|
||||
g_Vars.currentplayer->eyespy->up.x = 0;
|
||||
|
||||
+2
-2
@@ -2133,13 +2133,13 @@ void bgrabHandleActivate(void)
|
||||
void bgrabUpdateSpeedSideways(f32 targetspeed, f32 accelspeed, s32 mult)
|
||||
{
|
||||
if (targetspeed < g_Vars.currentplayer->speedstrafe) {
|
||||
g_Vars.currentplayer->speedstrafe -= FRAMESTOTIME60(accelspeed * mult);
|
||||
g_Vars.currentplayer->speedstrafe -= PALUPF(accelspeed * mult);
|
||||
|
||||
if (g_Vars.currentplayer->speedstrafe < targetspeed) {
|
||||
g_Vars.currentplayer->speedstrafe = targetspeed;
|
||||
}
|
||||
} else if (g_Vars.currentplayer->speedstrafe < targetspeed) {
|
||||
g_Vars.currentplayer->speedstrafe += FRAMESTOTIME60(accelspeed * mult);
|
||||
g_Vars.currentplayer->speedstrafe += PALUPF(accelspeed * mult);
|
||||
|
||||
if (g_Vars.currentplayer->speedstrafe > targetspeed) {
|
||||
g_Vars.currentplayer->speedstrafe = targetspeed;
|
||||
|
||||
+1
-1
@@ -198,7 +198,7 @@ void bheadUpdate(f32 arg0, f32 arg1)
|
||||
|
||||
g_Vars.currentplayer->headwalkingtime60 += g_Vars.lvupdate240_60;
|
||||
|
||||
if (g_Vars.currentplayer->headwalkingtime60 > 60) {
|
||||
if (g_Vars.currentplayer->headwalkingtime60 > PALDOWN(60)) {
|
||||
bheadSetdamp(PAL ? 0.9785f : 0.982f);
|
||||
} else {
|
||||
bheadSetdamp(PAL ? 0.99699f : 0.99748998880386f);
|
||||
|
||||
+9
-9
@@ -99,7 +99,7 @@ void bmoveUpdateAutoAimYProp(struct prop *prop, f32 autoaimy)
|
||||
|
||||
if (prop != g_Vars.currentplayer->autoyaimprop) {
|
||||
if (g_Vars.currentplayer->autoyaimtime60 < 0) {
|
||||
g_Vars.currentplayer->autoyaimtime60 = 30;
|
||||
g_Vars.currentplayer->autoyaimtime60 = PALDOWN(30);
|
||||
g_Vars.currentplayer->autoyaimprop = prop;
|
||||
} else {
|
||||
return;
|
||||
@@ -152,7 +152,7 @@ void bmoveUpdateAutoAimXProp(struct prop *prop, f32 autoaimx)
|
||||
|
||||
if (prop != g_Vars.currentplayer->autoxaimprop) {
|
||||
if (g_Vars.currentplayer->autoxaimtime60 < 0) {
|
||||
g_Vars.currentplayer->autoxaimtime60 = 30;
|
||||
g_Vars.currentplayer->autoxaimtime60 = PALDOWN(30);
|
||||
g_Vars.currentplayer->autoxaimprop = prop;
|
||||
} else {
|
||||
return;
|
||||
@@ -1500,7 +1500,7 @@ glabel var7f1ad8e4
|
||||
/* f0c9584: 26100001 */ addiu $s0,$s0,0x1
|
||||
/* f0c9588: 8e450284 */ lw $a1,0x284($s2)
|
||||
/* f0c958c: 84a2024c */ lh $v0,0x24c($a1)
|
||||
/* f0c9590: 28410010 */ slti $at,$v0,0x10
|
||||
/* f0c9590: 28410010 */ slti $at,$v0,0xd
|
||||
/* f0c9594: 14200006 */ bnez $at,.L0f0c95b0
|
||||
/* f0c9598: 24480001 */ addiu $t0,$v0,0x1
|
||||
/* f0c959c: 0fc3fbda */ jal amOpen
|
||||
@@ -1590,7 +1590,7 @@ glabel var7f1ad8e4
|
||||
.L0f0c96c8:
|
||||
/* f0c96c8: 84a4024e */ lh $a0,0x24e($a1)
|
||||
/* f0c96cc: 0480002a */ bltz $a0,.L0f0c9778
|
||||
/* f0c96d0: 2881001a */ slti $at,$a0,0x1a
|
||||
/* f0c96d0: 2881001a */ slti $at,$a0,0x15
|
||||
/* f0c96d4: 14200016 */ bnez $at,.L0f0c9730
|
||||
/* f0c96d8: 248b0001 */ addiu $t3,$a0,0x1
|
||||
/* f0c96dc: 00002825 */ or $a1,$zero,$zero
|
||||
@@ -1779,7 +1779,7 @@ glabel var7f1ad8e4
|
||||
.L0f0c9964:
|
||||
/* f0c9964: 8ca20260 */ lw $v0,0x260($a1)
|
||||
/* f0c9968: 1840000a */ blez $v0,.L0f0c9994
|
||||
/* f0c996c: 2841000f */ slti $at,$v0,0xf
|
||||
/* f0c996c: 2841000f */ slti $at,$v0,0xc
|
||||
/* f0c9970: 10200008 */ beqz $at,.L0f0c9994
|
||||
/* f0c9974: 8fa20218 */ lw $v0,0x218($sp)
|
||||
/* f0c9978: 10400003 */ beqz $v0,.L0f0c9988
|
||||
@@ -2433,7 +2433,7 @@ glabel var7f1ad8e4
|
||||
/* f0ca2b0: 26100001 */ addiu $s0,$s0,0x1
|
||||
/* f0ca2b4: 8e450284 */ lw $a1,0x284($s2)
|
||||
/* f0ca2b8: 84a2024c */ lh $v0,0x24c($a1)
|
||||
/* f0ca2bc: 28410010 */ slti $at,$v0,0x10
|
||||
/* f0ca2bc: 28410010 */ slti $at,$v0,0xd
|
||||
/* f0ca2c0: 14200006 */ bnez $at,.L0f0ca2dc
|
||||
/* f0ca2c4: 244e0001 */ addiu $t6,$v0,0x1
|
||||
/* f0ca2c8: 0fc3fbda */ jal amOpen
|
||||
@@ -2522,7 +2522,7 @@ glabel var7f1ad8e4
|
||||
.L0f0ca3f0:
|
||||
/* f0ca3f0: 84a4024e */ lh $a0,0x24e($a1)
|
||||
/* f0ca3f4: 0480002a */ bltz $a0,.L0f0ca4a0
|
||||
/* f0ca3f8: 2881001a */ slti $at,$a0,0x1a
|
||||
/* f0ca3f8: 2881001a */ slti $at,$a0,0x15
|
||||
/* f0ca3fc: 14200016 */ bnez $at,.L0f0ca458
|
||||
/* f0ca400: 248f0001 */ addiu $t7,$a0,0x1
|
||||
/* f0ca404: 00002825 */ or $a1,$zero,$zero
|
||||
@@ -2687,7 +2687,7 @@ glabel var7f1ad8e4
|
||||
.L0f0ca630:
|
||||
/* f0ca630: 8ca20260 */ lw $v0,0x260($a1)
|
||||
/* f0ca634: 1840000a */ blez $v0,.L0f0ca660
|
||||
/* f0ca638: 2841000f */ slti $at,$v0,0xf
|
||||
/* f0ca638: 2841000f */ slti $at,$v0,0xc
|
||||
/* f0ca63c: 10200008 */ beqz $at,.L0f0ca660
|
||||
/* f0ca640: 8fa20218 */ lw $v0,0x218($sp)
|
||||
/* f0ca644: 10400003 */ beqz $v0,.L0f0ca654
|
||||
@@ -3178,7 +3178,7 @@ glabel var7f1ad8e4
|
||||
/* f0cad2c: 27a401b4 */ addiu $a0,$sp,0x1b4
|
||||
/* f0cad30: 8e450284 */ lw $a1,0x284($s2)
|
||||
/* f0cad34: 8ca90178 */ lw $t1,0x178($a1)
|
||||
/* f0cad38: 292100b4 */ slti $at,$t1,0xb4
|
||||
/* f0cad38: 292100b4 */ slti $at,$t1,0x96
|
||||
/* f0cad3c: 1420001b */ bnez $at,.L0f0cadac
|
||||
/* f0cad40: 3c013fa0 */ lui $at,0x3fa0
|
||||
/* f0cad44: 44811000 */ mtc1 $at,$f2
|
||||
|
||||
+352
-7
@@ -328,6 +328,350 @@ bool bwalkCalculateNewPosition(struct coord *vel, f32 rotateamount, bool apply,
|
||||
|
||||
const char var7f1ad75c[] = "bondwalk.c";
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel bwalkCalculateNewPositionWithPush
|
||||
/* f0c4250: 27bdff58 */ addiu $sp,$sp,-168
|
||||
/* f0c4254: 8fae00b8 */ lw $t6,0xb8($sp)
|
||||
/* f0c4258: afbf0024 */ sw $ra,0x24($sp)
|
||||
/* f0c425c: afa400a8 */ sw $a0,0xa8($sp)
|
||||
/* f0c4260: afa500ac */ sw $a1,0xac($sp)
|
||||
/* f0c4264: afa600b0 */ sw $a2,0xb0($sp)
|
||||
/* f0c4268: afa700b4 */ sw $a3,0xb4($sp)
|
||||
/* f0c426c: 0fc30f85 */ jal bwalkCalculateNewPosition
|
||||
/* f0c4270: afae0010 */ sw $t6,0x10($sp)
|
||||
/* f0c4274: 24010001 */ addiu $at,$zero,0x1
|
||||
/* f0c4278: 10410135 */ beq $v0,$at,.L0f0c4750
|
||||
/* f0c427c: afa200a4 */ sw $v0,0xa4($sp)
|
||||
/* f0c4280: 0c0093ac */ jal cdGetObstacle
|
||||
/* f0c4284: 00000000 */ nop
|
||||
/* f0c4288: 10400131 */ beqz $v0,.L0f0c4750
|
||||
/* f0c428c: afa200a0 */ sw $v0,0xa0($sp)
|
||||
/* f0c4290: 3c08800a */ lui $t0,%hi(g_Vars)
|
||||
/* f0c4294: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars)
|
||||
/* f0c4298: 8d0f0034 */ lw $t7,0x34($t0)
|
||||
/* f0c429c: 59e0012d */ blezl $t7,.L0f0c4754
|
||||
/* f0c42a0: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
/* f0c42a4: 90430000 */ lbu $v1,0x0($v0)
|
||||
/* f0c42a8: 24010002 */ addiu $at,$zero,0x2
|
||||
/* f0c42ac: 54610046 */ bnel $v1,$at,.L0f0c43c8
|
||||
/* f0c42b0: 24010003 */ addiu $at,$zero,0x3
|
||||
/* f0c42b4: 8c430004 */ lw $v1,0x4($v0)
|
||||
/* f0c42b8: 94780070 */ lhu $t8,0x70($v1)
|
||||
/* f0c42bc: 33190400 */ andi $t9,$t8,0x400
|
||||
/* f0c42c0: 53200124 */ beqzl $t9,.L0f0c4754
|
||||
/* f0c42c4: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
/* f0c42c8: 8d090284 */ lw $t1,0x284($t0)
|
||||
/* f0c42cc: 27a40084 */ addiu $a0,$sp,0x84
|
||||
/* f0c42d0: 27a50078 */ addiu $a1,$sp,0x78
|
||||
/* f0c42d4: 8d2a00d8 */ lw $t2,0xd8($t1)
|
||||
/* f0c42d8: 240601d1 */ addiu $a2,$zero,0x1d1
|
||||
/* f0c42dc: 3c077f1b */ lui $a3,%hi(var7f1ad75c)
|
||||
/* f0c42e0: 5540011c */ bnezl $t2,.L0f0c4754
|
||||
/* f0c42e4: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
/* f0c42e8: 0c009393 */ jal func00024e4c
|
||||
/* f0c42ec: 24e7d75c */ addiu $a3,$a3,%lo(var7f1ad75c)
|
||||
/* f0c42f0: c7a40080 */ lwc1 $f4,0x80($sp)
|
||||
/* f0c42f4: c7a6008c */ lwc1 $f6,0x8c($sp)
|
||||
/* f0c42f8: 44801000 */ mtc1 $zero,$f2
|
||||
/* f0c42fc: c7a80084 */ lwc1 $f8,0x84($sp)
|
||||
/* f0c4300: 46062001 */ sub.s $f0,$f4,$f6
|
||||
/* f0c4304: c7aa0078 */ lwc1 $f10,0x78($sp)
|
||||
/* f0c4308: 3c08800a */ lui $t0,%hi(g_Vars)
|
||||
/* f0c430c: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars)
|
||||
/* f0c4310: 46001032 */ c.eq.s $f2,$f0
|
||||
/* f0c4314: e7a00090 */ swc1 $f0,0x90($sp)
|
||||
/* f0c4318: 460a4101 */ sub.s $f4,$f8,$f10
|
||||
/* f0c431c: 27a40090 */ addiu $a0,$sp,0x90
|
||||
/* f0c4320: e7a20094 */ swc1 $f2,0x94($sp)
|
||||
/* f0c4324: 45000004 */ bc1f .L0f0c4338
|
||||
/* f0c4328: e7a40098 */ swc1 $f4,0x98($sp)
|
||||
/* f0c432c: 46041032 */ c.eq.s $f2,$f4
|
||||
/* f0c4330: 3c013f80 */ lui $at,0x3f80
|
||||
/* f0c4334: 45010006 */ bc1t .L0f0c4350
|
||||
.L0f0c4338:
|
||||
/* f0c4338: 27a50094 */ addiu $a1,$sp,0x94
|
||||
/* f0c433c: 0c0011e4 */ jal guNormalize
|
||||
/* f0c4340: 27a60098 */ addiu $a2,$sp,0x98
|
||||
/* f0c4344: 3c08800a */ lui $t0,%hi(g_Vars)
|
||||
/* f0c4348: 10000004 */ b .L0f0c435c
|
||||
/* f0c434c: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars)
|
||||
.L0f0c4350:
|
||||
/* f0c4350: 44813000 */ mtc1 $at,$f6
|
||||
/* f0c4354: 00000000 */ nop
|
||||
/* f0c4358: e7a60098 */ swc1 $f6,0x98($sp)
|
||||
.L0f0c435c:
|
||||
/* f0c435c: 8d0b0284 */ lw $t3,0x284($t0)
|
||||
/* f0c4360: 3c053ecc */ lui $a1,0x3ecc
|
||||
/* f0c4364: 34a5cccd */ ori $a1,$a1,0xcccd
|
||||
/* f0c4368: 8d6200bc */ lw $v0,0xbc($t3)
|
||||
/* f0c436c: 27a60090 */ addiu $a2,$sp,0x90
|
||||
/* f0c4370: 00003825 */ or $a3,$zero,$zero
|
||||
/* f0c4374: 8c440004 */ lw $a0,0x4($v0)
|
||||
/* f0c4378: 0fc0d05f */ jal func0f03417c
|
||||
/* f0c437c: afa20010 */ sw $v0,0x10($sp)
|
||||
/* f0c4380: 3c01bf80 */ lui $at,0xbf80
|
||||
/* f0c4384: 44814000 */ mtc1 $at,$f8
|
||||
/* f0c4388: 3c048009 */ lui $a0,%hi(var80095200)
|
||||
/* f0c438c: 240cffff */ addiu $t4,$zero,-1
|
||||
/* f0c4390: 240dffff */ addiu $t5,$zero,-1
|
||||
/* f0c4394: 240effff */ addiu $t6,$zero,-1
|
||||
/* f0c4398: afae001c */ sw $t6,0x1c($sp)
|
||||
/* f0c439c: afad0018 */ sw $t5,0x18($sp)
|
||||
/* f0c43a0: afac0010 */ sw $t4,0x10($sp)
|
||||
/* f0c43a4: 8c845200 */ lw $a0,%lo(var80095200)($a0)
|
||||
/* f0c43a8: 240500f2 */ addiu $a1,$zero,0xf2
|
||||
/* f0c43ac: 00003025 */ or $a2,$zero,$zero
|
||||
/* f0c43b0: 2407ffff */ addiu $a3,$zero,-1
|
||||
/* f0c43b4: 0c004241 */ jal audioStart
|
||||
/* f0c43b8: e7a80014 */ swc1 $f8,0x14($sp)
|
||||
/* f0c43bc: 100000e5 */ b .L0f0c4754
|
||||
/* f0c43c0: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
/* f0c43c4: 24010003 */ addiu $at,$zero,0x3
|
||||
.L0f0c43c8:
|
||||
/* f0c43c8: 5461008b */ bnel $v1,$at,.L0f0c45f8
|
||||
/* f0c43cc: 24010006 */ addiu $at,$zero,0x6
|
||||
/* f0c43d0: 8d180318 */ lw $t8,0x318($t0)
|
||||
/* f0c43d4: 8c4f0004 */ lw $t7,0x4($v0)
|
||||
/* f0c43d8: 00001825 */ or $v1,$zero,$zero
|
||||
/* f0c43dc: 1300000c */ beqz $t8,.L0f0c4410
|
||||
/* f0c43e0: afaf0074 */ sw $t7,0x74($sp)
|
||||
/* f0c43e4: 8d190284 */ lw $t9,0x284($t0)
|
||||
/* f0c43e8: 01e02825 */ or $a1,$t7,$zero
|
||||
/* f0c43ec: 24060001 */ addiu $a2,$zero,0x1
|
||||
/* f0c43f0: 8f2900bc */ lw $t1,0xbc($t9)
|
||||
/* f0c43f4: 8d240004 */ lw $a0,0x4($t1)
|
||||
/* f0c43f8: 0fc12aa3 */ jal chrCompareTeams
|
||||
/* f0c43fc: afa00044 */ sw $zero,0x44($sp)
|
||||
/* f0c4400: 10400014 */ beqz $v0,.L0f0c4454
|
||||
/* f0c4404: 8fa30044 */ lw $v1,0x44($sp)
|
||||
/* f0c4408: 10000012 */ b .L0f0c4454
|
||||
/* f0c440c: 24030001 */ addiu $v1,$zero,0x1
|
||||
.L0f0c4410:
|
||||
/* f0c4410: 8faa0074 */ lw $t2,0x74($sp)
|
||||
/* f0c4414: 8d4b0018 */ lw $t3,0x18($t2)
|
||||
/* f0c4418: 000b61c0 */ sll $t4,$t3,0x7
|
||||
/* f0c441c: 0581000d */ bgez $t4,.L0f0c4454
|
||||
/* f0c4420: 00000000 */ nop
|
||||
/* f0c4424: 8d0d029c */ lw $t5,0x29c($t0)
|
||||
/* f0c4428: 05a2000a */ bltzl $t5,.L0f0c4454
|
||||
/* f0c442c: 24030001 */ addiu $v1,$zero,0x1
|
||||
/* f0c4430: 8d0e02a8 */ lw $t6,0x2a8($t0)
|
||||
/* f0c4434: 8d0f0284 */ lw $t7,0x284($t0)
|
||||
/* f0c4438: 55cf0006 */ bnel $t6,$t7,.L0f0c4454
|
||||
/* f0c443c: 24030001 */ addiu $v1,$zero,0x1
|
||||
/* f0c4440: 8d580014 */ lw $t8,0x14($t2)
|
||||
/* f0c4444: 0018c840 */ sll $t9,$t8,0x1
|
||||
/* f0c4448: 07200002 */ bltz $t9,.L0f0c4454
|
||||
/* f0c444c: 00000000 */ nop
|
||||
/* f0c4450: 24030001 */ addiu $v1,$zero,0x1
|
||||
.L0f0c4454:
|
||||
/* f0c4454: 106000be */ beqz $v1,.L0f0c4750
|
||||
/* f0c4458: 8fa200a8 */ lw $v0,0xa8($sp)
|
||||
/* f0c445c: c4400008 */ lwc1 $f0,0x8($v0)
|
||||
/* f0c4460: c4420000 */ lwc1 $f2,0x0($v0)
|
||||
/* f0c4464: 46000282 */ mul.s $f10,$f0,$f0
|
||||
/* f0c4468: 00000000 */ nop
|
||||
/* f0c446c: 46021102 */ mul.s $f4,$f2,$f2
|
||||
/* f0c4470: 0c012974 */ jal sqrtf
|
||||
/* f0c4474: 46045300 */ add.s $f12,$f10,$f4
|
||||
/* f0c4478: 3c08800a */ lui $t0,%hi(g_Vars)
|
||||
/* f0c447c: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars)
|
||||
/* f0c4480: c5060044 */ lwc1 $f6,0x4c($t0)
|
||||
/* f0c4484: 8d090284 */ lw $t1,0x284($t0)
|
||||
/* f0c4488: 8fa300a0 */ lw $v1,0xa0($sp)
|
||||
/* f0c448c: 46060203 */ div.s $f8,$f0,$f6
|
||||
/* f0c4490: 44801000 */ mtc1 $zero,$f2
|
||||
/* f0c4494: e7a80054 */ swc1 $f8,0x54($sp)
|
||||
/* f0c4498: 8d2200bc */ lw $v0,0xbc($t1)
|
||||
/* f0c449c: c46a0008 */ lwc1 $f10,0x8($v1)
|
||||
/* f0c44a0: c4660010 */ lwc1 $f6,0x10($v1)
|
||||
/* f0c44a4: c4440008 */ lwc1 $f4,0x8($v0)
|
||||
/* f0c44a8: c4480010 */ lwc1 $f8,0x10($v0)
|
||||
/* f0c44ac: 46045381 */ sub.s $f14,$f10,$f4
|
||||
/* f0c44b0: 46083401 */ sub.s $f16,$f6,$f8
|
||||
/* f0c44b4: 46027032 */ c.eq.s $f14,$f2
|
||||
/* f0c44b8: 00000000 */ nop
|
||||
/* f0c44bc: 45000005 */ bc1f .L0f0c44d4
|
||||
/* f0c44c0: 00000000 */ nop
|
||||
/* f0c44c4: 46028032 */ c.eq.s $f16,$f2
|
||||
/* f0c44c8: 00000000 */ nop
|
||||
/* f0c44cc: 450300a1 */ bc1tl .L0f0c4754
|
||||
/* f0c44d0: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
.L0f0c44d4:
|
||||
/* f0c44d4: 460e7282 */ mul.s $f10,$f14,$f14
|
||||
/* f0c44d8: e7ae0050 */ swc1 $f14,0x50($sp)
|
||||
/* f0c44dc: e7b0004c */ swc1 $f16,0x4c($sp)
|
||||
/* f0c44e0: 46108102 */ mul.s $f4,$f16,$f16
|
||||
/* f0c44e4: 0c012974 */ jal sqrtf
|
||||
/* f0c44e8: 46045300 */ add.s $f12,$f10,$f4
|
||||
/* f0c44ec: 44801000 */ mtc1 $zero,$f2
|
||||
/* f0c44f0: 3c08800a */ lui $t0,%hi(g_Vars)
|
||||
/* f0c44f4: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars)
|
||||
/* f0c44f8: 4600103c */ c.lt.s $f2,$f0
|
||||
/* f0c44fc: c7ae0050 */ lwc1 $f14,0x50($sp)
|
||||
/* f0c4500: c7b0004c */ lwc1 $f16,0x4c($sp)
|
||||
/* f0c4504: c7a60054 */ lwc1 $f6,0x54($sp)
|
||||
/* f0c4508: 45020092 */ bc1fl .L0f0c4754
|
||||
/* f0c450c: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
/* f0c4510: 46003303 */ div.s $f12,$f6,$f0
|
||||
/* f0c4514: 3c013f00 */ lui $at,0x3f00
|
||||
/* f0c4518: 44819000 */ mtc1 $at,$f18
|
||||
/* f0c451c: 8fa40074 */ lw $a0,0x74($sp)
|
||||
/* f0c4520: 8fa200a0 */ lw $v0,0xa0($sp)
|
||||
/* f0c4524: 27a50068 */ addiu $a1,$sp,0x68
|
||||
/* f0c4528: 27a60058 */ addiu $a2,$sp,0x58
|
||||
/* f0c452c: 00003825 */ or $a3,$zero,$zero
|
||||
/* f0c4530: 460c7382 */ mul.s $f14,$f14,$f12
|
||||
/* f0c4534: 00000000 */ nop
|
||||
/* f0c4538: 460c8402 */ mul.s $f16,$f16,$f12
|
||||
/* f0c453c: 00000000 */ nop
|
||||
/* f0c4540: 460e9082 */ mul.s $f2,$f18,$f14
|
||||
/* f0c4544: 00000000 */ nop
|
||||
/* f0c4548: 46109202 */ mul.s $f8,$f18,$f16
|
||||
/* f0c454c: e4820304 */ swc1 $f2,0x304($a0)
|
||||
/* f0c4550: e4880308 */ swc1 $f8,0x308($a0)
|
||||
/* f0c4554: c5000044 */ lwc1 $f0,0x4c($t0)
|
||||
/* f0c4558: c4440008 */ lwc1 $f4,0x8($v0)
|
||||
/* f0c455c: 46001282 */ mul.s $f10,$f2,$f0
|
||||
/* f0c4560: 46045180 */ add.s $f6,$f10,$f4
|
||||
/* f0c4564: e7a60068 */ swc1 $f6,0x68($sp)
|
||||
/* f0c4568: c448000c */ lwc1 $f8,0xc($v0)
|
||||
/* f0c456c: e7a8006c */ swc1 $f8,0x6c($sp)
|
||||
/* f0c4570: c48a0308 */ lwc1 $f10,0x308($a0)
|
||||
/* f0c4574: c4460010 */ lwc1 $f6,0x10($v0)
|
||||
/* f0c4578: 46005102 */ mul.s $f4,$f10,$f0
|
||||
/* f0c457c: 46062200 */ add.s $f8,$f4,$f6
|
||||
/* f0c4580: 0fc079fd */ jal func0f01e7f4
|
||||
/* f0c4584: e7a80070 */ swc1 $f8,0x70($sp)
|
||||
/* f0c4588: 8fa400a0 */ lw $a0,0xa0($sp)
|
||||
/* f0c458c: c7aa0068 */ lwc1 $f10,0x68($sp)
|
||||
/* f0c4590: e48a0008 */ swc1 $f10,0x8($a0)
|
||||
/* f0c4594: c7a4006c */ lwc1 $f4,0x6c($sp)
|
||||
/* f0c4598: e484000c */ swc1 $f4,0xc($a0)
|
||||
/* f0c459c: c7a60070 */ lwc1 $f6,0x70($sp)
|
||||
/* f0c45a0: 0fc19711 */ jal func0f065c44
|
||||
/* f0c45a4: e4860010 */ swc1 $f6,0x10($a0)
|
||||
/* f0c45a8: 8fa500a0 */ lw $a1,0xa0($sp)
|
||||
/* f0c45ac: 27a40058 */ addiu $a0,$sp,0x58
|
||||
/* f0c45b0: 0fc195e9 */ jal roomsCopy
|
||||
/* f0c45b4: 24a50028 */ addiu $a1,$a1,0x28
|
||||
/* f0c45b8: 0fc0882b */ jal func0f0220ac
|
||||
/* f0c45bc: 8fa40074 */ lw $a0,0x74($sp)
|
||||
/* f0c45c0: 8fab0074 */ lw $t3,0x74($sp)
|
||||
/* f0c45c4: 27a50068 */ addiu $a1,$sp,0x68
|
||||
/* f0c45c8: 0c006b4d */ jal modelSetRootPosition
|
||||
/* f0c45cc: 8d640020 */ lw $a0,0x20($t3)
|
||||
/* f0c45d0: 8fac00b8 */ lw $t4,0xb8($sp)
|
||||
/* f0c45d4: 8fa400a8 */ lw $a0,0xa8($sp)
|
||||
/* f0c45d8: 8fa500ac */ lw $a1,0xac($sp)
|
||||
/* f0c45dc: 8fa600b0 */ lw $a2,0xb0($sp)
|
||||
/* f0c45e0: 8fa700b4 */ lw $a3,0xb4($sp)
|
||||
/* f0c45e4: 0fc30f85 */ jal bwalkCalculateNewPosition
|
||||
/* f0c45e8: afac0010 */ sw $t4,0x10($sp)
|
||||
/* f0c45ec: 10000058 */ b .L0f0c4750
|
||||
/* f0c45f0: afa200a4 */ sw $v0,0xa4($sp)
|
||||
/* f0c45f4: 24010006 */ addiu $at,$zero,0x6
|
||||
.L0f0c45f8:
|
||||
/* f0c45f8: 10610055 */ beq $v1,$at,.L0f0c4750
|
||||
/* f0c45fc: 24010001 */ addiu $at,$zero,0x1
|
||||
/* f0c4600: 54610054 */ bnel $v1,$at,.L0f0c4754
|
||||
/* f0c4604: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
/* f0c4608: 8c460004 */ lw $a2,0x4($v0)
|
||||
/* f0c460c: 8cc30040 */ lw $v1,0x40($a2)
|
||||
/* f0c4610: 00036940 */ sll $t5,$v1,0x5
|
||||
/* f0c4614: 05a0004e */ bltz $t5,.L0f0c4750
|
||||
/* f0c4618: 00037100 */ sll $t6,$v1,0x4
|
||||
/* f0c461c: 05c2004d */ bltzl $t6,.L0f0c4754
|
||||
/* f0c4620: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
/* f0c4624: 8d030284 */ lw $v1,0x284($t0)
|
||||
/* f0c4628: 8c6f1af0 */ lw $t7,0x1af0($v1)
|
||||
/* f0c462c: 55e00008 */ bnezl $t7,.L0f0c4650
|
||||
/* f0c4630: 8cd80010 */ lw $t8,0x10($a2)
|
||||
/* f0c4634: 90ca0003 */ lbu $t2,0x3($a2)
|
||||
/* f0c4638: 2401002d */ addiu $at,$zero,0x2d
|
||||
/* f0c463c: 55410004 */ bnel $t2,$at,.L0f0c4650
|
||||
/* f0c4640: 8cd80010 */ lw $t8,0x10($a2)
|
||||
/* f0c4644: 10000042 */ b .L0f0c4750
|
||||
/* f0c4648: ac621aec */ sw $v0,0x1aec($v1)
|
||||
/* f0c464c: 8cd80010 */ lw $t8,0x10($a2)
|
||||
.L0f0c4650:
|
||||
/* f0c4650: 33190001 */ andi $t9,$t8,0x1
|
||||
/* f0c4654: 5320003f */ beqzl $t9,.L0f0c4754
|
||||
/* f0c4658: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
/* f0c465c: ac600178 */ sw $zero,0x178($v1)
|
||||
/* f0c4660: 8cc90040 */ lw $t1,0x40($a2)
|
||||
/* f0c4664: 24020001 */ addiu $v0,$zero,0x1
|
||||
/* f0c4668: 8fa400a8 */ lw $a0,0xa8($sp)
|
||||
/* f0c466c: 312b0080 */ andi $t3,$t1,0x80
|
||||
/* f0c4670: 11600007 */ beqz $t3,.L0f0c4690
|
||||
/* f0c4674: 00c02825 */ or $a1,$a2,$zero
|
||||
/* f0c4678: 8ccc0048 */ lw $t4,0x48($a2)
|
||||
/* f0c467c: 8d8d0000 */ lw $t5,0x0($t4)
|
||||
/* f0c4680: 31ae1000 */ andi $t6,$t5,0x1000
|
||||
/* f0c4684: 11c00002 */ beqz $t6,.L0f0c4690
|
||||
/* f0c4688: 00000000 */ nop
|
||||
/* f0c468c: 00001025 */ or $v0,$zero,$zero
|
||||
.L0f0c4690:
|
||||
/* f0c4690: 50400030 */ beqzl $v0,.L0f0c4754
|
||||
/* f0c4694: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
/* f0c4698: 0fc30ece */ jal bwalk0f0c3b38
|
||||
/* f0c469c: afa60040 */ sw $a2,0x40($sp)
|
||||
/* f0c46a0: 8fa60040 */ lw $a2,0x40($sp)
|
||||
/* f0c46a4: 8ccf0040 */ lw $t7,0x40($a2)
|
||||
/* f0c46a8: 31ea0080 */ andi $t2,$t7,0x80
|
||||
/* f0c46ac: 51400029 */ beqzl $t2,.L0f0c4754
|
||||
/* f0c46b0: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
/* f0c46b4: 8cd80048 */ lw $t8,0x48($a2)
|
||||
/* f0c46b8: 00c02025 */ or $a0,$a2,$zero
|
||||
/* f0c46bc: 27a50034 */ addiu $a1,$sp,0x34
|
||||
/* f0c46c0: 8f190000 */ lw $t9,0x0($t8)
|
||||
/* f0c46c4: 33290800 */ andi $t1,$t9,0x800
|
||||
/* f0c46c8: 51200022 */ beqzl $t1,.L0f0c4754
|
||||
/* f0c46cc: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
/* f0c46d0: afa00034 */ sw $zero,0x34($sp)
|
||||
/* f0c46d4: 0fc1cf1b */ jal func0f073c6c
|
||||
/* f0c46d8: afa60040 */ sw $a2,0x40($sp)
|
||||
/* f0c46dc: 8fa60040 */ lw $a2,0x40($sp)
|
||||
/* f0c46e0: 8ccb0040 */ lw $t3,0x40($a2)
|
||||
/* f0c46e4: 316c0080 */ andi $t4,$t3,0x80
|
||||
/* f0c46e8: 11800010 */ beqz $t4,.L0f0c472c
|
||||
/* f0c46ec: 00000000 */ nop
|
||||
/* f0c46f0: 8cc30048 */ lw $v1,0x48($a2)
|
||||
/* f0c46f4: 8c6d0000 */ lw $t5,0x0($v1)
|
||||
/* f0c46f8: 35ae1000 */ ori $t6,$t5,0x1000
|
||||
/* f0c46fc: 10400006 */ beqz $v0,.L0f0c4718
|
||||
/* f0c4700: ac6e0000 */ sw $t6,0x0($v1)
|
||||
/* f0c4704: 8cc30048 */ lw $v1,0x48($a2)
|
||||
/* f0c4708: 8c6f0000 */ lw $t7,0x0($v1)
|
||||
/* f0c470c: 35ea2000 */ ori $t2,$t7,0x2000
|
||||
/* f0c4710: 10000006 */ b .L0f0c472c
|
||||
/* f0c4714: ac6a0000 */ sw $t2,0x0($v1)
|
||||
.L0f0c4718:
|
||||
/* f0c4718: 8cc30048 */ lw $v1,0x48($a2)
|
||||
/* f0c471c: 2401dfff */ addiu $at,$zero,-8193
|
||||
/* f0c4720: 8c780000 */ lw $t8,0x0($v1)
|
||||
/* f0c4724: 0301c824 */ and $t9,$t8,$at
|
||||
/* f0c4728: ac790000 */ sw $t9,0x0($v1)
|
||||
.L0f0c472c:
|
||||
/* f0c472c: 10400008 */ beqz $v0,.L0f0c4750
|
||||
/* f0c4730: 8fa400a8 */ lw $a0,0xa8($sp)
|
||||
/* f0c4734: 8fa900b8 */ lw $t1,0xb8($sp)
|
||||
/* f0c4738: 8fa500ac */ lw $a1,0xac($sp)
|
||||
/* f0c473c: 8fa600b0 */ lw $a2,0xb0($sp)
|
||||
/* f0c4740: 8fa700b4 */ lw $a3,0xb4($sp)
|
||||
/* f0c4744: 0fc30f85 */ jal bwalkCalculateNewPosition
|
||||
/* f0c4748: afa90010 */ sw $t1,0x10($sp)
|
||||
/* f0c474c: afa200a4 */ sw $v0,0xa4($sp)
|
||||
.L0f0c4750:
|
||||
/* f0c4750: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
.L0f0c4754:
|
||||
/* f0c4754: 8fa200a4 */ lw $v0,0xa4($sp)
|
||||
/* f0c4758: 27bd00a8 */ addiu $sp,$sp,0xa8
|
||||
/* f0c475c: 03e00008 */ jr $ra
|
||||
/* f0c4760: 00000000 */ nop
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel bwalkCalculateNewPositionWithPush
|
||||
/* f0c4250: 27bdff58 */ addiu $sp,$sp,-168
|
||||
@@ -670,6 +1014,7 @@ glabel bwalkCalculateNewPositionWithPush
|
||||
/* f0c475c: 03e00008 */ jr $ra
|
||||
/* f0c4760: 00000000 */ nop
|
||||
);
|
||||
#endif
|
||||
|
||||
// Mismatch: The below loads 0.5f twice in the chr push code while goal reuses it.
|
||||
//bool bwalkCalculateNewPositionWithPush(struct coord *delta, f32 rotateamount, bool apply, f32 extrawidth, s32 types)
|
||||
@@ -971,13 +1316,13 @@ void bwalkUpdateSpeedSideways(f32 targetspeed, f32 accelspeed, s32 mult)
|
||||
}
|
||||
|
||||
if (g_Vars.currentplayer->speedstrafe > targetspeed) {
|
||||
g_Vars.currentplayer->speedstrafe -= FRAMESTOTIME60(accelspeed * mult);
|
||||
g_Vars.currentplayer->speedstrafe -= PALUPF(accelspeed * mult);
|
||||
|
||||
if (g_Vars.currentplayer->speedstrafe < targetspeed) {
|
||||
g_Vars.currentplayer->speedstrafe = targetspeed;
|
||||
}
|
||||
} else if (g_Vars.currentplayer->speedstrafe < targetspeed) {
|
||||
g_Vars.currentplayer->speedstrafe += FRAMESTOTIME60(accelspeed * mult);
|
||||
g_Vars.currentplayer->speedstrafe += PALUPF(accelspeed * mult);
|
||||
|
||||
if (g_Vars.currentplayer->speedstrafe > targetspeed) {
|
||||
g_Vars.currentplayer->speedstrafe = targetspeed;
|
||||
@@ -1248,7 +1593,7 @@ void bwalkUpdateVertical(void)
|
||||
g_Vars.currentplayer->isfalling = true;
|
||||
g_Vars.currentplayer->fallstart = g_Vars.lvframe60;
|
||||
} else {
|
||||
if (g_Vars.lvframe60 - g_Vars.currentplayer->fallstart > 240) {
|
||||
if (g_Vars.lvframe60 - g_Vars.currentplayer->fallstart > PALDOWN(240)) {
|
||||
// Have been falling for 4 seconds
|
||||
currentPlayerDie(true);
|
||||
}
|
||||
@@ -1313,10 +1658,10 @@ void bwalkUpdateVertical(void)
|
||||
// landing. Eg. The faster the fall speed, the longer Jo will take to
|
||||
// stand back to full height again.
|
||||
if (g_Vars.currentplayer->bdeltapos.y < -13.333333f) {
|
||||
g_Vars.currentplayer->crouchtime240 = 60;
|
||||
g_Vars.currentplayer->crouchtime240 = PALDOWN(60);
|
||||
g_Vars.currentplayer->crouchfall = -90;
|
||||
} else if (g_Vars.currentplayer->bdeltapos.y < -5.0f) {
|
||||
g_Vars.currentplayer->crouchtime240 = 60;
|
||||
g_Vars.currentplayer->crouchtime240 = PALDOWN(60);
|
||||
g_Vars.currentplayer->crouchfall =
|
||||
(-5.0f - g_Vars.currentplayer->bdeltapos.y) * -90.0f / 8.333333f;
|
||||
}
|
||||
@@ -1347,7 +1692,7 @@ void bwalkUpdateVertical(void)
|
||||
|
||||
if (g_Vars.mplayerisrunning == false
|
||||
&& (chr->headnum == HEAD_DARK_COMBAT || chr->headnum == HEAD_DARK_FROCK)
|
||||
&& g_Vars.lvframe60 - g_Vars.currentplayer->fallstart > 40) {
|
||||
&& g_Vars.lvframe60 - g_Vars.currentplayer->fallstart > PALDOWN(40)) {
|
||||
// Play Jo landing grunt
|
||||
s32 sounds[] = {
|
||||
SFX_JO_LANDING_046F,
|
||||
@@ -1472,7 +1817,7 @@ void bwalkUpdateCrouchOffset(void)
|
||||
|
||||
// f32 *frac, f32 maxfrac, f32 *fracspeed, f32 accel, f32 decel, f32 maxspeed
|
||||
func0f06d90c(&g_Vars.currentplayer->crouchoffset, targetoffset,
|
||||
&g_Vars.currentplayer->crouchspeed, FRAMESTOTIME60(0.5f), FRAMESTOTIME60(0.5f), FRAMESTOTIME60(5.0f));
|
||||
&g_Vars.currentplayer->crouchspeed, PALUPF(0.5f), PALUPF(0.5f), PALUPF(5.0f));
|
||||
|
||||
bwalkUpdateCrouchOffsetReal();
|
||||
|
||||
|
||||
@@ -862,6 +862,19 @@ glabel func0f14a16c
|
||||
/* f14a1c8: 314200ff */ andi $v0,$t2,0xff
|
||||
);
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel func0f14a1cc
|
||||
/* f14a1cc: 27bdffe8 */ addiu $sp,$sp,-24
|
||||
/* f14a1d0: afbf0014 */ sw $ra,0x14($sp)
|
||||
/* f14a1d4: 0fc5b9f1 */ jal langGet
|
||||
/* f14a1d8: 248459ad */ addiu $a0,$a0,0x58aa
|
||||
/* f14a1dc: 8fbf0014 */ lw $ra,0x14($sp)
|
||||
/* f14a1e0: 27bd0018 */ addiu $sp,$sp,0x18
|
||||
/* f14a1e4: 03e00008 */ jr $ra
|
||||
/* f14a1e8: 00000000 */ nop
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel func0f14a1cc
|
||||
/* f14a1cc: 27bdffe8 */ addiu $sp,$sp,-24
|
||||
@@ -873,7 +886,21 @@ glabel func0f14a1cc
|
||||
/* f14a1e4: 03e00008 */ jr $ra
|
||||
/* f14a1e8: 00000000 */ nop
|
||||
);
|
||||
#endif
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel func0f14a1ec
|
||||
/* f14a1ec: 27bdffe8 */ addiu $sp,$sp,-24
|
||||
/* f14a1f0: afbf0014 */ sw $ra,0x14($sp)
|
||||
/* f14a1f4: 0fc5b9f1 */ jal langGet
|
||||
/* f14a1f8: 248459b1 */ addiu $a0,$a0,0x58ae
|
||||
/* f14a1fc: 8fbf0014 */ lw $ra,0x14($sp)
|
||||
/* f14a200: 27bd0018 */ addiu $sp,$sp,0x18
|
||||
/* f14a204: 03e00008 */ jr $ra
|
||||
/* f14a208: 00000000 */ nop
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel func0f14a1ec
|
||||
/* f14a1ec: 27bdffe8 */ addiu $sp,$sp,-24
|
||||
@@ -885,6 +912,7 @@ glabel func0f14a1ec
|
||||
/* f14a204: 03e00008 */ jr $ra
|
||||
/* f14a208: 00000000 */ nop
|
||||
);
|
||||
#endif
|
||||
|
||||
GLOBAL_ASM(
|
||||
glabel func0f14a20c
|
||||
|
||||
@@ -11,10 +11,10 @@ glabel casingsReset
|
||||
/* f010b28: ac800000 */ sw $zero,0x0($a0)
|
||||
/* f010b2c: ac800004 */ sw $zero,0x4($a0)
|
||||
/* f010b30: 3c01800a */ lui $at,%hi(var8009d0d8)
|
||||
/* f010b34: 3c03800a */ lui $v1,%hi(var8009d0e0)
|
||||
/* f010b38: 3c02800a */ lui $v0,%hi(var8009d0f0)
|
||||
/* f010b34: 3c03800a */ lui $v1,%hi(var8009d0e0+0x10)
|
||||
/* f010b38: 3c02800a */ lui $v0,%hi(var8009d0e0)
|
||||
/* f010b3c: ac20d0d8 */ sw $zero,%lo(var8009d0d8)($at)
|
||||
/* f010b40: 2442d0f0 */ addiu $v0,$v0,%lo(var8009d0f0)
|
||||
/* f010b40: 2442d0f0 */ addiu $v0,$v0,%lo(var8009d0e0+0x10)
|
||||
/* f010b44: 2463d0e0 */ addiu $v1,$v1,%lo(var8009d0e0)
|
||||
.L0f010b48:
|
||||
/* f010b48: 24630004 */ addiu $v1,$v1,0x4
|
||||
@@ -31,9 +31,9 @@ glabel casingsReset
|
||||
/* f010b70: ac60fffc */ sw $zero,-0x4($v1)
|
||||
/* f010b74: 3c018007 */ lui $at,%hi(g_CasingsActive)
|
||||
/* f010b78: 3c03800a */ lui $v1,%hi(g_Fireslots)
|
||||
/* f010b7c: 3c04800a */ lui $a0,%hi(g_Casings)
|
||||
/* f010b7c: 3c04800a */ lui $a0,%hi(g_Fireslots+0x3c0)
|
||||
/* f010b80: ac200524 */ sw $zero,%lo(g_CasingsActive)($at)
|
||||
/* f010b84: 2484d510 */ addiu $a0,$a0,%lo(g_Casings)
|
||||
/* f010b84: 2484d510 */ addiu $a0,$a0,%lo(g_Fireslots+0x3c0)
|
||||
/* f010b88: 2463d150 */ addiu $v1,$v1,%lo(g_Fireslots)
|
||||
/* f010b8c: 2402ffff */ addiu $v0,$zero,-1
|
||||
.L0f010b90:
|
||||
|
||||
+244
-2
@@ -11,9 +11,250 @@
|
||||
|
||||
const u32 var7f1a8660[] = {0x3e8e38e4};
|
||||
const u32 var7f1a8664[] = {0x3f7ae148};
|
||||
const u32 var7f1a8668[] = {0x00000000};
|
||||
const u32 var7f1a866c[] = {0x00000000};
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel casingTick
|
||||
/* f01d9f0: 27bdff48 */ addiu $sp,$sp,-184
|
||||
/* f01d9f4: afb40034 */ sw $s4,0x34($sp)
|
||||
/* f01d9f8: 3c14800a */ lui $s4,%hi(g_Vars)
|
||||
/* f01d9fc: 26949fc0 */ addiu $s4,$s4,%lo(g_Vars)
|
||||
/* f01da00: 3c017f1b */ lui $at,%hi(var7f1a8660)
|
||||
/* f01da04: c682004c */ lwc1 $f2,0x4c($s4)
|
||||
/* f01da08: c4248660 */ lwc1 $f4,%lo(var7f1a8660)($at)
|
||||
/* f01da0c: afbf003c */ sw $ra,0x3c($sp)
|
||||
/* f01da10: afb50038 */ sw $s5,0x38($sp)
|
||||
/* f01da14: 46041182 */ mul.s $f6,$f2,$f4
|
||||
/* f01da18: afb30030 */ sw $s3,0x30($sp)
|
||||
/* f01da1c: afb2002c */ sw $s2,0x2c($sp)
|
||||
/* f01da20: afb10028 */ sw $s1,0x28($sp)
|
||||
/* f01da24: afb00024 */ sw $s0,0x24($sp)
|
||||
/* f01da28: c4800014 */ lwc1 $f0,0x14($a0)
|
||||
/* f01da2c: 3c013f00 */ lui $at,0x3f00
|
||||
/* f01da30: 44814000 */ mtc1 $at,$f8
|
||||
/* f01da34: 46060301 */ sub.s $f12,$f0,$f6
|
||||
/* f01da38: c4840008 */ lwc1 $f4,0x8($a0)
|
||||
/* f01da3c: 46081282 */ mul.s $f10,$f2,$f8
|
||||
/* f01da40: 3c12800a */ lui $s2,%hi(var8009d0d8)
|
||||
/* f01da44: 460c0400 */ add.s $f16,$f0,$f12
|
||||
/* f01da48: 0080a825 */ or $s5,$a0,$zero
|
||||
/* f01da4c: 2652d0d8 */ addiu $s2,$s2,%lo(var8009d0d8)
|
||||
/* f01da50: 46105482 */ mul.s $f18,$f10,$f16
|
||||
/* f01da54: c48a0000 */ lwc1 $f10,0x0($a0)
|
||||
/* f01da58: 46122180 */ add.s $f6,$f4,$f18
|
||||
/* f01da5c: e4860008 */ swc1 $f6,0x8($a0)
|
||||
/* f01da60: c4880008 */ lwc1 $f8,0x8($a0)
|
||||
/* f01da64: 460a403c */ c.lt.s $f8,$f10
|
||||
/* f01da68: 00000000 */ nop
|
||||
/* f01da6c: 4502004c */ bc1fl .L0f01dba0
|
||||
/* f01da70: c6aa0010 */ lwc1 $f10,0x10($s5)
|
||||
/* f01da74: 8e4e0000 */ lw $t6,0x0($s2)
|
||||
/* f01da78: 3c13800a */ lui $s3,%hi(var8009d0d0)
|
||||
/* f01da7c: 2411ffff */ addiu $s1,$zero,-1
|
||||
/* f01da80: 15c00009 */ bnez $t6,.L0f01daa8
|
||||
/* f01da84: 2673d0d0 */ addiu $s3,$s3,%lo(var8009d0d0)
|
||||
/* f01da88: 8e6f0000 */ lw $t7,0x0($s3)
|
||||
/* f01da8c: 55e00003 */ bnezl $t7,.L0f01da9c
|
||||
/* f01da90: 8e780004 */ lw $t8,0x4($s3)
|
||||
/* f01da94: 00008825 */ or $s1,$zero,$zero
|
||||
/* f01da98: 8e780004 */ lw $t8,0x4($s3)
|
||||
.L0f01da9c:
|
||||
/* f01da9c: 57000003 */ bnezl $t8,.L0f01daac
|
||||
/* f01daa0: 8e990034 */ lw $t9,0x34($s4)
|
||||
/* f01daa4: 24110001 */ addiu $s1,$zero,0x1
|
||||
.L0f01daa8:
|
||||
/* f01daa8: 8e990034 */ lw $t9,0x34($s4)
|
||||
.L0f01daac:
|
||||
/* f01daac: 3c13800a */ lui $s3,%hi(var8009d0d0)
|
||||
/* f01dab0: 2673d0d0 */ addiu $s3,$s3,%lo(var8009d0d0)
|
||||
/* f01dab4: 1b200037 */ blez $t9,.L0f01db94
|
||||
/* f01dab8: 00000000 */ nop
|
||||
/* f01dabc: 06200035 */ bltz $s1,.L0f01db94
|
||||
/* f01dac0: 00000000 */ nop
|
||||
/* f01dac4: 8e820284 */ lw $v0,0x284($s4)
|
||||
/* f01dac8: 24030002 */ addiu $v1,$zero,0x2
|
||||
/* f01dacc: 8c4a0658 */ lw $t2,0x658($v0)
|
||||
/* f01dad0: 106a0030 */ beq $v1,$t2,.L0f01db94
|
||||
/* f01dad4: 00000000 */ nop
|
||||
/* f01dad8: 8c4b0dfc */ lw $t3,0xdfc($v0)
|
||||
/* f01dadc: 106b002d */ beq $v1,$t3,.L0f01db94
|
||||
/* f01dae0: 00000000 */ nop
|
||||
/* f01dae4: 0c004b70 */ jal random
|
||||
/* f01dae8: 00000000 */ nop
|
||||
/* f01daec: 44828000 */ mtc1 $v0,$f16
|
||||
/* f01daf0: 240c0014 */ addiu $t4,$zero,0x10
|
||||
/* f01daf4: 04410005 */ bgez $v0,.L0f01db0c
|
||||
/* f01daf8: 46808120 */ cvt.s.w $f4,$f16
|
||||
/* f01dafc: 3c014f80 */ lui $at,0x4f80
|
||||
/* f01db00: 44819000 */ mtc1 $at,$f18
|
||||
/* f01db04: 00000000 */ nop
|
||||
/* f01db08: 46122100 */ add.s $f4,$f4,$f18
|
||||
.L0f01db0c:
|
||||
/* f01db0c: 3c012f80 */ lui $at,0x2f80
|
||||
/* f01db10: 44813000 */ mtc1 $at,$f6
|
||||
/* f01db14: 3c013e80 */ lui $at,0x3e80
|
||||
/* f01db18: 44815000 */ mtc1 $at,$f10
|
||||
/* f01db1c: 46062202 */ mul.s $f8,$f4,$f6
|
||||
/* f01db20: 3c017f1b */ lui $at,%hi(var7f1a8664)
|
||||
/* f01db24: c4328664 */ lwc1 $f18,%lo(var7f1a8664)($at)
|
||||
/* f01db28: 3c01bf80 */ lui $at,0xbf80
|
||||
/* f01db2c: 44813000 */ mtc1 $at,$f6
|
||||
/* f01db30: 00116880 */ sll $t5,$s1,0x2
|
||||
/* f01db34: ae4c0000 */ sw $t4,0x0($s2)
|
||||
/* f01db38: 460a4402 */ mul.s $f16,$f8,$f10
|
||||
/* f01db3c: 026d8021 */ addu $s0,$s3,$t5
|
||||
/* f01db40: 3c048009 */ lui $a0,%hi(var80095200)
|
||||
/* f01db44: 240effff */ addiu $t6,$zero,-1
|
||||
/* f01db48: 240fffff */ addiu $t7,$zero,-1
|
||||
/* f01db4c: 2418ffff */ addiu $t8,$zero,-1
|
||||
/* f01db50: afb8001c */ sw $t8,0x1c($sp)
|
||||
/* f01db54: 46128100 */ add.s $f4,$f16,$f18
|
||||
/* f01db58: afaf0018 */ sw $t7,0x18($sp)
|
||||
/* f01db5c: afae0010 */ sw $t6,0x10($sp)
|
||||
/* f01db60: 8c845200 */ lw $a0,%lo(var80095200)($a0)
|
||||
/* f01db64: e7a40058 */ swc1 $f4,0x58($sp)
|
||||
/* f01db68: 02003025 */ or $a2,$s0,$zero
|
||||
/* f01db6c: 24058051 */ addiu $a1,$zero,-32687
|
||||
/* f01db70: 2407ffff */ addiu $a3,$zero,-1
|
||||
/* f01db74: 0c004241 */ jal audioStart
|
||||
/* f01db78: e7a60014 */ swc1 $f6,0x14($sp)
|
||||
/* f01db7c: 8e040000 */ lw $a0,0x0($s0)
|
||||
/* f01db80: 24050010 */ addiu $a1,$zero,0x10
|
||||
/* f01db84: 10800003 */ beqz $a0,.L0f01db94
|
||||
/* f01db88: 00000000 */ nop
|
||||
/* f01db8c: 0c00cf94 */ jal func00033e50
|
||||
/* f01db90: 8fa60058 */ lw $a2,0x58($sp)
|
||||
.L0f01db94:
|
||||
/* f01db94: 1000006c */ b .L0f01dd48
|
||||
/* f01db98: aea00040 */ sw $zero,0x40($s5)
|
||||
/* f01db9c: c6aa0010 */ lwc1 $f10,0x10($s5)
|
||||
.L0f01dba0:
|
||||
/* f01dba0: c6a60018 */ lwc1 $f6,0x18($s5)
|
||||
/* f01dba4: c6a80004 */ lwc1 $f8,0x4($s5)
|
||||
/* f01dba8: 460a1402 */ mul.s $f16,$f2,$f10
|
||||
/* f01dbac: c6a4000c */ lwc1 $f4,0xc($s5)
|
||||
/* f01dbb0: 3c013980 */ lui $at,0x3980
|
||||
/* f01dbb4: 46061282 */ mul.s $f10,$f2,$f6
|
||||
/* f01dbb8: 44810000 */ mtc1 $at,$f0
|
||||
/* f01dbbc: e6ac0014 */ swc1 $f12,0x14($s5)
|
||||
/* f01dbc0: 27a7008c */ addiu $a3,$sp,0x8c
|
||||
/* f01dbc4: 02a04025 */ or $t0,$s5,$zero
|
||||
/* f01dbc8: 46104480 */ add.s $f18,$f8,$f16
|
||||
/* f01dbcc: 27a60068 */ addiu $a2,$sp,0x68
|
||||
/* f01dbd0: 24100003 */ addiu $s0,$zero,0x3
|
||||
/* f01dbd4: 460a2200 */ add.s $f8,$f4,$f10
|
||||
/* f01dbd8: e6b20004 */ swc1 $f18,0x4($s5)
|
||||
/* f01dbdc: 27a9008c */ addiu $t1,$sp,0x8c
|
||||
/* f01dbe0: e6a8000c */ swc1 $f8,0xc($s5)
|
||||
.L0f01dbe4:
|
||||
/* f01dbe4: 00001825 */ or $v1,$zero,$zero
|
||||
/* f01dbe8: 00e02825 */ or $a1,$a3,$zero
|
||||
/* f01dbec: 01001025 */ or $v0,$t0,$zero
|
||||
/* f01dbf0: 00c02025 */ or $a0,$a2,$zero
|
||||
/* f01dbf4: 8459002e */ lh $t9,0x2e($v0)
|
||||
/* f01dbf8: 24630001 */ addiu $v1,$v1,0x1
|
||||
/* f01dbfc: 44998000 */ mtc1 $t9,$f16
|
||||
/* f01dc00: 00000000 */ nop
|
||||
/* f01dc04: 46808420 */ cvt.s.w $f16,$f16
|
||||
/* f01dc08: 46008482 */ mul.s $f18,$f16,$f0
|
||||
/* f01dc0c: 50700013 */ beql $v1,$s0,.L0f01dc5c
|
||||
/* f01dc10: e4b20000 */ swc1 $f18,0x0($a1)
|
||||
/* f01dc14: e4b20000 */ swc1 $f18,0x0($a1)
|
||||
.L0f01dc18:
|
||||
/* f01dc18: 844a001c */ lh $t2,0x1c($v0)
|
||||
/* f01dc1c: 24630001 */ addiu $v1,$v1,0x1
|
||||
/* f01dc20: 24a50004 */ addiu $a1,$a1,0x4
|
||||
/* f01dc24: 448a8000 */ mtc1 $t2,$f16
|
||||
/* f01dc28: 24420002 */ addiu $v0,$v0,0x2
|
||||
/* f01dc2c: 24840004 */ addiu $a0,$a0,4
|
||||
/* f01dc30: 46808420 */ cvt.s.w $f16,$f16
|
||||
/* f01dc34: 46008402 */ mul.s $f16,$f16,$f0
|
||||
/* f01dc38: e490fffc */ swc1 $f16,-0x4($a0)
|
||||
/* f01dc3c: 8459002e */ lh $t9,0x2e($v0)
|
||||
/* f01dc40: 44998000 */ mtc1 $t9,$f16
|
||||
/* f01dc44: 00000000 */ nop
|
||||
/* f01dc48: 46808420 */ cvt.s.w $f16,$f16
|
||||
/* f01dc4c: 46008482 */ mul.s $f18,$f16,$f0
|
||||
/* f01dc50: 5470fff1 */ bnel $v1,$s0,.L0f01dc18
|
||||
/* f01dc54: e4b20000 */ swc1 $f18,0x0($a1)
|
||||
/* f01dc58: e4b20000 */ swc1 $f18,0x0($a1)
|
||||
.L0f01dc5c:
|
||||
/* f01dc5c: 844a001c */ lh $t2,0x1c($v0)
|
||||
/* f01dc60: 24a50004 */ addiu $a1,$a1,0x4
|
||||
/* f01dc64: 24420002 */ addiu $v0,$v0,0x2
|
||||
/* f01dc68: 448a8000 */ mtc1 $t2,$f16
|
||||
/* f01dc6c: 24840004 */ addiu $a0,$a0,0x4
|
||||
/* f01dc70: 46808420 */ cvt.s.w $f16,$f16
|
||||
/* f01dc74: 46008402 */ mul.s $f16,$f16,$f0
|
||||
/* f01dc78: e490fffc */ swc1 $f16,-0x4($a0)
|
||||
/* f01dc7c: 24c6000c */ addiu $a2,$a2,0xc
|
||||
/* f01dc80: 00c9082b */ sltu $at,$a2,$t1
|
||||
/* f01dc84: 24e7000c */ addiu $a3,$a3,0xc
|
||||
/* f01dc88: 1420ffd6 */ bnez $at,.L0f01dbe4
|
||||
/* f01dc8c: 25080006 */ addiu $t0,$t0,0x6
|
||||
/* f01dc90: 8e8b0034 */ lw $t3,0x34($s4)
|
||||
/* f01dc94: 00008825 */ or $s1,$zero,$zero
|
||||
/* f01dc98: 27b30068 */ addiu $s3,$sp,0x68
|
||||
/* f01dc9c: 19600009 */ blez $t3,.L0f01dcc4
|
||||
/* f01dca0: 27b2008c */ addiu $s2,$sp,0x8c
|
||||
/* f01dca4: 02402025 */ or $a0,$s2,$zero
|
||||
.L0f01dca8:
|
||||
/* f01dca8: 0c005844 */ jal func00016110
|
||||
/* f01dcac: 02602825 */ or $a1,$s3,$zero
|
||||
/* f01dcb0: 8e8c0034 */ lw $t4,0x34($s4)
|
||||
/* f01dcb4: 26310001 */ addiu $s1,$s1,0x1
|
||||
/* f01dcb8: 022c082a */ slt $at,$s1,$t4
|
||||
/* f01dcbc: 5420fffa */ bnezl $at,.L0f01dca8
|
||||
/* f01dcc0: 02402025 */ or $a0,$s2,$zero
|
||||
.L0f01dcc4:
|
||||
/* f01dcc4: 3c014580 */ lui $at,0x4580
|
||||
/* f01dcc8: 44810000 */ mtc1 $at,$f0
|
||||
/* f01dccc: 02a04025 */ or $t0,$s5,$zero
|
||||
/* f01dcd0: 27a60068 */ addiu $a2,$sp,0x68
|
||||
/* f01dcd4: 27a5008c */ addiu $a1,$sp,0x8c
|
||||
.L0f01dcd8:
|
||||
/* f01dcd8: 00001825 */ or $v1,$zero,$zero
|
||||
/* f01dcdc: 01001025 */ or $v0,$t0,$zero
|
||||
/* f01dce0: 00c02025 */ or $a0,$a2,$zero
|
||||
/* f01dce4: c4900000 */ lwc1 $f16,0x0($a0)
|
||||
/* f01dce8: 24630001 */ addiu $v1,$v1,0x1
|
||||
/* f01dcec: 46008482 */ mul.s $f18,$f16,$f0
|
||||
/* f01dcf0: 5070000d */ beql $v1,$s0,.L0f01dd28
|
||||
/* f01dcf4: 4600940d */ trunc.w.s $f16,$f18
|
||||
/* f01dcf8: 4600940d */ trunc.w.s $f16,$f18
|
||||
.L0f01dcfc:
|
||||
/* f01dcfc: 24630001 */ addiu $v1,$v1,0x1
|
||||
/* f01dd00: 24420002 */ addiu $v0,$v0,0x2
|
||||
/* f01dd04: 24840004 */ addiu $a0,$a0,0x4
|
||||
/* f01dd08: 440e8000 */ mfc1 $t6,$f16
|
||||
/* f01dd0c: 00000000 */ nop
|
||||
/* f01dd10: a44e001a */ sh $t6,0x1a($v0)
|
||||
/* f01dd14: c4900000 */ lwc1 $f16,0x0($a0)
|
||||
/* f01dd18: 46008482 */ mul.s $f18,$f16,$f0
|
||||
/* f01dd1c: 5470fff7 */ bnel $v1,$s0,.L0f01dcfc
|
||||
/* f01dd20: 4600940d */ trunc.w.s $f16,$f18
|
||||
/* f01dd24: 4600940d */ trunc.w.s $f16,$f18
|
||||
.L0f01dd28:
|
||||
/* f01dd28: 24420002 */ addiu $v0,$v0,0x2
|
||||
/* f01dd2c: 24840004 */ addiu $a0,$a0,0x4
|
||||
/* f01dd30: 440e8000 */ mfc1 $t6,$f16
|
||||
/* f01dd34: 00000000 */ nop
|
||||
/* f01dd38: a44e001a */ sh $t6,0x1a($v0)
|
||||
/* f01dd3c: 24c6000c */ addiu $a2,$a2,0xc
|
||||
/* f01dd40: 14c5ffe5 */ bne $a2,$a1,.L0f01dcd8
|
||||
/* f01dd44: 25080006 */ addiu $t0,$t0,0x6
|
||||
.L0f01dd48:
|
||||
/* f01dd48: 8fbf003c */ lw $ra,0x3c($sp)
|
||||
/* f01dd4c: 8fb00024 */ lw $s0,0x24($sp)
|
||||
/* f01dd50: 8fb10028 */ lw $s1,0x28($sp)
|
||||
/* f01dd54: 8fb2002c */ lw $s2,0x2c($sp)
|
||||
/* f01dd58: 8fb30030 */ lw $s3,0x30($sp)
|
||||
/* f01dd5c: 8fb40034 */ lw $s4,0x34($sp)
|
||||
/* f01dd60: 8fb50038 */ lw $s5,0x38($sp)
|
||||
/* f01dd64: 03e00008 */ jr $ra
|
||||
/* f01dd68: 27bd00b8 */ addiu $sp,$sp,0xb8
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel casingTick
|
||||
/* f01d9f0: 27bdff48 */ addiu $sp,$sp,-184
|
||||
@@ -255,6 +496,7 @@ glabel casingTick
|
||||
/* f01dd64: 03e00008 */ jr $ra
|
||||
/* f01dd68: 27bd00b8 */ addiu $sp,$sp,0xb8
|
||||
);
|
||||
#endif
|
||||
|
||||
GLOBAL_ASM(
|
||||
glabel casingsTick
|
||||
|
||||
+817
-99
File diff suppressed because it is too large
Load Diff
+3968
-30
File diff suppressed because it is too large
Load Diff
@@ -384,10 +384,6 @@ bool aiKneel(void)
|
||||
return false;
|
||||
}
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
extern f32 g_SomePalFloat;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @cmd 000b
|
||||
*/
|
||||
@@ -425,7 +421,7 @@ bool aiChrDoAnimation(void)
|
||||
if (g_Vars.in_cutscene) {
|
||||
if (startframe != 0xfffe) {
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
fstartframe += g_SomePalFloat * result;
|
||||
fstartframe += var8009e388pf * result;
|
||||
#else
|
||||
fstartframe += var8009de20 * result * 0.25f;
|
||||
#endif
|
||||
@@ -5145,7 +5141,7 @@ bool aiObjectDoAnimation(void)
|
||||
|
||||
if (g_Vars.in_cutscene && startframe != 0xfffe) {
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
fstartframe += g_SomePalFloat * thing;
|
||||
fstartframe += var8009e388pf * thing;
|
||||
#else
|
||||
fstartframe += var8009de20 * thing * 0.25f;
|
||||
#endif
|
||||
@@ -5994,7 +5990,7 @@ bool aiSetLights(void)
|
||||
roomSetLightsOn(roomnum, true);
|
||||
break;
|
||||
default:
|
||||
roomSetLighting(roomnum, cmd[4], cmd[5], cmd[6], TIME60TOFRAMES(cmd[7]));
|
||||
roomSetLighting(roomnum, cmd[4], cmd[5], cmd[6], PALDOWN(cmd[7]));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9141,7 +9137,7 @@ bool aiSetChrPresetToUnalertedTeammate(void)
|
||||
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
|
||||
s16 *chrnums = teamGetChrIds(g_Vars.chrdata->team);
|
||||
|
||||
if (g_Vars.chrdata->talktimer > 480 && g_Vars.chrdata->listening) {
|
||||
if (g_Vars.chrdata->talktimer > PALDOWN(480) && g_Vars.chrdata->listening) {
|
||||
g_Vars.chrdata->listening = 0;
|
||||
}
|
||||
|
||||
@@ -9736,9 +9732,9 @@ bool aiChrAdjustMotionBlur(void)
|
||||
|
||||
if (chr) {
|
||||
if (cmd[4] == 0) {
|
||||
chr->blurdrugamount -= TIME60TOFRAMES(cmd[3]);
|
||||
chr->blurdrugamount -= PALDOWN(cmd[3]);
|
||||
} else {
|
||||
chr->blurdrugamount += TIME60TOFRAMES(cmd[3]);
|
||||
chr->blurdrugamount += PALDOWN(cmd[3]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10080,7 +10076,7 @@ bool ai0184(void)
|
||||
bool aiIfSoundTimer(void)
|
||||
{
|
||||
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
|
||||
s32 value = TIME60TOFRAMES(cmd[3] | (cmd[2] << 8));
|
||||
s32 value = PALDOWN(cmd[3] | (cmd[2] << 8));
|
||||
|
||||
if ((g_Vars.chrdata->soundtimer > value && cmd[4] == 0) ||
|
||||
(g_Vars.chrdata->soundtimer < value && cmd[4] == 1)) {
|
||||
|
||||
+110
-15
@@ -264,7 +264,7 @@ void coreLoadStage(s32 stagenum)
|
||||
g_Vars.lvupdate240 = 4;
|
||||
|
||||
g_Vars.lvupdate240f = 1;
|
||||
g_Vars.lvupdate240frealprev = FRAMESTOTIME60(1.0f);
|
||||
g_Vars.lvupdate240frealprev = PALUPF(1.0f);
|
||||
g_Vars.lvupdate240freal = g_Vars.lvupdate240frealprev;
|
||||
|
||||
g_StageTimeElapsed60 = 0;
|
||||
@@ -511,7 +511,11 @@ Gfx *coreRenderFade(Gfx *gdl)
|
||||
if (g_FadeDelay > 0) {
|
||||
g_FadeDelay--;
|
||||
} else {
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
g_FadeFrac += g_Vars.diffframe60freal / g_FadeNumFrames;
|
||||
#else
|
||||
g_FadeFrac += g_Vars.diffframe60f / g_FadeNumFrames;
|
||||
#endif
|
||||
|
||||
if (g_FadeFrac >= 1) {
|
||||
g_FadeFrac = -1;
|
||||
@@ -581,11 +585,11 @@ bool coreCheckCmpFollowThreat(struct threat *threat, s32 index)
|
||||
if (chrIsDead(threat->prop->chr)) {
|
||||
if (index >= 0) {
|
||||
// Existing threat
|
||||
if (g_Vars.currentplayer->targetset[index] < 129) {
|
||||
g_Vars.currentplayer->targetset[index] = 129;
|
||||
if (g_Vars.currentplayer->targetset[index] < PALDOWN(129)) {
|
||||
g_Vars.currentplayer->targetset[index] = PALDOWN(129);
|
||||
}
|
||||
|
||||
if (g_Vars.currentplayer->targetset[index] >= 175) {
|
||||
if (g_Vars.currentplayer->targetset[index] >= (PAL ? 146 : 175)) {
|
||||
threat->prop = NULL;
|
||||
return false;
|
||||
}
|
||||
@@ -3480,13 +3484,21 @@ Gfx *coreRender(Gfx *gdl)
|
||||
}
|
||||
#endif
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
u32 var800840a4 = 0;
|
||||
u32 var800840a8 = 100;
|
||||
u32 var800840ac = 0;
|
||||
u32 g_CutsceneTime240_60 = 0;
|
||||
u32 var800840a8 = PAL ? 100 : 0;
|
||||
u32 var800840ac = 0x00000000;
|
||||
u32 var800840b0 = 0x00000000;
|
||||
u32 var800840b4 = 0x00000000;
|
||||
u32 var800840b8 = 0x00000000;
|
||||
u32 var800840bc = 0x00000000;
|
||||
#else
|
||||
u32 g_CutsceneTime240_60 = 0;
|
||||
u32 var800840a8 = 0;
|
||||
u32 var800840ac = 0;
|
||||
u32 var800840b0 = 0;
|
||||
#endif
|
||||
|
||||
u32 var800840b4 = 0;
|
||||
u32 var800840b8 = 0;
|
||||
u32 var800840bc = 0;
|
||||
|
||||
void coreUpdateSoloHandicaps(void)
|
||||
{
|
||||
@@ -3555,7 +3567,7 @@ void coreUpdateSoloHandicaps(void)
|
||||
var80062ca4 = 1;
|
||||
var80062ca8 = 1;
|
||||
var8007e4a8 = 1;
|
||||
var80069880 = g_LanguageId ? 1.1f : 0.75f;
|
||||
var80069880 = g_Jpn ? 1.1f : 0.75f;
|
||||
g_AmmoMultiplier = 1.5f;
|
||||
var80062cac = 0.5f;
|
||||
} else {
|
||||
@@ -3568,7 +3580,7 @@ void coreUpdateSoloHandicaps(void)
|
||||
var80062ca4 = 1.5f;
|
||||
var80062ca8 = 1;
|
||||
var8007e4a8 = 1.5f;
|
||||
var80069880 = g_LanguageId ? 0.75f : 0.2f;
|
||||
var80069880 = g_Jpn ? 0.75f : 0.2f;
|
||||
g_AmmoMultiplier = 1;
|
||||
var80062cac = 1;
|
||||
}
|
||||
@@ -3613,7 +3625,7 @@ void coreUpdateSoloHandicaps(void)
|
||||
var80062ca4 = 0.6f;
|
||||
var80062ca8 = 1;
|
||||
var8007e4a8 = 0.75f;
|
||||
var80069880 = g_LanguageId ? 1.1f : 0.75f;
|
||||
var80069880 = g_Jpn ? 1.1f : 0.75f;
|
||||
g_AmmoMultiplier = 1.5f;
|
||||
var80062cac = 0.5f;
|
||||
} else if (g_Difficulty == DIFF_PA) {
|
||||
@@ -3626,7 +3638,7 @@ void coreUpdateSoloHandicaps(void)
|
||||
var80062ca4 = 1;
|
||||
var80062ca8 = 1;
|
||||
var8007e4a8 = 1;
|
||||
var80069880 = g_LanguageId ? 0.75f : 0.2f;
|
||||
var80069880 = g_Jpn ? 0.75f : 0.2f;
|
||||
g_AmmoMultiplier = 1;
|
||||
var80062cac = 1;
|
||||
} else if (g_Difficulty == DIFF_PD) {
|
||||
@@ -3665,6 +3677,88 @@ void coreUpdateCutsceneTime(void)
|
||||
g_CutsceneTime240_60 = 0;
|
||||
}
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel coreGetSlowMotionType
|
||||
/* f16b854: 27bdffd0 */ addiu $sp,$sp,-48
|
||||
/* f16b858: afbf0014 */ sw $ra,0x14($sp)
|
||||
/* f16b85c: 3c04b000 */ lui $a0,0xb000
|
||||
/* f16b860: 0fc5ae00 */ jal sub54321
|
||||
/* f16b864: 3484de8d */ ori $a0,$a0,0x1d45
|
||||
/* f16b868: 3c041741 */ lui $a0,0x330
|
||||
/* f16b86c: afa2002c */ sw $v0,0x2c($sp)
|
||||
/* f16b870: 0fc5ae00 */ jal sub54321
|
||||
/* f16b874: 3484d42a */ ori $a0,$a0,0xe225
|
||||
/* f16b878: afa20024 */ sw $v0,0x24($sp)
|
||||
/* f16b87c: 8fa4002c */ lw $a0,0x2c($sp)
|
||||
/* f16b880: 0c013994 */ jal osPiReadIo
|
||||
/* f16b884: 27a50028 */ addiu $a1,$sp,0x28
|
||||
/* f16b888: 8fae0028 */ lw $t6,0x28($sp)
|
||||
/* f16b88c: 8faf0024 */ lw $t7,0x24($sp)
|
||||
/* f16b890: 3c058006 */ lui $a1,%hi(rspbootTextStart)
|
||||
/* f16b894: 24a29fe0 */ addiu $v0,$a1,%lo(rspbootTextStart)
|
||||
/* f16b898: 11cf000d */ beq $t6,$t7,.L0f16b8d0
|
||||
/* f16b89c: 3c09800a */ lui $t1,%hi(g_Vars+0x318)
|
||||
/* f16b8a0: 3c188006 */ lui $t8,%hi(rspbootTextStart+0x1)
|
||||
/* f16b8a4: 24431000 */ addiu $v1,$v0,0x1000
|
||||
/* f16b8a8: 27189fe1 */ addiu $t8,$t8,%lo(rspbootTextStart+0x1)
|
||||
/* f16b8ac: 0078082b */ sltu $at,$v1,$t8
|
||||
/* f16b8b0: 14200007 */ bnez $at,.L0f16b8d0
|
||||
/* f16b8b4: 00000000 */ nop
|
||||
.L0f16b8b8:
|
||||
/* f16b8b8: 8c590000 */ lw $t9,0x0($v0)
|
||||
/* f16b8bc: 24420004 */ addiu $v0,$v0,0x4
|
||||
/* f16b8c0: 0043082b */ sltu $at,$v0,$v1
|
||||
/* f16b8c4: 27280008 */ addiu $t0,$t9,0x8
|
||||
/* f16b8c8: 1420fffb */ bnez $at,.L0f16b8b8
|
||||
/* f16b8cc: ac48fffc */ sw $t0,-0x4($v0)
|
||||
.L0f16b8d0:
|
||||
/* f16b8d0: 8d29a2d8 */ lw $t1,%lo(g_Vars+0x318)($t1)
|
||||
/* f16b8d4: 3c02800b */ lui $v0,%hi(g_MpSetup+0xc)
|
||||
/* f16b8d8: 1120000b */ beqz $t1,.L0f16b908
|
||||
/* f16b8dc: 00000000 */ nop
|
||||
/* f16b8e0: 8c42cb94 */ lw $v0,%lo(g_MpSetup+0xc)($v0)
|
||||
/* f16b8e4: 304a0040 */ andi $t2,$v0,0x40
|
||||
/* f16b8e8: 11400003 */ beqz $t2,.L0f16b8f8
|
||||
/* f16b8ec: 304b0080 */ andi $t3,$v0,0x80
|
||||
/* f16b8f0: 1000001a */ b .L0f16b95c
|
||||
/* f16b8f4: 24020001 */ addiu $v0,$zero,0x1
|
||||
.L0f16b8f8:
|
||||
/* f16b8f8: 51600018 */ beqzl $t3,.L0f16b95c
|
||||
/* f16b8fc: 00001025 */ or $v0,$zero,$zero
|
||||
/* f16b900: 10000016 */ b .L0f16b95c
|
||||
/* f16b904: 24020002 */ addiu $v0,$zero,0x2
|
||||
.L0f16b908:
|
||||
/* f16b908: 0fc41b99 */ jal cheatIsActive
|
||||
/* f16b90c: 24040006 */ addiu $a0,$zero,0x6
|
||||
/* f16b910: 10400003 */ beqz $v0,.L0f16b920
|
||||
/* f16b914: 00000000 */ nop
|
||||
/* f16b918: 10000010 */ b .L0f16b95c
|
||||
/* f16b91c: 24020001 */ addiu $v0,$zero,0x1
|
||||
.L0f16b920:
|
||||
/* f16b920: 0fc47b9c */ jal debugGetSlowMotion
|
||||
/* f16b924: 00000000 */ nop
|
||||
/* f16b928: 24010001 */ addiu $at,$zero,0x1
|
||||
/* f16b92c: 14410003 */ bne $v0,$at,.L0f16b93c
|
||||
/* f16b930: 00000000 */ nop
|
||||
/* f16b934: 10000009 */ b .L0f16b95c
|
||||
/* f16b938: 24020001 */ addiu $v0,$zero,0x1
|
||||
.L0f16b93c:
|
||||
/* f16b93c: 0fc47b9c */ jal debugGetSlowMotion
|
||||
/* f16b940: 00000000 */ nop
|
||||
/* f16b944: 24010002 */ addiu $at,$zero,0x2
|
||||
/* f16b948: 54410004 */ bnel $v0,$at,.L0f16b95c
|
||||
/* f16b94c: 00001025 */ or $v0,$zero,$zero
|
||||
/* f16b950: 10000002 */ b .L0f16b95c
|
||||
/* f16b954: 24020002 */ addiu $v0,$zero,0x2
|
||||
/* f16b958: 00001025 */ or $v0,$zero,$zero
|
||||
.L0f16b95c:
|
||||
/* f16b95c: 8fbf0014 */ lw $ra,0x14($sp)
|
||||
/* f16b960: 27bd0030 */ addiu $sp,$sp,0x30
|
||||
/* f16b964: 03e00008 */ jr $ra
|
||||
/* f16b968: 00000000 */ nop
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel coreGetSlowMotionType
|
||||
/* f16b854: 27bdffd0 */ addiu $sp,$sp,-48
|
||||
@@ -3745,6 +3839,7 @@ glabel coreGetSlowMotionType
|
||||
/* f16b964: 03e00008 */ jr $ra
|
||||
/* f16b968: 00000000 */ nop
|
||||
);
|
||||
#endif
|
||||
|
||||
// Can't match the antipiracy part
|
||||
//u32 coreGetSlowMotionType(void)
|
||||
@@ -5210,7 +5305,7 @@ void coreTick(void)
|
||||
g_Vars.lvframe60 += g_Vars.lvupdate240_60;
|
||||
g_Vars.lvframe240 += g_Vars.lvupdate240;
|
||||
g_Vars.lvupdate240frealprev = g_Vars.lvupdate240freal;
|
||||
g_Vars.lvupdate240freal = FRAMESTOTIME60(g_Vars.lvupdate240f);
|
||||
g_Vars.lvupdate240freal = PALUPF(g_Vars.lvupdate240f);
|
||||
|
||||
speedpillTick();
|
||||
hudmsgsTick();
|
||||
|
||||
+356
-4
@@ -266,7 +266,7 @@ Gfx *creditsRenderBackground(Gfx *gdl)
|
||||
s32 s2[4];
|
||||
|
||||
u32 stack;
|
||||
f32 tmp = var800a416c / 1200.0f;
|
||||
f32 tmp = var800a416c / (PAL ? 1000.0f : 1200.0f);
|
||||
f32 bestvalue;
|
||||
s32 bestindex;
|
||||
s32 len = 0;
|
||||
@@ -771,6 +771,353 @@ void func0f13870c(void)
|
||||
}
|
||||
}
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel func0f13899c
|
||||
.late_rodata
|
||||
glabel var7f1b5810
|
||||
.word 0x3be56042
|
||||
glabel var7f1b5814
|
||||
.word 0x3b03126f
|
||||
glabel var7f1b5818
|
||||
.word 0x3be56042
|
||||
glabel var7f1b581c
|
||||
.word 0x453b8000
|
||||
glabel var7f1b5820
|
||||
.word 0x3c23d70a
|
||||
glabel var7f1b5824
|
||||
.word 0x40c907a9
|
||||
.text
|
||||
/* f13899c: 27bdffb8 */ addiu $sp,$sp,-72
|
||||
/* f1389a0: afb1003c */ sw $s1,0x3c($sp)
|
||||
/* f1389a4: 3c11800a */ lui $s1,%hi(g_CreditsData)
|
||||
/* f1389a8: 26314170 */ addiu $s1,$s1,%lo(g_CreditsData)
|
||||
/* f1389ac: 8e230000 */ lw $v1,0x0($s1)
|
||||
/* f1389b0: afbf0044 */ sw $ra,0x44($sp)
|
||||
/* f1389b4: afb20040 */ sw $s2,0x40($sp)
|
||||
/* f1389b8: afb00038 */ sw $s0,0x38($sp)
|
||||
/* f1389bc: f7ba0030 */ sdc1 $f26,0x30($sp)
|
||||
/* f1389c0: f7b80028 */ sdc1 $f24,0x28($sp)
|
||||
/* f1389c4: f7b60020 */ sdc1 $f22,0x20($sp)
|
||||
/* f1389c8: f7b40018 */ sdc1 $f20,0x18($sp)
|
||||
/* f1389cc: 806e41f5 */ lb $t6,0x41f5($v1)
|
||||
/* f1389d0: 05c00019 */ bltz $t6,.L0f138a38
|
||||
/* f1389d4: 3c01800a */ lui $at,%hi(g_Vars+0x5c)
|
||||
/* f1389d8: c424a008 */ lwc1 $f4,%lo(g_Vars+0x5c)($at)
|
||||
/* f1389dc: 3c014434 */ lui $at,0x4434
|
||||
/* f1389e0: 44813000 */ mtc1 $at,$f6
|
||||
/* f1389e4: c46a41f8 */ lwc1 $f10,0x41f8($v1)
|
||||
/* f1389e8: 3c013f80 */ lui $at,0x3f80
|
||||
/* f1389ec: 46062203 */ div.s $f8,$f4,$f6
|
||||
/* f1389f0: 44819000 */ mtc1 $at,$f18
|
||||
/* f1389f4: 3c012f80 */ lui $at,0x2f80
|
||||
/* f1389f8: 4481d000 */ mtc1 $at,$f26
|
||||
/* f1389fc: 46085400 */ add.s $f16,$f10,$f8
|
||||
/* f138a00: e47041f8 */ swc1 $f16,0x41f8($v1)
|
||||
/* f138a04: 8e230000 */ lw $v1,0x0($s1)
|
||||
/* f138a08: c46441f8 */ lwc1 $f4,0x41f8($v1)
|
||||
/* f138a0c: 4604903c */ c.lt.s $f18,$f4
|
||||
/* f138a10: 00000000 */ nop
|
||||
/* f138a14: 45000006 */ bc1f .L0f138a30
|
||||
/* f138a18: 00000000 */ nop
|
||||
/* f138a1c: 806f41f5 */ lb $t7,0x41f5($v1)
|
||||
/* f138a20: 2418ffff */ addiu $t8,$zero,-1
|
||||
/* f138a24: a06f41f6 */ sb $t7,0x41f6($v1)
|
||||
/* f138a28: 8e390000 */ lw $t9,0x0($s1)
|
||||
/* f138a2c: a33841f5 */ sb $t8,0x41f5($t9)
|
||||
.L0f138a30:
|
||||
/* f138a30: 10000020 */ b .L0f138ab4
|
||||
/* f138a34: 00000000 */ nop
|
||||
.L0f138a38:
|
||||
/* f138a38: 0c004b70 */ jal random
|
||||
/* f138a3c: 00000000 */ nop
|
||||
/* f138a40: 44823000 */ mtc1 $v0,$f6
|
||||
/* f138a44: 3c012f80 */ lui $at,0x2f80
|
||||
/* f138a48: 4481d000 */ mtc1 $at,$f26
|
||||
/* f138a4c: 04410005 */ bgez $v0,.L0f138a64
|
||||
/* f138a50: 468032a0 */ cvt.s.w $f10,$f6
|
||||
/* f138a54: 3c014f80 */ lui $at,0x4f80
|
||||
/* f138a58: 44814000 */ mtc1 $at,$f8
|
||||
/* f138a5c: 00000000 */ nop
|
||||
/* f138a60: 46085280 */ add.s $f10,$f10,$f8
|
||||
.L0f138a64:
|
||||
/* f138a64: 461a5402 */ mul.s $f16,$f10,$f26
|
||||
/* f138a68: 3c017f1b */ lui $at,%hi(var7f1b5810)
|
||||
/* f138a6c: c4325810 */ lwc1 $f18,%lo(var7f1b5810)($at)
|
||||
/* f138a70: 00002025 */ or $a0,$zero,$zero
|
||||
/* f138a74: 4612803c */ c.lt.s $f16,$f18
|
||||
/* f138a78: 00000000 */ nop
|
||||
/* f138a7c: 4500000d */ bc1f .L0f138ab4
|
||||
/* f138a80: 00000000 */ nop
|
||||
/* f138a84: 0c0053d8 */ jal contGetButtons
|
||||
/* f138a88: 24050030 */ addiu $a1,$zero,0x30
|
||||
/* f138a8c: 14400009 */ bnez $v0,.L0f138ab4
|
||||
/* f138a90: 00000000 */ nop
|
||||
/* f138a94: 0c004b70 */ jal random
|
||||
/* f138a98: 00000000 */ nop
|
||||
/* f138a9c: 8e290000 */ lw $t1,0x0($s1)
|
||||
/* f138aa0: 30480003 */ andi $t0,$v0,0x3
|
||||
/* f138aa4: 44802000 */ mtc1 $zero,$f4
|
||||
/* f138aa8: a12841f5 */ sb $t0,0x41f5($t1)
|
||||
/* f138aac: 8e2a0000 */ lw $t2,0x0($s1)
|
||||
/* f138ab0: e54441f8 */ swc1 $f4,0x41f8($t2)
|
||||
.L0f138ab4:
|
||||
/* f138ab4: 0c004b70 */ jal random
|
||||
/* f138ab8: 00000000 */ nop
|
||||
/* f138abc: 44823000 */ mtc1 $v0,$f6
|
||||
/* f138ac0: 3c014f80 */ lui $at,0x4f80
|
||||
/* f138ac4: 04410004 */ bgez $v0,.L0f138ad8
|
||||
/* f138ac8: 46803220 */ cvt.s.w $f8,$f6
|
||||
/* f138acc: 44815000 */ mtc1 $at,$f10
|
||||
/* f138ad0: 00000000 */ nop
|
||||
/* f138ad4: 460a4200 */ add.s $f8,$f8,$f10
|
||||
.L0f138ad8:
|
||||
/* f138ad8: 461a4402 */ mul.s $f16,$f8,$f26
|
||||
/* f138adc: 3c017f1b */ lui $at,%hi(var7f1b5814)
|
||||
/* f138ae0: c4325814 */ lwc1 $f18,%lo(var7f1b5814)($at)
|
||||
/* f138ae4: 00002025 */ or $a0,$zero,$zero
|
||||
/* f138ae8: 4612803c */ c.lt.s $f16,$f18
|
||||
/* f138aec: 00000000 */ nop
|
||||
/* f138af0: 4502000e */ bc1fl .L0f138b2c
|
||||
/* f138af4: 00002025 */ or $a0,$zero,$zero
|
||||
/* f138af8: 0c0053d8 */ jal contGetButtons
|
||||
/* f138afc: 24050030 */ addiu $a1,$zero,0x30
|
||||
/* f138b00: 5440000a */ bnezl $v0,.L0f138b2c
|
||||
/* f138b04: 00002025 */ or $a0,$zero,$zero
|
||||
/* f138b08: 0c004b70 */ jal random
|
||||
/* f138b0c: 00000000 */ nop
|
||||
/* f138b10: 24010005 */ addiu $at,$zero,0x5
|
||||
/* f138b14: 0041001b */ divu $zero,$v0,$at
|
||||
/* f138b18: 8e2c0000 */ lw $t4,0x0($s1)
|
||||
/* f138b1c: 00005810 */ mfhi $t3
|
||||
/* f138b20: a18b41fc */ sb $t3,0x41fc($t4)
|
||||
/* f138b24: 00000000 */ nop
|
||||
/* f138b28: 00002025 */ or $a0,$zero,$zero
|
||||
.L0f138b2c:
|
||||
/* f138b2c: 0c005408 */ jal contGetButtonsPressedThisFrame
|
||||
/* f138b30: 24050010 */ addiu $a1,$zero,0x10
|
||||
/* f138b34: 10400014 */ beqz $v0,.L0f138b88
|
||||
/* f138b38: 00000000 */ nop
|
||||
/* f138b3c: 0c004b70 */ jal random
|
||||
/* f138b40: 00000000 */ nop
|
||||
/* f138b44: 24010005 */ addiu $at,$zero,0x5
|
||||
/* f138b48: 0041001b */ divu $zero,$v0,$at
|
||||
/* f138b4c: 8e2e0000 */ lw $t6,0x0($s1)
|
||||
/* f138b50: 00006810 */ mfhi $t5
|
||||
/* f138b54: a1cd41fc */ sb $t5,0x41fc($t6)
|
||||
/* f138b58: 8e2f0000 */ lw $t7,0x0($s1)
|
||||
/* f138b5c: 81f841f5 */ lb $t8,0x41f5($t7)
|
||||
/* f138b60: 07010009 */ bgez $t8,.L0f138b88
|
||||
/* f138b64: 00000000 */ nop
|
||||
/* f138b68: 0c004b70 */ jal random
|
||||
/* f138b6c: 00000000 */ nop
|
||||
/* f138b70: 8e280000 */ lw $t0,0x0($s1)
|
||||
/* f138b74: 30590003 */ andi $t9,$v0,0x3
|
||||
/* f138b78: 44802000 */ mtc1 $zero,$f4
|
||||
/* f138b7c: a11941f5 */ sb $t9,0x41f5($t0)
|
||||
/* f138b80: 8e290000 */ lw $t1,0x0($s1)
|
||||
/* f138b84: e52441f8 */ swc1 $f4,0x41f8($t1)
|
||||
.L0f138b88:
|
||||
/* f138b88: 0c004b70 */ jal random
|
||||
/* f138b8c: 00000000 */ nop
|
||||
/* f138b90: 44823000 */ mtc1 $v0,$f6
|
||||
/* f138b94: 3c014f80 */ lui $at,0x4f80
|
||||
/* f138b98: 04410004 */ bgez $v0,.L0f138bac
|
||||
/* f138b9c: 468032a0 */ cvt.s.w $f10,$f6
|
||||
/* f138ba0: 44814000 */ mtc1 $at,$f8
|
||||
/* f138ba4: 00000000 */ nop
|
||||
/* f138ba8: 46085280 */ add.s $f10,$f10,$f8
|
||||
.L0f138bac:
|
||||
/* f138bac: 461a5402 */ mul.s $f16,$f10,$f26
|
||||
/* f138bb0: 3c017f1b */ lui $at,%hi(var7f1b5818)
|
||||
/* f138bb4: c4325818 */ lwc1 $f18,%lo(var7f1b5818)($at)
|
||||
/* f138bb8: 4612803c */ c.lt.s $f16,$f18
|
||||
/* f138bbc: 00000000 */ nop
|
||||
/* f138bc0: 4502000b */ bc1fl .L0f138bf0
|
||||
/* f138bc4: 3c0141f0 */ lui $at,0x41f0
|
||||
/* f138bc8: 0c004b70 */ jal random
|
||||
/* f138bcc: 00000000 */ nop
|
||||
/* f138bd0: 8e2b0000 */ lw $t3,0x0($s1)
|
||||
/* f138bd4: 304a0001 */ andi $t2,$v0,0x1
|
||||
/* f138bd8: 0c004b70 */ jal random
|
||||
/* f138bdc: a16a41fd */ sb $t2,0x41fd($t3)
|
||||
/* f138be0: 8e2d0000 */ lw $t5,0x0($s1)
|
||||
/* f138be4: 304c0001 */ andi $t4,$v0,0x1
|
||||
/* f138be8: a1ac41fe */ sb $t4,0x41fe($t5)
|
||||
/* f138bec: 3c0141f0 */ lui $at,0x41f0
|
||||
.L0f138bf0:
|
||||
/* f138bf0: 4481c000 */ mtc1 $at,$f24
|
||||
/* f138bf4: 3c017f1b */ lui $at,%hi(var7f1b581c)
|
||||
/* f138bf8: c436581c */ lwc1 $f22,%lo(var7f1b581c)($at)
|
||||
/* f138bfc: 00009025 */ or $s2,$zero,$zero
|
||||
/* f138c00: 00008025 */ or $s0,$zero,$zero
|
||||
.L0f138c04:
|
||||
/* f138c04: 324e0007 */ andi $t6,$s2,0x7
|
||||
/* f138c08: 25cf0001 */ addiu $t7,$t6,0x1
|
||||
/* f138c0c: 448f2000 */ mtc1 $t7,$f4
|
||||
/* f138c10: 3c017f1b */ lui $at,%hi(var7f1b5820)
|
||||
/* f138c14: c4285820 */ lwc1 $f8,%lo(var7f1b5820)($at)
|
||||
/* f138c18: 468021a0 */ cvt.s.w $f6,$f4
|
||||
/* f138c1c: 8e380000 */ lw $t8,0x0($s1)
|
||||
/* f138c20: 32590008 */ andi $t9,$s2,0x8
|
||||
/* f138c24: 03101021 */ addu $v0,$t8,$s0
|
||||
/* f138c28: 46083082 */ mul.s $f2,$f6,$f8
|
||||
/* f138c2c: 17200002 */ bnez $t9,.L0f138c38
|
||||
/* f138c30: 46001006 */ mov.s $f0,$f2
|
||||
/* f138c34: 46001007 */ neg.s $f0,$f2
|
||||
.L0f138c38:
|
||||
/* f138c38: c44a0018 */ lwc1 $f10,0x18($v0)
|
||||
/* f138c3c: 3c01800a */ lui $at,%hi(g_Vars+0x5c)
|
||||
/* f138c40: 46005400 */ add.s $f16,$f10,$f0
|
||||
/* f138c44: e4500018 */ swc1 $f16,0x18($v0)
|
||||
/* f138c48: c432a008 */ lwc1 $f18,%lo(g_Vars+0x5c)($at)
|
||||
/* f138c4c: 3c013e80 */ lui $at,0x3e80
|
||||
/* f138c50: 44813000 */ mtc1 $at,$f6
|
||||
/* f138c54: 46189102 */ mul.s $f4,$f18,$f24
|
||||
/* f138c58: 8e280000 */ lw $t0,0x0($s1)
|
||||
/* f138c5c: 44808000 */ mtc1 $zero,$f16
|
||||
/* f138c60: 01101021 */ addu $v0,$t0,$s0
|
||||
/* f138c64: c4480014 */ lwc1 $f8,0x14($v0)
|
||||
/* f138c68: 46062002 */ mul.s $f0,$f4,$f6
|
||||
/* f138c6c: 46004280 */ add.s $f10,$f8,$f0
|
||||
/* f138c70: e44a0014 */ swc1 $f10,0x14($v0)
|
||||
/* f138c74: 8e290000 */ lw $t1,0x0($s1)
|
||||
/* f138c78: 01305021 */ addu $t2,$t1,$s0
|
||||
/* f138c7c: c5520014 */ lwc1 $f18,0x14($t2)
|
||||
/* f138c80: 4612803c */ c.lt.s $f16,$f18
|
||||
/* f138c84: 00000000 */ nop
|
||||
/* f138c88: 4502006b */ bc1fl .L0f138e38
|
||||
/* f138c8c: 26520001 */ addiu $s2,$s2,0x1
|
||||
/* f138c90: 0c004b70 */ jal random
|
||||
/* f138c94: 00000000 */ nop
|
||||
/* f138c98: 44822000 */ mtc1 $v0,$f4
|
||||
/* f138c9c: 3c014f80 */ lui $at,0x4f80
|
||||
/* f138ca0: 04410004 */ bgez $v0,.L0f138cb4
|
||||
/* f138ca4: 468021a0 */ cvt.s.w $f6,$f4
|
||||
/* f138ca8: 44814000 */ mtc1 $at,$f8
|
||||
/* f138cac: 00000000 */ nop
|
||||
/* f138cb0: 46083180 */ add.s $f6,$f6,$f8
|
||||
.L0f138cb4:
|
||||
/* f138cb4: 461a3502 */ mul.s $f20,$f6,$f26
|
||||
/* f138cb8: 8e2b0000 */ lw $t3,0x0($s1)
|
||||
/* f138cbc: 01706021 */ addu $t4,$t3,$s0
|
||||
/* f138cc0: 4614a280 */ add.s $f10,$f20,$f20
|
||||
/* f138cc4: 46165402 */ mul.s $f16,$f10,$f22
|
||||
/* f138cc8: 46168481 */ sub.s $f18,$f16,$f22
|
||||
/* f138ccc: 0c004b70 */ jal random
|
||||
/* f138cd0: e592000c */ swc1 $f18,0xc($t4)
|
||||
/* f138cd4: 44822000 */ mtc1 $v0,$f4
|
||||
/* f138cd8: 3c014f80 */ lui $at,0x4f80
|
||||
/* f138cdc: 04410004 */ bgez $v0,.L0f138cf0
|
||||
/* f138ce0: 46802220 */ cvt.s.w $f8,$f4
|
||||
/* f138ce4: 44813000 */ mtc1 $at,$f6
|
||||
/* f138ce8: 00000000 */ nop
|
||||
/* f138cec: 46064200 */ add.s $f8,$f8,$f6
|
||||
.L0f138cf0:
|
||||
/* f138cf0: 461a4502 */ mul.s $f20,$f8,$f26
|
||||
/* f138cf4: 8e2d0000 */ lw $t5,0x0($s1)
|
||||
/* f138cf8: 01b07021 */ addu $t6,$t5,$s0
|
||||
/* f138cfc: 4614a280 */ add.s $f10,$f20,$f20
|
||||
/* f138d00: 46165402 */ mul.s $f16,$f10,$f22
|
||||
/* f138d04: 46168481 */ sub.s $f18,$f16,$f22
|
||||
/* f138d08: 0c004b70 */ jal random
|
||||
/* f138d0c: e5d20010 */ swc1 $f18,0x10($t6)
|
||||
/* f138d10: 8e380000 */ lw $t8,0x0($s1)
|
||||
/* f138d14: 304f0003 */ andi $t7,$v0,0x3
|
||||
/* f138d18: 0310c821 */ addu $t9,$t8,$s0
|
||||
/* f138d1c: 0c004b70 */ jal random
|
||||
/* f138d20: a32f001e */ sb $t7,0x1e($t9)
|
||||
/* f138d24: 8e290000 */ lw $t1,0x0($s1)
|
||||
/* f138d28: 30480003 */ andi $t0,$v0,0x3
|
||||
/* f138d2c: 01305021 */ addu $t2,$t1,$s0
|
||||
/* f138d30: 0c004b70 */ jal random
|
||||
/* f138d34: a1480020 */ sb $t0,0x20($t2)
|
||||
/* f138d38: 44822000 */ mtc1 $v0,$f4
|
||||
/* f138d3c: 3c014f80 */ lui $at,0x4f80
|
||||
/* f138d40: 04410004 */ bgez $v0,.L0f138d54
|
||||
/* f138d44: 468021a0 */ cvt.s.w $f6,$f4
|
||||
/* f138d48: 44814000 */ mtc1 $at,$f8
|
||||
/* f138d4c: 00000000 */ nop
|
||||
/* f138d50: 46083180 */ add.s $f6,$f6,$f8
|
||||
.L0f138d54:
|
||||
/* f138d54: 461a3282 */ mul.s $f10,$f6,$f26
|
||||
/* f138d58: 3c017f1b */ lui $at,%hi(var7f1b5824)
|
||||
/* f138d5c: c4305824 */ lwc1 $f16,%lo(var7f1b5824)($at)
|
||||
/* f138d60: 8e2b0000 */ lw $t3,0x0($s1)
|
||||
/* f138d64: 01706021 */ addu $t4,$t3,$s0
|
||||
/* f138d68: 46105482 */ mul.s $f18,$f10,$f16
|
||||
/* f138d6c: e5920018 */ swc1 $f18,0x18($t4)
|
||||
/* f138d70: 8e230000 */ lw $v1,0x0($s1)
|
||||
/* f138d74: 90644200 */ lbu $a0,0x4200($v1)
|
||||
/* f138d78: 906d41ff */ lbu $t5,0x41ff($v1)
|
||||
/* f138d7c: 00704021 */ addu $t0,$v1,$s0
|
||||
/* f138d80: 008d082a */ slt $at,$a0,$t5
|
||||
/* f138d84: 50200012 */ beqzl $at,.L0f138dd0
|
||||
/* f138d88: a104001f */ sb $a0,0x1f($t0)
|
||||
/* f138d8c: 0c004b70 */ jal random
|
||||
/* f138d90: 00000000 */ nop
|
||||
/* f138d94: 8e230000 */ lw $v1,0x0($s1)
|
||||
/* f138d98: 90644200 */ lbu $a0,0x4200($v1)
|
||||
/* f138d9c: 906e41ff */ lbu $t6,0x41ff($v1)
|
||||
/* f138da0: 00704821 */ addu $t1,$v1,$s0
|
||||
/* f138da4: 01c4c023 */ subu $t8,$t6,$a0
|
||||
/* f138da8: 0058001b */ divu $zero,$v0,$t8
|
||||
/* f138dac: 00007810 */ mfhi $t7
|
||||
/* f138db0: 01e4c821 */ addu $t9,$t7,$a0
|
||||
/* f138db4: 17000002 */ bnez $t8,.L0f138dc0
|
||||
/* f138db8: 00000000 */ nop
|
||||
/* f138dbc: 0007000d */ break 0x7
|
||||
.L0f138dc0:
|
||||
/* f138dc0: a139001f */ sb $t9,0x1f($t1)
|
||||
/* f138dc4: 10000003 */ b .L0f138dd4
|
||||
/* f138dc8: 8e230000 */ lw $v1,0x0($s1)
|
||||
/* f138dcc: a104001f */ sb $a0,0x1f($t0)
|
||||
.L0f138dd0:
|
||||
/* f138dd0: 8e230000 */ lw $v1,0x0($s1)
|
||||
.L0f138dd4:
|
||||
/* f138dd4: 906a41fc */ lbu $t2,0x41fc($v1)
|
||||
/* f138dd8: 00705821 */ addu $t3,$v1,$s0
|
||||
/* f138ddc: 0c004b70 */ jal random
|
||||
/* f138de0: a16a001c */ sb $t2,0x1c($t3)
|
||||
/* f138de4: 304c0001 */ andi $t4,$v0,0x1
|
||||
/* f138de8: 24010001 */ addiu $at,$zero,0x1
|
||||
/* f138dec: 55810007 */ bnel $t4,$at,.L0f138e0c
|
||||
/* f138df0: 8e230000 */ lw $v1,0x0($s1)
|
||||
/* f138df4: 8e230000 */ lw $v1,0x0($s1)
|
||||
/* f138df8: 906d41fd */ lbu $t5,0x41fd($v1)
|
||||
/* f138dfc: 00707021 */ addu $t6,$v1,$s0
|
||||
/* f138e00: 10000005 */ b .L0f138e18
|
||||
/* f138e04: a1cd001d */ sb $t5,0x1d($t6)
|
||||
/* f138e08: 8e230000 */ lw $v1,0x0($s1)
|
||||
.L0f138e0c:
|
||||
/* f138e0c: 907841fe */ lbu $t8,0x41fe($v1)
|
||||
/* f138e10: 00707821 */ addu $t7,$v1,$s0
|
||||
/* f138e14: a1f8001d */ sb $t8,0x1d($t7)
|
||||
.L0f138e18:
|
||||
/* f138e18: 8e390000 */ lw $t9,0x0($s1)
|
||||
/* f138e1c: 3c01c5fa */ lui $at,0xc5fa
|
||||
/* f138e20: 44814000 */ mtc1 $at,$f8
|
||||
/* f138e24: 03301021 */ addu $v0,$t9,$s0
|
||||
/* f138e28: c4440014 */ lwc1 $f4,0x14($v0)
|
||||
/* f138e2c: 46082180 */ add.s $f6,$f4,$f8
|
||||
/* f138e30: e4460014 */ swc1 $f6,0x14($v0)
|
||||
/* f138e34: 26520001 */ addiu $s2,$s2,0x1
|
||||
.L0f138e38:
|
||||
/* f138e38: 240101f4 */ addiu $at,$zero,0x1f4
|
||||
/* f138e3c: 1641ff71 */ bne $s2,$at,.L0f138c04
|
||||
/* f138e40: 26100018 */ addiu $s0,$s0,0x18
|
||||
/* f138e44: 8fbf0044 */ lw $ra,0x44($sp)
|
||||
/* f138e48: d7b40018 */ ldc1 $f20,0x18($sp)
|
||||
/* f138e4c: d7b60020 */ ldc1 $f22,0x20($sp)
|
||||
/* f138e50: d7b80028 */ ldc1 $f24,0x28($sp)
|
||||
/* f138e54: d7ba0030 */ ldc1 $f26,0x30($sp)
|
||||
/* f138e58: 8fb00038 */ lw $s0,0x38($sp)
|
||||
/* f138e5c: 8fb1003c */ lw $s1,0x3c($sp)
|
||||
/* f138e60: 8fb20040 */ lw $s2,0x40($sp)
|
||||
/* f138e64: 03e00008 */ jr $ra
|
||||
/* f138e68: 27bd0048 */ addiu $sp,$sp,0x48
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel func0f13899c
|
||||
.late_rodata
|
||||
@@ -1116,6 +1463,7 @@ glabel var7f1b5824
|
||||
/* f138e64: 03e00008 */ jr $ra
|
||||
/* f138e68: 27bd0048 */ addiu $sp,$sp,0x48
|
||||
);
|
||||
#endif
|
||||
|
||||
// Mismatch: 30.0f should be loaded earlier and needs to go into a callee-save
|
||||
// register.
|
||||
@@ -2484,7 +2832,11 @@ void creditsTickSlide(void)
|
||||
f32 seconds;
|
||||
|
||||
g_CreditsData->slidelifetime = durations[credit->durationindex] + 1.0f;
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
seconds = g_Vars.diffframe240freal / 240.0f;
|
||||
#else
|
||||
seconds = g_Vars.diffframe240f / 240.0f;
|
||||
#endif
|
||||
g_CreditsData->slideage += seconds;
|
||||
|
||||
if (g_CreditsData->slideage > loadat) {
|
||||
@@ -4172,7 +4524,7 @@ void creditsTick(void)
|
||||
var800a4168 = var800a4164;
|
||||
var800a4164 += g_Vars.diffframe240;
|
||||
var800a416c += g_Vars.diffframe240;
|
||||
var800a4160 = (var800a416c % 4800) / 4800.0f;
|
||||
var800a4160 = (var800a416c % PALDOWN(4800)) / PALDOWN(4800.0f);
|
||||
|
||||
func0f13899c();
|
||||
|
||||
@@ -4182,7 +4534,7 @@ void creditsTick(void)
|
||||
creditsCreatePendingBgLayers(0xffffffff);
|
||||
}
|
||||
|
||||
if (!g_CreditsData->slidesenabled && g_CreditsData->unk4204 < 1360) {
|
||||
if (!g_CreditsData->slidesenabled && g_CreditsData->unk4204 < (PAL ? 1150 : 1360)) {
|
||||
g_CreditsData->unk4204 += g_Vars.diffframe60;
|
||||
}
|
||||
}
|
||||
@@ -4968,7 +5320,7 @@ void creditsInit(void)
|
||||
g_CreditsAltTitleRequested = false;
|
||||
|
||||
g_CreditsData->slidesenabled = false;
|
||||
g_CreditsData->unk4204 = SECSTOTIME60(19);
|
||||
g_CreditsData->unk4204 = PALDOWN(1140);
|
||||
}
|
||||
|
||||
currentPlayerConfigureVi();
|
||||
|
||||
@@ -148,11 +148,11 @@ bool explosionCreateComplex(struct prop *prop, struct coord *pos, s16 *rooms, s1
|
||||
f32 explosionGetHorizontalRangeAtFrame(struct explosion *exp, s32 frame)
|
||||
{
|
||||
struct explosiontype *type = &g_ExplosionTypes[exp->type];
|
||||
f32 changerate = FRAMESTOTIME60(type->changerateh);
|
||||
f32 changerate = PALUPF(type->changerateh);
|
||||
f32 result;
|
||||
|
||||
if (exp->type == EXPLOSIONTYPE_14 && frame > TIME60TOFRAMES(32)) {
|
||||
result = frame * FRAMESTOTIME60(3.0f) + 40.0f;
|
||||
if (exp->type == EXPLOSIONTYPE_14 && frame > PALDOWN(32)) {
|
||||
result = frame * PALUPF(3.0f) + 40.0f;
|
||||
|
||||
if (result > 300) {
|
||||
result = 300;
|
||||
@@ -167,10 +167,10 @@ f32 explosionGetHorizontalRangeAtFrame(struct explosion *exp, s32 frame)
|
||||
f32 explosionGetVerticalRangeAtFrame(struct explosion *exp, s32 frame)
|
||||
{
|
||||
struct explosiontype *type = &g_ExplosionTypes[exp->type];
|
||||
f32 changerate = FRAMESTOTIME60(type->changeratev);
|
||||
f32 changerate = PALUPF(type->changeratev);
|
||||
f32 result;
|
||||
|
||||
if (exp->type == EXPLOSIONTYPE_14 && frame > TIME60TOFRAMES(32)) {
|
||||
if (exp->type == EXPLOSIONTYPE_14 && frame > PALDOWN(32)) {
|
||||
result = 20;
|
||||
} else {
|
||||
result = type->rangev + changerate * frame;
|
||||
@@ -4483,7 +4483,7 @@ Gfx *explosionRender(struct prop *prop, Gfx *gdl, bool withalpha)
|
||||
gSPMatrix(gdl++, osVirtualToPhysical(currentPlayerGetUnk1750()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
|
||||
|
||||
#if PAL
|
||||
tmp = (g_ExplosionTypes[exp->type].flarespeed * 0.83333331346512f) * 15.0f;
|
||||
tmp = (g_ExplosionTypes[exp->type].flarespeed * 15.0f) * 0.83333331346512f;
|
||||
#else
|
||||
tmp = g_ExplosionTypes[exp->type].flarespeed * 15.0f;
|
||||
#endif
|
||||
|
||||
@@ -9,7 +9,7 @@ void func0f000000(void)
|
||||
{
|
||||
s32 i;
|
||||
|
||||
if (g_LanguageId != LANGUAGE_NTSC_EN) {
|
||||
if (g_Jpn) {
|
||||
var800aabb4 = malloc(0x2e80, MEMPOOL_PERMANENT);
|
||||
var800aabb8 = malloc(0x100, MEMPOOL_PERMANENT);
|
||||
|
||||
|
||||
@@ -32,13 +32,21 @@ u32 colourBlend(u32 a, u32 b, u32 aweight)
|
||||
|
||||
void func0f0069dc(void)
|
||||
{
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
var80061630 = var80061630 + g_Vars.diffframe240freal / 4800.0f;
|
||||
#else
|
||||
var80061630 = var80061630 + g_Vars.diffframe240f / 4800.0f;
|
||||
#endif
|
||||
|
||||
if (var80061630 > 1.0f) {
|
||||
var80061630 -= 1.0f;
|
||||
}
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
var80061634 = var80061634 + g_Vars.lvupdate240freal / 4800.0f;
|
||||
#else
|
||||
var80061634 = var80061634 + g_Vars.lvupdate240f / 4800.0f;
|
||||
#endif
|
||||
|
||||
if (var80061634 > 1.0f) {
|
||||
var80061634 -= 1.0f;
|
||||
|
||||
+142
-5
@@ -2376,6 +2376,142 @@ void setupHov(struct defaultobj *obj, struct hov *hov)
|
||||
hov->unk3c = -1;
|
||||
}
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel func0f00e980
|
||||
/* f00e980: 27bdffc8 */ addiu $sp,$sp,-56
|
||||
/* f00e984: afb5002c */ sw $s5,0x2c($sp)
|
||||
/* f00e988: afb30024 */ sw $s3,0x24($sp)
|
||||
/* f00e98c: afb20020 */ sw $s2,0x20($sp)
|
||||
/* f00e990: afb1001c */ sw $s1,0x1c($sp)
|
||||
/* f00e994: 2881005a */ slti $at,$a0,0x5a
|
||||
/* f00e998: 00e08825 */ or $s1,$a3,$zero
|
||||
/* f00e99c: 00a09025 */ or $s2,$a1,$zero
|
||||
/* f00e9a0: 00809825 */ or $s3,$a0,$zero
|
||||
/* f00e9a4: 00c0a825 */ or $s5,$a2,$zero
|
||||
/* f00e9a8: afbf0034 */ sw $ra,0x34($sp)
|
||||
/* f00e9ac: afb60030 */ sw $s6,0x30($sp)
|
||||
/* f00e9b0: afb40028 */ sw $s4,0x28($sp)
|
||||
/* f00e9b4: 10200061 */ beqz $at,.L0f00eb3c
|
||||
/* f00e9b8: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f00e9bc: 0fc59585 */ jal stageGetIndex
|
||||
/* f00e9c0: 00000000 */ nop
|
||||
/* f00e9c4: 04410002 */ bgez $v0,.L0f00e9d0
|
||||
/* f00e9c8: 00401825 */ or $v1,$v0,$zero
|
||||
/* f00e9cc: 00001825 */ or $v1,$zero,$zero
|
||||
.L0f00e9d0:
|
||||
/* f00e9d0: 000370c0 */ sll $t6,$v1,0x3
|
||||
/* f00e9d4: 01c37023 */ subu $t6,$t6,$v1
|
||||
/* f00e9d8: 000e70c0 */ sll $t6,$t6,0x3
|
||||
/* f00e9dc: 3c028008 */ lui $v0,%hi(g_Stages+0xe)
|
||||
/* f00e9e0: 004e1021 */ addu $v0,$v0,$t6
|
||||
/* f00e9e4: 9444fcce */ lhu $a0,%lo(g_Stages+0xe)($v0)
|
||||
/* f00e9e8: 240f0003 */ addiu $t7,$zero,0x3
|
||||
/* f00e9ec: 3c018006 */ lui $at,%hi(g_LoadType)
|
||||
/* f00e9f0: a02fd9a0 */ sb $t7,%lo(g_LoadType)($at)
|
||||
/* f00e9f4: 24050022 */ addiu $a1,$zero,0x22
|
||||
/* f00e9f8: 02403025 */ or $a2,$s2,$zero
|
||||
/* f00e9fc: 02a03825 */ or $a3,$s5,$zero
|
||||
/* f00ea00: 0fc59c80 */ jal func0f167200
|
||||
/* f00ea04: 00808025 */ or $s0,$a0,$zero
|
||||
/* f00ea08: 0fc59ca0 */ jal fileGetSize
|
||||
/* f00ea0c: 02002025 */ or $a0,$s0,$zero
|
||||
/* f00ea10: 02428021 */ addu $s0,$s2,$v0
|
||||
/* f00ea14: 02a2a023 */ subu $s4,$s5,$v0
|
||||
/* f00ea18: 0fc5b878 */ jal langGetLangBankIndexFromStagenum
|
||||
/* f00ea1c: 02602025 */ or $a0,$s3,$zero
|
||||
/* f00ea20: a622001a */ sh $v0,0x1a($s1)
|
||||
/* f00ea24: 3044ffff */ andi $a0,$v0,0xffff
|
||||
/* f00ea28: 02002825 */ or $a1,$s0,$zero
|
||||
/* f00ea2c: 0fc5b9d9 */ jal langSetBank
|
||||
/* f00ea30: 02803025 */ or $a2,$s4,$zero
|
||||
/* f00ea34: 8e580010 */ lw $t8,0x10($s2)
|
||||
/* f00ea38: 02589821 */ addu $s3,$s2,$t8
|
||||
/* f00ea3c: 52600040 */ beqzl $s3,.L0f00eb40
|
||||
/* f00ea40: 8fbf0034 */ lw $ra,0x34($sp)
|
||||
/* f00ea44: 0fc5b367 */ jal coreGetDifficulty
|
||||
/* f00ea48: 24160001 */ addiu $s6,$zero,0x1
|
||||
/* f00ea4c: 14400002 */ bnez $v0,.L0f00ea58
|
||||
/* f00ea50: 00000000 */ nop
|
||||
/* f00ea54: 24160003 */ addiu $s6,$zero,0x3
|
||||
.L0f00ea58:
|
||||
/* f00ea58: 0fc5b367 */ jal coreGetDifficulty
|
||||
/* f00ea5c: 00000000 */ nop
|
||||
/* f00ea60: 24010001 */ addiu $at,$zero,0x1
|
||||
/* f00ea64: 14410002 */ bne $v0,$at,.L0f00ea70
|
||||
/* f00ea68: 02201825 */ or $v1,$s1,$zero
|
||||
/* f00ea6c: 24160002 */ addiu $s6,$zero,0x2
|
||||
.L0f00ea70:
|
||||
/* f00ea70: 00001025 */ or $v0,$zero,$zero
|
||||
.L0f00ea74:
|
||||
/* f00ea74: 24420001 */ addiu $v0,$v0,0x1
|
||||
/* f00ea78: 28410006 */ slti $at,$v0,0x6
|
||||
/* f00ea7c: 24630002 */ addiu $v1,$v1,0x2
|
||||
/* f00ea80: 1420fffc */ bnez $at,.L0f00ea74
|
||||
/* f00ea84: a4600000 */ sh $zero,0x0($v1)
|
||||
/* f00ea88: 2419582a */ addiu $t9,$zero,0x5801
|
||||
/* f00ea8c: a6390000 */ sh $t9,0x0($s1)
|
||||
/* f00ea90: 92680003 */ lbu $t0,0x3($s3)
|
||||
/* f00ea94: 24120034 */ addiu $s2,$zero,0x34
|
||||
/* f00ea98: 02608025 */ or $s0,$s3,$zero
|
||||
/* f00ea9c: 12480027 */ beq $s2,$t0,.L0f00eb3c
|
||||
/* f00eaa0: 310300ff */ andi $v1,$t0,0xff
|
||||
/* f00eaa4: 24150001 */ addiu $s5,$zero,0x1
|
||||
/* f00eaa8: 24140023 */ addiu $s4,$zero,0x23
|
||||
/* f00eaac: 24130017 */ addiu $s3,$zero,0x17
|
||||
.L0f00eab0:
|
||||
/* f00eab0: 5073000f */ beql $v1,$s3,.L0f00eaf0
|
||||
/* f00eab4: 8e020004 */ lw $v0,0x4($s0)
|
||||
/* f00eab8: 14740019 */ bne $v1,$s4,.L0f00eb20
|
||||
/* f00eabc: 00000000 */ nop
|
||||
/* f00eac0: 8e020004 */ lw $v0,0x4($s0)
|
||||
/* f00eac4: 16a20004 */ bne $s5,$v0,.L0f00ead8
|
||||
/* f00eac8: 00000000 */ nop
|
||||
/* f00eacc: 8e090008 */ lw $t1,0x8($s0)
|
||||
/* f00ead0: a6290000 */ sh $t1,0x0($s1)
|
||||
/* f00ead4: 8e020004 */ lw $v0,0x4($s0)
|
||||
.L0f00ead8:
|
||||
/* f00ead8: 16c20011 */ bne $s6,$v0,.L0f00eb20
|
||||
/* f00eadc: 00000000 */ nop
|
||||
/* f00eae0: 8e0a0008 */ lw $t2,0x8($s0)
|
||||
/* f00eae4: 1000000e */ b .L0f00eb20
|
||||
/* f00eae8: a62a0000 */ sh $t2,0x0($s1)
|
||||
/* f00eaec: 8e020004 */ lw $v0,0x4($s0)
|
||||
.L0f00eaf0:
|
||||
/* f00eaf0: 2c410007 */ sltiu $at,$v0,0x7
|
||||
/* f00eaf4: 1020000a */ beqz $at,.L0f00eb20
|
||||
/* f00eaf8: 00000000 */ nop
|
||||
/* f00eafc: 8e0b0008 */ lw $t3,0x8($s0)
|
||||
/* f00eb00: 00026040 */ sll $t4,$v0,0x1
|
||||
/* f00eb04: 022c6821 */ addu $t5,$s1,$t4
|
||||
/* f00eb08: a5ab0002 */ sh $t3,0x2($t5)
|
||||
/* f00eb0c: 8e0f0004 */ lw $t7,0x4($s0)
|
||||
/* f00eb10: 820e000f */ lb $t6,0xf($s0)
|
||||
/* f00eb14: 000fc040 */ sll $t8,$t7,0x1
|
||||
/* f00eb18: 0238c821 */ addu $t9,$s1,$t8
|
||||
/* f00eb1c: a72e000e */ sh $t6,0xe($t9)
|
||||
.L0f00eb20:
|
||||
/* f00eb20: 0fc24784 */ jal setupGetCommandLength
|
||||
/* f00eb24: 02002025 */ or $a0,$s0,$zero
|
||||
/* f00eb28: 00024080 */ sll $t0,$v0,0x2
|
||||
/* f00eb2c: 01108021 */ addu $s0,$t0,$s0
|
||||
/* f00eb30: 92030003 */ lbu $v1,0x3($s0)
|
||||
/* f00eb34: 1643ffde */ bne $s2,$v1,.L0f00eab0
|
||||
/* f00eb38: 00000000 */ nop
|
||||
.L0f00eb3c:
|
||||
/* f00eb3c: 8fbf0034 */ lw $ra,0x34($sp)
|
||||
.L0f00eb40:
|
||||
/* f00eb40: 8fb00018 */ lw $s0,0x18($sp)
|
||||
/* f00eb44: 8fb1001c */ lw $s1,0x1c($sp)
|
||||
/* f00eb48: 8fb20020 */ lw $s2,0x20($sp)
|
||||
/* f00eb4c: 8fb30024 */ lw $s3,0x24($sp)
|
||||
/* f00eb50: 8fb40028 */ lw $s4,0x28($sp)
|
||||
/* f00eb54: 8fb5002c */ lw $s5,0x2c($sp)
|
||||
/* f00eb58: 8fb60030 */ lw $s6,0x30($sp)
|
||||
/* f00eb5c: 03e00008 */ jr $ra
|
||||
/* f00eb60: 27bd0038 */ addiu $sp,$sp,0x38
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel func0f00e980
|
||||
/* f00e980: 27bdffc8 */ addiu $sp,$sp,-56
|
||||
@@ -2510,6 +2646,7 @@ glabel func0f00e980
|
||||
/* f00eb5c: 03e00008 */ jr $ra
|
||||
/* f00eb60: 27bd0038 */ addiu $sp,$sp,0x38
|
||||
);
|
||||
#endif
|
||||
|
||||
void setupLoadFiles(s32 stagenum)
|
||||
{
|
||||
@@ -2825,7 +2962,7 @@ void setupParseObjects(s32 stagenum)
|
||||
break;
|
||||
case OBJTYPE_SHIELD:
|
||||
if (withobjs) {
|
||||
if ((obj->flags2 & diffflag) == 0 || g_LanguageId != LANGUAGE_NTSC_EN) {
|
||||
if ((obj->flags2 & diffflag) == 0 || g_Jpn) {
|
||||
struct shieldobj *shield = (struct shieldobj *)obj;
|
||||
shield->initialamount = *(s32 *)&shield->initialamount / 65536.0f;
|
||||
shield->amount = shield->initialamount;
|
||||
@@ -2852,8 +2989,8 @@ void setupParseObjects(s32 stagenum)
|
||||
struct prop *prop;
|
||||
s32 i;
|
||||
|
||||
lift->accel = FRAMESTOTIME60(*(s32 *)&lift->accel) / 65536.0f;
|
||||
lift->maxspeed = FRAMESTOTIME60(*(s32 *)&lift->maxspeed) / 65536.0f;
|
||||
lift->accel = PALUPF(*(s32 *)&lift->accel) / 65536.0f;
|
||||
lift->maxspeed = PALUPF(*(s32 *)&lift->maxspeed) / 65536.0f;
|
||||
lift->dist = 0;
|
||||
lift->speed = 0;
|
||||
lift->levelcur = 0;
|
||||
@@ -2939,8 +3076,8 @@ void setupParseObjects(s32 stagenum)
|
||||
struct fanobj *fan = (struct fanobj *)obj;
|
||||
|
||||
fan->yrot = 0;
|
||||
fan->ymaxspeed = FRAMESTOTIME60(*(s32 *)&fan->ymaxspeed) / 65536.0f;
|
||||
fan->yaccel = FRAMESTOTIME60(*(s32 *)&fan->yaccel) / 65536.0f;
|
||||
fan->ymaxspeed = PALUPF(*(s32 *)&fan->ymaxspeed) / 65536.0f;
|
||||
fan->yaccel = PALUPF(*(s32 *)&fan->yaccel) / 65536.0f;
|
||||
|
||||
setupGenericObject(obj, index);
|
||||
}
|
||||
|
||||
@@ -722,7 +722,7 @@ Gfx *getitleRender(Gfx *gdl)
|
||||
sp30 = 0;
|
||||
}
|
||||
|
||||
sp2c = 255 - (var80062498 * 255 - 163200) / (PAL ? 233 : 280);
|
||||
sp2c = 255 - (var80062498 * 255 - (PAL ? 135915 : 163200)) / (PAL ? 233 : 280);
|
||||
|
||||
if (sp2c > 255) {
|
||||
sp2c = 255;
|
||||
@@ -742,7 +742,7 @@ Gfx *getitleRender(Gfx *gdl)
|
||||
|
||||
gdl = func0f0155f0(gdl, var8009cc8c, (sp30 * sp2c) / 255);
|
||||
|
||||
if (var80062498 >= 1040 && var80062498 >= 1160) {
|
||||
if (var80062498 >= PALDOWN(1040) && var80062498 >= PALDOWN(1160)) {
|
||||
var80062498 = 0;
|
||||
var80062414++;
|
||||
var80062414++;
|
||||
|
||||
@@ -64,7 +64,7 @@ void func0f01d860(void)
|
||||
{
|
||||
s32 i;
|
||||
|
||||
if (g_LanguageId != LANGUAGE_NTSC_EN) {
|
||||
if (g_Jpn) {
|
||||
for (i = 0; i != 124; i++) {
|
||||
if (var800aabb8[i].unk00_00) {
|
||||
var800aabb8[i].unk00_00--;
|
||||
|
||||
@@ -2751,7 +2751,7 @@ void audioPlayFromProp2(s32 channelnum, s32 soundnum, s16 padnum, struct prop *p
|
||||
}
|
||||
|
||||
if (a1) {
|
||||
channel->unk1c = TIME60TOFRAMES(arg4);
|
||||
channel->unk1c = PALDOWN(arg4);
|
||||
}
|
||||
|
||||
if (padnum != -1) {
|
||||
|
||||
+6185
-48
File diff suppressed because it is too large
Load Diff
@@ -41,10 +41,9 @@ const u32 var7f1acc64[] = {0x461c4000};
|
||||
const u32 var7f1acc68[] = {0xc61c4000};
|
||||
const u32 var7f1acc6c[] = {0x3fb50481};
|
||||
|
||||
struct fireslot g_Fireslots[NUM_FIRESLOTS];
|
||||
struct casing g_Casings[20];
|
||||
struct var8009da60 var8009da60[8];
|
||||
struct lasersight g_LaserSights[4];
|
||||
struct casing g_Casings[20]; // da80 (correct)
|
||||
struct var8009da60 var8009da60[8]; // dfd0 (correct)
|
||||
struct lasersight g_LaserSights[4]; // correct
|
||||
|
||||
u32 var80070500 = 0x00000000;
|
||||
u32 var80070504 = 0x00000000;
|
||||
@@ -4265,7 +4264,11 @@ void func0f0aefb8(void)
|
||||
(var8009da60[i].unk20.f[1] - var8009da60[i].unk14.f[1]) * (var8009da60[i].unk20.f[1] - var8009da60[i].unk14.f[1]) +
|
||||
(var8009da60[i].unk20.f[2] - var8009da60[i].unk14.f[2]) * (var8009da60[i].unk20.f[2] - var8009da60[i].unk14.f[2]));
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
value -= var8009da60[i].unk2c * g_Vars.lvupdate240freal / 60.0f;
|
||||
#else
|
||||
value -= var8009da60[i].unk2c * g_Vars.lvupdate240f / 60.0f;
|
||||
#endif
|
||||
|
||||
if (value < 0) {
|
||||
var8009da60[i].unk00 = -1;
|
||||
|
||||
+14
-2
@@ -220,7 +220,11 @@ void currentPlayerZoomOut(f32 fovpersec)
|
||||
}
|
||||
|
||||
if (index >= 0) {
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
f32 amount = fovpersec * 0.25f * g_Vars.lvupdate240freal;
|
||||
#else
|
||||
f32 amount = fovpersec * 0.25f * g_Vars.lvupdate240f;
|
||||
#endif
|
||||
|
||||
if (getCurrentPlayerWeaponIdWrapper(0) == WEAPON_FARSIGHTXR20) {
|
||||
amount *= 0.5f;
|
||||
@@ -245,7 +249,11 @@ void currentPlayerZoomIn(f32 fovpersec)
|
||||
}
|
||||
|
||||
if (index >= 0) {
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
f32 amount = fovpersec * 0.25f * g_Vars.lvupdate240freal;
|
||||
#else
|
||||
f32 amount = fovpersec * 0.25f * g_Vars.lvupdate240f;
|
||||
#endif
|
||||
|
||||
if (getCurrentPlayerWeaponIdWrapper(0) == WEAPON_FARSIGHTXR20) {
|
||||
amount *= 0.5f;
|
||||
@@ -569,7 +577,11 @@ f32 handGetDamage(struct shorthand *hand)
|
||||
damage = fullfunc->damage;
|
||||
|
||||
if (hand->weaponnum == WEAPON_REAPER) {
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
damage *= g_Vars.lvupdate240freal;
|
||||
#else
|
||||
damage *= g_Vars.lvupdate240f;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -602,7 +614,7 @@ u8 handGetSingleUnk38(struct shorthand *hand)
|
||||
}
|
||||
|
||||
if (result >= 4) {
|
||||
result = TIME60TOFRAMES(result);
|
||||
result = PALDOWN(result);
|
||||
}
|
||||
|
||||
return result;
|
||||
@@ -655,7 +667,7 @@ s8 weaponGetMaxFireRatePerTick(u32 weaponnum, u32 funcindex)
|
||||
}
|
||||
|
||||
if (result > 3) {
|
||||
result = TIME60TOFRAMES(result);
|
||||
result = PALDOWN(result);
|
||||
}
|
||||
|
||||
return result;
|
||||
|
||||
+15
-15
@@ -91,17 +91,17 @@ f32 var8009de00;
|
||||
u32 var8009de04;
|
||||
u32 var8009de08;
|
||||
u32 var8009de0c;
|
||||
s32 g_CameraAnimCurFrame; // e380 (good)
|
||||
s32 g_CameraAnimCurFrame;
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
f32 var8009de14; // e384
|
||||
f32 var8009e388pf; // e388
|
||||
f32 var8009de14;
|
||||
f32 var8009e388pf;
|
||||
#else
|
||||
s32 var8009de14;
|
||||
#endif
|
||||
|
||||
s16 g_CameraAnimNum; // e388 -> e38c
|
||||
f32 g_CutsceneBlurFrac; // e38c -> e390
|
||||
s16 g_CameraAnimNum;
|
||||
f32 g_CutsceneBlurFrac;
|
||||
|
||||
#if VERSION < VERSION_PAL_FINAL
|
||||
s32 var8009de20;
|
||||
@@ -109,7 +109,7 @@ s32 var8009de20;
|
||||
|
||||
s32 var8009de24;
|
||||
f32 var8009de28;
|
||||
s32 var8009de2c; // e3a0 -> e39c
|
||||
s32 var8009de2c;
|
||||
f32 var8009de30;
|
||||
u32 var8009de34;
|
||||
s16 g_SpawnPoints[MAX_SPAWNPOINTS];
|
||||
@@ -1283,8 +1283,8 @@ bool currentPlayerAssumeChrForAnti(struct chrdata *hostchr, bool force)
|
||||
currentPlayerEquipWeaponWrapper(HAND_RIGHT, WEAPON_UNARMED);
|
||||
}
|
||||
|
||||
g_Vars.currentplayer->invdowntime = -40;
|
||||
g_Vars.currentplayer->usedowntime = -40;
|
||||
g_Vars.currentplayer->invdowntime = PALDOWN(-40);
|
||||
g_Vars.currentplayer->usedowntime = PALDOWN(-40);
|
||||
|
||||
currentPlayerGiveUnlimitedAmmo(true);
|
||||
|
||||
@@ -3950,7 +3950,7 @@ Gfx *func0f0baf84(Gfx *gdl)
|
||||
u16 b;
|
||||
|
||||
guPerspective(a, &b, g_Vars.currentplayer->zoominfovy,
|
||||
1.4545454978943f, 10, 300, 1);
|
||||
PAL ? 1.7316017150879f : 1.4545454978943f, 10, 300, 1);
|
||||
|
||||
gSPMatrix(gdl++, 0x80000000 + (u32)a, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
|
||||
gSPPerspNormalize(gdl++, b);
|
||||
@@ -4679,7 +4679,7 @@ void currentPlayerTickExplode(void)
|
||||
|
||||
explosionCreateSimple(NULL, &pos, g_Vars.currentplayer->prop->rooms, EXPLOSIONTYPE_18, g_Vars.currentplayernum);
|
||||
|
||||
g_Vars.currentplayer->bondnextexplode = g_Vars.lvframe60 + 15 + (random() % 15);
|
||||
g_Vars.currentplayer->bondnextexplode = g_Vars.lvframe60 + PALDOWN(15) + (random() % PALDOWN(15));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12192,7 +12192,7 @@ Gfx *func0f0c07c8(Gfx *gdl)
|
||||
|
||||
if (g_MpSetupSaveFile.locktype == MPLOCKTYPE_CHALLENGE) {
|
||||
if (g_Vars.currentplayer->deadtimer < 0) {
|
||||
g_Vars.currentplayer->deadtimer = 600;
|
||||
g_Vars.currentplayer->deadtimer = PALDOWN(600);
|
||||
}
|
||||
|
||||
if (g_Vars.currentplayer->deadtimer >= 0) {
|
||||
@@ -12237,21 +12237,21 @@ Gfx *func0f0c07c8(Gfx *gdl)
|
||||
gdl = func0f15b114(gdl);
|
||||
|
||||
if (g_Vars.currentplayer->eyespy) {
|
||||
if (g_Vars.currentplayer->eyespy->startuptimer60 < 50) {
|
||||
if (g_Vars.currentplayer->eyespy->startuptimer60 < PALDOWN(50)) {
|
||||
gdl = bviewRenderFisheye(gdl, -1, 255, 0, g_Vars.currentplayer->eyespy->startuptimer60, g_Vars.currentplayer->eyespy->hit);
|
||||
} else {
|
||||
s32 time = g_Vars.currentplayer->eyespy->camerashuttertime;
|
||||
|
||||
if (time > 0) {
|
||||
if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) {
|
||||
gdl = bviewRenderFisheye(gdl, -1, 255, time, 50, g_Vars.currentplayer->eyespy->hit);
|
||||
gdl = bviewRenderFisheye(gdl, -1, 255, time, PALDOWN(50), g_Vars.currentplayer->eyespy->hit);
|
||||
} else {
|
||||
gdl = bviewRenderFisheye(gdl, -1, 255, 0, 50, g_Vars.currentplayer->eyespy->hit);
|
||||
gdl = bviewRenderFisheye(gdl, -1, 255, 0, PALDOWN(50), g_Vars.currentplayer->eyespy->hit);
|
||||
}
|
||||
|
||||
g_Vars.currentplayer->eyespy->camerashuttertime -= g_Vars.lvupdate240_60;
|
||||
} else {
|
||||
gdl = bviewRenderFisheye(gdl, -1, 255, 0, 50, g_Vars.currentplayer->eyespy->hit);
|
||||
gdl = bviewRenderFisheye(gdl, -1, 255, 0, PALDOWN(50), g_Vars.currentplayer->eyespy->hit);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5147,6 +5147,874 @@ u32 func0f0e4fe0(void)
|
||||
return align16(0xd20);
|
||||
}
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel func0f0e5000
|
||||
/* f0e5000: 27bdfeb0 */ addiu $sp,$sp,-336
|
||||
/* f0e5004: 3c0140a0 */ lui $at,0x40a0
|
||||
/* f0e5008: 3c0e8008 */ lui $t6,%hi(g_StageIndex)
|
||||
/* f0e500c: 44812000 */ mtc1 $at,$f4
|
||||
/* f0e5010: 8dcefc00 */ lw $t6,%lo(g_StageIndex)($t6)
|
||||
/* f0e5014: 24010019 */ addiu $at,$zero,0x19
|
||||
/* f0e5018: afbf0064 */ sw $ra,0x64($sp)
|
||||
/* f0e501c: afb30060 */ sw $s3,0x60($sp)
|
||||
/* f0e5020: afb2005c */ sw $s2,0x5c($sp)
|
||||
/* f0e5024: afb10058 */ sw $s1,0x58($sp)
|
||||
/* f0e5028: afb00054 */ sw $s0,0x54($sp)
|
||||
/* f0e502c: f7be0048 */ sdc1 $f30,0x48($sp)
|
||||
/* f0e5030: f7bc0040 */ sdc1 $f28,0x40($sp)
|
||||
/* f0e5034: f7ba0038 */ sdc1 $f26,0x38($sp)
|
||||
/* f0e5038: f7b80030 */ sdc1 $f24,0x30($sp)
|
||||
/* f0e503c: f7b60028 */ sdc1 $f22,0x28($sp)
|
||||
/* f0e5040: f7b40020 */ sdc1 $f20,0x20($sp)
|
||||
/* f0e5044: afa40150 */ sw $a0,0x150($sp)
|
||||
/* f0e5048: afa000f0 */ sw $zero,0xf0($sp)
|
||||
/* f0e504c: 15c10006 */ bne $t6,$at,.L0f0e5068
|
||||
/* f0e5050: e7a400f4 */ swc1 $f4,0xf4($sp)
|
||||
/* f0e5054: 3c014000 */ lui $at,0x4000
|
||||
/* f0e5058: 44813000 */ mtc1 $at,$f6
|
||||
/* f0e505c: 240f0001 */ addiu $t7,$zero,0x1
|
||||
/* f0e5060: afaf00f0 */ sw $t7,0xf0($sp)
|
||||
/* f0e5064: e7a600f4 */ swc1 $f6,0xf4($sp)
|
||||
.L0f0e5068:
|
||||
/* f0e5068: 3c118007 */ lui $s1,%hi(var80071184)
|
||||
/* f0e506c: 26311184 */ addiu $s1,$s1,%lo(var80071184)
|
||||
/* f0e5070: 8e380000 */ lw $t8,0x0($s1)
|
||||
/* f0e5074: 5700005d */ bnezl $t8,.L0f0e51ec
|
||||
/* f0e5078: 3c012f80 */ lui $at,0x2f80
|
||||
/* f0e507c: 0fc2777b */ jal func0f09ddec
|
||||
/* f0e5080: 00000000 */ nop
|
||||
/* f0e5084: 14400003 */ bnez $v0,.L0f0e5094
|
||||
/* f0e5088: ae220000 */ sw $v0,0x0($s1)
|
||||
/* f0e508c: 10000304 */ b .L0f0e5ca0
|
||||
/* f0e5090: 8fa20150 */ lw $v0,0x150($sp)
|
||||
.L0f0e5094:
|
||||
/* f0e5094: 3c0143f0 */ lui $at,0x43f0
|
||||
/* f0e5098: 4481f000 */ mtc1 $at,$f30
|
||||
/* f0e509c: 3c01c420 */ lui $at,0xc420
|
||||
/* f0e50a0: 4481e000 */ mtc1 $at,$f28
|
||||
/* f0e50a4: 3c014420 */ lui $at,0x4420
|
||||
/* f0e50a8: 4481d000 */ mtc1 $at,$f26
|
||||
/* f0e50ac: 3c017f1b */ lui $at,%hi(var7f1adf74)
|
||||
/* f0e50b0: c438df74 */ lwc1 $f24,%lo(var7f1adf74)($at)
|
||||
/* f0e50b4: 3c017f1b */ lui $at,%hi(var7f1adf78)
|
||||
/* f0e50b8: c436df78 */ lwc1 $f22,%lo(var7f1adf78)($at)
|
||||
/* f0e50bc: 3c012f80 */ lui $at,0x2f80
|
||||
/* f0e50c0: 4481a000 */ mtc1 $at,$f20
|
||||
/* f0e50c4: 00008025 */ or $s0,$zero,$zero
|
||||
/* f0e50c8: 24120d20 */ addiu $s2,$zero,0xd20
|
||||
.L0f0e50cc:
|
||||
/* f0e50cc: 0c004b70 */ jal random
|
||||
/* f0e50d0: 00000000 */ nop
|
||||
/* f0e50d4: 44824000 */ mtc1 $v0,$f8
|
||||
/* f0e50d8: 3c014f80 */ lui $at,0x4f80
|
||||
/* f0e50dc: 04410004 */ bgez $v0,.L0f0e50f0
|
||||
/* f0e50e0: 468042a0 */ cvt.s.w $f10,$f8
|
||||
/* f0e50e4: 44818000 */ mtc1 $at,$f16
|
||||
/* f0e50e8: 00000000 */ nop
|
||||
/* f0e50ec: 46105280 */ add.s $f10,$f10,$f16
|
||||
.L0f0e50f0:
|
||||
/* f0e50f0: 46145482 */ mul.s $f18,$f10,$f20
|
||||
/* f0e50f4: 8e290000 */ lw $t1,0x0($s1)
|
||||
/* f0e50f8: 01305021 */ addu $t2,$t1,$s0
|
||||
/* f0e50fc: 46169102 */ mul.s $f4,$f18,$f22
|
||||
/* f0e5100: 46182181 */ sub.s $f6,$f4,$f24
|
||||
/* f0e5104: 0c004b70 */ jal random
|
||||
/* f0e5108: e5460000 */ swc1 $f6,0x0($t2)
|
||||
/* f0e510c: 44824000 */ mtc1 $v0,$f8
|
||||
/* f0e5110: 3c014f80 */ lui $at,0x4f80
|
||||
/* f0e5114: 04410004 */ bgez $v0,.L0f0e5128
|
||||
/* f0e5118: 46804420 */ cvt.s.w $f16,$f8
|
||||
/* f0e511c: 44815000 */ mtc1 $at,$f10
|
||||
/* f0e5120: 00000000 */ nop
|
||||
/* f0e5124: 460a8400 */ add.s $f16,$f16,$f10
|
||||
.L0f0e5128:
|
||||
/* f0e5128: 46148482 */ mul.s $f18,$f16,$f20
|
||||
/* f0e512c: 8e2b0000 */ lw $t3,0x0($s1)
|
||||
/* f0e5130: 3c01c3f0 */ lui $at,0xc3f0
|
||||
/* f0e5134: 01706021 */ addu $t4,$t3,$s0
|
||||
/* f0e5138: 46169102 */ mul.s $f4,$f18,$f22
|
||||
/* f0e513c: 46182181 */ sub.s $f6,$f4,$f24
|
||||
/* f0e5140: e5860004 */ swc1 $f6,0x4($t4)
|
||||
/* f0e5144: 8e2d0000 */ lw $t5,0x0($s1)
|
||||
/* f0e5148: 01b01821 */ addu $v1,$t5,$s0
|
||||
/* f0e514c: c4600000 */ lwc1 $f0,0x0($v1)
|
||||
/* f0e5150: 461a003c */ c.lt.s $f0,$f26
|
||||
/* f0e5154: 00000000 */ nop
|
||||
/* f0e5158: 45000010 */ bc1f .L0f0e519c
|
||||
/* f0e515c: 00000000 */ nop
|
||||
/* f0e5160: 4600e03c */ c.lt.s $f28,$f0
|
||||
/* f0e5164: 00000000 */ nop
|
||||
/* f0e5168: 4500000c */ bc1f .L0f0e519c
|
||||
/* f0e516c: 00000000 */ nop
|
||||
/* f0e5170: c4600004 */ lwc1 $f0,0x4($v1)
|
||||
/* f0e5174: 461e003c */ c.lt.s $f0,$f30
|
||||
/* f0e5178: 00000000 */ nop
|
||||
/* f0e517c: 45000007 */ bc1f .L0f0e519c
|
||||
/* f0e5180: 00000000 */ nop
|
||||
/* f0e5184: 44814000 */ mtc1 $at,$f8
|
||||
/* f0e5188: 00000000 */ nop
|
||||
/* f0e518c: 4600403c */ c.lt.s $f8,$f0
|
||||
/* f0e5190: 00000000 */ nop
|
||||
/* f0e5194: 4501ffcd */ bc1t .L0f0e50cc
|
||||
/* f0e5198: 00000000 */ nop
|
||||
.L0f0e519c:
|
||||
/* f0e519c: 0c004b70 */ jal random
|
||||
/* f0e51a0: 00000000 */ nop
|
||||
/* f0e51a4: 44825000 */ mtc1 $v0,$f10
|
||||
/* f0e51a8: 3c014f80 */ lui $at,0x4f80
|
||||
/* f0e51ac: 04410004 */ bgez $v0,.L0f0e51c0
|
||||
/* f0e51b0: 46805420 */ cvt.s.w $f16,$f10
|
||||
/* f0e51b4: 44819000 */ mtc1 $at,$f18
|
||||
/* f0e51b8: 00000000 */ nop
|
||||
/* f0e51bc: 46128400 */ add.s $f16,$f16,$f18
|
||||
.L0f0e51c0:
|
||||
/* f0e51c0: 46148102 */ mul.s $f4,$f16,$f20
|
||||
/* f0e51c4: 3c0145fa */ lui $at,0x45fa
|
||||
/* f0e51c8: 44814000 */ mtc1 $at,$f8
|
||||
/* f0e51cc: 8e2e0000 */ lw $t6,0x0($s1)
|
||||
/* f0e51d0: 01d07821 */ addu $t7,$t6,$s0
|
||||
/* f0e51d4: 46002187 */ neg.s $f6,$f4
|
||||
/* f0e51d8: 2610000c */ addiu $s0,$s0,0xc
|
||||
/* f0e51dc: 46083282 */ mul.s $f10,$f6,$f8
|
||||
/* f0e51e0: 1612ffba */ bne $s0,$s2,.L0f0e50cc
|
||||
/* f0e51e4: e5ea0008 */ swc1 $f10,0x8($t7)
|
||||
/* f0e51e8: 3c012f80 */ lui $at,0x2f80
|
||||
.L0f0e51ec:
|
||||
/* f0e51ec: 4481a000 */ mtc1 $at,$f20
|
||||
/* f0e51f0: 3c017f1b */ lui $at,%hi(var7f1adf7c)
|
||||
/* f0e51f4: c436df7c */ lwc1 $f22,%lo(var7f1adf7c)($at)
|
||||
/* f0e51f8: 3c017f1b */ lui $at,%hi(var7f1adf80)
|
||||
/* f0e51fc: c438df80 */ lwc1 $f24,%lo(var7f1adf80)($at)
|
||||
/* f0e5200: 3c014420 */ lui $at,0x4420
|
||||
/* f0e5204: 4481d000 */ mtc1 $at,$f26
|
||||
/* f0e5208: 3c01c420 */ lui $at,0xc420
|
||||
/* f0e520c: 4481e000 */ mtc1 $at,$f28
|
||||
/* f0e5210: 3c0143f0 */ lui $at,0x43f0
|
||||
/* f0e5214: 4481f000 */ mtc1 $at,$f30
|
||||
/* f0e5218: 00009025 */ or $s2,$zero,$zero
|
||||
/* f0e521c: 00008025 */ or $s0,$zero,$zero
|
||||
/* f0e5220: 24130005 */ addiu $s3,$zero,0x5
|
||||
.L0f0e5224:
|
||||
/* f0e5224: 0253001a */ div $zero,$s2,$s3
|
||||
/* f0e5228: 0000c810 */ mfhi $t9
|
||||
/* f0e522c: 27290001 */ addiu $t1,$t9,0x1
|
||||
/* f0e5230: 44899000 */ mtc1 $t1,$f18
|
||||
/* f0e5234: c7a800f4 */ lwc1 $f8,0xf4($sp)
|
||||
/* f0e5238: 8e380000 */ lw $t8,0x0($s1)
|
||||
/* f0e523c: 46809420 */ cvt.s.w $f16,$f18
|
||||
/* f0e5240: 03101821 */ addu $v1,$t8,$s0
|
||||
/* f0e5244: 16600002 */ bnez $s3,.L0f0e5250
|
||||
/* f0e5248: 00000000 */ nop
|
||||
/* f0e524c: 0007000d */ break 0x7
|
||||
.L0f0e5250:
|
||||
/* f0e5250: 2401ffff */ addiu $at,$zero,-1
|
||||
/* f0e5254: 16610004 */ bne $s3,$at,.L0f0e5268
|
||||
/* f0e5258: 3c018000 */ lui $at,0x8000
|
||||
/* f0e525c: 16410002 */ bne $s2,$at,.L0f0e5268
|
||||
/* f0e5260: 00000000 */ nop
|
||||
/* f0e5264: 0006000d */ break 0x6
|
||||
.L0f0e5268:
|
||||
/* f0e5268: 3c01800a */ lui $at,%hi(g_Vars+0x5c)
|
||||
/* f0e526c: c424a008 */ lwc1 $f4,%lo(g_Vars+0x5c)($at)
|
||||
/* f0e5270: c4720008 */ lwc1 $f18,0x8($v1)
|
||||
/* f0e5274: 46048182 */ mul.s $f6,$f16,$f4
|
||||
/* f0e5278: 44802000 */ mtc1 $zero,$f4
|
||||
/* f0e527c: 46083282 */ mul.s $f10,$f6,$f8
|
||||
/* f0e5280: 460a9400 */ add.s $f16,$f18,$f10
|
||||
/* f0e5284: e4700008 */ swc1 $f16,0x8($v1)
|
||||
/* f0e5288: 8e2a0000 */ lw $t2,0x0($s1)
|
||||
/* f0e528c: 01505821 */ addu $t3,$t2,$s0
|
||||
/* f0e5290: c5660008 */ lwc1 $f6,0x8($t3)
|
||||
/* f0e5294: 4606203c */ c.lt.s $f4,$f6
|
||||
/* f0e5298: 00000000 */ nop
|
||||
/* f0e529c: 45020049 */ bc1fl .L0f0e53c4
|
||||
/* f0e52a0: 26520001 */ addiu $s2,$s2,0x1
|
||||
.L0f0e52a4:
|
||||
/* f0e52a4: 0c004b70 */ jal random
|
||||
/* f0e52a8: 00000000 */ nop
|
||||
/* f0e52ac: 44824000 */ mtc1 $v0,$f8
|
||||
/* f0e52b0: 3c014f80 */ lui $at,0x4f80
|
||||
/* f0e52b4: 04410004 */ bgez $v0,.L0f0e52c8
|
||||
/* f0e52b8: 468044a0 */ cvt.s.w $f18,$f8
|
||||
/* f0e52bc: 44815000 */ mtc1 $at,$f10
|
||||
/* f0e52c0: 00000000 */ nop
|
||||
/* f0e52c4: 460a9480 */ add.s $f18,$f18,$f10
|
||||
.L0f0e52c8:
|
||||
/* f0e52c8: 46149402 */ mul.s $f16,$f18,$f20
|
||||
/* f0e52cc: 8e2c0000 */ lw $t4,0x0($s1)
|
||||
/* f0e52d0: 01906821 */ addu $t5,$t4,$s0
|
||||
/* f0e52d4: 46168102 */ mul.s $f4,$f16,$f22
|
||||
/* f0e52d8: 46182181 */ sub.s $f6,$f4,$f24
|
||||
/* f0e52dc: 0c004b70 */ jal random
|
||||
/* f0e52e0: e5a60000 */ swc1 $f6,0x0($t5)
|
||||
/* f0e52e4: 44824000 */ mtc1 $v0,$f8
|
||||
/* f0e52e8: 3c014f80 */ lui $at,0x4f80
|
||||
/* f0e52ec: 04410004 */ bgez $v0,.L0f0e5300
|
||||
/* f0e52f0: 468042a0 */ cvt.s.w $f10,$f8
|
||||
/* f0e52f4: 44819000 */ mtc1 $at,$f18
|
||||
/* f0e52f8: 00000000 */ nop
|
||||
/* f0e52fc: 46125280 */ add.s $f10,$f10,$f18
|
||||
.L0f0e5300:
|
||||
/* f0e5300: 46145402 */ mul.s $f16,$f10,$f20
|
||||
/* f0e5304: 8e2e0000 */ lw $t6,0x0($s1)
|
||||
/* f0e5308: 3c01c3f0 */ lui $at,0xc3f0
|
||||
/* f0e530c: 01d07821 */ addu $t7,$t6,$s0
|
||||
/* f0e5310: 46168102 */ mul.s $f4,$f16,$f22
|
||||
/* f0e5314: 46182181 */ sub.s $f6,$f4,$f24
|
||||
/* f0e5318: e5e60004 */ swc1 $f6,0x4($t7)
|
||||
/* f0e531c: 8e380000 */ lw $t8,0x0($s1)
|
||||
/* f0e5320: 03101821 */ addu $v1,$t8,$s0
|
||||
/* f0e5324: c4600000 */ lwc1 $f0,0x0($v1)
|
||||
/* f0e5328: 461a003c */ c.lt.s $f0,$f26
|
||||
/* f0e532c: 00000000 */ nop
|
||||
/* f0e5330: 45000010 */ bc1f .L0f0e5374
|
||||
/* f0e5334: 00000000 */ nop
|
||||
/* f0e5338: 4600e03c */ c.lt.s $f28,$f0
|
||||
/* f0e533c: 00000000 */ nop
|
||||
/* f0e5340: 4500000c */ bc1f .L0f0e5374
|
||||
/* f0e5344: 00000000 */ nop
|
||||
/* f0e5348: c4600004 */ lwc1 $f0,0x4($v1)
|
||||
/* f0e534c: 461e003c */ c.lt.s $f0,$f30
|
||||
/* f0e5350: 00000000 */ nop
|
||||
/* f0e5354: 45000007 */ bc1f .L0f0e5374
|
||||
/* f0e5358: 00000000 */ nop
|
||||
/* f0e535c: 44814000 */ mtc1 $at,$f8
|
||||
/* f0e5360: 00000000 */ nop
|
||||
/* f0e5364: 4600403c */ c.lt.s $f8,$f0
|
||||
/* f0e5368: 00000000 */ nop
|
||||
/* f0e536c: 4501ffcd */ bc1t .L0f0e52a4
|
||||
/* f0e5370: 00000000 */ nop
|
||||
.L0f0e5374:
|
||||
/* f0e5374: 0c004b70 */ jal random
|
||||
/* f0e5378: 00000000 */ nop
|
||||
/* f0e537c: 44829000 */ mtc1 $v0,$f18
|
||||
/* f0e5380: 3c014f80 */ lui $at,0x4f80
|
||||
/* f0e5384: 04410004 */ bgez $v0,.L0f0e5398
|
||||
/* f0e5388: 468092a0 */ cvt.s.w $f10,$f18
|
||||
/* f0e538c: 44818000 */ mtc1 $at,$f16
|
||||
/* f0e5390: 00000000 */ nop
|
||||
/* f0e5394: 46105280 */ add.s $f10,$f10,$f16
|
||||
.L0f0e5398:
|
||||
/* f0e5398: 46145102 */ mul.s $f4,$f10,$f20
|
||||
/* f0e539c: 3c0143fa */ lui $at,0x43fa
|
||||
/* f0e53a0: 44813000 */ mtc1 $at,$f6
|
||||
/* f0e53a4: 3c01c5fa */ lui $at,0xc5fa
|
||||
/* f0e53a8: 44819000 */ mtc1 $at,$f18
|
||||
/* f0e53ac: 8e390000 */ lw $t9,0x0($s1)
|
||||
/* f0e53b0: 46062202 */ mul.s $f8,$f4,$f6
|
||||
/* f0e53b4: 03304821 */ addu $t1,$t9,$s0
|
||||
/* f0e53b8: 46089401 */ sub.s $f16,$f18,$f8
|
||||
/* f0e53bc: e5300008 */ swc1 $f16,0x8($t1)
|
||||
/* f0e53c0: 26520001 */ addiu $s2,$s2,0x1
|
||||
.L0f0e53c4:
|
||||
/* f0e53c4: 2a410118 */ slti $at,$s2,0x118
|
||||
/* f0e53c8: 1420ff96 */ bnez $at,.L0f0e5224
|
||||
/* f0e53cc: 2610000c */ addiu $s0,$s0,0xc
|
||||
/* f0e53d0: 3c014120 */ lui $at,0x4120
|
||||
/* f0e53d4: 44816000 */ mtc1 $at,$f12
|
||||
/* f0e53d8: 0fc01ae8 */ jal func0f006ba0
|
||||
/* f0e53dc: 00000000 */ nop
|
||||
/* f0e53e0: 3c01800a */ lui $at,%hi(var8009de98)
|
||||
/* f0e53e4: ac20de98 */ sw $zero,%lo(var8009de98)($at)
|
||||
/* f0e53e8: 3c01800a */ lui $at,%hi(var8009de9c)
|
||||
/* f0e53ec: 8fa40150 */ lw $a0,0x150($sp)
|
||||
/* f0e53f0: 46000506 */ mov.s $f20,$f0
|
||||
/* f0e53f4: ac20de9c */ sw $zero,%lo(var8009de9c)($at)
|
||||
/* f0e53f8: 0fc3528f */ jal func0f0d4a3c
|
||||
/* f0e53fc: 00002825 */ or $a1,$zero,$zero
|
||||
/* f0e5400: 3c0afffe */ lui $t2,0xfffe
|
||||
/* f0e5404: 8fac00f0 */ lw $t4,0xf0($sp)
|
||||
/* f0e5408: 354a7960 */ ori $t2,$t2,0x7960
|
||||
/* f0e540c: 3c01800a */ lui $at,%hi(var8009de90)
|
||||
/* f0e5410: ac2ade90 */ sw $t2,%lo(var8009de90)($at)
|
||||
/* f0e5414: 3c0b0001 */ lui $t3,0x1
|
||||
/* f0e5418: 356b86a0 */ ori $t3,$t3,0x86a0
|
||||
/* f0e541c: 3c01800a */ lui $at,%hi(var8009de94)
|
||||
/* f0e5420: 00409025 */ or $s2,$v0,$zero
|
||||
/* f0e5424: 11800022 */ beqz $t4,.L0f0e54b0
|
||||
/* f0e5428: ac2bde94 */ sw $t3,%lo(var8009de94)($at)
|
||||
/* f0e542c: 3c026060 */ lui $v0,0x6060
|
||||
/* f0e5430: 3442607f */ ori $v0,$v0,0x607f
|
||||
/* f0e5434: 240dfff6 */ addiu $t5,$zero,-10
|
||||
/* f0e5438: afad0010 */ sw $t5,0x10($sp)
|
||||
/* f0e543c: afa20014 */ sw $v0,0x14($sp)
|
||||
/* f0e5440: afa20018 */ sw $v0,0x18($sp)
|
||||
/* f0e5444: 02402025 */ or $a0,$s2,$zero
|
||||
/* f0e5448: 2405fc18 */ addiu $a1,$zero,-1000
|
||||
/* f0e544c: 2406fff6 */ addiu $a2,$zero,-10
|
||||
/* f0e5450: 240707d0 */ addiu $a3,$zero,0x7d0
|
||||
/* f0e5454: afb3001c */ sw $s3,0x1c($sp)
|
||||
/* f0e5458: 0fc35343 */ jal func0f0d4d0c
|
||||
/* f0e545c: afb20150 */ sw $s2,0x150($sp)
|
||||
/* f0e5460: 0c002f06 */ jal viGetHeight
|
||||
/* f0e5464: afa20150 */ sw $v0,0x150($sp)
|
||||
/* f0e5468: 00028400 */ sll $s0,$v0,0x10
|
||||
/* f0e546c: 00107403 */ sra $t6,$s0,0x10
|
||||
/* f0e5470: 0c002f06 */ jal viGetHeight
|
||||
/* f0e5474: 01c08025 */ or $s0,$t6,$zero
|
||||
/* f0e5478: 3c039090 */ lui $v1,0x9090
|
||||
/* f0e547c: 3463907f */ ori $v1,$v1,0x907f
|
||||
/* f0e5480: 244f000a */ addiu $t7,$v0,0xa
|
||||
/* f0e5484: afaf0010 */ sw $t7,0x10($sp)
|
||||
/* f0e5488: afa30014 */ sw $v1,0x14($sp)
|
||||
/* f0e548c: afa30018 */ sw $v1,0x18($sp)
|
||||
/* f0e5490: 8fa40150 */ lw $a0,0x150($sp)
|
||||
/* f0e5494: 2405fc18 */ addiu $a1,$zero,-1000
|
||||
/* f0e5498: 2606000a */ addiu $a2,$s0,0xa
|
||||
/* f0e549c: 240707d0 */ addiu $a3,$zero,0x7d0
|
||||
/* f0e54a0: 0fc35343 */ jal func0f0d4d0c
|
||||
/* f0e54a4: afb3001c */ sw $s3,0x1c($sp)
|
||||
/* f0e54a8: 10000023 */ b .L0f0e5538
|
||||
/* f0e54ac: 00409025 */ or $s2,$v0,$zero
|
||||
.L0f0e54b0:
|
||||
/* f0e54b0: 2418fff6 */ addiu $t8,$zero,-10
|
||||
/* f0e54b4: 3419947f */ dli $t9,0x947f
|
||||
/* f0e54b8: 3409947f */ dli $t1,0x947f
|
||||
/* f0e54bc: 240a000a */ addiu $t2,$zero,0xa
|
||||
/* f0e54c0: afaa001c */ sw $t2,0x1c($sp)
|
||||
/* f0e54c4: afa90018 */ sw $t1,0x18($sp)
|
||||
/* f0e54c8: afb90014 */ sw $t9,0x14($sp)
|
||||
/* f0e54cc: afb80010 */ sw $t8,0x10($sp)
|
||||
/* f0e54d0: 02402025 */ or $a0,$s2,$zero
|
||||
/* f0e54d4: 2405fc18 */ addiu $a1,$zero,-1000
|
||||
/* f0e54d8: 2406fff6 */ addiu $a2,$zero,-10
|
||||
/* f0e54dc: 240707d0 */ addiu $a3,$zero,0x7d0
|
||||
/* f0e54e0: 0fc35343 */ jal func0f0d4d0c
|
||||
/* f0e54e4: afb20150 */ sw $s2,0x150($sp)
|
||||
/* f0e54e8: 0c002f06 */ jal viGetHeight
|
||||
/* f0e54ec: afa20150 */ sw $v0,0x150($sp)
|
||||
/* f0e54f0: 00028400 */ sll $s0,$v0,0x10
|
||||
/* f0e54f4: 00105c03 */ sra $t3,$s0,0x10
|
||||
/* f0e54f8: 0c002f06 */ jal viGetHeight
|
||||
/* f0e54fc: 01608025 */ or $s0,$t3,$zero
|
||||
/* f0e5500: 3c036200 */ lui $v1,0x6200
|
||||
/* f0e5504: 3463947f */ ori $v1,$v1,0x947f
|
||||
/* f0e5508: 244c000a */ addiu $t4,$v0,0xa
|
||||
/* f0e550c: 240d0006 */ addiu $t5,$zero,0x6
|
||||
/* f0e5510: afad001c */ sw $t5,0x1c($sp)
|
||||
/* f0e5514: afac0010 */ sw $t4,0x10($sp)
|
||||
/* f0e5518: afa30014 */ sw $v1,0x14($sp)
|
||||
/* f0e551c: afa30018 */ sw $v1,0x18($sp)
|
||||
/* f0e5520: 8fa40150 */ lw $a0,0x150($sp)
|
||||
/* f0e5524: 2405fc18 */ addiu $a1,$zero,-1000
|
||||
/* f0e5528: 2606000a */ addiu $a2,$s0,0xa
|
||||
/* f0e552c: 0fc35343 */ jal func0f0d4d0c
|
||||
/* f0e5530: 240707d0 */ addiu $a3,$zero,0x7d0
|
||||
/* f0e5534: 00409025 */ or $s2,$v0,$zero
|
||||
.L0f0e5538:
|
||||
/* f0e5538: 02402025 */ or $a0,$s2,$zero
|
||||
/* f0e553c: 0fc35320 */ jal func0f0d4c80
|
||||
/* f0e5540: afb20150 */ sw $s2,0x150($sp)
|
||||
/* f0e5544: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e5548: 0fc35272 */ jal func0f0d49c8
|
||||
/* f0e554c: afa20150 */ sw $v0,0x150($sp)
|
||||
/* f0e5550: 3c05800b */ lui $a1,%hi(var800ab5a8)
|
||||
/* f0e5554: 8ca5b5a8 */ lw $a1,%lo(var800ab5a8)($a1)
|
||||
/* f0e5558: 240e0002 */ addiu $t6,$zero,0x2
|
||||
/* f0e555c: 240f0001 */ addiu $t7,$zero,0x1
|
||||
/* f0e5560: afaf0014 */ sw $t7,0x14($sp)
|
||||
/* f0e5564: afae0010 */ sw $t6,0x10($sp)
|
||||
/* f0e5568: 27a40150 */ addiu $a0,$sp,0x150
|
||||
/* f0e556c: 24060002 */ addiu $a2,$zero,0x2
|
||||
/* f0e5570: 24070001 */ addiu $a3,$zero,0x1
|
||||
/* f0e5574: afa00018 */ sw $zero,0x18($sp)
|
||||
/* f0e5578: afa20150 */ sw $v0,0x150($sp)
|
||||
/* f0e557c: 0fc2ce70 */ jal func0f0b39c0
|
||||
/* f0e5580: 24a5000c */ addiu $a1,$a1,0x000c
|
||||
/* f0e5584: 8fb80150 */ lw $t8,0x150($sp)
|
||||
/* f0e5588: 3c09ba00 */ lui $t1,0xba00
|
||||
/* f0e558c: 35291402 */ ori $t1,$t1,0x1402
|
||||
/* f0e5590: 27190008 */ addiu $t9,$t8,0x8
|
||||
/* f0e5594: afb90150 */ sw $t9,0x150($sp)
|
||||
/* f0e5598: af000004 */ sw $zero,0x4($t8)
|
||||
/* f0e559c: af090000 */ sw $t1,0x0($t8)
|
||||
/* f0e55a0: 8faa0150 */ lw $t2,0x150($sp)
|
||||
/* f0e55a4: 3c0cba00 */ lui $t4,0xba00
|
||||
/* f0e55a8: 358c0602 */ ori $t4,$t4,0x602
|
||||
/* f0e55ac: 254b0008 */ addiu $t3,$t2,0x8
|
||||
/* f0e55b0: afab0150 */ sw $t3,0x150($sp)
|
||||
/* f0e55b4: 240d00c0 */ addiu $t5,$zero,0xc0
|
||||
/* f0e55b8: ad4d0004 */ sw $t5,0x4($t2)
|
||||
/* f0e55bc: ad4c0000 */ sw $t4,0x0($t2)
|
||||
/* f0e55c0: 8fae0150 */ lw $t6,0x150($sp)
|
||||
/* f0e55c4: 3c18b900 */ lui $t8,0xb900
|
||||
/* f0e55c8: 3c190050 */ lui $t9,0x50
|
||||
/* f0e55cc: 25cf0008 */ addiu $t7,$t6,0x8
|
||||
/* f0e55d0: afaf0150 */ sw $t7,0x150($sp)
|
||||
/* f0e55d4: 373949d8 */ ori $t9,$t9,0x49d8
|
||||
/* f0e55d8: 3718031d */ ori $t8,$t8,0x31d
|
||||
/* f0e55dc: add80000 */ sw $t8,0x0($t6)
|
||||
/* f0e55e0: add90004 */ sw $t9,0x4($t6)
|
||||
/* f0e55e4: 8fa90150 */ lw $t1,0x150($sp)
|
||||
/* f0e55e8: 3c0bb900 */ lui $t3,0xb900
|
||||
/* f0e55ec: 356b0002 */ ori $t3,$t3,0x2
|
||||
/* f0e55f0: 252a0008 */ addiu $t2,$t1,0x8
|
||||
/* f0e55f4: afaa0150 */ sw $t2,0x150($sp)
|
||||
/* f0e55f8: ad200004 */ sw $zero,0x4($t1)
|
||||
/* f0e55fc: ad2b0000 */ sw $t3,0x0($t1)
|
||||
/* f0e5600: 8fac0150 */ lw $t4,0x150($sp)
|
||||
/* f0e5604: 3c0eba00 */ lui $t6,0xba00
|
||||
/* f0e5608: 35ce1001 */ ori $t6,$t6,0x1001
|
||||
/* f0e560c: 258d0008 */ addiu $t5,$t4,0x8
|
||||
/* f0e5610: afad0150 */ sw $t5,0x150($sp)
|
||||
/* f0e5614: ad800004 */ sw $zero,0x4($t4)
|
||||
/* f0e5618: ad8e0000 */ sw $t6,0x0($t4)
|
||||
/* f0e561c: 8faf0150 */ lw $t7,0x150($sp)
|
||||
/* f0e5620: 3c19ba00 */ lui $t9,0xba00
|
||||
/* f0e5624: 37390903 */ ori $t9,$t9,0x903
|
||||
/* f0e5628: 25f80008 */ addiu $t8,$t7,0x8
|
||||
/* f0e562c: afb80150 */ sw $t8,0x150($sp)
|
||||
/* f0e5630: 24090c00 */ addiu $t1,$zero,0xc00
|
||||
/* f0e5634: ade90004 */ sw $t1,0x4($t7)
|
||||
/* f0e5638: adf90000 */ sw $t9,0x0($t7)
|
||||
/* f0e563c: 8faa0150 */ lw $t2,0x150($sp)
|
||||
/* f0e5640: 3c0cfcff */ lui $t4,0xfcff
|
||||
/* f0e5644: 3c0dff32 */ lui $t5,0xff32
|
||||
/* f0e5648: 254b0008 */ addiu $t3,$t2,0x8
|
||||
/* f0e564c: afab0150 */ sw $t3,0x150($sp)
|
||||
/* f0e5650: 35ad7f3f */ ori $t5,$t5,0x7f3f
|
||||
/* f0e5654: 358c99ff */ ori $t4,$t4,0x99ff
|
||||
/* f0e5658: ad4c0000 */ sw $t4,0x0($t2)
|
||||
/* f0e565c: ad4d0004 */ sw $t5,0x4($t2)
|
||||
/* f0e5660: 8fae0150 */ lw $t6,0x150($sp)
|
||||
/* f0e5664: 3c18ba00 */ lui $t8,0xba00
|
||||
/* f0e5668: 37180c02 */ ori $t8,$t8,0xc02
|
||||
/* f0e566c: 25cf0008 */ addiu $t7,$t6,0x8
|
||||
/* f0e5670: afaf0150 */ sw $t7,0x150($sp)
|
||||
/* f0e5674: 24192000 */ addiu $t9,$zero,0x2000
|
||||
/* f0e5678: add90004 */ sw $t9,0x4($t6)
|
||||
/* f0e567c: add80000 */ sw $t8,0x0($t6)
|
||||
/* f0e5680: 8fa90150 */ lw $t1,0x150($sp)
|
||||
/* f0e5684: 3c0bba00 */ lui $t3,0xba00
|
||||
/* f0e5688: 27b00110 */ addiu $s0,$sp,0x110
|
||||
/* f0e568c: 252a0008 */ addiu $t2,$t1,0x8
|
||||
/* f0e5690: afaa0150 */ sw $t2,0x150($sp)
|
||||
/* f0e5694: 356b1301 */ ori $t3,$t3,0x1301
|
||||
/* f0e5698: 3c0c0008 */ lui $t4,0x8
|
||||
/* f0e569c: 02002025 */ or $a0,$s0,$zero
|
||||
/* f0e56a0: ad2c0004 */ sw $t4,0x4($t1)
|
||||
/* f0e56a4: 0c00566c */ jal func000159b0
|
||||
/* f0e56a8: ad2b0000 */ sw $t3,0x0($t1)
|
||||
/* f0e56ac: 0fc59e66 */ jal gfxAllocateMatrix
|
||||
/* f0e56b0: 00000000 */ nop
|
||||
/* f0e56b4: 00409025 */ or $s2,$v0,$zero
|
||||
/* f0e56b8: 02002025 */ or $a0,$s0,$zero
|
||||
/* f0e56bc: 0c005815 */ jal func00016054
|
||||
/* f0e56c0: 00402825 */ or $a1,$v0,$zero
|
||||
/* f0e56c4: 8fb00150 */ lw $s0,0x150($sp)
|
||||
/* f0e56c8: 3c0f0102 */ lui $t7,0x102
|
||||
/* f0e56cc: 35ef0040 */ ori $t7,$t7,0x40
|
||||
/* f0e56d0: 260e0008 */ addiu $t6,$s0,0x8
|
||||
/* f0e56d4: afae0150 */ sw $t6,0x150($sp)
|
||||
/* f0e56d8: 02402025 */ or $a0,$s2,$zero
|
||||
/* f0e56dc: 0c012d20 */ jal osVirtualToPhysical
|
||||
/* f0e56e0: ae0f0000 */ sw $t7,0x0($s0)
|
||||
/* f0e56e4: ae020004 */ sw $v0,0x4($s0)
|
||||
/* f0e56e8: 0fc59e73 */ jal gfxAllocateColours
|
||||
/* f0e56ec: 24040014 */ addiu $a0,$zero,0x14
|
||||
/* f0e56f0: 8fb800f0 */ lw $t8,0xf0($sp)
|
||||
/* f0e56f4: 00408025 */ or $s0,$v0,$zero
|
||||
/* f0e56f8: 00001825 */ or $v1,$zero,$zero
|
||||
/* f0e56fc: 1300004b */ beqz $t8,.L0f0e582c
|
||||
/* f0e5700: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e5704: 00001825 */ or $v1,$zero,$zero
|
||||
/* f0e5708: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e570c: 2408ff00 */ addiu $t0,$zero,-256
|
||||
/* f0e5710: 2407007f */ addiu $a3,$zero,0x7f
|
||||
/* f0e5714: 24050005 */ addiu $a1,$zero,0x5
|
||||
/* f0e5718: 0263c823 */ subu $t9,$s3,$v1
|
||||
.L0f0e571c:
|
||||
/* f0e571c: 03270019 */ multu $t9,$a3
|
||||
/* f0e5720: 24630001 */ addiu $v1,$v1,0x1
|
||||
/* f0e5724: 28610005 */ slti $at,$v1,0x5
|
||||
/* f0e5728: 24840010 */ addiu $a0,$a0,0x10
|
||||
/* f0e572c: 00004812 */ mflo $t1
|
||||
/* f0e5730: 00000000 */ nop
|
||||
/* f0e5734: 00000000 */ nop
|
||||
/* f0e5738: 0125001b */ divu $zero,$t1,$a1
|
||||
/* f0e573c: 00005012 */ mflo $t2
|
||||
/* f0e5740: 01485825 */ or $t3,$t2,$t0
|
||||
/* f0e5744: 14a00002 */ bnez $a1,.L0f0e5750
|
||||
/* f0e5748: 00000000 */ nop
|
||||
/* f0e574c: 0007000d */ break 0x7
|
||||
.L0f0e5750:
|
||||
/* f0e5750: ac8bfff0 */ sw $t3,-0x10($a0)
|
||||
/* f0e5754: 5420fff1 */ bnezl $at,.L0f0e571c
|
||||
/* f0e5758: 0263c823 */ subu $t9,$s3,$v1
|
||||
/* f0e575c: 3c06aaaa */ lui $a2,0xaaaa
|
||||
/* f0e5760: 34c6aa00 */ ori $a2,$a2,0xaa00
|
||||
/* f0e5764: 00001825 */ or $v1,$zero,$zero
|
||||
/* f0e5768: 00402025 */ or $a0,$v0,$zero
|
||||
.L0f0e576c:
|
||||
/* f0e576c: 02636023 */ subu $t4,$s3,$v1
|
||||
/* f0e5770: 000c6900 */ sll $t5,$t4,0x4
|
||||
/* f0e5774: 01a5001b */ divu $zero,$t5,$a1
|
||||
/* f0e5778: 00007012 */ mflo $t6
|
||||
/* f0e577c: 24630001 */ addiu $v1,$v1,0x1
|
||||
/* f0e5780: 28610005 */ slti $at,$v1,0x5
|
||||
/* f0e5784: 01c67825 */ or $t7,$t6,$a2
|
||||
/* f0e5788: 14a00002 */ bnez $a1,.L0f0e5794
|
||||
/* f0e578c: 00000000 */ nop
|
||||
/* f0e5790: 0007000d */ break 0x7
|
||||
.L0f0e5794:
|
||||
/* f0e5794: ac8f0004 */ sw $t7,0x4($a0)
|
||||
/* f0e5798: 1420fff4 */ bnez $at,.L0f0e576c
|
||||
/* f0e579c: 24840010 */ addiu $a0,$a0,0x10
|
||||
/* f0e57a0: 00001825 */ or $v1,$zero,$zero
|
||||
/* f0e57a4: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e57a8: 0263c023 */ subu $t8,$s3,$v1
|
||||
.L0f0e57ac:
|
||||
/* f0e57ac: 03070019 */ multu $t8,$a3
|
||||
/* f0e57b0: 24630001 */ addiu $v1,$v1,0x1
|
||||
/* f0e57b4: 28610005 */ slti $at,$v1,0x5
|
||||
/* f0e57b8: 24840010 */ addiu $a0,$a0,0x10
|
||||
/* f0e57bc: 0000c812 */ mflo $t9
|
||||
/* f0e57c0: 00000000 */ nop
|
||||
/* f0e57c4: 00000000 */ nop
|
||||
/* f0e57c8: 0325001b */ divu $zero,$t9,$a1
|
||||
/* f0e57cc: 00004812 */ mflo $t1
|
||||
/* f0e57d0: 01285025 */ or $t2,$t1,$t0
|
||||
/* f0e57d4: 14a00002 */ bnez $a1,.L0f0e57e0
|
||||
/* f0e57d8: 00000000 */ nop
|
||||
/* f0e57dc: 0007000d */ break 0x7
|
||||
.L0f0e57e0:
|
||||
/* f0e57e0: ac8afff8 */ sw $t2,-0x8($a0)
|
||||
/* f0e57e4: 5420fff1 */ bnezl $at,.L0f0e57ac
|
||||
/* f0e57e8: 0263c023 */ subu $t8,$s3,$v1
|
||||
/* f0e57ec: 00001825 */ or $v1,$zero,$zero
|
||||
/* f0e57f0: 00402025 */ or $a0,$v0,$zero
|
||||
.L0f0e57f4:
|
||||
/* f0e57f4: 02635823 */ subu $t3,$s3,$v1
|
||||
/* f0e57f8: 000b6100 */ sll $t4,$t3,0x4
|
||||
/* f0e57fc: 0185001b */ divu $zero,$t4,$a1
|
||||
/* f0e5800: 00006812 */ mflo $t5
|
||||
/* f0e5804: 01a67025 */ or $t6,$t5,$a2
|
||||
/* f0e5808: 14a00002 */ bnez $a1,.L0f0e5814
|
||||
/* f0e580c: 00000000 */ nop
|
||||
/* f0e5810: 0007000d */ break 0x7
|
||||
.L0f0e5814:
|
||||
/* f0e5814: 24630001 */ addiu $v1,$v1,0x1
|
||||
/* f0e5818: ac8e000c */ sw $t6,0xc($a0)
|
||||
/* f0e581c: 1473fff5 */ bne $v1,$s3,.L0f0e57f4
|
||||
/* f0e5820: 24840010 */ addiu $a0,$a0,0x10
|
||||
/* f0e5824: 1000004a */ b .L0f0e5950
|
||||
/* f0e5828: 8fb30150 */ lw $s3,0x150($sp)
|
||||
.L0f0e582c:
|
||||
/* f0e582c: 2408ff00 */ addiu $t0,$zero,-256
|
||||
/* f0e5830: 2407007f */ addiu $a3,$zero,0x7f
|
||||
/* f0e5834: 24050005 */ addiu $a1,$zero,0x5
|
||||
/* f0e5838: 02637823 */ subu $t7,$s3,$v1
|
||||
.L0f0e583c:
|
||||
/* f0e583c: 01e70019 */ multu $t7,$a3
|
||||
/* f0e5840: 24630001 */ addiu $v1,$v1,0x1
|
||||
/* f0e5844: 28610005 */ slti $at,$v1,0x5
|
||||
/* f0e5848: 24840010 */ addiu $a0,$a0,0x10
|
||||
/* f0e584c: 0000c012 */ mflo $t8
|
||||
/* f0e5850: 00000000 */ nop
|
||||
/* f0e5854: 00000000 */ nop
|
||||
/* f0e5858: 0305001b */ divu $zero,$t8,$a1
|
||||
/* f0e585c: 0000c812 */ mflo $t9
|
||||
/* f0e5860: 03284825 */ or $t1,$t9,$t0
|
||||
/* f0e5864: 14a00002 */ bnez $a1,.L0f0e5870
|
||||
/* f0e5868: 00000000 */ nop
|
||||
/* f0e586c: 0007000d */ break 0x7
|
||||
.L0f0e5870:
|
||||
/* f0e5870: ac89fff0 */ sw $t1,-0x10($a0)
|
||||
/* f0e5874: 5420fff1 */ bnezl $at,.L0f0e583c
|
||||
/* f0e5878: 02637823 */ subu $t7,$s3,$v1
|
||||
/* f0e587c: 3c06aaaa */ lui $a2,0xaaaa
|
||||
/* f0e5880: 34c6ff00 */ ori $a2,$a2,0xff00
|
||||
/* f0e5884: 00001825 */ or $v1,$zero,$zero
|
||||
/* f0e5888: 00402025 */ or $a0,$v0,$zero
|
||||
.L0f0e588c:
|
||||
/* f0e588c: 02635023 */ subu $t2,$s3,$v1
|
||||
/* f0e5890: 000a5900 */ sll $t3,$t2,0x4
|
||||
/* f0e5894: 0165001b */ divu $zero,$t3,$a1
|
||||
/* f0e5898: 00006012 */ mflo $t4
|
||||
/* f0e589c: 24630001 */ addiu $v1,$v1,0x1
|
||||
/* f0e58a0: 28610005 */ slti $at,$v1,0x5
|
||||
/* f0e58a4: 01866825 */ or $t5,$t4,$a2
|
||||
/* f0e58a8: 14a00002 */ bnez $a1,.L0f0e58b4
|
||||
/* f0e58ac: 00000000 */ nop
|
||||
/* f0e58b0: 0007000d */ break 0x7
|
||||
.L0f0e58b4:
|
||||
/* f0e58b4: ac8d0004 */ sw $t5,0x4($a0)
|
||||
/* f0e58b8: 1420fff4 */ bnez $at,.L0f0e588c
|
||||
/* f0e58bc: 24840010 */ addiu $a0,$a0,0x10
|
||||
/* f0e58c0: 00001825 */ or $v1,$zero,$zero
|
||||
/* f0e58c4: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e58c8: 02637023 */ subu $t6,$s3,$v1
|
||||
.L0f0e58cc:
|
||||
/* f0e58cc: 01c70019 */ multu $t6,$a3
|
||||
/* f0e58d0: 24630001 */ addiu $v1,$v1,0x1
|
||||
/* f0e58d4: 28610005 */ slti $at,$v1,0x5
|
||||
/* f0e58d8: 24840010 */ addiu $a0,$a0,0x10
|
||||
/* f0e58dc: 00007812 */ mflo $t7
|
||||
/* f0e58e0: 00000000 */ nop
|
||||
/* f0e58e4: 00000000 */ nop
|
||||
/* f0e58e8: 01e5001b */ divu $zero,$t7,$a1
|
||||
/* f0e58ec: 0000c012 */ mflo $t8
|
||||
/* f0e58f0: 0308c825 */ or $t9,$t8,$t0
|
||||
/* f0e58f4: 14a00002 */ bnez $a1,.L0f0e5900
|
||||
/* f0e58f8: 00000000 */ nop
|
||||
/* f0e58fc: 0007000d */ break 0x7
|
||||
.L0f0e5900:
|
||||
/* f0e5900: ac99fff8 */ sw $t9,-0x8($a0)
|
||||
/* f0e5904: 5420fff1 */ bnezl $at,.L0f0e58cc
|
||||
/* f0e5908: 02637023 */ subu $t6,$s3,$v1
|
||||
/* f0e590c: 3c06ffaa */ lui $a2,0xffaa
|
||||
/* f0e5910: 34c6ff00 */ ori $a2,$a2,0xff00
|
||||
/* f0e5914: 00001825 */ or $v1,$zero,$zero
|
||||
/* f0e5918: 00402025 */ or $a0,$v0,$zero
|
||||
.L0f0e591c:
|
||||
/* f0e591c: 02634823 */ subu $t1,$s3,$v1
|
||||
/* f0e5920: 00095100 */ sll $t2,$t1,0x4
|
||||
/* f0e5924: 0145001b */ divu $zero,$t2,$a1
|
||||
/* f0e5928: 00005812 */ mflo $t3
|
||||
/* f0e592c: 01666025 */ or $t4,$t3,$a2
|
||||
/* f0e5930: 14a00002 */ bnez $a1,.L0f0e593c
|
||||
/* f0e5934: 00000000 */ nop
|
||||
/* f0e5938: 0007000d */ break 0x7
|
||||
.L0f0e593c:
|
||||
/* f0e593c: 24630001 */ addiu $v1,$v1,0x1
|
||||
/* f0e5940: ac8c000c */ sw $t4,0xc($a0)
|
||||
/* f0e5944: 1473fff5 */ bne $v1,$s3,.L0f0e591c
|
||||
/* f0e5948: 24840010 */ addiu $a0,$a0,0x10
|
||||
/* f0e594c: 8fb30150 */ lw $s3,0x150($sp)
|
||||
.L0f0e5950:
|
||||
/* f0e5950: 3c0f074c */ lui $t7,0x74c
|
||||
/* f0e5954: 35ef0050 */ ori $t7,$t7,0x50
|
||||
/* f0e5958: 266e0008 */ addiu $t6,$s3,0x8
|
||||
/* f0e595c: afae0150 */ sw $t6,0x150($sp)
|
||||
/* f0e5960: 02002025 */ or $a0,$s0,$zero
|
||||
/* f0e5964: 0c012d20 */ jal osVirtualToPhysical
|
||||
/* f0e5968: ae6f0000 */ sw $t7,0x0($s3)
|
||||
/* f0e596c: ae620004 */ sw $v0,0x4($s3)
|
||||
/* f0e5970: 3c017f1b */ lui $at,%hi(var7f1adf84)
|
||||
/* f0e5974: c42adf84 */ lwc1 $f10,%lo(var7f1adf84)($at)
|
||||
/* f0e5978: 3c017f1b */ lui $at,%hi(var7f1adf88)
|
||||
/* f0e597c: c43edf88 */ lwc1 $f30,%lo(var7f1adf88)($at)
|
||||
/* f0e5980: 460aa002 */ mul.s $f0,$f20,$f10
|
||||
/* f0e5984: 3c014170 */ lui $at,0x4170
|
||||
/* f0e5988: 4481e000 */ mtc1 $at,$f28
|
||||
/* f0e598c: 3c017f1b */ lui $at,%hi(var7f1adf8c)
|
||||
/* f0e5990: c43adf8c */ lwc1 $f26,%lo(var7f1adf8c)($at)
|
||||
/* f0e5994: 3c0141c8 */ lui $at,0x41c8
|
||||
/* f0e5998: 4481b000 */ mtc1 $at,$f22
|
||||
/* f0e599c: e7a00070 */ swc1 $f0,0x70($sp)
|
||||
/* f0e59a0: 24120117 */ addiu $s2,$zero,0x117
|
||||
/* f0e59a4: 24100d14 */ addiu $s0,$zero,0xd14
|
||||
.L0f0e59a8:
|
||||
/* f0e59a8: 44922000 */ mtc1 $s2,$f4
|
||||
/* f0e59ac: c7a00070 */ lwc1 $f0,0x70($sp)
|
||||
/* f0e59b0: 00009825 */ or $s3,$zero,$zero
|
||||
/* f0e59b4: 468021a0 */ cvt.s.w $f6,$f4
|
||||
/* f0e59b8: 461c3483 */ div.s $f18,$f6,$f28
|
||||
/* f0e59bc: 4612d202 */ mul.s $f8,$f26,$f18
|
||||
/* f0e59c0: 46080500 */ add.s $f20,$f0,$f8
|
||||
/* f0e59c4: 0c0068f7 */ jal sinf
|
||||
/* f0e59c8: 4600a306 */ mov.s $f12,$f20
|
||||
/* f0e59cc: 46000606 */ mov.s $f24,$f0
|
||||
/* f0e59d0: 0c0068f4 */ jal cosf
|
||||
/* f0e59d4: 4600a306 */ mov.s $f12,$f20
|
||||
/* f0e59d8: 8e380000 */ lw $t8,0x0($s1)
|
||||
/* f0e59dc: 46000506 */ mov.s $f20,$f0
|
||||
/* f0e59e0: 3c017f1b */ lui $at,%hi(var7f1adf90)
|
||||
/* f0e59e4: 03101821 */ addu $v1,$t8,$s0
|
||||
/* f0e59e8: c4700000 */ lwc1 $f16,0x0($v1)
|
||||
/* f0e59ec: e7b000b8 */ swc1 $f16,0xb8($sp)
|
||||
/* f0e59f0: c46a0004 */ lwc1 $f10,0x4($v1)
|
||||
/* f0e59f4: e7aa00bc */ swc1 $f10,0xbc($sp)
|
||||
/* f0e59f8: c4640008 */ lwc1 $f4,0x8($v1)
|
||||
/* f0e59fc: e7a400c0 */ swc1 $f4,0xc0($sp)
|
||||
/* f0e5a00: c7a600c0 */ lwc1 $f6,0xc0($sp)
|
||||
/* f0e5a04: c7a000c0 */ lwc1 $f0,0xc0($sp)
|
||||
/* f0e5a08: 461e303c */ c.lt.s $f6,$f30
|
||||
/* f0e5a0c: 00000000 */ nop
|
||||
/* f0e5a10: 4502000e */ bc1fl .L0f0e5a4c
|
||||
/* f0e5a14: 44808000 */ mtc1 $zero,$f16
|
||||
/* f0e5a18: c432df90 */ lwc1 $f18,%lo(var7f1adf90)($at)
|
||||
/* f0e5a1c: 3c0144af */ lui $at,0x44af
|
||||
/* f0e5a20: 44815000 */ mtc1 $at,$f10
|
||||
/* f0e5a24: 46123200 */ add.s $f8,$f6,$f18
|
||||
/* f0e5a28: 3c0140a0 */ lui $at,0x40a0
|
||||
/* f0e5a2c: 44813000 */ mtc1 $at,$f6
|
||||
/* f0e5a30: 46004407 */ neg.s $f16,$f8
|
||||
/* f0e5a34: 460a8103 */ div.s $f4,$f16,$f10
|
||||
/* f0e5a38: 46062482 */ mul.s $f18,$f4,$f6
|
||||
/* f0e5a3c: 4600920d */ trunc.w.s $f8,$f18
|
||||
/* f0e5a40: 44134000 */ mfc1 $s3,$f8
|
||||
/* f0e5a44: 00000000 */ nop
|
||||
/* f0e5a48: 44808000 */ mtc1 $zero,$f16
|
||||
.L0f0e5a4c:
|
||||
/* f0e5a4c: 2a610006 */ slti $at,$s3,0x6
|
||||
/* f0e5a50: 4610003c */ c.lt.s $f0,$f16
|
||||
/* f0e5a54: 00000000 */ nop
|
||||
/* f0e5a58: 4502008d */ bc1fl .L0f0e5c90
|
||||
/* f0e5a5c: 2652ffff */ addiu $s2,$s2,-1
|
||||
/* f0e5a60: 5020008b */ beqzl $at,.L0f0e5c90
|
||||
/* f0e5a64: 2652ffff */ addiu $s2,$s2,-1
|
||||
/* f0e5a68: 0fc59e59 */ jal gfxAllocateVertices
|
||||
/* f0e5a6c: 24040005 */ addiu $a0,$zero,0x5
|
||||
/* f0e5a70: c7aa00b8 */ lwc1 $f10,0xb8($sp)
|
||||
/* f0e5a74: 4600c007 */ neg.s $f0,$f24
|
||||
/* f0e5a78: 4600a087 */ neg.s $f2,$f20
|
||||
/* f0e5a7c: 4600510d */ trunc.w.s $f4,$f10
|
||||
/* f0e5a80: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e5a84: 440a2000 */ mfc1 $t2,$f4
|
||||
/* f0e5a88: 4614c100 */ add.s $f4,$f24,$f20
|
||||
/* f0e5a8c: a44a0000 */ sh $t2,0x0($v0)
|
||||
/* f0e5a90: c7a600bc */ lwc1 $f6,0xbc($sp)
|
||||
/* f0e5a94: 4600348d */ trunc.w.s $f18,$f6
|
||||
/* f0e5a98: 4604b182 */ mul.s $f6,$f22,$f4
|
||||
/* f0e5a9c: 4600a100 */ add.s $f4,$f20,$f0
|
||||
/* f0e5aa0: 440c9000 */ mfc1 $t4,$f18
|
||||
/* f0e5aa4: 00000000 */ nop
|
||||
/* f0e5aa8: a44c0002 */ sh $t4,0x2($v0)
|
||||
/* f0e5aac: c7a800c0 */ lwc1 $f8,0xc0($sp)
|
||||
/* f0e5ab0: 4600440d */ trunc.w.s $f16,$f8
|
||||
/* f0e5ab4: 440e8000 */ mfc1 $t6,$f16
|
||||
/* f0e5ab8: 00000000 */ nop
|
||||
/* f0e5abc: a44e0004 */ sh $t6,0x4($v0)
|
||||
/* f0e5ac0: c7aa00b8 */ lwc1 $f10,0xb8($sp)
|
||||
/* f0e5ac4: 46065480 */ add.s $f18,$f10,$f6
|
||||
/* f0e5ac8: 4604b282 */ mul.s $f10,$f22,$f4
|
||||
/* f0e5acc: 4600920d */ trunc.w.s $f8,$f18
|
||||
/* f0e5ad0: 44184000 */ mfc1 $t8,$f8
|
||||
/* f0e5ad4: 00000000 */ nop
|
||||
/* f0e5ad8: a458000c */ sh $t8,0xc($v0)
|
||||
/* f0e5adc: c7b000bc */ lwc1 $f16,0xbc($sp)
|
||||
/* f0e5ae0: 460a8180 */ add.s $f6,$f16,$f10
|
||||
/* f0e5ae4: 4614c281 */ sub.s $f10,$f24,$f20
|
||||
/* f0e5ae8: 4600348d */ trunc.w.s $f18,$f6
|
||||
/* f0e5aec: 460ab182 */ mul.s $f6,$f22,$f10
|
||||
/* f0e5af0: 4600a281 */ sub.s $f10,$f20,$f0
|
||||
/* f0e5af4: 44099000 */ mfc1 $t1,$f18
|
||||
/* f0e5af8: 00000000 */ nop
|
||||
/* f0e5afc: a449000e */ sh $t1,0xe($v0)
|
||||
/* f0e5b00: c7a800c0 */ lwc1 $f8,0xc0($sp)
|
||||
/* f0e5b04: 4600410d */ trunc.w.s $f4,$f8
|
||||
/* f0e5b08: 440b2000 */ mfc1 $t3,$f4
|
||||
/* f0e5b0c: 00000000 */ nop
|
||||
/* f0e5b10: a44b0010 */ sh $t3,0x10($v0)
|
||||
/* f0e5b14: c7b000b8 */ lwc1 $f16,0xb8($sp)
|
||||
/* f0e5b18: 46068480 */ add.s $f18,$f16,$f6
|
||||
/* f0e5b1c: 460ab402 */ mul.s $f16,$f22,$f10
|
||||
/* f0e5b20: 4600920d */ trunc.w.s $f8,$f18
|
||||
/* f0e5b24: 440d4000 */ mfc1 $t5,$f8
|
||||
/* f0e5b28: 00000000 */ nop
|
||||
/* f0e5b2c: a44d0018 */ sh $t5,0x18($v0)
|
||||
/* f0e5b30: c7a400bc */ lwc1 $f4,0xbc($sp)
|
||||
/* f0e5b34: 46102180 */ add.s $f6,$f4,$f16
|
||||
/* f0e5b38: 46140401 */ sub.s $f16,$f0,$f20
|
||||
/* f0e5b3c: 4600348d */ trunc.w.s $f18,$f6
|
||||
/* f0e5b40: 4610b182 */ mul.s $f6,$f22,$f16
|
||||
/* f0e5b44: 46001401 */ sub.s $f16,$f2,$f0
|
||||
/* f0e5b48: 440f9000 */ mfc1 $t7,$f18
|
||||
/* f0e5b4c: 00000000 */ nop
|
||||
/* f0e5b50: a44f001a */ sh $t7,0x1a($v0)
|
||||
/* f0e5b54: c7a800c0 */ lwc1 $f8,0xc0($sp)
|
||||
/* f0e5b58: 4600428d */ trunc.w.s $f10,$f8
|
||||
/* f0e5b5c: 44195000 */ mfc1 $t9,$f10
|
||||
/* f0e5b60: 00000000 */ nop
|
||||
/* f0e5b64: a459001c */ sh $t9,0x1c($v0)
|
||||
/* f0e5b68: c7a400b8 */ lwc1 $f4,0xb8($sp)
|
||||
/* f0e5b6c: 46062480 */ add.s $f18,$f4,$f6
|
||||
/* f0e5b70: 4610b102 */ mul.s $f4,$f22,$f16
|
||||
/* f0e5b74: 4600920d */ trunc.w.s $f8,$f18
|
||||
/* f0e5b78: 440a4000 */ mfc1 $t2,$f8
|
||||
/* f0e5b7c: 00000000 */ nop
|
||||
/* f0e5b80: a44a0024 */ sh $t2,0x24($v0)
|
||||
/* f0e5b84: c7aa00bc */ lwc1 $f10,0xbc($sp)
|
||||
/* f0e5b88: 46045180 */ add.s $f6,$f10,$f4
|
||||
/* f0e5b8c: 46140100 */ add.s $f4,$f0,$f20
|
||||
/* f0e5b90: 4600348d */ trunc.w.s $f18,$f6
|
||||
/* f0e5b94: 4604b182 */ mul.s $f6,$f22,$f4
|
||||
/* f0e5b98: 46001100 */ add.s $f4,$f2,$f0
|
||||
/* f0e5b9c: 440c9000 */ mfc1 $t4,$f18
|
||||
/* f0e5ba0: 00000000 */ nop
|
||||
/* f0e5ba4: a44c0026 */ sh $t4,0x26($v0)
|
||||
/* f0e5ba8: c7a800c0 */ lwc1 $f8,0xc0($sp)
|
||||
/* f0e5bac: 00136080 */ sll $t4,$s3,0x2
|
||||
/* f0e5bb0: 4600440d */ trunc.w.s $f16,$f8
|
||||
/* f0e5bb4: 440e8000 */ mfc1 $t6,$f16
|
||||
/* f0e5bb8: 00000000 */ nop
|
||||
/* f0e5bbc: a44e0028 */ sh $t6,0x28($v0)
|
||||
/* f0e5bc0: c7aa00b8 */ lwc1 $f10,0xb8($sp)
|
||||
/* f0e5bc4: 46065480 */ add.s $f18,$f10,$f6
|
||||
/* f0e5bc8: 4604b282 */ mul.s $f10,$f22,$f4
|
||||
/* f0e5bcc: 4600920d */ trunc.w.s $f8,$f18
|
||||
/* f0e5bd0: 44184000 */ mfc1 $t8,$f8
|
||||
/* f0e5bd4: 00000000 */ nop
|
||||
/* f0e5bd8: a4580030 */ sh $t8,0x30($v0)
|
||||
/* f0e5bdc: c7b000bc */ lwc1 $f16,0xbc($sp)
|
||||
/* f0e5be0: 460a8180 */ add.s $f6,$f16,$f10
|
||||
/* f0e5be4: 4600348d */ trunc.w.s $f18,$f6
|
||||
/* f0e5be8: 44099000 */ mfc1 $t1,$f18
|
||||
/* f0e5bec: 00000000 */ nop
|
||||
/* f0e5bf0: a4490032 */ sh $t1,0x32($v0)
|
||||
/* f0e5bf4: c7a800c0 */ lwc1 $f8,0xc0($sp)
|
||||
/* f0e5bf8: 3c090440 */ lui $t1,0x440
|
||||
/* f0e5bfc: 3529003c */ ori $t1,$t1,0x3c
|
||||
/* f0e5c00: 4600410d */ trunc.w.s $f4,$f8
|
||||
/* f0e5c04: 440b2000 */ mfc1 $t3,$f4
|
||||
/* f0e5c08: 00000000 */ nop
|
||||
/* f0e5c0c: a44b0034 */ sh $t3,0x34($v0)
|
||||
/* f0e5c10: 06410004 */ bgez $s2,.L0f0e5c24
|
||||
/* f0e5c14: 324d0001 */ andi $t5,$s2,0x1
|
||||
/* f0e5c18: 11a00002 */ beqz $t5,.L0f0e5c24
|
||||
/* f0e5c1c: 00000000 */ nop
|
||||
/* f0e5c20: 25adfffe */ addiu $t5,$t5,-2
|
||||
.L0f0e5c24:
|
||||
/* f0e5c24: 000d7040 */ sll $t6,$t5,0x1
|
||||
/* f0e5c28: 018e1821 */ addu $v1,$t4,$t6
|
||||
/* f0e5c2c: 00037880 */ sll $t7,$v1,0x2
|
||||
/* f0e5c30: 25e50004 */ addiu $a1,$t7,0x4
|
||||
/* f0e5c34: a04f0007 */ sb $t7,0x7($v0)
|
||||
/* f0e5c38: a0450013 */ sb $a1,0x13($v0)
|
||||
/* f0e5c3c: a085001f */ sb $a1,0x1f($a0)
|
||||
/* f0e5c40: a085002b */ sb $a1,0x2b($a0)
|
||||
/* f0e5c44: a0850037 */ sb $a1,0x37($a0)
|
||||
/* f0e5c48: 8fb80150 */ lw $t8,0x150($sp)
|
||||
/* f0e5c4c: 27190008 */ addiu $t9,$t8,0x8
|
||||
/* f0e5c50: afb90150 */ sw $t9,0x150($sp)
|
||||
/* f0e5c54: af090000 */ sw $t1,0x0($t8)
|
||||
/* f0e5c58: 0c012d20 */ jal osVirtualToPhysical
|
||||
/* f0e5c5c: afb80080 */ sw $t8,0x80($sp)
|
||||
/* f0e5c60: 8fa60080 */ lw $a2,0x80($sp)
|
||||
/* f0e5c64: 3c0db100 */ lui $t5,0xb100
|
||||
/* f0e5c68: 3c0c4030 */ lui $t4,0x4030
|
||||
/* f0e5c6c: acc20004 */ sw $v0,0x4($a2)
|
||||
/* f0e5c70: 8faa0150 */ lw $t2,0x150($sp)
|
||||
/* f0e5c74: 358c2010 */ ori $t4,$t4,0x2010
|
||||
/* f0e5c78: 35ad1432 */ ori $t5,$t5,0x1432
|
||||
/* f0e5c7c: 254b0008 */ addiu $t3,$t2,0x8
|
||||
/* f0e5c80: afab0150 */ sw $t3,0x150($sp)
|
||||
/* f0e5c84: ad4c0004 */ sw $t4,0x4($t2)
|
||||
/* f0e5c88: ad4d0000 */ sw $t5,0x0($t2)
|
||||
/* f0e5c8c: 2652ffff */ addiu $s2,$s2,-1
|
||||
.L0f0e5c90:
|
||||
/* f0e5c90: 0641ff45 */ bgez $s2,.L0f0e59a8
|
||||
/* f0e5c94: 2610fff4 */ addiu $s0,$s0,-12
|
||||
/* f0e5c98: 0fc351e7 */ jal func0f0d479c
|
||||
/* f0e5c9c: 8fa40150 */ lw $a0,0x150($sp)
|
||||
.L0f0e5ca0:
|
||||
/* f0e5ca0: 8fbf0064 */ lw $ra,0x64($sp)
|
||||
/* f0e5ca4: d7b40020 */ ldc1 $f20,0x20($sp)
|
||||
/* f0e5ca8: d7b60028 */ ldc1 $f22,0x28($sp)
|
||||
/* f0e5cac: d7b80030 */ ldc1 $f24,0x30($sp)
|
||||
/* f0e5cb0: d7ba0038 */ ldc1 $f26,0x38($sp)
|
||||
/* f0e5cb4: d7bc0040 */ ldc1 $f28,0x40($sp)
|
||||
/* f0e5cb8: d7be0048 */ ldc1 $f30,0x48($sp)
|
||||
/* f0e5cbc: 8fb00054 */ lw $s0,0x54($sp)
|
||||
/* f0e5cc0: 8fb10058 */ lw $s1,0x58($sp)
|
||||
/* f0e5cc4: 8fb2005c */ lw $s2,0x5c($sp)
|
||||
/* f0e5cc8: 8fb30060 */ lw $s3,0x60($sp)
|
||||
/* f0e5ccc: 03e00008 */ jr $ra
|
||||
/* f0e5cd0: 27bd0150 */ addiu $sp,$sp,0x150
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel func0f0e5000
|
||||
/* f0e5000: 27bdfeb0 */ addiu $sp,$sp,-336
|
||||
@@ -6013,3 +6881,4 @@ glabel func0f0e5000
|
||||
/* f0e5ccc: 03e00008 */ jr $ra
|
||||
/* f0e5cd0: 27bd0150 */ addiu $sp,$sp,0x150
|
||||
);
|
||||
#endif
|
||||
|
||||
@@ -1149,7 +1149,11 @@ void func0f0f1418(void)
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
if (g_Menus[g_MpPlayerNum].unkdfc[i].item) {
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
g_Menus[g_MpPlayerNum].unkdfc[i].unk04 += g_Vars.diffframe60freal / 60.0f;
|
||||
#else
|
||||
g_Menus[g_MpPlayerNum].unkdfc[i].unk04 += g_Vars.diffframe60f / 60.0f;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -150,13 +150,13 @@ s32 menuhandlerAimControl(s32 operation, struct menuitem *item, union handlerdat
|
||||
? g_Vars.currentplayerstats->mpindex : item->param3;
|
||||
|
||||
#if PAL
|
||||
s32 index = 0;
|
||||
|
||||
u16 options[2][2] = {
|
||||
{ L_OPTIONS_201, L_OPTIONS_202 }, // "Hold", "Toggle"
|
||||
{ L_MPWEAPONS_276, L_MPWEAPONS_277 }, // "Hold", "Toggle"
|
||||
};
|
||||
|
||||
s32 index = 0;
|
||||
|
||||
if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL && PLAYERCOUNT() >= 2) {
|
||||
index = 1;
|
||||
}
|
||||
@@ -3455,8 +3455,8 @@ void func0f105948(s32 weaponnum)
|
||||
|
||||
func0f0f372c(&g_Menus[g_MpPlayerNum].unk840, 0, 0, 0, 0, 0, 0, 1, 1);
|
||||
|
||||
g_Menus[g_MpPlayerNum].unkdb8 = 60;
|
||||
g_Menus[g_MpPlayerNum].unkdb4 = 120;
|
||||
g_Menus[g_MpPlayerNum].unkdb8 = PALDOWN(60);
|
||||
g_Menus[g_MpPlayerNum].unkdb4 = PALDOWN(120);
|
||||
g_Menus[g_MpPlayerNum].unkd8c = -0.2f;
|
||||
g_Menus[g_MpPlayerNum].unkd64 = -0.2f;
|
||||
}
|
||||
@@ -3484,8 +3484,8 @@ s32 inventoryMenuDialog(s32 operation, struct menudialog *dialog, union handlerd
|
||||
|
||||
if (g_InventoryWeapon == WEAPON_DISGUISE40 || g_InventoryWeapon == WEAPON_DISGUISE41) {
|
||||
g_Menus[g_MpPlayerNum].unk89c = 0x6a;
|
||||
g_Menus[g_MpPlayerNum].unkdb8 = 60;
|
||||
g_Menus[g_MpPlayerNum].unkdb4 = 120;
|
||||
g_Menus[g_MpPlayerNum].unkdb8 = PALDOWN(60);
|
||||
g_Menus[g_MpPlayerNum].unkdb4 = PALDOWN(120);
|
||||
}
|
||||
} else {
|
||||
var80072d88 = 255;
|
||||
|
||||
@@ -312,6 +312,123 @@ glabel func0f11080c
|
||||
/* f1109bc: 27bd0128 */ addiu $sp,$sp,0x128
|
||||
);
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel func0f1109c0
|
||||
/* f1109c0: 27bdfed0 */ addiu $sp,$sp,-304
|
||||
/* f1109c4: afb20028 */ sw $s2,0x28($sp)
|
||||
/* f1109c8: 27b2004c */ addiu $s2,$sp,0x4c
|
||||
/* f1109cc: afbf002c */ sw $ra,0x2c($sp)
|
||||
/* f1109d0: afb10024 */ sw $s1,0x24($sp)
|
||||
/* f1109d4: afb00020 */ sw $s0,0x20($sp)
|
||||
/* f1109d8: afa0012c */ sw $zero,0x12c($sp)
|
||||
/* f1109dc: 0fc35517 */ jal func0f0d545c
|
||||
/* f1109e0: 02402025 */ or $a0,$s2,$zero
|
||||
/* f1109e4: 3c10800a */ lui $s0,%hi(g_Vars)
|
||||
/* f1109e8: 26109fc0 */ addiu $s0,$s0,%lo(g_Vars)
|
||||
/* f1109ec: 8e0e047c */ lw $t6,0x47c($s0)
|
||||
/* f1109f0: 960f0480 */ lhu $t7,0x480($s0)
|
||||
/* f1109f4: 02402025 */ or $a0,$s2,$zero
|
||||
/* f1109f8: 27a50044 */ addiu $a1,$sp,0x44
|
||||
/* f1109fc: afae0044 */ sw $t6,0x44($sp)
|
||||
/* f110a00: 0fc355d7 */ jal func0f0d575c
|
||||
/* f110a04: a7af0048 */ sh $t7,0x48($sp)
|
||||
/* f110a08: 3c05800b */ lui $a1,%hi(g_MpSetup+0x89)
|
||||
/* f110a0c: 90a5cc11 */ lbu $a1,%lo(g_MpSetup+0x89)($a1)
|
||||
/* f110a10: 02402025 */ or $a0,$s2,$zero
|
||||
/* f110a14: 0fc354be */ jal savefileGetSomething
|
||||
/* f110a18: 24060001 */ addiu $a2,$zero,0x1
|
||||
/* f110a1c: 02402025 */ or $a0,$s2,$zero
|
||||
/* f110a20: 96050482 */ lhu $a1,0x482($s0)
|
||||
/* f110a24: 0fc354be */ jal savefileGetSomething
|
||||
/* f110a28: 24060004 */ addiu $a2,$zero,0x4
|
||||
/* f110a2c: 3c10800b */ lui $s0,%hi(g_MpSetup+0x28)
|
||||
/* f110a30: 3c11800b */ lui $s1,%hi(g_MpSetup+0x88)
|
||||
/* f110a34: 2631cc10 */ addiu $s1,$s1,%lo(g_MpSetup+0x88)
|
||||
/* f110a38: 2610cbb0 */ addiu $s0,$s0,%lo(g_MpSetup+0x28)
|
||||
/* f110a3c: 02402025 */ or $a0,$s2,$zero
|
||||
.L0f110a40:
|
||||
/* f110a40: 0fc35569 */ jal func0f0d55a4
|
||||
/* f110a44: 02002825 */ or $a1,$s0,$zero
|
||||
/* f110a48: 2610000c */ addiu $s0,$s0,0xc
|
||||
/* f110a4c: 0211082b */ sltu $at,$s0,$s1
|
||||
/* f110a50: 5420fffb */ bnezl $at,.L0f110a40
|
||||
/* f110a54: 02402025 */ or $a0,$s2,$zero
|
||||
/* f110a58: 3c02800b */ lui $v0,%hi(g_MpSetupSaveFile+0x64)
|
||||
/* f110a5c: 8042cc14 */ lb $v0,%lo(g_MpSetupSaveFile+0x64)($v0)
|
||||
/* f110a60: 2401ffff */ addiu $at,$zero,-1
|
||||
/* f110a64: 02402025 */ or $a0,$s2,$zero
|
||||
/* f110a68: 14410007 */ bne $v0,$at,.L0f110a88
|
||||
/* f110a6c: 00402825 */ or $a1,$v0,$zero
|
||||
/* f110a70: 02402025 */ or $a0,$s2,$zero
|
||||
/* f110a74: 240500ff */ addiu $a1,$zero,0xff
|
||||
/* f110a78: 0fc354be */ jal savefileGetSomething
|
||||
/* f110a7c: 24060008 */ addiu $a2,$zero,0x8
|
||||
/* f110a80: 10000003 */ b .L0f110a90
|
||||
/* f110a84: 00000000 */ nop
|
||||
.L0f110a88:
|
||||
/* f110a88: 0fc354be */ jal savefileGetSomething
|
||||
/* f110a8c: 24060008 */ addiu $a2,$zero,0x8
|
||||
.L0f110a90:
|
||||
/* f110a90: 3c10800b */ lui $s0,%hi(g_MpSetup+0x28)
|
||||
/* f110a94: 3c11800b */ lui $s1,%hi(g_MpSetup+0x2e)
|
||||
/* f110a98: 2631cbb6 */ addiu $s1,$s1,%lo(g_MpSetup+0x2e)
|
||||
/* f110a9c: 2610cbb0 */ addiu $s0,$s0,%lo(g_MpSetup+0x28)
|
||||
/* f110aa0: 02402025 */ or $a0,$s2,$zero
|
||||
.L0f110aa4:
|
||||
/* f110aa4: 92050065 */ lbu $a1,0x65($s0)
|
||||
/* f110aa8: 0fc354be */ jal savefileGetSomething
|
||||
/* f110aac: 24060008 */ addiu $a2,$zero,0x8
|
||||
/* f110ab0: 26100001 */ addiu $s0,$s0,0x1
|
||||
/* f110ab4: 5611fffb */ bnel $s0,$s1,.L0f110aa4
|
||||
/* f110ab8: 02402025 */ or $a0,$s2,$zero
|
||||
/* f110abc: 3c05800b */ lui $a1,%hi(g_MpSetup+0x8a)
|
||||
/* f110ac0: 90a5cc12 */ lbu $a1,%lo(g_MpSetup+0x8a)($a1)
|
||||
/* f110ac4: 02402025 */ or $a0,$s2,$zero
|
||||
/* f110ac8: 0fc354be */ jal savefileGetSomething
|
||||
/* f110acc: 24060001 */ addiu $a2,$zero,0x1
|
||||
/* f110ad0: 3c05800a */ lui $a1,%hi(var800a2328+0x3)
|
||||
/* f110ad4: 90a5232b */ lbu $a1,%lo(var800a2328+0x3)($a1)
|
||||
/* f110ad8: 02402025 */ or $a0,$s2,$zero
|
||||
/* f110adc: 0fc354be */ jal savefileGetSomething
|
||||
/* f110ae0: 24060001 */ addiu $a2,$zero,0x1
|
||||
/* f110ae4: 3c05800a */ lui $a1,%hi(g_AltTitle)
|
||||
/* f110ae8: 90a5232c */ lbu $a1,%lo(g_AltTitle)($a1)
|
||||
/* f110aec: 02402025 */ or $a0,$s2,$zero
|
||||
/* f110af0: 0fc354be */ jal savefileGetSomething
|
||||
/* f110af4: 24060001 */ addiu $a2,$zero,0x1
|
||||
/* f110af8: 0fc35531 */ jal func0f0d54c4
|
||||
/* f110afc: 02402025 */ or $a0,$s2,$zero
|
||||
/* f110b00: 0fc441c8 */ jal func0f110720
|
||||
/* f110b04: 00000000 */ nop
|
||||
/* f110b08: 14400007 */ bnez $v0,.L0f110b28
|
||||
/* f110b0c: 00408025 */ or $s0,$v0,$zero
|
||||
/* f110b10: 3c047f1b */ lui $a0,%hi(var7f1b39b0)
|
||||
/* f110b14: 3c057f1b */ lui $a1,%hi(var7f1b39bc)
|
||||
/* f110b18: 24a539bc */ addiu $a1,$a1,%lo(var7f1b39bc)
|
||||
/* f110b1c: 248439b0 */ addiu $a0,$a0,%lo(var7f1b39b0)
|
||||
/* f110b20: 0c002ff4 */ jal func0000bfd0
|
||||
/* f110b24: 24060177 */ addiu $a2,$zero,0x179
|
||||
.L0f110b28:
|
||||
/* f110b28: 24040004 */ addiu $a0,$zero,0x4
|
||||
/* f110b2c: 02002825 */ or $a1,$s0,$zero
|
||||
/* f110b30: 24060010 */ addiu $a2,$zero,0x10
|
||||
/* f110b34: 27a70050 */ addiu $a3,$sp,0x50
|
||||
/* f110b38: afa00010 */ sw $zero,0x10($sp)
|
||||
/* f110b3c: 0fc45a0a */ jal func0f116828
|
||||
/* f110b40: afa00014 */ sw $zero,0x14($sp)
|
||||
/* f110b44: 10400002 */ beqz $v0,.L0f110b50
|
||||
/* f110b48: 24180001 */ addiu $t8,$zero,0x1
|
||||
/* f110b4c: afb8012c */ sw $t8,0x12c($sp)
|
||||
.L0f110b50:
|
||||
/* f110b50: 8fbf002c */ lw $ra,0x2c($sp)
|
||||
/* f110b54: 8fb00020 */ lw $s0,0x20($sp)
|
||||
/* f110b58: 8fb10024 */ lw $s1,0x24($sp)
|
||||
/* f110b5c: 8fb20028 */ lw $s2,0x28($sp)
|
||||
/* f110b60: 03e00008 */ jr $ra
|
||||
/* f110b64: 27bd0130 */ addiu $sp,$sp,0x130
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel func0f1109c0
|
||||
/* f1109c0: 27bdfed0 */ addiu $sp,$sp,-304
|
||||
@@ -427,6 +544,7 @@ glabel func0f1109c0
|
||||
/* f110b60: 03e00008 */ jr $ra
|
||||
/* f110b64: 27bd0130 */ addiu $sp,$sp,0x130
|
||||
);
|
||||
#endif
|
||||
|
||||
void func0f110b68(void)
|
||||
{
|
||||
|
||||
@@ -9648,6 +9648,120 @@ glabel var7f1b511c
|
||||
);
|
||||
#endif
|
||||
|
||||
#if PAL
|
||||
GLOBAL_ASM(
|
||||
glabel func0f126c3c
|
||||
/* f126c3c: 27bdff90 */ addiu $sp,$sp,-112
|
||||
/* f126c40: afa7007c */ sw $a3,0x7c($sp)
|
||||
/* f126c44: 44856000 */ mtc1 $a1,$f12
|
||||
/* f126c48: 44867000 */ mtc1 $a2,$f14
|
||||
/* f126c4c: c7a4007c */ lwc1 $f4,0x7c($sp)
|
||||
/* f126c50: afbf0024 */ sw $ra,0x24($sp)
|
||||
/* f126c54: afa40070 */ sw $a0,0x70($sp)
|
||||
/* f126c58: e7ac0064 */ swc1 $f12,0x64($sp)
|
||||
/* f126c5c: e7ae0068 */ swc1 $f14,0x68($sp)
|
||||
/* f126c60: 0fc2d5be */ jal currentPlayerGetMatrix1740
|
||||
/* f126c64: e7a4006c */ swc1 $f4,0x6c($sp)
|
||||
/* f126c68: 00402025 */ or $a0,$v0,$zero
|
||||
/* f126c6c: 0c0056d9 */ jal func00015b64
|
||||
/* f126c70: 27a50064 */ addiu $a1,$sp,0x64
|
||||
/* f126c74: 0fc2d5c6 */ jal currentPlayerGetUnk1754
|
||||
/* f126c78: 00000000 */ nop
|
||||
/* f126c7c: 00402025 */ or $a0,$v0,$zero
|
||||
/* f126c80: 0c0056d9 */ jal func00015b64
|
||||
/* f126c84: 27a50064 */ addiu $a1,$sp,0x64
|
||||
/* f126c88: 3c013f80 */ lui $at,0x3f80
|
||||
/* f126c8c: 44813000 */ mtc1 $at,$f6
|
||||
/* f126c90: c7a8006c */ lwc1 $f8,0x6c($sp)
|
||||
/* f126c94: 4608303c */ c.lt.s $f6,$f8
|
||||
/* f126c98: 00000000 */ nop
|
||||
/* f126c9c: 4502004e */ bc1fl .L0f126dd8
|
||||
/* f126ca0: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
/* f126ca4: 0c002f40 */ jal viGetViewLeft
|
||||
/* f126ca8: 00000000 */ nop
|
||||
/* f126cac: 0c002f44 */ jal viGetViewTop
|
||||
/* f126cb0: a7a2005a */ sh $v0,0x5a($sp)
|
||||
/* f126cb4: 0c002f22 */ jal viGetViewWidth
|
||||
/* f126cb8: a7a20058 */ sh $v0,0x58($sp)
|
||||
/* f126cbc: 0c002f26 */ jal viGetViewHeight
|
||||
/* f126cc0: a7a20056 */ sh $v0,0x56($sp)
|
||||
/* f126cc4: 87ae0056 */ lh $t6,0x56($sp)
|
||||
/* f126cc8: c7a60064 */ lwc1 $f6,0x64($sp)
|
||||
/* f126ccc: c7a8006c */ lwc1 $f8,0x6c($sp)
|
||||
/* f126cd0: 448e5000 */ mtc1 $t6,$f10
|
||||
/* f126cd4: 87af005a */ lh $t7,0x5a($sp)
|
||||
/* f126cd8: 3c013f80 */ lui $at,0x3f80
|
||||
/* f126cdc: 468053a0 */ cvt.s.w $f14,$f10
|
||||
/* f126ce0: 448f2000 */ mtc1 $t7,$f4
|
||||
/* f126ce4: 87b80058 */ lh $t8,0x58($sp)
|
||||
/* f126ce8: 46083283 */ div.s $f10,$f6,$f8
|
||||
/* f126cec: 46802020 */ cvt.s.w $f0,$f4
|
||||
/* f126cf0: 44812000 */ mtc1 $at,$f4
|
||||
/* f126cf4: 3c013f00 */ lui $at,0x3f00
|
||||
/* f126cf8: 46045180 */ add.s $f6,$f10,$f4
|
||||
/* f126cfc: 44815000 */ mtc1 $at,$f10
|
||||
/* f126d00: 3c013f80 */ lui $at,0x3f80
|
||||
/* f126d04: 460a3102 */ mul.s $f4,$f6,$f10
|
||||
/* f126d08: 00000000 */ nop
|
||||
/* f126d0c: 460e2182 */ mul.s $f6,$f4,$f14
|
||||
/* f126d10: 44822000 */ mtc1 $v0,$f4
|
||||
/* f126d14: 00000000 */ nop
|
||||
/* f126d18: 46802420 */ cvt.s.w $f16,$f4
|
||||
/* f126d1c: c7a40068 */ lwc1 $f4,0x68($sp)
|
||||
/* f126d20: 46003280 */ add.s $f10,$f6,$f0
|
||||
/* f126d24: 44983000 */ mtc1 $t8,$f6
|
||||
/* f126d28: 00000000 */ nop
|
||||
/* f126d2c: 468030a0 */ cvt.s.w $f2,$f6
|
||||
/* f126d30: e7aa002c */ swc1 $f10,0x2c($sp)
|
||||
/* f126d34: 46002187 */ neg.s $f6,$f4
|
||||
/* f126d38: 460a003e */ c.le.s $f0,$f10
|
||||
/* f126d3c: 46083103 */ div.s $f4,$f6,$f8
|
||||
/* f126d40: 44813000 */ mtc1 $at,$f6
|
||||
/* f126d44: 3c013f00 */ lui $at,0x3f00
|
||||
/* f126d48: 46062200 */ add.s $f8,$f4,$f6
|
||||
/* f126d4c: 44812000 */ mtc1 $at,$f4
|
||||
/* f126d50: 00000000 */ nop
|
||||
/* f126d54: 46044182 */ mul.s $f6,$f8,$f4
|
||||
/* f126d58: 00000000 */ nop
|
||||
/* f126d5c: 46103202 */ mul.s $f8,$f6,$f16
|
||||
/* f126d60: 46024300 */ add.s $f12,$f8,$f2
|
||||
/* f126d64: 4500001b */ bc1f .L0f126dd4
|
||||
/* f126d68: e7ac005c */ swc1 $f12,0x5c($sp)
|
||||
/* f126d6c: 460e0100 */ add.s $f4,$f0,$f14
|
||||
/* f126d70: 4604503c */ c.lt.s $f10,$f4
|
||||
/* f126d74: 00000000 */ nop
|
||||
/* f126d78: 45020017 */ bc1fl .L0f126dd8
|
||||
/* f126d7c: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
/* f126d80: 460c103e */ c.le.s $f2,$f12
|
||||
/* f126d84: 00000000 */ nop
|
||||
/* f126d88: 45020013 */ bc1fl .L0f126dd8
|
||||
/* f126d8c: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
/* f126d90: 46101180 */ add.s $f6,$f2,$f16
|
||||
/* f126d94: 8fa40070 */ lw $a0,0x70($sp)
|
||||
/* f126d98: 8fa6005c */ lw $a2,0x5c($sp)
|
||||
/* f126d9c: 8fa70084 */ lw $a3,0x84($sp)
|
||||
/* f126da0: 4606603c */ c.lt.s $f12,$f6
|
||||
/* f126da4: c7a80080 */ lwc1 $f8,0x80($sp)
|
||||
/* f126da8: 2419005a */ addiu $t9,$zero,0x4b
|
||||
/* f126dac: 3c013f80 */ lui $at,0x3f80
|
||||
/* f126db0: 45020009 */ bc1fl .L0f126dd8
|
||||
/* f126db4: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
/* f126db8: 44055000 */ mfc1 $a1,$f10
|
||||
/* f126dbc: 44815000 */ mtc1 $at,$f10
|
||||
/* f126dc0: e7a80010 */ swc1 $f8,0x10($sp)
|
||||
/* f126dc4: afb90014 */ sw $t9,0x14($sp)
|
||||
/* f126dc8: 0fc498e1 */ jal func0f126384
|
||||
/* f126dcc: e7aa0018 */ swc1 $f10,0x18($sp)
|
||||
/* f126dd0: afa20070 */ sw $v0,0x70($sp)
|
||||
.L0f126dd4:
|
||||
/* f126dd4: 8fbf0024 */ lw $ra,0x24($sp)
|
||||
.L0f126dd8:
|
||||
/* f126dd8: 8fa20070 */ lw $v0,0x70($sp)
|
||||
/* f126ddc: 27bd0070 */ addiu $sp,$sp,0x70
|
||||
/* f126de0: 03e00008 */ jr $ra
|
||||
/* f126de4: 00000000 */ nop
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel func0f126c3c
|
||||
/* f126c3c: 27bdff90 */ addiu $sp,$sp,-112
|
||||
@@ -9760,6 +9874,7 @@ glabel func0f126c3c
|
||||
/* f126de0: 03e00008 */ jr $ra
|
||||
/* f126de4: 00000000 */ nop
|
||||
);
|
||||
#endif
|
||||
|
||||
GLOBAL_ASM(
|
||||
glabel func0f126de8
|
||||
|
||||
@@ -477,14 +477,14 @@ void playerAllocate(s32 index)
|
||||
g_Vars.players[index]->lastroomforoffset = -1;
|
||||
|
||||
g_Vars.players[index]->c_screenwidth = 320;
|
||||
g_Vars.players[index]->c_screenheight = 240;
|
||||
g_Vars.players[index]->c_screenheight = PAL ? 272 : 240;
|
||||
g_Vars.players[index]->c_screenleft = 0;
|
||||
g_Vars.players[index]->c_screentop = 0;
|
||||
g_Vars.players[index]->c_perspnear = 10;
|
||||
g_Vars.players[index]->c_perspfovy = 46;
|
||||
g_Vars.players[index]->c_perspaspect = 1;
|
||||
g_Vars.players[index]->c_halfwidth = 160;
|
||||
g_Vars.players[index]->c_halfheight = 120;
|
||||
g_Vars.players[index]->c_halfheight = PAL ? 136 : 120;
|
||||
g_Vars.players[index]->c_scalex = 1;
|
||||
g_Vars.players[index]->c_scaley = 1;
|
||||
g_Vars.players[index]->c_recipscalex = 1;
|
||||
@@ -515,7 +515,7 @@ void playerAllocate(s32 index)
|
||||
g_Vars.players[index]->screenxminf = 0;
|
||||
g_Vars.players[index]->screenyminf = 0;
|
||||
g_Vars.players[index]->screenxmaxf = 320;
|
||||
g_Vars.players[index]->screenymaxf = 240;
|
||||
g_Vars.players[index]->screenymaxf = PAL ? 272 : 240;
|
||||
|
||||
g_Vars.players[index]->gunsightoff = 0;
|
||||
g_Vars.players[index]->unk1834 = 0;
|
||||
|
||||
+10
-10
@@ -102,8 +102,8 @@ u32 var8007fbc4 = 0xffffff00;
|
||||
u32 var8007fbc8 = 0xffffff00;
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
u32 var80080130pf[4] = {0};
|
||||
u32 var8007fbd8 = 0x00000000;
|
||||
u32 var80080130pf[4] = {0};
|
||||
#else
|
||||
u32 var8007fbcc = 0x00000c0b;
|
||||
u32 var8007fbd0 = 0x00000000;
|
||||
@@ -2933,8 +2933,8 @@ glabel func0f1552d4
|
||||
/* f155314: afa500dc */ sw $a1,0xdc($sp)
|
||||
/* f155318: afa600e0 */ sw $a2,0xe0($sp)
|
||||
/* f15531c: afa000c0 */ sw $zero,0xc0($sp)
|
||||
/* f155320: 3c188008 */ lui $t8,%hi(g_LanguageId)
|
||||
/* f155324: 8f184120 */ lw $t8,%lo(g_LanguageId)($t8)
|
||||
/* f155320: 3c188008 */ lui $t8,%hi(g_Jpn)
|
||||
/* f155324: 8f184120 */ lw $t8,%lo(g_Jpn)($t8)
|
||||
/* f155328: 92af0446 */ lbu $t7,0x446($s5)
|
||||
/* f15532c: 82ae0445 */ lb $t6,0x445($s5)
|
||||
/* f155330: 4487d000 */ mtc1 $a3,$f26
|
||||
@@ -5067,8 +5067,8 @@ glabel textRenderProjected
|
||||
/* f156310: 01696021 */ addu $t4,$t3,$t1
|
||||
/* f156314: afac00e8 */ sw $t4,0xe8($sp)
|
||||
.L0f156318:
|
||||
/* f156318: 3c0d8008 */ lui $t5,%hi(g_LanguageId)
|
||||
/* f15631c: 8dad4120 */ lw $t5,%lo(g_LanguageId)($t5)
|
||||
/* f156318: 3c0d8008 */ lui $t5,%hi(g_Jpn)
|
||||
/* f15631c: 8dad4120 */ lw $t5,%lo(g_Jpn)($t5)
|
||||
/* f156320: 02a01025 */ or $v0,$s5,$zero
|
||||
/* f156324: 3c17e700 */ lui $s7,0xe700
|
||||
/* f156328: 11a00007 */ beqz $t5,.L0f156348
|
||||
@@ -6094,7 +6094,7 @@ glabel textRender
|
||||
/* f156ea0: 00a09025 */ or $s2,$a1,$zero
|
||||
/* f156ea4: 00c0a825 */ or $s5,$a2,$zero
|
||||
/* f156ea8: 24160048 */ addiu $s6,$zero,0x48
|
||||
/* f156eac: 3c188008 */ lui $t8,%hi(g_LanguageId)
|
||||
/* f156eac: 3c188008 */ lui $t8,%hi(g_Jpn)
|
||||
/* f156eb0: 0000b812 */ mflo $s7
|
||||
/* f156eb4: acb70000 */ sw $s7,0x0($a1)
|
||||
/* f156eb8: 8fab00f4 */ lw $t3,0xf4($sp)
|
||||
@@ -6108,7 +6108,7 @@ glabel textRender
|
||||
/* f156ed8: 01ae7821 */ addu $t7,$t5,$t6
|
||||
/* f156edc: afaf00f4 */ sw $t7,0xf4($sp)
|
||||
.L0f156ee0:
|
||||
/* f156ee0: 8f184120 */ lw $t8,%lo(g_LanguageId)($t8)
|
||||
/* f156ee0: 8f184120 */ lw $t8,%lo(g_Jpn)($t8)
|
||||
/* f156ee4: 3c0dba00 */ lui $t5,0xba00
|
||||
/* f156ee8: 3c0ce700 */ lui $t4,0xe700
|
||||
/* f156eec: 13000007 */ beqz $t8,.L0f156f0c
|
||||
@@ -6557,8 +6557,8 @@ glabel textMeasure
|
||||
/* f157330: 80ef0445 */ lb $t7,0x445($a3)
|
||||
/* f157334: 01cf8821 */ addu $s1,$t6,$t7
|
||||
.L0f157338:
|
||||
/* f157338: 3c188008 */ lui $t8,%hi(g_LanguageId)
|
||||
/* f15733c: 8f184120 */ lw $t8,%lo(g_LanguageId)($t8)
|
||||
/* f157338: 3c188008 */ lui $t8,%hi(g_Jpn)
|
||||
/* f15733c: 8f184120 */ lw $t8,%lo(g_Jpn)($t8)
|
||||
/* f157340: 2a21000e */ slti $at,$s1,0xe
|
||||
/* f157344: 13000004 */ beqz $t8,.L0f157358
|
||||
/* f157348: 00000000 */ nop
|
||||
@@ -6716,7 +6716,7 @@ glabel textMeasure
|
||||
//
|
||||
// // 344
|
||||
// // Force minimum height for non-English languages
|
||||
// if (g_LanguageId != LANGUAGE_NTSC_EN && lineheight < 14) {
|
||||
// if (g_Jpn && lineheight < 14) {
|
||||
// lineheight = 14;
|
||||
// }
|
||||
//
|
||||
|
||||
+11
-11
@@ -1165,7 +1165,7 @@ glabel func0f1660a4
|
||||
/* f1660f0: 3c03800a */ lui $v1,%hi(var800a6628)
|
||||
/* f1660f4: ad010000 */ sw $at,0x0($t0)
|
||||
/* f1660f8: 8f380004 */ lw $t8,0x4($t9)
|
||||
/* f1660fc: 3c01800a */ lui $at,%hi(var800a6630+0x2)
|
||||
/* f1660fc: 3c01800a */ lui $at,%hi(var800a6630)
|
||||
/* f166100: ad180004 */ sw $t8,0x4($t0)
|
||||
/* f166104: 8c636628 */ lw $v1,%lo(var800a6628)($v1)
|
||||
/* f166108: 84490002 */ lh $t1,0x2($v0)
|
||||
@@ -1193,7 +1193,7 @@ glabel func0f1660a4
|
||||
/* f166160: 4600218d */ trunc.w.s $f6,$f4
|
||||
/* f166164: 44183000 */ mfc1 $t8,$f6
|
||||
/* f166168: 00000000 */ nop
|
||||
/* f16616c: a4386634 */ sh $t8,0x6634($at)
|
||||
/* f16616c: a4386634 */ sh $t8,%lo(var800a6630+0x4)($at)
|
||||
/* f166170: 8459000c */ lh $t9,0xc($v0)
|
||||
/* f166174: 8468000c */ lh $t0,0xc($v1)
|
||||
/* f166178: 3c01800a */ lui $at,%hi(var800a663c)
|
||||
@@ -1220,7 +1220,7 @@ glabel func0f1660a4
|
||||
/* f1661cc: 4600428d */ trunc.w.s $f10,$f8
|
||||
/* f1661d0: 440f5000 */ mfc1 $t7,$f10
|
||||
/* f1661d4: 00000000 */ nop
|
||||
/* f1661d8: a42f663e */ sh $t7,0x663e($at)
|
||||
/* f1661d8: a42f663e */ sh $t7,%lo(var800a6630+0xe)($at)
|
||||
/* f1661dc: 904e0010 */ lbu $t6,0x10($v0)
|
||||
/* f1661e0: 3c014f80 */ lui $at,0x4f80
|
||||
/* f1661e4: 448e2000 */ mtc1 $t6,$f4
|
||||
@@ -1401,14 +1401,14 @@ glabel func0f1660a4
|
||||
/* f166468: 0700fffb */ bltz $t8,.L0f166458
|
||||
/* f16646c: 00000000 */ nop
|
||||
.L0f166470:
|
||||
/* f166470: 3c01800a */ lui $at,%hi(var800a6640+0x2)
|
||||
/* f166474: a0386642 */ sb $t8,%lo(var800a6640+0x2)($at)
|
||||
/* f166470: 3c01800a */ lui $at,%hi(var800a6630)
|
||||
/* f166474: a0386642 */ sb $t8,%lo(var800a6630+0x12)($at)
|
||||
/* f166478: 44cef800 */ ctc1 $t6,$31
|
||||
/* f16647c: 330f00f8 */ andi $t7,$t8,0xf8
|
||||
/* f166480: a0296640 */ sb $t1,0x6640($at)
|
||||
/* f166484: a02b6641 */ sb $t3,0x6641($at)
|
||||
/* f166480: a0296640 */ sb $t1,%lo(var800a6630+0x10)($at)
|
||||
/* f166484: a02b6641 */ sb $t3,%lo(var800a6630+0x11)($at)
|
||||
/* f166488: 0fc59663 */ jal func0f16598c
|
||||
/* f16648c: a02f6642 */ sb $t7,0x6642($at)
|
||||
/* f16648c: a02f6642 */ sb $t7,%lo(var800a6630+0x12)($at)
|
||||
/* f166490: 8fbf0014 */ lw $ra,0x14($sp)
|
||||
/* f166494: 27bd0020 */ addiu $sp,$sp,0x20
|
||||
/* f166498: 03e00008 */ jr $ra
|
||||
@@ -1425,13 +1425,13 @@ glabel func0f1664a0
|
||||
/* f1664b4: 00801025 */ or $v0,$a0,$zero
|
||||
.L0f1664b8:
|
||||
/* f1664b8: 10a0003d */ beqz $a1,.L0f1665b0
|
||||
/* f1664bc: 3c078008 */ lui $a3,%hi(g_Stages+0x34a)
|
||||
/* f1664bc: 3c078008 */ lui $a3,%hi(var80081058)
|
||||
/* f1664c0: 3c078008 */ lui $a3,%hi(var80081058)
|
||||
/* f1664c4: 00801025 */ or $v0,$a0,$zero
|
||||
/* f1664c8: 3c0ff800 */ lui $t7,0xf800
|
||||
/* f1664cc: 24e71058 */ addiu $a3,$a3,%lo(var80081058)
|
||||
/* f1664d0: ac4f0000 */ sw $t7,0x0($v0)
|
||||
/* f1664d4: 90ed000a */ lbu $t5,%lo(g_Stages+0x34a)($a3)
|
||||
/* f1664d4: 90ed000a */ lbu $t5,0xa($a3)
|
||||
/* f1664d8: 90ea0009 */ lbu $t2,0x9($a3)
|
||||
/* f1664dc: 90f90008 */ lbu $t9,0x8($a3)
|
||||
/* f1664e0: 01a07025 */ or $t6,$t5,$zero
|
||||
@@ -1493,7 +1493,7 @@ glabel func0f1664a0
|
||||
.L0f1665b0:
|
||||
/* f1665b0: 00801025 */ or $v0,$a0,$zero
|
||||
/* f1665b4: 3c08f800 */ lui $t0,0xf800
|
||||
/* f1665b8: 24e71058 */ addiu $a3,$a3,4184
|
||||
/* f1665b8: 24e71058 */ addiu $a3,$a3,%lo(var80081058)
|
||||
/* f1665bc: ac480000 */ sw $t0,0x0($v0)
|
||||
/* f1665c0: 90e9000a */ lbu $t1,0xa($a3)
|
||||
/* f1665c4: 90f80009 */ lbu $t8,0x9($a3)
|
||||
|
||||
+456
-10
@@ -1670,7 +1670,7 @@ bool func0f191638(struct chrdata *chr, bool arg1)
|
||||
}
|
||||
|
||||
if (chr->aibot->simulant->difficulty > SIMDIFF_MEAT) {
|
||||
if (chr->aibot->unk178[mpindex] >= g_Vars.lvframe60 - 240
|
||||
if (chr->aibot->unk178[mpindex] >= g_Vars.lvframe60 - PALDOWN(240)
|
||||
|| (arrayIntersects(chr->prop->rooms, target->rooms))) {
|
||||
result = true;
|
||||
}
|
||||
@@ -1809,10 +1809,10 @@ glabel var7f1b8ef0
|
||||
.L0f1919a8:
|
||||
/* f1919a8: 862202d8 */ lh $v0,0x2d8($s1)
|
||||
/* f1919ac: 18400012 */ blez $v0,.L0f1919f8
|
||||
/* f1919b0: 28411389 */ slti $at,$v0,0x1389
|
||||
/* f1919b0: 28411389 */ slti $at,$v0,0x1047
|
||||
/* f1919b4: 14200004 */ bnez $at,.L0f1919c8
|
||||
/* f1919b8: 3c19800a */ lui $t9,%hi(g_Vars+0x38)
|
||||
/* f1919bc: 24181388 */ addiu $t8,$zero,0x1388
|
||||
/* f1919bc: 24181388 */ addiu $t8,$zero,0x1046
|
||||
/* f1919c0: a63802d8 */ sh $t8,0x2d8($s1)
|
||||
/* f1919c4: 862202d8 */ lh $v0,0x2d8($s1)
|
||||
.L0f1919c8:
|
||||
@@ -1902,7 +1902,7 @@ glabel var7f1b8ef0
|
||||
/* f191b00: 24010033 */ addiu $at,$zero,0x33
|
||||
/* f191b04: 8f399fc8 */ lw $t9,%lo(g_Vars+0x8)($t9)
|
||||
/* f191b08: 8e0801e4 */ lw $t0,0x1e4($s0)
|
||||
/* f191b0c: 2729ffc4 */ addiu $t1,$t9,-60
|
||||
/* f191b0c: 2729ffc4 */ addiu $t1,$t9,-50
|
||||
/* f191b10: 0109082a */ slt $at,$t0,$t1
|
||||
/* f191b14: 5420000c */ bnezl $at,.L0f191b48
|
||||
/* f191b18: 24010033 */ addiu $at,$zero,0x33
|
||||
@@ -1923,7 +1923,7 @@ glabel var7f1b8ef0
|
||||
/* f191b4c: 3c0c800a */ lui $t4,%hi(g_Vars+0x8)
|
||||
/* f191b50: 8d8c9fc8 */ lw $t4,%lo(g_Vars+0x8)($t4)
|
||||
/* f191b54: 8e0d01e4 */ lw $t5,0x1e4($s0)
|
||||
/* f191b58: 258effc4 */ addiu $t6,$t4,-60
|
||||
/* f191b58: 258effc4 */ addiu $t6,$t4,-50
|
||||
/* f191b5c: 01ae082a */ slt $at,$t5,$t6
|
||||
/* f191b60: 14200007 */ bnez $at,.L0f191b80
|
||||
/* f191b64: 00000000 */ nop
|
||||
@@ -1978,7 +1978,7 @@ glabel var7f1b8ef0
|
||||
/* f191c10: 55000021 */ bnezl $t0,.L0f191c98
|
||||
/* f191c14: c7a40044 */ lwc1 $f4,0x44($sp)
|
||||
/* f191c18: 8d299fc8 */ lw $t1,%lo(g_Vars+0x8)($t1)
|
||||
/* f191c1c: 24010078 */ addiu $at,$zero,0x78
|
||||
/* f191c1c: 24010078 */ addiu $at,$zero,0x64
|
||||
/* f191c20: e7a20048 */ swc1 $f2,0x48($sp)
|
||||
/* f191c24: 0121001a */ div $zero,$t1,$at
|
||||
/* f191c28: 00005010 */ mfhi $t2
|
||||
@@ -3132,7 +3132,7 @@ void func0f192628(struct chrdata *chr, struct prop *arg1)
|
||||
chr->hidden |= CHRHFLAG_00000001;
|
||||
|
||||
if (obj->hidden & OBJHFLAG_AIRBORNE) {
|
||||
obj->projectile->unk0b4 = 240;
|
||||
obj->projectile->unk0b4 = PALDOWN(240);
|
||||
obj->projectile->unk108 = arg1;
|
||||
}
|
||||
}
|
||||
@@ -3174,7 +3174,7 @@ void func0f19277c(struct chrdata *chr, s32 propnum)
|
||||
chr->aibot->unk208 = 0;
|
||||
|
||||
if (chr->aibot->unk128 && chr2) {
|
||||
chr->aibot->unk2c8 = 120;
|
||||
chr->aibot->unk2c8 = PALDOWN(120);
|
||||
} else {
|
||||
chr->aibot->unk2c8 = 0;
|
||||
}
|
||||
@@ -3196,7 +3196,7 @@ void func0f19277c(struct chrdata *chr, s32 propnum)
|
||||
|
||||
if (chr->aibot->unk128 && chr2) {
|
||||
if ((chr2->hidden & CHRHFLAG_CLOAKED) == 0) {
|
||||
chr->aibot->unk2c8 = 120;
|
||||
chr->aibot->unk2c8 = PALDOWN(120);
|
||||
} else {
|
||||
if (chr->aibot->unk2c8 > 0) {
|
||||
chr->aibot->unk2c8 -= g_Vars.lvupdate240_60;
|
||||
@@ -3254,7 +3254,7 @@ void func0f192a74(struct chrdata *chr)
|
||||
|
||||
if (aibot->unk1cc <= 0) {
|
||||
aibot->unk1d0 = random();
|
||||
aibot->unk1cc = 20 + random() % (PAL ? 16 : 20);
|
||||
aibot->unk1cc = PALDOWN(20) + random() % PALDOWN(20);
|
||||
}
|
||||
|
||||
if (g_Vars.lvupdate240 > 0) {
|
||||
@@ -3358,6 +3358,451 @@ bool func0f192dc0(struct chrdata *botchr, struct chrdata *chr)
|
||||
return result;
|
||||
}
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel func0f192e90
|
||||
/* f192e90: 27bdff58 */ addiu $sp,$sp,-168
|
||||
/* f192e94: afbf002c */ sw $ra,0x2c($sp)
|
||||
/* f192e98: afb50028 */ sw $s5,0x28($sp)
|
||||
/* f192e9c: afb40024 */ sw $s4,0x24($sp)
|
||||
/* f192ea0: afb30020 */ sw $s3,0x20($sp)
|
||||
/* f192ea4: afb2001c */ sw $s2,0x1c($sp)
|
||||
/* f192ea8: afb10018 */ sw $s1,0x18($sp)
|
||||
/* f192eac: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f192eb0: 8c9302d4 */ lw $s3,0x2d4($a0)
|
||||
/* f192eb4: 240effff */ addiu $t6,$zero,-1
|
||||
/* f192eb8: a7ae006a */ sh $t6,0x6a($sp)
|
||||
/* f192ebc: 8e6f012c */ lw $t7,0x12c($s3)
|
||||
/* f192ec0: 3c19800b */ lui $t9,%hi(g_MpNumPlayers)
|
||||
/* f192ec4: 8f39c530 */ lw $t9,%lo(g_MpNumPlayers)($t9)
|
||||
/* f192ec8: 25f80001 */ addiu $t8,$t7,0x1
|
||||
/* f192ecc: 0080a825 */ or $s5,$a0,$zero
|
||||
/* f192ed0: 0319001a */ div $zero,$t8,$t9
|
||||
/* f192ed4: 00002010 */ mfhi $a0
|
||||
/* f192ed8: ae64012c */ sw $a0,0x12c($s3)
|
||||
/* f192edc: 17200002 */ bnez $t9,.L0f192ee8
|
||||
/* f192ee0: 00000000 */ nop
|
||||
/* f192ee4: 0007000d */ break 0x7
|
||||
.L0f192ee8:
|
||||
/* f192ee8: 2401ffff */ addiu $at,$zero,-1
|
||||
/* f192eec: 17210004 */ bne $t9,$at,.L0f192f00
|
||||
/* f192ef0: 3c018000 */ lui $at,0x8000
|
||||
/* f192ef4: 17010002 */ bne $t8,$at,.L0f192f00
|
||||
/* f192ef8: 00000000 */ nop
|
||||
/* f192efc: 0006000d */ break 0x6
|
||||
.L0f192f00:
|
||||
/* f192f00: 0fc63410 */ jal mpGetChrFromPlayerIndex
|
||||
/* f192f04: 00000000 */ nop
|
||||
/* f192f08: 1055002b */ beq $v0,$s5,.L0f192fb8
|
||||
/* f192f0c: 00408825 */ or $s1,$v0,$zero
|
||||
/* f192f10: 0c004b70 */ jal random
|
||||
/* f192f14: 00000000 */ nop
|
||||
/* f192f18: 24013840 */ addiu $at,$zero,0x2ee0
|
||||
/* f192f1c: 0041001b */ divu $zero,$v0,$at
|
||||
/* f192f20: 3c0d800b */ lui $t5,%hi(g_MpNumPlayers)
|
||||
/* f192f24: 3c0e800a */ lui $t6,%hi(g_Vars+0x38)
|
||||
/* f192f28: 8dce9ff8 */ lw $t6,%lo(g_Vars+0x38)($t6)
|
||||
/* f192f2c: 8dadc530 */ lw $t5,%lo(g_MpNumPlayers)($t5)
|
||||
/* f192f30: 00006010 */ mfhi $t4
|
||||
/* f192f34: 00000000 */ nop
|
||||
/* f192f38: 00000000 */ nop
|
||||
/* f192f3c: 01ae0019 */ multu $t5,$t6
|
||||
/* f192f40: 00007812 */ mflo $t7
|
||||
/* f192f44: 018f082b */ sltu $at,$t4,$t7
|
||||
/* f192f48: 50200005 */ beqzl $at,.L0f192f60
|
||||
/* f192f4c: 8e25001c */ lw $a1,0x1c($s1)
|
||||
/* f192f50: 9279009c */ lbu $t9,0x9c($s3)
|
||||
/* f192f54: 372b0010 */ ori $t3,$t9,0x10
|
||||
/* f192f58: a26b009c */ sb $t3,0x9c($s3)
|
||||
/* f192f5c: 8e25001c */ lw $a1,0x1c($s1)
|
||||
.L0f192f60:
|
||||
/* f192f60: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f192f64: 0fc1250e */ jal chrGetDistanceToCoord
|
||||
/* f192f68: 24a50008 */ addiu $a1,$a1,0x8
|
||||
/* f192f6c: 8e6d012c */ lw $t5,0x12c($s3)
|
||||
/* f192f70: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f192f74: 02202825 */ or $a1,$s1,$zero
|
||||
/* f192f78: 000d7080 */ sll $t6,$t5,0x2
|
||||
/* f192f7c: 026e6021 */ addu $t4,$s3,$t6
|
||||
/* f192f80: e580013c */ swc1 $f0,0x13c($t4)
|
||||
/* f192f84: 0fc0e48b */ jal chrCanSeeChr
|
||||
/* f192f88: 27a6006a */ addiu $a2,$sp,0x6a
|
||||
/* f192f8c: 8e6f012c */ lw $t7,0x12c($s3)
|
||||
/* f192f90: 026fc021 */ addu $t8,$s3,$t7
|
||||
/* f192f94: a302016c */ sb $v0,0x16c($t8)
|
||||
/* f192f98: 8e6b012c */ lw $t3,0x12c($s3)
|
||||
/* f192f9c: 87b9006a */ lh $t9,0x6a($sp)
|
||||
/* f192fa0: 000b6840 */ sll $t5,$t3,0x1
|
||||
/* f192fa4: 026d7021 */ addu $t6,$s3,$t5
|
||||
/* f192fa8: a5d901a8 */ sh $t9,0x1a8($t6)
|
||||
/* f192fac: 926c009c */ lbu $t4,0x9c($s3)
|
||||
/* f192fb0: 318fffef */ andi $t7,$t4,0xffef
|
||||
/* f192fb4: a26f009c */ sb $t7,0x9c($s3)
|
||||
.L0f192fb8:
|
||||
/* f192fb8: 3c07800b */ lui $a3,%hi(g_MpNumPlayers)
|
||||
/* f192fbc: 8ce7c530 */ lw $a3,%lo(g_MpNumPlayers)($a3)
|
||||
/* f192fc0: 00009025 */ or $s2,$zero,$zero
|
||||
/* f192fc4: 02608025 */ or $s0,$s3,$zero
|
||||
/* f192fc8: 18e00010 */ blez $a3,.L0f19300c
|
||||
/* f192fcc: 3c0a800a */ lui $t2,%hi(g_Vars)
|
||||
/* f192fd0: 254a9fc0 */ addiu $t2,$t2,%lo(g_Vars)
|
||||
.L0f192fd4:
|
||||
/* f192fd4: 9218016c */ lbu $t8,0x16c($s0)
|
||||
/* f192fd8: 00126880 */ sll $t5,$s2,0x2
|
||||
/* f192fdc: 53000007 */ beqzl $t8,.L0f192ffc
|
||||
/* f192fe0: 26520001 */ addiu $s2,$s2,0x1
|
||||
/* f192fe4: 8d4b0008 */ lw $t3,0x8($t2)
|
||||
/* f192fe8: 026dc821 */ addu $t9,$s3,$t5
|
||||
/* f192fec: 3c07800b */ lui $a3,%hi(g_MpNumPlayers)
|
||||
/* f192ff0: af2b0178 */ sw $t3,0x178($t9)
|
||||
/* f192ff4: 8ce7c530 */ lw $a3,%lo(g_MpNumPlayers)($a3)
|
||||
/* f192ff8: 26520001 */ addiu $s2,$s2,0x1
|
||||
.L0f192ffc:
|
||||
/* f192ffc: 0247082a */ slt $at,$s2,$a3
|
||||
/* f193000: 1420fff4 */ bnez $at,.L0f192fd4
|
||||
/* f193004: 26100001 */ addiu $s0,$s0,0x1
|
||||
/* f193008: 00009025 */ or $s2,$zero,$zero
|
||||
.L0f19300c:
|
||||
/* f19300c: 18e00008 */ blez $a3,.L0f193030
|
||||
/* f193010: 27a2006c */ addiu $v0,$sp,0x6c
|
||||
/* f193014: 00076080 */ sll $t4,$a3,0x2
|
||||
/* f193018: 01821821 */ addu $v1,$t4,$v0
|
||||
.L0f19301c:
|
||||
/* f19301c: 24420004 */ addiu $v0,$v0,0x4
|
||||
/* f193020: 0043082b */ sltu $at,$v0,$v1
|
||||
/* f193024: 1420fffd */ bnez $at,.L0f19301c
|
||||
/* f193028: ac40fffc */ sw $zero,-0x4($v0)
|
||||
/* f19302c: 00009025 */ or $s2,$zero,$zero
|
||||
.L0f193030:
|
||||
/* f193030: 18e00026 */ blez $a3,.L0f1930cc
|
||||
/* f193034: 24090001 */ addiu $t1,$zero,0x1
|
||||
/* f193038: 44801000 */ mtc1 $zero,$f2
|
||||
/* f19303c: 27a8006c */ addiu $t0,$sp,0x6c
|
||||
/* f193040: 2406ffff */ addiu $a2,$zero,-1
|
||||
.L0f193044:
|
||||
/* f193044: 46001006 */ mov.s $f0,$f2
|
||||
/* f193048: 18e00014 */ blez $a3,.L0f19309c
|
||||
/* f19304c: 00001825 */ or $v1,$zero,$zero
|
||||
/* f193050: 00002025 */ or $a0,$zero,$zero
|
||||
/* f193054: 27a5006c */ addiu $a1,$sp,0x6c
|
||||
.L0f193058:
|
||||
/* f193058: 8caf0000 */ lw $t7,0x0($a1)
|
||||
/* f19305c: 24a50004 */ addiu $a1,$a1,0x4
|
||||
/* f193060: 55e0000b */ bnezl $t7,.L0f193090
|
||||
/* f193064: 24630001 */ addiu $v1,$v1,0x1
|
||||
/* f193068: 04c00006 */ bltz $a2,.L0f193084
|
||||
/* f19306c: 02641021 */ addu $v0,$s3,$a0
|
||||
/* f193070: c444013c */ lwc1 $f4,0x13c($v0)
|
||||
/* f193074: 4600203c */ c.lt.s $f4,$f0
|
||||
/* f193078: 00000000 */ nop
|
||||
/* f19307c: 45020004 */ bc1fl .L0f193090
|
||||
/* f193080: 24630001 */ addiu $v1,$v1,0x1
|
||||
.L0f193084:
|
||||
/* f193084: 00603025 */ or $a2,$v1,$zero
|
||||
/* f193088: c440013c */ lwc1 $f0,0x13c($v0)
|
||||
/* f19308c: 24630001 */ addiu $v1,$v1,0x1
|
||||
.L0f193090:
|
||||
/* f193090: 0067082a */ slt $at,$v1,$a3
|
||||
/* f193094: 1420fff0 */ bnez $at,.L0f193058
|
||||
/* f193098: 24840004 */ addiu $a0,$a0,0x4
|
||||
.L0f19309c:
|
||||
/* f19309c: 04c00007 */ bltz $a2,.L0f1930bc
|
||||
/* f1930a0: 0272c021 */ addu $t8,$s3,$s2
|
||||
/* f1930a4: 00066880 */ sll $t5,$a2,0x2
|
||||
/* f1930a8: a3060130 */ sb $a2,0x130($t8)
|
||||
/* f1930ac: 010d5821 */ addu $t3,$t0,$t5
|
||||
/* f1930b0: ad690000 */ sw $t1,0x0($t3)
|
||||
/* f1930b4: 3c07800b */ lui $a3,%hi(g_MpNumPlayers)
|
||||
/* f1930b8: 8ce7c530 */ lw $a3,%lo(g_MpNumPlayers)($a3)
|
||||
.L0f1930bc:
|
||||
/* f1930bc: 26520001 */ addiu $s2,$s2,0x1
|
||||
/* f1930c0: 0247082a */ slt $at,$s2,$a3
|
||||
/* f1930c4: 5420ffdf */ bnezl $at,.L0f193044
|
||||
/* f1930c8: 2406ffff */ addiu $a2,$zero,-1
|
||||
.L0f1930cc:
|
||||
/* f1930cc: 0fc64a9d */ jal func0f192a74
|
||||
/* f1930d0: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f1930d4: 92a202a0 */ lbu $v0,0x2a0($s5)
|
||||
/* f1930d8: 2401002e */ addiu $at,$zero,0x2e
|
||||
/* f1930dc: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f1930e0: 54410006 */ bnel $v0,$at,.L0f1930fc
|
||||
/* f1930e4: 2401002f */ addiu $at,$zero,0x2f
|
||||
/* f1930e8: 0fc649df */ jal func0f19277c
|
||||
/* f1930ec: 2405ffff */ addiu $a1,$zero,-1
|
||||
/* f1930f0: 100000f2 */ b .L0f1934bc
|
||||
/* f1930f4: 8fbf002c */ lw $ra,0x2c($sp)
|
||||
/* f1930f8: 2401002f */ addiu $at,$zero,0x2f
|
||||
.L0f1930fc:
|
||||
/* f1930fc: 5441001f */ bnel $v0,$at,.L0f19317c
|
||||
/* f193100: 86b8017e */ lh $t8,0x17e($s5)
|
||||
/* f193104: 86620008 */ lh $v0,0x8($s3)
|
||||
/* f193108: 0440001b */ bltz $v0,.L0f193178
|
||||
/* f19310c: 0262c821 */ addu $t9,$s3,$v0
|
||||
/* f193110: 932c016c */ lbu $t4,0x16c($t9)
|
||||
/* f193114: 3c10800b */ lui $s0,%hi(g_MpPlayerChrs)
|
||||
/* f193118: 2610c4d0 */ addiu $s0,$s0,%lo(g_MpPlayerChrs)
|
||||
/* f19311c: 11800016 */ beqz $t4,.L0f193178
|
||||
/* f193120: 00027080 */ sll $t6,$v0,0x2
|
||||
/* f193124: 020e7821 */ addu $t7,$s0,$t6
|
||||
/* f193128: 0fc0e6a5 */ jal chrIsDead
|
||||
/* f19312c: 8de40000 */ lw $a0,0x0($t7)
|
||||
/* f193130: 54400012 */ bnezl $v0,.L0f19317c
|
||||
/* f193134: 86b8017e */ lh $t8,0x17e($s5)
|
||||
/* f193138: 86780008 */ lh $t8,0x8($s3)
|
||||
/* f19313c: 3c0e800a */ lui $t6,%hi(g_Vars+0x338)
|
||||
/* f193140: 8dcea2f8 */ lw $t6,%lo(g_Vars+0x338)($t6)
|
||||
/* f193144: 00186880 */ sll $t5,$t8,0x2
|
||||
/* f193148: 020d5821 */ addu $t3,$s0,$t5
|
||||
/* f19314c: 8d790000 */ lw $t9,0x0($t3)
|
||||
/* f193150: 24010048 */ addiu $at,$zero,0x48
|
||||
/* f193154: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f193158: 8f2c001c */ lw $t4,0x1c($t9)
|
||||
/* f19315c: 018e2823 */ subu $a1,$t4,$t6
|
||||
/* f193160: 00a1001a */ div $zero,$a1,$at
|
||||
/* f193164: 00002812 */ mflo $a1
|
||||
/* f193168: 0fc649df */ jal func0f19277c
|
||||
/* f19316c: 00000000 */ nop
|
||||
/* f193170: 100000d2 */ b .L0f1934bc
|
||||
/* f193174: 8fbf002c */ lw $ra,0x2c($sp)
|
||||
.L0f193178:
|
||||
/* f193178: 86b8017e */ lh $t8,0x17e($s5)
|
||||
.L0f19317c:
|
||||
/* f19317c: 2411ffff */ addiu $s1,$zero,-1
|
||||
/* f193180: 52380028 */ beql $s1,$t8,.L0f193224
|
||||
/* f193184: 86a2017e */ lh $v0,0x17e($s5)
|
||||
/* f193188: 0fc0a221 */ jal chrGetTargetProp
|
||||
/* f19318c: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f193190: 00408025 */ or $s0,$v0,$zero
|
||||
/* f193194: 0fc0e6a5 */ jal chrIsDead
|
||||
/* f193198: 8c440004 */ lw $a0,0x4($v0)
|
||||
/* f19319c: 10400002 */ beqz $v0,.L0f1931a8
|
||||
/* f1931a0: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f1931a4: a6b1017e */ sh $s1,0x17e($s5)
|
||||
.L0f1931a8:
|
||||
/* f1931a8: 8ead02d4 */ lw $t5,0x2d4($s5)
|
||||
/* f1931ac: 8dab0128 */ lw $t3,0x128($t5)
|
||||
/* f1931b0: 55600007 */ bnezl $t3,.L0f1931d0
|
||||
/* f1931b4: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f1931b8: 0fc64a53 */ jal func0f19294c
|
||||
/* f1931bc: 8e050004 */ lw $a1,0x4($s0)
|
||||
/* f1931c0: 50400003 */ beqzl $v0,.L0f1931d0
|
||||
/* f1931c4: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f1931c8: a6b1017e */ sh $s1,0x17e($s5)
|
||||
/* f1931cc: 02a02025 */ or $a0,$s5,$zero
|
||||
.L0f1931d0:
|
||||
/* f1931d0: 8e050004 */ lw $a1,0x4($s0)
|
||||
/* f1931d4: 0fc12aa3 */ jal chrCompareTeams
|
||||
/* f1931d8: 24060001 */ addiu $a2,$zero,0x1
|
||||
/* f1931dc: 10400002 */ beqz $v0,.L0f1931e8
|
||||
/* f1931e0: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f1931e4: a6b1017e */ sh $s1,0x17e($s5)
|
||||
.L0f1931e8:
|
||||
/* f1931e8: 0fc64b59 */ jal func0f192d64
|
||||
/* f1931ec: 8e050004 */ lw $a1,0x4($s0)
|
||||
/* f1931f0: 14400002 */ bnez $v0,.L0f1931fc
|
||||
/* f1931f4: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f1931f8: a6b1017e */ sh $s1,0x17e($s5)
|
||||
.L0f1931fc:
|
||||
/* f1931fc: 8eb902d4 */ lw $t9,0x2d4($s5)
|
||||
/* f193200: 8f2c0128 */ lw $t4,0x128($t9)
|
||||
/* f193204: 55800007 */ bnezl $t4,.L0f193224
|
||||
/* f193208: 86a2017e */ lh $v0,0x17e($s5)
|
||||
/* f19320c: 0fc64b70 */ jal func0f192dc0
|
||||
/* f193210: 8e050004 */ lw $a1,0x4($s0)
|
||||
/* f193214: 54400003 */ bnezl $v0,.L0f193224
|
||||
/* f193218: 86a2017e */ lh $v0,0x17e($s5)
|
||||
/* f19321c: a6b1017e */ sh $s1,0x17e($s5)
|
||||
/* f193220: 86a2017e */ lh $v0,0x17e($s5)
|
||||
.L0f193224:
|
||||
/* f193224: 3c0f800b */ lui $t7,%hi(g_MpNumPlayers)
|
||||
/* f193228: 3c0b800a */ lui $t3,%hi(g_Vars+0x338)
|
||||
/* f19322c: 16220062 */ bne $s1,$v0,.L0f1933b8
|
||||
/* f193230: 000268c0 */ sll $t5,$v0,0x3
|
||||
/* f193234: 8defc530 */ lw $t7,%lo(g_MpNumPlayers)($t7)
|
||||
/* f193238: 240effff */ addiu $t6,$zero,-1
|
||||
/* f19323c: afae0050 */ sw $t6,0x50($sp)
|
||||
/* f193240: 19e00047 */ blez $t7,.L0f193360
|
||||
/* f193244: 00009025 */ or $s2,$zero,$zero
|
||||
/* f193248: 0260a025 */ or $s4,$s3,$zero
|
||||
/* f19324c: 82900130 */ lb $s0,0x130($s4)
|
||||
.L0f193250:
|
||||
/* f193250: 0fc63410 */ jal mpGetChrFromPlayerIndex
|
||||
/* f193254: 02002025 */ or $a0,$s0,$zero
|
||||
/* f193258: 1055003a */ beq $v0,$s5,.L0f193344
|
||||
/* f19325c: 00408825 */ or $s1,$v0,$zero
|
||||
/* f193260: 0fc0e6a5 */ jal chrIsDead
|
||||
/* f193264: 00402025 */ or $a0,$v0,$zero
|
||||
/* f193268: 14400036 */ bnez $v0,.L0f193344
|
||||
/* f19326c: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f193270: 02202825 */ or $a1,$s1,$zero
|
||||
/* f193274: 0fc12aa3 */ jal chrCompareTeams
|
||||
/* f193278: 24060002 */ addiu $a2,$zero,0x2
|
||||
/* f19327c: 10400031 */ beqz $v0,.L0f193344
|
||||
/* f193280: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f193284: 0fc64b59 */ jal func0f192d64
|
||||
/* f193288: 02202825 */ or $a1,$s1,$zero
|
||||
/* f19328c: 1040002d */ beqz $v0,.L0f193344
|
||||
/* f193290: 0270c021 */ addu $t8,$s3,$s0
|
||||
/* f193294: 930d016c */ lbu $t5,0x16c($t8)
|
||||
/* f193298: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f19329c: 11a0000c */ beqz $t5,.L0f1932d0
|
||||
/* f1932a0: 3c19800a */ lui $t9,%hi(g_Vars+0x338)
|
||||
/* f1932a4: 8f39a2f8 */ lw $t9,%lo(g_Vars+0x338)($t9)
|
||||
/* f1932a8: 8e2b001c */ lw $t3,0x1c($s1)
|
||||
/* f1932ac: 24010048 */ addiu $at,$zero,0x48
|
||||
/* f1932b0: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f1932b4: 01792823 */ subu $a1,$t3,$t9
|
||||
/* f1932b8: 00a1001a */ div $zero,$a1,$at
|
||||
/* f1932bc: 00002812 */ mflo $a1
|
||||
/* f1932c0: 0fc649df */ jal func0f19277c
|
||||
/* f1932c4: 00000000 */ nop
|
||||
/* f1932c8: 1000007c */ b .L0f1934bc
|
||||
/* f1932cc: 8fbf002c */ lw $ra,0x2c($sp)
|
||||
.L0f1932d0:
|
||||
/* f1932d0: 0fc64a53 */ jal func0f19294c
|
||||
/* f1932d4: 02202825 */ or $a1,$s1,$zero
|
||||
/* f1932d8: 14400013 */ bnez $v0,.L0f193328
|
||||
/* f1932dc: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f1932e0: 8e6e0004 */ lw $t6,0x4($s3)
|
||||
/* f1932e4: 24010001 */ addiu $at,$zero,0x1
|
||||
/* f1932e8: 91c20048 */ lbu $v0,0x48($t6)
|
||||
/* f1932ec: 10400002 */ beqz $v0,.L0f1932f8
|
||||
/* f1932f0: 00000000 */ nop
|
||||
/* f1932f4: 1441000c */ bne $v0,$at,.L0f193328
|
||||
.L0f1932f8:
|
||||
/* f1932f8: 3c18800a */ lui $t8,%hi(g_Vars+0x338)
|
||||
/* f1932fc: 8f18a2f8 */ lw $t8,%lo(g_Vars+0x338)($t8)
|
||||
/* f193300: 8e2f001c */ lw $t7,0x1c($s1)
|
||||
/* f193304: 24010048 */ addiu $at,$zero,0x48
|
||||
/* f193308: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f19330c: 01f82823 */ subu $a1,$t7,$t8
|
||||
/* f193310: 00a1001a */ div $zero,$a1,$at
|
||||
/* f193314: 00002812 */ mflo $a1
|
||||
/* f193318: 0fc649df */ jal func0f19277c
|
||||
/* f19331c: 00000000 */ nop
|
||||
/* f193320: 10000066 */ b .L0f1934bc
|
||||
/* f193324: 8fbf002c */ lw $ra,0x2c($sp)
|
||||
.L0f193328:
|
||||
/* f193328: 0fc64a53 */ jal func0f19294c
|
||||
/* f19332c: 02202825 */ or $a1,$s1,$zero
|
||||
/* f193330: 14400004 */ bnez $v0,.L0f193344
|
||||
/* f193334: 8fab0050 */ lw $t3,0x50($sp)
|
||||
/* f193338: 05610002 */ bgez $t3,.L0f193344
|
||||
/* f19333c: 00000000 */ nop
|
||||
/* f193340: afb00050 */ sw $s0,0x50($sp)
|
||||
.L0f193344:
|
||||
/* f193344: 3c19800b */ lui $t9,%hi(g_MpNumPlayers)
|
||||
/* f193348: 8f39c530 */ lw $t9,%lo(g_MpNumPlayers)($t9)
|
||||
/* f19334c: 26520001 */ addiu $s2,$s2,0x1
|
||||
/* f193350: 26940001 */ addiu $s4,$s4,0x1
|
||||
/* f193354: 0259082a */ slt $at,$s2,$t9
|
||||
/* f193358: 5420ffbd */ bnezl $at,.L0f193250
|
||||
/* f19335c: 82900130 */ lb $s0,0x130($s4)
|
||||
.L0f193360:
|
||||
/* f193360: 8fac0050 */ lw $t4,0x50($sp)
|
||||
/* f193364: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f193368: 0580000f */ bltz $t4,.L0f1933a8
|
||||
/* f19336c: 00000000 */ nop
|
||||
/* f193370: 0fc63410 */ jal mpGetChrFromPlayerIndex
|
||||
/* f193374: 01802025 */ or $a0,$t4,$zero
|
||||
/* f193378: 3c0f800a */ lui $t7,%hi(g_Vars+0x338)
|
||||
/* f19337c: 8defa2f8 */ lw $t7,%lo(g_Vars+0x338)($t7)
|
||||
/* f193380: 8c4e001c */ lw $t6,0x1c($v0)
|
||||
/* f193384: 24010048 */ addiu $at,$zero,0x48
|
||||
/* f193388: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f19338c: 01cf2823 */ subu $a1,$t6,$t7
|
||||
/* f193390: 00a1001a */ div $zero,$a1,$at
|
||||
/* f193394: 00002812 */ mflo $a1
|
||||
/* f193398: 0fc649df */ jal func0f19277c
|
||||
/* f19339c: 00000000 */ nop
|
||||
/* f1933a0: 10000046 */ b .L0f1934bc
|
||||
/* f1933a4: 8fbf002c */ lw $ra,0x2c($sp)
|
||||
.L0f1933a8:
|
||||
/* f1933a8: 0fc649df */ jal func0f19277c
|
||||
/* f1933ac: 2405ffff */ addiu $a1,$zero,-1
|
||||
/* f1933b0: 10000042 */ b .L0f1934bc
|
||||
/* f1933b4: 8fbf002c */ lw $ra,0x2c($sp)
|
||||
.L0f1933b8:
|
||||
/* f1933b8: 8d6ba2f8 */ lw $t3,%lo(g_Vars+0x338)($t3)
|
||||
/* f1933bc: 01a26821 */ addu $t5,$t5,$v0
|
||||
/* f1933c0: 000d68c0 */ sll $t5,$t5,0x3
|
||||
/* f1933c4: 01abc821 */ addu $t9,$t5,$t3
|
||||
/* f1933c8: 0fc633fe */ jal mpPlayerGetIndex
|
||||
/* f1933cc: 8f240004 */ lw $a0,0x4($t9)
|
||||
/* f1933d0: 02626021 */ addu $t4,$s3,$v0
|
||||
/* f1933d4: 918e016c */ lbu $t6,0x16c($t4)
|
||||
/* f1933d8: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f1933dc: 3c0f800b */ lui $t7,%hi(g_MpNumPlayers)
|
||||
/* f1933e0: 11c00005 */ beqz $t6,.L0f1933f8
|
||||
/* f1933e4: 00000000 */ nop
|
||||
/* f1933e8: 0fc649df */ jal func0f19277c
|
||||
/* f1933ec: 86a5017e */ lh $a1,0x17e($s5)
|
||||
/* f1933f0: 10000032 */ b .L0f1934bc
|
||||
/* f1933f4: 8fbf002c */ lw $ra,0x2c($sp)
|
||||
.L0f1933f8:
|
||||
/* f1933f8: 8defc530 */ lw $t7,%lo(g_MpNumPlayers)($t7)
|
||||
/* f1933fc: 00009025 */ or $s2,$zero,$zero
|
||||
/* f193400: 02608025 */ or $s0,$s3,$zero
|
||||
/* f193404: 59e0002a */ blezl $t7,.L0f1934b0
|
||||
/* f193408: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f19340c: 82040130 */ lb $a0,0x130($s0)
|
||||
.L0f193410:
|
||||
/* f193410: 0264c021 */ addu $t8,$s3,$a0
|
||||
/* f193414: 930d016c */ lbu $t5,0x16c($t8)
|
||||
/* f193418: 11a0001d */ beqz $t5,.L0f193490
|
||||
/* f19341c: 00000000 */ nop
|
||||
/* f193420: 0fc63410 */ jal mpGetChrFromPlayerIndex
|
||||
/* f193424: 00000000 */ nop
|
||||
/* f193428: 10550019 */ beq $v0,$s5,.L0f193490
|
||||
/* f19342c: 00408825 */ or $s1,$v0,$zero
|
||||
/* f193430: 0fc0e6a5 */ jal chrIsDead
|
||||
/* f193434: 00402025 */ or $a0,$v0,$zero
|
||||
/* f193438: 14400015 */ bnez $v0,.L0f193490
|
||||
/* f19343c: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f193440: 02202825 */ or $a1,$s1,$zero
|
||||
/* f193444: 0fc12aa3 */ jal chrCompareTeams
|
||||
/* f193448: 24060002 */ addiu $a2,$zero,0x2
|
||||
/* f19344c: 10400010 */ beqz $v0,.L0f193490
|
||||
/* f193450: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f193454: 0fc64b59 */ jal func0f192d64
|
||||
/* f193458: 02202825 */ or $a1,$s1,$zero
|
||||
/* f19345c: 1040000c */ beqz $v0,.L0f193490
|
||||
/* f193460: 3c19800a */ lui $t9,%hi(g_Vars+0x338)
|
||||
/* f193464: 8f39a2f8 */ lw $t9,%lo(g_Vars+0x338)($t9)
|
||||
/* f193468: 8e2b001c */ lw $t3,0x1c($s1)
|
||||
/* f19346c: 24010048 */ addiu $at,$zero,0x48
|
||||
/* f193470: 02a02025 */ or $a0,$s5,$zero
|
||||
/* f193474: 01792823 */ subu $a1,$t3,$t9
|
||||
/* f193478: 00a1001a */ div $zero,$a1,$at
|
||||
/* f19347c: 00002812 */ mflo $a1
|
||||
/* f193480: 0fc649df */ jal func0f19277c
|
||||
/* f193484: 00000000 */ nop
|
||||
/* f193488: 1000000c */ b .L0f1934bc
|
||||
/* f19348c: 8fbf002c */ lw $ra,0x2c($sp)
|
||||
.L0f193490:
|
||||
/* f193490: 3c0e800b */ lui $t6,%hi(g_MpNumPlayers)
|
||||
/* f193494: 8dcec530 */ lw $t6,%lo(g_MpNumPlayers)($t6)
|
||||
/* f193498: 26520001 */ addiu $s2,$s2,0x1
|
||||
/* f19349c: 26100001 */ addiu $s0,$s0,0x1
|
||||
/* f1934a0: 024e082a */ slt $at,$s2,$t6
|
||||
/* f1934a4: 5420ffda */ bnezl $at,.L0f193410
|
||||
/* f1934a8: 82040130 */ lb $a0,0x130($s0)
|
||||
/* f1934ac: 02a02025 */ or $a0,$s5,$zero
|
||||
.L0f1934b0:
|
||||
/* f1934b0: 0fc649df */ jal func0f19277c
|
||||
/* f1934b4: 86a5017e */ lh $a1,0x17e($s5)
|
||||
/* f1934b8: 8fbf002c */ lw $ra,0x2c($sp)
|
||||
.L0f1934bc:
|
||||
/* f1934bc: 8fb00014 */ lw $s0,0x14($sp)
|
||||
/* f1934c0: 8fb10018 */ lw $s1,0x18($sp)
|
||||
/* f1934c4: 8fb2001c */ lw $s2,0x1c($sp)
|
||||
/* f1934c8: 8fb30020 */ lw $s3,0x20($sp)
|
||||
/* f1934cc: 8fb40024 */ lw $s4,0x24($sp)
|
||||
/* f1934d0: 8fb50028 */ lw $s5,0x28($sp)
|
||||
/* f1934d4: 03e00008 */ jr $ra
|
||||
/* f1934d8: 27bd00a8 */ addiu $sp,$sp,0xa8
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel func0f192e90
|
||||
/* f192e90: 27bdff58 */ addiu $sp,$sp,-168
|
||||
@@ -3801,6 +4246,7 @@ glabel func0f192e90
|
||||
/* f1934d4: 03e00008 */ jr $ra
|
||||
/* f1934d8: 27bd00a8 */ addiu $sp,$sp,0xa8
|
||||
);
|
||||
#endif
|
||||
|
||||
bool mpIsChrFollowedByChr(struct chrdata *leader, struct chrdata *follower)
|
||||
{
|
||||
|
||||
+13
-13
@@ -227,7 +227,7 @@ void func0f197600(struct chrdata *chr)
|
||||
if (somevalue == 0) {
|
||||
new074 = 3;
|
||||
aibot->unk050 = prop;
|
||||
aibot->unk09d = 20 + (random() % 120);
|
||||
aibot->unk09d = PALDOWN(20) + (random() % PALDOWN(120));
|
||||
} else if (aibot->unk050) {
|
||||
if (aibot->unk09d > g_Vars.lvupdate240_60) {
|
||||
aibot->unk09d -= g_Vars.lvupdate240_60;
|
||||
@@ -261,7 +261,7 @@ void func0f197600(struct chrdata *chr)
|
||||
break;
|
||||
}
|
||||
|
||||
aibot->unk0d0 = 60;
|
||||
aibot->unk0d0 = PALDOWN(60);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -784,7 +784,7 @@ void aibotScoreWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 arg3,
|
||||
score2 = 0;
|
||||
}
|
||||
} else {
|
||||
if (arg7 && chr->target != -1 && chrGetTargetProp(chr)->chr->blurdrugamount > 3500) {
|
||||
if (arg7 && chr->target != -1 && chrGetTargetProp(chr)->chr->blurdrugamount > PALDOWN(3500)) {
|
||||
score1 = 0;
|
||||
score2 = 0;
|
||||
} else {
|
||||
@@ -805,7 +805,7 @@ void aibotScoreWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 arg3,
|
||||
if (chr->aibot->simulant->difficulty <= SIMDIFF_MEAT) {
|
||||
score1 = 0;
|
||||
score2 = 0;
|
||||
} else if (bluramount > 3500 && (chr->aibot->rand % 2) == 0) {
|
||||
} else if (bluramount > PALDOWN(3500) && (chr->aibot->rand % 2) == 0) {
|
||||
score1 = chr->aibot->rand % 140 + 48;
|
||||
score2 = 188;
|
||||
} else if (chr->aibot->rand % 10 == 0) {
|
||||
@@ -816,15 +816,15 @@ void aibotScoreWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 arg3,
|
||||
score2 = 0;
|
||||
}
|
||||
} else {
|
||||
if (bluramount >= 5000) {
|
||||
if (bluramount >= PALDOWN(5000)) {
|
||||
score2 = 48;
|
||||
|
||||
if (chr->aibot->rand % 2) {
|
||||
score1 = 0;
|
||||
score2 = 0;
|
||||
}
|
||||
} else if (bluramount > 3500) {
|
||||
u32 value = (-bluramount * 16 + 80000) / 1500;
|
||||
} else if (bluramount > PALDOWN(3500)) {
|
||||
u32 value = (-bluramount * 16 + (PAL ? 66656 : 80000)) / PALDOWN(1500);
|
||||
|
||||
if (value > 15) {
|
||||
value = 15;
|
||||
@@ -861,7 +861,7 @@ void aibotScoreWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 arg3,
|
||||
f32 float2;
|
||||
|
||||
if (g_Vars.lvframe60 > 0) {
|
||||
killrate = g_Vars.totalkills * (PAL ? 3000.0f : 3600.0f) / (f32)(g_Vars.lvframe60 * g_MpNumPlayers);
|
||||
killrate = g_Vars.totalkills * PALDOWN(3600.0f) / (f32)(g_Vars.lvframe60 * g_MpNumPlayers);
|
||||
|
||||
if (killrate < 1) {
|
||||
killrate = 1;
|
||||
@@ -871,7 +871,7 @@ void aibotScoreWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 arg3,
|
||||
weaponindex = mpGetWeaponIndexByWeaponNum(weaponnum);
|
||||
|
||||
if (weaponindex >= 0) {
|
||||
float2 = ceilf(chr->aibot->equipdurations60[weaponindex][funcnum] * (1.0f / (PAL ? 3000.0f : 3600.0f)));
|
||||
float2 = ceilf(chr->aibot->equipdurations60[weaponindex][funcnum] * (1.0f / PALDOWN(3600.0f)));
|
||||
|
||||
if (float2 > 0) {
|
||||
float1 = chr->aibot->killsbygunfunc[weaponindex][funcnum];
|
||||
@@ -972,7 +972,7 @@ void aibotTickInventory(struct chrdata *chr)
|
||||
aibot->dampensuicidesttl60 -= g_Vars.lvupdate240_60;
|
||||
|
||||
if (aibot->dampensuicidesttl60 < 0) {
|
||||
aibot->dampensuicidesttl60 = SECSTOTIME60(60) + random() % SECSTOTIME60(1);
|
||||
aibot->dampensuicidesttl60 = PALDOWN(3600) + random() % PALDOWN(60);
|
||||
|
||||
for (i = 0; i < 6; i++) {
|
||||
aibot->suicidesbygunfunc[i][0] *= 0.9f;
|
||||
@@ -984,7 +984,7 @@ void aibotTickInventory(struct chrdata *chr)
|
||||
aibot->unk2a4 -= g_Vars.lvupdate240_60;
|
||||
|
||||
if (aibot->unk2a4 < 0) {
|
||||
aibot->unk2a4 = SECSTOTIME60(10) + random() % SECSTOTIME60(50);
|
||||
aibot->unk2a4 = PALDOWN(600) + random() % PALDOWN(3000);
|
||||
|
||||
for (i = 0; i < 6; i++) {
|
||||
if (aibot->simulant->difficulty == SIMDIFF_MEAT) {
|
||||
@@ -1002,7 +1002,7 @@ void aibotTickInventory(struct chrdata *chr)
|
||||
aibot->randttl60 -= g_Vars.lvupdate240_60;
|
||||
|
||||
if (aibot->randttl60 < 0) {
|
||||
aibot->randttl60 = SECSTOTIME60(2) + random() % SECSTOTIME60(10);
|
||||
aibot->randttl60 = PALDOWN(120) + random() % PALDOWN(600);
|
||||
aibot->rand = random();
|
||||
}
|
||||
|
||||
@@ -1125,7 +1125,7 @@ bool aibotSwitchToWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum)
|
||||
changingfunc = funcnum != aibot->gunfunc;
|
||||
|
||||
if (changinggun) {
|
||||
aibot->unk0cc = 60;
|
||||
aibot->unk0cc = PALDOWN(60);
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
aibot->unk0c4[i] = 0;
|
||||
|
||||
@@ -313,10 +313,10 @@ u32 aibotGetProjectileThrowInterval(u32 weapon)
|
||||
{
|
||||
switch (weapon) {
|
||||
case WEAPON_COMBATKNIFE:
|
||||
return 120;
|
||||
return PALDOWN(120);
|
||||
case WEAPON_GRENADE:
|
||||
case WEAPON_NBOMB:
|
||||
return 90;
|
||||
return PALDOWN(90);
|
||||
case WEAPON_CROSSBOW:
|
||||
case WEAPON_TRANQUILIZER:
|
||||
case WEAPON_LASER:
|
||||
@@ -324,7 +324,7 @@ u32 aibotGetProjectileThrowInterval(u32 weapon)
|
||||
case WEAPON_PROXIMITYMINE:
|
||||
case WEAPON_REMOTEMINE:
|
||||
default:
|
||||
return 60;
|
||||
return PALDOWN(60);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -704,7 +704,7 @@ glabel mpLoadConfig
|
||||
/* f19b918: afbf0014 */ sw $ra,0x14($sp)
|
||||
/* f19b91c: afa401c8 */ sw $a0,0x1c8($sp)
|
||||
/* f19b920: afa501cc */ sw $a1,0x1cc($sp)
|
||||
/* f19b924: 0fc5b9b5 */ jal langGetLanguageId
|
||||
/* f19b924: 0fc5b9b5 */ jal langGetFileNumOffset
|
||||
/* f19b928: afa601d0 */ sw $a2,0x1d0($sp)
|
||||
/* f19b92c: 3c0f8009 */ lui $t7,%hi(var800887c4)
|
||||
/* f19b930: 25ef87c4 */ addiu $t7,$t7,%lo(var800887c4)
|
||||
@@ -793,7 +793,7 @@ glabel mpLoadConfig
|
||||
// u8 buffer2[sizeof(struct mpstrings) + 40];
|
||||
// struct mpstrings *loadedstrings;
|
||||
// struct mpstrings *bank;
|
||||
// u32 language_id = langGetLanguageId();
|
||||
// u32 language_id = langGetFileNumOffset();
|
||||
// extern struct mpconfig _mpconfigsSegmentRomStart[];
|
||||
// extern struct mpstrings _mpstringsESegmentRomStart;
|
||||
// extern struct mpstrings _mpstringsJSegmentRomStart;
|
||||
|
||||
@@ -5,10 +5,6 @@
|
||||
#include "data.h"
|
||||
#include "types.h"
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
f32 g_SomePalFloat;
|
||||
#endif
|
||||
|
||||
void func0f1a78b0(void)
|
||||
{
|
||||
// empty
|
||||
|
||||
+1
-1
@@ -3602,7 +3602,7 @@ glabel hudmsgCreate
|
||||
/* f0df7a4: 240c000a */ li $t4,0xa
|
||||
/* f0df7a8: 26320020 */ addiu $s2,$s1,0x20
|
||||
/* f0df7ac: 11400010 */ beqz $t2,.PF0f0df7f0
|
||||
/* f0df7b0: 03201021 */ move $v0,$t9
|
||||
/* f0df7b0: 03201021 */ addu $v0,$t9,$zero
|
||||
/* f0df7b4: 93230000 */ lbu $v1,0x0($t9)
|
||||
/* f0df7b8: 27b00044 */ addiu $s0,$sp,0x44
|
||||
/* f0df7bc: 2406000a */ li $a2,0xa
|
||||
|
||||
+24
-17
@@ -7,18 +7,25 @@
|
||||
#include "data.h"
|
||||
#include "types.h"
|
||||
|
||||
/**
|
||||
* NTSC appears to use a boolean for Japanese support.
|
||||
* PAL ignores this mostly and introduces g_LanguageId.
|
||||
*/
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
u32 var80084660pf = 0;
|
||||
bool g_Jpn = false;
|
||||
u32 var80084664pf = 0;
|
||||
u32 var80084668pf = 0;
|
||||
u32 var8008466cpf = 0;
|
||||
#endif
|
||||
|
||||
u32 *g_LangBanks[69];
|
||||
void *var800aabb4;
|
||||
struct var800aabb8 *var800aabb8;
|
||||
|
||||
u32 g_LanguageId = 0;
|
||||
s32 g_LanguageId = LANGUAGE_NTSC_EN;
|
||||
#else
|
||||
u32 *g_LangBanks[69];
|
||||
void *var800aabb4;
|
||||
struct var800aabb8 *var800aabb8;
|
||||
bool g_Jpn = false;
|
||||
#endif
|
||||
|
||||
u16 g_LangFiles[] = {
|
||||
/* 0*/ 0,
|
||||
@@ -294,8 +301,8 @@ glabel func0f16e3fc
|
||||
/* f16e5b4: a46e0000 */ sh $t6,0x0($v1)
|
||||
/* f16e5b8: 3c0f800b */ lui $t7,%hi(var800aabb4)
|
||||
/* f16e5bc: 8defabb4 */ lw $t7,%lo(var800aabb4)($t7)
|
||||
/* f16e5c0: 3c190019 */ lui $t9,0x19
|
||||
/* f16e5c4: 27394440 */ addiu $t9,$t9,0x4440
|
||||
/* f16e5c0: 3c190019 */ lui $t9,%hi(_jpndata1)
|
||||
/* f16e5c4: 27394440 */ addiu $t9,$t9,%lo(_jpndata1)
|
||||
/* f16e5c8: 0000c012 */ mflo $t8
|
||||
/* f16e5cc: 03192821 */ addu $a1,$t8,$t9
|
||||
/* f16e5d0: afa80024 */ sw $t0,0x24($sp)
|
||||
@@ -347,8 +354,8 @@ glabel func0f16e3fc
|
||||
/* f16e684: 32191fff */ andi $t9,$s0,0x1fff
|
||||
/* f16e688: 00197043 */ sra $t6,$t9,0x1
|
||||
/* f16e68c: 01182021 */ addu $a0,$t0,$t8
|
||||
/* f16e690: 3c18001a */ lui $t8,0x1a
|
||||
/* f16e694: 2718fb40 */ addiu $t8,$t8,-1216
|
||||
/* f16e690: 3c18001a */ lui $t8,%hi(_jpndata2)
|
||||
/* f16e694: 2718fb40 */ addiu $t8,$t8,%lo(_jpndata2)
|
||||
/* f16e698: 000e79c0 */ sll $t7,$t6,0x7
|
||||
/* f16e69c: 01f82821 */ addu $a1,$t7,$t8
|
||||
/* f16e6a0: 0c003504 */ jal dmaExec
|
||||
@@ -373,25 +380,25 @@ glabel func0f16e3fc
|
||||
* NTSC only supports English, while PAL supports 4 languages and JPN has its
|
||||
* own. Each English file is followed immediately by the other translations.
|
||||
*/
|
||||
s32 langGetLanguageId(void)
|
||||
s32 langGetFileNumOffset(void)
|
||||
{
|
||||
#if PAL
|
||||
s32 ret = g_LanguageId;
|
||||
return ret + 2;
|
||||
s32 offset = g_LanguageId;
|
||||
return offset + 2;
|
||||
#else
|
||||
s32 ret = LANGUAGE_NTSC_EN;
|
||||
s32 offset = 0;
|
||||
|
||||
if (g_LanguageId != LANGUAGE_NTSC_EN) {
|
||||
ret = LANGUAGE_NTSC_JP;
|
||||
if (g_Jpn) {
|
||||
offset = 1;
|
||||
}
|
||||
|
||||
return ret;
|
||||
return offset;
|
||||
#endif
|
||||
}
|
||||
|
||||
s32 langGetFileId(s32 bank)
|
||||
{
|
||||
return g_LangFiles[bank] + langGetLanguageId();
|
||||
return g_LangFiles[bank] + langGetFileNumOffset();
|
||||
}
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
|
||||
+687
-16
@@ -21,12 +21,12 @@
|
||||
#include "data.h"
|
||||
#include "types.h"
|
||||
|
||||
u8 g_MpSelectedPlayersForStats[4];
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
u8 fill3[0x30];
|
||||
#endif
|
||||
|
||||
u8 g_MpSelectedPlayersForStats[4];
|
||||
|
||||
const char var7f1adfa0[] = "brcol";
|
||||
const char var7f1adfa8[] = "%d: ";
|
||||
const char var7f1adfb0[] = "%s";
|
||||
@@ -3231,6 +3231,7 @@ Gfx *menuRenderItemSeparator(Gfx *gdl, struct menurendercontext *context)
|
||||
|
||||
u32 var800711e8 = 0;
|
||||
|
||||
#if PAL
|
||||
GLOBAL_ASM(
|
||||
glabel menuRenderObjective
|
||||
/* f0e98ac: 27bdfed0 */ addiu $sp,$sp,-304
|
||||
@@ -3243,7 +3244,7 @@ glabel menuRenderObjective
|
||||
/* f0e98c8: afa7013c */ sw $a3,0x13c($sp)
|
||||
/* f0e98cc: 11c00002 */ beqz $t6,.L0f0e98d8
|
||||
/* f0e98d0: 00001025 */ or $v0,$zero,$zero
|
||||
/* f0e98d4: 2402000c */ addiu $v0,$zero,0xc
|
||||
/* f0e98d4: 2402000c */ addiu $v0,$zero,0x10
|
||||
.L0f0e98d8:
|
||||
/* f0e98d8: 3c047f1b */ lui $a0,%hi(var7f1adfa0)
|
||||
/* f0e98dc: 3c058007 */ lui $a1,%hi(var800711e8)
|
||||
@@ -3431,7 +3432,7 @@ glabel menuRenderObjective
|
||||
/* f0e9ba0: 27a400c0 */ addiu $a0,$sp,0xc0
|
||||
/* f0e9ba4: 27a500c4 */ addiu $a1,$sp,0xc4
|
||||
/* f0e9ba8: 11a00141 */ beqz $t5,.L0f0ea0b0
|
||||
/* f0e9bac: 3c078008 */ lui $a3,%hi(g_Stages+0x33f)
|
||||
/* f0e9bac: 3c078008 */ lui $a3,%hi(g_FontHandelGothicSm1)
|
||||
/* f0e9bb0: 0fc255a1 */ jal objectiveCheck
|
||||
/* f0e9bb4: 8fa40138 */ lw $a0,0x138($sp)
|
||||
/* f0e9bb8: 10400007 */ beqz $v0,.L0f0e9bd8
|
||||
@@ -3636,7 +3637,7 @@ glabel menuRenderObjective
|
||||
/* f0e9eb8: 8fa7005c */ lw $a3,0x5c($sp)
|
||||
/* f0e9ebc: 8fa30054 */ lw $v1,0x54($sp)
|
||||
/* f0e9ec0: 24c80001 */ addiu $t0,$a2,0x1
|
||||
/* f0e9ec4: 24e7ffff */ addiu $a3,$a3,%lo(g_Stages+0x33f)
|
||||
/* f0e9ec4: 24e7ffff */ addiu $a3,$a3,-1
|
||||
/* f0e9ec8: afa70058 */ sw $a3,0x58($sp)
|
||||
/* f0e9ecc: afa80010 */ sw $t0,0x10($sp)
|
||||
/* f0e9ed0: afa80048 */ sw $t0,0x48($sp)
|
||||
@@ -3774,7 +3775,7 @@ glabel menuRenderObjective
|
||||
/* f0ea0dc: afa90078 */ sw $t1,0x78($sp)
|
||||
/* f0ea0e0: afac0074 */ sw $t4,0x74($sp)
|
||||
/* f0ea0e4: 8fa60120 */ lw $a2,0x120($sp)
|
||||
/* f0ea0e8: 8ce7fb10 */ lw $a3,-0x4f0($a3)
|
||||
/* f0ea0e8: 8ce7fb10 */ lw $a3,%lo(g_FontHandelGothicSm1)($a3)
|
||||
/* f0ea0ec: afa00014 */ sw $zero,0x14($sp)
|
||||
/* f0ea0f0: 0fc55cbe */ jal textMeasure
|
||||
/* f0ea0f4: afab0010 */ sw $t3,0x10($sp)
|
||||
@@ -3883,6 +3884,660 @@ glabel menuRenderObjective
|
||||
/* f0ea288: 03e00008 */ jr $ra
|
||||
/* f0ea28c: 27bd0130 */ addiu $sp,$sp,0x130
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel menuRenderObjective
|
||||
/* f0e98ac: 27bdfed0 */ addiu $sp,$sp,-304
|
||||
/* f0e98b0: 8fae0154 */ lw $t6,0x154($sp)
|
||||
/* f0e98b4: afbf003c */ sw $ra,0x3c($sp)
|
||||
/* f0e98b8: afb00038 */ sw $s0,0x38($sp)
|
||||
/* f0e98bc: afa40130 */ sw $a0,0x130($sp)
|
||||
/* f0e98c0: afa50134 */ sw $a1,0x134($sp)
|
||||
/* f0e98c4: afa60138 */ sw $a2,0x138($sp)
|
||||
/* f0e98c8: afa7013c */ sw $a3,0x13c($sp)
|
||||
/* f0e98cc: 11c00002 */ beqz $t6,.L0f0e98d8
|
||||
/* f0e98d0: 00001025 */ or $v0,$zero,$zero
|
||||
/* f0e98d4: 2402000c */ addiu $v0,$zero,0xc
|
||||
.L0f0e98d8:
|
||||
/* f0e98d8: 3c047f1b */ lui $a0,%hi(var7f1adfa0)
|
||||
/* f0e98dc: 3c058007 */ lui $a1,%hi(var800711e8)
|
||||
/* f0e98e0: 24a511e8 */ addiu $a1,$a1,%lo(var800711e8)
|
||||
/* f0e98e4: 2484dfa0 */ addiu $a0,$a0,%lo(var7f1adfa0)
|
||||
/* f0e98e8: 0c0036cc */ jal func0000db30
|
||||
/* f0e98ec: afa200bc */ sw $v0,0xbc($sp)
|
||||
/* f0e98f0: 8faf0138 */ lw $t7,0x138($sp)
|
||||
/* f0e98f4: 3c04800a */ lui $a0,%hi(g_Briefing+0x2)
|
||||
/* f0e98f8: 000fc040 */ sll $t8,$t7,0x1
|
||||
/* f0e98fc: 00982021 */ addu $a0,$a0,$t8
|
||||
/* f0e9900: 0fc5b9f1 */ jal langGet
|
||||
/* f0e9904: 9484dfca */ lhu $a0,%lo(g_Briefing+0x2)($a0)
|
||||
/* f0e9908: 87b90146 */ lh $t9,0x146($sp)
|
||||
/* f0e990c: 8fa30134 */ lw $v1,0x134($sp)
|
||||
/* f0e9910: afa20120 */ sw $v0,0x120($sp)
|
||||
/* f0e9914: afb90124 */ sw $t9,0x124($sp)
|
||||
/* f0e9918: 44803000 */ mtc1 $zero,$f6
|
||||
/* f0e991c: c4640040 */ lwc1 $f4,0x40($v1)
|
||||
/* f0e9920: 4606203c */ c.lt.s $f4,$f6
|
||||
/* f0e9924: 00000000 */ nop
|
||||
/* f0e9928: 4502000b */ bc1fl .L0f0e9958
|
||||
/* f0e992c: 906c003d */ lbu $t4,0x3d($v1)
|
||||
/* f0e9930: 9069003c */ lbu $t1,0x3c($v1)
|
||||
/* f0e9934: 2410003c */ addiu $s0,$zero,0x3c
|
||||
/* f0e9938: 3c0b7f1b */ lui $t3,%hi(g_MenuColourPalettes+0x18)
|
||||
/* f0e993c: 01300019 */ multu $t1,$s0
|
||||
/* f0e9940: 00005012 */ mflo $t2
|
||||
/* f0e9944: 016a5821 */ addu $t3,$t3,$t2
|
||||
/* f0e9948: 8d6b1fc8 */ lw $t3,%lo(g_MenuColourPalettes+0x18)($t3)
|
||||
/* f0e994c: 10000012 */ b .L0f0e9998
|
||||
/* f0e9950: afab012c */ sw $t3,0x12c($sp)
|
||||
/* f0e9954: 906c003d */ lbu $t4,0x3d($v1)
|
||||
.L0f0e9958:
|
||||
/* f0e9958: 2410003c */ addiu $s0,$zero,0x3c
|
||||
/* f0e995c: 9078003c */ lbu $t8,0x3c($v1)
|
||||
/* f0e9960: 01900019 */ multu $t4,$s0
|
||||
/* f0e9964: 3c0e7f1b */ lui $t6,%hi(g_MenuColourPalettes)
|
||||
/* f0e9968: 25ce1fb0 */ addiu $t6,$t6,%lo(g_MenuColourPalettes)
|
||||
/* f0e996c: 8c660044 */ lw $a2,0x44($v1)
|
||||
/* f0e9970: 00006812 */ mflo $t5
|
||||
/* f0e9974: 01ae7821 */ addu $t7,$t5,$t6
|
||||
/* f0e9978: 8de40018 */ lw $a0,0x18($t7)
|
||||
/* f0e997c: 03100019 */ multu $t8,$s0
|
||||
/* f0e9980: 0000c812 */ mflo $t9
|
||||
/* f0e9984: 032e4821 */ addu $t1,$t9,$t6
|
||||
/* f0e9988: 0fc01a40 */ jal colourBlend
|
||||
/* f0e998c: 8d250018 */ lw $a1,0x18($t1)
|
||||
/* f0e9990: afa2012c */ sw $v0,0x12c($sp)
|
||||
/* f0e9994: 8fa30134 */ lw $v1,0x134($sp)
|
||||
.L0f0e9998:
|
||||
/* f0e9998: 8c6a000c */ lw $t2,0xc($v1)
|
||||
/* f0e999c: 8fa4012c */ lw $a0,0x12c($sp)
|
||||
/* f0e99a0: 00002825 */ or $a1,$zero,$zero
|
||||
/* f0e99a4: 5140000b */ beqzl $t2,.L0f0e99d4
|
||||
/* f0e99a8: 9078003c */ lbu $t8,0x3c($v1)
|
||||
/* f0e99ac: 0fc01a40 */ jal colourBlend
|
||||
/* f0e99b0: 2406002c */ addiu $a2,$zero,0x2c
|
||||
/* f0e99b4: 8fac012c */ lw $t4,0x12c($sp)
|
||||
/* f0e99b8: 2401ff00 */ addiu $at,$zero,-256
|
||||
/* f0e99bc: 00415824 */ and $t3,$v0,$at
|
||||
/* f0e99c0: 318d00ff */ andi $t5,$t4,0xff
|
||||
/* f0e99c4: 016d7825 */ or $t7,$t3,$t5
|
||||
/* f0e99c8: afaf012c */ sw $t7,0x12c($sp)
|
||||
/* f0e99cc: 8fa30134 */ lw $v1,0x134($sp)
|
||||
/* f0e99d0: 9078003c */ lbu $t8,0x3c($v1)
|
||||
.L0f0e99d4:
|
||||
/* f0e99d4: 3c047f1b */ lui $a0,%hi(g_MenuColourPalettes3+0x18)
|
||||
/* f0e99d8: 3c057f1b */ lui $a1,%hi(g_MenuColourPalettes2+0x18)
|
||||
/* f0e99dc: 03100019 */ multu $t8,$s0
|
||||
/* f0e99e0: 00001012 */ mflo $v0
|
||||
/* f0e99e4: 00822021 */ addu $a0,$a0,$v0
|
||||
/* f0e99e8: 00a22821 */ addu $a1,$a1,$v0
|
||||
/* f0e99ec: 8ca52130 */ lw $a1,%lo(g_MenuColourPalettes2+0x18)($a1)
|
||||
/* f0e99f0: 0fc54f8e */ jal func0f153e38
|
||||
/* f0e99f4: 8c842298 */ lw $a0,%lo(g_MenuColourPalettes3+0x18)($a0)
|
||||
/* f0e99f8: a3a000d0 */ sb $zero,0xd0($sp)
|
||||
/* f0e99fc: 0fc54d8a */ jal func0f153628
|
||||
/* f0e9a00: 8fa40130 */ lw $a0,0x130($sp)
|
||||
/* f0e9a04: 27b000d0 */ addiu $s0,$sp,0xd0
|
||||
/* f0e9a08: 3c057f1b */ lui $a1,%hi(var7f1adfa8)
|
||||
/* f0e9a0c: afa20130 */ sw $v0,0x130($sp)
|
||||
/* f0e9a10: 24a5dfa8 */ addiu $a1,$a1,%lo(var7f1adfa8)
|
||||
/* f0e9a14: 02002025 */ or $a0,$s0,$zero
|
||||
/* f0e9a18: 0c004dad */ jal sprintf
|
||||
/* f0e9a1c: 8fa6013c */ lw $a2,0x13c($sp)
|
||||
/* f0e9a20: 3c198008 */ lui $t9,%hi(g_FontHandelGothicSm2)
|
||||
/* f0e9a24: 8f39fb0c */ lw $t9,%lo(g_FontHandelGothicSm2)($t9)
|
||||
/* f0e9a28: 3c078008 */ lui $a3,%hi(g_FontHandelGothicSm1)
|
||||
/* f0e9a2c: 8ce7fb10 */ lw $a3,%lo(g_FontHandelGothicSm1)($a3)
|
||||
/* f0e9a30: 27a400c0 */ addiu $a0,$sp,0xc0
|
||||
/* f0e9a34: 27a500c4 */ addiu $a1,$sp,0xc4
|
||||
/* f0e9a38: 02003025 */ or $a2,$s0,$zero
|
||||
/* f0e9a3c: afa00014 */ sw $zero,0x14($sp)
|
||||
/* f0e9a40: 0fc55cbe */ jal textMeasure
|
||||
/* f0e9a44: afb90010 */ sw $t9,0x10($sp)
|
||||
/* f0e9a48: 87ae0142 */ lh $t6,0x142($sp)
|
||||
/* f0e9a4c: 8fa900c4 */ lw $t1,0xc4($sp)
|
||||
/* f0e9a50: 3c0b8008 */ lui $t3,%hi(g_FontHandelGothicSm1)
|
||||
/* f0e9a54: 3c0d8008 */ lui $t5,%hi(g_FontHandelGothicSm2)
|
||||
/* f0e9a58: 8dadfb0c */ lw $t5,%lo(g_FontHandelGothicSm2)($t5)
|
||||
/* f0e9a5c: 8d6bfb10 */ lw $t3,%lo(g_FontHandelGothicSm1)($t3)
|
||||
/* f0e9a60: 8faf012c */ lw $t7,0x12c($sp)
|
||||
/* f0e9a64: 87b8014a */ lh $t8,0x14a($sp)
|
||||
/* f0e9a68: 87b9014e */ lh $t9,0x14e($sp)
|
||||
/* f0e9a6c: 01c95023 */ subu $t2,$t6,$t1
|
||||
/* f0e9a70: 254c0019 */ addiu $t4,$t2,0x19
|
||||
/* f0e9a74: afac0128 */ sw $t4,0x128($sp)
|
||||
/* f0e9a78: 8fa40130 */ lw $a0,0x130($sp)
|
||||
/* f0e9a7c: 27a50128 */ addiu $a1,$sp,0x128
|
||||
/* f0e9a80: 27a60124 */ addiu $a2,$sp,0x124
|
||||
/* f0e9a84: 02003825 */ or $a3,$s0,$zero
|
||||
/* f0e9a88: afa00024 */ sw $zero,0x24($sp)
|
||||
/* f0e9a8c: afa00028 */ sw $zero,0x28($sp)
|
||||
/* f0e9a90: afad0014 */ sw $t5,0x14($sp)
|
||||
/* f0e9a94: afab0010 */ sw $t3,0x10($sp)
|
||||
/* f0e9a98: afaf0018 */ sw $t7,0x18($sp)
|
||||
/* f0e9a9c: afb8001c */ sw $t8,0x1c($sp)
|
||||
/* f0e9aa0: 0fc5580f */ jal textRenderProjected
|
||||
/* f0e9aa4: afb90020 */ sw $t9,0x20($sp)
|
||||
/* f0e9aa8: 87ae0142 */ lh $t6,0x142($sp)
|
||||
/* f0e9aac: 8faa0154 */ lw $t2,0x154($sp)
|
||||
/* f0e9ab0: afa20130 */ sw $v0,0x130($sp)
|
||||
/* f0e9ab4: 25c90019 */ addiu $t1,$t6,0x19
|
||||
/* f0e9ab8: 1140001f */ beqz $t2,.L0f0e9b38
|
||||
/* f0e9abc: afa90128 */ sw $t1,0x128($sp)
|
||||
/* f0e9ac0: 3c0c8008 */ lui $t4,%hi(g_FontHandelGothicXs2)
|
||||
/* f0e9ac4: 8d8cfb04 */ lw $t4,%lo(g_FontHandelGothicXs2)($t4)
|
||||
/* f0e9ac8: 3c078008 */ lui $a3,%hi(g_FontHandelGothicXs1)
|
||||
/* f0e9acc: 8ce7fb08 */ lw $a3,%lo(g_FontHandelGothicXs1)($a3)
|
||||
/* f0e9ad0: 24040055 */ addiu $a0,$zero,0x55
|
||||
/* f0e9ad4: 8fa50120 */ lw $a1,0x120($sp)
|
||||
/* f0e9ad8: 02003025 */ or $a2,$s0,$zero
|
||||
/* f0e9adc: 0fc55d48 */ jal textWrap
|
||||
/* f0e9ae0: afac0010 */ sw $t4,0x10($sp)
|
||||
/* f0e9ae4: 3c0b8008 */ lui $t3,%hi(g_FontHandelGothicXs1)
|
||||
/* f0e9ae8: 3c0d8008 */ lui $t5,%hi(g_FontHandelGothicXs2)
|
||||
/* f0e9aec: 8dadfb04 */ lw $t5,%lo(g_FontHandelGothicXs2)($t5)
|
||||
/* f0e9af0: 8d6bfb08 */ lw $t3,%lo(g_FontHandelGothicXs1)($t3)
|
||||
/* f0e9af4: 8faf012c */ lw $t7,0x12c($sp)
|
||||
/* f0e9af8: 87b8014a */ lh $t8,0x14a($sp)
|
||||
/* f0e9afc: 87b9014e */ lh $t9,0x14e($sp)
|
||||
/* f0e9b00: 8fa40130 */ lw $a0,0x130($sp)
|
||||
/* f0e9b04: 27a50128 */ addiu $a1,$sp,0x128
|
||||
/* f0e9b08: 27a60124 */ addiu $a2,$sp,0x124
|
||||
/* f0e9b0c: 02003825 */ or $a3,$s0,$zero
|
||||
/* f0e9b10: afa00024 */ sw $zero,0x24($sp)
|
||||
/* f0e9b14: afa00028 */ sw $zero,0x28($sp)
|
||||
/* f0e9b18: afad0014 */ sw $t5,0x14($sp)
|
||||
/* f0e9b1c: afab0010 */ sw $t3,0x10($sp)
|
||||
/* f0e9b20: afaf0018 */ sw $t7,0x18($sp)
|
||||
/* f0e9b24: afb8001c */ sw $t8,0x1c($sp)
|
||||
/* f0e9b28: 0fc5580f */ jal textRenderProjected
|
||||
/* f0e9b2c: afb90020 */ sw $t9,0x20($sp)
|
||||
/* f0e9b30: 1000001a */ b .L0f0e9b9c
|
||||
/* f0e9b34: afa20130 */ sw $v0,0x130($sp)
|
||||
.L0f0e9b38:
|
||||
/* f0e9b38: 3c057f1b */ lui $a1,%hi(var7f1adfb0)
|
||||
/* f0e9b3c: 24a5dfb0 */ addiu $a1,$a1,%lo(var7f1adfb0)
|
||||
/* f0e9b40: 02002025 */ or $a0,$s0,$zero
|
||||
/* f0e9b44: 0c004dad */ jal sprintf
|
||||
/* f0e9b48: 8fa60120 */ lw $a2,0x120($sp)
|
||||
/* f0e9b4c: 3c0e8008 */ lui $t6,%hi(g_FontHandelGothicSm1)
|
||||
/* f0e9b50: 3c098008 */ lui $t1,%hi(g_FontHandelGothicSm2)
|
||||
/* f0e9b54: 8d29fb0c */ lw $t1,%lo(g_FontHandelGothicSm2)($t1)
|
||||
/* f0e9b58: 8dcefb10 */ lw $t6,%lo(g_FontHandelGothicSm1)($t6)
|
||||
/* f0e9b5c: 8faa012c */ lw $t2,0x12c($sp)
|
||||
/* f0e9b60: 87ac014a */ lh $t4,0x14a($sp)
|
||||
/* f0e9b64: 87ab014e */ lh $t3,0x14e($sp)
|
||||
/* f0e9b68: 8fa40130 */ lw $a0,0x130($sp)
|
||||
/* f0e9b6c: 27a50128 */ addiu $a1,$sp,0x128
|
||||
/* f0e9b70: 27a60124 */ addiu $a2,$sp,0x124
|
||||
/* f0e9b74: 02003825 */ or $a3,$s0,$zero
|
||||
/* f0e9b78: afa00024 */ sw $zero,0x24($sp)
|
||||
/* f0e9b7c: afa00028 */ sw $zero,0x28($sp)
|
||||
/* f0e9b80: afa90014 */ sw $t1,0x14($sp)
|
||||
/* f0e9b84: afae0010 */ sw $t6,0x10($sp)
|
||||
/* f0e9b88: afaa0018 */ sw $t2,0x18($sp)
|
||||
/* f0e9b8c: afac001c */ sw $t4,0x1c($sp)
|
||||
/* f0e9b90: 0fc5580f */ jal textRenderProjected
|
||||
/* f0e9b94: afab0020 */ sw $t3,0x20($sp)
|
||||
/* f0e9b98: afa20130 */ sw $v0,0x130($sp)
|
||||
.L0f0e9b9c:
|
||||
/* f0e9b9c: 8fad0150 */ lw $t5,0x150($sp)
|
||||
/* f0e9ba0: 27a400c0 */ addiu $a0,$sp,0xc0
|
||||
/* f0e9ba4: 27a500c4 */ addiu $a1,$sp,0xc4
|
||||
/* f0e9ba8: 11a00141 */ beqz $t5,.L0f0ea0b0
|
||||
/* f0e9bac: 3c078008 */ lui $a3,%hi(g_FontHandelGothicSm1)
|
||||
/* f0e9bb0: 0fc255a1 */ jal objectiveCheck
|
||||
/* f0e9bb4: 8fa40138 */ lw $a0,0x138($sp)
|
||||
/* f0e9bb8: 10400007 */ beqz $v0,.L0f0e9bd8
|
||||
/* f0e9bbc: 24010001 */ addiu $at,$zero,0x1
|
||||
/* f0e9bc0: 1041000c */ beq $v0,$at,.L0f0e9bf4
|
||||
/* f0e9bc4: 24010002 */ addiu $at,$zero,0x2
|
||||
/* f0e9bc8: 10410011 */ beq $v0,$at,.L0f0e9c10
|
||||
/* f0e9bcc: 00000000 */ nop
|
||||
/* f0e9bd0: 10000015 */ b .L0f0e9c28
|
||||
/* f0e9bd4: 00000000 */ nop
|
||||
.L0f0e9bd8:
|
||||
/* f0e9bd8: 0fc5b9f1 */ jal langGet
|
||||
/* f0e9bdc: 24045601 */ addiu $a0,$zero,0x5601
|
||||
/* f0e9be0: 3c0fffff */ lui $t7,0xffff
|
||||
/* f0e9be4: 35ef00ff */ ori $t7,$t7,0xff
|
||||
/* f0e9be8: afa200cc */ sw $v0,0xcc($sp)
|
||||
/* f0e9bec: 1000000e */ b .L0f0e9c28
|
||||
/* f0e9bf0: afaf00c8 */ sw $t7,0xc8($sp)
|
||||
.L0f0e9bf4:
|
||||
/* f0e9bf4: 0fc5b9f1 */ jal langGet
|
||||
/* f0e9bf8: 24045600 */ addiu $a0,$zero,0x5600
|
||||
/* f0e9bfc: 3c1800ff */ lui $t8,0xff
|
||||
/* f0e9c00: 371800ff */ ori $t8,$t8,0xff
|
||||
/* f0e9c04: afa200cc */ sw $v0,0xcc($sp)
|
||||
/* f0e9c08: 10000007 */ b .L0f0e9c28
|
||||
/* f0e9c0c: afb800c8 */ sw $t8,0xc8($sp)
|
||||
.L0f0e9c10:
|
||||
/* f0e9c10: 0fc5b9f1 */ jal langGet
|
||||
/* f0e9c14: 24045602 */ addiu $a0,$zero,0x5602
|
||||
/* f0e9c18: 3c19ff40 */ lui $t9,0xff40
|
||||
/* f0e9c1c: 373940ff */ ori $t9,$t9,0x40ff
|
||||
/* f0e9c20: afa200cc */ sw $v0,0xcc($sp)
|
||||
/* f0e9c24: afb900c8 */ sw $t9,0xc8($sp)
|
||||
.L0f0e9c28:
|
||||
/* f0e9c28: 3c098007 */ lui $t1,%hi(g_MpPlayerNum)
|
||||
/* f0e9c2c: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1)
|
||||
/* f0e9c30: 3c0c800a */ lui $t4,%hi(g_Menus+0x4f8)
|
||||
/* f0e9c34: 8fae0134 */ lw $t6,0x134($sp)
|
||||
/* f0e9c38: 000950c0 */ sll $t2,$t1,0x3
|
||||
/* f0e9c3c: 01495023 */ subu $t2,$t2,$t1
|
||||
/* f0e9c40: 000a5080 */ sll $t2,$t2,0x2
|
||||
/* f0e9c44: 01495021 */ addu $t2,$t2,$t1
|
||||
/* f0e9c48: 000a50c0 */ sll $t2,$t2,0x3
|
||||
/* f0e9c4c: 01495023 */ subu $t2,$t2,$t1
|
||||
/* f0e9c50: 000a5100 */ sll $t2,$t2,0x4
|
||||
/* f0e9c54: 018a6021 */ addu $t4,$t4,$t2
|
||||
/* f0e9c58: 8d8ce4f8 */ lw $t4,%lo(g_Menus+0x4f8)($t4)
|
||||
/* f0e9c5c: 27a400c0 */ addiu $a0,$sp,0xc0
|
||||
/* f0e9c60: 27a500c4 */ addiu $a1,$sp,0xc4
|
||||
/* f0e9c64: 11cc0004 */ beq $t6,$t4,.L0f0e9c78
|
||||
/* f0e9c68: 3c078008 */ lui $a3,%hi(g_FontHandelGothicXs1)
|
||||
/* f0e9c6c: 3c0b7f1b */ lui $t3,%hi(g_MenuColourPalettes+0x18)
|
||||
/* f0e9c70: 8d6b1fc8 */ lw $t3,%lo(g_MenuColourPalettes+0x18)($t3)
|
||||
/* f0e9c74: afab00c8 */ sw $t3,0xc8($sp)
|
||||
.L0f0e9c78:
|
||||
/* f0e9c78: 3c0d8008 */ lui $t5,%hi(g_FontHandelGothicXs2)
|
||||
/* f0e9c7c: 8dadfb04 */ lw $t5,%lo(g_FontHandelGothicXs2)($t5)
|
||||
/* f0e9c80: 8fa600cc */ lw $a2,0xcc($sp)
|
||||
/* f0e9c84: 8ce7fb08 */ lw $a3,%lo(g_FontHandelGothicXs1)($a3)
|
||||
/* f0e9c88: afa00014 */ sw $zero,0x14($sp)
|
||||
/* f0e9c8c: 0fc55cbe */ jal textMeasure
|
||||
/* f0e9c90: afad0010 */ sw $t5,0x10($sp)
|
||||
/* f0e9c94: 3c028007 */ lui $v0,%hi(var800711e8)
|
||||
/* f0e9c98: 8c4211e8 */ lw $v0,%lo(var800711e8)($v0)
|
||||
/* f0e9c9c: 27a50128 */ addiu $a1,$sp,0x128
|
||||
/* f0e9ca0: 27a60124 */ addiu $a2,$sp,0x124
|
||||
/* f0e9ca4: 10400002 */ beqz $v0,.L0f0e9cb0
|
||||
/* f0e9ca8: 3c0c8008 */ lui $t4,%hi(g_FontHandelGothicXs1)
|
||||
/* f0e9cac: afa200c8 */ sw $v0,0xc8($sp)
|
||||
.L0f0e9cb0:
|
||||
/* f0e9cb0: 87a2014a */ lh $v0,0x14a($sp)
|
||||
/* f0e9cb4: 87af0142 */ lh $t7,0x142($sp)
|
||||
/* f0e9cb8: 8fb800c4 */ lw $t8,0xc4($sp)
|
||||
/* f0e9cbc: 87aa0146 */ lh $t2,0x146($sp)
|
||||
/* f0e9cc0: 8fae00bc */ lw $t6,0xbc($sp)
|
||||
/* f0e9cc4: 01e28021 */ addu $s0,$t7,$v0
|
||||
/* f0e9cc8: 3c0b8008 */ lui $t3,%hi(g_FontHandelGothicXs2)
|
||||
/* f0e9ccc: 8d6bfb04 */ lw $t3,%lo(g_FontHandelGothicXs2)($t3)
|
||||
/* f0e9cd0: 87af014e */ lh $t7,0x14e($sp)
|
||||
/* f0e9cd4: 8d8cfb08 */ lw $t4,%lo(g_FontHandelGothicXs1)($t4)
|
||||
/* f0e9cd8: 8fad00c8 */ lw $t5,0xc8($sp)
|
||||
/* f0e9cdc: 0218c823 */ subu $t9,$s0,$t8
|
||||
/* f0e9ce0: 014e1821 */ addu $v1,$t2,$t6
|
||||
/* f0e9ce4: 2729fff6 */ addiu $t1,$t9,-10
|
||||
/* f0e9ce8: 24630009 */ addiu $v1,$v1,0x9
|
||||
/* f0e9cec: afa90128 */ sw $t1,0x128($sp)
|
||||
/* f0e9cf0: afa30124 */ sw $v1,0x124($sp)
|
||||
/* f0e9cf4: afa30058 */ sw $v1,0x58($sp)
|
||||
/* f0e9cf8: 8fa40130 */ lw $a0,0x130($sp)
|
||||
/* f0e9cfc: 8fa700cc */ lw $a3,0xcc($sp)
|
||||
/* f0e9d00: afa00024 */ sw $zero,0x24($sp)
|
||||
/* f0e9d04: afa00028 */ sw $zero,0x28($sp)
|
||||
/* f0e9d08: afa2001c */ sw $v0,0x1c($sp)
|
||||
/* f0e9d0c: afab0014 */ sw $t3,0x14($sp)
|
||||
/* f0e9d10: afaf0020 */ sw $t7,0x20($sp)
|
||||
/* f0e9d14: afac0010 */ sw $t4,0x10($sp)
|
||||
/* f0e9d18: 0fc5580f */ jal textRenderProjected
|
||||
/* f0e9d1c: afad0018 */ sw $t5,0x18($sp)
|
||||
/* f0e9d20: 8fb800c4 */ lw $t8,0xc4($sp)
|
||||
/* f0e9d24: 8fac00c8 */ lw $t4,0xc8($sp)
|
||||
/* f0e9d28: 3c0a8008 */ lui $t2,%hi(g_FontHandelGothicXs1)
|
||||
/* f0e9d2c: 3c0e8008 */ lui $t6,%hi(g_FontHandelGothicXs2)
|
||||
/* f0e9d30: 8fa30058 */ lw $v1,0x58($sp)
|
||||
/* f0e9d34: 8dcefb04 */ lw $t6,%lo(g_FontHandelGothicXs2)($t6)
|
||||
/* f0e9d38: 8d4afb08 */ lw $t2,%lo(g_FontHandelGothicXs1)($t2)
|
||||
/* f0e9d3c: 87ad014a */ lh $t5,0x14a($sp)
|
||||
/* f0e9d40: 87af014e */ lh $t7,0x14e($sp)
|
||||
/* f0e9d44: 2401ff7f */ addiu $at,$zero,-129
|
||||
/* f0e9d48: 0218c823 */ subu $t9,$s0,$t8
|
||||
/* f0e9d4c: 2729fff6 */ addiu $t1,$t9,-10
|
||||
/* f0e9d50: 01815824 */ and $t3,$t4,$at
|
||||
/* f0e9d54: afa90128 */ sw $t1,0x128($sp)
|
||||
/* f0e9d58: afab0018 */ sw $t3,0x18($sp)
|
||||
/* f0e9d5c: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e9d60: 27a50128 */ addiu $a1,$sp,0x128
|
||||
/* f0e9d64: 27a60124 */ addiu $a2,$sp,0x124
|
||||
/* f0e9d68: 8fa700cc */ lw $a3,0xcc($sp)
|
||||
/* f0e9d6c: afa00024 */ sw $zero,0x24($sp)
|
||||
/* f0e9d70: afa00028 */ sw $zero,0x28($sp)
|
||||
/* f0e9d74: afa30124 */ sw $v1,0x124($sp)
|
||||
/* f0e9d78: afae0014 */ sw $t6,0x14($sp)
|
||||
/* f0e9d7c: afaa0010 */ sw $t2,0x10($sp)
|
||||
/* f0e9d80: afad001c */ sw $t5,0x1c($sp)
|
||||
/* f0e9d84: 0fc5580f */ jal textRenderProjected
|
||||
/* f0e9d88: afaf0020 */ sw $t7,0x20($sp)
|
||||
/* f0e9d8c: 8fb800c4 */ lw $t8,0xc4($sp)
|
||||
/* f0e9d90: 87b90146 */ lh $t9,0x146($sp)
|
||||
/* f0e9d94: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e9d98: 02183023 */ subu $a2,$s0,$t8
|
||||
/* f0e9d9c: 24c6fff3 */ addiu $a2,$a2,-13
|
||||
/* f0e9da0: 27290009 */ addiu $t1,$t9,0x9
|
||||
/* f0e9da4: afa90124 */ sw $t1,0x124($sp)
|
||||
/* f0e9da8: 0fc54de0 */ jal func0f153780
|
||||
/* f0e9dac: afa60128 */ sw $a2,0x128($sp)
|
||||
/* f0e9db0: 87a50142 */ lh $a1,0x142($sp)
|
||||
/* f0e9db4: 87ae0146 */ lh $t6,0x146($sp)
|
||||
/* f0e9db8: 8fa60128 */ lw $a2,0x128($sp)
|
||||
/* f0e9dbc: 00054880 */ sll $t1,$a1,0x2
|
||||
/* f0e9dc0: 01254823 */ subu $t1,$t1,$a1
|
||||
/* f0e9dc4: 25cb0008 */ addiu $t3,$t6,0x8
|
||||
/* f0e9dc8: 8fad0124 */ lw $t5,0x124($sp)
|
||||
/* f0e9dcc: 8faf00bc */ lw $t7,0xbc($sp)
|
||||
/* f0e9dd0: afab00ac */ sw $t3,0xac($sp)
|
||||
/* f0e9dd4: 24aa0016 */ addiu $t2,$a1,0x16
|
||||
/* f0e9dd8: 01251821 */ addu $v1,$t1,$a1
|
||||
/* f0e9ddc: 8fab013c */ lw $t3,0x13c($sp)
|
||||
/* f0e9de0: afaa00b4 */ sw $t2,0xb4($sp)
|
||||
/* f0e9de4: 24630042 */ addiu $v1,$v1,0x42
|
||||
/* f0e9de8: 25ccfffe */ addiu $t4,$t6,-2
|
||||
/* f0e9dec: afac00b0 */ sw $t4,0xb0($sp)
|
||||
/* f0e9df0: 01afc021 */ addu $t8,$t5,$t7
|
||||
/* f0e9df4: 256dffff */ addiu $t5,$t3,-1
|
||||
/* f0e9df8: 27190002 */ addiu $t9,$t8,0x2
|
||||
/* f0e9dfc: afb900a8 */ sw $t9,0xa8($sp)
|
||||
/* f0e9e00: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e9e04: afa6009c */ sw $a2,0x9c($sp)
|
||||
/* f0e9e08: 04610003 */ bgez $v1,.L0f0e9e18
|
||||
/* f0e9e0c: 00035083 */ sra $t2,$v1,0x2
|
||||
/* f0e9e10: 24610003 */ addiu $at,$v1,0x3
|
||||
/* f0e9e14: 00015083 */ sra $t2,$at,0x2
|
||||
.L0f0e9e18:
|
||||
/* f0e9e18: 00ca6023 */ subu $t4,$a2,$t2
|
||||
/* f0e9e1c: 258effe8 */ addiu $t6,$t4,-24
|
||||
/* f0e9e20: 01cd0019 */ multu $t6,$t5
|
||||
/* f0e9e24: 24010005 */ addiu $at,$zero,0x5
|
||||
/* f0e9e28: afaa005c */ sw $t2,0x5c($sp)
|
||||
/* f0e9e2c: 00007812 */ mflo $t7
|
||||
/* f0e9e30: 00000000 */ nop
|
||||
/* f0e9e34: 00000000 */ nop
|
||||
/* f0e9e38: 01e1001a */ div $zero,$t7,$at
|
||||
/* f0e9e3c: 0000c012 */ mflo $t8
|
||||
/* f0e9e40: 0158c821 */ addu $t9,$t2,$t8
|
||||
/* f0e9e44: 27290013 */ addiu $t1,$t9,0x13
|
||||
/* f0e9e48: 0fc38926 */ jal func0f0e2498
|
||||
/* f0e9e4c: afa90098 */ sw $t1,0x98($sp)
|
||||
/* f0e9e50: 8fa3012c */ lw $v1,0x12c($sp)
|
||||
/* f0e9e54: 8fa600b0 */ lw $a2,0xb0($sp)
|
||||
/* f0e9e58: 2401ff00 */ addiu $at,$zero,-256
|
||||
/* f0e9e5c: 00616024 */ and $t4,$v1,$at
|
||||
/* f0e9e60: 3590003f */ ori $s0,$t4,0x3f
|
||||
/* f0e9e64: 24ca0001 */ addiu $t2,$a2,0x1
|
||||
/* f0e9e68: afaa0010 */ sw $t2,0x10($sp)
|
||||
/* f0e9e6c: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0e9e70: 01801825 */ or $v1,$t4,$zero
|
||||
/* f0e9e74: afac0014 */ sw $t4,0x14($sp)
|
||||
/* f0e9e78: afac0054 */ sw $t4,0x54($sp)
|
||||
/* f0e9e7c: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e9e80: 87a50142 */ lh $a1,0x142($sp)
|
||||
/* f0e9e84: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0e9e88: 8fa700b4 */ lw $a3,0xb4($sp)
|
||||
/* f0e9e8c: 8fa500b4 */ lw $a1,0xb4($sp)
|
||||
/* f0e9e90: 8fab00ac */ lw $t3,0xac($sp)
|
||||
/* f0e9e94: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e9e98: 24a70001 */ addiu $a3,$a1,0x1
|
||||
/* f0e9e9c: afa7004c */ sw $a3,0x4c($sp)
|
||||
/* f0e9ea0: 8fa600b0 */ lw $a2,0xb0($sp)
|
||||
/* f0e9ea4: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f0e9ea8: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0e9eac: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0e9eb0: afab0010 */ sw $t3,0x10($sp)
|
||||
/* f0e9eb4: 8fa600ac */ lw $a2,0xac($sp)
|
||||
/* f0e9eb8: 8fa7005c */ lw $a3,0x5c($sp)
|
||||
/* f0e9ebc: 8fa30054 */ lw $v1,0x54($sp)
|
||||
/* f0e9ec0: 24c80001 */ addiu $t0,$a2,0x1
|
||||
/* f0e9ec4: 24e7ffff */ addiu $a3,$a3,-1
|
||||
/* f0e9ec8: afa70058 */ sw $a3,0x58($sp)
|
||||
/* f0e9ecc: afa80010 */ sw $t0,0x10($sp)
|
||||
/* f0e9ed0: afa80048 */ sw $t0,0x48($sp)
|
||||
/* f0e9ed4: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e9ed8: 87a50142 */ lh $a1,0x142($sp)
|
||||
/* f0e9edc: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0e9ee0: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0e9ee4: afa30014 */ sw $v1,0x14($sp)
|
||||
/* f0e9ee8: 8fa50058 */ lw $a1,0x58($sp)
|
||||
/* f0e9eec: 8fa80048 */ lw $t0,0x48($sp)
|
||||
/* f0e9ef0: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e9ef4: 24a50003 */ addiu $a1,$a1,0x3
|
||||
/* f0e9ef8: afa50054 */ sw $a1,0x54($sp)
|
||||
/* f0e9efc: 8fa600ac */ lw $a2,0xac($sp)
|
||||
/* f0e9f00: 8fa7004c */ lw $a3,0x4c($sp)
|
||||
/* f0e9f04: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f0e9f08: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0e9f0c: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0e9f10: afa80010 */ sw $t0,0x10($sp)
|
||||
/* f0e9f14: 8fa300a8 */ lw $v1,0xa8($sp)
|
||||
/* f0e9f18: 8fa50058 */ lw $a1,0x58($sp)
|
||||
/* f0e9f1c: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e9f20: 24630002 */ addiu $v1,$v1,0x2
|
||||
/* f0e9f24: afa30010 */ sw $v1,0x10($sp)
|
||||
/* f0e9f28: afa3004c */ sw $v1,0x4c($sp)
|
||||
/* f0e9f2c: 8fa600ac */ lw $a2,0xac($sp)
|
||||
/* f0e9f30: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f0e9f34: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0e9f38: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0e9f3c: 24a70001 */ addiu $a3,$a1,0x1
|
||||
/* f0e9f40: 8fa50058 */ lw $a1,0x58($sp)
|
||||
/* f0e9f44: 8fae00a8 */ lw $t6,0xa8($sp)
|
||||
/* f0e9f48: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e9f4c: 24a50002 */ addiu $a1,$a1,0x2
|
||||
/* f0e9f50: afa50044 */ sw $a1,0x44($sp)
|
||||
/* f0e9f54: 8fa600ac */ lw $a2,0xac($sp)
|
||||
/* f0e9f58: 8fa70054 */ lw $a3,0x54($sp)
|
||||
/* f0e9f5c: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f0e9f60: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0e9f64: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0e9f68: afae0010 */ sw $t6,0x10($sp)
|
||||
/* f0e9f6c: 8fa600a8 */ lw $a2,0xa8($sp)
|
||||
/* f0e9f70: 8fa7005c */ lw $a3,0x5c($sp)
|
||||
/* f0e9f74: 8fa50044 */ lw $a1,0x44($sp)
|
||||
/* f0e9f78: 24c30001 */ addiu $v1,$a2,0x1
|
||||
/* f0e9f7c: 24e7000e */ addiu $a3,$a3,0xe
|
||||
/* f0e9f80: afa70054 */ sw $a3,0x54($sp)
|
||||
/* f0e9f84: afa30010 */ sw $v1,0x10($sp)
|
||||
/* f0e9f88: afa30048 */ sw $v1,0x48($sp)
|
||||
/* f0e9f8c: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e9f90: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f0e9f94: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0e9f98: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0e9f9c: 8fa300a8 */ lw $v1,0xa8($sp)
|
||||
/* f0e9fa0: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e9fa4: 8fa50058 */ lw $a1,0x58($sp)
|
||||
/* f0e9fa8: 24630003 */ addiu $v1,$v1,0x3
|
||||
/* f0e9fac: afa30010 */ sw $v1,0x10($sp)
|
||||
/* f0e9fb0: afa30044 */ sw $v1,0x44($sp)
|
||||
/* f0e9fb4: 8fa6004c */ lw $a2,0x4c($sp)
|
||||
/* f0e9fb8: 8fa70054 */ lw $a3,0x54($sp)
|
||||
/* f0e9fbc: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f0e9fc0: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0e9fc4: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0e9fc8: 8fad0048 */ lw $t5,0x48($sp)
|
||||
/* f0e9fcc: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e9fd0: 8fa50054 */ lw $a1,0x54($sp)
|
||||
/* f0e9fd4: 8fa600a8 */ lw $a2,0xa8($sp)
|
||||
/* f0e9fd8: 8fa70098 */ lw $a3,0x98($sp)
|
||||
/* f0e9fdc: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f0e9fe0: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0e9fe4: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0e9fe8: afad0010 */ sw $t5,0x10($sp)
|
||||
/* f0e9fec: 8faf0044 */ lw $t7,0x44($sp)
|
||||
/* f0e9ff0: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0e9ff4: 8fa50054 */ lw $a1,0x54($sp)
|
||||
/* f0e9ff8: 8fa6004c */ lw $a2,0x4c($sp)
|
||||
/* f0e9ffc: 8fa70098 */ lw $a3,0x98($sp)
|
||||
/* f0ea000: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f0ea004: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0ea008: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0ea00c: afaf0010 */ sw $t7,0x10($sp)
|
||||
/* f0ea010: 8fa300c8 */ lw $v1,0xc8($sp)
|
||||
/* f0ea014: 8fa50098 */ lw $a1,0x98($sp)
|
||||
/* f0ea018: 2401ff00 */ addiu $at,$zero,-256
|
||||
/* f0ea01c: 8fb90044 */ lw $t9,0x44($sp)
|
||||
/* f0ea020: 00614824 */ and $t1,$v1,$at
|
||||
/* f0ea024: 3530003f */ ori $s0,$t1,0x3f
|
||||
/* f0ea028: 24a70001 */ addiu $a3,$a1,0x1
|
||||
/* f0ea02c: afa70054 */ sw $a3,0x54($sp)
|
||||
/* f0ea030: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f0ea034: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0ea038: 01201825 */ or $v1,$t1,$zero
|
||||
/* f0ea03c: afa9005c */ sw $t1,0x5c($sp)
|
||||
/* f0ea040: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0ea044: 8fa600a8 */ lw $a2,0xa8($sp)
|
||||
/* f0ea048: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0ea04c: afb90010 */ sw $t9,0x10($sp)
|
||||
/* f0ea050: 8fa7009c */ lw $a3,0x9c($sp)
|
||||
/* f0ea054: 8faa004c */ lw $t2,0x4c($sp)
|
||||
/* f0ea058: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0ea05c: 24e7fffc */ addiu $a3,$a3,-4
|
||||
/* f0ea060: afa70050 */ sw $a3,0x50($sp)
|
||||
/* f0ea064: 8fa50054 */ lw $a1,0x54($sp)
|
||||
/* f0ea068: 8fa60048 */ lw $a2,0x48($sp)
|
||||
/* f0ea06c: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f0ea070: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0ea074: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0ea078: afaa0010 */ sw $t2,0x10($sp)
|
||||
/* f0ea07c: 8fab005c */ lw $t3,0x5c($sp)
|
||||
/* f0ea080: 8fac004c */ lw $t4,0x4c($sp)
|
||||
/* f0ea084: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0ea088: 356e00cf */ ori $t6,$t3,0xcf
|
||||
/* f0ea08c: afae0018 */ sw $t6,0x18($sp)
|
||||
/* f0ea090: 8fa50050 */ lw $a1,0x50($sp)
|
||||
/* f0ea094: 8fa60048 */ lw $a2,0x48($sp)
|
||||
/* f0ea098: 8fa7009c */ lw $a3,0x9c($sp)
|
||||
/* f0ea09c: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f0ea0a0: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0ea0a4: afac0010 */ sw $t4,0x10($sp)
|
||||
/* f0ea0a8: 10000074 */ b .L0f0ea27c
|
||||
/* f0ea0ac: afa20130 */ sw $v0,0x130($sp)
|
||||
.L0f0ea0b0:
|
||||
/* f0ea0b0: 87b80146 */ lh $t8,0x146($sp)
|
||||
/* f0ea0b4: 87ad0142 */ lh $t5,0x142($sp)
|
||||
/* f0ea0b8: 8faa0124 */ lw $t2,0x124($sp)
|
||||
/* f0ea0bc: 3c0b8008 */ lui $t3,%hi(g_FontHandelGothicSm2)
|
||||
/* f0ea0c0: 8d6bfb0c */ lw $t3,%lo(g_FontHandelGothicSm2)($t3)
|
||||
/* f0ea0c4: 2719fffe */ addiu $t9,$t8,-2
|
||||
/* f0ea0c8: 27090008 */ addiu $t1,$t8,0x8
|
||||
/* f0ea0cc: 25af0016 */ addiu $t7,$t5,0x16
|
||||
/* f0ea0d0: 254c0001 */ addiu $t4,$t2,0x1
|
||||
/* f0ea0d4: afaf0080 */ sw $t7,0x80($sp)
|
||||
/* f0ea0d8: afb9007c */ sw $t9,0x7c($sp)
|
||||
/* f0ea0dc: afa90078 */ sw $t1,0x78($sp)
|
||||
/* f0ea0e0: afac0074 */ sw $t4,0x74($sp)
|
||||
/* f0ea0e4: 8fa60120 */ lw $a2,0x120($sp)
|
||||
/* f0ea0e8: 8ce7fb10 */ lw $a3,%lo(g_FontHandelGothicSm1)($a3)
|
||||
/* f0ea0ec: afa00014 */ sw $zero,0x14($sp)
|
||||
/* f0ea0f0: 0fc55cbe */ jal textMeasure
|
||||
/* f0ea0f4: afab0010 */ sw $t3,0x10($sp)
|
||||
/* f0ea0f8: 87ae0142 */ lh $t6,0x142($sp)
|
||||
/* f0ea0fc: 8fad00c4 */ lw $t5,0xc4($sp)
|
||||
/* f0ea100: 8fa40130 */ lw $a0,0x130($sp)
|
||||
/* f0ea104: 01cd7821 */ addu $t7,$t6,$t5
|
||||
/* f0ea108: 25f90019 */ addiu $t9,$t7,0x19
|
||||
/* f0ea10c: 0fc54de0 */ jal func0f153780
|
||||
/* f0ea110: afb9006c */ sw $t9,0x6c($sp)
|
||||
/* f0ea114: 0fc38926 */ jal func0f0e2498
|
||||
/* f0ea118: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0ea11c: 8fa3012c */ lw $v1,0x12c($sp)
|
||||
/* f0ea120: 8fa6007c */ lw $a2,0x7c($sp)
|
||||
/* f0ea124: 2401ff00 */ addiu $at,$zero,-256
|
||||
/* f0ea128: 00614824 */ and $t1,$v1,$at
|
||||
/* f0ea12c: 3530003f */ ori $s0,$t1,0x3f
|
||||
/* f0ea130: 24d80001 */ addiu $t8,$a2,0x1
|
||||
/* f0ea134: afb80010 */ sw $t8,0x10($sp)
|
||||
/* f0ea138: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0ea13c: 01201825 */ or $v1,$t1,$zero
|
||||
/* f0ea140: afa90014 */ sw $t1,0x14($sp)
|
||||
/* f0ea144: afa90054 */ sw $t1,0x54($sp)
|
||||
/* f0ea148: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0ea14c: 87a50142 */ lh $a1,0x142($sp)
|
||||
/* f0ea150: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0ea154: 8fa70080 */ lw $a3,0x80($sp)
|
||||
/* f0ea158: 8fa50080 */ lw $a1,0x80($sp)
|
||||
/* f0ea15c: 8fac0078 */ lw $t4,0x78($sp)
|
||||
/* f0ea160: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0ea164: 24a70001 */ addiu $a3,$a1,0x1
|
||||
/* f0ea168: afa7005c */ sw $a3,0x5c($sp)
|
||||
/* f0ea16c: 8fa6007c */ lw $a2,0x7c($sp)
|
||||
/* f0ea170: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f0ea174: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0ea178: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0ea17c: afac0010 */ sw $t4,0x10($sp)
|
||||
/* f0ea180: 87ab0142 */ lh $t3,0x142($sp)
|
||||
/* f0ea184: 8fa60078 */ lw $a2,0x78($sp)
|
||||
/* f0ea188: 8fa30054 */ lw $v1,0x54($sp)
|
||||
/* f0ea18c: 000b7080 */ sll $t6,$t3,0x2
|
||||
/* f0ea190: 01cb7023 */ subu $t6,$t6,$t3
|
||||
/* f0ea194: 01cb3821 */ addu $a3,$t6,$t3
|
||||
/* f0ea198: 24e70042 */ addiu $a3,$a3,0x42
|
||||
/* f0ea19c: 24c80001 */ addiu $t0,$a2,0x1
|
||||
/* f0ea1a0: afa80010 */ sw $t0,0x10($sp)
|
||||
/* f0ea1a4: afa8004c */ sw $t0,0x4c($sp)
|
||||
/* f0ea1a8: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0ea1ac: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0ea1b0: 01602825 */ or $a1,$t3,$zero
|
||||
/* f0ea1b4: 04e10003 */ bgez $a3,.L0f0ea1c4
|
||||
/* f0ea1b8: 00076883 */ sra $t5,$a3,0x2
|
||||
/* f0ea1bc: 24e10003 */ addiu $at,$a3,0x3
|
||||
/* f0ea1c0: 00016883 */ sra $t5,$at,0x2
|
||||
.L0f0ea1c4:
|
||||
/* f0ea1c4: 25a7ffff */ addiu $a3,$t5,-1
|
||||
/* f0ea1c8: afa70058 */ sw $a3,0x58($sp)
|
||||
/* f0ea1cc: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0ea1d0: afa30014 */ sw $v1,0x14($sp)
|
||||
/* f0ea1d4: 8fa50058 */ lw $a1,0x58($sp)
|
||||
/* f0ea1d8: 8fa8004c */ lw $t0,0x4c($sp)
|
||||
/* f0ea1dc: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0ea1e0: 24a50003 */ addiu $a1,$a1,0x3
|
||||
/* f0ea1e4: afa50054 */ sw $a1,0x54($sp)
|
||||
/* f0ea1e8: 8fa60078 */ lw $a2,0x78($sp)
|
||||
/* f0ea1ec: 8fa7005c */ lw $a3,0x5c($sp)
|
||||
/* f0ea1f0: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f0ea1f4: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0ea1f8: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0ea1fc: afa80010 */ sw $t0,0x10($sp)
|
||||
/* f0ea200: 8faf0074 */ lw $t7,0x74($sp)
|
||||
/* f0ea204: 8fa50058 */ lw $a1,0x58($sp)
|
||||
/* f0ea208: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0ea20c: 25f90002 */ addiu $t9,$t7,0x2
|
||||
/* f0ea210: afb90010 */ sw $t9,0x10($sp)
|
||||
/* f0ea214: 8fa60078 */ lw $a2,0x78($sp)
|
||||
/* f0ea218: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f0ea21c: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0ea220: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0ea224: 24a70001 */ addiu $a3,$a1,0x1
|
||||
/* f0ea228: 8fa50058 */ lw $a1,0x58($sp)
|
||||
/* f0ea22c: 8fb80074 */ lw $t8,0x74($sp)
|
||||
/* f0ea230: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0ea234: 24a50002 */ addiu $a1,$a1,0x2
|
||||
/* f0ea238: afa50044 */ sw $a1,0x44($sp)
|
||||
/* f0ea23c: 8fa60078 */ lw $a2,0x78($sp)
|
||||
/* f0ea240: 8fa70054 */ lw $a3,0x54($sp)
|
||||
/* f0ea244: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f0ea248: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0ea24c: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0ea250: afb80010 */ sw $t8,0x10($sp)
|
||||
/* f0ea254: 8fa60074 */ lw $a2,0x74($sp)
|
||||
/* f0ea258: 8fa50044 */ lw $a1,0x44($sp)
|
||||
/* f0ea25c: 00402025 */ or $a0,$v0,$zero
|
||||
/* f0ea260: 24ca0001 */ addiu $t2,$a2,0x1
|
||||
/* f0ea264: afaa0010 */ sw $t2,0x10($sp)
|
||||
/* f0ea268: 8fa7006c */ lw $a3,0x6c($sp)
|
||||
/* f0ea26c: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f0ea270: 0fc389d1 */ jal func0f0e2744
|
||||
/* f0ea274: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f0ea278: afa20130 */ sw $v0,0x130($sp)
|
||||
.L0f0ea27c:
|
||||
/* f0ea27c: 8fbf003c */ lw $ra,0x3c($sp)
|
||||
/* f0ea280: 8fa20130 */ lw $v0,0x130($sp)
|
||||
/* f0ea284: 8fb00038 */ lw $s0,0x38($sp)
|
||||
/* f0ea288: 03e00008 */ jr $ra
|
||||
/* f0ea28c: 27bd0130 */ addiu $sp,$sp,0x130
|
||||
);
|
||||
#endif
|
||||
|
||||
Gfx *menuRenderItemObjectives(Gfx *gdl, struct menurendercontext *context)
|
||||
{
|
||||
@@ -3904,7 +4559,7 @@ Gfx *menuRenderItemObjectives(Gfx *gdl, struct menurendercontext *context)
|
||||
if (context->item->param == 0) {
|
||||
y += 18;
|
||||
} else if (context->item->param == 2) {
|
||||
y += 30;
|
||||
y += PAL ? 34 : 30;
|
||||
} else {
|
||||
y += 14;
|
||||
}
|
||||
@@ -5422,7 +6077,7 @@ bool menuTickItemSlider(struct menuitem *item, struct menuframe *frame, struct m
|
||||
f0 = data->slider.unk00 / 1000.0f;
|
||||
f0 = (f0 * 100.0f) / item->param3;
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
f0 = f0 + inputs->unk08 * g_Vars.diffframe60f;
|
||||
f0 = f0 + inputs->unk08 * g_Vars.diffframe60freal;
|
||||
#else
|
||||
f0 = f0 + inputs->unk08 * g_Vars.diffframe60;
|
||||
#endif
|
||||
@@ -5459,7 +6114,11 @@ bool menuTickItemSlider(struct menuitem *item, struct menuframe *frame, struct m
|
||||
|
||||
if (f2 > 20) {
|
||||
f2 = (f2 - 20) * 0.0625f;
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
f2 *= g_Vars.diffframe60freal;
|
||||
#else
|
||||
f2 *= g_Vars.diffframe60f;
|
||||
#endif
|
||||
|
||||
if (inputs->xaxis < 0) {
|
||||
f0 -= f2;
|
||||
@@ -6349,7 +7008,11 @@ bool menuTickItemScrollable(struct menuitem *item, struct menuframe *frame, stru
|
||||
|
||||
if (floatval > 20) {
|
||||
floatval = (floatval - 20) / 5;
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
floatval *= g_Vars.diffframe60freal;
|
||||
#else
|
||||
floatval *= g_Vars.diffframe60f;
|
||||
#endif
|
||||
|
||||
if (inputs->yaxis < 0) {
|
||||
intval = floatval;
|
||||
@@ -6358,8 +7021,8 @@ bool menuTickItemScrollable(struct menuitem *item, struct menuframe *frame, stru
|
||||
}
|
||||
}
|
||||
|
||||
#if PAL
|
||||
intval = intval + (s32)(((f32)inputs->unk09 + (f32)inputs->unk09) * g_Vars.diffframe60f);
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
intval = intval + (s32)(((f32)inputs->unk09 + (f32)inputs->unk09) * g_Vars.diffframe60freal);
|
||||
#else
|
||||
intval += inputs->unk09 * 2 * g_Vars.diffframe60;
|
||||
#endif
|
||||
@@ -7233,13 +7896,17 @@ bool menuTickItemRanking(struct menuinputs *inputs, u32 arg1, union menuitemdata
|
||||
|
||||
if (floatval > 20) {
|
||||
floatval = (floatval - 20) / 5;
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
floatval *= g_Vars.diffframe60freal;
|
||||
#else
|
||||
floatval *= g_Vars.diffframe60f;
|
||||
#endif
|
||||
|
||||
intval = inputs->yaxis < 0 ? (s32)floatval : -(s32)floatval;
|
||||
}
|
||||
|
||||
#if PAL
|
||||
intval = intval + (s32)(((f32)inputs->unk09 + (f32)inputs->unk09) * g_Vars.diffframe60f);
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
intval = intval + (s32)(((f32)inputs->unk09 + (f32)inputs->unk09) * g_Vars.diffframe60freal);
|
||||
#else
|
||||
intval += inputs->unk09 * 2 * g_Vars.diffframe60;
|
||||
#endif
|
||||
@@ -7483,13 +8150,17 @@ bool menuTickItemPlayerStats(struct menuitem *item, struct menuframe *frame, str
|
||||
|
||||
if (floatval > 20) {
|
||||
floatval = (floatval - 20) / 5;
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
floatval *= g_Vars.diffframe60freal;
|
||||
#else
|
||||
floatval *= g_Vars.diffframe60f;
|
||||
#endif
|
||||
|
||||
intval = inputs->yaxis < 0 ? (s32)floatval : -(s32)floatval;
|
||||
}
|
||||
|
||||
#if PAL
|
||||
intval = intval + (s32)(((f32)inputs->unk09 + (f32)inputs->unk09) * g_Vars.diffframe60f);
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
intval = intval + (s32)(((f32)inputs->unk09 + (f32)inputs->unk09) * g_Vars.diffframe60freal);
|
||||
#else
|
||||
intval += inputs->unk09 * 2 * g_Vars.diffframe60;
|
||||
#endif
|
||||
@@ -7921,7 +8592,7 @@ Gfx *menuRenderControllerText(Gfx *gdl, s32 curmode, struct menurendercontext *c
|
||||
|
||||
for (i = 0; i < ARRAYCOUNT(labels); i++) {
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
ry = i * 7 + context->y + y - 4;
|
||||
ry = i * 8 + context->y + y - 4;
|
||||
#else
|
||||
ry = i * 7 + context->y + y;
|
||||
#endif
|
||||
@@ -8098,7 +8769,7 @@ Gfx *menuRenderItemController(Gfx *gdl, struct menurendercontext *context)
|
||||
g_Menus[g_MpPlayerNum].data.main.controlmode + 4,
|
||||
contalpha, textcolour, colour, data->prevmode);
|
||||
} else {
|
||||
gdl = menuRenderControllerInfo(gdl, context, 0, 15,
|
||||
gdl = menuRenderControllerInfo(gdl, context, 0, PAL ? 19 : 15,
|
||||
g_Menus[g_MpPlayerNum].data.main.controlmode,
|
||||
contalpha, textcolour, colour, data->prevmode);
|
||||
|
||||
|
||||
@@ -1686,6 +1686,382 @@ void mpSetPaused(u8 mode)
|
||||
* Render "Paused" in the middle of the viewport if paused,
|
||||
* or "Press START" if player has finished their death animation.
|
||||
*/
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel mpRenderModalText
|
||||
/* f18973c: 3c02800b */ lui $v0,%hi(g_MpSetup+0x1e)
|
||||
/* f189740: 9042cba6 */ lbu $v0,%lo(g_MpSetup+0x1e)($v0)
|
||||
/* f189744: 27bdff60 */ addiu $sp,$sp,-160
|
||||
/* f189748: 24010001 */ addiu $at,$zero,0x1
|
||||
/* f18974c: afbf0034 */ sw $ra,0x34($sp)
|
||||
/* f189750: 14410077 */ bne $v0,$at,.L0f189930
|
||||
/* f189754: afa400a0 */ sw $a0,0xa0($sp)
|
||||
/* f189758: 3c013f80 */ lui $at,0x3f80
|
||||
/* f18975c: 44812000 */ mtc1 $at,$f4
|
||||
/* f189760: 3c018006 */ lui $at,%hi(var80061630)
|
||||
/* f189764: c4261630 */ lwc1 $f6,%lo(var80061630)($at)
|
||||
/* f189768: 3c0141a0 */ lui $at,0x41a0
|
||||
/* f18976c: 44815000 */ mtc1 $at,$f10
|
||||
/* f189770: 46062201 */ sub.s $f8,$f4,$f6
|
||||
/* f189774: 3c01437f */ lui $at,0x437f
|
||||
/* f189778: 44819000 */ mtc1 $at,$f18
|
||||
/* f18977c: 240100ff */ addiu $at,$zero,0xff
|
||||
/* f189780: 460a4402 */ mul.s $f16,$f8,$f10
|
||||
/* f189784: 00000000 */ nop
|
||||
/* f189788: 46128102 */ mul.s $f4,$f16,$f18
|
||||
/* f18978c: 4600218d */ trunc.w.s $f6,$f4
|
||||
/* f189790: 440f3000 */ mfc1 $t7,$f6
|
||||
/* f189794: 00000000 */ nop
|
||||
/* f189798: 01e1001a */ div $zero,$t7,$at
|
||||
/* f18979c: 0000c010 */ mfhi $t8
|
||||
/* f1897a0: afb80054 */ sw $t8,0x54($sp)
|
||||
/* f1897a4: 0fc54d8a */ jal func0f153628
|
||||
/* f1897a8: 00000000 */ nop
|
||||
/* f1897ac: afa200a0 */ sw $v0,0xa0($sp)
|
||||
/* f1897b0: 0fc5b9f1 */ jal langGet
|
||||
/* f1897b4: 24045428 */ addiu $a0,$zero,0x5429
|
||||
/* f1897b8: 27a4005c */ addiu $a0,$sp,0x5c
|
||||
/* f1897bc: 0c004c4c */ jal strcpy
|
||||
/* f1897c0: 00402825 */ or $a1,$v0,$zero
|
||||
/* f1897c4: 0c002f40 */ jal viGetViewLeft
|
||||
/* f1897c8: 00000000 */ nop
|
||||
/* f1897cc: 0c002f22 */ jal viGetViewWidth
|
||||
/* f1897d0: a7a20042 */ sh $v0,0x42($sp)
|
||||
/* f1897d4: 87a80042 */ lh $t0,0x42($sp)
|
||||
/* f1897d8: 3c0a800a */ lui $t2,%hi(g_Vars+0x288)
|
||||
/* f1897dc: 8d4aa248 */ lw $t2,%lo(g_Vars+0x288)($t2)
|
||||
/* f1897e0: 04410003 */ bgez $v0,.L0f1897f0
|
||||
/* f1897e4: 0002c843 */ sra $t9,$v0,0x1
|
||||
/* f1897e8: 24410001 */ addiu $at,$v0,0x1
|
||||
/* f1897ec: 0001c843 */ sra $t9,$at,0x1
|
||||
.L0f1897f0:
|
||||
/* f1897f0: 03284821 */ addu $t1,$t9,$t0
|
||||
/* f1897f4: afa90094 */ sw $t1,0x94($sp)
|
||||
/* f1897f8: 8d4b0070 */ lw $t3,0x70($t2)
|
||||
/* f1897fc: 3c0d800a */ lui $t5,%hi(g_Menus+0x4f8)
|
||||
/* f189800: 000b60c0 */ sll $t4,$t3,0x3
|
||||
/* f189804: 018b6023 */ subu $t4,$t4,$t3
|
||||
/* f189808: 000c6080 */ sll $t4,$t4,0x2
|
||||
/* f18980c: 018b6021 */ addu $t4,$t4,$t3
|
||||
/* f189810: 000c60c0 */ sll $t4,$t4,0x3
|
||||
/* f189814: 018b6023 */ subu $t4,$t4,$t3
|
||||
/* f189818: 000c6100 */ sll $t4,$t4,0x4
|
||||
/* f18981c: 01ac6821 */ addu $t5,$t5,$t4
|
||||
/* f189820: 8dade4f8 */ lw $t5,%lo(g_Menus+0x4f8)($t5)
|
||||
/* f189824: 11a00006 */ beqz $t5,.L0f189840
|
||||
/* f189828: 00000000 */ nop
|
||||
/* f18982c: 0c002f44 */ jal viGetViewTop
|
||||
/* f189830: 00000000 */ nop
|
||||
/* f189834: 244e000a */ addiu $t6,$v0,0xa
|
||||
/* f189838: 1000000c */ b .L0f18986c
|
||||
/* f18983c: afae0090 */ sw $t6,0x90($sp)
|
||||
.L0f189840:
|
||||
/* f189840: 0c002f44 */ jal viGetViewTop
|
||||
/* f189844: 00000000 */ nop
|
||||
/* f189848: 0c002f26 */ jal viGetViewHeight
|
||||
/* f18984c: a7a20042 */ sh $v0,0x42($sp)
|
||||
/* f189850: 87b80042 */ lh $t8,0x42($sp)
|
||||
/* f189854: 04410003 */ bgez $v0,.L0f189864
|
||||
/* f189858: 00027843 */ sra $t7,$v0,0x1
|
||||
/* f18985c: 24410001 */ addiu $at,$v0,0x1
|
||||
/* f189860: 00017843 */ sra $t7,$at,0x1
|
||||
.L0f189864:
|
||||
/* f189864: 01f8c821 */ addu $t9,$t7,$t8
|
||||
/* f189868: afb90090 */ sw $t9,0x90($sp)
|
||||
.L0f18986c:
|
||||
/* f18986c: 3c088008 */ lui $t0,%hi(g_FontHandelGothicSm2)
|
||||
/* f189870: 8d08fb14 */ lw $t0,%lo(g_FontHandelGothicSm2)($t0)
|
||||
/* f189874: 3c078008 */ lui $a3,%hi(g_FontHandelGothicSm1)
|
||||
/* f189878: 8ce7fb18 */ lw $a3,%lo(g_FontHandelGothicSm1)($a3)
|
||||
/* f18987c: 27a40098 */ addiu $a0,$sp,0x98
|
||||
/* f189880: 27a5009c */ addiu $a1,$sp,0x9c
|
||||
/* f189884: 27a6005c */ addiu $a2,$sp,0x5c
|
||||
/* f189888: afa00014 */ sw $zero,0x14($sp)
|
||||
/* f18988c: 0fc55cbe */ jal textMeasure
|
||||
/* f189890: afa80010 */ sw $t0,0x10($sp)
|
||||
/* f189894: 8faa009c */ lw $t2,0x9c($sp)
|
||||
/* f189898: 8fa90094 */ lw $t1,0x94($sp)
|
||||
/* f18989c: 05410003 */ bgez $t2,.L0f1898ac
|
||||
/* f1898a0: 000a5843 */ sra $t3,$t2,0x1
|
||||
/* f1898a4: 25410001 */ addiu $at,$t2,0x1
|
||||
/* f1898a8: 00015843 */ sra $t3,$at,0x1
|
||||
.L0f1898ac:
|
||||
/* f1898ac: 012b6023 */ subu $t4,$t1,$t3
|
||||
/* f1898b0: 0c002f02 */ jal viGetWidth
|
||||
/* f1898b4: afac0094 */ sw $t4,0x94($sp)
|
||||
/* f1898b8: 0c002f02 */ jal viGetWidth
|
||||
/* f1898bc: a7a20040 */ sh $v0,0x40($sp)
|
||||
/* f1898c0: 8faf0054 */ lw $t7,0x54($sp)
|
||||
/* f1898c4: 3c0d8008 */ lui $t5,%hi(g_FontHandelGothicSm1)
|
||||
/* f1898c8: 3c0e8008 */ lui $t6,%hi(g_FontHandelGothicSm2)
|
||||
/* f1898cc: 3c0100ff */ lui $at,0xff
|
||||
/* f1898d0: 8dcefb14 */ lw $t6,%lo(g_FontHandelGothicSm2)($t6)
|
||||
/* f1898d4: 8dadfb18 */ lw $t5,%lo(g_FontHandelGothicSm1)($t5)
|
||||
/* f1898d8: 87aa0040 */ lh $t2,0x40($sp)
|
||||
/* f1898dc: 342100ff */ ori $at,$at,0xff
|
||||
/* f1898e0: 000fc600 */ sll $t8,$t7,0x18
|
||||
/* f1898e4: 0301c825 */ or $t9,$t8,$at
|
||||
/* f1898e8: 240800ff */ addiu $t0,$zero,0xff
|
||||
/* f1898ec: afa8001c */ sw $t0,0x1c($sp)
|
||||
/* f1898f0: afb90018 */ sw $t9,0x18($sp)
|
||||
/* f1898f4: 8fa400a0 */ lw $a0,0xa0($sp)
|
||||
/* f1898f8: 27a50094 */ addiu $a1,$sp,0x94
|
||||
/* f1898fc: 27a60090 */ addiu $a2,$sp,0x90
|
||||
/* f189900: 27a7005c */ addiu $a3,$sp,0x5c
|
||||
/* f189904: afa20024 */ sw $v0,0x24($sp)
|
||||
/* f189908: afa00028 */ sw $zero,0x28($sp)
|
||||
/* f18990c: afa0002c */ sw $zero,0x2c($sp)
|
||||
/* f189910: afae0014 */ sw $t6,0x14($sp)
|
||||
/* f189914: afad0010 */ sw $t5,0x10($sp)
|
||||
/* f189918: 0fc55b92 */ jal textRender
|
||||
/* f18991c: afaa0020 */ sw $t2,0x20($sp)
|
||||
/* f189920: 0fc54de0 */ jal func0f153780
|
||||
/* f189924: 00402025 */ or $a0,$v0,$zero
|
||||
/* f189928: 100000e0 */ b .L0f189cac
|
||||
/* f18992c: afa200a0 */ sw $v0,0xa0($sp)
|
||||
.L0f189930:
|
||||
/* f189930: 3c098006 */ lui $t1,%hi(var8005d9d0)
|
||||
/* f189934: 8d29d9d0 */ lw $t1,%lo(var8005d9d0)($t1)
|
||||
/* f189938: 552000dd */ bnezl $t1,.L0f189cb0
|
||||
/* f18993c: 8fbf0034 */ lw $ra,0x34($sp)
|
||||
/* f189940: 144000da */ bnez $v0,.L0f189cac
|
||||
/* f189944: 3c03800a */ lui $v1,%hi(g_Vars)
|
||||
/* f189948: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars)
|
||||
/* f18994c: 8c620284 */ lw $v0,0x284($v1)
|
||||
/* f189950: 8c4b00d8 */ lw $t3,0xd8($v0)
|
||||
/* f189954: 516000d6 */ beqzl $t3,.L0f189cb0
|
||||
/* f189958: 8fbf0034 */ lw $ra,0x34($sp)
|
||||
/* f18995c: 8c4c032c */ lw $t4,0x32c($v0)
|
||||
/* f189960: 518000d3 */ beqzl $t4,.L0f189cb0
|
||||
/* f189964: 8fbf0034 */ lw $ra,0x34($sp)
|
||||
/* f189968: 8c4d0330 */ lw $t5,0x330($v0)
|
||||
/* f18996c: 51a000d0 */ beqzl $t5,.L0f189cb0
|
||||
/* f189970: 8fbf0034 */ lw $ra,0x34($sp)
|
||||
/* f189974: 8c6e0298 */ lw $t6,0x298($v1)
|
||||
/* f189978: 05c20011 */ bltzl $t6,.L0f1899c0
|
||||
/* f18997c: 8c6b029c */ lw $t3,0x29c($v1)
|
||||
/* f189980: 8c6f02a0 */ lw $t7,0x2a0($v1)
|
||||
/* f189984: 8df800d8 */ lw $t8,0xd8($t7)
|
||||
/* f189988: 53000006 */ beqzl $t8,.L0f1899a4
|
||||
/* f18998c: 8c4a1c10 */ lw $t2,0x1c10($v0)
|
||||
/* f189990: 8c7902a4 */ lw $t9,0x2a4($v1)
|
||||
/* f189994: 8f2800d8 */ lw $t0,0xd8($t9)
|
||||
/* f189998: 550000c5 */ bnezl $t0,.L0f189cb0
|
||||
/* f18999c: 8fbf0034 */ lw $ra,0x34($sp)
|
||||
/* f1899a0: 8c4a1c10 */ lw $t2,0x1c10($v0)
|
||||
.L0f1899a4:
|
||||
/* f1899a4: 3c098007 */ lui $t1,%hi(g_InCutscene)
|
||||
/* f1899a8: 514000c1 */ beqzl $t2,.L0f189cb0
|
||||
/* f1899ac: 8fbf0034 */ lw $ra,0x34($sp)
|
||||
/* f1899b0: 8d290764 */ lw $t1,%lo(g_InCutscene)($t1)
|
||||
/* f1899b4: 552000be */ bnezl $t1,.L0f189cb0
|
||||
/* f1899b8: 8fbf0034 */ lw $ra,0x34($sp)
|
||||
/* f1899bc: 8c6b029c */ lw $t3,0x29c($v1)
|
||||
.L0f1899c0:
|
||||
/* f1899c0: 3c0e8008 */ lui $t6,%hi(g_NumReasonsToEndMpMatch)
|
||||
/* f1899c4: 05600008 */ bltz $t3,.L0f1899e8
|
||||
/* f1899c8: 00000000 */ nop
|
||||
/* f1899cc: 8c6c02a8 */ lw $t4,0x2a8($v1)
|
||||
/* f1899d0: 3c0d8007 */ lui $t5,%hi(g_InCutscene)
|
||||
/* f1899d4: 558200b6 */ bnel $t4,$v0,.L0f189cb0
|
||||
/* f1899d8: 8fbf0034 */ lw $ra,0x34($sp)
|
||||
/* f1899dc: 8dad0764 */ lw $t5,%lo(g_InCutscene)($t5)
|
||||
/* f1899e0: 55a000b3 */ bnezl $t5,.L0f189cb0
|
||||
/* f1899e4: 8fbf0034 */ lw $ra,0x34($sp)
|
||||
.L0f1899e8:
|
||||
/* f1899e8: 8dce4038 */ lw $t6,%lo(g_NumReasonsToEndMpMatch)($t6)
|
||||
/* f1899ec: 55c000b0 */ bnezl $t6,.L0f189cb0
|
||||
/* f1899f0: 8fbf0034 */ lw $ra,0x34($sp)
|
||||
/* f1899f4: 0fc54d8a */ jal func0f153628
|
||||
/* f1899f8: 8fa400a0 */ lw $a0,0xa0($sp)
|
||||
/* f1899fc: afa200a0 */ sw $v0,0xa0($sp)
|
||||
/* f189a00: 0fc5b9f1 */ jal langGet
|
||||
/* f189a04: 24045427 */ addiu $a0,$zero,0x5428
|
||||
/* f189a08: 27a4005c */ addiu $a0,$sp,0x5c
|
||||
/* f189a0c: 0c004c4c */ jal strcpy
|
||||
/* f189a10: 00402825 */ or $a1,$v0,$zero
|
||||
/* f189a14: 0c002f40 */ jal viGetViewLeft
|
||||
/* f189a18: 00000000 */ nop
|
||||
/* f189a1c: 0c002f22 */ jal viGetViewWidth
|
||||
/* f189a20: a7a20042 */ sh $v0,0x42($sp)
|
||||
/* f189a24: 87b80042 */ lh $t8,0x42($sp)
|
||||
/* f189a28: 04410003 */ bgez $v0,.L0f189a38
|
||||
/* f189a2c: 00027843 */ sra $t7,$v0,0x1
|
||||
/* f189a30: 24410001 */ addiu $at,$v0,0x1
|
||||
/* f189a34: 00017843 */ sra $t7,$at,0x1
|
||||
.L0f189a38:
|
||||
/* f189a38: 01f8c821 */ addu $t9,$t7,$t8
|
||||
/* f189a3c: 0c002f44 */ jal viGetViewTop
|
||||
/* f189a40: afb90094 */ sw $t9,0x94($sp)
|
||||
/* f189a44: 0c002f26 */ jal viGetViewHeight
|
||||
/* f189a48: a7a20042 */ sh $v0,0x42($sp)
|
||||
/* f189a4c: 87aa0042 */ lh $t2,0x42($sp)
|
||||
/* f189a50: 3c0b8008 */ lui $t3,%hi(g_FontHandelGothicSm2)
|
||||
/* f189a54: 8d6bfb0c */ lw $t3,%lo(g_FontHandelGothicSm2)($t3)
|
||||
/* f189a58: 04410003 */ bgez $v0,.L0f189a68
|
||||
/* f189a5c: 00024043 */ sra $t0,$v0,0x1
|
||||
/* f189a60: 24410001 */ addiu $at,$v0,0x1
|
||||
/* f189a64: 00014043 */ sra $t0,$at,0x1
|
||||
.L0f189a68:
|
||||
/* f189a68: 3c078008 */ lui $a3,%hi(g_FontHandelGothicSm1)
|
||||
/* f189a6c: 010a4821 */ addu $t1,$t0,$t2
|
||||
/* f189a70: afa90090 */ sw $t1,0x90($sp)
|
||||
/* f189a74: 8ce7fb10 */ lw $a3,%lo(g_FontHandelGothicSm1)($a3)
|
||||
/* f189a78: 27a40098 */ addiu $a0,$sp,0x98
|
||||
/* f189a7c: 27a5009c */ addiu $a1,$sp,0x9c
|
||||
/* f189a80: 27a6005c */ addiu $a2,$sp,0x5c
|
||||
/* f189a84: afa00014 */ sw $zero,0x14($sp)
|
||||
/* f189a88: 0fc55cbe */ jal textMeasure
|
||||
/* f189a8c: afab0010 */ sw $t3,0x10($sp)
|
||||
/* f189a90: 8fad009c */ lw $t5,0x9c($sp)
|
||||
/* f189a94: 8fac0094 */ lw $t4,0x94($sp)
|
||||
/* f189a98: 05a10003 */ bgez $t5,.L0f189aa8
|
||||
/* f189a9c: 000d7043 */ sra $t6,$t5,0x1
|
||||
/* f189aa0: 25a10001 */ addiu $at,$t5,0x1
|
||||
/* f189aa4: 00017043 */ sra $t6,$at,0x1
|
||||
.L0f189aa8:
|
||||
/* f189aa8: 018e7823 */ subu $t7,$t4,$t6
|
||||
/* f189aac: 0c002f02 */ jal viGetWidth
|
||||
/* f189ab0: afaf0094 */ sw $t7,0x94($sp)
|
||||
/* f189ab4: 0c002f02 */ jal viGetWidth
|
||||
/* f189ab8: a7a20040 */ sh $v0,0x40($sp)
|
||||
/* f189abc: 3c188008 */ lui $t8,%hi(g_FontHandelGothicSm1)
|
||||
/* f189ac0: 3c198008 */ lui $t9,%hi(g_FontHandelGothicSm2)
|
||||
/* f189ac4: 8f39fb0c */ lw $t9,%lo(g_FontHandelGothicSm2)($t9)
|
||||
/* f189ac8: 8f18fb10 */ lw $t8,%lo(g_FontHandelGothicSm1)($t8)
|
||||
/* f189acc: 87a90040 */ lh $t1,0x40($sp)
|
||||
/* f189ad0: 3c08ff00 */ lui $t0,0xff00
|
||||
/* f189ad4: 350800ff */ ori $t0,$t0,0xff
|
||||
/* f189ad8: 240a00ff */ addiu $t2,$zero,0xff
|
||||
/* f189adc: afaa001c */ sw $t2,0x1c($sp)
|
||||
/* f189ae0: afa80018 */ sw $t0,0x18($sp)
|
||||
/* f189ae4: 8fa400a0 */ lw $a0,0xa0($sp)
|
||||
/* f189ae8: 27a50094 */ addiu $a1,$sp,0x94
|
||||
/* f189aec: 27a60090 */ addiu $a2,$sp,0x90
|
||||
/* f189af0: 27a7005c */ addiu $a3,$sp,0x5c
|
||||
/* f189af4: afa20024 */ sw $v0,0x24($sp)
|
||||
/* f189af8: afa00028 */ sw $zero,0x28($sp)
|
||||
/* f189afc: afa0002c */ sw $zero,0x2c($sp)
|
||||
/* f189b00: afb90014 */ sw $t9,0x14($sp)
|
||||
/* f189b04: afb80010 */ sw $t8,0x10($sp)
|
||||
/* f189b08: 0fc55b92 */ jal textRender
|
||||
/* f189b0c: afa90020 */ sw $t1,0x20($sp)
|
||||
/* f189b10: 3c0b800a */ lui $t3,%hi(g_Vars+0x284)
|
||||
/* f189b14: 8d6ba244 */ lw $t3,%lo(g_Vars+0x284)($t3)
|
||||
/* f189b18: afa200a0 */ sw $v0,0xa0($sp)
|
||||
/* f189b1c: 8d6d1c0c */ lw $t5,0x1c0c($t3)
|
||||
/* f189b20: 19a00051 */ blez $t5,.L0f189c68
|
||||
/* f189b24: 00000000 */ nop
|
||||
/* f189b28: 0c002f44 */ jal viGetViewTop
|
||||
/* f189b2c: 00000000 */ nop
|
||||
/* f189b30: 0c002f26 */ jal viGetViewHeight
|
||||
/* f189b34: a7a20042 */ sh $v0,0x42($sp)
|
||||
/* f189b38: 87ae0042 */ lh $t6,0x42($sp)
|
||||
/* f189b3c: 8fb80098 */ lw $t8,0x98($sp)
|
||||
/* f189b40: 04410003 */ bgez $v0,.L0f189b50
|
||||
/* f189b44: 00026043 */ sra $t4,$v0,0x1
|
||||
/* f189b48: 24410001 */ addiu $at,$v0,0x1
|
||||
/* f189b4c: 00016043 */ sra $t4,$at,0x1
|
||||
.L0f189b50:
|
||||
/* f189b50: 018e7821 */ addu $t7,$t4,$t6
|
||||
/* f189b54: 01f8c821 */ addu $t9,$t7,$t8
|
||||
/* f189b58: 27280002 */ addiu $t0,$t9,0x2
|
||||
/* f189b5c: 0c002f40 */ jal viGetViewLeft
|
||||
/* f189b60: afa8004c */ sw $t0,0x4c($sp)
|
||||
/* f189b64: 0c002f22 */ jal viGetViewWidth
|
||||
/* f189b68: a7a20042 */ sh $v0,0x42($sp)
|
||||
/* f189b6c: 87a90042 */ lh $t1,0x42($sp)
|
||||
/* f189b70: 3c0d800a */ lui $t5,%hi(g_Vars+0x284)
|
||||
/* f189b74: 8dada244 */ lw $t5,%lo(g_Vars+0x284)($t5)
|
||||
/* f189b78: 04410003 */ bgez $v0,.L0f189b88
|
||||
/* f189b7c: 00025043 */ sra $t2,$v0,0x1
|
||||
/* f189b80: 24410001 */ addiu $at,$v0,0x1
|
||||
/* f189b84: 00015043 */ sra $t2,$at,0x1
|
||||
.L0f189b88:
|
||||
/* f189b88: 01495821 */ addu $t3,$t2,$t1
|
||||
/* f189b8c: afab0048 */ sw $t3,0x48($sp)
|
||||
/* f189b90: 8da61c0c */ lw $a2,0x1c0c($t5)
|
||||
/* f189b94: 2401003c */ addiu $at,$zero,0x32
|
||||
/* f189b98: 3c057f1c */ lui $a1,%hi(var7f1b8aa4)
|
||||
/* f189b9c: 24c6003b */ addiu $a2,$a2,0x31
|
||||
/* f189ba0: 00c1001a */ div $zero,$a2,$at
|
||||
/* f189ba4: 00003012 */ mflo $a2
|
||||
/* f189ba8: 24a58aa4 */ addiu $a1,$a1,%lo(var7f1b8aa4)
|
||||
/* f189bac: 0c004dad */ jal sprintf
|
||||
/* f189bb0: 27a4005c */ addiu $a0,$sp,0x5c
|
||||
/* f189bb4: 3c0e8008 */ lui $t6,%hi(g_FontHandelGothicSm2)
|
||||
/* f189bb8: 8dcefb0c */ lw $t6,%lo(g_FontHandelGothicSm2)($t6)
|
||||
/* f189bbc: 3c078008 */ lui $a3,%hi(g_FontHandelGothicSm1)
|
||||
/* f189bc0: 8ce7fb10 */ lw $a3,%lo(g_FontHandelGothicSm1)($a3)
|
||||
/* f189bc4: 27a40098 */ addiu $a0,$sp,0x98
|
||||
/* f189bc8: 27a5009c */ addiu $a1,$sp,0x9c
|
||||
/* f189bcc: 27a6005c */ addiu $a2,$sp,0x5c
|
||||
/* f189bd0: afa00014 */ sw $zero,0x14($sp)
|
||||
/* f189bd4: 0fc55cbe */ jal textMeasure
|
||||
/* f189bd8: afae0010 */ sw $t6,0x10($sp)
|
||||
/* f189bdc: 8fb8009c */ lw $t8,0x9c($sp)
|
||||
/* f189be0: 8faf0048 */ lw $t7,0x48($sp)
|
||||
/* f189be4: 8faa004c */ lw $t2,0x4c($sp)
|
||||
/* f189be8: 07010003 */ bgez $t8,.L0f189bf8
|
||||
/* f189bec: 0018c843 */ sra $t9,$t8,0x1
|
||||
/* f189bf0: 27010001 */ addiu $at,$t8,0x1
|
||||
/* f189bf4: 0001c843 */ sra $t9,$at,0x1
|
||||
.L0f189bf8:
|
||||
/* f189bf8: 01f94023 */ subu $t0,$t7,$t9
|
||||
/* f189bfc: afa80094 */ sw $t0,0x94($sp)
|
||||
/* f189c00: 0c002f02 */ jal viGetWidth
|
||||
/* f189c04: afaa0090 */ sw $t2,0x90($sp)
|
||||
/* f189c08: 0c002f02 */ jal viGetWidth
|
||||
/* f189c0c: a7a20040 */ sh $v0,0x40($sp)
|
||||
/* f189c10: 3c098008 */ lui $t1,%hi(g_FontHandelGothicSm1)
|
||||
/* f189c14: 3c0b8008 */ lui $t3,%hi(g_FontHandelGothicSm2)
|
||||
/* f189c18: 8d6bfb0c */ lw $t3,%lo(g_FontHandelGothicSm2)($t3)
|
||||
/* f189c1c: 8d29fb10 */ lw $t1,%lo(g_FontHandelGothicSm1)($t1)
|
||||
/* f189c20: 87ae0040 */ lh $t6,0x40($sp)
|
||||
/* f189c24: 3c0dff00 */ lui $t5,0xff00
|
||||
/* f189c28: 35ad00ff */ ori $t5,$t5,0xff
|
||||
/* f189c2c: 240c00ff */ addiu $t4,$zero,0xff
|
||||
/* f189c30: afac001c */ sw $t4,0x1c($sp)
|
||||
/* f189c34: afad0018 */ sw $t5,0x18($sp)
|
||||
/* f189c38: 8fa400a0 */ lw $a0,0xa0($sp)
|
||||
/* f189c3c: 27a50094 */ addiu $a1,$sp,0x94
|
||||
/* f189c40: 27a60090 */ addiu $a2,$sp,0x90
|
||||
/* f189c44: 27a7005c */ addiu $a3,$sp,0x5c
|
||||
/* f189c48: afa20024 */ sw $v0,0x24($sp)
|
||||
/* f189c4c: afa00028 */ sw $zero,0x28($sp)
|
||||
/* f189c50: afa0002c */ sw $zero,0x2c($sp)
|
||||
/* f189c54: afab0014 */ sw $t3,0x14($sp)
|
||||
/* f189c58: afa90010 */ sw $t1,0x10($sp)
|
||||
/* f189c5c: 0fc55b92 */ jal textRender
|
||||
/* f189c60: afae0020 */ sw $t6,0x20($sp)
|
||||
/* f189c64: afa200a0 */ sw $v0,0xa0($sp)
|
||||
.L0f189c68:
|
||||
/* f189c68: 0fc54de0 */ jal func0f153780
|
||||
/* f189c6c: 8fa400a0 */ lw $a0,0xa0($sp)
|
||||
/* f189c70: 3c0f800a */ lui $t7,%hi(g_Vars+0x288)
|
||||
/* f189c74: 8defa248 */ lw $t7,%lo(g_Vars+0x288)($t7)
|
||||
/* f189c78: afa200a0 */ sw $v0,0xa0($sp)
|
||||
/* f189c7c: 3c01800a */ lui $at,%hi(g_Menus+0x83c)
|
||||
/* f189c80: 8df90070 */ lw $t9,0x70($t7)
|
||||
/* f189c84: 2418000a */ addiu $t8,$zero,0xa
|
||||
/* f189c88: 001940c0 */ sll $t0,$t9,0x3
|
||||
/* f189c8c: 01194023 */ subu $t0,$t0,$t9
|
||||
/* f189c90: 00084080 */ sll $t0,$t0,0x2
|
||||
/* f189c94: 01194021 */ addu $t0,$t0,$t9
|
||||
/* f189c98: 000840c0 */ sll $t0,$t0,0x3
|
||||
/* f189c9c: 01194023 */ subu $t0,$t0,$t9
|
||||
/* f189ca0: 00084100 */ sll $t0,$t0,0x4
|
||||
/* f189ca4: 00280821 */ addu $at,$at,$t0
|
||||
/* f189ca8: a038e83c */ sb $t8,%lo(g_Menus+0x83c)($at)
|
||||
.L0f189cac:
|
||||
/* f189cac: 8fbf0034 */ lw $ra,0x34($sp)
|
||||
.L0f189cb0:
|
||||
/* f189cb0: 8fa200a0 */ lw $v0,0xa0($sp)
|
||||
/* f189cb4: 27bd00a0 */ addiu $sp,$sp,0xa0
|
||||
/* f189cb8: 03e00008 */ jr $ra
|
||||
/* f189cbc: 00000000 */ nop
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel mpRenderModalText
|
||||
/* f18973c: 3c02800b */ lui $v0,%hi(g_MpSetup+0x1e)
|
||||
@@ -2060,6 +2436,7 @@ glabel mpRenderModalText
|
||||
/* f189cb8: 03e00008 */ jr $ra
|
||||
/* f189cbc: 00000000 */ nop
|
||||
);
|
||||
#endif
|
||||
|
||||
GLOBAL_ASM(
|
||||
glabel func0f189cc0
|
||||
|
||||
+1053
-11
File diff suppressed because it is too large
Load Diff
@@ -655,6 +655,231 @@ s32 func0f179d6c(s32 operation, struct menuitem *item, union handlerdata *data)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel func0f179da4
|
||||
.late_rodata
|
||||
glabel var7f1b8078
|
||||
.word func0f179da4+0x34 # f179dd8
|
||||
glabel var7f1b807c
|
||||
.word func0f179da4+0x270 # f17a014
|
||||
glabel var7f1b8080
|
||||
.word func0f179da4+0x270 # f17a014
|
||||
glabel var7f1b8084
|
||||
.word func0f179da4+0x270 # f17a014
|
||||
glabel var7f1b8088
|
||||
.word func0f179da4+0x270 # f17a014
|
||||
glabel var7f1b808c
|
||||
.word func0f179da4+0x168 # f179f0c
|
||||
glabel var7f1b8090
|
||||
.word func0f179da4+0x160 # f179f04
|
||||
glabel var7f1b8094
|
||||
.word func0f179da4+0x270 # f17a014
|
||||
glabel var7f1b8098
|
||||
.word func0f179da4+0x270 # f17a014
|
||||
glabel var7f1b809c
|
||||
.word func0f179da4+0x270 # f17a014
|
||||
glabel var7f1b80a0
|
||||
.word func0f179da4+0x48 # f179dec
|
||||
glabel var7f1b80a4
|
||||
.word func0f179da4+0x270 # f17a014
|
||||
glabel var7f1b80a8
|
||||
.word func0f179da4+0x128 # f179ecc
|
||||
glabel var7f1b80ac
|
||||
.word func0f179da4+0x270 # f17a014
|
||||
glabel var7f1b80b0
|
||||
.word func0f179da4+0x168 # f179f0c
|
||||
glabel var7f1b80b4
|
||||
.word func0f179da4+0x270 # f17a014
|
||||
glabel var7f1b80b8
|
||||
.word func0f179da4+0x270 # f17a014
|
||||
glabel var7f1b80bc
|
||||
.word func0f179da4+0x270 # f17a014
|
||||
glabel var7f1b80c0
|
||||
.word func0f179da4+0x270 # f17a014
|
||||
glabel var7f1b80c4
|
||||
.word func0f179da4+0x270 # f17a014
|
||||
glabel var7f1b80c8
|
||||
.word func0f179da4+0x108 # f179eac
|
||||
glabel var7f1b80cc
|
||||
.word 0x3c23d70a
|
||||
glabel var7f1b80d0
|
||||
.word 0x41033333
|
||||
glabel var7f1b80d4
|
||||
.word 0xc0833333
|
||||
glabel var7f1b80d8
|
||||
.word 0xbe4ccccd
|
||||
glabel var7f1b80dc
|
||||
.word 0x3b03126f
|
||||
.text
|
||||
/* f179da4: 248effff */ addiu $t6,$a0,-1
|
||||
/* f179da8: 27bdffc0 */ addiu $sp,$sp,-64
|
||||
/* f179dac: 2dc10015 */ sltiu $at,$t6,0x15
|
||||
/* f179db0: afbf002c */ sw $ra,0x2c($sp)
|
||||
/* f179db4: afa50044 */ sw $a1,0x44($sp)
|
||||
/* f179db8: 10200096 */ beqz $at,.L0f17a014
|
||||
/* f179dbc: 00801825 */ or $v1,$a0,$zero
|
||||
/* f179dc0: 000e7080 */ sll $t6,$t6,0x2
|
||||
/* f179dc4: 3c017f1c */ lui $at,%hi(var7f1b8078)
|
||||
/* f179dc8: 002e0821 */ addu $at,$at,$t6
|
||||
/* f179dcc: 8c2e8078 */ lw $t6,%lo(var7f1b8078)($at)
|
||||
/* f179dd0: 01c00008 */ jr $t6
|
||||
/* f179dd4: 00000000 */ nop
|
||||
/* f179dd8: 0fc62ee2 */ jal mpGetNumBodies
|
||||
/* f179ddc: afa60048 */ sw $a2,0x48($sp)
|
||||
/* f179de0: 8fa60048 */ lw $a2,0x48($sp)
|
||||
/* f179de4: 1000008b */ b .L0f17a014
|
||||
/* f179de8: acc20000 */ sw $v0,0x0($a2)
|
||||
/* f179dec: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum)
|
||||
/* f179df0: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7)
|
||||
/* f179df4: 3c19800a */ lui $t9,%hi(g_Menus)
|
||||
/* f179df8: 3c05800a */ lui $a1,%hi(g_Vars)
|
||||
/* f179dfc: 000fc0c0 */ sll $t8,$t7,0x3
|
||||
/* f179e00: 030fc023 */ subu $t8,$t8,$t7
|
||||
/* f179e04: 0018c080 */ sll $t8,$t8,0x2
|
||||
/* f179e08: 030fc021 */ addu $t8,$t8,$t7
|
||||
/* f179e0c: 0018c0c0 */ sll $t8,$t8,0x3
|
||||
/* f179e10: 030fc023 */ subu $t8,$t8,$t7
|
||||
/* f179e14: 0018c100 */ sll $t8,$t8,0x4
|
||||
/* f179e18: 2739e000 */ addiu $t9,$t9,%lo(g_Menus)
|
||||
/* f179e1c: 8fa90050 */ lw $t1,0x50($sp)
|
||||
/* f179e20: 24a59fc0 */ addiu $a1,$a1,%lo(g_Vars)
|
||||
/* f179e24: 03191021 */ addu $v0,$t8,$t9
|
||||
/* f179e28: 8c4e0db4 */ lw $t6,0xdb4($v0)
|
||||
/* f179e2c: 8ca40000 */ lw $a0,0x0($a1)
|
||||
/* f179e30: 00095400 */ sll $t2,$t1,0x10
|
||||
/* f179e34: 354bffff */ ori $t3,$t2,0xffff
|
||||
/* f179e38: 00076600 */ sll $t4,$a3,0x18
|
||||
/* f179e3c: 01c47821 */ addu $t7,$t6,$a0
|
||||
/* f179e40: 240801fc */ addiu $t0,$zero,0x1fc
|
||||
/* f179e44: 016c6825 */ or $t5,$t3,$t4
|
||||
/* f179e48: 29e101e1 */ slti $at,$t7,0x191
|
||||
/* f179e4c: a448089c */ sh $t0,0x89c($v0)
|
||||
/* f179e50: ac4d084c */ sw $t5,0x84c($v0)
|
||||
/* f179e54: 14200003 */ bnez $at,.L0f179e64
|
||||
/* f179e58: ac4f0db4 */ sw $t7,0xdb4($v0)
|
||||
/* f179e5c: 25f8fe20 */ addiu $t8,$t7,-0x190
|
||||
/* f179e60: ac580db4 */ sw $t8,0xdb4($v0)
|
||||
.L0f179e64:
|
||||
/* f179e64: 8c430db8 */ lw $v1,0xdb8($v0)
|
||||
/* f179e68: 3c017f1c */ lui $at,%hi(var7f1b80cc)
|
||||
/* f179e6c: 18600003 */ blez $v1,.L0f179e7c
|
||||
/* f179e70: 0064c823 */ subu $t9,$v1,$a0
|
||||
/* f179e74: 10000008 */ b .L0f179e98
|
||||
/* f179e78: ac590db8 */ sw $t9,0xdb8($v0)
|
||||
.L0f179e7c:
|
||||
/* f179e7c: c42480cc */ lwc1 $f4,%lo(var7f1b80cc)($at)
|
||||
/* f179e80: c4a60004 */ lwc1 $f6,0x10($a1)
|
||||
/* f179e84: c44a0d64 */ lwc1 $f10,0xd64($v0)
|
||||
/* f179e88: 46062202 */ mul.s $f8,$f4,$f6
|
||||
/* f179e8c: 46085000 */ add.s $f0,$f10,$f8
|
||||
/* f179e90: e4400d8c */ swc1 $f0,0xd8c($v0)
|
||||
/* f179e94: e4400d64 */ swc1 $f0,0xd64($v0)
|
||||
.L0f179e98:
|
||||
/* f179e98: 3c0141f0 */ lui $at,0x41f0
|
||||
/* f179e9c: 44818000 */ mtc1 $at,$f16
|
||||
/* f179ea0: ac400df4 */ sw $zero,0xdf4($v0)
|
||||
/* f179ea4: 1000005b */ b .L0f17a014
|
||||
/* f179ea8: e4500d94 */ swc1 $f16,0xd94($v0)
|
||||
/* f179eac: 0fc62f1c */ jal mpGetBodyRequiredFeature
|
||||
/* f179eb0: 90c40003 */ lbu $a0,0x3($a2)
|
||||
/* f179eb4: 0fc67244 */ jal mpIsFeatureUnlocked
|
||||
/* f179eb8: 00402025 */ or $a0,$v0,$zero
|
||||
/* f179ebc: 54400056 */ bnezl $v0,.L0f17a018
|
||||
/* f179ec0: 00001025 */ or $v0,$zero,$zero
|
||||
/* f179ec4: 10000054 */ b .L0f17a018
|
||||
/* f179ec8: 24020001 */ addiu $v0,$zero,0x1
|
||||
/* f179ecc: 3c098007 */ lui $t1,%hi(g_MpPlayerNum)
|
||||
/* f179ed0: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1)
|
||||
/* f179ed4: 3c01800a */ lui $at,%hi(g_Menus+0x840)
|
||||
/* f179ed8: 24080003 */ addiu $t0,$zero,0x3
|
||||
/* f179edc: 000950c0 */ sll $t2,$t1,0x3
|
||||
/* f179ee0: 01495023 */ subu $t2,$t2,$t1
|
||||
/* f179ee4: 000a5080 */ sll $t2,$t2,0x2
|
||||
/* f179ee8: 01495021 */ addu $t2,$t2,$t1
|
||||
/* f179eec: 000a50c0 */ sll $t2,$t2,0x3
|
||||
/* f179ef0: 01495023 */ subu $t2,$t2,$t1
|
||||
/* f179ef4: 000a5100 */ sll $t2,$t2,0x4
|
||||
/* f179ef8: 002a0821 */ addu $at,$at,$t2
|
||||
/* f179efc: 10000045 */ b .L0f17a014
|
||||
/* f179f00: a028e840 */ sb $t0,%lo(g_Menus+0x840)($at)
|
||||
/* f179f04: 10000043 */ b .L0f17a014
|
||||
/* f179f08: acc70000 */ sw $a3,0x0($a2)
|
||||
/* f179f0c: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum)
|
||||
/* f179f10: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3)
|
||||
/* f179f14: 44800000 */ mtc1 $zero,$f0
|
||||
/* f179f18: 3c0d800a */ lui $t5,%hi(g_Menus)
|
||||
/* f179f1c: 000b60c0 */ sll $t4,$t3,0x3
|
||||
/* f179f20: 018b6023 */ subu $t4,$t4,$t3
|
||||
/* f179f24: 000c6080 */ sll $t4,$t4,0x2
|
||||
/* f179f28: 018b6021 */ addu $t4,$t4,$t3
|
||||
/* f179f2c: 000c60c0 */ sll $t4,$t4,0x3
|
||||
/* f179f30: 3c013f80 */ lui $at,0x3f80
|
||||
/* f179f34: 018b6023 */ subu $t4,$t4,$t3
|
||||
/* f179f38: 44819000 */ mtc1 $at,$f18
|
||||
/* f179f3c: 000c6100 */ sll $t4,$t4,0x4
|
||||
/* f179f40: 25ade000 */ addiu $t5,$t5,%lo(g_Menus)
|
||||
/* f179f44: 018d1021 */ addu $v0,$t4,$t5
|
||||
/* f179f48: 240e0001 */ addiu $t6,$zero,0x1
|
||||
/* f179f4c: 44050000 */ mfc1 $a1,$f0
|
||||
/* f179f50: 44060000 */ mfc1 $a2,$f0
|
||||
/* f179f54: 44070000 */ mfc1 $a3,$f0
|
||||
/* f179f58: ac400dc0 */ sw $zero,0xdc0($v0)
|
||||
/* f179f5c: afae0020 */ sw $t6,0x20($sp)
|
||||
/* f179f60: 24440840 */ addiu $a0,$v0,0x840
|
||||
/* f179f64: afa30034 */ sw $v1,0x34($sp)
|
||||
/* f179f68: e7a00010 */ swc1 $f0,0x10($sp)
|
||||
/* f179f6c: e7a00014 */ swc1 $f0,0x14($sp)
|
||||
/* f179f70: e7a00018 */ swc1 $f0,0x18($sp)
|
||||
/* f179f74: 0fc3cdcb */ jal func0f0f372c
|
||||
/* f179f78: e7b2001c */ swc1 $f18,0x1c($sp)
|
||||
/* f179f7c: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum)
|
||||
/* f179f80: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7)
|
||||
/* f179f84: 3c017f1c */ lui $at,%hi(var7f1b80d0)
|
||||
/* f179f88: c42080d0 */ lwc1 $f0,%lo(var7f1b80d0)($at)
|
||||
/* f179f8c: 000fc0c0 */ sll $t8,$t7,0x3
|
||||
/* f179f90: 030fc023 */ subu $t8,$t8,$t7
|
||||
/* f179f94: 0018c080 */ sll $t8,$t8,0x2
|
||||
/* f179f98: 3c017f1c */ lui $at,%hi(var7f1b80d4)
|
||||
/* f179f9c: 030fc021 */ addu $t8,$t8,$t7
|
||||
/* f179fa0: c42280d4 */ lwc1 $f2,%lo(var7f1b80d4)($at)
|
||||
/* f179fa4: 0018c0c0 */ sll $t8,$t8,0x3
|
||||
/* f179fa8: 3c017f1c */ lui $at,%hi(var7f1b80d8)
|
||||
/* f179fac: 3c19800a */ lui $t9,%hi(g_Menus)
|
||||
/* f179fb0: 030fc023 */ subu $t8,$t8,$t7
|
||||
/* f179fb4: c42c80d8 */ lwc1 $f12,%lo(var7f1b80d8)($at)
|
||||
/* f179fb8: 0018c100 */ sll $t8,$t8,0x4
|
||||
/* f179fbc: 2739e000 */ addiu $t9,$t9,%lo(g_Menus)
|
||||
/* f179fc0: 03191021 */ addu $v0,$t8,$t9
|
||||
/* f179fc4: 3c017f1c */ lui $at,%hi(var7f1b80dc)
|
||||
/* f179fc8: e4400d50 */ swc1 $f0,0xd50($v0)
|
||||
/* f179fcc: e4400d78 */ swc1 $f0,0xd78($v0)
|
||||
/* f179fd0: e4420d54 */ swc1 $f2,0xd54($v0)
|
||||
/* f179fd4: e4420d7c */ swc1 $f2,0xd7c($v0)
|
||||
/* f179fd8: c42480dc */ lwc1 $f4,%lo(var7f1b80dc)($at)
|
||||
/* f179fdc: 8fa30034 */ lw $v1,0x34($sp)
|
||||
/* f179fe0: 2409003c */ addiu $t1,$zero,0x32
|
||||
/* f179fe4: 24080078 */ addiu $t0,$zero,0x64
|
||||
/* f179fe8: 240a0008 */ addiu $t2,$zero,0x8
|
||||
/* f179fec: 2401000f */ addiu $at,$zero,0xf
|
||||
/* f179ff0: ac490db8 */ sw $t1,0xdb8($v0)
|
||||
/* f179ff4: ac480db4 */ sw $t0,0xdb4($v0)
|
||||
/* f179ff8: a04a0840 */ sb $t2,0x840($v0)
|
||||
/* f179ffc: e44c0d64 */ swc1 $f12,0xd64($v0)
|
||||
/* f17a000: e44c0d8c */ swc1 $f12,0xd8c($v0)
|
||||
/* f17a004: 14610003 */ bne $v1,$at,.L0f17a014
|
||||
/* f17a008: e4440d5c */ swc1 $f4,0xd5c($v0)
|
||||
/* f17a00c: 240b0010 */ addiu $t3,$zero,0x10
|
||||
/* f17a010: a04b0840 */ sb $t3,0x840($v0)
|
||||
.L0f17a014:
|
||||
/* f17a014: 00001025 */ or $v0,$zero,$zero
|
||||
.L0f17a018:
|
||||
/* f17a018: 8fbf002c */ lw $ra,0x2c($sp)
|
||||
/* f17a01c: 27bd0040 */ addiu $sp,$sp,0x40
|
||||
/* f17a020: 03e00008 */ jr $ra
|
||||
/* f17a024: 00000000 */ nop
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel func0f179da4
|
||||
.late_rodata
|
||||
@@ -878,6 +1103,7 @@ glabel var7f1b80dc
|
||||
/* f17a020: 03e00008 */ jr $ra
|
||||
/* f17a024: 00000000 */ nop
|
||||
);
|
||||
#endif
|
||||
|
||||
s32 menuhandlerMpCharacterBody(s32 operation, struct menuitem *item, union handlerdata *data)
|
||||
{
|
||||
@@ -1765,6 +1991,275 @@ struct menudialog g_MpPlayerStatsMenuDialog = {
|
||||
u32 var80085448 = 0x00000300;
|
||||
u32 var8008544c = 0x0400ff00;
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel func0f17b4f8
|
||||
.late_rodata
|
||||
glabel var7f1b80f0
|
||||
.word func0f17b4f8+0x34 # f17b52c
|
||||
glabel var7f1b80f4
|
||||
.word func0f17b4f8+0x334 # f17b82c
|
||||
glabel var7f1b80f8
|
||||
.word func0f17b4f8+0x334 # f17b82c
|
||||
glabel var7f1b80fc
|
||||
.word func0f17b4f8+0x334 # f17b82c
|
||||
glabel var7f1b8100
|
||||
.word func0f17b4f8+0x334 # f17b82c
|
||||
glabel var7f1b8104
|
||||
.word func0f17b4f8+0x214 # f17b70c
|
||||
glabel var7f1b8108
|
||||
.word func0f17b4f8+0x208 # f17b700
|
||||
glabel var7f1b810c
|
||||
.word func0f17b4f8+0x334 # f17b82c
|
||||
glabel var7f1b8110
|
||||
.word func0f17b4f8+0x334 # f17b82c
|
||||
glabel var7f1b8114
|
||||
.word func0f17b4f8+0x334 # f17b82c
|
||||
glabel var7f1b8118
|
||||
.word func0f17b4f8+0x48 # f17b540
|
||||
glabel var7f1b811c
|
||||
.word func0f17b4f8+0x334 # f17b82c
|
||||
glabel var7f1b8120
|
||||
.word func0f17b4f8+0x214 # f17b70c
|
||||
glabel var7f1b8124
|
||||
.word func0f17b4f8+0x334 # f17b82c
|
||||
glabel var7f1b8128
|
||||
.word func0f17b4f8+0x334 # f17b82c
|
||||
glabel var7f1b812c
|
||||
.word func0f17b4f8+0x334 # f17b82c
|
||||
glabel var7f1b8130
|
||||
.word func0f17b4f8+0x334 # f17b82c
|
||||
glabel var7f1b8134
|
||||
.word func0f17b4f8+0x334 # f17b82c
|
||||
glabel var7f1b8138
|
||||
.word func0f17b4f8+0x334 # f17b82c
|
||||
glabel var7f1b813c
|
||||
.word func0f17b4f8+0x334 # f17b82c
|
||||
glabel var7f1b8140
|
||||
.word func0f17b4f8+0x1e8 # f17b6e0
|
||||
glabel var7f1b8144
|
||||
.word 0x3c23d70a
|
||||
glabel var7f1b8148
|
||||
.word 0xbe99999a
|
||||
glabel var7f1b814c
|
||||
.word 0x3c23d70a
|
||||
.text
|
||||
/* f17b4f8: 27bdffd0 */ addiu $sp,$sp,-48
|
||||
/* f17b4fc: 248effff */ addiu $t6,$a0,-1
|
||||
/* f17b500: 2dc10015 */ sltiu $at,$t6,0x15
|
||||
/* f17b504: afbf002c */ sw $ra,0x2c($sp)
|
||||
/* f17b508: afa50034 */ sw $a1,0x34($sp)
|
||||
/* f17b50c: 102000c7 */ beqz $at,.L0f17b82c
|
||||
/* f17b510: afa7003c */ sw $a3,0x3c($sp)
|
||||
/* f17b514: 000e7080 */ sll $t6,$t6,0x2
|
||||
/* f17b518: 3c017f1c */ lui $at,%hi(var7f1b80f0)
|
||||
/* f17b51c: 002e0821 */ addu $at,$at,$t6
|
||||
/* f17b520: 8c2e80f0 */ lw $t6,%lo(var7f1b80f0)($at)
|
||||
/* f17b524: 01c00008 */ jr $t6
|
||||
/* f17b528: 00000000 */ nop
|
||||
/* f17b52c: 0fc62ec7 */ jal func0f18bb1c
|
||||
/* f17b530: afa60038 */ sw $a2,0x38($sp)
|
||||
/* f17b534: 8fa60038 */ lw $a2,0x38($sp)
|
||||
/* f17b538: 100000bc */ b .L0f17b82c
|
||||
/* f17b53c: acc20000 */ sw $v0,0x0($a2)
|
||||
/* f17b540: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum)
|
||||
/* f17b544: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7)
|
||||
/* f17b548: 3c017f1c */ lui $at,%hi(var7f1b8144)
|
||||
/* f17b54c: c4248144 */ lwc1 $f4,%lo(var7f1b8144)($at)
|
||||
/* f17b550: 3c01800a */ lui $at,%hi(g_Vars+0x10)
|
||||
/* f17b554: 000fc0c0 */ sll $t8,$t7,0x3
|
||||
/* f17b558: c4269fc4 */ lwc1 $f6,%lo(g_Vars+0x10)($at)
|
||||
/* f17b55c: 030fc023 */ subu $t8,$t8,$t7
|
||||
/* f17b560: 0018c080 */ sll $t8,$t8,0x2
|
||||
/* f17b564: 030fc021 */ addu $t8,$t8,$t7
|
||||
/* f17b568: 46062202 */ mul.s $f8,$f4,$f6
|
||||
/* f17b56c: 0018c0c0 */ sll $t8,$t8,0x3
|
||||
/* f17b570: 3c19800a */ lui $t9,%hi(g_Menus)
|
||||
/* f17b574: 030fc023 */ subu $t8,$t8,$t7
|
||||
/* f17b578: 0018c100 */ sll $t8,$t8,0x4
|
||||
/* f17b57c: 2739e000 */ addiu $t9,$t9,%lo(g_Menus)
|
||||
/* f17b580: 03191821 */ addu $v1,$t8,$t9
|
||||
/* f17b584: c46a0d64 */ lwc1 $f10,0xd64($v1)
|
||||
/* f17b588: 46085000 */ add.s $f0,$f10,$f8
|
||||
/* f17b58c: e4600d8c */ swc1 $f0,0xd8c($v1)
|
||||
/* f17b590: 0fc62ec7 */ jal func0f18bb1c
|
||||
/* f17b594: e4600d64 */ swc1 $f0,0xd64($v1)
|
||||
/* f17b598: 8fa3003c */ lw $v1,0x3c($sp)
|
||||
/* f17b59c: 0062082a */ slt $at,$v1,$v0
|
||||
/* f17b5a0: 1020001a */ beqz $at,.L0f17b60c
|
||||
/* f17b5a4: 00000000 */ nop
|
||||
/* f17b5a8: 0fc62ecb */ jal mpGetHeadId
|
||||
/* f17b5ac: 306400ff */ andi $a0,$v1,0xff
|
||||
/* f17b5b0: 3c088007 */ lui $t0,%hi(g_MpPlayerNum)
|
||||
/* f17b5b4: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0)
|
||||
/* f17b5b8: 3c0a800a */ lui $t2,%hi(g_Menus)
|
||||
/* f17b5bc: 254ae000 */ addiu $t2,$t2,%lo(g_Menus)
|
||||
/* f17b5c0: 000848c0 */ sll $t1,$t0,0x3
|
||||
/* f17b5c4: 01284823 */ subu $t1,$t1,$t0
|
||||
/* f17b5c8: 00094880 */ sll $t1,$t1,0x2
|
||||
/* f17b5cc: 01284821 */ addu $t1,$t1,$t0
|
||||
/* f17b5d0: 000948c0 */ sll $t1,$t1,0x3
|
||||
/* f17b5d4: 01284823 */ subu $t1,$t1,$t0
|
||||
/* f17b5d8: 00094900 */ sll $t1,$t1,0x4
|
||||
/* f17b5dc: 00025880 */ sll $t3,$v0,0x2
|
||||
/* f17b5e0: 01625821 */ addu $t3,$t3,$v0
|
||||
/* f17b5e4: 012a1821 */ addu $v1,$t1,$t2
|
||||
/* f17b5e8: 906d0df1 */ lbu $t5,0xdf1($v1)
|
||||
/* f17b5ec: 000b5880 */ sll $t3,$t3,0x2
|
||||
/* f17b5f0: 3c0c8008 */ lui $t4,%hi(g_Bodies+0x2)
|
||||
/* f17b5f4: 018b6021 */ addu $t4,$t4,$t3
|
||||
/* f17b5f8: 958ccf06 */ lhu $t4,%lo(g_Bodies+0x2)($t4)
|
||||
/* f17b5fc: 31aeff7f */ andi $t6,$t5,0xff7f
|
||||
/* f17b600: a06e0df1 */ sb $t6,0xdf1($v1)
|
||||
/* f17b604: 1000002e */ b .L0f17b6c0
|
||||
/* f17b608: ac6c084c */ sw $t4,0x84c($v1)
|
||||
.L0f17b60c:
|
||||
/* f17b60c: 0fc62ec7 */ jal func0f18bb1c
|
||||
/* f17b610: 00000000 */ nop
|
||||
/* f17b614: 8faf003c */ lw $t7,0x3c($sp)
|
||||
/* f17b618: 0fc52a7e */ jal func0f14a9f8
|
||||
/* f17b61c: 01e22023 */ subu $a0,$t7,$v0
|
||||
/* f17b620: 0fc62ed9 */ jal mpGetBeauHeadId
|
||||
/* f17b624: 304400ff */ andi $a0,$v0,0xff
|
||||
/* f17b628: 3c188007 */ lui $t8,%hi(g_MpPlayerNum)
|
||||
/* f17b62c: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8)
|
||||
/* f17b630: 3c08800a */ lui $t0,%hi(g_Menus)
|
||||
/* f17b634: 2508e000 */ addiu $t0,$t0,%lo(g_Menus)
|
||||
/* f17b638: 0018c8c0 */ sll $t9,$t8,0x3
|
||||
/* f17b63c: 0338c823 */ subu $t9,$t9,$t8
|
||||
/* f17b640: 0019c880 */ sll $t9,$t9,0x2
|
||||
/* f17b644: 0338c821 */ addu $t9,$t9,$t8
|
||||
/* f17b648: 0019c8c0 */ sll $t9,$t9,0x3
|
||||
/* f17b64c: 0338c823 */ subu $t9,$t9,$t8
|
||||
/* f17b650: 0019c900 */ sll $t9,$t9,0x4
|
||||
/* f17b654: 00024880 */ sll $t1,$v0,0x2
|
||||
/* f17b658: 01224821 */ addu $t1,$t1,$v0
|
||||
/* f17b65c: 03281821 */ addu $v1,$t9,$t0
|
||||
/* f17b660: 906c0df1 */ lbu $t4,0xdf1($v1)
|
||||
/* f17b664: 00094880 */ sll $t1,$t1,0x2
|
||||
/* f17b668: 3c0a8008 */ lui $t2,%hi(g_Bodies+0x2)
|
||||
/* f17b66c: 01495021 */ addu $t2,$t2,$t1
|
||||
/* f17b670: 954acf06 */ lhu $t2,%lo(g_Bodies+0x2)($t2)
|
||||
/* f17b674: 358d0080 */ ori $t5,$t4,0x80
|
||||
/* f17b678: a06d0df1 */ sb $t5,0xdf1($v1)
|
||||
/* f17b67c: 0fc62ec7 */ jal func0f18bb1c
|
||||
/* f17b680: ac6a084c */ sw $t2,0x84c($v1)
|
||||
/* f17b684: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum)
|
||||
/* f17b688: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6)
|
||||
/* f17b68c: 8fb9003c */ lw $t9,0x3c($sp)
|
||||
/* f17b690: 3c18800a */ lui $t8,%hi(g_Menus)
|
||||
/* f17b694: 000e78c0 */ sll $t7,$t6,0x3
|
||||
/* f17b698: 01ee7823 */ subu $t7,$t7,$t6
|
||||
/* f17b69c: 000f7880 */ sll $t7,$t7,0x2
|
||||
/* f17b6a0: 01ee7821 */ addu $t7,$t7,$t6
|
||||
/* f17b6a4: 000f78c0 */ sll $t7,$t7,0x3
|
||||
/* f17b6a8: 01ee7823 */ subu $t7,$t7,$t6
|
||||
/* f17b6ac: 000f7900 */ sll $t7,$t7,0x4
|
||||
/* f17b6b0: 2718e000 */ addiu $t8,$t8,%lo(g_Menus)
|
||||
/* f17b6b4: 01f81821 */ addu $v1,$t7,$t8
|
||||
/* f17b6b8: 03224023 */ subu $t0,$t9,$v0
|
||||
/* f17b6bc: a0680df0 */ sb $t0,0xdf0($v1)
|
||||
.L0f17b6c0:
|
||||
/* f17b6c0: 3c0141f0 */ lui $at,0x41f0
|
||||
/* f17b6c4: 44818000 */ mtc1 $at,$f16
|
||||
/* f17b6c8: 3c098008 */ lui $t1,%hi(var80085448)
|
||||
/* f17b6cc: 25295448 */ addiu $t1,$t1,%lo(var80085448)
|
||||
/* f17b6d0: ac600db4 */ sw $zero,0xdb4($v1)
|
||||
/* f17b6d4: ac690df4 */ sw $t1,0xdf4($v1)
|
||||
/* f17b6d8: 10000054 */ b .L0f17b82c
|
||||
/* f17b6dc: e4700d94 */ swc1 $f16,0xd94($v1)
|
||||
/* f17b6e0: 0fc62ed2 */ jal mpGetHeadRequiredFeature
|
||||
/* f17b6e4: 90c40003 */ lbu $a0,0x3($a2)
|
||||
/* f17b6e8: 0fc67244 */ jal mpIsFeatureUnlocked
|
||||
/* f17b6ec: 00402025 */ or $a0,$v0,$zero
|
||||
/* f17b6f0: 5440004f */ bnezl $v0,.L0f17b830
|
||||
/* f17b6f4: 00001025 */ or $v0,$zero,$zero
|
||||
/* f17b6f8: 1000004d */ b .L0f17b830
|
||||
/* f17b6fc: 24020001 */ addiu $v0,$zero,0x1
|
||||
/* f17b700: 8faa003c */ lw $t2,0x3c($sp)
|
||||
/* f17b704: 10000049 */ b .L0f17b82c
|
||||
/* f17b708: acca0000 */ sw $t2,0x0($a2)
|
||||
/* f17b70c: 3c0c8007 */ lui $t4,%hi(g_MpPlayerNum)
|
||||
/* f17b710: 8d8c1448 */ lw $t4,%lo(g_MpPlayerNum)($t4)
|
||||
/* f17b714: 3c01800a */ lui $at,%hi(g_Menus+0x840)
|
||||
/* f17b718: 240b0003 */ addiu $t3,$zero,0x3
|
||||
/* f17b71c: 000c68c0 */ sll $t5,$t4,0x3
|
||||
/* f17b720: 01ac6823 */ subu $t5,$t5,$t4
|
||||
/* f17b724: 000d6880 */ sll $t5,$t5,0x2
|
||||
/* f17b728: 01ac6821 */ addu $t5,$t5,$t4
|
||||
/* f17b72c: 000d68c0 */ sll $t5,$t5,0x3
|
||||
/* f17b730: 01ac6823 */ subu $t5,$t5,$t4
|
||||
/* f17b734: 000d6900 */ sll $t5,$t5,0x4
|
||||
/* f17b738: 002d0821 */ addu $at,$at,$t5
|
||||
/* f17b73c: 0fc62ec7 */ jal func0f18bb1c
|
||||
/* f17b740: a02be840 */ sb $t3,%lo(g_Menus+0x840)($at)
|
||||
/* f17b744: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum)
|
||||
/* f17b748: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6)
|
||||
/* f17b74c: 44800000 */ mtc1 $zero,$f0
|
||||
/* f17b750: 3c013f80 */ lui $at,0x3f80
|
||||
/* f17b754: 000e78c0 */ sll $t7,$t6,0x3
|
||||
/* f17b758: 01ee7823 */ subu $t7,$t7,$t6
|
||||
/* f17b75c: 000f7880 */ sll $t7,$t7,0x2
|
||||
/* f17b760: 01ee7821 */ addu $t7,$t7,$t6
|
||||
/* f17b764: 000f78c0 */ sll $t7,$t7,0x3
|
||||
/* f17b768: 01ee7823 */ subu $t7,$t7,$t6
|
||||
/* f17b76c: 44819000 */ mtc1 $at,$f18
|
||||
/* f17b770: 000f7900 */ sll $t7,$t7,0x4
|
||||
/* f17b774: 3c19800a */ lui $t9,%hi(g_Menus)
|
||||
/* f17b778: 2739e000 */ addiu $t9,$t9,%lo(g_Menus)
|
||||
/* f17b77c: 25f80840 */ addiu $t8,$t7,0x840
|
||||
/* f17b780: 24080001 */ addiu $t0,$zero,0x1
|
||||
/* f17b784: 44050000 */ mfc1 $a1,$f0
|
||||
/* f17b788: 44060000 */ mfc1 $a2,$f0
|
||||
/* f17b78c: 44070000 */ mfc1 $a3,$f0
|
||||
/* f17b790: afa80020 */ sw $t0,0x20($sp)
|
||||
/* f17b794: 03192021 */ addu $a0,$t8,$t9
|
||||
/* f17b798: e7a00010 */ swc1 $f0,0x10($sp)
|
||||
/* f17b79c: e7a00014 */ swc1 $f0,0x14($sp)
|
||||
/* f17b7a0: e7a00018 */ swc1 $f0,0x18($sp)
|
||||
/* f17b7a4: 0fc3cdcb */ jal func0f0f372c
|
||||
/* f17b7a8: e7b2001c */ swc1 $f18,0x1c($sp)
|
||||
/* f17b7ac: 3c098007 */ lui $t1,%hi(g_MpPlayerNum)
|
||||
/* f17b7b0: 8d291448 */ lw $t1,%lo(g_MpPlayerNum)($t1)
|
||||
/* f17b7b4: 3c017f1c */ lui $at,%hi(var7f1b8148)
|
||||
/* f17b7b8: 3c0c800a */ lui $t4,%hi(g_Menus)
|
||||
/* f17b7bc: 000950c0 */ sll $t2,$t1,0x3
|
||||
/* f17b7c0: 01495023 */ subu $t2,$t2,$t1
|
||||
/* f17b7c4: 000a5080 */ sll $t2,$t2,0x2
|
||||
/* f17b7c8: 01495021 */ addu $t2,$t2,$t1
|
||||
/* f17b7cc: 000a50c0 */ sll $t2,$t2,0x3
|
||||
/* f17b7d0: 01495023 */ subu $t2,$t2,$t1
|
||||
/* f17b7d4: c4228148 */ lwc1 $f2,%lo(var7f1b8148)($at)
|
||||
/* f17b7d8: 44800000 */ mtc1 $zero,$f0
|
||||
/* f17b7dc: 000a5100 */ sll $t2,$t2,0x4
|
||||
/* f17b7e0: 258ce000 */ addiu $t4,$t4,%lo(g_Menus)
|
||||
/* f17b7e4: 014c1821 */ addu $v1,$t2,$t4
|
||||
/* f17b7e8: 3c01c040 */ lui $at,0xc040
|
||||
/* f17b7ec: 44812000 */ mtc1 $at,$f4
|
||||
/* f17b7f0: 3c017f1c */ lui $at,%hi(var7f1b814c)
|
||||
/* f17b7f4: e4600d50 */ swc1 $f0,0xd50($v1)
|
||||
/* f17b7f8: e4600d54 */ swc1 $f0,0xd54($v1)
|
||||
/* f17b7fc: e4600d78 */ swc1 $f0,0xd78($v1)
|
||||
/* f17b800: e4640d7c */ swc1 $f4,0xd7c($v1)
|
||||
/* f17b804: c426814c */ lwc1 $f6,%lo(var7f1b814c)($at)
|
||||
/* f17b808: 3c013f80 */ lui $at,0x3f80
|
||||
/* f17b80c: 44815000 */ mtc1 $at,$f10
|
||||
/* f17b810: 3c0141f0 */ lui $at,0x41f0
|
||||
/* f17b814: 44814000 */ mtc1 $at,$f8
|
||||
/* f17b818: e4620d64 */ swc1 $f2,0xd64($v1)
|
||||
/* f17b81c: e4620d8c */ swc1 $f2,0xd8c($v1)
|
||||
/* f17b820: e4660d5c */ swc1 $f6,0xd5c($v1)
|
||||
/* f17b824: e46a0d84 */ swc1 $f10,0xd84($v1)
|
||||
/* f17b828: e4680d94 */ swc1 $f8,0xd94($v1)
|
||||
.L0f17b82c:
|
||||
/* f17b82c: 00001025 */ or $v0,$zero,$zero
|
||||
.L0f17b830:
|
||||
/* f17b830: 8fbf002c */ lw $ra,0x2c($sp)
|
||||
/* f17b834: 27bd0030 */ addiu $sp,$sp,0x30
|
||||
/* f17b838: 03e00008 */ jr $ra
|
||||
/* f17b83c: 00000000 */ nop
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel func0f17b4f8
|
||||
.late_rodata
|
||||
@@ -2032,6 +2527,7 @@ glabel var7f1b814c
|
||||
/* f17b838: 03e00008 */ jr $ra
|
||||
/* f17b83c: 00000000 */ nop
|
||||
);
|
||||
#endif
|
||||
|
||||
s32 menuhandlerMpCharacterHead(s32 operation, struct menuitem *item, union handlerdata *data)
|
||||
{
|
||||
@@ -3256,6 +3752,134 @@ s32 menudialog0017ccfc(s32 operation, struct menudialog *dialog, union handlerda
|
||||
return menudialogMpSimulant(operation, dialog, data);
|
||||
}
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel menuhandlerMpSimulantDifficulty
|
||||
/* f17cda0: 27bdffd0 */ addiu $sp,$sp,-48
|
||||
/* f17cda4: afb40028 */ sw $s4,0x28($sp)
|
||||
/* f17cda8: afb20020 */ sw $s2,0x20($sp)
|
||||
/* f17cdac: 24010001 */ addiu $at,$zero,0x1
|
||||
/* f17cdb0: 00c0a025 */ or $s4,$a2,$zero
|
||||
/* f17cdb4: afbf002c */ sw $ra,0x2c($sp)
|
||||
/* f17cdb8: afb30024 */ sw $s3,0x24($sp)
|
||||
/* f17cdbc: afb1001c */ sw $s1,0x1c($sp)
|
||||
/* f17cdc0: afb00018 */ sw $s0,0x18($sp)
|
||||
/* f17cdc4: afa50034 */ sw $a1,0x34($sp)
|
||||
/* f17cdc8: 10810038 */ beq $a0,$at,.L0f17ceac
|
||||
/* f17cdcc: 00009025 */ or $s2,$zero,$zero
|
||||
/* f17cdd0: 24010003 */ addiu $at,$zero,0x3
|
||||
/* f17cdd4: 10810042 */ beq $a0,$at,.L0f17cee0
|
||||
/* f17cdd8: 00008825 */ or $s1,$zero,$zero
|
||||
/* f17cddc: 24130006 */ addiu $s3,$zero,0x6
|
||||
/* f17cde0: 10930006 */ beq $a0,$s3,.L0f17cdfc
|
||||
/* f17cde4: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum)
|
||||
/* f17cde8: 24010007 */ addiu $at,$zero,0x7
|
||||
/* f17cdec: 10810014 */ beq $a0,$at,.L0f17ce40
|
||||
/* f17cdf0: 3c188007 */ lui $t8,%hi(g_MpPlayerNum)
|
||||
/* f17cdf4: 10000050 */ b .L0f17cf38
|
||||
/* f17cdf8: 00001025 */ or $v0,$zero,$zero
|
||||
.L0f17cdfc:
|
||||
/* f17cdfc: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6)
|
||||
/* f17ce00: 3c04800a */ lui $a0,%hi(g_Menus+0xe1c)
|
||||
/* f17ce04: 8e850000 */ lw $a1,0x0($s4)
|
||||
/* f17ce08: 000e78c0 */ sll $t7,$t6,0x3
|
||||
/* f17ce0c: 01ee7823 */ subu $t7,$t7,$t6
|
||||
/* f17ce10: 000f7880 */ sll $t7,$t7,0x2
|
||||
/* f17ce14: 01ee7821 */ addu $t7,$t7,$t6
|
||||
/* f17ce18: 000f78c0 */ sll $t7,$t7,0x3
|
||||
/* f17ce1c: 01ee7823 */ subu $t7,$t7,$t6
|
||||
/* f17ce20: 000f7900 */ sll $t7,$t7,0x4
|
||||
/* f17ce24: 008f2021 */ addu $a0,$a0,$t7
|
||||
/* f17ce28: 0fc632d8 */ jal func0f18cb60
|
||||
/* f17ce2c: 8c84ee1c */ lw $a0,%lo(g_Menus+0xe1c)($a0)
|
||||
/* f17ce30: 0fc63377 */ jal func0f18cddc
|
||||
/* f17ce34: 00000000 */ nop
|
||||
/* f17ce38: 1000003f */ b .L0f17cf38
|
||||
/* f17ce3c: 00001025 */ or $v0,$zero,$zero
|
||||
.L0f17ce40:
|
||||
/* f17ce40: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8)
|
||||
/* f17ce44: 3c08800a */ lui $t0,%hi(g_Menus+0xe1c)
|
||||
/* f17ce48: 3c02800b */ lui $v0,%hi(g_MpSimulants+0x48)
|
||||
/* f17ce4c: 0018c8c0 */ sll $t9,$t8,0x3
|
||||
/* f17ce50: 0338c823 */ subu $t9,$t9,$t8
|
||||
/* f17ce54: 0019c880 */ sll $t9,$t9,0x2
|
||||
/* f17ce58: 0338c821 */ addu $t9,$t9,$t8
|
||||
/* f17ce5c: 0019c8c0 */ sll $t9,$t9,0x3
|
||||
/* f17ce60: 0338c823 */ subu $t9,$t9,$t8
|
||||
/* f17ce64: 0019c900 */ sll $t9,$t9,0x4
|
||||
/* f17ce68: 01194021 */ addu $t0,$t0,$t9
|
||||
/* f17ce6c: 8d08ee1c */ lw $t0,%lo(g_Menus+0xe1c)($t0)
|
||||
/* f17ce70: 00084880 */ sll $t1,$t0,0x2
|
||||
/* f17ce74: 01284821 */ addu $t1,$t1,$t0
|
||||
/* f17ce78: 00094880 */ sll $t1,$t1,0x2
|
||||
/* f17ce7c: 01284823 */ subu $t1,$t1,$t0
|
||||
/* f17ce80: 00094880 */ sll $t1,$t1,0x2
|
||||
/* f17ce84: 00491021 */ addu $v0,$v0,$t1
|
||||
/* f17ce88: 9042c580 */ lbu $v0,%lo(g_MpSimulants+0x48)($v0)
|
||||
/* f17ce8c: 04400005 */ bltz $v0,.L0f17cea4
|
||||
/* f17ce90: 28410006 */ slti $at,$v0,0x6
|
||||
/* f17ce94: 10200003 */ beqz $at,.L0f17cea4
|
||||
/* f17ce98: 00000000 */ nop
|
||||
/* f17ce9c: 10000025 */ b .L0f17cf34
|
||||
/* f17cea0: ae820000 */ sw $v0,0x0($s4)
|
||||
.L0f17cea4:
|
||||
/* f17cea4: 10000023 */ b .L0f17cf34
|
||||
/* f17cea8: ae800000 */ sw $zero,0x0($s4)
|
||||
.L0f17ceac:
|
||||
/* f17ceac: 3c108008 */ lui $s0,%hi(g_MpSimulantTypes)
|
||||
/* f17ceb0: 3c118008 */ lui $s1,%hi(g_MpSimulantTypes+0x30)
|
||||
/* f17ceb4: 2631775c */ addiu $s1,$s1,%lo(g_MpSimulantTypes+0x30)
|
||||
/* f17ceb8: 2610772c */ addiu $s0,$s0,%lo(g_MpSimulantTypes)
|
||||
.L0f17cebc:
|
||||
/* f17cebc: 0fc67244 */ jal mpIsFeatureUnlocked
|
||||
/* f17cec0: 92040006 */ lbu $a0,0x6($s0)
|
||||
/* f17cec4: 10400002 */ beqz $v0,.L0f17ced0
|
||||
/* f17cec8: 26100008 */ addiu $s0,$s0,0x8
|
||||
/* f17cecc: 26520001 */ addiu $s2,$s2,0x1
|
||||
.L0f17ced0:
|
||||
/* f17ced0: 1611fffa */ bne $s0,$s1,.L0f17cebc
|
||||
/* f17ced4: 00000000 */ nop
|
||||
/* f17ced8: 10000016 */ b .L0f17cf34
|
||||
/* f17cedc: ae920000 */ sw $s2,0x0($s4)
|
||||
.L0f17cee0:
|
||||
/* f17cee0: 3c108008 */ lui $s0,%hi(g_MpSimulantTypes)
|
||||
/* f17cee4: 2610772c */ addiu $s0,$s0,%lo(g_MpSimulantTypes)
|
||||
/* f17cee8: 24130006 */ addiu $s3,$zero,0x6
|
||||
.L0f17ceec:
|
||||
/* f17ceec: 0fc67244 */ jal mpIsFeatureUnlocked
|
||||
/* f17cef0: 92040006 */ lbu $a0,0x6($s0)
|
||||
/* f17cef4: 5040000a */ beqzl $v0,.L0f17cf20
|
||||
/* f17cef8: 26310001 */ addiu $s1,$s1,0x1
|
||||
/* f17cefc: 8e8a0000 */ lw $t2,0x0($s4)
|
||||
/* f17cf00: 564a0006 */ bnel $s2,$t2,.L0f17cf1c
|
||||
/* f17cf04: 26520001 */ addiu $s2,$s2,0x1
|
||||
/* f17cf08: 0fc5b9f1 */ jal langGet
|
||||
/* f17cf0c: 26245852 */ addiu $a0,$s1,0x5815
|
||||
/* f17cf10: 1000000a */ b .L0f17cf3c
|
||||
/* f17cf14: 8fbf002c */ lw $ra,0x2c($sp)
|
||||
/* f17cf18: 26520001 */ addiu $s2,$s2,0x1
|
||||
.L0f17cf1c:
|
||||
/* f17cf1c: 26310001 */ addiu $s1,$s1,0x1
|
||||
.L0f17cf20:
|
||||
/* f17cf20: 1633fff2 */ bne $s1,$s3,.L0f17ceec
|
||||
/* f17cf24: 26100008 */ addiu $s0,$s0,0x8
|
||||
/* f17cf28: 3c027f1c */ lui $v0,%hi(var7f1b8028)
|
||||
/* f17cf2c: 10000002 */ b .L0f17cf38
|
||||
/* f17cf30: 24428028 */ addiu $v0,$v0,%lo(var7f1b8028)
|
||||
.L0f17cf34:
|
||||
/* f17cf34: 00001025 */ or $v0,$zero,$zero
|
||||
.L0f17cf38:
|
||||
/* f17cf38: 8fbf002c */ lw $ra,0x2c($sp)
|
||||
.L0f17cf3c:
|
||||
/* f17cf3c: 8fb00018 */ lw $s0,0x18($sp)
|
||||
/* f17cf40: 8fb1001c */ lw $s1,0x1c($sp)
|
||||
/* f17cf44: 8fb20020 */ lw $s2,0x20($sp)
|
||||
/* f17cf48: 8fb30024 */ lw $s3,0x24($sp)
|
||||
/* f17cf4c: 8fb40028 */ lw $s4,0x28($sp)
|
||||
/* f17cf50: 03e00008 */ jr $ra
|
||||
/* f17cf54: 27bd0030 */ addiu $sp,$sp,0x30
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel menuhandlerMpSimulantDifficulty
|
||||
/* f17cda0: 27bdffd0 */ addiu $sp,$sp,-48
|
||||
@@ -3382,6 +4006,7 @@ glabel menuhandlerMpSimulantDifficulty
|
||||
/* f17cf50: 03e00008 */ jr $ra
|
||||
/* f17cf54: 27bd0030 */ addiu $sp,$sp,0x30
|
||||
);
|
||||
#endif
|
||||
|
||||
s32 menuhandlerMpDeleteSimulant(s32 operation, struct menuitem *item, union handlerdata *data)
|
||||
{
|
||||
|
||||
+3
-3
@@ -438,7 +438,7 @@ void func0f16dd14(void)
|
||||
}
|
||||
|
||||
musicStartMpDeath(0);
|
||||
var800840f0 = 1200;
|
||||
var800840f0 = PALDOWN(1200);
|
||||
var800840dc = 1;
|
||||
func0f16d44c();
|
||||
}
|
||||
@@ -535,8 +535,8 @@ void musicSetXReason(s32 reason, u32 arg1, u32 duration)
|
||||
{
|
||||
if (g_AudioXReasonsActive[reason] == false) {
|
||||
g_AudioXReasonsActive[reason] = true;
|
||||
var800aaa78[reason] = arg1 * 240;
|
||||
g_AudioXReasonDurations[reason] = duration * 240;
|
||||
var800aaa78[reason] = arg1 * PALDOWN(240);
|
||||
g_AudioXReasonDurations[reason] = duration * PALDOWN(240);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+549
-14
@@ -2774,9 +2774,9 @@ s32 nbombCalculateAlpha(struct nbomb *nbomb)
|
||||
{
|
||||
s32 alpha = 127;
|
||||
|
||||
if (nbomb->age240 > 310) {
|
||||
if (nbomb->age240 < 350) {
|
||||
alpha = (350 * 127 - nbomb->age240 * 127) / 40;
|
||||
if (nbomb->age240 > PALDOWN(310)) {
|
||||
if (nbomb->age240 < PALDOWN(350)) {
|
||||
alpha = (PALDOWN(350) * 127 - nbomb->age240 * 127) / PALDOWN(40);
|
||||
} else {
|
||||
alpha = 0;
|
||||
}
|
||||
@@ -2903,6 +2903,228 @@ void func0f0099a4(void)
|
||||
}
|
||||
}
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel nbombInflictDamage
|
||||
.late_rodata
|
||||
glabel var7f1a7f20
|
||||
.word 0x3c23d70a
|
||||
.text
|
||||
/* f0099e4: 27bdfcf8 */ addiu $sp,$sp,-776
|
||||
/* f0099e8: afb50030 */ sw $s5,0x30($sp)
|
||||
/* f0099ec: 3c15800a */ lui $s5,%hi(g_Vars)
|
||||
/* f0099f0: 26b59fc0 */ addiu $s5,$s5,%lo(g_Vars)
|
||||
/* f0099f4: 8eaf0034 */ lw $t7,0x34($s5)
|
||||
/* f0099f8: afb20024 */ sw $s2,0x24($sp)
|
||||
/* f0099fc: afb10020 */ sw $s1,0x20($sp)
|
||||
/* f009a00: 240e001f */ addiu $t6,$zero,0x1f
|
||||
/* f009a04: 00809025 */ or $s2,$a0,$zero
|
||||
/* f009a08: afbf0034 */ sw $ra,0x34($sp)
|
||||
/* f009a0c: afb4002c */ sw $s4,0x2c($sp)
|
||||
/* f009a10: afb30028 */ sw $s3,0x28($sp)
|
||||
/* f009a14: afb0001c */ sw $s0,0x1c($sp)
|
||||
/* f009a18: 00008825 */ or $s1,$zero,$zero
|
||||
/* f009a1c: a3ae0070 */ sb $t6,0x70($sp)
|
||||
/* f009a20: 19e000b2 */ blez $t7,.L0f009cec
|
||||
/* f009a24: a3a00073 */ sb $zero,0x73($sp)
|
||||
/* f009a28: 8c98000c */ lw $t8,0xc($a0)
|
||||
/* f009a2c: 2b01015f */ slti $at,$t8,0x124
|
||||
/* f009a30: 502000af */ beqzl $at,.L0f009cf0
|
||||
/* f009a34: 8fbf0034 */ lw $ra,0x34($sp)
|
||||
/* f009a38: c4840000 */ lwc1 $f4,0x0($a0)
|
||||
/* f009a3c: c4860010 */ lwc1 $f6,0x10($a0)
|
||||
/* f009a40: 3c13800a */ lui $s3,%hi(g_Rooms)
|
||||
/* f009a44: 26734928 */ addiu $s3,$s3,%lo(g_Rooms)
|
||||
/* f009a48: 46062201 */ sub.s $f8,$f4,$f6
|
||||
/* f009a4c: 24100001 */ addiu $s0,$zero,0x1
|
||||
/* f009a50: 2403008c */ addiu $v1,$zero,0x8c
|
||||
/* f009a54: 27b4007c */ addiu $s4,$sp,0x7c
|
||||
/* f009a58: e7a800f4 */ swc1 $f8,0xf4($sp)
|
||||
/* f009a5c: c4900010 */ lwc1 $f16,0x10($a0)
|
||||
/* f009a60: c48a0004 */ lwc1 $f10,0x4($a0)
|
||||
/* f009a64: 46105481 */ sub.s $f18,$f10,$f16
|
||||
/* f009a68: e7b200f8 */ swc1 $f18,0xf8($sp)
|
||||
/* f009a6c: c4860010 */ lwc1 $f6,0x10($a0)
|
||||
/* f009a70: c4840008 */ lwc1 $f4,0x8($a0)
|
||||
/* f009a74: 46062201 */ sub.s $f8,$f4,$f6
|
||||
/* f009a78: e7a800fc */ swc1 $f8,0xfc($sp)
|
||||
/* f009a7c: c4900010 */ lwc1 $f16,0x10($a0)
|
||||
/* f009a80: c48a0000 */ lwc1 $f10,0x0($a0)
|
||||
/* f009a84: 46105480 */ add.s $f18,$f10,$f16
|
||||
/* f009a88: e7b200e8 */ swc1 $f18,0xe8($sp)
|
||||
/* f009a8c: c4860010 */ lwc1 $f6,0x10($a0)
|
||||
/* f009a90: c4840004 */ lwc1 $f4,0x4($a0)
|
||||
/* f009a94: 46062200 */ add.s $f8,$f4,$f6
|
||||
/* f009a98: e7a800ec */ swc1 $f8,0xec($sp)
|
||||
/* f009a9c: c4900010 */ lwc1 $f16,0x10($a0)
|
||||
/* f009aa0: c48a0008 */ lwc1 $f10,0x8($a0)
|
||||
/* f009aa4: 8ea402bc */ lw $a0,0x2bc($s5)
|
||||
/* f009aa8: 46105480 */ add.s $f18,$f10,$f16
|
||||
/* f009aac: 28810002 */ slti $at,$a0,0x2
|
||||
/* f009ab0: 14200038 */ bnez $at,.L0f009b94
|
||||
/* f009ab4: e7b200f0 */ swc1 $f18,0xf0($sp)
|
||||
.L0f009ab8:
|
||||
/* f009ab8: 8e790000 */ lw $t9,0x0($s3)
|
||||
/* f009abc: c7a400e8 */ lwc1 $f4,0xe8($sp)
|
||||
/* f009ac0: c7aa00f4 */ lwc1 $f10,0xf4($sp)
|
||||
/* f009ac4: 03231021 */ addu $v0,$t9,$v1
|
||||
/* f009ac8: c4460018 */ lwc1 $f6,0x18($v0)
|
||||
/* f009acc: 4606203c */ c.lt.s $f4,$f6
|
||||
/* f009ad0: 00000000 */ nop
|
||||
/* f009ad4: 4503002c */ bc1tl .L0f009b88
|
||||
/* f009ad8: 26100001 */ addiu $s0,$s0,0x1
|
||||
/* f009adc: c4480024 */ lwc1 $f8,0x24($v0)
|
||||
/* f009ae0: c7b000ec */ lwc1 $f16,0xec($sp)
|
||||
/* f009ae4: 460a403c */ c.lt.s $f8,$f10
|
||||
/* f009ae8: 00000000 */ nop
|
||||
/* f009aec: 45030026 */ bc1tl .L0f009b88
|
||||
/* f009af0: 26100001 */ addiu $s0,$s0,0x1
|
||||
/* f009af4: c452001c */ lwc1 $f18,0x1c($v0)
|
||||
/* f009af8: c7a600f8 */ lwc1 $f6,0xf8($sp)
|
||||
/* f009afc: 4612803c */ c.lt.s $f16,$f18
|
||||
/* f009b00: 00000000 */ nop
|
||||
/* f009b04: 45030020 */ bc1tl .L0f009b88
|
||||
/* f009b08: 26100001 */ addiu $s0,$s0,0x1
|
||||
/* f009b0c: c4440028 */ lwc1 $f4,0x28($v0)
|
||||
/* f009b10: c7a800f0 */ lwc1 $f8,0xf0($sp)
|
||||
/* f009b14: 4606203c */ c.lt.s $f4,$f6
|
||||
/* f009b18: 00000000 */ nop
|
||||
/* f009b1c: 4503001a */ bc1tl .L0f009b88
|
||||
/* f009b20: 26100001 */ addiu $s0,$s0,0x1
|
||||
/* f009b24: c44a0020 */ lwc1 $f10,0x20($v0)
|
||||
/* f009b28: c7b200fc */ lwc1 $f18,0xfc($sp)
|
||||
/* f009b2c: 460a403c */ c.lt.s $f8,$f10
|
||||
/* f009b30: 00000000 */ nop
|
||||
/* f009b34: 45030014 */ bc1tl .L0f009b88
|
||||
/* f009b38: 26100001 */ addiu $s0,$s0,0x1
|
||||
/* f009b3c: c450002c */ lwc1 $f16,0x2c($v0)
|
||||
/* f009b40: 2a210034 */ slti $at,$s1,0x34
|
||||
/* f009b44: 4612803c */ c.lt.s $f16,$f18
|
||||
/* f009b48: 00000000 */ nop
|
||||
/* f009b4c: 4503000e */ bc1tl .L0f009b88
|
||||
/* f009b50: 26100001 */ addiu $s0,$s0,0x1
|
||||
/* f009b54: 1020000b */ beqz $at,.L0f009b84
|
||||
/* f009b58: 00114040 */ sll $t0,$s1,0x1
|
||||
/* f009b5c: 02884821 */ addu $t1,$s4,$t0
|
||||
/* f009b60: a5300000 */ sh $s0,0x0($t1)
|
||||
/* f009b64: 26310001 */ addiu $s1,$s1,0x1
|
||||
/* f009b68: afa30040 */ sw $v1,0x40($sp)
|
||||
/* f009b6c: 02002025 */ or $a0,$s0,$zero
|
||||
/* f009b70: 2405ffda */ addiu $a1,$zero,-38
|
||||
/* f009b74: 0fc010e3 */ jal roomAdjustLighting
|
||||
/* f009b78: 2406ff4c */ addiu $a2,$zero,-180
|
||||
/* f009b7c: 8fa30040 */ lw $v1,0x40($sp)
|
||||
/* f009b80: 8ea402bc */ lw $a0,0x2bc($s5)
|
||||
.L0f009b84:
|
||||
/* f009b84: 26100001 */ addiu $s0,$s0,0x1
|
||||
.L0f009b88:
|
||||
/* f009b88: 0204082a */ slt $at,$s0,$a0
|
||||
/* f009b8c: 1420ffca */ bnez $at,.L0f009ab8
|
||||
/* f009b90: 2463008c */ addiu $v1,$v1,0x8c
|
||||
.L0f009b94:
|
||||
/* f009b94: 27a4007c */ addiu $a0,$sp,0x7c
|
||||
/* f009b98: 00115840 */ sll $t3,$s1,0x1
|
||||
/* f009b9c: 008b6021 */ addu $t4,$a0,$t3
|
||||
/* f009ba0: 240affff */ addiu $t2,$zero,-1
|
||||
/* f009ba4: 27b00100 */ addiu $s0,$sp,0x100
|
||||
/* f009ba8: a58a0000 */ sh $t2,0x0($t4)
|
||||
/* f009bac: 02002825 */ or $a1,$s0,$zero
|
||||
/* f009bb0: 0fc197e0 */ jal roomGetProps
|
||||
/* f009bb4: 24060100 */ addiu $a2,$zero,0x100
|
||||
/* f009bb8: 87ad0100 */ lh $t5,0x100($sp)
|
||||
/* f009bbc: 02009825 */ or $s3,$s0,$zero
|
||||
/* f009bc0: 27ae0100 */ addiu $t6,$sp,0x100
|
||||
/* f009bc4: 05a00049 */ bltz $t5,.L0f009cec
|
||||
/* f009bc8: 27b4004c */ addiu $s4,$sp,0x4c
|
||||
/* f009bcc: 85c20000 */ lh $v0,0x0($t6)
|
||||
/* f009bd0: 8eb80338 */ lw $t8,0x338($s5)
|
||||
.L0f009bd4:
|
||||
/* f009bd4: 000278c0 */ sll $t7,$v0,0x3
|
||||
/* f009bd8: 01e27821 */ addu $t7,$t7,$v0
|
||||
/* f009bdc: 000f78c0 */ sll $t7,$t7,0x3
|
||||
/* f009be0: 01f88821 */ addu $s1,$t7,$t8
|
||||
/* f009be4: 86390002 */ lh $t9,0x2($s1)
|
||||
/* f009be8: 5720003d */ bnezl $t9,.L0f009ce0
|
||||
/* f009bec: 86620002 */ lh $v0,0x2($s3)
|
||||
/* f009bf0: 92220000 */ lbu $v0,0x0($s1)
|
||||
/* f009bf4: 24010003 */ addiu $at,$zero,0x3
|
||||
/* f009bf8: 10410003 */ beq $v0,$at,.L0f009c08
|
||||
/* f009bfc: 24010006 */ addiu $at,$zero,0x6
|
||||
/* f009c00: 54410037 */ bnel $v0,$at,.L0f009ce0
|
||||
/* f009c04: 86620002 */ lh $v0,0x2($s3)
|
||||
.L0f009c08:
|
||||
/* f009c08: c6240008 */ lwc1 $f4,0x8($s1)
|
||||
/* f009c0c: c6460000 */ lwc1 $f6,0x0($s2)
|
||||
/* f009c10: c628000c */ lwc1 $f8,0xc($s1)
|
||||
/* f009c14: c64a0004 */ lwc1 $f10,0x4($s2)
|
||||
/* f009c18: 46062001 */ sub.s $f0,$f4,$f6
|
||||
/* f009c1c: c6300010 */ lwc1 $f16,0x10($s1)
|
||||
/* f009c20: c6520008 */ lwc1 $f18,0x8($s2)
|
||||
/* f009c24: 460a4081 */ sub.s $f2,$f8,$f10
|
||||
/* f009c28: 46000102 */ mul.s $f4,$f0,$f0
|
||||
/* f009c2c: 46128381 */ sub.s $f14,$f16,$f18
|
||||
/* f009c30: 46021182 */ mul.s $f6,$f2,$f2
|
||||
/* f009c34: 46062200 */ add.s $f8,$f4,$f6
|
||||
/* f009c38: 460e7282 */ mul.s $f10,$f14,$f14
|
||||
/* f009c3c: 0c012974 */ jal sqrtf
|
||||
/* f009c40: 460a4300 */ add.s $f12,$f8,$f10
|
||||
/* f009c44: c6500010 */ lwc1 $f16,0x10($s2)
|
||||
/* f009c48: 4610003c */ c.lt.s $f0,$f16
|
||||
/* f009c4c: 00000000 */ nop
|
||||
/* f009c50: 45020023 */ bc1fl .L0f009ce0
|
||||
/* f009c54: 86620002 */ lh $v0,0x2($s3)
|
||||
/* f009c58: 8e300004 */ lw $s0,0x4($s1)
|
||||
/* f009c5c: 3c088006 */ lui $t0,%hi(var800616e8)
|
||||
/* f009c60: 250816e8 */ addiu $t0,$t0,%lo(var800616e8)
|
||||
/* f009c64: 5200001e */ beqzl $s0,.L0f009ce0
|
||||
/* f009c68: 86620002 */ lh $v0,0x2($s3)
|
||||
/* f009c6c: 8d010000 */ lw $at,0x0($t0)
|
||||
/* f009c70: c6a4004c */ lwc1 $f4,0x4c($s5)
|
||||
/* f009c74: 02002025 */ or $a0,$s0,$zero
|
||||
/* f009c78: ae810000 */ sw $at,0x0($s4)
|
||||
/* f009c7c: 8d0b0004 */ lw $t3,0x4($t0)
|
||||
/* f009c80: 02803025 */ or $a2,$s4,$zero
|
||||
/* f009c84: 27a70070 */ addiu $a3,$sp,0x70
|
||||
/* f009c88: ae8b0004 */ sw $t3,0x4($s4)
|
||||
/* f009c8c: 8d010008 */ lw $at,0x8($t0)
|
||||
/* f009c90: ae810008 */ sw $at,0x8($s4)
|
||||
/* f009c94: 3c017f1a */ lui $at,%hi(var7f1a7f20)
|
||||
/* f009c98: c4327f20 */ lwc1 $f18,%lo(var7f1a7f20)($at)
|
||||
/* f009c9c: 8e4a001c */ lw $t2,0x1c($s2)
|
||||
/* f009ca0: 46049002 */ mul.s $f0,$f18,$f4
|
||||
/* f009ca4: afaa0010 */ sw $t2,0x10($sp)
|
||||
/* f009ca8: 44050000 */ mfc1 $a1,$f0
|
||||
/* f009cac: 0fc0d049 */ jal chrPoison
|
||||
/* f009cb0: 00000000 */ nop
|
||||
/* f009cb4: 8e0c0018 */ lw $t4,0x18($s0)
|
||||
/* f009cb8: 8e0e0014 */ lw $t6,0x14($s0)
|
||||
/* f009cbc: 3c010020 */ lui $at,0x20
|
||||
/* f009cc0: 01816825 */ or $t5,$t4,$at
|
||||
/* f009cc4: 000e7880 */ sll $t7,$t6,0x2
|
||||
/* f009cc8: 05e10004 */ bgez $t7,.L0f009cdc
|
||||
/* f009ccc: ae0d0018 */ sw $t5,0x18($s0)
|
||||
/* f009cd0: 02002025 */ or $a0,$s0,$zero
|
||||
/* f009cd4: 0fc08946 */ jal chrUncloak
|
||||
/* f009cd8: 24050001 */ addiu $a1,$zero,0x1
|
||||
.L0f009cdc:
|
||||
/* f009cdc: 86620002 */ lh $v0,0x2($s3)
|
||||
.L0f009ce0:
|
||||
/* f009ce0: 26730002 */ addiu $s3,$s3,0x2
|
||||
/* f009ce4: 0443ffbb */ bgezl $v0,.L0f009bd4
|
||||
/* f009ce8: 8eb80338 */ lw $t8,0x338($s5)
|
||||
.L0f009cec:
|
||||
/* f009cec: 8fbf0034 */ lw $ra,0x34($sp)
|
||||
.L0f009cf0:
|
||||
/* f009cf0: 8fb0001c */ lw $s0,0x1c($sp)
|
||||
/* f009cf4: 8fb10020 */ lw $s1,0x20($sp)
|
||||
/* f009cf8: 8fb20024 */ lw $s2,0x24($sp)
|
||||
/* f009cfc: 8fb30028 */ lw $s3,0x28($sp)
|
||||
/* f009d00: 8fb4002c */ lw $s4,0x2c($sp)
|
||||
/* f009d04: 8fb50030 */ lw $s5,0x30($sp)
|
||||
/* f009d08: 03e00008 */ jr $ra
|
||||
/* f009d0c: 27bd0308 */ addiu $sp,$sp,0x308
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel nbombInflictDamage
|
||||
.late_rodata
|
||||
@@ -3123,6 +3345,7 @@ glabel var7f1a7f20
|
||||
/* f009d08: 03e00008 */ jr $ra
|
||||
/* f009d0c: 27bd0308 */ addiu $sp,$sp,0x308
|
||||
);
|
||||
#endif
|
||||
|
||||
// Mismatch: different usage of callee-save registers relating to room loop
|
||||
//void nbombInflictDamage(struct nbomb *nbomb)
|
||||
@@ -3229,18 +3452,17 @@ void nbombTick(struct nbomb *nbomb)
|
||||
|
||||
nbomb->age240 += increment;
|
||||
|
||||
if (nbomb->age240 < 80) {
|
||||
nbomb->radius = nbomb->age240 / 80.0f;
|
||||
|
||||
if (nbomb->age240 < PALDOWN(80)) {
|
||||
nbomb->radius = nbomb->age240 / (PAL ? 66.0f : 80.0f);
|
||||
nbomb->radius = sqrtf(sqrtf(nbomb->radius));
|
||||
nbomb->unk18 = 0;
|
||||
} else {
|
||||
nbomb->radius = sinf((nbomb->age240 - 80) * (PAL ? 0.062800005078316f : 0.0523333363235f)) * 0.05f + 1.0f;
|
||||
nbomb->radius = sinf((nbomb->age240 - PALDOWN(80)) * (PAL ? 0.062800005078316f : 0.0523333363235f)) * 0.05f + 1.0f;
|
||||
|
||||
// Return value is not used - could have been printed
|
||||
sinf((nbomb->age240 - 80) * (PAL ? 0.062800005078316f : 0.0523333363235f));
|
||||
sinf((nbomb->age240 - PALDOWN(80)) * (PAL ? 0.062800005078316f : 0.0523333363235f));
|
||||
|
||||
nbomb->unk18 = ((nbomb->age240 - 80) / (PAL ? 225.0f : 270.0f)) * 3.0f;
|
||||
nbomb->unk18 = ((nbomb->age240 - PALDOWN(80)) / (PAL ? 225.0f : 270.0f)) * 3.0f;
|
||||
}
|
||||
|
||||
nbomb->radius *= 500.0f;
|
||||
@@ -3261,7 +3483,7 @@ void nbombTick(struct nbomb *nbomb)
|
||||
|
||||
nbomb->unk14 %= 0x800;
|
||||
|
||||
if (nbomb->age240 > 370) {
|
||||
if (nbomb->age240 > (PAL ? 307 : 370)) {
|
||||
nbomb->age240 = -1;
|
||||
}
|
||||
}
|
||||
@@ -3291,7 +3513,7 @@ void nbombsTick(void)
|
||||
|
||||
somevalue = 0;
|
||||
|
||||
if (youngest240 < 350) {
|
||||
if (youngest240 < PALDOWN(350)) {
|
||||
if (g_Vars.lvupdate240 != 0) {
|
||||
if (g_NbombAudioHandle == 0) {
|
||||
audioStart(var80095200, SFX_SHIP_HUM, &g_NbombAudioHandle, -1, -1, -1, -1, -1);
|
||||
@@ -3302,11 +3524,11 @@ void nbombsTick(void)
|
||||
if (g_NbombAudioHandle) {
|
||||
f32 speed = func0f006b08(20) * 0.02f + 0.4f;
|
||||
|
||||
if (youngest240 > 300) {
|
||||
somevalue = (1.0f - (f32)(youngest240 - 300) / 50.0f) * 32767.0f;
|
||||
if (youngest240 > PALDOWN(300)) {
|
||||
somevalue = (1.0f - (f32)(youngest240 - PALDOWN(300)) / (PAL ? 41.0f : 50.0f)) * 32767.0f;
|
||||
}
|
||||
|
||||
if (youngest240 >= 350) {
|
||||
if (youngest240 >= PALDOWN(350)) {
|
||||
somevalue = 0;
|
||||
}
|
||||
|
||||
@@ -3445,6 +3667,318 @@ f32 gasGetDoorFrac(s32 tagnum)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if PAL
|
||||
GLOBAL_ASM(
|
||||
glabel func0f00a490
|
||||
/* f00a490: 27bdff80 */ addiu $sp,$sp,-128
|
||||
/* f00a494: 3c02800a */ lui $v0,%hi(g_Vars+0x284)
|
||||
/* f00a498: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0)
|
||||
/* f00a49c: afbf0034 */ sw $ra,0x34($sp)
|
||||
/* f00a4a0: afb30030 */ sw $s3,0x30($sp)
|
||||
/* f00a4a4: afb2002c */ sw $s2,0x2c($sp)
|
||||
/* f00a4a8: afb10028 */ sw $s1,0x28($sp)
|
||||
/* f00a4ac: afb00024 */ sw $s0,0x24($sp)
|
||||
/* f00a4b0: afa40080 */ sw $a0,0x80($sp)
|
||||
/* f00a4b4: afa00050 */ sw $zero,0x50($sp)
|
||||
/* f00a4b8: c4441bb0 */ lwc1 $f4,0x1bb0($v0)
|
||||
/* f00a4bc: 3c10800a */ lui $s0,%hi(g_Nbombs)
|
||||
/* f00a4c0: 3c11800a */ lui $s1,%hi(var8009cbf8)
|
||||
/* f00a4c4: e7a40070 */ swc1 $f4,0x70($sp)
|
||||
/* f00a4c8: c4461bb4 */ lwc1 $f6,0x1bb4($v0)
|
||||
/* f00a4cc: 00009025 */ or $s2,$zero,$zero
|
||||
/* f00a4d0: 00009825 */ or $s3,$zero,$zero
|
||||
/* f00a4d4: e7a60074 */ swc1 $f6,0x74($sp)
|
||||
/* f00a4d8: c4481bb8 */ lwc1 $f8,0x1bb8($v0)
|
||||
/* f00a4dc: 2631cbf8 */ addiu $s1,$s1,%lo(var8009cbf8)
|
||||
/* f00a4e0: 2610cb08 */ addiu $s0,$s0,%lo(g_Nbombs)
|
||||
/* f00a4e4: e7a80078 */ swc1 $f8,0x78($sp)
|
||||
/* f00a4e8: 8e02000c */ lw $v0,0xc($s0)
|
||||
.L0f00a4ec:
|
||||
/* f00a4ec: 0440001d */ bltz $v0,.L0f00a564
|
||||
/* f00a4f0: 2841015f */ slti $at,$v0,0x124
|
||||
/* f00a4f4: 1020001b */ beqz $at,.L0f00a564
|
||||
/* f00a4f8: c7aa0070 */ lwc1 $f10,0x70($sp)
|
||||
/* f00a4fc: c6100000 */ lwc1 $f16,0x0($s0)
|
||||
/* f00a500: c7b20074 */ lwc1 $f18,0x74($sp)
|
||||
/* f00a504: c6040004 */ lwc1 $f4,0x4($s0)
|
||||
/* f00a508: 46105001 */ sub.s $f0,$f10,$f16
|
||||
/* f00a50c: c7a60078 */ lwc1 $f6,0x78($sp)
|
||||
/* f00a510: c6080008 */ lwc1 $f8,0x8($s0)
|
||||
/* f00a514: 46049081 */ sub.s $f2,$f18,$f4
|
||||
/* f00a518: 46000282 */ mul.s $f10,$f0,$f0
|
||||
/* f00a51c: 46083381 */ sub.s $f14,$f6,$f8
|
||||
/* f00a520: 46021402 */ mul.s $f16,$f2,$f2
|
||||
/* f00a524: 46105480 */ add.s $f18,$f10,$f16
|
||||
/* f00a528: 460e7102 */ mul.s $f4,$f14,$f14
|
||||
/* f00a52c: 0c012974 */ jal sqrtf
|
||||
/* f00a530: 46049300 */ add.s $f12,$f18,$f4
|
||||
/* f00a534: c6060010 */ lwc1 $f6,0x10($s0)
|
||||
/* f00a538: 02002025 */ or $a0,$s0,$zero
|
||||
/* f00a53c: 4606003c */ c.lt.s $f0,$f6
|
||||
/* f00a540: 00000000 */ nop
|
||||
/* f00a544: 45020008 */ bc1fl .L0f00a568
|
||||
/* f00a548: 26100028 */ addiu $s0,$s0,0x28
|
||||
/* f00a54c: 0fc0252f */ jal nbombCalculateAlpha
|
||||
/* f00a550: 24120001 */ addiu $s2,$zero,0x1
|
||||
/* f00a554: 0262082b */ sltu $at,$s3,$v0
|
||||
/* f00a558: 50200003 */ beqzl $at,.L0f00a568
|
||||
/* f00a55c: 26100028 */ addiu $s0,$s0,0x28
|
||||
/* f00a560: 00409825 */ or $s3,$v0,$zero
|
||||
.L0f00a564:
|
||||
/* f00a564: 26100028 */ addiu $s0,$s0,0x28
|
||||
.L0f00a568:
|
||||
/* f00a568: 5611ffe0 */ bnel $s0,$s1,.L0f00a4ec
|
||||
/* f00a56c: 8e02000c */ lw $v0,0xc($s0)
|
||||
/* f00a570: 524000e6 */ beqzl $s2,.L0f00a90c
|
||||
/* f00a574: 8fb80050 */ lw $t8,0x50($sp)
|
||||
/* f00a578: 0fc59e73 */ jal gfxAllocateColours
|
||||
/* f00a57c: 24040001 */ addiu $a0,$zero,0x1
|
||||
/* f00a580: afa20048 */ sw $v0,0x48($sp)
|
||||
/* f00a584: 0fc59e59 */ jal gfxAllocateVertices
|
||||
/* f00a588: 24040004 */ addiu $a0,$zero,0x4
|
||||
/* f00a58c: 0c002f40 */ jal viGetViewLeft
|
||||
/* f00a590: 00408025 */ or $s0,$v0,$zero
|
||||
/* f00a594: 00027080 */ sll $t6,$v0,0x2
|
||||
/* f00a598: 01c27021 */ addu $t6,$t6,$v0
|
||||
/* f00a59c: 000e7040 */ sll $t6,$t6,0x1
|
||||
/* f00a5a0: 0c002f44 */ jal viGetViewTop
|
||||
/* f00a5a4: a7ae0042 */ sh $t6,0x42($sp)
|
||||
/* f00a5a8: 00027880 */ sll $t7,$v0,0x2
|
||||
/* f00a5ac: 01e27821 */ addu $t7,$t7,$v0
|
||||
/* f00a5b0: 000f7840 */ sll $t7,$t7,0x1
|
||||
/* f00a5b4: 0c002f40 */ jal viGetViewLeft
|
||||
/* f00a5b8: a7af0040 */ sh $t7,0x40($sp)
|
||||
/* f00a5bc: 00028c00 */ sll $s1,$v0,0x10
|
||||
/* f00a5c0: 0011c403 */ sra $t8,$s1,0x10
|
||||
/* f00a5c4: 0c002f22 */ jal viGetViewWidth
|
||||
/* f00a5c8: 03008825 */ or $s1,$t8,$zero
|
||||
/* f00a5cc: 00515821 */ addu $t3,$v0,$s1
|
||||
/* f00a5d0: 000b6080 */ sll $t4,$t3,0x2
|
||||
/* f00a5d4: 018b6021 */ addu $t4,$t4,$t3
|
||||
/* f00a5d8: 000c6040 */ sll $t4,$t4,0x1
|
||||
/* f00a5dc: 0c002f44 */ jal viGetViewTop
|
||||
/* f00a5e0: a7ac003e */ sh $t4,0x3e($sp)
|
||||
/* f00a5e4: 00028c00 */ sll $s1,$v0,0x10
|
||||
/* f00a5e8: 00116c03 */ sra $t5,$s1,0x10
|
||||
/* f00a5ec: 0c002f26 */ jal viGetViewHeight
|
||||
/* f00a5f0: 01a08825 */ or $s1,$t5,$zero
|
||||
/* f00a5f4: 3c014100 */ lui $at,0x4100
|
||||
/* f00a5f8: 44811000 */ mtc1 $at,$f2
|
||||
/* f00a5fc: 3c014300 */ lui $at,0x4300
|
||||
/* f00a600: 44816000 */ mtc1 $at,$f12
|
||||
/* f00a604: 3c014200 */ lui $at,0x4200
|
||||
/* f00a608: 44817000 */ mtc1 $at,$f14
|
||||
/* f00a60c: 3c018006 */ lui $at,%hi(var80061630)
|
||||
/* f00a610: c4201630 */ lwc1 $f0,%lo(var80061630)($at)
|
||||
/* f00a614: c7a40074 */ lwc1 $f4,0x74($sp)
|
||||
/* f00a618: 00514821 */ addu $t1,$v0,$s1
|
||||
/* f00a61c: 46001202 */ mul.s $f8,$f2,$f0
|
||||
/* f00a620: 00097400 */ sll $t6,$t1,0x10
|
||||
/* f00a624: 000e7c03 */ sra $t7,$t6,0x10
|
||||
/* f00a628: 000fc080 */ sll $t8,$t7,0x2
|
||||
/* f00a62c: 030fc021 */ addu $t8,$t8,$t7
|
||||
/* f00a630: 0018c040 */ sll $t8,$t8,0x1
|
||||
/* f00a634: 0018cc00 */ sll $t9,$t8,0x10
|
||||
/* f00a638: 460c4282 */ mul.s $f10,$f8,$f12
|
||||
/* f00a63c: 00195403 */ sra $t2,$t9,0x10
|
||||
/* f00a640: 01404825 */ or $t1,$t2,$zero
|
||||
/* f00a644: 240a0001 */ addiu $t2,$zero,0x1
|
||||
/* f00a648: afaa0050 */ sw $t2,0x50($sp)
|
||||
/* f00a64c: a7a9003c */ sh $t1,0x3c($sp)
|
||||
/* f00a650: 8fa40080 */ lw $a0,0x80($sp)
|
||||
/* f00a654: 460e5402 */ mul.s $f16,$f10,$f14
|
||||
/* f00a658: 46000280 */ add.s $f10,$f0,$f0
|
||||
/* f00a65c: 46022182 */ mul.s $f6,$f4,$f2
|
||||
/* f00a660: 4600848d */ trunc.w.s $f18,$f16
|
||||
/* f00a664: 460c5402 */ mul.s $f16,$f10,$f12
|
||||
/* f00a668: 44129000 */ mfc1 $s2,$f18
|
||||
/* f00a66c: 4600320d */ trunc.w.s $f8,$f6
|
||||
/* f00a670: 460e8482 */ mul.s $f18,$f16,$f14
|
||||
/* f00a674: 06410004 */ bgez $s2,.L0f00a688
|
||||
/* f00a678: 324c07ff */ andi $t4,$s2,0x7ff
|
||||
/* f00a67c: 11800002 */ beqz $t4,.L0f00a688
|
||||
/* f00a680: 00000000 */ nop
|
||||
/* f00a684: 258cf800 */ addiu $t4,$t4,-2048
|
||||
.L0f00a688:
|
||||
/* f00a688: 4600910d */ trunc.w.s $f4,$f18
|
||||
/* f00a68c: 44184000 */ mfc1 $t8,$f8
|
||||
/* f00a690: 000c6c00 */ sll $t5,$t4,0x10
|
||||
/* f00a694: 000d7403 */ sra $t6,$t5,0x10
|
||||
/* f00a698: 440f2000 */ mfc1 $t7,$f4
|
||||
/* f00a69c: 01c09025 */ or $s2,$t6,$zero
|
||||
/* f00a6a0: 07010004 */ bgez $t8,.L0f00a6b4
|
||||
/* f00a6a4: 331907ff */ andi $t9,$t8,0x7ff
|
||||
/* f00a6a8: 13200002 */ beqz $t9,.L0f00a6b4
|
||||
/* f00a6ac: 00000000 */ nop
|
||||
/* f00a6b0: 2739f800 */ addiu $t9,$t9,-2048
|
||||
.L0f00a6b4:
|
||||
/* f00a6b4: 03205825 */ or $t3,$t9,$zero
|
||||
/* f00a6b8: 016fc821 */ addu $t9,$t3,$t7
|
||||
/* f00a6bc: 0fc351e7 */ jal func0f0d479c
|
||||
/* f00a6c0: a7b9005e */ sh $t9,0x5e($sp)
|
||||
/* f00a6c4: 3c05800b */ lui $a1,%hi(var800ab5a8)
|
||||
/* f00a6c8: 87a8005e */ lh $t0,0x5e($sp)
|
||||
/* f00a6cc: 87a9003c */ lh $t1,0x3c($sp)
|
||||
/* f00a6d0: 8ca5b5a8 */ lw $a1,%lo(var800ab5a8)($a1)
|
||||
/* f00a6d4: 240c0002 */ addiu $t4,$zero,0x2
|
||||
/* f00a6d8: 240d0001 */ addiu $t5,$zero,0x1
|
||||
/* f00a6dc: afa20080 */ sw $v0,0x80($sp)
|
||||
/* f00a6e0: afad0014 */ sw $t5,0x14($sp)
|
||||
/* f00a6e4: afac0010 */ sw $t4,0x10($sp)
|
||||
/* f00a6e8: 27a40080 */ addiu $a0,$sp,0x80
|
||||
/* f00a6ec: 24060002 */ addiu $a2,$zero,0x2
|
||||
/* f00a6f0: 24070001 */ addiu $a3,$zero,0x1
|
||||
/* f00a6f4: afa00018 */ sw $zero,0x18($sp)
|
||||
/* f00a6f8: a7a8005e */ sh $t0,0x5e($sp)
|
||||
/* f00a6fc: a7a9003c */ sh $t1,0x3c($sp)
|
||||
/* f00a700: 0fc2ce70 */ jal func0f0b39c0
|
||||
/* f00a704: 24a50078 */ addiu $a1,$a1,0x0078
|
||||
/* f00a708: 8fae0080 */ lw $t6,0x80($sp)
|
||||
/* f00a70c: 87a8005e */ lh $t0,0x5e($sp)
|
||||
/* f00a710: 87a9003c */ lh $t1,0x3c($sp)
|
||||
/* f00a714: 25cb0008 */ addiu $t3,$t6,0x8
|
||||
/* f00a718: afab0080 */ sw $t3,0x80($sp)
|
||||
/* f00a71c: 3c0fe700 */ lui $t7,0xe700
|
||||
/* f00a720: adcf0000 */ sw $t7,0x0($t6)
|
||||
/* f00a724: adc00004 */ sw $zero,0x4($t6)
|
||||
/* f00a728: 8fb80080 */ lw $t8,0x80($sp)
|
||||
/* f00a72c: 3c0aba00 */ lui $t2,0xba00
|
||||
/* f00a730: 354a1402 */ ori $t2,$t2,0x1402
|
||||
/* f00a734: 27190008 */ addiu $t9,$t8,0x8
|
||||
/* f00a738: afb90080 */ sw $t9,0x80($sp)
|
||||
/* f00a73c: af000004 */ sw $zero,0x4($t8)
|
||||
/* f00a740: af0a0000 */ sw $t2,0x0($t8)
|
||||
/* f00a744: 8fac0080 */ lw $t4,0x80($sp)
|
||||
/* f00a748: 3c0eb900 */ lui $t6,0xb900
|
||||
/* f00a74c: 35ce0002 */ ori $t6,$t6,0x2
|
||||
/* f00a750: 258d0008 */ addiu $t5,$t4,0x8
|
||||
/* f00a754: afad0080 */ sw $t5,0x80($sp)
|
||||
/* f00a758: ad800004 */ sw $zero,0x4($t4)
|
||||
/* f00a75c: ad8e0000 */ sw $t6,0x0($t4)
|
||||
/* f00a760: 8fab0080 */ lw $t3,0x80($sp)
|
||||
/* f00a764: 3c18fc12 */ lui $t8,0xfc12
|
||||
/* f00a768: 3c19ff33 */ lui $t9,0xff33
|
||||
/* f00a76c: 256f0008 */ addiu $t7,$t3,0x8
|
||||
/* f00a770: afaf0080 */ sw $t7,0x80($sp)
|
||||
/* f00a774: 3739ffff */ ori $t9,$t9,0xffff
|
||||
/* f00a778: 37181824 */ ori $t8,$t8,0x1824
|
||||
/* f00a77c: ad780000 */ sw $t8,0x0($t3)
|
||||
/* f00a780: ad790004 */ sw $t9,0x4($t3)
|
||||
/* f00a784: 8faa0080 */ lw $t2,0x80($sp)
|
||||
/* f00a788: 240e3000 */ addiu $t6,$zero,0x3000
|
||||
/* f00a78c: 3c0db600 */ lui $t5,0xb600
|
||||
/* f00a790: 254c0008 */ addiu $t4,$t2,0x8
|
||||
/* f00a794: afac0080 */ sw $t4,0x80($sp)
|
||||
/* f00a798: ad4e0004 */ sw $t6,0x4($t2)
|
||||
/* f00a79c: ad4d0000 */ sw $t5,0x0($t2)
|
||||
/* f00a7a0: 8fab0080 */ lw $t3,0x80($sp)
|
||||
/* f00a7a4: 87a70040 */ lh $a3,0x40($sp)
|
||||
/* f00a7a8: 87a60042 */ lh $a2,0x42($sp)
|
||||
/* f00a7ac: 256f0008 */ addiu $t7,$t3,0x8
|
||||
/* f00a7b0: afaf0080 */ sw $t7,0x80($sp)
|
||||
/* f00a7b4: 3c18ba00 */ lui $t8,0xba00
|
||||
/* f00a7b8: 37180602 */ ori $t8,$t8,0x602
|
||||
/* f00a7bc: 241900c0 */ addiu $t9,$zero,0xc0
|
||||
/* f00a7c0: ad790004 */ sw $t9,0x4($t3)
|
||||
/* f00a7c4: ad780000 */ sw $t8,0x0($t3)
|
||||
/* f00a7c8: 8faa0080 */ lw $t2,0x80($sp)
|
||||
/* f00a7cc: 3c0dba00 */ lui $t5,0xba00
|
||||
/* f00a7d0: 35ad0c02 */ ori $t5,$t5,0xc02
|
||||
/* f00a7d4: 254c0008 */ addiu $t4,$t2,0x8
|
||||
/* f00a7d8: afac0080 */ sw $t4,0x80($sp)
|
||||
/* f00a7dc: 240e2000 */ addiu $t6,$zero,0x2000
|
||||
/* f00a7e0: ad4e0004 */ sw $t6,0x4($t2)
|
||||
/* f00a7e4: ad4d0000 */ sw $t5,0x0($t2)
|
||||
/* f00a7e8: 8fab0080 */ lw $t3,0x80($sp)
|
||||
/* f00a7ec: 3c18b900 */ lui $t8,0xb900
|
||||
/* f00a7f0: 3c190050 */ lui $t9,0x50
|
||||
/* f00a7f4: 256f0008 */ addiu $t7,$t3,0x8
|
||||
/* f00a7f8: afaf0080 */ sw $t7,0x80($sp)
|
||||
/* f00a7fc: 37394a50 */ ori $t9,$t9,0x4a50
|
||||
/* f00a800: 3718031d */ ori $t8,$t8,0x31d
|
||||
/* f00a804: ad780000 */ sw $t8,0x0($t3)
|
||||
/* f00a808: ad790004 */ sw $t9,0x4($t3)
|
||||
/* f00a80c: 8faa0080 */ lw $t2,0x80($sp)
|
||||
/* f00a810: 3c0dba00 */ lui $t5,0xba00
|
||||
/* f00a814: 35ad1301 */ ori $t5,$t5,0x1301
|
||||
/* f00a818: 254c0008 */ addiu $t4,$t2,0x8
|
||||
/* f00a81c: afac0080 */ sw $t4,0x80($sp)
|
||||
/* f00a820: 3c0e0008 */ lui $t6,0x8
|
||||
/* f00a824: ad4e0004 */ sw $t6,0x4($t2)
|
||||
/* f00a828: ad4d0000 */ sw $t5,0x0($t2)
|
||||
/* f00a82c: a6070002 */ sh $a3,0x2($s0)
|
||||
/* f00a830: a6060000 */ sh $a2,0x0($s0)
|
||||
/* f00a834: 87a3003e */ lh $v1,0x3e($sp)
|
||||
/* f00a838: 2402fff6 */ addiu $v0,$zero,-10
|
||||
/* f00a83c: a6020004 */ sh $v0,0x4($s0)
|
||||
/* f00a840: a6020010 */ sh $v0,0x10($s0)
|
||||
/* f00a844: a602001c */ sh $v0,0x1c($s0)
|
||||
/* f00a848: a6020028 */ sh $v0,0x28($s0)
|
||||
/* f00a84c: a6120008 */ sh $s2,0x8($s0)
|
||||
/* f00a850: a608000a */ sh $t0,0xa($s0)
|
||||
/* f00a854: a609001a */ sh $t1,0x1a($s0)
|
||||
/* f00a858: a6090026 */ sh $t1,0x26($s0)
|
||||
/* f00a85c: a607000e */ sh $a3,0xe($s0)
|
||||
/* f00a860: a6060024 */ sh $a2,0x24($s0)
|
||||
/* f00a864: a603000c */ sh $v1,0xc($s0)
|
||||
/* f00a868: a6030018 */ sh $v1,0x18($s0)
|
||||
/* f00a86c: 8fa40048 */ lw $a0,0x48($sp)
|
||||
/* f00a870: 264200a0 */ addiu $v0,$s2,0xa0
|
||||
/* f00a874: 250303c0 */ addiu $v1,$t0,0x3c0
|
||||
/* f00a878: a6020014 */ sh $v0,0x14($s0)
|
||||
/* f00a87c: a6020020 */ sh $v0,0x20($s0)
|
||||
/* f00a880: a6030022 */ sh $v1,0x22($s0)
|
||||
/* f00a884: a612002c */ sh $s2,0x2c($s0)
|
||||
/* f00a888: a603002e */ sh $v1,0x2e($s0)
|
||||
/* f00a88c: a2000007 */ sb $zero,0x7($s0)
|
||||
/* f00a890: a2000013 */ sb $zero,0x13($s0)
|
||||
/* f00a894: a200001f */ sb $zero,0x1f($s0)
|
||||
/* f00a898: a200002b */ sb $zero,0x2b($s0)
|
||||
/* f00a89c: a6080016 */ sh $t0,0x16($s0)
|
||||
/* f00a8a0: ac930000 */ sw $s3,0x0($a0)
|
||||
/* f00a8a4: 8fb10080 */ lw $s1,0x80($sp)
|
||||
/* f00a8a8: 3c180700 */ lui $t8,0x700
|
||||
/* f00a8ac: 37180004 */ ori $t8,$t8,0x4
|
||||
/* f00a8b0: 262f0008 */ addiu $t7,$s1,0x8
|
||||
/* f00a8b4: afaf0080 */ sw $t7,0x80($sp)
|
||||
/* f00a8b8: 0c012d20 */ jal osVirtualToPhysical
|
||||
/* f00a8bc: ae380000 */ sw $t8,0x0($s1)
|
||||
/* f00a8c0: ae220004 */ sw $v0,0x4($s1)
|
||||
/* f00a8c4: 8fb20080 */ lw $s2,0x80($sp)
|
||||
/* f00a8c8: 3c0c0430 */ lui $t4,0x430
|
||||
/* f00a8cc: 358c0030 */ ori $t4,$t4,0x30
|
||||
/* f00a8d0: 264a0008 */ addiu $t2,$s2,0x8
|
||||
/* f00a8d4: afaa0080 */ sw $t2,0x80($sp)
|
||||
/* f00a8d8: 02002025 */ or $a0,$s0,$zero
|
||||
/* f00a8dc: 0c012d20 */ jal osVirtualToPhysical
|
||||
/* f00a8e0: ae4c0000 */ sw $t4,0x0($s2)
|
||||
/* f00a8e4: ae420004 */ sw $v0,0x4($s2)
|
||||
/* f00a8e8: 8fad0080 */ lw $t5,0x80($sp)
|
||||
/* f00a8ec: 3c0bb100 */ lui $t3,0xb100
|
||||
/* f00a8f0: 356b0002 */ ori $t3,$t3,0x2
|
||||
/* f00a8f4: 25ae0008 */ addiu $t6,$t5,0x8
|
||||
/* f00a8f8: afae0080 */ sw $t6,0x80($sp)
|
||||
/* f00a8fc: 240f3210 */ addiu $t7,$zero,0x3210
|
||||
/* f00a900: adaf0004 */ sw $t7,0x4($t5)
|
||||
/* f00a904: adab0000 */ sw $t3,0x0($t5)
|
||||
/* f00a908: 8fb80050 */ lw $t8,0x50($sp)
|
||||
.L0f00a90c:
|
||||
/* f00a90c: 53000005 */ beqzl $t8,.L0f00a924
|
||||
/* f00a910: 8fbf0034 */ lw $ra,0x34($sp)
|
||||
/* f00a914: 0fc35272 */ jal func0f0d49c8
|
||||
/* f00a918: 8fa40080 */ lw $a0,0x80($sp)
|
||||
/* f00a91c: afa20080 */ sw $v0,0x80($sp)
|
||||
/* f00a920: 8fbf0034 */ lw $ra,0x34($sp)
|
||||
.L0f00a924:
|
||||
/* f00a924: 8fa20080 */ lw $v0,0x80($sp)
|
||||
/* f00a928: 8fb00024 */ lw $s0,0x24($sp)
|
||||
/* f00a92c: 8fb10028 */ lw $s1,0x28($sp)
|
||||
/* f00a930: 8fb2002c */ lw $s2,0x2c($sp)
|
||||
/* f00a934: 8fb30030 */ lw $s3,0x30($sp)
|
||||
/* f00a938: 03e00008 */ jr $ra
|
||||
/* f00a93c: 27bd0080 */ addiu $sp,$sp,0x80
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel func0f00a490
|
||||
/* f00a490: 27bdff80 */ addiu $sp,$sp,-128
|
||||
@@ -3755,6 +4289,7 @@ glabel func0f00a490
|
||||
/* f00a938: 03e00008 */ jr $ra
|
||||
/* f00a93c: 27bd0080 */ addiu $sp,$sp,0x80
|
||||
);
|
||||
#endif
|
||||
|
||||
GLOBAL_ASM(
|
||||
glabel gasRender
|
||||
|
||||
+4
-4
@@ -5205,7 +5205,7 @@ glabel func0f11a8f4
|
||||
/* f11a9d8: afa20014 */ sw $v0,0x14($sp)
|
||||
/* f11a9dc: afa20030 */ sw $v0,0x30($sp)
|
||||
/* f11a9e0: 24e75cf8 */ addiu $a3,$a3,%lo(g_PakNoteGameName)
|
||||
/* f11a9e4: 34c64445 */ ori $a2,$a2,0x4445
|
||||
/* f11a9e4: 34c64445 */ ori $a2,$a2,_gamecode
|
||||
/* f11a9e8: 0fc45f96 */ jal func0f117e58
|
||||
/* f11a9ec: afaf0010 */ sw $t7,0x10($sp)
|
||||
/* f11a9f0: 0c005451 */ jal func00015144
|
||||
@@ -5256,7 +5256,7 @@ glabel func0f11a8f4
|
||||
/* f11aa98: 3c064e50 */ lui $a2,0x4e50
|
||||
/* f11aa9c: 3c078007 */ lui $a3,%hi(g_PakNoteGameName)
|
||||
/* f11aaa0: 24e75cf8 */ addiu $a3,$a3,%lo(g_PakNoteGameName)
|
||||
/* f11aaa4: 34c64445 */ ori $a2,$a2,0x4445
|
||||
/* f11aaa4: 34c64445 */ ori $a2,$a2,_gamecode
|
||||
/* f11aaa8: afae0010 */ sw $t6,0x10($sp)
|
||||
/* f11aaac: afaf0014 */ sw $t7,0x14($sp)
|
||||
/* f11aab0: 0fc45f64 */ jal func0f117d90
|
||||
@@ -5455,7 +5455,7 @@ glabel func0f11a8f4
|
||||
/* f11a758: afa20014 */ sw $v0,0x14($sp)
|
||||
/* f11a75c: afa20034 */ sw $v0,0x34($sp)
|
||||
/* f11a760: 24e75cf8 */ addiu $a3,$a3,%lo(g_PakNoteGameName)
|
||||
/* f11a764: 34c64445 */ ori $a2,$a2,0x4445
|
||||
/* f11a764: 34c64445 */ ori $a2,$a2,_gamecode
|
||||
/* f11a768: 0fc45f76 */ jal 0xf117dd8
|
||||
/* f11a76c: afaf0010 */ sw $t7,0x10($sp)
|
||||
/* f11a770: 0c005451 */ jal 0x15144
|
||||
@@ -5506,7 +5506,7 @@ glabel func0f11a8f4
|
||||
/* f11a818: 3c064e50 */ lui $a2,0x4e50
|
||||
/* f11a81c: 3c078007 */ lui $a3,%hi(g_PakNoteGameName)
|
||||
/* f11a820: 24e75cf8 */ addiu $a3,$a3,%lo(g_PakNoteGameName)
|
||||
/* f11a824: 34c64445 */ ori $a2,$a2,0x4445
|
||||
/* f11a824: 34c64445 */ ori $a2,$a2,_gamecode
|
||||
/* f11a828: afae0010 */ sw $t6,0x10($sp)
|
||||
/* f11a82c: afaf0014 */ sw $t7,0x14($sp)
|
||||
/* f11a830: 0fc45f44 */ jal 0xf117d10
|
||||
|
||||
+1
-1
@@ -2496,7 +2496,7 @@ void func0f062b64(struct prop *prop, s32 arg1)
|
||||
&& prop->obj && (prop->obj->hidden2 & OBJH2FLAG_04)) {
|
||||
struct defaultobj *obj = prop->obj;
|
||||
|
||||
prop->timetoregen = 1200;
|
||||
prop->timetoregen = PALDOWN(1200);
|
||||
|
||||
obj->damage = 0;
|
||||
obj->hidden |= OBJHFLAG_00000800;
|
||||
|
||||
+5910
-81
File diff suppressed because it is too large
Load Diff
+2
-2
@@ -142,7 +142,7 @@ Gfx *radarDrawDot(Gfx *gdl, struct prop *prop, struct coord *dist, u32 colour1,
|
||||
}
|
||||
|
||||
x = g_RadarX + (s32)(sinf(spcc * 0.017453292384744f) * sqdist);
|
||||
y = g_RadarY + (s32)FRAMESTOTIME60(cosf(spcc * 0.017453292384744f) * sqdist);
|
||||
y = g_RadarY + (s32)PALUPF(cosf(spcc * 0.017453292384744f) * sqdist);
|
||||
|
||||
if (swapcolours) {
|
||||
if (prop == g_Vars.currentplayer->prop) {
|
||||
@@ -306,7 +306,7 @@ Gfx *radarRender(Gfx *gdl)
|
||||
}
|
||||
}
|
||||
|
||||
g_RadarY = viGetViewTop() + 26;
|
||||
g_RadarY = viGetViewTop() + (PAL ? 29 : 26);
|
||||
|
||||
if (playercount == 2) {
|
||||
if (IS4MB()) {
|
||||
|
||||
+2
-2
@@ -3864,9 +3864,9 @@ void bgInit(s32 stagenum)
|
||||
|
||||
#if PIRACYCHECKS
|
||||
{
|
||||
u32 addr = not(~0xb0000454);
|
||||
u32 addr = not(PAL ? ~0xb0000340 : ~0xb0000454);
|
||||
u32 actualvalue;
|
||||
u32 expectedvalue = xorBabebabe(0x0109082b ^ 0xbabebabe);
|
||||
u32 expectedvalue = xorBabebabe((PAL ? 0x0330c820 : 0x0109082b) ^ 0xbabebabe);
|
||||
|
||||
osPiReadIo(addr, &actualvalue);
|
||||
|
||||
|
||||
@@ -127,9 +127,9 @@ void shardCreate(s16 room, struct coord *pos, f32 rotx, f32 size, s32 type)
|
||||
g_Shards[g_NextShardNum].pos.y = pos->y;
|
||||
g_Shards[g_NextShardNum].pos.z = pos->z;
|
||||
|
||||
g_Shards[g_NextShardNum].vel.x = velx * FRAMESTOTIME60(1.5f);
|
||||
g_Shards[g_NextShardNum].vel.y = vely * FRAMESTOTIME60(3.0f);
|
||||
g_Shards[g_NextShardNum].vel.z = velz * FRAMESTOTIME60(1.5f);
|
||||
g_Shards[g_NextShardNum].vel.x = velx * PALUPF(1.5f);
|
||||
g_Shards[g_NextShardNum].vel.y = vely * PALUPF(3.0f);
|
||||
g_Shards[g_NextShardNum].vel.z = velz * PALUPF(1.5f);
|
||||
|
||||
g_Shards[g_NextShardNum].vertices[0].x = (random() * (1.0f / U32_MAX) * 0.5f + 1.0f) * size;
|
||||
g_Shards[g_NextShardNum].vertices[0].y = (random() * (1.0f / U32_MAX) * 0.5f + 1.0f) * size;
|
||||
@@ -194,9 +194,9 @@ void shardCreate(s16 room, struct coord *pos, f32 rotx, f32 size, s32 type)
|
||||
g_Shards[g_NextShardNum].rot.y = 0;
|
||||
g_Shards[g_NextShardNum].rot.z = random() * (1.0f / U32_MAX) * M_BADTAU;
|
||||
|
||||
g_Shards[g_NextShardNum].rotspeed.x = random() * (1.0f / U32_MAX) * FRAMESTOTIME60(0.1f);
|
||||
g_Shards[g_NextShardNum].rotspeed.y = random() * (1.0f / U32_MAX) * FRAMESTOTIME60(0.1f);
|
||||
g_Shards[g_NextShardNum].rotspeed.z = random() * (1.0f / U32_MAX) * FRAMESTOTIME60(0.1f);
|
||||
g_Shards[g_NextShardNum].rotspeed.x = random() * (1.0f / U32_MAX) * PALUPF(0.1f);
|
||||
g_Shards[g_NextShardNum].rotspeed.y = random() * (1.0f / U32_MAX) * PALUPF(0.1f);
|
||||
g_Shards[g_NextShardNum].rotspeed.z = random() * (1.0f / U32_MAX) * PALUPF(0.1f);
|
||||
|
||||
g_NextShardNum++;
|
||||
|
||||
@@ -282,7 +282,7 @@ Gfx *shardsRenderWood(Gfx *gdl)
|
||||
if (g_Vars.currentplayer->visionmode == VISIONMODE_XRAY) {
|
||||
u8 (*colours)[4] = gfxAllocateColours(3);
|
||||
|
||||
if (g_Shards[i].age60 >= 100) {
|
||||
if (g_Shards[i].age60 >= PALDOWN(100)) {
|
||||
f32 frac = g_Shards[i].age60 / (PAL ? 41.666664123535f : 50.0f);
|
||||
|
||||
if (frac > 1) {
|
||||
@@ -405,7 +405,7 @@ Gfx *shardsRenderGlass(Gfx *gdl)
|
||||
if (g_Vars.currentplayer->visionmode == VISIONMODE_XRAY) {
|
||||
u8 (*colours)[4] = gfxAllocateColours(3);
|
||||
|
||||
if (g_Shards[i].age60 >= 100) {
|
||||
if (g_Shards[i].age60 >= PALDOWN(100)) {
|
||||
f32 frac = g_Shards[i].age60 / (PAL ? 41.666664123535f : 50.0f);
|
||||
|
||||
if (frac > 1) {
|
||||
|
||||
@@ -11,7 +11,7 @@ void shardsTick(void)
|
||||
s32 j;
|
||||
|
||||
if (g_ShardsActive) {
|
||||
lvupdate = (g_Vars.lvupdate240_60 < 15) ? g_Vars.lvupdate240_60 : 15;
|
||||
lvupdate = (g_Vars.lvupdate240_60 < PALDOWN(15)) ? g_Vars.lvupdate240_60 : PALDOWN(15);
|
||||
|
||||
for (i = 0; i < g_MaxShards; i++) {
|
||||
if (g_Shards[i].age60 > 0) {
|
||||
@@ -25,10 +25,10 @@ void shardsTick(void)
|
||||
|
||||
for (j = 0; j < (s32)lvupdate; j++) {
|
||||
g_Shards[i].pos.y += g_Shards[i].vel.y;
|
||||
g_Shards[i].vel.y -= FRAMESTOTIME60(0.1f);
|
||||
g_Shards[i].vel.y -= PALUPF(0.1f);
|
||||
}
|
||||
|
||||
if (g_Shards[i].age60 >= 150) {
|
||||
if (g_Shards[i].age60 >= PALDOWN(150)) {
|
||||
g_Shards[i].age60 = 0;
|
||||
}
|
||||
|
||||
|
||||
+1425
-5
File diff suppressed because it is too large
Load Diff
+5
-5
@@ -57,13 +57,13 @@ void splatTick(struct prop *prop)
|
||||
|
||||
if (thudframe != -1.0f && modelGetCurAnimFrame(chr->model) < thudframe) {
|
||||
osSyncPrintf("SPLAT : Not Dead Enough %s%s%f", "", "", modelGetCurAnimFrame(chr->model));
|
||||
} else if (chr->tickssincesplat > 30 && chr->deaddropsplatsadded < 6) {
|
||||
chr->deaddropsplatsadded += func0f148f18(1, 1.1f, prop, NULL, 0, 0, isskedar, 1, 150, unk350, random() & 8);
|
||||
} else if (chr->tickssincesplat > PALDOWN(30) && chr->deaddropsplatsadded < 6) {
|
||||
chr->deaddropsplatsadded += func0f148f18(1, 1.1f, prop, NULL, 0, 0, isskedar, 1, PALDOWN(150), unk350, random() & 8);
|
||||
}
|
||||
} else {
|
||||
u32 value = chr->bulletstaken * chr->tickssincesplat;
|
||||
|
||||
if (value > 240) {
|
||||
if (value > PALDOWN(240)) {
|
||||
f32 dist = coordsGetDistance(&chr->lastdroppos, &prop->pos);
|
||||
s32 addmore = false;
|
||||
|
||||
@@ -76,7 +76,7 @@ void splatTick(struct prop *prop)
|
||||
}
|
||||
|
||||
if (addmore) {
|
||||
chr->woundedsplatsadded += func0f148f18(1, 0.3f, prop, NULL, 0, 0, isskedar, 2, 80, unk350, 0);
|
||||
chr->woundedsplatsadded += func0f148f18(1, 0.3f, prop, NULL, 0, 0, isskedar, 2, PALDOWN(80), unk350, 0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -104,7 +104,7 @@ void func0f148e54(struct prop *prop, struct splat *arg1, struct coord *arg2, str
|
||||
u32 rand = random() % 3;
|
||||
|
||||
if (rand) {
|
||||
chr->stdsplatsadded += func0f148f18(rand, 0.8f, prop, arg1, arg2, arg3, arg4, arg5, 50, arg6, 0);
|
||||
chr->stdsplatsadded += func0f148f18(rand, 0.8f, prop, arg1, arg2, arg3, arg4, arg5, PALDOWN(50), arg6, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+12
-2
@@ -18,13 +18,13 @@ void frametimeApply(s32 diffframe60, s32 diffframe240, s32 frametime)
|
||||
|
||||
g_Vars.diffframe60 = diffframe60;
|
||||
g_Vars.diffframe60f = diffframe60;
|
||||
g_Vars.diffframe60freal = FRAMESTOTIME60(g_Vars.diffframe60f);
|
||||
g_Vars.diffframe60freal = PALUPF(g_Vars.diffframe60f);
|
||||
|
||||
g_Vars.lastframe240 = g_Vars.thisframe240;
|
||||
g_Vars.thisframe240 += diffframe240;
|
||||
g_Vars.diffframe240 = diffframe240;
|
||||
g_Vars.diffframe240f = diffframe240;
|
||||
g_Vars.diffframe240freal = FRAMESTOTIME60(g_Vars.diffframe240f);
|
||||
g_Vars.diffframe240freal = PALUPF(g_Vars.diffframe240f);
|
||||
}
|
||||
|
||||
void frametimeCalculate(void)
|
||||
@@ -39,12 +39,22 @@ void frametimeCalculate(void)
|
||||
thisframeticks = count - g_Vars.thisframetime;
|
||||
g_Vars.thisframeticks = thisframeticks;
|
||||
|
||||
#if PAL
|
||||
diffframe60 = (g_Vars.lostframetime + thisframeticks + 468750) / 937500;
|
||||
diffframe240 = (g_Vars.lostframetime240 + thisframeticks + 117187) / 234375;
|
||||
#else
|
||||
diffframe60 = (g_Vars.lostframetime + thisframeticks + 390625) / 781250;
|
||||
diffframe240 = (g_Vars.lostframetime240 + thisframeticks + 97656) / 195312;
|
||||
#endif
|
||||
} while (diffframe60 < g_Vars.mininc60);
|
||||
|
||||
#if PAL
|
||||
g_Vars.lostframetime = (g_Vars.lostframetime + thisframeticks) - (diffframe60 * 937500);
|
||||
g_Vars.lostframetime240 = (g_Vars.lostframetime240 + thisframeticks) - (diffframe240 * 234375);
|
||||
#else
|
||||
g_Vars.lostframetime = (g_Vars.lostframetime + thisframeticks) - (diffframe60 * 781250);
|
||||
g_Vars.lostframetime240 = (g_Vars.lostframetime240 + thisframeticks) - (diffframe240 * 195312);
|
||||
#endif
|
||||
g_Vars.mininc60 = 1;
|
||||
|
||||
frametimeApply(diffframe60, diffframe240, count);
|
||||
|
||||
+746
-23
@@ -439,7 +439,7 @@ void titleTickLegal(void)
|
||||
|
||||
g_TitleTimer += g_Vars.lvupdate240_60;
|
||||
|
||||
if (g_TitleTimer > 180) {
|
||||
if (g_TitleTimer > PALDOWN(180)) {
|
||||
titleSetNextMode(TITLEMODE_CHECKCONTROLLERS);
|
||||
}
|
||||
}
|
||||
@@ -1827,15 +1827,14 @@ void titleTickPdLogo(void)
|
||||
titleSetNextMode(TITLEMODE_SKIP);
|
||||
}
|
||||
}
|
||||
|
||||
if (var800624a8 && g_TitleTimer > 666) {
|
||||
if (var800624a8 && g_TitleTimer > PALDOWN(666)) {
|
||||
titleSetNextMode(TITLEMODE_SKIP);
|
||||
}
|
||||
|
||||
if (contGetButtonsPressedThisFrame(0, 0xffff)) {
|
||||
var800624a8 = var800624ac = 1;
|
||||
|
||||
if (g_TitleTimer < 549) {
|
||||
if (g_TitleTimer < PALDOWN(549)) {
|
||||
titleSetNextMode(TITLEMODE_PDLOGO);
|
||||
}
|
||||
}
|
||||
@@ -2439,7 +2438,7 @@ void func0f017980(void)
|
||||
var80062804 = 1;
|
||||
var8006280c = 1;
|
||||
var80062810 = 1;
|
||||
g_TitleTimer = 549;
|
||||
g_TitleTimer = PALDOWN(549);
|
||||
var80062730 = 0;
|
||||
|
||||
musicStartTemporaryPrimary(1);
|
||||
@@ -5137,7 +5136,7 @@ void titleTickRarePresents(void)
|
||||
|
||||
g_TitleTimer += g_Vars.lvupdate240_60;
|
||||
|
||||
if (g_TitleTimer > 300) {
|
||||
if (g_TitleTimer > PALDOWN(300)) {
|
||||
titleSetNextMode(TITLEMODE_PDLOGO);
|
||||
} else if (contGetButtonsPressedThisFrame(0, 0xffff)) {
|
||||
titleSetNextMode(TITLEMODE_SKIP);
|
||||
@@ -5319,8 +5318,8 @@ Gfx *titleRenderRarePresents(Gfx *gdl)
|
||||
|
||||
gdl = bviewRenderRarePresents(gdl);
|
||||
|
||||
if (g_TitleTimer > 222) {
|
||||
f32 alpha = ((g_TitleTimer - 222.0f) / 78.0f);
|
||||
if (g_TitleTimer > PALDOWN(222)) {
|
||||
f32 alpha = ((g_TitleTimer - PALDOWN(222.0f)) / PALDOWN(78.0f));
|
||||
u32 stack;
|
||||
|
||||
gdl = func0f153a34(gdl, viGetViewLeft(), viGetViewTop(),
|
||||
@@ -5339,7 +5338,7 @@ void titleInitNintendoLogo(void)
|
||||
var800624ac = 0;
|
||||
|
||||
if (var800624a8) {
|
||||
g_TitleTimer = 180;
|
||||
g_TitleTimer = PAL ? 133 : 180;
|
||||
} else {
|
||||
g_TitleTimer = 0;
|
||||
}
|
||||
@@ -5406,17 +5405,318 @@ void titleTickNintendoLogo(void)
|
||||
}
|
||||
}
|
||||
|
||||
if (var800624ac && var800624a8 == 0 && g_TitleTimer > 140) {
|
||||
if (var800624ac && var800624a8 == 0 && g_TitleTimer > PALDOWN(140)) {
|
||||
var800624a8 = 1;
|
||||
var800624ac = 0;
|
||||
titleSetNextMode(TITLEMODE_PDLOGO);
|
||||
}
|
||||
|
||||
if (g_TitleTimer > 240) {
|
||||
if (g_TitleTimer > (PAL ? 183 : 240)) {
|
||||
titleSetNextMode(TITLEMODE_PDLOGO);
|
||||
}
|
||||
}
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel titleRenderNintendoLogo
|
||||
.late_rodata
|
||||
glabel var7f1a847c
|
||||
.word 0x40490fdb
|
||||
glabel var7f1a8480
|
||||
.word 0x3dcccccd
|
||||
glabel var7f1a8484
|
||||
.word 0x3f666666
|
||||
glabel var7f1a8488
|
||||
.word 0x3ecccccd
|
||||
glabel var7f1a848c
|
||||
.word 0x3ecccccd
|
||||
glabel var7f1a8490
|
||||
.word 0x40490fdb
|
||||
glabel var7f1a8494
|
||||
.word 0x3fc90fdb
|
||||
glabel var7f1a8498
|
||||
.word 0x40490fdb
|
||||
glabel var7f1a849c
|
||||
.word 0x3eb33333
|
||||
glabel var7f1a84a0
|
||||
.word 0x3e4ccccd
|
||||
.text
|
||||
/* f019658: 27bdfe70 */ addiu $sp,$sp,-400
|
||||
/* f01965c: afb2003c */ sw $s2,0x3c($sp)
|
||||
/* f019660: 3c0e8006 */ lui $t6,%hi(var8006287c)
|
||||
/* f019664: 27b20150 */ addiu $s2,$sp,0x150
|
||||
/* f019668: afb00034 */ sw $s0,0x34($sp)
|
||||
/* f01966c: 25ce287c */ addiu $t6,$t6,%lo(var8006287c)
|
||||
/* f019670: 27b000f8 */ addiu $s0,$sp,0xf8
|
||||
/* f019674: afbf0044 */ sw $ra,0x44($sp)
|
||||
/* f019678: afb30040 */ sw $s3,0x40($sp)
|
||||
/* f01967c: afb10038 */ sw $s1,0x38($sp)
|
||||
/* f019680: f7b40028 */ sdc1 $f20,0x28($sp)
|
||||
/* f019684: 25d9003c */ addiu $t9,$t6,0x3c
|
||||
/* f019688: 02404025 */ or $t0,$s2,$zero
|
||||
.L0f01968c:
|
||||
/* f01968c: 8dc10000 */ lw $at,0x0($t6)
|
||||
/* f019690: 25ce000c */ addiu $t6,$t6,0xc
|
||||
/* f019694: 2508000c */ addiu $t0,$t0,0xc
|
||||
/* f019698: ad01fff4 */ sw $at,-0xc($t0)
|
||||
/* f01969c: 8dc1fff8 */ lw $at,-0x8($t6)
|
||||
/* f0196a0: ad01fff8 */ sw $at,-0x8($t0)
|
||||
/* f0196a4: 8dc1fffc */ lw $at,-0x4($t6)
|
||||
/* f0196a8: 15d9fff8 */ bne $t6,$t9,.L0f01968c
|
||||
/* f0196ac: ad01fffc */ sw $at,-0x4($t0)
|
||||
/* f0196b0: 8dc10000 */ lw $at,0x0($t6)
|
||||
/* f0196b4: 3c098006 */ lui $t1,%hi(g_TitleTimer)
|
||||
/* f0196b8: 3c0a8006 */ lui $t2,%hi(var800628bc)
|
||||
/* f0196bc: ad010000 */ sw $at,0x0($t0)
|
||||
/* f0196c0: 3c014370 */ lui $at,0x4337
|
||||
/* f0196c4: 44814000 */ mtc1 $at,$f8
|
||||
/* f0196c8: 8d2924c4 */ lw $t1,%lo(g_TitleTimer)($t1)
|
||||
/* f0196cc: 254a28bc */ addiu $t2,$t2,%lo(var800628bc)
|
||||
/* f0196d0: 8d410000 */ lw $at,0x0($t2)
|
||||
/* f0196d4: 44892000 */ mtc1 $t1,$f4
|
||||
/* f0196d8: ae010000 */ sw $at,0x0($s0)
|
||||
/* f0196dc: 8d4d0004 */ lw $t5,0x4($t2)
|
||||
/* f0196e0: 468021a0 */ cvt.s.w $f6,$f4
|
||||
/* f0196e4: ae0d0004 */ sw $t5,0x4($s0)
|
||||
/* f0196e8: 8d410008 */ lw $at,0x8($t2)
|
||||
/* f0196ec: 46083503 */ div.s $f20,$f6,$f8
|
||||
/* f0196f0: 0fc06bf0 */ jal func0f01afc0
|
||||
/* f0196f4: ae010008 */ sw $at,0x8($s0)
|
||||
/* f0196f8: 3c013f80 */ lui $at,0x3f80
|
||||
/* f0196fc: 44815000 */ mtc1 $at,$f10
|
||||
/* f019700: 3c013fc0 */ lui $at,0x3fc0
|
||||
/* f019704: 44818000 */ mtc1 $at,$f16
|
||||
/* f019708: 46145001 */ sub.s $f0,$f10,$f20
|
||||
/* f01970c: 3c18bc00 */ lui $t8,0xbc00
|
||||
/* f019710: 3c0f8000 */ lui $t7,0x8000
|
||||
/* f019714: 3c190386 */ lui $t9,0x386
|
||||
/* f019718: 3c0e8006 */ lui $t6,%hi(var80062598)
|
||||
/* f01971c: 25ce2598 */ addiu $t6,$t6,%lo(var80062598)
|
||||
/* f019720: 37390010 */ ori $t9,$t9,0x10
|
||||
/* f019724: 35ef0040 */ ori $t7,$t7,0x40
|
||||
/* f019728: 37180002 */ ori $t8,$t8,0x2
|
||||
/* f01972c: 46100482 */ mul.s $f18,$f0,$f16
|
||||
/* f019730: ac580000 */ sw $t8,0x0($v0)
|
||||
/* f019734: ac4f0004 */ sw $t7,0x4($v0)
|
||||
/* f019738: ac590008 */ sw $t9,0x8($v0)
|
||||
/* f01973c: ac4e000c */ sw $t6,0xc($v0)
|
||||
/* f019740: 24480018 */ addiu $t0,$v0,0x18
|
||||
/* f019744: 3c118006 */ lui $s1,%hi(var80062590)
|
||||
/* f019748: afa80190 */ sw $t0,0x190($sp)
|
||||
/* f01974c: 3c090388 */ lui $t1,0x388
|
||||
/* f019750: 26312590 */ addiu $s1,$s1,%lo(var80062590)
|
||||
/* f019754: 35290010 */ ori $t1,$t1,0x10
|
||||
/* f019758: ac490010 */ sw $t1,0x10($v0)
|
||||
/* f01975c: ac510014 */ sw $s1,0x14($v0)
|
||||
/* f019760: 3c017f1b */ lui $at,%hi(var7f1a847c)
|
||||
/* f019764: c424847c */ lwc1 $f4,%lo(var7f1a847c)($at)
|
||||
/* f019768: e7a00050 */ swc1 $f0,0x50($sp)
|
||||
/* f01976c: 46049302 */ mul.s $f12,$f18,$f4
|
||||
/* f019770: 0c0068f7 */ jal sinf
|
||||
/* f019774: e7ac004c */ swc1 $f12,0x4c($sp)
|
||||
/* f019778: c7ac004c */ lwc1 $f12,0x4c($sp)
|
||||
/* f01977c: 0c0068f4 */ jal cosf
|
||||
/* f019780: e7a00100 */ swc1 $f0,0x100($sp)
|
||||
/* f019784: e7a000f8 */ swc1 $f0,0xf8($sp)
|
||||
/* f019788: 02002025 */ or $a0,$s0,$zero
|
||||
/* f01978c: 27a500fc */ addiu $a1,$sp,0xfc
|
||||
/* f019790: 0c0011e4 */ jal guNormalize
|
||||
/* f019794: 27a60100 */ addiu $a2,$sp,0x100
|
||||
/* f019798: 3c017f1b */ lui $at,%hi(var7f1a8480)
|
||||
/* f01979c: c4208480 */ lwc1 $f0,%lo(var7f1a8480)($at)
|
||||
/* f0197a0: 44801000 */ mtc1 $zero,$f2
|
||||
/* f0197a4: 240200ff */ addiu $v0,$zero,0xff
|
||||
/* f0197a8: 4600a03c */ c.lt.s $f20,$f0
|
||||
/* f0197ac: 02202025 */ or $a0,$s1,$zero
|
||||
/* f0197b0: 45000008 */ bc1f .L0f0197d4
|
||||
/* f0197b4: 3c01437f */ lui $at,0x437f
|
||||
/* f0197b8: 44813000 */ mtc1 $at,$f6
|
||||
/* f0197bc: 00000000 */ nop
|
||||
/* f0197c0: 46143202 */ mul.s $f8,$f6,$f20
|
||||
/* f0197c4: 46004283 */ div.s $f10,$f8,$f0
|
||||
/* f0197c8: 4600540d */ trunc.w.s $f16,$f10
|
||||
/* f0197cc: 44028000 */ mfc1 $v0,$f16
|
||||
/* f0197d0: 00000000 */ nop
|
||||
.L0f0197d4:
|
||||
/* f0197d4: 3c017f1b */ lui $at,%hi(var7f1a8484)
|
||||
/* f0197d8: c4328484 */ lwc1 $f18,%lo(var7f1a8484)($at)
|
||||
/* f0197dc: 4614903c */ c.lt.s $f18,$f20
|
||||
/* f0197e0: 00000000 */ nop
|
||||
/* f0197e4: 45000008 */ bc1f .L0f019808
|
||||
/* f0197e8: 3c01437f */ lui $at,0x437f
|
||||
/* f0197ec: 44813000 */ mtc1 $at,$f6
|
||||
/* f0197f0: c7a40050 */ lwc1 $f4,0x50($sp)
|
||||
/* f0197f4: 46062202 */ mul.s $f8,$f4,$f6
|
||||
/* f0197f8: 46004283 */ div.s $f10,$f8,$f0
|
||||
/* f0197fc: 4600540d */ trunc.w.s $f16,$f10
|
||||
/* f019800: 44028000 */ mfc1 $v0,$f16
|
||||
/* f019804: 00000000 */ nop
|
||||
.L0f019808:
|
||||
/* f019808: 28410100 */ slti $at,$v0,0x100
|
||||
/* f01980c: 14200002 */ bnez $at,.L0f019818
|
||||
/* f019810: 00000000 */ nop
|
||||
/* f019814: 240200ff */ addiu $v0,$zero,0xff
|
||||
.L0f019818:
|
||||
/* f019818: 04430003 */ bgezl $v0,.L0f019828
|
||||
/* f01981c: 304500ff */ andi $a1,$v0,0xff
|
||||
/* f019820: 00001025 */ or $v0,$zero,$zero
|
||||
/* f019824: 304500ff */ andi $a1,$v0,0xff
|
||||
.L0f019828:
|
||||
/* f019828: 30a600ff */ andi $a2,$a1,0xff
|
||||
/* f01982c: 30a700ff */ andi $a3,$a1,0xff
|
||||
/* f019830: e7a20010 */ swc1 $f2,0x10($sp)
|
||||
/* f019834: 0fc0585b */ jal func0f01616c
|
||||
/* f019838: afb00014 */ sw $s0,0x14($sp)
|
||||
/* f01983c: 3c017f1b */ lui $at,%hi(var7f1a8488)
|
||||
/* f019840: c4328488 */ lwc1 $f18,%lo(var7f1a8488)($at)
|
||||
/* f019844: 44801000 */ mtc1 $zero,$f2
|
||||
/* f019848: 4612a03c */ c.lt.s $f20,$f18
|
||||
/* f01984c: e7a2009c */ swc1 $f2,0x9c($sp)
|
||||
/* f019850: 45000015 */ bc1f .L0f0198a8
|
||||
/* f019854: 3c013f80 */ lui $at,0x3f80
|
||||
/* f019858: 44812000 */ mtc1 $at,$f4
|
||||
/* f01985c: 3c017f1b */ lui $at,%hi(var7f1a848c)
|
||||
/* f019860: c426848c */ lwc1 $f6,%lo(var7f1a848c)($at)
|
||||
/* f019864: 3c017f1b */ lui $at,%hi(var7f1a8490)
|
||||
/* f019868: c4308490 */ lwc1 $f16,%lo(var7f1a8490)($at)
|
||||
/* f01986c: 4606a203 */ div.s $f8,$f20,$f6
|
||||
/* f019870: 46082281 */ sub.s $f10,$f4,$f8
|
||||
/* f019874: 46105302 */ mul.s $f12,$f10,$f16
|
||||
/* f019878: 0c0068f4 */ jal cosf
|
||||
/* f01987c: 00000000 */ nop
|
||||
/* f019880: 3c013f00 */ lui $at,0x3f00
|
||||
/* f019884: 44813000 */ mtc1 $at,$f6
|
||||
/* f019888: 46000487 */ neg.s $f18,$f0
|
||||
/* f01988c: 44814000 */ mtc1 $at,$f8
|
||||
/* f019890: 46069102 */ mul.s $f4,$f18,$f6
|
||||
/* f019894: 3c017f1b */ lui $at,%hi(var7f1a8494)
|
||||
/* f019898: c4308494 */ lwc1 $f16,%lo(var7f1a8494)($at)
|
||||
/* f01989c: 46082280 */ add.s $f10,$f4,$f8
|
||||
/* f0198a0: 46105482 */ mul.s $f18,$f10,$f16
|
||||
/* f0198a4: e7b2009c */ swc1 $f18,0x9c($sp)
|
||||
.L0f0198a8:
|
||||
/* f0198a8: 3c013f80 */ lui $at,0x3f80
|
||||
/* f0198ac: 44812000 */ mtc1 $at,$f4
|
||||
/* f0198b0: 44813000 */ mtc1 $at,$f6
|
||||
/* f0198b4: 3c017f1b */ lui $at,%hi(var7f1a8498)
|
||||
/* f0198b8: 4604a203 */ div.s $f8,$f20,$f4
|
||||
/* f0198bc: c4308498 */ lwc1 $f16,%lo(var7f1a8498)($at)
|
||||
/* f0198c0: 46083281 */ sub.s $f10,$f6,$f8
|
||||
/* f0198c4: 46105302 */ mul.s $f12,$f10,$f16
|
||||
/* f0198c8: 0c0068f4 */ jal cosf
|
||||
/* f0198cc: 00000000 */ nop
|
||||
/* f0198d0: 3c013f00 */ lui $at,0x3f00
|
||||
/* f0198d4: 44812000 */ mtc1 $at,$f4
|
||||
/* f0198d8: 46000487 */ neg.s $f18,$f0
|
||||
/* f0198dc: 44814000 */ mtc1 $at,$f8
|
||||
/* f0198e0: 46049182 */ mul.s $f6,$f18,$f4
|
||||
/* f0198e4: 3c017f1b */ lui $at,%hi(var7f1a849c)
|
||||
/* f0198e8: c430849c */ lwc1 $f16,%lo(var7f1a849c)($at)
|
||||
/* f0198ec: 44801000 */ mtc1 $zero,$f2
|
||||
/* f0198f0: 27b100a8 */ addiu $s1,$sp,0xa8
|
||||
/* f0198f4: 02202825 */ or $a1,$s1,$zero
|
||||
/* f0198f8: 27a4009c */ addiu $a0,$sp,0x9c
|
||||
/* f0198fc: 46083280 */ add.s $f10,$f6,$f8
|
||||
/* f019900: e7a200a4 */ swc1 $f2,0xa4($sp)
|
||||
/* f019904: 46105482 */ mul.s $f18,$f10,$f16
|
||||
/* f019908: 0c005923 */ jal func0001648c
|
||||
/* f01990c: e7b200a0 */ swc1 $f18,0xa0($sp)
|
||||
/* f019910: 3c017f1b */ lui $at,%hi(var7f1a84a0)
|
||||
/* f019914: c42484a0 */ lwc1 $f4,%lo(var7f1a84a0)($at)
|
||||
/* f019918: 3c013f80 */ lui $at,0x3f80
|
||||
/* f01991c: 44814000 */ mtc1 $at,$f8
|
||||
/* f019920: 4604a182 */ mul.s $f6,$f20,$f4
|
||||
/* f019924: 02202825 */ or $a1,$s1,$zero
|
||||
/* f019928: 0c0057e2 */ jal func00015f88
|
||||
/* f01992c: 46083300 */ add.s $f12,$f6,$f8
|
||||
/* f019930: 44801000 */ mtc1 $zero,$f2
|
||||
/* f019934: 3c013f80 */ lui $at,0x3f80
|
||||
/* f019938: 44815000 */ mtc1 $at,$f10
|
||||
/* f01993c: 27b00108 */ addiu $s0,$sp,0x108
|
||||
/* f019940: 44051000 */ mfc1 $a1,$f2
|
||||
/* f019944: 44061000 */ mfc1 $a2,$f2
|
||||
/* f019948: 02002025 */ or $a0,$s0,$zero
|
||||
/* f01994c: 3c07457a */ lui $a3,0x457a
|
||||
/* f019950: e7a20010 */ swc1 $f2,0x10($sp)
|
||||
/* f019954: e7a20014 */ swc1 $f2,0x14($sp)
|
||||
/* f019958: e7a20018 */ swc1 $f2,0x18($sp)
|
||||
/* f01995c: e7a2001c */ swc1 $f2,0x1c($sp)
|
||||
/* f019960: e7a20024 */ swc1 $f2,0x24($sp)
|
||||
/* f019964: 0c005ab9 */ jal func00016ae4
|
||||
/* f019968: e7aa0020 */ swc1 $f10,0x20($sp)
|
||||
/* f01996c: 02002025 */ or $a0,$s0,$zero
|
||||
/* f019970: 0c00567f */ jal func000159fc
|
||||
/* f019974: 02202825 */ or $a1,$s1,$zero
|
||||
/* f019978: 02202025 */ or $a0,$s1,$zero
|
||||
/* f01997c: 0c005746 */ jal func00015d18
|
||||
/* f019980: 02002825 */ or $a1,$s0,$zero
|
||||
/* f019984: 3c138006 */ lui $s3,%hi(g_TitleModel)
|
||||
/* f019988: 267324f8 */ addiu $s3,$s3,%lo(g_TitleModel)
|
||||
/* f01998c: 8e6a0000 */ lw $t2,0x0($s3)
|
||||
/* f019990: afb00150 */ sw $s0,0x150($sp)
|
||||
/* f019994: 8d4d0008 */ lw $t5,0x8($t2)
|
||||
/* f019998: 85a4000e */ lh $a0,0xe($t5)
|
||||
/* f01999c: 0004c180 */ sll $t8,$a0,0x6
|
||||
/* f0199a0: 0fc59e7d */ jal gfxAllocate
|
||||
/* f0199a4: 03002025 */ or $a0,$t8,$zero
|
||||
/* f0199a8: afa20160 */ sw $v0,0x160($sp)
|
||||
/* f0199ac: 02002025 */ or $a0,$s0,$zero
|
||||
/* f0199b0: 0c005746 */ jal func00015d18
|
||||
/* f0199b4: 00402825 */ or $a1,$v0,$zero
|
||||
/* f0199b8: 8faf0160 */ lw $t7,0x160($sp)
|
||||
/* f0199bc: 8e790000 */ lw $t9,0x0($s3)
|
||||
/* f0199c0: af2f000c */ sw $t7,0xc($t9)
|
||||
/* f0199c4: 0c007308 */ jal func0001cc20
|
||||
/* f0199c8: 8e640000 */ lw $a0,0x0($s3)
|
||||
/* f0199cc: 8fa80190 */ lw $t0,0x190($sp)
|
||||
/* f0199d0: 240e0003 */ addiu $t6,$zero,0x3
|
||||
/* f0199d4: afae0158 */ sw $t6,0x158($sp)
|
||||
/* f0199d8: afa00154 */ sw $zero,0x154($sp)
|
||||
/* f0199dc: 02402025 */ or $a0,$s2,$zero
|
||||
/* f0199e0: 8e650000 */ lw $a1,0x0($s3)
|
||||
/* f0199e4: 0c0087bd */ jal modelRender
|
||||
/* f0199e8: afa8015c */ sw $t0,0x15c($sp)
|
||||
/* f0199ec: 8fa9015c */ lw $t1,0x15c($sp)
|
||||
/* f0199f0: 8e620000 */ lw $v0,0x0($s3)
|
||||
/* f0199f4: 00008025 */ or $s0,$zero,$zero
|
||||
/* f0199f8: afa90190 */ sw $t1,0x190($sp)
|
||||
/* f0199fc: 8c4c0008 */ lw $t4,0x8($v0)
|
||||
/* f019a00: 00008825 */ or $s1,$zero,$zero
|
||||
/* f019a04: 27b20054 */ addiu $s2,$sp,0x54
|
||||
/* f019a08: 858b000e */ lh $t3,0xe($t4)
|
||||
/* f019a0c: 59600014 */ blezl $t3,.L0f019a60
|
||||
/* f019a10: 8fbf0044 */ lw $ra,0x44($sp)
|
||||
/* f019a14: 8c4a000c */ lw $t2,0xc($v0)
|
||||
.L0f019a18:
|
||||
/* f019a18: 02402825 */ or $a1,$s2,$zero
|
||||
/* f019a1c: 0c005746 */ jal func00015d18
|
||||
/* f019a20: 01512021 */ addu $a0,$t2,$s1
|
||||
/* f019a24: 8e6d0000 */ lw $t5,0x0($s3)
|
||||
/* f019a28: 00107980 */ sll $t7,$s0,0x6
|
||||
/* f019a2c: 02402025 */ or $a0,$s2,$zero
|
||||
/* f019a30: 8db8000c */ lw $t8,0xc($t5)
|
||||
/* f019a34: 0c005815 */ jal func00016054
|
||||
/* f019a38: 030f2821 */ addu $a1,$t8,$t7
|
||||
/* f019a3c: 8e620000 */ lw $v0,0x0($s3)
|
||||
/* f019a40: 26100001 */ addiu $s0,$s0,0x1
|
||||
/* f019a44: 26310040 */ addiu $s1,$s1,0x40
|
||||
/* f019a48: 8c590008 */ lw $t9,0x8($v0)
|
||||
/* f019a4c: 872e000e */ lh $t6,0xe($t9)
|
||||
/* f019a50: 020e082a */ slt $at,$s0,$t6
|
||||
/* f019a54: 5420fff0 */ bnezl $at,.L0f019a18
|
||||
/* f019a58: 8c4a000c */ lw $t2,0xc($v0)
|
||||
/* f019a5c: 8fbf0044 */ lw $ra,0x44($sp)
|
||||
.L0f019a60:
|
||||
/* f019a60: 8fa20190 */ lw $v0,0x190($sp)
|
||||
/* f019a64: d7b40028 */ ldc1 $f20,0x28($sp)
|
||||
/* f019a68: 8fb00034 */ lw $s0,0x34($sp)
|
||||
/* f019a6c: 8fb10038 */ lw $s1,0x38($sp)
|
||||
/* f019a70: 8fb2003c */ lw $s2,0x3c($sp)
|
||||
/* f019a74: 8fb30040 */ lw $s3,0x40($sp)
|
||||
/* f019a78: 03e00008 */ jr $ra
|
||||
/* f019a7c: 27bd0190 */ addiu $sp,$sp,0x190
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel titleRenderNintendoLogo
|
||||
.late_rodata
|
||||
@@ -5716,6 +6016,7 @@ glabel var7f1a84a0
|
||||
/* f019a78: 03e00008 */ jr $ra
|
||||
/* f019a7c: 27bd0190 */ addiu $sp,$sp,0x190
|
||||
);
|
||||
#endif
|
||||
|
||||
void titleInitRareLogo(void)
|
||||
{
|
||||
@@ -5799,11 +6100,11 @@ void titleTickRareLogo(void)
|
||||
var800624a8 = 1;
|
||||
titleSetNextMode(TITLEMODE_PDLOGO);
|
||||
} else if (var800624a8 == 0) {
|
||||
if (g_TitleTimer < 60) {
|
||||
if (g_TitleTimer < PALDOWN(60)) {
|
||||
var800624a8 = 1;
|
||||
|
||||
if (g_TitleTimer < 100) {
|
||||
g_TitleTimer = 100;
|
||||
if (g_TitleTimer < PALDOWN(100)) {
|
||||
g_TitleTimer = PALDOWN(100);
|
||||
}
|
||||
} else {
|
||||
var800624ac = 1;
|
||||
@@ -5812,7 +6113,9 @@ void titleTickRareLogo(void)
|
||||
}
|
||||
}
|
||||
|
||||
if (g_TitleTimer > 240 || var800624ac || (var800624a8 && g_TitleTimer > 140)) {
|
||||
if (g_TitleTimer > PALDOWN(240)
|
||||
|| var800624ac
|
||||
|| (var800624a8 && g_TitleTimer > PALDOWN(140))) {
|
||||
titleSetNextMode(TITLEMODE_NINTENDOLOGO);
|
||||
}
|
||||
}
|
||||
@@ -5823,6 +6126,7 @@ f32 func0f019d0c(f32 arg0)
|
||||
return ((1.0f - arg0) + (1.0f - arg0)) * M_PI - DEG2RAD(90);
|
||||
}
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel titleRenderRareLogo
|
||||
.late_rodata
|
||||
@@ -5861,7 +6165,7 @@ glabel var7f1a84bc
|
||||
/* f019d98: 02802025 */ or $a0,$s4,$zero
|
||||
/* f019d9c: adc10000 */ sw $at,0x0($t6)
|
||||
/* f019da0: 8e090000 */ lw $t1,0x0($s0)
|
||||
/* f019da4: 3c014370 */ lui $at,0x4370
|
||||
/* f019da4: 3c014370 */ lui $at,0x4348
|
||||
/* f019da8: 44814000 */ mtc1 $at,$f8
|
||||
/* f019dac: 44892000 */ mtc1 $t1,$f4
|
||||
/* f019db0: 00000000 */ nop
|
||||
@@ -6028,7 +6332,7 @@ glabel var7f1a84bc
|
||||
/* f01a014: e7a200bc */ swc1 $f2,0xbc($sp)
|
||||
/* f01a018: 46064280 */ add.s $f10,$f8,$f6
|
||||
/* f01a01c: 46040201 */ sub.s $f8,$f0,$f4
|
||||
/* f01a020: e42a2920 */ swc1 $f10,0x2920($at)
|
||||
/* f01a020: e42a2920 */ swc1 $f10,%lo(var80062920)($at)
|
||||
/* f01a024: 3c017f1b */ lui $at,%hi(var7f1a84bc)
|
||||
/* f01a028: c43084bc */ lwc1 $f16,%lo(var7f1a84bc)($at)
|
||||
/* f01a02c: 46088182 */ mul.s $f6,$f16,$f8
|
||||
@@ -6240,6 +6544,425 @@ glabel var7f1a84bc
|
||||
/* f01a340: 03e00008 */ jr $ra
|
||||
/* f01a344: 27bd01a0 */ addiu $sp,$sp,0x1a0
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel titleRenderRareLogo
|
||||
.late_rodata
|
||||
glabel var7f1a84b4
|
||||
.word 0x3dcccccd
|
||||
glabel var7f1a84b8
|
||||
.word 0x3e4ccccd
|
||||
glabel var7f1a84bc
|
||||
.word 0x3fc90fdb
|
||||
.text
|
||||
/* f019d38: 27bdfe60 */ addiu $sp,$sp,-416
|
||||
/* f019d3c: afb00030 */ sw $s0,0x30($sp)
|
||||
/* f019d40: 3c0f8006 */ lui $t7,%hi(var800628d4)
|
||||
/* f019d44: 3c108006 */ lui $s0,%hi(g_TitleTimer)
|
||||
/* f019d48: afb40040 */ sw $s4,0x40($sp)
|
||||
/* f019d4c: 25ef28d4 */ addiu $t7,$t7,%lo(var800628d4)
|
||||
/* f019d50: 0080a025 */ or $s4,$a0,$zero
|
||||
/* f019d54: 261024c4 */ addiu $s0,$s0,%lo(g_TitleTimer)
|
||||
/* f019d58: afbf0044 */ sw $ra,0x44($sp)
|
||||
/* f019d5c: afb3003c */ sw $s3,0x3c($sp)
|
||||
/* f019d60: afb20038 */ sw $s2,0x38($sp)
|
||||
/* f019d64: afb10034 */ sw $s1,0x34($sp)
|
||||
/* f019d68: 25e8003c */ addiu $t0,$t7,0x3c
|
||||
/* f019d6c: 27ae0160 */ addiu $t6,$sp,0x160
|
||||
.L0f019d70:
|
||||
/* f019d70: 8de10000 */ lw $at,0x0($t7)
|
||||
/* f019d74: 25ef000c */ addiu $t7,$t7,0xc
|
||||
/* f019d78: 25ce000c */ addiu $t6,$t6,0xc
|
||||
/* f019d7c: adc1fff4 */ sw $at,-0xc($t6)
|
||||
/* f019d80: 8de1fff8 */ lw $at,-0x8($t7)
|
||||
/* f019d84: adc1fff8 */ sw $at,-0x8($t6)
|
||||
/* f019d88: 8de1fffc */ lw $at,-0x4($t7)
|
||||
/* f019d8c: 15e8fff8 */ bne $t7,$t0,.L0f019d70
|
||||
/* f019d90: adc1fffc */ sw $at,-0x4($t6)
|
||||
/* f019d94: 8de10000 */ lw $at,0x0($t7)
|
||||
/* f019d98: 02802025 */ or $a0,$s4,$zero
|
||||
/* f019d9c: adc10000 */ sw $at,0x0($t6)
|
||||
/* f019da0: 8e090000 */ lw $t1,0x0($s0)
|
||||
/* f019da4: 3c014370 */ lui $at,0x4370
|
||||
/* f019da8: 44814000 */ mtc1 $at,$f8
|
||||
/* f019dac: 44892000 */ mtc1 $t1,$f4
|
||||
/* f019db0: 00000000 */ nop
|
||||
/* f019db4: 468021a0 */ cvt.s.w $f6,$f4
|
||||
/* f019db8: 46083283 */ div.s $f10,$f6,$f8
|
||||
/* f019dbc: 0fc06bf0 */ jal func0f01afc0
|
||||
/* f019dc0: e7aa0158 */ swc1 $f10,0x158($sp)
|
||||
/* f019dc4: 8e0a0000 */ lw $t2,0x0($s0)
|
||||
/* f019dc8: 3c0b8006 */ lui $t3,%hi(var80062914)
|
||||
/* f019dcc: 0040a025 */ or $s4,$v0,$zero
|
||||
/* f019dd0: 05410003 */ bgez $t2,.L0f019de0
|
||||
/* f019dd4: 256b2914 */ addiu $t3,$t3,%lo(var80062914)
|
||||
/* f019dd8: 10000154 */ b .L0f01a32c
|
||||
/* f019ddc: 8fbf0044 */ lw $ra,0x44($sp)
|
||||
.L0f019de0:
|
||||
/* f019de0: 8d610000 */ lw $at,0x0($t3)
|
||||
/* f019de4: 27b10104 */ addiu $s1,$sp,0x104
|
||||
/* f019de8: ae210000 */ sw $at,0x0($s1)
|
||||
/* f019dec: 8d6d0004 */ lw $t5,0x4($t3)
|
||||
/* f019df0: ae2d0004 */ sw $t5,0x4($s1)
|
||||
/* f019df4: 8d610008 */ lw $at,0x8($t3)
|
||||
/* f019df8: ae210008 */ sw $at,0x8($s1)
|
||||
/* f019dfc: 0fc06743 */ jal func0f019d0c
|
||||
/* f019e00: c7ac0158 */ lwc1 $f12,0x158($sp)
|
||||
/* f019e04: 0c0068f7 */ jal sinf
|
||||
/* f019e08: 46000306 */ mov.s $f12,$f0
|
||||
/* f019e0c: e7a0010c */ swc1 $f0,0x10c($sp)
|
||||
/* f019e10: 0fc06743 */ jal func0f019d0c
|
||||
/* f019e14: c7ac0158 */ lwc1 $f12,0x158($sp)
|
||||
/* f019e18: 0c0068f4 */ jal cosf
|
||||
/* f019e1c: 46000306 */ mov.s $f12,$f0
|
||||
/* f019e20: 27b20108 */ addiu $s2,$sp,0x108
|
||||
/* f019e24: 27b3010c */ addiu $s3,$sp,0x10c
|
||||
/* f019e28: e7a00104 */ swc1 $f0,0x104($sp)
|
||||
/* f019e2c: 02603025 */ or $a2,$s3,$zero
|
||||
/* f019e30: 02402825 */ or $a1,$s2,$zero
|
||||
/* f019e34: 0c0011e4 */ jal guNormalize
|
||||
/* f019e38: 02202025 */ or $a0,$s1,$zero
|
||||
/* f019e3c: 3c017f1b */ lui $at,%hi(var7f1a84b4)
|
||||
/* f019e40: c42084b4 */ lwc1 $f0,%lo(var7f1a84b4)($at)
|
||||
/* f019e44: c7a20158 */ lwc1 $f2,0x158($sp)
|
||||
/* f019e48: 241000ff */ addiu $s0,$zero,0xff
|
||||
/* f019e4c: 4600103c */ c.lt.s $f2,$f0
|
||||
/* f019e50: 00000000 */ nop
|
||||
/* f019e54: 45000008 */ bc1f .L0f019e78
|
||||
/* f019e58: 3c01437f */ lui $at,0x437f
|
||||
/* f019e5c: 44818000 */ mtc1 $at,$f16
|
||||
/* f019e60: 00000000 */ nop
|
||||
/* f019e64: 46028482 */ mul.s $f18,$f16,$f2
|
||||
/* f019e68: 46009103 */ div.s $f4,$f18,$f0
|
||||
/* f019e6c: 4600218d */ trunc.w.s $f6,$f4
|
||||
/* f019e70: 44103000 */ mfc1 $s0,$f6
|
||||
/* f019e74: 00000000 */ nop
|
||||
.L0f019e78:
|
||||
/* f019e78: 2a010100 */ slti $at,$s0,0x100
|
||||
/* f019e7c: 14200002 */ bnez $at,.L0f019e88
|
||||
/* f019e80: 00000000 */ nop
|
||||
/* f019e84: 241000ff */ addiu $s0,$zero,0xff
|
||||
.L0f019e88:
|
||||
/* f019e88: 06010002 */ bgez $s0,.L0f019e94
|
||||
/* f019e8c: 3c017f1b */ lui $at,%hi(var7f1a84b8)
|
||||
/* f019e90: 00008025 */ or $s0,$zero,$zero
|
||||
.L0f019e94:
|
||||
/* f019e94: c42084b8 */ lwc1 $f0,%lo(var7f1a84b8)($at)
|
||||
/* f019e98: 4600103c */ c.lt.s $f2,$f0
|
||||
/* f019e9c: 00000000 */ nop
|
||||
/* f019ea0: 45000013 */ bc1f .L0f019ef0
|
||||
/* f019ea4: 3c01437f */ lui $at,0x437f
|
||||
/* f019ea8: 44814000 */ mtc1 $at,$f8
|
||||
/* f019eac: 44802000 */ mtc1 $zero,$f4
|
||||
/* f019eb0: 3c048006 */ lui $a0,%hi(var80062590)
|
||||
/* f019eb4: 46024282 */ mul.s $f10,$f8,$f2
|
||||
/* f019eb8: 24842590 */ addiu $a0,$a0,%lo(var80062590)
|
||||
/* f019ebc: afb10014 */ sw $s1,0x14($sp)
|
||||
/* f019ec0: e7a40010 */ swc1 $f4,0x10($sp)
|
||||
/* f019ec4: 46005403 */ div.s $f16,$f10,$f0
|
||||
/* f019ec8: 4600848d */ trunc.w.s $f18,$f16
|
||||
/* f019ecc: 44059000 */ mfc1 $a1,$f18
|
||||
/* f019ed0: 00000000 */ nop
|
||||
/* f019ed4: 30a800ff */ andi $t0,$a1,0xff
|
||||
/* f019ed8: 01002825 */ or $a1,$t0,$zero
|
||||
/* f019edc: 310600ff */ andi $a2,$t0,0xff
|
||||
/* f019ee0: 0fc0585b */ jal func0f01616c
|
||||
/* f019ee4: 310700ff */ andi $a3,$t0,0xff
|
||||
/* f019ee8: 1000000b */ b .L0f019f18
|
||||
/* f019eec: 3c013f00 */ lui $at,0x3f00
|
||||
.L0f019ef0:
|
||||
/* f019ef0: 44803000 */ mtc1 $zero,$f6
|
||||
/* f019ef4: 3c048006 */ lui $a0,%hi(var80062590)
|
||||
/* f019ef8: 320500ff */ andi $a1,$s0,0xff
|
||||
/* f019efc: 30a600ff */ andi $a2,$a1,0xff
|
||||
/* f019f00: 30a700ff */ andi $a3,$a1,0xff
|
||||
/* f019f04: 24842590 */ addiu $a0,$a0,%lo(var80062590)
|
||||
/* f019f08: afb10014 */ sw $s1,0x14($sp)
|
||||
/* f019f0c: 0fc0585b */ jal func0f01616c
|
||||
/* f019f10: e7a60010 */ swc1 $f6,0x10($sp)
|
||||
/* f019f14: 3c013f00 */ lui $at,0x3f00
|
||||
.L0f019f18:
|
||||
/* f019f18: 00107880 */ sll $t7,$s0,0x2
|
||||
/* f019f1c: 44816000 */ mtc1 $at,$f12
|
||||
/* f019f20: 01f07823 */ subu $t7,$t7,$s0
|
||||
/* f019f24: 000f7980 */ sll $t7,$t7,0x6
|
||||
/* f019f28: 240100ff */ addiu $at,$zero,0xff
|
||||
/* f019f2c: 01e1001a */ div $zero,$t7,$at
|
||||
/* f019f30: c7a80158 */ lwc1 $f8,0x158($sp)
|
||||
/* f019f34: 00008012 */ mflo $s0
|
||||
/* f019f38: 460c403c */ c.lt.s $f8,$f12
|
||||
/* f019f3c: 00000000 */ nop
|
||||
/* f019f40: 4502001c */ bc1fl .L0f019fb4
|
||||
/* f019f44: 44808000 */ mtc1 $zero,$f16
|
||||
/* f019f48: 0fc06743 */ jal func0f019d0c
|
||||
/* f019f4c: 00000000 */ nop
|
||||
/* f019f50: 0c0068f7 */ jal sinf
|
||||
/* f019f54: 46000306 */ mov.s $f12,$f0
|
||||
/* f019f58: 3c013f00 */ lui $at,0x3f00
|
||||
/* f019f5c: 44816000 */ mtc1 $at,$f12
|
||||
/* f019f60: 0fc06743 */ jal func0f019d0c
|
||||
/* f019f64: e7a0010c */ swc1 $f0,0x10c($sp)
|
||||
/* f019f68: 0c0068f4 */ jal cosf
|
||||
/* f019f6c: 46000306 */ mov.s $f12,$f0
|
||||
/* f019f70: e7a00104 */ swc1 $f0,0x104($sp)
|
||||
/* f019f74: 02202025 */ or $a0,$s1,$zero
|
||||
/* f019f78: 02402825 */ or $a1,$s2,$zero
|
||||
/* f019f7c: 0c0011e4 */ jal guNormalize
|
||||
/* f019f80: 02603025 */ or $a2,$s3,$zero
|
||||
/* f019f84: 44805000 */ mtc1 $zero,$f10
|
||||
/* f019f88: 3c048006 */ lui $a0,%hi(var800625a8)
|
||||
/* f019f8c: 320500ff */ andi $a1,$s0,0xff
|
||||
/* f019f90: 30a600ff */ andi $a2,$a1,0xff
|
||||
/* f019f94: 30a700ff */ andi $a3,$a1,0xff
|
||||
/* f019f98: 248425a8 */ addiu $a0,$a0,%lo(var800625a8)
|
||||
/* f019f9c: afb10014 */ sw $s1,0x14($sp)
|
||||
/* f019fa0: 0fc0585b */ jal func0f01616c
|
||||
/* f019fa4: e7aa0010 */ swc1 $f10,0x10($sp)
|
||||
/* f019fa8: 1000000b */ b .L0f019fd8
|
||||
/* f019fac: 3c013f80 */ lui $at,0x3f80
|
||||
/* f019fb0: 44808000 */ mtc1 $zero,$f16
|
||||
.L0f019fb4:
|
||||
/* f019fb4: 3c048006 */ lui $a0,%hi(var800625a8)
|
||||
/* f019fb8: 320500ff */ andi $a1,$s0,0xff
|
||||
/* f019fbc: 30a600ff */ andi $a2,$a1,0xff
|
||||
/* f019fc0: 30a700ff */ andi $a3,$a1,0xff
|
||||
/* f019fc4: 248425a8 */ addiu $a0,$a0,%lo(var800625a8)
|
||||
/* f019fc8: afb10014 */ sw $s1,0x14($sp)
|
||||
/* f019fcc: 0fc0585b */ jal func0f01616c
|
||||
/* f019fd0: e7b00010 */ swc1 $f16,0x10($sp)
|
||||
/* f019fd4: 3c013f80 */ lui $at,0x3f80
|
||||
.L0f019fd8:
|
||||
/* f019fd8: 44810000 */ mtc1 $at,$f0
|
||||
/* f019fdc: 3c01800a */ lui $at,%hi(g_Vars+0x44)
|
||||
/* f019fe0: c432a004 */ lwc1 $f18,%lo(g_Vars+0x44)($at)
|
||||
/* f019fe4: 3c0142b4 */ lui $at,0x42b4
|
||||
/* f019fe8: 44812000 */ mtc1 $at,$f4
|
||||
/* f019fec: 3c018006 */ lui $at,%hi(var80062920)
|
||||
/* f019ff0: c4282920 */ lwc1 $f8,%lo(var80062920)($at)
|
||||
/* f019ff4: 46049183 */ div.s $f6,$f18,$f4
|
||||
/* f019ff8: c7b20158 */ lwc1 $f18,0x158($sp)
|
||||
/* f019ffc: 44801000 */ mtc1 $zero,$f2
|
||||
/* f01a000: 27b100c0 */ addiu $s1,$sp,0xc0
|
||||
/* f01a004: 46009102 */ mul.s $f4,$f18,$f0
|
||||
/* f01a008: 02202825 */ or $a1,$s1,$zero
|
||||
/* f01a00c: 27a400b4 */ addiu $a0,$sp,0xb4
|
||||
/* f01a010: e7a200b4 */ swc1 $f2,0xb4($sp)
|
||||
/* f01a014: e7a200bc */ swc1 $f2,0xbc($sp)
|
||||
/* f01a018: 46064280 */ add.s $f10,$f8,$f6
|
||||
/* f01a01c: 46040201 */ sub.s $f8,$f0,$f4
|
||||
/* f01a020: e42a2920 */ swc1 $f10,%lo(var80062920)($at)
|
||||
/* f01a024: 3c017f1b */ lui $at,%hi(var7f1a84bc)
|
||||
/* f01a028: c43084bc */ lwc1 $f16,%lo(var7f1a84bc)($at)
|
||||
/* f01a02c: 46088182 */ mul.s $f6,$f16,$f8
|
||||
/* f01a030: 0c005923 */ jal func0001648c
|
||||
/* f01a034: e7a600b8 */ swc1 $f6,0xb8($sp)
|
||||
/* f01a038: 3c013e80 */ lui $at,0x3e80
|
||||
/* f01a03c: 44819000 */ mtc1 $at,$f18
|
||||
/* f01a040: c7aa0158 */ lwc1 $f10,0x158($sp)
|
||||
/* f01a044: 3c013f80 */ lui $at,0x3f80
|
||||
/* f01a048: 44818000 */ mtc1 $at,$f16
|
||||
/* f01a04c: 46125102 */ mul.s $f4,$f10,$f18
|
||||
/* f01a050: 02202825 */ or $a1,$s1,$zero
|
||||
/* f01a054: 0c0057e2 */ jal func00015f88
|
||||
/* f01a058: 46102300 */ add.s $f12,$f4,$f16
|
||||
/* f01a05c: 44800000 */ mtc1 $zero,$f0
|
||||
/* f01a060: 3c013f80 */ lui $at,0x3f80
|
||||
/* f01a064: 44814000 */ mtc1 $at,$f8
|
||||
/* f01a068: 27b00118 */ addiu $s0,$sp,0x118
|
||||
/* f01a06c: 44050000 */ mfc1 $a1,$f0
|
||||
/* f01a070: 44060000 */ mfc1 $a2,$f0
|
||||
/* f01a074: 02002025 */ or $a0,$s0,$zero
|
||||
/* f01a078: 3c07457a */ lui $a3,0x457a
|
||||
/* f01a07c: e7a00010 */ swc1 $f0,0x10($sp)
|
||||
/* f01a080: e7a00014 */ swc1 $f0,0x14($sp)
|
||||
/* f01a084: e7a00018 */ swc1 $f0,0x18($sp)
|
||||
/* f01a088: e7a0001c */ swc1 $f0,0x1c($sp)
|
||||
/* f01a08c: e7a00024 */ swc1 $f0,0x24($sp)
|
||||
/* f01a090: 0c005ab9 */ jal func00016ae4
|
||||
/* f01a094: e7a80020 */ swc1 $f8,0x20($sp)
|
||||
/* f01a098: 02002025 */ or $a0,$s0,$zero
|
||||
/* f01a09c: 0c00567f */ jal func000159fc
|
||||
/* f01a0a0: 02202825 */ or $a1,$s1,$zero
|
||||
/* f01a0a4: 02202025 */ or $a0,$s1,$zero
|
||||
/* f01a0a8: 0c005746 */ jal func00015d18
|
||||
/* f01a0ac: 02002825 */ or $a1,$s0,$zero
|
||||
/* f01a0b0: 3c138006 */ lui $s3,%hi(g_TitleModel)
|
||||
/* f01a0b4: 267324f8 */ addiu $s3,$s3,%lo(g_TitleModel)
|
||||
/* f01a0b8: 8e690000 */ lw $t1,0x0($s3)
|
||||
/* f01a0bc: afb00160 */ sw $s0,0x160($sp)
|
||||
/* f01a0c0: 8d2a0008 */ lw $t2,0x8($t1)
|
||||
/* f01a0c4: 8544000e */ lh $a0,0xe($t2)
|
||||
/* f01a0c8: 00046180 */ sll $t4,$a0,0x6
|
||||
/* f01a0cc: 0fc59e7d */ jal gfxAllocate
|
||||
/* f01a0d0: 01802025 */ or $a0,$t4,$zero
|
||||
/* f01a0d4: afa20170 */ sw $v0,0x170($sp)
|
||||
/* f01a0d8: 02002025 */ or $a0,$s0,$zero
|
||||
/* f01a0dc: 0c005746 */ jal func00015d18
|
||||
/* f01a0e0: 00402825 */ or $a1,$v0,$zero
|
||||
/* f01a0e4: 8fab0170 */ lw $t3,0x170($sp)
|
||||
/* f01a0e8: 8e6d0000 */ lw $t5,0x0($s3)
|
||||
/* f01a0ec: adab000c */ sw $t3,0xc($t5)
|
||||
/* f01a0f0: 0c007308 */ jal func0001cc20
|
||||
/* f01a0f4: 8e640000 */ lw $a0,0x0($s3)
|
||||
/* f01a0f8: 8e790000 */ lw $t9,0x0($s3)
|
||||
/* f01a0fc: 2405000b */ addiu $a1,$zero,0xb
|
||||
/* f01a100: 0c006a47 */ jal modelGetPart
|
||||
/* f01a104: 8f240008 */ lw $a0,0x8($t9)
|
||||
/* f01a108: 8e640000 */ lw $a0,0x0($s3)
|
||||
/* f01a10c: 0c006a87 */ jal modelGetNodeData
|
||||
/* f01a110: 00402825 */ or $a1,$v0,$zero
|
||||
/* f01a114: 50400003 */ beqzl $v0,.L0f01a124
|
||||
/* f01a118: 8e780000 */ lw $t8,0x0($s3)
|
||||
/* f01a11c: ac400000 */ sw $zero,0x0($v0)
|
||||
/* f01a120: 8e780000 */ lw $t8,0x0($s3)
|
||||
.L0f01a124:
|
||||
/* f01a124: 2405000d */ addiu $a1,$zero,0xd
|
||||
/* f01a128: 0c006a47 */ jal modelGetPart
|
||||
/* f01a12c: 8f040008 */ lw $a0,0x8($t8)
|
||||
/* f01a130: 8e640000 */ lw $a0,0x0($s3)
|
||||
/* f01a134: 0c006a87 */ jal modelGetNodeData
|
||||
/* f01a138: 00402825 */ or $a1,$v0,$zero
|
||||
/* f01a13c: 10400002 */ beqz $v0,.L0f01a148
|
||||
/* f01a140: 24080001 */ addiu $t0,$zero,0x1
|
||||
/* f01a144: ac480000 */ sw $t0,0x0($v0)
|
||||
.L0f01a148:
|
||||
/* f01a148: 8e6f0000 */ lw $t7,0x0($s3)
|
||||
/* f01a14c: 2405000c */ addiu $a1,$zero,0xc
|
||||
/* f01a150: 0c006a47 */ jal modelGetPart
|
||||
/* f01a154: 8de40008 */ lw $a0,0x8($t7)
|
||||
/* f01a158: 8e640000 */ lw $a0,0x0($s3)
|
||||
/* f01a15c: 0c006a87 */ jal modelGetNodeData
|
||||
/* f01a160: 00402825 */ or $a1,$v0,$zero
|
||||
/* f01a164: 10400002 */ beqz $v0,.L0f01a170
|
||||
/* f01a168: 3c12bc00 */ lui $s2,0xbc00
|
||||
/* f01a16c: ac400000 */ sw $zero,0x0($v0)
|
||||
.L0f01a170:
|
||||
/* f01a170: 02801025 */ or $v0,$s4,$zero
|
||||
/* f01a174: 3c0e8000 */ lui $t6,0x8000
|
||||
/* f01a178: 36520002 */ ori $s2,$s2,0x2
|
||||
/* f01a17c: 35ce0040 */ ori $t6,$t6,0x40
|
||||
/* f01a180: 26830008 */ addiu $v1,$s4,0x8
|
||||
/* f01a184: ac4e0004 */ sw $t6,0x4($v0)
|
||||
/* f01a188: ac520000 */ sw $s2,0x0($v0)
|
||||
/* f01a18c: 3c090386 */ lui $t1,0x386
|
||||
/* f01a190: 3c108006 */ lui $s0,%hi(var80062598)
|
||||
/* f01a194: 26102598 */ addiu $s0,$s0,%lo(var80062598)
|
||||
/* f01a198: 35290010 */ ori $t1,$t1,0x10
|
||||
/* f01a19c: ac690000 */ sw $t1,0x0($v1)
|
||||
/* f01a1a0: ac700004 */ sw $s0,0x4($v1)
|
||||
/* f01a1a4: 24660008 */ addiu $a2,$v1,0x8
|
||||
/* f01a1a8: 3c0a0388 */ lui $t2,0x388
|
||||
/* f01a1ac: 3c118006 */ lui $s1,%hi(var80062590)
|
||||
/* f01a1b0: 26312590 */ addiu $s1,$s1,%lo(var80062590)
|
||||
/* f01a1b4: 354a0010 */ ori $t2,$t2,0x10
|
||||
/* f01a1b8: acca0000 */ sw $t2,0x0($a2)
|
||||
/* f01a1bc: acd10004 */ sw $s1,0x4($a2)
|
||||
/* f01a1c0: 24d40008 */ addiu $s4,$a2,0x8
|
||||
/* f01a1c4: 240c0003 */ addiu $t4,$zero,0x3
|
||||
/* f01a1c8: afac0168 */ sw $t4,0x168($sp)
|
||||
/* f01a1cc: afa00164 */ sw $zero,0x164($sp)
|
||||
/* f01a1d0: afb4016c */ sw $s4,0x16c($sp)
|
||||
/* f01a1d4: 8e650000 */ lw $a1,0x0($s3)
|
||||
/* f01a1d8: 0c0087bd */ jal modelRender
|
||||
/* f01a1dc: 27a40160 */ addiu $a0,$sp,0x160
|
||||
/* f01a1e0: 8e6b0000 */ lw $t3,0x0($s3)
|
||||
/* f01a1e4: 8fb4016c */ lw $s4,0x16c($sp)
|
||||
/* f01a1e8: 2405000b */ addiu $a1,$zero,0xb
|
||||
/* f01a1ec: 0c006a47 */ jal modelGetPart
|
||||
/* f01a1f0: 8d640008 */ lw $a0,0x8($t3)
|
||||
/* f01a1f4: 8e640000 */ lw $a0,0x0($s3)
|
||||
/* f01a1f8: 0c006a87 */ jal modelGetNodeData
|
||||
/* f01a1fc: 00402825 */ or $a1,$v0,$zero
|
||||
/* f01a200: 10400002 */ beqz $v0,.L0f01a20c
|
||||
/* f01a204: 240d0001 */ addiu $t5,$zero,0x1
|
||||
/* f01a208: ac4d0000 */ sw $t5,0x0($v0)
|
||||
.L0f01a20c:
|
||||
/* f01a20c: 8e790000 */ lw $t9,0x0($s3)
|
||||
/* f01a210: 2405000d */ addiu $a1,$zero,0xd
|
||||
/* f01a214: 0c006a47 */ jal modelGetPart
|
||||
/* f01a218: 8f240008 */ lw $a0,0x8($t9)
|
||||
/* f01a21c: 8e640000 */ lw $a0,0x0($s3)
|
||||
/* f01a220: 0c006a87 */ jal modelGetNodeData
|
||||
/* f01a224: 00402825 */ or $a1,$v0,$zero
|
||||
/* f01a228: 50400003 */ beqzl $v0,.L0f01a238
|
||||
/* f01a22c: 8e780000 */ lw $t8,0x0($s3)
|
||||
/* f01a230: ac400000 */ sw $zero,0x0($v0)
|
||||
/* f01a234: 8e780000 */ lw $t8,0x0($s3)
|
||||
.L0f01a238:
|
||||
/* f01a238: 2405000c */ addiu $a1,$zero,0xc
|
||||
/* f01a23c: 0c006a47 */ jal modelGetPart
|
||||
/* f01a240: 8f040008 */ lw $a0,0x8($t8)
|
||||
/* f01a244: 8e640000 */ lw $a0,0x0($s3)
|
||||
/* f01a248: 0c006a87 */ jal modelGetNodeData
|
||||
/* f01a24c: 00402825 */ or $a1,$v0,$zero
|
||||
/* f01a250: 10400003 */ beqz $v0,.L0f01a260
|
||||
/* f01a254: 26830008 */ addiu $v1,$s4,0x8
|
||||
/* f01a258: 24080001 */ addiu $t0,$zero,0x1
|
||||
/* f01a25c: ac480000 */ sw $t0,0x0($v0)
|
||||
.L0f01a260:
|
||||
/* f01a260: 02801025 */ or $v0,$s4,$zero
|
||||
/* f01a264: 3c0f8000 */ lui $t7,0x8000
|
||||
/* f01a268: 35ef0040 */ ori $t7,$t7,0x40
|
||||
/* f01a26c: ac4f0004 */ sw $t7,0x4($v0)
|
||||
/* f01a270: ac520000 */ sw $s2,0x0($v0)
|
||||
/* f01a274: 3c0e0386 */ lui $t6,0x386
|
||||
/* f01a278: 35ce0010 */ ori $t6,$t6,0x10
|
||||
/* f01a27c: ac6e0000 */ sw $t6,0x0($v1)
|
||||
/* f01a280: ac700004 */ sw $s0,0x4($v1)
|
||||
/* f01a284: 24660008 */ addiu $a2,$v1,0x8
|
||||
/* f01a288: 3c090388 */ lui $t1,0x388
|
||||
/* f01a28c: 35290010 */ ori $t1,$t1,0x10
|
||||
/* f01a290: acc90000 */ sw $t1,0x0($a2)
|
||||
/* f01a294: acd10004 */ sw $s1,0x4($a2)
|
||||
/* f01a298: 24d40008 */ addiu $s4,$a2,0x8
|
||||
/* f01a29c: 240a0003 */ addiu $t2,$zero,0x3
|
||||
/* f01a2a0: afaa0168 */ sw $t2,0x168($sp)
|
||||
/* f01a2a4: afa00164 */ sw $zero,0x164($sp)
|
||||
/* f01a2a8: afb4016c */ sw $s4,0x16c($sp)
|
||||
/* f01a2ac: 8e650000 */ lw $a1,0x0($s3)
|
||||
/* f01a2b0: 0c0087bd */ jal modelRender
|
||||
/* f01a2b4: 27a40160 */ addiu $a0,$sp,0x160
|
||||
/* f01a2b8: 8e620000 */ lw $v0,0x0($s3)
|
||||
/* f01a2bc: 8fb4016c */ lw $s4,0x16c($sp)
|
||||
/* f01a2c0: 00008025 */ or $s0,$zero,$zero
|
||||
/* f01a2c4: 8c4c0008 */ lw $t4,0x8($v0)
|
||||
/* f01a2c8: 00008825 */ or $s1,$zero,$zero
|
||||
/* f01a2cc: 27b20058 */ addiu $s2,$sp,0x58
|
||||
/* f01a2d0: 858b000e */ lh $t3,0xe($t4)
|
||||
/* f01a2d4: 59600014 */ blezl $t3,.L0f01a328
|
||||
/* f01a2d8: 02801025 */ or $v0,$s4,$zero
|
||||
/* f01a2dc: 8c4d000c */ lw $t5,0xc($v0)
|
||||
.L0f01a2e0:
|
||||
/* f01a2e0: 02402825 */ or $a1,$s2,$zero
|
||||
/* f01a2e4: 0c005746 */ jal func00015d18
|
||||
/* f01a2e8: 01b12021 */ addu $a0,$t5,$s1
|
||||
/* f01a2ec: 8e790000 */ lw $t9,0x0($s3)
|
||||
/* f01a2f0: 00104180 */ sll $t0,$s0,0x6
|
||||
/* f01a2f4: 02402025 */ or $a0,$s2,$zero
|
||||
/* f01a2f8: 8f38000c */ lw $t8,0xc($t9)
|
||||
/* f01a2fc: 0c005815 */ jal func00016054
|
||||
/* f01a300: 03082821 */ addu $a1,$t8,$t0
|
||||
/* f01a304: 8e620000 */ lw $v0,0x0($s3)
|
||||
/* f01a308: 26100001 */ addiu $s0,$s0,0x1
|
||||
/* f01a30c: 26310040 */ addiu $s1,$s1,0x40
|
||||
/* f01a310: 8c4f0008 */ lw $t7,0x8($v0)
|
||||
/* f01a314: 85ee000e */ lh $t6,0xe($t7)
|
||||
/* f01a318: 020e082a */ slt $at,$s0,$t6
|
||||
/* f01a31c: 5420fff0 */ bnezl $at,.L0f01a2e0
|
||||
/* f01a320: 8c4d000c */ lw $t5,0xc($v0)
|
||||
/* f01a324: 02801025 */ or $v0,$s4,$zero
|
||||
.L0f01a328:
|
||||
/* f01a328: 8fbf0044 */ lw $ra,0x44($sp)
|
||||
.L0f01a32c:
|
||||
/* f01a32c: 8fb00030 */ lw $s0,0x30($sp)
|
||||
/* f01a330: 8fb10034 */ lw $s1,0x34($sp)
|
||||
/* f01a334: 8fb20038 */ lw $s2,0x38($sp)
|
||||
/* f01a338: 8fb3003c */ lw $s3,0x3c($sp)
|
||||
/* f01a33c: 8fb40040 */ lw $s4,0x40($sp)
|
||||
/* f01a340: 03e00008 */ jr $ra
|
||||
/* f01a344: 27bd01a0 */ addiu $sp,$sp,0x1a0
|
||||
);
|
||||
#endif
|
||||
|
||||
s32 getNumPlayers(void)
|
||||
{
|
||||
@@ -6341,8 +7064,8 @@ glabel titleRenderNoController
|
||||
/* f01a574: 852924a0 */ lh $t1,%lo(var800624a0)($t1)
|
||||
/* f01a578: 8fab0064 */ lw $t3,0x64($sp)
|
||||
/* f01a57c: 000fc043 */ sra $t8,$t7,0x1
|
||||
/* f01a580: 3c0f8008 */ lui $t7,%hi(g_LanguageId)
|
||||
/* f01a584: 8def4120 */ lw $t7,%lo(g_LanguageId)($t7)
|
||||
/* f01a580: 3c0f8008 */ lui $t7,%hi(g_Jpn)
|
||||
/* f01a584: 8def4120 */ lw $t7,%lo(g_Jpn)($t7)
|
||||
/* f01a588: 000b6043 */ sra $t4,$t3,0x1
|
||||
/* f01a58c: 24190120 */ addiu $t9,$zero,0x120
|
||||
/* f01a590: 03384023 */ subu $t0,$t9,$t8
|
||||
@@ -6426,8 +7149,8 @@ glabel titleRenderNoController
|
||||
/* f01a6bc: 856b24a0 */ lh $t3,%lo(var800624a0)($t3)
|
||||
/* f01a6c0: 8fac0064 */ lw $t4,0x64($sp)
|
||||
/* f01a6c4: 0019c043 */ sra $t8,$t9,0x1
|
||||
/* f01a6c8: 3c198008 */ lui $t9,%hi(g_LanguageId)
|
||||
/* f01a6cc: 8f394120 */ lw $t9,%lo(g_LanguageId)($t9)
|
||||
/* f01a6c8: 3c198008 */ lui $t9,%hi(g_Jpn)
|
||||
/* f01a6cc: 8f394120 */ lw $t9,%lo(g_Jpn)($t9)
|
||||
/* f01a6d0: 000c6843 */ sra $t5,$t4,0x1
|
||||
/* f01a6d4: 24080120 */ addiu $t0,$zero,0x120
|
||||
/* f01a6d8: 01184823 */ subu $t1,$t0,$t8
|
||||
@@ -6533,7 +7256,7 @@ glabel titleRenderNoController
|
||||
// x = 288 - (textwidth >> 1);
|
||||
// y = ((var800624a0 / 2) - (textheight >> 1)) - 12;
|
||||
//
|
||||
// if (g_LanguageId != LANGUAGE_NTSC_EN) {
|
||||
// if (g_Jpn) {
|
||||
// gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicLg1, g_FontHandelGothicLg2,
|
||||
// -1, 0x008000ff, viGetWidth(), viGetHeight(), 0, 0);
|
||||
// } else {
|
||||
@@ -6548,7 +7271,7 @@ glabel titleRenderNoController
|
||||
// x = 288 - (textwidth >> 1);
|
||||
// y = ((var800624a0 / 2) - (textheight >> 1)) + 12;
|
||||
//
|
||||
// if (g_LanguageId != LANGUAGE_NTSC_EN) {
|
||||
// if (g_Jpn) {
|
||||
// gdl = textRender(gdl, &x, &y, text, g_FontHandelGothicLg1, g_FontHandelGothicLg2,
|
||||
// -1, 0x008000ff, viGetWidth(), viGetHeight(), 0, 0);
|
||||
// } else {
|
||||
|
||||
+144
-4
@@ -2676,7 +2676,7 @@ s32 ciCharacterProfileMenuDialog(s32 operation, struct menudialog *dialog, union
|
||||
scale = 1.0f;
|
||||
}
|
||||
|
||||
g_Menus[g_MpPlayerNum].unkdb4 = (PAL ? 100 : 120);
|
||||
g_Menus[g_MpPlayerNum].unkdb4 = PALDOWN(120);
|
||||
g_Menus[g_MpPlayerNum].unkdc0 = 0;
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
@@ -2718,7 +2718,7 @@ s32 ciCharacterProfileMenuDialog(s32 operation, struct menudialog *dialog, union
|
||||
g_Menus[g_MpPlayerNum].unkd5c = 0.00393f;
|
||||
g_Menus[g_MpPlayerNum].unkd64 = 0;
|
||||
g_Menus[g_MpPlayerNum].unkd8c = 0;
|
||||
g_Menus[g_MpPlayerNum].unkdb8 = (PAL ? 50 : 60);
|
||||
g_Menus[g_MpPlayerNum].unkdb8 = PALDOWN(60);
|
||||
break;
|
||||
case MENUOP_CLOSE:
|
||||
break;
|
||||
@@ -2759,7 +2759,11 @@ s32 ciCharacterProfileMenuDialog(s32 operation, struct menudialog *dialog, union
|
||||
if (g_Menus[g_MpPlayerNum].unkdb8 > 0) {
|
||||
g_Menus[g_MpPlayerNum].unkdb8 -= g_Vars.diffframe60;
|
||||
} else {
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
f32 tmp = g_Menus[g_MpPlayerNum].unkd64 + 0.01f * g_Vars.diffframe60freal;
|
||||
#else
|
||||
f32 tmp = g_Menus[g_MpPlayerNum].unkd64 + 0.01f * g_Vars.diffframe60f;
|
||||
#endif
|
||||
g_Menus[g_MpPlayerNum].unkd8c = tmp;
|
||||
g_Menus[g_MpPlayerNum].unkd64 = tmp;
|
||||
}
|
||||
@@ -2978,8 +2982,8 @@ s32 dtTrainingDetailsMenuDialog(s32 operation, struct menudialog *dialog, union
|
||||
|
||||
if (weaponnum == WEAPON_DISGUISE41) {
|
||||
g_Menus[g_MpPlayerNum].unk89c = 0x6a;
|
||||
g_Menus[g_MpPlayerNum].unkdb8 = 60;
|
||||
g_Menus[g_MpPlayerNum].unkdb4 = 120;
|
||||
g_Menus[g_MpPlayerNum].unkdb8 = PALDOWN(60);
|
||||
g_Menus[g_MpPlayerNum].unkdb4 = PALDOWN(120);
|
||||
}
|
||||
|
||||
g_Menus[g_MpPlayerNum].unkd8c = 18.849555969238f * var80061630;
|
||||
@@ -3687,6 +3691,141 @@ glabel menuhandler001a6ea4
|
||||
/* f1a7378: 00000000 */ nop
|
||||
);
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
GLOBAL_ASM(
|
||||
glabel ciHangarHolographMenuDialog
|
||||
.late_rodata
|
||||
glabel var7f1b99d4
|
||||
.word 0x3a83126f
|
||||
glabel var7f1b99d8
|
||||
.word 0x3c23d70a
|
||||
.text
|
||||
/* f1a737c: 27bdff60 */ addiu $sp,$sp,-160
|
||||
/* f1a7380: afa600a8 */ sw $a2,0xa8($sp)
|
||||
/* f1a7384: 00803025 */ or $a2,$a0,$zero
|
||||
/* f1a7388: afa400a0 */ sw $a0,0xa0($sp)
|
||||
/* f1a738c: afbf0014 */ sw $ra,0x14($sp)
|
||||
/* f1a7390: 3c048009 */ lui $a0,%hi(g_HangarBioSlot)
|
||||
/* f1a7394: afa500a4 */ sw $a1,0xa4($sp)
|
||||
/* f1a7398: 90848964 */ lbu $a0,%lo(g_HangarBioSlot)($a0)
|
||||
/* f1a739c: 0fc685db */ jal ciGetHangarBioIndexBySlot
|
||||
/* f1a73a0: afa600a0 */ sw $a2,0xa0($sp)
|
||||
/* f1a73a4: 2841000e */ slti $at,$v0,0xe
|
||||
/* f1a73a8: 14200065 */ bnez $at,.L0f1a7540
|
||||
/* f1a73ac: 8fa600a0 */ lw $a2,0xa0($sp)
|
||||
/* f1a73b0: 3c0e8009 */ lui $t6,%hi(hoverprops)
|
||||
/* f1a73b4: 27a70030 */ addiu $a3,$sp,0x30
|
||||
/* f1a73b8: 25ce97cc */ addiu $t6,$t6,%lo(hoverprops)
|
||||
/* f1a73bc: 25d8006c */ addiu $t8,$t6,0x6c
|
||||
/* f1a73c0: 00e0c825 */ or $t9,$a3,$zero
|
||||
.L0f1a73c4:
|
||||
/* f1a73c4: 8dc10000 */ lw $at,0x0($t6)
|
||||
/* f1a73c8: 25ce000c */ addiu $t6,$t6,0xc
|
||||
/* f1a73cc: 2739000c */ addiu $t9,$t9,0xc
|
||||
/* f1a73d0: af21fff4 */ sw $at,-0xc($t9)
|
||||
/* f1a73d4: 8dc1fff8 */ lw $at,-0x8($t6)
|
||||
/* f1a73d8: af21fff8 */ sw $at,-0x8($t9)
|
||||
/* f1a73dc: 8dc1fffc */ lw $at,-0x4($t6)
|
||||
/* f1a73e0: 15d8fff8 */ bne $t6,$t8,.L0f1a73c4
|
||||
/* f1a73e4: af21fffc */ sw $at,-0x4($t9)
|
||||
/* f1a73e8: 24010064 */ addiu $at,$zero,0x64
|
||||
/* f1a73ec: 10c10008 */ beq $a2,$at,.L0f1a7410
|
||||
/* f1a73f0: 3c088007 */ lui $t0,%hi(g_MpPlayerNum)
|
||||
/* f1a73f4: 24010065 */ addiu $at,$zero,0x65
|
||||
/* f1a73f8: 10c10051 */ beq $a2,$at,.L0f1a7540
|
||||
/* f1a73fc: 24010066 */ addiu $at,$zero,0x66
|
||||
/* f1a7400: 10c10019 */ beq $a2,$at,.L0f1a7468
|
||||
/* f1a7404: 00000000 */ nop
|
||||
/* f1a7408: 1000004e */ b .L0f1a7544
|
||||
/* f1a740c: 8fbf0014 */ lw $ra,0x14($sp)
|
||||
.L0f1a7410:
|
||||
/* f1a7410: 8d081448 */ lw $t0,%lo(g_MpPlayerNum)($t0)
|
||||
/* f1a7414: 44800000 */ mtc1 $zero,$f0
|
||||
/* f1a7418: 3c0a800a */ lui $t2,%hi(g_Menus)
|
||||
/* f1a741c: 000848c0 */ sll $t1,$t0,0x3
|
||||
/* f1a7420: 01284823 */ subu $t1,$t1,$t0
|
||||
/* f1a7424: 00094880 */ sll $t1,$t1,0x2
|
||||
/* f1a7428: 01284821 */ addu $t1,$t1,$t0
|
||||
/* f1a742c: 000948c0 */ sll $t1,$t1,0x3
|
||||
/* f1a7430: 01284823 */ subu $t1,$t1,$t0
|
||||
/* f1a7434: 00094900 */ sll $t1,$t1,0x4
|
||||
/* f1a7438: 254ae000 */ addiu $t2,$t2,%lo(g_Menus)
|
||||
/* f1a743c: 012a1821 */ addu $v1,$t1,$t2
|
||||
/* f1a7440: e4600d88 */ swc1 $f0,0xd88($v1)
|
||||
/* f1a7444: e4600d60 */ swc1 $f0,0xd60($v1)
|
||||
/* f1a7448: e4600d8c */ swc1 $f0,0xd8c($v1)
|
||||
/* f1a744c: e4600d64 */ swc1 $f0,0xd64($v1)
|
||||
/* f1a7450: e4600d78 */ swc1 $f0,0xd78($v1)
|
||||
/* f1a7454: e4600d50 */ swc1 $f0,0xd50($v1)
|
||||
/* f1a7458: e4600d7c */ swc1 $f0,0xd7c($v1)
|
||||
/* f1a745c: e4600d54 */ swc1 $f0,0xd54($v1)
|
||||
/* f1a7460: 10000037 */ b .L0f1a7540
|
||||
/* f1a7464: e4600d5c */ swc1 $f0,0xd5c($v1)
|
||||
.L0f1a7468:
|
||||
/* f1a7468: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum)
|
||||
/* f1a746c: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3)
|
||||
/* f1a7470: 3c0d800a */ lui $t5,%hi(g_Menus)
|
||||
/* f1a7474: 25ade000 */ addiu $t5,$t5,%lo(g_Menus)
|
||||
/* f1a7478: 000b60c0 */ sll $t4,$t3,0x3
|
||||
/* f1a747c: 018b6023 */ subu $t4,$t4,$t3
|
||||
/* f1a7480: 000c6080 */ sll $t4,$t4,0x2
|
||||
/* f1a7484: 018b6021 */ addu $t4,$t4,$t3
|
||||
/* f1a7488: 000c60c0 */ sll $t4,$t4,0x3
|
||||
/* f1a748c: 018b6023 */ subu $t4,$t4,$t3
|
||||
/* f1a7490: 000c6100 */ sll $t4,$t4,0x4
|
||||
/* f1a7494: 018d1821 */ addu $v1,$t4,$t5
|
||||
/* f1a7498: 8c6404f8 */ lw $a0,0x4f8($v1)
|
||||
/* f1a749c: 50800029 */ beqzl $a0,.L0f1a7544
|
||||
/* f1a74a0: 8fbf0014 */ lw $ra,0x14($sp)
|
||||
/* f1a74a4: 8faf00a4 */ lw $t7,0xa4($sp)
|
||||
/* f1a74a8: 8c980000 */ lw $t8,0x0($a0)
|
||||
/* f1a74ac: 2445fff2 */ addiu $a1,$v0,-14
|
||||
/* f1a74b0: 00057080 */ sll $t6,$a1,0x2
|
||||
/* f1a74b4: 15f80022 */ bne $t7,$t8,.L0f1a7540
|
||||
/* f1a74b8: 01c57023 */ subu $t6,$t6,$a1
|
||||
/* f1a74bc: 000e7080 */ sll $t6,$t6,0x2
|
||||
/* f1a74c0: 00ee2021 */ addu $a0,$a3,$t6
|
||||
/* f1a74c4: 8c990004 */ lw $t9,0x4($a0)
|
||||
/* f1a74c8: 94880008 */ lhu $t0,0x8($a0)
|
||||
/* f1a74cc: 3c014f80 */ lui $at,0x4f80
|
||||
/* f1a74d0: 44992000 */ mtc1 $t9,$f4
|
||||
/* f1a74d4: 44883000 */ mtc1 $t0,$f6
|
||||
/* f1a74d8: 46802020 */ cvt.s.w $f0,$f4
|
||||
/* f1a74dc: 05010004 */ bgez $t0,.L0f1a74f0
|
||||
/* f1a74e0: 46803220 */ cvt.s.w $f8,$f6
|
||||
/* f1a74e4: 44815000 */ mtc1 $at,$f10
|
||||
/* f1a74e8: 00000000 */ nop
|
||||
/* f1a74ec: 460a4200 */ add.s $f8,$f8,$f10
|
||||
.L0f1a74f0:
|
||||
/* f1a74f0: 3c017f1c */ lui $at,%hi(var7f1b99d4)
|
||||
/* f1a74f4: c43099d4 */ lwc1 $f16,%lo(var7f1b99d4)($at)
|
||||
/* f1a74f8: 8c890000 */ lw $t1,0x0($a0)
|
||||
/* f1a74fc: e4600d54 */ swc1 $f0,0xd54($v1)
|
||||
/* f1a7500: 46104302 */ mul.s $f12,$f8,$f16
|
||||
/* f1a7504: e4600d7c */ swc1 $f0,0xd7c($v1)
|
||||
/* f1a7508: 3c017f1c */ lui $at,%hi(var7f1b99d8)
|
||||
/* f1a750c: ac69084c */ sw $t1,0x84c($v1)
|
||||
/* f1a7510: c46a0d64 */ lwc1 $f10,0xd64($v1)
|
||||
/* f1a7514: 3c0a8009 */ lui $t2,%hi(var800897c4)
|
||||
/* f1a7518: 254a97c4 */ addiu $t2,$t2,%lo(var800897c4)
|
||||
/* f1a751c: e46c0d84 */ swc1 $f12,0xd84($v1)
|
||||
/* f1a7520: c43299d8 */ lwc1 $f18,%lo(var7f1b99d8)($at)
|
||||
/* f1a7524: 3c01800a */ lui $at,%hi(g_Vars+0x10)
|
||||
/* f1a7528: c4249fc4 */ lwc1 $f4,%lo(g_Vars+0x10)($at)
|
||||
/* f1a752c: ac6a0df4 */ sw $t2,0xdf4($v1)
|
||||
/* f1a7530: 46049182 */ mul.s $f6,$f18,$f4
|
||||
/* f1a7534: 46065080 */ add.s $f2,$f10,$f6
|
||||
/* f1a7538: e4620d8c */ swc1 $f2,0xd8c($v1)
|
||||
/* f1a753c: e4620d64 */ swc1 $f2,0xd64($v1)
|
||||
.L0f1a7540:
|
||||
/* f1a7540: 8fbf0014 */ lw $ra,0x14($sp)
|
||||
.L0f1a7544:
|
||||
/* f1a7544: 27bd00a0 */ addiu $sp,$sp,0xa0
|
||||
/* f1a7548: 00001025 */ or $v0,$zero,$zero
|
||||
/* f1a754c: 03e00008 */ jr $ra
|
||||
/* f1a7550: 00000000 */ nop
|
||||
);
|
||||
#else
|
||||
GLOBAL_ASM(
|
||||
glabel ciHangarHolographMenuDialog
|
||||
.late_rodata
|
||||
@@ -3820,6 +3959,7 @@ glabel var7f1b99d8
|
||||
/* f1a754c: 03e00008 */ jr $ra
|
||||
/* f1a7550: 00000000 */ nop
|
||||
);
|
||||
#endif
|
||||
|
||||
s8 var800897c4[] = {-73, 0, 5, 0};
|
||||
u32 var800897c8 = 0x0400ff00;
|
||||
|
||||
@@ -377,10 +377,10 @@ void frInitLighting(void)
|
||||
s32 roomnum;
|
||||
|
||||
for (roomnum = 7; roomnum < 10; roomnum++) {
|
||||
roomSetLighting(roomnum, LIGHTOP_3, 50, 100, 32);
|
||||
roomSetLighting(roomnum, LIGHTOP_3, 50, 100, PALDOWN(32));
|
||||
}
|
||||
|
||||
roomSetLighting(CIROOM_FIRINGRANGE, LIGHTOP_3, 25, 100, 32);
|
||||
roomSetLighting(CIROOM_FIRINGRANGE, LIGHTOP_3, 25, 100, PALDOWN(32));
|
||||
|
||||
g_FrData.donelighting = true;
|
||||
|
||||
@@ -396,10 +396,10 @@ void frRestoreLighting(void)
|
||||
s32 roomnum;
|
||||
|
||||
for (roomnum = 7; roomnum < 10; roomnum++) {
|
||||
roomSetLighting(roomnum, LIGHTOP_3, 100, 50, 8);
|
||||
roomSetLighting(roomnum, LIGHTOP_3, 100, 50, PALDOWN(8));
|
||||
}
|
||||
|
||||
roomSetLighting(CIROOM_FIRINGRANGE, LIGHTOP_3, 100, 25, 8);
|
||||
roomSetLighting(CIROOM_FIRINGRANGE, LIGHTOP_3, 100, 25, PALDOWN(8));
|
||||
|
||||
g_FrData.donelighting = false;
|
||||
|
||||
@@ -508,7 +508,7 @@ void frInitDefaults(void)
|
||||
func0f13e40c(g_FrData.targets[i].prop, true);
|
||||
}
|
||||
|
||||
g_FrData.timetaken = -240;
|
||||
g_FrData.timetaken = PALDOWN(-240);
|
||||
g_FrData.score = 0;
|
||||
g_FrData.numtargets = 0;
|
||||
g_FrData.targetsdestroyed = 0;
|
||||
@@ -2094,39 +2094,39 @@ char *frGetWeaponDescription(void)
|
||||
|
||||
switch (weapon) {
|
||||
#if PAL
|
||||
case WEAPON_FALCON2: return langGet(L_DISH_285);
|
||||
case WEAPON_FALCON2_SCOPE: return langGet(L_DISH_286);
|
||||
case WEAPON_FALCON2_SILENCER: return langGet(L_DISH_287);
|
||||
case WEAPON_MAGSEC4: return langGet(L_DISH_288);
|
||||
case WEAPON_MAULER: return langGet(L_DISH_289);
|
||||
case WEAPON_PHOENIX: return langGet(L_DISH_290);
|
||||
case WEAPON_DY357MAGNUM: return langGet(L_DISH_291);
|
||||
case WEAPON_DY357LX: return langGet(L_DISH_292);
|
||||
case WEAPON_CMP150: return langGet(L_DISH_293);
|
||||
case WEAPON_CYCLONE: return langGet(L_DISH_294);
|
||||
case WEAPON_CALLISTONTG: return langGet(L_DISH_295);
|
||||
case WEAPON_RCP120: return langGet(L_DISH_296);
|
||||
case WEAPON_LAPTOPGUN: return langGet(L_DISH_297);
|
||||
case WEAPON_DRAGON: return langGet(L_DISH_298);
|
||||
case WEAPON_K7AVENGER: return langGet(L_DISH_299);
|
||||
case WEAPON_AR34: return langGet(L_DISH_300);
|
||||
case WEAPON_SUPERDRAGON: return langGet(L_DISH_301);
|
||||
case WEAPON_SHOTGUN: return langGet(L_DISH_302);
|
||||
case WEAPON_SNIPERRIFLE: return langGet(L_DISH_303);
|
||||
case WEAPON_FARSIGHTXR20: return langGet(L_DISH_304);
|
||||
case WEAPON_CROSSBOW: return langGet(L_DISH_305);
|
||||
case WEAPON_TRANQUILIZER: return langGet(L_DISH_306);
|
||||
case WEAPON_REAPER: return langGet(L_DISH_307);
|
||||
case WEAPON_DEVASTATOR: return langGet(L_DISH_308);
|
||||
case WEAPON_ROCKETLAUNCHER: return langGet(L_DISH_309);
|
||||
case WEAPON_SLAYER: return langGet(L_DISH_310);
|
||||
case WEAPON_COMBATKNIFE: return langGet(L_DISH_311);
|
||||
case WEAPON_LASER: return langGet(L_DISH_312);
|
||||
case WEAPON_GRENADE: return langGet(L_DISH_313);
|
||||
case WEAPON_NBOMB: return langGet(L_DISH_314);
|
||||
case WEAPON_TIMEDMINE: return langGet(L_DISH_315);
|
||||
case WEAPON_PROXIMITYMINE: return langGet(L_DISH_316);
|
||||
case WEAPON_REMOTEMINE: return langGet(L_DISH_317);
|
||||
case WEAPON_FALCON2: return langGet(L_DISH_283);
|
||||
case WEAPON_FALCON2_SCOPE: return langGet(L_DISH_284);
|
||||
case WEAPON_FALCON2_SILENCER: return langGet(L_DISH_285);
|
||||
case WEAPON_MAGSEC4: return langGet(L_DISH_286);
|
||||
case WEAPON_MAULER: return langGet(L_DISH_287);
|
||||
case WEAPON_PHOENIX: return langGet(L_DISH_288);
|
||||
case WEAPON_DY357MAGNUM: return langGet(L_DISH_289);
|
||||
case WEAPON_DY357LX: return langGet(L_DISH_290);
|
||||
case WEAPON_CMP150: return langGet(L_DISH_291);
|
||||
case WEAPON_CYCLONE: return langGet(L_DISH_292);
|
||||
case WEAPON_CALLISTONTG: return langGet(L_DISH_293);
|
||||
case WEAPON_RCP120: return langGet(L_DISH_294);
|
||||
case WEAPON_LAPTOPGUN: return langGet(L_DISH_295);
|
||||
case WEAPON_DRAGON: return langGet(L_DISH_296);
|
||||
case WEAPON_K7AVENGER: return langGet(L_DISH_297);
|
||||
case WEAPON_AR34: return langGet(L_DISH_298);
|
||||
case WEAPON_SUPERDRAGON: return langGet(L_DISH_299);
|
||||
case WEAPON_SHOTGUN: return langGet(L_DISH_300);
|
||||
case WEAPON_SNIPERRIFLE: return langGet(L_DISH_301);
|
||||
case WEAPON_FARSIGHTXR20: return langGet(L_DISH_302);
|
||||
case WEAPON_CROSSBOW: return langGet(L_DISH_303);
|
||||
case WEAPON_TRANQUILIZER: return langGet(L_DISH_304);
|
||||
case WEAPON_REAPER: return langGet(L_DISH_305);
|
||||
case WEAPON_DEVASTATOR: return langGet(L_DISH_306);
|
||||
case WEAPON_ROCKETLAUNCHER: return langGet(L_DISH_307);
|
||||
case WEAPON_SLAYER: return langGet(L_DISH_308);
|
||||
case WEAPON_COMBATKNIFE: return langGet(L_DISH_309);
|
||||
case WEAPON_LASER: return langGet(L_DISH_310);
|
||||
case WEAPON_GRENADE: return langGet(L_DISH_311);
|
||||
case WEAPON_NBOMB: return langGet(L_DISH_312);
|
||||
case WEAPON_TIMEDMINE: return langGet(L_DISH_313);
|
||||
case WEAPON_PROXIMITYMINE: return langGet(L_DISH_314);
|
||||
case WEAPON_REMOTEMINE: return langGet(L_DISH_315);
|
||||
#else
|
||||
case WEAPON_FALCON2: return langGet(L_MISC_377);
|
||||
case WEAPON_FALCON2_SCOPE: return langGet(L_MISC_378);
|
||||
@@ -2301,7 +2301,7 @@ void frSetFailReason(s32 failreason)
|
||||
|
||||
g_FrData.failreason = frWasTooInaccurate() ? FRFAILREASON_INACCURATE : failreason;
|
||||
g_FrData.menutype = FRMENUTYPE_FAILED;
|
||||
g_FrData.menucountdown = 60;
|
||||
g_FrData.menucountdown = PALDOWN(60);
|
||||
}
|
||||
|
||||
void frSetCompleted(void)
|
||||
@@ -2317,7 +2317,7 @@ void frSetCompleted(void)
|
||||
g_FrData.menutype = FRMENUTYPE_COMPLETED;
|
||||
}
|
||||
|
||||
g_FrData.menucountdown = 60;
|
||||
g_FrData.menucountdown = PALDOWN(60);
|
||||
}
|
||||
|
||||
bool frIsTargetOneHitExplodable(struct prop *prop)
|
||||
@@ -2527,7 +2527,7 @@ bool frIsAmmoWasted(void)
|
||||
hand = &g_Vars.currentplayer->hands[HAND_RIGHT];
|
||||
|
||||
if (currentPlayerGetAmmoCountWithCheck(ammotype) + hand->loadedammo[0] == 0) {
|
||||
g_FrData.proxyendtimer = 300;
|
||||
g_FrData.proxyendtimer = PALDOWN(300);
|
||||
}
|
||||
|
||||
return false;
|
||||
@@ -2536,7 +2536,7 @@ bool frIsAmmoWasted(void)
|
||||
g_FrData.proxyendtimer -= g_Vars.lvupdate240_60;
|
||||
|
||||
if (g_FrData.proxyendtimer <= 0) {
|
||||
// Timer has just hit zero - deactivate (or explode?) all mines
|
||||
// Timer has just hit zero - remove all mines
|
||||
for (i = 0; i < ARRAYCOUNT(g_ProxyMines); i++) {
|
||||
if (g_ProxyMines[i]) {
|
||||
g_ProxyMines[i]->unk62 = 0;
|
||||
@@ -5541,7 +5541,7 @@ void frCalculateHit(struct defaultobj *obj, struct coord *hitpos, f32 maulerchar
|
||||
} else if (frGetWeaponBySlot(g_FrData.slot) == WEAPON_MAULER) {
|
||||
g_FrData.targets[i].damage += (f32)((s32)(maulercharge * 0.1f) + 1);
|
||||
} else if ((g_FrData.targets[i].flags & FRTARGETFLAG_TMPINVINCIBLE) == 0
|
||||
|| g_FrData.targets[i].invincibletimer >= 300) {
|
||||
|| g_FrData.targets[i].invincibletimer >= PALDOWN(300)) {
|
||||
g_FrData.targets[i].damage++;
|
||||
}
|
||||
|
||||
@@ -5559,7 +5559,7 @@ void frCalculateHit(struct defaultobj *obj, struct coord *hitpos, f32 maulerchar
|
||||
g_FrData.numhitsring3++;
|
||||
}
|
||||
|
||||
g_FrData.feedbackttl = 60;
|
||||
g_FrData.feedbackttl = PALDOWN(60);
|
||||
g_FrData.score += g_FrData.feedbackzone;
|
||||
}
|
||||
}
|
||||
@@ -6663,7 +6663,7 @@ bool frFormatTime(char *buffer)
|
||||
{
|
||||
s32 mins = 0;
|
||||
s32 mult = 1;
|
||||
f32 secs = g_FrData.timetaken / 60.0f;
|
||||
f32 secs = g_FrData.timetaken / PALDOWN(60.0f);
|
||||
u8 failed = false;
|
||||
|
||||
if (g_FrData.timelimit != 255 && secs >= g_FrData.timelimit) {
|
||||
@@ -6695,7 +6695,7 @@ bool frGetHudMiddleSubtext(char *buffer)
|
||||
s32 secs;
|
||||
s32 mins;
|
||||
|
||||
if (g_FrData.timetaken < -180) {
|
||||
if (g_FrData.timetaken < PALDOWN(-180)) {
|
||||
sprintf(buffer, "%s", langGet(L_MISC_420)); // "FIRE TO START"
|
||||
return false;
|
||||
}
|
||||
@@ -6815,8 +6815,8 @@ Gfx *frRenderHud(Gfx *gdl)
|
||||
s32 alpha = 0xa0;
|
||||
f32 mult;
|
||||
|
||||
if (viGetViewWidth() > 400) {
|
||||
mult = 2;
|
||||
if (viGetViewWidth() > (PAL ? 330 : 400)) {
|
||||
mult = PAL ? 1.5f : 2;
|
||||
} else {
|
||||
mult = 1;
|
||||
}
|
||||
@@ -6826,7 +6826,7 @@ Gfx *frRenderHud(Gfx *gdl)
|
||||
}
|
||||
|
||||
if (g_FrData.menucountdown != 0) {
|
||||
alpha = (f32)(g_FrData.menucountdown * 160) / 60.0f;
|
||||
alpha = (f32)(g_FrData.menucountdown * 160) / PALDOWN(60.0f);
|
||||
}
|
||||
|
||||
gdl = func0f153628(gdl);
|
||||
|
||||
+1476
-5
File diff suppressed because it is too large
Load Diff
+23
-11
@@ -392,9 +392,15 @@ void weatherTickRain(struct weatherdata *weather)
|
||||
for (i = 0; i != ARRAYCOUNT(data->particles); i++) {
|
||||
struct weatherparticle *particle = &data->particles[i];
|
||||
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
particle->pos.x += particle->inc.x * g_Vars.lvupdate240freal;
|
||||
particle->pos.y += particle->inc.y * g_Vars.lvupdate240freal;
|
||||
particle->pos.z += particle->inc.z * g_Vars.lvupdate240freal;
|
||||
#else
|
||||
particle->pos.x += particle->inc.x * g_Vars.lvupdate240f;
|
||||
particle->pos.y += particle->inc.y * g_Vars.lvupdate240f;
|
||||
particle->pos.z += particle->inc.z * g_Vars.lvupdate240f;
|
||||
#endif
|
||||
|
||||
if (particle->pos.y < data->boundarymin.y) {
|
||||
lVar6 = 2;
|
||||
@@ -482,7 +488,7 @@ void weatherTickSnow(struct weatherdata *weather)
|
||||
data = g_WeatherData->particledata;
|
||||
|
||||
// 0
|
||||
data->unk3ec8[0] += 0.04f * g_Vars.lvupdate240f;
|
||||
data->unk3ec8[0] += 0.04f * (VERSION >= VERSION_PAL_FINAL ? g_Vars.lvupdate240freal : g_Vars.lvupdate240f);
|
||||
|
||||
if (data->unk3ec8[0] < 0) {
|
||||
data->unk3ec8[0] += M_TAU;
|
||||
@@ -493,7 +499,7 @@ void weatherTickSnow(struct weatherdata *weather)
|
||||
}
|
||||
|
||||
// 1
|
||||
data->unk3ec8[1] += -0.03f * g_Vars.lvupdate240f;
|
||||
data->unk3ec8[1] += -0.03f * (VERSION >= VERSION_PAL_FINAL ? g_Vars.lvupdate240freal : g_Vars.lvupdate240f);
|
||||
|
||||
if (data->unk3ec8[1] < 0) {
|
||||
data->unk3ec8[1] += M_TAU;
|
||||
@@ -504,7 +510,7 @@ void weatherTickSnow(struct weatherdata *weather)
|
||||
}
|
||||
|
||||
// 2
|
||||
data->unk3ec8[2] += 0.04f * g_Vars.lvupdate240f;
|
||||
data->unk3ec8[2] += 0.04f * (VERSION >= VERSION_PAL_FINAL ? g_Vars.lvupdate240freal : g_Vars.lvupdate240f);
|
||||
|
||||
if (data->unk3ec8[2] < 0) {
|
||||
data->unk3ec8[2] += M_TAU;
|
||||
@@ -515,7 +521,7 @@ void weatherTickSnow(struct weatherdata *weather)
|
||||
}
|
||||
|
||||
// 3
|
||||
data->unk3ec8[3] += 0.03f * g_Vars.lvupdate240f;
|
||||
data->unk3ec8[3] += 0.03f * (VERSION >= VERSION_PAL_FINAL ? g_Vars.lvupdate240freal : g_Vars.lvupdate240f);
|
||||
|
||||
if (data->unk3ec8[3] < 0) {
|
||||
data->unk3ec8[3] += M_TAU;
|
||||
@@ -526,7 +532,7 @@ void weatherTickSnow(struct weatherdata *weather)
|
||||
}
|
||||
|
||||
// 4
|
||||
data->unk3ec8[4] += 0.02f * g_Vars.lvupdate240f;
|
||||
data->unk3ec8[4] += 0.02f * (VERSION >= VERSION_PAL_FINAL ? g_Vars.lvupdate240freal : g_Vars.lvupdate240f);
|
||||
|
||||
if (data->unk3ec8[4] < 0) {
|
||||
data->unk3ec8[4] += M_TAU;
|
||||
@@ -537,7 +543,7 @@ void weatherTickSnow(struct weatherdata *weather)
|
||||
}
|
||||
|
||||
// 5
|
||||
data->unk3ec8[5] += 0.01f * g_Vars.lvupdate240f;
|
||||
data->unk3ec8[5] += 0.01f * (VERSION >= VERSION_PAL_FINAL ? g_Vars.lvupdate240freal : g_Vars.lvupdate240f);
|
||||
|
||||
if (data->unk3ec8[5] < 0) {
|
||||
data->unk3ec8[5] += M_TAU;
|
||||
@@ -548,7 +554,7 @@ void weatherTickSnow(struct weatherdata *weather)
|
||||
}
|
||||
|
||||
// 6
|
||||
data->unk3ec8[6] += -0.01f * g_Vars.lvupdate240f;
|
||||
data->unk3ec8[6] += -0.01f * (VERSION >= VERSION_PAL_FINAL ? g_Vars.lvupdate240freal : g_Vars.lvupdate240f);
|
||||
|
||||
if (data->unk3ec8[6] < 0) {
|
||||
data->unk3ec8[6] += M_TAU;
|
||||
@@ -559,7 +565,7 @@ void weatherTickSnow(struct weatherdata *weather)
|
||||
}
|
||||
|
||||
// 7
|
||||
data->unk3ec8[7] += -0.02f * g_Vars.lvupdate240f;
|
||||
data->unk3ec8[7] += -0.02f * (VERSION >= VERSION_PAL_FINAL ? g_Vars.lvupdate240freal : g_Vars.lvupdate240f);
|
||||
|
||||
if (data->unk3ec8[7] < 0) {
|
||||
data->unk3ec8[7] += M_TAU;
|
||||
@@ -572,9 +578,15 @@ void weatherTickSnow(struct weatherdata *weather)
|
||||
for (i = 0; i < ARRAYCOUNT(data->particles); i++) {
|
||||
struct weatherparticle *particle = &data->particles[i];
|
||||
|
||||
particle->pos.x += particle->inc.f[0] * g_Vars.lvupdate240f;
|
||||
particle->pos.y += particle->inc.f[1] * g_Vars.lvupdate240f;
|
||||
particle->pos.z += particle->inc.f[2] * g_Vars.lvupdate240f;
|
||||
#if VERSION >= VERSION_PAL_FINAL
|
||||
particle->pos.x += particle->inc.x * g_Vars.lvupdate240freal;
|
||||
particle->pos.y += particle->inc.y * g_Vars.lvupdate240freal;
|
||||
particle->pos.z += particle->inc.z * g_Vars.lvupdate240freal;
|
||||
#else
|
||||
particle->pos.x += particle->inc.x * g_Vars.lvupdate240f;
|
||||
particle->pos.y += particle->inc.y * g_Vars.lvupdate240f;
|
||||
particle->pos.z += particle->inc.z * g_Vars.lvupdate240f;
|
||||
#endif
|
||||
|
||||
if (particle->pos.y < data->boundarymin.y) {
|
||||
lVar7 = 2;
|
||||
|
||||
Reference in New Issue
Block a user