summaryrefslogtreecommitdiff
path: root/engine/battle
diff options
context:
space:
mode:
Diffstat (limited to 'engine/battle')
-rwxr-xr-xengine/battle/core.asm26
-rwxr-xr-xengine/battle/end_of_battle.asm12
-rw-r--r--engine/battle/link_battle_versus_text.asm2
-rw-r--r--engine/battle/save_trainer_name.asm30
4 files changed, 34 insertions, 36 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 6d758dd1..a80da1af 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2967,7 +2967,7 @@ PrintMenuItem:
call PlaceString
coord hl, 7, 11
ld [hl], "/"
- coord hl, 5, 9
+ coord hl, 4, 9
ld [hl], "/"
coord hl, 5, 11
ld de, wcd6d
@@ -6907,19 +6907,15 @@ InitWildBattle:
ld [hli], a ; write front sprite pointer
ld [hl], b
ld hl, wEnemyMonNick ; set name to "GHOST"
- ld a, "S"
- ld [hli], a
- ld a, "P"
+ ld a, "G"
ld [hli], a
ld a, "E"
ld [hli], a
- ld a, "C"
- ld [hli], a
- ld a, "T"
+ ld a, "I"
ld [hli], a
- ld a, "R"
+ ld a, "S"
ld [hli], a
- ld a, "E"
+ ld a, "T"
ld [hli], a
ld [hl], "@"
ld a, [wcf91]
@@ -7963,12 +7959,12 @@ PrintStatText:
jp CopyData
StatsTextStrings:
- db "FOR@"
- db "DEF@"
- db "VIT@"
- db "SPE@"
- db "PRE@"
- db "ESQ@"
+ db "ANGR@"
+ db "VERT@"
+ db "INIT@"
+ db "SPEZ@"
+ db "GENA@"
+ db "FLU@"
StatModifierRatios:
; first byte is numerator, second byte is denominator
diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm
index 92a1bcda..f3720944 100755
--- a/engine/battle/end_of_battle.asm
+++ b/engine/battle/end_of_battle.asm
@@ -12,14 +12,16 @@ EndOfBattle:
call ClearScreen
callab DisplayLinkBattleVersusTextBox
ld a, [wBattleResult]
- cp $1
+ cp 1
ld de, YouWinText
jr c, .placeWinOrLoseString
ld de, YouLoseText
jr z, .placeWinOrLoseString
ld de, DrawText
-.placeWinOrLoseString
coord hl, 6, 8
+ jr .placeWinOrLoseString
+ coord hl, 6, 8
+.placeWinOrLoseString
call PlaceString
ld c, 200
call DelayFrames
@@ -75,13 +77,13 @@ EndOfBattle:
ret
YouWinText:
- db " GAGNE@"
+ db "GEWONNEN@"
YouLoseText:
- db " PERDU@"
+ db "VERLOREN@"
DrawText:
- db "MATCH NUL@"
+ db "UNENTSCHIEDEN@"
PickUpPayDayMoneyText:
TX_FAR _PickUpPayDayMoneyText
diff --git a/engine/battle/link_battle_versus_text.asm b/engine/battle/link_battle_versus_text.asm
index d58b6c22..9e5f89cb 100644
--- a/engine/battle/link_battle_versus_text.asm
+++ b/engine/battle/link_battle_versus_text.asm
@@ -12,7 +12,7 @@ DisplayLinkBattleVersusTextBox:
ld de, wLinkEnemyTrainerName
call PlaceString
; place bold "VS" tiles between the names
- coord hl, 7, 8
+ coord hl, 9, 8
ld a, "V"
ldi [hl], a
ld [hl], "S"
diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm
index 45b35a76..50f8f052 100644
--- a/engine/battle/save_trainer_name.asm
+++ b/engine/battle/save_trainer_name.asm
@@ -69,44 +69,44 @@ TrainerNamePointers:
dw wTrainerName
YoungsterName:
- db "GAMIN@"
+ db "TEENAGER@"
BugCatcherName:
- db "SCOUT@"
+ db "KÄFERSAMMLER@"
LassName:
- db "FILLETTE@"
+ db "GÖRE@"
JrTrainerMName:
- db "DRESSEUR JR♂@"
+ db "PFADFINDER@"
JrTrainerFName:
- db "DRESSEUR JR♀@"
+ db "PFADFINDERIN@"
PokemaniacName:
db "#MANIAC@"
SuperNerdName:
- db "INTELLO@"
+ db "STREBER@"
BurglarName:
- db "PILLARD@"
+ db "DIEB@"
EngineerName:
- db "MECANO@"
+ db "MECHANIKER@"
JugglerXName:
db "JONGLEUR@"
SwimmerName:
- db "NAGEUR@"
+ db "SCHWIMMER@"
BeautyName:
- db "CANON@"
+ db "SCHÖNHEIT@"
RockerName:
db "ROCKER@"
JugglerName:
db "JONGLEUR@"
BlackbeltName:
- db "KARATEKA@"
+ db "SCHWARZGURT@"
ProfOakName:
- db "PROF.CHEN@"
+ db "PROF.EICH@"
ChiefName:
db "CHIEF@"
ScientistName:
- db "SCIENTIFIQUE@"
+ db "FORSCHER@"
RocketName:
db "ROCKET@"
CooltrainerMName:
- db "TOPDRESSEUR♂@"
+ db "TRAINER@"
CooltrainerFName:
- db "TOPDRESSEUR♀@"
+ db "TRAINERIN@"