diff options
| -rw-r--r-- | graphics/battle_interface/hpbar_anim_unused.png (renamed from graphics/interface/hpbar_anim.png) | bin | 192 -> 192 bytes | |||
| -rw-r--r-- | graphics/battle_interface/hpbar_unused.png (renamed from graphics/interface/unused_hpbar.png) | bin | 136 -> 136 bytes | |||
| -rw-r--r-- | graphics/battle_interface/numbers1.png (renamed from graphics/interface/numbers1.png) | bin | 201 -> 201 bytes | |||
| -rw-r--r-- | graphics/battle_interface/numbers2.png (renamed from graphics/interface/numbers2.png) | bin | 215 -> 215 bytes | |||
| -rw-r--r-- | graphics/interface/mon_markings.png (renamed from graphics/misc/mon_markings.png) | bin | 489 -> 489 bytes | |||
| -rw-r--r-- | graphics/interface/mon_markings_menu.png (renamed from graphics/misc/mon_markings_menu.png) | bin | 353 -> 353 bytes | |||
| -rw-r--r-- | graphics/starter_choose/birch_bag.bin (renamed from graphics/misc/birch_bag_map.bin) | bin | 1280 -> 1280 bytes | |||
| -rw-r--r-- | graphics/starter_choose/birch_bag.png (renamed from graphics/misc/birch_bag.png) | bin | 1304 -> 1304 bytes | |||
| -rw-r--r-- | graphics/starter_choose/birch_grass.bin (renamed from graphics/misc/birch_grass_map.bin) | bin | 2048 -> 2048 bytes | |||
| -rw-r--r-- | graphics/starter_choose/birch_grass.png (renamed from graphics/misc/birch_grass.png) | bin | 691 -> 691 bytes | |||
| -rw-r--r-- | graphics/starter_choose/pokeball_selection.png (renamed from graphics/misc/pokeball_selection.png) | bin | 635 -> 635 bytes | |||
| -rw-r--r-- | graphics/starter_choose/starter_circle.png (renamed from graphics/misc/starter_circle.png) | bin | 349 -> 349 bytes | |||
| -rw-r--r-- | graphics/trade/gba.png (renamed from graphics/link/gba.png) | bin | 1253 -> 1253 bytes | |||
| -rw-r--r-- | graphics/trade/gba_pal2.pal (renamed from graphics/link/gba_pal2.pal) | 0 | ||||
| -rw-r--r-- | graphics_file_rules.mk | 9 | ||||
| -rw-r--r-- | src/graphics.c | 14 | ||||
| -rw-r--r-- | src/mon_markings.c | 4 | ||||
| -rw-r--r-- | src/starter_choose.c | 18 |
18 files changed, 23 insertions, 22 deletions
diff --git a/graphics/interface/hpbar_anim.png b/graphics/battle_interface/hpbar_anim_unused.png Binary files differindex d4e79fdae..d4e79fdae 100644 --- a/graphics/interface/hpbar_anim.png +++ b/graphics/battle_interface/hpbar_anim_unused.png diff --git a/graphics/interface/unused_hpbar.png b/graphics/battle_interface/hpbar_unused.png Binary files differindex 763b91210..763b91210 100644 --- a/graphics/interface/unused_hpbar.png +++ b/graphics/battle_interface/hpbar_unused.png diff --git a/graphics/interface/numbers1.png b/graphics/battle_interface/numbers1.png Binary files differindex f15757958..f15757958 100644 --- a/graphics/interface/numbers1.png +++ b/graphics/battle_interface/numbers1.png diff --git a/graphics/interface/numbers2.png b/graphics/battle_interface/numbers2.png Binary files differindex 4ddf364bf..4ddf364bf 100644 --- a/graphics/interface/numbers2.png +++ b/graphics/battle_interface/numbers2.png diff --git a/graphics/misc/mon_markings.png b/graphics/interface/mon_markings.png Binary files differindex 013173292..013173292 100644 --- a/graphics/misc/mon_markings.png +++ b/graphics/interface/mon_markings.png diff --git a/graphics/misc/mon_markings_menu.png b/graphics/interface/mon_markings_menu.png Binary files differindex 818446557..818446557 100644 --- a/graphics/misc/mon_markings_menu.png +++ b/graphics/interface/mon_markings_menu.png diff --git a/graphics/misc/birch_bag_map.bin b/graphics/starter_choose/birch_bag.bin Binary files differindex ddfad5ec9..ddfad5ec9 100644 --- a/graphics/misc/birch_bag_map.bin +++ b/graphics/starter_choose/birch_bag.bin diff --git a/graphics/misc/birch_bag.png b/graphics/starter_choose/birch_bag.png Binary files differindex 86bfbbbc0..86bfbbbc0 100644 --- a/graphics/misc/birch_bag.png +++ b/graphics/starter_choose/birch_bag.png diff --git a/graphics/misc/birch_grass_map.bin b/graphics/starter_choose/birch_grass.bin Binary files differindex b7332940c..b7332940c 100644 --- a/graphics/misc/birch_grass_map.bin +++ b/graphics/starter_choose/birch_grass.bin diff --git a/graphics/misc/birch_grass.png b/graphics/starter_choose/birch_grass.png Binary files differindex 838fa5f4c..838fa5f4c 100644 --- a/graphics/misc/birch_grass.png +++ b/graphics/starter_choose/birch_grass.png diff --git a/graphics/misc/pokeball_selection.png b/graphics/starter_choose/pokeball_selection.png Binary files differindex d2f0a3d97..d2f0a3d97 100644 --- a/graphics/misc/pokeball_selection.png +++ b/graphics/starter_choose/pokeball_selection.png diff --git a/graphics/misc/starter_circle.png b/graphics/starter_choose/starter_circle.png Binary files differindex 3501dfec4..3501dfec4 100644 --- a/graphics/misc/starter_circle.png +++ b/graphics/starter_choose/starter_circle.png diff --git a/graphics/link/gba.png b/graphics/trade/gba.png Binary files differindex 1a0909468..1a0909468 100644 --- a/graphics/link/gba.png +++ b/graphics/trade/gba.png diff --git a/graphics/link/gba_pal2.pal b/graphics/trade/gba_pal2.pal index e2fb95b4a..e2fb95b4a 100644 --- a/graphics/link/gba_pal2.pal +++ b/graphics/trade/gba_pal2.pal diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 25ac18142..cb12b9c18 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -19,6 +19,7 @@ OBJEVENTGFXDIR := graphics/object_events MISCGFXDIR := graphics/misc JPCONTESTGFXDIR := graphics/contest/japanese POKEDEXGFXDIR := graphics/pokedex +STARTERGFXDIR := graphics/starter_choose types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough @@ -371,9 +372,9 @@ $(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \ $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp @cat $^ >$@ -$(INTERFACEGFXDIR)/battle_bar.4bpp: $(INTERFACEGFXDIR)/hpbar_anim.4bpp \ - $(INTERFACEGFXDIR)/numbers1.4bpp \ - $(INTERFACEGFXDIR)/numbers2.4bpp +$(BATINTGFXDIR)/battle_bar.4bpp: $(BATINTGFXDIR)/hpbar_anim_unused.4bpp \ + $(BATINTGFXDIR)/numbers1.4bpp \ + $(BATINTGFXDIR)/numbers2.4bpp @cat $^ >$@ $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \ @@ -707,5 +708,5 @@ $(POKEDEXGFXDIR)/region_map.8bpp: %.8bpp: %.png $(POKEDEXGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png $(GFX) $< $@ -num_tiles 233 -$(MISCGFXDIR)/birch_help.4bpp: $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp +$(STARTERGFXDIR)/birch_help.4bpp: $(STARTERGFXDIR)/birch_bag.4bpp $(STARTERGFXDIR)/birch_grass.4bpp @cat $^ >$@ diff --git a/src/graphics.c b/src/graphics.c index 09cae59ce..9f708f18b 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -147,7 +147,7 @@ const u32 gBattleAnimSpriteGfx_ClawSlash[] = INCBIN_U32("graphics/battle_anims/s const u32 gBattleAnimSpriteGfx_Scratch3[] = INCBIN_U32("graphics/battle_anims/sprites/scratch_3.4bpp.lz"); const u32 gBattleAnimSpriteGfx_Scratch2[] = INCBIN_U32("graphics/battle_anims/sprites/scratch_2.4bpp.lz"); -const u32 gUnusedHpBar_Gfx[] = INCBIN_U32("graphics/interface/unused_hpbar.4bpp.lz"); +const u32 gUnusedHpBar_Gfx[] = INCBIN_U32("graphics/battle_interface/hpbar_unused.4bpp.lz"); const u32 gBattleAnimSpriteGfx_BubbleBurst2[] = INCBIN_U32("graphics/battle_anims/sprites/bubble_burst_2.4bpp.lz"); @@ -165,7 +165,7 @@ const u32 gBattleAnimSpriteGfx_PinkHeart2[] = INCBIN_U32("graphics/battle_anims/ const u32 gBattleInterfaceGfx_UnusedWindow1[] = INCBIN_U32("graphics/battle_interface/unused_window.4bpp.lz"); const u32 gBattleInterfacePal_UnusedWindow1[] = INCBIN_U32("graphics/battle_interface/unused_window.gbapal.lz"); -const u32 gBattleInterfaceGfx_BattleBar[] = INCBIN_U32("graphics/interface/battle_bar.4bpp.lz"); +const u32 gBattleInterfaceGfx_BattleBar[] = INCBIN_U32("graphics/battle_interface/battle_bar.4bpp.lz"); const u32 gBattleAnimSpriteGfx_SapDrip[] = INCBIN_U32("graphics/battle_anims/sprites/sap_drip.4bpp.lz"); const u32 gBattleAnimSpritePal_SapDrip[] = INCBIN_U32("graphics/battle_anims/sprites/sap_drip.gbapal.lz"); @@ -1329,8 +1329,8 @@ const u32 gRegionMapCityZoomText_Gfx[] = INCBIN_U32("graphics/pokenav/city_zoom_ const u16 gPokenavConditionCancel_Pal[] = INCBIN_U16("graphics/pokenav/condition/cancel.gbapal"); const u8 gPokenavConditionCancel_Gfx[] = INCBIN_U8("graphics/pokenav/condition/cancel.4bpp"); -const u16 gMonMarkingsMenu_Pal[] = INCBIN_U16("graphics/misc/mon_markings_menu.gbapal"); -const u8 gMonMarkingsMenu_Gfx[] = INCBIN_U8("graphics/misc/mon_markings_menu.4bpp"); +const u16 gMonMarkingsMenu_Pal[] = INCBIN_U16("graphics/interface/mon_markings_menu.gbapal"); +const u8 gMonMarkingsMenu_Gfx[] = INCBIN_U8("graphics/interface/mon_markings_menu.4bpp"); const u16 gBerryBlenderMiscPalette[] = INCBIN_U16("graphics/berry_blender/misc.gbapal"); const u16 gBerryBlenderArrowPalette[] = INCBIN_U16("graphics/berry_blender/arrow.gbapal"); @@ -1447,9 +1447,9 @@ const u32 gTilesetTiles_General[] = INCBIN_U32("data/tilesets/primary/general/ti // trade/egg hatch -const u16 gTradeGba_Pal[] = INCBIN_U16("graphics/link/gba.gbapal"); -const u16 gTradeGba2_Pal[] = INCBIN_U16("graphics/link/gba_pal2.gbapal"); -const u8 gTradeGba_Gfx[] = INCBIN_U8("graphics/link/gba.4bpp"); +const u16 gTradeGba_Pal[] = INCBIN_U16("graphics/trade/gba.gbapal"); +const u16 gTradeGba2_Pal[] = INCBIN_U16("graphics/trade/gba_pal2.gbapal"); +const u8 gTradeGba_Gfx[] = INCBIN_U8("graphics/trade/gba.4bpp"); static const u16 sEmptyPal[16] = {0}; diff --git a/src/mon_markings.c b/src/mon_markings.c index dbd5a2fa8..1e03179e9 100644 --- a/src/mon_markings.c +++ b/src/mon_markings.c @@ -22,8 +22,8 @@ static void SpriteCB_Marking(struct Sprite *); static void SpriteCB_Cursor(struct Sprite *); static struct Sprite *CreateMarkingComboSprite(u16, u16, const u16 *, u16); -static const u16 sMonMarkings_Pal[] = INCBIN_U16("graphics/misc/mon_markings.gbapal"); -static const u8 sMonMarkings_Gfx[] = INCBIN_U8("graphics/misc/mon_markings.4bpp"); +static const u16 sMonMarkings_Pal[] = INCBIN_U16("graphics/interface/mon_markings.gbapal"); +static const u8 sMonMarkings_Gfx[] = INCBIN_U8("graphics/interface/mon_markings.4bpp"); static const struct OamData sOamData_MenuWindow = { diff --git a/src/starter_choose.c b/src/starter_choose.c index ca393c4d8..81a88e771 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -53,17 +53,17 @@ static u16 sStarterLabelWindowId; const u16 gBirchBagGrassPal[][16] = { - INCBIN_U16("graphics/misc/birch_bag.gbapal"), - INCBIN_U16("graphics/misc/birch_grass.gbapal"), + INCBIN_U16("graphics/starter_choose/birch_bag.gbapal"), + INCBIN_U16("graphics/starter_choose/birch_grass.gbapal"), }; -static const u16 sPokeballSelection_Pal[] = INCBIN_U16("graphics/misc/pokeball_selection.gbapal"); -static const u16 sStarterCircle_Pal[] = INCBIN_U16("graphics/misc/starter_circle.gbapal"); -const u32 gBirchBagTilemap[] = INCBIN_U32("graphics/misc/birch_bag_map.bin.lz"); -const u32 gBirchGrassTilemap[] = INCBIN_U32("graphics/misc/birch_grass_map.bin.lz"); -const u32 gBirchHelpGfx[] = INCBIN_U32("graphics/misc/birch_help.4bpp.lz"); // Birch bag and grass combined -const u32 gPokeballSelection_Gfx[] = INCBIN_U32("graphics/misc/pokeball_selection.4bpp.lz"); -static const u32 sStarterCircle_Gfx[] = INCBIN_U32("graphics/misc/starter_circle.4bpp.lz"); +static const u16 sPokeballSelection_Pal[] = INCBIN_U16("graphics/starter_choose/pokeball_selection.gbapal"); +static const u16 sStarterCircle_Pal[] = INCBIN_U16("graphics/starter_choose/starter_circle.gbapal"); +const u32 gBirchBagTilemap[] = INCBIN_U32("graphics/starter_choose/birch_bag.bin.lz"); +const u32 gBirchGrassTilemap[] = INCBIN_U32("graphics/starter_choose/birch_grass.bin.lz"); +const u32 gBirchHelpGfx[] = INCBIN_U32("graphics/starter_choose/birch_help.4bpp.lz"); // Birch bag and grass combined +const u32 gPokeballSelection_Gfx[] = INCBIN_U32("graphics/starter_choose/pokeball_selection.4bpp.lz"); +static const u32 sStarterCircle_Gfx[] = INCBIN_U32("graphics/starter_choose/starter_circle.4bpp.lz"); static const struct WindowTemplate sWindowTemplates[] = { |
