mirror of https://github.com/pmret/papermario.git
More world functions (#689)
* functions in tik * Fixed suggestions and a few more functions completed * quick fixes * EncounterStatus * Fixed current issues * Merge branch 'master' of https://github.com/theRealBatman189/papermario * Functions for trd * fixed issues
This commit is contained in:
theRealBatman189
GitHub
parent
5718fa67fa
commit
17c09c34e9
|
|
@ -6,8 +6,24 @@
|
|||
|
||||
#include "world/common/GetItemName.inc.c"
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_80240A78_890618);
|
||||
extern s32 D_802427BC_89235C[13][2];
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_80240AA4_890644);
|
||||
ApiStatus func_80240A78_890618(Evt* script, s32 isInitialCall) {
|
||||
s32* array = D_802427BC_89235C[script->varTable[0]];
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_80240AD0_890670);
|
||||
script->varTable[0xA] = array[0];
|
||||
script->varTable[0xB] = array[1];
|
||||
return ApiStatus_DONE2;
|
||||
}
|
||||
|
||||
ApiStatus func_80240AA4_890644(Evt* script) {
|
||||
script->varTable[0] = get_item_empty_count();
|
||||
return ApiStatus_DONE2;
|
||||
}
|
||||
|
||||
ApiStatus func_80240AD0_890670(Evt* script, s32 isInitialCall) {
|
||||
Bytecode* args = script->ptrReadPos;
|
||||
|
||||
evt_set_variable(script, *args++, gPlayerData.coins >= 64);
|
||||
return ApiStatus_DONE2;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,4 +5,10 @@ static char* N(exit_str_1) = "kmr_22";
|
|||
static char* N(exit_str_2) = "tik_22";
|
||||
static char* N(exit_str_3) = "";
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_tik/tik_17/892A20", func_80240000_892A20);
|
||||
s32 func_8014AB0C(s32, s16);
|
||||
|
||||
ApiStatus func_80240000_892A20(Evt* script, s32 isInitialCall) {
|
||||
func_8014AB0C(0, 2);
|
||||
return ApiStatus_DONE2;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,4 +2,11 @@
|
|||
|
||||
#include "world/common/UnkPosFunc2.inc.c"
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_tik/tik_18/8959F0", func_80240680_895D60);
|
||||
ApiStatus func_80240680_895D60(Evt* script, s32 isInitialCall) {
|
||||
Enemy* enemy = get_enemy_safe(1);
|
||||
|
||||
if (enemy != NULL) {
|
||||
enemy->varTable[0] = 1;
|
||||
}
|
||||
return ApiStatus_DONE2;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,4 +3,9 @@
|
|||
static char* N(exit_str_0) = "tik_21";
|
||||
static char* N(exit_str_1) = "tik_17";
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEC0", func_80240000_89FEC0);
|
||||
s32 func_8014AB0C(s32, s16);
|
||||
|
||||
ApiStatus func_80240000_89FEC0(Evt* script, s32 isInitialCall) {
|
||||
func_8014AB0C(0, 2);
|
||||
return ApiStatus_DONE2;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,11 @@
|
|||
|
||||
#include "world/common/atomic/Pipe.inc.c"
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024061C_8A04DC);
|
||||
s32 func_8014AB60(s32, s16);
|
||||
|
||||
ApiStatus func_8024061C_8A04DC(Evt* script, s32 isInitialCall) {
|
||||
func_8014AB60(0, 2);
|
||||
return ApiStatus_DONE2;
|
||||
}
|
||||
|
||||
#include "world/common/UnkPosFunc2.inc.c"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
#include "tik_24.h"
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5A80", func_80240000_8A5A80);
|
||||
s32 func_80240000_8A5A80(void) {
|
||||
sprintf((s8*) &wMapShapeName, "tik_18_shape");
|
||||
sprintf((s8*) &wMapHitName, "tik_18_hit\0\0tik_25\0\0tik_23");
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,9 +61,49 @@
|
|||
// todo remove when below are decompiled
|
||||
static const f32 padding = 0.0f;
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243310_9AB700);
|
||||
void func_80243310_9AB700(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
|
||||
Bytecode* args = script->ptrReadPos;
|
||||
Enemy* enemy = script->owner1.enemy;
|
||||
Npc* npc = get_npc_unsafe(enemy->npcID);
|
||||
f32 yawTemp;
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243438_9AB828);
|
||||
npc->currentAnim.w = enemy->animList[9];
|
||||
npc->jumpVelocity = -5.0f;
|
||||
npc->jumpScale = 0.15f;
|
||||
npc->collisionHeight = enemy->varTable[8] / 2;
|
||||
|
||||
dist2D(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
|
||||
npc->moveSpeed = 7.0f;
|
||||
enemy->unk_10.x = npc->pos.x;
|
||||
enemy->unk_10.y = npc->pos.y;
|
||||
enemy->unk_10.z = npc->pos.z;
|
||||
enemy->unk_07 = 1;
|
||||
|
||||
ai_enemy_play_sound(npc, SOUND_UNUSED_2C1, 0);
|
||||
yawTemp = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z);
|
||||
npc->duration = 12;
|
||||
npc->yaw = yawTemp;
|
||||
script->functionTemp[0] = 13;
|
||||
}
|
||||
|
||||
void func_80243438_9AB828(Evt* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) {
|
||||
Enemy* enemy = script->owner1.enemy;
|
||||
Npc* npc = get_npc_unsafe(script->owner1.enemy->npcID);
|
||||
|
||||
npc->jumpVelocity += npc->jumpScale;
|
||||
npc->pos.y += npc->jumpVelocity;
|
||||
npc_move_heading(npc, npc->moveSpeed, npc->yaw);
|
||||
npc->duration--;
|
||||
|
||||
if (npc->duration <= 0) {
|
||||
enemy->unk_07 = 0;
|
||||
npc->jumpScale = 0.3f;
|
||||
npc->jumpVelocity = 0.0f;
|
||||
npc->moveSpeed = 3.0f;
|
||||
npc->currentAnim.w = enemy->animList[10];
|
||||
script->functionTemp[0] = 14;
|
||||
}
|
||||
}
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802434F4_9AB8E4);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80240A78_890618
|
||||
/* 890618 80240A78 8C820084 */ lw $v0, 0x84($a0)
|
||||
/* 89061C 80240A7C 3C038024 */ lui $v1, %hi(D_802427BC_89235C)
|
||||
/* 890620 80240A80 246327BC */ addiu $v1, $v1, %lo(D_802427BC_89235C)
|
||||
/* 890624 80240A84 000210C0 */ sll $v0, $v0, 3
|
||||
/* 890628 80240A88 00431021 */ addu $v0, $v0, $v1
|
||||
/* 89062C 80240A8C 8C430000 */ lw $v1, ($v0)
|
||||
/* 890630 80240A90 AC8300AC */ sw $v1, 0xac($a0)
|
||||
/* 890634 80240A94 8C420004 */ lw $v0, 4($v0)
|
||||
/* 890638 80240A98 AC8200B0 */ sw $v0, 0xb0($a0)
|
||||
/* 89063C 80240A9C 03E00008 */ jr $ra
|
||||
/* 890640 80240AA0 24020002 */ addiu $v0, $zero, 2
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80240AA4_890644
|
||||
/* 890644 80240AA4 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* 890648 80240AA8 AFB00010 */ sw $s0, 0x10($sp)
|
||||
/* 89064C 80240AAC AFBF0014 */ sw $ra, 0x14($sp)
|
||||
/* 890650 80240AB0 0C039D88 */ jal get_item_empty_count
|
||||
/* 890654 80240AB4 0080802D */ daddu $s0, $a0, $zero
|
||||
/* 890658 80240AB8 AE020084 */ sw $v0, 0x84($s0)
|
||||
/* 89065C 80240ABC 8FBF0014 */ lw $ra, 0x14($sp)
|
||||
/* 890660 80240AC0 8FB00010 */ lw $s0, 0x10($sp)
|
||||
/* 890664 80240AC4 24020002 */ addiu $v0, $zero, 2
|
||||
/* 890668 80240AC8 03E00008 */ jr $ra
|
||||
/* 89066C 80240ACC 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80240AD0_890670
|
||||
/* 890670 80240AD0 3C068011 */ lui $a2, %hi(gPlayerData+0xC)
|
||||
/* 890674 80240AD4 84C6F29C */ lh $a2, %lo(gPlayerData+0xC)($a2)
|
||||
/* 890678 80240AD8 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* 89067C 80240ADC AFBF0010 */ sw $ra, 0x10($sp)
|
||||
/* 890680 80240AE0 8C82000C */ lw $v0, 0xc($a0)
|
||||
/* 890684 80240AE4 28C60040 */ slti $a2, $a2, 0x40
|
||||
/* 890688 80240AE8 8C450000 */ lw $a1, ($v0)
|
||||
/* 89068C 80240AEC 0C0B2026 */ jal evt_set_variable
|
||||
/* 890690 80240AF0 38C60001 */ xori $a2, $a2, 1
|
||||
/* 890694 80240AF4 8FBF0010 */ lw $ra, 0x10($sp)
|
||||
/* 890698 80240AF8 24020002 */ addiu $v0, $zero, 2
|
||||
/* 89069C 80240AFC 03E00008 */ jr $ra
|
||||
/* 8906A0 80240B00 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
/* 8906A4 80240B04 00000000 */ nop
|
||||
/* 8906A8 80240B08 00000000 */ nop
|
||||
/* 8906AC 80240B0C 00000000 */ nop
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80240000_892A20
|
||||
/* 892A20 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* 892A24 80240004 0000202D */ daddu $a0, $zero, $zero
|
||||
/* 892A28 80240008 AFBF0010 */ sw $ra, 0x10($sp)
|
||||
/* 892A2C 8024000C 0C052AC3 */ jal func_8014AB0C
|
||||
/* 892A30 80240010 24050002 */ addiu $a1, $zero, 2
|
||||
/* 892A34 80240014 8FBF0010 */ lw $ra, 0x10($sp)
|
||||
/* 892A38 80240018 24020002 */ addiu $v0, $zero, 2
|
||||
/* 892A3C 8024001C 03E00008 */ jr $ra
|
||||
/* 892A40 80240020 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
/* 892A44 80240024 00000000 */ nop
|
||||
/* 892A48 80240028 00000000 */ nop
|
||||
/* 892A4C 8024002C 00000000 */ nop
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80240680_895D60
|
||||
/* 895D60 80240680 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* 895D64 80240684 AFBF0010 */ sw $ra, 0x10($sp)
|
||||
/* 895D68 80240688 0C00FB5A */ jal get_enemy_safe
|
||||
/* 895D6C 8024068C 24040001 */ addiu $a0, $zero, 1
|
||||
/* 895D70 80240690 0040182D */ daddu $v1, $v0, $zero
|
||||
/* 895D74 80240694 10600002 */ beqz $v1, .L802406A0
|
||||
/* 895D78 80240698 24020001 */ addiu $v0, $zero, 1
|
||||
/* 895D7C 8024069C AC62006C */ sw $v0, 0x6c($v1)
|
||||
.L802406A0:
|
||||
/* 895D80 802406A0 8FBF0010 */ lw $ra, 0x10($sp)
|
||||
/* 895D84 802406A4 24020002 */ addiu $v0, $zero, 2
|
||||
/* 895D88 802406A8 03E00008 */ jr $ra
|
||||
/* 895D8C 802406AC 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80240000_89FEC0
|
||||
/* 89FEC0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* 89FEC4 80240004 0000202D */ daddu $a0, $zero, $zero
|
||||
/* 89FEC8 80240008 AFBF0010 */ sw $ra, 0x10($sp)
|
||||
/* 89FECC 8024000C 0C052AC3 */ jal func_8014AB0C
|
||||
/* 89FED0 80240010 24050002 */ addiu $a1, $zero, 2
|
||||
/* 89FED4 80240014 8FBF0010 */ lw $ra, 0x10($sp)
|
||||
/* 89FED8 80240018 24020002 */ addiu $v0, $zero, 2
|
||||
/* 89FEDC 8024001C 03E00008 */ jr $ra
|
||||
/* 89FEE0 80240020 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
/* 89FEE4 80240024 00000000 */ nop
|
||||
/* 89FEE8 80240028 00000000 */ nop
|
||||
/* 89FEEC 8024002C 00000000 */ nop
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_8024061C_8A04DC
|
||||
/* 8A04DC 8024061C 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* 8A04E0 80240620 0000202D */ daddu $a0, $zero, $zero
|
||||
/* 8A04E4 80240624 AFBF0010 */ sw $ra, 0x10($sp)
|
||||
/* 8A04E8 80240628 0C052AD8 */ jal func_8014AB60
|
||||
/* 8A04EC 8024062C 24050002 */ addiu $a1, $zero, 2
|
||||
/* 8A04F0 80240630 8FBF0010 */ lw $ra, 0x10($sp)
|
||||
/* 8A04F4 80240634 24020002 */ addiu $v0, $zero, 2
|
||||
/* 8A04F8 80240638 03E00008 */ jr $ra
|
||||
/* 8A04FC 8024063C 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
.section .rodata
|
||||
|
||||
dlabel D_80242470_8A7EF0
|
||||
.ascii "tik_18_shape\0\0\0\0"
|
||||
|
||||
dlabel D_80242480_8A7F00
|
||||
.ascii "tik_18_hit\0\0tik_25\0\0tik_23\0\0\0\0\0\0"
|
||||
|
||||
.section .text
|
||||
|
||||
glabel func_80240000_8A5A80
|
||||
/* 8A5A80 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18
|
||||
/* 8A5A84 80240004 3C04800E */ lui $a0, %hi(wMapShapeName)
|
||||
/* 8A5A88 80240008 24849230 */ addiu $a0, $a0, %lo(wMapShapeName)
|
||||
/* 8A5A8C 8024000C 3C058024 */ lui $a1, %hi(D_80242470_8A7EF0)
|
||||
/* 8A5A90 80240010 24A52470 */ addiu $a1, $a1, %lo(D_80242470_8A7EF0)
|
||||
/* 8A5A94 80240014 AFBF0010 */ sw $ra, 0x10($sp)
|
||||
/* 8A5A98 80240018 0C01953C */ jal sprintf
|
||||
/* 8A5A9C 8024001C 00000000 */ nop
|
||||
/* 8A5AA0 80240020 3C04800E */ lui $a0, %hi(wMapHitName)
|
||||
/* 8A5AA4 80240024 248491E0 */ addiu $a0, $a0, %lo(wMapHitName)
|
||||
/* 8A5AA8 80240028 3C058024 */ lui $a1, %hi(D_80242480_8A7F00)
|
||||
/* 8A5AAC 8024002C 0C01953C */ jal sprintf
|
||||
/* 8A5AB0 80240030 24A52480 */ addiu $a1, $a1, %lo(D_80242480_8A7F00)
|
||||
/* 8A5AB4 80240034 8FBF0010 */ lw $ra, 0x10($sp)
|
||||
/* 8A5AB8 80240038 0000102D */ daddu $v0, $zero, $zero
|
||||
/* 8A5ABC 8024003C 03E00008 */ jr $ra
|
||||
/* 8A5AC0 80240040 27BD0018 */ addiu $sp, $sp, 0x18
|
||||
/* 8A5AC4 80240044 00000000 */ nop
|
||||
/* 8A5AC8 80240048 00000000 */ nop
|
||||
/* 8A5ACC 8024004C 00000000 */ nop
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80243310_9AB700
|
||||
/* 9AB700 80243310 27BDFFD8 */ addiu $sp, $sp, -0x28
|
||||
/* 9AB704 80243314 AFB3001C */ sw $s3, 0x1c($sp)
|
||||
/* 9AB708 80243318 0080982D */ daddu $s3, $a0, $zero
|
||||
/* 9AB70C 8024331C AFBF0020 */ sw $ra, 0x20($sp)
|
||||
/* 9AB710 80243320 AFB20018 */ sw $s2, 0x18($sp)
|
||||
/* 9AB714 80243324 AFB10014 */ sw $s1, 0x14($sp)
|
||||
/* 9AB718 80243328 AFB00010 */ sw $s0, 0x10($sp)
|
||||
/* 9AB71C 8024332C 8E710148 */ lw $s1, 0x148($s3)
|
||||
/* 9AB720 80243330 0C00EABB */ jal get_npc_unsafe
|
||||
/* 9AB724 80243334 86240008 */ lh $a0, 8($s1)
|
||||
/* 9AB728 80243338 0040802D */ daddu $s0, $v0, $zero
|
||||
/* 9AB72C 8024333C C60C0038 */ lwc1 $f12, 0x38($s0)
|
||||
/* 9AB730 80243340 8E2200CC */ lw $v0, 0xcc($s1)
|
||||
/* 9AB734 80243344 3C01C0A0 */ lui $at, 0xc0a0
|
||||
/* 9AB738 80243348 44811000 */ mtc1 $at, $f2
|
||||
/* 9AB73C 8024334C 3C013E19 */ lui $at, 0x3e19
|
||||
/* 9AB740 80243350 3421999A */ ori $at, $at, 0x999a
|
||||
/* 9AB744 80243354 44810000 */ mtc1 $at, $f0
|
||||
/* 9AB748 80243358 8C420024 */ lw $v0, 0x24($v0)
|
||||
/* 9AB74C 8024335C 3C12800F */ lui $s2, %hi(gPlayerStatusPtr)
|
||||
/* 9AB750 80243360 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr)
|
||||
/* 9AB754 80243364 E602001C */ swc1 $f2, 0x1c($s0)
|
||||
/* 9AB758 80243368 E6000014 */ swc1 $f0, 0x14($s0)
|
||||
/* 9AB75C 8024336C AE020028 */ sw $v0, 0x28($s0)
|
||||
/* 9AB760 80243370 8E22008C */ lw $v0, 0x8c($s1)
|
||||
/* 9AB764 80243374 C60E0040 */ lwc1 $f14, 0x40($s0)
|
||||
/* 9AB768 80243378 00021FC2 */ srl $v1, $v0, 0x1f
|
||||
/* 9AB76C 8024337C 00431021 */ addu $v0, $v0, $v1
|
||||
/* 9AB770 80243380 8E430000 */ lw $v1, ($s2)
|
||||
/* 9AB774 80243384 00021043 */ sra $v0, $v0, 1
|
||||
/* 9AB778 80243388 A60200A8 */ sh $v0, 0xa8($s0)
|
||||
/* 9AB77C 8024338C 8C660028 */ lw $a2, 0x28($v1)
|
||||
/* 9AB780 80243390 0C00A7B5 */ jal dist2D
|
||||
/* 9AB784 80243394 8C670030 */ lw $a3, 0x30($v1)
|
||||
/* 9AB788 80243398 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 9AB78C 8024339C 0000302D */ daddu $a2, $zero, $zero
|
||||
/* 9AB790 802433A0 C6020038 */ lwc1 $f2, 0x38($s0)
|
||||
/* 9AB794 802433A4 3C0140E0 */ lui $at, 0x40e0
|
||||
/* 9AB798 802433A8 44810000 */ mtc1 $at, $f0
|
||||
/* 9AB79C 802433AC 4600110D */ trunc.w.s $f4, $f2
|
||||
/* 9AB7A0 802433B0 44022000 */ mfc1 $v0, $f4
|
||||
/* 9AB7A4 802433B4 E6000018 */ swc1 $f0, 0x18($s0)
|
||||
/* 9AB7A8 802433B8 A6220010 */ sh $v0, 0x10($s1)
|
||||
/* 9AB7AC 802433BC C600003C */ lwc1 $f0, 0x3c($s0)
|
||||
/* 9AB7B0 802433C0 240502C1 */ addiu $a1, $zero, 0x2c1
|
||||
/* 9AB7B4 802433C4 4600010D */ trunc.w.s $f4, $f0
|
||||
/* 9AB7B8 802433C8 44022000 */ mfc1 $v0, $f4
|
||||
/* 9AB7BC 802433CC 00000000 */ nop
|
||||
/* 9AB7C0 802433D0 A6220012 */ sh $v0, 0x12($s1)
|
||||
/* 9AB7C4 802433D4 C6000040 */ lwc1 $f0, 0x40($s0)
|
||||
/* 9AB7C8 802433D8 24020001 */ addiu $v0, $zero, 1
|
||||
/* 9AB7CC 802433DC A2220007 */ sb $v0, 7($s1)
|
||||
/* 9AB7D0 802433E0 4600010D */ trunc.w.s $f4, $f0
|
||||
/* 9AB7D4 802433E4 44022000 */ mfc1 $v0, $f4
|
||||
/* 9AB7D8 802433E8 0C012530 */ jal ai_enemy_play_sound
|
||||
/* 9AB7DC 802433EC A6220014 */ sh $v0, 0x14($s1)
|
||||
/* 9AB7E0 802433F0 C60C0038 */ lwc1 $f12, 0x38($s0)
|
||||
/* 9AB7E4 802433F4 8E420000 */ lw $v0, ($s2)
|
||||
/* 9AB7E8 802433F8 C60E0040 */ lwc1 $f14, 0x40($s0)
|
||||
/* 9AB7EC 802433FC 8C460028 */ lw $a2, 0x28($v0)
|
||||
/* 9AB7F0 80243400 0C00A720 */ jal atan2
|
||||
/* 9AB7F4 80243404 8C470030 */ lw $a3, 0x30($v0)
|
||||
/* 9AB7F8 80243408 2402000C */ addiu $v0, $zero, 0xc
|
||||
/* 9AB7FC 8024340C A602008E */ sh $v0, 0x8e($s0)
|
||||
/* 9AB800 80243410 2402000D */ addiu $v0, $zero, 0xd
|
||||
/* 9AB804 80243414 E600000C */ swc1 $f0, 0xc($s0)
|
||||
/* 9AB808 80243418 AE620070 */ sw $v0, 0x70($s3)
|
||||
/* 9AB80C 8024341C 8FBF0020 */ lw $ra, 0x20($sp)
|
||||
/* 9AB810 80243420 8FB3001C */ lw $s3, 0x1c($sp)
|
||||
/* 9AB814 80243424 8FB20018 */ lw $s2, 0x18($sp)
|
||||
/* 9AB818 80243428 8FB10014 */ lw $s1, 0x14($sp)
|
||||
/* 9AB81C 8024342C 8FB00010 */ lw $s0, 0x10($sp)
|
||||
/* 9AB820 80243430 03E00008 */ jr $ra
|
||||
/* 9AB824 80243434 27BD0028 */ addiu $sp, $sp, 0x28
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80243438_9AB828
|
||||
/* 9AB828 80243438 27BDFFE0 */ addiu $sp, $sp, -0x20
|
||||
/* 9AB82C 8024343C AFB20018 */ sw $s2, 0x18($sp)
|
||||
/* 9AB830 80243440 0080902D */ daddu $s2, $a0, $zero
|
||||
/* 9AB834 80243444 AFBF001C */ sw $ra, 0x1c($sp)
|
||||
/* 9AB838 80243448 AFB10014 */ sw $s1, 0x14($sp)
|
||||
/* 9AB83C 8024344C AFB00010 */ sw $s0, 0x10($sp)
|
||||
/* 9AB840 80243450 8E510148 */ lw $s1, 0x148($s2)
|
||||
/* 9AB844 80243454 0C00EABB */ jal get_npc_unsafe
|
||||
/* 9AB848 80243458 86240008 */ lh $a0, 8($s1)
|
||||
/* 9AB84C 8024345C 0040802D */ daddu $s0, $v0, $zero
|
||||
/* 9AB850 80243460 C602001C */ lwc1 $f2, 0x1c($s0)
|
||||
/* 9AB854 80243464 C6000014 */ lwc1 $f0, 0x14($s0)
|
||||
/* 9AB858 80243468 8E050018 */ lw $a1, 0x18($s0)
|
||||
/* 9AB85C 8024346C 46001080 */ add.s $f2, $f2, $f0
|
||||
/* 9AB860 80243470 C600003C */ lwc1 $f0, 0x3c($s0)
|
||||
/* 9AB864 80243474 8E06000C */ lw $a2, 0xc($s0)
|
||||
/* 9AB868 80243478 46020000 */ add.s $f0, $f0, $f2
|
||||
/* 9AB86C 8024347C 0200202D */ daddu $a0, $s0, $zero
|
||||
/* 9AB870 80243480 E602001C */ swc1 $f2, 0x1c($s0)
|
||||
/* 9AB874 80243484 0C00EA95 */ jal npc_move_heading
|
||||
/* 9AB878 80243488 E600003C */ swc1 $f0, 0x3c($s0)
|
||||
/* 9AB87C 8024348C 9602008E */ lhu $v0, 0x8e($s0)
|
||||
/* 9AB880 80243490 2442FFFF */ addiu $v0, $v0, -1
|
||||
/* 9AB884 80243494 A602008E */ sh $v0, 0x8e($s0)
|
||||
/* 9AB888 80243498 00021400 */ sll $v0, $v0, 0x10
|
||||
/* 9AB88C 8024349C 1C40000F */ bgtz $v0, .L802434DC
|
||||
/* 9AB890 802434A0 00000000 */ nop
|
||||
/* 9AB894 802434A4 3C013E99 */ lui $at, 0x3e99
|
||||
/* 9AB898 802434A8 3421999A */ ori $at, $at, 0x999a
|
||||
/* 9AB89C 802434AC 44810000 */ mtc1 $at, $f0
|
||||
/* 9AB8A0 802434B0 3C014040 */ lui $at, 0x4040
|
||||
/* 9AB8A4 802434B4 44811000 */ mtc1 $at, $f2
|
||||
/* 9AB8A8 802434B8 A2200007 */ sb $zero, 7($s1)
|
||||
/* 9AB8AC 802434BC AE00001C */ sw $zero, 0x1c($s0)
|
||||
/* 9AB8B0 802434C0 E6000014 */ swc1 $f0, 0x14($s0)
|
||||
/* 9AB8B4 802434C4 E6020018 */ swc1 $f2, 0x18($s0)
|
||||
/* 9AB8B8 802434C8 8E2200CC */ lw $v0, 0xcc($s1)
|
||||
/* 9AB8BC 802434CC 8C420028 */ lw $v0, 0x28($v0)
|
||||
/* 9AB8C0 802434D0 AE020028 */ sw $v0, 0x28($s0)
|
||||
/* 9AB8C4 802434D4 2402000E */ addiu $v0, $zero, 0xe
|
||||
/* 9AB8C8 802434D8 AE420070 */ sw $v0, 0x70($s2)
|
||||
.L802434DC:
|
||||
/* 9AB8CC 802434DC 8FBF001C */ lw $ra, 0x1c($sp)
|
||||
/* 9AB8D0 802434E0 8FB20018 */ lw $s2, 0x18($sp)
|
||||
/* 9AB8D4 802434E4 8FB10014 */ lw $s1, 0x14($sp)
|
||||
/* 9AB8D8 802434E8 8FB00010 */ lw $s0, 0x10($sp)
|
||||
/* 9AB8DC 802434EC 03E00008 */ jr $ra
|
||||
/* 9AB8E0 802434F0 27BD0020 */ addiu $sp, $sp, 0x20
|
||||
Loading…
Reference in New Issue