Merge branch 'master' into battle
This commit is contained in:
jiangzhengwenjz
@@ -9,6 +9,8 @@ open(my $file, $ARGV[0])
|
||||
|
||||
my $src = 0;
|
||||
my $asm = 0;
|
||||
my $srcdata = 0;
|
||||
my $data = 0;
|
||||
while (my $line = <$file>)
|
||||
{
|
||||
if ($line =~ /^ \.(\w+)\s+0x[0-9a-f]+\s+(0x[0-9a-f]+) (\w+)\/.+\.o/)
|
||||
@@ -28,6 +30,17 @@ while (my $line = <$file>)
|
||||
$asm += $size;
|
||||
}
|
||||
}
|
||||
elsif ($section =~ /rodata/)
|
||||
{
|
||||
if ($dir eq 'src')
|
||||
{
|
||||
$srcdata += $size;
|
||||
}
|
||||
elsif ($dir eq 'data')
|
||||
{
|
||||
$data += $size;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -118,3 +131,26 @@ print "$total_syms total symbols\n";
|
||||
print "$documented symbols documented ($docPct%)\n";
|
||||
print "$partial_documented symbols partially documented ($partialPct%)\n";
|
||||
print "$undocumented symbols undocumented ($undocPct%)\n";
|
||||
|
||||
my $foundLines = `git grep '\.incbin "baserom\.gba"' data/`;
|
||||
my @allLines = split('\n', $foundLines);
|
||||
my $incbinTotal = 0;
|
||||
my $incbinNum = 0;
|
||||
foreach my $line (@allLines)
|
||||
{
|
||||
if ($line =~ /\.incbin\s+"baserom\.gba",\s*0x\w+,\s*(.+?)\s*(\@.*)?$/)
|
||||
{
|
||||
my $size = hex($1);
|
||||
$incbinTotal += $size;
|
||||
$incbinNum++;
|
||||
}
|
||||
}
|
||||
print "\n";
|
||||
my $dataTotal = $srcdata + $data;
|
||||
my $srcDataPct = sprintf("%.4f", 100 * $srcdata / $dataTotal);
|
||||
my $dataPct = sprintf("%.4f", 100 * $data / $dataTotal);
|
||||
my $incbinTotalPct = sprintf("%.4f", 100 * $incbinTotal / $dataTotal);
|
||||
print "$dataTotal total bytes of data\n";
|
||||
print "$srcdata bytes of data in src ($srcDataPct%)\n";
|
||||
print "$data bytes of data in data ($dataPct%)\n";
|
||||
print "$incbinNum baserom incbins with a combined $incbinTotal bytes ($incbinTotalPct%)\n";
|
||||
|
||||
@@ -26,8 +26,8 @@ sub_80F558C: @ 80F558C
|
||||
bx r0
|
||||
thumb_func_end sub_80F558C
|
||||
|
||||
thumb_func_start sub_80F55A0
|
||||
sub_80F55A0: @ 80F55A0
|
||||
thumb_func_start CB2_SaveClearScreen_Init
|
||||
CB2_SaveClearScreen_Init: @ 80F55A0
|
||||
push {r4,lr}
|
||||
ldr r4, _080F55D0 @ =gUnknown_203AB54
|
||||
movs r0, 0x4
|
||||
@@ -52,7 +52,7 @@ sub_80F55A0: @ 80F55A0
|
||||
_080F55D0: .4byte gUnknown_203AB54
|
||||
_080F55D4: .4byte sub_80F55DC
|
||||
_080F55D8: .4byte sub_80F5574
|
||||
thumb_func_end sub_80F55A0
|
||||
thumb_func_end CB2_SaveClearScreen_Init
|
||||
|
||||
thumb_func_start sub_80F55DC
|
||||
sub_80F55DC: @ 80F55DC
|
||||
|
||||
-4794
File diff suppressed because it is too large
Load Diff
-2310
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,9 @@
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnknown_83BFBE4:: @ 83BFBE4
|
||||
.incbin "baserom.gba", 0x3BFBE4, 0x2FD8
|
||||
|
||||
gUnknown_83C2BBC:: @ 83C2BBC
|
||||
.incbin "baserom.gba", 0x3C2BBC, 0x4
|
||||
|
||||
|
||||
+23
-22
@@ -16355,38 +16355,39 @@ gUnknown_8EAAB98:: @ 8EAAB98
|
||||
gUnknown_8EAB30C:: @ 8EAB30C
|
||||
.incbin "baserom.gba", 0xEAB30C, 0x3B8
|
||||
|
||||
gUnknown_8EAB6C4:: @ 8EAB6C4
|
||||
.incbin "baserom.gba", 0xEAB6C4, 0x200 @UNKNOWN
|
||||
@ title_screen
|
||||
gGraphics_TitleScreen_PokemonFireRedLogoPals:: @ 8EAB6C4
|
||||
.incbin "graphics/title_screen/unk_8eab6c4.gbapal"
|
||||
|
||||
gUnknown_8EAB8C4:: @ 8EAB8C4
|
||||
.incbin "baserom.gba", 0xEAB8C4, 0x1ACC
|
||||
gGraphics_TitleScreen_PokemonFireRedLogoTiles:: @ 8EAB8C4
|
||||
.incbin "graphics/title_screen/unk_8eab8c4.8bpp.lz"
|
||||
|
||||
gUnknown_8EAD390:: @ 8EAD390
|
||||
.incbin "baserom.gba", 0xEAD390, 0x258
|
||||
gGraphics_TitleScreen_PokemonFireRedLogoMap:: @ 8EAD390
|
||||
.incbin "graphics/title_screen/unk_8ead390.bin.lz"
|
||||
|
||||
gUnknown_8EAD5E8:: @ 8EAD5E8
|
||||
.incbin "baserom.gba", 0xEAD5E8, 0x20 @UNKNOWN
|
||||
gGraphics_TitleScreen_CharizardPals:: @ 8EAD5E8
|
||||
.incbin "graphics/title_screen/unk_8ead5e8.gbapal"
|
||||
|
||||
gUnknown_8EAD608:: @ 8EAD608
|
||||
.incbin "baserom.gba", 0xEAD608, 0x8DC
|
||||
gGraphics_TitleScreen_CharizardTiles:: @ 8EAD608
|
||||
.incbin "graphics/title_screen/unk_8ead608.4bpp.lz"
|
||||
|
||||
gUnknown_8EADEE4:: @ 8EADEE4
|
||||
.incbin "baserom.gba", 0xEADEE4, 0x1B0
|
||||
gGraphics_TitleScreen_CharizardMap:: @ 8EADEE4
|
||||
.incbin "graphics/title_screen/unk_8eadee4.bin.lz"
|
||||
|
||||
gUnknown_8EAE094:: @ 8EAE094
|
||||
.incbin "baserom.gba", 0xEAE094, 0x20 @UNKNOWN
|
||||
gGraphics_TitleScreen_BackgroundPals:: @ 8EAE094
|
||||
.incbin "graphics/title_screen/unk_8eae094.gbapal"
|
||||
|
||||
gUnknown_8EAE0B4:: @ 8EAE0B4
|
||||
.incbin "baserom.gba", 0xEAE0B4, 0x2C0
|
||||
gGraphics_TitleScreen_CopyrightPressStartTiles:: @ 8EAE0B4
|
||||
.incbin "graphics/title_screen/unk_8eae0b4.4bpp.lz"
|
||||
|
||||
gUnknown_8EAE374:: @ 8EAE374
|
||||
.incbin "baserom.gba", 0xEAE374, 0x114
|
||||
gGraphics_TitleScreen_CopyrightPressStartMap:: @ 8EAE374
|
||||
.incbin "graphics/title_screen/unk_8eae374.bin.lz"
|
||||
|
||||
gUnknown_8EAE488:: @ 8EAE488
|
||||
.incbin "baserom.gba", 0xEAE488, 0x20 @UNKNOWN
|
||||
gGraphics_TitleScreen_FirePals:: @ 8EAE488
|
||||
.incbin "graphics/title_screen/unk_8eae488.gbapal"
|
||||
|
||||
gUnknown_8EAE4A8:: @ 8EAE4A8
|
||||
.incbin "baserom.gba", 0xEAE4A8, 0x80
|
||||
gGraphics_TitleScreen_BlankObjTiles:: @ 8EAE4A8
|
||||
.incbin "graphics/title_screen/unk_8eae4a8.4bpp.lz"
|
||||
|
||||
gUnknown_8EAE528:: @ 8EAE528
|
||||
.incbin "baserom.gba", 0xEAE528, 0x20 @UNKNOWN
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 78 B |
@@ -0,0 +1 @@
|
||||
àààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààà
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 188 B |
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
82 205 180
|
||||
0 0 0
|
||||
255 255 189
|
||||
255 246 139
|
||||
255 213 65
|
||||
255 172 0
|
||||
197 164 49
|
||||
115 180 139
|
||||
98 189 156
|
||||
90 197 164
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
82 205 180
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 539 B |
Binary file not shown.
|
After Width: | Height: | Size: 150 B |
@@ -1,94 +0,0 @@
|
||||
.section .rodata
|
||||
.align 2
|
||||
gUnknown_8464890:: @ 8464890
|
||||
.incbin "baserom.gba", 0x464890, 0x1E
|
||||
|
||||
gUnknown_84648AE:: @ 84648AE
|
||||
.incbin "baserom.gba", 0x4648AE, 0xF
|
||||
|
||||
gUnknown_84648BD:: @ 84648BD
|
||||
.incbin "baserom.gba", 0x4648BD, 0x15
|
||||
|
||||
gUnknown_84648D2:: @ 84648D2
|
||||
.incbin "baserom.gba", 0x4648D2, 0x54
|
||||
|
||||
gUnknown_8464926:: @ 8464926
|
||||
.incbin "baserom.gba", 0x464926, 0x40
|
||||
|
||||
gUnknown_8464966:: @ 8464966
|
||||
.incbin "baserom.gba", 0x464966, 0xC4A
|
||||
|
||||
gUnknown_84655B0:: @ 84655B0
|
||||
.incbin "baserom.gba", 0x4655B0, 0x18
|
||||
|
||||
gUnknown_84655C8:: @ 84655C8
|
||||
.incbin "baserom.gba", 0x4655C8, 0x40
|
||||
|
||||
gUnknown_8465608:: @ 8465608
|
||||
.incbin "baserom.gba", 0x465608, 0xE
|
||||
|
||||
gUnknown_8465616:: @ 8465616
|
||||
.incbin "baserom.gba", 0x465616, 0xC0
|
||||
|
||||
gUnknown_84656D6:: @ 84656D6
|
||||
.incbin "baserom.gba", 0x4656D6, 0x10E
|
||||
|
||||
gUnknown_84657E4:: @ 84657E4
|
||||
.incbin "baserom.gba", 0x4657E4, 0x98
|
||||
|
||||
gUnknown_846587C:: @ 846587C
|
||||
.incbin "baserom.gba", 0x46587C, 0x5C
|
||||
|
||||
gUnknown_84658D8:: @ 84658D8
|
||||
.incbin "baserom.gba", 0x4658D8, 0x18
|
||||
|
||||
gUnknown_84658F0:: @ 84658F0
|
||||
.incbin "baserom.gba", 0x4658F0, 0x40
|
||||
|
||||
gUnknown_8465930:: @ 8465930
|
||||
.incbin "baserom.gba", 0x465930, 0x20
|
||||
|
||||
gUnknown_8465950:: @ 8465950
|
||||
.incbin "baserom.gba", 0x465950, 0x80
|
||||
|
||||
gUnknown_84659D0:: @ 84659D0
|
||||
.incbin "baserom.gba", 0x4659D0, 0x804
|
||||
|
||||
gUnknown_84661D4:: @ 84661D4
|
||||
.incbin "baserom.gba", 0x4661D4, 0x2E8
|
||||
|
||||
gUnknown_84664BC:: @ 84664BC
|
||||
.incbin "baserom.gba", 0x4664BC, 0x20
|
||||
|
||||
gUnknown_84664DC:: @ 84664DC
|
||||
.incbin "baserom.gba", 0x4664DC, 0x60
|
||||
|
||||
gUnknown_846653C:: @ 846653C
|
||||
.incbin "baserom.gba", 0x46653C, 0x84
|
||||
|
||||
gUnknown_84665C0:: @ 84665C0
|
||||
.incbin "baserom.gba", 0x4665C0, 0x60
|
||||
|
||||
gUnknown_8466620:: @ 8466620
|
||||
.incbin "baserom.gba", 0x466620, 0x378
|
||||
|
||||
gUnknown_8466998:: @ 8466998
|
||||
.incbin "baserom.gba", 0x466998, 0x178
|
||||
|
||||
gUnknown_8466B10:: @ 8466B10
|
||||
.incbin "baserom.gba", 0x466B10, 0x10
|
||||
|
||||
gUnknown_8466B20:: @ 8466B20
|
||||
.incbin "baserom.gba", 0x466B20, 0xEC
|
||||
|
||||
gUnknown_8466C0C:: @ 8466C0C
|
||||
.incbin "baserom.gba", 0x466C0C, 0x28
|
||||
|
||||
gUnknown_8466C34:: @ 8466C34
|
||||
.incbin "baserom.gba", 0x466C34, 0x4
|
||||
|
||||
gUnknown_8466C38:: @ 8466C38
|
||||
.incbin "baserom.gba", 0x466C38, 0x8
|
||||
|
||||
gUnknown_8466C40:: @ 8466C40
|
||||
.incbin "baserom.gba", 0x466C40, 0x18
|
||||
+3
-3
@@ -3067,13 +3067,13 @@ gText_HatchedFromEgg:: @ 841B6FD
|
||||
gText_NickHatchPrompt:: @ 841B716
|
||||
.string "Would you like to nickname the newly\nhatched {STR_VAR_1}?$"
|
||||
|
||||
gUnknown_841B747:: @ 841B747
|
||||
gString_OutOfCoins:: @ 841B747
|
||||
.string "You've run out of COINS.\nGame over!$"
|
||||
|
||||
gUnknown_841B76B:: @ 841B76B
|
||||
gString_QuitPlaying:: @ 841B76B
|
||||
.string "Quit playing?$"
|
||||
|
||||
gUnknown_841B779:: @ 841B779
|
||||
gString_SlotMachineControls:: @ 841B779
|
||||
.string "{KEYGFX_DPAD_LEFT_RIGHT}COMBOS {KEYGFX_DPAD_DOWN}WAGER {KEYGFX_A_BUTTON}STOP {KEYGFX_B_BUTTON}EXIT$"
|
||||
|
||||
gUnknown_841B798:: @ 0x841B798
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
.section .rodata
|
||||
.align 2
|
||||
gUnknown_83BF58C:: @ 83BF58C
|
||||
.incbin "baserom.gba", 0x3BF58C, 0x1C
|
||||
|
||||
gUnknown_83BF5A8:: @ 83BF5A8
|
||||
.incbin "baserom.gba", 0x3BF5A8, 0x55C
|
||||
|
||||
gUnknown_83BFB04:: @ 83BFB04
|
||||
.incbin "baserom.gba", 0x3BFB04, 0x18
|
||||
|
||||
gUnknown_83BFB1C:: @ 83BFB1C
|
||||
.incbin "baserom.gba", 0x3BFB1C, 0x20
|
||||
|
||||
gUnknown_83BFB3C:: @ 83BFB3C
|
||||
.incbin "baserom.gba", 0x3BFB3C, 0x20
|
||||
|
||||
gUnknown_83BFB5C:: @ 83BFB5C
|
||||
.incbin "baserom.gba", 0x3BFB5C, 0x18
|
||||
|
||||
gUnknown_83BFB74:: @ 83BFB74
|
||||
.incbin "baserom.gba", 0x3BFB74, 0x10
|
||||
|
||||
gUnknown_83BFB84:: @ 83BFB84
|
||||
.incbin "baserom.gba", 0x3BFB84, 0x18
|
||||
|
||||
gUnknown_83BFB9C:: @ 83BFB9C
|
||||
.incbin "baserom.gba", 0x3BFB9C, 0x20
|
||||
|
||||
gUnknown_83BFBBC:: @ 83BFBBC
|
||||
.incbin "baserom.gba", 0x3BFBBC, 0x18
|
||||
|
||||
gUnknown_83BFBD4:: @ 83BFBD4
|
||||
.incbin "baserom.gba", 0x3BFBD4, 0x2FE8
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 255 255
|
||||
65 65 65
|
||||
255 246 0
|
||||
255 172 0
|
||||
246 246 255
|
||||
255 246 213
|
||||
246 213 156
|
||||
238 222 0
|
||||
98 98 98
|
||||
131 98 41
|
||||
255 106 0
|
||||
222 57 0
|
||||
213 180 0
|
||||
222 222 230
|
||||
0 0 0
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
123 255 255
|
||||
65 65 65
|
||||
246 246 255
|
||||
246 74 0
|
||||
205 65 0
|
||||
255 205 189
|
||||
222 222 230
|
||||
0 0 0
|
||||
255 238 238
|
||||
164 32 0
|
||||
205 123 24
|
||||
255 222 115
|
||||
123 82 0
|
||||
255 246 0
|
||||
230 205 0
|
||||
164 123 41
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
115 255 139
|
||||
65 65 65
|
||||
255 0 0
|
||||
255 255 255
|
||||
255 131 0
|
||||
255 205 0
|
||||
0 0 255
|
||||
0 131 255
|
||||
0 205 255
|
||||
156 238 74
|
||||
205 205 230
|
||||
222 0 0
|
||||
0 156 0
|
||||
131 131 148
|
||||
164 164 189
|
||||
180 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 156 230
|
||||
57 65 65
|
||||
255 246 213
|
||||
246 213 123
|
||||
255 205 172
|
||||
255 172 115
|
||||
172 156 90
|
||||
246 246 255
|
||||
213 98 41
|
||||
222 222 230
|
||||
148 148 156
|
||||
238 172 255
|
||||
246 131 180
|
||||
197 74 106
|
||||
148 74 197
|
||||
205 131 255
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 230 115
|
||||
57 65 65
|
||||
106 115 115
|
||||
197 205 205
|
||||
230 238 238
|
||||
246 246 255
|
||||
164 172 172
|
||||
255 90 65
|
||||
65 90 255
|
||||
189 213 255
|
||||
255 213 189
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
0 0 0
|
||||
238 172 0
|
||||
156 115 115
|
||||
246 205 205
|
||||
123 90 90
|
||||
222 164 164
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
222 123 32
|
||||
255 205 32
|
||||
205 90 0
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 909 B |
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
0 0 0
|
||||
98 98 90
|
||||
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 0
|
||||
0 255 0
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 215 B |
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
0 0 0
|
||||
57 57 49
|
||||
230 230 230
|
||||
255 255 255
|
||||
238 172 0
|
||||
197 74 24
|
||||
205 90 0
|
||||
255 205 32
|
||||
222 123 32
|
||||
255 164 41
|
||||
57 148 255
|
||||
164 222 255
|
||||
0 49 123
|
||||
139 0 0
|
||||
98 98 90
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
222 222 222
|
||||
255 255 255
|
||||
238 172 0
|
||||
255 90 0
|
||||
222 41 0
|
||||
255 90 0
|
||||
222 41 0
|
||||
255 90 0
|
||||
222 41 0
|
||||
255 90 0
|
||||
222 41 0
|
||||
255 90 0
|
||||
222 41 0
|
||||
255 205 32
|
||||
156 0 0
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
0 0 0
|
||||
255 255 255
|
||||
74 74 213
|
||||
115 172 255
|
||||
115 164 74
|
||||
156 238 74
|
||||
255 90 0
|
||||
255 164 41
|
||||
255 238 32
|
||||
222 41 0
|
||||
189 189 189
|
||||
156 156 156
|
||||
123 123 123
|
||||
90 90 90
|
||||
65 65 65
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
0 0 0
|
||||
238 172 0
|
||||
172 106 106
|
||||
222 156 156
|
||||
148 82 82
|
||||
197 131 131
|
||||
8 123 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
222 123 32
|
||||
255 205 32
|
||||
205 90 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
222 222 222
|
||||
213 57 0
|
||||
205 90 0
|
||||
255 255 255
|
||||
238 172 0
|
||||
0 0 197
|
||||
180 65 0
|
||||
180 65 0
|
||||
0 106 0
|
||||
0 106 0
|
||||
82 123 255
|
||||
246 156 0
|
||||
246 156 0
|
||||
41 180 82
|
||||
41 180 82
|
||||
0 0 0
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
222 222 222
|
||||
213 57 0
|
||||
205 90 0
|
||||
255 255 255
|
||||
238 172 0
|
||||
0 164 238
|
||||
238 131 0
|
||||
238 131 0
|
||||
0 222 0
|
||||
0 222 0
|
||||
139 255 255
|
||||
255 238 106
|
||||
255 238 106
|
||||
148 255 148
|
||||
148 255 148
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
222 222 222
|
||||
255 255 255
|
||||
238 172 0
|
||||
255 255 131
|
||||
255 180 65
|
||||
255 255 255
|
||||
255 255 131
|
||||
255 255 131
|
||||
255 180 65
|
||||
255 180 65
|
||||
255 90 0
|
||||
255 90 0
|
||||
222 41 0
|
||||
255 205 32
|
||||
156 0 0
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
222 222 222
|
||||
255 255 255
|
||||
238 172 0
|
||||
255 180 65
|
||||
255 90 0
|
||||
255 255 131
|
||||
255 180 65
|
||||
255 255 255
|
||||
255 255 131
|
||||
255 255 131
|
||||
255 180 65
|
||||
255 180 65
|
||||
255 90 0
|
||||
255 205 32
|
||||
156 0 0
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
222 222 222
|
||||
255 255 255
|
||||
238 172 0
|
||||
255 90 0
|
||||
222 41 0
|
||||
255 180 65
|
||||
255 90 0
|
||||
255 255 131
|
||||
255 180 65
|
||||
255 255 255
|
||||
255 255 131
|
||||
255 255 131
|
||||
255 180 65
|
||||
255 205 32
|
||||
156 0 0
|
||||
0 0 0
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 229 B |
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
230 189 230
|
||||
65 65 65
|
||||
255 255 255
|
||||
139 238 255
|
||||
172 255 255
|
||||
106 205 222
|
||||
246 222 123
|
||||
255 230 180
|
||||
213 189 90
|
||||
222 49 0
|
||||
255 238 0
|
||||
246 205 115
|
||||
213 156 41
|
||||
246 49 0
|
||||
222 255 205
|
||||
255 230 230
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
197 255 255
|
||||
65 65 65
|
||||
246 246 246
|
||||
255 82 82
|
||||
49 180 255
|
||||
65 213 255
|
||||
255 156 82
|
||||
0 156 0
|
||||
156 238 74
|
||||
164 164 189
|
||||
255 238 0
|
||||
255 246 164
|
||||
197 164 57
|
||||
238 222 0
|
||||
222 255 205
|
||||
255 230 230
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
197 255 255
|
||||
65 65 65
|
||||
246 246 246
|
||||
123 131 131
|
||||
197 205 205
|
||||
255 139 115
|
||||
90 123 255
|
||||
213 131 255
|
||||
148 74 197
|
||||
189 90 65
|
||||
255 180 172
|
||||
246 230 106
|
||||
246 74 0
|
||||
197 255 255
|
||||
222 255 205
|
||||
255 230 230
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 772 B |
Binary file not shown.
@@ -0,0 +1,259 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
256
|
||||
0 255 41
|
||||
0 0 0
|
||||
255 238 16
|
||||
246 222 41
|
||||
246 238 246
|
||||
255 246 24
|
||||
246 246 41
|
||||
246 246 246
|
||||
246 255 255
|
||||
255 246 255
|
||||
32 0 255
|
||||
106 65 156
|
||||
32 0 238
|
||||
246 222 24
|
||||
246 222 32
|
||||
255 238 41
|
||||
255 238 49
|
||||
255 255 16
|
||||
255 255 24
|
||||
255 255 246
|
||||
255 255 255
|
||||
123 106 156
|
||||
24 41 32
|
||||
32 32 74
|
||||
32 0 230
|
||||
115 82 164
|
||||
16 0 246
|
||||
106 82 172
|
||||
246 238 32
|
||||
255 230 24
|
||||
246 230 41
|
||||
246 238 41
|
||||
246 230 49
|
||||
246 238 49
|
||||
255 246 32
|
||||
255 246 41
|
||||
255 255 32
|
||||
255 255 41
|
||||
32 24 32
|
||||
32 32 41
|
||||
197 156 41
|
||||
197 164 41
|
||||
156 156 156
|
||||
164 164 156
|
||||
172 172 172
|
||||
180 189 180
|
||||
41 0 230
|
||||
189 189 189
|
||||
197 189 189
|
||||
197 197 197
|
||||
205 205 213
|
||||
8 8 197
|
||||
246 230 24
|
||||
246 230 32
|
||||
255 238 24
|
||||
255 238 32
|
||||
32 32 32
|
||||
32 41 32
|
||||
41 32 32
|
||||
41 41 32
|
||||
49 32 32
|
||||
49 41 32
|
||||
41 32 41
|
||||
49 32 41
|
||||
24 41 41
|
||||
32 32 90
|
||||
16 24 106
|
||||
24 32 98
|
||||
41 32 82
|
||||
41 32 98
|
||||
41 41 82
|
||||
41 41 98
|
||||
0 0 115
|
||||
8 8 131
|
||||
32 24 115
|
||||
32 24 131
|
||||
32 41 115
|
||||
41 41 115
|
||||
32 41 131
|
||||
41 41 131
|
||||
57 41 41
|
||||
57 41 49
|
||||
57 49 41
|
||||
57 57 57
|
||||
65 41 41
|
||||
74 41 41
|
||||
65 57 57
|
||||
74 57 57
|
||||
57 74 74
|
||||
65 65 74
|
||||
82 74 82
|
||||
82 57 131
|
||||
82 90 82
|
||||
90 90 90
|
||||
90 98 98
|
||||
98 98 106
|
||||
115 106 106
|
||||
131 98 115
|
||||
139 98 106
|
||||
139 115 98
|
||||
180 139 57
|
||||
172 131 65
|
||||
156 115 90
|
||||
156 131 82
|
||||
115 82 139
|
||||
123 82 131
|
||||
115 98 131
|
||||
131 98 123
|
||||
115 123 123
|
||||
123 123 131
|
||||
139 131 139
|
||||
148 123 131
|
||||
205 172 24
|
||||
213 172 16
|
||||
205 164 32
|
||||
213 172 32
|
||||
222 189 24
|
||||
230 189 16
|
||||
213 189 32
|
||||
222 189 32
|
||||
230 205 24
|
||||
230 205 32
|
||||
230 213 32
|
||||
238 222 32
|
||||
180 148 57
|
||||
189 156 49
|
||||
180 148 74
|
||||
180 172 90
|
||||
156 148 123
|
||||
139 148 139
|
||||
164 148 115
|
||||
172 156 106
|
||||
197 156 49
|
||||
205 180 49
|
||||
197 172 90
|
||||
205 189 82
|
||||
222 205 49
|
||||
230 222 49
|
||||
205 205 74
|
||||
222 213 65
|
||||
49 0 230
|
||||
213 213 213
|
||||
222 230 230
|
||||
222 230 230
|
||||
255 0 246
|
||||
255 0 255
|
||||
16 8 197
|
||||
16 16 189
|
||||
32 16 164
|
||||
41 16 164
|
||||
32 16 180
|
||||
41 16 189
|
||||
8 8 205
|
||||
8 16 205
|
||||
24 8 213
|
||||
24 16 205
|
||||
41 8 213
|
||||
41 16 213
|
||||
49 8 213
|
||||
57 16 213
|
||||
16 8 230
|
||||
24 8 230
|
||||
24 16 230
|
||||
24 24 230
|
||||
8 8 246
|
||||
8 16 246
|
||||
16 8 246
|
||||
16 16 246
|
||||
32 8 230
|
||||
32 16 230
|
||||
32 8 238
|
||||
32 8 246
|
||||
41 8 230
|
||||
41 16 230
|
||||
49 16 230
|
||||
49 8 238
|
||||
32 32 156
|
||||
24 32 172
|
||||
41 41 156
|
||||
41 32 164
|
||||
74 49 180
|
||||
82 49 172
|
||||
82 65 164
|
||||
90 74 164
|
||||
24 32 189
|
||||
57 41 189
|
||||
41 32 213
|
||||
57 32 213
|
||||
74 41 189
|
||||
90 57 189
|
||||
74 49 197
|
||||
74 41 205
|
||||
49 49 49
|
||||
197 197 197
|
||||
189 189 189
|
||||
156 156 156
|
||||
172 172 172
|
||||
139 139 139
|
||||
115 115 115
|
||||
255 255 255
|
||||
16 16 16
|
||||
98 98 98
|
||||
246 246 246
|
||||
82 82 82
|
||||
230 230 230
|
||||
213 213 213
|
||||
0 0 0
|
||||
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
|
||||
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
|
||||
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
|
||||
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.
|
After Width: | Height: | Size: 5.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
0 0 255
|
||||
0 0 0
|
||||
82 205 180
|
||||
255 0 255
|
||||
255 0 255
|
||||
255 0 255
|
||||
32 0 0
|
||||
49 0 0
|
||||
65 0 0
|
||||
90 0 0
|
||||
123 32 0
|
||||
156 32 0
|
||||
180 49 0
|
||||
205 65 0
|
||||
222 90 0
|
||||
230 123 0
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
Binary file not shown.
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 255 139
|
||||
0 0 0
|
||||
123 123 123
|
||||
197 197 197
|
||||
222 222 222
|
||||
255 255 255
|
||||
0 0 0
|
||||
123 123 123
|
||||
197 197 197
|
||||
222 222 222
|
||||
255 255 255
|
||||
65 180 164
|
||||
139 0 0
|
||||
172 24 0
|
||||
213 57 0
|
||||
255 90 0
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 597 B |
Binary file not shown.
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
82 205 180
|
||||
189 197 205
|
||||
164 164 172
|
||||
123 131 131
|
||||
213 213 222
|
||||
255 246 74
|
||||
255 213 32
|
||||
164 131 24
|
||||
246 164 24
|
||||
131 90 16
|
||||
106 98 90
|
||||
65 57 41
|
||||
230 82 16
|
||||
205 41 0
|
||||
139 8 8
|
||||
246 246 246
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 148 B |
@@ -19,9 +19,11 @@ PSSGFXDIR := graphics/pokemon_storage
|
||||
EVENTOBJGFXDIR := graphics/event_objects
|
||||
MISCGFXDIR := graphics/misc
|
||||
TEXTWINDOWGFXDIR := graphics/text_window
|
||||
SLOTMACHINEGFXDIR := graphics/slot_machine
|
||||
TEACHYTVGFXDIR := graphics/teachy_tv
|
||||
SSANNEGFXDIR := graphics/ss_anne
|
||||
ITEMPCGFXDIR := graphics/item_pc
|
||||
TITLESCREENGFXDIR := graphics/title_screen
|
||||
|
||||
types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
|
||||
contest_types := cool beauty cute smart tough
|
||||
@@ -478,6 +480,12 @@ $(MISCGFXDIR)/unk_846B008.4bpp: %.4bpp: %.png
|
||||
$(TEXTWINDOWGFXDIR)/unk_8470B0C.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 19
|
||||
|
||||
$(SLOTMACHINEGFXDIR)/unk_8466620.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 66
|
||||
|
||||
$(SLOTMACHINEGFXDIR)/unk_84659d0.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 138
|
||||
|
||||
$(TEACHYTVGFXDIR)/tiles.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 233
|
||||
|
||||
@@ -486,3 +494,6 @@ $(SSANNEGFXDIR)/unk_8479A38.4bpp: %.4bpp: %.png
|
||||
|
||||
$(ITEMPCGFXDIR)/unk_8E85090.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 82
|
||||
|
||||
$(TITLESCREENGFXDIR)/unk_8ead608.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 135
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifndef GUARD_BERRY_FIX_PROGRAM_H
|
||||
#define GUARD_BERRY_FIX_PROGRAM_H
|
||||
|
||||
void mb_berry_fix_serve(void);
|
||||
|
||||
#endif //GUARD_BERRY_FIX_PROGRAM_H
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifndef GUARD_CLEAR_SAVE_DATA_SCREEN_H
|
||||
#define GUARD_CLEAR_SAVE_DATA_SCREEN_H
|
||||
|
||||
void CB2_SaveClearScreen_Init(void);
|
||||
|
||||
#endif //GUARD_CLEAR_SAVE_DATA_SCREEN_H
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
// Get the IDE to stfu
|
||||
|
||||
// We define it this way to fool preproc.
|
||||
#define INCBIN(x) {0}
|
||||
#define INCBIN(...) {0}
|
||||
#define INCBIN_U8 INCBIN
|
||||
#define INCBIN_U16 INCBIN
|
||||
#define INCBIN_U32 INCBIN
|
||||
|
||||
@@ -961,6 +961,19 @@ extern const u8 gFile_graphics_items_icon_palettes_sapphire_palette[];
|
||||
extern const u8 gFile_graphics_items_icons_return_to_field_arrow_sheet[];
|
||||
extern const u8 gFile_graphics_items_icon_palettes_return_to_field_arrow_palette[];
|
||||
|
||||
// title_screen
|
||||
extern const u16 gGraphics_TitleScreen_PokemonFireRedLogoPals[];
|
||||
extern const u8 gGraphics_TitleScreen_PokemonFireRedLogoTiles[];
|
||||
extern const u8 gGraphics_TitleScreen_PokemonFireRedLogoMap[];
|
||||
extern const u16 gGraphics_TitleScreen_CharizardPals[];
|
||||
extern const u8 gGraphics_TitleScreen_CharizardTiles[];
|
||||
extern const u8 gGraphics_TitleScreen_CharizardMap[];
|
||||
extern u16 gGraphics_TitleScreen_BackgroundPals[]; // If this is const, title_screen.c does not match
|
||||
extern const u8 gGraphics_TitleScreen_CopyrightPressStartTiles[];
|
||||
extern const u8 gGraphics_TitleScreen_CopyrightPressStartMap[];
|
||||
extern const u16 gGraphics_TitleScreen_FirePals[];
|
||||
extern const u8 gGraphics_TitleScreen_BlankObjTiles[];
|
||||
|
||||
extern const u32 gHealthboxSinglesPlayerGfx[];
|
||||
extern const u32 gHealthboxSinglesOpponentGfx[];
|
||||
extern const u32 gHealthboxDoublesPlayerGfx[];
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifndef GUARD_INTRO_H
|
||||
#define GUARD_INTRO_H
|
||||
|
||||
void sub_80EC864(void);
|
||||
|
||||
#endif //GUARD_INTRO_H
|
||||
@@ -65,6 +65,8 @@ void ClearPokemonCrySongs(void);
|
||||
void RestoreSerialTimer3IntrHandlers(void);
|
||||
void SetVBlankCounter1Ptr(u32 *ptr);
|
||||
void DisableVBlankCounter1(void);
|
||||
void StartTimer1(void);
|
||||
void SeedRngAndSetTrainerId(void);
|
||||
|
||||
extern const char RomHeaderGameCode[4];
|
||||
extern const char RomHeaderSoftwareVersion;
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifndef GUARD_MAIN_MENU_H
|
||||
#define GUARD_MAIN_MENU_H
|
||||
|
||||
void sub_800C300(void);
|
||||
|
||||
#endif //GUARD_MAIN_MENU_H
|
||||
@@ -31,6 +31,7 @@ void DrawDialogueFrame(u8 windowId, bool8 transfer);
|
||||
void DrawStdWindowFrame(u8 windowId, bool8 copyNow);
|
||||
void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram);
|
||||
void ClearStdWindowAndFrame(u8 taskId, bool8 copyNow);
|
||||
void sub_80F6C14(void);
|
||||
void sub_80F771C(bool8 copyToVram);
|
||||
void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram);
|
||||
void sub_80F7768(u8 windowId, bool8 copyToVram);
|
||||
|
||||
@@ -71,7 +71,11 @@ void BlendPalettes(u32, u8, u16);
|
||||
void BlendPalettesUnfaded(u32, u8, u16);
|
||||
void sub_80716F8(const u16 *, u16 *, u16, u8);
|
||||
void TintPalette_GrayScale(u16 *, u16);
|
||||
void TintPalette_GrayScale2(u16 *, u16);
|
||||
void TintPalette_SepiaTone(u16 *, u16);
|
||||
void sub_80717A8(u32, s8, u8, u8, u16, u8, u8);
|
||||
bool32 sub_807185C(u8);
|
||||
void sub_8071898(void);
|
||||
|
||||
extern struct PaletteFadeControl gPaletteFade;
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@ extern const u16 gUnknown_84566A8[];
|
||||
|
||||
void sub_8112720(u8);
|
||||
void sub_8113550(u16, const u16 *);
|
||||
void sub_811539C(void);
|
||||
void sub_8115748(u16);
|
||||
u8 sub_8112CAC(void);
|
||||
bool8 sub_81119D4(void (*func)(void));
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
|
||||
#include "global.h"
|
||||
|
||||
void PlaySlotMachine(u8, void *);
|
||||
void PlaySlotMachine(u16, void (*)(void));
|
||||
|
||||
#endif // GUARD_SLOT_MACHINE_H
|
||||
|
||||
@@ -203,6 +203,11 @@ extern const u8 gString_BattleRecords_ColumnHeaders[];
|
||||
extern const u8 gString_BattleRecords_7Dashes[];
|
||||
extern const u8 gString_BattleRecords_4Dashes[];
|
||||
|
||||
// slot_machine
|
||||
extern const u8 gString_OutOfCoins[];
|
||||
extern const u8 gString_QuitPlaying[];
|
||||
extern const u8 gString_SlotMachineControls[];
|
||||
|
||||
// battle_controller_safari
|
||||
extern const u8 gUnknown_83FDA4C[];
|
||||
extern const u8 gUnknown_83FE747[];
|
||||
|
||||
+4
-4
@@ -115,7 +115,7 @@ SECTIONS {
|
||||
src/task.o(.text);
|
||||
src/reshow_battle_screen.o(.text);
|
||||
asm/battle_anim_status_effects.o(.text);
|
||||
asm/title_screen.o(.text);
|
||||
src/title_screen.o(.text);
|
||||
src/reset_save_heap.o(.text);
|
||||
asm/field_weather.o(.text);
|
||||
asm/field_weather_effects.o(.text);
|
||||
@@ -254,7 +254,7 @@ SECTIONS {
|
||||
asm/berry_pouch.o(.text);
|
||||
asm/itemfinder.o(.text);
|
||||
src/buy_menu_helpers.o(.text);
|
||||
asm/slot_machine.o(.text);
|
||||
src/slot_machine.o(.text);
|
||||
src/roamer.o(.text);
|
||||
src/mystery_gift_menu.o(.text);
|
||||
src/mevent.o(.text);
|
||||
@@ -410,7 +410,7 @@ SECTIONS {
|
||||
data/battle_anim.o(.rodata);
|
||||
data/map_events.o(.rodata);
|
||||
data/battle_anim_status_effects.o(.rodata);
|
||||
data/title_screen.o(.rodata);
|
||||
src/title_screen.o(.rodata);
|
||||
data/field_weather.o(.rodata);
|
||||
data/data_835B488.o(.rodata);
|
||||
src/item_menu_icons.o(.rodata);
|
||||
@@ -461,7 +461,7 @@ SECTIONS {
|
||||
data/berry_pouch.o(.rodata);
|
||||
data/itemfinder.o(.rodata);
|
||||
src/buy_menu_helpers.o(.rodata);
|
||||
data/slot_machine.o(.rodata);
|
||||
src/slot_machine.o(.rodata);
|
||||
src/roamer.o(.rodata);
|
||||
src/mystery_gift_menu.o(.rodata);
|
||||
src/mevent.o(.rodata);
|
||||
|
||||
+2886
File diff suppressed because it is too large
Load Diff
+1056
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -1,4 +1,5 @@
|
||||
#include "global.h"
|
||||
#include "constants/songs.h"
|
||||
#include "sound.h"
|
||||
#include "task.h"
|
||||
#include "malloc.h"
|
||||
@@ -22,7 +23,6 @@
|
||||
#include "map_obj_8097404.h"
|
||||
#include "unk_810c3a4.h"
|
||||
#include "constants/movement_commands.h"
|
||||
#include "constants/songs.h"
|
||||
#include "vs_seeker.h"
|
||||
|
||||
typedef enum
|
||||
|
||||
+5
-7
@@ -756,9 +756,10 @@ gUnknown_2037F24: @ 2037F24
|
||||
gUnknown_2037F28: @ 2037F28
|
||||
.space 0x8
|
||||
|
||||
gUnknown_2037F30: @ 2037F30
|
||||
.space 0x4
|
||||
.align 2
|
||||
.include "src/title_screen.o"
|
||||
|
||||
.align 2
|
||||
gUnknown_2037F34: @ 2037F34
|
||||
.space 0x200
|
||||
|
||||
@@ -1374,11 +1375,8 @@ gUnknown_203F38C: @ 203F38C
|
||||
gUnknown_203F39C: @ 203F39C
|
||||
.space 0x4
|
||||
|
||||
gUnknown_203F3A0: @ 203F3A0
|
||||
.space 0x4
|
||||
|
||||
gUnknown_203F3A4: @ 203F3A4
|
||||
.space 0x4
|
||||
.align 2
|
||||
.include "src/slot_machine.o"
|
||||
|
||||
sLocationHistory: @ 203F3A8
|
||||
.space 0x6
|
||||
|
||||
@@ -6,7 +6,10 @@ LIBS = -lm
|
||||
|
||||
SRCS = main.c extended.c
|
||||
|
||||
.PHONY: clean
|
||||
.PHONY: all clean
|
||||
|
||||
all: aif2pcm
|
||||
@:
|
||||
|
||||
aif2pcm: $(SRCS)
|
||||
$(CC) $(CFLAGS) $(SRCS) -o $@ $(LDFLAGS) $(LIBS)
|
||||
|
||||
@@ -2,10 +2,13 @@ CC = gcc
|
||||
|
||||
CFLAGS = -Wall -Wextra -Werror -std=c11 -O2
|
||||
|
||||
.PHONY: clean
|
||||
.PHONY: all clean
|
||||
|
||||
SRCS = bin2c.c
|
||||
|
||||
all: bin2c
|
||||
@:
|
||||
|
||||
bin2c: $(SRCS)
|
||||
$(CC) $(CFLAGS) $(SRCS) -o $@ $(LDFLAGS)
|
||||
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
CC = gcc
|
||||
.PHONY: clean
|
||||
.PHONY: all clean
|
||||
|
||||
SRCS = gbafix.c
|
||||
|
||||
all: gbafix
|
||||
@:
|
||||
|
||||
gbafix: $(SRCS)
|
||||
$(CC) $(SRCS) -o $@ $(LDFLAGS)
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ SRCS := jsonproc.cpp
|
||||
|
||||
HEADERS := jsonproc.h inja.hpp nlohmann/json.hpp
|
||||
|
||||
.PHONY: clean
|
||||
.PHONY: all clean
|
||||
|
||||
all: jsonproc
|
||||
@:
|
||||
|
||||
@@ -6,7 +6,10 @@ SRCS := json11.cpp mapjson.cpp
|
||||
|
||||
HEADERS := mapjson.h
|
||||
|
||||
.PHONY: clean
|
||||
.PHONY: all clean
|
||||
|
||||
all: mapjson
|
||||
@:
|
||||
|
||||
mapjson: $(SRCS) $(HEADERS)
|
||||
$(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS)
|
||||
|
||||
@@ -8,7 +8,10 @@ SRCS := asm_file.cpp c_file.cpp charmap.cpp preproc.cpp string_parser.cpp \
|
||||
HEADERS := asm_file.h c_file.h char_util.h charmap.h preproc.h string_parser.h \
|
||||
utf8.h
|
||||
|
||||
.PHONY: clean
|
||||
.PHONY: all clean
|
||||
|
||||
all: preproc
|
||||
@:
|
||||
|
||||
preproc: $(SRCS) $(HEADERS)
|
||||
$(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS)
|
||||
|
||||
@@ -6,7 +6,10 @@ SRCS := main.cpp sym_file.cpp elf.cpp
|
||||
|
||||
HEADERS := ramscrgen.h sym_file.h elf.h char_util.h
|
||||
|
||||
.PHONY: clean
|
||||
.PHONY: all clean
|
||||
|
||||
all: ramscrgen
|
||||
@:
|
||||
|
||||
ramscrgen: $(SRCS) $(HEADERS)
|
||||
$(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS)
|
||||
|
||||
@@ -6,7 +6,10 @@ LIBS = -lpng -lz
|
||||
|
||||
SRCS = main.c convert_png.c util.c font.c
|
||||
|
||||
.PHONY: clean
|
||||
.PHONY: all clean
|
||||
|
||||
all: rsfont
|
||||
@:
|
||||
|
||||
rsfont: $(SRCS) convert_png.h gfx.h global.h util.h font.h
|
||||
$(CC) $(CFLAGS) $(SRCS) -o $@ $(LDFLAGS) $(LIBS)
|
||||
|
||||
@@ -6,7 +6,10 @@ SRCS = scaninc.cpp c_file.cpp asm_file.cpp source_file.cpp
|
||||
|
||||
HEADERS := scaninc.h asm_file.h c_file.h source_file.h
|
||||
|
||||
.PHONY: clean
|
||||
.PHONY: all clean
|
||||
|
||||
all: scaninc
|
||||
@:
|
||||
|
||||
scaninc: $(SRCS) $(HEADERS)
|
||||
$(CXX) $(CXXFLAGS) $(SRCS) -o $@ $(LDFLAGS)
|
||||
|
||||
Reference in New Issue
Block a user