diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
| commit | 8cd4908fa3820b22a8b4e3d96780d725132549c4 (patch) | |
| tree | bcc8e697ce7dd0d4ab532a61fccafbbdb6d2400e /asm/berry_tag_screen.s | |
| parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
| parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) | |
merge bike with master, fix conflicts
Diffstat (limited to 'asm/berry_tag_screen.s')
| -rw-r--r-- | asm/berry_tag_screen.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/berry_tag_screen.s b/asm/berry_tag_screen.s index 422f5f3d6..75e50f88d 100644 --- a/asm/berry_tag_screen.s +++ b/asm/berry_tag_screen.s @@ -115,7 +115,7 @@ _08177CD8: .4byte _08177DC2 _08177D18: bl SetVBlankHBlankCallbacksToNull - bl sub_8121DA0 + bl ResetVramOamAndBgCntRegs bl clear_scheduled_bg_copies_to_vram b _08177DDC _08177D26: @@ -246,7 +246,7 @@ sub_8177E14: @ 8177E14 adds r1, r0 movs r0, 0x3 bl SetBgTilemapBuffer - bl sub_8121E10 + bl ResetAllBgsCoordinates movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x3 |