Skip to content

Commit bf657d1

Browse files
MokhaLeeeMokhaLeee
authored
Merge pull request #48 from MokhaLeee/playrank
Playrank in process
2 parents 546618c + ecf2dd3 commit bf657d1

35 files changed

+2894
-4329
lines changed

‎asm/banim_dragonfx.s‎

Lines changed: 3 additions & 460 deletions
Large diffs are not rendered by default.

asm/code.s renamed to asm/playrank_0808F33C.s

Lines changed: 27 additions & 3417 deletions
Large diffs are not rendered by default.

‎asm/prepscreen.s‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12141,45 +12141,45 @@ func_fe6_080834B4: @ 0x080834B4
1214112141
adds r1, r5, #0
1214212142
movs r3, #1
1214312143
bl func_fe6_08082F54
12144-
bl func_fe6_0808F30C
12144+
bl PlayRank_GetTotalTurn
1214512145
adds r2, r0, #0
1214612146
lsls r2, r2, #0x10
1214712147
lsrs r2, r2, #0x10
1214812148
adds r0, r4, #0
1214912149
adds r1, r5, #0
1215012150
movs r3, #0x10
1215112151
bl func_fe6_08082F54
12152-
bl func_fe6_0808F470
12152+
bl PlayRank_GetWinningRate
1215312153
adds r2, r0, #0
1215412154
lsls r2, r2, #0x10
1215512155
lsrs r2, r2, #0x10
1215612156
adds r0, r4, #0
1215712157
adds r1, r5, #0
1215812158
movs r3, #0x10
1215912159
bl func_fe6_08082F54
12160-
bl func_fe6_0808F4F0
12160+
bl PlayRank_GetDeadAllies
1216112161
adds r2, r0, #0
1216212162
lsls r2, r2, #0x10
1216312163
lsrs r2, r2, #0x10
1216412164
adds r0, r4, #0
1216512165
adds r1, r5, #0
1216612166
movs r3, #7
1216712167
bl func_fe6_08082F54
12168-
bl func_fe6_0808F59C
12168+
bl PlayRank_GetTotalLevelsGained
1216912169
adds r2, r0, #0
1217012170
lsls r2, r2, #0x10
1217112171
lsrs r2, r2, #0x10
1217212172
adds r0, r4, #0
1217312173
adds r1, r5, #0
1217412174
movs r3, #0xc
1217512175
bl func_fe6_08082F54
12176-
bl func_fe6_08017104
12176+
bl GetTotalAsset
1217712177
adds r2, r0, #0
1217812178
adds r0, r4, #0
1217912179
adds r1, r5, #0
1218012180
movs r3, #0x18
1218112181
bl func_fe6_08082F54
12182-
bl func_fe6_0808F648
12182+
bl PlayRank_CalcTotalLevel
1218312183
adds r2, r0, #0
1218412184
lsls r2, r2, #0x10
1218512185
lsrs r2, r2, #0x10
@@ -12282,18 +12282,18 @@ func_fe6_0808357C: @ 0x0808357C
1228212282
func_fe6_08083618: @ 0x08083618
1228312283
push {r4, lr}
1228412284
sub sp, #0xc
12285-
bl func_fe6_0808F30C
12285+
bl PlayRank_GetTotalTurn
1228612286
ldr r4, .L08083654 @ =gUnk_030048C0
1228712287
strh r0, [r4]
12288-
bl func_fe6_0808F470
12288+
bl PlayRank_GetWinningRate
1228912289
strh r0, [r4, #2]
12290-
bl func_fe6_0808F4F0
12290+
bl PlayRank_GetDeadAllies
1229112291
strh r0, [r4, #4]
12292-
bl func_fe6_0808F59C
12292+
bl PlayRank_GetTotalLevelsGained
1229312293
strh r0, [r4, #6]
12294-
bl func_fe6_08017104
12294+
bl GetTotalAsset
1229512295
str r0, [r4, #8]
12296-
bl func_fe6_0808F648
12296+
bl PlayRank_CalcTotalLevel
1229712297
strh r0, [r4, #0xc]
1229812298
ldr r1, .L08083658 @ =gPlaySt
1229912299
movs r0, #0x40
@@ -12310,7 +12310,7 @@ func_fe6_08083618: @ 0x08083618
1231012310
movs r0, #0
1231112311
.L0808365E:
1231212312
strb r0, [r4, #0x11]
12313-
bl func_fe6_0808EC1C
12313+
bl PlayRank_GetTotalPlayTime
1231412314
add r2, sp, #4
1231512315
add r3, sp, #8
1231612316
mov r1, sp

‎data/data-banim-dragon.s‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,8 @@
22
.include "animscr.inc"
33
.include "gba_sprites.inc"
44

5-
.global gUnk_08604948
6-
gUnk_08604948: @ 08604948
7-
.incbin "fe6-base.gba", 0x604948, (0x604968 - 0x604948) @ length: 0020
8-
9-
.global gUnk_08604968
10-
gUnk_08604968: @ 08604968
11-
.incbin "fe6-base.gba", 0x604968, (0x604988 - 0x604968) @ length: 0020
12-
13-
.global gUnk_08604988
14-
gUnk_08604988: @ 08604988
15-
.incbin "fe6-base.gba", 0x604988, (0x6049A8 - 0x604988) @ length: 0020
16-
17-
.global gUnk_086049A8
18-
gUnk_086049A8: @ 086049A8
5+
.global ProcScr_EkrDragonfx_IdunnExit2
6+
ProcScr_EkrDragonfx_IdunnExit2: @ 086049A8
197
.incbin "fe6-base.gba", 0x6049A8, (0x6049D0 - 0x6049A8) @ length: 0028
208

219
.global ProcScr_EkrIdunnDeamon1

‎data/data.s‎

Lines changed: 0 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -1,137 +1,5 @@
11
.data
22

3-
.global HelpInfo_0868B1B0
4-
HelpInfo_0868B1B0: @ 0868B1B0
5-
.incbin "fe6-base.gba", 0x68B1B0, (0x68B2C8 - 0x68B1B0) @ length: 0118
6-
7-
.global HelpInfo_0868B2C8
8-
HelpInfo_0868B2C8: @ 0868B2C8
9-
.incbin "fe6-base.gba", 0x68B2C8, (0x68B3C4 - 0x68B2C8) @ length: 00FC
10-
11-
.global HelpInfo_0868B3C4
12-
HelpInfo_0868B3C4: @ 0868B3C4
13-
.incbin "fe6-base.gba", 0x68B3C4, (0x68B3FC - 0x68B3C4) @ length: 0038
14-
15-
.global gpAuguryBuf
16-
gpAuguryBuf: @ 0868B3FC
17-
.incbin "fe6-base.gba", 0x68B3FC, (0x68B410 - 0x68B3FC) @ length: 0014
18-
19-
.global gUnk_0868B410
20-
gUnk_0868B410: @ 0868B410
21-
.incbin "fe6-base.gba", 0x68B410, (0x68B418 - 0x68B410) @ length: 0008
22-
23-
.global gUnk_0868B418
24-
gUnk_0868B418: @ 0868B418
25-
.incbin "fe6-base.gba", 0x68B418, (0x68B420 - 0x68B418) @ length: 0008
26-
27-
.global gUnk_0868B420
28-
gUnk_0868B420: @ 0868B420
29-
.incbin "fe6-base.gba", 0x68B420, (0x68B490 - 0x68B420) @ length: 0070
30-
31-
.global gUnk_0868B490
32-
gUnk_0868B490: @ 0868B490
33-
.incbin "fe6-base.gba", 0x68B490, (0x68B4D0 - 0x68B490) @ length: 0040
34-
35-
.global gUnk_0868B4D0
36-
gUnk_0868B4D0: @ 0868B4D0
37-
.incbin "fe6-base.gba", 0x68B4D0, (0x68B5B0 - 0x68B4D0) @ length: 00E0
38-
39-
.global gUnk_0868B5B0
40-
gUnk_0868B5B0: @ 0868B5B0
41-
.incbin "fe6-base.gba", 0x68B5B0, (0x68B5C8 - 0x68B5B0) @ length: 0018
42-
43-
.global gUnk_0868B5C8
44-
gUnk_0868B5C8: @ 0868B5C8
45-
.incbin "fe6-base.gba", 0x68B5C8, (0x68B5E0 - 0x68B5C8) @ length: 0018
46-
47-
.global gUnk_0868B5E0
48-
gUnk_0868B5E0: @ 0868B5E0
49-
.incbin "fe6-base.gba", 0x68B5E0, (0x68B5E8 - 0x68B5E0) @ length: 0008
50-
51-
.global ProcScr_0868B5E8
52-
ProcScr_0868B5E8: @ 0868B5E8
53-
.incbin "fe6-base.gba", 0x68B5E8, (0x68B610 - 0x68B5E8) @ length: 0028
54-
55-
.global ProcScr_0868B610
56-
ProcScr_0868B610: @ 0868B610
57-
.incbin "fe6-base.gba", 0x68B610, (0x68B648 - 0x68B610) @ length: 0038
58-
59-
.global ProcScr_0868B648
60-
ProcScr_0868B648: @ 0868B648
61-
.incbin "fe6-base.gba", 0x68B648, (0x68B6D8 - 0x68B648) @ length: 0090
62-
63-
.global ProcScr_0868B6D8
64-
ProcScr_0868B6D8: @ 0868B6D8
65-
.incbin "fe6-base.gba", 0x68B6D8, (0x68B700 - 0x68B6D8) @ length: 0028
66-
67-
.global ProcScr_0868B700
68-
ProcScr_0868B700: @ 0868B700
69-
.incbin "fe6-base.gba", 0x68B700, (0x68B720 - 0x68B700) @ length: 0020
70-
71-
.global gUnk_0868B720
72-
gUnk_0868B720: @ 0868B720
73-
.incbin "fe6-base.gba", 0x68B720, (0x68B730 - 0x68B720) @ length: 0010
74-
75-
.global ProcScr_0868B730
76-
ProcScr_0868B730: @ 0868B730
77-
.incbin "fe6-base.gba", 0x68B730, (0x68B750 - 0x68B730) @ length: 0020
78-
79-
.global ProcScr_0868B750
80-
ProcScr_0868B750: @ 0868B750
81-
.incbin "fe6-base.gba", 0x68B750, (0x68B768 - 0x68B750) @ length: 0018
82-
83-
.global ProcScr_0868B768
84-
ProcScr_0868B768: @ 0868B768
85-
.incbin "fe6-base.gba", 0x68B768, (0x68B788 - 0x68B768) @ length: 0020
86-
87-
.global gUnk_0868B788
88-
gUnk_0868B788: @ 0868B788
89-
.incbin "fe6-base.gba", 0x68B788, (0x68B79C - 0x68B788) @ length: 0014
90-
91-
.global gUnk_0868B79C
92-
gUnk_0868B79C: @ 0868B79C
93-
.incbin "fe6-base.gba", 0x68B79C, (0x68B7A0 - 0x68B79C) @ length: 0004
94-
95-
.global gUnk_0868B7A0
96-
gUnk_0868B7A0: @ 0868B7A0
97-
.incbin "fe6-base.gba", 0x68B7A0, (0x68B7A4 - 0x68B7A0) @ length: 0004
98-
99-
.global gUnk_0868B7A4
100-
gUnk_0868B7A4: @ 0868B7A4
101-
.incbin "fe6-base.gba", 0x68B7A4, (0x68B7A8 - 0x68B7A4) @ length: 0004
102-
103-
.global gUnk_0868B7A8
104-
gUnk_0868B7A8: @ 0868B7A8
105-
.incbin "fe6-base.gba", 0x68B7A8, (0x68B7B8 - 0x68B7A8) @ length: 0010
106-
107-
.global gUnk_0868B7B8
108-
gUnk_0868B7B8: @ 0868B7B8
109-
.incbin "fe6-base.gba", 0x68B7B8, (0x68B7D6 - 0x68B7B8) @ length: 001E
110-
111-
.global gUnk_0868B7D6
112-
gUnk_0868B7D6: @ 0868B7D6
113-
.incbin "fe6-base.gba", 0x68B7D6, (0x68B7E2 - 0x68B7D6) @ length: 000C
114-
115-
.global gUnk_0868B7E2
116-
gUnk_0868B7E2: @ 0868B7E2
117-
.incbin "fe6-base.gba", 0x68B7E2, (0x68B7E8 - 0x68B7E2) @ length: 0006
118-
119-
.global gUnk_0868B7E8
120-
gUnk_0868B7E8: @ 0868B7E8
121-
.incbin "fe6-base.gba", 0x68B7E8, (0x68B7F4 - 0x68B7E8) @ length: 000C
122-
123-
.global BgConfig_PlayRank
124-
BgConfig_PlayRank: @ 0868B7F4
125-
.incbin "fe6-base.gba", 0x68B7F4, (0x68B80C - 0x68B7F4) @ length: 0018
126-
127-
.global ProcScr_0868B80C
128-
ProcScr_0868B80C: @ 0868B80C
129-
.incbin "fe6-base.gba", 0x68B80C, (0x68B88C - 0x68B80C) @ length: 0080
130-
131-
.global ProcScr_0868B88C
132-
ProcScr_0868B88C: @ 0868B88C
133-
.incbin "fe6-base.gba", 0x68B88C, (0x68B8AC - 0x68B88C) @ length: 0020
134-
1353
.global ProcScr_0868B8AC
1364
ProcScr_0868B8AC: @ 0868B8AC
1375
.incbin "fe6-base.gba", 0x68B8AC, (0x68B8E4 - 0x68B8AC) @ length: 0038

‎data/rodata.s‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,16 @@ Img_WorldMap_PlayRank: @ 0833C984
100100
Tsa_08340ED8: @ 08340ED8
101101
.incbin "fe6-base.gba", 0x340ED8, (0x34138C - 0x340ED8) @ length: 04B4
102102

103-
.global gUnk_0834138C
104-
gUnk_0834138C: @ 0834138C
103+
.global Pal_0834138C
104+
Pal_0834138C: @ 0834138C
105105
.incbin "fe6-base.gba", 0x34138C, (0x3413CC - 0x34138C) @ length: 0040
106106

107107
.global Img_PlayRank_083413CC
108108
Img_PlayRank_083413CC: @ 083413CC
109109
.incbin "fe6-base.gba", 0x3413CC, (0x341DA0 - 0x3413CC) @ length: 09D4
110110

111-
.global gUnk_08341DA0
112-
gUnk_08341DA0: @ 08341DA0
111+
.global Pal_08341DA0
112+
Pal_08341DA0: @ 08341DA0
113113
.incbin "fe6-base.gba", 0x341DA0, (0x341DC0 - 0x341DA0) @ length: 0020
114114

115115
.global Img_PlayRank
@@ -120,12 +120,12 @@ Img_PlayRank: @ 08341DC0
120120
Img_PlayRankCharacters: @ 08342438
121121
.incbin "fe6-base.gba", 0x342438, (0x342A98 - 0x342438) @ length: 0660
122122

123-
.global gUnk_08342A98
124-
gUnk_08342A98: @ 08342A98
123+
.global Pal_08342A98
124+
Pal_08342A98: @ 08342A98
125125
.incbin "fe6-base.gba", 0x342A98, (0x342AB8 - 0x342A98) @ length: 0020
126126

127-
.global gUnk_08342AB8
128-
gUnk_08342AB8: @ 08342AB8
127+
.global Pal_08342AB8
128+
Pal_08342AB8: @ 08342AB8
129129
.incbin "fe6-base.gba", 0x342AB8, (0x342AD8 - 0x342AB8) @ length: 0020
130130

131131
.global Pal_08342AD8
@@ -140,8 +140,8 @@ Tsa_08342AF8: @ 08342AF8
140140
gUnk_08342B54: @ 08342B54
141141
.incbin "fe6-base.gba", 0x342B54, (0x343358 - 0x342B54) @ length: 0804
142142

143-
.global gUnk_08343358
144-
gUnk_08343358: @ 08343358
143+
.global Pal_08343358
144+
Pal_08343358: @ 08343358
145145
.incbin "fe6-base.gba", 0x343358, (0x343398 - 0x343358) @ length: 0040
146146

147147
.global Img_08343398

‎data/rodata_banim_08112122.s‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,12 +1282,12 @@ Pal_081C4DE8: @ 081C4DE8
12821282
Tsa_EkrIdunn_081C4E28: @ 081C4E28
12831283
.incbin "fe6-base.gba", 0x1C4E28, (0x1C5264 - 0x1C4E28) @ length: 043C
12841284

1285-
.global gUnk_081C5264
1286-
gUnk_081C5264: @ 081C5264
1285+
.global Tsa_EkrIdunn_081C5264
1286+
Tsa_EkrIdunn_081C5264: @ 081C5264
12871287
.incbin "fe6-base.gba", 0x1C5264, (0x1C5688 - 0x1C5264) @ length: 0424
12881288

1289-
.global gUnk_081C5688
1290-
gUnk_081C5688: @ 081C5688
1289+
.global Tsa_EkrIdunn_081C5688
1290+
Tsa_EkrIdunn_081C5688: @ 081C5688
12911291
.incbin "fe6-base.gba", 0x1C5688, (0x1C5AAC - 0x1C5688) @ length: 0424
12921292

12931293
.global Tsa_EkrIdunn_081C5AAC

‎fe6.lds‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ SECTIONS
200200
. = 0x01E7AC; EkrDragonProcs = .;
201201
. = 0x01E7B4; gEkrDragonDeamonProcs = .;
202202
. = 0x01E7BC; gpProcEkrIdunnBodyFlashing = .;
203-
. = 0x01E7C0; gEkrDragonIntroDone = .;
203+
. = 0x01E7C0; gEkrDragonfxState = .;
204204
. = 0x01E7C4; gEkrDragonFastenConf = .;
205205
. = 0x01E7C8; gEkrDragonState = .;
206206
. = 0x01E7CC; gUnk_Banim_0201E7CC = .;
@@ -611,7 +611,8 @@ SECTIONS
611611
asm/xmap.o(.text);
612612
src/config.o(.text);
613613
src/augury.o(.text);
614-
asm/code.o(.text);
614+
src/playrank.o(.text);
615+
asm/playrank_0808F33C.o(.text);
615616
src/worldmap.o(.text);
616617
src/worldmapfx.o(.text);
617618
src/monologue.o(.text);
@@ -851,6 +852,7 @@ SECTIONS
851852
. = ALIGN(4); data/xmap.o(.data);
852853
. = ALIGN(4); src/config.o(.data);
853854
. = ALIGN(4); src/augury.o(.data);
855+
. = ALIGN(4); src/playrank.o(.data);
854856
. = ALIGN(4); data/data.o(.data);
855857
. = ALIGN(4); src/worldmap.o(.data);
856858
. = ALIGN(4); src/worldmapfx.o(.data);

0 commit comments

Comments
 (0)