Merge pull request #24 from basvroegop/master

Changes based on playtesting.
wfowler1 · Jan 7, 2025 · 2083a25 · 2083a25
2 parents c8513e7 + 1ff6965
commit 2083a25
Show file tree

Hide file tree

Showing 17 changed files with 70 additions and 71 deletions.
diff --git a/data/battle/stat_names.asm b/data/battle/stat_names.asm
@@ -2,10 +2,10 @@ StatNames: ; For printing during battles
 ; entries correspond to stat ids
 	list_start
 	li "AANVAL" ; "ATTACK"
-	li "VERDEDIG" ; "DEFENSE"
+	li "AFWEER" ; "DEFENSE"
 	li "SNELHEID" ; "SPEED"
 	li "SPCL.AAN" ; "SPCL.ATK"
-	li "SPCL.VER" ; "SPCL.DEF"
+	li "SPCL.AFW" ; "SPCL.DEF"
 	li "PRECISIE" ; "ACCURACY"
 	li "ONTWIJK" ; "EVASION"
 	li "VERMOGEN" ; "ABILITY" ; used for BattleCommand_Curse

diff --git a/data/items/names.asm b/data/items/names.asm
@@ -37,7 +37,7 @@ ItemNames::
 	li "METAALPOEDER" ; "METAL POWDER"
 	li "GOUDKLOMPJE" ; "NUGGET"
 	li "#POP" ; "# DOLL"
-	li "VOLLEGENEZEN" ; "FULL HEAL"
+	li "VOLLEGENEZER" ; "FULL HEAL"
 	li "OPWEKKER" ; "REVIVE"
 	li "MAXOPWEKKER" ; "MAX REVIVE"
 	li "STATWACHT" ; "GUARD SPEC."

diff --git a/data/moves/descriptions.asm b/data/moves/descriptions.asm
@@ -869,7 +869,7 @@ SplashDescription:
 
 AcidArmorDescription:
 	db   "Verhoogt" ; "Sharply raises the"
-	next "VERDEDIGING flink.@" ; "user's DEFENSE.@"
+	next "AFWEER flink.@" ; "user's DEFENSE.@"
 
 CrabhammerDescription:
 	db   "Heeft hoge kans op" ; "Has a high criti-"
@@ -1188,7 +1188,7 @@ SweetScentDescription:
 	next "ing tegenstander.@" ; "evasiveness.@"
 
 IronTailDescription:
-	db   "Kan VERDEDIGING" ; "An attack that may"
+	db   "Kan AFWEER" ; "An attack that may"
 	next "verlagen.@" ; "reduce DEFENSE.@"
 
 MetalClawDescription:
@@ -1260,7 +1260,7 @@ FutureSightDescription:
 	next "in derde beurt.@" ; "hits on 3rd turn.@"
 
 RockSmashDescription:
-	db   "Kan VERDEDIGING" ; "An attack that may"
+	db   "Kan AFWEER" ; "An attack that may"
 	next "verlagen.@" ; "lower DEFENSE.@"
 
 WhirlpoolDescription:

diff --git a/data/moves/names.asm b/data/moves/names.asm
@@ -30,7 +30,7 @@ MoveNames::
 	li "ZANDAANVAL" ; "SAND-ATTACK"
 	li "KOPSTOOT" ; "HEADBUTT"
 	li "HOORNAANVAL" ; "HORN ATTACK"
-	li "FURIE AANVAL" ; "FURY ATTACK"
+	li "FURIE-AANVAL" ; "FURY ATTACK"
 	li "HOORNBOOR" ; "HORN DRILL"
 	li "TACKLE"
 	li "LIJFSTRAF" ; "BODY SLAM"
@@ -140,7 +140,7 @@ MoveNames::
 	li "DROOMETER" ; "DREAM EATER"
 	li "GIFGAS" ; "POISON GAS"
 	li "VERSPERRING" ; "BARRAGE"
-	li "ONTTREKLEVEN" ; "LEECH LIFE"
+	li "BLOEDZUIGER" ; "LEECH LIFE"
 	li "NACHTKUS" ; "LOVELY KISS"
 	li "LUCHTAANVAL" ; "SKY ATTACK"
 	li "TRANSFORMEER" ; "TRANSFORM"

diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
@@ -1324,7 +1324,7 @@ GruntMGroup:
 	db -1 ; end
 
 	; GRUNTM (12)
-	db "LEIDER@", TRAINERTYPE_NORMAL
+	db "MANAGER@", TRAINERTYPE_NORMAL
 	; db "EXECUTIVE@", TRAINERTYPE_NORMAL
 	db 33, HOUNDOUR
 	db -1 ; end
@@ -1395,13 +1395,13 @@ GruntMGroup:
 	db -1 ; end
 
 	; GRUNTM (22)
-	db "LEIDER@", TRAINERTYPE_NORMAL
+	db "MANAGER@", TRAINERTYPE_NORMAL
 	; db "EXECUTIVE@", TRAINERTYPE_NORMAL
 	db 36, GOLBAT
 	db -1 ; end
 
 	; GRUNTM (23)
-	db "LEIDER@", TRAINERTYPE_NORMAL
+	db "MANAGER@", TRAINERTYPE_NORMAL
 	; db "EXECUTIVE@", TRAINERTYPE_NORMAL
 	db 30, KOFFING
 	db -1 ; end
@@ -1428,7 +1428,7 @@ GruntMGroup:
 	db -1 ; end
 
 	; GRUNTM (27)
-	db "LEIDER@", TRAINERTYPE_NORMAL
+	db "MANAGER@", TRAINERTYPE_NORMAL
 	; db "EXECUTIVE@", TRAINERTYPE_NORMAL
 	db 22, ZUBAT
 	db -1 ; end
@@ -2690,21 +2690,21 @@ BlackbeltGroup:
 
 ExecutiveMGroup:
 	; EXECUTIVEM (1)
-	db "LEIDER@", TRAINERTYPE_MOVES
+	db "MANAGER@", TRAINERTYPE_MOVES
 	; db "EXECUTIVE@", TRAINERTYPE_MOVES
 	db 33, HOUNDOUR,   EMBER, ROAR, BITE, FAINT_ATTACK
 	db 33, KOFFING,    TACKLE, SLUDGE, SMOKESCREEN, HAZE
 	db 35, HOUNDOOM,   EMBER, SMOG, BITE, FAINT_ATTACK
 	db -1 ; end
 
 	; EXECUTIVEM (2)
-	db "LEIDER@", TRAINERTYPE_MOVES
+	db "MANAGER@", TRAINERTYPE_MOVES
 	; db "EXECUTIVE@", TRAINERTYPE_MOVES
 	db 36, GOLBAT,     LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK
 	db -1 ; end
 
 	; EXECUTIVEM (3)
-	db "LEIDER@", TRAINERTYPE_MOVES
+	db "MANAGER@", TRAINERTYPE_MOVES
 	; db "EXECUTIVE@", TRAINERTYPE_MOVES
 	db 30, KOFFING,    TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
 	db 30, KOFFING,    TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN
@@ -2715,7 +2715,7 @@ ExecutiveMGroup:
 	db -1 ; end
 
 	; EXECUTIVEM (4)
-	db "LEIDER@", TRAINERTYPE_NORMAL
+	db "MANAGER@", TRAINERTYPE_NORMAL
 	; db "EXECUTIVE@", TRAINERTYPE_NORMAL
 	db 22, ZUBAT
 	db 24, RATICATE
@@ -3094,15 +3094,15 @@ CamperGroup:
 
 ExecutiveFGroup:
 	; EXECUTIVEF (1)
-	db "LEIDER@", TRAINERTYPE_MOVES
+	db "MANAGER@", TRAINERTYPE_MOVES
 	; db "EXECUTIVE@", TRAINERTYPE_MOVES
 	db 32, ARBOK,      WRAP, POISON_STING, BITE, GLARE
 	db 32, VILEPLUME,  ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID
 	db 32, MURKROW,    PECK, PURSUIT, HAZE, NIGHT_SHADE
 	db -1 ; end
 
 	; EXECUTIVEF (2)
-	db "LEIDER@", TRAINERTYPE_MOVES
+	db "MANAGER@", TRAINERTYPE_MOVES
 	; db "EXECUTIVE@", TRAINERTYPE_MOVES
 	db 23, ARBOK,      WRAP, LEER, POISON_STING, BITE
 	db 23, GLOOM,      ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID

diff --git a/docs/menus.md b/docs/menus.md
@@ -247,8 +247,8 @@ If bit 4 is set, a string at the end of the items array will be put at an offset
 
 ```asm
 	db 2 ; # items
-	db "GIVE@"
-	db "TAKE@"
+	db "GEEF@" ; "GIVE@"
+	db "NEEM@" ; "TAKE@"
 	db 2 ; x offset
 	db "TEST@"
 ```

diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm
@@ -383,8 +383,8 @@ GiveTakeItemMenuData:
 .Items:
 	db STATICMENU_CURSOR ; flags
 	db 2 ; # items
-	db "GIVE@"
-	db "TAKE@"
+	db "GEEF@" ; "GIVE@"
+	db "NEEM@" ; "TAKE@"
 
 PokemonSwapItemText:
 	text_far _PokemonSwapItemText

diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm
@@ -191,7 +191,7 @@ PryceText_Impressed:
 	cont "doorstaan." ;
 
 	para "Je bent deze" ; "You are worthy of"
-	line "BADGE waard!" ; "this BADGE!"
+	line "BADGE waardig!" ; "this BADGE!"
 	done
 
 Text_ReceivedGlacierBadge:
@@ -268,9 +268,9 @@ BoarderBradSeenText:
 	para "Erg leuk, vind" ; "It's fun, isn't"
 	line "je niet?" ; "it?"
 
-	para "Maar hé--we" ; "But hey--we're"
-	line "spelen geen" ; "not playing games"
-	cont "spelletjes hier!" ; "here!"
+	para "Maar hé--we spelen" ; "But hey--we're"
+	line "spelen spelletjes" ; "not playing games"
+	cont "hier!" ; "here!"
 	done
 
 BoarderBradBeatenText:
@@ -303,7 +303,7 @@ BoarderDouglasAfterBattleText:
 	para "Hij mediteert elke" ; "He meditates under"
 	line "dag onder een" ; "a waterfall daily"
 
-	para "waterval om z'n" ; "to strengthen his"
+	para "waterval om zijn" ; "to strengthen his"
 	line "geest en lichaam" ; "mind and body."
 	cont "te versterken." ;
 	done
@@ -327,9 +327,9 @@ SkierRoxanneAfterBattleText:
 	text "Als je niet nauw-" ; "If you don't skate"
 	line "keurig schaatst," ; "with precision,"
 
-	para "zal je in deze" ; "you won't get far"
-	line "GYM niet ver" ; "in this GYM."
-	cont "komen." ;
+	para "kom je niet ver in" ; "you won't get far"
+	line "deze GYM." ; "in this GYM."
+	;cont "komen." ;
 	done
 
 SkierClarissaSeenText:
@@ -355,17 +355,17 @@ MahoganyGymGuideText:
 	para "jaar #MON" ; "#MON for some"
 	line "traint." ; "50 years."
 
-	para "Hij is naar zeggen" ; "He's said to be"
-	line "goed in tegen-" ; "good at freezing"
+	para "Hij schijnt goed" ; "He's said to be"
+	line "te zijn in tegen-" ; "good at freezing"
 
-	para "standers met ijs-" ; "opponents with"
-	line "type aanvallen" ; "ice-type moves."
+	para "standers bevriezen" ; "opponents with"
+	line "met ijs-aanvallen." ; "ice-type moves."
 
-	para "bevriezen. Dus" ; "That means you"
-	line "moet je hem" ; "should melt him"
+	para "Dus je moet hem" ; "That means you"
+	line "met je vurige" ; "should melt him"
 
-	para "met je vurige" ; "with your burning"
-	line "ambitie ontdooien!" ; "ambition!"
+	para "ambitie ontdooien!" ; "with your burning"
+	line ;"ambitie ontdooien!" ; "ambition!"
 	done
 
 MahoganyGymGuideWinText:

diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
@@ -192,7 +192,7 @@ MrPokemonsHouse_GotEggText:
 MrPokemonIntroText3:
 	text "Ik ken een stel" ; "I know a couple"
 	line "met een #MON-" ; "who run a #MON"
-	cont "Dagverblijf." ; "DAY-CARE service."
+	cont "DAGVERBLIJF." ; "DAY-CARE service."
 
 	para "Zij gaven mij dit" ; "They gave me that"
 	line "EI." ; "EGG."

diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm
@@ -142,7 +142,7 @@ Text_ReceivedMineralBadge:
 Jasmine_BadgeSpeech:
 	text "MINERAALBADGE" ; "MINERALBADGE"
 	line "verhoogt #MON-" ; "raises #MON's"
-	cont "VERDEDIGING." ; "DEFENSE."
+	cont "AFWEER." ; "DEFENSE."
 
 	para "…Um… Neem" ; "…Um… Please take"
 	line "dit ook…" ; "this too…"
@@ -155,7 +155,7 @@ Text_ReceivedTM09: ; unreferenced
 
 Jasmine_IronTailSpeech:
 	text "…Met die TM" ; "…You could use"
-	line "kan je IJZER-" ; "that TM to teach"
+	line "kun je IJZER-" ; "that TM to teach"
 	cont "STAART leren." ; "IRON TAIL."
 	done
 

diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm
@@ -155,7 +155,7 @@ CamperJerrySeenText:
 
 	para "Het rotstype" ; "The rock-type has"
 	line "heeft hoge" ; "high DEFENSE."
-	cont "VERDEDIGING." ;
+	cont "AFWEER." ;
 
 	para "Gevechten kunnen" ; "Battles could end"
 	line "wellicht lang" ; "up going a long"

diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
@@ -365,8 +365,8 @@ PlayersHouse1FSinkText:
 	done
 
 PlayersHouse1FFridgeText:
-	text "Eens zien wat er" ; "Let's see what's"
-	line "in de koelkast zit" ; "in the fridge…"
+	text "Eens zien wat in" ; "Let's see what's"
+	line "de koelkast zit…" ; "in the fridge…"
 
 	para "VERS WATER en" ; "FRESH WATER and"
 	line "lekkere LIMONADE!" ; "tasty LEMONADE!"

diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
@@ -445,7 +445,7 @@ GruntM6AfterBattleText:
 
 	para "Ze hebben een of" ; "They have some big"
 	line "ander groot plan." ; "plan. I wonder"
-	cont "Wat zou 't zijn?" ; "what that is?"
+	cont "Wat zou het zijn?" ; "what that is?"
 	done
 
 GruntF2SeenText:

diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
@@ -195,10 +195,10 @@ RadioTower3FCooltrainerFPleaseSaveDirectorText:
 	cont "zelf opgesloten." ; "himself in."
 
 	para "Maar de DIRECTEUR" ; "But the DIRECTOR"
-	line "kan 't openen." ; "can open it."
+	line "kan het openen." ; "can open it."
 
 	para "Hij is boven," ; "He's up on the"
-	line "op de vijfde." ; "fifth floor."
+	line "op de vierde." ; "fifth floor."
 
 	para "Red hem," ; "Please save him!"
 	line "alsjeblieft!" ; 
@@ -252,7 +252,7 @@ GruntM7AfterBattleText:
 	done
 
 GruntM8SeenText:
-	text "Het voelt top" ; "It feels great"
+	text "Het voelt geweldig" ; "It feels great"
 	line "#MON te bevelen" ; "ordering #MON"
 	cont "om misdaad te" ; "to commit crimes."
 	cont "plegen." ;
@@ -264,7 +264,7 @@ GruntM8BeatenText:
 
 GruntM8AfterBattleText:
 	text "Ik voel me beroerd" ; "I feel lousy over"
-	line "over verliezen!" ; "losing!"
+	line "over mijn verlies!" ; "losing!"
 
 	para "Verdorie! Ik haat" ; "Darn it! I hate"
 	line "nutteloze #MON!" ; "useless #MON!"

diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
@@ -213,9 +213,9 @@ FakeDirectorTextBefore2:
 	cont "DIRECTEUR hebben" ; "the real DIRECTOR?"
 	cont "verstopt?" ; 
 
-	para "Tuurlijk, ik ver-" ; "Sure, I'll tell"
-	line "tel het. Als" ; "you. But only if"
-	cont "je me verslaat!" ; "you can beat me!"
+	para "Ja hoor, ik zal" ; "Sure, I'll tell"
+	line "het zeggen. Al je" ; "you. But only if"
+	cont "mij verslaat!" ; "you can beat me!"
 	done
 
 FakeDirectorWinText:
@@ -230,7 +230,7 @@ FakeDirectorTextAfter:
 	para "verstopt in de" ; "the UNDERGROUND"
 	line "OPSLAGKELDER." ; "WAREHOUSE."
 
-	para "Het is aan 't" ; "It's at the far"
+	para "Het is aan het" ; "It's at the far"
 	line "einde van het" ; "end of the UNDER-"
 	cont "ONDERGRONDSE." ; "GROUND."
 

diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
@@ -695,7 +695,7 @@ RockerBaseLanceElectrodeFaintText:
 	para "Dat zou deze" ; "That should stop"
 	line "machine moeten" ; "this machine from"
 
-	para "stoppen om dat" ; "transmitting that"
+	para "stoppen  dat" ; "transmitting that"
 	line "vreemde signaal" ; "strange signal."
 	cont "uit te zenden." ;
 
@@ -813,15 +813,15 @@ LanceHealsText2:
 	done
 
 GruntM17SeenText:
-	text "De deur gaat" ; "The door won't"
-	line "niet open?" ; "open?"
+	text "De deur gaat niet" ; "The door won't"
+	line "open?" ; "open?"
 
 	para "Ja, duh." ; "Well, duh."
 	line "Het heeft een" ; "It has to have a"
 
 	para "wachtwoord dat" ; "password that only"
-	line "alleen TEAM" ; "TEAM ROCKET knows."
-	cont "ROCKET weet." ;
+	line "alleen TEAM ROCKET" ; "TEAM ROCKET knows."
+	cont "weet." ;
 	done
 
 GruntM17BeatenText:
@@ -882,13 +882,13 @@ GruntM19AfterBattleText:
 	cont "die deur." ;
 
 	para "Waar is de baas?" ; "Where's the boss?"
-	line "Wie weet 't? Ga" ; "Who knows? Go look"
-	cont "zelf kijken." ; "for yourself."
+	line "Wie weet het? Ga" ; "Who knows? Go look"
+	cont "zelf maar zoeken." ; "for yourself."
 	done
 
 RocketBaseDoorNoPasswordText:
 	text "De deur is" ; "The door's closed…"
-	cont "op slot…" ;
+	line "op slot…" ;
 
 	para "Het heeft een" ; "It needs a pass-"
 	line "wachtwoord nodig" ; "word to open."