diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-15 00:47:34 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-15 00:47:34 -0600 |
| commit | ce0e5cbfe4439a9767134a670868f65cc9920e65 (patch) | |
| tree | 07d1e496a653dc2c6584022cb977bbdf273858aa /asm/contest.s | |
| parent | 6e6e11205d312a296391ec7d16d809e52c5b4027 (diff) | |
| parent | 3fb2a488f99d4d8499a2b0247f73f45837b07156 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps
Diffstat (limited to 'asm/contest.s')
| -rw-r--r-- | asm/contest.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/contest.s b/asm/contest.s index 1e3665bf7..50398c518 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -6763,7 +6763,7 @@ _080DB1CC: adds r0, r5, 0 adds r1, r7, 0 adds r2, r6, 0 - bl species_and_otid_get_pal + bl GetFrontSpritePalFromSpeciesAndPersonality movs r1, 0x90 lsls r1, 1 movs r2, 0x20 |