pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

bgcoord

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
battle/core.asm
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

3
constants/deco_constants.asm
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

2
engine/battle_start.asm
View File

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

6
engine/color.asm
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

40
engine/crystal_intro.asm
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

1
engine/decorations.asm
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

6
engine/evolution_animation.asm
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
View File

File diff suppressed because it is too large Load Diff

10
engine/link.asm
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

6
engine/main_menu.asm
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

12
engine/map_setup.asm
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

4
engine/phone.asm
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

10
engine/pokegear.asm
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

6
engine/save.asm
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

2
engine/slot_machine.asm
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

10
engine/specials.asm
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

2
engine/time_capsule/conversion.asm
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

6
engine/timeofdaypals.asm
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

4
engine/timeset.asm
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

54
engine/title.asm
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

4
event/field_moves.asm
View File

@ -7,7 +7,7 @@ PlayWhirlpoolSound: ; 8c7d4
; 8c7e1
BlindingFlash: ; 8c7e1
callba FadeOutPalettes
callba RotatePalettesRightPalettes
ld hl, StatusFlags
set 2, [hl]
callba Function8c0e5
@ -15,7 +15,7 @@ BlindingFlash: ; 8c7e1
ld b, SCGB_09
call GetSGBLayout
callba Function49409
callba FadeInPalettes
callba RotatePalettesLeftPalettes
ret
; 8c80a

6
event/halloffame.asm
View File

@ -40,7 +40,7 @@ RedCredits:: ; 86455
ld [MusicFadeIDHi], a
ld a, $a
ld [MusicFade], a
callba FadeOutPalettes
callba RotatePalettesRightPalettes
xor a
ld [VramState], a
ld [hMapAnims], a
@ -63,7 +63,7 @@ Function8648e: ; 8648e
ld [MusicFadeIDHi], a
ld a, 10
ld [MusicFade], a
callba FadeOutPalettes
callba RotatePalettesRightPalettes
xor a
ld [VramState], a
ld [hMapAnims], a
@ -114,7 +114,7 @@ Function864c3: ; 864c3
call Function86810
ld a, $4
ld [MusicFade], a
call FadeToWhite
call RotateThreePalettesRight
ld c, 8
call DelayFrames
ret

24
event/magnet_train.asm
View File

@ -158,7 +158,7 @@ endr
; 8cd27
DrawMagnetTrain: ; 8cd27
ld hl, VBGMap0
hlbgcoord 0, 0
xor a
.asm_8cd2b
call GetMagnetTrainBGTiles
@ -167,19 +167,19 @@ DrawMagnetTrain: ; 8cd27
inc a
cp $12
jr c, .asm_8cd2b
ld hl, VBGMap0 tile $0c
hlbgcoord 0, 6
ld de, MagnetTrainTilemap1
ld c, 20
call .FillLine
ld hl, VBGMap0 tile $0e
hlbgcoord 0, 7
ld de, MagnetTrainTilemap2
ld c, 20
call .FillLine
ld hl, VBGMap0 tile $10
hlbgcoord 0, 8
ld de, MagnetTrainTilemap3
ld c, 20
call .FillLine
ld hl, VBGMap0 tile $12
hlbgcoord 0, 9
ld de, MagnetTrainTilemap4
ld c, 20
call .FillLine
@ -262,25 +262,25 @@ SetMagnetTrainPals: ; 8cdc3
ld [rVBK], a
; bushes
ld hl, VBGMap0
ld bc, 8 tiles
hlbgcoord 0, 0
ld bc, 4 bgrows
ld a, $2
call ByteFill
; train
ld hl, VBGMap0 tile $08
ld bc, 20 tiles
hlbgcoord 0, 4
ld bc, 10 bgrows
xor a
call ByteFill
; more bushes
ld hl, VBGMap0 tile $1c
ld bc, 8 tiles
hlbgcoord 0, 14
ld bc, 4 bgrows
ld a, $2
call ByteFill
; train window
ld hl, VBGMap0 tile $10 + 7
hlbgcoord 7, 8
ld bc, 6
ld a, $4
call ByteFill

12
event/sacred_ash.asm
View File

@ -52,12 +52,12 @@ SacredAshScript: ; 0x50821
special HealParty
reloadmappart
playsound SFX_WARP_TO
special FadeOutPalettes
special FadeInPalettes
special FadeOutPalettes
special FadeInPalettes
special FadeOutPalettes
special FadeInPalettes
special RotatePalettesRightPalettes
special RotatePalettesLeftPalettes
special RotatePalettesRightPalettes
special RotatePalettesLeftPalettes
special RotatePalettesRightPalettes
special RotatePalettesLeftPalettes
waitbutton
writetext UnknownText_0x50845
playsound SFX_CAUGHT_MON

4
event/whiteout.asm
View File

@ -10,7 +10,7 @@ Script_OverworldWhiteout:: ; 0x124c8
Script_Whiteout: ; 0x124ce
writetext .WhitedOutText
closetext
special FadeOutPalettes
special RotatePalettesRightPalettes
pause 40
special HealParty
checkflag ENGINE_BUG_CONTEST_TIMER
@ -37,7 +37,7 @@ OverworldBGMap: ; 124fa
call ClearScreen
call Function3200
call HideSprites
call Function4f0
call RotateThreePalettesLeft
ret
; 1250a

8
home.asm
View File

@ -579,7 +579,7 @@ Function321c:: ; 321c
ld a, 1
ld [hBGMapMode], a
jr LoadDETile
jr LoadEDTile
.dmg
; WaitBGMap
@ -595,8 +595,8 @@ Function3238:: ; 3238
and a
jr z, WaitBGMap
LoadDETile:: ; 323d
jr .LoadDETile
LoadEDTile:: ; 323d
jr .LoadEDTile
; 323f
.unreferenced_323f ; 323f
@ -604,7 +604,7 @@ LoadDETile:: ; 323d
ret
; 3246
.LoadDETile ; 3246
.LoadEDTile ; 3246
ld a, [hBGMapMode]
push af
xor a

4
home/audio.asm
View File

@ -312,13 +312,13 @@ VolumeOff:: ; 3ca3
ret
; 3ca8
Unused_FadeOutMusic:: ; 3ca8
Unused_RotatePalettesRightMusic:: ; 3ca8
ld a, 4
ld [MusicFade], a
ret
; 3cae
FadeInMusic:: ; 3cae
RotatePalettesLeftMusic:: ; 3cae
ld a, 4 | 1 << 7
ld [MusicFade], a
ret

61
home/fade.asm
View File

@ -8,10 +8,10 @@ Function48c:: ; 48c
ld a, l
sub b
ld l, a
jr nc, .asm_499
jr nc, .okay
dec h
.asm_499
.okay
ld a, [hli]
ld [rBGP], a
ld a, [hli]
@ -22,34 +22,34 @@ Function48c:: ; 48c
; 4a3
Function4a3:: ; 4a3
RotateFourPalettesRight:: ; 4a3
ld a, [hCGB]
and a
jr z, .asm_4af
jr z, .dmg
ld hl, IncGradGBPalTable_00
ld b, 4
jr FadeOut
jr RotatePalettesRight
.asm_4af
.dmg
ld hl, IncGradGBPalTable_08
ld b, 4
jr FadeOut
jr RotatePalettesRight
; 4b6
FadeToWhite:: ; 4b6
RotateThreePalettesRight:: ; 4b6
ld a, [hCGB]
and a
jr z, .asm_4c2
jr z, .dmg
ld hl, IncGradGBPalTable_05
ld b, 3
jr FadeOut
jr RotatePalettesRight
.asm_4c2
.dmg
ld hl, IncGradGBPalTable_13
ld b, 3
; 4c7
FadeOut:: ; 4c7
RotatePalettesRight:: ; 4c7
; Rotate palettes to the right and fill with loaded colors from the left
; If we're already at the leftmost color, fill with the leftmost color
push de
ld a, [hli]
call DmgToCgbBGPals
@ -62,39 +62,38 @@ FadeOut:: ; 4c7
call DelayFrames
pop de
dec b
jr nz, FadeOut
jr nz, RotatePalettesRight
ret
; 4dd
Function4dd:: ; 4dd
RotateFourPalettesLeft:: ; 4dd
ld a, [hCGB]
and a
jr z, .asm_4e9
jr z, .dmg
ld hl, IncGradGBPalTable_04 - 1
ld b, 4
jr FadeIn
jr RotatePalettesLeft
.asm_4e9
.dmg
ld hl, IncGradGBPalTable_12 - 1
ld b, 4
jr FadeIn
jr RotatePalettesLeft
; 4f0
Function4f0:: ; 4f0
RotateThreePalettesLeft:: ; 4f0
ld a, [hCGB]
and a
jr z, .asm_4fc
jr z, .dmg
ld hl, IncGradGBPalTable_07 - 1
ld b, 3
jr FadeIn
jr RotatePalettesLeft
.asm_4fc
.dmg
ld hl, IncGradGBPalTable_15 - 1
ld b, 3
; fallthrough
; 501
FadeIn:: ; 501
RotatePalettesLeft:: ; 501
; Rotate palettes to the left and fill with loaded colors from the right
; If we're already at the rightmost color, fill with the rightmost color
push de
ld a, [hld]
ld d, a
@ -107,7 +106,7 @@ FadeIn:: ; 501
call DelayFrames
pop de
dec b
jr nz, FadeIn
jr nz, RotatePalettesLeft
ret
; 517
@ -117,17 +116,21 @@ IncGradGBPalTable_00:: db %11111111, %11111111, %11111111
IncGradGBPalTable_01:: db %11111110, %11111110, %11111110
IncGradGBPalTable_02:: db %11111001, %11111001, %11111001
IncGradGBPalTable_03:: db %11100100, %11100100, %11100100
IncGradGBPalTable_04:: db %11100100, %11100100, %11100100
IncGradGBPalTable_05:: db %10010000, %10010000, %10010000
IncGradGBPalTable_06:: db %01000000, %01000000, %01000000
IncGradGBPalTable_07:: db %00000000, %00000000, %00000000
; bgp obp1 obp2
IncGradGBPalTable_08:: db %11111111, %11111111, %11111111
IncGradGBPalTable_09:: db %11111110, %11111110, %11111000
IncGradGBPalTable_10:: db %11111001, %11100100, %11100100
IncGradGBPalTable_11:: db %11100100, %11010000, %11100000
IncGradGBPalTable_12:: db %11100100, %11010000, %11100000
IncGradGBPalTable_13:: db %10010000, %10000000, %10010000
IncGradGBPalTable_14:: db %01000000, %01000000, %01000000
IncGradGBPalTable_15:: db %00000000, %00000000, %00000000
; 547

4
home/map.asm
View File

@ -2007,7 +2007,7 @@ FadeToMenu:: ; 2b29
xor a
ld [hBGMapMode], a
call LoadStandardMenuDataHeader
callba FadeOutPalettes
callba RotatePalettesRightPalettes
call ClearSprites
call DisableSpriteUpdates
ret
@ -2036,7 +2036,7 @@ Function2b5c:: ; 2b5c
call GetSGBLayout
callba Function49409
call Function3200
callba FadeInPalettes
callba RotatePalettesLeftPalettes
call EnableSpriteUpdates
ret
; 2b74

28
home/time.asm
View File

@ -101,7 +101,7 @@ FixDays:: ; 5e8
; update dl
ld [hRTCDayLo], a ; DL
; flag for s0_ac60
; flag for sRTCStatusFlags
ld a, %01000000
jr .set
@ -120,7 +120,7 @@ FixDays:: ; 5e8
; update dl
ld [hRTCDayLo], a ; DL
; flag for s0_ac60
; flag for sRTCStatusFlags
ld a, %00100000
.set
@ -277,23 +277,23 @@ SetClock:: ; 691
; 6c4
Function6c4:: ; 6c4
; clear s0_ac60
ClearRTCStatus:: ; 6c4
; clear sRTCStatusFlags
xor a
push af
ld a, BANK(s0_ac60)
ld a, BANK(sRTCStatusFlags)
call GetSRAMBank
pop af
ld [s0_ac60], a
ld [sRTCStatusFlags], a
call CloseSRAM
ret
; 6d3
Function6d3:: ; 6d3
; append flags to s0_ac60
ld hl, s0_ac60
RecordRTCStatus:: ; 6d3
; append flags to sRTCStatusFlags
ld hl, sRTCStatusFlags
push af
ld a, BANK(s0_ac60)
ld a, BANK(sRTCStatusFlags)
call GetSRAMBank
pop af
or [hl]
@ -302,11 +302,11 @@ Function6d3:: ; 6d3
ret
; 6e3
Function6e3:: ; 6e3
; check s0_ac60
ld a, BANK(s0_ac60)
CheckRTCStatus:: ; 6e3
; check sRTCStatusFlags
ld a, BANK(sRTCStatusFlags)
call GetSRAMBank
ld a, [s0_ac60]
ld a, [sRTCStatusFlags]
call CloseSRAM
ret
; 6ef

4
items/item_effects.asm
View File

@ -605,7 +605,7 @@ endr
ld b, 0
callba NamingScreen
call FadeToWhite
call RotateThreePalettesRight
call LoadStandardFont
@ -686,7 +686,7 @@ endr
ld hl, Text_SentToBillsPC
call PrintText
call FadeToWhite
call RotateThreePalettesRight
call LoadStandardFont
jr .return_from_capture

13
macros.asm
View File

@ -221,3 +221,16 @@ endc
endm
depixel EQUS "ldpixel de,"
bgcoord: MACRO
IF _NARG == 4
ld \1, \3 * $20 + \2 + \4
ELSE
ld \1, \3 * $20 + \2 + VBGMap0
ENDC
ENDM
hlbgcoord EQUS "bgcoord hl,"
debgcoord EQUS "bgcoord de,"
bcbgcoord EQUS "bgcoord bc,"
bgrows EQUS "* $20"

1
macros/charmap.asm
View File

@ -35,6 +35,7 @@
; Actual characters
charmap "▲", $61
charmap "_", $62
charmap "<COLON>", $6d ; necessary because ":" is already used
charmap "′", $6e
charmap "<LV>", $6e
charmap "″", $6f

1483
main.asm
View File

File diff suppressed because it is too large Load Diff

4
maps/AzaleaTown.asm
View File

@ -30,7 +30,7 @@ UnknownScript_0x198018:
moveperson $b, $b, $b
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 15
appear $b
applymovement $b, MovementData_0x198134
@ -40,7 +40,7 @@ UnknownScript_0x198018:
UnknownScript_0x198034:
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 15
appear $b
applymovement $b, MovementData_0x19813c

10
maps/BattleTowerBattleRoom.asm
View File

@ -31,7 +31,7 @@ Script_BattleRoomLoop: ; 0x9f425
keeptextopen
loadmovesprites
special BattleTowerBattle ; calls predef startbattle
special FadeOutPalettes
special RotatePalettesRightPalettes
reloadmap
if_not_equal $0, Script_FailedBattleTowerChallenge
copybytetovar wNrOfBeatenBattleTowerTrainers ; wcf64
@ -46,10 +46,10 @@ Script_BattleRoomLoop: ; 0x9f425
closetext
loadmovesprites
playmusic MUSIC_HEAL
special FadeOutPalettes
special RotatePalettesRightPalettes
special LoadMapPalettes
pause 60
special FadeInPalettes
special RotatePalettesLeftPalettes
special RestartMapMusic
loadfont
writetext Text_NextUpOpponentNo
@ -73,7 +73,7 @@ Script_DontBattleNextOpponent: ; 0x9f483
special BattleTowerAction
playsound SFX_SAVE
waitbutton
special FadeOutPalettes
special RotatePalettesRightPalettes
special Reset
Script_DontSaveAndEndTheSession: ; 0x9f4a3
writetext Text_CancelYourBattleRoomChallenge
@ -84,7 +84,7 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3
writebyte BATTLE_TOWER_ACTION_06
special BattleTowerAction
loadmovesprites
special FadeOutPalettes
special RotatePalettesRightPalettes
warpfacing UP, BATTLE_TOWER_1F, $7, $7
loadfont
jump UnknownScript_0x9e4b0

4
maps/BluesHouse.asm
View File

@ -30,10 +30,10 @@ UnknownScript_0x19b0de:
writetext UnknownText_0x19b266
closetext
loadmovesprites
special FadeOutPalettes
special RotatePalettesRightPalettes
playmusic MUSIC_HEAL
pause 60
special FadeInPalettes
special RotatePalettesLeftPalettes
special RestartMapMusic
loadfont
writetext UnknownText_0x19b296

4
maps/BurnedTower1F.asm
View File

@ -49,7 +49,7 @@ UnknownScript_0x185c0d:
UnknownScript_0x185c25:
showemote EMOTE_SHOCK, $4, 15
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 15
spriteface $4, RIGHT
pause 15
@ -98,7 +98,7 @@ UnknownScript_0x185c80:
loadmovesprites
dotrigger $2
setevent EVENT_RIVAL_BURNED_TOWER
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 15
earthquake 50
showemote EMOTE_SHOCK, PLAYER, 15

2
maps/CherrygroveCity.asm
View File

@ -103,7 +103,7 @@ UnknownScript_0x19c0aa:
UnknownScript_0x19c0ae:
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 15
appear $3
applymovement $3, MovementData_0x19c1ce

2
maps/CianwoodCity.asm
View File

@ -66,7 +66,7 @@ UnknownScript_0x1a001e:
applymovement $c, MovementData_0x1a00ec
disappear $c
pause 20
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
playmapmusic
pause 10
.Done

2
maps/DragonShrine.asm
View File

@ -130,7 +130,7 @@ DragonShrineTestScript:
writetext UnknownText_0x18d916
closetext
loadmovesprites
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
applymovement $5, MovementData_0x18d2da
loadfont
writetext UnknownText_0x18d974

2
maps/DragonsDenB1F.asm
View File

@ -70,7 +70,7 @@ UnknownScript_0x18c8f4:
loadmovesprites
UnknownScript_0x18c8f9:
applymovement $3, MovementData_0x18c9b3
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 30
special RestartMapMusic
disappear $3

2
maps/EcruteakGym.asm
View File

@ -84,7 +84,7 @@ UnknownScript_0x99dc6:
follow PLAYER, $8
applymovement PLAYER, MovementData_0x99e5f
stopfollow
special FadeOutPalettes
special RotatePalettesRightPalettes
playsound SFX_ENTER_DOOR
waitbutton
warp ECRUTEAK_CITY, $6, $1b

4
maps/FastShip1F.asm
View File

@ -64,7 +64,7 @@ SailorScript_0x75160:
loadmovesprites
scall .LetThePlayerOut
playsound SFX_EXIT_BUILDING
special FadeOutPalettes
special RotatePalettesRightPalettes
waitbutton
setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
domaptrigger VERMILION_PORT, $1
@ -77,7 +77,7 @@ SailorScript_0x75160:
loadmovesprites
scall .LetThePlayerOut
playsound SFX_EXIT_BUILDING
special FadeOutPalettes
special RotatePalettesRightPalettes
waitbutton
setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
domaptrigger OLIVINE_PORT, $1

2
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@ -43,7 +43,7 @@ TwinScript_0x75ebb:
appear $4
spriteface PLAYER, UP
spriteface $4, UP
special Special_FadeInQuickly
special Special_RotatePalettesLeftQuickly
spriteface $3, DOWN
showemote EMOTE_SHOCK, $3, 15
applymovement $4, MovementData_0x7600c

2
maps/FastShipCabins_SW_SSW_NW.asm
View File

@ -70,7 +70,7 @@ FastShipBed:
playmusic MUSIC_HEAL
pause 60
special RestartMapMusic
special Special_FadeInQuickly
special Special_RotatePalettesLeftQuickly
loadfont
writetext FastShipBedText2
closetext

2
maps/IlexForest.asm
View File

@ -449,7 +449,7 @@ UnknownScript_0x6ee42:
loadmovesprites
pause 20
showemote EMOTE_SHOCK, PLAYER, 20
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
applymovement PLAYER, MovementData_0x6ef58
pause 30
spriteface PLAYER, DOWN

6
maps/IndigoPlateauPokeCenter1F.asm
View File

@ -55,7 +55,7 @@ UnknownScript_0x180053:
appear $5
spriteface PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 15
applymovement $5, MovementData_0x180164
playmusic MUSIC_RIVAL_ENCOUNTER
@ -76,7 +76,7 @@ UnknownScript_0x180094:
appear $5
spriteface PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 15
applymovement $5, MovementData_0x18016b
playmusic MUSIC_RIVAL_ENCOUNTER
@ -154,7 +154,7 @@ TeleportGuyScript:
closetext
loadmovesprites
playsound SFX_WARP_TO
special FadeOutPalettes
special RotatePalettesRightPalettes
waitbutton
warp NEW_BARK_TOWN, $d, $6
end

4
maps/KurtsHouse.asm
View File

@ -40,7 +40,7 @@ KurtScript_0x18e178:
writetext UnknownText_0x18e473
closetext
loadmovesprites
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
checkcode VAR_FACING
if_equal UP, .RunAround
@ -287,7 +287,7 @@ KurtScript_0x18e178:
setevent EVENT_FOREST_IS_RESTLESS
clearevent EVENT_CAN_GIVE_GS_BALL_TO_KURT
clearevent EVENT_GAVE_GS_BALL_TO_KURT
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 20
showemote EMOTE_SHOCK, $2, 30
checkcode VAR_FACING

6
maps/LancesRoom.asm
View File

@ -44,12 +44,12 @@ UnknownScript_0x180e53:
end
UnknownScript_0x180e6a:
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
applymovement PLAYER, MovementData_0x180f38
jump LanceScript_0x180e7b
UnknownScript_0x180e74:
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
applymovement PLAYER, MovementData_0x180f3c
LanceScript_0x180e7b:
spriteface $2, LEFT
@ -125,7 +125,7 @@ LanceScript_0x180e7b:
pause 30
loadmovesprites
applymovement $3, MovementData_0x180f5b
special FadeOutPalettes
special RotatePalettesRightPalettes
pause 15
warpfacing UP, HALL_OF_FAME, $4, $d
end

4
maps/MobileBattleRoom.asm
View File

@ -35,11 +35,11 @@ MapMobileBattleRoomSignpost0Script:
writetext MobileBattleRoom_HealText
pause 20
loadmovesprites
special FadeOutPalettes
special RotatePalettesRightPalettes
playmusic MUSIC_HEAL
special LoadMapPalettes
pause 60
special FadeInPalettes
special RotatePalettesLeftPalettes
special RestartMapMusic
refreshscreen $0
.two_:

2
maps/MountMoon.asm
View File

@ -19,7 +19,7 @@ UnknownScript_0x7408d:
UnknownScript_0x7408e:
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 15
applymovement $2, MovementData_0x740f9
playmusic MUSIC_RIVAL_ENCOUNTER

2
maps/MrPokemonsHouse.asm
View File

@ -114,7 +114,7 @@ UnknownScript_0x196ec9:
special Mobile_HealParty
special HealParty
pause 60
special Special_FadeInQuickly
special Special_RotatePalettesLeftQuickly
special RestartMapMusic
loadfont
writetext UnknownText_0x197134

4
maps/OlivineCity.asm
View File

@ -25,7 +25,7 @@ OlivineCity_MapScriptHeader:
UnknownScript_0x1a8833:
spriteface PLAYER, LEFT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 15
playsound SFX_ENTER_DOOR
appear $5
@ -49,7 +49,7 @@ UnknownScript_0x1a8833:
UnknownScript_0x1a886b:
spriteface PLAYER, LEFT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 15
playsound SFX_ENTER_DOOR
appear $5

12
maps/OlivineLighthouse6F.asm
View File

@ -42,9 +42,9 @@ UnknownScript_0x60bab:
loadmovesprites
special RestartMapMusic
cry AMPHAROS
special FadeOutPalettes
special RotatePalettesRightPalettes
pause 10
special FadeInPalettes
special RotatePalettesLeftPalettes
loadfont
writetext UnknownText_0x60f3d
closetext
@ -116,10 +116,10 @@ UnknownScript_0x60c51:
cry AMPHAROS
closetext
loadmovesprites
special FadeOutPalettes
special FadeInPalettes
special FadeOutPalettes
special FadeInPalettes
special RotatePalettesRightPalettes
special RotatePalettesLeftPalettes
special RotatePalettesRightPalettes
special RotatePalettesLeftPalettes
end
ItemFragment_0x60c66:

2
maps/OlivinePort.asm
View File

@ -39,7 +39,7 @@ SailorScript_0x748c0:
waitbutton
applymovement PLAYER, MovementData_0x74a30
playsound SFX_EXIT_BUILDING
special FadeOutPalettes
special RotatePalettesRightPalettes
waitbutton
checkevent EVENT_FAST_SHIP_FIRST_TIME
iffalse UnknownScript_0x7490a

6
maps/RadioTower2F.asm
View File

@ -140,7 +140,7 @@ UnknownScript_0x5d7be:
writetext UnknownText_0x5e054
closetext
loadmovesprites
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 20
special RestartMapMusic
checkcode VAR_BLUECARDBALANCE
@ -169,7 +169,7 @@ UnknownScript_0x5d81e:
closetext
loadmovesprites
spriteface $b, RIGHT
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 20
special RestartMapMusic
end
@ -200,7 +200,7 @@ UnknownScript_0x5d845:
closetext
loadmovesprites
spriteface $b, RIGHT
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 20
special RestartMapMusic
end

2
maps/RadioTower5F.asm
View File

@ -95,7 +95,7 @@ UnknownScript_0x6006e:
disappear $3
disappear $4
pause 15
special Special_FadeInQuickly
special Special_RotatePalettesLeftQuickly
setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1
setevent EVENT_CLEARED_RADIO_TOWER
clearflag ENGINE_ROCKETS_IN_RADIO_TOWER

4
maps/Route24.asm
View File

@ -21,7 +21,7 @@ RocketScript_0x1adbfa:
loadfont
writetext UnknownText_0x1addc0
keeptextopen
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
writetext UnknownText_0x1adee1
closetext
loadmovesprites
@ -29,7 +29,7 @@ RocketScript_0x1adbfa:
special Special_ReloadSpritesNoPalettes
disappear $2
pause 25
special Special_FadeInQuickly
special Special_RotatePalettesLeftQuickly
playmapmusic
end

2
maps/Route26HealSpeechHouse.asm
View File

@ -17,7 +17,7 @@ TeacherScript_0x7b125:
playmusic MUSIC_HEAL
special HealParty
pause 60
special Special_FadeInQuickly
special Special_RotatePalettesLeftQuickly
special RestartMapMusic
loadfont
writetext UnknownText_0x7b18b

4
maps/Route35NationalParkgate.asm
View File

@ -75,7 +75,7 @@ Route35NationalParkgate_GoBackIn:
loadmovesprites
scall Route35NationalParkgate_EnterContest
playsound SFX_ENTER_DOOR
special FadeOutPalettes
special RotatePalettesRightPalettes
waitbutton
warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f
end
@ -112,7 +112,7 @@ Route35NationalParkgate_OkayToProceed:
special Special_GiveParkBalls
scall Route35NationalParkgate_EnterContest
playsound SFX_ENTER_DOOR
special FadeOutPalettes
special RotatePalettesRightPalettes
waitbutton
special Special_SelectRandomBugContestContestants
warpfacing UP, NATIONAL_PARK_BUG_CONTEST, $a, $2f

6
maps/Route36NationalParkgate.asm
View File

@ -74,7 +74,7 @@ Route36NationalParkgate_MapScriptHeader:
appear $d
applymovement PLAYER, MovementData_0x6add1
pause 15
special Special_FadeInQuickly
special Special_RotatePalettesLeftQuickly
jumpstd bugcontestresults
.GoBackToContest:
@ -83,7 +83,7 @@ Route36NationalParkgate_MapScriptHeader:
loadmovesprites
spriteface PLAYER, LEFT
playsound SFX_EXIT_BUILDING
special FadeOutPalettes
special RotatePalettesRightPalettes
waitbutton
warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12
end
@ -166,7 +166,7 @@ Route36OfficerScriptContest:
special Special_GiveParkBalls
spriteface PLAYER, LEFT
playsound SFX_EXIT_BUILDING
special FadeOutPalettes
special RotatePalettesRightPalettes
waitbutton
special Special_SelectRandomBugContestContestants
warpfacing LEFT, NATIONAL_PARK_BUG_CONTEST, $21, $12

6
maps/SilverCaveRoom3.asm
View File

@ -6,7 +6,7 @@ SilverCaveRoom3_MapScriptHeader:
db 0
RedScript_0x18c603:
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
faceplayer
loadfont
writetext UnknownText_0x18c637
@ -17,7 +17,7 @@ RedScript_0x18c603:
startbattle
reloadmapmusic
returnafterbattle
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
loadfont
writetext UnknownText_0x18c63f
closetext
@ -26,7 +26,7 @@ RedScript_0x18c603:
special Special_ReloadSpritesNoPalettes
disappear $2
pause 15
special Special_FadeInQuickly
special Special_RotatePalettesLeftQuickly
pause 30
special HealParty
refreshscreen $0

4
maps/SlowpokeWellB1F.asm
View File

@ -34,7 +34,7 @@ GruntM1Script:
disappear $4
disappear $5
pause 15
special Special_FadeInQuickly
special Special_RotatePalettesLeftQuickly
disappear $8
moveperson $8, $b, $6
appear $8
@ -56,7 +56,7 @@ GruntM1Script:
clearevent EVENT_AZALEA_TOWN_SLOWPOKES
clearevent EVENT_KURTS_HOUSE_SLOWPOKE
clearevent EVENT_KURTS_HOUSE_KURT_1
special FadeOutPalettes
special RotatePalettesRightPalettes
special HealParty
pause 15
warp KURTS_HOUSE, $3, $3

4
maps/SproutTower3F.asm
View File

@ -18,7 +18,7 @@ UnknownScript_0x184946:
UnknownScript_0x184947:
spriteface PLAYER, UP
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
playsound SFX_TACKLE
playsound SFX_ELEVATOR
earthquake 79
@ -51,7 +51,7 @@ UnknownScript_0x184947:
special Special_ReloadSpritesNoPalettes
disappear $8
waitbutton
special Special_FadeInQuickly
special Special_RotatePalettesLeftQuickly
dotrigger $1
special RestartMapMusic
end

12
maps/TeamRocketBaseB1F.asm
View File

@ -445,9 +445,9 @@ ExplodingTrap22:
end
VoltorbExplodingTrap:
special FadeOutPalettes
special RotatePalettesRightPalettes
cry VOLTORB
special FadeInPalettes
special RotatePalettesLeftPalettes
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata VOLTORB, 23
@ -455,9 +455,9 @@ VoltorbExplodingTrap:
end
GeodudeExplodingTrap:
special FadeOutPalettes
special RotatePalettesRightPalettes
cry GEODUDE
special FadeInPalettes
special RotatePalettesLeftPalettes
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata GEODUDE, 21
@ -465,9 +465,9 @@ GeodudeExplodingTrap:
end
KoffingExplodingTrap:
special FadeOutPalettes
special RotatePalettesRightPalettes
cry KOFFING
special FadeInPalettes
special RotatePalettesLeftPalettes
setlasttalked $ff
writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
loadpokedata KOFFING, 21

6
maps/TeamRocketBaseB2F.asm
View File

@ -106,7 +106,7 @@ UnknownScript_0x6cfac:
disappear $d
disappear $e
pause 15
special Special_FadeInQuickly
special Special_RotatePalettesLeftQuickly
dotrigger $2
clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE
spriteface $4, DOWN
@ -155,11 +155,11 @@ UnknownScript_0x6d091:
writetext UnknownText_0x6da97
closetext
loadmovesprites
special FadeOutPalettes
special RotatePalettesRightPalettes
special Mobile_HealParty
playsound SFX_FULL_HEAL
special HealParty
special FadeInPalettes
special RotatePalettesLeftPalettes
loadfont
writetext UnknownText_0x6daf7
closetext

2
maps/TeamRocketBaseB3F.asm
View File

@ -55,7 +55,7 @@ LanceScript_0x6dffc:
UnknownScript_0x6e019:
spriteface PLAYER, LEFT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
appear $a
applymovement $a, MovementData_0x6e164
spriteface PLAYER, LEFT

2
maps/TinTower1F.asm
View File

@ -158,7 +158,7 @@ UnknownScript_0x1850d7:
playsound SFX_EXIT_BUILDING
disappear $5
waitbutton
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 20
playmapmusic
end

4
maps/UndergroundPathSwitchRoomEntrances.asm
View File

@ -80,7 +80,7 @@ TeacherScript_0x7ca7d:
UnknownScript_0x7ca80:
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 15
playsound SFX_EXIT_BUILDING
appear $c
@ -99,7 +99,7 @@ UnknownScript_0x7ca80:
UnknownScript_0x7caaa:
spriteface PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 15
playsound SFX_EXIT_BUILDING
appear $c

2
maps/VermilionPort.asm
View File

@ -51,7 +51,7 @@ SailorScript_0x74dc4:
waitbutton
applymovement PLAYER, MovementData_0x74ef1
playsound SFX_EXIT_BUILDING
special FadeOutPalettes
special RotatePalettesRightPalettes
waitbutton
setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND

4
maps/VictoryRoad.asm
View File

@ -19,7 +19,7 @@ UnknownScript_0x74492:
moveperson $2, $12, $b
spriteface PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 15
appear $2
applymovement $2, MovementData_0x74539
@ -33,7 +33,7 @@ UnknownScript_0x74492:
UnknownScript_0x744b5:
spriteface PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
special Special_FadeOutMusic
special Special_RotatePalettesRightMusic
pause 15
appear $2
applymovement $2, MovementData_0x74542

8
maps/WarehouseEntrance.asm
View File

@ -226,10 +226,10 @@ OlderHaircutBrotherScript:
writetext UnknownText_0x7c6b8
closetext
loadmovesprites
special FadeOutPalettes
special RotatePalettesRightPalettes
playmusic MUSIC_HEAL
pause 60
special FadeInPalettes
special RotatePalettesLeftPalettes
special RestartMapMusic
loadfont
writetext UnknownText_0x7c6d8
@ -309,10 +309,10 @@ YoungerHaircutBrotherScript:
writetext UnknownText_0x7c80e
closetext
loadmovesprites
special FadeOutPalettes
special RotatePalettesRightPalettes
playmusic MUSIC_HEAL
pause 60
special FadeInPalettes
special RotatePalettesLeftPalettes
special RestartMapMusic
loadfont
writetext UnknownText_0x7c82a

2
misc/mobile_12.asm
View File

@ -1,4 +1,4 @@
Function4802f: ; 4802f (12:402f)
InitMobileProfile: ; 4802f (12:402f)
xor a
set 6, a
ld [wd002], a

4
misc/mobile_40.asm
View File

@ -312,7 +312,7 @@ Function10016f: ; 10016f
Function10020b: ; 10020b
xor a
ld [wc303], a
callba FadeOutPalettes
callba RotatePalettesRightPalettes
callba Function106464
call HideSprites
call DelayFrame
@ -1591,7 +1591,7 @@ Function1009d2: ; 1009d2
ld [rVBK], a
ld hl, w3_d800
ld de, VBGMap0
debgcoord 0, 0
lb bc, $3, $24
call Get2bpp

12
misc/mobile_42.asm
View File

@ -241,13 +241,13 @@ Function1081ad: ; 1081ad
Function1081ca: ; 1081ca
ld a, $1
ld [rVBK], a
ld hl, VBGMap0
hlbgcoord 0, 0
ld bc, $0800
ld a, $0
call ByteFill
ld a, $0
ld [rVBK], a
ld hl, VBGMap0
hlbgcoord 0, 0
ld bc, $0800
ld a, $7f
call ByteFill
@ -1669,10 +1669,10 @@ UnknownText_0x108c68: ; 0x108c68
Function108c6d: ; 108c6d
ld hl, LZ_108fe7
ld de, VBGMap0
debgcoord 0, 0
call Decompress
ld hl, LZ_108fe7
ld de, VBGMap1
debgcoord 0, 0, VBGMap1
call Decompress
ret
; 108c80
@ -1681,10 +1681,10 @@ Function108c80: ; 108c80
ld a, $1
ld [rVBK], a
ld hl, LZ_1090a7
ld de, VBGMap0
debgcoord 0, 0
call Decompress
ld hl, LZ_1090a7
ld de, VBGMap1
debgcoord 0, 0, VBGMap1
call Decompress
ld a, $0
ld [rVBK], a

2
misc/mobile_45.asm
View File

@ -8407,7 +8407,7 @@ Function117c4a:
add hl, de
dec c
jr nz, .asm_117c71 ; 0x117c7b $f4
call FadeToWhite
call RotateThreePalettesRight
pop af
ld [rSVBK], a
ld a, $80

36
misc/mobile_5b.asm
View File

@ -169,7 +169,7 @@ Function16c108: ; 16c108
call Function16c130
call Function16c145
call Function16c15c
ld hl, VBGMap0
hlbgcoord 0, 0
call Function16cc73
call Function16cc02
xor a
@ -795,7 +795,7 @@ Function16cc62: ; 16cc62
; 16cc6e
Function16cc6e: ; 16cc6e
ld hl, VBGMap1
hlbgcoord 0, 0, VBGMap1
jr Function16cc73
Function16cc73:
@ -925,19 +925,19 @@ rept 2
inc c
endr
ld a, $7
.asm_16d630
.loop
push bc
push hl
.asm_16d632
.loop2
ld [hli], a
dec c
jr nz, .asm_16d632
jr nz, .loop2
pop hl
ld de, $0014
ld de, SCREEN_WIDTH
add hl, de
pop bc
dec b
jr nz, .asm_16d630
jr nz, .loop
ret
; 16d640
@ -950,20 +950,20 @@ Function16d640: ; 16d640
inc a
ld [hl], a
pop hl
ld de, $0014
ld de, SCREEN_WIDTH
add hl, de
.asm_16d64f
.loop
push hl
ld a, $33
ld [hli], a
ld a, $7f
ld a, " "
call Function16d66d
ld [hl], $34
pop hl
ld de, $0014
ld de, SCREEN_WIDTH
add hl, de
dec b
jr nz, .asm_16d64f
jr nz, .loop
ld a, $35
ld [hli], a
ld a, $36
@ -974,10 +974,10 @@ Function16d640: ; 16d640
Function16d66d: ; 16d66d
ld d, c
.asm_16d66e
.loop
ld [hli], a
dec d
jr nz, .asm_16d66e
jr nz, .loop
ret
; 16d673
@ -1044,11 +1044,11 @@ Function16d6ce: ; 16d6ce
Function16d6e1: ; 16d6e1
hlcoord 4, 10
ld b, $1
ld c, $a
ld b, 1
ld c, 10
predef Function28eef
hlcoord 5, 11
ld de, String_16d701
ld de, .Waiting
call PlaceString
call WaitBGMap
call Function3200
@ -1056,7 +1056,7 @@ Function16d6e1: ; 16d6e1
jp DelayFrames
; 16d701
String_16d701: ; 16d701
.Waiting: ; 16d701
db "WAITING..!@"
; 16d70c

4
misc/mobile_5f.asm
View File

@ -1973,7 +1973,7 @@ MenuData2_17dc96:
Function17dc9f: ; 17dc9f
call Function17e415
call Function17e41e
call Function4dd
call RotateFourPalettesLeft
ret
; 17dca9
@ -1997,7 +1997,7 @@ Function17dcaf:
add hl, de
dec c
jr nz, .asm_17dcbb
call FadeToWhite
call RotateThreePalettesRight
ld a, $4
ld [rSVBK], a
ret

2
misc/unused_title.asm
View File

@ -31,7 +31,7 @@ endr
call CopyBytes
ld hl, UnusedTitleBG_Tilemap
ld de, VBGMap0
debgcoord 0, 0
ld bc, 32 * 32
.copy
ld a, 0

10
sram.asm
View File

@ -57,11 +57,12 @@ sMailbox10Backup:: mailmsg sMailbox10Backup
; abe2
sMysteryGiftItem:: ds 1
s0_abe3:: ds 1
sMysteryGiftUnlocked:: ds 1
sBackupMysteryGiftItem:: ds 1
s0_abe5:: ds 1
s0_abe6:: ds 10
s0_abf0:: ds 10
sMysteryGiftDecorationsReceived:: flag_array NUM_NON_TROPHY_DECOS
ds 4
sMysteryGiftTimer:: ds 1
sMysteryGiftTimerStartDay:: ds 1
ds 1
@ -73,12 +74,11 @@ sBackupMysteryGiftItemEnd::
ds $30
s0_ac60:: ds 8
sRTCStatusFlags:: ds 8
sLuckyNumberDay:: ds 1
sLuckyIDNumber:: ds 2
ds $b200 - $ac6b
SECTION "Backup Save", SRAM [$b200], BANK [0]
sBackupOptions:: ds OptionsEnd - Options
s0_b208:: ds 1