mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-24 14:51:46 -05:00
Code Issues Projects Releases Wiki Activity

remove unused VB_SHOULDs (#5056)

Browse Source 
* remove an unused should

* another unused

* remove more unused

* one more

* remove case

* more cases for unused shoulds
This commit is contained in:
briaguya 2025-02-14 12:32:25 -08:00 committed by GitHub
parent 6df5abc30b
commit 20a9f41906
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
soh/soh/Enhancements/boss-rush/BossRush.cpp
View File

@ -522,13 +522,6 @@ void BossRush_OnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
} }
break; break;
} }
// Replace the blue warp transitions with ones that lead back to the chamber of sages
case VB_BLUE_WARP_APPLY_ENTRANCE_AND_CUTSCENE: {
DoorWarp1* blueWarp = va_arg(args, DoorWarp1*);
BossRush_HandleBlueWarp(gPlayState, blueWarp->actor.world.pos.x, blueWarp->actor.world.pos.z);
*should = false;
break;
}
// Spawn clean blue warps (no ruto, adult animation, etc) // Spawn clean blue warps (no ruto, adult animation, etc)
case VB_SPAWN_BLUE_WARP: { case VB_SPAWN_BLUE_WARP: {
switch (gPlayState->sceneNum) { switch (gPlayState->sceneNum) {

18
soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h
View File

@ -212,9 +212,6 @@ typedef enum {
// - None // - None
VB_BIGGORON_CONSIDER_TRADE_COMPLETE, VB_BIGGORON_CONSIDER_TRADE_COMPLETE,
// # UNUSED
VB_BLUE_WARP_APPLY_ENTRANCE_AND_CUTSCENE,
// #### `result` // #### `result`
// Actor is ACTOR_EN_ELF, ACTOR_EN_FISH, ACTOR_EN_ICE_HONO, or ACTOR_EN_INSECT // Actor is ACTOR_EN_ELF, ACTOR_EN_FISH, ACTOR_EN_ICE_HONO, or ACTOR_EN_INSECT
// ```c // ```c
@ -335,9 +332,6 @@ typedef enum {
// - None // - None
VB_DEKU_STICK_BURN_OUT, VB_DEKU_STICK_BURN_OUT,
// # UNUSED
VB_DEKU_UPDATE_BURNING_DEKU_STICK,
// #### `result` // #### `result`
// ```c // ```c
// Flags_GetItemGetInf(ITEMGETINF_30) // Flags_GetItemGetInf(ITEMGETINF_30)
@ -730,12 +724,6 @@ typedef enum {
// - None // - None
VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD, VB_GIVE_ITEM_GERUDO_MEMBERSHIP_CARD,
// # UNUSED
VB_GIVE_ITEM_GORON_RUBY,
// # UNUSED
VB_GIVE_ITEM_KOKIRI_EMERALD,
// #### `result` // #### `result`
// ```c // ```c
// true // true
@ -904,9 +892,6 @@ typedef enum {
// - None // - None
VB_GIVE_ITEM_ZELDAS_LULLABY, VB_GIVE_ITEM_ZELDAS_LULLABY,
// # UNUSED
VB_GIVE_ITEM_ZORA_SAPPHIRE,
// #### `result` // #### `result`
// ```c // ```c
// false // false
@ -1390,9 +1375,6 @@ typedef enum {
// - None // - None
VB_PLAY_NABOORU_CAPTURED_CS, VB_PLAY_NABOORU_CAPTURED_CS,
// # UNUSED
VB_PLAY_ODD_POTION_ANIM,
// #### `result` // #### `result`
// ```c // ```c
// true // true

3
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View File

@ -1667,9 +1667,6 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
case VB_GIVE_ITEM_STRENGTH_1: case VB_GIVE_ITEM_STRENGTH_1:
case VB_GIVE_ITEM_ZELDAS_LETTER: case VB_GIVE_ITEM_ZELDAS_LETTER:
case VB_GIVE_ITEM_OCARINA_OF_TIME: case VB_GIVE_ITEM_OCARINA_OF_TIME:
case VB_GIVE_ITEM_KOKIRI_EMERALD:
case VB_GIVE_ITEM_GORON_RUBY:
case VB_GIVE_ITEM_ZORA_SAPPHIRE:
case VB_GIVE_ITEM_LIGHT_MEDALLION: case VB_GIVE_ITEM_LIGHT_MEDALLION:
case VB_GIVE_ITEM_FOREST_MEDALLION: case VB_GIVE_ITEM_FOREST_MEDALLION:
case VB_GIVE_ITEM_FIRE_MEDALLION: case VB_GIVE_ITEM_FIRE_MEDALLION: