From e772de43d53cfdfcfc95aa838899d587f1defda7 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sun, 9 Apr 2023 14:02:08 +0100 Subject: [PATCH] Revert "Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack" This reverts commit 9bf8886d4b32ec69717d6d0db1243ed5239806f2, reversing changes made to 8cf1ba9fc9575fafb53c720111b7ff98d6669aca. --- README.md | 13 ++++--- constants/item_constants.asm | 44 ++++++++++++------------ constants/script_constants.asm | 4 +-- data/events/trades.asm | 4 +-- data/items/key_items.asm | 16 ++++----- data/items/names.asm | 16 ++++----- data/items/prices.asm | 16 ++++----- data/maps/objects/CeruleanPokecenter.asm | 1 - data/maps/objects/LavenderPokecenter.asm | 1 - data/maps/objects/VermilionDock.asm | 2 +- data/text/item_descriptions.asm | 2 +- engine/debug/debug_party.asm | 17 ++++----- engine/events/in_game_trades.asm | 1 + engine/items/item_effects.asm | 16 ++++----- engine/menus/item_descriptions.asm | 32 +++++++++++++++-- scripts/CeruleanPokecenter.asm | 9 ----- scripts/LavenderPokecenter.asm | 9 ----- scripts/NameRatersHouse.asm | 14 ++++---- 18 files changed, 110 insertions(+), 107 deletions(-) diff --git a/README.md b/README.md index 92ef1441..0ee7ee9c 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ New areas ==== - Celadon University is just north of Celadon. - This is a reference to a Magikarp event from July 1998, and includes the lore from it and other areas of Pokemon's early worldbuilding. - - New infinitely re-battleable trainers for grinding. + - New infinitely re-battleable trainers are accessible. - There's a Move Deleter and Move Relearner! - Citrine City is a new island city that can be accessed in the postgame. - Underwater Tunnel connects Route 25 and Route 10. @@ -61,13 +61,13 @@ New areas Improved areas ==== - Most barriers to travel across the region have been removed, allowing for almost fully open world gameplay. To encourage this, Gym Leaders now have level scaling, giving more consistent challenge across the game. -- Cinnabar Lab's Trade Room now features the Trader, who will evolve trade-evolving Pokemon for you! - Rock Tunnel has a more workable map, now being easier to go through and having new areas to explore. Includes a way to get renewable fossils, items, and other interesting bits and pieces. Overall, it makes Flash much more rewarding to bring, showing you where the items and content are instead of being an inconvenience. - Diglett's Cave has a more detailed map with Onix, Wiglett, and Wugtrio also appearing! - Route 25 has been given a facelift, adding Bill's Lighthouse! - The Route 5-6 underground path contains a shortcut to Celadon City. - This allows you to skip Route 9 and Rock Tunnel, making them optional areas and opening up central Kanto. - Cinnabar Island is a lot bigger, and has a new location added to it. The mansion seems different too... +- Cinnabar Lab's trade room features an NPC who'll trade you back your Pokemon for trade evolutions! - Pokemon Tower was shortened, being less intensive and adding room for more maps. - Silph Co's pathing was completely overhauled to make navigating it less tedious. - Viridian Gym now has a new area once you make Giovanni leave. @@ -84,7 +84,6 @@ QoL Enhancements - PP symbol is displayed in the battle menu. PP displayed before, it just looks nicer now. Done by changing a straggler Japanese character. - Running Shoes by holding B. Also works with the bike! Surf speed is also doubled. - Fast text has no frame delay between text scrolling, doubling the scroll speed. It's also been made the default option, so you don't need to go into the Options menu for it. -- Traded Pokemon ("Outsiders") can now be nicknamed at the Name Rater's House. - Lorelei, Bruno, and Agatha now play the Gym Leader Battle theme. - HP bar has been doubled in speed, having a 1 frame delay per pixel rather than 2. - Trainer DVs are perfect-15s. @@ -98,7 +97,7 @@ QoL Enhancements - HM02 (Fly) can be taught to the Pikachu line (Corocoro) - HM03 (Surf) can be taught to the Pikachu line (Stadium / Corocoro) - Psyduck learns Amnesia at Lv15 (Stadium) -- Yellow learnset changes are imported; eg. Flash Venonat, with tweaks made to ensure nothing is lost from RB either. +- Yellow learnset changes are imported; eg. Flash Venonat - The Game Corner in general is massively buffed, making everything far more worth going for; - 3x Cherry now gives 100 coins (used to be 8) - 3x Magikarp/Poliwag/Bird/Diglett/Rattata/Jigglypuff now gives 200 coins (used to be 15) @@ -110,6 +109,7 @@ QoL Enhancements - The Moon Stone is available over TM23 (Dragon Rage). Dragon Rage is accessible in Celadon University! - Bag capacity increased from 20 to 30 items. - Spinner tiles move faster. +- If a move is disabled, it now has an upper-case D instead of a lower-case one. Bug Fixes ==== @@ -147,7 +147,6 @@ and more! - Trainer Name Pointers are removed, as the localised games don't need to use the file at all. - Dakutens are removed, as the Japanese accents aren't used in English releases. - Blank Leader Name code is removed; before, this would only be for the PNGs. -- Some grammar tweaks have been made (eg. If a move is disabled, it now has an upper-case D instead of a lower-case one.) Known Bugs ==== @@ -158,7 +157,7 @@ Known Bugs - Fix warps from Viridian Pre-Gym, currently goes to Fuschia which is hilarious. - Mew needs to disappear after being captured etc (only seems to happen sometimes?) - Should be able to fly from Faraway (reposition in map listing) -- Item descriptions are offset by a bit +- Item descriptions are offset - Strength boulders don't fall down holes - Pokedex is very laggy @@ -187,7 +186,7 @@ New Pokemon: - Primeape -> Annihilape | Trade - Golbat -> Crobat | L44 - Marowak -> Guardia | Use Heart Stone -- Porygon -> Porygon2 | Use Up-Grade +- Porygon -> Porygon2 | Trade - Porygon2 -> Porygon-Z | Use Dubious Disc - Gloom -> Bellossom | Use Poison Stone - Weepinbell -> Tsubomitto | Use Poison Stone diff --git a/constants/item_constants.asm b/constants/item_constants.asm index a2674e1f..09c9c5a6 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -92,31 +92,31 @@ DEF SAFARI_ROCK EQU $16 ; overload const MAX_ETHER ; $51 const ELIXER ; $52 const MAX_ELIXER ; $53 - const ICE_STONE ; $54 - const PROTECTOR ; $55 - const POISON_STONE ; $56 - const BLK_AUGURITE ; $57 - const DUBIOUS_DISC ; $58 - const CITRINE_PASS ; $59 - const OLD_SEA_MAP ; $60 - const UP_GRADE ; $61 DEF NUM_ITEMS EQU const_value - 1 ; elevator floors use item IDs - const FLOOR_B2F ; $62 - const FLOOR_B1F ; $63 - const FLOOR_1F ; $64 - const FLOOR_2F ; $65 - const FLOOR_3F ; $66 - const FLOOR_4F ; $67 - const FLOOR_5F ; $68 - const FLOOR_6F ; $69 - const FLOOR_7F ; $70 - const FLOOR_8F ; $71 - const FLOOR_9F ; $72 - const FLOOR_10F ; $73 - const FLOOR_11F ; $74 - const FLOOR_B4F ; $75 + const FLOOR_B2F ; $54 + const FLOOR_B1F ; $55 + const FLOOR_1F ; $56 + const FLOOR_2F ; $57 + const FLOOR_3F ; $58 + const FLOOR_4F ; $59 + const FLOOR_5F ; $5A + const FLOOR_6F ; $5B + const FLOOR_7F ; $5C + const FLOOR_8F ; $5D + const FLOOR_9F ; $5E + const FLOOR_10F ; $5F + const FLOOR_11F ; $60 + const FLOOR_B4F ; $61 + const ICE_STONE ; $62 + const PROTECTOR ; $63 + const POISON_STONE ; $64 + const BLK_AUGURITE ; $65 + const DUBIOUS_DISC ; $66 + const CITRINE_PASS ; $67 + const OLDSEACHART ; $68 + const UP_GRADE ; $69 DEF NUM_FLOORS EQU const_value - 1 - NUM_ITEMS const_next $C4 diff --git a/constants/script_constants.asm b/constants/script_constants.asm index e0603581..9f36b865 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -33,9 +33,9 @@ DEF SLOTS_SOMEONESKEYS EQU $ff const TRADE_WITH_SELF ; Celadon University const TRADE_FOR_RATICATE_A ; LGPE Trade references - Viridian const TRADE_FOR_GOLEM_A ; Pewter - const TRADE_FOR_NINETALES_A ; Cerulean + ;const TRADE_FOR_NINETALES_A ; Cerulean const TRADE_FOR_PERSIAN_A ; Vermillion - const TRADE_FOR_DUGTRIO_A ; Lavender + ;const TRADE_FOR_DUGTRIO_A ; Lavender const TRADE_FOR_SANDSLASH_A ; Celadon const TRADE_FOR_RAICHU_A ; Saffron const TRADE_FOR_MAROWAK_A ; Fuschia diff --git a/data/events/trades.asm b/data/events/trades.asm index 988139d1..804893ee 100644 --- a/data/events/trades.asm +++ b/data/events/trades.asm @@ -15,9 +15,9 @@ TradeMons: db NO_MON, NO_MON, TRADE_DIALOGSET_SELF, "Unseen@@@@@" ; Celadon Uni Trader db RATICATE, RATICATE_A, TRADE_DIALOGSET_REGION, "RATICATE@@@" ; Viridian - LGPE trades begin here db GOLEM, GOLEM_A, TRADE_DIALOGSET_REGION, "GOLEM@@@@@@" ; Pewter - db NINETALES, NINETALES_A, TRADE_DIALOGSET_REGION, "NINETALES@@" ; Cerulean + ;db NINETALES, NINETALES_A, TRADE_DIALOGSET_REGION, "NINETALES@@" ; Cerulean db PERSIAN, PERSIAN_A, TRADE_DIALOGSET_REGION, "PERSIAN@@@@" ; Vermillion - db DUGTRIO, DUGTRIO_A, TRADE_DIALOGSET_REGION, "DUGTRIO@@@@" ; Lavender + ;db DUGTRIO, DUGTRIO_A, TRADE_DIALOGSET_REGION, "DUGTRIO@@@@" ; Lavender db SANDSLASH, SANDSLASH_A, TRADE_DIALOGSET_REGION, "SANDSLASH@@" ; Celadon db RAICHU, RAICHU_A, TRADE_DIALOGSET_REGION, "RAICHU@@@@@" ; Saffron db MAROWAK, MAROWAK_A, TRADE_DIALOGSET_REGION, "MAROWAK@@@@" ; Fuschia diff --git a/data/items/key_items.asm b/data/items/key_items.asm index c2b879ce..8d5f8ae6 100644 --- a/data/items/key_items.asm +++ b/data/items/key_items.asm @@ -83,14 +83,6 @@ KeyItemFlags: dbit FALSE ; MAX_ETHER dbit FALSE ; ELIXER dbit FALSE ; MAX_ELIXER - dbit FALSE ; ICE_STONE - dbit FALSE ; PROTECTOR - dbit FALSE ; POISON_STONE - dbit FALSE ; BLK_AUGURITE - dbit FALSE ; DUBIOUS_DISC - dbit TRUE ; CITRINE_PASS - dbit TRUE ; OLD_SEA_MAP - dbit FALSE ; UP_GRADE dbit TRUE ; FLOOR_B2F dbit TRUE ; FLOOR_B1F dbit TRUE ; FLOOR_1F @@ -105,4 +97,12 @@ KeyItemFlags: dbit TRUE ; FLOOR_10F dbit TRUE ; FLOOR_11F dbit TRUE ; FLOOR_B4F + dbit FALSE ; ICE_STONE + dbit FALSE ; PROTECTOR + dbit FALSE ; POISON_STONE + dbit FALSE ; BLK_AUGURITE + dbit FALSE ; DUBIOUS_DISC + dbit TRUE ; CITRINE_PASS + dbit TRUE ; OLDSEACHART + dbit FALSE ; UP_GRADE end_bit_array NUM_ITEMS + NUM_FLOORS diff --git a/data/items/names.asm b/data/items/names.asm index c2254c20..d2542e20 100644 --- a/data/items/names.asm +++ b/data/items/names.asm @@ -83,14 +83,6 @@ ItemNames:: li "MAX ETHER" li "ELIXER" li "MAX ELIXER" - li "ICE STONE" - li "PROTECTOR" - li "POISON STONE" - li "BLK AUGURITE" - li "DUBIOUS DISC" - li "CITRINE PASS" - li "OLD SEA MAP" - li "UP-GRADE" assert_list_length NUM_ITEMS li "B2F" li "B1F" @@ -106,4 +98,12 @@ ItemNames:: li "10F" li "11F" li "B4F" + li "ICE STONE" + li "PROTECTOR" + li "POISON STONE" + li "BLK AUGURITE" + li "DUBIOUS DISC" + li "CITRINE PASS" + li "OLDSEACHART" + li "UP-GRADE" assert_list_length NUM_ITEMS + NUM_FLOORS diff --git a/data/items/prices.asm b/data/items/prices.asm index bc3865fb..b700c176 100644 --- a/data/items/prices.asm +++ b/data/items/prices.asm @@ -83,14 +83,6 @@ ItemPrices:: bcd3 0 ; MAX_ETHER bcd3 0 ; ELIXER bcd3 0 ; MAX_ELIXER - bcd3 2100 ; ICE_STONE - bcd3 3000 ; PROTECTOR - bcd3 2100 ; POISON_STONE - bcd3 2100 ; BLK_AUGURITE - bcd3 3000 ; DUBIOUS_DISC - bcd3 0 ; CITRINE_PASS - bcd3 0 ; OLD_SEA_MAP - bcd3 3000 ; UP_GRADE assert_table_length NUM_ITEMS bcd3 0 ; FLOOR_B2F bcd3 0 ; FLOOR_B1F @@ -106,4 +98,12 @@ ItemPrices:: bcd3 0 ; FLOOR_10F bcd3 0 ; FLOOR_11F bcd3 0 ; FLOOR_B4F + bcd3 2100 ; ICE_STONE + bcd3 3000 ; PROTECTOR + bcd3 2100 ; POISON_STONE + bcd3 2100 ; BLK_AUGURITE + bcd3 3000 ; DUBIOUS_DISC + bcd3 0 ; CITRINE_PASS + bcd3 0 ; OLDSEACHART + bcd3 3000 ; UP_GRADE assert_table_length NUM_ITEMS + NUM_FLOORS diff --git a/data/maps/objects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm index 4e6a5495..eee0a0c6 100644 --- a/data/maps/objects/CeruleanPokecenter.asm +++ b/data/maps/objects/CeruleanPokecenter.asm @@ -12,6 +12,5 @@ CeruleanPokecenter_Object: object_event 10, 5, SPRITE_SUPER_NERD, WALK, ANY_DIR, 2 ; person object_event 4, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person - object_event 10, 7, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Ninetales Trader def_warps_to CERULEAN_POKECENTER diff --git a/data/maps/objects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm index 6a9b2dc7..99c29528 100644 --- a/data/maps/objects/LavenderPokecenter.asm +++ b/data/maps/objects/LavenderPokecenter.asm @@ -12,6 +12,5 @@ LavenderPokecenter_Object: object_event 5, 3, SPRITE_GENTLEMAN, STAY, NONE, 2 ; person object_event 2, 6, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 3 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person - object_event 10, 7, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Dugtrio Trader def_warps_to LAVENDER_POKECENTER diff --git a/data/maps/objects/VermilionDock.asm b/data/maps/objects/VermilionDock.asm index 87184755..1d2bb954 100644 --- a/data/maps/objects/VermilionDock.asm +++ b/data/maps/objects/VermilionDock.asm @@ -8,6 +8,6 @@ VermilionDock_Object: def_bg_events def_object_events - object_event 22, 0, SPRITE_POKE_BALL, STAY, NONE, 2, OLD_SEA_MAP + object_event 22, 0, SPRITE_POKE_BALL, STAY, NONE, 2, OLDSEACHART def_warps_to VERMILION_DOCK diff --git a/data/text/item_descriptions.asm b/data/text/item_descriptions.asm index 005daba9..f63c03c2 100644 --- a/data/text/item_descriptions.asm +++ b/data/text/item_descriptions.asm @@ -342,7 +342,7 @@ _CitrinePassDescription:: next "CITRINE CITY." prompt -_OldSeaMapDescription:: +_OldSeaChartDescription:: text "A sea chart for" next "certain island." prompt diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index 5a84c9aa..6480884a 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -21,13 +21,13 @@ SetIshiharaTeam: jr .loop IshiharaTeam: - db EXEGGUTOR_A, 90 + db EXEGGUTOR, 90 db RAICHU, 90 - db MEWTWO, 90 - db PORYGON, 50 + db EXEGGUTOR, 90 + db RAPIDASH, 50 IF DEF(_DEBUG) - db NINETALES, 50 - db DUGTRIO, 50 + db GOLEM, 50 + db MAROWAK, 50 ENDC db -1 ; end @@ -143,6 +143,7 @@ DebugItemsList: db RARE_CANDY, 99 db MASTER_BALL, 99 db ULTRA_BALL, 99 + db CANDY_JAR, 99 db SECRET_KEY, 1 db CARD_KEY, 1 db S_S_TICKET, 1 @@ -151,11 +152,7 @@ DebugItemsList: db COIN_CASE, 1 db POKE_FLUTE, 1 db SILPH_SCOPE, 1 - db OLD_SEA_MAP, 1 - db UP_GRADE, 1 - db TM_MEGA_PUNCH, 1 - db HM_SURF, 1 - db FLOOR_1F + db OLDSEACHART, 1 db -1 ; end DebugUnusedList: diff --git a/engine/events/in_game_trades.asm b/engine/events/in_game_trades.asm index 35e1cf45..0276a466 100644 --- a/engine/events/in_game_trades.asm +++ b/engine/events/in_game_trades.asm @@ -277,6 +277,7 @@ InGameTradeTextPointers: dw TradeTextPointers3 dw TradeTextPointers4 dw TradeTextPointers5 + ;dw TradeTextPointers6 TradeTextPointers1: dw WannaTrade1Text diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 14008cdc..a16d4410 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -100,14 +100,6 @@ ItemUsePtrTable: dw ItemUsePPRestore ; MAX_ETHER dw ItemUsePPRestore ; ELIXER dw ItemUsePPRestore ; MAX_ELIXER - dw ItemUseEvoStone ; ICE_STONE - dw ItemUseEvoStone ; PROTECTOR - dw ItemUseEvoStone ; POISON_STONE - dw ItemUseEvoStone ; BLK_AUGURITE - dw ItemUseEvoStone ; DUBIOUS_DISC - dw UnusableItem ; CITRINE_PASS - dw UnusableItem ; OLDSEACHART - dw ItemUseEvoStone ; UP_GRADE dw UnusableItem ; FLOOR_B2F dw UnusableItem ; FLOOR_B1F dw UnusableItem ; FLOOR_1F @@ -122,6 +114,14 @@ ItemUsePtrTable: dw UnusableItem ; FLOOR_10F dw UnusableItem ; FLOOR_11F dw UnusableItem ; FLOOR_14F + dw ItemUseEvoStone ; ICE_STONE + dw ItemUseEvoStone ; PROTECTOR + dw ItemUseEvoStone ; POISON_STONE + dw ItemUseEvoStone ; BLK_AUGURITE + dw ItemUseEvoStone ; DUBIOUS_DISC + dw UnusableItem ; CITRINE_PASS + dw UnusableItem ; OLDSEACHART + dw ItemUseEvoStone ; UP_GRADE ItemUseBall: diff --git a/engine/menus/item_descriptions.asm b/engine/menus/item_descriptions.asm index 259cac9e..f09d8e6e 100644 --- a/engine/menus/item_descriptions.asm +++ b/engine/menus/item_descriptions.asm @@ -180,6 +180,34 @@ ItemDescriptionPointers: text_end text_far _MaxElixerDescription text_end + text_far _UnusedItemDescription ; for the floor items - we've added items after these, so we need to stuff them in lest TM descriptions invade our personal space. + text_end + text_far _UnusedItemDescription + text_end + text_far _UnusedItemDescription + text_end + text_far _UnusedItemDescription + text_end + text_far _UnusedItemDescription + text_end + text_far _UnusedItemDescription + text_end + text_far _UnusedItemDescription + text_end + text_far _UnusedItemDescription + text_end + text_far _UnusedItemDescription + text_end + text_far _UnusedItemDescription + text_end + text_far _UnusedItemDescription + text_end + text_far _UnusedItemDescription + text_end + text_far _UnusedItemDescription + text_end + text_far _UnusedItemDescription + text_end ; floor items end here text_far _IceStoneDescription text_end text_far _ProtectorDescription @@ -192,9 +220,7 @@ ItemDescriptionPointers: text_end text_far _CitrinePassDescription text_end - text_far _OldSeaMapDescription - text_end - text_far _UpGradeDescription + text_far _OldSeaChartDescription text_end text_far _HM01Description text_end diff --git a/scripts/CeruleanPokecenter.asm b/scripts/CeruleanPokecenter.asm index d601f019..680640f4 100644 --- a/scripts/CeruleanPokecenter.asm +++ b/scripts/CeruleanPokecenter.asm @@ -7,7 +7,6 @@ CeruleanPokecenter_TextPointers: dw CeruleanPokecenterText2 dw CeruleanPokecenterText3 dw CeruleanTradeNurseText - dw NinetalesTrade CeruleanTradeNurseText: script_cable_club_receptionist @@ -22,11 +21,3 @@ CeruleanPokecenterText2: CeruleanPokecenterText3: text_far _CeruleanPokecenterText3 text_end - -NinetalesTrade: - text_asm - ld a, TRADE_FOR_NINETALES_A - ld [wWhichTrade], a - predef DoInGameTradeDialogue - jp TextScriptEnd - diff --git a/scripts/LavenderPokecenter.asm b/scripts/LavenderPokecenter.asm index 36a88aba..b8a1d2a5 100644 --- a/scripts/LavenderPokecenter.asm +++ b/scripts/LavenderPokecenter.asm @@ -7,7 +7,6 @@ LavenderPokecenter_TextPointers: dw LavenderPokecenterText2 dw LavenderPokecenterText3 dw LavenderTradeNurseText - dw DugtrioTrade LavenderTradeNurseText: script_cable_club_receptionist @@ -22,11 +21,3 @@ LavenderPokecenterText2: LavenderPokecenterText3: text_far _LavenderPokecenterText3 text_end - -DugtrioTrade: - text_asm - ld a, TRADE_FOR_DUGTRIO_A - ld [wWhichTrade], a - predef DoInGameTradeDialogue - jp TextScriptEnd - diff --git a/scripts/NameRatersHouse.asm b/scripts/NameRatersHouse.asm index a3f3255e..cecf97e7 100644 --- a/scripts/NameRatersHouse.asm +++ b/scripts/NameRatersHouse.asm @@ -8,7 +8,7 @@ NameRaterScript_1da15: and a ret -NameRaterScript_1da20: ; This shouldn't be necessary now that it's removed, but better safe than sorry. +NameRaterScript_1da20: ld hl, wPartyMonOT ld bc, NAME_LENGTH ld a, [wWhichPokemon] @@ -60,9 +60,9 @@ NameRaterText1: pop af jr c, .asm_1daae call GetPartyMonName2 - ;call NameRaterScript_1da20 - Removing the OT check, traded Pokemon can be nicknamed. - ;ld hl, NameRaterText_1dad1 - ;jr c, .asm_1daa8 + call NameRaterScript_1da20 + ld hl, NameRaterText_1dad1 + jr c, .asm_1daa8 ld hl, NameRaterText_1dabd call NameRaterScript_1da15 jr nz, .asm_1daae @@ -102,6 +102,6 @@ NameRaterText_1dacc: text_far _NameRaterText_1dacc text_end -;NameRaterText_1dad1: -; text_far _NameRaterText_1dad1 -; text_end +NameRaterText_1dad1: + text_far _NameRaterText_1dad1 + text_end