diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-27 15:01:18 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-27 15:01:18 -0400 |
| commit | 00c7dee919c8f93b8519a7eede2c41ba2ddcaf08 (patch) | |
| tree | 5707f8764920abcd4cffca84c675e5c53c32559d /asm/pokeblock.s | |
| parent | 3d9eb18add0d8a9eb5bfa77fc64cd7b1f37fea5d (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' into pokemon_data
Diffstat (limited to 'asm/pokeblock.s')
| -rw-r--r-- | asm/pokeblock.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/pokeblock.s b/asm/pokeblock.s index 74da210b0..5b6522144 100644 --- a/asm/pokeblock.s +++ b/asm/pokeblock.s @@ -2121,7 +2121,7 @@ sub_810C788: @ 810C788 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - ldr r0, _0810C840 @ =gUnknown_030041C0 + ldr r0, _0810C840 @ =gBattleTextBuff1 ldr r2, _0810C844 @ =gPokeblockNames ldr r1, _0810C848 @ =0xfffff808 adds r5, r1 @@ -2189,7 +2189,7 @@ _0810C808: _0810C834: .4byte gEnemyParty _0810C838: .4byte gScriptItemId _0810C83C: .4byte gSaveBlock1 + 0x7F8 -_0810C840: .4byte gUnknown_030041C0 +_0810C840: .4byte gBattleTextBuff1 _0810C844: .4byte gPokeblockNames _0810C848: .4byte 0xfffff808 _0810C84C: .4byte gTasks |