diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-03 10:13:06 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-03 10:13:06 -0500 |
| commit | 826e070f0443b50ff31a49b4faf7c66577f1e26e (patch) | |
| tree | 5a466635490c15e6a9e78e037507a22fceb1da9f /maps | |
| parent | 01d6e6c75843fdc0035499ce0214c19be74a9bda (diff) | |
More syncing with pokegold
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/DanceTheatre.asm | 14 | ||||
| -rw-r--r-- | maps/Route29.asm | 2 | ||||
| -rw-r--r-- | maps/Route35GoldenrodGate.asm | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 2853ca5c8..fa3597977 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -14,13 +14,13 @@ DanceTheatre_MapScripts: def_callbacks -TrainerKimonoGirlNaoko2: - trainer KIMONO_GIRL, NAOKO2, 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 @@ -135,18 +135,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." @@ -349,7 +349,7 @@ DanceTheatre_MapEvents: bg_event 6, 6, BGEVENT_UP, DanceTheatreFancyPanel def_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 diff --git a/maps/Route29.asm b/maps/Route29.asm index fa8e3ff15..3009c4b6e 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -322,7 +322,7 @@ Route29FisherText: line "progress." done -Text_WaitingForDay: ; unreferenced +Route29CooltrainerMText_WaitingForDay: ; unreferenced text "I'm waiting for" line "#MON that" diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm index eedbbddd4..2eae3cd47 100644 --- a/maps/Route35GoldenrodGate.asm +++ b/maps/Route35GoldenrodGate.asm @@ -20,7 +20,7 @@ RandyScript: writetext Route35GoldenrodGateRandyAskTakeThisMonToMyFriendText yesorno iffalse .refused - writetext Route35GoldenrodGateRandyThanksKidText + writetext Route35GoldenrodGateRandyThanksText promptbutton waitsfx readvar VAR_PARTYCOUNT @@ -73,7 +73,7 @@ GiftSpearowName: GiftSpearowOTName: db "RANDY@" - db 0 ; filler + db 0 ; unused Route35GoldenrodGatePokefanFScript: faceplayer @@ -106,7 +106,7 @@ Route35GoldenrodGateRandyAskTakeThisMonToMyFriendText: para "He's on ROUTE 31." done -Route35GoldenrodGateRandyThanksKidText: +Route35GoldenrodGateRandyThanksText: text "You will? Perfect!" line "Thanks, kid!" |