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

# 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
249 changed files with 1382 additions and 1408 deletions

View File

@@ -384,7 +384,7 @@ CheckIndoorMap:: ; 22f4
ret
; 2300
; XXX
; unused
cp INDOOR
ret z
cp GATE
@@ -1383,7 +1383,7 @@ UpdateBGMapColumn:: ; 27f8
ret
; 2816
; unreferenced
Unreferenced_Function2816::
ld hl, BGMapBuffer
ld bc, BGMapBufferEnd - BGMapBuffer
xor a
@@ -1984,7 +1984,7 @@ FadeToMenu:: ; 2b29
xor a
ld [hBGMapMode], a
call LoadStandardMenuDataHeader
farcall FadeOutPalettes
farcall Special_FadeOutPalettes
call ClearSprites
call DisableSpriteUpdates
ret
@@ -2010,7 +2010,7 @@ FinishExitMenu:: ; 2b5c
call GetSGBLayout
farcall LoadOW_BGPal7
call WaitBGMap2
farcall FadeInPalettes
farcall Special_FadeInPalettes
call EnableSpriteUpdates
ret
; 2b74
@@ -2043,7 +2043,7 @@ ReturnToMapWithSpeechTextbox:: ; 0x2b74
ReloadTilesetAndPalettes:: ; 2bae
call DisableLCD
call ClearSprites
farcall RefreshSprites
farcall Special_RefreshSprites
call LoadStandardFont
call LoadFontsExtra
ld a, [hROMBank]
@@ -2076,7 +2076,6 @@ GetAnyMapHeaderPointer:: ; 0x2bed
; inputs:
; b = map group, c = map number
; XXX de = ???
; outputs:
; hl points to the map header
@@ -2248,7 +2247,7 @@ GetMapEnvironment:: ; 2c8a
ret
; 2c98
ret ; XXX
ret ; unused
; 2c99
GetAnyMapEnvironment:: ; 2c99