Merge pull request #507 from hatal175/sub_08080C80

This commit is contained in:
notyourav 2022-04-30 12:58:47 -07:00 committed by GitHub
commit 51e67d2fc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 23 deletions

View File

@ -1,22 +0,0 @@
.syntax unified
push {r4, lr}
bl sub_080197D4
ldr r0, _08080CA8 @ =gMapDataBottom
ldr r4, _08080CAC @ =gRoomControls
ldrh r1, [r4, #0x1e]
lsrs r1, r1, #4
ldrh r2, [r4, #0x20]
lsrs r2, r2, #4
bl sub_0807C8B0
ldr r0, _08080CB0 @ =gMapDataTop
ldrh r1, [r4, #0x1e]
lsrs r1, r1, #4
ldrh r2, [r4, #0x20]
lsrs r2, r2, #4
bl sub_0807C8B0
pop {r4, pc}
.align 2, 0
_08080CA8: .4byte gMapDataBottom
_08080CAC: .4byte gRoomControls
_08080CB0: .4byte gMapDataTop
.syntax divided

View File

@ -617,6 +617,10 @@ ASM_FUNC("asm/non_matching/scroll/sub_08080B60.inc", void sub_08080B60(u8* param
ASM_FUNC("asm/non_matching/scroll/sub_08080BC4.inc", void sub_08080BC4())
ASM_FUNC("asm/non_matching/scroll/sub_08080C80.inc", void sub_08080C80(u32* param_1))
void sub_08080C80(u32* param_1) {
sub_080197D4(param_1);
sub_0807C8B0(gMapDataBottom, gRoomControls.width >> 4, gRoomControls.height >> 4);
sub_0807C8B0(gMapDataTop, gRoomControls.width >> 4, gRoomControls.height >> 4);
}
ASM_FUNC("asm/non_matching/scroll/sub_08080CB4.inc", void sub_08080CB4(Entity* a))