summaryrefslogtreecommitdiff
path: root/src/code_0805436C.c
diff options
context:
space:
mode:
authorTal Hayon <talhayon1@gmail.com>2022-02-14 22:35:58 +0200
committerTal Hayon <talhayon1@gmail.com>2022-02-14 22:35:58 +0200
commit35c6989914e84e67b19fcdc78b5ddb15eeed7e8f (patch)
tree4f91f97e6c302b93524e88a7c84c92c4c7fb8784 /src/code_0805436C.c
parentcaa11c47ef61f2b15f677e07639545723b9bc0b3 (diff)
match sub_08054524
Diffstat (limited to 'src/code_0805436C.c')
-rw-r--r--src/code_0805436C.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/code_0805436C.c b/src/code_0805436C.c
index 452c2ddf..699feeb1 100644
--- a/src/code_0805436C.c
+++ b/src/code_0805436C.c
@@ -165,8 +165,7 @@ u32 GetBottleContaining(u32 id) {
}
}
-NONMATCH("asm/non_matching/sub_08054524.inc", void sub_08054524(void)) {
- // reg-alloc
+void sub_08054524(void) {
u32 bVar1;
bVar1 = gArea.locationIndex;
@@ -177,9 +176,9 @@ NONMATCH("asm/non_matching/sub_08054524.inc", void sub_08054524(void)) {
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) {
gRoomVars.field_0x2 = 1;