ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix build errors

Browse Source
This commit is contained in:
YamaArashi 2017-04-05 13:51:55 -07:00
parent b95747dc69
commit e0dd5ef9a7
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -87,22 +87,28 @@ src/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork
src/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc src/m4a_2.o: CC1 := tools/agbcc/bin/old_agbcc
src/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc src/m4a_4.o: CC1 := tools/agbcc/bin/old_agbcc
$(C_OBJS): %.o : %.c ifeq ($(NODEP),)
%.o: c_dep = $(shell $(SCANINC) $*.c)
else
%.o: c_dep :=
endif
$(C_OBJS): %.o : %.c $$(c_dep)
@$(CPP) $(CPPFLAGS) $< -o $*.i @$(CPP) $(CPPFLAGS) $< -o $*.i
@$(PREPROC) $*.i charmap.txt | $(CC1) $(CFLAGS) -o $*.s @$(PREPROC) $*.i charmap.txt | $(CC1) $(CFLAGS) -o $*.s
@echo -e ".text\n\t.align\t2, 0\n" >> $*.s @echo -e ".text\n\t.align\t2, 0\n" >> $*.s
$(AS) $(ASFLAGS) -o $@ $*.s $(AS) $(ASFLAGS) -o $@ $*.s
ifeq ($(NODEP),) ifeq ($(NODEP),)
%.o: dep = $(shell $(SCANINC) $*.s) %.o: asm_dep = $(shell $(SCANINC) $*.s)
else else
%.o: dep := %.o: asm_dep :=
endif endif
$(ASM_OBJS): %.o: %.s $$(dep) $(ASM_OBJS): %.o: %.s $$(asm_dep)
$(AS) $(ASFLAGS) -o $@ $< $(AS) $(ASFLAGS) -o $@ $<
$(DATA_ASM_OBJS): %.o: %.s $$(dep) $(DATA_ASM_OBJS): %.o: %.s $$(asm_dep)
$(PREPROC) $< charmap.txt | $(AS) $(ASFLAGS) -o $@ $(PREPROC) $< charmap.txt | $(AS) $(ASFLAGS) -o $@
sym_bss.ld: sym_bss.txt sym_bss.ld: sym_bss.txt

7
include/text.h
View File

@ -73,13 +73,6 @@ struct FontInfo
u8 shadowColor:4; u8 shadowColor:4;
}; };
struct Bitmap // TODO: Find a better spot for this
{
u8* pixels;
u32 width:16;
u32 height:16;
};
struct GlyphWidthFunc{ struct GlyphWidthFunc{
u32 font_id; u32 font_id;
u32 (*func)(u16 glyphId, bool32 isJapanese); u32 (*func)(u16 glyphId, bool32 isJapanese);

4
src/text.c
View File

@ -1771,8 +1771,8 @@ void ClearTextSpan(struct TextPrinter *textPrinter, u32 width)
{ {
window = &gWindows[textPrinter->subPrinter.windowId]; window = &gWindows[textPrinter->subPrinter.windowId];
pixels_data.pixels = window->tileData; pixels_data.pixels = window->tileData;
pixels_data.width = window->width << 3; pixels_data.width = window->window.width << 3;
pixels_data.height = window->height << 3; pixels_data.height = window->window.height << 3;
gUnk = gUnknown_03002F90; gUnk = gUnknown_03002F90;
glyphHeight = &gUnk[0x81]; glyphHeight = &gUnk[0x81];