summaryrefslogtreecommitdiff
path: root/engine/gfx
diff options
context:
space:
mode:
Diffstat (limited to 'engine/gfx')
-rw-r--r--engine/gfx/cgb_layouts.asm6
-rw-r--r--engine/gfx/color.asm58
-rw-r--r--engine/gfx/crystal_layouts.asm2
-rw-r--r--engine/gfx/pic_animation.asm17
-rw-r--r--engine/gfx/sgb_layouts.asm8
5 files changed, 46 insertions, 45 deletions
diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm
index d8f53d7fc..ffd4d4c48 100644
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -266,7 +266,7 @@ _CGB_Pokedex:
jr .got_palette
.is_pokemon
- call GetMonPalettePointer_
+ call GetMonPalettePointer
call LoadPalette_White_Col1_Col2_Black ; mon palette
.got_palette
call WipeAttrMap
@@ -352,7 +352,7 @@ _CGB_PokedexUnownMode:
call GetPredefPal
call LoadHLPaletteIntoDE
ld a, [wCurPartySpecies]
- call GetMonPalettePointer_
+ call GetMonPalettePointer
call LoadPalette_White_Col1_Col2_Black
call WipeAttrMap
hlcoord 7, 5, wAttrMap
@@ -914,7 +914,7 @@ _CGB_PlayerOrMonFrontpicPals:
_CGB1e:
ld de, wBGPals1
ld a, [wCurPartySpecies]
- call GetMonPalettePointer_
+ call GetMonPalettePointer
call LoadPalette_White_Col1_Col2_Black
call WipeAttrMap
call ApplyAttrMap
diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm
index 9a3b4f8ef..397db9751 100644
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -94,9 +94,9 @@ Unreferenced_Function8aa4:
ld a, d
ld [wSGBPals + 6], a
ld hl, wSGBPals
- call PushSGBPals_
+ call PushSGBPals
ld hl, BlkPacket_9a86
- call PushSGBPals_
+ call PushSGBPals
ret
InitPartyMenuPalettes:
@@ -173,7 +173,7 @@ Unreferenced_Function8b3f:
and a
ret z
ld hl, BlkPacket_9a86
- jp PushSGBPals_
+ jp PushSGBPals
Unreferenced_Function8b4d:
call CheckCGB
@@ -182,7 +182,7 @@ Unreferenced_Function8b4d:
and a
ret z
ld hl, PalPacket_BetaIntroVenusaur
- jp PushSGBPals_
+ jp PushSGBPals
.cgb
ld de, wOBPals1
@@ -197,7 +197,7 @@ Unreferenced_Function8b67:
and a
ret z
ld hl, PalPacket_Pack
- jp PushSGBPals_
+ jp PushSGBPals
.cgb
ld de, wOBPals1
@@ -218,7 +218,7 @@ Unreferenced_Function8b81:
ld bc, PALPACKET_LENGTH
call CopyBytes
pop af
- call GetMonPalettePointer_
+ call GetMonPalettePointer
ld a, [hli]
ld [wSGBPals + 3], a
ld a, [hli]
@@ -228,12 +228,12 @@ Unreferenced_Function8b81:
ld a, [hl]
ld [wSGBPals + 6], a
ld hl, wSGBPals
- jp PushSGBPals_
+ jp PushSGBPals
.cgb
ld de, wOBPals1
ld a, c
- call GetMonPalettePointer_
+ call GetMonPalettePointer
call LoadPalette_White_Col1_Col2_Black
ret
@@ -245,7 +245,7 @@ LoadTrainerClassPaletteAsNthBGPal:
LoadMonPaletteAsNthBGPal:
ld a, [wCurPartySpecies]
- call GetMonPalettePointer
+ call _GetMonPalettePointer
ld a, e
bit 7, a
jr z, got_palette_pointer_8bd7
@@ -278,7 +278,7 @@ Unreferenced_Function8bec:
and a
jr nz, .cgb
ld hl, wPlayerLightScreenCount
- jp PushSGBPals_
+ jp PushSGBPals
.cgb
ld a, [wEnemyLightScreenCount] ; col
@@ -310,7 +310,7 @@ ApplyMonOrTrainerPals:
and a
jr z, .get_trainer
ld a, [wCurPartySpecies]
- call GetMonPalettePointer_
+ call GetMonPalettePointer
jr .load_palettes
.get_trainer
@@ -426,9 +426,9 @@ LoadMailPalettes:
ld a, [hli]
ld [wSGBPals + 6], a
ld hl, wSGBPals
- call PushSGBPals_
+ call PushSGBPals
ld hl, BlkPacket_9a86
- call PushSGBPals_
+ call PushSGBPals
ret
.cgb
@@ -732,8 +732,8 @@ GetTrainerPalettePointer:
add hl, bc
ret
-GetMonPalettePointer_:
- call GetMonPalettePointer
+GetMonPalettePointer:
+ call _GetMonPalettePointer
ret
Unreferenced_Function9779:
@@ -781,7 +781,7 @@ Unreferenced_Function97cc:
jr nz, .loop
ret
-GetMonPalettePointer:
+_GetMonPalettePointer:
ld l, a
ld h, $0
add hl, hl
@@ -793,7 +793,7 @@ GetMonPalettePointer:
GetMonNormalOrShinyPalettePointer:
push bc
- call GetMonPalettePointer
+ call _GetMonPalettePointer
pop bc
push hl
call CheckShininess
@@ -804,17 +804,17 @@ rept 4
endr
ret
-PushSGBPals_:
+PushSGBPals:
ld a, [wcfbe]
push af
set 7, a
ld [wcfbe], a
- call PushSGBPals
+ call _PushSGBPals
pop af
ld [wcfbe], a
ret
-PushSGBPals:
+_PushSGBPals:
ld a, [hl]
and $7
ret z
@@ -878,7 +878,7 @@ InitSGBBorder:
call SGBDelayCycles
call SGB_ClearVRAM
ld hl, MaskEnCancelPacket
- call PushSGBPals
+ call _PushSGBPals
.skip
pop af
@@ -950,7 +950,7 @@ _InitSGBBorderPals:
push hl
ld h, [hl]
ld l, a
- call PushSGBPals
+ call _PushSGBPals
pop hl
inc hl
pop bc
@@ -974,12 +974,12 @@ Unreferenced_Function9911:
xor a
ld [rJOYP], a
ld hl, MaskEnFreezePacket
- call PushSGBPals
+ call _PushSGBPals
call PushSGBBorder
call SGBDelayCycles
call SGB_ClearVRAM
ld hl, MaskEnCancelPacket
- call PushSGBPals
+ call _PushSGBPals
ei
ret
@@ -1005,7 +1005,7 @@ SGB_ClearVRAM:
PushSGBBorderPalsAndWait:
ld hl, MltReq2Packet
- call PushSGBPals
+ call _PushSGBPals
call SGBDelayCycles
ld a, [rJOYP]
and $3
@@ -1050,7 +1050,7 @@ endr
.FinalPush:
ld hl, MltReq1Packet
- call PushSGBPals
+ call _PushSGBPals
jp SGBDelayCycles
SGBBorder_PushBGPals:
@@ -1065,7 +1065,7 @@ SGBBorder_PushBGPals:
ld a, LCDC_DEFAULT
ld [rLCDC], a
ld hl, PalTrnPacket
- call PushSGBPals
+ call _PushSGBPals
xor a
ld [rBGP], a
ret
@@ -1099,7 +1099,7 @@ SGBBorder_MorePalPushing:
ld a, LCDC_DEFAULT
ld [rLCDC], a
ld hl, PctTrnPacket
- call PushSGBPals
+ call _PushSGBPals
xor a
ld [rBGP], a
ret
@@ -1123,7 +1123,7 @@ SGBBorder_YetMorePalPushing:
ld a, LCDC_DEFAULT
ld [rLCDC], a
ld hl, ChrTrnPacket
- call PushSGBPals
+ call _PushSGBPals
xor a
ld [rBGP], a
ret
diff --git a/engine/gfx/crystal_layouts.asm b/engine/gfx/crystal_layouts.asm
index b9686701c..bdbf91118 100644
--- a/engine/gfx/crystal_layouts.asm
+++ b/engine/gfx/crystal_layouts.asm
@@ -284,7 +284,7 @@ _InitMG_Mobile_LinkTradePalMap:
call ByteFill
ret
-LoadTradeRoomBGPals:
+_LoadTradeRoomBGPals:
ld hl, TradeRoomPalette
ld de, wBGPals1 palette PAL_BG_GREEN
ld bc, 6 palettes
diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm
index 843e5cba4..af0227a2a 100644
--- a/engine/gfx/pic_animation.asm
+++ b/engine/gfx/pic_animation.asm
@@ -40,8 +40,8 @@ AnimateMon_Hatch:
call AnimateFrontpic
ret
-AnimateMon_Unused:
- ld e, ANIM_MON_UNUSED
+AnimateMon_HOF:
+ ld e, ANIM_MON_HOF
ld d, $0
call AnimateFrontpic
ret
@@ -59,13 +59,14 @@ endr
ENDM
PokeAnims:
+; entries correspond to ANIM_MON_* constants
dw .Slow
dw .Normal
dw .Menu
dw .Trade
dw .Evolve
dw .Hatch
- dw .Unused ; same as .Menu
+ dw .HOF
dw .Egg1
dw .Egg2
@@ -75,7 +76,7 @@ PokeAnims:
.Trade: pokeanim Idle, Play2, Idle, Play, SetWait, Wait, Cry, Setup, Play
.Evolve: pokeanim Idle, Play, SetWait, Wait, CryNoWait, Setup, Play
.Hatch: pokeanim Idle, Play, CryNoWait, Setup, Play, SetWait, Wait, Idle, Play
-.Unused: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Idle, Play
+.HOF: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Idle, Play
.Egg1: pokeanim Setup, Play
.Egg2: pokeanim Idle, Play
@@ -108,7 +109,7 @@ LoadMonAnimation:
SetUpPokeAnim:
ld a, [rSVBK]
push af
- ld a, BANK(wPokeAnimSceneIndex)
+ ld a, BANK(wPokeAnimStruct)
ld [rSVBK], a
ld a, [wPokeAnimSceneIndex]
ld c, a
@@ -283,14 +284,14 @@ AnimateMon_CheckIfPokemon:
PokeAnim_InitPicAttributes:
ld a, [rSVBK]
push af
- ld a, BANK(wPokeAnimSceneIndex)
+ ld a, BANK(wPokeAnimStruct)
ld [rSVBK], a
push bc
push de
push hl
- ld hl, wPokeAnimSceneIndex
- ld bc, wPokeAnimStructEnd - wPokeAnimSceneIndex
+ ld hl, wPokeAnimStruct
+ ld bc, wPokeAnimStructEnd - wPokeAnimStruct
xor a
call ByteFill
pop hl
diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm
index 538132ce2..7279f9a32 100644
--- a/engine/gfx/sgb_layouts.asm
+++ b/engine/gfx/sgb_layouts.asm
@@ -61,7 +61,7 @@ LoadSGBLayout:
.SGB_BattleColors:
ld hl, BlkPacket_Battle
- call PushSGBPals_
+ call PushSGBPals
ld hl, PalPacket_9ce6
ld de, wSGBPals
@@ -210,7 +210,7 @@ LoadSGBLayout:
inc hl
ld [hl], HIGH(palred 26 + palgreen 10 + palblue 6)
ld a, [wCurPartySpecies]
- call GetMonPalettePointer_
+ call GetMonPalettePointer
ld a, [hli]
ld [wSGBPals + 9], a
ld a, [hli]
@@ -566,6 +566,6 @@ INCLUDE "data/maps/sgb_roof_pal_inds.asm"
_LoadSGBLayout_ReturnFromJumpTable:
push de
- call PushSGBPals_
+ call PushSGBPals
pop hl
- jp PushSGBPals_
+ jp PushSGBPals
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 22:06:33 +0000