diff options
Diffstat (limited to 'engine')
39 files changed, 204 insertions, 204 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index cba2f154..5adecbd7 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -1689,7 +1689,7 @@ _AnimationSquishMonPic: call AnimCopyRowRight inc hl .next - ld [hl], " " + ld [hl], ' ' pop hl ld de, SCREEN_WIDTH add hl, de @@ -1922,7 +1922,7 @@ _AnimationSlideMonOff: ; bugfix: compares against the max tile + 1 as opposed to the max tile cp $62 ret c - ld a, " " + ld a, ' ' ret .EnemyNextTile @@ -1932,7 +1932,7 @@ _AnimationSlideMonOff: ; the lower right tile is in the first column to slide off the screen. cp $30 ret c - ld a, " " + ld a, ' ' ret AnimationSlideMonHalfOff: diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 299b5ee7..a1a989e4 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -20,7 +20,7 @@ SlidePlayerAndEnemySilhouettesOnScreen: ld hl, vBGMap0 ld bc, TILEMAP_AREA .clearBackgroundLoop - ld a, " " + ld a, ' ' ld [hli], a dec bc ld a, b @@ -2059,11 +2059,11 @@ CenterMonName: .loop inc de ld a, [de] - cp "@" + cp '@' jr z, .done inc de ld a, [de] - cp "@" + cp '@' jr z, .done dec hl dec b @@ -2120,15 +2120,15 @@ DisplayBattleMenu:: call CopyData ; the following simulates the keystrokes by drawing menus on screen hlcoord 9, 14 - ld [hl], "▶" + ld [hl], '▶' ld c, 20 call DelayFrames - ld [hl], " " + ld [hl], ' ' hlcoord 9, 16 - ld [hl], "▶" + ld [hl], '▶' ld c, 20 call DelayFrames - ld [hl], "▷" + ld [hl], '▷' ld a, $2 ; select the "ITEM" menu jp .upperLeftMenuItemWasNotSelected .oldManName @@ -2148,7 +2148,7 @@ DisplayBattleMenu:: .leftColumn ; put cursor in left column of menu ld a, [wBattleType] cp BATTLE_TYPE_SAFARI - ld a, " " + ld a, ' ' jr z, .safariLeftColumn ; put cursor in left column for normal battle menu (i.e. when it's not a Safari battle) ldcoord_a 15, 14 ; clear upper cursor position in right column @@ -2181,7 +2181,7 @@ DisplayBattleMenu:: .rightColumn ; put cursor in right column of menu ld a, [wBattleType] cp BATTLE_TYPE_SAFARI - ld a, " " + ld a, ' ' jr z, .safariRightColumn ; put cursor in right column for normal battle menu (i.e. when it's not a Safari battle) ldcoord_a 9, 14 ; clear upper cursor position in left column @@ -2432,7 +2432,7 @@ PartyMenuOrRockOrRun: .partyMonDeselected hlcoord 11, 11 ld bc, 6 * SCREEN_WIDTH + 9 - ld a, " " + ld a, ' ' call FillMemory xor a ; NORMAL_PARTY_MENU ld [wPartyMenuTypeOrMessageID], a @@ -2600,9 +2600,9 @@ MoveSelectionMenu: ; so it is necessary to put the di ei block to not cause tearing call TextBoxBorder hlcoord 4, 12 - ld [hl], "─" + ld [hl], '─' hlcoord 10, 12 - ld [hl], "┘" + ld [hl], '┘' ei hlcoord 6, 13 call .writemoves @@ -2704,7 +2704,7 @@ SelectMenuItem: dec a ld bc, SCREEN_WIDTH call AddNTimes - ld [hl], "▷" + ld [hl], '▷' .select ld hl, hUILayoutFlags set BIT_DOUBLE_SPACED_MENU, [hl] @@ -3057,9 +3057,9 @@ PrintMenuItem: ld de, TypeText call PlaceString hlcoord 7, 11 - ld [hl], "/" + ld [hl], '/' hlcoord 5, 9 - ld [hl], "/" + ld [hl], '/' hlcoord 5, 11 ld de, wBattleMenuCurrentPP lb bc, 1, 2 diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm index 6a674ec5..2babf7f1 100644 --- a/engine/battle/effects.asm +++ b/engine/battle/effects.asm @@ -779,7 +779,7 @@ FellText: PrintStatText: ld hl, StatModTextStrings - ld c, "@" + ld c, '@' .findStatName_outer dec b jr z, .foundStatName diff --git a/engine/battle/init_battle.asm b/engine/battle/init_battle.asm index 27b5245b..a291880c 100644 --- a/engine/battle/init_battle.asm +++ b/engine/battle/init_battle.asm @@ -76,17 +76,17 @@ InitWildBattle: ld [hli], a ; write front sprite pointer ld [hl], b ld hl, wEnemyMonNick ; set name to "GHOST" - ld a, "G" + ld a, 'G' ld [hli], a - ld a, "H" + ld a, 'H' ld [hli], a - ld a, "O" + ld a, 'O' ld [hli], a - ld a, "S" + ld a, 'S' ld [hli], a - ld a, "T" + ld a, 'T' ld [hli], a - ld [hl], "@" + ld [hl], '@' ld a, [wCurPartySpecies] push af ld a, MON_GHOST diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm index d06f7f39..e5dd42ea 100644 --- a/engine/battle/link_battle_versus_text.asm +++ b/engine/battle/link_battle_versus_text.asm @@ -12,9 +12,9 @@ DisplayLinkBattleVersusTextBox: call PlaceString ; place bold "VS" tiles between the names hlcoord 9, 8 - ld a, "<BOLD_V>" + ld a, '<BOLD_V>' ld [hli], a - ld [hl], "<BOLD_S>" + ld [hl], '<BOLD_S>' xor a ld [wUpdateSpritesEnabled], a callfar SetupPlayerAndEnemyPokeballs diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm index b8ee4c2f..45135a71 100644 --- a/engine/battle/misc.asm +++ b/engine/battle/misc.asm @@ -17,7 +17,7 @@ FormatMovesString: ld hl, wNameBuffer .copyNameLoop ld a, [hli] - cp "@" + cp '@' jr z, .doneCopyingName ld [de], a inc de @@ -26,7 +26,7 @@ FormatMovesString: ld a, b ld [wNumMovesMinusOne], a inc b - ld a, "<NEXT>" + ld a, '<NEXT>' ld [de], a inc de pop hl @@ -35,19 +35,19 @@ FormatMovesString: jr z, .done jr .printMoveNameLoop .printDashLoop - ld a, "-" + ld a, '-' ld [de], a inc de inc b ld a, b cp NUM_MOVES jr z, .done - ld a, "<NEXT>" + ld a, '<NEXT>' ld [de], a inc de jr .printDashLoop .done - ld a, "@" + ld a, '@' ld [de], a ret diff --git a/engine/battle/print_type.asm b/engine/battle/print_type.asm index e7c6729c..6ebd4189 100644 --- a/engine/battle/print_type.asm +++ b/engine/battle/print_type.asm @@ -25,7 +25,7 @@ PrintType: ; erase "TYPE2/" if the mon only has 1 type EraseType2Text: - ld a, " " + ld a, ' ' ld bc, $13 add hl, bc ld bc, $6 diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm index b25d5a11..08260029 100644 --- a/engine/battle/save_trainer_name.asm +++ b/engine/battle/save_trainer_name.asm @@ -14,7 +14,7 @@ SaveTrainerName:: ld a, [hli] ld [de], a inc de - cp "@" + cp '@' jr nz, .CopyCharacter ret diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm index a8f147a6..a3933842 100644 --- a/engine/debug/debug_menu.asm +++ b/engine/debug/debug_menu.asm @@ -131,11 +131,11 @@ Func_fe7ca: push hl push bc dec hl - ld a, "▶" + ld a, '▶' ld [hl], a ld bc, 11 add hl, bc - ld a, " " + ld a, ' ' ld [hl], a push de pop de @@ -232,13 +232,13 @@ Func_fe85d: ld [wWhichPokemon], a dec de dec hl - ld a, " " + ld a, ' ' ld [hl], a push bc ld bc, hMovingBGTilesCounter1 add hl, bc pop bc - ld a, "▶" + ld a, '▶' ld [hl], a inc hl push hl @@ -254,11 +254,11 @@ Func_fe880: ld [wWhichPokemon], a inc de dec hl - ld a, " " + ld a, ' ' ld [hl], a ld bc, SCREEN_WIDTH * 2 add hl, bc - ld a, "▶" + ld a, '▶' ld [hl], a inc hl push hl @@ -270,11 +270,11 @@ Func_fe8a1: push hl push bc dec hl - ld a, " " + ld a, ' ' ld [hl], a ld bc, 11 add hl, bc - ld a, "▶" + ld a, '▶' ld [hl], a pop bc pop hl @@ -352,7 +352,7 @@ Func_fe912: push hl ld bc, 10 add hl, bc - ld a, " " + ld a, ' ' ld [hl], a pop hl ld bc, hMovingBGTilesCounter1 @@ -360,7 +360,7 @@ Func_fe912: push hl ld bc, 10 add hl, bc - ld a, "▶" + ld a, '▶' ld [hl], a call Func_fe964 pop hl @@ -376,7 +376,7 @@ Func_fe93b: push hl ld bc, 10 add hl, bc - ld a, " " + ld a, ' ' ld [hl], a pop hl ld bc, SCREEN_WIDTH * 2 @@ -384,7 +384,7 @@ Func_fe93b: push hl ld bc, 10 add hl, bc - ld a, "▶" + ld a, '▶' ld [hl], a call Func_fe964 pop hl @@ -532,10 +532,10 @@ Func_fe97f: pop bc ; fallthrough Func_fea78: - ld a, " " + ld a, ' ' ldcoord_a 0, 8 ldcoord_a 15, 8 - ld a, "▶" + ld a, '▶' ldcoord_a 0, 4 ; fallthrough Func_fea85: @@ -566,7 +566,7 @@ Func_fea9d: jr nz, .asm_feace ld a, 2 ld [wIsInBattle], a - ld a, " " + ld a, ' ' ldcoord_a 4, 3 hlcoord 1, 4 ld de, Text_fedb2 @@ -575,7 +575,7 @@ Func_fea9d: .asm_feace ld a, 1 ld [wIsInBattle], a - ld a, " " + ld a, ' ' ldcoord_a 1, 3 hlcoord 1, 4 ld de, Text_feda8 @@ -583,9 +583,9 @@ Func_fea9d: jp Func_fea85 Func_feae4: - ld a, "▶" + ld a, '▶' ldcoord_a 0, 8 - ld a, " " + ld a, ' ' ldcoord_a 15, 8 ldcoord_a 0, 4 ; fallthrough @@ -694,9 +694,9 @@ Func_feb82: jp Func_feb64 Func_febba: - ld a, " " + ld a, ' ' ldcoord_a 0, 8 - ld a, "▶" + ld a, '▶' ldcoord_a 15, 8 ; fallthrough Func_febc4: @@ -940,9 +940,9 @@ Func_fedfe: ; fallthrough Func_fee23: hlcoord 0, 3 - ld [hl], " " + ld [hl], ' ' hlcoord 0, 1 - ld [hl], "▶" + ld [hl], '▶' call Func_fee60 .asm_fee30 call DelayFrame @@ -995,11 +995,11 @@ Func_fee60: Func_fee96: hlcoord 0, 1 - ld [hl], " " + ld [hl], ' ' hlcoord 0, 3 - ld [hl], "▶" + ld [hl], '▶' hlcoord 0, 5 - ld [hl], " " + ld [hl], ' ' call Func_feee2 call Func_feeef .asm_feeab @@ -1173,13 +1173,13 @@ Func_fefc5: pop de pop hl push hl - ld [hl], "▶" + ld [hl], '▶' ld bc, hMovingBGTilesCounter1 add hl, bc - ld [hl], " " + ld [hl], ' ' ld bc, SCREEN_WIDTH * 4 add hl, bc - ld [hl], " " + ld [hl], ' ' pop hl inc hl ld a, [de] @@ -1218,7 +1218,7 @@ Func_ff006: callfar Func_3b079 pop hl jr c, .asm_ff036 - ld [hl], "×" + ld [hl], '×' .asm_ff036 pop af ld [wCurPartySpecies], a @@ -1296,13 +1296,13 @@ Func_ff09e: push de push bc push hl - ld [hl], "▶" + ld [hl], '▶' ld bc, hMovingBGTilesCounter1 add hl, bc - ld [hl], " " + ld [hl], ' ' ld bc, SCREEN_WIDTH * 4 add hl, bc - ld [hl], " " + ld [hl], ' ' pop hl inc hl ld a, [de] @@ -1454,13 +1454,13 @@ Func_ff1b9: ; fallthrough Func_ff1e7: hlcoord 2, 13 - ld [hl], "ﾞ" + ld [hl], 'ﾞ' hlcoord 1, 14 - ld [hl], "レ" + ld [hl], 'レ' inc hl - ld [hl], "へ" + ld [hl], 'へ' inc hl - ld [hl], "ル" + ld [hl], 'ル' inc hl inc hl ld de, wCurEnemyLevel diff --git a/engine/events/give_pokemon.asm b/engine/events/give_pokemon.asm index 5d7d0661..43c7e4ee 100644 --- a/engine/events/give_pokemon.asm +++ b/engine/events/give_pokemon.asm @@ -24,15 +24,15 @@ _GivePokemon:: cp 9 jr c, .singleDigitBoxNum sub 9 - ld [hl], "1" + ld [hl], '1' inc hl - add "0" + add '0' jr .next .singleDigitBoxNum - add "1" + add '1' .next ld [hli], a - ld [hl], "@" + ld [hl], '@' ld hl, SentToBoxText call PrintText scf diff --git a/engine/events/pokedex_rating.asm b/engine/events/pokedex_rating.asm index 1086257a..510b11a3 100644 --- a/engine/events/pokedex_rating.asm +++ b/engine/events/pokedex_rating.asm @@ -42,7 +42,7 @@ DisplayDexRating: inc de .copyRatingTextLoop ld a, [hli] - cp "@" + cp '@' jr z, .doneCopying ld [de], a inc de diff --git a/engine/gfx/hp_bar.asm b/engine/gfx/hp_bar.asm index b25f5c49..04a3251a 100644 --- a/engine/gfx/hp_bar.asm +++ b/engine/gfx/hp_bar.asm @@ -221,7 +221,7 @@ UpdateHPBar_PrintHPNumber: .hpBelowBar add hl, de push hl - ld a, " " + ld a, ' ' ld [hli], a ld [hli], a ld [hli], a diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 1bbb4cf9..31684719 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -2441,7 +2441,7 @@ ItemUseTMHM: .chooseMon ld hl, wStringBuffer ld de, wTempMoveNameBuffer - ld bc, 14 + ld bc, ITEM_NAME_LENGTH + 1 call CopyData ; save the move name because DisplayPartyMenu will overwrite it ld a, $ff ld [wUpdateSpritesEnabled], a @@ -2451,7 +2451,7 @@ ItemUseTMHM: push af ld hl, wTempMoveNameBuffer ld de, wStringBuffer - ld bc, 14 + ld bc, ITEM_NAME_LENGTH + 1 call CopyData pop af jr nc, .checkIfAbleToLearnMove diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm index 3cf68aea..a7093cfc 100644 --- a/engine/items/town_map.asm +++ b/engine/items/town_map.asm @@ -57,7 +57,7 @@ DisplayTownMap: ld a, [hli] ld [de], a inc de - cp "@" + cp '@' jr nz, .copyMapName hlcoord 1, 0 ld de, wNameBuffer @@ -176,7 +176,7 @@ LoadTownMap_Fly:: ld hl, wFlyLocationsList decoord 18, 0 .townMapFlyLoop - ld a, " " + ld a, ' ' ld [de], a push hl push hl @@ -193,9 +193,9 @@ LoadTownMap_Fly:: ld c, 15 call DelayFrames hlcoord 18, 0 - ld [hl], "▲" + ld [hl], '▲' hlcoord 19, 0 - ld [hl], "▼" + ld [hl], '▼' pop hl .inputLoop push hl @@ -373,7 +373,7 @@ DrawPlayerOrBirdSprite: ld a, [hli] ld [de], a inc de - cp "@" + cp '@' jr nz, .loop ld hl, wShadowOAM ld de, wShadowOAMBackup diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm index ac961a4f..d66dc608 100644 --- a/engine/link/cable_club.asm +++ b/engine/link/cable_club.asm @@ -488,7 +488,7 @@ TradeCenter_SelectMon: ld a, 16 ld [wTopMenuItemY], a .selectStatsMenuItem - ld a, " " + ld a, ' ' ldcoord_a 11, 16 ld a, PAD_RIGHT | PAD_B | PAD_A ld [wMenuWatchedKeys], a @@ -505,7 +505,7 @@ TradeCenter_SelectMon: call LoadScreenTilesFromBuffer1 jp .playerMonMenu .selectTradeMenuItem - ld a, " " + ld a, ' ' ldcoord_a 1, 16 ld a, PAD_LEFT | PAD_B | PAD_A ld [wMenuWatchedKeys], a @@ -553,10 +553,10 @@ TradeCenter_SelectMon: ld l, a ld a, [wMenuCursorLocation + 1] ld h, a - ld a, " " + ld a, ' ' ld [hl], a .cancelMenuItem_Loop - ld a, "▶" ; filled arrow cursor + ld a, '▶' ; filled arrow cursor ldcoord_a 1, 16 .cancelMenuItem_JoypadLoop call JoypadLowSensitivity @@ -568,14 +568,14 @@ TradeCenter_SelectMon: bit B_PAD_UP, a jr z, .cancelMenuItem_JoypadLoop ; if Up pressed - ld a, " " + ld a, ' ' ldcoord_a 1, 16 ld a, [wPartyCount] dec a ld [wCurrentMenuItem], a jp .playerMonMenu .cancelMenuItem_APressed - ld a, "▷" ; unfilled arrow cursor + ld a, '▷' ; unfilled arrow cursor ldcoord_a 1, 16 ld a, $f ld [wSerialExchangeNybbleSendData], a @@ -624,7 +624,7 @@ TradeCenter_PlaceSelectedEnemyMonMenuCursor: hlcoord 1, 9 ld bc, SCREEN_WIDTH call AddNTimes - ld [hl], "▷" ; cursor + ld [hl], '▷' ; cursor ret TradeCenter_DisplayStats: @@ -956,7 +956,7 @@ CableClub_TextBoxBorder: push hl ld a, $7b ; border left vertical line tile ld [hli], a - ld a, " " + ld a, ' ' call CableClub_DrawHorizontalLine ld [hl], $77 ; border right vertical line tile pop hl 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 diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm index f7e13aab..149f51a7 100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -171,7 +171,7 @@ FillFourRowsWithBlack: FillMiddleOfScreenWithWhite: hlcoord 0, 4 ld bc, SCREEN_WIDTH * 10 - ld a, " " + ld a, ' ' jp FillMemory FillLeftHalfOfScreenWithWhite: @@ -191,7 +191,7 @@ FillRightHalfOfScreenWithWhite: FillHalfOfScreenWithWhite: ld b, 10 ld c, 10 - ld a, " " + ld a, ' ' .loop push bc push hl diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm index fb77e073..4afb23d3 100644 --- a/engine/movie/hall_of_fame.asm +++ b/engine/movie/hall_of_fame.asm @@ -8,7 +8,7 @@ AnimateHallOfFame: call DisableLCD ld hl, vBGMap0 ld bc, 2 * TILEMAP_AREA - ld a, " " + ld a, ' ' call FillMemory call EnableLCD ld hl, rLCDC diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm index 300b5590..cedc8be7 100644 --- a/engine/movie/oak_speech/oak_speech2.asm +++ b/engine/movie/oak_speech/oak_speech2.asm @@ -16,7 +16,7 @@ ChoosePlayerName: ld [wNamingScreenType], a call DisplayNamingScreen ld a, [wStringBuffer] - cp "@" + cp '@' jr z, .customName call ClearScreen call Delay3 @@ -49,7 +49,7 @@ ChooseRivalName: ld [wNamingScreenType], a call DisplayNamingScreen ld a, [wStringBuffer] - cp "@" + cp '@' jr z, .customName call ClearScreen call Delay3 @@ -199,7 +199,7 @@ GetDefaultName: ld e, l .innerLoop ld a, [hli] - cp "@" + cp '@' jr nz, .innerLoop ld a, b cp c diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 495c8cfe..0e9b651e 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -53,7 +53,7 @@ DisplayTitleScreen: callfar LoadYellowTitleScreenGFX ld hl, vBGMap0 ld bc, (vBGMap1 tile $40) - vBGMap0 - ld a, " " + ld a, ' ' call FillMemory callfar TitleScreen_PlacePokemonLogo call FillSpriteBuffer0WithAA diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm index 852af717..1af97969 100644 --- a/engine/movie/trade.asm +++ b/engine/movie/trade.asm @@ -151,7 +151,7 @@ Trade_Delay80: Trade_ClearTileMap: hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' jp FillMemory LoadTradingGFXAndMonNames: @@ -169,7 +169,7 @@ LoadTradingGFXAndMonNames: call FarCopyData ld hl, vBGMap0 ld bc, 2 * TILEMAP_AREA - ld a, " " + ld a, ' ' call FillMemory call ClearSprites ld a, $ff diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm index d29a5425..3f642dc0 100644 --- a/engine/overworld/player_state.asm +++ b/engine/overworld/player_state.asm @@ -241,7 +241,7 @@ PrintSafariZoneSteps:: cp 10 jr nc, .tenOrMore hlcoord 5, 3 - ld a, " " + ld a, ' ' ld [hl], a .tenOrMore hlcoord 6, 3 diff --git a/engine/overworld/wild_mons.asm b/engine/overworld/wild_mons.asm index 2593e0ec..2b186e75 100644 --- a/engine/overworld/wild_mons.asm +++ b/engine/overworld/wild_mons.asm @@ -16,10 +16,10 @@ LoadWildData:: jr z, .NoGrassData ; if no grass data, skip to surfing data push hl ld de, wGrassMons ; otherwise, load grass data - ld bc, $14 + ld bc, WILDDATA_LENGTH - 1 call CopyData pop hl - ld bc, $14 + ld bc, WILDDATA_LENGTH - 1 add hl, bc .NoGrassData ld a, [hli] @@ -27,7 +27,7 @@ LoadWildData:: and a ret z ; if no water data, we're done ld de, wWaterMons ; otherwise, load surfing data - ld bc, $14 + ld bc, WILDDATA_LENGTH - 1 jp CopyData INCLUDE "data/wild/grass_water.asm" diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index c6908409..e82b41b0 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -154,11 +154,11 @@ BillsPCMenu: ; two digit box num sub 9 hlcoord 17, 16 - ld [hl], "1" - add "0" + ld [hl], '1' + add '0' jr .next .singleDigitBoxNum - add "1" + add '1' .next ldcoord_a 18, 16 hlcoord 10, 16 @@ -258,15 +258,15 @@ BillsPCDeposit: cp 9 jr c, .singleDigitBoxNum sub 9 - ld [hl], "1" + ld [hl], '1' inc hl - add "0" + add '0' jr .next .singleDigitBoxNum - add "1" + add '1' .next ld [hli], a - ld [hl], "@" + ld [hl], '@' ld hl, MonWasStoredText call PrintText jp BillsPCMenu diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm index 8fe004e4..1f0d265f 100644 --- a/engine/pokemon/evos_moves.asm +++ b/engine/pokemon/evos_moves.asm @@ -280,7 +280,7 @@ RenameEvolvedMon: cp [hl] inc hl ret nz - cp "@" + cp '@' jr nz, .compareNamesLoop ld a, [wWhichPokemon] ld bc, NAME_LENGTH diff --git a/engine/pokemon/status_ailments.asm b/engine/pokemon/status_ailments.asm index 05205a34..2c5b3bcd 100644 --- a/engine/pokemon/status_ailments.asm +++ b/engine/pokemon/status_ailments.asm @@ -10,37 +10,37 @@ PrintStatusAilment:: jr nz, .par and SLP_MASK ret z - ld a, "S" + ld a, 'S' ld [hli], a - ld a, "L" + ld a, 'L' ld [hli], a - ld [hl], "P" + ld [hl], 'P' ret .psn - ld a, "P" + ld a, 'P' ld [hli], a - ld a, "S" + ld a, 'S' ld [hli], a - ld [hl], "N" + ld [hl], 'N' ret .brn - ld a, "B" + ld a, 'B' ld [hli], a - ld a, "R" + ld a, 'R' ld [hli], a - ld [hl], "N" + ld [hl], 'N' ret .frz - ld a, "F" + ld a, 'F' ld [hli], a - ld a, "R" + ld a, 'R' ld [hli], a - ld [hl], "Z" + ld [hl], 'Z' ret .par - ld a, "P" + ld a, 'P' ld [hli], a - ld a, "A" + ld a, 'A' ld [hli], a - ld [hl], "R" + ld [hl], 'R' ret diff --git a/engine/pokemon/status_screen.asm b/engine/pokemon/status_screen.asm index 90dd8523..638f4c41 100644 --- a/engine/pokemon/status_screen.asm +++ b/engine/pokemon/status_screen.asm @@ -52,7 +52,7 @@ DrawHP_: ld de, wLoadedMonHP lb bc, 2, 3 call PrintNumber - ld a, "/" + ld a, '/' ld [hli], a ld de, wLoadedMonMaxHP lb bc, 2, 3 @@ -110,9 +110,9 @@ StatusScreen: call DrawLineBox ; Draws the box around name, HP and status ld de, -6 add hl, de - ld [hl], "<DOT>" + ld [hl], '<DOT>' dec hl - ld [hl], "№" + ld [hl], '№' hlcoord 19, 9 lb bc, 8, 6 call DrawLineBox ; Draws the box around types, ID No. and OT @@ -343,13 +343,13 @@ StatusScreen2: ld b, a ; Number of moves ? hlcoord 11, 10 ld de, SCREEN_WIDTH * 2 - ld a, "<BOLD_P>" + ld a, '<BOLD_P>' call StatusScreen_PrintPP ; Print "PP" ld a, b and a jr z, .InitPP ld c, a - ld a, "-" + ld a, '-' call StatusScreen_PrintPP ; Fill the rest with -- .InitPP ld hl, wLoadedMonMoves @@ -386,7 +386,7 @@ StatusScreen2: ld de, wStatusScreenCurrentPP lb bc, 1, 2 call PrintNumber - ld a, "/" + ld a, '/' ld [hli], a ld de, wMaxPP lb bc, 1, 2 @@ -414,7 +414,7 @@ StatusScreen2: ld [wLoadedMonLevel], a ; Increase temporarily if not 100 .Level100 hlcoord 14, 6 - ld [hl], "<to>" + ld [hl], '<to>' inc hl inc hl call PrintLevel @@ -483,7 +483,7 @@ StatusScreenExpText: StatusScreen_ClearName: ld bc, 10 - ld a, " " + ld a, ' ' jp FillMemory StatusScreen_PrintPP: diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index ee1bc73e..fa3a5afa 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -675,7 +675,7 @@ Printer_PrepareSurfingMinigameHighScoreTileMap:: .find_end_of_name ld a, [hli] inc c - cp "@" + cp '@' jr nz, .find_end_of_name ld a, 8 sub c @@ -778,7 +778,7 @@ PrintPCBox_DrawPage1: call PrintPCBox_PlaceHorizontalLines hlcoord 0, 0 ld bc, 11 * SCREEN_WIDTH - ld a, " " + ld a, ' ' call FillMemory call PrintPCBox_DrawLeftAndRightBorders call PrintPCBox_DrawTopBorder @@ -794,13 +794,13 @@ PrintPCBox_DrawPage1: cp 9 jr c, .less_than_9 sub 9 - ld [hl], "1" + ld [hl], '1' inc hl - add "0" + add '0' jr .placed_box_number .less_than_9 - add "1" + add '1' .placed_box_number ld [hl], a hlcoord 4, 9 @@ -846,7 +846,7 @@ PrintPCBox_DrawPage4: call PrintPCBox_DrawBottomBorderAtHL hlcoord 0, 16 ld bc, 2 * SCREEN_WIDTH - ld a, " " + ld a, ' ' call FillMemory ld a, [wBoxDataStart] cp 16 @@ -872,14 +872,14 @@ PrintPCBox_PlaceBoxMonInfo: push de push hl ld bc, 12 - ld a, " " + ld a, ' ' call FillMemory pop hl push hl ld de, SCREEN_WIDTH add hl, de ld bc, 12 - ld a, " " + ld a, ' ' call FillMemory pop hl push hl @@ -896,7 +896,7 @@ PrintPCBox_PlaceBoxMonInfo: pop hl ld bc, SCREEN_WIDTH + 1 add hl, bc - ld [hl], " " ; blank tile instead of "/" separator in Yellow + ld [hl], ' ' ; blank tile instead of "/" separator in Yellow inc hl call PlaceString ld hl, wBoxNumString diff --git a/engine/printer/printer2.asm b/engine/printer/printer2.asm index 944cee0f..586dbbb4 100644 --- a/engine/printer/printer2.asm +++ b/engine/printer/printer2.asm @@ -32,10 +32,10 @@ Printer_GetMonStats: hlcoord 2, 10 ld a, $6e ld [hli], a - ld [hl], " " + ld [hl], ' ' hlcoord 2, 11 - ld [hl], "’" + ld [hl], '’' hlcoord 4, 11 ld de, wLoadedMonMaxHP @@ -56,7 +56,7 @@ Printer_GetMonStats: predef IndexToPokedex hlcoord 2, 8 - ld [hl], "№" + ld [hl], '№' inc hl ld [hl], $f2 inc hl diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm index baf5c242..e3363db3 100644 --- a/engine/slots/slot_machine.asm +++ b/engine/slots/slot_machine.asm @@ -632,7 +632,7 @@ SlotMachine_PrintWinningSymbol: inc a ld [hl], a hlcoord 18, 16 - ld [hl], "▼" + ld [hl], '▼' ret SlotMachine_SubtractBetFromPlayerCoins: |