Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here, like for example a crash log.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

P3D/Content/Data/maps/quest/trainertower/double/1f.dat

@@ -47,5 +47,5 @@ Stairs:
 {"Entity"{ENT[{"EntityID"{str[WallBlock]}}{"TexturePath"{str[rocketbase]}}{"Textures"{recArr[[16,64,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}{"Position"{sngArr[4,-1.001,1]}}]}}
 
 NPCs:
-{"NPC"{NPC[{"Position"{sngArr[8,0,6]}}{"TextureID"{str[41]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\double\001_1]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,6]}}{"TextureID"{str[littlegirl]}}{"ID"{int[0]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\double\001_1]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[8,0,7]}}{"TextureID"{str[41]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\double\001_2]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[8,0,7]}}{"TextureID"{str[littlegirl]}}{"ID"{int[1]}}{"Name"{str[Lass]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\double\001_2]}}{"Rotation"{int[1]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}

P3D/Content/Data/maps/quest/trainertower/main.dat

@@ -440,7 +440,7 @@ Corners:
 {"Entity"{ENT[{"Position"{sngArr[28,2,39]}}{"EntityID"{str[WallBlock]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[96,16,16,16]]}}{"TextureIndex"{intArr[-1,-1,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[5]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 
 NPC:
-{"NPC"{NPC[{"Position"{sngArr[14,17,7]}}{"TextureID"{str[TowerOwner]}}{"ID"{int[0]}}{"Name"{str[IDlotto]}}{"Action"{int[1]}}{"AdditionalValue"{str[quest\tower\owner]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[14,17,7]}}{"TextureID"{str[TowerOwner]}}{"ID"{int[0]}}{"Name"{str[IDlotto]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|quest\tower\owner]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
 {"NPC"{NPC[{"Position"{sngArr[12,0,30]}}{"TextureID"{str[29]}}{"ID"{int[1]}}{"Name"{str[IDlotto]}}{"Action"{int[2]}}{"AdditionalValue"{str[1|trainer\quest\tower\outside\002]}}{"Rotation"{int[0]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[[17,2,2,1]]}}]}}
 {"NPC"{NPC[{"Position"{sngArr[12,1,33]}}{"TextureID"{str[29]}}{"ID"{int[2]}}{"Name"{str[IDlotto]}}{"Action"{int[2]}}{"AdditionalValue"{str[2|trainer\quest\tower\outside\001]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[[16,10,3,2]]}}]}}
 

P3D/Content/Data/pokedex.dat

@@ -1,4 +1,4 @@
 Johto Pokédex|0|152-160,16-18,21,22,163,164,19,20,161,162,10-15,165-168,175,176,468,174,39,40,298,183,184,60-62,186,194,195,118,119,79,80,199,54,55,74-76,41,42,169,92,93,94,206,23,24,179,180,181,231,232,216,217,50,51,27,28,187-189,191,192,69-71,43-45,182,46-49,102,103,193,469,204,205,123,212,127,214,190,424,438,185,96,97,63-65,177,178,213,327,235,201,360,202,132,442,203,234,29-34,52,53,83,37,38,58,59,209,210,241,128-130,98,99,72,73,120,121,211,222,90,91,170,171,458,226,116,117,230,109,110,81,82,462,56,57,66-68,95,208,200,429,108,463,440,113,242,228,229,207,472,227,225,215,461,238,124,220,221,473,86,87,131,636,637,133-136,196,197,470,471,700,243-245,147-149,249-251|0
 Kanto Pokédex|pokedex_kanto|1-9,16-18,21,22,163,164,19,20,161,162,172,25,26,10-15,173,35,36,174,39,40,60-62,186,194,195,118,119,79,80,199,54,55,74-76,524-526,41,42,169,92-94,23,24,231,232,216,217,50,51,27,28,104,105,187-189,191,192,69-71,43-45,182,114,465,46-49,708,709,96,97,63-65,439,122,280-282,475,605,606,177,178,360,202,442,29-34,52,53,84,85,77,78,37,38,58,59,209,210,129,130,98,99,72,73,211,222,120,121,170,171,116,117,230,88,89,100,101,239,125,466,599-601,81,82,462,436,437,374-376,236,106,107,237,447,448,56,57,296,297,307,308,66-68,218,219,299,476,703,337,338,95,208,111,112,464,304-306,707,200,429,622,623,562,563,679-681,115,440,113,242,198,430,228,229,215,461,238,124,86,87,613,614,582-584,132,138-142,714,715,446,143-146,246-248,150,385|0
-Sevii Pokédex|pokedex_sevii|16-18,21,22,19,20,161,162,172,25,26,10-15,165-168,298,183,184,60-62,186,194,195,118,119,79,80,199,54,55,74-76,524-528,41,42,169,92-94,618,231,232,50,51,187-189,69-71,43-45,182,48,49,102,103,114,465,193,469,588,589,616,617,214,96,97,177,178,201,360,202,52,53,77,78,198,430,129,130,456,457,318,319,692,693,98,99,690,691,223,224,72,73,592,593,120,121,211,222,688,689,90,91,366-370,320,321,458,226,278,279,116,117,230,88,89,66-68,218,219,324,104,105,240,126,467,95,208,200,429,227,225,215,461,238,124,37,38,27,28,220,221,473,86,87,131,137,233,474,246-248,721,489,490,151|0
+Sevii Pokédex|pokedex_sevii|16-18,21,22,19,20,161,162,172,25,26,10-15,165-168,298,183,184,60-62,186,194,195,118,119,79,80,199,54,55,74-76,524-528,41,42,169,92-94,618,231,232,50,51,187-189,69-71,43-45,182,48,49,102,103,114,465,193,469,588,589,616,617,214,96,97,177,178,201,360,202,52,53,77,78,198,430,129,130,456,457,318,319,692,693,98,99,690,691,223,224,72,73,592,593,120,121,211,222,688,689,90,91,366-370,320,321,458,226,278,279,116,117,230,88,89,66-68,218,219,324,104,105,240,126,467,95,208,200,429,227,225,215,461,238,124,37,38,27,28,220,221,473,86,87,131,137,233,474,246-248,885-887,721,489,490,151|0
 National Pokédex|pokedex_national|1-[MAX]|1

P3D/Content/Localization/Tokens_en.dat

@@ -446,7 +446,7 @@ Places_Scrufib Chamber,Scrufib Chamber
 Places_Rixy Chamber,Rixy Chamber
 Places_Viapois Chamber,Viapois Chamber
 Places_Ancient Ruins,Ancient Ruins
-Places_Millenial Star Tower,Millenial Star Tower
+Places_Millenial Star Tower,Millennial Star Tower
 Places_Kolben Tower,Kolben Tower
 Places_Faraway Island,Faraway Island
 Places_Underwater Cave,Underwater Cave

P3D/Content/Localization/Tokens_no.dat

@@ -13,13 +13,13 @@ load_menu_time,Tid
 load_menu_back,Tilbake
 load_menu_load,Last
 load_menu_delete,Slett
-load_menu_gamemode,GameMode
+load_menu_gamemode,Spillmodus
 DeleteScreen:
 delete_menu_delete_confirm,Vil du virkelig slette det du har lagret
 delete_menu_delete,Slett
 delete_menu_cancel,Avbryt
 LanguageScreen:
-language_menu_apply,Anvend
+language_menu_apply,Bruk
 language_menu_back,Tilbake
 PacksScreen:
 pack_menu_up,Opp
@@ -28,11 +28,11 @@ pack_menu_toggle_on,Aktiver
 pack_menu_toggle_off,Deaktiver
 pack_menu_information,Informasjon
 pack_menu_enabled,Aktivert
-pack_menu_apply,Anvend
+pack_menu_apply,Bruk
 pack_menu_back,Tilbake
 pack_menu_songs,Sanger
 pack_menu_sounds,Lyder
-pack_menu_textures,Textur
+pack_menu_textures,Tekstur
 pack_menu_name,Navn
 pack_menu_version,Versjon
 pack_menu_by,Av
@@ -44,12 +44,12 @@ gamemode_menu_name,Navn
 gamemode_menu_description,Beskrivelse
 gamemode_menu_version,Versjon
 gamemode_menu_author,Forfatter
-gamemode_menu_contentpath,Innhold Filbane
+gamemode_menu_contentpath,Filbane for innhold
-gamemode_menu_create,Lag
+gamemode_menu_create,Opprett
 gamemode_menu_back,Tilbake
 ---
 Pausescreen:
-pause_menu_title,Spill menu
+pause_menu_title,Spill meny
 pause_menu_back_to_game,Tilbake til spillet
 pause_menu_disconnect,Koble fra
 pause_menu_quit_to_menu,Avslutt til hovedmenyen
@@ -98,7 +98,7 @@ map_screen_roaming,Roaming Pokes
 PokedexScreen:
 pokedex_screen_seen,Sett
 pokedex_screen_obtained,Fanget
-pokedex_screen_rare,Sjeldne
+pokedex_screen_rare,Sjelden
 pokedex_screen_backadvice,TRYKK E FOR Å GÅ TILBAKE
 ---
 PokemonScreen:
@@ -107,7 +107,7 @@ pokemon_screen_backadvice,Trykk E for å gå tilbake.
 pokemon_screen_item_give,Gi
 pokemon_screen_item_take,Ta
 pokemon_screen_item_back,Tilbake
-pokemon_screen_doesnt_hold_item,~holder ikke et element.
+pokemon_screen_doesnt_hold_item,~holder ikke et objekt.
 pokemon_screen_take_item_1,Tok 
 pokemon_screen_take_item_2, fra~
 pokemon_screen_take_item_3,~og la det inn i~
@@ -119,7 +119,7 @@ pokemon_screen_give_item_4,~og la
 pokemon_screen_give_item_5,~tilbake i sekken.
 pokemon_screen_summary,	Sammendrag
 pokemon_screen_switch,Bytt
-pokemon_screen_item,Element
+pokemon_screen_item,Objekt
 pokemon_screen_back,Tilbake
 pokemon_screen_EMPTY,TOMT
 ---
@@ -132,11 +132,11 @@ poke_status_screen_number,#
 Page 1:
 poke_status_screen_all_exp,All Exp
 poke_status_screen_nxt_lv,Neste Lv.
-poke_status_screen_stats_page,Stats side
+poke_status_screen_stats_page,Statistikk side
 Page 2:
 poke_status_screen_OT,OT
-poke_status_screen_Item,Element
+poke_status_screen_Item,Objekt
-poke_status_screen_no_item,no elemtn
+poke_status_screen_no_item,Ingen objekter
 poke_status_screen_ability,Evne
 poke_status_screen_details_page,Detaljer side
 Page 3:
@@ -152,7 +152,7 @@ trainer_screen_money,Penger
 trainer_screen_pokedex,Pokédex
 trainer_screen_time,Tid
 trainer_screen_collected_badges,Samlede merker
-trainer_screen_badge,merke
+trainer_screen_badge, Merke
 trainer_screen_backadvice,TRYKK E FOR Å GÅ TILBAKE
 trainer_screen_empty_badge,???
 ---
@@ -204,7 +204,7 @@ option_screen_battle_style,Kampstil
 option_screen_battle_style_shift,Shift
 option_screen_battle_style_set,Set
 option_screen_battle_style_description,Kampstil~Set: Du blir ikke bedt om å bytte ut Pokémon~Shift: Du kan slå ut Pokémonen din etter å ha beseiret en motstander.
-option_screen_view_bobbing,Se bobbing
+option_screen_view_bobbing,Se bevegelse
 option_screen_view_bobbing_description,Slår kamera risting på eller av.
 option_screen_reset_options,Tilbakestill alternativer.
 option_screen_reset_options_description,Tilbakestill alle alternativer.
@@ -224,7 +224,7 @@ Apricorn Screen:
 apricorn_screen_apricorns,Apricorns
 apricorn_screen_producing,Jeg produserer Pokéballene for øyeblikket.~Kom tilbake senere.
 apricorn_screen_backadvice,TRYKK E FOR Å GÅ TILBAKE
-apricorn_screen_choose_apricorns,Vennligst velg Apricorn jeg skal ta for å produsere Pokéballer.
+apricorn_screen_choose_apricorns,Vennligst velg Apricorn jeg skal bruke for å produsere Pokéballer.
 apricorn_screen_ok,OK
 apricorn_screen_clear,Tøm
 apricorn_screen_take,Ta
@@ -245,7 +245,7 @@ daycare_screen_pokemon_choose_header,Sett inn Pokémon
 Egg,Egg
 ---
 Network Screen:
-network_screen_isonline,Du er allerede i et co-op spill! Vennligst lukk forbindelsen~for å åpne et nytt spill eller koble igjen!~~~TRYKK E FOR Å GÅ TILBAKE!
+network_screen_isonline,Du er allerede i et co-op spill! Vennligst lukk forbindelsen~for å åpne et nytt spill eller koble igjen!~~~Trykk E for å gå tilbake!
 network_screen_header,Co-Op Spilling
 network_screen_main_header,Du kan enten delta i et spill eller være vert~for et nytt spill for å spille sammen med en venn.
 network_screen_main_join,Bli med
@@ -260,7 +260,7 @@ network_screen_host_host,Sett opp
 ---
 Donation screen:
 donation_screen_donators,Donasjoner
-donation_screen_backadvice,TRYKK E FOR Å GÅ TILBAKE
+donation_screen_backadvice,Trykk E for å gå tilbake
 ---
 Blackout Screen:
 black_out_screen_line1,Du har gått tom for Pokémon!
@@ -295,7 +295,7 @@ battle_main_trainer_defeat_5,~PokéDollars for å vinne!
 attackTurn:
 battle_attack_poison_damage,~ble skadet av gift!
 battle_attack_curse_damage,~er plaget av forbannelsen!
-battle_attack_fire_damage,~ble skadet av brenningen!
+battle_attack_fire_damage,~ble skadet av flammene!
 battle_attack_trainer_item_1, brukte en~
 battle_attack_trainer_item_2,!
 battle_attack_asleep, sovnet~fort.
@@ -331,6 +331,7 @@ badge_Rising,Stigende
 Regions:
 Johto,Johto
 Kanto,Kanto
+Sevii Islands,Sevii Øyene
 ---
 Places:
 Places_???,???
@@ -366,10 +367,10 @@ Places_Seven Island,Syv Øy
 
 Special Houses:
 Places_Gate,Gate
-Places_Pokemon Center,Pokémon Center
+Places_Pokemon Center,Pokémon Senter
 Places_Pokemon Mart,Pokémon Marked
-Places_Elms lab,Elm's Labb
+Places_Elms lab,Elm sitt laboratorium
-Places_Oak's lab,Oak's Labb
+Places_Oak's lab,Oak sitt laboratorium
 Places_Azalea Town Gym,Asalea Landsby Gym
 Places_Violet City Gym,Fiolett By Gym
 Places_Goldenrod City Gym,Oker By Gym
@@ -390,64 +391,66 @@ Places_Saffron City Gym,Safran Byen Gym
 Places_Cinnabar Gym,Sinober Gym
 Places_Viridian City Gym,Viridian By Gym
 Places_Dance Theater,Danseteater
-Places_Lighthouse,Fyr
+Places_Lighthouse,Fyrtårn
 Places_Team Rocket HQ,Team Rocket Hovedkvarter
 Places_Radio Tower,Radio Tårn
 
 Dungeons:
-Places_Ilex Forest,Ilex Forest
+Places_Ilex Forest,Ilex skogen
-Places_Dark Cave,Dark Cave
+Places_Dark Cave,Mørk Hule
-Places_Ruins of Alph,Ruins of Alph
+Places_Ruins of Alph,Ruinene av Alph
-Places_Slowpoke Well,Slowpoke Well
+Places_Slowpoke Well,Slowpoke Brønn
-Places_Sprout Tower,Sprout Tower
+Places_Sprout Tower,Sprout Tårn
-Places_Union Cave,Union Cave
+Places_Union Cave,Union Hule
-Places_Mt. Mortar,Mt. Mortar
+Places_Mt. Mortar,Mt. Mørtel
-Places_Bell Tower,Tin Tower
+Places_Bell Tower,Tin Tårn
-Places_Tin Tower,Tin Tower
+Places_Tin Tower,Tin Tårn
-Places_Tin Tower Peak,Tin Tower Peak
+Places_Tin Tower Peak,Tin Tårntopp
-Places_Burned Tower,Burned Tower
+Places_Burned Tower,Brent Tårn
-Places_Glitter Lighthouse,Glitter Lighthouse
+Places_Glitter Lighthouse,Glitter Fyrtårn
-Places_Ice Path,Ice Path
+Places_Ice Path,Is Sti
-Places_National Park,National Park
+Places_National Park,Nasjonalpark
-Places_Whirl Islands,Whirl Islands
+Places_Whirl Islands,Virvel øyene
-Places_Lake of Rage,Lake of Rage
+Places_Lake of Rage,Rasende innsjø
-Places_Underground,Underground
+Places_Underground,Undergrunnen
-Places_Dragon's Den,Dragon's Den
+Places_Dragon's Den,Dragens hule
-Places_Tohjo Falls,Tohjo Falls
+Places_Tohjo Falls,Tohjo fossen
-Places_Victory Road,Victory Road
+Places_Victory Road,Seiersveien
-Places_Mt. Silver,Mt. Silver
+Places_Mt. Silver,Mt. Sølv
-Places_Indigo Plateau,Indigo Plateau
+Places_Indigo Plateau,Indigo platå
-Places_Safari Zone,Safari Zone
+Places_Safari Zone,Safari sone
-Places_Viridian Forest,Viridian Forest
+Places_Viridian Forest,Viridian skogen
-Places_Cerulean Cave,Cerulean Cave
+Places_Cerulean Cave,Cerulean hule
-Places_Power Plant,Power Plant
+Places_Power Plant,Kraftverk
-Places_Rock Tunnel,Rock Tunnel
+Places_Rock Tunnel,Bergtunnel
-Places_Seafoam Islands,Seafoam Islands
+Places_Seafoam Islands,Sjøskum øyene
-Places_Pal Park,Pal Park
+Places_Pal Park,Kompis parken
-Places_Diglett's Cave,Diglett's Cave
+Places_Diglett's Cave,Digletts hule
-Places_Mt. Moon,Mt. Moon
+Places_Mt. Moon,Mt. Måne
-Places_Mt. Ember,Mt. Ember
+Places_Mt. Ember,Mt. Glo
-Places_Three Isle Path,Three Isle Path
+Places_Three Isle Path,Tre øyer stien
-Places_Berry Forest,Berry Forest
+Places_Berry Forest,Bærskog
-Places_Icefall Cave,Icefall Cave
+Places_Icefall Cave,Isfallhule
-Places_Lost Cave,Lost Cave
+Places_Lost Cave,Mistet hule
-Places_Trainer Tower,Trainer Tower
+Places_Trainer Tower,Trenertårn
-Places_Altering Cave,Altering Cave
+Places_Altering Cave,Forandrende grotte
-Places_Pattern Bush,Pattern Bush
+Places_Pattern Bush,Mønsterbusk
-Places_Dotted Hole,Dotted Hole
+Places_Dotted Hole,Prikkete hull
-Places_Tanoby Chambers,Tanoby Chambers
+Places_Tanoby Chambers,Tanoby kamre
 Places_Tanoby Key,Tanoby Key
-Places_Monean Chamber,Monean Chamber
+Places_Monean Chamber,Monean kamre
-Places_Liptoo Chamber,Liptoo Chamber
+Places_Liptoo Chamber,Liptoo kamre
-Places_Weepth Chamber,Weepth Chamber
+Places_Weepth Chamber,Weepth kamre
-Places_Dilford Chamber,Dilford Chamber
+Places_Dilford Chamber,Dilford kamre
-Places_Scrufib Chamber,Scrufib Chamber
+Places_Scrufib Chamber,Scrufib kamre
-Places_Rixy Chamber,Rixy Chamber
+Places_Rixy Chamber,Rixy kamre
-Places_Viapois Chamber,Viapois Chamber
+Places_Viapois Chamber,Viapois kamre
-Places_Ancient Ruins,Ancient Ruins
+Places_Ancient Ruins,Gamle ruiner
-Places_Millenial Star Tower,Millenial Star Tower
+Places_Millenial Star Tower,Tusenårsstjernetårnet
-Places_Kolben Tower,Kolben Tower
+Places_Kolben Tower,Kolben tårnet
-Places_Faraway Island,Faraway Island
+Places_Faraway Island,Fjerne øyen
+Places_Underwater Cave,Undervannshulen
+Places_Embedded Tower,Innebygd tårn
 
 Routes:
 Places_Route 1,Rute 1
@@ -499,33 +502,33 @@ Places_Route 46,Rute 46
 Places_Route 47,Rute 47
 Places_Route 48,Rute 48
 
-Places_Treasure Beach,Treasure Beach
+Places_Treasure Beach,Skattestrand
-Places_Kindle Road,Kindle Road
+Places_Kindle Road,Tenne vei
-Places_Cape Brink,Cape Brink
+Places_Cape Brink,Kappe randen
-Places_Three Isle Port,Three Isle Port
+Places_Three Isle Port,Tre øyene porten
-Places_Bond Bridge,Bond Bridge
+Places_Bond Bridge,Bindingsbro
-Places_Five Isle Meadow,Five Isle Meadow
+Places_Five Isle Meadow,Fem øy-eng
-Places_Memorial Pillar,Memorial Pillar
+Places_Memorial Pillar,Minnesøyle
-Places_Water Labyrinth,Water Labyrinth
+Places_Water Labyrinth,Vannlabyrint
-Places_Resort Gorgeous,Resort Gorgeous
+Places_Resort Gorgeous,Feriestedet Nydelig
-Places_Water Path,Water Path
+Places_Water Path,Vannsti
-Places_Grass Path,Grass Path
+Places_Grass Path,Gresssti
-Places_Outcast Island,Outcast Island
+Places_Outcast Island,Utstøtt øy
-Places_Ruin Valley,Ruin Valley
+Places_Ruin Valley,Ruindalen
-Places_Canyon Entrance,Canyon Entrance
+Places_Canyon Entrance,Dal inngang
-Places_Sevault Canyon,Sevault Canyon
+Places_Sevault Canyon,Sevault dalen
-Places_Tanoby Ruins,Tanoby Ruins
+Places_Tanoby Ruins,Tanoby ruinene
-Places_Safari Zone Gate,Safari Zone Gate
+Places_Safari Zone Gate,Safari sone porten
-Places_S.S. Aqua,S.S. Aqua
+Places_S.S. Aqua,S.S. Vann
 Places_Elite 4,Elite 4
-Places_Indigo Plateau,Indigo Plateau
+Places_Indigo Plateau,Indigo platået
-Places_Twirl Forest,Twirl Forest
+Places_Twirl Forest,Virvelskogen
-Places_Berry Vista,Berry Vista
+Places_Berry Vista,Bærutsikten
-Places_Battle Frontier,Battle Frontier
+Places_Battle Frontier,Kampgrensen
-Places_Battle Tower,Battle Tower
+Places_Battle Tower,Kamptårnet
-Places_Battle Factory,Battle Factory
+Places_Battle Factory,Kampfabrikken
-Places_Rocket Warehouse,Rocket Warehouse
+Places_Rocket Warehouse,Rakettlager
-Places_Secret Laboratory,Secret Laboratory
+Places_Secret Laboratory,Hemmelig laboratorium
 
 ---
 Item categories:
@@ -534,7 +537,7 @@ item_category_Medicine,Medisin
 item_category_Machines,Maskiner
 item_category_Pokéballs,PokéBaller
 item_category_Plants,Planter
-item_category_KeyItems,Nøkkelelementer
+item_category_KeyItems,Nøkkelobjekter
 item_category_BattleItems,Kampobjekter
 item_category_Mail,Post
 ---
@@ -575,7 +578,7 @@ Attack,Angrep
 Defense,Forsvar
 Special_Attack,Spesielt Angrep
 Special_Defense,Spesielt Forsvar
-Speed,Speed
+Speed,Hastighet
 ---
 Pokemon:
 pokemon_name_Bulbasaur,Bulbasaur
@@ -835,4 +838,4 @@ New Bark Town:
 ---
 barktown.dat:
 ---
-barktown_player_house,<playername>'s House
+barktown_player_house,<playername>s Hus

P3D/Content/Localization/Tokens_sv.dat

@@ -13,6 +13,7 @@ load_menu_time,Tid
 load_menu_back,Tillbaka
 load_menu_load,Ladda
 load_menu_delete,Ta bort
+load_menu_gamemode,Spelläge
 DeleteScreen:
 delete_menu_delete_confirm,Vill du verkligen to bort sparningen
 delete_menu_delete,Ta bort
@@ -20,7 +21,6 @@ delete_menu_cancel,Avbryt
 LanguageScreen:
 language_menu_apply,Applicera
 language_menu_back,Tillbaka
----
 PacksScreen:
 pack_menu_up,Upp
 pack_menu_down,Ned
@@ -54,6 +54,9 @@ pause_menu_back_to_game,Tillbaka till spelet
 pause_menu_disconnect,Koppla bort
 pause_menu_quit_to_menu,Avsluta till huvudmenyn
 pause_menu_autosave_fail,Kan inte skapa automatisk sparning.
+pause_menu_yes,Ja
+pause_menu_no,Nej
+pause_menu_confirmation,Vill du verkligen sluta? O sparade framsteg kommer att gå förlorade.
 ---
 IngameMenu:
 game_menu_pokedex,Pokédex
@@ -90,6 +93,7 @@ MapScreen:
 map_screen_cities,Städer
 map_screen_routes,Rutter
 map_screen_places,Platser
+map_screen_roaming,Roaming Pokes
 ---
 PokedexScreen:
 pokedex_screen_seen,Sedda
@@ -256,7 +260,7 @@ network_screen_host_host,Bli värd
 ---
 Donation screen:
 donation_screen_donators,Donatorer
-donation_screen_backadvice,Tryck E för att stänga.
+donation_screen_backadvice,Tryck E för att stänga
 ---
 Blackout Screen:
 black_out_screen_line1,Du har slut på Pokémon!
@@ -290,6 +294,7 @@ battle_main_trainer_defeat_5,~PokéDollar för att du vann!
 ---
 attackTurn:
 battle_attack_poison_damage,~blev skadad av gift!
+battle_attack_curse_damage,~är drabbad av förbannelsen!
 battle_attack_fire_damage,~blev skadad av dess brännskada!
 battle_attack_trainer_item_1, Använde en~
 battle_attack_trainer_item_2,!
@@ -326,6 +331,7 @@ badge_Rising,Rising
 Regions:
 Johto,Johto
 Kanto,Kanto
+Sevii Islands,Sevii öar
 ---
 Places:
 Places_???,???
@@ -443,6 +449,8 @@ Places_Ancient Ruins,Forntida ruiner
 Places_Millenial Star Tower,Tusenåriga stjärnatornet
 Places_Kolben Tower,Kolben Tornet
 Places_Faraway Island,Avlägsen Ö
+Places_Underwater Cave,Undervattensgrotta
+Places_Embedded Tower,Inbäddat torn
 
 Routes:
 Places_Route 1,Rutt 1
@@ -830,4 +838,4 @@ New Bark Town:
 ---
 barktown.dat:
 ---
-barktown_player_house,<playername>'s House
+barktown_player_house,<playername>s hus

P3D/Network/ChatScreen.vb

@@ -88,6 +88,10 @@ Public Class ChatScreen
         'Crops too long input text:
         If FontManager.TextFont.MeasureString(Me.currentText).X * 2.0F > Core.windowSize.Width - 200 Then
             While FontManager.TextFont.MeasureString(Me.currentText).X * 2.0F > Core.windowSize.Width - 200
+                If Me.currentText.Length = 0 Then
+                    Exit While
+                End If
+
                 Me.currentText = Me.currentText.Remove(Me.currentText.Length - 1, 1)
             End While
         End If

P3D/P3D.vbproj

@@ -27304,6 +27304,9 @@
     <Content Include="Content\Textures\UI\GameJolt\x.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\GUI\RenameRival.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Textures\UI\TrainerCard\Back.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

P3D/Player/Pokedex.vb

@@ -6,7 +6,7 @@
     '3 = shiny + caught + seen
 
     Public Shared AutoDetect As Boolean = True
-    Public Const POKEMONCOUNT As Integer = 721
+    Public Const POKEMONCOUNT As Integer = 893
 
 #Region "PlayerData"
 

P3D/Screens/Battle/BattleCatchScreen.vb

@@ -228,7 +228,6 @@
 
         p.SetCatchInfos(Me.Ball, "caught at")
 
-        MusicManager.Stop()
         MusicManager.Play("wild_defeat", False, 0.2F)
         SoundManager.PlaySound("success", True)
         TextBox.Show(s, {}, False, False)

P3D/Screens/Credits/CreditsScreen.vb

@@ -2,7 +2,7 @@ Public Class CreditsScreen
 
     Inherits Screen
 
-    Private Const COPYRIGHTYEAR As String = "2019"
+    Private Const COPYRIGHTYEAR As String = "2020"
 
     Dim CreditsPages As New List(Of CreditsPage)
     Dim CurrentPageIndex As Integer = 0
@@ -56,18 +56,18 @@ Public Class CreditsScreen
         Else
             CreditsPages.Add(New CreditsPage("Pokémon 3D", Color.White, Color.Black, {"Trademark (TM) 2012 - " & COPYRIGHTYEAR, "made by Kolben Games", "", "GameMode made by", GameModeManager.ActiveGameMode.Author}.ToList()))
         End If
-        CreditsPages.Add(New CreditsPage("Team Kolben", Color.White, Color.Black, {"Nils Drescher", "Andrew Leach", "Marc Boisvert-Dupras", "Grant Garrett", "Jason Houston", "Daniel Billing", "Benjamin Smith", "Hunter Graves"}.ToList()))
+        CreditsPages.Add(New CreditsPage("Team Kolben", Color.White, Color.Black, {"Nils Drescher", "Andrew Leach", "Marc Boisvert-Dupras", "Grant Garrett", "Jason Houston", "Daniel S. Billing", "Benjamin Smith", "Hunter Graves"}.ToList()))
         CreditsPages.Add(New CreditsPage("Director", Color.White, Color.Black, {"Nils Drescher"}.ToList()))
         CreditsPages.Add(New CreditsPage("Open Source Development Team", Color.White, Color.Black, {"Benjamin Smith", """Aragas""", """oXFantaXo""", "Jorge Luis Espinoza", "Conner Joseph Brewster", """The Omega Ghost"""}.ToList()))
-        CreditsPages.Add(New CreditsPage("Programming", Color.White, Color.Black, {"Nils Drescher", "Jason Houston", "William Lang", "Benjamin Smith", "Yong Jian Ming", "Jorge Luis Espinoza", """Aragas"""}.ToList()))
+        CreditsPages.Add(New CreditsPage("Programming", Color.White, Color.Black, {"Nils Drescher", "Jason Houston", "William Lang", "Benjamin Smith", "Yong Jian Ming", "Jorge Luis Espinoza", """Aragas""", "Jasper Speelman"}.ToList()))
         CreditsPages.Add(New CreditsPage("Graphic Design", Color.White, Color.Black, {"Nils Drescher", "Benjamin Smith", """Godeken""", "Caleb Coleman", "Robert Nobbmann", "Manuel Lampe", "Miguel Nunez", "Grant Garrett", """Anvil555""", """The Omega Ghost""", """princess-phoenix"""}.ToList()))
         CreditsPages.Add(New CreditsPage("Map Design", Color.White, Color.Black, {"Nils Drescher", "Benjamin Smith", "Hunter Graves", "Manuel Lampe", "Robert Nobbmann", "Maximilian Schröder", "Jan Mika Eine", "Jason Houston", """oXFantaXo"""}.ToList()))
         CreditsPages.Add(New CreditsPage("Actionscript", Color.White, Color.Black, {"Nils Drescher", "Benjamin Smith", "Hunter Graves", "Andrew Leach", "Jason Houston", "Yong Jian Ming", """Aragas"""}.ToList()))
         CreditsPages.Add(New CreditsPage("Script System Development", Color.White, Color.Black, {"Nils Drescher", "Benjamin Smith", "Hunter Graves", "Yong Jian Ming", """Aragas"""}.ToList()))
         CreditsPages.Add(New CreditsPage("KolbenWindowWidget Development & LUA Implementation", Color.White, Color.Black, {"Jason Houston"}.ToList()))
-        CreditsPages.Add(New CreditsPage("Launcher Programming", Color.White, Color.Black, {"Nils Drescher", "Daniel Billing", """ThuxCommix""", """Aragas"""}.ToList()))
+        CreditsPages.Add(New CreditsPage("Launcher Programming", Color.White, Color.Black, {"Nils Drescher", "Daniel S. Billing", """ThuxCommix""", """Aragas"""}.ToList()))
         CreditsPages.Add(New CreditsPage("Pokéditor Programming", Color.White, Color.Black, {"Nils Drescher", "Jason Houston", "Hunter Graves"}.ToList()))
-        CreditsPages.Add(New CreditsPage("Website Host/Server Maintenance", Color.White, Color.Black, {"Daniel Billing", "Daniel Laube"}.ToList()))
+        CreditsPages.Add(New CreditsPage("Website Host/Server Maintenance", Color.White, Color.Black, {"Daniel S. Billing", "Daniel Laube"}.ToList()))
         CreditsPages.Add(New CreditsPage("GameJolt Service/API Programming", Color.White, Color.Black, {"David DeCarmine", "Nils Drescher"}.ToList()))
         CreditsPages.Add(New CreditsPage("Debug Testing", Color.White, Color.Black, {"Jan Mika Eine", "Tim Drescher", "Daniel Steinborn", "Andrew Leach", "Marc Boisvert-Dupras", "Matt Chambers", "Hunter Graves", "Benjamin Smith", "William Hunn", "Torben Carrington", """oXFantaXo""", "Conner Joseph Brewster", """Sanio"""}.ToList()))
         CreditsPages.Add(New CreditsPage("Special Thanks", Color.White, Color.Black, {"""MunchingOrange""", """TheFlamingSpade""", """SlyFoxHound""", """ArsenioDev""", """TrUShade""", """Isaaking6"""}.ToList()))

P3D/Screens/Pokemon/Daycare.vb

@@ -82,15 +82,16 @@
                 male = 1
             End If
             If male > -1 Then
-                Dim cParent As Pokemon = Nothing
-                Select Case male
-                    Case 0
-                        cParent = parent1
-                    Case 1
-                        cParent = parent2
-                End Select
                 For Each BreedMove As Integer In p.EggMoves
-                    For Each m1 As BattleSystem.Attack In cParent.Attacks
+                    For Each m1 As BattleSystem.Attack In parent1.Attacks
+                        If m1.ID = BreedMove Then
+                            GameJolt.Emblem.AchieveEmblem("eggsplosion")
+
+                            Dim newAttack As BattleSystem.Attack = BattleSystem.Attack.GetAttackByID(m1.ID)
+                            EggMoves.Add(newAttack)
+                        End If
+                    Next
+                    For Each m1 As BattleSystem.Attack In parent2.Attacks
                         If m1.ID = BreedMove Then
                             GameJolt.Emblem.AchieveEmblem("eggsplosion")
 

P3D/World/ActionScript/V2/ScriptCommands/DoPlayer.vb

@@ -25,7 +25,7 @@
                     Core.Player.HasPokegear = True
                     IsReady = True
                 Case "renamerival"
-                    Core.SetScreen(New NameObjectScreen(Core.CurrentScreen, TextureManager.GetTexture("NPC\4", New Rectangle(0, 64, 32, 32)), False, False, "rival", "Silver", AddressOf Script.NameRival))
+                    Core.SetScreen(New NameObjectScreen(Core.CurrentScreen, TextureManager.GetTexture("GUI\RenameRival"), False, False, "rival", "Silver", AddressOf Script.NameRival))
                     IsReady = True
                     CanContinue = False
                 Case "wearskin"

P3D/World/ActionScript/V2/ScriptCommands/DoPokemon.vb

@@ -85,6 +85,11 @@
                             heldItem = CInt(argument.GetSplit(7))
                         End If
 
+                        Dim isShiny As Boolean = False
+                        If commas > 7 Then
+                            isShiny = CBool(argument.GetSplit(8))
+                        End If
+
                         Dim Pokemon As Pokemon = Pokemon.GetPokemonByID(PokemonID)
                         Pokemon.Generate(Level, True)
 
@@ -106,6 +111,8 @@
                             Pokemon.Item = Item.GetItemByID(heldItem)
                         End If
 
+                        Pokemon.IsShiny = isShiny
+
                         Core.Player.Pokemons.Add(Pokemon)
 
                         Dim pokedexType As Integer = 2
@@ -714,7 +721,7 @@
                     End If
                 Case "addtostorage"
                     ' @Pokemon.AddToStorage([BoxIndex], PokemonData)
-                    ' @Pokemon.AddToStorage(PokemonID, Level, [Method], [BallID], [Location], [isEgg], [trainerName])
+                    ' @Pokemon.AddToStorage(PokemonID, Level, [Method], [BallID], [Location], [isEgg], [trainerName], [heldItem], [isShiny])
 
                     If argument.StartsWith("{") = True Or argument.Remove(0, argument.IndexOf(",")).StartsWith(",{") = True Then
                         Dim insertIndex As Integer = -1
@@ -771,6 +778,16 @@
                             catchTrainer = argument.GetSplit(6)
                         End If
 
+                        Dim heldItem As Integer = 0
+                        If commas > 6 Then
+                            heldItem = CInt(argument.GetSplit(7))
+                        End If
+
+                        Dim isShiny As Boolean = False
+                        If commas > 7 Then
+                            isShiny = CBool(argument.GetSplit(8))
+                        End If
+
                         Dim Pokemon As Pokemon = Pokemon.GetPokemonByID(PokemonID)
                         Pokemon.Generate(Level, True)
 
@@ -788,6 +805,12 @@
                             Pokemon.EggSteps = 0
                         End If
 
+                        If heldItem <> 0 Then
+                            Pokemon.Item = Item.GetItemByID(heldItem)
+                        End If
+
+                        Pokemon.IsShiny = isShiny
+
                         StorageSystemScreen.DepositPokemon(Pokemon)
 
                         Dim pokedexType As Integer = 2

P3D/credits.txt

@@ -1,9 +1,11 @@
-Pokémon created by Nintendo, Game Freak and The Pokémon Company / Creatures Inc.
+Pokémon made by Nintendo, Game Freak and The Pokémon Company / Creatures Inc.
+
+Pokémon 3D is not affiliated with Nintendo, Creatures Inc. or GAME FREAK Inc.
 
 Pokémon 3D
 
 	Created by Kolben Games 
-	2012 - 2019
+	2012-2020
 
 	Team Kolben
 		Nils Drescher
@@ -11,7 +13,7 @@ Pokémon 3D
 		Marc Boisvert-Dupras
 		Grant Garrett
 		Jason Houston
-		Daniel Billing
+		Daniel S. Billing
 		Benjamin Smith
 		Hunter Graves
 
@@ -29,11 +31,12 @@ Pokémon 3D
 	Programming
 		Nils Drescher
 		Jason Houston
-		Benjamin Smith
 		William Lang
+		Benjamin Smith
 		Yong Jian Ming
 		Jorge Luis Espinoza
 		"Aragas"
+		Jasper Speelman
 
 	Graphic Design
 		Nils Drescher
@@ -95,7 +98,7 @@ Pokémon 3D
 
 	Launcher Programming
 		Nils Drescher
-		Daniel Billing
+		Daniel S. Billing
 		"ThuxCommix"
 		"Aragas"
 
@@ -108,7 +111,7 @@ Pokémon 3D
 		Nils Drescher
 
 	Website Host/Server Maintenance
-		Daniel Billing
+		Daniel S. Billing
 		Daniel Laube
 
 	GameJolt Service/API Programming

README.md

@@ -10,7 +10,7 @@ It is built using the MonoGame framework as graphics middleware.
 In order to build the game's solution, you need the following:
 * Microsoft Windows operating system (XP and up)
 * [Microsoft Visual Studio](https://www.visualstudio.com/) (2010 and up)
-* [MonoGame 3.6](http://www.monogame.net/downloads/)
+* [MonoGame 3.7](http://www.monogame.net/downloads/)
 
 To run the game after a successful build, you also need an applicable graphics card that supports DirectX (version 9 minimum).