pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Dance Theatre -> Dance Theater

Browse Source 
Fixes #1008
This commit is contained in:
Rangi 2022-09-23 22:06:52 -04:00
parent 553a272e52
commit 8fc3b8e6e3
8 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/map_constants.asm
View File

@ -161,7 +161,7 @@ ENDM
map_const WISE_TRIOS_ROOM, 4, 4 ; 2 map_const WISE_TRIOS_ROOM, 4, 4 ; 2
map_const ECRUTEAK_POKECENTER_1F, 5, 4 ; 3 map_const ECRUTEAK_POKECENTER_1F, 5, 4 ; 3
map_const ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4 ; 4 map_const ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4 ; 4
map_const DANCE_THEATRE, 6, 7 ; 5 map_const DANCE_THEATER, 6, 7 ; 5
map_const ECRUTEAK_MART, 6, 4 ; 6 map_const ECRUTEAK_MART, 6, 4 ; 6
map_const ECRUTEAK_GYM, 5, 9 ; 7 map_const ECRUTEAK_GYM, 5, 9 ; 7
map_const ECRUTEAK_ITEMFINDER_HOUSE, 4, 4 ; 8 map_const ECRUTEAK_ITEMFINDER_HOUSE, 4, 4 ; 8

2
data/maps/attributes.asm
View File

@ -486,7 +486,7 @@ ENDM
map_attributes WiseTriosRoom, WISE_TRIOS_ROOM, $00, 0 map_attributes WiseTriosRoom, WISE_TRIOS_ROOM, $00, 0
map_attributes EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $00, 0 map_attributes EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $00, 0
map_attributes EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $00, 0 map_attributes EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $00, 0
map_attributes DanceTheatre, DANCE_THEATRE, $00, 0 map_attributes DanceTheater, DANCE_THEATER, $00, 0
map_attributes EcruteakMart, ECRUTEAK_MART, $00, 0 map_attributes EcruteakMart, ECRUTEAK_MART, $00, 0
map_attributes EcruteakGym, ECRUTEAK_GYM, $00, 0 map_attributes EcruteakGym, ECRUTEAK_GYM, $00, 0
map_attributes EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $00, 0 map_attributes EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $00, 0

4
data/maps/blocks.asm
View File

@ -803,8 +803,8 @@ RuinsOfAlphResearchCenter_Blocks:
GoldenrodBikeShop_Blocks: GoldenrodBikeShop_Blocks:
INCBIN "maps/GoldenrodBikeShop.blk" INCBIN "maps/GoldenrodBikeShop.blk"
DanceTheatre_Blocks: DanceTheater_Blocks:
INCBIN "maps/DanceTheatre.blk" INCBIN "maps/DanceTheater.blk"
EcruteakTinTowerEntrance_Blocks: EcruteakTinTowerEntrance_Blocks:
INCBIN "maps/EcruteakTinTowerEntrance.blk" INCBIN "maps/EcruteakTinTowerEntrance.blk"

2
data/maps/maps.asm
View File

@ -175,7 +175,7 @@ MapGroup_Ecruteak:
map WiseTriosRoom, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE map WiseTriosRoom, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map EcruteakLugiaSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map EcruteakLugiaSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map DanceTheatre, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE map DanceTheater, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map EcruteakMart, TILESET_MART, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map EcruteakMart, TILESET_MART, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map EcruteakGym, TILESET_TOWER, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map EcruteakGym, TILESET_TOWER, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map EcruteakItemfinderHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map EcruteakItemfinderHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

2
data/maps/scripts.asm
View File

@ -195,7 +195,7 @@ INCLUDE "maps/EcruteakTinTowerEntrance.asm"
INCLUDE "maps/WiseTriosRoom.asm" INCLUDE "maps/WiseTriosRoom.asm"
INCLUDE "maps/EcruteakPokecenter1F.asm" INCLUDE "maps/EcruteakPokecenter1F.asm"
INCLUDE "maps/EcruteakLugiaSpeechHouse.asm" INCLUDE "maps/EcruteakLugiaSpeechHouse.asm"
INCLUDE "maps/DanceTheatre.asm" INCLUDE "maps/DanceTheater.asm"
INCLUDE "maps/EcruteakMart.asm" INCLUDE "maps/EcruteakMart.asm"
INCLUDE "maps/EcruteakGym.asm" INCLUDE "maps/EcruteakGym.asm"
INCLUDE "maps/EcruteakItemfinderHouse.asm" INCLUDE "maps/EcruteakItemfinderHouse.asm"

48
maps/DanceTheatre.asm → maps/DanceTheater.asm
View File

@ -1,15 +1,15 @@
object_const_def object_const_def
const DANCETHEATRE_KIMONO_GIRL1 const DANCETHEATER_KIMONO_GIRL1
const DANCETHEATRE_KIMONO_GIRL2 const DANCETHEATER_KIMONO_GIRL2
const DANCETHEATRE_KIMONO_GIRL3 const DANCETHEATER_KIMONO_GIRL3
const DANCETHEATRE_KIMONO_GIRL4 const DANCETHEATER_KIMONO_GIRL4
const DANCETHEATRE_KIMONO_GIRL5 const DANCETHEATER_KIMONO_GIRL5
const DANCETHEATRE_GENTLEMAN const DANCETHEATER_GENTLEMAN
const DANCETHEATRE_RHYDON const DANCETHEATER_RHYDON
const DANCETHEATRE_COOLTRAINER_M const DANCETHEATER_COOLTRAINER_M
const DANCETHEATRE_GRANNY const DANCETHEATER_GRANNY
DanceTheatre_MapScripts: DanceTheater_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
@ -126,14 +126,14 @@ DanceTheaterRhydon:
closetext closetext
end end
DanceTheatreCooltrainerMScript: DanceTheaterCooltrainerMScript:
jumptextfaceplayer DanceTheatreCooltrainerMText jumptextfaceplayer DanceTheaterCooltrainerMText
DanceTheatreGrannyScript: DanceTheaterGrannyScript:
jumptextfaceplayer DanceTheatreGrannyText jumptextfaceplayer DanceTheaterGrannyText
DanceTheatreFancyPanel: DanceTheaterFancyPanel:
jumptext DanceTheatreFancyPanelText jumptext DanceTheaterFancyPanelText
KimonoGirlNaokoSeenText: KimonoGirlNaokoSeenText:
text "You have lovely" text "You have lovely"
@ -296,7 +296,7 @@ RhydonText:
line "gugogooh!" line "gugogooh!"
done done
DanceTheatreCooltrainerMText: DanceTheaterCooltrainerMText:
text "That man's always" text "That man's always"
line "with his RHYDON." line "with his RHYDON."
@ -310,7 +310,7 @@ DanceTheatreCooltrainerMText:
cont "#MON?" cont "#MON?"
done done
DanceTheatreGrannyText: DanceTheaterGrannyText:
text "The KIMONO GIRLS" text "The KIMONO GIRLS"
line "are so beautiful…" line "are so beautiful…"
@ -329,13 +329,13 @@ DanceTheatreGrannyText:
cont "thing is possible." cont "thing is possible."
done done
DanceTheatreFancyPanelText: DanceTheaterFancyPanelText:
text "It's a fancy panel" text "It's a fancy panel"
line "that's decorated" line "that's decorated"
cont "with flowers." cont "with flowers."
done done
DanceTheatre_MapEvents: DanceTheater_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
def_warp_events def_warp_events
@ -345,8 +345,8 @@ DanceTheatre_MapEvents:
def_coord_events def_coord_events
def_bg_events def_bg_events
bg_event 5, 6, BGEVENT_UP, DanceTheatreFancyPanel bg_event 5, 6, BGEVENT_UP, DanceTheaterFancyPanel
bg_event 6, 6, BGEVENT_UP, DanceTheatreFancyPanel bg_event 6, 6, BGEVENT_UP, DanceTheaterFancyPanel
def_object_events def_object_events
object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko, -1 object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko, -1
@ -356,5 +356,5 @@ DanceTheatre_MapEvents:
object_event 11, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlMiki, -1 object_event 11, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlMiki, -1
object_event 7, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheaterSurfGuy, -1 object_event 7, 10, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheaterSurfGuy, -1
object_event 6, 8, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, DanceTheaterRhydon, -1 object_event 6, 8, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, DanceTheaterRhydon, -1
object_event 10, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DanceTheatreCooltrainerMScript, -1 object_event 10, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DanceTheaterCooltrainerMScript, -1
object_event 3, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -1 object_event 3, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheaterGrannyScript, -1

0
maps/DanceTheatre.blk → maps/DanceTheater.blk
View File

2
maps/EcruteakCity.asm
View File

@ -267,7 +267,7 @@ EcruteakCity_MapEvents:
warp_event 20, 3, WISE_TRIOS_ROOM, 2 warp_event 20, 3, WISE_TRIOS_ROOM, 2
warp_event 23, 27, ECRUTEAK_POKECENTER_1F, 1 warp_event 23, 27, ECRUTEAK_POKECENTER_1F, 1
warp_event 5, 21, ECRUTEAK_LUGIA_SPEECH_HOUSE, 1 warp_event 5, 21, ECRUTEAK_LUGIA_SPEECH_HOUSE, 1
warp_event 23, 21, DANCE_THEATRE, 1 warp_event 23, 21, DANCE_THEATER, 1
warp_event 29, 21, ECRUTEAK_MART, 2 warp_event 29, 21, ECRUTEAK_MART, 2
warp_event 6, 27, ECRUTEAK_GYM, 1 warp_event 6, 27, ECRUTEAK_GYM, 1
warp_event 13, 27, ECRUTEAK_ITEMFINDER_HOUSE, 1 warp_event 13, 27, ECRUTEAK_ITEMFINDER_HOUSE, 1