diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-22 19:20:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-22 19:20:53 -0500 |
| commit | 9aaafa84871e7bcc553d3eda680415545a337eee (patch) | |
| tree | 78a208976e44452f8818305fe73e53e8b9de865e /asm | |
| parent | e194cf83d257796591e6a7a2cb88e208ac7de968 (diff) | |
| parent | 8c02668a19f45e2969c206657ec08799d4dddd3e (diff) | |
Merge pull request #263 from GriffinRichards/move-graphics
Move graphics.s to src
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_bg.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/battle_bg.s b/asm/battle_bg.s index e21617e70..4962d17dc 100644 --- a/asm/battle_bg.s +++ b/asm/battle_bg.s @@ -298,7 +298,7 @@ LoadBattleTextboxAndBackground: @ 800F420 movs r1, 0xC0 lsls r1, 19 bl LZDecompressVram - ldr r1, _0800F458 @ =gFile_graphics_interface_menu_map_tilemap + ldr r1, _0800F458 @ =gBattleTextboxTilemap movs r0, 0 movs r2, 0 movs r3, 0 @@ -315,7 +315,7 @@ LoadBattleTextboxAndBackground: @ 800F420 bx r0 .align 2, 0 _0800F454: .4byte gBattleTextboxTiles -_0800F458: .4byte gFile_graphics_interface_menu_map_tilemap +_0800F458: .4byte gBattleTextboxTilemap _0800F45C: .4byte gBattleTextboxPalette thumb_func_end LoadBattleTextboxAndBackground @@ -1393,7 +1393,7 @@ _0800FCEC: .align 2, 0 _0800FCF8: .4byte gBattleTextboxTiles _0800FCFC: - ldr r1, _0800FD10 @ =gFile_graphics_interface_menu_map_tilemap + ldr r1, _0800FD10 @ =gBattleTextboxTilemap movs r0, 0 movs r2, 0 movs r3, 0 @@ -1402,7 +1402,7 @@ _0800FCFC: bl CopyBgTilemapBufferToVram b _0800FD94 .align 2, 0 -_0800FD10: .4byte gFile_graphics_interface_menu_map_tilemap +_0800FD10: .4byte gBattleTextboxTilemap _0800FD14: ldr r0, _0800FD20 @ =gBattleTextboxPalette movs r1, 0 |