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

Port/decomp scrcmd

Browse Source
This commit is contained in:
Diegoisawesome
2017-10-12 02:06:19 -05:00
parent 8914645231
commit f1b6358047
115 changed files with 3540 additions and 6621 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_frontier_1.s
+3 -3
View File
@@ -14296,7 +14296,7 @@ sub_81963F0: @ 81963F0
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80D338C
bl sub_809757C
bl UnfreezeMapObjects
bl ScriptContext2_Disable
_08196446:
movs r0, 0x1
@@ -14680,7 +14680,7 @@ sub_8196748: @ 8196748
ldr r4, =gUnknown_085500A4
_08196750:
ldrh r0, [r4]
bl trainer_flag_check
bl HasTrainerAlreadyBeenFought
lsls r0, 24
cmp r0, 0
beq _0819675E
@@ -14706,7 +14706,7 @@ sub_8196774: @ 8196774
ldr r5, =gUnknown_085500A4
_0819677E:
ldrh r0, [r5]
bl trainer_flag_check
bl HasTrainerAlreadyBeenFought
lsls r0, 24
cmp r0, 0
beq _0819679A
asm/battle_frontier_2.s
+4 -4
View File
@@ -27306,7 +27306,7 @@ _081A8A74:
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
adds r3, r7, 0
bl exec_movement
bl ScriptMovement_StartObjectMovementScript
b _081A8AD4
.pool
_081A8ACC:
@@ -27540,7 +27540,7 @@ _081A8C72:
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
bl exec_movement
bl ScriptMovement_StartObjectMovementScript
b _081A8D32
.pool
_081A8C9C:
@@ -27618,7 +27618,7 @@ _081A8D12:
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
bl exec_movement
bl ScriptMovement_StartObjectMovementScript
_081A8D32:
mov r0, r9
adds r0, 0x1
@@ -28660,7 +28660,7 @@ _081A95EE:
lsls r0, r7, 2
adds r0, r1
ldr r0, [r0]
bl box_related_two__2
bl ShowFieldMessage
add sp, 0x8
pop {r3,r4}
mov r8, r3
asm/battle_setup.s
+32 -32
View File
@@ -299,8 +299,8 @@ sub_80B086C: @ 80B086C
.pool
thumb_func_end sub_80B086C
thumb_func_start sub_80B08A8
sub_80B08A8: @ 80B08A8
thumb_func_start BattleSetup_StartScriptedWildBattle
BattleSetup_StartScriptedWildBattle: @ 80B08A8
push {lr}
bl ScriptContext2_Enable
ldr r1, =gMain
@@ -323,7 +323,7 @@ sub_80B08A8: @ 80B08A8
pop {r0}
bx r0
.pool
thumb_func_end sub_80B08A8
thumb_func_end BattleSetup_StartScriptedWildBattle
thumb_func_start sub_80B08EC
sub_80B08EC: @ 80B08EC
@@ -1357,7 +1357,7 @@ sub_80B1158: @ 80B1158
movs r1, 0x5
movs r2, 0
movs r3, 0
bl sub_80F9244
bl ScriptGiveMon
bl ResetTasks
bl PlayBattleBGM
ldr r0, =sub_80B11A8
@@ -1686,9 +1686,9 @@ _080B141A:
.pool
thumb_func_end battle_80801F0
thumb_func_start TrainerBattleConfigure
@ u8 *TrainerBattleConfigure(u8 *args)
TrainerBattleConfigure: @ 80B1430
thumb_func_start BattleSetup_ConfigureTrainerBattle
@ u8 *BattleSetup_ConfigureTrainerBattle(u8 *args)
BattleSetup_ConfigureTrainerBattle: @ 80B1430
push {r4,r5,lr}
adds r5, r0, 0
bl InitTrainerBattleVariables
@@ -1872,7 +1872,7 @@ _080B161E:
pop {r1}
bx r1
.pool
thumb_func_end TrainerBattleConfigure
thumb_func_end BattleSetup_ConfigureTrainerBattle
thumb_func_start SingleTrainerWantsBattle
@ void SingleTrainerWantsBattle(u8 trainerFieldObjectId, u8 *trainerScript)
@@ -1892,7 +1892,7 @@ SingleTrainerWantsBattle: @ 80B162C
strh r0, [r4]
adds r1, 0x1
adds r0, r1, 0
bl TrainerBattleConfigure
bl BattleSetup_ConfigureTrainerBattle
ldr r0, =gUnknown_08271354
bl ScriptContext1_SetupScript
bl ScriptContext2_Enable
@@ -1920,7 +1920,7 @@ TwoTrainersWantBattle: @ 80B1670
strh r0, [r4]
adds r1, 0x1
adds r0, r1, 0
bl TrainerBattleConfigure
bl BattleSetup_ConfigureTrainerBattle
pop {r4}
pop {r0}
bx r0
@@ -2056,8 +2056,8 @@ sub_80B178C: @ 80B178C
bx r0
thumb_func_end sub_80B178C
thumb_func_start trainer_flag_check
trainer_flag_check: @ 80B17A0
thumb_func_start HasTrainerAlreadyBeenFought
HasTrainerAlreadyBeenFought: @ 80B17A0
push {lr}
lsls r0, 16
movs r1, 0xA0
@@ -2069,7 +2069,7 @@ trainer_flag_check: @ 80B17A0
lsrs r0, 24
pop {r1}
bx r1
thumb_func_end trainer_flag_check
thumb_func_end HasTrainerAlreadyBeenFought
thumb_func_start trainer_flag_set
trainer_flag_set: @ 80B17B8
@@ -2092,13 +2092,13 @@ trainer_flag_clear: @ 80B17CC
lsls r1, 19
adds r0, r1
lsrs r0, 16
bl FlagReset
bl FlagClear
pop {r0}
bx r0
thumb_func_end trainer_flag_clear
thumb_func_start sub_80B17E0
sub_80B17E0: @ 80B17E0
thumb_func_start BattleSetup_StartTrainerBattle
BattleSetup_StartTrainerBattle: @ 80B17E0
push {r4,lr}
ldr r0, =gUnknown_030060A8
ldrb r0, [r0]
@@ -2217,7 +2217,7 @@ _080B190C:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_80B17E0
thumb_func_end BattleSetup_StartTrainerBattle
thumb_func_start sub_80B1918
sub_80B1918: @ 80B1918
@@ -2407,14 +2407,14 @@ _080B1AD8:
.pool
_080B1AEC:
bl sub_80B1C7C
bl box_related_two__2
bl ShowFieldMessage
_080B1AF4:
pop {r0}
bx r0
thumb_func_end sub_80B1A14
thumb_func_start sub_80B1AF8
sub_80B1AF8: @ 80B1AF8
thumb_func_start BattleSetup_GetScriptAddrAfterBattle
BattleSetup_GetScriptAddrAfterBattle: @ 80B1AF8
push {lr}
ldr r0, =gUnknown_02038BEC
ldr r0, [r0]
@@ -2425,10 +2425,10 @@ _080B1B04:
pop {r1}
bx r1
.pool
thumb_func_end sub_80B1AF8
thumb_func_end BattleSetup_GetScriptAddrAfterBattle
thumb_func_start sub_80B1B10
sub_80B1B10: @ 80B1B10
thumb_func_start BattleSetup_GetTrainerPostBattleScript
BattleSetup_GetTrainerPostBattleScript: @ 80B1B10
push {lr}
ldr r1, =gUnknown_02038BF8
ldrb r2, [r1]
@@ -2462,13 +2462,13 @@ _080B1B56:
pop {r1}
bx r1
.pool
thumb_func_end sub_80B1B10
thumb_func_end BattleSetup_GetTrainerPostBattleScript
thumb_func_start special_trainer_unable_to_battle
special_trainer_unable_to_battle: @ 80B1B60
push {lr}
bl sub_80B1D18
bl box_related_two__2
bl ShowFieldMessage
pop {r0}
bx r0
thumb_func_end special_trainer_unable_to_battle
@@ -2796,7 +2796,7 @@ _080B1DCE:
ldrh r0, [r4]
cmp r0, 0
beq _080B1DE2
bl trainer_flag_check
bl HasTrainerAlreadyBeenFought
lsls r0, 24
cmp r0, 0
bne _080B1DCA
@@ -2895,7 +2895,7 @@ sub_80B1E94: @ 80B1E94
lsls r0, r4, 4
adds r0, r5
ldrh r0, [r0]
bl trainer_flag_check
bl HasTrainerAlreadyBeenFought
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3076,7 +3076,7 @@ _080B1FE2:
ldrh r0, [r4]
cmp r0, 0
beq _080B1FCA
bl trainer_flag_check
bl HasTrainerAlreadyBeenFought
lsls r0, 24
cmp r0, 0
beq _080B1FD4
@@ -3127,7 +3127,7 @@ _080B203A:
ldrh r0, [r4]
cmp r0, 0
beq _080B201E
bl trainer_flag_check
bl HasTrainerAlreadyBeenFought
lsls r0, 24
cmp r0, 0
beq _080B2028
@@ -3233,7 +3233,7 @@ sub_80B20F4: @ 80B20F4
lsls r0, r1, 4
adds r0, r4
ldrh r0, [r0, 0x2]
bl trainer_flag_check
bl HasTrainerAlreadyBeenFought
lsls r0, 24
cmp r0, 0
beq _080B211E
@@ -3509,7 +3509,7 @@ sub_80B2318: @ 80B2318
lsrs r4, r0, 12
adds r6, r4, r7
ldrh r0, [r6]
bl trainer_flag_check
bl HasTrainerAlreadyBeenFought
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3527,7 +3527,7 @@ _080B2338:
adds r4, r6, 0x2
_080B2346:
ldrh r0, [r4]
bl trainer_flag_check
bl HasTrainerAlreadyBeenFought
lsls r0, 24
cmp r0, 0
beq _080B2360
asm/battle_tower.s
+7 -7
View File
@@ -3548,11 +3548,11 @@ _08163E2C:
movs r0, 0
strb r0, [r4]
ldr r0, =gUnknown_08224158
bl TrainerBattleConfigure
bl BattleSetup_ConfigureTrainerBattle
movs r0, 0x1
strb r0, [r4]
ldr r0, =gUnknown_08224167
bl TrainerBattleConfigure
bl BattleSetup_ConfigureTrainerBattle
ldr r0, =gPartnerTrainerId
strh r5, [r0]
ldr r0, =sub_8163A8C
@@ -4364,7 +4364,7 @@ _081644E0:
strb r0, [r1, 0x1]
movs r0, 0xD8
lsls r0, 2
bl FlagReset
bl FlagClear
ldr r0, [r6]
adds r0, r5
ldrh r0, [r0]
@@ -4525,7 +4525,7 @@ _08164660:
adds r1, 0xC0
strb r0, [r1, 0x1]
ldr r0, =0x00000361
bl FlagReset
bl FlagClear
ldr r0, [r6]
adds r0, r5
ldrh r0, [r0]
@@ -5016,7 +5016,7 @@ _08164B04:
lsls r0, 2
adds r0, r1
ldr r0, [r0]
bl box_related_two__2
bl ShowFieldMessage
b _08164B54
.pool
_08164B28:
@@ -5040,7 +5040,7 @@ _08164B28:
lsls r1, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
_08164B54:
add sp, 0x8
pop {r3-r5}
@@ -6056,7 +6056,7 @@ _081653E0:
bne _081653F8
bl sub_80F01B8
movs r0, 0x77
bl FlagReset
bl FlagClear
_081653F8:
pop {r0}
bx r0
asm/battle_transition.s
+2 -2
View File
@@ -2151,7 +2151,7 @@ sub_8147018: @ 8147018
ands r5, r0
movs r1, 0
mov r8, r4
ldr r6, =gFieldEffectSpawnParams
ldr r6, =gFieldEffectArguments
_08147046:
lsls r5, 16
asrs r5, 16
@@ -2221,7 +2221,7 @@ _081470C4:
sub_81470D0: @ 81470D0
push {r4,r5,lr}
ldr r0, =gUnknown_085C8E68
ldr r5, =gFieldEffectSpawnParams
ldr r5, =gFieldEffectArguments
movs r2, 0
ldrsh r1, [r5, r2]
movs r3, 0x4
asm/bike.s
+2 -2
View File
@@ -2013,9 +2013,9 @@ _0811A0B0:
bl SetPlayerAvatarTransitionFlags
ldr r4, =0x00000193
adds r0, r4, 0
bl sav1_set_battle_music_maybe
bl Overworld_SetSavedMusic
adds r0, r4, 0
bl sub_80858C4
bl Overworld_ChangeMusicTo
_0811A0C4:
pop {r4}
pop {r0}
asm/cable_club.s
+11 -11
View File
@@ -434,7 +434,7 @@ sub_80B2688: @ 80B2688
movs r0, 0x15
bl PlaySE
ldr r0, =gUnknown_082780B3
bl box_related_two__3
bl ShowFieldAutoScrollMessage
ldr r0, =sub_80B270C
b _080B26FA
.pool
@@ -442,7 +442,7 @@ _080B26EC:
movs r0, 0x16
bl PlaySE
ldr r0, =gUnknown_08278131
bl box_related_two__3
bl ShowFieldAutoScrollMessage
ldr r0, =sub_80B2918
_080B26FA:
str r0, [r4]
@@ -545,7 +545,7 @@ sub_80B275C: @ 80B275C
movs r3, 0x1
bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_082780F2
bl box_related_two__3
bl ShowFieldAutoScrollMessage
mov r0, r9
subs r0, 0x8
add r0, r8
@@ -598,7 +598,7 @@ sub_80B2804: @ 80B2804
beq _080B2878
_080B2852:
ldr r0, =gUnknown_082780B3
bl box_related_two__3
bl ShowFieldAutoScrollMessage
ldr r1, =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -719,7 +719,7 @@ sub_80B2918: @ 80B2918
cmp r0, 0x1
bhi _080B297C
bl sub_800AC34
bl textbox_close
bl HideFieldMessageBox
ldr r0, =sub_80B2CB0
b _080B29E4
.pool
@@ -730,7 +730,7 @@ _080B297C:
bne _080B2994
_080B2984:
bl sub_80097E8
bl textbox_close
bl HideFieldMessageBox
ldr r0, =sub_80B2CB0
b _080B29E4
.pool
@@ -814,7 +814,7 @@ _080B2A42:
_080B2A4A:
bl sub_80097E8
_080B2A4E:
bl textbox_close
bl HideFieldMessageBox
ldr r0, =gTasks
lsls r1, r7, 2
adds r1, r7
@@ -1151,7 +1151,7 @@ sub_80B2D2C: @ 80B2D2C
bl sub_80B241C
ldrb r0, [r4, 0x12]
bl RemoveWindow
bl textbox_close
bl HideFieldMessageBox
bl EnableBothScriptContexts
adds r0, r5, 0
bl DestroyTask
@@ -2297,13 +2297,13 @@ _080B3750:
b _080B37CC
_080B375A:
ldr r0, =gUnknown_08278091
bl box_related_two__2
bl ShowFieldMessage
movs r0, 0x1
strh r0, [r5, 0x8]
b _080B37CC
.pool
_080B376C:
bl sub_809833C
bl IsFieldMessageBoxHidden
lsls r0, 24
cmp r0, 0
beq _080B37CC
@@ -2325,7 +2325,7 @@ _080B378C:
beq _080B37B2
b _080B37CC
_080B379E:
bl textbox_close
bl HideFieldMessageBox
movs r0, 0
strh r0, [r5, 0x8]
bl sub_80872C4
asm/clock.s
+3 -3
View File
@@ -27,8 +27,8 @@ sub_809E778: @ 809E778
.pool
thumb_func_end sub_809E778
thumb_func_start sub_809E7B0
sub_809E7B0: @ 809E7B0
thumb_func_start DoTimeBasedEvents
DoTimeBasedEvents: @ 809E7B0
push {r4,lr}
ldr r0, =0x00000895
bl FlagGet
@@ -50,7 +50,7 @@ _0809E7DA:
pop {r0}
bx r0
.pool
thumb_func_end sub_809E7B0
thumb_func_end DoTimeBasedEvents
thumb_func_start sub_809E7E8
sub_809E7E8: @ 809E7E8
asm/coins.s
+8 -8
View File
@@ -5,9 +5,9 @@
.text
thumb_func_start AddCoins
@ bool8 AddCoins(u16 toAdd)
AddCoins: @ 8145C80
thumb_func_start GiveCoins
@ bool8 GiveCoins(u16 toAdd)
GiveCoins: @ 8145C80
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -44,11 +44,11 @@ _08145CC0:
pop {r1}
bx r1
.pool
thumb_func_end AddCoins
thumb_func_end GiveCoins
thumb_func_start SubtractCoins
@ bool8 SubtractCoins(u16 toSub)
SubtractCoins: @ 8145CCC
thumb_func_start TakeCoins
@ bool8 TakeCoins(u16 toSub)
TakeCoins: @ 8145CCC
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -69,6 +69,6 @@ _08145CEE:
pop {r4}
pop {r1}
bx r1
thumb_func_end SubtractCoins
thumb_func_end TakeCoins
.align 2, 0 @ Don't pad with nop.
asm/contest.s
+6 -6
View File
@@ -6313,7 +6313,7 @@ _080DAE1E:
movs r0, 0x4
b _080DAE9A
_080DAE2E:
ldr r0, =gUnknown_02039F2C
ldr r0, =gScriptContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bhi _080DAE82
@@ -8456,7 +8456,7 @@ sub_80DBED4: @ 80DBED4
adds r0, r1
ldrb r1, [r0]
lsls r1, 1
ldr r0, =gUnknown_02039F2C
ldr r0, =gScriptContestCategory
ldrh r0, [r0]
lsls r0, 3
adds r1, r0
@@ -11805,7 +11805,7 @@ sub_80DD9F0: @ 80DD9F0
ldrb r1, [r0, 0x1]
lsls r1, 29
lsrs r1, 29
ldr r0, =gUnknown_02039F2C
ldr r0, =gScriptContestCategory
ldrh r2, [r0]
lsls r0, r2, 2
adds r0, r2
@@ -14260,7 +14260,7 @@ _080DEDE6:
b _080DEF90
.pool
_080DEE00:
ldr r0, =gUnknown_02039F2C
ldr r0, =gScriptContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bhi _080DEE4C
@@ -14383,7 +14383,7 @@ _080DEF02:
mov r2, r9
lsls r1, r2, 5
adds r0, r1
ldr r1, =gUnknown_02039F2C
ldr r1, =gScriptContestCategory
ldrh r1, [r1]
ldr r3, =0x00002e9a
adds r0, r3
@@ -14485,7 +14485,7 @@ _080DEFE6:
b _080DF03A
.pool
_080DEFF8:
ldr r0, =gUnknown_02039F2C
ldr r0, =gScriptContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bhi _080DF038
asm/contest_ai.s
+1 -1
View File
@@ -1352,7 +1352,7 @@ sub_8156CF4: @ 8156CF4
ldr r0, =gUnknown_02039F34
ldr r0, [r0]
ldr r1, [r0, 0xC]
ldr r0, =gUnknown_02039F2C
ldr r0, =gScriptContestCategory
ldrh r0, [r0]
strh r0, [r1, 0x18]
ldr r1, =gAIScriptPtr
asm/contest_effect.s
+1 -1
View File
@@ -2590,7 +2590,7 @@ ContestEffectFunc_080E6778: @ 80E6778
adds r0, r3
ldrb r0, [r0, 0x1]
lsls r0, 29
ldr r1, =gUnknown_02039F2C
ldr r1, =gScriptContestCategory
lsrs r0, 29
ldrh r1, [r1]
cmp r0, r1
asm/contest_link_80F57C4.s
+5 -5
View File
@@ -3008,7 +3008,7 @@ _080F7236:
bl CopyToBgTilemapBufferRect
movs r5, 0xF
_080F7240:
ldr r0, =gUnknown_02039F2C
ldr r0, =gScriptContestCategory
ldrh r0, [r0]
cmp r0, 0
bne _080F725C
@@ -4640,7 +4640,7 @@ sub_80F7F30: @ 80F7F30
adds r5, r0, 0
cmp r5, 0
beq _080F7F5E
ldr r4, =gUnknown_02039F2C
ldr r4, =gScriptContestCategory
ldrb r0, [r4]
ldr r1, =gUnknown_02039F2E
ldrb r1, [r1]
@@ -4666,7 +4666,7 @@ sub_80F7F7C: @ 80F7F7C
muls r1, r0
ldr r0, =gPlayerParty
adds r2, r1, r0
ldr r0, =gUnknown_02039F2C
ldr r0, =gScriptContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bhi _080F7FEE
@@ -4730,7 +4730,7 @@ sub_80F7FFC: @ 80F7FFC
beq _080F8010
b _080F8250
_080F8010:
ldr r0, =gUnknown_02039F2C
ldr r0, =gScriptContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bls _080F801A
@@ -5488,7 +5488,7 @@ _080F8678:
bl sub_80F86E0
ldr r1, =gUnknown_02039F2B
strb r0, [r1]
ldr r0, =gUnknown_02039F2C
ldr r0, =gScriptContestCategory
ldrb r0, [r0]
bl sub_80DB09C
ldr r1, =sub_80FCF40
asm/contest_link_81D9DE4.s
+1 -1
View File
@@ -370,7 +370,7 @@ sub_81DA10C: @ 81DA10C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gUnknown_02039F2C
ldr r0, =gScriptContestCategory
ldrb r0, [r0]
bl sub_80DB09C
ldr r1, =sub_80FCF40
asm/decoration.s
+2 -2
View File
@@ -2094,7 +2094,7 @@ sub_8127B04: @ 8127B04
lsls r4, 24
asrs r4, 24
str r4, [sp]
bl warp1_set
bl Overworld_SetWarpDestination
bl warp_in
add sp, 0x4
pop {r4,r5}
@@ -2490,7 +2490,7 @@ _08127E34:
cmp r0, 0x1
bne _08127F1C
adds r0, r4, 0
bl FlagReset
bl FlagClear
movs r2, 0
ldr r0, [r7, 0x4]
ldrb r4, [r0]
asm/decoration_inventory.s
+3 -3
View File
@@ -156,8 +156,8 @@ _08161910:
bx r1
thumb_func_end sub_81618D0
thumb_func_start sub_8161918
sub_8161918: @ 8161918
thumb_func_start CheckHasDecoration
CheckHasDecoration: @ 8161918
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -193,7 +193,7 @@ _08161958:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8161918
thumb_func_end CheckHasDecoration
thumb_func_start DecorationAdd
DecorationAdd: @ 8161960
asm/easy_chat.s
+1 -1
View File
@@ -9914,7 +9914,7 @@ _0811EF48:
adds r1, r5, 0
bl ConvertEasyChatWordsToString
adds r0, r4, 0
bl box_related_two__3
bl ShowFieldAutoScrollMessage
_0811EF58:
pop {r4,r5}
pop {r0}
asm/field_door.s
+18 -18
View File
@@ -581,8 +581,8 @@ sub_808A83C: @ 808A83C
.pool
thumb_func_end sub_808A83C
thumb_func_start sub_808A854
sub_808A854: @ 808A854
thumb_func_start FieldSetDoorOpened
FieldSetDoorOpened: @ 808A854
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -602,10 +602,10 @@ _0808A876:
pop {r0}
bx r0
.pool
thumb_func_end sub_808A854
thumb_func_end FieldSetDoorOpened
thumb_func_start sub_808A880
sub_808A880: @ 808A880
thumb_func_start FieldSetDoorClosed
FieldSetDoorClosed: @ 808A880
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -625,10 +625,10 @@ _0808A8A2:
pop {r0}
bx r0
.pool
thumb_func_end sub_808A880
thumb_func_end FieldSetDoorClosed
thumb_func_start sub_808A8AC
sub_808A8AC: @ 808A8AC
thumb_func_start FieldAnimateDoorClose
FieldAnimateDoorClose: @ 808A8AC
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -654,10 +654,10 @@ _0808A8DC:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_808A8AC
thumb_func_end FieldAnimateDoorClose
thumb_func_start task_overworld_door_add_if_role_69_for_opening_door_at
task_overworld_door_add_if_role_69_for_opening_door_at: @ 808A8E4
thumb_func_start FieldAnimateDoorOpen
FieldAnimateDoorOpen: @ 808A8E4
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -683,10 +683,10 @@ _0808A914:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end task_overworld_door_add_if_role_69_for_opening_door_at
thumb_func_end FieldAnimateDoorOpen
thumb_func_start sub_808A91C
sub_808A91C: @ 808A91C
thumb_func_start FieldIsDoorAnimationRunning
FieldIsDoorAnimationRunning: @ 808A91C
push {lr}
ldr r0, =task50_overworld_door
bl FuncIsActiveTask
@@ -695,10 +695,10 @@ sub_808A91C: @ 808A91C
pop {r1}
bx r1
.pool
thumb_func_end sub_808A91C
thumb_func_end FieldIsDoorAnimationRunning
thumb_func_start cur_mapdata_get_door_sound_at
cur_mapdata_get_door_sound_at: @ 808A930
thumb_func_start GetDoorSoundEffect
GetDoorSoundEffect: @ 808A930
push {lr}
adds r3, r0, 0
adds r2, r1, 0
@@ -725,7 +725,7 @@ _0808A95C:
_0808A95E:
pop {r1}
bx r1
thumb_func_end cur_mapdata_get_door_sound_at
thumb_func_end GetDoorSoundEffect
thumb_func_start sub_808A964
sub_808A964: @ 808A964
asm/field_effect.s
+27 -27
View File
@@ -1989,7 +1989,7 @@ task00_8084310: @ 80B6A24
cmp r0, 0
beq _080B6A8A
bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -2100,7 +2100,7 @@ _080B6B3E:
cmp r0, 0
bne _080B6B58
bl ScriptContext2_Disable
bl sub_809757C
bl UnfreezeMapObjects
adds r0, r5, 0
bl DestroyTask
_080B6B58:
@@ -2459,7 +2459,7 @@ sub_80B6E18: @ 80B6E18
strb r0, [r1, 0x6]
bl ScriptContext2_Disable
bl CameraObjectReset1
bl sub_809757C
bl UnfreezeMapObjects
bl InstallCameraPanAheadCallback
ldr r0, =sub_80B6B94
bl FindTaskIdByFunc
@@ -3111,7 +3111,7 @@ oei_waterfall: @ 80B734C
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r2, =gFieldEffectSpawnParams
ldr r2, =gFieldEffectArguments
ldr r2, [r2]
strh r2, [r1, 0xA]
bl _call_via_r4
@@ -3188,7 +3188,7 @@ waterfall_1_do_anim_probably: @ 80B73F0
bne _080B7420
adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
movs r2, 0xA
ldrsh r0, [r4, r2]
str r0, [r1]
@@ -3304,7 +3304,7 @@ sub_80B74D0: @ 80B74D0
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r3, =gFieldEffectSpawnParams
ldr r3, =gFieldEffectArguments
ldr r2, [r3]
strh r2, [r1, 0x26]
ldr r2, [r3, 0x4]
@@ -3363,7 +3363,7 @@ dive_2_unknown: @ 80B7558
push {r4,lr}
adds r4, r0, 0
bl ScriptContext2_Enable
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
movs r2, 0x26
ldrsh r0, [r4, r2]
str r0, [r1]
@@ -3536,7 +3536,7 @@ sub_80B76B8: @ 80B76B8
strh r0, [r2, 0x26]
movs r0, 0x1
strh r0, [r4, 0xE]
ldr r3, =gFieldEffectSpawnParams
ldr r3, =gFieldEffectArguments
movs r5, 0x10
ldrsh r0, [r1, r5]
str r0, [r3]
@@ -3835,7 +3835,7 @@ sub_80B791C: @ 80B791C
lsls r0, 24
cmp r0, 0
beq _080B795C
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
movs r2, 0x10
ldrsh r0, [r5, r2]
str r0, [r1]
@@ -3919,7 +3919,7 @@ sub_80B79BC: @ 80B79BC
movs r0, 0
strb r0, [r1, 0x6]
bl ScriptContext2_Disable
bl sub_809757C
bl UnfreezeMapObjects
ldr r0, =sub_80B7890
bl FindTaskIdByFunc
lsls r0, 24
@@ -3935,7 +3935,7 @@ _080B79E6:
thumb_func_start sub_80B79F4
sub_80B79F4: @ 80B79F4
push {r4,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -4090,7 +4090,7 @@ sub_80B7B18: @ 80B7B18
ldrsh r0, [r5, r2]
cmp r0, 0x3
ble _080B7B6C
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
movs r2, 0x10
ldrsh r0, [r4, r2]
str r0, [r1]
@@ -4222,7 +4222,7 @@ _080B7C2C:
thumb_func_start sub_80B7C48
sub_80B7C48: @ 80B7C48
push {r4,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -4583,7 +4583,7 @@ _080B7F32:
ands r0, r1
strb r0, [r6, 0x1]
bl ScriptContext2_Disable
bl sub_809757C
bl UnfreezeMapObjects
ldr r0, =sub_80B7E94
bl FindTaskIdByFunc
lsls r0, 24
@@ -5194,7 +5194,7 @@ sub_80B8410: @ 80B8410
bne _080B8484
bl ScriptContext2_Disable
bl CameraObjectReset1
bl sub_809757C
bl UnfreezeMapObjects
ldr r0, =sub_80B8250
bl FindTaskIdByFunc
lsls r0, 24
@@ -5229,7 +5229,7 @@ _080B84BE:
bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r2, =gFieldEffectSpawnParams
ldr r2, =gFieldEffectArguments
ldr r0, [r2]
ldr r1, [r2, 0x4]
ldr r2, [r2, 0x8]
@@ -5252,7 +5252,7 @@ _080B84BE:
thumb_func_start sub_80B84F8
sub_80B84F8: @ 80B84F8
push {r4-r6,lr}
ldr r5, =gFieldEffectSpawnParams
ldr r5, =gFieldEffectArguments
ldr r0, [r5]
movs r6, 0x80
lsls r6, 24
@@ -6292,12 +6292,12 @@ sub_80B8D44: @ 80B8D44
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r0, =gFieldEffectSpawnParams
ldr r0, =gFieldEffectArguments
ldr r0, [r0]
strh r0, [r1, 0x26]
bl sav1_reset_battle_music_maybe
ldr r0, =0x0000016d
bl sub_80858C4
bl Overworld_ChangeMusicTo
movs r0, 0
pop {r1}
bx r1
@@ -6421,7 +6421,7 @@ sub_80B8E60: @ 80B8E60
lsls r0, 24
cmp r0, 0
beq _080B8E96
ldr r2, =gFieldEffectSpawnParams
ldr r2, =gFieldEffectArguments
movs r1, 0x26
ldrsh r0, [r4, r1]
movs r1, 0x80
@@ -6473,7 +6473,7 @@ sub_80B8EA8: @ 80B8EA8
lsrs r1, 24
adds r0, r4, 0
bl FieldObjectSetSpecialAnim
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
movs r2, 0xA
ldrsh r0, [r6, r2]
str r0, [r1]
@@ -6527,7 +6527,7 @@ sub_80B8F24: @ 80B8F24
ldrb r0, [r4, 0x1A]
movs r1, 0x1
bl sub_81555AC
bl sub_809757C
bl UnfreezeMapObjects
bl ScriptContext2_Disable
movs r0, 0x9
bl FieldEffectActiveListRemove
@@ -6704,7 +6704,7 @@ sub_80B90CC: @ 80B90CC
strb r0, [r2, 0x5]
ldr r0, =sub_80B9128
str r0, [r2, 0x1C]
ldr r0, =gFieldEffectSpawnParams
ldr r0, =gFieldEffectArguments
ldr r0, [r0]
strh r0, [r2, 0x30]
movs r0, 0x9E
@@ -6793,7 +6793,7 @@ sub_80B91A4: @ 80B91A4
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r0, =gFieldEffectSpawnParams
ldr r0, =gFieldEffectArguments
ldr r0, [r0]
strh r0, [r1, 0xA]
movs r0, 0
@@ -6884,7 +6884,7 @@ sub_80B925C: @ 80B925C
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
movs r2, 0xA
ldrsh r0, [r4, r2]
str r0, [r1]
@@ -7922,7 +7922,7 @@ _080B9ACA:
sub_80B9ADC: @ 80B9ADC
push {r4,lr}
sub sp, 0x4
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
ldrb r0, [r4]
ldrb r1, [r4, 0x4]
ldrb r2, [r4, 0x8]
@@ -8343,7 +8343,7 @@ _080B9E24:
sub_80B9E28: @ 80B9E28
push {r4-r7,lr}
sub sp, 0x4
ldr r7, =gFieldEffectSpawnParams
ldr r7, =gFieldEffectArguments
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
asm/field_effect_helpers.s
+28 -28
View File
@@ -574,7 +574,7 @@ _0815432E:
thumb_func_start oei_shadow
oei_shadow: @ 8154340
push {r4,r5,lr}
ldr r5, =gFieldEffectSpawnParams
ldr r5, =gFieldEffectArguments
ldrb r0, [r5]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
@@ -742,7 +742,7 @@ _08154498:
oei_grass_normal: @ 81544AC
push {r4,r5,lr}
sub sp, 0x4
ldr r5, =gFieldEffectSpawnParams
ldr r5, =gFieldEffectArguments
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@@ -951,7 +951,7 @@ _08154648:
thumb_func_start sub_8154658
sub_8154658: @ 8154658
push {r4,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1080,7 +1080,7 @@ _0815474C:
sub_8154758: @ 8154758
push {r4,r5,lr}
sub sp, 0x4
ldr r5, =gFieldEffectSpawnParams
ldr r5, =gFieldEffectArguments
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@@ -1282,7 +1282,7 @@ _081548EA:
thumb_func_start sub_81548FC
sub_81548FC: @ 81548FC
push {r4,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1336,7 +1336,7 @@ _08154958:
thumb_func_start sub_815496C
sub_815496C: @ 815496C
push {r4-r6,lr}
ldr r6, =gFieldEffectSpawnParams
ldr r6, =gFieldEffectArguments
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -1537,7 +1537,7 @@ _08154AF2:
thumb_func_start sub_8154B04
sub_8154B04: @ 8154B04
push {r4,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1591,7 +1591,7 @@ _08154B62:
thumb_func_start sub_8154B78
sub_8154B78: @ 8154B78
push {r4,r5,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1646,7 +1646,7 @@ _08154BD8:
thumb_func_start sub_8154BEC
sub_8154BEC: @ 8154BEC
push {r4,r5,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1777,7 +1777,7 @@ _08154CE4:
thumb_func_start sub_8154CEC
sub_8154CEC: @ 8154CEC
push {r4-r6,lr}
ldr r6, =gFieldEffectSpawnParams
ldr r6, =gFieldEffectArguments
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -1922,7 +1922,7 @@ _08154E0A:
thumb_func_start sub_8154E1C
sub_8154E1C: @ 8154E1C
push {r4,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1976,7 +1976,7 @@ _08154E78:
thumb_func_start oei_water_drop_tall
oei_water_drop_tall: @ 8154E8C
push {r4,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2030,7 +2030,7 @@ _08154EE8:
thumb_func_start sub_8154EFC
sub_8154EFC: @ 8154EFC
push {r4-r7,lr}
ldr r7, =gFieldEffectSpawnParams
ldr r7, =gFieldEffectArguments
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
@@ -2193,7 +2193,7 @@ oei_ripples: @ 8155054
push {r4,lr}
ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x14]
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
movs r2, 0
ldrsh r1, [r4, r2]
movs r3, 0x4
@@ -2238,7 +2238,7 @@ _081550A0:
thumb_func_start sub_81550B4
sub_81550B4: @ 81550B4
push {r4-r6,lr}
ldr r6, =gFieldEffectSpawnParams
ldr r6, =gFieldEffectArguments
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -2393,7 +2393,7 @@ _081551E4:
thumb_func_start sub_81551F0
sub_81551F0: @ 81551F0
push {r4,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2445,7 +2445,7 @@ _08155248:
thumb_func_start sub_815525C
sub_815525C: @ 815525C
push {r4,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2497,7 +2497,7 @@ _081552B4:
thumb_func_start sub_81552C8
sub_81552C8: @ 81552C8
push {r4,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2549,7 +2549,7 @@ _08155320:
thumb_func_start sub_8155334
sub_8155334: @ 8155334
push {r4,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2603,7 +2603,7 @@ ash: @ 81553A0
push {r4,lr}
lsls r2, 16
lsrs r2, 16
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
lsls r0, 16
asrs r0, 16
str r0, [r4]
@@ -2630,7 +2630,7 @@ ash: @ 81553A0
oei_ash: @ 81553D4
push {r4,r5,lr}
sub sp, 0x4
ldr r5, =gFieldEffectSpawnParams
ldr r5, =gFieldEffectArguments
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@@ -2809,7 +2809,7 @@ _0815552C:
thumb_func_start sub_8155534
sub_8155534: @ 8155534
push {r4,r5,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -3261,7 +3261,7 @@ _08155888:
thumb_func_start sub_8155890
sub_8155890: @ 8155890
push {r4,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -3315,7 +3315,7 @@ _081558EC:
thumb_func_start sub_8155900
sub_8155900: @ 8155900
push {r4-r7,lr}
ldr r7, =gFieldEffectSpawnParams
ldr r7, =gFieldEffectArguments
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
@@ -3505,7 +3505,7 @@ _08155A76:
thumb_func_start sub_8155A88
sub_8155A88: @ 8155A88
push {r4,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -3586,7 +3586,7 @@ _08155B20:
thumb_func_start sub_8155B2C
sub_8155B2C: @ 8155B2C
push {r4,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -3689,7 +3689,7 @@ ShowDisguiseFieldEffect: @ 8155BD0
lsrs r6, r1, 24
lsls r2, 24
lsrs r7, r2, 24
ldr r5, =gFieldEffectSpawnParams
ldr r5, =gFieldEffectArguments
ldrb r0, [r5]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
@@ -3950,7 +3950,7 @@ _08155DD8:
thumb_func_start sub_8155DDC
sub_8155DDC: @ 8155DDC
push {r4,lr}
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
ldr r0, [r4]
adds r0, 0x7
str r0, [r4]
asm/field_ground_effect.s
+12 -12
View File
@@ -1166,7 +1166,7 @@ _08096E8C:
@ void GroundEffect_SpawnOnTallGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_SpawnOnTallGrass: @ 8096E90
push {lr}
ldr r3, =gFieldEffectSpawnParams
ldr r3, =gFieldEffectArguments
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@@ -1205,7 +1205,7 @@ GroundEffect_SpawnOnTallGrass: @ 8096E90
@ void GroundEffect_StepOnTallGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_StepOnTallGrass: @ 8096EDC
push {lr}
ldr r3, =gFieldEffectSpawnParams
ldr r3, =gFieldEffectArguments
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@@ -1244,7 +1244,7 @@ GroundEffect_StepOnTallGrass: @ 8096EDC
@ void GroundEffect_SpawnOnLongGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_SpawnOnLongGrass: @ 8096F28
push {lr}
ldr r3, =gFieldEffectSpawnParams
ldr r3, =gFieldEffectArguments
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@@ -1283,7 +1283,7 @@ GroundEffect_SpawnOnLongGrass: @ 8096F28
@ void GroundEffect_StepOnLongGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_StepOnLongGrass: @ 8096F74
push {lr}
ldr r3, =gFieldEffectSpawnParams
ldr r3, =gFieldEffectArguments
movs r2, 0x10
ldrsh r1, [r0, r2]
str r1, [r3]
@@ -1413,7 +1413,7 @@ DoTracksGroundEffect_Footprints: @ 8097044
mov r0, sp
movs r2, 0x4
bl memcpy
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
movs r2, 0x14
ldrsh r0, [r5, r2]
str r0, [r1]
@@ -1449,7 +1449,7 @@ DoTracksGroundEffect_BikeTireTracks: @ 8097094
ldr r0, [r4, 0x14]
cmp r1, r0
beq _080970D6
ldr r2, =gFieldEffectSpawnParams
ldr r2, =gFieldEffectArguments
movs r1, 0x14
ldrsh r0, [r4, r1]
str r0, [r2]
@@ -1520,7 +1520,7 @@ GroundEffect_JumpOnTallGrass: @ 8097110
sub sp, 0x4
adds r5, r0, 0
adds r6, r1, 0
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
movs r2, 0x10
ldrsh r0, [r5, r2]
str r0, [r1]
@@ -1562,7 +1562,7 @@ _0809715A:
@ void GroundEffect_JumpOnLongGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpOnLongGrass: @ 8097168
push {lr}
ldr r2, =gFieldEffectSpawnParams
ldr r2, =gFieldEffectArguments
movs r3, 0x10
ldrsh r1, [r0, r3]
str r1, [r2]
@@ -1585,7 +1585,7 @@ GroundEffect_JumpOnLongGrass: @ 8097168
@ void GroundEffect_JumpOnShallowWater(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpOnShallowWater: @ 8097190
push {r4,lr}
ldr r3, =gFieldEffectSpawnParams
ldr r3, =gFieldEffectArguments
movs r4, 0x10
ldrsh r2, [r0, r4]
str r2, [r3]
@@ -1611,7 +1611,7 @@ GroundEffect_JumpOnShallowWater: @ 8097190
@ void GroundEffect_JumpOnWater(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpOnWater: @ 80971C0
push {r4,lr}
ldr r3, =gFieldEffectSpawnParams
ldr r3, =gFieldEffectArguments
movs r4, 0x10
ldrsh r2, [r0, r4]
str r2, [r3]
@@ -1637,7 +1637,7 @@ GroundEffect_JumpOnWater: @ 80971C0
@ void GroundEffect_JumpLandingDust(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpLandingDust: @ 80971F0
push {r4,lr}
ldr r3, =gFieldEffectSpawnParams
ldr r3, =gFieldEffectArguments
movs r4, 0x10
ldrsh r2, [r0, r4]
str r2, [r3]
@@ -1685,7 +1685,7 @@ GroundEffect_HotSprings: @ 8097230
@ void GroundEffect_Seaweed(struct npc_state *fieldObject, struct obj *object)
GroundEffect_Seaweed: @ 8097240
push {lr}
ldr r2, =gFieldEffectSpawnParams
ldr r2, =gFieldEffectArguments
movs r3, 0x10
ldrsh r1, [r0, r3]
str r1, [r2]
asm/field_message_box.s
+12 -12
View File
@@ -108,8 +108,8 @@ _080981E4:
.pool
thumb_func_end task_del_textbox
thumb_func_start box_related_two__2
box_related_two__2: @ 80981EC
thumb_func_start ShowFieldMessage
ShowFieldMessage: @ 80981EC
push {r4,lr}
adds r1, r0, 0
ldr r4, =gUnknown_020375BC
@@ -130,7 +130,7 @@ _0809820E:
pop {r4}
pop {r1}
bx r1
thumb_func_end box_related_two__2
thumb_func_end ShowFieldMessage
thumb_func_start sub_8098214
sub_8098214: @ 8098214
@@ -181,8 +181,8 @@ _08098272:
bx r1
thumb_func_end sub_8098238
thumb_func_start box_related_two__3
box_related_two__3: @ 8098278
thumb_func_start ShowFieldAutoScrollMessage
ShowFieldAutoScrollMessage: @ 8098278
push {lr}
adds r1, r0, 0
ldr r2, =gUnknown_020375BC
@@ -202,7 +202,7 @@ _08098298:
_0809829A:
pop {r1}
bx r1
thumb_func_end box_related_two__3
thumb_func_end ShowFieldAutoScrollMessage
thumb_func_start sub_80982A0
sub_80982A0: @ 80982A0
@@ -267,8 +267,8 @@ textbox_auto_and_task_add: @ 8098304
bx r0
thumb_func_end textbox_auto_and_task_add
thumb_func_start textbox_close
textbox_close: @ 8098314
thumb_func_start HideFieldMessageBox
HideFieldMessageBox: @ 8098314
push {lr}
bl task_del_textbox
movs r0, 0
@@ -280,7 +280,7 @@ textbox_close: @ 8098314
pop {r0}
bx r0
.pool
thumb_func_end textbox_close
thumb_func_end HideFieldMessageBox
thumb_func_start textbox_any_visible
textbox_any_visible: @ 8098330
@@ -290,8 +290,8 @@ textbox_any_visible: @ 8098330
.pool
thumb_func_end textbox_any_visible
thumb_func_start sub_809833C
sub_809833C: @ 809833C
thumb_func_start IsFieldMessageBoxHidden
IsFieldMessageBoxHidden: @ 809833C
push {lr}
ldr r0, =gUnknown_020375BC
ldrb r0, [r0]
@@ -305,7 +305,7 @@ _08098350:
_08098352:
pop {r1}
bx r1
thumb_func_end sub_809833C
thumb_func_end IsFieldMessageBoxHidden
thumb_func_start sub_8098358
sub_8098358: @ 8098358
asm/field_player_avatar.s
+4 -4
View File
@@ -1522,7 +1522,7 @@ PlayerAvatarTransition_Surfing: @ 808B4D8
bl FieldObjectTurn
movs r0, 0x8
bl SetPlayerAvatarStateMask
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
movs r2, 0x10
ldrsh r0, [r4, r2]
str r0, [r1]
@@ -3517,7 +3517,7 @@ _0808C3F0:
lsrs r1, 24
adds r0, r4, 0
bl FieldObjectSetSpecialAnim
ldr r2, =gFieldEffectSpawnParams
ldr r2, =gFieldEffectArguments
movs r1, 0x10
ldrsh r0, [r4, r1]
str r0, [r2]
@@ -3897,7 +3897,7 @@ sub_808C750: @ 808C750
lsrs r4, 24
bl ScriptContext2_Enable
bl sav1_reset_battle_music_maybe
bl sub_8085898
bl Overworld_ChangeMusicToDefault
ldr r2, =gPlayerAvatar
ldrb r1, [r2]
movs r0, 0xF7
@@ -4858,7 +4858,7 @@ fishF: @ 808CF2C
ldr r0, =gPlayerAvatar
strb r1, [r0, 0x6]
bl ScriptContext2_Disable
bl sub_809757C
bl UnfreezeMapObjects
movs r0, 0
movs r1, 0x1
bl sub_8197434
asm/field_poison.s
+2 -2
View File
@@ -178,7 +178,7 @@ _080F96A8:
strh r0, [r4]
b _080F9722
_080F96AE:
bl sub_809833C
bl IsFieldMessageBoxHidden
lsls r0, 24
cmp r0, 0
beq _080F9722
@@ -217,7 +217,7 @@ _080F96FC:
ldrb r0, [r4, 0x2]
bl sub_80F95C0
ldr r0, =gText_PkmnFainted3
bl box_related_two__2
bl ShowFieldMessage
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
asm/field_screen.s
+17 -17
View File
@@ -7503,8 +7503,8 @@ _080AED78:
bx r0
thumb_func_end bag_add_task0_by_acit
thumb_func_start sub_80AED7C
sub_80AED7C: @ 80AED7C
thumb_func_start SetSav1Weather
SetSav1Weather: @ 80AED7C
push {r4,r5,lr}
ldr r4, =gSaveBlock1Ptr
ldr r1, [r4]
@@ -7525,7 +7525,7 @@ sub_80AED7C: @ 80AED7C
pop {r0}
bx r0
.pool
thumb_func_end sub_80AED7C
thumb_func_end SetSav1Weather
thumb_func_start sav1_get_weather_probably
sav1_get_weather_probably: @ 80AEDAC
@@ -7564,7 +7564,7 @@ sub_80AEDBC: @ 80AEDBC
thumb_func_start sub_80AEDF0
sub_80AEDF0: @ 80AEDF0
push {lr}
bl sub_80AED7C
bl SetSav1Weather
bl sav1_get_weather_probably
lsls r0, 24
lsrs r0, 24
@@ -7576,7 +7576,7 @@ sub_80AEDF0: @ 80AEDF0
thumb_func_start sub_80AEE08
sub_80AEE08: @ 80AEE08
push {lr}
bl sub_80AED7C
bl SetSav1Weather
bl sav1_get_weather_probably
lsls r0, 24
lsrs r0, 24
@@ -7585,8 +7585,8 @@ sub_80AEE08: @ 80AEE08
bx r0
thumb_func_end sub_80AEE08
thumb_func_start sub_80AEE20
sub_80AEE20: @ 80AEE20
thumb_func_start DoCurrentWeather
DoCurrentWeather: @ 80AEE20
push {r4,r5,lr}
bl sav1_get_weather_probably
lsls r0, 24
@@ -7627,7 +7627,7 @@ _080AEE6E:
pop {r0}
bx r0
.pool
thumb_func_end sub_80AEE20
thumb_func_end DoCurrentWeather
thumb_func_start sub_80AEE84
sub_80AEE84: @ 80AEE84
@@ -8390,7 +8390,7 @@ _080AF480:
ldrsh r0, [r6, r1]
movs r2, 0
ldrsh r1, [r7, r2]
bl sub_808A854
bl FieldSetDoorOpened
movs r0, 0x1
strh r0, [r5, 0x8]
b _080AF54A
@@ -8427,7 +8427,7 @@ _080AF4DC:
ldrsh r0, [r6, r1]
movs r2, 0
ldrsh r1, [r7, r2]
bl sub_808A8AC
bl FieldAnimateDoorClose
lsls r0, 24
asrs r0, 24
strh r0, [r5, 0xA]
@@ -8461,7 +8461,7 @@ _080AF520:
cmp r0, 0x1
beq _080AF54A
_080AF536:
bl sub_809757C
bl UnfreezeMapObjects
movs r0, 0x4
strh r0, [r5, 0x8]
b _080AF54A
@@ -8550,7 +8550,7 @@ _080AF5EC:
lsls r0, 24
cmp r0, 0
beq _080AF60A
bl sub_809757C
bl UnfreezeMapObjects
movs r0, 0x3
strh r0, [r5, 0x8]
b _080AF60A
@@ -8593,7 +8593,7 @@ _080AF644:
bl sub_80AF71C
cmp r0, 0
beq _080AF65A
bl sub_809757C
bl UnfreezeMapObjects
bl ScriptContext2_Disable
adds r0, r5, 0
bl DestroyTask
@@ -9142,7 +9142,7 @@ _080AFAD4:
movs r2, 0
ldrsh r1, [r6, r2]
subs r1, 0x1
bl cur_mapdata_get_door_sound_at
bl GetDoorSoundEffect
lsls r0, 16
lsrs r0, 16
bl PlaySE
@@ -9151,7 +9151,7 @@ _080AFAD4:
movs r2, 0
ldrsh r1, [r6, r2]
subs r1, 0x1
bl task_overworld_door_add_if_role_69_for_opening_door_at
bl FieldAnimateDoorOpen
lsls r0, 24
asrs r0, 24
strh r0, [r5, 0xA]
@@ -9211,7 +9211,7 @@ _080AFB6C:
movs r2, 0
ldrsh r1, [r6, r2]
subs r1, 0x1
bl sub_808A8AC
bl FieldAnimateDoorClose
lsls r0, 24
asrs r0, 24
strh r0, [r5, 0xA]
@@ -9996,7 +9996,7 @@ _080B0198:
bl sub_808D1B4
cmp r0, 0x1
beq _080B01B6
bl sub_809757C
bl UnfreezeMapObjects
bl ScriptContext2_Disable
adds r0, r5, 0
bl DestroyTask
asm/field_tasks.s
+4 -4
View File
@@ -46,7 +46,7 @@ _0809D8CA:
ands r0, r1
cmp r0, 0
beq _0809D8FC
bl sub_809E7B0
bl DoTimeBasedEvents
ldrh r0, [r4]
adds r0, 0x1
b _0809D8FA
@@ -144,8 +144,8 @@ _0809D992:
.pool
thumb_func_end overworld_ensure_per_step_coros_running
thumb_func_start activate_per_step_callback
activate_per_step_callback: @ 809D9A8
thumb_func_start ActivatePerStepCallback
ActivatePerStepCallback: @ 809D9A8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -180,7 +180,7 @@ _0809D9EA:
pop {r4}
pop {r0}
bx r0
thumb_func_end activate_per_step_callback
thumb_func_end ActivatePerStepCallback
thumb_func_start wild_encounter_reset_coro_args
wild_encounter_reset_coro_args: @ 809D9F0
asm/fldeff_80F9BCC.s
+16 -16
View File
@@ -486,7 +486,7 @@ sub_80F9F78: @ 80F9F78
ands r0, r1
cmp r0, 0
beq _080F9FC0
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
ldr r0, [r1, 0x4]
cmp r0, 0x2
beq _080F9FAE
@@ -517,7 +517,7 @@ _080F9FB6:
movs r0, 0x18
b _080F9FFC
_080F9FC0:
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
ldr r0, [r1, 0x4]
cmp r0, 0x2
beq _080F9FEA
@@ -643,7 +643,7 @@ _080FA0C4:
sub_80FA0DC: @ 80FA0DC
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -701,7 +701,7 @@ sub_80FA13C: @ 80FA13C
ldrh r1, [r2, 0x2]
lsls r1, 23
lsrs r1, 23
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
ldr r3, [r4, 0x14]
adds r1, r3
lsls r1, 16
@@ -778,7 +778,7 @@ sub_80FA1D8: @ 80FA1D8
sub_80FA1E8: @ 80FA1E8
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -836,13 +836,13 @@ sub_80FA248: @ 80FA248
ands r2, r0
cmp r2, 0x96
bne _080FA26A
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
movs r0, 0
str r0, [r1, 0x1C]
_080FA26A:
cmp r2, 0x9C
bne _080FA274
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
movs r0, 0x2
str r0, [r1, 0x1C]
_080FA274:
@@ -858,7 +858,7 @@ _080FA274:
ldrh r1, [r2, 0x2]
lsls r1, 23
lsrs r1, 23
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
ldr r3, [r4, 0x14]
adds r1, r3
lsls r1, 16
@@ -891,7 +891,7 @@ sub_80FA2D8: @ 80FA2D8
adds r4, r0, 0
movs r0, 0x9B
bl PlaySE
ldr r0, =gFieldEffectSpawnParams
ldr r0, =gFieldEffectArguments
ldr r1, [r0, 0x1C]
adds r2, r4, 0
adds r2, 0x2A
@@ -917,7 +917,7 @@ sub_80FA304: @ 80FA304
asrs r0, 16
cmp r0, 0x27
ble _080FA32E
ldr r0, =gFieldEffectSpawnParams
ldr r0, =gFieldEffectArguments
ldr r0, [r0, 0x1C]
cmp r0, 0
beq _080FA322
@@ -951,7 +951,7 @@ sub_80FA33C: @ 80FA33C
sub_80FA34C: @ 80FA34C
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -1009,7 +1009,7 @@ sub_80FA3AC: @ 80FA3AC
ldrh r1, [r2, 0x2]
lsls r1, 23
lsrs r1, 23
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
ldr r3, [r4, 0x14]
adds r1, r3
lsls r1, 16
@@ -1807,7 +1807,7 @@ sub_80FAA7C: @ 80FAA7C
mov r0, sp
adds r1, r4, 0
bl GetXYCoordsOneStepInFrontOfPlayer
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
mov r0, sp
movs r2, 0
ldrsh r0, [r0, r2]
@@ -1930,7 +1930,7 @@ door_restore_tilemap: @ 80FABA4
adds r5, r0, 0
movs r0, 0x83
bl PlaySE
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18]
subs r1, 0x1
@@ -1953,7 +1953,7 @@ _080FABDC:
lsls r2, 2
bl MapGridSetMetatileIdAt
_080FABEA:
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18]
ldr r2, =0x0000020a
@@ -1988,7 +1988,7 @@ sub_80FAC24: @ 80FAC24
strh r0, [r5, 0x2E]
b _080FAC54
_080FAC38:
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18]
ldr r2, =0x00000e8c
asm/fldeff_cut.s
+2 -2
View File
@@ -385,7 +385,7 @@ hm2_ruin_valley: @ 80D3A50
movs r0, 0x1
bl FieldEffectStart
bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -421,7 +421,7 @@ sub_80D3A6C: @ 80D3A6C
sub_80D3A9C: @ 80D3A9C
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
asm/fldeff_groundshake.s
+2 -2
View File
@@ -161,7 +161,7 @@ sub_81BE79C: @ 81BE79C
beq _081BE7B8
movs r0, 0xA7
lsls r0, 1
bl FlagReset
bl FlagClear
b _081BE7EE
.pool
_081BE7B8:
@@ -188,7 +188,7 @@ _081BE7D4:
_081BE7E6:
movs r0, 0xA7
lsls r0, 1
bl FlagReset
bl FlagClear
_081BE7EE:
pop {r4}
pop {r0}
asm/fldeff_strength.s
+2 -2
View File
@@ -40,7 +40,7 @@ _08145DF2:
sub_8145E0C: @ 8145E0C
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -66,7 +66,7 @@ sub_8145E2C: @ 8145E2C
lsrs r0, r2, 16
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
ldr r0, =gFieldEffectSpawnParams
ldr r0, =gFieldEffectArguments
ldr r1, [r0]
movs r0, 0x64
muls r0, r1
asm/fldeff_sweetscent.s
+1 -1
View File
@@ -24,7 +24,7 @@ hm2_sweet_scent: @ 8159F10
movs r0, 0x33
bl FieldEffectStart
bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
asm/fldeff_teleport.s
+1 -1
View File
@@ -39,7 +39,7 @@ hm_teleport_run_dp02scr: @ 817C8FC
movs r0, 0x3F
bl FieldEffectStart
bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
asm/item.s
+6 -6
View File
@@ -676,8 +676,8 @@ _080D6D04:
.pool
thumb_func_end sub_80D6CE4
thumb_func_start sub_80D6D1C
sub_80D6D1C: @ 80D6D1C
thumb_func_start CheckPCHasItem
CheckPCHasItem: @ 80D6D1C
push {r4-r6,lr}
lsls r0, 16
lsrs r6, r0, 16
@@ -717,10 +717,10 @@ _080D6D68:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_80D6D1C
thumb_func_end CheckPCHasItem
thumb_func_start sub_80D6D70
sub_80D6D70: @ 80D6D70
thumb_func_start AddPCItem
AddPCItem: @ 80D6D70
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -819,7 +819,7 @@ _080D6E3A:
pop {r1}
bx r1
.pool
thumb_func_end sub_80D6D70
thumb_func_end AddPCItem
thumb_func_start sub_80D6E48
sub_80D6E48: @ 80D6E48
asm/item_menu.s
+1 -1
View File
@@ -5388,7 +5388,7 @@ _081ADB6C:
ldrh r0, [r4]
mov r3, r8
ldrh r1, [r3, 0x10]
bl sub_80D6D70
bl AddPCItem
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x1
asm/item_use.s
+2 -2
View File
@@ -2215,7 +2215,7 @@ ItemUseOutOfBattle_BlackWhiteFlute: @ 80FE234
ldr r0, =0x000008ad
bl FlagSet
ldr r0, =0x000008ae
bl FlagReset
bl FlagClear
ldr r0, =gStringVar4
ldr r1, =gText_UsedVar2WildLured
bl StringExpandPlaceholders
@@ -2225,7 +2225,7 @@ _080FE278:
ldr r0, =0x000008ae
bl FlagSet
ldr r0, =0x000008ad
bl FlagReset
bl FlagClear
ldr r0, =gStringVar4
ldr r1, =gText_UsedVar2WildRepelled
bl StringExpandPlaceholders
asm/link.s
+4 -4
View File
@@ -21117,7 +21117,7 @@ sub_8014290: @ 8014290
asrs r5, 24
str r5, [sp]
adds r3, r4, 0
bl warp1_set
bl Overworld_SetWarpDestination
ldr r0, [r6]
movs r1, 0x4
ldrsb r1, [r0, r1]
@@ -21182,7 +21182,7 @@ sub_8014304: @ 8014304
adds r0, r4, 0
adds r1, r5, 0
mov r3, r8
bl warp1_set
bl Overworld_SetWarpDestination
bl warp_in
add sp, 0x4
pop {r3}
@@ -28312,7 +28312,7 @@ _080181BC:
sub_80181CC: @ 80181CC
push {lr}
bl ScriptContext2_Enable
bl sub_80983E8
bl ScriptFreezeMapObjects
pop {r0}
bx r0
thumb_func_end sub_80181CC
@@ -31292,7 +31292,7 @@ flag_clear_x63: @ 8019A64
adds r0, r1
lsls r0, 16
lsrs r0, 16
bl FlagReset
bl FlagClear
pop {r0}
bx r0
.pool
asm/map_obj_8097404.s
+5 -5
View File
@@ -205,8 +205,8 @@ _0809756C:
.pool
thumb_func_end npc_sync_anim_pause_bits
thumb_func_start sub_809757C
sub_809757C: @ 809757C
thumb_func_start UnfreezeMapObjects
UnfreezeMapObjects: @ 809757C
push {r4,r5,lr}
movs r4, 0
ldr r5, =gMapObjects
@@ -231,7 +231,7 @@ _08097598:
pop {r0}
bx r0
.pool
thumb_func_end sub_809757C
thumb_func_end UnfreezeMapObjects
thumb_func_start little_step
@ void little_step(struct obj *object, u8 direction)
@@ -1396,7 +1396,7 @@ oe_exec_and_other_stuff: @ 8097DD0
adds r0, r1, 0
lsls r4, 24
lsrs r4, 24
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -1434,7 +1434,7 @@ DoRippleFieldEffect: @ 8097E14
adds r4, r1, 0
ldrb r0, [r0, 0x5]
bl GetFieldObjectGraphicsInfo
ldr r2, =gFieldEffectSpawnParams
ldr r2, =gFieldEffectArguments
movs r3, 0x20
ldrsh r1, [r4, r3]
str r1, [r2]
asm/map_obj_lock.s
+8 -8
View File
@@ -59,8 +59,8 @@ _080983E2:
bx r1
thumb_func_end sub_80983C4
thumb_func_start sub_80983E8
sub_80983E8: @ 80983E8
thumb_func_start ScriptFreezeMapObjects
ScriptFreezeMapObjects: @ 80983E8
push {lr}
bl player_bitmagic
ldr r0, =sub_80983A4
@@ -69,7 +69,7 @@ sub_80983E8: @ 80983E8
pop {r0}
bx r0
.pool
thumb_func_end sub_80983E8
thumb_func_end ScriptFreezeMapObjects
thumb_func_start sub_8098400
sub_8098400: @ 8098400
@@ -149,8 +149,8 @@ _0809849A:
bx r1
thumb_func_end sub_809847C
thumb_func_start sub_80984A0
sub_80984A0: @ 80984A0
thumb_func_start LockSelectedMapObject
LockSelectedMapObject: @ 80984A0
push {r4,r5,lr}
ldr r4, =gSelectedMapObject
ldrb r0, [r4]
@@ -184,7 +184,7 @@ _080984DE:
pop {r0}
bx r0
.pool
thumb_func_end sub_80984A0
thumb_func_end LockSelectedMapObject
thumb_func_start sub_80984F4
sub_80984F4: @ 80984F4
@@ -203,7 +203,7 @@ sub_80984F4: @ 80984F4
adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80D338C
bl sub_809757C
bl UnfreezeMapObjects
pop {r0}
bx r0
.pool
@@ -239,7 +239,7 @@ _08098542:
adds r0, r4
bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80D338C
bl sub_809757C
bl UnfreezeMapObjects
pop {r4}
pop {r0}
bx r0
asm/mauville_old_man.s
+1 -1
View File
@@ -2205,7 +2205,7 @@ sub_8121178: @ 8121178
bl ConvertInternationalString
mov r0, r8
bl sub_8120EC0
bl box_related_two__2
bl ShowFieldMessage
pop {r3}
mov r8, r3
pop {r4-r6}
asm/mystery_event_script.s
+4 -4
View File
@@ -46,7 +46,7 @@ sub_8153804: @ 8153804
ldr r1, =gUnknown_08674C86
bl StringExpandPlaceholders
movs r0, 0x3
bl sub_81538C4
bl SetMysteryEventScriptStatus
pop {r0}
bx r0
.pool
@@ -140,13 +140,13 @@ _081538AC:
.pool
thumb_func_end sub_81538A0
thumb_func_start sub_81538C4
sub_81538C4: @ 81538C4
thumb_func_start SetMysteryEventScriptStatus
SetMysteryEventScriptStatus: @ 81538C4
ldr r1, =gUnknown_0203BBC0
str r0, [r1, 0x6C]
bx lr
.pool
thumb_func_end sub_81538C4
thumb_func_end SetMysteryEventScriptStatus
thumb_func_start sub_81538D0
sub_81538D0: @ 81538D0
asm/party_menu.s
+6 -6
View File
@@ -10051,7 +10051,7 @@ task_launch_hm_phase_2: @ 81B5750
cmp r0, 0x1
bne _081B577C
bl brm_get_selected_species
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
lsls r0, 16
lsrs r0, 16
str r0, [r1]
@@ -10135,7 +10135,7 @@ _081B57FE:
hm_surf_run_dp02scr: @ 81B5804
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -10239,7 +10239,7 @@ sub_81B58A8: @ 81B58A8
hm2_waterfall: @ 81B58D4
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -10299,7 +10299,7 @@ _081B594E:
sub_81B5958: @ 81B5958
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -10314,7 +10314,7 @@ sub_81B5958: @ 81B5958
sub_81B5974: @ 81B5974
push {lr}
bl sub_809D1E8
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1, 0x4]
@@ -15205,7 +15205,7 @@ sub_81B841C: @ 81B841C
beq _081B8438
adds r0, r1, 0
movs r1, 0x1
bl sub_80D6D70
bl AddPCItem
b _081B8440
.pool
_081B8438:
asm/player_pc.s
+1 -1
View File
@@ -31,7 +31,7 @@ _0816AE1A:
ldrh r0, [r0]
adds r1, r6
ldrh r1, [r1]
bl sub_80D6D70
bl AddPCItem
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/pokemon_storage_system.s
+1 -1
View File
@@ -6902,7 +6902,7 @@ sub_80CABE0: @ 80CABE0
cmp r1, r0
beq _080CAC0A
ldr r0, =0x000008d7
bl FlagReset
bl FlagClear
ldr r4, =0x00004036
bl StorageGetCurrentBox
adds r1, r0, 0
asm/record_mixing.s
+1 -1
View File
@@ -2266,7 +2266,7 @@ sub_80E7F68: @ 80E7F68
bne _080E7FE4
ldrh r0, [r4]
movs r1, 0x1
bl sub_80D6D1C
bl CheckPCHasItem
lsls r0, 24
cmp r0, 0
bne _080E7FE4
asm/rom4.s
+57 -57
View File
@@ -36,15 +36,15 @@ flag_var_implications_of_teleport_: @ 8084660
push {lr}
bl player_avatar_init_params_reset
ldr r0, =0x0000088b
bl FlagReset
bl FlagClear
ldr r0, =0x0000088d
bl FlagReset
bl FlagClear
ldr r0, =0x0000088c
bl FlagReset
bl FlagClear
ldr r0, =0x00000889
bl FlagReset
bl FlagClear
ldr r0, =0x00000888
bl FlagReset
bl FlagClear
pop {r0}
bx r0
.pool
@@ -55,15 +55,15 @@ sub_808469C: @ 808469C
push {lr}
bl player_avatar_init_params_reset
ldr r0, =0x0000088b
bl FlagReset
bl FlagClear
ldr r0, =0x0000088d
bl FlagReset
bl FlagClear
ldr r0, =0x0000088c
bl FlagReset
bl FlagClear
ldr r0, =0x00000889
bl FlagReset
bl FlagClear
ldr r0, =0x00000888
bl FlagReset
bl FlagClear
ldr r0, =gUnknown_08271862
bl ScriptContext2_RunNewScript
pop {r0}
@@ -76,15 +76,15 @@ flagmods_08054D70: @ 80846E4
push {lr}
bl player_avatar_init_params_reset
ldr r0, =0x0000088b
bl FlagReset
bl FlagClear
ldr r0, =0x0000088d
bl FlagReset
bl FlagClear
ldr r0, =0x0000088c
bl FlagReset
bl FlagClear
ldr r0, =0x00000889
bl FlagReset
bl FlagClear
ldr r0, =0x00000888
bl FlagReset
bl FlagClear
pop {r0}
bx r0
.pool
@@ -95,15 +95,15 @@ sub_8084720: @ 8084720
push {r4,lr}
bl player_avatar_init_params_reset
ldr r0, =0x0000088b
bl FlagReset
bl FlagClear
ldr r0, =0x0000088d
bl FlagReset
bl FlagClear
ldr r0, =0x0000088c
bl FlagReset
bl FlagClear
ldr r0, =0x00000889
bl FlagReset
bl FlagClear
ldr r0, =0x00000888
bl FlagReset
bl FlagClear
ldr r4, =0x00004039
adds r0, r4, 0
bl VarGet
@@ -128,7 +128,7 @@ _08084764:
sub_8084788: @ 8084788
push {lr}
ldr r0, =0x0000088c
bl FlagReset
bl FlagClear
bl sub_8085B2C
bl wild_pokemon_reroll
bl UpdateLocationHistoryForRoamer
@@ -324,8 +324,8 @@ _080848F4:
.pool
thumb_func_end CopyFieldObjectTemplateCoordsToSav1
thumb_func_start update_saveblock1_field_object_coords
update_saveblock1_field_object_coords: @ 8084910
thumb_func_start Overworld_SetMapObjTemplateCoords
Overworld_SetMapObjTemplateCoords: @ 8084910
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -356,10 +356,10 @@ _08084944:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end update_saveblock1_field_object_coords
thumb_func_end Overworld_SetMapObjTemplateCoords
thumb_func_start update_saveblock1_field_object_movement_behavior
update_saveblock1_field_object_movement_behavior: @ 808494C
thumb_func_start Overworld_SetMapObjTemplateMovementType
Overworld_SetMapObjTemplateMovementType: @ 808494C
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -387,7 +387,7 @@ _08084978:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end update_saveblock1_field_object_movement_behavior
thumb_func_end Overworld_SetMapObjTemplateMovementType
thumb_func_start mapdata_load_assets_to_gpu_and_full_redraw
mapdata_load_assets_to_gpu_and_full_redraw: @ 8084980
@@ -710,9 +710,9 @@ warp_in: @ 8084BD8
bx r0
thumb_func_end warp_in
thumb_func_start warp1_set
@ void warp1_set(char bank, char map, char warpid, char enter_x, char enter_y)
warp1_set: @ 8084BEC
thumb_func_start Overworld_SetWarpDestination
@ void Overworld_SetWarpDestination(char bank, char map, char warpid, char enter_x, char enter_y)
Overworld_SetWarpDestination: @ 8084BEC
push {r4-r6,lr}
sub sp, 0x8
adds r4, r0, 0
@@ -741,7 +741,7 @@ warp1_set: @ 8084BEC
pop {r0}
bx r0
.pool
thumb_func_end warp1_set
thumb_func_end Overworld_SetWarpDestination
thumb_func_start warp1_set_2
@ void warp1_set_2(char bank, char map, char warpid)
@@ -757,7 +757,7 @@ warp1_set_2: @ 8084C28
movs r3, 0x1
negs r3, r3
str r3, [sp]
bl warp1_set
bl Overworld_SetWarpDestination
add sp, 0x4
pop {r0}
bx r0
@@ -857,7 +857,7 @@ sub_8084CCC: @ 8084CCC
lsls r4, 24
asrs r4, 24
str r4, [sp]
bl warp1_set
bl Overworld_SetWarpDestination
_08084CFA:
add sp, 0x4
pop {r4}
@@ -879,8 +879,8 @@ copy_saved_warp3_bank_and_enter_x_to_warp1: @ 8084D04
.pool
thumb_func_end copy_saved_warp3_bank_and_enter_x_to_warp1
thumb_func_start sub_8084D1C
sub_8084D1C: @ 8084D1C
thumb_func_start Overworld_SetHealLocationWarp
Overworld_SetHealLocationWarp: @ 8084D1C
push {r4,r5,lr}
sub sp, 0x8
lsls r0, 24
@@ -911,7 +911,7 @@ _08084D50:
pop {r0}
bx r0
.pool
thumb_func_end sub_8084D1C
thumb_func_end Overworld_SetHealLocationWarp
thumb_func_start sub_8084D5C
sub_8084D5C: @ 8084D5C
@@ -1126,7 +1126,7 @@ _08084EF0:
lsls r4, r6, 24
asrs r4, 24
str r4, [sp]
bl warp1_set
bl Overworld_SetWarpDestination
_08084F0A:
add sp, 0x4
pop {r4-r6}
@@ -1289,7 +1289,7 @@ sub_8084FF8: @ 8084FF8
lsls r4, r5, 24
asrs r4, 24
str r4, [sp]
bl warp1_set
bl Overworld_SetWarpDestination
b _0808504C
_08085030:
bl mapheader_run_script_with_tag_x6
@@ -1365,7 +1365,7 @@ mliX_load_map: @ 8085098
negs r3, r3
str r3, [sp]
adds r2, r3, 0
bl warp1_set
bl Overworld_SetWarpDestination
ldr r4, =gMapHeader
ldrb r0, [r4, 0x14]
cmp r0, 0x3A
@@ -1382,7 +1382,7 @@ _080850C8:
adds r0, r6, 0
adds r1, r5, 0
bl sub_80B21B4
bl sub_809E7B0
bl DoTimeBasedEvents
bl sub_80AEDBC
bl sub_8085B2C
bl update_sav1_flash_used_on_map
@@ -1404,7 +1404,7 @@ _08085116:
bl sub_80A0A2C
bl UpdateLocationHistoryForRoamer
bl RoamerMove
bl sub_80AEE20
bl DoCurrentWeather
bl wild_encounter_reset_coro_args
bl mapheader_run_script_with_tag_x5
ldr r2, =gMapHeader
@@ -1481,14 +1481,14 @@ _080851A2:
bl sub_80B21B4
cmp r7, 0x1
beq _080851EE
bl sub_809E7B0
bl DoTimeBasedEvents
_080851EE:
bl sub_80AEDBC
bl sub_8085B2C
cmp r5, 0
beq _08085200
ldr r0, =0x00000888
bl FlagReset
bl FlagClear
_08085200:
bl update_sav1_flash_used_on_map
bl sav1_reset_battle_music_maybe
@@ -1858,8 +1858,8 @@ _080854DE:
.pool
thumb_func_end update_sav1_flash_used_on_map
thumb_func_start sub_80854EC
sub_80854EC: @ 80854EC
thumb_func_start Overworld_SetFlashLevel
Overworld_SetFlashLevel: @ 80854EC
push {lr}
adds r1, r0, 0
cmp r1, 0
@@ -1878,7 +1878,7 @@ _080854FE:
pop {r0}
bx r0
.pool
thumb_func_end sub_80854EC
thumb_func_end Overworld_SetFlashLevel
thumb_func_start sav1_get_flash_used_on_map
sav1_get_flash_used_on_map: @ 8085514
@@ -2263,14 +2263,14 @@ _080857E8:
.pool
thumb_func_end sub_8085784
thumb_func_start sav1_set_battle_music_maybe
sav1_set_battle_music_maybe: @ 80857F4
thumb_func_start Overworld_SetSavedMusic
Overworld_SetSavedMusic: @ 80857F4
ldr r1, =gSaveBlock1Ptr
ldr r1, [r1]
strh r0, [r1, 0x2C]
bx lr
.pool
thumb_func_end sav1_set_battle_music_maybe
thumb_func_end Overworld_SetSavedMusic
thumb_func_start sav1_reset_battle_music_maybe
sav1_reset_battle_music_maybe: @ 8085800
@@ -2339,8 +2339,8 @@ _08085890:
bx r0
thumb_func_end sub_8085810
thumb_func_start sub_8085898
sub_8085898: @ 8085898
thumb_func_start Overworld_ChangeMusicToDefault
Overworld_ChangeMusicToDefault: @ 8085898
push {r4,lr}
bl GetCurrentMapMusic
adds r4, r0, 0
@@ -2360,10 +2360,10 @@ _080858BE:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_8085898
thumb_func_end Overworld_ChangeMusicToDefault
thumb_func_start sub_80858C4
sub_80858C4: @ 80858C4
thumb_func_start Overworld_ChangeMusicTo
Overworld_ChangeMusicTo: @ 80858C4
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -2383,7 +2383,7 @@ _080858E4:
pop {r0}
bx r0
.pool
thumb_func_end sub_80858C4
thumb_func_end Overworld_ChangeMusicTo
thumb_func_start is_warp1_light_level_8_or_9
is_warp1_light_level_8_or_9: @ 80858F0
@@ -3525,8 +3525,8 @@ _08086278:
_08086286:
bl CopyFieldObjectTemplateCoordsToSav1
_0808628A:
bl sub_809757C
bl sub_809E7B0
bl UnfreezeMapObjects
bl DoTimeBasedEvents
bl sub_8084788
ldr r0, =gMapHeader
ldrh r1, [r0, 0x12]
asm/rom6.s
+42 -42
View File
@@ -167,7 +167,7 @@ sub_8135578: @ 8135578
cmp r4, 0
bne _081355FC
bl player_get_direction_lower_nybble
ldr r6, =gFieldEffectSpawnParams
ldr r6, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r6, 0x4]
@@ -303,7 +303,7 @@ _081356AC:
sub_81356C4: @ 81356C4
push {lr}
bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -380,7 +380,7 @@ hm2_dig: @ 8135760
movs r0, 0x26
bl FieldEffectStart
bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -3381,7 +3381,7 @@ hm2_flash: @ 8137178
lsls r4, 24
lsrs r4, 24
bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
lsls r0, 24
lsrs r0, 24
str r0, [r1]
@@ -4337,7 +4337,7 @@ sub_8137988: @ 8137988
.pool
_081379C8:
ldr r0, =0x0000089a
bl FlagReset
bl FlagClear
_081379CE:
pop {r0}
bx r0
@@ -4629,7 +4629,7 @@ sub_8137C10: @ 8137C10
ldr r0, =gSpecialVar_0x8004
ldrh r0, [r0]
bl sub_8137A98
bl box_related_two__2
bl ShowFieldMessage
pop {r0}
bx r0
.pool
@@ -5030,7 +5030,7 @@ _08137F6E:
movs r1, 0
bl VarSet
movs r0, 0
bl sav1_set_battle_music_maybe
bl Overworld_SetSavedMusic
_08137F7C:
pop {r4}
pop {r0}
@@ -5056,7 +5056,7 @@ sub_8137F90: @ 8137F90
sub_8137FB0: @ 8137FB0
push {lr}
ldr r0, =0x0000088d
bl FlagReset
bl FlagClear
pop {r0}
bx r0
.pool
@@ -6378,7 +6378,7 @@ sub_8138AA4: @ 8138AA4
sub_8138AC0: @ 8138AC0
push {lr}
ldr r0, =gStringVar4
bl box_related_two__2
bl ShowFieldMessage
pop {r0}
bx r0
.pool
@@ -6485,7 +6485,7 @@ sub_8138B8C: @ 8138B8C
movs r0, 0x13
movs r1, 0
movs r3, 0x6
bl warp1_set
bl Overworld_SetWarpDestination
b _08138BC2
.pool
_08138BB0:
@@ -6496,7 +6496,7 @@ _08138BB0:
movs r0, 0x13
movs r1, 0x1
movs r3, 0x6
bl warp1_set
bl Overworld_SetWarpDestination
_08138BC2:
add sp, 0x4
pop {r0}
@@ -6537,7 +6537,7 @@ _08138BF6:
thumb_func_start sub_8138C04
sub_8138C04: @ 8138C04
push {r4,lr}
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -7051,7 +7051,7 @@ sub_8138FEC: @ 8138FEC
ldr r1, =gSpecialVar_0x8004
ldr r0, =0x000001f5
strh r0, [r1]
bl FlagReset
bl FlagClear
pop {r0}
bx r0
.pool
@@ -7060,7 +7060,7 @@ sub_8138FEC: @ 8138FEC
thumb_func_start sub_8139004
sub_8139004: @ 8139004
push {lr}
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -7084,7 +7084,7 @@ _0813902A:
thumb_func_start sub_8139030
sub_8139030: @ 8139030
push {lr}
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -7108,7 +7108,7 @@ _08139056:
thumb_func_start sub_813905C
sub_813905C: @ 813905C
push {lr}
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -7132,7 +7132,7 @@ _08139082:
thumb_func_start sub_8139088
sub_8139088: @ 8139088
push {lr}
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -7156,7 +7156,7 @@ _081390AE:
thumb_func_start sub_81390B4
sub_81390B4: @ 81390B4
push {lr}
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -7295,7 +7295,7 @@ RemoveScriptFieldObject: @ 81391AC
thumb_func_start sub_81391D0
sub_81391D0: @ 81391D0
push {lr}
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -7479,7 +7479,7 @@ _08139342:
thumb_func_start sub_8139348
sub_8139348: @ 8139348
push {lr}
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -7507,7 +7507,7 @@ sub_8139370: @ 8139370
movs r1, 0x1
mov r0, sp
strb r1, [r0]
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -7538,7 +7538,7 @@ _081393B6:
thumb_func_start sub_81393C8
sub_81393C8: @ 81393C8
push {lr}
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -7858,7 +7858,7 @@ sub_8139648: @ 8139648
cmp r0, 0x1
beq _08139664
movs r0, 0x14
bl sub_80AED7C
bl SetSav1Weather
_08139664:
pop {r0}
bx r0
@@ -7876,14 +7876,14 @@ sub_8139668: @ 8139668
cmp r0, 0x1
beq _08139684
movs r0, 0x15
bl sub_80AED7C
bl SetSav1Weather
_08139684:
pop {r0}
bx r0
thumb_func_end sub_8139668
thumb_func_start sub_8139688
sub_8139688: @ 8139688
thumb_func_start GetLeadMonIndex
GetLeadMonIndex: @ 8139688
push {r4-r6,lr}
bl CalculatePlayerPartyCount
lsls r0, 24
@@ -7926,7 +7926,7 @@ _081396D8:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_8139688
thumb_func_end GetLeadMonIndex
thumb_func_start sub_81396E0
sub_81396E0: @ 81396E0
@@ -9094,7 +9094,7 @@ _0813A062:
lsls r0, 2
adds r0, r7
ldr r0, [r0]
bl box_related_two__2
bl ShowFieldMessage
pop {r4-r7}
pop {r0}
bx r0
@@ -9996,7 +9996,7 @@ _0813A7C6:
lsrs r0, 22
adds r0, r1
ldr r0, [r0]
bl box_related_two__2
bl ShowFieldMessage
pop {r0}
bx r0
.pool
@@ -10036,7 +10036,7 @@ sub_813A820: @ 813A820
lsls r0, r4, 2
adds r0, r1
ldr r0, [r0]
bl box_related_two__2
bl ShowFieldMessage
ldr r0, =0x00004031
adds r1, r4, 0
bl VarSet
@@ -10056,7 +10056,7 @@ sub_813A854: @ 813A854
lsrs r0, 14
adds r0, r4
ldr r0, [r0]
bl box_related_two__2
bl ShowFieldMessage
pop {r4}
pop {r0}
bx r0
@@ -11039,7 +11039,7 @@ _0813B0F8:
ldr r0, =sub_813B160
movs r1, 0x8
bl CreateTask
ldr r3, =gFieldEffectSpawnParams
ldr r3, =gFieldEffectArguments
movs r0, 0x1
str r0, [r3]
movs r0, 0x3A
@@ -11074,7 +11074,7 @@ _0813B13A:
adds r0, r5, r0
ldrb r2, [r0]
movs r0, 0x1
bl update_saveblock1_field_object_coords
bl Overworld_SetMapObjTemplateCoords
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -11238,7 +11238,7 @@ _0813B27E:
cmp r0, r4
beq _0813B2A6
ldr r0, =0x000008d7
bl FlagReset
bl FlagClear
_0813B2A6:
ldr r0, =0x00004036
lsrs r1, r7, 16
@@ -11778,7 +11778,7 @@ _0813B728:
cmp r0, 0x2
bne _0813B790
ldr r0, =gUnknown_0824979B
bl box_related_two__3
bl ShowFieldAutoScrollMessage
b _0813B790
.pool
_0813B74C:
@@ -11787,7 +11787,7 @@ _0813B74C:
cmp r0, 0x3
bne _0813B790
ldr r0, =gUnknown_0824979B
bl box_related_two__3
bl ShowFieldAutoScrollMessage
b _0813B790
.pool
_0813B764:
@@ -12075,7 +12075,7 @@ sub_813B9A0: @ 813B9A0
cmp r1, r0
bne _0813B9B6
movs r0, 0x3
bl sub_8084D1C
bl Overworld_SetHealLocationWarp
_0813B9B6:
pop {r0}
bx r0
@@ -12187,16 +12187,16 @@ sub_813BA60: @ 813BA60
adds r1, r2
strh r0, [r1]
ldr r0, =0x00000315
bl FlagReset
bl FlagClear
ldr r0, =0x00000316
bl FlagReset
bl FlagClear
ldr r0, =0x00000317
bl FlagReset
bl FlagClear
movs r0, 0xC6
lsls r0, 2
bl FlagReset
bl FlagClear
ldr r0, =0x000002da
bl FlagReset
bl FlagClear
ldr r0, =0x00004095
movs r1, 0x1
bl VarSet
asm/scrcmd.s
-5744
View File
File diff suppressed because it is too large Load Diff
asm/script_menu.s
+19 -19
View File
@@ -5,9 +5,9 @@
.text
thumb_func_start Multichoice
@ bool8 Multichoice(u8 x, u8 y, u8 menuId, bool8 noCancelling)
Multichoice: @ 80E1E08
thumb_func_start ScriptMenu_Multichoice
@ bool8 ScriptMenu_Multichoice(u8 x, u8 y, u8 menuId, bool8 noCancelling)
ScriptMenu_Multichoice: @ 80E1E08
push {r4-r7,lr}
sub sp, 0x4
lsls r0, 24
@@ -44,10 +44,10 @@ _080E1E4E:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end Multichoice
thumb_func_end ScriptMenu_Multichoice
thumb_func_start sub_80E1E58
sub_80E1E58: @ 80E1E58
thumb_func_start ScriptMenu_MultichoiceWithDefault
ScriptMenu_MultichoiceWithDefault: @ 80E1E58
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -91,7 +91,7 @@ _080E1EAA:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_80E1E58
thumb_func_end ScriptMenu_MultichoiceWithDefault
thumb_func_start sub_80E1EB8
sub_80E1EB8: @ 80E1EB8
@@ -379,8 +379,8 @@ _080E20FC:
.pool
thumb_func_end sub_80E2058
thumb_func_start yes_no_box
yes_no_box: @ 80E2108
thumb_func_start ScriptMenu_YesNo
ScriptMenu_YesNo: @ 80E2108
push {r4,lr}
ldr r4, =task_yes_no_maybe
adds r0, r4, 0
@@ -405,7 +405,7 @@ _080E213A:
pop {r4}
pop {r1}
bx r1
thumb_func_end yes_no_box
thumb_func_end ScriptMenu_YesNo
thumb_func_start sub_80E2140
sub_80E2140: @ 80E2140
@@ -485,8 +485,8 @@ _080E21C4:
.pool
thumb_func_end task_yes_no_maybe
thumb_func_start sub_80E21D0
sub_80E21D0: @ 80E21D0
thumb_func_start ScriptMenu_MultichoiceGrid
ScriptMenu_MultichoiceGrid: @ 80E21D0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -627,7 +627,7 @@ _080E22E8:
pop {r1}
bx r1
.pool
thumb_func_end sub_80E21D0
thumb_func_end ScriptMenu_MultichoiceGrid
thumb_func_start sub_80E2308
sub_80E2308: @ 80E2308
@@ -1334,8 +1334,8 @@ _080E28F8:
bx r0
thumb_func_end task_picbox
thumb_func_start sub_80E2900
sub_80E2900: @ 80E2900
thumb_func_start ScriptMenu_ShowPokemonPic
ScriptMenu_ShowPokemonPic: @ 80E2900
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -1422,10 +1422,10 @@ _080E29BA:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_80E2900
thumb_func_end ScriptMenu_ShowPokemonPic
thumb_func_start picbox_close
picbox_close: @ 80E29C4
thumb_func_start ScriptMenu_GetPicboxWaitFunc
ScriptMenu_GetPicboxWaitFunc: @ 80E29C4
push {lr}
ldr r0, =task_picbox
bl FindTaskIdByFunc
@@ -1449,7 +1449,7 @@ _080E29F4:
_080E29F6:
pop {r1}
bx r1
thumb_func_end picbox_close
thumb_func_end ScriptMenu_GetPicboxWaitFunc
thumb_func_start sub_80E29FC
sub_80E29FC: @ 80E29FC
asm/script_movement.s
+6 -6
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start exec_movement
exec_movement: @ 80D32E8
thumb_func_start ScriptMovement_StartObjectMovementScript
ScriptMovement_StartObjectMovementScript: @ 80D32E8
push {r4,lr}
sub sp, 0x4
adds r4, r3, 0
@@ -47,10 +47,10 @@ _080D3332:
pop {r1}
bx r1
.pool
thumb_func_end exec_movement
thumb_func_end ScriptMovement_StartObjectMovementScript
thumb_func_start sub_80D3340
sub_80D3340: @ 80D3340
thumb_func_start ScriptMovement_IsObjectMovementFinished
ScriptMovement_IsObjectMovementFinished: @ 80D3340
push {r4,lr}
sub sp, 0x4
lsls r0, 24
@@ -87,7 +87,7 @@ _080D3384:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_80D3340
thumb_func_end ScriptMovement_IsObjectMovementFinished
thumb_func_start sub_80D338C
sub_80D338C: @ 80D338C
asm/script_pokemon_util_80F87D8.s
+17 -17
View File
@@ -83,7 +83,7 @@ sub_80F8850: @ 80F8850
thumb_func_start sub_80F8864
sub_80F8864: @ 80F8864
push {lr}
ldr r0, =gUnknown_02039F2C
ldr r0, =gScriptContestCategory
ldrh r0, [r0]
cmp r0, 0x4
bhi _080F88A4
@@ -397,8 +397,8 @@ sub_80F8ACC: @ 80F8ACC
.pool
thumb_func_end sub_80F8ACC
thumb_func_start sub_80F8ADC
sub_80F8ADC: @ 80F8ADC
thumb_func_start ShowContestWinner
ShowContestWinner: @ 80F8ADC
push {lr}
ldr r0, =sub_812FDEC
bl SetMainCallback2
@@ -408,7 +408,7 @@ sub_80F8ADC: @ 80F8ADC
pop {r0}
bx r0
.pool
thumb_func_end sub_80F8ADC
thumb_func_end ShowContestWinner
thumb_func_start sub_80F8AFC
sub_80F8AFC: @ 80F8AFC
@@ -1269,9 +1269,9 @@ _080F922C:
.pool
thumb_func_end sp000_heal_pokemon
thumb_func_start sub_80F9244
@ void sub_80F9244(s16 species_num, u8 level, int held_item)
sub_80F9244: @ 80F9244
thumb_func_start ScriptGiveMon
@ void ScriptGiveMon(s16 species_num, u8 level, int held_item)
ScriptGiveMon: @ 80F9244
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -1332,10 +1332,10 @@ _080F92B8:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_80F9244
thumb_func_end ScriptGiveMon
thumb_func_start sub_80F92C8
sub_80F92C8: @ 80F92C8
thumb_func_start ScriptGiveEgg
ScriptGiveEgg: @ 80F92C8
push {lr}
sub sp, 0x68
adds r1, r0, 0
@@ -1357,7 +1357,7 @@ sub_80F92C8: @ 80F92C8
add sp, 0x68
pop {r1}
bx r1
thumb_func_end sub_80F92C8
thumb_func_end ScriptGiveEgg
thumb_func_start sub_80F92F8
sub_80F92F8: @ 80F92F8
@@ -1450,8 +1450,8 @@ _080F9392:
.pool
thumb_func_end sub_80F9370
thumb_func_start sub_80F93A0
sub_80F93A0: @ 80F93A0
thumb_func_start CreateScriptedWildMon
CreateScriptedWildMon: @ 80F93A0
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -1496,10 +1496,10 @@ _080F93EE:
pop {r0}
bx r0
.pool
thumb_func_end sub_80F93A0
thumb_func_end CreateScriptedWildMon
thumb_func_start sub_80F9400
sub_80F9400: @ 80F9400
thumb_func_start ScriptSetMonMoveSlot
ScriptSetMonMoveSlot: @ 80F9400
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -1525,7 +1525,7 @@ _080F941C:
pop {r0}
bx r0
.pool
thumb_func_end sub_80F9400
thumb_func_end ScriptSetMonMoveSlot
thumb_func_start sub_80F9438
sub_80F9438: @ 80F9438
asm/secret_base.s
+2 -2
View File
@@ -861,7 +861,7 @@ sub_80E916C: @ 80E916C
asrs r0, 24
str r0, [sp]
adds r0, r5, 0
bl warp1_set
bl Overworld_SetWarpDestination
bl warp_in
ldr r1, =gFieldCallback
ldr r0, =sub_80E9108
@@ -1208,7 +1208,7 @@ _080E9462:
adds r0, 0xAE
lsls r0, 16
lsrs r0, 16
bl FlagReset
bl FlagClear
ldrb r0, [r6]
ldr r5, =gSaveBlock1Ptr
ldr r2, [r5]
asm/shop.s
+1 -1
View File
@@ -2465,7 +2465,7 @@ BuyMenuSubtractMoney: @ 80E0F88
lsls r2, 6
adds r1, r2
ldr r1, [r1]
bl SubtractMoney
bl RemoveMoney
movs r0, 0x5F
bl PlaySE
ldr r0, [r5]
asm/slot_machine.s
+3 -3
View File
@@ -55,8 +55,8 @@ _0812A530:
.pool
thumb_func_end sub_812A4DC
thumb_func_start sub_812A540
sub_812A540: @ 812A540
thumb_func_start PlaySlotMachine
PlaySlotMachine: @ 812A540
push {r4-r6,lr}
adds r4, r0, 0
adds r6, r1, 0
@@ -85,7 +85,7 @@ sub_812A540: @ 812A540
pop {r0}
bx r0
.pool
thumb_func_end sub_812A540
thumb_func_end PlaySlotMachine
thumb_func_start sub_812A588
sub_812A588: @ 812A588
asm/trainer_rematch.s
+1 -1
View File
@@ -185,7 +185,7 @@ _081DA6D4:
adds r0, r1
adds r0, r6
ldrh r0, [r0]
bl trainer_flag_check
bl HasTrainerAlreadyBeenFought
lsls r0, 24
cmp r0, 0
bne _081DA6F0
asm/trainer_see.s
+6 -6
View File
@@ -734,7 +734,7 @@ sub_80B417C: @ 80B417C
push {r4,r5,lr}
adds r5, r1, 0
adds r4, r2, 0
ldr r1, =gFieldEffectSpawnParams
ldr r1, =gFieldEffectArguments
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
@@ -1050,7 +1050,7 @@ sub_80B43E0: @ 80B43E0
lsls r0, 24
cmp r0, 0
beq _080B4426
ldr r2, =gFieldEffectSpawnParams
ldr r2, =gFieldEffectArguments
movs r1, 0x10
ldrsh r0, [r4, r1]
str r0, [r2]
@@ -1303,7 +1303,7 @@ sub_80B45D0: @ 80B45D0
ldr r1, =gScriptResult
movs r0, 0x1
strh r0, [r1]
bl sub_809757C
bl UnfreezeMapObjects
ldr r0, =gUnknown_03006090
ldrb r0, [r0, 0xC]
bl sub_80974D0
@@ -1432,7 +1432,7 @@ sub_80B46D8: @ 80B46D8
orrs r3, r4
mov r4, r12
strb r3, [r4]
ldr r4, =gFieldEffectSpawnParams
ldr r4, =gFieldEffectArguments
ldr r3, [r4]
strh r3, [r0, 0x2E]
ldr r3, [r4, 0x4]
@@ -1609,7 +1609,7 @@ sub_80B4808: @ 80B4808
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
movs r0, 0xFF
bl exec_movement
bl ScriptMovement_StartObjectMovementScript
b _080B489E
.pool
_080B4870:
@@ -1633,7 +1633,7 @@ _080B4870:
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
movs r0, 0xFF
bl exec_movement
bl ScriptMovement_StartObjectMovementScript
_080B489E:
movs r0, 0xFF
bl sub_809BE48
asm/tv.s
+50 -50
View File
@@ -233,7 +233,7 @@ _080EC080:
beq _080EC0BE
_080EC0AE:
ldr r0, =0x00000891
bl FlagReset
bl FlagClear
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x3
@@ -1407,7 +1407,7 @@ sub_80ECA38: @ 80ECA38
ldr r1, =gSaveBlock2Ptr
ldr r1, [r1]
bl StringCopy
ldr r0, =gUnknown_02039F2C
ldr r0, =gScriptContestCategory
ldrh r0, [r0]
strb r0, [r4, 0x1C]
ldr r0, =gUnknown_02039F24
@@ -2114,7 +2114,7 @@ sub_80ED090: @ 80ED090
ands r2, r1
orrs r2, r0
strb r2, [r7, 0x13]
ldr r0, =gUnknown_02039F2C
ldr r0, =gScriptContestCategory
ldrb r0, [r0]
movs r1, 0x7
ands r1, r0
@@ -2609,7 +2609,7 @@ sub_80ED548: @ 80ED548
ldr r1, =gSaveBlock2Ptr
ldr r1, [r1]
bl StringCopy
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -2689,7 +2689,7 @@ sub_80ED610: @ 80ED610
mov r8, r0
mov r1, r8
strb r1, [r5, 0x1]
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r7, 0x64
@@ -2719,7 +2719,7 @@ sub_80ED610: @ 80ED610
ldr r1, =gSaveBlock2Ptr
ldr r1, [r1]
bl StringCopy
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
muls r0, r7
@@ -2731,7 +2731,7 @@ sub_80ED610: @ 80ED610
bl GetMonData
adds r0, r4, 0
bl StripExtCtrlCodes
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
muls r0, r7
@@ -2747,7 +2747,7 @@ sub_80ED610: @ 80ED610
strb r0, [r5, 0xD]
cmp r0, 0x1
beq _080ED6D4
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
muls r0, r7
@@ -2761,7 +2761,7 @@ _080ED6D4:
b _080ED706
.pool
_080ED6F4:
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
muls r0, r7
@@ -5699,7 +5699,7 @@ _080EEFD0:
lsls r0, 2
adds r0, r1
ldr r0, [r0]
bl box_related_two__2
bl ShowFieldMessage
b _080EF016
.pool
_080EEFE8:
@@ -5723,7 +5723,7 @@ _080EEFE8:
lsls r0, 2
adds r0, r1
ldr r0, [r0]
bl box_related_two__2
bl ShowFieldMessage
_080EF016:
ldr r1, =gScriptResult
movs r0, 0x1
@@ -6495,7 +6495,7 @@ sub_80EF64C: @ 80EF64C
cmp r0, 0
bne _080EF6A0
ldr r4, =gStringVar1
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -6569,7 +6569,7 @@ sub_80EF704: @ 80EF704
cmp r0, 0
bne _080EF774
ldr r6, =gStringVar1
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r5, 0x64
@@ -6585,7 +6585,7 @@ sub_80EF704: @ 80EF704
adds r1, r0
adds r0, r6, 0
bl StringCopy
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
muls r0, r5
@@ -6788,7 +6788,7 @@ _080EF8EE:
thumb_func_start sub_80EF8F8
sub_80EF8F8: @ 80EF8F8
push {lr}
bl sub_8139688
bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
bl sub_80EF88C
@@ -10706,7 +10706,7 @@ _080F1952:
lsls r1, r5, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4,r5}
pop {r0}
bx r0
@@ -10958,7 +10958,7 @@ _080F1BEA:
lsls r1, r5, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4,r5}
pop {r0}
bx r0
@@ -11190,7 +11190,7 @@ _080F1E2C:
lsls r1, r6, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4-r6}
pop {r0}
bx r0
@@ -11485,7 +11485,7 @@ _080F20FE:
lsls r1, r6, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -11707,7 +11707,7 @@ _080F2358:
lsls r1, r6, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4-r6}
pop {r0}
bx r0
@@ -11846,7 +11846,7 @@ _080F24C0:
lsls r1, r5, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4,r5}
pop {r0}
bx r0
@@ -12019,7 +12019,7 @@ _080F26A6:
movs r3, 0x2
bl ConvertEasyChatWordsToString
adds r0, r4, 0
bl box_related_two__2
bl ShowFieldMessage
ldr r1, =gUnknown_0203A030
movs r0, 0x1
strb r0, [r1]
@@ -12033,7 +12033,7 @@ _080F26CC:
movs r3, 0x2
bl ConvertEasyChatWordsToString
adds r0, r4, 0
bl box_related_two__2
bl ShowFieldMessage
ldr r1, =gUnknown_0203A030
movs r0, 0x3
strb r0, [r1]
@@ -12044,7 +12044,7 @@ _080F26F0:
lsls r1, r7, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
_080F26FC:
pop {r4-r7}
pop {r0}
@@ -12173,7 +12173,7 @@ _080F2868:
movs r3, 0x2
bl ConvertEasyChatWordsToString
adds r0, r4, 0
bl box_related_two__2
bl ShowFieldMessage
ldr r1, =gUnknown_0203A030
movs r0, 0x1
strb r0, [r1]
@@ -12184,7 +12184,7 @@ _080F288C:
lsls r1, r6, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
_080F2898:
pop {r4-r7}
pop {r0}
@@ -12278,7 +12278,7 @@ _080F297E:
lsls r1, r5, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4-r6}
pop {r0}
bx r0
@@ -12322,7 +12322,7 @@ DoTVShowPokemonNewsMassOutbreak: @ 80F29A0
lsls r0, 2
adds r0, r1
ldr r0, [r0]
bl box_related_two__2
bl ShowFieldMessage
pop {r4}
pop {r0}
bx r0
@@ -13075,7 +13075,7 @@ _080F311C:
lsls r1, r7, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4-r7}
pop {r0}
bx r0
@@ -13285,7 +13285,7 @@ _080F3362:
lsls r1, r5, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4,r5}
pop {r0}
bx r0
@@ -13535,7 +13535,7 @@ _080F3624:
lsls r1, r5, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4,r5}
pop {r0}
bx r0
@@ -13721,7 +13721,7 @@ _080F37EA:
lsls r1, r7, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4-r7}
pop {r0}
bx r0
@@ -13806,7 +13806,7 @@ _080F38E0:
lsls r1, r5, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4,r5}
pop {r0}
bx r0
@@ -13894,7 +13894,7 @@ _080F39BE:
lsls r1, r5, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4-r6}
pop {r0}
bx r0
@@ -14124,7 +14124,7 @@ _080F3BE8:
lsls r1, r5, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4,r5}
pop {r0}
bx r0
@@ -14257,7 +14257,7 @@ _080F3D54:
lsls r1, r5, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4,r5}
pop {r0}
bx r0
@@ -14362,7 +14362,7 @@ _080F3E5C:
lsls r1, r6, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4-r7}
pop {r0}
bx r0
@@ -14532,7 +14532,7 @@ _080F4008:
lsls r1, r5, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4,r5}
pop {r0}
bx r0
@@ -14835,7 +14835,7 @@ _080F4344:
lsls r1, r7, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4-r7}
pop {r0}
bx r0
@@ -15063,7 +15063,7 @@ _080F4588:
lsls r1, r6, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4-r6}
pop {r0}
bx r0
@@ -15133,7 +15133,7 @@ _080F4634:
lsls r0, r6, 2
adds r0, r1
ldr r0, [r0]
bl box_related_two__2
bl ShowFieldMessage
pop {r4-r6}
pop {r0}
bx r0
@@ -15330,7 +15330,7 @@ _080F4858:
lsls r1, r7, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4-r7}
pop {r0}
bx r0
@@ -15453,7 +15453,7 @@ _080F499A:
lsls r1, r5, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4,r5}
pop {r0}
bx r0
@@ -15623,7 +15623,7 @@ _080F4B3A:
lsls r1, r5, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4,r5}
pop {r0}
bx r0
@@ -15846,7 +15846,7 @@ _080F4D84:
lsls r1, r5, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4,r5}
pop {r0}
bx r0
@@ -16107,7 +16107,7 @@ _080F5014:
lsls r1, r7, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4-r7}
pop {r0}
bx r0
@@ -16245,7 +16245,7 @@ _080F5164:
lsls r1, r5, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4,r5}
pop {r0}
bx r0
@@ -16650,7 +16650,7 @@ _080F552A:
lsls r1, r2, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r3,r4}
mov r8, r3
mov r9, r4
@@ -16821,7 +16821,7 @@ _080F56BC:
lsls r1, r5, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4,r5}
pop {r0}
bx r0
@@ -16895,7 +16895,7 @@ _080F575E:
lsls r1, r5, 2
adds r1, r0
ldr r0, [r1]
bl box_related_two__2
bl ShowFieldMessage
pop {r4-r6}
pop {r0}
bx r0