Merge

1 files changed, 17 insertions, 16 deletions

diff --git a/asm/rom5.s b/asm/rom5.s
index 1cc6fe217..b641e83fe 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -1,4 +1,5 @@
 	.include "constants/gba_constants.s"
+	.include "constants/species_constants.s"
 	.include "asm/macros.s"
 
 	.syntax unified
@@ -20311,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
@@ -20448,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
@@ -20725,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]
@@ -20756,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
@@ -20966,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
@@ -21003,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
@@ -21639,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
@@ -21655,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
@@ -46442,7 +46443,7 @@ sub_80918EC: @ 80918EC
 	adds r0, r7, 0
 	bl NationalPokedexNumToSpecies
 	adds r7, r0, 0
-	cmp r7, 0xC9
+	cmp r7, SPECIES_UNOWN
 	beq _0809199C
 	movs r0, 0x9A
 	lsls r0, 1
@@ -70242,7 +70243,7 @@ mon_icon_convert_unown_species_id: @ 809D434
 	push {lr}
 	lsls r0, 16
 	lsrs r2, r0, 16
-	cmp r2, 0xC9
+	cmp r2, SPECIES_UNOWN
 	bne _0809D45E
 	adds r0, r1, 0
 	bl sub_809D474
@@ -70250,7 +70251,7 @@ mon_icon_convert_unown_species_id: @ 809D434
 	lsrs r0, 16
 	cmp r0, 0
 	bne _0809D450
-	movs r0, 0xC9
+	movs r0, SPECIES_UNOWN
 	b _0809D45A
 _0809D450:
 	movs r1, 0xCE
@@ -70315,14 +70316,14 @@ sub_809D4A8: @ 809D4A8
 	bl sub_80A2D64
 	lsls r0, 16
 	lsrs r0, 16
-	cmp r0, 0xC9
+	cmp r0, SPECIES_UNOWN
 	bne _0809D4DE
 	mov r0, sp
 	ldrh r0, [r0]
 	cmp r0, 0
 	bne _0809D4CE
 	mov r1, sp
-	adds r0, 0xC9
+	adds r0, SPECIES_UNOWN
 	b _0809D4D6
 _0809D4CE:
 	mov r1, sp