Merge branch 'master' of https://github.com/pret/pokefirered into dump_graphics
This commit is contained in:
+25
-25
@@ -49,103 +49,103 @@ gFile_graphics_battle_anims_sprites_smokescreen_impact_palette:: @ 8D0170C
|
||||
.incbin "graphics/battle_anims/sprites/smokescreen_impact.gbapal.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Poke_sheet:: @ 8D01724
|
||||
gInterfaceGfx_PokeBall:: @ 8D01724
|
||||
.incbin "graphics/interface/ball/poke.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Poke_palette:: @ 8D017E0
|
||||
gInterfacePal_PokeBall:: @ 8D017E0
|
||||
.incbin "graphics/interface/ball/poke.gbapal.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Great_sheet:: @ 8D01800
|
||||
gInterfaceGfx_GreatBall:: @ 8D01800
|
||||
.incbin "graphics/interface/ball/great.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Great_palette:: @ 8D018BC
|
||||
gInterfacePal_GreatBall:: @ 8D018BC
|
||||
.incbin "graphics/interface/ball/great.gbapal.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Safari_sheet:: @ 8D018E0
|
||||
gInterfaceGfx_SafariBall:: @ 8D018E0
|
||||
.incbin "graphics/interface/ball/safari.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Safari_palette:: @ 8D019A4
|
||||
gInterfacePal_SafariBall:: @ 8D019A4
|
||||
.incbin "graphics/interface/ball/safari.gbapal.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Ultra_sheet:: @ 8D019C8
|
||||
gInterfaceGfx_UltraBall:: @ 8D019C8
|
||||
.incbin "graphics/interface/ball/ultra.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Ultra_palette:: @ 8D01A7C
|
||||
gInterfacePal_UltraBall:: @ 8D01A7C
|
||||
.incbin "graphics/interface/ball/ultra.gbapal.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Master_sheet:: @ 8D01A9C
|
||||
gInterfaceGfx_MasterBall:: @ 8D01A9C
|
||||
.incbin "graphics/interface/ball/master.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Master_palette:: @ 8D01B5C
|
||||
gInterfacePal_MasterBall:: @ 8D01B5C
|
||||
.incbin "graphics/interface/ball/master.gbapal.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Net_sheet:: @ 8D01B80
|
||||
gInterfaceGfx_NetBall:: @ 8D01B80
|
||||
.incbin "graphics/interface/ball/net.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Net_palette:: @ 8D01C40
|
||||
gInterfacePal_NetBall:: @ 8D01C40
|
||||
.incbin "graphics/interface/ball/net.gbapal.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Dive_sheet:: @ 8D01C60
|
||||
gInterfaceGfx_DiveBall:: @ 8D01C60
|
||||
.incbin "graphics/interface/ball/dive.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Dive_palette:: @ 8D01D74
|
||||
gInterfacePal_DiveBall:: @ 8D01D74
|
||||
.incbin "graphics/interface/ball/dive.gbapal.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Nest_sheet:: @ 8D01D9C
|
||||
gInterfaceGfx_NestBall:: @ 8D01D9C
|
||||
.incbin "graphics/interface/ball/nest.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Nest_palette:: @ 8D01E60
|
||||
gInterfacePal_NestBall:: @ 8D01E60
|
||||
.incbin "graphics/interface/ball/nest.gbapal.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Repeat_sheet:: @ 8D01E84
|
||||
gInterfaceGfx_RepeatBall:: @ 8D01E84
|
||||
.incbin "graphics/interface/ball/repeat.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Repeat_palette:: @ 8D01F44
|
||||
gInterfacePal_RepeatBall:: @ 8D01F44
|
||||
.incbin "graphics/interface/ball/repeat.gbapal.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Timer_sheet:: @ 8D01F68
|
||||
gInterfaceGfx_TimerBall:: @ 8D01F68
|
||||
.incbin "graphics/interface/ball/timer.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Timer_palette:: @ 8D02060
|
||||
gInterfacePal_TimerBall:: @ 8D02060
|
||||
.incbin "graphics/interface/ball/timer.gbapal.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Luxury_sheet:: @ 8D02084
|
||||
gInterfaceGfx_LuxuryBall:: @ 8D02084
|
||||
.incbin "graphics/interface/ball/luxury.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Luxury_palette:: @ 8D021B0
|
||||
gInterfacePal_LuxuryBall:: @ 8D021B0
|
||||
.incbin "graphics/interface/ball/luxury.gbapal.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Premier_sheet:: @ 8D021D8
|
||||
gInterfaceGfx_PremierBall:: @ 8D021D8
|
||||
.incbin "graphics/interface/ball/premier.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Premier_palette:: @ 8D022C8
|
||||
gInterfacePal_PremierBall:: @ 8D022C8
|
||||
.incbin "graphics/interface/ball/premier.gbapal.lz"
|
||||
|
||||
.align 2
|
||||
gFile_graphics_interface_ball_Open_sheet:: @ 8D022E8
|
||||
gOpenPokeballGfx:: @ 8D022E8
|
||||
.incbin "graphics/interface/ball_open.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
|
||||
-116
@@ -1,116 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2, 0
|
||||
|
||||
gUnknown_826056C:: @ 826056C
|
||||
obj_tiles gFile_graphics_interface_ball_Poke_sheet, 0x180, 55000
|
||||
obj_tiles gFile_graphics_interface_ball_Great_sheet, 0x180, 55001
|
||||
obj_tiles gFile_graphics_interface_ball_Safari_sheet, 0x180, 55002
|
||||
obj_tiles gFile_graphics_interface_ball_Ultra_sheet, 0x180, 55003
|
||||
obj_tiles gFile_graphics_interface_ball_Master_sheet, 0x180, 55004
|
||||
obj_tiles gFile_graphics_interface_ball_Net_sheet, 0x180, 55005
|
||||
obj_tiles gFile_graphics_interface_ball_Dive_sheet, 0x180, 55006
|
||||
obj_tiles gFile_graphics_interface_ball_Nest_sheet, 0x180, 55007
|
||||
obj_tiles gFile_graphics_interface_ball_Repeat_sheet, 0x180, 55008
|
||||
obj_tiles gFile_graphics_interface_ball_Timer_sheet, 0x180, 55009
|
||||
obj_tiles gFile_graphics_interface_ball_Luxury_sheet, 0x180, 55010
|
||||
obj_tiles gFile_graphics_interface_ball_Premier_sheet, 0x180, 55011
|
||||
|
||||
gUnknown_82605CC:: @ 82605CC
|
||||
obj_pal gFile_graphics_interface_ball_Poke_palette, 55000
|
||||
obj_pal gFile_graphics_interface_ball_Great_palette, 55001
|
||||
obj_pal gFile_graphics_interface_ball_Safari_palette, 55002
|
||||
obj_pal gFile_graphics_interface_ball_Ultra_palette, 55003
|
||||
obj_pal gFile_graphics_interface_ball_Master_palette, 55004
|
||||
obj_pal gFile_graphics_interface_ball_Net_palette, 55005
|
||||
obj_pal gFile_graphics_interface_ball_Dive_palette, 55006
|
||||
obj_pal gFile_graphics_interface_ball_Nest_palette, 55007
|
||||
obj_pal gFile_graphics_interface_ball_Repeat_palette, 55008
|
||||
obj_pal gFile_graphics_interface_ball_Timer_palette, 55009
|
||||
obj_pal gFile_graphics_interface_ball_Luxury_palette, 55010
|
||||
obj_pal gFile_graphics_interface_ball_Premier_palette, 55011
|
||||
|
||||
gOamData_826062C:: @ 826062C
|
||||
.4byte 0x40000300, 0x00000800
|
||||
|
||||
gSpriteAnim_8260634:: @ 8260634
|
||||
obj_image_anim_frame 0x0, 0x5
|
||||
obj_image_anim_jump 0
|
||||
|
||||
gSpriteAnim_826063C:: @ 826063C
|
||||
obj_image_anim_frame 0x4, 0x1
|
||||
obj_image_anim_jump 0
|
||||
|
||||
gSpriteAnim_8260644:: @ 8260644
|
||||
obj_image_anim_frame 0x8, 0x5
|
||||
obj_image_anim_jump 0
|
||||
|
||||
gSpriteAnim_826064C:: @ 826064C
|
||||
obj_image_anim_frame 0xc, 0x1
|
||||
obj_image_anim_jump 0
|
||||
|
||||
gSpriteAnim_8260654:: @ 8260654
|
||||
obj_image_anim_frame 0x0, 0x1
|
||||
obj_image_anim_end
|
||||
|
||||
gSpriteAnim_826065C:: @ 826065C
|
||||
obj_image_anim_frame 0x4, 0x5
|
||||
obj_image_anim_frame 0x8, 0x5
|
||||
obj_image_anim_end
|
||||
|
||||
gSpriteAnim_8260668:: @ 8260668
|
||||
obj_image_anim_frame 0x4, 0x5
|
||||
obj_image_anim_frame 0x0, 0x5
|
||||
obj_image_anim_end
|
||||
|
||||
gSpriteAnimTable_8260674::
|
||||
.4byte gSpriteAnim_8260654
|
||||
.4byte gSpriteAnim_826065C
|
||||
.4byte gSpriteAnim_8260668
|
||||
.4byte gSpriteAnim_8260634
|
||||
.4byte gSpriteAnim_8260644
|
||||
.4byte gSpriteAnim_826063C
|
||||
.4byte gSpriteAnim_826064C
|
||||
|
||||
gSpriteAffineAnims_8260690::
|
||||
obj_rot_scal_anim_frame 0x0, 0x0, 0x0, 0x1
|
||||
obj_rot_scal_anim_jump 0
|
||||
|
||||
gSpriteAffineAnims_82606A0::
|
||||
obj_rot_scal_anim_frame 0x0, 0x0, 0xfd, 0x1
|
||||
obj_rot_scal_anim_jump 0
|
||||
|
||||
gSpriteAffineAnims_82606B0::
|
||||
obj_rot_scal_anim_frame 0x0, 0x0, 0x3, 0x1
|
||||
obj_rot_scal_anim_jump 0
|
||||
|
||||
gSpriteAffineAnims_82606C0::
|
||||
obj_rot_scal_anim_frame 0x100, 0x100, 0x0, 0x0
|
||||
obj_rot_scal_anim_end
|
||||
|
||||
gSpriteAffineAnims_82606D0::
|
||||
obj_rot_scal_anim_frame 0x0, 0x0, 0x19, 0x1
|
||||
obj_rot_scal_anim_jump 0
|
||||
|
||||
gSpriteAffineAnimTable_82606E0::
|
||||
.4byte gSpriteAffineAnims_8260690
|
||||
.4byte gSpriteAffineAnims_82606A0
|
||||
.4byte gSpriteAffineAnims_82606B0
|
||||
.4byte gSpriteAffineAnims_82606C0
|
||||
.4byte gSpriteAffineAnims_82606D0
|
||||
|
||||
gUnknown_82606F4:: @ 82606F4
|
||||
spr_template 55000, 55000, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
|
||||
spr_template 55001, 55001, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
|
||||
spr_template 55002, 55002, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
|
||||
spr_template 55003, 55003, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
|
||||
spr_template 55004, 55004, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
|
||||
spr_template 55005, 55005, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
|
||||
spr_template 55006, 55006, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
|
||||
spr_template 55007, 55007, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
|
||||
spr_template 55008, 55008, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
|
||||
spr_template 55009, 55009, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
|
||||
spr_template 55010, 55010, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
|
||||
spr_template 55011, 55011, gOamData_826062C, gSpriteAnimTable_8260674, NULL, gSpriteAffineAnimTable_82606E0, SpriteCB_TestBallThrow
|
||||
Reference in New Issue
Block a user