diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-03-19 19:46:39 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-03-19 19:46:39 -0400 |
| commit | 707020f9be6548b2ea24eda0819c6202b3531571 (patch) | |
| tree | 967db990ad0e4cb81fa5db41d89233af15769f53 /main.asm | |
| parent | 5b9ba5d921c7d389edc0a72a520df09d8d3ec3a1 (diff) | |
| parent | 9ce74b3d2c7b0a6a678e234fd06dd898e1e372d0 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3605,7 +3605,7 @@ FishFunction: ; cf8e ld d, a ld a, [Buffer2] ld e, a - callba FishAction + callba Fish ld a, d and a jr z, .nonibble @@ -10536,7 +10536,7 @@ INCLUDE "engine/phone.asm" INCLUDE "engine/timeset.asm" INCLUDE "engine/pokegear.asm" -INCLUDE "data/wild/fish.asm" +INCLUDE "engine/fish.asm" INCLUDE "engine/slot_machine.asm" SECTION "Phone Engine", ROMX, BANK[$28] |