diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 54f9432d1..63ff63218 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -91,35 +91,35 @@ TrainerTwinsAmyandmay2: closetext end -TrainerBug_catcherbenny: - trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherbennySeenText, Bug_catcherbennyBeatenText, 0, .AfterScript +TrainerBugCatcherbenny: + trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, BugCatcherbennySeenText, BugCatcherbennyBeatenText, 0, .AfterScript .AfterScript: end_if_just_battled opentext - writetext Bug_catcherbennyAfterBattleText + writetext BugCatcherbennyAfterBattleText waitbutton closetext end -TrainerBug_catcherAl: - trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, 0, .AfterScript +TrainerBugCatcherAl: + trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, BugCatcherAlSeenText, BugCatcherAlBeatenText, 0, .AfterScript .AfterScript: end_if_just_battled opentext - writetext Bug_catcherAlAfterBattleText + writetext BugCatcherAlAfterBattleText waitbutton closetext end -TrainerBug_catcherJosh: - trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, 0, .AfterScript +TrainerBugCatcherJosh: + trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, BugCatcherJoshSeenText, BugCatcherJoshBeatenText, 0, .AfterScript .AfterScript: end_if_just_battled opentext - writetext Bug_catcherJoshAfterBattleText + writetext BugCatcherJoshAfterBattleText waitbutton closetext end @@ -232,7 +232,7 @@ BugsyText_BugMonsAreDeep: line "ites thoroughly." done -Bug_catcherbennySeenText: +BugCatcherbennySeenText: text "Bug #MON evolve" line "young. So they get" @@ -240,18 +240,18 @@ Bug_catcherbennySeenText: line "faster." done -Bug_catcherbennyBeatenText: +BugCatcherbennyBeatenText: text "Just evolving" line "isn't enough!" done -Bug_catcherbennyAfterBattleText: +BugCatcherbennyAfterBattleText: text "#MON become" line "stronger if they" cont "evolve. Really!" done -Bug_catcherAlSeenText: +BugCatcherAlSeenText: text "Bug #MON are" line "cool and tough!" @@ -259,12 +259,12 @@ Bug_catcherAlSeenText: line "you!" done -Bug_catcherAlBeatenText: +BugCatcherAlBeatenText: text "You proved how" line "tough you are…" done -Bug_catcherAlAfterBattleText: +BugCatcherAlAfterBattleText: text "They're so cool," line "but most girls" @@ -274,7 +274,7 @@ Bug_catcherAlAfterBattleText: para "I don't know why…" done -Bug_catcherJoshSeenText: +BugCatcherJoshSeenText: text "You saved all the" line "SLOWPOKE? Whew," cont "you're mighty!" @@ -284,11 +284,11 @@ Bug_catcherJoshSeenText: cont "tough too!" done -Bug_catcherJoshBeatenText: +BugCatcherJoshBeatenText: text "Urrgggh!" done -Bug_catcherJoshAfterBattleText: +BugCatcherJoshAfterBattleText: text "I guess I should" line "teach them better" cont "moves…" @@ -381,9 +381,9 @@ AzaleaGym_MapEventHeader: .ObjectEvents: db 7 object_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1 - object_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBug_catcherbenny, -1 - object_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherAl, -1 - object_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1 + object_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherbenny, -1 + object_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1 + object_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherJosh, -1 object_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1 object_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1 object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1 diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index f2a7717f6..ab2febc5f 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -22,13 +22,13 @@ TrainerFirebreatherLyle: closetext end -TrainerBug_catcherKen: - trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, Bug_catcherKenSeenText, Bug_catcherKenBeatenText, 0, .Script +TrainerBugCatcherKen: + trainer EVENT_BEAT_BUG_CATCHER_KEN, BUG_CATCHER, KEN, BugCatcherKenSeenText, BugCatcherKenBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bug_catcherKenAfterBattleText + writetext BugCatcherKenAfterBattleText waitbutton closetext end @@ -132,18 +132,18 @@ FirebreatherLyleAfterBattleText: line "Really?" done -Bug_catcherKenSeenText: +BugCatcherKenSeenText: text "I'm visiting my" line "grandma to catch" cont "me some bugs!" done -Bug_catcherKenBeatenText: +BugCatcherKenBeatenText: text "Ooh, wow." line "You're tough!" done -Bug_catcherKenAfterBattleText: +BugCatcherKenAfterBattleText: text "You can find lots" line "of #MON in the" cont "trees of JOHTO!" @@ -246,6 +246,6 @@ FastShipCabins_SW_SSW_NW_MapEventHeader: .ObjectEvents: db 4 object_event SPRITE_FISHER, 15, 1, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP - object_event SPRITE_BUG_CATCHER, 15, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBug_catcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + object_event SPRITE_BUG_CATCHER, 15, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND object_event SPRITE_BUENA, 26, 1, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND object_event SPRITE_ROCKER, 28, 3, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 6ce300e27..fc9bbca86 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -387,13 +387,13 @@ IlexForestHeadbuttGuyScript: closetext end -TrainerBug_catcherWayne: - trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, Bug_catcherWayneSeenText, Bug_catcherWayneBeatenText, 0, .Script +TrainerBugCatcherWayne: + trainer EVENT_BEAT_BUG_CATCHER_WAYNE, BUG_CATCHER, WAYNE, BugCatcherWayneSeenText, BugCatcherWayneBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bug_catcherWayneAfterBattleText + writetext BugCatcherWayneAfterBattleText waitbutton closetext end @@ -913,7 +913,7 @@ Text_KurtCaughtCelebi: para "I'm going!" done -Bug_catcherWayneSeenText: +BugCatcherWayneSeenText: text "Don't sneak up on" line "me like that!" @@ -921,12 +921,12 @@ Bug_catcherWayneSeenText: line "#MON away!" done -Bug_catcherWayneBeatenText: +BugCatcherWayneBeatenText: text "I hadn't seen that" line "#MON before…" done -Bug_catcherWayneAfterBattleText: +BugCatcherWayneAfterBattleText: text "A #MON I've" line "never seen before" @@ -969,7 +969,7 @@ IlexForest_MapEventHeader: object_event SPRITE_POKE_BALL, 32, 20, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestRevive, EVENT_ILEX_FOREST_REVIVE object_event SPRITE_KURT, 29, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT object_event SPRITE_LASS, 24, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, IlexForestLassScript, EVENT_ILEX_FOREST_LASS - object_event SPRITE_YOUNGSTER, 1, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerBug_catcherWayne, -1 + object_event SPRITE_YOUNGSTER, 1, 12, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 0, TrainerBugCatcherWayne, -1 object_event SPRITE_POKE_BALL, 17, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestXAttack, EVENT_ILEX_FOREST_X_ATTACK object_event SPRITE_POKE_BALL, 7, 17, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestAntidote, EVENT_ILEX_FOREST_ANTIDOTE object_event SPRITE_POKE_BALL, 1, 27, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IlexForestEther, EVENT_ILEX_FOREST_ETHER diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 847de0e44..500dab0c9 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -11,13 +11,13 @@ OlivineLighthouse3F_MapScriptHeader: .MapCallbacks: db 0 -TrainerBird_keeperTheo: - trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, Bird_keeperTheoSeenText, Bird_keeperTheoBeatenText, 0, .Script +TrainerBirdKeeperTheo: + trainer EVENT_BEAT_BIRD_KEEPER_THEO, BIRD_KEEPER, THEO, BirdKeeperTheoSeenText, BirdKeeperTheoBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bird_keeperTheoAfterBattleText + writetext BirdKeeperTheoAfterBattleText waitbutton closetext end @@ -47,7 +47,7 @@ TrainerSailorTerrell: OlivineLighthouse3FEther: itemball ETHER -Bird_keeperTheoSeenText: +BirdKeeperTheoSeenText: text "Why are you here?" line "Are you just going" @@ -55,12 +55,12 @@ Bird_keeperTheoSeenText: line "that you leave!" done -Bird_keeperTheoBeatenText: +BirdKeeperTheoBeatenText: text "You really are" line "concerned…" done -Bird_keeperTheoAfterBattleText: +BirdKeeperTheoAfterBattleText: text "How the heck do" line "you go up?" @@ -138,5 +138,5 @@ OlivineLighthouse3F_MapEventHeader: db 4 object_event SPRITE_SAILOR, 2, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSailorTerrell, -1 object_event SPRITE_GENTLEMAN, 5, 13, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerGentlemanPreston, -1 - object_event SPRITE_YOUNGSTER, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperTheo, -1 + object_event SPRITE_YOUNGSTER, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperTheo, -1 object_event SPRITE_POKE_BALL, 2, 8, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse3FEther, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 2c166bc69..5b29a089e 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -12,13 +12,13 @@ OlivineLighthouse5F_MapScriptHeader: .MapCallbacks: db 0 -TrainerBird_keeperDenis: - trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, Bird_keeperDenisSeenText, Bird_keeperDenisBeatenText, 0, .Script +TrainerBirdKeeperDenis: + trainer EVENT_BEAT_BIRD_KEEPER_DENIS, BIRD_KEEPER, DENIS, BirdKeeperDenisSeenText, BirdKeeperDenisBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bird_keeperDenisAfterBattleText + writetext BirdKeeperDenisAfterBattleText waitbutton closetext end @@ -69,7 +69,7 @@ SailorErnestAfterBattleText: cont "compassionate." done -Bird_keeperDenisSeenText: +BirdKeeperDenisSeenText: text "We're pretty high" line "up here. My bird" @@ -77,11 +77,11 @@ Bird_keeperDenisSeenText: line "prime form." done -Bird_keeperDenisBeatenText: +BirdKeeperDenisBeatenText: text "Oops…They crashed…" done -Bird_keeperDenisAfterBattleText: +BirdKeeperDenisAfterBattleText: text "My #MON learned" line "how to use FLY in" cont "CIANWOOD." @@ -115,7 +115,7 @@ OlivineLighthouse5F_MapEventHeader: .ObjectEvents: db 5 object_event SPRITE_SAILOR, 11, 8, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSailorErnest, -1 - object_event SPRITE_YOUNGSTER, 3, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBird_keeperDenis, -1 + object_event SPRITE_YOUNGSTER, 3, 8, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerBirdKeeperDenis, -1 object_event SPRITE_POKE_BALL, 12, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FRareCandy, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY object_event SPRITE_POKE_BALL, 15, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FSuperRepel, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL object_event SPRITE_POKE_BALL, 13, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse5FTMSwagger, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER diff --git a/maps/Route13.asm b/maps/Route13.asm index 7ea3738fd..3111b82f6 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -34,24 +34,24 @@ TrainerPokefanmJoshua: closetext end -TrainerBird_keeperPerry: - trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, Bird_keeperPerrySeenText, Bird_keeperPerryBeatenText, 0, .Script +TrainerBirdKeeperPerry: + trainer EVENT_BEAT_BIRD_KEEPER_PERRY, BIRD_KEEPER, PERRY, BirdKeeperPerrySeenText, BirdKeeperPerryBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bird_keeperPerryAfterBattleText + writetext BirdKeeperPerryAfterBattleText waitbutton closetext end -TrainerBird_keeperBret: - trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, Bird_keeperBretSeenText, Bird_keeperBretBeatenText, 0, .Script +TrainerBirdKeeperBret: + trainer EVENT_BEAT_BIRD_KEEPER_BRET, BIRD_KEEPER, BRET, BirdKeeperBretSeenText, BirdKeeperBretBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bird_keeperBretAfterBattleText + writetext BirdKeeperBretAfterBattleText waitbutton closetext end @@ -114,24 +114,24 @@ PokefanmJoshuaAfterBattleText: line "still the best." done -Bird_keeperPerrySeenText: +BirdKeeperPerrySeenText: text "Agility is the key" line "attribute of bird" cont "#MON." done -Bird_keeperPerryBeatenText: +BirdKeeperPerryBeatenText: text "You beat me with" line "your speed…" done -Bird_keeperPerryAfterBattleText: +BirdKeeperPerryAfterBattleText: text "Your #MON are" line "remarkably well-" cont "trained." done -Bird_keeperBretSeenText: +BirdKeeperBretSeenText: text "Check out my #-" line "MON. Just look at" @@ -139,12 +139,12 @@ Bird_keeperBretSeenText: line "their plumage." done -Bird_keeperBretBeatenText: +BirdKeeperBretBeatenText: text "Shoot!" line "Not good enough!" done -Bird_keeperBretAfterBattleText: +BirdKeeperBretAfterBattleText: text "If you groom them," line "#MON get happy." done @@ -211,8 +211,8 @@ Route13_MapEventHeader: .ObjectEvents: db 5 - object_event SPRITE_YOUNGSTER, 6, 42, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBird_keeperPerry, -1 - object_event SPRITE_YOUNGSTER, 6, 43, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBird_keeperBret, -1 + object_event SPRITE_YOUNGSTER, 6, 42, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperPerry, -1 + object_event SPRITE_YOUNGSTER, 6, 43, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperBret, -1 object_event SPRITE_POKEFAN_M, 8, 32, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmJoshua, -1 object_event SPRITE_POKEFAN_M, 10, 14, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerHikerKenny, -1 object_event SPRITE_POKEFAN_M, 6, 25, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmAlex, -1 diff --git a/maps/Route14.asm b/maps/Route14.asm index ba9a510af..411f5029a 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -30,13 +30,13 @@ TrainerPokefanmCarter: closetext end -TrainerBird_keeperRoy: - trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, 0, .Script +TrainerBirdKeeperRoy: + trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, BirdKeeperRoySeenText, BirdKeeperRoyBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bird_keeperRoyAfterBattleText + writetext BirdKeeperRoyAfterBattleText waitbutton closetext end @@ -72,18 +72,18 @@ PokefanmCarterAfterBattleText: line "well-balanced mix." done -Bird_keeperRoySeenText: +BirdKeeperRoySeenText: text "My dream is to fly" line "with my beloved" cont "bird #MON." done -Bird_keeperRoyBeatenText: +BirdKeeperRoyBeatenText: text "I can dream, but I" line "can't ever fly…" done -Bird_keeperRoyAfterBattleText: +BirdKeeperRoyAfterBattleText: text "You have #MON" line "that know the HM" @@ -131,6 +131,6 @@ Route14_MapEventHeader: .ObjectEvents: db 4 object_event SPRITE_POKEFAN_M, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmCarter, -1 - object_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperRoy, -1 + object_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRoy, -1 object_event SPRITE_POKEFAN_M, 11, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1 object_event SPRITE_TEACHER, 5, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 4, Kim, -1 diff --git a/maps/Route18.asm b/maps/Route18.asm index aaa2ce6cf..75ce7ca65 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -9,24 +9,24 @@ Route18_MapScriptHeader: .MapCallbacks: db 0 -TrainerBird_keeperBoris: - trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, 0, .Script +TrainerBirdKeeperBoris: + trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, BirdKeeperBorisSeenText, BirdKeeperBorisBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bird_keeperBorisAfterBattleText + writetext BirdKeeperBorisAfterBattleText waitbutton closetext end -TrainerBird_keeperBob: - trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, 0, .Script +TrainerBirdKeeperBob: + trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, BirdKeeperBobSeenText, BirdKeeperBobBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bird_keeperBobAfterBattleText + writetext BirdKeeperBobAfterBattleText waitbutton closetext end @@ -34,7 +34,7 @@ TrainerBird_keeperBob: Route18Sign: jumptext Route18SignText -Bird_keeperBorisSeenText: +BirdKeeperBorisSeenText: text "If you're looking" line "for #MON, you" @@ -42,27 +42,27 @@ Bird_keeperBorisSeenText: line "the tall grass." done -Bird_keeperBorisBeatenText: +BirdKeeperBorisBeatenText: text "Ayieee!" done -Bird_keeperBorisAfterBattleText: +BirdKeeperBorisAfterBattleText: text "Since you're so" line "strong, it must be" cont "fun to battle." done -Bird_keeperBobSeenText: +BirdKeeperBobSeenText: text "CYCLING ROAD is a" line "quick shortcut to" cont "CELADON." done -Bird_keeperBobBeatenText: +BirdKeeperBobBeatenText: text "…Whew!" done -Bird_keeperBobAfterBattleText: +BirdKeeperBobAfterBattleText: text "If you don't have" line "a BICYCLE, you're" @@ -95,5 +95,5 @@ Route18_MapEventHeader: .ObjectEvents: db 2 - object_event SPRITE_YOUNGSTER, 12, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperBoris, -1 - object_event SPRITE_YOUNGSTER, 6, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperBob, -1 + object_event SPRITE_YOUNGSTER, 12, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBoris, -1 + object_event SPRITE_YOUNGSTER, 6, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperBob, -1 diff --git a/maps/Route2.asm b/maps/Route2.asm index 80f703b16..cceac50f7 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -15,35 +15,35 @@ Route2_MapScriptHeader: .MapCallbacks: db 0 -TrainerBug_catcherRob: - trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, Bug_catcherRobSeenText, Bug_catcherRobBeatenText, 0, .Script +TrainerBugCatcherRob: + trainer EVENT_BEAT_BUG_CATCHER_ROB, BUG_CATCHER, ROB, BugCatcherRobSeenText, BugCatcherRobBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bug_catcherRobAfterBattleText + writetext BugCatcherRobAfterBattleText waitbutton closetext end -TrainerBug_catcherEd: - trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, Bug_catcherEdSeenText, Bug_catcherEdBeatenText, 0, .Script +TrainerBugCatcherEd: + trainer EVENT_BEAT_BUG_CATCHER_ED, BUG_CATCHER, ED, BugCatcherEdSeenText, BugCatcherEdBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bug_catcherEdAfterBattleText + writetext BugCatcherEdAfterBattleText waitbutton closetext end -TrainerBug_catcherDoug: - trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, Bug_catcherDougSeenText, Bug_catcherDougBeatenText, 0, .Script +TrainerBugCatcherDoug: + trainer EVENT_BEAT_BUG_CATCHER_DOUG, BUG_CATCHER, DOUG, BugCatcherDougSeenText, BugCatcherDougBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bug_catcherDougAfterBattleText + writetext BugCatcherDougAfterBattleText waitbutton closetext end @@ -81,23 +81,23 @@ Route2HiddenFullRestore: Route2HiddenRevive: dwb EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE -Bug_catcherRobSeenText: +BugCatcherRobSeenText: text "My bug #MON are" line "tough. Prepare to" cont "lose!" done -Bug_catcherRobBeatenText: +BugCatcherRobBeatenText: text "I was whipped…" done -Bug_catcherRobAfterBattleText: +BugCatcherRobAfterBattleText: text "I'm going to look" line "for stronger bug" cont "#MON." done -Bug_catcherEdSeenText: +BugCatcherEdSeenText: text "If you walk in" line "tall grass wearing" @@ -105,26 +105,26 @@ Bug_catcherEdSeenText: line "nicks and cuts?" done -Bug_catcherEdBeatenText: +BugCatcherEdBeatenText: text "Ouch, ouch, ouch!" done -Bug_catcherEdAfterBattleText: +BugCatcherEdAfterBattleText: text "They'll really" line "sting when you" cont "take a bath." done -Bug_catcherDougSeenText: +BugCatcherDougSeenText: text "Why don't girls" line "like bug #MON?" done -Bug_catcherDougBeatenText: +BugCatcherDougBeatenText: text "No good!" done -Bug_catcherDougAfterBattleText: +BugCatcherDougAfterBattleText: text "Bug #MON squish" line "like plush toys" @@ -172,9 +172,9 @@ Route2_MapEventHeader: .ObjectEvents: db 8 - object_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBug_catcherRob, -1 - object_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherEd, -1 - object_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherDoug, -1 + object_event SPRITE_BUG_CATCHER, 45, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherRob, -1 + object_event SPRITE_BUG_CATCHER, 4, 6, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEd, -1 + object_event SPRITE_BUG_CATCHER, 40, 0, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDoug, -1 object_event SPRITE_POKE_BALL, 29, 0, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2DireHit, EVENT_ROUTE_2_DIRE_HIT object_event SPRITE_POKE_BALL, 23, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2MaxPotion, EVENT_ROUTE_2_MAX_POTION object_event SPRITE_POKE_BALL, 2, 19, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route2Carbos, EVENT_ROUTE_2_CARBOS diff --git a/maps/Route27.asm b/maps/Route27.asm index a058af254..e58ae3656 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -59,8 +59,8 @@ TrainerPsychicGilbert: closetext end -TrainerBird_keeperJose2: - trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, Bird_keeperJose2SeenText, Bird_keeperJose2BeatenText, 0, .Script +TrainerBirdKeeperJose2: + trainer EVENT_BEAT_BIRD_KEEPER_JOSE2, BIRD_KEEPER, JOSE2, BirdKeeperJose2SeenText, BirdKeeperJose2BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE @@ -92,7 +92,7 @@ UnknownScript_0x1a08eb: UnknownScript_0x1a08ff: scall UnknownScript_0x1a096f - winlosstext Bird_keeperJose2BeatenText, 0 + winlosstext BirdKeeperJose2BeatenText, 0 copybytetovar wJoseFightCount if_equal 2, .Fight2 if_equal 1, .Fight1 @@ -443,12 +443,12 @@ PsychicGilbertAfterBattleText: line "premonition says." done -Bird_keeperJose2SeenText: +BirdKeeperJose2SeenText: text "Tweet! Tweet!" line "Tetweet!" done -Bird_keeperJose2BeatenText: +BirdKeeperJose2BeatenText: text "Tweet!" done @@ -493,7 +493,7 @@ Route27_MapEventHeader: object_event SPRITE_COOLTRAINER_F, 10, 72, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainerfReena, -1 object_event SPRITE_COOLTRAINER_F, 6, 37, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerCooltrainerfMegan, -1 object_event SPRITE_YOUNGSTER, 7, 65, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicGilbert, -1 - object_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperJose2, -1 + object_event SPRITE_YOUNGSTER, 13, 58, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperJose2, -1 object_event SPRITE_POKE_BALL, 12, 60, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27TMSolarbeam, EVENT_ROUTE_27_TM_SOLARBEAM object_event SPRITE_POKE_BALL, 12, 53, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route27RareCandy, EVENT_ROUTE_27_RARE_CANDY object_event SPRITE_FISHER, 10, 21, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 3, Route27FisherScript, -1 diff --git a/maps/Route30.asm b/maps/Route30.asm index 7a98c6a7e..293238095 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -196,13 +196,13 @@ TrainerYoungsterMikey: closetext end -TrainerBug_catcherDon: - trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, Bug_catcherDonSeenText, Bug_catcherDonBeatenText, 0, .Script +TrainerBugCatcherDon: + trainer EVENT_BEAT_BUG_CATCHER_DON, BUG_CATCHER, DON, BugCatcherDonSeenText, BugCatcherDonBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bug_catcherDonAfterText + writetext BugCatcherDonAfterText waitbutton closetext end @@ -325,18 +325,18 @@ YoungsterMikeyAfterText: cont "to get better." done -Bug_catcherDonSeenText: +BugCatcherDonSeenText: text "Instead of a bug" line "#MON, I found" cont "a trainer!" done -Bug_catcherDonBeatenText: +BugCatcherDonBeatenText: text "Argh! You're too" line "strong!" done -Bug_catcherDonAfterText: +BugCatcherDonAfterText: text "I ran out of #" line "BALLS while I was" cont "catching #MON." @@ -432,7 +432,7 @@ Route30_MapEventHeader: object_event SPRITE_YOUNGSTER, 26, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, YoungsterJoey_ImportantBattleScript, EVENT_ROUTE_30_BATTLE object_event SPRITE_YOUNGSTER, 28, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY object_event SPRITE_YOUNGSTER, 23, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1 - object_event SPRITE_BUG_CATCHER, 7, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherDon, -1 + object_event SPRITE_BUG_CATCHER, 7, 1, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherDon, -1 object_event SPRITE_YOUNGSTER, 30, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route30YoungsterScript, -1 object_event SPRITE_MONSTER, 24, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE object_event SPRITE_MONSTER, 25, 5, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE diff --git a/maps/Route31.asm b/maps/Route31.asm index d356f2c6f..efd236b28 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -24,8 +24,8 @@ Route31_MapScriptHeader: specialphonecall SPECIALCALL_WORRIED return -TrainerBug_catcherWade1: - trainer EVENT_BEAT_BUG_CATCHER_WADE, BUG_CATCHER, WADE1, Bug_catcherWade1SeenText, Bug_catcherWade1BeatenText, 0, .Script +TrainerBugCatcherWade1: + trainer EVENT_BEAT_BUG_CATCHER_WADE, BUG_CATCHER, WADE1, BugCatcherWade1SeenText, BugCatcherWade1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_WADE @@ -39,7 +39,7 @@ TrainerBug_catcherWade1: iftrue .AcceptedNumberSTD checkevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER iftrue .AskAgain - writetext Bug_catcherWade1AfterText + writetext BugCatcherWade1AfterText waitbutton setevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER scall .AskPhoneNumberSTD @@ -57,7 +57,7 @@ TrainerBug_catcherWade1: .WadeRematch: scall .RematchSTD - winlosstext Bug_catcherWade1BeatenText, 0 + winlosstext BugCatcherWade1BeatenText, 0 copybytetovar wWadeFightCount if_equal 4, .Fight4 if_equal 3, .Fight3 @@ -274,17 +274,17 @@ Route31CooltrainerMText: cont "explore it." done -Bug_catcherWade1SeenText: +BugCatcherWade1SeenText: text "I caught a bunch" line "of #MON. Let me" cont "battle with you!" done -Bug_catcherWade1BeatenText: +BugCatcherWade1BeatenText: text "Awwwww…" done -Bug_catcherWade1AfterText: +BugCatcherWade1AfterText: text "You can catch" line "#MON even if" @@ -438,7 +438,7 @@ Route31_MapEventHeader: db 7 object_event SPRITE_FISHER, 7, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31MailRecipientScript, -1 object_event SPRITE_YOUNGSTER, 5, 9, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31YoungsterScript, -1 - object_event SPRITE_BUG_CATCHER, 13, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBug_catcherWade1, -1 + object_event SPRITE_BUG_CATCHER, 13, 21, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherWade1, -1 object_event SPRITE_COOLTRAINER_M, 8, 33, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31CooltrainerMScript, -1 object_event SPRITE_FRUIT_TREE, 7, 16, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route31FruitTree, -1 object_event SPRITE_POKE_BALL, 5, 29, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route31Potion, EVENT_ROUTE_31_POTION diff --git a/maps/Route32.asm b/maps/Route32.asm index 660f972f3..43df9f0a3 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -440,13 +440,13 @@ TrainerYoungsterGordon: closetext end -TrainerBird_keeperPeter: - trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, Bird_keeperPeterSeenText, Bird_keeperPeterBeatenText, 0, .Script +TrainerBirdKeeperPeter: + trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, BirdKeeperPeterSeenText, BirdKeeperPeterBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bird_keeperPeterAfterText + writetext BirdKeeperPeterAfterText waitbutton closetext end @@ -821,19 +821,19 @@ PicnickerLiz1AfterText: line "nice chat too." done -Bird_keeperPeterSeenText: +BirdKeeperPeterSeenText: text "That BADGE! It's" line "from VIOLET CITY!" para "You beat FALKNER?" done -Bird_keeperPeterBeatenText: +BirdKeeperPeterBeatenText: text "I know what my" line "weaknesses are." done -Bird_keeperPeterAfterText: +BirdKeeperPeterAfterText: text "I should train" line "again at the GYM" cont "in VIOLET CITY." @@ -965,7 +965,7 @@ Route32_MapEventHeader: object_event SPRITE_YOUNGSTER, 45, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1 object_event SPRITE_LASS, 30, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1 object_event SPRITE_COOLTRAINER_M, 8, 19, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1 - object_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperPeter, -1 + object_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperPeter, -1 object_event SPRITE_FISHER, 70, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS object_event SPRITE_POKE_BALL, 53, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL object_event SPRITE_FISHER, 13, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1 diff --git a/maps/Route35.asm b/maps/Route35.asm index 2e10bd22a..59a5d57e9 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -18,13 +18,13 @@ Route35_MapScriptHeader: .MapCallbacks: db 0 -TrainerBird_keeperBryan: - trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, Bird_keeperBryanSeenText, Bird_keeperBryanBeatenText, 0, .Script +TrainerBirdKeeperBryan: + trainer EVENT_BEAT_BIRD_KEEPER_BRYAN, BIRD_KEEPER, BRYAN, BirdKeeperBryanSeenText, BirdKeeperBryanBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bird_keeperBryanAfterBattleText + writetext BirdKeeperBryanAfterBattleText waitbutton closetext end @@ -128,8 +128,8 @@ TrainerPicnickerKim: closetext end -TrainerBug_catcherArnie1: - trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, Bug_catcherArnie1SeenText, Bug_catcherArnie1BeatenText, 0, .Script +TrainerBugCatcherArnie1: + trainer EVENT_BEAT_BUG_CATCHER_ARNIE, BUG_CATCHER, ARNIE1, BugCatcherArnie1SeenText, BugCatcherArnie1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE @@ -161,7 +161,7 @@ UnknownScript_0x19c9a7: UnknownScript_0x19c9bb: scall UnknownScript_0x19c91b - winlosstext Bug_catcherArnie1BeatenText, 0 + winlosstext BugCatcherArnie1BeatenText, 0 copybytetovar wArnieFightCount if_equal 4, .Fight4 if_equal 3, .Fight3 @@ -344,17 +344,17 @@ PicnickerKimAfterBattleText: cont "them." done -Bird_keeperBryanSeenText: +BirdKeeperBryanSeenText: text "What kinds of" line "BALLS do you use?" done -Bird_keeperBryanBeatenText: +BirdKeeperBryanBeatenText: text "Yikes! Not fast" line "enough!" done -Bird_keeperBryanAfterBattleText: +BirdKeeperBryanAfterBattleText: text "Some #MON flee" line "right away." @@ -389,13 +389,13 @@ UnknownText_0x19cd5a: line "electrified me!" done -Bug_catcherArnie1SeenText: +BugCatcherArnie1SeenText: text "I'll go anywhere" line "if bug #MON" cont "appear there." done -Bug_catcherArnie1BeatenText: +BugCatcherArnie1BeatenText: text "Huh? I shouldn't" line "have lost that…" done @@ -486,9 +486,9 @@ Route35_MapEventHeader: object_event SPRITE_YOUNGSTER, 20, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperElliot, -1 object_event SPRITE_LASS, 20, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPicnickerBrooke, -1 object_event SPRITE_LASS, 26, 10, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerKim, -1 - object_event SPRITE_YOUNGSTER, 28, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerBird_keeperBryan, -1 + object_event SPRITE_YOUNGSTER, 28, 14, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerBirdKeeperBryan, -1 object_event SPRITE_FISHER, 10, 2, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherWalt, -1 - object_event SPRITE_BUG_CATCHER, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherArnie1, -1 + object_event SPRITE_BUG_CATCHER, 7, 16, SPRITEMOVEDATA_STANDING_DOWN, 0, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherArnie1, -1 object_event SPRITE_SUPER_NERD, 10, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerJugglerIrwin, -1 object_event SPRITE_OFFICER, 6, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ca49, -1 object_event SPRITE_FRUIT_TREE, 25, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19ca7e, -1 diff --git a/maps/Route38.asm b/maps/Route38.asm index f2ae60489..c4b957465 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -14,13 +14,13 @@ Route38_MapScriptHeader: .MapCallbacks: db 0 -TrainerBird_keeperToby: - trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, 0, .Script +TrainerBirdKeeperToby: + trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, BirdKeeperTobySeenText, BirdKeeperTobyBeatenText, 0, .Script .Script end_if_just_battled opentext - writetext Bird_keeperTobyAfterBattleText + writetext BirdKeeperTobyAfterBattleText waitbutton closetext end @@ -322,18 +322,18 @@ Route38TrainerTips: FruitTreeScript_0x1a1f33: fruittree FRUITTREE_ROUTE_38 -Bird_keeperTobySeenText: +BirdKeeperTobySeenText: text "Fly high into the" line "sky, my beloved" cont "bird #MON!" done -Bird_keeperTobyBeatenText: +BirdKeeperTobyBeatenText: text "I feel like just" line "flying away now." done -Bird_keeperTobyAfterBattleText: +BirdKeeperTobyAfterBattleText: text "I plan to train in" line "CIANWOOD CITY to" @@ -493,7 +493,7 @@ Route38_MapEventHeader: db 7 object_event SPRITE_STANDING_YOUNGSTER, 1, 4, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerSchoolboyChad1, -1 object_event SPRITE_LASS, 3, 15, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerLassDana1, -1 - object_event SPRITE_STANDING_YOUNGSTER, 15, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBird_keeperToby, -1 + object_event SPRITE_STANDING_YOUNGSTER, 15, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBirdKeeperToby, -1 object_event SPRITE_BUENA, 9, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerBeautyValerie, -1 object_event SPRITE_SAILOR, 5, 24, SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSailorHarry, -1 object_event SPRITE_FRUIT_TREE, 10, 12, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x1a1f33, -1 diff --git a/maps/Route4.asm b/maps/Route4.asm index cb1b18d69..e4797656e 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -11,13 +11,13 @@ Route4_MapScriptHeader: .MapCallbacks: db 0 -TrainerBird_keeperHank: - trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, 0, .Script +TrainerBirdKeeperHank: + trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bird_keeperHankAfterBattleText + writetext BirdKeeperHankAfterBattleText waitbutton closetext end @@ -54,18 +54,18 @@ Route4HiddenUltraBall: dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL -Bird_keeperHankSeenText: +BirdKeeperHankSeenText: text "I'm raising my" line "#MON. Want to" cont "battle with me?" done -Bird_keeperHankBeatenText: +BirdKeeperHankBeatenText: text "Ack! I lost that" line "one…" done -Bird_keeperHankAfterBattleText: +BirdKeeperHankAfterBattleText: text "If you have a" line "specific #MON" @@ -139,7 +139,7 @@ Route4_MapEventHeader: .ObjectEvents: db 4 - object_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperHank, -1 + object_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1 object_event SPRITE_LASS, 8, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1 object_event SPRITE_LASS, 6, 21, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 object_event SPRITE_POKE_BALL, 3, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP diff --git a/maps/Route44.asm b/maps/Route44.asm index a12953ebc..29ff0399a 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -18,8 +18,8 @@ Route44_MapScriptHeader: .MapCallbacks: db 0 -TrainerBird_keeperVance1: - trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, Bird_keeperVance1SeenText, Bird_keeperVance1BeatenText, 0, .Script +TrainerBirdKeeperVance1: + trainer EVENT_BEAT_BIRD_KEEPER_VANCE, BIRD_KEEPER, VANCE1, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script .Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE @@ -49,7 +49,7 @@ UnknownScript_0x19d856: UnknownScript_0x19d86a: scall UnknownScript_0x19d8f7 - winlosstext Bird_keeperVance1BeatenText, 0 + winlosstext BirdKeeperVance1BeatenText, 0 copybytetovar wVanceFightCount if_equal 2, .Fight2 if_equal 1, .Fight1 @@ -368,13 +368,13 @@ FisherEdgarAfterBattleText: line "again for a while." done -Bird_keeperVance1SeenText: +BirdKeeperVance1SeenText: text "Do you know about" line "the legendary bird" cont "#MON?" done -Bird_keeperVance1BeatenText: +BirdKeeperVance1BeatenText: text "Whew! You're hot" line "stuff." done @@ -530,7 +530,7 @@ Route44_MapEventHeader: object_event SPRITE_FISHER, 13, 19, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerFisherEdgar, -1 object_event SPRITE_YOUNGSTER, 9, 10, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicPhil, -1 object_event SPRITE_SUPER_NERD, 2, 43, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerPokemaniacZach, -1 - object_event SPRITE_YOUNGSTER, 5, 51, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBird_keeperVance1, -1 + object_event SPRITE_YOUNGSTER, 5, 51, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 2, TrainerBirdKeeperVance1, -1 object_event SPRITE_COOLTRAINER_M, 15, 41, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainermAllen, -1 object_event SPRITE_COOLTRAINER_F, 14, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerCooltrainerfCybil, -1 object_event SPRITE_FRUIT_TREE, 5, 9, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x19da40, -1 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index a40fe33db..239cdcd7a 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -66,24 +66,24 @@ VioletGymActivateRockets: .RadioTowerRockets: jumpstd radiotowerrockets -TrainerBird_keeperRod: - trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, Bird_keeperRodSeenText, Bird_keeperRodBeatenText, 0, .Script +TrainerBirdKeeperRod: + trainer EVENT_BEAT_BIRD_KEEPER_ROD, BIRD_KEEPER, ROD, BirdKeeperRodSeenText, BirdKeeperRodBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bird_keeperRodAfterBattleText + writetext BirdKeeperRodAfterBattleText waitbutton closetext end -TrainerBird_keeperAbe: - trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, Bird_keeperAbeSeenText, Bird_keeperAbeBeatenText, 0, .Script +TrainerBirdKeeperAbe: + trainer EVENT_BEAT_BIRD_KEEPER_ABE, BIRD_KEEPER, ABE, BirdKeeperAbeSeenText, BirdKeeperAbeBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bird_keeperAbeAfterBattleText + writetext BirdKeeperAbeAfterBattleText waitbutton closetext end @@ -209,7 +209,7 @@ UnknownText_0x68735: line "master!" done -Bird_keeperRodSeenText: +BirdKeeperRodSeenText: text "The keyword is" line "guts!" @@ -222,11 +222,11 @@ Bird_keeperRodSeenText: para "Come on!" done -Bird_keeperRodBeatenText: +BirdKeeperRodBeatenText: text "Gaaah!" done -Bird_keeperRodAfterBattleText: +BirdKeeperRodAfterBattleText: text "FALKNER's skills" line "are for real!" @@ -235,18 +235,18 @@ Bird_keeperRodAfterBattleText: cont "beat me!" done -Bird_keeperAbeSeenText: +BirdKeeperAbeSeenText: text "Let me see if you" line "are good enough to" cont "face FALKNER!" done -Bird_keeperAbeBeatenText: +BirdKeeperAbeBeatenText: text "This can't be" line "true!" done -Bird_keeperAbeAfterBattleText: +BirdKeeperAbeAfterBattleText: text "This is pathetic," line "losing to some" cont "rookie trainer…" @@ -301,6 +301,6 @@ VioletGym_MapEventHeader: .ObjectEvents: db 4 object_event SPRITE_FALKNER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FalknerScript_0x683c2, -1 - object_event SPRITE_YOUNGSTER, 6, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperRod, -1 - object_event SPRITE_YOUNGSTER, 10, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperAbe, -1 + object_event SPRITE_YOUNGSTER, 6, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRod, -1 + object_event SPRITE_YOUNGSTER, 10, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperAbe, -1 object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletGymGuyScript, -1