mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-04 10:41:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

label BounceUpdate asm

Browse Source
This commit is contained in:
theo3
2023-12-30 17:13:42 -08:00
parent 37723f5607
commit fb9f59fbbb
62 changed files with 230 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/playerItem/playerItemHeldObject.c
+1 -1
View File
@@ -137,7 +137,7 @@ void PlayerItemHeldObject_SubAction2(PlayerItemHeldObjectEntity* this) {
(child->base).x = super->x;
(child->base).y = super->y;
(child->base).z = super->z;
tile = GetTileUnderEntity(super);
tile = GetActTile(super);
switch (tile) {
case 0xd:
case 0x10:
src/playerItem/playerItemPacciCaneProjectile.c
+1 -1
View File
@@ -128,7 +128,7 @@ void PlayerItemPacciCaneProjectile_Action1(PlayerItemPacciCaneProjectileEntity*
}
if (sub_080B1BA4(COORD_TO_TILE(super), gPlayerEntity.collisionLayer, 0x80) == 0) {
if (sub_080040D8(super, &gUnk_08003E44, super->x.HALF.HI, super->y.HALF.HI) == 0) {
if (GetTileUnderEntity(super) == 0x19) {
if (GetActTile(super) == 0x19) {
super->action = 4;
COLLISION_OFF(super);
super->x.HALF.HI = (super->x.HALF.HI & 0xfff0) | 8;