dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into trainer_tower

Browse Source
This commit is contained in:
PikalaxALT
2019-01-07 18:39:27 -05:00
parent f50bc217ae 8f74008096
commit f7eef0735b
95 changed files with 3967 additions and 8671 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_controller_oak.s
+1 -1
View File
@@ -308,7 +308,7 @@ _080E77AC:
bhi _080E7838 bhi _080E7838
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
_080E780A: _080E780A:
movs r0, 0x5 movs r0, 0x5
bl PlaySE bl PlaySE
asm/battle_controller_player.s
+1 -1
View File
@@ -381,7 +381,7 @@ _0802E5A8:
bhi _0802E634 bhi _0802E634
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
_0802E606: _0802E606:
movs r0, 0x5 movs r0, 0x5
bl PlaySE bl PlaySE
asm/battle_message.s
+3 -3
View File
@@ -1604,7 +1604,7 @@ _080D7F9C:
ldrh r0, [r0] ldrh r0, [r0]
_080D7FA0: _080D7FA0:
mov r1, sp mov r1, sp
bl sub_8099E90 bl CopyItemName
mov r4, sp mov r4, sp
b _080D8382 b _080D8382
.align 2, 0 .align 2, 0
@@ -2495,12 +2495,12 @@ _080D8698: .4byte gUnknown_83FD8A2
_080D869C: _080D869C:
adds r0, r2, 0 adds r0, r2, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_8099E90 bl CopyItemName
b _080D86AE b _080D86AE
_080D86A6: _080D86A6:
adds r0, r2, 0 adds r0, r2, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_8099E90 bl CopyItemName
_080D86AE: _080D86AE:
adds r5, 0x3 adds r5, 0x3
_080D86B0: _080D86B0:
asm/battle_setup.s
+30 -30
View File
@@ -104,7 +104,7 @@ sub_807F6CC: @ 807F6CC
bhi _0807F6FC bhi _0807F6FC
ldr r0, _0807F6F8 @ =0x00000167 ldr r0, _0807F6F8 @ =0x00000167
movs r1, 0x1 movs r1, 0x1
bl sub_8099F40 bl CheckBagHasItem
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0807F6FC bne _0807F6FC
@@ -318,8 +318,8 @@ _0807F8BC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_0807F8C0: .4byte gBattleTypeFlags _0807F8C0: .4byte gBattleTypeFlags
thumb_func_end sub_807F888 thumb_func_end sub_807F888
thumb_func_start sub_807F8C4 thumb_func_start BattleSetup_StartScriptedWildBattle
sub_807F8C4: @ 807F8C4 BattleSetup_StartScriptedWildBattle: @ 807F8C4
push {lr} push {lr}
bl ScriptContext2_Enable bl ScriptContext2_Enable
ldr r1, _0807F8F8 @ =gMain ldr r1, _0807F8F8 @ =gMain
@@ -344,7 +344,7 @@ sub_807F8C4: @ 807F8C4
_0807F8F8: .4byte gMain _0807F8F8: .4byte gMain
_0807F8FC: .4byte sub_807FBA0 _0807F8FC: .4byte sub_807FBA0
_0807F900: .4byte gBattleTypeFlags _0807F900: .4byte gBattleTypeFlags
thumb_func_end sub_807F8C4 thumb_func_end BattleSetup_StartScriptedWildBattle
thumb_func_start sub_807F904 thumb_func_start sub_807F904
sub_807F904: @ 807F904 sub_807F904: @ 807F904
@@ -356,7 +356,7 @@ sub_807F904: @ 807F904
str r0, [r1, 0x8] str r0, [r1, 0x8]
ldr r0, _0807F94C @ =0x00000167 ldr r0, _0807F94C @ =0x00000167
movs r1, 0x1 movs r1, 0x1
bl sub_8099F40 bl CheckBagHasItem
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0807F958 beq _0807F958
@@ -1512,7 +1512,7 @@ battle_80801F0: @ 80801F0
ldrb r1, [r2, 0x5] ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4] ldrb r2, [r2, 0x4]
bl GetFieldObjectIdByLocalIdAndMap bl GetFieldObjectIdByLocalIdAndMap
ldr r1, _08080224 @ =gUnknown_3005074 ldr r1, _08080224 @ =gSelectedEventObject
strb r0, [r1] strb r0, [r1]
_08080212: _08080212:
pop {r0} pop {r0}
@@ -1521,11 +1521,11 @@ _08080212:
_08080218: .4byte gUnknown_20386B0 _08080218: .4byte gUnknown_20386B0
_0808021C: .4byte gSpecialVar_LastTalked _0808021C: .4byte gSpecialVar_LastTalked
_08080220: .4byte gSaveBlock1Ptr _08080220: .4byte gSaveBlock1Ptr
_08080224: .4byte gUnknown_3005074 _08080224: .4byte gSelectedEventObject
thumb_func_end battle_80801F0 thumb_func_end battle_80801F0
thumb_func_start sub_8080228 thumb_func_start BattleSetup_ConfigureTrainerBattle
sub_8080228: @ 8080228 BattleSetup_ConfigureTrainerBattle: @ 8080228
push {r4,r5,lr} push {r4,r5,lr}
adds r5, r0, 0 adds r5, r0, 0
bl sub_8080110 bl sub_8080110
@@ -1640,14 +1640,14 @@ _08080326:
.align 2, 0 .align 2, 0
_0808032C: .4byte gUnknown_83C6900 _0808032C: .4byte gUnknown_83C6900
_08080330: .4byte gUnknown_81A4EC1 _08080330: .4byte gUnknown_81A4EC1
thumb_func_end sub_8080228 thumb_func_end BattleSetup_ConfigureTrainerBattle
thumb_func_start TrainerWantsBattle thumb_func_start TrainerWantsBattle
TrainerWantsBattle: @ 8080334 TrainerWantsBattle: @ 8080334
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, _08080368 @ =gUnknown_3005074 ldr r2, _08080368 @ =gSelectedEventObject
strb r0, [r2] strb r0, [r2]
ldr r4, _0808036C @ =gSpecialVar_LastTalked ldr r4, _0808036C @ =gSpecialVar_LastTalked
ldr r3, _08080370 @ =gMapObjects ldr r3, _08080370 @ =gMapObjects
@@ -1659,7 +1659,7 @@ TrainerWantsBattle: @ 8080334
strh r0, [r4] strh r0, [r4]
adds r1, 0x1 adds r1, 0x1
adds r0, r1, 0 adds r0, r1, 0
bl sub_8080228 bl BattleSetup_ConfigureTrainerBattle
ldr r0, _08080374 @ =gUnknown_81A4EB4 ldr r0, _08080374 @ =gUnknown_81A4EB4
bl ScriptContext1_SetupScript bl ScriptContext1_SetupScript
bl ScriptContext2_Enable bl ScriptContext2_Enable
@@ -1667,7 +1667,7 @@ TrainerWantsBattle: @ 8080334
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08080368: .4byte gUnknown_3005074 _08080368: .4byte gSelectedEventObject
_0808036C: .4byte gSpecialVar_LastTalked _0808036C: .4byte gSpecialVar_LastTalked
_08080370: .4byte gMapObjects _08080370: .4byte gMapObjects
_08080374: .4byte gUnknown_81A4EB4 _08080374: .4byte gUnknown_81A4EB4
@@ -1693,7 +1693,7 @@ GetTrainerFlagFromScriptPointer: @ 8080378
thumb_func_start sub_8080398 thumb_func_start sub_8080398
sub_8080398: @ 8080398 sub_8080398: @ 8080398
push {r4,lr} push {r4,lr}
ldr r0, _080803C4 @ =gUnknown_3005074 ldr r0, _080803C4 @ =gSelectedEventObject
ldrb r0, [r0] ldrb r0, [r0]
lsls r4, r0, 3 lsls r4, r0, 3
adds r4, r0 adds r4, r0
@@ -1713,7 +1713,7 @@ sub_8080398: @ 8080398
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080803C4: .4byte gUnknown_3005074 _080803C4: .4byte gSelectedEventObject
_080803C8: .4byte gMapObjects _080803C8: .4byte gMapObjects
thumb_func_end sub_8080398 thumb_func_end sub_8080398
@@ -1785,8 +1785,8 @@ HasTrainerAlreadyBeenFought: @ 8080424
bx r1 bx r1
thumb_func_end HasTrainerAlreadyBeenFought thumb_func_end HasTrainerAlreadyBeenFought
thumb_func_start trainer_flag_set thumb_func_start SetTrainerFlag
trainer_flag_set: @ 808043C SetTrainerFlag: @ 808043C
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
movs r1, 0xA0 movs r1, 0xA0
@@ -1796,10 +1796,10 @@ trainer_flag_set: @ 808043C
bl FlagSet bl FlagSet
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end trainer_flag_set thumb_func_end SetTrainerFlag
thumb_func_start trainer_flag_clear thumb_func_start ClearTrainerFlag
trainer_flag_clear: @ 8080450 ClearTrainerFlag: @ 8080450
push {lr} push {lr}
lsls r0, 16 lsls r0, 16
movs r1, 0xA0 movs r1, 0xA0
@@ -1809,10 +1809,10 @@ trainer_flag_clear: @ 8080450
bl FlagClear bl FlagClear
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end trainer_flag_clear thumb_func_end ClearTrainerFlag
thumb_func_start sub_8080464 thumb_func_start BattleSetup_StartTrainerBattle
sub_8080464: @ 8080464 BattleSetup_StartTrainerBattle: @ 8080464
push {r4,lr} push {r4,lr}
ldr r4, _080804A0 @ =gBattleTypeFlags ldr r4, _080804A0 @ =gBattleTypeFlags
movs r0, 0x8 movs r0, 0x8
@@ -1844,7 +1844,7 @@ _0808048C:
_080804A0: .4byte gBattleTypeFlags _080804A0: .4byte gBattleTypeFlags
_080804A4: .4byte gMain _080804A4: .4byte gMain
_080804A8: .4byte sub_80804AC _080804A8: .4byte sub_80804AC
thumb_func_end sub_8080464 thumb_func_end BattleSetup_StartTrainerBattle
thumb_func_start sub_80804AC thumb_func_start sub_80804AC
sub_80804AC: @ 80804AC sub_80804AC: @ 80804AC
@@ -1992,8 +1992,8 @@ sub_80805D8: @ 80805D8
bx r0 bx r0
thumb_func_end sub_80805D8 thumb_func_end sub_80805D8
thumb_func_start sub_80805E8 thumb_func_start BattleSetup_GetScriptAddrAfterBattle
sub_80805E8: @ 80805E8 BattleSetup_GetScriptAddrAfterBattle: @ 80805E8
push {lr} push {lr}
ldr r0, _080805F8 @ =gUnknown_20386C4 ldr r0, _080805F8 @ =gUnknown_20386C4
ldr r0, [r0] ldr r0, [r0]
@@ -2006,10 +2006,10 @@ _080805F4:
.align 2, 0 .align 2, 0
_080805F8: .4byte gUnknown_20386C4 _080805F8: .4byte gUnknown_20386C4
_080805FC: .4byte gUnknown_81C555B _080805FC: .4byte gUnknown_81C555B
thumb_func_end sub_80805E8 thumb_func_end BattleSetup_GetScriptAddrAfterBattle
thumb_func_start sub_8080600 thumb_func_start BattleSetup_GetTrainerPostBattleScript
sub_8080600: @ 8080600 BattleSetup_GetTrainerPostBattleScript: @ 8080600
push {lr} push {lr}
ldr r0, _08080610 @ =gUnknown_20386C8 ldr r0, _08080610 @ =gUnknown_20386C8
ldr r0, [r0] ldr r0, [r0]
@@ -2022,7 +2022,7 @@ _0808060C:
.align 2, 0 .align 2, 0
_08080610: .4byte gUnknown_20386C8 _08080610: .4byte gUnknown_20386C8
_08080614: .4byte gUnknown_81C555B _08080614: .4byte gUnknown_81C555B
thumb_func_end sub_8080600 thumb_func_end BattleSetup_GetTrainerPostBattleScript
thumb_func_start sub_8080618 thumb_func_start sub_8080618
sub_8080618: @ 8080618 sub_8080618: @ 8080618
asm/battle_tower.s
+2 -2
View File
@@ -3218,7 +3218,7 @@ sub_80E724C: @ 80E724C
adds r1, r0 adds r1, r0
ldrh r0, [r1] ldrh r0, [r1]
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
cmp r4, 0x1 cmp r4, 0x1
@@ -3229,7 +3229,7 @@ sub_80E724C: @ 80E724C
adds r0, r1 adds r0, r1
ldrh r0, [r0] ldrh r0, [r0]
ldr r1, _080E7290 @ =gStringVar1 ldr r1, _080E7290 @ =gStringVar1
bl sub_8099E90 bl CopyItemName
ldr r0, _080E7294 @ =gSpecialVar_Result ldr r0, _080E7294 @ =gSpecialVar_Result
strh r4, [r0] strh r4, [r0]
b _080E72AA b _080E72AA
asm/berry_pouch.s
+7 -7
View File
@@ -733,7 +733,7 @@ sub_813D31C: @ 813D31C
bl StringAppend bl StringAppend
adds r0, r5, 0 adds r0, r5, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_8099E90 bl CopyItemName
ldr r1, _0813D394 @ =gUnknown_84643B4 ldr r1, _0813D394 @ =gUnknown_84643B4
adds r0, r4, 0 adds r0, r4, 0
bl StringAppend bl StringAppend
@@ -2497,7 +2497,7 @@ _0813E18A:
ldr r0, _0813E1F4 @ =gSpecialVar_ItemId ldr r0, _0813E1F4 @ =gSpecialVar_ItemId
ldrh r0, [r0] ldrh r0, [r0]
ldrh r1, [r5, 0x10] ldrh r1, [r5, 0x10]
bl sub_809A1D8 bl RemoveBagItem
movs r0, 0x9 movs r0, 0x9
bl sub_813EA98 bl sub_813EA98
ldrb r0, [r5] ldrb r0, [r5]
@@ -2736,7 +2736,7 @@ sub_813E37C: @ 813E37C
bne _0813E3D8 bne _0813E3D8
ldr r1, _0813E3C8 @ =gStringVar1 ldr r1, _0813E3C8 @ =gStringVar1
adds r0, r4, 0 adds r0, r4, 0
bl sub_8099E90 bl CopyItemName
ldr r4, _0813E3CC @ =gStringVar4 ldr r4, _0813E3CC @ =gStringVar4
ldr r1, _0813E3D0 @ =gUnknown_8416374 ldr r1, _0813E3D0 @ =gUnknown_8416374
adds r0, r4, 0 adds r0, r4, 0
@@ -2815,7 +2815,7 @@ sub_813E428: @ 813E428
bne _0813E488 bne _0813E488
ldrh r0, [r6] ldrh r0, [r6]
ldr r1, _0813E478 @ =gStringVar1 ldr r1, _0813E478 @ =gStringVar1
bl sub_8099E90 bl CopyItemName
ldr r4, _0813E47C @ =gStringVar4 ldr r4, _0813E47C @ =gStringVar4
ldr r1, _0813E480 @ =gUnknown_84168F1 ldr r1, _0813E480 @ =gUnknown_84168F1
adds r0, r4, 0 adds r0, r4, 0
@@ -2855,7 +2855,7 @@ _0813E4A0:
_0813E4A8: _0813E4A8:
ldrh r0, [r6] ldrh r0, [r6]
ldr r1, _0813E4D4 @ =gStringVar1 ldr r1, _0813E4D4 @ =gStringVar1
bl sub_8099E90 bl CopyItemName
ldr r4, _0813E4D8 @ =gStringVar4 ldr r4, _0813E4D8 @ =gStringVar4
ldr r1, _0813E4DC @ =gUnknown_8416911 ldr r1, _0813E4DC @ =gUnknown_8416911
adds r0, r4, 0 adds r0, r4, 0
@@ -3188,7 +3188,7 @@ sub_813E768: @ 813E768
ldr r0, _0813E7D8 @ =gSpecialVar_ItemId ldr r0, _0813E7D8 @ =gSpecialVar_ItemId
ldrh r0, [r0] ldrh r0, [r0]
ldr r1, _0813E7DC @ =gStringVar1 ldr r1, _0813E7DC @ =gStringVar1
bl sub_8099E90 bl CopyItemName
ldr r6, _0813E7E0 @ =gStringVar3 ldr r6, _0813E7E0 @ =gStringVar3
ldrh r1, [r4, 0x2] ldrh r1, [r4, 0x2]
movs r0, 0x5 movs r0, 0x5
@@ -3250,7 +3250,7 @@ sub_813E7F0: @ 813E7F0
ldrh r0, [r5] ldrh r0, [r5]
mov r2, r8 mov r2, r8
ldrh r1, [r2, 0x10] ldrh r1, [r2, 0x10]
bl sub_809A1D8 bl RemoveBagItem
ldr r7, _0813E8C4 @ =gSaveBlock1Ptr ldr r7, _0813E8C4 @ =gSaveBlock1Ptr
ldr r4, [r7] ldr r4, [r7]
movs r3, 0xA4 movs r3, 0xA4
asm/bike.s
+2 -2
View File
@@ -745,9 +745,9 @@ _080BD5F8:
cmp r0, 0 cmp r0, 0
beq _080BD618 beq _080BD618
adds r0, r4, 0 adds r0, r4, 0
bl sub_8055E78 bl Overworld_SetSavedMusic
adds r0, r4, 0 adds r0, r4, 0
bl sub_8055F48 bl Overworld_ChangeMusicTo
_080BD618: _080BD618:
pop {r4} pop {r4}
pop {r0} pop {r0}
asm/field_camera.s
+2 -2
View File
@@ -528,7 +528,7 @@ sub_805A948: @ 805A948
mov r8, r1 mov r8, r1
adds r0, r6, 0 adds r0, r6, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_8058E48 bl MapGridGetMetatileIdAt
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
movs r0, 0x80 movs r0, 0x80
@@ -557,7 +557,7 @@ _0805A98C:
asrs r0, 16 asrs r0, 16
lsls r1, r7, 16 lsls r1, r7, 16
asrs r1, 16 asrs r1, 16
bl sub_8058F8C bl MapGridGetMetatileLayerTypeAt
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
lsls r1, r4, 4 lsls r1, r4, 4
asm/field_control_avatar.s
+13 -13
View File
@@ -884,7 +884,7 @@ sub_806CF38: @ 806CF38
ldrh r1, [r4, 0x2] ldrh r1, [r4, 0x2]
b _0806CF7E b _0806CF7E
_0806CF60: _0806CF60:
ldr r1, _0806CFA4 @ =gUnknown_826D2D8 ldr r1, _0806CFA4 @ =gDirectionToVectors
lsls r2, r6, 3 lsls r2, r6, 3
adds r0, r2, r1 adds r0, r2, r1
ldr r3, [r0] ldr r3, [r0]
@@ -919,7 +919,7 @@ _0806CF9E:
movs r0, 0 movs r0, 0
b _0806CFDE b _0806CFDE
.align 2, 0 .align 2, 0
_0806CFA4: .4byte gUnknown_826D2D8 _0806CFA4: .4byte gDirectionToVectors
_0806CFA8: .4byte gMapObjects _0806CFA8: .4byte gMapObjects
_0806CFAC: _0806CFAC:
movs r4, 0 movs r4, 0
@@ -936,7 +936,7 @@ _0806CFBC:
adds r4, 0x1 adds r4, 0x1
cmp r4, 0x3 cmp r4, 0x3
ble _0806CFB0 ble _0806CFB0
ldr r0, _0806CFE8 @ =gUnknown_3005074 ldr r0, _0806CFE8 @ =gSelectedEventObject
strb r3, [r0] strb r3, [r0]
ldr r1, _0806CFEC @ =gSpecialVar_LastTalked ldr r1, _0806CFEC @ =gSpecialVar_LastTalked
adds r0, r2, r3 adds r0, r2, r3
@@ -954,7 +954,7 @@ _0806CFDE:
bx r1 bx r1
.align 2, 0 .align 2, 0
_0806CFE4: .4byte gUnknown_2031DEC _0806CFE4: .4byte gUnknown_2031DEC
_0806CFE8: .4byte gUnknown_3005074 _0806CFE8: .4byte gSelectedEventObject
_0806CFEC: .4byte gSpecialVar_LastTalked _0806CFEC: .4byte gSpecialVar_LastTalked
_0806CFF0: .4byte gSpecialVar_Facing _0806CFF0: .4byte gSpecialVar_Facing
thumb_func_end sub_806CF38 thumb_func_end sub_806CF38
@@ -994,7 +994,7 @@ _0806D02A:
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
bne _0806D092 bne _0806D092
ldr r1, _0806D09C @ =gUnknown_826D2D8 ldr r1, _0806D09C @ =gDirectionToVectors
mov r0, r8 mov r0, r8
lsls r2, r0, 3 lsls r2, r0, 3
adds r0, r2, r1 adds r0, r2, r1
@@ -1042,9 +1042,9 @@ _0806D092:
b _0806D0C8 b _0806D0C8
.align 2, 0 .align 2, 0
_0806D098: .4byte gMapObjects _0806D098: .4byte gMapObjects
_0806D09C: .4byte gUnknown_826D2D8 _0806D09C: .4byte gDirectionToVectors
_0806D0A0: _0806D0A0:
ldr r0, _0806D0D4 @ =gUnknown_3005074 ldr r0, _0806D0D4 @ =gSelectedEventObject
strb r5, [r0] strb r5, [r0]
ldr r4, _0806D0D8 @ =gSpecialVar_LastTalked ldr r4, _0806D0D8 @ =gSpecialVar_LastTalked
ldr r1, _0806D0DC @ =gMapObjects ldr r1, _0806D0DC @ =gMapObjects
@@ -1069,7 +1069,7 @@ _0806D0C8:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_0806D0D4: .4byte gUnknown_3005074 _0806D0D4: .4byte gSelectedEventObject
_0806D0D8: .4byte gSpecialVar_LastTalked _0806D0D8: .4byte gSpecialVar_LastTalked
_0806D0DC: .4byte gMapObjects _0806D0DC: .4byte gMapObjects
_0806D0E0: .4byte gSpecialVar_Facing _0806D0E0: .4byte gSpecialVar_Facing
@@ -2195,7 +2195,7 @@ mapheader_run_first_tag2_script_list_match_conditionally: @ 806D964
adds r1, r5, 0 adds r1, r5, 0
adds r2, r7, 0 adds r2, r7, 0
bl sub_806DC54 bl sub_806DC54
bl sub_807E438 bl DoWarp
movs r0, 0x1 movs r0, 0x1
b _0806DA02 b _0806DA02
.align 2, 0 .align 2, 0
@@ -2331,7 +2331,7 @@ _0806DAC4:
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
bne _0806DAE4 bne _0806DAE4
bl sub_80559E4 bl ResetInitialPlayerAvatarState
ldr r0, _0806DAE0 @ =gUnknown_81C1361 ldr r0, _0806DAE0 @ =gUnknown_81C1361
bl ScriptContext1_SetupScript bl ScriptContext1_SetupScript
movs r0, 0x1 movs r0, 0x1
@@ -2339,7 +2339,7 @@ _0806DAC4:
.align 2, 0 .align 2, 0
_0806DAE0: .4byte gUnknown_81C1361 _0806DAE0: .4byte gUnknown_81C1361
_0806DAE4: _0806DAE4:
bl sub_807E438 bl DoWarp
movs r0, 0x1 movs r0, 0x1
b _0806DAEE b _0806DAEE
_0806DAEC: _0806DAEC:
@@ -2638,7 +2638,7 @@ map_warp_consider_2_to_inside: @ 806DCD0
adds r1, r4, 0 adds r1, r4, 0
adds r2, r6, 0 adds r2, r6, 0
bl sub_806DC54 bl sub_806DC54
bl sub_807E4DC bl DoDoorWarp
movs r0, 0x1 movs r0, 0x1
b _0806DD32 b _0806DD32
.align 2, 0 .align 2, 0
@@ -2990,7 +2990,7 @@ _0806DF98:
cmp r0, 0 cmp r0, 0
beq _0806DFB0 beq _0806DFB0
bl sub_8055A08 bl sub_8055A08
bl sp13E_warp_to_last_warp bl DoDiveWarp
movs r0, 0xE2 movs r0, 0xE2
bl PlaySE bl PlaySE
movs r0, 0x1 movs r0, 0x1
asm/field_door.s
+22 -22
View File
@@ -337,7 +337,7 @@ sub_805B158: @ 805B158
adds r6, r2, 0 adds r6, r2, 0
adds r0, r5, 0 adds r0, r5, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_8058E48 bl MapGridGetMetatileIdAt
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
@@ -392,7 +392,7 @@ sub_805B1B8: @ 805B1B8
adds r6, r2, 0 adds r6, r2, 0
adds r0, r5, 0 adds r0, r5, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_8058E48 bl MapGridGetMetatileIdAt
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
@@ -439,7 +439,7 @@ sub_805B210: @ 805B210
adds r6, r2, 0 adds r6, r2, 0
adds r0, r5, 0 adds r0, r5, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_8058E48 bl MapGridGetMetatileIdAt
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
@@ -478,8 +478,8 @@ _0805B25C:
_0805B264: .4byte gUnknown_835B4B0 _0805B264: .4byte gUnknown_835B4B0
thumb_func_end sub_805B210 thumb_func_end sub_805B210
thumb_func_start sub_805B268 thumb_func_start FieldSetDoorOpened
sub_805B268: @ 805B268 FieldSetDoorOpened: @ 805B268
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -504,10 +504,10 @@ _0805B292:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0805B298: .4byte gUnknown_835B5D8 _0805B298: .4byte gUnknown_835B5D8
thumb_func_end sub_805B268 thumb_func_end FieldSetDoorOpened
thumb_func_start sub_805B29C thumb_func_start FieldSetDoorClosed
sub_805B29C: @ 805B29C FieldSetDoorClosed: @ 805B29C
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -532,10 +532,10 @@ _0805B2C6:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0805B2CC: .4byte gUnknown_835B5D8 _0805B2CC: .4byte gUnknown_835B5D8
thumb_func_end sub_805B29C thumb_func_end FieldSetDoorClosed
thumb_func_start sub_805B2D0 thumb_func_start FieldAnimateDoorClose
sub_805B2D0: @ 805B2D0 FieldAnimateDoorClose: @ 805B2D0
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -566,10 +566,10 @@ _0805B308:
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_805B2D0 thumb_func_end FieldAnimateDoorClose
thumb_func_start sub_805B310 thumb_func_start FieldAnimateDoorOpen
sub_805B310: @ 805B310 FieldAnimateDoorOpen: @ 805B310
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
adds r5, r1, 0 adds r5, r1, 0
@@ -600,10 +600,10 @@ _0805B348:
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_805B310 thumb_func_end FieldAnimateDoorOpen
thumb_func_start sub_805B350 thumb_func_start FieldIsDoorAnimationRunning
sub_805B350: @ 805B350 FieldIsDoorAnimationRunning: @ 805B350
push {lr} push {lr}
ldr r0, _0805B360 @ =sub_805B028 ldr r0, _0805B360 @ =sub_805B028
bl FuncIsActiveTask bl FuncIsActiveTask
@@ -613,10 +613,10 @@ sub_805B350: @ 805B350
bx r1 bx r1
.align 2, 0 .align 2, 0
_0805B360: .4byte sub_805B028 _0805B360: .4byte sub_805B028
thumb_func_end sub_805B350 thumb_func_end FieldIsDoorAnimationRunning
thumb_func_start sub_805B364 thumb_func_start GetDoorSoundEffect
sub_805B364: @ 805B364 GetDoorSoundEffect: @ 805B364
push {lr} push {lr}
adds r3, r0, 0 adds r3, r0, 0
adds r2, r1, 0 adds r2, r1, 0
@@ -635,7 +635,7 @@ _0805B380:
_0805B382: _0805B382:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_805B364 thumb_func_end GetDoorSoundEffect
thumb_func_start sub_805B388 thumb_func_start sub_805B388
sub_805B388: @ 805B388 sub_805B388: @ 805B388
@@ -643,7 +643,7 @@ sub_805B388: @ 805B388
adds r4, r0, 0 adds r4, r0, 0
adds r0, r1, 0 adds r0, r1, 0
adds r1, r2, 0 adds r1, r2, 0
bl sub_8058E48 bl MapGridGetMetatileIdAt
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
asm/field_effect.s
+1 -1
View File
@@ -6955,7 +6955,7 @@ sub_8086944: @ 8086944
cmp r0, 0 cmp r0, 0
beq _08086978 beq _08086978
adds r0, r4, 0 adds r0, r4, 0
bl sub_8055F48 bl Overworld_ChangeMusicTo
_08086978: _08086978:
movs r0, 0 movs r0, 0
pop {r4} pop {r4}
asm/field_effect_helpers.s
+4 -4
View File
@@ -845,7 +845,7 @@ unc_grass_normal: @ 80DB3EC
lsrs r4, r0, 8 lsrs r4, r0, 8
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r3, _080DB498 @ =gUnknown_2036E18 ldr r3, _080DB498 @ =gCamera
ldrb r1, [r3] ldrb r1, [r3]
movs r0, 0x1 movs r0, 0x1
ands r0, r1 ands r0, r1
@@ -921,7 +921,7 @@ _080DB48C:
bl FieldEffectStop bl FieldEffectStop
b _080DB4E4 b _080DB4E4
.align 2, 0 .align 2, 0
_080DB498: .4byte gUnknown_2036E18 _080DB498: .4byte gCamera
_080DB49C: .4byte gSaveBlock1Ptr _080DB49C: .4byte gSaveBlock1Ptr
_080DB4A0: _080DB4A0:
mov r0, sp mov r0, sp
@@ -1196,7 +1196,7 @@ unc_grass_tall: @ 80DB69C
lsrs r7, r0, 8 lsrs r7, r0, 8
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
ldr r3, _080DB748 @ =gUnknown_2036E18 ldr r3, _080DB748 @ =gCamera
ldrb r1, [r3] ldrb r1, [r3]
movs r0, 0x1 movs r0, 0x1
ands r0, r1 ands r0, r1
@@ -1272,7 +1272,7 @@ _080DB73C:
bl FieldEffectStop bl FieldEffectStop
b _080DB786 b _080DB786
.align 2, 0 .align 2, 0
_080DB748: .4byte gUnknown_2036E18 _080DB748: .4byte gCamera
_080DB74C: .4byte gSaveBlock1Ptr _080DB74C: .4byte gSaveBlock1Ptr
_080DB750: _080DB750:
mov r0, sp mov r0, sp
asm/field_fadetransition.s
+23 -23
View File
@@ -661,7 +661,7 @@ _0807E028:
ldrsh r0, [r6, r2] ldrsh r0, [r6, r2]
movs r2, 0 movs r2, 0
ldrsh r1, [r7, r2] ldrsh r1, [r7, r2]
bl sub_805B268 bl FieldSetDoorOpened
movs r0, 0x1 movs r0, 0x1
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
b _0807E206 b _0807E206
@@ -691,7 +691,7 @@ _0807E074:
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
movs r2, 0 movs r2, 0
ldrsh r1, [r7, r2] ldrsh r1, [r7, r2]
bl sub_805B364 bl GetDoorSoundEffect
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl PlaySE bl PlaySE
@@ -699,12 +699,12 @@ _0807E074:
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
movs r2, 0 movs r2, 0
ldrsh r1, [r7, r2] ldrsh r1, [r7, r2]
bl sub_805B310 bl FieldAnimateDoorOpen
movs r0, 0x7 movs r0, 0x7
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
b _0807E206 b _0807E206
_0807E0A2: _0807E0A2:
bl sub_805B350 bl FieldIsDoorAnimationRunning
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0807E0AE beq _0807E0AE
@@ -750,7 +750,7 @@ _0807E0FC:
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
movs r2, 0x22 movs r2, 0x22
ldrsh r1, [r4, r2] ldrsh r1, [r4, r2]
bl sub_805B2D0 bl FieldAnimateDoorClose
movs r0, 0x9 movs r0, 0x9
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
b _0807E206 b _0807E206
@@ -762,7 +762,7 @@ _0807E10E:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0807E206 beq _0807E206
bl sub_805B350 bl FieldIsDoorAnimationRunning
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0807E206 bne _0807E206
@@ -822,7 +822,7 @@ _0807E198:
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
movs r2, 0 movs r2, 0
ldrsh r1, [r7, r2] ldrsh r1, [r7, r2]
bl sub_805B2D0 bl FieldAnimateDoorClose
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
strh r0, [r4, 0xA] strh r0, [r4, 0xA]
@@ -1153,8 +1153,8 @@ _0807E434:
bx r1 bx r1
thumb_func_end sub_807E418 thumb_func_end sub_807E418
thumb_func_start sub_807E438 thumb_func_start DoWarp
sub_807E438: @ 807E438 DoWarp: @ 807E438
push {lr} push {lr}
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl sub_8055F88 bl sub_8055F88
@@ -1174,10 +1174,10 @@ sub_807E438: @ 807E438
_0807E464: .4byte gUnknown_3005020 _0807E464: .4byte gUnknown_3005020
_0807E468: .4byte sub_807DF64 _0807E468: .4byte sub_807DF64
_0807E46C: .4byte sub_807E718 _0807E46C: .4byte sub_807E718
thumb_func_end sub_807E438 thumb_func_end DoWarp
thumb_func_start sp13E_warp_to_last_warp thumb_func_start DoDiveWarp
sp13E_warp_to_last_warp: @ 807E470 DoDiveWarp: @ 807E470
push {lr} push {lr}
bl ScriptContext2_Enable bl ScriptContext2_Enable
bl sub_8055F88 bl sub_8055F88
@@ -1195,7 +1195,7 @@ sp13E_warp_to_last_warp: @ 807E470
_0807E494: .4byte gUnknown_3005020 _0807E494: .4byte gUnknown_3005020
_0807E498: .4byte sub_807DF64 _0807E498: .4byte sub_807DF64
_0807E49C: .4byte sub_807E718 _0807E49C: .4byte sub_807E718
thumb_func_end sp13E_warp_to_last_warp thumb_func_end DoDiveWarp
thumb_func_start sub_807E4A0 thumb_func_start sub_807E4A0
sub_807E4A0: @ 807E4A0 sub_807E4A0: @ 807E4A0
@@ -1228,8 +1228,8 @@ _0807E4D4: .4byte sub_807E980
_0807E4D8: .4byte gTasks _0807E4D8: .4byte gTasks
thumb_func_end sub_807E4A0 thumb_func_end sub_807E4A0
thumb_func_start sub_807E4DC thumb_func_start DoDoorWarp
sub_807E4DC: @ 807E4DC DoDoorWarp: @ 807E4DC
push {lr} push {lr}
bl ScriptContext2_Enable bl ScriptContext2_Enable
ldr r0, _0807E4F4 @ =gUnknown_3005020 ldr r0, _0807E4F4 @ =gUnknown_3005020
@@ -1244,7 +1244,7 @@ sub_807E4DC: @ 807E4DC
_0807E4F4: .4byte gUnknown_3005020 _0807E4F4: .4byte gUnknown_3005020
_0807E4F8: .4byte sub_807DF64 _0807E4F8: .4byte sub_807DF64
_0807E4FC: .4byte sub_807E80C _0807E4FC: .4byte sub_807E80C
thumb_func_end sub_807E4DC thumb_func_end DoDoorWarp
thumb_func_start sub_807E500 thumb_func_start sub_807E500
sub_807E500: @ 807E500 sub_807E500: @ 807E500
@@ -1282,10 +1282,10 @@ _0807E540: .4byte sub_807DF64
_0807E544: .4byte sub_807E784 _0807E544: .4byte sub_807E784
thumb_func_end sub_807E524 thumb_func_end sub_807E524
thumb_func_start sp13F_fall_to_last_warp thumb_func_start DoFallWarp
sp13F_fall_to_last_warp: @ 807E548 DoFallWarp: @ 807E548
push {lr} push {lr}
bl sp13E_warp_to_last_warp bl DoDiveWarp
ldr r1, _0807E558 @ =gUnknown_3005020 ldr r1, _0807E558 @ =gUnknown_3005020
ldr r0, _0807E55C @ =sub_8084454 ldr r0, _0807E55C @ =sub_8084454
str r0, [r1] str r0, [r1]
@@ -1294,7 +1294,7 @@ sp13F_fall_to_last_warp: @ 807E548
.align 2, 0 .align 2, 0
_0807E558: .4byte gUnknown_3005020 _0807E558: .4byte gUnknown_3005020
_0807E55C: .4byte sub_8084454 _0807E55C: .4byte sub_8084454
thumb_func_end sp13F_fall_to_last_warp thumb_func_end DoFallWarp
thumb_func_start sub_807E560 thumb_func_start sub_807E560
sub_807E560: @ 807E560 sub_807E560: @ 807E560
@@ -1690,7 +1690,7 @@ _0807E85C:
movs r2, 0 movs r2, 0
ldrsh r1, [r6, r2] ldrsh r1, [r6, r2]
subs r1, 0x1 subs r1, 0x1
bl sub_805B364 bl GetDoorSoundEffect
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
bl PlaySE bl PlaySE
@@ -1699,7 +1699,7 @@ _0807E85C:
movs r2, 0 movs r2, 0
ldrsh r1, [r6, r2] ldrsh r1, [r6, r2]
subs r1, 0x1 subs r1, 0x1
bl sub_805B310 bl FieldAnimateDoorOpen
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
strh r0, [r5, 0xA] strh r0, [r5, 0xA]
@@ -1760,7 +1760,7 @@ _0807E8F4:
movs r2, 0 movs r2, 0
ldrsh r1, [r6, r2] ldrsh r1, [r6, r2]
subs r1, 0x1 subs r1, 0x1
bl sub_805B2D0 bl FieldAnimateDoorClose
lsls r0, 24 lsls r0, 24
asrs r0, 24 asrs r0, 24
strh r0, [r5, 0xA] strh r0, [r5, 0xA]
asm/field_map_obj.s
+11 -11
View File
@@ -673,7 +673,7 @@ sub_805E2E8: @ 805E2E8
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0805E37C beq _0805E37C
ldr r1, _0805E374 @ =gUnknown_3005040 ldr r1, _0805E374 @ =VMap
ldr r0, [r1] ldr r0, [r1]
adds r3, r0, 0 adds r3, r0, 0
subs r3, 0x10 subs r3, 0x10
@@ -736,7 +736,7 @@ _0805E36A:
movs r0, 0 movs r0, 0
b _0805E37E b _0805E37E
.align 2, 0 .align 2, 0
_0805E374: .4byte gUnknown_3005040 _0805E374: .4byte VMap
_0805E378: .4byte gSaveBlock1Ptr _0805E378: .4byte gSaveBlock1Ptr
_0805E37C: _0805E37C:
movs r0, 0x1 movs r0, 0x1
@@ -1614,8 +1614,8 @@ _0805E9F0: .4byte 0x0000ffff
_0805E9F4: .4byte gSprites _0805E9F4: .4byte gSprites
thumb_func_end AddPseudoFieldObject thumb_func_end AddPseudoFieldObject
thumb_func_start sub_805E9F8 thumb_func_start sprite_new
sub_805E9F8: @ 805E9F8 sprite_new: @ 805E9F8
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -1772,7 +1772,7 @@ _0805EB24:
_0805EB38: .4byte sub_8068FA8 _0805EB38: .4byte sub_8068FA8
_0805EB3C: .4byte 0x0000ffff _0805EB3C: .4byte 0x0000ffff
_0805EB40: .4byte gSprites _0805EB40: .4byte gSprites
thumb_func_end sub_805E9F8 thumb_func_end sprite_new
thumb_func_start sub_805EB44 thumb_func_start sub_805EB44
sub_805EB44: @ 805EB44 sub_805EB44: @ 805EB44
@@ -3516,7 +3516,7 @@ npc_coords_shift_still: @ 805F818
thumb_func_start UpdateFieldObjectCoordsForCameraUpdate thumb_func_start UpdateFieldObjectCoordsForCameraUpdate
UpdateFieldObjectCoordsForCameraUpdate: @ 805F82C UpdateFieldObjectCoordsForCameraUpdate: @ 805F82C
push {r4,r5,lr} push {r4,r5,lr}
ldr r2, _0805F88C @ =gUnknown_2036E18 ldr r2, _0805F88C @ =gCamera
ldrb r1, [r2] ldrb r1, [r2]
movs r0, 0x1 movs r0, 0x1
ands r0, r1 ands r0, r1
@@ -3566,7 +3566,7 @@ _0805F884:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0805F88C: .4byte gUnknown_2036E18 _0805F88C: .4byte gCamera
_0805F890: .4byte gMapObjects _0805F890: .4byte gMapObjects
thumb_func_end UpdateFieldObjectCoordsForCameraUpdate thumb_func_end UpdateFieldObjectCoordsForCameraUpdate
@@ -12332,13 +12332,13 @@ npc_block_way: @ 80636AC
_080636E2: _080636E2:
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl sub_8058DC4 bl MapGridIsImpassableAt
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08063724 bne _08063724
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl sub_8059334 bl GetMapBorderIdAt
movs r1, 0x1 movs r1, 0x1
negs r1, r1 negs r1, r1
cmp r0, r1 cmp r0, r1
@@ -12432,13 +12432,13 @@ sub_8063770: @ 8063770
lsrs r4, r1, 31 lsrs r4, r1, 31
adds r0, r6, 0 adds r0, r6, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_8058DC4 bl MapGridIsImpassableAt
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080637E8 bne _080637E8
adds r0, r6, 0 adds r0, r6, 0
adds r1, r5, 0 adds r1, r5, 0
bl sub_8059334 bl GetMapBorderIdAt
movs r1, 0x1 movs r1, 0x1
negs r1, r1 negs r1, r1
cmp r0, r1 cmp r0, r1
asm/field_player_avatar.s
+1 -1
View File
@@ -2818,7 +2818,7 @@ PartyHasMonWithSurf: @ 805C83C
_0805C84E: _0805C84E:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x39 movs r1, 0x39
bl pokemon_has_move bl MonKnowsMove
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0805C860 beq _0805C860
asm/field_specials.s
+10 -10
View File
@@ -33,9 +33,9 @@ _080CA644:
movs r4, 0x8D movs r4, 0x8D
lsls r4, 1 lsls r4, 1
adds r0, r4, 0 adds r0, r4, 0
bl sub_8055E78 bl Overworld_SetSavedMusic
adds r0, r4, 0 adds r0, r4, 0
bl sub_8055F48 bl Overworld_ChangeMusicTo
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@@ -3138,7 +3138,7 @@ _080CBDE4: .4byte gSpecialVar_0x8004
thumb_func_start sub_80CBDE8 thumb_func_start sub_80CBDE8
sub_80CBDE8: @ 80CBDE8 sub_80CBDE8: @ 80CBDE8
ldr r1, _080CBDF8 @ =gUnknown_3005074 ldr r1, _080CBDF8 @ =gSelectedEventObject
movs r0, 0 movs r0, 0
strb r0, [r1] strb r0, [r1]
ldr r1, _080CBDFC @ =gUnknown_20370DA ldr r1, _080CBDFC @ =gUnknown_20370DA
@@ -3146,7 +3146,7 @@ sub_80CBDE8: @ 80CBDE8
strh r0, [r1] strh r0, [r1]
bx lr bx lr
.align 2, 0 .align 2, 0
_080CBDF8: .4byte gUnknown_3005074 _080CBDF8: .4byte gSelectedEventObject
_080CBDFC: .4byte gUnknown_20370DA _080CBDFC: .4byte gUnknown_20370DA
thumb_func_end sub_80CBDE8 thumb_func_end sub_80CBDE8
@@ -3157,7 +3157,7 @@ sub_80CBE00: @ 80CBE00
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0xFF cmp r0, 0xFF
bne _080CBE44 bne _080CBE44
ldr r1, _080CBE1C @ =gUnknown_3005074 ldr r1, _080CBE1C @ =gSelectedEventObject
ldrb r0, [r1] ldrb r0, [r1]
cmp r0, 0 cmp r0, 0
bne _080CBE20 bne _080CBE20
@@ -3165,7 +3165,7 @@ sub_80CBE00: @ 80CBE00
b _080CBE48 b _080CBE48
.align 2, 0 .align 2, 0
_080CBE18: .4byte gUnknown_20370DA _080CBE18: .4byte gUnknown_20370DA
_080CBE1C: .4byte gUnknown_3005074 _080CBE1C: .4byte gSelectedEventObject
_080CBE20: _080CBE20:
ldr r2, _080CBE4C @ =gMapObjects ldr r2, _080CBE4C @ =gMapObjects
ldrb r1, [r1] ldrb r1, [r1]
@@ -3267,7 +3267,7 @@ TV_PrintIntToStringVar: @ 80CBED4
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
adds r0, r5, 0 adds r0, r5, 0
bl sub_80CBF04 bl CountDigits
adds r3, r0, 0 adds r3, r0, 0
ldr r0, _080CBF00 @ =gUnknown_83F5AF8 ldr r0, _080CBF00 @ =gUnknown_83F5AF8
lsls r4, 2 lsls r4, 2
@@ -3285,8 +3285,8 @@ TV_PrintIntToStringVar: @ 80CBED4
_080CBF00: .4byte gUnknown_83F5AF8 _080CBF00: .4byte gUnknown_83F5AF8
thumb_func_end TV_PrintIntToStringVar thumb_func_end TV_PrintIntToStringVar
thumb_func_start sub_80CBF04 thumb_func_start CountDigits
sub_80CBF04: @ 80CBF04 CountDigits: @ 80CBF04
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
movs r1, 0xA movs r1, 0xA
@@ -3366,7 +3366,7 @@ _080CBF9A:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80CBF04 thumb_func_end CountDigits
thumb_func_start sub_80CBFA0 thumb_func_start sub_80CBFA0
sub_80CBFA0: @ 80CBFA0 sub_80CBFA0: @ 80CBFA0
asm/field_tasks.s
+2 -2
View File
@@ -490,7 +490,7 @@ _0806EB8E:
ldrsh r0, [r0, r3] ldrsh r0, [r0, r3]
movs r2, 0 movs r2, 0
ldrsh r1, [r4, r2] ldrsh r1, [r4, r2]
bl sub_8058E48 bl MapGridGetMetatileIdAt
ldr r1, _0806EBDC @ =0x0000020a ldr r1, _0806EBDC @ =0x0000020a
cmp r0, r1 cmp r0, r1
bne _0806EBE4 bne _0806EBE4
@@ -534,7 +534,7 @@ sub_806EC04: @ 806EC04
asrs r4, r1, 16 asrs r4, r1, 16
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl sub_8058E48 bl MapGridGetMetatileIdAt
ldr r1, _0806EC38 @ =0x0000022f ldr r1, _0806EC38 @ =0x0000022f
ldr r2, _0806EC3C @ =0x00000237 ldr r2, _0806EC3C @ =0x00000237
cmp r0, r1 cmp r0, r1
asm/field_weather.s
+3 -3
View File
@@ -2804,8 +2804,8 @@ sav1_get_weather_probably: @ 807B130
_0807B13C: .4byte gSaveBlock1Ptr _0807B13C: .4byte gSaveBlock1Ptr
thumb_func_end sav1_get_weather_probably thumb_func_end sav1_get_weather_probably
thumb_func_start sub_807B140 thumb_func_start SetSav1WeatherFromCurrMapHeader
sub_807B140: @ 807B140 SetSav1WeatherFromCurrMapHeader: @ 807B140
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, _0807B16C @ =gSaveBlock1Ptr ldr r4, _0807B16C @ =gSaveBlock1Ptr
ldr r0, [r4] ldr r0, [r4]
@@ -2828,7 +2828,7 @@ sub_807B140: @ 807B140
.align 2, 0 .align 2, 0
_0807B16C: .4byte gSaveBlock1Ptr _0807B16C: .4byte gSaveBlock1Ptr
_0807B170: .4byte gMapHeader _0807B170: .4byte gMapHeader
thumb_func_end sub_807B140 thumb_func_end SetSav1WeatherFromCurrMapHeader
thumb_func_start SetWeather thumb_func_start SetWeather
SetWeather: @ 807B174 SetWeather: @ 807B174
asm/fieldmap.s
-2400
View File
File diff suppressed because it is too large Load Diff
asm/fldeff_cut.s
+1 -1
View File
@@ -380,7 +380,7 @@ sub_8097B50: @ 8097B50
asrs r0, 16 asrs r0, 16
lsrs r7, r1, 16 lsrs r7, r1, 16
asrs r1, 16 asrs r1, 16
bl sub_8058E48 bl MapGridGetMetatileIdAt
lsls r0, 16 lsls r0, 16
lsrs r2, r0, 16 lsrs r2, r0, 16
ldr r1, _08097B84 @ =gUnknown_83D4100 ldr r1, _08097B84 @ =gUnknown_83D4100
asm/hall_of_fame.s
+2 -2
View File
@@ -1459,8 +1459,8 @@ sub_80F2934: @ 80F2934
movs r1, 0x9 movs r1, 0x9
movs r3, 0xB movs r3, 0xB
bl Overworld_SetWarpDestination bl Overworld_SetWarpDestination
bl sub_807E438 bl DoWarp
bl sub_80559E4 bl ResetInitialPlayerAvatarState
add sp, 0x4 add sp, 0x4
pop {r0} pop {r0}
bx r0 bx r0
asm/help_system_812B1E0.s
+1 -1
View File
@@ -967,7 +967,7 @@ _0812B98C: .4byte 0x00000829
_0812B990: _0812B990:
ldr r0, _0812B99C @ =0x00000169 ldr r0, _0812B99C @ =0x00000169
movs r1, 0x1 movs r1, 0x1
bl sub_8099F40 bl CheckBagHasItem
b _0812BAF6 b _0812BAF6
.align 2, 0 .align 2, 0
_0812B99C: .4byte 0x00000169 _0812B99C: .4byte 0x00000169
asm/item.s
+25 -25
View File
@@ -149,8 +149,8 @@ _08099E88: .4byte gSaveBlock1Ptr
_08099E8C: .4byte 0x0000054c _08099E8C: .4byte 0x0000054c
thumb_func_end sub_8099E44 thumb_func_end sub_8099E44
thumb_func_start sub_8099E90 thumb_func_start CopyItemName
sub_8099E90: @ 8099E90 CopyItemName: @ 8099E90
push {r4,lr} push {r4,lr}
adds r4, r1, 0 adds r4, r1, 0
lsls r0, 16 lsls r0, 16
@@ -177,7 +177,7 @@ _08099EC4:
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8099E90 thumb_func_end CopyItemName
thumb_func_start sub_8099ECC thumb_func_start sub_8099ECC
sub_8099ECC: @ 8099ECC sub_8099ECC: @ 8099ECC
@@ -252,8 +252,8 @@ _08099F3C:
bx r1 bx r1
thumb_func_end sub_8099F08 thumb_func_end sub_8099F08
thumb_func_start sub_8099F40 thumb_func_start CheckBagHasItem
sub_8099F40: @ 8099F40 CheckBagHasItem: @ 8099F40
push {r4,r5,lr} push {r4,r5,lr}
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
@@ -310,14 +310,14 @@ _08099FA6:
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8099F40 thumb_func_end CheckBagHasItem
thumb_func_start sub_8099FAC thumb_func_start sub_8099FAC
sub_8099FAC: @ 8099FAC sub_8099FAC: @ 8099FAC
push {r4,lr} push {r4,lr}
ldr r0, _08099FC0 @ =0x0000016d ldr r0, _08099FC0 @ =0x0000016d
movs r1, 0x1 movs r1, 0x1
bl sub_8099F40 bl CheckBagHasItem
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -338,7 +338,7 @@ _08099FD4:
_08099FD6: _08099FD6:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8099F40 bl CheckBagHasItem
lsls r0, 24 lsls r0, 24
lsrs r1, r0, 24 lsrs r1, r0, 24
cmp r1, 0 cmp r1, 0
@@ -360,8 +360,8 @@ _08099FF6:
_08099FFC: .4byte gSpecialVar_Result _08099FFC: .4byte gSpecialVar_Result
thumb_func_end sub_8099FAC thumb_func_end sub_8099FAC
thumb_func_start sub_809A000 thumb_func_start CheckBagHasSpace
sub_809A000: @ 809A000 CheckBagHasSpace: @ 809A000
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
@@ -428,10 +428,10 @@ _0809A07C:
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_809A000 thumb_func_end CheckBagHasSpace
thumb_func_start sub_809A084 thumb_func_start AddBagItem
sub_809A084: @ 809A084 AddBagItem: @ 809A084
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -494,7 +494,7 @@ _0809A0F4:
lsls r4, 1 lsls r4, 1
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8099F40 bl CheckBagHasItem
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0809A132 bne _0809A132
@@ -522,7 +522,7 @@ _0809A132:
ldr r4, _0809A1B0 @ =0x0000016d ldr r4, _0809A1B0 @ =0x0000016d
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_8099F40 bl CheckBagHasItem
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0809A174 bne _0809A174
@@ -595,10 +595,10 @@ _0809A1CC:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_809A084 thumb_func_end AddBagItem
thumb_func_start sub_809A1D8 thumb_func_start RemoveBagItem
sub_809A1D8: @ 809A1D8 RemoveBagItem: @ 809A1D8
push {r4-r7,lr} push {r4-r7,lr}
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
@@ -667,7 +667,7 @@ _0809A25A:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_809A1D8 thumb_func_end RemoveBagItem
thumb_func_start GetPocketByItemId thumb_func_start GetPocketByItemId
GetPocketByItemId: @ 809A260 GetPocketByItemId: @ 809A260
@@ -832,8 +832,8 @@ _0809A35C:
_0809A370: .4byte gSaveBlock1Ptr _0809A370: .4byte gSaveBlock1Ptr
thumb_func_end sub_809A33C thumb_func_end sub_809A33C
thumb_func_start sub_809A374 thumb_func_start CheckPCHasItem
sub_809A374: @ 809A374 CheckPCHasItem: @ 809A374
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 16 lsls r0, 16
lsrs r6, r0, 16 lsrs r6, r0, 16
@@ -875,10 +875,10 @@ _0809A3C0:
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_809A374 thumb_func_end CheckPCHasItem
thumb_func_start sub_809A3C8 thumb_func_start AddPCItem
sub_809A3C8: @ 809A3C8 AddPCItem: @ 809A3C8
push {r4-r7,lr} push {r4-r7,lr}
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
@@ -955,7 +955,7 @@ _0809A458:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_809A3C8 thumb_func_end AddPCItem
thumb_func_start sub_809A460 thumb_func_start sub_809A460
sub_809A460: @ 809A460 sub_809A460: @ 809A460
asm/item_menu.s
+21 -21
View File
@@ -3237,7 +3237,7 @@ sub_810971C: @ 810971C
lsrs r0, 16 lsrs r0, 16
ldr r1, _081097D8 @ =gStringVar1 ldr r1, _081097D8 @ =gStringVar1
mov r10, r1 mov r10, r1
bl sub_8099E90 bl CopyItemName
ldr r0, _081097DC @ =gStringVar4 ldr r0, _081097DC @ =gStringVar4
mov r9, r0 mov r9, r0
adds r1, r6, 0 adds r1, r6, 0
@@ -3725,7 +3725,7 @@ _08109AD4:
ldr r0, _08109BA8 @ =gSpecialVar_ItemId ldr r0, _08109BA8 @ =gSpecialVar_ItemId
ldrh r0, [r0] ldrh r0, [r0]
ldr r1, _08109BAC @ =gStringVar1 ldr r1, _08109BAC @ =gStringVar1
bl sub_8099E90 bl CopyItemName
ldr r6, _08109BB0 @ =gStringVar4 ldr r6, _08109BB0 @ =gStringVar4
ldr r1, _08109BB4 @ =gUnknown_84162FF ldr r1, _08109BB4 @ =gUnknown_84162FF
adds r0, r6, 0 adds r0, r6, 0
@@ -4125,7 +4125,7 @@ sub_8109EA8: @ 8109EA8
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldr r1, _08109F30 @ =gStringVar1 ldr r1, _08109F30 @ =gStringVar1
bl sub_8099E90 bl CopyItemName
ldr r0, _08109F34 @ =gStringVar2 ldr r0, _08109F34 @ =gStringVar2
movs r2, 0x10 movs r2, 0x10
ldrsh r1, [r6, r2] ldrsh r1, [r6, r2]
@@ -4200,7 +4200,7 @@ _08109F6E:
ldr r0, _08109FF4 @ =gSpecialVar_ItemId ldr r0, _08109FF4 @ =gSpecialVar_ItemId
ldrh r0, [r0] ldrh r0, [r0]
ldrh r1, [r7, 0x10] ldrh r1, [r7, 0x10]
bl sub_809A1D8 bl RemoveBagItem
movs r0, 0x6 movs r0, 0x6
bl sub_810BA3C bl sub_810BA3C
ldrb r0, [r7] ldrb r0, [r7]
@@ -4447,7 +4447,7 @@ sub_810A18C: @ 810A18C
ldr r0, _0810A1BC @ =gSpecialVar_ItemId ldr r0, _0810A1BC @ =gSpecialVar_ItemId
ldrh r0, [r0] ldrh r0, [r0]
ldr r1, _0810A1C0 @ =gStringVar1 ldr r1, _0810A1C0 @ =gStringVar1
bl sub_8099E90 bl CopyItemName
ldr r5, _0810A1C4 @ =gStringVar4 ldr r5, _0810A1C4 @ =gStringVar4
ldr r1, _0810A1C8 @ =gUnknown_841635E ldr r1, _0810A1C8 @ =gUnknown_841635E
adds r0, r5, 0 adds r0, r5, 0
@@ -4969,7 +4969,7 @@ _0810A5B4:
bne _0810A5F8 bne _0810A5F8
ldrh r0, [r6] ldrh r0, [r6]
ldr r1, _0810A5E8 @ =gStringVar1 ldr r1, _0810A5E8 @ =gStringVar1
bl sub_8099E90 bl CopyItemName
ldr r4, _0810A5EC @ =gStringVar4 ldr r4, _0810A5EC @ =gStringVar4
ldr r1, _0810A5F0 @ =gUnknown_84168F1 ldr r1, _0810A5F0 @ =gUnknown_84168F1
adds r0, r4, 0 adds r0, r4, 0
@@ -5007,7 +5007,7 @@ _0810A610:
_0810A618: _0810A618:
ldrh r0, [r6] ldrh r0, [r6]
ldr r1, _0810A644 @ =gStringVar1 ldr r1, _0810A644 @ =gStringVar1
bl sub_8099E90 bl CopyItemName
ldr r4, _0810A648 @ =gStringVar4 ldr r4, _0810A648 @ =gStringVar4
ldr r1, _0810A64C @ =gUnknown_8416911 ldr r1, _0810A64C @ =gUnknown_8416911
adds r0, r4, 0 adds r0, r4, 0
@@ -5397,7 +5397,7 @@ sub_810A940: @ 810A940
ldr r0, _0810A9B8 @ =gSpecialVar_ItemId ldr r0, _0810A9B8 @ =gSpecialVar_ItemId
ldrh r0, [r0] ldrh r0, [r0]
ldr r1, _0810A9BC @ =gStringVar1 ldr r1, _0810A9BC @ =gStringVar1
bl sub_8099E90 bl CopyItemName
ldr r6, _0810A9C0 @ =gStringVar3 ldr r6, _0810A9C0 @ =gStringVar3
ldr r0, _0810A9C4 @ =gUnknown_203ACFC ldr r0, _0810A9C4 @ =gUnknown_203ACFC
ldrb r0, [r0, 0x6] ldrb r0, [r0, 0x6]
@@ -5464,7 +5464,7 @@ sub_810A9D4: @ 810A9D4
ldrh r0, [r5] ldrh r0, [r5]
mov r2, r8 mov r2, r8
ldrh r1, [r2, 0x10] ldrh r1, [r2, 0x10]
bl sub_809A1D8 bl RemoveBagItem
ldr r3, _0810AAE0 @ =gSaveBlock1Ptr ldr r3, _0810AAE0 @ =gSaveBlock1Ptr
ldr r4, [r3] ldr r4, [r3]
movs r7, 0xA4 movs r7, 0xA4
@@ -5744,7 +5744,7 @@ sub_810AC40: @ 810AC40
ldr r5, _0810ACD0 @ =gSpecialVar_ItemId ldr r5, _0810ACD0 @ =gSpecialVar_ItemId
ldrh r0, [r5] ldrh r0, [r5]
ldrh r1, [r7, 0x10] ldrh r1, [r7, 0x10]
bl sub_809A3C8 bl AddPCItem
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
cmp r6, 0x1 cmp r6, 0x1
@@ -5756,7 +5756,7 @@ sub_810AC40: @ 810AC40
bl sub_80A2294 bl sub_80A2294
ldrh r0, [r5] ldrh r0, [r5]
ldr r1, _0810ACD8 @ =gStringVar1 ldr r1, _0810ACD8 @ =gStringVar1
bl sub_8099E90 bl CopyItemName
ldr r0, _0810ACDC @ =gStringVar2 ldr r0, _0810ACDC @ =gStringVar2
movs r2, 0x10 movs r2, 0x10
ldrsh r1, [r7, r2] ldrsh r1, [r7, r2]
@@ -5839,7 +5839,7 @@ _0810AD1E:
cmp r0, 0 cmp r0, 0
beq _0810AD98 beq _0810AD98
movs r1, 0x1 movs r1, 0x1
bl sub_8099F40 bl CheckBagHasItem
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
cmp r6, 0x1 cmp r6, 0x1
@@ -6120,10 +6120,10 @@ sub_810AF74: @ 810AF74
bl sub_810ADD8 bl sub_810ADD8
movs r0, 0xD movs r0, 0xD
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
movs r0, 0x4 movs r0, 0x4
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
ldr r2, _0810AF98 @ =sub_8030AEC ldr r2, _0810AF98 @ =sub_8030AEC
movs r0, 0x6 movs r0, 0x6
movs r1, 0 movs r1, 0
@@ -6317,27 +6317,27 @@ sub_810B108: @ 810B108
bl sub_810ADD8 bl sub_810ADD8
movs r0, 0xD movs r0, 0xD
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
movs r0, 0xE movs r0, 0xE
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
movs r0, 0xB7 movs r0, 0xB7
lsls r0, 1 lsls r0, 1
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
movs r0, 0xB6 movs r0, 0xB6
lsls r0, 1 lsls r0, 1
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
movs r0, 0x4 movs r0, 0x4
movs r1, 0x5 movs r1, 0x5
bl sub_809A084 bl AddBagItem
movs r0, 0x3 movs r0, 0x3
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
movs r0, 0x8 movs r0, 0x8
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
cmp r4, 0x7 cmp r4, 0x7
beq _0810B160 beq _0810B160
cmp r4, 0x8 cmp r4, 0x8
asm/item_pc.s
+4 -4
View File
@@ -1886,7 +1886,7 @@ sub_810E274: @ 810E274
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldr r1, _0810E348 @ =gStringVar1 ldr r1, _0810E348 @ =gStringVar1
bl sub_8099E90 bl CopyItemName
ldr r6, _0810E34C @ =gStringVar4 ldr r6, _0810E34C @ =gStringVar4
ldr r1, _0810E350 @ =gUnknown_84162FF ldr r1, _0810E350 @ =gUnknown_84162FF
adds r0, r6, 0 adds r0, r6, 0
@@ -2036,7 +2036,7 @@ sub_810E418: @ 810E418
lsrs r4, r0, 16 lsrs r4, r0, 16
ldrh r1, [r5, 0x10] ldrh r1, [r5, 0x10]
adds r0, r4, 0 adds r0, r4, 0
bl sub_809A084 bl AddBagItem
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -2048,7 +2048,7 @@ sub_810E418: @ 810E418
bl sub_80A2294 bl sub_80A2294
ldr r1, _0810E4A4 @ =gStringVar1 ldr r1, _0810E4A4 @ =gStringVar1
adds r0, r4, 0 adds r0, r4, 0
bl sub_8099E90 bl CopyItemName
ldr r0, _0810E4A8 @ =gStringVar2 ldr r0, _0810E4A8 @ =gStringVar2
movs r2, 0x10 movs r2, 0x10
ldrsh r1, [r5, r2] ldrsh r1, [r5, r2]
@@ -2241,7 +2241,7 @@ sub_810E5E0: @ 810E5E0
lsrs r0, 16 lsrs r0, 16
ldr r6, _0810E660 @ =gStringVar1 ldr r6, _0810E660 @ =gStringVar1
adds r1, r6, 0 adds r1, r6, 0
bl sub_8099E90 bl CopyItemName
ldr r5, _0810E664 @ =gStringVar4 ldr r5, _0810E664 @ =gStringVar4
ldr r1, _0810E668 @ =gUnknown_84177AC ldr r1, _0810E668 @ =gUnknown_84177AC
adds r0, r5, 0 adds r0, r5, 0
asm/item_use.s
+8 -8
View File
@@ -544,7 +544,7 @@ _080A13D4:
ldrsh r0, [r0, r1] ldrsh r0, [r0, r1]
movs r2, 0 movs r2, 0
ldrsh r1, [r4, r2] ldrsh r1, [r4, r2]
bl sub_8058DC4 bl MapGridIsImpassableAt
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080A13D0 beq _080A13D0
@@ -1361,7 +1361,7 @@ sub_80A1A44: @ 80A1A44
ldr r4, _080A1A84 @ =gSpecialVar_ItemId ldr r4, _080A1A84 @ =gSpecialVar_ItemId
ldrh r0, [r4] ldrh r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
ldrh r0, [r4] ldrh r0, [r4]
bl ItemId_GetPocket bl ItemId_GetPocket
lsls r0, 24 lsls r0, 24
@@ -1374,7 +1374,7 @@ sub_80A1A44: @ 80A1A44
bl sub_81089F4 bl sub_81089F4
ldrh r0, [r4] ldrh r0, [r4]
ldr r1, _080A1A88 @ =gStringVar2 ldr r1, _080A1A88 @ =gStringVar2
bl sub_8099E90 bl CopyItemName
ldr r0, _080A1A8C @ =gStringVar4 ldr r0, _080A1A8C @ =gStringVar4
ldr r1, _080A1A90 @ =gUnknown_841658C ldr r1, _080A1A90 @ =gUnknown_841658C
bl StringExpandPlaceholders bl StringExpandPlaceholders
@@ -1409,7 +1409,7 @@ sub_80A1A94: @ 80A1A94
bl FlagClear bl FlagClear
ldrh r0, [r5] ldrh r0, [r5]
ldr r1, _080A1AE4 @ =gStringVar2 ldr r1, _080A1AE4 @ =gStringVar2
bl sub_8099E90 bl CopyItemName
ldr r0, _080A1AE8 @ =gStringVar4 ldr r0, _080A1AE8 @ =gStringVar4
ldr r1, _080A1AEC @ =gUnknown_84165D2 ldr r1, _080A1AEC @ =gUnknown_84165D2
bl StringExpandPlaceholders bl StringExpandPlaceholders
@@ -1435,7 +1435,7 @@ _080A1AF4:
bl FlagClear bl FlagClear
ldrh r0, [r5] ldrh r0, [r5]
ldr r1, _080A1B34 @ =gStringVar2 ldr r1, _080A1B34 @ =gStringVar2
bl sub_8099E90 bl CopyItemName
ldr r0, _080A1B38 @ =gStringVar4 ldr r0, _080A1B38 @ =gStringVar4
ldr r1, _080A1B3C @ =gUnknown_8416600 ldr r1, _080A1B3C @ =gUnknown_8416600
bl StringExpandPlaceholders bl StringExpandPlaceholders
@@ -1597,7 +1597,7 @@ sub_80A1C44: @ 80A1C44
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
bl sub_80559E4 bl ResetInitialPlayerAvatarState
bl sub_8085620 bl sub_8085620
adds r0, r4, 0 adds r0, r4, 0
bl DestroyTask bl DestroyTask
@@ -1844,7 +1844,7 @@ sub_80A1E1C: @ 80A1E1C
ldr r0, _080A1E44 @ =gSpecialVar_ItemId ldr r0, _080A1E44 @ =gSpecialVar_ItemId
ldrh r0, [r0] ldrh r0, [r0]
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
bl sub_8108CB4 bl sub_8108CB4
adds r0, r4, 0 adds r0, r4, 0
bl sub_8108B50 bl sub_8108B50
@@ -1959,7 +1959,7 @@ sub_80A1EF4: @ 80A1EF4
bl PlaySE bl PlaySE
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
adds r0, r4, 0 adds r0, r4, 0
bl sub_8042DA4 bl sub_8042DA4
adds r2, r0, 0 adds r2, r0, 0
asm/link_rfu.s
+1 -1
View File
@@ -3259,7 +3259,7 @@ sub_80FEC54: @ 80FEC54
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_805642C bl is_c1_link_related_active
cmp r0, 0 cmp r0, 0
bne _080FEC70 bne _080FEC70
_080FEC62: _080FEC62:
asm/link_rfu_3.s
+2 -2
View File
@@ -3366,7 +3366,7 @@ sub_8117440: @ 8117440
str r5, [sp, 0x4] str r5, [sp, 0x4]
movs r0, 0 movs r0, 0
mov r3, r8 mov r3, r8
bl saved_warp2_set_2 bl SetDynamicWarpWithCoords
bl warp_in bl warp_in
add sp, 0x8 add sp, 0x8
pop {r3} pop {r3}
@@ -11969,7 +11969,7 @@ _0811BADA:
str r0, [sp, 0x4] str r0, [sp, 0x4]
movs r0, 0x19 movs r0, 0x19
adds r1, r4, 0 adds r1, r4, 0
bl sub_805E9F8 bl sprite_new
ldr r1, [sp, 0x8] ldr r1, [sp, 0x8]
adds r5, r1, r5 adds r5, r1, r5
strb r0, [r5] strb r0, [r5]
asm/map_obj_lock.s
+10 -10
View File
@@ -101,7 +101,7 @@ _080695F6:
cmp r0, 0 cmp r0, 0
bne _0806961E bne _0806961E
ldr r2, _08069640 @ =gMapObjects ldr r2, _08069640 @ =gMapObjects
ldr r0, _08069644 @ =gUnknown_3005074 ldr r0, _08069644 @ =gSelectedEventObject
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 3 lsls r0, r1, 3
adds r0, r1 adds r0, r1
@@ -133,7 +133,7 @@ _08069634:
.align 2, 0 .align 2, 0
_0806963C: .4byte gTasks _0806963C: .4byte gTasks
_08069640: .4byte gMapObjects _08069640: .4byte gMapObjects
_08069644: .4byte gUnknown_3005074 _08069644: .4byte gSelectedEventObject
thumb_func_end sub_80695CC thumb_func_end sub_80695CC
thumb_func_start sub_8069648 thumb_func_start sub_8069648
@@ -159,7 +159,7 @@ _08069666:
thumb_func_start LockSelectedMapObject thumb_func_start LockSelectedMapObject
LockSelectedMapObject: @ 806966C LockSelectedMapObject: @ 806966C
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, _080696B0 @ =gUnknown_3005074 ldr r4, _080696B0 @ =gSelectedEventObject
ldrb r0, [r4] ldrb r0, [r4]
bl FreezeMapObjectsExceptOne bl FreezeMapObjectsExceptOne
ldr r0, _080696B4 @ =sub_80695CC ldr r0, _080696B4 @ =sub_80695CC
@@ -191,7 +191,7 @@ _080696AA:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080696B0: .4byte gUnknown_3005074 _080696B0: .4byte gSelectedEventObject
_080696B4: .4byte sub_80695CC _080696B4: .4byte sub_80695CC
_080696B8: .4byte gMapObjects _080696B8: .4byte gMapObjects
_080696BC: .4byte gTasks _080696BC: .4byte gTasks
@@ -225,7 +225,7 @@ _080696EC: .4byte gMapObjects
sub_80696F0: @ 80696F0 sub_80696F0: @ 80696F0
push {r4,lr} push {r4,lr}
ldr r4, _08069738 @ =gMapObjects ldr r4, _08069738 @ =gMapObjects
ldr r0, _0806973C @ =gUnknown_3005074 ldr r0, _0806973C @ =gSelectedEventObject
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 3 lsls r0, r1, 3
adds r0, r1 adds r0, r1
@@ -257,13 +257,13 @@ _0806970E:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08069738: .4byte gMapObjects _08069738: .4byte gMapObjects
_0806973C: .4byte gUnknown_3005074 _0806973C: .4byte gSelectedEventObject
thumb_func_end sub_80696F0 thumb_func_end sub_80696F0
thumb_func_start sub_8069740 thumb_func_start sub_8069740
sub_8069740: @ 8069740 sub_8069740: @ 8069740
push {lr} push {lr}
ldr r0, _0806975C @ =gUnknown_3005074 ldr r0, _0806975C @ =gSelectedEventObject
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 3 lsls r0, r1, 3
adds r0, r1 adds r0, r1
@@ -276,7 +276,7 @@ sub_8069740: @ 8069740
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0806975C: .4byte gUnknown_3005074 _0806975C: .4byte gSelectedEventObject
_08069760: .4byte gMapObjects _08069760: .4byte gMapObjects
_08069764: .4byte gSpecialVar_Facing _08069764: .4byte gSpecialVar_Facing
thumb_func_end sub_8069740 thumb_func_end sub_8069740
@@ -284,7 +284,7 @@ _08069764: .4byte gSpecialVar_Facing
thumb_func_start sub_8069768 thumb_func_start sub_8069768
sub_8069768: @ 8069768 sub_8069768: @ 8069768
push {lr} push {lr}
ldr r0, _08069780 @ =gUnknown_3005074 ldr r0, _08069780 @ =gSelectedEventObject
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 3 lsls r0, r1, 3
adds r0, r1 adds r0, r1
@@ -295,7 +295,7 @@ sub_8069768: @ 8069768
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08069780: .4byte gUnknown_3005074 _08069780: .4byte gSelectedEventObject
_08069784: .4byte gMapObjects _08069784: .4byte gMapObjects
thumb_func_end sub_8069768 thumb_func_end sub_8069768
asm/menu_helpers.s
+2 -2
View File
@@ -334,7 +334,7 @@ itemid_80BF6D8_mail_related: @ 80BF6D8
push {r4,lr} push {r4,lr}
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
bl sub_805642C bl is_c1_link_related_active
cmp r0, 0x1 cmp r0, 0x1
beq _080BF6EE beq _080BF6EE
bl InUnionRoom bl InUnionRoom
@@ -360,7 +360,7 @@ _080BF702:
thumb_func_start sub_80BF708 thumb_func_start sub_80BF708
sub_80BF708: @ 80BF708 sub_80BF708: @ 80BF708
push {lr} push {lr}
bl sub_805642C bl is_c1_link_related_active
cmp r0, 0x1 cmp r0, 0x1
beq _080BF71A beq _080BF71A
ldr r0, _080BF720 @ =gReceivedRemoteLinkPlayers ldr r0, _080BF720 @ =gReceivedRemoteLinkPlayers
asm/overworld.s
+67 -67
View File
@@ -72,7 +72,7 @@ sub_8054C48: @ 8054C48
bl sub_8054C04 bl sub_8054C04
adds r4, r0, 0 adds r4, r0, 0
ldr r5, _08054C6C @ =gStringVar1 ldr r5, _08054C6C @ =gStringVar1
bl sub_80CBF04 bl CountDigits
adds r3, r0, 0 adds r3, r0, 0
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
@@ -118,7 +118,7 @@ _08054C9C: .4byte gUnknown_826D29E
thumb_func_start sub_8054CA0 thumb_func_start sub_8054CA0
sub_8054CA0: @ 8054CA0 sub_8054CA0: @ 8054CA0
push {lr} push {lr}
bl sub_80559E4 bl ResetInitialPlayerAvatarState
movs r0, 0x83 movs r0, 0x83
lsls r0, 4 lsls r0, 4
bl FlagClear bl FlagClear
@@ -157,7 +157,7 @@ _08054D04: .4byte 0x0000404d
thumb_func_start sub_8054D08 thumb_func_start sub_8054D08
sub_8054D08: @ 8054D08 sub_8054D08: @ 8054D08
push {lr} push {lr}
bl sub_80559E4 bl ResetInitialPlayerAvatarState
movs r0, 0x83 movs r0, 0x83
lsls r0, 4 lsls r0, 4
bl FlagClear bl FlagClear
@@ -196,7 +196,7 @@ _08054D6C: .4byte 0x0000404d
thumb_func_start sub_8054D70 thumb_func_start sub_8054D70
sub_8054D70: @ 8054D70 sub_8054D70: @ 8054D70
push {lr} push {lr}
bl sub_80559E4 bl ResetInitialPlayerAvatarState
movs r0, 0x83 movs r0, 0x83
lsls r0, 4 lsls r0, 4
bl FlagClear bl FlagClear
@@ -235,7 +235,7 @@ _08054DD4: .4byte 0x0000404d
thumb_func_start sub_8054DD8 thumb_func_start sub_8054DD8
sub_8054DD8: @ 8054DD8 sub_8054DD8: @ 8054DD8
push {lr} push {lr}
bl sub_80559E4 bl ResetInitialPlayerAvatarState
movs r0, 0x83 movs r0, 0x83
lsls r0, 4 lsls r0, 4
bl FlagClear bl FlagClear
@@ -1084,8 +1084,8 @@ saved_warp2_set: @ 80553E8
_08055418: .4byte gSaveBlock1Ptr _08055418: .4byte gSaveBlock1Ptr
thumb_func_end saved_warp2_set thumb_func_end saved_warp2_set
thumb_func_start saved_warp2_set_2 thumb_func_start SetDynamicWarpWithCoords
saved_warp2_set_2: @ 805541C SetDynamicWarpWithCoords: @ 805541C
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x8 sub sp, 0x8
ldr r4, [sp, 0x14] ldr r4, [sp, 0x14]
@@ -1112,7 +1112,7 @@ saved_warp2_set_2: @ 805541C
bx r0 bx r0
.align 2, 0 .align 2, 0
_08055450: .4byte gSaveBlock1Ptr _08055450: .4byte gSaveBlock1Ptr
thumb_func_end saved_warp2_set_2 thumb_func_end SetDynamicWarpWithCoords
thumb_func_start copy_saved_warp2_bank_and_enter_x_to_warp1 thumb_func_start copy_saved_warp2_bank_and_enter_x_to_warp1
copy_saved_warp2_bank_and_enter_x_to_warp1: @ 8055454 copy_saved_warp2_bank_and_enter_x_to_warp1: @ 8055454
@@ -1185,8 +1185,8 @@ sub_80554BC: @ 80554BC
_080554C8: .4byte gUnknown_2031DBC _080554C8: .4byte gUnknown_2031DBC
thumb_func_end sub_80554BC thumb_func_end sub_80554BC
thumb_func_start sub_80554CC thumb_func_start SetLastHealLocationWarp
sub_80554CC: @ 80554CC SetLastHealLocationWarp: @ 80554CC
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x8 sub sp, 0x8
lsls r0, 24 lsls r0, 24
@@ -1218,7 +1218,7 @@ _08055500:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08055508: .4byte gSaveBlock1Ptr _08055508: .4byte gSaveBlock1Ptr
thumb_func_end sub_80554CC thumb_func_end SetLastHealLocationWarp
thumb_func_start sub_805550C thumb_func_start sub_805550C
sub_805550C: @ 805550C sub_805550C: @ 805550C
@@ -1281,7 +1281,7 @@ sub_805550C: @ 805550C
lsls r4, 24 lsls r4, 24
asrs r4, 24 asrs r4, 24
str r4, [sp] str r4, [sp]
bl sub_80555A0 bl SetEscapeWarp
_08055590: _08055590:
add sp, 0x4 add sp, 0x4
pop {r4-r7} pop {r4-r7}
@@ -1292,8 +1292,8 @@ _08055598: .4byte gUnknown_2031DBC
_0805559C: .4byte gSaveBlock1Ptr _0805559C: .4byte gSaveBlock1Ptr
thumb_func_end sub_805550C thumb_func_end sub_805550C
thumb_func_start sub_80555A0 thumb_func_start SetEscapeWarp
sub_80555A0: @ 80555A0 SetEscapeWarp: @ 80555A0
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x8 sub sp, 0x8
adds r4, r0, 0 adds r4, r0, 0
@@ -1325,7 +1325,7 @@ sub_80555A0: @ 80555A0
bx r0 bx r0
.align 2, 0 .align 2, 0
_080555DC: .4byte gSaveBlock1Ptr _080555DC: .4byte gSaveBlock1Ptr
thumb_func_end sub_80555A0 thumb_func_end SetEscapeWarp
thumb_func_start sub_80555E0 thumb_func_start sub_80555E0
sub_80555E0: @ 80555E0 sub_80555E0: @ 80555E0
@@ -1342,8 +1342,8 @@ _080555F0: .4byte gUnknown_2031DBC
_080555F4: .4byte gSaveBlock1Ptr _080555F4: .4byte gSaveBlock1Ptr
thumb_func_end sub_80555E0 thumb_func_end sub_80555E0
thumb_func_start sub_80555F8 thumb_func_start SetFixedDiveWarp
sub_80555F8: @ 80555F8 SetFixedDiveWarp: @ 80555F8
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x8 sub sp, 0x8
adds r4, r0, 0 adds r4, r0, 0
@@ -1373,7 +1373,7 @@ sub_80555F8: @ 80555F8
bx r0 bx r0
.align 2, 0 .align 2, 0
_08055630: .4byte gUnknown_2031DC4 _08055630: .4byte gUnknown_2031DC4
thumb_func_end sub_80555F8 thumb_func_end SetFixedDiveWarp
thumb_func_start warp1_set_to_warp2 thumb_func_start warp1_set_to_warp2
warp1_set_to_warp2: @ 8055634 warp1_set_to_warp2: @ 8055634
@@ -1389,8 +1389,8 @@ _08055644: .4byte gUnknown_2031DBC
_08055648: .4byte gUnknown_2031DC4 _08055648: .4byte gUnknown_2031DC4
thumb_func_end warp1_set_to_warp2 thumb_func_end warp1_set_to_warp2
thumb_func_start sub_805564C thumb_func_start SetFixedHoleWarp
sub_805564C: @ 805564C SetFixedHoleWarp: @ 805564C
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x8 sub sp, 0x8
adds r4, r0, 0 adds r4, r0, 0
@@ -1420,10 +1420,10 @@ sub_805564C: @ 805564C
bx r0 bx r0
.align 2, 0 .align 2, 0
_08055684: .4byte gUnknown_2031DCC _08055684: .4byte gUnknown_2031DCC
thumb_func_end sub_805564C thumb_func_end SetFixedHoleWarp
thumb_func_start sub_8055688 thumb_func_start SetWarpDestinationToFixedHoleWarp
sub_8055688: @ 8055688 SetWarpDestinationToFixedHoleWarp: @ 8055688
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0x4 sub sp, 0x4
lsls r0, 16 lsls r0, 16
@@ -1464,7 +1464,7 @@ _080556D6:
pop {r4-r6} pop {r4-r6}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8055688 thumb_func_end SetWarpDestinationToFixedHoleWarp
thumb_func_start warp1_set_to_sav1w thumb_func_start warp1_set_to_sav1w
warp1_set_to_sav1w: @ 80556E0 warp1_set_to_sav1w: @ 80556E0
@@ -1712,7 +1712,7 @@ sub_8055864: @ 8055864
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl sub_810C578 bl sub_810C578
bl sub_807B140 bl SetSav1WeatherFromCurrMapHeader
bl sub_805610C bl sub_805610C
bl sub_8055CB8 bl sub_8055CB8
bl sav1_reset_battle_music_maybe bl sav1_reset_battle_music_maybe
@@ -1723,7 +1723,7 @@ sub_8055864: @ 8055864
ldr r0, [r4] ldr r0, [r4]
bl copy_map_tileset2_to_vram_2 bl copy_map_tileset2_to_vram_2
ldr r0, [r4] ldr r0, [r4]
bl sub_8059AA0 bl apply_map_tileset2_palette
movs r4, 0x7 movs r4, 0x7
_080558D4: _080558D4:
lsls r0, r4, 24 lsls r0, r4, 24
@@ -1784,7 +1784,7 @@ sub_8055920: @ 8055920
lsls r1, 16 lsls r1, 16
lsrs r1, 16 lsrs r1, 16
bl sub_810C578 bl sub_810C578
bl sub_807B140 bl SetSav1WeatherFromCurrMapHeader
bl sub_805610C bl sub_805610C
cmp r4, 0 cmp r4, 0
beq _08055974 beq _08055974
@@ -1817,7 +1817,7 @@ sub_80559A8: @ 80559A8
ldrb r0, [r0, 0x17] ldrb r0, [r0, 0x17]
bl is_light_level_1_2_3_5_or_6 bl is_light_level_1_2_3_5_or_6
bl TrySetMapSaveWarpStatus bl TrySetMapSaveWarpStatus
bl sub_807B140 bl SetSav1WeatherFromCurrMapHeader
bl sub_805610C bl sub_805610C
bl sub_8055CB8 bl sub_8055CB8
bl sub_8110920 bl sub_8110920
@@ -1830,8 +1830,8 @@ sub_80559A8: @ 80559A8
_080559E0: .4byte gMapHeader _080559E0: .4byte gMapHeader
thumb_func_end sub_80559A8 thumb_func_end sub_80559A8
thumb_func_start sub_80559E4 thumb_func_start ResetInitialPlayerAvatarState
sub_80559E4: @ 80559E4 ResetInitialPlayerAvatarState: @ 80559E4
ldr r0, _080559F4 @ =gUnknown_2031DD4 ldr r0, _080559F4 @ =gUnknown_2031DD4
movs r2, 0 movs r2, 0
movs r1, 0x1 movs r1, 0x1
@@ -1841,7 +1841,7 @@ sub_80559E4: @ 80559E4
bx lr bx lr
.align 2, 0 .align 2, 0
_080559F4: .4byte gUnknown_2031DD4 _080559F4: .4byte gUnknown_2031DD4
thumb_func_end sub_80559E4 thumb_func_end ResetInitialPlayerAvatarState
thumb_func_start sub_80559F8 thumb_func_start sub_80559F8
sub_80559F8: @ 80559F8 sub_80559F8: @ 80559F8
@@ -2295,8 +2295,8 @@ sav1_get_flash_used_on_map: @ 8055D30
_08055D3C: .4byte gSaveBlock1Ptr _08055D3C: .4byte gSaveBlock1Ptr
thumb_func_end sav1_get_flash_used_on_map thumb_func_end sav1_get_flash_used_on_map
thumb_func_start sub_8055D40 thumb_func_start SetCurrentMapLayout
sub_8055D40: @ 8055D40 SetCurrentMapLayout: @ 8055D40
push {lr} push {lr}
ldr r1, _08055D54 @ =gSaveBlock1Ptr ldr r1, _08055D54 @ =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
@@ -2309,7 +2309,7 @@ sub_8055D40: @ 8055D40
.align 2, 0 .align 2, 0
_08055D54: .4byte gSaveBlock1Ptr _08055D54: .4byte gSaveBlock1Ptr
_08055D58: .4byte gMapHeader _08055D58: .4byte gMapHeader
thumb_func_end sub_8055D40 thumb_func_end SetCurrentMapLayout
thumb_func_start sub_8055D5C thumb_func_start sub_8055D5C
sub_8055D5C: @ 8055D5C sub_8055D5C: @ 8055D5C
@@ -2464,15 +2464,15 @@ _08055E6C:
_08055E74: .4byte 0x00000131 _08055E74: .4byte 0x00000131
thumb_func_end sub_8055DC4 thumb_func_end sub_8055DC4
thumb_func_start sub_8055E78 thumb_func_start Overworld_SetSavedMusic
sub_8055E78: @ 8055E78 Overworld_SetSavedMusic: @ 8055E78
ldr r1, _08055E80 @ =gSaveBlock1Ptr ldr r1, _08055E80 @ =gSaveBlock1Ptr
ldr r1, [r1] ldr r1, [r1]
strh r0, [r1, 0x2C] strh r0, [r1, 0x2C]
bx lr bx lr
.align 2, 0 .align 2, 0
_08055E80: .4byte gSaveBlock1Ptr _08055E80: .4byte gSaveBlock1Ptr
thumb_func_end sub_8055E78 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: @ 8055E84 sav1_reset_battle_music_maybe: @ 8055E84
@@ -2573,8 +2573,8 @@ _08055F42:
bx r0 bx r0
thumb_func_end Overworld_ChangeMusicToDefault thumb_func_end Overworld_ChangeMusicToDefault
thumb_func_start sub_8055F48 thumb_func_start Overworld_ChangeMusicTo
sub_8055F48: @ 8055F48 Overworld_ChangeMusicTo: @ 8055F48
push {r4,lr} push {r4,lr}
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
@@ -2590,7 +2590,7 @@ _08055F62:
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_8055F48 thumb_func_end Overworld_ChangeMusicTo
thumb_func_start GetMapMusicFadeoutSpeed thumb_func_start GetMapMusicFadeoutSpeed
GetMapMusicFadeoutSpeed: @ 8055F68 GetMapMusicFadeoutSpeed: @ 8055F68
@@ -3225,8 +3225,8 @@ sub_8056420: @ 8056420
bx r0 bx r0
thumb_func_end sub_8056420 thumb_func_end sub_8056420
thumb_func_start sub_805642C thumb_func_start is_c1_link_related_active
sub_805642C: @ 805642C is_c1_link_related_active: @ 805642C
push {lr} push {lr}
ldr r0, _0805643C @ =gMain ldr r0, _0805643C @ =gMain
ldr r1, [r0] ldr r1, [r0]
@@ -3243,7 +3243,7 @@ _08056444:
_08056446: _08056446:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_805642C thumb_func_end is_c1_link_related_active
thumb_func_start sub_805644C thumb_func_start sub_805644C
sub_805644C: @ 805644C sub_805644C: @ 805644C
@@ -3494,7 +3494,7 @@ CB2_NewGame: @ 8056644
bl StopMapMusic bl StopMapMusic
bl sub_8056420 bl sub_8056420
bl sub_8054A60 bl sub_8054A60
bl sub_80559E4 bl ResetInitialPlayerAvatarState
bl PlayTimeCounter_Start bl PlayTimeCounter_Start
bl ScriptContext1_Init bl ScriptContext1_Init
bl ScriptContext2_Disable bl ScriptContext2_Disable
@@ -3662,7 +3662,7 @@ _080567D8: .4byte sub_80565B4
thumb_func_start c2_exit_to_overworld_2_switch thumb_func_start c2_exit_to_overworld_2_switch
c2_exit_to_overworld_2_switch: @ 80567DC c2_exit_to_overworld_2_switch: @ 80567DC
push {lr} push {lr}
bl sub_805642C bl is_c1_link_related_active
cmp r0, 0x1 cmp r0, 0x1
bne _080567F4 bne _080567F4
ldr r0, _080567F0 @ =c2_exit_to_overworld_2_link ldr r0, _080567F0 @ =c2_exit_to_overworld_2_link
@@ -4024,14 +4024,14 @@ _08056AEE:
_08056AF4: _08056AF4:
ldr r0, _08056B00 @ =gMapHeader ldr r0, _08056B00 @ =gMapHeader
ldr r0, [r0] ldr r0, [r0]
bl sub_8059A54 bl copy_map_tileset1_to_vram
b _08056B62 b _08056B62
.align 2, 0 .align 2, 0
_08056B00: .4byte gMapHeader _08056B00: .4byte gMapHeader
_08056B04: _08056B04:
ldr r0, _08056B10 @ =gMapHeader ldr r0, _08056B10 @ =gMapHeader
ldr r0, [r0] ldr r0, [r0]
bl sub_8059A68 bl copy_map_tileset2_to_vram
b _08056B62 b _08056B62
.align 2, 0 .align 2, 0
_08056B10: .4byte gMapHeader _08056B10: .4byte gMapHeader
@@ -4166,14 +4166,14 @@ _08056C2A:
_08056C30: _08056C30:
ldr r0, _08056C3C @ =gMapHeader ldr r0, _08056C3C @ =gMapHeader
ldr r0, [r0] ldr r0, [r0]
bl sub_8059A54 bl copy_map_tileset1_to_vram
b _08056CCA b _08056CCA
.align 2, 0 .align 2, 0
_08056C3C: .4byte gMapHeader _08056C3C: .4byte gMapHeader
_08056C40: _08056C40:
ldr r0, _08056C4C @ =gMapHeader ldr r0, _08056C4C @ =gMapHeader
ldr r0, [r0] ldr r0, [r0]
bl sub_8059A68 bl copy_map_tileset2_to_vram
b _08056CCA b _08056CCA
.align 2, 0 .align 2, 0
_08056C4C: .4byte gMapHeader _08056C4C: .4byte gMapHeader
@@ -4355,14 +4355,14 @@ _08056DCA:
_08056DD0: _08056DD0:
ldr r0, _08056DDC @ =gMapHeader ldr r0, _08056DDC @ =gMapHeader
ldr r0, [r0] ldr r0, [r0]
bl sub_8059A54 bl copy_map_tileset1_to_vram
b _08056E3E b _08056E3E
.align 2, 0 .align 2, 0
_08056DDC: .4byte gMapHeader _08056DDC: .4byte gMapHeader
_08056DE0: _08056DE0:
ldr r0, _08056DEC @ =gMapHeader ldr r0, _08056DEC @ =gMapHeader
ldr r0, [r0] ldr r0, [r0]
bl sub_8059A68 bl copy_map_tileset2_to_vram
b _08056E3E b _08056E3E
.align 2, 0 .align 2, 0
_08056DEC: .4byte gMapHeader _08056DEC: .4byte gMapHeader
@@ -4690,7 +4690,7 @@ mli4_mapscripts_and_other: @ 805709C
adds r4, 0x2 adds r4, 0x2
mov r0, sp mov r0, sp
adds r1, r4, 0 adds r1, r4, 0
bl sav1_camera_get_focus_coords bl GetCameraFocusCoords
bl sub_8055A6C bl sub_8055A6C
adds r5, r0, 0 adds r5, r0, 0
mov r0, sp mov r0, sp
@@ -4705,7 +4705,7 @@ mli4_mapscripts_and_other: @ 805709C
bl InitPlayerAvatar bl InitPlayerAvatar
ldrb r0, [r5] ldrb r0, [r5]
bl SetPlayerAvatarTransitionFlags bl SetPlayerAvatarTransitionFlags
bl sub_80559E4 bl ResetInitialPlayerAvatarState
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl sub_805EC30 bl sub_805EC30
@@ -4792,7 +4792,7 @@ sub_8057178: @ 8057178
adds r4, 0x2 adds r4, 0x2
mov r0, sp mov r0, sp
adds r1, r4, 0 adds r1, r4, 0
bl sav1_camera_get_focus_coords bl GetCameraFocusCoords
mov r2, sp mov r2, sp
ldr r0, _080571A4 @ =gUnknown_300502C ldr r0, _080571A4 @ =gUnknown_300502C
ldrb r1, [r0] ldrb r1, [r0]
@@ -4801,7 +4801,7 @@ sub_8057178: @ 8057178
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldrh r1, [r4] ldrh r1, [r4]
bl sub_80597EC bl SetCameraFocusCoords
add sp, 0x4 add sp, 0x4
pop {r4} pop {r4}
pop {r0} pop {r0}
@@ -4820,7 +4820,7 @@ sub_80571A8: @ 80571A8
adds r4, 0x2 adds r4, 0x2
mov r0, sp mov r0, sp
adds r1, r4, 0 adds r1, r4, 0
bl sav1_camera_get_focus_coords bl GetCameraFocusCoords
mov r3, sp mov r3, sp
mov r2, sp mov r2, sp
ldr r0, _08057224 @ =gUnknown_300502C ldr r0, _08057224 @ =gUnknown_300502C
@@ -5066,14 +5066,14 @@ _080573C2:
_080573C8: _080573C8:
ldr r0, _080573D4 @ =gMapHeader ldr r0, _080573D4 @ =gMapHeader
ldr r0, [r0] ldr r0, [r0]
bl sub_8059A54 bl copy_map_tileset1_to_vram
b _08057412 b _08057412
.align 2, 0 .align 2, 0
_080573D4: .4byte gMapHeader _080573D4: .4byte gMapHeader
_080573D8: _080573D8:
ldr r0, _080573E4 @ =gMapHeader ldr r0, _080573E4 @ =gMapHeader
ldr r0, [r0] ldr r0, [r0]
bl sub_8059A68 bl copy_map_tileset2_to_vram
b _08057412 b _08057412
.align 2, 0 .align 2, 0
_080573E4: .4byte gMapHeader _080573E4: .4byte gMapHeader
@@ -5415,14 +5415,14 @@ _080576CC:
_080576D2: _080576D2:
ldr r0, _080576DC @ =gMapHeader ldr r0, _080576DC @ =gMapHeader
ldr r0, [r0] ldr r0, [r0]
bl sub_8059A54 bl copy_map_tileset1_to_vram
b _0805772A b _0805772A
.align 2, 0 .align 2, 0
_080576DC: .4byte gMapHeader _080576DC: .4byte gMapHeader
_080576E0: _080576E0:
ldr r0, _080576EC @ =gMapHeader ldr r0, _080576EC @ =gMapHeader
ldr r0, [r0] ldr r0, [r0]
bl sub_8059A68 bl copy_map_tileset2_to_vram
b _0805772A b _0805772A
.align 2, 0 .align 2, 0
_080576EC: .4byte gMapHeader _080576EC: .4byte gMapHeader
@@ -6144,7 +6144,7 @@ _08057C72:
bl sub_805833C bl sub_805833C
cmp r0, 0x1 cmp r0, 0x1
bls _08057CA8 bls _08057CA8
bl sub_805642C bl is_c1_link_related_active
cmp r0, 0x1 cmp r0, 0x1
bne _08057CA8 bne _08057CA8
bl sub_800A00C bl sub_800A00C
@@ -6748,7 +6748,7 @@ _08058074:
ldr r1, [r4, 0x8] ldr r1, [r4, 0x8]
str r0, [sp] str r0, [sp]
str r1, [sp, 0x4] str r1, [sp, 0x4]
ldr r3, _080580E4 @ =gUnknown_826D2D8 ldr r3, _080580E4 @ =gDirectionToVectors
ldrb r0, [r4, 0x3] ldrb r0, [r4, 0x3]
lsls r0, 3 lsls r0, 3
adds r0, r3 adds r0, r3
@@ -6801,7 +6801,7 @@ _080580E0:
ldr r0, _080580F8 @ =gUnknown_81BB9A3 ldr r0, _080580F8 @ =gUnknown_81BB9A3
b _08058122 b _08058122
.align 2, 0 .align 2, 0
_080580E4: .4byte gUnknown_826D2D8 _080580E4: .4byte gDirectionToVectors
_080580E8: .4byte 0xffff0000 _080580E8: .4byte 0xffff0000
_080580EC: .4byte 0x0000ffff _080580EC: .4byte 0x0000ffff
_080580F0: .4byte 0xffffff00 _080580F0: .4byte 0xffffff00
@@ -6976,7 +6976,7 @@ _08058240: .4byte gUnknown_81BB9F0
thumb_func_start sub_8058244 thumb_func_start sub_8058244
sub_8058244: @ 8058244 sub_8058244: @ 8058244
push {lr} push {lr}
bl sub_805642C bl is_c1_link_related_active
cmp r0, 0 cmp r0, 0
bne _08058252 bne _08058252
movs r0, 0 movs r0, 0
@@ -7009,7 +7009,7 @@ sub_8058274: @ 8058274
bl sub_800B248 bl sub_800B248
cmp r0, 0x1 cmp r0, 0x1
bls _080582D8 bls _080582D8
bl sub_805642C bl is_c1_link_related_active
cmp r0, 0x1 cmp r0, 0x1
bne _080582D8 bne _080582D8
bl sub_800A00C bl sub_800A00C
@@ -7062,7 +7062,7 @@ sub_80582E0: @ 80582E0
bl sub_805833C bl sub_805833C
cmp r0, 0x1 cmp r0, 0x1
bls _08058304 bls _08058304
bl sub_805642C bl is_c1_link_related_active
cmp r0, 0x1 cmp r0, 0x1
bne _08058304 bne _08058304
bl sub_800A00C bl sub_800A00C
@@ -7829,7 +7829,7 @@ _08058854:
bls _08058810 bls _08058810
asrs r0, r3, 16 asrs r0, r3, 16
asrs r1, r5, 16 asrs r1, r5, 16
bl sub_8058DC4 bl MapGridIsImpassableAt
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
_0805886A: _0805886A:
asm/party_menu.s
+32 -32
View File
@@ -3383,7 +3383,7 @@ _08120468:
bl GetMonNickname bl GetMonNickname
ldr r1, _081204A0 @ =gStringVar2 ldr r1, _081204A0 @ =gStringVar2
adds r0, r4, 0 adds r0, r4, 0
bl sub_8099E90 bl CopyItemName
ldr r4, _081204A4 @ =gStringVar4 ldr r4, _081204A4 @ =gStringVar4
ldr r1, _081204A8 @ =gUnknown_8416C2A ldr r1, _081204A8 @ =gUnknown_8416C2A
adds r0, r4, 0 adds r0, r4, 0
@@ -3424,7 +3424,7 @@ sub_81204AC: @ 81204AC
bl GetMonNickname bl GetMonNickname
ldr r1, _08120500 @ =gStringVar2 ldr r1, _08120500 @ =gStringVar2
adds r0, r4, 0 adds r0, r4, 0
bl sub_8099E90 bl CopyItemName
ldr r4, _08120504 @ =gStringVar4 ldr r4, _08120504 @ =gStringVar4
ldr r1, _08120508 @ =gUnknown_8416CAC ldr r1, _08120508 @ =gUnknown_8416CAC
adds r0, r4, 0 adds r0, r4, 0
@@ -3458,7 +3458,7 @@ sub_812050C: @ 812050C
bl GetMonNickname bl GetMonNickname
ldr r1, _0812054C @ =gStringVar2 ldr r1, _0812054C @ =gStringVar2
adds r0, r4, 0 adds r0, r4, 0
bl sub_8099E90 bl CopyItemName
ldr r4, _08120550 @ =gStringVar4 ldr r4, _08120550 @ =gStringVar4
ldr r1, _08120554 @ =gUnknown_8416C49 ldr r1, _08120554 @ =gUnknown_8416C49
adds r0, r4, 0 adds r0, r4, 0
@@ -3502,10 +3502,10 @@ sub_8120558: @ 8120558
bl sub_8124B60 bl sub_8124B60
ldr r1, _081205B8 @ =gStringVar1 ldr r1, _081205B8 @ =gStringVar1
adds r0, r4, 0 adds r0, r4, 0
bl sub_8099E90 bl CopyItemName
ldr r1, _081205BC @ =gStringVar2 ldr r1, _081205BC @ =gStringVar2
adds r0, r5, 0 adds r0, r5, 0
bl sub_8099E90 bl CopyItemName
ldr r4, _081205C0 @ =gStringVar4 ldr r4, _081205C0 @ =gStringVar4
ldr r1, _081205C4 @ =gUnknown_8416CEA ldr r1, _081205C4 @ =gUnknown_8416CEA
adds r0, r4, 0 adds r0, r4, 0
@@ -3582,7 +3582,7 @@ sub_8120610: @ 8120610
b _0812064E b _0812064E
_0812062C: _0812062C:
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0812064C beq _0812064C
@@ -4298,7 +4298,7 @@ _08120B86:
lsls r0, 16 lsls r0, 16
lsrs r1, r0, 16 lsrs r1, r0, 16
adds r0, r5, 0 adds r0, r5, 0
bl pokemon_has_move bl MonKnowsMove
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -9943,7 +9943,7 @@ _081237CC:
beq _081237F8 beq _081237F8
ldrh r0, [r6] ldrh r0, [r6]
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
movs r0, 0x9 movs r0, 0x9
ldrsb r0, [r5, r0] ldrsb r0, [r5, r0]
mov r1, r8 mov r1, r8
@@ -10016,7 +10016,7 @@ sub_8123824: @ 8123824
bl sub_81205C8 bl sub_81205C8
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
ldr r1, _0812389C @ =gTasks ldr r1, _0812389C @ =gTasks
lsls r0, r7, 2 lsls r0, r7, 2
adds r0, r7 adds r0, r7
@@ -10133,17 +10133,17 @@ _08123956:
ldr r5, _08123998 @ =gSpecialVar_ItemId ldr r5, _08123998 @ =gSpecialVar_ItemId
ldrh r0, [r5] ldrh r0, [r5]
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
ldr r6, _0812399C @ =gUnknown_203B0D8 ldr r6, _0812399C @ =gUnknown_203B0D8
ldrh r0, [r6] ldrh r0, [r6]
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _081239AC bne _081239AC
ldrh r0, [r5] ldrh r0, [r5]
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
ldrh r0, [r6] ldrh r0, [r6]
bl sub_8120658 bl sub_8120658
ldr r0, _081239A0 @ =gStringVar4 ldr r0, _081239A0 @ =gStringVar4
@@ -10330,10 +10330,10 @@ sub_8123ACC: @ 8123ACC
bl SetMonData bl SetMonData
ldrh r0, [r4] ldrh r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
mov r0, r8 mov r0, r8
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
ldrb r0, [r6, 0x8] ldrb r0, [r6, 0x8]
lsls r0, 28 lsls r0, 28
lsrs r0, 28 lsrs r0, 28
@@ -10903,7 +10903,7 @@ _08123FAA:
lsrs r4, r0, 16 lsrs r4, r0, 16
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -12735,7 +12735,7 @@ sub_8124E48: @ 8124E48
bhi _08124EB0 bhi _08124EB0
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
_08124EB0: _08124EB0:
mov r1, r8 mov r1, r8
ldr r0, [r1] ldr r0, [r1]
@@ -12828,7 +12828,7 @@ sub_8124EFC: @ 8124EFC
bhi _08124F7C bhi _08124F7C
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
_08124F7C: _08124F7C:
mov r1, r8 mov r1, r8
ldr r0, [r1] ldr r0, [r1]
@@ -13418,7 +13418,7 @@ _0812544C:
beq _0812547E beq _0812547E
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
b _0812547E b _0812547E
.align 2, 0 .align 2, 0
_08125474: .4byte gUnknown_203B0C0 _08125474: .4byte gUnknown_203B0C0
@@ -13963,7 +13963,7 @@ sub_8125898: @ 8125898
bl PlaySE bl PlaySE
ldrh r0, [r6] ldrh r0, [r6]
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
movs r2, 0xE movs r2, 0xE
ldrsh r1, [r5, r2] ldrsh r1, [r5, r2]
adds r1, 0xD adds r1, 0xD
@@ -14065,7 +14065,7 @@ _081259A0:
bl PlaySE bl PlaySE
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
movs r0, 0 movs r0, 0
ldrsh r1, [r7, r0] ldrsh r1, [r7, r0]
adds r1, 0xD adds r1, 0xD
@@ -14185,8 +14185,8 @@ _08125ABC:
bx r1 bx r1
thumb_func_end sub_8125A90 thumb_func_end sub_8125A90
thumb_func_start pokemon_has_move thumb_func_start MonKnowsMove
pokemon_has_move: @ 8125AC0 MonKnowsMove: @ 8125AC0
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
lsls r1, 16 lsls r1, 16
@@ -14212,7 +14212,7 @@ _08125AE8:
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end pokemon_has_move thumb_func_end MonKnowsMove
thumb_func_start sub_8125AF0 thumb_func_start sub_8125AF0
sub_8125AF0: @ 8125AF0 sub_8125AF0: @ 8125AF0
@@ -14406,7 +14406,7 @@ sub_8125C48: @ 8125C48
bhi _08125C84 bhi _08125C84
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
_08125C84: _08125C84:
ldr r1, _08125CD8 @ =gStringVar1 ldr r1, _08125CD8 @ =gStringVar1
adds r0, r5, 0 adds r0, r5, 0
@@ -15276,7 +15276,7 @@ sub_8126350: @ 8126350
bl sub_8126440 bl sub_8126440
ldrh r0, [r5] ldrh r0, [r5]
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
ldr r1, _08126428 @ =gStringVar1 ldr r1, _08126428 @ =gStringVar1
adds r0, r4, 0 adds r0, r4, 0
bl GetMonNickname bl GetMonNickname
@@ -16117,7 +16117,7 @@ _08126AB4:
ldr r0, _08126ADC @ =gSpecialVar_ItemId ldr r0, _08126ADC @ =gSpecialVar_ItemId
ldrh r0, [r0] ldrh r0, [r0]
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
_08126ABE: _08126ABE:
ldr r1, _08126AE4 @ =gTasks ldr r1, _08126AE4 @ =gTasks
lsls r0, r4, 2 lsls r0, r4, 2
@@ -16269,7 +16269,7 @@ sub_8126BD4: @ 8126BD4
bl sub_80A2294 bl sub_80A2294
ldrh r0, [r5] ldrh r0, [r5]
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
pop {r4,r5} pop {r4,r5}
pop {r0} pop {r0}
bx r0 bx r0
@@ -16971,7 +16971,7 @@ sub_812713C: @ 812713C
bl SetMonData bl SetMonData
ldrh r0, [r4] ldrh r0, [r4]
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
adds r0, r7, 0 adds r0, r7, 0
bl sub_81273AC bl sub_81273AC
ldr r0, [r6] ldr r0, [r6]
@@ -17117,7 +17117,7 @@ _0812728E:
ldr r6, _081272C4 @ =gUnknown_203B0D8 ldr r6, _081272C4 @ =gUnknown_203B0D8
ldrh r0, [r6] ldrh r0, [r6]
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _081272CC bne _081272CC
@@ -17240,7 +17240,7 @@ _0812739C: .4byte gUnknown_203B0A0
_081273A0: _081273A0:
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
_081273A8: _081273A8:
pop {r0} pop {r0}
bx r0 bx r0
@@ -17257,14 +17257,14 @@ sub_81273AC: @ 81273AC
beq _081273C8 beq _081273C8
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0x1 movs r1, 0x1
bl sub_809A3C8 bl AddPCItem
b _081273D0 b _081273D0
.align 2, 0 .align 2, 0
_081273C4: .4byte gUnknown_203B0A0 _081273C4: .4byte gUnknown_203B0A0
_081273C8: _081273C8:
adds r0, r1, 0 adds r0, r1, 0
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
_081273D0: _081273D0:
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
asm/player_pc.s
+2 -2
View File
@@ -25,7 +25,7 @@ _080EB672:
ldrh r0, [r0] ldrh r0, [r0]
adds r1, r6 adds r1, r6
ldrh r1, [r1] ldrh r1, [r1]
bl sub_809A3C8 bl AddPCItem
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -1649,7 +1649,7 @@ sub_80EC364: @ 80EC364
adds r5, r1, r0 adds r5, r1, r0
ldrh r0, [r5, 0x20] ldrh r0, [r5, 0x20]
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080EC3B4 bne _080EC3B4
asm/pokemon_storage_system.s
+3 -3
View File
@@ -5151,7 +5151,7 @@ _0808E2E8:
adds r0, r1 adds r0, r1
ldrh r0, [r0] ldrh r0, [r0]
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0808E314 bne _0808E314
@@ -5504,7 +5504,7 @@ _0808E5E0:
adds r0, r1 adds r0, r1
ldrh r0, [r0] ldrh r0, [r0]
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -6643,7 +6643,7 @@ _0808EF56:
mov r0, sp mov r0, sp
ldrh r0, [r0] ldrh r0, [r0]
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
_0808EF60: _0808EF60:
add sp, 0x4 add sp, 0x4
pop {r0} pop {r0}
asm/pokemon_summary_screen.s
+3 -3
View File
@@ -3587,7 +3587,7 @@ _08136338:
ldr r1, [r6] ldr r1, [r6]
ldr r2, _0813634C @ =0x00003074 ldr r2, _0813634C @ =0x00003074
adds r1, r2 adds r1, r2
bl sub_8099E90 bl CopyItemName
_08136342: _08136342:
add sp, 0x14 add sp, 0x14
pop {r4-r7} pop {r4-r7}
@@ -8431,7 +8431,7 @@ _08138B48: .4byte 0x00003208
thumb_func_start sub_8138B4C thumb_func_start sub_8138B4C
sub_8138B4C: @ 8138B4C sub_8138B4C: @ 8138B4C
push {lr} push {lr}
bl sub_805642C bl is_c1_link_related_active
cmp r0, 0 cmp r0, 0
bne _08138B84 bne _08138B84
bl sub_811FA20 bl sub_811FA20
@@ -13239,7 +13239,7 @@ _0813B16C:
_0813B190: .4byte 0x000032f4 _0813B190: .4byte 0x000032f4
_0813B194: .4byte 0x00003210 _0813B194: .4byte 0x00003210
_0813B198: _0813B198:
bl sub_805642C bl is_c1_link_related_active
cmp r0, 0 cmp r0, 0
bne _0813B1C4 bne _0813B1C4
ldr r0, _0813B1C0 @ =gReceivedRemoteLinkPlayers ldr r0, _0813B1C0 @ =gReceivedRemoteLinkPlayers
asm/scrcmd.s
-5612
View File
File diff suppressed because it is too large Load Diff
asm/script_menu.s
+12 -12
View File
@@ -613,8 +613,8 @@ _0809CDE0:
_0809CDE8: .4byte gUnknown_83E0748 _0809CDE8: .4byte gUnknown_83E0748
thumb_func_end sub_809CD48 thumb_func_end sub_809CD48
thumb_func_start sub_809CDEC thumb_func_start ScriptMenu_YesNo
sub_809CDEC: @ 809CDEC ScriptMenu_YesNo: @ 809CDEC
push {r4,lr} push {r4,lr}
ldr r4, _0809CE04 @ =task_yes_no_maybe ldr r4, _0809CE04 @ =task_yes_no_maybe
adds r0, r4, 0 adds r0, r4, 0
@@ -649,7 +649,7 @@ _0809CE28:
.align 2, 0 .align 2, 0
_0809CE30: .4byte gSpecialVar_Result _0809CE30: .4byte gSpecialVar_Result
_0809CE34: .4byte sub_809D6D4 _0809CE34: .4byte sub_809D6D4
thumb_func_end sub_809CDEC thumb_func_end ScriptMenu_YesNo
thumb_func_start sub_809CE38 thumb_func_start sub_809CE38
sub_809CE38: @ 809CE38 sub_809CE38: @ 809CE38
@@ -733,8 +733,8 @@ _0809CEBC:
_0809CEC4: .4byte gSpecialVar_Result _0809CEC4: .4byte gSpecialVar_Result
thumb_func_end task_yes_no_maybe thumb_func_end task_yes_no_maybe
thumb_func_start sub_809CEC8 thumb_func_start ScriptMenu_MultichoiceGrid
sub_809CEC8: @ 809CEC8 ScriptMenu_MultichoiceGrid: @ 809CEC8
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r10 mov r7, r10
mov r6, r9 mov r6, r9
@@ -862,7 +862,7 @@ _0809CFCC: .4byte gSpecialVar_Result
_0809CFD0: .4byte sub_809D6D4 _0809CFD0: .4byte sub_809D6D4
_0809CFD4: .4byte gUnknown_83E04B0 _0809CFD4: .4byte gUnknown_83E04B0
_0809CFD8: .4byte gTasks _0809CFD8: .4byte gTasks
thumb_func_end sub_809CEC8 thumb_func_end ScriptMenu_MultichoiceGrid
thumb_func_start sub_809CFDC thumb_func_start sub_809CFDC
sub_809CFDC: @ 809CFDC sub_809CFDC: @ 809CFDC
@@ -1241,8 +1241,8 @@ _0809D2E8:
bx r0 bx r0
thumb_func_end sub_809D288 thumb_func_end sub_809D288
thumb_func_start sub_809D2F0 thumb_func_start ScriptMenu_ShowPokemonPic
sub_809D2F0: @ 809D2F0 ScriptMenu_ShowPokemonPic: @ 809D2F0
push {r4-r7,lr} push {r4-r7,lr}
mov r7, r8 mov r7, r8
push {r7} push {r7}
@@ -1344,10 +1344,10 @@ _0809D3C2:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_809D2F0 thumb_func_end ScriptMenu_ShowPokemonPic
thumb_func_start sub_809D3CC thumb_func_start ScriptMenu_GetPicboxWaitFunc
sub_809D3CC: @ 809D3CC ScriptMenu_GetPicboxWaitFunc: @ 809D3CC
push {lr} push {lr}
ldr r0, _0809D3F0 @ =sub_809D288 ldr r0, _0809D3F0 @ =sub_809D288
bl FindTaskIdByFunc bl FindTaskIdByFunc
@@ -1374,7 +1374,7 @@ _0809D3FC:
_0809D3FE: _0809D3FE:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_809D3CC thumb_func_end ScriptMenu_GetPicboxWaitFunc
thumb_func_start sub_809D404 thumb_func_start sub_809D404
sub_809D404: @ 809D404 sub_809D404: @ 809D404
asm/script_pokemon_util_80A0058.s
+3 -3
View File
@@ -170,8 +170,8 @@ _080A0196:
bx r1 bx r1
thumb_func_end ScriptGiveMon thumb_func_end ScriptGiveMon
thumb_func_start sub_80A01AC thumb_func_start ScriptGiveEgg
sub_80A01AC: @ 80A01AC ScriptGiveEgg: @ 80A01AC
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x4 sub sp, 0x4
adds r4, r0, 0 adds r4, r0, 0
@@ -202,7 +202,7 @@ sub_80A01AC: @ 80A01AC
pop {r4,r5} pop {r4,r5}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_80A01AC thumb_func_end ScriptGiveEgg
thumb_func_start CheckForAlivePartyMons thumb_func_start CheckForAlivePartyMons
CheckForAlivePartyMons: @ 80A01F4 CheckForAlivePartyMons: @ 80A01F4
asm/seagallop.s
+1 -1
View File
@@ -371,7 +371,7 @@ _08147150:
bl warp_in bl warp_in
ldr r0, _081471BC @ =sub_805671C ldr r0, _081471BC @ =sub_805671C
bl SetMainCallback2 bl SetMainCallback2
bl sub_80559E4 bl ResetInitialPlayerAvatarState
bl sub_81473A0 bl sub_81473A0
ldr r0, _081471C0 @ =gUnknown_203F3D0 ldr r0, _081471C0 @ =gUnknown_203F3D0
ldr r0, [r0] ldr r0, [r0]
asm/shop.s
+17 -17
View File
@@ -1023,7 +1023,7 @@ sub_809B300: @ 809B300
lsrs r5, 16 lsrs r5, 16
adds r0, r5, 0 adds r0, r5, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_8099E90 bl CopyItemName
str r6, [r4] str r6, [r4]
str r5, [r4, 0x4] str r5, [r4, 0x4]
pop {r4-r6} pop {r4-r6}
@@ -1632,7 +1632,7 @@ _0809B7B2:
movs r3, 0 movs r3, 0
ldrsh r1, [r2, r3] ldrsh r1, [r2, r3]
adds r1, r7 adds r1, r7
bl sub_8058E48 bl MapGridGetMetatileIdAt
lsls r0, 16 lsls r0, 16
lsrs r5, r0, 16 lsrs r5, r0, 16
mov r0, sp mov r0, sp
@@ -1645,7 +1645,7 @@ _0809B7B2:
adds r1, r7, r1 adds r1, r7, r1
lsls r1, 16 lsls r1, 16
asrs r1, 16 asrs r1, 16
bl sub_8058F8C bl MapGridGetMetatileLayerTypeAt
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
ldr r0, _0809B808 @ =0x0000027f ldr r0, _0809B808 @ =0x0000027f
@@ -2232,7 +2232,7 @@ _0809BC78: .4byte sub_809BF98
_0809BC7C: _0809BC7C:
ldr r1, _0809BC94 @ =gStringVar1 ldr r1, _0809BC94 @ =gStringVar1
adds r0, r4, 0 adds r0, r4, 0
bl sub_8099E90 bl CopyItemName
ldr r1, _0809BC98 @ =gUnknown_8416766 ldr r1, _0809BC98 @ =gUnknown_8416766
ldr r2, _0809BC9C @ =sub_809BCA0 ldr r2, _0809BC9C @ =sub_809BCA0
adds r0, r6, 0 adds r0, r6, 0
@@ -2408,7 +2408,7 @@ _0809BDD4:
bl PutWindowTilemap bl PutWindowTilemap
ldrh r0, [r4, 0xA] ldrh r0, [r4, 0xA]
ldr r1, _0809BE40 @ =gStringVar1 ldr r1, _0809BE40 @ =gStringVar1
bl sub_8099E90 bl CopyItemName
ldr r0, _0809BE44 @ =gStringVar2 ldr r0, _0809BE44 @ =gStringVar2
movs r2, 0x2 movs r2, 0x2
ldrsh r1, [r4, r2] ldrsh r1, [r4, r2]
@@ -2485,7 +2485,7 @@ sub_809BEA4: @ 809BEA4
bl PutWindowTilemap bl PutWindowTilemap
ldrh r0, [r4, 0xA] ldrh r0, [r4, 0xA]
ldrh r1, [r4, 0x2] ldrh r1, [r4, 0x2]
bl sub_809A084 bl AddBagItem
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -2826,8 +2826,8 @@ _0809C15A:
_0809C160: .4byte gUnknown_203996C _0809C160: .4byte gUnknown_203996C
thumb_func_end sub_809C138 thumb_func_end sub_809C138
thumb_func_start sub_809C164 thumb_func_start CreatePokemartMenu
sub_809C164: @ 809C164 CreatePokemartMenu: @ 809C164
push {r4,lr} push {r4,lr}
bl sub_809ABD8 bl sub_809ABD8
movs r0, 0 movs r0, 0
@@ -2851,10 +2851,10 @@ sub_809C164: @ 809C164
_0809C194: .4byte EnableBothScriptContexts _0809C194: .4byte EnableBothScriptContexts
_0809C198: .4byte gUnknown_203996C _0809C198: .4byte gUnknown_203996C
_0809C19C: .4byte gMapHeader _0809C19C: .4byte gMapHeader
thumb_func_end sub_809C164 thumb_func_end CreatePokemartMenu
thumb_func_start sub_809C1A0 thumb_func_start CreateDecorationShop1Menu
sub_809C1A0: @ 809C1A0 CreateDecorationShop1Menu: @ 809C1A0
push {lr} push {lr}
bl sub_809ABD8 bl sub_809ABD8
movs r0, 0x2 movs r0, 0x2
@@ -2865,10 +2865,10 @@ sub_809C1A0: @ 809C1A0
bx r0 bx r0
.align 2, 0 .align 2, 0
_0809C1B8: .4byte EnableBothScriptContexts _0809C1B8: .4byte EnableBothScriptContexts
thumb_func_end sub_809C1A0 thumb_func_end CreateDecorationShop1Menu
thumb_func_start sub_809C1BC thumb_func_start CreateDecorationShop2Menu
sub_809C1BC: @ 809C1BC CreateDecorationShop2Menu: @ 809C1BC
push {lr} push {lr}
bl sub_809ABD8 bl sub_809ABD8
movs r0, 0x3 movs r0, 0x3
@@ -2879,7 +2879,7 @@ sub_809C1BC: @ 809C1BC
bx r0 bx r0
.align 2, 0 .align 2, 0
_0809C1D4: .4byte EnableBothScriptContexts _0809C1D4: .4byte EnableBothScriptContexts
thumb_func_end sub_809C1BC thumb_func_end CreateDecorationShop2Menu
thumb_func_start sub_809C1D8 thumb_func_start sub_809C1D8
sub_809C1D8: @ 809C1D8 sub_809C1D8: @ 809C1D8
@@ -2940,7 +2940,7 @@ _0809C238:
adds r5, r1, r0 adds r5, r1, r0
adds r0, r5, 0 adds r0, r5, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_8058E48 bl MapGridGetMetatileIdAt
movs r2, 0 movs r2, 0
ldrsh r1, [r7, r2] ldrsh r1, [r7, r2]
lsls r0, 16 lsls r0, 16
@@ -3006,7 +3006,7 @@ _0809C2B8:
adds r5, r1, r0 adds r5, r1, r0
adds r0, r5, 0 adds r0, r5, 0
adds r1, r6, 0 adds r1, r6, 0
bl sub_8058E48 bl MapGridGetMetatileIdAt
movs r1, 0x2 movs r1, 0x2
subs r1, r7 subs r1, r7
lsls r1, 1 lsls r1, 1
asm/slot_machine.s
+3 -3
View File
@@ -5,8 +5,8 @@
.text .text
thumb_func_start sub_813F804 thumb_func_start PlaySlotMachine
sub_813F804: @ 813F804 PlaySlotMachine: @ 813F804
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r1, 0 adds r6, r1, 0
lsls r0, 16 lsls r0, 16
@@ -39,7 +39,7 @@ _0813F840:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0813F848: .4byte sub_813F898 _0813F848: .4byte sub_813F898
thumb_func_end sub_813F804 thumb_func_end PlaySlotMachine
thumb_func_start sub_813F84C thumb_func_start sub_813F84C
sub_813F84C: @ 813F84C sub_813F84C: @ 813F84C
asm/start_menu.s
+3 -3
View File
@@ -11,7 +11,7 @@ sub_806ED54: @ 806ED54
ldr r0, _0806ED6C @ =gUnknown_20370F5 ldr r0, _0806ED6C @ =gUnknown_20370F5
movs r1, 0 movs r1, 0
strb r1, [r0] strb r1, [r0]
bl sub_805642C bl is_c1_link_related_active
cmp r0, 0x1 cmp r0, 0x1
bne _0806ED70 bne _0806ED70
bl sub_806EE34 bl sub_806EE34
@@ -634,7 +634,7 @@ _0806F254: .4byte gUnknown_20370F0
thumb_func_start ShowStartMenu thumb_func_start ShowStartMenu
ShowStartMenu: @ 806F258 ShowStartMenu: @ 806F258
push {lr} push {lr}
bl sub_805642C bl is_c1_link_related_active
cmp r0, 0 cmp r0, 0
bne _0806F26E bne _0806F26E
bl player_bitmagic bl player_bitmagic
@@ -1109,7 +1109,7 @@ _0806F61E:
thumb_func_start sub_806F624 thumb_func_start sub_806F624
sub_806F624: @ 806F624 sub_806F624: @ 806F624
push {lr} push {lr}
bl sub_80590D8 bl save_serialize_map
ldr r1, _0806F63C @ =gUnknown_3000FA4 ldr r1, _0806F63C @ =gUnknown_3000FA4
ldr r0, _0806F640 @ =sub_806F7A8 ldr r0, _0806F640 @ =sub_806F7A8
str r0, [r1] str r0, [r1]
asm/teachy_tv.s
+2 -2
View File
@@ -398,7 +398,7 @@ sub_815AEE8: @ 815AEE8
movs r0, 0xB6 movs r0, 0xB6
lsls r0, 1 lsls r0, 1
movs r1, 0x1 movs r1, 0x1
bl sub_8099F40 bl CheckBagHasItem
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0815AF30 bne _0815AF30
@@ -443,7 +443,7 @@ sub_815AF5C: @ 815AF5C
movs r0, 0xB6 movs r0, 0xB6
lsls r0, 1 lsls r0, 1
movs r1, 0x1 movs r1, 0x1
bl sub_8099F40 bl CheckBagHasItem
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0815AF84 bne _0815AF84
asm/tileset_anims.s
+60 -60
View File
@@ -132,11 +132,11 @@ sub_806FFB0: @ 806FFB0
sub_806FFBC: @ 806FFBC sub_806FFBC: @ 806FFBC
push {r4,lr} push {r4,lr}
bl ResetTilesetAnimBuffer bl ResetTilesetAnimBuffer
ldr r2, _08070014 @ =gUnknown_3000FAE ldr r2, _08070014 @ =sPrimaryTilesetCBCounter
ldrh r0, [r2] ldrh r0, [r2]
adds r0, 0x1 adds r0, 0x1
strh r0, [r2] strh r0, [r2]
ldr r1, _08070018 @ =gUnknown_3000FB0 ldr r1, _08070018 @ =sPrimaryTilesetCBBufferSize
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldrh r1, [r1] ldrh r1, [r1]
@@ -145,11 +145,11 @@ sub_806FFBC: @ 806FFBC
movs r0, 0 movs r0, 0
strh r0, [r2] strh r0, [r2]
_0806FFDA: _0806FFDA:
ldr r4, _0807001C @ =gUnknown_3000FB2 ldr r4, _0807001C @ =sSecondaryTilesetCBCounter
ldrh r0, [r4] ldrh r0, [r4]
adds r0, 0x1 adds r0, 0x1
strh r0, [r4] strh r0, [r4]
ldr r1, _08070020 @ =gUnknown_3000FB4 ldr r1, _08070020 @ =sSecondaryTilesetCBBufferSize
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
ldrh r1, [r1] ldrh r1, [r1]
@@ -158,14 +158,14 @@ _0806FFDA:
movs r0, 0 movs r0, 0
strh r0, [r4] strh r0, [r4]
_0806FFF2: _0806FFF2:
ldr r0, _08070024 @ =gUnknown_3000FB8 ldr r0, _08070024 @ =sPrimaryTilesetCB
ldr r1, [r0] ldr r1, [r0]
cmp r1, 0 cmp r1, 0
beq _08070000 beq _08070000
ldrh r0, [r2] ldrh r0, [r2]
bl _call_via_r1 bl _call_via_r1
_08070000: _08070000:
ldr r0, _08070028 @ =gUnknown_3000FBC ldr r0, _08070028 @ =sSecondaryTilesetCB
ldr r1, [r0] ldr r1, [r0]
cmp r1, 0 cmp r1, 0
beq _0807000E beq _0807000E
@@ -176,23 +176,23 @@ _0807000E:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08070014: .4byte gUnknown_3000FAE _08070014: .4byte sPrimaryTilesetCBCounter
_08070018: .4byte gUnknown_3000FB0 _08070018: .4byte sPrimaryTilesetCBBufferSize
_0807001C: .4byte gUnknown_3000FB2 _0807001C: .4byte sSecondaryTilesetCBCounter
_08070020: .4byte gUnknown_3000FB4 _08070020: .4byte sSecondaryTilesetCBBufferSize
_08070024: .4byte gUnknown_3000FB8 _08070024: .4byte sPrimaryTilesetCB
_08070028: .4byte gUnknown_3000FBC _08070028: .4byte sSecondaryTilesetCB
thumb_func_end sub_806FFBC thumb_func_end sub_806FFBC
thumb_func_start cur_mapheader_run_tileset1_func thumb_func_start cur_mapheader_run_tileset1_func
cur_mapheader_run_tileset1_func: @ 807002C cur_mapheader_run_tileset1_func: @ 807002C
push {lr} push {lr}
ldr r0, _08070058 @ =gUnknown_3000FAE ldr r0, _08070058 @ =sPrimaryTilesetCBCounter
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, _0807005C @ =gUnknown_3000FB0 ldr r0, _0807005C @ =sPrimaryTilesetCBBufferSize
strh r1, [r0] strh r1, [r0]
ldr r1, _08070060 @ =gUnknown_3000FB8 ldr r1, _08070060 @ =sPrimaryTilesetCB
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
ldr r0, _08070064 @ =gMapHeader ldr r0, _08070064 @ =gMapHeader
@@ -208,21 +208,21 @@ _08070052:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08070058: .4byte gUnknown_3000FAE _08070058: .4byte sPrimaryTilesetCBCounter
_0807005C: .4byte gUnknown_3000FB0 _0807005C: .4byte sPrimaryTilesetCBBufferSize
_08070060: .4byte gUnknown_3000FB8 _08070060: .4byte sPrimaryTilesetCB
_08070064: .4byte gMapHeader _08070064: .4byte gMapHeader
thumb_func_end cur_mapheader_run_tileset1_func thumb_func_end cur_mapheader_run_tileset1_func
thumb_func_start cur_mapheader_run_tileset2_func thumb_func_start cur_mapheader_run_tileset2_func
cur_mapheader_run_tileset2_func: @ 8070068 cur_mapheader_run_tileset2_func: @ 8070068
push {lr} push {lr}
ldr r0, _08070094 @ =gUnknown_3000FB2 ldr r0, _08070094 @ =sSecondaryTilesetCBCounter
movs r1, 0 movs r1, 0
strh r1, [r0] strh r1, [r0]
ldr r0, _08070098 @ =gUnknown_3000FB4 ldr r0, _08070098 @ =sSecondaryTilesetCBBufferSize
strh r1, [r0] strh r1, [r0]
ldr r1, _0807009C @ =gUnknown_3000FBC ldr r1, _0807009C @ =sSecondaryTilesetCB
movs r0, 0 movs r0, 0
str r0, [r1] str r0, [r1]
ldr r0, _080700A0 @ =gMapHeader ldr r0, _080700A0 @ =gMapHeader
@@ -238,9 +238,9 @@ _0807008E:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08070094: .4byte gUnknown_3000FB2 _08070094: .4byte sSecondaryTilesetCBCounter
_08070098: .4byte gUnknown_3000FB4 _08070098: .4byte sSecondaryTilesetCBBufferSize
_0807009C: .4byte gUnknown_3000FBC _0807009C: .4byte sSecondaryTilesetCB
_080700A0: .4byte gMapHeader _080700A0: .4byte gMapHeader
thumb_func_end cur_mapheader_run_tileset2_func thumb_func_end cur_mapheader_run_tileset2_func
@@ -342,22 +342,22 @@ _0807014C:
thumb_func_start sub_8070154 thumb_func_start sub_8070154
sub_8070154: @ 8070154 sub_8070154: @ 8070154
ldr r1, _0807016C @ =gUnknown_3000FAE ldr r1, _0807016C @ =sPrimaryTilesetCBCounter
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
ldr r1, _08070170 @ =gUnknown_3000FB0 ldr r1, _08070170 @ =sPrimaryTilesetCBBufferSize
movs r2, 0xA0 movs r2, 0xA0
lsls r2, 2 lsls r2, 2
adds r0, r2, 0 adds r0, r2, 0
strh r0, [r1] strh r0, [r1]
ldr r1, _08070174 @ =gUnknown_3000FB8 ldr r1, _08070174 @ =sPrimaryTilesetCB
ldr r0, _08070178 @ =sub_8070120 ldr r0, _08070178 @ =sub_8070120
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0 .align 2, 0
_0807016C: .4byte gUnknown_3000FAE _0807016C: .4byte sPrimaryTilesetCBCounter
_08070170: .4byte gUnknown_3000FB0 _08070170: .4byte sPrimaryTilesetCBBufferSize
_08070174: .4byte gUnknown_3000FB8 _08070174: .4byte sPrimaryTilesetCB
_08070178: .4byte sub_8070120 _08070178: .4byte sub_8070120
thumb_func_end sub_8070154 thumb_func_end sub_8070154
@@ -410,20 +410,20 @@ _080701D0:
thumb_func_start sub_80701D8 thumb_func_start sub_80701D8
sub_80701D8: @ 80701D8 sub_80701D8: @ 80701D8
ldr r1, _080701EC @ =gUnknown_3000FB2 ldr r1, _080701EC @ =sSecondaryTilesetCBCounter
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
ldr r1, _080701F0 @ =gUnknown_3000FB4 ldr r1, _080701F0 @ =sSecondaryTilesetCBBufferSize
movs r0, 0x78 movs r0, 0x78
strh r0, [r1] strh r0, [r1]
ldr r1, _080701F4 @ =gUnknown_3000FBC ldr r1, _080701F4 @ =sSecondaryTilesetCB
ldr r0, _080701F8 @ =sub_80701AC ldr r0, _080701F8 @ =sub_80701AC
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0 .align 2, 0
_080701EC: .4byte gUnknown_3000FB2 _080701EC: .4byte sSecondaryTilesetCBCounter
_080701F0: .4byte gUnknown_3000FB4 _080701F0: .4byte sSecondaryTilesetCBBufferSize
_080701F4: .4byte gUnknown_3000FBC _080701F4: .4byte sSecondaryTilesetCB
_080701F8: .4byte sub_80701AC _080701F8: .4byte sub_80701AC
thumb_func_end sub_80701D8 thumb_func_end sub_80701D8
@@ -474,20 +474,20 @@ _08070248:
thumb_func_start sub_8070250 thumb_func_start sub_8070250
sub_8070250: @ 8070250 sub_8070250: @ 8070250
ldr r1, _08070264 @ =gUnknown_3000FB2 ldr r1, _08070264 @ =sSecondaryTilesetCBCounter
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
ldr r1, _08070268 @ =gUnknown_3000FB4 ldr r1, _08070268 @ =sSecondaryTilesetCBBufferSize
movs r0, 0xA0 movs r0, 0xA0
strh r0, [r1] strh r0, [r1]
ldr r1, _0807026C @ =gUnknown_3000FBC ldr r1, _0807026C @ =sSecondaryTilesetCB
ldr r0, _08070270 @ =sub_8070224 ldr r0, _08070270 @ =sub_8070224
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0 .align 2, 0
_08070264: .4byte gUnknown_3000FB2 _08070264: .4byte sSecondaryTilesetCBCounter
_08070268: .4byte gUnknown_3000FB4 _08070268: .4byte sSecondaryTilesetCBBufferSize
_0807026C: .4byte gUnknown_3000FBC _0807026C: .4byte sSecondaryTilesetCB
_08070270: .4byte sub_8070224 _08070270: .4byte sub_8070224
thumb_func_end sub_8070250 thumb_func_end sub_8070250
@@ -531,22 +531,22 @@ _080702B0:
thumb_func_start sub_80702B4 thumb_func_start sub_80702B4
sub_80702B4: @ 80702B4 sub_80702B4: @ 80702B4
ldr r1, _080702CC @ =gUnknown_3000FB2 ldr r1, _080702CC @ =sSecondaryTilesetCBCounter
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
ldr r1, _080702D0 @ =gUnknown_3000FB4 ldr r1, _080702D0 @ =sSecondaryTilesetCBBufferSize
movs r2, 0x80 movs r2, 0x80
lsls r2, 1 lsls r2, 1
adds r0, r2, 0 adds r0, r2, 0
strh r0, [r1] strh r0, [r1]
ldr r1, _080702D4 @ =gUnknown_3000FBC ldr r1, _080702D4 @ =sSecondaryTilesetCB
ldr r0, _080702D8 @ =sub_807029C ldr r0, _080702D8 @ =sub_807029C
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0 .align 2, 0
_080702CC: .4byte gUnknown_3000FB2 _080702CC: .4byte sSecondaryTilesetCBCounter
_080702D0: .4byte gUnknown_3000FB4 _080702D0: .4byte sSecondaryTilesetCBBufferSize
_080702D4: .4byte gUnknown_3000FBC _080702D4: .4byte sSecondaryTilesetCB
_080702D8: .4byte sub_807029C _080702D8: .4byte sub_807029C
thumb_func_end sub_80702B4 thumb_func_end sub_80702B4
@@ -589,20 +589,20 @@ _08070318:
thumb_func_start sub_807031C thumb_func_start sub_807031C
sub_807031C: @ 807031C sub_807031C: @ 807031C
ldr r1, _08070330 @ =gUnknown_3000FB2 ldr r1, _08070330 @ =sSecondaryTilesetCBCounter
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
ldr r1, _08070334 @ =gUnknown_3000FB4 ldr r1, _08070334 @ =sSecondaryTilesetCBBufferSize
movs r0, 0xF0 movs r0, 0xF0
strh r0, [r1] strh r0, [r1]
ldr r1, _08070338 @ =gUnknown_3000FBC ldr r1, _08070338 @ =sSecondaryTilesetCB
ldr r0, _0807033C @ =sub_8070304 ldr r0, _0807033C @ =sub_8070304
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0 .align 2, 0
_08070330: .4byte gUnknown_3000FB2 _08070330: .4byte sSecondaryTilesetCBCounter
_08070334: .4byte gUnknown_3000FB4 _08070334: .4byte sSecondaryTilesetCBBufferSize
_08070338: .4byte gUnknown_3000FBC _08070338: .4byte sSecondaryTilesetCB
_0807033C: .4byte sub_8070304 _0807033C: .4byte sub_8070304
thumb_func_end sub_807031C thumb_func_end sub_807031C
@@ -645,22 +645,22 @@ _0807037C:
thumb_func_start sub_8070380 thumb_func_start sub_8070380
sub_8070380: @ 8070380 sub_8070380: @ 8070380
ldr r1, _08070398 @ =gUnknown_3000FB2 ldr r1, _08070398 @ =sSecondaryTilesetCBCounter
movs r0, 0 movs r0, 0
strh r0, [r1] strh r0, [r1]
ldr r1, _0807039C @ =gUnknown_3000FB4 ldr r1, _0807039C @ =sSecondaryTilesetCBBufferSize
movs r2, 0x80 movs r2, 0x80
lsls r2, 1 lsls r2, 1
adds r0, r2, 0 adds r0, r2, 0
strh r0, [r1] strh r0, [r1]
ldr r1, _080703A0 @ =gUnknown_3000FBC ldr r1, _080703A0 @ =sSecondaryTilesetCB
ldr r0, _080703A4 @ =sub_8070368 ldr r0, _080703A4 @ =sub_8070368
str r0, [r1] str r0, [r1]
bx lr bx lr
.align 2, 0 .align 2, 0
_08070398: .4byte gUnknown_3000FB2 _08070398: .4byte sSecondaryTilesetCBCounter
_0807039C: .4byte gUnknown_3000FB4 _0807039C: .4byte sSecondaryTilesetCBBufferSize
_080703A0: .4byte gUnknown_3000FBC _080703A0: .4byte sSecondaryTilesetCB
_080703A4: .4byte sub_8070368 _080703A4: .4byte sub_8070368
thumb_func_end sub_8070380 thumb_func_end sub_8070380
asm/tm_case.s
+9 -9
View File
@@ -1855,7 +1855,7 @@ sub_8132714: @ 8132714
ldr r0, _08132744 @ =gSpecialVar_ItemId ldr r0, _08132744 @ =gSpecialVar_ItemId
ldrh r0, [r0] ldrh r0, [r0]
ldr r1, _08132748 @ =gStringVar1 ldr r1, _08132748 @ =gStringVar1
bl sub_8099E90 bl CopyItemName
ldr r5, _0813274C @ =gStringVar4 ldr r5, _0813274C @ =gStringVar4
ldr r1, _08132750 @ =gUnknown_841635E ldr r1, _08132750 @ =gUnknown_841635E
adds r0, r5, 0 adds r0, r5, 0
@@ -2093,7 +2093,7 @@ sub_8132908: @ 8132908
bne _08132968 bne _08132968
ldrh r0, [r6] ldrh r0, [r6]
ldr r1, _08132958 @ =gStringVar1 ldr r1, _08132958 @ =gStringVar1
bl sub_8099E90 bl CopyItemName
ldr r4, _0813295C @ =gStringVar4 ldr r4, _0813295C @ =gStringVar4
ldr r1, _08132960 @ =gUnknown_84168F1 ldr r1, _08132960 @ =gUnknown_84168F1
adds r0, r4, 0 adds r0, r4, 0
@@ -2133,7 +2133,7 @@ _08132980:
_08132988: _08132988:
ldrh r0, [r6] ldrh r0, [r6]
ldr r1, _081329B4 @ =gStringVar1 ldr r1, _081329B4 @ =gStringVar1
bl sub_8099E90 bl CopyItemName
ldr r4, _081329B8 @ =gStringVar4 ldr r4, _081329B8 @ =gStringVar4
ldr r1, _081329BC @ =gUnknown_8416911 ldr r1, _081329BC @ =gUnknown_8416911
adds r0, r4, 0 adds r0, r4, 0
@@ -2506,7 +2506,7 @@ sub_8132CAC: @ 8132CAC
ldr r0, _08132D1C @ =gSpecialVar_ItemId ldr r0, _08132D1C @ =gSpecialVar_ItemId
ldrh r0, [r0] ldrh r0, [r0]
ldr r1, _08132D20 @ =gStringVar1 ldr r1, _08132D20 @ =gStringVar1
bl sub_8099E90 bl CopyItemName
ldr r6, _08132D24 @ =gStringVar3 ldr r6, _08132D24 @ =gStringVar3
ldrh r1, [r4, 0x2] ldrh r1, [r4, 0x2]
movs r0, 0x4 movs r0, 0x4
@@ -2568,7 +2568,7 @@ sub_8132D34: @ 8132D34
ldrh r0, [r5] ldrh r0, [r5]
mov r2, r8 mov r2, r8
ldrh r1, [r2, 0x10] ldrh r1, [r2, 0x10]
bl sub_809A1D8 bl RemoveBagItem
ldr r7, _08132DFC @ =gSaveBlock1Ptr ldr r7, _08132DFC @ =gSaveBlock1Ptr
ldr r4, [r7] ldr r4, [r7]
movs r3, 0xA4 movs r3, 0xA4
@@ -2729,16 +2729,16 @@ sub_8132E64: @ 8132E64
bl sub_81320AC bl sub_81320AC
ldr r0, _08132F0C @ =0x00000121 ldr r0, _08132F0C @ =0x00000121
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
ldr r0, _08132F10 @ =0x00000123 ldr r0, _08132F10 @ =0x00000123
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
ldr r0, _08132F14 @ =0x00000129 ldr r0, _08132F14 @ =0x00000129
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
ldr r0, _08132F18 @ =0x00000143 ldr r0, _08132F18 @ =0x00000143
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
ldr r1, _08132F1C @ =sub_815ABFC ldr r1, _08132F1C @ =sub_815ABFC
movs r0, 0x4 movs r0, 0x4
movs r2, 0 movs r2, 0
asm/unk_810C3A4.s
+1 -1
View File
@@ -180,7 +180,7 @@ sub_810C4EC: @ 810C4EC
movs r0, 0xB5 movs r0, 0xB5
lsls r0, 1 lsls r0, 1
movs r1, 0x1 movs r1, 0x1
bl sub_8099F40 bl CheckBagHasItem
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
asm/unk_8147AA8.s
+6 -6
View File
@@ -2300,14 +2300,14 @@ _08148BFC:
beq _08148C54 beq _08148C54
ldrh r0, [r1, 0x3E] ldrh r0, [r1, 0x3E]
ldrh r1, [r2] ldrh r1, [r2]
bl sub_809A084 bl AddBagItem
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08148C54 beq _08148C54
ldr r0, [r4] ldr r0, [r4]
ldrh r0, [r0, 0x3E] ldrh r0, [r0, 0x3E]
movs r1, 0x1 movs r1, 0x1
bl sub_809A000 bl CheckBagHasSpace
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08148C4C bne _08148C4C
@@ -4162,7 +4162,7 @@ _0814998A:
beq _0814999C beq _0814999C
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl sub_809A000 bl CheckBagHasSpace
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08149984 beq _08149984
@@ -5613,7 +5613,7 @@ sub_814A468: @ 814A468
ldr r1, [r5] ldr r1, [r5]
adds r1, 0x26 adds r1, 0x26
adds r0, r4, 0 adds r0, r4, 0
bl sub_8099E90 bl CopyItemName
ldr r0, [r5] ldr r0, [r5]
adds r0, 0x66 adds r0, 0x66
adds r1, r6, 0 adds r1, r6, 0
@@ -5705,7 +5705,7 @@ sub_814A53C: @ 814A53C
ldr r4, _0814A5AC @ =gUnknown_203F3D8 ldr r4, _0814A5AC @ =gUnknown_203F3D8
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x26 adds r1, 0x26
bl sub_8099E90 bl CopyItemName
bl UnkTextUtil_Reset bl UnkTextUtil_Reset
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x26 adds r1, 0x26
@@ -5760,7 +5760,7 @@ sub_814A5B4: @ 814A5B4
ldr r4, _0814A624 @ =gUnknown_203F3D8 ldr r4, _0814A624 @ =gUnknown_203F3D8
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x26 adds r1, 0x26
bl sub_8099E90 bl CopyItemName
bl UnkTextUtil_Reset bl UnkTextUtil_Reset
ldr r1, [r4] ldr r1, [r4]
adds r1, 0x26 adds r1, 0x26
asm/unk_814B6F0.s
+1 -1
View File
@@ -204,7 +204,7 @@ _0814B878: .4byte gSpecialVar_ItemId
_0814B87C: _0814B87C:
ldrh r0, [r1] ldrh r0, [r1]
movs r1, 0x1 movs r1, 0x1
bl sub_809A1D8 bl RemoveBagItem
_0814B884: _0814B884:
ldr r4, _0814B8E0 @ =gUnknown_203F3DC ldr r4, _0814B8E0 @ =gUnknown_203F3DC
ldr r2, [r4] ldr r2, [r4]
asm/unk_81507FC.s
+5 -5
View File
@@ -6240,7 +6240,7 @@ _08153754: .4byte gUnknown_203F3E0
_08153758: _08153758:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0x1 movs r1, 0x1
bl sub_809A000 bl CheckBagHasSpace
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0815376A bne _0815376A
@@ -6249,10 +6249,10 @@ _08153758:
_0815376A: _0815376A:
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x1 movs r1, 0x1
bl sub_809A084 bl AddBagItem
adds r0, r6, 0 adds r0, r6, 0
movs r1, 0x1 movs r1, 0x1
bl sub_809A000 bl CheckBagHasSpace
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08153784 beq _08153784
@@ -9989,7 +9989,7 @@ _08155480:
lsrs r0, 16 lsrs r0, 16
add r5, sp, 0x70 add r5, sp, 0x70
adds r1, r5, 0 adds r1, r5, 0
bl sub_8099E90 bl CopyItemName
movs r0, 0 movs r0, 0
adds r1, r5, 0 adds r1, r5, 0
bl UnkTextUtil_SetPtrI bl UnkTextUtil_SetPtrI
@@ -10021,7 +10021,7 @@ _08155480:
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
adds r1, r5, 0 adds r1, r5, 0
bl sub_8099E90 bl CopyItemName
movs r0, 0 movs r0, 0
adds r1, r5, 0 adds r1, r5, 0
bl UnkTextUtil_SetPtrI bl UnkTextUtil_SetPtrI
common_syms/fieldmap.txt
+1
View File
@@ -0,0 +1 @@
VMap
data/data.s
+1 -21
View File
@@ -908,7 +908,7 @@ gUnknown_826D29E:: @ 826D29E
gUnknown_826D2B0:: @ 826D2B0 gUnknown_826D2B0:: @ 826D2B0
.incbin "baserom.gba", 0x26D2B0, 0x28 .incbin "baserom.gba", 0x26D2B0, 0x28
gUnknown_826D2D8:: @ 826D2D8 gDirectionToVectors:: @ 826D2D8
.incbin "baserom.gba", 0x26D2D8, 0x48 .incbin "baserom.gba", 0x26D2D8, 0x48
gUnknown_826D320:: @ 826D320 gUnknown_826D320:: @ 826D320
@@ -933,23 +933,3 @@ gUnknown_834EB8C:: @ 834EB8C
.incbin "baserom.gba", 0x34EB8C, 0x5FC .incbin "baserom.gba", 0x34EB8C, 0x5FC
.include "data/maps/groups.inc" .include "data/maps/groups.inc"
gUnknown_8352754:: @ 8352754
.incbin "baserom.gba", 0x352754, 0x798
gUnknown_8352EEC:: @ 8352EEC
.incbin "baserom.gba", 0x352EEC, 0x4
gUnknown_8352EF0:: @ 8352EF0
.incbin "baserom.gba", 0x352EF0, 0x20
gUnknown_8352F10:: @ 8352F10
.incbin "baserom.gba", 0x352F10, 0x8
.align 2
gUnknown_8352F18:: @ 8352F18
.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/fieldmap.c"
.align 2
gUnknown_8352F4C:: @ 8352F4C
.asciz "VMap.Xsize * VMap.Ysize <= VIRTUAL_MAP_SIZE"
data/data_835B488.s
+7 -20
View File
@@ -657,29 +657,16 @@ gUnknown_83A720C:: @ 83A720C
gUnknown_83A7240:: @ 83A7240 gUnknown_83A7240:: @ 83A7240
.asciz "0" .asciz "0"
.align 2 .section .rodata.83A72A0
gNullScriptPtr:: @ 83A7244
.incbin "baserom.gba", 0x3A7244, 0x4
gUnknown_83A7248:: @ 83A7248
.incbin "baserom.gba", 0x3A7248, 0x14
gUnknown_83A725C:: @ 83A725C
.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c"
.align 2
gUnknown_83A7290:: @ 83A7290
.asciz "0"
.align 2
gUnknown_83A7294:: @ 83A7294
.incbin "baserom.gba", 0x3A7294, 0xC
gUnknown_83A72A0:: @ 83A72A0 gUnknown_83A72A0:: @ 83A72A0
.incbin "baserom.gba", 0x3A72A0, 0x2 .string "S$"
gUnknown_83A72A2:: @ 83A72A2 gUnknown_83A72A2:: @ 83A72A2
.incbin "baserom.gba", 0x3A72A2, 0x6 .string "IES$"
gUnknown_83A72A6:: @ 83A72A6
.string " "
gUnknown_83A72A8:: @ 83A72A8 gUnknown_83A72A8:: @ 83A72A8
.incbin "baserom.gba", 0x3A72A8, 0x68 .incbin "baserom.gba", 0x3A72A8, 0x68
@@ -1560,7 +1547,7 @@ gUnknown_83DFC9C:: @ 83DFC9C
gUnknown_83E04B0:: @ 83E04B0 gUnknown_83E04B0:: @ 83E04B0
.incbin "baserom.gba", 0x3E04B0, 0x208 .incbin "baserom.gba", 0x3E04B0, 0x208
gUnknown_83E06B8:: @ 83E06B8 gStdStringPtrs:: @ 83E06B8
.incbin "baserom.gba", 0x3E06B8, 0x74 .incbin "baserom.gba", 0x3E06B8, 0x74
gUnknown_83E072C:: @ 83E072C gUnknown_83E072C:: @ 83E072C
data/data_83FECCC.s
+1 -1
View File
@@ -785,7 +785,7 @@ gUnknown_84162B9:: @ 84162B9
.incbin "baserom.gba", 0x4162B9, 0x4 .incbin "baserom.gba", 0x4162B9, 0x4
gUnknown_84162BD:: @ 84162BD gUnknown_84162BD:: @ 84162BD
.incbin "baserom.gba", 0x4162BD, 0x7 .string " BERRY$"
gText_Coins:: @ 84162C4 gText_Coins:: @ 84162C4
.incbin "baserom.gba", 0x4162C4, 0x24 .incbin "baserom.gba", 0x4162C4, 0x24
data/event_scripts.s
+1 -1
View File
@@ -40,7 +40,7 @@ gStdScripts:: @ 8160450
.4byte gStdScript_81A676C .4byte gStdScript_81A676C
.4byte gStdScript_81A8E58 .4byte gStdScript_81A8E58
.4byte gStdScript_81A4E66 .4byte gStdScript_81A4E66
gStdScripts_End:: gStdScriptsEnd::
gUnknown_8160478:: @ 8160478 gUnknown_8160478:: @ 8160478
.incbin "baserom.gba", 0x160478, 0x886C .incbin "baserom.gba", 0x160478, 0x886C
data/fieldmap.s
+6
View File
@@ -0,0 +1,6 @@
.include "asm/macros.inc"
.section .rodata
gUnknown_8352754:: @ 8352754
.incbin "baserom.gba", 0x352754, 0x798
data/script_cmd_table.inc
+73 -73
View File
@@ -1,8 +1,8 @@
.align 2 .align 2
gScriptCmdTable:: @ 815F9B4 gScriptCmdTable:: @ 815F9B4
.4byte sub_8069ED0 .4byte ScrCmd_nop
.4byte sub_8069ED4 .4byte ScrCmd_nop1
.4byte ScrCmd_end .4byte ScrCmd_end
.4byte ScrCmd_return .4byte ScrCmd_return
.4byte ScrCmd_call .4byte ScrCmd_call
@@ -38,48 +38,48 @@ gScriptCmdTable:: @ 815F9B4
.4byte ScrCmd_compare_var_to_var .4byte ScrCmd_compare_var_to_var
.4byte ScrCmd_callnative .4byte ScrCmd_callnative
.4byte ScrCmd_gotonative .4byte ScrCmd_gotonative
.4byte sub_8069EFC .4byte ScrCmd_special
.4byte sub_8069F3C .4byte ScrCmd_specialvar
.4byte sub_8069FA4 .4byte ScrCmd_waitstate
.4byte ScrCmd_delay .4byte ScrCmd_delay
.4byte ScrCmd_setflag .4byte ScrCmd_setflag
.4byte ScrCmd_clearflag .4byte ScrCmd_clearflag
.4byte ScrCmd_checkflag .4byte ScrCmd_checkflag
.4byte sub_806A9D4 .4byte ScrCmd_initclock
.4byte sub_806A9D8 .4byte ScrCmd_dodailyevents
.4byte sub_806A9DC .4byte ScrCmd_gettime
.4byte ScrCmd_playse .4byte ScrCmd_playse
.4byte sub_806B094 .4byte ScrCmd_waitse
.4byte ScrCmd_playfanfare .4byte ScrCmd_playfanfare
.4byte sub_806B0CC .4byte ScrCmd_waitfanfare
.4byte sub_806B0E0 .4byte ScrCmd_playbgm
.4byte sub_806B120 .4byte ScrCmd_savebgm
.4byte sub_806B134 .4byte ScrCmd_fadedefaultbgm
.4byte sub_806B154 .4byte ScrCmd_fadenewbgm
.4byte sub_806B17C .4byte ScrCmd_fadeoutbgm
.4byte sub_806B1C8 .4byte ScrCmd_fadeinbgm
.4byte ScrCmd_warp .4byte ScrCmd_warp
.4byte ScrCmd_warpsilent .4byte ScrCmd_warpsilent
.4byte ScrCmd_warpdoor .4byte ScrCmd_warpdoor
.4byte ScrCmd_warphole .4byte ScrCmd_warphole
.4byte sub_806AC70 .4byte ScrCmd_warpteleport
.4byte ScrCmd_setwarp .4byte ScrCmd_setwarp
.4byte ScrCmd_setdynamicwarp .4byte ScrCmd_setdynamicwarp
.4byte sub_806AE90 .4byte ScrCmd_setdivewarp
.4byte sub_806AF10 .4byte ScrCmd_setholewarp
.4byte ScrCmd_getplayerxy .4byte ScrCmd_getplayerxy
.4byte ScrCmd_getpartysize .4byte ScrCmd_getpartysize
.4byte sub_806A610 .4byte ScrCmd_giveitem
.4byte ScrCmd_takeitem .4byte ScrCmd_takeitem
.4byte sub_806A6A0 .4byte ScrCmd_checkitemspace
.4byte sub_806A6E4 .4byte ScrCmd_checkitem
.4byte ScrCmd_checkitemtype .4byte ScrCmd_checkitemtype
.4byte ScrCmd_givepcitem .4byte ScrCmd_givepcitem
.4byte ScrCmd_checkpcitem .4byte ScrCmd_checkpcitem
.4byte sub_806A7DC .4byte ScrCmd_givedecoration
.4byte sub_806A7F0 .4byte ScrCmd_takedecoration
.4byte sub_806A818 .4byte ScrCmd_checkdecor
.4byte sub_806A804 .4byte ScrCmd_checkdecorspace
.4byte ScrCmd_applymovement .4byte ScrCmd_applymovement
.4byte ScrCmd_applymovement_at .4byte ScrCmd_applymovement_at
.4byte ScrCmd_waitmovement .4byte ScrCmd_waitmovement
@@ -94,34 +94,34 @@ gScriptCmdTable:: @ 815F9B4
.4byte ScrCmd_faceplayer .4byte ScrCmd_faceplayer
.4byte ScrCmd_turnobject .4byte ScrCmd_turnobject
.4byte ScrCmd_trainerbattle .4byte ScrCmd_trainerbattle
.4byte sub_806C2D8 .4byte ScrCmd_dotrainerbattle
.4byte ScrCmd_ontrainerbattleend .4byte ScrCmd_gotopostbattlescript
.4byte ScrCmd_ontrainerbattleendgoto .4byte ScrCmd_gotobeatenscript
.4byte ScrCmd_checktrainerflag .4byte ScrCmd_checktrainerflag
.4byte ScrCmd_settrainerflag .4byte ScrCmd_settrainerflag
.4byte ScrCmd_cleartrainerflag .4byte ScrCmd_cleartrainerflag
.4byte ScrCmd_setobjectxyperm .4byte ScrCmd_setobjectxyperm
.4byte ScrCmd_moveobjectoffscreen .4byte ScrCmd_moveobjectoffscreen
.4byte ScrCmd_setobjectmovementtype .4byte ScrCmd_setobjectmovementtype
.4byte sub_806B878 .4byte ScrCmd_waitmessage
.4byte sub_806B80C .4byte ScrCmd_message
.4byte sub_806B88C .4byte ScrCmd_closemessage
.4byte ScrCmd_lockall .4byte ScrCmd_lockall
.4byte ScrCmd_lock .4byte ScrCmd_lock
.4byte ScrCmd_releaseall .4byte ScrCmd_releaseall
.4byte ScrCmd_release .4byte ScrCmd_release
.4byte sub_806BA3C .4byte ScrCmd_waitbuttonpress
.4byte ScrCmd_yesnobox .4byte ScrCmd_yesnobox
.4byte ScrCmd_multichoice .4byte ScrCmd_multichoice
.4byte ScrCmd_multichoicedefault .4byte ScrCmd_multichoicedefault
.4byte ScrCmd_multichoicegrid .4byte ScrCmd_multichoicegrid
.4byte sub_806BB38 .4byte ScrCmd_drawbox
.4byte sub_806BB8C .4byte ScrCmd_erasebox
.4byte sub_806BB98 .4byte ScrCmd_drawboxtext
.4byte sub_806BB9C .4byte ScrCmd_showmonpic
.4byte sub_806BBD8 .4byte ScrCmd_hidemonpic
.4byte sub_806BBF8 .4byte ScrCmd_showcontestwinner
.4byte sub_806BC04 .4byte ScrCmd_braillemessage
.4byte ScrCmd_givemon .4byte ScrCmd_givemon
.4byte ScrCmd_giveegg .4byte ScrCmd_giveegg
.4byte ScrCmd_setmonmove .4byte ScrCmd_setmonmove
@@ -130,33 +130,33 @@ gScriptCmdTable:: @ 815F9B4
.4byte ScrCmd_bufferleadmonspeciesname .4byte ScrCmd_bufferleadmonspeciesname
.4byte ScrCmd_bufferpartymonnick .4byte ScrCmd_bufferpartymonnick
.4byte ScrCmd_bufferitemname .4byte ScrCmd_bufferitemname
.4byte sub_806BE34 .4byte ScrCmd_bufferdecorationname
.4byte ScrCmd_buffermovename .4byte ScrCmd_buffermovename
.4byte ScrCmd_buffernumberstring .4byte ScrCmd_buffernumberstring
.4byte ScrCmd_bufferstdstring .4byte ScrCmd_bufferstdstring
.4byte ScrCmd_bufferstring .4byte ScrCmd_bufferstring
.4byte sub_806C3AC .4byte ScrCmd_pokemart
.4byte sub_806C3C0 .4byte ScrCmd_pokemartdecoration
.4byte sub_806C3D4 .4byte ScrCmd_pokemartdecoration2
.4byte ScrCmd_playslotmachine .4byte ScrCmd_playslotmachine
.4byte sub_806C410 .4byte ScrCmd_setberrytree
.4byte sub_806C418 .4byte ScrCmd_choosecontestmon
.4byte sub_806C424 .4byte ScrCmd_startcontest
.4byte sub_806C428 .4byte ScrCmd_showcontestresults
.4byte sub_806C42C .4byte ScrCmd_contestlinktransfer
.4byte ScrCmd_random .4byte ScrCmd_random
.4byte ScrCmd_givemoney .4byte ScrCmd_givemoney
.4byte ScrCmd_takemoney .4byte ScrCmd_takemoney
.4byte ScrCmd_checkmoney .4byte ScrCmd_checkmoney
.4byte sub_806C1CC .4byte ScrCmd_showmoneybox
.4byte sub_806C21C .4byte ScrCmd_hidemoneybox
.4byte sub_806C228 .4byte ScrCmd_updatemoneybox
.4byte sub_806C414 .4byte ScrCmd_getpricereduction
.4byte ScrCmd_fadescreen .4byte ScrCmd_fadescreen
.4byte ScrCmd_fadescreenspeed .4byte ScrCmd_fadescreenspeed
.4byte ScrCmd_setflashradius .4byte ScrCmd_setflashradius
.4byte ScrCmd_animateflash .4byte ScrCmd_animateflash
.4byte sub_806B85C .4byte ScrCmd_messageautoscroll
.4byte ScrCmd_dofieldeffect .4byte ScrCmd_dofieldeffect
.4byte ScrCmd_setfieldeffectarg .4byte ScrCmd_setfieldeffectarg
.4byte ScrCmd_waitfieldeffect .4byte ScrCmd_waitfieldeffect
@@ -175,16 +175,16 @@ gScriptCmdTable:: @ 815F9B4
.4byte ScrCmd_turnvobject .4byte ScrCmd_turnvobject
.4byte ScrCmd_opendoor .4byte ScrCmd_opendoor
.4byte ScrCmd_closedoor .4byte ScrCmd_closedoor
.4byte sub_806C688 .4byte ScrCmd_waitdooranim
.4byte ScrCmd_setdooropen .4byte ScrCmd_setdooropen
.4byte ScrCmd_setdoorclosed .4byte ScrCmd_setdoorclosed
.4byte sub_806C724 .4byte ScrCmd_addelevmenuitem
.4byte sub_806C728 .4byte ScrCmd_showelevmenu
.4byte ScrCmd_checkcoins .4byte ScrCmd_checkcoins
.4byte ScrCmd_givecoins .4byte ScrCmd_givecoins
.4byte ScrCmd_takecoins .4byte ScrCmd_takecoins
.4byte ScrCmd_setwildbattle .4byte ScrCmd_setwildbattle
.4byte sub_806C39C .4byte ScrCmd_dowildbattle
.4byte ScrCmd_setvaddress .4byte ScrCmd_setvaddress
.4byte ScrCmd_vgoto .4byte ScrCmd_vgoto
.4byte ScrCmd_vcall .4byte ScrCmd_vcall
@@ -193,27 +193,27 @@ gScriptCmdTable:: @ 815F9B4
.4byte ScrCmd_vmessage .4byte ScrCmd_vmessage
.4byte ScrCmd_vloadword .4byte ScrCmd_vloadword
.4byte ScrCmd_vbufferstring .4byte ScrCmd_vbufferstring
.4byte sub_806C258 .4byte ScrCmd_showcoinsbox
.4byte ScrCmd_hidecoinsbox .4byte ScrCmd_hidecoinsbox
.4byte ScrCmd_updatecoinsbox .4byte ScrCmd_updatecoinsbox
.4byte ScrCmd_incrementgamestat .4byte ScrCmd_incrementgamestat
.4byte ScrCmd_setescapewarp .4byte ScrCmd_setescapewarp
.4byte sub_806C540 .4byte ScrCmd_waitmoncry
.4byte ScrCmd_bufferboxname .4byte ScrCmd_bufferboxname
.4byte sub_806B7EC .4byte ScrCmd_cmdC7
.4byte sub_806B828 .4byte ScrCmd_cmdC8
.4byte sub_806B850 .4byte ScrCmd_cmdC9
.4byte sub_806C7BC .4byte ScrCmd_cmdCA
.4byte sub_806C7C8 .4byte ScrCmd_cmdCB
.4byte sub_806A888 .4byte ScrCmd_comparestattoword
.4byte ScrCmd_setmonobedient .4byte ScrCmd_setmonobedient
.4byte ScrCmd_checkmonobedience .4byte ScrCmd_checkmonobedience
.4byte sub_806A28C .4byte ScrCmd_cmdCF
.4byte sub_806A8C0 .4byte ScrCmd_cmdD0
.4byte sub_806ACF8 .4byte ScrCmd_warpD1
.4byte sub_806C844 .4byte ScrCmd_setmonmetlocation
.4byte sub_806BC40 .4byte ScrCmd_getbraillestringwidth
.4byte sub_806BD90 .4byte ScrCmd_bufferitemnameplural
gScriptCmdTableEnd:: @ 815FD08 gScriptCmdTableEnd:: @ 815FD08
.4byte sub_8069ED0 .4byte ScrCmd_nop
data/specials.inc
+2 -2
View File
@@ -327,8 +327,8 @@ gSpecials:: @ 815FD60
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
def_special sub_807B6C0 def_special sub_807B6C0
def_special sp13E_warp_to_last_warp def_special DoDiveWarp
def_special sp13F_fall_to_last_warp def_special DoFallWarp
def_special nullsub_75 def_special nullsub_75
def_special nullsub_75 def_special nullsub_75
def_special sub_80E5E70 def_special sub_80E5E70
include/battle_setup.h
+2 -2
View File
@@ -11,8 +11,8 @@ void BattleSetup_StartWildBattle(void);
void BattleSetup_StartRoamerBattle(void); void BattleSetup_StartRoamerBattle(void);
u8 HasTrainerAlreadyBeenFought(u16); u8 HasTrainerAlreadyBeenFought(u16);
void trainer_flag_set(u16); void SetTrainerFlag(u16);
void trainer_flag_clear(u16); void ClearTrainerFlag(u16);
void BattleSetup_StartTrainerBattle(void); void BattleSetup_StartTrainerBattle(void);
u8 *BattleSetup_GetScriptAddrAfterBattle(void); u8 *BattleSetup_GetScriptAddrAfterBattle(void);
u8 *BattleSetup_GetTrainerPostBattleScript(void); u8 *BattleSetup_GetTrainerPostBattleScript(void);
include/field_fadetransition.h
+8 -8
View File
@@ -3,14 +3,14 @@
#include "global.h" #include "global.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);
void sub_807DF64(void);
void sub_807DF7C(void); void sub_807DF7C(void);
void DoWarp(void);
void DoDiveWarp(void);
void DoDoorWarp(void);
void DoFallWarp(void);
void sub_807E59C(void);
void sub_807E500(void);
void sub_807DF64(void);
#endif // GUARD_FIELD_FADETRANSITION_H #endif // GUARD_FIELD_FADETRANSITION_H
include/field_map_obj.h
+4 -4
View File
@@ -35,7 +35,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 sub_805F7C4(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_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat);
@@ -59,13 +59,13 @@ const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8);
void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8); void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8);
void gpu_pal_allocator_reset__manage_upper_four(void); void gpu_pal_allocator_reset__manage_upper_four(void);
void sub_808E82C(u8, u8, u8, s16, s16); void sub_808E82C(u8, u8, u8, s16, s16);
void sub_808E7E4(u8, u8, u8); void sub_805F400(u8, u8, u8);
void sub_808E78C(u8, u8, u8, u8); void sub_805F3A8(u8, u8, u8, u8);
void sub_808E75C(s16, s16); void sub_808E75C(s16, s16);
void FieldObjectGetLocalIdAndMap(struct MapObject *, u8 *, u8 *, u8 *); void FieldObjectGetLocalIdAndMap(struct MapObject *, u8 *, u8 *, u8 *);
void npc_coords_shift(struct MapObject *, s16, s16); 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_805FE94(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 FieldObjectFaceOppositeDirection(struct MapObject *, u8);
u8 GetOppositeDirection(u8); u8 GetOppositeDirection(u8);
include/field_map_obj_helpers.h
+1 -1
View File
@@ -4,6 +4,6 @@
#include "global.h" #include "global.h"
void UnfreezeMapObjects(void); void UnfreezeMapObjects(void);
void sub_8097B78(u8, u8); void sub_8069058(u8, u8);
#endif #endif
include/field_player_avatar.h
+1
View File
@@ -20,5 +20,6 @@ u8 sub_805C808(u8);
void SetPlayerAvatarStateMask(u8 mask); void SetPlayerAvatarStateMask(u8 mask);
void sub_805D9C4(struct Sprite *sprite); void sub_805D9C4(struct Sprite *sprite);
void sub_805D154(u8 direction); void sub_805D154(u8 direction);
void sub_805DAE4(u8 direction);
#endif //GUARD_FIELD_PLAYER_AVATAR_H #endif //GUARD_FIELD_PLAYER_AVATAR_H
include/field_screen_effect.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "global.h" #include "global.h"
void sub_80AF79C(void); void sub_80AF79C(void);
void sub_80B009C(u8); void sub_807F028(u8);
void sub_80B0244(void); void sub_80B0244(void);
#endif // GUARD_FIELD_SCREEN_EFFECT_H #endif // GUARD_FIELD_SCREEN_EFFECT_H
include/field_specials.h
+1
View File
@@ -4,6 +4,7 @@
#include "global.h" #include "global.h"
u8 GetLeadMonIndex(void); u8 GetLeadMonIndex(void);
u8 CountDigits(u16 number);
void TV_PrintIntToStringVar(u8, int); void TV_PrintIntToStringVar(u8, int);
#endif // GUARD_FIELD_SPECIALS_H #endif // GUARD_FIELD_SPECIALS_H
include/field_weather.h
+1
View File
@@ -10,6 +10,7 @@ u8 GetSav1Weather(void);
void sub_80AEDBC(void); void sub_80AEDBC(void);
void DoCurrentWeather(void); void DoCurrentWeather(void);
void SetSav1WeatherFromCurrMapHeader(void);
void sub_807B0C4(u16 *, u16 *, u32); void sub_807B0C4(u16 *, u16 *, u32);
#endif // GUARD_WEATHER_H #endif // GUARD_WEATHER_H
include/fieldmap.h
+13 -8
View File
@@ -3,19 +3,24 @@
#include "global.h" #include "global.h"
extern struct MapCoords { #define NUM_TILES_IN_PRIMARY 640
int width; #define NUM_TILES_TOTAL 1024
int height; #define NUM_METATILES_IN_PRIMARY 640
} gUnknown_03005DC0; #define NUM_METATILES_TOTAL 1024
#define NUM_PALS_IN_PRIMARY 7
#define NUM_PALS_TOTAL 13
#define VIRTUAL_MAP_SIZE 0x2800
extern struct BackupMapData VMap;
u32 MapGridGetMetatileIdAt(int, int); u32 MapGridGetMetatileIdAt(int, int);
u32 MapGridGetMetatileBehaviorAt(int, int); u32 MapGridGetMetatileBehaviorAt(int, int);
void MapGridSetMetatileIdAt(int, int, u16); void MapGridSetMetatileIdAt(int, int, u16);
void MapGridSetMetatileEntryAt(int, int, u16); void MapGridSetMetatileEntryAt(int, int, u16);
void GetCameraCoords(u16*, u16*); void GetCameraCoords(u16*, u16*);
bool8 MapGridIsImpassableAt(s16, s16); bool8 MapGridIsImpassableAt(s32, s32);
s32 GetMapBorderIdAt(s16, s16); s32 GetMapBorderIdAt(s32, s32);
bool32 CanCameraMoveInDirection(u8); bool32 CanCameraMoveInDirection(s32);
u16 GetBehaviorByMetatileId(u16 metatileId); u32 GetBehaviorByMetatileIdAndMapData(struct MapData *mapData, u16 metatile, u8 attr);
#endif //GUARD_FIELDMAP_H #endif //GUARD_FIELDMAP_H
include/global.fieldmap.h
+8 -6
View File
@@ -51,8 +51,8 @@ struct Tileset
/*0x04*/ void *tiles; /*0x04*/ void *tiles;
/*0x08*/ void *palettes; /*0x08*/ void *palettes;
/*0x0c*/ void *metatiles; /*0x0c*/ void *metatiles;
/*0x10*/ void *metatileAttributes;
/*0x14*/ TilesetCB callback; /*0x14*/ TilesetCB callback;
/*0x10*/ void *metatileAttributes;
}; };
struct MapData struct MapData
@@ -63,12 +63,14 @@ struct MapData
/*0x0c*/ u16 *map; /*0x0c*/ u16 *map;
/*0x10*/ struct Tileset *primaryTileset; /*0x10*/ struct Tileset *primaryTileset;
/*0x14*/ struct Tileset *secondaryTileset; /*0x14*/ struct Tileset *secondaryTileset;
/*0x18*/ u8 unk18;
/*0x19*/ u8 unk19;
}; };
struct BackupMapData struct BackupMapData
{ {
s32 width; s32 Xsize;
s32 height; s32 Ysize;
u16 *map; u16 *map;
}; };
@@ -149,9 +151,9 @@ struct MapEvents
struct MapConnection struct MapConnection
{ {
/*0x00*/ u8 direction; /*0x00*/ u8 direction;
/*0x01*/ u32 offset; /*0x04*/ u32 offset;
/*0x05*/ u8 mapGroup; /*0x08*/ u8 mapGroup;
/*0x06*/ u8 mapNum; /*0x09*/ u8 mapNum;
}; };
struct MapConnections struct MapConnections
include/global.h
+2 -1
View File
@@ -328,7 +328,8 @@ struct SaveBlock2
/*0x0AC*/ u8 filler_AC[0x3F4]; /*0x0AC*/ u8 filler_AC[0x3F4];
/*0x4A0*/ u32 unk_4A0[0x2F]; /*0x4A0*/ u32 unk_4A0[0x2F];
/*0x55c*/ struct UnkSaveBlock2Substruct_55C unk_55C; /*0x55c*/ struct UnkSaveBlock2Substruct_55C unk_55C;
/*0x574*/ u8 filler_574[0x524]; /*0x574*/ u8 filler_574[0x324];
/*0x898*/ u16 mapView[0x100];
/*0xA98*/ struct LinkBattleRecords linkBattleRecords; /*0xA98*/ struct LinkBattleRecords linkBattleRecords;
/*0xAF0*/ struct BerryCrush berryCrush; /*0xAF0*/ struct BerryCrush berryCrush;
/*0xB00*/ u8 filler_B00[0x420]; /*0xB00*/ u8 filler_B00[0x420];
include/item.h
+3 -2
View File
@@ -62,7 +62,8 @@ u8 ItemId_GetSecondaryId(u16 itemId);
u16 itemid_get_market_price(u16 itemId); u16 itemid_get_market_price(u16 itemId);
void sub_809A2DC(void); void sub_809A2DC(void);
void sub_809A2A4(void); void sub_809A2A4(void);
void sub_8099E90(u16, u8 *); void CopyItemName(u16, u8 *);
bool8 sub_809A084(u16 itemId, u16 amount); void sub_809A824(u16 itemId);
bool8 AddBagItem(u16 itemId, u16 amount);
#endif // ITEM_H #endif // ITEM_H
include/map_obj_lock.h
+2 -2
View File
@@ -3,9 +3,9 @@
#include "global.h" #include "global.h"
bool8 sub_80983C4(void); bool8 sub_8069590(void);
void ScriptFreezeMapObjects(void); void ScriptFreezeMapObjects(void);
bool8 sub_809847C(void); bool8 sub_8069648(void);
void LockSelectedMapObject(void); void LockSelectedMapObject(void);
void sub_8098630(void); void sub_8098630(void);
bool8 sub_8098734(void); bool8 sub_8098734(void);
include/map_preview_screen.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_MAP_PREVIEW_SCREEN_H
#define GUARD_MAP_PREVIEW_SCREEN_H
void sub_80F85BC(u16 a0);
#endif //GUARD_MAP_PREVIEW_SCREEN_H
include/menu.h
+1
View File
@@ -37,5 +37,6 @@ void clear_scheduled_bg_copies_to_vram(void);
void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str); void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str);
void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3); void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3);
void sub_810F4D8(u8 windowId, bool32 someBool); void sub_810F4D8(u8 windowId, bool32 someBool);
void *sub_80F68F0(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
#endif // GUARD_MENU_H #endif // GUARD_MENU_H
include/new_menu_helpers.h
+4
View File
@@ -19,5 +19,9 @@ void sub_80F6F54(u8, u8);
u8 sub_80F78A8(void); u8 sub_80F78A8(void);
void sub_80F6E9C(void); void sub_80F6E9C(void);
void sub_80F6EE4(u8 windowId, bool8 transfer); void sub_80F6EE4(u8 windowId, bool8 transfer);
void sub_80F7974(const u8 *);
u8 GetStartMenuWindowId(void);
void sub_80F7998(void);
void sub_80F69E8(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
#endif // GUARD_NEW_MENU_HELPERS_H #endif // GUARD_NEW_MENU_HELPERS_H
include/overworld.h
+12 -1
View File
@@ -24,6 +24,8 @@ struct UCoords32
u32 x, y; u32 x, y;
}; };
extern struct UCoords32 gDirectionToVectors[];
extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4]; extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
extern MainCallback gFieldCallback; extern MainCallback gFieldCallback;
@@ -35,7 +37,10 @@ void Overworld_SetMapObjTemplateMovementType(u8, u8);
void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
void saved_warp2_set(int unused, s8 mapGroup, s8 mapNum, s8 warpId); void saved_warp2_set(int unused, s8 mapGroup, s8 mapNum, s8 warpId);
void saved_warp2_set_2(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void SetDynamicWarpWithCoords(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
void SetEscapeWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
void Overworld_SetHealLocationWarp(u8); void Overworld_SetHealLocationWarp(u8);
void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
void sub_8084E2C(s8, s8, s8, s8, s8); void sub_8084E2C(s8, s8, s8, s8, s8);
@@ -81,6 +86,10 @@ void sub_8055DC4(void);
u8 sav1_map_get_name(void); u8 sav1_map_get_name(void);
void SetCurrentMapLayout(u16 mapDataId);
void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y);
void ResetInitialPlayerAvatarState(void);
void sub_8055D40(u16 mapDataId); void sub_8055D40(u16 mapDataId);
void sub_80563F0(void); void sub_80563F0(void);
@@ -88,5 +97,7 @@ extern u8 gUnknown_2031DD8;
extern u8 gUnknown_2036E28; extern u8 gUnknown_2036E28;
extern bool8 (* gUnknown_3005024)(void); extern bool8 (* gUnknown_3005024)(void);
void SetLastHealLocationWarp(u8 healLocaionId);
void sub_8055864(u8 mapGroup, u8 mapNum);
#endif //GUARD_ROM4_H #endif //GUARD_ROM4_H
include/palette.h
+2
View File
@@ -70,6 +70,8 @@ void BeginHardwarePaletteFade(u8, u8, u8, u8, u8);
void BlendPalettes(u32, u8, u16); void BlendPalettes(u32, u8, u16);
void BlendPalettesUnfaded(u32, u8, u16); void BlendPalettesUnfaded(u32, u8, u16);
void sub_80716F8(const u16 *, u16 *, u16, u8); void sub_80716F8(const u16 *, u16 *, u16, u8);
void TintPalette_GrayScale(u16 *, u16);
void TintPalette_SepiaTone(u16 *, u16);
extern struct PaletteFadeControl gPaletteFade; extern struct PaletteFadeControl gPaletteFade;
include/party_menu.h
+1 -1
View File
@@ -12,7 +12,7 @@ enum {
AILMENT_BRN AILMENT_BRN
}; };
bool8 pokemon_has_move(struct Pokemon *, u16); bool8 MonKnowsMove(struct Pokemon *, u16);
void sub_81B58A8(void); void sub_81B58A8(void);
void DoWallyTutorialBagMenu(void); void DoWallyTutorialBagMenu(void);
u8 pokemon_ailments_get_primary(u32 status); u8 pokemon_ailments_get_primary(u32 status);
include/pokemon_storage_system.h
+1
View File
@@ -12,5 +12,6 @@ void SetBoxMonNickFromAnyBox(u8 boxId, u8 monPosition, u8 * newNick);
void CompactPartySlots(void); void CompactPartySlots(void);
u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request); u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request);
void sub_808BCB4(u8 boxId, u8 monPosition); void sub_808BCB4(u8 boxId, u8 monPosition);
u8 * GetBoxNamePtr(u8 boxId);
#endif // GUARD_POKEMON_STORAGE_SYSTEM_H #endif // GUARD_POKEMON_STORAGE_SYSTEM_H
include/quest_log.h
+6
View File
@@ -21,5 +21,11 @@ extern struct UnkStruct_203AE98 * gUnknown_3005E94;
void sub_8112720(u8); void sub_8112720(u8);
void sub_8113550(u16, const u16 *); void sub_8113550(u16, const u16 *);
void sub_8115748(u16);
u8 sub_8112CAC(void);
bool8 sub_81119D4(void (*func)(void));
void sub_8111F38(u16, u16);
extern u8 gUnknown_203ADFA;
#endif //GUARD_QUEST_LOG_H #endif //GUARD_QUEST_LOG_H
include/scrcmd.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_SCRCMD_H
#define GUARD_SCRCMD_H
extern struct ScriptContext * gUnknown_3005070;
#endif //GUARD_SCRCMD_H
include/script.h
+9
View File
@@ -65,5 +65,14 @@ void sub_80992A0(u8 *script, u16 scriptSize);
bool32 sub_8069DFC(void); bool32 sub_8069DFC(void);
void sub_8069EA4(u8 * script, u16 scriptSize); void sub_8069EA4(u8 * script, u16 scriptSize);
u8 * sub_8069E48(void); u8 * sub_8069E48(void);
void sub_8069998(u8 var);
void sub_80699F8(void);
void sub_8069964(void);
void sub_80699A4(void);
void sub_8069970(void);
void sub_8069A20(void);
void sub_8069A2C(void);
extern const u8 *gRAMScriptPtr;
#endif // GUARD_SCRIPT_H #endif // GUARD_SCRIPT_H
include/script_menu.h
+2 -1
View File
@@ -3,7 +3,7 @@
#include "global.h" #include "global.h"
extern const u8 *const gUnknown_0858BAF0[9]; extern const u8 *const gStdStringPtrs[9];
bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 var3, u8 var4); 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_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 var5);
@@ -11,5 +11,6 @@ bool8 ScriptMenu_YesNo(u8 var1, u8 var2);
bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount); bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3); bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3);
bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void); bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
void sub_809D6D4(void);
#endif //GUARD_SCRIPT_MENU_H #endif //GUARD_SCRIPT_MENU_H
include/script_movement.h
+1 -1
View File
@@ -5,6 +5,6 @@
bool8 ScriptMovement_StartObjectMovementScript(u8, u8, u8, const u8 *); bool8 ScriptMovement_StartObjectMovementScript(u8, u8, u8, const u8 *);
bool8 ScriptMovement_IsObjectMovementFinished(u8, u8, u8); bool8 ScriptMovement_IsObjectMovementFinished(u8, u8, u8);
void sub_80D338C(void); void sub_80974D8(void);
#endif // GUARD_SCRIPT_MOVEMENT_H #endif // GUARD_SCRIPT_MOVEMENT_H
include/script_pokemon_util_80A0058.h
+8
View File
@@ -0,0 +1,8 @@
#ifndef GUARD_SCRIPT_POKEMON_UTIL_80A0058_H
#define GUARD_SCRIPT_POKEMON_UTIL_80A0058_H
bool8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unk1, u32 unk2, u8 unk3);
bool8 ScriptGiveEgg(u16 species);
void ScriptSetMonMoveSlot(u8 partyIdx, u16 move, u8 slot);
#endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H
include/sound.h
+1
View File
@@ -31,6 +31,7 @@ void PlayCry3(u16 species, s8 pan, u8 mode);
void PlayCry4(u16 species, s8 pan, u8 mode); void PlayCry4(u16 species, s8 pan, u8 mode);
void PlayCry5(u16 species, u8 mode); void PlayCry5(u16 species, u8 mode);
void PlayCry6(u16 species, s8 pan, u8 mode); void PlayCry6(u16 species, s8 pan, u8 mode);
void PlayCry7(u16 species, u8 mode);
void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode); void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode);
bool8 IsCryFinished(void); bool8 IsCryFinished(void);
void StopCryAndClearCrySongs(void); void StopCryAndClearCrySongs(void);
ld_script.txt
+6 -2
View File
@@ -91,7 +91,7 @@ SECTIONS {
asm/play_time.o(.text); asm/play_time.o(.text);
asm/new_game.o(.text); asm/new_game.o(.text);
asm/overworld.o(.text); asm/overworld.o(.text);
asm/fieldmap.o(.text); src/fieldmap.o(.text);
src/metatile_behavior.o(.text); src/metatile_behavior.o(.text);
asm/field_camera.o(.text); asm/field_camera.o(.text);
asm/field_door.o(.text); asm/field_door.o(.text);
@@ -103,7 +103,7 @@ SECTIONS {
asm/map_obj_lock.o(.text); asm/map_obj_lock.o(.text);
asm/text_window_graphics.o(.text); asm/text_window_graphics.o(.text);
src/script.o(.text); src/script.o(.text);
asm/scrcmd.o(.text); src/scrcmd.o(.text);
asm/field_control_avatar.o(.text); asm/field_control_avatar.o(.text);
asm/event_data.o(.text); asm/event_data.o(.text);
asm/coord_event_weather.o(.text); asm/coord_event_weather.o(.text);
@@ -367,9 +367,13 @@ SECTIONS {
src/bg_regs.o(.rodata); src/bg_regs.o(.rodata);
src/string_util.o(.rodata); src/string_util.o(.rodata);
data/data.o(.rodata); data/data.o(.rodata);
data/fieldmap.o(.rodata);
src/fieldmap.o(.rodata);
src/metatile_behavior.o(.rodata); src/metatile_behavior.o(.rodata);
data/metatile_behavior.o(.rodata); data/metatile_behavior.o(.rodata);
data/data_835B488.o(.rodata); data/data_835B488.o(.rodata);
src/scrcmd.o(.rodata);
data/data_835B488.o(.rodata.83A72A0);
src/battle_ai_script_commands.o(.rodata); src/battle_ai_script_commands.o(.rodata);
data/data_83F5738.o(.rodata); data/data_83F5738.o(.rodata);
src/save.o(.rodata); src/save.o(.rodata);
src/fieldmap.c
+1025
View File
File diff suppressed because it is too large Load Diff
src/quest_log.c
+2 -2
View File
@@ -4312,7 +4312,7 @@ u16 * sub_8114C68(u16 * a0, const u16 * a1)
const u16 * sub_8114C8C(const u16 * a0) const u16 * sub_8114C8C(const u16 * a0)
{ {
const u16 *r4 = sub_8113E88(28, a0); const u16 *r4 = sub_8113E88(28, a0);
sub_8099E90(r4[0], gStringVar1); CopyItemName(r4[0], gStringVar1);
StringExpandPlaceholders(gStringVar4, gUnknown_841A391); StringExpandPlaceholders(gStringVar4, gUnknown_841A391);
return r4 + 1; return r4 + 1;
} }
@@ -4329,7 +4329,7 @@ u16 * sub_8114CC0(u16 * a0, const u16 * a1)
const u16 * sub_8114CE4(const u16 * a0) const u16 * sub_8114CE4(const u16 * a0)
{ {
const u16 *r4 = sub_8113E88(29, a0); const u16 *r4 = sub_8113E88(29, a0);
sub_8099E90(r4[0], gStringVar1); CopyItemName(r4[0], gStringVar1);
StringExpandPlaceholders(gStringVar4, gUnknown_841A3DA); StringExpandPlaceholders(gStringVar4, gUnknown_841A3DA);
return r4 + 1; return r4 + 1;
} }
src/save.c
+2 -2
View File
@@ -69,7 +69,7 @@ const struct SaveSectionOffsets gSaveSectionOffsets[] =
extern void DoSaveFailedScreen(u8 saveType); // save_failed_screen extern void DoSaveFailedScreen(u8 saveType); // save_failed_screen
extern void sub_800AB9C(void); // link extern void sub_800AB9C(void); // link
extern bool8 sub_800A4BC(void); // link extern bool8 sub_800A4BC(void); // link
extern void sub_80590D8(void); // fieldmap extern void save_serialize_map(void); // fieldmap
extern void sub_804C1C0(void); // load_save extern void sub_804C1C0(void); // load_save
extern void sav2_gender2_inplace_and_xFE(void); // load_save extern void sav2_gender2_inplace_and_xFE(void); // load_save
@@ -867,7 +867,7 @@ void sub_80DA634(u8 taskId)
case 2: case 2:
if (sub_800A4BC()) if (sub_800A4BC())
{ {
sub_80590D8(); save_serialize_map();
gTasks[taskId].data[0] = 3; gTasks[taskId].data[0] = 3;
} }
break; break;
src/scrcmd.c
+2267
View File
File diff suppressed because it is too large Load Diff
src/script.c
+3 -3
View File
@@ -19,7 +19,7 @@ enum
}; };
EWRAM_DATA u8 gUnknown_20370A0 = 0; EWRAM_DATA u8 gUnknown_20370A0 = 0;
EWRAM_DATA u8 *gUnknown_20370A4 = NULL; EWRAM_DATA const u8 *gRAMScriptPtr = NULL;
// ewram bss // ewram bss
/*IWRAM_DATA*/ static u8 sScriptContext1Status; /*IWRAM_DATA*/ static u8 sScriptContext1Status;
@@ -485,7 +485,7 @@ bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objec
u8 *GetRamScript(u8 objectId, u8 *script) u8 *GetRamScript(u8 objectId, u8 *script)
{ {
struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data; struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data;
gUnknown_20370A4 = NULL; gRAMScriptPtr = NULL;
if (scriptData->magic != RAM_SCRIPT_MAGIC) if (scriptData->magic != RAM_SCRIPT_MAGIC)
return script; return script;
if (scriptData->mapGroup != gSaveBlock1Ptr->location.mapGroup) if (scriptData->mapGroup != gSaveBlock1Ptr->location.mapGroup)
@@ -501,7 +501,7 @@ u8 *GetRamScript(u8 objectId, u8 *script)
} }
else else
{ {
gUnknown_20370A4 = script; gRAMScriptPtr = script;
return scriptData->script; return scriptData->script;
} }
} }
src/trainer_tower.c
+4 -4
View File
@@ -440,12 +440,12 @@ void sub_815DD44(void)
if (gMapHeader.mapDataId - 0x129 > gUnknown_203F458->unk_0004.unk_0000.unk0) if (gMapHeader.mapDataId - 0x129 > gUnknown_203F458->unk_0004.unk_0000.unk0)
{ {
gSpecialVar_Result = 3; gSpecialVar_Result = 3;
sub_8055D40(0x132); SetCurrentMapLayout(0x132);
} }
else else
{ {
gSpecialVar_Result = gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_002; gSpecialVar_Result = gUnknown_203F458->unk_0004.unk_0008[gUnknown_203F458->unk_0000].unk_002;
sub_8055D40(gUnknown_847A284[gUnknown_203F458->unk_0000][gSpecialVar_Result]); SetCurrentMapLayout(gUnknown_847A284[gUnknown_203F458->unk_0000][gSpecialVar_Result]);
sub_815DDB0(); sub_815DDB0();
} }
} }
@@ -819,9 +819,9 @@ void sub_815E408(void)
u16 itemId = gUnknown_847A2B4[gUnknown_203F458->unk_0004.unk_0008->unk_003]; u16 itemId = gUnknown_847A2B4[gUnknown_203F458->unk_0004.unk_0008->unk_003];
if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_0) if (gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_0)
gSpecialVar_Result = 2; gSpecialVar_Result = 2;
else if (sub_809A084(itemId, 1) == 1) else if (AddBagItem(itemId, 1) == 1)
{ {
sub_8099E90(itemId, gStringVar2); CopyItemName(itemId, gStringVar2);
gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_0 = TRUE; gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_0 = TRUE;
gSpecialVar_Result = 0; gSpecialVar_Result = 0;
} }
src/vs_seeker.c
+2 -2
View File
@@ -65,7 +65,7 @@ struct VsSeekerStruct
extern u16 gSpecialVar_LastTalked; extern u16 gSpecialVar_LastTalked;
extern struct MapObject gMapObjects[MAP_OBJECTS_COUNT]; extern struct MapObject gMapObjects[MAP_OBJECTS_COUNT];
extern u8 gUnknown_3005074; extern u8 gSelectedEventObject;
// static declarations // static declarations
static EWRAM_DATA struct VsSeekerStruct *sVsSeeker = NULL; static EWRAM_DATA struct VsSeekerStruct *sVsSeeker = NULL;
@@ -1012,7 +1012,7 @@ void sub_810CB90(void)
sub_810CF54(&r4[r8]); // You are using this function incorrectly. Please consult the manual. sub_810CF54(&r4[r8]); // You are using this function incorrectly. Please consult the manual.
sub_805FE7C(r4_2, gUnknown_8453F67[r4_2->mapobj_unk_18]); sub_805FE7C(r4_2, gUnknown_8453F67[r4_2->mapobj_unk_18]);
gSaveBlock1Ptr->trainerRematches[r4[r8].localId] = 0; gSaveBlock1Ptr->trainerRematches[r4[r8].localId] = 0;
if (gUnknown_3005074 == sp0) if (gSelectedEventObject == sp0)
r4_2->animPattern = gUnknown_8453F67[r4_2->mapobj_unk_18]; r4_2->animPattern = gUnknown_8453F67[r4_2->mapobj_unk_18];
else else
r4_2->animPattern = 0x08; r4_2->animPattern = 0x08;
sym_bss.txt
+6 -6
View File
@@ -111,22 +111,22 @@ gUnknown_3000FA9: @ 3000FA9
gUnknown_3000FAC: @ 3000FAC gUnknown_3000FAC: @ 3000FAC
.space 0x2 .space 0x2
gUnknown_3000FAE: @ 3000FAE sPrimaryTilesetCBCounter: @ 3000FAE
.space 0x2 .space 0x2
gUnknown_3000FB0: @ 3000FB0 sPrimaryTilesetCBBufferSize: @ 3000FB0
.space 0x2 .space 0x2
gUnknown_3000FB2: @ 3000FB2 sSecondaryTilesetCBCounter: @ 3000FB2
.space 0x2 .space 0x2
gUnknown_3000FB4: @ 3000FB4 sSecondaryTilesetCBBufferSize: @ 3000FB4
.space 0x4 .space 0x4
gUnknown_3000FB8: @ 3000FB8 sPrimaryTilesetCB: @ 3000FB8
.space 0x4 .space 0x4
gUnknown_3000FBC: @ 3000FBC sSecondaryTilesetCB: @ 3000FBC
.space 0x4 .space 0x4
.include "src/sound.o" .include "src/sound.o"
sym_common.txt
+3 -3
View File
@@ -160,9 +160,9 @@ gUnknown_300502C: @ 300502C
gUnknown_3005030: @ 3005030 gUnknown_3005030: @ 3005030
.space 0x10 .space 0x10
gUnknown_3005040: @ 3005040 .include "fieldmap.o"
.space 0x10
.align 4
gUnknown_3005050: @ 3005050 gUnknown_3005050: @ 3005050
.space 0x18 .space 0x18
@@ -175,7 +175,7 @@ gUnknown_300506C: @ 300506C
gUnknown_3005070: @ 3005070 gUnknown_3005070: @ 3005070
.space 0x4 .space 0x4
gUnknown_3005074: @ 3005074 gSelectedEventObject: @ 3005074
.space 0x4 .space 0x4
gUnknown_3005078: @ 3005078 gUnknown_3005078: @ 3005078
sym_ewram.txt
+3 -33
View File
@@ -593,17 +593,7 @@ gUnknown_2031DEA: @ 2031DEA
gUnknown_2031DEC: @ 2031DEC gUnknown_2031DEC: @ 2031DEC
.space 0x10 .space 0x10
gUnknown_2031DFC: @ 2031DFC .include "src/fieldmap.o"
.space 0x5000
gMapHeader: @ 2036DFC
.space 0x1C
gUnknown_2036E18: @ 2036E18
.space 0xC
gUnknown_2036E24: @ 2036E24
.space 0x4
gUnknown_2036E28: @ 2036E28 gUnknown_2036E28: @ 2036E28
.space 0x4 .space 0x4
@@ -633,29 +623,9 @@ gUnknown_203709C: @ 203709C
.space 0x4 .space 0x4
.include "src/script.o" .include "src/script.o"
.include "src/scrcmd.o"
.align 2 .align 2
gUnknown_20370A8: @ 20370A8
.space 0x4
gUnknown_20370AC: @ 20370AC
.space 0x2
gUnknown_20370AE: @ 20370AE
.space 0x2
gUnknown_20370B0: @ 20370B0
.space 0x2
gUnknown_20370B2: @ 20370B2
.space 0x2
gUnknown_20370B4: @ 20370B4
.space 0x2
gUnknown_20370B6: @ 20370B6
.space 0x2
gSpecialVar_0x8000: @ 20370B8 gSpecialVar_0x8000: @ 20370B8
.space 0x2 .space 0x2