diff --git a/DS_Map/Resources/PokeDatabase.cs b/DS_Map/Resources/PokeDatabase.cs
index 5ad061b..cc7220d 100644
--- a/DS_Map/Resources/PokeDatabase.cs
+++ b/DS_Map/Resources/PokeDatabase.cs
@@ -696,6 +696,7 @@ namespace DSPRE.Resources {
                 [0x0010] = "IfAdrsAdrs",
                 [0x0011] = "CompareVarValue",
                 [0x0012] = "CompareVars",
+
                 [0x0014] = "CommonScript",
                 [0x0015] = "LocalScript",
                 [0x0016] = "Jump",
@@ -723,8 +724,10 @@ namespace DSPRE.Resources {
                 [0x002C] = "Message",
                 [0x002D] = "MessageFlex",
                 [0x002E] = "MessageNoSkip",
+
                 [0x0030] = "WaitAB",
                 [0x0031] = "WaitButton",
+
                 [0x0033] = "OpenMessage",
                 [0x0034] = "CloseMessage",
                 [0x0035] = "FreezeMessage",
@@ -735,13 +738,17 @@ namespace DSPRE.Resources {
                 [0x003A] = "BoardMessage",
                 [0x003B] = "EndBoard",
                 [0x003C] = "Menu",
+
                 [0x003E] = "YesNoBox",
+
                 [0x0040] = "Multi",
                 [0x0041] = "Multi2",
                 [0x0042] = "TextScriptMulti",
                 [0x0043] = "CloseMulti",
                 [0x0044] = "Multi3",
+
                 [0x0046] = "TextMessageScriptMulti",
+
                 [0x0048] = "MultiRow",
                 [0x0049] = "PlayFanfare",
                 [0x004A] = "StopFanfare",
@@ -774,6 +781,7 @@ namespace DSPRE.Resources {
                 [0x0067] = "ReleaseCam",
                 [0x0068] = "FacePlayer",
                 [0x0069] = "CheckPlayerPosition",
+
                 [0x006B] = "CheckOverworldPosition",
                 [0x006C] = "KeepOverworld",
                 [0x006D] = "FollowHero",
@@ -796,15 +804,21 @@ namespace DSPRE.Resources {
                 [0x007E] = "CheckPlayerHasItem",
                 [0x007F] = "CheckItemIsMachine",
                 [0x0080] = "GetItemPocket",
+                [0x0081] = "DummyAddPCItem",
+                [0x0082] = "DummyCheckPCItem",
+
                 [0x0085] = "CheckUndergroundPcStatus",
+
                 [0x0093] = "CheckPokémonParty",
                 [0x0094] = "StorePokémonParty",
                 [0x0095] = "SetPokémonPartyStored",
                 [0x0096] = "GivePokemon",
                 [0x0097] = "GivePokemonEgg",
-                [0x009C] = "SetWeather",
-                [0x009D] = "InitWeather",
-                [0x009E] = "UpdateWeather",
+
+                [0x009C] = "DummySetWeather",
+                [0x009D] = "DummyInitWeather",
+                [0x009E] = "DummyUpdateWeather",
+
                 [0x00A5] = "Interview",
                 [0x00A6] = "DressPokémon",
                 [0x00A7] = "DisplayDressedPokémon",
@@ -816,10 +830,13 @@ namespace DSPRE.Resources {
                 [0x00AD] = "TrainerCaseUnion",
                 [0x00AE] = "TradeUnion",
                 [0x00AF] = "RecordMixingUnion",
+
                 [0x00B0] = "EndGame",
                 [0x00B1] = "HallFameData",
+
                 [0x00B3] = "WFC1",
                 [0x00B4] = "ChooseStarter",
+
                 [0x00BA] = "ChoosePlayerName",
                 [0x00BB] = "ChoosePokémonName",
                 [0x00BC] = "FadeScreen",
@@ -835,6 +852,7 @@ namespace DSPRE.Resources {
                 [0x00C6] = "Tuxedo",
                 [0x00C7] = "CheckBike",
                 [0x00C8] = "RideBike",
+
                 [0x00CB] = "BerryHiroAnimation",
                 [0x00CC] = "StopBerryHiroAnimation",
                 [0x00CD] = "TextPlayerName",
@@ -855,14 +873,12 @@ namespace DSPRE.Resources {
                 [0x00DC] = "TextRivalStarter",
                 [0x00DD] = "TextCounterpartStarter",
                 [0x00DE] = "CheckStarter",
-
                 [0x00DF] = "TextGoods",
                 [0x00E0] = "TextTrap",
                 [0x00E1] = "TextTreasure",
                 [0x00E2] = "TextMapName",
                 [0x00E3] = "GenerateSwarm",
                 [0x00E4] = "TrainerID",
-
                 [0x00E5] = "TrainerBattle",
                 [0x00E6] = "TrainerMessage",
                 [0x00E7] = "TrainerMsgCheck",
@@ -878,28 +894,39 @@ namespace DSPRE.Resources {
                 [0x00F1] = "DummyTrainerFlagJump",
                 [0x00F2] = "ChooseFriend",
                 [0x00F3] = "WirelessBattleWait",
+
                 [0x00F7] = "PokémonContest",
+
                 [0x0111] = "FlashContest",
                 [0x0112] = "EndFlash",
                 [0x0116] = "ShowLinkCountRecord",
-                [0x011B] = "WarpMapElevator",
+                [0x0119] = "CheckPokerus",
+                [0x011A] = "CheckPokemonGender",
+               
                 [0x011C] = "CheckElevatorFloor",
                 [0x001D] = "ElevatorBox",
-                [0x0120] = "SetPositionAfterShip",
+                [0x001E] = "SinnohDexSeen",
+                [0x001F] = "SinnohDexObtained",
+                [0x0120] = "NationalDexSeen",
+                [0x0121] = "NationalDexObtained",
+                [0x0122] = "DummyNationalDexCheck",
+                [0x0123] = "PokedexProgressMsg",
                 [0x0124] = "WildBattle",
                 [0x0125] = "FirstBattle",
                 [0x0126] = "CatchTutorial",
-                [0x0127] = "HoneyTreeBattle",
-                [0x0128] = "HoneyTreeBattleCheck",
+                [0x0127] = "UpdateHoneyTree",
+                [0x0128] = "CheckHoneyTree",
+                [0x0129] = "HoneyTreeBattle",
+                [0x012A] = "StopHoneyTreeAnimation",
+                [0x012C] = "CheckSaveGame",
+                [0x012D] = "SaveGame",
+
                 [0x0131] = "GivePokétch",
                 [0x0132] = "PoketchFlag",
                 [0x0133] = "GivePoketchApp",
                 [0x0134] = "CheckPoketchApp",
-                [0x0143] = "ExpectDecisionOther",
-                [0x0147] = "PokéMart",
-                [0x0148] = "PokéMart1",
-                [0x0149] = "PokéMart2",
-                [0x014A] = "PokéMart3",
+
+                [0x014B] = "DummyLostBattle",
                 [0x014D] = "CheckPlayerGender",
                 [0x014E] = "HealPokemon",
                 [0x0153] = "UnionRoom",
@@ -910,12 +937,30 @@ namespace DSPRE.Resources {
                 [0x015B] = "CheckBadge",
                 [0x015C] = "EnableBadge",
                 [0x015D] = "DisableBadge",
+
+                [0x0160] = "CheckPartner",
+                [0x0161] = "SetPartner",
+                [0x0162] = "ClearPartner",
+
+                [0x0166] = "CheckGameIsCompleted"
+                [0x0167] = "GameCompleted",
                 [0x0168] = "DoorAnimation",
                 [0x0169] = "WaitDoor",
                 [0x016A] = "FreeDoor",
                 [0x016B] = "OpenDoor",
                 [0x016C] = "CloseDoor",
+                [0x016D] = "GetDaycareNames",
+                [0x016E] = "GetDaycareStatus",
+                [0x016F] = "InitPastoriaGym",
+                [0x0170] = "PastoriaGymButton",
+                [0x0171] = "InitHearthomeGym",
+                [0x0172] = "HearthomeGymLift",
+                [0x0173] = "InitCanalaveGym",
+                [0x0174] = "InitVeilstoneGym",
+                [0x0175] = "InitSunyshoreGym",
+                [0x0176] = "SunyshoreGymGear",
                 [0x0177] = "GetPartyCount",
+
                 [0x0178] = "OpenBerryPouch",
                 [0x0186] = "SetOverworldPosition",
                 [0x0188] = "SetOverworldMovement",
@@ -930,11 +975,23 @@ namespace DSPRE.Resources {
                 [0x0195] = "PokémonInfo",
                 [0x0198] = "StorePokémonNumber",
                 [0x019A] = "CheckPartyNumber2",
-                [0x01AC] = "EggAnimation",
-                [0x01B3] = "Mailbox",
+
+                [0x01AC] = "EggHatchScreen",
+                [0x01AD] = "DummyDaycare",
+                [0x01AE] = "CheckDaycareLevel",
+
+                [0x01B3] = "OpenMailScreen",
+                [0x01B4] = "GetMailCount",
+
                 [0x01B5] = "RecordList",
+                [0x01B6] = "CheckTimePeriod",
+                [0x01B7] = "GetRandom",
+                [0x01B8] = "DummyGetRandom",
                 [0x01B9] = "GetPokemonHappiness",
-                [0x01BD] = "CheckPosition",
+                [0x01BA] = "AddHappiness",
+                [0x01BB] = "SubHappiness",
+
+                [0x01BD] = "CheckPlayerDir",
                 [0x01C0] = "CheckPokémonParty2",
                 [0x01C1] = "CopyPokémonHeight",
                 [0x01C2] = "TextPokémonHeight",
@@ -953,7 +1010,7 @@ namespace DSPRE.Resources {
                 [0x01F1] = "CheckFossil",
                 [0x01F6] = "CheckPokémonLevel",
                 [0x0204] = "WarpLastElevator",
-                [0x0205] = "GeoNet",
+                [0x0205] = "Geonet",
                 [0x0206] = "GreatMarshBynocule",
                 [0x0208] = "PokémonPicture",
                 [0x0209] = "HidePicture",
@@ -970,10 +1027,10 @@ namespace DSPRE.Resources {
                 [0x0230] = "RibbonCheck",
                 [0x0231] = "RibbonGive",
                 [0x0232] = "TextRibbon",
-                [0x0239] = "DecideRules",
-                [0x023B] = "AnimationPCHeal",
-                [0x023C] = "AnimationElevator",
-                [0x023D] = "AnimationShip",
+                [0x0239] = "RulesList",
+                [0x023B] = "PCHealAnimation",
+                [0x023C] = "ElevatorAnimation",
+                [0x023D] = "ShipAnimation",
                 [0x0243] = "PhraseBox1W",
                 [0x0244] = "PhraseBox2W",
                 [0x0249] = "CheckPhraseBoxInput",
@@ -985,10 +1042,21 @@ namespace DSPRE.Resources {
                 [0x0252] = "CheckBoxesNumber",
                 [0x0257] = "SprtSave",
                 [0x0258] = "RetSprtSave",
-                [0x0259] = "ElevLgAnimation",
-                [0x0261] = "CheckAccessories",
+                
+                [0x0261] = "TextAccesory",
+                [0x0262] = "CheckPokemonInParty",
+                [0x0263] = "SetDeoxysForm"
+                //0x0264 is different between DP/Plat
+
                 [0x0267] = "SlotMachine",
+                [0x0268] = "GetHour",
+                [0x0269] = "OverworldShake",
+                [0x026A] = "OverworldBlink",
+                [0x026B] = "CheckRegis",
+
                 [0x026D] = "UnownMessageBox",
+                [0x026E] = "CheckGBACartidge",
+                [0x026F] = "ResetSpiritombCounter",
                 [0x0271] = "ThankNameInsert",
                 [0x027A] = "LeagueCastleView",
                 [0x028C] = "PokémonPartyPicture",
@@ -997,7 +1065,7 @@ namespace DSPRE.Resources {
                 [0x0295] = "HideBattlePointsBox",
                 [0x029D] = "ChoiceMulti",
                 [0x029E] = "HiddenMachineEffect",
-                [0x029F] = "CameraBumpEffect",
+                [0x029F] = "ShakeCamera",
                 [0x02A0] = "DoubleBattle",
                 [0x02A1] = "ApplyMovement2",
                 [0x02A5] = "ChooseTradePokémon",