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

finish trainer card matching and data

Browse Source
This commit is contained in:
Evan
2019-12-11 11:35:10 -05:00
parent af24633bf3
commit 9806a60837
48 changed files with 1522 additions and 6108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/cable_club.s
+4 -4
View File
@@ -781,7 +781,7 @@ _08080D54:
ldrb r0, [r4]
bl sub_800A900
ldr r0, _08080D84 @ =gBlockSendBuffer
bl sub_80898E8
bl TrainerCard_GenerateCardForLinkPlayer
ldr r0, _08080D88 @ =sub_8080E6C
_08080D72:
str r0, [r5]
@@ -884,7 +884,7 @@ _08080E20:
ldrb r0, [r4]
bl sub_800A900
ldr r0, _08080E60 @ =gBlockSendBuffer
bl sub_80898E8
bl TrainerCard_GenerateCardForLinkPlayer
ldr r1, _08080E64 @ =gTasks
lsls r0, r5, 2
adds r0, r5
@@ -2388,7 +2388,7 @@ sp02A_crash_sound: @ 8081A1C
ldr r0, _08081A2C @ =gSpecialVar_0x8006
ldrb r0, [r0]
ldr r1, _08081A30 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
bl InitLinkPartnerTrainerCard
bl ShowTrainerCardInLink
pop {r0}
bx r0
.align 2, 0
@@ -2412,7 +2412,7 @@ sub_8081A34: @ 8081A34
adds r1, r2
bl StringCopy
adds r0, r4, 0
bl sub_808B1BC
bl GetTrainerCardStars
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
asm/link_rfu_3.s
+2 -2
View File
@@ -3252,7 +3252,7 @@ _08117384:
lsls r0, 24
lsrs r0, 24
ldr r1, _081173BC @ =CB2_ReturnToField
bl InitLinkPartnerTrainerCard
bl ShowTrainerCardInLink
_081173A2:
bl RunTasks
bl RunTextPrinters
@@ -3489,7 +3489,7 @@ sub_8117594: @ 8117594
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
bl sub_80898E8
bl TrainerCard_GenerateCardForLinkPlayer
cmp r5, 0
beq _081175AE
bl sub_81440E8
asm/trainer_card.s
-5113
View File
File diff suppressed because it is too large Load Diff
data/graphics.s
+4 -4
View File
@@ -16218,16 +16218,16 @@ gUnknown_8E990F8:: @ 8E990F8
gUnknown_8E99118:: @ 8E99118
.incbin "graphics/tm_case/unk_8E99118.4bpp"
gUnknown_8E99198::
gFireRedTrainerCard_Pal:: @ 8E99198
.incbin "graphics/trainer_card/0star.gbapal"
gUnknown_8E991F8:: @ 8E991F8
gFireRedTrainerCard_Gfx:: @ 8E991F8
.incbin "graphics/trainer_card/card.4bpp.lz"
gUnknown_8E9986C:: @ 8E9986C
gEmeraldTrainerCard_Pal:: @ 8E9986C
.incbin "graphics/trainer_card/0star_em.gbapal"
gUnknown_8E998CC:: @ 8E998CC
gEmeraldTrainerCard_Gfx:: @ 8E998CC
.incbin "graphics/trainer_card/card_em.4bpp.lz"
gUnknown_8E99D8C:: @ 8E99D8C
data/strings.s
+17 -17
View File
@@ -2846,61 +2846,61 @@ gUnknown_8419CB9:: @ 8419CB9
.string "HM moves can't be\n"
.string "forgotten now.$"
gUnknown_8419CDA:: @ 8419CDA
gText_TrainerCardName:: @ 8419CDA
.string "NAME: $"
gUnknown_8419CE1:: @ 8419CE1
gText_TrainerCardIDNo:: @ 8419CE1
.string "IDNo.$"
gUnknown_8419CE7:: @ 8419CE7
gText_TrainerCardMoney:: @ 8419CE7
.string "MONEY$"
gUnknown_8419CED:: @ 8419CED
gText_TrainerCardYen:: @ 8419CED
.string "¥$"
gUnknown_8419CEF:: @ 8419CEF
gText_TrainerCardPokedex:: @ 8419CEF
.string "POKéDEX$"
gUnknown_8419CF7:: @ 8419CF7
gText_TrainerCardNull:: @ 8419CF7
.string "$"
gUnknown_8419CF8:: @ 8419CF8
gText_Colon2:: @ 8419CF8
.string ":$"
gUnknown_8419CFA:: @ 0x8419CFA
.string "てん$"
gUnknown_8419CFD:: @ 8419CFD
gText_TrainerCardTime:: @ 8419CFD
.string "TIME$"
gUnknown_8419D02:: @ 0x8419D02
.string "ゲ-ムポイント$"
gUnknown_8419D0A:: @ 8419D0A
gText_Var1sTrainerCard:: @ 8419D0A
.string "'s TRAINER CARD$"
gUnknown_8419D1A:: @ 8419D1A
gText_HallOfFameDebut:: @ 8419D1A
.string "HALL OF FAME DEBUT $"
gUnknown_8419D2F:: @ 0x8419D2F
gText_LinkBattles:: @ 0x8419D2F
.string "LINK BATTLES$"
gUnknown_8419D3C:: @ 0x8419D3C
gText_LinkCableBattles:: @ 0x8419D3C
.string "LINK CABLE BATTLES$"
gUnknown_8419D4F:: @ 8419D4F
gText_WinLossRatio:: @ 8419D4F
.string "W:{CLEAR_TO 0x30}L:$"
gUnknown_8419D57:: @ 8419D57
gText_PokemonTrades:: @ 8419D57
.string "POKéMON TRADES$"
gUnknown_8419D66:: @ 8419D66
gText_UnionRoomTradesBattles:: @ 8419D66
.string "UNION TRADES & BATTLES$"
gUnknown_8419D7D:: @ 8419D7D
gText_BerryCrushes:: @ 8419D7D
.string "BERRY CRUSH$"
gUnknown_8419D89:: @ 8419D89
gText_WaitingTrainerFinishReading:: @ 8419D89
.string "Waiting for the other TRAINER to\n"
.string "finish reading your TRAINER CARD.$"
data/trainer_card.s
-192
View File
@@ -1,192 +0,0 @@
#include "constants/maps.h"
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_83CC368:: @ 83CC368
.incbin "baserom.gba", 0x3CC368, 0x174
gUnknown_83CC4DC:: @ 83CC4DC
.incbin "baserom.gba", 0x3CC4DC, 0x214
gUnknown_83CC6F0:: @ 83CC6F0
.incbin "baserom.gba", 0x3CC6F0, 0x1B8
gUnknown_83CC8A8:: @ 83CC8A8
.incbin "baserom.gba", 0x3CC8A8, 0xDC
gUnknown_83CC984:: @ 83CC984
.incbin "baserom.gba", 0x3CC984, 0x12C
gUnknown_83CCAB0:: @ 83CCAB0
.incbin "baserom.gba", 0x3CCAB0, 0x1F4
gUnknown_83CCCA4:: @ 83CCCA4
.incbin "baserom.gba", 0x3CCCA4, 0x18C
gUnknown_83CCE30:: @ 83CCE30
.incbin "baserom.gba", 0x3CCE30, 0x98
gUnknown_83CCEC8:: @ 83CCEC8
.incbin "baserom.gba", 0x3CCEC8, 0xB8
gUnknown_83CCF80:: @ 83CCF80
.incbin "baserom.gba", 0x3CCF80, 0x60
gUnknown_83CCFE0:: @ 83CCFE0
.incbin "baserom.gba", 0x3CCFE0, 0x60
gUnknown_83CD040:: @ 83CD040
.incbin "baserom.gba", 0x3CD040, 0x60
gUnknown_83CD0A0:: @ 83CD0A0
.incbin "baserom.gba", 0x3CD0A0, 0x60
gUnknown_83CD100:: @ 83CD100
.incbin "baserom.gba", 0x3CD100, 0x60
gUnknown_83CD160:: @ 83CD160
.incbin "baserom.gba", 0x3CD160, 0x60
gUnknown_83CD1C0:: @ 83CD1C0
.incbin "baserom.gba", 0x3CD1C0, 0x60
gUnknown_83CD220:: @ 83CD220
.incbin "baserom.gba", 0x3CD220, 0x60
gUnknown_83CD280:: @ 83CD280
.incbin "baserom.gba", 0x3CD280, 0x20
gUnknown_83CD2A0:: @ 83CD2A0
.incbin "baserom.gba", 0x3CD2A0, 0x20
gUnknown_83CD2C0:: @ 83CD2C0
.incbin "baserom.gba", 0x3CD2C0, 0x20
gUnknown_83CD2E0:: @ 83CD2E0
.incbin "baserom.gba", 0x3CD2E0, 0x20
gUnknown_83CD300:: @ 83CD300
.incbin "baserom.gba", 0x3CD300, 0x20
gUnknown_83CD320:: @ 83CD320
.incbin "baserom.gba", 0x3CD320, 0x20
gUnknown_83CD340:: @ 83CD340
.incbin "baserom.gba", 0x3CD340, 0x20
gUnknown_83CD360:: @ 83CD360
.incbin "baserom.gba", 0x3CD360, 0x20
gUnknown_83CD380:: @ 83CD380
.incbin "baserom.gba", 0x3CD380, 0x268
gUnknown_83CD5E8:: @ 83CD5E8
.incbin "baserom.gba", 0x3CD5E8, 0x2A0
gUnknown_83CD888:: @ 83CD888
.incbin "baserom.gba", 0x3CD888, 0x10
gUnknown_83CD898:: @ 83CD898
.incbin "baserom.gba", 0x3CD898, 0x20
gUnknown_83CD8B8:: @ 83CD8B8
.word gUnknown_8E9986C
.word gUnknown_83CCF80
.word gUnknown_83CD040
.word gUnknown_83CD100
.word gUnknown_83CD1C0
gUnknown_83CD8CC:: @ 83CD8CC
.word gUnknown_8E99198
.word gUnknown_83CCFE0
.word gUnknown_83CD0A0
.word gUnknown_83CD160
.word gUnknown_83CD220
gUnknown_83CD8E0:: @ 83CD8E0
.incbin "baserom.gba", 0x3CD8E0, 0x3
gUnknown_83CD8E3:: @ 83CD8E3
.incbin "baserom.gba", 0x3CD8E3, 0x6
gUnknown_83CD8E9:: @ 83CD8E9
.incbin "baserom.gba", 0x3CD8E9, 0x3
gUnknown_83CD8EC:: @ 83CD8EC
.incbin "baserom.gba", 0x3CD8EC, 0x8
gUnknown_83CD8F4:: @ 83CD8F4
.incbin "baserom.gba", 0x3CD8F4, 0x4
gUnknown_83CD8F8:: @ 83CD8F8
.incbin "baserom.gba", 0x3CD8F8, 0x10
gUnknown_83CD908:: @ 83CD908
.incbin "baserom.gba", 0x3CD908, 0x18
gUnknown_83CD920:: @ 83CD920
.incbin "baserom.gba", 0x3CD920, 0x2
gUnknown_83CD922:: @ 83CD922
.incbin "baserom.gba", 0x3CD922, 0x2
gUnknown_83CD924:: @ 83CD924
.incbin "baserom.gba", 0x3CD924, 0x2
gUnknown_83CD926:: @ 83CD926
.incbin "baserom.gba", 0x3CD926, 0x2
gUnknown_83CD928:: @ 83CD928
.incbin "baserom.gba", 0x3CD928, 0x8
gUnknown_83CD930:: @ 83CD930
.incbin "baserom.gba", 0x3CD930, 0x2
gUnknown_83CD932:: @ 83CD932
.incbin "baserom.gba", 0x3CD932, 0x2
gUnknown_83CD934:: @ 83CD934
.incbin "baserom.gba", 0x3CD934, 0x2
gUnknown_83CD936:: @ 83CD936
.incbin "baserom.gba", 0x3CD936, 0x2
gUnknown_83CD938:: @ 83CD938
.incbin "baserom.gba", 0x3CD938, 0x2
gUnknown_83CD93A:: @ 83CD93A
.incbin "baserom.gba", 0x3CD93A, 0x2
gUnknown_83CD93C:: @ 83CD93C
.incbin "baserom.gba", 0x3CD93C, 0x2
gUnknown_83CD93E:: @ 83CD93E
.incbin "baserom.gba", 0x3CD93E, 0x2
gUnknown_83CD940:: @ 83CD940
.incbin "baserom.gba", 0x3CD940, 0x4
gUnknown_83CD944:: @ 83CD944
.incbin "baserom.gba", 0x3CD944, 0x8
gUnknown_83CD94C:: @ 83CD94C
.incbin "baserom.gba", 0x3CD94C, 0x6
gUnknown_83CD952:: @ 83CD952
.incbin "baserom.gba", 0x3CD952, 0x6
gUnknown_83CD958:: @ 83CD958
.incbin "baserom.gba", 0x3CD958, 0x4
gUnknown_83CD95C:: @ 83CD95C
.incbin "baserom.gba", 0x3CD95C, 0x4
gUnknown_83CD960:: @ 83CD960
.incbin "baserom.gba", 0x3CD960, 0x60
gUnknown_83CD9C0:: @ 83CD9C0
.incbin "baserom.gba", 0x3CD9C0, 0x60
graphics/trainer_card/badges.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 537 B

graphics/trainer_card/em_1stars_pals.pal
+51
View File
@@ -0,0 +1,51 @@
JASC-PAL
0100
48
139 98 115
238 255 246
213 238 230
164 164 164
123 123 123
98 98 115
41 57 65
57 106 139
65 139 197
189 213 205
148 180 164
106 148 123
65 115 90
106 189 255
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
0 0 0
106 180 213
41 123 164
0 0 0
0 0 0
98 98 115
255 255 255
230 230 238
164 164 164
123 123 123
255 255 255
230 230 238
164 164 164
123 123 123
255 255 255
230 230 238
164 164 164
123 123 123
106 189 255
205 205 205
0 0 0
graphics/trainer_card/em_2stars_pals.pal
+51
View File
@@ -0,0 +1,51 @@
JASC-PAL
0100
48
139 98 115
255 246 230
246 230 213
205 156 90
180 131 65
98 98 115
41 57 65
57 106 139
65 139 197
230 189 139
205 156 115
180 131 82
156 106 41
106 189 255
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
0 0 0
106 180 213
41 123 164
0 0 0
0 0 0
98 98 115
255 255 255
230 230 238
164 164 164
123 123 123
255 255 255
230 230 238
164 164 164
123 123 123
255 255 255
230 230 238
164 164 164
123 123 123
106 189 255
205 205 205
0 0 0
graphics/trainer_card/em_3stars_pals.pal
+51
View File
@@ -0,0 +1,51 @@
JASC-PAL
0100
48
139 98 115
246 246 255
230 230 238
189 189 197
156 156 156
156 106 41
41 57 65
57 106 139
65 139 197
230 230 238
189 189 197
156 156 156
123 123 123
106 189 255
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
0 0 0
106 180 213
41 123 164
0 0 0
0 0 0
98 98 115
255 255 255
230 230 238
164 164 164
123 123 123
255 255 255
230 230 238
164 164 164
123 123 123
255 255 255
230 230 238
164 164 164
123 123 123
106 189 255
205 205 205
0 0 0
graphics/trainer_card/em_4stars_pals.pal
+51
View File
@@ -0,0 +1,51 @@
JASC-PAL
0100
48
139 98 115
246 246 222
246 238 172
164 164 164
123 123 123
98 98 115
41 57 65
57 106 139
65 139 197
246 230 139
230 213 49
213 197 57
156 115 57
106 189 255
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
0 0 0
106 180 213
41 123 164
0 0 0
0 0 0
98 98 115
255 255 255
230 230 238
164 164 164
123 123 123
255 255 255
230 230 238
164 164 164
123 123 123
255 255 255
230 230 238
164 164 164
123 123 123
106 189 255
205 205 205
0 0 0
graphics/trainer_card/em_badges.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
139 98 115
255 255 255
213 213 213
180 180 180
123 123 123
255 139 57
222 57 8
106 189 255
65 139 197
255 213 98
238 180 57
197 123 197
148 74 156
106 189 255
205 205 205
0 0 0
graphics/trainer_card/em_badges.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 513 B

graphics/trainer_card/em_female_bg.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
230 123 139
164 49 115
0 0 0
0 0 0
graphics/trainer_card/fr_1stars_pals.pal
+51
View File
@@ -0,0 +1,51 @@
JASC-PAL
0100
48
139 98 115
222 255 230
205 246 222
197 238 213
189 230 205
246 205 148
164 164 164
98 98 115
246 213 139
180 205 148
131 180 172
115 156 156
82 131 123
255 246 189
255 255 255
156 205 197
139 98 115
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
189 148 16
255 213 82
82 205 180
65 172 164
197 197 197
90 90 90
0 0 0
32 65 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
0 0 0
0 0 0
graphics/trainer_card/fr_2stars_pals.pal
+51
View File
@@ -0,0 +1,51 @@
JASC-PAL
0100
48
139 98 115
246 246 205
246 238 197
238 230 189
230 222 156
246 205 148
164 164 164
98 98 115
246 238 139
222 197 139
213 189 139
197 180 123
164 123 82
255 255 205
255 255 255
230 205 156
139 98 115
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
189 148 16
255 213 82
82 205 180
65 172 164
197 197 197
90 90 90
0 0 0
32 65 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
0 0 0
0 0 0
graphics/trainer_card/fr_3stars_pals.pal
+51
View File
@@ -0,0 +1,51 @@
JASC-PAL
0100
48
139 98 115
238 246 246
238 246 246
238 238 238
230 230 230
246 205 148
164 164 164
98 98 115
255 238 131
205 205 164
197 205 205
172 180 172
131 139 156
246 246 197
255 255 255
213 222 222
139 98 115
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
189 148 16
255 213 82
82 205 180
65 172 164
197 197 197
90 90 90
0 0 0
32 65 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
0 0 0
0 0 0
graphics/trainer_card/fr_4stars_pals.pal
+51
View File
@@ -0,0 +1,51 @@
JASC-PAL
0100
48
139 98 115
255 246 230
246 238 213
246 246 197
246 238 180
246 222 106
164 164 164
98 98 115
255 255 148
246 222 49
246 205 8
238 189 0
189 148 57
255 255 197
255 255 255
246 230 82
139 98 115
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
189 148 16
255 213 82
82 205 180
65 172 164
197 197 197
90 90 90
0 0 0
32 65 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
0 0 0
0 0 0
graphics/trainer_card/fr_badges.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
139 98 115
255 255 255
213 213 213
180 180 180
123 123 123
255 139 57
222 57 8
106 189 255
65 139 197
255 213 98
238 180 57
197 123 197
148 74 156
106 189 255
205 205 205
0 0 0
graphics/trainer_card/fr_female_bg.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
139 98 115
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
189 148 16
255 213 82
230 148 82
213 98 41
197 197 197
90 90 90
graphics/trainer_card/sticker1.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 246 189
255 255 255
255 197 164
238 246 246
222 222 230
0 0 0
0 0 0
0 0 0
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/trainer_card/sticker2.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 246 189
255 255 255
98 197 238
238 246 246
222 222 230
0 0 0
0 0 0
0 0 0
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/trainer_card/sticker3.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 246 189
255 255 255
246 230 74
238 246 246
222 222 230
0 0 0
0 0 0
0 0 0
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/trainer_card/sticker4.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 246 189
255 255 255
106 131 148
238 246 246
222 222 230
0 0 0
0 0 0
0 0 0
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/trainer_card/stickers.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 336 B

graphics/trainer_card/unk_83CC4DC.bin
BIN
View File
Binary file not shown.
graphics/trainer_card/unk_83CC6F0.bin
BIN
View File
Binary file not shown.
graphics/trainer_card/unk_83CC8A8.bin
BIN
View File
Binary file not shown.
graphics/trainer_card/unk_83CC984.bin
BIN
View File
Binary file not shown.
graphics/trainer_card/unk_83CCAB0.bin
BIN
View File
Binary file not shown.
graphics/trainer_card/unk_83CCCA4.bin
BIN
View File
Binary file not shown.
graphics/trainer_card/unk_83CCE30.bin
BIN
View File
Binary file not shown.
graphics/trainer_card/unk_83CCEC8.bin
BIN
View File
Binary file not shown.
graphics/trainer_card/unk_83CD300.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
139 98 115
246 197 0
205 164 0
246 197 0
246 197 0
246 197 0
246 197 0
246 197 0
0 0 0
0 0 0
189 148 16
255 213 82
0 0 0
0 0 0
189 148 16
246 197 0
include/constants/game_stat.h
+3 -2
View File
@@ -51,9 +51,10 @@
#define GAME_STAT_USED_DAYCARE 47
#define GAME_STAT_RODE_CABLE_CAR 48
#define GAME_STAT_ENTERED_HOT_SPRINGS 49
#define GAME_STAT_NUM_UNION_ROOM_BATTLES 50
#define GAME_STAT_BERRY_CRUSH_POINTS 51
/*TODO: add new stats added in Emerald*/
#define NUM_USED_GAME_STATS 52
#define NUM_GAME_STATS 64
#endif // GUARD_CONSTANTS_GAME_STAT_H
include/global.h
+1 -1
View File
@@ -257,7 +257,7 @@ struct BattleTowerData // Leftover from R/S
/*0x04CC, 0x057C*/ u16 currentWinStreaks[2];
/*0x04D0, 0x0580*/ u8 lastStreakLevelType; // 0 = level 50, 1 = level 100. level type of the last streak. Used by tv to report the level mode.
/*0x04D1, 0x0581*/ u8 filler_4D1[0x317];
};
}; /* size = 0x7E8 */
struct SaveBlock2
{
include/graphics.h
+6
View File
@@ -4258,4 +4258,10 @@ extern const u32 gBuyMenuFrame_Pal[];
// battle_message
extern const u16 gUnknown_8D2FBB4[];
// trainer card
extern const u16 gFireRedTrainerCard_Pal[];
extern const u32 gFireRedTrainerCard_Gfx[];
extern const u16 gEmeraldTrainerCard_Pal[];
extern const u32 gEmeraldTrainerCard_Gfx[];
#endif //GUARD_GRAPHICS_H
include/pokedex.h
+3
View File
@@ -44,6 +44,9 @@ s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId);
u16 GetNationalPokedexCount(u8);
u16 sub_80C0844(u8);
u16 GetKantoPokedexCount(u8);
bool16 HasAllHoennMons(void);
bool16 HasAllKantoMons(void);
bool16 HasAllMons(void);
u32 sub_8106B60(u16 species);
include/pokemon_icon.h
+3
View File
@@ -3,6 +3,8 @@
#include "global.h"
extern const u16 gMonIconPalettes[][16];
const u8 *GetMonIconPtr(u16 speciesId, u32 personality, u32 frameNo);
const u8 *GetMonIconTiles(u16 iconSpecies, bool32 extra);
const u16 *GetValidMonIconPalettePtr(u16 speciesId);
@@ -23,5 +25,6 @@ u8 UpdateMonIconFrame(struct Sprite * sprite);
void LoadMonIconPalette(u16 iconId);
void FreeMonIconPalette(u16 iconId);
void SetPartyHPBarSprite(struct Sprite * sprite, u8 animNum);
u8 GetMonIconPaletteIndexFromSpecies(u16 species);
#endif // GUARD_POKEMON_ICON_H
include/strings.h
+19
View File
@@ -943,4 +943,23 @@ extern const u8 gText_Var1AndYouWantedVar2[];
extern const u8 gText_HereYouGoThankYou[];
extern const u8 gText_NoMoreRoomForThis[];
// trainer card
extern const u8 gText_WaitingTrainerFinishReading[];
extern const u8 gText_TrainerCardName[];
extern const u8 gText_TrainerCardIDNo[];
extern const u8 gText_TrainerCardMoney[];
extern const u8 gText_TrainerCardYen[];
extern const u8 gText_TrainerCardPokedex[];
extern const u8 gText_TrainerCardNull[];
extern const u8 gText_Colon2[];
extern const u8 gText_TrainerCardTime[];
extern const u8 gText_Var1sTrainerCard[];
extern const u8 gText_HallOfFameDebut[];
extern const u8 gText_WinLossRatio[];
extern const u8 gText_PokemonTrades[];
extern const u8 gText_BerryCrushes[];
extern const u8 gText_UnionRoomTradesBattles[];
extern const u8 gText_LinkBattles[];
extern const u8 gText_LinkCableBattles[];
#endif //GUARD_STRINGS_H
include/trainer_card.h
+10 -7
View File
@@ -24,23 +24,26 @@ struct TrainerCard
/*0x20*/ u16 pokemonTrades;
/*0x24*/ u32 money;
/*0x28*/ u16 var_28[4];
/*0x30*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
/*0x30*/ u8 playerName[PLAYER_NAME_LENGTH];
/*0x38*/ u8 version;
/*0x3A*/ u16 var_3A;
/*0x3C*/ u32 berryCrushPoints;
/*0x40*/ u32 unionRoomNum;
/*0x44*/ u8 filler44[0x8];
/*0x4C*/ u8 var_4C;
/*0x4D*/ u8 var_4D;
/*0x44*/ u32 berriesPicked;
/*0x48*/ u32 jumpsInRow;
/*0x4C*/ bool8 var_4C;
/*0x4D*/ bool8 hasAllMons;
/*0x4E*/ u8 var_4E;
/*0x4F*/ u8 var_4F;
/*0x50*/ u8 var_50[0x4];
/*0x50*/ u8 var_50[4];
/*0x54*/ u16 monSpecies[PARTY_SIZE];
};
extern struct TrainerCard gTrainerCards[4];
void InitTrainerCard(MainCallback callback);
void InitLinkPartnerTrainerCard(u8 whoseCard, MainCallback callback);
void ShowPlayerTrainerCard(void (*callback)(void));
void ShowTrainerCardInLink(u8 whoseCard, MainCallback callback);
u8 GetTrainerCardStars(u8 cardId);
void TrainerCard_GenerateCardForLinkPlayer(struct TrainerCard *trainerCard);
#endif //GUARD_TRAINER_CARD_H
include/trainer_pokemon_sprites.h
+4 -1
View File
@@ -3,13 +3,14 @@
#include "global.h"
u16 sub_810C330(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId);
bool16 ResetAllPicSprites(void);
u16 sub_818D3E4(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
u16 sub_818D7D8(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
u16 sub_818D820(u16 spriteId);
u16 sub_818D8AC(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
u16 sub_818D8F0(u16 spriteId);
u16 sub_818D938(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId);
u8 sub_818D97C(u8 a0, u8 a1);
u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
u16 FreeAndDestroyMonPicSprite(u16);
@@ -18,4 +19,6 @@ u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass);
u16 CreateMonPicSprite_HandleDeoxys(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
u16 LoadMonPicInWindow(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId);
#endif // GUARD_TRAINER_POKEMON_SPRITES_H
ld_script.txt
+3 -3
View File
@@ -130,8 +130,8 @@ SECTIONS {
src/scanline_effect.o(.text);
src/option_menu.o(.text);
src/pokedex.o(.text);
asm/trainer_card.o(.text);
asm/pokemon_storage_system.o(.text);
src/trainer_card.o(.text);
asm/pokemon_storage_system.o(.text);
src/pokemon_icon.o(.text);
asm/script_movement.o(.text);
asm/fldeff_cut.o(.text);
@@ -434,7 +434,7 @@ SECTIONS {
src/wild_encounter.o(.rodata);
data/field_effect.o(.rodata);
src/option_menu.o(.rodata);
data/trainer_card.o(.rodata);
src/trainer_card.o(.rodata);
data/pokemon_storage_system.o(.rodata);
src/pokemon_icon.o(.rodata);
data/fldeff_cut.o(.rodata);
src/money.c
+2 -2
View File
@@ -6,7 +6,7 @@
#include "text_window.h"
extern const u8 gText_PokedollarVar1[];
extern const u8 gUnknown_8419CE7[];
extern const u8 gText_TrainerCardMoney[];
#define MAX_MONEY 999999
@@ -110,7 +110,7 @@ void PrintMoneyAmount(u8 windowId, u8 x, u8 y, int amount, u8 speed)
void PrintMoneyAmountInMoneyBoxWithBorder(u8 windowId, u16 tileStart, u8 pallete, int amount)
{
DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, tileStart, pallete);
AddTextPrinterParameterized(windowId, 2, gUnknown_8419CE7, 0, 0, 0xFF, 0);
AddTextPrinterParameterized(windowId, 2, gText_TrainerCardMoney, 0, 0, 0xFF, 0);
PrintMoneyAmountInMoneyBox(windowId, amount, 0);
}
src/pokedex.c
+1 -1
View File
@@ -88,7 +88,7 @@ bool16 HasAllHoennMons(void)
return TRUE;
}
bool8 HasAllKantoMons(void)
bool16 HasAllKantoMons(void)
{
u16 i;
src/start_menu.c
+2 -2
View File
@@ -504,7 +504,7 @@ static bool8 StartMenuPlayerCallback(void)
PlayRainStoppingSoundEffect();
DestroySafariZoneStatsWindow();
CleanupOverworldWindowsAndTilemaps();
InitTrainerCard(CB2_ReturnToFieldWithOpenMenu);
ShowPlayerTrainerCard(CB2_ReturnToFieldWithOpenMenu);
return TRUE;
}
return FALSE;
@@ -554,7 +554,7 @@ static bool8 StartMenuLinkPlayerCallback(void)
{
PlayRainStoppingSoundEffect();
CleanupOverworldWindowsAndTilemaps();
InitLinkPartnerTrainerCard(gUnknown_300502C, CB2_ReturnToFieldWithOpenMenu);
ShowTrainerCardInLink(gUnknown_300502C, CB2_ReturnToFieldWithOpenMenu);
return TRUE;
}
return FALSE;
src/trainer_card.c
+857 -751
View File
File diff suppressed because it is too large Load Diff
sym_ewram.txt
+2 -6
View File
@@ -227,12 +227,8 @@ gFieldEffectArguments: @ 20386E0
.align 2
.include "src/option_menu.o"
gTrainerCards: @ 2039624
.space 0x180
gUnknown_20397A4: @ 20397A4
.space 0x4
.align 2
.include "src/trainer_card.o"
gUnknown_20397A8: @ 20397A8
.space 0x4