Remove redundant dimensions in image filenames.
|
@ -55,8 +55,8 @@ ENDC
|
||||||
|
|
||||||
SGBBorderGraphics: ; 72fe8 (1c:6fe8)
|
SGBBorderGraphics: ; 72fe8 (1c:6fe8)
|
||||||
IF _RED
|
IF _RED
|
||||||
INCBIN "gfx/red/sgbborder.w128.2bpp"
|
INCBIN "gfx/red/sgbborder.2bpp"
|
||||||
ENDC
|
ENDC
|
||||||
IF _BLUE
|
IF _BLUE
|
||||||
INCBIN "gfx/blue/sgbborder.w128.2bpp"
|
INCBIN "gfx/blue/sgbborder.2bpp"
|
||||||
ENDC
|
ENDC
|
||||||
|
|
|
@ -260,4 +260,4 @@ INCLUDE "data/credits_order.asm"
|
||||||
INCLUDE "text/credits_text.asm"
|
INCLUDE "text/credits_text.asm"
|
||||||
|
|
||||||
TheEndGfx: ; 7473e (1d:473e) ; 473E (473F on blue)
|
TheEndGfx: ; 7473e (1d:473e) ; 473E (473F on blue)
|
||||||
INCBIN "gfx/theend.w40.interleave.2bpp"
|
INCBIN "gfx/theend.interleave.2bpp"
|
||||||
|
|
|
@ -425,7 +425,7 @@ IntroNidorinoAnimation7: ; 41950 (10:5950)
|
||||||
db $50 ; list terminator
|
db $50 ; list terminator
|
||||||
|
|
||||||
GameFreakIntro: ; 41959 (10:5959)
|
GameFreakIntro: ; 41959 (10:5959)
|
||||||
INCBIN "gfx/gamefreak_intro.h8.2bpp"
|
INCBIN "gfx/gamefreak_intro.2bpp"
|
||||||
INCBIN "gfx/gamefreak_logo.2bpp"
|
INCBIN "gfx/gamefreak_logo.2bpp"
|
||||||
ds $10 ; blank tile
|
ds $10 ; blank tile
|
||||||
|
|
||||||
|
|
|
@ -65,4 +65,4 @@ EmotionBubblesOAM: ; 17cb5 (5:7cb5)
|
||||||
db $FA,$00,$FB,$00
|
db $FA,$00,$FB,$00
|
||||||
|
|
||||||
EmotionBubbles: ; 17cbd (5:7cbd)
|
EmotionBubbles: ; 17cbd (5:7cbd)
|
||||||
INCBIN "gfx/emotion_bubbles.w16.2bpp"
|
INCBIN "gfx/emotion_bubbles.2bpp"
|
||||||
|
|
Before Width: | Height: | Size: 924 B After Width: | Height: | Size: 924 B |
Before Width: | Height: | Size: 136 B After Width: | Height: | Size: 136 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 220 B After Width: | Height: | Size: 220 B |
Before Width: | Height: | Size: 149 B After Width: | Height: | Size: 149 B |
Before Width: | Height: | Size: 719 B After Width: | Height: | Size: 719 B |
Before Width: | Height: | Size: 147 B After Width: | Height: | Size: 147 B |
Before Width: | Height: | Size: 297 B After Width: | Height: | Size: 297 B |
Before Width: | Height: | Size: 257 B |
Before Width: | Height: | Size: 926 B After Width: | Height: | Size: 926 B |
Before Width: | Height: | Size: 145 B After Width: | Height: | Size: 145 B |
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 139 B After Width: | Height: | Size: 139 B |
Before Width: | Height: | Size: 1,022 B After Width: | Height: | Size: 1,022 B |
Before Width: | Height: | Size: 928 B After Width: | Height: | Size: 928 B |
Before Width: | Height: | Size: 899 B After Width: | Height: | Size: 899 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1 KiB After Width: | Height: | Size: 1 KiB |
Before Width: | Height: | Size: 966 B After Width: | Height: | Size: 966 B |
Before Width: | Height: | Size: 960 B After Width: | Height: | Size: 960 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 1,011 B After Width: | Height: | Size: 1,011 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 845 B After Width: | Height: | Size: 845 B |
Before Width: | Height: | Size: 865 B After Width: | Height: | Size: 865 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 272 B After Width: | Height: | Size: 272 B |
52
main.asm
|
@ -3044,7 +3044,7 @@ DrawBadges: ; ea03 (3:6a03)
|
||||||
db $20, $28, $30, $38, $40, $48, $50, $58
|
db $20, $28, $30, $38, $40, $48, $50, $58
|
||||||
|
|
||||||
GymLeaderFaceAndBadgeTileGraphics: ; ea9e (3:6a9e)
|
GymLeaderFaceAndBadgeTileGraphics: ; ea9e (3:6a9e)
|
||||||
INCBIN "gfx/badges.w16.2bpp"
|
INCBIN "gfx/badges.2bpp"
|
||||||
|
|
||||||
Func_ee9e: ; ee9e (3:6e9e)
|
Func_ee9e: ; ee9e (3:6e9e)
|
||||||
call GetPredefRegisters
|
call GetPredefRegisters
|
||||||
|
@ -4687,15 +4687,15 @@ SnorlaxSprite: INCBIN "gfx/sprites/snorlax.2bpp"
|
||||||
OldAmberSprite: INCBIN "gfx/sprites/old_amber.2bpp"
|
OldAmberSprite: INCBIN "gfx/sprites/old_amber.2bpp"
|
||||||
LyingOldManSprite: INCBIN "gfx/sprites/lying_old_man.2bpp"
|
LyingOldManSprite: INCBIN "gfx/sprites/lying_old_man.2bpp"
|
||||||
|
|
||||||
PokemonLogoGraphics: INCBIN "gfx/pokemon_logo.w128.2bpp"
|
PokemonLogoGraphics: INCBIN "gfx/pokemon_logo.2bpp"
|
||||||
FontGraphics: INCBIN "gfx/font.w128.1bpp"
|
FontGraphics: INCBIN "gfx/font.1bpp"
|
||||||
ABTiles: INCBIN "gfx/AB.2bpp"
|
ABTiles: INCBIN "gfx/AB.2bpp"
|
||||||
HpBarAndStatusGraphics: INCBIN "gfx/hp_bar_and_status.2bpp"
|
HpBarAndStatusGraphics: INCBIN "gfx/hp_bar_and_status.2bpp"
|
||||||
BattleHudTiles1: INCBIN "gfx/battle_hud1.1bpp"
|
BattleHudTiles1: INCBIN "gfx/battle_hud1.1bpp"
|
||||||
BattleHudTiles2: INCBIN "gfx/battle_hud2.1bpp"
|
BattleHudTiles2: INCBIN "gfx/battle_hud2.1bpp"
|
||||||
BattleHudTiles3: INCBIN "gfx/battle_hud3.1bpp"
|
BattleHudTiles3: INCBIN "gfx/battle_hud3.1bpp"
|
||||||
NintendoCopyrightLogoGraphics: INCBIN "gfx/copyright.h8.2bpp"
|
NintendoCopyrightLogoGraphics: INCBIN "gfx/copyright.2bpp"
|
||||||
GamefreakLogoGraphics: INCBIN "gfx/gamefreak.h8.2bpp"
|
GamefreakLogoGraphics: INCBIN "gfx/gamefreak.2bpp"
|
||||||
TextBoxGraphics: INCBIN "gfx/text_box.2bpp"
|
TextBoxGraphics: INCBIN "gfx/text_box.2bpp"
|
||||||
PokedexTileGraphics: INCBIN "gfx/pokedex.2bpp"
|
PokedexTileGraphics: INCBIN "gfx/pokedex.2bpp"
|
||||||
WorldMapTileGraphics: INCBIN "gfx/town_map.2bpp"
|
WorldMapTileGraphics: INCBIN "gfx/town_map.2bpp"
|
||||||
|
@ -6343,23 +6343,23 @@ INCLUDE "engine/hidden_object_functions18.asm"
|
||||||
|
|
||||||
SECTION "bank19",ROMX,BANK[$19]
|
SECTION "bank19",ROMX,BANK[$19]
|
||||||
|
|
||||||
Overworld_GFX: INCBIN "gfx/tilesets/overworld.w128.t2.2bpp"
|
Overworld_GFX: INCBIN "gfx/tilesets/overworld.t2.2bpp"
|
||||||
Overworld_Block: INCBIN "gfx/blocksets/overworld.bst"
|
Overworld_Block: INCBIN "gfx/blocksets/overworld.bst"
|
||||||
|
|
||||||
RedsHouse1_GFX:
|
RedsHouse1_GFX:
|
||||||
RedsHouse2_GFX: INCBIN "gfx/tilesets/reds_house.w128.t7.2bpp"
|
RedsHouse2_GFX: INCBIN "gfx/tilesets/reds_house.t7.2bpp"
|
||||||
RedsHouse1_Block:
|
RedsHouse1_Block:
|
||||||
RedsHouse2_Block: INCBIN "gfx/blocksets/reds_house.bst"
|
RedsHouse2_Block: INCBIN "gfx/blocksets/reds_house.bst"
|
||||||
|
|
||||||
House_GFX: INCBIN "gfx/tilesets/house.w128.t2.2bpp"
|
House_GFX: INCBIN "gfx/tilesets/house.t2.2bpp"
|
||||||
House_Block: INCBIN "gfx/blocksets/house.bst"
|
House_Block: INCBIN "gfx/blocksets/house.bst"
|
||||||
Mansion_GFX: INCBIN "gfx/tilesets/mansion.w128.t2.2bpp"
|
Mansion_GFX: INCBIN "gfx/tilesets/mansion.t2.2bpp"
|
||||||
Mansion_Block: INCBIN "gfx/blocksets/mansion.bst"
|
Mansion_Block: INCBIN "gfx/blocksets/mansion.bst"
|
||||||
ShipPort_GFX: INCBIN "gfx/tilesets/ship_port.w128.t2.2bpp"
|
ShipPort_GFX: INCBIN "gfx/tilesets/ship_port.t2.2bpp"
|
||||||
ShipPort_Block: INCBIN "gfx/blocksets/ship_port.bst"
|
ShipPort_Block: INCBIN "gfx/blocksets/ship_port.bst"
|
||||||
Interior_GFX: INCBIN "gfx/tilesets/interior.w128.t1.2bpp"
|
Interior_GFX: INCBIN "gfx/tilesets/interior.t1.2bpp"
|
||||||
Interior_Block: INCBIN "gfx/blocksets/interior.bst"
|
Interior_Block: INCBIN "gfx/blocksets/interior.bst"
|
||||||
Plateau_GFX: INCBIN "gfx/tilesets/plateau.w128.t10.2bpp"
|
Plateau_GFX: INCBIN "gfx/tilesets/plateau.t10.2bpp"
|
||||||
Plateau_Block: INCBIN "gfx/blocksets/plateau.bst"
|
Plateau_Block: INCBIN "gfx/blocksets/plateau.bst"
|
||||||
|
|
||||||
|
|
||||||
|
@ -6369,50 +6369,50 @@ INCLUDE "engine/battle/1a.asm"
|
||||||
|
|
||||||
Version_GFX:
|
Version_GFX:
|
||||||
IF _RED
|
IF _RED
|
||||||
INCBIN "gfx/red/redgreenversion.h8.1bpp" ; 10 tiles
|
INCBIN "gfx/red/redgreenversion.1bpp" ; 10 tiles
|
||||||
ENDC
|
ENDC
|
||||||
IF _BLUE
|
IF _BLUE
|
||||||
INCBIN "gfx/blue/blueversion.h8.1bpp" ; 8 tiles
|
INCBIN "gfx/blue/blueversion.1bpp" ; 8 tiles
|
||||||
ENDC
|
ENDC
|
||||||
|
|
||||||
Dojo_GFX:
|
Dojo_GFX:
|
||||||
Gym_GFX: INCBIN "gfx/tilesets/gym.w128.2bpp"
|
Gym_GFX: INCBIN "gfx/tilesets/gym.2bpp"
|
||||||
Dojo_Block:
|
Dojo_Block:
|
||||||
Gym_Block: INCBIN "gfx/blocksets/gym.bst"
|
Gym_Block: INCBIN "gfx/blocksets/gym.bst"
|
||||||
|
|
||||||
Mart_GFX:
|
Mart_GFX:
|
||||||
Pokecenter_GFX: INCBIN "gfx/tilesets/pokecenter.w128.2bpp"
|
Pokecenter_GFX: INCBIN "gfx/tilesets/pokecenter.2bpp"
|
||||||
Mart_Block:
|
Mart_Block:
|
||||||
Pokecenter_Block: INCBIN "gfx/blocksets/pokecenter.bst"
|
Pokecenter_Block: INCBIN "gfx/blocksets/pokecenter.bst"
|
||||||
|
|
||||||
ForestGate_GFX:
|
ForestGate_GFX:
|
||||||
Museum_GFX:
|
Museum_GFX:
|
||||||
Gate_GFX: INCBIN "gfx/tilesets/gate.w128.t1.2bpp"
|
Gate_GFX: INCBIN "gfx/tilesets/gate.t1.2bpp"
|
||||||
ForestGate_Block:
|
ForestGate_Block:
|
||||||
Museum_Block:
|
Museum_Block:
|
||||||
Gate_Block: INCBIN "gfx/blocksets/gate.bst"
|
Gate_Block: INCBIN "gfx/blocksets/gate.bst"
|
||||||
|
|
||||||
Forest_GFX: INCBIN "gfx/tilesets/forest.w128.2bpp"
|
Forest_GFX: INCBIN "gfx/tilesets/forest.2bpp"
|
||||||
Forest_Block: INCBIN "gfx/blocksets/forest.bst"
|
Forest_Block: INCBIN "gfx/blocksets/forest.bst"
|
||||||
Facility_GFX: INCBIN "gfx/tilesets/facility.w128.2bpp"
|
Facility_GFX: INCBIN "gfx/tilesets/facility.2bpp"
|
||||||
Facility_Block: INCBIN "gfx/blocksets/facility.bst"
|
Facility_Block: INCBIN "gfx/blocksets/facility.bst"
|
||||||
|
|
||||||
|
|
||||||
SECTION "bank1B",ROMX,BANK[$1B]
|
SECTION "bank1B",ROMX,BANK[$1B]
|
||||||
|
|
||||||
Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.w128.t4.2bpp"
|
Cemetery_GFX: INCBIN "gfx/tilesets/cemetery.t4.2bpp"
|
||||||
Cemetery_Block: INCBIN "gfx/blocksets/cemetery.bst"
|
Cemetery_Block: INCBIN "gfx/blocksets/cemetery.bst"
|
||||||
Cavern_GFX: INCBIN "gfx/tilesets/cavern.w128.t14.2bpp"
|
Cavern_GFX: INCBIN "gfx/tilesets/cavern.t14.2bpp"
|
||||||
Cavern_Block: INCBIN "gfx/blocksets/cavern.bst"
|
Cavern_Block: INCBIN "gfx/blocksets/cavern.bst"
|
||||||
Lobby_GFX: INCBIN "gfx/tilesets/lobby.w128.t2.2bpp"
|
Lobby_GFX: INCBIN "gfx/tilesets/lobby.t2.2bpp"
|
||||||
Lobby_Block: INCBIN "gfx/blocksets/lobby.bst"
|
Lobby_Block: INCBIN "gfx/blocksets/lobby.bst"
|
||||||
Ship_GFX: INCBIN "gfx/tilesets/ship.w128.t6.2bpp"
|
Ship_GFX: INCBIN "gfx/tilesets/ship.t6.2bpp"
|
||||||
Ship_Block: INCBIN "gfx/blocksets/ship.bst"
|
Ship_Block: INCBIN "gfx/blocksets/ship.bst"
|
||||||
Lab_GFX: INCBIN "gfx/tilesets/lab.w128.t4.2bpp"
|
Lab_GFX: INCBIN "gfx/tilesets/lab.t4.2bpp"
|
||||||
Lab_Block: INCBIN "gfx/blocksets/lab.bst"
|
Lab_Block: INCBIN "gfx/blocksets/lab.bst"
|
||||||
Club_GFX: INCBIN "gfx/tilesets/club.w128.t5.2bpp"
|
Club_GFX: INCBIN "gfx/tilesets/club.t5.2bpp"
|
||||||
Club_Block: INCBIN "gfx/blocksets/club.bst"
|
Club_Block: INCBIN "gfx/blocksets/club.bst"
|
||||||
Underground_GFX: INCBIN "gfx/tilesets/underground.w128.t7.2bpp"
|
Underground_GFX: INCBIN "gfx/tilesets/underground.t7.2bpp"
|
||||||
Underground_Block: INCBIN "gfx/blocksets/underground.bst"
|
Underground_Block: INCBIN "gfx/blocksets/underground.bst"
|
||||||
|
|
||||||
|
|
||||||
|
|