diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-31 00:36:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 00:36:20 -0400 |
| commit | 5d7c438efcd341c777c866a7eb3f8401f8548dc5 (patch) | |
| tree | ea4c848c8239b51efff64c5bc4fccc9517c2722d /src/battle_interface.c | |
| parent | e8b6b4b65e3b53f5fcf83035b9f848c5ef6378bd (diff) | |
| parent | 8c6e89e994b312b3c6d36bcda8636343f80e4801 (diff) | |
Merge pull request #1391 from GriffinRichards/objvram
Add some uses of OBJ_VRAM/VRAM_SIZE
Diffstat (limited to 'src/battle_interface.c')
| -rw-r--r-- | src/battle_interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_interface.c b/src/battle_interface.c index df123630c..cccc0b971 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1935,7 +1935,7 @@ static void UpdateNickInHealthbox(u8 healthboxSpriteId, struct Pokemon *mon) if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER) { - TextIntoHealthboxObject((void*)(VRAM + 0x10040 + spriteTileNum), windowTileData, 6); + TextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x40 + spriteTileNum), windowTileData, 6); ptr = (void*)(OBJ_VRAM0); if (!IsDoubleBattle()) ptr += spriteTileNum + 0x800; @@ -1945,7 +1945,7 @@ static void UpdateNickInHealthbox(u8 healthboxSpriteId, struct Pokemon *mon) } else { - TextIntoHealthboxObject((void*)(VRAM + 0x10020 + spriteTileNum), windowTileData, 7); + TextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x20 + spriteTileNum), windowTileData, 7); } RemoveWindowOnHealthbox(windowId); |