bg_window stuff + update nitrogfx

pret · Jul 3, 2023 · 3a571c9 · 3a571c9
1 parent 5058226
commit 3a571c9
Show file tree

Hide file tree

Showing 43 changed files with 4,847 additions and 352 deletions.
diff --git a/include/battle_arcade_game_board.h b/include/battle_arcade_game_board.h
@@ -8,7 +8,7 @@
 #include "player_data.h"
 #include "save.h"
 #include "save_frontier.h"
-#include "window.h"
+#include "bg_window.h"
 #include "unk_02009D48.h"
 #include "unk_02023694.h"
 

diff --git a/include/battle_input.h b/include/battle_input.h
@@ -4,7 +4,7 @@
 #include "battle_system.h"
 #include "battle_cursor.h"
 #include "battle_finger.h"
-#include "window.h"
+#include "bg_window.h"
 #include "unk_0200E320.h"
 
 typedef struct BattleInputMainScreen {

diff --git a/include/window.h → include/bg_window.h b/include/window.h → include/bg_window.h
@@ -1,6 +1,7 @@
-#ifndef POKEHEARTGOLD_WINDOW_H
-#define POKEHEARTGOLD_WINDOW_H
+#ifndef POKEHEARTGOLD_BG_WINDOW_H
+#define POKEHEARTGOLD_BG_WINDOW_H
 
+#include "global.h"
 #include "heap.h"
 #include "gx_layers.h"
 
@@ -232,4 +233,4 @@ void ScheduleSetBgPosText(BgConfig *bgConfig, u8 layer, enum BgPosAdjustOp op, f
 void ScheduleSetBgAffineScale(BgConfig *bgConfig, u8 layer, enum BgPosAdjustOp op, fx32 value);
 BOOL DoesPixelAtScreenXYMatchPtrVal(BgConfig *bgConfig, u8 layer, u8 x, u8 y, u16 *src);
 
-#endif //POKEHEARTGOLD_WINDOW_H
+#endif //POKEHEARTGOLD_BG_WINDOW_H
diff --git a/include/credits/data.h b/include/credits/data.h
@@ -2,7 +2,7 @@
 #define POKEHEARTGOLD_CREDITS_DATA_H
 
 #include "gx_layers.h"
-#include "window.h"
+#include "bg_window.h"
 #include "credits/credits.h"
 
 typedef struct {

diff --git a/include/field_system.h b/include/field_system.h
@@ -9,7 +9,7 @@
 #include "save_pokegear.h"
 #include "unk_0200E320.h"
 #include "unk_02022D74.h"
-#include "window.h"
+#include "bg_window.h"
 
 typedef struct FieldSystem FieldSystem;
 typedef struct TaskManager TaskManager;

diff --git a/include/font_types_def.h b/include/font_types_def.h
@@ -2,7 +2,7 @@
 #define POKEHEARTGOLD_FONT_TYPES_DEF_H
 
 #include "pm_string.h"
-#include "window.h"
+#include "bg_window.h"
 
 typedef u8 FontID;
 struct FontData;

diff --git a/include/gf_gfx_loader.h b/include/gf_gfx_loader.h
@@ -2,7 +2,7 @@
 #define POKEHEARTGOLD_GF_GFX_LOADER_H
 
 #include "filesystem.h"
-#include "window.h"
+#include "bg_window.h"
 
 // These functions load (perhap-compressed) graphics resources to VRAM.
 // A temporary file handle is used to read the data from the card.

diff --git a/include/list_menu.h b/include/list_menu.h
@@ -3,7 +3,7 @@
 
 #include "list_menu_cursor.h"
 #include "list_menu_items.h"
-#include "window.h"
+#include "bg_window.h"
 
 struct ListMenu;
 

diff --git a/include/list_menu_cursor.h b/include/list_menu_cursor.h
@@ -1,7 +1,7 @@
 #ifndef POKEHEARTGOLD_LIST_MENU_CURSOR_H
 #define POKEHEARTGOLD_LIST_MENU_CURSOR_H
 
-#include "window.h"
+#include "bg_window.h"
 
 struct ListMenuCursor;
 

diff --git a/include/overlay_01_021EDAFC.h b/include/overlay_01_021EDAFC.h
@@ -2,7 +2,7 @@
 #define POKEHEARTGOLD_OVERLAY_01_021EDAFC_H
 
 #include "field_system.h"
-#include "window.h"
+#include "bg_window.h"
 
 void ov01_021EEC68(Window *window);
 void ov01_021EEC7C(FieldSystem *fsys, Window *window, u8 type);

diff --git a/include/render_window.h b/include/render_window.h
@@ -1,7 +1,7 @@
 #ifndef POKEHEARTGOLD_RENDER_WINDOW_H
 #define POKEHEARTGOLD_RENDER_WINDOW_H
 
-#include "window.h"
+#include "bg_window.h"
 
 typedef struct WaitingIcon WaitingIcon; //todo: copy from pokediamond
 struct PokepicManager;

diff --git a/include/script.h b/include/script.h
@@ -3,7 +3,7 @@
 
 #include "map_events_internal.h"
 #include "msgdata.h"
-#include "window.h"
+#include "bg_window.h"
 #include "field_player_avatar.h"
 #include "gear_phone.h"
 #include "save_pokegear.h"

diff --git a/include/text.h b/include/text.h
@@ -2,7 +2,7 @@
 #define POKEHEARTGOLD_TEXT_H
 
 #include "font_types_def.h"
-#include "window.h"
+#include "bg_window.h"
 #include "options.h"
 #include "text_0205B4EC.h"
 

diff --git a/include/text_0205B4EC.h b/include/text_0205B4EC.h
@@ -3,7 +3,7 @@
 
 #include "options.h"
 #include "pm_string.h"
-#include "window.h"
+#include "bg_window.h"
 
 void sub_0205B514(BgConfig *bgConfig, Window *window, int a2);
 void sub_0205B564(Window *window, OPTIONS *options);

diff --git a/include/unk_0201660C.h b/include/unk_0201660C.h
@@ -2,7 +2,7 @@
 #define POKEHEARTGOLD_UNK_0201660C_H
 
 #include "heap.h"
-#include "window.h"
+#include "bg_window.h"
 
 typedef struct Unk122_021E6900 {
  BgConfig *unk0;

diff --git a/include/unk_020183F0.h b/include/unk_020183F0.h
@@ -3,7 +3,7 @@
 
 #include "heap.h"
 #include "list_menu_items.h"
-#include "window.h"
+#include "bg_window.h"
 
 typedef struct Ov122_021E9282 {
  u16 unk0;

diff --git a/include/voltorb_flip/voltorb_flip_data.h b/include/voltorb_flip/voltorb_flip_data.h
@@ -3,7 +3,7 @@
 
 #include "unk_0200CF18.h"
 #include "unk_020183F0.h"
-#include "window.h"
+#include "bg_window.h"
 
 typedef struct Ov122_021E9278 {
  u8 unk0[5][2];

diff --git a/include/voltorb_flip/voltorb_flip_work.h b/include/voltorb_flip/voltorb_flip_work.h
@@ -6,7 +6,7 @@
 #include "options.h"
 #include "player_data.h"
 #include "unk_0200CF18.h"
-#include "window.h"
+#include "bg_window.h"
 #include "voltorb_flip/voltorb_flip_game.h"
 #include "voltorb_flip/voltorb_flip_input.h"
 

diff --git a/src/bg_window.c b/src/bg_window.c
@@ -1,4 +1,4 @@
-#include "window.h"
+#include "bg_window.h"
 #include "global.h"
 #include "math_util.h"
 
@@ -43,12 +43,12 @@ static void Bg_SetAffineScale(BG *bg, enum BgPosAdjustOp op, fx32 value);
 static void ApplyFlipFlagsToTile(BgConfig *bgConfig, u8 flags, u8 *tile);
 
 static const u8 sTilemapWidthByBufferSize[] = {
- 16, // GF_BG_SCR_SIZE_128x128
- 32, // GF_BG_SCR_SIZE_256x256
- 32, // GF_BG_SCR_SIZE_256x512
- 32, // GF_BG_SCR_SIZE_512x256
- 32, // GF_BG_SCR_SIZE_512x512
- 32, // GF_BG_SCR_SIZE_1024x1024
+ [GF_BG_SCR_SIZE_128x128] = 0x10,
+ [GF_BG_SCR_SIZE_256x256] = 0x20,
+ [GF_BG_SCR_SIZE_256x512] = 0x20,
+ [GF_BG_SCR_SIZE_512x256] = 0x20,
+ [GF_BG_SCR_SIZE_512x512] = 0x20,
+ [GF_BG_SCR_SIZE_1024x1024] = 0x20,
 };
 
 static void (*const sScheduleWindowCopyToVramFuncs[GF_BG_TYPE_MAX])(Window *window) = {

diff --git a/src/communication_error.c b/src/communication_error.c
@@ -6,7 +6,7 @@
 #include "pm_string.h"
 #include "system.h"
 #include "unk_0200FA24.h"
-#include "window.h"
+#include "bg_window.h"
 #include "font.h"
 #include "text.h"
 #include "render_window.h"

diff --git a/src/credits/credits.c b/src/credits/credits.c
@@ -15,7 +15,7 @@
 #include "unk_020215A0.h"
 #include "unk_02022588.h"
 #include "unk_02023694.h"
-#include "window.h"
+#include "bg_window.h"
 #include "constants/rgb.h"
 #include "constants/sndseq.h"
 #include "credits/credits.h"

diff --git a/src/error_message_reset.c b/src/error_message_reset.c
@@ -16,7 +16,7 @@
 #include "unk_0200B380.h"
 #include "text.h"
 #include "font.h"
-#include "window.h"
+#include "bg_window.h"
 
 static const GF_GXBanksConfig sErrorMessageBanksConfig = {
  .bg = GX_VRAM_BG_256_AB,

diff --git a/src/field/scrcmd_message.c b/src/field/scrcmd_message.c
@@ -11,7 +11,7 @@
 #include "script.h"
 #include "text.h"
 #include "text_0205B4EC.h"
-#include "window.h"
+#include "bg_window.h"
 
 typedef struct MessageBox {
  String *message;

diff --git a/src/game_clear.c b/src/game_clear.c
@@ -22,7 +22,7 @@
 #include "unk_0206793C.h"
 #include "unk_0206D494.h"
 #include "use_item_on_mon.h"
-#include "window.h"
+#include "bg_window.h"
 #include "constants/sndseq.h"
 #include "credits/credits.h"
 #include "msgdata/msg/msg_0040.h"

diff --git a/src/gf_gfx_loader.c b/src/gf_gfx_loader.c
@@ -1,5 +1,5 @@
 #include "gf_gfx_loader.h"
-#include "window.h"
+#include "bg_window.h"
 #include "nnsys.h"
 
 static u32 GfGfxLoader_LoadCharDataInternal(void *data, BgConfig *bgConfig, enum GFBgLayer layer, u32 tileStart, u32 szByte);

diff --git a/src/save_data_read_error.c b/src/save_data_read_error.c
@@ -9,7 +9,7 @@
 #include "save_data_read_error.h"
 #include "system.h"
 #include "unk_0200FA24.h"
-#include "window.h"
+#include "bg_window.h"
 #include "text.h"
 #include "font.h"
 #include "render_window.h"

diff --git a/src/save_data_write_error.c b/src/save_data_write_error.c
@@ -9,7 +9,7 @@
 #include "save_data_write_error.h"
 #include "system.h"
 #include "unk_0200FA24.h"
-#include "window.h"
+#include "bg_window.h"
 #include "font.h"
 #include "render_window.h"
 #include "unk_0200B380.h"

diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c
@@ -1,7 +1,7 @@
 #define _IN_SCRCMD_C
 
 #include "scrcmd.h"
-#include "window.h"
+#include "bg_window.h"
 #include "overlay_01.h"
 #include "overlay_26.h"
 #include "overlay_03.h"

diff --git a/src/voltorb_flip/voltorb_flip.c b/src/voltorb_flip/voltorb_flip.c
@@ -23,7 +23,7 @@
 #include "unk_020183F0.h"
 #include "unk_02023694.h"
 #include "unk_02025154.h"
-#include "window.h"
+#include "bg_window.h"
 #include "constants/sndseq.h"
 #include "msgdata/msg/msg_0039.h"
 #include "voltorb_flip/voltorb_flip.h"

diff --git a/src/voltorb_flip/voltorb_flip_data2.c b/src/voltorb_flip/voltorb_flip_data2.c
@@ -1,5 +1,5 @@
 #include "gx_layers.h"
-#include "window.h"
+#include "bg_window.h"
 #include "voltorb_flip/voltorb_flip.h"
 #include "voltorb_flip/voltorb_flip_data.h"
 

diff --git a/src/wfc_user_info_warning.c b/src/wfc_user_info_warning.c
@@ -7,7 +7,7 @@
 #include "system.h"
 #include "unk_0200FA24.h"
 #include "wfc_user_info_warning.h"
-#include "window.h"
+#include "bg_window.h"
 #include "render_window.h"
 #include "unk_0200B380.h"
 #include "text.h"

diff --git a/tools/nitrogfx/LICENSE b/tools/nitrogfx/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015 YamaArashi
+Copyright (c) 2015 YamaArashi, 2021-2023 red031000
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/tools/nitrogfx/Makefile b/tools/nitrogfx/Makefile
@@ -1,41 +1,28 @@
 CC = gcc
-LD = gcc
 
-CFLAGS = -Wall -Wextra -Werror -Wno-sign-compare -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK $(shell pkg-config --cflags libpng)
+HAVE_LIBPNG := $(shell pkg-config libpng; echo $?)
 
-LIBS = $(shell pkg-config --libs libpng)
+ifeq ($(HAVE_LIBPNG),1)
+$(error No package 'libpng' found)
+endif
 
-SRCS = main.c convert_png.c gfx.c jasc_pal.c lz.c rl.c util.c font.c huff.c
-OBJS = $(SRCS:%.c=%.o)
+CFLAGS = -Wall -Wextra -Werror -Wno-sign-compare -std=c11 -O2 -DPNG_SKIP_SETJMP_CHECK $(shell pkg-config --cflags libpng zlib)
 
-.PHONY: all clean
+LIBS = $(shell pkg-config --libs libpng zlib)
 
-DEPDIR := .deps
-DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$*.d
+SRCS = main.c convert_png.c gfx.c jasc_pal.c lz.c rl.c util.c font.c huff.c json.c cJSON.c
+OBJS = $(SRCS:%.c=%.o)
 
-ifneq ($(DEBUG),)
-CFLAGS += -DDEBUG
-endif
+.PHONY: all clean
 
 all: nitrogfx
  @:
 
-nitrogfx-debug: DEBUG = 1
-nitrogfx-debug: nitrogfx
-
-nitrogfx: $(OBJS)
- $(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
+nitrogfx-debug: $(SRCS) convert_png.h gfx.h global.h jasc_pal.h lz.h rl.h util.h font.h json.h cJSON.h
+ $(CC) $(CFLAGS) -g -DDEBUG $(SRCS) -o $@ $(LDFLAGS) $(LIBS)
 
-%.o: %.c
-%.o: %.c $(DEPDIR)/%.d | $(DEPDIR)
- $(CC) $(CFLAGS) $(DEPFLAGS) -c -o $@ $<
+nitrogfx: $(SRCS) convert_png.h gfx.h global.h jasc_pal.h lz.h rl.h util.h font.h json.h cJSON.h
+ $(CC) $(CFLAGS) $(SRCS) -o $@ $(LDFLAGS) $(LIBS)
 
 clean:
- $(RM) -r nitrogfx nitrogfx.exe $(OBJS) $(DEPDIR)
-
-$(DEPDIR): ; @mkdir -p $@
-
-DEPFILES := $(SRCS:%.c=$(DEPDIR)/%.d)
-$(DEPFILES):
-
-include $(wildcard $(DEPFILES))
+ $(RM) -r nitrogfx nitrogfx.exe $(OBJS)