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 /mobile/mobile_22_2.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 'mobile/mobile_22_2.asm')
| -rw-r--r-- | mobile/mobile_22_2.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index c6ee2b243..974836b88 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -645,11 +645,11 @@ Palette_8b6d5: ; 8b6d5 ; 8b6ed Function8b6ed: ; 8b6ed - hlcoord 0, 0, AttrMap + hlcoord 0, 0, wAttrMap ld bc, $012c xor a call ByteFill - hlcoord 0, 14, AttrMap + hlcoord 0, 14, wAttrMap ld bc, $0050 ld a, $7 call ByteFill @@ -709,7 +709,7 @@ Function8b73e: ; 8b73e ; 8b744 Function8b744: ; 8b744 - ld de, AttrMap - TileMap + ld de, wAttrMap - wTileMap add hl, de inc b inc b @@ -781,10 +781,10 @@ Function8b788: ; 8b788 ; 8b79e Function8b79e: ; 8b79e - hlcoord 0, 1, AttrMap + hlcoord 0, 1, wAttrMap ld a, $1 ld [hli], a - hlcoord 9, 1, AttrMap + hlcoord 9, 1, wAttrMap ld e, $b .asm_8b7a9 ld a, $2 @@ -853,7 +853,7 @@ Function8b7bd: ; 8b7bd jr .asm_8b7ea .asm_8b81c - ld a, [MenuSelection] + ld a, [wMenuSelection] cp $ff jr nz, .asm_8b824 @@ -931,7 +931,7 @@ MenuData_0x8b870: ; 0x8b870 Function8b880: ; 8b880 ld h, d ld l, e - ld de, MenuSelection + ld de, wMenuSelection lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum ret |