diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-09-30 03:00:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 03:00:10 -0500 |
| commit | 741c99cded03ceb2d924b52b5c44d68bc5901b17 (patch) | |
| tree | 722c09a5712e65b460268a300b0799eeef6374fc /asm/title_screen.s | |
| parent | f09a6a653c2691865314a309266d4d6d82152fdc (diff) | |
| parent | 4dad58648fe65b7df90da45972518222853b2e98 (diff) | |
Merge pull request #45 from DizzyEggg/decomp_battle4
Decompile Battle 4
Diffstat (limited to 'asm/title_screen.s')
| -rw-r--r-- | asm/title_screen.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/title_screen.s b/asm/title_screen.s index b2c0a4995..961b14210 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -468,7 +468,7 @@ title_screen_vblank_callback: @ 80AA780 bl LoadOam bl ProcessSpriteCopyRequests bl TransferPlttBuffer - ldr r0, =gUnknown_02022E1A + ldr r0, =gBattle_BG1_Y ldrh r1, [r0] movs r0, 0x16 bl SetGpuReg @@ -1156,14 +1156,14 @@ _080AAE30: ldrh r0, [r3, 0x10] adds r0, 0x1 strh r0, [r3, 0x10] - ldr r2, =gUnknown_02022E1A + ldr r2, =gBattle_BG1_Y movs r1, 0x10 ldrsh r0, [r3, r1] lsrs r1, r0, 31 adds r0, r1 asrs r0, 1 strh r0, [r2] - ldr r1, =gUnknown_02022E18 + ldr r1, =gBattle_BG1_X movs r0, 0 strh r0, [r1] _080AAE72: |