diff --git a/src/sm_8b.c b/src/sm_8b.c index 5c9a4b1..f86c967 100644 --- a/src/sm_8b.c +++ b/src/sm_8b.c @@ -4274,10 +4274,8 @@ void CinematicFunction_Intro_Func57(uint16 j) { // 0x8BBE7E } void CinematicFunction_Intro_Func58(uint16 k) { // 0x8BBEB5 - char v3; // t0 unsigned int v8; // kr08_4 unsigned int v9; // kr0C_4 - uint16 v4; if (cinematic_function == FUNC16(CinematicFunction_Intro_Func56)) { int v1 = k >> 1; @@ -6153,9 +6151,7 @@ void CinematicFunction_Intro_Func127(void) { // 0x8BE7BB void CinematicFunction_Intro_Func149(void) { // 0x8BE812 int16 v2; int16 v5; - int16 v7; int16 v8; - int16 v11; int16 v12; int16 v17; OamEnt *v18; diff --git a/src/sm_9b.c b/src/sm_9b.c index b857c99..737db9c 100644 --- a/src/sm_9b.c +++ b/src/sm_9b.c @@ -633,10 +633,6 @@ void GrappleBeamFunc_BD44(void) { // 0x9BBD44 } void GrappleBeamFunc_BD95(void) { // 0x9BBD95 - int16 v4; - int16 v5; - int16 v6; - uint16 v0 = abs16(grapple_beam_unkD26); uint16 v1; diff --git a/src/variables.h b/src/variables.h index 01c073b..e5db5da 100644 --- a/src/variables.h +++ b/src/variables.h @@ -1,3 +1,9 @@ +#ifndef SM_VARIABLES_H_ +#define SM_VARIABLES_H_ +#include "types.h" + +extern uint8 g_ram[0x20000]; + #define R0_ (*(LongPtr*)(g_ram+0x0)) #define R3_ (*(LongPtr*)(g_ram+0x3)) #define R6_ (*(uint16*)(g_ram+0x6)) @@ -1161,3 +1167,5 @@ #include "variables_extra.h" #define ADDR16_OF_RAM(x) ((uint8*)&(x) - g_ram) + +#endif // SM_VARIABLES_H_