Merge branch 'master' into demo-jp

This commit is contained in:
octorock
2021-10-23 14:07:39 +02:00
216 changed files with 8499 additions and 17378 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ void Manager34_Main(Manager34* this) {
void sub_0805DBB4(Manager34* this) {
this->manager.action = 1;
this->field_0x20 = gScreenTransition.filler[0] * 0x3c;
this->field_0x20 = gScreenTransition.field_0x3d * 0x3c;
}
void sub_0805DBCC(Manager34* this) {