From 563ba141962d6f7881f7837b2fdcbd0541bc340f Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Tue, 19 Nov 2019 00:48:39 +0100
Subject: [PATCH] Remove old charmap sections

---
 FAQ.md               |  4 ++--
 INSTALL.md           |  2 +-
 charmap.asm          |  6 +++---
 mobile/mobile_40.asm | 20 +++++---------------
 mobile/mobile_45.asm |  8 ++++----
 mobile/mobile_46.asm |  9 +++------
 pokecrystal.link     |  5 -----
 7 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/FAQ.md b/FAQ.md
index a740004de..f09ca63dd 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -38,11 +38,11 @@ You need to install `gcc`. If you're using Cygwin, re-run its setup, and at "Sel
 
 ### "ERROR: `UNION` already defined"
 
-Download [**rgbds 0.3.8**][rgbds]. Older versions will not work.
+Download [**rgbds 0.3.9**][rgbds] or newer. Older versions will not work.
 
 ### "Expression must be 8-bit"
 
-Download [**rgbds 0.3.8**][rgbds]. Older versions will not work.
+Download [**rgbds 0.3.9**][rgbds] or newer. Older versions will not work.
 
 ### "Segmentation fault" from `rgbgfx`
 
diff --git a/INSTALL.md b/INSTALL.md
index a5a46eb66..cc96cf98d 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -38,7 +38,7 @@ Double click on the text that says "**Skip**" next to each package to select the
 
 Then download [**rgbds**](https://github.com/rednex/rgbds/releases/): the latest **win64.zip** or **win32.zip** release. Extract it and put all the `exe` and `dll` files individually in **C:\cygwin64\usr\local\bin**.
 
-**Note: If you already have an older rgbds, you will need to update to 0.3.8.** Ignore this if you have never installed rgbds before. If a version newer than 0.3.8 does not work, try downloading 0.3.8.
+**Note: If you already have an older rgbds, you will need to update to 0.3.9.** Ignore this if you have never installed rgbds before. If a version newer than 0.3.9 does not work, try downloading 0.3.9.
 
 Now open the **Cygwin terminal** and enter the following commands.
 
diff --git a/charmap.asm b/charmap.asm
index 95e1a804a..f3ec8a8e6 100644
--- a/charmap.asm
+++ b/charmap.asm
@@ -418,6 +418,6 @@
 	charmap "９", $ff
 
 ; ASCII charmap, for mobile functions
-	pushc
-	newcharmap ascii
-	popc
+pushc
+newcharmap ascii
+popc
diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm
index e2921a906..3ba879ee0 100644
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -1683,18 +1683,13 @@ Function100ae7:
 	ld [wcd2b], a
 	ret
 
-
-SECTION "tetsuji", ROMX
-
-	pushc
-	setcharmap ascii ; revert to ascii
+pushc
+setcharmap ascii
 
 Unknown_100b0a:
 	db "tetsuji", 0
 
-	popc
-
-SECTION "bank40_2", ROMX
+popc
 
 Function100b12:
 	call Function100dd8
@@ -3619,11 +3614,8 @@ Function101826:
 	ld [wcd2b], a
 	ret
 
-
-SECTION "ascii 10186f", ROMX
-
-	pushc
-	setcharmap ascii ; revert to ascii
+pushc
+setcharmap ascii
 
 Unknown_10186f:
 	db .end - @
@@ -3642,8 +3634,6 @@ Unknown_101895:
 
 popc
 
-SECTION "bank40_3", ROMX
-
 Function1018a8:
 	ld hl, wccb5
 	ld de, wcc61
diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm
index 45662e4e6..3d4085cc0 100644
--- a/mobile/mobile_45.asm
+++ b/mobile/mobile_45.asm
@@ -1,7 +1,7 @@
 SECTION "Mobile 45", ROMX
 
-	pushc
-	setcharmap ascii ; revert to ascii
+pushc
+setcharmap ascii
 
 String_114000:
 	db "---", 0
@@ -60,8 +60,6 @@ String_114160:
 String_114163:
 	db ".", 0
 
-popc
-
 Jumptable_114165:
 	dw Stubbed_Function114268
 	dw Function114269
@@ -128,6 +126,8 @@ String_114228:
 String_114232:
 	db "=?ISO-2022-JP?B?", 0
 
+popc
+
 Function114243::
 	ld a, SRAM_ENABLE
 	ld [MBC3SRamEnable], a
diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm
index e77ac983e..a2c117bfb 100644
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -1484,8 +1484,8 @@ Function118b9a:
 	and a
 	ret
 
-	pushc
-	setcharmap ascii ; revert to ascii
+pushc
+setcharmap ascii
 
 ExchangeDownloadURL:
 	db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/exchange/index.txt", 0
@@ -1502,7 +1502,7 @@ MenuDownloadURL:
 IndexDownloadURL:
 	db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/tamago/index.txt", 0
 
-	popc
+popc
 
 Unreferenced_Function118d35:
 	ld hl, $d200
@@ -2935,9 +2935,6 @@ Unknown_1196b8:
 
 popc
 
-SECTION "Mobile 46 ASCII", ROMX
-; A hack to use ascii above.
-
 Function1196cd:
 	ld de, wc719
 	call Function1196de
diff --git a/pokecrystal.link b/pokecrystal.link
index e8e8f0714..d03fe47c1 100644
--- a/pokecrystal.link
+++ b/pokecrystal.link
@@ -167,10 +167,6 @@ ROMX $3f
 	"bank3F"
 ROMX $40
 	"mobile_40"
-	"tetsuji"
-	"bank40_2"
-	"ascii 10186f"
-	"bank40_3"
 ROMX $41
 	"bank41"
 ROMX $42
@@ -186,7 +182,6 @@ ROMX $45
 	"Mobile Stadium"
 ROMX $46
 	"Mobile 46"
-	"Mobile 46 ASCII"
 ROMX $47
 	"Battle Tower"
 ROMX $48