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:
21
home.asm
21
home.asm
@@ -44,6 +44,7 @@ INCLUDE "home/game_time.asm"
|
||||
INCLUDE "home/map.asm"
|
||||
|
||||
InexplicablyEmptyFunction:: ; 2d43
|
||||
; unused
|
||||
; Inexplicably empty.
|
||||
; Seen in PredefPointers.
|
||||
rept 16
|
||||
@@ -57,8 +58,7 @@ INCLUDE "home/predef.asm"
|
||||
INCLUDE "home/window.asm"
|
||||
INCLUDE "home/flag.asm"
|
||||
|
||||
Function2ebb:: ; 2ebb
|
||||
; unreferenced
|
||||
Unreferenced_Function2ebb:: ; 2ebb
|
||||
ld a, [wMonStatusFlags]
|
||||
bit 1, a
|
||||
ret z
|
||||
@@ -79,8 +79,7 @@ xor_a_dec_a:: ; 2ec8
|
||||
ret
|
||||
; 2ecb
|
||||
|
||||
Function2ecb:: ; 2ecb
|
||||
; unreferenced
|
||||
Unreferenced_Function2ecb:: ; 2ecb
|
||||
push hl
|
||||
ld hl, wMonStatusFlags
|
||||
bit 1, [hl]
|
||||
@@ -552,7 +551,7 @@ CopyTilemapAtOnce:: ; 323d
|
||||
jr .CopyTilemapAtOnce
|
||||
; 323f
|
||||
|
||||
; XXX
|
||||
; unused
|
||||
farcall HDMATransferAttrMapAndTileMapToWRAMBank3
|
||||
ret
|
||||
; 3246
|
||||
@@ -712,7 +711,7 @@ GetSGBLayout:: ; 3340
|
||||
ret z
|
||||
|
||||
.sgb
|
||||
predef_jump Predef_LoadSGBLayout ; LoadSGBLayout
|
||||
predef_jump Predef_LoadSGBLayout
|
||||
; 334e
|
||||
|
||||
SetHPPal:: ; 334e
|
||||
@@ -1075,12 +1074,12 @@ _PrepMonFrontpic:: ; 378b
|
||||
|
||||
push hl
|
||||
ld de, vTiles2
|
||||
predef GetMonFrontpic
|
||||
predef Predef_GetMonFrontpic
|
||||
pop hl
|
||||
xor a
|
||||
ld [hGraphicStartTile], a
|
||||
lb bc, 7, 7
|
||||
predef PlaceGraphic
|
||||
predef Predef_PlaceGraphic
|
||||
xor a
|
||||
ld [wBoxAlignment], a
|
||||
ret
|
||||
@@ -1127,8 +1126,7 @@ Print8BitNumRightAlign:: ; 3842
|
||||
jp PrintNum
|
||||
; 384d
|
||||
|
||||
Function384d:: ; 384d
|
||||
; XXX
|
||||
Unreferenced_Function384d:: ; 384d
|
||||
; GetNthMove
|
||||
ld hl, wListMoves_MoveIndicesBuffer
|
||||
ld c, a
|
||||
@@ -1321,8 +1319,7 @@ GetPartyLocation:: ; 3927
|
||||
jp AddNTimes
|
||||
; 392d
|
||||
|
||||
Function392d:: ; 392d
|
||||
; XXX
|
||||
Unreferenced_Function392d:: ; 392d
|
||||
; GetDexNumber
|
||||
; Probably used in gen 1 to convert index number to dex number
|
||||
; Not required in gen 2 because index number == dex number
|
||||
|
Reference in New Issue
Block a user