mirror of
https://github.com/zeldaret/st
synced 2026-08-15 12:58:54 -04:00
Remove ARM and THUMB macros (#87)
* remove ARM and THUMB macros * fix regressions
This commit is contained in:
@@ -11,13 +11,6 @@
|
||||
#include "types.h"
|
||||
#include "versions.h"
|
||||
|
||||
// some functions use thumb mode on the japanese version (only in overlay 40?)
|
||||
#if IS_JP
|
||||
#define OV040_ARM THUMB
|
||||
#else
|
||||
#define OV040_ARM ARM
|
||||
#endif
|
||||
|
||||
class ActorParams {
|
||||
public:
|
||||
/* 00 */ VecFx32 mInitialPos;
|
||||
|
||||
@@ -94,7 +94,7 @@ public:
|
||||
/* 00 */ VecFx32 mUnk_00;
|
||||
/* 0C */
|
||||
|
||||
ARM UnkStruct_ov110_021861ec(fx32 x, fx32 y, fx32 z) {
|
||||
UnkStruct_ov110_021861ec(fx32 x, fx32 y, fx32 z) {
|
||||
this->mUnk_00.x = x;
|
||||
this->mUnk_00.y = y;
|
||||
this->mUnk_00.z = z;
|
||||
|
||||
+3
-3
@@ -5,10 +5,10 @@
|
||||
#ifdef __INTELLISENSE__
|
||||
#endif
|
||||
|
||||
#define ARM _Pragma("thumb off")
|
||||
#define THUMB _Pragma("thumb on")
|
||||
|
||||
// start of thumb region, using thumb instructions
|
||||
#define THUMB_BEGIN _Pragma("thumb on")
|
||||
|
||||
// end of thumb region, using arm instructions
|
||||
#define THUMB_END _Pragma("thumb off")
|
||||
|
||||
// `override` was added in C++11 before the DS, so we only use the keyword to indicate overriden functions
|
||||
|
||||
Reference in New Issue
Block a user