etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-21 19:45:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix GRUCODE defines

Browse source
This commit is contained in:
fgsfds 2020-06-20 04:32:12 +03:00
parent 5053446f45
commit fe44da4794
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Makefile
View file

@ -10,12 +10,12 @@ default: all
# These options can either be changed by modifying the makefile, or # These options can either be changed by modifying the makefile, or
# by building with 'make SETTING=value'. 'make clean' may be required. # by building with 'make SETTING=value'. 'make clean' may be required.
# Build debug version (default) # Build debug version
DEBUG ?= 1 DEBUG ?= 0
# Version of the game to build # Version of the game to build
VERSION ?= us VERSION ?= us
# Graphics microcode used # Graphics microcode used
GRUCODE ?= f3d_old GRUCODE ?= f3dex2e
# If COMPARE is 1, check the output sha1sum when building 'all' # If COMPARE is 1, check the output sha1sum when building 'all'
COMPARE ?= 1 COMPARE ?= 1
# If NON_MATCHING is 1, define the NON_MATCHING and AVOID_UB macros when building (recommended) # If NON_MATCHING is 1, define the NON_MATCHING and AVOID_UB macros when building (recommended)
@ -72,8 +72,6 @@ BASEPACK ?= base.zip
# Automatic settings for PC port(s) # Automatic settings for PC port(s)
NON_MATCHING := 1
GRUCODE := f3dex2e
WINDOWS_BUILD ?= 0 WINDOWS_BUILD ?= 0
# Attempt to detect OS # Attempt to detect OS
@ -116,20 +114,16 @@ endif
ifeq ($(VERSION),jp) ifeq ($(VERSION),jp)
VERSION_DEF := VERSION_JP VERSION_DEF := VERSION_JP
GRUCODE_DEF := F3D_OLD
else else
ifeq ($(VERSION),us) ifeq ($(VERSION),us)
VERSION_DEF := VERSION_US VERSION_DEF := VERSION_US
GRUCODE_DEF := F3D_OLD
else else
ifeq ($(VERSION),eu) ifeq ($(VERSION),eu)
VERSION_DEF := VERSION_EU VERSION_DEF := VERSION_EU
GRUCODE_DEF := F3D_NEW
else else
ifeq ($(VERSION),sh) ifeq ($(VERSION),sh)
$(warning Building SH is experimental and is prone to breaking. Try at your own risk.) $(warning Building SH is experimental and is prone to breaking. Try at your own risk.)
VERSION_DEF := VERSION_SH VERSION_DEF := VERSION_SH
GRUCODE_DEF := F3D_NEW
# TODO: GET RID OF THIS!!! We should mandate assets for Shindou like EU but we dont have the addresses extracted yet so we'll just pretend you have everything extracted for now. # TODO: GET RID OF THIS!!! We should mandate assets for Shindou like EU but we dont have the addresses extracted yet so we'll just pretend you have everything extracted for now.
NOEXTRACT := 1 NOEXTRACT := 1
else else
@ -159,14 +153,14 @@ ifeq ($(GRUCODE),f3dex) # Fast3DEX
TARGET := $(TARGET).f3dex TARGET := $(TARGET).f3dex
COMPARE := 0 COMPARE := 0
else else
ifeq ($(GRUCODE), f3dex2) # Fast3DEX2 ifeq ($(GRUCODE),f3dex2) # Fast3DEX2
GRUCODE_DEF := F3DEX_GBI_2 GRUCODE_DEF := F3DEX_GBI_2
GRUCODE_ASFLAGS := --defsym F3DEX_GBI_SHARED=1 GRUCODE_ASFLAGS := --defsym F3DEX_GBI_SHARED=1
TARGET := $(TARGET).f3dex2 TARGET := $(TARGET).f3dex2
COMPARE := 0 COMPARE := 0
else else
ifeq ($(GRUCODE), f3dex2e) # Fast3DEX2 Extended (PC default) ifeq ($(GRUCODE),f3dex2e) # Fast3DEX2 Extended (PC default)
GRUCODE_CFLAGS := -DF3DEX_GBI_2E GRUCODE_DEF := F3DEX_GBI_2E
TARGET := $(TARGET).f3dex2e TARGET := $(TARGET).f3dex2e
COMPARE := 0 COMPARE := 0
else else

2
src/game/hud.c
View file

@ -14,6 +14,7 @@
#include "area.h" #include "area.h"
#include "save_file.h" #include "save_file.h"
#include "print.h" #include "print.h"
#include "pc/configfile.h"
/* @file hud.c /* @file hud.c
* This file implements HUD rendering and power meter animations. * This file implements HUD rendering and power meter animations.
@ -58,7 +59,6 @@ static struct UnusedHUDStruct sUnusedHUDValues = { 0x00, 0x0A, 0x00 };
static struct CameraHUD sCameraHUD = { CAM_STATUS_NONE }; static struct CameraHUD sCameraHUD = { CAM_STATUS_NONE };
extern bool configHUD;
/** /**
* Renders a rgba16 16x16 glyph texture from a table list. * Renders a rgba16 16x16 glyph texture from a table list.
*/ */

2
src/pc/gfx/gfx_pc.c
View file

@ -38,6 +38,8 @@
#define SCALE_3_8(VAL_) ((VAL_) * 0x24) #define SCALE_3_8(VAL_) ((VAL_) * 0x24)
#define SCALE_8_3(VAL_) ((VAL_) / 0x24) #define SCALE_8_3(VAL_) ((VAL_) / 0x24)
#define SCREEN_WIDTH 320
#define SCREEN_HEIGHT 240
#define HALF_SCREEN_WIDTH (SCREEN_WIDTH / 2) #define HALF_SCREEN_WIDTH (SCREEN_WIDTH / 2)
#define HALF_SCREEN_HEIGHT (SCREEN_HEIGHT / 2) #define HALF_SCREEN_HEIGHT (SCREEN_HEIGHT / 2)