From 2fba5d6d8bd733be35cd0c84dd545a173e4dc618 Mon Sep 17 00:00:00 2001 From: AdAstra-LD Date: Fri, 5 Feb 2021 04:24:40 +0100 Subject: [PATCH] Reorganized files --- DS_Map/DS Map.csproj | 289 ++++++++-------- DS_Map/HeaderSearch.cs | 27 +- DS_Map/Main Window.cs | 63 ++-- .../PokeDatabase.ScriptEditor.datasource | 10 - DS_Map/Properties/Resources.Designer.cs | 22 +- DS_Map/Properties/Resources.resx | 312 +++++++++--------- DS_Map/{ => ROMFiles}/AreaData.cs | 3 +- DS_Map/{ => ROMFiles}/EncounterFile.cs | 3 +- DS_Map/{ => ROMFiles}/EventFile.cs | 5 +- DS_Map/{ => ROMFiles}/MapFile.cs | 4 +- DS_Map/{Header.cs => ROMFiles/MapHeader.cs} | 23 +- DS_Map/{ => ROMFiles}/Matrix.cs | 3 +- DS_Map/{ => ROMFiles}/ScriptCommand.cs | 2 +- DS_Map/{ => ROMFiles}/ScriptFile.cs | 2 +- DS_Map/{ => ROMFiles}/TextArchive.cs | 3 +- DS_Map/ROMToolboxDialog.cs | 1 + DS_Map/{Graphics => Resources}/ColorTable.txt | 0 .../Graphics/Area Icons/areaicon00.png | Bin .../Graphics/Area Icons/areaicon01.png | Bin .../Graphics/Area Icons/areaicon02.png | Bin .../Graphics/Area Icons/areaicon03.png | Bin .../Graphics/Area Icons/areaicon04.png | Bin .../Graphics/Area Icons/areaicon05.png | Bin .../Graphics/Area Icons/areaicon06.png | Bin .../Graphics/Area Icons/areaicon07.png | Bin .../Graphics/Area Icons/areaicon08.png | Bin .../Graphics/Area Icons/areaicon09.png | Bin .../Graphics/Area Icons/dp.png | Bin .../Graphics/Area Icons/hgsscave.png | Bin .../Graphics/Area Icons/hgssfield.png | Bin .../Graphics/Area Icons/hgssforest.png | Bin .../Graphics/Area Icons/hgssgray.png | Bin .../Graphics/Area Icons/hgsstown.png | Bin .../Graphics/Area Icons/hgsswall.png | Bin .../Graphics/Area Icons/hgsswater.png | Bin .../Graphics/Area Icons/hgsswood.png | Bin .../Graphics/Camera Angles/DPPt/dpcamera0.png | Bin .../Graphics/Camera Angles/DPPt/dpcamera1.png | Bin .../Camera Angles/DPPt/dpcamera10.png | Bin .../Camera Angles/DPPt/dpcamera11.png | Bin .../Camera Angles/DPPt/dpcamera12.png | Bin .../Camera Angles/DPPt/dpcamera13.png | Bin .../Camera Angles/DPPt/dpcamera14.png | Bin .../Camera Angles/DPPt/dpcamera15.png | Bin .../Graphics/Camera Angles/DPPt/dpcamera2.png | Bin .../Graphics/Camera Angles/DPPt/dpcamera3.png | Bin .../Graphics/Camera Angles/DPPt/dpcamera4.png | Bin .../Graphics/Camera Angles/DPPt/dpcamera5.png | Bin .../Graphics/Camera Angles/DPPt/dpcamera6.png | Bin .../Graphics/Camera Angles/DPPt/dpcamera7.png | Bin .../Graphics/Camera Angles/DPPt/dpcamera8.png | Bin .../Graphics/Camera Angles/DPPt/dpcamera9.png | Bin .../Graphics/Camera Angles/DPPt/ptcamera0.png | Bin .../Graphics/Camera Angles/DPPt/ptcamera1.png | Bin .../Camera Angles/DPPt/ptcamera10.png | Bin .../Camera Angles/DPPt/ptcamera11.png | Bin .../Camera Angles/DPPt/ptcamera12.png | Bin .../Camera Angles/DPPt/ptcamera13.png | Bin .../Camera Angles/DPPt/ptcamera14.png | Bin .../Camera Angles/DPPt/ptcamera15.png | Bin .../Graphics/Camera Angles/DPPt/ptcamera2.png | Bin .../Graphics/Camera Angles/DPPt/ptcamera3.png | Bin .../Graphics/Camera Angles/DPPt/ptcamera4.png | Bin .../Graphics/Camera Angles/DPPt/ptcamera5.png | Bin .../Graphics/Camera Angles/DPPt/ptcamera6.png | Bin .../Graphics/Camera Angles/DPPt/ptcamera7.png | Bin .../Graphics/Camera Angles/DPPt/ptcamera8.png | Bin .../Graphics/Camera Angles/DPPt/ptcamera9.png | Bin .../Camera Angles/HGSS/hgsscamera00.png | Bin .../Camera Angles/HGSS/hgsscamera01.png | Bin .../Camera Angles/HGSS/hgsscamera02.png | Bin .../Camera Angles/HGSS/hgsscamera03.png | Bin .../Camera Angles/HGSS/hgsscamera04.png | Bin .../Camera Angles/HGSS/hgsscamera05.png | Bin .../Camera Angles/HGSS/hgsscamera06.png | Bin .../Camera Angles/HGSS/hgsscamera07.png | Bin .../Camera Angles/HGSS/hgsscamera08.png | Bin .../Camera Angles/HGSS/hgsscamera09.png | Bin .../Camera Angles/HGSS/hgsscamera10.png | Bin .../Camera Angles/HGSS/hgsscamera11.png | Bin .../Camera Angles/HGSS/hgsscamera12.png | Bin .../Camera Angles/HGSS/hgsscamera13.png | Bin .../Camera Angles/HGSS/hgsscamera14.png | Bin .../Camera Angles/HGSS/hgsscamera15.png | Bin .../Graphics/Event Icons/blue_sign.png | Bin .../Graphics/Event Icons/brown_sign.png | Bin .../Graphics/Event Icons/dawn_platinum.png | Bin .../Graphics/Event Icons/dppt_suitcase.png | Bin .../Graphics/Event Icons/gray_sign.png | Bin .../Graphics/Event Icons/overworld.png | Bin .../Graphics/Event Icons/red_sign.png | Bin .../Graphics/Event Icons/route_sign.png | Bin .../Graphics/Event Icons/sign.png | Bin .../Graphics/Event Icons/trigger.png | Bin .../Graphics/Event Icons/warp.png | Bin .../Graphics/Program Icons/LeftClick.png | Bin .../Graphics/Program Icons/RightClick.png | Bin .../Graphics/Program Icons/SurfIcon.png | Bin .../Graphics/Program Icons/WheelClick.png | Bin .../Graphics/Program Icons/addIcon.png | Bin .../Graphics/Program Icons/arrowdown.png | Bin .../Graphics/Program Icons/arrowleft.png | Bin .../Graphics/Program Icons/arrowright.png | Bin .../Graphics/Program Icons/arrowup.png | Bin .../Program Icons/building_editor.png | Bin .../Graphics/Program Icons/checkmark.png | Bin .../Graphics/Program Icons/clearflag.png | Bin .../Graphics/Program Icons/closemsg.png | Bin .../Graphics/Program Icons/copyIcon.png | Bin .../Graphics/Program Icons/copyIcon_small.png | Bin .../Graphics/Program Icons/deleteIcon.png | Bin .../Program Icons/dualslot_encounters.png | Bin .../Graphics/Program Icons/egg.png | Bin .../Graphics/Program Icons/event_editor.png | Bin .../Program Icons/exploreKit.Image.png | Bin .../Graphics/Program Icons/exportArrow.png | Bin .../Graphics/Program Icons/give_badge.png | Bin .../Graphics/Program Icons/give_pokedex.png | Bin .../Graphics/Program Icons/give_pokegear.png | Bin .../Graphics/Program Icons/give_shoes.png | Bin .../Graphics/Program Icons/giveitem.png | Bin .../Graphics/Program Icons/givemom.png | Bin .../Graphics/Program Icons/goToOW.png | Bin .../Graphics/Program Icons/goToSpawnable.png | Bin .../Graphics/Program Icons/goToTrigger.png | Bin .../Graphics/Program Icons/goToWarp.png | Bin .../Program Icons/good_rod_encounters.png | Bin .../Graphics/Program Icons/importArrow.png | Bin .../Program Icons/legendary_battle.png | Bin .../Graphics/Program Icons/loadColorTable.png | Bin .../Graphics/Program Icons/map_editor.png | Bin .../Graphics/Program Icons/map_header.ico | Bin .../Graphics/Program Icons/matrix_editor.png | Bin .../Graphics/Program Icons/message.png | Bin .../Graphics/Program Icons/money.png | Bin .../Program Icons/old_rod_encounters.png | Bin .../Graphics/Program Icons/open_file.png | Bin .../Graphics/Program Icons/pasteIcon.png | Bin .../Program Icons/pokéradar_encounters.png | Bin .../Program Icons/radio_encounters.png | Bin .../Program Icons/resetColorTable.png | Bin .../Program Icons/rock_smash_encounters.png | Bin .../Graphics/Program Icons/save_rom.png | Bin .../Graphics/Program Icons/script_editor.png | Bin .../Graphics/Program Icons/setflag.png | Bin .../Program Icons/super_rod_encounters.png | Bin .../Graphics/Program Icons/takeitem.png | Bin .../Graphics/Program Icons/takemom.png | Bin .../Graphics/Program Icons/takemoney.png | Bin .../Graphics/Program Icons/text_editor.png | Bin .../Program Icons/texture_background.png | Bin .../Graphics/Program Icons/tileset_editor.png | Bin .../Graphics/Program Icons/trainer_battle.png | Bin .../Graphics/Program Icons/unpackAllIcon.png | Bin .../Program Icons/unpackBuildingNarcsIcon.png | Bin .../Program Icons/walking_encounters_dppt.png | Bin .../Program Icons/walking_encounters_hgss.png | Bin .../Graphics/Program Icons/warpGo.png | Bin .../Graphics/Program Icons/wideLensImage.png | Bin .../Program Icons/wideLensImageTransp.png | Bin .../Graphics/Program Icons/wild_battle.png | Bin .../Graphics/Program Icons/wild_editor.png | Bin .../Graphics/Weather/DPPt/dpblizzard.gif | Bin .../Graphics/Weather/DPPt/dpcloudy.png | Bin .../Graphics/Weather/DPPt/dpdark.png | Bin .../Graphics/Weather/DPPt/dpdiamondsnow.gif | Bin .../Graphics/Weather/DPPt/dpfog.png | Bin .../Graphics/Weather/DPPt/dphail.gif | Bin .../Graphics/Weather/DPPt/dpheavyrain.gif | Bin .../Graphics/Weather/DPPt/dplightning.gif | Bin .../Weather/DPPt/dplightsandstorm.gif | Bin .../Graphics/Weather/DPPt/dpnormal.png | Bin .../Graphics/Weather/DPPt/dprain.gif | Bin .../Weather/DPPt/dprocksascending.gif | Bin .../Graphics/Weather/DPPt/dpsandfall.gif | Bin .../Graphics/Weather/DPPt/dpsandstorm.gif | Bin .../Graphics/Weather/DPPt/dpsnowslow.gif | Bin .../Graphics/Weather/DPPt/dpthunderstorm.gif | Bin .../Graphics/Weather/DPPt/ptblizzard.gif | Bin .../Graphics/Weather/DPPt/ptcloudy.png | Bin .../Graphics/Weather/DPPt/ptdark.png | Bin .../Graphics/Weather/DPPt/ptdiamondsnow.gif | Bin .../Graphics/Weather/DPPt/ptfog.png | Bin .../Graphics/Weather/DPPt/ptforestweather.gif | Bin .../Graphics/Weather/DPPt/pthail.gif | Bin .../Graphics/Weather/DPPt/ptheavyrain.gif | Bin .../Graphics/Weather/DPPt/ptlightning.gif | Bin .../Weather/DPPt/ptlightsandstorm.gif | Bin .../Graphics/Weather/DPPt/ptnormal.png | Bin .../Graphics/Weather/DPPt/ptrain.gif | Bin .../Weather/DPPt/ptrocksascending.gif | Bin .../Graphics/Weather/DPPt/ptsandfall.gif | Bin .../Graphics/Weather/DPPt/ptsandstorm.gif | Bin .../Graphics/Weather/DPPt/ptsnowslow.gif | Bin .../Graphics/Weather/DPPt/ptspotlight.gif | Bin .../Graphics/Weather/DPPt/ptthunderstorm.gif | Bin .../Graphics/Weather/HGSS/hgssArcade.gif | Bin .../Graphics/Weather/HGSS/hgssdark.png | Bin .../Graphics/Weather/HGSS/hgssdark2.png | Bin .../Graphics/Weather/HGSS/hgssdiamond.gif | Bin .../Graphics/Weather/HGSS/hgssfog.gif | Bin .../Graphics/Weather/HGSS/hgssfog.png | Bin .../Graphics/Weather/HGSS/hgsshail.gif | Bin .../Graphics/Weather/HGSS/hgssnormal.gif | Bin .../Graphics/Weather/HGSS/hgssrain.gif | Bin .../Graphics/Weather/HGSS/hgsssnow.gif | Bin DS_Map/{ => Resources}/Graphics/app.ico | Bin DS_Map/{ => Resources}/Graphics/app.png | Bin DS_Map/Resources/PokeDatabase.cs | 3 +- DS_Map/WildEditorDPPt.cs | 3 +- DS_Map/WildEditorHGSS.cs | 3 +- 211 files changed, 395 insertions(+), 386 deletions(-) delete mode 100644 DS_Map/Properties/DataSources/PokeDatabase.ScriptEditor.datasource rename DS_Map/{ => ROMFiles}/AreaData.cs (98%) rename DS_Map/{ => ROMFiles}/EncounterFile.cs (99%) rename DS_Map/{ => ROMFiles}/EventFile.cs (99%) rename DS_Map/{ => ROMFiles}/MapFile.cs (99%) rename DS_Map/{Header.cs => ROMFiles/MapHeader.cs} (97%) rename DS_Map/{ => ROMFiles}/Matrix.cs (99%) rename DS_Map/{ => ROMFiles}/ScriptCommand.cs (99%) rename DS_Map/{ => ROMFiles}/ScriptFile.cs (99%) rename DS_Map/{ => ROMFiles}/TextArchive.cs (99%) rename DS_Map/{Graphics => Resources}/ColorTable.txt (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/areaicon00.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/areaicon01.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/areaicon02.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/areaicon03.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/areaicon04.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/areaicon05.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/areaicon06.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/areaicon07.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/areaicon08.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/areaicon09.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/dp.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/hgsscave.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/hgssfield.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/hgssforest.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/hgssgray.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/hgsstown.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/hgsswall.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/hgsswater.png (100%) rename DS_Map/{ => Resources}/Graphics/Area Icons/hgsswood.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/dpcamera0.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/dpcamera1.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/dpcamera10.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/dpcamera11.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/dpcamera12.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/dpcamera13.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/dpcamera14.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/dpcamera15.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/dpcamera2.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/dpcamera3.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/dpcamera4.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/dpcamera5.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/dpcamera6.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/dpcamera7.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/dpcamera8.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/dpcamera9.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/ptcamera0.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/ptcamera1.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/ptcamera10.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/ptcamera11.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/ptcamera12.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/ptcamera13.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/ptcamera14.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/ptcamera15.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/ptcamera2.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/ptcamera3.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/ptcamera4.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/ptcamera5.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/ptcamera6.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/ptcamera7.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/ptcamera8.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/DPPt/ptcamera9.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/HGSS/hgsscamera00.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/HGSS/hgsscamera01.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/HGSS/hgsscamera02.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/HGSS/hgsscamera03.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/HGSS/hgsscamera04.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/HGSS/hgsscamera05.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/HGSS/hgsscamera06.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/HGSS/hgsscamera07.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/HGSS/hgsscamera08.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/HGSS/hgsscamera09.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/HGSS/hgsscamera10.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/HGSS/hgsscamera11.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/HGSS/hgsscamera12.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/HGSS/hgsscamera13.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/HGSS/hgsscamera14.png (100%) rename DS_Map/{ => Resources}/Graphics/Camera Angles/HGSS/hgsscamera15.png (100%) rename DS_Map/{ => Resources}/Graphics/Event Icons/blue_sign.png (100%) rename DS_Map/{ => Resources}/Graphics/Event Icons/brown_sign.png (100%) rename DS_Map/{ => Resources}/Graphics/Event Icons/dawn_platinum.png (100%) rename DS_Map/{ => Resources}/Graphics/Event Icons/dppt_suitcase.png (100%) rename DS_Map/{ => Resources}/Graphics/Event Icons/gray_sign.png (100%) rename DS_Map/{ => Resources}/Graphics/Event Icons/overworld.png (100%) rename DS_Map/{ => Resources}/Graphics/Event Icons/red_sign.png (100%) rename DS_Map/{ => Resources}/Graphics/Event Icons/route_sign.png (100%) rename DS_Map/{ => Resources}/Graphics/Event Icons/sign.png (100%) rename DS_Map/{ => Resources}/Graphics/Event Icons/trigger.png (100%) rename DS_Map/{ => Resources}/Graphics/Event Icons/warp.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/LeftClick.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/RightClick.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/SurfIcon.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/WheelClick.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/addIcon.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/arrowdown.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/arrowleft.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/arrowright.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/arrowup.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/building_editor.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/checkmark.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/clearflag.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/closemsg.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/copyIcon.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/copyIcon_small.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/deleteIcon.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/dualslot_encounters.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/egg.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/event_editor.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/exploreKit.Image.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/exportArrow.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/give_badge.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/give_pokedex.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/give_pokegear.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/give_shoes.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/giveitem.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/givemom.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/goToOW.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/goToSpawnable.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/goToTrigger.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/goToWarp.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/good_rod_encounters.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/importArrow.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/legendary_battle.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/loadColorTable.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/map_editor.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/map_header.ico (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/matrix_editor.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/message.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/money.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/old_rod_encounters.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/open_file.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/pasteIcon.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/pokéradar_encounters.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/radio_encounters.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/resetColorTable.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/rock_smash_encounters.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/save_rom.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/script_editor.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/setflag.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/super_rod_encounters.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/takeitem.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/takemom.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/takemoney.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/text_editor.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/texture_background.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/tileset_editor.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/trainer_battle.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/unpackAllIcon.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/unpackBuildingNarcsIcon.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/walking_encounters_dppt.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/walking_encounters_hgss.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/warpGo.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/wideLensImage.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/wideLensImageTransp.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/wild_battle.png (100%) rename DS_Map/{ => Resources}/Graphics/Program Icons/wild_editor.png (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/dpblizzard.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/dpcloudy.png (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/dpdark.png (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/dpdiamondsnow.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/dpfog.png (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/dphail.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/dpheavyrain.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/dplightning.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/dplightsandstorm.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/dpnormal.png (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/dprain.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/dprocksascending.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/dpsandfall.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/dpsandstorm.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/dpsnowslow.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/dpthunderstorm.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/ptblizzard.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/ptcloudy.png (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/ptdark.png (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/ptdiamondsnow.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/ptfog.png (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/ptforestweather.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/pthail.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/ptheavyrain.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/ptlightning.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/ptlightsandstorm.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/ptnormal.png (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/ptrain.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/ptrocksascending.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/ptsandfall.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/ptsandstorm.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/ptsnowslow.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/ptspotlight.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/DPPt/ptthunderstorm.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/HGSS/hgssArcade.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/HGSS/hgssdark.png (100%) rename DS_Map/{ => Resources}/Graphics/Weather/HGSS/hgssdark2.png (100%) rename DS_Map/{ => Resources}/Graphics/Weather/HGSS/hgssdiamond.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/HGSS/hgssfog.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/HGSS/hgssfog.png (100%) rename DS_Map/{ => Resources}/Graphics/Weather/HGSS/hgsshail.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/HGSS/hgssnormal.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/HGSS/hgssrain.gif (100%) rename DS_Map/{ => Resources}/Graphics/Weather/HGSS/hgsssnow.gif (100%) rename DS_Map/{ => Resources}/Graphics/app.ico (100%) rename DS_Map/{ => Resources}/Graphics/app.png (100%) diff --git a/DS_Map/DS Map.csproj b/DS_Map/DS Map.csproj index 475d728..d9e4e61 100644 --- a/DS_Map/DS Map.csproj +++ b/DS_Map/DS Map.csproj @@ -93,7 +93,7 @@ - + Form @@ -148,7 +148,7 @@ CameraView.cs - + Form @@ -173,19 +173,19 @@ GivePokémonDialog.cs - + Form InsertValueDialog.cs - - + + - - - + + + Component @@ -249,7 +249,7 @@ Main Window.cs - + @@ -316,7 +316,6 @@ WildEditorDPPt.cs - SettingsSingleFileGenerator Settings.Designer.cs @@ -337,142 +336,142 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always diff --git a/DS_Map/HeaderSearch.cs b/DS_Map/HeaderSearch.cs index ab341d5..9cf7dbe 100644 --- a/DS_Map/HeaderSearch.cs +++ b/DS_Map/HeaderSearch.cs @@ -1,4 +1,5 @@ -using System; +using DSPRE.ROMFiles; +using System; using System.Collections.Generic; using System.Windows.Forms; @@ -91,19 +92,19 @@ namespace DSPRE { for (short i = startID; i < finalID; i++) { if (oper.Equals("Is Exactly")) { if (intNames[i].Equals(valToSearch)) { - result.Add(i.ToString("D3") + Header.nameSeparator + intNames[i]); + result.Add(i.ToString("D3") + MapHeader.nameSeparator + intNames[i]); } } else if (oper.Equals("Is Not")) { if (!intNames[i].Equals(valToSearch)) { - result.Add(i.ToString("D3") + Header.nameSeparator + intNames[i]); + result.Add(i.ToString("D3") + MapHeader.nameSeparator + intNames[i]); } } else if (oper.Equals("Contains")) { if (intNames[i].IndexOf(valToSearch, StringComparison.InvariantCultureIgnoreCase) >= 0) { - result.Add(i.ToString("D3") + Header.nameSeparator + intNames[i]); + result.Add(i.ToString("D3") + MapHeader.nameSeparator + intNames[i]); } } else if (oper.Equals("Does not contain")) { if (intNames[i].IndexOf(valToSearch, StringComparison.InvariantCultureIgnoreCase) < 0) { - result.Add(i.ToString("D3") + Header.nameSeparator + intNames[i]); + result.Add(i.ToString("D3") + MapHeader.nameSeparator + intNames[i]); } } } @@ -130,32 +131,32 @@ namespace DSPRE { } for (short i = startID; i < finalID; i++) { - var headerFieldEntry = typeof(Header).GetProperty(property).GetValue(Header.LoadFromARM9(i), null); + var headerFieldEntry = typeof(MapHeader).GetProperty(property).GetValue(MapHeader.LoadFromARM9(i), null); int headerField = int.Parse(headerFieldEntry.ToString()); if (oper.Equals("Is Less than")) { if (headerField < numToSearch) { - result.Add(i.ToString("D3") + Header.nameSeparator + intNames[i]); + result.Add(i.ToString("D3") + MapHeader.nameSeparator + intNames[i]); } } else if (oper.Equals("Equals")) { if (headerField == numToSearch) { - result.Add(i.ToString("D3") + Header.nameSeparator + intNames[i]); + result.Add(i.ToString("D3") + MapHeader.nameSeparator + intNames[i]); } } else if (oper.Equals("Is Greater")) { if (headerField > numToSearch) { - result.Add(i.ToString("D3") + Header.nameSeparator + intNames[i]); + result.Add(i.ToString("D3") + MapHeader.nameSeparator + intNames[i]); } } else if (oper.StartsWith("Is Less than or Equal")) { if (headerField <= numToSearch) { - result.Add(i.ToString("D3") + Header.nameSeparator + intNames[i]); + result.Add(i.ToString("D3") + MapHeader.nameSeparator + intNames[i]); } } else if (oper.StartsWith("Is Greater than or Equal")) { if (headerField >= numToSearch) { - result.Add(i.ToString("D3") + Header.nameSeparator + intNames[i]); + result.Add(i.ToString("D3") + MapHeader.nameSeparator + intNames[i]); } } else if (oper.StartsWith("Is Different")) { if (headerField != numToSearch) { - result.Add(i.ToString("D3") + Header.nameSeparator + intNames[i]); + result.Add(i.ToString("D3") + MapHeader.nameSeparator + intNames[i]); } } } @@ -215,7 +216,7 @@ namespace DSPRE { for (int i = 0; i < intNames.Count; i++) { string name = intNames[i]; - headerListBox.Items.Add(i.ToString("D3") + Header.nameSeparator + name); + headerListBox.Items.Add(i.ToString("D3") + MapHeader.nameSeparator + name); } } } diff --git a/DS_Map/Main Window.cs b/DS_Map/Main Window.cs index 67db5e1..4123e05 100644 --- a/DS_Map/Main Window.cs +++ b/DS_Map/Main Window.cs @@ -1,20 +1,23 @@ using System; +using System.Collections; using System.Collections.Generic; +using System.Diagnostics; using System.Drawing; using System.Drawing.Drawing2D; +using System.IO; using System.Linq; using System.Text; using System.Windows.Forms; -using System.IO; -using System.Diagnostics; using System.Resources; using System.Reflection; + using NarcAPI; using Tao.OpenGl; using LibNDSFormats.NSBMD; using LibNDSFormats.NSBTX; -using System.Collections; using DSPRE.Resources; +using DSPRE.ROMFiles; +using Matrix = DSPRE.ROMFiles.Matrix; namespace DSPRE { public partial class MainProgram : Form { @@ -364,7 +367,7 @@ namespace DSPRE { byte[] row = reader.ReadBytes(RomInfo.internalNameLength); string internalName = Encoding.ASCII.GetString(row);//.TrimEnd(); - headerListBox.Items.Add(i.ToString("D3") + Header.nameSeparator + internalName); + headerListBox.Items.Add(i.ToString("D3") + MapHeader.nameSeparator + internalName); internalNames.Add(internalName.TrimEnd('\0')); } } @@ -481,7 +484,7 @@ namespace DSPRE { break; }; string nsbmdName = Encoding.UTF8.GetString(reader.ReadBytes(16)); - selectMapComboBox.Items.Add(i.ToString("D3") + Header.nameSeparator + nsbmdName); + selectMapComboBox.Items.Add(i.ToString("D3") + MapHeader.nameSeparator + nsbmdName); } } @@ -1036,7 +1039,7 @@ namespace DSPRE { #region Header Editor #region Variables - public Header currentHeader; + public MapHeader currentHeader; public List internalNames; #endregion private void areaDataUpDown_ValueChanged(object sender, EventArgs e) { @@ -1144,7 +1147,7 @@ namespace DSPRE { /* Obtain current header ID from listbox*/ short headerNumber = Int16.Parse(headerListBox.SelectedItem.ToString().Substring(0, internalNames.Count.ToString().Length)); - currentHeader = Header.LoadFromARM9(headerNumber); + currentHeader = MapHeader.LoadFromARM9(headerNumber); refreshHeaderEditorFields(); } @@ -1478,7 +1481,7 @@ namespace DSPRE { mainTabControl.SelectedTab = textEditorTabPage; } private void saveHeaderButton_Click(object sender, EventArgs e) { - uint headerOffset = (uint)(PokeDatabase.System.headerOffsetsDict[RomInfo.romID] + Header.length * currentHeader.ID); + uint headerOffset = (uint)(PokeDatabase.System.headerOffsetsDict[RomInfo.romID] + MapHeader.length * currentHeader.ID); DSUtils.WriteToArm9(headerOffset, currentHeader.toByteArray()); disableHandlers = true; @@ -1502,7 +1505,7 @@ namespace DSPRE { private void updateHeaderNameShown(int thisIndex, int headerNumber, string text) { disableHandlers = true; - headerListBox.Items[thisIndex] = headerNumber.ToString("D3") + Header.nameSeparator + text; + headerListBox.Items[thisIndex] = headerNumber.ToString("D3") + MapHeader.nameSeparator + text; disableHandlers = false; } @@ -1529,18 +1532,18 @@ namespace DSPRE { case "D": case "P": for (short i = 0; i < internalNames.Count; i++) { - String locationName = locationNameComboBox.Items[((HeaderDP)Header.LoadFromARM9(i)).locationName].ToString(); + String locationName = locationNameComboBox.Items[((HeaderDP)MapHeader.LoadFromARM9(i)).locationName].ToString(); if (locationName.IndexOf(searchLocationTextBox.Text, StringComparison.InvariantCultureIgnoreCase) >= 0) { - headerListBox.Items.Add(i.ToString("D3") + Header.nameSeparator + internalNames[i]); + headerListBox.Items.Add(i.ToString("D3") + MapHeader.nameSeparator + internalNames[i]); noResult = false; } } break; case "Plat": for (short i = 0; i < internalNames.Count; i++) { - String locationName = locationNameComboBox.Items[((HeaderPt)Header.LoadFromARM9(i)).locationName].ToString(); + String locationName = locationNameComboBox.Items[((HeaderPt)MapHeader.LoadFromARM9(i)).locationName].ToString(); if (locationName.IndexOf(searchLocationTextBox.Text, StringComparison.InvariantCultureIgnoreCase) >= 0) { - headerListBox.Items.Add(i.ToString("D3") + Header.nameSeparator + internalNames[i]); + headerListBox.Items.Add(i.ToString("D3") + MapHeader.nameSeparator + internalNames[i]); noResult = false; } } @@ -1548,9 +1551,9 @@ namespace DSPRE { case "HG": case "SS": for (short i = 0; i < internalNames.Count; i++) { - String locationName = locationNameComboBox.Items[((HeaderHGSS)Header.LoadFromARM9(i)).locationName].ToString(); + String locationName = locationNameComboBox.Items[((HeaderHGSS)MapHeader.LoadFromARM9(i)).locationName].ToString(); if (locationName.IndexOf(searchLocationTextBox.Text, StringComparison.InvariantCultureIgnoreCase) >= 0) { - headerListBox.Items.Add(i.ToString("D3") + Header.nameSeparator + internalNames[i]); + headerListBox.Items.Add(i.ToString("D3") + MapHeader.nameSeparator + internalNames[i]); noResult = false; } } @@ -1628,12 +1631,12 @@ namespace DSPRE { if (of.ShowDialog(this) != DialogResult.OK) return; - Header h = null; + MapHeader h = null; try { if (new FileInfo(of.FileName).Length > 48) throw new FileFormatException(); - h = Header.BuildFromFile(of.FileName, currentHeader.ID, 0); + h = MapHeader.BuildFromFile(of.FileName, currentHeader.ID, 0); if (h.ID == -1) throw new FileFormatException(); @@ -1644,11 +1647,11 @@ namespace DSPRE { } currentHeader = h; - uint headerOffset = (uint)(PokeDatabase.System.headerOffsetsDict[RomInfo.romID] + Header.length * currentHeader.ID); + uint headerOffset = (uint)(PokeDatabase.System.headerOffsetsDict[RomInfo.romID] + MapHeader.length * currentHeader.ID); DSUtils.WriteToArm9(headerOffset, currentHeader.toByteArray()); try { using (BinaryReader reader = new BinaryReader(new FileStream(of.FileName, FileMode.Open))) { - reader.BaseStream.Position = Header.length + 8; + reader.BaseStream.Position = MapHeader.length + 8; internalNameBox.Text = Encoding.UTF8.GetString(reader.ReadBytes(RomInfo.internalNameLength)); updateCurrentInternalName(); } @@ -2237,7 +2240,7 @@ namespace DSPRE { } /* get texture file numbers from area data */ - areaData = LoadAreaData(Header.LoadFromARM9(header).areaDataID); + areaData = LoadAreaData(MapHeader.LoadFromARM9(header).areaDataID); /* Load Map File and switch to Map Editor tab */ disableHandlers = true; @@ -2495,7 +2498,7 @@ namespace DSPRE { string[] bldList = GetBuildingsList(interiorbldRadioButton.Checked); for (int i = 0; i < currentMapFile.buildings.Count; i++) // Add entry into buildings ListBox - buildingsListBox.Items.Add((i+1).ToString("D2") + Header.nameSeparator + buildIndexComboBox.Items[(int)currentMapFile.buildings[i].modelID]); + buildingsListBox.Items.Add((i+1).ToString("D2") + MapHeader.nameSeparator + buildIndexComboBox.Items[(int)currentMapFile.buildings[i].modelID]); } private Building LoadBuildingModel(Building building, bool interior) { string modelPath = romInfo.GetBuildingModelsDirPath(interior) + "\\" + building.modelID.ToString("D4"); @@ -2607,7 +2610,7 @@ namespace DSPRE { using (BinaryWriter writer = new BinaryWriter(new FileStream(mapFilePath, FileMode.Create))) writer.Write(LoadMapFile(0).ToByteArray()); /* Update ComboBox and select new file */ - selectMapComboBox.Items.Add(selectMapComboBox.Items.Count.ToString("D3") + Header.nameSeparator + "newmap"); + selectMapComboBox.Items.Add(selectMapComboBox.Items.Count.ToString("D3") + MapHeader.nameSeparator + "newmap"); selectMapComboBox.SelectedIndex = selectMapComboBox.Items.Count - 1; } private void replaceMapBinButton_Click(object sender, EventArgs e) { @@ -2890,7 +2893,7 @@ namespace DSPRE { currentMapFile.buildings[currentMapFile.buildings.Count - 1].NSBMDFile = LoadModelTextures(b.NSBMDFile, romInfo.buildingTexturesDirPath, buildTextureComboBox.SelectedIndex - 1); /* Add new entry to buildings ListBox */ - buildingsListBox.Items.Add((buildingsListBox.Items.Count + 1).ToString("D2") + Header.nameSeparator + + buildingsListBox.Items.Add((buildingsListBox.Items.Count + 1).ToString("D2") + MapHeader.nameSeparator + buildIndexComboBox.Items[(int)b.modelID]); buildingsListBox.SelectedIndex = buildingsListBox.Items.Count - 1; @@ -2902,7 +2905,7 @@ namespace DSPRE { return; disableHandlers = true; - buildingsListBox.Items[buildingsListBox.SelectedIndex] = (buildingsListBox.SelectedIndex + 1).ToString("D2") + Header.nameSeparator + buildIndexComboBox.SelectedItem; + buildingsListBox.Items[buildingsListBox.SelectedIndex] = (buildingsListBox.SelectedIndex + 1).ToString("D2") + MapHeader.nameSeparator + buildIndexComboBox.SelectedItem; disableHandlers = false; currentMapFile.buildings[buildingsListBox.SelectedIndex].modelID = (uint)buildIndexComboBox.SelectedIndex; @@ -3796,7 +3799,7 @@ namespace DSPRE { uint areaDataID; if (eventMatrix.hasHeadersSection) { short header = (short)eventMatrix.headers[(short)eventMatrixYUpDown.Value, (short)eventMatrixXUpDown.Value]; - areaDataID = Header.LoadFromARM9(header).areaDataID; + areaDataID = MapHeader.LoadFromARM9(header).areaDataID; } else areaDataID = (uint)eventAreaDataUpDown.Value; /* get texture file numbers from area data */ @@ -4837,7 +4840,7 @@ namespace DSPRE { private void goToWarpDestination_Click(object sender, EventArgs e) { int destAnchor = (int)warpAnchorUpDown.Value; short destHeader = (short)warpHeaderUpDown.Value; - ushort destEventID = Header.LoadFromARM9(destHeader).eventFileID; + ushort destEventID = MapHeader.LoadFromARM9(destHeader).eventFileID; EventFile destEvent = new EventFile(destEventID); if (destEvent.warps.Count < destAnchor + 1) { @@ -4846,15 +4849,15 @@ namespace DSPRE { if (d == DialogResult.No) return; else { - eventMatrixUpDown.Value = Header.LoadFromARM9((short)warpHeaderUpDown.Value).matrixID; - eventAreaDataUpDown.Value = Header.LoadFromARM9((short)warpHeaderUpDown.Value).areaDataID; + eventMatrixUpDown.Value = MapHeader.LoadFromARM9((short)warpHeaderUpDown.Value).matrixID; + eventAreaDataUpDown.Value = MapHeader.LoadFromARM9((short)warpHeaderUpDown.Value).areaDataID; selectEventComboBox.SelectedIndex = destEventID; centerEventviewOnEntities(); return; } } - eventMatrixUpDown.Value = Header.LoadFromARM9((short)warpHeaderUpDown.Value).matrixID; - eventAreaDataUpDown.Value = Header.LoadFromARM9((short)warpHeaderUpDown.Value).areaDataID; + eventMatrixUpDown.Value = MapHeader.LoadFromARM9((short)warpHeaderUpDown.Value).matrixID; + eventAreaDataUpDown.Value = MapHeader.LoadFromARM9((short)warpHeaderUpDown.Value).areaDataID; selectEventComboBox.SelectedIndex = destEventID; warpsListBox.SelectedIndex = destAnchor; centerEventViewOnSelectedEvent_Click(sender, e); diff --git a/DS_Map/Properties/DataSources/PokeDatabase.ScriptEditor.datasource b/DS_Map/Properties/DataSources/PokeDatabase.ScriptEditor.datasource deleted file mode 100644 index d651508..0000000 --- a/DS_Map/Properties/DataSources/PokeDatabase.ScriptEditor.datasource +++ /dev/null @@ -1,10 +0,0 @@ - - - - DSPRE.PokeDatabase+ScriptEditor, DSPRE, Version=1.1.2.0, Culture=neutral, PublicKeyToken=null - \ No newline at end of file diff --git a/DS_Map/Properties/Resources.Designer.cs b/DS_Map/Properties/Resources.Designer.cs index c40e096..c985f91 100644 --- a/DS_Map/Properties/Resources.Designer.cs +++ b/DS_Map/Properties/Resources.Designer.cs @@ -301,7 +301,7 @@ namespace DSPRE.Properties { } /// - /// Cerca una stringa localizzata simile a dp. + /// Cerca una stringa localizzata simile a D. /// internal static string Diamond { get { @@ -709,6 +709,15 @@ namespace DSPRE.Properties { } } + /// + /// Cerca una stringa localizzata simile a HG. + /// + internal static string HeartGold { + get { + return ResourceManager.GetString("HeartGold", resourceCulture); + } + } + /// /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// @@ -1120,7 +1129,7 @@ namespace DSPRE.Properties { } /// - /// Cerca una stringa localizzata simile a dp. + /// Cerca una stringa localizzata simile a P. /// internal static string Pearl { get { @@ -1537,6 +1546,15 @@ namespace DSPRE.Properties { } } + /// + /// Cerca una stringa localizzata simile a SS. + /// + internal static string SoulSilver { + get { + return ResourceManager.GetString("SoulSilver", resourceCulture); + } + } + /// /// Cerca una risorsa localizzata di tipo System.Drawing.Bitmap. /// diff --git a/DS_Map/Properties/Resources.resx b/DS_Map/Properties/Resources.resx index 0f73a79..13f5d47 100644 --- a/DS_Map/Properties/Resources.resx +++ b/DS_Map/Properties/Resources.resx @@ -119,474 +119,480 @@ - ..\Graphics\Camera Angles\DPPt\dpcamera8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\dpcamera13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\ptcamera13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\ptrain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptrain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\weather\hgss\hgsssnow.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\weather\hgss\hgsssnow.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\addIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\addIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\camera angles\hgss\hgsscamera10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\unpackAllIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\unpackAllIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\weather\hgss\hgssrain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\weather\hgss\hgssrain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\dpcamera6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\camera angles\hgss\hgsscamera12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\ptcamera11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\camera angles\hgss\hgsscamera08.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera08.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\ptcamera4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\goToTrigger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\goToTrigger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\ptcamera14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\camera angles\hgss\hgsscamera13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera13.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\dplightsandstorm.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\dplightsandstorm.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\pthail.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\pthail.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\ptcamera12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\program icons\resetcolortable.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\program icons\resetcolortable.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\camera angles\hgss\hgsscamera06.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera06.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\LeftClick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\LeftClick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\ptcamera6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\SurfIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\SurfIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\dpcamera14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\dpsnowslow.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\dpsnowslow.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\ptcloudy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptcloudy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\dpcamera12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Area Icons\areaicon08.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\areaicon08.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\arrowdown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\arrowdown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\ptcamera2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\weather\hgss\hgssfog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\weather\hgss\hgssfog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\ptcamera0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\dpcamera5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\camera angles\hgss\hgsscamera04.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera04.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\goToWarp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\goToWarp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\dpcamera0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\weather\hgss\hgssnormal.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\weather\hgss\hgssnormal.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\ptthunderstorm.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptthunderstorm.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Event Icons\warp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Event Icons\warp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Area Icons\hgsswood.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\hgsswood.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\dpcamera7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\ptblizzard.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptblizzard.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Area Icons\hgsswall.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\hgsswall.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\ptsandfall.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptsandfall.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\ptcamera10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\arrowleft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\arrowleft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\save_rom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\save_rom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\dpcamera15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Area Icons\areaicon01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\areaicon01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\dpcamera10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera10.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\ptcamera15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Area Icons\hgssfield.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\hgssfield.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\ptcamera3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\dpcamera9.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera9.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Area Icons\hgsswater.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\hgsswater.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\camera angles\hgss\hgsscamera05.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera05.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\ptcamera9.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera9.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - dp + D - ..\Graphics\Area Icons\areaicon03.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\areaicon03.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\camera angles\hgss\hgsscamera00.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera00.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\open_file.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\open_file.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\HGSS\hgssdark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\HGSS\hgssdark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Area Icons\areaicon09.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\areaicon09.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\ptcamera7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Event Icons\dawn_platinum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Event Icons\dawn_platinum.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\wideLensImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\wideLensImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\HGSS\hgssdark2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\HGSS\hgssdark2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\dprocksascending.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\dprocksascending.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\dpcamera1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\RightClick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\RightClick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Area Icons\hgssforest.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\hgssforest.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\app.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\program icons\loadcolortable.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\program icons\loadcolortable.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\dpcamera2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Area Icons\hgsscave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\hgsscave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Event Icons\route_sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Event Icons\route_sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\weather\hgss\hgssrain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\weather\hgss\hgssrain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\wideLensImageTransp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\wideLensImageTransp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\program icons\exportarrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\program icons\exportarrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\dpsandfall.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\dpsandfall.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\goToOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\goToOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Area Icons\areaicon02.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\areaicon02.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\ptfog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptfog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\ptnormal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptnormal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\dpfog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\dpfog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\program icons\importarrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\program icons\importarrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\camera angles\hgss\hgsscamera07.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera07.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\ptcamera8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\camera angles\hgss\hgsscamera01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Area Icons\hgssgray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\hgssgray.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\copyIcon_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\copyIcon_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\dplightning.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\dplightning.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\ptdark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptdark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\dprain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\dprain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\program icons\pasteicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\program icons\pasteicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\camera angles\hgss\hgsscamera03.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera03.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\ptlightning.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptlightning.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\dpcloudy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\dpcloudy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Area Icons\areaicon04.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\areaicon04.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\ptsandstorm.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptsandstorm.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\dpcamera3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - dp + P - ..\Graphics\Event Icons\brown_sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Event Icons\brown_sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Event Icons\sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Event Icons\sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Area Icons\hgsstown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\hgsstown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\ptforestweather.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptforestweather.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\arrowright.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\arrowright.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\dpcamera4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Event Icons\overworld.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Event Icons\overworld.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Event Icons\red_sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Event Icons\red_sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\map_editor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\map_editor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\ptlightsandstorm.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptlightsandstorm.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\camera angles\hgss\hgsscamera11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\camera angles\hgss\hgsscamera15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera15.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\ptrocksascending.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptrocksascending.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\dpthunderstorm.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\dpthunderstorm.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Event Icons\gray_sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Event Icons\gray_sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Area Icons\dp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\dp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\dpdiamondsnow.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\dpdiamondsnow.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\ptheavyrain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptheavyrain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Tools\ndstool.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Graphics\Event Icons\blue_sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Event Icons\blue_sign.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\arrowup.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\weather\hgss\hgssarcade.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\weather\hgss\hgssarcade.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\dpsandstorm.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\dpsandstorm.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Area Icons\areaicon06.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\areaicon06.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\dpnormal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\dpnormal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Tools\blz.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\Graphics\Area Icons\areaicon05.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\areaicon05.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Plat - ..\Graphics\Weather\DPPt\ptspotlight.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptspotlight.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Area Icons\areaicon00.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\areaicon00.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\dpheavyrain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\dpheavyrain.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Event Icons\dppt_suitcase.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Event Icons\dppt_suitcase.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\ptsnowslow.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptsnowslow.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\goToSpawnable.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\goToSpawnable.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\program icons\copyicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\program icons\copyicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\camera angles\hgss\hgsscamera09.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera09.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\unpackBuildingNarcsIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\unpackBuildingNarcsIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\ptcamera5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Area Icons\areaicon07.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Area Icons\areaicon07.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\dpblizzard.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\dpblizzard.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\dpcamera11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\dpcamera11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\dphail.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\dphail.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\warpGo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\warpGo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Camera Angles\DPPt\ptcamera1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Camera Angles\DPPt\ptcamera1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\camera angles\hgss\hgsscamera14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera14.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\camera angles\hgss\hgsscamera02.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\camera angles\hgss\hgsscamera02.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\graphics\weather\hgss\hgssdiamond.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\weather\hgss\hgssdiamond.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\dpdark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\dpdark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\deleteIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\deleteIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Weather\DPPt\ptdiamondsnow.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Weather\DPPt\ptdiamondsnow.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Event Icons\trigger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Event Icons\trigger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\WheelClick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\WheelClick.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Graphics\Program Icons\checkmark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Graphics\Program Icons\checkmark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + HG + + + SS \ No newline at end of file diff --git a/DS_Map/AreaData.cs b/DS_Map/ROMFiles/AreaData.cs similarity index 98% rename from DS_Map/AreaData.cs rename to DS_Map/ROMFiles/AreaData.cs index ffff9fc..8b909ee 100644 --- a/DS_Map/AreaData.cs +++ b/DS_Map/ROMFiles/AreaData.cs @@ -1,6 +1,5 @@ using System.IO; -namespace DSPRE -{ +namespace DSPRE.ROMFiles { /// /// Class to store area data in Pokémon NDS games /// diff --git a/DS_Map/EncounterFile.cs b/DS_Map/ROMFiles/EncounterFile.cs similarity index 99% rename from DS_Map/EncounterFile.cs rename to DS_Map/ROMFiles/EncounterFile.cs index d0072ca..a0f48cf 100644 --- a/DS_Map/EncounterFile.cs +++ b/DS_Map/ROMFiles/EncounterFile.cs @@ -1,8 +1,7 @@ using System.IO; using System.Windows.Forms; -namespace DSPRE -{ +namespace DSPRE.ROMFiles { /* ---------------------- WILD POKéMON DATA STRUCTURE (DPPt):---------------------------- 0x0 // byte: Walking encounter rate diff --git a/DS_Map/EventFile.cs b/DS_Map/ROMFiles/EventFile.cs similarity index 99% rename from DS_Map/EventFile.cs rename to DS_Map/ROMFiles/EventFile.cs index 4ae054b..b3d4cf5 100644 --- a/DS_Map/EventFile.cs +++ b/DS_Map/ROMFiles/EventFile.cs @@ -1,11 +1,8 @@ -using DSPRE; -using System; using System.Collections.Generic; using System.IO; using System.Windows.Forms; -namespace LibNDSFormats.NSBMD -{ +namespace DSPRE.ROMFiles { /// /// Classes to store event data in Pokémon NDS games /// diff --git a/DS_Map/MapFile.cs b/DS_Map/ROMFiles/MapFile.cs similarity index 99% rename from DS_Map/MapFile.cs rename to DS_Map/ROMFiles/MapFile.cs index aa91b9a..e20c8f0 100644 --- a/DS_Map/MapFile.cs +++ b/DS_Map/ROMFiles/MapFile.cs @@ -1,11 +1,9 @@ using System.IO; using System.Collections.Generic; using LibNDSFormats.NSBMD; -using System; using System.Windows.Forms; -namespace DSPRE -{ +namespace DSPRE.ROMFiles { /* ----------------------- MAP FILE DATA STRUCTURE (DPPtHGSS):-------------------------- 0x0 // uint: Length of permissions section (always 2048) diff --git a/DS_Map/Header.cs b/DS_Map/ROMFiles/MapHeader.cs similarity index 97% rename from DS_Map/Header.cs rename to DS_Map/ROMFiles/MapHeader.cs index 2fd456e..25cdd2f 100644 --- a/DS_Map/Header.cs +++ b/DS_Map/ROMFiles/MapHeader.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; using System.IO; using System.Windows.Forms; -namespace DSPRE -{ +namespace DSPRE.ROMFiles { /* ---------------------- HEADER DATA STRUCTURE (DPPt):---------------------------- 0x0 // byte: Area data value @@ -84,7 +81,7 @@ namespace DSPRE /// /// General class to store common map header data across all Gen IV Pokémon NDS games /// - public abstract class Header { + public abstract class MapHeader { /*System*/ public short ID { get; set; } public static readonly byte length = 24; @@ -111,12 +108,12 @@ namespace DSPRE #region Methods (1) public abstract byte[] toByteArray(); - public static Header BuildFromFile(string filename, short headerNumber, long offsetInFile) { + public static MapHeader BuildFromFile(string filename, short headerNumber, long offsetInFile) { /* Calculate header offset and load data */ - byte[] headerData = DSUtils.ReadFromFile(filename, offsetInFile, Header.length); + byte[] headerData = DSUtils.ReadFromFile(filename, offsetInFile, MapHeader.length); /* Encapsulate header data into the class appropriate for the gameVersion */ - if (headerData.Length < Header.length) + if (headerData.Length < MapHeader.length) return null; switch (RomInfo.gameVersion) { @@ -129,8 +126,8 @@ namespace DSPRE return new HeaderHGSS(headerNumber, new MemoryStream(headerData)); } } - public static Header LoadFromARM9(short headerNumber) { - long headerOffset = Resources.PokeDatabase.System.headerOffsetsDict[RomInfo.romID] + Header.length * headerNumber; + public static MapHeader LoadFromARM9(short headerNumber) { + long headerOffset = Resources.PokeDatabase.System.headerOffsetsDict[RomInfo.romID] + MapHeader.length * headerNumber; return BuildFromFile(RomInfo.arm9Path, headerNumber, headerOffset); } #endregion @@ -139,7 +136,7 @@ namespace DSPRE /// /// Class to store map header data from Pokémon D and P /// - public class HeaderDP: Header + public class HeaderDP: MapHeader { #region Fields (5) public byte unknown1 { get; set; } @@ -233,7 +230,7 @@ namespace DSPRE /// /// Class to store map header data from Pokémon Plat /// - public class HeaderPt : Header + public class HeaderPt : MapHeader { #region Fields (5) public byte areaIcon { get; set; } @@ -307,7 +304,7 @@ namespace DSPRE /// /// Class to store map header data from Pokémon HG and SS /// - public class HeaderHGSS : Header + public class HeaderHGSS : MapHeader { #region Fields (7) public byte areaIcon { get; set; } diff --git a/DS_Map/Matrix.cs b/DS_Map/ROMFiles/Matrix.cs similarity index 99% rename from DS_Map/Matrix.cs rename to DS_Map/ROMFiles/Matrix.cs index ec63c0b..1787ef9 100644 --- a/DS_Map/Matrix.cs +++ b/DS_Map/ROMFiles/Matrix.cs @@ -3,8 +3,7 @@ using System.IO; using System.Text; using System.Windows.Forms; -namespace DSPRE -{ +namespace DSPRE.ROMFiles { /* ---------------------- MATRIX DATA STRUCTURE (DPPtHGSS):----------------------------- 0x0 // byte: Matrix width (a.k.a row length) (x) diff --git a/DS_Map/ScriptCommand.cs b/DS_Map/ROMFiles/ScriptCommand.cs similarity index 99% rename from DS_Map/ScriptCommand.cs rename to DS_Map/ROMFiles/ScriptCommand.cs index 5cc4577..4420b1e 100644 --- a/DS_Map/ScriptCommand.cs +++ b/DS_Map/ROMFiles/ScriptCommand.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -namespace DSPRE { +namespace DSPRE.ROMFiles { public class Script { public List commands; public int useScript; diff --git a/DS_Map/ScriptFile.cs b/DS_Map/ROMFiles/ScriptFile.cs similarity index 99% rename from DS_Map/ScriptFile.cs rename to DS_Map/ROMFiles/ScriptFile.cs index 31d85f8..e727361 100644 --- a/DS_Map/ScriptFile.cs +++ b/DS_Map/ROMFiles/ScriptFile.cs @@ -4,7 +4,7 @@ using System.IO; using System.Linq; using System.Windows.Forms; -namespace DSPRE { +namespace DSPRE.ROMFiles { /// /// Class to store script file data in Pokémon NDS games /// diff --git a/DS_Map/TextArchive.cs b/DS_Map/ROMFiles/TextArchive.cs similarity index 99% rename from DS_Map/TextArchive.cs rename to DS_Map/ROMFiles/TextArchive.cs index 91b78b8..d1ffd81 100644 --- a/DS_Map/TextArchive.cs +++ b/DS_Map/ROMFiles/TextArchive.cs @@ -7,8 +7,7 @@ using System.Reflection; using System.Windows.Forms; using DSPRE.Resources; -namespace DSPRE -{ +namespace DSPRE.ROMFiles { /// /// Class to store message data from DS Pokémon games /// diff --git a/DS_Map/ROMToolboxDialog.cs b/DS_Map/ROMToolboxDialog.cs index 93abdfb..5319280 100644 --- a/DS_Map/ROMToolboxDialog.cs +++ b/DS_Map/ROMToolboxDialog.cs @@ -4,6 +4,7 @@ using System.Reflection; using System.Resources; using System.Windows.Forms; using System.Linq; +using DSPRE.ROMFiles; namespace DSPRE { public partial class ROMToolboxDialog : Form { diff --git a/DS_Map/Graphics/ColorTable.txt b/DS_Map/Resources/ColorTable.txt similarity index 100% rename from DS_Map/Graphics/ColorTable.txt rename to DS_Map/Resources/ColorTable.txt diff --git a/DS_Map/Graphics/Area Icons/areaicon00.png b/DS_Map/Resources/Graphics/Area Icons/areaicon00.png similarity index 100% rename from DS_Map/Graphics/Area Icons/areaicon00.png rename to DS_Map/Resources/Graphics/Area Icons/areaicon00.png diff --git a/DS_Map/Graphics/Area Icons/areaicon01.png b/DS_Map/Resources/Graphics/Area Icons/areaicon01.png similarity index 100% rename from DS_Map/Graphics/Area Icons/areaicon01.png rename to DS_Map/Resources/Graphics/Area Icons/areaicon01.png diff --git a/DS_Map/Graphics/Area Icons/areaicon02.png b/DS_Map/Resources/Graphics/Area Icons/areaicon02.png similarity index 100% rename from DS_Map/Graphics/Area Icons/areaicon02.png rename to DS_Map/Resources/Graphics/Area Icons/areaicon02.png diff --git a/DS_Map/Graphics/Area Icons/areaicon03.png b/DS_Map/Resources/Graphics/Area Icons/areaicon03.png similarity index 100% rename from DS_Map/Graphics/Area Icons/areaicon03.png rename to DS_Map/Resources/Graphics/Area Icons/areaicon03.png diff --git a/DS_Map/Graphics/Area Icons/areaicon04.png b/DS_Map/Resources/Graphics/Area Icons/areaicon04.png similarity index 100% rename from DS_Map/Graphics/Area Icons/areaicon04.png rename to DS_Map/Resources/Graphics/Area Icons/areaicon04.png diff --git a/DS_Map/Graphics/Area Icons/areaicon05.png b/DS_Map/Resources/Graphics/Area Icons/areaicon05.png similarity index 100% rename from DS_Map/Graphics/Area Icons/areaicon05.png rename to DS_Map/Resources/Graphics/Area Icons/areaicon05.png diff --git a/DS_Map/Graphics/Area Icons/areaicon06.png b/DS_Map/Resources/Graphics/Area Icons/areaicon06.png similarity index 100% rename from DS_Map/Graphics/Area Icons/areaicon06.png rename to DS_Map/Resources/Graphics/Area Icons/areaicon06.png diff --git a/DS_Map/Graphics/Area Icons/areaicon07.png b/DS_Map/Resources/Graphics/Area Icons/areaicon07.png similarity index 100% rename from DS_Map/Graphics/Area Icons/areaicon07.png rename to DS_Map/Resources/Graphics/Area Icons/areaicon07.png diff --git a/DS_Map/Graphics/Area Icons/areaicon08.png b/DS_Map/Resources/Graphics/Area Icons/areaicon08.png similarity index 100% rename from DS_Map/Graphics/Area Icons/areaicon08.png rename to DS_Map/Resources/Graphics/Area Icons/areaicon08.png diff --git a/DS_Map/Graphics/Area Icons/areaicon09.png b/DS_Map/Resources/Graphics/Area Icons/areaicon09.png similarity index 100% rename from DS_Map/Graphics/Area Icons/areaicon09.png rename to DS_Map/Resources/Graphics/Area Icons/areaicon09.png diff --git a/DS_Map/Graphics/Area Icons/dp.png b/DS_Map/Resources/Graphics/Area Icons/dp.png similarity index 100% rename from DS_Map/Graphics/Area Icons/dp.png rename to DS_Map/Resources/Graphics/Area Icons/dp.png diff --git a/DS_Map/Graphics/Area Icons/hgsscave.png b/DS_Map/Resources/Graphics/Area Icons/hgsscave.png similarity index 100% rename from DS_Map/Graphics/Area Icons/hgsscave.png rename to DS_Map/Resources/Graphics/Area Icons/hgsscave.png diff --git a/DS_Map/Graphics/Area Icons/hgssfield.png b/DS_Map/Resources/Graphics/Area Icons/hgssfield.png similarity index 100% rename from DS_Map/Graphics/Area Icons/hgssfield.png rename to DS_Map/Resources/Graphics/Area Icons/hgssfield.png diff --git a/DS_Map/Graphics/Area Icons/hgssforest.png b/DS_Map/Resources/Graphics/Area Icons/hgssforest.png similarity index 100% rename from DS_Map/Graphics/Area Icons/hgssforest.png rename to DS_Map/Resources/Graphics/Area Icons/hgssforest.png diff --git a/DS_Map/Graphics/Area Icons/hgssgray.png b/DS_Map/Resources/Graphics/Area Icons/hgssgray.png similarity index 100% rename from DS_Map/Graphics/Area Icons/hgssgray.png rename to DS_Map/Resources/Graphics/Area Icons/hgssgray.png diff --git a/DS_Map/Graphics/Area Icons/hgsstown.png b/DS_Map/Resources/Graphics/Area Icons/hgsstown.png similarity index 100% rename from DS_Map/Graphics/Area Icons/hgsstown.png rename to DS_Map/Resources/Graphics/Area Icons/hgsstown.png diff --git a/DS_Map/Graphics/Area Icons/hgsswall.png b/DS_Map/Resources/Graphics/Area Icons/hgsswall.png similarity index 100% rename from DS_Map/Graphics/Area Icons/hgsswall.png rename to DS_Map/Resources/Graphics/Area Icons/hgsswall.png diff --git a/DS_Map/Graphics/Area Icons/hgsswater.png b/DS_Map/Resources/Graphics/Area Icons/hgsswater.png similarity index 100% rename from DS_Map/Graphics/Area Icons/hgsswater.png rename to DS_Map/Resources/Graphics/Area Icons/hgsswater.png diff --git a/DS_Map/Graphics/Area Icons/hgsswood.png b/DS_Map/Resources/Graphics/Area Icons/hgsswood.png similarity index 100% rename from DS_Map/Graphics/Area Icons/hgsswood.png rename to DS_Map/Resources/Graphics/Area Icons/hgsswood.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/dpcamera0.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera0.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/dpcamera0.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera0.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/dpcamera1.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera1.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/dpcamera1.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera1.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/dpcamera10.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera10.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/dpcamera10.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera10.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/dpcamera11.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera11.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/dpcamera11.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera11.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/dpcamera12.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera12.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/dpcamera12.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera12.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/dpcamera13.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera13.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/dpcamera13.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera13.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/dpcamera14.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera14.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/dpcamera14.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera14.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/dpcamera15.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera15.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/dpcamera15.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera15.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/dpcamera2.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera2.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/dpcamera2.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera2.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/dpcamera3.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera3.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/dpcamera3.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera3.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/dpcamera4.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera4.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/dpcamera4.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera4.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/dpcamera5.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera5.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/dpcamera5.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera5.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/dpcamera6.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera6.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/dpcamera6.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera6.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/dpcamera7.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera7.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/dpcamera7.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera7.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/dpcamera8.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera8.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/dpcamera8.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera8.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/dpcamera9.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera9.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/dpcamera9.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/dpcamera9.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/ptcamera0.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera0.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/ptcamera0.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera0.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/ptcamera1.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera1.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/ptcamera1.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera1.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/ptcamera10.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera10.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/ptcamera10.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera10.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/ptcamera11.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera11.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/ptcamera11.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera11.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/ptcamera12.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera12.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/ptcamera12.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera12.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/ptcamera13.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera13.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/ptcamera13.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera13.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/ptcamera14.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera14.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/ptcamera14.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera14.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/ptcamera15.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera15.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/ptcamera15.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera15.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/ptcamera2.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera2.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/ptcamera2.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera2.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/ptcamera3.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera3.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/ptcamera3.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera3.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/ptcamera4.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera4.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/ptcamera4.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera4.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/ptcamera5.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera5.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/ptcamera5.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera5.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/ptcamera6.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera6.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/ptcamera6.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera6.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/ptcamera7.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera7.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/ptcamera7.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera7.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/ptcamera8.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera8.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/ptcamera8.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera8.png diff --git a/DS_Map/Graphics/Camera Angles/DPPt/ptcamera9.png b/DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera9.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/DPPt/ptcamera9.png rename to DS_Map/Resources/Graphics/Camera Angles/DPPt/ptcamera9.png diff --git a/DS_Map/Graphics/Camera Angles/HGSS/hgsscamera00.png b/DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera00.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/HGSS/hgsscamera00.png rename to DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera00.png diff --git a/DS_Map/Graphics/Camera Angles/HGSS/hgsscamera01.png b/DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera01.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/HGSS/hgsscamera01.png rename to DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera01.png diff --git a/DS_Map/Graphics/Camera Angles/HGSS/hgsscamera02.png b/DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera02.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/HGSS/hgsscamera02.png rename to DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera02.png diff --git a/DS_Map/Graphics/Camera Angles/HGSS/hgsscamera03.png b/DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera03.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/HGSS/hgsscamera03.png rename to DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera03.png diff --git a/DS_Map/Graphics/Camera Angles/HGSS/hgsscamera04.png b/DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera04.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/HGSS/hgsscamera04.png rename to DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera04.png diff --git a/DS_Map/Graphics/Camera Angles/HGSS/hgsscamera05.png b/DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera05.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/HGSS/hgsscamera05.png rename to DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera05.png diff --git a/DS_Map/Graphics/Camera Angles/HGSS/hgsscamera06.png b/DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera06.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/HGSS/hgsscamera06.png rename to DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera06.png diff --git a/DS_Map/Graphics/Camera Angles/HGSS/hgsscamera07.png b/DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera07.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/HGSS/hgsscamera07.png rename to DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera07.png diff --git a/DS_Map/Graphics/Camera Angles/HGSS/hgsscamera08.png b/DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera08.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/HGSS/hgsscamera08.png rename to DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera08.png diff --git a/DS_Map/Graphics/Camera Angles/HGSS/hgsscamera09.png b/DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera09.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/HGSS/hgsscamera09.png rename to DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera09.png diff --git a/DS_Map/Graphics/Camera Angles/HGSS/hgsscamera10.png b/DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera10.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/HGSS/hgsscamera10.png rename to DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera10.png diff --git a/DS_Map/Graphics/Camera Angles/HGSS/hgsscamera11.png b/DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera11.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/HGSS/hgsscamera11.png rename to DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera11.png diff --git a/DS_Map/Graphics/Camera Angles/HGSS/hgsscamera12.png b/DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera12.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/HGSS/hgsscamera12.png rename to DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera12.png diff --git a/DS_Map/Graphics/Camera Angles/HGSS/hgsscamera13.png b/DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera13.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/HGSS/hgsscamera13.png rename to DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera13.png diff --git a/DS_Map/Graphics/Camera Angles/HGSS/hgsscamera14.png b/DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera14.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/HGSS/hgsscamera14.png rename to DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera14.png diff --git a/DS_Map/Graphics/Camera Angles/HGSS/hgsscamera15.png b/DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera15.png similarity index 100% rename from DS_Map/Graphics/Camera Angles/HGSS/hgsscamera15.png rename to DS_Map/Resources/Graphics/Camera Angles/HGSS/hgsscamera15.png diff --git a/DS_Map/Graphics/Event Icons/blue_sign.png b/DS_Map/Resources/Graphics/Event Icons/blue_sign.png similarity index 100% rename from DS_Map/Graphics/Event Icons/blue_sign.png rename to DS_Map/Resources/Graphics/Event Icons/blue_sign.png diff --git a/DS_Map/Graphics/Event Icons/brown_sign.png b/DS_Map/Resources/Graphics/Event Icons/brown_sign.png similarity index 100% rename from DS_Map/Graphics/Event Icons/brown_sign.png rename to DS_Map/Resources/Graphics/Event Icons/brown_sign.png diff --git a/DS_Map/Graphics/Event Icons/dawn_platinum.png b/DS_Map/Resources/Graphics/Event Icons/dawn_platinum.png similarity index 100% rename from DS_Map/Graphics/Event Icons/dawn_platinum.png rename to DS_Map/Resources/Graphics/Event Icons/dawn_platinum.png diff --git a/DS_Map/Graphics/Event Icons/dppt_suitcase.png b/DS_Map/Resources/Graphics/Event Icons/dppt_suitcase.png similarity index 100% rename from DS_Map/Graphics/Event Icons/dppt_suitcase.png rename to DS_Map/Resources/Graphics/Event Icons/dppt_suitcase.png diff --git a/DS_Map/Graphics/Event Icons/gray_sign.png b/DS_Map/Resources/Graphics/Event Icons/gray_sign.png similarity index 100% rename from DS_Map/Graphics/Event Icons/gray_sign.png rename to DS_Map/Resources/Graphics/Event Icons/gray_sign.png diff --git a/DS_Map/Graphics/Event Icons/overworld.png b/DS_Map/Resources/Graphics/Event Icons/overworld.png similarity index 100% rename from DS_Map/Graphics/Event Icons/overworld.png rename to DS_Map/Resources/Graphics/Event Icons/overworld.png diff --git a/DS_Map/Graphics/Event Icons/red_sign.png b/DS_Map/Resources/Graphics/Event Icons/red_sign.png similarity index 100% rename from DS_Map/Graphics/Event Icons/red_sign.png rename to DS_Map/Resources/Graphics/Event Icons/red_sign.png diff --git a/DS_Map/Graphics/Event Icons/route_sign.png b/DS_Map/Resources/Graphics/Event Icons/route_sign.png similarity index 100% rename from DS_Map/Graphics/Event Icons/route_sign.png rename to DS_Map/Resources/Graphics/Event Icons/route_sign.png diff --git a/DS_Map/Graphics/Event Icons/sign.png b/DS_Map/Resources/Graphics/Event Icons/sign.png similarity index 100% rename from DS_Map/Graphics/Event Icons/sign.png rename to DS_Map/Resources/Graphics/Event Icons/sign.png diff --git a/DS_Map/Graphics/Event Icons/trigger.png b/DS_Map/Resources/Graphics/Event Icons/trigger.png similarity index 100% rename from DS_Map/Graphics/Event Icons/trigger.png rename to DS_Map/Resources/Graphics/Event Icons/trigger.png diff --git a/DS_Map/Graphics/Event Icons/warp.png b/DS_Map/Resources/Graphics/Event Icons/warp.png similarity index 100% rename from DS_Map/Graphics/Event Icons/warp.png rename to DS_Map/Resources/Graphics/Event Icons/warp.png diff --git a/DS_Map/Graphics/Program Icons/LeftClick.png b/DS_Map/Resources/Graphics/Program Icons/LeftClick.png similarity index 100% rename from DS_Map/Graphics/Program Icons/LeftClick.png rename to DS_Map/Resources/Graphics/Program Icons/LeftClick.png diff --git a/DS_Map/Graphics/Program Icons/RightClick.png b/DS_Map/Resources/Graphics/Program Icons/RightClick.png similarity index 100% rename from DS_Map/Graphics/Program Icons/RightClick.png rename to DS_Map/Resources/Graphics/Program Icons/RightClick.png diff --git a/DS_Map/Graphics/Program Icons/SurfIcon.png b/DS_Map/Resources/Graphics/Program Icons/SurfIcon.png similarity index 100% rename from DS_Map/Graphics/Program Icons/SurfIcon.png rename to DS_Map/Resources/Graphics/Program Icons/SurfIcon.png diff --git a/DS_Map/Graphics/Program Icons/WheelClick.png b/DS_Map/Resources/Graphics/Program Icons/WheelClick.png similarity index 100% rename from DS_Map/Graphics/Program Icons/WheelClick.png rename to DS_Map/Resources/Graphics/Program Icons/WheelClick.png diff --git a/DS_Map/Graphics/Program Icons/addIcon.png b/DS_Map/Resources/Graphics/Program Icons/addIcon.png similarity index 100% rename from DS_Map/Graphics/Program Icons/addIcon.png rename to DS_Map/Resources/Graphics/Program Icons/addIcon.png diff --git a/DS_Map/Graphics/Program Icons/arrowdown.png b/DS_Map/Resources/Graphics/Program Icons/arrowdown.png similarity index 100% rename from DS_Map/Graphics/Program Icons/arrowdown.png rename to DS_Map/Resources/Graphics/Program Icons/arrowdown.png diff --git a/DS_Map/Graphics/Program Icons/arrowleft.png b/DS_Map/Resources/Graphics/Program Icons/arrowleft.png similarity index 100% rename from DS_Map/Graphics/Program Icons/arrowleft.png rename to DS_Map/Resources/Graphics/Program Icons/arrowleft.png diff --git a/DS_Map/Graphics/Program Icons/arrowright.png b/DS_Map/Resources/Graphics/Program Icons/arrowright.png similarity index 100% rename from DS_Map/Graphics/Program Icons/arrowright.png rename to DS_Map/Resources/Graphics/Program Icons/arrowright.png diff --git a/DS_Map/Graphics/Program Icons/arrowup.png b/DS_Map/Resources/Graphics/Program Icons/arrowup.png similarity index 100% rename from DS_Map/Graphics/Program Icons/arrowup.png rename to DS_Map/Resources/Graphics/Program Icons/arrowup.png diff --git a/DS_Map/Graphics/Program Icons/building_editor.png b/DS_Map/Resources/Graphics/Program Icons/building_editor.png similarity index 100% rename from DS_Map/Graphics/Program Icons/building_editor.png rename to DS_Map/Resources/Graphics/Program Icons/building_editor.png diff --git a/DS_Map/Graphics/Program Icons/checkmark.png b/DS_Map/Resources/Graphics/Program Icons/checkmark.png similarity index 100% rename from DS_Map/Graphics/Program Icons/checkmark.png rename to DS_Map/Resources/Graphics/Program Icons/checkmark.png diff --git a/DS_Map/Graphics/Program Icons/clearflag.png b/DS_Map/Resources/Graphics/Program Icons/clearflag.png similarity index 100% rename from DS_Map/Graphics/Program Icons/clearflag.png rename to DS_Map/Resources/Graphics/Program Icons/clearflag.png diff --git a/DS_Map/Graphics/Program Icons/closemsg.png b/DS_Map/Resources/Graphics/Program Icons/closemsg.png similarity index 100% rename from DS_Map/Graphics/Program Icons/closemsg.png rename to DS_Map/Resources/Graphics/Program Icons/closemsg.png diff --git a/DS_Map/Graphics/Program Icons/copyIcon.png b/DS_Map/Resources/Graphics/Program Icons/copyIcon.png similarity index 100% rename from DS_Map/Graphics/Program Icons/copyIcon.png rename to DS_Map/Resources/Graphics/Program Icons/copyIcon.png diff --git a/DS_Map/Graphics/Program Icons/copyIcon_small.png b/DS_Map/Resources/Graphics/Program Icons/copyIcon_small.png similarity index 100% rename from DS_Map/Graphics/Program Icons/copyIcon_small.png rename to DS_Map/Resources/Graphics/Program Icons/copyIcon_small.png diff --git a/DS_Map/Graphics/Program Icons/deleteIcon.png b/DS_Map/Resources/Graphics/Program Icons/deleteIcon.png similarity index 100% rename from DS_Map/Graphics/Program Icons/deleteIcon.png rename to DS_Map/Resources/Graphics/Program Icons/deleteIcon.png diff --git a/DS_Map/Graphics/Program Icons/dualslot_encounters.png b/DS_Map/Resources/Graphics/Program Icons/dualslot_encounters.png similarity index 100% rename from DS_Map/Graphics/Program Icons/dualslot_encounters.png rename to DS_Map/Resources/Graphics/Program Icons/dualslot_encounters.png diff --git a/DS_Map/Graphics/Program Icons/egg.png b/DS_Map/Resources/Graphics/Program Icons/egg.png similarity index 100% rename from DS_Map/Graphics/Program Icons/egg.png rename to DS_Map/Resources/Graphics/Program Icons/egg.png diff --git a/DS_Map/Graphics/Program Icons/event_editor.png b/DS_Map/Resources/Graphics/Program Icons/event_editor.png similarity index 100% rename from DS_Map/Graphics/Program Icons/event_editor.png rename to DS_Map/Resources/Graphics/Program Icons/event_editor.png diff --git a/DS_Map/Graphics/Program Icons/exploreKit.Image.png b/DS_Map/Resources/Graphics/Program Icons/exploreKit.Image.png similarity index 100% rename from DS_Map/Graphics/Program Icons/exploreKit.Image.png rename to DS_Map/Resources/Graphics/Program Icons/exploreKit.Image.png diff --git a/DS_Map/Graphics/Program Icons/exportArrow.png b/DS_Map/Resources/Graphics/Program Icons/exportArrow.png similarity index 100% rename from DS_Map/Graphics/Program Icons/exportArrow.png rename to DS_Map/Resources/Graphics/Program Icons/exportArrow.png diff --git a/DS_Map/Graphics/Program Icons/give_badge.png b/DS_Map/Resources/Graphics/Program Icons/give_badge.png similarity index 100% rename from DS_Map/Graphics/Program Icons/give_badge.png rename to DS_Map/Resources/Graphics/Program Icons/give_badge.png diff --git a/DS_Map/Graphics/Program Icons/give_pokedex.png b/DS_Map/Resources/Graphics/Program Icons/give_pokedex.png similarity index 100% rename from DS_Map/Graphics/Program Icons/give_pokedex.png rename to DS_Map/Resources/Graphics/Program Icons/give_pokedex.png diff --git a/DS_Map/Graphics/Program Icons/give_pokegear.png b/DS_Map/Resources/Graphics/Program Icons/give_pokegear.png similarity index 100% rename from DS_Map/Graphics/Program Icons/give_pokegear.png rename to DS_Map/Resources/Graphics/Program Icons/give_pokegear.png diff --git a/DS_Map/Graphics/Program Icons/give_shoes.png b/DS_Map/Resources/Graphics/Program Icons/give_shoes.png similarity index 100% rename from DS_Map/Graphics/Program Icons/give_shoes.png rename to DS_Map/Resources/Graphics/Program Icons/give_shoes.png diff --git a/DS_Map/Graphics/Program Icons/giveitem.png b/DS_Map/Resources/Graphics/Program Icons/giveitem.png similarity index 100% rename from DS_Map/Graphics/Program Icons/giveitem.png rename to DS_Map/Resources/Graphics/Program Icons/giveitem.png diff --git a/DS_Map/Graphics/Program Icons/givemom.png b/DS_Map/Resources/Graphics/Program Icons/givemom.png similarity index 100% rename from DS_Map/Graphics/Program Icons/givemom.png rename to DS_Map/Resources/Graphics/Program Icons/givemom.png diff --git a/DS_Map/Graphics/Program Icons/goToOW.png b/DS_Map/Resources/Graphics/Program Icons/goToOW.png similarity index 100% rename from DS_Map/Graphics/Program Icons/goToOW.png rename to DS_Map/Resources/Graphics/Program Icons/goToOW.png diff --git a/DS_Map/Graphics/Program Icons/goToSpawnable.png b/DS_Map/Resources/Graphics/Program Icons/goToSpawnable.png similarity index 100% rename from DS_Map/Graphics/Program Icons/goToSpawnable.png rename to DS_Map/Resources/Graphics/Program Icons/goToSpawnable.png diff --git a/DS_Map/Graphics/Program Icons/goToTrigger.png b/DS_Map/Resources/Graphics/Program Icons/goToTrigger.png similarity index 100% rename from DS_Map/Graphics/Program Icons/goToTrigger.png rename to DS_Map/Resources/Graphics/Program Icons/goToTrigger.png diff --git a/DS_Map/Graphics/Program Icons/goToWarp.png b/DS_Map/Resources/Graphics/Program Icons/goToWarp.png similarity index 100% rename from DS_Map/Graphics/Program Icons/goToWarp.png rename to DS_Map/Resources/Graphics/Program Icons/goToWarp.png diff --git a/DS_Map/Graphics/Program Icons/good_rod_encounters.png b/DS_Map/Resources/Graphics/Program Icons/good_rod_encounters.png similarity index 100% rename from DS_Map/Graphics/Program Icons/good_rod_encounters.png rename to DS_Map/Resources/Graphics/Program Icons/good_rod_encounters.png diff --git a/DS_Map/Graphics/Program Icons/importArrow.png b/DS_Map/Resources/Graphics/Program Icons/importArrow.png similarity index 100% rename from DS_Map/Graphics/Program Icons/importArrow.png rename to DS_Map/Resources/Graphics/Program Icons/importArrow.png diff --git a/DS_Map/Graphics/Program Icons/legendary_battle.png b/DS_Map/Resources/Graphics/Program Icons/legendary_battle.png similarity index 100% rename from DS_Map/Graphics/Program Icons/legendary_battle.png rename to DS_Map/Resources/Graphics/Program Icons/legendary_battle.png diff --git a/DS_Map/Graphics/Program Icons/loadColorTable.png b/DS_Map/Resources/Graphics/Program Icons/loadColorTable.png similarity index 100% rename from DS_Map/Graphics/Program Icons/loadColorTable.png rename to DS_Map/Resources/Graphics/Program Icons/loadColorTable.png diff --git a/DS_Map/Graphics/Program Icons/map_editor.png b/DS_Map/Resources/Graphics/Program Icons/map_editor.png similarity index 100% rename from DS_Map/Graphics/Program Icons/map_editor.png rename to DS_Map/Resources/Graphics/Program Icons/map_editor.png diff --git a/DS_Map/Graphics/Program Icons/map_header.ico b/DS_Map/Resources/Graphics/Program Icons/map_header.ico similarity index 100% rename from DS_Map/Graphics/Program Icons/map_header.ico rename to DS_Map/Resources/Graphics/Program Icons/map_header.ico diff --git a/DS_Map/Graphics/Program Icons/matrix_editor.png b/DS_Map/Resources/Graphics/Program Icons/matrix_editor.png similarity index 100% rename from DS_Map/Graphics/Program Icons/matrix_editor.png rename to DS_Map/Resources/Graphics/Program Icons/matrix_editor.png diff --git a/DS_Map/Graphics/Program Icons/message.png b/DS_Map/Resources/Graphics/Program Icons/message.png similarity index 100% rename from DS_Map/Graphics/Program Icons/message.png rename to DS_Map/Resources/Graphics/Program Icons/message.png diff --git a/DS_Map/Graphics/Program Icons/money.png b/DS_Map/Resources/Graphics/Program Icons/money.png similarity index 100% rename from DS_Map/Graphics/Program Icons/money.png rename to DS_Map/Resources/Graphics/Program Icons/money.png diff --git a/DS_Map/Graphics/Program Icons/old_rod_encounters.png b/DS_Map/Resources/Graphics/Program Icons/old_rod_encounters.png similarity index 100% rename from DS_Map/Graphics/Program Icons/old_rod_encounters.png rename to DS_Map/Resources/Graphics/Program Icons/old_rod_encounters.png diff --git a/DS_Map/Graphics/Program Icons/open_file.png b/DS_Map/Resources/Graphics/Program Icons/open_file.png similarity index 100% rename from DS_Map/Graphics/Program Icons/open_file.png rename to DS_Map/Resources/Graphics/Program Icons/open_file.png diff --git a/DS_Map/Graphics/Program Icons/pasteIcon.png b/DS_Map/Resources/Graphics/Program Icons/pasteIcon.png similarity index 100% rename from DS_Map/Graphics/Program Icons/pasteIcon.png rename to DS_Map/Resources/Graphics/Program Icons/pasteIcon.png diff --git a/DS_Map/Graphics/Program Icons/pokéradar_encounters.png b/DS_Map/Resources/Graphics/Program Icons/pokéradar_encounters.png similarity index 100% rename from DS_Map/Graphics/Program Icons/pokéradar_encounters.png rename to DS_Map/Resources/Graphics/Program Icons/pokéradar_encounters.png diff --git a/DS_Map/Graphics/Program Icons/radio_encounters.png b/DS_Map/Resources/Graphics/Program Icons/radio_encounters.png similarity index 100% rename from DS_Map/Graphics/Program Icons/radio_encounters.png rename to DS_Map/Resources/Graphics/Program Icons/radio_encounters.png diff --git a/DS_Map/Graphics/Program Icons/resetColorTable.png b/DS_Map/Resources/Graphics/Program Icons/resetColorTable.png similarity index 100% rename from DS_Map/Graphics/Program Icons/resetColorTable.png rename to DS_Map/Resources/Graphics/Program Icons/resetColorTable.png diff --git a/DS_Map/Graphics/Program Icons/rock_smash_encounters.png b/DS_Map/Resources/Graphics/Program Icons/rock_smash_encounters.png similarity index 100% rename from DS_Map/Graphics/Program Icons/rock_smash_encounters.png rename to DS_Map/Resources/Graphics/Program Icons/rock_smash_encounters.png diff --git a/DS_Map/Graphics/Program Icons/save_rom.png b/DS_Map/Resources/Graphics/Program Icons/save_rom.png similarity index 100% rename from DS_Map/Graphics/Program Icons/save_rom.png rename to DS_Map/Resources/Graphics/Program Icons/save_rom.png diff --git a/DS_Map/Graphics/Program Icons/script_editor.png b/DS_Map/Resources/Graphics/Program Icons/script_editor.png similarity index 100% rename from DS_Map/Graphics/Program Icons/script_editor.png rename to DS_Map/Resources/Graphics/Program Icons/script_editor.png diff --git a/DS_Map/Graphics/Program Icons/setflag.png b/DS_Map/Resources/Graphics/Program Icons/setflag.png similarity index 100% rename from DS_Map/Graphics/Program Icons/setflag.png rename to DS_Map/Resources/Graphics/Program Icons/setflag.png diff --git a/DS_Map/Graphics/Program Icons/super_rod_encounters.png b/DS_Map/Resources/Graphics/Program Icons/super_rod_encounters.png similarity index 100% rename from DS_Map/Graphics/Program Icons/super_rod_encounters.png rename to DS_Map/Resources/Graphics/Program Icons/super_rod_encounters.png diff --git a/DS_Map/Graphics/Program Icons/takeitem.png b/DS_Map/Resources/Graphics/Program Icons/takeitem.png similarity index 100% rename from DS_Map/Graphics/Program Icons/takeitem.png rename to DS_Map/Resources/Graphics/Program Icons/takeitem.png diff --git a/DS_Map/Graphics/Program Icons/takemom.png b/DS_Map/Resources/Graphics/Program Icons/takemom.png similarity index 100% rename from DS_Map/Graphics/Program Icons/takemom.png rename to DS_Map/Resources/Graphics/Program Icons/takemom.png diff --git a/DS_Map/Graphics/Program Icons/takemoney.png b/DS_Map/Resources/Graphics/Program Icons/takemoney.png similarity index 100% rename from DS_Map/Graphics/Program Icons/takemoney.png rename to DS_Map/Resources/Graphics/Program Icons/takemoney.png diff --git a/DS_Map/Graphics/Program Icons/text_editor.png b/DS_Map/Resources/Graphics/Program Icons/text_editor.png similarity index 100% rename from DS_Map/Graphics/Program Icons/text_editor.png rename to DS_Map/Resources/Graphics/Program Icons/text_editor.png diff --git a/DS_Map/Graphics/Program Icons/texture_background.png b/DS_Map/Resources/Graphics/Program Icons/texture_background.png similarity index 100% rename from DS_Map/Graphics/Program Icons/texture_background.png rename to DS_Map/Resources/Graphics/Program Icons/texture_background.png diff --git a/DS_Map/Graphics/Program Icons/tileset_editor.png b/DS_Map/Resources/Graphics/Program Icons/tileset_editor.png similarity index 100% rename from DS_Map/Graphics/Program Icons/tileset_editor.png rename to DS_Map/Resources/Graphics/Program Icons/tileset_editor.png diff --git a/DS_Map/Graphics/Program Icons/trainer_battle.png b/DS_Map/Resources/Graphics/Program Icons/trainer_battle.png similarity index 100% rename from DS_Map/Graphics/Program Icons/trainer_battle.png rename to DS_Map/Resources/Graphics/Program Icons/trainer_battle.png diff --git a/DS_Map/Graphics/Program Icons/unpackAllIcon.png b/DS_Map/Resources/Graphics/Program Icons/unpackAllIcon.png similarity index 100% rename from DS_Map/Graphics/Program Icons/unpackAllIcon.png rename to DS_Map/Resources/Graphics/Program Icons/unpackAllIcon.png diff --git a/DS_Map/Graphics/Program Icons/unpackBuildingNarcsIcon.png b/DS_Map/Resources/Graphics/Program Icons/unpackBuildingNarcsIcon.png similarity index 100% rename from DS_Map/Graphics/Program Icons/unpackBuildingNarcsIcon.png rename to DS_Map/Resources/Graphics/Program Icons/unpackBuildingNarcsIcon.png diff --git a/DS_Map/Graphics/Program Icons/walking_encounters_dppt.png b/DS_Map/Resources/Graphics/Program Icons/walking_encounters_dppt.png similarity index 100% rename from DS_Map/Graphics/Program Icons/walking_encounters_dppt.png rename to DS_Map/Resources/Graphics/Program Icons/walking_encounters_dppt.png diff --git a/DS_Map/Graphics/Program Icons/walking_encounters_hgss.png b/DS_Map/Resources/Graphics/Program Icons/walking_encounters_hgss.png similarity index 100% rename from DS_Map/Graphics/Program Icons/walking_encounters_hgss.png rename to DS_Map/Resources/Graphics/Program Icons/walking_encounters_hgss.png diff --git a/DS_Map/Graphics/Program Icons/warpGo.png b/DS_Map/Resources/Graphics/Program Icons/warpGo.png similarity index 100% rename from DS_Map/Graphics/Program Icons/warpGo.png rename to DS_Map/Resources/Graphics/Program Icons/warpGo.png diff --git a/DS_Map/Graphics/Program Icons/wideLensImage.png b/DS_Map/Resources/Graphics/Program Icons/wideLensImage.png similarity index 100% rename from DS_Map/Graphics/Program Icons/wideLensImage.png rename to DS_Map/Resources/Graphics/Program Icons/wideLensImage.png diff --git a/DS_Map/Graphics/Program Icons/wideLensImageTransp.png b/DS_Map/Resources/Graphics/Program Icons/wideLensImageTransp.png similarity index 100% rename from DS_Map/Graphics/Program Icons/wideLensImageTransp.png rename to DS_Map/Resources/Graphics/Program Icons/wideLensImageTransp.png diff --git a/DS_Map/Graphics/Program Icons/wild_battle.png b/DS_Map/Resources/Graphics/Program Icons/wild_battle.png similarity index 100% rename from DS_Map/Graphics/Program Icons/wild_battle.png rename to DS_Map/Resources/Graphics/Program Icons/wild_battle.png diff --git a/DS_Map/Graphics/Program Icons/wild_editor.png b/DS_Map/Resources/Graphics/Program Icons/wild_editor.png similarity index 100% rename from DS_Map/Graphics/Program Icons/wild_editor.png rename to DS_Map/Resources/Graphics/Program Icons/wild_editor.png diff --git a/DS_Map/Graphics/Weather/DPPt/dpblizzard.gif b/DS_Map/Resources/Graphics/Weather/DPPt/dpblizzard.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/dpblizzard.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/dpblizzard.gif diff --git a/DS_Map/Graphics/Weather/DPPt/dpcloudy.png b/DS_Map/Resources/Graphics/Weather/DPPt/dpcloudy.png similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/dpcloudy.png rename to DS_Map/Resources/Graphics/Weather/DPPt/dpcloudy.png diff --git a/DS_Map/Graphics/Weather/DPPt/dpdark.png b/DS_Map/Resources/Graphics/Weather/DPPt/dpdark.png similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/dpdark.png rename to DS_Map/Resources/Graphics/Weather/DPPt/dpdark.png diff --git a/DS_Map/Graphics/Weather/DPPt/dpdiamondsnow.gif b/DS_Map/Resources/Graphics/Weather/DPPt/dpdiamondsnow.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/dpdiamondsnow.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/dpdiamondsnow.gif diff --git a/DS_Map/Graphics/Weather/DPPt/dpfog.png b/DS_Map/Resources/Graphics/Weather/DPPt/dpfog.png similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/dpfog.png rename to DS_Map/Resources/Graphics/Weather/DPPt/dpfog.png diff --git a/DS_Map/Graphics/Weather/DPPt/dphail.gif b/DS_Map/Resources/Graphics/Weather/DPPt/dphail.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/dphail.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/dphail.gif diff --git a/DS_Map/Graphics/Weather/DPPt/dpheavyrain.gif b/DS_Map/Resources/Graphics/Weather/DPPt/dpheavyrain.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/dpheavyrain.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/dpheavyrain.gif diff --git a/DS_Map/Graphics/Weather/DPPt/dplightning.gif b/DS_Map/Resources/Graphics/Weather/DPPt/dplightning.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/dplightning.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/dplightning.gif diff --git a/DS_Map/Graphics/Weather/DPPt/dplightsandstorm.gif b/DS_Map/Resources/Graphics/Weather/DPPt/dplightsandstorm.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/dplightsandstorm.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/dplightsandstorm.gif diff --git a/DS_Map/Graphics/Weather/DPPt/dpnormal.png b/DS_Map/Resources/Graphics/Weather/DPPt/dpnormal.png similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/dpnormal.png rename to DS_Map/Resources/Graphics/Weather/DPPt/dpnormal.png diff --git a/DS_Map/Graphics/Weather/DPPt/dprain.gif b/DS_Map/Resources/Graphics/Weather/DPPt/dprain.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/dprain.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/dprain.gif diff --git a/DS_Map/Graphics/Weather/DPPt/dprocksascending.gif b/DS_Map/Resources/Graphics/Weather/DPPt/dprocksascending.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/dprocksascending.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/dprocksascending.gif diff --git a/DS_Map/Graphics/Weather/DPPt/dpsandfall.gif b/DS_Map/Resources/Graphics/Weather/DPPt/dpsandfall.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/dpsandfall.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/dpsandfall.gif diff --git a/DS_Map/Graphics/Weather/DPPt/dpsandstorm.gif b/DS_Map/Resources/Graphics/Weather/DPPt/dpsandstorm.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/dpsandstorm.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/dpsandstorm.gif diff --git a/DS_Map/Graphics/Weather/DPPt/dpsnowslow.gif b/DS_Map/Resources/Graphics/Weather/DPPt/dpsnowslow.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/dpsnowslow.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/dpsnowslow.gif diff --git a/DS_Map/Graphics/Weather/DPPt/dpthunderstorm.gif b/DS_Map/Resources/Graphics/Weather/DPPt/dpthunderstorm.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/dpthunderstorm.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/dpthunderstorm.gif diff --git a/DS_Map/Graphics/Weather/DPPt/ptblizzard.gif b/DS_Map/Resources/Graphics/Weather/DPPt/ptblizzard.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/ptblizzard.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/ptblizzard.gif diff --git a/DS_Map/Graphics/Weather/DPPt/ptcloudy.png b/DS_Map/Resources/Graphics/Weather/DPPt/ptcloudy.png similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/ptcloudy.png rename to DS_Map/Resources/Graphics/Weather/DPPt/ptcloudy.png diff --git a/DS_Map/Graphics/Weather/DPPt/ptdark.png b/DS_Map/Resources/Graphics/Weather/DPPt/ptdark.png similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/ptdark.png rename to DS_Map/Resources/Graphics/Weather/DPPt/ptdark.png diff --git a/DS_Map/Graphics/Weather/DPPt/ptdiamondsnow.gif b/DS_Map/Resources/Graphics/Weather/DPPt/ptdiamondsnow.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/ptdiamondsnow.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/ptdiamondsnow.gif diff --git a/DS_Map/Graphics/Weather/DPPt/ptfog.png b/DS_Map/Resources/Graphics/Weather/DPPt/ptfog.png similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/ptfog.png rename to DS_Map/Resources/Graphics/Weather/DPPt/ptfog.png diff --git a/DS_Map/Graphics/Weather/DPPt/ptforestweather.gif b/DS_Map/Resources/Graphics/Weather/DPPt/ptforestweather.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/ptforestweather.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/ptforestweather.gif diff --git a/DS_Map/Graphics/Weather/DPPt/pthail.gif b/DS_Map/Resources/Graphics/Weather/DPPt/pthail.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/pthail.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/pthail.gif diff --git a/DS_Map/Graphics/Weather/DPPt/ptheavyrain.gif b/DS_Map/Resources/Graphics/Weather/DPPt/ptheavyrain.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/ptheavyrain.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/ptheavyrain.gif diff --git a/DS_Map/Graphics/Weather/DPPt/ptlightning.gif b/DS_Map/Resources/Graphics/Weather/DPPt/ptlightning.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/ptlightning.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/ptlightning.gif diff --git a/DS_Map/Graphics/Weather/DPPt/ptlightsandstorm.gif b/DS_Map/Resources/Graphics/Weather/DPPt/ptlightsandstorm.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/ptlightsandstorm.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/ptlightsandstorm.gif diff --git a/DS_Map/Graphics/Weather/DPPt/ptnormal.png b/DS_Map/Resources/Graphics/Weather/DPPt/ptnormal.png similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/ptnormal.png rename to DS_Map/Resources/Graphics/Weather/DPPt/ptnormal.png diff --git a/DS_Map/Graphics/Weather/DPPt/ptrain.gif b/DS_Map/Resources/Graphics/Weather/DPPt/ptrain.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/ptrain.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/ptrain.gif diff --git a/DS_Map/Graphics/Weather/DPPt/ptrocksascending.gif b/DS_Map/Resources/Graphics/Weather/DPPt/ptrocksascending.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/ptrocksascending.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/ptrocksascending.gif diff --git a/DS_Map/Graphics/Weather/DPPt/ptsandfall.gif b/DS_Map/Resources/Graphics/Weather/DPPt/ptsandfall.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/ptsandfall.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/ptsandfall.gif diff --git a/DS_Map/Graphics/Weather/DPPt/ptsandstorm.gif b/DS_Map/Resources/Graphics/Weather/DPPt/ptsandstorm.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/ptsandstorm.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/ptsandstorm.gif diff --git a/DS_Map/Graphics/Weather/DPPt/ptsnowslow.gif b/DS_Map/Resources/Graphics/Weather/DPPt/ptsnowslow.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/ptsnowslow.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/ptsnowslow.gif diff --git a/DS_Map/Graphics/Weather/DPPt/ptspotlight.gif b/DS_Map/Resources/Graphics/Weather/DPPt/ptspotlight.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/ptspotlight.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/ptspotlight.gif diff --git a/DS_Map/Graphics/Weather/DPPt/ptthunderstorm.gif b/DS_Map/Resources/Graphics/Weather/DPPt/ptthunderstorm.gif similarity index 100% rename from DS_Map/Graphics/Weather/DPPt/ptthunderstorm.gif rename to DS_Map/Resources/Graphics/Weather/DPPt/ptthunderstorm.gif diff --git a/DS_Map/Graphics/Weather/HGSS/hgssArcade.gif b/DS_Map/Resources/Graphics/Weather/HGSS/hgssArcade.gif similarity index 100% rename from DS_Map/Graphics/Weather/HGSS/hgssArcade.gif rename to DS_Map/Resources/Graphics/Weather/HGSS/hgssArcade.gif diff --git a/DS_Map/Graphics/Weather/HGSS/hgssdark.png b/DS_Map/Resources/Graphics/Weather/HGSS/hgssdark.png similarity index 100% rename from DS_Map/Graphics/Weather/HGSS/hgssdark.png rename to DS_Map/Resources/Graphics/Weather/HGSS/hgssdark.png diff --git a/DS_Map/Graphics/Weather/HGSS/hgssdark2.png b/DS_Map/Resources/Graphics/Weather/HGSS/hgssdark2.png similarity index 100% rename from DS_Map/Graphics/Weather/HGSS/hgssdark2.png rename to DS_Map/Resources/Graphics/Weather/HGSS/hgssdark2.png diff --git a/DS_Map/Graphics/Weather/HGSS/hgssdiamond.gif b/DS_Map/Resources/Graphics/Weather/HGSS/hgssdiamond.gif similarity index 100% rename from DS_Map/Graphics/Weather/HGSS/hgssdiamond.gif rename to DS_Map/Resources/Graphics/Weather/HGSS/hgssdiamond.gif diff --git a/DS_Map/Graphics/Weather/HGSS/hgssfog.gif b/DS_Map/Resources/Graphics/Weather/HGSS/hgssfog.gif similarity index 100% rename from DS_Map/Graphics/Weather/HGSS/hgssfog.gif rename to DS_Map/Resources/Graphics/Weather/HGSS/hgssfog.gif diff --git a/DS_Map/Graphics/Weather/HGSS/hgssfog.png b/DS_Map/Resources/Graphics/Weather/HGSS/hgssfog.png similarity index 100% rename from DS_Map/Graphics/Weather/HGSS/hgssfog.png rename to DS_Map/Resources/Graphics/Weather/HGSS/hgssfog.png diff --git a/DS_Map/Graphics/Weather/HGSS/hgsshail.gif b/DS_Map/Resources/Graphics/Weather/HGSS/hgsshail.gif similarity index 100% rename from DS_Map/Graphics/Weather/HGSS/hgsshail.gif rename to DS_Map/Resources/Graphics/Weather/HGSS/hgsshail.gif diff --git a/DS_Map/Graphics/Weather/HGSS/hgssnormal.gif b/DS_Map/Resources/Graphics/Weather/HGSS/hgssnormal.gif similarity index 100% rename from DS_Map/Graphics/Weather/HGSS/hgssnormal.gif rename to DS_Map/Resources/Graphics/Weather/HGSS/hgssnormal.gif diff --git a/DS_Map/Graphics/Weather/HGSS/hgssrain.gif b/DS_Map/Resources/Graphics/Weather/HGSS/hgssrain.gif similarity index 100% rename from DS_Map/Graphics/Weather/HGSS/hgssrain.gif rename to DS_Map/Resources/Graphics/Weather/HGSS/hgssrain.gif diff --git a/DS_Map/Graphics/Weather/HGSS/hgsssnow.gif b/DS_Map/Resources/Graphics/Weather/HGSS/hgsssnow.gif similarity index 100% rename from DS_Map/Graphics/Weather/HGSS/hgsssnow.gif rename to DS_Map/Resources/Graphics/Weather/HGSS/hgsssnow.gif diff --git a/DS_Map/Graphics/app.ico b/DS_Map/Resources/Graphics/app.ico similarity index 100% rename from DS_Map/Graphics/app.ico rename to DS_Map/Resources/Graphics/app.ico diff --git a/DS_Map/Graphics/app.png b/DS_Map/Resources/Graphics/app.png similarity index 100% rename from DS_Map/Graphics/app.png rename to DS_Map/Resources/Graphics/app.png diff --git a/DS_Map/Resources/PokeDatabase.cs b/DS_Map/Resources/PokeDatabase.cs index c12e4db..25bd70b 100644 --- a/DS_Map/Resources/PokeDatabase.cs +++ b/DS_Map/Resources/PokeDatabase.cs @@ -1,4 +1,5 @@ -using System; +using DSPRE.ROMFiles; +using System; using System.Collections.Generic; using System.Drawing; diff --git a/DS_Map/WildEditorDPPt.cs b/DS_Map/WildEditorDPPt.cs index aef4d5e..bb1d69f 100644 --- a/DS_Map/WildEditorDPPt.cs +++ b/DS_Map/WildEditorDPPt.cs @@ -1,4 +1,5 @@ -using System; +using DSPRE.ROMFiles; +using System; using System.IO; using System.Windows.Forms; diff --git a/DS_Map/WildEditorHGSS.cs b/DS_Map/WildEditorHGSS.cs index 4c50e3c..60da678 100644 --- a/DS_Map/WildEditorHGSS.cs +++ b/DS_Map/WildEditorHGSS.cs @@ -1,4 +1,5 @@ -using System; +using DSPRE.ROMFiles; +using System; using System.IO; using System.Windows.Forms;