summaryrefslogtreecommitdiff
path: root/asm/party_menu.s
diff options
context:
space:
mode:
authorCameron Hall <camthesaxman@users.noreply.github.com>2016-11-19 00:36:57 -0600
committerYamaArashi <YamaArashi@users.noreply.github.com>2016-11-18 22:36:57 -0800
commitc84d788ebfb4ff0f1a3dd1cf6ce820c403fbf169 (patch)
tree989233a4ce3a447980ae1787a37ec3e8c41ddeb5 /asm/party_menu.s
parent2405562993bcc4f3eda613b0fa443dd94573c5ab (diff)
decompile field_camera.c (#103)
* start decompiling field_camera.c * can't get CameraUpdate to match * finish decompiling
Diffstat (limited to 'asm/party_menu.s')
-rw-r--r--asm/party_menu.s28
1 files changed, 14 insertions, 14 deletions
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 26eab6b57..8f1d9d5b7 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -803,7 +803,7 @@ sub_806B548: @ 806B548
ldrb r3, [r4]
cmp r3, 0
beq _0806B56E
- ldr r1, _0806B57C @ =gBG2TilemapBuffer
+ ldr r1, _0806B57C @ =gBGTilemapBuffers + 0x1000
ldr r2, _0806B580 @ =0x06003000
ldr r0, _0806B584 @ =0x040000d4
str r1, [r0]
@@ -822,7 +822,7 @@ _0806B56E:
.align 2, 0
_0806B574: .4byte 0x0201b000
_0806B578: .4byte 0x00000261
-_0806B57C: .4byte gBG2TilemapBuffer
+_0806B57C: .4byte gBGTilemapBuffers + 0x1000
_0806B580: .4byte 0x06003000
_0806B584: .4byte 0x040000d4
_0806B588: .4byte 0x80000400
@@ -892,14 +892,14 @@ _0806B5F0:
.4byte _0806B8C6
.4byte _0806B8E8
_0806B614:
- ldr r0, _0806B624 @ =gBG2TilemapBuffer
+ ldr r0, _0806B624 @ =gBGTilemapBuffers + 0x1000
movs r2, 0x80
lsls r2, 4
movs r1, 0
bl memset
b _0806B900
.align 2, 0
-_0806B624: .4byte gBG2TilemapBuffer
+_0806B624: .4byte gBGTilemapBuffers + 0x1000
_0806B628:
ldrb r0, [r4]
ldrb r1, [r4, 0x1]
@@ -1269,7 +1269,7 @@ _0806B902:
thumb_func_start sub_806B908
sub_806B908: @ 806B908
push {r4,r5,lr}
- ldr r0, _0806B948 @ =gBG2TilemapBuffer
+ ldr r0, _0806B948 @ =gBGTilemapBuffers + 0x1000
movs r2, 0x80
lsls r2, 4
movs r1, 0
@@ -1297,7 +1297,7 @@ sub_806B908: @ 806B908
bl sub_806BA94
b _0806B964
.align 2, 0
-_0806B948: .4byte gBG2TilemapBuffer
+_0806B948: .4byte gBGTilemapBuffers + 0x1000
_0806B94C: .4byte gUnknown_0202E8FA
_0806B950: .4byte gUnknown_083769A8
_0806B954: .4byte gPlayerParty + 1 * 0x64
@@ -1372,7 +1372,7 @@ _0806B9CA:
lsls r0, r1, 5
ldr r4, [sp, 0x4]
adds r6, r4, r0
- ldr r0, _0806BA30 @ =gBG2TilemapBuffer
+ ldr r0, _0806BA30 @ =gBGTilemapBuffers + 0x1000
mov r12, r0
ldr r4, [sp]
lsls r5, r4, 12
@@ -1415,7 +1415,7 @@ _0806BA12:
bx r0
.align 2, 0
_0806BA2C: .4byte gUnknown_083769D8
-_0806BA30: .4byte gBG2TilemapBuffer
+_0806BA30: .4byte gBGTilemapBuffers + 0x1000
thumb_func_end sub_806B9A4
thumb_func_start sub_806BA34
@@ -1440,7 +1440,7 @@ _0806BA48:
lsls r0, r1, 5
mov r5, r8
adds r1, r5, r0
- ldr r6, _0806BA90 @ =gBG2TilemapBuffer
+ ldr r6, _0806BA90 @ =gBGTilemapBuffers + 0x1000
movs r5, 0
_0806BA5E:
adds r0, r3, r2
@@ -1470,7 +1470,7 @@ _0806BA7C:
pop {r0}
bx r0
.align 2, 0
-_0806BA90: .4byte gBG2TilemapBuffer
+_0806BA90: .4byte gBGTilemapBuffers + 0x1000
thumb_func_end sub_806BA34
thumb_func_start sub_806BA94
@@ -1515,7 +1515,7 @@ _0806BACC:
lsls r0, r1, 5
ldr r4, [sp, 0x4]
adds r6, r4, r0
- ldr r0, _0806BB38 @ =gBG2TilemapBuffer
+ ldr r0, _0806BB38 @ =gBGTilemapBuffers + 0x1000
mov r8, r0
ldr r4, [sp]
lsls r5, r4, 12
@@ -1560,7 +1560,7 @@ _0806BB16:
.align 2, 0
_0806BB30: .4byte gUnknown_08376A5E
_0806BB34: .4byte gUnknown_08376A25
-_0806BB38: .4byte gBG2TilemapBuffer
+_0806BB38: .4byte gBGTilemapBuffers + 0x1000
thumb_func_end sub_806BA94
thumb_func_start sub_806BB3C
@@ -1585,7 +1585,7 @@ _0806BB50:
lsls r0, r1, 5
mov r5, r8
adds r1, r5, r0
- ldr r6, _0806BB98 @ =gBG2TilemapBuffer
+ ldr r6, _0806BB98 @ =gBGTilemapBuffers + 0x1000
movs r5, 0
_0806BB66:
adds r0, r3, r2
@@ -1615,7 +1615,7 @@ _0806BB84:
pop {r0}
bx r0
.align 2, 0
-_0806BB98: .4byte gBG2TilemapBuffer
+_0806BB98: .4byte gBGTilemapBuffers + 0x1000
thumb_func_end sub_806BB3C
thumb_func_start sub_806BB9C