Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes legendary backgrounds (#3464)

Browse Source 
* Fixes legendary backgrounds

* missed one

* forgot break
This commit is contained in:
Alex 2023-10-25 17:06:25 +02:00 committed by GitHub
parent 7a9221e7b9
commit cb38f3bee6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/scripts/debug.inc
View File

@ -155,28 +155,28 @@ DebugScript_HatchAnEgg_Text_EmptyParty::
DebugScript_HatchAnEgg_Text_NotAnEgg:: DebugScript_HatchAnEgg_Text_NotAnEgg::
.string "That's not a Pokémon Egg.$" .string "That's not a Pokémon Egg.$"
DebugScript_ZeroDaycareMons:: DebugScript_ZeroDaycareMons::
msgbox DebugText_DaycareNoPokemon, MSGBOX_DEFAULT msgbox DebugText_DaycareNoPokemon, MSGBOX_DEFAULT
releaseall releaseall
end end
DebugScript_OneDaycareMons:: DebugScript_OneDaycareMons::
msgbox DebugText_DaycareOnePokemon, MSGBOX_DEFAULT msgbox DebugText_DaycareOnePokemon, MSGBOX_DEFAULT
releaseall releaseall
end end
DebugScript_DaycareMonsNotCompatible:: DebugScript_DaycareMonsNotCompatible::
msgbox DebugText_DaycarePokemonNotCompatible, MSGBOX_DEFAULT msgbox DebugText_DaycarePokemonNotCompatible, MSGBOX_DEFAULT
releaseall releaseall
end end
DebugText_DaycareNoPokemon: DebugText_DaycareNoPokemon:
.string "You have no Pokémon at Daycare.$" .string "You have no Pokémon at Daycare.$"
DebugText_DaycareOnePokemon: DebugText_DaycareOnePokemon:
.string "You have only one Pokémon at Daycare.$" .string "You have only one Pokémon at Daycare.$"
DebugText_DaycarePokemonNotCompatible: DebugText_DaycarePokemonNotCompatible:
.string "Your Pokémon at Daycare can't\nhave babies together!$" .string "Your Pokémon at Daycare can't\nhave babies together!$"

9
src/battle_bg.c
View File

@ -777,6 +777,11 @@ void DrawMainBattleBackground(void)
LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void*)(BG_SCREEN_ADDR(26))); LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void*)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, 0x20, 0x60); LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, 0x20, 0x60);
break; break;
default:
LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tileset, (void *)(BG_CHAR_ADDR(2)));
LZDecompressVram(sBattleTerrainTable[gBattleTerrain].tilemap, (void *)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(sBattleTerrainTable[gBattleTerrain].palette, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);
break;
} }
} }
else else
@ -1174,6 +1179,10 @@ void DrawBattleEntryBackground(void)
LZDecompressVram(gBattleTerrainAnimTiles_Rayquaza, (void*)(BG_CHAR_ADDR(1))); LZDecompressVram(gBattleTerrainAnimTiles_Rayquaza, (void*)(BG_CHAR_ADDR(1)));
LZDecompressVram(gBattleTerrainAnimTilemap_Rayquaza, (void*)(BG_SCREEN_ADDR(28))); LZDecompressVram(gBattleTerrainAnimTilemap_Rayquaza, (void*)(BG_SCREEN_ADDR(28)));
break; break;
default:
LZDecompressVram(sBattleTerrainTable[gBattleTerrain].entryTileset, (void *)(BG_CHAR_ADDR(1)));
LZDecompressVram(sBattleTerrainTable[gBattleTerrain].entryTilemap, (void *)(BG_SCREEN_ADDR(28)));
break;
} }
} }
else else