ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

label a bit of battle transition

Browse Source
This commit is contained in:
DizzyEggg 2017-09-04 13:46:03 +02:00
parent a83501f3bc
commit 0b39bfb2c2
7 changed files with 165 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/battle_setup.s
View File

@ -35,7 +35,7 @@ _080B0614:
strh r0, [r4]
b _080B0652
_080B062E:
bl sub_8145F20
bl IsBattleTransitionDone
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -1375,7 +1375,7 @@ sub_80B11A8: @ 80B11A8
push {lr}
bl UpdatePaletteFade
bl RunTasks
bl sub_8145F20
bl IsBattleTransitionDone
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1

266
asm/battle_transition.s
View File

@ -4,6 +4,58 @@
.syntax unified
.text
thumb_func_start CB2_TestBattleTransition
CB2_TestBattleTransition: @ 8145E84
push {r4,lr}
ldr r4, =sTestingTransitionState
ldrb r0, [r4]
cmp r0, 0
beq _08145E98
cmp r0, 0x1
beq _08145EAC
b _08145EC0
.pool
_08145E98:
ldr r0, =sTestingTransitionId
ldrb r0, [r0]
bl LaunchBattleTransitionTask
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
b _08145EC0
.pool
_08145EAC:
bl IsBattleTransitionDone
lsls r0, 24
cmp r0, 0
beq _08145EC0
movs r0, 0
strb r0, [r4]
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
_08145EC0:
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end CB2_TestBattleTransition
thumb_func_start TestBattleTransition
TestBattleTransition: @ 8145EDC
push {lr}
ldr r1, =sTestingTransitionId
strb r0, [r1]
ldr r0, =CB2_TestBattleTransition
bl SetMainCallback2
pop {r0}
bx r0
.pool
thumb_func_end TestBattleTransition
thumb_func_start sub_8145EF4
sub_8145EF4: @ 8145EF4
@ -13,7 +65,7 @@ sub_8145EF4: @ 8145EF4
ldr r2, =gMain
ldr r1, =sub_8085E50
str r1, [r2, 0x4]
bl sub_8145F6C
bl LaunchBattleTransitionTask
pop {r0}
bx r0
.pool
@ -24,15 +76,15 @@ sub_8145F10: @ 8145F10
push {lr}
lsls r0, 24
lsrs r0, 24
bl sub_8145F6C
bl LaunchBattleTransitionTask
pop {r0}
bx r0
thumb_func_end sub_8145F10
thumb_func_start sub_8145F20
sub_8145F20: @ 8145F20
thumb_func_start IsBattleTransitionDone
IsBattleTransitionDone: @ 8145F20
push {r4,lr}
ldr r0, =sub_8145FA8
ldr r0, =Task_BattleTransitionMain
bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
@ -51,7 +103,7 @@ sub_8145F20: @ 8145F20
_08145F4C:
adds r0, r2, 0
bl DestroyTask
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
ldr r0, [r4]
bl Free
movs r0, 0
@ -62,15 +114,15 @@ _08145F60:
pop {r1}
bx r1
.pool
thumb_func_end sub_8145F20
thumb_func_end IsBattleTransitionDone
thumb_func_start sub_8145F6C
sub_8145F6C: @ 8145F6C
thumb_func_start LaunchBattleTransitionTask
LaunchBattleTransitionTask: @ 8145F6C
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =sub_8145FA8
ldr r0, =Task_BattleTransitionMain
movs r1, 0x2
bl CreateTask
lsls r0, 24
@ -81,7 +133,7 @@ sub_8145F6C: @ 8145F6C
lsls r1, 3
adds r1, r2
strh r4, [r1, 0xA]
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
movs r0, 0x3C
bl AllocZeroed
str r0, [r4]
@ -89,10 +141,10 @@ sub_8145F6C: @ 8145F6C
pop {r0}
bx r0
.pool
thumb_func_end sub_8145F6C
thumb_func_end LaunchBattleTransitionTask
thumb_func_start sub_8145FA8
sub_8145FA8: @ 8145FA8
thumb_func_start Task_BattleTransitionMain
Task_BattleTransitionMain: @ 8145FA8
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@ -117,7 +169,7 @@ _08145FBA:
pop {r0}
bx r0
.pool
thumb_func_end sub_8145FA8
thumb_func_end Task_BattleTransitionMain
thumb_func_start sub_8145FE0
sub_8145FE0: @ 8145FE0
@ -445,7 +497,7 @@ sub_814623C: @ 814623C
movs r3, 0x10
bl BeginNormalPaletteFade
ldr r0, =gUnknown_020393A8
ldr r1, =gUnknown_0203ABA0
ldr r1, =sTransitionStructPtr
ldr r1, [r1]
movs r2, 0x14
ldrsh r1, [r1, r2]
@ -476,7 +528,7 @@ sub_814623C: @ 814623C
sub_81462A8: @ 81462A8
push {r4,r5,lr}
sub sp, 0x8
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
ldr r2, [r4]
ldrb r1, [r2]
movs r1, 0
@ -530,7 +582,7 @@ _081462FA:
sub_8146320: @ 8146320
push {lr}
bl sub_8149F2C
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r0, [r0]
ldrb r0, [r0]
cmp r0, 0
@ -615,7 +667,7 @@ sub_81463BC: @ 81463BC
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldr r0, =gUnknown_020393A8
movs r2, 0x16
@ -643,7 +695,7 @@ sub_81463BC: @ 81463BC
thumb_func_start sub_8146420
sub_8146420: @ 8146420
push {r4-r7,lr}
ldr r1, =gUnknown_0203ABA0
ldr r1, =sTransitionStructPtr
ldr r2, [r1]
ldrb r1, [r2]
movs r1, 0
@ -669,7 +721,7 @@ _08146448:
ldr r1, =gUnknown_02038C28
lsls r2, r5, 1
adds r2, r1
ldr r6, =gUnknown_0203ABA0
ldr r6, =sTransitionStructPtr
ldr r1, [r6]
ldrh r1, [r1, 0x16]
adds r0, r1
@ -712,7 +764,7 @@ _0814648E:
sub_81464B0: @ 81464B0
push {lr}
bl sub_8149F2C
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r0, [r0]
ldrb r0, [r0]
cmp r0, 0
@ -964,7 +1016,7 @@ sub_814669C: @ 814669C
movs r0, 0x80
lsls r0, 7
strh r0, [r4, 0x12]
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r2, [r0]
movs r0, 0x3F
strh r0, [r2, 0x2]
@ -1583,7 +1635,7 @@ sub_8146BF8: @ 8146BF8
push {r4,r5,lr}
sub sp, 0x8
adds r3, r0, 0
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@ -1657,7 +1709,7 @@ sub_8146C8C: @ 8146C8C
push {r4,r5,lr}
sub sp, 0x8
adds r3, r0, 0
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@ -1731,7 +1783,7 @@ sub_8146D20: @ 8146D20
push {r4-r7,lr}
sub sp, 0x8
adds r4, r0, 0
ldr r7, =gUnknown_0203ABA0
ldr r7, =sTransitionStructPtr
ldr r0, [r7]
ldrb r1, [r0]
movs r6, 0
@ -1847,7 +1899,7 @@ _08146DEE:
sub_8146DF8: @ 8146DF8
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r0, [r0]
ldrb r1, [r0]
movs r3, 0
@ -1918,7 +1970,7 @@ _08146E90:
ldr r0, =sub_8146F68
bl SetVBlankCallback
_08146EA4:
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
adds r0, 0x1
@ -1946,7 +1998,7 @@ sub_8146EC0: @ 8146EC0
strh r0, [r1, 0xA]
ldrh r0, [r1, 0xA]
bl sub_8149F2C
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r0, [r2]
ldrb r0, [r0]
cmp r0, 0
@ -2347,7 +2399,7 @@ sub_814723C: @ 814723C
adds r4, r0, 0
bl sub_8149F08
bl dp12_8087EA4
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r0, 0
strh r0, [r1, 0x2]
@ -2371,7 +2423,7 @@ _08147262:
bls _08147262
ldr r0, =sub_8147688
bl SetVBlankCallback
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r0, 0x78
strh r0, [r1, 0x2C]
@ -2390,7 +2442,7 @@ sub_81472A4: @ 81472A4
push {r4-r7,lr}
sub sp, 0xC
adds r6, r0, 0
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@ -2411,7 +2463,7 @@ sub_81472A4: @ 81472A4
bl sub_814A1AC
ldr r5, =gUnknown_02038C28
_081472D4:
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
ldr r0, [r4]
movs r7, 0x2A
ldrsh r3, [r0, r7]
@ -2469,7 +2521,7 @@ sub_8147334: @ 8147334
add r1, sp, 0xC
movs r0, 0
strb r0, [r1]
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
ldr r1, [r4]
ldrb r0, [r1]
movs r0, 0
@ -2548,7 +2600,7 @@ _081473DE:
cmp r0, r2
bge _08147406
adds r3, r4, 0
ldr r5, =gUnknown_0203ABA0
ldr r5, =sTransitionStructPtr
_081473EA:
ldr r2, [r5]
ldrh r0, [r2, 0x2A]
@ -2587,7 +2639,7 @@ sub_8147428: @ 8147428
push {r4-r6,lr}
sub sp, 0xC
adds r6, r0, 0
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@ -2607,7 +2659,7 @@ sub_8147428: @ 8147428
bl sub_814A1AC
ldr r5, =gUnknown_02038C28
_08147456:
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
ldr r0, [r4]
movs r1, 0x2A
ldrsh r3, [r0, r1]
@ -2663,7 +2715,7 @@ sub_81474B0: @ 81474B0
add r1, sp, 0xC
movs r0, 0
strb r0, [r1]
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
ldr r1, [r4]
ldrb r0, [r1]
movs r0, 0
@ -2683,7 +2735,7 @@ sub_81474B0: @ 81474B0
bl sub_814A1AC
ldr r7, =gUnknown_02038C28
mov r10, r7
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
mov r8, r0
add r6, sp, 0xC
_081474F4:
@ -2745,7 +2797,7 @@ _0814755E:
ble _08147588
ldr r6, =gUnknown_02038C28
adds r3, r1, 0
ldr r5, =gUnknown_0203ABA0
ldr r5, =sTransitionStructPtr
_0814756C:
ldr r2, [r5]
ldrh r0, [r2, 0x2A]
@ -2762,7 +2814,7 @@ _0814756C:
cmp r1, r0
bgt _0814756C
_08147588:
ldr r7, =gUnknown_0203ABA0
ldr r7, =sTransitionStructPtr
ldr r0, [r7]
ldrb r1, [r0]
adds r1, 0x1
@ -2785,7 +2837,7 @@ sub_81475B0: @ 81475B0
push {r4-r7,lr}
sub sp, 0xC
adds r7, r0, 0
ldr r1, =gUnknown_0203ABA0
ldr r1, =sTransitionStructPtr
ldr r0, [r1]
ldrb r2, [r0]
movs r2, 0
@ -2805,7 +2857,7 @@ sub_81475B0: @ 81475B0
ldr r6, =gUnknown_02038C28
_081475DC:
movs r2, 0x78
ldr r5, =gUnknown_0203ABA0
ldr r5, =sTransitionStructPtr
ldr r3, [r5]
ldrh r4, [r3, 0x28]
movs r1, 0x28
@ -2896,7 +2948,7 @@ sub_8147688: @ 8147688
strh r0, [r4, 0xA]
ldrh r0, [r4, 0xA]
bl sub_8149F2C
ldr r3, =gUnknown_0203ABA0
ldr r3, =sTransitionStructPtr
ldr r0, [r3]
ldrb r0, [r0]
cmp r0, 0
@ -2976,7 +3028,7 @@ sub_8147750: @ 8147750
bl dp12_8087EA4
movs r2, 0
ldr r4, =gUnknown_020393A8
ldr r3, =gUnknown_0203ABA0
ldr r3, =sTransitionStructPtr
_08147762:
lsls r1, r2, 1
adds r1, r4
@ -3011,7 +3063,7 @@ sub_81477A8: @ 81477A8
push {r7}
sub sp, 0x4
adds r6, r0, 0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
movs r0, 0
@ -3046,7 +3098,7 @@ _081477E8:
ldr r1, =gUnknown_02038C28
lsls r2, r5, 1
adds r2, r1
ldr r1, =gUnknown_0203ABA0
ldr r1, =sTransitionStructPtr
ldr r1, [r1]
ldrh r1, [r1, 0x16]
adds r0, r1
@ -3095,7 +3147,7 @@ _08147838:
lsrs r0, 24
bl DestroyTask
_0814785A:
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
adds r0, 0x1
@ -3115,7 +3167,7 @@ _0814785A:
sub_8147888: @ 8147888
push {lr}
bl sub_8149F2C
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r0, [r0]
ldrb r0, [r0]
cmp r0, 0
@ -3191,7 +3243,7 @@ sub_8147924: @ 8147924
adds r4, r0, 0
bl sub_8149F08
bl dp12_8087EA4
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r2, 0
movs r0, 0x3F
@ -3231,7 +3283,7 @@ sub_814797C: @ 814797C
mov r7, r8
push {r7}
adds r4, r0, 0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
movs r0, 0
@ -3292,7 +3344,7 @@ _081479D8:
adds r0, 0x1
strh r0, [r4, 0x8]
_081479F6:
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
adds r0, 0x1
@ -3346,7 +3398,7 @@ sub_8147A58: @ 8147A58
strh r0, [r4, 0xA]
ldrh r0, [r4, 0xA]
bl sub_8149F2C
ldr r3, =gUnknown_0203ABA0
ldr r3, =sTransitionStructPtr
ldr r0, [r3]
ldrb r0, [r0]
cmp r0, 0
@ -3517,7 +3569,7 @@ sub_8147BBC: @ 8147BBC
strh r0, [r4, 0xC]
movs r0, 0xEF
strh r0, [r4, 0xE]
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r0, 0x3F
strh r0, [r1, 0x2]
@ -3638,7 +3690,7 @@ _08147C7E:
sub_8147CE4: @ 8147CE4
push {r4-r7,lr}
adds r4, r0, 0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
movs r0, 0
@ -3741,7 +3793,7 @@ _08147D9A:
adds r0, 0x1
strh r0, [r4, 0x8]
_08147DA6:
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrh r0, [r1, 0x18]
subs r0, 0x8
@ -3764,7 +3816,7 @@ _08147DA6:
sub_8147DD0: @ 8147DD0
push {r4,r5,lr}
adds r4, r0, 0
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@ -3823,7 +3875,7 @@ _08147DE4:
sub_8147E4C: @ 8147E4C
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrh r0, [r1, 0x18]
subs r0, 0x8
@ -3857,7 +3909,7 @@ sub_8147E88: @ 8147E88
mov r7, r8
push {r7}
adds r6, r0, 0
ldr r7, =gUnknown_0203ABA0
ldr r7, =sTransitionStructPtr
ldr r1, [r7]
ldrh r0, [r1, 0x18]
subs r0, 0x8
@ -3934,7 +3986,7 @@ _08147F1C:
sub_8147F40: @ 8147F40
push {r4-r7,lr}
adds r4, r0, 0
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@ -4041,7 +4093,7 @@ _08147FEA:
sub_8148008: @ 8148008
push {r4-r6,lr}
adds r4, r0, 0
ldr r5, =gUnknown_0203ABA0
ldr r5, =sTransitionStructPtr
ldr r0, [r5]
ldrb r1, [r0]
movs r6, 0
@ -4069,7 +4121,7 @@ sub_8148008: @ 8148008
sub_8148040: @ 8148040
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, =gUnknown_0203ABA0
ldr r5, =sTransitionStructPtr
ldr r1, [r5]
ldrb r0, [r1]
movs r0, 0
@ -4144,7 +4196,7 @@ sub_81480CC: @ 81480CC
strh r0, [r4, 0xA]
ldrh r0, [r4, 0xA]
bl sub_8149F2C
ldr r3, =gUnknown_0203ABA0
ldr r3, =sTransitionStructPtr
ldr r0, [r3]
ldrb r0, [r0]
cmp r0, 0
@ -4200,7 +4252,7 @@ sub_8148160: @ 8148160
strh r0, [r4, 0xA]
ldrh r0, [r4, 0xA]
bl sub_8149F2C
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r0, [r2]
ldrb r0, [r0]
cmp r0, 0
@ -4241,14 +4293,14 @@ sub_81481E0: @ 81481E0
cmp r0, 0x4F
bhi _08148200
ldr r1, =0x04000010
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r0, [r0]
ldrh r0, [r0, 0x18]
b _08148208
.pool
_08148200:
ldr r1, =0x04000010
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r0, [r0]
ldrh r0, [r0, 0x1A]
_08148208:
@ -4653,7 +4705,7 @@ sub_8148508: @ 8148508
strh r0, [r5, 0xC]
movs r0, 0x1
strh r0, [r5, 0xE]
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
movs r0, 0x3F
strh r0, [r1, 0x2]
@ -4706,7 +4758,7 @@ sub_8148590: @ 8148590
mov r7, r8
push {r7}
adds r3, r0, 0
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@ -4847,7 +4899,7 @@ sub_814869C: @ 814869C
ldrh r0, [r4, 0xA]
bl sub_8149F2C
ldr r2, =0x04000048
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrh r0, [r1, 0x2]
strh r0, [r2]
@ -4948,7 +5000,7 @@ sub_8148798: @ 8148798
adds r6, r0, 0
bl sub_8149F08
bl dp12_8087EA4
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r2, 0
movs r0, 0x3F
@ -4969,7 +5021,7 @@ _081487CC:
lsls r2, r4, 1
mov r7, r12
adds r1, r2, r7
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r3, [r0]
ldrh r0, [r3, 0x14]
strh r0, [r1]
@ -5052,7 +5104,7 @@ sub_8148864: @ 8148864
adds r0, r4, 0
movs r2, 0x4
bl memcpy
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@ -5147,7 +5199,7 @@ _08148940:
adds r2, r0, r1
ldr r1, =gUnknown_02038D68
adds r3, r0, r1
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrh r0, [r4]
ldrh r1, [r1, 0x14]
@ -5251,7 +5303,7 @@ _08148A18:
adds r2, r0, r1
ldr r1, =gUnknown_02038D68
adds r3, r0, r1
ldr r1, =gUnknown_0203ABA0
ldr r1, =sTransitionStructPtr
ldr r0, [r1]
ldrh r1, [r0, 0x14]
ldrh r0, [r4]
@ -5322,7 +5374,7 @@ _08148A98:
adds r0, 0x1
strh r0, [r3, 0x8]
_08148AA6:
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
adds r0, 0x1
@ -5463,7 +5515,7 @@ sub_8148BC4: @ 8148BC4
adds r5, r0, 0
bl sub_8149F08
bl dp12_8087EA4
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r0, 0
strh r0, [r1, 0x2]
@ -5530,7 +5582,7 @@ sub_8148C28: @ 8148C28
b _08148CDE
.pool
_08148C6C:
ldr r5, =gUnknown_0203ABA0
ldr r5, =sTransitionStructPtr
ldr r1, [r5]
ldrb r0, [r1]
movs r0, 0
@ -5595,7 +5647,7 @@ _08148CDE:
sub_8148CE8: @ 8148CE8
push {r4-r6,lr}
adds r4, r0, 0
ldr r6, =gUnknown_0203ABA0
ldr r6, =sTransitionStructPtr
ldr r0, [r6]
ldrb r1, [r0]
movs r5, 0
@ -5660,7 +5712,7 @@ _08148D4C:
sub_8148D6C: @ 8148D6C
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
movs r0, 0
@ -5754,7 +5806,7 @@ _08148E28:
adds r0, 0x1
strh r0, [r4, 0x14]
_08148E3C:
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
adds r0, 0x1
@ -6342,7 +6394,7 @@ sub_81492B4: @ 81492B4
movs r2, 0x80
lsls r2, 5
bl CpuSet
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r0, 0
strh r0, [r1, 0x20]
@ -6491,7 +6543,7 @@ sub_8149410: @ 8149410
ands r0, r1
cmp r0, 0
bne _0814942E
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r0, 0x1
strh r0, [r1, 0x20]
@ -6557,7 +6609,7 @@ _0814949A:
asrs r0, 16
cmp r0, 0x27
ble _081494F0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r0, 0
strh r0, [r1, 0x2]
@ -6614,7 +6666,7 @@ sub_8149508: @ 8149508
strh r0, [r1, 0xA]
ldrh r0, [r1, 0xA]
bl sub_8149F2C
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r0, [r0]
movs r1, 0x20
ldrsh r0, [r0, r1]
@ -6677,7 +6729,7 @@ sub_81495B0: @ 81495B0
adds r5, r0, 0
bl sub_8149F08
bl dp12_8087EA4
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r2, 0
movs r0, 0xBF
@ -6782,7 +6834,7 @@ _0814963C:
sub_814969C: @ 814969C
push {r4,lr}
adds r4, r0, 0
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
ldr r1, [r2]
ldrb r0, [r1]
movs r0, 0
@ -6812,7 +6864,7 @@ _081496C6:
sub_81496D8: @ 81496D8
push {r4-r6,lr}
adds r6, r0, 0
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
ldr r0, [r4]
ldrb r1, [r0]
movs r5, 0
@ -6854,7 +6906,7 @@ sub_81496D8: @ 81496D8
thumb_func_start sub_8149740
sub_8149740: @ 8149740
push {lr}
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrh r0, [r1, 0x12]
adds r0, 0x1
@ -6891,7 +6943,7 @@ sub_8149774: @ 8149774
ldrh r0, [r4, 0xA]
bl sub_8149F2C
ldr r2, =0x04000050
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrh r0, [r1, 0xE]
strh r0, [r2]
@ -6936,7 +6988,7 @@ sub_8149804: @ 8149804
push {lr}
bl sub_8149F2C
ldr r1, =0x04000054
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r2, [r0]
ldrh r0, [r2, 0x12]
strh r0, [r1]
@ -6992,7 +7044,7 @@ sub_8149864: @ 8149864
ldrsh r0, [r3, r1]
cmp r0, 0
beq _0814994C
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
movs r0, 0x1
@ -7065,7 +7117,7 @@ _08149902:
ldrsh r0, [r3, r2]
cmp r0, 0
beq _08149914
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
movs r0, 0x1
@ -7077,7 +7129,7 @@ _08149914:
beq _0814994C
movs r2, 0x3A
ldrsh r0, [r3, r2]
ldr r2, =gUnknown_0203ABA0
ldr r2, =sTransitionStructPtr
cmp r0, 0
beq _0814993E
ldr r0, [r2]
@ -7271,7 +7323,7 @@ sub_8149AA4: @ 8149AA4
adds r5, r0, 0
bl sub_8149F08
bl dp12_8087EA4
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
movs r2, 0
movs r0, 0x3F
@ -7317,7 +7369,7 @@ sub_8149B08: @ 8149B08
push {r6}
sub sp, 0xC
mov r8, r0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r0, [r0]
adds r0, 0x24
ldr r6, =gUnknown_085C8DD0
@ -7378,7 +7430,7 @@ sub_8149B84: @ 8149B84
mov r6, r8
push {r6,r7}
adds r6, r0, 0
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
movs r0, 0
@ -7389,7 +7441,7 @@ sub_8149B84: @ 8149B84
mov r9, r0
_08149BA0:
ldr r1, =gUnknown_02038C28
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r2, [r0]
movs r3, 0x2A
ldrsh r0, [r2, r3]
@ -7431,7 +7483,7 @@ _08149BEA:
bgt _08149BF4
lsrs r5, r1, 16
_08149BF4:
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r4, [r0]
movs r0, 0x2A
ldrsh r2, [r4, r0]
@ -7469,7 +7521,7 @@ _08149C1C:
cmp r0, 0xF
ble _08149BA0
_08149C40:
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
adds r0, 0x1
@ -7568,7 +7620,7 @@ sub_8149CE8: @ 8149CE8
strh r0, [r4, 0xA]
ldrh r0, [r4, 0xA]
bl sub_8149F2C
ldr r3, =gUnknown_0203ABA0
ldr r3, =sTransitionStructPtr
ldr r0, [r3]
ldrb r0, [r0]
cmp r0, 0
@ -7824,7 +7876,7 @@ _08149EFE:
thumb_func_start sub_8149F08
sub_8149F08: @ 8149F08
push {r4,lr}
ldr r4, =gUnknown_0203ABA0
ldr r4, =sTransitionStructPtr
ldr r0, [r4]
movs r1, 0
movs r2, 0x3C
@ -8538,7 +8590,7 @@ sub_814A42C: @ 814A42C
movs r0, 0xA0
lsls r0, 4
strh r0, [r4, 0x16]
ldr r6, =gUnknown_0203ABA0
ldr r6, =sTransitionStructPtr
ldr r2, [r6]
ldr r3, =0x00003f41
strh r3, [r2, 0xE]
@ -8609,7 +8661,7 @@ sub_814A500: @ 814A500
movs r2, 0
ldr r6, =sub_814A684
ldr r4, =gUnknown_020393A8
ldr r3, =gUnknown_0203ABA0
ldr r3, =sTransitionStructPtr
_0814A50C:
lsls r1, r2, 1
adds r1, r4
@ -8644,7 +8696,7 @@ sub_814A550: @ 814A550
push {r7}
sub sp, 0x4
adds r4, r0, 0
ldr r1, =gUnknown_0203ABA0
ldr r1, =sTransitionStructPtr
ldr r0, [r1]
ldrb r2, [r0]
movs r3, 0
@ -8721,7 +8773,7 @@ _0814A5E4:
ldr r1, =gUnknown_02038C28
lsls r2, r5, 1
adds r2, r1
ldr r1, =gUnknown_0203ABA0
ldr r1, =sTransitionStructPtr
ldr r1, [r1]
ldrh r1, [r1, 0x16]
adds r0, r1
@ -8772,7 +8824,7 @@ _0814A654:
ldrh r0, [r4, 0x16]
subs r0, 0x11
strh r0, [r4, 0x16]
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrb r0, [r1]
adds r0, 0x1
@ -8793,7 +8845,7 @@ sub_814A684: @ 814A684
push {lr}
bl sub_8149F2C
ldr r2, =0x04000050
ldr r0, =gUnknown_0203ABA0
ldr r0, =sTransitionStructPtr
ldr r1, [r0]
ldrh r0, [r1, 0xE]
strh r0, [r2]

60
asm/rom_8145E84.s
View File

@ -1,60 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8145E84
sub_8145E84: @ 8145E84
push {r4,lr}
ldr r4, =gUnknown_0300120B
ldrb r0, [r4]
cmp r0, 0
beq _08145E98
cmp r0, 0x1
beq _08145EAC
b _08145EC0
.pool
_08145E98:
ldr r0, =gUnknown_0300120A
ldrb r0, [r0]
bl sub_8145F6C
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
b _08145EC0
.pool
_08145EAC:
bl sub_8145F20
lsls r0, 24
cmp r0, 0
beq _08145EC0
movs r0, 0
strb r0, [r4]
ldr r0, =c2_exit_to_overworld_2_switch
bl SetMainCallback2
_08145EC0:
bl RunTasks
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8145E84
thumb_func_start sub_8145EDC
sub_8145EDC: @ 8145EDC
push {lr}
ldr r1, =gUnknown_0300120A
strb r0, [r1]
ldr r0, =sub_8145E84
bl SetMainCallback2
pop {r0}
bx r0
.pool
thumb_func_end sub_8145EDC
.align 2, 0 @ Don't pad with nop.

2
asm/rom_8161F74.s
View File

@ -3186,7 +3186,7 @@ sub_8163A8C: @ 8163A8C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_8145F20
bl IsBattleTransitionDone
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1

1
ld_script.txt
View File

@ -173,7 +173,6 @@ SECTIONS {
asm/coins.o(.text);
asm/landmark.o(.text);
asm/fldeff_strength.o(.text);
asm/rom_8145E84.o(.text);
asm/battle_transition.o(.text);
asm/battle_controller_linkpartner.o(.text);
asm/battle_message.o(.text);

4
sym_bss.txt
View File

@ -336,10 +336,10 @@ gUnknown_03001204: @ 3001204
gUnknown_03001208: @ 3001208
.space 0x2
gUnknown_0300120A: @ 300120A
sTestingTransitionId: @ 300120A
.space 0x1
gUnknown_0300120B: @ 300120B
sTestingTransitionState: @ 300120B
.space 0x5
gUnknown_03001210: @ 3001210

2
sym_ewram.txt
View File

@ -1620,7 +1620,7 @@ gUnknown_0203AB98: @ 203AB98
gUnknown_0203AB9C: @ 203AB9C
.space 0x4
gUnknown_0203ABA0: @ 203ABA0
sTransitionStructPtr: @ 203ABA0
.space 0x4
gUnknown_0203ABA4: @ 203ABA4