diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-04 12:03:31 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-04 12:03:31 -0500 |
| commit | 6c405e38598309bd090bb325a45f135e08b47a6f (patch) | |
| tree | 5d228260664a2b82fd69e544b6634019038afff5 | |
| parent | 885080f21354f17ba7a45628a7c262d54dc346b9 (diff) | |
Keep specials files together
| -rw-r--r-- | docs/bugs_and_glitches.md | 2 | ||||
| -rw-r--r-- | engine/events/specials.asm (renamed from engine/specials.asm) | 0 | ||||
| -rwxr-xr-x | engine/events/specials_2.asm (renamed from engine/events/special.asm) | 0 | ||||
| -rw-r--r-- | main.asm | 4 |
4 files changed, 3 insertions, 3 deletions
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 index 3904f4a31..3904f4a31 100644 --- a/engine/specials.asm +++ b/engine/events/specials.asm diff --git a/engine/events/special.asm b/engine/events/specials_2.asm index ab1f35515..ab1f35515 100755 --- a/engine/events/special.asm +++ b/engine/events/specials_2.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" |