diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-11-22 10:42:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 10:42:31 -0500 |
| commit | 548490c675f68dfacf4d1939486c47d8405dddd8 (patch) | |
| tree | 9d21e9bb940cfb6b03c51b23986f3d7503333562 /asm | |
| parent | 2d284654440cb77365639bf107c31b44326362e3 (diff) | |
| parent | 04272c51df9f2ef08219cb6c3e03d3242c709803 (diff) | |
Merge pull request #163 from PikalaxALT/dism_more_data
Data dism: item_menu, link_rfu_2, union_room_chat
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/link_rfu_2.s | 4 | ||||
| -rw-r--r-- | asm/union_room_chat.s | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/asm/link_rfu_2.s b/asm/link_rfu_2.s index 8f896ea7c..c1582c4e4 100644 --- a/asm/link_rfu_2.s +++ b/asm/link_rfu_2.s @@ -2308,7 +2308,7 @@ sub_80F9828: @ 80F9828 cmp r0, 0 beq _080F983E ldr r0, _080F984C @ =gUnknown_843ED94 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu.c" - ldr r1, _080F9850 @ =0x000005c1 + ldr r1, _080F9850 @ =0x000005c1 // 1473 ldr r2, _080F9854 @ =gUnknown_843EDC4 "Rfu.RfuFunc == NULL" movs r3, 0x1 bl AGBAssert @@ -3137,7 +3137,7 @@ Rfu_InitBlockSend: @ 80F9E60 cmp r6, 0xFC bls _080F9E7C ldr r0, _080F9EA8 @ =gUnknown_843ED94 "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu.c" - ldr r1, _080F9EAC @ =0x00000701 + ldr r1, _080F9EAC @ =0x00000701 // 1793 ldr r2, _080F9EB0 @ =gUnknown_843EDD8 "size<=252" movs r3, 0x1 bl AGBAssert diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s index ae5381dda..1a2b4951e 100644 --- a/asm/union_room_chat.s +++ b/asm/union_room_chat.s @@ -5660,7 +5660,7 @@ sub_812AF8C: @ 812AF8C push {r4,lr} adds r4, r0, 0 lsls r4, 2 - ldr r0, _0812AFB8 @ =gUnknown_845AC16 + ldr r0, _0812AFB8 @ =gUnknown_845AC14 + 2 adds r4, r0 movs r0, 0 bl IndexOfSpritePaletteTag @@ -5677,7 +5677,7 @@ sub_812AF8C: @ 812AF8C pop {r0} bx r0 .align 2, 0 -_0812AFB8: .4byte gUnknown_845AC16 +_0812AFB8: .4byte gUnknown_845AC14 + 2 _0812AFBC: .4byte 0x01010000 thumb_func_end sub_812AF8C |