summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorklektron <klektron@users.noreply.github.com>2020-12-31 20:27:09 +0100
committerklektron <klektron@users.noreply.github.com>2020-12-31 20:27:09 +0100
commit36d4d6fe0aeeb60b5137b812b779fa82b05b4a5a (patch)
tree213b9771f884b4c3f5f6f3436b2e9c20a7989dd7 /engine
parent4bd566bbb14ba293e23ec8c21ee1a7541d9f975a (diff)
aaaand more fixes
Diffstat (limited to 'engine')
-rwxr-xr-xengine/items/town_map.asm7
-rwxr-xr-xengine/menus/main_menu.asm2
-rwxr-xr-xengine/menus/party_menu.asm8
-rwxr-xr-xengine/movie/title.asm2
-rw-r--r--engine/overworld/movement.asm10
-rwxr-xr-xengine/pokemon/status_screen.asm7
6 files changed, 17 insertions, 19 deletions
diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm
index 0c56dd88..b357f8f3 100755
--- a/engine/items/town_map.asm
+++ b/engine/items/town_map.asm
@@ -120,10 +120,9 @@ LoadTownMap_Nest:
push hl
call DisplayWildLocations
call GetMonName
- hlcoord 1, 0
+ hlcoord 9, 0
call PlaceString
- ld h, b
- ld l, c
+ hlcoord 1, 0
ld de, MonsNestText
call PlaceString
call WaitForTextScrollButtonPress
@@ -134,7 +133,7 @@ LoadTownMap_Nest:
ret
MonsNestText:
- db "'s NEST@"
+ db "NIDO DE @"
LoadTownMap_Fly::
call ClearSprites
diff --git a/engine/menus/main_menu.asm b/engine/menus/main_menu.asm
index 9620a2d0..ac2aa3c0 100755
--- a/engine/menus/main_menu.asm
+++ b/engine/menus/main_menu.asm
@@ -425,7 +425,7 @@ PrintPlayTime:
SaveScreenInfoText:
db "JUGAD."
- next "MEDALLAS "
+ next "MEDALLAS "
next "#DEX "
next "TIEMPO@"
diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm
index 6648ab54..2fdd9cd1 100755
--- 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/movie/title.asm b/engine/movie/title.asm
index 2a405400..b05c271b 100755
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -399,7 +399,7 @@ PrintGameVersionOnTitleScreen:
; these point to special tiles specifically loaded for that purpose and are not usual text
VersionOnTitleScreenText:
IF DEF(_RED)
- db $60,$61,$62,$63,$64,$65,$66,$67,$68,$69,"@" ; "Edición Roja"
+ db $60,$61,$62,$63,$64,$65,$66,$67,"@" ; "Edición Roja"
ENDC
IF DEF(_BLUE)
db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Edición Azul"
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index 5dcef8ec..7a5c1fe6 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -461,7 +461,7 @@ InitializeSpriteScreenPosition:
ld b, a
ld a, [hl] ; x#SPRITESTATEDATA2_MAPY
sub b ; relative to player position
- call Func_515D
+ call Func_5119
sub $4 ; - 4
dec h
ld [hli], a ; [x#SPRITESTATEDATA1_YPIXELS]
@@ -470,20 +470,20 @@ InitializeSpriteScreenPosition:
ld b, a
ld a, [hli] ; x#SPRITESTATEDATA2_MAPX
sub b ; relative to player position
- call Func_515D
+ call Func_5119
dec h
ld [hl], a ; [x#SPRITESTATEDATA1_XPIXELS]
ret
-Func_515D:
- jr nc, .asm_5166
+Func_5119:
+ jr nc, .asm_5122
cpl
inc a
swap a
cpl
inc a
ret
-.asm_5166
+.asm_5122
swap a
ret
diff --git a/engine/pokemon/status_screen.asm b/engine/pokemon/status_screen.asm
index eb8c4890..9d53c003 100755
--- a/engine/pokemon/status_screen.asm
+++ b/engine/pokemon/status_screen.asm
@@ -221,7 +221,7 @@ OTText:
next "@"
StatusText:
- db "ESTADO/@"
+ db "ESTADO@"
OKText:
db "OK@"
@@ -399,9 +399,8 @@ StatusScreen2:
inc a
ld [wLoadedMonLevel], a ; Increase temporarily if not 100
.Level100
- hlcoord 14, 6
- ld [hl], "<to>"
- inc hl
+ hlcoord 15, 6
+ ld [hl], "A"
inc hl
call PrintLevel
pop af