diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-09 19:43:30 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-09 20:30:56 -0600 |
| commit | 09e431077af3c6fe672ad8a775b58d955596b81d (patch) | |
| tree | 88d2eceb1071df85b4f73b1742885127755579c6 /asm/pokemon_summary_screen.s | |
| parent | 2d3044aaa645bbad85e8e60dfe23f7f0224383ca (diff) | |
| parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) | |
Merge remote-tracking branch 'pret/master' into dump_maps
Diffstat (limited to 'asm/pokemon_summary_screen.s')
| -rwxr-xr-x | asm/pokemon_summary_screen.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index db9429c6a..448e7c7a8 100755 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -1087,7 +1087,7 @@ _081C4750: ldrh r0, [r5, 0x2] ldr r1, [r5, 0x48] ldr r2, [r5, 0xC] - bl sub_806E7CC + bl GetMonSpritePalStructFromOtIdPersonality adds r4, r0, 0 bl LoadCompressedObjectPalette ldrh r0, [r4, 0x4] @@ -2035,7 +2035,7 @@ sub_81C4EFC: @ 81C4EFC thumb_func_start sub_81C4F10 sub_81C4F10: @ 81C4F10 push {lr} - ldr r1, =sub_8059D50 + ldr r1, =SetCB2ToReshowScreenAfterMenu2 movs r0, 0x1 bl sub_81C4F98 pop {r0} |