Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ else
CC1 := $(shell $(PATH_MODERNCC) --print-prog-name=cc1) -quiet
LIBPATH := -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libnosys.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libc.a))"
LIB := $(LIBPATH) -lc -lnosys -lgcc -L../../libagbsyscall -lagbsyscall
override CC1FLAGS += -mthumb -mthumb-interwork -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -Wimplicit -Wparentheses -Wunused -Werror -O2
override CC1FLAGS += -mthumb -mthumb-interwork -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -Wimplicit -Wparentheses -Wunused -Werror -O2 -g
INCLUDE_DIRS := include
INCLUDE_CPP_ARGS := $(INCLUDE_DIRS:%=-iquote %)
INCLUDE_PATHS := $(INCLUDE_DIRS:%=-I %)
Expand Down
14 changes: 0 additions & 14 deletions include/code_800558C.h

This file was deleted.

2 changes: 1 addition & 1 deletion include/text_1.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ extern void (*ScrollUpWindowFunc)(s32 windowId);
extern void (*gIwramTextFunc3)(s32 a0);
extern void (*gIwramTextFunc4)(s32 a0);

extern s16 gUnknown_3000E94[161];
extern s16 gWindowBg[161];

extern const u32 gUnknown_80B853C[16];
extern const unkShiftData gCharMasksOffsets[8];
Expand Down
2 changes: 1 addition & 1 deletion include/text_2.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ void sub_8007B7C(u32 a0, s32 x, s32 y, s32 a3, u32 color);
// srcGFX: Each u32 is 8 packed pixels, 4 bits per pixel.
void WriteGFXToBG0Window(u32 winID, u32 x, u32 y, u32 w, u32 h, u32 *srcGFX, u32 palNum);
void sub_80087EC(s32 a0, s32 a1, s32 a2, s32 a3, s32 a4);
void sub_80089AC(const WindowTemplate *r4, DungeonPos *r5_Str);
void DrawWindowBg(const WindowTemplate *window, DungeonPos *pos);
u32 DrawCharOnWindow(s32 x, s32 y, u32 chr, u32 color, u32 windowId);
bool8 xxx_call_update_bg_vram(void);
u32 DrawCharOnWindowInternal(Window *windows, s32 x, s32 y, u32 chr, u32 color, u32 windowId);
Expand Down
23 changes: 23 additions & 0 deletions include/window_buffer.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#ifndef GUARD_WINDOW_BUFFER_H
#define GUARD_WINDOW_BUFFER_H

extern bool8 gDrawWindow;
extern s16 *gWinBufferPtr;
extern s16 gUnknown_2026E4E;

extern s16 *gWindowBgCopy;

typedef enum CopyWindowBgBufferType {
COPY_WINDOW_BG_BUFFER_WIN0,
COPY_WINDOW_BG_BUFFER_DIM2, // Dim while in light darkness corridor
COPY_WINDOW_BG_BUFFER_DIM1, // Same but for heavy darkness
COPY_WINDOW_BG_BUFFER_ROOM_DIM, // While in a room, dim outside
COPY_WINDOW_BG_BUFFER_UNK4,
COPY_WINDOW_BG_BUFFER_UNK5,
} CopyWindowBgBufferType;

void WindowBgBufferInit(void);
void CopyWindowBgBuffer(s32 *pos, u8 kind);
void ToggleWindowBgBuffer(void);

#endif // GUARD_WINDOW_BUFFER_H
4 changes: 2 additions & 2 deletions ld_script.ld
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ SECTIONS {
src/input.o(.text);
src/code_8004AA0.o(.text);
src/sprite.o(.text);
src/code_800558C.o(.text);
src/window_buffer.o(.text);
src/random.o(.text);
src/text_1.o(.text);
src/text_2.o(.text);
Expand Down Expand Up @@ -440,7 +440,7 @@ SECTIONS {
src/input.o(.rodata);
src/code_8004AA0.o(.rodata);
src/sprite.o(.rodata);
src/code_800558C.o(.rodata);
src/window_buffer.o(.rodata);
src/random.o(.rodata);
src/text_1.o(.rodata);
src/text_2.o(.rodata);
Expand Down
Loading