ref: 31901f73b0cb0c516962975c323df06d73263486
parent: 59ee673775b20b4859842c98b8199991fa55790c
author: Remy Oukaour <[email protected]>
date: Sat Dec 9 17:57:41 EST 2017
Move some gfx/misc/ files into meaningful directories
--- a/Makefile
+++ b/Makefile
@@ -140,8 +140,8 @@
### Misc file-specific graphics rules
-gfx/shrink1.2bpp: rgbgfx += -h
-gfx/shrink2.2bpp: rgbgfx += -h
+gfx/shrink/shrink1.2bpp: rgbgfx += -h
+gfx/shrink/shrink2.2bpp: rgbgfx += -h
gfx/trainers/%.2bpp: rgbgfx += -h
gfx/trainers/%.pal: gfx/trainers/%.gbcpal
@@ -153,7 +153,9 @@
gfx/mail/0b9dc6.1bpp: tools/gfx += --remove-whitespace
gfx/mail/0b9cfe.1bpp: tools/gfx += --remove-whitespace
-gfx/pokedex/%.2bpp: tools/gfx += --trim-whitespace
+gfx/pokedex/pokedex.2bpp: tools/gfx += --trim-whitespace
+gfx/pokedex/sgb.2bpp: tools/gfx += --trim-whitespace
+gfx/pokedex/slowpoke.2bpp: tools/gfx += --trim-whitespace
gfx/title/crystal.2bpp: tools/gfx += --interleave --png=$<
gfx/title/old_fg.2bpp: tools/gfx += --interleave --png=$<
@@ -162,10 +164,8 @@
gfx/trade/ball.2bpp: tools/gfx += --remove-whitespace
gfx/trade/game_boy_n64.2bpp: tools/gfx += --trim-whitespace
-gfx/slots_2.2bpp: tools/gfx += --interleave --png=$<
-gfx/slots_3.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates --keep-whitespace --remove-xflip
-gfx/slots_3a.2bpp: tools/gfx += --interleave --png=$<
-gfx/slots_3b.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates --keep-whitespace --remove-xflip
+gfx/slots/slots_2.2bpp: tools/gfx += --interleave --png=$<
+gfx/slots/slots_3.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates --keep-whitespace --remove-xflip
gfx/fx/angels.2bpp: tools/gfx += --trim-whitespace
gfx/fx/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace
@@ -185,16 +185,20 @@
gfx/fx/skyattack.2bpp: tools/gfx += --remove-whitespace
gfx/fx/status.2bpp: tools/gfx += --remove-whitespace
-gfx/misc/chris.2bpp: rgbgfx += -h
-gfx/misc/chris_card.2bpp: rgbgfx += -h
-gfx/misc/kris.2bpp: rgbgfx += -h
-gfx/misc/kris_card.2bpp: rgbgfx += -h
-gfx/misc/kris_back.2bpp: rgbgfx += -h
-gfx/misc/dude.2bpp: rgbgfx += -h
+gfx/player/chris.2bpp: rgbgfx += -h
+gfx/player/chris_back.2bpp: rgbgfx += -h
+gfx/player/kris.2bpp: rgbgfx += -h
+gfx/player/kris_back.2bpp: rgbgfx += -h
+
+gfx/trainer_card/chris_card.2bpp: rgbgfx += -h
+gfx/trainer_card/kris_card.2bpp: rgbgfx += -h
+
+gfx/battle/dude.2bpp: rgbgfx += -h
+
gfx/misc/unknown_egg.2bpp: rgbgfx += -h
-gfx/misc/player.2bpp: rgbgfx += -h
-gfx/misc/pokegear.2bpp: rgbgfx += -x2
-gfx/misc/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace
+
+gfx/pokegear/pokegear.2bpp: rgbgfx += -x2
+gfx/pokegear/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace
gfx/unknown/0e0ea8.2bpp: tools/gfx += --remove-whitespace
gfx/unknown/0f8f34.1bpp: tools/gfx += --trim-whitespace
--- a/engine/battle_start.asm
+++ b/engine/battle_start.asm
@@ -141,7 +141,7 @@
; 8c2f4
TrainerBattlePokeballTiles: ; 8c2f4
-INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp"
+INCBIN "gfx/ow_fx/trainer_battle_pokeball_tiles.2bpp"
FlashyTransitionToBattle: ; 8c314
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@@ -2280,8 +2280,8 @@
ret
; e3419 (38:7419)
-PCSelectLZ: INCBIN "gfx/pc.2bpp.lz"
-PCMailGFX: INCBIN "gfx/pc_mail.2bpp"
+PCSelectLZ: INCBIN "gfx/pc/pc.2bpp.lz"
+PCMailGFX: INCBIN "gfx/pc/pc_mail.2bpp"
; e34dd
PCString_ChooseaPKMN: db "Choose a <PK><MN>.@"
--- a/engine/events_3.asm
+++ b/engine/events_3.asm
@@ -850,9 +850,9 @@
; b84f2
FishingGFX: ; b84f2
-INCBIN "gfx/overworld/chris_fish.2bpp"
+INCBIN "gfx/ow_fx/chris_fish.2bpp"
; b8582
KrisFishingGFX: ; b8582
-INCBIN "gfx/overworld/kris_fish.2bpp"
+INCBIN "gfx/ow_fx/kris_fish.2bpp"
; b8612
--- a/engine/overworld.asm
+++ b/engine/overworld.asm
@@ -723,6 +723,7 @@
ENDM
EmotesPointers: ; 144d
+; entries correspond to EMOTE_* constants
; graphics address, length, starting tile
emote_header ShockEmote, 4, $78
emote_header QuestionEmote, 4, $78
@@ -733,9 +734,9 @@
emote_header SleepEmote, 4, $78
emote_header FishEmote, 4, $78
emote_header JumpShadowGFX, 1, $7c
- emote_header FishingRodGFX2, 2, $7c
+ emote_header FishingRodGFX, 2, $7c
emote_header BoulderDustGFX, 2, $7e
- emote_header FishingRodGFX4, 1, $7e
+ emote_header GrassRustleGFX, 1, $7e
; 14495
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -1716,6 +1716,6 @@
; 0x10b16
PackMenuGFX:
-INCBIN "gfx/misc/pack_menu.2bpp"
+INCBIN "gfx/pack/pack_menu.2bpp"
PackGFX:
-INCBIN "gfx/misc/pack.2bpp"
+INCBIN "gfx/pack/pack.2bpp"
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -136,7 +136,7 @@
; 90cb2
FastShipGFX: ; 90cb2
-INCBIN "gfx/misc/fast_ship.2bpp"
+INCBIN "gfx/pokegear/fast_ship.2bpp"
; 90d32
InitPokegearModeIndicatorArrow: ; 90d32 (24:4d32)
@@ -1407,7 +1407,7 @@
; 0x914dd
PokegearSpritesGFX: ; 914dd
-INCBIN "gfx/misc/pokegear_sprites.2bpp.lz"
+INCBIN "gfx/pokegear/pokegear_sprites.2bpp.lz"
; 9150d
RadioTilemapRLE: ; 9150d
@@ -2970,11 +2970,11 @@
; 91fff
JohtoMap: ; 91fff
-INCBIN "gfx/misc/johto.bin"
+INCBIN "gfx/pokegear/johto.bin"
; 92168
KantoMap: ; 92168
-INCBIN "gfx/misc/kanto.bin"
+INCBIN "gfx/pokegear/kanto.bin"
; 922d1
PokedexNestIconGFX: ; 922d1
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -2211,17 +2211,17 @@
; 9335d
SlotsTilemap: ; 9335d
-INCBIN "gfx/slots.tilemap"
+INCBIN "gfx/slots/slots.tilemap"
; 9344d
Slots1LZ: ; 9344d
-INCBIN "gfx/slots_1.2bpp.lz"
+INCBIN "gfx/slots/slots_1.2bpp.lz"
; 935cd
Slots2LZ: ; 935cd
-INCBIN "gfx/slots_2.2bpp.lz"
+INCBIN "gfx/slots/slots_2.2bpp.lz"
; 9382d
Slots3LZ: ; 9382d
-INCBIN "gfx/slots_3.2bpp.lz"
+INCBIN "gfx/slots/slots_3.2bpp.lz"
; 93a3d
--- a/engine/trainer_card.asm
+++ b/engine/trainer_card.asm
@@ -606,11 +606,11 @@
db $1c | $80, $20, $24, $20 | $80
; 25523
-CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp"
+CardStatusGFX: INCBIN "gfx/trainer_card/card_status.2bpp"
-LeaderGFX: INCBIN "gfx/misc/leaders.2bpp"
-LeaderGFX2: INCBIN "gfx/misc/leaders.2bpp"
-BadgeGFX: INCBIN "gfx/misc/badges.2bpp"
-BadgeGFX2: INCBIN "gfx/misc/badges.2bpp"
+LeaderGFX: INCBIN "gfx/trainer_card/leaders.2bpp"
+LeaderGFX2: INCBIN "gfx/trainer_card/leaders.2bpp"
+BadgeGFX: INCBIN "gfx/trainer_card/badges.2bpp"
+BadgeGFX2: INCBIN "gfx/trainer_card/badges.2bpp"
-CardRightCornerGFX: INCBIN "gfx/misc/card_right_corner.2bpp"
+CardRightCornerGFX: INCBIN "gfx/trainer_card/card_right_corner.2bpp"
--- a/event/field_moves.asm
+++ b/event/field_moves.asm
@@ -75,7 +75,7 @@
; 8c893
HeadbuttTreeGFX: ; 8c893
-INCBIN "gfx/overworld/headbutt_tree.2bpp"
+INCBIN "gfx/ow_fx/headbutt_tree.2bpp"
; 8c913
HideHeadbuttTree: ; 8c913
@@ -152,11 +152,11 @@
; 8c98c
CutTreeGFX: ; c898c
-INCBIN "gfx/misc/cut_tree.2bpp"
+INCBIN "gfx/ow_fx/cut_tree.2bpp"
; c89cc
CutGrassGFX: ; 8c9cc
-INCBIN "gfx/misc/cut_grass.2bpp"
+INCBIN "gfx/ow_fx/cut_grass.2bpp"
; 8ca0c
OWCutJumptable: ; 8ca0c
binary files /dev/null b/gfx/battle/dude.2bpp.lz.d13fb490 differ
binary files /dev/null b/gfx/battle/dude.png differ
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -1,11 +1,11 @@
FontExtra:
-INCBIN "gfx/misc/font_extra.2bpp"
+INCBIN "gfx/font/font_extra.2bpp"
Font:
-INCBIN "gfx/misc/font.1bpp"
+INCBIN "gfx/font/font.1bpp"
FontBattleExtra:
-INCBIN "gfx/misc/font_battle_extra.2bpp"
+INCBIN "gfx/font/font_battle_extra.2bpp"
Frames: ; f8800
INCBIN "gfx/frames/1.1bpp"
@@ -47,7 +47,7 @@
; f8ba0
TownMapGFX: ; f8ba0
-INCBIN "gfx/misc/town_map.2bpp.lz"
+INCBIN "gfx/pokegear/town_map.2bpp.lz"
; f8ea4
WeekdayKanjiGFX: ; unused kanji
@@ -79,7 +79,7 @@
; f9434
Footprints: ; f9434
-INCBIN "gfx/misc/footprints.1bpp"
+INCBIN "gfx/pokedex/footprints.1bpp"
; fb434
; This and the following two functions are unreferenced.
binary files /dev/null b/gfx/font/font.png differ
binary files /dev/null b/gfx/font/font_battle_extra.png differ
binary files /dev/null b/gfx/font/font_extra.png differ
binary files /dev/null b/gfx/font/font_inversed.png differ
binary files /dev/null b/gfx/font/unown_font.png differ
binary files a/gfx/misc/badges.png /dev/null differ
binary files a/gfx/misc/boulderdust.png /dev/null differ
binary files a/gfx/misc/card_right_corner.png /dev/null differ
binary files a/gfx/misc/card_status.png /dev/null differ
binary files a/gfx/misc/chris.png /dev/null differ
binary files a/gfx/misc/chris_card.png /dev/null differ
binary files a/gfx/misc/copyright.png /dev/null differ
binary files a/gfx/misc/cut_grass.png /dev/null differ
binary files a/gfx/misc/cut_tree.png /dev/null differ
binary files a/gfx/misc/dude.2bpp.lz.d13fb490 /dev/null differ
binary files a/gfx/misc/dude.png /dev/null differ
binary files a/gfx/misc/fast_ship.png /dev/null differ
binary files a/gfx/misc/fishing2.png /dev/null differ
binary files a/gfx/misc/fishing4.png /dev/null differ
binary files a/gfx/misc/font.png /dev/null differ
binary files a/gfx/misc/font_battle_extra.png /dev/null differ
binary files a/gfx/misc/font_extra.png /dev/null differ
binary files a/gfx/misc/font_inversed.png /dev/null differ
binary files a/gfx/misc/footprints.png /dev/null differ
binary files a/gfx/misc/johto.bin /dev/null differ
binary files a/gfx/misc/kanto.bin /dev/null differ
binary files a/gfx/misc/kris.png /dev/null differ
binary files a/gfx/misc/kris_back.png /dev/null differ
binary files a/gfx/misc/kris_card.png /dev/null differ
binary files a/gfx/misc/leaders.png /dev/null differ
binary files a/gfx/misc/pack.png /dev/null differ
binary files a/gfx/misc/pack_f.png /dev/null differ
binary files a/gfx/misc/pack_menu.png /dev/null differ
binary files a/gfx/misc/player.2bpp.lz.0312ddce /dev/null differ
binary files a/gfx/misc/player.png /dev/null differ
binary files a/gfx/misc/pokegear.2bpp.lz.42315ab4 /dev/null differ
binary files a/gfx/misc/pokegear.png /dev/null differ
binary files a/gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f /dev/null differ
binary files a/gfx/misc/pokegear_sprites.png /dev/null differ
binary files a/gfx/misc/shadow.png /dev/null differ
binary files a/gfx/misc/town_map.2bpp.lz.c0587c86 /dev/null differ
binary files a/gfx/misc/town_map.png /dev/null differ
binary files a/gfx/misc/trainer_card.png /dev/null differ
binary files a/gfx/misc/unown_font.png /dev/null differ
binary files a/gfx/overworld/chris_fish.png /dev/null differ
binary files a/gfx/overworld/headbutt_tree.png /dev/null differ
binary files a/gfx/overworld/kris_fish.png /dev/null differ
binary files a/gfx/overworld/trainer_battle_pokeball_tiles.png /dev/null differ
binary files /dev/null b/gfx/ow_fx/boulder_dust.png differ
binary files /dev/null b/gfx/ow_fx/chris_fish.png differ
binary files /dev/null b/gfx/ow_fx/cut_grass.png differ
binary files /dev/null b/gfx/ow_fx/cut_tree.png differ
binary files /dev/null b/gfx/ow_fx/fishing_rod.png differ
binary files /dev/null b/gfx/ow_fx/grass_rustle.png differ
binary files /dev/null b/gfx/ow_fx/headbutt_tree.png differ
binary files /dev/null b/gfx/ow_fx/kris_fish.png differ
binary files /dev/null b/gfx/ow_fx/shadow.png differ
binary files /dev/null b/gfx/ow_fx/trainer_battle_pokeball_tiles.png differ
binary files /dev/null b/gfx/pack/pack.png differ
binary files /dev/null b/gfx/pack/pack_f.png differ
binary files /dev/null b/gfx/pack/pack_menu.png differ
binary files a/gfx/pc.2bpp.lz.2201c1aa /dev/null differ
binary files a/gfx/pc.png /dev/null differ
binary files /dev/null b/gfx/pc/pc.2bpp.lz.2201c1aa differ
binary files /dev/null b/gfx/pc/pc.png differ
binary files /dev/null b/gfx/pc/pc_mail.png differ
binary files a/gfx/pc_mail.png /dev/null differ
binary files /dev/null b/gfx/player/chris.png differ
binary files /dev/null b/gfx/player/chris_back.2bpp.lz.0312ddce differ
binary files /dev/null b/gfx/player/chris_back.png differ
binary files /dev/null b/gfx/player/kris.png differ
binary files /dev/null b/gfx/player/kris_back.png differ
binary files /dev/null b/gfx/pokedex/footprints.png differ
--- /dev/null
+++ b/gfx/pokegear/dexmap_nest_icon.2bpp
@@ -1,0 +1,1 @@
+BBff��������ZZ$$
\ No newline at end of file
binary files /dev/null b/gfx/pokegear/fast_ship.png differ
binary files /dev/null b/gfx/pokegear/flymap_label_border.1bpp differ
binary files /dev/null b/gfx/pokegear/johto.bin differ
binary files /dev/null b/gfx/pokegear/kanto.bin differ
binary files /dev/null b/gfx/pokegear/pokegear.2bpp.lz.42315ab4 differ
binary files /dev/null b/gfx/pokegear/pokegear.png differ
binary files /dev/null b/gfx/pokegear/pokegear_sprites.2bpp.lz.7a3cc91f differ
binary files /dev/null b/gfx/pokegear/pokegear_sprites.png differ
binary files /dev/null b/gfx/pokegear/town_map.2bpp.lz.c0587c86 differ
binary files /dev/null b/gfx/pokegear/town_map.png differ
binary files /dev/null b/gfx/shrink/shrink1.2bpp.lz.d4443930 differ
binary files /dev/null b/gfx/shrink/shrink1.png differ
binary files /dev/null b/gfx/shrink/shrink2.2bpp.lz.3f58480a differ
binary files /dev/null b/gfx/shrink/shrink2.png differ
binary files a/gfx/shrink1.2bpp.lz.d4443930 /dev/null differ
binary files a/gfx/shrink1.png /dev/null differ
binary files a/gfx/shrink2.2bpp.lz.3f58480a /dev/null differ
binary files a/gfx/shrink2.png /dev/null differ
binary files a/gfx/slots.tilemap /dev/null differ
binary files /dev/null b/gfx/slots/slots.tilemap differ
binary files /dev/null b/gfx/slots/slots_1.2bpp.lz.b22ddc13 differ
binary files /dev/null b/gfx/slots/slots_1.png differ
binary files /dev/null b/gfx/slots/slots_2.2bpp.lz.b28f76e3 differ
binary files /dev/null b/gfx/slots/slots_2.png differ
binary files /dev/null b/gfx/slots/slots_3.2bpp.lz.70c2984c differ
binary files /dev/null b/gfx/slots/slots_3.png differ
binary files a/gfx/slots_1.2bpp.lz.b22ddc13 /dev/null differ
binary files a/gfx/slots_1.png /dev/null differ
binary files a/gfx/slots_2.2bpp.lz.b28f76e3 /dev/null differ
binary files a/gfx/slots_2.png /dev/null differ
binary files a/gfx/slots_3.2bpp.lz.70c2984c /dev/null differ
binary files a/gfx/slots_3.png /dev/null differ
binary files /dev/null b/gfx/splash/copyright.png differ
binary files a/gfx/tilesets/water.png /dev/null differ
binary files /dev/null b/gfx/tilesets/water/water.png differ
binary files /dev/null b/gfx/trainer_card/badges.png differ
binary files /dev/null b/gfx/trainer_card/card_right_corner.png differ
binary files /dev/null b/gfx/trainer_card/card_status.png differ
binary files /dev/null b/gfx/trainer_card/chris_card.png differ
binary files /dev/null b/gfx/trainer_card/kris_card.png differ
binary files /dev/null b/gfx/trainer_card/leaders.png differ
binary files /dev/null b/gfx/trainer_card/trainer_card.png differ
--- a/main.asm
+++ b/main.asm
@@ -1178,10 +1178,10 @@
INCLUDE "battle/link_result.asm"
ChrisBackpic: ; 2ba1a
-INCBIN "gfx/misc/player.2bpp.lz"
+INCBIN "gfx/player/chris_back.2bpp.lz"
DudeBackpic: ; 2bbaa
-INCBIN "gfx/misc/dude.2bpp.lz"
+INCBIN "gfx/battle/dude.2bpp.lz"
SECTION "bankB", ROMX
@@ -1969,7 +1969,7 @@
dw PackFGFX + (15 tiles) * 2
PackFGFX: ; 48e9b
-INCBIN "gfx/misc/pack_f.2bpp"
+INCBIN "gfx/pack/pack_f.2bpp"
Special_MoveTutor: ; 4925b
call FadeToMenu
@@ -2487,10 +2487,10 @@
ret
Shrink1Pic: ; 4d249
-INCBIN "gfx/shrink1.2bpp.lz"
+INCBIN "gfx/shrink/shrink1.2bpp.lz"
Shrink2Pic: ; 4d2d9
-INCBIN "gfx/shrink2.2bpp.lz"
+INCBIN "gfx/shrink/shrink2.2bpp.lz"
LinkMonStatsScreen: ; 4d319
ld a, [wMenuCursorY]
@@ -4857,13 +4857,13 @@
ret
ChrisCardPic: ; 88365
-INCBIN "gfx/misc/chris_card.2bpp"
+INCBIN "gfx/trainer_card/chris_card.2bpp"
KrisCardPic: ; 88595
-INCBIN "gfx/misc/kris_card.2bpp"
+INCBIN "gfx/trainer_card/kris_card.2bpp"
CardGFX: ; 887c5
-INCBIN "gfx/misc/trainer_card.2bpp"
+INCBIN "gfx/trainer_card/trainer_card.2bpp"
GetPlayerBackpic: ; 88825
ld a, [PlayerGender]
@@ -4943,10 +4943,10 @@
ret
ChrisPic: ; 888a9
-INCBIN "gfx/misc/chris.2bpp"
+INCBIN "gfx/player/chris.2bpp"
KrisPic: ; 88bb9
-INCBIN "gfx/misc/kris.2bpp"
+INCBIN "gfx/player/kris.2bpp"
GetKrisBackpic: ; 88ec9
; Kris's backpic is uncompressed.
@@ -4957,7 +4957,7 @@
ret
KrisBackpic: ; 88ed6
-INCBIN "gfx/misc/kris_back.2bpp"
+INCBIN "gfx/player/kris_back.2bpp"
String_89116:
db "-----@"
@@ -5310,7 +5310,7 @@
SECTION "bank36", ROMX
-FontInversed: INCBIN "gfx/misc/font_inversed.1bpp"
+FontInversed: INCBIN "gfx/font/font_inversed.1bpp"
SECTION "Pic Animations 3", ROMX
@@ -5452,7 +5452,7 @@
SECTION "bank39", ROMX
CopyrightGFX:: ; e4000
-INCBIN "gfx/misc/copyright.2bpp"
+INCBIN "gfx/splash/copyright.2bpp"
INCLUDE "engine/options_menu.asm"
INCLUDE "engine/crystal_intro.asm"
@@ -5595,7 +5595,7 @@
SECTION "bank77", ROMX
UnownFont: ; 1dc000
-INCBIN "gfx/misc/unown_font.2bpp"
+INCBIN "gfx/font/unown_font.2bpp"
INCLUDE "misc/printer_77.asm"
@@ -5908,7 +5908,7 @@
ret
PokegearGFX: ; 1de2e4
-INCBIN "gfx/misc/pokegear.2bpp.lz"
+INCBIN "gfx/pokegear/pokegear.2bpp.lz"
IsMailEuropean: ; 1de5c8
; return 1 if French
--- a/misc/gfx_41.asm
+++ b/misc/gfx_41.asm
@@ -632,7 +632,7 @@
BoltEmote: INCBIN "gfx/emotes/bolt.2bpp"
SleepEmote: INCBIN "gfx/emotes/sleep.2bpp"
FishEmote: INCBIN "gfx/emotes/fish.2bpp"
-JumpShadowGFX: INCBIN "gfx/misc/shadow.2bpp"
-FishingRodGFX2: INCBIN "gfx/misc/fishing2.2bpp"
-BoulderDustGFX: INCBIN "gfx/misc/boulderdust.2bpp"
-FishingRodGFX4: INCBIN "gfx/misc/fishing4.2bpp"
+JumpShadowGFX: INCBIN "gfx/ow_fx/shadow.2bpp"
+FishingRodGFX: INCBIN "gfx/ow_fx/fishing_rod.2bpp"
+BoulderDustGFX: INCBIN "gfx/ow_fx/boulder_dust.2bpp"
+GrassRustleGFX: INCBIN "gfx/ow_fx/grass_rustle.2bpp"
--- a/tilesets/animations.asm
+++ b/tilesets/animations.asm
@@ -492,7 +492,7 @@
; fc41c
WaterTileFrames: ; fc41c
- INCBIN "gfx/tilesets/water.2bpp"
+ INCBIN "gfx/tilesets/water/water.2bpp"
; fc45c