From 2cc1a64fe4bb3f9e285e15daa6dbd878101f247e Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 18 Jul 2020 03:24:52 -0400 Subject: [PATCH] flags --- papermario/Makefile | 2 +- papermario/src/code_fe0b0_len_5a0.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/papermario/Makefile b/papermario/Makefile index 07b1fc6f60..c17907663d 100644 --- a/papermario/Makefile +++ b/papermario/Makefile @@ -49,7 +49,7 @@ OBJCOPY = $(CROSS)objcopy CPPFLAGS = -Iinclude -D _LANGUAGE_C ASFLAGS = -EB -march=vr4300 -mtune=vr4300 -CFLAGS = -O2 -quiet -G 0 +CFLAGS = -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 LDFLAGS = -T undefined_syms.txt -T $(LD_SCRIPT) -Map $(BUILD_DIR)/papermario.map --no-check-sections ######################## Targets ############################# diff --git a/papermario/src/code_fe0b0_len_5a0.c b/papermario/src/code_fe0b0_len_5a0.c index 669e2e1039..a0e92d9295 100644 --- a/papermario/src/code_fe0b0_len_5a0.c +++ b/papermario/src/code_fe0b0_len_5a0.c @@ -40,7 +40,7 @@ void __attribute__((naked)) DemoJoystickRadial(void) { ".include \"asm/code_fe0b0_len_5a0/DemoJoystickRadial.s\"\n" ); } -/*s32 DemoJoysticRadial(ScriptContext* script) { +/*s32 DemoJoystickRadial(ScriptContext* script) { float a; float b; s32* nextPos = script->ptrReadPos + 1; @@ -48,8 +48,8 @@ void __attribute__((naked)) DemoJoystickRadial(void) { a = get_float_variable(script, *script->ptrReadPos); b = get_float_variable(script, nextPos); - gGameStatus->demoStickX = a * sin_deg(b); - gGameStatus->demoStickY = a * cos_deg(b); + gGameStatus->demoStickX = (s32)(a * sin_deg(b)); + gGameStatus->demoStickY = (s32)(a * cos_deg(b)); return 2; }*/