summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authorKurausukun <lord.uber1@gmail.com>2020-12-10 23:30:52 -0500
committerKurausukun <lord.uber1@gmail.com>2020-12-10 23:30:52 -0500
commit58976ebaa8d73d174940f622ec36f22bcd2fd8a2 (patch)
treec27ab24ed83fdb16654b5814d681af487b119601 /constants
parent32ae13f9b66ab1b01146e5746e9350f97f055526 (diff)
parent8d29f65c6c7f34aa53ae2e7ae3e4f34a95025602 (diff)
Merge remote-tracking branch 'upstream/master' into berry_crush
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