shithub: pokecrystal

Download patch

ref: 563ba141962d6f7881f7837b2fdcbd0541bc340f
parent: 7b2377c41e480bc718b4d2e23d60175f9b5fadb9
author: mid-kid <esteve.varela@gmail.com>
date: Mon Nov 18 19:48:39 EST 2019

Remove old charmap sections

--- a/FAQ.md
+++ b/FAQ.md
@@ -38,11 +38,11 @@
 
 ### "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`
 
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -38,7 +38,7 @@
 
 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.
 
--- a/charmap.asm
+++ b/charmap.asm
@@ -418,6 +418,6 @@
 	charmap "9", $ff
 
 ; ASCII charmap, for mobile functions
-	pushc
-	newcharmap ascii
-	popc
+pushc
+newcharmap ascii
+popc
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -1683,19 +1683,14 @@
 	ld [wcd2b], a
 	ret
 
+pushc
+setcharmap ascii
 
-SECTION "tetsuji", ROMX
-
-	pushc
-	setcharmap ascii ; revert to ascii
-
 Unknown_100b0a:
 	db "tetsuji", 0
 
-	popc
+popc
 
-SECTION "bank40_2", ROMX
-
 Function100b12:
 	call Function100dd8
 	ret c
@@ -3619,12 +3614,9 @@
 	ld [wcd2b], a
 	ret
 
+pushc
+setcharmap ascii
 
-SECTION "ascii 10186f", ROMX
-
-	pushc
-	setcharmap ascii ; revert to ascii
-
 Unknown_10186f:
 	db .end - @
 	db $19, $73, $09, $13, "trade_crystal"
@@ -3641,8 +3633,6 @@
 .end	db 0
 
 popc
-
-SECTION "bank40_3", ROMX
 
 Function1018a8:
 	ld hl, wccb5
--- 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_114163:
 	db ".", 0
 
-popc
-
 Jumptable_114165:
 	dw Stubbed_Function114268
 	dw Function114269
@@ -127,6 +125,8 @@
 	db "BOUNDARY=", 0
 String_114232:
 	db "=?ISO-2022-JP?B?", 0
+
+popc
 
 Function114243::
 	ld a, SRAM_ENABLE
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -1484,8 +1484,8 @@
 	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 @@
 IndexDownloadURL:
 	db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/tamago/index.txt", 0
 
-	popc
+popc
 
 Unreferenced_Function118d35:
 	ld hl, $d200
@@ -2934,9 +2934,6 @@
 	db "Sun"
 
 popc
-
-SECTION "Mobile 46 ASCII", ROMX
-; A hack to use ascii above.
 
 Function1196cd:
 	ld de, wc719
--- a/pokecrystal.link
+++ b/pokecrystal.link
@@ -167,10 +167,6 @@
 	"bank3F"
 ROMX $40
 	"mobile_40"
-	"tetsuji"
-	"bank40_2"
-	"ascii 10186f"
-	"bank40_3"
 ROMX $41
 	"bank41"
 ROMX $42
@@ -186,7 +182,6 @@
 	"Mobile Stadium"
 ROMX $46
 	"Mobile 46"
-	"Mobile 46 ASCII"
 ROMX $47
 	"Battle Tower"
 ROMX $48