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

Merge remote-tracking branch 'upstream/master' into m

Browse Source
This commit is contained in:
theo3
2021-11-05 01:58:55 -07:00
parent 9cfbb3a27a 90ed4a86ce
commit a9bb5184d0
440 changed files with 7319 additions and 11526 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/businessScrub.c
+1 -1
View File
@@ -267,7 +267,7 @@ void sub_08028CE8(Entity* this) {
this->actionDelay = 4;
this->field_0x80.HALF.HI = 0;
sub_080290E0(this, 3);
#if defined(USA) || defined(DEMO)
#if defined(USA) || defined(DEMO_USA)
SetLocalFlag(0x87);
#endif
return;
src/enemy/vaatiArm.c
+1 -1
View File
@@ -546,7 +546,7 @@ void sub_08042C34(Entity* this) {
if ((gRoomControls.roomOriginY + 0x20) > y) {
y = gRoomControls.roomOriginY + 0x20;
}
#if defined EU || defined JP
#if defined EU || defined JP || defined DEMO_JP
if (gRoomControls.roomOriginY + gRoomControls.height + -0x20 < y) {
y = gRoomControls.roomOriginY + gRoomControls.height + -0x20;
}
src/enemy/vaatiWrath.c
+1 -1
View File
@@ -997,7 +997,7 @@ void sub_0804235C(Entity* this) {
InitializeAnimation(((VaatiWrathHeapStruct*)this->myHeap)->type3, 0x1b);
}
#if defined USA || defined DEMO
#if defined USA || defined DEMO_USA || defined DEMO_JP
void VaatiWrathType0PreAction(Entity* this) {
int temp;
if ((gScreenTransition.field_0x38 & 2) == 0) {