Shipwright/soh/src/code/z_scene_table.c, branch 9.0.1 Ship of Harkinian: Ocarina of Time PC port Apply clang-format to files (#5273) 2025-04-02T02:33:38+00:00 Archez Archez@users.noreply.github.com 2025-04-02T02:33:38+00:00 8f126344a4ef22765cfa550146f89bf428e86053 






Trade cleanup (#4971)
2025-02-25T11:09:01+00:00

Pepe20129
72659707+Pepe20129@users.noreply.github.com

2025-02-25T11:09:01+00:00

06387060d6b3434eae7d65f12f651d495444af2c

* Move adult trade to flags

* Move child trade to flags

* Fix vanilla

* Address review

* Rename `trade_shuffle` to `ShuffleTradeItems`

* Fix mac build

* Update GIVanillaBehavior.h

* Update z_kankyo.c

* Update z_en_heishi2.c




* Move adult trade to flags

* Move child trade to flags

* Fix vanilla

* Address review

* Rename `trade_shuffle` to `ShuffleTradeItems`

* Fix mac build

* Update GIVanillaBehavior.h

* Update z_kankyo.c

* Update z_en_heishi2.c






OTRGlobals cleanup (#4251)
2024-11-19T16:44:44+00:00

Pepe20129
72659707+Pepe20129@users.noreply.github.com

2024-11-19T16:44:44+00:00

9bed5af33b920cc0d44b410dce152de784ce56b3

* Remove unused headers

* Move all "ResourceMgr_" functions to a new file

* Don't transitively include SaveManager

* Move cvar prefixes to a new header

* Add missing includes

* Update OTRGlobals.cpp

* Fix build

* Address review

* Fix some of the errors

* Update gameplaystats.h

* Update z_en_in.c

* Hopefully fix the linux issues

* Fix Linux issues for real this time, I checked

* Update ResourceManagerHelpers.cpp

* Update z_obj_mure2.c

* Post-merge fixes

* Fix build (hopefully)

* Post-merge fixes

* Update z_file_nameset_PAL.c

* cleanup some unnecessary headers (#7)

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>




* Remove unused headers

* Move all "ResourceMgr_" functions to a new file

* Don't transitively include SaveManager

* Move cvar prefixes to a new header

* Add missing includes

* Update OTRGlobals.cpp

* Fix build

* Address review

* Fix some of the errors

* Update gameplaystats.h

* Update z_en_in.c

* Hopefully fix the linux issues

* Fix Linux issues for real this time, I checked

* Update ResourceManagerHelpers.cpp

* Update z_obj_mure2.c

* Post-merge fixes

* Fix build (hopefully)

* Post-merge fixes

* Update z_file_nameset_PAL.c

* cleanup some unnecessary headers (#7)

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>






Entrance Docs (#3332)
2023-11-19T19:29:56+00:00

inspectredc
78732756+inspectredc@users.noreply.github.com

2023-11-19T19:29:56+00:00

80ef399c5256b401a70be76d93abe4b26672c6ee

* transition variables renamed

* transition circle

* transition wipe

* sand storm

* remaining sceneloadflag rename

* transition trigger macros

* transition mode enum

* transition type enum

* tc set params

* creg debug transitions

* introduce entrance table + return entrance indices + entrance info macros

* randomizer entrance pass through

* cleanup some missing scene enums

* randomizer entrance tracker pass through

* randomizer grotto pass through

* gSaveContext.entranceIndex

* misc lists

* z_select pass through

* respawn entrance index

* nextEntranceIndex

* add missing include




* transition variables renamed

* transition circle

* transition wipe

* sand storm

* remaining sceneloadflag rename

* transition trigger macros

* transition mode enum

* transition type enum

* tc set params

* creg debug transitions

* introduce entrance table + return entrance indices + entrance info macros

* randomizer entrance pass through

* cleanup some missing scene enums

* randomizer entrance tracker pass through

* randomizer grotto pass through

* gSaveContext.entranceIndex

* misc lists

* z_select pass through

* respawn entrance index

* nextEntranceIndex

* add missing include






Transition docs (#3322)
2023-11-19T07:38:07+00:00

inspectredc
78732756+inspectredc@users.noreply.github.com

2023-11-19T07:38:07+00:00

2b1327c41aad3e2fca2e4af50597a2c1f93116f3

* transition variables renamed

* transition circle

* transition wipe

* sand storm

* remaining sceneloadflag rename

* transition trigger macros

* transition mode enum

* transition type enum

* tc set params

* creg debug transitions




* transition variables renamed

* transition circle

* transition wipe

* sand storm

* remaining sceneloadflag rename

* transition trigger macros

* transition mode enum

* transition type enum

* tc set params

* creg debug transitions






[OTR Archive] Move shared scenes out of nonmq/mq folders (#3191)
2023-11-06T22:44:49+00:00

Adam Bird
Archez@users.noreply.github.com

2023-11-06T22:44:49+00:00

460b3d02f501904ba0a1e77af8d523534cd42e62

* share common scenes between mq and nonmq

* move shared scenes under shared folder and bring back thieves hideout mq handling

* update headers for shared scenes

* bump submodules

* remove mq handling for mirror world song patch

* only have unique dungeons be nomq/mq variants

* bump submodules




* share common scenes between mq and nonmq

* move shared scenes under shared folder and bring back thieves hideout mq handling

* update headers for shared scenes

* bump submodules

* remove mq handling for mirror world song patch

* only have unique dungeons be nomq/mq variants

* bump submodules






Quest Cleanup (#3178)
2023-09-26T14:20:33+00:00

Pepe20129
72659707+Pepe20129@users.noreply.github.com

2023-09-26T14:20:33+00:00

d63c9d1774c13d192ba9a2ccf76d95fb016bc352

* Change most n64ddFlag checks to IS_RANDO checks

* Change most isMasterQuest checks to IS_MASTER_QUEST checks

* Change most isBossRush checks to IS_BOSS_RUSH checks

* Replace isMasterQuest & isBossRush with questId

* Replace n64ddFlag with questId

Also restore authentic n64ddFlag behavior except savefile saving/loading

* Move quest enum from file_choose.h to z64save.h

* Update macros to not take gSaveContext




* Change most n64ddFlag checks to IS_RANDO checks

* Change most isMasterQuest checks to IS_MASTER_QUEST checks

* Change most isBossRush checks to IS_BOSS_RUSH checks

* Replace isMasterQuest & isBossRush with questId

* Replace n64ddFlag with questId

Also restore authentic n64ddFlag behavior except savefile saving/loading

* Move quest enum from file_choose.h to z64save.h

* Update macros to not take gSaveContext






Some documentation changes for zplayer (#3172)
2023-09-15T18:39:46+00:00

Garrett Cox
garrettjcox@gmail.com

2023-09-15T18:39:46+00:00

c11a6a17e9c229bfe8f3c8b5c093eeaa09e3d557

* Documentation changes for zplayer

* Update soh/include/z64player.h

Co-authored-by: Adam Bird <Archez@users.noreply.github.com>

---------

Co-authored-by: Adam Bird <Archez@users.noreply.github.com>




* Documentation changes for zplayer

* Update soh/include/z64player.h

Co-authored-by: Adam Bird <Archez@users.noreply.github.com>

---------

Co-authored-by: Adam Bird <Archez@users.noreply.github.com>






Add scene table (#3131)
2023-09-01T16:46:19+00:00

Pepe20129
72659707+Pepe20129@users.noreply.github.com

2023-09-01T16:46:19+00:00

45b7520dcb79d5accb717e9bfda13e0e0ce2a9af

* Add scene table

* Re-add accidentally deleted entry

* Update CrashHandlerExt.cpp

* Update CrashHandlerExt.cpp




* Add scene table

* Re-add accidentally deleted entry

* Update CrashHandlerExt.cpp

* Update CrashHandlerExt.cpp






Flags stuff (#3014)
2023-06-20T15:54:02+00:00

Garrett Cox
garrettjcox@gmail.com

2023-06-20T15:54:02+00:00

7c5efb278582a7b438f58a804dd38c6795c8e0c9

* Manual adjustments to flags

* Script run to adjust flags




* Manual adjustments to flags

* Script run to adjust flags