diff options
| author | YamaArashi <shadow962@live.com> | 2016-09-25 17:19:28 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-09-25 17:19:28 -0700 |
| commit | 0a2857a7dce54b3b16cad1a3b605bae35ff748a9 (patch) | |
| tree | 367bcaf9afdbe052d489fe28e7ee0ccfcf71445d | |
| parent | 653724c79bb0cca9e79cc46c189d2cb5e69dfdae (diff) | |
fix save block symbols
| -rw-r--r-- | asm/rom3.s | 14 | ||||
| -rw-r--r-- | asm/rom4.s | 44 | ||||
| -rw-r--r-- | asm/rom5.s | 498 | ||||
| -rw-r--r-- | asm/rom_803D1FC.s | 4 | ||||
| -rw-r--r-- | asm/rom_8040EB4.s | 36 | ||||
| -rw-r--r-- | asm/rom_8065394.s | 18 | ||||
| -rw-r--r-- | include/global.h | 4 | ||||
| -rw-r--r-- | sym_ewram.txt | 244 |
8 files changed, 312 insertions, 550 deletions
diff --git a/asm/rom3.s b/asm/rom3.s index af1886f99..600d780f7 100644 --- a/asm/rom3.s +++ b/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 diff --git a/asm/rom4.s b/asm/rom4.s index ae77e879c..14e965139 100644 --- a/asm/rom4.s +++ b/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 diff --git a/asm/rom5.s b/asm/rom5.s index fe19def2e..ee4180b66 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -15969,7 +15969,7 @@ _0808291E: movs r4, 0x1 b _0808296E .align 2, 0 -_08082968: .4byte gUnknown_020260AE +_08082968: .4byte gSaveBlock1 + 0x97A _0808296C: adds r4, 0x1 _0808296E: @@ -16031,7 +16031,7 @@ _080829BA: movs r0, 0x1 b _080829E2 .align 2, 0 -_080829D4: .4byte gUnknown_020260AE +_080829D4: .4byte gSaveBlock1 + 0x97A _080829D8: adds r3, 0x10 adds r1, 0x1 @@ -18672,7 +18672,7 @@ _08083E1A: pop {r1} bx r1 .align 2, 0 -_08083E24: .4byte gUnknown_020286D0 +_08083E24: .4byte gSaveBlock1 + 0x2F9C thumb_func_end sub_8083DFC thumb_func_start sub_8083E28 @@ -18695,7 +18695,7 @@ _08083E46: pop {r1} bx r1 .align 2, 0 -_08083E50: .4byte gUnknown_020286D0 +_08083E50: .4byte gSaveBlock1 + 0x2F9C thumb_func_end sub_8083E28 thumb_func_start sub_8083E54 @@ -21415,7 +21415,7 @@ _0808524A: b _08085284 .align 2, 0 _08085260: .4byte gWildMonHeaders -_08085264: .4byte gUnknown_02028878 +_08085264: .4byte gSaveBlock1 + 0x3144 _08085268: ldr r0, [r4] movs r1, 0x1 @@ -31695,7 +31695,7 @@ _0808A1CA: .align 2, 0 _0808A1D0: .4byte gPaletteFade _0808A1D4: .4byte gPlayerParty -_0808A1D8: .4byte gUnknown_02028280 +_0808A1D8: .4byte gSaveBlock1 + 0x2B4C _0808A1DC: .4byte sub_808A520 thumb_func_end sub_808A180 @@ -31857,7 +31857,7 @@ sub_808A2DC: @ 808A2DC bx r0 .align 2, 0 _0808A324: .4byte gPlayerParty -_0808A328: .4byte gUnknown_02028280 +_0808A328: .4byte gSaveBlock1 + 0x2B4C _0808A32C: .4byte sub_808A520 thumb_func_end sub_808A2DC @@ -32526,7 +32526,7 @@ _0808A890: .align 2, 0 _0808A898: .4byte gPaletteFade _0808A89C: .4byte gPlayerParty -_0808A8A0: .4byte gUnknown_02028280 +_0808A8A0: .4byte gSaveBlock1 + 0x2B4C _0808A8A4: .4byte sub_808A8A8 thumb_func_end sub_808A848 @@ -33902,7 +33902,7 @@ _0808B384: _0808B38C: .4byte gPaletteFade _0808B390: .4byte gUnknown_03005CE0 _0808B394: .4byte gPlayerParty -_0808B398: .4byte gUnknown_02028280 +_0808B398: .4byte gSaveBlock1 + 0x2B4C _0808B39C: .4byte sub_808B3EC thumb_func_end sub_808B338 @@ -35547,7 +35547,7 @@ _0808C088: .4byte gUnknown_0202FFB8 _0808C08C: .4byte gUnknown_0202FFBA _0808C090: .4byte gUnknown_03005CE8 _0808C094: .4byte gSaveBlock2 -_0808C098: .4byte gUnknown_0202606C +_0808C098: .4byte gSaveBlock1 + 0x938 _0808C09C: .4byte 0x00003154 thumb_func_end sub_808C02C @@ -81312,7 +81312,7 @@ _080A2B1E: pop {r0} bx r0 .align 2, 0 -_080A2B3C: .4byte gUnknown_02028280 +_080A2B3C: .4byte gSaveBlock1 + 0x2B4C thumb_func_end sub_80A2B18 thumb_func_start sub_80A2B40 @@ -81554,11 +81554,11 @@ _080A2C88: _080A2D00: .4byte gSaveBlock1 _080A2D04: .4byte 0x00002b6c _080A2D08: .4byte gSaveBlock2 -_080A2D0C: .4byte gUnknown_02028280 +_080A2D0C: .4byte gSaveBlock1 + 0x2B4C _080A2D10: .4byte 0x0000ffff -_080A2D14: .4byte gUnknown_02028292 -_080A2D18: .4byte gUnknown_0202829A -_080A2D1C: .4byte gUnknown_02024EAE +_080A2D14: .4byte gSaveBlock1 + 0x2B5E +_080A2D18: .4byte gSaveBlock1 + 0x2B66 +_080A2D1C: .4byte gSaveBlock2 + 0xA _080A2D20: .4byte 0x00002b6a _080A2D24: adds r0, r1, 0x1 @@ -84133,7 +84133,7 @@ _080A40EE: .align 2, 0 _080A4114: .4byte gUnknown_03005D10 _080A4118: .4byte gUnknown_02038559 -_080A411C: .4byte gUnknown_02025BCA +_080A411C: .4byte gSaveBlock1 + 0x496 _080A4120: .4byte gUnknown_03005D24 _080A4124: adds r0, r4, 0x1 @@ -84571,7 +84571,7 @@ sub_80A444C: @ 80A444C mov r9, r0 b _080A4520 .align 2, 0 -_080A446C: .4byte gUnknown_02025BCA +_080A446C: .4byte gSaveBlock1 + 0x496 _080A4470: ldr r1, _080A44E8 ldr r0, _080A44EC @@ -89056,7 +89056,7 @@ sub_80A6870: @ 80A6870 pop {r0} bx r0 .align 2, 0 -_080A68A0: .4byte gUnknown_02025BC4 +_080A68A0: .4byte gSaveBlock1 + 0x490 thumb_func_end sub_80A6870 thumb_func_start sub_80A68A4 @@ -90235,7 +90235,7 @@ _080A71B2: _080A7214: .4byte gUnknown_03000700 _080A7218: .4byte gUnknown_02038559 _080A721C: .4byte 0x0201e000 -_080A7220: .4byte gUnknown_02025C94 +_080A7220: .4byte gSaveBlock1 + 0x560 _080A7224: .4byte gUnknown_03005D10 _080A7228: .4byte gUnknown_03000701 _080A722C: .4byte sub_80A7150 @@ -90366,7 +90366,7 @@ _080A72F4: b _080A735E .align 2, 0 _080A7344: .4byte gBG1TilemapBuffer -_080A7348: .4byte gUnknown_02025C94 +_080A7348: .4byte gSaveBlock1 + 0x560 _080A734C: .4byte 0x0201e000 _080A7350: .4byte sub_802E424 _080A7354: .4byte sub_80A5B00 @@ -91793,7 +91793,7 @@ sub_80A7CF8: @ 80A7CF8 bl LoadSpritePalette b _080A7D72 .align 2, 0 -_080A7D34: .4byte gUnknown_020288B0 +_080A7D34: .4byte gSaveBlock1 + 0x317C _080A7D38: .4byte 0x02000000 _080A7D3C: .4byte 0xffff0000 _080A7D40: .4byte 0x00007544 @@ -95340,7 +95340,7 @@ _080A97A0: movs r0, 0 b _080A97E8 .align 2, 0 -_080A97C4: .4byte gUnknown_02025BCC +_080A97C4: .4byte gSaveBlock1 + 0x498 _080A97C8: .4byte 0x0000fc19 _080A97CC: .4byte 0x000003e7 _080A97D0: @@ -95363,7 +95363,7 @@ _080A97E8: pop {r1} bx r1 .align 2, 0 -_080A97F0: .4byte gUnknown_02025BCC +_080A97F0: .4byte gSaveBlock1 + 0x498 thumb_func_end sub_80A9760 thumb_func_start sub_80A97F4 @@ -95444,7 +95444,7 @@ _080A986C: bx r0 .align 2, 0 _080A987C: .4byte gSaveBlock1 -_080A9880: .4byte gUnknown_02025BCC +_080A9880: .4byte gSaveBlock1 + 0x498 thumb_func_end sub_80A982C thumb_func_start sub_80A9884 @@ -114326,7 +114326,7 @@ _080B2C98: movs r0, 0x2 b _080B2D16 .align 2, 0 -_080B2C9C: .4byte gUnknown_02028530 +_080B2C9C: .4byte gSaveBlock1 + 0x2DFC _080B2CA0: cmp r1, 0 beq _080B2CCA @@ -114354,7 +114354,7 @@ _080B2CCA: movs r0, 0x5 b _080B2D16 .align 2, 0 -_080B2CD0: .4byte gUnknown_02028530 +_080B2CD0: .4byte gSaveBlock1 + 0x2DFC _080B2CD4: ldr r0, _080B2CE8 ldrh r0, [r0] @@ -116263,7 +116263,7 @@ sub_80B3B80: @ 80B3B80 pop {r0} bx r0 .align 2, 0 -_080B3BC0: .4byte gUnknown_02025BC4 +_080B3BC0: .4byte gSaveBlock1 + 0x490 _080B3BC4: .4byte gUnknown_020386A0 _080B3BC8: .4byte gTasks _080B3BCC: .4byte sub_80B3AEC @@ -117857,7 +117857,7 @@ unref_sub_80B4884: @ 80B4884 pop {r0} bx r0 .align 2, 0 -_080B48A0: .4byte gUnknown_02028894 +_080B48A0: .4byte gSaveBlock1 + 0x3160 _080B48A4: .4byte 0x01000298 thumb_func_end unref_sub_80B4884 @@ -117892,7 +117892,7 @@ _080B48B6: pop {r0} bx r0 .align 2, 0 -_080B48E0: .4byte gUnknown_02028894 +_080B48E0: .4byte gSaveBlock1 + 0x3160 _080B48E4: .4byte 0x0000052f _080B48E8: .4byte 0xffffcea0 _080B48EC: .4byte 0x0000316c @@ -117990,7 +117990,7 @@ GetBerryInfo: @ 80B498C ldr r0, _080B49A4 b _080B49BE .align 2, 0 -_080B49A4: .4byte gUnknown_02028894 +_080B49A4: .4byte gSaveBlock1 + 0x3160 _080B49A8: subs r0, r4, 0x1 lsls r0, 24 @@ -118020,7 +118020,7 @@ GetBerryTreeInfo: @ 80B49C8 adds r0, r1 bx lr .align 2, 0 -_080B49D4: .4byte gUnknown_02026D3C +_080B49D4: .4byte gSaveBlock1 + 0x1608 thumb_func_end GetBerryTreeInfo thumb_func_start FieldObjectInteractionWaterBerryTree @@ -118283,7 +118283,7 @@ _080B4B6A: str r1, [r4, 0x4] b _080B4BF8 .align 2, 0 -_080B4BAC: .4byte gUnknown_02026D3C +_080B4BAC: .4byte gSaveBlock1 + 0x1608 _080B4BB0: .4byte gUnknown_083CD780 _080B4BB4: adds r5, r6, 0 @@ -124939,7 +124939,7 @@ sub_80B7D0C: @ 80B7D0C pop {r0} bx r0 .align 2, 0 -_080B7D1C: .4byte gUnknown_02025BC4 +_080B7D1C: .4byte gSaveBlock1 + 0x490 _080B7D20: .4byte gUnknown_0202E8CE thumb_func_end sub_80B7D0C @@ -132222,7 +132222,7 @@ sub_80BB594: @ 80BB594 pop {r0} bx r0 .align 2, 0 -_080BB5B0: .4byte gUnknown_0202713C +_080BB5B0: .4byte gSaveBlock1 + 0x1A08 thumb_func_end sub_80BB594 thumb_func_start sub_80BB5B4 @@ -132731,10 +132731,10 @@ _080BB948: .4byte gSaveBlock1 _080BB94C: .4byte gUnknown_020387DC _080BB950: .4byte 0x00001a08 _080BB954: .4byte 0x00001a11 -_080BB958: .4byte gUnknown_02024EAE +_080BB958: .4byte gSaveBlock2 + 0xA _080BB95C: .4byte 0x00004054 _080BB960: .4byte gSaveBlock2 -_080BB964: .4byte gUnknown_0202713E +_080BB964: .4byte gSaveBlock1 + 0x1A0A _080BB968: .4byte 0x00004026 _080BB96C: .4byte gMapHeader thumb_func_end sub_80BB8CC @@ -133315,7 +133315,7 @@ sub_80BBDD0: @ 80BBDD0 b _080BBE1E .align 2, 0 _080BBE00: .4byte 0x00004054 -_080BBE04: .4byte gUnknown_02027DBC +_080BBE04: .4byte gSaveBlock1 + 0x2688 _080BBE08: lsls r1, r4, 2 adds r1, r4 @@ -133506,7 +133506,7 @@ _080BBF6C: pop {r0} bx r0 .align 2, 0 -_080BBF7C: .4byte gUnknown_0202714E +_080BBF7C: .4byte gSaveBlock1 + 0x1A1A _080BBF80: .4byte gSaveBlock1 _080BBF84: .4byte gDecorations _080BBF88: .4byte gMapHeader @@ -133805,7 +133805,7 @@ sub_80BC190: @ 80BC190 pop {r1} bx r1 .align 2, 0 -_080BC1C8: .4byte gUnknown_0202713E +_080BC1C8: .4byte gSaveBlock1 + 0x1A0A _080BC1CC: .4byte gOtherText_PlayersBase thumb_func_end sub_80BC190 @@ -133877,7 +133877,7 @@ sub_80BC224: @ 80BC224 bx r0 .align 2, 0 _080BC25C: .4byte 0x00004054 -_080BC260: .4byte gUnknown_0202713E +_080BC260: .4byte gSaveBlock1 + 0x1A0A _080BC264: .4byte gStringVar1 thumb_func_end sub_80BC224 @@ -134103,12 +134103,12 @@ _080BC408: bx r0 .align 2, 0 _080BC424: .4byte gPlayerParty -_080BC428: .4byte gUnknown_02027188 -_080BC42C: .4byte gUnknown_020271B8 -_080BC430: .4byte gUnknown_020271C4 -_080BC434: .4byte gUnknown_020271D0 -_080BC438: .4byte gUnknown_02027170 -_080BC43C: .4byte gUnknown_020271D6 +_080BC428: .4byte gSaveBlock1 + 0x1A54 +_080BC42C: .4byte gSaveBlock1 + 0x1A84 +_080BC430: .4byte gSaveBlock1 + 0x1A90 +_080BC434: .4byte gSaveBlock1 + 0x1A9C +_080BC438: .4byte gSaveBlock1 + 0x1A3C +_080BC43C: .4byte gSaveBlock1 + 0x1AA2 thumb_func_end sub_80BC300 thumb_func_start sub_80BC440 @@ -134189,7 +134189,7 @@ _080BC4C6: b _080BC504 .align 2, 0 _080BC4CC: .4byte gMapHeader -_080BC4D0: .4byte gUnknown_0202713C +_080BC4D0: .4byte gSaveBlock1 + 0x1A08 _080BC4D4: .4byte gUnknown_083D1358 _080BC4D8: ldr r0, [r4, 0x10] @@ -135396,7 +135396,7 @@ sub_80BCE1C: @ 80BCE1C bx r0 .align 2, 0 _080BCE44: .4byte 0x00004054 -_080BCE48: .4byte gUnknown_0202713C +_080BCE48: .4byte gSaveBlock1 + 0x1A08 thumb_func_end sub_80BCE1C thumb_func_start sub_80BCE4C @@ -136056,7 +136056,7 @@ _080BD30C: pop {r0} bx r0 .align 2, 0 -_080BD324: .4byte gUnknown_0202713C +_080BD324: .4byte gSaveBlock1 + 0x1A08 thumb_func_end sub_80BD280 thumb_func_start sub_80BD328 @@ -136497,7 +136497,7 @@ sub_80BD610: @ 80BD610 pop {r0} bx r0 .align 2, 0 -_080BD670: .4byte gUnknown_0202713C +_080BD670: .4byte gSaveBlock1 + 0x1A08 thumb_func_end sub_80BD610 thumb_func_start sub_80BD674 @@ -137061,7 +137061,7 @@ special_0x4a: @ 80BDA78 b _080BDAAE .align 2, 0 _080BDAA4: .4byte gUnknown_0202E8CC -_080BDAA8: .4byte gUnknown_02027E6C +_080BDAA8: .4byte gSaveBlock1 + 0x2738 _080BDAAC: ldrb r0, [r2] _080BDAAE: @@ -137711,7 +137711,7 @@ _080BDF64: .align 2, 0 _080BDF98: .4byte 0x0000ffff _080BDF9C: .4byte gSpeciesNames -_080BDFA0: .4byte gUnknown_02027E6C +_080BDFA0: .4byte gSaveBlock1 + 0x2738 _080BDFA4: .4byte gUnknown_03005D38 _080BDFA8: .4byte gSaveBlock2 _080BDFAC: @@ -137808,7 +137808,7 @@ _080BE048: pop {r0} bx r0 .align 2, 0 -_080BE064: .4byte gUnknown_020281CC +_080BE064: .4byte gSaveBlock1 + 0x2A98 _080BE068: .4byte 0xfffffca0 _080BE06C: .4byte gUnknown_030042E0 _080BE070: .4byte gMapHeader @@ -137900,7 +137900,7 @@ _080BE112: _080BE118: .4byte 0x0000ffff _080BE11C: .4byte gUnknown_03004316 _080BE120: .4byte gUnknown_02024D26 -_080BE124: .4byte gUnknown_02027E6C +_080BE124: .4byte gSaveBlock1 + 0x2738 _080BE128: .4byte gUnknown_03005D38 _080BE12C: .4byte gUnknown_030042E0 _080BE130: .4byte gMapHeader @@ -138032,7 +138032,7 @@ _080BE224: pop {r0} bx r0 .align 2, 0 -_080BE22C: .4byte gUnknown_020281CC +_080BE22C: .4byte gSaveBlock1 + 0x2A98 _080BE230: .4byte gUnknown_03005D38 _080BE234: .4byte 0xfffffca0 _080BE238: .4byte gSaveBlock2 @@ -138068,7 +138068,7 @@ _080BE270: pop {r0} bx r0 .align 2, 0 -_080BE278: .4byte gUnknown_020281CC +_080BE278: .4byte gSaveBlock1 + 0x2A98 _080BE27C: .4byte 0xfffffca0 _080BE280: .4byte gUnknown_03005D38 thumb_func_end sub_80BE23C @@ -138138,7 +138138,7 @@ _080BE2FE: pop {r0} bx r0 .align 2, 0 -_080BE304: .4byte gUnknown_020281CC +_080BE304: .4byte gSaveBlock1 + 0x2A98 _080BE308: .4byte 0xfffffca0 _080BE30C: .4byte gUnknown_03005D38 _080BE310: .4byte gUnknown_0203869C @@ -138197,7 +138197,7 @@ sub_80BE320: @ 80BE320 b _080BE39E .align 2, 0 _080BE384: .4byte gUnknown_03005D38 -_080BE388: .4byte gUnknown_02027E6C +_080BE388: .4byte gSaveBlock1 + 0x2738 _080BE38C: .4byte gSaveBlock2 _080BE390: .4byte 0x00000484 _080BE394: .4byte 0x00000482 @@ -138300,7 +138300,7 @@ _080BE458: bx r0 .align 2, 0 _080BE460: .4byte 0x00005555 -_080BE464: .4byte gUnknown_02027E6C +_080BE464: .4byte gSaveBlock1 + 0x2738 _080BE468: .4byte gUnknown_03005D38 _080BE46C: .4byte gUnknown_02038724 _080BE470: .4byte gMapHeader @@ -138413,7 +138413,7 @@ _080BE55C: .4byte gPlayerParty _080BE560: .4byte gStringVar1 _080BE564: .4byte gSaveBlock2 _080BE568: .4byte gUnknown_03005D38 -_080BE56C: .4byte gUnknown_02027E6C +_080BE56C: .4byte gSaveBlock1 + 0x2738 thumb_func_end sub_80BE478 thumb_func_start StartMassOutbreak @@ -138484,7 +138484,7 @@ StartMassOutbreak: @ 80BE570 bx r0 .align 2, 0 _080BE5F0: .4byte gUnknown_0202E8CC -_080BE5F4: .4byte gUnknown_02027E6C +_080BE5F4: .4byte gSaveBlock1 + 0x2738 _080BE5F8: .4byte 0x000003d5 thumb_func_end StartMassOutbreak @@ -138527,7 +138527,7 @@ sub_80BE5FC: @ 80BE5FC bx r0 .align 2, 0 _080BE64C: .4byte gUnknown_03005D38 -_080BE650: .4byte gUnknown_02027E6C +_080BE650: .4byte gSaveBlock1 + 0x2738 _080BE654: .4byte gSaveBlock2 _080BE658: .4byte gPlayerParty thumb_func_end sub_80BE5FC @@ -138562,7 +138562,7 @@ sub_80BE65C: @ 80BE65C bx r0 .align 2, 0 _080BE694: .4byte gUnknown_03005D38 -_080BE698: .4byte gUnknown_02027E6C +_080BE698: .4byte gSaveBlock1 + 0x2738 _080BE69C: .4byte gSaveBlock2 thumb_func_end sub_80BE65C @@ -138655,7 +138655,7 @@ sub_80BE6A0: @ 80BE6A0 bx r0 .align 2, 0 _080BE760: .4byte gUnknown_03005D38 -_080BE764: .4byte gUnknown_02027E6C +_080BE764: .4byte gSaveBlock1 + 0x2738 _080BE768: .4byte gPlayerParty _080BE76C: .4byte gUnknown_0202E8D2 _080BE770: .4byte gSaveBlock2 @@ -138767,7 +138767,7 @@ _080BE83C: .4byte 0x00000804 _080BE840: .4byte gSaveBlock1 _080BE844: .4byte 0x00002738 _080BE848: .4byte 0x00000147 -_080BE84C: .4byte gUnknown_02027E6C +_080BE84C: .4byte gSaveBlock1 + 0x2738 _080BE850: .4byte gUnknown_03005D38 _080BE854: .4byte gUnknown_083D13F8 thumb_func_end sub_80BE778 @@ -139028,7 +139028,7 @@ _080BEA36: pop {r0} bx r0 .align 2, 0 -_080BEA3C: .4byte gUnknown_02027E6C +_080BEA3C: .4byte gSaveBlock1 + 0x2738 _080BEA40: .4byte gUnknown_03005D38 _080BEA44: .4byte gUnknown_020387E2 _080BEA48: .4byte gUnknown_020387E0 @@ -139060,7 +139060,7 @@ sub_80BEA5C: @ 80BEA5C bl sub_80BF55C b _080BEA84 .align 2, 0 -_080BEA78: .4byte gUnknown_020281CC +_080BEA78: .4byte gSaveBlock1 + 0x2A98 _080BEA7C: .4byte 0xfffffca0 _080BEA80: bl sub_80BEA88 @@ -139132,7 +139132,7 @@ _080BEB04: pop {r0} bx r0 .align 2, 0 -_080BEB0C: .4byte gUnknown_020281CC +_080BEB0C: .4byte gSaveBlock1 + 0x2A98 _080BEB10: .4byte 0x0000ffff _080BEB14: .4byte 0xfffffca0 _080BEB18: .4byte gUnknown_03005D38 @@ -139208,7 +139208,7 @@ _080BEBA6: bx r0 .align 2, 0 _080BEBAC: .4byte 0x00000804 -_080BEBB0: .4byte gUnknown_020281F0 +_080BEBB0: .4byte gSaveBlock1 + 0x2ABC _080BEBB4: .4byte gUnknown_03005D38 _080BEBB8: .4byte 0x0000028f _080BEBBC: .4byte 0xffffd544 @@ -139850,7 +139850,7 @@ SetContestCategoryStringVarForInterview: @ 80BF060 bx r0 .align 2, 0 _080BF080: .4byte gUnknown_0202E8CC -_080BF084: .4byte gUnknown_02027E6C +_080BF084: .4byte gSaveBlock1 + 0x2738 thumb_func_end SetContestCategoryStringVarForInterview thumb_func_start sub_80BF088 @@ -140048,7 +140048,7 @@ _080BF1C4: movs r0, 0x1 b _080BF204 .align 2, 0 -_080BF1F4: .4byte gUnknown_02027E6C +_080BF1F4: .4byte gSaveBlock1 + 0x2738 _080BF1F8: adds r0, r4, 0x1 lsls r0, 24 @@ -140262,7 +140262,7 @@ _080BF390: .4byte gStringVar1 _080BF394: .4byte gPlayerParty _080BF398: .4byte gSpeciesNames _080BF39C: .4byte gUnknown_03005D38 -_080BF3A0: .4byte gUnknown_02027E6C +_080BF3A0: .4byte gSaveBlock1 + 0x2738 thumb_func_end sub_80BF334 thumb_func_start sub_80BF3A4 @@ -140291,7 +140291,7 @@ _080BF3CC: .align 2, 0 _080BF3D0: .4byte gScriptResult _080BF3D4: .4byte gUnknown_03005D38 -_080BF3D8: .4byte gUnknown_02027E6C +_080BF3D8: .4byte gSaveBlock1 + 0x2738 thumb_func_end sub_80BF3A4 thumb_func_start sub_80BF3DC @@ -140353,7 +140353,7 @@ _080BF458: .4byte gPlayerParty _080BF45C: .4byte gSpeciesNames _080BF460: .4byte gStringVar2 _080BF464: .4byte gUnknown_03005D38 -_080BF468: .4byte gUnknown_02027E6C +_080BF468: .4byte gSaveBlock1 + 0x2738 thumb_func_end sub_80BF3DC thumb_func_start sub_80BF46C @@ -140401,7 +140401,7 @@ _080BF4AC: .align 2, 0 _080BF4B0: .4byte gScriptResult _080BF4B4: .4byte gUnknown_03005D38 -_080BF4B8: .4byte gUnknown_02027E6C +_080BF4B8: .4byte gSaveBlock1 + 0x2738 thumb_func_end sub_80BF484 thumb_func_start sub_80BF4BC @@ -140430,7 +140430,7 @@ _080BF4E4: .align 2, 0 _080BF4E8: .4byte gScriptResult _080BF4EC: .4byte gUnknown_03005D38 -_080BF4F0: .4byte gUnknown_02027E6C +_080BF4F0: .4byte gSaveBlock1 + 0x2738 thumb_func_end sub_80BF4BC thumb_func_start sub_80BF4F4 @@ -140595,7 +140595,7 @@ _080BF5F2: bl sub_80BF55C b _080BF62A .align 2, 0 -_080BF61C: .4byte gUnknown_02027E6C +_080BF61C: .4byte gSaveBlock1 + 0x2738 _080BF620: adds r0, r2, 0x1 lsls r0, 24 @@ -140719,7 +140719,7 @@ sub_80BF6D8: @ 80BF6D8 movs r0, 0x1 b _080BF714 .align 2, 0 -_080BF700: .4byte gUnknown_02027E6C +_080BF700: .4byte gSaveBlock1 + 0x2738 _080BF704: .4byte gUnknown_03005D38 _080BF708: .4byte gUnknown_0202E8D0 _080BF70C: .4byte gScriptResult @@ -141620,7 +141620,7 @@ _080BFD9A: bl sub_80BFE24 b _080BFDFC .align 2, 0 -_080BFDB4: .4byte gUnknown_02027E6C +_080BFDB4: .4byte gSaveBlock1 + 0x2738 _080BFDB8: .4byte 0x00000a8c _080BFDBC: ldr r1, _080BFDC8 @@ -141629,7 +141629,7 @@ _080BFDBC: adds r2, r4, r0 b _080BFDD4 .align 2, 0 -_080BFDC8: .4byte gUnknown_02027E6C +_080BFDC8: .4byte gSaveBlock1 + 0x2738 _080BFDCC: movs r0, 0xE1 lsls r0, 2 @@ -141642,7 +141642,7 @@ _080BFDD4: bl sub_80BFE24 b _080BFDFC .align 2, 0 -_080BFDE0: .4byte gUnknown_02027E6C +_080BFDE0: .4byte gSaveBlock1 + 0x2738 _080BFDE4: .4byte 0x00000a8c _080BFDE8: movs r0, 0xE1 @@ -141669,7 +141669,7 @@ _080BFDFC: pop {r0} bx r0 .align 2, 0 -_080BFE20: .4byte gUnknown_02027E6C +_080BFE20: .4byte gSaveBlock1 + 0x2738 thumb_func_end sub_80BFD44 thumb_func_start sub_80BFE24 @@ -142249,7 +142249,7 @@ _080C02AC: ldrh r0, [r0, 0x2] b _080C035A .align 2, 0 -_080C02B8: .4byte gUnknown_02027E6C +_080C02B8: .4byte gSaveBlock1 + 0x2738 _080C02BC: adds r0, r2, r6 lsls r0, 2 @@ -142258,7 +142258,7 @@ _080C02BC: ldrh r0, [r0, 0x2] b _080C035A .align 2, 0 -_080C02C8: .4byte gUnknown_02027E6C +_080C02C8: .4byte gSaveBlock1 + 0x2738 _080C02CC: adds r0, r2, r6 lsls r0, 2 @@ -142267,7 +142267,7 @@ _080C02CC: ldrh r0, [r0, 0x6] b _080C035A .align 2, 0 -_080C02D8: .4byte gUnknown_02027E6C +_080C02D8: .4byte gSaveBlock1 + 0x2738 _080C02DC: adds r4, r2, r6 lsls r4, 2 @@ -142281,7 +142281,7 @@ _080C02DC: ldrh r0, [r4, 0x1C] b _080C037E .align 2, 0 -_080C02F4: .4byte gUnknown_02027E6C +_080C02F4: .4byte gSaveBlock1 + 0x2738 _080C02F8: adds r0, r2, r6 lsls r0, 2 @@ -142290,7 +142290,7 @@ _080C02F8: ldrh r0, [r0, 0x2] b _080C035A .align 2, 0 -_080C0304: .4byte gUnknown_02027E6C +_080C0304: .4byte gSaveBlock1 + 0x2738 _080C0308: adds r4, r2, r6 lsls r4, 2 @@ -142304,7 +142304,7 @@ _080C0308: ldrh r0, [r4, 0x14] b _080C037E .align 2, 0 -_080C0320: .4byte gUnknown_02027E6C +_080C0320: .4byte gSaveBlock1 + 0x2738 _080C0324: adds r0, r2, r6 lsls r0, 2 @@ -142313,7 +142313,7 @@ _080C0324: ldrh r0, [r0, 0x10] b _080C035A .align 2, 0 -_080C0330: .4byte gUnknown_02027E6C +_080C0330: .4byte gSaveBlock1 + 0x2738 _080C0334: adds r4, r2, r6 lsls r4, 2 @@ -142327,7 +142327,7 @@ _080C0334: ldrh r0, [r4, 0xE] b _080C037E .align 2, 0 -_080C034C: .4byte gUnknown_02027E6C +_080C034C: .4byte gSaveBlock1 + 0x2738 _080C0350: adds r0, r2, r6 lsls r0, 2 @@ -142340,7 +142340,7 @@ _080C035A: bl sub_80C03C8 b _080C0394 .align 2, 0 -_080C0364: .4byte gUnknown_02027E6C +_080C0364: .4byte gSaveBlock1 + 0x2738 _080C0368: adds r4, r2, r6 lsls r4, 2 @@ -142357,7 +142357,7 @@ _080C037E: bl sub_80C03C8 b _080C0394 .align 2, 0 -_080C0388: .4byte gUnknown_02027E6C +_080C0388: .4byte gSaveBlock1 + 0x2738 _080C038C: lsls r0, r6, 24 lsrs r0, 24 @@ -142569,7 +142569,7 @@ _080C0502: .align 2, 0 _080C0508: .4byte gSaveBlock1 _080C050C: .4byte 0x00002738 -_080C0510: .4byte gUnknown_02027E6C +_080C0510: .4byte gSaveBlock1 + 0x2738 thumb_func_end sub_80C04A0 thumb_func_start sub_80C0514 @@ -142623,14 +142623,14 @@ _080C055E: bl sub_80C05C4 b _080C05AC .align 2, 0 -_080C0574: .4byte gUnknown_020281F0 +_080C0574: .4byte gSaveBlock1 + 0x2ABC _080C0578: ldr r1, _080C0580 adds r2, r4, 0 adds r2, 0x80 b _080C058A .align 2, 0 -_080C0580: .4byte gUnknown_020281F0 +_080C0580: .4byte gSaveBlock1 + 0x2ABC _080C0584: adds r1, r4, 0 adds r1, 0x40 @@ -142642,7 +142642,7 @@ _080C058A: bl sub_80C05C4 b _080C05AC .align 2, 0 -_080C0598: .4byte gUnknown_020281F0 +_080C0598: .4byte gSaveBlock1 + 0x2ABC _080C059C: adds r1, r6, 0 adds r1, 0x40 @@ -142660,7 +142660,7 @@ _080C05AC: pop {r0} bx r0 .align 2, 0 -_080C05C0: .4byte gUnknown_020281F0 +_080C05C0: .4byte gSaveBlock1 + 0x2ABC thumb_func_end sub_80C0514 thumb_func_start sub_80C05C4 @@ -143104,7 +143104,7 @@ _080C093C: mov pc, r0 .align 2, 0 _080C0948: .4byte gUnknown_0202E8CC -_080C094C: .4byte gUnknown_02027E6C +_080C094C: .4byte gSaveBlock1 + 0x2738 _080C0950: .4byte gScriptResult _080C0954: .4byte gUnknown_020387E8 _080C0958: .4byte _080C095C @@ -143381,7 +143381,7 @@ _080C0BBE: mov pc, r0 .align 2, 0 _080C0BC8: .4byte gUnknown_0202E8CC -_080C0BCC: .4byte gUnknown_02027E6C +_080C0BCC: .4byte gSaveBlock1 + 0x2738 _080C0BD0: .4byte gScriptResult _080C0BD4: .4byte gUnknown_020387E8 _080C0BD8: .4byte _080C0BDC @@ -143654,7 +143654,7 @@ _080C0E22: mov pc, r0 .align 2, 0 _080C0E2C: .4byte gUnknown_0202E8CC -_080C0E30: .4byte gUnknown_02027E6C +_080C0E30: .4byte gSaveBlock1 + 0x2738 _080C0E34: .4byte gScriptResult _080C0E38: .4byte gUnknown_020387E8 _080C0E3C: .4byte _080C0E40 @@ -143908,7 +143908,7 @@ _080C1054: mov pc, r0 .align 2, 0 _080C1060: .4byte gUnknown_0202E8CC -_080C1064: .4byte gUnknown_02027E6C +_080C1064: .4byte gSaveBlock1 + 0x2738 _080C1068: .4byte gScriptResult _080C106C: .4byte gUnknown_020387E8 _080C1070: .4byte _080C1074 @@ -144293,7 +144293,7 @@ _080C13CE: mov pc, r0 .align 2, 0 _080C13D8: .4byte gUnknown_0202E8CC -_080C13DC: .4byte gUnknown_02027E6C +_080C13DC: .4byte gSaveBlock1 + 0x2738 _080C13E0: .4byte gScriptResult _080C13E4: .4byte gUnknown_020387E8 _080C13E8: .4byte _080C13EC @@ -144545,7 +144545,7 @@ _080C1614: mov pc, r0 .align 2, 0 _080C1620: .4byte gUnknown_0202E8CC -_080C1624: .4byte gUnknown_02027E6C +_080C1624: .4byte gSaveBlock1 + 0x2738 _080C1628: .4byte gScriptResult _080C162C: .4byte gUnknown_020387E8 _080C1630: .4byte _080C1634 @@ -144703,7 +144703,7 @@ _080C1776: mov pc, r0 .align 2, 0 _080C1780: .4byte gUnknown_0202E8CC -_080C1784: .4byte gUnknown_02027E6C +_080C1784: .4byte gSaveBlock1 + 0x2738 _080C1788: .4byte gScriptResult _080C178C: .4byte gUnknown_020387E8 _080C1790: .4byte _080C1794 @@ -144916,7 +144916,7 @@ _080C199A: mov pc, r0 .align 2, 0 _080C19A4: .4byte gUnknown_0202E8CC -_080C19A8: .4byte gUnknown_02027E6C +_080C19A8: .4byte gSaveBlock1 + 0x2738 _080C19AC: .4byte gScriptResult _080C19B0: .4byte gUnknown_020387E8 _080C19B4: .4byte _080C19B8 @@ -145060,7 +145060,7 @@ DoTVShowPokemonFanClubOpinions: @ 80C1B08 b _080C1BD6 .align 2, 0 _080C1B30: .4byte gUnknown_0202E8CC -_080C1B34: .4byte gUnknown_02027E6C +_080C1B34: .4byte gSaveBlock1 + 0x2738 _080C1B38: .4byte gScriptResult _080C1B3C: .4byte gUnknown_020387E8 _080C1B40: @@ -145181,7 +145181,7 @@ DoTVShowPokemonNewsMassOutbreak: @ 80C1BF8 bx r0 .align 2, 0 _080C1C40: .4byte gUnknown_0202E8CC -_080C1C44: .4byte gUnknown_02027E6C +_080C1C44: .4byte gSaveBlock1 + 0x2738 _080C1C48: .4byte gStringVar1 _080C1C4C: .4byte gStringVar2 _080C1C50: .4byte gSpeciesNames @@ -145420,7 +145420,7 @@ DoTVShowPokemonAngler: @ 80C1E38 b _080C1E74 .align 2, 0 _080C1E5C: .4byte gUnknown_0202E8CC -_080C1E60: .4byte gUnknown_02027E6C +_080C1E60: .4byte gSaveBlock1 + 0x2738 _080C1E64: .4byte gScriptResult _080C1E68: .4byte gUnknown_020387E8 _080C1E6C: @@ -145516,7 +145516,7 @@ DoTVShowTheWorldOfMasters: @ 80C1F08 b _080C1FB6 .align 2, 0 _080C1F30: .4byte gUnknown_0202E8CC -_080C1F34: .4byte gUnknown_02027E6C +_080C1F34: .4byte gSaveBlock1 + 0x2738 _080C1F38: .4byte gScriptResult _080C1F3C: .4byte gUnknown_020387E8 _080C1F40: @@ -156829,7 +156829,7 @@ sub_80C77A0: @ 80C77A0 .align 2, 0 _080C77CC: .4byte gUnknown_03004B28 _080C77D0: .4byte 0x000040b4 -_080C77D4: .4byte gUnknown_02025738 +_080C77D4: .4byte gSaveBlock1 + 0x4 _080C77D8: cmp r2, 0x2 beq _080C783E @@ -220274,22 +220274,22 @@ _080E6134: ldr r1, _080E6138 b _080E624C .align 2, 0 -_080E6138: .4byte gUnknown_02028250 +_080E6138: .4byte gSaveBlock1 + 0x2B1C _080E613C: ldr r1, _080E6140 b _080E6276 .align 2, 0 -_080E6140: .4byte gUnknown_0202825C +_080E6140: .4byte gSaveBlock1 + 0x2B28 _080E6144: ldr r1, _080E6148 b _080E624C .align 2, 0 -_080E6148: .4byte gUnknown_02028268 +_080E6148: .4byte gSaveBlock1 + 0x2B34 _080E614C: ldr r1, _080E6150 b _080E6276 .align 2, 0 -_080E6150: .4byte gUnknown_02028274 +_080E6150: .4byte gSaveBlock1 + 0x2B40 _080E6154: ldr r0, _080E6164 ldrh r1, [r0] @@ -220301,7 +220301,7 @@ _080E6154: b _080E624C .align 2, 0 _080E6164: .4byte gUnknown_0202E8CE -_080E6168: .4byte gUnknown_02028280 +_080E6168: .4byte gSaveBlock1 + 0x2B4C _080E616C: ldr r0, _080E6194 movs r2, 0 @@ -220325,7 +220325,7 @@ _080E617C: adds r1, r6, 0 b _080E627A .align 2, 0 -_080E6194: .4byte gUnknown_020284C8 +_080E6194: .4byte gSaveBlock1 + 0x2D94 _080E6198: .4byte sub_80546B8 _080E619C: ldr r0, _080E61B0 @@ -220340,7 +220340,7 @@ _080E619C: b _080E6276 .align 2, 0 _080E61B0: .4byte gUnknown_0202E8CE -_080E61B4: .4byte gUnknown_02027E70 +_080E61B4: .4byte gSaveBlock1 + 0x273C _080E61B8: .4byte gUnknown_0202E8D0 _080E61BC: ldr r0, _080E61D4 @@ -220357,7 +220357,7 @@ _080E61BC: b _080E624A .align 2, 0 _080E61D4: .4byte gUnknown_0202E8CE -_080E61D8: .4byte gUnknown_02027E88 +_080E61D8: .4byte gSaveBlock1 + 0x2754 _080E61DC: .4byte gUnknown_0202E8D0 _080E61E0: ldr r0, _080E61F4 @@ -220371,7 +220371,7 @@ _080E61E0: b _080E6276 .align 2, 0 _080E61F4: .4byte gUnknown_0202E8CE -_080E61F8: .4byte gUnknown_02027E6E +_080E61F8: .4byte gSaveBlock1 + 0x273A _080E61FC: movs r1, 0 b _080E624C @@ -220382,7 +220382,7 @@ _080E6200: strh r0, [r1] b _080E624A .align 2, 0 -_080E620C: .4byte gUnknown_0202824A +_080E620C: .4byte gSaveBlock1 + 0x2B16 _080E6210: .4byte 0x0000ffff _080E6214: ldr r0, _080E6230 @@ -220400,7 +220400,7 @@ _080E6214: b _080E6276 .align 2, 0 _080E6230: .4byte gUnknown_0202E8CE -_080E6234: .4byte gUnknown_02027E70 +_080E6234: .4byte gSaveBlock1 + 0x273C _080E6238: .4byte gUnknown_0202E8D0 _080E623C: ldr r0, _080E6254 @@ -220418,7 +220418,7 @@ _080E624C: b _080E627A .align 2, 0 _080E6254: .4byte gUnknown_0202E8CE -_080E6258: .4byte gUnknown_02027E84 +_080E6258: .4byte gSaveBlock1 + 0x2750 _080E625C: .4byte sub_80546B8 _080E6260: ldr r1, _080E628C @@ -221147,14 +221147,14 @@ _080E67F8: pop {r0} bx r0 .align 2, 0 -_080E680C: .4byte gUnknown_02028250 +_080E680C: .4byte gSaveBlock1 + 0x2B1C _080E6810: .4byte gUnknown_083DB7EC -_080E6814: .4byte gUnknown_0202825C +_080E6814: .4byte gSaveBlock1 + 0x2B28 _080E6818: .4byte gUnknown_083DB7F4 -_080E681C: .4byte gUnknown_02028268 +_080E681C: .4byte gSaveBlock1 + 0x2B34 _080E6820: .4byte 0x0000ffff -_080E6824: .4byte gUnknown_02028280 -_080E6828: .4byte gUnknown_020284C0 +_080E6824: .4byte gSaveBlock1 + 0x2B4C +_080E6828: .4byte gSaveBlock1 + 0x2D8C thumb_func_end sub_80E6764 thumb_func_start sub_80E682C @@ -231351,7 +231351,7 @@ _080EB6A4: ldr r1, _080EB6B0 b _080EB6CE .align 2, 0 -_080EB6B0: .4byte gUnknown_02027E70 +_080EB6B0: .4byte gSaveBlock1 + 0x273C _080EB6B4: movs r2, 0x2 lsls r0, r1, 3 @@ -231360,7 +231360,7 @@ _080EB6B4: ldr r1, _080EB6C0 b _080EB6CE .align 2, 0 -_080EB6C0: .4byte gUnknown_02027E88 +_080EB6C0: .4byte gSaveBlock1 + 0x2754 _080EB6C4: movs r2, 0x1 lsls r0, r1, 3 @@ -231390,7 +231390,7 @@ _080EB6EE: pop {r0} bx r0 .align 2, 0 -_080EB6F4: .4byte gUnknown_02027E6E +_080EB6F4: .4byte gSaveBlock1 + 0x273A _080EB6F8: .4byte 0x0000ffff thumb_func_end unref_sub_80EB684 @@ -231530,7 +231530,7 @@ _080EB7E6: movs r2, 0x2 b _080EB81C .align 2, 0 -_080EB7EC: .4byte gUnknown_02028250 +_080EB7EC: .4byte gSaveBlock1 + 0x2B1C _080EB7F0: ldr r5, _080EB80C adds r0, r5, 0 @@ -231545,12 +231545,12 @@ _080EB7F0: movs r3, 0x3 b _080EB81E .align 2, 0 -_080EB80C: .4byte gUnknown_0202825C +_080EB80C: .4byte gSaveBlock1 + 0x2B28 _080EB810: ldr r5, _080EB814 b _080EB81A .align 2, 0 -_080EB814: .4byte gUnknown_02028268 +_080EB814: .4byte gSaveBlock1 + 0x2B34 _080EB818: ldr r5, _080EB834 _080EB81A: @@ -231569,7 +231569,7 @@ _080EB82E: pop {r0} bx r0 .align 2, 0 -_080EB834: .4byte gUnknown_02028274 +_080EB834: .4byte gSaveBlock1 + 0x2B40 _080EB838: .4byte gStringVar4 thumb_func_end sub_80EB7C4 @@ -254359,7 +254359,7 @@ _080F6D0E: .align 2, 0 _080F6D44: .4byte gUnknown_083DFEC4 _080F6D48: .4byte 0x0000d158 -_080F6D4C: .4byte gUnknown_020260AE +_080F6D4C: .4byte gSaveBlock1 + 0x97A _080F6D50: .4byte gTrainerEyeTrainers _080F6D54: .4byte 0x0000cee8 _080F6D58: .4byte 0x0000ceec @@ -256034,7 +256034,7 @@ _080F7A48: pop {r0} bx r0 .align 2, 0 -_080F7A64: .4byte gUnknown_020284C8 +_080F7A64: .4byte gSaveBlock1 + 0x2D94 _080F7A68: .4byte gUnknown_083E537C thumb_func_end sub_80F7A34 @@ -256047,7 +256047,7 @@ sub_80F7A6C: @ 80F7A6C strb r2, [r0, 0x1] bx lr .align 2, 0 -_080F7A78: .4byte gUnknown_020284C8 +_080F7A78: .4byte gSaveBlock1 + 0x2D94 thumb_func_end sub_80F7A6C thumb_func_start sub_80F7A7C @@ -256067,7 +256067,7 @@ sub_80F7A88: @ 80F7A88 strb r2, [r0, 0x1] bx lr .align 2, 0 -_080F7A94: .4byte gUnknown_020284C8 +_080F7A94: .4byte gSaveBlock1 + 0x2D94 thumb_func_end sub_80F7A88 thumb_func_start sub_80F7A98 @@ -256133,7 +256133,7 @@ GetCurrentMauvilleOldMan: @ 80F7B08 ldrb r0, [r0] bx lr .align 2, 0 -_080F7B10: .4byte gUnknown_020284C8 +_080F7B10: .4byte gSaveBlock1 + 0x2D94 thumb_func_end GetCurrentMauvilleOldMan thumb_func_start sub_80F7B14 @@ -256161,7 +256161,7 @@ sub_80F7B2C: @ 80F7B2C bx lr .align 2, 0 _080F7B38: .4byte gScriptResult -_080F7B3C: .4byte gUnknown_020284C8 +_080F7B3C: .4byte gSaveBlock1 + 0x2D94 thumb_func_end sub_80F7B2C thumb_func_start sub_80F7B40 @@ -256212,7 +256212,7 @@ _080F7B78: pop {r0} bx r0 .align 2, 0 -_080F7B98: .4byte gUnknown_020284C8 +_080F7B98: .4byte gSaveBlock1 + 0x2D94 _080F7B9C: .4byte gSaveBlock2 thumb_func_end sub_80F7B40 @@ -256312,7 +256312,7 @@ _080F7C3A: pop {r0} bx r0 .align 2, 0 -_080F7C48: .4byte gUnknown_020284C8 +_080F7C48: .4byte gSaveBlock1 + 0x2D94 _080F7C4C: .4byte gUnknown_0202E8CC _080F7C50: .4byte gStringVar4 thumb_func_end sub_80F7BA0 @@ -256340,7 +256340,7 @@ sub_80F7C70: @ 80F7C70 bx lr .align 2, 0 _080F7C7C: .4byte gScriptResult -_080F7C80: .4byte gUnknown_020284C8 +_080F7C80: .4byte gSaveBlock1 + 0x2D94 thumb_func_end sub_80F7C70 thumb_func_start sub_80F7C84 @@ -256350,7 +256350,7 @@ sub_80F7C84: @ 80F7C84 strb r0, [r1, 0x1] bx lr .align 2, 0 -_080F7C8C: .4byte gUnknown_020284C8 +_080F7C8C: .4byte gSaveBlock1 + 0x2D94 thumb_func_end sub_80F7C84 thumb_func_start sub_80F7C90 @@ -256395,7 +256395,7 @@ sub_80F7CC8: @ 80F7CC8 strb r0, [r2, 0x1] b _080F7CEA .align 2, 0 -_080F7CDC: .4byte gUnknown_020284C8 +_080F7CDC: .4byte gSaveBlock1 + 0x2D94 _080F7CE0: .4byte gScriptResult _080F7CE4: ldr r1, _080F7CF0 @@ -256452,7 +256452,7 @@ _080F7D02: bl StringCopy b _080F7D88 .align 2, 0 -_080F7D50: .4byte gUnknown_020284C8 +_080F7D50: .4byte gSaveBlock1 + 0x2D94 _080F7D54: .4byte 0x0000ffff _080F7D58: .4byte gStringVar4 _080F7D5C: .4byte gOtherText_Is @@ -256602,7 +256602,7 @@ _080F7E56: b _080F7EE2 .align 2, 0 _080F7E84: .4byte gUnknown_083E53C8 -_080F7E88: .4byte gUnknown_020284C8 +_080F7E88: .4byte gSaveBlock1 + 0x2D94 _080F7E8C: .4byte 0x0000ffff _080F7E90: bl Random @@ -256670,7 +256670,7 @@ sub_80F7EFC: @ 80F7EFC strb r1, [r0] bx lr .align 2, 0 -_080F7F08: .4byte gUnknown_020284C8 +_080F7F08: .4byte gSaveBlock1 + 0x2D94 thumb_func_end sub_80F7EFC thumb_func_start sub_80F7F0C @@ -256680,7 +256680,7 @@ sub_80F7F0C: @ 80F7F0C strb r0, [r1, 0x1] bx lr .align 2, 0 -_080F7F14: .4byte gUnknown_020284C8 +_080F7F14: .4byte gSaveBlock1 + 0x2D94 thumb_func_end sub_80F7F0C thumb_func_start sub_80F7F18 @@ -256833,7 +256833,7 @@ _080F8016: strh r0, [r6, 0x4] b _080F817A .align 2, 0 -_080F8034: .4byte gUnknown_020284C8 +_080F8034: .4byte gSaveBlock1 + 0x2D94 _080F8038: .4byte gUnknown_0202E8CC _080F803C: .4byte 0x0000ffff _080F8040: @@ -257089,7 +257089,7 @@ _080F8228: ldr r6, _080F824C b _080F825A .align 2, 0 -_080F8240: .4byte gUnknown_020284C8 +_080F8240: .4byte gSaveBlock1 + 0x2D94 _080F8244: .4byte gStringVar4 _080F8248: .4byte gUnknown_03005DA0 _080F824C: .4byte gUnknown_020388BC @@ -257346,7 +257346,7 @@ _080F840C: pop {r0} bx r0 .align 2, 0 -_080F8424: .4byte gUnknown_020284C8 +_080F8424: .4byte gSaveBlock1 + 0x2D94 thumb_func_end sub_80F83F8 thumb_func_start sub_80F8428 @@ -257358,7 +257358,7 @@ sub_80F8428: @ 80F8428 strb r2, [r0, 0x1] bx lr .align 2, 0 -_080F8434: .4byte gUnknown_020284C8 +_080F8434: .4byte gSaveBlock1 + 0x2D94 thumb_func_end sub_80F8428 thumb_func_start sub_80F8438 @@ -257453,7 +257453,7 @@ _080F84BC: pop {r1} bx r1 .align 2, 0 -_080F84C4: .4byte gUnknown_020284C8 +_080F84C4: .4byte gSaveBlock1 + 0x2D94 thumb_func_end sub_80F849C thumb_func_start sub_80F84C8 @@ -257474,7 +257474,7 @@ sub_80F84C8: @ 80F84C8 adds r0, r2, 0 bx lr .align 2, 0 -_080F84E8: .4byte gUnknown_020284EC +_080F84E8: .4byte gSaveBlock1 + 0x2DB8 thumb_func_end sub_80F84C8 thumb_func_start sub_80F84EC @@ -257491,7 +257491,7 @@ sub_80F84EC: @ 80F84EC strb r1, [r0, 0x3] bx lr .align 2, 0 -_080F8504: .4byte gUnknown_020284EC +_080F8504: .4byte gSaveBlock1 + 0x2DB8 thumb_func_end sub_80F84EC thumb_func_start sub_80F8508 @@ -257511,7 +257511,7 @@ sub_80F8508: @ 80F8508 movs r0, 0 b _080F852E .align 2, 0 -_080F8528: .4byte gUnknown_020284C8 +_080F8528: .4byte gSaveBlock1 + 0x2D94 _080F852C: movs r0, 0x1 _080F852E: @@ -257540,7 +257540,7 @@ sub_80F8534: @ 80F8534 pop {r0} bx r0 .align 2, 0 -_080F855C: .4byte gUnknown_020284D0 +_080F855C: .4byte gSaveBlock1 + 0x2D9C thumb_func_end sub_80F8534 thumb_func_start sub_80F8560 @@ -257568,7 +257568,7 @@ sub_80F8560: @ 80F8560 pop {r0} bx r0 .align 2, 0 -_080F8594: .4byte gUnknown_020284D0 +_080F8594: .4byte gSaveBlock1 + 0x2D9C thumb_func_end sub_80F8560 thumb_func_start sub_80F8598 @@ -257608,7 +257608,7 @@ sub_80F8598: @ 80F8598 pop {r0} bx r0 .align 2, 0 -_080F85EC: .4byte gUnknown_020284C8 +_080F85EC: .4byte gSaveBlock1 + 0x2D94 _080F85F0: .4byte gSaveBlock2 _080F85F4: .4byte gStringVar1 _080F85F8: .4byte gStringVar2 @@ -257729,8 +257729,8 @@ _080F86AC: .align 2, 0 _080F86D4: .4byte gUnknown_083E5620 _080F86D8: .4byte gUnknown_083E53E0 -_080F86DC: .4byte gUnknown_020284C8 -_080F86E0: .4byte gUnknown_020284CC +_080F86DC: .4byte gSaveBlock1 + 0x2D94 +_080F86E0: .4byte gSaveBlock1 + 0x2D98 _080F86E4: adds r5, 0x1 cmp r5, 0x23 @@ -257780,7 +257780,7 @@ sub_80F8700: @ 80F8700 pop {r0} bx r0 .align 2, 0 -_080F8748: .4byte gUnknown_020284C8 +_080F8748: .4byte gSaveBlock1 + 0x2D94 _080F874C: .4byte gStringVar1 _080F8750: .4byte gStringVar2 _080F8754: .4byte gStringVar3 @@ -257836,7 +257836,7 @@ _080F87A4: pop {r0} bx r0 .align 2, 0 -_080F87BC: .4byte gUnknown_020284C8 +_080F87BC: .4byte gSaveBlock1 + 0x2D94 _080F87C0: .4byte gPCText_Cancel thumb_func_end sub_80F8758 @@ -257975,7 +257975,7 @@ sub_80F88AC: @ 80F88AC movs r0, 0 b _080F88DA .align 2, 0 -_080F88C8: .4byte gUnknown_020284C8 +_080F88C8: .4byte gSaveBlock1 + 0x2D94 _080F88CC: .4byte gUnknown_03000748 _080F88D0: ldrb r0, [r5] @@ -257998,7 +257998,7 @@ sub_80F88E0: @ 80F88E0 movs r0, 0x1 b _080F88F6 .align 2, 0 -_080F88F0: .4byte gUnknown_020284C8 +_080F88F0: .4byte gSaveBlock1 + 0x2D94 _080F88F4: movs r0, 0 _080F88F6: @@ -261272,7 +261272,7 @@ _080FA1C2: .align 2, 0 _080FA214: .4byte 0x00002dda _080FA218: .4byte 0x00002dd5 -_080FA21C: .4byte gUnknown_02028508 +_080FA21C: .4byte gSaveBlock1 + 0x2DD4 thumb_func_end sub_80FA17C thumb_func_start sub_80FA220 @@ -261333,7 +261333,7 @@ _080FA24A: orrs r0, r6 b _080FA334 .align 2, 0 -_080FA28C: .4byte gUnknown_02028508 +_080FA28C: .4byte gSaveBlock1 + 0x2DD4 _080FA290: lsrs r0, r3, 25 subs r2, r0 @@ -261442,7 +261442,7 @@ _080FA34E: pop {r0} bx r0 .align 2, 0 -_080FA360: .4byte gUnknown_02028508 +_080FA360: .4byte gSaveBlock1 + 0x2DD4 thumb_func_end sub_80FA220 thumb_func_start sub_80FA364 @@ -261553,7 +261553,7 @@ _080FA428: movs r0, 0x1 b _080FA464 .align 2, 0 -_080FA444: .4byte gUnknown_02028508 +_080FA444: .4byte gSaveBlock1 + 0x2DD4 _080FA448: .4byte 0xffffd22c _080FA44C: .4byte 0x00002dd4 _080FA450: @@ -261754,7 +261754,7 @@ _080FA59A: bx r0 .align 2, 0 _080FA5B4: .4byte 0x02007900 -_080FA5B8: .4byte gUnknown_02028508 +_080FA5B8: .4byte gSaveBlock1 + 0x2DD4 thumb_func_end sub_80FA4E4 thumb_func_start sub_80FA5BC @@ -261774,7 +261774,7 @@ sub_80FA5BC: @ 80FA5BC bx r0 .align 2, 0 _080FA5D8: .4byte gUnknown_0202E8CC -_080FA5DC: .4byte gUnknown_02028508 +_080FA5DC: .4byte gSaveBlock1 + 0x2DD4 _080FA5E0: .4byte gStringVar1 thumb_func_end sub_80FA5BC @@ -262045,7 +262045,7 @@ _080FA7CE: movs r0, 0x1 b _080FA7F4 .align 2, 0 -_080FA7E4: .4byte gUnknown_0202850C +_080FA7E4: .4byte gSaveBlock1 + 0x2DD8 _080FA7E8: adds r0, r4, 0x1 lsls r0, 16 @@ -263746,7 +263746,7 @@ _080FB464: .align 2, 0 _080FB48C: .4byte gUnknown_020388CC _080FB490: .4byte gMapHeader -_080FB494: .4byte gUnknown_02025758 +_080FB494: .4byte gSaveBlock1 + 0x24 _080FB498: ldr r4, _080FB548 movs r0, 0 @@ -263838,7 +263838,7 @@ _080FB53A: beq _080FB55E b _080FB5BE .align 2, 0 -_080FB548: .4byte gUnknown_02025748 +_080FB548: .4byte gSaveBlock1 + 0x14 _080FB54C: .4byte gUnknown_020388CC _080FB550: .4byte gRegionMapLocations _080FB554: @@ -269732,7 +269732,7 @@ sub_80FE264: @ 80FE264 bx r0 .align 2, 0 _080FE284: .4byte 0x0201f000 -_080FE288: .4byte gUnknown_0202714E +_080FE288: .4byte gSaveBlock1 + 0x1A1A thumb_func_end sub_80FE264 thumb_func_start sub_80FE28C @@ -269754,7 +269754,7 @@ sub_80FE28C: @ 80FE28C bx r0 .align 2, 0 _080FE2AC: .4byte 0x0201f000 -_080FE2B0: .4byte gUnknown_02027DBC +_080FE2B0: .4byte gSaveBlock1 + 0x2688 thumb_func_end sub_80FE28C thumb_func_start sub_80FE2B4 @@ -271202,7 +271202,7 @@ _080FEE1E: .align 2, 0 _080FEE30: .4byte gUnknown_020388D6 _080FEE34: .4byte gUnknown_020388E6 -_080FEE38: .4byte gUnknown_0202714E +_080FEE38: .4byte gSaveBlock1 + 0x1A1A _080FEE3C: .4byte gUnknown_08402E40 _080FEE40: .4byte gUnknown_020388F6 _080FEE44: .4byte gUnknown_020388D0 @@ -294034,7 +294034,7 @@ _081099AC: pop {r0} bx r0 .align 2, 0 -_081099C8: .4byte gUnknown_020284C8 +_081099C8: .4byte gSaveBlock1 + 0x2D94 thumb_func_end sub_810993C thumb_func_start sub_81099CC @@ -294074,7 +294074,7 @@ _081099E0: pop {r0} bx r0 .align 2, 0 -_08109A14: .4byte gUnknown_020284C8 +_08109A14: .4byte gSaveBlock1 + 0x2D94 _08109A18: .4byte gUnknown_083F62D8 _08109A1C: .4byte gTraderDecorations thumb_func_end sub_81099CC @@ -294087,7 +294087,7 @@ sub_8109A20: @ 8109A20 strb r1, [r0] bx lr .align 2, 0 -_08109A2C: .4byte gUnknown_020284C8 +_08109A2C: .4byte gSaveBlock1 + 0x2D94 thumb_func_end sub_8109A20 thumb_func_start sub_8109A30 @@ -294164,7 +294164,7 @@ _08109A98: bl MenuPrint b _08109AD8 .align 2, 0 -_08109AB8: .4byte gUnknown_020284C8 +_08109AB8: .4byte gSaveBlock1 + 0x2D94 _08109ABC: .4byte gOtherText_FiveQuestionsAndSlash _08109AC0: ldrb r0, [r1] @@ -294281,7 +294281,7 @@ sub_8109B7C: @ 8109B7C bl MoveMenuCursor b _08109C3E .align 2, 0 -_08109BA4: .4byte gUnknown_020284C8 +_08109BA4: .4byte gSaveBlock1 + 0x2D94 _08109BA8: .4byte gMain _08109BAC: movs r0, 0x80 @@ -294363,7 +294363,7 @@ sub_8109C44: @ 8109C44 strh r0, [r1] bx lr .align 2, 0 -_08109C50: .4byte gUnknown_020284C8 +_08109C50: .4byte gSaveBlock1 + 0x2D94 _08109C54: .4byte gScriptResult thumb_func_end sub_8109C44 @@ -294586,7 +294586,7 @@ sub_8109DE0: @ 8109DE0 pop {r0} bx r0 .align 2, 0 -_08109E20: .4byte gUnknown_020284C8 +_08109E20: .4byte gSaveBlock1 + 0x2D94 _08109E24: .4byte gUnknown_0202E8D0 _08109E28: .4byte gUnknown_0202E8CC _08109E2C: .4byte gUnknown_0202E8CE @@ -298371,7 +298371,7 @@ _0810BC6C: bx r0 .align 2, 0 _0810BC7C: .4byte gUnknown_083F7EB8 -_0810BC80: .4byte gUnknown_02025F2C +_0810BC80: .4byte gSaveBlock1 + 0x7F8 thumb_func_end sub_810BB88 thumb_func_start sub_810BC84 @@ -298445,7 +298445,7 @@ _0810BCE8: bx r0 .align 2, 0 _0810BD00: .4byte gSaveBlock1 -_0810BD04: .4byte gUnknown_02025F2C +_0810BD04: .4byte gSaveBlock1 + 0x7F8 thumb_func_end sub_810BC98 thumb_func_start sub_810BD08 @@ -298654,7 +298654,7 @@ _0810BE30: _0810BE94: .4byte gBG2TilemapBuffer _0810BE98: .4byte 0x000001a1 _0810BE9C: .4byte gUnknown_02039248 -_0810BEA0: .4byte gUnknown_02025F2C +_0810BEA0: .4byte gSaveBlock1 + 0x7F8 _0810BEA4: lsls r0, r5, 1 adds r0, r7 @@ -298712,7 +298712,7 @@ _0810BECC: _0810BF10: .4byte gWindowConfig_81E6E34 _0810BF14: .4byte gUnknown_02039248 _0810BF18: .4byte gStringVar1 -_0810BF1C: .4byte gUnknown_02025F2C +_0810BF1C: .4byte gSaveBlock1 + 0x7F8 _0810BF20: movs r0, 0xB movs r1, 0x11 @@ -299443,7 +299443,7 @@ _0810C4F0: .align 2, 0 _0810C4F8: .4byte gPaletteFade _0810C4FC: .4byte word_203855E -_0810C500: .4byte gUnknown_02025F2C +_0810C500: .4byte gSaveBlock1 + 0x7F8 _0810C504: .4byte sub_810B96C thumb_func_end sub_810C4C4 @@ -299843,7 +299843,7 @@ _0810C808: .align 2, 0 _0810C834: .4byte gEnemyParty _0810C838: .4byte word_203855E -_0810C83C: .4byte gUnknown_02025F2C +_0810C83C: .4byte gSaveBlock1 + 0x7F8 _0810C840: .4byte gUnknown_030041C0 _0810C844: .4byte gUnknown_083F7EB8 _0810C848: .4byte 0xfffff808 @@ -306575,7 +306575,7 @@ _0810FBA8: strh r0, [r7] b _0810FC00 .align 2, 0 -_0810FBD8: .4byte gUnknown_02026AF6 +_0810FBD8: .4byte gSaveBlock1 + 0x13C2 _0810FBDC: .4byte gUnknown_083F8408 _0810FBE0: adds r0, r5, 0x1 @@ -306681,7 +306681,7 @@ _0810FC94: pop {r1} bx r1 .align 2, 0 -_0810FCA0: .4byte gUnknown_02026AF6 +_0810FCA0: .4byte gSaveBlock1 + 0x13C2 _0810FCA4: .4byte gUnknown_083F8410 _0810FCA8: .4byte gSaveBlock1 _0810FCAC: .4byte 0x000013c2 @@ -306717,7 +306717,7 @@ _0810FCD0: pop {r1} bx r1 .align 2, 0 -_0810FCE4: .4byte gUnknown_02026AF6 +_0810FCE4: .4byte gSaveBlock1 + 0x13C2 thumb_func_end sub_810FCB0 thumb_func_start sub_810FCE8 @@ -306877,7 +306877,7 @@ _0810FE0C: pop {r0} bx r0 .align 2, 0 -_0810FE18: .4byte gUnknown_020287EC +_0810FE18: .4byte gSaveBlock1 + 0x30B8 thumb_func_end sub_810FDAC thumb_func_start sub_810FE1C @@ -307402,7 +307402,7 @@ GameFreakRTC_Reset: @ 81101EC pop {r0} bx r0 .align 2, 0 -_081101F8: .4byte gUnknown_020287EC +_081101F8: .4byte gSaveBlock1 + 0x30B8 thumb_func_end GameFreakRTC_Reset thumb_func_start sub_81101FC @@ -307520,7 +307520,7 @@ sub_8110290: @ 8110290 pop {r0} bx r0 .align 2, 0 -_081102D4: .4byte gUnknown_020287EC +_081102D4: .4byte gSaveBlock1 + 0x30B8 _081102D8: .4byte gUnknown_0202FFF0 _081102DC: .4byte gUnknown_02024D26 _081102E0: .4byte gLinkPlayers @@ -307717,7 +307717,7 @@ _08110468: bx r0 .align 2, 0 _08110488: .4byte gOtherText_BattleResults -_0811048C: .4byte gUnknown_020287EC +_0811048C: .4byte gSaveBlock1 + 0x30B8 _08110490: .4byte gOtherText_WinLoseDraw thumb_func_end sub_811043C @@ -307739,7 +307739,7 @@ sub_8110494: @ 8110494 ldr r0, [r0] mov pc, r0 .align 2, 0 -_081104B4: .4byte gUnknown_02024F4C +_081104B4: .4byte gSaveBlock2 + 0xA8 _081104B8: .4byte 0x000004ae _081104BC: .4byte _081104C0 .align 2, 0 @@ -307824,7 +307824,7 @@ sub_8110538: @ 8110538 pop {r0} bx r0 .align 2, 0 -_08110564: .4byte gUnknown_02024F4C +_08110564: .4byte gSaveBlock2 + 0xA8 _08110568: .4byte gOtherText_Record thumb_func_end sub_8110538 @@ -308472,7 +308472,7 @@ _08110A44: b _08110A8C .align 2, 0 _08110A7C: .4byte 0x02000000 -_08110A80: .4byte gUnknown_02028878 +_08110A80: .4byte gSaveBlock1 + 0x3144 _08110A84: movs r1, 0x88 lsls r1, 1 @@ -351646,7 +351646,7 @@ _08126270: pop {r1} bx r1 .align 2, 0 -_08126284: .4byte gUnknown_020291B4 +_08126284: .4byte gSaveBlock1 + 0x3A80 thumb_func_end sub_8126268 thumb_func_start sub_8126288 @@ -351674,7 +351674,7 @@ _081262B0: movs r0, 0 b _081262BA .align 2, 0 -_081262B4: .4byte gUnknown_020291B4 +_081262B4: .4byte gSaveBlock1 + 0x3A80 _081262B8: movs r0, 0x1 _081262BA: @@ -351698,7 +351698,7 @@ sub_81262C0: @ 81262C0 pop {r0} bx r0 .align 2, 0 -_081262DC: .4byte gUnknown_020291B0 +_081262DC: .4byte gSaveBlock1 + 0x3A7C _081262E0: .4byte 0x01000008 thumb_func_end sub_81262C0 @@ -351759,7 +351759,7 @@ sub_8126338: @ 8126338 movs r0, 0 b _0812636E .align 2, 0 -_0812634C: .4byte gUnknown_020291B4 +_0812634C: .4byte gSaveBlock1 + 0x3A80 _08126350: ldrh r5, [r4, 0x2] ldrb r0, [r4, 0x1] @@ -351930,7 +351930,7 @@ sub_8126438: @ 8126438 b _081264B8 .align 2, 0 _08126484: .4byte gStringVar1 -_08126488: .4byte gUnknown_02028894 +_08126488: .4byte gSaveBlock1 + 0x3160 _0812648C: .4byte gStringVar2 _08126490: .4byte gStringVar4 _08126494: .4byte gOtherText_BerryObtainedDadHasIt @@ -352261,7 +352261,7 @@ sub_8126714: @ 8126714 pop {r1} bx r1 .align 2, 0 -_08126748: .4byte gUnknown_0202533C +_08126748: .4byte gSaveBlock2 + 0x498 _0812674C: .4byte gStringVar4 _08126750: .4byte gOtherText_NewTrainerInHoenn thumb_func_end sub_8126714 @@ -380928,7 +380928,7 @@ sub_81341F8: @ 81341F8 pop {r0} bx r0 .align 2, 0 -_08134208: .4byte gUnknown_02028878 +_08134208: .4byte gSaveBlock1 + 0x3144 thumb_func_end sub_81341F8 thumb_func_start sub_813420C @@ -381054,7 +381054,7 @@ _081342FC: .4byte gEnemyParty .ifdef SAPPHIRE _sub_8134240_Latias: .4byte 407 .endif -_08134300: .4byte gUnknown_02028878 +_08134300: .4byte gSaveBlock1 + 0x3144 _08134304: .4byte gUnknown_02039302 _08134308: .4byte gUnknown_08402E80 thumb_func_end sub_8134240 @@ -381125,7 +381125,7 @@ _08134380: pop {r0} bx r0 .align 2, 0 -_08134388: .4byte gUnknown_02028878 +_08134388: .4byte gSaveBlock1 + 0x3144 _0813438C: .4byte gUnknown_02039302 _08134390: .4byte gUnknown_08402E80 thumb_func_end sub_8134348 @@ -381185,7 +381185,7 @@ _081343F4: strb r1, [r7, 0x1] b _08134416 .align 2, 0 -_081343FC: .4byte gUnknown_02028878 +_081343FC: .4byte gSaveBlock1 + 0x3144 _08134400: .4byte gUnknown_02039302 _08134404: .4byte gUnknown_08402E80 _08134408: .4byte gUnknown_020392FC @@ -381222,7 +381222,7 @@ sub_813441C: @ 813441C movs r0, 0x1 b _0813444A .align 2, 0 -_08134440: .4byte gUnknown_02028878 +_08134440: .4byte gSaveBlock1 + 0x3144 _08134444: .4byte gUnknown_02039302 _08134448: movs r0, 0 @@ -381285,7 +381285,7 @@ sub_8134450: @ 8134450 bx r0 .align 2, 0 _081344C4: .4byte gEnemyParty -_081344C8: .4byte gUnknown_02028878 +_081344C8: .4byte gSaveBlock1 + 0x3144 thumb_func_end sub_8134450 thumb_func_start sub_81344CC @@ -381335,7 +381335,7 @@ sub_8134504: @ 8134504 pop {r0} bx r0 .align 2, 0 -_08134528: .4byte gUnknown_02028878 +_08134528: .4byte gSaveBlock1 + 0x3144 thumb_func_end sub_8134504 thumb_func_start sub_813452C @@ -381345,7 +381345,7 @@ sub_813452C: @ 813452C strb r0, [r1, 0x13] bx lr .align 2, 0 -_08134534: .4byte gUnknown_02028878 +_08134534: .4byte gSaveBlock1 + 0x3144 thumb_func_end sub_813452C thumb_func_start sub_8134538 @@ -381678,9 +381678,9 @@ _081347A4: movs r0, 0 b _081347E0 .align 2, 0 -_081347B4: .4byte gUnknown_02024FF0 +_081347B4: .4byte gSaveBlock2 + 0x14C _081347B8: .4byte gSaveBlock2 -_081347BC: .4byte gUnknown_02025090 +_081347BC: .4byte gSaveBlock2 + 0x1EC _081347C0: bl Random ldr r4, _081347F0 @@ -382146,8 +382146,8 @@ _08134B32: b _08134B54 .align 2, 0 _08134B3C: .4byte gSaveBlock2 -_08134B40: .4byte gUnknown_02024FFC -_08134B44: .4byte gUnknown_02024FF4 +_08134B40: .4byte gSaveBlock2 + 0x158 +_08134B44: .4byte gSaveBlock2 + 0x150 _08134B48: adds r6, 0x1 cmp r6, 0x6 @@ -382599,7 +382599,7 @@ _08134E78: b _08135082 .align 2, 0 _08134E94: .4byte gEnemyParty -_08134E98: .4byte gUnknown_02025370 +_08134E98: .4byte gSaveBlock2 + 0x4CC _08134E9C: movs r6, 0 adds r4, r1, 0 @@ -383416,7 +383416,7 @@ _081354EA: ble _081354EA b _08135520 .align 2, 0 -_08135514: .4byte gUnknown_0202596C +_08135514: .4byte gSaveBlock1 + 0x238 _08135518: .4byte gPlayerParty _0813551C: bl sub_81360D0 @@ -383524,7 +383524,7 @@ _081355D6: b _08135648 .align 2, 0 _081355F4: .4byte gPlayerParty -_081355F8: .4byte gUnknown_0202596C +_081355F8: .4byte gSaveBlock1 + 0x238 _081355FC: .4byte sub_8135534 _08135600: bl ZeroEnemyPartyMons @@ -383565,7 +383565,7 @@ _08135648: bx r0 .align 2, 0 _08135650: .4byte gEnemyParty -_08135654: .4byte gUnknown_02025370 +_08135654: .4byte gSaveBlock2 + 0x4CC _08135658: .4byte gUnknown_020239F8 _0813565C: .4byte 0x00000808 _08135660: .4byte word_202FF5E @@ -383689,7 +383689,7 @@ _0813575A: ble _0813575A b _0813589A .align 2, 0 -_0813576C: .4byte gUnknown_02025409 +_0813576C: .4byte gSaveBlock2 + 0x565 _08135770: .4byte gUnknown_02039270 _08135774: ldr r3, _081357C0 @@ -384035,7 +384035,7 @@ _08135A1C: bx r0 .align 2, 0 _08135A34: .4byte gUnknown_02039270 -_08135A38: .4byte gUnknown_02025409 +_08135A38: .4byte gSaveBlock2 + 0x565 thumb_func_end sub_8135A14 thumb_func_start sub_8135A3C @@ -384133,7 +384133,7 @@ sub_8135AC4: @ 8135AC4 movs r1, 0x14 b _08135B0E .align 2, 0 -_08135AF0: .4byte gUnknown_02024F4C +_08135AF0: .4byte gSaveBlock2 + 0xA8 _08135AF4: .4byte 0x000004ac _08135AF8: .4byte gUnknown_08405E7E _08135AFC: @@ -384203,12 +384203,12 @@ _08135B56: bx r0 .align 2, 0 _08135B84: .4byte gUnknown_08405E60 -_08135B88: .4byte gUnknown_02024EAE +_08135B88: .4byte gSaveBlock2 + 0xA _08135B8C: .4byte gSaveBlock1 _08135B90: .4byte 0x00002b28 -_08135B94: .4byte gUnknown_02025409 +_08135B94: .4byte gSaveBlock2 + 0x565 _08135B98: .4byte gUnknown_030042FC -_08135B9C: .4byte gUnknown_02024F4C +_08135B9C: .4byte gSaveBlock2 + 0xA8 thumb_func_end sub_8135AC4 thumb_func_start sub_8135BA0 @@ -384357,7 +384357,7 @@ _08135CAA: pop {r0} bx r0 .align 2, 0 -_08135CBC: .4byte gUnknown_02024F4C +_08135CBC: .4byte gSaveBlock2 + 0xA8 _08135CC0: .4byte gSaveBlock2 thumb_func_end sub_8135C44 @@ -384427,7 +384427,7 @@ _08135D1E: pop {r0} bx r0 .align 2, 0 -_08135D34: .4byte gUnknown_02025328 +_08135D34: .4byte gSaveBlock2 + 0x484 _08135D38: .4byte gBattleMons thumb_func_end sub_8135CFC @@ -384663,7 +384663,7 @@ unref_sub_8135EE8: @ 8135EE8 movs r1, 0x14 b _08135F2A .align 2, 0 -_08135F0C: .4byte gUnknown_0202533C +_08135F0C: .4byte gSaveBlock2 + 0x498 _08135F10: .4byte 0xfffffb68 _08135F14: .4byte gUnknown_08405E7E _08135F18: @@ -384738,7 +384738,7 @@ _08135F80: bx r0 .align 2, 0 _08135FA8: .4byte gUnknown_08405E60 -_08135FAC: .4byte gUnknown_02024EAE +_08135FAC: .4byte gSaveBlock2 + 0xA _08135FB0: .4byte gSaveBlock1 _08135FB4: .4byte 0x00002b28 _08135FB8: .4byte gPlayerParty @@ -384797,7 +384797,7 @@ _08135FFC: pop {r0} bx r0 .align 2, 0 -_08136018: .4byte gUnknown_02025340 +_08136018: .4byte gSaveBlock2 + 0x49C thumb_func_end sub_8135FF4 thumb_func_start sub_813601C @@ -384824,7 +384824,7 @@ _0813602E: b _08136078 .align 2, 0 _08136044: .4byte gScriptResult -_08136048: .4byte gUnknown_0202533C +_08136048: .4byte gSaveBlock2 + 0x498 _0813604C: movs r3, 0 movs r2, 0 @@ -384901,7 +384901,7 @@ sub_81360C0: @ 81360C0 pop {r0} bx r0 .align 2, 0 -_081360CC: .4byte gUnknown_0202534C +_081360CC: .4byte gSaveBlock2 + 0x4A8 thumb_func_end sub_81360C0 thumb_func_start sub_81360D0 @@ -384925,7 +384925,7 @@ _081360EC: bl sub_813545C b _08136102 .align 2, 0 -_081360F8: .4byte gUnknown_02025364 +_081360F8: .4byte gSaveBlock2 + 0x4C0 _081360FC: ldr r0, _08136108 bl sub_813545C @@ -384933,7 +384933,7 @@ _08136102: pop {r0} bx r0 .align 2, 0 -_08136108: .4byte gUnknown_02025358 +_08136108: .4byte gSaveBlock2 + 0x4B4 thumb_func_end sub_81360D0 thumb_func_start sub_813610C @@ -384955,7 +384955,7 @@ _0813611E: pop {r0} bx r0 .align 2, 0 -_0813612C: .4byte gUnknown_020253FA +_0813612C: .4byte gSaveBlock2 + 0x556 thumb_func_end sub_813610C thumb_func_start sub_8136130 @@ -392222,7 +392222,7 @@ _08139C64: pop {r0} bx r0 .align 2, 0 -_08139C6C: .4byte gUnknown_02025BCC +_08139C6C: .4byte gSaveBlock1 + 0x498 _08139C70: .4byte gUnknown_084062F0 thumb_func_end sub_8139C18 @@ -394243,7 +394243,7 @@ _0813AC78: bl sub_813AB64 b _0813ACBA .align 2, 0 -_0813AC8C: .4byte gUnknown_02025BCC +_0813AC8C: .4byte gSaveBlock1 + 0x498 _0813AC90: ldr r0, _0813ACA4 adds r0, r4, r0 @@ -394255,7 +394255,7 @@ _0813AC90: bl sub_813AB90 b _0813ACBA .align 2, 0 -_0813ACA4: .4byte gUnknown_02025BCC +_0813ACA4: .4byte gSaveBlock1 + 0x498 _0813ACA8: ldr r0, _0813AD00 adds r0, r4, r0 @@ -394302,7 +394302,7 @@ _0813ACEA: bl sub_80F953C b _0813AD26 .align 2, 0 -_0813AD00: .4byte gUnknown_02025BCC +_0813AD00: .4byte gSaveBlock1 + 0x498 _0813AD04: ldr r0, _0813AD1C mov r2, r8 @@ -394784,7 +394784,7 @@ _0813B0A4: .align 2, 0 _0813B0B8: .4byte 0x0201fe00 _0813B0BC: .4byte gStringVar1 -_0813B0C0: .4byte gUnknown_0202836A +_0813B0C0: .4byte gSaveBlock1 + 0x2C36 _0813B0C4: ldr r0, _0813B0D0 movs r1, 0x15 @@ -395050,7 +395050,7 @@ sub_813B294: @ 813B294 .align 2, 0 _0813B2E8: .4byte gStringVar1 _0813B2EC: .4byte 0x0201fe00 -_0813B2F0: .4byte gUnknown_02028292 +_0813B2F0: .4byte gSaveBlock1 + 0x2B5E _0813B2F4: .4byte gStringVar4 _0813B2F8: .4byte gOtherText_WhatWillYouDoMail _0813B2FC: .4byte sub_813B348 @@ -395261,7 +395261,7 @@ _0813B488: .align 2, 0 _0813B490: .4byte gPaletteFade _0813B494: .4byte 0x0201fe00 -_0813B498: .4byte gUnknown_02028280 +_0813B498: .4byte gSaveBlock1 + 0x2B4C _0813B49C: .4byte sub_813B4F0 thumb_func_end sub_813B454 @@ -395407,7 +395407,7 @@ sub_813B578: @ 813B578 b _0813B602 .align 2, 0 _0813B5BC: .4byte 0x0201fe00 -_0813B5C0: .4byte gUnknown_02028280 +_0813B5C0: .4byte gSaveBlock1 + 0x2B4C _0813B5C4: .4byte gOtherText_BagIsFull _0813B5C8: .4byte sub_813B758 _0813B5CC: @@ -420468,7 +420468,7 @@ sub_8147C90: @ 8147C90 pop {r0} bx r0 .align 2, 0 -_08147CB8: .4byte gUnknown_02025F2C +_08147CB8: .4byte gSaveBlock1 + 0x7F8 _08147CBC: .4byte gUnknown_02039350 _08147CC0: .4byte gUnknown_084120A4 _08147CC4: .4byte 0x000039e2 @@ -420704,7 +420704,7 @@ sub_8147E40: @ 8147E40 _08147E94: .4byte gUnknown_02039310 _08147E98: .4byte gPlayerParty _08147E9C: .4byte word_203855E -_08147EA0: .4byte gUnknown_02025F2C +_08147EA0: .4byte gSaveBlock1 + 0x7F8 _08147EA4: .4byte gUnknown_02039312 _08147EA8: .4byte gStringVar1 _08147EAC: .4byte gStringVar2 diff --git a/asm/rom_803D1FC.s b/asm/rom_803D1FC.s index 306beb51c..59db9abff 100644 --- a/asm/rom_803D1FC.s +++ b/asm/rom_803D1FC.s @@ -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 diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s index 38a57cd9e..826e43ea1 100644 --- a/asm/rom_8040EB4.s +++ b/asm/rom_8040EB4.s @@ -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 diff --git a/asm/rom_8065394.s b/asm/rom_8065394.s index f44a05351..c8cf00cef 100644 --- a/asm/rom_8065394.s +++ b/asm/rom_8065394.s @@ -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 diff --git a/include/global.h b/include/global.h index 437f87ecb..b50aa7d2f 100644 --- a/include/global.h +++ b/include/global.h @@ -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; diff --git a/sym_ewram.txt b/sym_ewram.txt index 9fac9ab93..048e35173 100644 --- a/sym_ewram.txt +++ b/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 |