diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-09-03 03:18:55 +0100 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2016-09-03 03:18:55 +0100 |
| commit | 724a95924c3d636f11c9ec59f944e8697aa82edb (patch) | |
| tree | 7b31ff7b3e93edfe0a7ea6a4c139ec7d9bd8548e /asm | |
| parent | 795247b217877bb049a3be7bfe23b7c44699a9db (diff) | |
| parent | fc23707dc64abdc3219f72e7cb7992890737d00d (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/rom5.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 2f0c387fa..11afc0a3f 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -38125,7 +38125,7 @@ sub_808D640: @ 808D640 .align 2, 0 _0808D658: .4byte 0x0202ffb4 _0808D65C: .4byte 0x0000064c -_0808D660: .4byte gUnknown_0839F67E +_0808D660: .4byte gUnknown_0839F67C + 0x2 _0808D664: bl sub_806912C cmp r0, 0 @@ -38147,7 +38147,7 @@ _0808D686: pop {r0} bx r0 .align 2, 0 -_0808D68C: .4byte gUnknown_0839F73E +_0808D68C: .4byte gUnknown_0839F73C + 0x2 thumb_func_end sub_808D640 thumb_func_start sub_808D690 @@ -283466,7 +283466,7 @@ _08104A50: pop {r0} bx r0 .align 2, 0 -_08104A80: .4byte gUnknown_083EEFE0 +_08104A80: .4byte gReelTimeWindowTilemap _08104A84: .4byte 0x0600e000 thumb_func_end sub_8104A40 |