summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-03-14 15:12:13 -0400
committerentrpntr <entrpntr@gmail.com>2020-03-17 11:03:16 -0400
commit1e0807e4bfd5ca3e710c284cbbd4c0a50131baf3 (patch)
tree30c3108612fa8196fee6241070e21515ed111867 /main.asm
parent6231351906960364a5ad2f34efefd809cceb0eb8 (diff)
Itemfinder routines and labels.
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm9
1 files changed, 6 insertions, 3 deletions
diff --git a/main.asm b/main.asm
index 2366a2e4..12787429 100644
--- a/main.asm
+++ b/main.asm
@@ -626,8 +626,9 @@ INCLUDE "engine/events/misc_scripts.asm"
INCLUDE "engine/events/heal_machine_anim.asm"
INCLUDE "engine/events/whiteout.asm"
INCLUDE "engine/events/forced_movement.asm"
-ItemfinderFunction:
- dr $12947, $12e33
+INCLUDE "engine/events/itemfinder.asm"
+StartMenu:
+ dr $12994, $12e33
PartyMonItemName::
dr $12e33, $12fa0
@@ -1313,7 +1314,9 @@ SECTION "bank2d", ROMX, BANK[$2d]
dr $b4000, $b8000
SECTION "bank2e", ROMX, BANK[$2e]
- dr $b8000, $ba378
+ dr $b8000, $ba300
+
+INCLUDE "engine/events/checkforhiddenitems.asm"
TreeMonEncounter:
dr $ba378, $ba3a1