Merge branch 'master' of https://github.com/pret/pokered

10 files changed, 56 insertions, 56 deletions

diff --git a/engine/menus/link_menu.asm b/engine/menus/link_menu.asm
index dcb609e2..e1a60161 100644
--- a/engine/menus/link_menu.asm
+++ b/engine/menus/link_menu.asm
@@ -109,10 +109,10 @@ Func_f531b::
 	call Serial_SendZeroByte
 	dec b
 	jr nz, .loop
-	ld b, " "
-	ld c, " "
-	ld d, " "
-	ld e, "▷"
+	ld b, ' '
+	ld c, ' '
+	ld d, ' '
+	ld e, '▷'
 	ld a, [wLinkMenuSelectionSendBuffer]
 	bit 3, a
 	jr nz, .asm_f541a
@@ -358,7 +358,7 @@ PetitCup::
 	ld hl, wNameBuffer
 .loop2
 	ld a, [hli]
-	cp "@"
+	cp '@'
 	jr nz, .loop2
 	ld a, [hli]
 	cp $7
@@ -736,10 +736,10 @@ LinkMenu:
 	ld a, SC_START | SC_INTERNAL
 	ldh [rSC], a
 .skipStartingTransfer
-	ld b, " "
-	ld c, " "
-	ld d, " "
-	ld e, "▷"
+	ld b, ' '
+	ld c, ' '
+	ld d, ' '
+	ld e, '▷'
 	ld a, [wLinkMenuSelectionSendBuffer]
 	and PAD_B << 2 ; was B button pressed?
 	jr nz, .updateCursorPosition
@@ -811,10 +811,10 @@ LinkMenu:
 	ld a, [wNamedObjectIndex]
 	and a
 	jr nz, .asm_f5974
-	ld b, " "
-	ld c, " "
-	ld d, "▷"
-	ld e, " "
+	ld b, ' '
+	ld c, ' '
+	ld d, '▷'
+	ld e, ' '
 	call Func_f59ec
 .asm_f5974
 	xor a
@@ -856,10 +856,10 @@ LinkMenu:
 	ld a, [wNamedObjectIndex]
 	and a
 	jr z, .asm_f59cd
-	ld b, " "
-	ld c, " "
-	ld d, " "
-	ld e, "▷"
+	ld b, ' '
+	ld c, ' '
+	ld d, ' '
+	ld e, '▷'
 	call Func_f59ec
 	jp .choseCancel
 
@@ -869,10 +869,10 @@ LinkMenu:
 	jp .choseCancel
 
 .asm_f59d6
-	ld b, " "
-	ld c, " "
-	ld d, "▷"
-	ld e, " "
+	ld b, ' '
+	ld c, ' '
+	ld d, '▷'
+	ld e, ' '
 	call Func_f59ec
 	call Func_f531b
 	jp c, .choseCancel
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index 262250a3..d0e1cc1b 100644
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -284,7 +284,7 @@ CheckForPlayerNameInSRAM:
 	ld hl, sPlayerName
 .loop
 	ld a, [hli]
-	cp "@"
+	cp '@'
 	jr z, .found
 	dec b
 	jr nz, .loop
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index 815fa54f..38da8afe 100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -39,7 +39,7 @@ AskName:
 	pop af
 	ld [wUpdateSpritesEnabled], a
 	ld a, [wStringBuffer]
-	cp "@"
+	cp '@'
 	ret nz
 .declinedNickname
 	ld d, h
@@ -63,7 +63,7 @@ DisplayNameRaterScreen::
 	call RestoreScreenTilesAndReloadTilePatterns
 	call LoadGBPal
 	ld a, [wStringBuffer]
-	cp "@"
+	cp '@'
 	jr z, .playerCancelled
 	ld hl, wPartyMonNicks
 	ld bc, NAME_LENGTH
@@ -106,7 +106,7 @@ DisplayNamingScreen:
 	ld [wMenuWatchedKeys], a
 	ld a, 7
 	ld [wMaxMenuItem], a
-	ld a, "@"
+	ld a, '@'
 	ld [wStringBuffer], a
 	xor a
 	ld hl, wNamingScreenSubmitName
@@ -229,10 +229,10 @@ DisplayNamingScreen:
 	ld [wNamingScreenLetter], a
 	call CalcStringLength
 	ld a, [wNamingScreenLetter]
-	cp "ﾞ"
+	cp 'ﾞ'
 	ld de, Dakutens
 	jr z, .dakutensAndHandakutens
-	cp "ﾟ"
+	cp 'ﾟ'
 	ld de, Handakutens
 	jr z, .dakutensAndHandakutens
 	ld a, [wNamingScreenType]
@@ -257,7 +257,7 @@ DisplayNamingScreen:
 .addLetter
 	ld a, [wNamingScreenLetter]
 	ld [hli], a
-	ld [hl], "@"
+	ld [hl], '@'
 	ld a, SFX_PRESS_AB
 	call PlaySound
 	ret
@@ -267,7 +267,7 @@ DisplayNamingScreen:
 	ret z
 	call CalcStringLength
 	dec hl
-	ld [hl], "@"
+	ld [hl], '@'
 	ret
 .pressedRight
 	ld a, [wCurrentMenuItem]
@@ -457,7 +457,7 @@ CalcStringLength:
 	ld c, $0
 .loop
 	ld a, [hl]
-	cp "@"
+	cp '@'
 	ret z
 	inc hl
 	inc c
@@ -483,7 +483,7 @@ PrintNamingText:
 	call PlaceString
 	ld hl, $1
 	add hl, bc
-	ld [hl], "の" ; leftover from Japanese version; blank tile $c9 in English
+	ld [hl], 'の' ; leftover from Japanese version; blank tile $c9 in English
 	hlcoord 1, 3
 	ld de, NicknameTextString
 	jr .placeString
diff --git a/engine/menus/options.asm b/engine/menus/options.asm
index 73a41e1c..8505cfac 100644
--- a/engine/menus/options.asm
+++ b/engine/menus/options.asm
@@ -433,7 +433,7 @@ OptionsMenu_UpdateCursorPosition:
 	ld de, SCREEN_WIDTH
 	ld c, 16
 .loop
-	ld [hl], " "
+	ld [hl], ' '
 	add hl, de
 	dec c
 	jr nz, .loop
@@ -441,7 +441,7 @@ OptionsMenu_UpdateCursorPosition:
 	ld bc, SCREEN_WIDTH * 2
 	ld a, [wOptionsCursorLocation]
 	call AddNTimes
-	ld [hl], "▶"
+	ld [hl], '▶'
 	ret
 
 InitOptionsMenu:
diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm
index 493f2e98..d994c15f 100644
--- a/engine/menus/party_menu.asm
+++ b/engine/menus/party_menu.asm
@@ -59,7 +59,7 @@ RedrawPartyMenu_::
 	dec hl
 	dec hl
 	dec hl
-	ld a, "▷" ; unfilled right arrow menu cursor
+	ld a, '▷' ; unfilled right arrow menu cursor
 	ld [hli], a ; place the cursor
 	inc hl
 	inc hl
@@ -139,7 +139,7 @@ RedrawPartyMenu_::
 	ld l, a
 	ld de, wEvoDataBuffer
 	ld a, BANK(EvosMovesPointerTable)
-	ld bc, 4 * 3 + 1 ; enough for Eevee's three 4-byte evolutions and 0 terminator
+	ld bc, wEvoDataBufferEnd - wEvoDataBuffer
 	call FarCopyData
 	ld hl, wEvoDataBuffer
 	ld de, .notAbleToEvolveText
diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm
index 07b24392..48c5ab01 100644
--- a/engine/menus/pokedex.asm
+++ b/engine/menus/pokedex.asm
@@ -136,7 +136,7 @@ ENDC
 	push bc
 	hlcoord 0, 3
 	ld de, 20
-	lb bc, " ", 13
+	lb bc, ' ', 13
 	call DrawTileLine ; cover up the menu cursor in the pokemon list
 	pop bc
 	ret
@@ -145,7 +145,7 @@ ENDC
 	push bc
 	hlcoord 15, 8
 	ld de, 20
-	lb bc, " ", 9
+	lb bc, ' ', 9
 	call DrawTileLine ; cover up the menu cursor in the side menu
 	pop bc
 	jr .exitSideMenu
@@ -266,7 +266,7 @@ Pokedex_DrawInterface:
 	ldh [hAutoBGTransferEnabled], a
 ; draw the horizontal line separating the seen and owned amounts from the menu
 	hlcoord 15, 6
-	ld a, "─"
+	ld a, '─'
 	ld [hli], a
 	ld [hli], a
 	ld [hli], a
@@ -388,7 +388,7 @@ Pokedex_PlacePokemonList:
 	ld hl, wPokedexOwned
 	call IsPokemonBitSet
 	pop hl
-	ld a, " "
+	ld a, ' '
 	jr z, .writeTile
 	ld a, $72 ; pokeball tile
 .writeTile
@@ -558,9 +558,9 @@ DrawDexEntryOnScreen:
 	call IndexToPokedex
 
 	hlcoord 2, 8
-	ld a, "№"
+	ld a, '№'
 	ld [hli], a
-	ld a, "<DOT>"
+	ld a, '<DOT>'
 	ld [hli], a
 	ld de, wPokedexNum
 	lb bc, LEADING_ZEROES | 1, 3
@@ -601,14 +601,14 @@ DrawDexEntryOnScreen:
 	hlcoord 12, 6
 	lb bc, 1, 2
 	call PrintNumber ; print feet (height)
-	ld a, "′"
+	ld a, '′'
 	ld [hl], a
 	inc de
 	inc de ; de = address of inches (height)
 	hlcoord 15, 6
 	lb bc, LEADING_ZEROES | 1, 2
 	call PrintNumber ; print inches (height)
-	ld a, "″"
+	ld a, '″'
 	ld [hl], a
 ; now print the weight (note that weight is stored in tenths of pounds internally)
 	inc de
@@ -636,12 +636,12 @@ DrawDexEntryOnScreen:
 	ldh a, [hDexWeight]
 	sbc 0
 	jr nc, .next
-	ld [hl], "0" ; if the weight is less than 10, put a 0 before the decimal point
+	ld [hl], '0' ; if the weight is less than 10, put a 0 before the decimal point
 .next
 	inc hl
 	ld a, [hli]
 	ld [hld], a ; make space for the decimal point by moving the last digit forward one tile
-	ld [hl], "<DOT>" ; decimal point tile
+	ld [hl], '<DOT>' ; decimal point tile
 	pop af
 	ldh [hDexWeight + 1], a ; restore original value of [hDexWeight + 1]
 	pop af
diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index e4575793..768b6e8b 100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -451,11 +451,11 @@ DisplayChangeBoxMenu:
 	jr c, .singleDigitBoxNum
 	sub 9
 	hlcoord 8, 2
-	ld [hl], "1"
-	add "0"
+	ld [hl], '1'
+	add '0'
 	jr .next
 .singleDigitBoxNum
-	add "1"
+	add '1'
 .next
 	ldcoord_a 9, 2
 	hlcoord 1, 2
diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index 32258437..7e801068 100644
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
@@ -306,7 +306,7 @@ ErasePartyMenuCursors::
 	ld bc, 2 * SCREEN_WIDTH ; menu cursor positions are 2 rows apart
 	ld a, 6 ; 6 menu cursor positions
 .loop
-	ld [hl], " "
+	ld [hl], ' '
 	add hl, bc
 	dec a
 	jr nz, .loop
@@ -346,7 +346,7 @@ StartMenu_Item::
 	jp RedisplayStartMenu
 .choseItem
 ; erase menu cursor (blank each tile in front of an item name)
-	ld a, " "
+	ld a, ' '
 	ldcoord_a 5, 4
 	ldcoord_a 5, 6
 	ldcoord_a 5, 8
@@ -499,7 +499,7 @@ DrawTrainerInfo:
 	predef DisplayPicCenteredOrUpperRight
 	call DisableLCD
 	hlcoord 0, 2
-	ld a, " "
+	ld a, ' '
 	call TrainerInfo_DrawVerticalLine
 	hlcoord 1, 2
 	call TrainerInfo_DrawVerticalLine
@@ -689,7 +689,7 @@ SwitchPartyMon_ClearGfx:
 	ld bc, SCREEN_WIDTH * 2
 	call AddNTimes
 	ld c, SCREEN_WIDTH * 2
-	ld a, " "
+	ld a, ' '
 .clearMonBGLoop ; clear the mon's row in the party menu
 	ld [hli], a
 	dec c
diff --git a/engine/menus/text_box.asm b/engine/menus/text_box.asm
index d73df6ff..a9d5b4c9 100644
--- a/engine/menus/text_box.asm
+++ b/engine/menus/text_box.asm
@@ -442,7 +442,7 @@ DisplayFieldMoveMonMenu:
 	jr z, .reachedName
 .skipNameLoop ; skip past current name
 	ld a, [hli]
-	cp "@"
+	cp '@'
 	jr nz, .skipNameLoop
 	jr .skipNamesLoop
 .reachedName
diff --git a/engine/menus/unused_input.asm b/engine/menus/unused_input.asm
index 9c868b3f..2eb79373 100644
--- a/engine/menus/unused_input.asm
+++ b/engine/menus/unused_input.asm
@@ -98,7 +98,7 @@ PlaceMenuCursorDuplicate:
 	jr nz, .loop2
 .asm_f5ad5
 	ld a, [hl]
-	cp "▶"
+	cp '▶'
 	jr nz, .asm_f5ade
 	ld a, [wTileBehindCursor]
 	ld [hl], a
@@ -114,11 +114,11 @@ PlaceMenuCursorDuplicate:
 	jr nz, .loop3
 .asm_f5aec
 	ld a, [hl]
-	cp "▶"
+	cp '▶'
 	jr z, .asm_f5af4
 	ld [wTileBehindCursor], a
 .asm_f5af4
-	ld a, "▶"
+	ld a, '▶'
 	ld [hl], a
 	ld a, l
 	ld [wMenuCursorLocation], a