Skip to content

Commit ae8e89a

Browse files
DizzyEgggDizzyEggg
committed
move some pokemon data to c
1 parent eb6aed5 commit ae8e89a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+32297
-20897
lines changed

‎asm/battle_frontier_1.s

+2-2
Original file line numberDiff line numberDiff line change
@@ -7171,7 +7171,7 @@ _0819270A:
71717171
ldr r4, [sp, 0x24]
71727172
cmp r4, r0
71737173
bne _08192784
7174-
ldr r0, =gTrainerClassToNameIndex
7174+
ldr r0, =gFacilityClassToTrainerClass
71757175
adds r0, 0x3C
71767176
ldrb r5, [r0]
71777177
b _081927A2
@@ -12991,7 +12991,7 @@ sub_8195938: @ 8195938
1299112991
push {r4,lr}
1299212992
adds r3, r0, 0
1299312993
movs r2, 0
12994-
ldr r4, =gTrainers + TRAINER_TUCKER * 0x28 + 0x4 @ Tucker's name
12994+
ldr r4, =(gTrainers + 806 * 0x28 + 0x4) @ TRAINER_TUCKER name
1299512995
_08195940:
1299612996
adds r0, r3, r2
1299712997
adds r1, r2, r4

‎asm/battle_frontier_2.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -29783,7 +29783,7 @@ GetTrainerEncounterMusicIdInBattlePyramind: @ 81A9F3C
2978329783
lsls r0, 16
2978429784
lsrs r0, 16
2978529785
movs r4, 0
29786-
ldr r3, =gTrainerClassToNameIndex
29786+
ldr r3, =gFacilityClassToTrainerClass
2978729787
ldr r1, =gUnknown_0203BC88
2978829788
ldr r2, [r1]
2978929789
movs r1, 0x34

‎asm/battle_tower.s

+16-16
Original file line numberDiff line numberDiff line change
@@ -1340,7 +1340,7 @@ GetFrontierTrainerFrontSpriteId: @ 8162AA0
13401340
lsls r0, 1
13411341
cmp r4, r0
13421342
bne _08162AD0
1343-
ldr r1, =gUnknown_0831F578
1343+
ldr r1, =gFacilityClassToPicIndex
13441344
ldr r0, =gSaveBlock2Ptr
13451345
ldr r0, [r0]
13461346
ldr r2, =0x00000bed
@@ -1362,7 +1362,7 @@ _08162AE4:
13621362
ldr r0, =0x0000012b
13631363
cmp r4, r0
13641364
bhi _08162B08
1365-
ldr r2, =gUnknown_0831F578
1365+
ldr r2, =gFacilityClassToPicIndex
13661366
ldr r0, =gUnknown_0203BC88
13671367
ldr r1, [r0]
13681368
movs r0, 0x34
@@ -1383,15 +1383,15 @@ _08162B08:
13831383
ands r0, r1
13841384
cmp r0, 0
13851385
beq _08162B38
1386-
ldr r4, =gUnknown_0831F578
1386+
ldr r4, =gFacilityClassToPicIndex
13871387
bl sub_818649C
13881388
lsls r0, 24
13891389
lsrs r0, 24
13901390
adds r0, r4
13911391
b _08162BC8
13921392
.pool
13931393
_08162B38:
1394-
ldr r3, =gUnknown_0831F578
1394+
ldr r3, =gFacilityClassToPicIndex
13951395
ldr r0, =gSaveBlock2Ptr
13961396
ldr r0, [r0]
13971397
ldr r1, =0xfffffed4
@@ -1413,7 +1413,7 @@ _08162B64:
14131413
ands r0, r1
14141414
cmp r0, 0
14151415
bne _08162BB0
1416-
ldr r4, =gUnknown_0831F578
1416+
ldr r4, =gFacilityClassToPicIndex
14171417
ldr r3, =gUnknown_08610970
14181418
ldr r0, =gSaveBlock2Ptr
14191419
ldr r1, [r0]
@@ -1436,7 +1436,7 @@ _08162B64:
14361436
b _08162BC8
14371437
.pool
14381438
_08162BB0:
1439-
ldr r5, =gUnknown_0831F578
1439+
ldr r5, =gFacilityClassToPicIndex
14401440
ldr r4, =gUnknown_08610970
14411441
bl sub_81864A8
14421442
lsls r0, 24
@@ -1467,7 +1467,7 @@ GetFrontierOpponentClass: @ 8162BD8
14671467
lsls r0, 1
14681468
cmp r4, r0
14691469
bne _08162C08
1470-
ldr r1, =gTrainerClassToNameIndex
1470+
ldr r1, =gFacilityClassToTrainerClass
14711471
ldr r0, =gSaveBlock2Ptr
14721472
ldr r0, [r0]
14731473
ldr r2, =0x00000bed
@@ -1499,7 +1499,7 @@ _08162C38:
14991499
ldr r0, =0x0000012b
15001500
cmp r4, r0
15011501
bhi _08162C60
1502-
ldr r2, =gTrainerClassToNameIndex
1502+
ldr r2, =gFacilityClassToTrainerClass
15031503
ldr r0, =gUnknown_0203BC88
15041504
ldr r1, [r0]
15051505
movs r0, 0x34
@@ -1521,7 +1521,7 @@ _08162C60:
15211521
ands r0, r1
15221522
cmp r0, 0
15231523
beq _08162C90
1524-
ldr r4, =gTrainerClassToNameIndex
1524+
ldr r4, =gFacilityClassToTrainerClass
15251525
bl sub_818649C
15261526
lsls r0, 24
15271527
lsrs r0, 24
@@ -1530,7 +1530,7 @@ _08162C60:
15301530
b _08162D1E
15311531
.pool
15321532
_08162C90:
1533-
ldr r3, =gTrainerClassToNameIndex
1533+
ldr r3, =gFacilityClassToTrainerClass
15341534
ldr r0, =gSaveBlock2Ptr
15351535
ldr r0, [r0]
15361536
ldr r1, =0xfffffed4
@@ -1553,7 +1553,7 @@ _08162CBC:
15531553
ands r0, r1
15541554
cmp r0, 0
15551555
beq _08162CF4
1556-
ldr r5, =gTrainerClassToNameIndex
1556+
ldr r5, =gFacilityClassToTrainerClass
15571557
ldr r4, =gUnknown_08610970
15581558
bl sub_81864A8
15591559
lsls r0, 24
@@ -1568,7 +1568,7 @@ _08162CBC:
15681568
b _08162D1E
15691569
.pool
15701570
_08162CF4:
1571-
ldr r4, =gTrainerClassToNameIndex
1571+
ldr r4, =gFacilityClassToTrainerClass
15721572
ldr r3, =gUnknown_08610970
15731573
ldr r0, =gSaveBlock2Ptr
15741574
ldr r1, [r0]
@@ -1736,7 +1736,7 @@ _08162E68:
17361736
ldr r0, =0x00000c03
17371737
cmp r5, r0
17381738
bne _08162E88
1739-
ldr r2, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 @ Steven's name
1739+
ldr r2, =gTrainers + 804 * 0x28 + 0x4 @ TRAINER_STEVEN name
17401740
_08162E70:
17411741
adds r0, r6, r4
17421742
adds r1, r4, r2
@@ -5845,7 +5845,7 @@ _08165206:
58455845

58465846
thumb_func_start GetEreaderTrainerFrontSpriteId
58475847
GetEreaderTrainerFrontSpriteId: @ 8165244
5848-
ldr r1, =gUnknown_0831F578
5848+
ldr r1, =gFacilityClassToPicIndex
58495849
ldr r0, =gSaveBlock2Ptr
58505850
ldr r0, [r0]
58515851
ldr r2, =0x00000bed
@@ -5859,7 +5859,7 @@ GetEreaderTrainerFrontSpriteId: @ 8165244
58595859

58605860
thumb_func_start GetEreaderTrainerClassId
58615861
GetEreaderTrainerClassId: @ 8165264
5862-
ldr r1, =gTrainerClassToNameIndex
5862+
ldr r1, =gFacilityClassToTrainerClass
58635863
ldr r0, =gSaveBlock2Ptr
58645864
ldr r0, [r0]
58655865
ldr r2, =0x00000bed
@@ -6193,7 +6193,7 @@ _081654DE:
61936193
adds r4, r0
61946194
adds r0, r4, 0
61956195
movs r1, 0x7
6196-
ldr r2, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 @ Steven's name
6196+
ldr r2, =gTrainers + 804 * 0x28 + 0x4 @ TRAINER_STEVEN name
61976197
bl SetMonData
61986198
movs r0, 0
61996199
str r0, [sp, 0x44]

‎asm/pokemon_1.s

+1-1
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ _08068BE0:
827827
ldrb r0, [r1, 0x13]
828828
lsls r0, 3
829829
orrs r2, r0
830-
ldr r1, =gTrainerClassToNameIndex
830+
ldr r1, =gFacilityClassToTrainerClass
831831
ldr r0, =gUnknown_08329D54
832832
lsls r2, 1
833833
adds r2, r0

‎asm/pokenav.s

+4-4
Original file line numberDiff line numberDiff line change
@@ -7890,7 +7890,7 @@ _081CAF34:
78907890
adds r0, r5, 0
78917891
bl sub_81D1BD0
78927892
adds r4, r0, 0
7893-
ldr r0, =gUnknown_0831F578
7893+
ldr r0, =gFacilityClassToPicIndex
78947894
adds r0, r4, r0
78957895
ldrb r0, [r0]
78967896
b _081CAF6C
@@ -28880,7 +28880,7 @@ sub_81D5530: @ 81D5530
2888028880
lsls r1, 24
2888128881
adds r0, r1
2888228882
lsrs r0, 24
28883-
ldr r2, =gTrainerClassToNameIndex
28883+
ldr r2, =gFacilityClassToTrainerClass
2888428884
ldr r1, =gUnknown_0203CF58
2888528885
ldr r1, [r1]
2888628886
adds r1, 0x16
@@ -28947,7 +28947,7 @@ sub_81D5588: @ 81D5588
2894728947
adds r3, r0
2894828948
ldrb r4, [r3, 0x1B]
2894928949
bl sub_81D5710
28950-
ldr r0, =gUnknown_0831F578
28950+
ldr r0, =gFacilityClassToPicIndex
2895128951
adds r4, r0
2895228952
ldrb r0, [r4]
2895328953
pop {r4}
@@ -30656,7 +30656,7 @@ sub_81D63C8: @ 81D63C8
3065630656
ldrb r4, [r3, 0x1B]
3065730657
bl sub_81D5710
3065830658
movs r2, 0
30659-
ldr r0, =gTrainerClassToNameIndex
30659+
ldr r0, =gFacilityClassToTrainerClass
3066030660
adds r4, r0
3066130661
ldrb r3, [r4]
3066230662
ldr r1, =gUnknown_0862A3B4

‎asm/trade.s

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.include "asm/macros.inc"
22
.include "constants/gba_constants.inc"
33
.include "constants/misc_constants.inc"
4-
.include "constants/species_constants.inc"
54

65
.syntax unified
76

@@ -2400,7 +2399,7 @@ _08078726:
24002399
bne _08078766
24012400
adds r0, r4, 0
24022401
movs r1, 0x2
2403-
ldr r2, =gSpeciesNames + SPECIES_SHEDINJA * POKEMON_NAME_LENGTH
2402+
ldr r2, =gSpeciesNames + 303 * POKEMON_NAME_LENGTH @ SPECIES_SHEDINJA
24042403
bl SetMonData
24052404
_08078766:
24062405
adds r4, 0x64

‎constants/constants.inc

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
.include "constants/pokemon_data_constants.inc"
66
.include "constants/item_data_constants.inc"
77
.include "constants/battle_move_constants.inc"
8-
.include "constants/trainer_constants.inc"
98
.include "constants/battle_frontier_constants.inc"
109
.include "constants/map_constants.inc"
1110
.include "constants/berry_constants.inc"

0 commit comments

Comments
 (0)