-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Day 6 Scheduled Merge #42
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* changed co-ords 2,13 to 1,2, should be below the village now. * Shops! Shopping yaas uwu
* Added Ch10 materials. * Fixed tileset issue. * Add installer line to include events. * Fixed turn based events block. * Fine tuning and corrections. * Modified shop lists.
* Specified version numbers on setup instructions. * Updated with more informed plan.
* Added Transform/Revert functionality. * Added Void Master/Monster classes and relevant text/effectiveness. * Fixed text issues. * Fixed effectiveness pointer bugs. * Some rebalancing. * Added Map Sprite editors and set temporary map sprites for void monster/master.
* Added spreadsheet and instructions for contributing. * Add files via upload * Add files via upload uncommented something that was accidentally left commented out last time * ch8 map * add ch8 text * ch8 portraits * deleting the separate file for ch8 text to put into charactertext.txt * added ch8 names/descs * altered 0x3c (Manakete) altered base stats and movement pointers of class 0x3c * added Fanni/Ersatz/Dennis over Natasha/Knoll/MaelduinBoss * Update FE8 Personal Skill Editor.csv * added ch8 character definitions * Update FE8 Personal Skill Editor.csv * fixed definitions etc definitions added for non-generics; ALIGN 4 added after the shop; nonsensical labels purged; conditions fixed * reverted manakete_f (0x3c) movement pointers * added dialogue text for ch8
…personal skill. (#40) * Setting personal skill for C10 recruit * C10 recruit text * C10 recruit definition * C10 recruit stats, text indices * C10 recruit stats, text indices * Update character_text.txt Added a space to follow conventions
* Added chapter names. * Removed boss rush * Added chapter 2 name. * Added Ch7 Name * Add ch3 name
* chapter 3 revised now recruiting an actual dude instead of a vanilla guy in addition: traditional tilespam instead of fe1 peaks on the mountains * changes as per code review comment removed, iron lance given, tmx file compressed
* Added chapter 9 assets. * Added recruitable character change. * Corrected CSV line that got messed up by copy paste somehow. * Added ch9 chatacter changes. Added palettes folder. * Added Chapter 9 character mugs, corrected events, corrected bug in character table. * Changed a few door-appearing tiles to actually be doors in the valni tileconfig. * Fixed issues, chapter is now good to go. * zlib compression.
Crazycolorz5
added a commit
that referenced
this pull request
Jun 24, 2020
Squashed commit of the following: commit 40ca130 Author: Crazycolorz5 <Crazycolorz5@gmail.com> Date: Tue Jun 23 21:02:44 2020 -0400 Remove unused files. commit 69b953f Merge: 1ab7b4c 533f5f6 Author: Crazycolorz5 <Crazycolorz5@gmail.com> Date: Tue Jun 23 21:01:24 2020 -0400 Merge branch 'skill-system-update' of https://github.com/sme23/VBA-Blitz-Tendency into sme23-skill-system-update commit 533f5f6 Merge: 1c3e226 c5c356b Author: Sme <esahig15789@gmail.com> Date: Sat May 23 14:34:58 2020 -0400 Merge remote-tracking branch 'upstream/unit_balance' into skill-system-update commit 1c3e226 Author: Sme <esahig15789@gmail.com> Date: Tue Nov 26 00:03:48 2019 -0500 Update FE8 Class Editor.csv commit c5c356b Author: Crazycolorz5 <Crazycolorz5@gmail.com> Date: Mon Nov 25 15:58:24 2019 -0500 Add wincon text to ch2, fix Nichol's passive. commit 243dc2f Author: Sme <esahig15789@gmail.com> Date: Mon Nov 25 01:10:46 2019 -0500 Update ModularStatScreen.event commit 6ce6006 Author: Sme <esahig15789@gmail.com> Date: Mon Nov 25 01:08:31 2019 -0500 Update Chapter Data Editor.csv commit 0ca01e5 Author: Sme <esahig15789@gmail.com> Date: Mon Nov 25 01:07:29 2019 -0500 Update battle_quotes.txt commit 4bcdcec Author: Sme <esahig15789@gmail.com> Date: Mon Nov 25 01:06:06 2019 -0500 Bugfixes Effectiveness wasn't being applied at all due to include order Supply wasn't accessible due to lack of skill present, reverted to vanilla system Disabled skip hand axe wait to return, as its purpose is unneeded and it makes hand axe anims ugly commit 0fa8342 Author: Sme <esahig15789@gmail.com> Date: Sun Nov 24 23:45:42 2019 -0500 Update ReaverSplit.event commit 0586870 Author: Sme <esahig15789@gmail.com> Date: Sun Nov 24 23:42:21 2019 -0500 Updated skill system commit 26fc890 Merge: 587780f dbb23e9 Author: Sme <esahig15789@gmail.com> Date: Sun Nov 24 22:09:34 2019 -0500 Merge branch 'pr/6' commit 587780f Merge: 9bef7ea 0456b56 Author: Sme <esahig15789@gmail.com> Date: Sun Nov 24 22:09:17 2019 -0500 Merge branch 'pr/5' commit 9bef7ea Merge: 3eaaf8b 863bae5 Author: Sme <esahig15789@gmail.com> Date: Sun Nov 24 22:08:49 2019 -0500 Merge branch 'pr/4' commit 3eaaf8b Merge: 3317602 57e48a7 Author: Sme <esahig15789@gmail.com> Date: Sun Nov 24 22:00:41 2019 -0500 Merge pull request #3 from FireEmblemUniverse/Ch10Polish Ch10 polish commit 3317602 Merge: 900000b dd25e28 Author: Sme <esahig15789@gmail.com> Date: Sun Nov 24 22:00:27 2019 -0500 Merge pull request #7 from FireEmblemUniverse/lastch3polish Lastch3polish commit c111ac0 Author: Crazycolorz5 <Crazycolorz5@gmail.com> Date: Sun Nov 24 21:07:43 2019 -0500 Made Nichol not a female. commit 450e3f0 Author: Crazycolorz5 <Crazycolorz5@gmail.com> Date: Sun Nov 24 20:55:19 2019 -0500 Made Nichol's passive steal and made it a character ability. commit dbb23e9 Author: Stan H <deindall@gmail.com> Date: Tue Oct 1 13:03:03 2019 +0200 stop using backslashes kirb commit 0456b56 Author: Stan H <deindall@gmail.com> Date: Tue Oct 1 12:53:08 2019 +0200 Add MMB commit bccf08e Author: Stan H <deindall@gmail.com> Date: Tue Oct 1 12:05:48 2019 +0200 fix bad filename case and backslashes commit 96b3a18 Merge: 671dc58 2273a14 Author: Stan H <deindall@gmail.com> Date: Tue Oct 1 11:26:12 2019 +0200 Merge branch 'develop' of https://github.com/FireEmblemUniverse/VBA-Blitz-Tendency into cleanup commit 863bae5 Merge: d2a857c be9bd11 Author: Teraspark <33077030+Teraspark@users.noreply.github.com> Date: Fri Jul 5 08:51:21 2019 -0400 Merge pull request #120 from FireEmblemUniverse/develop Develop commit d2a857c Author: Teraspark <33077030+Teraspark@users.noreply.github.com> Date: Thu Jul 4 14:13:52 2019 -0400 Update Battle Palettes.txt added more palettes for player and boss units commit 57e48a7 Author: Crazycolorz5 <Crazycolorz5@gmail.com> Date: Wed May 29 00:37:22 2019 -0400 Formatting. commit 900000b Merge: 517389c 0d9b3f3 Author: Darrman <30606600+Darrman@users.noreply.github.com> Date: Sat Mar 16 20:50:44 2019 +0000 Merge branch 'text_formatting' into master commit 0d9b3f3 Author: Darrman <30606600+Darrman@users.noreply.github.com> Date: Sat Mar 16 20:40:03 2019 +0000 Pushing old text stuff Committing already-formatted Chapters 21 and 23. Keeping Chapter 24 around too, just in case. commit 671dc58 Author: Stan H <deindall@gmail.com> Date: Sat Mar 9 21:44:20 2019 +0100 ignore tpc text entries commit 964938a Author: Stan H <deindall@gmail.com> Date: Sat Mar 9 21:42:55 2019 +0100 move chapter_text to text root (for tpc support) commit de18dce Author: Stan H <deindall@gmail.com> Date: Sat Mar 9 21:41:42 2019 +0100 (cleanup) line end fixes commit 517389c Author: Sme <esahig15789@gmail.com> Date: Thu Feb 7 14:19:14 2019 -0500 oops was in wrong place commit 045d7b9 Author: Sme <esahig15789@gmail.com> Date: Tue Feb 5 20:20:28 2019 -0500 Micheal P commit 0ac8720 Author: Sme <esahig15789@gmail.com> Date: Tue Feb 5 20:04:06 2019 -0500 Chapter 24 text commit 8b287a5 Author: Sme <esahig15789@gmail.com> Date: Tue Feb 5 19:50:05 2019 -0500 Chapter 21 and 23 text commit 9d1cf20 Merge: 0a3191a 654e6e3 Author: sme23 <esahig15789@gmail.com> Date: Tue Feb 5 19:35:17 2019 -0500 Merge pull request #2 from sme23/text_formatting Text formatting commit 654e6e3 Author: Darrman <30606600+Darrman@users.noreply.github.com> Date: Mon Dec 24 21:44:51 2018 +0000 Formatting to 20 commit 9c60c35 Author: Darrman <30606600+Darrman@users.noreply.github.com> Date: Sat Dec 22 19:18:56 2018 +0000 Formatting to Ch13 No events modified as of yet. Should build in debug without TextProcess throwing a fit. commit 1af33be Author: Darrman <30606600+Darrman@users.noreply.github.com> Date: Sat Dec 22 17:56:51 2018 +0000 Lower case definitions for when i'm too lazy to hit shift and save myself some keystrokes commit dd25e28 Author: Darrman <30606600+Darrman@users.noreply.github.com> Date: Sat Dec 22 14:40:26 2018 +0000 i forget really this stuff was probably important for something maybe it wasn't i'll just commit it onto this branch anyway, pretty sure it's all been merged commit 6b29e16 Author: Crazycolorz5 <Crazycolorz5@gmail.com> Date: Wed Dec 19 22:08:43 2018 -0500 Toned down weapons a bit. commit 7415709 Author: Crazycolorz5 <Crazycolorz5@gmail.com> Date: Wed Dec 19 22:00:58 2018 -0500 Fixed a map issue, added camera indicators for tile changes. commit 8333030 Author: Crazycolorz5 <Crazycolorz5@gmail.com> Date: Wed Dec 19 21:40:57 2018 -0500 Fixed tile change issues. commit 0a3191a Merge: 5a2d81c 6403e90 Author: Crazycolorz5 <crazycolorz5@gmail.com> Date: Mon Nov 5 00:52:39 2018 -0500 Merge pull request #108 from FireEmblemUniverse/develop Prologue - Ch9 Polish commit 39876bb Merge: 849a6e5 74dc895 Author: Crazycolorz5 <crazycolorz5@gmail.com> Date: Sun Nov 4 23:56:02 2018 -0500 Merge branch 'develop' into lastch3polish commit 849a6e5 Author: Darrman <30606600+Darrman@users.noreply.github.com> Date: Mon Oct 29 22:50:46 2018 +0000 ch3 polish attempt i hate random bugs, there's still random purple weirdness when visiting the left house commit 5a2d81c Merge: 13c3a60 184a602 Author: Crazycolorz5 <crazycolorz5@gmail.com> Date: Thu Sep 20 02:55:54 2018 -0400 Merge pull request #100 from FireEmblemUniverse/develop Getting Everything In The Game commit 13c3a60 Merge: c547aff 492fc21 Author: Crazycolorz5 <crazycolorz5@gmail.com> Date: Thu Jul 19 14:16:55 2018 -0400 Merge pull request #88 from FireEmblemUniverse/develop Phase 2 Fixes (#87) commit c547aff Merge: 2725d6f 33e3b8f Author: Crazycolorz5 <crazycolorz5@gmail.com> Date: Wed Jul 18 03:57:29 2018 -0400 Merge pull request #81 from FireEmblemUniverse/develop End of Phase 2 commit 2725d6f Merge: 7abf740 a237979 Author: Crazycolorz5 <crazycolorz5@gmail.com> Date: Wed Jul 11 02:00:32 2018 -0400 Merge pull request #46 from FireEmblemUniverse/develop End of Phase 1 commit 7abf740 Merge: 015989c c6fff8b Author: Crazycolorz5 <crazycolorz5@gmail.com> Date: Tue Jul 10 01:42:57 2018 -0400 Merge pull request #42 from FireEmblemUniverse/develop Day 6 Scheduled Merge commit 015989c Merge: 6e7e07e b92c352 Author: Crazycolorz5 <crazycolorz5@gmail.com> Date: Sun Jul 8 03:12:13 2018 -0400 Merge pull request #19 from FireEmblemUniverse/develop Day 4 Scheduled Merge commit 6e7e07e Author: U-COLORZ-STRIX\Crazycolorz5 <Crazycolorz5@gmail.com> Date: Wed Jul 4 02:31:25 2018 -0400 Added spreadsheet and instructions for contributing.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.