diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/HoF_room_pc.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/animations.asm | 10 | ||||
| -rw-r--r-- | engine/battle/battle_transitions.asm | 2 | ||||
| -rw-r--r-- | engine/battle/draw_hud_pokeball_gfx.asm | 2 | ||||
| -rwxr-xr-x | engine/gamefreak.asm | 2 | ||||
| -rwxr-xr-x | engine/intro.asm | 24 | ||||
| -rw-r--r-- | engine/menu/draw_badges.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/naming_screen.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/status_screen.asm | 4 | ||||
| -rwxr-xr-x | engine/mon_party_sprites.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/emotion_bubbles.asm | 10 | ||||
| -rwxr-xr-x | engine/overworld/healing_machine.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/ledges.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/ssanne.asm | 2 | ||||
| -rwxr-xr-x | engine/slot_machine.asm | 6 | ||||
| -rwxr-xr-x | engine/town_map.asm | 9 |
16 files changed, 41 insertions, 42 deletions
diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 7e08631c..f820aae3 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -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: diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 9eb7badb..fcc3c99f 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -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: diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index f2e26ed5..62b023b0 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -160,7 +160,7 @@ LoadBattleTransitionTile: jp CopyVideoData BattleTransitionTile: - INCBIN "gfx/battle_transition.2bpp" + INCBIN "gfx/overworld/battle_transition.2bpp" BattleTransitionTileEnd: BattleTransition_BlackScreen: diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm index 323dd167..c0a91949 100644 --- a/engine/battle/draw_hud_pokeball_gfx.asm +++ b/engine/battle/draw_hud_pokeball_gfx.asm @@ -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: diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm index 5226072b..78e48384 100755 --- a/engine/gamefreak.asm +++ b/engine/gamefreak.asm @@ -239,5 +239,5 @@ GameFreakShootingStarOAMData: GameFreakShootingStarOAMDataEnd: FallingStar: - INCBIN "gfx/falling_star.2bpp" + INCBIN "gfx/intro_credits/falling_star.2bpp" FallingStarEnd: diff --git a/engine/intro.asm b/engine/intro.asm index a016b365..9a13c96f 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -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 diff --git a/engine/menu/draw_badges.asm b/engine/menu/draw_badges.asm index 9e6262a0..1888e32f 100644 --- a/engine/menu/draw_badges.asm +++ b/engine/menu/draw_badges.asm @@ -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" diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index e2973988..2b86d6f4 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -332,7 +332,7 @@ LoadEDTile: jp CopyVideoDataDouble ED_Tile: - INCBIN "gfx/ED_tile.1bpp" + INCBIN "gfx/font/ED.1bpp" ED_TileEnd: PrintAlphabet: diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm index ef94f13c..20bee0ee 100755 --- a/engine/menu/status_screen.asm +++ b/engine/menu/status_screen.asm @@ -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: diff --git a/engine/mon_party_sprites.asm b/engine/mon_party_sprites.asm index 1e0f9c59..994f5086 100755 --- a/engine/mon_party_sprites.asm +++ b/engine/mon_party_sprites.asm @@ -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" diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm index ac4276bd..20309fc1 100755 --- a/engine/overworld/emotion_bubbles.asm +++ b/engine/overworld/emotion_bubbles.asm @@ -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" diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 73b3fa1f..510f963b 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -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 diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index b0ec703a..290c8c80 100755 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm @@ -68,7 +68,7 @@ LoadHoppingShadowOAM: ret LedgeHoppingShadow: - INCBIN "gfx/ledge_hopping_shadow.1bpp" + INCBIN "gfx/overworld/shadow.1bpp" LedgeHoppingShadowEnd: LedgeHoppingShadowOAM: diff --git a/engine/overworld/ssanne.asm b/engine/overworld/ssanne.asm index c226a5c5..6c26b712 100755 --- a/engine/overworld/ssanne.asm +++ b/engine/overworld/ssanne.asm @@ -89,5 +89,5 @@ LoadSmokeTile: jp CopyVideoData SSAnneSmokePuffTile: - INCBIN "gfx/ss_anne_smoke_puff.2bpp" + INCBIN "gfx/overworld/smoke.2bpp" SSAnneSmokePuffTileEnd: diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 3a46687f..0a92c69b 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -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 diff --git a/engine/town_map.asm b/engine/town_map.asm index 1bb8d561..9cc55161 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -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:: |