diff options
| author | SnorlaxMonster <snorlaxmonster+github@gmail.com> | 2021-06-21 21:56:01 +1000 |
|---|---|---|
| committer | SnorlaxMonster <snorlaxmonster+github@gmail.com> | 2021-06-21 21:56:01 +1000 |
| commit | 337caefaa9a505dab9c4430219a48fb302f28dec (patch) | |
| tree | e5a95d9182fc00e7afc0a02c8144e74ab2796fe0 /src | |
| parent | 4c26116d1ae8cebf2b126ed5da1a85127590cd05 (diff) | |
Use plain terrain macro where appropriate
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_bg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_bg.c b/src/battle_bg.c index c30f10643..f5b8d7921 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -612,13 +612,13 @@ static u8 GetBattleTerrainByMapScene(u8 mapBattleScene) if (mapBattleScene == sMapBattleSceneMapping[i].mapScene) return sMapBattleSceneMapping[i].battleTerrain; } - return 9; + return BATTLE_TERRAIN_PLAIN; } static void LoadBattleTerrainGfx(u16 terrain) { if (terrain >= NELEMS(sBattleTerrainTable)) - terrain = 9; + terrain = BATTLE_TERRAIN_PLAIN; // Copy to bg3 LZDecompressVram(sBattleTerrainTable[terrain].tileset, (void *)BG_CHAR_ADDR(2)); LZDecompressVram(sBattleTerrainTable[terrain].tilemap, (void *)BG_SCREEN_ADDR(26)); @@ -628,7 +628,7 @@ static void LoadBattleTerrainGfx(u16 terrain) static void LoadBattleTerrainEntryGfx(u16 terrain) { if (terrain >= NELEMS(sBattleTerrainTable)) - terrain = 9; + terrain = BATTLE_TERRAIN_PLAIN; // Copy to bg1 LZDecompressVram(sBattleTerrainTable[terrain].entryTileset, (void *)BG_CHAR_ADDR(1)); LZDecompressVram(sBattleTerrainTable[terrain].entryTilemap, (void *)BG_SCREEN_ADDR(28)); @@ -636,8 +636,8 @@ static void LoadBattleTerrainEntryGfx(u16 terrain) UNUSED void GetBattleTerrainGfxPtrs(u8 terrain, const u32 **tilesPtr, const u32 **mapPtr, const u32 **palPtr) { - if (terrain > 9) - terrain = 9; + if (terrain > BATTLE_TERRAIN_PLAIN) + terrain = BATTLE_TERRAIN_PLAIN; *tilesPtr = sBattleTerrainTable[terrain].tileset; *mapPtr = sBattleTerrainTable[terrain].tilemap; *palPtr = sBattleTerrainTable[terrain].palette; |