mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-11 03:26:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #436 from octorock/rename-arm

Browse Source 
Use same names for arm functions and their trampolines
This commit is contained in:
notyourav
2022-03-08 17:22:42 -08:00
committed by GitHub
parent 5df0c09ac6 8f678d15ed
commit c330470f91
98 changed files with 476 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/beanstalk.c
+3 -3
View File
@@ -335,18 +335,18 @@ void Beanstalk_Action1Type9(BeanstalkEntity* this) {
if (super->subAction == 0) {
super->subAction = 1;
super->y.HALF.HI += 0x28;
this->unk_72 = sub_0800029C(super, 0, -0x18);
this->unk_72 = sub_080B1A0C(super, 0, -0x18);
}
super->spriteOrientation.flipY = gPlayerEntity.spriteOrientation.flipY;
super->spriteRendering.b3 = gPlayerEntity.spriteRendering.b3;
if (gPlayerState.floor_type == 0x1e) {
super->spritePriority.b0 = 0;
if (sub_0800029C(super, 0, -0x18) != 0x4014) {
if (sub_080B1A0C(super, 0, -0x18) != 0x4014) {
SetTile(0x4014, COORD_TO_TILE_OFFSET(super, 0, 0x18), 1);
}
} else {
super->spritePriority.b0 = 5;
if (this->unk_72 != sub_0800029C(super, 0, -0x18)) {
if (this->unk_72 != sub_080B1A0C(super, 0, -0x18)) {
SetTile(this->unk_72, COORD_TO_TILE_OFFSET(super, 0, 0x18), 1);
}
}
src/object/bigIceBlock.c
+16 -16
View File
@@ -145,27 +145,27 @@ void sub_08099910(BigIceBlockEntity* this) {
SetTile(0x4022, position, super->collisionLayer);
break;
case 1:
iVar1 = sub_080002C8(position - 0x41, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 0x41, super->collisionLayer);
uVar3 = 0x4024;
if (iVar1 == 0x12) {
uVar3 = 0x4079;
}
SetTile(uVar3, position - 0x41, super->collisionLayer);
SetTile(0x4022, position - 0x40, super->collisionLayer);
iVar1 = sub_080002C8(position - 0x3f, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 0x3f, super->collisionLayer);
uVar3 = 0x4025;
if (iVar1 == 0x12) {
uVar3 = 0x407b;
}
SetTile(uVar3, position - 0x3f, super->collisionLayer);
iVar1 = sub_080002C8(position - 1, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 1, super->collisionLayer);
uVar3 = 0x4024;
if (iVar1 == 0x12) {
uVar3 = 0x4079;
}
SetTile(uVar3, position - 1, super->collisionLayer);
SetTile(0x4022, position, super->collisionLayer);
iVar1 = sub_080002C8(position + 1, super->collisionLayer);
iVar1 = sub_080B1AE0(position + 1, super->collisionLayer);
uVar3 = 0x4025;
if (iVar1 == 0x12) {
uVar3 = 0x407b;
@@ -174,13 +174,13 @@ void sub_08099910(BigIceBlockEntity* this) {
return;
break;
case 2:
iVar1 = sub_080002C8(position - 0x41, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 0x41, super->collisionLayer);
uVar3 = 0x4023;
if (iVar1 == 0x12) {
uVar3 = 0x4077;
}
SetTile(uVar3, position - 0x41, super->collisionLayer);
iVar1 = sub_080002C8(position - 0x40, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 0x40, super->collisionLayer);
uVar3 = 0x4023;
if (iVar1 == 0x12) {
uVar3 = 0x4077;
@@ -188,13 +188,13 @@ void sub_08099910(BigIceBlockEntity* this) {
SetTile(uVar3, position - 0x40, super->collisionLayer);
SetTile(0x4022, position - 1, super->collisionLayer);
SetTile(0x4022, position, super->collisionLayer);
iVar1 = sub_080002C8(position + 0x3f, super->collisionLayer);
iVar1 = sub_080B1AE0(position + 0x3f, super->collisionLayer);
uVar3 = 0x4026;
if (iVar1 == 0x12) {
uVar3 = 0x407c;
}
SetTile(uVar3, position + 0x3f, super->collisionLayer);
iVar1 = sub_080002C8(position + 0x40, super->collisionLayer);
iVar1 = sub_080B1AE0(position + 0x40, super->collisionLayer);
uVar3 = 0x4026;
if (iVar1 == 0x12) {
uVar3 = 0x407c;
@@ -202,50 +202,50 @@ void sub_08099910(BigIceBlockEntity* this) {
SetTile(uVar3, position + 0x40, super->collisionLayer);
break;
case 3:
iVar1 = sub_080002C8(position - 0x41, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 0x41, super->collisionLayer);
uVar3 = 0x4027;
if (iVar1 == 0x12) {
uVar3 = 0x4075;
}
SetTile(uVar3, position - 0x41, super->collisionLayer);
iVar1 = sub_080002C8(position - 0x40, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 0x40, super->collisionLayer);
uVar3 = 0x4023;
if (iVar1 == 0x12) {
uVar3 = 0x4077;
}
SetTile(uVar3, position - 0x40, super->collisionLayer);
iVar1 = sub_080002C8(position - 0x3f, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 0x3f, super->collisionLayer);
uVar3 = 0x4028;
if (iVar1 == 0x12) {
uVar3 = 0x4076;
}
SetTile(uVar3, position - 0x3f, super->collisionLayer);
iVar1 = sub_080002C8(position - 1, super->collisionLayer);
iVar1 = sub_080B1AE0(position - 1, super->collisionLayer);
uVar3 = 0x4024;
if (iVar1 == 0x12) {
uVar3 = 0x4079;
}
SetTile(uVar3, position - 1, super->collisionLayer);
SetTile(0x4022, position, super->collisionLayer);
iVar1 = sub_080002C8(position + 1, super->collisionLayer);
iVar1 = sub_080B1AE0(position + 1, super->collisionLayer);
uVar3 = 0x4025;
if (iVar1 == 0x12) {
uVar3 = 0x407b;
}
SetTile(uVar3, position + 1, super->collisionLayer);
iVar1 = sub_080002C8(position + 0x3f, super->collisionLayer);
iVar1 = sub_080B1AE0(position + 0x3f, super->collisionLayer);
uVar3 = 0x4029;
if (iVar1 == 0x12) {
uVar3 = 0x4078;
}
SetTile(uVar3, position + 0x3f, super->collisionLayer);
iVar1 = sub_080002C8(position + 0x40, super->collisionLayer);
iVar1 = sub_080B1AE0(position + 0x40, super->collisionLayer);
uVar3 = 0x4026;
if (iVar1 == 0x12) {
uVar3 = 0x407c;
}
SetTile(uVar3, position + 0x40, super->collisionLayer);
iVar1 = sub_080002C8(position + 0x41, super->collisionLayer);
iVar1 = sub_080B1AE0(position + 0x41, super->collisionLayer);
uVar3 = 0x402a;
if (iVar1 == 0x12) {
uVar3 = 0x407a;
src/object/bollard.c
+1 -1
View File
@@ -89,7 +89,7 @@ void sub_0808B3AC(BollardEntity* this) {
super->spritePriority.b0 = 4;
this->tile = COORD_TO_TILE(super);
this->tileIndex = GetTileIndex(this->tile, super->collisionLayer);
this->unk74 = sub_080002E0(this->tile, super->collisionLayer);
this->unk74 = sub_080B1B44(this->tile, super->collisionLayer);
SetTile(0x400b, this->tile, super->collisionLayer);
}
src/object/button.c
+1 -1
View File
@@ -140,7 +140,7 @@ u32 sub_08081E0C(Entity*);
Entity* sub_08081D74(Entity* this) {
Entity* ent;
if (sub_080002E0(this->field_0x74.HWORD, this->collisionLayer) == 0xF) {
if (sub_080B1B44(this->field_0x74.HWORD, this->collisionLayer) == 0xF) {
return 0;
}
ent = 0;
src/object/crenelBeanSprout.c
+3 -3
View File
@@ -18,7 +18,7 @@ typedef struct {
/*0x72*/ u16 unk_72;
} CrenelBeanSproutEntity;
extern u32 sub_080002BC(s32, s32, u32);
extern u32 sub_080B1AB4(s32, s32, u32);
void sub_080969A4(CrenelBeanSproutEntity*);
void sub_08096A78(CrenelBeanSproutEntity*);
@@ -171,13 +171,13 @@ void CrenelBeanSprout_Action1(CrenelBeanSproutEntity* this) {
tmp = gPlayerEntity.animationState & 6;
this->unk_70 = ((super->x.HALF.HI + (s8)gUnk_08123184[tmp]) & -0x10) | 8;
this->unk_72 = ((super->y.HALF.HI + (s8)gUnk_08123184[(tmp) + 1]) & -0x10) | 8;
if (sub_080002BC(this->unk_70, this->unk_72, super->collisionLayer) == 0x19) {
if (sub_080B1AB4(this->unk_70, this->unk_72, super->collisionLayer) == 0x19) {
gUnk_0200AF00.filler25[10] = 3;
} else {
gUnk_0200AF00.filler25[10] = 0;
}
PositionRelative(&gPlayerEntity, super, 0, 0x10000);
if (sub_080002B8(super) == 0x19) {
if (sub_080B1AA8(super) == 0x19) {
sub_0807BA8C(0xdc, super->collisionLayer);
sub_08096A78(this);
}
src/object/itemOnGround.c
+1 -1
View File
@@ -247,7 +247,7 @@ void sub_080812A0(Entity* this) {
}
void sub_080812A8(Entity* this) {
if (sub_080002D0(this) != 0xF && this->field_0x6e.HWORD != GetTileTypeByEntity(this)) {
if (sub_080B1B0C(this) != 0xF && this->field_0x6e.HWORD != GetTileTypeByEntity(this)) {
this->direction = 0;
this->speed = 0;
this->spriteSettings.draw = 1;
src/object/lilypadLarge.c
+8 -8
View File
@@ -102,10 +102,10 @@ void sub_08085A1C(LilypadLargeEntity* this) {
void sub_08085A44(LilypadLargeEntity* this) {
super->speed = 0x200;
if (sub_080002B4(super, 0x10, 0x18) != 0x11) {
if (sub_080B1A8C(super, 0x10, 0x18) != 0x11) {
super->direction = 0x18;
} else {
if (sub_080002B4(super, 0xfffffff0, 0x18) != 0x11) {
if (sub_080B1A8C(super, 0xfffffff0, 0x18) != 0x11) {
super->direction = 8;
} else {
super->direction = 0x10;
@@ -126,7 +126,7 @@ void sub_08085A98(LilypadLargeEntity* this) {
this->unk_78.WORD -= 0x20000;
sub_0805EC9C(super, this->unk_78.HALF_U.HI, this->unk_78.HALF_U.HI, this->unk_7c.HALF_U.HI);
}
if (sub_080002B4(super, 0, 0x18) != 0x11) {
if (sub_080B1A8C(super, 0, 0x18) != 0x11) {
super->subAction = 2;
if (gArea.locationIndex == 0x1b) {
super->y.HALF.HI += 0xd0;
@@ -159,7 +159,7 @@ void sub_08085B40(LilypadLargeEntity* this) {
}
} else {
ResetCollisionLayer(super);
if (sub_080002B8(super) == 0xd) {
if (sub_080B1AA8(super) == 0xd) {
ResetCollisionLayer(&gPlayerEntity);
sub_08085CDC(this);
super->direction = GetFacingDirection(&gPlayerEntity, super);
@@ -181,7 +181,7 @@ void sub_08085B40(LilypadLargeEntity* this) {
super->actionDelay |= 0x80;
this->unk_70 = 0;
this->unk_6c = 0;
if (sub_080002B8(super) == 0xd) {
if (sub_080B1AA8(super) == 0xd) {
super->action = 4;
}
}
@@ -229,7 +229,7 @@ void sub_08085D10(LilypadLargeEntity* this) {
void sub_08085D28(LilypadLargeEntity* this) {
if (((gPlayerState.framestate != PL_STATE_TALKEZLO) && ((gPlayerState.flags & PL_FLAGS2) != 0)) &&
(sub_080002B4(super, 0, 0x18) == 0x11)) {
(sub_080B1A8C(super, 0, 0x18) == 0x11)) {
super->action = 2;
super->subAction = 0;
sub_08078B48();
@@ -261,7 +261,7 @@ NONMATCH("asm/non_matching/lilypadLarge/sub_08085D60.inc", void sub_08085D60(Lil
u32 tmp = r4 >> 2;
s32 tmpX = gUnk_08120638[tmp];
s32 tmpY = gUnk_08120638[tmp + 1];
if (sub_080002CC(super, tmpX, tmpY) == 0xff) {
if (sub_080B1AF0(super, tmpX, tmpY) == 0xff) {
if (sub_080806BC((super->x.HALF.HI - gRoomControls.origin_x) + tmpX,
(super->y.HALF.HI - gRoomControls.origin_y) + tmpY, r4, 5) == 0) {
@@ -280,7 +280,7 @@ NONMATCH("asm/non_matching/lilypadLarge/sub_08085D60.inc", void sub_08085D60(Lil
u32 tmp = r6 >> 2;
s32 tmpX = (u8)gUnk_08120638[tmp];
s32 tmpY = gUnk_08120638[tmp + 1];
if (sub_080002CC(super, tmpX, tmpY) == 0xff) {
if (sub_080B1AF0(super, tmpX, tmpY) == 0xff) {
if (sub_0807BD14(&gPlayerEntity, r6 >> 3) != 0) {
super->direction = (u8)r6;
sub_08085E74(this);
src/object/mask.c
+1 -1
View File
@@ -46,7 +46,7 @@ void sub_080929A4(Entity* this) {
this->field_0x7c.HALF_U.HI = COORD_TO_TILE(this);
this->field_0x7c.HALF_U.LO = GetTileIndex(this->field_0x7c.HALF_U.HI, 1);
this->field_0x7a.HWORD = sub_080002E0((u16)this->field_0x7c.HALF.HI, 1);
this->field_0x7a.HWORD = sub_080B1B44((u16)this->field_0x7c.HALF.HI, 1);
SetTile(0x4022, this->field_0x7c.HALF_U.HI, 1);
}
src/object/minecart.c
+2 -2
View File
@@ -141,7 +141,7 @@ void sub_080919AC(Entity* this) {
this->field_0xf = 0x3c;
}
uVar3 = sub_080002B4(this, gUnk_081223C8[this->animationState * 2],
uVar3 = sub_080B1A8C(this, gUnk_081223C8[this->animationState * 2],
gUnk_081223C8[this->animationState * 2 + 1]);
iVar2 = sub_08007DD6(uVar3, gUnk_081223D8[this->animationState]);
if (iVar2 == 0) {
@@ -177,7 +177,7 @@ void sub_080919AC(Entity* this) {
case 0x6d:
case 0x6e:
case 0x6f:
if (uVar3 == sub_080002B8(this)) {
if (uVar3 == sub_080B1AA8(this)) {
sub_08091C0C(this);
gPlayerEntity.animationState = this->animationState << 1;
return;
src/object/object68.c
+2 -2
View File
@@ -16,7 +16,7 @@ typedef struct {
/*0x68*/ u8 unk_68;
} Object68Entity;
extern u32 sub_0800029C(Entity*, s32, s32);
extern u32 sub_080B1A0C(Entity*, s32, s32);
void sub_08094774(Object68Entity*);
void sub_080948D0(Object68Entity*);
@@ -117,7 +117,7 @@ void sub_08094980(Object68Entity* this, u32 searchTileIndex, u32 replaceTileInde
while (index < 10) {
xOffset = gUnk_08122A28[index];
yOffset = gUnk_08122A28[index + 1];
if (searchTileIndex == sub_0800029C(super, xOffset, yOffset)) {
if (searchTileIndex == sub_080B1A0C(super, xOffset, yOffset)) {
SetTile(replaceTileIndex, TILE(super->x.HALF.HI + xOffset, super->y.HALF.HI + yOffset),
super->collisionLayer);
}
src/object/object6A.c
+1 -1
View File
@@ -327,7 +327,7 @@ void sub_08094E30(Object6AEntity* this) {
super->zVelocity = 0;
SetDefaultPriority(super, PRIO_PLAYER_EVENT);
InitializeAnimation(super, 0);
if (sub_080002B8(super) == 13) {
if (sub_080B1AA8(super) == 13) {
super->action = 3;
}
break;
src/object/objectOnPillar.c
+1 -1
View File
@@ -211,7 +211,7 @@ void sub_080970F4(ObjectOnPillarEntity* this) {
bool32 sub_08097144(ObjectOnPillarEntity* this) {
LinearMoveUpdate(super);
sub_0800445C(super);
if (sub_080002B8(super) == 0x19) {
if (sub_080B1AA8(super) == 0x19) {
super->spriteOffsetY = 2;
}
if ((--this->unk_76 == 0) && sub_08097194(this) == FALSE) {
src/object/pot.c
+1 -1
View File
@@ -94,7 +94,7 @@ void sub_08082310(Entity* this) {
DeleteThisEntity();
break;
default:
if (sub_080002B8(this) == 13) {
if (sub_080B1AA8(this) == 13) {
CreateFx(this, FX_FALL_DOWN, 0);
} else if (tileType == 0x4005) {
gPlayerState.field_0xab = 4;
src/object/pullableLever.c
+1 -1
View File
@@ -114,7 +114,7 @@ void PullableLever_HandleSubAction0(PullableLeverEntity* this) {
if (-player->animationState + super->type2 * 2 == 0) {
x = gUnk_081222B8[super->type2 * 2] + super->x.HALF_U.HI;
y = gUnk_081222B8[super->type2 * 2 + 1] + super->y.HALF_U.HI;
if (0x10 < sub_080002D4(x, y, player->collisionLayer) - 0xf) {
if (0x10 < sub_080B1B18(x, y, player->collisionLayer) - 0xf) {
player->x.HALF.HI = x;
player->y.HALF.HI = y;
}
src/object/pushableFurniture.c
+5 -5
View File
@@ -152,7 +152,7 @@ bool32 sub_0808FC5C(PushableFurnitureEntity* this) {
} else {
super->spriteOffsetY = 0;
}
if (sub_080002D0(super)) {
if (sub_080B1B0C(super)) {
return 0;
}
if (super->field_0xf == 0) {
@@ -239,27 +239,27 @@ void sub_0808FDE8(PushableFurnitureEntity* this) {
u32 uVar3;
uVar3 = (u32)this->unk_70;
uVar1 = sub_080002E0(uVar3 - 1, 1);
uVar1 = sub_080B1B44(uVar3 - 1, 1);
iVar2 = GetTileIndex(uVar3, 1);
if (iVar2 == 0x402e) {
if ((((uVar1 & 0xf0) != 0) && ((uVar1 & 0xf0) != 0x50)) || ((uVar1 & 5) == 0)) {
SetTile(0x402c, uVar3, 1);
}
} else {
iVar2 = sub_080002E0(uVar3, 1);
iVar2 = sub_080B1B44(uVar3, 1);
if ((iVar2 == 5) && ((((uVar1 & 0xf0) == 0 || ((uVar1 & 0xf0) == 0x50)) && ((uVar1 & 5) != 0)))) {
SetTile(0x402e, uVar3, 1);
}
}
uVar3 = (u32)this->unk_72;
uVar1 = sub_080002E0(uVar3 + 1, 1);
uVar1 = sub_080B1B44(uVar3 + 1, 1);
iVar2 = GetTileIndex(uVar3, 1);
if (iVar2 == 0x402f) {
if ((((uVar1 & 0xf0) != 0) && ((uVar1 & 0xf0) != 0x50)) || ((uVar1 & 10) == 0)) {
SetTile(0x402d, uVar3, 1);
}
} else {
iVar2 = sub_080002E0(uVar3, 1);
iVar2 = sub_080B1B44(uVar3, 1);
if (((iVar2 == 10) && (((uVar1 & 0xf0) == 0 || ((uVar1 & 0xf0) == 0x50)))) && ((uVar1 & 10) != 0)) {
SetTile(0x402f, uVar3, 1);
}
src/object/pushableRock.c
+2 -2
View File
@@ -92,8 +92,8 @@ void sub_0808A644(PushableRockEntity* this) {
u32 tmp;
this->tilePosition = COORD_TO_TILE(super);
this->tileIndex = GetTileIndex(this->tilePosition, super->collisionLayer);
this->unk_72 = sub_080002E0(this->tilePosition, super->collisionLayer);
tmp = sub_080002C8(this->tilePosition, super->collisionLayer);
this->unk_72 = sub_080B1B44(this->tilePosition, super->collisionLayer);
tmp = sub_080B1AE0(this->tilePosition, super->collisionLayer);
if ((tmp == 0x19) || (tmp == 0xf0)) {
SetTile(0x4015, this->tilePosition, super->collisionLayer);
super->action = 3;
src/object/pushableStatue.c
+1 -1
View File
@@ -213,7 +213,7 @@ bool32 sub_080895C0(PushableStatueEntity* this) {
LinearMoveUpdate(super);
if ((--this->unk_86 == 0) && (sub_0800442E(super) == 0)) {
super->spriteOffsetY = 0;
if (!sub_080002D0(super)) {
if (!sub_080B1B0C(super)) {
sub_08089454(this);
return TRUE;
}