summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorlibjet <libj3t@gmail.com>2019-12-09 22:20:03 +0000
committerlibjet <libj3t@gmail.com>2019-12-09 22:20:03 +0000
commitcc8fc02a9467307f1494946fd08b4e57d4ffdac5 (patch)
treefa37c8c82262b5a0d5db6d76d7edf9d78bbf25da /main.asm
parentcfe6e295746996e64198b2a4b0f0eba1420ca8eb (diff)
Added engine/events stuff and cleaned up contest related code
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm5
1 files changed, 3 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index 9c4a0423..00d272f9 100644
--- a/main.asm
+++ b/main.asm
@@ -651,8 +651,9 @@ PartyMonItemName::
dr $12e33, $12fa0
Function12fa0:
dr $12fa0, $1399d
-GiveParkBalls:
- dr $1399d, $13a5f
+INCLUDE "engine/events/bug_contest/contest.asm"
+INCLUDE "engine/events/misc_scripts_2.asm"
+INCLUDE "engine/events/std_collision.asm"
Function13a5f:
dr $13a5f, $13d44
ApplyPokerusTick: