deps/buildcore/scripts/pybb.py

@@ -117,7 +117,9 @@ def hostname() -> int:
 
 def host_env() -> int:
     os_name = platform.system().lower()
-    arch = util.get_arch()
+    arch = platform.machine()
+    if arch == 'amd64':
+        arch = 'x86_64'
     print(f'{os_name}-{arch}')
     return 0
 

deps/ox/src/ox/model/descwrite.hpp

@@ -363,8 +363,8 @@ constexpr Result<DescriptorType*> buildTypeDef(TypeStore *typeStore) noexcept {
 		oxReturnError(model(&handler, t));
 		a.deallocate(t, 1);
 	} else {
-		auto t = ox_malloca(sizeof(T), T);
-		oxReturnError(model(&handler, t.get()));
+		T *t = reinterpret_cast<T*>(ox_alloca(sizeof(T)));
+		oxReturnError(model(&handler, t));
 	}
 	return writer.definition();
 }

deps/ox/src/ox/model/modelhandleradaptor.hpp

@@ -33,7 +33,7 @@ class ModelHandlerInterface {
 
 		template<typename T = std::nullptr_t>
 		constexpr ox::Error setTypeInfo(
-			const char *name,
+			const char* name,
 			int version,
 			const Vector<String>& typeParams,
 			std::size_t fields) noexcept {
@@ -46,7 +46,7 @@ class ModelHandlerInterface {
 		}
 
 		template<std::size_t len>
-		constexpr Error fieldCString(const char *name, const char val[len]) noexcept requires(Handler::opType() != OpType::Read) {
+		constexpr Error fieldCString(const char *name, const char val[len]) noexcept {
 			return m_handler->fieldCString(name, &val[0], len);
 		}
 
@@ -54,11 +54,11 @@ class ModelHandlerInterface {
 			return m_handler->fieldCString(name, val);
 		}
 
-		constexpr Error fieldCString(const char *name, const char *const*val) noexcept requires(Handler::opType() != OpType::Read) {
+		constexpr Error fieldCString(const char *name, const char *const*val) noexcept {
 			return m_handler->fieldCString(name, val);
 		}
 
-		constexpr Error fieldCString(const char *name, const char **val) noexcept requires(Handler::opType() != OpType::Read) {
+		constexpr Error fieldCString(const char *name, const char **val) noexcept {
 			return m_handler->fieldCString(name, val);
 		}
 
@@ -66,7 +66,7 @@ class ModelHandlerInterface {
 			return m_handler->fieldCString(name, val, buffLen);
 		}
 
-		constexpr Error fieldCString(const char *name, const char **val, std::size_t buffLen) noexcept requires(Handler::opType() != OpType::Read) {
+		constexpr Error fieldCString(const char *name, const char **val, std::size_t buffLen) noexcept {
 			return m_handler->fieldCString(name, val, buffLen);
 		}
 

deps/ox/src/ox/std/hashmap.hpp

@@ -41,7 +41,7 @@ class HashMap {
 
 		constexpr HashMap &operator=(const HashMap &other);
 
-		constexpr HashMap &operator=(HashMap &&other) noexcept;
+		constexpr HashMap &operator=(HashMap &&other);
 
 		/**
 		 * K is assumed to be a null terminated string.
@@ -135,7 +135,7 @@ constexpr HashMap<K, T> &HashMap<K, T>::operator=(const HashMap<K, T> &other) {
 }
 
 template<typename K, typename T>
-constexpr HashMap<K, T> &HashMap<K, T>::operator=(HashMap<K, T> &&other) noexcept {
+constexpr HashMap<K, T> &HashMap<K, T>::operator=(HashMap<K, T> &&other) {
 	if (this != &other) {
 		clear();
 		m_keys = std::move(other.m_keys);

deps/ox/src/ox/std/memory.hpp

@@ -222,13 +222,13 @@ class UniquePtr {
 		template<typename U>
 		constexpr UniquePtr &operator=(const UniquePtr<U> &other) = delete;
 
-		constexpr UniquePtr &operator=(UniquePtr<T> &&other) noexcept {
+		constexpr UniquePtr &operator=(UniquePtr<T> &&other) {
 			reset(std::move(other));
 			return *this;
 		}
 
 		template<typename U>
-		constexpr UniquePtr &operator=(UniquePtr<U> &&other) noexcept {
+		constexpr UniquePtr &operator=(UniquePtr<U> &&other) {
 			reset(std::move(other));
 			return *this;
 		}

deps/teagba/include/teagba/addresses.hpp

@@ -49,7 +49,7 @@ using BgCtl = uint16_t;
 #define REG_BG3CTL *reinterpret_cast<volatile BgCtl*>(0x0400'000e)
 
 [[nodiscard]]
-inline auto &regBgCtl(uintptr_t bgIdx) noexcept {
+inline auto &regBgCtl(auto bgIdx) noexcept {
 	return *reinterpret_cast<volatile BgCtl*>(0x0400'0008 + 2 * bgIdx);
 }
 

src/nostalgia/modules/core/include/nostalgia/core/ptidxconv.hpp

@@ -20,7 +20,7 @@ constexpr std::size_t ptToIdx(int x, int y, int c, int scale = 1) noexcept {
 	const auto colStart = static_cast<std::size_t>(colLength * static_cast<std::size_t>(x / tileWidth));
 	const auto rowStart = static_cast<std::size_t>(rowLength * static_cast<std::size_t>(y / tileHeight));
 	const auto colOffset = static_cast<std::size_t>(x % tileWidth);
-	const auto rowOffset = static_cast<std::size_t>((y % tileHeight) * tileHeight);
+	const auto rowOffset = static_cast<std::size_t>(static_cast<std::size_t>((y % tileHeight) * tileHeight));
 	return static_cast<std::size_t>(colStart + colOffset + rowStart + rowOffset);
 }
 

src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp

@@ -45,10 +45,8 @@ struct TileSheetV2 {
 		ox::Vector<uint8_t> pixels;
 		constexpr SubSheet() noexcept = default;
 		constexpr SubSheet(ox::CRStringView pName, int pColumns, int pRows, int bpp) noexcept:
-			name(pName),
-			columns(pColumns),
-			rows(pRows),
-			pixels(static_cast<size_t>(columns * rows * PixelsPerTile) / (bpp == 4 ? 2u : 1u)) {
+			name(pName), columns(pColumns), rows(pRows),
+            pixels(static_cast<std::size_t>(columns * rows * PixelsPerTile) / (bpp == 4 ? 2u : 1u)) {
 		}
 	};