From bef792f2d21ccac0127aeffd9e0838aba81f44b6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 20 Jul 2015 03:51:52 -0400 Subject: More label updates, moved predefs to new file Also named most of the engine and event flag constants. --- data/wild/fish.asm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'data') diff --git a/data/wild/fish.asm b/data/wild/fish.asm index 777c7b48a..f25365c49 100644 --- a/data/wild/fish.asm +++ b/data/wild/fish.asm @@ -12,17 +12,7 @@ FishAction: ; 92402 call GetFishGroupHeader ld hl, FishGroupHeaders - ; encounter chance - add hl, de - ; pointer to old rod data - add hl, de - add hl, de - ; pointer to good rod data - add hl, de - add hl, de - ; pointer to super rod data - add hl, de - add hl, de + add_n_times hl, de, 7 call Fish @@ -52,8 +42,7 @@ Fish: ; 9241a inc hl ld e, b ld d, 0 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -122,7 +111,7 @@ GetFishGroupHeader: ; 9245b ; Return fishing encounter group header d in de. push hl - ld hl, wdc1e + ld hl, DailyFlags bit 2, [hl] pop hl jr z, .end -- cgit v1.2.3