diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/gba_constants.s | 11 | ||||
| -rw-r--r-- | constants/m4a_constants.s | 11 |
2 files changed, 20 insertions, 2 deletions
diff --git a/constants/gba_constants.s b/constants/gba_constants.s index accd16007..412858935 100644 --- a/constants/gba_constants.s +++ b/constants/gba_constants.s @@ -15,6 +15,17 @@ .set IWRAM_START, 0x03000000 .set IWRAM_END, IWRAM_START + 0x8000 + .set PLTT, 0x5000000 + .set BG_PLTT, PLTT + .set OBJ_PLTT, PLTT + 0x200 + + .set VRAM, 0x6000000 + .set BG_VRAM, VRAM + .set OBJ_VRAM0, VRAM + 0x10000 @ text-mode BG + .set OBJ_VRAM1, VRAM + 0x14000 @ bitmap-mode BG + + .set OAM, 0x7000000 + .set SOUND_INFO_PTR, IWRAM_END - 0x10 .set INTR_VECTOR, IWRAM_END - 0x4 diff --git a/constants/m4a_constants.s b/constants/m4a_constants.s index 4b05bc63d..b424a9230 100644 --- a/constants/m4a_constants.s +++ b/constants/m4a_constants.s @@ -2,6 +2,11 @@ .equiv PCM_DMA_BUF_SIZE, 1584 + .equiv TONEDATA_TYPE_CGB, 0x07 + .equiv TONEDATA_TYPE_FIX, 0x08 + .equiv TONEDATA_TYPE_SPL, 0x40 @ key split + .equiv TONEDATA_TYPE_RHY, 0x80 @ rhythm + .macro struct_begin .struct 0 .endm @@ -81,9 +86,9 @@ struct_field o_MusicPlayerTrack_wai, 1 struct_field o_MusicPlayerTrack_patP, 1 struct_field o_MusicPlayerTrack_repN, 1 - struct_field o_MusicPlayerTrack_gat, 1 + struct_field o_MusicPlayerTrack_gateTime, 1 struct_field o_MusicPlayerTrack_key, 1 - struct_field o_MusicPlayerTrack_vel, 1 + struct_field o_MusicPlayerTrack_velocity, 1 struct_field o_MusicPlayerTrack_run, 1 struct_field o_MusicPlayerTrack_keyM, 1 struct_field o_MusicPlayerTrack_pitM, 1 @@ -125,3 +130,5 @@ struct_field o_MusicPlayerTrack_cmdPtr, 4 struct_field o_MusicPlayerTrack_patS, 12 struct_field MusicPlayerTrack_size, 0 + + .equiv o_MusicPlayerTrack_ToneData_keySplitTable, o_MusicPlayerTrack_ToneData_attack |