Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New PR with playtest fixes, and possible the last few maps. #22

Merged
merged 15 commits into from
Jan 3, 2025
2 changes: 1 addition & 1 deletion data/moves/names.asm
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ MoveNames::
li "ONDERWERPING" ; "SUBMISSION"
li "LAGE SCHOP" ; "LOW KICK"
li "TEGENAANVAL" ; "COUNTER"
li "SEISMISCSMAK" ; "SEISMIC TOSS"
li "GEOWORP" ; "SEISMIC TOSS"
li "KRACHT" ; "STRENGTH"
li "ABSORBEER" ; "ABSORB"
li "MEGA DRAIN"
Expand Down
4 changes: 2 additions & 2 deletions data/text/common_3.asm
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ _SavingDontTurnOffThePowerText::
done

_SavedTheGameText::
text "<PLAYER> sloeg" ; "<PLAYER> saved"
line "het spel op." ; "the game."
text "<PLAYER> sloeg het" ; "<PLAYER> saved"
line "spel op." ; "the game."
done

_AlreadyASaveFileText::
Expand Down
16 changes: 8 additions & 8 deletions engine/events/mom.asm
Original file line number Diff line number Diff line change
Expand Up @@ -627,16 +627,16 @@ MomJustDoWhatYouCanText:
text_end

Mom_SavedString:
db "SAVED@"
db "GESPAARD@" ; "SAVED@"

Mon_WithdrawString:
db "WITHDRAW@"
db "HAAL OP@" ; "WITHDRAW@"

Mom_DepositString:
db "DEPOSIT@"
db "STORT@" ; "DEPOSIT@"

Mom_HeldString:
db "HELD@"
db "VAST@" ; "HELD@"

BankOfMom_MenuHeader:
db MENU_BACKUP_TILES ; flags
Expand All @@ -647,7 +647,7 @@ BankOfMom_MenuHeader:
.MenuData:
db STATICMENU_CURSOR ; flags
db 4 ; items
db "GET@"
db "SAVE@"
db "CHANGE@"
db "CANCEL@"
db "HAAL@" ; "GET@"
db "SPAAR@" ; "SAVE@"
db "WISSEL@" ; "CHANGE@"
db "SLUITEN@" ; "CANCEL@"
16 changes: 8 additions & 8 deletions engine/link/link.asm
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ ExchangeBytes:
ret

String_PleaseWait:
db "PLEASE WAIT!@"
db "EVEN GEDULD!@" ; "PLEASE WAIT!@"

ClearLinkData:
ld hl, wLinkData
Expand Down Expand Up @@ -1571,7 +1571,7 @@ LinkTrade_TradeStatsMenu:
text_end

.String_Stats_Trade:
db "STATS TRADE@"
db "STATS RUIL@" ; "STATS TRADE@"

.LinkAbnormalMonText:
text_far _LinkAbnormalMonText
Expand Down Expand Up @@ -1664,7 +1664,7 @@ GSPlaceTradeScreenFooter: ; unreferenced
jp PlaceString

.CancelString:
db "CANCEL@"
db "SLUIT@" ; "CANCEL@"

LinkTradePlaceArrow:
; Indicates which pokemon the other player has selected to trade
Expand Down Expand Up @@ -2060,19 +2060,19 @@ InitTradeMenuDisplay_Delay:
jp InitTradeMenuDisplay

String_TradeCancel:
db "TRADE"
next "CANCEL@"
db "RUIL" ; "TRADE"
next "SLUIT@" ; "CANCEL@"

LinkAskTradeForText:
text_far _LinkAskTradeForText
text_end

String_TradeCompleted:
db "Trade completed!@"
db "Ruil voltooid!@" ; "Trade completed!@"

String_TooBadTheTradeWasCanceled:
db "Too bad! The trade"
next "was canceled!@"
db "Helaas! De ruil is" ; "Too bad! The trade"
next "geannuleerd!@" ; "was canceled!@"

LinkTextboxAtHL:
ld d, h
Expand Down
4 changes: 2 additions & 2 deletions engine/link/link_trade.asm
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ InitTradeSpeciesList:
ret

.CancelString:
db "CANCEL@"
db "SLUITEN@" ; "CANCEL@"

_LoadTradeScreenBorderGFX:
call __LoadTradeScreenBorderGFX
Expand Down Expand Up @@ -178,7 +178,7 @@ PlaceWaitingTextAndSyncAndExchangeNybble:
jp DelayFrames

.Waiting:
db "WAITING..!@"
db "WACHTEN..!@" ; "WAITING..!@"

LinkTradeMenu:
call .MenuAction
Expand Down
2 changes: 1 addition & 1 deletion engine/link/place_waiting_text.asm
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ PlaceWaitingText::
jp DelayFrames

.Waiting:
db "Waiting...!@"
db "Wachten...!@" ; "Waiting...!@"
8 changes: 4 additions & 4 deletions engine/printer/print_party.asm
Original file line number Diff line number Diff line change
Expand Up @@ -109,25 +109,25 @@ GBPrinterString_PrinterError1:
db " Drukker Fout 1" ; " Printer Error 1"
next ""
next "Lees het Game Boy" ; "Check the Game Boy"
next "Printer Handboek." ; "Printer Manual."
next "Printer-Handboek." ; "Printer Manual."
db "@"
GBPrinterString_PrinterError2:
db " Drukker Fout 2" ; " Printer Error 2"
next ""
next "Lees het Game Boy" ; "Check the Game Boy"
next "Printer Handboek." ; "Printer Manual."
next "Printer-Handboek." ; "Printer Manual."
db "@"
GBPrinterString_PrinterError3:
db " Drukker Fout 3" ; " Printer Error 3"
next ""
next "Lees het Game Boy" ; "Check the Game Boy"
next "Printer Handboek." ; "Printer Manual."
next "Printer-Handboek." ; "Printer Manual."
db "@"
GBPrinterString_PrinterError4:
db " Drukker Fout 4" ; " Printer Error 4"
next ""
next "Lees het Game Boy" ; "Check the Game Boy"
next "Printer Handboek." ; "Printer Manual."
next "Printer-Handboek." ; "Printer Manual."
db "@"

PrintPartyMonPage1:
Expand Down
5 changes: 2 additions & 3 deletions maps/CianwoodCity.asm
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,8 @@ CianwoodCityPokefanMText:
line "ze iets." ; "something."

para "Je #MON kunnen" ; "Your #MON could"
line "STEENKNAL gebruik-" ; "use ROCK SMASH to"
cont "en om ze te" ; "break them."
cont "breken." ;
line "ze breken met" ; "use ROCK SMASH to"
cont "STEENKNAL." ; "break them."
done

CianwoodCityLassText:
Expand Down
4 changes: 2 additions & 2 deletions maps/CianwoodGym.asm
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ ChuckIntroText2:
done

ChuckIntroText3:
text "Zo! Ben je" ; "There! Scared now,"
line "nu bang?" ; "are you?"
text "Zo! Ben je nu" ; "There! Scared now,"
line "bang?" ; "are you?"

para "Wat?" ; "What?"
line "Dat heeft niets" ; "It has nothing to"
Expand Down
2 changes: 1 addition & 1 deletion maps/CianwoodPharmacy.asm
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ PharmacistGiveSecretpotionText:

para "…"

para "De VUURTOREN" ; "The LIGHTHOUSE"
para "De VUURTOREN-" ; "The LIGHTHOUSE"
line "#MON is in" ; "#MON is in"
cont "nood?" ; "trouble?"

Expand Down
4 changes: 2 additions & 2 deletions maps/OlivineCity.asm
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,9 @@ OlivineCitySailor1Text:
line "donker van de" ; "black of night,"

para "nacht, is de zee" ; "the sea is even"
line "nog verradelijker!" ; "more treacherous!"
line "verraderlijker!" ; "more treacherous!"

para "Zonder de baken" ; "Without the beacon"
para "Zonder het baken" ; "Without the beacon"
line "van de VUURTOREN" ; "of the LIGHTHOUSE"

para "kan geen schip" ; "to guide it, no"
Expand Down
4 changes: 2 additions & 2 deletions maps/OlivineLighthouse6F.asm
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@ JasmineDontBeOffendedText:
cont "niet beledigd…" ; "offended…"

para "…AMPHY neemt" ; "…AMPHY will not"
line "alleen iets" ; "take anything from"
cont "van mij…" ; "anyone but me…"
line "alleen iets van" ; "take anything from"
cont "mij…" ; "anyone but me…"
done

JasmineAmphyHowAreYouFeelingText:
Expand Down
2 changes: 1 addition & 1 deletion maps/OlivinePokecenter1F.asm
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ OlivinePokecenter1FTeacherScript:
jumptextfaceplayer OlivinePokecenter1FTeacherText

OlivinePokecenter1FFisherText:
text "De MATROOS in de" ; "The SAILOR in the"
text "De MATROOS in het" ; "The SAILOR in the"
line "OLIVINE CAFE" ; "OLIVINE CAFE next"

para "hiernaast is" ; "door is really"
Expand Down
98 changes: 49 additions & 49 deletions maps/Route24.asm
Original file line number Diff line number Diff line change
Expand Up @@ -35,85 +35,85 @@ Route24RocketScript:
end

Route24RocketSeenText:
text "Hey, kid! Me am a"
line "TEAM ROCKET member"
cont "kind of guy!"
text "Hé, ettertje!" ; "Hey, kid! Me am a"
line "Een lid van TEAM" ; "TEAM ROCKET member"
cont "ROCKET ik ben!" ; "kind of guy!"

para "Come from another"
line "country, a trainer"
cont "number one, me!"
para "Uit ander land," ; "Come from another"
line "een trainer" ; "country, a trainer"
cont "nummer één, ik!" ; "number one, me!"

para "Think I did, if"
line "stop the energy,"
para "Denken deed ik," ; "Think I did, if"
line "als stop energie," ; "stop the energy,"

para "be big panic for"
line "here people!"
para "grote paniek hier" ; "be big panic for"
line "voor mensen!" ; "here people!"

para "Secret it is my"
line "mission, so tell"
cont "you I not!"
para "Geheim het is mijn" ; "Secret it is my"
line "missie, dus vertel" ; "mission, so tell"
cont "je ik niet!" ; "you I not!"

para "But! If win you do"
line "versus me, a man I"
para "Maar! Als win je" ; "But! If win you do"
line "tegen mij, een" ; "versus me, a man I"

para "be and mine secret"
line "to you I tell."
para "man ben ik en mijn" ; "be and mine secret"
line "geheim vertel." ; "to you I tell."

para "Hey, kid! Battle"
line "begin we do!"
para "Hé, snotneus!" ; "Hey, kid! Battle"
line "Vecht begin!" ; "begin we do!"
done

Route24RocketBeatenText:
text "Ayieeeh! No, no,"
line "no, believe it I"
cont "can't!"
text "Aiii! Nee, nee," ; "Ayieeeh! No, no,"
line "nee, geloof ik" ; "no, believe it I"
cont "kan niet!" ; "can't!"

para "Strong very much"
line "be you! Match I am"
cont "not to you!"
para "Sterk heel zijn" ; "Strong very much"
line "jij! Kans ik" ; "be you! Match I am"
cont "niet maak jou!" ; "not to you!"
done

Route24RocketAfterBattleText:
text "OK. Tell you mine"
line "secret will I."
text "Oké. Vertel ik" ; "OK. Tell you mine"
line "mijn geheim jou." ; "secret will I."

para "MACHINE PART steal"
line "by me, hide it I"
para "MACHINEDEEL steel" ; "MACHINE PART steal"
line "door mij, verstopt" ; "by me, hide it I"

para "did in GYM of the"
para "ik in GYM van de" ; "did in GYM of the"
line "CERULEAN."

para "Inside water put"
line "it I did. Look for"
para "In water stopte" ; "Inside water put"
line "deed ik. Zoek" ; "it I did. Look for"

para "in water center of"
line "GYM at."
para "in water midden" ; "in water center of"
line "van GYM." ; "GYM at."

para "But you forget me"
line "not!"
para "Maar mij niet" ; "But you forget me"
line "vergeten!" ; "not!"

para "Beat you for sure"
line "will TEAM ROCKET."
para "Versla jou zeker" ; "Beat you for sure"
line "zal TEAM ROCKET." ; "will TEAM ROCKET."

para "Come from JOHTO"
line "will they, mine"
para "Komen uit JOHTO" ; "Come from JOHTO"
line "zullen ze, mijn" ; "will they, mine"

para "friends, yes. Will"
line "revenge they are."
para "vrienden, ja." ; "friends, yes. Will"
line "Wraak zij nemen." ; "revenge they are."
done

Route24RocketDisappearsText:
text "…"

para "You say what? TEAM"
line "ROCKET bye-bye a"
para "Je zegt wat? TEAM" ; "You say what? TEAM"
line "ROCKET houdt voor" ; "ROCKET bye-bye a"

para "go-go? Broken it"
line "is says you?"
para "gezien? Opgebroken" ; "go-go? Broken it"
line "zegt jij?" ; "is says you?"

para "Oh, no! Should I"
line "do what now on"
cont "from, me?"
para "Oh nee! Zal ik" ; "Oh, no! Should I"
line "doen wat nu vanaf?" ; "do what now on"
;cont "vanaf?" ; "from, me?"
done

Route24_MapEvents:
Expand Down
Loading
Loading