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

Name all link trade animation related functions

Browse Source
This commit is contained in:
pikalaxalt 2016-05-13 22:46:32 -04:00
parent 1be6923c06
commit 5ea3a953c3
14 changed files with 313 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
constants/cgb_constants.asm
View File

@ -25,9 +25,9 @@
const SCGB_17 const SCGB_17
const SCGB_18 const SCGB_18
const SCGB_GAMEFREAK_LOGO const SCGB_GAMEFREAK_LOGO
const SCGB_1A const SCGB_PLAYER_OR_MON_FRONTPIC_PALS
const SCGB_1B const SCGB_TRADE_TUBE
const SCGB_FRONTPICPALS const SCGB_TRAINER_OR_MON_FRONTPIC_PALS
const SCGB_1D const SCGB_1D
const SCGB_1E const SCGB_1E

10
constants/sprite_constants.asm
View File

@ -390,8 +390,8 @@ MAX_OUTDOOR_SPRITES EQU 23
const SPRITE_ANIM_FRAMESET_14 const SPRITE_ANIM_FRAMESET_14
const SPRITE_ANIM_FRAMESET_15 const SPRITE_ANIM_FRAMESET_15
const SPRITE_ANIM_FRAMESET_16 const SPRITE_ANIM_FRAMESET_16
const SPRITE_ANIM_FRAMESET_17 const SPRITE_ANIM_FRAMESET_TRADEMON_ICON
const SPRITE_ANIM_FRAMESET_18 const SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE
const SPRITE_ANIM_FRAMESET_19 const SPRITE_ANIM_FRAMESET_19
const SPRITE_ANIM_FRAMESET_1A const SPRITE_ANIM_FRAMESET_1A
const SPRITE_ANIM_FRAMESET_1B const SPRITE_ANIM_FRAMESET_1B
@ -453,7 +453,7 @@ MAX_OUTDOOR_SPRITES EQU 23
const SPRITE_ANIM_SEQ_0F const SPRITE_ANIM_SEQ_0F
const SPRITE_ANIM_SEQ_10 const SPRITE_ANIM_SEQ_10
const SPRITE_ANIM_SEQ_11 const SPRITE_ANIM_SEQ_11
const SPRITE_ANIM_SEQ_12 const SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE
const SPRITE_ANIM_SEQ_13 const SPRITE_ANIM_SEQ_13
const SPRITE_ANIM_SEQ_14 const SPRITE_ANIM_SEQ_14
const SPRITE_ANIM_SEQ_15 const SPRITE_ANIM_SEQ_15
@ -489,8 +489,8 @@ MAX_OUTDOOR_SPRITES EQU 23
const SPRITE_ANIM_INDEX_0E const SPRITE_ANIM_INDEX_0E
const SPRITE_ANIM_INDEX_0F const SPRITE_ANIM_INDEX_0F
const SPRITE_ANIM_INDEX_10 const SPRITE_ANIM_INDEX_10
const SPRITE_ANIM_INDEX_11 const SPRITE_ANIM_INDEX_TRADEMON_ICON
const SPRITE_ANIM_INDEX_12 const SPRITE_ANIM_INDEX_TRADEMON_BUBBLE
const SPRITE_ANIM_INDEX_13 const SPRITE_ANIM_INDEX_13
const SPRITE_ANIM_INDEX_14 const SPRITE_ANIM_INDEX_14
const SPRITE_ANIM_INDEX_15 const SPRITE_ANIM_INDEX_15

10
engine/intro_menu.asm
View File

@ -688,7 +688,7 @@ OakSpeech: ; 0x5f99
ld [TrainerClass], a ld [TrainerClass], a
call Intro_PrepTrainerPic call Intro_PrepTrainerPic
ld b, SCGB_FRONTPICPALS ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetSGBLayout call GetSGBLayout
call Intro_RotatePalettesLeftFrontpic call Intro_RotatePalettesLeftFrontpic
@ -709,7 +709,7 @@ OakSpeech: ; 0x5f99
ld [TempMonDVs], a ld [TempMonDVs], a
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld b, SCGB_FRONTPICPALS ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetSGBLayout call GetSGBLayout
call Intro_WipeInFrontpic call Intro_WipeInFrontpic
@ -726,7 +726,7 @@ OakSpeech: ; 0x5f99
ld [TrainerClass], a ld [TrainerClass], a
call Intro_PrepTrainerPic call Intro_PrepTrainerPic
ld b, SCGB_FRONTPICPALS ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetSGBLayout call GetSGBLayout
call Intro_RotatePalettesLeftFrontpic call Intro_RotatePalettesLeftFrontpic
@ -739,7 +739,7 @@ OakSpeech: ; 0x5f99
ld [CurPartySpecies], a ld [CurPartySpecies], a
callba DrawIntroPlayerPic callba DrawIntroPlayerPic
ld b, SCGB_FRONTPICPALS ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetSGBLayout call GetSGBLayout
call Intro_RotatePalettesLeftFrontpic call Intro_RotatePalettesLeftFrontpic
@ -809,7 +809,7 @@ NamePlayer: ; 0x6074
ld [CurPartySpecies], a ld [CurPartySpecies], a
callba DrawIntroPlayerPic callba DrawIntroPlayerPic
ld b, SCGB_FRONTPICPALS ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetSGBLayout call GetSGBLayout
call RotateThreePalettesLeft call RotateThreePalettesLeft

6
engine/sprite_anims.asm
View File

@ -554,19 +554,19 @@ DoAnimFrame: ; 8d24b
inc [hl] inc [hl]
inc [hl] inc [hl]
cp $b0 cp $b0
jr nc, .asm_8d53f jr nc, .delete
and $3 and $3
ret nz ret nz
ld de, SFX_POKEBALLS_PLACED_ON_TABLE ld de, SFX_POKEBALLS_PLACED_ON_TABLE
call PlaySFX call PlaySFX
ret ret
.asm_8d53f .delete
call DeinitializeSprite call DeinitializeSprite
ret ret
.eighteen ; 8d543 (23:5543) .eighteen ; 8d543 (23:5543)
callab Function29676 callab TradeAnim_AnimateTrademonInTube
ret ret
.EggShell: ; 8d54a (23:554a) .EggShell: ; 8d54a (23:554a)

4
engine/sprites.asm
View File

@ -569,8 +569,8 @@ SpriteAnimSeqData: ; 8d1c4
db SPRITE_ANIM_FRAMESET_13, SPRITE_ANIM_SEQ_10, $00 ; 0e db SPRITE_ANIM_FRAMESET_13, SPRITE_ANIM_SEQ_10, $00 ; 0e
db SPRITE_ANIM_FRAMESET_15, SPRITE_ANIM_SEQ_NULL, $00 ; 0f db SPRITE_ANIM_FRAMESET_15, SPRITE_ANIM_SEQ_NULL, $00 ; 0f
db SPRITE_ANIM_FRAMESET_16, SPRITE_ANIM_SEQ_11, $00 ; 10 db SPRITE_ANIM_FRAMESET_16, SPRITE_ANIM_SEQ_11, $00 ; 10
db SPRITE_ANIM_FRAMESET_17, SPRITE_ANIM_SEQ_12, $00 ; 11 db SPRITE_ANIM_FRAMESET_TRADEMON_ICON, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, $00 ; 11
db SPRITE_ANIM_FRAMESET_18, SPRITE_ANIM_SEQ_12, $00 ; 12 db SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE, SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE, $00 ; 12
db SPRITE_ANIM_FRAMESET_19, SPRITE_ANIM_SEQ_13, $00 ; 13 db SPRITE_ANIM_FRAMESET_19, SPRITE_ANIM_SEQ_13, $00 ; 13
db SPRITE_ANIM_FRAMESET_1A, SPRITE_ANIM_SEQ_14, $00 ; 14 radio tuning knob db SPRITE_ANIM_FRAMESET_1A, SPRITE_ANIM_SEQ_14, $00 ; 14 radio tuning knob
db SPRITE_ANIM_FRAMESET_1B, SPRITE_ANIM_SEQ_NULL, $00 ; 15 chris on magnet train db SPRITE_ANIM_FRAMESET_1B, SPRITE_ANIM_SEQ_NULL, $00 ; 15 chris on magnet train

2
engine/time_capsule/conversion.asm
View File

@ -383,7 +383,7 @@ NewPokedexEntry: ; fb877
ld [TempMonDVs], a ld [TempMonDVs], a
ld a, [hl] ld a, [hl]
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld b, SCGB_FRONTPICPALS ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes
ret ret

445
engine/trade/animation.asm
View File

File diff suppressed because it is too large Load Diff

6
event/halloffame.asm
View File

@ -261,7 +261,7 @@ AnimateHOFMonEntrance: ; 865b5
call WaitBGMap call WaitBGMap
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
ld b, SCGB_1A ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes
call HOF_SlideBackpic call HOF_SlideBackpic
@ -396,7 +396,7 @@ _HallOfFamePC: ; 86650
ld de, .EmptyString ld de, .EmptyString
call PlaceString call PlaceString
call WaitBGMap call WaitBGMap
ld b, SCGB_1A ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes
decoord 6, 5 decoord 6, 5
@ -553,7 +553,7 @@ HOF_AnimatePlayerPic: ; 86810
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld b, SCGB_1A ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes
call HOF_SlideBackpic call HOF_SlideBackpic

2
event/photo.asm
View File

@ -59,7 +59,7 @@ UnownPrinter: ; 16be4
ld [TempMonDVs], a ld [TempMonDVs], a
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld b, SCGB_FRONTPICPALS ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes

9
gfx/mail.asm
View File

@ -32,7 +32,7 @@ ReadAnyMail: ; b9237
lb bc, BANK(StandardEnglishFont), $80 lb bc, BANK(StandardEnglishFont), $80
call Get1bpp call Get1bpp
pop de pop de
call Functionb92b8 call .LoadGFX
call EnableLCD call EnableLCD
call WaitBGMap call WaitBGMap
ld a, [Buffer3] ld a, [Buffer3]
@ -65,7 +65,7 @@ ReadAnyMail: ; b9237
jr .loop jr .loop
; b92b8 ; b92b8
Functionb92b8: ; b92b8 .LoadGFX: ; b92b8
ld h, d ld h, d
ld l, e ld l, e
push hl push hl
@ -83,7 +83,7 @@ Functionb92b8: ; b92b8
call CloseSRAM call CloseSRAM
ld hl, MailGFXPointers ld hl, MailGFXPointers
ld c, 0 ld c, 0
.loop .loop2
ld a, [hli] ld a, [hli]
cp b cp b
jr z, .got_pointer jr z, .got_pointer
@ -92,7 +92,7 @@ Functionb92b8: ; b92b8
inc c inc c
inc hl inc hl
inc hl inc hl
jr .loop jr .loop2
.invalid .invalid
ld hl, MailGFXPointers ld hl, MailGFXPointers
@ -726,6 +726,7 @@ MailGFX_PlaceMessage: ; b9803
; b984e ; b984e
Functionb984e: ; b984e Functionb984e: ; b984e
; XXX
.loop .loop
ld a, [hl] ld a, [hl]
xor $ff xor $ff

4
main.asm
View File

@ -2679,14 +2679,14 @@ AnimateTrademonFrontpic: ; 4d81e
ld a, [wOTTrademonSpecies] ld a, [wOTTrademonSpecies]
call IsAPokemon call IsAPokemon
ret c ret c
callba Function29549 callba ShowOTTrademonStats
ld a, [wOTTrademonSpecies] ld a, [wOTTrademonSpecies]
ld [CurPartySpecies], a ld [CurPartySpecies], a
ld a, [wOTTrademonDVs] ld a, [wOTTrademonDVs]
ld [TempMonDVs], a ld [TempMonDVs], a
ld a, [wOTTrademonDVs + 1] ld a, [wOTTrademonDVs + 1]
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld b, SCGB_1A ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout call GetSGBLayout
ld a, %11100100 ; 3,2,1,0 ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals call DmgToCgbBGPals

10
misc/mobile_42.asm
View File

@ -492,7 +492,7 @@ MobileTradeAnim_ShowPlayerMonToBeSent: ; 10830e
ld [TempMonDVs], a ld [TempMonDVs], a
ld a, [wPlayerTrademonDVs + 1] ld a, [wPlayerTrademonDVs + 1]
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld b, SCGB_1A ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout call GetSGBLayout
ld a, %11100100 ; 3,2,1,0 ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals call DmgToCgbBGPals
@ -585,7 +585,7 @@ MobileTradeAnim_ShowOTMonFromTrade: ; 10839b
ld [TempMonDVs], a ld [TempMonDVs], a
ld a, [wOTTrademonDVs + 1] ld a, [wOTTrademonDVs + 1]
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld b, SCGB_1A ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout call GetSGBLayout
ld a, %11100100 ; 3,2,1,0 ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals call DmgToCgbBGPals
@ -627,7 +627,7 @@ MobileTradeAnim_ShowPlayerMonForGTS: ; 10842c
ld [TempMonDVs], a ld [TempMonDVs], a
ld a, [wPlayerTrademonDVs + 1] ld a, [wPlayerTrademonDVs + 1]
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld b, SCGB_1A ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout call GetSGBLayout
ld a, %11100100 ; 3,2,1,0 ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals call DmgToCgbBGPals
@ -729,7 +729,7 @@ MobileTradeAnim_ShowOTMonFromGTS: ; 1084d7
ld [TempMonDVs], a ld [TempMonDVs], a
ld a, [wOTTrademonDVs + 1] ld a, [wOTTrademonDVs + 1]
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld b, SCGB_1A ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout call GetSGBLayout
ld a, %11100100 ; 3,2,1,0 ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals call DmgToCgbBGPals
@ -798,7 +798,7 @@ MobileTradeAnim_GetOddEgg: ; 108589
ld [TempMonDVs], a ld [TempMonDVs], a
ld a, [wOTTrademonDVs + 1] ld a, [wOTTrademonDVs + 1]
ld [TempMonDVs + 1], a ld [TempMonDVs + 1], a
ld b, SCGB_1A ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout call GetSGBLayout
ld a, %11100100 ; 3,2,1,0 ld a, %11100100 ; 3,2,1,0
call DmgToCgbBGPals call DmgToCgbBGPals

12
predef/cgb.asm
View File

@ -59,9 +59,9 @@ Predef_LoadSGBLayoutCGB: ; 8d59
dw _CGB17 dw _CGB17
dw _CGB18 dw _CGB18
dw _CGB_GamefreakLogo ; called before copyright dw _CGB_GamefreakLogo ; called before copyright
dw _CGB1a dw _CGB_PlayerOrMonFrontpicPals
dw _CGB1b dw _CGB_TradeTube
dw _CGB_FrontpicPals dw _CGB_TrainerOrMonFrontpicPals
dw _CGB1d dw _CGB1d
dw _CGB1e dw _CGB1e
; 8db8 ; 8db8
@ -1026,7 +1026,7 @@ _CGB_GamefreakLogo: ; 94fa
RGB 00, 00, 00 RGB 00, 00, 00
; 9529 ; 9529
_CGB1a: ; 9529 _CGB_PlayerOrMonFrontpicPals: ; 9529
ld de, UnknBGPals ld de, UnknBGPals
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
ld bc, TempMonDVs ld bc, TempMonDVs
@ -1048,7 +1048,7 @@ _CGB1e: ; 9542
ret ret
; 9555 ; 9555
_CGB1b: ; 9555 _CGB_TradeTube: ; 9555
ld hl, PalPacket_9cc6 + 1 ld hl, PalPacket_9cc6 + 1
call CopyFourPalettes call CopyFourPalettes
ld hl, Palettes_b681 ld hl, Palettes_b681
@ -1064,7 +1064,7 @@ _CGB1b: ; 9555
ret ret
; 9578 ; 9578
_CGB_FrontpicPals: ; 9578 _CGB_TrainerOrMonFrontpicPals: ; 9578
ld de, UnknBGPals ld de, UnknBGPals
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
ld bc, TempMonDVs ld bc, TempMonDVs

12
predef/sgb.asm
View File

@ -50,9 +50,9 @@ Predef_LoadSGBLayout: ; 864c
dw .SGB17 dw .SGB17
dw .SGB18 dw .SGB18
dw .SGB19 dw .SGB19
dw .SGB1a dw .SGB_PlayerOrMonFrontpicPals
dw .SGB1b dw .SGB_TradeTube
dw .SGB_FrontpicPals dw .SGB_TrainerOrMonFrontpicPals
dw .SGB1d dw .SGB1d
dw .SGB1e dw .SGB1e
; 86ad ; 86ad
@ -503,7 +503,7 @@ endr
ret ret
; 89ad ; 89ad
.SGB1a: ; 89ad .SGB_PlayerOrMonFrontpicPals: ; 89ad
ld hl, PalPacket_9ce6 ld hl, PalPacket_9ce6
ld de, wSGBPals ld de, wSGBPals
ld bc, $10 ld bc, $10
@ -524,13 +524,13 @@ endr
ret ret
; 89d9 ; 89d9
.SGB1b: ; 89d9 .SGB_TradeTube: ; 89d9
ld hl, PalPacket_9cc6 ld hl, PalPacket_9cc6
ld de, BlkPacket_9a86 ld de, BlkPacket_9a86
ret ret
; 89e0 ; 89e0
.SGB_FrontpicPals: ; 89e0 .SGB_TrainerOrMonFrontpicPals: ; 89e0
ld hl, PalPacket_9ce6 ld hl, PalPacket_9ce6
ld de, wSGBPals ld de, wSGBPals
ld bc, $10 ld bc, $10