[nostalgia,olympic] Change macro names to comply with broader conventions

src/nostalgia/modules/scene/include/nostalgia/scene/scenestatic.hpp

@@ -57,12 +57,12 @@ struct TileDoc {
 
 };
 
-oxModelBegin(TileDoc)
-	oxModelFieldRename(subsheetId, subsheet_id)
-	oxModelFieldRename(subsheetPath, subsheet_path)
-	oxModelField(type)
-	oxModelFieldRename(layerAttachments, layer_attachments)
-oxModelEnd()
+OX_MODEL_BEGIN(TileDoc)
+	OX_MODEL_FIELD_RENAME(subsheetId, subsheet_id)
+	OX_MODEL_FIELD_RENAME(subsheetPath, subsheet_path)
+	OX_MODEL_FIELD(type)
+	OX_MODEL_FIELD_RENAME(layerAttachments, layer_attachments)
+OX_MODEL_END()
 
 struct SceneDoc {
 
@@ -95,11 +95,11 @@ struct SceneDoc {
 	}
 };
 
-oxModelBegin(SceneDoc)
-	oxModelField(tilesheet)
-	oxModelField(palettes)
-	oxModelField(tiles)
-oxModelEnd()
+OX_MODEL_BEGIN(SceneDoc)
+	OX_MODEL_FIELD(tilesheet)
+	OX_MODEL_FIELD(palettes)
+	OX_MODEL_FIELD(tiles)
+OX_MODEL_END()
 
 
 constexpr void setTopEdge(uint8_t &layerAttachments, unsigned val) noexcept {
@@ -215,14 +215,14 @@ struct SceneStatic {
 
 };
 
-oxModelBegin(SceneStatic)
-	oxModelField(tilesheet)
-	oxModelField(palettes)
-	oxModelField(columns)
-	oxModelField(rows)
-	oxModelField(tileMapIdx)
-	oxModelField(tileType)
-	oxModelField(layerAttachments)
-oxModelEnd()
+OX_MODEL_BEGIN(SceneStatic)
+	OX_MODEL_FIELD(tilesheet)
+	OX_MODEL_FIELD(palettes)
+	OX_MODEL_FIELD(columns)
+	OX_MODEL_FIELD(rows)
+	OX_MODEL_FIELD(tileMapIdx)
+	OX_MODEL_FIELD(tileType)
+	OX_MODEL_FIELD(layerAttachments)
+OX_MODEL_END()
 
 }

src/nostalgia/modules/scene/src/keel/typeconv.cpp

@@ -37,7 +37,7 @@ ox::Error SceneDocToSceneStaticConverter::convert(
 		keel::Context &ctx,
 		SceneDoc &src,
 		SceneStatic &dst) const noexcept {
-	oxRequire(ts, keel::readObj<core::TileSheet>(ctx, src.tilesheet));
+	OX_REQUIRE(ts, keel::readObj<core::TileSheet>(ctx, src.tilesheet));
 	const auto layerCnt = src.tiles.size();
 	dst.setLayerCnt(layerCnt);
 	dst.tilesheet = ox::FileAddress(src.tilesheet);
@@ -53,8 +53,8 @@ ox::Error SceneDocToSceneStaticConverter::convert(
 			for (const auto &srcTile : row) {
 				auto dstTile = dstLayer.tile(tileIdx);
 				dstTile.tileType = srcTile.type;
-				oxRequire(path, srcTile.getSubsheetPath(*ts));
-				oxRequire(mapIdx, getTileOffset(*ts, path));
+				OX_REQUIRE(path, srcTile.getSubsheetPath(*ts));
+				OX_REQUIRE(mapIdx, getTileOffset(*ts, path));
 				dstTile.tileMapIdx = static_cast<uint16_t>(mapIdx);
 				setLayerAttachments(layerIdx, srcTile, dstTile);
 				++tileIdx;

src/nostalgia/modules/scene/src/scene.cpp

@@ -17,8 +17,8 @@ ox::Error Scene::setupDisplay(core::Context &ctx) const noexcept {
 		return ox::Error(1, "Scene has no palettes");
 	}
 	auto const&palette = m_sceneStatic.palettes[0];
-	oxReturnError(core::loadBgTileSheet(ctx, 0, m_sceneStatic.tilesheet));
-	oxReturnError(core::loadBgPalette(ctx, 0, palette));
+	OX_RETURN_ERROR(core::loadBgTileSheet(ctx, 0, m_sceneStatic.tilesheet));
+	OX_RETURN_ERROR(core::loadBgPalette(ctx, 0, palette));
 	// disable all backgrounds
 	core::setBgStatus(ctx, 0);
 	for (auto layerNo = 0u; auto const&layer : m_sceneStatic.tileMapIdx) {

src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.cpp

@@ -48,7 +48,7 @@ void SceneEditorImGui::onActivated() noexcept {
 
 ox::Error SceneEditorImGui::saveItem() noexcept {
 	const auto sctx = applicationData<studio::StudioContext>(m_ctx);
-	oxReturnError(sctx->project->writeObj(itemPath(), m_editor.scene()));
+	OX_RETURN_ERROR(sctx->project->writeObj(itemPath(), m_editor.scene()));
 	return {};
 }