Move graphics.s through pokemon to src

2026-04-24 14:57:07 -05:00 · 2020-02-22 11:08:23 -05:00 · 2020-02-22 11:08:23 -05:00 · f66d0dfce3
commit f66d0dfce3
parent e194cf83d2
366 changed files with 3925 additions and 12408 deletions
--- a/asm/battle_bg.s
+++ b/asm/battle_bg.s
@ -298,7 +298,7 @@ LoadBattleTextboxAndBackground: @ 800F420
 	movs r1, 0xC0
 	lsls r1, 19
 	bl LZDecompressVram
-	ldr r1, _0800F458 @ =gFile_graphics_interface_menu_map_tilemap
+	ldr r1, _0800F458 @ =gBattleTextboxTilemap
 	movs r0, 0
 	movs r2, 0
 	movs r3, 0
@ -315,7 +315,7 @@ LoadBattleTextboxAndBackground: @ 800F420
 	bx r0
 	.align 2, 0
 _0800F454: .4byte gBattleTextboxTiles
-_0800F458: .4byte gFile_graphics_interface_menu_map_tilemap
+_0800F458: .4byte gBattleTextboxTilemap
 _0800F45C: .4byte gBattleTextboxPalette
 	thumb_func_end LoadBattleTextboxAndBackground

@ -1393,7 +1393,7 @@ _0800FCEC:
 	.align 2, 0
 _0800FCF8: .4byte gBattleTextboxTiles
 _0800FCFC:
-	ldr r1, _0800FD10 @ =gFile_graphics_interface_menu_map_tilemap
+	ldr r1, _0800FD10 @ =gBattleTextboxTilemap
 	movs r0, 0
 	movs r2, 0
 	movs r3, 0
@ -1402,7 +1402,7 @@ _0800FCFC:
 	bl CopyBgTilemapBufferToVram
 	b _0800FD94
 	.align 2, 0
-_0800FD10: .4byte gFile_graphics_interface_menu_map_tilemap
+_0800FD10: .4byte gBattleTextboxTilemap
 _0800FD14:
 	ldr r0, _0800FD20 @ =gBattleTextboxPalette
 	movs r1, 0
--- a/data/graphics.s
+++ b/data/graphics.s
--- a/data/smokescreen.s
+++ b/data/smokescreen.s
@ -4,10 +4,10 @@
 	.align 2

 gSmokescreenImpactSpriteSheet:: @ 825098C
-	obj_tiles gFile_graphics_battle_anims_sprites_smokescreen_impact_sheet, 0x0180, 55019
+	obj_tiles gSmokescreenImpactTiles, 0x0180, 55019

 gSmokescreenImpactSpritePalette:: @ 8250994
-	obj_pal gFile_graphics_battle_anims_sprites_smokescreen_impact_palette, 55019
+	obj_pal gSmokescreenImpactPalette, 55019

 gOamData_835099C::
 	.4byte 0x40000000, 0x00000400
--- a/graphics/battle_anims/backgrounds/aurora.bin
+++ b/graphics/battle_anims/backgrounds/aurora.bin
--- a/graphics/battle_anims/backgrounds/aurora.png
+++ b/graphics/battle_anims/backgrounds/aurora.png
--- a/graphics/battle_anims/backgrounds/bug.pal
+++ b/graphics/battle_anims/backgrounds/bug.pal
--- a/graphics/battle_anims/backgrounds/cosmic.bin
+++ b/graphics/battle_anims/backgrounds/cosmic.bin
--- a/graphics/battle_anims/backgrounds/cosmic.png
+++ b/graphics/battle_anims/backgrounds/cosmic.png
--- a/graphics/battle_anims/backgrounds/dark.bin
+++ b/graphics/battle_anims/backgrounds/dark.bin
--- a/graphics/battle_anims/backgrounds/dark.png
+++ b/graphics/battle_anims/backgrounds/dark.png
--- a/graphics/battle_anims/backgrounds/drill.bin
+++ b/graphics/battle_anims/backgrounds/drill.bin
--- a/graphics/battle_anims/backgrounds/drill.png
+++ b/graphics/battle_anims/backgrounds/drill.png
--- a/graphics/battle_anims/backgrounds/drill_contests.bin
+++ b/graphics/battle_anims/backgrounds/drill_contests.bin
--- a/graphics/battle_anims/backgrounds/fissure.bin
+++ b/graphics/battle_anims/backgrounds/fissure.bin
--- a/graphics/battle_anims/backgrounds/fissure.png
+++ b/graphics/battle_anims/backgrounds/fissure.png
--- a/graphics/battle_anims/backgrounds/ghost.bin
+++ b/graphics/battle_anims/backgrounds/ghost.bin
--- a/graphics/battle_anims/backgrounds/ghost.png
+++ b/graphics/battle_anims/backgrounds/ghost.png
--- a/graphics/battle_anims/backgrounds/guillotine.png
+++ b/graphics/battle_anims/backgrounds/guillotine.png
--- a/graphics/battle_anims/backgrounds/guillotine_contests.bin
+++ b/graphics/battle_anims/backgrounds/guillotine_contests.bin
--- a/graphics/battle_anims/backgrounds/guillotine_opponent.bin
+++ b/graphics/battle_anims/backgrounds/guillotine_opponent.bin
--- a/graphics/battle_anims/backgrounds/guillotine_player.bin
+++ b/graphics/battle_anims/backgrounds/guillotine_player.bin
--- a/graphics/battle_anims/backgrounds/highspeed.png
+++ b/graphics/battle_anims/backgrounds/highspeed.png
--- a/graphics/battle_anims/backgrounds/highspeed_opponent.bin
+++ b/graphics/battle_anims/backgrounds/highspeed_opponent.bin
--- a/graphics/battle_anims/backgrounds/highspeed_player.bin
+++ b/graphics/battle_anims/backgrounds/highspeed_player.bin
--- a/graphics/battle_anims/backgrounds/ice.bin
+++ b/graphics/battle_anims/backgrounds/ice.bin
--- a/graphics/battle_anims/backgrounds/ice.png
+++ b/graphics/battle_anims/backgrounds/ice.png
--- a/graphics/battle_anims/backgrounds/impact.png
+++ b/graphics/battle_anims/backgrounds/impact.png
--- a/graphics/battle_anims/backgrounds/impact_contests.bin
+++ b/graphics/battle_anims/backgrounds/impact_contests.bin
--- a/graphics/battle_anims/backgrounds/impact_opponent.bin
+++ b/graphics/battle_anims/backgrounds/impact_opponent.bin
--- a/graphics/battle_anims/backgrounds/impact_player.bin
+++ b/graphics/battle_anims/backgrounds/impact_player.bin
--- a/graphics/battle_anims/backgrounds/in_air.bin
+++ b/graphics/battle_anims/backgrounds/in_air.bin
--- a/graphics/battle_anims/backgrounds/in_air.png
+++ b/graphics/battle_anims/backgrounds/in_air.png
--- a/graphics/battle_anims/backgrounds/psychic.bin
+++ b/graphics/battle_anims/backgrounds/psychic.bin
--- a/graphics/battle_anims/backgrounds/psychic.png
+++ b/graphics/battle_anims/backgrounds/psychic.png
--- a/graphics/battle_anims/backgrounds/sky.pal
+++ b/graphics/battle_anims/backgrounds/sky.pal
--- a/graphics/battle_anims/backgrounds/solarbeam.pal
+++ b/graphics/battle_anims/backgrounds/solarbeam.pal
--- a/graphics/battle_anims/backgrounds/thunder.bin
+++ b/graphics/battle_anims/backgrounds/thunder.bin
--- a/graphics/battle_anims/backgrounds/thunder.png
+++ b/graphics/battle_anims/backgrounds/thunder.png
--- a/graphics/battle_anims/masks/morning_sun.bin
+++ b/graphics/battle_anims/masks/morning_sun.bin
--- a/graphics/battle_anims/masks/morning_sun.png
+++ b/graphics/battle_anims/masks/morning_sun.png
--- a/graphics/battle_anims/sprites/air_slash.png
+++ b/graphics/battle_anims/sprites/air_slash.png
--- a/graphics/battle_anims/sprites/air_wave.png
+++ b/graphics/battle_anims/sprites/air_wave.png
--- a/graphics/battle_anims/sprites/air_wave_2.png
+++ b/graphics/battle_anims/sprites/air_wave_2.png
--- a/graphics/battle_anims/sprites/alert.png
+++ b/graphics/battle_anims/sprites/alert.png
--- a/graphics/battle_anims/sprites/amnesia.png
+++ b/graphics/battle_anims/sprites/amnesia.png
--- a/graphics/battle_anims/sprites/angel.png
+++ b/graphics/battle_anims/sprites/angel.png
--- a/graphics/battle_anims/sprites/anger.png
+++ b/graphics/battle_anims/sprites/anger.png
--- a/graphics/battle_anims/sprites/bell.png
+++ b/graphics/battle_anims/sprites/bell.png
--- a/graphics/battle_anims/sprites/bell_2.png
+++ b/graphics/battle_anims/sprites/bell_2.png
--- a/graphics/battle_anims/sprites/bent_spoon.png
+++ b/graphics/battle_anims/sprites/bent_spoon.png
--- a/graphics/battle_anims/sprites/bird.png
+++ b/graphics/battle_anims/sprites/bird.png
--- a/graphics/battle_anims/sprites/black_ball.png
+++ b/graphics/battle_anims/sprites/black_ball.png
--- a/graphics/battle_anims/sprites/black_ball_2.png
+++ b/graphics/battle_anims/sprites/black_ball_2.png
--- a/graphics/battle_anims/sprites/black_smoke.png
+++ b/graphics/battle_anims/sprites/black_smoke.png
--- a/graphics/battle_anims/sprites/blue_burst.png
+++ b/graphics/battle_anims/sprites/blue_burst.png
--- a/graphics/battle_anims/sprites/blue_flames.png
+++ b/graphics/battle_anims/sprites/blue_flames.png
--- a/graphics/battle_anims/sprites/blue_flames_2.png
+++ b/graphics/battle_anims/sprites/blue_flames_2.png
--- a/graphics/battle_anims/sprites/blue_light_wall.pal
+++ b/graphics/battle_anims/sprites/blue_light_wall.pal
--- a/graphics/battle_anims/sprites/blue_lines.png
+++ b/graphics/battle_anims/sprites/blue_lines.png
--- a/graphics/battle_anims/sprites/blue_orb.pal
+++ b/graphics/battle_anims/sprites/blue_orb.pal
--- a/graphics/battle_anims/sprites/blue_ring.pal
+++ b/graphics/battle_anims/sprites/blue_ring.pal
--- a/graphics/battle_anims/sprites/blue_ring_2.pal
+++ b/graphics/battle_anims/sprites/blue_ring_2.pal
--- a/graphics/battle_anims/sprites/blue_shards.png
+++ b/graphics/battle_anims/sprites/blue_shards.png
--- a/graphics/battle_anims/sprites/blue_star.png
+++ b/graphics/battle_anims/sprites/blue_star.png
--- a/graphics/battle_anims/sprites/bluegreen_orb.png
+++ b/graphics/battle_anims/sprites/bluegreen_orb.png
--- a/graphics/battle_anims/sprites/bone.png
+++ b/graphics/battle_anims/sprites/bone.png
--- a/graphics/battle_anims/sprites/bone_2.png
+++ b/graphics/battle_anims/sprites/bone_2.png
--- a/graphics/battle_anims/sprites/breaking_egg.png
+++ b/graphics/battle_anims/sprites/breaking_egg.png
--- a/graphics/battle_anims/sprites/breath.png
+++ b/graphics/battle_anims/sprites/breath.png
--- a/graphics/battle_anims/sprites/brown_orb.pal
+++ b/graphics/battle_anims/sprites/brown_orb.pal
--- a/graphics/battle_anims/sprites/brown_triangle.png
+++ b/graphics/battle_anims/sprites/brown_triangle.png
--- a/graphics/battle_anims/sprites/bubble.png
+++ b/graphics/battle_anims/sprites/bubble.png
--- a/graphics/battle_anims/sprites/bubble_burst.png
+++ b/graphics/battle_anims/sprites/bubble_burst.png
--- a/graphics/battle_anims/sprites/bubble_burst_2.png
+++ b/graphics/battle_anims/sprites/bubble_burst_2.png
--- a/graphics/battle_anims/sprites/circle_impact.png
+++ b/graphics/battle_anims/sprites/circle_impact.png
--- a/graphics/battle_anims/sprites/circle_of_light.png
+++ b/graphics/battle_anims/sprites/circle_of_light.png
--- a/graphics/battle_anims/sprites/clamp.png
+++ b/graphics/battle_anims/sprites/clamp.png
--- a/graphics/battle_anims/sprites/clapping.png
+++ b/graphics/battle_anims/sprites/clapping.png
--- a/graphics/battle_anims/sprites/claw_slash.png
+++ b/graphics/battle_anims/sprites/claw_slash.png
--- a/graphics/battle_anims/sprites/claw_slash_2.png
+++ b/graphics/battle_anims/sprites/claw_slash_2.png
--- a/graphics/battle_anims/sprites/closing_eye.png
+++ b/graphics/battle_anims/sprites/closing_eye.png
--- a/graphics/battle_anims/sprites/closing_eye_2.png
+++ b/graphics/battle_anims/sprites/closing_eye_2.png
--- a/graphics/battle_anims/sprites/coin.png
+++ b/graphics/battle_anims/sprites/coin.png
--- a/graphics/battle_anims/sprites/confetti.png
+++ b/graphics/battle_anims/sprites/confetti.png
--- a/graphics/battle_anims/sprites/conversion.png
+++ b/graphics/battle_anims/sprites/conversion.png
--- a/graphics/battle_anims/sprites/cracked_egg.png
+++ b/graphics/battle_anims/sprites/cracked_egg.png
--- a/graphics/battle_anims/sprites/cross_impact.png
+++ b/graphics/battle_anims/sprites/cross_impact.png
--- a/graphics/battle_anims/sprites/cut.png
+++ b/graphics/battle_anims/sprites/cut.png
--- a/graphics/battle_anims/sprites/devil.png
+++ b/graphics/battle_anims/sprites/devil.png
--- a/graphics/battle_anims/sprites/dirt_mound.png
+++ b/graphics/battle_anims/sprites/dirt_mound.png
--- a/graphics/battle_anims/sprites/duck.png
+++ b/graphics/battle_anims/sprites/duck.png
--- a/graphics/battle_anims/sprites/eclipsing_orb.png
+++ b/graphics/battle_anims/sprites/eclipsing_orb.png
--- a/graphics/battle_anims/sprites/effect.pal
+++ b/graphics/battle_anims/sprites/effect.pal
@ -1,27 +0,0 @@
-JASC-PAL
-0100
-24
-230 205 8
-230 172 41
-222 148 65
-222 115 90
-213 82 123
-213 57 148
-205 24 172
-205 0 205
-205 0 189
-205 0 164
-205 0 131
-205 0 106
-213 0 82
-213 0 49
-213 0 24
-222 0 0
-222 8 0
-222 41 0
-222 74 0
-222 98 0
-230 131 0
-230 156 0
-230 189 0
-238 222 0
--- a/graphics/battle_anims/sprites/electric_orbs.png
+++ b/graphics/battle_anims/sprites/electric_orbs.png
--- a/graphics/battle_anims/sprites/electricity.png
+++ b/graphics/battle_anims/sprites/electricity.png
--- a/graphics/battle_anims/sprites/explosion.png
+++ b/graphics/battle_anims/sprites/explosion.png
--- a/graphics/battle_anims/sprites/explosion_2.png
+++ b/graphics/battle_anims/sprites/explosion_2.png
--- a/graphics/battle_anims/sprites/explosion_3.png
+++ b/graphics/battle_anims/sprites/explosion_3.png
--- a/graphics/battle_anims/sprites/explosion_4.png
+++ b/graphics/battle_anims/sprites/explosion_4.png
--- a/graphics/battle_anims/sprites/explosion_5.png
+++ b/graphics/battle_anims/sprites/explosion_5.png
--- a/Show More
+++ b/Show More