Merge pull request #661 from mid-kid/patch-1

Fixed a charmap warning with the new RGBDS

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`
 

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.
 

charmap.asm

@@ -416,3 +416,8 @@
 	charmap "７", $fd
 	charmap "８", $fe
 	charmap "９", $ff
+
+; ASCII charmap, for mobile functions
+pushc
+newcharmap ascii
+popc

mobile/mobile_40.asm

@@ -1683,16 +1683,13 @@ Function100ae7:
 	ld [wcd2b], a
 	ret
 
-
+pushc
-SECTION "tetsuji", ROMX
+setcharmap ascii
-
-	charmap " ", $20 ; revert to ascii
 
 Unknown_100b0a:
 	db "tetsuji", 0
 
-
+popc
-SECTION "bank40_2", ROMX
 
 Function100b12:
 	call Function100dd8
@@ -3617,10 +3614,8 @@ Function101826:
 	ld [wcd2b], a
 	ret
 
-
+pushc
-SECTION "ascii 10186f", ROMX
+setcharmap ascii
-
-	charmap " ", $20 ; revert to ascii
 
 Unknown_10186f:
 	db .end - @
@@ -3637,8 +3632,7 @@ Unknown_101895:
 	db $19, $67, $10, $01, "limit_crystal"
 .end	db 0
 
-
+popc
-SECTION "bank40_3", ROMX
 
 Function1018a8:
 	ld hl, wccb5

mobile/mobile_45.asm

@@ -1,6 +1,7 @@
 SECTION "Mobile 45", ROMX
 
-	charmap " ", $20 ; revert to ascii
+pushc
+setcharmap ascii
 
 String_114000:
 	db "---", 0
@@ -125,6 +126,8 @@ String_114228:
 String_114232:
 	db "=?ISO-2022-JP?B?", 0
 
+popc
+
 Function114243::
 	ld a, SRAM_ENABLE
 	ld [MBC3SRamEnable], a

mobile/mobile_46.asm

@@ -1484,7 +1484,8 @@ Function118b9a:
 	and a
 	ret
 
-	charmap " ", $20 ; revert to ascii
+pushc
+setcharmap ascii
 
 ExchangeDownloadURL:
 	db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/exchange/index.txt", 0
@@ -1501,6 +1502,8 @@ MenuDownloadURL:
 IndexDownloadURL:
 	db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/tamago/index.txt", 0
 
+popc
+
 Unreferenced_Function118d35:
 	ld hl, $d200
 	ld a, [wcd38]
@@ -2918,6 +2921,9 @@ Function119694:
 	jr nz, .asm_119699
 	ret
 
+pushc
+setcharmap ascii
+
 Unknown_1196b8:
 	db "Mon"
 	db "Tue"
@@ -2927,9 +2933,7 @@ Unknown_1196b8:
 	db "Sat"
 	db "Sun"
 
-
+popc
-SECTION "Mobile 46 ASCII", ROMX
-; A hack to use ascii above.
 
 Function1196cd:
 	ld de, wc719

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