summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/playerItem/playerItemC.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/playerItem/playerItemC.c b/src/playerItem/playerItemC.c
index 2ae472d3..d223b637 100644
--- a/src/playerItem/playerItemC.c
+++ b/src/playerItem/playerItemC.c
@@ -31,10 +31,8 @@ void sub_0801B8B0(Entity* this) {
}
}
-NONMATCH("asm/non_matching/playerItemC/sub_0801B8FC.inc", void sub_0801B8FC(Entity* this)) {
+void sub_0801B8FC(Entity* this) {
Entity* pbVar1;
- u32 tmp;
-
pbVar1 = (Entity*)gPlayerState.field_0x2c;
if ((Entity*)gPlayerState.field_0x2c != this) {
DeleteThisEntity();
@@ -43,14 +41,12 @@ NONMATCH("asm/non_matching/playerItemC/sub_0801B8FC.inc", void sub_0801B8FC(Enti
gPlayerState.field_0x2c = (u8*)(u32)gPlayerState.field_0x1d[1];
DeleteThisEntity();
} else {
- // TODO regalloc
- gPlayerState.field_0x2c[0x10] |= 0x80;
+ pbVar1->flags |= 0x80;
pbVar1->field_0x3c = 0x21;
sub_0801B938(pbVar1);
}
}
}
-END_NONMATCH
ASM_FUNC("asm/non_matching/playerItemC/sub_0801B938.inc", void sub_0801B938(Entity* this))