Merge branch 'master' into Unbound

charmap.tbl

@@ -1,16 +1,61 @@
 00= 
+01=À
+02=Á
+03=Â
+04=Ç
+05=È
+06=É
+07=Ê
+08=Ë
+09=Ì
+0B=Î
+0C=Ï
+0D=Ò
+0E=Ó
+0F=Ô
+10=Œ
+11=Ù
+12=Ú
+13=Û
+14=Ñ
+15=ß
+16=à
+17=á
+19=ç
+1A=è
 1B=\e
-
+1C=ê
+1D=ë
+1E=ì
+20=î
+21=ï
+22=ò
+23=ó
+24=ô
+25=œ
+26=ù
+27=ú
+28=û
+29=ñ
+2A=º
+2B=ª
 2D=&
 2E=+
 
 35==
 36=;
 
+51=¿
+52=¡
+
+5A=Í
 5B=%
 5C=(
 5D=)
 
+68=â
+6F=í
+
 85=<
 86=>
 
@@ -31,13 +76,15 @@ AE=-
 AF=·
 B0=…
 B1="
+B1=“
 B2=\"
+B2=”
 B3=‘
 B4=’
 B4='
 B5=♂
 B6=♀
-B7=¥
+B7=\$
 B8=,
 B9=×
 BA=/

scripts/string.py

@@ -41,14 +41,39 @@ SpecialBuffers = {
     "ARROW_LEFT": ["7B"],
     "ARROW_RIGHT": ["7C"],
 
+    "SHRINK": ["FC", "06", "00"],
+    "PAUSE": ["FC", "08"],
+    "PAUSE_UNTIL_PRESS": ["FC", "09"],
+    "PLAY_BGM": ["FC", "0B"],
+    "ESCAPE": ["FC", "0C"],
+    "SHIFT_TEXT": ["FC", "0D"],
+    "PLAY_SE": ["FC", "10"],
+    "CLEAR": ["FC", "11"],
+    "SKIP": ["FC", "12"],
     "ALIGN": ["FC", "13"],
-    "SHRINK": ["FC", "06", "00"]
+    "MIN_LETTER_SPACING": ["FC", "14"],
+    "PAUSE_MUSIC": ["FC", "17"],
+    "RESUME_MUSIC": ["FC", "18"],
+
+    "A_BUTTON": ["F8", "00"],
+    "B_BUTTON": ["F8", "01"],
+    "L_BUTTON": ["F8", "02"],
+    "R_BUTTON": ["F8", "03"],
+    "START_BUTTON": ["F8", "04"],
+    "SELECT_BUTTON": ["F8", "05"],
+    "DPAD_UP": ["F8", "06"],
+    "DPAD_DOWN": ["F8", "07"],
+    "DPAD_LEFT": ["F8", "08"],
+    "DPAD_RIGHT": ["F8", "09"],
+    "DPAD_UP_DOWN": ["F8", "0A"],
+    "DPAD_LEFT_RIGHT": ["F8", "0B"],
+    "DPAD": ["F8", "0C"],
 }
 
 
 def StringFileConverter(fileName: str):
     stringToWrite = ".thumb\n.text\n.align 2\n\n"
-    with open(fileName, 'r') as file:
+    with open(fileName, 'r', encoding="utf-8") as file:
         maxLength = 0
         fillFF = False
         readingState = 0
@@ -178,7 +203,7 @@ def ProcessString(string: str, lineNum: int, maxLength=0, fillWithFF=False) -> s
 
 def PokeByteTableMaker():
     dictionary = {}
-    with open(CharMap) as file:
+    with open(CharMap, 'r', encoding="utf-8") as file:
         for line in file:
             if line.strip() != "/FF" and line.strip() != "":
                 if line[2] == '=' and line[3] != "":
@@ -190,8 +215,4 @@ def PokeByteTableMaker():
                     except:
                         pass
         dictionary[' '] = 0
-
-    dictionary["<EFBFBD>"] = 0xB4
-    dictionary["<EFBFBD>"] = 0xB0
-    dictionary["<EFBFBD>"] = 0xB1
     return dictionary

src/Habitat_Table.c

@@ -1136,8 +1136,6 @@ const u16 gSeaPage19[] =
 {
 	SPECIES_FRILLISH,
 	SPECIES_JELLICENT,
-	SPECIES_FRILLISH_F,
-	SPECIES_JELLICENT_F,
 };
 
 const u16 gSeaPage20[] =
@@ -1617,13 +1615,27 @@ const u16 gMountainPage35[] =
 
 const u16 gMountainPage36[] =
 {
-	SPECIES_MINIOR_SHIELD,
 	SPECIES_TURTONATOR,
 	SPECIES_TOGEDEMARU,
 	SPECIES_DRAMPA,
 };
 
-const u16 gMountainPage37[] =
+const u16 gMountainPage37[]=
+{
+	SPECIES_MINIOR_SHIELD,
+	SPECIES_MINIOR_RED,
+	SPECIES_MINIOR_BLUE,
+	SPECIES_MINIOR_ORANGE,
+};
+
+const u16 gMountainPage38[]=
+{
+	SPECIES_MINIOR_YELLOW,
+	SPECIES_MINIOR_INDIGO,
+	SPECIES_MINIOR_GREEN,
+};
+
+const u16 gMountainPage39[] =
 {
 	SPECIES_ZERAORA,
 };
@@ -1709,8 +1721,6 @@ const u16 gRoughTerrainPage13[] =
 {
 	SPECIES_HIPPOPOTAS,
 	SPECIES_HIPPOWDON,
-	SPECIES_HIPPOPOTAS_F,
-	SPECIES_HIPPOWDON_F,
 };
 
 const u16 gRoughTerrainPage14[] =
@@ -1915,7 +1925,6 @@ const u16 gUrbanPage20[] =
 	SPECIES_PIDOVE,
 	SPECIES_TRANQUILL,
 	SPECIES_UNFEZANT,
-	SPECIES_UNFEZANT_F,
 };
 
 const u16 gUrbanPage21[] =
@@ -2355,7 +2364,9 @@ const struct HabitatPage gMountainPages[] =
 	{gMountainPage34, ARRAY_COUNT(gMountainPage34)}, 
 	{gMountainPage35, ARRAY_COUNT(gMountainPage35)}, 
 	{gMountainPage36, ARRAY_COUNT(gMountainPage36)},
-	{gMountainPage37, ARRAY_COUNT(gMountainPage37)}, 
+	{gMountainPage37, ARRAY_COUNT(gMountainPage37)},
+	{gMountainPage38, ARRAY_COUNT(gMountainPage38)},
+	{gMountainPage39, ARRAY_COUNT(gMountainPage39)},
 };
 
 const struct HabitatPage gRoughTerrainPages[] =