mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-26 06:37:00 -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/manager/manager37.c
+1 -1
View File
@@ -38,7 +38,7 @@ void sub_0805DE68(Manager* this) {
gScreenTransition.field_0x39 = 0x0f;
*(u8*)&gScreenTransition.field_0x3a = 0x20;
*((u8*)&gScreenTransition.field_0x3a + 1) = 0x20;
#if !defined(EU) && !defined(JP) && !defined(DEMO_JP)
#if !defined(EU) && !defined(JP)
gSave.unk498 = 0x1194;
#endif
}
src/manager/managerF.c
+3 -3
View File
@@ -29,7 +29,7 @@ void sub_0805947C(ManagerF*);
#ifndef EU
void sub_080594DC(ManagerF*);
#endif
#if defined(USA) || defined(DEMO)
#if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP)
void sub_08059548(ManagerF*);
#endif
@@ -52,7 +52,7 @@ void (*const gUnk_08108314[])(ManagerF*) = {
#ifndef EU
sub_080594DC,
#endif
#if defined(USA) || defined(DEMO)
#if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP)
sub_08059548,
#endif
};
@@ -425,7 +425,7 @@ void sub_080594DC(ManagerF* this) {
}
#endif
#if defined(USA) || defined(DEMO)
#if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP)
void sub_08059548(ManagerF* this) {
sub_0805E3A0(this, 6);
if (gPlayerEntity.action == 0x16) {