Merge pull request #534 from red031000/master

nitrogfx: implement multiple OAM objects in NCER
pret · Jul 29, 2023 · 0dc1da3 · 0dc1da3
2 parents 0a8f413 + 66ce2b8
commit 0dc1da3
Show file tree

Hide file tree

Showing 6 changed files with 324 additions and 267 deletions.
diff --git a/files/poketool/icongra/poke_icon/narc_0002.json b/files/poketool/icongra/poke_icon/narc_0002.json
@@ -15,27 +15,28 @@
 			"maxY":	15,
 			"minX":	-16,
 			"minY":	-16,
-			"OAM":	{
-				"Attr0":	{
-					"YCoordinate":	240,
-					"Rotation":	false,
-					"SizeDisable":	false,
-					"Mode":	0,
-					"Mosaic":	false,
-					"Colours":	16,
-					"Shape":	0
-				},
-				"Attr1":	{
-					"XCoordinate":	496,
-					"RotationScaling":	0,
-					"Size":	2
-				},
-				"Attr2":	{
-					"CharName":	0,
-					"Priority":	0,
-					"Palette":	0
-				}
-			}
+			"oamCount":	1,
+			"OAM":	[{
+					"Attr0":	{
+						"YCoordinate":	240,
+						"Rotation":	false,
+						"SizeDisable":	false,
+						"Mode":	0,
+						"Mosaic":	false,
+						"Colours":	16,
+						"Shape":	0
+					},
+					"Attr1":	{
+						"XCoordinate":	496,
+						"RotationScaling":	0,
+						"Size":	2
+					},
+					"Attr2":	{
+						"CharName":	0,
+						"Priority":	0,
+						"Palette":	0
+					}
+				}]
 		}, {
 			"cellAttrs":	{
 				"hFlip":	false,
@@ -48,27 +49,28 @@
 			"maxY":	15,
 			"minX":	-16,
 			"minY":	-16,
-			"OAM":	{
-				"Attr0":	{
-					"YCoordinate":	240,
-					"Rotation":	false,
-					"SizeDisable":	false,
-					"Mode":	0,
-					"Mosaic":	false,
-					"Colours":	16,
-					"Shape":	0
-				},
-				"Attr1":	{
-					"XCoordinate":	496,
-					"RotationScaling":	0,
-					"Size":	2
-				},
-				"Attr2":	{
-					"CharName":	16,
-					"Priority":	0,
-					"Palette":	0
-				}
-			}
+			"oamCount":	1,
+			"OAM":	[{
+					"Attr0":	{
+						"YCoordinate":	240,
+						"Rotation":	false,
+						"SizeDisable":	false,
+						"Mode":	0,
+						"Mosaic":	false,
+						"Colours":	16,
+						"Shape":	0
+					},
+					"Attr1":	{
+						"XCoordinate":	496,
+						"RotationScaling":	0,
+						"Size":	2
+					},
+					"Attr2":	{
+						"CharName":	16,
+						"Priority":	0,
+						"Palette":	0
+					}
+				}]
 		}],
 	"labels":	["CellAnime0", "CellAnime1"],
 	"labelCount":	2

diff --git a/files/poketool/icongra/poke_icon/narc_0004.json b/files/poketool/icongra/poke_icon/narc_0004.json
@@ -15,27 +15,28 @@
 			"maxY":	15,
 			"minX":	-16,
 			"minY":	-16,
-			"OAM":	{
-				"Attr0":	{
-					"YCoordinate":	240,
-					"Rotation":	false,
-					"SizeDisable":	false,
-					"Mode":	0,
-					"Mosaic":	false,
-					"Colours":	16,
-					"Shape":	0
-				},
-				"Attr1":	{
-					"XCoordinate":	496,
-					"RotationScaling":	0,
-					"Size":	2
-				},
-				"Attr2":	{
-					"CharName":	0,
-					"Priority":	0,
-					"Palette":	0
-				}
-			}
+			"oamCount":	1,
+			"OAM":	[{
+					"Attr0":	{
+						"YCoordinate":	240,
+						"Rotation":	false,
+						"SizeDisable":	false,
+						"Mode":	0,
+						"Mosaic":	false,
+						"Colours":	16,
+						"Shape":	0
+					},
+					"Attr1":	{
+						"XCoordinate":	496,
+						"RotationScaling":	0,
+						"Size":	2
+					},
+					"Attr2":	{
+						"CharName":	0,
+						"Priority":	0,
+						"Palette":	0
+					}
+				}]
 		}, {
 			"cellAttrs":	{
 				"hFlip":	false,
@@ -48,27 +49,28 @@
 			"maxY":	15,
 			"minX":	-16,
 			"minY":	-16,
-			"OAM":	{
-				"Attr0":	{
-					"YCoordinate":	240,
-					"Rotation":	false,
-					"SizeDisable":	false,
-					"Mode":	0,
-					"Mosaic":	false,
-					"Colours":	16,
-					"Shape":	0
-				},
-				"Attr1":	{
-					"XCoordinate":	496,
-					"RotationScaling":	0,
-					"Size":	2
-				},
-				"Attr2":	{
-					"CharName":	16,
-					"Priority":	0,
-					"Palette":	0
-				}
-			}
+			"oamCount":	1,
+			"OAM":	[{
+					"Attr0":	{
+						"YCoordinate":	240,
+						"Rotation":	false,
+						"SizeDisable":	false,
+						"Mode":	0,
+						"Mosaic":	false,
+						"Colours":	16,
+						"Shape":	0
+					},
+					"Attr1":	{
+						"XCoordinate":	496,
+						"RotationScaling":	0,
+						"Size":	2
+					},
+					"Attr2":	{
+						"CharName":	16,
+						"Priority":	0,
+						"Palette":	0
+					}
+				}]
 		}],
 	"labels":	["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5"],
 	"labelCount":	6

diff --git a/files/poketool/icongra/poke_icon/narc_0006.json b/files/poketool/icongra/poke_icon/narc_0006.json
@@ -15,27 +15,28 @@
 			"maxY":	15,
 			"minX":	-16,
 			"minY":	-16,
-			"OAM":	{
-				"Attr0":	{
-					"YCoordinate":	240,
-					"Rotation":	false,
-					"SizeDisable":	false,
-					"Mode":	0,
-					"Mosaic":	false,
-					"Colours":	16,
-					"Shape":	0
-				},
-				"Attr1":	{
-					"XCoordinate":	496,
-					"RotationScaling":	0,
-					"Size":	2
-				},
-				"Attr2":	{
-					"CharName":	0,
-					"Priority":	0,
-					"Palette":	0
-				}
-			}
+			"oamCount":	1,
+			"OAM":	[{
+					"Attr0":	{
+						"YCoordinate":	240,
+						"Rotation":	false,
+						"SizeDisable":	false,
+						"Mode":	0,
+						"Mosaic":	false,
+						"Colours":	16,
+						"Shape":	0
+					},
+					"Attr1":	{
+						"XCoordinate":	496,
+						"RotationScaling":	0,
+						"Size":	2
+					},
+					"Attr2":	{
+						"CharName":	0,
+						"Priority":	0,
+						"Palette":	0
+					}
+				}]
 		}, {
 			"cellAttrs":	{
 				"hFlip":	false,
@@ -48,27 +49,28 @@
 			"maxY":	15,
 			"minX":	-16,
 			"minY":	-16,
-			"OAM":	{
-				"Attr0":	{
-					"YCoordinate":	240,
-					"Rotation":	false,
-					"SizeDisable":	false,
-					"Mode":	0,
-					"Mosaic":	false,
-					"Colours":	16,
-					"Shape":	0
-				},
-				"Attr1":	{
-					"XCoordinate":	496,
-					"RotationScaling":	0,
-					"Size":	2
-				},
-				"Attr2":	{
-					"CharName":	8,
-					"Priority":	0,
-					"Palette":	0
-				}
-			}
+			"oamCount":	1,
+			"OAM":	[{
+					"Attr0":	{
+						"YCoordinate":	240,
+						"Rotation":	false,
+						"SizeDisable":	false,
+						"Mode":	0,
+						"Mosaic":	false,
+						"Colours":	16,
+						"Shape":	0
+					},
+					"Attr1":	{
+						"XCoordinate":	496,
+						"RotationScaling":	0,
+						"Size":	2
+					},
+					"Attr2":	{
+						"CharName":	8,
+						"Priority":	0,
+						"Palette":	0
+					}
+				}]
 		}],
 	"labels":	["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3", "CellAnime4", "CellAnime5"],
 	"labelCount":	6