trade through sub_804C728 (nonmatching
This commit is contained in:
+2
-2
@@ -2849,7 +2849,7 @@ _0809EFEC: .4byte gUnknown_83E252C
|
||||
sub_809EFF0: @ 809EFF0
|
||||
push {lr}
|
||||
sub sp, 0xC
|
||||
bl sub_809707C
|
||||
bl LoadMonIconPalettes
|
||||
ldr r0, _0809F038 @ =gUnknown_203998C
|
||||
ldr r3, [r0]
|
||||
ldr r1, _0809F03C @ =0x00001e34
|
||||
@@ -2866,7 +2866,7 @@ sub_809EFF0: @ 809EFF0
|
||||
str r2, [sp, 0x8]
|
||||
movs r2, 0x38
|
||||
movs r3, 0x28
|
||||
bl sub_8096E18
|
||||
bl CreateMonIcon
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
ldr r2, _0809F048 @ =gSprites
|
||||
|
||||
+6
-6
@@ -364,7 +364,7 @@ _0811ED14:
|
||||
_0811ED30: .4byte gUnknown_203B0A0
|
||||
_0811ED34: .4byte gUnknown_203B09C
|
||||
_0811ED38:
|
||||
bl sub_8122550
|
||||
bl LoadHeldItemIcons
|
||||
b _0811EDFC
|
||||
_0811ED3E:
|
||||
bl sub_8122860
|
||||
@@ -373,7 +373,7 @@ _0811ED44:
|
||||
bl sub_8122980
|
||||
b _0811EDFC
|
||||
_0811ED4A:
|
||||
bl sub_809707C
|
||||
bl LoadMonIconPalettes
|
||||
b _0811EDFC
|
||||
_0811ED50:
|
||||
bl party_menu_add_per_mon_objects
|
||||
@@ -7216,7 +7216,7 @@ party_menu_link_mon_icon_anim: @ 812224C
|
||||
ldr r0, [sp, 0x20]
|
||||
str r0, [sp, 0x8]
|
||||
adds r0, r5, 0
|
||||
bl sub_8096E18
|
||||
bl CreateMonIcon
|
||||
strb r0, [r4, 0x9]
|
||||
ldr r2, _081222A8 @ =gSprites
|
||||
ldrb r0, [r4, 0x9]
|
||||
@@ -7598,8 +7598,8 @@ _08122544:
|
||||
_0812254C: .4byte gSprites
|
||||
thumb_func_end sub_81224D0
|
||||
|
||||
thumb_func_start sub_8122550
|
||||
sub_8122550: @ 8122550
|
||||
thumb_func_start LoadHeldItemIcons
|
||||
LoadHeldItemIcons: @ 8122550
|
||||
push {lr}
|
||||
ldr r0, _08122564 @ =gUnknown_845A42C
|
||||
bl LoadSpriteSheet
|
||||
@@ -7610,7 +7610,7 @@ sub_8122550: @ 8122550
|
||||
.align 2, 0
|
||||
_08122564: .4byte gUnknown_845A42C
|
||||
_08122568: .4byte gUnknown_845A434
|
||||
thumb_func_end sub_8122550
|
||||
thumb_func_end LoadHeldItemIcons
|
||||
|
||||
thumb_func_start sub_812256C
|
||||
sub_812256C: @ 812256C
|
||||
|
||||
+6
-6
@@ -5,8 +5,8 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_8096E18
|
||||
sub_8096E18: @ 8096E18
|
||||
thumb_func_start CreateMonIcon
|
||||
CreateMonIcon: @ 8096E18
|
||||
push {r4-r7,lr}
|
||||
mov r7, r9
|
||||
mov r6, r8
|
||||
@@ -89,7 +89,7 @@ _08096EBC: .4byte gUnknown_83D40E0
|
||||
_08096EC0: .4byte gUnknown_83D3E80
|
||||
_08096EC4: .4byte 0x0000dac0
|
||||
_08096EC8: .4byte gSprites
|
||||
thumb_func_end sub_8096E18
|
||||
thumb_func_end CreateMonIcon
|
||||
|
||||
thumb_func_start sub_8096ECC
|
||||
sub_8096ECC: @ 8096ECC
|
||||
@@ -330,8 +330,8 @@ sub_8097070: @ 8097070
|
||||
bx r0
|
||||
thumb_func_end sub_8097070
|
||||
|
||||
thumb_func_start sub_809707C
|
||||
sub_809707C: @ 809707C
|
||||
thumb_func_start LoadMonIconPalettes
|
||||
LoadMonIconPalettes: @ 809707C
|
||||
push {r4,r5,lr}
|
||||
movs r4, 0
|
||||
ldr r5, _0809709C @ =gUnknown_83D4038
|
||||
@@ -349,7 +349,7 @@ _08097082:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0809709C: .4byte gUnknown_83D4038
|
||||
thumb_func_end sub_809707C
|
||||
thumb_func_end LoadMonIconPalettes
|
||||
|
||||
thumb_func_start SafeLoadMonIconPalette
|
||||
SafeLoadMonIconPalette: @ 80970A0
|
||||
|
||||
@@ -8688,7 +8688,7 @@ _0808FFA8: .4byte 0x00004037
|
||||
thumb_func_start sub_808FFAC
|
||||
sub_808FFAC: @ 808FFAC
|
||||
push {r4-r6,lr}
|
||||
bl sub_809707C
|
||||
bl LoadMonIconPalettes
|
||||
movs r2, 0
|
||||
ldr r3, _0809003C @ =gUnknown_20397B0
|
||||
ldr r5, _08090040 @ =0x00000b04
|
||||
|
||||
@@ -10814,7 +10814,7 @@ _08139E58:
|
||||
adds r0, r5, 0
|
||||
movs r2, 0x18
|
||||
movs r3, 0x20
|
||||
bl sub_8096E18
|
||||
bl CreateMonIcon
|
||||
ldr r1, [r6]
|
||||
ldr r2, _08139E9C @ =0x00003014
|
||||
adds r1, r2
|
||||
|
||||
+19
-1061
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user