diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-28 12:16:01 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-28 12:16:01 -0400 |
| commit | e9cf9fc104ceedd50330af6b22c6e896e85930e1 (patch) | |
| tree | 270d92bcacc8521c8ce8d7495591e45ff743a3ba /asm/battle_tower.s | |
| parent | a5ff9f2d00fbcc6bc73475069dcbe93eaf518c1b (diff) | |
port shedinja_maker_maybe; resolve within-array party pointers
Diffstat (limited to 'asm/battle_tower.s')
| -rw-r--r-- | asm/battle_tower.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_tower.s b/asm/battle_tower.s index eddc03f83..87f01b7fb 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -2832,7 +2832,7 @@ _080E6F68: ldrb r1, [r0] movs r0, 0x64 muls r0, r1 - ldr r1, _080E6FB4 @ =gUnknown_2024220 + ldr r1, _080E6FB4 @ =gEnemyParty + 0x1f4 adds r0, r1 movs r1, 0x2C muls r1, r4 @@ -2855,7 +2855,7 @@ _080E6FA4: .4byte gSaveBlock2Ptr _080E6FA8: .4byte gSaveBlock1Ptr _080E6FAC: .4byte 0x00002cac _080E6FB0: .4byte 0x0000056d -_080E6FB4: .4byte gUnknown_2024220 +_080E6FB4: .4byte gEnemyParty + 0x1f4 thumb_func_end sub_80E6EE0 thumb_func_start SaveBattleTowerProgress |