diff options
| author | Ralphie Morell <stratomaster64@gmail.com> | 2023-01-19 23:45:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-19 23:45:34 -0500 |
| commit | 7964bde063ceb46ec9b329ff2a0613d631a3dfe8 (patch) | |
| tree | 45ee34502752b983ae2802f7c15872aa3e004a4a /soh/src/code | |
| parent | 1e178c4497a49f63ce7066160e558cc920c7eecf (diff) | |
Rando: Misc. Hints (#1947)
* Added too much
* Added 3d settings and brought over to soh
* fixed conditionals for replacing LA hint
* whoops
* Finshed making settings consistent; minor text edit
* fix leftovers from adding warp hints
* more fixes from merge
* fix skull hint messages
* Added fire temple goron junk hints; menu stuff
* Address feedback
* Added optional scrub text
* whoops
* Add hint cvars to clear preset func
* whoops again
* whoops the third
* ADD: French Pass
* FIXED: Dampe + Skull Reward
* TWEAK: German skulltula hint
* TWEAK: French oopsie
* Address feedback
* whoops
* remove "staticness" from altar/ganon text funcs
* ADD: German
* actually add warp song hints to things;
always generate ganon hint and let OTRGlobals handle showing it
* Fix CVar Getters
* whoops
* for real this time
* Actually implemented scrub text in 3d rando
Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_message_PAL.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c index af2eb7366..0cd2bfd66 100644 --- a/soh/src/code/z_message_PAL.c +++ b/soh/src/code/z_message_PAL.c @@ -1697,15 +1697,8 @@ void Message_StartTextbox(PlayState* play, u16 textId, Actor* actor) { osSyncPrintf(VT_RST); msgCtx->ocarinaAction = 0xFFFF; - // we need the talkActor for gossip stones in rando - // so we need to switch the order of these lines - if (gSaveContext.n64ddFlag && textId == 0x2053) { - msgCtx->talkActor = actor; - Message_OpenText(play, textId); - } else { - Message_OpenText(play, textId); - msgCtx->talkActor = actor; - } + Message_OpenText(play, textId); + msgCtx->talkActor = actor; msgCtx->msgMode = MSGMODE_TEXT_START; msgCtx->stateTimer = 0; msgCtx->textDelayTimer = 0; |