mirror of
https://github.com/pret/pokecrystal.git
synced 2026-03-21 17:45:29 -05:00
Use features of RGBDS 1.0.0 (#1204)
Some checks are pending
CI / build (push) Waiting to run
Some checks are pending
CI / build (push) Waiting to run
- Use single-quoted character literals or `CHARVAL` when you need
a character's numeric value; using strings as numbers is deprecated
- Use `?` to silence a node in warning/error location backtraces
- Use `===` and `!==` instead of `STRCMP`, and `++` instead of `STRCAT`
- Use `__SCOPE__` instead of checking for `..` and `.` separately
- Use `#string` instead of `"{string}"`
- All programs (rgbasm, rgblink, rgbfix, rgbgfx) support `-W` warnings
- `rgbgfx --colors dmg` is short for `rgbgfx --colors dmg=e4`
This commit is contained in:
parent
b91ba4fe9b
commit
a55bc33d67
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
0.9.3
|
||||
1.0.0
|
||||
|
|
|
|||
6
FAQ.md
6
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`
|
||||
|
||||
|
|
|
|||
22
INSTALL.md
22
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
|
||||
```
|
||||
|
|
|
|||
70
Makefile
70
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))
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -4605,7 +4605,7 @@ BattleCommand_StatDownFailText:
|
|||
|
||||
GetStatName:
|
||||
ld hl, StatNames
|
||||
ld c, "@"
|
||||
ld c, '@'
|
||||
.CheckName:
|
||||
dec b
|
||||
jr z, .Copy
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ GetGen1TrainerClassName: ; unreferenced
|
|||
ld a, [hli]
|
||||
ld [de], a
|
||||
inc de
|
||||
cp "@"
|
||||
cp '@'
|
||||
jr nz, .copy
|
||||
ret
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ ReadTrainerParty:
|
|||
|
||||
.skip_name
|
||||
ld a, [hli]
|
||||
cp "@"
|
||||
cp '@'
|
||||
jr nz, .skip_name
|
||||
|
||||
ld a, [hli]
|
||||
|
|
|
|||
|
|
@ -246,9 +246,9 @@ _ShowLinkBattleParticipants:
|
|||
ld de, wOTPlayerName
|
||||
call PlaceString
|
||||
hlcoord 9, 8
|
||||
ld a, "<BOLD_V>"
|
||||
ld a, '<BOLD_V>'
|
||||
ld [hli], a
|
||||
ld [hl], "<BOLD_S>"
|
||||
ld [hl], '<BOLD_S>'
|
||||
farcall LinkBattle_TrainerHuds ; no need to farcall
|
||||
ld b, SCGB_DIPLOMA
|
||||
call GetSGBLayout
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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], "<DOT>"
|
||||
ld [hl], '<DOT>'
|
||||
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, "<ID>"
|
||||
ld a, '<ID>'
|
||||
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, "<ID>"
|
||||
ld a, '<ID>'
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -161,9 +161,9 @@ PlaceMapNameCenterAlign:
|
|||
ld hl, wStringBuffer1
|
||||
.loop
|
||||
ld a, [hli]
|
||||
cp "@"
|
||||
cp '@'
|
||||
jr z, .stop
|
||||
cp "<WBR>"
|
||||
cp '<WBR>'
|
||||
jr z, .loop
|
||||
inc c
|
||||
jr .loop
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ Rate:
|
|||
|
||||
.UpdateRatingBuffer:
|
||||
push hl
|
||||
ld a, "@"
|
||||
ld a, '@'
|
||||
ld bc, ITEM_NAME_LENGTH
|
||||
call ByteFill
|
||||
pop hl
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ ReturnShuckie:
|
|||
ld a, [de]
|
||||
cp [hl]
|
||||
jr nz, .DontReturn
|
||||
cp "@"
|
||||
cp '@'
|
||||
jr z, .done
|
||||
inc de
|
||||
inc hl
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -406,7 +406,7 @@ _LoadHDMAParameters:
|
|||
ret
|
||||
|
||||
PadTilemapForHDMATransfer:
|
||||
ld c, " "
|
||||
ld c, ' '
|
||||
jr PadMapForHDMATransfer
|
||||
|
||||
PadAttrmapForHDMATransfer:
|
||||
|
|
|
|||
|
|
@ -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 ; "<BOLD_D>"
|
||||
ld hl, vTiles2 tile "<BOLD_D>"
|
||||
lb bc, BANK(FontExtra), 22 ; "<BOLD_D>" to "ぉ"
|
||||
ld de, FontExtra + 3 tiles ; '<BOLD_D>'
|
||||
ld hl, vTiles2 tile '<BOLD_D>'
|
||||
lb bc, BANK(FontExtra), 22 ; '<BOLD_D>' 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 ; "<DO>"
|
||||
lb bc, BANK(FontBattleExtra), 3 ; "<DO>" to "『"
|
||||
ld de, FontBattleExtra + 16 tiles ; '<DO>'
|
||||
lb bc, BANK(FontBattleExtra), 3 ; '<DO>' to '『'
|
||||
call Get2bppViaHDMA
|
||||
call LoadFrame
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -1426,7 +1426,7 @@ Pack_GetItemName:
|
|||
Pack_ClearTilemap: ; unreferenced
|
||||
hlcoord 0, 0
|
||||
ld bc, SCREEN_AREA
|
||||
ld a, " "
|
||||
ld a, ' '
|
||||
call ByteFill
|
||||
ret
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ LinkTextbox2:
|
|||
push hl
|
||||
ld a, $79
|
||||
ld [hli], a
|
||||
ld a, " "
|
||||
ld a, ' '
|
||||
call .PlaceRow
|
||||
ld [hl], $7a
|
||||
pop hl
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ _LinkTextbox:
|
|||
push hl
|
||||
ld a, $33
|
||||
ld [hli], a
|
||||
ld a, " "
|
||||
ld a, ' '
|
||||
call .PlaceRow
|
||||
ld [hl], $34
|
||||
pop hl
|
||||
|
|
|
|||
|
|
@ -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], "<DOT>"
|
||||
ld [hl], '<DOT>'
|
||||
|
||||
.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], "<DOT>"
|
||||
ld [hl], '<DOT>'
|
||||
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:
|
||||
|
|
|
|||
|
|
@ -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], "<COLON>"
|
||||
ld [hl], '<COLON>'
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
DEF NAMINGSCREEN_CURSOR EQU $7e
|
||||
|
||||
DEF NAMINGSCREEN_BORDER EQU "■" ; $60
|
||||
DEF NAMINGSCREEN_MIDDLELINE EQU "→" ; $eb
|
||||
DEF NAMINGSCREEN_UNDERLINE EQU "<DOT>" ; $f2
|
||||
DEF NAMINGSCREEN_BORDER EQU '■' ; $60
|
||||
DEF NAMINGSCREEN_MIDDLELINE EQU '→' ; $eb
|
||||
DEF NAMINGSCREEN_UNDERLINE EQU '<DOT>' ; $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], "<NEXT>"
|
||||
ld [hl], '<NEXT>'
|
||||
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], "<NEXT>"
|
||||
ld [hl], '<NEXT>'
|
||||
ret
|
||||
|
||||
.start
|
||||
|
|
@ -1130,7 +1130,7 @@ INCBIN "gfx/naming_screen/mail.2bpp"
|
|||
call NamingScreen_GetTextCursorPosition
|
||||
ld [hl], NAMINGSCREEN_UNDERLINE
|
||||
inc hl
|
||||
ld [hl], "<NEXT>"
|
||||
ld [hl], '<NEXT>'
|
||||
ret
|
||||
|
||||
.finished
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1676,7 +1676,7 @@ Script_getnum:
|
|||
ResetStringBuffer1:
|
||||
ld hl, wStringBuffer1
|
||||
ld bc, NAME_LENGTH
|
||||
ld a, "@"
|
||||
ld a, '@'
|
||||
call ByteFill
|
||||
ret
|
||||
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@ LoadMapTimeOfDay:
|
|||
pop af
|
||||
ldh [rVBK], a
|
||||
|
||||
ld a, "■"
|
||||
ld a, '■'
|
||||
ld bc, vBGMap1 - vBGMap0
|
||||
hlbgcoord 0, 0
|
||||
call ByteFill
|
||||
|
|
|
|||
|
|
@ -908,7 +908,7 @@ RandomPhoneMon:
|
|||
ld a, BANK(Trainers)
|
||||
call GetFarByte
|
||||
inc hl
|
||||
cp "@"
|
||||
cp '@'
|
||||
jr nz, .skip_name
|
||||
|
||||
ld a, BANK(Trainers)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ UpdateUnownDex:
|
|||
PrintUnownWord:
|
||||
hlcoord 4, 15
|
||||
ld bc, 12
|
||||
ld a, " "
|
||||
ld a, ' '
|
||||
call ByteFill
|
||||
ld a, [wDexCurUnownIndex]
|
||||
ld e, a
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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], "<DONE>"
|
||||
ld [hl], '<DONE>'
|
||||
ld hl, wPokedexShowPointerAddr
|
||||
call CopyRadioTextToRAM
|
||||
pop hl
|
||||
|
|
@ -755,7 +755,7 @@ CopyDexEntry:
|
|||
push hl
|
||||
call CopyDexEntryPart1
|
||||
dec hl
|
||||
ld [hl], "<DONE>"
|
||||
ld [hl], '<DONE>'
|
||||
ld hl, wPokedexShowPointerAddr
|
||||
call CopyRadioTextToRAM
|
||||
pop hl
|
||||
|
|
@ -770,15 +770,15 @@ CopyDexEntryPart1:
|
|||
ld hl, wPokedexShowPointerAddr
|
||||
ld [hl], TX_START
|
||||
inc hl
|
||||
ld [hl], "<LINE>"
|
||||
ld [hl], '<LINE>'
|
||||
inc hl
|
||||
.loop
|
||||
ld a, [hli]
|
||||
cp "@"
|
||||
cp '@'
|
||||
ret z
|
||||
cp "<NEXT>"
|
||||
cp '<NEXT>'
|
||||
ret z
|
||||
cp "<DEXEND>"
|
||||
cp '<DEXEND>'
|
||||
ret z
|
||||
jr .loop
|
||||
|
||||
|
|
@ -788,11 +788,11 @@ CopyDexEntryPart2:
|
|||
ld a, d
|
||||
call GetFarByte
|
||||
inc hl
|
||||
cp "@"
|
||||
cp '@'
|
||||
jr z, .okay
|
||||
cp "<NEXT>"
|
||||
cp '<NEXT>'
|
||||
jr z, .okay
|
||||
cp "<DEXEND>"
|
||||
cp '<DEXEND>'
|
||||
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
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@ TownMap_ConvertLineBreakCharacters:
|
|||
ld hl, wStringBuffer1
|
||||
.loop
|
||||
ld a, [hl]
|
||||
cp "@"
|
||||
cp '@'
|
||||
jr z, .end
|
||||
cp "<WBR>"
|
||||
cp '<WBR>'
|
||||
jr z, .line_feed
|
||||
cp "<BSP>"
|
||||
cp '<BSP>'
|
||||
jr z, .line_feed
|
||||
inc hl
|
||||
jr .loop
|
||||
|
||||
.line_feed
|
||||
ld [hl], "<LF>"
|
||||
ld [hl], '<LF>'
|
||||
|
||||
.end
|
||||
ld de, wStringBuffer1
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 "<NULL>", "ガ"
|
||||
db "<PLAY_G>", "<JP_18>" + 1
|
||||
db "<NI>", "<NO>" + 1
|
||||
db "<ROUTE>", "<GREEN>" + 1
|
||||
db "<ENEMY>", "<ENEMY>" + 1
|
||||
db "<MOM>", "<TM>" + 1
|
||||
db "<ROCKET>", "┘" + 1
|
||||
db '<NULL>', 'ガ'
|
||||
db '<PLAY_G>', '<JP_18>' + 1
|
||||
db '<NI>', '<NO>' + 1
|
||||
db '<ROUTE>', '<GREEN>' + 1
|
||||
db '<ENEMY>', '<ENEMY>' + 1
|
||||
db '<MOM>', '<TM>' + 1
|
||||
db '<ROCKET>', '┘' + 1
|
||||
db -1 ; end
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -360,7 +360,7 @@ UpdateSpeciesNameIfNotNicknamed:
|
|||
cp [hl]
|
||||
inc hl
|
||||
ret nz
|
||||
cp "@"
|
||||
cp '@'
|
||||
jr nz, .loop
|
||||
|
||||
ld a, [wCurPartyMon]
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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, "<LV>"
|
||||
ld a, '<LV>'
|
||||
ld [hli], a
|
||||
lb bc, PRINTNUM_LEFTALIGN | 1, 2
|
||||
; jr .okay
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 "<LV>"
|
||||
ld hl, vTiles2 tile '<LV>'
|
||||
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:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@ CopyName2::
|
|||
ld a, [de]
|
||||
inc de
|
||||
ld [hli], a
|
||||
cp "@"
|
||||
cp '@'
|
||||
jr nz, .loop
|
||||
ret
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user