From bed291546a931574a8b753e304585e02ced5bd75 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 1 Mar 2020 23:16:49 +1000 Subject: [PATCH] Decompile currentPlayerUpdatePrevPos --- src/game/bondbike.c | 4 +-- src/game/bondgrab.c | 4 +-- src/game/bondwalk.c | 50 +++++++++------------------- src/game/chr/chraction.c | 28 ++++++++-------- src/game/game_01e250.c | 16 ++++----- src/game/game_0601b0.c | 4 +-- src/game/game_066310.c | 60 +++++++++++++++++----------------- src/game/game_097ba0.c | 4 +-- src/game/game_0b63b0.c | 2 +- src/game/game_0cf150.c | 6 ++-- src/game/game_190260.c | 12 +++---- src/game/game_19c990.c | 4 +-- src/include/game/bondwalk.h | 2 +- src/include/game/game_0601b0.h | 2 +- src/include/types.h | 5 +-- 15 files changed, 90 insertions(+), 113 deletions(-) diff --git a/src/game/bondbike.c b/src/game/bondbike.c index 1929a0108..43832f495 100644 --- a/src/game/bondbike.c +++ b/src/game/bondbike.c @@ -1312,7 +1312,7 @@ glabel func0f0d2e18 /* f0d3234: 8e290284 */ lw $t1,0x284($s1) /* f0d3238: 27a40118 */ addiu $a0,$sp,0x118 /* f0d323c: 8d251a6c */ lw $a1,0x1a6c($t1) -/* f0d3240: 0fc195e9 */ jal func0f0657a4 +/* f0d3240: 0fc195e9 */ jal roomsCopy /* f0d3244: 24a50028 */ addiu $a1,$a1,0x28 /* f0d3248: 27ab00d8 */ addiu $t3,$sp,0xd8 /* f0d324c: 256d003c */ addiu $t5,$t3,0x3c @@ -1476,7 +1476,7 @@ glabel func0f0d341c /* f0d3488: 8e090284 */ lw $t1,0x284($s0) /* f0d348c: 27a40050 */ addiu $a0,$sp,0x50 /* f0d3490: 8d2500bc */ lw $a1,0xbc($t1) -/* f0d3494: 0fc195e9 */ jal func0f0657a4 +/* f0d3494: 0fc195e9 */ jal roomsCopy /* f0d3498: 24a50028 */ addiu $a1,$a1,0x28 /* f0d349c: 3c017f1b */ lui $at,%hi(var7f1adb80) /* f0d34a0: c420db80 */ lwc1 $f0,%lo(var7f1adb80)($at) diff --git a/src/game/bondgrab.c b/src/game/bondgrab.c index 36367ab5f..bd6b47db2 100644 --- a/src/game/bondgrab.c +++ b/src/game/bondgrab.c @@ -818,7 +818,7 @@ glabel func0f0cd05c /* f0cd17c: 8e190284 */ lw $t9,0x284($s0) /* f0cd180: 27a40040 */ addiu $a0,$sp,0x40 /* f0cd184: 8f2500bc */ lw $a1,0xbc($t9) -/* f0cd188: 0fc195e9 */ jal func0f0657a4 +/* f0cd188: 0fc195e9 */ jal roomsCopy /* f0cd18c: 24a50028 */ addiu $a1,$a1,0x28 /* f0cd190: 8fbf002c */ lw $ra,0x2c($sp) .L0f0cd194: @@ -1320,7 +1320,7 @@ glabel func0f0cd1a4 /* f0cd8d8: 8e0d0284 */ lw $t5,0x284($s0) /* f0cd8dc: 27a400cc */ addiu $a0,$sp,0xcc /* f0cd8e0: 8da500bc */ lw $a1,0xbc($t5) -/* f0cd8e4: 0fc195e9 */ jal func0f0657a4 +/* f0cd8e4: 0fc195e9 */ jal roomsCopy /* f0cd8e8: 24a50028 */ addiu $a1,$a1,0x28 /* f0cd8ec: 8e080284 */ lw $t0,0x284($s0) .L0f0cd8f0: diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c index 657f369ef..4498e4901 100644 --- a/src/game/bondwalk.c +++ b/src/game/bondwalk.c @@ -443,7 +443,7 @@ glabel var7f1ad784 /* f0c3de4: 8e0d0284 */ lw $t5,0x284($s0) /* f0c3de8: 27a40048 */ addiu $a0,$sp,0x48 /* f0c3dec: 8da500bc */ lw $a1,0xbc($t5) -/* f0c3df0: 0fc195e9 */ jal func0f0657a4 +/* f0c3df0: 0fc195e9 */ jal roomsCopy /* f0c3df4: 24a50028 */ addiu $a1,$a1,0x28 /* f0c3df8: 8fbf002c */ lw $ra,0x2c($sp) .L0f0c3dfc: @@ -736,7 +736,7 @@ glabel var7f1ad788 /* f0c421c: 8e190284 */ lw $t9,0x284($s0) /* f0c4220: 27a40094 */ addiu $a0,$sp,0x94 /* f0c4224: 8f2500bc */ lw $a1,0xbc($t9) -/* f0c4228: 0fc195e9 */ jal func0f0657a4 +/* f0c4228: 0fc195e9 */ jal roomsCopy /* f0c422c: 24a50028 */ addiu $a1,$a1,0x28 /* f0c4230: 8fa300b4 */ lw $v1,0xb4($sp) .L0f0c4234: @@ -975,7 +975,7 @@ glabel func0f0c4250 /* f0c45a4: e4860010 */ swc1 $f6,0x10($a0) /* f0c45a8: 8fa500a0 */ lw $a1,0xa0($sp) /* f0c45ac: 27a40058 */ addiu $a0,$sp,0x58 -/* f0c45b0: 0fc195e9 */ jal func0f0657a4 +/* f0c45b0: 0fc195e9 */ jal roomsCopy /* f0c45b4: 24a50028 */ addiu $a1,$a1,0x28 /* f0c45b8: 0fc0882b */ jal func0f0220ac /* f0c45bc: 8fa40074 */ lw $a0,0x74($sp) @@ -1819,7 +1819,7 @@ glabel var7f1ad7d0 /* f0c514c: c52a0010 */ lwc1 $f10,0x10($t1) /* f0c5150: e7aa00d4 */ swc1 $f10,0xd4($sp) /* f0c5154: 8c4400bc */ lw $a0,0xbc($v0) -/* f0c5158: 0fc195e9 */ jal func0f0657a4 +/* f0c5158: 0fc195e9 */ jal roomsCopy /* f0c515c: 24840028 */ addiu $a0,$a0,0x28 /* f0c5160: 8e040284 */ lw $a0,0x284($s0) /* f0c5164: 27a500cc */ addiu $a1,$sp,0xcc @@ -1878,7 +1878,7 @@ glabel var7f1ad7d0 /* f0c5234: 8c4400bc */ lw $a0,0xbc($v0) .L0f0c5238: /* f0c5238: 27a500d8 */ addiu $a1,$sp,0xd8 -/* f0c523c: 0fc195e9 */ jal func0f0657a4 +/* f0c523c: 0fc195e9 */ jal roomsCopy /* f0c5240: 24840028 */ addiu $a0,$a0,0x28 /* f0c5244: 8e040284 */ lw $a0,0x284($s0) /* f0c5248: 27a500cc */ addiu $a1,$sp,0xcc @@ -2800,7 +2800,7 @@ glabel var7f1ad7d0 /* f0c5fc0: 8e0f0284 */ lw $t7,0x284($s0) /* f0c5fc4: 27a400b0 */ addiu $a0,$sp,0xb0 /* f0c5fc8: 8de500bc */ lw $a1,0xbc($t7) -/* f0c5fcc: 0fc195e9 */ jal func0f0657a4 +/* f0c5fcc: 0fc195e9 */ jal roomsCopy /* f0c5fd0: 24a50028 */ addiu $a1,$a1,0x28 /* f0c5fd4: 8fbf004c */ lw $ra,0x4c($sp) .L0f0c5fd8: @@ -3165,34 +3165,14 @@ glabel func0f0c63bc /* f0c6540: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f0c6544 -/* f0c6544: 3c03800a */ lui $v1,%hi(g_Vars) -/* f0c6548: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars) -/* f0c654c: 8c620284 */ lw $v0,0x284($v1) -/* f0c6550: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0c6554: afbf0014 */ sw $ra,0x14($sp) -/* f0c6558: 8c4e00bc */ lw $t6,0xbc($v0) -/* f0c655c: c5c40008 */ lwc1 $f4,0x8($t6) -/* f0c6560: e4440310 */ swc1 $f4,0x310($v0) -/* f0c6564: 8c620284 */ lw $v0,0x284($v1) -/* f0c6568: 8c4f00bc */ lw $t7,0xbc($v0) -/* f0c656c: c5e6000c */ lwc1 $f6,0xc($t7) -/* f0c6570: e4460314 */ swc1 $f6,0x314($v0) -/* f0c6574: 8c620284 */ lw $v0,0x284($v1) -/* f0c6578: 8c5800bc */ lw $t8,0xbc($v0) -/* f0c657c: c7080010 */ lwc1 $f8,0x10($t8) -/* f0c6580: e4480318 */ swc1 $f8,0x318($v0) -/* f0c6584: 8c620284 */ lw $v0,0x284($v1) -/* f0c6588: 8c4400bc */ lw $a0,0xbc($v0) -/* f0c658c: 24450284 */ addiu $a1,$v0,0x284 -/* f0c6590: 0fc195e9 */ jal func0f0657a4 -/* f0c6594: 24840028 */ addiu $a0,$a0,0x28 -/* f0c6598: 8fbf0014 */ lw $ra,0x14($sp) -/* f0c659c: 27bd0018 */ addiu $sp,$sp,0x18 -/* f0c65a0: 03e00008 */ jr $ra -/* f0c65a4: 00000000 */ sll $zero,$zero,0x0 -); +void currentPlayerUpdatePrevPos(void) +{ + g_Vars.currentplayer->bondprevpos.x = g_Vars.currentplayer->prop->pos.x; + g_Vars.currentplayer->bondprevpos.y = g_Vars.currentplayer->prop->pos.y; + g_Vars.currentplayer->bondprevpos.z = g_Vars.currentplayer->prop->pos.z; + + roomsCopy(g_Vars.currentplayer->prop->rooms, g_Vars.currentplayer->bondprevrooms); +} GLOBAL_ASM( glabel func0f0c65a8 @@ -4564,7 +4544,7 @@ GLOBAL_ASM( glabel func0f0c785c /* f0c785c: 27bdffc0 */ addiu $sp,$sp,-64 /* f0c7860: afbf0014 */ sw $ra,0x14($sp) -/* f0c7864: 0fc31951 */ jal func0f0c6544 +/* f0c7864: 0fc31951 */ jal currentPlayerUpdatePrevPos /* f0c7868: 00000000 */ sll $zero,$zero,0x0 /* f0c786c: 0fc318c6 */ jal func0f0c6318 /* f0c7870: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 3afa6c2e9..6c9adfd97 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -10486,7 +10486,7 @@ glabel func0f0375e8 /* f037664: 0fc079ef */ jal chrSetOrUnsetHiddenFlag00000100 /* f037668: 00002825 */ or $a1,$zero,$zero /* f03766c: 8fa40138 */ lw $a0,0x138($sp) -/* f037670: 0fc195e9 */ jal func0f0657a4 +/* f037670: 0fc195e9 */ jal roomsCopy /* f037674: 27a50118 */ addiu $a1,$sp,0x118 /* f037678: 02002025 */ or $a0,$s0,$zero /* f03767c: 8fa50134 */ lw $a1,0x134($sp) @@ -10517,7 +10517,7 @@ glabel func0f0375e8 /* f0376e0: 46009100 */ add.s $f4,$f18,$f0 /* f0376e4: e7a400f8 */ swc1 $f4,0xf8($sp) /* f0376e8: c5060008 */ lwc1 $f6,0x8($t0) -/* f0376ec: 0fc195e9 */ jal func0f0657a4 +/* f0376ec: 0fc195e9 */ jal roomsCopy /* f0376f0: e7a600fc */ swc1 $f6,0xfc($sp) /* f0376f4: 02002025 */ or $a0,$s0,$zero /* f0376f8: 27a500f4 */ addiu $a1,$sp,0xf4 @@ -10567,7 +10567,7 @@ glabel func0f0375e8 /* f0377a8: a60e02b2 */ sh $t6,0x2b2($s0) /* f0377ac: 8fa500f0 */ lw $a1,0xf0($sp) /* f0377b0: 27a40118 */ addiu $a0,$sp,0x118 -/* f0377b4: 0fc195e9 */ jal func0f0657a4 +/* f0377b4: 0fc195e9 */ jal roomsCopy /* f0377b8: 24a50028 */ addiu $a1,$a1,0x28 /* f0377bc: 0fc1972c */ jal func0f065cb0 /* f0377c0: 8fa400f0 */ lw $a0,0xf0($sp) @@ -11624,7 +11624,7 @@ glabel chrGoToPos /* f03865c: 8faf0094 */ lw $t7,0x94($sp) /* f038660: c5f20008 */ lwc1 $f18,0x8($t7) /* f038664: e6120034 */ swc1 $f18,0x34($s0) -/* f038668: 0fc195e9 */ jal func0f0657a4 +/* f038668: 0fc195e9 */ jal roomsCopy /* f03866c: 8fa40098 */ lw $a0,0x98($sp) /* f038670: 8fb80084 */ lw $t8,0x84($sp) /* f038674: a2000064 */ sb $zero,0x64($s0) @@ -11819,7 +11819,7 @@ glabel chrGoToPos // chr->act_gopos.pos.x = pos->x; // chr->act_gopos.pos.y = pos->y; // chr->act_gopos.pos.z = pos->z; -// func0f0657a4(room, &chr->act_gopos.rooms[0]); +// roomsCopy(room, &chr->act_gopos.rooms[0]); // chr->act_gopos.nextwaypointindex = 0; // chr->act_gopos.numwaypoints = numwaypoints; // chr->act_gopos.unk065 = 4 | speed; @@ -26701,7 +26701,7 @@ glabel var7f1a9290 /* f04700c: c6040030 */ lwc1 $f4,0x30($s0) /* f047010: e7a40164 */ swc1 $f4,0x164($sp) /* f047014: c6060034 */ lwc1 $f6,0x34($s0) -/* f047018: 0fc195e9 */ jal func0f0657a4 +/* f047018: 0fc195e9 */ jal roomsCopy /* f04701c: e7a60168 */ swc1 $f6,0x168($sp) .L0f047020: /* f047020: 27ad0150 */ addiu $t5,$sp,0x150 @@ -26802,7 +26802,7 @@ glabel var7f1a9290 /* f047184: c6060030 */ lwc1 $f6,0x30($s0) /* f047188: e7a60164 */ swc1 $f6,0x164($sp) /* f04718c: c6080034 */ lwc1 $f8,0x34($s0) -/* f047190: 0fc195e9 */ jal func0f0657a4 +/* f047190: 0fc195e9 */ jal roomsCopy /* f047194: e7a80168 */ swc1 $f8,0x168($sp) /* f047198: 8fa40140 */ lw $a0,0x140($sp) /* f04719c: 30821000 */ andi $v0,$a0,0x1000 @@ -28004,7 +28004,7 @@ glabel func0f048b78 /* f048be8: 8c64001c */ lw $a0,0x1c($v1) .L0f048bec: /* f048bec: 8fa50090 */ lw $a1,0x90($sp) -/* f048bf0: 0fc195e9 */ jal func0f0657a4 +/* f048bf0: 0fc195e9 */ jal roomsCopy /* f048bf4: 24840028 */ addiu $a0,$a0,0x28 /* f048bf8: 1000002e */ beqz $zero,.L0f048cb4 /* f048bfc: 8fbf0014 */ lw $ra,0x14($sp) @@ -28053,7 +28053,7 @@ glabel func0f048b78 /* f048ca0: 10000001 */ beqz $zero,.L0f048ca8 /* f048ca4: 00000000 */ sll $zero,$zero,0x0 .L0f048ca8: -/* f048ca8: 0fc195e9 */ jal func0f0657a4 +/* f048ca8: 0fc195e9 */ jal roomsCopy /* f048cac: 24c40028 */ addiu $a0,$a2,0x28 .L0f048cb0: /* f048cb0: 8fbf0014 */ lw $ra,0x14($sp) @@ -29612,7 +29612,7 @@ glabel func0f04a848 /* f04a8c0: 460c1601 */ sub.s $f24,$f2,$f12 /* f04a8c4: 460c1680 */ add.s $f26,$f2,$f12 /* f04a8c8: 460c7701 */ sub.s $f28,$f14,$f12 -/* f04a8cc: 0fc195e9 */ jal func0f0657a4 +/* f04a8cc: 0fc195e9 */ jal roomsCopy /* f04a8d0: 460c7780 */ add.s $f30,$f14,$f12 /* f04a8d4: 862e0000 */ lh $t6,0x0($s1) /* f04a8d8: 2412ffff */ addiu $s2,$zero,-1 @@ -30215,7 +30215,7 @@ glabel var7f1a941c /* f04b268: c7b200a0 */ lwc1 $f18,0xa0($sp) /* f04b26c: e6520004 */ swc1 $f18,0x4($s2) /* f04b270: c7a400a4 */ lwc1 $f4,0xa4($sp) -/* f04b274: 0fc195e9 */ jal func0f0657a4 +/* f04b274: 0fc195e9 */ jal roomsCopy /* f04b278: e6440008 */ swc1 $f4,0x8($s2) /* f04b27c: 1000000e */ beqz $zero,.L0f04b2b8 /* f04b280: 24020001 */ addiu $v0,$zero,0x1 @@ -30279,7 +30279,7 @@ glabel chrSpawnAtCoord /* f04b348: c4660004 */ lwc1 $f6,0x4($v1) /* f04b34c: e7a6006c */ swc1 $f6,0x6c($sp) /* f04b350: c4680008 */ lwc1 $f8,0x8($v1) -/* f04b354: 0fc195e9 */ jal func0f0657a4 +/* f04b354: 0fc195e9 */ jal roomsCopy /* f04b358: e7a80070 */ swc1 $f8,0x70($sp) /* f04b35c: 8faf0090 */ lw $t7,0x90($sp) /* f04b360: 3c0141a0 */ lui $at,0x41a0 @@ -30545,7 +30545,7 @@ glabel var7f1a9424 /* f04b774: e7a60070 */ swc1 $f6,0x70($sp) /* f04b778: c4a80008 */ lwc1 $f8,0x8($a1) /* f04b77c: 27a5005c */ addiu $a1,$sp,0x5c -/* f04b780: 0fc195e9 */ jal func0f0657a4 +/* f04b780: 0fc195e9 */ jal roomsCopy /* f04b784: e7a80074 */ swc1 $f8,0x74($sp) /* f04b788: 8e04001c */ lw $a0,0x1c($s0) /* f04b78c: 0fc1905e */ jal func0f064178 @@ -30598,7 +30598,7 @@ glabel var7f1a9424 /* f04b848: 8e04001c */ lw $a0,0x1c($s0) /* f04b84c: 8e05001c */ lw $a1,0x1c($s0) /* f04b850: 27a4005c */ addiu $a0,$sp,0x5c -/* f04b854: 0fc195e9 */ jal func0f0657a4 +/* f04b854: 0fc195e9 */ jal roomsCopy /* f04b858: 24a50028 */ addiu $a1,$a1,0x28 /* f04b85c: 0fc0882b */ jal func0f0220ac /* f04b860: 02002025 */ or $a0,$s0,$zero diff --git a/src/game/game_01e250.c b/src/game/game_01e250.c index 19a1bde7a..1b087ec41 100644 --- a/src/game/game_01e250.c +++ b/src/game/game_01e250.c @@ -640,7 +640,7 @@ glabel func0f01e7f4 /* f01e830: 14410009 */ bne $v0,$at,.L0f01e858 /* f01e834: 02002025 */ or $a0,$s0,$zero /* f01e838: 26040028 */ addiu $a0,$s0,0x28 -/* f01e83c: 0fc195e9 */ jal func0f0657a4 +/* f01e83c: 0fc195e9 */ jal roomsCopy /* f01e840: 8fa500e0 */ lw $a1,0xe0($sp) /* f01e844: 8fa400d8 */ lw $a0,0xd8($sp) /* f01e848: 0fc079ef */ jal chrSetOrUnsetHiddenFlag00000100 @@ -1299,7 +1299,7 @@ glabel func0f01e7f4 /* f01f204: c6100010 */ lwc1 $f16,0x10($s0) /* f01f208: e5d00008 */ swc1 $f16,0x8($t6) /* f01f20c: 8fa500e0 */ lw $a1,0xe0($sp) -/* f01f210: 0fc195e9 */ jal func0f0657a4 +/* f01f210: 0fc195e9 */ jal roomsCopy /* f01f214: 8fa4003c */ lw $a0,0x3c($sp) /* f01f218: 8fb900d8 */ lw $t9,0xd8($sp) /* f01f21c: 24180001 */ addiu $t8,$zero,0x1 @@ -1348,7 +1348,7 @@ bool func0f01f264(struct chrdata *chr, struct coord *pos, s16 *rooms, f32 arg3, if (result == true && arg4) { pos->y = newpos.y; - func0f0657a4(newrooms, rooms); + roomsCopy(newrooms, rooms); } return result == true; @@ -1987,7 +1987,7 @@ glabel func0f01f378 /* f01fcc4: e6260008 */ swc1 $f6,0x8($s1) /* f01fcc8: 8fa40118 */ lw $a0,0x118($sp) /* f01fccc: 24840028 */ addiu $a0,$a0,0x28 -/* f01fcd0: 0fc195e9 */ jal func0f0657a4 +/* f01fcd0: 0fc195e9 */ jal roomsCopy /* f01fcd4: afa40048 */ sw $a0,0x48($sp) /* f01fcd8: 3c017f1b */ lui $at,%hi(var7f1a86d4) /* f01fcdc: c43086d4 */ lwc1 $f16,%lo(var7f1a86d4)($at) @@ -2202,7 +2202,7 @@ glabel func0f01f378 /* f01fff0: 8fac0118 */ lw $t4,0x118($sp) /* f01fff4: c5880010 */ lwc1 $f8,0x10($t4) /* f01fff8: e6280008 */ swc1 $f8,0x8($s1) -/* f01fffc: 0fc195e9 */ jal func0f0657a4 +/* f01fffc: 0fc195e9 */ jal roomsCopy /* f020000: 8fa40048 */ lw $a0,0x48($sp) /* f020004: 44809000 */ mtc1 $zero,$f18 /* f020008: 8fae0044 */ lw $t6,0x44($sp) @@ -2468,7 +2468,7 @@ glabel func0f01f378 /* f0203c0: c6280004 */ lwc1 $f8,0x4($s1) /* f0203c4: e7a800d4 */ swc1 $f8,0xd4($sp) /* f0203c8: c6260008 */ lwc1 $f6,0x8($s1) -/* f0203cc: 0fc195e9 */ jal func0f0657a4 +/* f0203cc: 0fc195e9 */ jal roomsCopy /* f0203d0: e7a600d8 */ swc1 $f6,0xd8($sp) /* f0203d4: c60a00b4 */ lwc1 $f10,0xb4($s0) /* f0203d8: c7a400f8 */ lwc1 $f4,0xf8($sp) @@ -2523,7 +2523,7 @@ glabel func0f01f378 /* f02048c: 0fc19711 */ jal func0f065c44 /* f020490: 00000000 */ sll $zero,$zero,0x0 /* f020494: 27a400fc */ addiu $a0,$sp,0xfc -/* f020498: 0fc195e9 */ jal func0f0657a4 +/* f020498: 0fc195e9 */ jal roomsCopy /* f02049c: 8fa50048 */ lw $a1,0x48($sp) /* f0204a0: 8fa60118 */ lw $a2,0x118($sp) /* f0204a4: 24010003 */ addiu $at,$zero,0x3 @@ -2970,7 +2970,7 @@ glabel func0f020b14 /* f020c2c: 0fc19711 */ jal func0f065c44 /* f020c30: e6300010 */ swc1 $f16,0x10($s1) /* f020c34: 8fa40074 */ lw $a0,0x74($sp) -/* f020c38: 0fc195e9 */ jal func0f0657a4 +/* f020c38: 0fc195e9 */ jal roomsCopy /* f020c3c: 26250028 */ addiu $a1,$s1,0x28 /* f020c40: 0fc0882b */ jal func0f0220ac /* f020c44: 02002025 */ or $a0,$s0,$zero diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index 3c78ac7e3..9567f9b08 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -4702,7 +4702,7 @@ glabel func0f0641f4 /* f064248: 8fbf002c */ lw $ra,0x2c($sp) /* f06424c: 8c4400bc */ lw $a0,0xbc($v0) /* f064250: 02602825 */ or $a1,$s3,$zero -/* f064254: 0fc195e9 */ jal func0f0657a4 +/* f064254: 0fc195e9 */ jal roomsCopy /* f064258: 24840028 */ addiu $a0,$a0,0x28 /* f06425c: 8e990284 */ lw $t9,0x284($s4) /* f064260: 2412ffff */ addiu $s2,$zero,-1 @@ -6195,7 +6195,7 @@ glabel func0f06554c ); GLOBAL_ASM( -glabel func0f0657a4 +glabel roomsCopy /* f0657a4: 84860000 */ lh $a2,0x0($a0) /* f0657a8: 2407ffff */ addiu $a3,$zero,-1 /* f0657ac: 00801025 */ or $v0,$a0,$zero diff --git a/src/game/game_066310.c b/src/game/game_066310.c index f9f91489c..f5480092e 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -6048,7 +6048,7 @@ glabel func0f06a580 /* f06a5c8: 0fc19711 */ jal func0f065c44 /* f06a5cc: e6280010 */ swc1 $f8,0x10($s1) /* f06a5d0: 8fa4002c */ lw $a0,0x2c($sp) -/* f06a5d4: 0fc195e9 */ jal func0f0657a4 +/* f06a5d4: 0fc195e9 */ jal roomsCopy /* f06a5d8: 26250028 */ addiu $a1,$s1,0x28 /* f06a5dc: 02002025 */ or $a0,$s0,$zero /* f06a5e0: 24050001 */ addiu $a1,$zero,0x1 @@ -9303,7 +9303,7 @@ glabel func0f06d37c /* f06d4d4: 0fc19711 */ jal func0f065c44 /* f06d4d8: e6120010 */ swc1 $f18,0x10($s0) /* f06d4dc: 27a40070 */ addiu $a0,$sp,0x70 -/* f06d4e0: 0fc195e9 */ jal func0f0657a4 +/* f06d4e0: 0fc195e9 */ jal roomsCopy /* f06d4e4: 8fa5003c */ lw $a1,0x3c($sp) /* f06d4e8: 10000005 */ beqz $zero,.L0f06d500 /* f06d4ec: 8faa009c */ lw $t2,0x9c($sp) @@ -9554,7 +9554,7 @@ glabel func0f06d37c /* f06d868: 0fc19711 */ jal func0f065c44 /* f06d86c: e6080010 */ swc1 $f8,0x10($s0) /* f06d870: 27a40070 */ addiu $a0,$sp,0x70 -/* f06d874: 0fc195e9 */ jal func0f0657a4 +/* f06d874: 0fc195e9 */ jal roomsCopy /* f06d878: 8fa5003c */ lw $a1,0x3c($sp) /* f06d87c: 240d0001 */ addiu $t5,$zero,0x1 /* f06d880: 10000007 */ beqz $zero,.L0f06d8a0 @@ -9586,7 +9586,7 @@ glabel func0f06d37c /* f06d8e0: 0fc19711 */ jal func0f065c44 /* f06d8e4: e60a000c */ swc1 $f10,0xc($s0) /* f06d8e8: 27a40070 */ addiu $a0,$sp,0x70 -/* f06d8ec: 0fc195e9 */ jal func0f0657a4 +/* f06d8ec: 0fc195e9 */ jal roomsCopy /* f06d8f0: 8fa5003c */ lw $a1,0x3c($sp) .L0f06d8f4: /* f06d8f4: 8fbf0034 */ lw $ra,0x34($sp) @@ -13657,7 +13657,7 @@ glabel func0f0713e4 /* f07142c: e7aa0024 */ swc1 $f10,0x24($sp) /* f071430: c4d00008 */ lwc1 $f16,0x8($a2) /* f071434: afa60048 */ sw $a2,0x48($sp) -/* f071438: 0fc195e9 */ jal func0f0657a4 +/* f071438: 0fc195e9 */ jal roomsCopy /* f07143c: e7b00028 */ swc1 $f16,0x28($sp) /* f071440: 8fa40040 */ lw $a0,0x40($sp) /* f071444: 27a50020 */ addiu $a1,$sp,0x20 @@ -13826,7 +13826,7 @@ glabel func0f0714b8 /* f0716a8: 46062201 */ sub.s $f8,$f4,$f6 /* f0716ac: e7a80094 */ swc1 $f8,0x94($sp) /* f0716b0: c44a0010 */ lwc1 $f10,0x10($v0) -/* f0716b4: 0fc195e9 */ jal func0f0657a4 +/* f0716b4: 0fc195e9 */ jal roomsCopy /* f0716b8: e7aa0098 */ swc1 $f10,0x98($sp) /* f0716bc: 02202025 */ or $a0,$s1,$zero /* f0716c0: 27a50090 */ addiu $a1,$sp,0x90 @@ -14782,7 +14782,7 @@ glabel func0f072144 /* f072450: 10000009 */ beqz $zero,.L0f072478 /* f072454: 8fb90484 */ lw $t9,0x484($sp) .L0f072458: -/* f072458: 0fc195e9 */ jal func0f0657a4 +/* f072458: 0fc195e9 */ jal roomsCopy /* f07245c: afa40034 */ sw $a0,0x34($sp) /* f072460: 02002025 */ or $a0,$s0,$zero /* f072464: 27a50450 */ addiu $a1,$sp,0x450 @@ -14852,7 +14852,7 @@ glabel func0f072144 /* f072554: 0fc19711 */ jal func0f065c44 /* f072558: e4880010 */ swc1 $f8,0x10($a0) /* f07255c: 27a40440 */ addiu $a0,$sp,0x440 -/* f072560: 0fc195e9 */ jal func0f0657a4 +/* f072560: 0fc195e9 */ jal roomsCopy /* f072564: 8fa50034 */ lw $a1,0x34($sp) /* f072568: 8e020044 */ lw $v0,0x44($s0) /* f07256c: 50400034 */ beqzl $v0,.L0f072640 @@ -16145,7 +16145,7 @@ glabel func0f073478 /* f073824: 0fc19711 */ jal func0f065c44 /* f073828: e6700010 */ swc1 $f16,0x10($s3) /* f07382c: 02202025 */ or $a0,$s1,$zero -/* f073830: 0fc195e9 */ jal func0f0657a4 +/* f073830: 0fc195e9 */ jal roomsCopy /* f073834: 02002825 */ or $a1,$s0,$zero /* f073838: 8fa40188 */ lw $a0,0x188($sp) /* f07383c: 24050001 */ addiu $a1,$zero,0x1 @@ -16388,7 +16388,7 @@ glabel func0f073ae8 /* f073b9c: 0fc19711 */ jal func0f065c44 /* f073ba0: e6280010 */ swc1 $f8,0x10($s1) /* f073ba4: 02402025 */ or $a0,$s2,$zero -/* f073ba8: 0fc195e9 */ jal func0f0657a4 +/* f073ba8: 0fc195e9 */ jal roomsCopy /* f073bac: 02002825 */ or $a1,$s0,$zero /* f073bb0: 10000023 */ beqz $zero,.L0f073c40 /* f073bb4: 8e6a0000 */ lw $t2,0x0($s3) @@ -16425,7 +16425,7 @@ glabel func0f073ae8 /* f073c28: 0fc19711 */ jal func0f065c44 /* f073c2c: e6320010 */ swc1 $f18,0x10($s1) /* f073c30: 27a40034 */ addiu $a0,$sp,0x34 -/* f073c34: 0fc195e9 */ jal func0f0657a4 +/* f073c34: 0fc195e9 */ jal roomsCopy /* f073c38: 02002825 */ or $a1,$s0,$zero /* f073c3c: 8e6a0000 */ lw $t2,0x0($s3) .L0f073c40: @@ -18016,7 +18016,7 @@ glabel func0f073c6c /* f0753a8: e7a805cc */ swc1 $f8,0x5cc($sp) /* f0753ac: c6440010 */ lwc1 $f4,0x10($s2) /* f0753b0: afa4006c */ sw $a0,0x6c($sp) -/* f0753b4: 0fc195e9 */ jal func0f0657a4 +/* f0753b4: 0fc195e9 */ jal roomsCopy /* f0753b8: e7a405d0 */ swc1 $f4,0x5d0($sp) /* f0753bc: 8e040088 */ lw $a0,0x88($s0) /* f0753c0: 50800004 */ beqzl $a0,.L0f0753d4 @@ -18874,7 +18874,7 @@ glabel func0f073c6c /* f075fec: 0fc19711 */ jal func0f065c44 /* f075ff0: e6480010 */ swc1 $f8,0x10($s2) /* f075ff4: 27a4013c */ addiu $a0,$sp,0x13c -/* f075ff8: 0fc195e9 */ jal func0f0657a4 +/* f075ff8: 0fc195e9 */ jal roomsCopy /* f075ffc: 8fa5006c */ lw $a1,0x6c($sp) /* f076000: 10000025 */ beqz $zero,.L0f076098 /* f076004: 8fae034c */ lw $t6,0x34c($sp) @@ -18916,7 +18916,7 @@ glabel func0f073c6c /* f076080: 0fc19711 */ jal func0f065c44 /* f076084: e6480010 */ swc1 $f8,0x10($s2) /* f076088: 27a4012c */ addiu $a0,$sp,0x12c -/* f07608c: 0fc195e9 */ jal func0f0657a4 +/* f07608c: 0fc195e9 */ jal roomsCopy /* f076090: 8fa5006c */ lw $a1,0x6c($sp) /* f076094: 8fae034c */ lw $t6,0x34c($sp) .L0f076098: @@ -19039,7 +19039,7 @@ glabel func0f073c6c /* f07625c: 0fc19711 */ jal func0f065c44 /* f076260: e6440010 */ swc1 $f4,0x10($s2) /* f076264: 27a405b8 */ addiu $a0,$sp,0x5b8 -/* f076268: 0fc195e9 */ jal func0f0657a4 +/* f076268: 0fc195e9 */ jal roomsCopy /* f07626c: 8fa5006c */ lw $a1,0x6c($sp) /* f076270: 8fa40070 */ lw $a0,0x70($sp) /* f076274: 8fa5006c */ lw $a1,0x6c($sp) @@ -19768,7 +19768,7 @@ glabel func0f073c6c /* f076cf0: e7aa05cc */ swc1 $f10,0x5cc($sp) /* f076cf4: c6460010 */ lwc1 $f6,0x10($s2) /* f076cf8: afa4006c */ sw $a0,0x6c($sp) -/* f076cfc: 0fc195e9 */ jal func0f0657a4 +/* f076cfc: 0fc195e9 */ jal roomsCopy /* f076d00: e7a605d0 */ swc1 $f6,0x5d0($sp) /* f076d04: 02202025 */ or $a0,$s1,$zero /* f076d08: 27a505dc */ addiu $a1,$sp,0x5dc @@ -19828,7 +19828,7 @@ glabel func0f073c6c /* f076dd8: 0fc19711 */ jal func0f065c44 /* f076ddc: afae0070 */ sw $t6,0x70($sp) /* f076de0: 27a405b8 */ addiu $a0,$sp,0x5b8 -/* f076de4: 0fc195e9 */ jal func0f0657a4 +/* f076de4: 0fc195e9 */ jal roomsCopy /* f076de8: 8fa5006c */ lw $a1,0x6c($sp) /* f076dec: 27b90096 */ addiu $t9,$sp,0x96 /* f076df0: afb90010 */ sw $t9,0x10($sp) @@ -20745,7 +20745,7 @@ glabel func0f07766c /* f077b1c: 0fc19711 */ jal func0f065c44 /* f077b20: e6260010 */ swc1 $f6,0x10($s1) /* f077b24: 27a40068 */ addiu $a0,$sp,0x68 -/* f077b28: 0fc195e9 */ jal func0f0657a4 +/* f077b28: 0fc195e9 */ jal roomsCopy /* f077b2c: 02002825 */ or $a1,$s0,$zero /* f077b30: 8e500064 */ lw $s0,0x64($s2) /* f077b34: c6100074 */ lwc1 $f16,0x74($s0) @@ -21062,7 +21062,7 @@ glabel func0f077c10 /* f077fc0: 0fc19711 */ jal func0f065c44 /* f077fc4: e6280010 */ swc1 $f8,0x10($s1) /* f077fc8: 27a4024c */ addiu $a0,$sp,0x24c -/* f077fcc: 0fc195e9 */ jal func0f0657a4 +/* f077fcc: 0fc195e9 */ jal roomsCopy /* f077fd0: 8fa50030 */ lw $a1,0x30($sp) /* f077fd4: 8fa40338 */ lw $a0,0x338($sp) /* f077fd8: 24050001 */ addiu $a1,$zero,0x1 @@ -23437,7 +23437,7 @@ glabel func0f079f1c /* f07a1bc: c5a6000c */ lwc1 $f6,0xc($t5) /* f07a1c0: e7a6016c */ swc1 $f6,0x16c($sp) /* f07a1c4: c5a80010 */ lwc1 $f8,0x10($t5) -/* f07a1c8: 0fc195e9 */ jal func0f0657a4 +/* f07a1c8: 0fc195e9 */ jal roomsCopy /* f07a1cc: e7a80170 */ swc1 $f8,0x170($sp) /* f07a1d0: 1000000b */ beqz $zero,.L0f07a200 /* f07a1d4: 8fae0194 */ lw $t6,0x194($sp) @@ -23449,7 +23449,7 @@ glabel func0f079f1c /* f07a1e8: c450000c */ lwc1 $f16,0xc($v0) /* f07a1ec: e7b0016c */ swc1 $f16,0x16c($sp) /* f07a1f0: c4520010 */ lwc1 $f18,0x10($v0) -/* f07a1f4: 0fc195e9 */ jal func0f0657a4 +/* f07a1f4: 0fc195e9 */ jal roomsCopy /* f07a1f8: e7b20170 */ swc1 $f18,0x170($sp) .L0f07a1fc: /* f07a1fc: 8fae0194 */ lw $t6,0x194($sp) @@ -25496,7 +25496,7 @@ glabel func0f07ba38 /* f07c080: 0fc19711 */ jal func0f065c44 /* f07c084: e4920010 */ swc1 $f18,0x10($a0) /* f07c088: 27a40160 */ addiu $a0,$sp,0x160 -/* f07c08c: 0fc195e9 */ jal func0f0657a4 +/* f07c08c: 0fc195e9 */ jal roomsCopy /* f07c090: 8fa50030 */ lw $a1,0x30($sp) /* f07c094: 02002025 */ or $a0,$s0,$zero /* f07c098: 00002825 */ or $a1,$zero,$zero @@ -25921,7 +25921,7 @@ glabel func0f07c12c /* f07c69c: 0fc19711 */ jal func0f065c44 /* f07c6a0: e62a0010 */ swc1 $f10,0x10($s1) /* f07c6a4: 27a40050 */ addiu $a0,$sp,0x50 -/* f07c6a8: 0fc195e9 */ jal func0f0657a4 +/* f07c6a8: 0fc195e9 */ jal roomsCopy /* f07c6ac: 8fa50040 */ lw $a1,0x40($sp) /* f07c6b0: 02002025 */ or $a0,$s0,$zero /* f07c6b4: 00002825 */ or $a1,$zero,$zero @@ -26882,7 +26882,7 @@ glabel func0f07d1e4 /* f07d490: 0fc19711 */ jal func0f065c44 /* f07d494: e48a0010 */ swc1 $f10,0x10($a0) /* f07d498: 27a401b0 */ addiu $a0,$sp,0x1b0 -/* f07d49c: 0fc195e9 */ jal func0f0657a4 +/* f07d49c: 0fc195e9 */ jal roomsCopy /* f07d4a0: 8fa50054 */ lw $a1,0x54($sp) /* f07d4a4: 02002025 */ or $a0,$s0,$zero /* f07d4a8: 00002825 */ or $a1,$zero,$zero @@ -27569,7 +27569,7 @@ glabel func0f07d1e4 /* f07de80: 0fc19711 */ jal func0f065c44 /* f07de84: e4880010 */ swc1 $f8,0x10($a0) /* f07de88: 27a40140 */ addiu $a0,$sp,0x140 -/* f07de8c: 0fc195e9 */ jal func0f0657a4 +/* f07de8c: 0fc195e9 */ jal roomsCopy /* f07de90: 8fa50054 */ lw $a1,0x54($sp) /* f07de94: c7aa0190 */ lwc1 $f10,0x190($sp) /* f07de98: 8e020088 */ lw $v0,0x88($s0) @@ -28564,7 +28564,7 @@ glabel func0f07e758 /* f07ec4c: 0fc19711 */ jal func0f065c44 /* f07ec50: e6280010 */ swc1 $f8,0x10($s1) /* f07ec54: 27a40180 */ addiu $a0,$sp,0x180 -/* f07ec58: 0fc195e9 */ jal func0f0657a4 +/* f07ec58: 0fc195e9 */ jal roomsCopy /* f07ec5c: 8fa50034 */ lw $a1,0x34($sp) /* f07ec60: 92020003 */ lbu $v0,0x3($s0) /* f07ec64: 24010035 */ addiu $at,$zero,0x35 @@ -28849,7 +28849,7 @@ glabel func0f07e758 /* f07f080: 0fc19711 */ jal func0f065c44 /* f07f084: e62a0010 */ swc1 $f10,0x10($s1) /* f07f088: 27a400dc */ addiu $a0,$sp,0xdc -/* f07f08c: 0fc195e9 */ jal func0f0657a4 +/* f07f08c: 0fc195e9 */ jal roomsCopy /* f07f090: 8fa50034 */ lw $a1,0x34($sp) /* f07f094: 8faf0090 */ lw $t7,0x90($sp) /* f07f098: 8fb90094 */ lw $t9,0x94($sp) @@ -34127,7 +34127,7 @@ glabel func0f08307c /* f083ca0: 0c005775 */ jal func00015dd4 /* f083ca4: 27a500f0 */ addiu $a1,$sp,0xf0 /* f083ca8: 26040028 */ addiu $a0,$s0,0x28 -/* f083cac: 0fc195e9 */ jal func0f0657a4 +/* f083cac: 0fc195e9 */ jal roomsCopy /* f083cb0: 27a500d4 */ addiu $a1,$sp,0xd4 .L0f083cb4: /* f083cb4: 0fc20be2 */ jal func0f082f88 @@ -34146,7 +34146,7 @@ glabel func0f08307c /* f083ce8: e4880010 */ swc1 $f8,0x10($a0) /* f083cec: 8fa50140 */ lw $a1,0x140($sp) /* f083cf0: 27a400d4 */ addiu $a0,$sp,0xd4 -/* f083cf4: 0fc195e9 */ jal func0f0657a4 +/* f083cf4: 0fc195e9 */ jal roomsCopy /* f083cf8: 24a50028 */ addiu $a1,$a1,0x28 /* f083cfc: 44800000 */ mtc1 $zero,$f0 /* f083d00: 8fa50138 */ lw $a1,0x138($sp) @@ -45150,7 +45150,7 @@ glabel func0f08d540 /* f08d71c: e48a0010 */ swc1 $f10,0x10($a0) /* f08d720: 8fa5007c */ lw $a1,0x7c($sp) /* f08d724: 27a40028 */ addiu $a0,$sp,0x28 -/* f08d728: 0fc195e9 */ jal func0f0657a4 +/* f08d728: 0fc195e9 */ jal roomsCopy /* f08d72c: 24a50028 */ addiu $a1,$a1,0x28 /* f08d730: 0fc23153 */ jal func0f08c54c /* f08d734: 02002025 */ or $a0,$s0,$zero diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 85e3a5112..590212055 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -8223,7 +8223,7 @@ glabel func0f09ed2c /* f09ed74: e7a6004c */ swc1 $f6,0x4c($sp) /* f09ed78: c4480010 */ lwc1 $f8,0x10($v0) /* f09ed7c: afa20034 */ sw $v0,0x34($sp) -/* f09ed80: 0fc195e9 */ jal func0f0657a4 +/* f09ed80: 0fc195e9 */ jal roomsCopy /* f09ed84: e7a80050 */ swc1 $f8,0x50($sp) /* f09ed88: 8fa20034 */ lw $v0,0x34($sp) /* f09ed8c: 8fa3005c */ lw $v1,0x5c($sp) @@ -8591,7 +8591,7 @@ glabel func0f09f100 /* f09f2c8: c566000c */ lwc1 $f6,0xc($t3) /* f09f2cc: e7a60174 */ swc1 $f6,0x174($sp) /* f09f2d0: c5680010 */ lwc1 $f8,0x10($t3) -/* f09f2d4: 0fc195e9 */ jal func0f0657a4 +/* f09f2d4: 0fc195e9 */ jal roomsCopy /* f09f2d8: e7a80178 */ swc1 $f8,0x178($sp) .L0f09f2dc: /* f09f2dc: 8fa401d8 */ lw $a0,0x1d8($sp) diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index d8960fdf0..796867239 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -1084,7 +1084,7 @@ glabel func0f0b69d0 /* f0b71cc: 0060a825 */ or $s5,$v1,$zero /* f0b71d0: 01392021 */ addu $a0,$t1,$t9 /* f0b71d4: e5100008 */ swc1 $f16,0x8($t0) -/* f0b71d8: 0fc195e9 */ jal func0f0657a4 +/* f0b71d8: 0fc195e9 */ jal roomsCopy /* f0b71dc: 8fa50290 */ lw $a1,0x290($sp) /* f0b71e0: 00155880 */ sll $t3,$s5,0x2 /* f0b71e4: 03ab5021 */ addu $t2,$sp,$t3 diff --git a/src/game/game_0cf150.c b/src/game/game_0cf150.c index af61464e9..2298a3435 100644 --- a/src/game/game_0cf150.c +++ b/src/game/game_0cf150.c @@ -217,7 +217,7 @@ glabel func0f0cf230 /* f0cf364: 0fc19711 */ jal func0f065c44 /* f0cf368: e610000c */ swc1 $f16,0xc($s0) /* f0cf36c: 27a40050 */ addiu $a0,$sp,0x50 -/* f0cf370: 0fc195e9 */ jal func0f0657a4 +/* f0cf370: 0fc195e9 */ jal roomsCopy /* f0cf374: 8fa5003c */ lw $a1,0x3c($sp) .L0f0cf378: /* f0cf378: 8fbf002c */ lw $ra,0x2c($sp) @@ -465,7 +465,7 @@ glabel func0f0cf38c /* f0cf700: 0fc19711 */ jal func0f065c44 /* f0cf704: e6080010 */ swc1 $f8,0x10($s0) /* f0cf708: 27a400a8 */ addiu $a0,$sp,0xa8 -/* f0cf70c: 0fc195e9 */ jal func0f0657a4 +/* f0cf70c: 0fc195e9 */ jal roomsCopy /* f0cf710: 8fa50040 */ lw $a1,0x40($sp) /* f0cf714: 8fbf0034 */ lw $ra,0x34($sp) .L0f0cf718: @@ -2220,7 +2220,7 @@ glabel func0f0d0928 /* f0d1038: 8dc40000 */ lw $a0,0x0($t6) /* f0d103c: a3bf00c2 */ sb $ra,0xc2($sp) /* f0d1040: e7ae00e0 */ swc1 $f14,0xe0($sp) -/* f0d1044: 0fc195e9 */ jal func0f0657a4 +/* f0d1044: 0fc195e9 */ jal roomsCopy /* f0d1048: 24840028 */ addiu $a0,$a0,0x28 /* f0d104c: 0fc44727 */ jal currentPlayerCanHaveWeapon /* f0d1050: 2404002e */ addiu $a0,$zero,0x2e diff --git a/src/game/game_190260.c b/src/game/game_190260.c index 53b8e04e6..85ead8481 100644 --- a/src/game/game_190260.c +++ b/src/game/game_190260.c @@ -1211,7 +1211,7 @@ glabel func0f19124c /* f191274: 8c84001c */ lw $a0,0x1c($a0) /* f191278: 27b30064 */ addiu $s3,$sp,0x64 /* f19127c: 02602825 */ or $a1,$s3,$zero -/* f191280: 0fc195e9 */ jal func0f0657a4 +/* f191280: 0fc195e9 */ jal roomsCopy /* f191284: 24840028 */ addiu $a0,$a0,0x28 /* f191288: 8e82001c */ lw $v0,0x1c($s4) /* f19128c: 2412ffff */ addiu $s2,$zero,-1 @@ -2472,7 +2472,7 @@ void mpAibotApplyDefend(struct chrdata *chr, struct coord *pos, s16 *room, f32 a chr->unk2d4->defendholdpos.x = pos->x; chr->unk2d4->defendholdpos.y = pos->y; chr->unk2d4->defendholdpos.z = pos->z; - func0f0657a4(room, &chr->unk2d4->rooms[0]); + roomsCopy(room, &chr->unk2d4->rooms[0]); chr->unk2d4->unk098 = arg3; chr->unk2d4->unk0d8 = 1; } @@ -2483,7 +2483,7 @@ void mpAibotApplyHold(struct chrdata *chr, struct coord *pos, s16 *room, f32 arg chr->unk2d4->defendholdpos.x = pos->x; chr->unk2d4->defendholdpos.y = pos->y; chr->unk2d4->defendholdpos.z = pos->z; - func0f0657a4(room, &chr->unk2d4->rooms[0]); + roomsCopy(room, &chr->unk2d4->rooms[0]); chr->unk2d4->unk098 = arg3; chr->unk2d4->unk0d8 = 1; } @@ -5979,7 +5979,7 @@ glabel func0f194b40 /* f1959fc: 264500f8 */ addiu $a1,$s2,0xf8 /* f195a00: e64600f0 */ swc1 $f6,0xf0($s2) /* f195a04: c46a0010 */ lwc1 $f10,0x10($v1) -/* f195a08: 0fc195e9 */ jal func0f0657a4 +/* f195a08: 0fc195e9 */ jal roomsCopy /* f195a0c: e64a00f4 */ swc1 $f10,0xf4($s2) /* f195a10: 924e004c */ lbu $t6,0x4c($s2) /* f195a14: 31cfff7f */ andi $t7,$t6,0xff7f @@ -6039,7 +6039,7 @@ glabel func0f194b40 /* f195ae4: c7a80274 */ lwc1 $f8,0x274($sp) /* f195ae8: 2484c11e */ addiu $a0,$a0,-16098 /* f195aec: 264500f8 */ addiu $a1,$s2,0xf8 -/* f195af0: 0fc195e9 */ jal func0f0657a4 +/* f195af0: 0fc195e9 */ jal roomsCopy /* f195af4: e64800f4 */ swc1 $f8,0xf4($s2) /* f195af8: 8e8f001c */ lw $t7,0x1c($s4) /* f195afc: 3c19800b */ lui $t9,0x800b @@ -6086,7 +6086,7 @@ glabel func0f194b40 /* f195b9c: c7b2025c */ lwc1 $f18,0x25c($sp) /* f195ba0: 2484c11e */ addiu $a0,$a0,-16098 /* f195ba4: 264500f8 */ addiu $a1,$s2,0xf8 -/* f195ba8: 0fc195e9 */ jal func0f0657a4 +/* f195ba8: 0fc195e9 */ jal roomsCopy /* f195bac: e65200f4 */ swc1 $f18,0xf4($s2) /* f195bb0: 8e8e001c */ lw $t6,0x1c($s4) /* f195bb4: 3c0f800b */ lui $t7,0x800b diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index 468370216..d3415ea7a 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -2990,7 +2990,7 @@ glabel func0f19ecdc /* f19ed98: 27b2006c */ addiu $s2,$sp,0x6c /* f19ed9c: 02402825 */ or $a1,$s2,$zero /* f19eda0: 8d4400bc */ lw $a0,0xbc($t2) -/* f19eda4: 0fc195e9 */ jal func0f0657a4 +/* f19eda4: 0fc195e9 */ jal roomsCopy /* f19eda8: 24840028 */ addiu $a0,$a0,0x28 /* f19edac: 8e8b0284 */ lw $t3,0x284($s4) /* f19edb0: 2401ffff */ addiu $at,$zero,-1 @@ -3640,7 +3640,7 @@ glabel func0f19f524 /* f19f694: 8defa244 */ lw $t7,-0x5dbc($t7) /* f19f698: 27a50064 */ addiu $a1,$sp,0x64 /* f19f69c: 8de400bc */ lw $a0,0xbc($t7) -/* f19f6a0: 0fc195e9 */ jal func0f0657a4 +/* f19f6a0: 0fc195e9 */ jal roomsCopy /* f19f6a4: 24840028 */ addiu $a0,$a0,0x0028 /* f19f6a8: 3c18800a */ lui $t8,0x800a /* f19f6ac: 8f18a244 */ lw $t8,-0x5dbc($t8) diff --git a/src/include/game/bondwalk.h b/src/include/game/bondwalk.h index 1dfbcd584..b4d0ed58b 100644 --- a/src/include/game/bondwalk.h +++ b/src/include/game/bondwalk.h @@ -23,7 +23,7 @@ u32 func0f0c6080(void); u32 func0f0c6180(void); u32 func0f0c6318(void); u32 func0f0c63bc(void); -u32 func0f0c6544(void); +void currentPlayerUpdatePrevPos(void); u32 func0f0c65a8(void); u32 func0f0c65c8(void); u32 func0f0c6948(void); diff --git a/src/include/game/game_0601b0.h b/src/include/game/game_0601b0.h index 97c944344..8bded565d 100644 --- a/src/include/game/game_0601b0.h +++ b/src/include/game/game_0601b0.h @@ -39,7 +39,7 @@ u32 func0f064a24(void); u32 func0f064ce8(void); u32 func0f0654e8(void); u32 func0f06554c(void); -void func0f0657a4(s16 *room, s16 *rooms); +void roomsCopy(s16 *srcrooms, s16 *dstrooms); u32 func0f0657d8(void); bool arrayIntersects(s16 *a, s16 *b); u32 func0f0658e8(void); diff --git a/src/include/types.h b/src/include/types.h index 77ce7b04f..39f3d22ec 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -1182,10 +1182,7 @@ struct player { /*0x0278*/ u32 unk0278; /*0x027c*/ u32 unk027c; /*0x0280*/ u32 unk0280; - /*0x0284*/ u32 unk0284; - /*0x0288*/ u32 unk0288; - /*0x028c*/ u32 unk028c; - /*0x0290*/ u32 unk0290; + /*0x0284*/ s16 bondprevrooms[8]; /*0x0294*/ u32 unk0294; /*0x0298*/ u32 unk0298; /*0x029c*/ u32 unk029c;