dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into pokedex_2

Browse Source
This commit is contained in:
ultima-soul
2019-08-04 15:23:09 -07:00
parent bbc7c6ccfc d58bf398b2
commit ed90bf2430
114 changed files with 8784 additions and 14915 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis/calcrom/calcrom.pl
+36
View File
@@ -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";
asm/battle_setup.s
+2 -2
View File
@@ -30,13 +30,13 @@ _0807F644:
bne _0807F686
bl sub_812B478
ldrb r0, [r4, 0x2]
bl sub_80D08B8
bl BT_StartOnField
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
b _0807F686
_0807F65E:
bl sub_80D08F8
bl BT_IsDone
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
asm/battle_tower.s
+3 -3
View File
@@ -2025,7 +2025,7 @@ sub_80E68C4: @ 80E68C4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_80D08F8
bl BT_IsDone
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2114,7 +2114,7 @@ _080E6970:
bl sub_8080060
lsls r0, 24
lsrs r0, 24
bl sub_80D08B8
bl BT_StartOnField
b _080E69E6
.align 2, 0
_080E698C: .4byte gSaveBlock1Ptr
@@ -2154,7 +2154,7 @@ _080E69A0:
bl sub_8080060
lsls r0, 24
lsrs r0, 24
bl sub_80D08B8
bl BT_StartOnField
_080E69E6:
add sp, 0x4
pop {r4-r6}
asm/battle_transition.s
-7480
View File
File diff suppressed because it is too large Load Diff
asm/clear_save_data_screen.s
+3 -3
View File
@@ -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
asm/overworld.s
+3 -3
View File
@@ -3398,13 +3398,13 @@ sub_8056578: @ 8056578
bx r0
thumb_func_end sub_8056578
thumb_func_start sub_80565A8
sub_80565A8: @ 80565A8
thumb_func_start CB2_OverworldBasic
CB2_OverworldBasic: @ 80565A8
push {lr}
bl sub_8056578
pop {r0}
bx r0
thumb_func_end sub_80565A8
thumb_func_end CB2_OverworldBasic
thumb_func_start sub_80565B4
sub_80565B4: @ 80565B4
asm/slot_machine.s
-4794
View File
File diff suppressed because it is too large Load Diff
asm/title_screen.s
-2310
View File
File diff suppressed because it is too large Load Diff
data/data_83F5738.s
+1 -122
View File
@@ -133,128 +133,7 @@ gUnknown_83F846D:: @ 83F846D
gUnknown_83F847D:: @ 83F847D
.incbin "baserom.gba", 0x3F847D, 0x323
gUnknown_83F87A0:: @ 83F87A0
.incbin "baserom.gba", 0x3F87A0, 0x580
gUnknown_83F8D20:: @ 83F8D20
.incbin "baserom.gba", 0x3F8D20, 0x240
gUnknown_83F8F60:: @ 83F8F60
.incbin "baserom.gba", 0x3F8F60, 0x11E0
gUnknown_83FA140:: @ 83FA140
.incbin "baserom.gba", 0x3FA140, 0x1E0
gUnknown_83FA320:: @ 83FA320
.incbin "baserom.gba", 0x3FA320, 0x48
gUnknown_83FA368:: @ 83FA368
.incbin "baserom.gba", 0x3FA368, 0x48
gUnknown_83FA3B0:: @ 83FA3B0
.incbin "baserom.gba", 0x3FA3B0, 0x10
gUnknown_83FA3C0:: @ 83FA3C0
.incbin "baserom.gba", 0x3FA3C0, 0xC
gUnknown_83FA3CC:: @ 83FA3CC
.incbin "baserom.gba", 0x3FA3CC, 0x8
gUnknown_83FA3D4:: @ 83FA3D4
.incbin "baserom.gba", 0x3FA3D4, 0x8
gUnknown_83FA3DC:: @ 83FA3DC
.incbin "baserom.gba", 0x3FA3DC, 0x18
gUnknown_83FA3F4:: @ 83FA3F4
.incbin "baserom.gba", 0x3FA3F4, 0xC
gUnknown_83FA400:: @ 83FA400
.incbin "baserom.gba", 0x3FA400, 0x4
gUnknown_83FA404:: @ 83FA404
.incbin "baserom.gba", 0x3FA404, 0xA
gUnknown_83FA40E:: @ 83FA40E
.incbin "baserom.gba", 0x3FA40E, 0x6
gUnknown_83FA414:: @ 83FA414
.incbin "baserom.gba", 0x3FA414, 0x1C
gUnknown_83FA430:: @ 83FA430
.incbin "baserom.gba", 0x3FA430, 0x8
gUnknown_83FA438:: @ 83FA438
.incbin "baserom.gba", 0x3FA438, 0xC
gUnknown_83FA444:: @ 83FA444
.incbin "baserom.gba", 0x3FA444, 0x20
gUnknown_83FA464:: @ 83FA464
.incbin "baserom.gba", 0x3FA464, 0x8
gUnknown_83FA46C:: @ 83FA46C
.incbin "baserom.gba", 0x3FA46C, 0x28
gUnknown_83FA494:: @ 83FA494
.incbin "baserom.gba", 0x3FA494, 0x6
gUnknown_83FA49A:: @ 83FA49A
.incbin "baserom.gba", 0x3FA49A, 0x14
gUnknown_83FA4AE:: @ 83FA4AE
.incbin "baserom.gba", 0x3FA4AE, 0x16
gUnknown_83FA4C4:: @ 83FA4C4
.incbin "baserom.gba", 0x3FA4C4, 0x1C
gUnknown_83FA4E0:: @ 83FA4E0
.incbin "baserom.gba", 0x3FA4E0, 0x4
gUnknown_83FA4E4:: @ 83FA4E4
.incbin "baserom.gba", 0x3FA4E4, 0x4
gUnknown_83FA4E8:: @ 83FA4E8
.incbin "baserom.gba", 0x3FA4E8, 0xC
gUnknown_83FA4F4:: @ 83FA4F4
.incbin "baserom.gba", 0x3FA4F4, 0x14
gUnknown_83FA508:: @ 83FA508
.incbin "baserom.gba", 0x3FA508, 0xC
gUnknown_83FA514:: @ 83FA514
.incbin "baserom.gba", 0x3FA514, 0xC
gUnknown_83FA520:: @ 83FA520
.incbin "baserom.gba", 0x3FA520, 0x14
gUnknown_83FA534:: @ 83FA534
.incbin "baserom.gba", 0x3FA534, 0x46
gUnknown_83FA57A:: @ 83FA57A
.incbin "baserom.gba", 0x3FA57A, 0xE
gUnknown_83FA588:: @ 83FA588
.incbin "baserom.gba", 0x3FA588, 0x44
gUnknown_83FA5CC:: @ 83FA5CC
.incbin "baserom.gba", 0x3FA5CC, 0x6C
gUnknown_83FA638:: @ 83FA638
.incbin "baserom.gba", 0x3FA638, 0x108
gUnknown_83FA740:: @ 83FA740
.incbin "baserom.gba", 0x3FA740, 0x14
gUnknown_83FA754:: @ 83FA754
.incbin "baserom.gba", 0x3FA754, 0x30
gUnknown_83FA784:: @ 83FA784
.incbin "baserom.gba", 0x3FA784, 0x4B0
gUnknown_83FAC34:: @ 83FAC34
.incbin "baserom.gba", 0x3FAC34, 0x500
.section .rodata.83FB134
gUnknown_83FB134:: @ 83FB134
.incbin "baserom.gba", 0x3FB134, 0xA80
data/field_map_obj.s
+7 -1
View File
@@ -31,7 +31,13 @@ gUnknown_83A0010:: @ 83A0010
.incbin "baserom.gba", 0x3A0010, 0x3688
gUnknown_83A3698:: @ 83A3698
.incbin "baserom.gba", 0x3A3698, 0x1AC0
.incbin "baserom.gba", 0x3A3698, 0x80
gEventObjectBaseOam_32x32:: @ 83A3718
.incbin "baserom.gba", 0x3A3718, 0x8
gUnknown_83A3720:: @ 83A3720
.incbin "baserom.gba", 0x3A3720, 0x1a38
gUnknown_83A5158:: @ 83A5158
.incbin "baserom.gba", 0x3A5158, 0xB0
data/field_weather.s
+3
View File
@@ -1,6 +1,9 @@
.section .rodata
.align 2
gUnknown_83BFBE4:: @ 83BFBE4
.incbin "baserom.gba", 0x3BFBE4, 0x2FD8
gUnknown_83C2BBC:: @ 83C2BBC
.incbin "baserom.gba", 0x3C2BBC, 0x4
data/graphics.s
+23 -22
View File
@@ -16352,38 +16352,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
data/graphics/title_screen/unk_83BF58C.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 78 B

data/graphics/title_screen/unk_83BF5A8.bin
+1
View File
@@ -0,0 +1 @@
àààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààààà
data/graphics/title_screen/unk_83bf64c.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 188 B

data/graphics/title_screen/unk_83bf77c.pal
+19
View File
@@ -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
data/graphics/title_screen/unk_83bf79c.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 539 B

data/graphics/title_screen/unk_83bfa14.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 150 B

data/slot_machine.s
-94
View File
@@ -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
data/strings.s
+3 -3
View File
@@ -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
data/title_screen.s
-34
View File
@@ -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
graphics/battle_transitions/agatha_bg.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
172 49 49
115 115 115
148 148 148
180 180 180
213 213 213
255 82 172
255 98 189
255 115 205
255 131 222
255 148 238
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/battle_transitions/big_pokeball_tilemap.bin
BIN
View File
Binary file not shown.
graphics/battle_transitions/big_pokeball_tileset.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 553 B

graphics/battle_transitions/blue_bg.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
172 49 49
115 115 115
148 148 148
180 180 180
213 213 213
197 197 65
213 213 82
230 230 98
246 246 115
255 255 131
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/battle_transitions/bruno_bg.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
172 49 49
115 115 115
148 148 148
180 180 180
213 213 213
8 213 8
32 238 32
49 246 49
74 255 74
123 255 123
230 123 139
246 139 156
255 156 172
255 172 189
255 189 205
230 123 139
graphics/battle_transitions/green_bg.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
230 123 139
246 139 156
255 156 172
255 172 189
255 189 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
0 0 0
0 0 0
0 0 0
graphics/battle_transitions/grid_square_tileset.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 121 B

graphics/battle_transitions/lance_bg.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
172 49 49
115 115 115
148 148 148
180 180 180
213 213 213
0 0 131
16 16 148
32 32 164
49 49 180
65 65 197
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
graphics/battle_transitions/lorelei_bg.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
172 49 49
115 115 115
148 148 148
180 180 180
213 213 213
189 0 189
205 16 205
222 32 222
238 49 238
255 65 255
106 180 213
123 197 230
139 213 246
156 230 255
172 246 255
255 255 255
graphics/battle_transitions/red_bg.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
106 180 213
123 197 230
139 213 246
156 230 255
172 246 255
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
graphics/battle_transitions/sliding_pokeball.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
98 172 238
246 8 0
238 213 180
222 180 148
255 255 255
222 230 238
189 205 230
156 180 222
98 156 180
148 0 0
197 197 197
238 230 164
222 205 131
213 180 106
205 156 82
0 0 0
graphics/battle_transitions/sliding_pokeball.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 309 B

graphics/battle_transitions/sliding_pokeball_tilemap.bin
BIN
View File
Binary file not shown.
graphics/battle_transitions/unused_brendan.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 475 B

graphics/battle_transitions/unused_lass.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 412 B

graphics/battle_transitions/unused_trainer.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 222 205
222 164 148
205 131 115
123 90 82
57 74 123
41 57 98
24 41 82
16 32 57
222 230 238
255 197 90
189 156 90
255 98 90
197 65 65
255 255 255
0 0 0
graphics/battle_transitions/vsbar_tilemap.bin
BIN
View File
Binary file not shown.
graphics/battle_transitions/vsbar_tileset.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 158 B

graphics/slot_machine/unk_8464974.pal
+19
View File
@@ -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
graphics/slot_machine/unk_8464994.pal
+19
View File
@@ -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
graphics/slot_machine/unk_84649b4.pal
+19
View File
@@ -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
graphics/slot_machine/unk_84649d4.pal
+19
View File
@@ -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
graphics/slot_machine/unk_84649f4.pal
+19
View File
@@ -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
graphics/slot_machine/unk_8464a14.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

graphics/slot_machine/unk_846504c.pal
+19
View File
@@ -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
graphics/slot_machine/unk_846506c.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 909 B

graphics/slot_machine/unk_8465524.pal
+19
View File
@@ -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
graphics/slot_machine/unk_8465544.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 215 B

graphics/slot_machine/unk_8465930.pal
+19
View File
@@ -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
graphics/slot_machine/unk_8465950.pal
+19
View File
@@ -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
graphics/slot_machine/unk_8465970.pal
+19
View File
@@ -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
graphics/slot_machine/unk_8465990.pal
+19
View File
@@ -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
graphics/slot_machine/unk_84659b0.pal
+19
View File
@@ -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
graphics/slot_machine/unk_84659d0.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

graphics/slot_machine/unk_84661d4.bin
BIN
View File
Binary file not shown.
graphics/slot_machine/unk_84664bc.pal
+19
View File
@@ -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
graphics/slot_machine/unk_84664dc.pal
+19
View File
@@ -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
graphics/slot_machine/unk_84664fc.pal
+19
View File
@@ -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
graphics/slot_machine/unk_846651c.pal
+19
View File
@@ -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
graphics/slot_machine/unk_846653c.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 229 B

graphics/slot_machine/unk_84665c0.pal
+19
View File
@@ -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
graphics/slot_machine/unk_84665e0.pal
+19
View File
@@ -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
graphics/slot_machine/unk_8466600.pal
+19
View File
@@ -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
graphics/slot_machine/unk_8466620.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 772 B

graphics/slot_machine/unk_8466998.bin
BIN
View File
Binary file not shown.
graphics/title_screen/unk_8eab6c4.pal
+259
View File
@@ -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
graphics/title_screen/unk_8eab8c4.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

graphics/title_screen/unk_8ead390.bin
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

graphics/title_screen/unk_8ead5e8.pal
+19
View File
@@ -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
graphics/title_screen/unk_8ead608.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

graphics/title_screen/unk_8eadee4.bin
BIN
View File
Binary file not shown.
graphics/title_screen/unk_8eae094.pal
+19
View File
@@ -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
graphics/title_screen/unk_8eae0b4.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 597 B

graphics/title_screen/unk_8eae374.bin
BIN
View File
Binary file not shown.
graphics/title_screen/unk_8eae488.pal
+19
View File
@@ -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
graphics/title_screen/unk_8eae4a8.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 148 B

graphics_file_rules.mk
+11
View File
@@ -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
include/battle_transition.h
+34 -3
View File
@@ -3,8 +3,39 @@
#include "global.h"
void sub_8149DFC(u8 a0);
bool8 sub_80D08F8(void);
void sub_80D08B8(u8 a0);
enum
{
MUGSHOT_LORELEI,
MUGSHOT_BRUNO,
MUGSHOT_AGATHA,
MUGSHOT_LANCE,
MUGSHOT_BLUE,
MUGSHOTS_COUNT
};
#define B_TRANSITION_BLUR 0
#define B_TRANSITION_DISTORTED_WAVE 1
#define B_TRANSITION_HORIZONTAL_CORRUGATE 2
#define B_TRANSITION_BIG_POKEBALL 3
#define B_TRANSITION_SLIDING_POKEBALLS 4
#define B_TRANSITION_CLOCKWISE_BLACKFADE 5
#define B_TRANSITION_FULLSCREEN_WAVE 6
#define B_TRANSITION_BLACK_WAVE_TO_RIGHT 7
#define B_TRANSITION_SLICED_SCREEN 8
#define B_TRANSITION_WHITEFADE_IN_STRIPES 9
#define B_TRANSITION_GRID_SQUARES 10
#define B_TRANSITION_BLACK_DOODLES 11
#define B_TRANSITION_LORELEI 12
#define B_TRANSITION_BRUNO 13
#define B_TRANSITION_AGATHA 14
#define B_TRANSITION_LANCE 15
#define B_TRANSITION_BLUE 16
#define B_TRANSITION_ANTI_CLOCKWISE_SPIRAL 17
extern const struct SpritePalette sSpritePalette_SlidingPokeball;
bool8 BT_IsDone(void);
void BT_StartOnField(u8 transitionId);
bool8 FldEff_Pokeball(void);
#endif // GUARD_BATTLE_TRANSITION_H
include/berry_fix_program.h
+6
View File
@@ -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
include/clear_save_data_screen.h
+6
View File
@@ -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
include/field_camera.h
+1
View File
@@ -26,5 +26,6 @@ extern u16 gUnknown_03005DE8;
void DrawWholeMapView(void);
void CurrentMapDrawMetatileAt(int x, int y);
void sub_805A658(s16 *x, s16 *y);
#endif //GUARD_FIELD_CAMERA_H
include/field_effect.h
+2
View File
@@ -83,5 +83,7 @@ void sub_80B69DC(void);
void CreateTeleportFieldEffectTask(void);
void FieldEffectActiveListRemove(u8 id);
void sub_8085620(void);
void FieldEffectStop(struct Sprite *sprite, u8 id);
u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer);
#endif //GUARD_FIELD_EFFECTS_H
include/global.h
+1 -1
View File
@@ -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
include/graphics.h
+13
View File
@@ -961,4 +961,17 @@ 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[];
#endif //GUARD_GRAPHICS_H
include/intro.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_INTRO_H
#define GUARD_INTRO_H
void sub_80EC864(void);
#endif //GUARD_INTRO_H
include/main.h
+2
View File
@@ -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;
include/main_menu.h
+6
View File
@@ -0,0 +1,6 @@
#ifndef GUARD_MAIN_MENU_H
#define GUARD_MAIN_MENU_H
void sub_800C300(void);
#endif //GUARD_MAIN_MENU_H
include/new_menu_helpers.h
+1
View File
@@ -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);
include/overworld.h
+1
View File
@@ -106,6 +106,7 @@ extern bool8 (* gFieldCallback2)(void);
void SetLastHealLocationWarp(u8 healLocaionId);
void sub_8055864(u8 mapGroup, u8 mapNum);
void CB2_Overworld(void);
void CB2_OverworldBasic(void);
void CB2_NewGame(void);
bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType);
void Overworld_ResetStateAfterTeleport(void);
include/palette.h
+4
View File
@@ -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;
include/quest_log.h
+1
View File
@@ -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));
include/slot_machine.h
+1 -1
View File
@@ -3,6 +3,6 @@
#include "global.h"
void PlaySlotMachine(u8, void *);
void PlaySlotMachine(u16, void (*)(void));
#endif // GUARD_SLOT_MACHINE_H
include/strings.h
+5
View File
@@ -203,4 +203,9 @@ 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[];
#endif //GUARD_STRINGS_H
include/trainer_pokemon_sprites.h
+4 -3
View File
@@ -1,5 +1,5 @@
#ifndef GUARD_BATTLE_DOME_CARDS_H
#define GUARD_BATTLE_DOME_CARDS_H
#ifndef GUARD_TRAINER_POKEMON_SPRITES_H
#define GUARD_TRAINER_POKEMON_SPRITES_H
#include "global.h"
@@ -13,5 +13,6 @@ u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteS
u8 sub_818D97C(u8 a0, u8 a1);
u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
u16 FreeAndDestroyTrainerPicSprite(u16);
u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass);
#endif //GUARD_BATTLE_DOME_CARDS_H
#endif // GUARD_TRAINER_POKEMON_SPRITES_H
ld_script.txt
+7 -5
View File
@@ -115,7 +115,7 @@ SECTIONS {
src/task.o(.text);
asm/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);
@@ -191,7 +191,7 @@ SECTIONS {
asm/evolution_scene.o(.text);
src/coins.o(.text);
src/fldeff_strength.o(.text);
asm/battle_transition.o(.text);
src/battle_transition.o(.text);
asm/battle_controller_link_partner.o(.text);
asm/battle_message.o(.text);
src/math_util.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);
@@ -405,7 +405,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);
@@ -418,6 +418,8 @@ SECTIONS {
data/data_83F5738.o(.rodata);
src/battle_records.o(.rodata);
data/data_83F5738.o(.rodata.83F6C90);
src/battle_transition.o(.rodata);
data/data_83F5738.o(.rodata.83FB134);
src/save.o(.rodata);
data/data_83FECCC.o(.rodata);
src/intro.o(.rodata);
@@ -454,7 +456,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);
src/battle_transition.c
+3728
View File
File diff suppressed because it is too large Load Diff
src/diploma.c
+4 -4
View File
@@ -35,7 +35,7 @@ static void DiplomaBgInit(void);
static void DiplomaPrintText(void);
static u8 DiplomaLoadGfx(void);
static void DiplomaVblankHandler(void);
static void CB2_DiplomaInit(void);
static void CB2_Diploma(void);
static void Task_WaitForExit(u8);
static void Task_DiplomaInit(u8);
static void Task_DiplomaReturnToOverworld(u8);
@@ -101,10 +101,10 @@ void CB2_ShowDiploma(void)
gDiploma->callbackStep = 0;
DiplomaBgInit();
CreateTask(Task_DiplomaInit, 0);
SetMainCallback2(CB2_DiplomaInit);
SetMainCallback2(CB2_Diploma);
}
static void CB2_DiplomaInit(void)
static void CB2_Diploma(void)
{
RunTasks();
AnimateSprites();
@@ -134,7 +134,7 @@ static void Task_DiplomaInit(u8 taskId)
case 4:
if (HasAllMons())
{
SetGpuReg(REG_OFFSET_BG1HOFS, 0x80 << 1);
SetGpuReg(REG_OFFSET_BG1HOFS, 0x100);
}
else
{
src/pokemon.c
+2 -2
View File
@@ -1621,7 +1621,7 @@ const u16 gLinkPlayerFacilityClasses[] =
FACILITY_CLASS_BEAUTY_2, FACILITY_CLASS_AQUA_LEADER,
};
const static struct OamData sOakSpeechNidoranFDummyOamData =
static const struct OamData sOakSpeechNidoranFDummyOamData =
{
.y = 0,
.affineMode = 0,
@@ -1637,7 +1637,7 @@ const static struct OamData sOakSpeechNidoranFDummyOamData =
.paletteNum = 0,
};
const struct SpriteTemplate sOakSpeechNidoranFDummyTemplate =
static const struct SpriteTemplate sOakSpeechNidoranFDummyTemplate =
{
.tileTag = SPRITE_INVALID_TAG,
.paletteTag = SPRITE_INVALID_TAG,
src/slot_machine.c
+2886
View File
File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More