This commit is contained in:
PikalaxALT
2015-11-20 11:47:52 -05:00
parent b023056259
commit 812976cee6
81 changed files with 1765 additions and 1740 deletions

View File

@@ -8569,7 +8569,7 @@ BackUpVBGMap2: ; 3f568
ld a, $1
ld [rVBK], a
ld de, w6_d000
ld hl, VBGMap0 ; VBGMap2
hlbgcoord 0, 0 ; VBGMap2
lb bc, BANK(BackUpVBGMap2), $40
call Request2bpp
pop af
@@ -9460,7 +9460,7 @@ InitBattleDisplay: ; 3fb6c
call ByteFill
ld de, w6_d000
ld hl, VBGMap0
hlbgcoord 0, 0
lb bc, BANK(.BlankBGMap), $40
call Request2bpp

View File

@@ -104,3 +104,6 @@ const_value = 1
const DECO_TENTACOOL_DOLL ; 32
const DECO_GOLD_TROPHY_DOLL ; 33
const DECO_SILVER_TROPHY_DOLL ; 34
NUM_NON_TROPHY_DECOS EQU $2b
NUM_DECOS EQU $2d

View File

@@ -84,7 +84,7 @@ endr
Function8c2a0: ; 8c2a0
call LoadTrainerBattlePokeballTiles
ld hl, VBGMap0
hlbgcoord 0, 0
call Function8c2cf
ret
; 8c2aa

View File

@@ -319,7 +319,7 @@ Function8bec: ; 8bec
ld a, [EnemySafeguardCount]
and $3
call FillBoxCGB
call LoadDETile
call LoadEDTile
ret
; 8c1d
@@ -702,7 +702,7 @@ Function96b3: ; 96b3
.asm_96d0
hlcoord 0, 0, AttrMap
ld de, VBGMap0
debgcoord 0, 0
ld b, $12
ld a, $1
ld [rVBK], a
@@ -1293,7 +1293,7 @@ ClearBytes: ; 0x9a5b
DrawDefaultTiles: ; 0x9a64
; Draw 240 tiles (2/3 of the screen) from tiles in VRAM
ld hl, VBGMap0 ; BG Map 0
hlbgcoord 0, 0 ; BG Map 0
ld de, 32 - 20
ld a, $80 ; starting tile
ld c, 12 + 1

View File

@@ -506,7 +506,7 @@ IntroScene1: ; e495b (39:495b)
ld a, $1
ld [rVBK], a
ld hl, IntroTilemap001
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld a, $0
ld [rVBK], a
@@ -517,7 +517,7 @@ IntroScene1: ; e495b (39:495b)
ld de, VTiles0 tile $00
call Functione54c2
ld hl, IntroTilemap002
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld a, [rSVBK]
push af
@@ -582,7 +582,7 @@ IntroScene3: ; e49fd (39:49fd)
ld a, $1
ld [rVBK], a
ld hl, IntroTilemap003
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld a, $0
ld [rVBK], a
@@ -590,7 +590,7 @@ IntroScene3: ; e49fd (39:49fd)
ld de, VTiles2 tile $00
call Functione54c2
ld hl, IntroTilemap004
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld a, [rSVBK]
push af
@@ -644,7 +644,7 @@ IntroScene5: ; e4a7a (39:4a7a)
ld a, $1
ld [rVBK], a
ld hl, IntroTilemap005
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld a, $0
ld [rVBK], a
@@ -655,7 +655,7 @@ IntroScene5: ; e4a7a (39:4a7a)
ld de, VTiles0 tile $00
call Functione54c2
ld hl, IntroTilemap006
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld a, [rSVBK]
push af
@@ -738,7 +738,7 @@ IntroScene7: ; e4b3f (39:4b3f)
ld a, $1
ld [rVBK], a
ld hl, IntroTilemap003
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld hl, IntroPichuWooperGFX
ld de, VTiles0 tile $00
@@ -752,7 +752,7 @@ IntroScene7: ; e4b3f (39:4b3f)
ld de, VTiles2 tile $00
call Functione54c2
ld hl, IntroTilemap004
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld a, [rSVBK]
push af
@@ -894,7 +894,7 @@ IntroScene11: ; e4c86 (39:4c86)
ld a, $1
ld [rVBK], a
ld hl, IntroTilemap007
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld a, $0
ld [rVBK], a
@@ -902,7 +902,7 @@ IntroScene11: ; e4c86 (39:4c86)
ld de, VTiles2 tile $00
call Functione54c2
ld hl, IntroTilemap008
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld a, [rSVBK]
push af
@@ -1016,7 +1016,7 @@ IntroScene13: ; e4d6d (39:4d6d)
ld a, $1
ld [rVBK], a
ld hl, IntroTilemap003
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld a, $0
ld [rVBK], a
@@ -1027,7 +1027,7 @@ IntroScene13: ; e4d6d (39:4d6d)
ld de, VTiles2 tile $00
call Functione54c2
ld hl, IntroTilemap004
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld a, [rSVBK]
push af
@@ -1120,7 +1120,7 @@ IntroScene15: ; e4e40 (39:4e40)
ld a, $1
ld [rVBK], a
ld hl, IntroTilemap009
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld a, $0
ld [rVBK], a
@@ -1135,7 +1135,7 @@ IntroScene15: ; e4e40 (39:4e40)
lb bc, BANK(GFX_e7a5d), 1
call Request2bpp
ld hl, IntroTilemap010
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
call Functione541b
ld a, [rSVBK]
@@ -1202,7 +1202,7 @@ IntroScene17: ; e4ef5 (39:4ef5)
ld a, $1
ld [rVBK], a
ld hl, IntroTilemap011
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld a, $0
ld [rVBK], a
@@ -1210,7 +1210,7 @@ IntroScene17: ; e4ef5 (39:4ef5)
ld de, VTiles1 tile $00
call Functione54de
ld hl, IntroTilemap012
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld a, [rSVBK]
push af
@@ -1268,7 +1268,7 @@ IntroScene19: ; e4f7e (39:4f7e)
ld a, $1
ld [rVBK], a
ld hl, IntroTilemap013
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld a, $0
ld [rVBK], a
@@ -1283,7 +1283,7 @@ IntroScene19: ; e4f7e (39:4f7e)
lb bc, BANK(GFX_e7a5d), 1
call Request2bpp
ld hl, IntroTilemap014
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
call Functione541b
ld a, [rSVBK]
@@ -1444,7 +1444,7 @@ IntroScene26: ; e50bb (39:50bb)
ld a, $1
ld [rVBK], a
ld hl, IntroTilemap015
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld a, $0
ld [rVBK], a
@@ -1452,7 +1452,7 @@ IntroScene26: ; e50bb (39:50bb)
ld de, VTiles2 tile $00
call Functione54c2
ld hl, IntroTilemap017
ld de, VBGMap0 tile $00
debgcoord 0, 0
call Functione54fa
ld a, [rSVBK]
push af

View File

@@ -1195,6 +1195,7 @@ DecorationIDs: ; 26f2b
db DECO_BIG_SNORLAX_DOLL ; 1a
db DECO_BIG_ONIX_DOLL ; 1b
db DECO_BIG_LAPRAS_DOLL ; 1c
Trophys:
db DECO_GOLD_TROPHY_DOLL ; 33
db DECO_SILVER_TROPHY_DOLL ; 34
db -1

View File

@@ -378,7 +378,7 @@ Function4e881: ; 4e881
call DisableLCD
call LoadStandardFont
call LoadFontsBattleExtra
ld hl, VBGMap0
hlbgcoord 0, 0
ld bc, VBGMap1 - VBGMap0
ld a, " "
call ByteFill
@@ -411,7 +411,7 @@ Function4e8c2: ; 4e8c2
call DisableLCD
call LoadStandardFont
call LoadFontsBattleExtra
ld hl, VBGMap0
hlbgcoord 0, 0
ld bc, VBGMap1 - VBGMap0
ld a, " "
call ByteFill
@@ -446,7 +446,7 @@ Function4e906: ; 4e906
ld bc, w6_d400 - w6_d000
ld a, " "
call ByteFill
ld hl, VBGMap0
hlbgcoord 0, 0
ld de, w6_d000
ld b, $0
ld c, $40

1427
engine/intro_menu.asm Executable file

File diff suppressed because it is too large Load Diff

View File

@@ -493,7 +493,7 @@ Function283b2: ; 283b2
pop hl
bccoord 1, 14
call PlaceWholeStringInBoxAtOnce
call FadeToWhite
call RotateThreePalettesRight
call ClearScreen
ld b, $8
call GetSGBLayout
@@ -1583,7 +1583,7 @@ Function28ade: ; 28ade
jr nz, .asm_28ade
Function28b22: ; 28b22
call FadeToWhite
call RotateThreePalettesRight
call ClearScreen
ld b, $8
call GetSGBLayout
@@ -2191,7 +2191,7 @@ Function28fdb: ; 28fdb
ld [rVBK], a
.asm_2900b
ld hl, VBGMap0
hlbgcoord 0, 0
ld bc, sScratch - VBGMap0
ld a, " "
call ByteFill
@@ -2372,7 +2372,7 @@ Function2914e: ; 2914e
push af
call DisableLCD
callab Function8cf53
ld hl, $9874
hlbgcoord 20, 3
ld bc, $c
ld a, $60
call ByteFill
@@ -2500,7 +2500,7 @@ Function29229: ; 29229
call ClearSprites
call DisableLCD
callab Function8cf53
ld hl, VBGMap0
hlbgcoord 0, 0
ld bc, sScratch - VBGMap0
ld a, " "
call ByteFill

View File

@@ -240,7 +240,7 @@ Function49e09: ; 49e09
Function49e27: ; 49e27
call Function6e3
call CheckRTCStatus
and $80
jr nz, .asm_49e39
hlcoord 0, 14
@@ -259,7 +259,7 @@ Function49e3d: ; 49e3d
ld a, [wSaveFileExists]
and a
ret z
call Function6e3
call CheckRTCStatus
and $80
jp nz, Function49e75
call UpdateTime
@@ -560,7 +560,7 @@ Function4a0c2: ; 4a0c2 (12:60c2)
ld c, 2
call DelayFrames
ld c, $1
call Function4802f
call InitMobileProfile
push af
call ClearBGPalettes
pop af

View File

@@ -249,10 +249,10 @@ MapSetupCommands: ; 15440
dba PlayMapMusic ; 03
dba RestartMapMusic ; 04
dba FadeToMapMusic ; 05
dba FadeOutMapAndMusic ; 06
dba RotatePalettesRightMapAndMusic ; 06
dba EnterMapMusic ; 07
dba ForceMapMusic ; 08
dba FadeInMusic ; 09
dba RotatePalettesLeftMusic ; 09
dba LoadBlockData ; 0a
dba LoadNeighboringBlockData ; 0b
dba SaveScreen ; 0c
@@ -272,8 +272,8 @@ MapSetupCommands: ; 15440
dba LoadMapAttributes ; 1a
dba LoadMapAttributes_SkipPeople ; 1b
dba ClearBGPalettes ; 1c
dba FadeOutPalettes ; 1d
dba FadeInPalettes ; 1e
dba RotatePalettesRightPalettes ; 1d
dba RotatePalettesLeftPalettes ; 1e
dba GetCoordOfUpperLeftCorner ; 1f
dba RestoreFacingAfterWarp ; 20
dba SpawnInFacingDown ; 21
@@ -417,14 +417,14 @@ RetainOldPalettes: ; 1556d
callba _UpdateTimePals
ret
FadeOutMapAndMusic: ; 15574
RotatePalettesRightMapAndMusic: ; 15574
ld e, 0
ld a, [MusicFadeIDLo]
ld d, 0
ld a, [MusicFadeIDHi]
ld a, $4
ld [MusicFade], a
call FadeToWhite
call RotateThreePalettesRight
ret
; 15587

View File

@@ -604,7 +604,7 @@ Phone_StartRinging: ; 9033f
call PlaySFX
call Phone_CallerTextbox
call UpdateSprites
callba Function4d188
callba PhoneRing_LoadEDTile
ret
; 90355
@@ -614,7 +614,7 @@ HangUp_Wait20Frames: ; 90355
Phone_Wait20Frames
ld c, 20
call DelayFrames
callba Function4d188
callba PhoneRing_LoadEDTile
ret
; 90363

View File

@@ -2332,7 +2332,7 @@ FlyMap: ; 91c90
call TownMapBubble
call TownMapPals
ld hl, VBGMap0 ; BG Map 0
hlbgcoord 0, 0 ; BG Map 0
call TownMapBGUpdate
call TownMapMon
@@ -2371,12 +2371,12 @@ Function91d11: ; 91d11
call FillKantoMap
call Function91de9
call TownMapPals
ld hl, VBGMap1
hlbgcoord 0, 0, VBGMap1
call TownMapBGUpdate
call FillJohtoMap
call Function91de9
call TownMapPals
ld hl, VBGMap0
hlbgcoord 0, 0
call TownMapBGUpdate
ld b, $2
call GetSGBLayout
@@ -2875,12 +2875,12 @@ Function92311: ; unreferenced
call FillKantoMap
call TownMapBubble
call TownMapPals
ld hl, VBGMap1
hlbgcoord 0, 0, VBGMap1
call TownMapBGUpdate
call FillJohtoMap
call TownMapBubble
call TownMapPals
ld hl, VBGMap0
hlbgcoord 0, 0
call TownMapBGUpdate
call TownMapMon
ld a, c

View File

@@ -1,9 +1,9 @@
SaveMenu: ; 14a1a
call LoadStandardMenuDataHeader
callba Function5e9a
callba DisplaySaveInfoOnSave
call SpeechTextBox
call UpdateSprites
callba SaveMenu_LoadDETile
callba SaveMenu_LoadEDTile
ld hl, UnknownText_0x15283
call SaveTheGame_yesorno
jr nz, .refused
@@ -19,7 +19,7 @@ SaveMenu: ; 14a1a
.refused
call ExitMenu
call Functiond90
callba SaveMenu_LoadDETile
callba SaveMenu_LoadEDTile
scf
ret

View File

@@ -26,7 +26,7 @@ Function926f7: ; 926f7 (24:66f7)
call PlayMusic
call DelayFrame
call DisableLCD
ld hl, VBGMap0 tile $00
hlbgcoord 0, 0
lb bc, 4, 0
ld a, $7f
call ByteFill

View File

@@ -66,11 +66,11 @@ SpecialsPointers:: ; c029
add_special Special_CardFlip
add_special Special_DummyNonfunctionalGameCornerGame
add_special Special_ClearBGPalettesBufferScreen
add_special FadeOutPalettes
add_special RotatePalettesRightPalettes
add_special Special_BattleTowerFade
add_special Special_FadeBlackQuickly
add_special FadeInPalettes
add_special Special_FadeInQuickly
add_special RotatePalettesLeftPalettes
add_special Special_RotatePalettesLeftQuickly
add_special Special_ReloadSpritesNoPalettes
add_special ClearBGPalettes
add_special UpdateTimePals
@@ -126,7 +126,7 @@ SpecialsPointers:: ; c029
add_special SpecialTrainerHouse
add_special PhotoStudio
add_special InitRoamMons
add_special Special_FadeOutMusic
add_special Special_RotatePalettesRightMusic
add_special Diploma
add_special PrintDiploma
@@ -616,7 +616,7 @@ SpecialGameboyCheck: ; c478
ret
Special_FadeOutMusic: ; c48f
Special_RotatePalettesRightMusic: ; c48f
ld a, MUSIC_NONE % $100
ld [MusicFadeIDLo], a
ld a, MUSIC_NONE / $100

View File

@@ -364,7 +364,7 @@ NewPokedexEntry: ; fb877
pop af
ld [wPokedexStatus], a
call MaxVolume
call FadeToWhite
call RotateThreePalettesRight
ld a, [hSCX]
add $fb
ld [hSCX], a

View File

@@ -116,7 +116,7 @@ _UpdateTimePals:: ; 8c070
ret
; 8c079
FadeInPalettes:: ; 8c079
RotatePalettesLeftPalettes:: ; 8c079
ld c, $12
call GetTimePalFade
ld b, $4
@@ -124,7 +124,7 @@ FadeInPalettes:: ; 8c079
ret
; 8c084
FadeOutPalettes:: ; 8c084
RotatePalettesRightPalettes:: ; 8c084
call Function8c0c1
ld c, $9
call GetTimePalFade
@@ -150,7 +150,7 @@ endr
ret
; 8c0ab
Special_FadeInQuickly: ; 8c0ab
Special_RotatePalettesLeftQuickly: ; 8c0ab
ld c, $0
call GetTimePalFade
ld b, $4

View File

@@ -15,7 +15,7 @@ InitClock: ; 90672 (24:4672)
ld [MusicFadeIDHi], a
ld c, 8
call DelayFrames
call Function4dd
call RotateFourPalettesLeft
call ClearTileMap
call ClearSprites
ld b, SCGB_08
@@ -37,7 +37,7 @@ InitClock: ; 90672 (24:4672)
call Request1bpp
call .ClearScreen
call WaitBGMap
call Function4a3
call RotateFourPalettesRight
ld hl, UnknownText_0x90874
call PrintText
ld hl, wc608

View File

@@ -31,8 +31,8 @@ _TitleScreen: ; 10ed67
; Clear screen palettes
ld hl, VBGMap0
ld bc, $0280
hlbgcoord 0, 0
ld bc, 20 bgrows
xor a
call ByteFill
@@ -42,8 +42,8 @@ _TitleScreen: ; 10ed67
; BG Map 1:
; line 0 (copyright)
ld hl, VBGMap1
ld bc, $0020 ; one row
hlbgcoord 0, 0, VBGMap1
ld bc, 1 bgrows
ld a, 7 ; palette
call ByteFill
@@ -53,41 +53,41 @@ _TitleScreen: ; 10ed67
; Apply logo gradient:
; lines 3-4
ld hl, VBGMap0 tile $06 ; (0,3)
ld bc, $0040 ; 2 rows
hlbgcoord 0, 3
ld bc, 2 bgrows
ld a, 2
call ByteFill
; line 5
ld hl, VBGMap0 tile $0a ; (0,5)
ld bc, $0020 ; 1 row
hlbgcoord 0, 5
ld bc, 1 bgrows
ld a, 3
call ByteFill
; line 6
ld hl, VBGMap0 tile $0c ; (0,6)
ld bc, $0020 ; 1 row
hlbgcoord 0, 6
ld bc, 1 bgrows
ld a, 4
call ByteFill
; line 7
ld hl, VBGMap0 tile $0e ; (0,7)
ld bc, $0020 ; 1 row
hlbgcoord 0, 7
ld bc, 1 bgrows
ld a, 5
call ByteFill
; lines 8-9
ld hl, VBGMap0 tile $10 ; (0,8)
ld bc, $0040 ; 2 rows
hlbgcoord 0, 8
ld bc, 2 bgrows
ld a, 6
call ByteFill
; 'CRYSTAL VERSION'
ld hl, $9925 ; (5,9)
ld bc, $000b ; length of version text
hlbgcoord 5, 9
ld bc, NAME_LENGTH ; length of version text
ld a, 1
call ByteFill
; Suicune gfx
ld hl, VBGMap0 tile $18 ; (0,12)
ld bc, $00c0 ; the rest of the screen
hlbgcoord 0, 12
ld bc, 6 bgrows ; the rest of the screen
ld a, 8
call ByteFill
@@ -109,9 +109,9 @@ _TitleScreen: ; 10ed67
; Clear screen tiles
ld hl, VBGMap0
ld bc, $0800
ld a, $7f
hlbgcoord 0, 0
ld bc, 64 bgrows
ld a, " "
call ByteFill
; Draw Pokemon logo
@@ -122,7 +122,7 @@ _TitleScreen: ; 10ed67
call DrawTitleGraphic
; Draw copyright text
ld hl, $9c03 ; BGMap1(3,0)
hlbgcoord 3, 0, VBGMap1
lb bc, 1, 13
ld d, $c
ld e, $10
@@ -270,7 +270,7 @@ SuicuneFrameIterator: ; 10eea7
LoadSuicuneFrame: ; 10eed2
hlcoord 6, 12
ld b, 6
.row
.bgrows
ld c, 8
.col
ld a, d
@@ -288,7 +288,7 @@ LoadSuicuneFrame: ; 10eed2
add d
ld d, a
dec b
jr nz, .row
jr nz, .bgrows
ret
; 10eeef
@@ -298,8 +298,8 @@ DrawTitleGraphic: ; 10eeef
; b: height
; c: width
; d: tile to start drawing from
; e: number of tiles to advance for each row
.row
; e: number of tiles to advance for each bgrows
.bgrows
push de
push bc
push hl
@@ -318,7 +318,7 @@ DrawTitleGraphic: ; 10eeef
add d
ld d, a
dec b
jr nz, .row
jr nz, .bgrows
ret
; 10ef06

Some files were not shown because too many files have changed in this diff Show More