Crystal Intro

This commit is contained in:
PikalaxALT 2015-12-02 17:59:05 -05:00
parent be082943ed
commit 2cdca75441
13 changed files with 437 additions and 290 deletions

View File

@ -56,10 +56,10 @@ Unknown_8d6e6: ; 8d6e6
dw Unknown_8d907 ; 36 dw Unknown_8d907 ; 36
dw Unknown_8d90c ; 37 dw Unknown_8d90c ; 37
dw Unknown_8d913 ; 38 dw Unknown_8d913 ; 38
dw Unknown_8d916 ; 39 dw Unknown_8d916 ; 39 unown in intro
dw Unknown_8d91d ; 3a dw Unknown_8d91d ; 3a unown in intro
dw Unknown_8d924 ; 3b dw Unknown_8d924 ; 3b unown in intro
dw Unknown_8d92b ; 3c dw Unknown_8d92b ; 3c unown in intro
dw Unknown_8d932 ; 3d dw Unknown_8d932 ; 3d
dw Unknown_8d93d ; 3e dw Unknown_8d93d ; 3e
dw Unknown_8d940 ; 3f dw Unknown_8d940 ; 3f

View File

@ -731,14 +731,14 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
ld a, 2 ld a, 2
ld [hSCX], a ld [hSCX], a
ld a, -2 ld a, -2
ld [wc3c0], a ld [wGlobalAnimXOffset], a
call EggHatch_DoAnimFrame call EggHatch_DoAnimFrame
ld c, 2 ld c, 2
call DelayFrames call DelayFrames
ld a, -2 ld a, -2
ld [hSCX], a ld [hSCX], a
ld a, 2 ld a, 2
ld [wc3c0], a ld [wGlobalAnimXOffset], a
call EggHatch_DoAnimFrame call EggHatch_DoAnimFrame
ld c, 2 ld c, 2
call DelayFrames call DelayFrames
@ -754,7 +754,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
call PlaySFX call PlaySFX
xor a xor a
ld [hSCX], a ld [hSCX], a
ld [wc3c0], a ld [wGlobalAnimXOffset], a
call ClearSprites call ClearSprites
call Function173b3 call Function173b3
hlcoord 6, 3 hlcoord 6, 3

File diff suppressed because it is too large Load Diff

View File

@ -7,7 +7,7 @@ _MainMenu: ; 5ae8
ld [wMapMusic], a ld [wMapMusic], a
call PlayMusic call PlayMusic
callba MainMenu callba MainMenu
jp Function6219 jp StartTitleScreen
; 5b04 ; 5b04
; unreferenced ; unreferenced
@ -1003,19 +1003,19 @@ Intro_PlacePlayerSprite: ; 61cd
.sprites ; 61fe .sprites ; 61fe
db 4 db 4
db $4c, $48, 0 db 9 * 8 + 4, 9 * 8, 0
db $4c, $50, 1 db 9 * 8 + 4, 10 * 8, 1
db $54, $48, 2 db 10 * 8 + 4, 9 * 8, 2
db $54, $50, 3 db 10 * 8 + 4, 10 * 8, 3
; 620b ; 620b
Function620b: ; 620b Function620b: ; 620b
callab Functione4579 callab Functione4579
jr c, Function6219 jr c, StartTitleScreen
callba CrystalIntro callba CrystalIntro
Function6219: ; 6219 StartTitleScreen: ; 6219
ld a, [rSVBK] ld a, [rSVBK]
push af push af
ld a, $5 ld a, $5

View File

@ -898,9 +898,9 @@ Function11c51: ; 11c51
ld [hl], $7e ld [hl], $7e
xor a xor a
ld [hSCY], a ld [hSCY], a
ld [wc3bf], a ld [wGlobalAnimYOffset], a
ld [hSCX], a ld [hSCX], a
ld [wc3c0], a ld [wGlobalAnimXOffset], a
ld [wJumptableIndex], a ld [wJumptableIndex], a
ld [wcf64], a ld [wcf64], a
ld [hBGMapMode], a ld [hBGMapMode], a

View File

@ -47,7 +47,7 @@ _OptionsMenu: ; e41d0
jr c, .ExitOptions jr c, .ExitOptions
.dpad .dpad
call Functione455c call Options_UpdateCursorPosition
ld c, 3 ld c, 3
call DelayFrames call DelayFrames
jr .joypad_loop jr .joypad_loop
@ -563,3 +563,20 @@ OptionsControl: ; e452a
scf scf
ret ret
; e455c ; e455c
Options_UpdateCursorPosition: ; e455c
hlcoord 1, 1
ld de, SCREEN_WIDTH
ld c, $10
.loop
ld [hl], " "
add hl, de
dec c
jr nz, .loop
hlcoord 1, 2
ld bc, 2 * SCREEN_WIDTH
ld a, [wJumptableIndex]
call AddNTimes
ld [hl], "▶"
ret
; e4579

View File

@ -259,13 +259,13 @@ Function8d04c: ; 8d04c
ld c, a ; number of objects ld c, a ; number of objects
.loop .loop
; first byte: y (px) ; first byte: y (px)
; [de] = [wCurrAnimYCoord] + [wCurrAnimYOffset] + [wc3bf] + Function8d0be([hl]) ; [de] = [wCurrAnimYCoord] + [wCurrAnimYOffset] + [wGlobalAnimYOffset] + Function8d0be([hl])
ld a, [wCurrAnimYCoord] ld a, [wCurrAnimYCoord]
ld b, a ld b, a
ld a, [wCurrAnimYOffset] ld a, [wCurrAnimYOffset]
add b add b
ld b, a ld b, a
ld a, [wc3bf] ld a, [wGlobalAnimYOffset]
add b add b
ld b, a ld b, a
call Function8d0be call Function8d0be
@ -274,13 +274,13 @@ Function8d04c: ; 8d04c
inc hl inc hl
inc de inc de
; second byte: x (px) ; second byte: x (px)
; [de] = [wCurrAnimXCoord] + [wCurrAnimXOffset] + [wc3c0] + Function8d0ce([hl]) ; [de] = [wCurrAnimXCoord] + [wCurrAnimXOffset] + [wGlobalAnimXOffset] + Function8d0ce([hl])
ld a, [wCurrAnimXCoord] ld a, [wCurrAnimXCoord]
ld b, a ld b, a
ld a, [wCurrAnimXOffset] ld a, [wCurrAnimXOffset]
add b add b
ld b, a ld b, a
ld a, [wc3c0] ld a, [wGlobalAnimXOffset]
add b add b
ld b, a ld b, a
call Function8d0ce call Function8d0ce
@ -411,15 +411,15 @@ LookUpInwSpriteAnimDict: ; 8d109
; 8d120 ; 8d120
Function8d120:: ; 8d120 Function8d120:: ; 8d120
ld hl, $1 ld hl, SPRITEANIMSTRUCT_01
add hl, bc add hl, bc
ld [hl], a ld [hl], a
ld hl, $8 ld hl, SPRITEANIMSTRUCT_DURATION
add hl, bc add hl, bc
ld [hl], $0 ld [hl], 0
ld hl, $a ld hl, SPRITEANIMSTRUCT_FRAME
add hl, bc add hl, bc
ld [hl], $ff ld [hl], -1
ret ret
; 8d132 ; 8d132
@ -593,7 +593,7 @@ Unknown_8d1c4: ; 8d1c4
db $35, SPRITE_ANIM_SEQ_1D, $00 ; 26 db $35, SPRITE_ANIM_SEQ_1D, $00 ; 26
db $37, SPRITE_ANIM_SEQ_1E, $00 ; 27 db $37, SPRITE_ANIM_SEQ_1E, $00 ; 27
db $38, SPRITE_ANIM_SEQ_1E, $00 ; 28 db $38, SPRITE_ANIM_SEQ_1E, $00 ; 28
db $39, SPRITE_ANIM_SEQ_20, $00 ; 29 db $39, SPRITE_ANIM_SEQ_20, $00 ; 29 intro unown
db $3f, SPRITE_ANIM_SEQ_21, $00 ; 2a db $3f, SPRITE_ANIM_SEQ_21, $00 ; 2a
db $3e, SPRITE_ANIM_SEQ_22, $00 ; 2b db $3e, SPRITE_ANIM_SEQ_22, $00 ; 2b
db $40, SPRITE_ANIM_SEQ_00, $00 ; 2c db $40, SPRITE_ANIM_SEQ_00, $00 ; 2c

View File

@ -359,7 +359,7 @@ Function8ce47: ; 8ce47
inc a inc a
add e add e
ld [wcf65], a ld [wcf65], a
ld hl, wc3c0 ld hl, wGlobalAnimXOffset
ld a, [wd191] ld a, [wd191]
add [hl] add [hl]
ld [hl], a ld [hl], a
@ -400,7 +400,7 @@ rept 2
add d add d
endr endr
ld [wcf65], a ld [wcf65], a
ld hl, wc3c0 ld hl, wGlobalAnimXOffset
ld a, [wd191] ld a, [wd191]
ld d, a ld d, a
ld a, [hl] ld a, [hl]

View File

@ -476,8 +476,8 @@ wCurrAnimXCoord:: ds 1
wCurrAnimYCoord:: ds 1 wCurrAnimYCoord:: ds 1
wCurrAnimXOffset:: ds 1 wCurrAnimXOffset:: ds 1
wCurrAnimYOffset:: ds 1 wCurrAnimYOffset:: ds 1
wc3bf:: ds 1 wGlobalAnimYOffset:: ds 1
wc3c0:: ds 1 wGlobalAnimXOffset:: ds 1
wSpriteAnimsEnd:: wSpriteAnimsEnd::
wc3c1:: ds 11 wc3c1:: ds 11
@ -1365,6 +1365,7 @@ wTitleScreenTimerHi::
wcf66:: ds 1 wcf66:: ds 1
Requested2bpp:: ; cf67 Requested2bpp:: ; cf67
Requested2bppSize::
ds 1 ds 1
Requested2bppSource:: ; cf68 Requested2bppSource:: ; cf68
ds 2 ds 2
@ -1372,6 +1373,7 @@ Requested2bppDest:: ; cf6a
ds 2 ds 2
Requested1bpp:: ; cf6c Requested1bpp:: ; cf6c
Requested1bppSize::
ds 1 ds 1
Requested1bppSource:: ; cf6d Requested1bppSource:: ; cf6d
ds 2 ds 2
@ -2170,6 +2172,8 @@ TimeOfDay:: ; d269
ds 1 ds 1
ds 1 ds 1
SECTION "Enemy Party", WRAMX, BANK [1]
wPokedexShowPointerAddr:: wPokedexShowPointerAddr::
wd26b:: ds 1 wd26b:: ds 1
wd26c:: ds 1 wd26c:: ds 1
@ -2180,7 +2184,8 @@ wd271:: ds 5
wd276:: ds 10 wd276:: ds 10
ds wd26b - @ ds wd26b - @
SECTION "Enemy Party", WRAMX, BANK [1]
; SECTION "Enemy Party", WRAMX, BANK [1]
OTPlayerName:: ds NAME_LENGTH OTPlayerName:: ds NAME_LENGTH
OTPlayerID:: ds 2 OTPlayerID:: ds 2
ds 8 ds 8