diff options
| -rw-r--r-- | engine/tilesets/map_palettes.asm | 4 | ||||
| -rw-r--r-- | home/handshake.asm | 1 | ||||
| -rw-r--r-- | home/map.asm | 10 | ||||
| -rw-r--r-- | home/palettes.asm | 8 |
4 files changed, 11 insertions, 12 deletions
diff --git a/engine/tilesets/map_palettes.asm b/engine/tilesets/map_palettes.asm index 5f943795a..c99975350 100644 --- a/engine/tilesets/map_palettes.asm +++ b/engine/tilesets/map_palettes.asm @@ -1,4 +1,4 @@ -SwapTextboxPalettes:: +_SwapTextboxPalettes:: hlcoord 0, 0 decoord 0, 0, wAttrMap ld b, SCREEN_HEIGHT @@ -44,7 +44,7 @@ SwapTextboxPalettes:: jr nz, .loop ret -ScrollBGMapPalettes:: +_ScrollBGMapPalettes:: ld hl, wBGMapBuffer ld de, wBGMapPalBuffer .loop diff --git a/home/handshake.asm b/home/handshake.asm index ee01cfadb..9747713c7 100644 --- a/home/handshake.asm +++ b/home/handshake.asm @@ -1,6 +1,5 @@ PrinterReceive:: homecall _PrinterReceive - ret AskSerial:: diff --git a/home/map.asm b/home/map.asm index 5fd2fcc27..bccc2ae1c 100644 --- a/home/map.asm +++ b/home/map.asm @@ -93,7 +93,7 @@ GetMapSceneID:: OverworldTextModeSwitch:: call LoadMapPart - call FarCallSwapTextboxPalettes + call SwapTextboxPalettes ret LoadMapPart:: @@ -1157,7 +1157,7 @@ ScrollMapUp:: ld de, wBGMapBuffer call BackupBGMapRow ld c, 2 * SCREEN_WIDTH - call FarCallScrollBGMapPalettes + call ScrollBGMapPalettes ld a, [wBGMapAnchor] ld e, a ld a, [wBGMapAnchor + 1] @@ -1172,7 +1172,7 @@ ScrollMapDown:: ld de, wBGMapBuffer call BackupBGMapRow ld c, 2 * SCREEN_WIDTH - call FarCallScrollBGMapPalettes + call ScrollBGMapPalettes ld a, [wBGMapAnchor] ld l, a ld a, [wBGMapAnchor + 1] @@ -1195,7 +1195,7 @@ ScrollMapLeft:: ld de, wBGMapBuffer call BackupBGMapColumn ld c, 2 * SCREEN_HEIGHT - call FarCallScrollBGMapPalettes + call ScrollBGMapPalettes ld a, [wBGMapAnchor] ld e, a ld a, [wBGMapAnchor + 1] @@ -1210,7 +1210,7 @@ ScrollMapRight:: ld de, wBGMapBuffer call BackupBGMapColumn ld c, 2 * SCREEN_HEIGHT - call FarCallScrollBGMapPalettes + call ScrollBGMapPalettes ld a, [wBGMapAnchor] ld e, a and %11100000 diff --git a/home/palettes.asm b/home/palettes.asm index 6391c7c27..e687e9a89 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -319,10 +319,10 @@ ReloadSpritesNoPalettes:: call DelayFrame ret -FarCallSwapTextboxPalettes:: - homecall SwapTextboxPalettes +SwapTextboxPalettes:: + homecall _SwapTextboxPalettes ret -FarCallScrollBGMapPalettes:: - homecall ScrollBGMapPalettes +ScrollBGMapPalettes:: + homecall _ScrollBGMapPalettes ret |