summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/rom4.s46
-rw-r--r--asm/rom5.s30
-rw-r--r--asm/rom_header.s12
3 files changed, 80 insertions, 8 deletions
diff --git a/asm/rom4.s b/asm/rom4.s
index 4bd319a49..5dfecb2a1 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -2198,9 +2198,17 @@ sub_8053D9C: @ 8053D9C
lsrs r0, 16
cmp r0, 0x1
bne _08053DB2
+ .ifdef SAPPHIRE
+ ldr r0, _sub_8053D9C_LegendaryMusic
+ .else
movs r0, 0xDE
lsls r0, 1
+ .endif
b _08053DDC
+ .ifdef SAPPHIRE
+ .align 2, 0
+_sub_8053D9C_LegendaryMusic: .4byte 443 @ OOAME (Kyogre's Heavy Rain theme)
+ .endif
_08053DB2:
adds r0, r4, 0
bl sub_8053D6C
@@ -2327,8 +2335,12 @@ sub_8053E90: @ 8053E90
bl sav1_map_get_music
lsls r0, 16
lsrs r4, r0, 16
+ .ifdef SAPPHIRE
+ ldr r0, _sub_8053E90_LegendaryMusic
+ .else
movs r0, 0xDE
lsls r0, 1
+ .endif
cmp r4, r0
beq _08053ED6
ldr r1, _08053EB0
@@ -2338,6 +2350,9 @@ sub_8053E90: @ 8053E90
adds r4, r0, 0
b _08053ED6
.align 2, 0
+ .ifdef SAPPHIRE
+_sub_8053E90_LegendaryMusic: .4byte 443 @ OOAME (Kyogre's Heavy Rain theme)
+ .endif
_08053EB0: .4byte 0x02025734
_08053EB4:
bl sav1_map_get_light_level
@@ -2406,8 +2421,12 @@ sub_8053F0C: @ 8053F0C
bl current_map_music_get
lsls r0, 16
lsrs r4, r0, 16
+ .ifdef SAPPHIRE
+ ldr r0, _sub_8053F0C_LegendaryMusic
+ .else
movs r0, 0xDE
lsls r0, 1
+ .endif
cmp r5, r0
beq _08053F4E
subs r0, 0x21
@@ -2437,6 +2456,9 @@ _08053F4E:
b _08053F7C
.align 2, 0
_08053F6C: .4byte 0x00004001
+ .ifdef SAPPHIRE
+_sub_8053F0C_LegendaryMusic: .4byte 443 @ OOAME (Kyogre's Heavy Rain theme)
+ .endif
_08053F70: .4byte 0x0000016d
_08053F74:
adds r0, r5, 0
@@ -2481,8 +2503,12 @@ sub_8053FB0: @ 8053FB0
lsrs r1, r0, 16
cmp r1, r4
beq _08053FD2
+ .ifdef SAPPHIRE
+ ldr r0, _sub_8053FB0_LegendaryMusic
+ .else
movs r0, 0xDE
lsls r0, 1
+ .endif
cmp r1, r0
beq _08053FD2
adds r0, r4, 0
@@ -2492,6 +2518,10 @@ _08053FD2:
pop {r4}
pop {r0}
bx r0
+ .ifdef SAPPHIRE
+ .align 2, 0
+_sub_8053FB0_LegendaryMusic: .4byte 443 @ OOAME (Kyogre's Heavy Rain theme)
+ .endif
thumb_func_end sub_8053FB0
thumb_func_start is_warp1_light_level_8_or_9
@@ -47870,7 +47900,7 @@ _080684AA:
.align 2, 0
_080684CC: .4byte 0x0202e8cc
_080684D0: .4byte 0x0202e8ce
-_080684D4: .4byte gUnknown_0819FF7B
+_080684D4: .4byte HiddenItemScript
_080684D8:
cmp r5, 0x2
bne _08068494
@@ -47999,7 +48029,7 @@ _080685CC:
ldr r0, _080685E0
b _080686EE
.align 2, 0
-_080685E0: .4byte gUnknown_081A085B
+_080685E0: .4byte PictureBookShelfScript
_080685E4:
adds r0, r5, 0
bl sub_8057944
@@ -48010,7 +48040,7 @@ _080685E4:
ldr r0, _080685F8
b _080686EE
.align 2, 0
-_080685F8: .4byte gUnknown_081A0864
+_080685F8: .4byte BookshelfScript
_080685FC:
adds r0, r5, 0
bl sub_8057958
@@ -48021,7 +48051,7 @@ _080685FC:
ldr r0, _08068610
b _080686EE
.align 2, 0
-_08068610: .4byte gUnknown_081A086D
+_08068610: .4byte PokemonCenterBookshelfScript
_08068614:
adds r0, r5, 0
bl sub_805796C
@@ -48032,7 +48062,7 @@ _08068614:
ldr r0, _08068628
b _080686EE
.align 2, 0
-_08068628: .4byte gUnknown_081A0876
+_08068628: .4byte VaseScript
_0806862C:
adds r0, r5, 0
bl sub_8057980
@@ -48043,7 +48073,7 @@ _0806862C:
ldr r0, _08068640
b _080686EE
.align 2, 0
-_08068640: .4byte gUnknown_081A087F
+_08068640: .4byte TrashCanScript
_08068644:
adds r0, r5, 0
bl sub_8057994
@@ -48054,7 +48084,7 @@ _08068644:
ldr r0, _08068658
b _080686EE
.align 2, 0
-_08068658: .4byte gUnknown_081A0888
+_08068658: .4byte ShopShelfScript
_0806865C:
adds r0, r5, 0
bl sub_80579A8
@@ -48065,7 +48095,7 @@ _0806865C:
ldr r0, _08068670
b _080686EE
.align 2, 0
-_08068670: .4byte gUnknown_081A0891
+_08068670: .4byte BlueprintScript
_08068674:
movs r4, 0x4
ldrsb r4, [r6, r4]
diff --git a/asm/rom5.s b/asm/rom5.s
index e1d7c1da0..e33cc2fca 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -3268,14 +3268,21 @@ sub_807C7E4: @ 807C7E4
ands r0, r1
cmp r0, 0
bne _0807C80C
+ .ifdef SAPPHIRE
+ mov r0, sp
+ strh r2, [r0]
+ .else
lsls r1, r2, 10
mov r0, sp
strh r1, [r0]
+ .endif
b _0807C816
_0807C80C:
movs r0, 0x1F
subs r0, r2
+ .ifndef SAPPHIRE
lsls r0, 10
+ .endif
mov r1, sp
strh r0, [r1]
_0807C816:
@@ -308261,8 +308268,13 @@ sub_8110908: @ 8110908
push {r6,r7}
lsls r0, 16
lsrs r7, r0, 16
+ .ifdef SAPPHIRE
+ ldr r0, _sub_8110908_Latias
+ .else
+ @ Latios
movs r0, 0xCC
lsls r0, 1
+ .endif
cmp r7, r0
bne _0811091E
b _08110A44
@@ -308323,6 +308335,9 @@ _08110960:
beq _0811099A
b _081109BA
.align 2, 0
+ .ifdef SAPPHIRE
+_sub_8110908_Latias: .4byte 407
+ .endif
_08110988: .4byte 0x02000000
_0811098C: .4byte gUnknown_083F856C
_08110990: .4byte gUnknown_083F856E
@@ -351357,6 +351372,9 @@ sub_8126098: @ 8126098
cmp r2, 0
beq _081260C6
movs r0, 0x80
+ .ifdef SAPPHIRE
+ lsls r0, 1 @ unknown difference
+ .endif
ands r0, r4
cmp r0, 0
beq _081260C6
@@ -380940,8 +380958,12 @@ sub_8134240: @ 8134240
push {r6}
sub sp, 0x10
ldr r5, _081342FC
+ .ifdef SAPPHIRE
+ ldr r6, _sub_8134240_Latias
+ .else
movs r6, 0xCC
lsls r6, 1
+ .endif
movs r0, 0
str r0, [sp]
str r0, [sp, 0x4]
@@ -381019,6 +381041,9 @@ sub_8134240: @ 8134240
bx r0
.align 2, 0
_081342FC: .4byte 0x030045c0
+ .ifdef SAPPHIRE
+_sub_8134240_Latias: .4byte 407
+ .endif
_08134300: .4byte 0x02028878
_08134304: .4byte 0x02039302
_08134308: .4byte gUnknown_08402E80
@@ -396619,9 +396644,14 @@ _0813BFDA:
bl SetVBlankCallback
movs r1, 0x80
lsls r1, 7
+ .ifdef SAPPHIRE
+ movs r0, 0
+ movs r2, 0x40
+ .else
movs r2, 0x80
lsls r2, 3
movs r0, 0x1
+ .endif
movs r3, 0x10
bl sub_8148EC0
lsls r0, 24
diff --git a/asm/rom_header.s b/asm/rom_header.s
index 0e6112228..e49b4fbee 100644
--- a/asm/rom_header.s
+++ b/asm/rom_header.s
@@ -22,10 +22,18 @@ RomHeaderNintendoLogo:
.byte 0x21,0xd4,0xf8,0x07
RomHeaderGameTitle:
+ .ifdef SAPPHIRE
+ .ascii "POKEMON SAPP"
+ .else
.ascii "POKEMON RUBY"
+ .endif
RomHeaderGameCode:
+ .ifdef SAPPHIRE
+ .ascii "AXPE"
+ .else
.ascii "AXVE"
+ .endif
RomHeaderMakerCode:
.ascii "01"
@@ -46,7 +54,11 @@ RomHeaderSoftwareVersion:
.byte 0
RomHeaderChecksum:
+ .ifdef SAPPHIRE
+ .byte 0x55
+ .else
.byte 0x41
+ .endif
RomHeaderReserved2:
.space 2
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 16:12:50 +0000