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

Merge branch 'master' into decompile_rom3

Browse Source
This commit is contained in:
DizzyEggg
2017-10-14 11:36:28 +02:00
parent 14e41d6c50 0d38d443b5
commit 455202eca0
121 changed files with 3591 additions and 9777 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 adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80D338C bl sub_80D338C
bl sub_809757C bl UnfreezeMapObjects
bl ScriptContext2_Disable bl ScriptContext2_Disable
_08196446: _08196446:
movs r0, 0x1 movs r0, 0x1
@@ -14680,7 +14680,7 @@ sub_8196748: @ 8196748
ldr r4, =gUnknown_085500A4 ldr r4, =gUnknown_085500A4
_08196750: _08196750:
ldrh r0, [r4] ldrh r0, [r4]
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0819675E beq _0819675E
@@ -14706,7 +14706,7 @@ sub_8196774: @ 8196774
ldr r5, =gUnknown_085500A4 ldr r5, =gUnknown_085500A4
_0819677E: _0819677E:
ldrh r0, [r5] ldrh r0, [r5]
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0819679A beq _0819679A
asm/battle_frontier_2.s
+3 -3
View File
@@ -27306,7 +27306,7 @@ _081A8A74:
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
adds r3, r7, 0 adds r3, r7, 0
bl exec_movement bl ScriptMovement_StartObjectMovementScript
b _081A8AD4 b _081A8AD4
.pool .pool
_081A8ACC: _081A8ACC:
@@ -27540,7 +27540,7 @@ _081A8C72:
ldr r2, [r1] ldr r2, [r1]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
bl exec_movement bl ScriptMovement_StartObjectMovementScript
b _081A8D32 b _081A8D32
.pool .pool
_081A8C9C: _081A8C9C:
@@ -27618,7 +27618,7 @@ _081A8D12:
ldr r2, [r1] ldr r2, [r1]
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
bl exec_movement bl ScriptMovement_StartObjectMovementScript
_081A8D32: _081A8D32:
mov r0, r9 mov r0, r9
adds r0, 0x1 adds r0, 0x1
asm/battle_setup.s
+30 -30
View File
@@ -299,8 +299,8 @@ sub_80B086C: @ 80B086C
.pool .pool
thumb_func_end sub_80B086C thumb_func_end sub_80B086C
thumb_func_start sub_80B08A8 thumb_func_start BattleSetup_StartScriptedWildBattle
sub_80B08A8: @ 80B08A8 BattleSetup_StartScriptedWildBattle: @ 80B08A8
push {lr} push {lr}
bl ScriptContext2_Enable bl ScriptContext2_Enable
ldr r1, =gMain ldr r1, =gMain
@@ -323,7 +323,7 @@ sub_80B08A8: @ 80B08A8
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80B08A8 thumb_func_end BattleSetup_StartScriptedWildBattle
thumb_func_start sub_80B08EC thumb_func_start sub_80B08EC
sub_80B08EC: @ 80B08EC sub_80B08EC: @ 80B08EC
@@ -1357,7 +1357,7 @@ sub_80B1158: @ 80B1158
movs r1, 0x5 movs r1, 0x5
movs r2, 0 movs r2, 0
movs r3, 0 movs r3, 0
bl sub_80F9244 bl ScriptGiveMon
bl ResetTasks bl ResetTasks
bl PlayBattleBGM bl PlayBattleBGM
ldr r0, =sub_80B11A8 ldr r0, =sub_80B11A8
@@ -1686,9 +1686,9 @@ _080B141A:
.pool .pool
thumb_func_end battle_80801F0 thumb_func_end battle_80801F0
thumb_func_start TrainerBattleConfigure thumb_func_start BattleSetup_ConfigureTrainerBattle
@ u8 *TrainerBattleConfigure(u8 *args) @ u8 *BattleSetup_ConfigureTrainerBattle(u8 *args)
TrainerBattleConfigure: @ 80B1430 BattleSetup_ConfigureTrainerBattle: @ 80B1430
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
bl InitTrainerBattleVariables bl InitTrainerBattleVariables
@@ -1872,7 +1872,7 @@ _080B161E:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end TrainerBattleConfigure thumb_func_end BattleSetup_ConfigureTrainerBattle
thumb_func_start SingleTrainerWantsBattle thumb_func_start SingleTrainerWantsBattle
@ void SingleTrainerWantsBattle(u8 trainerFieldObjectId, u8 *trainerScript) @ void SingleTrainerWantsBattle(u8 trainerFieldObjectId, u8 *trainerScript)
@@ -1892,7 +1892,7 @@ SingleTrainerWantsBattle: @ 80B162C
strh r0, [r4] strh r0, [r4]
adds r1, 0x1 adds r1, 0x1
adds r0, r1, 0 adds r0, r1, 0
bl TrainerBattleConfigure bl BattleSetup_ConfigureTrainerBattle
ldr r0, =gUnknown_08271354 ldr r0, =gUnknown_08271354
bl ScriptContext1_SetupScript bl ScriptContext1_SetupScript
bl ScriptContext2_Enable bl ScriptContext2_Enable
@@ -1920,7 +1920,7 @@ TwoTrainersWantBattle: @ 80B1670
strh r0, [r4] strh r0, [r4]
adds r1, 0x1 adds r1, 0x1
adds r0, r1, 0 adds r0, r1, 0
bl TrainerBattleConfigure bl BattleSetup_ConfigureTrainerBattle
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -2056,8 +2056,8 @@ sub_80B178C: @ 80B178C
bx r0 bx r0
thumb_func_end sub_80B178C thumb_func_end sub_80B178C
thumb_func_start trainer_flag_check thumb_func_start HasTrainerAlreadyBeenFought
trainer_flag_check: @ 80B17A0 HasTrainerAlreadyBeenFought: @ 80B17A0
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
movs r1, 0xA0 movs r1, 0xA0
@@ -2069,7 +2069,7 @@ trainer_flag_check: @ 80B17A0
lsrs r0, 24 lsrs r0, 24
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end trainer_flag_check thumb_func_end HasTrainerAlreadyBeenFought
thumb_func_start trainer_flag_set thumb_func_start trainer_flag_set
trainer_flag_set: @ 80B17B8 trainer_flag_set: @ 80B17B8
@@ -2092,13 +2092,13 @@ trainer_flag_clear: @ 80B17CC
lsls r1, 19 lsls r1, 19
adds r0, r1 adds r0, r1
lsrs r0, 16 lsrs r0, 16
bl FlagReset bl FlagClear
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end trainer_flag_clear thumb_func_end trainer_flag_clear
thumb_func_start sub_80B17E0 thumb_func_start BattleSetup_StartTrainerBattle
sub_80B17E0: @ 80B17E0 BattleSetup_StartTrainerBattle: @ 80B17E0
push {r4,lr} push {r4,lr}
ldr r0, =gUnknown_030060A8 ldr r0, =gUnknown_030060A8
ldrb r0, [r0] ldrb r0, [r0]
@@ -2217,7 +2217,7 @@ _080B190C:
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_80B17E0 thumb_func_end BattleSetup_StartTrainerBattle
thumb_func_start sub_80B1918 thumb_func_start sub_80B1918
sub_80B1918: @ 80B1918 sub_80B1918: @ 80B1918
@@ -2413,8 +2413,8 @@ _080B1AF4:
bx r0 bx r0
thumb_func_end sub_80B1A14 thumb_func_end sub_80B1A14
thumb_func_start sub_80B1AF8 thumb_func_start BattleSetup_GetScriptAddrAfterBattle
sub_80B1AF8: @ 80B1AF8 BattleSetup_GetScriptAddrAfterBattle: @ 80B1AF8
push {lr} push {lr}
ldr r0, =gUnknown_02038BEC ldr r0, =gUnknown_02038BEC
ldr r0, [r0] ldr r0, [r0]
@@ -2425,10 +2425,10 @@ _080B1B04:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end sub_80B1AF8 thumb_func_end BattleSetup_GetScriptAddrAfterBattle
thumb_func_start sub_80B1B10 thumb_func_start BattleSetup_GetTrainerPostBattleScript
sub_80B1B10: @ 80B1B10 BattleSetup_GetTrainerPostBattleScript: @ 80B1B10
push {lr} push {lr}
ldr r1, =gUnknown_02038BF8 ldr r1, =gUnknown_02038BF8
ldrb r2, [r1] ldrb r2, [r1]
@@ -2462,7 +2462,7 @@ _080B1B56:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end sub_80B1B10 thumb_func_end BattleSetup_GetTrainerPostBattleScript
thumb_func_start special_trainer_unable_to_battle thumb_func_start special_trainer_unable_to_battle
special_trainer_unable_to_battle: @ 80B1B60 special_trainer_unable_to_battle: @ 80B1B60
@@ -2796,7 +2796,7 @@ _080B1DCE:
ldrh r0, [r4] ldrh r0, [r4]
cmp r0, 0 cmp r0, 0
beq _080B1DE2 beq _080B1DE2
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080B1DCA bne _080B1DCA
@@ -2895,7 +2895,7 @@ sub_80B1E94: @ 80B1E94
lsls r0, r4, 4 lsls r0, r4, 4
adds r0, r5 adds r0, r5
ldrh r0, [r0] ldrh r0, [r0]
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -3076,7 +3076,7 @@ _080B1FE2:
ldrh r0, [r4] ldrh r0, [r4]
cmp r0, 0 cmp r0, 0
beq _080B1FCA beq _080B1FCA
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B1FD4 beq _080B1FD4
@@ -3127,7 +3127,7 @@ _080B203A:
ldrh r0, [r4] ldrh r0, [r4]
cmp r0, 0 cmp r0, 0
beq _080B201E beq _080B201E
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B2028 beq _080B2028
@@ -3233,7 +3233,7 @@ sub_80B20F4: @ 80B20F4
lsls r0, r1, 4 lsls r0, r1, 4
adds r0, r4 adds r0, r4
ldrh r0, [r0, 0x2] ldrh r0, [r0, 0x2]
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B211E beq _080B211E
@@ -3509,7 +3509,7 @@ sub_80B2318: @ 80B2318
lsrs r4, r0, 12 lsrs r4, r0, 12
adds r6, r4, r7 adds r6, r4, r7
ldrh r0, [r6] ldrh r0, [r6]
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -3527,7 +3527,7 @@ _080B2338:
adds r4, r6, 0x2 adds r4, r6, 0x2
_080B2346: _080B2346:
ldrh r0, [r4] ldrh r0, [r4]
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B2360 beq _080B2360
asm/battle_tower.s
+5 -5
View File
@@ -3548,11 +3548,11 @@ _08163E2C:
movs r0, 0 movs r0, 0
strb r0, [r4] strb r0, [r4]
ldr r0, =gUnknown_08224158 ldr r0, =gUnknown_08224158
bl TrainerBattleConfigure bl BattleSetup_ConfigureTrainerBattle
movs r0, 0x1 movs r0, 0x1
strb r0, [r4] strb r0, [r4]
ldr r0, =gUnknown_08224167 ldr r0, =gUnknown_08224167
bl TrainerBattleConfigure bl BattleSetup_ConfigureTrainerBattle
ldr r0, =gPartnerTrainerId ldr r0, =gPartnerTrainerId
strh r5, [r0] strh r5, [r0]
ldr r0, =sub_8163A8C ldr r0, =sub_8163A8C
@@ -4364,7 +4364,7 @@ _081644E0:
strb r0, [r1, 0x1] strb r0, [r1, 0x1]
movs r0, 0xD8 movs r0, 0xD8
lsls r0, 2 lsls r0, 2
bl FlagReset bl FlagClear
ldr r0, [r6] ldr r0, [r6]
adds r0, r5 adds r0, r5
ldrh r0, [r0] ldrh r0, [r0]
@@ -4525,7 +4525,7 @@ _08164660:
adds r1, 0xC0 adds r1, 0xC0
strb r0, [r1, 0x1] strb r0, [r1, 0x1]
ldr r0, =0x00000361 ldr r0, =0x00000361
bl FlagReset bl FlagClear
ldr r0, [r6] ldr r0, [r6]
adds r0, r5 adds r0, r5
ldrh r0, [r0] ldrh r0, [r0]
@@ -6056,7 +6056,7 @@ _081653E0:
bne _081653F8 bne _081653F8
bl sub_80F01B8 bl sub_80F01B8
movs r0, 0x77 movs r0, 0x77
bl FlagReset bl FlagClear
_081653F8: _081653F8:
pop {r0} pop {r0}
bx r0 bx r0
asm/battle_transition.s
+2 -2
View File
@@ -2151,7 +2151,7 @@ sub_8147018: @ 8147018
ands r5, r0 ands r5, r0
movs r1, 0 movs r1, 0
mov r8, r4 mov r8, r4
ldr r6, =gFieldEffectSpawnParams ldr r6, =gFieldEffectArguments
_08147046: _08147046:
lsls r5, 16 lsls r5, 16
asrs r5, 16 asrs r5, 16
@@ -2221,7 +2221,7 @@ _081470C4:
sub_81470D0: @ 81470D0 sub_81470D0: @ 81470D0
push {r4,r5,lr} push {r4,r5,lr}
ldr r0, =gUnknown_085C8E68 ldr r0, =gUnknown_085C8E68
ldr r5, =gFieldEffectSpawnParams ldr r5, =gFieldEffectArguments
movs r2, 0 movs r2, 0
ldrsh r1, [r5, r2] ldrsh r1, [r5, r2]
movs r3, 0x4 movs r3, 0x4
asm/bike.s
+2 -2
View File
@@ -2013,9 +2013,9 @@ _0811A0B0:
bl SetPlayerAvatarTransitionFlags bl SetPlayerAvatarTransitionFlags
ldr r4, =0x00000193 ldr r4, =0x00000193
adds r0, r4, 0 adds r0, r4, 0
bl sav1_set_battle_music_maybe bl Overworld_SetSavedMusic
adds r0, r4, 0 adds r0, r4, 0
bl sub_80858C4 bl Overworld_ChangeMusicTo
_0811A0C4: _0811A0C4:
pop {r4} pop {r4}
pop {r0} pop {r0}
asm/cable_club.s
+10 -10
View File
@@ -434,7 +434,7 @@ sub_80B2688: @ 80B2688
movs r0, 0x15 movs r0, 0x15
bl PlaySE bl PlaySE
ldr r0, =gUnknown_082780B3 ldr r0, =gUnknown_082780B3
bl box_related_two__3 bl ShowFieldAutoScrollMessage
ldr r0, =sub_80B270C ldr r0, =sub_80B270C
b _080B26FA b _080B26FA
.pool .pool
@@ -442,7 +442,7 @@ _080B26EC:
movs r0, 0x16 movs r0, 0x16
bl PlaySE bl PlaySE
ldr r0, =gUnknown_08278131 ldr r0, =gUnknown_08278131
bl box_related_two__3 bl ShowFieldAutoScrollMessage
ldr r0, =sub_80B2918 ldr r0, =sub_80B2918
_080B26FA: _080B26FA:
str r0, [r4] str r0, [r4]
@@ -545,7 +545,7 @@ sub_80B275C: @ 80B275C
movs r3, 0x1 movs r3, 0x1
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r0, =gUnknown_082780F2 ldr r0, =gUnknown_082780F2
bl box_related_two__3 bl ShowFieldAutoScrollMessage
mov r0, r9 mov r0, r9
subs r0, 0x8 subs r0, 0x8
add r0, r8 add r0, r8
@@ -598,7 +598,7 @@ sub_80B2804: @ 80B2804
beq _080B2878 beq _080B2878
_080B2852: _080B2852:
ldr r0, =gUnknown_082780B3 ldr r0, =gUnknown_082780B3
bl box_related_two__3 bl ShowFieldAutoScrollMessage
ldr r1, =gTasks ldr r1, =gTasks
lsls r0, r5, 2 lsls r0, r5, 2
adds r0, r5 adds r0, r5
@@ -719,7 +719,7 @@ sub_80B2918: @ 80B2918
cmp r0, 0x1 cmp r0, 0x1
bhi _080B297C bhi _080B297C
bl sub_800AC34 bl sub_800AC34
bl textbox_close bl HideFieldMessageBox
ldr r0, =sub_80B2CB0 ldr r0, =sub_80B2CB0
b _080B29E4 b _080B29E4
.pool .pool
@@ -730,7 +730,7 @@ _080B297C:
bne _080B2994 bne _080B2994
_080B2984: _080B2984:
bl sub_80097E8 bl sub_80097E8
bl textbox_close bl HideFieldMessageBox
ldr r0, =sub_80B2CB0 ldr r0, =sub_80B2CB0
b _080B29E4 b _080B29E4
.pool .pool
@@ -814,7 +814,7 @@ _080B2A42:
_080B2A4A: _080B2A4A:
bl sub_80097E8 bl sub_80097E8
_080B2A4E: _080B2A4E:
bl textbox_close bl HideFieldMessageBox
ldr r0, =gTasks ldr r0, =gTasks
lsls r1, r7, 2 lsls r1, r7, 2
adds r1, r7 adds r1, r7
@@ -1151,7 +1151,7 @@ sub_80B2D2C: @ 80B2D2C
bl sub_80B241C bl sub_80B241C
ldrb r0, [r4, 0x12] ldrb r0, [r4, 0x12]
bl RemoveWindow bl RemoveWindow
bl textbox_close bl HideFieldMessageBox
bl EnableBothScriptContexts bl EnableBothScriptContexts
adds r0, r5, 0 adds r0, r5, 0
bl DestroyTask bl DestroyTask
@@ -2303,7 +2303,7 @@ _080B375A:
b _080B37CC b _080B37CC
.pool .pool
_080B376C: _080B376C:
bl sub_809833C bl IsFieldMessageBoxHidden
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B37CC beq _080B37CC
@@ -2325,7 +2325,7 @@ _080B378C:
beq _080B37B2 beq _080B37B2
b _080B37CC b _080B37CC
_080B379E: _080B379E:
bl textbox_close bl HideFieldMessageBox
movs r0, 0 movs r0, 0
strh r0, [r5, 0x8] strh r0, [r5, 0x8]
bl sub_80872C4 bl sub_80872C4
asm/clock.s
+3 -3
View File
@@ -27,8 +27,8 @@ sub_809E778: @ 809E778
.pool .pool
thumb_func_end sub_809E778 thumb_func_end sub_809E778
thumb_func_start sub_809E7B0 thumb_func_start DoTimeBasedEvents
sub_809E7B0: @ 809E7B0 DoTimeBasedEvents: @ 809E7B0
push {r4,lr} push {r4,lr}
ldr r0, =0x00000895 ldr r0, =0x00000895
bl FlagGet bl FlagGet
@@ -50,7 +50,7 @@ _0809E7DA:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_809E7B0 thumb_func_end DoTimeBasedEvents
thumb_func_start sub_809E7E8 thumb_func_start sub_809E7E8
sub_809E7E8: @ 809E7E8 sub_809E7E8: @ 809E7E8
asm/coins.s
+8 -8
View File
@@ -5,9 +5,9 @@
.text .text
thumb_func_start AddCoins thumb_func_start GiveCoins
@ bool8 AddCoins(u16 toAdd) @ bool8 GiveCoins(u16 toAdd)
AddCoins: @ 8145C80 GiveCoins: @ 8145C80
push {r4,lr} push {r4,lr}
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
@@ -44,11 +44,11 @@ _08145CC0:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end AddCoins thumb_func_end GiveCoins
thumb_func_start SubtractCoins thumb_func_start TakeCoins
@ bool8 SubtractCoins(u16 toSub) @ bool8 TakeCoins(u16 toSub)
SubtractCoins: @ 8145CCC TakeCoins: @ 8145CCC
push {r4,lr} push {r4,lr}
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
@@ -69,6 +69,6 @@ _08145CEE:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end SubtractCoins thumb_func_end TakeCoins
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
asm/contest.s
+6 -6
View File
@@ -6313,7 +6313,7 @@ _080DAE1E:
movs r0, 0x4 movs r0, 0x4
b _080DAE9A b _080DAE9A
_080DAE2E: _080DAE2E:
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0x4 cmp r0, 0x4
bhi _080DAE82 bhi _080DAE82
@@ -8456,7 +8456,7 @@ sub_80DBED4: @ 80DBED4
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
lsls r1, 1 lsls r1, 1
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrh r0, [r0] ldrh r0, [r0]
lsls r0, 3 lsls r0, 3
adds r1, r0 adds r1, r0
@@ -11805,7 +11805,7 @@ sub_80DD9F0: @ 80DD9F0
ldrb r1, [r0, 0x1] ldrb r1, [r0, 0x1]
lsls r1, 29 lsls r1, 29
lsrs r1, 29 lsrs r1, 29
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrh r2, [r0] ldrh r2, [r0]
lsls r0, r2, 2 lsls r0, r2, 2
adds r0, r2 adds r0, r2
@@ -14260,7 +14260,7 @@ _080DEDE6:
b _080DEF90 b _080DEF90
.pool .pool
_080DEE00: _080DEE00:
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0x4 cmp r0, 0x4
bhi _080DEE4C bhi _080DEE4C
@@ -14383,7 +14383,7 @@ _080DEF02:
mov r2, r9 mov r2, r9
lsls r1, r2, 5 lsls r1, r2, 5
adds r0, r1 adds r0, r1
ldr r1, =gUnknown_02039F2C ldr r1, =gScriptContestCategory
ldrh r1, [r1] ldrh r1, [r1]
ldr r3, =0x00002e9a ldr r3, =0x00002e9a
adds r0, r3 adds r0, r3
@@ -14485,7 +14485,7 @@ _080DEFE6:
b _080DF03A b _080DF03A
.pool .pool
_080DEFF8: _080DEFF8:
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0x4 cmp r0, 0x4
bhi _080DF038 bhi _080DF038
asm/contest_ai.s
+1 -1
View File
@@ -1352,7 +1352,7 @@ sub_8156CF4: @ 8156CF4
ldr r0, =gUnknown_02039F34 ldr r0, =gUnknown_02039F34
ldr r0, [r0] ldr r0, [r0]
ldr r1, [r0, 0xC] ldr r1, [r0, 0xC]
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrh r0, [r0] ldrh r0, [r0]
strh r0, [r1, 0x18] strh r0, [r1, 0x18]
ldr r1, =gAIScriptPtr ldr r1, =gAIScriptPtr
asm/contest_effect.s
+1 -1
View File
@@ -2590,7 +2590,7 @@ ContestEffectFunc_080E6778: @ 80E6778
adds r0, r3 adds r0, r3
ldrb r0, [r0, 0x1] ldrb r0, [r0, 0x1]
lsls r0, 29 lsls r0, 29
ldr r1, =gUnknown_02039F2C ldr r1, =gScriptContestCategory
lsrs r0, 29 lsrs r0, 29
ldrh r1, [r1] ldrh r1, [r1]
cmp r0, r1 cmp r0, r1
asm/contest_link_80F57C4.s
+5 -5
View File
@@ -3008,7 +3008,7 @@ _080F7236:
bl CopyToBgTilemapBufferRect bl CopyToBgTilemapBufferRect
movs r5, 0xF movs r5, 0xF
_080F7240: _080F7240:
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0 cmp r0, 0
bne _080F725C bne _080F725C
@@ -4640,7 +4640,7 @@ sub_80F7F30: @ 80F7F30
adds r5, r0, 0 adds r5, r0, 0
cmp r5, 0 cmp r5, 0
beq _080F7F5E beq _080F7F5E
ldr r4, =gUnknown_02039F2C ldr r4, =gScriptContestCategory
ldrb r0, [r4] ldrb r0, [r4]
ldr r1, =gUnknown_02039F2E ldr r1, =gUnknown_02039F2E
ldrb r1, [r1] ldrb r1, [r1]
@@ -4666,7 +4666,7 @@ sub_80F7F7C: @ 80F7F7C
muls r1, r0 muls r1, r0
ldr r0, =gPlayerParty ldr r0, =gPlayerParty
adds r2, r1, r0 adds r2, r1, r0
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0x4 cmp r0, 0x4
bhi _080F7FEE bhi _080F7FEE
@@ -4730,7 +4730,7 @@ sub_80F7FFC: @ 80F7FFC
beq _080F8010 beq _080F8010
b _080F8250 b _080F8250
_080F8010: _080F8010:
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0x4 cmp r0, 0x4
bls _080F801A bls _080F801A
@@ -5488,7 +5488,7 @@ _080F8678:
bl sub_80F86E0 bl sub_80F86E0
ldr r1, =gUnknown_02039F2B ldr r1, =gUnknown_02039F2B
strb r0, [r1] strb r0, [r1]
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80DB09C bl sub_80DB09C
ldr r1, =sub_80FCF40 ldr r1, =sub_80FCF40
asm/contest_link_81D9DE4.s
+1 -1
View File
@@ -370,7 +370,7 @@ sub_81DA10C: @ 81DA10C
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrb r0, [r0] ldrb r0, [r0]
bl sub_80DB09C bl sub_80DB09C
ldr r1, =sub_80FCF40 ldr r1, =sub_80FCF40
asm/decoration.s
+2 -2
View File
@@ -2094,7 +2094,7 @@ sub_8127B04: @ 8127B04
lsls r4, 24 lsls r4, 24
asrs r4, 24 asrs r4, 24
str r4, [sp] str r4, [sp]
bl warp1_set bl Overworld_SetWarpDestination
bl warp_in bl warp_in
add sp, 0x4 add sp, 0x4
pop {r4,r5} pop {r4,r5}
@@ -2490,7 +2490,7 @@ _08127E34:
cmp r0, 0x1 cmp r0, 0x1
bne _08127F1C bne _08127F1C
adds r0, r4, 0 adds r0, r4, 0
bl FlagReset bl FlagClear
movs r2, 0 movs r2, 0
ldr r0, [r7, 0x4] ldr r0, [r7, 0x4]
ldrb r4, [r0] ldrb r4, [r0]
asm/decoration_inventory.s
+3 -3
View File
@@ -156,8 +156,8 @@ _08161910:
bx r1 bx r1
thumb_func_end sub_81618D0 thumb_func_end sub_81618D0
thumb_func_start sub_8161918 thumb_func_start CheckHasDecoration
sub_8161918: @ 8161918 CheckHasDecoration: @ 8161918
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
@@ -193,7 +193,7 @@ _08161958:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8161918 thumb_func_end CheckHasDecoration
thumb_func_start DecorationAdd thumb_func_start DecorationAdd
DecorationAdd: @ 8161960 DecorationAdd: @ 8161960
asm/easy_chat.s
+1 -1
View File
@@ -9914,7 +9914,7 @@ _0811EF48:
adds r1, r5, 0 adds r1, r5, 0
bl ConvertEasyChatWordsToString bl ConvertEasyChatWordsToString
adds r0, r4, 0 adds r0, r4, 0
bl box_related_two__3 bl ShowFieldAutoScrollMessage
_0811EF58: _0811EF58:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
asm/field_door.s
+18 -18
View File
@@ -581,8 +581,8 @@ sub_808A83C: @ 808A83C
.pool .pool
thumb_func_end sub_808A83C thumb_func_end sub_808A83C
thumb_func_start sub_808A854 thumb_func_start FieldSetDoorOpened
sub_808A854: @ 808A854 FieldSetDoorOpened: @ 808A854
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -602,10 +602,10 @@ _0808A876:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_808A854 thumb_func_end FieldSetDoorOpened
thumb_func_start sub_808A880 thumb_func_start FieldSetDoorClosed
sub_808A880: @ 808A880 FieldSetDoorClosed: @ 808A880
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -625,10 +625,10 @@ _0808A8A2:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_808A880 thumb_func_end FieldSetDoorClosed
thumb_func_start sub_808A8AC thumb_func_start FieldAnimateDoorClose
sub_808A8AC: @ 808A8AC FieldAnimateDoorClose: @ 808A8AC
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -654,10 +654,10 @@ _0808A8DC:
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx 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 thumb_func_start FieldAnimateDoorOpen
task_overworld_door_add_if_role_69_for_opening_door_at: @ 808A8E4 FieldAnimateDoorOpen: @ 808A8E4
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -683,10 +683,10 @@ _0808A914:
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx 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 thumb_func_start FieldIsDoorAnimationRunning
sub_808A91C: @ 808A91C FieldIsDoorAnimationRunning: @ 808A91C
push {lr} push {lr}
ldr r0, =task50_overworld_door ldr r0, =task50_overworld_door
bl FuncIsActiveTask bl FuncIsActiveTask
@@ -695,10 +695,10 @@ sub_808A91C: @ 808A91C
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end sub_808A91C thumb_func_end FieldIsDoorAnimationRunning
thumb_func_start cur_mapdata_get_door_sound_at thumb_func_start GetDoorSoundEffect
cur_mapdata_get_door_sound_at: @ 808A930 GetDoorSoundEffect: @ 808A930
push {lr} push {lr}
adds r3, r0, 0 adds r3, r0, 0
adds r2, r1, 0 adds r2, r1, 0
@@ -725,7 +725,7 @@ _0808A95C:
_0808A95E: _0808A95E:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end cur_mapdata_get_door_sound_at thumb_func_end GetDoorSoundEffect
thumb_func_start sub_808A964 thumb_func_start sub_808A964
sub_808A964: @ 808A964 sub_808A964: @ 808A964
asm/field_effect.s
+27 -27
View File
@@ -1989,7 +1989,7 @@ task00_8084310: @ 80B6A24
cmp r0, 0 cmp r0, 0
beq _080B6A8A beq _080B6A8A
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -2100,7 +2100,7 @@ _080B6B3E:
cmp r0, 0 cmp r0, 0
bne _080B6B58 bne _080B6B58
bl ScriptContext2_Disable bl ScriptContext2_Disable
bl sub_809757C bl UnfreezeMapObjects
adds r0, r5, 0 adds r0, r5, 0
bl DestroyTask bl DestroyTask
_080B6B58: _080B6B58:
@@ -2459,7 +2459,7 @@ sub_80B6E18: @ 80B6E18
strb r0, [r1, 0x6] strb r0, [r1, 0x6]
bl ScriptContext2_Disable bl ScriptContext2_Disable
bl CameraObjectReset1 bl CameraObjectReset1
bl sub_809757C bl UnfreezeMapObjects
bl InstallCameraPanAheadCallback bl InstallCameraPanAheadCallback
ldr r0, =sub_80B6B94 ldr r0, =sub_80B6B94
bl FindTaskIdByFunc bl FindTaskIdByFunc
@@ -3111,7 +3111,7 @@ oei_waterfall: @ 80B734C
adds r1, r0 adds r1, r0
lsls r1, 3 lsls r1, 3
adds r1, r2 adds r1, r2
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
ldr r2, [r2] ldr r2, [r2]
strh r2, [r1, 0xA] strh r2, [r1, 0xA]
bl _call_via_r4 bl _call_via_r4
@@ -3188,7 +3188,7 @@ waterfall_1_do_anim_probably: @ 80B73F0
bne _080B7420 bne _080B7420
adds r0, r5, 0 adds r0, r5, 0
bl FieldObjectClearAnimIfSpecialAnimFinished bl FieldObjectClearAnimIfSpecialAnimFinished
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0xA movs r2, 0xA
ldrsh r0, [r4, r2] ldrsh r0, [r4, r2]
str r0, [r1] str r0, [r1]
@@ -3304,7 +3304,7 @@ sub_80B74D0: @ 80B74D0
adds r1, r0 adds r1, r0
lsls r1, 3 lsls r1, 3
adds r1, r2 adds r1, r2
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
ldr r2, [r3] ldr r2, [r3]
strh r2, [r1, 0x26] strh r2, [r1, 0x26]
ldr r2, [r3, 0x4] ldr r2, [r3, 0x4]
@@ -3363,7 +3363,7 @@ dive_2_unknown: @ 80B7558
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl ScriptContext2_Enable bl ScriptContext2_Enable
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0x26 movs r2, 0x26
ldrsh r0, [r4, r2] ldrsh r0, [r4, r2]
str r0, [r1] str r0, [r1]
@@ -3536,7 +3536,7 @@ sub_80B76B8: @ 80B76B8
strh r0, [r2, 0x26] strh r0, [r2, 0x26]
movs r0, 0x1 movs r0, 0x1
strh r0, [r4, 0xE] strh r0, [r4, 0xE]
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r5, 0x10 movs r5, 0x10
ldrsh r0, [r1, r5] ldrsh r0, [r1, r5]
str r0, [r3] str r0, [r3]
@@ -3835,7 +3835,7 @@ sub_80B791C: @ 80B791C
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B795C beq _080B795C
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0x10 movs r2, 0x10
ldrsh r0, [r5, r2] ldrsh r0, [r5, r2]
str r0, [r1] str r0, [r1]
@@ -3919,7 +3919,7 @@ sub_80B79BC: @ 80B79BC
movs r0, 0 movs r0, 0
strb r0, [r1, 0x6] strb r0, [r1, 0x6]
bl ScriptContext2_Disable bl ScriptContext2_Disable
bl sub_809757C bl UnfreezeMapObjects
ldr r0, =sub_80B7890 ldr r0, =sub_80B7890
bl FindTaskIdByFunc bl FindTaskIdByFunc
lsls r0, 24 lsls r0, 24
@@ -3935,7 +3935,7 @@ _080B79E6:
thumb_func_start sub_80B79F4 thumb_func_start sub_80B79F4
sub_80B79F4: @ 80B79F4 sub_80B79F4: @ 80B79F4
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -4090,7 +4090,7 @@ sub_80B7B18: @ 80B7B18
ldrsh r0, [r5, r2] ldrsh r0, [r5, r2]
cmp r0, 0x3 cmp r0, 0x3
ble _080B7B6C ble _080B7B6C
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0x10 movs r2, 0x10
ldrsh r0, [r4, r2] ldrsh r0, [r4, r2]
str r0, [r1] str r0, [r1]
@@ -4222,7 +4222,7 @@ _080B7C2C:
thumb_func_start sub_80B7C48 thumb_func_start sub_80B7C48
sub_80B7C48: @ 80B7C48 sub_80B7C48: @ 80B7C48
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -4583,7 +4583,7 @@ _080B7F32:
ands r0, r1 ands r0, r1
strb r0, [r6, 0x1] strb r0, [r6, 0x1]
bl ScriptContext2_Disable bl ScriptContext2_Disable
bl sub_809757C bl UnfreezeMapObjects
ldr r0, =sub_80B7E94 ldr r0, =sub_80B7E94
bl FindTaskIdByFunc bl FindTaskIdByFunc
lsls r0, 24 lsls r0, 24
@@ -5194,7 +5194,7 @@ sub_80B8410: @ 80B8410
bne _080B8484 bne _080B8484
bl ScriptContext2_Disable bl ScriptContext2_Disable
bl CameraObjectReset1 bl CameraObjectReset1
bl sub_809757C bl UnfreezeMapObjects
ldr r0, =sub_80B8250 ldr r0, =sub_80B8250
bl FindTaskIdByFunc bl FindTaskIdByFunc
lsls r0, 24 lsls r0, 24
@@ -5229,7 +5229,7 @@ _080B84BE:
bl CreateTask bl CreateTask
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
ldr r0, [r2] ldr r0, [r2]
ldr r1, [r2, 0x4] ldr r1, [r2, 0x4]
ldr r2, [r2, 0x8] ldr r2, [r2, 0x8]
@@ -5252,7 +5252,7 @@ _080B84BE:
thumb_func_start sub_80B84F8 thumb_func_start sub_80B84F8
sub_80B84F8: @ 80B84F8 sub_80B84F8: @ 80B84F8
push {r4-r6,lr} push {r4-r6,lr}
ldr r5, =gFieldEffectSpawnParams ldr r5, =gFieldEffectArguments
ldr r0, [r5] ldr r0, [r5]
movs r6, 0x80 movs r6, 0x80
lsls r6, 24 lsls r6, 24
@@ -6292,12 +6292,12 @@ sub_80B8D44: @ 80B8D44
adds r1, r0 adds r1, r0
lsls r1, 3 lsls r1, 3
adds r1, r2 adds r1, r2
ldr r0, =gFieldEffectSpawnParams ldr r0, =gFieldEffectArguments
ldr r0, [r0] ldr r0, [r0]
strh r0, [r1, 0x26] strh r0, [r1, 0x26]
bl sav1_reset_battle_music_maybe bl sav1_reset_battle_music_maybe
ldr r0, =0x0000016d ldr r0, =0x0000016d
bl sub_80858C4 bl Overworld_ChangeMusicTo
movs r0, 0 movs r0, 0
pop {r1} pop {r1}
bx r1 bx r1
@@ -6421,7 +6421,7 @@ sub_80B8E60: @ 80B8E60
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B8E96 beq _080B8E96
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
movs r1, 0x26 movs r1, 0x26
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
movs r1, 0x80 movs r1, 0x80
@@ -6473,7 +6473,7 @@ sub_80B8EA8: @ 80B8EA8
lsrs r1, 24 lsrs r1, 24
adds r0, r4, 0 adds r0, r4, 0
bl FieldObjectSetSpecialAnim bl FieldObjectSetSpecialAnim
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0xA movs r2, 0xA
ldrsh r0, [r6, r2] ldrsh r0, [r6, r2]
str r0, [r1] str r0, [r1]
@@ -6527,7 +6527,7 @@ sub_80B8F24: @ 80B8F24
ldrb r0, [r4, 0x1A] ldrb r0, [r4, 0x1A]
movs r1, 0x1 movs r1, 0x1
bl sub_81555AC bl sub_81555AC
bl sub_809757C bl UnfreezeMapObjects
bl ScriptContext2_Disable bl ScriptContext2_Disable
movs r0, 0x9 movs r0, 0x9
bl FieldEffectActiveListRemove bl FieldEffectActiveListRemove
@@ -6704,7 +6704,7 @@ sub_80B90CC: @ 80B90CC
strb r0, [r2, 0x5] strb r0, [r2, 0x5]
ldr r0, =sub_80B9128 ldr r0, =sub_80B9128
str r0, [r2, 0x1C] str r0, [r2, 0x1C]
ldr r0, =gFieldEffectSpawnParams ldr r0, =gFieldEffectArguments
ldr r0, [r0] ldr r0, [r0]
strh r0, [r2, 0x30] strh r0, [r2, 0x30]
movs r0, 0x9E movs r0, 0x9E
@@ -6793,7 +6793,7 @@ sub_80B91A4: @ 80B91A4
adds r1, r0 adds r1, r0
lsls r1, 3 lsls r1, 3
adds r1, r2 adds r1, r2
ldr r0, =gFieldEffectSpawnParams ldr r0, =gFieldEffectArguments
ldr r0, [r0] ldr r0, [r0]
strh r0, [r1, 0xA] strh r0, [r1, 0xA]
movs r0, 0 movs r0, 0
@@ -6884,7 +6884,7 @@ sub_80B925C: @ 80B925C
ldrh r0, [r4, 0x8] ldrh r0, [r4, 0x8]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0xA movs r2, 0xA
ldrsh r0, [r4, r2] ldrsh r0, [r4, r2]
str r0, [r1] str r0, [r1]
@@ -7922,7 +7922,7 @@ _080B9ACA:
sub_80B9ADC: @ 80B9ADC sub_80B9ADC: @ 80B9ADC
push {r4,lr} push {r4,lr}
sub sp, 0x4 sub sp, 0x4
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldrb r0, [r4] ldrb r0, [r4]
ldrb r1, [r4, 0x4] ldrb r1, [r4, 0x4]
ldrb r2, [r4, 0x8] ldrb r2, [r4, 0x8]
@@ -8343,7 +8343,7 @@ _080B9E24:
sub_80B9E28: @ 80B9E28 sub_80B9E28: @ 80B9E28
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x4 sub sp, 0x4
ldr r7, =gFieldEffectSpawnParams ldr r7, =gFieldEffectArguments
ldrb r0, [r7] ldrb r0, [r7]
ldrb r1, [r7, 0x4] ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8] ldrb r2, [r7, 0x8]
asm/field_effect_helpers.s
+28 -28
View File
@@ -574,7 +574,7 @@ _0815432E:
thumb_func_start oei_shadow thumb_func_start oei_shadow
oei_shadow: @ 8154340 oei_shadow: @ 8154340
push {r4,r5,lr} push {r4,r5,lr}
ldr r5, =gFieldEffectSpawnParams ldr r5, =gFieldEffectArguments
ldrb r0, [r5] ldrb r0, [r5]
ldrb r1, [r5, 0x4] ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8] ldrb r2, [r5, 0x8]
@@ -742,7 +742,7 @@ _08154498:
oei_grass_normal: @ 81544AC oei_grass_normal: @ 81544AC
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x4 sub sp, 0x4
ldr r5, =gFieldEffectSpawnParams ldr r5, =gFieldEffectArguments
ldrh r1, [r5] ldrh r1, [r5]
mov r0, sp mov r0, sp
strh r1, [r0] strh r1, [r0]
@@ -951,7 +951,7 @@ _08154648:
thumb_func_start sub_8154658 thumb_func_start sub_8154658
sub_8154658: @ 8154658 sub_8154658: @ 8154658
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -1080,7 +1080,7 @@ _0815474C:
sub_8154758: @ 8154758 sub_8154758: @ 8154758
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x4 sub sp, 0x4
ldr r5, =gFieldEffectSpawnParams ldr r5, =gFieldEffectArguments
ldrh r1, [r5] ldrh r1, [r5]
mov r0, sp mov r0, sp
strh r1, [r0] strh r1, [r0]
@@ -1282,7 +1282,7 @@ _081548EA:
thumb_func_start sub_81548FC thumb_func_start sub_81548FC
sub_81548FC: @ 81548FC sub_81548FC: @ 81548FC
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -1336,7 +1336,7 @@ _08154958:
thumb_func_start sub_815496C thumb_func_start sub_815496C
sub_815496C: @ 815496C sub_815496C: @ 815496C
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, =gFieldEffectSpawnParams ldr r6, =gFieldEffectArguments
ldrb r0, [r6] ldrb r0, [r6]
ldrb r1, [r6, 0x4] ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8] ldrb r2, [r6, 0x8]
@@ -1537,7 +1537,7 @@ _08154AF2:
thumb_func_start sub_8154B04 thumb_func_start sub_8154B04
sub_8154B04: @ 8154B04 sub_8154B04: @ 8154B04
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -1591,7 +1591,7 @@ _08154B62:
thumb_func_start sub_8154B78 thumb_func_start sub_8154B78
sub_8154B78: @ 8154B78 sub_8154B78: @ 8154B78
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -1646,7 +1646,7 @@ _08154BD8:
thumb_func_start sub_8154BEC thumb_func_start sub_8154BEC
sub_8154BEC: @ 8154BEC sub_8154BEC: @ 8154BEC
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -1777,7 +1777,7 @@ _08154CE4:
thumb_func_start sub_8154CEC thumb_func_start sub_8154CEC
sub_8154CEC: @ 8154CEC sub_8154CEC: @ 8154CEC
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, =gFieldEffectSpawnParams ldr r6, =gFieldEffectArguments
ldrb r0, [r6] ldrb r0, [r6]
ldrb r1, [r6, 0x4] ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8] ldrb r2, [r6, 0x8]
@@ -1922,7 +1922,7 @@ _08154E0A:
thumb_func_start sub_8154E1C thumb_func_start sub_8154E1C
sub_8154E1C: @ 8154E1C sub_8154E1C: @ 8154E1C
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -1976,7 +1976,7 @@ _08154E78:
thumb_func_start oei_water_drop_tall thumb_func_start oei_water_drop_tall
oei_water_drop_tall: @ 8154E8C oei_water_drop_tall: @ 8154E8C
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -2030,7 +2030,7 @@ _08154EE8:
thumb_func_start sub_8154EFC thumb_func_start sub_8154EFC
sub_8154EFC: @ 8154EFC sub_8154EFC: @ 8154EFC
push {r4-r7,lr} push {r4-r7,lr}
ldr r7, =gFieldEffectSpawnParams ldr r7, =gFieldEffectArguments
ldrb r0, [r7] ldrb r0, [r7]
ldrb r1, [r7, 0x4] ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8] ldrb r2, [r7, 0x8]
@@ -2193,7 +2193,7 @@ oei_ripples: @ 8155054
push {r4,lr} push {r4,lr}
ldr r0, =gFieldEffectObjectTemplatePointers ldr r0, =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x14] ldr r0, [r0, 0x14]
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
movs r2, 0 movs r2, 0
ldrsh r1, [r4, r2] ldrsh r1, [r4, r2]
movs r3, 0x4 movs r3, 0x4
@@ -2238,7 +2238,7 @@ _081550A0:
thumb_func_start sub_81550B4 thumb_func_start sub_81550B4
sub_81550B4: @ 81550B4 sub_81550B4: @ 81550B4
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, =gFieldEffectSpawnParams ldr r6, =gFieldEffectArguments
ldrb r0, [r6] ldrb r0, [r6]
ldrb r1, [r6, 0x4] ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8] ldrb r2, [r6, 0x8]
@@ -2393,7 +2393,7 @@ _081551E4:
thumb_func_start sub_81551F0 thumb_func_start sub_81551F0
sub_81551F0: @ 81551F0 sub_81551F0: @ 81551F0
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -2445,7 +2445,7 @@ _08155248:
thumb_func_start sub_815525C thumb_func_start sub_815525C
sub_815525C: @ 815525C sub_815525C: @ 815525C
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -2497,7 +2497,7 @@ _081552B4:
thumb_func_start sub_81552C8 thumb_func_start sub_81552C8
sub_81552C8: @ 81552C8 sub_81552C8: @ 81552C8
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -2549,7 +2549,7 @@ _08155320:
thumb_func_start sub_8155334 thumb_func_start sub_8155334
sub_8155334: @ 8155334 sub_8155334: @ 8155334
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -2603,7 +2603,7 @@ ash: @ 81553A0
push {r4,lr} push {r4,lr}
lsls r2, 16 lsls r2, 16
lsrs r2, 16 lsrs r2, 16
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
lsls r0, 16 lsls r0, 16
asrs r0, 16 asrs r0, 16
str r0, [r4] str r0, [r4]
@@ -2630,7 +2630,7 @@ ash: @ 81553A0
oei_ash: @ 81553D4 oei_ash: @ 81553D4
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x4 sub sp, 0x4
ldr r5, =gFieldEffectSpawnParams ldr r5, =gFieldEffectArguments
ldrh r1, [r5] ldrh r1, [r5]
mov r0, sp mov r0, sp
strh r1, [r0] strh r1, [r0]
@@ -2809,7 +2809,7 @@ _0815552C:
thumb_func_start sub_8155534 thumb_func_start sub_8155534
sub_8155534: @ 8155534 sub_8155534: @ 8155534
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -3261,7 +3261,7 @@ _08155888:
thumb_func_start sub_8155890 thumb_func_start sub_8155890
sub_8155890: @ 8155890 sub_8155890: @ 8155890
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -3315,7 +3315,7 @@ _081558EC:
thumb_func_start sub_8155900 thumb_func_start sub_8155900
sub_8155900: @ 8155900 sub_8155900: @ 8155900
push {r4-r7,lr} push {r4-r7,lr}
ldr r7, =gFieldEffectSpawnParams ldr r7, =gFieldEffectArguments
ldrb r0, [r7] ldrb r0, [r7]
ldrb r1, [r7, 0x4] ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8] ldrb r2, [r7, 0x8]
@@ -3505,7 +3505,7 @@ _08155A76:
thumb_func_start sub_8155A88 thumb_func_start sub_8155A88
sub_8155A88: @ 8155A88 sub_8155A88: @ 8155A88
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -3586,7 +3586,7 @@ _08155B20:
thumb_func_start sub_8155B2C thumb_func_start sub_8155B2C
sub_8155B2C: @ 8155B2C sub_8155B2C: @ 8155B2C
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
adds r1, r4, 0x4 adds r1, r4, 0x4
adds r0, r4, 0 adds r0, r4, 0
movs r2, 0x8 movs r2, 0x8
@@ -3689,7 +3689,7 @@ ShowDisguiseFieldEffect: @ 8155BD0
lsrs r6, r1, 24 lsrs r6, r1, 24
lsls r2, 24 lsls r2, 24
lsrs r7, r2, 24 lsrs r7, r2, 24
ldr r5, =gFieldEffectSpawnParams ldr r5, =gFieldEffectArguments
ldrb r0, [r5] ldrb r0, [r5]
ldrb r1, [r5, 0x4] ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8] ldrb r2, [r5, 0x8]
@@ -3950,7 +3950,7 @@ _08155DD8:
thumb_func_start sub_8155DDC thumb_func_start sub_8155DDC
sub_8155DDC: @ 8155DDC sub_8155DDC: @ 8155DDC
push {r4,lr} push {r4,lr}
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldr r0, [r4] ldr r0, [r4]
adds r0, 0x7 adds r0, 0x7
str r0, [r4] 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) @ void GroundEffect_SpawnOnTallGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_SpawnOnTallGrass: @ 8096E90 GroundEffect_SpawnOnTallGrass: @ 8096E90
push {lr} push {lr}
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r2, 0x10 movs r2, 0x10
ldrsh r1, [r0, r2] ldrsh r1, [r0, r2]
str r1, [r3] str r1, [r3]
@@ -1205,7 +1205,7 @@ GroundEffect_SpawnOnTallGrass: @ 8096E90
@ void GroundEffect_StepOnTallGrass(struct npc_state *fieldObject, struct obj *object) @ void GroundEffect_StepOnTallGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_StepOnTallGrass: @ 8096EDC GroundEffect_StepOnTallGrass: @ 8096EDC
push {lr} push {lr}
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r2, 0x10 movs r2, 0x10
ldrsh r1, [r0, r2] ldrsh r1, [r0, r2]
str r1, [r3] str r1, [r3]
@@ -1244,7 +1244,7 @@ GroundEffect_StepOnTallGrass: @ 8096EDC
@ void GroundEffect_SpawnOnLongGrass(struct npc_state *fieldObject, struct obj *object) @ void GroundEffect_SpawnOnLongGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_SpawnOnLongGrass: @ 8096F28 GroundEffect_SpawnOnLongGrass: @ 8096F28
push {lr} push {lr}
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r2, 0x10 movs r2, 0x10
ldrsh r1, [r0, r2] ldrsh r1, [r0, r2]
str r1, [r3] str r1, [r3]
@@ -1283,7 +1283,7 @@ GroundEffect_SpawnOnLongGrass: @ 8096F28
@ void GroundEffect_StepOnLongGrass(struct npc_state *fieldObject, struct obj *object) @ void GroundEffect_StepOnLongGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_StepOnLongGrass: @ 8096F74 GroundEffect_StepOnLongGrass: @ 8096F74
push {lr} push {lr}
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r2, 0x10 movs r2, 0x10
ldrsh r1, [r0, r2] ldrsh r1, [r0, r2]
str r1, [r3] str r1, [r3]
@@ -1413,7 +1413,7 @@ DoTracksGroundEffect_Footprints: @ 8097044
mov r0, sp mov r0, sp
movs r2, 0x4 movs r2, 0x4
bl memcpy bl memcpy
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0x14 movs r2, 0x14
ldrsh r0, [r5, r2] ldrsh r0, [r5, r2]
str r0, [r1] str r0, [r1]
@@ -1449,7 +1449,7 @@ DoTracksGroundEffect_BikeTireTracks: @ 8097094
ldr r0, [r4, 0x14] ldr r0, [r4, 0x14]
cmp r1, r0 cmp r1, r0
beq _080970D6 beq _080970D6
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
movs r1, 0x14 movs r1, 0x14
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
str r0, [r2] str r0, [r2]
@@ -1520,7 +1520,7 @@ GroundEffect_JumpOnTallGrass: @ 8097110
sub sp, 0x4 sub sp, 0x4
adds r5, r0, 0 adds r5, r0, 0
adds r6, r1, 0 adds r6, r1, 0
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0x10 movs r2, 0x10
ldrsh r0, [r5, r2] ldrsh r0, [r5, r2]
str r0, [r1] str r0, [r1]
@@ -1562,7 +1562,7 @@ _0809715A:
@ void GroundEffect_JumpOnLongGrass(struct npc_state *fieldObject, struct obj *object) @ void GroundEffect_JumpOnLongGrass(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpOnLongGrass: @ 8097168 GroundEffect_JumpOnLongGrass: @ 8097168
push {lr} push {lr}
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
movs r3, 0x10 movs r3, 0x10
ldrsh r1, [r0, r3] ldrsh r1, [r0, r3]
str r1, [r2] str r1, [r2]
@@ -1585,7 +1585,7 @@ GroundEffect_JumpOnLongGrass: @ 8097168
@ void GroundEffect_JumpOnShallowWater(struct npc_state *fieldObject, struct obj *object) @ void GroundEffect_JumpOnShallowWater(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpOnShallowWater: @ 8097190 GroundEffect_JumpOnShallowWater: @ 8097190
push {r4,lr} push {r4,lr}
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r4, 0x10 movs r4, 0x10
ldrsh r2, [r0, r4] ldrsh r2, [r0, r4]
str r2, [r3] str r2, [r3]
@@ -1611,7 +1611,7 @@ GroundEffect_JumpOnShallowWater: @ 8097190
@ void GroundEffect_JumpOnWater(struct npc_state *fieldObject, struct obj *object) @ void GroundEffect_JumpOnWater(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpOnWater: @ 80971C0 GroundEffect_JumpOnWater: @ 80971C0
push {r4,lr} push {r4,lr}
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r4, 0x10 movs r4, 0x10
ldrsh r2, [r0, r4] ldrsh r2, [r0, r4]
str r2, [r3] str r2, [r3]
@@ -1637,7 +1637,7 @@ GroundEffect_JumpOnWater: @ 80971C0
@ void GroundEffect_JumpLandingDust(struct npc_state *fieldObject, struct obj *object) @ void GroundEffect_JumpLandingDust(struct npc_state *fieldObject, struct obj *object)
GroundEffect_JumpLandingDust: @ 80971F0 GroundEffect_JumpLandingDust: @ 80971F0
push {r4,lr} push {r4,lr}
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r4, 0x10 movs r4, 0x10
ldrsh r2, [r0, r4] ldrsh r2, [r0, r4]
str r2, [r3] str r2, [r3]
@@ -1685,7 +1685,7 @@ GroundEffect_HotSprings: @ 8097230
@ void GroundEffect_Seaweed(struct npc_state *fieldObject, struct obj *object) @ void GroundEffect_Seaweed(struct npc_state *fieldObject, struct obj *object)
GroundEffect_Seaweed: @ 8097240 GroundEffect_Seaweed: @ 8097240
push {lr} push {lr}
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
movs r3, 0x10 movs r3, 0x10
ldrsh r1, [r0, r3] ldrsh r1, [r0, r3]
str r1, [r2] str r1, [r2]
asm/field_message_box.s
+9 -9
View File
@@ -181,8 +181,8 @@ _08098272:
bx r1 bx r1
thumb_func_end sub_8098238 thumb_func_end sub_8098238
thumb_func_start box_related_two__3 thumb_func_start ShowFieldAutoScrollMessage
box_related_two__3: @ 8098278 ShowFieldAutoScrollMessage: @ 8098278
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
ldr r2, =gUnknown_020375BC ldr r2, =gUnknown_020375BC
@@ -202,7 +202,7 @@ _08098298:
_0809829A: _0809829A:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end box_related_two__3 thumb_func_end ShowFieldAutoScrollMessage
thumb_func_start sub_80982A0 thumb_func_start sub_80982A0
sub_80982A0: @ 80982A0 sub_80982A0: @ 80982A0
@@ -267,8 +267,8 @@ textbox_auto_and_task_add: @ 8098304
bx r0 bx r0
thumb_func_end textbox_auto_and_task_add thumb_func_end textbox_auto_and_task_add
thumb_func_start textbox_close thumb_func_start HideFieldMessageBox
textbox_close: @ 8098314 HideFieldMessageBox: @ 8098314
push {lr} push {lr}
bl task_del_textbox bl task_del_textbox
movs r0, 0 movs r0, 0
@@ -280,7 +280,7 @@ textbox_close: @ 8098314
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end textbox_close thumb_func_end HideFieldMessageBox
thumb_func_start textbox_any_visible thumb_func_start textbox_any_visible
textbox_any_visible: @ 8098330 textbox_any_visible: @ 8098330
@@ -290,8 +290,8 @@ textbox_any_visible: @ 8098330
.pool .pool
thumb_func_end textbox_any_visible thumb_func_end textbox_any_visible
thumb_func_start sub_809833C thumb_func_start IsFieldMessageBoxHidden
sub_809833C: @ 809833C IsFieldMessageBoxHidden: @ 809833C
push {lr} push {lr}
ldr r0, =gUnknown_020375BC ldr r0, =gUnknown_020375BC
ldrb r0, [r0] ldrb r0, [r0]
@@ -305,7 +305,7 @@ _08098350:
_08098352: _08098352:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_809833C thumb_func_end IsFieldMessageBoxHidden
thumb_func_start sub_8098358 thumb_func_start sub_8098358
sub_8098358: @ 8098358 sub_8098358: @ 8098358
asm/field_player_avatar.s
+4 -4
View File
@@ -1522,7 +1522,7 @@ PlayerAvatarTransition_Surfing: @ 808B4D8
bl FieldObjectTurn bl FieldObjectTurn
movs r0, 0x8 movs r0, 0x8
bl SetPlayerAvatarStateMask bl SetPlayerAvatarStateMask
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r2, 0x10 movs r2, 0x10
ldrsh r0, [r4, r2] ldrsh r0, [r4, r2]
str r0, [r1] str r0, [r1]
@@ -3517,7 +3517,7 @@ _0808C3F0:
lsrs r1, 24 lsrs r1, 24
adds r0, r4, 0 adds r0, r4, 0
bl FieldObjectSetSpecialAnim bl FieldObjectSetSpecialAnim
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
movs r1, 0x10 movs r1, 0x10
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
str r0, [r2] str r0, [r2]
@@ -3897,7 +3897,7 @@ sub_808C750: @ 808C750
lsrs r4, 24 lsrs r4, 24
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl sav1_reset_battle_music_maybe bl sav1_reset_battle_music_maybe
bl sub_8085898 bl Overworld_ChangeMusicToDefault
ldr r2, =gPlayerAvatar ldr r2, =gPlayerAvatar
ldrb r1, [r2] ldrb r1, [r2]
movs r0, 0xF7 movs r0, 0xF7
@@ -4858,7 +4858,7 @@ fishF: @ 808CF2C
ldr r0, =gPlayerAvatar ldr r0, =gPlayerAvatar
strb r1, [r0, 0x6] strb r1, [r0, 0x6]
bl ScriptContext2_Disable bl ScriptContext2_Disable
bl sub_809757C bl UnfreezeMapObjects
movs r0, 0 movs r0, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8197434 bl sub_8197434
asm/field_poison.s
+1 -1
View File
@@ -178,7 +178,7 @@ _080F96A8:
strh r0, [r4] strh r0, [r4]
b _080F9722 b _080F9722
_080F96AE: _080F96AE:
bl sub_809833C bl IsFieldMessageBoxHidden
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080F9722 beq _080F9722
asm/field_screen.s
+17 -17
View File
@@ -7503,8 +7503,8 @@ _080AED78:
bx r0 bx r0
thumb_func_end bag_add_task0_by_acit thumb_func_end bag_add_task0_by_acit
thumb_func_start sub_80AED7C thumb_func_start SetSav1Weather
sub_80AED7C: @ 80AED7C SetSav1Weather: @ 80AED7C
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, =gSaveBlock1Ptr ldr r4, =gSaveBlock1Ptr
ldr r1, [r4] ldr r1, [r4]
@@ -7525,7 +7525,7 @@ sub_80AED7C: @ 80AED7C
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80AED7C thumb_func_end SetSav1Weather
thumb_func_start sav1_get_weather_probably thumb_func_start sav1_get_weather_probably
sav1_get_weather_probably: @ 80AEDAC sav1_get_weather_probably: @ 80AEDAC
@@ -7564,7 +7564,7 @@ sub_80AEDBC: @ 80AEDBC
thumb_func_start sub_80AEDF0 thumb_func_start sub_80AEDF0
sub_80AEDF0: @ 80AEDF0 sub_80AEDF0: @ 80AEDF0
push {lr} push {lr}
bl sub_80AED7C bl SetSav1Weather
bl sav1_get_weather_probably bl sav1_get_weather_probably
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -7576,7 +7576,7 @@ sub_80AEDF0: @ 80AEDF0
thumb_func_start sub_80AEE08 thumb_func_start sub_80AEE08
sub_80AEE08: @ 80AEE08 sub_80AEE08: @ 80AEE08
push {lr} push {lr}
bl sub_80AED7C bl SetSav1Weather
bl sav1_get_weather_probably bl sav1_get_weather_probably
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
@@ -7585,8 +7585,8 @@ sub_80AEE08: @ 80AEE08
bx r0 bx r0
thumb_func_end sub_80AEE08 thumb_func_end sub_80AEE08
thumb_func_start sub_80AEE20 thumb_func_start DoCurrentWeather
sub_80AEE20: @ 80AEE20 DoCurrentWeather: @ 80AEE20
push {r4,r5,lr} push {r4,r5,lr}
bl sav1_get_weather_probably bl sav1_get_weather_probably
lsls r0, 24 lsls r0, 24
@@ -7627,7 +7627,7 @@ _080AEE6E:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80AEE20 thumb_func_end DoCurrentWeather
thumb_func_start sub_80AEE84 thumb_func_start sub_80AEE84
sub_80AEE84: @ 80AEE84 sub_80AEE84: @ 80AEE84
@@ -8390,7 +8390,7 @@ _080AF480:
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
movs r2, 0 movs r2, 0
ldrsh r1, [r7, r2] ldrsh r1, [r7, r2]
bl sub_808A854 bl FieldSetDoorOpened
movs r0, 0x1 movs r0, 0x1
strh r0, [r5, 0x8] strh r0, [r5, 0x8]
b _080AF54A b _080AF54A
@@ -8427,7 +8427,7 @@ _080AF4DC:
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
movs r2, 0 movs r2, 0
ldrsh r1, [r7, r2] ldrsh r1, [r7, r2]
bl sub_808A8AC bl FieldAnimateDoorClose
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
strh r0, [r5, 0xA] strh r0, [r5, 0xA]
@@ -8461,7 +8461,7 @@ _080AF520:
cmp r0, 0x1 cmp r0, 0x1
beq _080AF54A beq _080AF54A
_080AF536: _080AF536:
bl sub_809757C bl UnfreezeMapObjects
movs r0, 0x4 movs r0, 0x4
strh r0, [r5, 0x8] strh r0, [r5, 0x8]
b _080AF54A b _080AF54A
@@ -8550,7 +8550,7 @@ _080AF5EC:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080AF60A beq _080AF60A
bl sub_809757C bl UnfreezeMapObjects
movs r0, 0x3 movs r0, 0x3
strh r0, [r5, 0x8] strh r0, [r5, 0x8]
b _080AF60A b _080AF60A
@@ -8593,7 +8593,7 @@ _080AF644:
bl sub_80AF71C bl sub_80AF71C
cmp r0, 0 cmp r0, 0
beq _080AF65A beq _080AF65A
bl sub_809757C bl UnfreezeMapObjects
bl ScriptContext2_Disable bl ScriptContext2_Disable
adds r0, r5, 0 adds r0, r5, 0
bl DestroyTask bl DestroyTask
@@ -9142,7 +9142,7 @@ _080AFAD4:
movs r2, 0 movs r2, 0
ldrsh r1, [r6, r2] ldrsh r1, [r6, r2]
subs r1, 0x1 subs r1, 0x1
bl cur_mapdata_get_door_sound_at bl GetDoorSoundEffect
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl PlaySE bl PlaySE
@@ -9151,7 +9151,7 @@ _080AFAD4:
movs r2, 0 movs r2, 0
ldrsh r1, [r6, r2] ldrsh r1, [r6, r2]
subs r1, 0x1 subs r1, 0x1
bl task_overworld_door_add_if_role_69_for_opening_door_at bl FieldAnimateDoorOpen
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
strh r0, [r5, 0xA] strh r0, [r5, 0xA]
@@ -9211,7 +9211,7 @@ _080AFB6C:
movs r2, 0 movs r2, 0
ldrsh r1, [r6, r2] ldrsh r1, [r6, r2]
subs r1, 0x1 subs r1, 0x1
bl sub_808A8AC bl FieldAnimateDoorClose
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
strh r0, [r5, 0xA] strh r0, [r5, 0xA]
@@ -9996,7 +9996,7 @@ _080B0198:
bl sub_808D1B4 bl sub_808D1B4
cmp r0, 0x1 cmp r0, 0x1
beq _080B01B6 beq _080B01B6
bl sub_809757C bl UnfreezeMapObjects
bl ScriptContext2_Disable bl ScriptContext2_Disable
adds r0, r5, 0 adds r0, r5, 0
bl DestroyTask bl DestroyTask
asm/field_tasks.s
+4 -4
View File
@@ -46,7 +46,7 @@ _0809D8CA:
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _0809D8FC beq _0809D8FC
bl sub_809E7B0 bl DoTimeBasedEvents
ldrh r0, [r4] ldrh r0, [r4]
adds r0, 0x1 adds r0, 0x1
b _0809D8FA b _0809D8FA
@@ -144,8 +144,8 @@ _0809D992:
.pool .pool
thumb_func_end overworld_ensure_per_step_coros_running thumb_func_end overworld_ensure_per_step_coros_running
thumb_func_start activate_per_step_callback thumb_func_start ActivatePerStepCallback
activate_per_step_callback: @ 809D9A8 ActivatePerStepCallback: @ 809D9A8
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -180,7 +180,7 @@ _0809D9EA:
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end activate_per_step_callback thumb_func_end ActivatePerStepCallback
thumb_func_start wild_encounter_reset_coro_args thumb_func_start wild_encounter_reset_coro_args
wild_encounter_reset_coro_args: @ 809D9F0 wild_encounter_reset_coro_args: @ 809D9F0
asm/fldeff_80F9BCC.s
+16 -16
View File
@@ -486,7 +486,7 @@ sub_80F9F78: @ 80F9F78
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
beq _080F9FC0 beq _080F9FC0
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
ldr r0, [r1, 0x4] ldr r0, [r1, 0x4]
cmp r0, 0x2 cmp r0, 0x2
beq _080F9FAE beq _080F9FAE
@@ -517,7 +517,7 @@ _080F9FB6:
movs r0, 0x18 movs r0, 0x18
b _080F9FFC b _080F9FFC
_080F9FC0: _080F9FC0:
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
ldr r0, [r1, 0x4] ldr r0, [r1, 0x4]
cmp r0, 0x2 cmp r0, 0x2
beq _080F9FEA beq _080F9FEA
@@ -643,7 +643,7 @@ _080FA0C4:
sub_80FA0DC: @ 80FA0DC sub_80FA0DC: @ 80FA0DC
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -701,7 +701,7 @@ sub_80FA13C: @ 80FA13C
ldrh r1, [r2, 0x2] ldrh r1, [r2, 0x2]
lsls r1, 23 lsls r1, 23
lsrs r1, 23 lsrs r1, 23
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldr r3, [r4, 0x14] ldr r3, [r4, 0x14]
adds r1, r3 adds r1, r3
lsls r1, 16 lsls r1, 16
@@ -778,7 +778,7 @@ sub_80FA1D8: @ 80FA1D8
sub_80FA1E8: @ 80FA1E8 sub_80FA1E8: @ 80FA1E8
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -836,13 +836,13 @@ sub_80FA248: @ 80FA248
ands r2, r0 ands r2, r0
cmp r2, 0x96 cmp r2, 0x96
bne _080FA26A bne _080FA26A
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r0, 0 movs r0, 0
str r0, [r1, 0x1C] str r0, [r1, 0x1C]
_080FA26A: _080FA26A:
cmp r2, 0x9C cmp r2, 0x9C
bne _080FA274 bne _080FA274
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
movs r0, 0x2 movs r0, 0x2
str r0, [r1, 0x1C] str r0, [r1, 0x1C]
_080FA274: _080FA274:
@@ -858,7 +858,7 @@ _080FA274:
ldrh r1, [r2, 0x2] ldrh r1, [r2, 0x2]
lsls r1, 23 lsls r1, 23
lsrs r1, 23 lsrs r1, 23
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldr r3, [r4, 0x14] ldr r3, [r4, 0x14]
adds r1, r3 adds r1, r3
lsls r1, 16 lsls r1, 16
@@ -891,7 +891,7 @@ sub_80FA2D8: @ 80FA2D8
adds r4, r0, 0 adds r4, r0, 0
movs r0, 0x9B movs r0, 0x9B
bl PlaySE bl PlaySE
ldr r0, =gFieldEffectSpawnParams ldr r0, =gFieldEffectArguments
ldr r1, [r0, 0x1C] ldr r1, [r0, 0x1C]
adds r2, r4, 0 adds r2, r4, 0
adds r2, 0x2A adds r2, 0x2A
@@ -917,7 +917,7 @@ sub_80FA304: @ 80FA304
asrs r0, 16 asrs r0, 16
cmp r0, 0x27 cmp r0, 0x27
ble _080FA32E ble _080FA32E
ldr r0, =gFieldEffectSpawnParams ldr r0, =gFieldEffectArguments
ldr r0, [r0, 0x1C] ldr r0, [r0, 0x1C]
cmp r0, 0 cmp r0, 0
beq _080FA322 beq _080FA322
@@ -951,7 +951,7 @@ sub_80FA33C: @ 80FA33C
sub_80FA34C: @ 80FA34C sub_80FA34C: @ 80FA34C
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -1009,7 +1009,7 @@ sub_80FA3AC: @ 80FA3AC
ldrh r1, [r2, 0x2] ldrh r1, [r2, 0x2]
lsls r1, 23 lsls r1, 23
lsrs r1, 23 lsrs r1, 23
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldr r3, [r4, 0x14] ldr r3, [r4, 0x14]
adds r1, r3 adds r1, r3
lsls r1, 16 lsls r1, 16
@@ -1807,7 +1807,7 @@ sub_80FAA7C: @ 80FAA7C
mov r0, sp mov r0, sp
adds r1, r4, 0 adds r1, r4, 0
bl GetXYCoordsOneStepInFrontOfPlayer bl GetXYCoordsOneStepInFrontOfPlayer
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
mov r0, sp mov r0, sp
movs r2, 0 movs r2, 0
ldrsh r0, [r0, r2] ldrsh r0, [r0, r2]
@@ -1930,7 +1930,7 @@ door_restore_tilemap: @ 80FABA4
adds r5, r0, 0 adds r5, r0, 0
movs r0, 0x83 movs r0, 0x83
bl PlaySE bl PlaySE
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldr r0, [r4, 0x14] ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18] ldr r1, [r4, 0x18]
subs r1, 0x1 subs r1, 0x1
@@ -1953,7 +1953,7 @@ _080FABDC:
lsls r2, 2 lsls r2, 2
bl MapGridSetMetatileIdAt bl MapGridSetMetatileIdAt
_080FABEA: _080FABEA:
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldr r0, [r4, 0x14] ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18] ldr r1, [r4, 0x18]
ldr r2, =0x0000020a ldr r2, =0x0000020a
@@ -1988,7 +1988,7 @@ sub_80FAC24: @ 80FAC24
strh r0, [r5, 0x2E] strh r0, [r5, 0x2E]
b _080FAC54 b _080FAC54
_080FAC38: _080FAC38:
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldr r0, [r4, 0x14] ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18] ldr r1, [r4, 0x18]
ldr r2, =0x00000e8c ldr r2, =0x00000e8c
asm/fldeff_cut.s
+2 -2
View File
@@ -385,7 +385,7 @@ hm2_ruin_valley: @ 80D3A50
movs r0, 0x1 movs r0, 0x1
bl FieldEffectStart bl FieldEffectStart
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -421,7 +421,7 @@ sub_80D3A6C: @ 80D3A6C
sub_80D3A9C: @ 80D3A9C sub_80D3A9C: @ 80D3A9C
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
asm/fldeff_groundshake.s
+2 -2
View File
@@ -161,7 +161,7 @@ sub_81BE79C: @ 81BE79C
beq _081BE7B8 beq _081BE7B8
movs r0, 0xA7 movs r0, 0xA7
lsls r0, 1 lsls r0, 1
bl FlagReset bl FlagClear
b _081BE7EE b _081BE7EE
.pool .pool
_081BE7B8: _081BE7B8:
@@ -188,7 +188,7 @@ _081BE7D4:
_081BE7E6: _081BE7E6:
movs r0, 0xA7 movs r0, 0xA7
lsls r0, 1 lsls r0, 1
bl FlagReset bl FlagClear
_081BE7EE: _081BE7EE:
pop {r4} pop {r4}
pop {r0} pop {r0}
asm/fldeff_strength.s
+2 -2
View File
@@ -40,7 +40,7 @@ _08145DF2:
sub_8145E0C: @ 8145E0C sub_8145E0C: @ 8145E0C
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -66,7 +66,7 @@ sub_8145E2C: @ 8145E2C
lsrs r0, r2, 16 lsrs r0, r2, 16
strh r0, [r1, 0x18] strh r0, [r1, 0x18]
strh r2, [r1, 0x1A] strh r2, [r1, 0x1A]
ldr r0, =gFieldEffectSpawnParams ldr r0, =gFieldEffectArguments
ldr r1, [r0] ldr r1, [r0]
movs r0, 0x64 movs r0, 0x64
muls r0, r1 muls r0, r1
asm/fldeff_sweetscent.s
+1 -1
View File
@@ -24,7 +24,7 @@ hm2_sweet_scent: @ 8159F10
movs r0, 0x33 movs r0, 0x33
bl FieldEffectStart bl FieldEffectStart
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
asm/fldeff_teleport.s
+1 -1
View File
@@ -39,7 +39,7 @@ hm_teleport_run_dp02scr: @ 817C8FC
movs r0, 0x3F movs r0, 0x3F
bl FieldEffectStart bl FieldEffectStart
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
asm/item.s
+6 -6
View File
@@ -676,8 +676,8 @@ _080D6D04:
.pool .pool
thumb_func_end sub_80D6CE4 thumb_func_end sub_80D6CE4
thumb_func_start sub_80D6D1C thumb_func_start CheckPCHasItem
sub_80D6D1C: @ 80D6D1C CheckPCHasItem: @ 80D6D1C
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 16 lsls r0, 16
lsrs r6, r0, 16 lsrs r6, r0, 16
@@ -717,10 +717,10 @@ _080D6D68:
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80D6D1C thumb_func_end CheckPCHasItem
thumb_func_start sub_80D6D70 thumb_func_start AddPCItem
sub_80D6D70: @ 80D6D70 AddPCItem: @ 80D6D70
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -819,7 +819,7 @@ _080D6E3A:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end sub_80D6D70 thumb_func_end AddPCItem
thumb_func_start sub_80D6E48 thumb_func_start sub_80D6E48
sub_80D6E48: @ 80D6E48 sub_80D6E48: @ 80D6E48
asm/item_menu.s
+1 -1
View File
@@ -5388,7 +5388,7 @@ _081ADB6C:
ldrh r0, [r4] ldrh r0, [r4]
mov r3, r8 mov r3, r8
ldrh r1, [r3, 0x10] ldrh r1, [r3, 0x10]
bl sub_80D6D70 bl AddPCItem
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
cmp r6, 0x1 cmp r6, 0x1
asm/item_use.s
+2 -2
View File
@@ -2215,7 +2215,7 @@ ItemUseOutOfBattle_BlackWhiteFlute: @ 80FE234
ldr r0, =0x000008ad ldr r0, =0x000008ad
bl FlagSet bl FlagSet
ldr r0, =0x000008ae ldr r0, =0x000008ae
bl FlagReset bl FlagClear
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gText_UsedVar2WildLured ldr r1, =gText_UsedVar2WildLured
bl StringExpandPlaceholders bl StringExpandPlaceholders
@@ -2225,7 +2225,7 @@ _080FE278:
ldr r0, =0x000008ae ldr r0, =0x000008ae
bl FlagSet bl FlagSet
ldr r0, =0x000008ad ldr r0, =0x000008ad
bl FlagReset bl FlagClear
ldr r0, =gStringVar4 ldr r0, =gStringVar4
ldr r1, =gText_UsedVar2WildRepelled ldr r1, =gText_UsedVar2WildRepelled
bl StringExpandPlaceholders bl StringExpandPlaceholders
asm/link.s
+4 -4
View File
@@ -21117,7 +21117,7 @@ sub_8014290: @ 8014290
asrs r5, 24 asrs r5, 24
str r5, [sp] str r5, [sp]
adds r3, r4, 0 adds r3, r4, 0
bl warp1_set bl Overworld_SetWarpDestination
ldr r0, [r6] ldr r0, [r6]
movs r1, 0x4 movs r1, 0x4
ldrsb r1, [r0, r1] ldrsb r1, [r0, r1]
@@ -21182,7 +21182,7 @@ sub_8014304: @ 8014304
adds r0, r4, 0 adds r0, r4, 0
adds r1, r5, 0 adds r1, r5, 0
mov r3, r8 mov r3, r8
bl warp1_set bl Overworld_SetWarpDestination
bl warp_in bl warp_in
add sp, 0x4 add sp, 0x4
pop {r3} pop {r3}
@@ -28312,7 +28312,7 @@ _080181BC:
sub_80181CC: @ 80181CC sub_80181CC: @ 80181CC
push {lr} push {lr}
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl sub_80983E8 bl ScriptFreezeMapObjects
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_80181CC thumb_func_end sub_80181CC
@@ -31292,7 +31292,7 @@ flag_clear_x63: @ 8019A64
adds r0, r1 adds r0, r1
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl FlagReset bl FlagClear
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
asm/map_obj_8097404.s
+5 -5
View File
@@ -205,8 +205,8 @@ _0809756C:
.pool .pool
thumb_func_end npc_sync_anim_pause_bits thumb_func_end npc_sync_anim_pause_bits
thumb_func_start sub_809757C thumb_func_start UnfreezeMapObjects
sub_809757C: @ 809757C UnfreezeMapObjects: @ 809757C
push {r4,r5,lr} push {r4,r5,lr}
movs r4, 0 movs r4, 0
ldr r5, =gMapObjects ldr r5, =gMapObjects
@@ -231,7 +231,7 @@ _08097598:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_809757C thumb_func_end UnfreezeMapObjects
thumb_func_start little_step thumb_func_start little_step
@ void little_step(struct obj *object, u8 direction) @ void little_step(struct obj *object, u8 direction)
@@ -1396,7 +1396,7 @@ oe_exec_and_other_stuff: @ 8097DD0
adds r0, r1, 0 adds r0, r1, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
adds r2, r1, 0x4 adds r2, r1, 0x4
adds r3, r1, 0 adds r3, r1, 0
adds r3, 0x8 adds r3, 0x8
@@ -1434,7 +1434,7 @@ DoRippleFieldEffect: @ 8097E14
adds r4, r1, 0 adds r4, r1, 0
ldrb r0, [r0, 0x5] ldrb r0, [r0, 0x5]
bl GetFieldObjectGraphicsInfo bl GetFieldObjectGraphicsInfo
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
movs r3, 0x20 movs r3, 0x20
ldrsh r1, [r4, r3] ldrsh r1, [r4, r3]
str r1, [r2] str r1, [r2]
asm/map_obj_lock.s
+8 -8
View File
@@ -59,8 +59,8 @@ _080983E2:
bx r1 bx r1
thumb_func_end sub_80983C4 thumb_func_end sub_80983C4
thumb_func_start sub_80983E8 thumb_func_start ScriptFreezeMapObjects
sub_80983E8: @ 80983E8 ScriptFreezeMapObjects: @ 80983E8
push {lr} push {lr}
bl player_bitmagic bl player_bitmagic
ldr r0, =sub_80983A4 ldr r0, =sub_80983A4
@@ -69,7 +69,7 @@ sub_80983E8: @ 80983E8
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80983E8 thumb_func_end ScriptFreezeMapObjects
thumb_func_start sub_8098400 thumb_func_start sub_8098400
sub_8098400: @ 8098400 sub_8098400: @ 8098400
@@ -149,8 +149,8 @@ _0809849A:
bx r1 bx r1
thumb_func_end sub_809847C thumb_func_end sub_809847C
thumb_func_start sub_80984A0 thumb_func_start LockSelectedMapObject
sub_80984A0: @ 80984A0 LockSelectedMapObject: @ 80984A0
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, =gSelectedMapObject ldr r4, =gSelectedMapObject
ldrb r0, [r4] ldrb r0, [r4]
@@ -184,7 +184,7 @@ _080984DE:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80984A0 thumb_func_end LockSelectedMapObject
thumb_func_start sub_80984F4 thumb_func_start sub_80984F4
sub_80984F4: @ 80984F4 sub_80984F4: @ 80984F4
@@ -203,7 +203,7 @@ sub_80984F4: @ 80984F4
adds r0, r1 adds r0, r1
bl FieldObjectClearAnimIfSpecialAnimFinished bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80D338C bl sub_80D338C
bl sub_809757C bl UnfreezeMapObjects
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -239,7 +239,7 @@ _08098542:
adds r0, r4 adds r0, r4
bl FieldObjectClearAnimIfSpecialAnimFinished bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80D338C bl sub_80D338C
bl sub_809757C bl UnfreezeMapObjects
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
asm/mystery_event_script.s
+4 -4
View File
@@ -46,7 +46,7 @@ sub_8153804: @ 8153804
ldr r1, =gUnknown_08674C86 ldr r1, =gUnknown_08674C86
bl StringExpandPlaceholders bl StringExpandPlaceholders
movs r0, 0x3 movs r0, 0x3
bl sub_81538C4 bl SetMysteryEventScriptStatus
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -140,13 +140,13 @@ _081538AC:
.pool .pool
thumb_func_end sub_81538A0 thumb_func_end sub_81538A0
thumb_func_start sub_81538C4 thumb_func_start SetMysteryEventScriptStatus
sub_81538C4: @ 81538C4 SetMysteryEventScriptStatus: @ 81538C4
ldr r1, =gUnknown_0203BBC0 ldr r1, =gUnknown_0203BBC0
str r0, [r1, 0x6C] str r0, [r1, 0x6C]
bx lr bx lr
.pool .pool
thumb_func_end sub_81538C4 thumb_func_end SetMysteryEventScriptStatus
thumb_func_start sub_81538D0 thumb_func_start sub_81538D0
sub_81538D0: @ 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 cmp r0, 0x1
bne _081B577C bne _081B577C
bl brm_get_selected_species bl brm_get_selected_species
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
str r0, [r1] str r0, [r1]
@@ -10135,7 +10135,7 @@ _081B57FE:
hm_surf_run_dp02scr: @ 81B5804 hm_surf_run_dp02scr: @ 81B5804
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -10239,7 +10239,7 @@ sub_81B58A8: @ 81B58A8
hm2_waterfall: @ 81B58D4 hm2_waterfall: @ 81B58D4
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -10299,7 +10299,7 @@ _081B594E:
sub_81B5958: @ 81B5958 sub_81B5958: @ 81B5958
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -10314,7 +10314,7 @@ sub_81B5958: @ 81B5958
sub_81B5974: @ 81B5974 sub_81B5974: @ 81B5974
push {lr} push {lr}
bl sub_809D1E8 bl sub_809D1E8
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1, 0x4] str r0, [r1, 0x4]
@@ -15205,7 +15205,7 @@ sub_81B841C: @ 81B841C
beq _081B8438 beq _081B8438
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0x1 movs r1, 0x1
bl sub_80D6D70 bl AddPCItem
b _081B8440 b _081B8440
.pool .pool
_081B8438: _081B8438:
asm/player_pc.s
+1 -1
View File
@@ -31,7 +31,7 @@ _0816AE1A:
ldrh r0, [r0] ldrh r0, [r0]
adds r1, r6 adds r1, r6
ldrh r1, [r1] ldrh r1, [r1]
bl sub_80D6D70 bl AddPCItem
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
asm/pokemon_storage_system.s
+1 -1
View File
@@ -6902,7 +6902,7 @@ sub_80CABE0: @ 80CABE0
cmp r1, r0 cmp r1, r0
beq _080CAC0A beq _080CAC0A
ldr r0, =0x000008d7 ldr r0, =0x000008d7
bl FlagReset bl FlagClear
ldr r4, =0x00004036 ldr r4, =0x00004036
bl StorageGetCurrentBox bl StorageGetCurrentBox
adds r1, r0, 0 adds r1, r0, 0
asm/record_mixing.s
+1 -1
View File
@@ -2266,7 +2266,7 @@ sub_80E7F68: @ 80E7F68
bne _080E7FE4 bne _080E7FE4
ldrh r0, [r4] ldrh r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_80D6D1C bl CheckPCHasItem
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080E7FE4 bne _080E7FE4
asm/rom4.s
+57 -57
View File
@@ -36,15 +36,15 @@ flag_var_implications_of_teleport_: @ 8084660
push {lr} push {lr}
bl player_avatar_init_params_reset bl player_avatar_init_params_reset
ldr r0, =0x0000088b ldr r0, =0x0000088b
bl FlagReset bl FlagClear
ldr r0, =0x0000088d ldr r0, =0x0000088d
bl FlagReset bl FlagClear
ldr r0, =0x0000088c ldr r0, =0x0000088c
bl FlagReset bl FlagClear
ldr r0, =0x00000889 ldr r0, =0x00000889
bl FlagReset bl FlagClear
ldr r0, =0x00000888 ldr r0, =0x00000888
bl FlagReset bl FlagClear
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -55,15 +55,15 @@ sub_808469C: @ 808469C
push {lr} push {lr}
bl player_avatar_init_params_reset bl player_avatar_init_params_reset
ldr r0, =0x0000088b ldr r0, =0x0000088b
bl FlagReset bl FlagClear
ldr r0, =0x0000088d ldr r0, =0x0000088d
bl FlagReset bl FlagClear
ldr r0, =0x0000088c ldr r0, =0x0000088c
bl FlagReset bl FlagClear
ldr r0, =0x00000889 ldr r0, =0x00000889
bl FlagReset bl FlagClear
ldr r0, =0x00000888 ldr r0, =0x00000888
bl FlagReset bl FlagClear
ldr r0, =gUnknown_08271862 ldr r0, =gUnknown_08271862
bl ScriptContext2_RunNewScript bl ScriptContext2_RunNewScript
pop {r0} pop {r0}
@@ -76,15 +76,15 @@ flagmods_08054D70: @ 80846E4
push {lr} push {lr}
bl player_avatar_init_params_reset bl player_avatar_init_params_reset
ldr r0, =0x0000088b ldr r0, =0x0000088b
bl FlagReset bl FlagClear
ldr r0, =0x0000088d ldr r0, =0x0000088d
bl FlagReset bl FlagClear
ldr r0, =0x0000088c ldr r0, =0x0000088c
bl FlagReset bl FlagClear
ldr r0, =0x00000889 ldr r0, =0x00000889
bl FlagReset bl FlagClear
ldr r0, =0x00000888 ldr r0, =0x00000888
bl FlagReset bl FlagClear
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -95,15 +95,15 @@ sub_8084720: @ 8084720
push {r4,lr} push {r4,lr}
bl player_avatar_init_params_reset bl player_avatar_init_params_reset
ldr r0, =0x0000088b ldr r0, =0x0000088b
bl FlagReset bl FlagClear
ldr r0, =0x0000088d ldr r0, =0x0000088d
bl FlagReset bl FlagClear
ldr r0, =0x0000088c ldr r0, =0x0000088c
bl FlagReset bl FlagClear
ldr r0, =0x00000889 ldr r0, =0x00000889
bl FlagReset bl FlagClear
ldr r0, =0x00000888 ldr r0, =0x00000888
bl FlagReset bl FlagClear
ldr r4, =0x00004039 ldr r4, =0x00004039
adds r0, r4, 0 adds r0, r4, 0
bl VarGet bl VarGet
@@ -128,7 +128,7 @@ _08084764:
sub_8084788: @ 8084788 sub_8084788: @ 8084788
push {lr} push {lr}
ldr r0, =0x0000088c ldr r0, =0x0000088c
bl FlagReset bl FlagClear
bl sub_8085B2C bl sub_8085B2C
bl wild_pokemon_reroll bl wild_pokemon_reroll
bl UpdateLocationHistoryForRoamer bl UpdateLocationHistoryForRoamer
@@ -324,8 +324,8 @@ _080848F4:
.pool .pool
thumb_func_end CopyFieldObjectTemplateCoordsToSav1 thumb_func_end CopyFieldObjectTemplateCoordsToSav1
thumb_func_start update_saveblock1_field_object_coords thumb_func_start Overworld_SetMapObjTemplateCoords
update_saveblock1_field_object_coords: @ 8084910 Overworld_SetMapObjTemplateCoords: @ 8084910
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
@@ -356,10 +356,10 @@ _08084944:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx 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 thumb_func_start Overworld_SetMapObjTemplateMovementType
update_saveblock1_field_object_movement_behavior: @ 808494C Overworld_SetMapObjTemplateMovementType: @ 808494C
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
@@ -387,7 +387,7 @@ _08084978:
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx 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 thumb_func_start mapdata_load_assets_to_gpu_and_full_redraw
mapdata_load_assets_to_gpu_and_full_redraw: @ 8084980 mapdata_load_assets_to_gpu_and_full_redraw: @ 8084980
@@ -710,9 +710,9 @@ warp_in: @ 8084BD8
bx r0 bx r0
thumb_func_end warp_in thumb_func_end warp_in
thumb_func_start warp1_set thumb_func_start Overworld_SetWarpDestination
@ void warp1_set(char bank, char map, char warpid, char enter_x, char enter_y) @ void Overworld_SetWarpDestination(char bank, char map, char warpid, char enter_x, char enter_y)
warp1_set: @ 8084BEC Overworld_SetWarpDestination: @ 8084BEC
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x8 sub sp, 0x8
adds r4, r0, 0 adds r4, r0, 0
@@ -741,7 +741,7 @@ warp1_set: @ 8084BEC
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end warp1_set thumb_func_end Overworld_SetWarpDestination
thumb_func_start warp1_set_2 thumb_func_start warp1_set_2
@ void warp1_set_2(char bank, char map, char warpid) @ void warp1_set_2(char bank, char map, char warpid)
@@ -757,7 +757,7 @@ warp1_set_2: @ 8084C28
movs r3, 0x1 movs r3, 0x1
negs r3, r3 negs r3, r3
str r3, [sp] str r3, [sp]
bl warp1_set bl Overworld_SetWarpDestination
add sp, 0x4 add sp, 0x4
pop {r0} pop {r0}
bx r0 bx r0
@@ -857,7 +857,7 @@ sub_8084CCC: @ 8084CCC
lsls r4, 24 lsls r4, 24
asrs r4, 24 asrs r4, 24
str r4, [sp] str r4, [sp]
bl warp1_set bl Overworld_SetWarpDestination
_08084CFA: _08084CFA:
add sp, 0x4 add sp, 0x4
pop {r4} pop {r4}
@@ -879,8 +879,8 @@ copy_saved_warp3_bank_and_enter_x_to_warp1: @ 8084D04
.pool .pool
thumb_func_end copy_saved_warp3_bank_and_enter_x_to_warp1 thumb_func_end copy_saved_warp3_bank_and_enter_x_to_warp1
thumb_func_start sub_8084D1C thumb_func_start Overworld_SetHealLocationWarp
sub_8084D1C: @ 8084D1C Overworld_SetHealLocationWarp: @ 8084D1C
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x8 sub sp, 0x8
lsls r0, 24 lsls r0, 24
@@ -911,7 +911,7 @@ _08084D50:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_8084D1C thumb_func_end Overworld_SetHealLocationWarp
thumb_func_start sub_8084D5C thumb_func_start sub_8084D5C
sub_8084D5C: @ 8084D5C sub_8084D5C: @ 8084D5C
@@ -1126,7 +1126,7 @@ _08084EF0:
lsls r4, r6, 24 lsls r4, r6, 24
asrs r4, 24 asrs r4, 24
str r4, [sp] str r4, [sp]
bl warp1_set bl Overworld_SetWarpDestination
_08084F0A: _08084F0A:
add sp, 0x4 add sp, 0x4
pop {r4-r6} pop {r4-r6}
@@ -1289,7 +1289,7 @@ sub_8084FF8: @ 8084FF8
lsls r4, r5, 24 lsls r4, r5, 24
asrs r4, 24 asrs r4, 24
str r4, [sp] str r4, [sp]
bl warp1_set bl Overworld_SetWarpDestination
b _0808504C b _0808504C
_08085030: _08085030:
bl mapheader_run_script_with_tag_x6 bl mapheader_run_script_with_tag_x6
@@ -1365,7 +1365,7 @@ mliX_load_map: @ 8085098
negs r3, r3 negs r3, r3
str r3, [sp] str r3, [sp]
adds r2, r3, 0 adds r2, r3, 0
bl warp1_set bl Overworld_SetWarpDestination
ldr r4, =gMapHeader ldr r4, =gMapHeader
ldrb r0, [r4, 0x14] ldrb r0, [r4, 0x14]
cmp r0, 0x3A cmp r0, 0x3A
@@ -1382,7 +1382,7 @@ _080850C8:
adds r0, r6, 0 adds r0, r6, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_80B21B4 bl sub_80B21B4
bl sub_809E7B0 bl DoTimeBasedEvents
bl sub_80AEDBC bl sub_80AEDBC
bl sub_8085B2C bl sub_8085B2C
bl update_sav1_flash_used_on_map bl update_sav1_flash_used_on_map
@@ -1404,7 +1404,7 @@ _08085116:
bl sub_80A0A2C bl sub_80A0A2C
bl UpdateLocationHistoryForRoamer bl UpdateLocationHistoryForRoamer
bl RoamerMove bl RoamerMove
bl sub_80AEE20 bl DoCurrentWeather
bl wild_encounter_reset_coro_args bl wild_encounter_reset_coro_args
bl mapheader_run_script_with_tag_x5 bl mapheader_run_script_with_tag_x5
ldr r2, =gMapHeader ldr r2, =gMapHeader
@@ -1481,14 +1481,14 @@ _080851A2:
bl sub_80B21B4 bl sub_80B21B4
cmp r7, 0x1 cmp r7, 0x1
beq _080851EE beq _080851EE
bl sub_809E7B0 bl DoTimeBasedEvents
_080851EE: _080851EE:
bl sub_80AEDBC bl sub_80AEDBC
bl sub_8085B2C bl sub_8085B2C
cmp r5, 0 cmp r5, 0
beq _08085200 beq _08085200
ldr r0, =0x00000888 ldr r0, =0x00000888
bl FlagReset bl FlagClear
_08085200: _08085200:
bl update_sav1_flash_used_on_map bl update_sav1_flash_used_on_map
bl sav1_reset_battle_music_maybe bl sav1_reset_battle_music_maybe
@@ -1858,8 +1858,8 @@ _080854DE:
.pool .pool
thumb_func_end update_sav1_flash_used_on_map thumb_func_end update_sav1_flash_used_on_map
thumb_func_start sub_80854EC thumb_func_start Overworld_SetFlashLevel
sub_80854EC: @ 80854EC Overworld_SetFlashLevel: @ 80854EC
push {lr} push {lr}
adds r1, r0, 0 adds r1, r0, 0
cmp r1, 0 cmp r1, 0
@@ -1878,7 +1878,7 @@ _080854FE:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80854EC thumb_func_end Overworld_SetFlashLevel
thumb_func_start sav1_get_flash_used_on_map thumb_func_start sav1_get_flash_used_on_map
sav1_get_flash_used_on_map: @ 8085514 sav1_get_flash_used_on_map: @ 8085514
@@ -2263,14 +2263,14 @@ _080857E8:
.pool .pool
thumb_func_end sub_8085784 thumb_func_end sub_8085784
thumb_func_start sav1_set_battle_music_maybe thumb_func_start Overworld_SetSavedMusic
sav1_set_battle_music_maybe: @ 80857F4 Overworld_SetSavedMusic: @ 80857F4
ldr r1, =gSaveBlock1Ptr ldr r1, =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
strh r0, [r1, 0x2C] strh r0, [r1, 0x2C]
bx lr bx lr
.pool .pool
thumb_func_end sav1_set_battle_music_maybe thumb_func_end Overworld_SetSavedMusic
thumb_func_start sav1_reset_battle_music_maybe thumb_func_start sav1_reset_battle_music_maybe
sav1_reset_battle_music_maybe: @ 8085800 sav1_reset_battle_music_maybe: @ 8085800
@@ -2339,8 +2339,8 @@ _08085890:
bx r0 bx r0
thumb_func_end sub_8085810 thumb_func_end sub_8085810
thumb_func_start sub_8085898 thumb_func_start Overworld_ChangeMusicToDefault
sub_8085898: @ 8085898 Overworld_ChangeMusicToDefault: @ 8085898
push {r4,lr} push {r4,lr}
bl GetCurrentMapMusic bl GetCurrentMapMusic
adds r4, r0, 0 adds r4, r0, 0
@@ -2360,10 +2360,10 @@ _080858BE:
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8085898 thumb_func_end Overworld_ChangeMusicToDefault
thumb_func_start sub_80858C4 thumb_func_start Overworld_ChangeMusicTo
sub_80858C4: @ 80858C4 Overworld_ChangeMusicTo: @ 80858C4
push {r4,lr} push {r4,lr}
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
@@ -2383,7 +2383,7 @@ _080858E4:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80858C4 thumb_func_end Overworld_ChangeMusicTo
thumb_func_start is_warp1_light_level_8_or_9 thumb_func_start is_warp1_light_level_8_or_9
is_warp1_light_level_8_or_9: @ 80858F0 is_warp1_light_level_8_or_9: @ 80858F0
@@ -3525,8 +3525,8 @@ _08086278:
_08086286: _08086286:
bl CopyFieldObjectTemplateCoordsToSav1 bl CopyFieldObjectTemplateCoordsToSav1
_0808628A: _0808628A:
bl sub_809757C bl UnfreezeMapObjects
bl sub_809E7B0 bl DoTimeBasedEvents
bl sub_8084788 bl sub_8084788
ldr r0, =gMapHeader ldr r0, =gMapHeader
ldrh r1, [r0, 0x12] ldrh r1, [r0, 0x12]
asm/rom6.s
+36 -36
View File
@@ -167,7 +167,7 @@ sub_8135578: @ 8135578
cmp r4, 0 cmp r4, 0
bne _081355FC bne _081355FC
bl player_get_direction_lower_nybble bl player_get_direction_lower_nybble
ldr r6, =gFieldEffectSpawnParams ldr r6, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r6, 0x4] str r0, [r6, 0x4]
@@ -303,7 +303,7 @@ _081356AC:
sub_81356C4: @ 81356C4 sub_81356C4: @ 81356C4
push {lr} push {lr}
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -380,7 +380,7 @@ hm2_dig: @ 8135760
movs r0, 0x26 movs r0, 0x26
bl FieldEffectStart bl FieldEffectStart
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -3381,7 +3381,7 @@ hm2_flash: @ 8137178
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
bl brm_get_pokemon_selection bl brm_get_pokemon_selection
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
str r0, [r1] str r0, [r1]
@@ -4337,7 +4337,7 @@ sub_8137988: @ 8137988
.pool .pool
_081379C8: _081379C8:
ldr r0, =0x0000089a ldr r0, =0x0000089a
bl FlagReset bl FlagClear
_081379CE: _081379CE:
pop {r0} pop {r0}
bx r0 bx r0
@@ -5030,7 +5030,7 @@ _08137F6E:
movs r1, 0 movs r1, 0
bl VarSet bl VarSet
movs r0, 0 movs r0, 0
bl sav1_set_battle_music_maybe bl Overworld_SetSavedMusic
_08137F7C: _08137F7C:
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -5056,7 +5056,7 @@ sub_8137F90: @ 8137F90
sub_8137FB0: @ 8137FB0 sub_8137FB0: @ 8137FB0
push {lr} push {lr}
ldr r0, =0x0000088d ldr r0, =0x0000088d
bl FlagReset bl FlagClear
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -6485,7 +6485,7 @@ sub_8138B8C: @ 8138B8C
movs r0, 0x13 movs r0, 0x13
movs r1, 0 movs r1, 0
movs r3, 0x6 movs r3, 0x6
bl warp1_set bl Overworld_SetWarpDestination
b _08138BC2 b _08138BC2
.pool .pool
_08138BB0: _08138BB0:
@@ -6496,7 +6496,7 @@ _08138BB0:
movs r0, 0x13 movs r0, 0x13
movs r1, 0x1 movs r1, 0x1
movs r3, 0x6 movs r3, 0x6
bl warp1_set bl Overworld_SetWarpDestination
_08138BC2: _08138BC2:
add sp, 0x4 add sp, 0x4
pop {r0} pop {r0}
@@ -6537,7 +6537,7 @@ _08138BF6:
thumb_func_start sub_8138C04 thumb_func_start sub_8138C04
sub_8138C04: @ 8138C04 sub_8138C04: @ 8138C04
push {r4,lr} push {r4,lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7051,7 +7051,7 @@ sub_8138FEC: @ 8138FEC
ldr r1, =gSpecialVar_0x8004 ldr r1, =gSpecialVar_0x8004
ldr r0, =0x000001f5 ldr r0, =0x000001f5
strh r0, [r1] strh r0, [r1]
bl FlagReset bl FlagClear
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@@ -7060,7 +7060,7 @@ sub_8138FEC: @ 8138FEC
thumb_func_start sub_8139004 thumb_func_start sub_8139004
sub_8139004: @ 8139004 sub_8139004: @ 8139004
push {lr} push {lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7084,7 +7084,7 @@ _0813902A:
thumb_func_start sub_8139030 thumb_func_start sub_8139030
sub_8139030: @ 8139030 sub_8139030: @ 8139030
push {lr} push {lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7108,7 +7108,7 @@ _08139056:
thumb_func_start sub_813905C thumb_func_start sub_813905C
sub_813905C: @ 813905C sub_813905C: @ 813905C
push {lr} push {lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7132,7 +7132,7 @@ _08139082:
thumb_func_start sub_8139088 thumb_func_start sub_8139088
sub_8139088: @ 8139088 sub_8139088: @ 8139088
push {lr} push {lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7156,7 +7156,7 @@ _081390AE:
thumb_func_start sub_81390B4 thumb_func_start sub_81390B4
sub_81390B4: @ 81390B4 sub_81390B4: @ 81390B4
push {lr} push {lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7295,7 +7295,7 @@ RemoveScriptFieldObject: @ 81391AC
thumb_func_start sub_81391D0 thumb_func_start sub_81391D0
sub_81391D0: @ 81391D0 sub_81391D0: @ 81391D0
push {lr} push {lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7479,7 +7479,7 @@ _08139342:
thumb_func_start sub_8139348 thumb_func_start sub_8139348
sub_8139348: @ 8139348 sub_8139348: @ 8139348
push {lr} push {lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7507,7 +7507,7 @@ sub_8139370: @ 8139370
movs r1, 0x1 movs r1, 0x1
mov r0, sp mov r0, sp
strb r1, [r0] strb r1, [r0]
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7538,7 +7538,7 @@ _081393B6:
thumb_func_start sub_81393C8 thumb_func_start sub_81393C8
sub_81393C8: @ 81393C8 sub_81393C8: @ 81393C8
push {lr} push {lr}
bl GetIdxOfFirstPartyMemberThatIsNotAnEgg bl GetLeadMonIndex
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
movs r1, 0x64 movs r1, 0x64
@@ -7858,7 +7858,7 @@ sub_8139648: @ 8139648
cmp r0, 0x1 cmp r0, 0x1
beq _08139664 beq _08139664
movs r0, 0x14 movs r0, 0x14
bl sub_80AED7C bl SetSav1Weather
_08139664: _08139664:
pop {r0} pop {r0}
bx r0 bx r0
@@ -7876,14 +7876,14 @@ sub_8139668: @ 8139668
cmp r0, 0x1 cmp r0, 0x1
beq _08139684 beq _08139684
movs r0, 0x15 movs r0, 0x15
bl sub_80AED7C bl SetSav1Weather
_08139684: _08139684:
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8139668 thumb_func_end sub_8139668
thumb_func_start GetIdxOfFirstPartyMemberThatIsNotAnEgg thumb_func_start GetLeadMonIndex
GetIdxOfFirstPartyMemberThatIsNotAnEgg: @ 8139688 GetLeadMonIndex: @ 8139688
push {r4-r6,lr} push {r4-r6,lr}
bl CalculatePlayerPartyCount bl CalculatePlayerPartyCount
lsls r0, 24 lsls r0, 24
@@ -7926,7 +7926,7 @@ _081396D8:
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end GetIdxOfFirstPartyMemberThatIsNotAnEgg thumb_func_end GetLeadMonIndex
thumb_func_start sub_81396E0 thumb_func_start sub_81396E0
sub_81396E0: @ 81396E0 sub_81396E0: @ 81396E0
@@ -11039,7 +11039,7 @@ _0813B0F8:
ldr r0, =sub_813B160 ldr r0, =sub_813B160
movs r1, 0x8 movs r1, 0x8
bl CreateTask bl CreateTask
ldr r3, =gFieldEffectSpawnParams ldr r3, =gFieldEffectArguments
movs r0, 0x1 movs r0, 0x1
str r0, [r3] str r0, [r3]
movs r0, 0x3A movs r0, 0x3A
@@ -11074,7 +11074,7 @@ _0813B13A:
adds r0, r5, r0 adds r0, r5, r0
ldrb r2, [r0] ldrb r2, [r0]
movs r0, 0x1 movs r0, 0x1
bl update_saveblock1_field_object_coords bl Overworld_SetMapObjTemplateCoords
add sp, 0x4 add sp, 0x4
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
@@ -11238,7 +11238,7 @@ _0813B27E:
cmp r0, r4 cmp r0, r4
beq _0813B2A6 beq _0813B2A6
ldr r0, =0x000008d7 ldr r0, =0x000008d7
bl FlagReset bl FlagClear
_0813B2A6: _0813B2A6:
ldr r0, =0x00004036 ldr r0, =0x00004036
lsrs r1, r7, 16 lsrs r1, r7, 16
@@ -11778,7 +11778,7 @@ _0813B728:
cmp r0, 0x2 cmp r0, 0x2
bne _0813B790 bne _0813B790
ldr r0, =gUnknown_0824979B ldr r0, =gUnknown_0824979B
bl box_related_two__3 bl ShowFieldAutoScrollMessage
b _0813B790 b _0813B790
.pool .pool
_0813B74C: _0813B74C:
@@ -11787,7 +11787,7 @@ _0813B74C:
cmp r0, 0x3 cmp r0, 0x3
bne _0813B790 bne _0813B790
ldr r0, =gUnknown_0824979B ldr r0, =gUnknown_0824979B
bl box_related_two__3 bl ShowFieldAutoScrollMessage
b _0813B790 b _0813B790
.pool .pool
_0813B764: _0813B764:
@@ -12075,7 +12075,7 @@ sub_813B9A0: @ 813B9A0
cmp r1, r0 cmp r1, r0
bne _0813B9B6 bne _0813B9B6
movs r0, 0x3 movs r0, 0x3
bl sub_8084D1C bl Overworld_SetHealLocationWarp
_0813B9B6: _0813B9B6:
pop {r0} pop {r0}
bx r0 bx r0
@@ -12187,16 +12187,16 @@ sub_813BA60: @ 813BA60
adds r1, r2 adds r1, r2
strh r0, [r1] strh r0, [r1]
ldr r0, =0x00000315 ldr r0, =0x00000315
bl FlagReset bl FlagClear
ldr r0, =0x00000316 ldr r0, =0x00000316
bl FlagReset bl FlagClear
ldr r0, =0x00000317 ldr r0, =0x00000317
bl FlagReset bl FlagClear
movs r0, 0xC6 movs r0, 0xC6
lsls r0, 2 lsls r0, 2
bl FlagReset bl FlagClear
ldr r0, =0x000002da ldr r0, =0x000002da
bl FlagReset bl FlagClear
ldr r0, =0x00004095 ldr r0, =0x00004095
movs r1, 0x1 movs r1, 0x1
bl VarSet 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 .text
thumb_func_start Multichoice thumb_func_start ScriptMenu_Multichoice
@ bool8 Multichoice(u8 x, u8 y, u8 menuId, bool8 noCancelling) @ bool8 ScriptMenu_Multichoice(u8 x, u8 y, u8 menuId, bool8 noCancelling)
Multichoice: @ 80E1E08 ScriptMenu_Multichoice: @ 80E1E08
push {r4-r7,lr} push {r4-r7,lr}
sub sp, 0x4 sub sp, 0x4
lsls r0, 24 lsls r0, 24
@@ -44,10 +44,10 @@ _080E1E4E:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end Multichoice thumb_func_end ScriptMenu_Multichoice
thumb_func_start sub_80E1E58 thumb_func_start ScriptMenu_MultichoiceWithDefault
sub_80E1E58: @ 80E1E58 ScriptMenu_MultichoiceWithDefault: @ 80E1E58
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -91,7 +91,7 @@ _080E1EAA:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80E1E58 thumb_func_end ScriptMenu_MultichoiceWithDefault
thumb_func_start sub_80E1EB8 thumb_func_start sub_80E1EB8
sub_80E1EB8: @ 80E1EB8 sub_80E1EB8: @ 80E1EB8
@@ -379,8 +379,8 @@ _080E20FC:
.pool .pool
thumb_func_end sub_80E2058 thumb_func_end sub_80E2058
thumb_func_start yes_no_box thumb_func_start ScriptMenu_YesNo
yes_no_box: @ 80E2108 ScriptMenu_YesNo: @ 80E2108
push {r4,lr} push {r4,lr}
ldr r4, =task_yes_no_maybe ldr r4, =task_yes_no_maybe
adds r0, r4, 0 adds r0, r4, 0
@@ -405,7 +405,7 @@ _080E213A:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end yes_no_box thumb_func_end ScriptMenu_YesNo
thumb_func_start sub_80E2140 thumb_func_start sub_80E2140
sub_80E2140: @ 80E2140 sub_80E2140: @ 80E2140
@@ -485,8 +485,8 @@ _080E21C4:
.pool .pool
thumb_func_end task_yes_no_maybe thumb_func_end task_yes_no_maybe
thumb_func_start sub_80E21D0 thumb_func_start ScriptMenu_MultichoiceGrid
sub_80E21D0: @ 80E21D0 ScriptMenu_MultichoiceGrid: @ 80E21D0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -627,7 +627,7 @@ _080E22E8:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end sub_80E21D0 thumb_func_end ScriptMenu_MultichoiceGrid
thumb_func_start sub_80E2308 thumb_func_start sub_80E2308
sub_80E2308: @ 80E2308 sub_80E2308: @ 80E2308
@@ -1334,8 +1334,8 @@ _080E28F8:
bx r0 bx r0
thumb_func_end task_picbox thumb_func_end task_picbox
thumb_func_start sub_80E2900 thumb_func_start ScriptMenu_ShowPokemonPic
sub_80E2900: @ 80E2900 ScriptMenu_ShowPokemonPic: @ 80E2900
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -1422,10 +1422,10 @@ _080E29BA:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80E2900 thumb_func_end ScriptMenu_ShowPokemonPic
thumb_func_start picbox_close thumb_func_start ScriptMenu_GetPicboxWaitFunc
picbox_close: @ 80E29C4 ScriptMenu_GetPicboxWaitFunc: @ 80E29C4
push {lr} push {lr}
ldr r0, =task_picbox ldr r0, =task_picbox
bl FindTaskIdByFunc bl FindTaskIdByFunc
@@ -1449,7 +1449,7 @@ _080E29F4:
_080E29F6: _080E29F6:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end picbox_close thumb_func_end ScriptMenu_GetPicboxWaitFunc
thumb_func_start sub_80E29FC thumb_func_start sub_80E29FC
sub_80E29FC: @ 80E29FC sub_80E29FC: @ 80E29FC
asm/script_movement.s
+6 -6
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start exec_movement thumb_func_start ScriptMovement_StartObjectMovementScript
exec_movement: @ 80D32E8 ScriptMovement_StartObjectMovementScript: @ 80D32E8
push {r4,lr} push {r4,lr}
sub sp, 0x4 sub sp, 0x4
adds r4, r3, 0 adds r4, r3, 0
@@ -47,10 +47,10 @@ _080D3332:
pop {r1} pop {r1}
bx r1 bx r1
.pool .pool
thumb_func_end exec_movement thumb_func_end ScriptMovement_StartObjectMovementScript
thumb_func_start sub_80D3340 thumb_func_start ScriptMovement_IsObjectMovementFinished
sub_80D3340: @ 80D3340 ScriptMovement_IsObjectMovementFinished: @ 80D3340
push {r4,lr} push {r4,lr}
sub sp, 0x4 sub sp, 0x4
lsls r0, 24 lsls r0, 24
@@ -87,7 +87,7 @@ _080D3384:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80D3340 thumb_func_end ScriptMovement_IsObjectMovementFinished
thumb_func_start sub_80D338C thumb_func_start sub_80D338C
sub_80D338C: @ 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 thumb_func_start sub_80F8864
sub_80F8864: @ 80F8864 sub_80F8864: @ 80F8864
push {lr} push {lr}
ldr r0, =gUnknown_02039F2C ldr r0, =gScriptContestCategory
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0x4 cmp r0, 0x4
bhi _080F88A4 bhi _080F88A4
@@ -397,8 +397,8 @@ sub_80F8ACC: @ 80F8ACC
.pool .pool
thumb_func_end sub_80F8ACC thumb_func_end sub_80F8ACC
thumb_func_start sub_80F8ADC thumb_func_start ShowContestWinner
sub_80F8ADC: @ 80F8ADC ShowContestWinner: @ 80F8ADC
push {lr} push {lr}
ldr r0, =sub_812FDEC ldr r0, =sub_812FDEC
bl SetMainCallback2 bl SetMainCallback2
@@ -408,7 +408,7 @@ sub_80F8ADC: @ 80F8ADC
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80F8ADC thumb_func_end ShowContestWinner
thumb_func_start sub_80F8AFC thumb_func_start sub_80F8AFC
sub_80F8AFC: @ 80F8AFC sub_80F8AFC: @ 80F8AFC
@@ -1269,9 +1269,9 @@ _080F922C:
.pool .pool
thumb_func_end sp000_heal_pokemon thumb_func_end sp000_heal_pokemon
thumb_func_start sub_80F9244 thumb_func_start ScriptGiveMon
@ void sub_80F9244(s16 species_num, u8 level, int held_item) @ void ScriptGiveMon(s16 species_num, u8 level, int held_item)
sub_80F9244: @ 80F9244 ScriptGiveMon: @ 80F9244
push {r4-r6,lr} push {r4-r6,lr}
mov r6, r8 mov r6, r8
push {r6} push {r6}
@@ -1332,10 +1332,10 @@ _080F92B8:
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80F9244 thumb_func_end ScriptGiveMon
thumb_func_start sub_80F92C8 thumb_func_start ScriptGiveEgg
sub_80F92C8: @ 80F92C8 ScriptGiveEgg: @ 80F92C8
push {lr} push {lr}
sub sp, 0x68 sub sp, 0x68
adds r1, r0, 0 adds r1, r0, 0
@@ -1357,7 +1357,7 @@ sub_80F92C8: @ 80F92C8
add sp, 0x68 add sp, 0x68
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80F92C8 thumb_func_end ScriptGiveEgg
thumb_func_start sub_80F92F8 thumb_func_start sub_80F92F8
sub_80F92F8: @ 80F92F8 sub_80F92F8: @ 80F92F8
@@ -1450,8 +1450,8 @@ _080F9392:
.pool .pool
thumb_func_end sub_80F9370 thumb_func_end sub_80F9370
thumb_func_start sub_80F93A0 thumb_func_start CreateScriptedWildMon
sub_80F93A0: @ 80F93A0 CreateScriptedWildMon: @ 80F93A0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -1496,10 +1496,10 @@ _080F93EE:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80F93A0 thumb_func_end CreateScriptedWildMon
thumb_func_start sub_80F9400 thumb_func_start ScriptSetMonMoveSlot
sub_80F9400: @ 80F9400 ScriptSetMonMoveSlot: @ 80F9400
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
@@ -1525,7 +1525,7 @@ _080F941C:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80F9400 thumb_func_end ScriptSetMonMoveSlot
thumb_func_start sub_80F9438 thumb_func_start sub_80F9438
sub_80F9438: @ 80F9438 sub_80F9438: @ 80F9438
asm/secret_base.s
+2 -2
View File
@@ -861,7 +861,7 @@ sub_80E916C: @ 80E916C
asrs r0, 24 asrs r0, 24
str r0, [sp] str r0, [sp]
adds r0, r5, 0 adds r0, r5, 0
bl warp1_set bl Overworld_SetWarpDestination
bl warp_in bl warp_in
ldr r1, =gFieldCallback ldr r1, =gFieldCallback
ldr r0, =sub_80E9108 ldr r0, =sub_80E9108
@@ -1208,7 +1208,7 @@ _080E9462:
adds r0, 0xAE adds r0, 0xAE
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl FlagReset bl FlagClear
ldrb r0, [r6] ldrb r0, [r6]
ldr r5, =gSaveBlock1Ptr ldr r5, =gSaveBlock1Ptr
ldr r2, [r5] ldr r2, [r5]
asm/shop.s
+1 -1
View File
@@ -2465,7 +2465,7 @@ BuyMenuSubtractMoney: @ 80E0F88
lsls r2, 6 lsls r2, 6
adds r1, r2 adds r1, r2
ldr r1, [r1] ldr r1, [r1]
bl SubtractMoney bl RemoveMoney
movs r0, 0x5F movs r0, 0x5F
bl PlaySE bl PlaySE
ldr r0, [r5] ldr r0, [r5]
asm/slot_machine.s
+3 -3
View File
@@ -55,8 +55,8 @@ _0812A530:
.pool .pool
thumb_func_end sub_812A4DC thumb_func_end sub_812A4DC
thumb_func_start sub_812A540 thumb_func_start PlaySlotMachine
sub_812A540: @ 812A540 PlaySlotMachine: @ 812A540
push {r4-r6,lr} push {r4-r6,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r6, r1, 0 adds r6, r1, 0
@@ -85,7 +85,7 @@ sub_812A540: @ 812A540
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_812A540 thumb_func_end PlaySlotMachine
thumb_func_start sub_812A588 thumb_func_start sub_812A588
sub_812A588: @ 812A588 sub_812A588: @ 812A588
asm/trainer_rematch.s
+1 -1
View File
@@ -185,7 +185,7 @@ _081DA6D4:
adds r0, r1 adds r0, r1
adds r0, r6 adds r0, r6
ldrh r0, [r0] ldrh r0, [r0]
bl trainer_flag_check bl HasTrainerAlreadyBeenFought
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _081DA6F0 bne _081DA6F0
asm/trainer_see.s
+6 -6
View File
@@ -734,7 +734,7 @@ sub_80B417C: @ 80B417C
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r1, 0 adds r5, r1, 0
adds r4, r2, 0 adds r4, r2, 0
ldr r1, =gFieldEffectSpawnParams ldr r1, =gFieldEffectArguments
adds r2, r1, 0x4 adds r2, r1, 0x4
adds r3, r1, 0 adds r3, r1, 0
adds r3, 0x8 adds r3, 0x8
@@ -1050,7 +1050,7 @@ sub_80B43E0: @ 80B43E0
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B4426 beq _080B4426
ldr r2, =gFieldEffectSpawnParams ldr r2, =gFieldEffectArguments
movs r1, 0x10 movs r1, 0x10
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
str r0, [r2] str r0, [r2]
@@ -1303,7 +1303,7 @@ sub_80B45D0: @ 80B45D0
ldr r1, =gScriptResult ldr r1, =gScriptResult
movs r0, 0x1 movs r0, 0x1
strh r0, [r1] strh r0, [r1]
bl sub_809757C bl UnfreezeMapObjects
ldr r0, =gUnknown_03006090 ldr r0, =gUnknown_03006090
ldrb r0, [r0, 0xC] ldrb r0, [r0, 0xC]
bl sub_80974D0 bl sub_80974D0
@@ -1432,7 +1432,7 @@ sub_80B46D8: @ 80B46D8
orrs r3, r4 orrs r3, r4
mov r4, r12 mov r4, r12
strb r3, [r4] strb r3, [r4]
ldr r4, =gFieldEffectSpawnParams ldr r4, =gFieldEffectArguments
ldr r3, [r4] ldr r3, [r4]
strh r3, [r0, 0x2E] strh r3, [r0, 0x2E]
ldr r3, [r4, 0x4] ldr r3, [r4, 0x4]
@@ -1609,7 +1609,7 @@ sub_80B4808: @ 80B4808
ldrb r1, [r0, 0x5] ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4] ldrb r2, [r0, 0x4]
movs r0, 0xFF movs r0, 0xFF
bl exec_movement bl ScriptMovement_StartObjectMovementScript
b _080B489E b _080B489E
.pool .pool
_080B4870: _080B4870:
@@ -1633,7 +1633,7 @@ _080B4870:
ldrb r1, [r0, 0x5] ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4] ldrb r2, [r0, 0x4]
movs r0, 0xFF movs r0, 0xFF
bl exec_movement bl ScriptMovement_StartObjectMovementScript
_080B489E: _080B489E:
movs r0, 0xFF movs r0, 0xFF
bl sub_809BE48 bl sub_809BE48
data/event_script_command_function_table.inc
+227 -227
View File
@@ -1,229 +1,229 @@
.align 2 .align 2
gScriptCmdTable:: @ 81DB67C gScriptCmdTable:: @ 81DB67C
.4byte s00_nop .4byte ScrCmd_nop
.4byte s01_nop .4byte ScrCmd_nop1
.4byte s02_end .4byte ScrCmd_end
.4byte s03_return .4byte ScrCmd_return
.4byte s04_call .4byte ScrCmd_call
.4byte s05_goto .4byte ScrCmd_goto
.4byte s06_if_jump .4byte ScrCmd_goto_if
.4byte s07_if_call .4byte ScrCmd_call_if
.4byte s08_jumpstd .4byte ScrCmd_gotostd
.4byte s09_callstd .4byte ScrCmd_callstd
.4byte s0A_jumpstd_if .4byte ScrCmd_gotostd_if
.4byte s0B_callstd_if .4byte ScrCmd_callstd_if
.4byte s0C_restore_execution_after_sCF .4byte ScrCmd_gotoram
.4byte s0D_endscript_killram .4byte ScrCmd_killscript
.4byte s0E_set_byte .4byte ScrCmd_setmysteryeventstatus
.4byte s0F_u32_var_to_const .4byte ScrCmd_loadword
.4byte s10_u8_var_to_const .4byte ScrCmd_loadbyte
.4byte s11_u8_ptr_to_const .4byte ScrCmd_writebytetoaddr
.4byte s12_u32_var_to_ptr .4byte ScrCmd_loadbytefromaddr
.4byte s13_u8_var_to_ptr .4byte ScrCmd_setptrbyte
.4byte s14_u32_var_to_var .4byte ScrCmd_copylocal
.4byte s15_u8_ptr_to_ptr .4byte ScrCmd_copybyte
.4byte s16_u16_gvar_to_const .4byte ScrCmd_setvar
.4byte s17_u16_gvar_add_const .4byte ScrCmd_addvar
.4byte sub_809993C .4byte ScrCmd_subvar
.4byte s19_u16_gvar_gvar .4byte ScrCmd_copyvar
.4byte s1A_u16_gvar_gvar .4byte ScrCmd_setorcopyvar
.4byte s1B_cmp_u8_var_var .4byte ScrCmd_compare_local_to_local
.4byte s1C_cmp_u8_var_const .4byte ScrCmd_compare_local_to_value
.4byte s1D_cmp_u8_var_ptr .4byte ScrCmd_compare_local_to_addr
.4byte s1E_cmp_u8_ptr_var .4byte ScrCmd_compare_addr_to_local
.4byte s1F_cmp_u8_ptr_const .4byte ScrCmd_compare_addr_to_value
.4byte s20_cmp_u8_ptr_ptr .4byte ScrCmd_compare_addr_to_addr
.4byte s21_cmp_u16_gvar_const .4byte ScrCmd_compare_var_to_value
.4byte s22_cmp_u16_gvar_gvar .4byte ScrCmd_compare_var_to_var
.4byte s23_execute_ASM .4byte ScrCmd_callnative
.4byte s24_execute_ASM_2 .4byte ScrCmd_gotonative
.4byte s25_extended_cmd .4byte ScrCmd_special
.4byte s26_extended_cmd_setvar .4byte ScrCmd_specialvar
.4byte s27_set_to_waitstate .4byte ScrCmd_waitstate
.4byte s28_pause .4byte ScrCmd_delay
.4byte s29_flag_set .4byte ScrCmd_setflag
.4byte s2A_flag_clear .4byte ScrCmd_clearflag
.4byte s2B_flag_check .4byte ScrCmd_checkflag
.4byte s2C_unknown .4byte ScrCmd_initclock
.4byte s2D_unknown .4byte ScrCmd_dodailyevents
.4byte s2E_unknown .4byte ScrCmd_gettime
.4byte s2F_music_play .4byte ScrCmd_playse
.4byte s30_music_check .4byte ScrCmd_waitse
.4byte s31_PlayFanfare .4byte ScrCmd_playfanfare
.4byte s32_fanfare_wait .4byte ScrCmd_waitfanfare
.4byte s33_play_music .4byte ScrCmd_playbgm
.4byte s34_unknown .4byte ScrCmd_savebgm
.4byte s35_fade_to_default .4byte ScrCmd_fadedefaultbgm
.4byte s36_fade_to_music .4byte ScrCmd_fadenewbgm
.4byte s37_fadeout .4byte ScrCmd_fadeoutbgm
.4byte s38_fadein .4byte ScrCmd_fadeinbgm
.4byte s39_warp_sfx .4byte ScrCmd_warp
.4byte s3A_warp_new_music .4byte ScrCmd_warpsilent
.4byte s3B_warp_keep_music .4byte ScrCmd_warpdoor
.4byte sub_809A054 .4byte ScrCmd_warphole
.4byte s3D_warp_v4 .4byte ScrCmd_warpteleport
.4byte s3E_set_new_map .4byte ScrCmd_setwarp
.4byte s3F_set_new_map_DMA .4byte ScrCmd_setdynamicwarp
.4byte sub_809A2DC .4byte ScrCmd_setdivewarp
.4byte sub_809A35C .4byte ScrCmd_setholewarp
.4byte s42_get_map_camera_pos .4byte ScrCmd_getplayerxy
.4byte s43_get_player_party_count .4byte ScrCmd_countpokemon
.4byte sub_80999A0 .4byte ScrCmd_additem
.4byte sub_80999E4 .4byte ScrCmd_removeitem
.4byte sub_8099A28 .4byte ScrCmd_checkitemspace
.4byte sub_8099A6C .4byte ScrCmd_checkitem
.4byte s48_get_item_type .4byte ScrCmd_checkitemtype
.4byte sub_8099ADC .4byte ScrCmd_addpcitem
.4byte sub_8099B20 .4byte ScrCmd_checkpcitem
.4byte sub_8099B64 .4byte ScrCmd_adddecor
.4byte sub_8099B90 .4byte ScrCmd_removedecor
.4byte sub_8099BE8 .4byte ScrCmd_hasdecor
.4byte sub_8099BBC .4byte ScrCmd_checkdecor
.4byte s4F_execute_movement .4byte ScrCmd_applymovement
.4byte s50_execute_movement_remote .4byte ScrCmd_applymovement_at
.4byte s51_waitmove .4byte ScrCmd_waitmovement
.4byte s52_waitmove_remote .4byte ScrCmd_waitmovement_at
.4byte s53_hide_sprite .4byte ScrCmd_removeobject
.4byte s54_hide_sprite_set_coords .4byte ScrCmd_removeobject_at
.4byte s55_show_sprite .4byte ScrCmd_addobject
.4byte s56_show_sprite_set_coords .4byte ScrCmd_addobject_at
.4byte s57_move_sprites .4byte ScrCmd_setobjectxy
.4byte s58_npc_f1_clear_x20 .4byte ScrCmd_showobject
.4byte s59_npc_f1_set_x20 .4byte ScrCmd_hideobject
.4byte s5A_face_player .4byte ScrCmd_faceplayer
.4byte s5B_npc_set_direction .4byte ScrCmd_turnobject
.4byte s5C_trainer_battle_configure_and_start .4byte ScrCmd_trainerbattle
.4byte sub_809B5E4 .4byte ScrCmd_battlebegin
.4byte sub_809B5F0 .4byte ScrCmd_ontrainerbattleend
.4byte sub_809B604 .4byte ScrCmd_ontrainerbattleendgoto
.4byte s60_check_trainer_flag .4byte ScrCmd_checktrainerflag
.4byte s61_set_trainer_flag .4byte ScrCmd_settrainerflag
.4byte s62_unset_trainer_flag .4byte ScrCmd_cleartrainerflag
.4byte s63_new_sprite_location_permanent .4byte ScrCmd_setobjectxyperm
.4byte s64_set_sprite_top_left_corner .4byte ScrCmd_moveobjectoffscreen
.4byte s65_set_sprite_behaviour .4byte ScrCmd_setobjectmovementtype
.4byte sub_809AC78 .4byte ScrCmd_waitmessage
.4byte s67_execute_box .4byte ScrCmd_message
.4byte s68_close_box .4byte ScrCmd_closemessage
.4byte sub_809AAC4 .4byte ScrCmd_lockall
.4byte sub_809AAEC .4byte ScrCmd_lock
.4byte s6B_release .4byte ScrCmd_releaseall
.4byte s6C_release_2 .4byte ScrCmd_release
.4byte sub_809ACC0 .4byte ScrCmd_waitbutton
.4byte s6E_yes_no .4byte ScrCmd_yesnobox
.4byte s6F_multichoice .4byte ScrCmd_multichoice
.4byte sub_809AD3C .4byte ScrCmd_multichoicedefault
.4byte sub_809AD90 .4byte ScrCmd_multichoicegrid
.4byte sub_809AD8C .4byte ScrCmd_drawbox
.4byte s73_nop_skip_word .4byte ScrCmd_erasebox
.4byte sub_809ADEC .4byte ScrCmd_drawboxtext
.4byte sub_809ADF8 .4byte ScrCmd_drawpokepic
.4byte s76_close_picture_box .4byte ScrCmd_erasepokepic
.4byte sub_809AE48 .4byte ScrCmd_drawcontestwinner
.4byte sub_809AE6C .4byte ScrCmd_braillemessage
.4byte s79_give_pokemon .4byte ScrCmd_givepoke
.4byte s7A_create_egg .4byte ScrCmd_giveegg
.4byte s7B_change_pokedata_AP .4byte ScrCmd_setpokemove
.4byte sub_809B3DC .4byte ScrCmd_checkpokemove
.4byte s7D_load_pokename .4byte ScrCmd_getspeciesname
.4byte s7E_load_first_pokenames .4byte ScrCmd_getfirstpartypokename
.4byte s7F_load_pokename_team .4byte ScrCmd_getpartypokename
.4byte s80_load_item_name .4byte ScrCmd_getitemname
.4byte sub_809B114 .4byte ScrCmd_getdecorname
.4byte s82_load_item_name .4byte ScrCmd_getmovename
.4byte s83_load_textvar_var .4byte ScrCmd_getnumberstring
.4byte s84_load_textvar_std_expression .4byte ScrCmd_getstdstring
.4byte s85_load_textvar_pointer .4byte ScrCmd_getstring
.4byte s86_pokemart .4byte ScrCmd_pokemart
.4byte s87_pokemartdecor .4byte ScrCmd_pokemartdecor
.4byte s88_pokemartbp .4byte ScrCmd_pokemartbp
.4byte s89_open_casino_game1 .4byte ScrCmd_playslotmachine
.4byte berry_script_cmd .4byte ScrCmd_plantberrytree
.4byte sub_809B784 .4byte ScrCmd_choosecontestpkmn
.4byte sub_809B794 .4byte ScrCmd_startcontest
.4byte sub_809B7A4 .4byte ScrCmd_showcontestresults
.4byte sub_809B7B4 .4byte ScrCmd_contestlinktransfer
.4byte s8F_get_random_val .4byte ScrCmd_random
.4byte s90_AddMoney .4byte ScrCmd_givemoney
.4byte s91_SubtractMoney .4byte ScrCmd_takemoney
.4byte s92_check_money .4byte ScrCmd_checkmoney
.4byte s93_display_money .4byte ScrCmd_showmoneybox
.4byte s94_hide_money .4byte ScrCmd_hidemoneybox
.4byte s95_update_money .4byte ScrCmd_updatemoneybox
.4byte sub_809B758 .4byte ScrCmd_getpricereduction
.4byte s97_screen_special_effect .4byte ScrCmd_fadescreen
.4byte s98_refade_with_timer .4byte ScrCmd_fadescreendelay
.4byte s99_unknown .4byte ScrCmd_setdarklevel
.4byte s9A_unknown .4byte ScrCmd_animdarklevel
.4byte s9B_unknown .4byte ScrCmd_messageautoscroll
.4byte s9C_execute_HM .4byte ScrCmd_dofieldeffect
.4byte s9D_set_HM_animation_data .4byte ScrCmd_setfieldeffect
.4byte s9E_checkarray_HM_animation .4byte ScrCmd_waitfieldeffect
.4byte s9F_changeposition_fly .4byte ScrCmd_sethealplace
.4byte sA0_check_gender .4byte ScrCmd_checkplayergender
.4byte sA1_play_cry .4byte ScrCmd_playpokecry
.4byte sA2_setmaptile .4byte ScrCmd_setmaptile
.4byte sA3_set_standard_weather_data .4byte ScrCmd_resetweather
.4byte sA4_set_weather_data .4byte ScrCmd_setweather
.4byte sub_8099E7C .4byte ScrCmd_doweather
.4byte sA6_activate_per_step_callback_eg_ash .4byte ScrCmd_tileeffect
.4byte sA7_set_new_map_footer .4byte ScrCmd_setmaplayoutindex
.4byte sA8_unknown .4byte ScrCmd_setobjectpriority
.4byte sA9_unknown .4byte ScrCmd_resetobjectpriority
.4byte sAA_create_new_sprite .4byte ScrCmd_createvobject
.4byte sAB_unknown .4byte ScrCmd_turnvobject
.4byte sAC_open_door .4byte ScrCmd_opendoor
.4byte sub_809B9C8 .4byte ScrCmd_closedoor
.4byte sub_809BA24 .4byte ScrCmd_waitdooranim
.4byte sub_809BA38 .4byte ScrCmd_setdooropen
.4byte sub_809BA7C .4byte ScrCmd_setdoorclosed
.4byte sub_809BAC0 .4byte ScrCmd_addelevmenuitem
.4byte sub_809BAFC .4byte ScrCmd_showelevmenu
.4byte sB3_get_coin_amount .4byte ScrCmd_checkcoins
.4byte sub_809BB20 .4byte ScrCmd_givecoins
.4byte sub_809BB58 .4byte ScrCmd_takecoins
.4byte sB6_load_battle .4byte ScrCmd_setwildbattle
.4byte sub_809B6A8 .4byte ScrCmd_dowildbattle
.4byte sB8_set_virtual_address .4byte ScrCmd_setvaddress
.4byte sB9_virtual_jump .4byte ScrCmd_vgoto
.4byte sBA_virtual_call .4byte ScrCmd_vcall
.4byte sBB_virtual_if_jump .4byte ScrCmd_vgoto_if
.4byte sBC_virtual_if_call .4byte ScrCmd_vcall_if
.4byte sBD_virtual_message .4byte ScrCmd_vmessage
.4byte sBE_virtual_load_text .4byte ScrCmd_vloadword
.4byte sBF_virtual_load_textbuffer .4byte ScrCmd_vgetstring
.4byte sub_809B578 .4byte ScrCmd_showcoinsbox
.4byte sC1_hide_coins .4byte ScrCmd_hidecoinsbox
.4byte sC2_update_coins .4byte ScrCmd_updatecoinsbox
.4byte sC3_unknown .4byte ScrCmd_incrementgamestat
.4byte sC4_unknown .4byte ScrCmd_setescapewarp
.4byte sub_809B8DC .4byte ScrCmd_waitpokecry
.4byte sC6_load_textvar_box_label .4byte ScrCmd_getboxname
.4byte s01_nop .4byte ScrCmd_nop1
.4byte s01_nop .4byte ScrCmd_nop1
.4byte s01_nop .4byte ScrCmd_nop1
.4byte s01_nop .4byte ScrCmd_nop1
.4byte s01_nop .4byte ScrCmd_nop1
.4byte s01_nop .4byte ScrCmd_nop1
.4byte sCD_set_obedient_bit .4byte ScrCmd_setpokeobedient
.4byte sCE_check_obedient_bit .4byte ScrCmd_checkpokeobedience
.4byte sCF_execute_RAM_script_DMA .4byte ScrCmd_cmdCF
.4byte s01_nop .4byte ScrCmd_nop1
.4byte sD1_warp_v5 .4byte ScrCmd_warpD1
.4byte sub_809BD70 .4byte ScrCmd_setpokemetlocation
.4byte sub_809BB90 .4byte ScrCmd_mossdeepgym1
.4byte sub_809BBB4 .4byte ScrCmd_mossdeepgym2
.4byte ScrCmd_MossdeepGymSwitch .4byte ScrCmd_mossdeepgym3
.4byte sub_809BBDC .4byte ScrCmd_mossdeepgym4
.4byte sub_809A150 .4byte ScrCmd_warpD7
.4byte sub_809BBE8 .4byte ScrCmd_cmdD8
.4byte sub_809BBFC .4byte ScrCmd_cmdD9
.4byte sub_809AF94 .4byte ScrCmd_cmdDA
.4byte sub_809AC3C .4byte ScrCmd_cmdDB
.4byte sub_8099D20 .4byte ScrCmd_fadescreenswapbuffers
.4byte sub_809BDD0 .4byte ScrCmd_gettrainerclass
.4byte sub_809BE0C .4byte ScrCmd_gettrainername
.4byte sub_809ABF0 .4byte ScrCmd_pokenavcall
.4byte sub_809BE54 .4byte ScrCmd_warpE0
.4byte sub_809B214 .4byte ScrCmd_getcontesttype
.4byte sub_809B0C4 .4byte ScrCmd_getitemnameplural
data/event_scripts.s
+3 -3
View File
@@ -12,13 +12,13 @@ gScriptCmdTableEnd:: @ 81DBA08
gSpecialVars:: @ 81DBA0C gSpecialVars:: @ 81DBA0C
.incbin "baserom.gba", 0x1dba0c, 0x58 .incbin "baserom.gba", 0x1dba0c, 0x58
gUnknown_081DBA64:: @ 81DBA64 gSpecials:: @ 81DBA64
.incbin "baserom.gba", 0x1dba64, 0x83c .incbin "baserom.gba", 0x1dba64, 0x83c
gUnknown_081DC2A0:: @ 81DC2A0 gStdScripts:: @ 81DC2A0
.incbin "baserom.gba", 0x1dc2a0, 0x2c .incbin "baserom.gba", 0x1dc2a0, 0x2c
gUnknown_081DC2CC:: @ 81DC2CC gStdScripts_End:: @ 81DC2CC
.incbin "baserom.gba", 0x1dc2cc, 0x34ee .incbin "baserom.gba", 0x1dc2cc, 0x34ee
gUnknown_081DF7BA:: @ 81DF7BA gUnknown_081DF7BA:: @ 81DF7BA
data/scrcmd.s
-14
View File
@@ -1,14 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
gNullScriptPtr:: @ 85102BC
.incbin "baserom.gba", 0x5102bc, 0x4
gUnknown_085102C0:: @ 85102C0
.incbin "baserom.gba", 0x5102c0, 0x14
gUnknown_085102D4:: @ 85102D4
.incbin "baserom.gba", 0x5102d4, 0xc
include/battle_frontier_2.h
+9
View File
@@ -0,0 +1,9 @@
#ifndef GUARD_BATTLE_FRONTIER_2_H
#define GUARD_BATTLE_FRONTIER_2_H
void sub_81A8934(u8);
void sub_81A895C(void);
u16 sub_81A89A0(u8);
void sub_81A8AF8(void);
#endif // GUARD_BATTLE_FRONTIER_2_H
include/battle_setup.h
+9
View File
@@ -1,6 +1,15 @@
#ifndef GUARD_BATTLE_SETUP_H #ifndef GUARD_BATTLE_SETUP_H
#define GUARD_BATTLE_SETUP_H #define GUARD_BATTLE_SETUP_H
void BattleSetup_StartScriptedWildBattle(void);
u8 BattleSetup_GetTerrainId(void); u8 BattleSetup_GetTerrainId(void);
u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data);
u8 HasTrainerAlreadyBeenFought(u16);
void trainer_flag_set(u16);
void trainer_flag_clear(u16);
void BattleSetup_StartTrainerBattle(void);
u8 *BattleSetup_GetScriptAddrAfterBattle(void);
u8 *BattleSetup_GetTrainerPostBattleScript(void);
#endif // GUARD_BATTLE_SETUP_H #endif // GUARD_BATTLE_SETUP_H
include/clock.h
+8
View File
@@ -0,0 +1,8 @@
#ifndef GUARD_CLOCK_H
#define GUARD_CLOCK_H
// TODO: time of day and seconds in a day defines
void DoTimeBasedEvents(void);
#endif
include/coins.h
+2 -2
View File
@@ -6,7 +6,7 @@ void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y);
void HideCoinsWindow(void); void HideCoinsWindow(void);
u16 GetCoins(void); u16 GetCoins(void);
void SetCoins(u16 coinAmount); void SetCoins(u16 coinAmount);
bool8 AddCoins(u16 toAdd); bool8 GiveCoins(u16 toAdd);
bool8 SubtractCoins(u16 toSub); bool8 TakeCoins(u16 toSub);
#endif // GUARD_COINS_H #endif // GUARD_COINS_H
include/contest.h
+1 -1
View File
@@ -11,7 +11,7 @@ struct ContestStruct_02039E00 {
extern struct ContestStruct_02039E00 gUnknown_02039E00[4]; extern struct ContestStruct_02039E00 gUnknown_02039E00[4];
extern u8 gUnknown_02039F24; extern u8 gUnknown_02039F24;
extern EWRAM_DATA u16 gUnknown_02039F2C; extern EWRAM_DATA u16 gScriptContestCategory;
extern EWRAM_DATA u8 gUnknown_02039F2E; extern EWRAM_DATA u8 gUnknown_02039F2E;
extern EWRAM_DATA u8 gUnknown_02039F30; extern EWRAM_DATA u8 gUnknown_02039F30;
include/contest_link_80F57C4.h
+8
View File
@@ -0,0 +1,8 @@
#ifndef GUARD_CONTEST_LINK_80F57C4_H
#define GUARD_CONTEST_LINK_80F57C4_H
void sub_80F840C(void);
void sub_80F8484(void);
void sub_80F84C4(u8);
#endif // GUARD_CONTEST_LINK_80F57C4_H
include/contest_painting.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_CONTESTPAINTING_H
#define GUARD_CONTESTPAINTING_H
void sub_812FDA8(u32);
#endif
include/data2.h
+19
View File
@@ -0,0 +1,19 @@
#ifndef GUARD_DATA2_H
#define GUARD_DATA2_H
struct MonCoords
{
// This would use a bitfield, but some function
// uses it as a u8 and casting won't match.
u8 coords; // u8 x:4, y:4;
u8 y_offset;
};
extern struct MonCoords gTrainerBackPicCoords[];
extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
extern const u8 gMoveNames[][13];
extern const u8 gAbilityNames[][13];
extern const u8 gTypeNames[][7];
#endif // GUARD_DATA2_H
include/decoration.h
-5
View File
@@ -125,8 +125,6 @@ enum DecoId {
/*120*/ DECOR_REGISTEEL_DOLL /*120*/ DECOR_REGISTEEL_DOLL
}; };
// Exported type declarations
struct Decoration struct Decoration
{ {
/*0x00*/ u8 id; /*0x00*/ u8 id;
@@ -139,9 +137,6 @@ struct Decoration
/*0x1c*/ const u16 *tiles; /*0x1c*/ const u16 *tiles;
}; };
// Exported RAM declarations
// Exported ROM declarations
extern const struct Decoration gDecorations[]; extern const struct Decoration gDecorations[];
#endif //GUARD_DECORATION_H #endif //GUARD_DECORATION_H
include/decoration_inventory.h
+10
View File
@@ -0,0 +1,10 @@
#ifndef GUARD_DECORATION_INVENTORY_H
#define GUARD_DECORATION_INVENTORY_H
void ClearDecorationInventories(void);
u8 CheckHasDecoration(u8);
u8 DecorationAdd(u8);
u8 DecorationCheckSpace(u8);
s8 DecorationRemove(u8);
#endif // GUARD_DECORATION_INVENTORY_H
include/event_data.h
+1 -1
View File
@@ -27,7 +27,7 @@ bool8 VarSet(u16 id, u16 value);
u8 VarGetFieldObjectGraphicsId(u8 id); u8 VarGetFieldObjectGraphicsId(u8 id);
u8 *GetFlagPointer(u16 id); u8 *GetFlagPointer(u16 id);
u8 FlagSet(u16 id); u8 FlagSet(u16 id);
u8 FlagReset(u16 id); u8 FlagClear(u16 id);
bool8 FlagGet(u16 id); bool8 FlagGet(u16 id);
extern u16 gSpecialVar_0x8000; extern u16 gSpecialVar_0x8000;
include/field_door.h
+11
View File
@@ -0,0 +1,11 @@
#ifndef GUARD_FIELDDOOR_H
#define GUARD_FIELDDOOR_H
void FieldSetDoorOpened(u32, u32);
void FieldSetDoorClosed(u32, u32);
s8 FieldAnimateDoorClose(u32, u32);
s8 FieldAnimateDoorOpen(u32, u32);
bool8 FieldIsDoorAnimationRunning(void);
u32 GetDoorSoundEffect(u32 x, u32 y);
#endif
include/field_effect.h
+3 -6
View File
@@ -1,7 +1,3 @@
//
// Created by Scott Norton on 9/15/17.
//
#ifndef GUARD_FIELD_EFFECTS_H #ifndef GUARD_FIELD_EFFECTS_H
#define GUARD_FIELD_EFFECTS_H #define GUARD_FIELD_EFFECTS_H
@@ -73,8 +69,9 @@ enum FieldEffectScriptIdx
FLDEFF_USE_TELEPORT FLDEFF_USE_TELEPORT
}; };
extern u32 gFieldEffectSpawnParams[8];
u8 FieldEffectStart(u8); u8 FieldEffectStart(u8);
bool8 FieldEffectActiveListContains(u8 id);
extern u32 gFieldEffectArguments[8];
#endif //GUARD_FIELD_EFFECTS_H #endif //GUARD_FIELD_EFFECTS_H
include/field_fadetransition.h
+12
View File
@@ -0,0 +1,12 @@
#ifndef GUARD_FIELD_FADETRANSITION_H
#define GUARD_FIELD_FADETRANSITION_H
void sub_80AF734(void);
void sp13E_warp_to_last_warp(void);
void sub_80AF7D0(void);
void sp13F_fall_to_last_warp(void);
void sub_80AF848(void);
void sub_80AF87C(void);
#endif // GUARD_FIELD_FADETRANSITION_H
include/field_map_obj.h
+3
View File
@@ -33,6 +33,7 @@ u8 sub_808D4F4(void);
void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8); void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8);
void npc_load_two_palettes__no_record(u16, u8); void npc_load_two_palettes__no_record(u16, u8);
void npc_load_two_palettes__and_record(u16, u8); void npc_load_two_palettes__and_record(u16, u8);
void sub_808EBA8(u8, u8, u8, s16, s16);
void pal_patch_for_npc(u16, u8); void pal_patch_for_npc(u16, u8);
void sub_808E16C(s16, s16); void sub_808E16C(s16, s16);
void sub_8092FF0(s16, s16, s16 *, s16 *); void sub_8092FF0(s16, s16, s16 *, s16 *);
@@ -63,6 +64,7 @@ void npc_coords_shift(struct MapObject *, s16, s16);
void sub_808EB08(struct MapObject *, s16, s16); void sub_808EB08(struct MapObject *, s16, s16);
void sub_808F254(u8, u8, u8); void sub_808F254(u8, u8, u8);
void FieldObjectStep(struct MapObject *, struct Sprite *, bool8(struct MapObject *, struct Sprite *)); void FieldObjectStep(struct MapObject *, struct Sprite *, bool8(struct MapObject *, struct Sprite *));
u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8);
u8 GetOppositeDirection(u8); u8 GetOppositeDirection(u8);
u8 GetStepInPlaceDelay4AnimId(u32); u8 GetStepInPlaceDelay4AnimId(u32);
u8 GetStepInPlaceDelay8AnimId(u32); u8 GetStepInPlaceDelay8AnimId(u32);
@@ -71,6 +73,7 @@ u8 GetStepInPlaceDelay32AnimId(u32);
u8 npc_block_way(struct MapObject *, s16, s16, u32); u8 npc_block_way(struct MapObject *, s16, s16, u32);
void MoveCoords(u8, s16 *, s16 *); void MoveCoords(u8, s16 *, s16 *);
bool8 FieldObjectIsSpecialAnimActive(struct MapObject *); bool8 FieldObjectIsSpecialAnimActive(struct MapObject *);
u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *);
// Exported data declarations // Exported data declarations
include/field_map_obj_helpers.h
+7
View File
@@ -0,0 +1,7 @@
#ifndef GUARD_FIELDMAPOBJHELP_H
#define GUARD_FIELDMAPOBJHELP_H
void UnfreezeMapObjects(void);
void sub_8097B78(u8, u8);
#endif
include/field_message_box.h
+8 -10
View File
@@ -1,12 +1,10 @@
#ifndef GUARD_field_message_box_H #ifndef GUARD_FIELD_MESSAGE_BOX_H
#define GUARD_field_message_box_H #define GUARD_FIELD_MESSAGE_BOX_H
// Exported type declarations bool8 ShowFieldMessage(const u8 *message);
bool8 sub_8098238(const u8 *message);
bool8 ShowFieldAutoScrollMessage(const u8 *message);
void HideFieldMessageBox(void);
bool8 IsFieldMessageBoxHidden(void);
// Exported RAM declarations #endif // GUARD_FIELD_MESSAGE_BOX_H
// Exported ROM declarations
void ShowFieldMessage(const u8 *);
#endif //GUARD_field_message_box_H
include/field_player_avatar.h
+2 -4
View File
@@ -1,7 +1,3 @@
//
// Created by Scott Norton on 9/6/17.
//
#ifndef GUARD_FIELD_PLAYER_AVATAR_H #ifndef GUARD_FIELD_PLAYER_AVATAR_H
#define GUARD_FIELD_PLAYER_AVATAR_H #define GUARD_FIELD_PLAYER_AVATAR_H
@@ -14,4 +10,6 @@ u8 player_get_direction_lower_nybble(void);
u8 player_get_direction_upper_nybble(void); u8 player_get_direction_upper_nybble(void);
u8 player_get_x22(void); u8 player_get_x22(void);
void sub_808D074(u8);
#endif //GUARD_FIELD_PLAYER_AVATAR_H #endif //GUARD_FIELD_PLAYER_AVATAR_H
include/field_screen_effect.h
+8
View File
@@ -0,0 +1,8 @@
#ifndef GUARD_FIELD_SCREEN_EFFECT_H
#define GUARD_FIELD_SCREEN_EFFECT_H
void sub_80AF79C(void);
void sub_80B009C(u8);
void sub_80B0244(void);
#endif // GUARD_FIELD_SCREEN_EFFECT_H
include/field_specials.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_FIELD_SPECIALS_H
#define GUARD_FIELD_SPECIALS_H
u8 GetLeadMonIndex(void);
#endif // GUARD_FIELD_SPECIALS_H
include/field_tasks.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_FIELD_TASKS_H
#define GUARD_FIELD_TASKS_H
void ActivatePerStepCallback(u8);
#endif // GUARD_FIELD_TASKS_H
include/field_weather.h
+12
View File
@@ -0,0 +1,12 @@
#ifndef GUARD_WEATHER_H
#define GUARD_WEATHER_H
void fade_screen(u8, s8);
void SetSav1Weather(u32);
u8 GetSav1Weather(void);
void sub_80AEDBC(void);
void DoCurrentWeather(void);
#endif // GUARD_WEATHER_H
include/fieldmap.h
-8
View File
@@ -1,19 +1,11 @@
//
// Created by scott on 9/16/2017.
//
#ifndef GUARD_FIELDMAP_H #ifndef GUARD_FIELDMAP_H
#define GUARD_FIELDMAP_H #define GUARD_FIELDMAP_H
// Exported type declarations
// Exported RAM declarations
extern struct MapCoords { extern struct MapCoords {
int width; int width;
int height; int height;
} gUnknown_03005DC0; } gUnknown_03005DC0;
// Exported ROM declarations
u32 MapGridGetMetatileBehaviorAt(int, int); u32 MapGridGetMetatileBehaviorAt(int, int);
void MapGridSetMetatileIdAt(int, int, u16); void MapGridSetMetatileIdAt(int, int, u16);
void GetCameraCoords(u16*, u16*); void GetCameraCoords(u16*, u16*);
include/item.h
+1
View File
@@ -31,6 +31,7 @@ extern struct BagPocket gBagPockets[];
void GetBerryCountString(u8* dst, const u8* berryName, u32 quantity); void GetBerryCountString(u8* dst, const u8* berryName, u32 quantity);
void CopyItemName(u16 itemId, u8 *string); void CopyItemName(u16 itemId, u8 *string);
void CopyItemNameHandlePlural(u16 itemId, u8 *string, u32 quantity);
bool8 IsBagPocketNonEmpty(u8 pocket); bool8 IsBagPocketNonEmpty(u8 pocket);
bool8 CheckBagHasItem(u16 itemId, u16 count); bool8 CheckBagHasItem(u16 itemId, u16 count);
bool8 CheckBagHasSpace(u16 itemId, u16 count); bool8 CheckBagHasSpace(u16 itemId, u16 count);
include/map_obj_lock.h
+11
View File
@@ -0,0 +1,11 @@
#ifndef GUARD_MAP_OBJ_LOCK_H
#define GUARD_MAP_OBJ_LOCK_H
bool8 sub_80983C4(void);
void ScriptFreezeMapObjects(void);
bool8 sub_809847C(void);
void LockSelectedMapObject(void);
void sub_8098630(void);
bool8 sub_8098734(void);
#endif // GUARD_MAP_OBJ_LOCK_H
include/menu.h
+1
View File
@@ -19,5 +19,6 @@ void box_print(u8, u8, u8, u8, const void *, s8, const u8 *);
void sub_8198070(u8 windowId, bool8 copyToVram); void sub_8198070(u8 windowId, bool8 copyToVram);
void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock); void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock);
void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 tileStart, u8 palette); void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 tileStart, u8 palette);
void sub_8198A50(struct WindowTemplate*, u8, u8, u8, u8, u8, u8, u16); // returns something but it isn't used, fix when menu.s is decomp'd
#endif // GUARD_MENU_H #endif // GUARD_MENU_H
include/money.h
+1 -1
View File
@@ -5,7 +5,7 @@ u32 GetMoney(u32* moneyPtr);
void SetMoney(u32* moneyPtr, u32 newValue); void SetMoney(u32* moneyPtr, u32 newValue);
bool8 IsEnoughMoney(u32* moneyPtr, u32 cost); bool8 IsEnoughMoney(u32* moneyPtr, u32 cost);
void AddMoney(u32* moneyPtr, u32 toAdd); void AddMoney(u32* moneyPtr, u32 toAdd);
void SubtractMoney(u32* moneyPtr, u32 toSub); void RemoveMoney(u32* moneyPtr, u32 toSub);
bool8 IsEnoughForCostInVar0x8005(void); bool8 IsEnoughForCostInVar0x8005(void);
void SubtractMoneyFromVar0x8005(void); void SubtractMoneyFromVar0x8005(void);
void PrintMoneyAmountInMoneyBox(u8 windowId, int amount, u8 speed); void PrintMoneyAmountInMoneyBox(u8 windowId, int amount, u8 speed);
include/mystery_event_script.h
+8
View File
@@ -0,0 +1,8 @@
#ifndef GUARD_MYSTERY_EVENT_SCRIPT_H
#define GUARD_MYSTERY_EVENT_SCRIPT_H
u32 RunMysteryEventScript(u8 *);
void SetMysteryEventScriptStatus(u32 val);
u16 GetRecordMixingGift(void);
#endif // GUARD_MYSTERY_EVENT_SCRIPT_H
include/new_menu_helpers.h
+9
View File
@@ -0,0 +1,9 @@
#ifndef GUARD_NEW_MENU_HELPERS_H
#define GUARD_NEW_MENU_HELPERS_H
void sub_81973A4(void);
void sub_81973C4(u8, u8);
void sub_819746C(u8 windowId, bool8 copyToVram);
void sub_81973FC(u8, u8);
#endif // GUARD_NEW_MENU_HELPERS_H
include/overworld.h
+58
View File
@@ -0,0 +1,58 @@
#ifndef GUARD_ROM4_H
#define GUARD_ROM4_H
struct UnkPlayerStruct
{
u8 player_field_0;
u8 player_field_1;
};
struct LinkPlayerMapObject
{
u8 active;
u8 linkPlayerId;
u8 mapObjId;
u8 mode;
};
struct UCoords32
{
u32 x, y;
};
extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
void IncrementGameStat(u8 index);
void Overworld_SetMapObjTemplateCoords(u8, s16, s16);
void Overworld_SetMapObjTemplateMovementType(u8, u8);
void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
void saved_warp2_set_2(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
void Overworld_SetHealLocationWarp(u8);
void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
void sub_8084E2C(s8, s8, s8, s8, s8);
void sub_8084E80(s8, s8, s8, s8, s8);
void sub_8084EBC(s16, s16);
void player_avatar_init_params_reset(void);
void Overworld_SetFlashLevel(s32 a1);
//u8 Overworld_GetFlashLevel(void);
void sub_8085524(u16);
void Overworld_SetSavedMusic(u16);
void Overworld_ChangeMusicToDefault(void);
void Overworld_ChangeMusicTo(u16);
bool32 is_c1_link_related_active(void);
void strange_npc_table_clear(void);
const struct MapHeader *get_mapheader_by_bank_and_number(u8, u8);
void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *);
void sub_8086230(void);
void c2_exit_to_overworld_2_switch(void);
void c2_exit_to_overworld_1_continue_scripts_restart_music(void);
#endif //GUARD_ROM4_H
include/palette.h
+3
View File
@@ -8,6 +8,9 @@
#define gPaletteFade_delay (gPaletteFade.multipurpose2) // normal and hardware fade #define gPaletteFade_delay (gPaletteFade.multipurpose2) // normal and hardware fade
#define gPaletteFade_submode (gPaletteFade.multipurpose2) // fast fade #define gPaletteFade_submode (gPaletteFade.multipurpose2) // fast fade
#define PLTT_BUFFER_SIZE 0x200
#define PLTT_DECOMP_BUFFER_SIZE (PLTT_BUFFER_SIZE * 2)
enum enum
{ {
FAST_FADE_IN_FROM_WHITE, FAST_FADE_IN_FROM_WHITE,
include/party_menu.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_PARTY_MENU_H
#define GUARD_PARTY_MENU_H
bool8 pokemon_has_move(struct Pokemon *, u16);
#endif // GUARD_PARTY_MENU_H
include/pokemon_3.h
+7
View File
@@ -0,0 +1,7 @@
#ifndef GUARD_POKEMON_3_H
#define GUARD_POKEMON_3_H
const u8* GetTrainerClassNameFromId(u16 trainerId);
const u8* GetTrainerNameFromId(u16 trainerId);
#endif // GUARD_POKEMON_3_H
include/rom4.h
-34
View File
@@ -1,34 +0,0 @@
#ifndef GUARD_ROM4_H
#define GUARD_ROM4_H
struct UnkPlayerStruct
{
u8 player_field_0;
u8 player_field_1;
};
struct LinkPlayerMapObject
{
u8 active;
u8 linkPlayerId;
u8 mapObjId;
u8 mode;
};
struct UCoords32
{
u32 x, y;
};
extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
void strange_npc_table_clear(void);
const struct MapHeader *get_mapheader_by_bank_and_number(u8, u8);
void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *);
void sub_8086230(void);
void c2_exit_to_overworld_2_switch(void);
void c2_exit_to_overworld_1_continue_scripts_restart_music(void);
#endif //GUARD_ROM4_H
include/rom6.h
+1 -1
View File
@@ -2,6 +2,6 @@
#define GUARD_ROM6_H #define GUARD_ROM6_H
void sub_81357FC(u8, void(void)); void sub_81357FC(u8, void(void));
u8 GetIdxOfFirstPartyMemberThatIsNotAnEgg(void); u8 GetLeadMonIndex(void);
#endif //GUARD_ROM6_H #endif //GUARD_ROM6_H
include/script.h
+2 -2
View File
@@ -28,8 +28,8 @@ void StopScript(struct ScriptContext *ctx);
bool8 RunScriptCommand(struct ScriptContext *ctx); bool8 RunScriptCommand(struct ScriptContext *ctx);
u8 ScriptPush(struct ScriptContext *ctx, const u8 *ptr); u8 ScriptPush(struct ScriptContext *ctx, const u8 *ptr);
const u8 *ScriptPop(struct ScriptContext *ctx); const u8 *ScriptPop(struct ScriptContext *ctx);
void ScriptJump(struct ScriptContext *ctx, u8 *ptr); void ScriptJump(struct ScriptContext *ctx, const u8 *ptr);
void ScriptCall(struct ScriptContext *ctx, u8 *ptr); void ScriptCall(struct ScriptContext *ctx, const u8 *ptr);
void ScriptReturn(struct ScriptContext *ctx); void ScriptReturn(struct ScriptContext *ctx);
u16 ScriptReadHalfword(struct ScriptContext *ctx); u16 ScriptReadHalfword(struct ScriptContext *ctx);
u32 ScriptReadWord(struct ScriptContext *ctx); u32 ScriptReadWord(struct ScriptContext *ctx);
include/script_menu.h
+7 -5
View File
@@ -1,11 +1,13 @@
#ifndef GUARD_SCRIPT_MENU_H #ifndef GUARD_SCRIPT_MENU_H
#define GUARD_SCRIPT_MENU_H #define GUARD_SCRIPT_MENU_H
// Exported type declarations
// Exported RAM declarations
// Exported ROM declarations
extern const u8 *const gUnknown_0858BAF0[9]; extern const u8 *const gUnknown_0858BAF0[9];
bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 var3, u8 var4);
bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 var5);
bool8 ScriptMenu_YesNo(u8 var1, u8 var2);
bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3);
bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
#endif //GUARD_SCRIPT_MENU_H #endif //GUARD_SCRIPT_MENU_H
include/script_movement.h
+8
View File
@@ -0,0 +1,8 @@
#ifndef GUARD_SCRIPT_MOVEMENT_H
#define GUARD_SCRIPT_MOVEMENT_H
bool8 ScriptMovement_StartObjectMovementScript(u8, u8, u8, const u8 *);
bool8 ScriptMovement_IsObjectMovementFinished(u8, u8, u8);
void sub_80D338C(void);
#endif // GUARD_SCRIPT_MOVEMENT_H
include/script_pokemon_80F8.h
+10
View File
@@ -0,0 +1,10 @@
#ifndef GUARD_SCRIPTPOKE80F8_H
#define GUARD_SCRIPTPOKE80F8_H
void ShowContestWinner(void);
u8 ScriptGiveMon(u16, u8, u16, u32, u32, u8);
u8 ScriptGiveEgg(u16);
void CreateScriptedWildMon(u16, u8, u16);
void ScriptSetMonMoveSlot(u8, u16, u8);
#endif
include/script_pokemon_81B9.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_SCRIPTPOKE81B9_H
#define GUARD_SCRIPTPOKE81B9_H
void sub_81B9404(void);
#endif
include/shop.h
+4 -6
View File
@@ -1,12 +1,10 @@
#ifndef GUARD_SHOP_H #ifndef GUARD_SHOP_H
#define GUARD_SHOP_H #define GUARD_SHOP_H
// Exported type declarations
// Exported RAM declarations
extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3]; extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3];
// Exported ROM declarations void CreatePokemartMenu(const u16 *);
void CreateDecorationShop1Menu(const u16 *);
void CreateDecorationShop2Menu(const u16 *);
#endif //GUARD_SHOP_H #endif // GUARD_SHOP_H
include/slot_machine.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_SLOT_MACHINE_H
#define GUARD_SLOT_MACHINE_H
void PlaySlotMachine(u8, void *);
#endif // GUARD_SLOT_MACHINE_H
include/text.h
+2 -1
View File
@@ -170,6 +170,7 @@ typedef struct {
u8 flag_0:1; u8 flag_0:1;
u8 flag_1:1; u8 flag_1:1;
u8 flag_2:1; u8 flag_2:1;
u8 flag_3:1;
} TextFlags; } TextFlags;
extern TextFlags gTextFlags; extern TextFlags gTextFlags;
@@ -195,7 +196,7 @@ u8 gGlyphDimensions[0x2];
void SetFontsPointer(const struct FontInfo *fonts); void SetFontsPointer(const struct FontInfo *fonts);
void DeactivateAllTextPrinters(void); void DeactivateAllTextPrinters(void);
u16 PrintTextOnWindow(u8 windowId, u8 fontId, u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16)); u16 PrintTextOnWindow(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*callback)(struct TextSubPrinter *, u16)); bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
void RunTextPrinters(void); void RunTextPrinters(void);
bool16 IsTextPrinterActive(u8 id); bool16 IsTextPrinterActive(u8 id);

Some files were not shown because too many files have changed in this diff Show More