diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-11-12 15:44:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-12 15:44:07 -0500 |
| commit | 5943b96cf6d5eda52df2ad689af0ac251e4e0841 (patch) | |
| tree | 1e90b28cfce0c0876ad7f9886fb2ad405478fd39 /engine/menus | |
| parent | Use the same tools/make_patch.c as Gen 2 (diff) | |
| download | pokeyellow-5943b96cf6d5eda52df2ad689af0ac251e4e0841.tar.gz pokeyellow-5943b96cf6d5eda52df2ad689af0ac251e4e0841.tar.xz pokeyellow-5943b96cf6d5eda52df2ad689af0ac251e4e0841.zip | |
Use features of RGBDS 1.0.0 (#537)
Diffstat (limited to 'engine/menus')
| -rw-r--r-- | engine/menus/main_menu.asm | 10 | ||||
| -rw-r--r-- | engine/menus/naming_screen.asm | 18 | ||||
| -rw-r--r-- | engine/menus/party_menu.asm | 2 | ||||
| -rw-r--r-- | engine/menus/pokedex.asm | 20 | ||||
| -rw-r--r-- | engine/menus/save.asm | 6 | ||||
| -rw-r--r-- | engine/menus/start_sub_menus.asm | 8 | ||||
| -rw-r--r-- | engine/menus/text_box.asm | 2 |
7 files changed, 33 insertions, 33 deletions
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, "<DOT>" + ld a, '<DOT>' 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], "<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 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 |
