summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/bank_01.asm2
-rw-r--r--source/bank_20.asm11
2 files changed, 7 insertions, 6 deletions
diff --git a/source/bank_01.asm b/source/bank_01.asm
index f188759..5cb8f34 100644
--- a/source/bank_01.asm
+++ b/source/bank_01.asm
@@ -62,7 +62,7 @@ calc_town_map_puzzle_index::
xor $ff
inc a
add c
- add PUZZLE_DIGLETT
+ add TOWN_MAP_PUZZLES
jp farcall_ret
SECTION "function_01_6306", ROMX[$6306], BANK[$01]
diff --git a/source/bank_20.asm b/source/bank_20.asm
index da85a69..79d67cc 100644
--- a/source/bank_20.asm
+++ b/source/bank_20.asm
@@ -1,3 +1,4 @@
+INCLUDE "macros.inc"
INCLUDE "level_constants.inc"
INCLUDE "puzzle_constants.inc"
@@ -26,7 +27,7 @@ calc_safari_map_puzzle_index::
xor $ff
inc a
add c
- add PUZZLE_SAFARI_HAUNTER
+ add SAFARI_ZONE_PUZZLES
jp farcall_ret
SECTION "calc_safari_map_level_4_puzzle_index", ROMX[$5258], BANK[$20]
@@ -45,7 +46,7 @@ calc_safari_map_level_4_puzzle_index::
jp farcall_ret
.level_4_puzzles:
- db PUZZLE_THREE_POKEMON, PUZZLE_SAFARI_GLOOM, 00, 00
- db PUZZLE_TEAM_ROCKET, PUZZLE_PIKACHU_AND_TOGEPI, 00, 00
- db PUZZLE_HIDDEN_VILLAGE, PUZZLE_SNOWMAN, 00, 00
- db 00, 00, 00, 00
+ db PUZZLE_THREE_POKEMON, PUZZLE_SAFARI_GLOOM, 0, 0
+ db PUZZLE_TEAM_ROCKET, PUZZLE_PIKACHU_AND_TOGEPI, 0, 0
+ db PUZZLE_HIDDEN_VILLAGE, PUZZLE_SNOWMAN, 0, 0
+ db 0, 0, 0, 0