diff options
| author | Colton G. Rushton <colton51919@gmail.com> | 2019-11-18 18:26:07 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2019-11-18 18:27:48 +0100 |
| commit | 7b2377c41e480bc718b4d2e23d60175f9b5fadb9 (patch) | |
| tree | b8f82e210e686f3880ad977e71c86f1d70c12b8a | |
| parent | f76a093f44dcf6f5b733ba52bff481e03d0593f2 (diff) | |
Fixed a charmap warning with the new RGBDS
| -rw-r--r-- | charmap.asm | 5 | ||||
| -rw-r--r-- | mobile/mobile_40.asm | 8 | ||||
| -rw-r--r-- | mobile/mobile_45.asm | 5 | ||||
| -rw-r--r-- | mobile/mobile_46.asm | 9 |
4 files changed, 23 insertions, 4 deletions
diff --git a/charmap.asm b/charmap.asm index d5bd2bcf1..95e1a804a 100644 --- a/charmap.asm +++ b/charmap.asm @@ -416,3 +416,8 @@ charmap "７", $fd charmap "８", $fe charmap "９", $ff + +; ASCII charmap, for mobile functions + pushc + newcharmap ascii + popc diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 1d2856682..e2921a906 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -1686,11 +1686,13 @@ Function100ae7: SECTION "tetsuji", ROMX - charmap " ", $20 ; revert to ascii + pushc + setcharmap ascii ; revert to ascii Unknown_100b0a: db "tetsuji", 0 + popc SECTION "bank40_2", ROMX @@ -3620,7 +3622,8 @@ Function101826: SECTION "ascii 10186f", ROMX - charmap " ", $20 ; revert to ascii + pushc + setcharmap ascii ; revert to ascii Unknown_10186f: db .end - @ @@ -3637,6 +3640,7 @@ Unknown_101895: db $19, $67, $10, $01, "limit_crystal" .end db 0 +popc SECTION "bank40_3", ROMX diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index 7de382673..45662e4e6 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -1,6 +1,7 @@ SECTION "Mobile 45", ROMX - charmap " ", $20 ; revert to ascii + pushc + setcharmap ascii ; revert to ascii String_114000: db "---", 0 @@ -59,6 +60,8 @@ String_114160: String_114163: db ".", 0 +popc + Jumptable_114165: dw Stubbed_Function114268 dw Function114269 diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 9354e4704..e77ac983e 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -1484,7 +1484,8 @@ Function118b9a: and a ret - charmap " ", $20 ; revert to ascii + pushc + setcharmap ascii ; revert to 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,6 +2933,7 @@ Unknown_1196b8: db "Sat" db "Sun" +popc SECTION "Mobile 46 ASCII", ROMX ; A hack to use ascii above. |