diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-18 01:19:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-18 01:19:16 -0500 |
| commit | 0a7b97ee0605e48a34c7af193a26d770c6d23d29 (patch) | |
| tree | 1170647551cd0b2d79c0b1543a09198aeb10612a /src/field_effect.c | |
| parent | 5695617d64335474ead8a7e25c539daebcc55fa5 (diff) | |
| parent | 367c7b5f89e9433b7e11af645afbaaa6f4002930 (diff) | |
Merge branch 'master' into multiplayer-stuff
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index badf57b16..e7c0b39b9 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2953,15 +2953,15 @@ u8 sub_80B8F98(void) { for (j = 12; j < 18; j++) { - ((u16*)(VRAM + 0xF800))[i * 32 + j] = 0xBFF4 + i * 6 + j + 1; + ((u16*)(BG_SCREEN_ADDR(31)))[i * 32 + j] = 0xBFF4 + i * 6 + j + 1; } } for (k = 0; k < 90; k++) { for (i = 0; i < 8; i++) { - *(u16*)(VRAM + 0x8000 + (k + 1) * 32 + i * 4) = (gUnknown_0855B630[k * 32 + i * 4 + 1] << 8) + gUnknown_0855B630[k * 32 + i * 4]; - *(u16*)(VRAM + 0x8000 + (k + 1) * 32 + i * 4 + 2) = (gUnknown_0855B630[k * 32 + i * 4 + 3] << 8) + gUnknown_0855B630[k * 32 + i * 4 + 2]; + *(u16*)(BG_CHAR_ADDR(2) + (k + 1) * 32 + i * 4) = (gUnknown_0855B630[k * 32 + i * 4 + 1] << 8) + gUnknown_0855B630[k * 32 + i * 4]; + *(u16*)(BG_CHAR_ADDR(2) + (k + 1) * 32 + i * 4 + 2) = (gUnknown_0855B630[k * 32 + i * 4 + 3] << 8) + gUnknown_0855B630[k * 32 + i * 4 + 2]; } } return spriteId; |