diff options
| author | mid-kid <esteve.varela@gmail.com> | 2019-11-19 00:08:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-19 00:08:28 +0000 |
| commit | 5e104de3f5bdff54efd5ee562345236c0cdab5b5 (patch) | |
| tree | 5b02e703d76dd44adb8a0ac81041ba08025da7c5 /mobile | |
| parent | f76a093f44dcf6f5b733ba52bff481e03d0593f2 (diff) | |
| parent | 563ba141962d6f7881f7837b2fdcbd0541bc340f (diff) | |
Merge pull request #661 from mid-kid/patch-1
Fixed a charmap warning with the new RGBDS
Diffstat (limited to 'mobile')
| -rw-r--r-- | mobile/mobile_40.asm | 18 | ||||
| -rw-r--r-- | mobile/mobile_45.asm | 5 | ||||
| -rw-r--r-- | mobile/mobile_46.asm | 12 |
3 files changed, 18 insertions, 17 deletions
diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 1d2856682..3ba879ee0 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -1683,16 +1683,13 @@ Function100ae7: ld [wcd2b], a ret - -SECTION "tetsuji", ROMX - - charmap " ", $20 ; revert to ascii +pushc +setcharmap ascii Unknown_100b0a: db "tetsuji", 0 - -SECTION "bank40_2", ROMX +popc Function100b12: call Function100dd8 @@ -3617,10 +3614,8 @@ Function101826: ld [wcd2b], a ret - -SECTION "ascii 10186f", ROMX - - charmap " ", $20 ; revert to ascii +pushc +setcharmap ascii Unknown_10186f: db .end - @ @@ -3637,8 +3632,7 @@ Unknown_101895: db $19, $67, $10, $01, "limit_crystal" .end db 0 - -SECTION "bank40_3", ROMX +popc Function1018a8: ld hl, wccb5 diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index 7de382673..3d4085cc0 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 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 diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 9354e4704..a2c117bfb 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 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" - -SECTION "Mobile 46 ASCII", ROMX -; A hack to use ascii above. +popc Function1196cd: ld de, wc719 |