diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-29 22:53:14 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-29 22:53:14 -0400 |
| commit | b014273d73996d98519f90b1349feb469cd5f765 (patch) | |
| tree | 7e206d7ee1e1a2f9a8ea9eec69d178599e6c624d /src/trade.c | |
| parent | 22c795304d6c1edb568dfde9c6de2091d9470785 (diff) | |
| parent | cf0bf8a1f2d3cd97e0fe967270188dda24b8fac2 (diff) | |
Merge branch 'master' into trade
Diffstat (limited to 'src/trade.c')
| -rw-r--r-- | src/trade.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/trade.c b/src/trade.c index b8c027c04..37b91f57e 100644 --- a/src/trade.c +++ b/src/trade.c @@ -122,6 +122,8 @@ struct TradeEwramSubstruct { /*0x08fc*/ u8 filler_08fc[0x704]; }; +IWRAM_DATA u8 gUnknown_03000508[8]; + struct UnkStructF { u8 filler_0000[9]; u8 unk_0009; @@ -214,7 +216,6 @@ void sub_804DB84(void); extern u8 gUnknown_020297D8[2]; extern u8 *gUnknown_020296CC[13]; extern struct TradeEwramSubstruct *gUnknown_03004824; -extern u8 gUnknown_03000508; extern struct MailStruct gUnknown_02029700[16]; #define ewram_2010000 (*(struct TradeEwramStruct *)(ewram + 0x10000)) @@ -1046,7 +1047,7 @@ static void sub_8047EC0(void) gUnknown_03004824->unk_0086 = 0; gUnknown_03004824->unk_0087 = 0; gUnknown_03004824->unk_00b4 = 0; - gUnknown_03000508 = 0; + gUnknown_03000508[0] = 0; gMain.state ++; sub_804AA0C(0); CpuFill16(0, ewram_2010000.tileBuffers, sizeof(ewram_2010000.tileBuffers)); @@ -1187,7 +1188,7 @@ static void sub_8047EC0(void) { gMain.callback1 = sub_80494D8; SetMainCallback2(sub_8048AB4); - gUnknown_03000508 = 0; + gUnknown_03000508[0] = 0; } break; } @@ -1226,7 +1227,7 @@ static void sub_80484F4(void) gUnknown_03004824->unk_0086 = 0; gUnknown_03004824->unk_0087 = 0; gUnknown_03004824->unk_00b4 = 0; - gUnknown_03000508 = 0; + gUnknown_03000508[0] = 0; gMain.state ++; for (i = 0; i < 13; i ++) gUnknown_020296CC[i] = ewram_2010000.tileBuffers[i]; @@ -1329,7 +1330,7 @@ static void sub_80484F4(void) if (!gPaletteFade.active) { SetMainCallback2(sub_8048AB4); - gUnknown_03000508 = 0; + gUnknown_03000508[0] = 0; } break; } |