ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

split and label

Browse Source
This commit is contained in:
DizzyEggg 2017-09-04 12:22:04 +02:00
parent 7ea0d462c4
commit 75a94ce58e
41 changed files with 28907 additions and 28877 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/battle_anim.s
View File

@ -3978,7 +3978,7 @@ ma2B_make_side_invisible: @ 80A5A80
ldr r4, =gBattleAnimScriptPtr
ldr r0, [r4]
ldrb r0, [r0, 0x1]
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@ -4009,7 +4009,7 @@ ma2C_make_side_visible: @ 80A5ABC
ldr r4, =gBattleAnimScriptPtr
ldr r0, [r4]
ldrb r0, [r0, 0x1]
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@ -4078,7 +4078,7 @@ _080A5B54:
lsrs r4, r0, 24
movs r0, 0x1
_080A5B60:
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@ -4160,7 +4160,7 @@ _080A5C04:
lsrs r4, r0, 24
movs r0, 0x1
_080A5C10:
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF

328
asm/battle_anim_80FE840.s
View File

File diff suppressed because it is too large Load Diff

4
asm/battle_controller_linkopponent.s
View File

@ -4573,7 +4573,7 @@ sub_8066B94: @ 8066B94
lsls r0, 2
adds r0, r5
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@ -5705,7 +5705,7 @@ sub_8067508: @ 8067508
lsls r0, 2
adds r0, r4
ldr r1, =sub_80676FC
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r0, =c3_08038DC4
movs r1, 0x5
bl CreateTask

4
asm/battle_controller_linkpartner.s
View File

@ -3854,7 +3854,7 @@ sub_814D0F0: @ 814D0F0
lsls r0, 2
adds r0, r5
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@ -5022,7 +5022,7 @@ sub_814DAA8: @ 814DAA8
lsls r0, 2
adds r0, r4
ldr r1, =sub_805CC00
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]

4
asm/battle_controller_opponent.s
View File

@ -4725,7 +4725,7 @@ sub_8061AF0: @ 8061AF0
lsls r0, 2
adds r0, r5
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@ -6155,7 +6155,7 @@ sub_80626FC: @ 80626FC
lsls r0, 2
adds r0, r4
ldr r1, =sub_806280C
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r0, =sub_8062828
movs r1, 0x5
bl CreateTask

4
asm/battle_controller_player.s
View File

@ -7865,7 +7865,7 @@ sub_805B9F8: @ 805B9F8
lsls r0, 2
adds r0, r4
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@ -9743,7 +9743,7 @@ dp01t_2F_1_pokemon_enter: @ 805CA80
lsls r0, 2
adds r0, r5
ldr r1, =sub_805CC00
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldrb r0, [r7]
adds r0, r6
ldrb r1, [r0]

4
asm/battle_controller_player_partner.s
View File

@ -4478,7 +4478,7 @@ sub_81BD5C8: @ 81BD5C8
lsls r0, 2
adds r0, r5
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@ -5809,7 +5809,7 @@ sub_81BE10C: @ 81BE10C
lsls r0, 2
adds r0, r4
ldr r1, =sub_805CC00
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldrb r0, [r5]
adds r0, r6
ldrb r1, [r0]

4
asm/battle_controller_recorded_opponent.s
View File

@ -4262,7 +4262,7 @@ sub_8188A4C: @ 8188A4C
lsls r0, 2
adds r0, r5
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@ -5444,7 +5444,7 @@ sub_8189438: @ 8189438
lsls r0, 2
adds r0, r4
ldr r1, =sub_818962C
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r0, =c3_0803D564
movs r1, 0x5
bl CreateTask

4
asm/battle_controller_recorded_player.s
View File

@ -4334,7 +4334,7 @@ sub_818BFB8: @ 818BFB8
lsls r0, 2
adds r0, r5
ldr r1, =SpriteCallbackDummy
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@ -5603,7 +5603,7 @@ sub_818CA64: @ 818CA64
lsls r0, 2
adds r0, r4
ldr r1, =sub_805CC00
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]

1412
asm/battle_controller_safari.s Normal file
View File

File diff suppressed because it is too large Load Diff

2
asm/battle_controller_wally.s
View File

@ -4296,7 +4296,7 @@ sub_816A90C: @ 816A90C
lsls r0, 2
adds r0, r5
ldr r1, =sub_805CC00
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldrb r0, [r7]
adds r0, r6
ldrb r1, [r0]

4
asm/battle_setup.s
View File

@ -1894,7 +1894,7 @@ SingleTrainerWantsBattle: @ 80B162C
adds r0, r1, 0
bl TrainerBattleConfigure
ldr r0, =gUnknown_08271354
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
bl script_env_2_enable
pop {r4}
pop {r0}
@ -1932,7 +1932,7 @@ TwoTrainersWantBattle: @ 80B1670
TwoTrainersWantBattleExecuteScript: @ 80B16A4
push {lr}
ldr r0, =gUnknown_08271354
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
bl script_env_2_enable
pop {r0}
bx r0

10
asm/decoration.s
View File

@ -461,7 +461,7 @@ sub_8126D6C: @ 8126D6C
cmp r0, 0
bne _08126D98
ldr r0, =gUnknown_0823B4E8
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
b _08126D9E
@ -3926,7 +3926,7 @@ _08128A44:
subs r0, 0x7
strh r0, [r2]
ldr r0, =gUnknown_08275D1F
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
_08128A64:
ldr r2, =gSprites
ldr r0, =gUnknown_0203AA38
@ -4194,7 +4194,7 @@ _08128C96:
b _08128CAC
_08128C9C:
ldr r0, =gUnknown_08275D0C
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _08128CAC
.pool
_08128CA8:
@ -5787,7 +5787,7 @@ _08129928:
bne _08129994
bl DrawWholeMapView
ldr r0, =gUnknown_08275D2E
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0
movs r1, 0x1
bl sub_8197434
@ -6952,7 +6952,7 @@ _0812A2F6:
b _0812A30C
_0812A2FC:
ldr r0, =gUnknown_08275D0C
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0812A30C
.pool
_0812A308:

32
asm/field_control_avatar.s
View File

@ -456,7 +456,7 @@ _0809C214:
bl PlaySE
_0809C244:
adds r0, r4, 0
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0x1
_0809C24C:
pop {r4}
@ -1175,7 +1175,7 @@ sub_809C868: @ 809C868
cmp r0, 0x2
bne _0809C894
ldr r0, =gUnknown_08290B0F
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0809C896
.pool
@ -1204,7 +1204,7 @@ sub_809C89C: @ 809C89C
cmp r0, 0x1
bne _0809C8D4
ldr r0, =gUnknown_08290B5A
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0809C8D6
.pool
@ -1278,7 +1278,7 @@ mapheader_trigger_activate_at__run_now: @ 809C938
bl mapheader_trigger_activate_at
cmp r0, 0
beq _0809C964
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0809C966
.pool
@ -1312,7 +1312,7 @@ _0809C988:
beq _0809C9A4
ldr r0, =gUnknown_08252BE8
_0809C996:
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0809C9EA
.pool
@ -1386,7 +1386,7 @@ _0809CA04:
cmp r0, 0x1
bne _0809CA48
ldr r0, =gUnknown_082736BC
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CA48:
@ -1397,7 +1397,7 @@ _0809CA48:
movs r0, 0xD
bl IncrementGameStat
ldr r0, =gUnknown_08291FC0
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CA64:
@ -1407,7 +1407,7 @@ _0809CA64:
cmp r0, 0x1
bne _0809CA7C
ldr r0, =gUnknown_08273D1F
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CA7C:
@ -1417,7 +1417,7 @@ _0809CA7C:
cmp r0, 0x1
bne _0809CA94
ldr r0, =gUnknown_08238EAF
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CA94:
@ -1425,7 +1425,7 @@ _0809CA94:
cmp r0, 0x1
bne _0809CAA8
ldr r0, =gUnknown_081DF7BA
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CAA8:
@ -1433,7 +1433,7 @@ _0809CAA8:
cmp r0, 0x1
bne _0809CABC
ldr r0, =gUnknown_081F49EC
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CABC:
@ -1441,7 +1441,7 @@ _0809CABC:
cmp r0, 0x1
bne _0809CAD0
ldr r0, =gUnknown_081FA4D6
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CAD0:
@ -1449,7 +1449,7 @@ _0809CAD0:
cmp r0, 0x1
bne _0809CAE4
ldr r0, =gUnknown_0821307B
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CAE4:
@ -1457,7 +1457,7 @@ _0809CAE4:
cmp r0, 0x1
bne _0809CAF8
ldr r0, =gUnknown_08224175
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CAF8:
@ -1471,7 +1471,7 @@ _0809CAF8:
cmp r0, 0x1
bne _0809CB1C
ldr r0, =gUnknown_0823C050
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0809CB28
.pool
_0809CB1C:
@ -1765,7 +1765,7 @@ _0809CD50:
cmp r0, 0x1
bne _0809CD6C
ldr r0, =gUnknown_082A8350
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0809CD8C
.pool

12
asm/fldeff_80F9BCC.s
View File

@ -590,7 +590,7 @@ sub_80FA004: @ 80FA004
cmp r0, 0x1
bne _080FA070
bl sub_80F9F5C
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
@ -605,7 +605,7 @@ _080FA070:
cmp r0, 0x1
bne _080FA0A0
bl sub_80F9F5C
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
@ -624,7 +624,7 @@ _080FA0AE:
b _080FA0C4
_080FA0B2:
bl sub_80F9F5C
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
@ -648,7 +648,7 @@ sub_80FA0DC: @ 80FA0DC
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08275A86
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
@ -783,7 +783,7 @@ sub_80FA1E8: @ 80FA1E8
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08275ADF
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
@ -956,7 +956,7 @@ sub_80FA34C: @ 80FA34C
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08275B38
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool

4
asm/fldeff_strength.s
View File

@ -22,7 +22,7 @@ _08145DD8:
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
@ -45,7 +45,7 @@ sub_8145E0C: @ 8145E0C
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_082908FD
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool

220
asm/fldeff_sweetscent.s Normal file
View File

@ -0,0 +1,220 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start SetUpFieldMove_SweetScent
SetUpFieldMove_SweetScent: @ 8159EF0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
ldr r0, =hm2_sweet_scent
str r0, [r1]
movs r0, 0x1
bx lr
.pool
thumb_func_end SetUpFieldMove_SweetScent
thumb_func_start hm2_sweet_scent
hm2_sweet_scent: @ 8159F10
push {lr}
movs r0, 0x33
bl FieldEffectStart
bl brm_get_pokemon_selection
ldr r1, =gUnknown_02038C08
lsls r0, 24
lsrs r0, 24
str r0, [r1]
pop {r0}
bx r0
.pool
thumb_func_end hm2_sweet_scent
thumb_func_start FldEff_SweetScent
FldEff_SweetScent: @ 8159F2C
push {lr}
bl sub_80AC3D0
bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r2, =sub_8159F5C
lsrs r0, r2, 16
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
movs r0, 0
pop {r1}
bx r1
.pool
thumb_func_end FldEff_SweetScent
thumb_func_start sub_8159F5C
sub_8159F5C: @ 8159F5C
push {r4,r5,lr}
sub sp, 0x4
movs r0, 0xEC
bl PlaySE
ldr r5, =gPlttBufferUnfaded
ldr r1, =gPaletteDecompressionBuffer
movs r4, 0x80
lsls r4, 1
adds r0, r5, 0
adds r2, r4, 0
bl CpuFastSet
ldr r0, =gPlttBufferFaded
adds r1, r5, 0
adds r2, r4, 0
bl CpuFastSet
bl GetPlayerAvatarObjectId
ldr r2, =gSprites
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
adds r1, r2
ldrb r1, [r1, 0x5]
lsrs r1, 4
adds r1, 0x10
movs r0, 0x1
lsls r0, r1
mvns r0, r0
movs r1, 0x1F
str r1, [sp]
movs r1, 0x4
movs r2, 0
movs r3, 0x8
bl BeginNormalPaletteFade
ldr r0, =sub_8159FEC
movs r1, 0
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
movs r0, 0
strh r0, [r1, 0x8]
movs r0, 0x33
bl FieldEffectActiveListRemove
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_8159F5C
thumb_func_start sub_8159FEC
sub_8159FEC: @ 8159FEC
push {r4-r6,lr}
sub sp, 0x4
lsls r0, 24
lsrs r5, r0, 24
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0
bne _0815A088
bl sub_81BE72C
movs r0, 0x40
movs r1, 0x8
movs r2, 0x1F
bl BlendPalettes
ldr r0, =gTasks
lsls r1, r5, 2
adds r1, r5
lsls r1, 3
adds r4, r1, r0
ldrh r1, [r4, 0x8]
movs r2, 0x8
ldrsh r0, [r4, r2]
cmp r0, 0x40
bne _0815A084
strh r6, [r4, 0x8]
bl SweetScentWildEncounter
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0815A044
adds r0, r5, 0
bl DestroyTask
b _0815A088
.pool
_0815A044:
ldr r0, =sub_815A090
str r0, [r4]
bl GetPlayerAvatarObjectId
ldr r2, =gSprites
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
adds r1, r2
ldrb r1, [r1, 0x5]
lsrs r1, 4
adds r1, 0x10
movs r0, 0x1
lsls r0, r1
mvns r0, r0
movs r1, 0x1F
str r1, [sp]
movs r1, 0x4
movs r2, 0x8
movs r3, 0
bl BeginNormalPaletteFade
bl sub_81BE6B8
b _0815A088
.pool
_0815A084:
adds r0, r1, 0x1
strh r0, [r4, 0x8]
_0815A088:
add sp, 0x4
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_8159FEC
thumb_func_start sub_815A090
sub_815A090: @ 815A090
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
cmp r0, 0
bne _0815A0BE
ldr r0, =gPaletteDecompressionBuffer
ldr r1, =gPlttBufferUnfaded
movs r2, 0x80
lsls r2, 1
bl CpuFastSet
bl sub_80AC3E4
ldr r0, =gUnknown_08290CAE
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
_0815A0BE:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_815A090
.align 2, 0 @ Don't pad with nop.

2
asm/fldeff_teleport.s
View File

@ -19,7 +19,7 @@ SetUpFieldMove_Teleport: @ 817C8BC
b _0817C8E6
.pool
_0817C8D8:
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC

6
asm/item_use.s
View File

@ -1667,7 +1667,7 @@ sub_80FDD74: @ 80FDD74
bl RemoveBagItem
bl script_env_2_enable
ldr r0, =gUnknown_08274482
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
pop {r4}
@ -1729,7 +1729,7 @@ sub_80FDE08: @ 80FDE08
lsrs r4, 24
bl script_env_2_enable
ldr r0, =gUnknown_082744C0
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
pop {r4}
@ -1788,7 +1788,7 @@ sub_80FDE7C: @ 80FDE7C
lsrs r4, 24
bl script_env_2_enable
ldr r0, =gUnknown_08242CFC
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
adds r0, r4, 0
bl DestroyTask
pop {r4}

4
asm/player_pc.s
View File

@ -380,12 +380,12 @@ sub_816B148: @ 816B148
cmp r0, 0
bne _0816B174
ldr r0, =gUnknown_081F863F
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0816B184
.pool
_0816B174:
ldr r0, =gUnknown_081F958F
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _0816B184
.pool
_0816B180:

2
asm/rom3.s
View File

@ -294,7 +294,7 @@ _080328F0:
cmp r1, 0
beq _08032918
ldr r1, =gBattleBankFunc
ldr r0, =sub_815936C
ldr r0, =SetBankFuncToSafariBufferRunCommand
b _08032934
.pool
_08032918:

16
asm/rom4.s
View File

@ -3122,7 +3122,7 @@ sub_8085E94: @ 8085E94
thumb_func_start map_post_load_hook_exec
map_post_load_hook_exec: @ 8085EA0
push {r4,lr}
ldr r4, =gUnknown_03005DB0
ldr r4, =gFieldCallback
ldr r0, [r4]
cmp r0, 0
beq _08085ECC
@ -3177,7 +3177,7 @@ CB2_NewGame: @ 8085EF8
ldr r1, =gUnknown_03005DAC
ldr r0, =sub_80FB4E0
str r0, [r1]
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
movs r0, 0
str r0, [r1]
ldr r0, =gUnknown_030026F8
@ -3420,7 +3420,7 @@ _08086178:
sub_8086194: @ 8086194
push {lr}
bl sub_808631C
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =sub_80AF6A4
str r0, [r1]
bl c2_exit_to_overworld_2_switch
@ -5336,7 +5336,7 @@ _080871D4:
cmp r0, 0x1
bne _080871EA
ldr r0, =gUnknown_08277513
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
ldr r0, =sub_80871C0
bl c1_link_related_func_set
_080871EA:
@ -5774,7 +5774,7 @@ sub_8087530: @ 8087530
movs r0, 0x5
bl PlaySE
adds r0, r4, 0
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
bl script_env_2_enable
pop {r4}
pop {r0}
@ -5787,7 +5787,7 @@ sub_808754C: @ 808754C
movs r0, 0x6
bl PlaySE
ldr r0, =gUnknown_082774EF
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
bl script_env_2_enable
pop {r0}
bx r0
@ -5801,7 +5801,7 @@ sub_8087568: @ 8087568
movs r0, 0x5
bl PlaySE
adds r0, r4, 0
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
bl script_env_2_enable
pop {r4}
pop {r0}
@ -5812,7 +5812,7 @@ sub_8087568: @ 8087568
sub_8087584: @ 8087584
push {lr}
ldr r0, =gUnknown_08277509
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
bl script_env_2_enable
pop {r0}
bx r0

14
asm/rom6.s
View File

@ -267,7 +267,7 @@ sub_8135654: @ 8135654
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
@ -284,7 +284,7 @@ _0813568C:
movs r0, 0
b _081356AC
_0813569E:
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
@ -308,7 +308,7 @@ sub_81356C4: @ 81356C4
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_082907F0
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
@ -360,7 +360,7 @@ sub_813572C: @ 813572C
movs r0, 0
b _0813574C
_0813573E:
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
@ -3338,7 +3338,7 @@ sub_81370FC: @ 81370FC
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
@ -3355,7 +3355,7 @@ _08137134:
lsls r0, 24
cmp r0, 0
bne _08137170
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
@ -3408,7 +3408,7 @@ sub_81371B4: @ 81371B4
ldr r0, =0x00000888
bl FlagSet
ldr r0, =gUnknown_082926F8
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool

32
asm/rom_80A5C6C.s
View File

@ -716,8 +716,8 @@ _080A6238:
bx r1
thumb_func_end sub_80A6190
thumb_func_start obj_id_for_side_relative_to_move
obj_id_for_side_relative_to_move: @ 80A6240
thumb_func_start GetAnimBankSpriteId
GetAnimBankSpriteId: @ 80A6240
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@ -785,15 +785,15 @@ _080A62CA:
pop {r1}
bx r1
.pool
thumb_func_end obj_id_for_side_relative_to_move
thumb_func_end GetAnimBankSpriteId
thumb_func_start oamt_set_x3A_32
oamt_set_x3A_32: @ 80A62D4
thumb_func_start StoreSpriteCallbackInData6
StoreSpriteCallbackInData6: @ 80A62D4
strh r1, [r0, 0x3A]
lsrs r1, 16
strh r1, [r0, 0x3C]
bx lr
thumb_func_end oamt_set_x3A_32
thumb_func_end StoreSpriteCallbackInData6
thumb_func_start sub_80A62DC
sub_80A62DC: @ 80A62DC
@ -2889,7 +2889,7 @@ sub_80A7238: @ 80A7238
beq _080A7268
ldr r4, =gSprites
movs r0, 0
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
@ -3703,7 +3703,7 @@ _080A785C:
str r0, [r5, 0x1C]
ldr r1, =move_anim_8072740
adds r0, r5, 0
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
pop {r4-r7}
pop {r0}
bx r0
@ -3846,7 +3846,7 @@ _080A798E:
str r0, [r5, 0x1C]
ldr r1, =move_anim_8072740
adds r0, r5, 0
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
pop {r4-r7}
pop {r0}
bx r0
@ -3858,7 +3858,7 @@ duplicate_obj_of_side_rel2move_in_transparent_mode: @ 80A79E8
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xFF
@ -4084,7 +4084,7 @@ sub_80A7B98: @ 80A7B98
lsrs r4, r0, 24
ldr r0, =gBattleAnimArgs
ldrb r0, [r0]
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0xFF
@ -5985,7 +5985,7 @@ _080A8AB6:
strh r0, [r4, 0x38]
ldr r1, =move_anim_8074EE0
adds r0, r4, 0
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r0, =sub_80A66DC
str r0, [r4, 0x1C]
pop {r4}
@ -6040,7 +6040,7 @@ _080A8B26:
bl StartSpriteAnim
ldr r1, =move_anim_8074EE0
adds r0, r4, 0
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r0, =sub_80A66DC
str r0, [r4, 0x1C]
pop {r4}
@ -6083,7 +6083,7 @@ _080A8B9C:
str r0, [r4, 0x1C]
ldr r1, =move_anim_8072740
adds r0, r4, 0
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
pop {r4}
pop {r0}
bx r0
@ -6101,7 +6101,7 @@ sub_80A8BC4: @ 80A8BC4
ldr r0, =gTasks
adds r5, r1, r0
movs r0, 0
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
movs r6, 0
@ -6516,7 +6516,7 @@ _080A8F32:
str r0, [r4, 0x1C]
ldr r1, =move_anim_8072740
adds r0, r4, 0
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0

50
asm/rom_80C6FA0.s
View File

@ -24078,7 +24078,7 @@ sub_80D3718: @ 80D3718
lsrs r0, 24
cmp r0, 0x1
bne _080D3754
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
@ -24380,7 +24380,7 @@ _080D395A:
cmp r0, 0x1
bne _080D39F8
_080D39BC:
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
@ -24418,7 +24418,7 @@ _080D3A18:
cmp r2, 0x1
bne _080D3A2A
_080D3A1E:
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
@ -24485,7 +24485,7 @@ sub_80D3A9C: @ 80D3A9C
lsrs r0, 24
str r0, [r1]
ldr r0, =gUnknown_08290705
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
@ -25383,7 +25383,7 @@ _080D41D4:
cmp r0, 0x1
bne _080D422A
ldr r0, =gUnknown_08267EDB
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
_080D422A:
pop {r4-r6}
pop {r0}
@ -27321,7 +27321,7 @@ sub_80D51AC: @ 80D51AC
lsrs r5, r0, 24
ldr r4, =gBattleAnimArgs
ldrb r0, [r4]
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@ -27474,7 +27474,7 @@ sub_80D52D0: @ 80D52D0
bgt _080D52FC
lsls r0, 24
lsrs r0, 24
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0xFF
@ -27688,7 +27688,7 @@ sub_80D5484: @ 80D5484
lsrs r5, r0, 24
ldr r4, =gBattleAnimArgs
ldrb r0, [r4]
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0xFF
@ -27912,7 +27912,7 @@ sub_80D5644: @ 80D5644
lsrs r4, 24
ldr r5, =gBattleAnimArgs
ldrb r0, [r5]
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, =gSprites
@ -28032,7 +28032,7 @@ sub_80D5738: @ 80D5738
movs r6, 0x1
ldr r4, =gBattleAnimArgs
ldrb r0, [r4]
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r7, r0, 24
movs r1, 0x8
@ -28209,7 +28209,7 @@ _080D5894:
strh r2, [r4, 0x36]
ldr r1, =sub_80D58D4
adds r0, r4, 0
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r0, =sub_80A6630
str r0, [r4, 0x1C]
pop {r4}
@ -28229,7 +28229,7 @@ sub_80D58D4: @ 80D58D4
ldr r1, =sub_80A6630
str r1, [r0, 0x1C]
ldr r1, =move_anim_8072740
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.pool
@ -28247,7 +28247,7 @@ sub_80D58F8: @ 80D58F8
strb r0, [r2]
ldr r5, =gBattleAnimArgs
ldrb r0, [r5, 0x4]
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
ldrh r2, [r5]
@ -28260,7 +28260,7 @@ sub_80D58F8: @ 80D58F8
strh r2, [r4, 0x36]
ldr r1, =sub_80D5944
adds r0, r4, 0
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r0, =sub_80A6630
str r0, [r4, 0x1C]
pop {r4,r5}
@ -28280,7 +28280,7 @@ sub_80D5944: @ 80D5944
ldr r1, =sub_80A6630
str r1, [r0, 0x1C]
ldr r1, =move_anim_8072740
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.pool
@ -28503,7 +28503,7 @@ _080D5ADC:
strb r0, [r2]
ldr r1, =move_anim_8072740
adds r0, r5, 0
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r0, =sub_80A6680
str r0, [r5, 0x1C]
pop {r4-r6}
@ -28592,13 +28592,13 @@ _080D5B9C:
bne _080D5C04
ldr r1, =move_anim_8072740
adds r0, r6, 0
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
b _080D5C0C
.pool
_080D5C04:
ldr r1, =sub_80D5C20
adds r0, r6, 0
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
_080D5C0C:
ldr r0, =sub_80A6680
str r0, [r6, 0x1C]
@ -28661,7 +28661,7 @@ sub_80D5C50: @ 80D5C50
strh r0, [r5, 0xA]
_080D5C82:
ldrb r0, [r5]
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
ldr r1, =gTasks
lsls r4, r6, 2
adds r4, r6
@ -28817,7 +28817,7 @@ sub_80D5DB0: @ 80D5DB0
cmp r0, 0
blt _080D5E10
ldrb r0, [r1]
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
b _080D5E18
@ -28944,7 +28944,7 @@ sub_80D5EB8: @ 80D5EB8
_080D5ED4:
ldr r4, =gBattleAnimArgs
ldrb r0, [r4, 0x8]
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
@ -29145,7 +29145,7 @@ sub_80D6064: @ 80D6064
lsrs r4, 24
ldr r6, =gBattleAnimArgs
ldrb r0, [r6, 0x6]
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@ -29248,7 +29248,7 @@ sub_80D6134: @ 80D6134
lsrs r7, r0, 24
ldr r4, =gBattleAnimArgs
ldrb r0, [r4, 0x4]
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
mov r8, r0
@ -29366,7 +29366,7 @@ sub_80D622C: @ 80D622C
lsrs r5, r0, 24
ldr r4, =gBattleAnimArgs
ldrb r0, [r4, 0x4]
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
mov r8, r0
@ -29599,7 +29599,7 @@ _080D63EE:
ldrh r0, [r1, 0x8]
strh r0, [r4, 0x1E]
movs r0, 0x1
bl obj_id_for_side_relative_to_move
bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x16]

28563
asm/rom_8158B30.s
View File

File diff suppressed because it is too large Load Diff

26958
asm/rom_815A0D4.s Normal file
View File

File diff suppressed because it is too large Load Diff

20
asm/rom_818CFC8.s
View File

@ -55683,7 +55683,7 @@ _081A9F7A:
sub_81A9F80: @ 81A9F80
push {lr}
ldr r0, =gUnknown_08252C88
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
@ -61971,7 +61971,7 @@ _081AD5C4:
strh r7, [r0]
_081AD5CA:
ldr r0, =gUnknown_082736B3
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
_081AD5D0:
movs r0, 0x1
_081AD5D2:
@ -77469,7 +77469,7 @@ _081B5714:
movs r0, 0x5
bl PlaySE
_081B571A:
ldr r0, =gUnknown_03005DB0
ldr r0, =gFieldCallback
movs r1, 0
str r1, [r0]
ldr r0, =gUnknown_0203CEEC
@ -77615,7 +77615,7 @@ sub_81B5820: @ 81B5820
lsrs r0, 24
cmp r0, 0x1
bne _081B585C
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
@ -77733,7 +77733,7 @@ hm_prepare_waterfall: @ 81B58F0
lsrs r0, 24
cmp r0, 0x1
bne _081B594C
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
@ -77780,7 +77780,7 @@ sub_81B5974: @ 81B5974
b _081B599E
.pool
_081B5990:
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, =gUnknown_0203CEEC
@ -84546,7 +84546,7 @@ sub_81B9354: @ 81B9354
sub sp, 0xC
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_03005DB0
ldr r2, =gFieldCallback
ldr r1, =hm_add_c3_without_phase_2
str r1, [r2]
movs r1, 0
@ -84578,7 +84578,7 @@ sub_81B9390: @ 81B9390
movs r0, 0xFF
strh r0, [r4]
_081B93A6:
ldr r0, =gUnknown_03005DB0
ldr r0, =gFieldCallback
ldr r1, =hm_add_c3_without_phase_2
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch
@ -84687,7 +84687,7 @@ _081B9486:
ldr r1, =gSpecialVar_0x8004
ldrb r0, [r2]
strh r0, [r1]
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =hm_add_c3_without_phase_2
str r0, [r1]
ldr r0, =c2_exit_to_overworld_2_switch
@ -84823,7 +84823,7 @@ _081B95A4:
lsrs r0, 24
strh r0, [r4]
_081B95BA:
ldr r0, =gUnknown_03005DB0
ldr r0, =gFieldCallback
ldr r1, =hm_add_c3_without_phase_2
str r1, [r0]
ldr r0, =c2_exit_to_overworld_2_switch

2
asm/rom_81BE66C.s
View File

@ -12059,7 +12059,7 @@ sub_81C4F44: @ 81C4F44
cmp r0, 0
bne _081C4F6E
bl overworld_free_bg_tilemaps
ldr r0, =gUnknown_03005DB0
ldr r0, =gFieldCallback
ldr r1, =hm_add_c3_without_phase_2
str r1, [r0]
ldr r1, =c2_exit_to_overworld_2_switch

6
asm/safari_zone.s
View File

@ -103,7 +103,7 @@ _080FC168:
.pool
_080FC170:
ldr r0, =gUnknown_082A4B8A
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0x1
_080FC178:
pop {r1}
@ -115,7 +115,7 @@ _080FC178:
sub_80FC180: @ 80FC180
push {lr}
ldr r0, =gUnknown_082A4B6F
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
@ -165,7 +165,7 @@ _080FC208:
cmp r0, 0x7
bne _080FC21C
ldr r0, =gUnknown_082A4B9B
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
bl script_env_2_set_ctx_paused
ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
bl SetMainCallback2

4
asm/scrcmd.s
View File

@ -1421,7 +1421,7 @@ _08099D3A:
beq _08099D60
_08099D3E:
ldr r0, =gPlttBufferUnfaded
ldr r1, =sPaletteDecompressionBuffer
ldr r1, =gPaletteDecompressionBuffer
ldr r2, =0x04000100
bl CpuSet
adds r0, r4, 0
@ -1430,7 +1430,7 @@ _08099D3E:
b _08099D72
.pool
_08099D60:
ldr r0, =sPaletteDecompressionBuffer
ldr r0, =gPaletteDecompressionBuffer
ldr r1, =gPlttBufferUnfaded
ldr r2, =0x04000100
bl CpuSet

8
asm/script.s
View File

@ -368,8 +368,8 @@ _08098EF2:
bx r1
thumb_func_end script_env_2_run_current_script
thumb_func_start script_env_1_execute_new_script
script_env_1_execute_new_script: @ 8098EF8
thumb_func_start ScriptContext1_SetupScript
ScriptContext1_SetupScript: @ 8098EF8
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, =gUnknown_03000E40
@ -388,7 +388,7 @@ script_env_1_execute_new_script: @ 8098EF8
pop {r0}
bx r0
.pool
thumb_func_end script_env_1_execute_new_script
thumb_func_end ScriptContext1_SetupScript
thumb_func_start script_env_2_set_ctx_paused
script_env_2_set_ctx_paused: @ 8098F30
@ -598,7 +598,7 @@ mapheader_run_first_tag2_script_list_match: @ 809907C
bl mapheader_get_first_match_from_tagged_ptr_list
cmp r0, 0
beq _08099090
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0x1
b _08099092
_08099090:

6
asm/secret_base.s
View File

@ -1417,7 +1417,7 @@ sub_80E9668: @ 80E9668
bl sub_80E9608
bl sub_80E8B6C
ldr r0, =gUnknown_08275BB7
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
pop {r0}
bx r0
.pool
@ -2770,12 +2770,12 @@ task_pc_turn_off: @ 80EA1D0
cmp r0, 0
bne _080EA1F4
ldr r0, =gUnknown_0823B4E8
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
b _080EA1FA
.pool
_080EA1F4:
ldr r0, =gUnknown_0823B5E9
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
_080EA1FA:
adds r0, r4, 0
bl DestroyTask

4
asm/start_menu.s
View File

@ -674,7 +674,7 @@ sub_809FA18: @ 809FA18
movs r0, 0
strb r0, [r1]
strb r0, [r1, 0x1]
ldr r1, =gUnknown_03005DB0
ldr r1, =gFieldCallback
ldr r0, =sub_809FA00
str r0, [r1]
bx lr
@ -1249,7 +1249,7 @@ _0809FF00:
bl sub_80984F4
bl script_env_2_disable
ldr r0, =gUnknown_08252C88
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0x1
b _0809FF22
.pool

2
asm/trade.s
View File

@ -4419,7 +4419,7 @@ _08079772:
lsls r0, 2
add r0, r8
ldr r1, =sub_80D3014
bl oamt_set_x3A_32
bl StoreSpriteCallbackInData6
ldr r2, =gUnknown_0203229C
ldr r1, [r2]
adds r1, 0x74

8
asm/wild_encounter.s
View File

@ -1643,8 +1643,8 @@ _080B556E:
.pool
thumb_func_end rock_smash_wild_pokemon_encounter
thumb_func_start sub_80B5578
sub_80B5578: @ 80B5578
thumb_func_start SweetScentWildEncounter
SweetScentWildEncounter: @ 80B5578
push {r4,r5,lr}
sub sp, 0x4
mov r5, sp
@ -1814,7 +1814,7 @@ _080B56F4:
pop {r4,r5}
pop {r1}
bx r1
thumb_func_end sub_80B5578
thumb_func_end SweetScentWildEncounter
thumb_func_start GetFishingWildMonListHeader
GetFishingWildMonListHeader: @ 80B56FC
@ -2027,7 +2027,7 @@ sub_80B5870: @ 80B5870
cmp r4, 0
bne _080B58C4
ldr r0, =gUnknown_082A4B2A
bl script_env_1_execute_new_script
bl ScriptContext1_SetupScript
movs r0, 0x1
b _080B58C6
.pool

2
data/field_effect_scripts.s
View File

@ -280,7 +280,7 @@ gFieldEffectScript_Unknown50:: @ 82DBC76
field_eff_end
gFieldEffectScript_Unknown51:: @ 82DBC80
field_eff_callnative sub_8159F2C
field_eff_callnative FldEff_SweetScent
field_eff_end
gFieldEffectScript_Unknown52:: @ 82DBC86

2
data/rom_8158B30.s
View File

@ -3,7 +3,7 @@
.section .rodata
gUnknown_085CDF20:: @ 85CDF20
gSafariBufferCommands:: @ 85CDF20
.incbin "baserom.gba", 0x5cdf20, 0x380
gUnknown_085CE2A0:: @ 85CE2A0

3
ld_script.txt
View File

@ -187,6 +187,9 @@ SECTIONS {
asm/field_effect_helpers.o(.text);
asm/contest_ai.o(.text);
asm/rom_8158B30.o(.text);
asm/battle_controller_safari.o(.text);
asm/fldeff_sweetscent.o(.text);
asm/rom_815A0D4.o(.text);
asm/battle_controller_wally.o(.text);
asm/player_pc.o(.text);
asm/intro.o(.text);

8
src/palette.c
View File

@ -54,7 +54,7 @@ EWRAM_DATA struct PaletteStruct sPaletteStructs[0x10] = {0};
EWRAM_DATA struct PaletteFadeControl gPaletteFade = {0};
EWRAM_DATA u32 gFiller_2037FE0 = 0;
EWRAM_DATA u32 sPlttBufferTransferPending = 0;
EWRAM_DATA u8 sPaletteDecompressionBuffer[0x400] = {0};
EWRAM_DATA u8 gPaletteDecompressionBuffer[0x400] = {0};
extern struct PaletteStructTemplate gDummyPaletteStructTemplate;
extern void *gUnknown_0852487C;
@ -102,9 +102,9 @@ void sub_80A1884(u16 a1)
void LoadCompressedPalette(const void *src, u16 offset, u16 size)
{
LZDecompressWram(src, sPaletteDecompressionBuffer);
CpuCopy16(sPaletteDecompressionBuffer, gPlttBufferUnfaded + offset, size);
CpuCopy16(sPaletteDecompressionBuffer, gPlttBufferFaded + offset, size);
LZDecompressWram(src, gPaletteDecompressionBuffer);
CpuCopy16(gPaletteDecompressionBuffer, gPlttBufferUnfaded + offset, size);
CpuCopy16(gPaletteDecompressionBuffer, gPlttBufferFaded + offset, size);
}
void LoadPalette(const void *src, u16 offset, u16 size)

2
sym_common.txt
View File

@ -272,7 +272,7 @@ gUnknown_03005DA8: @ 3005DA8
gUnknown_03005DAC: @ 3005DAC
.space 0x4
gUnknown_03005DB0: @ 3005DB0
gFieldCallback: @ 3005DB0
.space 0x4
gUnknown_03005DB4: @ 3005DB4