From 44214ab2b81add562b05cb7dd47401da27a296f2 Mon Sep 17 00:00:00 2001 From: Ted John Date: Mon, 12 Sep 2016 20:43:43 +0100 Subject: [PATCH] Integrate gCurrentFont fully --- src/addresses.h | 5 ++--- src/drawing/drawing.c | 5 +++-- src/drawing/drawing.h | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/addresses.h b/src/addresses.h index 3a0072789a..4a5f81f901 100644 --- a/src/addresses.h +++ b/src/addresses.h @@ -93,9 +93,6 @@ #define RCT2_ADDRESS_SAVED_VIEW_ZOOM 0x0138869E #define RCT2_ADDRESS_SAVED_VIEW_ROTATION 0x0138869F -#define RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE 0x013CE950 -#define RCT2_ADDRESS_CURRENT_FONT_FLAGS 0x013CE9A2 - #define RCT2_ADDRESS_TILE_MAP_ELEMENT_POINTERS 0x013CE9A4 #define RCT2_ADDRESS_CURRENT_ROTATION 0x0141E9E0 @@ -514,6 +511,8 @@ #define RCT2_ADDRESS_CURRENT_RAIN_LEVEL 0x013CA752 #define RCT2_ADDRESS_NEXT_RAIN_LEVEL 0x013CA753 #define RCT2_ADDRESS_NEWS_ITEM_LIST 0x013CA754 +#define RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE 0x013CE950 +#define RCT2_ADDRESS_CURRENT_FONT_FLAGS 0x013CE9A2 #define RCT2_ADDRESS_COMMON_FORMAT_ARGS 0x013CE952 diff --git a/src/drawing/drawing.c b/src/drawing/drawing.c index e2d1204ac1..2d7a0e232d 100644 --- a/src/drawing/drawing.c +++ b/src/drawing/drawing.c @@ -26,6 +26,9 @@ int gLastDrawStringX; int gLastDrawStringY; +sint16 gCurrentFontSpriteBase; +uint16 gCurrentFontFlags; + uint8 gGamePalette[256 * 4]; uint32 gPaletteEffectFrame; @@ -38,8 +41,6 @@ void *unk_9E3CDC; void *unk_9E3CE4[8]; #ifdef NO_RCT2 rct_drawpixelinfo *unk_140E9A8; -sint16 gCurrentFontSpriteBase; -uint16 gCurrentFontFlags; #endif /** diff --git a/src/drawing/drawing.h b/src/drawing/drawing.h index 6e3bce7e38..32650b07b7 100644 --- a/src/drawing/drawing.h +++ b/src/drawing/drawing.h @@ -121,13 +121,8 @@ typedef struct rct_palette { #define PALETTE_TO_G1_OFFSET_COUNT 144 -#ifndef NO_RCT2 -#define gCurrentFontSpriteBase RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE, sint16) -#define gCurrentFontFlags RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_FONT_FLAGS, uint16) -#else extern sint16 gCurrentFontSpriteBase; extern uint16 gCurrentFontFlags; -#endif extern uint8 gGamePalette[256 * 4]; extern uint32 gPaletteEffectFrame;