Skip to content

Commit

Permalink
missed one
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexOn1ine committed Oct 25, 2023
1 parent bd9fde3 commit d587235
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
13 changes: 7 additions & 6 deletions data/scripts/debug.inc
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ Debug_BoxFilledMessage_Text:
.string "Storage boxes filled!$"

Debug_Script_1::
goto NavelRock_Top_EventScript_HoOh
end

Debug_Script_2::
Expand Down Expand Up @@ -155,28 +156,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
1 change: 1 addition & 0 deletions include/event_scripts.h
Original file line number Diff line number Diff line change
Expand Up @@ -611,5 +611,6 @@ extern const u8 EventScript_TradeCenter_Chair1[];
extern const u8 EventScript_TradeCenter_Chair0[];
extern const u8 EventScript_ConfirmLeaveCableClubRoom[];
extern const u8 EventScript_TerminateLink[];
extern const u8 NavelRock_Top_EventScript_HoOh[];

#endif // GUARD_EVENT_SCRIPTS_H
3 changes: 3 additions & 0 deletions src/battle_bg.c
Original file line number Diff line number Diff line change
Expand Up @@ -1179,6 +1179,9 @@ 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)));
}
}
else
Expand Down

0 comments on commit d587235

Please sign in to comment.