pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)

Browse Source 
# Conflicts:
#	data/items/descriptions.asm
#	data/sprite_anims/framesets.asm
#	engine/crystal_colors.asm
#	engine/events/kurt.asm
#	engine/events/special.asm
#	engine/events/std_scripts.asm
#	engine/events_3.asm
#	engine/item_effects.asm
#	engine/namingscreen.asm
#	engine/scripting.asm
#	engine/stats_screen.asm
#	engine/trade_animation.asm
#	home/audio.asm
#	main.asm
#	maps/BattleTower1F.asm
#	maps/BattleTowerBattleRoom.asm
#	maps/BurnedTowerB1F.asm
#	maps/ElmsLab.asm
#	maps/GoldenrodDeptStore5F.asm
#	maps/GoldenrodUnderground.asm
#	maps/HallOfFame.asm
#	maps/MahoganyTown.asm
#	maps/ManiasHouse.asm
#	maps/MobileBattleRoom.asm
#	maps/MobileTradeRoomMobile.asm
#	maps/RadioTower2F.asm
#	maps/Route35NationalParkGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/Route39Farmhouse.asm
#	tilesets/palette_maps.asm
This commit is contained in:
Remy Oukaour
2018-01-14 22:56:36 -05:00
parent 8e1e583640 2c789b64b1
commit 5c28d05bb4
249 changed files with 1382 additions and 1408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
engine/scripting.asm
View File

@ -1370,7 +1370,7 @@ Script_startbattle:
; script command 0x5f
call BufferScreen
predef StartBattle
predef Predef_StartBattle
ld a, [wBattleResult]
and $3f
ld [ScriptVar], a
@ -2351,7 +2351,7 @@ Script_giveegg:
ld [CurPartySpecies], a
call GetScriptByte
ld [CurPartyLevel], a
farcall GiveEgg
farcall Predef_GiveEgg
ret nc
ld a, 2
ld [ScriptVar], a
@ -2624,7 +2624,8 @@ Script_warpcheck:
farcall EnableEvents
ret
Script_enableevents: ; unreferenced
Script_enableevents:
; unused
farcall EnableEvents
ret
@ -2667,7 +2668,7 @@ Script_loadbytec2cf:
ld [wc2cf], a
ret
db $49 ; XXX
db closetext_command ; unused
Script_closetext:
; script command 0x49
@ -2804,8 +2805,8 @@ Script_halloffame:
ld hl, wGameTimerPause
res 0, [hl]
farcall TrainerRankings_HallOfFame
farcall TrainerRankings_HallOfFame2
farcall StubbedTrainerRankings_HallOfFame
farcall StubbedTrainerRankings_HallOfFame2
farcall HallOfFame
ld hl, wGameTimerPause
set 0, [hl]
@ -2847,7 +2848,7 @@ Script_check_save:
ret
; unreferenced
; unused
ld a, [.byte]
ld [ScriptVar], a
ret