diff options
| author | YamaArashi <shadow962@live.com> | 2015-10-10 08:43:47 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-10-10 08:43:47 -0700 |
| commit | 14a95252f805c04132eeb80ec9fe9186132bf60d (patch) | |
| tree | ecaf7e98c2cb95a68605e597bb8c5218606ba6db /asm | |
| parent | fd6e15b70a844ba646f3a39e9f248d429078e2e5 (diff) | |
create constants dir
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/defines.s | 33 | ||||
| -rw-r--r-- | asm/emerald.s | 2 |
2 files changed, 1 insertions, 34 deletions
diff --git a/asm/defines.s b/asm/defines.s deleted file mode 100644 index a4f3e3291..000000000 --- a/asm/defines.s +++ /dev/null @@ -1,33 +0,0 @@ - .set PSR_USR_MODE, 0x00000010 - .set PSR_FIQ_MODE, 0x00000011 - .set PSR_IRQ_MODE, 0x00000012 - .set PSR_SVC_MODE, 0x00000013 - .set PSR_ABT_MODE, 0x00000017 - .set PSR_UND_MODE, 0x0000001b - .set PSR_SYS_MODE, 0x0000001f - .set PSR_MODE_MASK, 0x0000001f - .set PSR_T_BIT, 0x00000020 - .set PSR_F_BIT, 0x00000040 - .set PSR_I_BIT, 0x00000080 - - .set EWRAM_START, 0x02000000 - .set EWRAM_END, EWRAM_START + 0x40000 - .set IWRAM_START, 0x03000000 - .set IWRAM_END, IWRAM_START + 0x8000 - - .set INTR_VECTOR, IWRAM_END - 0x4 - - .set INTR_FLAG_VBLANK, 1 << 0 - .set INTR_FLAG_HBLANK, 1 << 1 - .set INTR_FLAG_VCOUNT, 1 << 2 - .set INTR_FLAG_TIMER0, 1 << 3 - .set INTR_FLAG_TIMER1, 1 << 4 - .set INTR_FLAG_TIMER2, 1 << 5 - .set INTR_FLAG_TIMER3, 1 << 6 - .set INTR_FLAG_SERIAL, 1 << 7 - .set INTR_FLAG_DMA0, 1 << 8 - .set INTR_FLAG_DMA1, 1 << 9 - .set INTR_FLAG_DMA2, 1 << 10 - .set INTR_FLAG_DMA3, 1 << 11 - .set INTR_FLAG_KEYPAD, 1 << 12 - .set INTR_FLAG_GAMEPAK, 1 << 13 diff --git a/asm/emerald.s b/asm/emerald.s index 791caacab..4f31e3f53 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -1,4 +1,4 @@ - .include "asm/defines.s" + .include "constants/gba_constants.s" .include "asm/macros.s" .syntax unified |