diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 15:29:45 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 15:29:45 -0400 |
| commit | 2c1048f683f06ee0753ae43ab2c2225be7ae0a56 (patch) | |
| tree | 191765eae6d9b9f5610295471270666b88fe7c9b | |
| parent | d172b9ed71485e45f4896beb637ab536e10cc138 (diff) | |
Merge roulette ewram pointers
| -rw-r--r-- | include/ewram.h | 11 | ||||
| -rw-r--r-- | src/roulette.c | 12 |
2 files changed, 11 insertions, 12 deletions
diff --git a/include/ewram.h b/include/ewram.h index 24d7d9033..0a66c15d9 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -167,13 +167,12 @@ extern u8 gSharedMem[]; #define eBerryBlenderData (struct BerryBlenderData*)(&gSharedMem[0x18000]) #define eEggHatchData (struct EggHatchData*)(&gSharedMem[0x18000]) #define pssData (*(struct PokemonSummaryScreenStruct *)(gSharedMem + 0x18000)) -#define ewram18800 (&gSharedMem[0x18800]) -#define ewram189a0 ((u16 *)(gSharedMem + 0x189A0)) -#define ewram18a20 ((u16 *)(gSharedMem + 0x18A20)) -#define ewram18a32 ((u16 *)(gSharedMem + 0x18A32)) -#define ewram18a80 ((u16 *)(gSharedMem + 0x18a80)) -#define eCableCar2 ((struct CableCarEwramStruct2 *)(gSharedMem + 0x19000)) + +// roulette.c +#define ewram18800 ((u16 *)(gSharedMem + 0x18800)) #define eRoulette ((struct Roulette *)(gSharedMem + 0x19000)) + +#define eCableCar2 ((struct CableCarEwramStruct2 *)(gSharedMem + 0x19000)) #define ewram1A000 (&gSharedMem[0x1A000]) #define ePartyMenu2 (*(struct Unk201B000 *)(gSharedMem + 0x1B000)) #define gPartyMenu (*(struct PartyMenu *)(gSharedMem + 0x1C000)) diff --git a/src/roulette.c b/src/roulette.c index d261e7e41..34f0fa7b6 100644 --- a/src/roulette.c +++ b/src/roulette.c @@ -602,20 +602,20 @@ void sub_81157D0(u8 r0) 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); + sub_8124E2C(&gBGTilemapBuffers[2][0], ewram18800 + 0x119, temp0, 7, 3, 13); break; 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); + sub_8124E2C(&gBGTilemapBuffers[2][0], ewram18800 + 0x140, 14, temp1, 16, 3); break; default: 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); + sub_8124E2C(&gBGTilemapBuffers[2][0], ewram18800 + 0x110, temp0, temp1, 3, 3); break; } } @@ -1502,9 +1502,9 @@ void sub_8117158(u8 r0) for (z = 0; z < 3; z++) { 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]; + gBGTilemapBuffers[1][var1 + var2 + 0] = ewram18800[0xD0 + (var0 + z) * 3 + 0]; + gBGTilemapBuffers[1][var1 + var2 + 1] = ewram18800[0xD0 + (var0 + z) * 3 + 1]; + gBGTilemapBuffers[1][var1 + var2 + 2] = ewram18800[0xD0 + (var0 + z) * 3 + 2]; } } } |