diff options
author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-09 14:32:44 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-09 14:32:44 -0500 |
commit | 08a5efbd8144d2cb1f4b8da62ba484ffcc9a1f93 (patch) | |
tree | ab77e37580ab0eb0ee18c28f749d8c8da15dbcf7 /asm/battle_controller_player_partner.s | |
parent | 96c5966ff3676eb1b3463808b83b42e13e1591fd (diff) | |
parent | 41db0259759c8e4c3c31c5cf09daed9f85ab5b63 (diff) |
Merge pull request #62 from Diegoisawesome/baserom_extraction
Continued baserom extraction
Diffstat (limited to 'asm/battle_controller_player_partner.s')
-rw-r--r-- | asm/battle_controller_player_partner.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_controller_player_partner.s b/asm/battle_controller_player_partner.s index c0ea9b87f..0ddd2a924 100644 --- a/asm/battle_controller_player_partner.s +++ b/asm/battle_controller_player_partner.s @@ -4182,7 +4182,7 @@ sub_81BD37C: @ 81BD37C movs r4, 0x7 movs r0, 0x5A mov r9, r0 - ldr r0, =gUnknown_08305D2C + ldr r0, =gTrainerBackPicCoords ldrb r1, [r0, 0x1C] b _081BD3BE .pool @@ -4193,7 +4193,7 @@ _081BD3A8: lsrs r4, r0, 24 movs r0, 0x20 mov r9, r0 - ldr r1, =gUnknown_083054E0 + ldr r1, =gTrainerFrontPicCoords lsls r0, r4, 2 adds r0, r1 ldrb r1, [r0] |