diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle_start.asm | 2 | ||||
| -rwxr-xr-x | engine/billspc.asm | 4 | ||||
| -rwxr-xr-x | engine/events_3.asm | 4 | ||||
| -rwxr-xr-x | engine/overworld.asm | 5 | ||||
| -rw-r--r-- | engine/pack.asm | 4 | ||||
| -rwxr-xr-x | engine/pokegear.asm | 8 | ||||
| -rwxr-xr-x | engine/slot_machine.asm | 8 | ||||
| -rwxr-xr-x | engine/trainer_card.asm | 12 |
8 files changed, 24 insertions, 23 deletions
diff --git a/engine/battle_start.asm b/engine/battle_start.asm index 627519daa..9097e74ed 100644 --- a/engine/battle_start.asm +++ b/engine/battle_start.asm @@ -141,7 +141,7 @@ ConvertTrainerBattlePokeballTilesTo2bpp: ; 8c2cf ; 8c2f4 TrainerBattlePokeballTiles: ; 8c2f4 -INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp" +INCBIN "gfx/ow_fx/trainer_battle_pokeball_tiles.2bpp" FlashyTransitionToBattle: ; 8c314 diff --git a/engine/billspc.asm b/engine/billspc.asm index 4d8bf1c48..85f01af37 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -2280,8 +2280,8 @@ BillsPC_InitGFX: ; e33e8 (38:73e8) 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>.@" diff --git a/engine/events_3.asm b/engine/events_3.asm index b6aaea3b7..cff4eefb9 100755 --- a/engine/events_3.asm +++ b/engine/events_3.asm @@ -850,9 +850,9 @@ LoadFishingGFX: ; b84b3 ; 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 diff --git a/engine/overworld.asm b/engine/overworld.asm index 330dd3893..5bbd70a85 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -723,6 +723,7 @@ emote_header: MACRO 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 @@ EmotesPointers: ; 144d 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 diff --git a/engine/pack.asm b/engine/pack.asm index dad9a799d..e10b70e12 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -1716,6 +1716,6 @@ TextJump_YouCantUseItInABattle: ; 0x10b11 ; 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" diff --git a/engine/pokegear.asm b/engine/pokegear.asm index 948589639..901053c9f 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -136,7 +136,7 @@ Pokegear_LoadGFX: ; 90c4e ; 90cb2 FastShipGFX: ; 90cb2 -INCBIN "gfx/misc/fast_ship.2bpp" +INCBIN "gfx/pokegear/fast_ship.2bpp" ; 90d32 InitPokegearModeIndicatorArrow: ; 90d32 (24:4d32) @@ -1407,7 +1407,7 @@ PokegearText_DeleteStoredNumber: ; 0x914d8 ; 0x914dd PokegearSpritesGFX: ; 914dd -INCBIN "gfx/misc/pokegear_sprites.2bpp.lz" +INCBIN "gfx/pokegear/pokegear_sprites.2bpp.lz" ; 9150d RadioTilemapRLE: ; 9150d @@ -2970,11 +2970,11 @@ LoadTownMapGFX: ; 91ff2 ; 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 diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index c131e584f..e23b760cd 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -2211,17 +2211,17 @@ Reel3Tilemap: ; 9334b ; 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 diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm index 497d81ae6..499891fb0 100755 --- a/engine/trainer_card.asm +++ b/engine/trainer_card.asm @@ -606,11 +606,11 @@ TrainerCard_JohtoBadgesOAM: ; 254c9 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" |