diff options
Diffstat (limited to 'maps/Route29.asm')
| -rw-r--r-- | maps/Route29.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route29.asm b/maps/Route29.asm index f5a2cff8b..1a1f83e94 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -145,7 +145,7 @@ Route29TeacherScript: Route29FisherScript: jumptextfaceplayer Route29FisherText -CooltrainerMScript_0x1a1031: +Route29CooltrainerMScript: faceplayer opentext checktime DAY @@ -153,13 +153,13 @@ CooltrainerMScript_0x1a1031: checktime NITE iftrue .nite .day_morn - writetext Text_WaitingForNight + writetext Route29CooltrainerMText_WaitingForNight waitbutton closetext end .nite - writetext Text_WaitingForMorning + writetext Route29CooltrainerMText_WaitingForMorning waitbutton closetext end @@ -331,7 +331,7 @@ Text_WaitingForDay: line "daytime." done -Text_WaitingForNight: +Route29CooltrainerMText_WaitingForNight: text "I'm waiting for" line "#MON that" @@ -339,7 +339,7 @@ Text_WaitingForNight: line "night." done -Text_WaitingForMorning: +Route29CooltrainerMText_WaitingForMorning: text "I'm waiting for" line "#MON that" @@ -433,6 +433,6 @@ Route29_MapEvents: object_event 15, 11, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route29TeacherScript, -1 object_event 12, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route29FruitTree, -1 object_event 25, 3, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route29FisherScript, -1 - object_event 13, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CooltrainerMScript_0x1a1031, -1 + object_event 13, 4, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route29CooltrainerMScript, -1 object_event 29, 12, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY object_event 48, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route29Potion, EVENT_ROUTE_29_POTION |