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/fixed_words.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/fixed_words.asm')
| -rwxr-xr-x | mobile/fixed_words.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index 71474f236..602639b82 100755 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -269,7 +269,7 @@ CopyMobileEZChatToC608: ; 11c156 ld a, e ld [wd265], a call GetPokemonName - ld hl, StringBuffer1 + ld hl, wStringBuffer1 ld bc, MON_NAME_LENGTH - 1 jr .copy_string ; 11c1ab @@ -337,7 +337,7 @@ Function11c1b9: ; 11c1b9 ld a, $5 ld [rSVBK], a ld hl, $c6d0 - ld de, LYOverrides + ld de, wLYOverrides ld bc, $100 call CopyBytes pop af @@ -711,11 +711,11 @@ Function11c4a5: ; 11c4a5 (47:44a5) Function11c4be: ; 11c4be (47:44be) ld a, $1 - hlcoord 0, 6, AttrMap + hlcoord 0, 6, wAttrMap ld bc, $a0 call ByteFill ld a, $7 - hlcoord 0, 14, AttrMap + hlcoord 0, 14, wAttrMap ld bc, $28 call ByteFill farcall ReloadMapPart @@ -914,7 +914,7 @@ EZChat_PlaceCategoryNames: ; 11c5f0 (47:45f0) Function11c618: ; 11c618 (47:4618) ld a, $2 - hlcoord 0, 6, AttrMap + hlcoord 0, 6, wAttrMap ld bc, $c8 call ByteFill farcall ReloadMapPart @@ -1526,7 +1526,7 @@ Function11c992: ; 11c992 (47:4992) Function11c9ab: ; 11c9ab (47:49ab) ld a, $7 - hlcoord 0, 6, AttrMap + hlcoord 0, 6, wAttrMap ld bc, $c8 call ByteFill farcall ReloadMapPart @@ -1583,7 +1583,7 @@ Function11c9c3: ; 11c9c3 (47:49c3) ret Function11ca01: ; 11ca01 (47:4a01) - hlcoord 14, 7, AttrMap + hlcoord 14, 7, wAttrMap ld de, $14 ld a, $5 ld c, a @@ -1602,7 +1602,7 @@ Function11ca01: ; 11ca01 (47:4a01) jr nz, .asm_11ca0a Function11ca19: ; 11ca19 (47:4a19) - hlcoord 0, 12, AttrMap + hlcoord 0, 12, wAttrMap ld de, $14 ld a, $6 ld c, a @@ -2035,11 +2035,11 @@ Function11cd54: ; 11cd54 (47:4d54) Function11cdaa: ; 11cdaa (47:4daa) ld a, $2 - hlcoord 0, 6, AttrMap + hlcoord 0, 6, wAttrMap ld bc, 6 * SCREEN_WIDTH call ByteFill ld a, $7 - hlcoord 0, 12, AttrMap + hlcoord 0, 12, wAttrMap ld bc, 4 * SCREEN_WIDTH call ByteFill farcall ReloadMapPart |