diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a016aac78..51c2eab39 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@master with: path: rgbds - ref: v0.9.3 + ref: v1.0.0 repository: gbdev/rgbds - name: Install rgbds diff --git a/.rgbds-version b/.rgbds-version index 965065db5..3eefcb9dd 100644 --- a/.rgbds-version +++ b/.rgbds-version @@ -1 +1 @@ -0.9.3 +1.0.0 diff --git a/FAQ.md b/FAQ.md index 0383be418..492963dcf 100644 --- a/FAQ.md +++ b/FAQ.md @@ -41,15 +41,15 @@ You need to install `gcc`. If you're using Cygwin, re-run its setup, and at "Sel ### "ERROR: `UNION` already defined" -Download [**rgbds 0.9.3**][rgbds] or newer. Older versions will not work. +Download [**rgbds 1.0.0**][rgbds] or newer. Older versions will not work. ### "ERROR: Macro not defined" -Download [**rgbds 0.9.3**][rgbds] or newer. Older versions will not work. +Download [**rgbds 1.0.0**][rgbds] or newer. Older versions will not work. ### "Expression must be 8-bit" -Download [**rgbds 0.9.3**][rgbds] or newer. Older versions will not work. +Download [**rgbds 1.0.0**][rgbds] or newer. Older versions will not work. ### "Segmentation fault" from `rgbgfx` diff --git a/INSTALL.md b/INSTALL.md index b8e2326fe..40196cff1 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -42,9 +42,9 @@ Run setup and leave the default settings. At the "**Select Packages**" step, cho Double click on the text that says "**Skip**" next to each package to select the most recent version to install. -Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for Windows with Cygwin to install **rgbds 0.9.3**. +Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for Windows with Cygwin to install **rgbds 1.0.0**. -**Note:** If you already have an installed rgbds older than 0.9.3, you will need to update to 0.9.3. Ignore this if you have never installed rgbds before. If a version newer than 0.9.3 does not work, try downloading 0.9.3. +**Note:** If you already have an installed rgbds older than 1.0.0, you will need to update to 1.0.0. Ignore this if you have never installed rgbds before. If a version newer than 1.0.0 does not work, try downloading 1.0.0. Now open the **Cygwin terminal** and enter the following commands. @@ -67,7 +67,7 @@ Install [**Homebrew**](https://brew.sh/). Follow the official instructions. Open **Terminal** and prepare to enter commands. -Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for macOS to install **rgbds 0.9.3**. +Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for macOS to install **rgbds 1.0.0**. Now you're ready to [build **pokecrystal**](#build-pokecrystal). @@ -84,7 +84,7 @@ To install the software required for **pokecrystal**: sudo apt-get install make gcc git ``` -Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.9.3** from source. +Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.0** from source. ### OpenSUSE @@ -94,7 +94,7 @@ To install the software required for **pokecrystal**: sudo zypper install make gcc git ``` -Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.9.3** from source. +Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.0** from source. ### Arch Linux @@ -104,7 +104,7 @@ To install the software required for **pokecrystal**: sudo pacman -S make gcc git rgbds ``` -If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.9.3** from source. +If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.0** from source. ### Termux @@ -120,7 +120,7 @@ To install **rgbds**: pkg install rgbds ``` -If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.9.3** from source. +If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.0** from source. ### Other distros @@ -131,7 +131,7 @@ If your distro is not listed here, try to find the required software in its repo - `git` - `rgbds` -If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.9.3** from source. +If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 1.0.0** from source. Now you're ready to [build **pokecrystal**](#build-pokecrystal). @@ -159,12 +159,12 @@ make crystal11 ### Build with a local rgbds version -If you have different projects that require different versions of `rgbds`, it might not be convenient to install rgbds 0.9.3 globally. Instead, you can put its files in a directory within pokecrystal, such as `pokecrystal/rgbds-0.9.3/`. Then specify it when you run `make`: +If you have different projects that require different versions of `rgbds`, it might not be convenient to install rgbds 1.0.0 globally. Instead, you can put its files in a directory within pokecrystal, such as `pokecrystal/rgbds-1.0.0/`. Then specify it when you run `make`: ```bash -make RGBDS=rgbds-0.9.3/ +make RGBDS=rgbds-1.0.0/ ``` ```bash -make RGBDS=rgbds-0.9.3/ crystal11 +make RGBDS=rgbds-1.0.0/ crystal11 ``` diff --git a/Makefile b/Makefile index b28fc3f20..6eb6faf53 100644 --- a/Makefile +++ b/Makefile @@ -47,6 +47,11 @@ RGBFIX ?= $(RGBDS)rgbfix RGBGFX ?= $(RGBDS)rgbgfx RGBLINK ?= $(RGBDS)rgblink +RGBASMFLAGS ?= -Weverything -Wtruncation=1 +RGBLINKFLAGS ?= -Weverything -Wtruncation=1 +RGBFIXFLAGS ?= -Weverything +RGBGFXFLAGS ?= -Weverything + ### Build targets @@ -104,7 +109,7 @@ tools: $(MAKE) -C tools/ -RGBASMFLAGS = -Q8 -P includes.asm -Weverything -Wtruncation=1 +RGBASMFLAGS += -Q8 -P includes.asm # Create a sym/map for debug purposes if `make` run with `DEBUG=1` ifeq ($(DEBUG),1) RGBASMFLAGS += -E @@ -150,16 +155,17 @@ $(foreach obj, $(pokecrystal11_vc_obj), $(eval $(call DEP,$(obj),$(obj:11_vc.o=. endif -pokecrystal_opt = -Cjv -t PM_CRYSTAL -i BYTE -n 0 -k 01 -l 0x33 -m MBC3+TIMER+RAM+BATTERY -r 3 -p 0 -pokecrystal11_opt = -Cjv -t PM_CRYSTAL -i BYTE -n 1 -k 01 -l 0x33 -m MBC3+TIMER+RAM+BATTERY -r 3 -p 0 -pokecrystal_au_opt = -Cjv -t PM_CRYSTAL -i BYTU -n 0 -k 01 -l 0x33 -m MBC3+TIMER+RAM+BATTERY -r 3 -p 0 -pokecrystal_debug_opt = -Cjv -t PM_CRYSTAL -i BYTE -n 0 -k 01 -l 0x33 -m MBC3+TIMER+RAM+BATTERY -r 3 -p 0 -pokecrystal11_debug_opt = -Cjv -t PM_CRYSTAL -i BYTE -n 1 -k 01 -l 0x33 -m MBC3+TIMER+RAM+BATTERY -r 3 -p 0 -pokecrystal11_vc_opt = -Cjv -t PM_CRYSTAL -i BYTE -n 1 -k 01 -l 0x33 -m MBC3+TIMER+RAM+BATTERY -r 3 -p 0 +RGBFIXFLAGS += -Cjv -t PM_CRYSTAL -k 01 -l 0x33 -m MBC3+TIMER+RAM+BATTERY -r 3 -p 0 +pokecrystal.gbc: RGBFIXFLAGS += -i BYTE -n 0 +pokecrystal11.gbc: RGBFIXFLAGS += -i BYTE -n 1 +pokecrystal_au.gbc: RGBFIXFLAGS += -i BYTU -n 0 +pokecrystal_debug.gbc: RGBFIXFLAGS += -i BYTE -n 0 +pokecrystal11_debug.gbc: RGBFIXFLAGS += -i BYTE -n 1 +pokecrystal11_vc.gbc: RGBFIXFLAGS += -i BYTE -n 1 %.gbc: $$(%_obj) layout.link - $(RGBLINK) -n $*.sym -m $*.map -l layout.link -o $@ $(filter %.o,$^) - $(RGBFIX) $($*_opt) $@ + $(RGBLINK) $(RGBLINKFLAGS) -l layout.link -n $*.sym -m $*.map -o $@ $(filter %.o,$^) + $(RGBFIX) $(RGBFIXFLAGS) $@ tools/stadium $@ @@ -206,35 +212,35 @@ gfx/pokemon/girafarig/front.animated.tilemap: gfx/pokemon/girafarig/front.2bpp g ### Pokemon and trainer sprite rules -gfx/pokemon/%/back.2bpp: rgbgfx += --columns +gfx/pokemon/%/back.2bpp: RGBGFXFLAGS += --columns gfx/pokemon/%/back.2bpp: gfx/pokemon/%/back.png gfx/pokemon/%/normal.gbcpal - $(RGBGFX) $(rgbgfx) --colors gbc:$(word 2,$^) -o $@ $< + $(RGBGFX) $(RGBGFXFLAGS) --colors gbc:$(word 2,$^) -o $@ $< gfx/pokemon/%/front.2bpp: gfx/pokemon/%/front.png gfx/pokemon/%/normal.gbcpal - $(RGBGFX) $(rgbgfx) --colors gbc:$(word 2,$^) -o $@ $< + $(RGBGFX) $(RGBGFXFLAGS) --colors gbc:$(word 2,$^) -o $@ $< gfx/pokemon/%/normal.gbcpal: gfx/pokemon/%/front.gbcpal gfx/pokemon/%/back.gbcpal tools/gbcpal $(tools/gbcpal) $@ $^ -gfx/trainers/%.2bpp: rgbgfx += --columns +gfx/trainers/%.2bpp: RGBGFXFLAGS += --columns gfx/trainers/%.2bpp: gfx/trainers/%.png gfx/trainers/%.gbcpal - $(RGBGFX) $(rgbgfx) --colors gbc:$(word 2,$^) -o $@ $< + $(RGBGFX) $(RGBGFXFLAGS) --colors gbc:$(word 2,$^) -o $@ $< # Egg does not have a back sprite, so it only uses front.gbcpal gfx/pokemon/egg/front.2bpp: gfx/pokemon/egg/front.png gfx/pokemon/egg/front.gbcpal -gfx/pokemon/egg/front.2bpp: rgbgfx += --colors gbc:$(word 2,$^) +gfx/pokemon/egg/front.2bpp: RGBGFXFLAGS += --colors gbc:$(word 2,$^) # Unown letters share one normal.gbcpal unown_pngs := $(wildcard gfx/pokemon/unown_*/front.png) $(wildcard gfx/pokemon/unown_*/back.png) $(foreach png, $(unown_pngs),\ $(eval $(png:.png=.2bpp): $(png) gfx/pokemon/unown/normal.gbcpal)) -gfx/pokemon/unown_%/back.2bpp: rgbgfx += --colors gbc:$(word 2,$^) -gfx/pokemon/unown_%/front.2bpp: rgbgfx += --colors gbc:$(word 2,$^) +gfx/pokemon/unown_%/back.2bpp: RGBGFXFLAGS += --colors gbc:$(word 2,$^) +gfx/pokemon/unown_%/front.2bpp: RGBGFXFLAGS += --colors gbc:$(word 2,$^) gfx/pokemon/unown/normal.gbcpal: $(subst .png,.gbcpal,$(unown_pngs)) tools/gbcpal $(tools/gbcpal) $@ $^ ### Misc file-specific graphics rules -gfx/pokemon/egg/unused_front.2bpp: rgbgfx += --columns +gfx/pokemon/egg/unused_front.2bpp: RGBGFXFLAGS += --columns gfx/pokemon/spearow/normal.gbcpal: tools/gbcpal += --reverse gfx/pokemon/fearow/normal.gbcpal: tools/gbcpal += --reverse @@ -247,8 +253,8 @@ gfx/pokemon/porygon2/normal.gbcpal: tools/gbcpal += --reverse gfx/trainers/swimmer_m.gbcpal: tools/gbcpal += --reverse -gfx/new_game/shrink1.2bpp: rgbgfx += --columns -gfx/new_game/shrink2.2bpp: rgbgfx += --columns +gfx/new_game/shrink1.2bpp: RGBGFXFLAGS += --columns +gfx/new_game/shrink2.2bpp: RGBGFXFLAGS += --columns gfx/mail/dragonite.1bpp: tools/gfx += --remove-whitespace gfx/mail/large_note.1bpp: tools/gfx += --remove-whitespace @@ -258,17 +264,17 @@ gfx/mail/litebluemail_border.1bpp: tools/gfx += --remove-whitespace gfx/pokedex/pokedex.2bpp: tools/gfx += --trim-whitespace gfx/pokedex/pokedex_sgb.2bpp: tools/gfx += --trim-whitespace -gfx/pokedex/question_mark.2bpp: rgbgfx += --columns +gfx/pokedex/question_mark.2bpp: RGBGFXFLAGS += --columns gfx/pokedex/slowpoke.2bpp: tools/gfx += --trim-whitespace -gfx/pokegear/pokegear.2bpp: rgbgfx += --trim-end 2 +gfx/pokegear/pokegear.2bpp: RGBGFXFLAGS += --trim-end 2 gfx/pokegear/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace gfx/mystery_gift/mystery_gift.2bpp: tools/gfx += --trim-whitespace gfx/title/crystal.2bpp: tools/gfx += --interleave --png=$< gfx/title/old_fg.2bpp: tools/gfx += --interleave --png=$< -gfx/title/logo.2bpp: rgbgfx += --trim-end 4 +gfx/title/logo.2bpp: RGBGFXFLAGS += --trim-end 4 gfx/trade/ball.2bpp: tools/gfx += --remove-whitespace gfx/trade/game_boy.2bpp: tools/gfx += --remove-duplicates --preserve=0x23,0x27 @@ -299,13 +305,13 @@ gfx/battle_anims/rocks.2bpp: tools/gfx += --remove-whitespace gfx/battle_anims/skyattack.2bpp: tools/gfx += --remove-whitespace gfx/battle_anims/status.2bpp: tools/gfx += --remove-whitespace -gfx/player/chris.2bpp: rgbgfx += --columns -gfx/player/chris_back.2bpp: rgbgfx += --columns -gfx/player/kris.2bpp: rgbgfx += --columns -gfx/player/kris_back.2bpp: rgbgfx += --columns +gfx/player/chris.2bpp: RGBGFXFLAGS += --columns +gfx/player/chris_back.2bpp: RGBGFXFLAGS += --columns +gfx/player/kris.2bpp: RGBGFXFLAGS += --columns +gfx/player/kris_back.2bpp: RGBGFXFLAGS += --columns -gfx/trainer_card/chris_card.2bpp: rgbgfx += --columns -gfx/trainer_card/kris_card.2bpp: rgbgfx += --columns +gfx/trainer_card/chris_card.2bpp: RGBGFXFLAGS += --columns +gfx/trainer_card/kris_card.2bpp: RGBGFXFLAGS += --columns gfx/trainer_card/leaders.2bpp: tools/gfx += --trim-whitespace gfx/overworld/chris_fish.2bpp: tools/gfx += --trim-whitespace @@ -313,7 +319,7 @@ gfx/overworld/kris_fish.2bpp: tools/gfx += --trim-whitespace gfx/sprites/big_onix.2bpp: tools/gfx += --remove-whitespace --remove-xflip -gfx/battle/dude.2bpp: rgbgfx += --columns +gfx/battle/dude.2bpp: RGBGFXFLAGS += --columns gfx/font/unused_bold_font.1bpp: tools/gfx += --trim-whitespace @@ -336,12 +342,12 @@ gfx/mobile/stadium2_n64.2bpp: tools/gfx += --trim-whitespace ### Catch-all graphics rules %.2bpp: %.png - $(RGBGFX) --colors dmg=e4 $(rgbgfx) -o $@ $< + $(RGBGFX) --colors dmg $(RGBGFXFLAGS) -o $@ $< $(if $(tools/gfx),\ tools/gfx $(tools/gfx) -o $@ $@ || $$($(RM) $@ && false)) %.1bpp: %.png - $(RGBGFX) --colors dmg=e4 $(rgbgfx) --depth 1 -o $@ $< + $(RGBGFX) --colors dmg $(RGBGFXFLAGS) --depth 1 -o $@ $< $(if $(tools/gfx),\ tools/gfx $(tools/gfx) --depth 1 -o $@ $@ || $$($(RM) $@ && false)) diff --git a/data/events/unown_walls.asm b/data/events/unown_walls.asm index bc16c6e7f..8115cad2e 100644 --- a/data/events/unown_walls.asm +++ b/data/events/unown_walls.asm @@ -8,7 +8,7 @@ UnownWalls: ; entries correspond to UNOWNWORDS_* constants list_start for x, NUM_UNOWN_WALLS - li "{UNOWNWORD_{d:x}}" + li #UNOWNWORD_{d:x} endr assert_list_length NUM_UNOWN_WALLS @@ -16,7 +16,7 @@ MenuHeaders_UnownWalls: ; entries correspond to UNOWNWORDS_* constants table_width UNOWN_WALL_MENU_HEADER_SIZE for x, NUM_UNOWN_WALLS - DEF n = CHARLEN("{UNOWNWORD_{d:x}}") + DEF n = CHARLEN(#UNOWNWORD_{d:x}) db MENU_BACKUP_TILES ; flags menu_coords 9 - n, 4, 10 + n, 9 endr diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 170c94593..2c815b3ac 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -37,7 +37,7 @@ MACRO connection DEF _tgt = 0 endc - if !STRCMP("\1", "north") + if "\1" === "north" DEF _blk = \3_WIDTH * (\3_HEIGHT - MAP_CONNECTION_PADDING_WIDTH) + _src DEF _map = _tgt DEF _win = (\3_WIDTH + MAP_CONNECTION_PADDING_WIDTH * 2) * \3_HEIGHT + 1 @@ -48,7 +48,7 @@ MACRO connection DEF _len = \3_WIDTH endc - elif !STRCMP("\1", "south") + elif "\1" === "south" DEF _blk = _src DEF _map = (CURRENT_MAP_WIDTH + MAP_CONNECTION_PADDING_WIDTH * 2) * (CURRENT_MAP_HEIGHT + MAP_CONNECTION_PADDING_WIDTH) + _tgt DEF _win = \3_WIDTH + MAP_CONNECTION_PADDING_WIDTH * 2 + 1 @@ -59,7 +59,7 @@ MACRO connection DEF _len = \3_WIDTH endc - elif !STRCMP("\1", "west") + elif "\1" === "west" DEF _blk = (\3_WIDTH * _src) + \3_WIDTH - MAP_CONNECTION_PADDING_WIDTH DEF _map = (CURRENT_MAP_WIDTH + MAP_CONNECTION_PADDING_WIDTH * 2) * _tgt DEF _win = (\3_WIDTH + MAP_CONNECTION_PADDING_WIDTH * 2) * 2 - MAP_CONNECTION_PADDING_WIDTH * 2 @@ -70,7 +70,7 @@ MACRO connection DEF _len = \3_HEIGHT endc - elif !STRCMP("\1", "east") + elif "\1" === "east" DEF _blk = (\3_WIDTH * _src) DEF _map = (CURRENT_MAP_WIDTH + MAP_CONNECTION_PADDING_WIDTH * 2) * _tgt + CURRENT_MAP_WIDTH + MAP_CONNECTION_PADDING_WIDTH DEF _win = \3_WIDTH + MAP_CONNECTION_PADDING_WIDTH * 2 + 1 diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm index cf7e11775..7572b667e 100644 --- a/data/pokemon/unown_words.asm +++ b/data/pokemon/unown_words.asm @@ -1,6 +1,6 @@ MACRO unownword for n, CHARLEN(\1) - db STRCHAR(\1, n) - "A" + FIRST_UNOWN_CHAR + db CHARVAL(STRCHAR(\1, n)) - 'A' + FIRST_UNOWN_CHAR endr db -1 ENDM diff --git a/engine/battle/anim_hp_bar.asm b/engine/battle/anim_hp_bar.asm index 3e413f9f7..a76b38bcb 100644 --- a/engine/battle/anim_hp_bar.asm +++ b/engine/battle/anim_hp_bar.asm @@ -257,7 +257,7 @@ HPBarAnim_UpdateHPRemaining: .loaded_de push hl add hl, de - ld a, " " + ld a, ' ' ld [hli], a ld [hli], a ld [hld], a diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index a3138c9e5..ca244e9f7 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -5,8 +5,8 @@ DEF BATTLETRANSITION_NO_CAVE EQU $10 DEF BATTLETRANSITION_NO_CAVE_STRONGER EQU $18 DEF BATTLETRANSITION_FINISH EQU $20 -DEF BATTLETRANSITION_SQUARE EQU "8" ; $fe -DEF BATTLETRANSITION_BLACK EQU "9" ; $ff +DEF BATTLETRANSITION_SQUARE EQU '8' ; $fe +DEF BATTLETRANSITION_BLACK EQU '9' ; $ff DoBattleTransition: call .InitGFX diff --git a/engine/battle/core.asm b/engine/battle/core.asm index f91a095ea..38e2dec49 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -4685,11 +4685,11 @@ PrintPlayerHUD: ld a, TEMPMON ld [wMonType], a callfar GetGender - ld a, " " + ld a, ' ' jr c, .got_gender_char - ld a, "♂" + ld a, '♂' jr nz, .got_gender_char - ld a, "♀" + ld a, '♀' .got_gender_char hlcoord 17, 8 @@ -4703,7 +4703,7 @@ PrintPlayerHUD: pop bc ret nz ld a, b - cp " " + cp ' ' jr nz, .copy_level ; male or female dec hl ; genderless @@ -4761,11 +4761,11 @@ DrawEnemyHUD: ld a, TEMPMON ld [wMonType], a callfar GetGender - ld a, " " + ld a, ' ' jr c, .got_gender - ld a, "♂" + ld a, '♂' jr nz, .got_gender - ld a, "♀" + ld a, '♀' .got_gender hlcoord 9, 1 @@ -4780,7 +4780,7 @@ DrawEnemyHUD: pop bc jr nz, .skip_level ld a, b - cp " " + cp ' ' jr nz, .print_level dec hl .print_level @@ -5443,7 +5443,7 @@ MoveSelectionScreen: ld bc, SCREEN_WIDTH dec a call AddNTimes - ld [hl], "▷" + ld [hl], '▷' .interpret_joypad ld a, $1 @@ -5694,7 +5694,7 @@ MoveInfoBox: call PlaceString hlcoord 7, 11 - ld [hl], "/" + ld [hl], '/' callfar UpdateMoveData ld a, [wPlayerMoveStruct + MOVE_ANIM] @@ -5724,7 +5724,7 @@ MoveInfoBox: pop hl inc hl inc hl - ld [hl], "/" + ld [hl], '/' inc hl ld de, wNamedObjectIndex lb bc, 1, 2 @@ -8492,7 +8492,7 @@ ReadAndPrintLinkBattleRecord: ld de, wLinkBattleRecordName ld bc, NAME_LENGTH - 1 call CopyBytes - ld a, "@" + ld a, '@' ld [de], a inc de ; wLinkBattleRecordWins ld bc, 6 @@ -8958,7 +8958,7 @@ InitBattleDisplay: ld hl, wDecompressScratch ld bc, TILEMAP_AREA - ld a, " " + ld a, ' ' call ByteFill ld de, wDecompressScratch diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 89d0c4841..ca395bb5b 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -4605,7 +4605,7 @@ BattleCommand_StatDownFailText: GetStatName: ld hl, StatNames - ld c, "@" + ld c, '@' .CheckName: dec b jr z, .Copy diff --git a/engine/battle/getgen1trainerclassname.asm b/engine/battle/getgen1trainerclassname.asm index 78b543f12..7126af16d 100644 --- a/engine/battle/getgen1trainerclassname.asm +++ b/engine/battle/getgen1trainerclassname.asm @@ -14,7 +14,7 @@ GetGen1TrainerClassName: ; unreferenced ld a, [hli] ld [de], a inc de - cp "@" + cp '@' jr nz, .copy ret diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index f2b978b9b..f4ddfd3e4 100644 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm @@ -51,7 +51,7 @@ ReadTrainerParty: .skip_name ld a, [hli] - cp "@" + cp '@' jr nz, .skip_name ld a, [hli] diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm index a8ee5b010..bbde9d32d 100644 --- a/engine/battle/trainer_huds.asm +++ b/engine/battle/trainer_huds.asm @@ -246,9 +246,9 @@ _ShowLinkBattleParticipants: ld de, wOTPlayerName call PlaceString hlcoord 9, 8 - ld a, "" + ld a, '' ld [hli], a - ld [hl], "" + ld [hl], '' farcall LinkBattle_TrainerHuds ; no need to farcall ld b, SCGB_DIPLOMA call GetSGBLayout diff --git a/engine/debug/color_picker.asm b/engine/debug/color_picker.asm index 0d6cc744b..c4413bc88 100644 --- a/engine/debug/color_picker.asm +++ b/engine/debug/color_picker.asm @@ -1010,7 +1010,7 @@ DebugColor_PlaceCursor: hlcoord 1, 11 ld bc, 2 * SCREEN_WIDTH call AddNTimes - ld [hl], "▶" + ld [hl], '▶' .place_cursor ld a, [wDebugColorCurColor] @@ -1022,7 +1022,7 @@ DebugColor_PlaceCursor: .light hlcoord 10, 0 .place - ld [hl], "▶" + ld [hl], '▶' ld b, $70 ; initial tile id ld c, 5 ; initial palette diff --git a/engine/debug/debug_room.asm b/engine/debug/debug_room.asm index 1fed04963..2fc516003 100644 --- a/engine/debug/debug_room.asm +++ b/engine/debug/debug_room.asm @@ -41,7 +41,7 @@ _DebugRoom: .loop ld hl, wTilemap ld bc, wTilemapEnd - wTilemap - ld a, " " + ld a, ' ' call ByteFill call DebugRoom_PrintStackBottomTop call DebugRoom_PrintWindowStackBottomTop @@ -429,9 +429,9 @@ DebugRoom_PrintGender: ld a, [sCrystalData + (wPlayerGender - wCrystalData)] call CloseSRAM or a - ld a, "♂" + ld a, '♂' jr z, .ok - ld a, "♀" + ld a, '♀' .ok hlcoord 19, 1 ld [hl], a @@ -591,7 +591,7 @@ DebugRoom_EditPagedValues: call DebugRoom_InitializePagedValues xor a call DebugRoom_PrintPage - ld a, "▶" + ld a, '▶' call DebugRoom_ShowHideCursor xor a ldh [hJoyLast], a @@ -717,7 +717,7 @@ DebugRoom_NextPage: dec a ld [wDebugRoomCurValue], a .skip - ld a, "▶" + ld a, '▶' call DebugRoom_ShowHideCursor ret @@ -739,12 +739,12 @@ DebugRoom_PrevPage: dec a ld [wDebugRoomCurValue], a .skip - ld a, "▶" + ld a, '▶' call DebugRoom_ShowHideCursor ret DebugRoom_NextPagedValue: - ld a, " " + ld a, ' ' call DebugRoom_ShowHideCursor ld a, [wDebugRoomCurPage] call DebugRoom_GetNthPagePointer @@ -758,12 +758,12 @@ DebugRoom_NextPagedValue: DebugRoom_UpdateValueCursor: ld [wDebugRoomCurValue], a - ld a, "▶" + ld a, '▶' call DebugRoom_ShowHideCursor ret DebugRoom_PrevPagedValue: - ld a, " " + ld a, ' ' call DebugRoom_ShowHideCursor ld a, [wDebugRoomCurValue] or a ; pre-decremented value > 0? @@ -887,7 +887,7 @@ DebugRoom_InitializePagedValues: DebugRoom_PrintPage: push af hlcoord 10, 17 - add "1" + add '1' ld [hl], a hlcoord 1, 1 lb bc, SCREEN_HEIGHT - 2, SCREEN_WIDTH - 2 @@ -978,7 +978,7 @@ DebugRoom_PrintPagedValue: .hex ld c, 1 call PrintHexNumber - ld [hl], "H" + ld [hl], 'H' inc hl .printed ld bc, 6 @@ -1403,12 +1403,12 @@ DebugRoomMenu_RTCEdit_UpdateClock: ld de, wDebugRoomRTCCurHour lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum - ld [hl], ":" + ld [hl], ':' inc hl ld de, wDebugRoomRTCCurMin lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum - ld [hl], ":" + ld [hl], ':' inc hl ld de, wDebugRoomRTCCurSec lb bc, PRINTNUM_LEADINGZEROS | 1, 2 @@ -1593,7 +1593,7 @@ ComputeROMChecksum: hlcoord 16, 16 ld c, 1 call PrintHexNumber - ld [hl], "h" + ld [hl], 'h' pop de pop bc call ComputeROMXChecksum @@ -1661,7 +1661,7 @@ DebugRoomMenu_ROMChecksum: ld de, wDebugRoomROMChecksum ld c, 2 call PrintHexNumber - ld [hl], "h" + ld [hl], 'h' call DebugRoom_JoyWaitABSelect call CloseWindow ret @@ -1701,7 +1701,7 @@ DebugRoomMenu_BTBugPoke: ld de, sIsBugMon ld c, 1 call PrintHexNumber - ld [hl], "h" + ld [hl], 'h' call YesNoBox jr c, .done xor a diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index ca62149ba..2316ccf58 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -244,9 +244,9 @@ RunBattleTowerTrainer: call CloseSRAM ld hl, wStringBuffer3 ld a, [wNrOfBeatenBattleTowerTrainers] - add "1" + add '1' ld [hli], a - ld a, "@" + ld a, '@' ld [hl], a .lost @@ -308,7 +308,7 @@ ReadBTTrainerParty: .skip_mon_3 ; Add the terminator character to each of these names - ld a, "@" + ld a, '@' ld [wBT_OTTempMon1Name + MON_NAME_LENGTH - 1], a ld [wBT_OTTempMon2Name + MON_NAME_LENGTH - 1], a ld [wBT_OTTempMon3Name + MON_NAME_LENGTH - 1], a @@ -329,7 +329,7 @@ ReadBTTrainerParty: ld de, wOTPlayerName ld bc, NAME_LENGTH - 1 call CopyBytes - ld a, "@" + ld a, '@' ld [de], a ld hl, wBT_OTTempTrainerClass @@ -703,39 +703,39 @@ Function1704e1: .DrawBorder: hlcoord 0, 4 - ld a, "┌" + ld a, '┌' ld [hli], a ld c, SCREEN_WIDTH - 2 .top_border_loop - ld a, "─" + ld a, '─' ld [hli], a dec c jr nz, .top_border_loop - ld a, "┐" + ld a, '┐' ld [hli], a ld de, SCREEN_WIDTH ld c, 12 .left_border_loop - ld a, "│" + ld a, '│' ld [hl], a add hl, de dec c jr nz, .left_border_loop - ld a, "└" + ld a, '└' ld [hli], a ld c, SCREEN_WIDTH - 2 .bottom_border_loop - ld a, "─" + ld a, '─' ld [hli], a dec c jr nz, .bottom_border_loop - ld a, "┘" + ld a, '┘' ld [hl], a ld de, -SCREEN_WIDTH add hl, de ld c, 12 .right_border_loop - ld a, "│" + ld a, '│' ld [hl], a add hl, de dec c @@ -831,7 +831,7 @@ Function1704e1: and a jr z, .nope hlcoord 18, 5 - ld a, "▲" + ld a, '▲' ld [hl], a .nope @@ -839,7 +839,7 @@ Function1704e1: cp 60 ret z hlcoord 18, 16 - ld a, "▼" + ld a, '▼' ld [hl], a ret @@ -1281,7 +1281,7 @@ BattleTowerAction_EggTicket: rept 4 dec hl endr - ld a, "@" + ld a, '@' ld [hli], a ld [hli], a pop hl diff --git a/engine/events/battle_tower/rules.asm b/engine/events/battle_tower/rules.asm index 7ffa9f67f..a178da311 100644 --- a/engine/events/battle_tower/rules.asm +++ b/engine/events/battle_tower/rules.asm @@ -26,9 +26,9 @@ CheckForMobileBattleRules: _CheckForBattleTowerRules: ld hl, wStringBuffer2 - ld [hl], "3" + ld [hl], '3' inc hl - ld [hl], "@" + ld [hl], '@' ld de, .PointerTables call BattleTower_ExecuteJumptable ret z diff --git a/engine/events/buena.asm b/engine/events/buena.asm index 17a518b98..57835fc82 100644 --- a/engine/events/buena.asm +++ b/engine/events/buena.asm @@ -194,7 +194,7 @@ PrintBlueCardBalance: ld h, b ld l, c inc hl - ld a, " " + ld a, ' ' ld [hli], a ld [hld], a pop de @@ -283,7 +283,7 @@ endr call Buena_GetPrize inc hl ld a, [hl] - ld c, "0" + ld c, '0' add c ld [de], a ret diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index 3b4e9f1c6..79714f34e 100644 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -96,10 +96,10 @@ LoadContestantName: ; Delete the trailing terminator and replace it with a space. .next ld a, [hli] - cp "@" + cp '@' jr nz, .next dec hl - ld [hl], " " + ld [hl], ' ' inc hl ld d, h ld e, l diff --git a/engine/events/diploma.asm b/engine/events/diploma.asm index 6d8571542..78965fcfb 100644 --- a/engine/events/diploma.asm +++ b/engine/events/diploma.asm @@ -52,7 +52,7 @@ PlaceDiplomaOnScreen: PrintDiplomaPage2: hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill ld hl, DiplomaPage2Tilemap decoord 0, 0 diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index e8a9657f0..4dbe22adb 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -238,7 +238,7 @@ AnimateHOFMonEntrance: predef GetUnownLetter hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill ld de, vTiles2 tile $31 predef GetMonBackpic @@ -262,7 +262,7 @@ AnimateHOFMonEntrance: ld [wBoxAlignment], a hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill hlcoord 6, 5 call _PrepMonFrontpic @@ -449,11 +449,11 @@ DisplayHOFMon: ld de, wStringBuffer2 ld bc, MON_NAME_LENGTH - 1 call CopyBytes - ld a, "@" + ld a, '@' ld [wStringBuffer2 + MON_NAME_LENGTH - 1], a hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill hlcoord 0, 0 lb bc, 3, SCREEN_WIDTH - 2 @@ -474,9 +474,9 @@ DisplayHOFMon: cp EGG jr z, .print_id_no hlcoord 1, 13 - ld a, "№" + ld a, '№' ld [hli], a - ld [hl], "" + ld [hl], '' hlcoord 3, 13 ld de, wTextDecimalByte lb bc, PRINTNUM_LEADINGZEROS | 1, 3 @@ -487,17 +487,17 @@ DisplayHOFMon: ld a, TEMPMON ld [wMonType], a farcall GetGender - ld a, " " + ld a, ' ' jr c, .got_gender - ld a, "♂" + ld a, '♂' jr nz, .got_gender - ld a, "♀" + ld a, '♀' .got_gender hlcoord 18, 13 ld [hli], a hlcoord 8, 14 - ld a, "/" + ld a, '/' ld [hli], a ld de, wStringBuffer2 call PlaceString @@ -506,11 +506,11 @@ DisplayHOFMon: .print_id_no hlcoord 7, 16 - ld a, "" + ld a, '' ld [hli], a - ld a, "№" + ld a, '№' ld [hli], a - ld [hl], "/" + ld [hl], '/' hlcoord 10, 16 ld de, wTempMonID lb bc, PRINTNUM_LEADINGZEROS | 2, 5 @@ -525,7 +525,7 @@ HOF_AnimatePlayerPic: call Request2bpp hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill farcall GetPlayerBackpic ld a, $31 @@ -549,7 +549,7 @@ HOF_AnimatePlayerPic: ld [wBoxAlignment], a hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill farcall HOF_LoadTrainerFrontpic xor a @@ -576,11 +576,11 @@ HOF_AnimatePlayerPic: ld de, wPlayerName call PlaceString hlcoord 1, 6 - ld a, "" + ld a, '' ld [hli], a - ld a, "№" + ld a, '№' ld [hli], a - ld [hl], "/" + ld [hl], '/' hlcoord 4, 6 ld de, wPlayerID lb bc, PRINTNUM_LEADINGZEROS | 2, 5 diff --git a/engine/events/kurt.asm b/engine/events/kurt.asm index ace91a200..0209d480e 100644 --- a/engine/events/kurt.asm +++ b/engine/events/kurt.asm @@ -165,7 +165,7 @@ PlaceApricornQuantity: call MenuBoxCoord2Tile ld de, 2 * SCREEN_WIDTH + 10 add hl, de - ld [hl], "×" + ld [hl], '×' inc hl ld de, wItemQuantityChange lb bc, PRINTNUM_LEADINGZEROS | 1, 2 diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index ae31a3036..a3e040f27 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -211,6 +211,6 @@ PrintTodaysLuckyNumber: ld de, wLuckyIDNumber lb bc, PRINTNUM_LEADINGZEROS | 2, 5 call PrintNum - ld a, "@" + ld a, '@' ld [wStringBuffer3 + 5], a ret diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index acd46c24f..e637ae61c 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -76,7 +76,7 @@ CheckMagikarpLength: text_end Magikarp_LoadFeetInchesChars: - ld hl, vTiles2 tile "′" ; $6e + ld hl, vTiles2 tile '′' ; $6e ld de, .feetinchchars lb bc, BANK(.feetinchchars), 2 call Request2bpp @@ -91,14 +91,14 @@ PrintMagikarpLength: ld de, wMagikarpLength lb bc, PRINTNUM_LEFTALIGN | 1, 2 call PrintNum - ld [hl], "′" + ld [hl], '′' inc hl ld de, wMagikarpLength + 1 lb bc, PRINTNUM_LEFTALIGN | 1, 2 call PrintNum - ld [hl], "″" + ld [hl], '″' inc hl - ld [hl], "@" + ld [hl], '@' ret CalcMagikarpLength: diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm index 2bef462b8..b9e3267d3 100644 --- a/engine/events/map_name_sign.asm +++ b/engine/events/map_name_sign.asm @@ -161,9 +161,9 @@ PlaceMapNameCenterAlign: ld hl, wStringBuffer1 .loop ld a, [hli] - cp "@" + cp '@' jr z, .stop - cp "" + cp '' jr z, .loop inc c jr .loop diff --git a/engine/events/mom.asm b/engine/events/mom.asm index 0316c273b..cceccc68f 100644 --- a/engine/events/mom.asm +++ b/engine/events/mom.asm @@ -461,7 +461,7 @@ Mom_WithdrawDepositMenuJoypad: ldh [hBGMapMode], a hlcoord 12, 6 ld bc, 7 - ld a, " " + ld a, ' ' call ByteFill hlcoord 12, 6 ld de, wStringBuffer2 @@ -475,7 +475,7 @@ Mom_WithdrawDepositMenuJoypad: ld c, a ld b, 0 add hl, bc - ld [hl], " " + ld [hl], ' ' .skip call WaitBGMap diff --git a/engine/events/name_rater.asm b/engine/events/name_rater.asm index 9b6ae6bc9..4a4aa57c9 100644 --- a/engine/events/name_rater.asm +++ b/engine/events/name_rater.asm @@ -116,9 +116,9 @@ IsNewNameEmpty: ld c, MON_NAME_LENGTH - 1 .loop ld a, [hli] - cp "@" + cp '@' jr z, .terminator - cp " " + cp ' ' jr nz, .nonspace dec c jr nz, .loop @@ -149,7 +149,7 @@ CompareNewToOld: ld de, wStringBuffer2 .loop ld a, [de] - cp "@" + cp '@' jr z, .terminator cp [hl] jr nz, .different @@ -170,7 +170,7 @@ GetNicknamenameLength: ld c, 0 .loop ld a, [hli] - cp "@" + cp '@' ret z inc c ld a, c diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index 898a2e61c..cebb73163 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -316,14 +316,14 @@ CopyTradeName: Trade_CopyFourCharString: ; unreferenced ld bc, 4 call CopyBytes - ld a, "@" + ld a, '@' ld [de], a ret Trade_CopyThreeCharString: ; unreferenced ld bc, 3 call CopyBytes - ld a, "@" + ld a, '@' ld [de], a ret @@ -363,7 +363,7 @@ GetTradeMonNames: ld hl, wStringBuffer1 .loop ld a, [hli] - cp "@" + cp '@' jr nz, .loop dec hl @@ -375,13 +375,13 @@ GetTradeMonNames: and a ; TRADE_GENDER_EITHER ret z cp TRADE_GENDER_MALE - ld a, "♂" + ld a, '♂' jr z, .done ; TRADE_GENDER_FEMALE - ld a, "♀" + ld a, '♀' .done ld [hli], a - ld [hl], "@" + ld [hl], '@' ret INCLUDE "data/events/npc_trades.asm" diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm index 9e5e7a04e..7c15cefd9 100644 --- a/engine/events/poke_seer.asm +++ b/engine/events/poke_seer.asm @@ -146,7 +146,7 @@ GetCaughtName: ret GetCaughtLevel: - ld a, "@" + ld a, '@' ld hl, wSeerCaughtLevelString ld bc, 4 call ByteFill @@ -265,7 +265,7 @@ GetCaughtOT: .got_grammar ld de, wSeerOTGrammar - ld a, "@" + ld a, '@' ld [de], a ret diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm index 4badacaeb..b3836fbd2 100644 --- a/engine/events/print_unown.asm +++ b/engine/events/print_unown.asm @@ -1,5 +1,5 @@ -DEF UNOWNSTAMP_BOLD_A EQU "♂" ; $ef -DEF UNOWNSTAMP_BOLD_B EQU "♀" ; $f5 +DEF UNOWNSTAMP_BOLD_A EQU '♂' ; $ef +DEF UNOWNSTAMP_BOLD_B EQU '♀' ; $f5 _UnownPrinter: ld a, [wUnownDex] @@ -226,7 +226,7 @@ INCBIN "gfx/printer/bold_b.1bpp" PlaceUnownPrinterFrontpic: hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill hlcoord 7, 11 ld a, $31 diff --git a/engine/events/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm index b272e3fb5..253e17ca6 100644 --- a/engine/events/prof_oaks_pc.asm +++ b/engine/events/prof_oaks_pc.asm @@ -66,7 +66,7 @@ Rate: .UpdateRatingBuffer: push hl - ld a, "@" + ld a, '@' ld bc, ITEM_NAME_LENGTH call ByteFill pop hl diff --git a/engine/events/shuckle.asm b/engine/events/shuckle.asm index 9b98c1dae..9a0937342 100644 --- a/engine/events/shuckle.asm +++ b/engine/events/shuckle.asm @@ -101,7 +101,7 @@ ReturnShuckie: ld a, [de] cp [hl] jr nz, .DontReturn - cp "@" + cp '@' jr z, .done inc de inc hl diff --git a/engine/events/unown_walls.asm b/engine/events/unown_walls.asm index d7b78d9a4..38da045f3 100644 --- a/engine/events/unown_walls.asm +++ b/engine/events/unown_walls.asm @@ -154,9 +154,9 @@ INCLUDE "data/events/unown_walls.asm" _DisplayUnownWords_FillAttr: ld a, [de] - cp "@" + cp '@' ret z - cp "Y" + cp 'Y' ld a, OAM_BANK1 | PAL_BG_BROWN jr c, .got_pal ld a, PAL_BG_BROWN @@ -184,7 +184,7 @@ _DisplayUnownWords_CopyWord: push de .word_loop ld a, [de] - cp "@" + cp '@' jr z, .word_done ld c, a call .ConvertChar @@ -201,11 +201,11 @@ _DisplayUnownWords_CopyWord: .ConvertChar: push hl ld a, c - cp "Y" + cp 'Y' jr z, .YChar - cp "Z" + cp 'Z' jr z, .ZChar - cp "-" + cp '-' jr z, .DashChar ld [hli], a inc a diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm index 607849506..31b187bed 100644 --- a/engine/games/card_flip.asm +++ b/engine/games/card_flip.asm @@ -1,5 +1,5 @@ -DEF CARDFLIP_LIGHT_OFF EQU "♂" ; $ef -DEF CARDFLIP_LIGHT_ON EQU "♀" ; $f5 +DEF CARDFLIP_LIGHT_OFF EQU '♂' ; $ef +DEF CARDFLIP_LIGHT_ON EQU '♀' ; $f5 MemoryGameGFX: ; Graphics for an unused Game Corner @@ -580,11 +580,11 @@ CardFlip_CopyOAM: CardFlip_ShiftDigitsUpOnePixel: ; The top rows of digits 1-9 become the bottom rows of 0-8, ; so this routine relies on the top rows being blank. - ld de, vTiles0 tile "0" - ld hl, vTiles0 tile "0" + 2 + ld de, vTiles0 tile '0' + ld hl, vTiles0 tile '0' + 2 ld bc, 10 tiles - 2 call CopyBytes - ld hl, vTiles0 tile "9" + 1 tiles - 2 + ld hl, vTiles0 tile '9' + 1 tiles - 2 xor a ld [hli], a ld [hl], a diff --git a/engine/games/memory_game.asm b/engine/games/memory_game.asm index 5e8151e66..9b5ec4b14 100644 --- a/engine/games/memory_game.asm +++ b/engine/games/memory_game.asm @@ -120,7 +120,7 @@ endr .CheckTriesRemaining: ld a, [wMemoryGameNumberTriesRemaining] hlcoord 17, 0 - add "0" + add '0' ld [hl], a ld hl, wMemoryGameNumberTriesRemaining ld a, [hl] diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index 157c55c65..4782c8b67 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -110,7 +110,7 @@ _SlotMachine: call DisableLCD hlbgcoord 0, 0 ld bc, vBGMap1 - vBGMap0 - ld a, " " + ld a, ' ' call ByteFill ld b, SCGB_SLOT_MACHINE call GetSGBLayout @@ -242,13 +242,13 @@ DebugPrintSlotBias: ; unreferenced daa ld e, a and $f - add "0" + add '0' hlcoord 1, 0 ld [hl], a ld a, e swap a and $f - add "0" + add '0' hlcoord 0, 0 ld [hl], a ret @@ -1914,7 +1914,7 @@ Slots_PayoutText: inc a ldcoord_a 3, 14 hlcoord 18, 17 - ld [hl], "▼" + ld [hl], '▼' ld hl, .SlotsLinedUpText rept 4 inc bc diff --git a/engine/gfx/dma_transfer.asm b/engine/gfx/dma_transfer.asm index 9dafbe806..a7462c25c 100644 --- a/engine/gfx/dma_transfer.asm +++ b/engine/gfx/dma_transfer.asm @@ -406,7 +406,7 @@ _LoadHDMAParameters: ret PadTilemapForHDMATransfer: - ld c, " " + ld c, ' ' jr PadMapForHDMATransfer PadAttrmapForHDMATransfer: diff --git a/engine/gfx/load_font.asm b/engine/gfx/load_font.asm index e94380875..086c3618a 100644 --- a/engine/gfx/load_font.asm +++ b/engine/gfx/load_font.asm @@ -18,47 +18,47 @@ Get2bppOptionalHDMA: ; unreferenced _LoadStandardFont:: ld de, Font ld hl, vTiles1 - lb bc, BANK(Font), 128 ; "A" to "9" + lb bc, BANK(Font), 128 ; 'A' to '9' ldh a, [rLCDC] bit B_LCDC_ENABLE, a jp z, Copy1bpp ld de, Font ld hl, vTiles1 - lb bc, BANK(Font), 32 ; "A" to "]" + lb bc, BANK(Font), 32 ; 'A' to ']' call Get1bppViaHDMA ld de, Font + 32 * TILE_1BPP_SIZE ld hl, vTiles1 tile $20 - lb bc, BANK(Font), 32 ; "a" to $bf + lb bc, BANK(Font), 32 ; 'a' to $bf call Get1bppViaHDMA ld de, Font + 64 * TILE_1BPP_SIZE ld hl, vTiles1 tile $40 - lb bc, BANK(Font), 32 ; "Ä" to "←" + lb bc, BANK(Font), 32 ; 'Ä' to '←' call Get1bppViaHDMA ld de, Font + 96 * TILE_1BPP_SIZE ld hl, vTiles1 tile $60 - lb bc, BANK(Font), 32 ; "'" to "9" + lb bc, BANK(Font), 32 ; '\'' to '9' call Get1bppViaHDMA ret _LoadFontsExtra1:: ld de, FontsExtra_SolidBlackGFX - ld hl, vTiles2 tile "■" ; $60 + ld hl, vTiles2 tile '■' ; $60 lb bc, BANK(FontsExtra_SolidBlackGFX), 1 call Get1bppViaHDMA ld de, PokegearPhoneIconGFX - ld hl, vTiles2 tile "☎" ; $62 + ld hl, vTiles2 tile '☎' ; $62 lb bc, BANK(PokegearPhoneIconGFX), 1 call Get2bppViaHDMA - ld de, FontExtra + 3 tiles ; "" - ld hl, vTiles2 tile "" - lb bc, BANK(FontExtra), 22 ; "" to "ぉ" + ld de, FontExtra + 3 tiles ; '' + ld hl, vTiles2 tile '' + lb bc, BANK(FontExtra), 22 ; '' to 'ぉ' call Get2bppViaHDMA jr LoadFrame _LoadFontsExtra2:: ld de, FontsExtra2_UpArrowGFX - ld hl, vTiles2 tile "▲" ; $61 + ld hl, vTiles2 tile '▲' ; $61 ld b, BANK(FontsExtra2_UpArrowGFX) ld c, 1 call Get2bppViaHDMA @@ -79,10 +79,10 @@ LoadFrame: call AddNTimes ld d, h ld e, l - ld hl, vTiles2 tile "┌" ; $79 - lb bc, BANK(Frames), TEXTBOX_FRAME_TILES ; "┌" to "┘" + ld hl, vTiles2 tile '┌' ; $79 + lb bc, BANK(Frames), TEXTBOX_FRAME_TILES ; '┌' to '┘' call Get1bppViaHDMA - ld hl, vTiles2 tile " " ; $7f + ld hl, vTiles2 tile ' ' ; $7f ld de, TextboxSpaceGFX lb bc, BANK(TextboxSpaceGFX), 1 call Get1bppViaHDMA @@ -94,8 +94,8 @@ LoadBattleFontsHPBar: lb bc, BANK(FontBattleExtra), 12 call Get2bppViaHDMA ld hl, vTiles2 tile $70 - ld de, FontBattleExtra + 16 tiles ; "" - lb bc, BANK(FontBattleExtra), 3 ; "" to "『" + ld de, FontBattleExtra + 16 tiles ; '' + lb bc, BANK(FontBattleExtra), 3 ; '' to '『' call Get2bppViaHDMA call LoadFrame diff --git a/engine/gfx/load_overworld_font.asm b/engine/gfx/load_overworld_font.asm index f4ef84619..4b7d6682a 100644 --- a/engine/gfx/load_overworld_font.asm +++ b/engine/gfx/load_overworld_font.asm @@ -4,7 +4,7 @@ LoadOverworldFont:: lb bc, BANK(.OverworldFontGFX), $80 call Get2bpp ld de, .OverworldFontSpaceGFX - ld hl, vTiles2 tile " " + ld hl, vTiles2 tile ' ' lb bc, BANK(.OverworldFontSpaceGFX), 1 call Get2bpp ret diff --git a/engine/items/buy_sell_toss.asm b/engine/items/buy_sell_toss.asm index 5c4a3ecfc..ad7b89101 100644 --- a/engine/items/buy_sell_toss.asm +++ b/engine/items/buy_sell_toss.asm @@ -128,7 +128,7 @@ BuySellToss_UpdateQuantityDisplay: call MenuBoxCoord2Tile ld de, SCREEN_WIDTH + 1 add hl, de - ld [hl], "×" + ld [hl], '×' inc hl ld de, wItemQuantityChange lb bc, PRINTNUM_LEADINGZEROS | 1, 2 diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 1797a1641..92e33bae3 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -795,7 +795,7 @@ HeavyBallMultiplier: call HeavyBall_GetDexEntryBank call GetFarByte inc hl - cp "@" + cp '@' jr nz, .SkipText call HeavyBall_GetDexEntryBank @@ -1759,7 +1759,7 @@ ItemActionTextWaitButton: ldh [hBGMapMode], a hlcoord 0, 0 ld bc, wTilemapEnd - wTilemap - ld a, " " + ld a, ' ' call ByteFill ld a, [wPartyMenuActionText] call ItemActionText diff --git a/engine/items/mart.asm b/engine/items/mart.asm index 61631b337..9a964bdb4 100644 --- a/engine/items/mart.asm +++ b/engine/items/mart.asm @@ -283,12 +283,12 @@ GetMartPrice: .CharToNybble: ld a, [de] inc de - cp " " + cp ' ' jr nz, .not_space - ld a, "0" + ld a, '0' .not_space - sub "0" + sub '0' ret ReadMart: diff --git a/engine/items/pack.asm b/engine/items/pack.asm index 371e65f3b..b7f3e40a7 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -1426,7 +1426,7 @@ Pack_GetItemName: Pack_ClearTilemap: ; unreferenced hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill ret diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index 364aa6a9d..2ed495216 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -336,7 +336,7 @@ TMHM_DisplayPocketItems: hlcoord 5, 2 lb bc, 10, 15 - ld a, " " + ld a, ' ' call ClearBox call TMHM_GetCurrentPocketPosition ld d, $5 @@ -368,7 +368,7 @@ TMHM_DisplayPocketItems: push af sub NUM_TMS ld [wTempTMHM], a - ld [hl], "H" + ld [hl], 'H' inc hl ld de, wTempTMHM lb bc, PRINTNUM_LEFTALIGN | 1, 2 @@ -393,9 +393,9 @@ TMHM_DisplayPocketItems: jr nc, .hm2 ld bc, SCREEN_WIDTH + 9 add hl, bc - ld [hl], "×" + ld [hl], '×' inc hl - ld a, "0" ; why are we doing this? + ld a, '0' ; why are we doing this? pop bc push bc ld a, b diff --git a/engine/link/link.asm b/engine/link/link.asm index 6f883b443..c6418f3b9 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -1315,7 +1315,7 @@ LinkTradeOTPartymonMenuLoop: push bc ld bc, NAME_LENGTH add hl, bc - ld [hl], " " + ld [hl], ' ' pop bc pop hl ld a, [wPartyCount] @@ -1376,7 +1376,7 @@ LinkTradePartymonMenuLoop: push bc ld bc, NAME_LENGTH add hl, bc - ld [hl], " " + ld [hl], ' ' pop bc pop hl ld a, 1 @@ -1396,7 +1396,7 @@ LinkTradePartymonMenuLoop: push bc ld bc, NAME_LENGTH add hl, bc - ld [hl], " " + ld [hl], ' ' pop bc pop hl jp LinkTradePartymonMenuCheckCancel @@ -1421,7 +1421,7 @@ LinkTrade_TradeStatsMenu: farcall Link_WaitBGMap .joy_loop - ld a, " " + ld a, ' ' ldcoord_a 11, 16 ld a, PAD_A | PAD_B | PAD_RIGHT ld [wMenuJoypadFilter], a @@ -1453,7 +1453,7 @@ LinkTrade_TradeStatsMenu: jp LinkTrade_PlayerPartyMenu .d_right - ld a, " " + ld a, ' ' ldcoord_a 1, 16 ld a, PAD_A | PAD_B | PAD_LEFT ld [wMenuJoypadFilter], a @@ -1490,11 +1490,11 @@ LinkTrade_TradeStatsMenu: call SafeLoadTempTilemapToTilemap hlcoord 6, 1 lb bc, 6, 1 - ld a, " " + ld a, ' ' call LinkEngine_FillBox hlcoord 17, 1 lb bc, 6, 1 - ld a, " " + ld a, ' ' call LinkEngine_FillBox jp LinkTrade_PlayerPartyMenu @@ -1587,14 +1587,14 @@ LinkTradeOTPartymonMenuCheckCancel: push bc ld bc, NAME_LENGTH add hl, bc - ld [hl], " " + ld [hl], ' ' pop bc pop hl ; fallthrough LinkTradePartymonMenuCheckCancel: .loop1 - ld a, "▶" + ld a, '▶' ldcoord_a 9, 17 .loop2 call JoyTextDelay @@ -1604,7 +1604,7 @@ LinkTradePartymonMenuCheckCancel: bit B_PAD_A, a jr nz, .a_button push af - ld a, " " + ld a, ' ' ldcoord_a 9, 17 pop af bit B_PAD_UP, a @@ -1619,7 +1619,7 @@ LinkTradePartymonMenuCheckCancel: jp LinkTrade_PlayerPartyMenu .a_button - ld a, "▷" + ld a, '▷' ldcoord_a 9, 17 ld a, $f ld [wPlayerLinkAction], a @@ -1655,7 +1655,7 @@ GSPlaceTradeScreenFooter: ; unreferenced call ByteFill ; Clear out area for cancel string hlcoord 1, 16 - ld a, " " + ld a, ' ' ld bc, SCREEN_WIDTH - 2 call ByteFill ; Place the string @@ -1672,7 +1672,7 @@ LinkTradePlaceArrow: hlcoord 6, 9 ld bc, SCREEN_WIDTH call AddNTimes - ld [hl], "▷" + ld [hl], '▷' ret LinkEngine_FillBox: diff --git a/engine/link/link_2.asm b/engine/link/link_2.asm index 178b11dcc..b094c2f64 100644 --- a/engine/link/link_2.asm +++ b/engine/link/link_2.asm @@ -68,7 +68,7 @@ LinkTextbox2: push hl ld a, $79 ld [hli], a - ld a, " " + ld a, ' ' call .PlaceRow ld [hl], $7a pop hl diff --git a/engine/link/link_trade.asm b/engine/link/link_trade.asm index e7304196a..7a364b9c1 100644 --- a/engine/link/link_trade.asm +++ b/engine/link/link_trade.asm @@ -88,7 +88,7 @@ _LinkTextbox: push hl ld a, $33 ld [hli], a - ld a, " " + ld a, ' ' call .PlaceRow ld [hl], $34 pop hl diff --git a/engine/math/print_num.asm b/engine/math/print_num.asm index 8a2f36fcd..2657fdc2e 100644 --- a/engine/math/print_num.asm +++ b/engine/math/print_num.asm @@ -19,7 +19,7 @@ _PrintNum:: jr z, .main .moneyflag ; 101xxxxx or 011xxxxx - ld a, "¥" + ld a, '¥' ld [hli], a res PRINTNUM_MONEY_F, b ; 100xxxxx or 010xxxxx @@ -133,7 +133,7 @@ _PrintNum:: .two dec e jr nz, .two_skip - ld a, "0" + ld a, '0' ldh [hPrintNumBuffer + 0], a .two_skip @@ -157,7 +157,7 @@ _PrintNum:: .money call .PrintYen push af - ld a, "0" + ld a, '0' add c ld [hl], a pop af @@ -166,12 +166,12 @@ _PrintNum:: dec e jr nz, .money_leading_zero inc hl - ld [hl], "" + ld [hl], '' .money_leading_zero call .AdvancePointer call .PrintYen - ld a, "0" + ld a, '0' add b ld [hli], a @@ -186,7 +186,7 @@ _PrintNum:: jr nz, .stop bit PRINTNUM_MONEY_F, d jr z, .stop - ld a, "¥" + ld a, '¥' ld [hli], a res PRINTNUM_MONEY_F, d @@ -197,7 +197,7 @@ _PrintNum:: .PrintDigit: dec e jr nz, .ok - ld a, "0" + ld a, '0' ldh [hPrintNumBuffer + 0], a .ok ld c, 0 @@ -264,11 +264,11 @@ _PrintNum:: jr nz, .done bit PRINTNUM_MONEY_F, d jr z, .done - ld a, "¥" + ld a, '¥' ld [hli], a res PRINTNUM_MONEY_F, d .done - ld a, "0" + ld a, '0' add c ld [hl], a ldh [hPrintNumBuffer + 0], a @@ -276,14 +276,14 @@ _PrintNum:: dec e ret nz inc hl - ld [hl], "" + ld [hl], '' ret .PrintLeadingZero: ; prints a leading zero unless they are turned off in the flags bit PRINTNUM_LEADINGZEROS_F, d ret z - ld [hl], "0" + ld [hl], '0' ret .AdvancePointer: diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 91cce62cb..4d22def3c 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -245,13 +245,13 @@ SetDefaultBoxNames: cp 10 jr c, .less sub 10 - ld [hl], "1" + ld [hl], '1' inc hl .less - add "0" + add '0' ld [hli], a - ld [hl], "@" + ld [hl], '@' pop hl ld de, 9 add hl, de @@ -622,7 +622,7 @@ Continue_DisplayGameTime: ld de, wGameTimeHours lb bc, 2, 3 call PrintNum - ld [hl], "" + ld [hl], '' inc hl ld de, wGameTimeMinutes lb bc, PRINTNUM_LEADINGZEROS | 1, 2 @@ -794,7 +794,7 @@ GSShowPlayerNamingChoices: ; unreferenced ret StorePlayerName: - ld a, "@" + ld a, '@' ld bc, NAME_LENGTH ld hl, wPlayerName call ByteFill diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 23eccac0b..a49bb13e6 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -309,7 +309,7 @@ MainMenu_PrintCurrentTimeAndDay: ldh a, [hHours] ld c, a farcall PrintHour - ld [hl], ":" + ld [hl], ':' inc hl ld de, hMinutes lb bc, PRINTNUM_LEADINGZEROS | 1, 2 diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm index 2529114b3..06ef2d0ab 100644 --- a/engine/menus/menu.asm +++ b/engine/menus/menu.asm @@ -498,7 +498,7 @@ Move2DMenuCursor: ld h, [hl] ld l, a ld a, [hl] - cp "▶" + cp '▶' jr nz, Place2DMenuCursor ld a, [wCursorOffCharacter] ld [hl], a @@ -542,10 +542,10 @@ Place2DMenuCursor: ld c, a add hl, bc ld a, [hl] - cp "▶" + cp '▶' jr z, .cursor_on ld [wCursorOffCharacter], a - ld [hl], "▶" + ld [hl], '▶' .cursor_on ld a, l diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm index e229f3609..965076e2f 100644 --- a/engine/menus/menu_2.asm +++ b/engine/menus/menu_2.asm @@ -18,7 +18,7 @@ PlaceMenuItemQuantity: jr nz, .done ld de, $15 add hl, de - ld [hl], "×" + ld [hl], '×' inc hl ld de, wMenuSelectionQuantity lb bc, 1, 2 diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 5f0a02be1..36545fe07 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -1,8 +1,8 @@ DEF NAMINGSCREEN_CURSOR EQU $7e -DEF NAMINGSCREEN_BORDER EQU "■" ; $60 -DEF NAMINGSCREEN_MIDDLELINE EQU "→" ; $eb -DEF NAMINGSCREEN_UNDERLINE EQU "" ; $f2 +DEF NAMINGSCREEN_BORDER EQU '■' ; $60 +DEF NAMINGSCREEN_MIDDLELINE EQU '→' ; $eb +DEF NAMINGSCREEN_UNDERLINE EQU '' ; $f2 _NamingScreen: call DisableSpriteUpdates @@ -106,9 +106,9 @@ NamingScreenJumptable: call PlaceString farcall GetGender jr c, .genderless - ld a, "♂" + ld a, '♂' jr nz, .place_gender - ld a, "♀" + ld a, '♀' .place_gender hlcoord 1, 2 ld [hl], a @@ -683,7 +683,7 @@ NamingScreen_AdvanceCursor_CheckEndOfString: inc [hl] call NamingScreen_GetTextCursorPosition ld a, [hl] - cp "@" + cp '@' jr z, .end_of_string ld [hl], NAMINGSCREEN_UNDERLINE and a @@ -763,7 +763,7 @@ NamingScreen_InitNameEntry: ld [hli], a dec c jr nz, .loop - ld [hl], "@" + ld [hl], '@' ret NamingScreen_StoreEntry: @@ -780,7 +780,7 @@ NamingScreen_StoreEntry: cp NAMINGSCREEN_UNDERLINE jr nz, .not_terminator .terminator - ld [hl], "@" + ld [hl], '@' .not_terminator inc hl dec c @@ -959,7 +959,7 @@ _ComposeMailMessage: ld d, [hl] ld hl, MAIL_LINE_LENGTH add hl, de - ld [hl], "" + ld [hl], '' ret .MailIcon: @@ -981,7 +981,7 @@ INCBIN "gfx/naming_screen/mail.2bpp" call ByteFill hlcoord 0, 6 ld bc, 12 * SCREEN_WIDTH - ld a, " " + ld a, ' ' call ByteFill hlcoord 1, 1 lb bc, 4, SCREEN_WIDTH - 2 @@ -1104,7 +1104,7 @@ INCBIN "gfx/naming_screen/mail.2bpp" call NamingScreen_GetTextCursorPosition ld [hl], NAMINGSCREEN_UNDERLINE dec hl - ld [hl], "" + ld [hl], '' ret .start @@ -1130,7 +1130,7 @@ INCBIN "gfx/naming_screen/mail.2bpp" call NamingScreen_GetTextCursorPosition ld [hl], NAMINGSCREEN_UNDERLINE inc hl - ld [hl], "" + ld [hl], '' ret .finished diff --git a/engine/menus/options_menu.asm b/engine/menus/options_menu.asm index 3428f9e76..6b4409eda 100644 --- a/engine/menus/options_menu.asm +++ b/engine/menus/options_menu.asm @@ -478,7 +478,7 @@ Options_Frame: UpdateFrame: ld a, [wTextboxFrame] hlcoord 16, 15 ; where on the screen the number is drawn - add "1" + add '1' ld [hl], a call LoadFontsExtra and a @@ -548,7 +548,7 @@ Options_UpdateCursorPosition: ld de, SCREEN_WIDTH ld c, SCREEN_HEIGHT - 2 .loop - ld [hl], " " + ld [hl], ' ' add hl, de dec c jr nz, .loop @@ -556,5 +556,5 @@ Options_UpdateCursorPosition: ld bc, 2 * SCREEN_WIDTH ld a, [wJumptableIndex] call AddNTimes - ld [hl], "▶" + ld [hl], '▶' ret diff --git a/engine/menus/scrolling_menu.asm b/engine/menus/scrolling_menu.asm index 6137d7cff..f24672431 100644 --- a/engine/menus/scrolling_menu.asm +++ b/engine/menus/scrolling_menu.asm @@ -201,7 +201,7 @@ ScrollingMenu_ClearLeftColumn: ld de, 2 * SCREEN_WIDTH ld a, [wMenuData_ScrollingMenuHeight] .loop - ld [hl], " " + ld [hl], ' ' add hl, de dec a jr nz, .loop @@ -355,7 +355,7 @@ ScrollingMenu_UpdateDisplay: ld a, [wMenuBorderRightCoord] ld c, a call Coord2Tile - ld [hl], "▲" + ld [hl], '▲' .okay call MenuBoxCoord2Tile @@ -392,7 +392,7 @@ ScrollingMenu_UpdateDisplay: ld a, [wMenuBorderRightCoord] ld c, a call Coord2Tile - ld [hl], "▼" + ld [hl], '▼' .done ret @@ -461,7 +461,7 @@ ScrollingMenu_PlaceCursor: add $0 ld c, a call Coord2Tile - ld [hl], "▷" + ld [hl], '▷' .done ret diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm index 3ee56cfd5..95cf8134d 100644 --- a/engine/menus/trainer_card.asm +++ b/engine/menus/trainer_card.asm @@ -359,7 +359,7 @@ TrainerCard_InitBorder: ld [hli], a ld e, SCREEN_WIDTH - 3 - ld a, " " + ld a, ' ' .loop2 ld [hli], a dec e @@ -375,7 +375,7 @@ TrainerCard_InitBorder: ld [hli], a ld e, SCREEN_WIDTH - 2 - ld a, " " + ld a, ' ' .loop4 ld [hli], a dec e @@ -393,7 +393,7 @@ TrainerCard_InitBorder: ld [hli], a ld e, SCREEN_WIDTH - 3 - ld a, " " + ld a, ' ' .loop5 ld [hli], a dec e @@ -455,7 +455,7 @@ TrainerCard_Page1_PrintGameTime: ret nz hlcoord 15, 12 ld a, [hl] - xor " " ^ $2e ; alternate between space and small colon ($2e) tiles + xor ' ' ^ $2e ; alternate between space and small colon ($2e) tiles ld [hl], a ret diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index 6e8cfc889..b99316e0e 100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -248,7 +248,7 @@ ParseCredits: ldh [hBGMapMode], a hlcoord 0, 5 ld bc, SCREEN_WIDTH * 12 - ld a, " " + ld a, ' ' call ByteFill ; Then read the script. diff --git a/engine/movie/init_hof_credits.asm b/engine/movie/init_hof_credits.asm index 3e529d7da..a5e0f7f7f 100644 --- a/engine/movie/init_hof_credits.asm +++ b/engine/movie/init_hof_credits.asm @@ -7,7 +7,7 @@ InitDisplayForHallOfFame: call LoadFontsBattleExtra hlbgcoord 0, 0 ld bc, vBGMap1 - vBGMap0 - ld a, " " + ld a, ' ' call ByteFill hlcoord 0, 0, wAttrmap ld bc, SCREEN_AREA @@ -36,7 +36,7 @@ InitDisplayForRedCredits: call LoadFontsBattleExtra hlbgcoord 0, 0 ld bc, vBGMap1 - vBGMap0 - ld a, " " + ld a, ' ' call ByteFill hlcoord 0, 0, wAttrmap ld bc, SCREEN_AREA @@ -66,7 +66,7 @@ ResetDisplayBetweenHallOfFameMons: ldh [rWBK], a ld hl, wDecompressScratch ld bc, wScratchAttrmap - wDecompressScratch - ld a, " " + ld a, ' ' call ByteFill hlbgcoord 0, 0 ld de, wDecompressScratch diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 51f20fe8e..d4f070fe1 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -101,7 +101,7 @@ _TitleScreen: ; Clear screen tiles hlbgcoord 0, 0 ld bc, 64 * TILEMAP_WIDTH - ld a, " " + ld a, ' ' call ByteFill ; Draw Pokemon logo diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index 137cd6a72..3c39331a3 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -1,5 +1,5 @@ -DEF TRADEANIM_RIGHT_ARROW EQU "▶" ; $ed -DEF TRADEANIM_LEFT_ARROW EQU "▼" ; $ee +DEF TRADEANIM_RIGHT_ARROW EQU '▶' ; $ed +DEF TRADEANIM_LEFT_ARROW EQU '▼' ; $ee ; TradeAnim_TubeAnimJumptable.Jumptable indexes const_def @@ -177,7 +177,7 @@ RunTradeAnimScript: .NotCGB: hlbgcoord 0, 0 ld bc, STARTOF(VRAM) + SIZEOF(VRAM) - vBGMap0 - ld a, " " + ld a, ' ' call ByteFill ld hl, TradeGameBoyLZ ld de, vTiles2 tile $31 @@ -471,7 +471,7 @@ TradeAnim_TubeToPlayer8: callfar ClearSpriteAnims hlbgcoord 0, 0 ld bc, STARTOF(VRAM) + SIZEOF(VRAM) - vBGMap0 - ld a, " " + ld a, ' ' call ByteFill xor a ldh [hSCX], a @@ -595,7 +595,7 @@ TradeAnim_PlaceTrademonStatsOnTubeAnim: call ClearTilemap hlcoord 0, 0 ld bc, SCREEN_WIDTH - ld a, "─" + ld a, '─' call ByteFill hlcoord 0, 1 ld de, wLinkPlayer1Name @@ -604,7 +604,7 @@ TradeAnim_PlaceTrademonStatsOnTubeAnim: ld de, 0 .find_name_end_loop ld a, [hli] - cp "@" + cp '@' jr z, .done dec de jr .find_name_end_loop @@ -973,7 +973,7 @@ TrademonStats_PrintSpeciesNumber: hlcoord 10, 0 lb bc, PRINTNUM_LEADINGZEROS | 1, 3 call PrintNum - ld [hl], " " + ld [hl], ' ' ret TrademonStats_PrintSpeciesName: @@ -1218,7 +1218,7 @@ TradeAnim_TakeCareOfText: call WaitTop hlcoord 0, 10 ld bc, 8 * SCREEN_WIDTH - ld a, " " + ld a, ' ' call ByteFill call WaitBGMap ld hl, .TakeGoodCareOfMonText @@ -1279,7 +1279,7 @@ TradeAnim_Wait80Frames: TradeAnim_BlankTilemap: hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill ret diff --git a/engine/overworld/init_map.asm b/engine/overworld/init_map.asm index e09fc0c76..b9b124697 100644 --- a/engine/overworld/init_map.asm +++ b/engine/overworld/init_map.asm @@ -83,7 +83,7 @@ HDMATransfer_FillBGMap0WithBlack: ld a, BANK(wDecompressScratch) ldh [rWBK], a - ld a, "■" + ld a, '■' ld hl, wDecompressScratch ld bc, wScratchAttrmap - wDecompressScratch call ByteFill diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 1236fa97e..c720fe83f 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -6,7 +6,7 @@ BlankScreen: call ClearSprites hlcoord 0, 0 ld bc, wTilemapEnd - wTilemap - ld a, " " + ld a, ' ' call ByteFill hlcoord 0, 0, wAttrmap ld bc, wAttrmapEnd - wAttrmap diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 90b7d1e5b..4e152a6a5 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -1676,7 +1676,7 @@ Script_getnum: ResetStringBuffer1: ld hl, wStringBuffer1 ld bc, NAME_LENGTH - ld a, "@" + ld a, '@' call ByteFill ret diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm index 1127de5e3..05d9416f9 100644 --- a/engine/overworld/warp_connection.asm +++ b/engine/overworld/warp_connection.asm @@ -259,7 +259,7 @@ LoadMapTimeOfDay: pop af ldh [rVBK], a - ld a, "■" + ld a, '■' ld bc, vBGMap1 - vBGMap0 hlbgcoord 0, 0 call ByteFill diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index 9ac8fba8b..8e3479a2d 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -908,7 +908,7 @@ RandomPhoneMon: ld a, BANK(Trainers) call GetFarByte inc hl - cp "@" + cp '@' jr nz, .skip_name ld a, BANK(Trainers) diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index f35dc3d7e..2716b38d6 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -495,7 +495,7 @@ PhoneCall:: .CallerTextboxWithName: call Phone_CallerTextbox hlcoord 1, 2 - ld [hl], "☎" + ld [hl], '☎' inc hl inc hl ; BUG: The unused phonecall script command may crash (see docs/bugs_and_glitches.md) @@ -582,7 +582,7 @@ Phone_TextboxWithName: push bc call Phone_CallerTextbox hlcoord 1, 1 - ld [hl], "☎" + ld [hl], '☎' inc hl inc hl ld d, h @@ -640,7 +640,7 @@ GetCallerName: push hl push bc call PlaceString - ld a, ":" + ld a, ':' ld [bc], a pop bc pop hl diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index 686016618..e534245a5 100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -884,7 +884,7 @@ Pokedex_UnownModeHandleDPadInput: ret Pokedex_UnownModeEraseCursor: - ld c, " " + ld c, ' ' jr Pokedex_UnownModeUpdateCursorGfx Pokedex_UnownModePlaceCursor: @@ -1144,7 +1144,7 @@ Pokedex_DrawDexEntryScreenBG: hlcoord 19, 0 ld [hl], $34 hlcoord 19, 1 - ld a, " " + ld a, ' ' ld b, 15 call Pokedex_FillColumn ld [hl], $39 @@ -1154,7 +1154,7 @@ Pokedex_DrawDexEntryScreenBG: call ByteFill hlcoord 1, 17 ld bc, 18 - ld a, " " + ld a, ' ' call ByteFill hlcoord 9, 7 ld de, .Height @@ -1299,7 +1299,7 @@ Pokedex_PlaceSearchResultsTypeStrings: hlcoord 2, 15 call Pokedex_PlaceTypeString hlcoord 1, 15 - ld [hl], "/" + ld [hl], '/' .done ret @@ -1478,7 +1478,7 @@ Pokedex_PrintListing: add a inc a ld b, a - ld a, " " + ld a, ' ' call Pokedex_FillBox ; Load de with wPokedexOrder + [wDexListingScrollOffset] @@ -1846,7 +1846,7 @@ Pokedex_PlaceSearchScreenTypeStrings: ldh [hBGMapMode], a hlcoord 9, 3 lb bc, 4, 8 - ld a, " " + ld a, ' ' call Pokedex_FillBox ld a, [wDexSearchMonType1] hlcoord 9, 4 @@ -2226,7 +2226,7 @@ Pokedex_MoveArrowCursor: and a jr z, .no_action call Pokedex_GetArrowCursorPos - ld [hl], " " + ld [hl], ' ' ld hl, wDexArrowCursorPosIndex dec [hl] jr .update_cursor_pos @@ -2236,13 +2236,13 @@ Pokedex_MoveArrowCursor: cp c jr nc, .no_action call Pokedex_GetArrowCursorPos - ld [hl], " " + ld [hl], ' ' ld hl, wDexArrowCursorPosIndex inc [hl] .update_cursor_pos call Pokedex_GetArrowCursorPos - ld [hl], "▶" + ld [hl], '▶' ld a, 12 ld [wDexArrowCursorDelayCounter], a xor a @@ -2256,7 +2256,7 @@ Pokedex_MoveArrowCursor: .select call Pokedex_GetArrowCursorPos - ld [hl], " " + ld [hl], ' ' ld a, [wDexArrowCursorPosIndex] cp c jr c, .update @@ -2284,12 +2284,12 @@ Pokedex_BlinkArrowCursor: and $8 jr z, .blink_on call Pokedex_GetArrowCursorPos - ld [hl], " " + ld [hl], ' ' ret .blink_on call Pokedex_GetArrowCursorPos - ld [hl], "▶" + ld [hl], '▶' ret Pokedex_ArrowCursorDelay: @@ -2535,7 +2535,7 @@ _NewPokedexEntry: ld [hl], $3b inc hl ld bc, 19 - ld a, " " + ld a, ' ' call ByteFill farcall DisplayDexEntry call EnableLCD diff --git a/engine/pokedex/pokedex_2.asm b/engine/pokedex/pokedex_2.asm index 1a2fc18ff..2555ab865 100644 --- a/engine/pokedex/pokedex_2.asm +++ b/engine/pokedex/pokedex_2.asm @@ -259,7 +259,7 @@ GetDexEntryPagePointer: ld a, b call GetFarByte inc hl - cp "@" + cp '@' jr nz, .loop1 ; skip height and weight rept 4 @@ -273,7 +273,7 @@ endr ld a, b call GetFarByte inc hl - cp "@" + cp '@' jr nz, .loop2 .done diff --git a/engine/pokedex/unown_dex.asm b/engine/pokedex/unown_dex.asm index 1b66a4aca..e4bfe9cfb 100644 --- a/engine/pokedex/unown_dex.asm +++ b/engine/pokedex/unown_dex.asm @@ -21,7 +21,7 @@ UpdateUnownDex: PrintUnownWord: hlcoord 4, 15 ld bc, 12 - ld a, " " + ld a, ' ' call ByteFill ld a, [wDexCurUnownIndex] ld e, a diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index 02d4b6ad4..ec777030e 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -873,7 +873,7 @@ PokegearPhone_Joypad: ld a, [wPokegearPhoneCursorPosition] ld bc, SCREEN_WIDTH * 2 call AddNTimes - ld [hl], "▷" + ld [hl], '▷' call PokegearPhoneContactSubmenu jr c, .quit_submenu ld hl, wJumptableIndex @@ -1003,7 +1003,7 @@ PokegearPhone_GetDPad: ret PokegearPhone_UpdateCursor: - ld a, " " + ld a, ' ' for y, PHONE_DISPLAY_HEIGHT hlcoord 1, 4 + y * 2 ld [hl], a @@ -1012,13 +1012,13 @@ endr ld a, [wPokegearPhoneCursorPosition] ld bc, 2 * SCREEN_WIDTH call AddNTimes - ld [hl], "▶" + ld [hl], '▶' ret PokegearPhone_UpdateDisplayList: hlcoord 1, 3 ld b, PHONE_DISPLAY_HEIGHT * 2 + 1 - ld a, " " + ld a, ' ' .row ld c, SCREEN_WIDTH - 2 .col @@ -1230,7 +1230,7 @@ PokegearPhoneContactSubmenu: ld a, [de] ld c, a push hl - ld a, " " + ld a, ' ' ld de, SCREEN_WIDTH * 2 .clear_column ld [hl], a @@ -1241,7 +1241,7 @@ PokegearPhoneContactSubmenu: ld a, [wPokegearPhoneSubmenuCursor] ld bc, SCREEN_WIDTH * 2 call AddNTimes - ld [hl], "▶" + ld [hl], '▶' pop de ret @@ -1972,13 +1972,13 @@ PlayRadio: lb bc, 4, 18 call Textbox hlcoord 1, 14 - ld [hl], "“" + ld [hl], '“' pop de hlcoord 2, 14 call PlaceString ld h, b ld l, c - ld [hl], "”" + ld [hl], '”' call WaitBGMap ret @@ -2141,7 +2141,7 @@ TownMapBubble: ld [hli], a ; Top row ld bc, 16 - ld a, " " + ld a, ' ' call ByteFill ; Top-right corner ld a, $31 @@ -2150,7 +2150,7 @@ TownMapBubble: ; Middle row ld bc, SCREEN_WIDTH - 2 - ld a, " " + ld a, ' ' call ByteFill ; Bottom-left corner @@ -2159,7 +2159,7 @@ TownMapBubble: ld [hli], a ; Bottom row ld bc, 16 - ld a, " " + ld a, ' ' call ByteFill ; Bottom-right corner ld a, $33 @@ -2450,7 +2450,7 @@ Pokedex_GetArea: .PlaceString_MonsNest: hlcoord 0, 0 ld bc, SCREEN_WIDTH - ld a, " " + ld a, ' ' call ByteFill hlcoord 0, 1 ld a, $06 diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm index 04d4a4e24..4fd5a7156 100644 --- a/engine/pokegear/radio.asm +++ b/engine/pokegear/radio.asm @@ -149,9 +149,9 @@ ReplacePeriodsWithSpaces: ; unreferenced ld b, SCREEN_WIDTH * 2 .loop ld a, [hl] - cp "." + cp '.' jr nz, .next - ld [hl], " " + ld [hl], ' ' .next inc hl dec b @@ -633,11 +633,11 @@ CopyBottomLineToTopLine: ClearBottomLine: hlcoord 1, 15 ld bc, SCREEN_WIDTH - 2 - ld a, " " + ld a, ' ' call ByteFill hlcoord 1, 16 ld bc, SCREEN_WIDTH - 2 - ld a, " " + ld a, ' ' jp ByteFill PokedexShow_GetDexEntryBank: @@ -699,7 +699,7 @@ PokedexShow2: push hl call CopyDexEntryPart1 dec hl - ld [hl], "" + ld [hl], '' ld hl, wPokedexShowPointerAddr call CopyRadioTextToRAM pop hl @@ -755,7 +755,7 @@ CopyDexEntry: push hl call CopyDexEntryPart1 dec hl - ld [hl], "" + ld [hl], '' ld hl, wPokedexShowPointerAddr call CopyRadioTextToRAM pop hl @@ -770,15 +770,15 @@ CopyDexEntryPart1: ld hl, wPokedexShowPointerAddr ld [hl], TX_START inc hl - ld [hl], "" + ld [hl], '' inc hl .loop ld a, [hli] - cp "@" + cp '@' ret z - cp "" + cp '' ret z - cp "" + cp '' ret z jr .loop @@ -788,11 +788,11 @@ CopyDexEntryPart2: ld a, d call GetFarByte inc hl - cp "@" + cp '@' jr z, .okay - cp "" + cp '' jr z, .okay - cp "" + cp '' jr nz, .loop .okay ld a, l @@ -959,7 +959,7 @@ LuckyNumberShow8: ld de, wLuckyIDNumber lb bc, PRINTNUM_LEADINGZEROS | 2, 5 call PrintNum - ld a, "@" + ld a, '@' ld [wStringBuffer1 + 5], a ld hl, LC_Text8 ld a, LUCKY_NUMBER_SHOW_9 @@ -1571,7 +1571,7 @@ GetBuenasPassword: .read_loop ld a, [de] inc de - cp "@" + cp '@' jr nz, .read_loop dec c jr nz, .read_loop @@ -1582,7 +1582,7 @@ GetBuenasPassword: ld a, [de] inc de ld [hli], a - cp "@" + cp '@' jr nz, .copy_loop ld de, wStringBuffer1 ret diff --git a/engine/pokegear/townmap_convertlinebreakcharacters.asm b/engine/pokegear/townmap_convertlinebreakcharacters.asm index 6891d3594..0f2d938b8 100644 --- a/engine/pokegear/townmap_convertlinebreakcharacters.asm +++ b/engine/pokegear/townmap_convertlinebreakcharacters.asm @@ -2,17 +2,17 @@ TownMap_ConvertLineBreakCharacters: ld hl, wStringBuffer1 .loop ld a, [hl] - cp "@" + cp '@' jr z, .end - cp "" + cp '' jr z, .line_feed - cp "" + cp '' jr z, .line_feed inc hl jr .loop .line_feed - ld [hl], "" + ld [hl], '' .end ld de, wStringBuffer1 diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index bc3c1d6ff..1d16727ef 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -1083,9 +1083,9 @@ PCMonInfo: ld [wMonType], a farcall GetGender jr c, .skip_gender - ld a, "♂" + ld a, '♂' jr nz, .printgender - ld a, "♀" + ld a, '♀' .printgender hlcoord 5, 12 ld [hl], a @@ -1222,9 +1222,9 @@ BillsPC_RefreshTextboxes: call Textbox hlcoord 8, 2 - ld [hl], "└" + ld [hl], '└' hlcoord 19, 2 - ld [hl], "┘" + ld [hl], '┘' ld a, [wBillsPC_ScrollPosition] ld e, a @@ -1799,7 +1799,7 @@ DepositPokemon: ld h, b ld de, wStringBuffer1 call PlaceString - ld a, "!" + ld a, '!' ld [bc], a ld c, 50 call DelayFrames @@ -1854,7 +1854,7 @@ TryWithdrawPokemon: ld h, b ld de, wStringBuffer1 call PlaceString - ld a, "!" + ld a, '!' ld [bc], a ld c, 50 call DelayFrames @@ -1913,7 +1913,7 @@ ReleasePKMN_ByePKMN: call PlaceString ld l, c ld h, b - ld [hl], "!" + ld [hl], '!' ld c, 50 call DelayFrames ret @@ -2252,7 +2252,7 @@ BillsPC_ClearTilemap: ldh [hBGMapMode], a hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill ret diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index 74af33f74..4849d68bb 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -236,7 +236,7 @@ ClearPCItemScreen: call ClearSprites hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill hlcoord 0, 0 lb bc, 10, 18 diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index a344a7ec3..5de0c8bae 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -647,7 +647,7 @@ Hatch_UpdateFrontpicBGMapCenter: push bc hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill pop bc pop hl diff --git a/engine/pokemon/correct_nick_errors.asm b/engine/pokemon/correct_nick_errors.asm index 421bf92da..d2e6cd79a 100644 --- a/engine/pokemon/correct_nick_errors.asm +++ b/engine/pokemon/correct_nick_errors.asm @@ -11,7 +11,7 @@ CorrectNickErrors:: .checkchar ; end of nick? ld a, [de] - cp "@" ; terminator + cp '@' ; terminator jr z, .end ; check if this char is a text command @@ -34,8 +34,8 @@ CorrectNickErrors:: cp [hl] jr nc, .loop -; replace it with a "?" - ld a, "?" +; replace it with a '?' + ld a, '?' ld [de], a jr .loop @@ -49,10 +49,10 @@ CorrectNickErrors:: ; change nick to "?@" pop de push de - ld a, "?" + ld a, '?' ld [de], a inc de - ld a, "@" + ld a, '@' ld [de], a .end ; if the nick has any errors at this point it's out of our hands @@ -64,11 +64,11 @@ CorrectNickErrors:: ; table defining which characters are actually text commands ; format: ; ≥ < - db "", "ガ" - db "", "" + 1 - db "", "" + 1 - db "", "" + 1 - db "", "" + 1 - db "", "" + 1 - db "", "┘" + 1 + db '', 'ガ' + db '', '' + 1 + db '', '' + 1 + db '', '' + 1 + db '', '' + 1 + db '', '' + 1 + db '', '┘' + 1 db -1 ; end diff --git a/engine/pokemon/correct_party_errors.asm b/engine/pokemon/correct_party_errors.asm index 1a82413e9..afc0a6dee 100644 --- a/engine/pokemon/correct_party_errors.asm +++ b/engine/pokemon/correct_party_errors.asm @@ -211,7 +211,7 @@ CorrectPartyErrors: ; unreferenced ld b, NAME_LENGTH_JAPANESE .search_loop ld a, [de] - cp "@" + cp '@' jr z, .done inc de inc c @@ -219,7 +219,7 @@ CorrectPartyErrors: ; unreferenced jr nz, .search_loop dec c dec de - ld a, "@" + ld a, '@' ld [de], a .done pop de diff --git a/engine/pokemon/european_mail.asm b/engine/pokemon/european_mail.asm index d6ea16b3b..ccec4772d 100644 --- a/engine/pokemon/european_mail.asm +++ b/engine/pokemon/european_mail.asm @@ -3,24 +3,24 @@ ParseMailLanguage: ld hl, sPartyMon1MailNationality - sPartyMon1Mail add hl, de ld a, [hli] - cp "E" + cp 'E' ret nz ld a, [hli] assert MAIL_LANG_ENGLISH + 1 == MAIL_LANG_FRENCH inc c - cp "F" + cp 'F' ret z assert MAIL_LANG_FRENCH + 1 == MAIL_LANG_GERMAN inc c - cp "G" + cp 'G' ret z assert MAIL_LANG_GERMAN + 1 == MAIL_LANG_ITALIAN inc c - cp "I" + cp 'I' ret z assert MAIL_LANG_ITALIAN + 1 == MAIL_LANG_SPANISH inc c - cp "S" + cp 'S' ret z ld c, MAIL_LANG_ENGLISH ret @@ -48,13 +48,13 @@ ConvertFrenchGermanMailToEnglish: ld a, [hl] cp $dc ; 's in French/German font jr nz, .check_intermediate_chars - ld a, "'s" + ld a, '\'s' jr .replace .check_intermediate_chars - sub "'s" + sub '\'s' jr c, .dont_replace - cp "'v" - "'s" + 1 + cp '\'v' - '\'s' + 1 jr nc, .dont_replace add $cd @@ -76,7 +76,7 @@ ConvertEnglishMailToFrenchGerman: ld l, e .loop ld a, [hl] - cp "'s" + cp '\'s' jr nz, .check_intermediate_chars ld a, $dc ; 's in French/German font jr .replace @@ -84,9 +84,9 @@ ConvertEnglishMailToFrenchGerman: .check_intermediate_chars sub $cd jr c, .dont_replace - cp "'v" - "'s" + 1 + cp '\'v' - '\'s' + 1 jr nc, .dont_replace - add "'s" + add '\'s' .replace ld [hl], a diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index 0b2cc15bb..b2073653d 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -360,7 +360,7 @@ UpdateSpeciesNameIfNotNicknamed: cp [hl] inc hl ret nz - cp "@" + cp '@' jr nz, .loop ld a, [wCurPartyMon] diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index f95ee9e51..98f85658b 100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm @@ -155,7 +155,7 @@ CheckPokeMail:: ld c, a ld a, b call GetFarByte - cp "@" + cp '@' jr z, .done cp c ld a, POKEMAIL_WRONG_MAIL @@ -354,7 +354,7 @@ MailboxPC_GetMailAuthor: push de ld bc, NAME_LENGTH - 1 call CopyBytes - ld a, "@" + ld a, '@' ld [de], a call CloseSRAM pop de diff --git a/engine/pokemon/mail_2.asm b/engine/pokemon/mail_2.asm index 5a96cd833..bc0d4ef34 100644 --- a/engine/pokemon/mail_2.asm +++ b/engine/pokemon/mail_2.asm @@ -711,7 +711,7 @@ MailGFX_PlaceMessage: ld de, wMonOrItemNameBuffer ld bc, NAME_LENGTH - 1 call CopyBytes - ld a, "@" + ld a, '@' ld [wTempMailAuthor], a ld [wMonOrItemNameBuffer + NAME_LENGTH - 1], a ld de, wTempMailMessage diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 063445dd1..6ef0d144f 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -171,7 +171,7 @@ SwitchPartyMons: ld a, [wSwitchMon] dec a call AddNTimes - ld [hl], "▷" + ld [hl], '▷' call WaitBGMap call SetDefaultBGPAndOBP call DelayFrame @@ -907,7 +907,7 @@ MoveScreenLoop: jp .joy_loop .moving_move - ld a, " " + ld a, ' ' hlcoord 1, 11 ld bc, 5 call ByteFill @@ -1261,7 +1261,7 @@ PlaceMoveScreenLeftArrow: .legal hlcoord 16, 0 - ld [hl], "◀" + ld [hl], '◀' ret PlaceMoveScreenRightArrow: @@ -1292,5 +1292,5 @@ PlaceMoveScreenRightArrow: .legal hlcoord 18, 0 - ld [hl], "▶" + ld [hl], '▶' ret diff --git a/engine/pokemon/mon_stats.asm b/engine/pokemon/mon_stats.asm index 479917509..e745cf0da 100644 --- a/engine/pokemon/mon_stats.asm +++ b/engine/pokemon/mon_stats.asm @@ -71,7 +71,7 @@ DrawHP: lb bc, 2, 3 call PrintNum - ld a, "/" + ld a, '/' ld [hli], a ; Print max HP @@ -251,7 +251,7 @@ ListMovePP: and a jr z, .skip ld c, a - ld a, "-" + ld a, '-' call .load_loop .skip @@ -293,7 +293,7 @@ ListMovePP: ld de, wStringBuffer1 + 4 lb bc, 1, 2 call PrintNum - ld a, "/" + ld a, '/' ld [hli], a ld de, wTempPP lb bc, 1, 2 @@ -472,7 +472,7 @@ ListMoves: ld a, b .nonmove_loop push af - ld [hl], "-" + ld [hl], '-' ld a, [wListMovesLineSpacing] ld c, a ld b, 0 diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index 4701705f3..4446c9248 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -1717,7 +1717,7 @@ GivePoke:: ld [de], a inc hl inc de - cp "@" + cp '@' jr nz, .otnameloop ld a, [wScriptBank] call GetFarByte @@ -1744,7 +1744,7 @@ GivePoke:: ld [de], a inc hl inc de - cp "@" + cp '@' jr nz, .loop ld a, [wScriptBank] call GetFarByte diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index eb7f0c7f7..0de114a81 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -49,7 +49,7 @@ WritePartyMenuTilemap: ldh [hBGMapMode], a hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill ; blank the tilemap call GetPartyMenuQualityIndexes .loop @@ -204,7 +204,7 @@ PlacePartyMenuHPDigits: lb bc, 2, 3 call PrintNum pop de - ld a, "/" + ld a, '/' ld [hli], a inc de inc de @@ -244,7 +244,7 @@ PlacePartyMonLevel: ld a, [de] cp 100 ; This is distinct from MAX_LEVEL. jr nc, .ThreeDigits - ld a, "" + ld a, '' ld [hli], a lb bc, PRINTNUM_LEFTALIGN | 1, 2 ; jr .okay diff --git a/engine/pokemon/search_owned.asm b/engine/pokemon/search_owned.asm index 76674bc58..d46fd6257 100644 --- a/engine/pokemon/search_owned.asm +++ b/engine/pokemon/search_owned.asm @@ -227,7 +227,7 @@ rept NAME_LENGTH_JAPANESE - 2 ld a, [de] cp [hl] jr nz, .notfound - cp "@" + cp '@' jr z, .found inc hl inc de diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index 83e9759f2..aabec23b7 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -425,9 +425,9 @@ StatsScreen_InitUpperHalf: ld [wTextDecimalByte], a ld [wCurSpecies], a hlcoord 8, 0 - ld [hl], "№" + ld [hl], '№' inc hl - ld [hl], "." + ld [hl], '.' inc hl hlcoord 10, 0 lb bc, PRINTNUM_LEADINGZEROS | 1, 3 @@ -443,7 +443,7 @@ StatsScreen_InitUpperHalf: hlcoord 18, 0 call .PlaceGenderChar hlcoord 9, 4 - ld a, "/" + ld a, '/' ld [hli], a ld a, [wBaseDexNo] ld [wNamedObjectIndex], a @@ -476,9 +476,9 @@ StatsScreen_InitUpperHalf: farcall GetGender pop hl ret c - ld a, "♂" + ld a, '♂' jr nz, .got_gender - ld a, "♀" + ld a, '♀' .got_gender ld [hl], a ret @@ -514,9 +514,9 @@ StatsScreen_PlaceHorizontalDivider: StatsScreen_PlacePageSwitchArrows: hlcoord 12, 6 - ld [hl], "◀" + ld [hl], '◀' hlcoord 19, 6 - ld [hl], "▶" + ld [hl], '▶' ret StatsScreen_PlaceShinyIcon: @@ -524,7 +524,7 @@ StatsScreen_PlaceShinyIcon: farcall CheckShininess ret nc hlcoord 19, 0 - ld [hl], "⁂" + ld [hl], '⁂' ret StatsScreen_LoadGFX: @@ -599,7 +599,7 @@ LoadPinkPage: and $f0 jr z, .NotImmuneToPkrs hlcoord 8, 8 - ld [hl], "." ; Pokérus immunity dot + ld [hl], '.' ; Pokérus immunity dot .NotImmuneToPkrs: ld a, [wMonType] cp BOXMON @@ -808,9 +808,9 @@ LoadBluePage: cp $7f jr z, .done and CAUGHT_GENDER_MASK - ld a, "♂" + ld a, '♂' jr z, .got_gender - ld a, "♀" + ld a, '♀' .got_gender hlcoord 9, 13 ld [hl], a @@ -980,7 +980,7 @@ StatsScreen_LoadTextboxSpaceGFX: ldh [rVBK], a ld de, TextboxSpaceGFX lb bc, BANK(TextboxSpaceGFX), 1 - ld hl, vTiles2 tile " " + ld hl, vTiles2 tile ' ' call Get2bpp pop af ldh [rVBK], a diff --git a/engine/pokemon/switchpartymons.asm b/engine/pokemon/switchpartymons.asm index a957a7af3..7b16c104f 100644 --- a/engine/pokemon/switchpartymons.asm +++ b/engine/pokemon/switchpartymons.asm @@ -22,7 +22,7 @@ _SwitchPartyMons: ld bc, 2 * SCREEN_WIDTH call AddNTimes ld bc, 2 * SCREEN_WIDTH - ld a, " " + ld a, ' ' call ByteFill pop af ld hl, wShadowOAMSprite00 diff --git a/engine/pokemon/types.asm b/engine/pokemon/types.asm index 4abaf672f..1f0cc57bc 100644 --- a/engine/pokemon/types.asm +++ b/engine/pokemon/types.asm @@ -29,7 +29,7 @@ PrintMonTypes: .hide_type_2 ; Erase any type name that was here before. ; Seems to be pointless in localized versions. - ld a, " " + ld a, ' ' ld bc, SCREEN_WIDTH - 3 add hl, bc ld [hl], a diff --git a/engine/printer/print_party.asm b/engine/printer/print_party.asm index 001888e47..d68d63fae 100644 --- a/engine/printer/print_party.asm +++ b/engine/printer/print_party.asm @@ -1,4 +1,4 @@ -DEF PRINTPARTY_HP EQU "◀" ; $71 +DEF PRINTPARTY_HP EQU '◀' ; $71 PrintPage1: hlcoord 0, 0 @@ -16,7 +16,7 @@ PrintPage1: inc a ; $65 ld [hl], a hlcoord 1, 9, wPrinterTilemapBuffer - ld a, " " + ld a, ' ' ld [hli], a ld [hl], a hlcoord 1, 10, wPrinterTilemapBuffer @@ -54,7 +54,7 @@ PrintPage1: PrintPage2: hlcoord 0, 0, wPrinterTilemapBuffer ld bc, 8 * SCREEN_WIDTH - ld a, " " + ld a, ' ' call ByteFill hlcoord 0, 0, wPrinterTilemapBuffer ld a, $36 @@ -144,12 +144,12 @@ PrintPartyMonPage1: call Request1bpp ld de, GBPrinterLvIcon - ld hl, vTiles2 tile "" + ld hl, vTiles2 tile '' lb bc, BANK(GBPrinterLvIcon), 1 call Request1bpp ld de, StatsScreenPageTilesGFX + 14 tiles ; shiny icon - ld hl, vTiles2 tile "⁂" + ld hl, vTiles2 tile '⁂' lb bc, BANK(StatsScreenPageTilesGFX), 1 call Get2bpp @@ -177,14 +177,14 @@ PrintPartyMonPage1: hlcoord 8, 4 call PlaceString hlcoord 9, 6 - ld [hl], "/" + ld [hl], '/' call GetPokemonName hlcoord 10, 6 call PlaceString hlcoord 8, 0 - ld [hl], "№" + ld [hl], '№' inc hl - ld [hl], "." + ld [hl], '.' inc hl ld de, wNamedObjectIndex lb bc, PRINTNUM_LEADINGZEROS | 1, 3 @@ -309,11 +309,11 @@ PlaceMoveNameString: PlaceGenderAndShininess: farcall GetGender - ld a, " " + ld a, ' ' jr c, .got_gender - ld a, "♂" + ld a, '♂' jr nz, .got_gender - ld a, "♀" + ld a, '♀' .got_gender hlcoord 17, 2 @@ -322,7 +322,7 @@ PlaceGenderAndShininess: farcall CheckShininess ret nc hlcoord 18, 2 - ld [hl], "⁂" + ld [hl], '⁂' ret PrintParty_OTString: diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index c218d4a82..11765f18f 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -635,13 +635,13 @@ PrintPCBox_Page1: ld [wWhichBoxMonToPrint], a hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill call Printer_PlaceEmptyBoxSlotString hlcoord 0, 0 ld bc, 9 * SCREEN_WIDTH - ld a, " " + ld a, ' ' call ByteFill call Printer_PlaceSideBorders @@ -672,7 +672,7 @@ PrintPCBox_Page1: PrintPCBox_Page2: hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill call Printer_PlaceEmptyBoxSlotString call Printer_PlaceSideBorders @@ -689,7 +689,7 @@ PrintPCBox_Page2: PrintPCBox_Page3: hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill call Printer_PlaceEmptyBoxSlotString call Printer_PlaceSideBorders @@ -706,7 +706,7 @@ PrintPCBox_Page3: PrintPCBox_Page4: hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill call Printer_PlaceEmptyBoxSlotString hlcoord 1, 15 @@ -744,7 +744,7 @@ Printer_PrintBoxListSegment: push hl ld bc, 16 - ld a, " " + ld a, ' ' call ByteFill pop hl @@ -764,12 +764,12 @@ Printer_PrintBoxListSegment: call Printer_GetMonGender ld bc, SCREEN_WIDTH - MON_NAME_LENGTH add hl, bc - ld a, "/" + ld a, '/' ld [hli], a push hl ld bc, 14 - ld a, " " + ld a, ' ' call ByteFill pop hl @@ -846,11 +846,11 @@ Printer_GetMonGender: ld a, TEMPMON ld [wMonType], a farcall GetGender - ld a, " " + ld a, ' ' jr c, .got_gender - ld a, "♂" + ld a, '♂' jr nz, .got_gender - ld a, "♀" + ld a, '♀' .got_gender pop hl ld [hli], a @@ -872,15 +872,15 @@ Printer_GetBoxMonSpecies: Printer_PlaceTopBorder: hlcoord 0, 0 - ld a, "┌" + ld a, '┌' ld [hli], a - ld a, "─" + ld a, '─' ld c, SCREEN_WIDTH - 2 .loop ld [hli], a dec c jr nz, .loop - ld a, "┐" + ld a, '┐' ld [hl], a ret @@ -889,10 +889,10 @@ Printer_PlaceSideBorders: ld de, SCREEN_WIDTH - 1 ld c, SCREEN_HEIGHT .loop - ld a, "│" + ld a, '│' ld [hl], a add hl, de - ld a, "│" + ld a, '│' ld [hli], a dec c jr nz, .loop @@ -900,15 +900,15 @@ Printer_PlaceSideBorders: Printer_PlaceBottomBorders: hlcoord 0, 17 - ld a, "└" + ld a, '└' ld [hli], a - ld a, "─" + ld a, '─' ld c, SCREEN_WIDTH - 2 .loop ld [hli], a dec c jr nz, .loop - ld a, "┘" + ld a, '┘' ld [hl], a ret diff --git a/engine/rtc/print_hours_mins.asm b/engine/rtc/print_hours_mins.asm index b3a3ac332..868cf9924 100644 --- a/engine/rtc/print_hours_mins.asm +++ b/engine/rtc/print_hours_mins.asm @@ -37,10 +37,10 @@ PrintHoursMins: push hl pop de pop hl - ld [hl], " " + ld [hl], ' ' lb bc, 1, 2 call PrintNum - ld [hl], ":" + ld [hl], ':' inc hl ld d, h ld e, l diff --git a/engine/rtc/reset_password.asm b/engine/rtc/reset_password.asm index a5e25da29..6c75dc8cb 100644 --- a/engine/rtc/reset_password.asm +++ b/engine/rtc/reset_password.asm @@ -108,21 +108,21 @@ ClockResetPassword: ld c, 5 .loop3 ld a, [de] - add "0" + add '0' ld [hli], a inc de dec c jr nz, .loop3 hlcoord 14, 16 ld bc, 5 - ld a, " " + ld a, ' ' call ByteFill hlcoord 14, 16 ld a, [wStringBuffer2 + 5] ld e, a ld d, 0 add hl, de - ld [hl], "▲" + ld [hl], '▲' ret .dpadinput @@ -243,7 +243,7 @@ ClockResetPassword: .ComponentFromString: ld a, [hli] - cp "@" + cp '@' ret z add e ld e, a diff --git a/engine/rtc/restart_clock.asm b/engine/rtc/restart_clock.asm index e24906e04..8f1c2ed3b 100644 --- a/engine/rtc/restart_clock.asm +++ b/engine/rtc/restart_clock.asm @@ -205,10 +205,10 @@ RestartClock: decoord 11, 8 farcall PrintHoursMins ld a, [wRestartClockPrevDivision] - lb de, " ", " " + lb de, ' ', ' ' call .PlaceChars ld a, [wRestartClockCurDivision] - lb de, "▲", "▼" + lb de, '▲', '▼' call .PlaceChars ld a, [wRestartClockCurDivision] ld [wRestartClockPrevDivision], a diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index c9e163b90..0f61323d4 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -1,5 +1,5 @@ -DEF TIMESET_UP_ARROW EQU "♂" ; $ef -DEF TIMESET_DOWN_ARROW EQU "♀" ; $f5 +DEF TIMESET_UP_ARROW EQU '♂' ; $ef +DEF TIMESET_DOWN_ARROW EQU '♀' ; $f5 InitClock: ; Ask the player to set the time. @@ -170,7 +170,7 @@ SetHour: .okay hlcoord 4, 9 - ld a, " " + ld a, ' ' ld bc, 15 call ByteFill hlcoord 4, 9 @@ -204,7 +204,7 @@ DisplayHoursMinutesWithMinString: ; unreferenced pop de inc de inc de - ld a, ":" + ld a, ':' ld [de], a inc de push de @@ -259,7 +259,7 @@ SetMinutes: ld [hl], a .finish_dpad hlcoord 12, 9 - ld a, " " + ld a, ' ' ld bc, 7 call ByteFill hlcoord 12, 9 @@ -281,7 +281,7 @@ DisplayMinutesWithMinString: PrintTwoDigitNumberLeftAlign: push hl - ld a, " " + ld a, ' ' ld [hli], a ld [hl], a pop hl @@ -339,7 +339,7 @@ OakText_ResponseToSetTime: ld a, [wInitHourBuffer] ld c, a call PrintHour - ld [hl], ":" + ld [hl], ':' inc hl ld de, wInitMinuteBuffer lb bc, PRINTNUM_LEADINGZEROS | 1, 2 @@ -606,46 +606,46 @@ MrChrono: ; unreferenced call UpdateTime hlcoord 1, 14 - ld [hl], "R" + ld [hl], 'R' inc hl - ld [hl], "T" + ld [hl], 'T' inc hl - ld [hl], " " + ld [hl], ' ' inc hl ld de, hRTCDayLo call .PrintTime hlcoord 1, 16 - ld [hl], "D" + ld [hl], 'D' inc hl - ld [hl], "F" + ld [hl], 'F' inc hl - ld [hl], " " + ld [hl], ' ' inc hl ld de, wStartDay call .PrintTime - ld [hl], " " + ld [hl], ' ' inc hl ld a, [wDST] bit DST_F, a jr z, .off - ld [hl], "O" + ld [hl], 'O' inc hl - ld [hl], "N" + ld [hl], 'N' inc hl jr .done .off - ld [hl], "O" + ld [hl], 'O' inc hl - ld [hl], "F" + ld [hl], 'F' inc hl - ld [hl], "F" + ld [hl], 'F' inc hl .done @@ -660,12 +660,12 @@ MrChrono: ; unreferenced .PrintTime: lb bc, 1, 3 call PrintNum - ld [hl], "." + ld [hl], '.' inc hl inc de lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum - ld [hl], ":" + ld [hl], ':' inc hl inc de lb bc, PRINTNUM_LEADINGZEROS | 1, 2 diff --git a/home/audio.asm b/home/audio.asm index 4fe6feae7..a345a3ccd 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -487,16 +487,16 @@ PlaceBCDNumberSprite:: ; unreferenced ld b, a swap a and $f - add "0" + add '0' ld [wShadowOAMSprite38TileID], a ld a, b and $f - add "0" + add '0' ld [wShadowOAMSprite39TileID], a ret .max - ld a, "9" + ld a, '9' ld [wShadowOAMSprite38TileID], a ld [wShadowOAMSprite39TileID], a ret diff --git a/home/copy_name.asm b/home/copy_name.asm index 59c8cf6c8..faa3e3836 100644 --- a/home/copy_name.asm +++ b/home/copy_name.asm @@ -8,6 +8,6 @@ CopyName2:: ld a, [de] inc de ld [hli], a - cp "@" + cp '@' jr nz, .loop ret diff --git a/home/joypad.asm b/home/joypad.asm index 964f6648c..e710efec7 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -429,7 +429,7 @@ PromptButton:: ldh a, [hVBlankCounter] and 1 << 4 ; blink every 2**4 = 16 frames jr z, .cursor_off - ld a, "▼" + ld a, '▼' jr .load_cursor_state .cursor_off @@ -443,7 +443,7 @@ BlinkCursor:: push bc ld a, [hl] ld b, a - ld a, "▼" + ld a, '▼' cp b pop bc jr nz, .place_arrow @@ -455,7 +455,7 @@ BlinkCursor:: dec a ldh [hObjectStructIndex], a ret nz - ld a, "─" + ld a, '─' ld [hl], a ld a, -1 ldh [hMapObjectIndex], a @@ -478,6 +478,6 @@ BlinkCursor:: ret nz ld a, 6 ldh [hObjectStructIndex], a - ld a, "▼" + ld a, '▼' ld [hl], a ret diff --git a/home/map.asm b/home/map.asm index 2c9a399a6..c2c1acd8f 100644 --- a/home/map.asm +++ b/home/map.asm @@ -104,7 +104,7 @@ LoadOverworldTilemap:: rst Bankswitch call LoadMetatiles - ld a, "■" + ld a, '■' hlcoord 0, 0 ld bc, SCREEN_AREA call ByteFill diff --git a/home/menu.asm b/home/menu.asm index b64e50b68..0167925e6 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -52,7 +52,7 @@ PlaceHollowCursor:: ld a, [hli] ld h, [hl] ld l, a - ld [hl], "▷" + ld [hl], '▷' ret HideCursor:: @@ -60,7 +60,7 @@ HideCursor:: ld a, [hli] ld h, [hl] ld l, a - ld [hl], " " + ld [hl], ' ' ret PushWindow:: diff --git a/home/names.asm b/home/names.asm index afa6f5583..2b070a012 100644 --- a/home/names.asm +++ b/home/names.asm @@ -78,7 +78,7 @@ GetNthString:: push bc ld b, a - ld c, "@" + ld c, '@' .readChar ld a, [hli] cp c @@ -97,16 +97,16 @@ GetBasePokemonName:: ld hl, wStringBuffer1 .loop ld a, [hl] - cp "@" + cp '@' jr z, .quit - cp "♂" + cp '♂' jr z, .end - cp "♀" + cp '♀' jr z, .end inc hl jr .loop .end - ld [hl], "@" + ld [hl], '@' .quit pop hl ret @@ -140,7 +140,7 @@ GetPokemonName:: ld bc, MON_NAME_LENGTH - 1 call CopyBytes ld hl, wStringBuffer1 + MON_NAME_LENGTH - 1 - ld [hl], "@" + ld [hl], '@' pop de pop hl @@ -212,7 +212,7 @@ GetTMHMName:: .not_hm ; Divide and mod by 10 to get the top and bottom digits respectively - ld b, "0" + ld b, '0' .mod10 sub 10 jr c, .done_mod @@ -227,13 +227,13 @@ GetTMHMName:: inc de pop af - ld b, "0" + ld b, '0' add b ld [de], a ; End the string inc de - ld a, "@" + ld a, '@' ld [de], a pop af diff --git a/home/pokemon.asm b/home/pokemon.asm index d14e80b0c..a7dd70088 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -209,7 +209,7 @@ PrintLevel:: ; Print wTempMonLevel at hl ld a, [wTempMonLevel] - ld [hl], "" + ld [hl], '' inc hl ; How many digits? @@ -224,7 +224,7 @@ PrintLevel:: PrintLevel_Force3Digits:: ; Print :L and all 3 digits - ld [hl], "" + ld [hl], '' inc hl ld c, 3 diff --git a/home/print_bcd.asm b/home/print_bcd.asm index 4182eadfc..91c8707fd 100644 --- a/home/print_bcd.asm +++ b/home/print_bcd.asm @@ -20,7 +20,7 @@ PrintBCDNumber:: jr z, .loop bit PRINTNUM_LEADINGZEROS_F, b jr nz, .loop ; skip currency symbol - ld [hl], "¥" + ld [hl], '¥' inc hl .loop ld a, [de] @@ -41,10 +41,10 @@ PrintBCDNumber:: .skipLeftAlignmentAdjustment bit PRINTNUM_MONEY_F, b jr z, .skipCurrencySymbol - ld [hl], "¥" ; currency symbol + ld [hl], '¥' ; currency symbol inc hl .skipCurrencySymbol - ld [hl], "0" + ld [hl], '0' call PrintLetterDelay inc hl .done @@ -60,13 +60,13 @@ PrintBCDDigit:: ; if bit 7 is set, then no numbers have been printed yet bit PRINTNUM_MONEY_F, b jr z, .skipCurrencySymbol - ld [hl], "¥" + ld [hl], '¥' inc hl res PRINTNUM_MONEY_F, b .skipCurrencySymbol res PRINTNUM_LEADINGZEROS_F, b ; unset 7 to indicate that a nonzero digit has been reached .outputDigit - add "0" + add '0' ld [hli], a jp PrintLetterDelay @@ -75,6 +75,6 @@ PrintBCDDigit:: jr z, .outputDigit ; if so, print a zero digit bit PRINTNUM_LEFTALIGN_F, b ret nz - ld a, " " + ld a, ' ' ld [hli], a ; if right-aligned, "print" a space by advancing the pointer ret diff --git a/home/string.asm b/home/string.asm index 86de2e273..ddce180e7 100644 --- a/home/string.asm +++ b/home/string.asm @@ -13,9 +13,9 @@ _InitString:: push bc .loop ld a, [hli] - cp "@" + cp '@' jr z, .blank - cp " " + cp ' ' jr nz, .notblank dec c jr nz, .loop diff --git a/home/text.asm b/home/text.asm index c29b87b98..549a1a012 100644 --- a/home/text.asm +++ b/home/text.asm @@ -1,6 +1,6 @@ ClearBox:: ; Fill a c*b box at hl with blank tiles. - ld a, " " + ld a, ' ' ; fallthrough FillBoxWithByte:: @@ -23,7 +23,7 @@ ClearTilemap:: ; Fill wTilemap with blank tiles. hlcoord 0, 0 - ld a, " " + ld a, ' ' ld bc, wTilemapEnd - wTilemap call ByteFill @@ -54,7 +54,7 @@ Textbox:: TextboxBorder:: ; Top push hl - ld a, "┌" + ld a, '┌' ld [hli], a inc a ; "─" call .PlaceChars @@ -67,11 +67,11 @@ TextboxBorder:: add hl, de .row push hl - ld a, "│" + ld a, '│' ld [hli], a - ld a, " " + ld a, ' ' call .PlaceChars - ld [hl], "│" + ld [hl], '│' pop hl ld de, SCREEN_WIDTH @@ -80,11 +80,11 @@ TextboxBorder:: jr nz, .row ; Bottom - ld a, "└" + ld a, '└' ld [hli], a - ld a, "─" + ld a, '─' call .PlaceChars - ld [hl], "┘" + ld [hl], '┘' ret @@ -170,7 +170,7 @@ PlaceString:: PlaceNextChar:: ld a, [de] - cp "@" + cp '@' jr nz, CheckDict ld b, h ld c, l @@ -187,7 +187,6 @@ NextChar:: CheckDict:: MACRO dict - assert CHARLEN(\1) == 1 if \1 == 0 and a else @@ -206,44 +205,44 @@ MACRO dict endc ENDM - dict "", MobileScriptChar - dict "", LineChar - dict "", NextLineChar - dict "", CarriageReturnChar - dict "", NullChar - dict "", _ContTextNoPause - dict "<_CONT>", _ContText - dict "", Paragraph - dict "", PrintMomsName - dict "", PrintPlayerName - dict "", PrintRivalName - dict "", PlaceJPRoute - dict "", PlaceWatashi - dict "", PlaceKokoWa - dict "", PrintRedsName - dict "", PrintGreensName - dict "#", PlacePOKe - dict "", PCChar - dict "", RocketChar - dict "", TMChar - dict "", TrainerChar - dict "", PlaceKougeki - dict "", LineFeedChar - dict "", ContText - dict "<……>", SixDotsChar - dict "", DoneText - dict "", PromptText - dict "", PlacePKMN - dict "", PlacePOKE - dict "", NextChar - dict "", " " - dict "", PlaceDexEnd - dict "", PlaceMoveTargetsName - dict "", PlaceMoveUsersName - dict "", PlaceEnemysName - dict "", PlaceGenderedPlayerName - dict "ﾟ", .place ; should be .diacritic - dict "ﾞ", .place ; should be .diacritic + dict '', MobileScriptChar + dict '', LineChar + dict '', NextLineChar + dict '', CarriageReturnChar + dict '', NullChar + dict '', _ContTextNoPause + dict '<_CONT>', _ContText + dict '', Paragraph + dict '', PrintMomsName + dict '', PrintPlayerName + dict '', PrintRivalName + dict '', PlaceJPRoute + dict '', PlaceWatashi + dict '', PlaceKokoWa + dict '', PrintRedsName + dict '', PrintGreensName + dict '#', PlacePOKe + dict '', PCChar + dict '', RocketChar + dict '', TMChar + dict '', TrainerChar + dict '', PlaceKougeki + dict '', LineFeedChar + dict '', ContText + dict '<……>', SixDotsChar + dict '', DoneText + dict '', PromptText + dict '', PlacePKMN + dict '', PlacePOKE + dict '', NextChar + dict '', ' ' + dict '', PlaceDexEnd + dict '', PlaceMoveTargetsName + dict '', PlaceMoveUsersName + dict '', PlaceEnemysName + dict '', PlaceGenderedPlayerName + dict 'ﾟ', .place ; should be .diacritic + dict 'ﾞ', .place ; should be .diacritic jr .not_diacritic .diacritic ; unreferenced @@ -255,33 +254,33 @@ ENDM cp FIRST_REGULAR_TEXT_CHAR jr nc, .place ; dakuten or handakuten - cp "パ" + cp 'パ' jr nc, .handakuten ; dakuten cp FIRST_HIRAGANA_DAKUTEN_CHAR jr nc, .hiragana_dakuten ; katakana dakuten - add "カ" - "ガ" + add 'カ' - 'ガ' jr .place_dakuten .hiragana_dakuten - add "か" - "が" + add 'か' - 'が' .place_dakuten - ld b, "ﾞ" ; dakuten + ld b, 'ﾞ' ; dakuten call Diacritic jr .place .handakuten - cp "ぱ" + cp 'ぱ' jr nc, .hiragana_handakuten ; katakana handakuten - add "ハ" - "パ" + add 'ハ' - 'パ' jr .place_handakuten .hiragana_handakuten - add "は" - "ぱ" + add 'は' - 'ぱ' .place_handakuten - ld b, "ﾟ" ; handakuten + ld b, 'ﾟ' ; handakuten call Diacritic .place @@ -542,7 +541,7 @@ ContText:: PlaceDexEnd:: ; Ends a Pokédex entry in Gen 1. ; Dex entries are now regular strings. - ld [hl], "." + ld [hl], '.' pop hl ret @@ -574,7 +573,7 @@ DoneText:: text_end NullChar:: - ld a, "?" + ld a, '?' ld [hli], a call PrintLetterDelay jp NextChar @@ -604,7 +603,7 @@ TextScroll:: jr nz, .col hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY + 2 - ld a, " " + ld a, ' ' ld bc, TEXTBOX_INNERW call ByteFill ld c, 5 @@ -629,7 +628,7 @@ Diacritic:: ret LoadBlinkingCursor:: - ld a, "▼" + ld a, '▼' ldcoord_a 18, 17 ret @@ -964,7 +963,7 @@ TextCommand_DOTS:: .loop push de - ld a, "…" + ld a, '…' ld [hli], a call GetJoypad ldh a, [hJoyDown] diff --git a/lib/mobile/mail.asm b/lib/mobile/mail.asm index 0a8618718..8c8c1ffe4 100644 --- a/lib/mobile/mail.asm +++ b/lib/mobile/mail.asm @@ -495,17 +495,17 @@ Function1143f3: jp z, .asm_1144c2 inc e call z, Function1144c8 - cp "\r" + cp '\r' jr nz, .asm_11442b ld a, [de] inc e call z, Function1144c8 - cp "\n" + cp '\n' jr nz, .asm_11442b ld a, [de] - cp "." + cp '.' jr z, .asm_1144ae - cp "\r" + cp '\r' jr z, .asm_1144b8 .asm_11444a @@ -516,9 +516,9 @@ Function1143f3: jr z, .asm_1144c2 inc e call z, Function1144c8 - cp "a" + cp 'a' jr c, .asm_114462 - cp "z" + 1 + cp 'z' + 1 jr nc, .asm_114462 sub $20 @@ -542,10 +542,10 @@ Function1143f3: jr .asm_11446e .asm_114476 - ld a, " " + ld a, ' ' cp b jr z, .asm_114481 - ld a, "\n" + ld a, '\n' cp b jr z, .asm_114481 dec de @@ -561,18 +561,18 @@ Function1143f3: inc bc inc e call z, Function1144c8 - cp "\r" + cp '\r' jr nz, .asm_114486 ld a, [de] inc bc inc e call z, Function1144c8 - cp "\n" + cp '\n' jr nz, .asm_114486 ld a, [de] - cp " " + cp ' ' jr z, .asm_114486 - cp "\t" + cp '\t' jr z, .asm_114486 ld d, h ld e, l @@ -585,14 +585,14 @@ Function1143f3: inc e call z, Function1144c8 ld a, [de] - cp "\r" + cp '\r' jp nz, .asm_11442b .asm_1144b8 inc e call z, Function1144c8 ld a, [de] - cp "\n" + cp '\n' jp nz, .asm_11442b .asm_1144c2 @@ -5029,26 +5029,26 @@ endr ret .decodeBase64Character - cp "+" + cp '+' jr c, .asm_115d27 jr z, .asm_115d2f - cp "/" + cp '/' jr c, .asm_115d27 jr z, .asm_115d32 - cp "0" + cp '0' jr c, .asm_115d27 - cp "9" + 1 + cp '9' + 1 jr c, .asm_115d35 - cp "=" + cp '=' jr c, .asm_115d27 jr z, .asm_115d38 - cp "A" + cp 'A' jr c, .asm_115d27 - cp "Z" + 1 + cp 'Z' + 1 jr c, .asm_115d4d - cp "a" + cp 'a' jr c, .asm_115d27 - cp "z" + 1 + cp 'z' + 1 jr c, .asm_115d50 .asm_115d27 diff --git a/lib/mobile/main.asm b/lib/mobile/main.asm index 66773fc6a..d7321feba 100644 --- a/lib/mobile/main.asm +++ b/lib/mobile/main.asm @@ -5188,10 +5188,10 @@ Function112271: .asm_1122a1 ld hl, wc880 ld a, [hli] - cp "M" + cp 'M' jr nz, .asm_1122f5 ld a, [hld] - cp "A" + cp 'A' jr nz, .asm_1122f5 ld b, $be ld de, 0 @@ -6501,9 +6501,9 @@ Function112b11: dec hl .asm_112b2d ld a, [hli] - cp "\r" + cp '\r' jr z, .asm_112b36 - cp " " + cp ' ' jr nz, .asm_112b2d .asm_112b36 @@ -6545,9 +6545,9 @@ Function112b11: .asm_112b60: ld a, [hli] - cp "0" + cp '0' jr c, .asm_112b6f - cp "9" + 1 + cp '9' + 1 jr nc, .asm_112b6f and $f ld [de], a @@ -7878,25 +7878,25 @@ Function1133de: Function1133fe: ld hl, wMobileSDK_PacketBuffer + 17 ld a, [hli] - cp "h" + cp 'h' jr nz, .asm_113432 ld a, [hli] - cp "t" + cp 't' jr nz, .asm_113432 ld a, [hli] - cp "t" + cp 't' jr nz, .asm_113432 ld a, [hli] - cp "p" + cp 'p' jr nz, .asm_113432 ld a, [hli] - cp ":" + cp ':' jr nz, .asm_113432 ld a, [hli] - cp "/" + cp '/' jr nz, .asm_113432 ld a, [hli] - cp "/" + cp '/' jr nz, .asm_113432 ld hl, wMobileSDK_PacketBuffer + 16 ld de, wc880 @@ -7909,7 +7909,7 @@ Function1133fe: .asm_113432 ld a, [wMobileSDK_PacketBuffer + 17] - cp "/" + cp '/' jr z, .asm_113460 ld de, wc880 ld hl, wc9b5 @@ -7926,7 +7926,7 @@ Function1133fe: ld h, d .asm_11344c ld a, [hld] - cp "/" + cp '/' jr nz, .asm_11344c inc hl inc hl @@ -7953,7 +7953,7 @@ Function1133fe: ld h, [hl] ld l, a ld a, [hl] - cp "/" + cp '/' jr z, .asm_113478 ld b, $7 call MobileSDK_CopyBytes @@ -7962,7 +7962,7 @@ Function1133fe: ld a, [hli] ld [de], a inc de - cp "/" + cp '/' jr nz, .asm_113478 dec de jr .asm_113455 @@ -8102,10 +8102,10 @@ Function113519: .asm_11353f ld hl, wc880 ld a, [hli] - cp "M" + cp 'M' jr nz, .asm_113586 ld a, [hld] - cp "A" + cp 'A' jr nz, .asm_113586 ld b, $be ld de, 0 @@ -9272,26 +9272,26 @@ endr ret .decodeBase64Character: - cp "+" + cp '+' jr c, .asm_113e24 jr z, .asm_113e31 - cp "/" + cp '/' jr c, .asm_113e24 jr z, .asm_113e34 - cp "0" + cp '0' jr c, .asm_113e24 - cp "9" + 1 + cp '9' + 1 jr c, .asm_113e37 - cp "=" + cp '=' jr c, .asm_113e24 jr z, .asm_113e3a - cp "A" + cp 'A' jr c, .asm_113e24 - cp "Z" + 1 + cp 'Z' + 1 jr c, .asm_113e3c - cp "a" + cp 'a' jr c, .asm_113e24 - cp "z" + 1 + cp 'z' + 1 jr c, .asm_113e3f .asm_113e24 diff --git a/macros/asserts.asm b/macros/asserts.asm index 55637ff90..96fe01440 100644 --- a/macros/asserts.asm +++ b/macros/asserts.asm @@ -1,18 +1,14 @@ ; Macros to verify assumptions about the data or code -MACRO _redef_current_label +MACRO? _redef_current_label if DEF(\1) PURGE \1 endc if _NARG == 3 + (\3) DEF \1 EQUS "\<_NARG>" - elif DEF(..) - if .. - @ == 0 - DEF \1 EQUS "{..}" - endc - elif DEF(.) - if . - @ == 0 - DEF \1 EQUS "{.}" + elif STRLEN(#__SCOPE__) + if {{__SCOPE__}} - @ == 0 + DEF \1 EQUS #{__SCOPE__} endc endc if !DEF(\1) @@ -21,12 +17,12 @@ MACRO _redef_current_label endc ENDM -MACRO table_width +MACRO? table_width DEF CURRENT_TABLE_WIDTH = \1 _redef_current_label CURRENT_TABLE_START, "._table_width\@", 2, \# ENDM -MACRO assert_table_length +MACRO? assert_table_length DEF w = \1 DEF x = w * CURRENT_TABLE_WIDTH DEF y = @ - {CURRENT_TABLE_START} @@ -34,24 +30,24 @@ MACRO assert_table_length "bytes, for {d:x} total; but got {d:y} bytes" ENDM -MACRO list_start +MACRO? list_start DEF list_index = 0 _redef_current_label CURRENT_LIST_START, "._list_start\@", 1, \# ENDM -MACRO li +MACRO? li assert STRFIND(\1, "@") == -1, "String terminator \"@\" in list entry: \1" db \1, "@" DEF list_index += 1 ENDM -MACRO assert_list_length +MACRO? assert_list_length DEF x = \1 assert x == list_index, \ "{CURRENT_LIST_START}: expected {d:x} entries, got {d:list_index}" ENDM -MACRO def_grass_wildmons +MACRO? def_grass_wildmons ;\1: map id REDEF CURRENT_GRASS_WILDMONS_MAP EQUS "\1" REDEF CURRENT_GRASS_WILDMONS_LABEL EQUS "._def_grass_wildmons_\1" @@ -59,13 +55,13 @@ MACRO def_grass_wildmons map_id \1 ENDM -MACRO end_grass_wildmons +MACRO? end_grass_wildmons DEF x = @ - {CURRENT_GRASS_WILDMONS_LABEL} assert GRASS_WILDDATA_LENGTH == x, \ "def_grass_wildmons {CURRENT_GRASS_WILDMONS_MAP}: expected {d:GRASS_WILDDATA_LENGTH} bytes, got {d:x}" ENDM -MACRO def_water_wildmons +MACRO? def_water_wildmons ;\1: map id REDEF CURRENT_WATER_WILDMONS_MAP EQUS "\1" REDEF CURRENT_WATER_WILDMONS_LABEL EQUS "._def_water_wildmons_\1" @@ -73,7 +69,7 @@ MACRO def_water_wildmons map_id \1 ENDM -MACRO end_water_wildmons +MACRO? end_water_wildmons DEF x = @ - {CURRENT_WATER_WILDMONS_LABEL} assert WATER_WILDDATA_LENGTH == x, \ "def_water_wildmons {CURRENT_WATER_WILDMONS_MAP}: expected {d:WATER_WILDDATA_LENGTH} bytes, got {d:x}" diff --git a/macros/code.asm b/macros/code.asm index 7a10f84db..b07c6f425 100644 --- a/macros/code.asm +++ b/macros/code.asm @@ -1,10 +1,10 @@ ; Syntactic sugar macros -MACRO lb ; r, hi, lo +MACRO? lb ; r, hi, lo ld \1, ((\2) & $ff) << 8 | ((\3) & $ff) ENDM -MACRO ln ; r, hi, lo +MACRO? ln ; r, hi, lo ld \1, ((\2) & $f) << 4 | ((\3) & $f) ENDM @@ -23,7 +23,7 @@ MACRO jumptable jp hl ENDM -MACRO maskbits +MACRO? maskbits ; masks just enough bits to cover values 0 to \1 - 1 ; \2 is an optional shift amount ; e.g. "maskbits 26" becomes "and %00011111" (since 26 - 1 = %00011001) diff --git a/macros/const.asm b/macros/const.asm index 261fdef05..a10666293 100644 --- a/macros/const.asm +++ b/macros/const.asm @@ -1,6 +1,6 @@ ; Enumerate constants -MACRO const_def +MACRO? const_def if _NARG >= 1 DEF const_value = \1 else @@ -13,17 +13,17 @@ MACRO const_def endc ENDM -MACRO const +MACRO? const DEF \1 EQU const_value DEF const_value += const_inc ENDM -MACRO shift_const +MACRO? shift_const DEF \1 EQU 1 << const_value const \1_F ENDM -MACRO const_skip +MACRO? const_skip if _NARG >= 1 DEF const_value += const_inc * (\1) else @@ -31,7 +31,7 @@ MACRO const_skip endc ENDM -MACRO const_next +MACRO? const_next if (const_value > 0 && \1 < const_value) || (const_value < 0 && \1 > const_value) fail "const_next cannot go backwards from {const_value} to \1" else @@ -39,7 +39,7 @@ MACRO const_next endc ENDM -MACRO rb_skip +MACRO? rb_skip if _NARG == 1 rsset _RS + \1 else diff --git a/macros/coords.asm b/macros/coords.asm index 2df93f3b6..0b50c7090 100644 --- a/macros/coords.asm +++ b/macros/coords.asm @@ -1,18 +1,18 @@ ; Coordinate macros -MACRO hlcoord +MACRO? hlcoord coord hl, \# ENDM -MACRO bccoord +MACRO? bccoord coord bc, \# ENDM -MACRO decoord +MACRO? decoord coord de, \# ENDM -MACRO coord +MACRO? coord ; register, x, y[, origin] if _NARG < 4 ld \1, (\3) * SCREEN_WIDTH + (\2) + wTilemap @@ -21,19 +21,19 @@ MACRO coord endc ENDM -MACRO hlbgcoord +MACRO? hlbgcoord bgcoord hl, \# ENDM -MACRO bcbgcoord +MACRO? bcbgcoord bgcoord bc, \# ENDM -MACRO debgcoord +MACRO? debgcoord bgcoord de, \# ENDM -MACRO bgcoord +MACRO? bgcoord ; register, x, y[, origin] if _NARG < 4 ld \1, (\3) * TILEMAP_WIDTH + (\2) + vBGMap0 @@ -42,15 +42,15 @@ MACRO bgcoord endc ENDM -MACRO dwcoord +MACRO? dwcoord ; x, y - rept _NARG / 2 + rept? _NARG / 2 dw (\2) * SCREEN_WIDTH + (\1) + wTilemap shift 2 endr ENDM -MACRO ldcoord_a +MACRO? ldcoord_a ; x, y[, origin] if _NARG < 3 ld [(\2) * SCREEN_WIDTH + (\1) + wTilemap], a @@ -59,7 +59,7 @@ MACRO ldcoord_a endc ENDM -MACRO lda_coord +MACRO? lda_coord ; x, y[, origin] if _NARG < 3 ld a, [(\2) * SCREEN_WIDTH + (\1) + wTilemap] @@ -68,7 +68,7 @@ MACRO lda_coord endc ENDM -MACRO menu_coords +MACRO? menu_coords ; x1, y1, x2, y2 db \2, \1 ; start coords db \4, \3 ; end coords diff --git a/macros/data.asm b/macros/data.asm index 134d38b67..6fcae9b12 100644 --- a/macros/data.asm +++ b/macros/data.asm @@ -25,77 +25,77 @@ DEF percent EQUS "* $ff / 100" ; e.g. 1 out_of 2 == 50 percent + 1 == $80 DEF out_of EQUS "* $100 /" -MACRO assert_power_of_2 +MACRO? assert_power_of_2 assert (\1) & ((\1) - 1) == 0, "\1 must be a power of 2" ENDM ; Constant data (db, dw, dl) macros -MACRO dwb +MACRO? dwb dw \1 db \2 ENDM -MACRO dbw +MACRO? dbw db \1 dw \2 ENDM -MACRO dn ; nybbles - rept _NARG / 2 +MACRO? dn ; nybbles + rept? _NARG / 2 db ((\1) << 4) | (\2) shift 2 endr ENDM -MACRO dc ; "crumbs" - rept _NARG / 4 +MACRO? dc ; "crumbs" + rept? _NARG / 4 db ((\1) << 6) | ((\2) << 4) | ((\3) << 2) | (\4) shift 4 endr ENDM -MACRO bigdw ; big-endian word - rept _NARG +MACRO? bigdw ; big-endian word + rept? _NARG db HIGH(\1), LOW(\1) shift endr ENDM -MACRO bigdt ; big-endian "tribyte" - rept _NARG +MACRO? bigdt ; big-endian "tribyte" + rept? _NARG db LOW((\1) >> 16), HIGH(\1), LOW(\1) shift endr ENDM -MACRO bigdd ; big-endian "double word" - rept _NARG +MACRO? bigdd ; big-endian "double word" + rept? _NARG db HIGH((\1) >> 16), LOW((\1) >> 16), HIGH(\1), LOW(\1) shift endr ENDM -MACRO dba ; dbw bank, address - rept _NARG +MACRO? dba ; dbw bank, address + rept? _NARG dbw BANK(\1), \1 shift endr ENDM -MACRO dab ; dwb address, bank - rept _NARG +MACRO? dab ; dwb address, bank + rept? _NARG dwb \1, BANK(\1) shift endr ENDM -MACRO dba_pic ; dbw bank, address +MACRO? dba_pic ; dbw bank, address db BANK(\1) - PICS_FIX dw \1 ENDM -MACRO dba_pics ; front, back +MACRO? dba_pics ; front, back if _NARG == 2 dba_pic \1 ; front dba_pic \2 ; back @@ -108,7 +108,7 @@ MACRO dba_pics ; front, back endc ENDM -MACRO dname +MACRO? dname if _NARG == 2 def n = \2 else @@ -117,19 +117,19 @@ MACRO dname assert STRFIND(\1, "@") == -1, "String terminator \"@\" in name: \1" assert CHARLEN(\1) <= n, "Name longer than {d:n} characters: \1" db \1 - ds n - CHARLEN(\1), "@" + ds n - CHARLEN(\1), '@' ENDM -MACRO bcd - rept _NARG +MACRO? bcd + rept? _NARG dn ((\1) % 100) / 10, (\1) % 10 shift endr ENDM -MACRO sine_table +MACRO? sine_table ; \1 samples of sin(x) from x=0 to x<0.5 turns (pi radians) - for x, \1 + for? x, \1 dw sin(x * 0.5 / (\1)) endr ENDM diff --git a/macros/gfx.asm b/macros/gfx.asm index c2dc9ff6a..ebbe60fde 100644 --- a/macros/gfx.asm +++ b/macros/gfx.asm @@ -1,14 +1,14 @@ ; Graphics macros -MACRO assert_valid_rgb - rept _NARG +MACRO? assert_valid_rgb + rept? _NARG assert 0 <= (\1) && (\1) <= 31, "RGB channel must be 0-31" shift endr ENDM -MACRO RGB - rept _NARG / 3 +MACRO? RGB + rept? _NARG / 3 assert_valid_rgb \1, \2, \3 dw palred (\1) + palgreen (\2) + palblue (\3) shift 3 @@ -32,7 +32,7 @@ DEF tile EQUS "+ TILE_SIZE *" ; INCBIN "foo.gbcpal", middle_colors DEF middle_colors EQUS "COLOR_SIZE, COLOR_SIZE * 2" -MACRO dbpixel +MACRO? dbpixel if _NARG >= 4 ; x tile, y tile, x pixel, y pixel db \1 * TILE_WIDTH + \3, \2 * TILE_WIDTH + \4 @@ -42,19 +42,19 @@ MACRO dbpixel endc ENDM -MACRO hlpixel +MACRO? hlpixel ldpixel hl, \# ENDM -MACRO bcpixel +MACRO? bcpixel ldpixel bc, \# ENDM -MACRO depixel +MACRO? depixel ldpixel de, \# ENDM -MACRO ldpixel +MACRO? ldpixel if _NARG >= 5 ; register, x tile, y tile, x pixel, y pixel lb \1, \2 * TILE_WIDTH + \4, \3 * TILE_WIDTH + \5 @@ -64,7 +64,7 @@ MACRO ldpixel endc ENDM -MACRO dbsprite +MACRO? dbsprite ; x tile, y tile, x pixel, y pixel, vtile offset, attributes db (\2 * TILE_WIDTH) % $100 + \4, (\1 * TILE_WIDTH) % $100 + \3, \5, \6 ENDM diff --git a/macros/legacy.asm b/macros/legacy.asm index 61fcbbfc5..d3815608f 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -7,31 +7,31 @@ DEF callba EQUS "farcall" DEF callab EQUS "callfar" ; macros/gfx.asm -MACRO dsprite +MACRO? dsprite dbsprite \3, \1, \4, \2, \5, \6 ENDM ; macros/data.asm -MACRO dt +MACRO? dt bigdt \1 ENDM -MACRO dd +MACRO? dd bigdd \1 ENDM -MACRO dbbw +MACRO? dbbw db \1, \2 dw \3 ENDM -MACRO dbww +MACRO? dbww db \1 dw \2, \3 ENDM -MACRO dbwww +MACRO? dbwww db \1 dw \2, \3, \4 ENDM @@ -414,8 +414,8 @@ DEF gamecornercoinvendor EQUS "GameCornerCoinVendorScript" DEF happinesschecknpc EQUS "HappinessCheckScript" ; constants/charmap.asm -charmap "%", "" -charmap "¯", "" +charmap "%", '' +charmap "¯", '' ; constants/sprite_constants.asm DEF SPRITE_BUENA EQUS "SPRITE_BEAUTY" diff --git a/macros/predef.asm b/macros/predef.asm index a32b9a3ce..fbb7c2bbe 100644 --- a/macros/predef.asm +++ b/macros/predef.asm @@ -1,17 +1,17 @@ ; Predef function calls -MACRO lda_predef +MACRO? lda_predef ; Some functions load the predef id ; without immediately calling Predef. ld a, (\1Predef - PredefPointers) / 3 ENDM -MACRO predef +MACRO? predef lda_predef \1 call Predef ENDM -MACRO predef_jump +MACRO? predef_jump lda_predef \1 jp Predef ENDM diff --git a/macros/ram.asm b/macros/ram.asm index e718df881..84b33fbf7 100644 --- a/macros/ram.asm +++ b/macros/ram.asm @@ -1,6 +1,6 @@ ; Structures in RAM -MACRO flag_array +MACRO? flag_array ds ((\1) + 7) / 8 ENDM diff --git a/macros/vc.asm b/macros/vc.asm index b104cb524..fdeb69d3e 100644 --- a/macros/vc.asm +++ b/macros/vc.asm @@ -1,12 +1,12 @@ ; Virtual Console macros -MACRO vc_hook +MACRO? vc_hook if DEF(_CRYSTAL11_VC) .VC_\1:: endc ENDM -MACRO vc_patch +MACRO? vc_patch if DEF(_CRYSTAL11_VC) assert !DEF(CURRENT_VC_PATCH), "Already started a vc_patch" DEF CURRENT_VC_PATCH EQUS "\1" @@ -14,7 +14,7 @@ MACRO vc_patch endc ENDM -MACRO vc_patch_end +MACRO? vc_patch_end if DEF(_CRYSTAL11_VC) assert DEF(CURRENT_VC_PATCH), "No vc_patch started" .VC_{CURRENT_VC_PATCH}_End:: @@ -22,7 +22,7 @@ MACRO vc_patch_end endc ENDM -MACRO vc_assert +MACRO? vc_assert if DEF(_CRYSTAL11_VC) assert \# endc diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index 9a62b674c..1bb0b7a74 100644 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -153,11 +153,11 @@ PrintEZChatBattleMessage: inc a ld [wJumptableIndex], a ; if we're on line 2, insert "" - ld [hl], "" + ld [hl], '' rra jr c, .got_line_terminator ; else, insert "" - ld [hl], "" + ld [hl], '' .got_line_terminator inc hl @@ -171,7 +171,7 @@ PrintEZChatBattleMessage: ; add the space, unless we're at the start of the line cp 18 jr z, .skip_space - ld [hl], " " + ld [hl], ' ' inc hl .skip_space @@ -182,7 +182,7 @@ PrintEZChatBattleMessage: .place_string_loop ; load the string from de to hl ld a, [de] - cp "@" + cp '@' jr z, .done inc de ld [hli], a @@ -194,7 +194,7 @@ PrintEZChatBattleMessage: dec a jr nz, .loop ; we're finished, place "" - ld [hl], "" + ld [hl], '' ; now, let's place the string from wc618 to bc pop bc ld hl, wc618 @@ -212,7 +212,7 @@ GetLengthOfWordAtC608: ld hl, wc608 .loop ld a, [hli] - cp "@" + cp '@' ret z inc c jr .loop @@ -222,7 +222,7 @@ CopyMobileEZChatToC608: push af ld a, $1 ldh [rWBK], a - ld a, "@" + ld a, '@' ld hl, wc608 ld bc, NAME_LENGTH call ByteFill @@ -358,7 +358,7 @@ Function11c254: ret EZChat_ClearBottom12Rows: - ld a, "　" + ld a, '　' hlcoord 0, 6 ld bc, (SCREEN_HEIGHT - 6) * SCREEN_WIDTH call ByteFill @@ -882,7 +882,7 @@ EZChat_PlaceCategoryNames: .find_next_string_loop inc de ld a, [de] - cp "@" + cp '@' jr z, .find_next_string_loop pop bc pop af @@ -1349,10 +1349,10 @@ BCD2String: ; unreferenced farcall Function11a80c pop hl ld a, [wcd63] - add "０" + add '０' ld [hli], a ld a, [wcd62] - add "０" + add '０' ld [hli], a ret diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index ae25ee9be..a8f9b7903 100644 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -433,7 +433,7 @@ Function483bb: jr z, .asm_483d5 .asm_483cb ld a, [hli] - cp "@" + cp '@' jr nz, .asm_483cb ld a, b dec a @@ -465,7 +465,7 @@ Function483e8: jr z, .asm_48405 .asm_483fc ld a, [hli] - cp "@" + cp '@' jr nz, .asm_483fc ld a, d dec a @@ -884,7 +884,7 @@ endr Function487ff: push hl - ld a, " " + ld a, ' ' ld [hli], a ld [hl], a pop hl @@ -1561,7 +1561,7 @@ Function48c5a: ret Function48c63: - ld a, "@" + ld a, '@' ld [de], a ld a, c cp $30 @@ -1572,7 +1572,7 @@ Function48c63: push de ld h, d ld l, e - ld a, "@" + ld a, '@' ld b, 7 .asm_48c76 ld [hli], a @@ -1586,7 +1586,7 @@ Function48c63: ld [de], a inc de ld a, [hl] - cp "@" + cp '@' jr nz, .asm_48c81 and a pop de diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 22c1df210..9f7048fa2 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -84,7 +84,7 @@ Function8919e: .loop ld a, [de] inc de - cp "@" + cp '@' jr nz, .loop dec c jr nz, .loop @@ -99,7 +99,7 @@ Function891ab: Function891b8: call Mobile22_SetBGMapMode0 hlcoord 0, 0 - ld a, " " + ld a, ' ' ld bc, SCREEN_AREA call ByteFill call DelayFrame @@ -128,7 +128,7 @@ Function891de: ld bc, SCREEN_AREA call ByteFill hlcoord 0, 0 - ld a, " " + ld a, ' ' ld bc, SCREEN_AREA call ByteFill call Function891ab @@ -276,14 +276,14 @@ Function892b7: ld e, c ld hl, 0 add hl, bc - ld a, "@" + ld a, '@' ld bc, 6 call ByteFill ld b, d ld c, e ld hl, 6 add hl, bc - ld a, "@" + ld a, '@' ld bc, 6 call ByteFill ld b, d @@ -358,9 +358,9 @@ Function89331: ld c, NAME_LENGTH_JAPANESE - 1 .loop ld a, [hli] - cp "@" + cp '@' jr z, .terminator - cp " " + cp ' ' jr nz, .nonspace dec c jr nz, .loop @@ -390,9 +390,9 @@ _incave: ld c, NAME_LENGTH_JAPANESE - 1 .loop ld a, [hli] - cp "@" + cp '@' jr z, .terminator - cp " " + cp ' ' jr nz, .nonspace dec c jr nz, .loop @@ -739,7 +739,7 @@ Function8956f: ld hl, wd030 ld a, -1 ld [hli], a - ld a, " " + ld a, ' ' ld [hl], a pop af ldh [rWBK], a @@ -996,7 +996,7 @@ Function896ff: ; unreferenced ; c = width ; clears an area of the screen - ld a, " " + ld a, ' ' ld de, SCREEN_WIDTH .row_loop push bc diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 861760c9e..3d508dbf1 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -5559,7 +5559,7 @@ Function1026f3: .asm_102702 hlcoord 9, 17 - ld [hl], " " + ld [hl], ' ' ld a, $01 ld [wMenuCursorY], a ld a, $1d ; Function102652 @@ -5568,7 +5568,7 @@ Function1026f3: .asm_102712 hlcoord 9, 17 - ld [hl], " " + ld [hl], ' ' ld a, [wOTPartyCount] ld [wMenuCursorY], a ld a, $1f ; Function1025e9 @@ -5577,7 +5577,7 @@ Function1026f3: .asm_102723 hlcoord 9, 17 - ld [hl], "▷" + ld [hl], '▷' ld hl, wcd4b set 3, [hl] ld hl, wcd4b @@ -5621,9 +5621,9 @@ Function102770: Function102775: hlcoord 1, 16 - ld [hl], "▶" + ld [hl], '▶' hlcoord 11, 16 - ld [hl], " " + ld [hl], ' ' ld hl, wcd4b set 2, [hl] ld a, [wcd4a] @@ -5646,9 +5646,9 @@ Function10278c: ld [wcd4a], a Function1027a0: hlcoord 1, 16 - ld [hl], " " + ld [hl], ' ' hlcoord 11, 16 - ld [hl], "▶" + ld [hl], '▶' ld hl, wcd4b set 2, [hl] ld a, [wcd4a] @@ -6437,7 +6437,7 @@ Function102d48: ret Function102d9a: - ld a, " " + ld a, ' ' hlcoord 0, 0 ld bc, SCREEN_AREA call ByteFill diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index 10e5850e4..64b6366cb 100644 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -684,13 +684,13 @@ endr jr .done .create_digit - ld a, "0" + ld a, '0' add c ld [hl], a .done call .Function1062ff - ld a, "0" + ld a, '0' add b ld [hli], a pop de @@ -1017,15 +1017,15 @@ Stubbed_Function106462: Function106464:: ld de, FontsExtra_SolidBlackGFX - ld hl, vTiles2 tile "■" ; $60 + ld hl, vTiles2 tile '■' ; $60 lb bc, BANK(FontsExtra_SolidBlackGFX), 1 call Get2bpp ld de, FontsExtra2_UpArrowGFX - ld hl, vTiles2 tile "▲" ; $61 + ld hl, vTiles2 tile '▲' ; $61 lb bc, BANK(FontsExtra2_UpArrowGFX), 1 call Get2bpp ld de, MobileDialingFrameGFX - ld hl, vTiles2 tile "☎" ; $62 + ld hl, vTiles2 tile '☎' ; $62 ld c, 9 ld b, BANK(MobileDialingFrameGFX) call Get2bpp @@ -1044,11 +1044,11 @@ Function10649b: ; unreferenced call AddNTimes ld d, h ld e, l - ld hl, vTiles2 tile "┌" ; $79 - ld c, TEXTBOX_FRAME_TILES ; "┌" to "┘" + ld hl, vTiles2 tile '┌' ; $79 + ld c, TEXTBOX_FRAME_TILES ; '┌' to '┘' ld b, BANK(Frames) call Function1064c3 - ld hl, vTiles2 tile " " ; $7f + ld hl, vTiles2 tile ' ' ; $7f ld de, TextboxSpaceGFX ld c, 1 ld b, BANK(TextboxSpaceGFX) diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 33bf544c3..e32b2e7a2 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -505,7 +505,7 @@ MobileTradeAnim_ShowPlayerMonToBeSent: call PlaySFX hlcoord 0, 0 ld bc, 12 * SCREEN_WIDTH - ld a, " " + ld a, ' ' call ByteFill ld c, 80 call WaitMobileTradeSpriteAnims @@ -638,7 +638,7 @@ MobileTradeAnim_ShowPlayerMonForGTS: call PlaySFX hlcoord 0, 0 ld bc, 12 * SCREEN_WIDTH - ld a, " " + ld a, ' ' call ByteFill ld c, 80 call WaitMobileTradeSpriteAnims @@ -1357,7 +1357,7 @@ MobileTradeAnim_MonDisplay_PrintIDNumber: MobileTradeAnim_ClearTilemap: hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' call ByteFill ret diff --git a/mobile/mobile_45_stadium.asm b/mobile/mobile_45_stadium.asm index 8a8110ec6..eff6cd497 100644 --- a/mobile/mobile_45_stadium.asm +++ b/mobile/mobile_45_stadium.asm @@ -330,7 +330,7 @@ Function1178aa: ld de, YessNoString_1179c5 call PlaceString hlcoord 15, 10 - ld a, "▶" + ld a, '▶' ld [hl], a hlcoord 1, 14 ld de, AskSavePasswordString @@ -355,10 +355,10 @@ Function1178e8: dec a ld [wcd4e], a hlcoord 15, 8 - ld a, "▶" + ld a, '▶' ld [hl], a hlcoord 15, 10 - ld a, " " + ld a, ' ' ld [hl], a ret @@ -369,10 +369,10 @@ Function1178e8: inc a ld [wcd4e], a hlcoord 15, 8 - ld a, " " + ld a, ' ' ld [hl], a hlcoord 15, 10 - ld a, "▶" + ld a, '▶' ld [hl], a ret @@ -585,7 +585,7 @@ Function117b31: ld de, YesNo117ccc call PlaceString hlcoord 15, 8 - ld a, "▶" + ld a, '▶' ld [hl], a jp MobileStudium_JumptableIncrement @@ -605,10 +605,10 @@ Function117b4f: dec a ld [wcf64], a hlcoord 15, 8 - ld a, "▶" + ld a, '▶' ld [hl], a hlcoord 15, 10 - ld a, " " + ld a, ' ' ld [hl], a ret @@ -619,10 +619,10 @@ Function117b4f: inc a ld [wcf64], a hlcoord 15, 8 - ld a, " " + ld a, ' ' ld [hl], a hlcoord 15, 10 - ld a, "▶" + ld a, '▶' ld [hl], a ret diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index af7a903f3..9e3cb19cd 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -3718,26 +3718,26 @@ Function119b6b: pushc ascii .decodeBase64Character - cp "+" + cp '+' jr c, .asm_119c68 jr z, .asm_119c80 - cp "/" + cp '/' jr c, .asm_119c68 jr z, .asm_119c84 - cp "0" + cp '0' jr c, .asm_119c68 - cp "9" + 1 + cp '9' + 1 jr c, .asm_119c88 - cp "=" + cp '=' jr c, .asm_119c68 jr z, .asm_119c8c - cp "A" + cp 'A' jr c, .asm_119c68 - cp "Z" + 1 + cp 'Z' + 1 jr c, .asm_119c8f - cp "a" + cp 'a' jr c, .asm_119c68 - cp "z" + 1 + cp 'z' + 1 jr c, .asm_119c93 popc @@ -4034,7 +4034,7 @@ Function119e4f: ld a, [de] inc de pushc ascii - cp "\n" + cp '\n' popc jr z, .newline cp [hl] @@ -4061,7 +4061,7 @@ popc ld [de], a inc de pushc ascii - cp "\r" + cp '\r' popc jr z, .finish dec c @@ -6060,18 +6060,18 @@ Function11b03d: ld c, $1 .loop ld a, [hli] - cp "♂" + cp '♂' jr z, .gender - cp "♀" + cp '♀' jr z, .gender - cp "@" + cp '@' jr z, .done inc c jr .loop .gender dec hl - ld a, "@" + ld a, '@' ld [hli], a .done @@ -7314,7 +7314,7 @@ Function11b7e5: ld de, wOTTrademonOTName ld bc, 5 call CopyBytes - ld a, "@" + ld a, '@' ld [de], a ld a, [wMobileMonID] ld [wOTTrademonID], a @@ -7564,7 +7564,7 @@ AddMobileMonToParty: ld h, a ld bc, MON_NAME_LENGTH - 1 call CopyBytes - ld a, "@" + ld a, '@' ld [de], a ld hl, wPartyMonNicknames @@ -7583,7 +7583,7 @@ AddMobileMonToParty: ld h, a ld bc, MON_NAME_LENGTH - 1 call CopyBytes - ld a, "@" + ld a, '@' ld [de], a ld hl, sPartyMail diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index b5bad5a80..0690ec7ce 100644 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -5,13 +5,13 @@ Function170000: ld de, wPlayerTrademonSenderName ld bc, NAME_LENGTH_JAPANESE - 1 call CopyBytes - ld a, "@" + ld a, '@' ld [de], a ld hl, wOfferMonOT ld de, wPlayerTrademonOTName ld bc, NAME_LENGTH_JAPANESE - 1 call CopyBytes - ld a, "@" + ld a, '@' ld [de], a ld hl, wOfferMonDVs ld a, [hli] @@ -44,13 +44,13 @@ Function17005a: ld de, wOTTrademonSenderName ld bc, NAME_LENGTH_JAPANESE - 1 call CopyBytes - ld a, "@" + ld a, '@' ld [de], a ld hl, sOfferMonOT ld de, wOTTrademonOTName ld bc, NAME_LENGTH_JAPANESE - 1 call CopyBytes - ld a, "@" + ld a, '@' ld [de], a ld hl, sOfferMonDVs ld a, [hli] diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index f48ca3f10..a06d42a28 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -182,29 +182,29 @@ CheckStringForErrors: jr z, .NextChar cp FIRST_REGULAR_TEXT_CHAR jr nc, .NextChar - cp "" + cp '' jr z, .NextChar - cp "@" + cp '@' jr z, .Done - cp "ガ" + cp 'ガ' jr c, .Fail - cp "" + cp '' jr c, .NextChar - cp "" + 1 + cp '' + 1 jr c, .Fail - cp "" + cp '' jr c, .NextChar - cp "" + 1 + cp '' + 1 jr c, .Fail - cp "" + cp '' jr c, .NextChar - cp "" + 1 + cp '' + 1 jr c, .Fail - cp "" + cp '' jr c, .NextChar - cp "" + 1 + cp '' + 1 jr c, .Fail - cp "" + cp '' jr c, .NextChar .Fail: @@ -226,32 +226,32 @@ CheckStringForErrors_IgnoreTerminator: inc de and a jr z, .next - cp "" + 1 + cp '' + 1 jr nc, .next - cp "" + cp '' jr z, .next - cp "@" + cp '@' jr z, .next - cp "ガ" + cp 'ガ' jr c, .end - cp "" + cp '' jr c, .next - cp "" + 1 + cp '' + 1 jr c, .end - cp "" + cp '' jr c, .next - cp "" + 1 + cp '' + 1 jr c, .end - cp "" + cp '' jr c, .next - cp "" + 1 + cp '' + 1 jr c, .end - cp "" + cp '' jr c, .next - cp "" + 1 + cp '' + 1 jr c, .end - cp "" + cp '' jr c, .next .end @@ -274,7 +274,7 @@ Function17d0f3: ld de, wOTTrademonOTName ld bc, NAME_LENGTH_JAPANESE - 1 call CopyBytes - ld a, "@" + ld a, '@' ld [de], a ld a, [wMobileMonID] ld [wOTTrademonID], a @@ -343,7 +343,7 @@ Mobile_CopyDefaultNickname: dname "？？？？？", NAME_LENGTH_JAPANESE - 1 Mobile_CopyDefaultMail: - ld a, "@" + ld a, '@' ld hl, wMobileMonMail ld bc, MAIL_MSG_LENGTH + 1 call ByteFill @@ -358,7 +358,7 @@ Mobile_CopyDefaultMail: .DefaultMessageEnd: Mobile_CopyDefaultMailAuthor: - ld a, "@" + ld a, '@' ld de, wMobileMonMailAuthor ld bc, NAME_LENGTH_JAPANESE - 1 call ByteFill @@ -372,7 +372,7 @@ CheckStringContainsLessThanBNextCharacters: .loop ld a, [de] inc de - cp "" + cp '' jr nz, .next_char dec b jr z, .done @@ -3552,7 +3552,7 @@ RunMobileScript:: _RunMobileScript: ld a, [de] inc de - cp "@" + cp '@' jr z, .finished cp $10 ; jumptable size jr nc, .finished @@ -3607,7 +3607,7 @@ Function17f081: ld b, 0 add hl, bc ld a, [de] - cp "@" + cp '@' jr z, .asm_17f09d and a ret @@ -3692,7 +3692,7 @@ Function17f0f8: ld b, 0 add hl, bc ld a, [de] - cp "@" + cp '@' jr z, .asm_17f112 and a ret @@ -3720,7 +3720,7 @@ Function17f0f8: ld c, a ld b, 0 call CopyBytes - ld a, "@" + ld a, '@' ld [de], a pop hl ld de, wc608 @@ -3744,7 +3744,7 @@ Function17f154: ld e, l ld d, h ld a, [de] - cp "@" + cp '@' jr z, .asm_17f165 and a ret @@ -3789,7 +3789,7 @@ Function17f181: ld b, 0 add hl, bc ld a, [de] - cp "@" + cp '@' jr z, .asm_17f19b and a ret @@ -3843,7 +3843,7 @@ Function17f1d0: ld b, 0 add hl, bc ld a, [de] - cp "@" + cp '@' jr z, .asm_17f1ea and a ret @@ -3899,7 +3899,7 @@ Function17f220: ld b, 0 add hl, bc ld a, [de] - cp "@" + cp '@' jr z, .asm_17f23a and a ret @@ -3962,7 +3962,7 @@ Function17f27b: ld b, 0 add hl, bc ld a, [de] - cp "@" + cp '@' jr z, .asm_17f295 and a ret @@ -4270,7 +4270,7 @@ Function17f44f: ld b, 0 add hl, bc ld a, [de] - cp "@" + cp '@' jr z, .asm_17f46b and a ret @@ -4525,7 +4525,7 @@ Function17f5e4: ld [wMusicFadeID], a ld a, d ld [wMusicFadeID + 1], a - ld a, " " + ld a, ' ' hlcoord 0, 0 ld bc, SCREEN_AREA call ByteFill @@ -4668,7 +4668,7 @@ Function17f6b7: and $f .bcd_digit - add "0" + add '0' ld [hli], a ret diff --git a/mobile/mobile_menu.asm b/mobile/mobile_menu.asm index e85f0bece..bbcc70c0f 100644 --- a/mobile/mobile_menu.asm +++ b/mobile/mobile_menu.asm @@ -368,7 +368,7 @@ Strings_4a23d: Function4a28a: hlcoord 2, 3 lb bc, 6, 1 - ld a, " " + ld a, ' ' call Function4a6d8 call PlaceHollowCursor call WaitBGMap @@ -528,7 +528,7 @@ Function4a3aa: ld a, $3 call Function4a6d8 lb bc, 1, 1 - ld a, " " + ld a, ' ' call Function4a6d8 hlcoord 1, 0 ld a, $1 @@ -544,7 +544,7 @@ Function4a3aa: ld a, $2 call Function4a6d8 lb bc, 11, 18 - ld a, " " + ld a, ' ' call Function4a6d8 hlcoord 19, 0 lb bc, 3, 1 @@ -566,7 +566,7 @@ Function4a3aa: ld a, $3 call Function4a6d8 lb bc, 1, 1 - ld a, " " + ld a, ' ' call Function4a6d8 ret @@ -591,7 +591,7 @@ Function4a449: ; unreferenced ld a, $3 call ByteFill ld bc, SCREEN_WIDTH - ld a, " " + ld a, ' ' call ByteFill ret diff --git a/rgbdscheck.asm b/rgbdscheck.asm index 165fabbd7..5a0984901 100644 --- a/rgbdscheck.asm +++ b/rgbdscheck.asm @@ -1,6 +1,6 @@ -IF !DEF(__RGBDS_MAJOR__) || !DEF(__RGBDS_MINOR__) || !DEF(__RGBDS_PATCH__) - fail "pokecrystal requires rgbds v0.9.3 or newer." +IF !DEF(__RGBDS_MAJOR__) + fail "pokecrystal requires rgbds v1.0.0 or newer." ENDC -IF __RGBDS_MAJOR__ == 0 && (__RGBDS_MINOR__ < 9 || (__RGBDS_MINOR__ == 9 && __RGBDS_PATCH__ < 3)) - fail "pokecrystal requires rgbds v0.9.3 or newer." +IF __RGBDS_MAJOR__ < 1 + fail "pokecrystal requires rgbds v1.0.0 or newer." ENDC diff --git a/tools/unnamed.py b/tools/unnamed.py index d424eb9cd..206b13086 100755 --- a/tools/unnamed.py +++ b/tools/unnamed.py @@ -90,19 +90,19 @@ for objfile in objects: elif magic == b'RGB9': obj_ver = 10 + unpack_from('