diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-13 22:46:32 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-13 22:46:32 -0400 |
| commit | 5ea3a953c3332a718ec3d69ec8830979a12db6cb (patch) | |
| tree | 8704b8705d134022da510130f255255f6f066217 /predef | |
| parent | 1be6923c06d97c931c6f84a83ec9b3a80d92244b (diff) | |
Name all link trade animation related functions
Diffstat (limited to 'predef')
| -rw-r--r-- | predef/cgb.asm | 12 | ||||
| -rw-r--r-- | predef/sgb.asm | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/predef/cgb.asm b/predef/cgb.asm index a15ddf123..cb0547714 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -59,9 +59,9 @@ Predef_LoadSGBLayoutCGB: ; 8d59 dw _CGB17 dw _CGB18 dw _CGB_GamefreakLogo ; called before copyright - dw _CGB1a - dw _CGB1b - dw _CGB_FrontpicPals + dw _CGB_PlayerOrMonFrontpicPals + dw _CGB_TradeTube + dw _CGB_TrainerOrMonFrontpicPals dw _CGB1d dw _CGB1e ; 8db8 @@ -1026,7 +1026,7 @@ _CGB_GamefreakLogo: ; 94fa RGB 00, 00, 00 ; 9529 -_CGB1a: ; 9529 +_CGB_PlayerOrMonFrontpicPals: ; 9529 ld de, UnknBGPals ld a, [CurPartySpecies] ld bc, TempMonDVs @@ -1048,7 +1048,7 @@ _CGB1e: ; 9542 ret ; 9555 -_CGB1b: ; 9555 +_CGB_TradeTube: ; 9555 ld hl, PalPacket_9cc6 + 1 call CopyFourPalettes ld hl, Palettes_b681 @@ -1064,7 +1064,7 @@ _CGB1b: ; 9555 ret ; 9578 -_CGB_FrontpicPals: ; 9578 +_CGB_TrainerOrMonFrontpicPals: ; 9578 ld de, UnknBGPals ld a, [CurPartySpecies] ld bc, TempMonDVs diff --git a/predef/sgb.asm b/predef/sgb.asm index 4c8ed0b97..ca2fe24f3 100644 --- a/predef/sgb.asm +++ b/predef/sgb.asm @@ -50,9 +50,9 @@ Predef_LoadSGBLayout: ; 864c dw .SGB17 dw .SGB18 dw .SGB19 - dw .SGB1a - dw .SGB1b - dw .SGB_FrontpicPals + dw .SGB_PlayerOrMonFrontpicPals + dw .SGB_TradeTube + dw .SGB_TrainerOrMonFrontpicPals dw .SGB1d dw .SGB1e ; 86ad @@ -503,7 +503,7 @@ endr ret ; 89ad -.SGB1a: ; 89ad +.SGB_PlayerOrMonFrontpicPals: ; 89ad ld hl, PalPacket_9ce6 ld de, wSGBPals ld bc, $10 @@ -524,13 +524,13 @@ endr ret ; 89d9 -.SGB1b: ; 89d9 +.SGB_TradeTube: ; 89d9 ld hl, PalPacket_9cc6 ld de, BlkPacket_9a86 ret ; 89e0 -.SGB_FrontpicPals: ; 89e0 +.SGB_TrainerOrMonFrontpicPals: ; 89e0 ld hl, PalPacket_9ce6 ld de, wSGBPals ld bc, $10 |