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

Merge branch 'romhack' into lighting

Browse source
This commit is contained in:
Ariel Antonitis 2021-06-15 18:28:35 -04:00
commit ba2d394109
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -280,6 +280,11 @@ ifeq ($(DINFO),1)
override CFLAGS += -g override CFLAGS += -g
endif endif
ifeq ($(DDEBUG),1)
override ASFLAGS += --defsym DEBUG=1
override CPPFLAGS += -D DEBUG=1
endif
$(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep) $(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep)
@$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i @$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i
@$(PREPROC) $(C_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(C_BUILDDIR)/$*.s @$(PREPROC) $(C_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(C_BUILDDIR)/$*.s

15
gflib/sprite.c
View file

@ -1673,11 +1673,16 @@ u16 GetSpritePaletteTagByPaletteNum(u8 paletteNum)
void FreeSpritePaletteByTag(u16 tag) void FreeSpritePaletteByTag(u16 tag)
{ {
u8 index = IndexOfSpritePaletteTag(tag); u8 index = IndexOfSpritePaletteTag(tag);
u16 emptyPalette[16] = {0}; #if DEBUG
if (index != 0xFF) { u16 emptyPalette[16] = {0};
sSpritePaletteTags[index] = 0xFFFF; if (index != 0xFF) {
LoadPalette(emptyPalette, index * 16 + 0x100, 32); // TODO: For debugging only sSpritePaletteTags[index] = 0xFFFF;
} LoadPalette(emptyPalette, index * 16 + 0x100, 32);
}
#else
if (index != 0xFF)
sSpritePaletteTags[index] = 0xFFFF;
#endif
} }
void SetSubspriteTables(struct Sprite *sprite, const struct SubspriteTable *subspriteTables) void SetSubspriteTables(struct Sprite *sprite, const struct SubspriteTable *subspriteTables)

2
remote_build.sh
View file

@ -11,5 +11,5 @@ set -x
git push build --force git push build --force
# `nproc` must be escaped so that it executes on the remote machine # `nproc` must be escaped so that it executes on the remote machine
ssh $remote_host "cd $remote_path && git reset --hard && git checkout $git_branch && \ ssh $remote_host "cd $remote_path && git reset --hard && git checkout $git_branch && \
echo \"Using \`nproc\` job(s)\" && make -j\`nproc\`" echo \"Using \`nproc\` job(s)\" && make DDEBUG=1 -j\`nproc\`"
scp "$remote_host:$remote_path/pokeemerald.gba" romhack.gba scp "$remote_host:$remote_path/pokeemerald.gba" romhack.gba