pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 17:02:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

GetEntityPosition

Browse Source
This commit is contained in:
Ethan Roseman 2021-01-02 17:09:40 +09:00
parent a0d1324d2c
commit 70857a74b6
12 changed files with 9 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/nonmatchings/battle/area_omo/512AB0/func_80218A98_513068.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at .set noat # allow manual use of $at
.set noreorder # don't insert nops after branches .set noreorder # don't insert nops after branches
glabel func_80218A98_513068 glabel area_omo_GetEntityPosition
/* 513068 80218A98 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 513068 80218A98 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 51306C 80218A9C AFB20018 */ sw $s2, 0x18($sp) /* 51306C 80218A9C AFB20018 */ sw $s2, 0x18($sp)
/* 513070 80218AA0 0080902D */ daddu $s2, $a0, $zero /* 513070 80218AA0 0080902D */ daddu $s2, $a0, $zero

44
asm/nonmatchings/world/area_dgb/dgb_15/C50CA0/func_80241790_C50CA0.s
View File

@ -1,44 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80241790_C50CA0
/* C50CA0 80241790 27BDFFE0 */ addiu $sp, $sp, -0x20
/* C50CA4 80241794 AFB20018 */ sw $s2, 0x18($sp)
/* C50CA8 80241798 0080902D */ daddu $s2, $a0, $zero
/* C50CAC 8024179C AFBF001C */ sw $ra, 0x1c($sp)
/* C50CB0 802417A0 AFB10014 */ sw $s1, 0x14($sp)
/* C50CB4 802417A4 AFB00010 */ sw $s0, 0x10($sp)
/* C50CB8 802417A8 8E50000C */ lw $s0, 0xc($s2)
/* C50CBC 802417AC 8E050000 */ lw $a1, ($s0)
/* C50CC0 802417B0 0C0B1EAF */ jal get_variable
/* C50CC4 802417B4 26100004 */ addiu $s0, $s0, 4
/* C50CC8 802417B8 0C04417A */ jal get_entity_by_index
/* C50CCC 802417BC 0040202D */ daddu $a0, $v0, $zero
/* C50CD0 802417C0 8E050000 */ lw $a1, ($s0)
/* C50CD4 802417C4 26100004 */ addiu $s0, $s0, 4
/* C50CD8 802417C8 0040882D */ daddu $s1, $v0, $zero
/* C50CDC 802417CC C6200048 */ lwc1 $f0, 0x48($s1)
/* C50CE0 802417D0 4600008D */ trunc.w.s $f2, $f0
/* C50CE4 802417D4 44061000 */ mfc1 $a2, $f2
/* C50CE8 802417D8 0C0B2026 */ jal set_variable
/* C50CEC 802417DC 0240202D */ daddu $a0, $s2, $zero
/* C50CF0 802417E0 8E050000 */ lw $a1, ($s0)
/* C50CF4 802417E4 26100004 */ addiu $s0, $s0, 4
/* C50CF8 802417E8 C620004C */ lwc1 $f0, 0x4c($s1)
/* C50CFC 802417EC 4600008D */ trunc.w.s $f2, $f0
/* C50D00 802417F0 44061000 */ mfc1 $a2, $f2
/* C50D04 802417F4 0C0B2026 */ jal set_variable
/* C50D08 802417F8 0240202D */ daddu $a0, $s2, $zero
/* C50D0C 802417FC C6200050 */ lwc1 $f0, 0x50($s1)
/* C50D10 80241800 8E050000 */ lw $a1, ($s0)
/* C50D14 80241804 4600008D */ trunc.w.s $f2, $f0
/* C50D18 80241808 44061000 */ mfc1 $a2, $f2
/* C50D1C 8024180C 0C0B2026 */ jal set_variable
/* C50D20 80241810 0240202D */ daddu $a0, $s2, $zero
/* C50D24 80241814 8FBF001C */ lw $ra, 0x1c($sp)
/* C50D28 80241818 8FB20018 */ lw $s2, 0x18($sp)
/* C50D2C 8024181C 8FB10014 */ lw $s1, 0x14($sp)
/* C50D30 80241820 8FB00010 */ lw $s0, 0x10($sp)
/* C50D34 80241824 24020002 */ addiu $v0, $zero, 2
/* C50D38 80241828 03E00008 */ jr $ra
/* C50D3C 8024182C 27BD0020 */ addiu $sp, $sp, 0x20

47
asm/nonmatchings/world/area_kpa/kpa_60/A6CB00/func_80240034_A6CB34.s
View File

@ -1,47 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240034_A6CB34
/* A6CB34 80240034 27BDFFE0 */ addiu $sp, $sp, -0x20
/* A6CB38 80240038 AFB20018 */ sw $s2, 0x18($sp)
/* A6CB3C 8024003C 0080902D */ daddu $s2, $a0, $zero
/* A6CB40 80240040 AFBF001C */ sw $ra, 0x1c($sp)
/* A6CB44 80240044 AFB10014 */ sw $s1, 0x14($sp)
/* A6CB48 80240048 AFB00010 */ sw $s0, 0x10($sp)
/* A6CB4C 8024004C 8E50000C */ lw $s0, 0xc($s2)
/* A6CB50 80240050 8E050000 */ lw $a1, ($s0)
/* A6CB54 80240054 0C0B1EAF */ jal get_variable
/* A6CB58 80240058 26100004 */ addiu $s0, $s0, 4
/* A6CB5C 8024005C 0C04417A */ jal get_entity_by_index
/* A6CB60 80240060 0040202D */ daddu $a0, $v0, $zero
/* A6CB64 80240064 8E050000 */ lw $a1, ($s0)
/* A6CB68 80240068 26100004 */ addiu $s0, $s0, 4
/* A6CB6C 8024006C 0040882D */ daddu $s1, $v0, $zero
/* A6CB70 80240070 C6200048 */ lwc1 $f0, 0x48($s1)
/* A6CB74 80240074 4600008D */ trunc.w.s $f2, $f0
/* A6CB78 80240078 44061000 */ mfc1 $a2, $f2
/* A6CB7C 8024007C 0C0B2026 */ jal set_variable
/* A6CB80 80240080 0240202D */ daddu $a0, $s2, $zero
/* A6CB84 80240084 8E050000 */ lw $a1, ($s0)
/* A6CB88 80240088 26100004 */ addiu $s0, $s0, 4
/* A6CB8C 8024008C C620004C */ lwc1 $f0, 0x4c($s1)
/* A6CB90 80240090 4600008D */ trunc.w.s $f2, $f0
/* A6CB94 80240094 44061000 */ mfc1 $a2, $f2
/* A6CB98 80240098 0C0B2026 */ jal set_variable
/* A6CB9C 8024009C 0240202D */ daddu $a0, $s2, $zero
/* A6CBA0 802400A0 C6200050 */ lwc1 $f0, 0x50($s1)
/* A6CBA4 802400A4 8E050000 */ lw $a1, ($s0)
/* A6CBA8 802400A8 4600008D */ trunc.w.s $f2, $f0
/* A6CBAC 802400AC 44061000 */ mfc1 $a2, $f2
/* A6CBB0 802400B0 0C0B2026 */ jal set_variable
/* A6CBB4 802400B4 0240202D */ daddu $a0, $s2, $zero
/* A6CBB8 802400B8 8FBF001C */ lw $ra, 0x1c($sp)
/* A6CBBC 802400BC 8FB20018 */ lw $s2, 0x18($sp)
/* A6CBC0 802400C0 8FB10014 */ lw $s1, 0x14($sp)
/* A6CBC4 802400C4 8FB00010 */ lw $s0, 0x10($sp)
/* A6CBC8 802400C8 24020002 */ addiu $v0, $zero, 2
/* A6CBCC 802400CC 03E00008 */ jr $ra
/* A6CBD0 802400D0 27BD0020 */ addiu $sp, $sp, 0x20
/* A6CBD4 802400D4 00000000 */ nop
/* A6CBD8 802400D8 00000000 */ nop
/* A6CBDC 802400DC 00000000 */ nop

47
asm/nonmatchings/world/area_kpa/kpa_62/A72220/func_80240034_A72254.s
View File

@ -1,47 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240034_A72254
/* A72254 80240034 27BDFFE0 */ addiu $sp, $sp, -0x20
/* A72258 80240038 AFB20018 */ sw $s2, 0x18($sp)
/* A7225C 8024003C 0080902D */ daddu $s2, $a0, $zero
/* A72260 80240040 AFBF001C */ sw $ra, 0x1c($sp)
/* A72264 80240044 AFB10014 */ sw $s1, 0x14($sp)
/* A72268 80240048 AFB00010 */ sw $s0, 0x10($sp)
/* A7226C 8024004C 8E50000C */ lw $s0, 0xc($s2)
/* A72270 80240050 8E050000 */ lw $a1, ($s0)
/* A72274 80240054 0C0B1EAF */ jal get_variable
/* A72278 80240058 26100004 */ addiu $s0, $s0, 4
/* A7227C 8024005C 0C04417A */ jal get_entity_by_index
/* A72280 80240060 0040202D */ daddu $a0, $v0, $zero
/* A72284 80240064 8E050000 */ lw $a1, ($s0)
/* A72288 80240068 26100004 */ addiu $s0, $s0, 4
/* A7228C 8024006C 0040882D */ daddu $s1, $v0, $zero
/* A72290 80240070 C6200048 */ lwc1 $f0, 0x48($s1)
/* A72294 80240074 4600008D */ trunc.w.s $f2, $f0
/* A72298 80240078 44061000 */ mfc1 $a2, $f2
/* A7229C 8024007C 0C0B2026 */ jal set_variable
/* A722A0 80240080 0240202D */ daddu $a0, $s2, $zero
/* A722A4 80240084 8E050000 */ lw $a1, ($s0)
/* A722A8 80240088 26100004 */ addiu $s0, $s0, 4
/* A722AC 8024008C C620004C */ lwc1 $f0, 0x4c($s1)
/* A722B0 80240090 4600008D */ trunc.w.s $f2, $f0
/* A722B4 80240094 44061000 */ mfc1 $a2, $f2
/* A722B8 80240098 0C0B2026 */ jal set_variable
/* A722BC 8024009C 0240202D */ daddu $a0, $s2, $zero
/* A722C0 802400A0 C6200050 */ lwc1 $f0, 0x50($s1)
/* A722C4 802400A4 8E050000 */ lw $a1, ($s0)
/* A722C8 802400A8 4600008D */ trunc.w.s $f2, $f0
/* A722CC 802400AC 44061000 */ mfc1 $a2, $f2
/* A722D0 802400B0 0C0B2026 */ jal set_variable
/* A722D4 802400B4 0240202D */ daddu $a0, $s2, $zero
/* A722D8 802400B8 8FBF001C */ lw $ra, 0x1c($sp)
/* A722DC 802400BC 8FB20018 */ lw $s2, 0x18($sp)
/* A722E0 802400C0 8FB10014 */ lw $s1, 0x14($sp)
/* A722E4 802400C4 8FB00010 */ lw $s0, 0x10($sp)
/* A722E8 802400C8 24020002 */ addiu $v0, $zero, 2
/* A722EC 802400CC 03E00008 */ jr $ra
/* A722F0 802400D0 27BD0020 */ addiu $sp, $sp, 0x20
/* A722F4 802400D4 00000000 */ nop
/* A722F8 802400D8 00000000 */ nop
/* A722FC 802400DC 00000000 */ nop

45
asm/nonmatchings/world/area_pra/pra_02/D50010/func_802415BC_D515AC.s
View File

@ -1,45 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802415BC_D515AC
/* D515AC 802415BC 27BDFFE0 */ addiu $sp, $sp, -0x20
/* D515B0 802415C0 AFB20018 */ sw $s2, 0x18($sp)
/* D515B4 802415C4 0080902D */ daddu $s2, $a0, $zero
/* D515B8 802415C8 AFBF001C */ sw $ra, 0x1c($sp)
/* D515BC 802415CC AFB10014 */ sw $s1, 0x14($sp)
/* D515C0 802415D0 AFB00010 */ sw $s0, 0x10($sp)
/* D515C4 802415D4 8E50000C */ lw $s0, 0xc($s2)
/* D515C8 802415D8 8E050000 */ lw $a1, ($s0)
/* D515CC 802415DC 0C0B1EAF */ jal get_variable
/* D515D0 802415E0 26100004 */ addiu $s0, $s0, 4
/* D515D4 802415E4 0C04417A */ jal get_entity_by_index
/* D515D8 802415E8 0040202D */ daddu $a0, $v0, $zero
/* D515DC 802415EC 8E050000 */ lw $a1, ($s0)
/* D515E0 802415F0 26100004 */ addiu $s0, $s0, 4
/* D515E4 802415F4 0040882D */ daddu $s1, $v0, $zero
/* D515E8 802415F8 C6200048 */ lwc1 $f0, 0x48($s1)
/* D515EC 802415FC 4600008D */ trunc.w.s $f2, $f0
/* D515F0 80241600 44061000 */ mfc1 $a2, $f2
/* D515F4 80241604 0C0B2026 */ jal set_variable
/* D515F8 80241608 0240202D */ daddu $a0, $s2, $zero
/* D515FC 8024160C 8E050000 */ lw $a1, ($s0)
/* D51600 80241610 26100004 */ addiu $s0, $s0, 4
/* D51604 80241614 C620004C */ lwc1 $f0, 0x4c($s1)
/* D51608 80241618 4600008D */ trunc.w.s $f2, $f0
/* D5160C 8024161C 44061000 */ mfc1 $a2, $f2
/* D51610 80241620 0C0B2026 */ jal set_variable
/* D51614 80241624 0240202D */ daddu $a0, $s2, $zero
/* D51618 80241628 C6200050 */ lwc1 $f0, 0x50($s1)
/* D5161C 8024162C 8E050000 */ lw $a1, ($s0)
/* D51620 80241630 4600008D */ trunc.w.s $f2, $f0
/* D51624 80241634 44061000 */ mfc1 $a2, $f2
/* D51628 80241638 0C0B2026 */ jal set_variable
/* D5162C 8024163C 0240202D */ daddu $a0, $s2, $zero
/* D51630 80241640 8FBF001C */ lw $ra, 0x1c($sp)
/* D51634 80241644 8FB20018 */ lw $s2, 0x18($sp)
/* D51638 80241648 8FB10014 */ lw $s1, 0x14($sp)
/* D5163C 8024164C 8FB00010 */ lw $s0, 0x10($sp)
/* D51640 80241650 24020002 */ addiu $v0, $zero, 2
/* D51644 80241654 03E00008 */ jr $ra
/* D51648 80241658 27BD0020 */ addiu $sp, $sp, 0x20
/* D5164C 8024165C 00000000 */ nop

38
asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240D44_882F04.s
View File

@ -1,38 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240D44_882F04
/* 882F04 80240D44 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 882F08 80240D48 AFB10014 */ sw $s1, 0x14($sp)
/* 882F0C 80240D4C 0080882D */ daddu $s1, $a0, $zero
/* 882F10 80240D50 AFBF0018 */ sw $ra, 0x18($sp)
/* 882F14 80240D54 AFB00010 */ sw $s0, 0x10($sp)
/* 882F18 80240D58 8E300148 */ lw $s0, 0x148($s1)
/* 882F1C 80240D5C 0C00EABB */ jal get_npc_unsafe
/* 882F20 80240D60 86040008 */ lh $a0, 8($s0)
/* 882F24 80240D64 0040202D */ daddu $a0, $v0, $zero
/* 882F28 80240D68 9482008E */ lhu $v0, 0x8e($a0)
/* 882F2C 80240D6C 24030003 */ addiu $v1, $zero, 3
/* 882F30 80240D70 24420001 */ addiu $v0, $v0, 1
/* 882F34 80240D74 A482008E */ sh $v0, 0x8e($a0)
/* 882F38 80240D78 00021400 */ sll $v0, $v0, 0x10
/* 882F3C 80240D7C 00021403 */ sra $v0, $v0, 0x10
/* 882F40 80240D80 14430003 */ bne $v0, $v1, .L80240D90
/* 882F44 80240D84 00000000 */ nop
/* 882F48 80240D88 96020086 */ lhu $v0, 0x86($s0)
/* 882F4C 80240D8C A48200A8 */ sh $v0, 0xa8($a0)
.L80240D90:
/* 882F50 80240D90 8482008E */ lh $v0, 0x8e($a0)
/* 882F54 80240D94 8E030080 */ lw $v1, 0x80($s0)
/* 882F58 80240D98 0043102A */ slt $v0, $v0, $v1
/* 882F5C 80240D9C 14400004 */ bnez $v0, .L80240DB0
/* 882F60 80240DA0 00000000 */ nop
/* 882F64 80240DA4 96020086 */ lhu $v0, 0x86($s0)
/* 882F68 80240DA8 A48200A8 */ sh $v0, 0xa8($a0)
/* 882F6C 80240DAC AE200070 */ sw $zero, 0x70($s1)
.L80240DB0:
/* 882F70 80240DB0 8FBF0018 */ lw $ra, 0x18($sp)
/* 882F74 80240DB4 8FB10014 */ lw $s1, 0x14($sp)
/* 882F78 80240DB8 8FB00010 */ lw $s0, 0x10($sp)
/* 882F7C 80240DBC 03E00008 */ jr $ra
/* 882F80 80240DC0 27BD0020 */ addiu $sp, $sp, 0x20

2
asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s
View File

@ -250,7 +250,7 @@ glabel func_80240DC4_882F84
/* 883310 80241150 00000000 */ nop /* 883310 80241150 00000000 */ nop
.L80241154: .L80241154:
/* 883314 80241154 0280282D */ daddu $a1, $s4, $zero /* 883314 80241154 0280282D */ daddu $a1, $s4, $zero
/* 883318 80241158 0C090351 */ jal func_80240D44_882F04 /* 883318 80241158 0C090351 */ jal tik_09_set_script_owner_npc_col_height
/* 88331C 8024115C 02A0302D */ daddu $a2, $s5, $zero /* 88331C 8024115C 02A0302D */ daddu $a2, $s5, $zero
/* 883320 80241160 0809045C */ j .L80241170 /* 883320 80241160 0809045C */ j .L80241170
/* 883324 80241164 00000000 */ nop /* 883324 80241164 00000000 */ nop

2
src/world/area_dgb/dgb_15/C50CA0.c
View File

@ -1,5 +1,5 @@
#include "dgb_15.h" #include "dgb_15.h"
INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C50CA0", func_80241790_C50CA0); #include "world/common/GetEntityPosition.inc.c"
#include "world/common/SetEntityFlags100000.inc.c" #include "world/common/SetEntityFlags100000.inc.c"

2
src/world/area_kpa/kpa_60/A6CB00.c
View File

@ -2,4 +2,4 @@
#include "world/common/SetEntityFlags100000.inc.c" #include "world/common/SetEntityFlags100000.inc.c"
INCLUDE_ASM(s32, "world/area_kpa/kpa_60/A6CB00", func_80240034_A6CB34); #include "world/common/GetEntityPosition.inc.c"

2
src/world/area_kpa/kpa_62/A72220.c
View File

@ -2,4 +2,4 @@
#include "world/common/SetEntityFlags100000.inc.c" #include "world/common/SetEntityFlags100000.inc.c"
INCLUDE_ASM(s32, "world/area_kpa/kpa_62/A72220", func_80240034_A72254); #include "world/common/GetEntityPosition.inc.c"

7
src/world/area_pra/pra_02/D50010.c
View File

@ -48,7 +48,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802414A8_D51498);
#include "world/common/SetEntityFlags100000.inc.c" #include "world/common/SetEntityFlags100000.inc.c"
// #include "world/common/GetEntityPosition.inc.c" #define NAMESPACE dup_pra_02
// This is GetEntityPosition, but it alreaxy exists in this file. #include "world/common/GetEntityPosition.inc.c"
// This makes me think there's either a file split or something else we don't understand #define NAMESPACE pra_02
INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802415BC_D515AC);

2
src/world/area_tik/tik_09/882BF0.c
View File

@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240AAC_882C6C);
#include "world/common/UnkNpcAIFunc12.inc.c" #include "world/common/UnkNpcAIFunc12.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240D44_882F04); #include "world/common/set_script_owner_npc_col_height.inc.c"
INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240DC4_882F84); INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240DC4_882F84);