From 4eb11b55fc4ff05ade60037633b16cf6b27629a6 Mon Sep 17 00:00:00 2001 From: nmlgc Date: Thu, 17 Jun 2021 09:24:35 +0200 Subject: [PATCH] [Maintenance] [th04/th05] Declare playfield fill functions in playfld.hpp Part of P0147, funded by -Tom- and Ember2528. --- th04/shared.hpp | 2 -- th05/main/playfld.hpp | 11 +++++++++++ th05/main013.cpp | 8 +------- 3 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 th05/main/playfld.hpp diff --git a/th04/shared.hpp b/th04/shared.hpp index 17603ae7..2a8c09c7 100644 --- a/th04/shared.hpp +++ b/th04/shared.hpp @@ -24,8 +24,6 @@ #include "th04/score.h" /// ------ -#include "th04/main/playfld.hpp" - /// Stages /// ------ extern nearfunc_t_near stage_invalidate; diff --git a/th05/main/playfld.hpp b/th05/main/playfld.hpp new file mode 100644 index 00000000..dc5745fc --- /dev/null +++ b/th05/main/playfld.hpp @@ -0,0 +1,11 @@ +#include "th04/main/playfld.hpp" + +// These fill the VRAM playfield area around the given [left]_[top]_[w]_[h] +// coordinates with the current GRCG tile. The GRCG is assumed to be set to +// TDW mode. +void pascal near playfield_fillm_32_0_320_192(void); +void pascal near playfield_fillm_0_0_384_192__2(void); +void pascal near playfield_fillm_0_205_384_163(void); +void pascal near playfield_fillm_64_56_256_256(void); +void pascal near playfield_fillm_0_0_384_192__1(void); +void pascal near playfield_fillm_0_104_384_192(void); diff --git a/th05/main013.cpp b/th05/main013.cpp index 6e0d1ae9..45acc607 100644 --- a/th05/main013.cpp +++ b/th05/main013.cpp @@ -17,15 +17,9 @@ extern "C" { #include "th04/main/rank.hpp" #include "th04/main/item/items.hpp" #include "th05/formats/bb.h" +#include "th05/main/playfld.hpp" #include "th05/main/boss/boss.hpp" -void pascal near playfield_fillm_32_0_320_192(void); -void pascal near playfield_fillm_0_0_384_192__2(void); -void pascal near playfield_fillm_0_205_384_163(void); -void pascal near playfield_fillm_64_56_256_256(void); -void pascal near playfield_fillm_0_0_384_192__1(void); -void pascal near playfield_fillm_0_104_384_192(void); - #include "th04/main/boss/end.cpp" #include "th04/main/boss/reset.cpp" #include "th04/formats/bb_stage.c"