falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

func_80240790_BBD930 (#697) 

* matched func_80240790_BBD930

* removed unncessary variables

* deleted matched assembly function

* changes from comments

* fixed
This commit is contained in:
Kevin Klions 2022-04-18 13:15:33 -04:00 committed by GitHub
parent d33a2407df
commit 13cc6f46e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common_structs.h
View File

@ -1219,7 +1219,7 @@ typedef struct ItemEntity {
/* 0x28 */ u32* savedReadPos;
/* 0x2C */ char unk_2C[2];
/* 0x2E */ u8 unkCounter;
/* 0x2F */ s8 unk_2F;
/* 0x2F */ u8 unk_2F;
/* 0x30 */ f32 scale;
/* 0x34 */ Vec3s unk_34;
/* 0x3A */ char unk_3A[2];

8
src/world/area_obk/obk_01/BBD1A0.c
View File

@ -21,4 +21,10 @@ INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_802406AC_BBD84C);
INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_80240730_BBD8D0);
INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_80240790_BBD930);
ApiStatus func_80240790_BBD930(Evt* script, s32 isInitialCall) {
ItemEntity* item = get_item_entity(script->varTable[0]);
set_item_entity_flags(script->varTable[0], 0x80000);
item->unk_2F = -1;
return ApiStatus_DONE2;
}

24
ver/us/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240790_BBD930.s
View File

@ -1,24 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240790_BBD930
/* BBD930 80240790 27BDFFE8 */ addiu $sp, $sp, -0x18
/* BBD934 80240794 AFB00010 */ sw $s0, 0x10($sp)
/* BBD938 80240798 0080802D */ daddu $s0, $a0, $zero
/* BBD93C 8024079C AFBF0014 */ sw $ra, 0x14($sp)
/* BBD940 802407A0 0C04C3D6 */ jal get_item_entity
/* BBD944 802407A4 8E040084 */ lw $a0, 0x84($s0)
/* BBD948 802407A8 8E040084 */ lw $a0, 0x84($s0)
/* BBD94C 802407AC 0040802D */ daddu $s0, $v0, $zero
/* BBD950 802407B0 0C04D052 */ jal set_item_entity_flags
/* BBD954 802407B4 3C050008 */ lui $a1, 8
/* BBD958 802407B8 240300FF */ addiu $v1, $zero, 0xff
/* BBD95C 802407BC A203002F */ sb $v1, 0x2f($s0)
/* BBD960 802407C0 8FBF0014 */ lw $ra, 0x14($sp)
/* BBD964 802407C4 8FB00010 */ lw $s0, 0x10($sp)
/* BBD968 802407C8 24020002 */ addiu $v0, $zero, 2
/* BBD96C 802407CC 03E00008 */ jr $ra
/* BBD970 802407D0 27BD0018 */ addiu $sp, $sp, 0x18
/* BBD974 802407D4 00000000 */ nop
/* BBD978 802407D8 00000000 */ nop
/* BBD97C 802407DC 00000000 */ nop