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:
@@ -1339,7 +1339,7 @@ PokegearPhoneContactSubmenu: ; 91342 (24:5342)
|
||||
|
||||
; 9146e
|
||||
|
||||
; XXX
|
||||
; unused
|
||||
ld a, [hHours]
|
||||
cp 12
|
||||
jr c, .am
|
||||
@@ -1529,7 +1529,7 @@ UpdateRadioStation: ; 9166f (24:566f)
|
||||
|
||||
; 916a1 (24:56a1)
|
||||
|
||||
; XXX
|
||||
; unused
|
||||
ld [wPokegearRadioChannelBank], a
|
||||
ld a, [hli]
|
||||
ld [wPokegearRadioChannelAddr], a
|
||||
@@ -1781,7 +1781,7 @@ LoadStation_EvolutionRadio: ; 9183e (24:583e)
|
||||
|
||||
; 91853 (24:5853)
|
||||
|
||||
LoadStation_Dummy: ; 91853
|
||||
Unreferenced_LoadStation: ; 91853
|
||||
ret
|
||||
|
||||
RadioMusicRestartDE: ; 91854 (24:5854)
|
||||
@@ -2362,7 +2362,7 @@ HasVisitedSpawn: ; 91c50
|
||||
ld hl, wVisitedSpawns
|
||||
ld b, CHECK_FLAG
|
||||
ld d, 0
|
||||
predef FlagPredef
|
||||
predef Predef_SmallFarFlagAction
|
||||
ld a, c
|
||||
ret
|
||||
|
||||
@@ -2471,7 +2471,7 @@ FlyMap: ; 91c90
|
||||
|
||||
; 91d11
|
||||
|
||||
_Area: ; 91d11
|
||||
Predef_Pokedex_GetArea: ; 91d11
|
||||
; e: Current landmark
|
||||
ld a, [wTownMapPlayerIconLandmark]
|
||||
push af
|
||||
@@ -2963,7 +2963,7 @@ INCBIN "gfx/pokegear/dexmap_nest_icon.2bpp"
|
||||
FlyMapLabelBorderGFX: ; 922e1
|
||||
INCBIN "gfx/pokegear/flymap_label_border.1bpp"
|
||||
|
||||
; XXX
|
||||
Unreferenced_Function92311:
|
||||
xor a
|
||||
ld [wTownMapPlayerIconLandmark], a
|
||||
call ClearBGPalettes
|
||||
|
Reference in New Issue
Block a user