diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2016-08-07 20:11:35 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2016-08-07 20:11:35 -0700 |
| commit | 3ea23772aa8d6fe1b69520a544ac73a7a9a36a35 (patch) | |
| tree | ce1f5b0ae907979100f37f7a46a24d8ae127c25c | |
| parent | 01da89ecb2a975a57931969277f4ca080768effc (diff) | |
Feebas routine and fishing data.
| -rw-r--r-- | asm/rom5.s | 22 | ||||
| -rw-r--r-- | data/data2.s | 5 |
2 files changed, 14 insertions, 13 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index fdbaa63bf..6d03baaa2 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -20312,8 +20312,8 @@ _08084A34: bx r1 thumb_func_end sub_8084984 - thumb_func_start sub_8084A44 -sub_8084A44: @ 8084A44 + thumb_func_start check_feebas +check_feebas: @ 8084A44 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -20449,7 +20449,7 @@ _08084B3A: _08084B48: .4byte 0x02025734 _08084B4C: .4byte 0x00002dd6 _08084B50: .4byte 0x000001bf - thumb_func_end sub_8084A44 + thumb_func_end check_feebas thumb_func_start sub_8084B54 sub_8084B54: @ 8084B54 @@ -20726,8 +20726,8 @@ _08084D28: bx r1 thumb_func_end sub_8084C94 - thumb_func_start sub_8084D30 -sub_8084D30: @ 8084D30 + thumb_func_start random_number_in_range +random_number_in_range: @ 8084D30 push {r4,r5,lr} adds r4, r0, 0 ldrb r0, [r4, 0x1] @@ -20757,7 +20757,7 @@ _08084D44: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8084D30 + thumb_func_end random_number_in_range thumb_func_start sub_8084D6C sub_8084D6C: @ 8084D6C @@ -20967,7 +20967,7 @@ _08084EE2: lsls r4, r0, 2 ldr r0, [r6, 0x4] adds r0, r4 - bl sub_8084D30 + bl random_number_in_range lsls r0, 24 lsrs r5, r0, 24 cmp r7, 0x1 @@ -21004,7 +21004,7 @@ sub_8084F18: @ 8084F18 lsrs r4, 22 ldr r0, [r5, 0x4] adds r0, r4 - bl sub_8084D30 + bl random_number_in_range adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -21640,14 +21640,14 @@ sub_808541C: @ 808541C push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - bl sub_8084A44 + bl check_feebas lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0808544C ldr r4, _08085448 adds r0, r4, 0 - bl sub_8084D30 + bl random_number_in_range adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -21656,7 +21656,7 @@ sub_808541C: @ 808541C bl sub_8084E78 b _0808546C .align 2, 0 -_08085448: .4byte gUnknown_0839DBFC +_08085448: .4byte gWildFeebasRoute119Data _0808544C: ldr r4, _08085484 bl sub_8084D6C diff --git a/data/data2.s b/data/data2.s index 48349b906..7b1a19f05 100644 --- a/data/data2.s +++ b/data/data2.s @@ -10416,8 +10416,9 @@ gSpriteTemplate_839B528:: @ 839B528 @ 839B540 .include "data/wild_mons.s" -gUnknown_0839DBFC:: @ 839DBFC - .incbin "baserom.gba", 0x0039dbfc, 0x4 +gWildFeebasRoute119Data:: @ 839DBFC + .byte 20, 25 @ Min/Max level + .2byte SPECIES_FEEBAS gUnknown_0839DC00:: @ 839DC00 .incbin "baserom.gba", 0x0039dc00, 0x14 |