diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-17 11:05:44 -0700 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-17 11:05:44 -0700 |
| commit | aa6e1a91fc89d01ad65eb532d6832767c936807a (patch) | |
| tree | 77ea1ef0aa2dff7e70165741fcc455c8faaadfc7 /asm/battle_transition.s | |
| parent | 46e957bacd9ba5538262c89bb87e1915167bb201 (diff) | |
| parent | d05339979e39580b162e618087136bb220a4f20d (diff) | |
Merge branch 'master' into vs_seeker
Diffstat (limited to 'asm/battle_transition.s')
| -rw-r--r-- | asm/battle_transition.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 70453eb32..921482d16 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -4942,7 +4942,7 @@ sub_80D2EA4: @ 80D2EA4 adds r2, 0x2A lsls r2, 16 asrs r2, 16 - ldr r5, _080D3004 @ =gUnknown_201C000 + ldr r5, _080D3004 @ =gDecompressionBuffer str r5, [sp] movs r3, 0 bl CreateTrainerSprite @@ -5077,7 +5077,7 @@ sub_80D2EA4: @ 80D2EA4 _080D2FF8: .4byte gReservedSpritePaletteCount _080D2FFC: .4byte gUnknown_83FA494 _080D3000: .4byte gUnknown_83FA4AE -_080D3004: .4byte gUnknown_201C000 +_080D3004: .4byte gDecompressionBuffer _080D3008: .4byte gSaveBlock2Ptr _080D300C: .4byte gSprites _080D3010: .4byte sub_80D301C |