diff options
Diffstat (limited to 'maps/DanceTheatre.asm')
| -rw-r--r-- | maps/DanceTheatre.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 7b6b5ed5..83aee34e 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -1,4 +1,4 @@ - const_def 2 ; object constants + object_const_def ; object_event constants const DANCETHEATRE_KIMONO_GIRL1 const DANCETHEATRE_KIMONO_GIRL2 const DANCETHEATRE_KIMONO_GIRL3 @@ -14,13 +14,13 @@ DanceTheatre_MapScripts: db 0 ; callbacks -TrainerKimonoGirlNaoko2: - trainer KIMONO_GIRL, NAOKO, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaoko2SeenText, KimonoGirlNaoko2BeatenText, 0, .Script +TrainerKimonoGirlNaoko: + trainer KIMONO_GIRL, NAOKO, EVENT_BEAT_KIMONO_GIRL_NAOKO, KimonoGirlNaokoSeenText, KimonoGirlNaokoBeatenText, 0, .Script .Script: endifjustbattled opentext - writetext KimonoGirlNaoko2AfterBattleText + writetext KimonoGirlNaokoAfterBattleText waitbutton closetext end @@ -127,18 +127,18 @@ DanceTheatreGrannyScript: DanceTheatreFancyPanel: jumptext DanceTheatreFancyPanelText -KimonoGirlNaoko2SeenText: +KimonoGirlNaokoSeenText: text "You have lovely" line "#MON. May I see" cont "them in battle?" done -KimonoGirlNaoko2BeatenText: +KimonoGirlNaokoBeatenText: text "Oh, you are very" line "strong." done -KimonoGirlNaoko2AfterBattleText: +KimonoGirlNaokoAfterBattleText: text "I enjoyed that" line "bout. I would like" cont "to see you again." @@ -333,7 +333,7 @@ DanceTheatre_MapEvents: bg_event 6, 6, BGEVENT_UP, DanceTheatreFancyPanel db 9 ; object events - object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko2, -1 + object_event 0, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlNaoko, -1 object_event 2, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlSayo, -1 object_event 6, 2, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlZuki, -1 object_event 9, 1, SPRITE_KIMONO_GIRL, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerKimonoGirlKuni, -1 |