Skip to content

Commit

Permalink
improvement,feature(KirbyMagic): added new Kirby Magic project, based…
Browse files Browse the repository at this point in the history
… on the common Magic library
  • Loading branch information
LexouDuck committed Sep 8, 2021
1 parent f05fe11 commit 608c8ae
Show file tree
Hide file tree
Showing 46 changed files with 6,686 additions and 24,251 deletions.
Binary file added .vs/Magic/DesignTimeBuild/.dtbcache.v2
Binary file not shown.
Binary file added .vs/Magic/v14/.suo
Binary file not shown.
Binary file added .vs/Magic/v16/.suo
Binary file not shown.
246 changes: 245 additions & 1 deletion EmblemMagic/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,255 @@ EventAssembler/Tools/*.exe
bin/
obj/
dist/
.vs

# Nightmare modules
Modules/old/

# Macintosh hidden files
*.DS_Store
*._*

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
[Xx]64/
[Xx]86/
[Bb]uild/
bld/
[Bb]in/
[Oo]bj/

# Visual Studio 2015 cache/options directory
.vs
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

# DNX
project.lock.json
artifacts/

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db

# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding add-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml

# TODO: Un-comment the next line if you do not want to checkin
# your web deploy settings because they may include unencrypted
# passwords
#*.pubxml
*.publishproj

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets

# Microsoft Azure Build Output
csx/
*.build.csdef

# Microsoft Azure Emulator
ecf/
rcf/

# Windows Store app package directory
AppPackages/
BundleArtifacts/

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/

# Others
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.pfx
*.publishsettings
node_modules/
orleans.codegen.cs

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
*.mdf
*.ldf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Microsoft Fakes
FakesAssemblies/

# GhostDoc plugin setting file
*.GhostDoc.xml

# Node.js Tools for Visual Studio
.ntvs_analysis.dat

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions

# LightSwitch generated files
GeneratedArtifacts/
ModelManifest.xml

# Paket dependency manager
.paket/paket.exe

# FAKE - F# Make
.fake/

Binary file removed EmblemMagic/EmblemMagic.VC.db
Binary file not shown.
2 changes: 1 addition & 1 deletion EmblemMagic/EmblemMagic.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@
<EmbeddedResource Remove="EventAssembler\Nintenlord.Forms\Properties\Resources.resx" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ROMhack\ROMhack.csproj" />
<ProjectReference Include="..\Magic\Magic.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Update="src\Editors\MagicButton.cs" />
Expand Down
Binary file removed EmblemMagic/EmblemMagic.sdf
Binary file not shown.
6 changes: 3 additions & 3 deletions EmblemMagic/src/App.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 20 additions & 6 deletions EmblemMagic/src/App.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ public partial class App : Form, IApp
public System.Windows.Forms.ToolStripMenuItem Edit_Undo { get; set; }
public System.Windows.Forms.ToolStripMenuItem Edit_Redo { get; set; }

public String SoftwareName { get; set; }
public String AppName { get; set; }
public Version AppVersion { get; set; }

/// <summary>
/// Is responsible for all reading/writing of data, and the IO for the ROM file.
Expand Down Expand Up @@ -106,8 +107,9 @@ public partial class App : Form, IApp
public App(String software_name)
{
Core.App = this;
UI.App = this;

SoftwareName = software_name;
AppName = software_name;

ROM = new DataManager();
FEH = new HackManager(this);
Expand Down Expand Up @@ -214,7 +216,7 @@ public void Update_InfoTab()
/// <summary>
/// Sets this.CurrentROM, which stores fire emblem game specific data, like vanilla pointers
/// </summary>
void Core_LoadFireEmblem()
void Core_LoadGame()
{
try
{
Expand Down Expand Up @@ -481,7 +483,7 @@ void Core_OpenROMFile(String path)
try
{
ROM.OpenFile(path);
Core_LoadFireEmblem();
Core_LoadGame();

if (FEH.IsEmpty)
{
Expand Down Expand Up @@ -1119,12 +1121,24 @@ void Help_Help_Click(Object sender, EventArgs e)
{
String path = "file://" + Path.Combine(
Directory.GetCurrentDirectory(),
this.SoftwareName + ".chm");
this.AppName + ".chm");
Help.ShowHelp(this, path);
}
void Help_About_Click(Object sender, EventArgs e)
{
FormAbout dialog = new FormAbout();
FormAbout dialog = new FormAbout(AppName,
"(version " + AppVersion + ")"
+ "\n\n" + "The GBA Fire Emblem all-in-one editing tool"
+ "\n\n" + "by (Lexou Duck)"
+ '\n' + "Thanks to documentation and code written by:"
+ '\n' + "(Hextator), (Nintenlord), (Zahlman), (CrazyColors)"
,
"Fire Emblem " + '\u00A9' + " is property of Nintendo."
+ '\n' + "Emblem Magic is in no way affiliated with Nintendo or Intelligent Systems." + '\n'
+ '\n' + "This software is free and open source, following the GNU General Public License."
,
this.Icon,
Resources.Icon_Large);

dialog.Show();
}
Expand Down
Loading

0 comments on commit 608c8ae

Please sign in to comment.