pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Start organizing WRAM

Browse Source 
- Use db and dw when they're more meaningful than ds 1/2
- Use unions to group related labels
This commit is contained in:
Remy Oukaour
2017-12-09 13:52:14 -05:00
parent 0b7d8d44ad
commit 16c6696dd5
14 changed files with 195 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/credits.asm
View File

@@ -491,7 +491,7 @@ ParseCredits: ; 1099aa
ld a, MUSIC_POST_CREDITS % $100
ld [MusicFadeID], a
ld a, MUSIC_POST_CREDITS / $100
ld [MusicFadeIDHi], a
ld [MusicFadeID + 1], a
ret
.get

4
engine/init_gender.asm
View File

@@ -68,9 +68,9 @@ InitGenderScreen: ; 48e14 (12:4e14)
ld a, $10
ld [MusicFade], a
ld a, MUSIC_NONE
ld [MusicFadeIDLo], a
ld [MusicFadeID], a
ld a, $0
ld [MusicFadeIDHi], a
ld [MusicFadeID + 1], a
ld c, 8
call DelayFrames
call ClearBGPalettes

20
engine/intro_menu.asm
View File

@@ -375,9 +375,9 @@ Continue: ; 5d65
ld a, $8
ld [MusicFade], a
ld a, MUSIC_NONE % $100
ld [MusicFadeIDLo], a
ld [MusicFadeID], a
ld a, MUSIC_NONE / $100
ld [MusicFadeIDHi], a
ld [MusicFadeID + 1], a
call ClearBGPalettes
call Continue_MobileAdapterMenu
call CloseWindow
@@ -429,9 +429,9 @@ Continue_MobileAdapterMenu: ; 5df0
ld a, 5
ld [MusicFade], a
ld a, MUSIC_MOBILE_ADAPTER_MENU % $100
ld [MusicFadeIDLo], a
ld [MusicFadeID], a
ld a, MUSIC_MOBILE_ADAPTER_MENU / $100
ld [MusicFadeIDHi], a
ld [MusicFadeID + 1], a
ld c, 20
call DelayFrames
ld c, $1
@@ -440,9 +440,9 @@ Continue_MobileAdapterMenu: ; 5df0
ld a, 8
ld [MusicFade], a
ld a, MUSIC_NONE % $100
ld [MusicFadeIDLo], a
ld [MusicFadeID], a
ld a, MUSIC_NONE / $100
ld [MusicFadeIDHi], a
ld [MusicFadeID + 1], a
ld c, 35
call DelayFrames
ret
@@ -859,9 +859,9 @@ ShrinkPlayer: ; 610f
ld [MusicFade], a
ld de, MUSIC_NONE
ld a, e
ld [MusicFadeIDLo], a
ld [MusicFadeID], a
ld a, d
ld [MusicFadeIDHi], a
ld [MusicFadeID + 1], a
ld de, SFX_ESCAPE_ROPE
call PlaySFX
@@ -1282,8 +1282,8 @@ TitleScreenMain: ; 6304
; Fade out the title screen music
xor a
ld [MusicFadeIDLo], a
ld [MusicFadeIDHi], a
ld [MusicFadeID], a
ld [MusicFadeID + 1], a
ld hl, MusicFade
ld [hl], 8 ; 1 second

4
engine/map_setup.asm
View File

@@ -414,9 +414,9 @@ RetainOldPalettes: ; 1556d
RotatePalettesRightMapAndMusic: ; 15574
ld e, 0
ld a, [MusicFadeIDLo]
ld a, [MusicFadeID]
ld d, 0
ld a, [MusicFadeIDHi]
ld a, [MusicFadeID + 1]
ld a, $4
ld [MusicFade], a
call RotateThreePalettesRight

4
engine/specials.asm
View File

@@ -618,9 +618,9 @@ SpecialGameboyCheck: ; c478
Special_FadeOutMusic: ; c48f
ld a, MUSIC_NONE % $100
ld [MusicFadeIDLo], a
ld [MusicFadeID], a
ld a, MUSIC_NONE / $100
ld [MusicFadeIDHi], a
ld [MusicFadeID + 1], a
ld a, $2
ld [MusicFade], a
ret

4
engine/timeset.asm
View File

@@ -10,9 +10,9 @@ InitClock: ; 90672 (24:4672)
ld a, $10
ld [MusicFade], a
ld a, MUSIC_NONE % $100
ld [MusicFadeIDLo], a
ld [MusicFadeID], a
ld a, MUSIC_NONE / $100
ld [MusicFadeIDHi], a
ld [MusicFadeID + 1], a
ld c, 8
call DelayFrames
call RotateFourPalettesLeft