dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/pret/master'

Browse Source
This commit is contained in:
Diegoisawesome
2017-03-04 23:32:12 -06:00
parent 56f5e8bdab 83ae14e2b9
commit d12fd5c5ce
213 changed files with 57369 additions and 61524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
asm/title_screen.s
View File

@@ -482,7 +482,7 @@ title_screen_vblank_callback: @ 80AA780
c2_title_screen_1: @ 80AA7A4
push {r4,lr}
sub sp, 0x14
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -581,7 +581,7 @@ _080AA7E0:
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
bl ResetPaletteFade
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -634,7 +634,7 @@ _080AA8C4:
bl LoadPalette
ldr r0, =gUnknown_08540100
bl LoadTaggedObjectPalette
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
movs r2, 0x87
lsls r2, 3
adds r0, r2
@@ -662,7 +662,7 @@ _080AA998:
strh r0, [r1, 0xC]
subs r0, 0x10
strh r0, [r1, 0xE]
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -681,7 +681,7 @@ _080AA9E0:
bl BeginNormalPaletteFade
ldr r0, =title_screen_vblank_callback
bl SetVBlankCallback
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
movs r2, 0x87
lsls r2, 3
adds r0, r2
@@ -754,7 +754,7 @@ _080AAA14:
bl SetGpuReg
ldr r0, =0x0000019d
bl m4aSongNumStart
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
movs r1, 0x87
lsls r1, 3
adds r0, r1
@@ -808,7 +808,7 @@ task_title_screen_1: @ 80AAB44
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF
ands r0, r1
@@ -927,7 +927,7 @@ task_title_screen_2: @ 80AAC50
push {r4-r7,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0xF
ands r0, r1
@@ -1056,7 +1056,7 @@ task_title_screen_3: @ 80AAD64
sub sp, 0x4
lsls r0, 24
lsrs r5, r0, 24
ldr r2, =gUnknown_030022C0
ldr r2, =gMain
ldrh r1, [r2, 0x2E]
movs r0, 0x1
ands r0, r1
@@ -1115,7 +1115,7 @@ _080AADC8:
b _080AAE98
.pool
_080AADFC:
ldr r0, =gUnknown_030022C0
ldr r0, =gMain
ldrh r1, [r0, 0x2C]
movs r0, 0x6
ands r0, r1
@@ -1280,7 +1280,7 @@ title_screen_update_rayquaza_ring_palette: @ 80AAF48
bne _080AAF9C
adds r0, r1, 0
movs r1, 0x80
bl cosine
bl Cos
lsls r0, 16
asrs r0, 16
adds r2, r0, 0