Delete unused pictures

add spikes (25%)
updated coyote time code
2020-04-04 14:57:25 +02:00 · 2020-04-03 19:20:03 +02:00 · 2020-04-03 14:43:45 +02:00 · 2020-03-14 15:02:12 +01:00 · 2020-03-13 13:10:01 +01:00 · 2020-03-13 12:10:06 +01:00
170 changed files with 2271 additions and 3875 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,4 @@
+build-fx/*
+build-cg/*
+INIT/CasioRAM.mem
+SuperCbr.dlw
--- a/AddinInfo.txt
+++ b/AddinInfo.txt
@ -0,0 +1,12 @@
+//------------------------------------------------------------------
+// Addin-Application header control file, created with the CASIO SDK
+//------------------------------------------------------------------
+[OUTPUT]     : "SUPERCBR.G1A"
+[BINDATA]    : "FXADDINror.bin"
+[DISPNAME]   : "SuperCbr"
+[APPNAME]    : "@SUPERCB"
+[VERSION]    : "01.00.0000"
+[APL_ICON]   : "MainIcon.bmp"
+[MODULE_NUM] : 0
+[MOD1_TITLE] : "SuperCbr"
+[MOD1_ICON]  : "eActivityIcon.bmp"
--- a/INIT/CasioRAM.mem
+++ b/INIT/CasioRAM.mem
--- a/INIT/CasioRAMCPU.mem
+++ b/INIT/CasioRAMCPU.mem
--- a/MainIcon.bmp
+++ b/MainIcon.bmp
--- a/SuperCbr.dlr
+++ b/SuperCbr.dlr
@ -0,0 +1 @@
+[DLSimRunSpace]
--- a/SuperCbr.dlw
+++ b/SuperCbr.dlw
@ -0,0 +1,112 @@
+[DLSimWorkSpace]
+
+[_1]
+Type=5
+Order=0
+Top=15
+Left=2235
+Height=4740
+Width=5565
+State=0
+Flags=00000020
+OptionA=0
+
+[_2]
+Type=1
+Order=1
+Top=15
+Left=7800
+Height=6885
+Width=8400
+State=0
+Flags=00000001
+OptionA=15
+OptionB=15
+
+[_3]
+Type=6
+Order=2
+Top=4035
+Left=2715
+Height=6390
+Width=5535
+State=0
+Flags=00000001
+OptionA=0
+
+[_4]
+Type=7
+Order=6
+Top=4740
+Left=2220
+Height=3165
+Width=5565
+State=0
+Flags=00000000
+OptionA=0
+
+[_5]
+Type=8
+Order=5
+Top=7905
+Left=2220
+Height=3225
+Width=5580
+State=0
+Flags=00000000
+OptionA=0
+
+[_6]
+Type=3
+Order=9
+Top=0
+Left=10788
+Height=6348
+Width=2232
+State=16
+Flags=00000000
+OptionA=0
+
+[_7]
+Type=2
+Order=8
+Top=6348
+Left=7800
+Height=3588
+Width=5220
+State=16
+Flags=00000000
+OptionA=0
+
+[_8]
+Type=17
+Order=4
+Top=15
+Left=-15
+Height=11115
+Width=2235
+State=0
+Flags=00000000
+OptionA=0
+
+[_9]
+Type=15
+Order=3
+Top=4740
+Left=2235
+Height=6345
+Width=5595
+State=0
+Flags=00000000
+OptionA=0
+
+[_32]
+Type=16
+Order=7
+Top=0
+Left=2208
+Height=4584
+Width=5592
+State=16
+Flags=00000020
+OptionA=0
--- a/SuperCbr.g1a
+++ b/SuperCbr.g1a
--- a/SuperCbr.g1w
+++ b/SuperCbr.g1w
@ -0,0 +1,12 @@
+[DLSimProject]
+Name=SuperCbr
+Version=1.00.0000
+Model=:fx-9860G.dlm
+SourcePath=SRC
+MemoryPath=INIT
+MemCardPath=SDCard
+
+[Program1]
+Program=SUPERCBR.G1A
+Debug=Debug\FXADDINror.dbg
+LoadAddress=80000000:90100000
--- a/assets-fx/bin/lvl_1_1.png
+++ b/assets-fx/bin/lvl_1_1.png
--- a/assets-fx/bin/lvl_1_2.png
+++ b/assets-fx/bin/lvl_1_2.png
--- a/assets-fx/bin/lvl_1_3.png
+++ b/assets-fx/bin/lvl_1_3.png
--- a/assets-fx/bin/lvl_1_4.png
+++ b/assets-fx/bin/lvl_1_4.png
--- a/assets-fx/icon-fx.png
+++ b/assets-fx/icon-fx.png
--- a/assets-fx/icon-fx.png-autosave.kra
+++ b/assets-fx/icon-fx.png-autosave.kra
--- a/assets-fx/icon-fx.png~
+++ b/assets-fx/icon-fx.png~
--- a/assets-fx/img/arbre.png
+++ b/assets-fx/img/arbre.png
--- a/assets-fx/img/bloc.png
+++ b/assets-fx/img/bloc.png
--- a/assets-fx/img/bonus.png
+++ b/assets-fx/img/bonus.png
--- a/assets-fx/img/brick.png
+++ b/assets-fx/img/brick.png
--- a/assets-fx/img/carapace_rouge.png
+++ b/assets-fx/img/carapace_rouge.png
--- a/assets-fx/img/flag.png
+++ b/assets-fx/img/flag.png
--- a/assets-fx/img/koopa_rouge.png
+++ b/assets-fx/img/koopa_rouge.png
--- a/assets-fx/img/level.png
+++ b/assets-fx/img/level.png
--- a/assets-fx/img/lvl0.png
+++ b/assets-fx/img/lvl0.png
--- a/assets-fx/img/main.png
+++ b/assets-fx/img/main.png
--- a/assets-fx/img/mainmenu.png
+++ b/assets-fx/img/mainmenu.png
--- a/assets-fx/img/mariobig.png
+++ b/assets-fx/img/mariobig.png
--- a/assets-fx/img/mariosmall.png
+++ b/assets-fx/img/mariosmall.png
--- a/assets-fx/img/nuage.png
+++ b/assets-fx/img/nuage.png
--- a/assets-fx/img/plante.png
+++ b/assets-fx/img/plante.png
--- a/assets-fx/img/spikes.png
+++ b/assets-fx/img/spikes.png
--- a/assets-fx/img/tickbox.png
+++ b/assets-fx/img/tickbox.png
--- a/assets-fx/img/tuyau.png
+++ b/assets-fx/img/tuyau.png
--- a/assets-fx/img/w4.png
+++ b/assets-fx/img/w4.png
--- a/build-fx/SuperCbr.bin
+++ b/build-fx/SuperCbr.bin
--- a/build-fx/SuperCbr.elf
+++ b/build-fx/SuperCbr.elf
--- a/build-fx/assets/fonts/mario.png.o
+++ b/build-fx/assets/fonts/mario.png.o
--- a/build-fx/assets/img/1up.png.o
+++ b/build-fx/assets/img/1up.png.o
--- a/build-fx/assets/img/bloc.png.o
+++ b/build-fx/assets/img/bloc.png.o
--- a/build-fx/assets/img/bonus.png.o
+++ b/build-fx/assets/img/bonus.png.o
--- a/build-fx/assets/img/brick.png.o
+++ b/build-fx/assets/img/brick.png.o
--- a/build-fx/assets/img/buisson.png.o
+++ b/build-fx/assets/img/buisson.png.o
--- a/build-fx/assets/img/bullet.png.o
+++ b/build-fx/assets/img/bullet.png.o
--- a/build-fx/assets/img/carapace_verte.png.o
+++ b/build-fx/assets/img/carapace_verte.png.o
--- a/build-fx/assets/img/castle.png.o
+++ b/build-fx/assets/img/castle.png.o
--- a/build-fx/assets/img/champi.png.o
+++ b/build-fx/assets/img/champi.png.o
--- a/build-fx/assets/img/coin.png.o
+++ b/build-fx/assets/img/coin.png.o
--- a/build-fx/assets/img/colline.png.o
+++ b/build-fx/assets/img/colline.png.o
--- a/build-fx/assets/img/death.png.o
+++ b/build-fx/assets/img/death.png.o
--- a/build-fx/assets/img/dev.png.o
+++ b/build-fx/assets/img/dev.png.o
--- a/build-fx/assets/img/error.png.o
+++ b/build-fx/assets/img/error.png.o
--- a/build-fx/assets/img/flag.png.o
+++ b/build-fx/assets/img/flag.png.o
--- a/build-fx/assets/img/fleur.png.o
+++ b/build-fx/assets/img/fleur.png.o
--- a/build-fx/assets/img/fond1.png.o
+++ b/build-fx/assets/img/fond1.png.o
--- a/build-fx/assets/img/game_over.png.o
+++ b/build-fx/assets/img/game_over.png.o
--- a/build-fx/assets/img/gift.png.o
+++ b/build-fx/assets/img/gift.png.o
--- a/build-fx/assets/img/goomba.png.o
+++ b/build-fx/assets/img/goomba.png.o
--- a/build-fx/assets/img/koopa_verte.png.o
+++ b/build-fx/assets/img/koopa_verte.png.o
--- a/build-fx/assets/img/level.png.o
+++ b/build-fx/assets/img/level.png.o
--- a/build-fx/assets/img/levelchanger.png.o
+++ b/build-fx/assets/img/levelchanger.png.o
--- a/build-fx/assets/img/lvl0.png.o
+++ b/build-fx/assets/img/lvl0.png.o
--- a/build-fx/assets/img/main.png.o
+++ b/build-fx/assets/img/main.png.o
--- a/build-fx/assets/img/mainmenu.png.o
+++ b/build-fx/assets/img/mainmenu.png.o
--- a/build-fx/assets/img/mario.png.o
+++ b/build-fx/assets/img/mario.png.o
--- a/build-fx/assets/img/mariobig.png.o
+++ b/build-fx/assets/img/mariobig.png.o
--- a/build-fx/assets/img/mariosmall.png.o
+++ b/build-fx/assets/img/mariosmall.png.o
--- a/build-fx/assets/img/menu_pause.png.o
+++ b/build-fx/assets/img/menu_pause.png.o
--- a/build-fx/assets/img/new_level.png.o
+++ b/build-fx/assets/img/new_level.png.o
--- a/build-fx/assets/img/nuage.png.o
+++ b/build-fx/assets/img/nuage.png.o
--- a/build-fx/assets/img/options.png.o
+++ b/build-fx/assets/img/options.png.o
--- a/build-fx/assets/img/plateforme.png.o
+++ b/build-fx/assets/img/plateforme.png.o
--- a/build-fx/assets/img/ram.png.o
+++ b/build-fx/assets/img/ram.png.o
--- a/build-fx/assets/img/select_arrow.png.o
+++ b/build-fx/assets/img/select_arrow.png.o
--- a/build-fx/assets/img/star.png.o
+++ b/build-fx/assets/img/star.png.o
--- a/build-fx/assets/img/stone.png.o
+++ b/build-fx/assets/img/stone.png.o
--- a/build-fx/assets/img/stone2.png.o
+++ b/build-fx/assets/img/stone2.png.o
--- a/build-fx/assets/img/tickbox.png.o
+++ b/build-fx/assets/img/tickbox.png.o
--- a/build-fx/assets/img/time_over.png.o
+++ b/build-fx/assets/img/time_over.png.o
--- a/build-fx/assets/img/tuyau.png.o
+++ b/build-fx/assets/img/tuyau.png.o
--- a/build-fx/assets/img/w1.png.o
+++ b/build-fx/assets/img/w1.png.o
--- a/build-fx/assets/img/w2.png.o
+++ b/build-fx/assets/img/w2.png.o
--- a/build-fx/assets/img/w3.png.o
+++ b/build-fx/assets/img/w3.png.o
--- a/build-fx/assets/img/w4.png.o
+++ b/build-fx/assets/img/w4.png.o
--- a/build-fx/assets/img/w5.png.o
+++ b/build-fx/assets/img/w5.png.o
--- a/build-fx/map
+++ b/build-fx/map
--- a/build-fx/src/bonus.c.d
+++ b/build-fx/src/bonus.c.d
@ -1,21 +0,0 @@
-build-fx/src/bonus.c.o: src/bonus.c include/bonus.h include/box.h \
- include/mario.h include/box.h include/world.h include/tile.h \
- include/score.h include/ennemi.h include/constants.h
-
-include/bonus.h:
-
-include/box.h:
-
-include/mario.h:
-
-include/box.h:
-
-include/world.h:
-
-include/tile.h:
-
-include/score.h:
-
-include/ennemi.h:
-
-include/constants.h:
--- a/build-fx/src/bonus.c.o
+++ b/build-fx/src/bonus.c.o
--- a/build-fx/src/box.c.d
+++ b/build-fx/src/box.c.d
@ -1,14 +0,0 @@
-build-fx/src/box.c.o: src/box.c include/box.h include/world.h \
- include/ennemi.h include/box.h include/score.h include/constants.h
-
-include/box.h:
-
-include/world.h:
-
-include/ennemi.h:
-
-include/box.h:
-
-include/score.h:
-
-include/constants.h:
--- a/build-fx/src/box.c.o
+++ b/build-fx/src/box.c.o
--- a/build-fx/src/config.c.d
+++ b/build-fx/src/config.c.d
@ -1,3 +0,0 @@
-build-fx/src/config.c.o: src/config.c include/config.h
-
-include/config.h:
--- a/build-fx/src/config.c.o
+++ b/build-fx/src/config.c.o
--- a/build-fx/src/ennemi.c.d
+++ b/build-fx/src/ennemi.c.d
@ -1,17 +0,0 @@
-build-fx/src/ennemi.c.o: src/ennemi.c include/ennemi.h include/box.h \
- include/mario.h include/box.h include/tile.h include/world.h \
- include/score.h
-
-include/ennemi.h:
-
-include/box.h:
-
-include/mario.h:
-
-include/box.h:
-
-include/tile.h:
-
-include/world.h:
-
-include/score.h:
--- a/build-fx/src/ennemi.c.o
+++ b/build-fx/src/ennemi.c.o
--- a/build-fx/src/framerate.c.d
+++ b/build-fx/src/framerate.c.d
@ -1 +0,0 @@
-build-fx/src/framerate.c.o: src/framerate.c
--- a/build-fx/src/framerate.c.o
+++ b/build-fx/src/framerate.c.o
--- a/build-fx/src/keyboard.c.d
+++ b/build-fx/src/keyboard.c.d
@ -1,12 +0,0 @@
-build-fx/src/keyboard.c.o: src/keyboard.c include/keyboard.h \
- include/mario.h include/box.h include/score.h include/config.h
-
-include/keyboard.h:
-
-include/mario.h:
-
-include/box.h:
-
-include/score.h:
-
-include/config.h:
--- a/build-fx/src/keyboard.c.o
+++ b/build-fx/src/keyboard.c.o
--- a/build-fx/src/level.c.d
+++ b/build-fx/src/level.c.d
@ -1,21 +0,0 @@
-build-fx/src/level.c.o: src/level.c include/level.h include/world.h \
- include/mario.h include/box.h include/score.h include/ennemi.h \
- include/keyboard.h include/plateforme.h include/tuyau.h
-
-include/level.h:
-
-include/world.h:
-
-include/mario.h:
-
-include/box.h:
-
-include/score.h:
-
-include/ennemi.h:
-
-include/keyboard.h:
-
-include/plateforme.h:
-
-include/tuyau.h:
--- a/build-fx/src/level.c.o
+++ b/build-fx/src/level.c.o
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Milang	47529dd99c	Delete unused pictures	2020-04-04 14:57:25 +02:00
Milang	2a85f98b93	add spikes (25%)	2020-04-03 19:20:03 +02:00
Milang	14caa99616	updated coyote time code (cleaning some code to add functionnalities later)	2020-04-03 14:43:45 +02:00
Milang	1a877773f7	opimisations about mario	2020-03-14 15:02:12 +01:00
Milang	86286e4b29	new brick behaviour when destroying	2020-03-13 13:10:01 +01:00
Milang	0eaaac1a9c	fix flour bug this bug permitted to throw bullets without being big, when you are small and take a flower	2020-03-13 12:10:06 +01:00
Milang	0f6f429514	completed level 3 (some adjustements may come)	2020-03-13 10:55:17 +01:00
Milang	21734f0765	completing lvl 1- 3 adding items for 1-3 to be continued...	2020-03-11 11:41:59 +01:00
Milang	e06d2eb947	update build	2020-03-11 11:29:22 +01:00
Milang	b6ae4b8cc9	plante piranha completée	2020-03-10 19:34:09 +01:00
Milang	eb1e3e1fc6	completing piranha plants	2020-03-10 19:20:06 +01:00
Milang	9476c81e50	level changes currently adding plants (part 1)	2020-03-07 15:22:39 +01:00
Milang	35c1214270	Fixed camera	2020-03-07 15:22:07 +01:00
Milang	23b98fd3d4	fix minor camera "bugs" &correct error provided by previour commit	2020-03-04 15:08:35 +01:00
milang	13872b3dcb	reduce koopa code merge code from KOOPA_V & KOOPA_R	2020-02-29 19:15:09 +01:00
milang	5f9791f6aa	optimized ennemi behaviour (to be tested) replace ennemies specific behaviours by a switch => means less duplicated code	2020-02-29 19:01:17 +01:00
milang	1b3acce432	update ennemi functions use `ennemi_t const * ` instead of `ennemi_t *` in display methods	2020-02-29 18:24:33 +01:00
Milang	6a744b0547	clean code & prepare to add piranha plants	2020-02-25 18:42:40 +01:00
Milang	76fe4d2e3f	improve time & score displaying	2020-02-25 17:35:06 +01:00
Milang	9760257d76	fallback to getkey after gint's getkey improvements	2020-02-23 13:50:59 +01:00
Milang	7c9da97baf	last chance to fix timer bug	2020-02-22 17:56:09 +01:00
Milang	98ff078150	fix second timer bug	2020-02-20 18:24:40 +01:00
Milang	da4d716878	Fix timer bug reported by @Calcloverhk	2020-02-20 15:45:41 +01:00
Milang	a2754a92fd	fix flag drawing 2	2020-02-18 14:35:26 +01:00
Milang	3c467a5c5b	correct flag drawing	2020-02-18 14:32:44 +01:00
Milang	2547765eef	add commands for the camera & slow down ennemies to their initial speed	2020-02-18 13:47:44 +01:00
Milang	8306be7e7a	minimize ram use due to a lack of ram	2020-02-18 13:03:57 +01:00
Milang	f739816d03	clean bullets & correct special brick bug	2020-02-17 19:16:50 +01:00
Milang	7475d478f5	some code cleaning	2020-02-17 18:43:16 +01:00
Milang	5aeb14b1c6	fix minor brick display bug	2020-02-17 17:53:37 +01:00
Milang	72d1ce0255	clean mario.c source code	2020-02-17 14:49:03 +01:00
Milang	27a22209e3	fix minor hitbox bug when conflict with platform & blocs	2020-02-17 10:45:11 +01:00
Milang	7138dd442c	global code cleaning, especially with function names	2020-02-16 20:43:35 +01:00
Milang	0c527962ab	clear world.c code	2020-02-16 18:47:20 +01:00
Milang	de30485e46	add left animation for pipes	2020-02-16 15:20:35 +01:00
Milang	45a70614a0	fix coyote time bug and change a little hitboxes	2020-02-16 13:32:16 +01:00
Milang	99120d5299	new pipe sprite	2020-02-16 12:53:02 +01:00
Milang	6d29add2da	new mario hit box => reduced width	2020-02-16 12:51:27 +01:00
Milang	4fb0254dba	update textures, animations & add new keyboard keys for debug	2020-02-16 11:49:01 +01:00
Milang	ef10b6c6e6	fix time over bug	2020-02-16 11:14:53 +01:00
Milang	e2b6eac34b	fix keyboard bug, lighten interface & clean some parts of the code	2020-02-15 19:35:49 +01:00
Milang	d9d6648a17	clean ingame interface -> score & coins are hidden, and are shown only when they change	2020-02-15 14:40:01 +01:00
Milang	8ab8a4cd7a	add fx9860g emulator integrated to the folder clean LaunchUI() func (proper switch etc..)	2020-02-15 13:41:50 +01:00
Milang	fae77016d5	add a new camera system (experimental)	2020-02-07 10:40:24 +01:00
Milang	1aa5edd231	add coyote time & jump buffering	2020-02-07 10:39:43 +01:00
Milang	4ed9222790	correct fire bullet speed	2020-02-07 10:39:21 +01:00
Milang	e6ed094095	add specific comportement when a plateform is could pass trough mario	2020-02-04 20:34:30 +01:00
Milang	48625d4ce4	update start coords	2020-02-04 20:15:36 +01:00
Milang	a6bb83f355	add plateforms as complete physical objects there are no max coordinates any longer, but now thay can fall, and there is a better support with mario (not complete yet)	2020-02-04 20:12:17 +01:00
Milang	748d7c04db	fixed plateforms bug	2020-02-03 15:13:37 +01:00
Milang	f3c5a89450	updated icon	2020-02-03 11:53:55 +01:00
Milang	2ce87496e6	fixed ram management bug	2020-02-03 11:52:19 +01:00
Milang	7ff674bc39	fixed ram management bug	2020-02-03 11:12:54 +01:00
Milang	54ab77daed	add tree img	2020-02-02 20:32:02 +01:00
Milang	ed25c7394a	ajout des decos	2020-02-02 20:31:44 +01:00
Milang	a8a8550e05	add level 1 to binary levels	2020-02-02 17:55:03 +01:00
Milang	ddef97b66b	add ennemi support	2020-02-02 16:48:23 +01:00
Milang	af29ac6970	fixed flag bug	2020-02-02 16:24:40 +01:00
Milang	71f3e778bb	fully added level decompression	2020-02-02 16:05:56 +01:00
Milang	e6f3e6cdaa	adding compressed level format (incomplete)	2020-02-01 16:39:34 +01:00
Milang	04743ed5b5	move set_level	2020-02-01 14:39:08 +01:00
Milang	2871c50f73	move init ennemi function	2020-02-01 14:36:34 +01:00
Milang	bdab50f58e	update build	2020-01-30 21:24:23 +01:00
Milang	92668ae15b	fixed bonus speed	2020-01-30 21:18:03 +01:00
Milang	3d22b719ce	correct "persisting mushroom" bug add .gitignore	2020-01-30 21:09:18 +01:00
Milang	c97342b263	fix camera & continue level 2	2020-01-29 18:24:33 +01:00
Milang	6d09ea36be	add distinct camera	2020-01-29 14:34:57 +01:00
Milang	adccfcceb3	cleaned some parts of the code	2020-01-29 14:34:47 +01:00
Milang	17bd723f43	add red koopas, and a new lvl 1-2 prototype	2020-01-28 21:32:58 +01:00
Milang	1430639595	add complete second level & fix levelconv.py bug	2020-01-28 14:32:39 +01:00
Milang	a5619d4d18	add splash screen, disable up key, update w4 img, add transparency to flags	2020-01-27 20:19:25 +01:00
Milang	cdb9e2c26d	add full pipe support & animations	2020-01-27 16:53:53 +01:00
Milang	ca1f602345	experimental physics change to add completely plateforms support	2020-01-27 16:46:37 +01:00
Milang	7381ee005a	now mario moves automatically when he is on a plateform	2020-01-27 16:25:19 +01:00