diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-06-27 17:58:11 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-07-02 19:29:49 -0500 |
| commit | 498ff9ae1ae8dab1baa53e4068a126dc29e8e432 (patch) | |
| tree | dca49e1e019b1ffdb429bd265496a8104a889e2d /src | |
| parent | e3c0fb5a8577c780fee23fb21c1333c45cc37ebe (diff) | |
Some cleanup
Diffstat (limited to 'src')
| -rw-r--r-- | src/roulette.c | 1038 | ||||
| -rw-r--r-- | src/roulette_gfx.c | 948 |
2 files changed, 1003 insertions, 983 deletions
diff --git a/src/roulette.c b/src/roulette.c index 79ef4f10e..e7bd36932 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -89,41 +89,41 @@ const u8 gUnknown_083F88BC[] = INCBIN_U8("graphics/roulette/83F88BC.bin.lz"); const u8 gUnknown_083F8A60[] = INCBIN_U8("graphics/roulette/wheel_map.bin.lz"); const struct StructgUnknown_083F8C00 gUnknown_083F8C00[] = { - {0xFF, 0x0, 0x0, 0x00, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00000000, 0x00000000, 0x0000, 0x0000}, - {0x0C, 0x4, 0x1, 0x00, 0x11, 0x07, 0x00, 0x00, 0x00, 0x00000002, 0x00010842, 0xE000, 0x0000}, - {0x0D, 0x4, 0x2, 0x00, 0x14, 0x07, 0x00, 0x00, 0x00, 0x00000004, 0x00021084, 0xE000, 0x0000}, - {0x0E, 0x4, 0x3, 0x00, 0x17, 0x07, 0x00, 0x00, 0x00, 0x00000008, 0x00042108, 0xE000, 0x0000}, - {0x0F, 0x4, 0x4, 0x00, 0x1A, 0x07, 0x00, 0x00, 0x00, 0x00000010, 0x00084210, 0xE000, 0x0000}, - {0x10, 0x3, 0x0, 0x01, 0x0E, 0x0A, 0x00, 0x0C, 0x00, 0x00000020, 0x000003E0, 0x0249, 0x0000}, - {0x00, 0xC, 0x1, 0x01, 0x11, 0x0A, 0x03, 0x03, 0x00, 0x00000040, 0x00000040, 0x2001, 0x0000}, - {0x09, 0xC, 0x2, 0x01, 0x14, 0x0A, 0x03, 0x03, 0x00, 0x00000080, 0x00000080, 0x2200, 0x0000}, - {0x06, 0xC, 0x3, 0x01, 0x17, 0x0A, 0x03, 0x03, 0x00, 0x00000100, 0x00000100, 0x2040, 0x0000}, - {0x03, 0xC, 0x4, 0x01, 0x1A, 0x0A, 0x03, 0x03, 0x00, 0x00000200, 0x00000200, 0x2008, 0x0000}, - {0x11, 0x3, 0x0, 0x02, 0x0E, 0x0D, 0x03, 0x0F, 0x00, 0x00000400, 0x00007C00, 0x0492, 0x0000}, - {0x04, 0xC, 0x1, 0x02, 0x11, 0x0D, 0x06, 0x06, 0x00, 0x00000800, 0x00000800, 0x2010, 0x0000}, - {0x01, 0xC, 0x2, 0x02, 0x14, 0x0D, 0x06, 0x06, 0x00, 0x00001000, 0x00001000, 0x2002, 0x0000}, - {0x0A, 0xC, 0x3, 0x02, 0x17, 0x0D, 0x06, 0x06, 0x00, 0x00002000, 0x00002000, 0x2400, 0x0000}, - {0x07, 0xC, 0x4, 0x02, 0x1A, 0x0D, 0x06, 0x06, 0x00, 0x00004000, 0x00004000, 0x2080, 0x0000}, - {0x12, 0x3, 0x0, 0x03, 0x0E, 0x10, 0x06, 0x12, 0x00, 0x00008000, 0x000F8000, 0x0924, 0x0000}, - {0x08, 0xC, 0x1, 0x03, 0x11, 0x10, 0x09, 0x09, 0x00, 0x00010000, 0x00010000, 0x2100, 0x0000}, - {0x05, 0xC, 0x2, 0x03, 0x14, 0x10, 0x09, 0x09, 0x00, 0x00020000, 0x00020000, 0x2020, 0x0000}, - {0x02, 0xC, 0x3, 0x03, 0x17, 0x10, 0x09, 0x09, 0x00, 0x00040000, 0x00040000, 0x2004, 0x0000}, - {0x0B, 0xC, 0x4, 0x03, 0x1A, 0x10, 0x09, 0x09, 0x00, 0x00080000, 0x00080000, 0x2800, 0x0000}, + {255, 0, 0, 0, 7, 7, 0, 0, 0, 0, 0, 0, 0}, + {12, 4, 1, 0, 17, 7, 0, 0, 0, 2, 0x10842, 0xe000, 0}, + {13, 4, 2, 0, 20, 7, 0, 0, 0, 4, 0x21084, 0xe000, 0}, + {14, 4, 3, 0, 23, 7, 0, 0, 0, 8, 0x42108, 0xe000, 0}, + {15, 4, 4, 0, 26, 7, 0, 0, 0, 16, 0x84210, 0xe000, 0}, + {16, 3, 0, 1, 14, 10, 0, 12, 0, 32, 0x3e0, 0x249, 0}, + {0, 12, 1, 1, 17, 10, 3, 3, 0, 64, 64, 0x2001, 0}, + {9, 12, 2, 1, 20, 10, 3, 3, 0, 128, 128, 0x2200, 0}, + {6, 12, 3, 1, 23, 10, 3, 3, 0, 0x100, 0x100, 0x2040, 0}, + {3, 12, 4, 1, 26, 10, 3, 3, 0, 0x200, 0x200, 0x2008, 0}, + {17, 3, 0, 2, 14, 13, 3, 15, 0, 0x400, 0x7c00, 0x492, 0}, + {4, 12, 1, 2, 17, 13, 6, 6, 0, 0x800, 0x800, 0x2010, 0}, + {1, 12, 2, 2, 20, 13, 6, 6, 0, 0x1000, 0x1000, 0x2002, 0}, + {10, 12, 3, 2, 23, 13, 6, 6, 0, 0x2000, 0x2000, 0x2400, 0}, + {7, 12, 4, 2, 26, 13, 6, 6, 0, 0x4000, 0x4000, 0x2080, 0}, + {18, 3, 0, 3, 14, 16, 6, 18, 0, 0x8000, 0xf8000, 0x924, 0}, + {8, 12, 1, 3, 17, 16, 9, 9, 0, 0x10000, 0x10000, 0x2100, 0}, + {5, 12, 2, 3, 20, 16, 9, 9, 0, 0x20000, 0x20000, 0x2020, 0}, + {2, 12, 3, 3, 23, 16, 9, 9, 0, 0x40000, 0x40000, 0x2004, 0}, + {11, 12, 4, 3, 26, 16, 9, 9, 0, 0x80000, 0x80000, 0x2800, 0}, }; const struct StructgUnknown_083F8D90 gUnknown_083F8D90[] = { - { 0, 1, 6, 0x00000040}, - { 1, 3, 12, 0x00001000}, - { 2, 5, 18, 0x00040000}, - { 3, 7, 9, 0x00000200}, - { 4, 9, 11, 0x00000800}, - { 5, 11, 17, 0x00020000}, - { 6, 13, 8, 0x00000100}, - { 7, 15, 14, 0x00004000}, - { 8, 17, 16, 0x00010000}, - { 9, 19, 7, 0x00000080}, - {10, 21, 13, 0x00002000}, - {11, 23, 19, 0x00080000} + { 0, 1, 6, 64}, + { 1, 3, 12, 0x1000}, + { 2, 5, 18, 0x40000}, + { 3, 7, 9, 0x200}, + { 4, 9, 11, 0x800}, + { 5, 11, 17, 0x20000}, + { 6, 13, 8, 0x100}, + { 7, 15, 14, 0x4000}, + { 8, 17, 16, 0x10000}, + { 9, 19, 7, 128}, + {10, 21, 13, 0x2000}, + {11, 23, 19, 0x80000} }; const u8 gUnknown_083F8DF0[] = { @@ -168,118 +168,118 @@ const struct StructgUnknown_083F8DF4 gUnknown_083F8DF4[] = { const struct UnkStruct1 gUnknown_083F8E34[] = { { .var00 = 0x8000, - .var02 = 0x0005, - .var04 = 0x01, - .var05 = 0x01, - .var06 = 0xFF, + .var02 = 5, + .var04 = 1, + .var05 = 1, + .var06 = 255, .var07_0 = 8, .var07_5 = 2, .var07_7 = FALSE }, { .var00 = 0x8000, - .var02 = 0x000A, - .var04 = 0x01, - .var05 = 0x01, - .var06 = 0xFF, + .var02 = 10, + .var04 = 1, + .var05 = 1, + .var06 = 255, .var07_0 = 8, .var07_5 = 2, .var07_7 = FALSE }, { .var00 = 0x8000, - .var02 = 0x0015, - .var04 = 0x01, - .var05 = 0x01, - .var06 = 0xFF, + .var02 = 21, + .var04 = 1, + .var05 = 1, + .var06 = 255, .var07_0 = 8, .var07_5 = 2, .var07_7 = FALSE }, { .var00 = 0x8000, - .var02 = 0x0055, - .var04 = 0x01, - .var05 = 0x01, - .var06 = 0xFF, + .var02 = 85, + .var04 = 1, + .var05 = 1, + .var06 = 255, .var07_0 = 8, .var07_5 = 2, .var07_7 = FALSE }, { .var00 = 0x8000, - .var02 = 0x005A, - .var04 = 0x01, - .var05 = 0x01, - .var06 = 0xFF, + .var02 = 90, + .var04 = 1, + .var05 = 1, + .var06 = 255, .var07_0 = 8, .var07_5 = 2, .var07_7 = FALSE }, { .var00 = 0x8000, - .var02 = 0x0065, - .var04 = 0x01, - .var05 = 0x01, - .var06 = 0xFF, + .var02 = 101, + .var04 = 1, + .var05 = 1, + .var06 = 255, .var07_0 = 8, .var07_5 = 2, .var07_7 = FALSE }, { .var00 = 0x8000, - .var02 = 0x0075, - .var04 = 0x01, - .var05 = 0x01, - .var06 = 0xFF, + .var02 = 117, + .var04 = 1, + .var05 = 1, + .var06 = 255, .var07_0 = 8, .var07_5 = 2, .var07_7 = FALSE }, { .var00 = 0x8000, - .var02 = 0x007A, - .var04 = 0x01, - .var05 = 0x01, - .var06 = 0xFF, + .var02 = 122, + .var04 = 1, + .var05 = 1, + .var06 = 255, .var07_0 = 8, .var07_5 = 2, .var07_7 = FALSE }, { .var00 = 0x8000, - .var02 = 0x0085, - .var04 = 0x01, - .var05 = 0x01, - .var06 = 0xFF, + .var02 = 133, + .var04 = 1, + .var05 = 1, + .var06 = 255, .var07_0 = 8, .var07_5 = 2, .var07_7 = FALSE }, { .var00 = 0x8000, - .var02 = 0x0095, - .var04 = 0x01, - .var05 = 0x01, - .var06 = 0xFF, + .var02 = 149, + .var04 = 1, + .var05 = 1, + .var06 = 255, .var07_0 = 8, .var07_5 = 2, .var07_7 = FALSE }, { .var00 = 0x8000, - .var02 = 0x009A, - .var04 = 0x01, - .var05 = 0x01, - .var06 = 0xFF, + .var02 = 154, + .var04 = 1, + .var05 = 1, + .var06 = 255, .var07_0 = 8, .var07_5 = 2, .var07_7 = FALSE }, { .var00 = 0x8000, - .var02 = 0x00A5, - .var04 = 0x01, - .var05 = 0x01, - .var06 = 0xFF, + .var02 = 165, + .var04 = 1, + .var05 = 1, + .var06 = 255, .var07_0 = 8, .var07_5 = 2, .var07_7 = FALSE }, { - .var00 = 0x77D6, - .var02 = 0x0028, - .var04 = 0x02, - .var05 = 0x0A, - .var06 = 0xFF, + .var00 = 0x77d6, + .var02 = 40, + .var04 = 2, + .var05 = 10, + .var06 = 255, .var07_0 = 14, .var07_5 = 2, .var07_7 = FALSE @@ -289,28 +289,28 @@ const struct UnkStruct1 gUnknown_083F8E34[] = { const struct UnkStruct1 gUnknown_083F8E9C[] = { { .var00 = 0x53ff, - .var02 = 0x0101, - .var04 = 0x05, - .var05 = 0x1e, - .var06 = 0xff, + .var02 = 0x101, + .var04 = 5, + .var05 = 30, + .var06 = 255, .var07_0 = 14, .var07_5 = 2, .var07_7 = FALSE }, { .var00 = 0x7ffb, - .var02 = 0x0106, - .var04 = 0x05, - .var05 = 0x1e, - .var06 = 0xff, + .var02 = 0x106, + .var04 = 5, + .var05 = 30, + .var06 = 255, .var07_0 = 14, .var07_5 = 2, .var07_7 = FALSE }, { .var00 = 0x7f7f, - .var02 = 0x010b, - .var04 = 0x05, - .var05 = 0x1e, - .var06 = 0xff, + .var02 = 0x10b, + .var04 = 5, + .var05 = 30, + .var06 = 255, .var07_0 = 14, .var07_5 = 2, .var07_7 = FALSE @@ -374,24 +374,24 @@ void sub_8115124(void) REG_BLDALPHA = eRoulette->var34; if (eRoulette->var2A != 0) { - DmaCopy16(3, &gBGTilemapBuffers[1][0xE0], (void *)(VRAM + 0x21C0), 0x340); - eRoulette->var2A = 0x0; + DmaCopy16(3, &gBGTilemapBuffers[1][224], (void *)(VRAM + 0x21c0), 0x340); + eRoulette->var2A = 0; } switch (eRoulette->var28) { - case 0x1: - REG_BG0CNT = (0x20 * 0xF8); - DmaCopy16(3, &gBGTilemapBuffers[2][0xE0], (void *)(VRAM + 0xF9C0), 0x340); - eRoulette->var28 = 0x2; + case 1: + REG_BG0CNT = (32 * 248); + DmaCopy16(3, &gBGTilemapBuffers[2][224], (void *)(VRAM + 0xf9c0), 0x340); + eRoulette->var28 = 2; break; - case 0x2: - DmaCopy16(3, &gBGTilemapBuffers[2][0xE0], (void *)(VRAM + 0xF9C0), 0x340); + case 2: + DmaCopy16(3, &gBGTilemapBuffers[2][224], (void *)(VRAM + 0xf9c0), 0x340); break; - case 0xFF: - REG_BG0CNT = 0x1F08; - DmaFill16(3, 0x0, (void *)(VRAM + 0xF9C0), 0x340); - eRoulette->var28 = 0x0; - case 0x0: + case 255: + REG_BG0CNT = 0x1f08; + DmaFill16(3, 0, (void *)(VRAM + 0xf9c0), 0x340); + eRoulette->var28 = 0; + case 0: break; } } @@ -402,31 +402,31 @@ void sub_8115238(void) u32 temp; const struct StructgUnknown_083F8DF4 *s0; u16 arr[] = {RGB(24, 4, 10), RGB(10, 19, 6), RGB(24, 4, 10)}; - memset(eRoulette, 0x0, 0x17C); - eRoulette->var04_0 = (gSpecialVar_0x8004 & 0x1); - if (gSpecialVar_0x8004 & 0x80) - eRoulette->var04_7 = 0x1; + memset(eRoulette, 0, 0x17c); + eRoulette->var04_0 = (gSpecialVar_0x8004 & 1); + if (gSpecialVar_0x8004 & 128) + eRoulette->var04_7 = 1; s0 = &gUnknown_083F8DF4[0]; eRoulette->var22 = s0[eRoulette->var04_0].var03; eRoulette->var23 = s0[eRoulette->var04_0].var04; eRoulette->var19 = temp = gUnknown_083F8DF0[eRoulette->var04_0 + eRoulette->var04_7 * 2]; - eRoulette->var1A_4 = 0x1; - if (temp == 0x1) - gPlttBufferUnfaded[0] = gPlttBufferUnfaded[0x51] = gPlttBufferFaded[0] = gPlttBufferFaded[0x51] = arr[0]; + eRoulette->var1A_4 = 1; + if (temp == 1) + gPlttBufferUnfaded[0] = gPlttBufferUnfaded[81] = gPlttBufferFaded[0] = gPlttBufferFaded[81] = arr[0]; else - gPlttBufferUnfaded[0] = gPlttBufferUnfaded[0x51] = gPlttBufferFaded[0] = gPlttBufferFaded[0x51] = arr[1]; + gPlttBufferUnfaded[0] = gPlttBufferUnfaded[81] = gPlttBufferFaded[0] = gPlttBufferFaded[81] = arr[1]; sub_8124918((&eRoulette->varB8)); - for (i = 0; i < 0xD; i++) + for (i = 0; i < 13; i++) sub_812492C((&eRoulette->varB8), i, &gUnknown_083F8E34[i]); - for (i = 0; i < 0x6; i++) + for (i = 0; i < 6; i++) { switch (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2)) { case SPECIES_SHROOMISH: - eRoulette->var02 |= 0x1; + eRoulette->var02 |= 1; break; case SPECIES_TAILLOW: - eRoulette->var02 |= 0x2; + eRoulette->var02 |= 2; break; } } @@ -444,40 +444,40 @@ void sub_8115384(void) switch (gMain.state) { - case 0x0: + case 0: SetVBlankCallback(NULL); ScanlineEffect_Stop(); ClearVideoCallbacks(); sub_80F9368(); - REG_BG2CNT = 0x4686; - REG_BG1CNT = 0x4401; - REG_BLDCNT = 0x2400; - REG_BLDALPHA = 0x060A; + REG_BG2CNT = BGCNT_PRIORITY(2) | BGCNT_CHARBASE(1) | BGCNT_256COLOR | BGCNT_SCREENBASE(6) | BGCNT_TXT512x256; + REG_BG1CNT = BGCNT_PRIORITY(1) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(4) | BGCNT_TXT512x256; + REG_BLDCNT = BLDCNT_EFFECT_NONE | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BD; + REG_BLDALPHA = BLDALPHA_BLEND(10, 6); LZ77UnCompVram(&gUnknown_08E8096C, (void *)VRAM); LZ77UnCompVram(&gRouletteWheelTiles, (void *)(VRAM + 0x4000)); gMain.state++; break; - case 0x1: + case 1: ResetPaletteFade(); ResetSpriteData(); ResetTasks(); gMain.state++; break; - case 0x2: + case 2: Text_LoadWindowTemplate(&gWindowTemplate_81E6C3C); InitMenuWindow(&gMenuTextWindowTemplate); - LoadPalette(&gUnknown_083F86BC, 0x0, 0x1C0); + LoadPalette(&gUnknown_083F86BC, 0, 0x1c0); gMain.state++; break; - case 0x3: + case 3: sub_8115238(); ClearBGTilemapBuffers(); LZ77UnCompWram(&gUnknown_083F88BC, (void *)(ewram18800)); LZ77UnCompVram(&gUnknown_083F8A60, (void *)(VRAM + 0x3000)); gMain.state++; break; - case 0x4: - sub_8117838(0x0); + case 4: + sub_8117838(0); sub_811857C(); sub_81184D8(); sub_8117F2C(); @@ -486,35 +486,35 @@ void sub_8115384(void) sub_8117DF4(); gMain.state++; break; - case 0x5: + case 5: AnimateSprites(); BuildOamBuffer(); sub_81180F4(gSaveBlock1.coins); - sub_81182F8(0x6); - sub_811829C(0x0); - sub_8117158(0x0); - Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); - Menu_PrintText(&gUnknown_081C4157[0], 0x1, 0xF); - gSpriteCoordOffsetX = -0x3C; - gSpriteCoordOffsetY = 0x0; + sub_81182F8(6); + sub_811829C(0); + sub_8117158(0); + Menu_DrawStdWindowFrame(0, 14, 29, 19); + Menu_PrintText(&gUnknown_081C4157[0], 1, 15); + gSpriteCoordOffsetX = -60; + gSpriteCoordOffsetY = 0; gMain.state++; break; - case 0x6: - REG_DISPCNT = 0x1741; + case 6: + REG_DISPCNT = DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_BG2_ON | DISPCNT_OBJ_ON; gMain.state++; break; - case 0x7: + case 7: temp_IME = REG_IME; - REG_IME = 0x0; //disable interrupts - REG_IE |= 0x1; //enable VBlank interrupt + REG_IME = 0; //disable interrupts + REG_IE |= 1; //enable VBlank interrupt REG_IME = temp_IME; //reenable interrupts - REG_DISPSTAT |= 0x8; + REG_DISPSTAT |= 8; SetVBlankCallback(&sub_8115124); - BeginHardwarePaletteFade(0xFF, 0x0, 0x10, 0x0 , 0x1); - taskid = eRoulette->varA4 = CreateTask(&sub_81156BC, 0x0); - gTasks[taskid].data[0x6] = 0x6; - gTasks[taskid].data[0xD] = gSaveBlock1.coins; - eRoulette->varA5 = CreateTask(&sub_8115634, 0x1); + BeginHardwarePaletteFade(255, 0, 16, 0 , 1); + taskid = eRoulette->varA4 = CreateTask(&sub_81156BC, 0); + gTasks[taskid].data[6] = 6; + gTasks[taskid].data[13] = gSaveBlock1.coins; + eRoulette->varA5 = CreateTask(&sub_8115634, 1); SetMainCallback2(&sub_81150FC); break; } @@ -528,7 +528,7 @@ void sub_8115634(u8 unused) if (eRoulette->var21++ == eRoulette->var23) { - eRoulette->var21 = 0x0; + eRoulette->var21 = 0; if ((eRoulette->var24 -= eRoulette->var22) < 0) eRoulette->var24 = 0x168 - eRoulette->var22; } @@ -541,7 +541,7 @@ void sub_8115634(u8 unused) eRoulette->var2C.b = sin; eRoulette->var2C.c = -sin; #if DEBUG - if (unk_203955C[0] != 0 && (gMain.newKeys & 8)) + if (unk_203955C[0] != 0 && (gMain.newKeys & START_BUTTON)) { gTasks[eRoulette->varA4].func = sub_81157AC; m4aMPlayStop(&gMPlay_SE1); @@ -555,30 +555,30 @@ void sub_81156BC(u8 taskid) { if (UpdatePaletteFade() == 0) { - REG_BLDCNT |= 0x2400; - REG_BLDALPHA = 0x0808; - gTasks[taskid].data[0x6] = 0; + REG_BLDCNT |= BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BD; + REG_BLDALPHA = BLDALPHA_BLEND(8, 8); + gTasks[taskid].data[6] = 0; sub_8116CAC(taskid); sub_8116CF8(); sub_81185E8(); sub_8117158(0); - sub_81182F8(0x6); - sub_8116C34(taskid, &sub_81159BC, 0xFFFF, 0x3); + sub_81182F8(6); + sub_8116C34(taskid, &sub_81159BC, 0xffff, 3); } } void sub_8115734(u8 taskid) { - DisplayYesNoMenu(0x14, 0x8, 0x1); - sub_814AAF8(0x2D9E); - Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); - Menu_PrintText(&gUnknown_081C41E3, 0x1, 0xF); + DisplayYesNoMenu(20, 8, 1); + sub_814AAF8(RGB(30, 12, 11)); + Menu_DrawStdWindowFrame(0, 14, 29, 19); + Menu_PrintText(&gUnknown_081C41E3, 1, 15); DoYesNoFuncWithChoice(taskid, &gUnknown_083F8EBC); } void sub_811577C(u8 taskid) { - Menu_EraseWindowRect(0x14, 0x8, 0x1A, 0xD); + Menu_EraseWindowRect(20, 8, 26, 13); gTasks[taskid].func = &sub_81159BC; } @@ -593,29 +593,29 @@ void sub_81157D0(u8 r0) u8 temp0, temp1; switch (r0) { - case 0x0: - sub_8124DDC(&gBGTilemapBuffers[2][0], 0x0, 0xE, 0x7, 0x10, 0xD); + case 0: + sub_8124DDC(&gBGTilemapBuffers[2][0], 0, 14, 7, 16, 13); break; - case 0x1: - case 0x2: - case 0x3: - case 0x4: - temp0 = (r0 * 3 + 0xE); - sub_8124DDC(&gBGTilemapBuffers[2][0], 0x0, 0xE, 0x7, 0x10, 0xD); - sub_8124E2C(&gBGTilemapBuffers[2][0], ewram18a32, temp0, 0x7, 0x3, 0xD); + case 1: + case 2: + case 3: + case 4: + temp0 = (r0 * 3 + 14); + sub_8124DDC(&gBGTilemapBuffers[2][0], 0, 14, 7, 16, 13); + sub_8124E2C(&gBGTilemapBuffers[2][0], ewram18a32, temp0, 7, 3, 13); break; - case 0x5: - case 0xA: - case 0xF: - temp1 = ((r0 - 1) / 5 * 3 + 0xA); - sub_8124DDC(&gBGTilemapBuffers[2][0], 0x0, 0xE, 0x7, 0x10, 0xD); - sub_8124E2C(&gBGTilemapBuffers[2][0], ewram18a80, 0xE, temp1, 0x10, 0x3); + case 5: + case 10: + case 15: + temp1 = ((r0 - 1) / 5 * 3 + 10); + sub_8124DDC(&gBGTilemapBuffers[2][0], 0, 14, 7, 16, 13); + sub_8124E2C(&gBGTilemapBuffers[2][0], ewram18a80, 14, temp1, 16, 3); break; default: - temp0 = ((r0 % 5) * 3 + 0xE); - temp1 = ((r0 - 1) / 5 * 3 + 0x7); - sub_8124DDC(&gBGTilemapBuffers[2][0], 0x0, 0xE, 0x7, 0x10, 0xD); - sub_8124E2C(&gBGTilemapBuffers[2][0], ewram18a20, temp0, temp1, 0x3, 0x3); + temp0 = ((r0 % 5) * 3 + 14); + temp1 = ((r0 - 1) / 5 * 3 + 7); + sub_8124DDC(&gBGTilemapBuffers[2][0], 0, 14, 7, 16, 13); + sub_8124E2C(&gBGTilemapBuffers[2][0], ewram18a20, temp0, temp1, 3, 3); break; } } @@ -623,18 +623,18 @@ void sub_81157D0(u8 r0) void sub_8115928(u8 taskid, u8 r1) { if (!r1) - sub_811829C(gTasks[taskid].data[0x4]); + sub_811829C(gTasks[taskid].data[4]); else sub_811829C(eRoulette->var1B[eRoulette->var1A_0]); - sub_81157D0(gTasks[taskid].data[0x4]); + sub_81157D0(gTasks[taskid].data[4]); } void sub_811597C(u8 taskid) { - eRoulette->var28 = 0x1; - sub_81157D0(gTasks[taskid].data[0x4]); - eRoulette->var23 = 0x2; - eRoulette->var21 = 0x0; + eRoulette->var28 = 1; + sub_81157D0(gTasks[taskid].data[4]); + eRoulette->var23 = 2; + eRoulette->var21 = 0; gTasks[taskid].func = &sub_8115E14; } @@ -642,24 +642,24 @@ void sub_81159BC(u8 taskid) { s16 i; - if (eRoulette->var08 & 0x20) + if (eRoulette->var08 & 32) { - for (i = 0xB; (i < 0xE); i++) + for (i = 11; (i < 14); i++) if ((eRoulette->var08 & gUnknown_083F8C00[i].var08) == 0) break; } else { - for (i = 0x6; (i < 0xA); i++) + for (i = 6; (i < 10); i++) if ((eRoulette->var08 & gUnknown_083F8C00[i].var08) == 0) break; } - gTasks[taskid].data[0x4] = i; + gTasks[taskid].data[4] = i; sub_8116CAC(taskid); - sub_8117158(gTasks[taskid].data[0x4]); - sub_811829C(gTasks[taskid].data[0x4]); - sub_8116EF8(gTasks[taskid].data[0x4]); - gTasks[taskid].data[0x1] = 0x0; + sub_8117158(gTasks[taskid].data[4]); + sub_811829C(gTasks[taskid].data[4]); + sub_8116EF8(gTasks[taskid].data[4]); + gTasks[taskid].data[1] = 0; gTasks[taskid].func = &sub_811597C; } @@ -672,19 +672,19 @@ u8 sub_8115A94(s16 *r0, u8 r1) t = (u8)*r0; switch (r1) { - case 0x0: - case 0x1: + case 0: + case 1: temp1 = (*r0 % 5); - temp = temp1 + 0xF; + temp = temp1 + 15; if (temp1 == 0) - temp1 = 0x5; + temp1 = 5; break; - case 0x2: - case 0x3: + case 2: + case 3: temp1 = (s16)(*r0 / 5) * 5; - temp = temp1 + 0x4; + temp = temp1 + 4; if (temp1 == 0) - temp1 = 0x1; + temp1 = 1; break; } *r0 += arr[r1]; @@ -699,85 +699,105 @@ u8 sub_8115A94(s16 *r0, u8 r1) void sub_8115B58(u8 r0) { - u8 z = 0x0; + u8 z = 0; bool8 var0 = FALSE; - if (!(gMain.newKeys & DPAD_UP) || ((var0 = TRUE), sub_8115A94(&gTasks[r0].data[0x4], 0x0))) - if (!(gMain.newKeys & DPAD_DOWN) || ((var0 = TRUE), sub_8115A94(&gTasks[r0].data[0x4], 0x1))) - if (!(gMain.newKeys & DPAD_LEFT) || ((var0 = TRUE), sub_8115A94(&gTasks[r0].data[0x4], 0x2))) - if (!(gMain.newKeys & DPAD_RIGHT) || ((var0 = TRUE), sub_8115A94(&gTasks[r0].data[0x4], 0x3))) - if (var0) - { - u8 i; - sub_8117158(gTasks[r0].data[0x4]); - sub_8115928(r0, FALSE); - gTasks[r0].data[0x1] = z; - PlaySE(SE_SELECT); - sub_8124D3C((&eRoulette->varB8), 0xFFFF); - eRoulette->varB8.var04[0xF].var00_7 = 0x0; - eRoulette->varB8.var04[0xE].var00_7 = 0x0; - eRoulette->varB8.var04[0xD].var00_7 = 0x0; - sub_8116EF8(gTasks[r0].data[0x4]); - for (i = 0; i < 0x4; i++) - { - gSprites[eRoulette->var3C[i + 0x29]].oam.tileNum = - gSprites[eRoulette->var3C[i + 0x29]].sheetTileStart - + (*gSprites[eRoulette->var3C[i + 0x29]].anims)->type; - } - if ((u16)(gTasks[r0].data[0x4] - 1) < 0x4 && !(eRoulette->var08 & gUnknown_083F8C00[gTasks[r0].data[0x4]].var08) ) - { - z = gTasks[r0].data[0x4] - 1; - gSprites[eRoulette->var3C[z + 0x29]].oam.tileNum = - gSprites[eRoulette->var3C[z + 0x29]].sheetTileStart - + (*gSprites[eRoulette->var3C[z + 0x29]].anims + 1)->type; - } - } + if (gMain.newKeys & DPAD_UP) + { + var0 = TRUE; + if (!sub_8115A94(&gTasks[r0].data[4], 0)) + return; + } + if (gMain.newKeys & DPAD_DOWN) + { + var0 = TRUE; + if (!sub_8115A94(&gTasks[r0].data[4], 1)) + return; + } + if (gMain.newKeys & DPAD_LEFT) + { + var0 = TRUE; + if (!sub_8115A94(&gTasks[r0].data[4], 2)) + return; + } + if (gMain.newKeys & DPAD_RIGHT) + { + var0 = TRUE; + if (!sub_8115A94(&gTasks[r0].data[4], 3)) + return; + } + if (var0) + { + u8 i; + sub_8117158(gTasks[r0].data[4]); + sub_8115928(r0, FALSE); + gTasks[r0].data[1] = z; + PlaySE(SE_SELECT); + sub_8124D3C((&eRoulette->varB8), 0xffff); + eRoulette->varB8.var04[15].var00_7 = 0; + eRoulette->varB8.var04[14].var00_7 = 0; + eRoulette->varB8.var04[13].var00_7 = 0; + sub_8116EF8(gTasks[r0].data[4]); + for (i = 0; i < 4; i++) + { + gSprites[eRoulette->var3C[i + 41]].oam.tileNum = + gSprites[eRoulette->var3C[i + 41]].sheetTileStart + + (*gSprites[eRoulette->var3C[i + 41]].anims)->type; + } + if ((u16)(gTasks[r0].data[4] - 1) < 4 && !(eRoulette->var08 & gUnknown_083F8C00[gTasks[r0].data[4]].var08) ) + { + z = gTasks[r0].data[4] - 1; + gSprites[eRoulette->var3C[z + 41]].oam.tileNum = + gSprites[eRoulette->var3C[z + 41]].sheetTileStart + + (*gSprites[eRoulette->var3C[z + 41]].anims + 1)->type; + } + } } void sub_8115D58(u8 r0) { - eRoulette->var28 = 0xFF; + eRoulette->var28 = 255; if (eRoulette->var19 == 1) eRoulette->var23 = 1; else eRoulette->var23 = 0; eRoulette->var21 = 0; - gTasks[r0].data[0x1] = 0x20; + gTasks[r0].data[1] = 32; gTasks[r0].func = &sub_8115ECC; } void sub_8115DA0(u8 taskid) { - eRoulette->var1B[eRoulette->var1A_0] = gTasks[taskid].data[0x4]; - gTasks[taskid].data[0x2] = sub_8117380(eRoulette->var1B[eRoulette->var1A_0]); + eRoulette->var1B[eRoulette->var1A_0] = gTasks[taskid].data[4]; + gTasks[taskid].data[2] = sub_8117380(eRoulette->var1B[eRoulette->var1A_0]); sub_811829C(eRoulette->var1B[eRoulette->var1A_0]); - if ((gTasks[taskid].data[0xD] -= eRoulette->var19) < 0) - gTasks[taskid].data[0xD] = 0; - sub_81180F4(gTasks[taskid].data[0xD]); + if ((gTasks[taskid].data[13] -= eRoulette->var19) < 0) + gTasks[taskid].data[13] = 0; + sub_81180F4(gTasks[taskid].data[13]); gTasks[taskid].func = &sub_8115D58; } void sub_8115E14(u8 taskid) { sub_8115B58(taskid); - switch (gTasks[taskid].data[0x1]) + switch (gTasks[taskid].data[1]) { - case 0x0: - sub_81157D0(gTasks[taskid].data[0x4]); - gTasks[taskid].data[0x1]+= 1; + case 0: + sub_81157D0(gTasks[taskid].data[4]); + gTasks[taskid].data[1]+= 1; break; - case 0x1E: + case 30: sub_81157D0(0); - gTasks[taskid].data[0x1]+= 1; + gTasks[taskid].data[1]+= 1; break; - case 0x3B: - gTasks[taskid].data[0x1] = 0; + case 59: + gTasks[taskid].data[1] = 0; break; default: - gTasks[taskid].data[0x1]++; + gTasks[taskid].data[1]++; } if (gMain.newKeys & A_BUTTON) { - if ((eRoulette->var08 & gUnknown_083F8C00[gTasks[taskid].data[0x4]].var08)) + if ((eRoulette->var08 & gUnknown_083F8C00[gTasks[taskid].data[4]].var08)) PlaySE(SE_BOO); else { @@ -789,19 +809,19 @@ void sub_8115E14(u8 taskid) void sub_8115ECC(u8 taskid) { - if (gTasks[taskid].data[0x1]-- > 0) + if (gTasks[taskid].data[1]-- > 0) { - if (gTasks[taskid].data[0x1] > 0x2) - gSpriteCoordOffsetX += 0x2; - if ((eRoulette->var26 += 0x4) == 0x68) - gSprites[eRoulette->var3C[0x19]].callback = &SpriteCallbackDummy; + if (gTasks[taskid].data[1] > 2) + gSpriteCoordOffsetX += 2; + if ((eRoulette->var26 += 4) == 104) + gSprites[eRoulette->var3C[25]].callback = &SpriteCallbackDummy; } else { - sub_8117AA8(0x1, 0xFF); - sub_8117C60(0x1, 0xFF); + sub_8117AA8(1, 255); + sub_8117C60(1, 255); gTasks[taskid].func = &sub_8116100; - gTasks[taskid].data[0x1] = 0; + gTasks[taskid].data[1] = 0; } } @@ -810,21 +830,21 @@ u8 sub_8115F58(u16 r0, u16 r1) u8 timeh; switch (eRoulette->var02) { - case 0x1: // SHROOMISH - case 0x2: // TAILLOW + case 1: // SHROOMISH + case 2: // TAILLOW // one of the two is in party - timeh = gLocalTime.hours - 0x4; - if (!(timeh > 0x5)) + timeh = gLocalTime.hours - 4; + if (!(timeh > 5)) { - if (!(r0 < 0xC || (r1 & 0x1))) - return 0x1; + if (!(r0 < 12 || (r1 & 1))) + return 1; else { const struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; return p[eRoulette->var04_0].var02 / 2; } } - else if (!(r1 & 0x3)) + else if (!(r1 & 3)) { const struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; return p[eRoulette->var04_0].var02 / 2; @@ -835,22 +855,22 @@ u8 sub_8115F58(u16 r0, u16 r1) return p[eRoulette->var04_0].var02; } break; - case 0x3: + case 3: // both are in party - timeh = gLocalTime.hours - 0x4; - if (!(timeh > 0x6)) + timeh = gLocalTime.hours - 4; + if (!(timeh > 6)) { - if (r0 < 0x6 || (r1 & 0x1)) + if (r0 < 6 || (r1 & 1)) { const struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; return p[eRoulette->var04_0].var02 / 2; } else { - return 0x1; + return 1; } } - else if ((r1 & 0x1) && !(r0 < 0x7)) + else if ((r1 & 1) && !(r0 < 7)) { const struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; return p[eRoulette->var04_0].var02 / 4; @@ -864,12 +884,12 @@ u8 sub_8115F58(u16 r0, u16 r1) case 0: default: // neither is in party - timeh = gLocalTime.hours - 0x4; + timeh = gLocalTime.hours - 4; if (!(timeh > 5)) { - if (!(r1 & 0x3)) + if (!(r1 & 3)) { - return 0x1; + return 1; } else { @@ -877,9 +897,9 @@ u8 sub_8115F58(u16 r0, u16 r1) return p[eRoulette->var04_0].var02 / 2; } } - else if (!(r1 & 0x3)) + else if (!(r1 & 3)) { - if (!(r0 < 0xD)) + if (!(r0 < 13)) { const struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; return p[eRoulette->var04_0].var02 / 2; @@ -890,9 +910,9 @@ u8 sub_8115F58(u16 r0, u16 r1) return p[eRoulette->var04_0].var02; } } - else if (r1 & (0x80 << 8)) + else if (r1 & (128 << 8)) { - if (!(r0 < 0xD)) + if (!(r0 < 13)) { const struct StructgUnknown_083F8DF4 *p = &gUnknown_083F8DF4[0]; return p[eRoulette->var04_0].var02; @@ -921,18 +941,18 @@ void sub_8116100(u8 taskid) u16 randmod; u16 angles[] = {0, 180, 90, 270}; rand = Random(); - randmod = rand % 0x64; - eRoulette->var7C = gTasks[taskid].data[0x6]; + randmod = rand % 100; + eRoulette->var7C = gTasks[taskid].data[6]; eRoulette->var7F = g; eRoulette->var7E = g; eRoulette->var7D = g; - randf = sub_8115F58(gTasks[taskid].data[0x8], rand); + randf = sub_8115F58(gTasks[taskid].data[8], rand); randfinal = (rand % randf) - (randf / 2); - if (gLocalTime.hours < 0xD) - r5 = 0x0; + if (gLocalTime.hours < 13) + r5 = 0; else - r5 = 0x1; - if (randmod < 0x50) + r5 = 1; + if (randmod < 80) r5 *= 2; else r5 = (1 - r5) * 2; @@ -943,7 +963,7 @@ void sub_8116100(u8 taskid) eRoulette->var84 = g; eRoulette->var86 = g; // - eRoulette->var88 = S16TOPOSFLOAT(angles[(rand & 0x1) + r5]); + eRoulette->var88 = S16TOPOSFLOAT(angles[(rand & 1) + r5]); eRoulette->var8C = S16TOPOSFLOAT(gUnknown_083F8DF4[eRoulette->var04_0].var18); eRoulette->var90 = ((eRoulette->var8C * 0.5f) - eRoulette->var8C) / S16TOPOSFLOAT(g * 3); eRoulette->var94 = 68.0f; @@ -960,9 +980,9 @@ void sub_8116308(u8 taskid) index = eRoulette->var3C[eRoulette->var7C]; eRoulette->var38 = &gSprites[index]; eRoulette->var38->callback = sub_81191F4; - gTasks[taskid].data[0x6]++; - gTasks[taskid].data[0x8]++; - sub_81182F8(0x6 - gTasks[taskid].data[0x6]); + gTasks[taskid].data[6]++; + gTasks[taskid].data[8]++; + sub_81182F8(6 - gTasks[taskid].data[6]); m4aSongNumStart(SE_TAMAKORO); gTasks[taskid].func = &sub_811637C; } @@ -981,25 +1001,25 @@ void sub_811637C(u8 taskid) } else { - if (!gTasks[taskid].data[0x1]) + if (!gTasks[taskid].data[1]) { u8 temp = sub_8116E5C(sub_8116D54(taskid, eRoulette->var7E), eRoulette->var1B[eRoulette->var1A_0]); - gTasks[taskid].data[0x5] = temp; + gTasks[taskid].data[5] = temp; if (temp == 1) sub_8124CE8((&eRoulette->varB8), 0x1000); } - if (gTasks[taskid].data[0x1] < 0x3D) + if (gTasks[taskid].data[1] < 61) { if (gMain.newKeys & A_BUTTON) - gTasks[taskid].data[0x1] = 0x3C; - gTasks[taskid].data[0x1]++; + gTasks[taskid].data[1] = 60; + gTasks[taskid].data[1]++; } else { sub_8117158(eRoulette->var1B[eRoulette->var1A_0]); - sub_8117AA8(0x0, (u8)gTasks[taskid].data[0xC]); - sub_8117C60(0x0, (u8)gTasks[taskid].data[0x6] - 0x1); - gTasks[taskid].data[0x1] = 0x20; + sub_8117AA8(0, (u8)gTasks[taskid].data[12]); + sub_8117C60(0, (u8)gTasks[taskid].data[6] - 1); + gTasks[taskid].data[1] = 32; gTasks[taskid].func = &sub_8116474; } } @@ -1008,176 +1028,176 @@ void sub_811637C(u8 taskid) void sub_8116474(u8 taskid) { - if (gTasks[taskid].data[0x1]-- > 0x0) + if (gTasks[taskid].data[1]-- > 0) { - if (gTasks[taskid].data[0x1] > 0x2) - gSpriteCoordOffsetX -= 0x2; - if ((eRoulette->var26 -= 0x4) == 0x68) - gSprites[eRoulette->var3C[0x19]].callback = &sub_81184CC; + if (gTasks[taskid].data[1] > 2) + gSpriteCoordOffsetX -= 2; + if ((eRoulette->var26 -= 4) == 104) + gSprites[eRoulette->var3C[25]].callback = &sub_81184CC; } else { - sub_8117D68(gTasks[taskid].data[0xC]); - if (gTasks[taskid].data[0x5] == 1) - gTasks[taskid].data[0x1] = 0x79; + sub_8117D68(gTasks[taskid].data[12]); + if (gTasks[taskid].data[5] == 1) + gTasks[taskid].data[1] = 121; else - gTasks[taskid].data[0x1] = 0x3D; + gTasks[taskid].data[1] = 61; gTasks[taskid].func = &sub_8116514; } } void sub_8116514(u8 taskid) { - if (gTasks[taskid].data[0x1]-- > 0x1) + if (gTasks[taskid].data[1]-- > 1) { - switch (gTasks[taskid].data[0x1] % 0x10) + switch (gTasks[taskid].data[1] % 16) { - case 0x8: - sub_8117AA8(0x0, 0xFF); - sub_8117C60(0x0, 0xFF); + case 8: + sub_8117AA8(0, 255); + sub_8117C60(0, 255); break; - case 0x0: - sub_8117AA8(0x0, (u8)gTasks[taskid].data[0xC]); - sub_8117C60(0x0, (u8)gTasks[taskid].data[0x6] - 0x1); + case 0: + sub_8117AA8(0, (u8)gTasks[taskid].data[12]); + sub_8117C60(0, (u8)gTasks[taskid].data[6] - 1); break; } } else { - sub_8116C34(taskid, &sub_8116638, 0x1E, 0x0); + sub_8116C34(taskid, &sub_8116638, 30, 0); } } void sub_811659C(u8 taskid) { - switch (gTasks[taskid].data[0x5]) + switch (gTasks[taskid].data[5]) { - case 0x1: - case 0x2: + case 1: + case 2: if (IsFanfareTaskInactive()) { u32 wins = GetGameStat(GAME_STAT_CONSECUTIVE_ROULETTE_WINS); - if (wins < ++gTasks[taskid].data[0xB]) - SetGameStat(GAME_STAT_CONSECUTIVE_ROULETTE_WINS, gTasks[taskid].data[0xB]); - sub_8116C34(taskid, &sub_811677C, 0xFFFF, 0x3); + if (wins < ++gTasks[taskid].data[11]) + SetGameStat(GAME_STAT_CONSECUTIVE_ROULETTE_WINS, gTasks[taskid].data[11]); + sub_8116C34(taskid, &sub_811677C, 0xffff, 3); } break; case 0: default: if (!IsSEPlaying()) { - gTasks[taskid].data[0xB] = FALSE; - sub_8116C34(taskid, &sub_81167F4, 0xFFFF, 0x3); + gTasks[taskid].data[11] = FALSE; + sub_8116C34(taskid, &sub_81167F4, 0xffff, 3); } } } void sub_8116638(u8 taskid) { - switch (gTasks[taskid].data[0x5]) + switch (gTasks[taskid].data[5]) { - case 0x1: - case 0x2: - if (gTasks[taskid].data[0x2] == 0xC) + case 1: + case 2: + if (gTasks[taskid].data[2] == 12) { PlayFanfare(MUS_ME_B_BIG); - Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); - Menu_PrintText(&gUnknown_081C41A5, 0x1, 0xF); + Menu_DrawStdWindowFrame(0, 14, 29, 19); + Menu_PrintText(&gUnknown_081C41A5, 1, 15); } else { PlayFanfare(MUS_ME_B_SMALL); - Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); - Menu_PrintText(&gUnknown_081C4199, 0x1, 0xF); + Menu_DrawStdWindowFrame(0, 14, 29, 19); + Menu_PrintText(&gUnknown_081C4199, 1, 15); } break; case 0: default: m4aSongNumStart(SE_HAZURE); - Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); - Menu_PrintText(&gUnknown_081C41AE, 0x1, 0xF); + Menu_DrawStdWindowFrame(0, 14, 29, 19); + Menu_PrintText(&gUnknown_081C41AE, 1, 15); } - gTasks[taskid].data[0x1] = 0x0; + gTasks[taskid].data[1] = 0; gTasks[taskid].func = &sub_811659C; } void sub_81166E8(u8 taskid) { - s32 r0 = gTasks[taskid].data[0x7]; + s32 r0 = gTasks[taskid].data[7]; switch (r0) { - case 0x0: - gTasks[taskid].data[0xD]++; + case 0: + gTasks[taskid].data[13]++; m4aSongNumStart(SE_PIN); - sub_81180F4(gTasks[taskid].data[0xD]); - if (gTasks[taskid].data[0xD] > 0x270E) + sub_81180F4(gTasks[taskid].data[13]); + if (gTasks[taskid].data[13] > 0x270e) { - gTasks[taskid].data[0x1] = r0; + gTasks[taskid].data[1] = r0; } else { - gTasks[taskid].data[0x1]--; - gTasks[taskid].data[0x7]++; + gTasks[taskid].data[1]--; + gTasks[taskid].data[7]++; } break; - case 0x3: + case 3: m4aSongNumStop(SE_PIN); - gTasks[taskid].data[0x7] = 0x0; + gTasks[taskid].data[7] = 0; break; default: - gTasks[taskid].data[0x7]++; + gTasks[taskid].data[7]++; } - if (gTasks[taskid].data[0x1] == 0x0) - sub_8116C34(taskid, &sub_81167F4, 0xFFFF, 0x3); + if (gTasks[taskid].data[1] == 0) + sub_8116C34(taskid, &sub_81167F4, 0xffff, 3); } void sub_811677C(u8 taskid) { - ConvertIntToDecimalStringN((u8 *)&gStringVar1, (eRoulette->var19 * gTasks[taskid].data[0x2]), STR_CONV_MODE_LEFT_ALIGN, 0x2); + ConvertIntToDecimalStringN((u8 *)&gStringVar1, (eRoulette->var19 * gTasks[taskid].data[2]), STR_CONV_MODE_LEFT_ALIGN, 2); StringExpandPlaceholders((u8 *)&gStringVar4, &gUnknown_081C41BD); - Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); - Menu_PrintText((u8 *)&gStringVar4, 0x1, 0xF); - gTasks[taskid].data[0x1] = (eRoulette->var19 * gTasks[taskid].data[0x2]); - gTasks[taskid].data[0x7] = 0x0; + Menu_DrawStdWindowFrame(0, 14, 29, 19); + Menu_PrintText((u8 *)&gStringVar4, 1, 15); + gTasks[taskid].data[1] = (eRoulette->var19 * gTasks[taskid].data[2]); + gTasks[taskid].data[7] = 0; gTasks[taskid].func = &sub_81166E8; } void sub_81167F4(u8 taskid) { - sub_8124D3C((&eRoulette->varB8), 0xFFFF); - eRoulette->varB8.var04[0xF].var00_7 = 0x0; - eRoulette->varB8.var04[0xE].var00_7 = 0x0; - eRoulette->varB8.var04[0xD].var00_7 = 0x0; - gSprites[eRoulette->var3C[0x7 + gUnknown_083F8C00[gTasks[taskid].data[0xC]].var00]].invisible = TRUE; + sub_8124D3C((&eRoulette->varB8), 0xffff); + eRoulette->varB8.var04[15].var00_7 = 0; + eRoulette->varB8.var04[14].var00_7 = 0; + eRoulette->varB8.var04[13].var00_7 = 0; + gSprites[eRoulette->var3C[7 + gUnknown_083F8C00[gTasks[taskid].data[12]].var00]].invisible = TRUE; gTasks[taskid].func = &sub_8116880; } void sub_8116880(u8 taskid) { u8 i = 0; - gTasks[taskid].data[0x4] = i; - eRoulette->var1B[eRoulette->var1A_0] = 0x0; - sub_8117158(0x0); - gSprites[eRoulette->var3C[0x30]].invisible = TRUE; - for (i = 0; i < 0x4; i++) + gTasks[taskid].data[4] = i; + eRoulette->var1B[eRoulette->var1A_0] = 0; + sub_8117158(0); + gSprites[eRoulette->var3C[48]].invisible = TRUE; + for (i = 0; i < 4; i++) { - gSprites[eRoulette->var3C[i + 0x29]].oam.tileNum = - gSprites[eRoulette->var3C[i + 0x29]].sheetTileStart - + (*gSprites[eRoulette->var3C[i + 0x29]].anims)->type; + gSprites[eRoulette->var3C[i + 41]].oam.tileNum = + gSprites[eRoulette->var3C[i + 41]].sheetTileStart + + (*gSprites[eRoulette->var3C[i + 41]].anims)->type; } - if (!(gTasks[taskid].data[0xD] < eRoulette->var19)) + if (!(gTasks[taskid].data[13] < eRoulette->var19)) { - if (gTasks[taskid].data[0x6] == 0x6) + if (gTasks[taskid].data[6] == 6) { - Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); - Menu_PrintText(&gUnknown_081C41F1, 0x1, 0xF); - sub_8116C34(taskid, &dp01t_12_3_battle_menu, 0xFFFF, 0x3); + Menu_DrawStdWindowFrame(0, 14, 29, 19); + Menu_PrintText(&gUnknown_081C41F1, 1, 15); + sub_8116C34(taskid, &dp01t_12_3_battle_menu, 0xffff, 3); } - else if (gTasks[taskid].data[0xD] == 0x270F) + else if (gTasks[taskid].data[13] == 0x270f) { - Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); - Menu_PrintText(&gUnknown_081C4231, 0x1, 0xF); - sub_8116C34(taskid, &sub_8115734, 0xFFFF, 0x3); + Menu_DrawStdWindowFrame(0, 14, 29, 19); + Menu_PrintText(&gUnknown_081C4231, 1, 15); + sub_8116C34(taskid, &sub_8115734, 0xffff, 3); } else { @@ -1186,28 +1206,28 @@ void sub_8116880(u8 taskid) } else { - Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); - Menu_PrintText(&gUnknown_081C41D2, 0x1, 0xF); - sub_8116C34(taskid, &sub_81157AC, 0x3C, 0x3); + Menu_DrawStdWindowFrame(0, 14, 29, 19); + Menu_PrintText(&gUnknown_081C41D2, 1, 15); + sub_8116C34(taskid, &sub_81157AC, 60, 3); } } void dp01t_12_3_battle_menu(u8 taskid) { - u8 i = 0x0; - gTasks[taskid].data[0x6] = 0x0; + u8 i = 0; + gTasks[taskid].data[6] = 0; sub_8116CAC(taskid); sub_8116CF8(); sub_81185E8(); - sub_8117158(0x0); - sub_81182F8(0x6); - for (i = 0; i < 0xC; i++) - gSprites[eRoulette->var3C[i + 0x7]].invisible = FALSE; - if (gTasks[taskid].data[0xD] == 0x270F) + sub_8117158(0); + sub_81182F8(6); + for (i = 0; i < 12; i++) + gSprites[eRoulette->var3C[i + 7]].invisible = FALSE; + if (gTasks[taskid].data[13] == 0x270f) { - Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); - Menu_PrintText(&gUnknown_081C4231, 0x1, 0xF); - sub_8116C34(taskid, &sub_8115734, 0xFFFF, 0x3); + Menu_DrawStdWindowFrame(0, 14, 29, 19); + Menu_PrintText(&gUnknown_081C4231, 1, 15); + sub_8116C34(taskid, &sub_8115734, 0xffff, 3); } else { @@ -1217,14 +1237,14 @@ void dp01t_12_3_battle_menu(u8 taskid) void sub_8116AB0(u8 taskid) { - sub_8124D3C((&eRoulette->varB8), 0xFFFF); + sub_8124D3C((&eRoulette->varB8), 0xffff); sub_8124918((&eRoulette->varB8)); - gSaveBlock1.coins = gTasks[taskid].data[0xD]; + gSaveBlock1.coins = gTasks[taskid].data[13]; if (gSaveBlock1.coins < eRoulette->var19) gSpecialVar_0x8004 = TRUE; else gSpecialVar_0x8004 = FALSE; - BeginHardwarePaletteFade(0xFF, 0x0, 0x0, 0x10, 0x0); + BeginHardwarePaletteFade(255, 0, 0, 16, 0); gTasks[taskid].func = &sub_8116B40; } @@ -1233,16 +1253,16 @@ void sub_8116B40(u8 taskId) // end roulette ? if (UpdatePaletteFade() == 0) { SetVBlankCallback(NULL); - memset(eRoulette, 0x0, 0x17C); - gSpriteCoordOffsetX = gSpriteCoordOffsetY = 0x0; + memset(eRoulette, 0, 0x17c); + gSpriteCoordOffsetX = gSpriteCoordOffsetY = 0; sub_80F9368(); FreeAllSpritePalettes(); ResetPaletteFade(); ResetSpriteData(); ClearBGTilemapBuffers(); - REG_BLDCNT = 0x0; - REG_BLDALPHA = 0x0; - REG_BLDY = 0x0; + REG_BLDCNT = 0; + REG_BLDALPHA = 0; + REG_BLDY = 0; gFieldCallback = &sub_8080990; SetMainCallback2(&CB2_ReturnToField); DestroyTask(taskId); @@ -1260,10 +1280,10 @@ void sub_8116BC0(u8 taskid) if (eRoulette->varAA > 0) PlaySE(SE_SELECT); eRoulette->varAC = NULL; - eRoulette->varAA = 0x0; - eRoulette->varA8 = 0x0; + eRoulette->varAA = 0; + eRoulette->varA8 = 0; } - if (eRoulette->varA8 != 0xFFFF) + if (eRoulette->varA8 != 0xffff) eRoulette->varA8--; } @@ -1274,8 +1294,8 @@ void sub_8116C34(u8 taskid, TaskFunc r1, u16 r2, u16 r3) r1 = eRoulette->varB4; eRoulette->varAC = r1; eRoulette->varA8 = r2; - if (r2 == 0xFFFF && r3 == 0) - eRoulette->varAA = 0xFFFF; + if (r2 == 0xffff && r3 == 0) + eRoulette->varAA = 0xffff; else eRoulette->varAA = r3; gTasks[taskid].func = &sub_8116BC0; @@ -1285,56 +1305,56 @@ void sub_8116CAC(u8 taskid) { u8 i = 0; eRoulette->var00 = i; - eRoulette->var03_0 = 0x0; - eRoulette->var03_5 = 0x0; - eRoulette->var03_6 = 0x0; - eRoulette->var03_7 = 0x0; - for (i = 0; i < 0x6; i++) - eRoulette->var1B[i] = 0x0; - eRoulette->var1A_0 = 0x0; - gTasks[taskid].data[0x1] = 0x0; + eRoulette->var03_0 = 0; + eRoulette->var03_5 = 0; + eRoulette->var03_6 = 0; + eRoulette->var03_7 = 0; + for (i = 0; i < 6; i++) + eRoulette->var1B[i] = 0; + eRoulette->var1A_0 = 0; + gTasks[taskid].data[1] = 0; } void sub_8116CF8(void) { u8 i; - eRoulette->var08 = 0x0; - for (i = 0; i < 0x6; i++) - eRoulette->var0C[i] = 0x0; - for (i = 0; i < 0x4; i++) - eRoulette->var12[i] = 0x0; - for (i = 0; i < 0x3; i++) - eRoulette->var16[i] = 0x0; - sub_8117C60(0x1, 0xFF); + eRoulette->var08 = 0; + for (i = 0; i < 6; i++) + eRoulette->var0C[i] = 0; + for (i = 0; i < 4; i++) + eRoulette->var12[i] = 0; + for (i = 0; i < 3; i++) + eRoulette->var16[i] = 0; + sub_8117C60(1, 255); } u8 sub_8116D54(u8 taskid, u8 r1) { u32 t0[] = {67650, 135300, 270600, 541200}; u32 t1[] = {0x3e0, 0x7c00, 0xf8000}; - if (r1 > 0xB) + if (r1 > 11) { - return 0x0; + return 0; } else { u8 i; u8 z; - eRoulette->var0C[gTasks[taskid].data[0x6] - 1] = gUnknown_083F8D90[r1].var02; - gTasks[taskid].data[0xC] = gUnknown_083F8D90[r1].var02; + eRoulette->var0C[gTasks[taskid].data[6] - 1] = gUnknown_083F8D90[r1].var02; + gTasks[taskid].data[12] = gUnknown_083F8D90[r1].var02; eRoulette->var08 |= gUnknown_083F8D90[r1].var04; - for (i = 0; i < 0x4; i++) + for (i = 0; i < 4; i++) { if (gUnknown_083F8D90[r1].var04 & t0[i]) eRoulette->var12[i]++; - if (eRoulette->var12[i] > 0x2) + if (eRoulette->var12[i] > 2) eRoulette->var08 |= t0[i]; } - for (z = 0; z < 0x3; z++) + for (z = 0; z < 3; z++) { if (gUnknown_083F8D90[r1].var04 & t1[z]) eRoulette->var16[z]++; - if (eRoulette->var16[z] > 0x3) + if (eRoulette->var16[z] > 3) eRoulette->var08 |= t1[z]; } return gUnknown_083F8D90[r1].var02; @@ -1344,51 +1364,51 @@ u8 sub_8116D54(u8 taskid, u8 r1) u8 sub_8116E5C(u8 r0, u8 r1) { u8 t = r0; - if (--r0 < 0x13) + if (--r0 < 19) { switch (r1) { - case 0x0: - return 0x3; + case 0: + return 3; break; - case 0x1 ... 0x4: + case 1 ... 4: if (t == r1 + 5 || t == r1 + 10 || t == r1 + 15) - return 0x1; + return 1; break; - case 0x5: - case 0xA: - case 0xF: + case 5: + case 10: + case 15: if (!(t < r1 + 1) && !(t > r1 + 4)) - return 0x1; + return 1; break; default: if (t == r1) - return 0x1; + return 1; } } - return 0x0; + return 0; } void sub_8116EF8(u8 r0) { - u16 var0 = 0x0; + u16 var0 = 0; u8 var2; u16 var3; u8 i; switch (r0) { - case 0x5: - case 0xA: - case 0xF: - for (i = (r0 + 0x1); i < (r0 + 0x5); i++) + case 5: + case 10: + case 15: + for (i = (r0 + 1); i < (r0 + 5); i++) if (!(eRoulette->var08 & gUnknown_083F8C00[i].var08)) var0 |= gUnknown_083F8C00[i].var10; - sub_8124CE8(&eRoulette->varB8, var0 &= 0xDFFF); + sub_8124CE8(&eRoulette->varB8, var0 &= 0xdfff); break; default: { - struct UnkStruct1 var1[0x3]; + struct UnkStruct1 var1[3]; memcpy(var1, gUnknown_083F8E9C, sizeof var1); if (r0 > 0 && r0 < 5) var2 = 3; @@ -1397,17 +1417,17 @@ void sub_8116EF8(u8 r0) var3 = r0 / 5 - 1; switch (r0 % 5) { - case 0x1: - var3 = gSprites[eRoulette->var3C[7 + 0]].oam.paletteNum * 0x10; + case 1: + var3 = gSprites[eRoulette->var3C[7 + 0]].oam.paletteNum * 16; break; - case 0x2: - var3 = gSprites[eRoulette->var3C[7 + 1]].oam.paletteNum * 0x10; + case 2: + var3 = gSprites[eRoulette->var3C[7 + 1]].oam.paletteNum * 16; break; - case 0x3: - var3 = gSprites[eRoulette->var3C[7 + 2]].oam.paletteNum * 0x10; + case 3: + var3 = gSprites[eRoulette->var3C[7 + 2]].oam.paletteNum * 16; break; - case 0x4: - var3 = gSprites[eRoulette->var3C[7 + 3]].oam.paletteNum * 0x10; + case 4: + var3 = gSprites[eRoulette->var3C[7 + 3]].oam.paletteNum * 16; break; } if (var2 == 1) @@ -1450,41 +1470,41 @@ void sub_8117158(u8 r0) vu16 var1; vu16 var2; vu8 var0; - u8 v[0x5]; + u8 v[5]; u8 l; - eRoulette->var2A = 0x1; - sub_8117AA8(0x0, 0x0); - sub_8124E2C(gBGTilemapBuffers[1], (u16 *)ewram18800, 0xE, 0x7, 0x10, 0xD); + eRoulette->var2A = 1; + sub_8117AA8(0, 0); + sub_8124E2C(gBGTilemapBuffers[1], (u16 *)ewram18800, 14, 7, 16, 13); switch (r0) { - case 0x0: + case 0: return; - case 0x1 ... 0x4: - l = 0x4; - for (i = 0x0; i < l; i++) - v[i] = i * 0x5 + r0; + case 1 ... 4: + l = 4; + for (i = 0; i < l; i++) + v[i] = i * 5 + r0; break; - case 0x5: - case 0xA: - case 0xF: - l = 0x5; - for (i = 0x0; i < l; i++) + case 5: + case 10: + case 15: + l = 5; + for (i = 0; i < l; i++) v[i] = i + r0; break; default: - l = 0x1; + l = 1; v[0] = r0; } - for (i = 0x0; i < l; i++) + for (i = 0; i < l; i++) { var0 = gUnknown_083F8C00[v[i]].var06; var1 = gUnknown_083F8C00[v[i]].var03; - for (z = 0; z < 0x3; z++) + for (z = 0; z < 3; z++) { - var2 = (gUnknown_083F8C00[v[i]].var04 + z) * 0x20; - gBGTilemapBuffers[1][var1 + var2 + 0x0] = ewram189a0[(var0 + z) * 0x3 + 0x0]; - gBGTilemapBuffers[1][var1 + var2 + 0x1] = ewram189a0[(var0 + z) * 0x3 + 0x1]; - gBGTilemapBuffers[1][var1 + var2 + 0x2] = ewram189a0[(var0 + z) * 0x3 + 0x2]; + var2 = (gUnknown_083F8C00[v[i]].var04 + z) * 32; + gBGTilemapBuffers[1][var1 + var2 + 0] = ewram189a0[(var0 + z) * 3 + 0]; + gBGTilemapBuffers[1][var1 + var2 + 1] = ewram189a0[(var0 + z) * 3 + 1]; + gBGTilemapBuffers[1][var1 + var2 + 2] = ewram189a0[(var0 + z) * 3 + 2]; } } } @@ -1499,7 +1519,7 @@ u8 sub_8117380(u8 r0) case 3: r0 = r0 / 5 - 1; if (eRoulette->var16[r0] > 3) - return 0x0; + return 0; return var0[eRoulette->var16[r0] + 1]; case 4: r0--; @@ -1522,14 +1542,14 @@ void sub_8117434(void) REG_BG2PB = eRoulette->var2C.b; REG_BG2PC = eRoulette->var2C.c; REG_BG2PD = eRoulette->var2C.d; - x1 = 0x7400 - eRoulette->var2C.a * (gSpriteCoordOffsetX + 0x74) - - eRoulette->var2C.b * (gSpriteCoordOffsetY + 0x50); - x2 = 0x5400 - eRoulette->var2C.c * (gSpriteCoordOffsetX + 0x74) - - eRoulette->var2C.d * (gSpriteCoordOffsetY + 0x50); + x1 = 0x7400 - eRoulette->var2C.a * (gSpriteCoordOffsetX + 116) + - eRoulette->var2C.b * (gSpriteCoordOffsetY + 80); + x2 = 0x5400 - eRoulette->var2C.c * (gSpriteCoordOffsetX + 116) + - eRoulette->var2C.d * (gSpriteCoordOffsetY + 80); REG_BG2X_L = x1; - REG_BG2X_H = (x1 & 0x0fff0000) >> 16; + REG_BG2X_H = (x1 & 0xfff0000) >> 16; REG_BG2Y_L = x2; - REG_BG2Y_H = (x2 & 0x0fff0000) >> 16; + REG_BG2Y_H = (x2 & 0xfff0000) >> 16; } s16 sub_81174C4(s16 r0, s16 r1) @@ -1547,8 +1567,8 @@ s16 sub_81174E0(s16 r0) void sub_81174F8(u8 r0) { - DisplayYesNoMenu(0x14, 0x8, 0x1); - sub_814AAF8(0x2D9E); + DisplayYesNoMenu(20, 8, 1); + sub_814AAF8(RGB(30, 12, 11)); DoYesNoFuncWithChoice(r0, &gUnknown_083F8EB4); } @@ -1564,9 +1584,9 @@ void sub_8117528(u8 taskid) void sub_811755C(u8 taskid) { - Menu_EraseWindowRect(0x14, 0x8, 0x1A, 0xD); + Menu_EraseWindowRect(20, 8, 26, 13); Menu_EraseScreen(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); + BeginNormalPaletteFade(0xffffffff, 0, 0, 16, RGB(0, 0, 0)); gPaletteFade.delayCounter = gPaletteFade.multipurpose2; UpdatePaletteFade(); gTasks[taskid].func = &sub_8117528; @@ -1585,9 +1605,9 @@ void sub_81175C0(u8 taskid) void sub_81175DC(u8 taskid) { gTasks[taskid].data[0]++; - if (!(gMain.newKeys & (A_BUTTON | B_BUTTON)) && gTasks[taskid].data[0] < 0x3D) + if (!(gMain.newKeys & (A_BUTTON | B_BUTTON)) && gTasks[taskid].data[0] < 61) return; - gSpecialVar_0x8004 = 0x1; + gSpecialVar_0x8004 = 1; Menu_EraseScreen(); ScriptContext2_Disable(); DestroyTask(taskid); @@ -1595,47 +1615,47 @@ void sub_81175DC(u8 taskid) void sub_8117630(u8 taskid) { - u32 temp = gUnknown_083F8DF0[(gSpecialVar_0x8004 & 0x1) + (gSpecialVar_0x8004 >> 0x7 << 0x1)]; - ConvertIntToDecimalStringN(gStringVar1, temp, 0x2, 0x1); + u32 temp = gUnknown_083F8DF0[(gSpecialVar_0x8004 & 1) + (gSpecialVar_0x8004 >> 7 << 1)]; + ConvertIntToDecimalStringN(gStringVar1, temp, 2, 1); StringExpandPlaceholders(gStringVar4, &gUnknown_081C40DF); - Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); - Menu_PrintText(gStringVar4, 0x1, 0xF); + Menu_DrawStdWindowFrame(0, 14, 29, 19); + Menu_PrintText(gStringVar4, 1, 15); gTasks[taskid].func = &sub_81174F8; } void Task_Roulette_0(u8 taskid) { s32 temp; - ConvertIntToDecimalStringN(gStringVar1, gTasks[taskid].data[0xD], 0x1, 0x4); + ConvertIntToDecimalStringN(gStringVar1, gTasks[taskid].data[13], 1, 4); StringExpandPlaceholders(gStringVar4, gOtherText_Coins); - Menu_DrawStdWindowFrame(0x0, 0x0, 0x9, 0x3); - MenuPrint_RightAligned(gStringVar4, 0x9, 0x1); - temp = gUnknown_083F8DF0[(gSpecialVar_0x8004 & 0x1) + (gSpecialVar_0x8004 >> 0x7 << 0x1)]; - ConvertIntToDecimalStringN(gStringVar1, temp, 0x2, 0x1); - if (gTasks[taskid].data[0xD] >= temp) + Menu_DrawStdWindowFrame(0, 0, 9, 3); + MenuPrint_RightAligned(gStringVar4, 9, 1); + temp = gUnknown_083F8DF0[(gSpecialVar_0x8004 & 1) + (gSpecialVar_0x8004 >> 7 << 1)]; + ConvertIntToDecimalStringN(gStringVar1, temp, 2, 1); + if (gTasks[taskid].data[13] >= temp) { - if ((gSpecialVar_0x8004 & 0x80) && (gSpecialVar_0x8004 & 0x1)) + if ((gSpecialVar_0x8004 & 128) && (gSpecialVar_0x8004 & 1)) { - Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); - Menu_PrintText(&gUnknown_081C4139, 0x1, 0xF); - sub_8116C34(taskid , &sub_8117630, 0xFFFF, 0x3); + Menu_DrawStdWindowFrame(0, 14, 29, 19); + Menu_PrintText(&gUnknown_081C4139, 1, 15); + sub_8116C34(taskid , &sub_8117630, 0xffff, 3); } else { StringExpandPlaceholders(gStringVar4, &gUnknown_081C40DF); - Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); - Menu_PrintText(gStringVar4, 0x1, 0xF); + Menu_DrawStdWindowFrame(0, 14, 29, 19); + Menu_PrintText(gStringVar4, 1, 15); gTasks[taskid].func = &sub_81174F8; } } else { StringExpandPlaceholders(gStringVar4, &gUnknown_081C411C); - Menu_DrawStdWindowFrame(0x0, 0xE, 0x1D, 0x13); - Menu_PrintText(gStringVar4, 0x1, 0xF); + Menu_DrawStdWindowFrame(0, 14, 29, 19); + Menu_PrintText(gStringVar4, 1, 15); gTasks[taskid].func = &sub_81175DC; - gTasks[taskid].data[0xD] = 0x0; - gTasks[taskid].data[0x0] = 0x0; + gTasks[taskid].data[13] = 0; + gTasks[taskid].data[0] = 0; } } @@ -1704,7 +1724,7 @@ void debug_sub_812CFE8(u8 taskId) static const u8 gUnknown_Debug_0842510D[] = _("Set COIN and Press START\nAーp1 Bーm1 R:Lー×10"); gTasks[taskId].data[13] = gSaveBlock1.coins; if (Random() & 1) - gSpecialVar_0x8004 |= 0x80; + gSpecialVar_0x8004 |= 128; ConvertIntToDecimalStringN(gStringVar1, gTasks[taskId].data[13], 1, 4); StringExpandPlaceholders(gStringVar4, gOtherText_Coins); Menu_DrawStdWindowFrame(0, 0, 9, 3); @@ -1730,5 +1750,5 @@ void PlayRoulette(void) } #endif taskid = CreateTask(Task_Roulette_0, 0); - gTasks[taskid].data[0xD] = gSaveBlock1.coins; + gTasks[taskid].data[13] = gSaveBlock1.coins; } diff --git a/src/roulette_gfx.c b/src/roulette_gfx.c index 006eb70a0..a35fd8b7a 100644 --- a/src/roulette_gfx.c +++ b/src/roulette_gfx.c @@ -166,7 +166,7 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83F9EE4[] = { const struct CompressedSpriteSheet gUnknown_083F9EE8 = { RoulettePokeIcons2Tiles, - 0xC00, + 0xc00, 0 }; @@ -442,10 +442,10 @@ const struct OamData gOamData_83FA328 = { }; const struct SpriteFrameImage gSpriteImageTable_83FA330[] = { - {(void *)ewram17E00 + 0x000, 0x80}, - {(void *)ewram17E00 + 0x080, 0x80}, - {(void *)ewram17E00 + 0x100, 0x80}, - {(void *)ewram17E00 + 0x180, 0x80} + {(void *)ewram17E00 + 0, 128}, + {(void *)ewram17E00 + 128, 128}, + {(void *)ewram17E00 + 0x100, 128}, + {(void *)ewram17E00 + 0x180, 128} }; const union AnimCmd gSpriteAnim_83FA350[] = { @@ -522,7 +522,7 @@ const union AnimCmd *const gSpriteAnimTable_83FA3E8[] = { gSpriteAnim_83FA3CC }; -const struct SpriteTemplate gSpriteTemplate_83FA40C = {0xFFFF, 2, &gOamData_83FA328, gSpriteAnimTable_83FA3E8, gSpriteImageTable_83FA330, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; +const struct SpriteTemplate gSpriteTemplate_83FA40C = {0xffff, 2, &gOamData_83FA328, gSpriteAnimTable_83FA3E8, gSpriteImageTable_83FA330, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; const struct OamData gOamData_83FA424 = { .y = 81, @@ -553,13 +553,13 @@ const struct OamData gOamData_83FA454 = { }; const struct SpriteFrameImage gSpriteImageTable_83FA45C[] = { - {(void *)ewram17000 + 0x000, 0x200}, + {(void *)ewram17000 + 0, 0x200}, {(void *)ewram17000 + 0x200, 0x200}, {(void *)ewram17000 + 0x400, 0x200}, {(void *)ewram17000 + 0x600, 0x200}, {(void *)ewram17000 + 0x800, 0x200}, - {(void *)ewram17000 + 0xA00, 0x200}, - {(void *)ewram17000 + 0xC00, 0x200} + {(void *)ewram17000 + 0xa00, 0x200}, + {(void *)ewram17000 + 0xc00, 0x200} }; const union AnimCmd gSpriteAnim_83FA494[] = { @@ -620,9 +620,9 @@ const union AnimCmd *const gSpriteAnimTable_83FA4F4[] = { gSpriteAnim_83FA4E4 }; -const struct SpriteTemplate gSpriteTemplate_83FA50C = {0xFFFF, 6, &gOamData_83FA44C, gSpriteAnimTable_83FA4F0, gSpriteImageTable_83FA45C, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; +const struct SpriteTemplate gSpriteTemplate_83FA50C = {0xffff, 6, &gOamData_83FA44C, gSpriteAnimTable_83FA4F0, gSpriteImageTable_83FA45C, gDummySpriteAffineAnimTable, SpriteCallbackDummy}; -const struct SpriteTemplate gSpriteTemplate_83FA524 = {0xFFFF, 7, &gOamData_83FA454, gSpriteAnimTable_83FA4F4, gSpriteImageTable_83FA45C, gDummySpriteAffineAnimTable, sub_8119D80}; +const struct SpriteTemplate gSpriteTemplate_83FA524 = {0xffff, 7, &gOamData_83FA454, gSpriteAnimTable_83FA4F4, gSpriteImageTable_83FA45C, gDummySpriteAffineAnimTable, sub_8119D80}; const struct OamData gOamData_83FA53C = { .affineMode = ST_OAM_AFFINE_OFF, @@ -646,11 +646,11 @@ const struct OamData gOamData_83FA54C = { }; const struct SpriteFrameImage gSpriteImageTable_83FA554[] = { - {(void *)ewram18000 + 0x000, 0x080} + {(void *)ewram18000 + 0, 128} }; const struct SpriteFrameImage gSpriteImageTable_83FA55C[] = { - {(void *)ewram18000 + 0x080, 0x100} + {(void *)ewram18000 + 128, 0x100} }; const union AffineAnimCmd gSpriteAffineAnim_83FA564[] = { @@ -685,11 +685,11 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_83FA5BC[] = { }; const struct SpriteTemplate gSpriteTemplate_83FA5C0[] = { - {0xFFFF, 1, &gOamData_83FA53C, gSpriteAnimTable_83F9ED8, gSpriteImageTable_83FA554, gDummySpriteAffineAnimTable, SpriteCallbackDummy}, - {0xFFFF, 1, &gOamData_83FA544, gSpriteAnimTable_83F9ED8, gSpriteImageTable_83FA55C, gDummySpriteAffineAnimTable, sub_8119964} + {0xffff, 1, &gOamData_83FA53C, gSpriteAnimTable_83F9ED8, gSpriteImageTable_83FA554, gDummySpriteAffineAnimTable, SpriteCallbackDummy}, + {0xffff, 1, &gOamData_83FA544, gSpriteAnimTable_83F9ED8, gSpriteImageTable_83FA55C, gDummySpriteAffineAnimTable, sub_8119964} }; -const struct SpriteTemplate gSpriteTemplate_83FA5F0 = {0xFFFF, 1, &gOamData_83FA54C, gSpriteAnimTable_83F9ED8, gSpriteImageTable_83FA55C, gSpriteAffineAnimTable_83FA5A8, sub_8119D80}; +const struct SpriteTemplate gSpriteTemplate_83FA5F0 = {0xffff, 1, &gOamData_83FA54C, gSpriteAnimTable_83F9ED8, gSpriteImageTable_83FA55C, gSpriteAffineAnimTable_83FA5A8, sub_8119D80}; void sub_8117838(u8 r0) { @@ -710,16 +710,16 @@ void sub_8117838(u8 r0) u8 sub_8117890(const struct SpriteTemplate *r0, u8 r1, u16 *r2) { u16 temp; - u8 spriteid = CreateSprite(r0, 0x74, 0x50, r0->oam->y); + u8 spriteid = CreateSprite(r0, 116, 80, r0->oam->y); gSprites[spriteid].data[0] = *r2; gSprites[spriteid].data[1] = r1; gSprites[spriteid].coordOffsetEnabled = TRUE; gSprites[spriteid].animPaused = TRUE; gSprites[spriteid].affineAnimPaused = TRUE; temp = *r2; - *r2 += 0x1E; - if (*r2 > 0x167) - *r2 = temp - 0x14A; + *r2 += 30; + if (*r2 >- 360) + *r2 = temp - 330; return spriteid; } @@ -738,38 +738,38 @@ void sub_8117900(void) s.size = gUnknown_083F9F5C.size; s.tag = gUnknown_083F9F5C.tag; LoadSpriteSheet(&s); - for (i = 0; i < 0x3; i++) + for (i = 0; i < 3; i++) { - u8 o = i * 0x18; - for (j = 0; j < 0x4; j++) + u8 o = i * 24; + for (j = 0; j < 4; j++) { - spriteid = eRoulette->var3C[0x1D + i * 0x4 + j] = - CreateSprite(&gSpriteTemplate_83FA07C[j], j * 0x18 + 0x94, o + 0x5C, 0x1E); + spriteid = eRoulette->var3C[29 + i * 4 + j] = + CreateSprite(&gSpriteTemplate_83FA07C[j], j * 24 + 148, o + 92, 30); gSprites[spriteid].animPaused = TRUE; - o += 0x18; - if (o > 0x47) - o = 0x0; + o += 24; + if (o > 71) + o = 0; } } - for (i = 0x0; i < 0x4; i++) + for (i = 0; i < 4; i++) { - spriteid = eRoulette->var3C[0x29 + i] = - CreateSprite(&gSpriteTemplate_83F9FD4[i], (s16)(i * 0x18 + 0x94), 0x46, 0x1E); + spriteid = eRoulette->var3C[41 + i] = + CreateSprite(&gSpriteTemplate_83F9FD4[i], (s16)(i * 24 + 148), 70, 30); gSprites[spriteid].animPaused = TRUE; } - for (i = 0x0; i < 0x3; i++) + for (i = 0; i < 3; i++) { - spriteid = eRoulette->var3C[0x2D + i] = - CreateSprite(&gSpriteTemplate_83FA034[i], 0x7E, (s16)(i * 0x18 + 0x5C), 0x1E); + spriteid = eRoulette->var3C[45 + i] = + CreateSprite(&gSpriteTemplate_83FA034[i], 126, (s16)(i * 24 + 92), 30); gSprites[spriteid].animPaused = TRUE; } } -void unref_sub_8117A74(void) //destroy all sprites at 0x1D +void unref_sub_8117A74(void) //destroy all sprites at 29 { u8 i; - for (i = 0x0; i < 0xC; i++) - DestroySprite(&gSprites[eRoulette->var3C[0x1D + i]]); + for (i = 0; i < 12; i++) + DestroySprite(&gSprites[eRoulette->var3C[29 + i]]); } void sub_8117AA8(u8 r0, u8 r1) @@ -777,22 +777,22 @@ void sub_8117AA8(u8 r0, u8 r1) u8 i; switch (r0) { - case 0x1: - for (i = 0x0; i < 0x13; i++) - gSprites[eRoulette->var3C[0x1D + i]].invisible = TRUE; + case 1: + for (i = 0; i < 19; i++) + gSprites[eRoulette->var3C[29 + i]].invisible = TRUE; break; - case 0x0: - for (i = 0x0; i < 0xC; i++) + case 0: + for (i = 0; i < 12; i++) { if (!(eRoulette->var08 & gUnknown_083F8D90[i].var04)) - gSprites[eRoulette->var3C[0x1D + i]].invisible = FALSE; + gSprites[eRoulette->var3C[29 + i]].invisible = FALSE; else if(!(gUnknown_083F8D90[i].var02 == r1)) - gSprites[eRoulette->var3C[0x1D + i]].invisible = TRUE; + gSprites[eRoulette->var3C[29 + i]].invisible = TRUE; else - gSprites[eRoulette->var3C[0x1D + i]].invisible = FALSE; + gSprites[eRoulette->var3C[29 + i]].invisible = FALSE; } - for (; i < 0x13; i++) - gSprites[eRoulette->var3C[0x1D + i]].invisible = FALSE; + for (; i < 19; i++) + gSprites[eRoulette->var3C[29 + i]].invisible = FALSE; break; } } @@ -800,38 +800,38 @@ void sub_8117AA8(u8 r0, u8 r1) void sub_8117BBC(void) { u8 i; - for (i = 0x0; i < 0x6; i++) + for (i = 0; i < 6; i++) { - eRoulette->var3C[0x31 + i] = CreateSprite(&gSpriteTemplate_83FA40C, 0x74, 0x14, 0xA); - gSprites[eRoulette->var3C[0x31 + i]].invisible = TRUE; - gSprites[eRoulette->var3C[0x31 + i]].data[0] = 0x1; - gSprites[eRoulette->var3C[0x31 + i]].callback = &sub_81184CC; - gSprites[eRoulette->var3C[0x31 + i]].oam.priority = 0x1; - StartSpriteAnim(&gSprites[eRoulette->var3C[0x31 + i]], 0x8); + eRoulette->var3C[49 + i] = CreateSprite(&gSpriteTemplate_83FA40C, 116, 20, 10); + gSprites[eRoulette->var3C[49 + i]].invisible = TRUE; + gSprites[eRoulette->var3C[49 + i]].data[0] = 1; + gSprites[eRoulette->var3C[49 + i]].callback = &sub_81184CC; + gSprites[eRoulette->var3C[49 + i]].oam.priority = 1; + StartSpriteAnim(&gSprites[eRoulette->var3C[49 + i]], 8); } } void sub_8117C60(u8 r0, u8 r1) { - u8 i = 0x0; + u8 i = 0; if (r0) { - for ( ; i < 0x6; i++) - gSprites[eRoulette->var3C[0x31 + i]].invisible = TRUE; + for ( ; i < 6; i++) + gSprites[eRoulette->var3C[49 + i]].invisible = TRUE; } else { - for ( ; i < 0x6; i++) + for ( ; i < 6; i++) { if (!(eRoulette->var0C[i]) || (i == r1)) { - gSprites[eRoulette->var3C[0x31 + i]].invisible = TRUE; + gSprites[eRoulette->var3C[49 + i]].invisible = TRUE; } else { - gSprites[eRoulette->var3C[0x31 + i]].invisible = FALSE; - gSprites[eRoulette->var3C[0x31 + i]].pos1.x = (gUnknown_083F8C00[eRoulette->var0C[i]].var03 + 0x1) * 0x8 + 0x4; - gSprites[eRoulette->var3C[0x31 + i]].pos1.y = (gUnknown_083F8C00[eRoulette->var0C[i]].var04 + 0x1) * 0x8 + 0x3; + gSprites[eRoulette->var3C[49 + i]].invisible = FALSE; + gSprites[eRoulette->var3C[49 + i]].pos1.x = (gUnknown_083F8C00[eRoulette->var0C[i]].var03 + 1) * 8 + 4; + gSprites[eRoulette->var3C[49 + i]].pos1.y = (gUnknown_083F8C00[eRoulette->var0C[i]].var04 + 1) * 8 + 3; } } } @@ -841,13 +841,13 @@ void sub_8117D68(u8 r0) { if (!r0) { - gSprites[eRoulette->var3C[0x30]].invisible = TRUE; + gSprites[eRoulette->var3C[48]].invisible = TRUE; } else { - gSprites[eRoulette->var3C[0x30]].invisible = FALSE; - gSprites[eRoulette->var3C[0x30]].pos1.x = (gUnknown_083F8C00[r0].var03 + 0x2) * 0x8; - gSprites[eRoulette->var3C[0x30]].pos1.y = (gUnknown_083F8C00[r0].var04 + 0x2) * 0x8; + gSprites[eRoulette->var3C[48]].invisible = FALSE; + gSprites[eRoulette->var3C[48]].pos1.x = (gUnknown_083F8C00[r0].var03 + 2) * 8; + gSprites[eRoulette->var3C[48]].pos1.y = (gUnknown_083F8C00[r0].var04 + 2) * 8; } } @@ -861,14 +861,14 @@ void sub_8117DF4(void) s.size = gUnknown_083F9EE8.size; s.tag = gUnknown_083F9EE8.tag; LoadSpriteSheet(&s); - k = 0xF; - for (i = 0x0; i < 0x3; i++) + k = 15; + for (i = 0; i < 3; i++) { - for (j = 0x0; j < 0x4; j++) + for (j = 0; j < 4; j++) { u8 spriteid; spriteid = - eRoulette->var3C[0x7 + i * 0x4 + j] = sub_8117890(&gSpriteTemplate_83FA0DC[i * 0x4 + j], 0x28, &k); + eRoulette->var3C[7 + i * 4 + j] = sub_8117890(&gSpriteTemplate_83FA0DC[i * 4 + j], 40, &k); gSprites[spriteid].animPaused = TRUE; gSprites[spriteid].affineAnimPaused = TRUE; } @@ -885,8 +885,8 @@ void sub_8117E98(struct Sprite *sprite) angle -= 360; sin = Sin2(angle); cos = Cos2(angle); - sprite->pos2.x = sin * sprite->data[1] >> 0xC; - sprite->pos2.y = -cos * sprite->data[1] >> 0xC; + sprite->pos2.x = sin * sprite->data[1] >> 12; + sprite->pos2.y = -cos * sprite->data[1] >> 12; matrixNum = sprite->oam.matrixNum; sin /= 16; gOamMatrices[matrixNum].d = cos /= 16; @@ -898,7 +898,7 @@ void sub_8117E98(struct Sprite *sprite) void sub_8117F2C(void) { u8 i; - for (i = 0x0; i < 0x5; i++) + for (i = 0; i < 5; i++) { struct SpriteSheet s; LZ77UnCompWram(gUnknown_083FA21C[i].data, gSharedMem); @@ -907,26 +907,26 @@ void sub_8117F2C(void) s.tag = gUnknown_083FA21C[i].tag; LoadSpriteSheet(&s); } - eRoulette->var3C[0x14] = CreateSprite(&gSpriteTemplate_83FA2B0, 0xD0, 0x10, 0x4); - gSprites[eRoulette->var3C[0x14]].animPaused = TRUE; - for (i = 0x0; i < 0x4; i++) + eRoulette->var3C[20] = CreateSprite(&gSpriteTemplate_83FA2B0, 208, 16, 4); + gSprites[eRoulette->var3C[20]].animPaused = TRUE; + for (i = 0; i < 4; i++) { - eRoulette->var3C[0x15 + i] = CreateSprite(&gSpriteTemplate_83FA2C8, (s16)(i * 0x8 + 0xC4), 0x18, 0x0); - gSprites[eRoulette->var3C[0x15 + i]].invisible = TRUE; - gSprites[eRoulette->var3C[0x15 + i]].animPaused = TRUE; + eRoulette->var3C[21 + i] = CreateSprite(&gSpriteTemplate_83FA2C8, (s16)(i * 8 + 196), 24, 0); + gSprites[eRoulette->var3C[21 + i]].invisible = TRUE; + gSprites[eRoulette->var3C[21 + i]].animPaused = TRUE; } - eRoulette->var3C[0x19] = CreateSprite(&gSpriteTemplate_83FA2E0, 0x78, 0x44, 0x4); - gSprites[eRoulette->var3C[0x19]].animPaused = TRUE; - for (i = 0x0; i < 0x3; i++) + eRoulette->var3C[25] = CreateSprite(&gSpriteTemplate_83FA2E0, 120, 68, 4); + gSprites[eRoulette->var3C[25]].animPaused = TRUE; + for (i = 0; i < 3; i++) { - eRoulette->var3C[0x1A + i] = CreateSprite(&gSpriteTemplate_83FA2F8, (s16)(i * 0x10 + 0xC0), 0x24, 0x4); - gSprites[eRoulette->var3C[0x1A + i]].invisible = TRUE; - gSprites[eRoulette->var3C[0x1A + i]].animPaused = TRUE; + eRoulette->var3C[26 + i] = CreateSprite(&gSpriteTemplate_83FA2F8, (s16)(i * 16 + 192), 36, 4); + gSprites[eRoulette->var3C[26 + i]].invisible = TRUE; + gSprites[eRoulette->var3C[26 + i]].animPaused = TRUE; } - eRoulette->var3C[0x30] = CreateSprite(&gSpriteTemplate_83FA310, 0x98, 0x60, 0x9); - gSprites[eRoulette->var3C[0x30]].oam.priority = 0x1; - gSprites[eRoulette->var3C[0x30]].animPaused = TRUE; - gSprites[eRoulette->var3C[0x30]].invisible = TRUE; + eRoulette->var3C[48] = CreateSprite(&gSpriteTemplate_83FA310, 152, 96, 9); + gSprites[eRoulette->var3C[48]].oam.priority = 1; + gSprites[eRoulette->var3C[48]].animPaused = TRUE; + gSprites[eRoulette->var3C[48]].invisible = TRUE; } void sub_81180F4(u16 r0) @@ -934,16 +934,16 @@ void sub_81180F4(u16 r0) u8 i; u16 d = 1000; bool8 v = FALSE; - for (i = 0x0; i < 0x4; i++) + for (i = 0; i < 4; i++) { u8 t = r0 / d; - gSprites[eRoulette->var3C[0x15 + i]].invisible = TRUE; - if (t > 0x0 || v || i == 0x3) + gSprites[eRoulette->var3C[21 + i]].invisible = TRUE; + if (t > 0 || v || i == 3) { - gSprites[eRoulette->var3C[0x15 + i]].invisible = FALSE; - gSprites[eRoulette->var3C[0x15 + i]].oam.tileNum = - gSprites[eRoulette->var3C[0x15 + i]].sheetTileStart - + (*gSprites[eRoulette->var3C[0x15 + i]].anims + t)->type; + gSprites[eRoulette->var3C[21 + i]].invisible = FALSE; + gSprites[eRoulette->var3C[21 + i]].oam.tileNum = + gSprites[eRoulette->var3C[21 + i]].sheetTileStart + + (*gSprites[eRoulette->var3C[21 + i]].anims + t)->type; v = TRUE; } r0 = r0 % d; @@ -958,17 +958,17 @@ u8 sub_81181E8(u8 r0) r0 = 0; switch (gUnknown_083F8C00[r0].var01_0) { - case 0x3: + case 3: r0 = r0 / 5 - 1; if (eRoulette->var16[r0] < 4) return t[((vu8 *)eRoulette->var16)[r0] + 1]; // couldn't recreate redundant loads break; - case 0x4: + case 4: r0--; if (eRoulette->var12[r0] < 3) return t[((vu8 *)eRoulette->var12)[r0] + 2]; break; - case 0xC: + case 12: if (!(eRoulette->var08 & gUnknown_083F8C00[r0].var08)) return t[4]; break; @@ -978,7 +978,7 @@ u8 sub_81181E8(u8 r0) void sub_811829C(u8 r0) { - struct Sprite *s = &gSprites[eRoulette->var3C[0x19]]; + struct Sprite *s = &gSprites[eRoulette->var3C[25]]; s->animCmdIndex = sub_81181E8(r0); s->oam.tileNum = s->sheetTileStart @@ -988,52 +988,52 @@ void sub_811829C(u8 r0) void sub_81182F8(u8 r0) { u8 i; - u8 t = 0x0; - if (eRoulette->var19 == 0x1) - t = 0x2; + u8 t = 0; + if (eRoulette->var19 == 1) + t = 2; switch (r0) { - case 0x6: - for (i = 0x0; i < 0x3; i++) + case 6: + for (i = 0; i < 3; i++) { - gSprites[eRoulette->var3C[0x1A + i]].invisible = FALSE; - gSprites[eRoulette->var3C[0x1A + i]].oam.tileNum = - gSprites[eRoulette->var3C[0x1A + i]].sheetTileStart - + (*gSprites[eRoulette->var3C[0x1A + i]].anims)->type; + gSprites[eRoulette->var3C[26 + i]].invisible = FALSE; + gSprites[eRoulette->var3C[26 + i]].oam.tileNum = + gSprites[eRoulette->var3C[26 + i]].sheetTileStart + + (*gSprites[eRoulette->var3C[26 + i]].anims)->type; } break; - case 0x5: - gSprites[eRoulette->var3C[0x1C]].oam.tileNum = - gSprites[eRoulette->var3C[0x1C]].sheetTileStart - + (*gSprites[eRoulette->var3C[0x1C]].anims + t + 0x1)->type; + case 5: + gSprites[eRoulette->var3C[28]].oam.tileNum = + gSprites[eRoulette->var3C[28]].sheetTileStart + + (*gSprites[eRoulette->var3C[28]].anims + t + 1)->type; break; - case 0x4: - gSprites[eRoulette->var3C[0x1C]].oam.tileNum = - gSprites[eRoulette->var3C[0x1C]].sheetTileStart - + (*gSprites[eRoulette->var3C[0x1C]].anims + t + 0x2)->type; + case 4: + gSprites[eRoulette->var3C[28]].oam.tileNum = + gSprites[eRoulette->var3C[28]].sheetTileStart + + (*gSprites[eRoulette->var3C[28]].anims + t + 2)->type; break; - case 0x3: - gSprites[eRoulette->var3C[0x1B]].oam.tileNum = - gSprites[eRoulette->var3C[0x1B]].sheetTileStart - + (*gSprites[eRoulette->var3C[0x1B]].anims + t + 0x1)->type; + case 3: + gSprites[eRoulette->var3C[27]].oam.tileNum = + gSprites[eRoulette->var3C[27]].sheetTileStart + + (*gSprites[eRoulette->var3C[27]].anims + t + 1)->type; break; - case 0x2: - gSprites[eRoulette->var3C[0x1B]].oam.tileNum = - gSprites[eRoulette->var3C[0x1B]].sheetTileStart - + (*gSprites[eRoulette->var3C[0x1B]].anims + t + 0x2)->type; + case 2: + gSprites[eRoulette->var3C[27]].oam.tileNum = + gSprites[eRoulette->var3C[27]].sheetTileStart + + (*gSprites[eRoulette->var3C[27]].anims + t + 2)->type; break; - case 0x1: - gSprites[eRoulette->var3C[0x1A]].oam.tileNum = - gSprites[eRoulette->var3C[0x1A]].sheetTileStart - + (*gSprites[eRoulette->var3C[0x1A]].anims + t + 0x1)->type; + case 1: + gSprites[eRoulette->var3C[26]].oam.tileNum = + gSprites[eRoulette->var3C[26]].sheetTileStart + + (*gSprites[eRoulette->var3C[26]].anims + t + 1)->type; break; - case 0x0: + case 0: default: - for (i = 0x0; i < 0x3; i++) + for (i = 0; i < 3; i++) { - gSprites[eRoulette->var3C[0x1A + i]].oam.tileNum = - gSprites[eRoulette->var3C[0x1A + i]].sheetTileStart - + (*gSprites[eRoulette->var3C[0x1A + i]].anims + t + 2)->type; + gSprites[eRoulette->var3C[26 + i]].oam.tileNum = + gSprites[eRoulette->var3C[26 + i]].sheetTileStart + + (*gSprites[eRoulette->var3C[26 + i]].anims + t + 2)->type; } } } @@ -1052,9 +1052,9 @@ void sub_81184D8(void) s.size = gUnknown_083FA42C.size; s.tag = gUnknown_083FA42C.tag; LoadSpriteSheet(&s); - spriteid = CreateSprite(&gSpriteTemplate_83FA434, 0x74, 0x50, 0x51); + spriteid = CreateSprite(&gSpriteTemplate_83FA434, 116, 80, 81); gSprites[spriteid].data[0] = eRoulette->var24; - gSprites[spriteid].data[1] = 0x0; + gSprites[spriteid].data[1] = 0; gSprites[spriteid].animPaused = TRUE; gSprites[spriteid].affineAnimPaused = TRUE; gSprites[spriteid].coordOffsetEnabled = TRUE; @@ -1073,11 +1073,11 @@ void sub_8118554(struct Sprite *sprite) void sub_811857C(void) { u8 i; - for (i = 0x0; i < 0x6; i++) + for (i = 0; i < 6; i++) { u8 spriteid = - eRoulette->var3C[i] = CreateSprite(&gSpriteTemplate_83FA40C, 0x74, 0x50, 0x39 - i); - if (spriteid != 0x40) + eRoulette->var3C[i] = CreateSprite(&gSpriteTemplate_83FA40C, 116, 80, 57 - i); + if (spriteid != 64) { gSprites[eRoulette->var3C[i]].invisible = TRUE; gSprites[eRoulette->var3C[i]].coordOffsetEnabled = TRUE; @@ -1087,31 +1087,31 @@ void sub_811857C(void) void sub_81185E8(void) { - u8 t = eRoulette->var3C[0x0]; + u8 t = eRoulette->var3C[0]; u8 i; - for (i = 0x0; i < 0x6; i++) + for (i = 0; i < 6; i++) { u8 j; gSprites[t].invisible = TRUE; gSprites[t].callback = &SpriteCallbackDummy; - StartSpriteAnim(&gSprites[t], 0x0); - for (j = 0x0; j < 0x8; j++) - gSprites[t].data[j] = 0x0; + StartSpriteAnim(&gSprites[t], 0); + for (j = 0; j < 8; j++) + gSprites[t].data[j] = 0; t++; } } s16 sub_811866C(struct Sprite *sprite) { - if (eRoulette->var24 > sprite->data[0x3]) + if (eRoulette->var24 > sprite->data[3]) { - sprite->data[0x6] = 360 - eRoulette->var24 + sprite->data[0x3]; - if (sprite->data[0x6] > 359) - sprite->data[0x6] -=360; + sprite->data[6] = 360 - eRoulette->var24 + sprite->data[3]; + if (sprite->data[6] > 359) + sprite->data[6] -= 360; } else - sprite->data[0x6] = sprite->data[0x3] - eRoulette->var24; - return sprite->data[0x6]; + sprite->data[6] = sprite->data[3] - eRoulette->var24; + return sprite->data[6]; } u8 sub_81186B8(struct Sprite *sprite) @@ -1124,20 +1124,20 @@ s16 sub_81186E8(struct Sprite *sprite) { s16 t = sub_811866C(sprite) % 30; u16 z; - if (t == 0xE) + if (t == 14) { - z = 0x0; - return sprite->data[0x2] = z; + z = 0; + return sprite->data[2] = z; } - else if (t > 0xD) + else if (t > 13) { - z = (u16)(0x2B - t); - return sprite->data[0x2] = z; + z = (u16)(43 - t); + return sprite->data[2] = z; } else { - z = (u16)(0xE - t); - return sprite->data[0x2] = z; + z = (u16)(14 - t); + return sprite->data[2] = z; } } @@ -1151,57 +1151,57 @@ void sub_8118724(struct Sprite *sprite) else if (eRoulette->var88 < 0.0f) eRoulette->var88 += 360.0f; - sprite->data[0x3] = eRoulette->var88; + sprite->data[3] = eRoulette->var88; eRoulette->var98 += eRoulette->var9C; eRoulette->var94 += eRoulette->var98; - sprite->data[0x4] = eRoulette->var94; - sin = Sin2(sprite->data[0x3]); - cos = Cos2(sprite->data[0x3]); - sprite->pos2.x = sin * sprite->data[0x4] >> 0xC; - sprite->pos2.y = -cos * sprite->data[0x4] >> 0xC; + sprite->data[4] = eRoulette->var94; + sin = Sin2(sprite->data[3]); + cos = Cos2(sprite->data[3]); + sprite->pos2.x = sin * sprite->data[4] >> 12; + sprite->pos2.y = -cos * sprite->data[4] >> 12; if (IsSEPlaying()) { - m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF, sprite->pos2.x); - m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, sprite->pos2.x); + m4aMPlayPanpotControl(&gMPlay_SE1, 0xffff, sprite->pos2.x); + m4aMPlayPanpotControl(&gMPlay_SE2, 0xffff, sprite->pos2.x); } } void sub_8118834(struct Sprite *sprite) { s16 sin, cos; - sprite->data[0x3] = eRoulette->var24 + sprite->data[0x6]; - if (sprite->data[0x3] > 359) - sprite->data[0x3] -= 360; - sin = Sin2(sprite->data[0x3]); - cos = Cos2(sprite->data[0x3]); - sprite->pos2.x = sin * sprite->data[0x4] >> 0xC; - sprite->pos2.y = -cos * sprite->data[0x4] >> 0xC; + sprite->data[3] = eRoulette->var24 + sprite->data[6]; + if (sprite->data[3] > 359) + sprite->data[3] -= 360; + sin = Sin2(sprite->data[3]); + cos = Cos2(sprite->data[3]); + sprite->pos2.x = sin * sprite->data[4] >> 12; + sprite->pos2.y = -cos * sprite->data[4] >> 12; sprite->pos2.y += gSpriteCoordOffsetY; } void sub_811889C(struct Sprite *sprite) { sub_8118724(sprite); - sprite->data[0x2]++; - if ((u16)(sprite->data[0x4] + 0x84) > 0xD4) + sprite->data[2]++; + if ((u16)(sprite->data[4] + 132) > 212) sprite->invisible = TRUE; else sprite->invisible = FALSE; - if (!(sprite->data[0x2] < 30)) + if (!(sprite->data[2] < 30)) { - if (!sprite->data[0x0]) + if (!sprite->data[0]) { if (eRoulette->var94 <= eRoulette->varA0 - 2.0f) { - eRoulette->var7D = 0xFF; - eRoulette->var03_7 = 0x0; - StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); + eRoulette->var7D = 255; + eRoulette->var03_7 = 0; + StartSpriteAnim(sprite, sprite->animCmdIndex + 3); sub_81186B8(sprite); - sprite->data[0x4] = 30; + sprite->data[4] = 30; sub_811866C(sprite); - sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 0xF; + sprite->data[6] = (sprite->data[6] / 30) * 30 + 15; sprite->callback = &sub_8118834; - m4aSongNumStartOrChange(0x47); + m4aSongNumStartOrChange(SE_HASHI); eRoulette->var9C = eRoulette->var98 = 0.0f; eRoulette->var8C = -1.0f; } @@ -1210,15 +1210,15 @@ void sub_811889C(struct Sprite *sprite) { if (eRoulette->var94 >= eRoulette->varA0 - 2.0f) { - eRoulette->var7D = 0xFF; - eRoulette->var03_7 = 0x0; - StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); + eRoulette->var7D = 255; + eRoulette->var03_7 = 0; + StartSpriteAnim(sprite, sprite->animCmdIndex + 3); sub_81186B8(sprite); - sprite->data[0x4] = 30; + sprite->data[4] = 30; sub_811866C(sprite); - sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 0xF; + sprite->data[6] = (sprite->data[6] / 30) * 30 + 15; sprite->callback = &sub_8118834; - m4aSongNumStartOrChange(0x47); + m4aSongNumStartOrChange(SE_HASHI); eRoulette->var9C = eRoulette->var98 = 0.0f; eRoulette->var8C = -1.0f; } @@ -1231,14 +1231,14 @@ void sub_81189A8(struct Sprite *sprite) float f0, f1, f2; const struct StructgUnknown_083F8DF4 *p; sub_8118724(sprite); - switch (sprite->data[0x3]) + switch (sprite->data[3]) { case 0: - if (sprite->data[0x0] != 0x1) + if (sprite->data[0] != 1) { - f0 = ((float)sprite->data[0x7]); + f0 = ((float)sprite->data[7]); p = &gUnknown_083F8DF4[0]; - f1 = (f0 * ((float)(s32)p[eRoulette->var04_0].var01) + (float)((s32)p[eRoulette->var04_0].var02 - 0x1)); + f1 = (f0 * ((float)(s32)p[eRoulette->var04_0].var01) + (float)((s32)p[eRoulette->var04_0].var02 - 1)); f2 = (f0 / ((float)(s32)p[eRoulette->var04_0].var0C)); } else @@ -1247,11 +1247,11 @@ void sub_81189A8(struct Sprite *sprite) } break; case 180: - if (sprite->data[0x0] != 0x0) + if (sprite->data[0] != 0) { - f0 = ((float)sprite->data[0x7]); + f0 = ((float)sprite->data[7]); p = &gUnknown_083F8DF4[0]; - f1 = (f0 * ((float)(s32)p[eRoulette->var04_0].var01) + (float)((s32)p[eRoulette->var04_0].var02 - 0x1)); + f1 = (f0 * ((float)(s32)p[eRoulette->var04_0].var01) + (float)((s32)p[eRoulette->var04_0].var02 - 1)); f2 = -(f0 / ((float)(s32)p[eRoulette->var04_0].var0C)); } else @@ -1266,50 +1266,50 @@ void sub_81189A8(struct Sprite *sprite) eRoulette->var9C = -((f2 + f2) / f1 + (2.0f / (f1 * f1))); eRoulette->var8C = 0.0f; sprite->animPaused = FALSE; - sprite->animNum = 0x0; + sprite->animNum = 0; sprite->animBeginning = TRUE; sprite->animEnded = FALSE; sprite->callback = &sub_811889C; - sprite->data[0x2] = 0x0; + sprite->data[2] = 0; } void sub_8118B30(struct Sprite *sprite) { - sprite->pos2.y = (s32)(((float)sprite->data[0x2]) * 0.05f * ((float)sprite->data[0x2])) - 45; - sprite->data[0x2]++; - if (sprite->data[0x2] > 29 && sprite->pos2.y >= 0) + sprite->pos2.y = (s32)(((float)sprite->data[2]) * 0.05f * ((float)sprite->data[2])) - 45; + sprite->data[2]++; + if (sprite->data[2] > 29 && sprite->pos2.y >= 0) { - eRoulette->var7D = 0xFF; + eRoulette->var7D = 255; eRoulette->var03_7 = FALSE; - StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); + StartSpriteAnim(sprite, sprite->animCmdIndex + 3); sub_81186B8(sprite); - sprite->data[0x4] = 30; + sprite->data[4] = 30; sub_811866C(sprite); - sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 0xF; + sprite->data[6] = (sprite->data[6] / 30) * 30 + 15; sprite->callback = &sub_8118834; - m4aSongNumStartOrChange(0x47); + m4aSongNumStartOrChange(SE_HASHI); eRoulette->var03_6 = TRUE; } } void sub_8118BD8(struct Sprite *sprite) { - if (sprite->data[0x2]++ < 45) + if (sprite->data[2]++ < 45) { sprite->pos2.y--; - if (sprite->data[0x2] == 45) + if (sprite->data[2] == 45) { - if (gSprites[eRoulette->var3C[0x37]].animCmdIndex == 0x1) + if (gSprites[eRoulette->var3C[55]].animCmdIndex == 1) sprite->pos2.y++; } } else { - if (sprite->data[0x2] < sprite->data[0x7]) + if (sprite->data[2] < sprite->data[7]) { - if (gSprites[eRoulette->var3C[0x37]].animDelayCounter == 0x0) + if (gSprites[eRoulette->var3C[55]].animDelayCounter == 0) { - if (gSprites[eRoulette->var3C[0x37]].animCmdIndex == 0x1) + if (gSprites[eRoulette->var3C[55]].animCmdIndex == 1) sprite->pos2.y++; else sprite->pos2.y--; @@ -1318,12 +1318,12 @@ void sub_8118BD8(struct Sprite *sprite) else { sprite->animPaused = FALSE; - sprite->animNum = 0x1; + sprite->animNum = 1; sprite->animBeginning = TRUE; sprite->animEnded = FALSE; - sprite->data[0x2] = 0x0; + sprite->data[2] = 0; sprite->callback = &sub_8118B30; - m4aSongNumStart(0x3D); + m4aSongNumStart(SE_NAGERU); } } } @@ -1331,20 +1331,20 @@ void sub_8118BD8(struct Sprite *sprite) void sub_8118CAC(struct Sprite *sprite) { sub_8118724(sprite); - switch (sprite->data[0x3]) + switch (sprite->data[3]) { case 90: - if (sprite->data[0x0] != 0x1) + if (sprite->data[0] != 1) { sprite->callback = &sub_8118BD8; - sprite->data[0x2] = 0x0; + sprite->data[2] = 0; } break; case 270: - if (sprite->data[0x0] != 0x0) + if (sprite->data[0] != 0) { sprite->callback = &sub_8118BD8; - sprite->data[0x2] = 0x0; + sprite->data[2] = 0; } break; } @@ -1356,11 +1356,11 @@ void sub_8118CEC(struct Sprite *sprite) switch (eRoulette->var03_0) { default: - case 0x0: + case 0: sub_8119224(sprite); sprite->callback = &sub_81189A8; break; - case 0x1: + case 1: sub_81193D4(sprite); sprite->callback = &sub_8118CAC; break; @@ -1370,26 +1370,26 @@ void sub_8118CEC(struct Sprite *sprite) void sub_8118D2C(struct Sprite *sprite) { sub_8118724(sprite); - if (sprite->data[0x2]-- == 0x10) + if (sprite->data[2]-- == 16) eRoulette->var98 *= -1.0f; - if (sprite->data[0x2] == 0x0) + if (sprite->data[2] == 0) { - if (!sprite->data[0x0]) + if (!sprite->data[0]) { - eRoulette->var7D = 0xFF; - eRoulette->var03_7 = 0x0; - StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); + eRoulette->var7D = 255; + eRoulette->var03_7 = 0; + StartSpriteAnim(sprite, sprite->animCmdIndex + 3); sub_81186B8(sprite); - sprite->data[0x4] = 30; + sprite->data[4] = 30; sub_811866C(sprite); - sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 15; + sprite->data[6] = (sprite->data[6] / 30) * 30 + 15; sprite->callback = &sub_8118834; - m4aSongNumStartOrChange(0x47); + m4aSongNumStartOrChange(SE_HASHI); } else { sprite->animPaused = TRUE; - m4aSongNumStart(0x38); + m4aSongNumStart(SE_KON); sub_811952C(sprite); } } @@ -1402,7 +1402,7 @@ void debug_sub_812E698(struct Sprite *sprite) sub_8118724(sprite); sprite->data[2] = 0; sub_81186B8(sprite); - m4aSongNumStart(0x38); + m4aSongNumStart(SE_KON); if (Random() & 1) { eRoulette->var8C = 0; @@ -1425,17 +1425,17 @@ void debug_sub_812E698(struct Sprite *sprite) void sub_8118DE4(struct Sprite *sprite) { sub_8118724(sprite); - sprite->data[0x2] = 0x0; + sprite->data[2] = 0; sub_81186B8(sprite); if (!(gUnknown_083F8D90[eRoulette->var7E].var04 & eRoulette->var08)) { - eRoulette->var7D = 0xFF; - eRoulette->var03_7 = 0x0; - StartSpriteAnim(sprite, sprite->animCmdIndex + 0x3); + eRoulette->var7D = 255; + eRoulette->var03_7 = 0; + StartSpriteAnim(sprite, sprite->animCmdIndex + 3); sub_81186B8(sprite); - sprite->data[0x4] = 30; + sprite->data[4] = 30; sub_811866C(sprite); - sprite->data[0x6] = (sprite->data[0x6] / 30) * 30 + 15; + sprite->data[6] = (sprite->data[6] / 30) * 30 + 15; sprite->callback = &sub_8118834; m4aSongNumStartOrChange(SE_HASHI); } @@ -1444,11 +1444,11 @@ void sub_8118DE4(struct Sprite *sprite) u8 t; u32 z; m4aSongNumStart(SE_KON); - if ((z = (Random() & 0x1))) + if ((z = (Random() & 1))) { u32 o; eRoulette->var8C = 0.0f; - o = (eRoulette->var7E + 0x1) % 0xC; + o = (eRoulette->var7E + 1) % 12; t = o; eRoulette->var7F = o; } @@ -1458,24 +1458,24 @@ void sub_8118DE4(struct Sprite *sprite) float f = gUnknown_083F8DF4[eRoulette->var04_0].var1C; f * 2; }); // couldn't replicate loads - t = (eRoulette->var7E + 0xB) % 0xC; + t = (eRoulette->var7E + 11) % 12; eRoulette->var7F = eRoulette->var7E; } if (gUnknown_083F8D90[t].var04 & eRoulette->var08) { - sprite->data[0x0] = 0x1; - sprite->data[0x2] = gUnknown_083F8DF4[eRoulette->var04_0].var02; + sprite->data[0] = 1; + sprite->data[2] = gUnknown_083F8DF4[eRoulette->var04_0].var02; } else { - sprite->data[0x0] = gUnknown_083F8D90[t].var04 & eRoulette->var08; + sprite->data[0] = gUnknown_083F8D90[t].var04 & eRoulette->var08; if (eRoulette->var04_0) { - sprite->data[0x2] = gUnknown_083F8DF4[eRoulette->var04_0].var01; + sprite->data[2] = gUnknown_083F8DF4[eRoulette->var04_0].var01; } else { - sprite->data[0x2] = gUnknown_083F8DF4[eRoulette->var04_0].var02; + sprite->data[2] = gUnknown_083F8DF4[eRoulette->var04_0].var02; if (z) { eRoulette->var8C = 0.5f; @@ -1488,7 +1488,7 @@ void sub_8118DE4(struct Sprite *sprite) } eRoulette->var98 = 0.085f; sprite->callback = sub_8118D2C; - sprite->data[0x1] = 0x5; + sprite->data[1] = 5; } } @@ -1504,8 +1504,8 @@ void sub_8118F8C(struct Sprite *sprite) eRoulette->var90 = 0.0f; p = &gUnknown_083F8DF4[0]; eRoulette->var8C -= ((float)p[eRoulette->var04_0].var03) - / ((float)(s16)(p[eRoulette->var04_0].var04 + 0x1)); - sprite->data[0x1] = 0x4; + / ((float)(s16)(p[eRoulette->var04_0].var04 + 1)); + sprite->data[1] = 4; #if DEBUG if (unk_2039560 != 0) sprite->callback = debug_sub_812E698; @@ -1535,10 +1535,10 @@ void sub_8119088(struct Sprite *sprite) { eRoulette->var98 = - ( 4.0f / (float)(u16)eRoulette->var86); eRoulette->var90 = - (eRoulette->var8C / (float)(u16)eRoulette->var86); - sprite->animNum = 0x2; + sprite->animNum = 2; sprite->animBeginning = TRUE; sprite->animEnded = FALSE; - sprite->data[0x1] = 0x3; + sprite->data[1] = 3; sprite->callback = &sub_8118F8C; } } @@ -1548,21 +1548,21 @@ void sub_8119134(struct Sprite *sprite) sub_8118724(sprite); if (!(eRoulette->var94 > 60.0f)) { - m4aSongNumStartOrChange(0x5D); + m4aSongNumStartOrChange(SE_TAMAKORO_E); eRoulette->var98 = - ( 20.0f / (float)(u16)eRoulette->var84); eRoulette->var90 = ((1.0f - eRoulette->var8C) / (float)(u16)eRoulette->var84); - sprite->animNum = 0x1; + sprite->animNum = 1; sprite->animBeginning = TRUE; sprite->animEnded = FALSE; - sprite->data[0x1] = 0x2; + sprite->data[1] = 2; sprite->callback = &sub_8119088; } } void sub_81191F4(struct Sprite *sprite) { - sprite->data[0x1] = 0x1; - sprite->data[0x2] = 0x0; + sprite->data[1] = 1; + sprite->data[2] = 0; sub_8118724(sprite); sprite->invisible = FALSE; sprite->callback = &sub_8119134; @@ -1573,30 +1573,30 @@ void sub_8119224(struct Sprite *sprite) u16 t; u8 i; s16 s[2][2] = { - {0x74, 0x2C}, - {0x74, 0x70} + {116, 44}, + {116, 112} }; struct Roulette *p; - t = sprite->data[0x7] - 0x2; + t = sprite->data[7] - 2; p = eRoulette; - p->var3C[0x37] = CreateSprite(&gSpriteTemplate_83FA50C, 0x24, -0xC, 0x32); - p->var3C[0x38] = CreateSprite(&gSpriteTemplate_83FA5C0[0], s[sprite->data[0x0]][0x0], s[sprite->data[0x0]][0x1], 0x3B); - p->var3C[0x39] = CreateSprite(&gSpriteTemplate_83FA5C0[1], 0x24, 0x8C, 0x33); - gSprites[eRoulette->var3C[0x39]].oam.objMode = 0x1; - for (i = 0x0; i < 0x3; i++) - { - gSprites[eRoulette->var3C[0x37 + i]].coordOffsetEnabled = FALSE; - gSprites[eRoulette->var3C[0x37 + i]].invisible = TRUE; - gSprites[eRoulette->var3C[0x37 + i]].animPaused = TRUE; - gSprites[eRoulette->var3C[0x37 + i]].affineAnimPaused = TRUE; - gSprites[eRoulette->var3C[0x37 + i]].data[0x4] = eRoulette->var3C[0x37]; - gSprites[eRoulette->var3C[0x37 + i]].data[0x5] = eRoulette->var3C[0x38]; - gSprites[eRoulette->var3C[0x37 + i]].data[0x6] = eRoulette->var3C[0x39]; - gSprites[eRoulette->var3C[0x37 + i]].data[0x2] = t; - gSprites[eRoulette->var3C[0x37 + i]].data[0x3] = (sprite->data[0x7] * gUnknown_083F8DF4[eRoulette->var04_0].var01) + - (gUnknown_083F8DF4[eRoulette->var04_0].var02 + 0xFFFF); - } - gSprites[eRoulette->var3C[0x38]].coordOffsetEnabled = TRUE; + p->var3C[55] = CreateSprite(&gSpriteTemplate_83FA50C, 36, -12, 50); + p->var3C[56] = CreateSprite(&gSpriteTemplate_83FA5C0[0], s[sprite->data[0]][0], s[sprite->data[0]][1], 59); + p->var3C[57] = CreateSprite(&gSpriteTemplate_83FA5C0[1], 36, 140, 51); + gSprites[eRoulette->var3C[57]].oam.objMode = 1; + for (i = 0; i < 3; i++) + { + gSprites[eRoulette->var3C[55 + i]].coordOffsetEnabled = FALSE; + gSprites[eRoulette->var3C[55 + i]].invisible = TRUE; + gSprites[eRoulette->var3C[55 + i]].animPaused = TRUE; + gSprites[eRoulette->var3C[55 + i]].affineAnimPaused = TRUE; + gSprites[eRoulette->var3C[55 + i]].data[4] = eRoulette->var3C[55]; + gSprites[eRoulette->var3C[55 + i]].data[5] = eRoulette->var3C[56]; + gSprites[eRoulette->var3C[55 + i]].data[6] = eRoulette->var3C[57]; + gSprites[eRoulette->var3C[55 + i]].data[2] = t; + gSprites[eRoulette->var3C[55 + i]].data[3] = (sprite->data[7] * gUnknown_083F8DF4[eRoulette->var04_0].var01) + + (gUnknown_083F8DF4[eRoulette->var04_0].var02 + 0xffff); + } + gSprites[eRoulette->var3C[56]].coordOffsetEnabled = TRUE; eRoulette->var38 = sprite; } @@ -1609,20 +1609,20 @@ void sub_81193D4(struct Sprite *sprite) {-16, 84} }; const struct StructgUnknown_083F8DF4 *p; - t = sprite->data[0x7] - 0x2; - eRoulette->var3C[0x37] = CreateSprite(&gSpriteTemplate_83FA524, s[sprite->data[0x0]][0x0], s[sprite->data[0x0]][0x1], 0x32); - StartSpriteAnim(&gSprites[eRoulette->var3C[0x37]], sprite->data[0x0]); - eRoulette->var3C[0x38] = CreateSprite(&gSpriteTemplate_83FA5F0, s[sprite->data[0x0]][0x0], s[sprite->data[0x0]][0x1], 0x33); - gSprites[eRoulette->var3C[0x38]].affineAnimPaused = TRUE; - gSprites[eRoulette->var3C[0x38]].animPaused = TRUE; - sprite->data[0x7] = (t * (p = &gUnknown_083F8DF4[0])[eRoulette->var04_0].var01) + (p[eRoulette->var04_0].var10 + 0x2D); - for (; i < 0x2; i++) - { - gSprites[eRoulette->var3C[0x37 + i]].data[0x4] = eRoulette->var3C[0x37]; - gSprites[eRoulette->var3C[0x37 + i]].data[0x5] = eRoulette->var3C[0x38]; - gSprites[eRoulette->var3C[0x37 + i]].data[0x6] = eRoulette->var3C[0x38]; - gSprites[eRoulette->var3C[0x37 + i]].data[0x2] = t; - gSprites[eRoulette->var3C[0x37 + i]].data[0x3] = sprite->data[0x7] - 0x2D; + t = sprite->data[7] - 2; + eRoulette->var3C[55] = CreateSprite(&gSpriteTemplate_83FA524, s[sprite->data[0]][0], s[sprite->data[0]][1], 50); + StartSpriteAnim(&gSprites[eRoulette->var3C[55]], sprite->data[0]); + eRoulette->var3C[56] = CreateSprite(&gSpriteTemplate_83FA5F0, s[sprite->data[0]][0], s[sprite->data[0]][1], 51); + gSprites[eRoulette->var3C[56]].affineAnimPaused = TRUE; + gSprites[eRoulette->var3C[56]].animPaused = TRUE; + sprite->data[7] = (t * (p = &gUnknown_083F8DF4[0])[eRoulette->var04_0].var01) + (p[eRoulette->var04_0].var10 + 45); + for (; i < 2; i++) + { + gSprites[eRoulette->var3C[55 + i]].data[4] = eRoulette->var3C[55]; + gSprites[eRoulette->var3C[55 + i]].data[5] = eRoulette->var3C[56]; + gSprites[eRoulette->var3C[55 + i]].data[6] = eRoulette->var3C[56]; + gSprites[eRoulette->var3C[55 + i]].data[2] = t; + gSprites[eRoulette->var3C[55 + i]].data[3] = sprite->data[7] - 45; } eRoulette->var38 = sprite; } @@ -1633,20 +1633,20 @@ void sub_811952C(struct Sprite *sprite) u8 i; u8 z; u16 o; - u8 h = 0; // r10 (sp+0xc) + u8 h = 0; // r10 (sp+12) u8 j = 5; // r9 (r9) - u8 p = 0; // sp+0xc (sp+0x10) + u8 p = 0; // sp+12 (sp+16) u8 s[10] = {}; // sp+0 (sp+0) - u16 t = Random(); // sp+0x10 (r10) + u16 t = Random(); // sp+16 (r10) eRoulette->var7D = 1; eRoulette->var03_5 = TRUE; eRoulette->var03_6 = FALSE; - eRoulette->var7E = 0xFF; + eRoulette->var7E = 255; eRoulette->var88 = sprite->data[3]; eRoulette->var98 = 0.0f; eRoulette->var8C = gUnknown_083F8DF4[eRoulette->var04_0].var1C; - o = (eRoulette->var04_0 * 30 + 33) + (0x1 - eRoulette->var03_0) * 15; + o = (eRoulette->var04_0 * 30 + 33) + (1 - eRoulette->var03_0) * 15; for (i = 0; i < 4; i++) { if (o < sprite->data[3] && sprite->data[3] <= o + 90) @@ -1667,16 +1667,16 @@ void sub_811952C(struct Sprite *sprite) { if (sprite->data[0]) { - PlayCry1(SPECIES_TAILLOW, -0x3F); + PlayCry1(SPECIES_TAILLOW, -63); } else { - PlayCry1(SPECIES_TAILLOW, 0x3F); + PlayCry1(SPECIES_TAILLOW, 63); } } else { - PlayCry1(SPECIES_SHROOMISH, -0x3F); + PlayCry1(SPECIES_SHROOMISH, -63); } i = 2; z = (eRoulette->var7F + 2) % 12; @@ -1694,11 +1694,11 @@ void sub_811952C(struct Sprite *sprite) p = i; } } - z = (z + 1) % 0xC; + z = (z + 1) % 12; } if ((eRoulette->var03_0 + 1) & eRoulette->var02) { - if (p && (t & 0xFF) < 0xc0) + if (p && (t & 255) < 192) { sprite->data[7] = p; } @@ -1722,56 +1722,56 @@ void sub_811952C(struct Sprite *sprite) "\tmov r6, r9\n" "\tmov r5, r8\n" "\tpush {r5-r7}\n" - "\tsub sp, 0x14\n" + "\tsub sp, 20\n" "\tmov r8, r0\n" "\tmovs r0, 0\n" "\tmov r10, r0\n" - "\tmovs r1, 0x5\n" + "\tmovs r1, 5\n" "\tmov r9, r1\n" "\tmovs r2, 0\n" - "\tstr r2, [sp, 0xC]\n" + "\tstr r2, [sp, 12]\n" "\tmov r0, sp\n" "\tmovs r1, 0\n" - "\tmovs r2, 0xA\n" + "\tmovs r2, 10\n" "\tbl memset\n" "\tbl Random\n" "\tlsls r0, 16\n" "\tlsrs r0, 16\n" - "\tstr r0, [sp, 0x10]\n" + "\tstr r0, [sp, 16]\n" "\tldr r7, _08119610 @ =gSharedMem + 0x19000\n" "\tadds r0, r7, 0\n" - "\tadds r0, 0x7D\n" - "\tmovs r6, 0x1\n" + "\tadds r0, 125\n" + "\tmovs r6, 1\n" "\tstrb r6, [r0]\n" - "\tldrb r4, [r7, 0x3]\n" - "\tmovs r0, 0x20\n" + "\tldrb r4, [r7, 3]\n" + "\tmovs r0, 32\n" "\torrs r4, r0\n" - "\tmovs r0, 0x41\n" + "\tmovs r0, 65\n" "\tnegs r0, r0\n" "\tands r4, r0\n" - "\tstrb r4, [r7, 0x3]\n" + "\tstrb r4, [r7, 3]\n" "\tadds r1, r7, 0\n" - "\tadds r1, 0x7E\n" - "\tmovs r0, 0xFF\n" + "\tadds r1, 126\n" + "\tmovs r0, 255\n" "\tstrb r0, [r1]\n" "\tadds r5, r7, 0\n" - "\tadds r5, 0x88\n" + "\tadds r5, 136\n" "\tmov r3, r8\n" - "\tmovs r1, 0x34\n" + "\tmovs r1, 52\n" "\tldrsh r0, [r3, r1]\n" "\tbl __floatsisf\n" "\tstr r0, [r5]\n" "\tadds r1, r7, 0\n" - "\tadds r1, 0x98\n" - "\tldr r0, _08119614 @ =0x00000000\n" + "\tadds r1, 152\n" + "\tldr r0, _08119614 @ =0\n" "\tstr r0, [r1]\n" "\tadds r3, r7, 0\n" - "\tadds r3, 0x8C\n" + "\tadds r3, 140\n" "\tldr r2, _08119618 @ =gUnknown_083F8DF4\n" - "\tldrb r0, [r7, 0x4]\n" + "\tldrb r0, [r7, 4]\n" "\tlsls r0, 30\n" "\tlsrs r1, r0, 25\n" - "\tadds r2, 0x1C\n" + "\tadds r2, 28\n" "\tadds r1, r2\n" "\tldr r1, [r1]\n" "\tstr r1, [r3]\n" @@ -1779,7 +1779,7 @@ void sub_811952C(struct Sprite *sprite) "\tlsls r1, r0, 4\n" "\tsubs r1, r0\n" "\tlsls r1, 1\n" - "\tadds r1, 0x21\n" + "\tadds r1, 33\n" "\tlsls r4, 27\n" "\tlsrs r4, 27\n" "\tsubs r6, r4\n" @@ -1790,114 +1790,114 @@ void sub_811952C(struct Sprite *sprite) "\tlsrs r1, 16\n" "\tmov r5, r10\n" "\tmov r3, r8\n" - "\tmovs r0, 0x34\n" + "\tmovs r0, 52\n" "\tldrsh r2, [r3, r0]\n" "_081195C8:\n" "\tcmp r1, r2\n" "\tbge _081195D4\n" "\tadds r0, r1, 0\n" - "\tadds r0, 0x5A\n" + "\tadds r0, 90\n" "\tcmp r2, r0\n" "\tble _08119638\n" "_081195D4:\n" - "\tcmp r5, 0x3\n" + "\tcmp r5, 3\n" "\tbeq _0811961C\n" "\tadds r0, r1, 0\n" - "\tadds r0, 0x5A\n" + "\tadds r0, 90\n" "\tlsls r0, 16\n" "\tlsrs r1, r0, 16\n" - "\tadds r0, r5, 0x1\n" + "\tadds r0, r5, 1\n" "\tlsls r0, 24\n" "\tlsrs r5, r0, 24\n" - "\tcmp r5, 0x3\n" + "\tcmp r5, 3\n" "\tbls _081195C8\n" "_081195EA:\n" "\tldr r0, _08119610 @ =gSharedMem + 0x19000\n" - "\tldrb r1, [r0, 0x3]\n" - "\tmovs r0, 0x1F\n" + "\tldrb r1, [r0, 3]\n" + "\tmovs r0, 31\n" "\tands r0, r1\n" "\tcmp r0, 0\n" "\tbeq _08119664\n" "\tmov r1, r8\n" - "\tmovs r2, 0x2E\n" + "\tmovs r2, 46\n" "\tldrsh r0, [r1, r2]\n" "\tcmp r0, 0\n" "\tbeq _08119658\n" - "\tmovs r0, 0x98\n" + "\tmovs r0, 152\n" "\tlsls r0, 1\n" - "\tmovs r1, 0x3F\n" + "\tmovs r1, 63\n" "\tnegs r1, r1\n" "\tbl PlayCry1\n" "\tb _08119670\n" "\t.align 2, 0\n" "_08119610: .4byte gSharedMem + 0x19000\n" - "_08119614: .4byte 0x00000000\n" + "_08119614: .4byte 0\n" "_08119618: .4byte gUnknown_083F8DF4\n" "_0811961C:\n" - "\tmovs r0, 0x1\n" + "\tmovs r0, 1\n" "\tmov r3, r8\n" - "\tstrh r0, [r3, 0x2E]\n" + "\tstrh r0, [r3, 46]\n" "\tldr r2, _08119634 @ =gSharedMem + 0x19000\n" - "\tldrb r1, [r2, 0x3]\n" - "\tsubs r0, 0x21\n" + "\tldrb r1, [r2, 3]\n" + "\tsubs r0, 33\n" "\tands r0, r1\n" - "\tmovs r1, 0x1\n" + "\tmovs r1, 1\n" "\torrs r0, r1\n" - "\tstrb r0, [r2, 0x3]\n" + "\tstrb r0, [r2, 3]\n" "\tb _081195EA\n" "\t.align 2, 0\n" "_08119634: .4byte gSharedMem + 0x19000\n" "_08119638:\n" "\tlsrs r0, r5, 1\n" "\tmov r1, r8\n" - "\tstrh r0, [r1, 0x2E]\n" + "\tstrh r0, [r1, 46]\n" "\tldr r3, _08119654 @ =gSharedMem + 0x19000\n" - "\tmovs r1, 0x1\n" + "\tmovs r1, 1\n" "\tands r1, r5\n" - "\tldrb r2, [r3, 0x3]\n" - "\tmovs r0, 0x20\n" + "\tldrb r2, [r3, 3]\n" + "\tmovs r0, 32\n" "\tnegs r0, r0\n" "\tands r0, r2\n" "\torrs r0, r1\n" - "\tstrb r0, [r3, 0x3]\n" + "\tstrb r0, [r3, 3]\n" "\tb _081195EA\n" "\t.align 2, 0\n" "_08119654: .4byte gSharedMem + 0x19000\n" "_08119658:\n" - "\tmovs r0, 0x98\n" + "\tmovs r0, 152\n" "\tlsls r0, 1\n" - "\tmovs r1, 0x3F\n" + "\tmovs r1, 63\n" "\tbl PlayCry1\n" "\tb _08119670\n" "_08119664:\n" - "\tmovs r0, 0x99\n" + "\tmovs r0, 153\n" "\tlsls r0, 1\n" - "\tmovs r1, 0x3F\n" + "\tmovs r1, 63\n" "\tnegs r1, r1\n" "\tbl PlayCry1\n" "_08119670:\n" - "\tmovs r5, 0x2\n" + "\tmovs r5, 2\n" "\tldr r4, _081196A0 @ =gSharedMem + 0x19000\n" "\tadds r0, r4, 0\n" - "\tadds r0, 0x7F\n" + "\tadds r0, 127\n" "\tldrb r0, [r0]\n" - "\tadds r0, 0x2\n" - "\tmovs r1, 0xC\n" + "\tadds r0, 2\n" + "\tmovs r1, 12\n" "\tbl __modsi3\n" "\tlsls r0, 24\n" "\tlsrs r3, r0, 24\n" - "\tldrb r1, [r4, 0x3]\n" - "\tmovs r0, 0x1F\n" + "\tldrb r1, [r4, 3]\n" + "\tmovs r0, 31\n" "\tands r0, r1\n" - "\tcmp r0, 0x1\n" + "\tcmp r0, 1\n" "\tbne _081196A4\n" - "\tldrb r1, [r4, 0x4]\n" - "\tmovs r0, 0x3\n" + "\tldrb r1, [r4, 4]\n" + "\tmovs r0, 3\n" "\tands r0, r1\n" - "\tcmp r0, 0x1\n" + "\tcmp r0, 1\n" "\tbne _081196A4\n" "\tmov r0, r9\n" - "\tadds r0, 0x6\n" + "\tadds r0, 6\n" "\tb _081196A8\n" "\t.align 2, 0\n" "_081196A0: .4byte gSharedMem + 0x19000\n" @@ -1911,30 +1911,30 @@ void sub_811952C(struct Sprite *sprite) "\tcmp r5, r9\n" "\tbcs _0811970E\n" "\tldr r6, _08119734 @ =gSharedMem + 0x19000\n" - "\tldr r7, _08119738 @ =gUnknown_083F8C00 + 0xC\n" + "\tldr r7, _08119738 @ =gUnknown_083F8C00 + 12\n" "_081196B6:\n" "\tlsls r0, r3, 3\n" - "\tldr r1, _0811973C @ =gUnknown_083F8D90 + 0x4\n" + "\tldr r1, _0811973C @ =gUnknown_083F8D90 + 4\n" "\tadds r0, r1\n" - "\tldr r1, [r6, 0x8]\n" + "\tldr r1, [r6, 8]\n" "\tldr r2, [r0]\n" "\tands r1, r2\n" "\tcmp r1, 0\n" "\tbne _081196F8\n" "\tmov r0, r10\n" - "\tadds r1, r0, 0x1\n" + "\tadds r1, r0, 1\n" "\tlsls r1, 24\n" "\tlsrs r1, 24\n" "\tmov r10, r1\n" "\tadd r0, sp\n" "\tstrb r5, [r0]\n" - "\tldr r0, [sp, 0xC]\n" + "\tldr r0, [sp, 12]\n" "\tcmp r0, 0\n" "\tbne _081196F8\n" - "\tldrb r0, [r6, 0x1A]\n" + "\tldrb r0, [r6, 26]\n" "\tlsls r0, 28\n" "\tlsrs r0, 28\n" - "\tldr r1, _08119740 @ =gSharedMem + 0x1901B\n" + "\tldr r1, _08119740 @ =gSharedMem + 0x1901b\n" "\tadds r0, r1\n" "\tldrb r1, [r0]\n" "\tlsls r0, r1, 2\n" @@ -1945,65 +1945,65 @@ void sub_811952C(struct Sprite *sprite) "\tands r2, r0\n" "\tcmp r2, 0\n" "\tbeq _081196F8\n" - "\tstr r5, [sp, 0xC]\n" + "\tstr r5, [sp, 12]\n" "_081196F8:\n" - "\tadds r0, r3, 0x1\n" - "\tmovs r1, 0xC\n" + "\tadds r0, r3, 1\n" + "\tmovs r1, 12\n" "\tbl __modsi3\n" "\tlsls r0, 24\n" "\tlsrs r3, r0, 24\n" - "\tadds r0, r5, 0x1\n" + "\tadds r0, r5, 1\n" "\tlsls r0, 24\n" "\tlsrs r5, r0, 24\n" "\tcmp r5, r9\n" "\tbcc _081196B6\n" "_0811970E:\n" - "\tldrb r0, [r4, 0x3]\n" + "\tldrb r0, [r4, 3]\n" "\tlsls r0, 27\n" "\tlsrs r0, 27\n" - "\tadds r0, 0x1\n" - "\tldrb r1, [r4, 0x2]\n" + "\tadds r0, 1\n" + "\tldrb r1, [r4, 2]\n" "\tands r0, r1\n" "\tcmp r0, 0\n" "\tbeq _08119756\n" - "\tldr r2, [sp, 0xC]\n" + "\tldr r2, [sp, 12]\n" "\tcmp r2, 0\n" "\tbeq _08119744\n" - "\tmovs r0, 0xFF\n" - "\tldr r3, [sp, 0x10]\n" + "\tmovs r0, 255\n" + "\tldr r3, [sp, 16]\n" "\tands r0, r3\n" - "\tcmp r0, 0xBF\n" + "\tcmp r0, 191\n" "\tbhi _08119744\n" "\tmov r0, r8\n" - "\tstrh r2, [r0, 0x3C]\n" + "\tstrh r2, [r0, 60]\n" "\tb _08119766\n" "\t.align 2, 0\n" "_08119734: .4byte gSharedMem + 0x19000\n" - "_08119738: .4byte gUnknown_083F8C00 + 0xC\n" - "_0811973C: .4byte gUnknown_083F8D90 + 0x4\n" - "_08119740: .4byte gSharedMem + 0x1901B\n" + "_08119738: .4byte gUnknown_083F8C00 + 12\n" + "_0811973C: .4byte gUnknown_083F8D90 + 4\n" + "_08119740: .4byte gSharedMem + 0x1901b\n" "_08119744:\n" - "\tldr r0, [sp, 0x10]\n" + "\tldr r0, [sp, 16]\n" "\tmov r1, r10\n" "\tbl __modsi3\n" "\tadd r0, sp\n" "\tldrb r0, [r0]\n" "\tmov r1, r8\n" - "\tstrh r0, [r1, 0x3C]\n" + "\tstrh r0, [r1, 60]\n" "\tb _08119766\n" "_08119756:\n" - "\tldr r0, [sp, 0x10]\n" + "\tldr r0, [sp, 16]\n" "\tmov r1, r10\n" "\tbl __modsi3\n" "\tadd r0, sp\n" "\tldrb r0, [r0]\n" "\tmov r2, r8\n" - "\tstrh r0, [r2, 0x3C]\n" + "\tstrh r0, [r2, 60]\n" "_08119766:\n" "\tldr r3, _0811977C @ =sub_8118CEC\n" "\tmov r0, r8\n" - "\tstr r3, [r0, 0x1C]\n" - "\tadd sp, 0x14\n" + "\tstr r3, [r0, 28]\n" + "\tadd sp, 20\n" "\tpop {r3-r5}\n" "\tmov r8, r3\n" "\tmov r9, r4\n" @@ -2017,23 +2017,23 @@ void sub_811952C(struct Sprite *sprite) #endif const u16 gUnknown_083FA61E[] = { - 0x0907, - 0x0808, - 0x0709, - 0x060A, - 0x050B, - 0x040C, - 0x030D, - 0x020E, - 0x010F, - 0x0010 + BLDALPHA_BLEND( 7, 9), + BLDALPHA_BLEND( 8, 8), + BLDALPHA_BLEND( 9, 7), + BLDALPHA_BLEND(10, 6), + BLDALPHA_BLEND(11, 5), + BLDALPHA_BLEND(12, 4), + BLDALPHA_BLEND(13, 3), + BLDALPHA_BLEND(14, 2), + BLDALPHA_BLEND(15, 1), + BLDALPHA_BLEND(16, 0), }; void sub_8119780(struct Sprite *sprite) { if (sprite->data[1]++ >= sprite->data[3]) { - sprite->pos1.x -= 2; + sprite->pos1.x -= 2; if (sprite->pos1.x < -16) { if (!eRoulette->var03_6) @@ -2068,8 +2068,8 @@ void sub_81197D8(struct Sprite *sprite) } else { - gSpriteCoordOffsetY = 0x0; - gSprites[eRoulette->var3C[0x37]].animPaused = FALSE; + gSpriteCoordOffsetY = 0; + gSprites[eRoulette->var3C[55]].animPaused = FALSE; DestroySprite(sprite); } } @@ -2077,85 +2077,85 @@ void sub_81197D8(struct Sprite *sprite) void sub_8119898(struct Sprite *sprite) { float t; - sprite->data[0x1]++; - t = sprite->data[0x1]; + sprite->data[1]++; + t = sprite->data[1]; sprite->pos2.y = t * 0.039f * t; - eRoulette->var34 = gUnknown_083FA61E[(eRoulette->var01 - 0x1) / 2]; - if (eRoulette->var01 < 0x13) + eRoulette->var34 = gUnknown_083FA61E[(eRoulette->var01 - 1) / 2]; + if (eRoulette->var01 < 19) eRoulette->var01++; - if (sprite->data[0x1] > 0x3C) + if (sprite->data[1] > 60) { - sprite->data[0x1] = 0x0; + sprite->data[1] = 0; sprite->callback = &sub_8119780; - gSprites[sprite->data[0x6]].callback = &sub_8119780; - gSprites[sprite->data[0x6]].data[0x1] = -0x2; - gSprites[sprite->data[0x5]].invisible = FALSE; - gSprites[sprite->data[0x5]].callback = &sub_81197D8; - m4aSongNumStart(0xD6); + gSprites[sprite->data[6]].callback = &sub_8119780; + gSprites[sprite->data[6]].data[1] = -2; + gSprites[sprite->data[5]].invisible = FALSE; + gSprites[sprite->data[5]].callback = &sub_81197D8; + m4aSongNumStart(SE_W070); } } void sub_8119964(struct Sprite *sprite) { - if (sprite->data[0x7] == 0x0) + if (sprite->data[7] == 0) { register u32 t asm("r2"); u32 z ; - if (eRoulette->var38->data[0x0] == 0x0) + if (eRoulette->var38->data[0] == 0) { - t = eRoulette->var38->data[0x3]; + t = eRoulette->var38->data[3]; z = gUnknown_083F8DF4[eRoulette->var04_0].var08; } else { - t = eRoulette->var38->data[0x3]; + t = eRoulette->var38->data[3]; z = gUnknown_083F8DF4[eRoulette->var04_0].var08; - z += 0xB4; + z += 180; } if (t == z) { sprite->invisible = FALSE; - sprite->data[0x7]++; - m4aSongNumStart(0x2B); - eRoulette->var01 = 0x1; - eRoulette->var34 = gUnknown_083FA61E[0x0]; + sprite->data[7]++; + m4aSongNumStart(SE_RU_HYUU); + eRoulette->var01 = 1; + eRoulette->var34 = gUnknown_083FA61E[0]; } } else { u32 t, z; - eRoulette->var34 = gUnknown_083FA61E[(eRoulette->var01 - 0x1) / 2]; - if (eRoulette->var01 < 0x13) + eRoulette->var34 = gUnknown_083FA61E[(eRoulette->var01 - 1) / 2]; + if (eRoulette->var01 < 19) eRoulette->var01++; - if (eRoulette->var38->data[0x0] == 0x0) + if (eRoulette->var38->data[0] == 0) { - t = eRoulette->var38->data[0x3]; + t = eRoulette->var38->data[3]; z = gUnknown_083F8DF4[eRoulette->var04_0].var0A; } else { - t = eRoulette->var38->data[0x3]; + t = eRoulette->var38->data[3]; z = gUnknown_083F8DF4[eRoulette->var04_0].var0A ; - z += 0xB4; + z += 180; } if (t == z) { - gSprites[sprite->data[0x4]].callback = &sub_8119898; - gSprites[sprite->data[0x4]].invisible = FALSE; + gSprites[sprite->data[4]].callback = &sub_8119898; + gSprites[sprite->data[4]].invisible = FALSE; sprite->callback = &SpriteCallbackDummy; - sprite->data[0x7] = 0x0; + sprite->data[7] = 0; } } } void sub_8119A90(struct Sprite *sprite) { - sprite->invisible ^= 0x1; + sprite->invisible ^= 1; } void sub_8119AAC(struct Sprite *sprite) { - if (sprite->pos1.y > -0x10) + if (sprite->pos1.y > -16) { sprite->pos1.y--; } @@ -2164,30 +2164,30 @@ void sub_8119AAC(struct Sprite *sprite) sprite->callback = &SpriteCallbackDummy; sprite->invisible = TRUE; sprite->animPaused = TRUE; - m4aSongNumStop(0x5E); + m4aSongNumStop(SE_BASABASA); DestroySprite(sprite); - FreeOamMatrix(gSprites[eRoulette->var3C[0x38]].oam.matrixNum); - DestroySprite(&gSprites[eRoulette->var3C[0x38]]); + FreeOamMatrix(gSprites[eRoulette->var3C[56]].oam.matrixNum); + DestroySprite(&gSprites[eRoulette->var3C[56]]); } } void sub_8119B24(struct Sprite *sprite) { - if (sprite->data[0x1] >= 0x0) + if (sprite->data[1] >= 0) { - sprite->data[0x1]--; + sprite->data[1]--; sprite->pos1.y--; - if (sprite->data[0x1] == 0x0 && sprite->animCmdIndex == 0x1) + if (sprite->data[1] == 0 && sprite->animCmdIndex == 1) sprite->pos2.y++; } else { - if (sprite->data[0x3] >= 0x0) + if (sprite->data[3] >= 0) { - sprite->data[0x3]--; - if (sprite->animDelayCounter == 0x0) + sprite->data[3]--; + if (sprite->animDelayCounter == 0) { - if (sprite->animCmdIndex == 0x1) + if (sprite->animCmdIndex == 1) sprite->pos2.y++; else sprite->pos2.y--; @@ -2195,10 +2195,10 @@ void sub_8119B24(struct Sprite *sprite) } else { - m4aSongNumStart(0x2B); - StartSpriteAnim(sprite, eRoulette->var38->data[0x0] + 0x4); + m4aSongNumStart(SE_RU_HYUU); + StartSpriteAnim(sprite, eRoulette->var38->data[0] + 4); sprite->callback = &sub_8119AAC; - gSprites[sprite->data[0x6]].affineAnimPaused = FALSE; + gSprites[sprite->data[6]].affineAnimPaused = FALSE; } } } @@ -2216,32 +2216,32 @@ void sub_8119BCC(struct Sprite *sprite) {2, -2}, {2, -2} }; - if (sprite->data[0x1]-- > 0x7) + if (sprite->data[1]-- > 7) { - sprite->pos1.x += t[eRoulette->var38->data[0x0]] * 0x2; + sprite->pos1.x += t[eRoulette->var38->data[0]] * 2; if (IsSEPlaying()) { - s8 u = -((0x74 - sprite->pos1.x) / 0x2); - m4aMPlayPanpotControl(&gMPlay_SE1, 0xFFFF,u); - m4aMPlayPanpotControl(&gMPlay_SE2, 0xFFFF, u); + s8 u = -((116 - sprite->pos1.x) / 2); + m4aMPlayPanpotControl(&gMPlay_SE1, 0xffff, u); + m4aMPlayPanpotControl(&gMPlay_SE2, 0xffff, u); } } else { - if (sprite->data[0x1] >= 0x0) + if (sprite->data[1] >= 0) { - sprite->pos1.x += t[eRoulette->var38->data[0x0]] * z[0x7 - sprite->data[0x1]][0x0]; - sprite->pos1.y += z[0x7 - sprite->data[0x1]][0x1]; + sprite->pos1.x += t[eRoulette->var38->data[0]] * z[7 - sprite->data[1]][0]; + sprite->pos1.y += z[7 - sprite->data[1]][1]; } else { - m4aSongNumStartOrChange(0x5E); - if (eRoulette->var38->data[0x0] == 0x0) - PlayCry1(SPECIES_TAILLOW, 0x3F); + m4aSongNumStartOrChange(SE_BASABASA); + if (eRoulette->var38->data[0] == 0) + PlayCry1(SPECIES_TAILLOW, 63); else - PlayCry1(SPECIES_TAILLOW, -0x3F); - StartSpriteAnim(sprite, eRoulette->var38->data[0x0] + 0x2); - sprite->data[0x1] = 45; + PlayCry1(SPECIES_TAILLOW, -63); + StartSpriteAnim(sprite, eRoulette->var38->data[0] + 2); + sprite->data[1] = 45; sprite->callback = &sub_8119B24; } } @@ -2249,11 +2249,11 @@ void sub_8119BCC(struct Sprite *sprite) void sub_8119D08(struct Sprite *sprite) { - s8 t[0x2] = {-1, 1}; //sign - if (sprite->data[0x1]-- >= 0x0) + s8 t[2] = {-1, 1}; //sign + if (sprite->data[1]-- >= 0) { - sprite->pos1.x += t[eRoulette->var38->data[0x0]] * 0x2; - gSprites[sprite->data[0x6]].invisible ^= 0x1; + sprite->pos1.x += t[eRoulette->var38->data[0]] * 2; + gSprites[sprite->data[6]].invisible ^= 1; } else { @@ -2263,12 +2263,12 @@ void sub_8119D08(struct Sprite *sprite) void sub_8119D80(struct Sprite *sprite) { - if (eRoulette->var38->data[0x0] == 0x0) + if (eRoulette->var38->data[0] == 0) { - if (eRoulette->var38->data[0x3] == gUnknown_083F8DF4[eRoulette->var04_0].var12 + 90) + if (eRoulette->var38->data[3] == gUnknown_083F8DF4[eRoulette->var04_0].var12 + 90) { - gSprites[sprite->data[0x6]].data[0x1] = 0x34; - gSprites[sprite->data[0x4]].data[0x1] = 0x34; + gSprites[sprite->data[6]].data[1] = 52; + gSprites[sprite->data[4]].data[1] = 52; } else { @@ -2277,17 +2277,17 @@ void sub_8119D80(struct Sprite *sprite) } else { - if (eRoulette->var38->data[0x3] == gUnknown_083F8DF4[eRoulette->var04_0].var14 + 270) + if (eRoulette->var38->data[3] == gUnknown_083F8DF4[eRoulette->var04_0].var14 + 270) { - gSprites[sprite->data[0x6]].data[0x1] = 0x2E; - gSprites[sprite->data[0x4]].data[0x1] = 0x2E; + gSprites[sprite->data[6]].data[1] = 46; + gSprites[sprite->data[4]].data[1] = 46; } else { return; } } - gSprites[sprite->data[0x6]].callback = &sub_8119D08; - gSprites[sprite->data[0x4]].callback = &sub_8119BCC; - m4aSongNumStart(0x2B); + gSprites[sprite->data[6]].callback = &sub_8119D08; + gSprites[sprite->data[4]].callback = &sub_8119BCC; + m4aSongNumStart(SE_RU_HYUU); } |