Merge branch 'Rainchus:main' into main

This commit is contained in:
CreateSource 2023-12-06 19:31:49 -05:00 committed by GitHub
commit e9b8b565d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 144 additions and 9 deletions

View file

@ -3,9 +3,7 @@
#include "game/printfunc.h"
#include "dolphin/pad.h"
//HACK: Force 0.5 and 3.0 double constants to appear in REL
const double _half = 0.5;
const double _three = 3.0;
#include "math.h"
static void SubchrMain(void);

View file

@ -1,6 +1,8 @@
#include "include/REL/w10Dll.h"
#include "game/data.h"
#include "math.h"
//BSS
s16 lbl_1_bss_22[11];
s16 lbl_1_bss_20;
@ -58,11 +60,6 @@ s32 lbl_1_data_6C[2] = {
DATA_NUM_LISTEND
};
//RODATA
//HACK: Force 0.5 and 3.0 double constants to appear in REL
const double _half = 0.5;
const double _three = 3.0;
// function is probably global. only inlined in rels?
inline s32 get_current_board(void) {
return GWSystem.unk08 & 0x1F;