Placeholder non-generic names for engine/color functions

This commit is contained in:
pikalaxalt
2016-05-11 09:49:03 -04:00
parent 76819398a9
commit 295604cbb5
9 changed files with 142 additions and 127 deletions

View File

@@ -1800,8 +1800,10 @@ Music_Vibrato: ; e8882
; e88bd ; e88bd
Music_SlidePitchTo: ; e88bd Music_SlidePitchTo: ; e88bd
; ???? ; set the target for pitch wheel
; params: 2 ; params: 2
; note duration
; target note
call GetMusicByte call GetMusicByte
ld [wCurNoteDuration], a ld [wCurNoteDuration], a
@@ -1830,7 +1832,7 @@ Music_SlidePitchTo: ; e88bd
Music_Tone: ; e88e4 Music_Tone: ; e88e4
; tone ; tone
; params: 2 ; params: 1 (dw)
ld hl, Channel1Flags2 - Channel1 ld hl, Channel1Flags2 - Channel1
add hl, bc add hl, bc
set SOUND_CRY_PITCH, [hl] set SOUND_CRY_PITCH, [hl]
@@ -1859,9 +1861,8 @@ MusicE7: ; e88f7
; e8906 ; e8906
Music_SoundDuty: ; e8906 Music_SoundDuty: ; e8906
; ???? + duty cycle ; sequence of 4 duty cycles to be looped
; params: 1 ; params: 1 (4 2-bit duty cycle arguments)
;
ld hl, Channel1Flags2 - Channel1 ld hl, Channel1Flags2 - Channel1
add hl, bc add hl, bc
set SOUND_DUTY, [hl] ; duty cycle set SOUND_DUTY, [hl] ; duty cycle

View File

@@ -84,7 +84,7 @@ Predef_StartBattle: ; 8c20f
.NonMobile_LoadPokeballTiles: ; 8c2a0 .NonMobile_LoadPokeballTiles: ; 8c2a0
call LoadTrainerBattlePokeballTiles call LoadTrainerBattlePokeballTiles
hlbgcoord 0, 0 hlbgcoord 0, 0
call Function8c2cf call ConvertTrainerBattlePokeballTilesTo2bpp
ret ret
; 8c2aa ; 8c2aa
@@ -113,7 +113,7 @@ LoadTrainerBattlePokeballTiles:
ret ret
; 8c2cf ; 8c2cf
Function8c2cf: ; 8c2cf ConvertTrainerBattlePokeballTilesTo2bpp: ; 8c2cf
ld a, [rSVBK] ld a, [rSVBK]
push af push af
ld a, $6 ld a, $6
@@ -132,7 +132,7 @@ Function8c2cf: ; 8c2cf
pop hl pop hl
ld de, wDecompressScratch ld de, wDecompressScratch
ld b, BANK(Function8c2cf) ; BANK(@) ld b, BANK(ConvertTrainerBattlePokeballTilesTo2bpp) ; BANK(@)
ld c, $28 ld c, $28
call Request2bpp call Request2bpp
pop af pop af

File diff suppressed because it is too large Load Diff

View File

@@ -582,7 +582,7 @@ SpriteAnimSeqData: ; 8d1c4
db SPRITE_ANIM_FRAMESET_25, SPRITE_ANIM_SEQ_NULL, $00 ; 1b headbutt db SPRITE_ANIM_FRAMESET_25, SPRITE_ANIM_SEQ_NULL, $00 ; 1b headbutt
db SPRITE_ANIM_FRAMESET_20, SPRITE_ANIM_SEQ_13, $00 ; 1c db SPRITE_ANIM_FRAMESET_20, SPRITE_ANIM_SEQ_13, $00 ; 1c
db SPRITE_ANIM_FRAMESET_26, SPRITE_ANIM_SEQ_1A, $00 ; 1d db SPRITE_ANIM_FRAMESET_26, SPRITE_ANIM_SEQ_1A, $00 ; 1d
db SPRITE_ANIM_FRAMESET_2D, SPRITE_ANIM_SEQ_NULL, $00 ; 1e db SPRITE_ANIM_FRAMESET_2D, SPRITE_ANIM_SEQ_NULL, $00 ; 1e kris on map
db SPRITE_ANIM_FRAMESET_2E, SPRITE_ANIM_SEQ_NULL, $00 ; 1f kris on magnet train db SPRITE_ANIM_FRAMESET_2E, SPRITE_ANIM_SEQ_NULL, $00 ; 1f kris on magnet train
db SPRITE_ANIM_FRAMESET_2F, SPRITE_ANIM_SEQ_NULL, $00 ; 20 db SPRITE_ANIM_FRAMESET_2F, SPRITE_ANIM_SEQ_NULL, $00 ; 20
db SPRITE_ANIM_FRAMESET_30, SPRITE_ANIM_SEQ_NULL, $00 ; 21 db SPRITE_ANIM_FRAMESET_30, SPRITE_ANIM_SEQ_NULL, $00 ; 21

View File

@@ -37,7 +37,7 @@ ReadAnyMail: ; b9237
call WaitBGMap call WaitBGMap
ld a, [Buffer3] ld a, [Buffer3]
ld e, a ld e, a
callba Function8cb4 callba LoadMailPalettes
call SetPalettes call SetPalettes
xor a xor a
ld [hJoyPressed], a ld [hJoyPressed], a

View File

@@ -1492,7 +1492,7 @@ Function17d93a: ; 17d93a
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld a, [$c70c] ld a, [$c70c]
ld e, a ld e, a
callba Function8bc6 callba LoadMonPaletteAsNthBGPal
call SetPalettes call SetPalettes
ld a, [$c708] ld a, [$c708]
ld l, a ld l, a
@@ -1528,7 +1528,7 @@ Function17d98b: ; 17d98b
ld [TrainerClass], a ld [TrainerClass], a
ld a, [$c70b] ld a, [$c70b]
ld e, a ld e, a
callba Function8bbd callba LoadTrainerClassPaletteAsNthBGPal
call SetPalettes call SetPalettes
ld a, [$c708] ld a, [$c708]
ld e, a ld e, a

View File

@@ -14,7 +14,7 @@ Predef_LoadSGBLayoutCGB: ; 8d59
.not_ram .not_ram
cp SCGB_PARTY_MENU_HP_PALS cp SCGB_PARTY_MENU_HP_PALS
jp z, CGB_ApplyPartyMenuHPPals jp z, CGB_ApplyPartyMenuHPPals
call Function9673 call ResetBGPals
ld l, a ld l, a
ld h, 0 ld h, 0
add hl, hl add hl, hl

View File

@@ -5,7 +5,7 @@ GetMysteryGift_MobileAdapterLayout: ; 4930f (mobile)
ld a, [SGBPredef] ld a, [SGBPredef]
.not_ram .not_ram
push af push af
callba Function9673 callba ResetBGPals
pop af pop af
ld l, a ld l, a
ld h, 0 ld h, 0

View File

@@ -65,7 +65,7 @@ Predef_LoadSGBLayout: ; 864c
.SGB_BattleColors: ; 86b4 .SGB_BattleColors: ; 86b4
ld hl, BlkPacket_9aa6 ld hl, BlkPacket_9aa6
call Function9809 call PushSGBPals_
ld hl, PalPacket_9ce6 ld hl, PalPacket_9ce6
ld de, wSGBPals ld de, wSGBPals
@@ -627,7 +627,7 @@ endr
.Finish: ; 8a60 .Finish: ; 8a60
push de push de
call Function9809 call PushSGBPals_
pop hl pop hl
jp Function9809 jp PushSGBPals_
; 8a68 ; 8a68