diff --git a/Advanced templates/example_asymmetricalrotation_6states_animated/properties.txt b/Advanced templates/example_asymmetricalrotation_6states_animated/properties.txt index 6b989dcb245604bb2b03aa428479da4ab8828a68..784aa3d68be940c69917b622c2816c92b2aa89a8 100644 --- a/Advanced templates/example_asymmetricalrotation_6states_animated/properties.txt +++ b/Advanced templates/example_asymmetricalrotation_6states_animated/properties.txt @@ -6,7 +6,7 @@ "transparent_colors_explanation": "The above colors will be made transparent upon processing the template image for sprite conversion. You can add up to 4 colors to be set to transparent.", "name": "example", - "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. Underscores will be interpeted as spaces in-game.", + "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. For character names with spaces, use underscores instead of spaces: underscores will be interpreted as spaces in-game, while spaces won't work.", "prefix": "EXMP", "prefix_explanation": "A set of 4 characters used to internally identify your follower, mainly used for its files.", "category": "Fanworks", diff --git a/Advanced templates/example_asymmetricalrotation_6states_animated/sprites.png b/Advanced templates/example_asymmetricalrotation_6states_animated/sprites.png index a0f8080dd27ec938911124bc10886f1b707bdca1..ab205c4f1b219e8baa353ee22940468c0d3d66fc 100644 Binary files a/Advanced templates/example_asymmetricalrotation_6states_animated/sprites.png and b/Advanced templates/example_asymmetricalrotation_6states_animated/sprites.png differ diff --git a/Advanced templates/example_symmetricalrotation_6states_animated/properties.txt b/Advanced templates/example_symmetricalrotation_6states_animated/properties.txt index 32fde2032fdf4a42e86df990a541243dd1d30b5c..8676dc64da1245b5d6778599da11f1b6a08d51b7 100644 --- a/Advanced templates/example_symmetricalrotation_6states_animated/properties.txt +++ b/Advanced templates/example_symmetricalrotation_6states_animated/properties.txt @@ -6,7 +6,7 @@ "transparent_colors_explanation": "The above colors will be made transparent upon processing the template image for sprite conversion. You can add up to 4 colors to be set to transparent.", "name": "example", - "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. Underscores will be interpeted as spaces in-game.", + "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. For character names with spaces, use underscores instead of spaces: underscores will be interpreted as spaces in-game, while spaces won't work.", "prefix": "EXMP", "prefix_explanation": "A set of 4 characters used to internally identify your follower, mainly used for its files.", "category": "Fanworks", diff --git a/Advanced templates/example_symmetricalrotation_6states_animated/sprites.png b/Advanced templates/example_symmetricalrotation_6states_animated/sprites.png index 610a1e1497e0893335752c7d27c33e2674fc25f1..adfaef7e8b79441143bb18318f20842ac35e9dce 100644 Binary files a/Advanced templates/example_symmetricalrotation_6states_animated/sprites.png and b/Advanced templates/example_symmetricalrotation_6states_animated/sprites.png differ diff --git a/Basic templates/example/properties.txt b/Basic templates/example/properties.txt index 878925abede277c7be9be97bab9aca2c420fbd21..9d862e19a59bbc89c57873557e60e6578f16ac46 100644 --- a/Basic templates/example/properties.txt +++ b/Basic templates/example/properties.txt @@ -6,7 +6,7 @@ "transparent_colors_explanation": "The above colors will be made transparent upon processing the template image for sprite conversion. You can add up to 4 colors to be set to transparent.", "name": "example", - "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. Underscores will be interpeted as spaces in-game.", + "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. For character names with spaces, use underscores instead of spaces: underscores will be interpreted as spaces in-game, while spaces won't work.", "prefix": "EXMP", "prefix_explanation": "A set of 4 characters used to internally identify your follower, mainly used for its files.", "category": "Fanworks", diff --git a/Basic templates/example/sprites.png b/Basic templates/example/sprites.png index bcd76925f84abc78f7e28fb8868ee7e5956e96df..4b441dbe36e78b7091417d3ea7eb5448521dae53 100644 Binary files a/Basic templates/example/sprites.png and b/Basic templates/example/sprites.png differ diff --git a/Basic templates/example_animated/properties.txt b/Basic templates/example_animated/properties.txt index 66988c57012a57e19039fff803622f6ffbc3e9e4..4c0a70ca1e40531088534273ab38030d0f1abf6a 100644 --- a/Basic templates/example_animated/properties.txt +++ b/Basic templates/example_animated/properties.txt @@ -6,7 +6,7 @@ "transparent_colors_explanation": "The above colors will be made transparent upon processing the template image for sprite conversion. You can add up to 4 colors to be set to transparent.", "name": "example", - "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. Underscores will be interpeted as spaces in-game.", + "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. For character names with spaces, use underscores instead of spaces: underscores will be interpreted as spaces in-game, while spaces won't work.", "prefix": "EXMP", "prefix_explanation": "A set of 4 characters used to internally identify your follower, mainly used for its files.", "category": "Fanworks", diff --git a/Basic templates/example_animated/sprites.png b/Basic templates/example_animated/sprites.png index 332ac37051570f8691a0187b248b6b3352d05f87..5a465e02eba251aa3c2e4ea448ed135ecbf6ec1f 100644 Binary files a/Basic templates/example_animated/sprites.png and b/Basic templates/example_animated/sprites.png differ diff --git a/Basic templates/example_asymmetricalrotation/properties.txt b/Basic templates/example_asymmetricalrotation/properties.txt index 8bd319a9491abc23d178c14b53e2234b0689cba2..f26301a2bf2c104d00a64ae9faf515fb6f7b8a31 100644 --- a/Basic templates/example_asymmetricalrotation/properties.txt +++ b/Basic templates/example_asymmetricalrotation/properties.txt @@ -6,7 +6,7 @@ "transparent_colors_explanation": "The above colors will be made transparent upon processing the template image for sprite conversion. You can add up to 4 colors to be set to transparent.", "name": "example", - "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. Underscores will be interpeted as spaces in-game.", + "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. For character names with spaces, use underscores instead of spaces: underscores will be interpreted as spaces in-game, while spaces won't work.", "prefix": "EXMP", "prefix_explanation": "A set of 4 characters used to internally identify your follower, mainly used for its files.", "category": "Fanworks", diff --git a/Basic templates/example_asymmetricalrotation/sprites.png b/Basic templates/example_asymmetricalrotation/sprites.png index 9a0f9d96ef48d814b940eec5d324a4080d044dd8..52c9b3be1a1569d4b2bbe2ceead8fbd4c2e55c13 100644 Binary files a/Basic templates/example_asymmetricalrotation/sprites.png and b/Basic templates/example_asymmetricalrotation/sprites.png differ diff --git a/Basic templates/example_asymmetricalrotation_animated/properties.txt b/Basic templates/example_asymmetricalrotation_animated/properties.txt index 76a5985f84e157bc4551db81bc58c0cf824d5787..096a05ad2a2f14ea6516a7c6a9f749faeae2e85d 100644 --- a/Basic templates/example_asymmetricalrotation_animated/properties.txt +++ b/Basic templates/example_asymmetricalrotation_animated/properties.txt @@ -6,7 +6,7 @@ "transparent_colors_explanation": "The above colors will be made transparent upon processing the template image for sprite conversion. You can add up to 4 colors to be set to transparent.", "name": "example", - "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. Underscores will be interpeted as spaces in-game.", + "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. For character names with spaces, use underscores instead of spaces: underscores will be interpreted as spaces in-game, while spaces won't work.", "prefix": "EXMP", "prefix_explanation": "A set of 4 characters used to internally identify your follower, mainly used for its files.", "category": "Fanworks", diff --git a/Basic templates/example_asymmetricalrotation_animated/sprites.png b/Basic templates/example_asymmetricalrotation_animated/sprites.png index 071dda6d9817e84cfb4a4e34c6b60ab0a8c182cb..4748280d371340873f8c9d0b860238d035aaeb00 100644 Binary files a/Basic templates/example_asymmetricalrotation_animated/sprites.png and b/Basic templates/example_asymmetricalrotation_animated/sprites.png differ diff --git a/Basic templates/example_symmetricalrotation/properties.txt b/Basic templates/example_symmetricalrotation/properties.txt index 876fe6298419ad2d0cdf88d330dacbfa520f1a2a..454a00766417e54bbf4d0d0ffeb7a963c34e3d26 100644 --- a/Basic templates/example_symmetricalrotation/properties.txt +++ b/Basic templates/example_symmetricalrotation/properties.txt @@ -6,7 +6,7 @@ "transparent_colors_explanation": "The above colors will be made transparent upon processing the template image for sprite conversion. You can add up to 4 colors to be set to transparent.", "name": "example", - "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. Underscores will be interpeted as spaces in-game.", + "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. For character names with spaces, use underscores instead of spaces: underscores will be interpreted as spaces in-game, while spaces won't work.", "prefix": "EXMP", "prefix_explanation": "A set of 4 characters used to internally identify your follower, mainly used for its files.", "category": "Fanworks", diff --git a/Basic templates/example_symmetricalrotation/sprites.png b/Basic templates/example_symmetricalrotation/sprites.png index 43b347ea1fec203684ae39eac6c67a436b421f08..3d9cd46404821c250ab885c953ab679cd0e6a27b 100644 Binary files a/Basic templates/example_symmetricalrotation/sprites.png and b/Basic templates/example_symmetricalrotation/sprites.png differ diff --git a/Basic templates/example_symmetricalrotation_2states_animated/properties.txt b/Basic templates/example_symmetricalrotation_2states_animated/properties.txt index 11dae8fed0134a0feca79d1daaee40fe9b0401d7..1ac4726f5f562e856bbb570403766a048c4ea013 100644 --- a/Basic templates/example_symmetricalrotation_2states_animated/properties.txt +++ b/Basic templates/example_symmetricalrotation_2states_animated/properties.txt @@ -6,7 +6,7 @@ "transparent_colors_explanation": "The above colors will be made transparent upon processing the template image for sprite conversion. You can add up to 4 colors to be set to transparent.", "name": "example", - "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. Underscores will be interpeted as spaces in-game.", + "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. For character names with spaces, use underscores instead of spaces: underscores will be interpreted as spaces in-game, while spaces won't work.", "prefix": "EXMP", "prefix_explanation": "A set of 4 characters used to internally identify your follower, mainly used for its files.", "category": "Fanworks", diff --git a/Basic templates/example_symmetricalrotation_2states_animated/sprites.png b/Basic templates/example_symmetricalrotation_2states_animated/sprites.png index 52e01b403d41c84b4699a29e4b0ee504eb231f70..e5483410c64bd305f731a3557befa62ded74f5c5 100644 Binary files a/Basic templates/example_symmetricalrotation_2states_animated/sprites.png and b/Basic templates/example_symmetricalrotation_2states_animated/sprites.png differ diff --git a/Basic templates/example_symmetricalrotation_animated/properties.txt b/Basic templates/example_symmetricalrotation_animated/properties.txt index a6d00967f0bafd8d0d03298f4a28763a089dffbc..bee2ea02d8f41e3c18c1fd0e98d2f0246c9d927d 100644 --- a/Basic templates/example_symmetricalrotation_animated/properties.txt +++ b/Basic templates/example_symmetricalrotation_animated/properties.txt @@ -6,7 +6,7 @@ "transparent_colors_explanation": "The above colors will be made transparent upon processing the template image for sprite conversion. You can add up to 4 colors to be set to transparent.", "name": "example", - "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. Underscores will be interpeted as spaces in-game.", + "name_explanation": "The name of your follower. The names of followers appear on the main menu, upon toggling \"extrainfo mode\" with the drift button. For character names with spaces, use underscores instead of spaces: underscores will be interpreted as spaces in-game, while spaces won't work.", "prefix": "EXMP", "prefix_explanation": "A set of 4 characters used to internally identify your follower, mainly used for its files.", "category": "Fanworks", diff --git a/Basic templates/example_symmetricalrotation_animated/sprites.png b/Basic templates/example_symmetricalrotation_animated/sprites.png index 346ff440b0b04977b4f7aab133c5a25f70c8ef22..4e5fe98c50ea997a3d962741dd281b963fe9db6c 100644 Binary files a/Basic templates/example_symmetricalrotation_animated/sprites.png and b/Basic templates/example_symmetricalrotation_animated/sprites.png differ diff --git a/src/main.c b/src/main.c index 585ff7685d3a5aa882d900a981a885cfb1ff6abe..77fbb31639743d6579e14489066eb4222fcaaae9 100644 --- a/src/main.c +++ b/src/main.c @@ -72,7 +72,6 @@ struct followerstructthingwhatever { char bobspeed; char hitconfirmtime; - char animationframes; char idleanimationspeed; char followinganimationspeed; char hurtanimationspeed; @@ -219,7 +218,6 @@ void SetDefaultFollowerValues(void) kfollower.bobspeed = 70; kfollower.hitconfirmtime = 1; - kfollower.animationframes = 0; kfollower.idleanimationspeed = 35; kfollower.followinganimationspeed = 35; kfollower.hurtanimationspeed = 35; @@ -250,7 +248,8 @@ void processSprites(void) { // to do with automating animation frame order indices uint8_t curanimframeletter = 0x41; uint8_t lastanimframeletterinstate = 0; - uint8_t curstate, laststate = 0; + uint8_t curstate = 0; + uint8_t laststate = 0; kfollower.highestanimframeletter = 0x41;