diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-21 12:46:19 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-21 12:46:19 +0100 |
| commit | ad2ef517bd702c352d7a4d5b64db0e99f04721c2 (patch) | |
| tree | 540ef4c700ee35c2b177e219a9c0092a3a9aa29c /asm/main_menu.s | |
| parent | 77352c7ee480fe3127692ce50a6bdd019de87291 (diff) | |
| parent | 8a60952fc01ada92e029be488481a29da32f47eb (diff) | |
option menu fix conflicts
Diffstat (limited to 'asm/main_menu.s')
| -rw-r--r-- | asm/main_menu.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/main_menu.s b/asm/main_menu.s index ef2f5a9a1..9d6cba40f 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -3948,7 +3948,7 @@ AddBirchSpeechObjects: @ 803192C movs r1, 0x78 movs r2, 0x3C movs r3, 0 - bl sub_80B5E6C + bl CreateTrainerSprite lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 @@ -3981,7 +3981,7 @@ AddBirchSpeechObjects: @ 803192C movs r1, 0x78 movs r2, 0x3C movs r3, 0 - bl sub_80B5E6C + bl CreateTrainerSprite lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 |