mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-24 07:20:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into tilemap-docs

Browse Source
This commit is contained in:
octorock
2023-12-28 14:59:23 +01:00
parent b6a94d5062 dae4c66991
commit 768efa50b3
495 changed files with 14619 additions and 16191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/manager/minishPortalManager.c
+2 -2
View File
@@ -33,7 +33,7 @@ void MinishPortalManager_Main(MinishPortalManager* this) {
gArea.portal_type = super->type;
if (!CheckGlobalFlag(EZERO_1ST)) {
gArea.portal_mode = 1;
gArea.portal_type = 5;
gArea.portal_type = PT_5;
} else {
if ((gPlayerState.flags & PL_USE_PORTAL) && gPlayerState.jump_status == 0) {
gArea.portal_mode = 2;
@@ -82,7 +82,7 @@ void CreateMagicSparkles(u32 baseX, u32 baseY, u32 layer) {
}
bool32 PortalReadyForMinish(void) {
if ((gPlayerState.flags & PL_MINISH) && gPlayerState.attachedBeetleCount == 0 && (gArea.portal_type != 0x6) &&
if ((gPlayerState.flags & PL_MINISH) && gPlayerState.attachedBeetleCount == 0 && (gArea.portal_type != PT_TOD) &&
(gPlayerState.heldObject == 0)) {
switch (gPlayerState.framestate) {
case PL_STATE_IDLE:
src/manager/miscManager.c
+1 -1
View File
@@ -434,6 +434,6 @@ void MiscManager_TypeF(MiscManager* this) {
if (gPlayerEntity.action == PLAYER_TALKEZLO) {
DeleteThisEntity();
}
gInput.heldKeys |= 0x4;
gInput.heldKeys |= SELECT_BUTTON;
}
#endif
src/manager/rollingBarrelManager.c
+1 -1
View File
@@ -191,7 +191,7 @@ void sub_08058B5C(RollingBarrelManager* this, u32 unk1) {
gRoomTransition.player_status.start_anim = unk1 & 1 ? 4 : 0;
gRoomTransition.player_status.start_pos_x = gUnk_081082E8[unk1 * 3];
gRoomTransition.player_status.start_pos_y = gUnk_081082E8[unk1 * 3 + 1];
gSave.unk7 = gUnk_081082E8[unk1 * 3 + 2];
gSave.dws_barrel_state = gUnk_081082E8[unk1 * 3 + 2];
SoundReq(SFX_STAIRS);
}
src/manager/vaati3StartManager.c
+2 -2
View File
@@ -54,7 +54,7 @@ void Vaati3StartManager_Type0_Init(Vaati3StartManager* this) {
*(u8*)&gRoomTransition.field_0x3a = 0x20;
*((u8*)&gRoomTransition.field_0x3a + 1) = 0x20;
#if !defined(EU) && !defined(JP)
gSave.timers[3] = 0x1194;
gSave.vaati_timer = 0x1194;
#endif
}
@@ -71,7 +71,7 @@ void Vaati3StartManager_Type0_Action1(Vaati3StartManager* this) {
super->timer = 120;
SetPlayerControl(2);
sub_08078B48();
object = CreateObject(THUNDERBOLD, 0, 0);
object = CreateObject(THUNDERBOLT, 0, 0);
if (object != NULL) {
object->x.HALF.HI = gRoomControls.origin_x + 0x88;
object->y.HALF.HI = gRoomControls.origin_y + 0x48;
src/manager/vaatiAppearingManager.c
+4 -4
View File
@@ -138,16 +138,16 @@ void VaatiAppearingManager_Action2(VaatiAppearingManager* this) {
}
void VaatiAppearingManager_Action3(VaatiAppearingManager* this) {
if ((gInput.heldKeys & 0x40) != 0) {
if ((gInput.heldKeys & DPAD_UP) != 0) {
this->field_0x20--;
}
if ((gInput.heldKeys & 0x80) != 0) {
if ((gInput.heldKeys & DPAD_DOWN) != 0) {
this->field_0x20++;
}
if ((gInput.heldKeys & 0x20) != 0) {
if ((gInput.heldKeys & DPAD_LEFT) != 0) {
this->field_0x28--;
}
if ((gInput.heldKeys & 0x10) != 0) {
if ((gInput.heldKeys & DPAD_RIGHT) != 0) {
this->field_0x28++;
}
}