diff options
| author | Catobat <69204835+Catobat@users.noreply.github.com> | 2023-04-30 15:10:30 +0200 |
|---|---|---|
| committer | Catobat <69204835+Catobat@users.noreply.github.com> | 2023-04-30 15:10:30 +0200 |
| commit | 985eeb67a17517d522e963a1e52eafcd07712520 (patch) | |
| tree | 0ceaa203dca5acd8fa07d34c5b8e24e971ffa84f /src/object | |
| parent | d1d78ed018967130231a0ce9bb04819e9faef9ce (diff) | |
Name members for R actions in struct_0200AF00
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/crenelBeanSprout.c | 6 | ||||
| -rw-r--r-- | src/object/itemForSale.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/object/crenelBeanSprout.c b/src/object/crenelBeanSprout.c index a0fb206d..ee3364ee 100644 --- a/src/object/crenelBeanSprout.c +++ b/src/object/crenelBeanSprout.c @@ -172,9 +172,9 @@ void CrenelBeanSprout_Action1(CrenelBeanSproutEntity* this) { 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_080B1AB4(this->unk_70, this->unk_72, super->collisionLayer) == 0x19) { - gUnk_0200AF00.unk_2f = 3; + gUnk_0200AF00.rActionPlayerState = 3; } else { - gUnk_0200AF00.unk_2f = 0; + gUnk_0200AF00.rActionPlayerState = 0; } PositionRelative(&gPlayerEntity, super, 0, 0x10000); if (GetTileUnderEntity(super) == 0x19) { @@ -184,7 +184,7 @@ void CrenelBeanSprout_Action1(CrenelBeanSproutEntity* this) { if ((gPlayerState.playerInput.newInput & (PLAYER_INPUT_80 | PLAYER_INPUT_40)) == 0) { return; } - if (gUnk_0200AF00.unk_2f != 3) { + if (gUnk_0200AF00.rActionPlayerState != 3) { return; } gPlayerState.heldObject = 0; diff --git a/src/object/itemForSale.c b/src/object/itemForSale.c index 0f4b1fa5..ad83696b 100644 --- a/src/object/itemForSale.c +++ b/src/object/itemForSale.c @@ -85,7 +85,7 @@ void ItemForSale_Init(ItemForSaleEntity* this) { void ItemForSale_Action1(ItemForSaleEntity* this) { if (super->subAction != 0) { super->action = 2; - gUnk_0200AF00.unk_2f = 2; + gUnk_0200AF00.rActionPlayerState = 2; } else { if (super->type == 0x36) { if (super->interactType != 0) { @@ -102,7 +102,7 @@ void ItemForSale_Action1(ItemForSaleEntity* this) { ResetActiveItems(); gPlayerState.heldObject = 4; gNewPlayerEntity.unk_74 = super; - gUnk_0200AF00.unk_2f = 2; + gUnk_0200AF00.rActionPlayerState = 2; MessageClose(); } } @@ -112,14 +112,14 @@ void ItemForSale_Action1(ItemForSaleEntity* this) { void ItemForSale_Action2(ItemForSaleEntity* this) { void* ptr; - gUnk_0200AF00.unk_2f = 2; + gUnk_0200AF00.rActionPlayerState = 2; super->spriteSettings.draw = gPlayerEntity.spriteSettings.draw; if ((gPlayerState.heldObject == 0) || (super != gNewPlayerEntity.unk_74)) { sub_080819B4(this); } else { ptr = sub_080784E4(); if (((*(int*)(ptr + 8) == 0) || - ((*(u8*)(ptr + 1) != 1 || (gUnk_0200AF00.unk_2f = 7, (gPlayerState.playerInput.newInput & + ((*(u8*)(ptr + 1) != 1 || (gUnk_0200AF00.rActionPlayerState = 7, (gPlayerState.playerInput.newInput & (PLAYER_INPUT_80 | PLAYER_INPUT_8)) == 0)))) && ((gPlayerState.playerInput.newInput & (PLAYER_INPUT_80 | PLAYER_INPUT_10 | PLAYER_INPUT_8)) != 0)) { sub_080819B4(this); @@ -142,8 +142,8 @@ void sub_080819B4(ItemForSaleEntity* this) { gNewPlayerEntity.unk_74 = 0; ptr = &gUnk_0200AF00; gRoomVars.shopItemType = 0; - ptr->unk_2c = 0; - ptr->unk_2f = 0; + ptr->rActionInteractObject = 0; + ptr->rActionPlayerState = 0; gRoomVars.shopItemType2 = 0; super->x.HALF.HI = this->unk_80 + gRoomControls.origin_x; super->y.HALF.HI = this->unk_82 + gRoomControls.origin_y; |