Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021E6880.inc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
.public GameStats_GetCapped
.public GameStats_AddScore
.public SaveData_GetPhoneCallPersistentState
.public sub_0202F08C
.public PhoneCallPersistentState_CheckCallTriggerFlag
.public Save_SafariZone_Get
.public sub_0202F620
.public Save_ApricornBox_Get
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_01_021F3610.inc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.public sub_0201F990
.public sub_02020D2C
.public GF_AssertFail
.public sub_02097268
.public GetSafariObjectConfig
.public NNS_G3dGlbFlushP
.public NNS_G3dGlbSetBaseTrans
.public NNS_G3dGlbSetBaseScale
Expand Down
6 changes: 3 additions & 3 deletions asm/include/overlay_02.inc
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
.public SavePokegear_FindEmptyPhonebookSlot
.public SavePokegear_IsNumberRegistered
.public SavePokegear_AllocAndCopyPhonebook
.public sub_0202F08C
.public PhoneCallPersistentState_CheckCallTriggerFlag
.public Save_SafariZone_Get
.public sub_0202F620
.public SafariZone_GetAreaSet
Expand Down Expand Up @@ -343,8 +343,8 @@
.public FreePhoneBook
.public GetPhoneMessageGmm
.public sub_02095FF8
.public sub_02097268
.public sub_020974C4
.public GetSafariObjectConfig
.public SafariZoneAreaSet_LoadAreaEncounters
.public sub_02097F6C
.public NNS_G2dGetUnpackedCharacterData
.public NNS_G2dGetUnpackedPaletteData
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_03.inc
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
.public sub_020881C0
.public sub_020910B8
.public sub_02092B04
.public sub_02097268
.public GetSafariObjectConfig
.public sub_02097720
.public MI_CpuFill8
.public abs
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_108.inc
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
.public Save_VarsFlags_Get
.public ChangeFlag99D
.public BgConfig_LoadAssetFromOpenNarc
.public sub_02097268
.public GetSafariObjectConfig
.public NNS_GfdGetLnkTexVramManagerWorkSize
.public NNS_GfdGetLnkPlttVramManagerWorkSize
.public NNS_G3dAnmObjInit
Expand Down
16 changes: 8 additions & 8 deletions asm/include/unk_02097268.inc
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
.public Heap_Free
.public GF_AssertFail
.public SaveData_GetPhoneCallPersistentState
.public sub_0202F01C
.public sub_0202F050
.public PhoneCallPersistentState_SetCallTriggerFlag
.public PhoneCallPersistentState_ClearCallTriggerFlag
.public PhoneCallPersistentState_SafariZoneArrangement_Set
.public Save_SafariZone_Get
.public SafariZone_GetAreaSet
.public sub_0202F6A0
.public sub_0202F6AC
.public sub_0202F6B8
.public SafariZone_SetLevel
.public SafariZone_GetLevel
.public SafariZone_AddToAllAreaLevels
.public SafariZone_GetObjectUnlockLevel
.public Save_VarsFlags_Get
.public Save_VarsFlags_CheckSafariSysFlag
.public sub_02097268
.public sub_0209730C
.public sub_020974C4
.public GetSafariObjectConfig
.public SaveData_SafariZone_CheckAreasWithUpdatedEncounters
.public SafariZoneAreaSet_LoadAreaEncounters
.public MI_CpuFill8
.public _s32_div_f
2 changes: 1 addition & 1 deletion asm/macros/script.inc
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@
.byte \arg1
.endm

.macro ScrCmd_149 arg0
.macro UnsetPhoneCallTrigger arg0
.short 149
.byte \arg0
.endm
Expand Down
11 changes: 6 additions & 5 deletions asm/overlay_01_021E6880.s
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "constants/flags.h"
#include "constants/mmodel.h"
#include "constants/items.h"
#include "constants/phone_constants.h"
#include "msgdata/msg/msg_0096_D31R0201.h"
#include "msgdata/msg/msg_0066_D23R0102.h"
.include "asm/macros.inc"
Expand Down Expand Up @@ -2193,13 +2194,13 @@ ov01_021E7A08: ; 0x021E7A08
add r5, r0, #0
ldr r0, [r4, #0xc]
bl Save_VarsFlags_Get
ldr r1, _021E7A5C ; =FLAG_UNK_984
ldr r1, _021E7A5C ; =FLAG_SYS_GOT_BIKE_SHOP_CALL
bl Save_VarsFlags_CheckFlagInArray
cmp r0, #0
bne _021E7A56
add r0, r5, #0
mov r1, #2
bl sub_0202F08C
bl PhoneCallPersistentState_CheckCallTriggerFlag
cmp r0, #0
bne _021E7A56
ldr r0, [r4, #0xc]
Expand All @@ -2212,16 +2213,16 @@ ov01_021E7A08: ; 0x021E7A08
blo _021E7A56
add r0, r4, #0
bl FieldSystem_GetGearPhoneRingManager
mov r1, #2
mov r2, #1
mov r1, #CALL_TRIGGER_BIKE_SHOP_STEPS
mov r2, #1 // TRUE
bl sub_02092E14
mov r0, #0
pop {r3, r4, r5, pc}
_021E7A56:
mov r0, #0
pop {r3, r4, r5, pc}
nop
_021E7A5C: .word FLAG_UNK_984
_021E7A5C: .word FLAG_SYS_GOT_BIKE_SHOP_CALL
thumb_func_end ov01_021E7A08

thumb_func_start BugContestTimeoutCheck
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_01_021F3610.s
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ _021F38AC:
ldrb r1, [r4, #2]
ldr r2, [sp, #0x4c]
add r0, sp, #0x14
bl sub_02097268
bl GetSafariObjectConfig
add r1, sp, #0x14
ldrb r2, [r1]
ldr r0, [sp, #8]
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_02_02248728.s
Original file line number Diff line number Diff line change
Expand Up @@ -12958,7 +12958,7 @@ _0224E7D4:
ldrb r1, [r5]
ldr r2, [sp, #4]
add r0, sp, #0xc
bl sub_02097268
bl GetSafariObjectConfig
ldrb r1, [r5, #1]
cmp r7, r1
blt _0224E810
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_03.s
Original file line number Diff line number Diff line change
Expand Up @@ -9676,7 +9676,7 @@ ScrCmd_720: ; 0x02258A18
ldrb r1, [r4]
add r0, sp, #0x1c
lsr r2, r2, #0x18
bl sub_02097268
bl GetSafariObjectConfig
ldrb r0, [r4, #3]
mov ip, r0
add r0, sp, #0x1c
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_108.s
Original file line number Diff line number Diff line change
Expand Up @@ -4613,7 +4613,7 @@ _021E7DD0:
ldrb r1, [r6, #2]
add r0, sp, #0x24
mov r2, #2
bl sub_02097268
bl GetSafariObjectConfig
ldrb r1, [r7, #2]
cmp r1, #0
bne _021E7DE8
Expand Down
2 changes: 1 addition & 1 deletion asm/overlay_108_021E8850.s
Original file line number Diff line number Diff line change
Expand Up @@ -3818,7 +3818,7 @@ _021EA6B4:
ldr r2, [sp, #4]
add r0, r5, #2
add r1, r6, #0
bl sub_02097268
bl GetSafariObjectConfig
ldrb r1, [r5, #3]
lsl r0, r1, #0x1c
lsl r1, r1, #0x19
Expand Down
Loading
Loading