fixes here and there

17 files changed, 37 insertions, 37 deletions

diff --git a/audio/engine_2.asm b/audio/engine_2.asm
index 51a5d7c4..80b6d95c 100644
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -1065,8 +1065,8 @@ Audio2_IsCry:
 	jr z, .no
 	jr c, .yes
 .no
-	scf
-	ccf
+	ld a, [wLowHealthAlarm]
+	rla
 	ret
 .yes
 	scf
diff --git a/data/moves/field_moves.asm b/data/moves/field_moves.asm
index d7e9219b..c67f4d6d 100644
--- a/data/moves/field_moves.asm
+++ b/data/moves/field_moves.asm
@@ -6,9 +6,9 @@ FieldMoveDisplayData:
 	db FLY,        2, $0C
 	db ANIM_B4,    3, $0C ; unused
 	db SURF,       4, $0C
-	db STRENGTH,   5, $0A
-	db FLASH,      6, $0C
-	db DIG,        7, $0C
-	db TELEPORT,   8, $0A
-	db SOFTBOILED, 9, $08
+	db STRENGTH,   5, $0C
+	db FLASH,      6, $0A
+	db DIG,        7, $0B
+	db TELEPORT,   8, $07
+	db SOFTBOILED, 9, $06
 	db -1 ; end
diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm
index f54b7616..d100919f 100755
--- a/data/pokemon/dex_entries.asm
+++ b/data/pokemon/dex_entries.asm
@@ -679,14 +679,14 @@ NinetalesDexEntry:
 	text_end
 
 PikachuDexEntry:
-	db "RATAÓN@"
+	db "RATÓN@"
 	db 4
 	dw 60
 	text_far _PikachuDexEntry
 	text_end
 
 RaichuDexEntry:
-	db "RATAÓN@"
+	db "RATÓN@"
 	db 8
 	dw 300
 	text_far _RaichuDexEntry
@@ -735,14 +735,14 @@ SeadraDexEntry:
 	text_end
 
 SandshrewDexEntry:
-	db "RATAÓN@"
+	db "RATÓN@"
 	db 6
 	dw 120
 	text_far _SandshrewDexEntry
 	text_end
 
 SandslashDexEntry:
-	db "RATAÓN@"
+	db "RATÓN@"
 	db 10
 	dw 295
 	text_far _SandslashDexEntry
diff --git a/data/text/text_6.asm b/data/text/text_6.asm
index d1be9a86..998d591b 100644
--- a/data/text/text_6.asm
+++ b/data/text/text_6.asm
@@ -185,7 +185,6 @@ _TeachMachineMoveText::
 	done
 
 _MonCannotLearnMachineMoveText::
-	text_start
 	text_ram wcd6d
 	text " no es"
 	line "compatible con"
diff --git a/data/text_boxes.asm b/data/text_boxes.asm
index b9fc70a1..a593a053 100644
--- a/data/text_boxes.asm
+++ b/data/text_boxes.asm
@@ -25,13 +25,13 @@ ENDM
 TextBoxTextAndCoordTable:
 	; text box ID, upper-left X, upper-left Y, lower-right X, lower-right Y, text pointer, text X, text Y
 	text_box_text JP_MOCHIMONO_MENU_TEMPLATE,         0,  0, 14, 17, BuySellQuitText,          3,  0
-	text_box_text USE_TOSS_MENU_TEMPLATE,            12, 10, 19, 14, UseTossText,             16, 11
+	text_box_text USE_TOSS_MENU_TEMPLATE,            12, 10, 19, 14, UseTossText,             14, 11
 	text_box_text JP_SAVE_MESSAGE_MENU_TEMPLATE,      0,  0,  7,  5, BuySellQuitText,          2,  2
 	text_box_text JP_SPEED_OPTIONS_MENU_TEMPLATE,     0,  6,  5, 10, BuySellQuitText,          2,  7
 	text_box_text BATTLE_MENU_TEMPLATE,               8, 12, 19, 17, BattleMenuText,          10, 14
 	text_box_text SAFARI_BATTLE_MENU_TEMPLATE,        0, 12, 19, 17, SafariZoneBattleMenuText, 2, 14
 	text_box_text SWITCH_STATS_CANCEL_MENU_TEMPLATE, 11, 11, 19, 17, SwitchStatsCancelText,   13, 12
-	text_box_text BUY_SELL_QUIT_MENU_TEMPLATE,        0,  0, 10,  6, $7482,                    2,  1
+	text_box_text BUY_SELL_QUIT_MENU_TEMPLATE,        0,  0, 10,  6, BuySellQuitText+1,        2,  1
 	text_box_text MONEY_BOX_TEMPLATE,                11,  0, 19,  2, MoneyText,               13,  0
 	text_box_text JP_AH_MENU_TEMPLATE,                7,  6, 11, 10, BuySellQuitText,          8,  8
 	text_box_text JP_POKEDEX_MENU_TEMPLATE,          11,  8, 19, 17, BuySellQuitText,         12, 10
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
diff --git a/engine/events/hidden_objects/school_blackboard.asm b/engine/events/hidden_objects/school_blackboard.asm
index de4700d4..e00b7cbf 100644
--- a/engine/events/hidden_objects/school_blackboard.asm
+++ b/engine/events/hidden_objects/school_blackboard.asm
@@ -68,10 +68,10 @@ LinkCableHelpText2:
 	text_end
 
 HowToLinkText:
-	db   "HOW TO LINK"
-	next "COLOSSEUM"
-	next "TRADE CENTER"
-	next "STOP READING@"
+	db   "CÓMO CONECTA"
+	next "COLISEO"
+	next "CENT. CAMBIO"
+	next "PARA DE LEER@"
 
 LinkCableInfoTexts:
 	dw LinkCableInfoText1
diff --git a/engine/events/prize_menu.asm b/engine/events/prize_menu.asm
index d9320fe7..c12e5188 100755
--- a/engine/events/prize_menu.asm
+++ b/engine/events/prize_menu.asm
@@ -151,7 +151,7 @@ PrintPrizePrice:
 	ld c, 7
 	call TextBoxBorder
 	call UpdateSprites
-	hlcoord 12, 0
+	hlcoord 13, 0
 	ld de, .CoinString
 	call PlaceString
 	hlcoord 13, 1
@@ -164,7 +164,7 @@ PrintPrizePrice:
 	ret
 
 .CoinString:
-	db "COIN@"
+	db "FICHAS@"
 
 .SixSpacesString:
 	db "      @"
diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm
index b357f8f3..e630958b 100755
--- a/engine/items/town_map.asm
+++ b/engine/items/town_map.asm
@@ -415,7 +415,7 @@ DisplayWildLocations:
 	jp CopyData
 
 AreaUnknownText:
-	db " AREA UNKNOWN@"
+	db " DESCONOCIDA@"
 
 TownMapCoordsToOAMCoords:
 ; in: lower nybble of a = x, upper nybble of a = y
diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm
index 46a2bf77..f2c1c5fc 100755
--- a/engine/link/cable_club.asm
+++ b/engine/link/cable_club.asm
@@ -596,13 +596,13 @@ ReturnToCableClubRoom:
 	ret
 
 TradeCenter_DrawCancelBox:
-	hlcoord 11, 15
+	hlcoord 8, 15
 	ld a, $7e
-	ld bc, 2 * SCREEN_WIDTH + 9
+	ld bc, 2 * SCREEN_WIDTH + 12
 	call FillMemory
 	hlcoord 0, 15
 	ld b, 1
-	ld c, 9
+	ld c, 16
 	call CableClub_TextBoxBorder
 	hlcoord 2, 16
 	ld de, CancelTextString
diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm
index df91972f..2b41ab6b 100755
--- a/engine/menus/pokedex.asm
+++ b/engine/menus/pokedex.asm
@@ -549,9 +549,9 @@ ShowPokedexDataInternal:
 	lb bc, 2, 4 ; 2 bytes, 4 digits
 	call PrintNumber ; print weight
 	hlcoord 14, 8
-	ld a, [hDexWeight + 1]
+	ldh a, [hDexWeight + 1]
 	sub a, 10
-	ld a, [hDexWeight]
+	ldh a, [hDexWeight]
 	sbc a,0
 	jr nc, .next
 	ld [hl], "0" ; if the weight is less than 10, put a 0 before the decimal point
diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index ac3b218f..72a6c8c5 100755
--- 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
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index b05c271b..37811b81 100755
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -56,7 +56,7 @@ DisplayTitleScreen:
 	ld a, BANK(PokemonLogoGraphics)
 	call FarCopyData2          ; second chunk
 	ld hl, Version_GFX
-	ld de, vChars2 tile $60 + (10 tiles - (Version_GFXEnd - Version_GFX) * 2) / 2
+	ld de, vChars2 tile $60 + (8 tiles - (Version_GFXEnd - Version_GFX) * 2) / 2
 	ld bc, Version_GFXEnd - Version_GFX
 	ld a, BANK(Version_GFX)
 	call FarCopyDataDouble
@@ -398,12 +398,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,"@" ; "Edición Roja"
-ENDC
-IF DEF(_BLUE)
-	db $61,$62,$63,$64,$65,$66,$67,$68,"@" ; "Edición Azul"
-ENDC
+	db $60,$61,$62,$63,$64,$65,$66,$67,"@" ; "Edición Roja" or "Edición Azul"
 
 NintenText: db "NINTEN@"
 SonyText:   db "SONY@"
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index 7a5c1fe6..cb994e98 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -717,7 +717,7 @@ GetTileSpriteStandsOn:
 	ld l, a
 	ld a, [hli]     ; x#SPRITESTATEDATA1_YPIXELS
 	add $4          ; align to 2*2 tile blocks (Y position is always off 4 pixels to the top)
-	and $f0         ; in case object is currently moving
+	and $f8         ; in case object is currently moving
 	srl a           ; screen Y tile * 4
 	ld c, a
 	ld b, $0
diff --git a/gfx/title/red_version.png b/gfx/title/red_version.png
index 652d00e0..fe32b655 100644
--- a/gfx/title/red_version.png
+++ b/gfx/title/red_version.png
diff --git a/home/audio.asm b/home/audio.asm
index e1951fd5..eded85e9 100644
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -185,7 +185,7 @@ PlaySound::
 	jr nz, .audio3
 ; audio 2
 	ld a, b
-	call $603A ; TODO Audio2_PlaySound??
+	call Audio2_PlaySound
 	jr .next2
 
 .audio3
diff --git a/text/CeladonMansion2F.asm b/text/CeladonMansion2F.asm
index f63ee09b..b2e91bf1 100644
--- a/text/CeladonMansion2F.asm
+++ b/text/CeladonMansion2F.asm
@@ -1,4 +1,4 @@
 _CeladonMansion2Text1::
 	text "GAME FREAK"
-	line "Sala Desarrollo"
+	line "Sala Reuniones"
 	done