diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-15 09:19:30 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-15 09:19:30 -0500 |
| commit | f07f73e188f0ff81f313e74230d5ad055461966f (patch) | |
| tree | a6b628ac95872fbf8fedbd38b9024cb1e41a55ba /asm/battle_transition.s | |
| parent | f12a82b068bb5871bc8ee9fd4146baa89799e645 (diff) | |
| parent | a2e49c4d5c275b28b6485d404e305a98c935d022 (diff) | |
Merge branch 'master' into quest_log
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 3d56e8fbc..931c7788c 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 |