remaining work and tidy up previously dumped stuff in graphics.s

This commit is contained in:
ProjectRevoTPP 2016-09-03 21:27:34 +01:00
parent b953d0cb38
commit 828892df21
31 changed files with 471 additions and 92 deletions

View File

@ -182154,7 +182154,7 @@ _080D3A0E:
strh r0, [r7, 0xE]
b _080D3AEE
.align 2, 0
_080D3A78: .4byte gUnknown_08E6A704
_080D3A78: .4byte gBattleAnimBackgroundImageMuddyWater_Pal
_080D3A7C: .4byte sub_80D3D68
_080D3A80: .4byte 0x03004b20
_080D3A84: .4byte 0x0000ffb0
@ -214534,7 +214534,7 @@ _080E3550:
_080E3568: .4byte 0x02024a6a
_080E356C: .4byte 0x03004360
_080E3570: .4byte 0x02024be0
_080E3574: .4byte gUnknown_08D2DCDC
_080E3574: .4byte gBattleStatMask1_Tilemap
_080E3578:
ldr r0, _080E35B0
ldr r1, [sp, 0x4]
@ -214562,44 +214562,44 @@ _080E3598:
ldr r0, _080E35B8
b _080E35FE
.align 2, 0
_080E35B0: .4byte gUnknown_08D2DDF8
_080E35B4: .4byte gUnknown_08D2DACC
_080E35B8: .4byte gUnknown_08D2DF34
_080E35B0: .4byte gBattleStatMask2_Tilemap
_080E35B4: .4byte gBattleStatMask_Gfx
_080E35B8: .4byte gBattleStatMask2_Pal
_080E35BC:
cmp r0, 0x1
bne _080E35C8
ldr r0, _080E35C4
b _080E35FE
.align 2, 0
_080E35C4: .4byte gUnknown_08D2DF14
_080E35C4: .4byte gBattleStatMask1_Pal
_080E35C8:
cmp r0, 0x2
bne _080E35D4
ldr r0, _080E35D0
b _080E35FE
.align 2, 0
_080E35D0: .4byte gUnknown_08D2DF54
_080E35D0: .4byte gBattleStatMask3_Pal
_080E35D4:
cmp r0, 0x3
bne _080E35E0
ldr r0, _080E35DC
b _080E35FE
.align 2, 0
_080E35DC: .4byte gUnknown_08D2DF74
_080E35DC: .4byte gBattleStatMask4_Pal
_080E35E0:
cmp r0, 0x4
bne _080E35EC
ldr r0, _080E35E8
b _080E35FE
.align 2, 0
_080E35E8: .4byte gUnknown_08D2DFB4
_080E35E8: .4byte gBattleStatMask6_Pal
_080E35EC:
cmp r0, 0x5
bne _080E35F8
ldr r0, _080E35F4
b _080E35FE
.align 2, 0
_080E35F4: .4byte gUnknown_08D2DFD4
_080E35F4: .4byte gBattleStatMask7_Pal
_080E35F8:
cmp r0, 0x6
bne _080E3610
@ -214612,7 +214612,7 @@ _080E35FE:
bl LoadCompressedPalette
b _080E361E
.align 2, 0
_080E360C: .4byte gUnknown_08D2DFF4
_080E360C: .4byte gBattleStatMask8_Pal
_080E3610:
ldr r0, _080E3644
mov r1, sp
@ -214641,7 +214641,7 @@ _080E361E:
strh r1, [r0, 0xA]
b _080E3668
.align 2, 0
_080E3644: .4byte gUnknown_08D2DF94
_080E3644: .4byte gBattleStatMask5_Pal
_080E3648: .4byte 0x030042c0
_080E364C: .4byte 0x030041b4
_080E3650: .4byte 0x03004b20
@ -226246,7 +226246,7 @@ _080E8F40: .4byte gUnknown_08E953D0
_080E8F44: .4byte gMenuWordGroupFrame_Gfx
_080E8F48: .4byte 0x06008000
_080E8F4C: .4byte 0x06006800
_080E8F50: .4byte gUnknown_08E8F178
_080E8F50: .4byte gMenuWordGroupFrame1_Pal
_080E8F54: .4byte REG_BG2CNT
_080E8F58: .4byte 0x00000e02
_080E8F5C: .4byte 0x06007000
@ -226445,8 +226445,8 @@ _080E90DA:
pop {r0}
bx r0
.align 2, 0
_080E90F4: .4byte gUnknown_08E8F19A
_080E90F8: .4byte gUnknown_08E8F1A0
_080E90F4: .4byte gMenuWordGroupFrame2_Pal + 0x2
_080E90F8: .4byte gMenuWordGroupFrame2_Pal + 0x8
_080E90FC: .4byte gUnknown_083DB694
_080E9100: .4byte 0x00009c34
_080E9104: .4byte 0x00009c32

View File

@ -9374,7 +9374,7 @@ _080457BA:
bx r0
.align 2, 0
_080457C8: .4byte 0x02020004
_080457CC: .4byte gUnknown_08E903F8
_080457CC: .4byte gBattleInterfaceStatusIcons_DynPal
_080457D0: .4byte 0x0202ecc8
_080457D4: .4byte 0x05000200
_080457D8: .4byte 0x06010000

View File

@ -21495,11 +21495,11 @@ gSpriteTemplate_83DBD48:: @ 83DBD48
.align 2
gUnknown_083DBD60:: @ 83DBD60
obj_tiles gMenuWordGroup_Gfx, 4096, 0x0007
obj_tiles gMenuWordGroupIndicator_Gfx, 4096, 0x0007
.align 2
gUnknown_083DBD68:: @ 83DBD68
obj_pal gMenuWordGroup_Pal, 0x0005
obj_pal gMenuWordGroupIndicator_Pal, 0x0005
.align 2
gOamData_83DBD70:: @ 83DBD70
@ -31293,20 +31293,20 @@ gSpriteAffineAnimTable_8412050:: @ 8412050
.align 2
gUnknown_084120A4:: @ 84120A4
.4byte gUnknown_08E781E4
.4byte gUnknown_08E781F8
.4byte gUnknown_08E7820C
.4byte gUnknown_08E78220
.4byte gUnknown_08E78234
.4byte gUnknown_08E78248
.4byte gUnknown_08E7825C
.4byte gUnknown_08E78270
.4byte gUnknown_08E78284
.4byte gUnknown_08E78298
.4byte gUnknown_08E782ac
.4byte gUnknown_08E782c0
.4byte gUnknown_08E782d4
.4byte gUnknown_08E782e8
.4byte gPokeblockRed_Pal
.4byte gPokeblockBlue_Pal
.4byte gPokeblockPink_Pal
.4byte gPokeblockGreen_Pal
.4byte gPokeblockYellow_Pal
.4byte gPokeblockPurple_Pal
.4byte gPokeblockIndigo_Pal
.4byte gPokeblockBrown_Pal
.4byte gPokeblockLiteBlue_Pal
.4byte gPokeblockOlive_Pal
.4byte gPokeblockGray_Pal
.4byte gPokeblockBlack_Pal
.4byte gPokeblockWhite_Pal
.4byte gPokeblockGold_Pal
.align 2
gSpriteAffineAnim_84120DC:: @ 84120DC

View File

@ -2336,48 +2336,48 @@ gBattleAnimSpritePalette_243:: @ 8D2DAA4
.incbin "graphics/battle_anims/sprites/243.gbapal.lz"
.align 2
gUnknown_08D2DACC:: @ 8D2DACC
gBattleStatMask_Gfx:: @ 8D2DACC
.incbin "graphics/battle_anims/masks/stat.4bpp.lz"
.align 2
gUnknown_08D2DCDC:: @ 8D2DCDC
gBattleStatMask1_Tilemap:: @ 8D2DCDC
.incbin "graphics/battle_anims/masks/stat_tilemap_1.bin.lz"
.align 2
gUnknown_08D2DDF8:: @ 8D2DDF8
gBattleStatMask2_Tilemap:: @ 8D2DDF8
.incbin "graphics/battle_anims/masks/stat_tilemap_2.bin.lz"
.align 2
gUnknown_08D2DF14:: @ 8D2DF14
gBattleStatMask1_Pal:: @ 8D2DF14
.incbin "graphics/battle_anims/masks/stat1.gbapal.lz"
.align 2
gUnknown_08D2DF34:: @ 8D2DF34
gBattleStatMask2_Pal:: @ 8D2DF34
.incbin "graphics/battle_anims/masks/stat2.gbapal.lz"
.align 2
gUnknown_08D2DF54:: @ 8D2DF54
gBattleStatMask3_Pal:: @ 8D2DF54
.incbin "graphics/battle_anims/masks/stat3.gbapal.lz"
.align 2
gUnknown_08D2DF74:: @ 8D2DF74
gBattleStatMask4_Pal:: @ 8D2DF74
.incbin "graphics/battle_anims/masks/stat4.gbapal.lz"
.align 2
gUnknown_08D2DF94:: @ 8D2DF94
gBattleStatMask5_Pal:: @ 8D2DF94
.incbin "graphics/battle_anims/masks/stat5.gbapal.lz"
.align 2
gUnknown_08D2DFB4:: @ 8D2DFB4
gBattleStatMask6_Pal:: @ 8D2DFB4
.incbin "graphics/battle_anims/masks/stat6.gbapal.lz"
.align 2
gUnknown_08D2DFD4:: @ 8D2DFD4
.incbin "baserom.gba", 0xD2DFD4, 0x1D @ LZ, uncomp. size = 0x20
gBattleStatMask7_Pal:: @ 8D2DFD4
.incbin "graphics/battle_anims/masks/stat7.gbapal.lz"
.align 2
gUnknown_08D2DFF4:: @ 8D2DFF4
.incbin "baserom.gba", 0xD2DFF4, 0x1D @ LZ, uncomp. size = 0x20
gBattleStatMask8_Pal:: @ 8D2DFF4
.incbin "graphics/battle_anims/masks/stat8.gbapal.lz"
.align 2
gUnknown_08D2E014:: @ 8D2E014
@ -2926,8 +2926,8 @@ gBattleAnimSpritePalette_280:: @ 8E6A6E4
.incbin "graphics/battle_anims/sprites/280.gbapal.lz"
.align 2
gUnknown_08E6A704:: @ 8E6A704
.incbin "baserom.gba", 0xE6A704, 0x24 @ LZ, uncomp. size = 0x20
gBattleAnimBackgroundImageMuddyWater_Pal:: @ 8E6A704
.incbin "graphics/battle_anims/backgrounds/water_muddy.gbapal.lz"
.align 2
gEnemyMonShadow_Gfx:: @ 8E6A728
@ -3263,63 +3263,63 @@ gMenuPokeblock_Tilemap:: @ 8E78078
.align 2
gPokeblock_Gfx::
.incbin "graphics/misc/pokeblock.4bpp.lz"
.incbin "graphics/pokeblock/pokeblock.4bpp.lz"
.align 2
gUnknown_08E781E4::
.incbin "baserom.gba", 0xE781E4, 0x14 @ LZ, uncomp. size = 0x20
gPokeblockRed_Pal::
.incbin "graphics/pokeblock/red.gbapal.lz"
.align 2
gUnknown_08E781F8::
.incbin "baserom.gba", 0xE781F8, 0x14 @ LZ, uncomp. size = 0x20
gPokeblockBlue_Pal::
.incbin "graphics/pokeblock/blue.gbapal.lz"
.align 2
gUnknown_08E7820C::
.incbin "baserom.gba", 0xE7820C, 0x14 @ LZ, uncomp. size = 0x20
gPokeblockPink_Pal::
.incbin "graphics/pokeblock/pink.gbapal.lz"
.align 2
gUnknown_08E78220::
.incbin "baserom.gba", 0xE78220, 0x14 @ LZ, uncomp. size = 0x20
gPokeblockGreen_Pal::
.incbin "graphics/pokeblock/green.gbapal.lz"
.align 2
gUnknown_08E78234::
.incbin "baserom.gba", 0xE78234, 0x14 @ LZ, uncomp. size = 0x20
gPokeblockYellow_Pal::
.incbin "graphics/pokeblock/yellow.gbapal.lz"
.align 2
gUnknown_08E78248::
.incbin "baserom.gba", 0xE78248, 0x14 @ LZ, uncomp. size = 0x20
gPokeblockPurple_Pal::
.incbin "graphics/pokeblock/purple.gbapal.lz"
.align 2
gUnknown_08E7825C::
.incbin "baserom.gba", 0xE7825C, 0x14 @ LZ, uncomp. size = 0x20
gPokeblockIndigo_Pal::
.incbin "graphics/pokeblock/indigo.gbapal.lz"
.align 2
gUnknown_08E78270::
.incbin "baserom.gba", 0xE78270, 0x14 @ LZ, uncomp. size = 0x20
gPokeblockBrown_Pal::
.incbin "graphics/pokeblock/brown.gbapal.lz"
.align 2
gUnknown_08E78284::
.incbin "baserom.gba", 0xE78284, 0x14 @ LZ, uncomp. size = 0x20
gPokeblockLiteBlue_Pal::
.incbin "graphics/pokeblock/liteblue.gbapal.lz"
.align 2
gUnknown_08E78298::
.incbin "baserom.gba", 0xE78298, 0x14 @ LZ, uncomp. size = 0x20
gPokeblockOlive_Pal::
.incbin "graphics/pokeblock/olive.gbapal.lz"
.align 2
gUnknown_08E782ac::
.incbin "baserom.gba", 0xE782AC, 0x14 @ LZ, uncomp. size = 0x20
gPokeblockGray_Pal::
.incbin "graphics/pokeblock/gray.gbapal.lz"
.align 2
gUnknown_08E782c0::
.incbin "baserom.gba", 0xE782C0, 0x14 @ LZ, uncomp. size = 0x20
gPokeblockBlack_Pal::
.incbin "graphics/pokeblock/black.gbapal.lz"
.align 2
gUnknown_08E782d4::
.incbin "baserom.gba", 0xE782D4, 0x14 @ LZ, uncomp. size = 0x20
gPokeblockWhite_Pal::
.incbin "graphics/pokeblock/white.gbapal.lz"
.align 2
gUnknown_08E782e8::
.incbin "baserom.gba", 0xE782E8, 0x14 @ LZ, uncomp. size = 0x20
gPokeblockGold_Pal::
.incbin "graphics/pokeblock/gold.gbapal.lz"
.align 2
gUnknown_08E782FC:: @ 8E782FC
@ -3853,25 +3853,24 @@ gHallOfFame_Pal:: @ 8E8EA78
.incbin "graphics/misc/hof.gbapal"
.align 2
gMenuWordGroup_Gfx:: @ 8E8EA98
.incbin "graphics/interface/wordgroup.4bpp.lz"
gMenuWordGroupIndicator_Gfx:: @ 8E8EA98
.incbin "graphics/interface/wordgroup_indicator.4bpp.lz"
.align 2
gMenuWordGroupFrame_Gfx:: @ 8E8EE18
.incbin "graphics/interface/wordgroup_frame.4bpp.lz"
.align 2
gMenuWordGroup_Pal:: @ 8E8F158
.incbin "graphics/interface/wordgroup.gbapal"
gMenuWordGroupIndicator_Pal:: @ 8E8F158
.incbin "graphics/interface/wordgroup_indicator.gbapal"
gUnknown_08E8F178:: @ 8E8F178
.incbin "baserom.gba", 0x00e8f178, 0x22
.align 2
gMenuWordGroupFrame1_Pal:: @ 8E8F178
.incbin "graphics/interface/wordgroup_pink.gbapal"
gUnknown_08E8F19A:: @ 8E8F19A
.incbin "baserom.gba", 0x00e8f19a, 0x6
gUnknown_08E8F1A0:: @ 8E8F1A0
.incbin "baserom.gba", 0x00e8f1a0, 0x18
.align 2
gMenuWordGroupFrame2_Pal:: @ 8E8F198
.incbin "graphics/interface/wordgroup_blue.gbapal"
.align 2
gMiscClock_Gfx:: @ 8E8F1B8
@ -3890,11 +3889,11 @@ gSlotMachine_Gfx:: @ 8E8F844
.incbin "graphics/slot_machine/slots.4bpp.lz"
.align 2
gUnknown_08E903F8:: @ 8E903F8
.incbin "baserom.gba", 0x00e903f8, 0x20
gBattleInterfaceStatusIcons_DynPal:: @ 8E903F8
.incbin "graphics/battle_interface/status.gbapal"
@ unused
.incbin "baserom.gba", 0x00e90418, 0x200
.incbin "graphics/unused/arrow.4bpp"
.align 2
gBerryBlenderMarubatsuTiles:: @ 8E90618
@ -3914,7 +3913,7 @@ gBerryBlenderCountdownNumbersTiles:: @ 8E90A18
gBerryBlenderStartTiles:: @ 8E91018
.incbin "graphics/berry_blender/start.4bpp"
.incbin "baserom.gba", 0x00e91418, 0x20
.incbin "graphics/unknown/unknown_E91418.bin"
.space 0x1E0
@ -4549,7 +4548,7 @@ gTradeMonBoxTilemap:: @ 8EA1DC8
gUnknown_08EA1DEC:: @ 8EA1DEC
.incbin "graphics/trade/selected_mon.4bpp"
.incbin "baserom.gba", 0x00ea25ec, 0x20
.incbin "graphics/unused/unknown_EA25EC.bin"
.align 2
gCreditsCopyrightEnd_Gfx:: @ 8EA260C

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
131 49 0
148 74 32
164 106 65
180 131 106
197 164 139
213 189 180
230 222 213
255 255 255
148 74 32
164 106 65
197 164 139
230 222 213
255 255 255
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 8 8
255 65 16
255 131 32
255 189 41
255 255 57
255 255 123
255 255 189
255 255 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
0 148 0
32 172 24
74 197 57
115 222 90
156 255 123
189 255 164
222 255 205
255 255 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
197 98 197
189 189 24
164 164 139
139 180 230
230 115 82
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
255 0 0
0 255 0
0 0 255
255 255 255

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 255 148
156 230 255
98 197 246
82 148 197
172 246 213
139 230 180
90 164 123
0 0 0
0 0 0
0 0 0
0 0 0
41 49 49
98 98 98
180 189 180
222 213 222
255 255 255

View File

Before

Width:  |  Height:  |  Size: 558 B

After

Width:  |  Height:  |  Size: 558 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 255 148
255 213 213
246 180 180
213 148 148
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
41 49 49
98 98 98
180 189 180
222 213 222
255 255 255

Binary file not shown.

Before

Width:  |  Height:  |  Size: 192 B

After

Width:  |  Height:  |  Size: 235 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
213 131 74
41 41 41
98 98 98
148 148 148
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
106 106 189
148 148 255
180 180 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
106 0 0
172 65 65
197 123 123
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
222 197 49
246 230 164
255 238 197
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
148 148 148
189 189 189
205 205 205
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
0 106 0
49 164 49
90 230 90
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
139 205 74
0 0 106
65 65 172
123 123 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
106 139 189
148 213 255
180 238 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
115 180 106
148 246 98
205 255 139
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
205 90 172
255 156 197
255 197 213
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

Before

Width:  |  Height:  |  Size: 147 B

After

Width:  |  Height:  |  Size: 147 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
164 0 164
197 41 197
255 131 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
205 65 24
255 123 90
255 180 148
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
222 222 222
238 238 238
255 255 255
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
180 180 49
246 230 49
255 255 148
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

Binary file not shown.

BIN
graphics/unused/arrow.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 B