diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-08-31 01:12:36 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-08-31 01:12:36 -0400 |
| commit | b995ecd9ee7e5d52185e475486e46616702cf5c4 (patch) | |
| tree | 2adb5b5ffcc6ba975da13e75b507dd714b311b7b /asm/rom5.s | |
| parent | 77e755033c05a39c18b53e3a74bc777113e0581b (diff) | |
| parent | d5637762c3fd80a095061538c7bd874986e44b46 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'asm/rom5.s')
| -rw-r--r-- | asm/rom5.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index a45bd5f61..d1aedd4ff 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -421080,9 +421080,9 @@ _08148244: bx r0 .align 2, 0 _0814824C: .4byte 0x03005f34 -_08148250: .4byte gUnknown_08411A10 +_08148250: .4byte gNatureToMonPokeblockAnim _08148254: .4byte 0x03005f30 -_08148258: .4byte gUnknown_08411A42 +_08148258: .4byte gMonPokeblockAnims thumb_func_end sub_81481DC thumb_func_start sub_814825C @@ -421222,7 +421222,7 @@ _081483E8: b _08148532 .align 2, 0 _0814841C: .4byte 0x03005f40 -_08148420: .4byte gUnknown_08411A10 +_08148420: .4byte gNatureToMonPokeblockAnim _08148424: .4byte 0x03005f30 _08148428: .4byte 0x03005f20 _0814842C: .4byte 0x03005f2c @@ -421282,7 +421282,7 @@ _0814847A: bl StartSpriteAffineAnim b _081484EE .align 2, 0 -_081484A4: .4byte gUnknown_08411A10 +_081484A4: .4byte gNatureToMonPokeblockAnim _081484A8: .4byte 0x03005f30 _081484AC: .4byte 0x03005f20 _081484B0: .4byte gSpriteAffineAnimTable_8412050 @@ -421409,7 +421409,7 @@ _0814854C: b _081485C6 .align 2, 0 _081485B4: .4byte 0x03005fa0 -_081485B8: .4byte gUnknown_08411A42 +_081485B8: .4byte gMonPokeblockAnims _081485BC: .4byte 0x03005f40 _081485C0: .4byte 0x03005f20 _081485C4: |