From a1498e63e27d651ef85fdfc7bcc255d67fb04d57 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 17 Jun 2022 23:27:53 -0400 Subject: [PATCH] Rename search.asm and search2.asm --- docs/bugs_and_glitches.md | 4 ++-- engine/pokemon/{search.asm => search_owned.asm} | 0 engine/pokemon/{search2.asm => search_party.asm} | 0 main.asm | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename engine/pokemon/{search.asm => search_owned.asm} (100%) rename engine/pokemon/{search2.asm => search_party.asm} (100%) diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 405b39f62..21c0e28e4 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -2354,7 +2354,7 @@ CopyPokemonName_Buffer1_Buffer3: This bug can allow you to talk to Eusine in Celadon City and encounter Ho-Oh with only traded legendary beasts. -**Fix:** Edit `CheckOwnMon` in [engine/pokemon/search.asm](https://github.com/pret/pokecrystal/blob/master/engine/pokemon/search.asm): +**Fix:** Edit `CheckOwnMon` in [engine/pokemon/search_owned.asm](https://github.com/pret/pokecrystal/blob/master/engine/pokemon/search_owned.asm): ```diff ; check OT @@ -2386,7 +2386,7 @@ This bug can allow you to talk to Eusine in Celadon City and encounter Ho-Oh wit This bug can prevent you from talking to Eusine in Celadon City or encountering Ho-Oh when a caught legendary beast is in the Day-Care. -**Fix:** Edit `CheckOwnMonAnywhere` in [engine/pokemon/search.asm](https://github.com/pret/pokecrystal/blob/master/engine/pokemon/search.asm): +**Fix:** Edit `CheckOwnMonAnywhere` in [engine/pokemon/search_owned.asm](https://github.com/pret/pokecrystal/blob/master/engine/pokemon/search_owned.asm): ```diff ; If there are no monsters in the party, diff --git a/engine/pokemon/search.asm b/engine/pokemon/search_owned.asm similarity index 100% rename from engine/pokemon/search.asm rename to engine/pokemon/search_owned.asm diff --git a/engine/pokemon/search2.asm b/engine/pokemon/search_party.asm similarity index 100% rename from engine/pokemon/search2.asm rename to engine/pokemon/search_party.asm diff --git a/main.asm b/main.asm index b1041b4de..4a7ec6bc7 100644 --- a/main.asm +++ b/main.asm @@ -188,7 +188,7 @@ INCLUDE "engine/gfx/crystal_layouts.asm" INCLUDE "engine/events/celebi.asm" INCLUDE "engine/menus/main_menu.asm" INCLUDE "mobile/mobile_menu.asm" -INCLUDE "engine/pokemon/search.asm" +INCLUDE "engine/pokemon/search_owned.asm" INCLUDE "mobile/mobile_12_2.asm" INCLUDE "engine/events/buena_menu.asm" @@ -217,7 +217,7 @@ INCLUDE "engine/gfx/trademon_frontpic.asm" INCLUDE "engine/events/pokerus/check_pokerus.asm" INCLUDE "engine/events/lucky_number.asm" INCLUDE "engine/pokemon/caught_data.asm" -INCLUDE "engine/pokemon/search2.asm" +INCLUDE "engine/pokemon/search_party.asm" INCLUDE "engine/pokemon/stats_screen.asm" INCLUDE "engine/events/catch_tutorial.asm" INCLUDE "engine/movie/evolution_animation.asm"