diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2016-08-27 21:43:34 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2016-08-27 21:43:34 -0400 |
commit | 67a057d573b9c9e716f5afae5c6049f86836adbe (patch) | |
tree | 8cad114d5fa558000dcc38b412d917ffd4cf2f93 /asm/rom5.s | |
parent | ed4907a014e1cf3ee3d085f8660d483a85cc577d (diff) | |
parent | 382f99c35ee2e8b81847a18797815a2336971e30 (diff) |
Merge branch 'master' of github.com:twitchplayspokemon/pokeruby
Diffstat (limited to 'asm/rom5.s')
-rw-r--r-- | asm/rom5.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 2362dc989..020156d0b 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -272462,7 +272462,7 @@ _080FF81C: .4byte gUnknown_083EC954 _080FF820: .4byte 0x020391a8 _080FF824: .4byte 0x02020004 _080FF828: .4byte 0x03004880 -_080FF82C: .4byte gUnknown_083EC93C +_080FF82C: .4byte gSpriteTemplate_83EC93C _080FF830: .4byte gUnknown_083EC900 _080FF834: ldr r2, _080FF888 |