Match FireRed Rev1

asm/librfu.s

@@ -2363,7 +2363,7 @@ _081E0668:
 	lsrs r5, r0, 16
 	cmp r5, 0x3
 	bls _081E0668
-	ldr r1, _081E06E0 @ =0x081E1B25
+	ldr r1, _081E06E0 @ =sub_81E1B24
 	movs r5, 0x2
 	negs r5, r5
 	ands r5, r1
@@ -2371,7 +2371,7 @@ _081E0668:
 	ldr r0, [r2]
 	adds r4, r0, 0
 	adds r4, 0x8
-	ldr r0, _081E06E4 @ =0x081E1B55
+	ldr r0, _081E06E4 @ =rfu_REQ_changeMasterSlave
 	subs r0, r1
 	lsls r0, 15
 	lsrs r3, r0, 16
@@ -2408,8 +2408,8 @@ _081E06D0: .4byte gUnknown_3007464
 _081E06D4: .4byte gUnknown_3007468
 _081E06D8: .4byte gUnknown_3007450
 _081E06DC: .4byte gUnknown_3007440
-_081E06E0: .4byte 0x081E1B25
-_081E06E4: .4byte 0x081E1B55
+_081E06E0: .4byte sub_81E1B24
+_081E06E4: .4byte rfu_REQ_changeMasterSlave
 _081E06E8: .4byte 0x0000ffff
 	thumb_func_end sub_81E05B0
 

asm/macros.inc

@@ -158,3 +158,12 @@
 	.byte \bg, \top, \left, \height, \width, \palno
 	.2byte \baseBlock
 	.endm
+
+	.macro abspath relative
+	.if REVISION == 0
+	.ascii "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/"
+	.else
+	.ascii "C:/WORK/POKeFRLG/Src/pm_lgfr_ose/source/"
+	.endif
+	.asciz "\relative"
+	.endm

asm/pokedex_screen.s

@@ -337,7 +337,11 @@ sub_8105800: @ 8105800
 	cmp r0, 0
 	beq _08105864
 	ldrb r0, [r5]
+	.if REVISION == 0
 	cmp r0, 0
+	.else
+	cmp r0, 0xFF
+	.endif
 	beq _08105878
 _08105840:
 	mov r1, sp
@@ -351,7 +355,11 @@ _08105840:
 	lsrs r4, r0, 24
 	adds r0, r5, r4
 	ldrb r0, [r0]
+	.if REVISION == 0
 	cmp r0, 0
+	.else
+	cmp r0, 0xFF
+	.endif
 	beq _08105878
 	cmp r4, 0xA
 	bls _08105840