diff options
| author | Swastik Baranwal <swstkbaranwal@gmail.com> | 2019-06-23 18:47:35 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 18:47:35 +0530 |
| commit | 99703c6ab831d34e6859d8a8f53ba8e73dc4d3d9 (patch) | |
| tree | 3a712d3039d152616af58a45a13d82c40a87e58f /asm/battle_controllers.s | |
| parent | 6d190f861e3559eec922cd760778c0cba6e08397 (diff) | |
| parent | 9ee0c34758a63f8c00724b6fc984b4e96be2f7af (diff) | |
Merge pull request #5 from pret/master
Take files
Diffstat (limited to 'asm/battle_controllers.s')
| -rw-r--r-- | asm/battle_controllers.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_controllers.s b/asm/battle_controllers.s index 5d0921323..5337929a1 100644 --- a/asm/battle_controllers.s +++ b/asm/battle_controllers.s @@ -2176,7 +2176,7 @@ EmitPrintString: @ 800E2D4 ldr r2, _0800E3B4 @ =gUnknown_2022874 movs r0, 0x10 strb r0, [r2] - ldr r0, _0800E3B8 @ =gUnknown_2023E8A + ldr r0, _0800E3B8 @ =gBattleOutcome ldrb r0, [r0] strb r0, [r2, 0x1] strb r1, [r2, 0x2] @@ -2277,7 +2277,7 @@ _0800E378: bx r0 .align 2, 0 _0800E3B4: .4byte gUnknown_2022874 -_0800E3B8: .4byte gUnknown_2023E8A +_0800E3B8: .4byte gBattleOutcome _0800E3BC: .4byte gCurrentMove _0800E3C0: .4byte gUnknown_2023D4C _0800E3C4: .4byte gUnknown_2023D68 |