Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source 
# 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
This commit is contained in:
Rangi
2018-02-03 18:21:53 -05:00
parent 6ff2cb20e6 b35eb72290
commit 32ed487a47
367 changed files with 8920 additions and 8922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
engine/events_2.asm
View File

@@ -52,7 +52,7 @@ LoadScriptBDE:: ; 97c4f
TryTileCollisionEvent:: ; 97c5f
call GetFacingTileCoord
ld [EngineBuffer1], a
ld [wEngineBuffer1], a
ld c, a
farcall CheckFacingTileForStdScript
jr c, .done
@@ -63,21 +63,21 @@ TryTileCollisionEvent:: ; 97c5f
jr .done
.whirlpool
ld a, [EngineBuffer1]
ld a, [wEngineBuffer1]
call CheckWhirlpoolTile
jr nz, .waterfall
farcall TryWhirlpoolOW
jr .done
.waterfall
ld a, [EngineBuffer1]
ld a, [wEngineBuffer1]
call CheckWaterfallTile
jr nz, .headbutt
farcall TryWaterfallOW
jr .done
.headbutt
ld a, [EngineBuffer1]
ld a, [wEngineBuffer1]
call CheckHeadbuttTreeTile
jr nz, .surf
farcall TryHeadbuttOW
@@ -161,7 +161,7 @@ CanUseSweetScent:: ; 97cfd
jr nc, .no
.ice_check
ld a, [PlayerStandingTile]
ld a, [wPlayerStandingTile]
call CheckIceTile
jr z, .no
scf
@@ -202,7 +202,7 @@ ChooseWildEncounter_BugContest:: ; 97d31
; Species
ld a, [hli]
ld [TempWildMonSpecies], a
ld [wTempWildMonSpecies], a
; Min level
ld a, [hli]
@@ -228,14 +228,14 @@ ChooseWildEncounter_BugContest:: ; 97d31
add d
.GotLevel:
ld [CurPartyLevel], a
ld [wCurPartyLevel], a
xor a
ret
; 97d64
TryWildEncounter_BugContest: ; 97d64
ld a, [PlayerStandingTile]
ld a, [wPlayerStandingTile]
call CheckSuperTallGrassTile
ld b, 40 percent
jr z, .ok
@@ -268,7 +268,7 @@ DoBikeStep:: ; 97db3
jr z, .NoCall
; If we're not on the bike, we don't have to be here.
ld a, [PlayerState]
ld a, [wPlayerState]
cp PLAYER_BIKE
jr nz, .NoCall
@@ -594,7 +594,7 @@ CmdQueue_Type3: ; 97ef9
.IsPlayerFacingDown: ; 97f38
push bc
ld bc, PlayerStruct
ld bc, wPlayerStruct
call GetSpriteDirection
and a
pop bc
@@ -602,7 +602,7 @@ CmdQueue_Type3: ; 97ef9
; 97f42
CmdQueue_StoneTable: ; 97f42
ld de, PlayerStruct
ld de, wPlayerStruct
ld a, NUM_OBJECT_STRUCTS
.loop
push af