Merge pull request #7 from sardap/v0.4.0

V0.4.0
sardap · Mar 26, 2021 · 83ddfd8 · 83ddfd8
2 parents 5b71bf7 + 1c3ca91
commit 83ddfd8
Show file tree

Hide file tree

Showing 54 changed files with 830 additions and 302 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ assets/weapons/*.png
 assets/misc/*.png
 assets/obstacles/*.png
 assets/game_intro/*.png
+assets/title_screen/*.png
 
 assets/out.png
 __debug_bin
@@ -19,6 +20,7 @@ mus_edit/
 
 backgrounds_out.png
 objects_out.png
+version.png
 
 act/
 .actrc
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -19,7 +19,12 @@
 		"giwhale_air_0.h": "c",
 		"ready.h": "c",
 		"building3tileset.h": "c",
-		"tonc.h": "c"
+		"tonc.h": "c",
+		"player.h": "c",
+		"graphics.h": "c",
+		"enemybisuctdeath03.h": "c",
+		"anime.h": "c",
+		"enemybiscutufoidle00.h": "c"
 	},
 	"C_Cpp.errorSquiggles": "Disabled",
 	"cSpell.words": [

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -30,6 +30,19 @@
 				"panel": "new"
 			}
 		},
+		{
+			"label": "build-assets",
+			"type": "shell",
+			"command": "docker run --rm -v ${PWD}:/app wgm-builder:latest assets",
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			},
+			"presentation": {
+				"reveal": "always",
+				"panel": "new"
+			}
+		},
 		{
 			"label": "build-docker",
 			"type": "shell",
@@ -44,6 +57,5 @@
 			},
 			"problemMatcher": []
 		}
-
 	]
-}
+}
diff --git a/assets/enemy/enemyBiscutUFODeath00.psd b/assets/enemy/enemyBiscutUFODeath00.psd
diff --git a/assets/enemy/enemyBiscutUFODeath01.psd b/assets/enemy/enemyBiscutUFODeath01.psd
diff --git a/assets/enemy/enemyBiscutUFODeath02.psd b/assets/enemy/enemyBiscutUFODeath02.psd
diff --git a/assets/enemy/enemyBiscutUFODeath03.psd b/assets/enemy/enemyBiscutUFODeath03.psd
diff --git a/assets/enemy/enemyBiscutUFODeath04.psd b/assets/enemy/enemyBiscutUFODeath04.psd
diff --git a/assets/enemy/enemyBiscutUFODeath05.psd b/assets/enemy/enemyBiscutUFODeath05.psd
diff --git a/assets/enemy/enemyBiscutUFOIdle00.psd b/assets/enemy/enemyBiscutUFOIdle00.psd
diff --git a/assets/enemy/enemyBiscutUFOIdle01.psd b/assets/enemy/enemyBiscutUFOIdle01.psd
diff --git a/assets/enemy/enemyBiscutUFOIdle02.psd b/assets/enemy/enemyBiscutUFOIdle02.psd
diff --git a/assets/enemy/enemyBisuctDeath00.psd b/assets/enemy/enemyBisuctDeath00.psd
diff --git a/assets/enemy/enemyBisuctDeath01.psd b/assets/enemy/enemyBisuctDeath01.psd
diff --git a/assets/enemy/enemyBisuctDeath02.psd b/assets/enemy/enemyBisuctDeath02.psd
diff --git a/assets/enemy/enemyBisuctDeath03.psd b/assets/enemy/enemyBisuctDeath03.psd
diff --git a/assets/enemy/enemyBullet00.psd b/assets/enemy/enemyBullet00.psd
diff --git a/assets/title_screen/tsBackgroundAgg.png b/assets/title_screen/tsBackgroundAgg.png
diff --git a/assets/title_screen/tsBeach.png b/assets/title_screen/tsBeach.png
diff --git a/assets/title_screen/tsCity.png b/assets/title_screen/tsCity.png
diff --git a/assets/title_screen/tsEmpty.png b/assets/title_screen/tsEmpty.png
diff --git a/assets/title_screen/tsLava.png b/assets/title_screen/tsLava.png
diff --git a/assets/title_screen/tsTitleText.png b/assets/title_screen/tsTitleText.png
diff --git a/assets/title_screen/tsTitleText.psd b/assets/title_screen/tsTitleText.psd
diff --git a/assets/title_screen/tsWater.png b/assets/title_screen/tsWater.png
diff --git a/dockerfile b/dockerfile
@@ -8,6 +8,8 @@ COPY ./tools/colour-agg/*.go ./
 
 RUN go build -o main .
 
+############################################
+
 FROM golang:latest as builder-builder
 
 WORKDIR /app
@@ -20,6 +22,18 @@ RUN go build -o main .
 
 ##################################################
 
+FROM golang:latest as version-img-gen-builder
+
+WORKDIR /app
+COPY ./tools/version-img-gen/go.mod . 
+COPY ./tools/version-img-gen/go.sum . 
+RUN go mod download
+
+COPY ./tools/version-img-gen/*.go ./
+
+RUN go build -o main .
+
+##################################################
 #Devkit pro image is out of date also deabain is fucked here for some reason
 FROM devkitpro/devkitarm:latest as GBA-builder
 
@@ -34,6 +48,10 @@ COPY --from=colour-agg-builder /app/main /bin/colour-agg.exe
 COPY --from=builder-builder /app/main /bin/builder
 RUN chmod +x /bin/builder
 
+#Copy version-img-gen-builder
+COPY --from=version-img-gen-builder /app/main /bin/version-img-gen
+RUN chmod +x /bin/version-img-gen
+
 RUN mkdir /app
 
 WORKDIR /app

diff --git a/make_assets.sh b/make_assets.sh
@@ -62,7 +62,7 @@ gen_png "./assets/title_screen"
 
 OBJECTS="$OBJECTS $PWD/assets/text/lifeTitle.png "
 
-# colour-agg.exe ./assets/objects_out.png $OBJECTS
+version-img-gen ./assets/title_screen/tsTitleText.png
 
 colour-agg.exe ./assets/title_screen/tsBackgroundAgg.png \
 	./assets/title_screen/tsEmpty.png \

diff --git a/music/enemy_biscut_ufo_death_0.wav b/music/enemy_biscut_ufo_death_0.wav
diff --git a/source/anime.c b/source/anime.c
@@ -2,7 +2,7 @@
 
 #include <tonc.h>
 
-void step_anime(
+void step_anime_bad(
 	const unsigned int *anime[], int tile_len, int count,
 	int *cycle, int tile_idx)
 {
@@ -21,3 +21,27 @@ void step_anime(
 		(*cycle) = count * 3;
 	}
 }
+
+bool step_anime(
+	int *cycle,
+	const unsigned int *anime[], int count,
+	int tile_idx, int tile_len)
+{
+	//Copy current frame into tile mem
+	dma3_cpy(
+		&tile_mem[4][tile_idx],
+		anime[(*cycle)],
+		tile_len);
+
+	//Next frame
+	++(*cycle);
+
+	//Check if need to wrap cycle
+	if ((*cycle) >= count)
+	{
+		(*cycle) = 0;
+		return true;
+	}
+
+	return false;
+}
diff --git a/source/anime.h b/source/anime.h
@@ -1,9 +1,16 @@
 #ifndef ANIME_H
 #define ANIME_H
 
-void step_anime(
-	const unsigned int *anime[], int tile_len, int count, 
-	int *cycle, int tile_idx
-);
+#include <tonc.h>
+
+void step_anime_bad(
+	const unsigned int *anime[], int tile_len, int count,
+	int *cycle, int tile_idx);
+
+//Returns true when the anime is complete
+bool step_anime(
+	int *cycle,
+	const unsigned int *anime[], int count,
+	int tile_idx, int tile_len);
 
 #endif
diff --git a/source/common.c b/source/common.c
@@ -5,11 +5,12 @@
 
 #include "debug.h"
 #include "numbers.h"
+#include "ent.h"
 
 static int _frame_count;
 FIXED _scroll_x;
 static int _score;
-static int _score_att_start;
+static int _score_ent_start;
 
 static void nothing(void) {}
 
@@ -63,6 +64,24 @@ int gba_rand()
 	return qran();
 }
 
+void init_score()
+{
+	_score = 0;
+	_score_ent_start = allocate_visual_ent(SCORE_DIGITS);
+
+	for (int i = 0; i < SCORE_DIGITS; i++)
+	{
+		_visual_ents[_score_ent_start + i].type = TYPE_VISUAL_SCORE;
+
+		_visual_ents[_score_ent_start + i].x = int2fx(8 * i);
+		_visual_ents[_score_ent_start + i].y = 0;
+
+		_visual_ents[_score_ent_start + i].att.attr0 = ATTR0_SQUARE | ATTR0_8BPP;
+		_visual_ents[_score_ent_start + i].att.attr1 = ATTR1_SIZE_8x8;
+		_visual_ents[_score_ent_start + i].att.attr2 = ATTR2_PALBANK(0) | ATTR2_PRIO(0) | ATTR2_ID(get_number_tile_start());
+	}
+}
+
 static void update_score()
 {
 	int i_score = _score;
@@ -87,27 +106,18 @@ static void update_score()
 			offset = 0;
 		}
 
-		obj_set_attr(&_obj_buffer[_score_att_start + i],
-					 ATTR0_SQUARE | ATTR0_8BPP, ATTR1_SIZE_8x8,
-					 ATTR2_PALBANK(0) | ATTR2_PRIO(0) | ATTR2_ID(get_number_tile_start() + offset * 2));
-
-		obj_set_pos(&_obj_buffer[_score_att_start + i], 8 * i, 0);
-
 		i_score /= 10;
-	}
-}
-
-void init_score()
-{
-	_score = 0;
-	_score_att_start = allocate_ent(SCORE_DIGITS);
 
-	update_score();
+		_visual_ents[_score_ent_start + i].att.attr2 =
+			ATTR2_PALBANK(0) |
+			ATTR2_PRIO(0) |
+			ATTR2_ID(get_number_tile_start() + offset * 2);
+	}
 }
 
 void clear_score()
 {
-	free_ent(_score_att_start, SCORE_DIGITS);
+	free_visual_ent(_score_ent_start, SCORE_DIGITS);
 }
 
 void add_score(int x)