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

merge

Browse Source
This commit is contained in:
ProjectRevoTPP
2017-12-25 00:05:39 -05:00
parent 2c7112ce8f 87958f2f87
commit 7dd75f453d
65 changed files with 10837 additions and 4279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2199
asm/bike.s
View File

File diff suppressed because it is too large Load Diff

2
asm/field_control_avatar.s
View File

@@ -62,7 +62,7 @@ _0809BF3C:
cmp r6, 0
bne _0809BFA2
_0809BF40:
bl sub_811A138
bl GetPlayerSpeed
lsls r0, 16
asrs r0, 16
cmp r0, 0x4

12
asm/field_effect.s
View File

@@ -2027,7 +2027,7 @@ _080B6A8A:
thumb_func_start mapldr_08084390
mapldr_08084390: @ 80B6AA4
push {r4,lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_black
ldr r0, =c3_080843F8
movs r1, 0
@@ -2113,7 +2113,7 @@ _080B6B58:
thumb_func_start sub_80B6B68
sub_80B6B68: @ 80B6B68
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl ScriptContext2_Enable
bl FreezeMapObjects
@@ -2780,7 +2780,7 @@ _080B709C:
thumb_func_start sub_80B70B4
sub_80B70B4: @ 80B70B4
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl ScriptContext2_Enable
ldr r0, =sub_80B70DC
@@ -3747,7 +3747,7 @@ _080B784C:
thumb_func_start mapldr_080851BC
mapldr_080851BC: @ 80B7868
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl ScriptContext2_Enable
ldr r0, =gFieldCallback
@@ -4458,7 +4458,7 @@ _080B7E40:
thumb_func_start mapldr_080859D4
mapldr_080859D4: @ 80B7E48
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl ScriptContext2_Enable
bl FreezeMapObjects
@@ -4903,7 +4903,7 @@ _080B81E6:
thumb_func_start mapldr_08085D88
mapldr_08085D88: @ 80B8200
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl ScriptContext2_Enable
bl FreezeMapObjects

176
asm/field_player_avatar.s
View File

@@ -57,7 +57,7 @@ player_step: @ 808A9C0
bne _0808AA26
adds r0, r7, 0
adds r1, r6, 0
bl sub_8119C3C
bl Bike_TryAcroBikeHistoryUpdate
adds r0, r5, 0
mov r1, r8
bl TryInterruptFieldObjectSpecialAnim
@@ -405,7 +405,7 @@ DoForcedMovementInCurrentDirection: @ 808AC58
thumb_func_start ForcedMovement_Slip
ForcedMovement_Slip: @ 808AC8C
push {lr}
ldr r0, =PlayerGoSpeed1
ldr r0, =PlayerGoSpeed2
bl DoForcedMovementInCurrentDirection
lsls r0, 24
lsrs r0, 24
@@ -417,7 +417,7 @@ ForcedMovement_Slip: @ 808AC8C
thumb_func_start ForcedMovement_WalkSouth
ForcedMovement_WalkSouth: @ 808ACA0
push {lr}
ldr r1, =PlayerGoSpeed0
ldr r1, =PlayerGoSpeed1
movs r0, 0x1
bl DoForcedMovement
lsls r0, 24
@@ -430,7 +430,7 @@ ForcedMovement_WalkSouth: @ 808ACA0
thumb_func_start ForcedMovement_WalkNorth
ForcedMovement_WalkNorth: @ 808ACB8
push {lr}
ldr r1, =PlayerGoSpeed0
ldr r1, =PlayerGoSpeed1
movs r0, 0x2
bl DoForcedMovement
lsls r0, 24
@@ -443,7 +443,7 @@ ForcedMovement_WalkNorth: @ 808ACB8
thumb_func_start ForcedMovement_WalkWest
ForcedMovement_WalkWest: @ 808ACD0
push {lr}
ldr r1, =PlayerGoSpeed0
ldr r1, =PlayerGoSpeed1
movs r0, 0x3
bl DoForcedMovement
lsls r0, 24
@@ -456,7 +456,7 @@ ForcedMovement_WalkWest: @ 808ACD0
thumb_func_start ForcedMovement_WalkEast
ForcedMovement_WalkEast: @ 808ACE8
push {lr}
ldr r1, =PlayerGoSpeed0
ldr r1, =PlayerGoSpeed1
movs r0, 0x4
bl DoForcedMovement
lsls r0, 24
@@ -469,7 +469,7 @@ ForcedMovement_WalkEast: @ 808ACE8
thumb_func_start ForcedMovement_PushedSouthByCurrent
ForcedMovement_PushedSouthByCurrent: @ 808AD00
push {lr}
ldr r1, =PlayerGoSpeed2
ldr r1, =PlayerGoSpeed3
movs r0, 0x1
bl DoForcedMovement
lsls r0, 24
@@ -482,7 +482,7 @@ ForcedMovement_PushedSouthByCurrent: @ 808AD00
thumb_func_start ForcedMovement_PushedNorthByCurrent
ForcedMovement_PushedNorthByCurrent: @ 808AD18
push {lr}
ldr r1, =PlayerGoSpeed2
ldr r1, =PlayerGoSpeed3
movs r0, 0x2
bl DoForcedMovement
lsls r0, 24
@@ -495,7 +495,7 @@ ForcedMovement_PushedNorthByCurrent: @ 808AD18
thumb_func_start ForcedMovement_PushedWestByCurrent
ForcedMovement_PushedWestByCurrent: @ 808AD30
push {lr}
ldr r1, =PlayerGoSpeed2
ldr r1, =PlayerGoSpeed3
movs r0, 0x3
bl DoForcedMovement
lsls r0, 24
@@ -508,7 +508,7 @@ ForcedMovement_PushedWestByCurrent: @ 808AD30
thumb_func_start ForcedMovement_PushedEastByCurrent
ForcedMovement_PushedEastByCurrent: @ 808AD48
push {lr}
ldr r1, =PlayerGoSpeed2
ldr r1, =PlayerGoSpeed3
movs r0, 0x4
bl DoForcedMovement
lsls r0, 24
@@ -548,7 +548,7 @@ ForcedMovement_Slide: @ 808AD60
thumb_func_start ForcedMovement_SlideSouth
ForcedMovement_SlideSouth: @ 808AD98
push {lr}
ldr r1, =PlayerGoSpeed1
ldr r1, =PlayerGoSpeed2
movs r0, 0x1
bl ForcedMovement_Slide
lsls r0, 24
@@ -561,7 +561,7 @@ ForcedMovement_SlideSouth: @ 808AD98
thumb_func_start ForcedMovement_SlideNorth
ForcedMovement_SlideNorth: @ 808ADB0
push {lr}
ldr r1, =PlayerGoSpeed1
ldr r1, =PlayerGoSpeed2
movs r0, 0x2
bl ForcedMovement_Slide
lsls r0, 24
@@ -574,7 +574,7 @@ ForcedMovement_SlideNorth: @ 808ADB0
thumb_func_start ForcedMovement_SlideWest
ForcedMovement_SlideWest: @ 808ADC8
push {lr}
ldr r1, =PlayerGoSpeed1
ldr r1, =PlayerGoSpeed2
movs r0, 0x3
bl ForcedMovement_Slide
lsls r0, 24
@@ -587,7 +587,7 @@ ForcedMovement_SlideWest: @ 808ADC8
thumb_func_start ForcedMovement_SlideEast
ForcedMovement_SlideEast: @ 808ADE0
push {lr}
ldr r1, =PlayerGoSpeed1
ldr r1, =PlayerGoSpeed2
movs r0, 0x4
bl ForcedMovement_Slide
lsls r0, 24
@@ -630,19 +630,19 @@ ForcedMovement_MuddySlope: @ 808AE10
ands r0, r1
cmp r0, 0x20
bne _0808AE36
bl sub_811A138
bl GetPlayerSpeed
lsls r0, 16
asrs r0, 16
cmp r0, 0x3
bgt _0808AE60
_0808AE36:
movs r0, 0
bl sub_811A114
bl Bike_UpdateBikeCounterSpeed
ldrb r0, [r4, 0x1]
movs r1, 0x2
orrs r0, r1
strb r0, [r4, 0x1]
ldr r1, =PlayerGoSpeed1
ldr r1, =PlayerGoSpeed2
movs r0, 0x1
bl DoForcedMovement
lsls r0, 24
@@ -791,7 +791,7 @@ _0808AF4E:
cmp r0, 0
beq _0808AF68
adds r0, r5, 0
bl PlayerGoSpeed1
bl PlayerGoSpeed2
b _0808AFB6
.pool
_0808AF68:
@@ -829,7 +829,7 @@ _0808AF68:
.pool
_0808AFB0:
adds r0, r5, 0
bl PlayerGoSpeed0
bl PlayerGoSpeed1
_0808AFB6:
pop {r4-r6}
pop {r0}
@@ -1471,7 +1471,7 @@ PlayerAvatarTransition_MachBike: @ 808B46C
bl SetPlayerAvatarStateMask
movs r0, 0
movs r1, 0
bl sub_811A0D0
bl BikeClearState
pop {r4}
pop {r0}
bx r0
@@ -1497,8 +1497,8 @@ PlayerAvatarTransition_AcroBike: @ 808B4A0
bl SetPlayerAvatarStateMask
movs r0, 0
movs r1, 0
bl sub_811A0D0
bl sub_811A188
bl BikeClearState
bl Bike_HandleBumpySlopeJump
pop {r4}
pop {r0}
bx r0
@@ -1774,9 +1774,9 @@ sub_808B6BC: @ 808B6BC
.pool
thumb_func_end sub_808B6BC
thumb_func_start player_npc_set_state_and_x22_etc
@ void player_npc_set_state_and_x22_etc(u8 animState, u8 a2)
player_npc_set_state_and_x22_etc: @ 808B6E4
thumb_func_start PlayerSetAnimId
@ void PlayerSetAnimId(u8 animState, u8 a2)
PlayerSetAnimId: @ 808B6E4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -1802,11 +1802,11 @@ _0808B712:
pop {r0}
bx r0
.pool
thumb_func_end player_npc_set_state_and_x22_etc
thumb_func_end PlayerSetAnimId
thumb_func_start PlayerGoSpeed0
@ void PlayerGoSpeed0(u8 direction)
PlayerGoSpeed0: @ 808B720
thumb_func_start PlayerGoSpeed1
@ void PlayerGoSpeed1(u8 direction)
PlayerGoSpeed1: @ 808B720
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1814,14 +1814,14 @@ PlayerGoSpeed0: @ 808B720
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerGoSpeed0
thumb_func_end PlayerGoSpeed1
thumb_func_start PlayerGoSpeed1
@ void PlayerGoSpeed1(u8 direction)
PlayerGoSpeed1: @ 808B738
thumb_func_start PlayerGoSpeed2
@ void PlayerGoSpeed2(u8 direction)
PlayerGoSpeed2: @ 808B738
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1829,14 +1829,14 @@ PlayerGoSpeed1: @ 808B738
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerGoSpeed1
thumb_func_end PlayerGoSpeed2
thumb_func_start PlayerGoSpeed2
@ void PlayerGoSpeed2(u8 direction)
PlayerGoSpeed2: @ 808B750
thumb_func_start PlayerGoSpeed3
@ void PlayerGoSpeed3(u8 direction)
PlayerGoSpeed3: @ 808B750
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1844,14 +1844,14 @@ PlayerGoSpeed2: @ 808B750
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerGoSpeed2
thumb_func_end PlayerGoSpeed3
thumb_func_start PlayerGoSpeed3
@ void PlayerGoSpeed3(u8 direction)
PlayerGoSpeed3: @ 808B768
thumb_func_start PlayerGoSpeed4
@ void PlayerGoSpeed4(u8 direction)
PlayerGoSpeed4: @ 808B768
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1859,10 +1859,10 @@ PlayerGoSpeed3: @ 808B768
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerGoSpeed3
thumb_func_end PlayerGoSpeed4
thumb_func_start PlayerRun
@ void PlayerRun(u8 direction)
@@ -1874,7 +1874,7 @@ PlayerRun: @ 808B780
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerRun
@@ -1893,7 +1893,7 @@ PlayerOnBikeCollide: @ 808B798
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r4}
pop {r0}
bx r0
@@ -1909,7 +1909,7 @@ PlayerOnBikeCollideWithFarawayIslandMew: @ 808B7BC
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerOnBikeCollideWithFarawayIslandMew
@@ -1928,7 +1928,7 @@ PlayerNotOnBikeCollide: @ 808B7D4
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r4}
pop {r0}
bx r0
@@ -1944,7 +1944,7 @@ PlayerNotOnBikeCollideWithFarawayIslandMew: @ 808B7F8
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerNotOnBikeCollideWithFarawayIslandMew
@@ -1959,7 +1959,7 @@ PlayerFaceDirection: @ 808B810
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerFaceDirection
@@ -1974,7 +1974,7 @@ PlayerTurnInPlace: @ 808B828
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end PlayerTurnInPlace
@@ -1993,7 +1993,7 @@ PlayerJumpLedge: @ 808B840
lsls r0, 24
lsrs r0, 24
movs r1, 0x8
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r4}
pop {r0}
bx r0
@@ -2033,8 +2033,8 @@ _0808B89A:
.pool
thumb_func_end sub_808B864
thumb_func_start sub_808B8A8
sub_808B8A8: @ 808B8A8
thumb_func_start PlayerIdleWheelie
PlayerIdleWheelie: @ 808B8A8
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2042,13 +2042,13 @@ sub_808B8A8: @ 808B8A8
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end sub_808B8A8
thumb_func_end PlayerIdleWheelie
thumb_func_start sub_808B8C0
sub_808B8C0: @ 808B8C0
thumb_func_start PlayerStartWheelie
PlayerStartWheelie: @ 808B8C0
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2056,13 +2056,13 @@ sub_808B8C0: @ 808B8C0
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end sub_808B8C0
thumb_func_end PlayerStartWheelie
thumb_func_start sub_808B8D8
sub_808B8D8: @ 808B8D8
thumb_func_start PlayerEndWheelie
PlayerEndWheelie: @ 808B8D8
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2070,13 +2070,13 @@ sub_808B8D8: @ 808B8D8
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end sub_808B8D8
thumb_func_end PlayerEndWheelie
thumb_func_start sub_808B8F0
sub_808B8F0: @ 808B8F0
thumb_func_start PlayerStandingHoppingWheelie
PlayerStandingHoppingWheelie: @ 808B8F0
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -2088,14 +2088,14 @@ sub_808B8F0: @ 808B8F0
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_808B8F0
thumb_func_end PlayerStandingHoppingWheelie
thumb_func_start sub_808B914
sub_808B914: @ 808B914
thumb_func_start PlayerMovingHoppingWheelie
PlayerMovingHoppingWheelie: @ 808B914
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -2107,14 +2107,14 @@ sub_808B914: @ 808B914
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_808B914
thumb_func_end PlayerMovingHoppingWheelie
thumb_func_start sub_808B938
sub_808B938: @ 808B938
thumb_func_start PlayerLedgeHoppingWheelie
PlayerLedgeHoppingWheelie: @ 808B938
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -2126,14 +2126,14 @@ sub_808B938: @ 808B938
lsls r0, 24
lsrs r0, 24
movs r1, 0x8
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_808B938
thumb_func_end PlayerLedgeHoppingWheelie
thumb_func_start sub_808B95C
sub_808B95C: @ 808B95C
thumb_func_start PlayerAcroTurnJump
PlayerAcroTurnJump: @ 808B95C
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -2145,11 +2145,11 @@ sub_808B95C: @ 808B95C
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_808B95C
thumb_func_end PlayerAcroTurnJump
thumb_func_start sub_808B980
sub_808B980: @ 808B980
@@ -2164,7 +2164,7 @@ sub_808B980: @ 808B980
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r4}
pop {r0}
bx r0
@@ -2179,7 +2179,7 @@ sub_808B9A4: @ 808B9A4
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end sub_808B9A4
@@ -2193,7 +2193,7 @@ sub_808B9BC: @ 808B9BC
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end sub_808B9BC
@@ -2207,7 +2207,7 @@ npc_use_some_d2s: @ 808B9D4
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
bl player_npc_set_state_and_x22_etc
bl PlayerSetAnimId
pop {r0}
bx r0
thumb_func_end npc_use_some_d2s
@@ -2592,9 +2592,9 @@ sub_808BCF4: @ 808BCF4
lsls r0, 24
cmp r0, 0
beq _0808BD2C
bl sub_811A188
bl Bike_HandleBumpySlopeJump
movs r0, 0
bl sub_811A114
bl Bike_UpdateBikeCounterSpeed
_0808BD2C:
pop {r4}
pop {r0}

20
asm/field_screen.s
View File

@@ -7975,7 +7975,7 @@ _080AF120:
sub_80AF128: @ 80AF128
push {lr}
bl ScriptContext2_Enable
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_black
ldr r0, =task0A_nop_for_a_while
movs r1, 0xA
@@ -8006,7 +8006,7 @@ _080AF160:
sub_80AF168: @ 80AF168
push {lr}
bl ScriptContext2_Enable
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_black
ldr r0, =task0A_asap_script_env_2_enable_and_set_ctx_running
movs r1, 0xA
@@ -8092,7 +8092,7 @@ _080AF20E:
sub_80AF214: @ 80AF214
push {lr}
bl ScriptContext2_Enable
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl palette_bg_faded_fill_black
ldr r0, =task_mpl_807DD60
movs r1, 0xA
@@ -8220,7 +8220,7 @@ _080AF30C:
sub_80AF314: @ 80AF314
push {lr}
bl ScriptContext2_Enable
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl palette_bg_faded_fill_black
ldr r0, =sub_80AF234
movs r1, 0xA
@@ -8279,7 +8279,7 @@ _080AF37E:
thumb_func_start mapldr_default
mapldr_default: @ 80AF398
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
bl sub_80AF334
bl ScriptContext2_Enable
@@ -8290,7 +8290,7 @@ mapldr_default: @ 80AF398
thumb_func_start sub_80AF3B0
sub_80AF3B0: @ 80AF3B0
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl sub_80AF08C
bl sub_80AF334
bl ScriptContext2_Enable
@@ -8304,7 +8304,7 @@ sub_80AF3C8: @ 80AF3C8
bl sub_81D6534
cmp r0, 0
bne _080AF3D6
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
_080AF3D6:
bl pal_fill_black
bl sub_80AF334
@@ -8316,7 +8316,7 @@ _080AF3D6:
thumb_func_start sub_80AF3E8
sub_80AF3E8: @ 80AF3E8
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
movs r0, 0x2E
bl PlaySE
@@ -8332,7 +8332,7 @@ sub_80AF3E8: @ 80AF3E8
thumb_func_start sub_80AF40C
sub_80AF40C: @ 80AF40C
push {lr}
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_for_maplights
movs r0, 0x2E
bl PlaySE
@@ -8680,7 +8680,7 @@ sub_80AF6D4: @ 80AF6D4
sub_80AF6F0: @ 80AF6F0
push {lr}
bl ScriptContext2_Enable
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl pal_fill_black
ldr r0, =task_mpl_807E3C8
movs r1, 0xA

2
asm/field_tasks.s
View File

@@ -1662,7 +1662,7 @@ _0809E572:
lsls r0, 24
cmp r0, 0
beq _0809E5D2
bl sub_811A138
bl GetPlayerSpeed
lsls r0, 16
asrs r0, 16
cmp r0, 0x4

2
asm/item_use.s
View File

@@ -354,7 +354,7 @@ _080FD320:
bl sav1_map_is_biking_allowed
cmp r0, 0x1
bne _080FD348
bl sub_8119FF8
bl IsBikingDisallowedByPlayer
lsls r0, 24
cmp r0, 0
bne _080FD348

6
asm/overworld.s
View File

@@ -2212,8 +2212,8 @@ call_ResetMapMusic: @ 8085778
bx r0
thumb_func_end call_ResetMapMusic
thumb_func_start sub_8085784
sub_8085784: @ 8085784
thumb_func_start Overworld_PlaySpecialMapMusic
Overworld_PlaySpecialMapMusic: @ 8085784
push {r4,lr}
bl sav1_map_get_music
lsls r0, 16
@@ -2261,7 +2261,7 @@ _080857E8:
pop {r0}
bx r0
.pool
thumb_func_end sub_8085784
thumb_func_end Overworld_PlaySpecialMapMusic
thumb_func_start Overworld_SetSavedMusic
Overworld_SetSavedMusic: @ 80857F4

28
asm/pokedex.s
View File

@@ -2028,7 +2028,7 @@ _080BC56E:
bl SetGpuReg
movs r0, 0
bl ResetBgsAndClearDma3BusyFlags
ldr r1, =gUnknown_0855D298
ldr r1, =gBgTemplates_0855D298
movs r0, 0
movs r2, 0x4
bl InitBgsFromTemplates
@@ -2119,7 +2119,7 @@ _080BC682:
lsls r0, 31
lsrs r0, 31
bl sub_80BC844
ldr r0, =gUnknown_0855D2A8
ldr r0, =sWindowTemplates_0855D2A8
bl InitWindows
bl DeactivateAllTextPrinters
movs r0, 0
@@ -2141,9 +2141,9 @@ _080BC6CC:
ldr r1, =gReservedSpritePaletteCount
movs r0, 0x8
strb r0, [r1]
ldr r0, =gUnknown_0855D26C
ldr r0, =gSpriteSheets_0855D26C
bl LoadCompressedObjectPic
ldr r0, =gUnknown_0855D27C
ldr r0, =gSpritePalettes_0855D26C
bl LoadSpritePalettes
adds r0, r5, 0
bl sub_80BDB7C
@@ -2298,7 +2298,7 @@ _080BC858:
bl IsNationalPokedexEnabled
cmp r0, 0
bne _080BC870
ldr r0, =gUnknown_08DC16F6
ldr r0, =gUnknown_08DC16F4 + 2
_080BC862:
movs r1, 0x1
movs r2, 0xBE
@@ -2609,7 +2609,7 @@ _080BCACC:
movs r7, 0x1
mov r9, r7
_080BCADA:
ldr r1, =gUnknown_0855C6A4
ldr r1, =gPokedexOrder_Alphabetical
lsls r4, 16
asrs r0, r4, 15
adds r0, r1
@@ -2687,7 +2687,7 @@ _080BCB78:
ldr r7, =gUnknown_02039B4C
ldr r6, =0x0000060c
_080BCB82:
ldr r1, =gUnknown_0855C9DA
ldr r1, =gPokedexOrder_Weight
asrs r0, 15
adds r0, r1
ldrh r0, [r0]
@@ -2752,7 +2752,7 @@ _080BCC08:
ldr r0, =0x00000181
mov r9, r0
_080BCC16:
ldr r1, =gUnknown_0855C9DA
ldr r1, =gPokedexOrder_Weight
lsls r4, 16
asrs r0, r4, 15
adds r0, r1
@@ -2819,7 +2819,7 @@ _080BCCA0:
ldr r7, =gUnknown_02039B4C
ldr r6, =0x0000060c
_080BCCAA:
ldr r1, =gUnknown_0855CCDE
ldr r1, =gPokedexOrder_Height
asrs r0, 15
adds r0, r1
ldrh r0, [r0]
@@ -2884,7 +2884,7 @@ _080BCD30:
ldr r0, =0x00000181
mov r9, r0
_080BCD3E:
ldr r1, =gUnknown_0855CCDE
ldr r1, =gPokedexOrder_Height
lsls r4, 16
asrs r0, r4, 15
adds r0, r1
@@ -3517,7 +3517,7 @@ sub_80BD23C: @ 80BD23C
b _080BD266
.pool
_080BD264:
ldr r4, =gUnknown_0855D2FE
ldr r4, =sText_TenDashes
_080BD266:
str r5, [sp]
movs r0, 0
@@ -8751,7 +8751,7 @@ _080C00E8:
ands r1, r0
cmp r1, 0
beq _080C0114
ldr r0, =gUnknown_08DC16F6
ldr r0, =gUnknown_08DC16F4 + 2
movs r1, 0x31
movs r2, 0xE
bl LoadPalette
@@ -11172,9 +11172,9 @@ _080C13F0:
b _080C1516
.pool
_080C1414:
ldr r0, =gUnknown_0855D26C
ldr r0, =gSpriteSheets_0855D26C
bl LoadCompressedObjectPic
ldr r0, =gUnknown_0855D27C
ldr r0, =gSpritePalettes_0855D26C
bl LoadSpritePalettes
adds r0, r4, 0
bl sub_80C2594

18
asm/pokemon_icon.s
View File

@@ -28,15 +28,15 @@ sub_80D2CC4: @ 80D2CC4
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldr r0, =gUnknown_0857C570
ldr r0, =sMonIconOamData
str r0, [sp, 0x18]
adds r0, r4, 0
adds r2, r5, 0
bl GetMonIconPtr
str r0, [sp, 0x1C]
ldr r0, =gUnknown_0857C5B4
ldr r0, =sMonIconAnims
str r0, [sp, 0x20]
ldr r0, =gUnknown_0857C5E8
ldr r0, =sMonIconAffineAnims
str r0, [sp, 0x24]
str r6, [sp, 0x28]
ldr r0, =gMonIconPaletteIndices
@@ -102,13 +102,13 @@ sub_80D2D78: @ 80D2D78
lsls r6, 24
lsrs r6, 24
mov r3, sp
ldr r2, =gUnknown_0857C570
ldr r2, =sMonIconOamData
str r2, [sp]
movs r2, 0
str r2, [sp, 0x4]
ldr r2, =gUnknown_0857C5B4
ldr r2, =sMonIconAnims
str r2, [sp, 0x8]
ldr r2, =gUnknown_0857C5E8
ldr r2, =sMonIconAffineAnims
str r2, [sp, 0xC]
str r1, [sp, 0x10]
ldr r2, =gMonIconPaletteIndices
@@ -601,7 +601,7 @@ _080D3126:
strb r7, [r5]
b _080D31A4
_080D312A:
ldr r2, =gUnknown_0857C5F0
ldr r2, =sSpriteImageSizes
ldrb r1, [r4, 0x3]
lsrs r1, 6
lsls r1, 1
@@ -689,7 +689,7 @@ sub_80D31B4: @ 80D31B4
mov r8, r0
movs r0, 0
str r0, [sp, 0x30]
ldr r2, =gUnknown_0857C5F0
ldr r2, =sSpriteImageSizes
mov r0, r9
ldr r6, [r0]
ldrb r1, [r6, 0x3]
@@ -776,7 +776,7 @@ sub_80D328C: @ 80D328C
sub sp, 0x8
movs r1, 0
str r1, [sp]
ldr r3, =gUnknown_0857C5F0
ldr r3, =sSpriteImageSizes
ldrb r2, [r0, 0x3]
lsrs r2, 6
lsls r2, 1

4
asm/pokemon_storage_system.s
View File

@@ -1106,7 +1106,7 @@ sub_80C7958: @ 80C7958
ldrh r0, [r3]
adds r0, 0x1
strh r0, [r1]
ldr r0, =gUnknown_08571710
ldr r0, =sSpriteAnimTable_8571710
str r0, [sp, 0xC]
movs r4, 0
_080C7A10:
@@ -9124,7 +9124,7 @@ _080CBF80:
adds r1, r3
ldr r0, [r1]
ldr r2, [r0]
ldr r0, =gUnknown_0857291C
ldr r0, =gSpriteAffineAnimTable_857291C
str r0, [r2, 0x10]
ldr r0, [r1]
ldr r0, [r0]

6
asm/rayquaza_scene.s
View File

@@ -1172,8 +1172,8 @@ _081D7082:
.pool
thumb_func_end sub_81D706C
thumb_func_start task_add_00_WIN0V_open_close_above_and_more
task_add_00_WIN0V_open_close_above_and_more: @ 81D7134
thumb_func_start sub_81D7134
sub_81D7134: @ 81D7134
push {r4-r7,lr}
sub sp, 0x8
lsls r0, 24
@@ -1264,7 +1264,7 @@ _081D71EE:
pop {r0}
bx r0
.pool
thumb_func_end task_add_00_WIN0V_open_close_above_and_more
thumb_func_end sub_81D7134
thumb_func_start sub_81D7228
sub_81D7228: @ 81D7228

2
asm/rom6.s
View File

@@ -447,5 +447,5 @@ _081357EE:
bx r0
.pool
thumb_func_end sub_81357BC
.align 2, 0 @ Don't pad with nop.

12
asm/rom_81370FC.s
View File

@@ -1347,7 +1347,7 @@ mapldr_080CA5C0: @ 8137C5C
push {lr}
sub sp, 0x4
bl ScriptContext2_Enable
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
bl sp109_CreatePCMenu
bl sub_80E2514
movs r0, 0x1
@@ -1412,10 +1412,10 @@ Special_ViewWallClock: @ 8137CC8
thumb_func_start wild_pokemon_reroll
wild_pokemon_reroll: @ 8137CEC
ldr r0, =gUnknown_0203AB54
ldr r0, =gBikeCyclingChallenge
movs r1, 0
strb r1, [r0]
ldr r0, =gUnknown_0203AB55
ldr r0, =0x0203ab55
strb r1, [r0]
ldr r1, =gUnknown_0203AB58
movs r0, 0
@@ -1426,10 +1426,10 @@ wild_pokemon_reroll: @ 8137CEC
thumb_func_start sub_8137D0C
sub_8137D0C: @ 8137D0C
ldr r1, =gUnknown_0203AB54
ldr r1, =gBikeCyclingChallenge
movs r0, 0x1
strb r0, [r1]
ldr r1, =gUnknown_0203AB55
ldr r1, =0x0203ab55
movs r0, 0
strb r0, [r1]
ldr r1, =gUnknown_0203AB58
@@ -1598,7 +1598,7 @@ sub_8137E6C: @ 8137E6C
ldr r4, [r0, 0x20]
ldr r0, [r1]
subs r4, r0
ldr r5, =gUnknown_0203AB55
ldr r5, =0x0203ab55
ldrb r1, [r5]
adds r0, r4, 0
bl sub_8137D5C

4
asm/rotating_gate.s
View File

@@ -410,7 +410,7 @@ sub_80FBAE4: @ 80FBAE4
adds r0, r4, 0x4
lsls r0, 24
lsrs r4, r0, 24
bl sub_811A138
bl GetPlayerSpeed
lsls r0, 16
asrs r0, 16
cmp r0, 0x1
@@ -433,7 +433,7 @@ _080FBB2A:
adds r0, 0x8
lsls r0, 24
lsrs r4, r0, 24
bl sub_811A138
bl GetPlayerSpeed
lsls r0, 16
asrs r0, 16
cmp r0, 0x1

2
asm/trainer_card.s
View File

@@ -5766,7 +5766,7 @@ sub_80C58D4: @ 80C58D4
beq _080C5914
cmp r0, 0x2
beq _080C591C
bl sub_8085784
bl Overworld_PlaySpecialMapMusic
b _080C5924
.pool
_080C5914: