diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-09 20:33:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-09 20:33:28 -0400 |
| commit | c61603fb3812011981e22478bce93aba8b7ec183 (patch) | |
| tree | 0bcf628e1f3615159cbae3e5c638825544699182 /data/maps/PokemonLeague_ChampionsRoom | |
| parent | 77a6ee507fdeef8d6a3b8146c70df107e124b0b5 (diff) | |
| parent | f3bd7f06c9f260597575f60af8daf8985ce80fe1 (diff) | |
Merge pull request #113 from PikalaxALT/main_menu
Main menu and Song Constants
Diffstat (limited to 'data/maps/PokemonLeague_ChampionsRoom')
| -rw-r--r-- | data/maps/PokemonLeague_ChampionsRoom/map.json | 2 | ||||
| -rw-r--r-- | data/maps/PokemonLeague_ChampionsRoom/scripts.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index cf1c5bfa2..90e243652 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM", "name": "PokemonLeague_ChampionsRoom", "layout": "LAYOUT_POKEMON_LEAGUE_CHAMPIONS_ROOM", - "music": "BGM_FRLG_INDIGO_PLATEAU", + "music": "MUS_CHAMP_R", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index b2b8bc46c..b705e8c54 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -68,7 +68,7 @@ EventScript_162B76:: @ 8162B76 goto_if_eq EventScript_162C68 setflag FLAG_0x003 setflag FLAG_0x005 - savebgm BGM_FRLG_KACHI_LEADER + savebgm MUS_WIN_GYM checkflag FLAG_0x844 call_if 0, EventScript_162C6F checkflag FLAG_0x844 @@ -78,7 +78,7 @@ EventScript_162B76:: @ 8162B76 setflag FLAG_0x4BC setflag FLAG_0x004 msgbox gUnknown_8178F2F - playbgm BGM_FRLG_HALL_OF_FAME_PALLET_TOWN, 0 + playbgm MUS_SLOWMASARA, 0 addobject 2 msgbox gUnknown_8178FC6 closemessage |