Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes legendary backgrounds #3464

Merged
merged 3 commits into from
Oct 25, 2023
Merged

Fixes legendary backgrounds #3464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd9fde3
Fixes legendary backgrounds
AlexOn1ine Oct 25, 2023
d8cb8f3
missed one
AlexOn1ine Oct 25, 2023
c73f208
forgot break
AlexOn1ine Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions data/scripts/debug.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,28 +155,28 @@ DebugScript_HatchAnEgg_Text_EmptyParty::

DebugScript_HatchAnEgg_Text_NotAnEgg::
.string "That's not a Pokémon Egg.$"

DebugScript_ZeroDaycareMons::
msgbox DebugText_DaycareNoPokemon, MSGBOX_DEFAULT
releaseall
end

DebugScript_OneDaycareMons::
msgbox DebugText_DaycareOnePokemon, MSGBOX_DEFAULT
releaseall
end

DebugScript_DaycareMonsNotCompatible::
msgbox DebugText_DaycarePokemonNotCompatible, MSGBOX_DEFAULT
releaseall
end

DebugText_DaycareNoPokemon:
.string "You have no Pokémon at Daycare.$"

DebugText_DaycareOnePokemon:
.string "You have only one Pokémon at Daycare.$"

DebugText_DaycarePokemonNotCompatible:
.string "Your Pokémon at Daycare can't\nhave babies together!$"

Expand Down
9 changes: 9 additions & 0 deletions src/battle_bg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,6 +777,11 @@ void DrawMainBattleBackground(void)
LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void*)(BG_SCREEN_ADDR(26)));
LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, 0x20, 0x60);
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
Expand Down Expand Up @@ -1174,6 +1179,10 @@ void DrawBattleEntryBackground(void)
LZDecompressVram(gBattleTerrainAnimTiles_Rayquaza, (void*)(BG_CHAR_ADDR(1)));
LZDecompressVram(gBattleTerrainAnimTilemap_Rayquaza, (void*)(BG_SCREEN_ADDR(28)));
break;
default:
LZDecompressVram(sBattleTerrainTable[gBattleTerrain].entryTileset, (void *)(BG_CHAR_ADDR(1)));
LZDecompressVram(sBattleTerrainTable[gBattleTerrain].entryTilemap, (void *)(BG_SCREEN_ADDR(28)));
break;
}
}
else
Expand Down
Loading