From 5943b96cf6d5eda52df2ad689af0ac251e4e0841 Mon Sep 17 00:00:00 2001 From: Rangi <35663410+Rangi42@users.noreply.github.com> Date: Wed, 12 Nov 2025 15:44:07 -0500 Subject: Use features of RGBDS 1.0.0 (#537) --- engine/battle/animations.asm | 6 ++--- engine/battle/core.asm | 42 +++++++++++++++---------------- engine/battle/effects.asm | 2 +- engine/battle/link_battle_versus_text.asm | 4 +-- engine/battle/misc.asm | 10 ++++---- engine/battle/print_type.asm | 2 +- engine/battle/save_trainer_name.asm | 2 +- engine/events/diploma.asm | 2 +- engine/events/evolve_trade.asm | 6 ++--- engine/events/give_pokemon.asm | 8 +++--- engine/events/pokedex_rating.asm | 2 +- engine/gfx/hp_bar.asm | 2 +- engine/items/town_map.asm | 10 ++++---- engine/link/cable_club.asm | 16 ++++++------ engine/menus/main_menu.asm | 10 ++++---- engine/menus/naming_screen.asm | 18 ++++++------- engine/menus/party_menu.asm | 2 +- engine/menus/pokedex.asm | 20 +++++++-------- engine/menus/save.asm | 6 ++--- engine/menus/start_sub_menus.asm | 8 +++--- engine/menus/text_box.asm | 2 +- engine/movie/credits.asm | 2 +- engine/movie/hall_of_fame.asm | 2 +- engine/movie/oak_speech/oak_speech2.asm | 6 ++--- engine/movie/title.asm | 2 +- engine/movie/trade.asm | 4 +-- engine/overworld/player_state.asm | 2 +- engine/pokemon/bills_pc.asm | 14 +++++------ engine/pokemon/evos_moves.asm | 2 +- engine/pokemon/status_ailments.asm | 30 +++++++++++----------- engine/pokemon/status_screen.asm | 16 ++++++------ engine/slots/slot_machine.asm | 2 +- 32 files changed, 131 insertions(+), 131 deletions(-) (limited to 'engine') diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 6f255dd6..40b2047b 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -1603,7 +1603,7 @@ _AnimationSquishMonPic: call AnimCopyRowRight inc hl .next - ld [hl], " " + ld [hl], ' ' pop hl ld de, SCREEN_WIDTH add hl, de @@ -1838,7 +1838,7 @@ _AnimationSlideMonOff: ; plus one instead. cp $61 ret c - ld a, " " + ld a, ' ' ret .EnemyNextTile @@ -1848,7 +1848,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 83a52c2a..87abf2e8 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 @@ -1984,11 +1984,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 @@ -2036,15 +2036,15 @@ DisplayBattleMenu:: call CopyData ; the following simulates the keystrokes by drawing menus on screen hlcoord 9, 14 - ld [hl], "▶" + ld [hl], '▶' ld c, 80 call DelayFrames - ld [hl], " " + ld [hl], ' ' hlcoord 9, 16 - ld [hl], "▶" + ld [hl], '▶' ld c, 50 call DelayFrames - ld [hl], "▷" + ld [hl], '▷' ld a, $2 ; select the "ITEM" menu jp .upperLeftMenuItemWasNotSelected .oldManName @@ -2062,7 +2062,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 @@ -2095,7 +2095,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 @@ -2328,7 +2328,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 @@ -2495,9 +2495,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 @@ -2603,7 +2603,7 @@ SelectMenuItem: dec a ld bc, SCREEN_WIDTH call AddNTimes - ld [hl], "▷" + ld [hl], '▷' .select ld hl, hUILayoutFlags set BIT_DOUBLE_SPACED_MENU, [hl] @@ -2886,9 +2886,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 @@ -6841,17 +6841,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/effects.asm b/engine/battle/effects.asm index e111f783..413c34d9 100644 --- a/engine/battle/effects.asm +++ b/engine/battle/effects.asm @@ -743,7 +743,7 @@ FellText: PrintStatText: ld hl, StatModTextStrings - ld c, "@" + ld c, '@' .findStatName_outer dec b jr z, .foundStatName diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm index 374dcabc..d37d40c7 100644 --- a/engine/battle/link_battle_versus_text.asm +++ b/engine/battle/link_battle_versus_text.asm @@ -13,9 +13,9 @@ DisplayLinkBattleVersusTextBox: call PlaceString ; place bold "VS" tiles between the names hlcoord 9, 8 - ld a, "" + ld a, '' ld [hli], a - ld [hl], "" + ld [hl], '' xor a ld [wUpdateSpritesEnabled], a callfar SetupPlayerAndEnemyPokeballs diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm index 66675dbf..3deebc61 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, "" + ld a, '' 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, "" + ld a, '' 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/events/diploma.asm b/engine/events/diploma.asm index 900e3782..b4ccbb07 100644 --- a/engine/events/diploma.asm +++ b/engine/events/diploma.asm @@ -79,7 +79,7 @@ UnusedPlayerNameLengthFunc: lb bc, $ff, $00 .loop ld a, [hli] - cp "@" + cp '@' ret z dec c jr .loop diff --git a/engine/events/evolve_trade.asm b/engine/events/evolve_trade.asm index 8ec7ad5c..7dfc2433 100644 --- a/engine/events/evolve_trade.asm +++ b/engine/events/evolve_trade.asm @@ -6,13 +6,13 @@ InGameTrade_CheckForTradeEvo: ; Graveler's English name and Haunter's early English name "Spectre". ; The final release replaced Graveler and Haunter in TradeMons. ld a, [wInGameTradeReceiveMonName] - cp "G" ; GRAVELER + cp 'G' ; GRAVELER jr z, .nameMatched ; "SPECTRE" (HAUNTER) - cp "S" + cp 'S' ret nz ld a, [wInGameTradeReceiveMonName + 1] - cp "P" + cp 'P' ret nz .nameMatched ld a, [wPartyCount] diff --git a/engine/events/give_pokemon.asm b/engine/events/give_pokemon.asm index 640a3dba..b25ef048 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 c1ae598e..d8dcaa24 100644 --- a/engine/gfx/hp_bar.asm +++ b/engine/gfx/hp_bar.asm @@ -223,7 +223,7 @@ UpdateHPBar_PrintHPNumber: .next add hl, de push hl - ld a, " " + ld a, ' ' ld [hli], a ld [hli], a ld [hli], a diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm index 227ee033..6758adea 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 @@ -166,7 +166,7 @@ LoadTownMap_Fly:: ld hl, wFlyLocationsList decoord 18, 0 .townMapFlyLoop - ld a, " " + ld a, ' ' ld [de], a push hl push hl @@ -183,9 +183,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 @@ -363,7 +363,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 a4307532..c94b2693 100644 --- a/engine/link/cable_club.asm +++ b/engine/link/cable_club.asm @@ -482,7 +482,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 @@ -499,7 +499,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 @@ -547,10 +547,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 @@ -562,14 +562,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 @@ -619,7 +619,7 @@ TradeCenter_PlaceSelectedEnemyMonMenuCursor: hlcoord 1, 9 ld bc, SCREEN_WIDTH call AddNTimes - ld [hl], "▷" ; cursor + ld [hl], '▷' ; cursor ret TradeCenter_DisplayStats: @@ -950,7 +950,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/main_menu.asm b/engine/menus/main_menu.asm index c6f8547b..f4d8ec03 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -227,9 +227,9 @@ LinkMenu: ld a, SC_START | SC_INTERNAL ldh [rSC], a .skipStartingTransfer - ld b, " " - ld c, " " - ld d, "▷" + ld b, ' ' + ld c, ' ' + ld d, '▷' ld a, [wLinkMenuSelectionSendBuffer] and PAD_B << 2 ; was B button pressed? jr nz, .updateCursorPosition @@ -682,7 +682,7 @@ SetCursorPositionsFromOptions: ld e, a ld d, 0 add hl, de - ld [hl], "▷" + ld [hl], '▷' ret ; table that indicates how the 3 text speed options affect frame delays @@ -709,7 +709,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 14eb0b28..fda482e3 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -40,7 +40,7 @@ AskName: pop af ld [wUpdateSpritesEnabled], a ld a, [wStringBuffer] - cp "@" + cp '@' ret nz .declinedNickname ld d, h @@ -64,7 +64,7 @@ DisplayNameRaterScreen:: call RestoreScreenTilesAndReloadTilePatterns call LoadGBPal ld a, [wStringBuffer] - cp "@" + cp '@' jr z, .playerCancelled ld hl, wPartyMonNicks ld bc, NAME_LENGTH @@ -108,7 +108,7 @@ DisplayNamingScreen: ld [wMenuWatchedKeys], a ld a, 7 ld [wMaxMenuItem], a - ld a, "@" + ld a, '@' ld [wStringBuffer], a xor a ld hl, wNamingScreenSubmitName @@ -231,10 +231,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] @@ -259,7 +259,7 @@ DisplayNamingScreen: .addLetter ld a, [wNamingScreenLetter] ld [hli], a - ld [hl], "@" + ld [hl], '@' ld a, SFX_PRESS_AB call PlaySound ret @@ -269,7 +269,7 @@ DisplayNamingScreen: ret z call CalcStringLength dec hl - ld [hl], "@" + ld [hl], '@' ret .pressedRight ld a, [wCurrentMenuItem] @@ -442,7 +442,7 @@ CalcStringLength: ld c, $0 .loop ld a, [hl] - cp "@" + cp '@' ret z inc hl inc c @@ -468,7 +468,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/party_menu.asm b/engine/menus/party_menu.asm index 81472c31..f2688b52 100644 --- a/engine/menus/party_menu.asm +++ b/engine/menus/party_menu.asm @@ -51,7 +51,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 diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index 1f58fd68..3e4096bc 100644 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -121,7 +121,7 @@ HandlePokedexSideMenu: 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 @@ -130,7 +130,7 @@ HandlePokedexSideMenu: push bc hlcoord 15, 10 ld de, 20 - lb bc, " ", 7 + lb bc, ' ', 7 call DrawTileLine ; cover up the menu cursor in the side menu pop bc jr .exitSideMenu @@ -159,7 +159,7 @@ HandlePokedexListMenu: ldh [hAutoBGTransferEnabled], a ; draw the horizontal line separating the seen and owned amounts from the menu hlcoord 15, 8 - ld a, "─" + ld a, '─' ld [hli], a ld [hli], a ld [hli], a @@ -251,7 +251,7 @@ HandlePokedexListMenu: ld hl, wPokedexOwned call IsPokemonBitSet pop hl - ld a, " " + ld a, ' ' jr z, .writeTile ld a, $72 ; pokeball tile .writeTile @@ -476,9 +476,9 @@ ShowPokedexDataInternal: call IndexToPokedex hlcoord 2, 8 - ld a, "№" + ld a, '№' ld [hli], a - ld a, "" + ld a, '' ld [hli], a ld de, wPokedexNum lb bc, LEADING_ZEROES | 1, 3 @@ -518,14 +518,14 @@ ShowPokedexDataInternal: 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 @@ -553,12 +553,12 @@ ShowPokedexDataInternal: 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], "" ; decimal point tile + ld [hl], '' ; 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 7112207f..9dfdd949 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -474,11 +474,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 e845941f..8ba05b3f 100644 --- a/engine/menus/start_sub_menus.asm +++ b/engine/menus/start_sub_menus.asm @@ -289,7 +289,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 @@ -329,7 +329,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 @@ -481,7 +481,7 @@ DrawTrainerInfo: predef DisplayPicCenteredOrUpperRight call DisableLCD hlcoord 0, 2 - ld a, " " + ld a, ' ' call TrainerInfo_DrawVerticalLine hlcoord 1, 2 call TrainerInfo_DrawVerticalLine @@ -671,7 +671,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 076b395f..94c432c7 100644 --- a/engine/menus/text_box.asm +++ b/engine/menus/text_box.asm @@ -470,7 +470,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/movie/credits.asm b/engine/movie/credits.asm index bdd66e8e..1a68a7b5 100644 --- a/engine/movie/credits.asm +++ b/engine/movie/credits.asm @@ -164,7 +164,7 @@ FillFourRowsWithBlack: FillMiddleOfScreenWithWhite: hlcoord 0, 4 ld bc, SCREEN_WIDTH * 10 - ld a, " " + ld a, ' ' jp FillMemory Credits: diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm index 7653b4bc..b2c0de42 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 ceaa6838..df05091a 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 bcd01f33..698dd5e0 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -357,7 +357,7 @@ DrawPlayerCharacter: ClearBothBGMaps: ld hl, vBGMap0 ld bc, 2 * TILEMAP_AREA - ld a, " " + ld a, ' ' jp FillMemory LoadTitleMonSprite: diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm index 4cb9d394..bf77f21e 100644 --- a/engine/movie/trade.asm +++ b/engine/movie/trade.asm @@ -150,7 +150,7 @@ Trade_Delay80: Trade_ClearTileMap: hlcoord 0, 0 ld bc, SCREEN_AREA - ld a, " " + ld a, ' ' jp FillMemory LoadTradingGFXAndMonNames: @@ -168,7 +168,7 @@ LoadTradingGFXAndMonNames: call FarCopyData2 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 a5d3ee3e..263ab634 100644 --- a/engine/overworld/player_state.asm +++ b/engine/overworld/player_state.asm @@ -240,7 +240,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/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 6d522377..0fcdedc6 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -157,11 +157,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 @@ -240,15 +240,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 afae4396..1b92a093 100644 --- a/engine/pokemon/evos_moves.asm +++ b/engine/pokemon/evos_moves.asm @@ -278,7 +278,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 344e7802..80cdfb17 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], "" + ld [hl], '' dec hl - ld [hl], "№" + ld [hl], '№' hlcoord 19, 9 lb bc, 8, 6 call DrawLineBox ; Draws the box around types, ID No. and OT @@ -329,13 +329,13 @@ StatusScreen2: ld b, a ; Number of moves ? hlcoord 11, 10 ld de, SCREEN_WIDTH * 2 - ld a, "" + ld a, '' 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 @@ -372,7 +372,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 @@ -400,7 +400,7 @@ StatusScreen2: ld [wLoadedMonLevel], a ; Increase temporarily if not 100 .Level100 hlcoord 14, 6 - ld [hl], "" + ld [hl], '' inc hl inc hl call PrintLevel @@ -469,7 +469,7 @@ StatusScreenExpText: StatusScreen_ClearName: ld bc, 10 - ld a, " " + ld a, ' ' jp FillMemory StatusScreen_PrintPP: diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm index 9dc32397..147519c7 100644 --- a/engine/slots/slot_machine.asm +++ b/engine/slots/slot_machine.asm @@ -629,7 +629,7 @@ SlotMachine_PrintWinningSymbol: inc a ld [hl], a hlcoord 18, 16 - ld [hl], "▼" + ld [hl], '▼' ret SlotMachine_SubtractBetFromPlayerCoins: -- cgit v1.3.1-sl0p