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

match sub_08054524

This commit is contained in:
Tal Hayon 2022-02-14 22:35:58 +02:00
parent caa11c47ef
commit 35c6989914
2 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
asm/non_matching/sub_08054524.inc
View File

@ -1,31 +0,0 @@
.syntax unified
push {lr}
ldr r0, _08054550 @ =gArea
ldrb r1, [r0, #1]
cmp r1, #0
bne _08054534
ldr r0, _08054554 @ =gRoomTransition
adds r0, #0x2e
ldrb r1, [r0]
_08054534:
cmp r1, #0x16
bls _0805453A
movs r1, #0
_0805453A:
ldr r0, _08054558 @ =gUnk_080FE1C6
adds r0, r1, r0
ldrb r1, [r0]
lsls r0, r1, #5
ldr r1, _0805455C @ =gAreaDroptables
adds r0, r0, r1
ldr r1, _08054560 @ =gRoomVars+0x48
movs r2, #0x20
bl MemCopy
pop {pc}
.align 2, 0
_08054550: .4byte gArea
_08054554: .4byte gRoomTransition
_08054558: .4byte gUnk_080FE1C6
_0805455C: .4byte gAreaDroptables
_08054560: .4byte gRoomVars+0x48
.syntax divided

7
src/code_0805436C.c
View File

@ -165,8 +165,7 @@ u32 GetBottleContaining(u32 id) {
} }
} }
NONMATCH("asm/non_matching/sub_08054524.inc", void sub_08054524(void)) { void sub_08054524(void) {
// reg-alloc
u32 bVar1; u32 bVar1;
bVar1 = gArea.locationIndex; bVar1 = gArea.locationIndex;
@ -177,9 +176,9 @@ NONMATCH("asm/non_matching/sub_08054524.inc", void sub_08054524(void)) {
bVar1 = 0; bVar1 = 0;
} }
MemCopy(&gAreaDroptables[0] + gUnk_080FE1C6[bVar1] * 0x8, &gRoomVars.currentAreaDroptable, 0x20); bVar1 = gUnk_080FE1C6[bVar1];
MemCopy(&gAreaDroptables[bVar1], &gRoomVars.currentAreaDroptable, 0x20);
} }
END_NONMATCH
void sub_08054564(void) { void sub_08054564(void) {
gRoomVars.field_0x2 = 1; gRoomVars.field_0x2 = 1;