diff --git a/Makefile b/Makefile index d39ce7fb..7f4c64f5 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ rgbfix: $(rgbfix_obj) ${CC} $(cflags) -o $@ $(rgbfix_obj) .c.o: - ${CC} $(cflags) -DGAMEBOY -c -o $@ $< + ${CC} $(cflags) -c -o $@ $< src/asm/asmy.c: src/asm/asmy.y ${YACC} -d -o $@ $< diff --git a/include/asm/rpn.h b/include/asm/rpn.h index 59194351..3c224ae4 100644 --- a/include/asm/rpn.h +++ b/include/asm/rpn.h @@ -77,11 +77,6 @@ void rpn_Reset(struct Expression * expr); int rpn_RangeCheck(struct Expression * expr, struct Expression * src, SLONG low, SLONG high); -#ifdef GAMEBOY void rpn_CheckHRAM(struct Expression * expr, struct Expression * src1); -#endif -#ifdef PCENGINE -void rpn_CheckZP(struct Expression * expr, struct Expression * src); -#endif #endif diff --git a/src/asm/globlex.c b/src/asm/globlex.c index 62589377..6309b4be 100644 --- a/src/asm/globlex.c +++ b/src/asm/globlex.c @@ -317,15 +317,11 @@ struct sLexInitString staticstrings[] = { {"endc", T_POP_ENDC}, {"bss", T_SECT_BSS}, -#if defined(GAMEBOY) || defined(PCENGINE) {"vram", T_SECT_VRAM}, -#endif {"code", T_SECT_CODE}, {"data", T_SECT_CODE}, -#ifdef GAMEBOY {"home", T_SECT_HOME}, {"hram", T_SECT_HRAM}, -#endif {NAME_RB, T_POP_RB}, {NAME_RW, T_POP_RW}, diff --git a/src/asm/rpn.c b/src/asm/rpn.c index ab17952e..fadf7015 100644 --- a/src/asm/rpn.c +++ b/src/asm/rpn.c @@ -188,23 +188,12 @@ rpn_RangeCheck(struct Expression * expr, struct Expression * src, SLONG low, return (expr->nVal >= low && expr->nVal <= high); } } -#ifdef GAMEBOY void rpn_CheckHRAM(struct Expression * expr, struct Expression * src) { *expr = *src; pushbyte(expr, RPN_HRAM); } -#endif - -#ifdef PCENGINE -void -rpn_CheckZP(struct Expression * expr, struct Expression * src) -{ - *expr = *src; - pushbyte(expr, RPN_PCEZP); -} -#endif void rpn_LOGNOT(struct Expression * expr, struct Expression * src)