Game-Decompilation/2ship2harkinian
1
0
Fork 0
mirror of https://github.com/HarbourMasters/2ship2harkinian.git synced 2024-11-23 05:59:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change GI_VB_ to VB_ (#798)

Browse Source
This commit is contained in:
Garrett Cox 2024-10-05 10:02:53 -05:00 committed by GitHub
parent 8e0b482b23
commit da04b7f859
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
44 changed files with 105 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mm/2s2h/Enhancements/Camera/DebugCam.cpp
View File

@ -231,7 +231,7 @@ void RegisterDebugCam() {
}
if (CVarGetInteger("gEnhancements.Camera.DebugCam.Enable", 0)) {
freeCamVBHookId = REGISTER_VB_SHOULD(GI_VB_USE_CUSTOM_CAMERA, {
freeCamVBHookId = REGISTER_VB_SHOULD(VB_USE_CUSTOM_CAMERA, {
Camera* camera = va_arg(args, Camera*);
Camera_DebugCam(camera);
*should = false;

2
mm/2s2h/Enhancements/Camera/FreeLook.cpp
View File

@ -172,7 +172,7 @@ void RegisterCameraFreeLook() {
}
if (CVarGetInteger("gEnhancements.Camera.FreeLook.Enable", 0)) {
freeLookCameraVBHookId = REGISTER_VB_SHOULD(GI_VB_USE_CUSTOM_CAMERA, {
freeLookCameraVBHookId = REGISTER_VB_SHOULD(VB_USE_CUSTOM_CAMERA, {
Camera* camera = va_arg(args, Camera*);
switch (sCameraSettings[camera->setting].cameraModes[camera->mode].funcId) {
case CAM_FUNC_NORMAL0:

2
mm/2s2h/Enhancements/Cheats/UnbreakableRazorSword.cpp
View File

@ -2,7 +2,7 @@
#include "Enhancements/GameInteractor/GameInteractor.h"
void RegisterUnbreakableRazorSword() {
REGISTER_VB_SHOULD(GI_VB_LOWER_RAZOR_SWORD_DURABILITY, {
REGISTER_VB_SHOULD(VB_LOWER_RAZOR_SWORD_DURABILITY, {
if (CVarGetInteger("gCheats.UnbreakableRazorSword", 0)) {
*should = false;
}

2
mm/2s2h/Enhancements/Cheats/UnrestrictedItems.cpp
View File

@ -2,7 +2,7 @@
#include "Enhancements/GameInteractor/GameInteractor.h"
void RegisterUnrestrictedItems() {
REGISTER_VB_SHOULD(GI_VB_ITEM_BE_RESTRICTED, {
REGISTER_VB_SHOULD(VB_ITEM_BE_RESTRICTED, {
if (CVarGetInteger("gCheats.UnrestrictedItems", 0)) {
*should = false;
}

2
mm/2s2h/Enhancements/Cutscenes/HideTitleCards.cpp
View File

@ -2,7 +2,7 @@
#include "Enhancements/GameInteractor/GameInteractor.h"
void RegisterHideTitleCards() {
REGISTER_VB_SHOULD(GI_VB_SHOW_TITLE_CARD, {
REGISTER_VB_SHOULD(VB_SHOW_TITLE_CARD, {
if (CVarGetInteger("gEnhancements.Cutscenes.HideTitleCards", 0)) {
*should = false;
}

6
mm/2s2h/Enhancements/Cutscenes/MiscInteractions/SkipTatlInterrupts.cpp
View File

@ -15,7 +15,7 @@ void Actor_Kill(Actor* actor);
void RegisterSkipTatlInterrupts() {
// First time entering Clock Town Interupt
REGISTER_VB_SHOULD(GI_VB_PLAY_TRANSITION_CS, {
REGISTER_VB_SHOULD(VB_PLAY_TRANSITION_CS, {
if (gSaveContext.save.entrance == ENTRANCE(SOUTH_CLOCK_TOWN, 0) && gSaveContext.save.cutsceneIndex == 0 &&
!CHECK_WEEKEVENTREG(WEEKEVENTREG_59_04) &&
CVarGetInteger("gEnhancements.Cutscenes.SkipMiscInteractions", 0)) {
@ -24,7 +24,7 @@ void RegisterSkipTatlInterrupts() {
});
// General interupt
REGISTER_VB_SHOULD(GI_VB_TATL_INTERUPT_MSG3, {
REGISTER_VB_SHOULD(VB_TATL_INTERUPT_MSG3, {
if (CVarGetInteger("gEnhancements.Cutscenes.SkipMiscInteractions", 0) && *should) {
Actor* actor = va_arg(args, Actor*);
*should = false;
@ -36,7 +36,7 @@ void RegisterSkipTatlInterrupts() {
});
// General interupt 2 (the flags were directly copied from the original code)
REGISTER_VB_SHOULD(GI_VB_TATL_INTERUPT_MSG6, {
REGISTER_VB_SHOULD(VB_TATL_INTERUPT_MSG6, {
if (CVarGetInteger("gEnhancements.Cutscenes.SkipMiscInteractions", 0) && *should) {
Actor* actor = va_arg(args, Actor*);
*should = false;

2
mm/2s2h/Enhancements/Cutscenes/SkipEntranceCutscenes.cpp
View File

@ -2,7 +2,7 @@
#include "Enhancements/GameInteractor/GameInteractor.h"
void RegisterSkipEntranceCutscenes() {
REGISTER_VB_SHOULD(GI_VB_PLAY_ENTRANCE_CS, {
REGISTER_VB_SHOULD(VB_PLAY_ENTRANCE_CS, {
if (CVarGetInteger("gEnhancements.Cutscenes.SkipEntranceCutscenes", 0)) {
*should = false;
}

2
mm/2s2h/Enhancements/Cutscenes/SkipIntroSequence.cpp
View File

@ -8,7 +8,7 @@ extern SaveContext gSaveContext;
}
void RegisterSkipIntroSequence() {
REGISTER_VB_SHOULD(GI_VB_PLAY_TRANSITION_CS, {
REGISTER_VB_SHOULD(VB_PLAY_TRANSITION_CS, {
// Intro cutscene
if (!(gSaveContext.save.entrance == ENTRANCE(CUTSCENE, 0) && gSaveContext.save.cutsceneIndex == 0))
return;

4
mm/2s2h/Enhancements/Cutscenes/StoryCutscenes/SkipClockTowerOpen.cpp
View File

@ -10,14 +10,14 @@ extern PlayState* gPlayState;
void RegisterSkipClockTowerOpen() {
// This will handle skipping if you are around the Clock Town area, but not directly in south clock town
REGISTER_VB_SHOULD(GI_VB_CLOCK_TOWER_OPENING_CONSIDER_THIS_FIRST_CYCLE, {
REGISTER_VB_SHOULD(VB_CLOCK_TOWER_OPENING_CONSIDER_THIS_FIRST_CYCLE, {
if (CVarGetInteger("gEnhancements.Cutscenes.SkipStoryCutscenes", 0)) {
*should = false;
}
});
// This will handle skipping if you are directly in South Clock Town
REGISTER_VB_SHOULD(GI_VB_PLAY_TRANSITION_CS, {
REGISTER_VB_SHOULD(VB_PLAY_TRANSITION_CS, {
if ((gSaveContext.save.entrance == ENTRANCE(SOUTH_CLOCK_TOWN, 0) ||
gSaveContext.save.entrance == ENTRANCE(TERMINA_FIELD, 0)) &&
gSaveContext.save.cutsceneIndex == 0xFFF1 &&

2
mm/2s2h/Enhancements/Fixes/FierceDeityZTargetMovement.cpp
View File

@ -6,7 +6,7 @@ extern "C" {
}
void RegisterFierceDeityZTargetMovement() {
REGISTER_VB_SHOULD(GI_VB_ZTARGET_SPEED_CHECK, {
REGISTER_VB_SHOULD(VB_ZTARGET_SPEED_CHECK, {
Player* player = GET_PLAYER(gPlayState);
float* speedArg = va_arg(args, float*);

60
mm/2s2h/Enhancements/GameInteractor/GameInteractor.h
View File

@ -32,36 +32,36 @@ typedef enum {
typedef enum {
// Vanilla condition: gSaveContext.showTitleCard
GI_VB_SHOW_TITLE_CARD,
GI_VB_PLAY_ENTRANCE_CS,
GI_VB_DISABLE_FD_MASK,
GI_VB_DOGGY_RACE_SET_MAX_SPEED,
GI_VB_LOWER_RAZOR_SWORD_DURABILITY,
GI_VB_SET_BLAST_MASK_COOLDOWN_TIMER,
GI_VB_PATCH_POWER_CROUCH_STAB,
GI_VB_PATCH_SIDEROLL,
GI_VB_TATL_CONVERSATION_AVAILABLE,
GI_VB_PREVENT_MASK_TRANSFORMATION_CS,
GI_VB_RESET_PUTAWAY_TIMER,
GI_VB_SET_CLIMB_SPEED,
GI_VB_PREVENT_CLOCK_DISPLAY,
GI_VB_SONG_AVAILABLE_TO_PLAY,
GI_VB_USE_CUSTOM_CAMERA,
GI_VB_DELETE_OWL_SAVE,
GI_VB_CONSIDER_BUNNY_HOOD_EQUIPPED,
GI_VB_USE_ITEM_EQUIP_MASK,
GI_VB_KALEIDO_DISPLAY_ITEM_TEXT,
GI_VB_USE_ITEM_CONSIDER_LINK_HUMAN,
GI_VB_DRAW_ITEM_EQUIPPED_OUTLINE,
GI_VB_PLAY_TRANSITION_CS,
GI_VB_TATL_INTERUPT_MSG3,
GI_VB_TATL_INTERUPT_MSG6,
GI_VB_ITEM_BE_RESTRICTED,
GI_VB_FLIP_HOP_VARIABLE,
GI_VB_DISABLE_LETTERBOX,
GI_VB_CLOCK_TOWER_OPENING_CONSIDER_THIS_FIRST_CYCLE,
GI_VB_DRAW_SLIME_BODY_ITEM,
GI_VB_ZTARGET_SPEED_CHECK,
VB_SHOW_TITLE_CARD,
VB_PLAY_ENTRANCE_CS,
VB_DISABLE_FD_MASK,
VB_DOGGY_RACE_SET_MAX_SPEED,
VB_LOWER_RAZOR_SWORD_DURABILITY,
VB_SET_BLAST_MASK_COOLDOWN_TIMER,
VB_PATCH_POWER_CROUCH_STAB,
VB_PATCH_SIDEROLL,
VB_TATL_CONVERSATION_AVAILABLE,
VB_PREVENT_MASK_TRANSFORMATION_CS,
VB_RESET_PUTAWAY_TIMER,
VB_SET_CLIMB_SPEED,
VB_PREVENT_CLOCK_DISPLAY,
VB_SONG_AVAILABLE_TO_PLAY,
VB_USE_CUSTOM_CAMERA,
VB_DELETE_OWL_SAVE,
VB_CONSIDER_BUNNY_HOOD_EQUIPPED,
VB_USE_ITEM_EQUIP_MASK,
VB_KALEIDO_DISPLAY_ITEM_TEXT,
VB_USE_ITEM_CONSIDER_LINK_HUMAN,
VB_DRAW_ITEM_EQUIPPED_OUTLINE,
VB_PLAY_TRANSITION_CS,
VB_TATL_INTERUPT_MSG3,
VB_TATL_INTERUPT_MSG6,
VB_ITEM_BE_RESTRICTED,
VB_FLIP_HOP_VARIABLE,
VB_DISABLE_LETTERBOX,
VB_CLOCK_TOWER_OPENING_CONSIDER_THIS_FIRST_CYCLE,
VB_DRAW_SLIME_BODY_ITEM,
VB_ZTARGET_SPEED_CHECK,
} GIVanillaBehavior;
typedef enum {

2
mm/2s2h/Enhancements/Graphics/3DItemDrops.cpp
View File

@ -180,7 +180,7 @@ void Register3DItemDrops() {
actor->shape.rot.y += 0x3C0;
}
});
slimeVBHookID = REGISTER_VB_SHOULD(GI_VB_DRAW_SLIME_BODY_ITEM, {
slimeVBHookID = REGISTER_VB_SHOULD(VB_DRAW_SLIME_BODY_ITEM, {
Actor* actor = va_arg(args, Actor*);
DrawSlime3DItem(actor, should);
});

2
mm/2s2h/Enhancements/Graphics/3DSClock.cpp
View File

@ -50,7 +50,7 @@ s16 finalHoursClockSlots[8];
void Register3DSClock() {
REGISTER_VB_SHOULD(GI_VB_PREVENT_CLOCK_DISPLAY, {
REGISTER_VB_SHOULD(VB_PREVENT_CLOCK_DISPLAY, {
if (CVarGetInteger("gEnhancements.Graphics.ClockType", CLOCK_TYPE_ORIGINAL) == CLOCK_TYPE_3DS) {
*should = true;

2
mm/2s2h/Enhancements/Graphics/DisableBlackBars.cpp
View File

@ -3,7 +3,7 @@
#include "DisableBlackBars.h"
void RegisterDisableBlackBars() {
REGISTER_VB_SHOULD(GI_VB_DISABLE_LETTERBOX, {
REGISTER_VB_SHOULD(VB_DISABLE_LETTERBOX, {
if (CVarGetInteger("gEnhancements.Graphics.DisableBlackBars", 0)) {
*should = true;
}

2
mm/2s2h/Enhancements/Graphics/TextBasedClock.cpp
View File

@ -13,7 +13,7 @@ extern PlayState* gPlayState;
}
void RegisterTextBasedClock() {
REGISTER_VB_SHOULD(GI_VB_PREVENT_CLOCK_DISPLAY, {
REGISTER_VB_SHOULD(VB_PREVENT_CLOCK_DISPLAY, {
if (CVarGetInteger("gEnhancements.Graphics.ClockType", CLOCK_TYPE_ORIGINAL) == CLOCK_TYPE_TEXT_BASED) {
*should = true;

2
mm/2s2h/Enhancements/Masks/FastTransformation.cpp
View File

@ -16,7 +16,7 @@ void TransitionFade_SetColor(void* thisx, u32 color);
}
void RegisterFastTransformation() {
REGISTER_VB_SHOULD(GI_VB_PREVENT_MASK_TRANSFORMATION_CS, {
REGISTER_VB_SHOULD(VB_PREVENT_MASK_TRANSFORMATION_CS, {
if (CVarGetInteger("gEnhancements.Masks.FastTransformation", 0)) {
*should = true;
Player* player = GET_PLAYER(gPlayState);

2
mm/2s2h/Enhancements/Masks/FierceDeityAnywhere.cpp
View File

@ -2,7 +2,7 @@
#include "Enhancements/GameInteractor/GameInteractor.h"
void RegisterFierceDeityAnywhere() {
REGISTER_VB_SHOULD(GI_VB_DISABLE_FD_MASK, {
REGISTER_VB_SHOULD(VB_DISABLE_FD_MASK, {
if (CVarGetInteger("gEnhancements.Masks.FierceDeitysAnywhere", 0)) {
*should = false;
}

2
mm/2s2h/Enhancements/Masks/NoBlastMaskCooldown.cpp
View File

@ -2,7 +2,7 @@
#include "Enhancements/GameInteractor/GameInteractor.h"
void RegisterNoBlastMaskCooldown() {
REGISTER_VB_SHOULD(GI_VB_SET_BLAST_MASK_COOLDOWN_TIMER, {
REGISTER_VB_SHOULD(VB_SET_BLAST_MASK_COOLDOWN_TIMER, {
if (CVarGetInteger("gEnhancements.Masks.NoBlastMaskCooldown", 0)) {
*should = false;
}

12
mm/2s2h/Enhancements/Masks/PersistentMasks.cpp
View File

@ -137,14 +137,14 @@ void RegisterPersistentMasks() {
[](s8 sceneId, s8 spawnNum) { UpdatePersistentMasksState(); });
// Speed the player up when the bunny hood state is active
REGISTER_VB_SHOULD(GI_VB_CONSIDER_BUNNY_HOOD_EQUIPPED, {
REGISTER_VB_SHOULD(VB_CONSIDER_BUNNY_HOOD_EQUIPPED, {
if (CVarGetInteger("gEnhancements.Masks.PersistentBunnyHood.State", 0)) {
*should = true;
}
});
// Overrides allowing them to equip a mask while transformed
REGISTER_VB_SHOULD(GI_VB_USE_ITEM_CONSIDER_LINK_HUMAN, {
REGISTER_VB_SHOULD(VB_USE_ITEM_CONSIDER_LINK_HUMAN, {
PlayerItemAction* itemAction = va_arg(args, PlayerItemAction*);
if (CVarGetInteger("gEnhancements.Masks.PersistentBunnyHood.Enabled", 0) &&
*itemAction == PLAYER_IA_MASK_BUNNY) {
@ -153,7 +153,7 @@ void RegisterPersistentMasks() {
});
// When they do equip the mask, prevent it and instead set our state
REGISTER_VB_SHOULD(GI_VB_USE_ITEM_EQUIP_MASK, {
REGISTER_VB_SHOULD(VB_USE_ITEM_EQUIP_MASK, {
PlayerMask* maskId = va_arg(args, PlayerMask*);
Player* player = GET_PLAYER(gPlayState);
@ -172,7 +172,7 @@ void RegisterPersistentMasks() {
// Prevent the "equipped" white border from being drawn so ours shows instead (ours was drawn before it, so it's
// underneath)
REGISTER_VB_SHOULD(GI_VB_DRAW_ITEM_EQUIPPED_OUTLINE, {
REGISTER_VB_SHOULD(VB_DRAW_ITEM_EQUIPPED_OUTLINE, {
ItemId* itemId = va_arg(args, ItemId*);
if (*itemId == ITEM_MASK_BUNNY && CVarGetInteger("gEnhancements.Masks.PersistentBunnyHood.State", 0)) {
*should = false;
@ -180,7 +180,7 @@ void RegisterPersistentMasks() {
});
// Typically when you are in a transformation all masks are dimmed on the C-Buttons
REGISTER_VB_SHOULD(GI_VB_ITEM_BE_RESTRICTED, {
REGISTER_VB_SHOULD(VB_ITEM_BE_RESTRICTED, {
ItemId* itemId = va_arg(args, ItemId*);
if (*itemId == ITEM_MASK_BUNNY && CVarGetInteger("gEnhancements.Masks.PersistentBunnyHood.Enabled", 0)) {
*should = false;
@ -188,7 +188,7 @@ void RegisterPersistentMasks() {
});
// Override "A" press behavior on kaleido scope to toggle the mask state
REGISTER_VB_SHOULD(GI_VB_KALEIDO_DISPLAY_ITEM_TEXT, {
REGISTER_VB_SHOULD(VB_KALEIDO_DISPLAY_ITEM_TEXT, {
ItemId* itemId = va_arg(args, ItemId*);
if (CVarGetInteger("gEnhancements.Masks.PersistentBunnyHood.Enabled", 0) && *itemId == ITEM_MASK_BUNNY) {
*should = false;

2
mm/2s2h/Enhancements/Minigames/AlwaysWinDoggyRace.cpp
View File

@ -9,7 +9,7 @@ extern u8 gItemSlots[77];
}
void RegisterAlwaysWinDoggyRace() {
REGISTER_VB_SHOULD(GI_VB_DOGGY_RACE_SET_MAX_SPEED, {
REGISTER_VB_SHOULD(VB_DOGGY_RACE_SET_MAX_SPEED, {
uint8_t selectedOption = CVarGetInteger("gEnhancements.Minigames.AlwaysWinDoggyRace", 0);
if (selectedOption == ALWAYS_WIN_DOGGY_RACE_ALWAYS || (selectedOption == ALWAYS_WIN_DOGGY_RACE_MASKOFTRUTH &&
(INV_CONTENT(ITEM_MASK_TRUTH) == ITEM_MASK_TRUTH))) {

2
mm/2s2h/Enhancements/Player/ClimbSpeed.cpp
View File

@ -2,7 +2,7 @@
#include "Enhancements/GameInteractor/GameInteractor.h"
void RegisterClimbSpeed() {
REGISTER_VB_SHOULD(GI_VB_SET_CLIMB_SPEED, {
REGISTER_VB_SHOULD(VB_SET_CLIMB_SPEED, {
if (CVarGetInteger("gEnhancements.Player.ClimbSpeed", 1) > 1) {
f32* speed = va_arg(args, f32*);
*speed *= CVarGetInteger("gEnhancements.Player.ClimbSpeed", 1);

2
mm/2s2h/Enhancements/Player/InstantPutaway.cpp
View File

@ -2,7 +2,7 @@
#include "Enhancements/GameInteractor/GameInteractor.h"
void RegisterInstantPutaway() {
REGISTER_VB_SHOULD(GI_VB_RESET_PUTAWAY_TIMER, {
REGISTER_VB_SHOULD(VB_RESET_PUTAWAY_TIMER, {
if (CVarGetInteger("gEnhancements.Player.InstantPutaway", 0)) {
*should = false;
}

2
mm/2s2h/Enhancements/Restorations/FlipHopVariable.cpp
View File

@ -2,7 +2,7 @@
#include "Enhancements/GameInteractor/GameInteractor.h"
void RegisterVariableFlipHop() {
REGISTER_VB_SHOULD(GI_VB_FLIP_HOP_VARIABLE, {
REGISTER_VB_SHOULD(VB_FLIP_HOP_VARIABLE, {
if (CVarGetInteger("gEnhancements.Restorations.ConstantFlipsHops", 0)) {
*should = false;
}

2
mm/2s2h/Enhancements/Restorations/PowerCrouchStab.cpp
View File

@ -2,7 +2,7 @@
#include "Enhancements/GameInteractor/GameInteractor.h"
void RegisterPowerCrouchStab() {
REGISTER_VB_SHOULD(GI_VB_PATCH_POWER_CROUCH_STAB, {
REGISTER_VB_SHOULD(VB_PATCH_POWER_CROUCH_STAB, {
if (CVarGetInteger("gEnhancements.Restorations.PowerCrouchStab", 0)) {
*should = false;
}

2
mm/2s2h/Enhancements/Restorations/SideRoll.cpp
View File

@ -2,7 +2,7 @@
#include "Enhancements/GameInteractor/GameInteractor.h"
void RegisterSideRoll() {
REGISTER_VB_SHOULD(GI_VB_PATCH_SIDEROLL, {
REGISTER_VB_SHOULD(VB_PATCH_SIDEROLL, {
if (CVarGetInteger("gEnhancements.Restorations.SideRoll", 0)) {
*should = false;
}

2
mm/2s2h/Enhancements/Restorations/TatlISG.cpp
View File

@ -2,7 +2,7 @@
#include "Enhancements/GameInteractor/GameInteractor.h"
void RegisterTatlISG() {
REGISTER_VB_SHOULD(GI_VB_TATL_CONVERSATION_AVAILABLE, {
REGISTER_VB_SHOULD(VB_TATL_CONVERSATION_AVAILABLE, {
if (CVarGetInteger("gEnhancements.Restorations.TatlISG", 0)) {
*should = false;
}

2
mm/2s2h/Enhancements/Saving/SavingEnhancements.cpp
View File

@ -147,7 +147,7 @@ void HandleAutoSave() {
}
void RegisterSavingEnhancements() {
REGISTER_VB_SHOULD(GI_VB_DELETE_OWL_SAVE, {
REGISTER_VB_SHOULD(VB_DELETE_OWL_SAVE, {
if (CVarGetInteger("gEnhancements.Saving.PersistentOwlSaves", 0) ||
gSaveContext.save.shipSaveInfo.pauseSaveEntrance != -1) {
*should = false;

2
mm/2s2h/Enhancements/Songs/EnableSunsSong.cpp
View File

@ -6,7 +6,7 @@ extern "C" {
}
void RegisterEnableSunsSong() {
REGISTER_VB_SHOULD(GI_VB_SONG_AVAILABLE_TO_PLAY, {
REGISTER_VB_SHOULD(VB_SONG_AVAILABLE_TO_PLAY, {
uint8_t* songIndex = va_arg(args, uint8_t*);
// If the enhancement is on, and the currently played song is Sun's Song, set it to be available to be played.
if (CVarGetInteger("gEnhancements.Songs.EnableSunsSong", 0) && *songIndex == OCARINA_SONG_SUNS) {

2
mm/src/audio/code_8019AF00.c
View File

@ -2555,7 +2555,7 @@ void AudioOcarina_CheckSongsWithoutMusicStaff(void) {
for (songIndex = sFirstOcarinaSongIndex; songIndex < sLastOcarinaSongIndex; songIndex++) {
// Checks to see if the song is available to be played
bool vanillaCondition = (u32)sOcarinaAvailableSongFlags & (1 << songIndex);
if (GameInteractor_Should(GI_VB_SONG_AVAILABLE_TO_PLAY, vanillaCondition, &songIndex)) {
if (GameInteractor_Should(VB_SONG_AVAILABLE_TO_PLAY, vanillaCondition, &songIndex)) {
// Loops through all possible starting indices?
// Loops through the notes of the song?
for (j = 0, k = 0; (j < gOcarinaSongButtons[songIndex].numButtons) && (k == 0) &&

2
mm/src/code/z_camera.c
View File

@ -7554,7 +7554,7 @@ Vec3s Camera_Update(Camera* camera) {
}
// Call the camera update function
if (GameInteractor_Should(GI_VB_USE_CUSTOM_CAMERA, true, camera)) {
if (GameInteractor_Should(VB_USE_CUSTOM_CAMERA, true, camera)) {
sCameraUpdateHandlers[sCameraSettings[camera->setting].cameraModes[camera->mode].funcId](camera);
}

6
mm/src/code/z_demo.c
View File

@ -1545,7 +1545,7 @@ void Cutscene_HandleEntranceTriggers(PlayState* play) {
} else if (!CHECK_CS_SPAWN_FLAG_WEEKEVENTREG(play->csCtx.scriptList[scriptIndex].spawnFlags)) {
// Entrance cutscenes that only run once
SET_CS_SPAWN_FLAG_WEEKEVENTREG(play->csCtx.scriptList[scriptIndex].spawnFlags);
if (GameInteractor_Should(GI_VB_PLAY_ENTRANCE_CS, true)) {
if (GameInteractor_Should(VB_PLAY_ENTRANCE_CS, true)) {
CutsceneManager_Start(csId, NULL);
}
// The title card will be used by the cs misc command if necessary.
@ -1561,7 +1561,7 @@ void Cutscene_HandleEntranceTriggers(PlayState* play) {
if ((gSaveContext.respawnFlag == 0) || (gSaveContext.respawnFlag == -2)) {
scene = play->loadedScene;
if ((scene->titleTextId != 0) && GameInteractor_Should(GI_VB_SHOW_TITLE_CARD, gSaveContext.showTitleCard)) {
if ((scene->titleTextId != 0) && GameInteractor_Should(VB_SHOW_TITLE_CARD, gSaveContext.showTitleCard)) {
if ((Entrance_GetTransitionFlags(((void)0, gSaveContext.save.entrance) +
((void)0, gSaveContext.sceneLayer)) &
0x4000) != 0) {
@ -1580,7 +1580,7 @@ void func_800EDDB0(PlayState* play) {
LUSLOG_INFO("Cutscene_HandleConditionalTriggers: entrance: %d, cutsceneIndex: 0x%X", gSaveContext.save.entrance,
gSaveContext.save.cutsceneIndex);
if (!GameInteractor_Should(GI_VB_PLAY_TRANSITION_CS, true)) {
if (!GameInteractor_Should(VB_PLAY_TRANSITION_CS, true)) {
return;
}
}

2
mm/src/code/z_message.c
View File

@ -4589,7 +4589,7 @@ void Message_DrawMain(PlayState* play, Gfx** gfxP) {
AudioOcarina_SetOcarinaDisableTimer(0, 20);
Message_CloseTextbox(play);
play->msgCtx.ocarinaMode = OCARINA_MODE_PLAYED_FULL_EVAN_SONG;
} else if (GameInteractor_Should(GI_VB_SONG_AVAILABLE_TO_PLAY, vanillaOwnedSongCheck,
} else if (GameInteractor_Should(VB_SONG_AVAILABLE_TO_PLAY, vanillaOwnedSongCheck,
&msgCtx->ocarinaStaff->state)) {
sLastPlayedSong = msgCtx->ocarinaStaff->state;
msgCtx->lastPlayedSong = msgCtx->ocarinaStaff->state;

14
mm/src/code/z_parameter.c
View File

@ -2782,8 +2782,8 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
for (i = EQUIP_SLOT_C_LEFT; i <= EQUIP_SLOT_C_RIGHT; i++) {
// Individual C button
ItemId itemId = GET_CUR_FORM_BTN_ITEM(i);
if (GameInteractor_Should(GI_VB_ITEM_BE_RESTRICTED,
!gPlayerFormItemRestrictions[GET_PLAYER_FORM][itemId], &itemId)) {
if (GameInteractor_Should(VB_ITEM_BE_RESTRICTED, !gPlayerFormItemRestrictions[GET_PLAYER_FORM][itemId],
&itemId)) {
// Item not usable in current playerForm
if (gSaveContext.buttonStatus[i] != BTN_DISABLED) {
gSaveContext.buttonStatus[i] = BTN_DISABLED;
@ -2823,7 +2823,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
(play->sceneId != SCENE_MITURIN_BS) && (play->sceneId != SCENE_HAKUGIN_BS) &&
(play->sceneId != SCENE_SEA_BS) && (play->sceneId != SCENE_INISIE_BS) &&
(play->sceneId != SCENE_LAST_BS);
if (GameInteractor_Should(GI_VB_DISABLE_FD_MASK, vanillaSceneConditionResult)) {
if (GameInteractor_Should(VB_DISABLE_FD_MASK, vanillaSceneConditionResult)) {
if (gSaveContext.buttonStatus[i] != BTN_DISABLED) {
gSaveContext.buttonStatus[i] = BTN_DISABLED;
restoreHudVisibility = true;
@ -2929,8 +2929,8 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
for (s16 j = EQUIP_SLOT_D_RIGHT; j <= EQUIP_SLOT_D_UP; j++) {
// Individual D button
ItemId itemId = DPAD_GET_CUR_FORM_BTN_ITEM(j);
if (GameInteractor_Should(GI_VB_ITEM_BE_RESTRICTED,
!gPlayerFormItemRestrictions[GET_PLAYER_FORM][itemId], &itemId)) {
if (GameInteractor_Should(VB_ITEM_BE_RESTRICTED, !gPlayerFormItemRestrictions[GET_PLAYER_FORM][itemId],
&itemId)) {
// Item not usable in current playerForm
if (gSaveContext.shipSaveContext.dpad.status[j] != BTN_DISABLED) {
gSaveContext.shipSaveContext.dpad.status[j] = BTN_DISABLED;
@ -2970,7 +2970,7 @@ void Interface_UpdateButtonsPart2(PlayState* play) {
(play->sceneId != SCENE_MITURIN_BS) && (play->sceneId != SCENE_HAKUGIN_BS) &&
(play->sceneId != SCENE_SEA_BS) && (play->sceneId != SCENE_INISIE_BS) &&
(play->sceneId != SCENE_LAST_BS);
if (GameInteractor_Should(GI_VB_DISABLE_FD_MASK, vanillaSceneConditionResult)) {
if (GameInteractor_Should(VB_DISABLE_FD_MASK, vanillaSceneConditionResult)) {
if (gSaveContext.shipSaveContext.dpad.status[j] != BTN_DISABLED) {
gSaveContext.shipSaveContext.dpad.status[j] = BTN_DISABLED;
restoreHudVisibility = true;
@ -6151,7 +6151,7 @@ void Interface_DrawClock(PlayState* play) {
s16 finalHoursClockSlots[8];
s16 index;
if (GameInteractor_Should(GI_VB_PREVENT_CLOCK_DISPLAY, false)) {
if (GameInteractor_Should(VB_PREVENT_CLOCK_DISPLAY, false)) {
return;
}

2
mm/src/code/z_shrink_window.c
View File

@ -80,7 +80,7 @@ void ShrinkWindow_Draw(GraphicsContext* gfxCtx) {
s8 letterboxSize = sShrinkWindowPtr->letterboxSize;
s8 pillarboxSize = sShrinkWindowPtr->pillarboxSize;
if (GameInteractor_Should(GI_VB_DISABLE_LETTERBOX, false)) {
if (GameInteractor_Should(VB_DISABLE_LETTERBOX, false)) {
return;
}

2
mm/src/code/z_sram_NES.c
View File

@ -1373,7 +1373,7 @@ void Sram_OpenSave(FileSelectState* fileSelect, SramContext* sramCtx) {
fileNum = gSaveContext.fileNum;
// Remove Owl saves on save continue
if (GameInteractor_Should(GI_VB_DELETE_OWL_SAVE, true)) {
if (GameInteractor_Should(VB_DELETE_OWL_SAVE, true)) {
func_80147314(sramCtx, fileNum);
}
}

2
mm/src/code/z_view.c
View File

@ -160,7 +160,7 @@ void View_ApplyLetterbox(View* view) {
s32 lrx;
s32 lry;
if (GameInteractor_Should(GI_VB_DISABLE_LETTERBOX, false)) {
if (GameInteractor_Should(VB_DISABLE_LETTERBOX, false)) {
return;
}

2
mm/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c
View File

@ -106,7 +106,7 @@ void func_80A2CF7C(ElfMsg3* this, PlayState* play) {
EnElf* tatl = (EnElf*)player->tatlActor;
if (GameInteractor_Should(
GI_VB_TATL_INTERUPT_MSG3,
VB_TATL_INTERUPT_MSG3,
(((((player->tatlActor != NULL) &&
(fabsf(player->actor.world.pos.x - this->actor.world.pos.x) < (100.0f * this->actor.scale.x))) &&
(this->actor.world.pos.y <= player->actor.world.pos.y)) &&

2
mm/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c
View File

@ -238,7 +238,7 @@ void ElfMsg6_Destroy(Actor* thisx, PlayState* play) {
s32 func_80BA1C00(ElfMsg6* this) {
return GameInteractor_Should(
GI_VB_TATL_INTERUPT_MSG6,
VB_TATL_INTERUPT_MSG6,
((this->actor.xzDistToPlayer < (100.0f * this->actor.scale.x)) &&
((this->actor.playerHeightRel >= 0.0f) && (this->actor.playerHeightRel < (100.0f * this->actor.scale.y)))),
this);

2
mm/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c
View File

@ -519,7 +519,7 @@ void EnRacedog_UpdateSpeed(EnRacedog* this) {
// Cap the speed of the dog, or always max it out with the 'Always Win Doggy Race' enhancement.
bool vanillaCondition = this->actor.speed > 7.5f;
if (GameInteractor_Should(GI_VB_DOGGY_RACE_SET_MAX_SPEED, vanillaCondition)) {
if (GameInteractor_Should(VB_DOGGY_RACE_SET_MAX_SPEED, vanillaCondition)) {
this->actor.speed = 7.5f;
}
} else {

2
mm/src/overlays/actors/ovl_En_Slime/z_en_slime.c
View File

@ -1242,7 +1242,7 @@ void EnSlime_Draw(Actor* thisx, PlayState* play) {
Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y + (2000.0f * this->actor.scale.y),
this->actor.world.pos.z, MTXMODE_NEW);
if (GameInteractor_Should(GI_VB_DRAW_SLIME_BODY_ITEM, true, this)) {
if (GameInteractor_Should(VB_DRAW_SLIME_BODY_ITEM, true, this)) {
Matrix_Scale(0.03f, 0.03f, 0.03f, MTXMODE_APPLY);
gSPSegment(POLY_OPA_DISP++, 8, (uintptr_t)this->itemDropTex);

2
mm/src/overlays/actors/ovl_En_Test4/z_en_test4.c
View File

@ -444,7 +444,7 @@ void func_80A42AB8(EnTest4* this, PlayState* play) {
if (CURRENT_DAY == 3) {
if ((this->nextBellTime == CLOCK_TIME(0, 0)) &&
(GameInteractor_Should(GI_VB_CLOCK_TOWER_OPENING_CONSIDER_THIS_FIRST_CYCLE,
(GameInteractor_Should(VB_CLOCK_TOWER_OPENING_CONSIDER_THIS_FIRST_CYCLE,
gSaveContext.save.saveInfo.inventory.items[SLOT_OCARINA] == ITEM_NONE,
this) ||
(play->sceneId == SCENE_CLOCKTOWER))) {

30
mm/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -3814,7 +3814,7 @@ void Player_ProcessItemButtons(Player* this, PlayState* play) {
if (bomb != NULL) {
bomb->timer = 0;
if (GameInteractor_Should(GI_VB_SET_BLAST_MASK_COOLDOWN_TIMER, true)) {
if (GameInteractor_Should(VB_SET_BLAST_MASK_COOLDOWN_TIMER, true)) {
this->blastMaskTimer = 310;
}
}
@ -4471,7 +4471,7 @@ void Player_UseItem(PlayState* play, Player* this, ItemId item) {
(itemAction == PLAYER_IA_MASK_ZORA) ||
((this->currentBoots >= PLAYER_BOOTS_ZORA_UNDERWATER) && (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND)))) {
s32 var_v1 = ((itemAction >= PLAYER_IA_MASK_MIN) && (itemAction <= PLAYER_IA_MASK_MAX) &&
(!GameInteractor_Should(GI_VB_USE_ITEM_CONSIDER_LINK_HUMAN,
(!GameInteractor_Should(VB_USE_ITEM_CONSIDER_LINK_HUMAN,
this->transformation == PLAYER_FORM_HUMAN, &itemAction) ||
(itemAction >= PLAYER_IA_MASK_GIANT)));
CollisionPoly* sp5C;
@ -4533,12 +4533,12 @@ void Player_UseItem(PlayState* play, Player* this, ItemId item) {
} else {
Audio_PlaySfx(NA_SE_SY_ERROR);
}
} else if (GameInteractor_Should(GI_VB_USE_ITEM_CONSIDER_LINK_HUMAN, this->transformation == PLAYER_FORM_HUMAN,
} else if (GameInteractor_Should(VB_USE_ITEM_CONSIDER_LINK_HUMAN, this->transformation == PLAYER_FORM_HUMAN,
&itemAction) &&
(itemAction >= PLAYER_IA_MASK_MIN) && (itemAction < PLAYER_IA_MASK_GIANT)) {
PlayerMask maskId = GET_MASK_FROM_IA(itemAction);
if (GameInteractor_Should(GI_VB_USE_ITEM_EQUIP_MASK, true, &maskId)) {
if (GameInteractor_Should(VB_USE_ITEM_EQUIP_MASK, true, &maskId)) {
// Handle wearable masks
this->prevMask = this->currentMask;
if (maskId == this->currentMask) {
@ -6720,7 +6720,7 @@ void func_80836AD8(PlayState* play, Player* this) {
}
void func_80836B3C(PlayState* play, Player* this, f32 arg2) {
if (GameInteractor_Should(GI_VB_PATCH_SIDEROLL, true)) {
if (GameInteractor_Should(VB_PATCH_SIDEROLL, true)) {
this->currentYaw = this->actor.shape.rot.y;
this->actor.world.rot.y = this->actor.shape.rot.y;
}
@ -7814,7 +7814,7 @@ s32 Player_ActionChange_4(Player* this, PlayState* play) {
// !CutsceneManager_IsNext(CS_ID_GLOBAL_TALK), which is what prevented Tatl ISG from
// working
bool vanillaCondition = !CutsceneManager_IsNext(CS_ID_GLOBAL_TALK);
if (GameInteractor_Should(GI_VB_TATL_CONVERSATION_AVAILABLE, vanillaCondition) ||
if (GameInteractor_Should(VB_TATL_CONVERSATION_AVAILABLE, vanillaCondition) ||
!CHECK_BTN_ALL(sPlayerControlInput->press.button, BTN_CUP)) {
return false;
}
@ -9597,7 +9597,7 @@ s32 func_8083E404(Player* this, f32 arg1, s16 arg2) {
}
// Using Should hook, but ignoring return value, to be able to modify the speed argument
GameInteractor_Should(GI_VB_ZTARGET_SPEED_CHECK, false, &arg1);
GameInteractor_Should(VB_ZTARGET_SPEED_CHECK, false, &arg1);
temp_fv1 = fabsf(sp1C) / 0x8000;
if (((SQ(temp_fv1) * 50.0f) + 6.0f) < arg1) {
@ -10099,7 +10099,7 @@ s32 func_8083FD80(Player* this, PlayState* play) {
if (!Player_IsGoronOrDeku(this) && (Player_GetMeleeWeaponHeld(this) != PLAYER_MELEEWEAPON_NONE) &&
(this->transformation != PLAYER_FORM_ZORA) && sPlayerUseHeldItem) {
//! Calling this function sets the meleeWeaponQuads' damage properties correctly, patching "Power Crouch Stab".
if (GameInteractor_Should(GI_VB_PATCH_POWER_CROUCH_STAB, true)) {
if (GameInteractor_Should(VB_PATCH_POWER_CROUCH_STAB, true)) {
func_8083375C(this, PLAYER_MWA_STAB_1H);
}
Player_AnimationPlayOnce(play, this, &gPlayerAnim_link_normal_defense_kiru);
@ -10146,7 +10146,7 @@ s32 func_8083FF30(PlayState* play, Player* this) {
s32 func_8083FFEC(PlayState* play, Player* this) {
if (this->heldItemAction == PLAYER_IA_SWORD_RAZOR) {
if (gSaveContext.save.saveInfo.playerData.swordHealth > 0) {
if (GameInteractor_Should(GI_VB_LOWER_RAZOR_SWORD_DURABILITY, true)) {
if (GameInteractor_Should(VB_LOWER_RAZOR_SWORD_DURABILITY, true)) {
gSaveContext.save.saveInfo.playerData.swordHealth--;
}
if (gSaveContext.save.saveInfo.playerData.swordHealth <= 0) {
@ -11256,7 +11256,7 @@ void Player_SetDoAction(PlayState* play, Player* this) {
}
if (doActionA != DO_ACTION_PUTAWAY) {
if (GameInteractor_Should(GI_VB_RESET_PUTAWAY_TIMER, true)) {
if (GameInteractor_Should(VB_RESET_PUTAWAY_TIMER, true)) {
this->putAwayCountdown = 20;
}
} else if (this->putAwayCountdown != 0) {
@ -12202,7 +12202,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) {
this->actor.shape.face = ((play->gameplayFrames & 0x20) ? 0 : 3) + this->blinkInfo.eyeTexIndex;
if (GameInteractor_Should(GI_VB_CONSIDER_BUNNY_HOOD_EQUIPPED, this->currentMask == PLAYER_MASK_BUNNY, this)) {
if (GameInteractor_Should(VB_CONSIDER_BUNNY_HOOD_EQUIPPED, this->currentMask == PLAYER_MASK_BUNNY, this)) {
Player_UpdateBunnyEars(this);
}
@ -14469,7 +14469,7 @@ void Player_Action_13(Player* this, PlayState* play) {
Player_GetMovementSpeedAndYaw(this, &speedTarget, &yawTarget, SPEED_MODE_CURVED, play);
if (GameInteractor_Should(GI_VB_CONSIDER_BUNNY_HOOD_EQUIPPED, this->currentMask == PLAYER_MASK_BUNNY, this)) {
if (GameInteractor_Should(VB_CONSIDER_BUNNY_HOOD_EQUIPPED, this->currentMask == PLAYER_MASK_BUNNY, this)) {
speedTarget *= 1.5f;
}
@ -14898,7 +14898,7 @@ void Player_Action_25(Player* this, PlayState* play) {
Math_StepToF(&this->unk_B10[1], 0.0f, this->unk_B10[0]);
}
} else {
if (GameInteractor_Should(GI_VB_FLIP_HOP_VARIABLE, true)) {
if (GameInteractor_Should(VB_FLIP_HOP_VARIABLE, true)) {
func_8083CBC4(this, speedTarget, yawTarget, 1.0f, 0.05f, 0.1f, 0xC8);
}
}
@ -16036,7 +16036,7 @@ void Player_Action_50(Player* this, PlayState* play) {
var_fv1 = -1.0f;
}
if (GameInteractor_Should(GI_VB_SET_CLIMB_SPEED, true, &var_fv1)) {
if (GameInteractor_Should(VB_SET_CLIMB_SPEED, true, &var_fv1)) {
this->skelAnime.playSpeed = var_fv1 * var_fv0;
}
@ -18295,7 +18295,7 @@ void Player_Action_86(Player* this, PlayState* play) {
struct_8085D910* sp4C = D_8085D910;
s32 sp48 = false;
if (GameInteractor_Should(GI_VB_PREVENT_MASK_TRANSFORMATION_CS, false))
if (GameInteractor_Should(VB_PREVENT_MASK_TRANSFORMATION_CS, false))
return;
func_808323C0(this, play->playerCsIds[PLAYER_CS_ID_MASK_TRANSFORMATION]);

2
mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c
View File

@ -327,7 +327,7 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
// but this matches the behavior of the original code
u16 itemId = gSaveContext.save.saveInfo.inventory.items[i];
u8 itemRestricted = GameInteractor_Should(
GI_VB_ITEM_BE_RESTRICTED, !gPlayerFormItemRestrictions[GET_PLAYER_FORM][(s32)itemId], &itemId);
VB_ITEM_BE_RESTRICTED, !gPlayerFormItemRestrictions[GET_PLAYER_FORM][(s32)itemId], &itemId);
if (itemRestricted) {
gDPSetGrayscaleColor(POLY_OPA_DISP++, 109, 109, 109, 255);
gSPGrayscale(POLY_OPA_DISP++, true);

7
mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_mask.c
View File

@ -211,7 +211,7 @@ void KaleidoScope_DrawMaskSelect(PlayState* play) {
if (GET_CUR_FORM_BTN_ITEM(i + 1) != ITEM_NONE) {
if (GET_CUR_FORM_BTN_SLOT(i + 1) >= ITEM_NUM_SLOTS) {
ItemId item = GET_CUR_FORM_BTN_ITEM(i + 1);
if (GameInteractor_Should(GI_VB_DRAW_ITEM_EQUIPPED_OUTLINE, true, &item)) {
if (GameInteractor_Should(VB_DRAW_ITEM_EQUIPPED_OUTLINE, true, &item)) {
gSPVertex(POLY_OPA_DISP++, &pauseCtx->maskVtx[j], 4, 0);
POLY_OPA_DISP = Gfx_DrawTexQuadIA8(POLY_OPA_DISP, gEquippedItemOutlineTex, 32, 32, 0);
}
@ -224,7 +224,7 @@ void KaleidoScope_DrawMaskSelect(PlayState* play) {
if (DPAD_GET_CUR_FORM_BTN_ITEM(i) != ITEM_NONE) {
if (DPAD_GET_CUR_FORM_BTN_SLOT(i) >= ITEM_NUM_SLOTS) {
ItemId item = DPAD_GET_CUR_FORM_BTN_ITEM(i);
if (GameInteractor_Should(GI_VB_DRAW_ITEM_EQUIPPED_OUTLINE, true, &item)) {
if (GameInteractor_Should(VB_DRAW_ITEM_EQUIPPED_OUTLINE, true, &item)) {
gSPVertex(POLY_OPA_DISP++, &pauseCtx->maskVtx[j], 4, 0);
POLY_OPA_DISP = Gfx_DrawTexQuadIA8(POLY_OPA_DISP, gEquippedItemOutlineTex, 32, 32, 0);
}
@ -675,8 +675,7 @@ void KaleidoScope_UpdateMaskCursor(PlayState* play) {
} else if ((pauseCtx->debugEditor == DEBUG_EDITOR_NONE) && (pauseCtx->state == PAUSE_STATE_MAIN) &&
(pauseCtx->mainState == PAUSE_MAIN_STATE_IDLE) &&
CHECK_BTN_ALL(input->press.button, BTN_A) && (msgCtx->msgLength == 0)) {
if (GameInteractor_Should(GI_VB_KALEIDO_DISPLAY_ITEM_TEXT, true,
&pauseCtx->cursorItem[PAUSE_MASK])) {
if (GameInteractor_Should(VB_KALEIDO_DISPLAY_ITEM_TEXT, true, &pauseCtx->cursorItem[PAUSE_MASK])) {
// Give description on item through a message box
pauseCtx->itemDescriptionOn = true;
if (pauseCtx->cursorYIndex[PAUSE_MASK] < 2) {