Skip to content

Commit

Permalink
Merge pull request #20 from basvroegop/master
Browse files Browse the repository at this point in the history
Mostly second checks in this one, possibly new maps.
  • Loading branch information
wfowler1 authored Dec 28, 2024
2 parents ee74e6b + e544b93 commit 9bb6594
Show file tree
Hide file tree
Showing 95 changed files with 293 additions and 297 deletions.
30 changes: 15 additions & 15 deletions data/events/elevator_floors.asm
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ ElevatorFloorNames:

; Floor = Vloor
; Basement = Kelder
.B4F: db "K4V@" ; "B4F@"
.B3F: db "K3V@" ; "B3F@"
.B2F: db "K2V@" ; "B2F@"
.B1F: db "K1V@" ; "B1F@"
._1F: db "1V@" ; "1F@"
._2F: db "2V@" ; "2F@"
._3F: db "3V@" ; "3F@"
._4F: db "4V@" ; "4F@"
._5F: db "5V@" ; "5F@"
._6F: db "6V@" ; "6F@"
._7F: db "7V@" ; "7F@"
._8F: db "8V@" ; "8F@"
._9F: db "9V@" ; "9F@"
._10F: db "10V@" ; "10F@"
._11F: db "11V@" ; "11F@"
.B4F: db "-4V@" ; "B4F@"
.B3F: db "-3V@" ; "B3F@"
.B2F: db "-2V@" ; "B2F@"
.B1F: db "-1V@" ; "B1F@"
._1F: db "BG@" ; "1F@"
._2F: db "1V@" ; "2F@"
._3F: db "2V@" ; "3F@"
._4F: db "3V@" ; "4F@"
._5F: db "4V@" ; "5F@"
._6F: db "5V@" ; "6F@"
._7F: db "6V@" ; "7F@"
._8F: db "7V@" ; "8F@"
._9F: db "8V@" ; "9F@"
._10F: db "9V@" ; "10F@"
._11F: db "10V@" ; "11F@"
.ROOF: db "DAK@" ; "ROOF@"
6 changes: 3 additions & 3 deletions data/moves/names.asm
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ MoveNames::
li "HYPNOSE" ; "HYPNOSIS"
li "MEDITEER" ; "MEDITATE"
li "BEHENDIGHEID" ; "AGILITY"
li "SNELLEAANVAL" ; "QUICK ATTACK"
li "SNELLE KLAP" ; "QUICK ATTACK"
li "RAZERNIJ" ; "RAGE"
li "TELEPORTEER" ; "TELEPORT"
li "SACHTSCHADE" ; "NIGHT SHADE"
li "NACHTSCHADE" ; "NIGHT SHADE"
li "IMMITATIE" ; "MIMIC"
li "GIL" ; "SCREECH"
li "DUBBELTEAM" ; "DOUBLE TEAM"
Expand Down Expand Up @@ -193,7 +193,7 @@ MoveNames::
li "SPIKES"
li "ZAPKANON" ; "ZAP CANNON"
li "VOORUITBLIK" ; "FORESIGHT"
li "LOTSVERBINTE" ; "DESTINY BOND"
li "LOTSBAND" ; "DESTINY BOND"
li "VERDWIJNLIED" ; "PERISH SONG"
li "IJZIGE WIND" ; "ICY WIND"
li "OPSPORING" ; "DETECT"
Expand Down
13 changes: 6 additions & 7 deletions data/pokemon/dex_entries/abra.asm
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
db 9 ; height
dw 195 ; weight

; TODO: Strings too long
db "Het hypnotiseert" ; "It hypnotizes"
next "zichzelf zodat het" ; "itself so that it"
next "weg kan teleporteren" ; "can teleport away"
db "Hypnotiseert zich-" ; "It hypnotizes"
next "zelf zodat weg kan" ; "itself so that it"
next "teleporteren zodra" ; "can teleport away"

page "wanneer het gevaar" ; "when it senses"
next "voelt, zelfs" ; "danger, even"
next "als het slaapt.@" ; "if it is asleep.@"
page "het gevaar voelt," ; "when it senses"
next "zelfs als het" ; "danger, even"
next "slaapt.@" ; "if it is asleep.@"
4 changes: 2 additions & 2 deletions data/pokemon/dex_entries/arcanine.asm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
next "blijkt dat mensen" ; "scroll shows that"
next "waren aangetrokken" ; "people were"

page "door hoe het door" ; "attracted to its"
next "de praires kon" ; "movement as it ran"
page "door hoe het over" ; "attracted to its"
next "de prairies kon" ; "movement as it ran"
next "rennen.@" ; "through prairies.@"
6 changes: 3 additions & 3 deletions data/pokemon/dex_entries/bayleef.asm
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

db "De geur van de" ; "The scent that"
next "bladeren rond de" ; "wafts from the"
next "nek geeft" ; "leaves on its neck"
next "nek geeft ieder" ; "leaves on its neck"

page "iedereen die het" ; "causes anyone who"
next "ruikt extra" ; "smells it to"
page "die het ruikt" ; "causes anyone who"
next "een extra lading" ; "smells it to"
next "energie.@" ; "become energetic.@"
2 changes: 1 addition & 1 deletion data/pokemon/dex_entries/bellossom.asm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
dw 58 ; weight

db "Als ze samen" ; "When these dance"
next "dansen wrijven de" ; "together, their"
next "dansen, wrijven de" ; "together, their"
next "bladeren tegen" ; "petals rub against"

page "elkaar, wat een" ; "each other,"
Expand Down
6 changes: 3 additions & 3 deletions data/pokemon/dex_entries/blissey.asm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
next "van de heerlijke" ; "of the delicious"
next "eieren die BLISSEY" ; "eggs that BLISSEY"

page "verschaft zal" ; "provides will make"
next "iedereen ziels-" ; "everyone around"
next "gelukkig maken.@" ; "smile with joy.@"
page "verschaft, maakt" ; "provides will make"
next "iedere eter echt" ; "everyone around"
next "zielsgelukkig.@" ; "smile with joy.@"
2 changes: 1 addition & 1 deletion data/pokemon/dex_entries/bulbasaur.asm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

db "Gebruikt op jonge" ; "While it is young,"
next "leeftijd de" ; "it uses the"
next "voedigingsstoffen" ; "nutrients that are"
next "voedingsstoffen" ; "nutrients that are"

page "in de zaden op de" ; "stored in the"
next "rug om te kunnen" ; "seeds on its back"
Expand Down
6 changes: 3 additions & 3 deletions data/pokemon/dex_entries/charizard.asm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
next "om hoog te vlieg-" ; "to fly high. The"
next "en. Wordt warmer" ; "temperature of its"

page "na sterker te" ; "fire increases as"
next "worden door te" ; "it gains exper-"
next "vechten.@" ; "ience in battle.@"
page "naarmate het" ; "fire increases as"
next "sterker wordt" ; "it gains exper-"
next "door gevechten.@" ; "ience in battle.@"
4 changes: 2 additions & 2 deletions data/pokemon/dex_entries/charmander.asm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
next "staart brandt fel" ; "the flame on the"
next "bij een gezonde" ; "tip of its tail"

page "Charmander, zelfs" ; "will burn vigor-"
next "als hij een beetje" ; "ously, even if it"
page "CHARMANDER, zelfs" ; "will burn vigor-"
next "als het een beetje" ; "ously, even if it"
next "nat wordt.@" ; "gets a bit wet.@"
6 changes: 3 additions & 3 deletions data/pokemon/dex_entries/charmeleon.asm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
next "vlammen wanneer" ; "agitated during"
next "het geagiteerd" ; "battle, it spouts"

page "raakt, en ver-" ; "intense flames,"
next "brandt de gehele" ; "incinerating its"
next "omgeving.@" ; "surroundings.@"
page "raakt. Verbrandt" ; "intense flames,"
next "op die manier de" ; "incinerating its"
next "de omgeving.@" ; "surroundings.@"
4 changes: 2 additions & 2 deletions data/pokemon/dex_entries/chinchou.asm
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
next "fin, en geleidt" ; "fin, have both po-"

page "positieve en nega-" ; "sitive and neg-"
next "tieve ladingen er" ; "ative charges flo-"
next "doorheen.@" ; "wing through them.@"
next "tieve ladingen" ; "ative charges flo-"
next "elektriciteit.@" ; "wing through them.@"
4 changes: 2 additions & 2 deletions data/pokemon/dex_entries/dodrio.asm
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
next "niet let op de" ; "any of the three"

page "drie hoofden," ; "heads--even for a"
next "wordt hard ge-" ; "second--will get"
next "prikt.@" ; "pecked severely.@"
next "wordt keihard" ; "second--will get"
next "geprikt.@" ; "pecked severely.@"
6 changes: 3 additions & 3 deletions data/pokemon/dex_entries/drowzee.asm
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

db "Kan de neus" ; "When it twitches"
next "bewegen om te zien" ; "its nose, it can"
next "of iemand echt" ; "tell where someone"
next "waar iemand slaapt" ; "tell where someone"

page "slaapt en waar" ; "is sleeping and"
next "die persoon over" ; "what that person"
page "en waar die" ; "is sleeping and"
next "persoon over" ; "what that person"
next "droomt.@" ; "is dreaming about.@"
2 changes: 1 addition & 1 deletion data/pokemon/dex_entries/dugtrio.asm
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

page "onder zeeniveau." ; "level. No one"
next "Niemand weet hoe" ; "knows what it's"
next "het zo laag is.@" ; "like underground.@"
next "het daar is.@" ; "like underground.@"
2 changes: 1 addition & 1 deletion data/pokemon/dex_entries/eevee.asm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
db "EVOLUTIOE@" ; species name
db "EVOLUTIE@" ; species name
db 3 ; height
dw 65 ; weight

Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/dex_entries/exeggutor.asm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
dw 1200 ; weight

db "Door in een goede" ; "Living in a good"
next "omgeving te leven" ; "environment makes"
next "omgeving te leven," ; "environment makes"
next "groeien veel" ; "it grow lots of"

page "hoofden. Valt er" ; "heads. A head that"
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/dex_entries/fearow.asm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

db "Gebruikt de lange" ; "It uses its long"
next "snavel bij aanval-" ; "beak to attack. It"
next "len. Heeft ook" ; "has a surprisingly"
next "len. Heeft een" ; "has a surprisingly"

page "verrassend groot" ; "long reach, so it"
next "bereik, dus wees" ; "must be treated"
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/dex_entries/flareon.asm
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

page "#MON wel" ; "body temperature"
next "duizend graden" ; "can reach up to"
next "warm worden.@" ; "1700 degrees.@"
next "heet worden.@" ; "1700 degrees.@"
4 changes: 2 additions & 2 deletions data/pokemon/dex_entries/gengar.asm
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
next "mensen en absor-" ; "it absorbs their"

page "beert hun warmte." ; "heat. The chill it"
next "De kou laat mensen" ; "causes makes the"
next "beven.@" ; "victims shake.@"
next "De kou laat het" ; "causes makes the"
next "doelwit beven.@" ; "victims shake.@"
4 changes: 2 additions & 2 deletions data/pokemon/dex_entries/girafarig.asm
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
db 15 ; height
dw 415 ; weight

db "Bij gevaar ge-" ; "When it is in"
next "bruikt de staart" ; "danger, its tail"
db "Bij gevaar" ; "When it is in"
next "gebruikt de staart" ; "danger, its tail"
next "mysterieuze" ; "uses some sort of"

page "krachten om" ; "mysterious powers"
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/dex_entries/golbat.asm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

db "Als het de" ; "When it plunges"
next "tanden zet in een" ; "its fangs into its"
next "prooi, wordt" ; "prey, it instantly"
next "prooi, wordt" ; "prey, it instantly"

page "direct meer dan" ; "draws and gulps"
next "drie deciliter" ; "down more than ten"
Expand Down
6 changes: 3 additions & 3 deletions data/pokemon/dex_entries/graveler.asm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
next "bergpaden te" ; "ling on mountain"
next "rollen. Remt" ; "paths. If it gains"

page "door tegen rotsen" ; "too much speed, it"
next "te rammen bij te-" ; "stops by running"
next "veel snelheid.@" ; "into huge rocks.@"
page "door het lijf" ; "too much speed, it"
next "tegen de rotsen" ; "stops by running"
next "te rammen.@" ; "into huge rocks.@"
2 changes: 1 addition & 1 deletion data/pokemon/dex_entries/gyarados.asm
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

page "het bereisde pad" ; "burning down any"
next "tot aan de grond" ; "place it travels"
next "gelijk.@" ; "through.@"
next "af.@" ; "through.@"
2 changes: 1 addition & 1 deletion data/pokemon/dex_entries/hoothoot.asm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

db "Begint iedere dag" ; "It begins to hoot"
next "om dezelfde tijd" ; "at the same time"
next "met oehoe-georep." ; "every day. Some"
next "met oehoe-geroep." ; "every day. Some"

page "Sommige trainers" ; "trainers use them"
next "gebruiken ze als" ; "in place of"
Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/dex_entries/hypno.asm
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

page "duur van de" ; "longer the effects"
next "hypnose op het" ; "of its hypnosis"
next "slachtoffer..@" ; "last.@"
next "slachtoffer.@" ; "last.@"
6 changes: 3 additions & 3 deletions data/pokemon/dex_entries/igglybuff.asm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
next "gebruikt het" ; "with its short"
next "zachte lijf om" ; "legs, it moves"

page "rond te stuiteren" ; "around by bouncing"
next "door de omgeving" ; "on its soft,"
next "van de #MON.@" ; "tender body.@"
page "door de omgeving" ; "around by bouncing"
next "heen en weer te" ; "on its soft,"
next "stuiteren.@" ; "tender body.@"
4 changes: 2 additions & 2 deletions data/pokemon/dex_entries/kadabra.asm
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
next "het oppervlak van" ; "many alpha parti-"

page "het lichaam als" ; "cles come out of"
next "de ogen sluiten" ; "the surface of its"
next "van deze #MON.@" ; "body.@"
next "deze #MON de" ; "the surface of its"
next "ogen sluit.@" ; "body.@"
2 changes: 1 addition & 1 deletion data/pokemon/dex_entries/kakuna.asm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
db "KOKON@" ; species name
db "COCON@" ; species name
db 6 ; height
dw 100 ; weight

Expand Down
2 changes: 1 addition & 1 deletion data/pokemon/dex_entries/kangaskhan.asm
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

page "wordt, slaapt deze" ; "its pouch, it"
next "#MON altijd" ; "always sleeps"
next "rechtop staand.@" ; "standing up.@"
next "rechtopstaand.@" ; "standing up.@"
6 changes: 3 additions & 3 deletions data/pokemon/dex_entries/kingdra.asm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
next "door diep onder-" ; "by sleeping at"
next "water te slapen" ; "underwater depths"

page "waar andere" ; "at which no other"
next "levensvormen niet" ; "life forms can"
next "kunnen overleven.@" ; "survive.@"
page "waar ander leven" ; "at which no other"
next "onmogelijk kan" ; "life forms can"
next "overleven.@" ; "survive.@"
2 changes: 1 addition & 1 deletion data/pokemon/dex_entries/koffing.asm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

db "Als je te dichtbij" ; "If one gets close"
next "komt, laat het" ; "enough to it when"
next "gifas vrij. Dit" ; "it expels poison-"
next "gifgas vrij. Dit" ; "it expels poison-"

page "gas zie je aan" ; "ous gas, the gas"
next "de binnenzijde" ; "swirling inside it"
Expand Down
6 changes: 3 additions & 3 deletions data/pokemon/dex_entries/lanturn.asm
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

db "Deze #MON" ; "This #MON uses"
next "gebruikt het hel-" ; "the bright part of"
next "deel van het lijf," ; "its body, which"
next "dere deel van het" ; "its body, which"

page "wat ooit een fin" ; "changed from a"
next "was, om prooien" ; "dorsal fin, to"
page "lijf, wat ooit een" ; "changed from a"
next "fin was, om prooi" ; "dorsal fin, to"
next "te Lokken.@" ; "lure prey.@"
4 changes: 2 additions & 2 deletions data/pokemon/dex_entries/machoke.asm
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
dw 705 ; weight

db "Deze sterke #-" ; "This tough #MON"
next "blijft altijd in" ; "always stays in"
next "het moment. De" ; "the zone. Its"
next "MON blijft altijd" ; "always stays in"
next "in het moment. De" ; "the zone. Its"

page "spieren groeien" ; "muscles become"
next "met ieder ge-" ; "thicker after"
Expand Down
6 changes: 3 additions & 3 deletions data/pokemon/dex_entries/mareep.asm
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
next "in de zachte vacht" ; "air in its soft"
next "waarmee het koel" ; "fur, allowing it"

page "blijft in de zomer" ; "to stay cool in"
next "en warm in de" ; "summer and warm"
next "winter.@" ; "in winter.@"
page "in de zomer en" ; "to stay cool in"
next "warm in de winter" ; "summer and warm"
next "blijft.@" ; "in winter.@"
4 changes: 2 additions & 2 deletions data/pokemon/dex_entries/meganium.asm
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
dw 1005 ; weight

db "Iedereen die er" ; "Anyone who stands"
next "naast wordt ver-" ; "beside it becomes"
next "frist, alsof je" ; "refreshed, just as"
next "naast staat wordt" ; "beside it becomes"
next "verfrist, alsof je" ; "refreshed, just as"

page "ontspannen rond-" ; "if they were"
next "wandelt in een" ; "relaxing in a"
Expand Down
4 changes: 2 additions & 2 deletions data/pokemon/dex_entries/meowth.asm
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
next "een glimmend ob-" ; "it sees a shiny"

page "ject spot, licht" ; "object, the gold"
next "op het hoofd ook" ; "coin on its head"
next "op.@" ; "shines too.@"
next "de munt op het" ; "coin on its head"
next "hoofd ook op.@" ; "shines too.@"
4 changes: 2 additions & 2 deletions data/pokemon/dex_entries/metapod.asm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
db "KOKON@" ; species name
db "COCON@" ; species name
db 7 ; height
dw 99 ; weight

Expand All @@ -8,4 +8,4 @@

page "harden en beweegt" ; "only harden, so it"
next "niet om vijanden" ; "remains motionless"
next "te vermijden.@" ; "to avoid attack.@"
next "te ontwijken.@" ; "to avoid attack.@"
2 changes: 1 addition & 1 deletion data/pokemon/dex_entries/mew.asm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

db "Kan iedere aanval" ; "Because it can"
next "leren. Men onder-" ; "learn any move,"
next "zoekt daarom of" ; "some people began"
next "zoekt daarom of" ; "some people began"

page "dit de voorouder" ; "research to see if"
next "is van alle be-" ; "it is the ancestor"
Expand Down
Loading

0 comments on commit 9bb6594

Please sign in to comment.