consistency
This commit is contained in:
+2
-2
@@ -4,10 +4,10 @@
|
|||||||
// In the Generation 3 games, Asserts were used in various debug builds.
|
// In the Generation 3 games, Asserts were used in various debug builds.
|
||||||
// Ruby/Sapphire and Emerald do not have these asserts while Fire Red
|
// Ruby/Sapphire and Emerald do not have these asserts while Fire Red
|
||||||
// still has them in the ROM. This is because the developers forgot
|
// still has them in the ROM. This is because the developers forgot
|
||||||
// to define NOAGBPRN before release, which is actually supposed to be
|
// to define NDEBUG before release, which is actually supposed to be
|
||||||
// NDEBUG, however this has been changed as Ruby's actual debug build
|
// NDEBUG, however this has been changed as Ruby's actual debug build
|
||||||
// does not use the AGBPrint features.
|
// does not use the AGBPrint features.
|
||||||
#define NOAGBPRN
|
#define NDEBUG
|
||||||
// NOTE: Don't try to enable assert right now as many pointers
|
// NOTE: Don't try to enable assert right now as many pointers
|
||||||
// still exist in defines and WILL likely result in a broken ROM.
|
// still exist in defines and WILL likely result in a broken ROM.
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -1,9 +1,8 @@
|
|||||||
#ifndef GUARD_GLOBAL_H
|
#ifndef GUARD_GLOBAL_H
|
||||||
#define GUARD_GLOBAL_H
|
#define GUARD_GLOBAL_H
|
||||||
|
|
||||||
|
#include "config.h" // we need to define config before gba headers as print stuff needs the functions nulled before defines.
|
||||||
#include "gba/gba.h"
|
#include "gba/gba.h"
|
||||||
#include "config.h"
|
|
||||||
#include "assert.h"
|
|
||||||
|
|
||||||
// Prevent cross-jump optimization.
|
// Prevent cross-jump optimization.
|
||||||
#define BLOCK_CROSS_JUMP asm("");
|
#define BLOCK_CROSS_JUMP asm("");
|
||||||
|
|||||||
+1
-2
@@ -2,7 +2,6 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "gba/gba.h"
|
#include "gba/gba.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "assert.h"
|
|
||||||
|
|
||||||
#define AGB_PRINT_FLUSH_ADDR 0x9FE209D
|
#define AGB_PRINT_FLUSH_ADDR 0x9FE209D
|
||||||
#define AGB_PRINT_STRUCT_ADDR 0x9FE20F8
|
#define AGB_PRINT_STRUCT_ADDR 0x9FE20F8
|
||||||
@@ -25,7 +24,7 @@ struct AGBPrintStruct
|
|||||||
|
|
||||||
typedef void (*LPFN_PRINT_FLUSH)(void);
|
typedef void (*LPFN_PRINT_FLUSH)(void);
|
||||||
|
|
||||||
#ifndef NOAGBPRN
|
#ifndef NDEBUG
|
||||||
void AGBPrintFlush1Block(void);
|
void AGBPrintFlush1Block(void);
|
||||||
|
|
||||||
void AGBPrintInit(void)
|
void AGBPrintInit(void)
|
||||||
|
|||||||
Reference in New Issue
Block a user