diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
| commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
| tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /asm/pokedex_area_screen.s | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'asm/pokedex_area_screen.s')
| -rw-r--r-- | asm/pokedex_area_screen.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s index 9bf70a379..5f9e01974 100644 --- a/asm/pokedex_area_screen.s +++ b/asm/pokedex_area_screen.s @@ -1781,7 +1781,7 @@ sub_813D8A8: @ 813D8A8 str r1, [sp] ldr r0, =0x00030600 str r0, [sp, 0x4] - ldr r0, =gUnknown_08DC4140 + ldr r0, =gPokedexAreaScreenAreaUnknown_Gfx bl LZ77UnCompWram mov r0, sp bl LoadSpriteSheet @@ -1831,7 +1831,7 @@ _0813D924: lsls r6, 16 adds r1, r6 asrs r1, 16 - ldr r0, =gUnknown_085B40FC + ldr r0, =gSpriteTemplate_85B40FC movs r2, 0x8C movs r3, 0 bl CreateSprite |