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/types.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/types.asm')
| -rw-r--r-- | engine/types.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/types.asm b/engine/types.asm index 931e98b92..dc0df61ae 100644 --- a/engine/types.asm +++ b/engine/types.asm @@ -1,5 +1,5 @@ PrintMonTypes: ; 5090d -; Print one or both types of [CurSpecies] +; Print one or both types of [wCurSpecies] ; on the stats screen at hl. push hl @@ -7,14 +7,14 @@ PrintMonTypes: ; 5090d pop hl push hl - ld a, [BaseType1] + ld a, [wBaseType1] call .Print ; Single-typed monsters really ; have two of the same type. - ld a, [BaseType1] + ld a, [wBaseType1] ld b, a - ld a, [BaseType2] + ld a, [wBaseType2] cp b pop hl jr z, .hide_type_2 @@ -49,10 +49,10 @@ PrintMoveType: ; 5093a ld bc, MOVE_LENGTH ld hl, Moves call AddNTimes - ld de, StringBuffer1 + ld de, wStringBuffer1 ld a, BANK(Moves) call FarCopyBytes - ld a, [StringBuffer1 + MOVE_TYPE] + ld a, [wStringBuffer1 + MOVE_TYPE] pop hl ld b, a @@ -79,7 +79,7 @@ PrintType: ; 50953 GetTypeName: ; 50964 -; Copy the name of type [wd265] to StringBuffer1. +; Copy the name of type [wd265] to wStringBuffer1. ld a, [wd265] ld hl, TypeNames @@ -90,7 +90,7 @@ GetTypeName: ; 50964 ld a, [hli] ld h, [hl] ld l, a - ld de, StringBuffer1 + ld de, wStringBuffer1 ld bc, MOVE_NAME_LENGTH jp CopyBytes ; 5097b |