Commit Graph

1249 Commits

Author SHA1 Message Date
Sarge-117 6de7ce3720 Delete z_message_RandoNaviTips.c 2022-08-09 18:37:42 -07:00
Sarge-117 3c4405347d Remove old stuff + add test messages 2022-08-09 18:35:39 -07:00
lilDavid 12d45685b9 Move files in with other rando files 2022-08-09 19:57:40 -05:00
Sarge-117 b4c9f4aa6e Test switch to new message system
Testing setting up the table and calling the messages
2022-08-09 16:07:58 -07:00
Sarge-117 6a39b9e011 Comments 2022-08-09 13:56:45 -07:00
Sarge-117 dc6018b41e Update CMakeLists.txt 2022-08-09 13:44:57 -07:00
Sarge-117 00e2d0fe0e Update tips 2022-08-09 12:39:59 -07:00
Sarge-117 d6210a2ebb Merge branch 'rando-navi-tips' into rando-next 2022-08-09 12:25:54 -07:00
Sarge-117 f55623e1c6 Update z_message_PAL.c 2022-08-09 12:23:14 -07:00
PurpleHato 5c0939d4fd DEL: GTG disaplying a boss key 2022-08-09 19:00:44 +02:00
PurpleHato fc9aaf7c25 DEL: Boss Key on BOTW and Boss/Small key on ICE Cavern 2022-08-09 18:53:53 +02:00
PurpleHato 4f1d667ec5 TWEAK: Uncessecary new line 2022-08-09 18:44:27 +02:00
PurpleHato 5bbce43f19 TWEAK: added back but disabled personal notes for now 2022-08-09 18:28:03 +02:00
PurpleHato 3f8b060fad TWEAK: Window posiiton 2022-08-09 17:59:52 +02:00
PurpleHato fa393bff48 ADD: Item Tracker V2 2022-08-09 17:54:28 +02:00
lilDavid 08366c51b6 Correct mixed indentation styles 2022-08-09 10:17:38 -05:00
briaguya 1aeefa3c7e Merge pull request #1111 from leggettc18/rando-skull-message-fix
Fixes skulltula messages for custom items.
2022-08-09 08:54:41 -04:00
Garrett Cox 608f493c5b Update descriptions and defaults 2022-08-09 07:53:15 -05:00
Christopher Leggett 7a5acb0a2a Fixes placement 2022-08-09 08:36:20 -04:00
Christopher Leggett 20bbf85f00 Sets player getItemId before other messagebox instance. 2022-08-09 07:26:17 -04:00
aMannus 0b722eebd4 Merge branch 'develop-zhora' into zhora-rando-next-merge 2022-08-09 08:44:05 +02:00
aMannus e4b58e5a0c TWEAK: Layout/styling overhaul for the F1 menu (#1026)
* First pass of UX changes

* More padding/styling/layout

* More styling

* Moar styling

* Some more styling

* Implemented padding helpers

* More styling, added closing buttons to windows

* Fixed merge conflict mistake

* Fixed new enhancements

* Hopefully fix jenkins errors

* Changed button behaviour, more styling

* Tiny code cleanup

* Change buttons from close/open to > when open

* Small button spacing fix

* Small styling changes after merge

* Small fix after merge mistake
2022-08-09 02:16:45 -04:00
Christopher Leggett 6f7b38539b Moves setting of getItemId into a rando save if block. 2022-08-09 01:56:47 -04:00
Christopher Leggett 95918e0cb2 Fixes skulltula messages for custom items. 2022-08-09 01:42:47 -04:00
Garrett Cox bbce60e71c Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-09 00:01:46 -05:00
Garrett Cox 3472e83250 Use new custom message system, skulltula drops still broken text 2022-08-09 00:00:30 -05:00
Garrett Cox e8c4378d17 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-08 22:47:29 -05:00
Christopher Leggett b9e18519a2 Removes Skulltula text auto-dismiss in tokensanity
More precisely, removes the auto-dimissal from the Skulltula
textbox when in a rando save and any token shuffle is on.
Bonus Fix: parses the Skullsanity setting from the spoilerfile,
which wasn't happening before.
2022-08-08 23:40:02 -04:00
Christopher Leggett ffc36efe50 Reimplements FOWL ice trap text boxes.
They got lost in the custom-messages merge. Reimplemented them
in the custom-messages system.
2022-08-08 23:11:45 -04:00
briaguya 8410a79b26 Merge branch 'rando-next' into zhora-to-next 2022-08-08 22:27:04 -04:00
briaguya 816fac6c06 Merge branch 'develop-zhora' into zhora-to-next 2022-08-08 22:23:06 -04:00
briaguya 317de33a8b Merge branch 'develop-rachael' into rachael-to-zhora 2022-08-08 21:43:04 -04:00
briaguya fa090c51f6 Merge pull request #831 from leggettc18/custom-messages
System for Creating and Storing Custom Messages
2022-08-08 21:24:48 -04:00
Christopher Leggett e63d84bd7d Adapts this branch for cmake building. 2022-08-08 21:14:29 -04:00
aMannus 4ea7f8371f Rando: Zelda sequence fixes (#1095)
* Fixed zelda sequence oddities

* Fixed code inconsistency

* Adressed review comments

* Adressed review comments, removed unneccesary entrance skip

* Addressed some more review comments

* tiny cleanup
2022-08-08 19:59:06 -04:00
InfoManiac742 0e10b59307 Update z_kaleido_item.c (#1046) 2022-08-08 19:58:01 -04:00
InfoManiac742 4bf4ad3359 Update z_en_ru1.c (#1042) 2022-08-08 19:56:56 -04:00
lilDavid f80ba4102a Add instant boomerang recall (#1006) 2022-08-08 19:55:07 -04:00
Dog 1f5d323d89 Randomizer: Skip Cutscenes (#846)
* Skip Jabu Jabu's fishy feeding time if rando is enabled Issue #757

Also skip the ganon tower fall cutscene if you died to ganon during the ganon fight for issue #773

* Immediately give control back to player when talon running cutscene starts.

* Fix case of not skipping Gannon
2022-08-08 19:48:53 -04:00
Christopher Leggett 59baf24dc6 Merge branch 'develop-zhora' of https://github.com/HarbourMasters/Shipwright into custom-messages 2022-08-08 19:46:09 -04:00
Garrett Cox a0ac945b4e Make logic consistent across z_parameter & z_sram 2022-08-08 14:18:15 -05:00
Garrett Cox 8f55dd0624 Add support for shuffling maps and compasses 2022-08-08 14:07:02 -05:00
Garrett Cox cb97c2a205 Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into keysanity 2022-08-08 12:08:06 -05:00
Garrett Cox 34b8d7d5f8 Handle impa giving a key if skip zelda is on 2022-08-08 11:09:06 -05:00
David Chavez 9afbe42720 Use -O2 for Release config builds (#1083) 2022-08-08 12:01:45 +02:00
briaguya f8f8e01039 Merge pull request #1088 from HarbourMasters/develop-zhora
quick zhora to rando next
2022-08-07 21:41:31 -04:00
lilDavid 46be24b595 Add missing semicolons and return values 2022-08-07 18:58:17 -05:00
Sarge-117 a5acf6da20 Set Navi timer back to normal 2022-08-07 16:33:44 -07:00
Sarge-117 48a41bd11c Comment clarity 2022-08-07 16:31:50 -07:00
Sarge-117 6e8b45d129 Fix text colours (Navi text is always light blue)
Navi text should always be \x44
2022-08-07 15:50:53 -07:00