morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into breaking_changes

Browse Source 
# Conflicts:
#	BaseClasses.py
#	Mystery.py
#	WebHostLib/downloads.py
#	WebHostLib/models.py
#	WebHostLib/templates/macros.html
#	WebHostLib/upload.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
This commit is contained in:
Fabian Dill
2021-01-17 06:50:25 +01:00
parent 6bb7631382 3b5ba161de
commit 514cd19367
35 changed files with 965 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
worlds/alttp/Text.py
View File

@@ -222,7 +222,7 @@ TavernMan_texts = [
"Helmasaur is\nthrowing a\nparty.\nI hope it's\na masquerade!",
"I'd like to\nknow Arrghus\nbetter.\nBut he won't\ncome out of\nhis shell!",
"Mothula didn't\nhave much fun\nat the party.\nHe's immune to\nspiked punch!",
"Don't set me\nup with that\nchick from\nSteve's Town.\n\n\nI'm not\ninterested in\na Blind date!",
"Don't set me\nup with that\nlady from\nSteve's Town.\n\n\nI'm not\ninterested in\na Blind date!",
"Kholdstare is\nafraid to go\nto the circus.\nHungry kids\nthought he was\ncotton candy!",
"I asked who\nVitreous' best\nfriends are.\nHe said,\n'Me, Myself,\nand Eye!'",
"Trinexx can be\na hothead or\nhe can be an\nice guy. In\nthe end, he's\na solid\nindividual!",