thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Organize gfx/

Browse source
This commit is contained in:
Rangi 2020-06-27 16:27:30 -04:00 • committed by Rangi
parent 4b853ad676
commit d5089d3c62
100 changed files with 87 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engine/HoF_room_pc.asm
View file

@ -266,5 +266,5 @@ INCLUDE "data/credits_order.asm"
INCLUDE "text/credits_text.asm"
TheEndGfx:
INCBIN "gfx/theend.2bpp"
INCBIN "gfx/intro_credits/the_end.2bpp"
TheEndGfxEnd:

10
engine/battle/animations.asm
View file

@ -361,17 +361,17 @@ AnimationTilesetPointers:
db $FF
AnimationTileset1:
INCBIN "gfx/attack_anim_1.2bpp"
INCBIN "gfx/battle/attack_anim_1.2bpp"
AnimationTileset2:
INCBIN "gfx/attack_anim_2.2bpp"
INCBIN "gfx/battle/attack_anim_2.2bpp"
SlotMachineTiles2:
IF DEF(_RED)
INCBIN "gfx/red/slotmachine2.2bpp"
INCBIN "gfx/slots/red_slots_2.2bpp"
ENDC
IF DEF(_BLUE)
INCBIN "gfx/blue/slotmachine2.2bpp"
INCBIN "gfx/slots/blue_slots_2.2bpp"
ENDC
MoveAnimation:
@ -1710,7 +1710,7 @@ AnimationMinimizeMon:
jp AnimationShowMonPic
MinimizedMonSprite:
INCBIN "gfx/minimized_mon_sprite.1bpp"
INCBIN "gfx/battle/minimize.1bpp"
MinimizedMonSpriteEnd:
AnimationSlideMonDownAndHide:

2
engine/battle/battle_transitions.asm
View file

@ -160,7 +160,7 @@ LoadBattleTransitionTile:
jp CopyVideoData
BattleTransitionTile:
INCBIN "gfx/battle_transition.2bpp"
INCBIN "gfx/overworld/battle_transition.2bpp"
BattleTransitionTileEnd:
BattleTransition_BlackScreen:

2
engine/battle/draw_hud_pokeball_gfx.asm
View file

@ -188,5 +188,5 @@ SetupPlayerAndEnemyPokeballs:
; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (fainted) and pokeball slot (no mon)
PokeballTileGraphics::
INCBIN "gfx/pokeball.2bpp"
INCBIN "gfx/battle/balls.2bpp"
PokeballTileGraphicsEnd:

2
engine/gamefreak.asm
View file

@ -239,5 +239,5 @@ GameFreakShootingStarOAMData:
GameFreakShootingStarOAMDataEnd:
FallingStar:
INCBIN "gfx/falling_star.2bpp"
INCBIN "gfx/intro_credits/falling_star.2bpp"
FallingStarEnd:

24
engine/intro.asm
View file

@ -438,35 +438,33 @@ IntroNidorinoAnimation7:
db ANIMATION_END
GameFreakIntro:
INCBIN "gfx/gamefreak_intro.2bpp"
INCBIN "gfx/gamefreak_logo.2bpp"
rept 16
db $00 ; blank tile
endr
INCBIN "gfx/intro_credits/gamefreak_presents.2bpp"
INCBIN "gfx/intro_credits/gamefreak_logo.2bpp"
ds 16, $00 ; blank tile
GameFreakIntroEnd:
FightIntroBackMon:
INCBIN "gfx/intro_fight.2bpp"
INCBIN "gfx/intro_credits/gengar.2bpp"
FightIntroBackMonEnd:
FightIntroFrontMon:
IF DEF(_RED)
INCBIN "gfx/red/intro_nido_1.2bpp"
INCBIN "gfx/intro_credits/red_nidorino_1.2bpp"
FightIntroFrontMon2:
INCBIN "gfx/red/intro_nido_2.2bpp"
INCBIN "gfx/intro_credits/red_nidorino_2.2bpp"
FightIntroFrontMon3:
INCBIN "gfx/red/intro_nido_3.2bpp"
INCBIN "gfx/intro_credits/red_nidorino_3.2bpp"
ENDC
IF DEF(_BLUE)
INCBIN "gfx/blue/intro_purin_1.2bpp"
INCBIN "gfx/intro_credits/blue_jigglypuff_1.2bpp"
FightIntroFrontMon2:
INCBIN "gfx/blue/intro_purin_2.2bpp"
INCBIN "gfx/intro_credits/blue_jigglypuff_2.2bpp"
FightIntroFrontMon3:
INCBIN "gfx/blue/intro_purin_3.2bpp"
INCBIN "gfx/intro_credits/blue_jigglypuff_3.2bpp"
ENDC
FightIntroFrontMonEnd:
ds $10 ; blank tile
ds 16, $00 ; blank tile

2
engine/menu/draw_badges.asm
View file

@ -117,4 +117,4 @@ DrawBadges:
db $20, $28, $30, $38, $40, $48, $50, $58
GymLeaderFaceAndBadgeTileGraphics:
INCBIN "gfx/badges.2bpp"
INCBIN "gfx/trainer_card/badges.2bpp"

2
engine/menu/naming_screen.asm
View file

@ -332,7 +332,7 @@ LoadEDTile:
jp CopyVideoDataDouble
ED_Tile:
INCBIN "gfx/ED_tile.1bpp"
INCBIN "gfx/font/ED.1bpp"
ED_TileEnd:
PrintAlphabet:

4
engine/menu/status_screen.asm
View file

@ -241,8 +241,8 @@ DrawLineBox:
ld [hl], $6f ; ← (halfarrow ending)
ret
PTile: ; This is a single 1bpp "P" tile
INCBIN "gfx/p_tile.1bpp"
PTile:
INCBIN "gfx/font/P.1bpp"
PTileEnd:
PrintStatsBox:

2
engine/mon_party_sprites.asm
View file

@ -281,4 +281,4 @@ GetPartyMonSpriteID:
INCLUDE "data/mon_party_sprites.asm"
MonPartySprites:
INCBIN "gfx/mon_ow_sprites.2bpp"
INCBIN "gfx/trade/mon_ow_sprites.2bpp"

10
engine/overworld/emotion_bubbles.asm
View file

@ -62,13 +62,15 @@ EmotionBubble:
jp UpdateSprites
EmotionBubblesPointerTable:
dw EmotionBubbles
dw EmotionBubbles + $40
dw EmotionBubbles + $80
dw ShockEmote
dw QuestionEmote
dw HappyEmote
EmotionBubblesOAM:
db $F8,$00,$F9,$00
db $FA,$00,$FB,$00
EmotionBubbles:
INCBIN "gfx/emotion_bubbles.2bpp"
ShockEmote: INCBIN "gfx/emotes/shock.2bpp"
QuestionEmote: INCBIN "gfx/emotes/question.2bpp"
HappyEmote: INCBIN "gfx/emotes/happy.2bpp"

2
engine/overworld/healing_machine.asm
View file

@ -63,7 +63,7 @@ AnimateHealingMachine:
jp UpdateSprites
PokeCenterFlashingMonitorAndHealBall:
INCBIN "gfx/pokecenter_ball.2bpp"
INCBIN "gfx/overworld/heal_machine.2bpp"
PokeCenterOAMData:
db $24,$34,$7C,$10 ; heal machine monitor

2
engine/overworld/ledges.asm
View file

@ -68,7 +68,7 @@ LoadHoppingShadowOAM:
ret
LedgeHoppingShadow:
INCBIN "gfx/ledge_hopping_shadow.1bpp"
INCBIN "gfx/overworld/shadow.1bpp"
LedgeHoppingShadowEnd:
LedgeHoppingShadowOAM:

2
engine/overworld/ssanne.asm
View file

@ -89,5 +89,5 @@ LoadSmokeTile:
jp CopyVideoData
SSAnneSmokePuffTile:
INCBIN "gfx/ss_anne_smoke_puff.2bpp"
INCBIN "gfx/overworld/smoke.2bpp"
SSAnneSmokePuffTileEnd:

6
engine/slot_machine.asm
View file

@ -878,15 +878,15 @@ LoadSlotMachineTiles:
jp SlotMachine_AnimWheel3
SlotMachineMap:
INCBIN "gfx/tilemaps/slotmachine.map"
INCBIN "gfx/slots/slots.tilemap"
SlotMachineMapEnd:
INCLUDE "data/slot_machine_wheels.asm"
SlotMachineTiles1:
IF DEF(_RED)
INCBIN "gfx/red/slotmachine1.2bpp"
INCBIN "gfx/slots/red_slots_1.2bpp"
ENDC
IF DEF(_BLUE)
INCBIN "gfx/blue/slotmachine1.2bpp"
INCBIN "gfx/slots/blue_slots_1.2bpp"
ENDC

9
engine/town_map.asm
View file

@ -106,7 +106,7 @@ DisplayTownMap:
INCLUDE "data/town_map_order.asm"
TownMapCursor:
INCBIN "gfx/town_map_cursor.1bpp"
INCBIN "gfx/town_map/town_map_cursor.1bpp"
TownMapCursorEnd:
LoadTownMap_Nest:
@ -271,7 +271,7 @@ BuildFlyLocationsList:
ret
TownMapUpArrow:
INCBIN "gfx/up_arrow.1bpp"
INCBIN "gfx/town_map/up_arrow.1bpp"
TownMapUpArrowEnd:
LoadTownMap:
@ -325,8 +325,7 @@ LoadTownMap:
ret
CompressedMap:
; you can decompress this file with the redrle program in the extras/ dir
INCBIN "gfx/town_map.rle"
INCBIN "gfx/town_map/town_map.rle"
ExitTownMap:
; clear town map graphics data and load usual graphics data
@ -587,7 +586,7 @@ INCLUDE "data/town_map_entries.asm"
INCLUDE "text/map_names.asm"
MonNestIcon:
INCBIN "gfx/mon_nest_icon.1bpp"
INCBIN "gfx/pokedex/mon_nest_icon.1bpp"
MonNestIconEnd:
TownMapSpriteBlinkingAnimation::