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

battle 4 up to a8

Browse Source
This commit is contained in:
DizzyEggg
2017-09-26 22:39:59 +02:00
parent 52a951276f
commit d769ec1374
52 changed files with 3497 additions and 8242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/contest.s
+28 -28
View File
@@ -50,13 +50,13 @@ sub_80D7678: @ 80D7678
strh r1, [r0]
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r0, =gUnknown_02022E20
strh r1, [r0]
@@ -611,10 +611,10 @@ _080D7BF6:
.pool
_080D7C04:
bl sub_80DE224
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r1, [r0]
movs r0, 0x2
bl BeginFastPaletteFade
@@ -1190,7 +1190,7 @@ _080D814C:
strh r0, [r4, 0x8]
b _080D822C
_080D8176:
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r1]
adds r0, 0x7
strh r0, [r1]
@@ -1324,19 +1324,19 @@ vblank_cb_battle: @ 80D827C
ldrh r1, [r0]
movs r0, 0x12
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
ldrh r1, [r0]
movs r0, 0x14
bl SetGpuReg
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
ldrh r1, [r0]
movs r0, 0x16
bl SetGpuReg
ldr r0, =gUnknown_02022E1C
ldr r0, =gBattle_BG2_X
ldrh r1, [r0]
movs r0, 0x18
bl SetGpuReg
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
ldrh r1, [r0]
movs r0, 0x1A
bl SetGpuReg
@@ -1389,7 +1389,7 @@ sub_80D833C: @ 80D833C
bne _080D840C
ldr r0, =gUnknown_02022E16
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
bl sub_80DCD48
ldr r1, =gPlttBufferUnfaded
@@ -1520,7 +1520,7 @@ sub_80D8490: @ 80D8490
ldr r0, =gUnknown_02022E16
movs r1, 0xA0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
movs r6, 0
ldr r0, =gUnknown_02039F25
@@ -1773,7 +1773,7 @@ _080D86E4:
ldr r0, =gUnknown_02022E16
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r1, =gTasks
lsls r0, r7, 2
@@ -2044,7 +2044,7 @@ sub_80D895C: @ 80D895C
ldr r0, =gUnknown_02022E16
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
movs r0, 0
bl sub_80DC490
@@ -5325,7 +5325,7 @@ sub_80DA5E8: @ 80DA5E8
ldr r0, =gUnknown_02022E16
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
ldr r4, =gUnknown_02039F34
movs r3, 0
@@ -5404,9 +5404,9 @@ sub_80DA6B4: @ 80DA6B4
cmp r4, 0
bne _080DA6EA
bl sub_80DE224
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r4, [r0]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
movs r0, 0xA0
strh r0, [r1]
movs r0, 0x62
@@ -5432,7 +5432,7 @@ sub_80DA700: @ 80DA700
push {lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r1]
subs r0, 0x7
strh r0, [r1]
@@ -8519,7 +8519,7 @@ sub_80DBF68: @ 80DBF68
ldr r0, =gUnknown_02022E16
movs r1, 0
strh r1, [r0]
ldr r0, =gUnknown_02022E1E
ldr r0, =gBattle_BG2_Y
strh r1, [r0]
bl sub_80DB89C
ldr r0, =gUnknown_0827E8DA
@@ -12881,10 +12881,10 @@ sub_80DE224: @ 80DE224
ldrh r1, [r5]
movs r0, 0xC
bl SetGpuReg
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
movs r0, 0xF0
strh r0, [r1]
ldr r4, =gUnknown_02022E1A
ldr r4, =gBattle_BG1_Y
movs r0, 0xA0
strh r0, [r4]
movs r0, 0x14
@@ -13004,9 +13004,9 @@ sub_80DE350: @ 80DE350
ldrh r1, [r3]
movs r0, 0xA
bl SetGpuReg
ldr r0, =gUnknown_02022E18
ldr r0, =gBattle_BG1_X
strh r5, [r0]
ldr r0, =gUnknown_02022E1A
ldr r0, =gBattle_BG1_Y
strh r5, [r0]
ldr r7, =gSprites
_080DE3CA:
@@ -13051,10 +13051,10 @@ sub_80DE424: @ 80DE424
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =gUnknown_02022E18
ldr r1, =gBattle_BG1_X
movs r0, 0
strh r0, [r1]
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
movs r0, 0xA0
strh r0, [r1]
movs r0, 0x62
@@ -13078,7 +13078,7 @@ sub_80DE464: @ 80DE464
push {lr}
lsls r0, 24
lsrs r3, r0, 24
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r1]
subs r0, 0x7
strh r0, [r1]
@@ -13233,7 +13233,7 @@ sub_80DE5C0: @ 80DE5C0
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r1, =gUnknown_02022E1A
ldr r1, =gBattle_BG1_Y
ldrh r0, [r1]
adds r0, 0x7
strh r0, [r1]