diff options
Diffstat (limited to 'src/pokenav_before.c')
-rw-r--r-- | src/pokenav_before.c | 973 |
1 files changed, 485 insertions, 488 deletions
diff --git a/src/pokenav_before.c b/src/pokenav_before.c index db9de522a..5cd1c8942 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -1,22 +1,23 @@ #include "global.h" #include "main.h" #include "pokenav.h" +#include "ewram.h" #include "battle.h" #include "data2.h" #include "de_rom_8040FE0.h" +#include "flags.h" #include "landmark.h" #include "link.h" #include "menu.h" #include "overworld.h" -#include "string_util.h" #include "palette.h" +#include "region_map.h" +#include "songs.h" +#include "string_util.h" +#include "sound.h" #include "task.h" #include "text.h" #include "unknown_task.h" -#include "sound.h" -#include "region_map.h" -#include "songs.h" -#include "flags.h" extern u8 ewram[]; @@ -79,16 +80,12 @@ struct UnknownPokenav0 { /* 0xD162 */ u8 varD162; }; -#define ewram0 (*(struct UnknownPokenav0*)(ewram + 0)) - struct UnknownPokenav0_1 { u8 fill6dad[0x6dad]; s8 var6dad; s8 var6dae; }; -#define ewram0_1 (*(struct UnknownPokenav0_1*)(ewram + 0)) - IWRAM_DATA void (*gUnknown_03000744)(void); extern const u8 gUnknown_083E0314[]; @@ -304,9 +301,9 @@ void sub_80EBA5C() { default: gMain.state = 0; case 0: - ewram0.var6dac = is_c1_link_related_active(); - if (!ewram0.var6dac) { - ewram0.var6dab = 0; + ewram0_10.var6dac = is_c1_link_related_active(); + if (!ewram0_10.var6dac) { + ewram0_10.var6dab = 0; gMain.state++; SetMainCallback2(&sub_80EBBE8); break; @@ -354,7 +351,7 @@ void sub_80EBA5C() { sub_80EBDBC(&sub_80EBDD8); break; case 14: - ewram0.var6dab = 1; + ewram0_10.var6dab = 1; PlaySE(SE_PN_ON); SetMainCallback2(&sub_80EBD90); SetVBlankCallback(&sub_80EBD18); @@ -367,11 +364,11 @@ void sub_80EBA5C() { void sub_80EBBE8() { u8 var1; - if (!ewram0.var6dab) { - var1 = ewram0.var6dab; + if (!ewram0_10.var6dab) { + var1 = ewram0_10.var6dab; do { sub_80EBA5C(); - var1 = ewram0.var6dab; + var1 = ewram0_10.var6dab; } while (!var1); } } @@ -381,36 +378,36 @@ void sub_80EBC10() { u16 *var1; gKeyRepeatStartDelay = 0x14; - ewram0.playerPartyCount = CalculatePlayerPartyCount(); - ewram0.var6ddc = 0; - ewram0.var9344 = 0; - ewram0.var8768 = 0; - ewram0.varCED0 = 0; + ewram0_10.playerPartyCount = CalculatePlayerPartyCount(); + ewram0_10.var6ddc = 0; + ewram0_10.var9344 = 0; + ewram0_10.var8768 = 0; + ewram0_10.varCED0 = 0; for (i = 0; i < 5; ++i) { - ewram0.var8fff[i] = 0; - var1 = (u16 *)ewram0.var0; + ewram0_10.var8fff[i] = 0; + var1 = (u16 *)ewram0_10.var0; var1[i*2 + 0x4820] = 0x9B; var1[i*2 + 0x4821] = 0x5B; } - ewram0.var6e95 = 0; + ewram0_10.var6e95 = 0; sub_80EBCA8(); } void sub_80EBCA8() { - ewram0.var6db2[0] = 1; - ewram0.var6db2[1] = 2; - ewram0.var6db2[2] = 3; + ewram0_10.var6db2[0] = 1; + ewram0_10.var6db2[1] = 2; + ewram0_10.var6db2[2] = 3; if (FlagGet(SYS_RIBBON_GET)) { - ewram0.var6db2[3] = 4; + ewram0_10.var6db2[3] = 4; } else { - ewram0.var6db2[3] = 0; + ewram0_10.var6db2[3] = 0; } - ewram0.var6db2[4] = 5; + ewram0_10.var6db2[4] = 5; } void sub_80EBD18() { @@ -449,7 +446,7 @@ void sub_80EBD80() { } void sub_80EBD90() { - ewram0.var300(); + ewram0_10.var300(); AnimateSprites(); BuildOamBuffer(); RunTasks(); @@ -458,78 +455,78 @@ void sub_80EBD90() { } void sub_80EBDBC(void (*func)(void)) { - ewram0.var300 = func; - ewram0.var304 = 0; + ewram0_10.var300 = func; + ewram0_10.var304 = 0; } void sub_80EBDD8() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: SetVBlankCallback(NULL); REG_DISPCNT = 0; - ewram0.var6dad = ewram0.var6ddc; - ewram0.var6dae = 5; - ewram0.var304++; + ewram0_10.var6dad = ewram0_10.var6ddc; + ewram0_10.var6dae = 5; + ewram0_10.var304++; break; case 1: sub_80F3FF0(); - ewram0.var304++; + ewram0_10.var304++; case 2: if (sub_80F4024()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 3: sub_80F2598(); - ewram0.var304++; + ewram0_10.var304++; break; case 4: sub_80EEE20(); - ewram0.var304++; + ewram0_10.var304++; case 5: if (sub_80EEE54()) return; sub_80EEE08(); - ewram0.var304++; + ewram0_10.var304++; return; case 6: sub_80EF248(0); - ewram0.var304++; + ewram0_10.var304++; case 7: if (sub_80EF284(0)) return; - ewram0.var304++; + ewram0_10.var304++; break; case 8: sub_80F1B8C(0); - ewram0.var304++; + ewram0_10.var304++; case 9: if (sub_80F1BC8(0)) return; - ewram0.var304++; + ewram0_10.var304++; break; case 10: SetVBlankCallback(&sub_80EBD18); - ewram0.var304++; + ewram0_10.var304++; break; case 11: BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); - ewram0.var304++; + ewram0_10.var304++; return; case 12: sub_80EED2C(0); - ewram0.var304++; + ewram0_10.var304++; return; case 13: if (gPaletteFade.active) return; - ewram0.var304++; + ewram0_10.var304++; return; case 14: sub_80F2C80(0); - ewram0.var304++; + ewram0_10.var304++; case 15: if (sub_80F2CBC(0)) return; - ewram0.var304++; + ewram0_10.var304++; break; case 16: sub_80F1DF0(); - ewram0.var304++; + ewram0_10.var304++; return; case 17: if (!sub_80F1E50()) { @@ -543,76 +540,76 @@ void sub_80EBDD8() { } void sub_80EC00C() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: if (!sub_80EEF78()) { SetVBlankCallback(&sub_80EBD80); sub_80EED1C(); - ewram0.var6dad = ewram0.var6ddc; - ewram0.var6dae = 5; + ewram0_10.var6dad = ewram0_10.var6ddc; + ewram0_10.var6dae = 5; sub_80EEE08(); - ewram0.var304++; + ewram0_10.var304++; } break; case 1: sub_80EF248(0); - ewram0.var304++; + ewram0_10.var304++; case 2: if (sub_80EF284(0)) return; - ewram0.var304++; + ewram0_10.var304++; break; case 3: sub_80F1B8C(0); - ewram0.var304++; + ewram0_10.var304++; case 4: if (sub_80F1BC8(0)) return; - ewram0.var304++; + ewram0_10.var304++; break; case 5: if (sub_8055870()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 6: - BeginNormalPaletteFade(ewram0.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); SetVBlankCallback(&sub_80EBD18); - ewram0.var304++; + ewram0_10.var304++; break; case 7: sub_80EED2C(0); - ewram0.var304++; + ewram0_10.var304++; break; case 8: if (gPaletteFade.active) return; - ewram0.var304++; + ewram0_10.var304++; return; case 9: sub_80F2598(); - ewram0.var304++; + ewram0_10.var304++; break; case 10: sub_80F2C80(0); - ewram0.var304++; + ewram0_10.var304++; case 11: if (sub_80F2CBC(0)) return; - ewram0.var304++; + ewram0_10.var304++; return; case 12: sub_80F1DF0(); - ewram0.var304++; + ewram0_10.var304++; return; case 13: if (sub_80F1E50()) return; - sub_80EF428(0, ewram0.var6dad); + sub_80EF428(0, ewram0_10.var6dad); sub_80EBDBC(&sub_80EC268); } } void sub_80EC210() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: sub_80F2D04(1); - sub_80EE9C0(0, ewram0.var6ddc, 0); - ewram0.var304++; + sub_80EE9C0(0, ewram0_10.var6ddc, 0); + ewram0_10.var304++; break; case 1: if (sub_80EEA0C()) return; @@ -622,18 +619,18 @@ void sub_80EC210() { void sub_80EC268() { u8 var1; - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: if (sub_80EEC10() != 0) { PlaySE(0x5); - sub_80EF428(0, ewram0.var6dad); + sub_80EF428(0, ewram0_10.var6dad); sub_80EED9C(); break; } else { if (gMain.newKeys & A_BUTTON) { - ewram0.var6ddc = ewram0.var6dad; - switch (ewram0.var6db2[ewram0.var6ddc] - 1) { + ewram0_10.var6ddc = ewram0_10.var6dad; + switch (ewram0_10.var6db2[ewram0_10.var6ddc] - 1) { case 0: PlaySE(5); sub_80EBDBC(&sub_80EC4A0); @@ -643,18 +640,18 @@ void sub_80EC268() { sub_80EBDBC(&sub_80EC81C); break; case 4: - ewram0.var304 = 1; + ewram0_10.var304 = 1; break; case 3: - ewram0.var304 = 2; + ewram0_10.var304 = 2; break; case 2: - ewram0.var304 = 6; + ewram0_10.var304 = 6; break; } } else if (gMain.newKeys & B_BUTTON) { - ewram0.var304 = 1; + ewram0_10.var304 = 1; } break; } @@ -664,14 +661,14 @@ void sub_80EC268() { break; case 2: sub_80F6208(); - ewram0.var304++; + ewram0_10.var304++; case 3: if (sub_80F6250()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 4: if (sub_8055870()) return; - if (ewram0.var8fe8 != 0) { + if (ewram0_10.var8fe8 != 0) { PlaySE(0x5); sub_80EBDBC(&sub_80EDB88); break; @@ -679,12 +676,12 @@ void sub_80EC268() { else { PlaySE(0x20); sub_80EF428(0, 5); - ewram0.var304 = 0xFF; + ewram0_10.var304 = 0xFF; break; } case 6: sub_80F6C20(); - if (ewram0.varD158 != 0) { + if (ewram0_10.varD158 != 0) { PlaySE(0x5); sub_80EBDBC(&sub_80EE3D8); break; @@ -692,20 +689,20 @@ void sub_80EC268() { else { PlaySE(0x20); sub_80EF428(0, 6); - ewram0.var304 = 0xFF; + ewram0_10.var304 = 0xFF; break; } case 0xFF: if ((var1 = sub_80EEC10()) != 0) { PlaySE(0x5); - sub_80EF428(0, ewram0.var6dad); - ewram0.var304 = 0; + sub_80EF428(0, ewram0_10.var6dad); + ewram0_10.var304 = 0; sub_80EED9C(); } else { if (!(gMain.newKeys & (A_BUTTON | B_BUTTON))) return; - sub_80EF428(0, ewram0.var6dad); - ewram0.var304 = var1; + sub_80EF428(0, ewram0_10.var6dad); + ewram0_10.var304 = var1; break; } } @@ -714,11 +711,11 @@ void sub_80EC268() { void sub_80EC4A0() { u32 var1; u32 var2; - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: sub_80F1E84(); sub_80F2D04(0); - ewram0.var304++; + ewram0_10.var304++; break; case 1: if (!sub_80F1F10()) { @@ -727,59 +724,59 @@ void sub_80EC4A0() { } else var1 = 0x8; sub_80EEFBC(var1); - ewram0.var304++; + ewram0_10.var304++; } break; case 2: if (!(var2 = sub_80EEF34())) { - BeginNormalPaletteFade(ewram0.var308, -1, 0x0, 0x10, var2); - ewram0.var304++; + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var2); + ewram0_10.var304++; } break; case 3: if (gPaletteFade.active) return; SetVBlankCallback(NULL); sub_80EED0C(); - ewram0.var304++; + ewram0_10.var304++; break; case 4: sub_80F2620(); - ewram0.var304++; + ewram0_10.var304++; break; case 5: sub_80EF814(); - ewram0.var304++; + ewram0_10.var304++; break; case 6: sub_80EF840(); - ewram0.var304++; + ewram0_10.var304++; case 7: if (sub_80EF874()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 8: sub_80F2C80(0x4); - ewram0.var304++; + ewram0_10.var304++; case 9: if (sub_80F2CBC(0x4)) return; - ewram0.var304++; + ewram0_10.var304++; break; case 0xA: sub_80F2DD8(); SetVBlankCallback(&sub_80EBD30); - ewram0.var304++; + ewram0_10.var304++; break; case 0xB: if (sub_8055870()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 0xC: - BeginNormalPaletteFade(ewram0.var308, -1, 0x10, 0, 0); - ewram0.var304++; + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + ewram0_10.var304++; break; case 0xD: sub_80EED2C(0x1); - ewram0.var304++; + ewram0_10.var304++; break; case 0xE: if (gPaletteFade.active) return; @@ -790,7 +787,7 @@ void sub_80EC4A0() { void sub_80EC67C() { u32 var1; u32 var2; - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: switch (sub_80FAB60()) { case 1: @@ -801,57 +798,57 @@ void sub_80EC67C() { break; case 4: PlaySE(0x5); - ewram0.var304 = 1; + ewram0_10.var304 = 1; break; case 5: PlaySE(0x5); - ewram0.var304 = 4; + ewram0_10.var304 = 4; break; } break; case 1: - if (!ewram0.var6e90) { + if (!ewram0_10.var6e90) { sub_80FAEC4(); - ewram0.var304++; + ewram0_10.var304++; break; } if (sub_80EFBDC(1)) return; sub_80FAEC4(); - ewram0.var304++; + ewram0_10.var304++; break; case 2: if ((var2 = sub_80FAFC0())) return; - if (!ewram0.var6e90) { + if (!ewram0_10.var6e90) { sub_80EFBB0(); - ewram0.var304 = var2; + ewram0_10.var304 = var2; break; } - ewram0.var304++; + ewram0_10.var304++; break; case 3: if ((var1 = sub_80EFBDC(0))) return; sub_80EFBB0(); - ewram0.var304 = var1; + ewram0_10.var304 = var1; break; case 4: - BeginNormalPaletteFade(ewram0.var308, -1, 0, 0x10, 0); - ewram0.var304++; + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + ewram0_10.var304++; break; case 5: if (gPaletteFade.active) return; sub_80F2DF4(); sub_80F2D04(0x4); - gSaveBlock2.regionMapZoom = (ewram0.var6e90 == 1) ? 1 : 0; + gSaveBlock2.regionMapZoom = (ewram0_10.var6e90 == 1) ? 1 : 0; sub_80EBDBC(&sub_80EC00C); } } void sub_80EC81C() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: sub_80F2D04(0); sub_80EE9C0(1, 0, 1); - ewram0.var304++; + ewram0_10.var304++; break; case 1: if (sub_80EEA0C()) return; @@ -860,18 +857,18 @@ void sub_80EC81C() { } void sub_80EC86C() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: if (sub_80EEC90()) { PlaySE(0x5); - sub_80EF428(1, ewram0.var6dad); + sub_80EF428(1, ewram0_10.var6dad); sub_80EED9C(); break; } if (gMain.newKeys & A_BUTTON) { PlaySE(0x5); - ewram0.var6df0 = ewram0.var6dad; - switch (ewram0.var6df0) { + ewram0_10.var6df0 = ewram0_10.var6dad; + switch (ewram0_10.var6df0) { case 0: sub_80EBDBC(&sub_80ED620); break; @@ -886,9 +883,9 @@ void sub_80EC86C() { } else if (gMain.newKeys & B_BUTTON) { PlaySE(0x5); - ewram0.var6df0 = 0x2; - ewram0.var6dad = 0x2; - ewram0.var304++; + ewram0_10.var6df0 = 0x2; + ewram0_10.var6dad = 0x2; + ewram0_10.var304++; break; } break; @@ -899,10 +896,10 @@ void sub_80EC86C() { } void sub_80EC960() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: sub_80EE9C0(2, 0, 5); - ewram0.var304++; + ewram0_10.var304++; break; case 1: if (sub_80EEA0C()) return; @@ -911,125 +908,125 @@ void sub_80EC960() { } void sub_80EC9A8() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: sub_80F2D04(5); - sub_80EE9C0(1, ewram0.var6df0, 0xC); - ewram0.var304++; + sub_80EE9C0(1, ewram0_10.var6df0, 0xC); + ewram0_10.var304++; break; case 1: if (sub_80EEA0C()) return; sub_80EBDBC(&sub_80EC86C); - sub_80EF428(1, ewram0.var6dad); + sub_80EF428(1, ewram0_10.var6dad); } } void sub_80ECA10() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: if (sub_80EEF78()) return; SetVBlankCallback(&sub_80EBD80); sub_80EED1C(); - ewram0.var6dad = ewram0.var6df0; - ewram0.var6dae = 0x3; + ewram0_10.var6dad = ewram0_10.var6df0; + ewram0_10.var6dae = 0x3; sub_80EEE08(); - ewram0.var304++; + ewram0_10.var304++; break; case 1: sub_80EF248(0x1); - ewram0.var304++; + ewram0_10.var304++; case 2: if (sub_80EF284(0x1)) return; - ewram0.var304++; + ewram0_10.var304++; break; case 3: sub_80F1B8C(0x1); - ewram0.var304++; + ewram0_10.var304++; case 4: if (sub_80F1BC8(0x1)) return; - ewram0.var304++; + ewram0_10.var304++; break; case 5: if (sub_8055870()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 6: - BeginNormalPaletteFade(ewram0.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); SetVBlankCallback(&sub_80EBD18); - ewram0.var304++; + ewram0_10.var304++; break; case 7: sub_80EED2C(0); - ewram0.var304++; + ewram0_10.var304++; break; case 8: sub_80F2598(); - ewram0.var304++; + ewram0_10.var304++; break; case 9: if (gPaletteFade.active) return; - ewram0.var304++; + ewram0_10.var304++; break; case 0xA: sub_80F2C80(0x1); - ewram0.var304++; + ewram0_10.var304++; case 0xB: if (sub_80F2CBC(0x1)) return; - ewram0.var304++; + ewram0_10.var304++; break; case 0xC: sub_80F1DF0(); - ewram0.var304++; + ewram0_10.var304++; break; case 0xD: if (sub_80F1E50()) return; - sub_80EF428(1, ewram0.var6dad); + sub_80EF428(1, ewram0_10.var6dad); sub_80EBDBC(&sub_80EC86C); } } void sub_80ECC08() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: if (sub_80EEC90()) { PlaySE(0x5); - sub_80EF428(2, ewram0.var6dad); + sub_80EF428(2, ewram0_10.var6dad); sub_80EED9C(); break; } if (gMain.newKeys & A_BUTTON) { PlaySE(0x5); - switch ((s8)ewram0.var6dad) { + switch ((s8)ewram0_10.var6dad) { case 0: - ewram0.var87D8 = 22; + ewram0_10.var87D8 = 22; break; case 1: - ewram0.var87D8 = 23; + ewram0_10.var87D8 = 23; break; case 2: - ewram0.var87D8 = 24; + ewram0_10.var87D8 = 24; break; case 3: - ewram0.var87D8 = 33; + ewram0_10.var87D8 = 33; break; case 4: - ewram0.var87D8 = 47; + ewram0_10.var87D8 = 47; break; case 5: sub_80EBDBC(&sub_80EC9A8); return; } - ewram0.var6dfc = ewram0.var6dad; - ewram0.var76aa = 1; + ewram0_10.var6dfc = ewram0_10.var6dad; + ewram0_10.var76aa = 1; sub_80EBDBC(&sub_80ED01C); } else if (gMain.newKeys & B_BUTTON) { PlaySE(0x5); - ewram0.var6dad = 0x5; - ewram0.var304++; + ewram0_10.var6dad = 0x5; + ewram0_10.var304++; } break; case 1: @@ -1041,93 +1038,93 @@ void sub_80ECC08() { void sub_80ECD80() { u16 var1; - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0.var308, -1, 0, 0x10, 0); - ewram0.var304++; + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + ewram0_10.var304++; break; case 1: if (gPaletteFade.active) return; - ewram0.var304++; + ewram0_10.var304++; break; case 2: if (sub_80EEF78()) return; SetVBlankCallback(&sub_80EBD80); - ewram0.var304++; + ewram0_10.var304++; break; case 3: sub_80EED1C(); sub_80F3130(); - ewram0.var304++; + ewram0_10.var304++; break; case 4: sub_80F2D6C(0x1); - ewram0.var304++; + ewram0_10.var304++; break; case 5: sub_80F2D6C(0x5); - ewram0.var304++; + ewram0_10.var304++; break; case 6: - ewram0.var6dad = ewram0.var6dfc; - ewram0.var6dae = 0x6; + ewram0_10.var6dad = ewram0_10.var6dfc; + ewram0_10.var6dae = 0x6; sub_80EEE08(); - ewram0.var304++; + ewram0_10.var304++; break; case 7: sub_80EF248(0x2); - ewram0.var304++; + ewram0_10.var304++; case 8: if (sub_80EF284(0x2)) return; - ewram0.var304++; + ewram0_10.var304++; break; case 9: sub_80F1B8C(0x2); - ewram0.var304++; + ewram0_10.var304++; case 10: if (sub_80F1BC8(0x2)) return; - ewram0.var304++; + ewram0_10.var304++; break; case 11: if (sub_8055870()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 12: - BeginNormalPaletteFade(ewram0.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); SetVBlankCallback(&sub_80EBD18); - ewram0.var304++; + ewram0_10.var304++; break; case 13: sub_80EED2C(0); - ewram0.var304++; + ewram0_10.var304++; break; case 14: sub_80F2598(); - ewram0.var304++; + ewram0_10.var304++; break; case 15: if (gPaletteFade.active) return; - ewram0.var304++; + ewram0_10.var304++; break; case 16: sub_80F2C80(0x1); - ewram0.var304++; + ewram0_10.var304++; case 17: if ((var1 = sub_80F2CBC(0x1))) return; - ewram0.var306 = var1; - ewram0.var304++; + ewram0_10.var306 = var1; + ewram0_10.var304++; break; case 18: sub_80F2C80(0x5); - ewram0.var304++; + ewram0_10.var304++; case 19: if (sub_80F2CBC(0x5)) return; sub_80F1DF0(); - ewram0.var304++; + ewram0_10.var304++; break; case 20: if (sub_80F1E50()) return; - sub_80EF428(2, ewram0.var6dad); + sub_80EF428(2, ewram0_10.var6dad); sub_80EBDBC(&sub_80ECC08); } } @@ -1135,101 +1132,101 @@ void sub_80ECD80() { void sub_80ED01C() { u16 var1; u16 var3; - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: sub_80F1E84(); sub_80F2D04(0x1); sub_80F2D04(0x5); - ewram0.var304++; + ewram0_10.var304++; break; case 1: if (sub_80F1F10()) return; sub_80EEFBC(0); - ewram0.var304++; + ewram0_10.var304++; break; case 2: if ((var1 = sub_80EEF34())) return; - BeginNormalPaletteFade(ewram0.var308, -1, 0x0, 0x10, var1); - ewram0.var304++; + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var1); + ewram0_10.var304++; break; case 3: if (gPaletteFade.active) return; SetVBlankCallback(NULL); sub_80EED0C(); sub_80EF814(); - ewram0.var304++; + ewram0_10.var304++; break; case 4: sub_80F2620(); - ewram0.var304++; + ewram0_10.var304++; break; case 5: sub_80F4D44(); - ewram0.var304++; + ewram0_10.var304++; case 6: if (!sub_80F4D88()) { - ewram0.var304 += 2; + ewram0_10.var304 += 2; break; } - ewram0.var304++; + ewram0_10.var304++; break; case 7: if (sub_8055870()) return; - ewram0.var304--; + ewram0_10.var304--; break; case 8: if (sub_8055870()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 9: sub_80F0264(0); - ewram0.var304++; + ewram0_10.var304++; case 10: if (sub_80F02A0()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 11: sub_80F3008(0); - ewram0.var304++; + ewram0_10.var304++; break; case 12: if (sub_8055870()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 13: - BeginNormalPaletteFade(ewram0.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); SetVBlankCallback(&sub_80EBD18); - ewram0.var304++; + ewram0_10.var304++; break; case 14: sub_80EED2C(0x4); - ewram0.var304++; + ewram0_10.var304++; break; case 15: if (gPaletteFade.active) return; - ewram0.var306 = (u8)(gPaletteFade.active << 24); - ewram0.var304++; + ewram0_10.var306 = (u8)(gPaletteFade.active << 24); + ewram0_10.var304++; break; case 16: sub_80F2C80(0x1); - ewram0.var304++; + ewram0_10.var304++; case 17: if ((var3 = sub_80F2CBC(0x1))) return; - ewram0.var306 = var3; - ewram0.var304++; + ewram0_10.var306 = var3; + ewram0_10.var304++; break; case 18: - sub_80F2C80(ewram0.var6dfc + 7); - ewram0.var304++; + sub_80F2C80(ewram0_10.var6dfc + 7); + ewram0_10.var304++; case 19: - if (sub_80F2CBC(ewram0.var6dfc + 7)) return; + if (sub_80F2CBC(ewram0_10.var6dfc + 7)) return; sub_80EBDBC(&sub_80ED31C); break; } } void sub_80ED31C() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: switch (sub_80F5DD4()) { case 1: @@ -1238,7 +1235,7 @@ void sub_80ED31C() { break; case 2: PlaySE(0x5); - ewram0.var304++; + ewram0_10.var304++; break; default: if (gMain.newKeys & A_BUTTON) { @@ -1256,50 +1253,50 @@ void sub_80ED31C() { if (sub_80F0718()) return; ShowMapNamePopUpWindow(); sub_80F3264(); - ewram0.var304++; + ewram0_10.var304++; break; case 2: if (sub_8055870()) return; - ewram0.var304 = 0; + ewram0_10.var304 = 0; break; } } void sub_80ED3D0() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: SetVBlankCallback(NULL); - ewram0.var304++; + ewram0_10.var304++; break; case 1: sub_80EED0C(); sub_80F6134(); - ewram0.var304++; + ewram0_10.var304++; break; case 2: sub_80EEFBC(0); - ewram0.var304++; + ewram0_10.var304++; break; case 3: sub_80F0264(0); - ewram0.var304++; + ewram0_10.var304++; case 4: if (sub_80F02A0()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 5: if (sub_8055870()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 6: sub_80F3008(0); - BeginNormalPaletteFade(ewram0.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); SetVBlankCallback(&sub_80EBD18); - ewram0.var304++; + ewram0_10.var304++; break; case 7: sub_80EED2C(0x4); - ewram0.var304++; + ewram0_10.var304++; break; case 8: if (gPaletteFade.active) return; @@ -1308,43 +1305,43 @@ void sub_80ED3D0() { } void sub_80ED4D8() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0.var308, -1, 0, 0x10, 0); - ewram0.var304++; + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + ewram0_10.var304++; break; case 1: if (gPaletteFade.active) return; SetVBlankCallback(NULL); sub_80EED0C(); sub_80F3130(); - ewram0.var304++; + ewram0_10.var304++; break; case 2: if (sub_8055870()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 3: sub_80F4CF0(); - ewram0.var304++; + ewram0_10.var304++; break; case 4: sub_80EFF34(); - ewram0.var304++; + ewram0_10.var304++; case 5: if (sub_80EFF68()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 6: sub_80F35B4(); sub_80EEFBC(0x2); - BeginNormalPaletteFade(ewram0.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); SetVBlankCallback(sub_80EBD4C); - ewram0.var304++; + ewram0_10.var304++; break; case 7: sub_80EED2C(0x2); - ewram0.var304++; + ewram0_10.var304++; break; case 8: if (gPaletteFade.active) return; @@ -1355,21 +1352,21 @@ void sub_80ED4D8() { void sub_80ED620() { u8 var1; - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: sub_80F1E84(); sub_80F2D04(0x1); - ewram0.var304++; + ewram0_10.var304++; break; case 1: if (sub_80F1F10()) return; sub_80EEFBC(0x1); - ewram0.var304++; + ewram0_10.var304++; break; case 2: if (!(var1 = sub_80EEF34())) { - BeginNormalPaletteFade(ewram0.var308, -1, 0x0, 0x10, var1); - ewram0.var304++; + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var1); + ewram0_10.var304++; } break; case 3: @@ -1377,57 +1374,57 @@ void sub_80ED620() { SetVBlankCallback(NULL); sub_80EED0C(); sub_80EF814(); - ewram0.var76aa = (u8)(gPaletteFade.active << 24); - ewram0.var304++; + ewram0_10.var76aa = (u8)(gPaletteFade.active << 24); + ewram0_10.var304++; break; case 4: sub_80F2620(); - ewram0.var304++; + ewram0_10.var304++; break; case 5: - ewram0.varD162 = 0x2; + ewram0_10.varD162 = 0x2; sub_80F4BD0(); - ewram0.var304++; + ewram0_10.var304++; break; case 6: sub_80EFF34(); - ewram0.var304++; + ewram0_10.var304++; case 7: if (sub_80EFF68()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 8: if (sub_8055870()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 9: if (sub_8055870()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 10: sub_80F33A8(); - BeginNormalPaletteFade(ewram0.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); SetVBlankCallback(&sub_80EBD4C); - ewram0.var304++; + ewram0_10.var304++; break; case 11: sub_80EED2C(0x2); - ewram0.var304++; + ewram0_10.var304++; break; case 12: if (gPaletteFade.active) return; - ewram0.var304++; + ewram0_10.var304++; break; case 13: sub_80F2C80(0x1); - ewram0.var304++; + ewram0_10.var304++; case 14: if (sub_80F2CBC(0x1)) return; - ewram0.var304++; + ewram0_10.var304++; break; case 15: sub_80F2C80(0x6); - ewram0.var304++; + ewram0_10.var304++; case 16: if (sub_80F2CBC(0x6)) return; sub_80EBDBC(&sub_80ED858); @@ -1451,68 +1448,68 @@ void sub_80F4FDC(); void sub_80ED858() { u8 var1; - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: sub_80F4F78(); sub_80F5B38(); - ewram0.var304 = 0x1; + ewram0_10.var304 = 0x1; break; case 1: if (sub_80F5B50()) return; - ewram0.var304 = 0x2; + ewram0_10.var304 = 0x2; break; case 2: sub_80F0174(0x1); - ewram0.var304 = 0x3; + ewram0_10.var304 = 0x3; break; case 3: if (sub_80F4FB4()) return; sub_80F3C94(); sub_80F3D00(); - ewram0.var304 = 0x4; + ewram0_10.var304 = 0x4; break; case 4: - if ( (gMain.heldKeys & 0x40) && (ewram0.var87CB) && (!(ewram0.var76aa) || (ewram0.var87DC)) ) { + if ( (gMain.heldKeys & 0x40) && (ewram0_10.var87CB) && (!(ewram0_10.var76aa) || (ewram0_10.var87DC)) ) { PlaySE(0x5); sub_80F5060(0x1); move_anim_execute(); - ewram0.var304 = 0x5; + ewram0_10.var304 = 0x5; } - else if ( (gMain.heldKeys & 0x80) && (ewram0.var87CB) && (!(ewram0.var76aa) || (ewram0.var76aa >= ewram0.var87DC)) ) { + else if ( (gMain.heldKeys & 0x80) && (ewram0_10.var87CB) && (!(ewram0_10.var76aa) || (ewram0_10.var76aa >= ewram0_10.var87DC)) ) { PlaySE(0x5); sub_80F5060(0); move_anim_execute(); - ewram0.var304 = 0x5; + ewram0_10.var304 = 0x5; } if (gMain.newKeys & B_BUTTON) { PlaySE(0x5); sub_80F4FDC(); move_anim_execute(); - ewram0.var304 = 0x9; + ewram0_10.var304 = 0x9; } else if (gMain.newKeys & A_BUTTON) { - if (ewram0.var76aa) { - if (ewram0.var6dac) { + if (ewram0_10.var76aa) { + if (ewram0_10.var6dac) { PlaySE(0x5); - ewram0.var304 = 0x7; + ewram0_10.var304 = 0x7; } } - else if ((ewram0.var87DC == ewram0.var87DA - 1)) { + else if ((ewram0_10.var87DC == ewram0_10.var87DA - 1)) { PlaySE(0x5); - ewram0.var304 = 0x9; + ewram0_10.var304 = 0x9; } } /* if (gMain.heldKeys & 0x40) { - if (ewram0.var87CB) { - if (ewram0.var76aa) { - if (!ewram0.var87DC) goto label1; + if (ewram0_10.var87CB) { + if (ewram0_10.var76aa) { + if (!ewram0_10.var87DC) goto label1; } PlaySE(0x5); sub_80F5060(0x1); move_anim_execute(); - ewram0.var304 = 0x5; + ewram0_10.var304 = 0x5; } else goto label1; @@ -1521,14 +1518,14 @@ void sub_80ED858() { break; label1: if (gMain.heldKeys & 0x80) { - if (ewram0.var87CB) { - if (ewram0.var76aa) { - if (!(ewram0.var76aa < ewram0.var87DC)) goto label2; + if (ewram0_10.var87CB) { + if (ewram0_10.var76aa) { + if (!(ewram0_10.var76aa < ewram0_10.var87DC)) goto label2; } PlaySE(0x5); sub_80F5060(0x1); move_anim_execute(); - ewram0.var304 = 0x5; + ewram0_10.var304 = 0x5; } else goto label2; } @@ -1539,18 +1536,18 @@ label2: PlaySE(0x5); sub_80F4FDC(); move_anim_execute(); - ewram0.var304 = 0x9; + ewram0_10.var304 = 0x9; } else if (gMain.newKeys & A_BUTTON) { - if (!ewram0.var76aa) { - if ((ewram0.var87DC == ewram0.var87DA - 1)) { + if (!ewram0_10.var76aa) { + if ((ewram0_10.var87DC == ewram0_10.var87DA - 1)) { PlaySE(0x5); - ewram0.var304 = 0x9; + ewram0_10.var304 = 0x9; } } else { PlaySE(0x5); - ewram0.var304 = 0x9; + ewram0_10.var304 = 0x9; } } */ @@ -1559,36 +1556,36 @@ label2: case 5: if (gpu_sync_bg_show()) return; sub_80F3D00(); - ewram0.var304 = 0x6; + ewram0_10.var304 = 0x6; break; case 6: if (sub_8055870()) return; - ewram0.var304 = 0x4; + ewram0_10.var304 = 0x4; break; case 7: sub_80EEFBC(0x3); sub_80F3668(); - ewram0.var304 = 0x8; + ewram0_10.var304 = 0x8; break; case 8: if (sub_80F7500()) return; sub_80EEFBC(0x2); sub_80F3698(); - ewram0.var304 = 0x4; + ewram0_10.var304 = 0x4; break; case 9: if (!(var1 = sub_80F5038())) { sub_80F0174(0); sub_80F2F48(); - BeginNormalPaletteFade(ewram0.var308, -1, 0x0, 0x10, var1); - ewram0.var304 = 0xB; + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var1); + ewram0_10.var304 = 0xB; } break; case 0xA: if (gPaletteFade.active) return; sub_80F3CE8(); sub_80F5BDC(); - if (!ewram0.var76aa) { + if (!ewram0_10.var76aa) { sub_80F357C(); sub_80F2D6C(0x1); sub_80F2D6C(0x6); @@ -1607,7 +1604,7 @@ __attribute__((naked)) void sub_80ED858() { asm_unified("push {r4,r5,lr}\n\ sub sp, 0x4\n\ - ldr r1, _080ED878 @ =0x02000000\n\ + ldr r1, _080ED878 @ =gSharedMem\n\ movs r2, 0xC1\n\ lsls r2, 2\n\ adds r0, r1, r2\n\ @@ -1623,7 +1620,7 @@ _080ED86E:\n\ ldr r0, [r0]\n\ mov pc, r0\n\ .align 2, 0\n\ -_080ED878: .4byte 0x02000000\n\ +_080ED878: .4byte gSharedMem\n\ _080ED87C: .4byte _080ED880\n\ .align 2, 0\n\ _080ED880:\n\ @@ -1642,7 +1639,7 @@ _080ED880:\n\ _080ED8B0:\n\ bl sub_80F4F78\n\ bl sub_80F5B38\n\ - ldr r0, _080ED8C8 @ =0x02000000\n\ + ldr r0, _080ED8C8 @ =gSharedMem\n\ movs r4, 0xC1\n\ lsls r4, 2\n\ adds r0, r4\n\ @@ -1650,7 +1647,7 @@ _080ED8B0:\n\ strh r1, [r0]\n\ b _080EDB7A\n\ .align 2, 0\n\ -_080ED8C8: .4byte 0x02000000\n\ +_080ED8C8: .4byte gSharedMem\n\ _080ED8CC:\n\ bl sub_80F5B50\n\ lsls r0, 24\n\ @@ -1658,7 +1655,7 @@ _080ED8CC:\n\ beq _080ED8D8\n\ b _080EDB7A\n\ _080ED8D8:\n\ - ldr r0, _080ED8E8 @ =0x02000000\n\ + ldr r0, _080ED8E8 @ =gSharedMem\n\ movs r1, 0xC1\n\ lsls r1, 2\n\ adds r0, r1\n\ @@ -1666,11 +1663,11 @@ _080ED8D8:\n\ strh r1, [r0]\n\ b _080EDB7A\n\ .align 2, 0\n\ -_080ED8E8: .4byte 0x02000000\n\ +_080ED8E8: .4byte gSharedMem\n\ _080ED8EC:\n\ movs r0, 0x1\n\ bl sub_80F0174\n\ - ldr r0, _080ED900 @ =0x02000000\n\ + ldr r0, _080ED900 @ =gSharedMem\n\ movs r2, 0xC1\n\ lsls r2, 2\n\ adds r0, r2\n\ @@ -1678,7 +1675,7 @@ _080ED8EC:\n\ strh r1, [r0]\n\ b _080EDB7A\n\ .align 2, 0\n\ -_080ED900: .4byte 0x02000000\n\ +_080ED900: .4byte gSharedMem\n\ _080ED904:\n\ bl sub_80F4FB4\n\ lsls r0, 24\n\ @@ -1781,7 +1778,7 @@ _080ED9CC:\n\ bl PlaySE\n\ bl sub_80F4FDC\n\ bl move_anim_execute\n\ - ldr r0, _080ED9F4 @ =0x02000000\n\ + ldr r0, _080ED9F4 @ =gSharedMem\n\ movs r1, 0xC1\n\ lsls r1, 2\n\ adds r0, r1\n\ @@ -1789,7 +1786,7 @@ _080ED9CC:\n\ strh r1, [r0]\n\ b _080EDB7A\n\ .align 2, 0\n\ -_080ED9F4: .4byte 0x02000000\n\ +_080ED9F4: .4byte gSharedMem\n\ _080ED9F8:\n\ movs r0, 0x1\n\ ands r0, r2\n\ @@ -1854,7 +1851,7 @@ _080EDA68:\n\ b _080EDB7A\n\ _080EDA74:\n\ bl sub_80F3D00\n\ - ldr r0, _080EDA88 @ =0x02000000\n\ + ldr r0, _080EDA88 @ =gSharedMem\n\ movs r4, 0xC1\n\ lsls r4, 2\n\ adds r0, r4\n\ @@ -1862,23 +1859,23 @@ _080EDA74:\n\ strh r1, [r0]\n\ b _080EDB7A\n\ .align 2, 0\n\ -_080EDA88: .4byte 0x02000000\n\ +_080EDA88: .4byte gSharedMem\n\ _080EDA8C:\n\ bl sub_8055870\n\ cmp r0, 0\n\ bne _080EDB7A\n\ - ldr r0, _080EDAA0 @ =0x02000000\n\ + ldr r0, _080EDAA0 @ =gSharedMem\n\ movs r1, 0xC1\n\ lsls r1, 2\n\ adds r0, r1\n\ b _080EDADC\n\ .align 2, 0\n\ -_080EDAA0: .4byte 0x02000000\n\ +_080EDAA0: .4byte gSharedMem\n\ _080EDAA4:\n\ movs r0, 0x3\n\ bl sub_80EEFBC\n\ bl sub_80F3668\n\ - ldr r0, _080EDABC @ =0x02000000\n\ + ldr r0, _080EDABC @ =gSharedMem\n\ movs r2, 0xC1\n\ lsls r2, 2\n\ adds r0, r2\n\ @@ -1886,7 +1883,7 @@ _080EDAA4:\n\ strh r1, [r0]\n\ b _080EDB7A\n\ .align 2, 0\n\ -_080EDABC: .4byte 0x02000000\n\ +_080EDABC: .4byte gSharedMem\n\ _080EDAC0:\n\ bl sub_80F7500\n\ lsls r0, 24\n\ @@ -1896,7 +1893,7 @@ _080EDAC0:\n\ bl sub_80EEFBC\n\ bl sub_80F3698\n\ _080EDAD4:\n\ - ldr r0, _080EDAE4 @ =0x02000000\n\ + ldr r0, _080EDAE4 @ =gSharedMem\n\ movs r4, 0xC1\n\ lsls r4, 2\n\ adds r0, r4\n\ @@ -1905,7 +1902,7 @@ _080EDADC:\n\ strh r1, [r0]\n\ b _080EDB7A\n\ .align 2, 0\n\ -_080EDAE4: .4byte 0x02000000\n\ +_080EDAE4: .4byte gSharedMem\n\ _080EDAE8:\n\ bl sub_80F5038\n\ lsls r0, 24\n\ @@ -1915,7 +1912,7 @@ _080EDAE8:\n\ movs r0, 0\n\ bl sub_80F0174\n\ bl sub_80F2F48\n\ - ldr r5, _080EDB24 @ =0x02000000\n\ + ldr r5, _080EDB24 @ =gSharedMem\n\ movs r1, 0xC2\n\ lsls r1, 2\n\ adds r0, r5, r1\n\ @@ -1933,7 +1930,7 @@ _080EDAE8:\n\ strh r0, [r1]\n\ b _080EDB7A\n\ .align 2, 0\n\ -_080EDB24: .4byte 0x02000000\n\ +_080EDB24: .4byte gSharedMem\n\ _080EDB28:\n\ ldr r0, _080EDB60 @ =gPaletteFade\n\ ldrb r1, [r0, 0x7]\n\ @@ -1943,7 +1940,7 @@ _080EDB28:\n\ bne _080EDB7A\n\ bl sub_80F3CE8\n\ bl sub_80F5BDC\n\ - ldr r0, _080EDB64 @ =0x02000000\n\ + ldr r0, _080EDB64 @ =gSharedMem\n\ ldr r4, _080EDB68 @ =0x000076aa\n\ adds r0, r4\n\ ldrb r0, [r0]\n\ @@ -1959,7 +1956,7 @@ _080EDB28:\n\ b _080EDB7A\n\ .align 2, 0\n\ _080EDB60: .4byte gPaletteFade\n\ -_080EDB64: .4byte 0x02000000\n\ +_080EDB64: .4byte gSharedMem\n\ _080EDB68: .4byte 0x000076aa\n\ _080EDB6C: .4byte sub_80ECA10\n\ _080EDB70:\n\ @@ -1978,21 +1975,21 @@ _080EDB84: .4byte sub_80ED3D0\n"); void sub_80EDB88() { u8 var1; - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: sub_80F1E84(); sub_80F2D04(0); - ewram0.var304++; + ewram0_10.var304++; break; case 1: if (sub_80F1F10()) return; sub_80EEFBC(0x4); - ewram0.var304++; + ewram0_10.var304++; break; case 2: if (!(var1 = sub_80EEF34())) { - BeginNormalPaletteFade(ewram0.var308, -1, 0x0, 0x10, var1); - ewram0.var304++; + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var1); + ewram0_10.var304++; } break; case 3: @@ -2000,60 +1997,60 @@ void sub_80EDB88() { SetVBlankCallback(0); sub_80EED0C(); sub_80EF814(); - ewram0.var304++; + ewram0_10.var304++; break; case 4: sub_80F2620(); - ewram0.var304++; + ewram0_10.var304++; break; case 5: sub_80F638C(); - ewram0.var304++; + ewram0_10.var304++; case 6: if (!sub_80F63D0()) { - ewram0.var304 += 0x2; + ewram0_10.var304 += 0x2; break; } - ewram0.var304++; + ewram0_10.var304++; break; case 7: if (sub_8055870()) return; - ewram0.var304--; + ewram0_10.var304--; break; case 8: if (sub_8055870()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 9: sub_80F0264(0x1); - ewram0.var304++; + ewram0_10.var304++; case 10: if (sub_80F02A0()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 11: sub_80F2C80(0x2); - ewram0.var304++; + ewram0_10.var304++; case 12: if (sub_80F2CBC(0x2)) return; - ewram0.var304++; + ewram0_10.var304++; break; case 13: sub_80F3008(0x1); - ewram0.var304++; + ewram0_10.var304++; break; case 14: if (sub_8055870()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 15: - BeginNormalPaletteFade(ewram0.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); SetVBlankCallback(&sub_80EBD18); - ewram0.var304++; + ewram0_10.var304++; break; case 16: sub_80EED2C(0x4); - ewram0.var304++; + ewram0_10.var304++; break; case 17: if (gPaletteFade.active) return; @@ -2063,7 +2060,7 @@ void sub_80EDB88() { } void sub_80EDDBC() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: switch (sub_80F5DD4()) { case 1: @@ -2072,7 +2069,7 @@ void sub_80EDDBC() { break; case 2: PlaySE(0x5); - ewram0.var304++; + ewram0_10.var304++; break; default: if (gMain.newKeys & A_BUTTON) { @@ -2090,27 +2087,27 @@ void sub_80EDDBC() { if (sub_80F0718()) return; ShowMapNamePopUpWindow(); sub_80F3264(); - ewram0.var304++; + ewram0_10.var304++; break; case 2: if (sub_8055870()) return; - ewram0.var304 = 0; + ewram0_10.var304 = 0; break; } } void sub_80EDE70() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0.var308, -1, 0, 0x10, 0); - ewram0.var304++; + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + ewram0_10.var304++; break; case 1: if (gPaletteFade.active) return; sub_80F3130(); sub_80F2D6C(0x2); - ewram0.var304++; + ewram0_10.var304++; break; case 2: sub_80EBDBC(&sub_80EC00C); @@ -2120,51 +2117,51 @@ void sub_80EDE70() { } void sub_80EDEE4() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0.var308, -1, 0, 0x10, 0); - ewram0.var304++; + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + ewram0_10.var304++; break; case 1: if (gPaletteFade.active) return; SetVBlankCallback(NULL); sub_80EED0C(); sub_80F3130(); - ewram0.var304++; + ewram0_10.var304++; break; case 2: sub_80F66E0(); sub_80EEE08(); - ewram0.var304++; + ewram0_10.var304++; break; case 3: if (sub_80F1080()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 4: sub_80EEFBC(0x5); sub_80F38B8(); - ewram0.var304++; + ewram0_10.var304++; case 5: if (sub_80F38EC()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 6: if (sub_8055870()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 7: - BeginNormalPaletteFade(ewram0.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); SetVBlankCallback(&sub_80EBD18); - ewram0.var304++; + ewram0_10.var304++; break; case 8: sub_80EED2C(0x3); - ewram0.var304++; + ewram0_10.var304++; break; case 9: if (gPaletteFade.active) return; - ewram0.var304++; + ewram0_10.var304++; break; case 10: if (sub_80F170C()) return; @@ -2176,17 +2173,17 @@ void sub_80EDEE4() { void sub_80EE06C() { u32 var1; u16 var2; - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: sub_80F15A8(); - ewram0.var304++; + ewram0_10.var304++; break; case 1: if (gMain.newAndRepeatedKeys & 0x40) { - if (ewram0.var87DC) { + if (ewram0_10.var87DC) { PlaySE(0x5); sub_80F6A4C(-1); - ewram0.var304++; + ewram0_10.var304++; } else goto label1; } @@ -2194,10 +2191,10 @@ void sub_80EE06C() { break; label1: if (gMain.newAndRepeatedKeys & 0x80) { - if (ewram0.var87DC < ewram0.var8774) { + if (ewram0_10.var87DC < ewram0_10.var8774) { PlaySE(0x5); sub_80F6A4C(1); - ewram0.var304++; + ewram0_10.var304++; } else goto label2; } @@ -2207,7 +2204,7 @@ label2: if (gMain.newKeys & A_BUTTON) { PlaySE(0x5); sub_80EEFBC(0xB); - ewram0.var304 = 0x4; + ewram0_10.var304 = 0x4; } else if (gMain.newKeys & B_BUTTON) { PlaySE(0x5); @@ -2216,21 +2213,21 @@ label2: break; case 2: if (sub_80F6AF0()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 3: var1 = sub_8055870(); if (var1) return; - ewram0.var304 = var1; + ewram0_10.var304 = var1; break; case 4: sub_80F3B00(); - ewram0.var304++; + ewram0_10.var304++; break; case 5: if (sub_80F3B58()) return; sub_80F1494(); - ewram0.var304++; + ewram0_10.var304++; sub_80EED9C(); break; case 6: @@ -2238,36 +2235,36 @@ label2: case 1: PlaySE(0x5); sub_80F3B94(); - ewram0.var304 = 0x7; + ewram0_10.var304 = 0x7; break; default: case 0: if (gMain.newKeys & B_BUTTON) { PlaySE(0x5); sub_80F3B94(); - ewram0.var304 = 0x8; + ewram0_10.var304 = 0x8; } break; } break; case 7: if (sub_80F3BD4()) return; - ewram0.var304 = 0x4; + ewram0_10.var304 = 0x4; break; case 8: var2 = sub_80F3BD4(); if (var2) return; sub_80EEFBC(0x5); - ewram0.var304 = var2; + ewram0_10.var304 = var2; break; } } void sub_80EE294() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0.var308, -1, 0, 0x10, 0); - ewram0.var304++; + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + ewram0_10.var304++; break; case 1: if (gPaletteFade.active) return; @@ -2275,33 +2272,33 @@ void sub_80EE294() { sub_80EED0C(); sub_80F3C2C(); sub_80EEE08(); - ewram0.var304++; + ewram0_10.var304++; break; case 2: sub_80F6134(); sub_80F0264(0x1); - ewram0.var304++; + ewram0_10.var304++; case 3: if (sub_80F02A0()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 4: sub_80EEFBC(0x4); sub_80F3008(0x1); SetVBlankCallback(&sub_80EBD18); - ewram0.var304++; + ewram0_10.var304++; break; case 5: if (sub_8055870()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 6: - BeginNormalPaletteFade(ewram0.var308, -1, 0x10, 0, 0); - ewram0.var304++; + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); + ewram0_10.var304++; break; case 7: sub_80EED2C(0x4); - ewram0.var304++; + ewram0_10.var304++; break; case 8: if (gPaletteFade.active) return; @@ -2312,21 +2309,21 @@ void sub_80EE294() { void sub_80EE3D8() { u8 var1; - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: sub_80F1E84(); sub_80F2D04(0); - ewram0.var304++; + ewram0_10.var304++; break; case 1: if (sub_80F1F10()) return; sub_80EEFBC(0x9); - ewram0.var304++; + ewram0_10.var304++; break; case 2: if (!(var1 = sub_80EEF34())) { - BeginNormalPaletteFade(ewram0.var308, -1, 0x0, 0x10, var1); - ewram0.var304++; + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x0, 0x10, var1); + ewram0_10.var304++; } break; case 3: @@ -2335,43 +2332,43 @@ void sub_80EE3D8() { sub_80EED0C(); sub_80EF814(); sub_80EEE08(); - ewram0.var304++; + ewram0_10.var304++; break; case 4: sub_80F2620(); - ewram0.var304++; + ewram0_10.var304++; break; case 5: sub_80F0264(0x2); - ewram0.var304++; + ewram0_10.var304++; case 6: if (sub_80F02A0()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 7: sub_80F2C80(0x3); - ewram0.var304++; + ewram0_10.var304++; case 8: if (sub_80F2CBC(0x3)) return; - ewram0.var304++; + ewram0_10.var304++; break; case 9: sub_80F3008(0x2); - ewram0.var304++; + ewram0_10.var304++; break; case 10: if (sub_8055870()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 11: sub_80F6F10(); - BeginNormalPaletteFade(ewram0.var308, -1, 0x10, 0, 0); + BeginNormalPaletteFade(ewram0_10.var308, -1, 0x10, 0, 0); SetVBlankCallback(&sub_80EBD68); - ewram0.var304++; + ewram0_10.var304++; break; case 12: sub_80EED2C(0x5); - ewram0.var304++; + ewram0_10.var304++; break; case 13: if (gPaletteFade.active) return; @@ -2381,16 +2378,16 @@ void sub_80EE3D8() { } void sub_80EE58C() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: switch (sub_80F5DD4()) { case 1: PlaySE(0x5); - sub_80F0FFC(ewram0.var876E); + sub_80F0FFC(ewram0_10.var876E); break; case 2: PlaySE(0x5); - ewram0.var304++; + ewram0_10.var304++; break; default: if (gMain.newKeys & A_BUTTON) { @@ -2406,61 +2403,61 @@ void sub_80EE58C() { break; case 1: if (sub_80F0718()) return; - sub_80F0FFC(ewram0.var876E); + sub_80F0FFC(ewram0_10.var876E); sub_80F3264(); - ewram0.var304++; + ewram0_10.var304++; break; case 2: if (sub_8055870()) return; - ewram0.var304 = 0; + ewram0_10.var304 = 0; break; } } void sub_80EE658() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: sub_80F3294(0x1); sub_80EEFBC(0xA); sub_80F0B24(); - ewram0.var304++; + ewram0_10.var304++; break; case 1: if (sub_80F0B44()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 2: sub_80F0F64(); - ewram0.var304++; + ewram0_10.var304++; break; case 3: if (sub_80F0FEC()) return; sub_80F6FB8(0x1); - ewram0.var304++; + ewram0_10.var304++; break; case 4: sub_80F6DB8(); - ewram0.var304++; + ewram0_10.var304++; break; case 5: - sub_80F700C((u8 *)(ewram + 0x8788), *(u16 *)(ewram + 0x8788 - 0x1A)); - sub_80F42C4((u8 *)(ewram + 0x8788)); - ewram0.var304++; + sub_80F700C((u8 *)(gSharedMem + 0x8788), *(u16 *)(gSharedMem + 0x8788 - 0x1A)); + sub_80F42C4((u8 *)(gSharedMem + 0x8788)); + ewram0_10.var304++; break; case 6: sub_80F0CD8(); - ewram0.var304++; + ewram0_10.var304++; case 7: if (sub_80F6E9C()) return; if (sub_80F0D5C()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 8: if (gMain.heldKeys & 0x40) { - if (ewram0.var87DC) { + if (ewram0_10.var87DC) { PlaySE(0x5); sub_80F708C(-1); - ewram0.var304 = 0x10; + ewram0_10.var304 = 0x10; } else goto label1; } @@ -2468,10 +2465,10 @@ void sub_80EE658() { break; label1: if (gMain.heldKeys & 0x80) { - if (ewram0.var87DC < ewram0.var8774) { + if (ewram0_10.var87DC < ewram0_10.var8774) { PlaySE(0x5); sub_80F708C(1); - ewram0.var304 = 0x10; + ewram0_10.var304 = 0x10; } else goto label2; } @@ -2482,7 +2479,7 @@ label2: PlaySE(0x5); sub_80F4394(); sub_80F0EC0(); - ewram0.var304++; + ewram0_10.var304++; } break; case 9: @@ -2490,27 +2487,27 @@ label2: if (sub_80F0EF4()) return; sub_80F6FB8(0); sub_80F2FB0(); - ewram0.var304++; + ewram0_10.var304++; break; case 10: sub_80F6134(); - ewram0.var304++; + ewram0_10.var304++; break; case 11: sub_80F0FA0(); - ewram0.var304++; + ewram0_10.var304++; break; case 12: if (sub_80F0FEC()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 13: sub_80F0C28(); - ewram0.var304++; + ewram0_10.var304++; break; case 14: if (sub_80F0C48()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 15: sub_80EEFBC(0x9); @@ -2520,27 +2517,27 @@ label2: break; case 16: if (sub_80F70FC()) return; - ewram0.var304++; + ewram0_10.var304++; break; case 17: if (sub_8055870()) return; - ewram0.var304 = 0x8; + ewram0_10.var304 = 0x8; break; } } void sub_80EE8F4() { - switch (ewram0.var304) { + switch (ewram0_10.var304) { case 0: - BeginNormalPaletteFade(ewram0.var308, -1, 0, 0x10, 0); - ewram0.var304++; + BeginNormalPaletteFade(ewram0_10.var308, -1, 0, 0x10, 0); + ewram0_10.var304++; break; case 1: if (gPaletteFade.active) return; sub_80F3130(); sub_80F2D6C(0x2); sub_80F6FFC(); - ewram0.var304++; + ewram0_10.var304++; break; case 2: sub_80EBDBC(&sub_80EC00C); @@ -2549,11 +2546,11 @@ void sub_80EE8F4() { } void sub_80EE96C() { - u16 var1 = ewram0.var304; + u16 var1 = ewram0_10.var304; if (!var1) { PlaySE(0x6F); BeginNormalPaletteFade(-1, 0, 0, 0x10, var1); - ewram0.var304++; + ewram0_10.var304++; } else { if (gPaletteFade.active) return; @@ -2564,31 +2561,31 @@ void sub_80EE96C() { void sub_80EE9C0(u8 param1, u8 param2, u8 param3) { sub_80F1E84(); - ewram0.var6e14 = param1; - ewram0.var6e15 = param2; - ewram0.var6e16 = 0; - ewram0.var6e17 = param3; + ewram0_10.var6e14 = param1; + ewram0_10.var6e15 = param2; + ewram0_10.var6e16 = 0; + ewram0_10.var6e17 = param3; } #if 0 bool8 sub_80EEA0C() { - switch (ewram0.var6e16) { + switch (ewram0_10.var6e16) { case 0: if (sub_80F1F10()) return 1; - if (ewram0.var6e17 != 0xC) { - ewram0.var6e16 = 0x1; + if (ewram0_10.var6e17 != 0xC) { + ewram0_10.var6e16 = 0x1; return 1; } else { - ewram0.var6e16 = 0x3; + ewram0_10.var6e16 = 0x3; return 1; } case 1: - sub_80F2C80(ewram0.var6e17); - ewram0.var6e16++; + sub_80F2C80(ewram0_10.var6e17); + ewram0_10.var6e16++; case 2: - if (sub_80F2CBC(ewram0.var6e17)) return 1; - ewram0.var6e16++; + if (sub_80F2CBC(ewram0_10.var6e17)) return 1; + ewram0_10.var6e16++; case 3: } @@ -2598,7 +2595,7 @@ __attribute__((naked)) bool8 sub_80EEA0C() { asm_unified( "push {r4,lr}\n\ - ldr r1, _080EEA28 @ =0x02000000\n\ + ldr r1, _080EEA28 @ =gSharedMem\n\ ldr r2, _080EEA2C @ =0x00006e16\n\ adds r0, r1, r2\n\ ldrb r0, [r0]\n\ @@ -2613,7 +2610,7 @@ _080EEA1E:\n\ ldr r0, [r0]\n\ mov pc, r0\n\ .align 2, 0\n\ -_080EEA28: .4byte 0x02000000\n\ +_080EEA28: .4byte gSharedMem\n\ _080EEA2C: .4byte 0x00006e16\n\ _080EEA30: .4byte _080EEA34\n\ .align 2, 0\n\ @@ -2634,7 +2631,7 @@ _080EEA58:\n\ beq _080EEA64\n\ b _080EEC08\n\ _080EEA64:\n\ - ldr r1, _080EEA7C @ =0x02000000\n\ + ldr r1, _080EEA7C @ =gSharedMem\n\ ldr r4, _080EEA80 @ =0x00006e17\n\ adds r0, r1, r4\n\ ldrb r0, [r0]\n\ @@ -2646,7 +2643,7 @@ _080EEA64:\n\ strb r0, [r1]\n\ b _080EEC08\n\ .align 2, 0\n\ -_080EEA7C: .4byte 0x02000000\n\ +_080EEA7C: .4byte gSharedMem\n\ _080EEA80: .4byte 0x00006e17\n\ _080EEA84: .4byte 0x00006e16\n\ _080EEA88:\n\ @@ -2658,7 +2655,7 @@ _080EEA88:\n\ .align 2, 0\n\ _080EEA94: .4byte 0x00006e16\n\ _080EEA98:\n\ - ldr r4, _080EEAC8 @ =0x02000000\n\ + ldr r4, _080EEAC8 @ =gSharedMem\n\ ldr r1, _080EEACC @ =0x00006e17\n\ adds r0, r4, r1\n\ ldrb r0, [r0]\n\ @@ -2669,7 +2666,7 @@ _080EEA98:\n\ adds r0, 0x1\n\ strb r0, [r4]\n\ _080EEAAE:\n\ - ldr r4, _080EEAC8 @ =0x02000000\n\ + ldr r4, _080EEAC8 @ =gSharedMem\n\ ldr r1, _080EEACC @ =0x00006e17\n\ adds r0, r4, r1\n\ ldrb r0, [r0]\n\ @@ -2683,7 +2680,7 @@ _080EEAC2:\n\ adds r1, r4, r2\n\ b _080EEB76\n\ .align 2, 0\n\ -_080EEAC8: .4byte 0x02000000\n\ +_080EEAC8: .4byte gSharedMem\n\ _080EEACC: .4byte 0x00006e17\n\ _080EEAD0: .4byte 0x00006e16\n\ _080EEAD4:\n\ @@ -2732,7 +2729,7 @@ _080EEB20:\n\ _080EEB26:\n\ strb r0, [r1]\n\ _080EEB28:\n\ - ldr r4, _080EEB5C @ =0x02000000\n\ + ldr r4, _080EEB5C @ =gSharedMem\n\ ldr r1, _080EEB60 @ =0x00006e14\n\ adds r0, r4, r1\n\ ldrb r0, [r0]\n\ @@ -2743,7 +2740,7 @@ _080EEB28:\n\ adds r0, 0x1\n\ strb r0, [r4]\n\ _080EEB3E:\n\ - ldr r4, _080EEB5C @ =0x02000000\n\ + ldr r4, _080EEB5C @ =gSharedMem\n\ ldr r1, _080EEB60 @ =0x00006e14\n\ adds r0, r4, r1\n\ ldrb r0, [r0]\n\ @@ -2756,14 +2753,14 @@ _080EEB3E:\n\ b _080EEB76\n\ .align 2, 0\n\ _080EEB58: .4byte 0x00006dae\n\ -_080EEB5C: .4byte 0x02000000\n\ +_080EEB5C: .4byte gSharedMem\n\ _080EEB60: .4byte 0x00006e14\n\ _080EEB64: .4byte 0x00006e16\n\ _080EEB68:\n\ bl sub_8055870\n\ cmp r0, 0\n\ bne _080EEC08\n\ - ldr r1, _080EEB80 @ =0x02000000\n\ + ldr r1, _080EEB80 @ =gSharedMem\n\ ldr r4, _080EEB84 @ =0x00006e16\n\ adds r1, r4\n\ _080EEB76:\n\ @@ -2772,11 +2769,11 @@ _080EEB76:\n\ strb r0, [r1]\n\ b _080EEC08\n\ .align 2, 0\n\ -_080EEB80: .4byte 0x02000000\n\ +_080EEB80: .4byte gSharedMem\n\ _080EEB84: .4byte 0x00006e16\n\ _080EEB88:\n\ bl sub_80F1DF0\n\ - ldr r4, _080EEBA0 @ =0x02000000\n\ + ldr r4, _080EEBA0 @ =gSharedMem\n\ ldr r1, _080EEBA4 @ =0x00006e14\n\ adds r0, r4, r1\n\ ldrb r0, [r0]\n\ @@ -2785,7 +2782,7 @@ _080EEB88:\n\ adds r4, r2\n\ b _080EEBCC\n\ .align 2, 0\n\ -_080EEBA0: .4byte 0x02000000\n\ +_080EEBA0: .4byte gSharedMem\n\ _080EEBA4: .4byte 0x00006e14\n\ _080EEBA8: .4byte 0x00006e16\n\ _080EEBAC:\n\ @@ -2793,7 +2790,7 @@ _080EEBAC:\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _080EEC08\n\ - ldr r4, _080EEBD4 @ =0x02000000\n\ + ldr r4, _080EEBD4 @ =gSharedMem\n\ ldr r1, _080EEBD8 @ =0x00006e14\n\ adds r0, r4, r1\n\ ldrb r0, [r0]\n\ @@ -2809,7 +2806,7 @@ _080EEBCC:\n\ strb r0, [r4]\n\ b _080EEC08\n\ .align 2, 0\n\ -_080EEBD4: .4byte 0x02000000\n\ +_080EEBD4: .4byte gSharedMem\n\ _080EEBD8: .4byte 0x00006e14\n\ _080EEBDC: .4byte 0x00006dad\n\ _080EEBE0: .4byte 0x00006e16\n\ @@ -2818,7 +2815,7 @@ _080EEBE4:\n\ lsls r0, 24\n\ cmp r0, 0\n\ bne _080EEC08\n\ - ldr r1, _080EEC00 @ =0x02000000\n\ + ldr r1, _080EEC00 @ =gSharedMem\n\ ldr r2, _080EEC04 @ =0x00006e16\n\ adds r1, r2\n\ ldrb r0, [r1]\n\ @@ -2828,7 +2825,7 @@ _080EEBFA:\n\ movs r0, 0\n\ b _080EEC0A\n\ .align 2, 0\n\ -_080EEC00: .4byte 0x02000000\n\ +_080EEC00: .4byte gSharedMem\n\ _080EEC04: .4byte 0x00006e16\n\ _080EEC08:\n\ movs r0, 0x1\n\ @@ -2845,19 +2842,19 @@ _080EEC0A:\n\ bool8 sub_80EEC10() { if (gMain.newKeys & 0x40) { do { - if (--ewram0_1.var6dad < 0) { - ewram0_1.var6dad = ewram0_1.var6dae - 1; + if (--ewram0_11.var6dad < 0) { + ewram0_11.var6dad = ewram0_11.var6dae - 1; } - } while (!ewram0.var6db2[ewram0_1.var6dad]); + } while (!ewram0_10.var6db2[ewram0_11.var6dad]); return 1; } if (gMain.newKeys & 0x80) { do { - if (++ewram0_1.var6dad >= ewram0_1.var6dae) { - ewram0_1.var6dad = 0; + if (++ewram0_11.var6dad >= ewram0_11.var6dae) { + ewram0_11.var6dad = 0; } - } while (!ewram0.var6db2[ewram0_1.var6dad]); + } while (!ewram0_10.var6db2[ewram0_11.var6dad]); return 1; } return 0; @@ -2865,14 +2862,14 @@ bool8 sub_80EEC10() { bool8 sub_80EEC90() { if (gMain.newKeys & 0x40) { - if (--ewram0_1.var6dad < 0) { - ewram0_1.var6dad = ewram0_1.var6dae - 1; + if (--ewram0_11.var6dad < 0) { + ewram0_11.var6dad = ewram0_11.var6dae - 1; } return 1; } if (gMain.newKeys & 0x80) { - if (++ewram0_1.var6dad >= ewram0_1.var6dae) { - ewram0_1.var6dad = 0; + if (++ewram0_11.var6dad >= ewram0_11.var6dae) { + ewram0_11.var6dad = 0; } return 1; } @@ -2909,14 +2906,14 @@ void sub_80EED2C(u8 param1) { } void sub_80EED9C(void) { - gUnknown_03000744 = ewram0.var300; - ewram0.var300 = &sub_80EEDC4; - ewram0.var300(); + gUnknown_03000744 = ewram0_10.var300; + ewram0_10.var300 = &sub_80EEDC4; + ewram0_10.var300(); } void sub_80EEDC4(void) { if (sub_8055870() != 0x1) { - ewram0.var300 = gUnknown_03000744; + ewram0_10.var300 = gUnknown_03000744; } } |