diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-03 18:21:53 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-03 19:42:56 -0500 |
| commit | 32ed487a476e01759d3d9dbc818d8566ae2c9cb7 (patch) | |
| tree | 669e90b56d36f17efff5f673235193f5298c0ceb /engine/map_palettes.asm | |
| parent | 6ff2cb20e67db2054486fc5dc48eb9263298d4ad (diff) | |
| parent | b35eb72290b964b98844afbe741bb7ede34b9ef3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# audio/engine.asm
# constants/gfx_constants.asm
# constants/map_data_constants.asm
# constants/pokemon_data_constants.asm
# constants/sprite_constants.asm
# constants/wram_constants.asm
# data/maps/data.asm
# engine/battle/ai/scoring.asm
# engine/battle/core.asm
# engine/battle/effect_commands.asm
# engine/battle/misc.asm
# engine/battle_anims/getpokeballwobble.asm
# engine/breeding.asm
# engine/buy_sell_toss.asm
# engine/decorations.asm
# engine/events/battle_tower/battle_tower.asm
# engine/events/battle_tower/rules.asm
# engine/events/buena.asm
# engine/events/bug_contest/contest_2.asm
# engine/events/daycare.asm
# engine/events/dratini.asm
# engine/events/halloffame.asm
# engine/events/happiness_egg.asm
# engine/events/kurt.asm
# engine/events/lucky_number.asm
# engine/events/magnet_train.asm
# engine/events/overworld.asm
# engine/events/pokerus/pokerus.asm
# engine/events/print_unown.asm
# engine/events/print_unown_2.asm
# engine/events/unown_walls.asm
# engine/item_effects.asm
# engine/link.asm
# engine/mon_menu.asm
# engine/player_object.asm
# engine/routines/playslowcry.asm
# engine/scripting.asm
# engine/search.asm
# engine/search2.asm
# engine/specials.asm
# engine/start_menu.asm
# engine/timeset.asm
# home/battle_vars.asm
# home/map.asm
# maps/GoldenrodUndergroundSwitchRoomEntrances.asm
# maps/IlexForest.asm
# maps/KrissHouse2F.asm
# maps/Route39Barn.asm
# mobile/mobile_12_2.asm
# mobile/mobile_40.asm
# mobile/mobile_5f.asm
# wram.asm
Diffstat (limited to 'engine/map_palettes.asm')
| -rw-r--r-- | engine/map_palettes.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engine/map_palettes.asm b/engine/map_palettes.asm index ffeef7bf6..f8e23e058 100644 --- a/engine/map_palettes.asm +++ b/engine/map_palettes.asm @@ -1,6 +1,6 @@ SwapTextboxPalettes:: ; 4c000 hlcoord 0, 0 - decoord 0, 0, AttrMap + decoord 0, 0, wAttrMap ld b, SCREEN_HEIGHT .loop push bc @@ -10,10 +10,10 @@ SwapTextboxPalettes:: ; 4c000 push hl srl a jr c, .UpperNybble - ld hl, TilesetPalettes + ld hl, wTilesetPalettes add [hl] ld l, a - ld a, [TilesetPalettes + 1] + ld a, [wTilesetPalettes + 1] adc $0 ld h, a ld a, [hl] @@ -21,10 +21,10 @@ SwapTextboxPalettes:: ; 4c000 jr .next .UpperNybble: - ld hl, TilesetPalettes + ld hl, wTilesetPalettes add [hl] ld l, a - ld a, [TilesetPalettes + 1] + ld a, [wTilesetPalettes + 1] adc $0 ld h, a ld a, [hl] @@ -45,8 +45,8 @@ SwapTextboxPalettes:: ; 4c000 ret ScrollBGMapPalettes:: ; 4c03f - ld hl, BGMapBuffer - ld de, BGMapPalBuffer + ld hl, wBGMapBuffer + ld de, wBGMapPalBuffer .loop ld a, [hl] push hl @@ -54,10 +54,10 @@ ScrollBGMapPalettes:: ; 4c03f jr c, .UpperNybble ; .LowerNybble - ld hl, TilesetPalettes + ld hl, wTilesetPalettes add [hl] ld l, a - ld a, [TilesetPalettes + 1] + ld a, [wTilesetPalettes + 1] adc $0 ld h, a ld a, [hl] @@ -65,10 +65,10 @@ ScrollBGMapPalettes:: ; 4c03f jr .next .UpperNybble: - ld hl, TilesetPalettes + ld hl, wTilesetPalettes add [hl] ld l, a - ld a, [TilesetPalettes + 1] + ld a, [wTilesetPalettes + 1] adc $0 ld h, a ld a, [hl] |