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_setup.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_setup.asm')
| -rw-r--r-- | engine/map_setup.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engine/map_setup.asm b/engine/map_setup.asm index bf103a629..268574de0 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -172,12 +172,12 @@ CheckReplaceKrisSprite: ; 154f7 bit BIKEFLAGS_ALWAYS_ON_BIKE_F, [hl] ret z ld a, PLAYER_BIKE - ld [PlayerState], a + ld [wPlayerState], a scf ret .CheckSurfing2: ; 1551a (5:551a) - ld a, [PlayerState] + ld a, [wPlayerState] cp PLAYER_NORMAL jr z, .nope cp PLAYER_SKATE @@ -195,12 +195,12 @@ CheckReplaceKrisSprite: ; 154f7 jr z, .checkbiking jr .nope .checkbiking - ld a, [PlayerState] + ld a, [wPlayerState] cp PLAYER_BIKE jr nz, .nope .surfing ld a, PLAYER_NORMAL - ld [PlayerState], a + ld [wPlayerState], a scf ret @@ -211,13 +211,13 @@ CheckReplaceKrisSprite: ; 154f7 .CheckSurfing: ; 1554e (5:554e) call CheckOnWater jr nz, .ret_nc - ld a, [PlayerState] + ld a, [wPlayerState] cp PLAYER_SURF jr z, ._surfing cp PLAYER_SURF_PIKA jr z, ._surfing ld a, PLAYER_SURF - ld [PlayerState], a + ld [wPlayerState], a ._surfing scf ret @@ -238,22 +238,22 @@ RetainOldPalettes: ; 1556d RotatePalettesRightMapAndMusic: ; 15574 ld e, 0 - ld a, [MusicFadeID] + ld a, [wMusicFadeID] ld d, 0 - ld a, [MusicFadeID + 1] + ld a, [wMusicFadeID + 1] ld a, $4 - ld [MusicFade], a + ld [wMusicFade], a call RotateThreePalettesRight ret ; 15587 ForceMapMusic: ; 15587 - ld a, [PlayerState] + ld a, [wPlayerState] cp PLAYER_BIKE jr nz, .notbiking call VolumeOff ld a, $88 - ld [MusicFade], a + ld [wMusicFade], a .notbiking call TryRestartMapMusic ret |