thru sub_8011B94
This commit is contained in:
+8
-8
@@ -217,8 +217,8 @@ sub_800F34C: @ 800F34C
|
||||
_0800F37C: .4byte 0x0000b040
|
||||
thumb_func_end sub_800F34C
|
||||
|
||||
thumb_func_start sub_800F380
|
||||
sub_800F380: @ 800F380
|
||||
thumb_func_start LoadBattleMenuWindowGfx
|
||||
LoadBattleMenuWindowGfx: @ 800F380
|
||||
push {r4,r5,lr}
|
||||
movs r0, 0x2
|
||||
movs r1, 0x12
|
||||
@@ -278,7 +278,7 @@ _0800F3FC: .4byte 0x0000675a
|
||||
_0800F400: .4byte gPlttBufferFaded + 0xB8
|
||||
_0800F404: .4byte gBattleTypeFlags
|
||||
_0800F408: .4byte 0x00010010
|
||||
thumb_func_end sub_800F380
|
||||
thumb_func_end LoadBattleMenuWindowGfx
|
||||
|
||||
thumb_func_start sub_800F40C
|
||||
sub_800F40C: @ 800F40C
|
||||
@@ -309,7 +309,7 @@ LoadBattleTextboxAndBackground: @ 800F420
|
||||
movs r1, 0
|
||||
movs r2, 0x40
|
||||
bl LoadCompressedPalette
|
||||
bl sub_800F380
|
||||
bl LoadBattleMenuWindowGfx
|
||||
bl sub_800F40C
|
||||
pop {r0}
|
||||
bx r0
|
||||
@@ -1143,8 +1143,8 @@ _0800FAD8: .4byte 0x000003ff
|
||||
_0800FADC: .4byte 0xfffffc00
|
||||
thumb_func_end sub_800F6FC
|
||||
|
||||
thumb_func_start sub_800FAE0
|
||||
sub_800FAE0: @ 800FAE0
|
||||
thumb_func_start DrawBattleEntryBackground
|
||||
DrawBattleEntryBackground: @ 800FAE0
|
||||
push {r4,lr}
|
||||
ldr r0, _0800FB64 @ =gBattleTypeFlags
|
||||
ldr r1, [r0]
|
||||
@@ -1287,7 +1287,7 @@ _0800FC26:
|
||||
pop {r4}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_800FAE0
|
||||
thumb_func_end DrawBattleEntryBackground
|
||||
|
||||
thumb_func_start sub_800FC2C
|
||||
sub_800FC2C: @ 800FC2C
|
||||
@@ -1459,7 +1459,7 @@ _0800FD68:
|
||||
.align 2, 0
|
||||
_0800FD88: .4byte gUnknown_824EE34
|
||||
_0800FD8C:
|
||||
bl sub_800F380
|
||||
bl LoadBattleMenuWindowGfx
|
||||
b _0800FD94
|
||||
_0800FD92:
|
||||
movs r4, 0x1
|
||||
|
||||
-3671
File diff suppressed because it is too large
Load Diff
+3
-3
@@ -743,8 +743,8 @@ _0807FC54: .4byte gSpecialVar_Result
|
||||
_0807FC58: .4byte CB2_ReturnToFieldContinueScriptPlayMapMusic
|
||||
thumb_func_end sub_807FBF0
|
||||
|
||||
thumb_func_start sub_807FC5C
|
||||
sub_807FC5C: @ 807FC5C
|
||||
thumb_func_start BattleSetup_GetTerrainId
|
||||
BattleSetup_GetTerrainId: @ 807FC5C
|
||||
push {r4,r5,lr}
|
||||
sub sp, 0x4
|
||||
mov r4, sp
|
||||
@@ -891,7 +891,7 @@ _0807FD88:
|
||||
pop {r4,r5}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_807FC5C
|
||||
thumb_func_end BattleSetup_GetTerrainId
|
||||
|
||||
thumb_func_start GetBattleTransitionTypeByMap
|
||||
GetBattleTransitionTypeByMap: @ 807FD90
|
||||
|
||||
+3
-3
@@ -4012,8 +4012,8 @@ GetRfuPlayerCount: @ 80FA4EC
|
||||
_080FA4F4: .4byte gUnknown_3005450
|
||||
thumb_func_end GetRfuPlayerCount
|
||||
|
||||
thumb_func_start IsRfuTaskFinished
|
||||
IsRfuTaskFinished: @ 80FA4F8
|
||||
thumb_func_start IsLinkRfuTaskFinished
|
||||
IsLinkRfuTaskFinished: @ 80FA4F8
|
||||
push {lr}
|
||||
movs r1, 0
|
||||
ldr r0, _080FA50C @ =gUnknown_3005450
|
||||
@@ -4027,7 +4027,7 @@ _080FA506:
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_080FA50C: .4byte gUnknown_3005450
|
||||
thumb_func_end IsRfuTaskFinished
|
||||
thumb_func_end IsLinkRfuTaskFinished
|
||||
|
||||
thumb_func_start sub_80FA510
|
||||
sub_80FA510: @ 80FA510
|
||||
|
||||
+3
-3
@@ -422,7 +422,7 @@ _0804C9B0:
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0804C9E8
|
||||
bl IsRfuTaskFinished
|
||||
bl IsLinkRfuTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0804C9C4
|
||||
@@ -1832,7 +1832,7 @@ sub_804D5A4: @ 804D5A4
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0
|
||||
beq _0804D5FC
|
||||
bl IsRfuTaskFinished
|
||||
bl IsLinkRfuTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0804D620
|
||||
@@ -14745,7 +14745,7 @@ _0805434C:
|
||||
ldr r0, _08054378 @ =sub_804C718
|
||||
cmp r1, r0
|
||||
bne _08054384
|
||||
bl IsRfuTaskFinished
|
||||
bl IsLinkRfuTaskFinished
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _08054396
|
||||
|
||||
Reference in New Issue
Block a user