diff --git a/README.md b/README.md index 7766868c..9c15ca0a 100644 --- a/README.md +++ b/README.md @@ -286,9 +286,10 @@ Credits * ZumiIsawhat? - Restorations of beta OST * FrenchOrange - Reconstructions of various overworld beta sprites. * Helix Chamber, RacieBeep, loumilouminosus, Orchid, GBCRetro, & catstorm26 - Prototype Pokémon sprites -* Vortyne - Reused a bit of code from their pureRGB hack. Assisted in bug fixes. +* Vortiene - Reused a bit of code from their pureRGB hack. Assisted in bug fixes. * jojobear13 & Mateo - Move deleter & move relearner functionality from Shin Pokered, followed [this guide](https://github.com/jojobear13/shinpokered/blob/master/how%20to%20guides/how%20to%20add%20the%20move%20relearner%26deleter.txt). Tweaks were made to make it compatible with the pokered version we worked off of. * Rangi - Reused a bit of code from their Red* / Blue* hack to make HMs usable in the overworld! +* wrulfy - Technical advice * 大吟醸 (Daiginjo) - Assistance in translating the Tamamushi University Student Book, allowing for an accurate adaptation of the location. Original README.md proceeding; diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 8670ba19..77379a7e 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -185,7 +185,7 @@ DEF FIRST_INDOOR_MAP EQU const_value map_const SEAFOAM_ISLANDS_B3F, 15, 9 ; $A3 map_const SEAFOAM_ISLANDS_B4F, 15, 9 ; $A4 map_const CITRINE_TRADEBACK_HOUSE, 4, 4 ; $A5 - Was Vermillion Old Rod house - map_const FUCHSIA_GOOD_ROD_HOUSE, 4, 4 ; $A6 + map_const CITRINE_POKECENTER, 7, 4 ; $A6 - Was Fuschia Good Rod house map_const POKEMON_MANSION_1F, 15, 14 ; $A7 map_const CINNABAR_GYM, 10, 9 ; $A8 map_const CINNABAR_LAB, 9, 4 ; $A9 diff --git a/constants/script_constants.asm b/constants/script_constants.asm index d36cfd3c..689df9d6 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -20,16 +20,16 @@ DEF SLOTS_SOMEONESKEYS EQU $ff ; in game trades ; TradeMons indexes (see data/events/trades.asm) const_def - const TRADE_FOR_TERRY + const TRADE_FOR_LOLA const TRADE_FOR_MARCEL const TRADE_FOR_CHIKUCHIKU ; unused - const TRADE_FOR_SAILOR + const TRADE_FOR_HARRY const TRADE_FOR_DUX - const TRADE_FOR_MARC - const TRADE_FOR_LOLA - const TRADE_FOR_DORIS + const TRADE_FOR_JIMBO + const TRADE_FOR_MICHELLE + const TRADE_FOR_JENNY const TRADE_FOR_CRINKLES - const TRADE_FOR_SPOT + const TRADE_FOR_RICKY const TRADE_WITH_SELF ; Celadon University const TRADE_FOR_RATICATE_A ; LGPE Trade references - Viridian const TRADE_FOR_GOLEM_A ; Pewter diff --git a/data/events/bench_guys.asm b/data/events/bench_guys.asm index da9ba840..c465fd94 100644 --- a/data/events/bench_guys.asm +++ b/data/events/bench_guys.asm @@ -17,5 +17,6 @@ BenchGuyTextPointers: bench_guy_text SAFFRON_POKECENTER, SPRITE_FACING_LEFT, SaffronCityPokecenterBenchGuyText bench_guy_text MT_MOON_POKECENTER, SPRITE_FACING_LEFT, MtMoonPokecenterBenchGuyText bench_guy_text ROCK_TUNNEL_POKECENTER, SPRITE_FACING_LEFT, RockTunnelPokecenterBenchGuyText - bench_guy_text CELADON_UNIVERSITY_POKECENTER, SPRITE_FACING_LEFT, CeladonUniversityPokecenterBenchGuyText + bench_guy_text CELADON_UNIVERSITY_POKECENTER, SPRITE_FACING_LEFT, CeladonUniversityPokecenterBenchGuyText + bench_guy_text CITRINE_POKECENTER, SPRITE_FACING_LEFT, CitrinePokecenterGuyText db -1 ; end diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm index 53d2ecb0..15996c40 100644 --- a/data/events/hidden_objects.asm +++ b/data/events/hidden_objects.asm @@ -84,6 +84,7 @@ HiddenObjectMaps: db CERULEAN_CITY db ROUTE_4 db CELADON_UNIVERSITY_POKECENTER + db CITRINE_POKECENTER db -1 ; end HiddenObjectPointers: @@ -173,6 +174,7 @@ HiddenObjectPointers: dw CeruleanCityHiddenObjects dw Route4HiddenObjects dw CeladonUniversityPokecenterHiddenObjects + dw CitrinePokecenterHiddenObjects MACRO hidden_object db \2 ; y coord @@ -221,11 +223,6 @@ OaksLabHiddenObjects: hidden_object 1, 1, SPRITE_FACING_UP, DisplayOakLabEmailText db -1 ; end -ViridianPokecenterHiddenObjects: - hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - db -1 ; end - ViridianMartHiddenObjects: db -1 ; end @@ -254,12 +251,20 @@ PewterGymHiddenObjects: PewterMartHiddenObjects: db -1 ; end +; You don't need to re-define your hidden objects every time if they're always the same. +; Therefore, I put all the Pokecenters together. This saves a bunch of bytes. +ViridianPokecenterHiddenObjects: PewterPokecenterHiddenObjects: - hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - db -1 ; end - CeruleanPokecenterHiddenObjects: +LavenderPokecenterHiddenObjects: +VermilionPokecenterHiddenObjects: +CeladonPokecenterHiddenObjects: +FuchsiaPokecenterHiddenObjects: +CinnabarPokecenterHiddenObjects: +RockTunnelPokecenterHiddenObjects: +MtMoonPokecenterHiddenObjects: +CitrinePokecenterHiddenObjects: +CeladonUniversityPokecenterHiddenObjects: hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC db -1 ; end @@ -272,16 +277,6 @@ CeruleanGymHiddenObjects: CeruleanMartHiddenObjects: db -1 ; end -LavenderPokecenterHiddenObjects: - hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - db -1 ; end - -VermilionPokecenterHiddenObjects: - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText - db -1 ; end - VermilionGymHiddenObjects: hidden_object 3, 14, SPRITE_FACING_UP, GymStatues hidden_object 6, 14, SPRITE_FACING_UP, GymStatues @@ -308,11 +303,6 @@ CeladonMansion2HiddenObjects: hidden_object 0, 5, SPRITE_FACING_UP, OpenPokemonCenterPC db -1 ; end -CeladonPokecenterHiddenObjects: - hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - db -1 ; end - CeladonGymHiddenObjects: hidden_object 3, 15, SPRITE_FACING_UP, GymStatues hidden_object 6, 15, SPRITE_FACING_UP, GymStatues @@ -374,11 +364,6 @@ CeladonHotelHiddenObjects: hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText db -1 ; end -FuchsiaPokecenterHiddenObjects: - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText - db -1 ; end - FuchsiaGymHiddenObjects: hidden_object 3, 15, SPRITE_FACING_UP, GymStatues hidden_object 6, 15, SPRITE_FACING_UP, GymStatues @@ -395,25 +380,10 @@ CinnabarGymHiddenObjects: hidden_object 1, 7, (TRUE << 4) | 6, PrintCinnabarQuiz db -1 ; end -CinnabarPokecenterHiddenObjects: - hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - db -1 ; end - SaffronGymHiddenObjects: hidden_object 9, 15, SPRITE_FACING_UP, GymStatues db -1 ; end -MtMoonPokecenterHiddenObjects: - hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - db -1 ; end - -RockTunnelPokecenterHiddenObjects: - hidden_object 0, 4, SPRITE_FACING_LEFT, PrintBenchGuyText - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - db -1 ; end - ViridianForestHiddenObjects: hidden_object 1, 18, POTION, HiddenItems hidden_object 16, 42, ANTIDOTE, HiddenItems @@ -664,8 +634,3 @@ CeruleanCityHiddenObjects: Route4HiddenObjects: hidden_object 40, 3, GREAT_BALL, HiddenItems db -1 ; end - -CeladonUniversityPokecenterHiddenObjects: - hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText - hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC - db -1 ; end diff --git a/data/maps/headers/CitrinePokecenter.asm b/data/maps/headers/CitrinePokecenter.asm new file mode 100644 index 00000000..e2dd2f34 --- /dev/null +++ b/data/maps/headers/CitrinePokecenter.asm @@ -0,0 +1,2 @@ + map_header CitrinePokecenter, CITRINE_POKECENTER, POKECENTER, 0 + end_map_header diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm index 766d2353..f9e926ba 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -166,8 +166,8 @@ MapHeaderBanks:: db BANK(SeafoamIslandsB2F_h) db BANK(SeafoamIslandsB3F_h) db BANK(SeafoamIslandsB4F_h) - db BANK(CitrineTradebackHouse_h) - db BANK(FuchsiaGoodRodHouse_h) + db BANK(CitrineTradebackHouse_h) ; was old rod house + db BANK(CitrinePokecenter_h) ; was good rod house db BANK(PokemonMansion1F_h) db BANK(CinnabarGym_h) db BANK(CinnabarLab_h) diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index 02e3384d..480e3c26 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -166,8 +166,8 @@ MapHeaderPointers:: dw SeafoamIslandsB2F_h dw SeafoamIslandsB3F_h dw SeafoamIslandsB4F_h - dw CitrineTradebackHouse_h - dw FuchsiaGoodRodHouse_h + dw CitrineTradebackHouse_h ; was vermillion old rod house + dw CitrinePokecenter_h ; was fuschia good rod house dw PokemonMansion1F_h dw CinnabarGym_h dw CinnabarLab_h diff --git a/data/maps/objects/CitrineCity.asm b/data/maps/objects/CitrineCity.asm index 348605fc..ab2ecbfb 100644 --- a/data/maps/objects/CitrineCity.asm +++ b/data/maps/objects/CitrineCity.asm @@ -4,6 +4,7 @@ CitrineCity_Object: def_warp_events warp_event 9, 27, CITRINE_ROCKET_HOUSE, 1 warp_event 9, 17, CITRINE_TRADEBACK_HOUSE, 1 + warp_event 15, 17, CITRINE_POKECENTER, 1 def_bg_events diff --git a/data/maps/objects/CitrinePokecenter.asm b/data/maps/objects/CitrinePokecenter.asm new file mode 100644 index 00000000..8ee9a781 --- /dev/null +++ b/data/maps/objects/CitrinePokecenter.asm @@ -0,0 +1,18 @@ +CitrinePokecenter_Object: + db $0 ; border block + + def_warp_events + warp_event 3, 7, LAST_MAP, 6 + warp_event 4, 7, LAST_MAP, 6 + + def_bg_events + + def_object_events + object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person + object_event 5, 4, SPRITE_BRUNETTE_GIRL, WALK, LEFT_RIGHT, 2 ; person + object_event 10, 5, SPRITE_COOLTRAINER_M, WALK, ANY_DIR, 3 ; person + object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person + object_event 8, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Sandslash Trader + object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey + + def_warps_to CITRINE_POKECENTER diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm index 9a495ef3..e7f2c0c2 100644 --- a/data/maps/objects/FuchsiaCity.asm +++ b/data/maps/objects/FuchsiaCity.asm @@ -9,8 +9,8 @@ FuchsiaCity_Object: warp_event 18, 3, SAFARI_ZONE_GATE, 1 warp_event 5, 27, FUCHSIA_GYM, 1 warp_event 22, 13, FUCHSIA_MEETING_ROOM, 1 - warp_event 31, 27, FUCHSIA_GOOD_ROD_HOUSE, 2 - warp_event 31, 24, FUCHSIA_GOOD_ROD_HOUSE, 1 + ;warp_event 31, 27, FUCHSIA_GOOD_ROD_HOUSE, 2 these need to be replaced with...something. + ;warp_event 31, 24, FUCHSIA_GOOD_ROD_HOUSE, 1 def_bg_events bg_event 15, 23, 11 ; FuchsiaCityText11 diff --git a/data/maps/songs.asm b/data/maps/songs.asm index f5357037..f1518604 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -166,7 +166,7 @@ MapSongBanks:: db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B3F db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B4F db MUSIC_CITIES2, 0 ; CITRINE_TRADEBACK_HOUSE, was old rod house - db MUSIC_CITIES2, 0 ; FUCHSIA_GOOD_ROD_HOUSE + db MUSIC_POKECENTER, 0 ; CITRINE_POKECENTER was good rod house db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_1F db MUSIC_GYM, 0 ; CINNABAR_GYM db MUSIC_CINNABAR, 0 ; CINNABAR_LAB diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm index e1d9d3aa..43fc531d 100644 --- a/data/maps/town_map_entries.asm +++ b/data/maps/town_map_entries.asm @@ -96,7 +96,6 @@ InternalMapEntries: internal_map SAFARI_ZONE_GATE, 8, 12, SafariZoneName internal_map FUCHSIA_MEETING_ROOM, 8, 13, FuchsiaCityName internal_map SEAFOAM_ISLANDS_B4F, 5, 15, SeafoamIslandsName - internal_map FUCHSIA_GOOD_ROD_HOUSE, 8, 13, FuchsiaCityName internal_map POKEMON_MANSION_1F, 2, 15, PokemonMansionName internal_map CINNABAR_MART, 2, 15, CinnabarIslandName internal_map INDIGO_PLATEAU_LOBBY, 0, 2, IndigoPlateauName diff --git a/data/text/text_2.asm b/data/text/text_2.asm index a682431c..26aaf6ce 100644 --- a/data/text/text_2.asm +++ b/data/text/text_2.asm @@ -202,6 +202,19 @@ _RockTunnelPokecenterGuyText:: cont "LAVENDER TOWN!" done +_CitrinePokecenterGuyText:: + text "While #MON can" + line "become stronger" + cont "with vitamins," + cont "they only go" + cont "so far." + + para "#MON must" + line "battle to reach" + cont "their full" + cont "potential." + done + _UnusedBenchGuyText1:: text "I wish I could" line "catch #MON." diff --git a/data/text_predef_pointers.asm b/data/text_predef_pointers.asm index a9b2cc2c..ca6e0362 100644 --- a/data/text_predef_pointers.asm +++ b/data/text_predef_pointers.asm @@ -31,7 +31,7 @@ TextPredefs:: add_tx_pre MtMoonPokecenterBenchGuyText ; 19 add_tx_pre RockTunnelPokecenterBenchGuyText ; 1A add_tx_pre CeladonUniversityPokecenterBenchGuyText ; 1B - add_tx_pre UnusedBenchGuyText2 ; 1C XXX unused + add_tx_pre CitrinePokecenterGuyText ; 1C was unused bench guy text 2 add_tx_pre UnusedBenchGuyText3 ; 1D XXX unused add_tx_pre UnusedPredefText ; 1E XXX unused add_tx_pre PokemonCenterPCText ; 1F diff --git a/engine/events/hidden_objects/bench_guys.asm b/engine/events/hidden_objects/bench_guys.asm index aca8b918..8a37bae8 100644 --- a/engine/events/hidden_objects/bench_guys.asm +++ b/engine/events/hidden_objects/bench_guys.asm @@ -68,7 +68,7 @@ CeladonCityPokecenterBenchGuyText:: text_end FuchsiaCityPokecenterBenchGuyText:: - text_far _FuchsiaCityPokecenterGuyText + text_far _UnusedBenchGuyText3 ; replaced text_end CinnabarIslandPokecenterBenchGuyText:: @@ -96,3 +96,7 @@ SaffronCityPokecenterBenchGuyText2: CeladonCityHotelText:: text_far _CeladonCityHotelText text_end + +CitrinePokecenterGuyText:: + text_far _CitrinePokecenterGuyText + text_end diff --git a/maps.asm b/maps.asm index 37abb0fa..53e373d6 100644 --- a/maps.asm +++ b/maps.asm @@ -697,7 +697,7 @@ Route21_Blocks: INCBIN "maps/Route21.blk" Route12SuperRodHouse_Blocks: Daycare_Blocks: INCBIN "maps/Daycare.blk" -FuchsiaGoodRodHouse_Blocks: INCBIN "maps/FuchsiaGoodRodHouse.blk" +;FuchsiaGoodRodHouse_Blocks: INCBIN "maps/FuchsiaGoodRodHouse.blk" SECTION "Maps 12", ROMX @@ -718,9 +718,9 @@ INCLUDE "scripts/CeladonMart2F.asm" INCLUDE "data/maps/objects/CeladonMart2F.asm" CeladonMart2F_Blocks: INCBIN "maps/CeladonMart2F.blk" -INCLUDE "data/maps/headers/FuchsiaGoodRodHouse.asm" -INCLUDE "scripts/FuchsiaGoodRodHouse.asm" -INCLUDE "data/maps/objects/FuchsiaGoodRodHouse.asm" +;INCLUDE "data/maps/headers/FuchsiaGoodRodHouse.asm" +;INCLUDE "scripts/FuchsiaGoodRodHouse.asm" +;INCLUDE "data/maps/objects/FuchsiaGoodRodHouse.asm" INCLUDE "data/maps/headers/Daycare.asm" INCLUDE "scripts/Daycare.asm" @@ -1335,3 +1335,8 @@ INCLUDE "scripts/CitrineTradebackHouse.asm" INCLUDE "data/maps/objects/CitrineTradebackHouse.asm" INCLUDE "scripts/tradeback_move_tutor.asm" CitrineTradebackHouse_Blocks: INCBIN "maps/CitrineTradebackHouse.blk" + +INCLUDE "data/maps/headers/CitrinePokecenter.asm" +INCLUDE "scripts/CitrinePokecenter.asm" +INCLUDE "data/maps/objects/CitrinePokecenter.asm" +CitrinePokecenter_Blocks: INCBIN "maps/CitrinePokecenter.blk" diff --git a/maps/CitrinePokecenter.blk b/maps/CitrinePokecenter.blk new file mode 100644 index 00000000..9641efe4 --- /dev/null +++ b/maps/CitrinePokecenter.blk @@ -0,0 +1,2 @@ +  !"# +  \ No newline at end of file diff --git a/scripts/CinnabarLabFossilRoom.asm b/scripts/CinnabarLabFossilRoom.asm index b34064c5..1743e5b3 100644 --- a/scripts/CinnabarLabFossilRoom.asm +++ b/scripts/CinnabarLabFossilRoom.asm @@ -101,7 +101,7 @@ Lab4Text_75dd5: Lab4Text2: text_asm - ld a, TRADE_FOR_SAILOR + ld a, TRADE_FOR_JIMBO ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/CinnabarLabTradeRoom.asm b/scripts/CinnabarLabTradeRoom.asm index dce927b4..983d9a4b 100644 --- a/scripts/CinnabarLabTradeRoom.asm +++ b/scripts/CinnabarLabTradeRoom.asm @@ -13,7 +13,7 @@ Lab2Text1: Lab2Text2: text_asm - ld a, TRADE_FOR_DORIS + ld a, TRADE_FOR_JENNY ld [wWhichTrade], a jr Lab2DoTrade diff --git a/scripts/CitrinePokecenter.asm b/scripts/CitrinePokecenter.asm new file mode 100644 index 00000000..332d1cee --- /dev/null +++ b/scripts/CitrinePokecenter.asm @@ -0,0 +1,37 @@ +CitrinePokecenter_Script: + call Serial_TryEstablishingExternallyClockedConnection + jp EnableAutoTextBoxDrawing + +CitrinePokecenter_TextPointers: + dw CitrineHealNurseText + dw CitrinePokecenterText2 + dw CitrinePokecenterText3 + dw CitrineTradeNurseText + dw KadabraTrade + dw CitrinePokeCenterText4 + +CitrineTradeNurseText: + script_cable_club_receptionist + +CitrineHealNurseText: + script_pokecenter_nurse + +CitrinePokecenterText2: + text_far _CitrinePokecenterText2 + text_end + +CitrinePokecenterText3: + text_far _CitrinePokecenterText3 + text_end + +KadabraTrade: + text_asm + ld a, TRADE_FOR_HARRY + ld [wWhichTrade], a + predef DoInGameTradeDialogue + jp TextScriptEnd + +CitrinePokeCenterText4: + text_asm + callfar PokecenterChanseyText + jp TextScriptEnd diff --git a/scripts/Route18Gate2F.asm b/scripts/Route18Gate2F.asm index efb6d70a..be94d0ca 100644 --- a/scripts/Route18Gate2F.asm +++ b/scripts/Route18Gate2F.asm @@ -8,7 +8,7 @@ Route18Gate2F_TextPointers: Route18GateUpstairsText1: text_asm - ld a, TRADE_FOR_MARC + ld a, TRADE_FOR_JIMBO ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/UndergroundPathRoute5.asm b/scripts/UndergroundPathRoute5.asm index 5c078050..47c75fef 100644 --- a/scripts/UndergroundPathRoute5.asm +++ b/scripts/UndergroundPathRoute5.asm @@ -11,7 +11,7 @@ UndergroundPathRoute5_TextPointers: UndergroundPathEntranceRoute5Text1: text_asm - ld a, TRADE_FOR_SPOT + ld a, TRADE_FOR_RICKY ld [wWhichTrade], a predef DoInGameTradeDialogue ld hl, UndergroundPathEntranceRoute5_TextScriptEndingText diff --git a/text.asm b/text.asm index f03da275..e6c9088c 100644 --- a/text.asm +++ b/text.asm @@ -192,7 +192,7 @@ SECTION "Text 8", ROMX INCLUDE "text/VermilionGym_2.asm" INCLUDE "text/VermilionPidgeyHouse.asm" INCLUDE "text/VermilionDock.asm" -INCLUDE "text/VermilionOldRodHouse.asm" +;INCLUDE "text/VermilionOldRodHouse.asm" INCLUDE "text/CeladonMart1F.asm" INCLUDE "text/CeladonMart2F.asm" INCLUDE "text/CeladonMart3F.asm" @@ -223,7 +223,7 @@ SECTION "Text 9", ROMX INCLUDE "text/FuchsiaGym_2.asm" INCLUDE "text/FuchsiaMeetingRoom.asm" -INCLUDE "text/FuchsiaGoodRodHouse.asm" +;INCLUDE "text/FuchsiaGoodRodHouse.asm" INCLUDE "text/PokemonMansion1F.asm" INCLUDE "text/CinnabarGym.asm" INCLUDE "text/CinnabarLab.asm" @@ -288,6 +288,7 @@ INCLUDE "text/BrunswickTrail.asm" INCLUDE "text/SilphGauntlet1F.asm" INCLUDE "text/SilphGauntlet4F.asm" INCLUDE "text/SilphGauntlet7F.asm" +INCLUDE "text/CitrinePokecenter.asm" SECTION "Pokédex Text", ROMX diff --git a/text/CitrinePokecenter.asm b/text/CitrinePokecenter.asm new file mode 100644 index 00000000..a689a79c --- /dev/null +++ b/text/CitrinePokecenter.asm @@ -0,0 +1,19 @@ +_CitrinePokecenterText2:: + text "I've seen a lot" + line "of men in black" + cont "going in and" + cont "out of this one" + cont "house." + + para "It couldn't be," + line "could it?" + done + +_CitrinePokecenterText3:: + text "The TRAINERs here" + line "are too tough!" + + para "What are they" + line "feeding their" + cont "#MON?!" + done