all remaining ruby/sapphire code differences before scripts

2 files changed, 79 insertions, 30 deletions

diff --git a/asm/rom5.s b/asm/rom5.s
index d6ae712da..10777250d 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -396540,7 +396540,11 @@ task_intro_6: @ 813BF20
 	strh r1, [r0]
 	ldr r0, _0813BF64
 	strh r1, [r0]
+	.ifdef SAPPHIRE
+	movs r0, 0
+	.else
 	movs r0, 0x1
+	.endif
 	bl load_intro_part2_graphics
 	ldr r1, _0813BF68
 	lsls r0, r4, 2
@@ -396574,7 +396578,7 @@ sub_813BF70: @ 813BF70
 	b _0813BF96
 	.align 2, 0
 _0813BF88: .4byte 0x02039318
-_0813BF8C: .4byte gUnknown_08416DAC
+_0813BF8C: .4byte gIntro2BrendanSpriteSheet
 _0813BF90:
 	ldr r0, _0813BFBC
 	bl LoadCompressedObjectPic
@@ -396595,10 +396599,14 @@ _0813BF96:
 	bl sub_8149310
 	b _0813BFDA
 	.align 2, 0
-_0813BFBC: .4byte gUnknown_08416DBC
-_0813BFC0: .4byte gUnknown_08416DCC
-_0813BFC4: .4byte gUnknown_08416DDC
-_0813BFC8: .4byte gUnknown_08416DFC
+_0813BFBC: .4byte gIntro2MaySpriteSheet
+_0813BFC0: .4byte gIntro2BicycleSpriteSheet
+	.ifdef SAPPHIRE
+_0813BFC4: .4byte gIntro2LatiasSpriteSheet
+	.else
+_0813BFC4: .4byte gIntro2LatiosSpriteSheet
+	.endif
+_0813BFC8: .4byte gIntro2SpritePalettes
 _0813BFCC: .4byte 0x02039318
 _0813BFD0:
 	movs r0, 0x88
@@ -396630,7 +396638,11 @@ _0813BFDA:
 	movs r0, 0x40
 	negs r0, r0
 	movs r1, 0x3C
+	.ifdef SAPPHIRE
+	bl sapphire_sub_81494A0
+	.else
 	bl sub_8149424
+	.endif
 	lsls r0, 24
 	lsrs r6, r0, 24
 	lsls r0, r6, 4
@@ -396665,7 +396677,11 @@ _0813BFDA:
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r4, 0x8]
+	.ifdef SAPPHIRE
+	movs r0, 0
+	.else
 	movs r0, 0x1
+	.endif
 	bl sub_8148C78
 	ldr r0, _0813C07C
 	str r0, [r4]
@@ -396843,7 +396859,11 @@ _0813C182:
 	adds r0, r2, 0x1
 	strh r0, [r4, 0xE]
 _0813C1AE:
+	.ifdef SAPPHIRE
+	movs r0, 0
+	.else
 	movs r0, 0x1
+	.endif
 	bl sub_8149020
 	add sp, 0x4
 	pop {r4-r7}
@@ -414855,10 +414875,10 @@ _08144F5C:
 	b _08145034
 	.align 2, 0
 _08144FBC: .4byte 0x02024ea4
-_08144FC0: .4byte gUnknown_08416DAC
+_08144FC0: .4byte gIntro2BrendanSpriteSheet
 _08144FC4: .4byte gUnknown_08416E34
-_08144FC8: .4byte gUnknown_08416DCC
-_08144FCC: .4byte gUnknown_08416DFC
+_08144FC8: .4byte gIntro2BicycleSpriteSheet
+_08144FCC: .4byte gIntro2SpritePalettes
 _08144FD0: .4byte 0x03004b20
 _08144FD4: .4byte 0x02020004
 _08144FD8: .4byte sub_8145378
@@ -414921,10 +414941,10 @@ _08145034:
 	strb r0, [r1]
 	b _081450A2
 	.align 2, 0
-_0814505C: .4byte gUnknown_08416DBC
+_0814505C: .4byte gIntro2MaySpriteSheet
 _08145060: .4byte gUnknown_08416E24
-_08145064: .4byte gUnknown_08416DCC
-_08145068: .4byte gUnknown_08416DFC
+_08145064: .4byte gIntro2BicycleSpriteSheet
+_08145068: .4byte gIntro2SpritePalettes
 _0814506C: .4byte 0x03004b20
 _08145070: .4byte 0x02020004
 _08145074: .4byte sub_8145378
@@ -423215,8 +423235,8 @@ _08149498: .4byte 0x02020004
 _0814949C: .4byte sub_81493C4
 	thumb_func_end sub_8149424
 
-	thumb_func_start unref_sub_81494A0
-unref_sub_81494A0: @ 81494A0
+	thumb_func_start sapphire_sub_81494A0
+sapphire_sub_81494A0: @ 81494A0
 	push {r4-r6,lr}
 	mov r6, r8
 	push {r6}
@@ -423272,7 +423292,7 @@ _0814950C: .4byte gUnknown_08416D94
 _08149510: .4byte 0xffe00000
 _08149514: .4byte 0x02020004
 _08149518: .4byte sub_81493C4
-	thumb_func_end unref_sub_81494A0
+	thumb_func_end sapphire_sub_81494A0
 
 	thumb_func_start nullsub_84
 nullsub_84: @ 814951C
diff --git a/data/data2.s b/data/data2.s
index 180c4ecb2..cafd72fb7 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -15699,16 +15699,38 @@ gUnknown_08414064: @ 8414064
 	.global gUnknown_08414084
 gUnknown_08414084: @ 8414084
 	.incbin "baserom.gba", 0x00414084, 0x2AC
+
+gIntro2NightBGTiles:: @ 8414330
 	.incbin "graphics/intro/intro2_bgnight2.4bpp.lz"
+
+gIntro2BrendanPalette:: @ 84143B4
 	.incbin "graphics/intro/intro2_brendan.gbapal"
+
+gIntro2BrendanTiles:: @ 84143D4
 	.incbin "graphics/intro/intro2_brendan.4bpp.lz"
+
+gIntro2MayPalette:: @ 8414F70
 	.incbin "graphics/intro/intro2_may.gbapal"
-	.incbin "baserom.gba", 0x00414F90, 0x1E0
+
+gUnknown_08414F90:: @ 8414F90
+	.space 0x1E0
+
+gIntro2MayTiles:: @ 8415170
 	.incbin "graphics/intro/intro2_may.4bpp.lz"
+
+gIntro2BicycleTiles:: @ 8415E08
 	.incbin "graphics/intro/intro2_bicycle.4bpp.lz"
+
+gIntro2LatiosPalette:: @ 8416234
 	.incbin "graphics/intro/intro2_latios.gbapal"
+
+gIntro2LatiosTiles:: @ 8416254
 	.incbin "graphics/intro/intro2_latios.4bpp.lz"
+
+gIntro2LatiasPalette:: @ 84166F8
 	.incbin "graphics/intro/intro2_latias.gbapal"
+
+gIntro2LatiasTiles:: @ 8416718
 	.incbin "graphics/intro/intro2_latias.4bpp.lz"
 
 	.global gUnknown_08416B3C
@@ -15801,25 +15823,32 @@ gUnknown_08416D7C: @ 8416D7C
 gUnknown_08416D94: @ 8416D94
 	.incbin "baserom.gba", 0x00416d94, 0x18
 
-	.global gUnknown_08416DAC
-gUnknown_08416DAC: @ 8416DAC
-	.incbin "baserom.gba", 0x00416dac, 0x10
+gIntro2BrendanSpriteSheet:: @ 8416DAC
+	obj_tiles gIntro2BrendanTiles, 0x3800, 1002
+	.space 8
 
-	.global gUnknown_08416DBC
-gUnknown_08416DBC: @ 8416DBC
-	.incbin "baserom.gba", 0x00416dbc, 0x10
+gIntro2MaySpriteSheet:: @ 8416DBC
+	obj_tiles gIntro2MayTiles, 0x3800, 1003
+	.space 8
 
-	.global gUnknown_08416DCC
-gUnknown_08416DCC: @ 8416DCC
-	.incbin "baserom.gba", 0x00416dcc, 0x10
+gIntro2BicycleSpriteSheet:: @ 8416DCC
+	obj_tiles gIntro2BicycleTiles, 0x1000, 1001
+	.space 8
 
-	.global gUnknown_08416DDC
-gUnknown_08416DDC: @ 8416DDC
-	.incbin "baserom.gba", 0x00416ddc, 0x20
+gIntro2LatiosSpriteSheet:: @ 8416DDC
+	obj_tiles gIntro2LatiosTiles, 0x1000, 1004
+	.space 8
+
+gIntro2LatiasSpriteSheet:: @ 8416DEC
+	obj_tiles gIntro2LatiasTiles, 0x1000, 1005
+	.space 8
 
-	.global gUnknown_08416DFC
-gUnknown_08416DFC: @ 8416DFC
-	.incbin "baserom.gba", 0x00416dfc, 0x28
+gIntro2SpritePalettes:: @ 8416DFC
+	obj_pal gIntro2BrendanPalette, 1002
+	obj_pal gIntro2MayPalette,     1003
+	obj_pal gIntro2LatiosPalette,  1004
+	obj_pal gIntro2LatiasPalette,  1005
+	.space 8
 
 	.global gUnknown_08416E24
 gUnknown_08416E24: @ 8416E24