mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
parent
553a272e52
commit
8fc3b8e6e3
@ -161,7 +161,7 @@ ENDM
|
||||
map_const WISE_TRIOS_ROOM, 4, 4 ; 2
|
||||
map_const ECRUTEAK_POKECENTER_1F, 5, 4 ; 3
|
||||
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_GYM, 5, 9 ; 7
|
||||
map_const ECRUTEAK_ITEMFINDER_HOUSE, 4, 4 ; 8
|
||||
|
@ -486,7 +486,7 @@ ENDM
|
||||
map_attributes WiseTriosRoom, WISE_TRIOS_ROOM, $00, 0
|
||||
map_attributes EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $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 EcruteakGym, ECRUTEAK_GYM, $00, 0
|
||||
map_attributes EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $00, 0
|
||||
|
@ -803,8 +803,8 @@ RuinsOfAlphResearchCenter_Blocks:
|
||||
GoldenrodBikeShop_Blocks:
|
||||
INCBIN "maps/GoldenrodBikeShop.blk"
|
||||
|
||||
DanceTheatre_Blocks:
|
||||
INCBIN "maps/DanceTheatre.blk"
|
||||
DanceTheater_Blocks:
|
||||
INCBIN "maps/DanceTheater.blk"
|
||||
|
||||
EcruteakTinTowerEntrance_Blocks:
|
||||
INCBIN "maps/EcruteakTinTowerEntrance.blk"
|
||||
|
@ -175,7 +175,7 @@ MapGroup_Ecruteak:
|
||||
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 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 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
|
||||
|
@ -195,7 +195,7 @@ INCLUDE "maps/EcruteakTinTowerEntrance.asm"
|
||||
INCLUDE "maps/WiseTriosRoom.asm"
|
||||
INCLUDE "maps/EcruteakPokecenter1F.asm"
|
||||
INCLUDE "maps/EcruteakLugiaSpeechHouse.asm"
|
||||
INCLUDE "maps/DanceTheatre.asm"
|
||||
INCLUDE "maps/DanceTheater.asm"
|
||||
INCLUDE "maps/EcruteakMart.asm"
|
||||
INCLUDE "maps/EcruteakGym.asm"
|
||||
INCLUDE "maps/EcruteakItemfinderHouse.asm"
|
||||
|
@ -1,15 +1,15 @@
|
||||
object_const_def
|
||||
const DANCETHEATRE_KIMONO_GIRL1
|
||||
const DANCETHEATRE_KIMONO_GIRL2
|
||||
const DANCETHEATRE_KIMONO_GIRL3
|
||||
const DANCETHEATRE_KIMONO_GIRL4
|
||||
const DANCETHEATRE_KIMONO_GIRL5
|
||||
const DANCETHEATRE_GENTLEMAN
|
||||
const DANCETHEATRE_RHYDON
|
||||
const DANCETHEATRE_COOLTRAINER_M
|
||||
const DANCETHEATRE_GRANNY
|
||||
const DANCETHEATER_KIMONO_GIRL1
|
||||
const DANCETHEATER_KIMONO_GIRL2
|
||||
const DANCETHEATER_KIMONO_GIRL3
|
||||
const DANCETHEATER_KIMONO_GIRL4
|
||||
const DANCETHEATER_KIMONO_GIRL5
|
||||
const DANCETHEATER_GENTLEMAN
|
||||
const DANCETHEATER_RHYDON
|
||||
const DANCETHEATER_COOLTRAINER_M
|
||||
const DANCETHEATER_GRANNY
|
||||
|
||||
DanceTheatre_MapScripts:
|
||||
DanceTheater_MapScripts:
|
||||
def_scene_scripts
|
||||
|
||||
def_callbacks
|
||||
@ -126,14 +126,14 @@ DanceTheaterRhydon:
|
||||
closetext
|
||||
end
|
||||
|
||||
DanceTheatreCooltrainerMScript:
|
||||
jumptextfaceplayer DanceTheatreCooltrainerMText
|
||||
DanceTheaterCooltrainerMScript:
|
||||
jumptextfaceplayer DanceTheaterCooltrainerMText
|
||||
|
||||
DanceTheatreGrannyScript:
|
||||
jumptextfaceplayer DanceTheatreGrannyText
|
||||
DanceTheaterGrannyScript:
|
||||
jumptextfaceplayer DanceTheaterGrannyText
|
||||
|
||||
DanceTheatreFancyPanel:
|
||||
jumptext DanceTheatreFancyPanelText
|
||||
DanceTheaterFancyPanel:
|
||||
jumptext DanceTheaterFancyPanelText
|
||||
|
||||
KimonoGirlNaokoSeenText:
|
||||
text "You have lovely"
|
||||
@ -296,7 +296,7 @@ RhydonText:
|
||||
line "gugogooh!"
|
||||
done
|
||||
|
||||
DanceTheatreCooltrainerMText:
|
||||
DanceTheaterCooltrainerMText:
|
||||
text "That man's always"
|
||||
line "with his RHYDON."
|
||||
|
||||
@ -310,7 +310,7 @@ DanceTheatreCooltrainerMText:
|
||||
cont "#MON?"
|
||||
done
|
||||
|
||||
DanceTheatreGrannyText:
|
||||
DanceTheaterGrannyText:
|
||||
text "The KIMONO GIRLS"
|
||||
line "are so beautiful…"
|
||||
|
||||
@ -329,13 +329,13 @@ DanceTheatreGrannyText:
|
||||
cont "thing is possible."
|
||||
done
|
||||
|
||||
DanceTheatreFancyPanelText:
|
||||
DanceTheaterFancyPanelText:
|
||||
text "It's a fancy panel"
|
||||
line "that's decorated"
|
||||
cont "with flowers."
|
||||
done
|
||||
|
||||
DanceTheatre_MapEvents:
|
||||
DanceTheater_MapEvents:
|
||||
db 0, 0 ; filler
|
||||
|
||||
def_warp_events
|
||||
@ -345,8 +345,8 @@ DanceTheatre_MapEvents:
|
||||
def_coord_events
|
||||
|
||||
def_bg_events
|
||||
bg_event 5, 6, BGEVENT_UP, DanceTheatreFancyPanel
|
||||
bg_event 6, 6, BGEVENT_UP, DanceTheatreFancyPanel
|
||||
bg_event 5, 6, BGEVENT_UP, DanceTheaterFancyPanel
|
||||
bg_event 6, 6, BGEVENT_UP, DanceTheaterFancyPanel
|
||||
|
||||
def_object_events
|
||||
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 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 10, 10, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, DanceTheatreCooltrainerMScript, -1
|
||||
object_event 3, 6, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DanceTheatreGrannyScript, -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, DanceTheaterGrannyScript, -1
|
@ -267,7 +267,7 @@ EcruteakCity_MapEvents:
|
||||
warp_event 20, 3, WISE_TRIOS_ROOM, 2
|
||||
warp_event 23, 27, ECRUTEAK_POKECENTER_1F, 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 6, 27, ECRUTEAK_GYM, 1
|
||||
warp_event 13, 27, ECRUTEAK_ITEMFINDER_HOUSE, 1
|
||||
|
Loading…
Reference in New Issue
Block a user