From 8015aef572edf28d8f194c00c40e24d4e77caca8 Mon Sep 17 00:00:00 2001 From: Trevor Boddy Date: Tue, 16 Aug 2022 01:31:13 -0400 Subject: [PATCH] bg work. first round of cleanup --- bible.txt | 14 +++++++++----- res/bg/ceil1.png | Bin 0 -> 4629 bytes res/bg/{1_1.png => floor1.png} | Bin 5484 -> 4655 bytes res/bg/wall1.png | Bin 0 -> 5484 bytes res/resources.res | 7 +++---- res/tiles/1_1.png | Bin 4862 -> 0 bytes res/tiles/1_2.png | Bin 4858 -> 0 bytes src/background.h | 22 ++++++++++++++++------ src/global.h | 3 ++- src/main.c | 7 ++----- 10 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 res/bg/ceil1.png rename res/bg/{1_1.png => floor1.png} (67%) create mode 100644 res/bg/wall1.png delete mode 100644 res/tiles/1_1.png delete mode 100644 res/tiles/1_2.png diff --git a/bible.txt b/bible.txt index 49601fc..c0c5d0b 100644 --- a/bible.txt +++ b/bible.txt @@ -3,7 +3,13 @@ ######### - 100 (overheat) - - connect/transfer (???) + - connect/transfer (big fist) + +######### +# STORY # +######### + + - 18.5 nitori ############ @@ -44,10 +50,8 @@ # ASSET NEEDS # ############### - - tate sprite for nitori.... - - think connect/transfer - - bigger shot and robot sprite? - - 2 songs min needed + - big fist sprite for tate + - 2 songs minimum needed - start - stage - extra songs ordered by priority diff --git a/res/bg/ceil1.png b/res/bg/ceil1.png new file mode 100644 index 0000000000000000000000000000000000000000..cefbd205d0373ab94acb79c18e674ee9eff0aa90 GIT binary patch literal 4629 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 delta 1416 zcmZ3l@V<`${Rx+WF|M!FWMi59vkrYXjjNtS7;rpc2v_+(X*lZ=u~6OEE| zQ_a&%bWM_sOm&ki(h`A2ni!^7ni`s?rC3hR2yd-*F|(~?sYEzMF*buCTI40TNmlahd}6iZ!m0}D&b)U-r%)1)M9CV@i(7-}ZQ zRt83sd-?4qcL?~n5)mT6@Wpf&YS=Y^!taObD$k!S);%H-J&jeC`D?&i_SEES)q(=w(t8X9GSnCv)}MVp*-Uu$ zjq7vQt$bd!nJau%U}W4`Khbv#44wiC_qVbKb;jJD^GTF(!oH=vzczg;eV)~{D5rM? zudVS#VW*FL_5ETQY846jYAnigO;(Etq)u7SarvFM?qOzTrX$%?OdoR2DxS~JW8<@x zclCru`&teo&Lo#psnY3LOCBwmadTtPg7aDa3fk@yErn{fBr^y~SKW60nz2TK?dQ~I zeo`-08ut5cciJ*jA?Dy0pPBhf8_HKKUizeQk_YF^6LHU34!*44<;>Ezj{SLG4d;^e zYz>B0m75mGt&G+RKcN}x*{3Gs;qI?+^mDs(EL)^v=EuFFhr%r*llr-RG#|44U&b%X zbDdp2_QSWyWp7-Q3)nNtQzqVdsdH#Nm7s{(f0|B}r(C9z7&)6JsSKQ!(0 z6b;RcGjFEL9iCI{m#~(z-hn$N+c(2k$A{rSOm<=6I#a_&)2%iArj3Kn zoV{WFYJ2Zy$T`*Ac*k70^oG9t)KhzX>q8CNg{CYIl8-LFy7Z9(L;vieR~@gpUMFn3g-s%92$og8*u9%P z%C+R2>+_~?KeDcPwZL_6^u0G$cRow>Yct8(e2sc`l0|op&Pw4$vs#%x%jZt{sOl&1 hqtC$Vetzg*_Vvo2I9iXnz5y1l44$rjF6*2UngA4vI)eZJ diff --git a/res/bg/wall1.png b/res/bg/wall1.png new file mode 100644 index 0000000000000000000000000000000000000000..a61d2c234293df7cfc20124c78c7b7ae1747faf2 GIT binary patch literal 5484 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 E7nlt~;Q#;t literal 0 HcmV?d00001 diff --git a/res/resources.res b/res/resources.res index 4b91ac9..f9f2218 100644 --- a/res/resources.res +++ b/res/resources.res @@ -1,9 +1,8 @@ IMAGE font "font.png" BEST NONE -IMAGE tile1_1 "tiles/1_1.png" FAST -IMAGE tile1_2 "tiles/1_2.png" FAST - -IMAGE bg1_1 "bg/1_1.png" FAST +IMAGE bgWall1 "bg/wall1.png" FAST +IMAGE bgCeil1 "bg/ceil1.png" FAST +IMAGE bgFloor1 "bg/floor1.png" FAST IMAGE frame1 "chrome/frame1.png" FAST IMAGE frame2 "chrome/frame2.png" FAST diff --git a/res/tiles/1_1.png b/res/tiles/1_1.png deleted file mode 100644 index f7ea718ef738d6be29f2bc9bfab0184253ab695d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4862 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 diff --git a/res/tiles/1_2.png b/res/tiles/1_2.png deleted file mode 100644 index 5896b2c42854cb8be40780af36b9e6c3e4043596..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4858 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 BG_SIZE_F) bgPos.y = fix16Sub(bgPos.y, BG_SIZE_F); } - // loop void loadBg(){ drawBg(); + drawFg(); } void updateBg(){ + VDP_setHorizontalScroll(BG_B, fix16ToInt(bgPos.x)); + VDP_setVerticalScroll(BG_B, fix16ToInt(bgPos.y)); scrollBg(); } \ No newline at end of file diff --git a/src/global.h b/src/global.h index 5fc4b7f..e7fe089 100644 --- a/src/global.h +++ b/src/global.h @@ -22,4 +22,5 @@ s16 clock; -u32 score; \ No newline at end of file +u32 score, + highScore; \ No newline at end of file diff --git a/src/main.c b/src/main.c index 38c5d99..4e65260 100644 --- a/src/main.c +++ b/src/main.c @@ -6,7 +6,6 @@ #include "global.h" #include "controls.h" #include "background.h" -#include "tiles.h" #include "player.h" #include "chrome.h" @@ -17,21 +16,19 @@ static void loadInternals(){ JOY_setEventHandler(&updateControls); SPR_init(127, 0, 0); VDP_setScreenWidth256(); - VDP_setPalette(PAL1, tile1_1.palette -> data); - VDP_setPalette(PAL2, bg1_1.palette -> data); + VDP_setPalette(PAL1, font.palette -> data); + VDP_setPalette(PAL2, bgWall1.palette -> data); VDP_loadFont(font.tileset, DMA); VDP_setTextPalette(1); } static void loadGame(){ loadBg(); - loadTiles(); loadPlayer(); loadChrome(); } static void updateGame(){ - updateTiles(); updatePlayer(); updateBg(); updateChrome();