VBify (#4255)
* Convert ocarina buttons & skip scarecrow song to VB * Move most of boss rush & rupee/key counters to VB * Move BossRush_HandleCompleteBoss to VB * Convert boss timestamps to VB * Move being able to open doors to VB * Convert Entrance_OverrideWeatherState to VB * Move boss souls to hook_handlers.cpp * Update hook_handlers.cpp * Move infinite upgrades to hook_handlers.cpp * Move skeleton key to hook_handlers.cpp * Move swim and child wallet to hook_handlers.cpp * Move ganons boss key to hook_handlers.cpp * Move triforce hunt to hook_handlers.cpp * Move randomizer sheik spawn to hook_handlers.cpp * Update BossRush.h * Convert spoiling items to VB * Move load game stuff to hook_handlers.cpp * Move warp song handling to hook_handlers.cpp * Convert being able to play bowling to VB * Move shooting gallery man handling to hook_handlers.cpp * Move spirit temple silver block removal to hook_handlers.cpp * Fix build * Move last beehive stuff to hook_handlers.cpp * Fix build * Add VB_CLOSE_PAUSE_MENU * Add VB_BE_ABLE_TO_SAVE * Add VB_RENDER_YES_ON_CONTINUE_PROMPT * Add VB_SPAWN_BLUE_WARP * Add VB_BLUE_WARP_ADULT_WARP_OUT * Add VB_BG_BREAKWALL_BREAK * Convert Saria stuff to VB * Remove now unused check * Add VB_GANON_HEAL_BEFORE_FIGHT * Update hook_handlers.cpp * Fix blue warp offsets * Fixes from review * Improve documentation * Update BossRush.cpp * Fix my stupidity * Fix #4327 * Update hook_handlers.cpp * Fix blue warps * Use ultralib types & clean header * Replace options amount macro with BR_OPTIONS_MAX * Remove unused includes * Remove accidental line doubling * Tweaks to boss rush (#6) * Update GameInteractor_HookTable.h --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
This commit is contained in:
@@ -1804,10 +1804,6 @@ void* Play_LoadFile(PlayState* play, RomFile* file) {
|
||||
}
|
||||
|
||||
void Play_InitEnvironment(PlayState* play, s16 skyboxId) {
|
||||
// For entrance rando, ensure the correct weather state and sky mode is applied
|
||||
if (IS_RANDO && Randomizer_GetSettingValue(RSK_SHUFFLE_ENTRANCES)) {
|
||||
Entrance_OverrideWeatherState();
|
||||
}
|
||||
Skybox_Init(&play->state, &play->skyboxCtx, skyboxId);
|
||||
Environment_Init(play, &play->envCtx, 0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user