diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-08-31 23:54:24 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-08-31 23:54:24 -0400 |
| commit | ea9eb15e8affd51fac58a9f816090a06516d0835 (patch) | |
| tree | 0cf6e27ab7d99ec633a581864257b46f37f6e166 /asm/rom5.s | |
| parent | 8f39bce7929012032758c2667fb83230dfe3bbff (diff) | |
| parent | 6cea01f088c37fed9d219ab49f18c51fcd2caa70 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'asm/rom5.s')
| -rw-r--r-- | asm/rom5.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 816db74af..c085f778f 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -387012,8 +387012,8 @@ _081371AC: pop {r0} bx r0 .align 2, 0 -_081371C0: .4byte gUnknown_08406148 -_081371C4: .4byte gUnknown_08406150 +_081371C0: .4byte gSpriteSheet_ConditionUpDown +_081371C4: .4byte gSpritePalette_ConditionUpDown _081371C8: .4byte 0x02039304 _081371CC: .4byte gUnknown_08406158 _081371D0: .4byte 0x02020020 |