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

Decompile EU sub_08075ADC

This commit is contained in:
Tal Hayon 2022-01-03 08:29:21 +02:00
parent 0698806e00
commit 6e6517d287
2 changed files with 6 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
asm/non_matching/eu/sub_08075ADC.inc
View File

@ -1,58 +0,0 @@
.syntax unified
push {r4, r5, lr}
adds r4, r0, #0
adds r5, r1, #0
ldrb r1, [r4, #0xe]
movs r0, #1
ands r0, r1
cmp r0, #0
beq _08075532
ldr r0, _08075570 @ =gPlayerState
ldr r0, [r0, #0x30]
movs r1, #0x88
lsls r1, r1, #1
ands r0, r1
cmp r0, #0
bne _08075532
bl sub_08079D48
cmp r0, #0
bne _08075578
_08075532:
movs r0, #0
strb r0, [r4, #0xf]
ldrb r0, [r4, #4]
adds r0, #1
strb r0, [r4, #4]
ldr r3, _08075570 @ =gPlayerState
ldr r0, [r3, #0x30]
movs r1, #0x80
lsls r1, r1, #0x10
orrs r0, r1
str r0, [r3, #0x30]
movs r2, #8
asrs r2, r5
lsls r1, r2, #4
orrs r1, r2
ldrb r0, [r3, #4]
bics r0, r1
strb r0, [r3, #4]
mvns r2, r2
ldrb r1, [r3, #0xa]
adds r0, r2, #0
ands r0, r1
strb r0, [r3, #0xa]
ldrb r0, [r3, #0xb]
ands r2, r0
strb r2, [r3, #0xb]
ldr r0, _08075574 @ =0x0000013D
bl SoundReq
b _0807557E
.align 2, 0
_08075570: .4byte gPlayerState
_08075574: .4byte 0x0000013D
_08075578:
adds r0, r4, #0
bl UpdateItemAnim
_0807557E:
pop {r4, r5, pc}
.syntax divided

12
src/item/itemLantern.c
View File

@ -44,14 +44,15 @@ void sub_08075A0C(ItemBehavior* this, u32 arg1) {
} }
} }
#ifdef EU
ASM_FUNC("asm/non_matching/eu/sub_08075ADC.inc", void sub_08075ADC(ItemBehavior* this, u32 arg1))
#else
void sub_08075ADC(ItemBehavior* this, u32 arg1) { void sub_08075ADC(ItemBehavior* this, u32 arg1) {
u32 bVar1; u32 bVar1;
if (gPlayerState.item != NULL || (this->field_0x5[9] & 1) == 0 || if (
(gPlayerState.flags & (PL_DISABLE_ITEMS | PL_CAPTURED)) != 0 || sub_08079D48() == 0) { #ifndef EU
gPlayerState.item != NULL ||
#endif
(this->field_0x5[9] & 1) == 0 || (gPlayerState.flags & (PL_DISABLE_ITEMS | PL_CAPTURED)) != 0 ||
sub_08079D48() == 0) {
this->field_0xf = 0; this->field_0xf = 0;
this->stateID += 1; this->stateID += 1;
gPlayerState.flags |= PL_USE_LANTERN; gPlayerState.flags |= PL_USE_LANTERN;
@ -65,7 +66,6 @@ void sub_08075ADC(ItemBehavior* this, u32 arg1) {
UpdateItemAnim(this); UpdateItemAnim(this);
} }
} }
#endif
void sub_08075B54(ItemBehavior* this, u32 arg1) { void sub_08075B54(ItemBehavior* this, u32 arg1) {
u32 bVar1; u32 bVar1;