through ChooseAmbientCrySpecies

This commit is contained in:
PikalaxALT
2020-03-28 10:42:23 -04:00
parent fe9c3d3b58
commit 816e7ad1f8
15 changed files with 319 additions and 793 deletions
-775
View File
@@ -5,781 +5,6 @@
.text
thumb_func_start GetAdjustedInitialDirection
GetAdjustedInitialDirection: @ 8055B74
push {r4-r7,lr}
adds r6, r0, 0
lsls r1, 24
lsrs r7, r1, 24
lsls r2, 16
lsrs r4, r2, 16
lsls r3, 24
lsrs r5, r3, 24
ldr r0, _08055BD4 @ =0x00000802
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _08055B94
cmp r5, 0x6
beq _08055C3E
_08055B94:
lsls r4, 24
lsrs r5, r4, 24
adds r0, r5, 0
bl MetatileBehavior_ReturnFalse_2
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08055BD0
adds r0, r5, 0
bl MetatileBehavior_IsNonAnimDoor
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08055C68
adds r0, r5, 0
bl MetatileBehavior_IsWarpDoor_2
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08055C68
adds r0, r5, 0
bl MetatileBehavior_IsSouthArrowWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08055BD8
_08055BD0:
movs r0, 0x2
b _08055C6E
.align 2, 0
_08055BD4: .4byte 0x00000802
_08055BD8:
adds r0, r5, 0
bl MetatileBehavior_IsNorthArrowWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08055C68
adds r0, r5, 0
bl MetatileBehavior_IsWestArrowWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08055C3E
adds r0, r5, 0
bl MetatileBehavior_IsEastArrowWarp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08055C1E
adds r0, r5, 0
bl MetatileBehavior_IsUnknownWarp6C
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08055C1E
adds r0, r5, 0
bl MetatileBehavior_IsUnknownWarp6E
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08055C22
_08055C1E:
movs r0, 0x3
b _08055C6E
_08055C22:
adds r0, r5, 0
bl MetatileBehavior_IsUnknownWarp6D
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08055C3E
adds r0, r5, 0
bl MetatileBehavior_IsUnknownWarp6F
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08055C42
_08055C3E:
movs r0, 0x4
b _08055C6E
_08055C42:
ldrb r0, [r6]
cmp r0, 0x10
bne _08055C4C
cmp r7, 0x8
beq _08055C6C
_08055C4C:
cmp r0, 0x8
bne _08055C54
cmp r7, 0x10
beq _08055C6C
_08055C54:
lsrs r0, r4, 24
bl MetatileBehavior_IsLadder
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08055C6C
ldrb r0, [r6, 0x2]
cmp r0, 0
bne _08055C6C
_08055C68:
movs r0, 0x1
b _08055C6E
_08055C6C:
ldrb r0, [r6, 0x1]
_08055C6E:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end GetAdjustedInitialDirection
thumb_func_start GetCenterScreenMetatileBehavior
GetCenterScreenMetatileBehavior: @ 8055C74
push {lr}
ldr r0, _08055C98 @ =gSaveBlock1Ptr
ldr r1, [r0]
ldrh r0, [r1]
adds r0, 0x7
lsls r0, 16
asrs r0, 16
ldrh r1, [r1, 0x2]
adds r1, 0x7
lsls r1, 16
asrs r1, 16
bl MapGridGetMetatileBehaviorAt
lsls r0, 16
lsrs r0, 16
pop {r1}
bx r1
.align 2, 0
_08055C98: .4byte gSaveBlock1Ptr
thumb_func_end GetCenterScreenMetatileBehavior
thumb_func_start Overworld_IsBikingAllowed
Overworld_IsBikingAllowed: @ 8055C9C
push {lr}
ldr r0, _08055CAC @ =gMapHeader
ldrb r0, [r0, 0x18]
cmp r0, 0
beq _08055CB0
movs r0, 0x1
b _08055CB2
.align 2, 0
_08055CAC: .4byte gMapHeader
_08055CB0:
movs r0, 0
_08055CB2:
pop {r1}
bx r1
thumb_func_end Overworld_IsBikingAllowed
thumb_func_start SetDefaultFlashLevel
SetDefaultFlashLevel: @ 8055CB8
push {lr}
ldr r0, _08055CC8 @ =gMapHeader
ldrb r1, [r0, 0x15]
cmp r1, 0
bne _08055CD0
ldr r0, _08055CCC @ =gSaveBlock1Ptr
ldr r0, [r0]
b _08055CF8
.align 2, 0
_08055CC8: .4byte gMapHeader
_08055CCC: .4byte gSaveBlock1Ptr
_08055CD0:
ldr r0, _08055CE8 @ =0x00000806
bl FlagGet
lsls r0, 24
cmp r0, 0
beq _08055CF0
ldr r0, _08055CEC @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x30
movs r1, 0
b _08055CFA
.align 2, 0
_08055CE8: .4byte 0x00000806
_08055CEC: .4byte gSaveBlock1Ptr
_08055CF0:
ldr r0, _08055D00 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, _08055D04 @ =gMaxFlashLevel
ldr r1, [r1]
_08055CF8:
adds r0, 0x30
_08055CFA:
strb r1, [r0]
pop {r0}
bx r0
.align 2, 0
_08055D00: .4byte gSaveBlock1Ptr
_08055D04: .4byte gMaxFlashLevel
thumb_func_end SetDefaultFlashLevel
thumb_func_start Overworld_SetFlashLevel
Overworld_SetFlashLevel: @ 8055D08
push {lr}
adds r1, r0, 0
cmp r1, 0
blt _08055D18
ldr r0, _08055D28 @ =gMaxFlashLevel
ldr r0, [r0]
cmp r1, r0
ble _08055D1A
_08055D18:
movs r1, 0
_08055D1A:
ldr r0, _08055D2C @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x30
strb r1, [r0]
pop {r0}
bx r0
.align 2, 0
_08055D28: .4byte gMaxFlashLevel
_08055D2C: .4byte gSaveBlock1Ptr
thumb_func_end Overworld_SetFlashLevel
thumb_func_start Overworld_GetFlashLevel
Overworld_GetFlashLevel: @ 8055D30
ldr r0, _08055D3C @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x30
ldrb r0, [r0]
bx lr
.align 2, 0
_08055D3C: .4byte gSaveBlock1Ptr
thumb_func_end Overworld_GetFlashLevel
thumb_func_start SetCurrentMapLayout
SetCurrentMapLayout: @ 8055D40
push {lr}
ldr r1, _08055D54 @ =gSaveBlock1Ptr
ldr r1, [r1]
strh r0, [r1, 0x32]
bl GetMapLayout
ldr r1, _08055D58 @ =gMapHeader
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_08055D54: .4byte gSaveBlock1Ptr
_08055D58: .4byte gMapHeader
thumb_func_end SetCurrentMapLayout
thumb_func_start sub_8055D5C
sub_8055D5C: @ 8055D5C
ldr r2, _08055D68 @ =sWarpDestination
ldr r1, [r0, 0x4]
ldr r0, [r0]
str r0, [r2]
str r1, [r2, 0x4]
bx lr
.align 2, 0
_08055D68: .4byte sWarpDestination
thumb_func_end sub_8055D5C
thumb_func_start sub_8055D6C
sub_8055D6C: @ 8055D6C
push {lr}
adds r1, r0, 0
movs r0, 0
ldrsb r0, [r1, r0]
lsls r0, 16
lsrs r0, 16
ldrb r1, [r1, 0x1]
lsls r1, 24
asrs r1, 24
lsls r1, 16
lsrs r1, 16
bl Overworld_GetMapHeaderByGroupAndId
ldrh r0, [r0, 0x10]
pop {r1}
bx r1
thumb_func_end sub_8055D6C
thumb_func_start sub_8055D8C
sub_8055D8C: @ 8055D8C
push {lr}
ldr r0, _08055DA0 @ =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, 0x4
bl sub_8055D6C
lsls r0, 16
lsrs r0, 16
pop {r1}
bx r1
.align 2, 0
_08055DA0: .4byte gSaveBlock1Ptr
thumb_func_end sub_8055D8C
thumb_func_start sub_8055DA4
sub_8055DA4: @ 8055DA4
push {lr}
ldr r0, _08055DB4 @ =sWarpDestination
bl sub_8055D6C
lsls r0, 16
lsrs r0, 16
pop {r1}
bx r1
.align 2, 0
_08055DB4: .4byte sWarpDestination
thumb_func_end sub_8055DA4
thumb_func_start sub_8055DB8
sub_8055DB8: @ 8055DB8
push {lr}
bl ResetMapMusic
pop {r0}
bx r0
thumb_func_end sub_8055DB8
thumb_func_start Overworld_PlaySpecialMapMusic
Overworld_PlaySpecialMapMusic: @ 8055DC4
push {r4,r5,lr}
sub sp, 0x4
ldr r0, _08055DD8 @ =gDisableMapMusicChangeOnMapLoad
ldrb r0, [r0]
cmp r0, 0x1
bne _08055DDC
bl StopMapMusic
b _08055E6C
.align 2, 0
_08055DD8: .4byte gDisableMapMusicChangeOnMapLoad
_08055DDC:
cmp r0, 0x2
beq _08055E6C
ldr r0, _08055E14 @ =gSaveBlock1Ptr
ldr r0, [r0]
ldrh r1, [r0, 0x4]
ldr r0, _08055E18 @ =0x00004f01
cmp r1, r0
bne _08055E24
mov r4, sp
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
bl PlayerGetDestCoords
movs r1, 0
ldrsh r0, [r4, r1]
subs r0, 0x7
cmp r0, 0xA
bgt _08055E24
ldr r0, _08055E1C @ =gMPlayInfo_BGM
ldr r1, [r0]
ldr r0, _08055E20 @ =mus_win_gym
cmp r1, r0
bne _08055E24
movs r0, 0x4
bl FadeInBGM
b _08055E6C
.align 2, 0
_08055E14: .4byte gSaveBlock1Ptr
_08055E18: .4byte 0x00004f01
_08055E1C: .4byte gMPlayInfo_BGM
_08055E20: .4byte mus_win_gym
_08055E24:
bl sub_8055D8C
lsls r0, 16
lsrs r4, r0, 16
ldr r0, _08055E3C @ =gSaveBlock1Ptr
ldr r1, [r0]
ldrh r0, [r1, 0x2C]
cmp r0, 0
beq _08055E40
adds r4, r0, 0
b _08055E5A
.align 2, 0
_08055E3C: .4byte gSaveBlock1Ptr
_08055E40:
movs r0, 0x8
bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _08055E5A
ldr r5, _08055E74 @ =0x00000131 @ MUS_NAMINORI
adds r0, r5, 0
bl sub_8056124
cmp r0, 0
beq _08055E5A
adds r4, r5, 0
_08055E5A:
bl GetCurrentMapMusic
lsls r0, 16
lsrs r0, 16
cmp r4, r0
beq _08055E6C
adds r0, r4, 0
bl PlayNewMapMusic
_08055E6C:
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_08055E74: .4byte 0x00000131
thumb_func_end Overworld_PlaySpecialMapMusic
thumb_func_start Overworld_SetSavedMusic
Overworld_SetSavedMusic: @ 8055E78
ldr r1, _08055E80 @ =gSaveBlock1Ptr
ldr r1, [r1]
strh r0, [r1, 0x2C]
bx lr
.align 2, 0
_08055E80: .4byte gSaveBlock1Ptr
thumb_func_end Overworld_SetSavedMusic
thumb_func_start Overworld_ClearSavedMusic
Overworld_ClearSavedMusic: @ 8055E84
ldr r0, _08055E90 @ =gSaveBlock1Ptr
ldr r1, [r0]
movs r0, 0
strh r0, [r1, 0x2C]
bx lr
.align 2, 0
_08055E90: .4byte gSaveBlock1Ptr
thumb_func_end Overworld_ClearSavedMusic
thumb_func_start sub_8055E94
sub_8055E94: @ 8055E94
push {r4-r6,lr}
ldr r0, _08055EA4 @ =gDisableMapMusicChangeOnMapLoad
ldrb r0, [r0]
cmp r0, 0x1
bne _08055EA8
bl StopMapMusic
b _08055F14
.align 2, 0
_08055EA4: .4byte gDisableMapMusicChangeOnMapLoad
_08055EA8:
cmp r0, 0x2
beq _08055F14
ldr r0, _08055F04 @ =0x00004001
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08055F14
bl sub_8055DA4
lsls r0, 16
lsrs r4, r0, 16
bl GetCurrentMapMusic
lsls r0, 16
lsrs r6, r0, 16
ldr r5, _08055F08 @ =0x00000131 @ MUS_NAMINORI
cmp r6, r5
beq _08055F14
movs r0, 0x8
bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _08055EE8
adds r0, r5, 0
bl sub_8056124
cmp r0, 0
beq _08055EE8
adds r4, r5, 0
_08055EE8:
cmp r4, r6
beq _08055F14
movs r0, 0x6
bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _08055F0C
adds r0, r4, 0
movs r1, 0x4
movs r2, 0x4
bl FadeOutAndFadeInNewMapMusic
b _08055F14
.align 2, 0
_08055F04: .4byte 0x00004001
_08055F08: .4byte 0x00000131
_08055F0C:
adds r0, r4, 0
movs r1, 0x8
bl FadeOutAndPlayNewMapMusic
_08055F14:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_8055E94
thumb_func_start Overworld_ChangeMusicToDefault
Overworld_ChangeMusicToDefault: @ 8055F1C
push {r4,lr}
bl GetCurrentMapMusic
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
bl sub_8055D8C
lsls r0, 16
lsrs r0, 16
cmp r4, r0
beq _08055F42
bl sub_8055D8C
lsls r0, 16
lsrs r0, 16
movs r1, 0x8
bl FadeOutAndPlayNewMapMusic
_08055F42:
pop {r4}
pop {r0}
bx r0
thumb_func_end Overworld_ChangeMusicToDefault
thumb_func_start Overworld_ChangeMusicTo
Overworld_ChangeMusicTo: @ 8055F48
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
bl GetCurrentMapMusic
lsls r0, 16
lsrs r0, 16
cmp r0, r4
beq _08055F62
adds r0, r4, 0
movs r1, 0x8
bl FadeOutAndPlayNewMapMusic
_08055F62:
pop {r4}
pop {r0}
bx r0
thumb_func_end Overworld_ChangeMusicTo
thumb_func_start GetMapMusicFadeoutSpeed
GetMapMusicFadeoutSpeed: @ 8055F68
push {lr}
bl GetDestinationWarpMapHeader
ldrb r0, [r0, 0x17]
bl IsMapTypeIndoors
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08055F80
movs r0, 0x4
b _08055F82
_08055F80:
movs r0, 0x2
_08055F82:
pop {r1}
bx r1
thumb_func_end GetMapMusicFadeoutSpeed
thumb_func_start TryFadeOutOldMapMusic
TryFadeOutOldMapMusic: @ 8055F88
push {r4,lr}
bl sub_8055DA4
lsls r0, 16
lsrs r4, r0, 16
ldr r0, _08055FC0 @ =0x00004001
bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08055FB8
bl GetCurrentMapMusic
lsls r0, 16
lsrs r0, 16
cmp r4, r0
beq _08055FB8
bl GetMapMusicFadeoutSpeed
lsls r0, 24
lsrs r0, 24
bl FadeOutMapMusic
_08055FB8:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08055FC0: .4byte 0x00004001
thumb_func_end TryFadeOutOldMapMusic
thumb_func_start BGMusicStopped
BGMusicStopped: @ 8055FC4
push {lr}
bl IsNotWaitingForBGMStop
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
thumb_func_end BGMusicStopped
thumb_func_start Overworld_FadeOutMapMusic
Overworld_FadeOutMapMusic: @ 8055FD4
push {lr}
movs r0, 0x4
bl FadeOutMapMusic
pop {r0}
bx r0
thumb_func_end Overworld_FadeOutMapMusic
thumb_func_start sub_8055FE0
sub_8055FE0: @ 8055FE0
push {r4,lr}
sub sp, 0x4
mov r4, sp
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
bl PlayerGetDestCoords
ldr r0, _0805604C @ =gUnknown_2031DDC
ldrb r0, [r0]
cmp r0, 0x1
bne _08056014
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl MetatileBehavior_IsSurfable
lsls r0, 24
cmp r0, 0
beq _0805606A
_08056014:
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x58
bl __umodsi3
adds r0, 0xD4
lsls r0, 24
lsrs r4, r0, 24
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x1E
bl __umodsi3
adds r0, 0x32
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _08056050 @ =gDisableMapMusicChangeOnMapLoad
ldrb r0, [r0]
cmp r0, 0x1
bne _08056054
bl StopMapMusic
b _0805606A
.align 2, 0
_0805604C: .4byte gUnknown_2031DDC
_08056050: .4byte gDisableMapMusicChangeOnMapLoad
_08056054:
cmp r0, 0x2
beq _0805606A
ldr r0, _08056074 @ =gUnknown_2031DDA
ldrh r0, [r0]
lsls r1, r4, 24
asrs r1, 24
lsls r2, 24
asrs r2, 24
movs r3, 0x1
bl PlayCry2
_0805606A:
add sp, 0x4
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08056074: .4byte gUnknown_2031DDA
thumb_func_end sub_8055FE0
thumb_func_start sub_8056078
sub_8056078: @ 8056078
push {r4-r6,lr}
adds r6, r0, 0
adds r5, r1, 0
movs r1, 0
ldrsh r0, [r6, r1]
cmp r0, 0x4
bhi _08056106
lsls r0, 2
ldr r1, _08056090 @ =_08056094
adds r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08056090: .4byte _08056094
.align 2, 0
_08056094:
.4byte _080560A8
.4byte _080560BC
.4byte _080560D8
.4byte _080560F2
.4byte _08056106
_080560A8:
ldr r0, _080560B4 @ =gUnknown_2031DDA
ldrh r0, [r0]
cmp r0, 0
bne _080560B8
movs r0, 0x4
b _08056104
.align 2, 0
_080560B4: .4byte gUnknown_2031DDA
_080560B8:
movs r0, 0x1
b _08056104
_080560BC:
bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x96
lsls r1, 4
bl __umodsi3
movs r1, 0x96
lsls r1, 3
adds r0, r1
strh r0, [r5]
movs r0, 0x3
b _08056104
_080560D8:
bl Random
lsls r0, 16
lsrs r0, 16
movs r4, 0x96
lsls r4, 3
adds r1, r4, 0
bl __umodsi3
adds r0, r4
strh r0, [r5]
movs r0, 0x3
b _08056104
_080560F2:
ldrh r0, [r5]
subs r0, 0x1
strh r0, [r5]
lsls r0, 16
cmp r0, 0
bne _08056106
bl sub_8055FE0
movs r0, 0x2
_08056104:
strh r0, [r6]
_08056106:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_8056078
thumb_func_start ChooseAmbientCrySpecies
ChooseAmbientCrySpecies: @ 805610C
push {lr}
ldr r0, _0805611C @ =gUnknown_2031DDC
bl GetLocalWildMon
ldr r1, _08056120 @ =gUnknown_2031DDA
strh r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0805611C: .4byte gUnknown_2031DDC
_08056120: .4byte gUnknown_2031DDA
thumb_func_end ChooseAmbientCrySpecies
thumb_func_start sub_8056124
sub_8056124: @ 8056124
push {lr}