diff options
Diffstat (limited to 'asm/rom3.s')
| -rw-r--r-- | asm/rom3.s | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/asm/rom3.s b/asm/rom3.s index 918df9366..d0604fed6 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -629,7 +629,7 @@ _08009BE0: .4byte 0x04000040 _08009BE4: .4byte 0x04000048 _08009BE8: .4byte 0x00001111 _08009BEC: .4byte 0x04000052 -_08009BF0: .4byte 0x02024ea4 +_08009BF0: .4byte gSaveBlock2 _08009BF4: .4byte 0x00007e04 _08009BF8: mov r1, sp @@ -1301,7 +1301,7 @@ PrintPlayerName: @ 800A120 bx r0 .align 2, 0 _0800A13C: .4byte gUnknown_0840DF7C -_0800A140: .4byte 0x02024ea4 +_0800A140: .4byte gSaveBlock2 thumb_func_end PrintPlayerName thumb_func_start PrintPlayTime @@ -1334,7 +1334,7 @@ PrintPlayTime: @ 800A144 bx r0 .align 2, 0 _0800A180: .4byte gUnknown_0840DF8B -_0800A184: .4byte 0x02024ea4 +_0800A184: .4byte gSaveBlock2 thumb_func_end PrintPlayTime thumb_func_start PrintPokedexCount @@ -2207,7 +2207,7 @@ _0800A85A: pop {r0} bx r0 .align 2, 0 -_0800A860: .4byte 0x02024ea4 +_0800A860: .4byte gSaveBlock2 _0800A864: .4byte 0x03004b20 _0800A868: .4byte sub_800A974 _0800A86C: .4byte 0x02020004 @@ -2530,7 +2530,7 @@ _0800AAD8: bx r0 .align 2, 0 _0800AAE0: .4byte 0x0202f388 -_0800AAE4: .4byte 0x02024ea4 +_0800AAE4: .4byte gSaveBlock2 _0800AAE8: .4byte new_game_prof_birch_speech_part2_start thumb_func_end sub_800AAAC @@ -2974,7 +2974,7 @@ _0800AE54: ldrb r5, [r4, 0x1E] b _0800AE66 .align 2, 0 -_0800AE60: .4byte 0x02024ea4 +_0800AE60: .4byte gSaveBlock2 _0800AE64: ldrb r5, [r4, 0x1C] _0800AE66: @@ -3337,7 +3337,7 @@ _0800B160: .4byte 0x03004b20 _0800B164: .4byte 0x0000ffc4 _0800B168: .4byte gWindowConfig_81E6C3C _0800B16C: .4byte gWindowConfig_81E6CE4 -_0800B170: .4byte 0x02024ea4 +_0800B170: .4byte gSaveBlock2 _0800B174: strh r0, [r4, 0x14] ldrb r3, [r4, 0x1C] @@ -4154,7 +4154,7 @@ CreateNameMenu: @ 800B770 bl PrintStringArray b _0800B7D4 .align 2, 0 -_0800B7B8: .4byte 0x02024ea4 +_0800B7B8: .4byte gSaveBlock2 _0800B7BC: .4byte gUnknown_081E79C0 _0800B7C0: adds r5, 0x1 @@ -4209,7 +4209,7 @@ set_default_player_name: @ 800B808 ldr r1, _0800B820 b _0800B826 .align 2, 0 -_0800B81C: .4byte 0x02024ea4 +_0800B81C: .4byte gSaveBlock2 _0800B820: .4byte gUnknown_081E79C0 _0800B824: ldr r1, _0800B850 @@ -4237,7 +4237,7 @@ _0800B830: bx r0 .align 2, 0 _0800B850: .4byte gUnknown_081E79E8 -_0800B854: .4byte 0x02024ea4 +_0800B854: .4byte gSaveBlock2 thumb_func_end set_default_player_name thumb_func_start sub_800B858 @@ -14722,7 +14722,7 @@ _08010B04: .4byte 0x02024db8 _08010B08: .4byte 0x02024dbc _08010B0C: .4byte 0x02024c6c _08010B10: .4byte 0x020239f8 -_08010B14: .4byte 0x02024ea4 +_08010B14: .4byte gSaveBlock2 _08010B18: .4byte 0x02000000 _08010B1C: .4byte 0x00016084 _08010B20: .4byte 0x02024c0e @@ -67837,7 +67837,7 @@ _0802BA82: pop {r0} bx r0 .align 2, 0 -_0802BA88: .4byte 0x02024ea4 +_0802BA88: .4byte gSaveBlock2 _0802BA8C: .4byte 0x02024c10 thumb_func_end sub_802B9E0 @@ -70826,7 +70826,7 @@ _0802D2CC: .4byte 0x02020004 _0802D2D0: .4byte 0x02024be0 _0802D2D4: .4byte 0x02024a60 _0802D2D8: .4byte SpriteCallbackDummy -_0802D2DC: .4byte 0x02024ea4 +_0802D2DC: .4byte gSaveBlock2 thumb_func_end sub_802D274 thumb_func_start sub_802D2E0 @@ -75881,7 +75881,7 @@ _0802FBEA: pop {r0} bx r0 .align 2, 0 -_0802FCB8: .4byte 0x02024ea4 +_0802FCB8: .4byte gSaveBlock2 _0802FCBC: .4byte 0x02024a60 _0802FCC0: .4byte 0x02024e8c _0802FCC4: .4byte gTrainerBackPicCoords @@ -75981,7 +75981,7 @@ sub_802FCE0: @ 802FCE0 pop {r0} bx r0 .align 2, 0 -_0802FD94: .4byte 0x02024ea4 +_0802FD94: .4byte gSaveBlock2 _0802FD98: .4byte 0x02024a60 _0802FD9C: .4byte 0x02024e8c _0802FDA0: .4byte gTrainerBackPicCoords @@ -78009,7 +78009,7 @@ _08030E08: .4byte sub_8078B34 _08030E0C: .4byte sub_8030E38 _08030E10: .4byte 0x0000d6f8 _08030E14: .4byte gTrainerBackPicPaletteTable -_08030E18: .4byte 0x02024ea4 +_08030E18: .4byte gSaveBlock2 _08030E1C: .4byte task05_08033660 _08030E20: .4byte 0x03004b20 _08030E24: .4byte 0x02017810 @@ -97239,7 +97239,7 @@ _0803A8D4: bl PokemonSetEncryptedField b _0803AA9C .align 2, 0 -_0803AA00: .4byte 0x02024ea4 +_0803AA00: .4byte gSaveBlock2 _0803AA04: .4byte gGameLanguage _0803AA08: .4byte gBaseStats _0803AA0C: .4byte gExperienceTables @@ -103393,7 +103393,7 @@ pokemon_catch: @ 803D91C movs r5, 0 b _0803D94E .align 2, 0 -_0803D948: .4byte 0x02024ea4 +_0803D948: .4byte gSaveBlock2 _0803D94C: adds r5, 0x1 _0803D94E: @@ -109852,7 +109852,7 @@ _08040B0C: movs r0, 0 b _08040B16 .align 2, 0 -_08040B10: .4byte 0x02024ea4 +_08040B10: .4byte gSaveBlock2 _08040B14: movs r0, 0x1 _08040B16: |