diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-08-20 21:32:22 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-08-20 21:32:22 -0400 |
| commit | aa053f1948dcb03213105c63ed81f197909222c6 (patch) | |
| tree | 0e772b5fe11d262966bcd691cea91adf283681ac | |
| parent | e81986cd20dbe0d8a98da646d964310a066f1af5 (diff) | |
sub_80B33D0
| -rw-r--r-- | asm/shop.s | 40 | ||||
| -rw-r--r-- | src/shop.c | 9 |
2 files changed, 9 insertions, 40 deletions
diff --git a/asm/shop.s b/asm/shop.s index a341e90a1..8b4b0b00d 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -6,46 +6,6 @@ .text - thumb_func_start sub_80B33D0 -sub_80B33D0: @ 80B33D0 - push {r4-r6,lr} - mov r6, r8 - push {r6} - adds r6, r0, 0 - adds r4, r1, 0 - mov r8, r2 - lsls r4, 22 - ldr r5, _080B3418 @ =gBGTilemapBuffers + 0x1800 - lsls r6, 17 - asrs r6, 16 - movs r0, 0x80 - lsls r0, 15 - adds r4, r0 - asrs r4, 16 - adds r0, r5, 0 - adds r1, r6, 0 - adds r2, r4, 0 - mov r3, r8 - bl BuyMenuDrawMapMetatileLayer - ldr r0, _080B341C @ =0xfffff800 - adds r5, r0 - movs r0, 0x8 - add r8, r0 - adds r0, r5, 0 - adds r1, r6, 0 - adds r2, r4, 0 - mov r3, r8 - bl BuyMenuDrawMapMetatileLayer - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080B3418: .4byte gBGTilemapBuffers + 0x1800 -_080B341C: .4byte 0xfffff800 - thumb_func_end sub_80B33D0 - thumb_func_start sub_80B3420 sub_80B3420: @ 80B3420 push {r4-r7,lr} diff --git a/src/shop.c b/src/shop.c index d53646a88..5cc1f276e 100644 --- a/src/shop.c +++ b/src/shop.c @@ -340,3 +340,12 @@ void BuyMenuDrawMapMetatile(int var1, int var2, u16 *var3, s8 var4) break; } } + +void sub_80B33D0(s16 var1, int var2, u16 *var3) +{ + s16 offset1 = var1 * 2; + s16 offset2 = (var2 * 0x40) + 0x40; + + BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[3], offset1, offset2, var3); + BuyMenuDrawMapMetatileLayer(gBGTilemapBuffers[2], offset1, offset2, var3 + 4); +} |