summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2020-11-07 18:06:37 -0500
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2020-11-07 18:06:37 -0500
commita29b18ed2f27c2991b0894a69fa04738ba9522ca (patch)
tree4db08c6d6a2d585a0a42ee6f023faa9f6e8d13fb /constants
parent8d2d34aae9767f283b3c34140920828e37540d23 (diff)
parent8b1c2c946b3b58cc938f0496a9af11a641749a1e (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'constants')
-rw-r--r--constants/gba_constants.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/constants/gba_constants.inc b/constants/gba_constants.inc
index 13cbadf80..3ff857ee8 100644
--- a/constants/gba_constants.inc
+++ b/constants/gba_constants.inc
@@ -26,9 +26,9 @@
.set OAM, 0x7000000
- .set SOUND_INFO_PTR, IWRAM_END - 0x10
- .set INTR_CHECK, IWRAM_END - 0x8
- .set INTR_VECTOR, IWRAM_END - 0x4
+ .set SOUND_INFO_PTR, 0x3007FF0
+ .set INTR_CHECK, 0x3007FF8
+ .set INTR_VECTOR, 0x3007FFC
.set INTR_FLAG_VBLANK, 1 << 0
.set INTR_FLAG_HBLANK, 1 << 1