Gettin closer

13 files changed, 49 insertions, 49 deletions

diff --git a/audio/engine_2.asm b/audio/engine_2.asm
index 097fee5b..26cef4bd 100644
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -1016,8 +1016,8 @@ Audio2_21e8b:
 	cp $86
 	jr z, .asm_21e9a
 	jr c, .asm_21e9d
-	ld a, [$D088]
 .asm_21e9a
+	ld a, [wLowHealthAlarm]
 	rla
 	ret
 .asm_21e9d
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 6ed7a9cb..1d7cd474 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2120,12 +2120,12 @@ DisplayBattleMenu:
 	ld bc, NAME_LENGTH
 	call CopyData
 ; the following simulates the keystrokes by drawing menus on screen
-	coord hl, 9, 14
+	coord hl, 7, 14
 	ld [hl], "▶"
 	ld c, 80
 	call DelayFrames
 	ld [hl], " "
-	coord hl, 9, 16
+	coord hl, 7, 16
 	ld [hl], "▶"
 	ld c, 50
 	call DelayFrames
@@ -2150,13 +2150,13 @@ DisplayBattleMenu:
 	ld a, " "
 	jr z, .safariLeftColumn
 ; put cursor in left column for normal battle menu (i.e. when it's not a Safari battle)
-	Coorda 15, 14 ; clear upper cursor position in right column
-	Coorda 15, 16 ; clear lower cursor position in right column
-	ld b, $9 ; top menu item X
+	Coorda 13, 14 ; clear upper cursor position in right column
+	Coorda 13, 16 ; clear lower cursor position in right column
+	ld b, $7 ; top menu item X
 	jr .leftColumn_WaitForInput
 .safariLeftColumn
-	Coorda 13, 14
-	Coorda 13, 16
+	Coorda 12, 14
+	Coorda 12, 16
 	coord hl, 7, 14
 	ld de, wNumSafariBalls
 	lb bc, 1, 2
@@ -2183,9 +2183,9 @@ DisplayBattleMenu:
 	ld a, " "
 	jr z, .safariRightColumn
 ; put cursor in right column for normal battle menu (i.e. when it's not a Safari battle)
-	Coorda 9, 14 ; clear upper cursor position in left column
-	Coorda 9, 16 ; clear lower cursor position in left column
-	ld b, $f ; top menu item X
+	Coorda 7, 14 ; clear upper cursor position in left column
+	Coorda 7, 16 ; clear lower cursor position in left column
+	ld b, $d ; top menu item X
 	jr .rightColumn_WaitForInput
 .safariRightColumn
 	Coorda 1, 14 ; clear upper cursor position in left column
@@ -2194,7 +2194,7 @@ DisplayBattleMenu:
 	ld de, wNumSafariBalls
 	lb bc, 1, 2
 	call PrintNumber
-	ld b, $d ; top menu item X
+	ld b, $c ; top menu item X
 .rightColumn_WaitForInput
 	ld hl, wTopMenuItemY
 	ld a, $e
diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm
index b22eabdb..cc98239d 100644
--- a/engine/battle/link_battle_versus_text.asm
+++ b/engine/battle/link_battle_versus_text.asm
@@ -12,17 +12,17 @@ DisplayLinkBattleVersusTextBox:
 	ld de, wLinkEnemyTrainerName
 	call PlaceString
 ; place bold "VS" tiles between the names
-	coord hl, 9, 8
+	coord hl, 7, 8
 	ld a, "C"
-	ld [hl], a
+	ldi [hl], a
 	ld a, "O"
-	ld [hl], a
+	ldi [hl], a
 	ld a, "N"
-	ld [hl], a
+	ldi [hl], a
 	ld a, "T"
-	ld [hl], a
+	ldi [hl], a
 	ld a, "R"
-	ld [hl], a
+	ldi [hl], a
 	ld [hl], "E"
 	xor a
 	ld [wUpdateSpritesEnabled], a
diff --git a/engine/cable_club.asm b/engine/cable_club.asm
index c990119c..70be26c2 100755
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -596,9 +596,9 @@ ReturnToCableClubRoom:
 	ret
 
 TradeCenter_DrawCancelBox:
-	coord hl, 11, 15
+	coord hl, 8, 15
 	ld a, $7e
-	ld bc, 2 * SCREEN_WIDTH + 9
+	ld bc, 2 * SCREEN_WIDTH + 12
 	call FillMemory
 	coord hl, 0, 15
 	ld b, 1
@@ -712,8 +712,8 @@ TradeCenter_Trade:
 	coord bc, 1, 14
 	call TextCommandProcessor
 	call SaveScreenTilesToBuffer1
-	coord hl, 10, 7
-	lb bc, 8, 11
+	coord hl, 9, 7
+	lb bc, 8, 10
 	ld a, TRADE_CANCEL_MENU
 	ld [wTwoOptionMenuID], a
 	ld a, TWO_OPTION_MENU
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index 8b3313b6..bb47e3bd 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -39,11 +39,11 @@ DisplayPCMainMenu::
 .next2
 	call PlaceString
 	coord hl, 2, 4
-	ld de, wPlayerName
+	ld de, PlayersPCText
 	call PlaceString
 	ld l, c
 	ld h, b
-	ld de, PlayersPCText
+	ld de, wPlayerName
 	call PlaceString
 	CheckEvent EVENT_GOT_POKEDEX
 	jr z, .noOaksPC2
@@ -121,7 +121,7 @@ BillsPCMenu:
 	call LoadScreenTilesFromBuffer2DisableBGTransfer
 	coord hl, 0, 0
 	ld b, 10
-	ld c, 12
+	ld c, 14
 	call TextBoxBorder
 	coord hl, 2, 2
 	ld de, BillsPCMenuText
@@ -146,9 +146,9 @@ BillsPCMenu:
 	ld [wPlayerMonNumber], a
 	ld hl, WhatText
 	call PrintText
-	coord hl, 9, 14
+	coord hl, 11, 14
 	ld b, 2
-	ld c, 9
+	ld c, 7
 	call TextBoxBorder
 	ld a, [wCurrentBoxNum]
 	and $7f
@@ -164,7 +164,7 @@ BillsPCMenu:
 	add "1"
 .next
 	Coorda 18, 16
-	coord hl, 10, 16
+	coord hl, 12, 16
 	ld de, BoxNoPCText
 	call PlaceString
 	ld a, 1
diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm
index 4fc02ff8..107fe17d 100755
--- a/engine/menu/diploma.asm
+++ b/engine/menu/diploma.asm
@@ -91,7 +91,7 @@ DiplomaTextPointersAndCoords:
 	dw DiplomaCongrats
 	dwCoord 2, 6
 	dw DiplomaGameFreak
-	dwCoord 9, 16
+	dwCoord 9, 15
 
 DiplomaText:
 	db $70,"Diplôme",$70,"@"
diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm
index 546203f6..e3f9f1dd 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -516,8 +516,8 @@ ShowPokedexDataInternal:
 	inc de ; de = address of feet (height)
 	ld a,[de] ; reads feet, but a is overwritten without being used
 	push af
-	coord hl, 12, 6
-	lb bc, 1, 2
+	coord hl, 13, 6
+	lb bc, 1, 3
 	call PrintNumber ; print feet (height)
 	ld hl, $C426
 	pop af
@@ -545,8 +545,8 @@ ShowPokedexDataInternal:
 	ld a,[de] ; a = lower byte of weight
 	ld [hl],a ; store lower byte of weight in [hDexWeight + 1]
 	ld de,hDexWeight
-	coord hl, 11, 8
-	lb bc, 2, 5 ; 2 bytes, 5 digits
+	coord hl, 12, 8
+	lb bc, 2, 4 ; 2 bytes, 4 digits
 	call PrintNumber ; print weight
 	coord hl, 14, 8
 	ld a,[hDexWeight + 1]
diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm
index 4fbb739f..e2535261 100755
--- a/engine/menu/prize_menu.asm
+++ b/engine/menu/prize_menu.asm
@@ -153,7 +153,7 @@ PrintPrizePrice:
 	ld c, 7
 	call TextBoxBorder
 	call UpdateSprites
-	coord hl, 12, 0
+	coord hl, 13, 0
 	ld de, .CoinString
 	call PlaceString
 	coord hl, 13, 1
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index fc421c81..e2003d12 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -708,7 +708,7 @@ GetTileSpriteStandsOn:
 	ld l, a
 	ld a, [hli]     ; c1x4: screen Y position
 	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/engine/titlescreen.asm b/engine/titlescreen.asm
index a1da7292..f9e3d5d0 100755
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -42,7 +42,7 @@ DisplayTitleScreen:
 	call FarCopyData2
 	ld hl, GamefreakLogoGraphics
 	ld de, vTitleLogo2 + $100 + $50
-	ld bc, $90
+	ld bc, $a0
 	ld a, BANK(GamefreakLogoGraphics)
 	call FarCopyData2
 	ld hl, PokemonLogoGraphics
@@ -370,7 +370,7 @@ LoadCopyrightAndTextBoxTiles:
 LoadCopyrightTiles:
 	ld de, NintendoCopyrightLogoGraphics
 	ld hl, vChars2 + $600
-	lb bc, BANK(NintendoCopyrightLogoGraphics), (GamefreakLogoGraphicsEnd - NintendoCopyrightLogoGraphics) / $10
+	lb bc, BANK(NintendoCopyrightLogoGraphics), (GamefreakLogoGraphicsEnd - NintendoCopyrightLogoGraphics) / $0f
 	call CopyVideoData
 	coord hl, 2, 7
 	ld de, CopyrightTextString
@@ -386,7 +386,7 @@ INCLUDE "data/title_mons.asm"
 
 ; prints version text (red, blue)
 PrintGameVersionOnTitleScreen:
-	coord hl, 7, 8
+	coord hl, 6, 8
 	ld de, VersionOnTitleScreenText
 	jp PlaceString
 
diff --git a/engine/trade2.asm b/engine/trade2.asm
index 461c34cd..7797ccdf 100755
--- a/engine/trade2.asm
+++ b/engine/trade2.asm
@@ -44,5 +44,5 @@ Trade_PrintEnemyMonInfoText:
 
 Trade_MonInfoText:
 	db "──№⠄",$4E
-	next "OT/"
-	next $73,"№⠄","@"
+	next "DO/"
+	next "№",$73,"⠄@"
diff --git a/main.asm b/main.asm
index 400b5f6d..10e15aba 100755
--- a/main.asm
+++ b/main.asm
@@ -1328,9 +1328,9 @@ TextBoxTextAndCoordTable:
 	db 3,0   ; text coordinates
 
 	db USE_TOSS_MENU_TEMPLATE
-	db 13,10,19,14 ; text box coordinates
+	db 12,10,19,14 ; text box coordinates
 	dw UseTossText
-	db 15,11 ; text coordinates
+	db 14,11 ; text coordinates
 
 	db JP_SAVE_MESSAGE_MENU_TEMPLATE
 	db 0,0,7,5     ; text box coordinates
@@ -1343,9 +1343,9 @@ TextBoxTextAndCoordTable:
 	db 2,7   ; text coordinates
 
 	db BATTLE_MENU_TEMPLATE
-	db 8,12,19,17  ; text box coordinates
+	db 6,12,19,17  ; text box coordinates
 	dw BattleMenuText
-	db 10,14 ; text coordinates
+	db 8,14 ; text coordinates
 
 	db SAFARI_BATTLE_MENU_TEMPLATE
 	db 0,12,19,17  ; text box coordinates
@@ -1416,12 +1416,12 @@ DisplayMoneyBox:
 	call ClearScreenArea
 	coord hl, 12, 1
 	ld de, wPlayerMoney
-	call PrintBCDNumber
+	call PlaceString
 	ld hl, wd730
-	ld de, $D34C
+	ld de, wPlayerMoney
 	ld c, $83
 	call PrintBCDNumber
-	ld hl, $D735
+	ld hl, wd730
 	res 6, [hl]
 	ret
 
@@ -1673,7 +1673,7 @@ TwoOptionMenuStrings:
 	dw .YesNoMenu
 	db 6,3,0
 	dw .NorthEastMenu
-	db 7,3,0
+	db 8,3,0
 	dw .TradeCancelMenu
 	db 7,4,1
 	dw .HealCancelMenu
diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm
index bdf76540..89aa3b03 100755
--- a/scripts/celadongamecorner.asm
+++ b/scripts/celadongamecorner.asm
@@ -491,7 +491,7 @@ CeladonGameCornerScript_48f1e:
 	call PlaceString
 	coord hl, 12, 3
 	ld de, wPlayerMoney
-	ld c, $a3
+	ld c, $83
 	call PrintBCDNumber
 	coord hl, 12, 4
 	ld de, GameCornerCoinText