diff options
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/core.asm | 9 | ||||
| -rw-r--r-- | engine/battle/end_of_battle.asm | 6 | ||||
| -rw-r--r-- | engine/battle/link_battle_versus_text.asm | 4 | ||||
| -rw-r--r-- | engine/battle/wild_encounters.asm | 6 |
4 files changed, 16 insertions, 9 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 417516ae..8869b4ae 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2046,7 +2046,7 @@ DisplayBattleMenu:: ld a, $2 ; select the "ITEM" menu jp .upperLeftMenuItemWasNotSelected .oldManName - db "OLD MAN@" + db "ANCIANO@" .handleBattleMenuInput ld a, [wBattleAndStartSavedMenuItem] ld [wCurrentMenuItem], a @@ -2678,7 +2678,8 @@ MoveDisabledText: text_end WhichTechniqueString: - db "WHICH TECHNIQUE?@" + db "¿Qué técnica?" + next " @" SelectMenuItem_CursorUp: ld a, [wCurrentMenuItem] @@ -2898,10 +2899,10 @@ PrintMenuItem: jp Delay3 DisabledText: - db "disabled!@" + db "¡Anulado!@" TypeText: - db "TYPE@" + db "TIPO@" SelectEnemyMove: ld a, [wLinkState] diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index bd4a1901..ab556aca 100644 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -75,13 +75,13 @@ EndOfBattle: ret YouWinText: - db "YOU WIN@" + db " GANAS@" YouLoseText: - db "YOU LOSE@" + db "PIERDES@" DrawText: - db " DRAW@" + db "EMPATE@" PickUpPayDayMoneyText: text_far _PickUpPayDayMoneyText diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm index 29c11356..9d65b805 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, $69 + ld a, "V" ld [hli], a - ld [hl], $6a + ld [hl], "S" xor a ld [wUpdateSpritesEnabled], a callfar SetupPlayerAndEnemyPokeballs diff --git a/engine/battle/wild_encounters.asm b/engine/battle/wild_encounters.asm index 8c9c1529..1db9adf6 100644 --- a/engine/battle/wild_encounters.asm +++ b/engine/battle/wild_encounters.asm @@ -64,9 +64,13 @@ TryDoWildEncounter: ; determine which wild pokemon (grass or water) can appear in the half-block we're standing in ld c, [hl] ld hl, wGrassMons + ld a, [wWalkBikeSurfState] + bit 1, a + jr nz, .gotWaterMon lda_coord 8, 9 cp $14 ; is the bottom left tile (8,9) of the half-block we're standing in a water tile? jr nz, .gotWildEncounterType ; else, it's treated as a grass tile by default +.gotWaterMon ld hl, wWaterMons ; since the bottom right tile of a "left shore" half-block is $14 but the bottom left tile is not, ; "left shore" half-blocks (such as the one in the east coast of Cinnabar) load grass encounters. @@ -74,6 +78,8 @@ TryDoWildEncounter: ld b, 0 add hl, bc ld a, [hli] + cp $64 + jr nc, .CantEncounter2 ld [wCurEnemyLVL], a ld a, [hl] ld [wcf91], a |