diff --git a/AllPokemonInfoExcel/ExcelToPokemonInfoAsm.ipynb b/AllPokemonInfoExcel/ExcelToPokemonInfoAsm.ipynb index 5d430793..88e77fca 100644 --- a/AllPokemonInfoExcel/ExcelToPokemonInfoAsm.ipynb +++ b/AllPokemonInfoExcel/ExcelToPokemonInfoAsm.ipynb @@ -3183,7 +3183,7 @@ }, { "cell_type": "code", - "execution_count": 50, + "execution_count": 51, "metadata": { "scrolled": false }, @@ -3192,15 +3192,43 @@ "name": "stdout", "output_type": "stream", "text": [ - "text \"Careful! This BOX\"\n", - "line \"is now full!\"\n", + "text \"My friend just\"\n", + "line \"told me how\"\n", + "cont \"powerful the\"\n", + "cont \"SELECT Button is!\"\n", "\n", + "para \"If you press it at\"\n", + "line \"the end of a\"\n", + "cont \"#MON page in\"\n", + "cont \"the pokeDEX, it\"\n", + "cont \"shows its shiny\"\n", + "cont \"form!\"\n", "\n", + "para \"In the options\"\n", + "line \"menus, it gives\"\n", + "cont \"you extra infos!\"\n", "\n", + "para \"And in the STATS\"\n", + "line \"screen of the\"\n", + "cont \"#MON party,\"\n", + "cont \"toggles between\"\n", + "cont \"current stats,\"\n", + "cont \"base stats, DVs,\"\n", + "cont \"and EVs!\"\n", "\n", "\n", + "para \"Keep in mind that\"\n", + "line \"all of this is\"\n", + "cont \"true with default\"\n", + "cont \"cap setting,\"\n", + "cont \"OBEDIE. LOOSE!\"\n", "\n", "\n", + "para \"Finally, the more\"\n", + "line \"BADGEs you have,\"\n", + "cont \"the more likely\"\n", + "cont \"you're to find a\"\n", + "cont \"shiny #MON!\"\n", "\n", "\n", "\n", @@ -3209,21 +3237,21 @@ } ], "source": [ - "lineifyDialogue(\"Careful! This BOX is now full!\", firstLine=True)\n", + "lineifyDialogue(\"My friend just told me how powerful the SELECT Button is!\", firstLine=True)\n", "print(\"\")\n", - "lineifyDialogue(\"\")\n", + "lineifyDialogue(\"If you press it at the end of a PoKeMoN page in the pokeDEX, it shows its shiny form!\")\n", "print(\"\")\n", - "lineifyDialogue(\"\")\n", + "lineifyDialogue(\"In the options menus, it gives you extra infos!\")\n", "print(\"\")\n", - "lineifyDialogue(\"\")\n", + "lineifyDialogue(\"And in the STATS screen of the PoKeMoN party, toggles between current stats, base stats, DVs, and EVs!\")\n", "print(\"\")\n", "lineifyDialogue(\"\")\n", "print(\"\")\n", - "lineifyDialogue(\"\")\n", + "lineifyDialogue(\"Keep in mind that all of this is true with default cap setting, OBEDIE. LOOSE!\")\n", "print(\"\")\n", "lineifyDialogue(\"\")\n", "print(\"\")\n", - "lineifyDialogue(\"\")\n", + "lineifyDialogue(\"Finally, the more BADGEs you have, the more likely you're to find a shiny PoKeMoN!\")\n", "print(\"\")\n", "lineifyDialogue(\"\")\n", "print(\"\")\n", diff --git a/data/text/text_4.asm b/data/text/text_4.asm index 57d31b45..f4b57628 100644 --- a/data/text/text_4.asm +++ b/data/text/text_4.asm @@ -64,86 +64,219 @@ _RepelUseAnotherText:: ; new, from Vortiene ; personalization ---- _PersonalizationInfoTextNames:: - text "names" + text "Change #MON" + line "names between" + cont "English," + cont "gender-neutral," + cont "and Japanese." prompt + _PersonalizationInfoTextTypes:: - text "types" + text "Some selected" + line "#MON have" + cont "their typing" + cont "altered." prompt + _PersonalizationInfoTextSound:: - text "sound" + text "EARPHONE1 is" + line "stereo, 2 focuses" + cont "on left side, 3" + cont "on right side." prompt ; randomization ------ _RandomizationInfoTextWildMons:: - text "wild mons" + text "Wild encounters" + line "are randomized." + + para "After" + line "randomization," + cont "encounters in a" + cont "given area are" + cont "fixed." + + para "Re-randomized" + line "every time this" + cont "menu is opened." + + para "Not applied to" + line "fishing." prompt _RandomizationInfoTextEnemyTeams:: - text "enemy teams" - line "test 1" - cont "test 2" - cont "test 3" + text "Enemy teams are" + line "randomized." + + para "Upon rematch," + line "teams change." + + para "Re-randomized" + line "every time this" + cont "menu is opened." prompt _RandomizationInfoTextTypeChart:: - text "type chart" + text "Type chart" + line "(effectivenesses)" + cont "is randomized." + + para "Re-randomized" + line "every time this" + cont "menu is opened." prompt _RandomizationInfoTextItems:: - text "items" - prompt + text "Ground items are" + line "randomized." + para "Upon reloading," + line "items change." + + para "Re-randomized" + line "every time this" + cont "menu is opened." + + para "Not applied to" + line "hidden items." + prompt ; battle luck -------- _LuckInfoTextAccuracy:: - text "accuracy" + text "PLAYER MIN: all" + line "moves with" + cont "accuracy below" + cont "100% always miss." + + para "ENEMY MAX: enemies" + line "never miss." prompt _LuckInfoTextRoll:: - text "roll" + text "PLAYER MIN: moves" + line "deal minimum" + cont "damage (85%)." + + para "ENEMY MAX: enemy" + line "moves deal" + cont "maximum damage." prompt _LuckInfoTextCrits:: - text "crits" + text "PLAYER MIN: moves" + line "are never" + cont "critical hits." + + para "ENEMY MAX: enemy" + line "moves are always" + cont "critical hits." prompt _LuckInfoTextEffects:: - text "effects" + text "PLAYER MIN: moves" + line "never trigger" + cont "additional" + cont "effects" +; xxxx "123456789012345678" + cont "(e.g. flinch)." + + para "ENEMY MAX: enemy" + line "moves always deal" + cont "additional" + cont "effects." prompt _LuckInfoTextStatus:: - text "status" + text "PLAYER MIN: max" + line "SLEEP / DISABLE /" + cont "CONFUSION" + cont "duration, always" + cont "fully PAR, always" + cont "self-hit in" + cont "CONFUSION." + + para "ENEMY MAX: enemies" + line "min SLEEP /" + cont "DISABLE /" + cont "CONFUSION" + cont "duration, never" + cont "fully PAR, never" + cont "self-hit in" + cont "CONFUSION." prompt - ; start options ------ _OptionsInfoTextTextSpeed:: - text "text speed" + text "Adjust text speed." prompt _OptionsInfoTextAnimation:: - text "animation" + text "Moves animations." prompt _OptionsInfoTextBattleStyle:: - text "style" + text "SHIFT: you're" + line "prompted to" + cont "switch #MON" + cont "before opponent" + cont "sends a new one." prompt _OptionsInfoTextCap:: - text "cap" + text "Handles caps:" + + para "OBEDIENCE CAP:" + line "#MON above the" + cont "cap disobey." + + para "LEVEL CAP: #MON" + line "that reach the" + cont "cap earn no EXP." + + para "TIGHT: exactly at" + line "the next GYM" + cont "LEADER's ace." + + para "LOOSE: slightly" + line "above next GYM" + cont "LEADER's ace." prompt _OptionsInfoTextBadgeBoost:: - text "badge boost" + text "CLASSIC: as in the" + line "original games," + cont "including badge" + cont "boost glitch." prompt _OptionsInfoTextLevelScale:: - text "level scale" + text "EXACT: trainers'" + line "level is equal to" + cont "your max." + + para "FLUCTUATING:" + line "trainers' level" + cont "is equal to your" + cont "max +- 2." + + para "HARD: trainers'" + line "level is equal to" + cont "your max + 10%." + + para "IMPOSSIBLE:" + line "trainers' level" + cont "is always 100." prompt _OptionsInfoTextExpGain:: - text "exp gain" + text "LIMITED: wild" + line "#MON and" + cont "trainer rematches" + cont "earn no EXP." + + para "NOTHING: no battle" + line "earn any EXP." prompt diff --git a/text.asm b/text.asm index 873838e5..ed4fee2d 100644 --- a/text.asm +++ b/text.asm @@ -89,8 +89,6 @@ INCLUDE "text/Route18.asm" INCLUDE "text/Route19.asm" INCLUDE "text/Route20.asm" INCLUDE "text/Route21.asm" -INCLUDE "text/Route22.asm" -INCLUDE "text/Route23.asm" INCLUDE "data/text/text_4.asm" @@ -302,6 +300,8 @@ INCLUDE "text/NameRatersHouse.asm" INCLUDE "text/OchreResearchCenter1.asm" INCLUDE "text/BikeShop.asm" INCLUDE "text/PewterSpeechHouse.asm" +INCLUDE "text/Route22.asm" +INCLUDE "text/Route23.asm" ; new: splitted the Pokédex text into two separate sections diff --git a/text/CeruleanBadgeHouse.asm b/text/CeruleanBadgeHouse.asm index 7911147d..6586fc17 100644 --- a/text/CeruleanBadgeHouse.asm +++ b/text/CeruleanBadgeHouse.asm @@ -37,12 +37,24 @@ _CeruleanHouse2Text_74e77:: para "With 8, up to L70." + para "Keep in mind that" + line "all of this is" + cont "true with default" + cont "cap setting," + cont "OBEDIE. LOOSE!" + para "You need to be" line "crowned CHAMPION" cont "of the INDIGO" cont "LEAGUE to have" cont "any and all" cont "#MON obey you!" + + para "Finally, the more" + line "BADGEs you have," + cont "the more likely" + cont "you're to find a" + cont "shiny #MON!" prompt _CeruleanHouse2Text_74e7c:: diff --git a/text/RedsHouse2F.asm b/text/RedsHouse2F.asm index d1d6d586..200fb296 100644 --- a/text/RedsHouse2F.asm +++ b/text/RedsHouse2F.asm @@ -36,4 +36,10 @@ _RedsHouse2FInfoAboutOptions:: cont "of options in the" cont "START menu and on" cont "the walls here!" - done \ No newline at end of file + + para "In the menus, you" + line "can press SELECT" + cont "or A to have more" + cont "info about the" + cont "current option." + done diff --git a/text/ViridianSchoolHouse.asm b/text/ViridianSchoolHouse.asm index 496af7f3..b5bd7344 100644 --- a/text/ViridianSchoolHouse.asm +++ b/text/ViridianSchoolHouse.asm @@ -48,27 +48,42 @@ _SchoolText2:: ; edited _SchoolText4:: text "My friend just" - line "told me that if" - cont "you press SELECT" - cont "while looking at" - cont "a #MON page in" + line "told me how" + cont "powerful the" + cont "SELECT Button is!" + + para "If you press it at" + line "the end of a" + cont "#MON page in" cont "the #DEX, it" - cont "shows the shiny" - cont "colors! How cool!" + cont "shows you its" + cont "shiny form!" + + para "In the options" + line "menus, it gives" + cont "you extra infos!" + + para "And in the STATS" + line "screen of the" + cont "#MON party, it" + cont "toggles between" + cont "current stats," + cont "base stats, DVs," + cont "and EVs!" done _SchoolText5:: text "My friend just" - line "told me about the" + line "told me how" + cont "powerful the" + cont "START Button is!" + + para "It allows you to" + line "access the" cont "ATTACKDEX mode" cont "included in the" cont "#DEX!" - para "Do you know you" - line "can see the info" - cont "on the attack by" - cont "pressing START?" - para "It works while in" line "battle, and also" cont "when your #MON"