diff options
| author | YamaArashi <shadow962@live.com> | 2017-01-07 16:20:51 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2017-01-07 16:21:10 -0800 |
| commit | 44dfc173df70162ef4e0a972cb1eab76ab5381a5 (patch) | |
| tree | 94c2ea0f72f54207c7fdd57850d5d7bbe00a92c7 /asm | |
| parent | cb875db7372fe9be027e1745e7e96ac82f817665 (diff) | |
roulette incbins
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/roulette.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/roulette.s b/asm/roulette.s index 0704caf7f..6382ecf0b 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -369,7 +369,7 @@ _081153D0: movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram - ldr r0, _08115434 @ =gUnknown_08E81098 + ldr r0, _08115434 @ =gRouletteWheelTiles ldr r1, _08115438 @ =0x06004000 bl LZ77UnCompVram ldr r1, _0811543C @ =gMain @@ -382,7 +382,7 @@ _08115424: .4byte 0x00004686 _08115428: .4byte 0x00004401 _0811542C: .4byte 0x0000060a _08115430: .4byte gUnknown_08E8096C -_08115434: .4byte gUnknown_08E81098 +_08115434: .4byte gRouletteWheelTiles _08115438: .4byte 0x06004000 _0811543C: .4byte gMain _08115440: .4byte 0x0000043c @@ -3571,7 +3571,7 @@ _08116DEE: cmp r3, 0x3 bls _08116DC8 movs r2, 0 - ldr r0, _08116E54 @ =gUnknown_083F8D94 + ldr r0, _08116E54 @ =gUnknown_083F8D90 + 0x4 add r0, r12 ldr r7, [r0] ldr r4, _08116E58 @ =0x02019016 @@ -3617,7 +3617,7 @@ _08116E38: _08116E48: .4byte 0x02019000 _08116E4C: .4byte gTasks _08116E50: .4byte gUnknown_083F8D90 -_08116E54: .4byte gUnknown_083F8D94 +_08116E54: .4byte gUnknown_083F8D90 + 0x4 _08116E58: .4byte 0x02019016 thumb_func_end sub_8116D54 @@ -8689,10 +8689,10 @@ _081196A8: cmp r5, r9 bcs _0811970E ldr r6, _08119734 @ =0x02019000 - ldr r7, _08119738 @ =gUnknown_083F8C0C + ldr r7, _08119738 @ =gUnknown_083F8C00 + 0xC _081196B6: lsls r0, r3, 3 - ldr r1, _0811973C @ =gUnknown_083F8D94 + ldr r1, _0811973C @ =gUnknown_083F8D90 + 0x4 adds r0, r1 ldr r1, [r6, 0x8] ldr r2, [r0] @@ -8757,8 +8757,8 @@ _0811970E: b _08119766 .align 2, 0 _08119734: .4byte 0x02019000 -_08119738: .4byte gUnknown_083F8C0C -_0811973C: .4byte gUnknown_083F8D94 +_08119738: .4byte gUnknown_083F8C00 + 0xC +_0811973C: .4byte gUnknown_083F8D90 + 0x4 _08119740: .4byte 0x0201901b _08119744: ldr r0, [sp, 0x10] |