diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 792c08888..382848fb9 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -711,7 +711,7 @@ This is a bug with `ItemAttributes` in [data/items/attributes.asm](/data/items/a ## Daisy's grooming doesn't always increase happiness -This is a bug with `HaircutOrGrooming` in [engine/events/special.asm](/engine/events/special.asm): +This is a bug with `HaircutOrGrooming` in [engine/events/specials_2.asm](/engine/events/specials_2.asm): ```asm ; Bug: Subtracting $ff from $ff fails to set c. diff --git a/engine/specials.asm b/engine/events/specials.asm similarity index 100% rename from engine/specials.asm rename to engine/events/specials.asm diff --git a/engine/events/special.asm b/engine/events/specials_2.asm similarity index 100% rename from engine/events/special.asm rename to engine/events/specials_2.asm diff --git a/main.asm b/main.asm index 724a55492..7a5ddca9d 100644 --- a/main.asm +++ b/main.asm @@ -14,7 +14,7 @@ INCLUDE "engine/math.asm" INCLUDE "data/items/attributes.asm" INCLUDE "engine/npc_movement.asm" INCLUDE "engine/events/happiness_egg.asm" -INCLUDE "engine/events/special.asm" +INCLUDE "engine/events/specials_2.asm" SECTION "bank2", ROMX @@ -28,7 +28,7 @@ INCLUDE "engine/color.asm" SECTION "bank3", ROMX INCLUDE "engine/routines/checktime.asm" -INCLUDE "engine/specials.asm" +INCLUDE "engine/events/specials.asm" INCLUDE "engine/printnum.asm" INCLUDE "engine/health.asm" INCLUDE "engine/events/overworld.asm"