diff options
Diffstat (limited to 'engine/menus')
| -rw-r--r-- | engine/menus/draw_start_menu.asm | 12 | ||||
| -rw-r--r-- | engine/menus/league_pc.asm | 2 | ||||
| -rw-r--r-- | engine/menus/main_menu.asm | 32 | ||||
| -rw-r--r-- | engine/menus/naming_screen.asm | 36 | ||||
| -rw-r--r-- | engine/menus/party_menu.asm | 8 | ||||
| -rw-r--r-- | engine/menus/players_pc.asm | 12 | ||||
| -rw-r--r-- | engine/menus/pokedex.asm | 53 | ||||
| -rw-r--r-- | engine/menus/save.asm | 28 | ||||
| -rw-r--r-- | engine/menus/start_sub_menus.asm | 13 | ||||
| -rw-r--r-- | engine/menus/text_box.asm | 11 |
10 files changed, 104 insertions, 103 deletions
diff --git a/engine/menus/draw_start_menu.asm b/engine/menus/draw_start_menu.asm index 00d385bc..b8c4d927 100644 --- a/engine/menus/draw_start_menu.asm +++ b/engine/menus/draw_start_menu.asm @@ -60,25 +60,25 @@ DrawStartMenu:: ret StartMenuPokedexText: - db "POKéDEX@" + db "#DEX@" StartMenuPokemonText: - db "POKéMON@" + db "#MON@" StartMenuItemText: - db "ITEM@" + db "OBJETOS@" StartMenuSaveText: - db "SAVE@" + db "GUARDAR@" StartMenuResetText: db "RESET@" StartMenuExitText: - db "EXIT@" + db "SALIR@" StartMenuOptionText: - db "OPTION@" + db "OPCIÓN@" PrintStartMenuItem: push hl diff --git a/engine/menus/league_pc.asm b/engine/menus/league_pc.asm index 533454ad..517f95d6 100644 --- a/engine/menus/league_pc.asm +++ b/engine/menus/league_pc.asm @@ -113,7 +113,7 @@ LeaguePCShowMon: farjp HoFDisplayMonInfo HallOfFameNoText: - db "HALL OF FAME No @" + db "HALL DE FAMA Nº @" AccessedHoFPCText: text_far _AccessedHoFPCText diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm index 95404cce..ac2aa3c0 100644 --- a/engine/menus/main_menu.asm +++ b/engine/menus/main_menu.asm @@ -330,18 +330,18 @@ SpecialEnterMap:: jp EnterMap ContinueText: - db "CONTINUE" + db "CONTINUAR" next "" ; fallthrough NewGameText: - db "NEW GAME" - next "OPTION@" + db "JUEGO NUEVO" + next "OPCIONES@" CableClubOptionsText: - db "TRADE CENTER" - next "COLOSSEUM" - next "CANCEL@" + db "CENT. CAMBIO" + next "COLISEO" + next "SALIR@" DisplayContinueGameInfo: xor a @@ -424,10 +424,10 @@ PrintPlayTime: jp PrintNumber SaveScreenInfoText: - db "PLAYER" - next "BADGES " + db "JUGAD." + next "MEDALLAS " next "#DEX " - next "TIME@" + next "TIEMPO@" DisplayOptionMenu: hlcoord 0, 0 @@ -582,19 +582,19 @@ DisplayOptionMenu: jp .eraseOldMenuCursor TextSpeedOptionText: - db "TEXT SPEED" - next " FAST MEDIUM SLOW@" + db "VELOCIDAD TEXTO" + next " RÁP. MED. LEN.@" BattleAnimationOptionText: - db "BATTLE ANIMATION" - next " ON OFF@" + db "ANIMACIÓN BATALLA" + next " SÍ NO@" BattleStyleOptionText: - db "BATTLE STYLE" - next " SHIFT SET@" + db "ESTILO BATALLA" + next " CAMBIAR MANTENER@" OptionMenuCancelText: - db "CANCEL@" + db "SALIR@" ; sets the options variable according to the current placement of the menu cursors in the options menu SetOptionsFromCursorPositions: diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 9347212e..181978fc 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -324,12 +324,15 @@ DisplayNamingScreen: jp EraseMenuCursor LoadEDTile: - ld de, ED_Tile - ld hl, vFont tile $70 - ld bc, (ED_TileEnd - ED_Tile) / $8 + call DisableLCD + ld de, vFont + $700 + ld hl, ED_Tile + ld bc, (ED_TileEnd - ED_Tile) ; to fix the graphical bug on poor emulators - ;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) / $8 - jp CopyVideoDataDouble + ;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) + ld a, $01 + call FarCopyDataDouble + jp EnableLCD ED_Tile: INCBIN "gfx/font/ED.1bpp" @@ -454,10 +457,10 @@ PrintNamingText: ld a, [wNamingScreenType] ld de, YourTextString and a - jr z, .notNickname + jr z, .placeString ld de, RivalsTextString dec a - jr z, .notNickname + jr z, .placeString ld a, [wcf91] ld [wMonPartySpriteSpecies], a push af @@ -467,28 +470,21 @@ PrintNamingText: call GetMonName hlcoord 4, 1 call PlaceString - ld hl, $1 - add hl, bc - ld [hl], "の" ; leftover from Japanese version; blank tile $c9 in English hlcoord 1, 3 - ld de, NicknameTextString + ld de, NicknameTextString ; $69BC jr .placeString -.notNickname - call PlaceString - ld l, c - ld h, b - ld de, NameTextString + .placeString jp PlaceString YourTextString: - db "YOUR @" + db "¿TU NOMBRE?@" RivalsTextString: - db "RIVAL's @" + db "¿NOMBRE RIVAL?@" NameTextString: - db "NAME?@" + db "¿NOMBRE?@" NicknameTextString: - db "NICKNAME?@" + db "¿APODO?@" diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm index 6648ab54..2fdd9cd1 100644 --- a/engine/menus/party_menu.asm +++ b/engine/menus/party_menu.asm @@ -108,9 +108,9 @@ RedrawPartyMenu_:: inc c jp .loop .ableToLearnMoveText - db "ABLE@" + db "PUEDE@" .notAbleToLearnMoveText - db "NOT ABLE@" + db "NO PUEDE@" .evolutionStoneMenu push hl ld hl, EvosMovesPointerTable @@ -165,9 +165,9 @@ RedrawPartyMenu_:: pop hl jr .printLevel .ableToEvolveText - db "ABLE@" + db "PUEDE@" .notAbleToEvolveText - db "NOT ABLE@" + db "NO PUEDE@" .afterDrawingMonEntries ld b, SET_PAL_PARTY_MENU call RunPaletteCommand diff --git a/engine/menus/players_pc.asm b/engine/menus/players_pc.asm index 5461be51..e896cfae 100644 --- a/engine/menus/players_pc.asm +++ b/engine/menus/players_pc.asm @@ -1,6 +1,4 @@ PlayerPC:: - ld hl, wd730 - set 6, [hl] ld a, ITEM_NAME ld [wNameListType], a call SaveScreenTilesToBuffer1 @@ -17,6 +15,8 @@ PlayerPC:: call PrintText PlayerPCMenu: + ld hl, wd730 + set 6, [hl] ld a, [wParentMenuItem] ld [wCurrentMenuItem], a ld hl, wFlags_0xcd60 @@ -241,10 +241,10 @@ PlayerPCToss: jp .loop PlayersPCMenuEntries: - db "WITHDRAW ITEM" - next "DEPOSIT ITEM" - next "TOSS ITEM" - next "LOG OFF@" + db "SACAR OBJETO" + next "DEJAR OBJETO" + next "TIRAR OBJETO" + next "DESCONEXIÓN@" TurnedOnPC2Text: text_far _TurnedOnPC2Text diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index 2af8d714..c2e7de5a 100644 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -360,19 +360,19 @@ DrawPokedexVerticalLine: ret PokedexSeenText: - db "SEEN@" + db "VIST@" PokedexOwnText: - db "OWN@" + db "TIEN@" PokedexContentsText: - db "CONTENTS@" + db "CONTENIDO@" PokedexMenuItemsText: - db "DATA" - next "CRY" - next "AREA" - next "QUIT@" + db "INFO" + next "GRIT" + next "ÁREA" + next "SALE@" ; tests if a pokemon's bit is set in the seen or owned pokemon bit fields ; INPUT: @@ -515,22 +515,23 @@ ShowPokedexDataInternal: jp z, .waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description inc de ; de = address of feet (height) ld a, [de] ; reads feet, but a is overwritten without being used - hlcoord 12, 6 - lb bc, 1, 2 + push af + hlcoord 13, 6 + lb bc, 1, 3 call PrintNumber ; print feet (height) - 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 [hl], a -; now print the weight (note that weight is stored in tenths of pounds internally) + hlcoord 14, 6 + pop af + cp $a + jr nc, .func_43d7 + ld [hl], "0" +.func_43d7 + inc hl + ld a, [hli] + ldd [hl], a + ld [hl], "<DOT>" inc de inc de - inc de ; de = address of upper byte of weight + inc de ; de = address of inches (height) push de ; put weight in big-endian order at hDexWeight ld hl, hDexWeight @@ -544,14 +545,14 @@ ShowPokedexDataInternal: ld a, [de] ; a = lower byte of weight ld [hl], a ; store lower byte of weight in [hDexWeight + 1] ld de, hDexWeight - hlcoord 11, 8 - lb bc, 2, 5 ; 2 bytes, 5 digits + hlcoord 12, 8 + lb bc, 2, 4 ; 2 bytes, 4 digits call PrintNumber ; print weight hlcoord 14, 8 ldh a, [hDexWeight + 1] - sub 10 + sub a, 10 ldh a, [hDexWeight] - sbc 0 + sbc a,0 jr nc, .next ld [hl], "0" ; if the weight is less than 10, put a 0 before the decimal point .next @@ -590,8 +591,8 @@ ShowPokedexDataInternal: ret HeightWeightText: - db "HT ?′??″" - next "WT ???lb@" + db "AL ???<m>" + next "PE ???<k><g>@" ; XXX does anything point to this? PokeText: diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 194fb810..a01e767e 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -171,7 +171,7 @@ SaveSAV: jp DelayFrames NowSavingString: - db "Now saving...@" + db "Salvando...@" SaveSAVConfirm: call PrintText @@ -494,21 +494,21 @@ ChooseABoxText: text_end BoxNames: - db "BOX 1" - next "BOX 2" - next "BOX 3" - next "BOX 4" - next "BOX 5" - next "BOX 6" - next "BOX 7" - next "BOX 8" - next "BOX 9" - next "BOX10" - next "BOX11" - next "BOX12@" + db "C. 1" + next "C. 2" + next "C. 3" + next "C. 4" + next "C. 5" + next "C. 6" + next "C. 7" + next "C. 8" + next "C. 9" + next "C. 10" + next "C. 11" + next "C. 12@" BoxNoText: - db "BOX No.@" + db "CAJA Nº@" EmptyAllSRAMBoxes: ; marks all boxes in SRAM as empty (initialisation for the first time the diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm index c0448121..115036e9 100644 --- a/engine/menus/start_sub_menus.asm +++ b/engine/menus/start_sub_menus.asm @@ -347,7 +347,7 @@ StartMenu_Item:: ld hl, wTopMenuItemY ld a, 11 ld [hli], a ; top menu item Y - ld a, 14 + ld a, 13 ld [hli], a ; top menu item X xor a ld [hli], a ; current menu item ID @@ -552,8 +552,9 @@ DrawTrainerInfo: call PlaceString hlcoord 8, 4 ld de, wPlayerMoney - ld c, $e3 + ld c, $c3 call PrintBCDNumber + ld [hl], $f0 hlcoord 9, 6 ld de, wPlayTimeHours ; hours lb bc, LEFT_ALIGN | 1, 3 @@ -569,13 +570,13 @@ TrainerInfo_FarCopyData: jp FarCopyData2 TrainerInfo_NameMoneyTimeText: - db "NAME/" - next "MONEY/" - next "TIME/@" + db "NOM./" + next "DIN./" + next "TIEMPO/@" ; $76 is a circle tile TrainerInfo_BadgesText: - db $76,"BADGES",$76,"@" + db $76,"MEDALLAS",$76,"@" ; draws a text box on the trainer info screen ; height is always 6 diff --git a/engine/menus/text_box.asm b/engine/menus/text_box.asm index 5253ec48..6579e656 100644 --- a/engine/menus/text_box.asm +++ b/engine/menus/text_box.asm @@ -138,8 +138,11 @@ DisplayMoneyBox: ld c, 6 call ClearScreenArea hlcoord 12, 1 + ld de, CurrencyString + call PlaceString + hlcoord 12, 1 ld de, wPlayerMoney - ld c, $a3 + ld c, "D" call PrintBCDNumber ld hl, wd730 res 6, [hl] @@ -502,9 +505,9 @@ DisplayFieldMoveMonMenu: INCLUDE "data/moves/field_move_names.asm" PokemonMenuEntries: - db "STATS" - next "SWITCH" - next "CANCEL@" + db "ESTAD." + next "CAMBIO" + next "SALIR@" GetMonFieldMoves: ld a, [wWhichPokemon] |