diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-14 16:36:53 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-14 16:36:53 +0200 |
| commit | 3037f37cc669bec7580fe2623ce2c6ea1c4ebe76 (patch) | |
| tree | 5ee0dc775f6a4b6dda46baa8852ef78dd464528e /asm/battle_transition.s | |
| parent | 943931f86f50b946145548b0bee9663724e14980 (diff) | |
| parent | a2e49c4d5c275b28b6485d404e305a98c935d022 (diff) | |
merge upstream, fix non-conflict in trade.s
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 |