Merge branch 'ZetaNull:master' into master

This commit is contained in:
Martha Schilling 2023-10-27 17:09:09 +01:00 committed by GitHub
commit 37fbf884f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 687 additions and 145 deletions

View file

@ -105,6 +105,7 @@
const MUSIC_SUICUNE_BATTLE ; 64
const MUSIC_BATTLE_TOWER_LOBBY ; 65
const MUSIC_MOBILE_CENTER ; 66
const MUSIC_NIHON_TOWN_01 ; 67
DEF NUM_MUSIC_SONGS EQU const_value
; GetMapMusic picks music for this value (see home/map.asm)

View file

@ -38,6 +38,7 @@
const TILESET_AERODACTYL_WORD_ROOM ; 24
const TILESET_NIHON_01 ; 25
const TILESET_FOREST_KANTO ; 26
const TILESET_MUSEUM ; 27
DEF NUM_TILESETS EQU const_value - 1
; wTileset struct size