mirror of
https://github.com/pret/pokeruby.git
synced 2024-11-27 23:10:45 +00:00
fix save block symbols
This commit is contained in:
YamaArashi
parent
653724c79b
commit
0a2857a7dc
14
asm/rom3.s
14
asm/rom3.s
@ -6424,7 +6424,7 @@ _0800EACE:
|
||||
_0800EAF4: .4byte 0x02000004
|
||||
_0800EAF8: .4byte gSaveBlock1
|
||||
_0800EAFC: .4byte 0x00003160
|
||||
_0800EB00: .4byte gUnknown_02028DAA
|
||||
_0800EB00: .4byte gSaveBlock1 + 0x3676
|
||||
_0800EB04: .4byte 0x00003688
|
||||
thumb_func_end sub_800EAAC
|
||||
|
||||
@ -6500,7 +6500,7 @@ _0800EB88: .4byte gEnigmaBerries
|
||||
_0800EB8C: .4byte gSaveBlock1
|
||||
_0800EB90: .4byte 0x00003160
|
||||
_0800EB94: .4byte gUnknown_02024DF8
|
||||
_0800EB98: .4byte gUnknown_02028DAA
|
||||
_0800EB98: .4byte gSaveBlock1 + 0x3676
|
||||
_0800EB9C: .4byte 0x00003688
|
||||
_0800EBA0: .4byte 0x00003689
|
||||
_0800EBA4:
|
||||
@ -40414,7 +40414,7 @@ _08020138:
|
||||
ldrb r4, [r3]
|
||||
b _08020164
|
||||
.align 2, 0
|
||||
_08020150: .4byte gUnknown_02028DBC
|
||||
_08020150: .4byte gSaveBlock1 + 0x3688
|
||||
_08020154: .4byte gPlayerParty
|
||||
_08020158: .4byte gBitTable
|
||||
_0802015C:
|
||||
@ -48231,7 +48231,7 @@ sub_8024014: @ 8024014
|
||||
_08024048: .4byte word_202FF5E
|
||||
_0802404C: .4byte 0x02017000
|
||||
_08024050: .4byte 0xfffff056
|
||||
_08024054: .4byte gUnknown_02025BC4
|
||||
_08024054: .4byte gSaveBlock1 + 0x490
|
||||
_08024058:
|
||||
ldr r2, _08024074
|
||||
ldrh r1, [r0]
|
||||
@ -48345,7 +48345,7 @@ _080240FE:
|
||||
_08024120: .4byte gTrainerMoney
|
||||
_08024124: .4byte 0x02000000
|
||||
_08024128: .4byte gUnknown_020239F8
|
||||
_0802412C: .4byte gUnknown_02025BC4
|
||||
_0802412C: .4byte gSaveBlock1 + 0x490
|
||||
_08024130: .4byte gTrainers
|
||||
_08024134: .4byte word_202FF5E
|
||||
_08024138: .4byte 0x00016056
|
||||
@ -53549,7 +53549,7 @@ atk91_givemoney: @ 8026A30
|
||||
.align 2, 0
|
||||
_08026A8C: .4byte gUnknown_020239F8
|
||||
_08026A90: .4byte gUnknown_02024D1A
|
||||
_08026A94: .4byte gUnknown_02025BC4
|
||||
_08026A94: .4byte gSaveBlock1 + 0x490
|
||||
_08026A98: .4byte 0x02000000
|
||||
_08026A9C: .4byte 0x00016056
|
||||
_08026AA0: .4byte gUnknown_030041C0
|
||||
@ -86072,7 +86072,7 @@ _08037166:
|
||||
_08037170: .4byte gEnemyParty
|
||||
_08037174: .4byte 0x02016a00
|
||||
_08037178: .4byte gItemEffectTable
|
||||
_0803717C: .4byte gUnknown_02028DAA
|
||||
_0803717C: .4byte gSaveBlock1 + 0x3676
|
||||
_08037180: .4byte 0xfffe9600
|
||||
_08037184: .4byte gUnknown_02024A60
|
||||
_08037188: .4byte 0x000160d8
|
||||
|
||||
44
asm/rom4.s
44
asm/rom4.s
@ -53,7 +53,7 @@ set_player_trainer_id: @ 8052D2C
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08052D50: .4byte gUnknown_02024EAE
|
||||
_08052D50: .4byte gSaveBlock2 + 0xA
|
||||
thumb_func_end set_player_trainer_id
|
||||
|
||||
thumb_func_start sub_8052D54
|
||||
@ -98,7 +98,7 @@ sub_8052D78: @ 8052D78
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08052DA0: .4byte gUnknown_03005CE8
|
||||
_08052DA4: .4byte gUnknown_02024ECC
|
||||
_08052DA4: .4byte gSaveBlock2 + 0x28
|
||||
thumb_func_end sub_8052D78
|
||||
|
||||
thumb_func_start sub_8052DA8
|
||||
@ -146,7 +146,7 @@ sub_8052DE4: @ 8052DE4
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08052DFC: .4byte gUnknown_02024F4C
|
||||
_08052DFC: .4byte gSaveBlock2 + 0xA8
|
||||
_08052E00: .4byte 0x050001fa
|
||||
thumb_func_end sub_8052DE4
|
||||
|
||||
@ -551,7 +551,7 @@ sub_8053154: @ 8053154
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805318C: .4byte gUnknown_02026354
|
||||
_0805318C: .4byte gSaveBlock1 + 0xC20
|
||||
_08053190: .4byte 0x05000180
|
||||
_08053194: .4byte gMapHeader
|
||||
thumb_func_end sub_8053154
|
||||
@ -576,7 +576,7 @@ _080531A4:
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080531B8: .4byte gMapHeader
|
||||
_080531BC: .4byte gUnknown_02026354
|
||||
_080531BC: .4byte gSaveBlock1 + 0xC20
|
||||
thumb_func_end sub_8053198
|
||||
|
||||
thumb_func_start update_saveblock1_field_object_coords
|
||||
@ -598,7 +598,7 @@ _080531D2:
|
||||
strh r2, [r3, 0x6]
|
||||
b _080531EC
|
||||
.align 2, 0
|
||||
_080531E0: .4byte gUnknown_02026354
|
||||
_080531E0: .4byte gSaveBlock1 + 0xC20
|
||||
_080531E4:
|
||||
adds r3, 0x18
|
||||
adds r1, 0x1
|
||||
@ -626,7 +626,7 @@ _08053202:
|
||||
strb r1, [r2, 0x9]
|
||||
b _08053218
|
||||
.align 2, 0
|
||||
_0805320C: .4byte gUnknown_02026354
|
||||
_0805320C: .4byte gSaveBlock1 + 0xC20
|
||||
_08053210:
|
||||
adds r2, 0x18
|
||||
adds r3, 0x1
|
||||
@ -1022,7 +1022,7 @@ saved_warp2_set: @ 80534B0
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080534E8: .4byte gUnknown_02025748
|
||||
_080534E8: .4byte gSaveBlock1 + 0x14
|
||||
thumb_func_end saved_warp2_set
|
||||
|
||||
thumb_func_start saved_warp2_set_2
|
||||
@ -1050,7 +1050,7 @@ saved_warp2_set_2: @ 80534EC
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805351C: .4byte gUnknown_02025748
|
||||
_0805351C: .4byte gSaveBlock1 + 0x14
|
||||
thumb_func_end saved_warp2_set_2
|
||||
|
||||
thumb_func_start copy_saved_warp2_bank_and_enter_x_to_warp1
|
||||
@ -1141,7 +1141,7 @@ _080535B8:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080535C0: .4byte gUnknown_02025750
|
||||
_080535C0: .4byte gSaveBlock1 + 0x1C
|
||||
thumb_func_end sub_8053588
|
||||
|
||||
thumb_func_start sub_80535C4
|
||||
@ -1232,7 +1232,7 @@ sub_805363C: @ 805363C
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08053674: .4byte gUnknown_02025758
|
||||
_08053674: .4byte gSaveBlock1 + 0x24
|
||||
thumb_func_end sub_805363C
|
||||
|
||||
thumb_func_start sub_8053678
|
||||
@ -1417,7 +1417,7 @@ unref_sub_8053790: @ 8053790
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080537C8: .4byte gUnknown_02025740
|
||||
_080537C8: .4byte gSaveBlock1 + 0xC
|
||||
thumb_func_end unref_sub_8053790
|
||||
|
||||
thumb_func_start sub_80537CC
|
||||
@ -1450,7 +1450,7 @@ _080537FC:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08053804: .4byte gUnknown_02025740
|
||||
_08053804: .4byte gSaveBlock1 + 0xC
|
||||
thumb_func_end sub_80537CC
|
||||
|
||||
thumb_func_start gpu_sync_bg_hide
|
||||
@ -2268,7 +2268,7 @@ _08053E0C:
|
||||
adds r0, r1, 0
|
||||
b _08053E40
|
||||
.align 2, 0
|
||||
_08053E24: .4byte gUnknown_02025738
|
||||
_08053E24: .4byte gSaveBlock1 + 0x4
|
||||
_08053E28: .4byte 0x00007fff
|
||||
_08053E2C:
|
||||
subs r0, r4, 0x4
|
||||
@ -2808,7 +2808,7 @@ sav1_map_get_light_level: @ 80541D8
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_080541E8: .4byte gUnknown_02025738
|
||||
_080541E8: .4byte gSaveBlock1 + 0x4
|
||||
thumb_func_end sav1_map_get_light_level
|
||||
|
||||
thumb_func_start get_map_light_from_warp0
|
||||
@ -7578,7 +7578,7 @@ _080565FE:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0805660C: .4byte gUnknown_02025768
|
||||
_0805660C: .4byte gSaveBlock1 + 0x34
|
||||
_08056610: .4byte gUnknown_03004870
|
||||
_08056614: .4byte gUnknown_02029828
|
||||
thumb_func_end save_serialize_map
|
||||
@ -7605,7 +7605,7 @@ _08056622:
|
||||
movs r0, 0
|
||||
b _08056646
|
||||
.align 2, 0
|
||||
_0805663C: .4byte gUnknown_02025768
|
||||
_0805663C: .4byte gSaveBlock1 + 0x34
|
||||
_08056640: .4byte 0x000001ff
|
||||
_08056644:
|
||||
movs r0, 0x1
|
||||
@ -7630,7 +7630,7 @@ sav2_mapdata_clear: @ 805664C
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08056668: .4byte gUnknown_02025768
|
||||
_08056668: .4byte gSaveBlock1 + 0x34
|
||||
_0805666C: .4byte 0x01000100
|
||||
thumb_func_end sav2_mapdata_clear
|
||||
|
||||
@ -7697,7 +7697,7 @@ _080566D6:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080566E4: .4byte gUnknown_02025768
|
||||
_080566E4: .4byte gSaveBlock1 + 0x34
|
||||
_080566E8: .4byte gUnknown_03004870
|
||||
_080566EC: .4byte gUnknown_02029828
|
||||
thumb_func_end sub_8056670
|
||||
@ -7739,7 +7739,7 @@ sub_80566F0: @ 80566F0
|
||||
beq _0805674E
|
||||
b _08056766
|
||||
.align 2, 0
|
||||
_08056734: .4byte gUnknown_02025768
|
||||
_08056734: .4byte gSaveBlock1 + 0x34
|
||||
_08056738: .4byte gUnknown_03004870
|
||||
_0805673C:
|
||||
cmp r2, 0x3
|
||||
@ -18104,7 +18104,7 @@ _0805AE40:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0805AE4C: .4byte gUnknown_02026354
|
||||
_0805AE4C: .4byte gSaveBlock1 + 0xC20
|
||||
thumb_func_end sub_805ADDC
|
||||
|
||||
thumb_func_start GetAvailableFieldObjectSlot
|
||||
@ -19142,7 +19142,7 @@ _0805B618:
|
||||
.align 2, 0
|
||||
_0805B628: .4byte gMapHeader
|
||||
_0805B62C: .4byte gSaveBlock1
|
||||
_0805B630: .4byte gUnknown_02026354
|
||||
_0805B630: .4byte gSaveBlock1 + 0xC20
|
||||
thumb_func_end sub_805B55C
|
||||
|
||||
thumb_func_start RemoveFieldObjectsOutsideView
|
||||
|
||||
498
asm/rom5.s
498
asm/rom5.s
File diff suppressed because it is too large
Load Diff
@ -229,7 +229,7 @@ _0803E350:
|
||||
str r2, [sp, 0x20]
|
||||
b _0803E374
|
||||
.align 2, 0
|
||||
_0803E358: .4byte gUnknown_02028DAA
|
||||
_0803E358: .4byte gSaveBlock1 + 0x3676
|
||||
_0803E35C:
|
||||
mov r0, r8
|
||||
movs r2, 0
|
||||
@ -2276,7 +2276,7 @@ _0803F3B8:
|
||||
ldr r7, _0803F3BC
|
||||
b _0803F3CA
|
||||
.align 2, 0
|
||||
_0803F3BC: .4byte gUnknown_02028DAA
|
||||
_0803F3BC: .4byte gSaveBlock1 + 0x3676
|
||||
_0803F3C0:
|
||||
ldr r1, _0803F404
|
||||
subs r0, 0xD
|
||||
|
||||
@ -826,7 +826,7 @@ daycare_send: @ 804149C
|
||||
.align 2, 0
|
||||
_080414B4: .4byte gUnknown_03005CE0
|
||||
_080414B8: .4byte gPlayerParty
|
||||
_080414BC: .4byte gUnknown_020286D0
|
||||
_080414BC: .4byte gSaveBlock1 + 0x2F9C
|
||||
thumb_func_end daycare_send
|
||||
|
||||
thumb_func_start sub_80414C0
|
||||
@ -1030,7 +1030,7 @@ sub_8041648: @ 8041648
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0804165C: .4byte gUnknown_020286D0
|
||||
_0804165C: .4byte gSaveBlock1 + 0x2F9C
|
||||
_08041660: .4byte gUnknown_0202E8CC
|
||||
thumb_func_end sub_8041648
|
||||
|
||||
@ -1180,7 +1180,7 @@ sub_8041770: @ 8041770
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08041784: .4byte gUnknown_020286D0
|
||||
_08041784: .4byte gSaveBlock1 + 0x2F9C
|
||||
_08041788: .4byte gUnknown_0202E8CC
|
||||
_0804178C: .4byte gUnknown_0202E8CE
|
||||
thumb_func_end sub_8041770
|
||||
@ -1225,7 +1225,7 @@ sub_80417B8: @ 80417B8
|
||||
b _080417EC
|
||||
.align 2, 0
|
||||
_080417D8: .4byte gUnknown_0202E8CC
|
||||
_080417DC: .4byte gUnknown_020286D0
|
||||
_080417DC: .4byte gSaveBlock1 + 0x2F9C
|
||||
_080417E0:
|
||||
ldrb r1, [r5]
|
||||
adds r0, r4, 0
|
||||
@ -1431,7 +1431,7 @@ sub_8041940: @ 8041940
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0804194C: .4byte gUnknown_020286D0
|
||||
_0804194C: .4byte gSaveBlock1 + 0x2F9C
|
||||
thumb_func_end sub_8041940
|
||||
|
||||
thumb_func_start sub_8041950
|
||||
@ -1442,7 +1442,7 @@ sub_8041950: @ 8041950
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0804195C: .4byte gUnknown_020286D0
|
||||
_0804195C: .4byte gSaveBlock1 + 0x2F9C
|
||||
thumb_func_end sub_8041950
|
||||
|
||||
thumb_func_start sub_8041960
|
||||
@ -2120,7 +2120,7 @@ sub_8041E7C: @ 8041E7C
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08041E88: .4byte gUnknown_020286D0
|
||||
_08041E88: .4byte gSaveBlock1 + 0x2F9C
|
||||
thumb_func_end sub_8041E7C
|
||||
|
||||
thumb_func_start incense_effects
|
||||
@ -2522,7 +2522,7 @@ sp0B8_daycare: @ 80421A0
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080421AC: .4byte gUnknown_020286D0
|
||||
_080421AC: .4byte gSaveBlock1 + 0x2F9C
|
||||
thumb_func_end sp0B8_daycare
|
||||
|
||||
thumb_func_start sub_80421B0
|
||||
@ -2657,7 +2657,7 @@ sub_80422A0: @ 80422A0
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_080422B0: .4byte gUnknown_020286D0
|
||||
_080422B0: .4byte gSaveBlock1 + 0x2F9C
|
||||
thumb_func_end sub_80422A0
|
||||
|
||||
thumb_func_start sub_80422B4
|
||||
@ -2753,7 +2753,7 @@ sp0B5_daycare: @ 8042360
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0804236C: .4byte gUnknown_020286D0
|
||||
_0804236C: .4byte gSaveBlock1 + 0x2F9C
|
||||
thumb_func_end sp0B5_daycare
|
||||
|
||||
thumb_func_start sp0B6_daycare
|
||||
@ -2768,7 +2768,7 @@ sp0B6_daycare: @ 8042370
|
||||
movs r0, 0x1
|
||||
b _080423A0
|
||||
.align 2, 0
|
||||
_08042384: .4byte gUnknown_020286D0
|
||||
_08042384: .4byte gSaveBlock1 + 0x2F9C
|
||||
_08042388:
|
||||
adds r0, r4, 0
|
||||
bl daycare_count_pokemon
|
||||
@ -2980,7 +2980,7 @@ daycare_relationship_score_from_savegame: @ 80424F4
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_08042504: .4byte gUnknown_020286D0
|
||||
_08042504: .4byte gSaveBlock1 + 0x2F9C
|
||||
thumb_func_end daycare_relationship_score_from_savegame
|
||||
|
||||
thumb_func_start sp0B9_daycare_relationship_comment
|
||||
@ -3433,7 +3433,7 @@ sub_8042824: @ 8042824
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08042880: .4byte gUnknown_020286D0
|
||||
_08042880: .4byte gSaveBlock1 + 0x2F9C
|
||||
_08042884: .4byte sub_804272C
|
||||
thumb_func_end sub_8042824
|
||||
|
||||
@ -3780,7 +3780,7 @@ sub_8042B4C: @ 8042B4C
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_08042B60: .4byte gUnknown_020286D0
|
||||
_08042B60: .4byte gSaveBlock1 + 0x2F9C
|
||||
_08042B64: .4byte gUnknown_0202E8CC
|
||||
thumb_func_end sub_8042B4C
|
||||
|
||||
@ -16312,7 +16312,7 @@ _08048F44:
|
||||
b _08049006
|
||||
.align 2, 0
|
||||
_08048F54: .4byte gBlockSendBuffer
|
||||
_08048F58: .4byte gUnknown_02028280
|
||||
_08048F58: .4byte gSaveBlock1 + 0x2B4C
|
||||
_08048F5C: .4byte gUnknown_03004824
|
||||
_08048F60:
|
||||
cmp r7, 0
|
||||
@ -16360,7 +16360,7 @@ _08048FAC:
|
||||
b _08049006
|
||||
.align 2, 0
|
||||
_08048FBC: .4byte gBlockSendBuffer
|
||||
_08048FC0: .4byte gUnknown_02028844
|
||||
_08048FC0: .4byte gSaveBlock1 + 0x3110
|
||||
_08048FC4: .4byte gUnknown_03004824
|
||||
_08048FC8:
|
||||
cmp r7, 0
|
||||
@ -20437,7 +20437,7 @@ _0804AFA2:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0804AFB0: .4byte gUnknown_02028844
|
||||
_0804AFB0: .4byte gSaveBlock1 + 0x3110
|
||||
_0804AFB4: .4byte gUnknown_03004824
|
||||
thumb_func_end sub_804AF84
|
||||
|
||||
@ -21843,7 +21843,7 @@ _0804BB50:
|
||||
.align 2, 0
|
||||
_0804BB60: .4byte gPlayerParty
|
||||
_0804BB64: .4byte gEnemyParty
|
||||
_0804BB68: .4byte gUnknown_02028280
|
||||
_0804BB68: .4byte gSaveBlock1 + 0x2B4C
|
||||
_0804BB6C: .4byte gUnknown_03004828
|
||||
_0804BB70: .4byte gUnknown_02029700
|
||||
_0804BB74: .4byte gReceivedRemoteLinkPlayers
|
||||
|
||||
@ -2295,7 +2295,7 @@ sub_8069030: @ 8069030
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08069064: .4byte gUnknown_02026954
|
||||
_08069064: .4byte gSaveBlock1 + 0x1220
|
||||
_08069068: .4byte gUnknown_0202E8E2
|
||||
thumb_func_end sub_8069030
|
||||
|
||||
@ -2322,7 +2322,7 @@ sub_806906C: @ 806906C
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080690A0: .4byte gUnknown_02026954
|
||||
_080690A0: .4byte gSaveBlock1 + 0x1220
|
||||
_080690A4: .4byte 0x0000084d
|
||||
_080690A8: .4byte 0x0000084e
|
||||
_080690AC: .4byte 0x00000829
|
||||
@ -2339,7 +2339,7 @@ sub_80690B4: @ 80690B4
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_080690C4: .4byte gUnknown_02026A6C
|
||||
_080690C4: .4byte gSaveBlock1 + 0x1338
|
||||
thumb_func_end sub_80690B4
|
||||
|
||||
thumb_func_start sub_80690C8
|
||||
@ -2628,7 +2628,7 @@ _080692BC:
|
||||
b _080692E0
|
||||
.align 2, 0
|
||||
_080692C8: .4byte 0x00003fff
|
||||
_080692CC: .4byte gUnknown_02026954
|
||||
_080692CC: .4byte gSaveBlock1 + 0x1220
|
||||
_080692D0:
|
||||
ldr r1, _080692E8
|
||||
adds r0, r3, r1
|
||||
@ -4972,7 +4972,7 @@ _0806A43E:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_0806A448: .4byte gUnknown_02024F44
|
||||
_0806A448: .4byte gSaveBlock2 + 0xA0
|
||||
thumb_func_end sub_806A3F4
|
||||
|
||||
thumb_func_start sub_806A44C
|
||||
@ -14278,7 +14278,7 @@ _0806ECA0: .4byte gTasks
|
||||
_0806ECA4: .4byte TaskDummy
|
||||
_0806ECA8: .4byte 0x0201c000
|
||||
_0806ECAC: .4byte gUnknown_0202E8F4
|
||||
_0806ECB0: .4byte gUnknown_02028280
|
||||
_0806ECB0: .4byte gSaveBlock1 + 0x2B4C
|
||||
_0806ECB4: .4byte gOtherText_PokeHoldingItemCantMail
|
||||
_0806ECB8: .4byte party_menu_link_mon_held_item_object
|
||||
_0806ECBC:
|
||||
@ -16074,7 +16074,7 @@ sub_806FB7C: @ 806FB7C
|
||||
ldr r0, _0806FB8C
|
||||
b _0806FB9A
|
||||
.align 2, 0
|
||||
_0806FB8C: .4byte gUnknown_02028DAA
|
||||
_0806FB8C: .4byte gSaveBlock1 + 0x3676
|
||||
_0806FB90:
|
||||
ldr r1, _0806FBA8
|
||||
subs r0, 0xD
|
||||
@ -17091,7 +17091,7 @@ dp05_ether: @ 80703F0
|
||||
ldr r0, _0807040C
|
||||
b _0807041C
|
||||
.align 2, 0
|
||||
_0807040C: .4byte gUnknown_02028DAA
|
||||
_0807040C: .4byte gSaveBlock1 + 0x3676
|
||||
_08070410:
|
||||
ldr r1, _08070464
|
||||
adds r0, r5, 0
|
||||
@ -18293,7 +18293,7 @@ sub_8070E48: @ 8070E48
|
||||
ldr r4, _08070E58
|
||||
b _08070E66
|
||||
.align 2, 0
|
||||
_08070E58: .4byte gUnknown_02028DAA
|
||||
_08070E58: .4byte gSaveBlock1 + 0x3676
|
||||
_08070E5C:
|
||||
ldr r1, _08070E8C
|
||||
subs r0, 0xD
|
||||
|
||||
@ -111,6 +111,7 @@ struct SaveBlock1
|
||||
u16 coins;
|
||||
u8 filler_496[0x31FA];
|
||||
struct RamScript ramScript;
|
||||
u8 filler_3A7C[0x44];
|
||||
};
|
||||
|
||||
extern struct SaveBlock1 gSaveBlock1;
|
||||
@ -136,8 +137,9 @@ struct SaveBlock2
|
||||
u8 optionsButtonMode; // OPTIONS_BUTTON_MODE_[NORMAL/LR/L_EQUALS_A]
|
||||
u8 optionsTextSpeed:3; // OPTIONS_TEXT_SPEED_[SLOW/MID/FAST]
|
||||
u8 optionsWindowFrameType:5; // Specifies one of the 20 decorative borders for text boxes
|
||||
u8 filler[0x83];
|
||||
u8 filler_15[0x83];
|
||||
struct Time localTimeOffset;
|
||||
u8 filler_A0[0x7F0];
|
||||
};
|
||||
|
||||
extern struct SaveBlock2 gSaveBlock2;
|
||||
|
||||
244
sym_ewram.txt
244
sym_ewram.txt
@ -305,250 +305,10 @@ gUnknown_02024E8C: @ 2024E8C
|
||||
.space 0x18
|
||||
|
||||
gSaveBlock2: @ 2024EA4
|
||||
.space 0xA
|
||||
|
||||
gUnknown_02024EAE: @ 2024EAE
|
||||
.space 0x1E
|
||||
|
||||
gUnknown_02024ECC: @ 2024ECC
|
||||
.space 0x78
|
||||
|
||||
gUnknown_02024F44: @ 2024F44
|
||||
.space 0x8
|
||||
|
||||
gUnknown_02024F4C: @ 2024F4C
|
||||
.space 0xA4
|
||||
|
||||
gUnknown_02024FF0: @ 2024FF0
|
||||
.space 0x4
|
||||
|
||||
gUnknown_02024FF4: @ 2024FF4
|
||||
.space 0x8
|
||||
|
||||
gUnknown_02024FFC: @ 2024FFC
|
||||
.space 0x94
|
||||
|
||||
gUnknown_02025090: @ 2025090
|
||||
.space 0x298
|
||||
|
||||
gUnknown_02025328: @ 2025328
|
||||
.space 0x14
|
||||
|
||||
gUnknown_0202533C: @ 202533C
|
||||
.space 0x4
|
||||
|
||||
gUnknown_02025340: @ 2025340
|
||||
.space 0xC
|
||||
|
||||
gUnknown_0202534C: @ 202534C
|
||||
.space 0xC
|
||||
|
||||
gUnknown_02025358: @ 2025358
|
||||
.space 0xC
|
||||
|
||||
gUnknown_02025364: @ 2025364
|
||||
.space 0xC
|
||||
|
||||
gUnknown_02025370: @ 2025370
|
||||
.space 0x8A
|
||||
|
||||
gUnknown_020253FA: @ 20253FA
|
||||
.space 0xF
|
||||
|
||||
gUnknown_02025409: @ 2025409
|
||||
.space 0x32B
|
||||
.space 0x890
|
||||
|
||||
gSaveBlock1: @ 2025734
|
||||
.space 0x4
|
||||
|
||||
gUnknown_02025738: @ 2025738
|
||||
.space 0x8
|
||||
|
||||
gUnknown_02025740: @ 2025740
|
||||
.space 0x8
|
||||
|
||||
gUnknown_02025748: @ 2025748
|
||||
.space 0x8
|
||||
|
||||
gUnknown_02025750: @ 2025750
|
||||
.space 0x8
|
||||
|
||||
gUnknown_02025758: @ 2025758
|
||||
.space 0x10
|
||||
|
||||
gUnknown_02025768: @ 2025768
|
||||
.space 0x204
|
||||
|
||||
gUnknown_0202596C: @ 202596C
|
||||
.space 0x258
|
||||
|
||||
gUnknown_02025BC4: @ 2025BC4
|
||||
.space 0x6
|
||||
|
||||
gUnknown_02025BCA: @ 2025BCA
|
||||
.space 0x2
|
||||
|
||||
gUnknown_02025BCC: @ 2025BCC
|
||||
.space 0xC8
|
||||
|
||||
gUnknown_02025C94: @ 2025C94
|
||||
.space 0x298
|
||||
|
||||
gUnknown_02025F2C: @ 2025F2C
|
||||
.space 0x140
|
||||
|
||||
gUnknown_0202606C: @ 202606C
|
||||
.space 0x42
|
||||
|
||||
gUnknown_020260AE: @ 20260AE
|
||||
.space 0x2A6
|
||||
|
||||
gUnknown_02026354: @ 2026354
|
||||
.space 0x600
|
||||
|
||||
gUnknown_02026954: @ 2026954
|
||||
.space 0x118
|
||||
|
||||
gUnknown_02026A6C: @ 2026A6C
|
||||
.space 0x8A
|
||||
|
||||
gUnknown_02026AF6: @ 2026AF6
|
||||
.space 0x246
|
||||
|
||||
gUnknown_02026D3C: @ 2026D3C
|
||||
.space 0x400
|
||||
|
||||
gUnknown_0202713C: @ 202713C
|
||||
.space 0x2
|
||||
|
||||
gUnknown_0202713E: @ 202713E
|
||||
.space 0x10
|
||||
|
||||
gUnknown_0202714E: @ 202714E
|
||||
.space 0x22
|
||||
|
||||
gUnknown_02027170: @ 2027170
|
||||
.space 0x18
|
||||
|
||||
gUnknown_02027188: @ 2027188
|
||||
.space 0x30
|
||||
|
||||
gUnknown_020271B8: @ 20271B8
|
||||
.space 0xC
|
||||
|
||||
gUnknown_020271C4: @ 20271C4
|
||||
.space 0xC
|
||||
|
||||
gUnknown_020271D0: @ 20271D0
|
||||
.space 0x6
|
||||
|
||||
gUnknown_020271D6: @ 20271D6
|
||||
.space 0xBE6
|
||||
|
||||
gUnknown_02027DBC: @ 2027DBC
|
||||
.space 0xB0
|
||||
|
||||
gUnknown_02027E6C: @ 2027E6C
|
||||
.space 0x2
|
||||
|
||||
gUnknown_02027E6E: @ 2027E6E
|
||||
.space 0x2
|
||||
|
||||
gUnknown_02027E70: @ 2027E70
|
||||
.space 0x14
|
||||
|
||||
gUnknown_02027E84: @ 2027E84
|
||||
.space 0x4
|
||||
|
||||
gUnknown_02027E88: @ 2027E88
|
||||
.space 0x344
|
||||
|
||||
gUnknown_020281CC: @ 20281CC
|
||||
.space 0x24
|
||||
|
||||
gUnknown_020281F0: @ 20281F0
|
||||
.space 0x5A
|
||||
|
||||
gUnknown_0202824A: @ 202824A
|
||||
.space 0x6
|
||||
|
||||
gUnknown_02028250: @ 2028250
|
||||
.space 0xC
|
||||
|
||||
gUnknown_0202825C: @ 202825C
|
||||
.space 0xC
|
||||
|
||||
gUnknown_02028268: @ 2028268
|
||||
.space 0xC
|
||||
|
||||
gUnknown_02028274: @ 2028274
|
||||
.space 0xC
|
||||
|
||||
gUnknown_02028280: @ 2028280
|
||||
.space 0x12
|
||||
|
||||
gUnknown_02028292: @ 2028292
|
||||
.space 0x8
|
||||
|
||||
gUnknown_0202829A: @ 202829A
|
||||
.space 0xD0
|
||||
|
||||
gUnknown_0202836A: @ 202836A
|
||||
.space 0x156
|
||||
|
||||
gUnknown_020284C0: @ 20284C0
|
||||
.space 0x8
|
||||
|
||||
gUnknown_020284C8: @ 20284C8
|
||||
.space 0x4
|
||||
|
||||
gUnknown_020284CC: @ 20284CC
|
||||
.space 0x4
|
||||
|
||||
gUnknown_020284D0: @ 20284D0
|
||||
.space 0x1C
|
||||
|
||||
gUnknown_020284EC: @ 20284EC
|
||||
.space 0x1C
|
||||
|
||||
gUnknown_02028508: @ 2028508
|
||||
.space 0x4
|
||||
|
||||
gUnknown_0202850C: @ 202850C
|
||||
.space 0x24
|
||||
|
||||
gUnknown_02028530: @ 2028530
|
||||
.space 0x1A0
|
||||
|
||||
gUnknown_020286D0: @ 20286D0
|
||||
.space 0x11C
|
||||
|
||||
gUnknown_020287EC: @ 20287EC
|
||||
.space 0x58
|
||||
|
||||
gUnknown_02028844: @ 2028844
|
||||
.space 0x34
|
||||
|
||||
gUnknown_02028878: @ 2028878
|
||||
.space 0x1C
|
||||
|
||||
gUnknown_02028894: @ 2028894
|
||||
.space 0x1C
|
||||
|
||||
gUnknown_020288B0: @ 20288B0
|
||||
.space 0x4FA
|
||||
|
||||
gUnknown_02028DAA: @ 2028DAA
|
||||
.space 0x12
|
||||
|
||||
gUnknown_02028DBC: @ 2028DBC
|
||||
.space 0x3F4
|
||||
|
||||
gUnknown_020291B0: @ 20291B0
|
||||
.space 0x4
|
||||
|
||||
gUnknown_020291B4: @ 20291B4
|
||||
.space 0x40
|
||||
.space 0x3AC0
|
||||
|
||||
gUnknown_020291F4: @ 20291F4
|
||||
.space 0x4D8
|
||||
|
||||
Loading…
Reference in New Issue
Block a user