diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2021-07-03 16:57:44 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2021-07-03 16:57:44 -0400 |
| commit | 85beaf7f82b9848cf21fe40b86a51027cd5fbbc1 (patch) | |
| tree | e4c20560416857c59dcaa0a0bf1e8682b49f6707 /src/battle_bg.c | |
| parent | 72fc4b6f844a47ac4711c421cc4e06e0197dc7c5 (diff) | |
| parent | bbf39b8560c752d6b7e94bf1fea9ac60dc79c902 (diff) | |
Merge branch 'master' of https://github.com/pret/pokefirered into cast_test
Diffstat (limited to 'src/battle_bg.c')
| -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; |