battle_main remaining funcs
This commit is contained in:
-2542
File diff suppressed because it is too large
Load Diff
@@ -1962,14 +1962,14 @@ _080CEEA0:
|
||||
bl Free
|
||||
str r6, [r4]
|
||||
bl FreeAllWindowBuffers
|
||||
ldr r0, _080CEECC @ =gUnknown_300537C
|
||||
ldr r0, _080CEECC @ =gCB2_AfterEvolution
|
||||
ldr r0, [r0]
|
||||
bl SetMainCallback2
|
||||
b _080CF528
|
||||
.align 2, 0
|
||||
_080CEEC4: .4byte gPaletteFade
|
||||
_080CEEC8: .4byte gUnknown_2039A20
|
||||
_080CEECC: .4byte gUnknown_300537C
|
||||
_080CEECC: .4byte gCB2_AfterEvolution
|
||||
_080CEED0:
|
||||
ldr r0, _080CEF04 @ =gBattleCommunication
|
||||
ldrb r1, [r0, 0x2]
|
||||
@@ -3252,14 +3252,14 @@ _080CF9E0:
|
||||
negs r0, r0
|
||||
ands r0, r1
|
||||
strb r0, [r2]
|
||||
ldr r0, _080CFA10 @ =gUnknown_300537C
|
||||
ldr r0, _080CFA10 @ =gCB2_AfterEvolution
|
||||
ldr r0, [r0]
|
||||
bl SetMainCallback2
|
||||
b _080D003A
|
||||
.align 2, 0
|
||||
_080CFA08: .4byte gUnknown_2039A20
|
||||
_080CFA0C: .4byte gTextFlags
|
||||
_080CFA10: .4byte gUnknown_300537C
|
||||
_080CFA10: .4byte gCB2_AfterEvolution
|
||||
_080CFA14:
|
||||
ldr r0, _080CFA60 @ =gBattleCommunication
|
||||
ldrb r1, [r0, 0x2]
|
||||
|
||||
+4
-4
@@ -15699,7 +15699,7 @@ sub_8126704: @ 8126704
|
||||
cmp r4, 0
|
||||
beq _08126754
|
||||
bl sub_811F070
|
||||
ldr r0, _08126750 @ =gUnknown_300537C
|
||||
ldr r0, _08126750 @ =gCB2_AfterEvolution
|
||||
ldr r1, [r6]
|
||||
str r1, [r0]
|
||||
ldrb r3, [r6, 0x9]
|
||||
@@ -15713,7 +15713,7 @@ sub_8126704: @ 8126704
|
||||
.align 2, 0
|
||||
_08126748: .4byte gUnknown_203B0A0
|
||||
_0812674C: .4byte gPlayerParty
|
||||
_08126750: .4byte gUnknown_300537C
|
||||
_08126750: .4byte gCB2_AfterEvolution
|
||||
_08126754:
|
||||
ldr r0, _08126768 @ =gTasks
|
||||
lsls r1, r5, 2
|
||||
@@ -16248,7 +16248,7 @@ _08126BCE:
|
||||
thumb_func_start sub_8126BD4
|
||||
sub_8126BD4: @ 8126BD4
|
||||
push {r4,r5,lr}
|
||||
ldr r1, _08126C10 @ =gUnknown_300537C
|
||||
ldr r1, _08126C10 @ =gCB2_AfterEvolution
|
||||
ldr r4, _08126C14 @ =gUnknown_203B0A0
|
||||
ldr r0, [r4]
|
||||
str r0, [r1]
|
||||
@@ -16274,7 +16274,7 @@ sub_8126BD4: @ 8126BD4
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08126C10: .4byte gUnknown_300537C
|
||||
_08126C10: .4byte gCB2_AfterEvolution
|
||||
_08126C14: .4byte gUnknown_203B0A0
|
||||
_08126C18: .4byte gSpecialVar_ItemId
|
||||
_08126C1C: .4byte gPlayerParty
|
||||
|
||||
+6
-6
@@ -11052,7 +11052,7 @@ _0805223C:
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_805080C
|
||||
ldr r1, _08052284 @ =gUnknown_300537C
|
||||
ldr r1, _08052284 @ =gCB2_AfterEvolution
|
||||
ldr r0, _08052288 @ =sub_8050948
|
||||
str r0, [r1]
|
||||
ldr r7, _0805228C @ =gUnknown_2031DA4
|
||||
@@ -11081,7 +11081,7 @@ _0805223C:
|
||||
b _080522A8
|
||||
.align 2, 0
|
||||
_08052280: .4byte gSpecialVar_0x8005
|
||||
_08052284: .4byte gUnknown_300537C
|
||||
_08052284: .4byte gCB2_AfterEvolution
|
||||
_08052288: .4byte sub_8050948
|
||||
_0805228C: .4byte gUnknown_2031DA4
|
||||
_08052290: .4byte gPlayerParty
|
||||
@@ -13277,7 +13277,7 @@ _08053698:
|
||||
ldrb r0, [r0]
|
||||
movs r1, 0
|
||||
bl sub_805080C
|
||||
ldr r1, _080536E0 @ =gUnknown_300537C
|
||||
ldr r1, _080536E0 @ =gCB2_AfterEvolution
|
||||
ldr r0, _080536E4 @ =sub_8050948
|
||||
str r0, [r1]
|
||||
ldr r7, _080536E8 @ =gUnknown_2031DA4
|
||||
@@ -13306,7 +13306,7 @@ _08053698:
|
||||
b _08053704
|
||||
.align 2, 0
|
||||
_080536DC: .4byte gSpecialVar_0x8005
|
||||
_080536E0: .4byte gUnknown_300537C
|
||||
_080536E0: .4byte gCB2_AfterEvolution
|
||||
_080536E4: .4byte sub_8050948
|
||||
_080536E8: .4byte gUnknown_2031DA4
|
||||
_080536EC: .4byte gPlayerParty
|
||||
@@ -13404,7 +13404,7 @@ _080537A8:
|
||||
.align 2, 0
|
||||
_080537B4: .4byte gSoftResetDisabled
|
||||
_080537B8:
|
||||
ldr r0, _080537F4 @ =gUnknown_300537C
|
||||
ldr r0, _080537F4 @ =gCB2_AfterEvolution
|
||||
ldr r1, _080537F8 @ =sub_8053E8C
|
||||
mov r8, r1
|
||||
str r1, [r0]
|
||||
@@ -13433,7 +13433,7 @@ _080537B8:
|
||||
bl TradeEvolutionScene
|
||||
b _0805380E
|
||||
.align 2, 0
|
||||
_080537F4: .4byte gUnknown_300537C
|
||||
_080537F4: .4byte gCB2_AfterEvolution
|
||||
_080537F8: .4byte sub_8053E8C
|
||||
_080537FC: .4byte gUnknown_2031DA4
|
||||
_08053800: .4byte gPlayerParty
|
||||
|
||||
Reference in New Issue
Block a user