diff options
| author | Ibot02 <jtp.jtp@gmx.de> | 2021-06-23 23:34:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-23 23:34:02 +0200 |
| commit | 3664b4a37bfb48d2dc7f13597619ce2d48d8622b (patch) | |
| tree | 7b4837575811ffe15383250babe5e5b30110ae6e /src/object | |
| parent | 8621bc9329e7c4989ce6e391a06867638a7b23e7 (diff) | |
| parent | 813a824e8a635d008909c1e15016cad84755d9e4 (diff) | |
Merge pull request #162 from octorock/variants
Add variants
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/fileScreenObjects.c | 4 | ||||
| -rw-r--r-- | src/object/itemOnGround.c | 4 | ||||
| -rw-r--r-- | src/object/objectA2.c | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/object/fileScreenObjects.c b/src/object/fileScreenObjects.c index de79631a..bff3a5d8 100644 --- a/src/object/fileScreenObjects.c +++ b/src/object/fileScreenObjects.c @@ -139,7 +139,11 @@ static bool32 sub_0808E950(void) { void sub_0808E988(Entity* this) { if (this->action == 0) { this->action = 1; +#ifdef EU + this->spriteIndex = 0x141; +#else this->spriteIndex = 0x142; +#endif this->type2 = 0xFF; sub_080AE008(this, 1, 3); } diff --git a/src/object/itemOnGround.c b/src/object/itemOnGround.c index 493ed137..ee77e759 100644 --- a/src/object/itemOnGround.c +++ b/src/object/itemOnGround.c @@ -270,7 +270,11 @@ void sub_080812A8(Entity* this) { void sub_080812E8(Entity* this) { PlayerState* playerState = &gPlayerState; +#ifdef EU + if ((playerState->swimState & 0x80) && sub_080177A0(this, &gPlayerEntity)) { +#else if ((playerState->swimState & 0x80) && !(playerState->flags.all & 0x80) && sub_080177A0(this, &gPlayerEntity)) { +#endif sub_080810FC(this); } } diff --git a/src/object/objectA2.c b/src/object/objectA2.c index 701a12d5..2cc132fe 100644 --- a/src/object/objectA2.c +++ b/src/object/objectA2.c @@ -44,6 +44,7 @@ void sub_0809F318(Entity* this) { void sub_0809F374(Entity* this) { sub_0806F69C(this); +#ifndef EU if (gUnk_02000000->gameLanguage < 2) { if (sub_080044EC(this, 0x2000) < 2) { this->height.WORD = 0; @@ -54,6 +55,7 @@ void sub_0809F374(Entity* this) { this->actionDelay++; } } else { +#endif switch (sub_080044EC(this, 0x2000)) { default: this->actionDelay++; @@ -67,7 +69,9 @@ void sub_0809F374(Entity* this) { sub_0809F448(this); SoundReq(SFX_186); } +#ifndef EU } +#endif } void sub_0809F3E8(Entity* this) { |