diff options
| author | yenatch <yenatch@gmail.com> | 2016-06-28 23:46:18 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-06-28 23:46:18 -0400 |
| commit | e9e1b988f9925a26518b76d74677d0d0dceb3b7c (patch) | |
| tree | a259348294888df8b467a9bfcf06fc796ef5583e /asm | |
| parent | 2a4b3d91fd9c9e928c9cd9ad6163f15de6a9eb8d (diff) | |
| parent | f68fbc7b5e84671f779ae2d4dc5ee20d32edb0df (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
data/data2.s
Diffstat (limited to 'asm')
| -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 35115ceb5..f097875af 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -412595,7 +412595,7 @@ _08143DD0: .4byte 0x030028f8 _08143DD4: .4byte gUnknown_083F66F0 _08143DD8: .4byte gUnknown_083F64F8 _08143DDC: .4byte 0x06003800 -_08143DE0: .4byte gUnknown_083F62EE +_08143DE0: .4byte gUnknown_083F62EC + 0x2 _08143DE4: .4byte 0x0201e000 _08143DE8: .4byte 0x000007ff _08143DEC: .4byte 0x0201f800 |