Match FireRed Rev1

data/event_object_80688E4.s

@@ -1,3 +1,5 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
 	.section .rodata
 	.align 2
 
@@ -88,7 +90,7 @@ gUnknown_83A7208:: @ 83A7208
 
 	.align 2
 gUnknown_83A720C:: @ 83A720C
-	.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/evobjmv.c"
+	abspath "evobjmv.c"
 
 	.align 2
 gUnknown_83A7240:: @ 83A7240

data/event_scripts.s

@@ -12361,9 +12361,8 @@ gUnknown_81C1300:: @ 81C1300
 	.string "It looks like it's having fun.$"
 
 EventScript_1C1338:: @ 81C1338
-	waitse
-	setdivewarp MAP_UNKNOWN_MAP_00_00, 72, 7187, 8
-	nop
+	map_script_2 VAR_0x4030, 0, EventScript_1C1348
+	.2byte 0
 	copyvar VAR_0x4030, 1
 	end
 
@@ -14474,8 +14473,9 @@ Text_1C55A4:: @ 81C55A4
 	.string "テストよう　メッセージです！\n"
 	.string "ざひょう　チェックの　イベントです$"
 
-Text_1C55C5:: @ 81C55C5
-	.string "   $"
+	.align 2
+Text_1C55C8:: @ 81C55C8
+	.string "$"
 
 gText_WouldYouLikeToSaveTheGame:: @ 81C55C9
 	.string "Would you like to save the game?$"

data/field_effect.s

@@ -45,6 +45,9 @@ gUnknown_83CBB10:: @ 83CBB10 gbapal gUnknown_83CBA90
 gUnknown_83CBB30:: @ 83CBB30 4bpp
 	.incbin "graphics/field_effects/unk_83CBB30.bin"
 
+gUnknown_83CBDB0::
+	.incbin "graphics/field_effects/unk_83CBDB0.4bpp"
+
 	.align 2
 gUnknown_83CBE30:: @ 83CBE30 dataptr
 	.4byte FieldEffectCmd_loadtiles
@@ -398,10 +401,10 @@ gUnknown_83CC244:: @ 83CC244 dataptr
 	.4byte sub_8087CB4
 
 gUnknown_83CC250:: @ 83CC250 sprite_frames
-	obj_frame_tiles 0x083cbdb0, 0x0020
-	obj_frame_tiles 0x083cbdd0, 0x0020
-	obj_frame_tiles 0x083cbdf0, 0x0020
-	obj_frame_tiles 0x083cbe10, 0x0020
+	obj_frame_tiles gUnknown_83CBDB0 + 0x00, 0x0020
+	obj_frame_tiles gUnknown_83CBDB0 + 0x20, 0x0020
+	obj_frame_tiles gUnknown_83CBDB0 + 0x40, 0x0020
+	obj_frame_tiles gUnknown_83CBDB0 + 0x60, 0x0020
 
 gUnknown_83CC270:: @ 83CC270 animcmd
 	obj_image_anim_frame 0x0000, 0

data/link_rfu.s

@@ -221,10 +221,10 @@ gUnknown_843F9A0::
 	obj_image_anim_end
 
 gUnknown_843F9A8::
-	.4byte 0x843f988
-	.4byte 0x843f990
-	.4byte 0x843f998
-	.4byte 0x843f9a0
+	.4byte gUnknown_843F988
+	.4byte gUnknown_843F990
+	.4byte gUnknown_843F998
+	.4byte gUnknown_843F9A0
 
 gUnknown_843F9B8:: @ 843F9B8 sprite_template
 	spr_template 1, 1, gUnknown_843F980, gUnknown_843F9A8, NULL, gDummySpriteAffineAnimTable, sub_8101B20

data/link_rfu_2.s

@@ -95,7 +95,7 @@ gUnknown_843ED88:: @ 843ED88
 
 	.align 2
 gUnknown_843ED94:: @ 843ED94
-	.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu.c"
+	abspath "rfu.c"
 
 	.align 2
 gUnknown_843EDC4:: @ 843EDC4

data/link_rfu_3.s

@@ -315,7 +315,7 @@ gUnknown_8457120:: @ 8457120
 
 	.align 2
 gUnknown_8457138:: @ 8457138
-	.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/rfu_union_tool.c"
+	abspath "rfu_union_tool.c"
 
 	.align 2
 gUnknown_8457174:: @ 8457174

data/text/help_system.inc

@@ -980,8 +980,13 @@ gUnknown_81B752C:: @ 81B752C
 	.string "   the POKéDEX list.\n"
 	.string "{CIRCLE_2} A caught POKéMON will provide a\n"
 	.string "   large amount of data.\n"
+	.if REVISION < 1
 	.string "{CIRCLE_3} Select “AREA” to display the TOWN\n"
 	.string "   MAP with the POKéMON's habitat(s).$"
+	.else
+	.string "{CIRCLE_3} Select “NEXT DATA” to display the\n"
+	.string "   TOWN MAP with its habitat(s).$"
+	.endif
 
 gUnknown_81B7611:: @ 81B7611
 	.string "{CIRCLE_1} Go up to the PC at home, then press\n"