diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-05-16 22:14:21 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-05-16 22:14:21 -0400 |
| commit | ed94962edf1668aba3f60938e8a5ba8040e2a59c (patch) | |
| tree | 1b6c7de331cb983256651b11b8adf413a3a434f1 | |
| parent | 05b591cd95f3fd62e84b33eb56d25f197b17a96c (diff) | |
Couple quick fixes so nothing dangerous/shameful gets merged in.
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | engine/menus/naming_screen.asm | 8 |
2 files changed, 4 insertions, 9 deletions
@@ -52,13 +52,8 @@ all: $(roms) gold: pokegold.gbc silver: pokesilver.gbc -tidy: - rm -f $(roms) $(gold_obj) $(silver_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rgbdscheck.o - $(MAKE) clean -C tools/ - clean: rm -f $(roms) $(gold_obj) $(silver_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rgbdscheck.o - find gfx \( -iname "*.png" -not -iname "big_onix.png" -not -iname "slots_3.png" \) -delete $(MAKE) clean -C tools/ compare: $(roms) diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 02d20b29..34e2c6f2 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -649,10 +649,10 @@ NamingScreen_AnimateCursor: NamingScreen_TryAddCharacter: ld a, [wNamingScreenLastCharacter] ld hl, Dakutens - cp $e5 + cp "ﾞ" ; $e5 jr z, asm_11f06 ld hl, Handakutens - cp $e4 + cp "ﾟ" ; $e4 jr z, asm_11f06 MailComposition_TryAddCharacter: @@ -1334,10 +1334,10 @@ ComposeMail_GetCursorPosition: MailComposition_TryAddLastCharacter: ld a, [wNamingScreenLastCharacter] ld hl, Dakutens - cp $e5 + cp "ﾞ" ; $e5 jr z, .asm_1258b ld hl, Handakutens - cp $e4 + cp "ﾟ" ; $e4 jp nz, MailComposition_TryAddCharacter .asm_1258b |