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

begin save.s decomp, thanks revo!

Browse Source
This commit is contained in:
DizzyEggg
2017-09-03 14:13:01 +02:00
parent 907e281de6
commit a3f602f17c
43 changed files with 1054 additions and 1865 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_4.s
+1 -1
View File
@@ -15702,7 +15702,7 @@ atk60_cmd60: @ 804E868
ldr r0, =gBattlescriptCurrInstr
ldr r0, [r0]
ldrb r0, [r0, 0x1]
bl sav12_xor_increment
bl IncrementGameStat
_0804E882:
ldr r1, =gBattlescriptCurrInstr
ldr r0, [r1]
asm/battle_records.s
+5 -5
View File
@@ -259,12 +259,12 @@ _0813C152:
movs r4, 0x19
_0813C154:
adds r0, r4, 0
bl sub_80847F8
bl GetGameStat
ldr r1, =0x0000270e
cmp r0, r1
bhi _0813C166
adds r0, r4, 0
bl sav12_xor_increment
bl IncrementGameStat
_0813C166:
pop {r4}
pop {r0}
@@ -465,7 +465,7 @@ sub_813C2F4: @ 813C2F4
sub sp, 0xC
ldr r4, =gStringVar1
movs r0, 0x17
bl sub_80847F8
bl GetGameStat
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
@@ -473,7 +473,7 @@ sub_813C2F4: @ 813C2F4
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar2
movs r0, 0x18
bl sub_80847F8
bl GetGameStat
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
@@ -481,7 +481,7 @@ sub_813C2F4: @ 813C2F4
bl ConvertIntToDecimalStringN
ldr r4, =gStringVar3
movs r0, 0x19
bl sub_80847F8
bl GetGameStat
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
asm/battle_setup.s
+24 -24
View File
@@ -136,9 +136,9 @@ _080B06F2:
movs r1, 0
bl task_add_01_battle_start
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
pop {r4}
@@ -166,9 +166,9 @@ sub_80B072C: @ 80B072C
movs r1, 0
bl task_add_01_battle_start
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
pop {r0}
@@ -217,9 +217,9 @@ sub_80B07B4: @ 80B07B4
movs r1, 0
bl task_add_01_battle_start
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
pop {r0}
@@ -236,9 +236,9 @@ task_add_01_battle_start_with_music_and_stats: @ 80B0804
movs r1, 0
bl task_add_01_battle_start
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x9
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80B1234
pop {r0}
bx r0
@@ -267,9 +267,9 @@ _080B0846:
bl task_add_01_battle_start
_080B0856:
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x9
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80B1234
pop {r0}
bx r0
@@ -315,9 +315,9 @@ sub_80B08A8: @ 80B08A8
movs r1, 0
bl task_add_01_battle_start
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
pop {r0}
@@ -342,9 +342,9 @@ sub_80B08EC: @ 80B08EC
movs r1, 0
bl task_add_01_battle_start
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
pop {r0}
@@ -444,9 +444,9 @@ _080B09F4:
bl task_add_01_battle_start
_080B09FE:
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
pop {r4}
@@ -482,9 +482,9 @@ _080B0A50:
bl task_add_01_battle_start
_080B0A5A:
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
pop {r0}
@@ -540,9 +540,9 @@ _080B0AD6:
ldr r1, =0x000001df
bl task_add_01_battle_start
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
pop {r0}
@@ -1392,9 +1392,9 @@ sub_80B11A8: @ 80B11A8
bl prev_quest_postbuffer_cursor_backup_reset
bl overworld_poison_timer_set
movs r0, 0x7
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x8
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80EECC8
bl sub_80B1218
_080B11F0:
@@ -1418,7 +1418,7 @@ sub_80B1204: @ 80B1204
sub_80B1218: @ 80B1218
push {lr}
movs r0, 0x8
bl sub_80847F8
bl GetGameStat
movs r1, 0x3C
bl __umodsi3
cmp r0, 0
@@ -1433,7 +1433,7 @@ _080B122E:
sub_80B1234: @ 80B1234
push {lr}
movs r0, 0x9
bl sub_80847F8
bl GetGameStat
movs r1, 0x14
bl __umodsi3
cmp r0, 0
asm/berry_blender.s
+2 -2
View File
@@ -5050,12 +5050,12 @@ _08082292:
cmp r0, 0
bne _080822A8
movs r0, 0x22
bl sav12_xor_increment
bl IncrementGameStat
b _08082458
.pool
_080822A8:
movs r0, 0x21
bl sav12_xor_increment
bl IncrementGameStat
b _08082458
_080822B0:
ldr r6, =gUnknown_020322A4
asm/clear_save_data_screen.s
+1 -1
View File
@@ -126,7 +126,7 @@ sub_817ADC0: @ 817ADC0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
bl calls_flash_erase_block
bl ClearSaveData
adds r0, r4, 0
bl DestroyTask
ldr r0, =sub_817AFD4
asm/contest_link_80F57C4.s
+4 -4
View File
@@ -543,7 +543,7 @@ _080F5D2A:
cmp r0, 0
bne _080F5D58
movs r0, 0x23
bl sav12_xor_increment
bl IncrementGameStat
ldr r1, =gSpecialVar_0x8005
movs r0, 0x8
strh r0, [r1]
@@ -580,7 +580,7 @@ _080F5D58:
bl VarSet
bl sub_8076D5C
movs r0, 0x1
bl save_game_when_memory_present
bl TrySavingData
bl sav2_gender2_inplace_and_xFE
adds r0, r5, 0
adds r1, r4, 0
@@ -662,7 +662,7 @@ _080F5E2E:
.pool
_080F5E78:
movs r0, 0x24
bl sav12_xor_increment
bl IncrementGameStat
ldr r1, =gUnknown_02039F20
ldr r0, =gUnknown_02039F25
ldrb r0, [r0]
@@ -671,7 +671,7 @@ _080F5E78:
cmp r0, 0
bne _080F5E92
movs r0, 0x25
bl sav12_xor_increment
bl IncrementGameStat
_080F5E92:
ldr r0, =gUnknown_02039F2E
ldrb r0, [r0]
asm/evolution_scene.s
+2 -2
View File
@@ -1661,7 +1661,7 @@ _0813E99E:
movs r1, 0x3
bl pokedex_flag_operation
movs r0, 0xE
bl sav12_xor_increment
bl IncrementGameStat
b _0813F1A4
.pool
_0813EA1C:
@@ -2845,7 +2845,7 @@ _0813F4F2:
movs r1, 0x3
bl pokedex_flag_operation
movs r0, 0xE
bl sav12_xor_increment
bl IncrementGameStat
b _0813FCC4
.pool
_0813F570:
asm/field_control_avatar.s
+2 -2
View File
@@ -228,7 +228,7 @@ _0809C070:
cmp r0, 0
beq _0809C096
movs r0, 0x5
bl sav12_xor_increment
bl IncrementGameStat
bl increment_var_x4026_on_birth_island_modulo_100
mov r0, sp
adds r1, r4, 0
@@ -1395,7 +1395,7 @@ _0809CA48:
cmp r0, 0
beq _0809CA64
movs r0, 0xD
bl sav12_xor_increment
bl IncrementGameStat
ldr r0, =gUnknown_08291FC0
bl script_env_1_execute_new_script
b _0809CB28
asm/field_player_avatar.s
+1 -1
View File
@@ -993,7 +993,7 @@ _0808B0E4:
cmp r0, 0
beq _0808B108
movs r0, 0x2B
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0x6
b _0808B152
_0808B108:
asm/hall_of_fame.s
+4 -4
View File
@@ -519,16 +519,16 @@ sub_81739C4: @ 81739C4
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r1, =gUnknown_03006214
ldr r1, =gGameContinueCallback
ldr r0, =sub_81736D8
str r0, [r1]
movs r0, 0x3
bl save_game_when_memory_present
bl TrySavingData
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
bne _08173A34
ldr r0, =gUnknown_030061FC
ldr r0, =gDamagedSaveSectors
ldr r0, [r0]
cmp r0, 0
beq _08173A34
@@ -1651,7 +1651,7 @@ _081743BC:
_081743C6:
strh r0, [r1, 0x8]
movs r0, 0xA
bl sub_80847F8
bl GetGameStat
ldr r2, =gTasks
adds r1, r5, r6
lsls r1, 3
asm/intro.s
+1 -1
View File
@@ -309,7 +309,7 @@ c2_copyright_1: @ 816CEAC
lsrs r0, 16
bl InitSaveBlockPointersWithRandomOffset
bl sub_808447C
bl sub_8152680
bl ResetSaveCounters
movs r0, 0
bl sub_81534D0
ldr r0, =gUnknown_03006210
asm/item_use.s
+1 -1
View File
@@ -536,7 +536,7 @@ ItemUseOutOfBattle_Itemfinder: @ 80FD490
lsls r4, 24
lsrs r4, 24
movs r0, 0x27
bl sav12_xor_increment
bl IncrementGameStat
ldr r1, =gUnknown_0203A0F4
ldr r0, =ItemUseOnFieldCB_Itemfinder
str r0, [r1]
asm/link.s
+7 -7
View File
@@ -622,7 +622,7 @@ _08009956:
cmp r0, 0
beq _08009968
movs r0, 0x1
bl save_game_when_memory_present
bl TrySavingData
_08009968:
ldrh r1, [r4, 0x2E]
movs r0, 0x4
@@ -20827,7 +20827,7 @@ _08013FFC:
movs r2, 0x64
bl memcpy
movs r0, 0x32
bl sav12_xor_increment
bl IncrementGameStat
bl sub_800A5B4
b _0801405A
.pool
@@ -29860,7 +29860,7 @@ _08018EC0:
.pool
_08018ECC:
movs r0, 0
bl save_game_when_memory_present
bl TrySavingData
b _08018EEC
_08018ED4:
ldr r0, =gUnknown_085EF5E0
@@ -33410,7 +33410,7 @@ _0801AB1E:
cmp r4, r6
ble _0801AB1E
movs r0, 0x32
bl sav12_xor_increment
bl IncrementGameStat
bl calc_player_party_count
ldr r0, =gUnknown_02038BCA
movs r2, 0xC0
@@ -38746,7 +38746,7 @@ _0801D6D8:
b _0801D7FE
_0801D6EA:
ldrb r0, [r2, 0x4]
bl sub_80847F8
bl GetGameStat
adds r2, r0, 0
adds r0, r4, 0
movs r1, 0x12
@@ -41252,7 +41252,7 @@ _0801EB04:
bne _0801EBC2
bl sub_8076D5C
movs r0, 0
bl save_game_when_memory_present
bl TrySavingData
ldr r0, =gUnknown_02022C84
ldr r1, [r0]
movs r0, 0x8
@@ -52525,7 +52525,7 @@ sub_8024578: @ 8024578
adds r4, r0, 0
movs r5, 0
movs r0, 0x33
bl sav12_xor_increment
bl IncrementGameStat
strb r5, [r4, 0xD]
movs r1, 0
strh r5, [r4, 0x10]
asm/load_save.s
+6 -6
View File
@@ -398,23 +398,23 @@ _08076E7A:
.pool
thumb_func_end save_deserialize_npcs
thumb_func_start save_serialize_game
save_serialize_game: @ 8076EAC
thumb_func_start SaveSerializedGame
SaveSerializedGame: @ 8076EAC
push {lr}
bl copy_player_party_to_sav1
bl save_serialize_npcs
pop {r0}
bx r0
thumb_func_end save_serialize_game
thumb_func_end SaveSerializedGame
thumb_func_start save_deserialize_game
save_deserialize_game: @ 8076EBC
thumb_func_start LoadSerializedGame
LoadSerializedGame: @ 8076EBC
push {lr}
bl copy_player_party_from_sav1
bl save_deserialize_npcs
pop {r0}
bx r0
thumb_func_end save_deserialize_game
thumb_func_end LoadSerializedGame
thumb_func_start copy_bags_and_unk_data_from_save_blocks
copy_bags_and_unk_data_from_save_blocks: @ 8076ECC
asm/mauville_old_man.s
+1 -1
View File
@@ -1775,7 +1775,7 @@ sub_8120E74: @ 8120E74
bne _08120E80
movs r0, 0
_08120E80:
bl sub_80847F8
bl GetGameStat
pop {r1}
bx r1
thumb_func_end sub_8120E74
asm/mystery_event_menu.s
+1 -1
View File
@@ -484,7 +484,7 @@ _08178D74:
cmp r0, 0
bne _08178E34
movs r0, 0
bl save_game_when_memory_present
bl TrySavingData
b _08178E34
.pool
_08178DBC:
asm/reset_rtc_screen.s
+1 -1
View File
@@ -1269,7 +1269,7 @@ _0809F340:
.pool
_0809F398:
movs r0, 0
bl save_game_when_memory_present
bl TrySavingData
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/rom4.s
+8 -8
View File
@@ -155,16 +155,16 @@ _080847AC:
bx r0
thumb_func_end sub_80847A8
thumb_func_start sav12_xor_increment
@ void sav12_xor_increment(u8 a1)
sav12_xor_increment: @ 80847C4
thumb_func_start IncrementGameStat
@ void IncrementGameStat(u8 a1)
IncrementGameStat: @ 80847C4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x33
bhi _080847EC
adds r0, r4, 0
bl sub_80847F8
bl GetGameStat
adds r1, r0, 0
ldr r0, =0x00fffffe
cmp r1, r0
@@ -182,10 +182,10 @@ _080847EC:
pop {r0}
bx r0
.pool
thumb_func_end sav12_xor_increment
thumb_func_end IncrementGameStat
thumb_func_start sub_80847F8
sub_80847F8: @ 80847F8
thumb_func_start GetGameStat
GetGameStat: @ 80847F8
push {lr}
lsls r0, 24
lsrs r1, r0, 24
@@ -210,7 +210,7 @@ _08084828:
_0808482A:
pop {r1}
bx r1
thumb_func_end sub_80847F8
thumb_func_end GetGameStat
thumb_func_start sav12_xor_set
sav12_xor_set: @ 8084830
asm/rom6.s
+5 -5
View File
@@ -330,7 +330,7 @@ oei_rocksmash: @ 81356E4
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
movs r0, 0x13
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0
pop {r1}
bx r1
@@ -4055,7 +4055,7 @@ _08137760:
bl FlagSet
_0813776C:
movs r0, 0x1
bl sub_80847F8
bl GetGameStat
cmp r0, 0
bne _0813778E
ldr r0, =gSaveBlock2Ptr
@@ -4132,7 +4132,7 @@ _0813780A:
cmp r7, 0x1
bne _0813785A
movs r0, 0x2A
bl sav12_xor_increment
bl IncrementGameStat
ldr r0, =0x0000089b
bl FlagSet
mov r3, sp
@@ -7336,7 +7336,7 @@ sub_8139200: @ 8139200
sub_8139228: @ 8139228
push {lr}
movs r0, 0x20
bl sub_80847F8
bl GetGameStat
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -7501,7 +7501,7 @@ sub_8139370: @ 8139370
push {r4,lr}
sub sp, 0x4
movs r0, 0x2A
bl sav12_xor_increment
bl IncrementGameStat
ldr r0, =0x0000089b
bl FlagSet
movs r1, 0x1
asm/rom_80C6FA0.s
+2 -2
View File
@@ -24469,7 +24469,7 @@ sub_80D3A6C: @ 80D3A6C
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
movs r0, 0x12
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0
pop {r1}
bx r1
@@ -24507,7 +24507,7 @@ sub_80D3ABC: @ 80D3ABC
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
movs r0, 0x12
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0
pop {r1}
bx r1
asm/rom_8158B30.s
+1 -1
View File
@@ -23687,7 +23687,7 @@ _081650DC:
cmp r0, 0
beq _08165132
movs r0, 0x2A
bl sav12_xor_increment
bl IncrementGameStat
mov r0, r8
cmp r0, 0x1
ble _08165110
asm/rom_81700F8.s
+1 -1
View File
@@ -31,7 +31,7 @@ sub_81700F8: @ 81700F8
lsrs r0, 16
bl InitSaveBlockPointersWithRandomOffset
bl sub_808447C
bl sub_8152680
bl ResetSaveCounters
movs r0, 0
bl sub_81534D0
ldr r0, =gUnknown_03006210
asm/rom_8184DA4.s
+4 -4
View File
@@ -33562,7 +33562,7 @@ sub_8196D74: @ 8196D74
bl __divsi3
mov r8, r0
movs r0, 0x9
bl sub_80847F8
bl GetGameStat
eors r4, r5
eors r5, r0
adds r4, r5
@@ -60482,7 +60482,7 @@ _081A4C4E:
bl copy_player_party_from_sav1
bl sub_8076D5C
movs r0, 0x1
bl save_game_when_memory_present
bl TrySavingData
bl sav2_gender2_inplace_and_xFE
strb r5, [r4]
adds r4, r7, 0
@@ -65191,7 +65191,7 @@ sub_81A7418: @ 81A7418
strb r0, [r1]
bl save_serialize_map
movs r0, 0x1
bl save_game_when_memory_present
bl TrySavingData
pop {r4}
pop {r0}
bx r0
@@ -68828,7 +68828,7 @@ sub_81A9134: @ 81A9134
strb r0, [r1]
bl save_serialize_map
movs r0, 0x1
bl save_game_when_memory_present
bl TrySavingData
pop {r4}
pop {r0}
bx r0
asm/rom_81BE66C.s
+1 -1
View File
@@ -25858,7 +25858,7 @@ sub_81CBE50: @ 81CBE50
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0x9
bl sub_80847F8
bl GetGameStat
adds r1, r0, 0
ldr r0, =0x0001869f
cmp r1, r0
asm/roulette.s
+1 -1
View File
@@ -2559,7 +2559,7 @@ sub_8141800: @ 8141800
cmp r0, 0
beq _08141888
movs r0, 0x1D
bl sub_80847F8
bl GetGameStat
ldrh r1, [r4, 0x1E]
adds r1, 0x1
strh r1, [r4, 0x1E]
asm/safari_zone.s
+1 -1
View File
@@ -41,7 +41,7 @@ ResetSafariZoneFlag: @ 80FC0C4
sub_80FC0D4: @ 80FC0D4
push {lr}
movs r0, 0x11
bl sav12_xor_increment
bl IncrementGameStat
bl SetSafariZoneFlag
bl sub_80FC244
ldr r1, =gUnknown_0203A04C
asm/save.s
+7 -1741
View File
File diff suppressed because it is too large Load Diff
asm/save_failed_screen.s
+7 -7
View File
@@ -44,8 +44,8 @@ sub_8178F44: @ 8178F44
.pool
thumb_func_end sub_8178F44
thumb_func_start fullscreen_save_activate
fullscreen_save_activate: @ 8178F90
thumb_func_start DoSaveFailedScreen
DoSaveFailedScreen: @ 8178F90
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -66,7 +66,7 @@ fullscreen_save_activate: @ 8178F90
pop {r0}
bx r0
.pool
thumb_func_end fullscreen_save_activate
thumb_func_end DoSaveFailedScreen
thumb_func_start sub_8178FC8
sub_8178FC8: @ 8178FC8
@@ -325,7 +325,7 @@ sub_8179288: @ 8179288
ldr r0, =gUnknown_0203BCFE
movs r1, 0x1
strh r1, [r0]
ldr r1, =gUnknown_030061FC
ldr r1, =gDamagedSaveSectors
ldr r0, [r1]
cmp r0, 0
beq _081792EC
@@ -346,7 +346,7 @@ _0817929C:
bl sub_8178F44
ldr r0, =gUnknown_0203BCFC
ldrb r0, [r0]
bl calls_flash_erase_block_3
bl HandleSavingData
ldr r0, [r6]
cmp r0, 0
beq _081792DC
@@ -381,7 +381,7 @@ _0817931C:
ldrb r0, [r0]
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r0, =gUnknown_03006214
ldr r0, =gGameContinueCallback
ldr r0, [r0]
cmp r0, 0
bne _08179370
@@ -488,7 +488,7 @@ sub_8179428: @ 8179428
lsrs r4, r0, 24
cmp r4, 0
bne _0817944E
ldr r5, =gUnknown_03006214
ldr r5, =gGameContinueCallback
ldr r0, [r5]
cmp r0, 0
bne _08179448
asm/scrcmd.s
+1 -1
View File
@@ -1297,7 +1297,7 @@ sC3_unknown: @ 8099C58
adds r1, 0x1
str r1, [r0, 0x8]
adds r0, r2, 0
bl sav12_xor_increment
bl IncrementGameStat
movs r0, 0
pop {r1}
bx r1
asm/secret_base.s
+2 -2
View File
@@ -1927,7 +1927,7 @@ sub_80E9A90: @ 80E9A90
sub_80E9AC0: @ 80E9AC0
push {lr}
movs r0, 0x14
bl sav12_xor_increment
bl IncrementGameStat
bl sub_80E9A90
pop {r0}
bx r0
@@ -2018,7 +2018,7 @@ sub_80E9B70: @ 80E9B70
push {r4-r6,lr}
bl sub_80E9AD0
movs r0, 0x14
bl sav12_xor_increment
bl IncrementGameStat
ldr r5, =gSaveBlock1Ptr
ldr r0, [r5]
ldr r4, =0x00001aaa
asm/shop.s
+1 -1
View File
@@ -2453,7 +2453,7 @@ BuyMenuSubtractMoney: @ 80E0F88
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0x26
bl sav12_xor_increment
bl IncrementGameStat
ldr r5, =gSaveBlock1Ptr
ldr r0, [r5]
movs r4, 0x92
asm/slot_machine.s
+1 -1
View File
@@ -1387,7 +1387,7 @@ sub_812B01C: @ 812B01C
cmp r0, 0
beq _0812B044
movs r0, 0x1C
bl sav12_xor_increment
bl IncrementGameStat
_0812B044:
ldr r2, [r4]
ldrh r1, [r2, 0x8]
asm/start_menu.s
+4 -4
View File
@@ -864,7 +864,7 @@ StartMenu_Pokedex: @ 809FBB4
.pool
_0809FBCC:
movs r0, 0x29
bl sav12_xor_increment
bl IncrementGameStat
bl play_some_sound
bl RemoveExtraStartMenuWindows
bl overworld_free_bg_tilemaps
@@ -1656,14 +1656,14 @@ sub_80A0234: @ 80A0234
sub_80A024C: @ 80A024C
push {r4,lr}
movs r0, 0
bl sav12_xor_increment
bl IncrementGameStat
bl sub_81A9E90
ldr r4, =gUnknown_020322D4
ldrb r0, [r4]
cmp r0, 0x1
bne _080A0274
movs r0, 0x4
bl save_game_when_memory_present
bl TrySavingData
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0
@@ -1672,7 +1672,7 @@ sub_80A024C: @ 80A024C
.pool
_080A0274:
movs r0, 0
bl save_game_when_memory_present
bl TrySavingData
lsls r0, 24
lsrs r1, r0, 24
_080A027E:
asm/trade.s
+2 -2
View File
@@ -13829,7 +13829,7 @@ _0807EDC0:
cmp r0, 0
bne _0807EDCE
movs r0, 0x15
bl sav12_xor_increment
bl IncrementGameStat
_0807EDCE:
ldr r0, =gLinkVSyncDisabled
ldrb r0, [r0]
@@ -14676,7 +14676,7 @@ _0807F50A:
movs r2, 0
bl sub_807F1A8
movs r0, 0x15
bl sav12_xor_increment
bl IncrementGameStat
bl sub_8153380
ldr r0, =gUnknown_020322A0
ldr r0, [r0]
asm/trainer_card.s
+4 -4
View File
@@ -803,7 +803,7 @@ sav12_xor_get_clamped_above: @ 80C2DE4
adds r4, r1, 0
lsls r0, 24
lsrs r0, 24
bl sub_80847F8
bl GetGameStat
cmp r0, r4
bls _080C2DF6
adds r0, r4, 0
@@ -852,7 +852,7 @@ _080C2E38:
sub_80C2E40: @ 80C2E40
push {r4,lr}
movs r0, 0xA
bl sub_80847F8
bl GetGameStat
negs r1, r0
orrs r1, r0
lsrs r4, r1, 31
@@ -943,10 +943,10 @@ sub_80C2EC4: @ 80C2EC4
ldrb r0, [r1, 0x10]
strh r0, [r5, 0x12]
movs r0, 0x1
bl sub_80847F8
bl GetGameStat
adds r4, r0, 0
movs r0, 0xA
bl sub_80847F8
bl GetGameStat
cmp r0, 0
bne _080C2EF6
movs r4, 0
asm/tv.s
+3 -3
View File
@@ -748,7 +748,7 @@ GabbyAndTyAfterInterview: @ 80EC448
adds r0, r2
strb r1, [r0]
movs r0, 0x6
bl sav12_xor_increment
bl IncrementGameStat
pop {r4-r6}
pop {r0}
bx r0
@@ -1208,7 +1208,7 @@ sub_80EC8A4: @ 80EC8A4
movs r1, 0x18
bl sub_80EF910
movs r0, 0x5
bl sub_80847F8
bl GetGameStat
strh r0, [r4, 0x6]
movs r0, 0x19
strb r0, [r4]
@@ -3238,7 +3238,7 @@ sub_80EDA80: @ 80EDA80
ldrh r0, [r5, 0x2]
strh r0, [r4, 0x2]
movs r0, 0x5
bl sub_80847F8
bl GetGameStat
ldrh r1, [r5, 0x6]
subs r0, r1
strh r0, [r4, 0x6]
asm/weather.s
+1 -1
View File
@@ -7810,7 +7810,7 @@ sub_80AEFDC: @ 80AEFDC
bne _080AEFF6
_080AEFF0:
movs r0, 0x28
bl sav12_xor_increment
bl IncrementGameStat
_080AEFF6:
pop {r0}
bx r0
asm/wild_encounter.s
+1 -1
View File
@@ -1882,7 +1882,7 @@ _080B5764:
lsrs r4, r0, 16
_080B5784:
movs r0, 0xC
bl sav12_xor_increment
bl IncrementGameStat
adds r0, r4, 0
bl sub_80EDA3C
bl sub_80B0698