atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

consistency

Browse source
This commit is contained in:
ProjectRevoTPP 2018-01-06 22:00:08 -05:00
parent 419e6d885b
commit 10ddfac7ab
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/config.h
View file

@ -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.

3
include/global.h
View file

@ -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("");

3
src/libisagbprn.c
View file

@ -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)