Finish extracting data2.s

This commit is contained in:
Diegoisawesome 2017-09-16 03:21:09 -05:00
parent 3e1c6024a7
commit 448497dfbb
54 changed files with 2005 additions and 215 deletions

View File

@ -46151,17 +46151,17 @@ _0802121C:
lsls r2, 1
movs r1, 0
bl LoadPalette
ldr r1, =gUnknown_082F3C8C
ldr r1, =gBerryCrushGrinderTopTilemap
movs r0, 0x1
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBuffer
ldr r1, =gUnknown_082F3DBC
ldr r1, =gBerryCrushContainerCapTilemap
movs r0, 0x2
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBuffer
ldr r1, =gUnknown_082F3F54
ldr r1, =gBerryCrushBackgroundTilemap
movs r0, 0x3
movs r2, 0
movs r3, 0
@ -46800,7 +46800,7 @@ _0802175A:
asrs r0, 24
strh r0, [r2, 0x24]
ldr r2, [r3]
ldr r3, =gUnknown_082F41CD
ldr r3, =gUnknown_082F41CC+1
adds r1, r3
movs r0, 0
ldrsb r0, [r1, r0]
@ -46860,7 +46860,7 @@ _080217E8:
ldr r0, =sub_8022B28
str r0, [r2, 0x1C]
lsls r1, r4, 1
ldr r3, =gUnknown_082F41D2
ldr r3, =gUnknown_082F41CC+6
adds r0, r1, r3
movs r4, 0
ldrsb r4, [r0, r4]
@ -46868,7 +46868,7 @@ _080217E8:
adds r0, 0x78
strh r0, [r2, 0x20]
ldr r2, [r7]
ldr r0, =gUnknown_082F41D3
ldr r0, =gUnknown_082F41CC+7
adds r1, r0
movs r6, 0
ldrsb r6, [r1, r6]
@ -48771,7 +48771,7 @@ _080227AA:
bcc _080227AA
_08022822:
movs r5, 0
ldr r4, =gUnknown_082F41D2
ldr r4, =gUnknown_082F41CC+6
adds r7, r4, 0x1
_08022828:
lsls r2, r5, 1
@ -56589,7 +56589,7 @@ _08026676:
lsrs r0, 24
cmp r0, 0x1
bhi _080266D4
ldr r0, =gUnknown_082F45AF
ldr r0, =gUnknown_082F449C+0x113
lsls r1, r4, 1
adds r1, r4
adds r1, r7, r1
@ -56625,7 +56625,7 @@ _080266D0:
movs r0, 0x1
b _0802670C
_080266D4:
ldr r0, =gUnknown_082F45AF
ldr r0, =gUnknown_082F449C+0x113
lsls r1, r4, 1
adds r1, r4
adds r1, r7, r1
@ -57508,7 +57508,7 @@ _08026D76:
sub_8026D8C: @ 8026D8C
lsls r0, 24
lsrs r0, 24
ldr r3, =gUnknown_082F4648
ldr r3, =gUnknown_082F449C+0x1AC
ldr r1, =gUnknown_02022C98
ldr r1, [r1]
adds r1, 0x24
@ -57539,7 +57539,7 @@ sub_8026DB0: @ 8026DB0
subs r2, 0x1
lsls r2, 24
lsrs r2, 24
ldr r3, =gUnknown_082F45FA
ldr r3, =gUnknown_082F449C+0x15E
lsls r1, r0, 1
adds r1, r0
lsls r0, r2, 4
@ -57556,7 +57556,7 @@ sub_8026DB0: @ 8026DB0
ldrb r1, [r1]
mov r8, r1
movs r3, 0
ldr r1, =gUnknown_082F467F
ldr r1, =gUnknown_082F449C+0x1E3
lsls r0, r2, 2
adds r2, r0, r2
adds r0, r2, r1
@ -60392,7 +60392,7 @@ sub_80283A8: @ 80283A8
ldr r0, [r0]
str r0, [sp, 0x10]
str r1, [sp, 0x14]
ldr r0, =gUnknown_082F98BC
ldr r0, =gDodrioBerryPkmnGfx
adds r1, r4, 0
bl LZ77UnCompWram
cmp r4, 0
@ -60848,7 +60848,7 @@ sub_8028734: @ 8028734
ldr r0, [r0]
str r0, [sp, 0x20]
str r1, [sp, 0x24]
ldr r0, =gUnknown_082F96E0
ldr r0, =gDodrioBerryStatusGfx
adds r1, r6, 0
bl LZ77UnCompWram
cmp r6, 0
@ -61225,7 +61225,7 @@ sub_8028A34: @ 8028A34
ldr r0, [r0]
str r0, [sp, 0x8]
str r1, [sp, 0xC]
ldr r0, =gUnknown_082F7EB0
ldr r0, =gDodrioBerrySpritesGfx
adds r1, r4, 0
bl LZ77UnCompWram
cmp r4, 0
@ -61611,7 +61611,7 @@ sub_8028D44: @ 8028D44
ldr r0, [r0]
str r0, [sp, 0x20]
str r1, [sp, 0x24]
ldr r0, =gUnknown_082F9774
ldr r0, =gDodrioBerryPlatformGfx
adds r1, r6, 0
bl LZ77UnCompWram
cmp r6, 0
@ -62386,17 +62386,17 @@ _0802937A:
b _0802941C
.pool
_08029394:
ldr r1, =gUnknown_082FAAD8
ldr r1, =gDodrioBerryBgTilemap1
movs r0, 0x3
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBuffer
ldr r1, =gUnknown_082FAF94
ldr r1, =gDodrioBerryBgTilemap2Left
movs r0, 0x1
movs r2, 0
movs r3, 0
bl CopyToBgTilemapBuffer
ldr r1, =gUnknown_082FAD44
ldr r1, =gDodrioBerryBgTilemap2Right
movs r0, 0x2
movs r2, 0
movs r3, 0
@ -64749,7 +64749,7 @@ _0802A910:
.4byte _0802A964
.4byte _0802A972
_0802A928:
ldr r0, =gUnknown_082F7DF0
ldr r0, =gDodrioBerryBgPal1
movs r1, 0
movs r2, 0x40
bl LoadPalette
@ -64759,14 +64759,14 @@ _0802A938:
bl reset_temp_tile_data_buffers
b _0802A98A
_0802A93E:
ldr r1, =gUnknown_082F8084
ldr r1, =gDodrioBerryBgGfx1
movs r0, 0
str r0, [sp]
movs r0, 0x3
b _0802A954
.pool
_0802A94C:
ldr r1, =gUnknown_082F8914
ldr r1, =gDodrioBerryBgGfx2
movs r0, 0
str r0, [sp]
movs r0, 0x1
@ -64995,7 +64995,7 @@ sub_802AB20: @ 802AB20
ldr r7, =gUnknown_02022CFC
movs r6, 0
movs r5, 0
ldr r0, =gUnknown_082FB464
ldr r0, =gPkmnJumpSpecies
mov r8, r0
movs r4, 0x4
_0802AB32:
@ -65091,7 +65091,7 @@ sub_802AC00: @ 802AC00
lsls r0, 16
lsrs r3, r0, 16
movs r1, 0
ldr r2, =gUnknown_082FB464
ldr r2, =gPkmnJumpSpecies
_0802AC0A:
ldrh r0, [r2]
cmp r0, r3
@ -69939,56 +69939,56 @@ _0802D178:
ldr r0, [r6]
bl sub_802C974
bl sub_802DD08
ldr r0, =gUnknown_082FC044
ldr r0, =gPkmnJumpBgPal
movs r1, 0
movs r2, 0x20
bl LoadPalette
ldr r1, =gUnknown_082FC064
ldr r1, =gPkmnJumpBgGfx
str r5, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r1, =gUnknown_082FC290
ldr r1, =gPkmnJumpBgTilemap
movs r4, 0x1
str r4, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r0, =gUnknown_082FC440
ldr r0, =gPkmnJumpVenusaurPal
movs r1, 0x30
movs r2, 0x20
bl LoadPalette
ldr r1, =gUnknown_082FC460
ldr r1, =gPkmnJumpVenusaurGfx
str r5, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r1, =gUnknown_082FCDB0
ldr r1, =gPkmnJumpVenusaurTilemap
str r4, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r0, =gUnknown_082FD168
ldr r0, =gPkmnJumpResultsPal
movs r1, 0x10
movs r2, 0x20
bl LoadPalette
ldr r1, =gUnknown_082FD188
ldr r1, =gPkmnJumpResultsGfx
str r5, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r1, =gUnknown_082FDC38
ldr r1, =gPkmnJumpResultsTilemap
str r4, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
bl decompress_and_copy_tile_data_to_vram
ldr r0, =gUnknown_082FC024
ldr r0, =gPkmnJumpPal3
movs r1, 0x20
movs r2, 0x20
bl LoadPalette

File diff suppressed because it is too large Load Diff

View File

@ -75,7 +75,13 @@ gUnknown_082FF178:: @ 82FF178
.incbin "baserom.gba", 0x2ff178, 0x50
gUnknown_082FF1C8:: @ 82FF1C8
.incbin "baserom.gba", 0x2ff1c8, 0x450
.incbin "baserom.gba", 0x2ff1c8, 0x10
gUnknown_082FF1D8:: @ 82FF1D8
.incbin "baserom.gba", 0x2ff1d8, 0x20
gUnknown_082FF1F8:: @ 82FF1F8
.incbin "baserom.gba", 0x2ff1f8, 0x420
gUnknown_082FF618:: @ 82FF618
.incbin "baserom.gba", 0x2ff618, 0x7c

View File

@ -2328,12 +2328,15 @@ gUnknown_085ED7E0:: @ 85ED7E0
.string "1. {SPECIAL_F7 0x00}$"
.align 2
gUnknown_085ED7E8:: @ 85ED7E8
.string " time(s)$"
.align 2
gUnknown_085ED7F4:: @ 85ED7F4
.string "{STR_VAR_1}.{STR_VAR_2}$"
.align 2
gUnknown_085ED7FC:: @ 85ED7FC
.string "{STR_VAR_1} BERRY$"
.align 2
@ -2372,22 +2375,28 @@ gUnknown_085ED848:: @ 85ED848
gUnknown_085ED850:: @ 85ED850
.string " Times/sec.$"
.align 2
gUnknown_085ED85C:: @ 85ED85C
.string "{STR_VAR_1}%$"
.align 2
gUnknown_085ED860:: @ 85ED860
.string "No. of Presses Rankings$"
.align 2
gUnknown_085ED878:: @ 85ED878
.string "Crushing Results$"
.align 2
gUnknown_085ED88C:: @ 85ED88C
.string "Neatness Rankings$"
.align 2
gUnknown_085ED8A0:: @ 85ED8A0
.string "Cooperative Rankings$"
.align 2
gUnknown_085ED8B8:: @ 85ED8B8
.string "Pressing-Power Rankings$"
gUnknown_085ED8D0:: @ 85ED8D0
@ -2455,8 +2464,14 @@ gUnknown_085EDCDE:: @ 85EDCDE
gUnknown_085EDCE5:: @ 85EDCE5
.string "DODRIO BERRY-PICKING RECORDS$"
gUnknown_085EDD02:: @ 85EDD02
.string "BERRIES picked:$"
gUnknown_085EDD12:: @ 85EDD12
.string "Best score:$"
gUnknown_085EDD1E:: @ 85EDD1E
.string "BERRIES picked in a row with\nfive players:$"
gUnknown_085EDD49:: @ 85EDD49
@ -2470,10 +2485,20 @@ gUnknown_085EDD86:: @ 85EDD86
gUnknown_085EDD9B:: @ 85EDD9B
.string "Announcing prizes!$"
gUnknown_085EDDAE:: @ 85EDDAE
.string "1:$"
gUnknown_085EDDB1:: @ 85EDDB1
.string "2:$"
gUnknown_085EDDB4:: @ 85EDDB4
.string "3:$"
gUnknown_085EDDB7:: @ 85EDDB7
.string "4:$"
gUnknown_085EDDBA:: @ 85EDDBA
.string "5:$"
gUnknown_085EDDBD:: @ 85EDDBD
@ -2505,8 +2530,14 @@ gUnknown_085EDE84:: @ 85EDE84
gUnknown_085EDE8D:: @ 85EDE8D
.string "POKéMON JUMP RECORDS$"
gUnknown_085EDEA2:: @ 85EDEA2
.string "Jumps in a row:$"
gUnknown_085EDEB2:: @ 85EDEB2
.string "Best score:$"
gUnknown_085EDEBE:: @ 85EDEBE
.string "EXCELLENTS in a row:$"
gUnknown_085EDED3:: @ 85EDED3

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 189 189
148 131 82
180 164 115
205 189 148
213 205 172
230 222 189
246 238 205
255 255 238
98 106 115
115 123 131
0 0 0
0 90 16
255 0 0
49 82 205
172 164 131
65 74 90

Binary file not shown.

After

Width:  |  Height:  |  Size: 626 B

Binary file not shown.

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 189 189
255 238 172
255 255 0
255 230 74
255 139 0
197 255 255
139 213 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
197 255 205
255 213 131
255 255 156
255 255 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 329 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
148 222 164
164 230 172
180 238 189
197 246 205
213 255 222
238 255 238
205 106 255
172 82 222
148 148 148
123 123 123
255 0 255
255 0 255
255 0 255
180 189 189
255 255 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
230 255 255
65 65 65
156 156 230
115 115 189
139 246 213
98 213 172
255 213 57
246 172 57
238 238 238
0 148 213
230 131 49
0 156 189
255 148 139
0 230 255
213 98 90
0 238 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 395 B

Binary file not shown.

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
230 246 255
82 180 172
82 205 189
156 156 131
106 156 148
123 123 98
189 172 98
189 189 139
74 172 156
172 172 131
74 156 123
115 115 82
139 139 106
164 164 115
197 197 148
230 246 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
230 246 255
246 246 222
230 230 180
139 238 139
246 246 189
197 246 164
246 230 197
230 246 255
230 213 180
205 197 164
148 222 148
222 238 255
139 205 139
213 238 246
222 246 255
213 205 164

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
238 255 238
41 41 41
255 197 115
230 164 74
115 90 65
246 131 164
172 74 74
255 238 189
213 197 148
115 106 82
148 148 148
106 98 90
255 205 230
180 139 90
0 0 0
255 255 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
230 246 255
255 255 255
238 255 255
246 255 255
230 230 246
222 238 246
222 246 246
238 238 255
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.

After

Width:  |  Height:  |  Size: 310 B

View File

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

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
230 255 255
65 65 65
255 255 189
255 238 115
255 197 0
197 197 213
164 164 180
131 131 148
255 197 197
255 139 139
255 49 49
0 0 0
0 0 0
0 0 0
0 0 0
255 49 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 195 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 213 230
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
32 32 32
131 49 49
230 65 41
156 65 65
255 90 74
172 115 57
255 189 74
255 255 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 778 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 213 230
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
32 32 32
131 49 49
230 65 41
156 65 65
255 90 74
172 115 57
255 189 74
255 255 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 815 B

Binary file not shown.

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 156 197
106 222 156
106 230 230
139 230 255
156 238 255
197 246 255
189 213 131
230 213 115
238 230 131
246 246 156
222 222 172
106 230 172
255 0 255
255 0 255
255 0 255
255 0 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 532 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 156 197
65 148 74
82 180 74
106 205 74
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
98 98 82
205 189 82
255 246 82
255 255 255
238 172 131
238 230 131

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
49 123 57
65 139 57
82 164 57
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
246 246 255
0 0 0
222 222 213
255 156 24
255 222 189
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.

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 156 197
148 197 115
172 222 123
213 180 57
238 205 65
230 164 131
246 189 172
98 98 82
164 148 90
205 189 82
255 238 74
156 164 230
90 90 106
172 148 106
230 205 123
180 189 246

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 318 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 309 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 325 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 243 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 326 B

Binary file not shown.

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
213 213 213
32 98 49
98 156 115
90 205 148
139 238 189
139 57 0
189 106 49
16 16 16
230 74 65
255 131 115
156 246 139
222 205 49
255 238 82
65 164 24
106 205 65
255 255 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
graphics/interface/test.bin Normal file

Binary file not shown.

View File

@ -3,6 +3,7 @@ monbackdir := graphics/pokemon/back_pics
monfrontdir := graphics/pokemon/anim_front_pics
monpaldir := graphics/pokemon/palettes
INTROGFXDIR := graphics/intro
interfacedir := graphics/interface
$(monstillfrontdir)/castform_still_front_pic.4bpp: $(monstillfrontdir)/castform_normal_form_still_front_pic.4bpp \
$(monstillfrontdir)/castform_sunny_form_still_front_pic.4bpp \
@ -286,3 +287,6 @@ graphics/title_screen/pokemon_logo.gbapal: graphics/title_screen/pokemon_logo.pa
$(INTROGFXDIR)/copyright.4bpp: $(INTROGFXDIR)/copyright.png
$(GFX) $< $@ -num_tiles 39
$(interfacedir)/pkmnjump_bg.4bpp: $(interfacedir)/pkmnjump_bg.png
$(GFX) $< $@ -num_tiles 63