Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions 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

26
engine/start_menu.asm
View File

@@ -591,7 +591,7 @@ HasNoItems: ; 129d5
TossItemFromPC: ; 129f4
push de
call PartyMonItemName
call Predef_PartyMonItemName
farcall _CheckTossableItem
ld a, [wItemAttributeParamBuffer]
and a
@@ -614,7 +614,7 @@ TossItemFromPC: ; 129f4
pop hl
ld a, [CurItemQuantity]
call TossItem
call PartyMonItemName
call Predef_PartyMonItemName
ld hl, .TossedThisMany
call MenuTextBox
call ExitMenu
@@ -666,7 +666,7 @@ CantUseItemText: ; 12a67
; 12a6c
PartyMonItemName: ; 12a6c
Predef_PartyMonItemName: ; 12a6c
ld a, [CurItem]
ld [wd265], a
call GetItemName
@@ -860,7 +860,7 @@ GiveTakePartyMonItem: ; 12b60
TryGiveItemToPartymon: ; 12bd9
call SpeechTextBox
call PartyMonItemName
call Predef_PartyMonItemName
call GetPartyItemLocation
ld a, [hl]
and a
@@ -1221,7 +1221,7 @@ OpenPartyStats: ; 12e00
xor a
ld [MonType], a
call LowVolume
predef StatsScreenInit
predef Predef_StatsScreenInit
call MaxVolume
call Call_ExitMenu
ld a, 0
@@ -1251,7 +1251,7 @@ MonMenu_Fly: ; 12e30
jr z, .Fail
cp $0
jr z, .Error
farcall TrainerRankings_Fly
farcall StubbedTrainerRankings_Fly
ld b, $4
ld a, $2
ret
@@ -1264,7 +1264,7 @@ MonMenu_Fly: ; 12e30
ld a, $0
ret
.Unused:
.Unreferenced:
ld a, $1
ret
; 12e55
@@ -1788,7 +1788,7 @@ SetUpMoveScreenBG: ; 13172
hlcoord 5, 1
call PlaceString
push bc
farcall CopyPkmnToTempMon
farcall Predef_CopyPkmnToTempMon
pop hl
call PrintLevel
ld hl, PlayerHPPal
@@ -1805,7 +1805,7 @@ SetUpMoveList: ; 131ef
ld [hBGMapMode], a
ld [wMoveSwapBuffer], a
ld [MonType], a
predef CopyPkmnToTempMon
predef Predef_CopyPkmnToTempMon
ld hl, TempMonMoves
ld de, wListMoves_MoveIndicesBuffer
ld bc, NUM_MOVES
@@ -1813,9 +1813,9 @@ SetUpMoveList: ; 131ef
ld a, SCREEN_WIDTH * 2
ld [Buffer1], a
hlcoord 2, 3
predef ListMoves
predef Predef_ListMoves
hlcoord 10, 4
predef ListMovePP
predef Predef_ListMovePP
call WaitBGMap
call SetPalettes
ld a, [wNumMoves]
@@ -1859,7 +1859,7 @@ PlaceMoveData: ; 13256
ld a, [CurMove]
ld b, a
hlcoord 2, 12
predef PrintMoveType
predef Predef_PrintMoveType
ld a, [CurMove]
dec a
ld hl, Moves + MOVE_POWER
@@ -1882,7 +1882,7 @@ PlaceMoveData: ; 13256
.description
hlcoord 1, 14
predef PrintMoveDesc
predef Predef_PrintMoveDesc
ld a, $1
ld [hBGMapMode], a
ret