Merge pull request #287 from red031000/master

some itemtool images, arm7 OS_context, arm9 PXI_init

28 files changed, 18 insertions, 0 deletions

diff --git a/files/itemtool/itemdata/item_icon/.gitignore b/files/itemtool/itemdata/item_icon/.gitignore
index 5f446a70..190832e8 100644
--- a/files/itemtool/itemdata/item_icon/.gitignore
+++ b/files/itemtool/itemdata/item_icon/.gitignore
@@ -144,3 +144,21 @@ narc_0144.NCGR
 narc_0144.NCLR
 narc_0146.NCGR
 narc_0146.NCLR
+narc_0148.NCGR
+narc_0148.NCLR
+narc_0150.NCGR
+narc_0150.NCLR
+narc_0152.NCGR
+narc_0152.NCLR
+narc_0154.NCGR
+narc_0154.NCLR
+narc_0156.NCGR
+narc_0156.NCLR
+narc_0158.NCGR
+narc_0158.NCLR
+narc_0160.NCGR
+narc_0160.NCLR
+narc_0162.NCGR
+narc_0162.NCLR
+narc_0164.NCGR
+narc_0164.NCLR
diff --git a/files/itemtool/itemdata/item_icon/narc_0148.NCGR b/files/itemtool/itemdata/item_icon/narc_0148.NCGR
deleted file mode 100644
index fb3df5f1..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0148.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0148.png b/files/itemtool/itemdata/item_icon/narc_0148.png
new file mode 100644
index 00000000..c7e82654
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0148.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0149.NCLR b/files/itemtool/itemdata/item_icon/narc_0149.NCLR
deleted file mode 100644
index 29d2c57f..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0149.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0150.NCGR b/files/itemtool/itemdata/item_icon/narc_0150.NCGR
deleted file mode 100644
index 6f16aad9..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0150.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0150.png b/files/itemtool/itemdata/item_icon/narc_0150.png
new file mode 100644
index 00000000..07232e02
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0150.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0151.NCLR b/files/itemtool/itemdata/item_icon/narc_0151.NCLR
deleted file mode 100644
index 2f63520e..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0151.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0152.NCGR b/files/itemtool/itemdata/item_icon/narc_0152.NCGR
deleted file mode 100644
index bd6f7920..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0152.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0152.png b/files/itemtool/itemdata/item_icon/narc_0152.png
new file mode 100644
index 00000000..6eedd513
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0152.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0153.NCLR b/files/itemtool/itemdata/item_icon/narc_0153.NCLR
deleted file mode 100644
index afde875c..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0153.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0154.NCGR b/files/itemtool/itemdata/item_icon/narc_0154.NCGR
deleted file mode 100644
index 91dcfde9..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0154.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0154.png b/files/itemtool/itemdata/item_icon/narc_0154.png
new file mode 100644
index 00000000..53c93d6f
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0154.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0155.NCLR b/files/itemtool/itemdata/item_icon/narc_0155.NCLR
deleted file mode 100644
index eeb4079f..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0155.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0156.NCGR b/files/itemtool/itemdata/item_icon/narc_0156.NCGR
deleted file mode 100644
index 97aff7ce..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0156.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0156.png b/files/itemtool/itemdata/item_icon/narc_0156.png
new file mode 100644
index 00000000..f1ddf5c6
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0156.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0157.NCLR b/files/itemtool/itemdata/item_icon/narc_0157.NCLR
deleted file mode 100644
index 1d75bf34..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0157.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0158.NCGR b/files/itemtool/itemdata/item_icon/narc_0158.NCGR
deleted file mode 100644
index 6bc815f9..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0158.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0158.png b/files/itemtool/itemdata/item_icon/narc_0158.png
new file mode 100644
index 00000000..fd6891e8
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0158.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0159.NCLR b/files/itemtool/itemdata/item_icon/narc_0159.NCLR
deleted file mode 100644
index 863d1893..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0159.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0160.NCGR b/files/itemtool/itemdata/item_icon/narc_0160.NCGR
deleted file mode 100644
index 13b9c0b7..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0160.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0160.png b/files/itemtool/itemdata/item_icon/narc_0160.png
new file mode 100644
index 00000000..e26c993c
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0160.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0161.NCLR b/files/itemtool/itemdata/item_icon/narc_0161.NCLR
deleted file mode 100644
index ae173567..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0161.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0162.NCGR b/files/itemtool/itemdata/item_icon/narc_0162.NCGR
deleted file mode 100644
index a49fbbca..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0162.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0162.png b/files/itemtool/itemdata/item_icon/narc_0162.png
new file mode 100644
index 00000000..2a9f506d
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0162.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0163.NCLR b/files/itemtool/itemdata/item_icon/narc_0163.NCLR
deleted file mode 100644
index 48348a5c..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0163.NCLR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0164.NCGR b/files/itemtool/itemdata/item_icon/narc_0164.NCGR
deleted file mode 100644
index 8450af19..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0164.NCGR
+++ /dev/null
diff --git a/files/itemtool/itemdata/item_icon/narc_0164.png b/files/itemtool/itemdata/item_icon/narc_0164.png
new file mode 100644
index 00000000..a948310a
--- /dev/null
+++ b/files/itemtool/itemdata/item_icon/narc_0164.png
diff --git a/files/itemtool/itemdata/item_icon/narc_0165.NCLR b/files/itemtool/itemdata/item_icon/narc_0165.NCLR
deleted file mode 100644
index 58db9595..00000000
--- a/files/itemtool/itemdata/item_icon/narc_0165.NCLR
+++ /dev/null