Merge pull request #231 from KDSKardabox/master

Player PC
2018-03-28 21:45:24 -07:00
parent d4c6ef7ae6 8ba626b3c4
commit a5cd6e8ef4
25 changed files with 1522 additions and 3565 deletions
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -15413,7 +15413,7 @@ sub_81B8448: @ 81B8448
 	str r0, [sp]
 	ldr r0, =sub_81B1370
 	str r0, [sp, 0x4]
-	ldr r0, =sub_816BB28
+	ldr r0, =Mailbox_ReturnToMailListAfterDeposit
 	str r0, [sp, 0x8]
 	movs r0, 0
 	movs r1, 0
@@ -15442,7 +15442,7 @@ sub_81B8474: @ 81B8474
 	movs r0, 0
 	strb r0, [r1]
 	ldr r2, =gSaveBlock1Ptr
-	ldr r0, =gUnknown_0203BCB8
+	ldr r0, =playerPCItemPageInfo
 	ldrh r1, [r0]
 	adds r1, 0x6
 	ldrh r0, [r0, 0x2]
--- a/asm/player_pc.s
+++ b/asm/player_pc.s
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -20753,7 +20753,7 @@ sub_81D1C84: @ 81D1C84
 	ldr r0, [r0, 0x10]
 	str r0, [sp]
 	str r1, [sp, 0x4]
-	ldr r0, =gUnknown_085DFF04
+	ldr r0, =gMailboxMailOptions
 	movs r1, 0x4
 	bl GetMaxWidthInMenuTable
 	lsls r0, 24