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

18
engine/intro_menu.asm
View File

@ -10,7 +10,7 @@ _MainMenu: ; 5ae8
jp StartTitleScreen
; 5b04
; unreferenced
; unused
ret
; 5b05
@ -825,7 +825,7 @@ NamePlayer: ; 0x6074
db "KRIS@@@@@@@"
; 60e9
Function60e9: ; Unreferenced
Unreferenced_Function60e9:
call LoadMenuDataHeader
call VerticalMenu
ld a, [wMenuCursorY]
@ -941,24 +941,24 @@ Intro_WipeInFrontpic: ; 6182
Intro_PrepTrainerPic: ; 619c
ld de, vTiles2
farcall GetTrainerPic
farcall Predef_GetTrainerPic
xor a
ld [hGraphicStartTile], a
hlcoord 6, 4
lb bc, 7, 7
predef PlaceGraphic
predef Predef_PlaceGraphic
ret
; 61b4
ShrinkFrame: ; 61b4
ld de, vTiles2
ld c, $31
predef DecompressPredef
predef Predef_Decompress
xor a
ld [hGraphicStartTile], a
hlcoord 6, 4
lb bc, 7, 7
predef PlaceGraphic
predef Predef_PlaceGraphic
ret
; 61cd
@ -1093,7 +1093,7 @@ RunTitleScreen: ; 627b
ret
; 6292
Function6292: ; 6292 ; unreferenced
Unreferenced_Function6292: ; 6292
ld a, [hVBlankCounter]
and $7
ret nz
@ -1124,7 +1124,7 @@ TitleScreenScene: ; 62a3
dw TitleScreenEnd
; 62b7
.NextScene: ; Unreferenced
.Unreferenced_NextScene:
ld hl, wJumptableIndex
inc [hl]
ret
@ -1328,7 +1328,7 @@ ResetClock: ; 6392
jp Init
; 639b
Function639b: ; unreferenced
Unreferenced_Function639b:
; If bit 0 or 1 of [wTitleScreenTimer] is set, we don't need to be here.
ld a, [wTitleScreenTimer]
and %00000011