ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge with master

Browse Source
This commit is contained in:
DizzyEggg 2018-10-14 20:51:34 +02:00
commit b3ad32bbe6
200 changed files with 9130 additions and 19514 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3782
asm/battle_frontier_2.s
View File

File diff suppressed because it is too large Load Diff

30
asm/battle_tower.s
View File

@ -576,7 +576,7 @@ _0816266C:
b _081626BA
.pool
_08162698:
ldr r3, =gUnknown_08610970
ldr r3, =gApprentices
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
ldr r0, =0xfffffe70
@ -747,7 +747,7 @@ _081627E8:
b _08162836
.pool
_08162814:
ldr r3, =gUnknown_08610970
ldr r3, =gApprentices
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
ldr r0, =0xfffffe70
@ -1161,7 +1161,7 @@ _08162B64:
cmp r0, 0
bne _08162BB0
ldr r4, =gFacilityClassToPicIndex
ldr r3, =gUnknown_08610970
ldr r3, =gApprentices
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
ldr r0, =0xfffffe70
@ -1184,7 +1184,7 @@ _08162B64:
.pool
_08162BB0:
ldr r5, =gFacilityClassToPicIndex
ldr r4, =gUnknown_08610970
ldr r4, =gApprentices
bl sub_81864A8
lsls r0, 24
lsrs r0, 24
@ -1301,7 +1301,7 @@ _08162CBC:
cmp r0, 0
beq _08162CF4
ldr r5, =gFacilityClassToTrainerClass
ldr r4, =gUnknown_08610970
ldr r4, =gApprentices
bl sub_81864A8
lsls r0, 24
lsrs r0, 24
@ -1316,7 +1316,7 @@ _08162CBC:
.pool
_08162CF4:
ldr r4, =gFacilityClassToTrainerClass
ldr r3, =gUnknown_08610970
ldr r3, =gApprentices
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
ldr r0, =0xfffffe70
@ -1407,7 +1407,7 @@ _08162DC0:
ands r0, r1
cmp r0, 0
beq _08162DE8
ldr r4, =gUnknown_08610970
ldr r4, =gApprentices
bl sub_81864A8
lsls r0, 24
lsrs r0, 24
@ -1417,7 +1417,7 @@ _08162DC0:
b _08162E08
.pool
_08162DE8:
ldr r3, =gUnknown_08610970
ldr r3, =gApprentices
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
ldr r0, =0xfffffe70
@ -1578,7 +1578,7 @@ _08162F24:
_08162F3E:
adds r0, r5, 0
adds r1, r4, 0
bl sub_81A1650
bl GetApprenticeNameInLanguage
adds r1, r0, 0
adds r0, r6, 0
adds r2, r4, 0
@ -1648,7 +1648,7 @@ _08162FC0:
b _0816300E
.pool
_08162FEC:
ldr r3, =gUnknown_08610970
ldr r3, =gApprentices
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
ldr r0, =0xfffffe70
@ -1927,7 +1927,7 @@ _08163230:
ldr r1, [r6]
adds r1, r5
lsrs r2, r4, 24
bl sub_8068528
bl CreateApprenticeMon
movs r2, 0x80
lsls r2, 17
adds r4, r2
@ -2831,7 +2831,7 @@ _0816399C:
adds r0, 0x70
lsls r0, 24
lsrs r0, 24
bl sub_819F99C
bl CopyFriendsApprenticeChallengeText
_081639A8:
pop {r0}
bx r0
@ -3475,7 +3475,7 @@ _08163FCC:
adds r1, r0, 0
movs r0, 0x64
muls r0, r1
ldr r1, =gBattleScripting + 0x14
ldr r1, =gPlayerParty - 100
adds r0, r1
movs r1, 0x2C
muls r1, r4
@ -6295,7 +6295,7 @@ _08165812:
adds r0, r5
ldrb r2, [r0]
adds r0, r4, 0
bl sub_8068528
bl CreateApprenticeMon
movs r3, 0xC8
lsls r3, 1
adds r0, r7, r3
@ -6690,7 +6690,7 @@ _08165B10:
adds r1, 0x1
cmp r1, 0x10
bls _08165B10
bl sub_819FA5C
bl ResetApprenticeStruct
pop {r0}
bx r0
thumb_func_end sub_8165B08

2842
asm/cable_club.s
View File

File diff suppressed because it is too large Load Diff

4603
asm/field_effect_helpers.s
View File

File diff suppressed because it is too large Load Diff

6
asm/script_pokemon_util_80F87D8.s
View File

@ -1606,8 +1606,8 @@ _080F94D6:
.pool
thumb_func_end sub_80F94B8
thumb_func_start sub_80F94E8
sub_80F94E8: @ 80F94E8
thumb_func_start ReducePlayerPartyToThree
ReducePlayerPartyToThree: @ 80F94E8
push {r4-r7,lr}
sub sp, 0x198
add r0, sp, 0x190
@ -1662,6 +1662,6 @@ _080F9538:
pop {r0}
bx r0
.pool
thumb_func_end sub_80F94E8
thumb_func_end ReducePlayerPartyToThree
.align 2, 0 @ Don't pad with nop.

12
asm/trainer_card.s
View File

@ -1141,8 +1141,8 @@ _080C308C:
.pool
thumb_func_end sub_80C3020
thumb_func_start sub_80C30A4
sub_80C30A4: @ 80C30A4
thumb_func_start TrainerCard_GenerateCardForPlayer
TrainerCard_GenerateCardForPlayer: @ 80C30A4
push {r4,lr}
adds r4, r0, 0
movs r1, 0
@ -1197,7 +1197,7 @@ _080C3108:
pop {r0}
bx r0
.pool
thumb_func_end sub_80C30A4
thumb_func_end TrainerCard_GenerateCardForPlayer
thumb_func_start sub_80C3120
sub_80C3120: @ 80C3120
@ -4558,8 +4558,8 @@ _080C4E44:
.pool
thumb_func_end sub_80C4DDC
thumb_func_start sub_80C4E74
sub_80C4E74: @ 80C4E74
thumb_func_start TrainerCard_ShowLinkCard
TrainerCard_ShowLinkCard: @ 80C4E74
push {r4-r6,lr}
adds r4, r0, 0
adds r6, r1, 0
@ -4600,7 +4600,7 @@ sub_80C4E74: @ 80C4E74
pop {r0}
bx r0
.pool
thumb_func_end sub_80C4E74
thumb_func_end TrainerCard_ShowLinkCard
thumb_func_start sub_80C4EE4
sub_80C4EE4: @ 80C4EE4

523
data/battle_frontier_2.s
View File

@ -6,529 +6,6 @@
.section .rodata
.align 2 @ struct, eight bytes x6 for names in different languages, then 0x28 more bytes of data
gUnknown_08610970:: @ 8610970
.string "サダヒロ$", 8
.string "ALANN$", 8
.string "ALAIN$", 8
.string "ADELFO$", 8
.string "CLAUS$", 8
.string "TEO$", 8
.byte 0xC9, 0xBD
.2byte 0x43
.2byte SPECIES_BEAUTIFLY, SPECIES_DUSTOX, SPECIES_ILLUMISE, SPECIES_SHIFTRY, SPECIES_BRELOOM, SPECIES_NINJASK, SPECIES_SHEDINJA, SPECIES_PINSIR, SPECIES_HERACROSS, SPECIES_VOLBEAT, 0
.byte 0x1D, 8, 0x3e, 20, 0, 12, 1, 10, 0x30, 6, 0x44, 20, 0, 0
.string "ヒロオ$", 8
.string "LIONEL$", 8
.string "LIONEL$", 8
.string "CAIO$", 8
.string "LUDWIG$", 8
.string "LEO$", 8
.byte 0x9, 0xCF
.2byte 0x2B
.2byte SPECIES_SWELLOW, SPECIES_SWALOT, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_TORKOAL, SPECIES_HARIYAMA, SPECIES_MIGHTYENA, SPECIES_LUDICOLO, SPECIES_CRAWDAUNT, SPECIES_WHISCASH, 1
.byte 0x38, 12, 1, 10, 0x30, 6, 6, 10, 0x20, 0x10, 0x13, 0x22, 0, 0
.string "ケイジ$", 8
.string "SONNY$", 8
.string "HERVE$", 8
.string "FEDRO$", 8
.string "WENZEL$", 8
.string "SANTI$", 8
.byte 0x34, 0x2E
.2byte 0x26
.2byte SPECIES_LINOONE, SPECIES_MIGHTYENA, SPECIES_WHISCASH, SPECIES_ZANGOOSE, SPECIES_SEVIPER, SPECIES_NINETALES, SPECIES_KECLEON, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_MACHAMP, 2
.byte 1, 10, 10, 0x16, 0x15, 14, 0x30, 6, 0x3b, 12, 0x4, 12, 0, 0
.string "ユラ$", 8
.string "LAYLA$", 8
.string "LAYLA$", 8
.string "ASTRID$", 8
.string "SONJA$", 8
.string "LOLA$", 8
.byte 0xEF, 0x84
.2byte 0x47
.2byte SPECIES_SWALOT, SPECIES_XATU, SPECIES_ALTARIA, SPECIES_GOLDUCK, SPECIES_FLYGON, SPECIES_ALAKAZAM, SPECIES_GARDEVOIR, SPECIES_WAILORD, SPECIES_GRUMPIG, SPECIES_MIGHTYENA, 3
.byte 11, 16, 15, 0x1e, 0x39, 16, 0x21, 0x14, 0x3, 12, 0xff, 0xff, 0, 0
.string "ヨウカ$", 8
.string "MACY$", 8
.string "AMELIE$", 8
.string "CLEO$", 8
.string "MARIA$", 8
.string "ELISA$", 8
.byte 0x43, 0x1E
.2byte 0x27
.2byte SPECIES_WIGGLYTUFF, SPECIES_LINOONE, SPECIES_KINGDRA, SPECIES_DELCATTY, SPECIES_RAICHU, SPECIES_FEAROW, SPECIES_STARMIE, SPECIES_MEDICHAM, SPECIES_SHIFTRY, SPECIES_BEAUTIFLY, 4
.byte 15, 0x1e, 0x14, 16, 6, 16, 15, 0x28, 0x1c, 0x1c, 0x13, 0x1c, 0, 0
.string "ヤスシ$", 8
.string "DONTE$", 8
.string "BRAHIM$", 8
.string "GLAUCO$", 8
.string "JOSEF$", 8
.string "ROQUE$", 8
.byte 0x9F, 0x37
.2byte 0x30
.2byte SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_AGGRON, SPECIES_MAGNETON, SPECIES_MACHAMP, SPECIES_ARMALDO, SPECIES_HERACROSS, SPECIES_NOSEPASS, SPECIES_EXPLOUD, SPECIES_MIGHTYENA, 5
.byte 0x29, 0x0A, 0x08, 0x14, 0x2F, 0x10, 0x38, 0x16, 0x20, 0x08, 0x00, 0x0C, 0x00, 0
.string "ミサオ$", 8
.string "AMIRA$", 8
.string "LAURE$", 8
.string "DAFNE$", 8
.string "AMELIE$", 8
.string "LARA$", 8
.byte 0x55, 0xF5
.2byte 0x31
.2byte SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_MAGNETON, SPECIES_MEDICHAM, SPECIES_MIGHTYENA, SPECIES_GLALIE, SPECIES_GOLEM, SPECIES_ELECTRODE, SPECIES_PELIPPER, SPECIES_SHARPEDO, 6
.byte 0x0B, 0x0C, 0x3E, 0x12, 0x00, 0x0C, 0x31, 0x0A, 0x30, 0x14, 0x00, 0x0C, 0x00, 0x00
.string "カズサ$", 8
.string "KALI$", 8
.string "JODIE$", 8
.string "ILENIA$", 8
.string "KARO$", 8
.string "ELSA$", 8
.byte 0x26, 0x8D
.2byte 0x14
.2byte SPECIES_NINETALES, SPECIES_ALAKAZAM, SPECIES_SCEPTILE, SPECIES_SALAMENCE, SPECIES_GOLDUCK, SPECIES_MAWILE, SPECIES_WEEZING, SPECIES_LANTURN, SPECIES_GARDEVOIR, SPECIES_MILOTIC, 7
.byte 0x06, 0x0A, 0x20, 0x06, 0x1F, 0x0A, 0x02, 0x0A, 0x03, 0x0C, 0xFF, 0xFF, 0x00, 0x00
.string "スミレ$", 8
.string "ANNIE$", 8
.string "ANNIE$", 8
.string "IMELDA$", 8
.string "INES$", 8
.string "ROSA$", 8
.byte 0xC, 0x80
.2byte 0xD
.2byte SPECIES_SCEPTILE, SPECIES_VILEPLUME, SPECIES_BELLOSSOM, SPECIES_ROSELIA, SPECIES_CORSOLA, SPECIES_FLYGON, SPECIES_BRELOOM, SPECIES_MILOTIC, SPECIES_ALTARIA, SPECIES_CRADILY, 8
.byte 0x22, 0x1E, 0x33, 0x04, 0x0E, 0x02, 0x02, 0x0A, 0x1E, 0x10, 0x00, 0x0C, 0x00, 0x00
.string "アキノリ$", 8
.string "DILLEN$", 8
.string "RENE$", 8
.string "INDRO$", 8
.string "DETLEF$", 8
.string "PEDRO$", 8
.byte 0x9f, 0x46
.2byte 0
.2byte SPECIES_SKARMORY, SPECIES_GOLEM, SPECIES_BLAZIKEN, SPECIES_CAMERUPT, SPECIES_DONPHAN, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_TROPIUS, SPECIES_SOLROCK, SPECIES_RHYDON, 9
.byte 0x3D, 0x0A, 0x11, 0x10, 0x1E, 0x0E, 0x1C, 0x20, 0x04, 0x0C, 0xFF, 0xFF, 0x00, 0x00
.string "トウゾウ$", 8
.string "DALLAS$", 8
.string "BRUNO$", 8
.string "LEARCO$", 8
.string "ANSGAR$", 8
.string "MANOLO$", 8
.byte 0xFC, 0x71
.2byte 0x2D
.2byte SPECIES_SEAKING, SPECIES_STARMIE, SPECIES_GOLDUCK, SPECIES_TENTACRUEL, SPECIES_OCTILLERY, SPECIES_GOREBYSS, SPECIES_GLALIE, SPECIES_WAILORD, SPECIES_SHARPEDO, SPECIES_KINGDRA, 10
.byte 0x05, 0x0A, 0x06, 0x06, 0x0E, 0x16, 0x14, 0x0A, 0x00, 0x0C, 0xFF, 0xFF, 0x00, 0x00
.string "セイヤ$", 8
.string "FRANK$", 8
.string "FRANK$", 8
.string "OLINDO$", 8
.string "FRANK$", 8
.string "MAURO$", 8
.byte 0x9E, 0xA3
.2byte 0x3A
.2byte SPECIES_QUAGSIRE, SPECIES_STARMIE, SPECIES_PELIPPER, SPECIES_CRAWDAUNT, SPECIES_WAILORD, SPECIES_GYARADOS, SPECIES_SWAMPERT, SPECIES_LANTURN, SPECIES_WHISCASH, SPECIES_SHUCKLE, 11
.byte 0x0E, 0x28, 0x3D, 0x10, 0x0F, 0x24, 0x14, 0x0A, 0x23, 0x1E, 0x24, 0x10, 0x00, 0x00
.string "リュウジ$", 8
.string "LAMONT$", 8
.string "XAV$", 8
.string "ORFEO$", 8
.string "JÜRGEN$", 8
.string "JORGE$", 8
.byte 0x90, 0xE5
.2byte 0x19
.2byte SPECIES_ABSOL, SPECIES_CROBAT, SPECIES_EXPLOUD, SPECIES_MAGNETON, SPECIES_SHARPEDO, SPECIES_MANECTRIC, SPECIES_METAGROSS, SPECIES_ELECTRODE, SPECIES_NOSEPASS, SPECIES_WEEZING, 12
.byte 0x20, 0x10, 0x2E, 0x06, 0x0B, 0x10, 0x22, 0x1E, 0x0F, 0x1E, 0x0B, 0x10, 0x00, 0x00
.string "カツアキ$", 8
.string "TYRESE$", 8
.string "ANDY$", 8
.string "PARIDE$", 8
.string "DAVID$", 8
.string "CHICHO$", 8
.byte 0x18, 0xD0
.2byte 10
.2byte SPECIES_BLAZIKEN, SPECIES_GOLEM, SPECIES_MACHAMP, SPECIES_RHYDON, SPECIES_HARIYAMA, SPECIES_AGGRON, SPECIES_MEDICHAM, SPECIES_ZANGOOSE, SPECIES_VIGOROTH, SPECIES_SLAKING, 13
.byte 0x29, 0x0A, 0x3A, 0x06, 0x15, 0x0E, 0x35, 0x14, 0x34, 0x10, 0x1E, 0x06, 0x00, 0x00
.string "トシミツ$", 8
.string "DANTE$", 8
.string "DANTE$", 8
.string "RAOUL$", 8
.string "LOTHAR$", 8
.string "PABLO$", 8
.byte 0x75, 0xBC
.2byte 14
.2byte SPECIES_SCEPTILE, SPECIES_SANDSLASH, SPECIES_FLYGON, SPECIES_CLAYDOL, SPECIES_ARMALDO, SPECIES_CROBAT, SPECIES_CRADILY, SPECIES_SOLROCK, SPECIES_LUNATONE, SPECIES_GOLEM, 14
.byte 0x01, 0x0A, 0x17, 0x10, 0x43, 0x12, 0x22, 0x1E, 0x0B, 0x10, 0x0F, 0x28, 0x00, 0x00
.string "ローウェン$", 8
.string "ARTURO$", 8
.string "ARTURO$", 8
.string "ROMOLO$", 8
.string "BRIAN$", 8
.string "ARTURO$", 8
.byte 0x2, 0xFA
.2byte 0x20
.2byte SPECIES_ABSOL, SPECIES_MIGHTYENA, SPECIES_ALAKAZAM, SPECIES_BANETTE, SPECIES_NINETALES, SPECIES_CLAYDOL, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_WALREIN, SPECIES_DUSCLOPS, 15
.byte 0x0F, 0x1E, 0x04, 0x14, 0x2F, 0x10, 0x06, 0x10, 0x20, 0x10, 0x03, 0x0E, 0x00, 0x00
.align 2
gUnknown_08610EF0:: @ 8610EF0
.4byte gText_082B7229
.4byte gText_082B731C
.4byte gText_082B735B
.4byte gText_082B7423
.4byte gText_082B74C1
.4byte gText_082B756F
.4byte gText_082B75B2
.4byte gText_082B763F
.4byte gText_082B76AC
.4byte gText_082B7772
.4byte gText_082B77CE
.4byte gText_082B7871
.4byte gText_082B78D4
.4byte gText_082B7B1A
.4byte gText_082B7C13
.4byte gText_082B7D18
.4byte gText_082B7DD4
.4byte gText_082B7EE5
.4byte gText_082B7F35
.4byte gText_082B7FE8
.4byte gText_082B8087
.4byte gText_082B822B
.4byte gText_082B8286
.4byte gText_082B8356
.4byte gText_082B83CE
.4byte gText_082B84FC
.4byte gText_082B8559
.4byte gText_082B8656
.4byte gText_082B86EA
.4byte gText_082B87DA
.4byte gText_082B887C
.4byte gText_082B8957
.4byte gText_082B89C6
.4byte gText_082B8ACF
.4byte gText_082B8B66
.4byte gText_082B8C20
.4byte gText_082B8CAA
.4byte gText_082B8DD3
.4byte gText_082B8E24
.4byte gText_082B8ED5
.4byte gText_082B8F45
.4byte gText_082B905F
.4byte gText_082B910E
.4byte gText_082B9204
.4byte gText_082B929C
.4byte gText_082B9438
.4byte gText_082B9488
.4byte gText_082B9564
.4byte gText_082B95D8
.4byte gText_082B9763
.4byte gText_082B97E5
.4byte gText_082B989A
.4byte gText_082B992D
.4byte gText_082B9A84
.4byte gText_082B9AB9
.4byte gText_082B9B76
.4byte gText_082B9BF2
.4byte gText_082B9D83
.4byte gText_082B9DF9
.4byte gText_082B9EAA
.4byte gText_082B9F55
.4byte gText_082BA084
.4byte gText_082BA11D
.4byte gText_082BA1F3
.align 2
gUnknown_08610FF0:: @ 8610FF0
.4byte gText_082BE50D
.4byte gText_082BE5F5
.4byte gText_082BE679
.4byte gText_082BE71E
.4byte gText_082BE762
.4byte gText_082BE7F8
.4byte gText_082BE850
.4byte gText_082BE99C
.4byte gText_082BEA1B
.4byte gText_082BEAE9
.4byte gText_082BEB72
.4byte gText_082BEC8E
.4byte gText_082BED16
.4byte gText_082BEE29
.4byte gText_082BEEB4
.4byte gText_082BEFE2
.4byte gText_082BF04E
.4byte gText_082BF11D
.4byte gText_082BF1A8
.4byte gText_082BF268
.4byte gText_082BF2D1
.4byte gText_082BF3CF
.4byte gText_082BF46A
.4byte gText_082BF551
.4byte gText_082BF5C3
.4byte gText_082BF6E5
.4byte gText_082BF773
.4byte gText_082BF869
.4byte gText_082BF8DD
.4byte gText_082BF9BA
.4byte gText_082BFA5A
.4byte gText_082BFB4E
.align 2
gUnknown_08611070:: @ 8611070
.4byte gText_082BA2A3
.4byte gText_082BA34E
.4byte gText_082BA380
.4byte gText_082BA3D2
.4byte gText_082BA448
.4byte gText_082BA4D3
.4byte gText_082BA58C
.4byte gText_082BA5BF
.4byte gText_082BA5F3
.4byte gText_082BA635
.4byte gText_082BA6E6
.4byte gText_082BA742
.4byte gText_082BA770
.4byte gText_082BA78F
.4byte gText_082BA7D8
.4byte gText_082BA867
.4byte gText_082BA96B
.4byte gText_082BA9B7
.4byte gText_082BAA1B
.4byte gText_082BAA81
.4byte gText_082BAB22
.4byte gText_082BAC43
.4byte gText_082BAC78
.4byte gText_082BAD17
.4byte gText_082BADB6
.4byte gText_082BAE36
.4byte gText_082BAF4E
.4byte gText_082BAF8F
.4byte gText_082BAFDB
.4byte gText_082BB05F
.4byte gText_082BB0D4
.4byte gText_082BB18C
.4byte gText_082BB1CE
.4byte gText_082BB242
.4byte gText_082BB2D9
.4byte gText_082BB370
.4byte gText_082BB4C3
.4byte gText_082BB4FB
.4byte gText_082BB575
.4byte gText_082BB5E1
.4byte gText_082BB656
.4byte gText_082BB6E5
.4byte gText_082BB72C
.4byte gText_082BB7A2
.4byte gText_082BB84A
.4byte gText_082BB8CD
.4byte gText_082BB970
.4byte gText_082BB9AE
.4byte gText_082BBA05
.4byte gText_082BBA6C
.4byte gText_082BBB01
.4byte gText_082BBC1C
.4byte gText_082BBC4B
.4byte gText_082BBCF6
.4byte gText_082BBD90
.4byte gText_082BBE0B
.4byte gText_082BBEE5
.4byte gText_082BBF25
.4byte gText_082BBFA4
.4byte gText_082BC024
.4byte gText_082BC0C8
.4byte gText_082BC213
.4byte gText_082BC247
.4byte gText_082BC2DD
.4byte gText_082BC373
.4byte gText_082BC40E
.4byte gText_082BC514
.4byte gText_082BC555
.4byte gText_082BC5CE
.4byte gText_082BC666
.4byte gText_082BC714
.4byte gText_082BC808
.4byte gText_082BC84D
.4byte gText_082BC8EA
.4byte gText_082BC984
.4byte gText_082BCA4D
.4byte gText_082BCB75
.4byte gText_082BCBA6
.4byte gText_082BCBFC
.4byte gText_082BCCA4
.align 2
gUnknown_086111B0:: @ 86111B0
.4byte gText_082BFBF2
.4byte gText_082BFCAE
.4byte gText_082BFD26
.4byte gText_082BFDB1
.4byte gText_082BFE24
.4byte gText_082BFEAD
.4byte gText_082BFF0A
.4byte gText_082C0032
.4byte gText_082C0090
.4byte gText_082C016E
.4byte gText_082C01F7
.4byte gText_082C034C
.4byte gText_082C03CA
.4byte gText_082C046E
.4byte gText_082C04F9
.4byte gText_082C0598
.4byte gText_082C0602
.4byte gText_082C06D8
.4byte gText_082C074A
.4byte gText_082C0809
.4byte gText_082C086E
.4byte gText_082C0982
.4byte gText_082C0A1D
.4byte gText_082C0AFD
.4byte gText_082C0B6F
.4byte gText_082C0C7D
.4byte gText_082C0D0B
.4byte gText_082C0DFE
.4byte gText_082C0E71
.4byte gText_082C0F6D
.4byte gText_082C1003
.4byte gText_082C1122
.align 2
gUnknown_08611230:: @ 8611230
.4byte gText_082BCD68
.4byte gText_082BCE64
.4byte gText_082BCEF2
.4byte gText_082BCF61
.4byte gText_082BCFA1
.4byte gText_082BD03C
.4byte gText_082BD06D
.4byte gText_082BD18A
.4byte gText_082BD222
.4byte gText_082BD325
.4byte gText_082BD3B1
.4byte gText_082BD493
.4byte gText_082BD51C
.4byte gText_082BD609
.4byte gText_082BD697
.4byte gText_082BD797
.4byte gText_082BD806
.4byte gText_082BD8F5
.4byte gText_082BD9BE
.4byte gText_082BDAE1
.4byte gText_082BDB4E
.4byte gText_082BDC6B
.4byte gText_082BDD0D
.4byte gText_082BDDEC
.4byte gText_082BDE68
.4byte gText_082BDF4D
.4byte gText_082BDFD8
.4byte gText_082BE0FD
.4byte gText_082BE189
.4byte gText_082BE2A5
.4byte gText_082BE33E
.4byte gText_082BE46C
.align 2
gUnknown_086112B0:: @ 86112B0
.4byte gText_082C11D1
.4byte gText_082C12D5
.4byte gText_082C13AB
.4byte gText_082C1444
.4byte gText_082C1501
.4byte gText_082C15B6
.4byte gText_082C165E
.4byte gText_082C174F
.4byte gText_082C1862
.4byte gText_082C19A0
.4byte gText_082C1A76
.4byte gText_082C1C16
.4byte gText_082C1CF5
.4byte gText_082C1DC1
.4byte gText_082C1EDC
.4byte gText_082C1FEC
.4byte gText_082C20D1
.4byte gText_082C21FF
.4byte gText_082C231C
.4byte gText_082C2407
.4byte gText_082C24B5
.4byte gText_082C25B1
.4byte gText_082C2707
.4byte gText_082C27D4
.4byte gText_082C28D6
.4byte gText_082C2A0B
.4byte gText_082C2B50
.4byte gText_082C2C77
.4byte gText_082C2D67
.4byte gText_082C2E41
.4byte gText_082C2EF5
.4byte gText_082C3023
.align 2
gUnknown_08611330:: @ 8611330
.4byte gText_082B6EA5
.4byte gText_082B6EEC
.4byte gText_082B6F16
.4byte gText_082B6F4C
.4byte gText_082B6F92
.4byte gText_082B6FC9
.4byte gText_082B700C
.4byte gText_082B703A
.4byte gText_082B706A
.4byte gText_082B709C
.4byte gText_082B70CC
.4byte gText_082B710A
.4byte gText_082B714D
.4byte gText_082B7185
.4byte gText_082B71C1
.4byte gText_082B71F9
gUnknown_08611370:: @ 8611370
.byte 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00
.byte 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01
.byte 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01
.byte 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01
.byte 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
.byte 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01
.byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01
.byte 0x01, 0x01, 0x01
gUnknown_086114D3:: @ 86114D3
.byte 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_086114E0:: @ 86114E0
.4byte sub_81A093C
.4byte sub_81A0964
.4byte sub_81A0978
.4byte sub_819FC60
.4byte sub_81A0984
.4byte sub_81A0990
.4byte sub_81A09D0
.4byte sub_81A0A20
.4byte sub_81A0C9C
.4byte sub_81A087C
.4byte sub_81A1638
.4byte sub_81A0CC0
.4byte sub_81A09B4
.4byte sub_81A0D40
.4byte sub_81A0DD4
.4byte sub_81A0FE4
.4byte sub_81A0FFC
.4byte sub_81A0D80
.4byte sub_81A11F8
.4byte sub_81A1218
.4byte sub_81A1224
.4byte sub_81A1438
.4byte sub_81A150C
.4byte sub_81A15A4
.4byte sub_81A1644
.4byte sub_81A1370
.align 2
gUnknown_08611548:: @ 8611548
.byte 0x00, 0x01, 0x02, 0x03, 0x06, 0x07, 0x08, 0x09
.align 2
gUnknown_08611550:: @ 8611550
.byte 0x23, 0x46, 0x23, 0x01, 0x04, 0x09, 0x05, 0x00, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x38, 0x1c, 0x01, 0x15, 0x2a, 0x15, 0x01, 0x1c, 0x8c, 0x38, 0x01, 0x15, 0x46, 0x23, 0x00

16
data/cable_club.s
View File

@ -1,16 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2, 0
.align 2
gUnknown_08550594:: @ 8550594
window_template 0x00, 0x10, 0x0b, 0x0b, 0x02, 0x0f, 0x0125
.align 2
gUnknown_0855059C:: @ 855059C
.4byte gText_BronzeCard
.4byte gText_CopperCard
.4byte gText_SilverCard
.4byte gText_GoldCard

2979
data/event_scripts.s
View File

File diff suppressed because it is too large Load Diff

27
data/field_effect_helpers.s
View File

@ -2,31 +2,10 @@
.include "constants/constants.inc"
.section .rodata
gUnknown_085CDC38:: @ 85CDC38
.2byte 12, 28, 44
gUnknown_085CDC3E:: @ 85CDC3E
.byte 0x00, 0x01, 0x02, 0x03
gUnknown_085CDC42:: @ 85CDC42
.2byte 0x0004, 0x0004, 0x0004, 0x0010, 0x0000
gUnknown_085CDC4C:: @ 85CDC4C
.4byte sub_8154C7C
.4byte sub_8154CA0
gUnknown_085CDC54:: @ 85CDC54
.4byte sub_815547C
.4byte sub_81554AC
.4byte sub_815550C
gUnknown_085CDC60:: @ 85CDC60
.byte 0, 0, 1, 2, 3, 0, 0, 1, 1
.byte 0
.align 1
gUnknown_085CDC6A:: @ 85CDC6A
.2byte 3, 7
gUnknown_085CDC6E:: @ 85CDC6E
@the following might be unref, not sure
.byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00

2
data/maps/BattleFrontier_BattleTowerLobby/events.inc
View File

@ -4,7 +4,7 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638
object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0
object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0
object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918
object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701
object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, 701
object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0
object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0
object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0

6
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
View File

@ -12,7 +12,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E690: @ 823E690
BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694
call BattleFrontier_BattleTowerLobby_EventScript_28CC84
setvar VAR_0x8004, 10
special sub_81A085C
special CallApprenticeFunction
compare VAR_0x8004, 0
goto_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5
checkflag FLAG_0x934
@ -21,7 +21,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694
BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5
clearflag FLAG_0x2BD
setvar VAR_0x8004, 23
special sub_81A085C
special CallApprenticeFunction
BattleFrontier_BattleTowerLobby_EventScript_23E6C0:: @ 823E6C0
end
@ -929,7 +929,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F2B7:: @ 823F2B7
BattleFrontier_BattleTowerLobby_EventScript_23F2C5:: @ 823F2C5
setvar VAR_0x8004, 9
message OldaleTown_PokemonCenter_2F_Text_278091
message gText_PleaseWaitForLink
waitmessage
setvar VAR_0x8005, 0
special sub_80B2DA4

2
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
View File

@ -260,7 +260,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C
goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA
MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032
special sub_80F94E8
special ReducePlayerPartyToThree
setvar VAR_0x8004, 2
setvar VAR_0x8005, 4
special sub_81A1780

2
data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
View File

@ -106,7 +106,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
compare VAR_RESULT, 0
goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
special SavePlayerParty
special sub_80F94E8
special ReducePlayerPartyToThree
msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, 4
closemessage
compare VAR_FACING, 2

2869
data/scripts/apprentice.inc Normal file
View File

File diff suppressed because it is too large Load Diff

14
data/scripts/cable_club.inc
View File

@ -430,7 +430,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60
call OldaleTown_PokemonCenter_2F_EventScript_27134F
compare VAR_RESULT, 0
goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
message OldaleTown_PokemonCenter_2F_Text_278091
message gText_PleaseWaitForLink
waitmessage
special sub_80B2DA4
waitstate
@ -532,7 +532,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2
call OldaleTown_PokemonCenter_2F_EventScript_27134F
compare VAR_RESULT, 0
goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
message OldaleTown_PokemonCenter_2F_Text_278091
message gText_PleaseWaitForLink
waitmessage
special sub_80B2E4C
waitstate
@ -607,7 +607,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB
call OldaleTown_PokemonCenter_2F_EventScript_27134F
compare VAR_RESULT, 0
goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
message OldaleTown_PokemonCenter_2F_Text_278091
message gText_PleaseWaitForLink
waitmessage
special sub_80B2E74
waitstate
@ -1675,21 +1675,21 @@ OldaleTown_PokemonCenter_2F_Text_278061: @ 8278061
.string "A POKéMON holding the {STR_VAR_1}\n"
.string "BERRY can’t be traded.$"
OldaleTown_PokemonCenter_2F_Text_278091:: @ 8278091
gText_PleaseWaitForLink:: @ 8278091
.string "Please wait.\n"
.string "… … B Button: Cancel$"
OldaleTown_PokemonCenter_2F_Text_2780B3:: @ 82780B3
gText_ConfirmLinkWhenPlayersReady:: @ 82780B3
.string "When all players are ready…\n"
.string "A Button: Confirm\l"
.string "B Button: Cancel$"
OldaleTown_PokemonCenter_2F_Text_2780F2:: @ 82780F2
gText_ConfirmStartLinkWithXPlayers:: @ 82780F2
.string "Start link with {STR_VAR_1} players.\n"
.string "A Button: Confirm\l"
.string "B Button: Cancel$"
OldaleTown_PokemonCenter_2F_Text_278131:: @ 8278131
gText_AwaitingLinkup:: @ 8278131
.string "Awaiting linkup…\n"
.string "… … B Button: Cancel$"

4
data/specials.inc
View File

@ -259,7 +259,7 @@ gSpecials:: @ 81DBA64
def_special sub_80F9490
def_special ValidateEReaderTrainer
def_special GetBestBattleTowerStreak
def_special sub_80F94E8
def_special ReducePlayerPartyToThree
def_special BedroomPC
def_special PlayerPC
def_special FieldShowRegionMap
@ -415,7 +415,7 @@ gSpecials:: @ 81DBA64
def_special sub_818E990
def_special PutLilycoveContestLadyShowOnTheAir
def_special sub_813B880
def_special sub_81A085C
def_special CallApprenticeFunction
def_special ShouldTryGetTrainerScript
def_special ShowMapNamePopup
def_special ShowMapNamePopup

24
include/apprentice.h Normal file
View File

@ -0,0 +1,24 @@
#ifndef GUARD_APPRENTICE_H
#define GUARD_APPRENTICE_H
#define APPRENTICE_SPECIES_COUNT 10
struct ApprenticeTrainer
{
u8 name[6][PLAYER_NAME_LENGTH + 1]; // For all six languages.
u16 otId;
u8 facilityClass;
u16 species[APPRENTICE_SPECIES_COUNT];
u8 rest[14];
};
extern const struct ApprenticeTrainer gApprentices[];
void CopyFriendsApprenticeChallengeText(u8 saveblockApprenticeId);
void Apprentice_EnableBothScriptContexts(void);
void ResetApprenticeStruct(struct Apprentice *apprentice);
void ResetAllApprenticeData(void);
void CallApprenticeFunction(void);
const u8 *GetApprenticeNameInLanguage(u32 apprenticeId, s32 language);
#endif // GUARD_APPRENTICE_H

195
include/battle.h
View File

@ -28,8 +28,8 @@
#define B_ACTION_SAFARI_POKEBLOCK 6
#define B_ACTION_SAFARI_GO_NEAR 7
#define B_ACTION_SAFARI_RUN 8
#define B_ACTION_WALLY_THROW 9
// The exact purposes of these are unclear
#define B_ACTION_WALLY_THROW 9
#define B_ACTION_EXEC_SCRIPT 10 // when executing an action
#define B_ACTION_CANCEL_PARTNER 12 // when choosing an action
#define B_ACTION_FINISHED 12 // when executing an action
@ -131,38 +131,38 @@ struct UnknownFlags
struct DisableStruct
{
/*0x00*/ u32 transformedMonPersonality;
/*0x04*/ u16 disabledMove;
/*0x06*/ u16 encoredMove;
/*0x08*/ u8 protectUses;
/*0x09*/ u8 stockpileCounter;
/*0x0A*/ u8 substituteHP;
/*0x0B*/ u8 disableTimer1:4;
/*0x0B*/ u8 disableTimer2:4;
/*0x0C*/ u8 encoredMovePos;
/*0x0D*/ u8 unkD;
/*0x0E*/ u8 encoreTimer1:4;
/*0x0E*/ u8 encoreTimer2:4;
/*0x0F*/ u8 perishSongTimer1:4;
/*0x0F*/ u8 perishSongTimer2:4;
/*0x10*/ u8 furyCutterCounter;
/*0x11*/ u8 rolloutCounter1:4;
/*0x11*/ u8 rolloutCounter2:4;
/*0x12*/ u8 chargeTimer1:4;
/*0x12*/ u8 chargeTimer2:4;
/*0x13*/ u8 tauntTimer1:4;
/*0x13*/ u8 tauntTimer2:4;
/*0x14*/ u8 battlerPreventingEscape;
/*0x15*/ u8 battlerWithSureHit;
/*0x16*/ u8 isFirstTurn;
/*0x17*/ u8 unk17;
/*0x18*/ u8 truantCounter:1;
/*0x18*/ u8 truantUnknownBit:1;
/*0x18*/ u8 unk18_a_2:2;
/*0x18*/ u8 unk18_b:4;
/*0x19*/ u8 rechargeCounter;
/*0x1A*/ u8 autonomizeCount;
/*0x1B*/ u8 slowStartTimer;
u32 transformedMonPersonality;
u16 disabledMove;
u16 encoredMove;
u8 protectUses;
u8 stockpileCounter;
u8 substituteHP;
u8 disableTimer:4;
u8 disableTimerStartValue:4;
u8 encoredMovePos;
u8 filler_D; // Unused field.
u8 encoreTimer:4;
u8 encoreTimerStartValue:4;
u8 perishSongTimer:4;
u8 perishSongTimerStartValue:4;
u8 furyCutterCounter;
u8 rolloutTimer:4;
u8 rolloutTimerStartValue:4;
u8 chargeTimer:4;
u8 chargeTimerStartValue:4;
u8 tauntTimer:4;
u8 tauntTimer2:4;
u8 battlerPreventingEscape;
u8 battlerWithSureHit;
u8 isFirstTurn;
u8 unk17;
u8 truantCounter:1;
u8 truantUnknownBit:1;
u8 unk18_a_2:2;
u8 unk18_b:4;
u8 rechargeTimer;
u8 autonomizeCount;
u8 slowStartTimer;
u8 embargoTimer;
u8 magnetRiseTimer;
u8 telekinesisTimer;
@ -174,34 +174,34 @@ struct DisableStruct
struct ProtectStruct
{
u8 protected:1;
u8 wideGuarded:1;
u8 quickGuarded:1;
u8 spikyShielded:1;
u8 kingsShielded:1;
u8 banefulBunkered:1;
u8 endured:1;
u8 noValidMoves:1;
u8 helpingHand:1;
u8 bounceMove:1;
u8 stealMove:1;
u8 flag0Unknown:1;
u8 prlzImmobility:1;
u8 confusionSelfDmg:1;
u8 targetNotAffected:1;
u8 chargingTurn:1;
u8 fleeFlag:2; // for RunAway and Smoke Ball
u8 usedImprisionedMove:1;
u8 loveImmobility:1;
u8 usedDisabledMove:1;
u8 usedTauntedMove:1;
u8 flag2Unknown:1;
u8 flinchImmobility:1;
u8 notFirstStrike:1;
u8 flag_x10:1;
u8 usesBouncedMove:1;
u8 usedHealBlockedMove:1;
u8 usedGravityPreventedMove:1;
u32 protected:1;
u32 wideGuarded:1;
u32 quickGuarded:1;
u32 spikyShielded:1;
u32 kingsShielded:1;
u32 banefulBunkered:1;
u32 endured:1;
u32 noValidMoves:1;
u32 helpingHand:1;
u32 bounceMove:1;
u32 stealMove:1;
u32 flag0Unknown:1;
u32 prlzImmobility:1;
u32 confusionSelfDmg:1;
u32 targetNotAffected:1;
u32 chargingTurn:1;
u32 fleeFlag:2; // For RunAway and Smoke Ball.
u32 usedImprisionedMove:1;
u32 loveImmobility:1;
u32 usedDisabledMove:1;
u32 usedTauntedMove:1;
u32 flag2Unknown:1;
u32 flinchImmobility:1;
u32 notFirstStrike:1;
u32 flag_x10:1;
u32 usesBouncedMove:1;
u32 usedHealBlockedMove:1;
u32 usedGravityPreventedMove:1;
u32 physicalDmg;
u32 specialDmg;
u8 physicalBattlerId;
@ -210,12 +210,12 @@ struct ProtectStruct
struct SpecialStatus
{
u8 statLowered:1; // 0x1
u8 lightningRodRedirected:1; // 0x2
u8 restoredBattlerSprite: 1; // 0x4
u8 intimidatedMon:1; // 0x8
u8 traced:1; // 0x10
u8 flag20:1;
u8 statLowered:1;
u8 lightningRodRedirected:1;
u8 restoredBattlerSprite: 1;
u8 intimidatedMon:1;
u8 traced:1;
u8 ppNotAffectedByPressure:1;
u8 flag40:1;
u8 focusBanded:1;
u8 focusSashed:1;
@ -227,23 +227,21 @@ struct SpecialStatus
s32 specialDmg;
u8 physicalBattlerId;
u8 specialBattlerId;
u8 field12;
u8 field13;
};
struct SideTimer
{
/*0x00*/ u8 reflectTimer;
/*0x01*/ u8 reflectBattlerId;
/*0x02*/ u8 lightscreenTimer;
/*0x03*/ u8 lightscreenBattlerId;
/*0x04*/ u8 mistTimer;
/*0x05*/ u8 mistBattlerId;
/*0x06*/ u8 safeguardTimer;
/*0x07*/ u8 safeguardBattlerId;
/*0x08*/ u8 followmeTimer;
/*0x09*/ u8 followmeTarget;
/*0x0A*/ u8 spikesAmount;
u8 reflectTimer;
u8 reflectBattlerId;
u8 lightscreenTimer;
u8 lightscreenBattlerId;
u8 mistTimer;
u8 mistBattlerId;
u8 safeguardTimer;
u8 safeguardBattlerId;
u8 followmeTimer;
u8 followmeTarget;
u8 spikesAmount;
u8 toxicSpikesAmount;
u8 stealthRockAmount;
u8 stickyWebAmount;
@ -279,7 +277,7 @@ struct WishFutureKnock
u8 wishCounter[MAX_BATTLERS_COUNT];
u8 wishMonId[MAX_BATTLERS_COUNT];
u8 weatherDuration;
u8 knockedOffPokes[2];
u8 knockedOffMons[2]; // Each battler is represented by a bit. The array entry is dependent on the battler's side.
};
struct AI_SavedBattleMon
@ -361,7 +359,7 @@ struct BattleResults
u8 playerSwitchesCounter; // 0x2
u8 unk3; // 0x3
u8 unk4; // 0x4
u8 unk5_0:1; // 0x5
u8 playerMonWasDamaged:1; // 0x5
u8 usedMasterBall:1; // 0x5
u8 caughtMonBall:4; // 0x5
u8 shinyWildMon:1; // 0x5
@ -485,22 +483,14 @@ struct BattleStruct
u8 turnEffectsBattlerId;
u8 filler2;
u8 turnCountersTracker;
u8 wrappedMove[8]; // ask gamefreak why they declared it that way
u8 moveTarget[4];
u8 wrappedMove[MAX_BATTLERS_COUNT * 2]; // Leftover from Ruby's ewram access.
u8 moveTarget[MAX_BATTLERS_COUNT];
u8 expGetterMonId;
u8 field_11;
u8 wildVictorySong;
u8 dynamicMoveType;
u8 wrappedBy[4];
u16 assistPossibleMoves[5 * 4]; // 5 mons, each of them knowing 4 moves
u8 field_40;
u8 field_41;
u8 field_42;
u8 field_43;
u8 field_44;
u8 field_45;
u8 field_46;
u8 field_47;
u8 wrappedBy[MAX_BATTLERS_COUNT];
u16 assistPossibleMoves[PARTY_SIZE * 4]; // Each of mons can know max 4 moves.
u8 focusPunchBattlerId;
u8 battlerPreventingSwitchout;
u8 moneyMultiplier;
@ -508,7 +498,6 @@ struct BattleStruct
u8 switchInAbilitiesCounter;
u8 faintedActionsState;
u8 faintedActionsBattlerId;
u8 field_4F;
u16 expValue;
u8 field_52;
u8 sentInPokes;
@ -517,7 +506,7 @@ struct BattleStruct
u8 monToSwitchIntoId[MAX_BATTLERS_COUNT];
u8 field_60[4][3];
u8 runTries;
u8 caughtMonNick[11];
u8 caughtMonNick[POKEMON_NAME_LENGTH + 1];
u8 field_78;
u8 safariGoNearCounter;
u8 safariPkblThrowCounter;
@ -544,15 +533,7 @@ struct BattleStruct
u8 wallyMovesState;
u8 wallyWaitFrames;
u8 wallyMoveFrames;
u8 mirrorMoves[8]; // ask gamefreak why they declared it that way
u8 field_A0;
u8 field_A1;
u8 field_A2;
u8 field_A3;
u8 field_A4;
u8 field_A5;
u8 field_A6;
u8 field_A7;
u8 lastTakenMove[MAX_BATTLERS_COUNT * 2 * 2]; // Last move that a battler was hit with. This field seems to erroneously take 16 bytes instead of 8.
u16 hpOnSwitchout[2];
u32 savedBattleTypeFlags;
u8 abilityPreventingSwitchout;
@ -561,7 +542,7 @@ struct BattleStruct
bool8 anyMonHasTransformed;
void (*savedCallback)(void);
u16 usedHeldItems[MAX_BATTLERS_COUNT];
u8 chosenItem[4]; // why is this an u8?
u8 chosenItem[MAX_BATTLERS_COUNT]; // why is this an u8?
u8 AI_itemType[2];
u8 AI_itemFlags[2];
u16 choicedMove[MAX_BATTLERS_COUNT];
@ -572,7 +553,7 @@ struct BattleStruct
u8 turnEffectsSide;
u8 fillerDC[0xDF-0xDC];
u8 field_DF;
u8 mirrorMoveArrays[32];
u8 lastTakenMoveFrom[MAX_BATTLERS_COUNT * MAX_BATTLERS_COUNT * 2]; // a 3-D array [target][attacker][byte]
u16 castformPalette[MAX_BATTLERS_COUNT][16];
u8 field_180;
u8 field_181;

1
include/battle_frontier_2.h
View File

@ -11,7 +11,6 @@ void sub_81A895C(void);
u16 sub_81A89A0(u8);
void sub_81A8AF8(void);
bool8 InBattlePike(void);
void sub_819FA50(void);
void sub_81AA078(u16*, u8);
void sub_81A4C30(void);
bool8 sub_81A6BF4(void);

6
include/blend_palette.h
View File

@ -1,6 +0,0 @@
#ifndef GUARD_BLEND_PALETTE_H
#define GUARD_BLEND_PALETTE_H
void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor);
#endif // GUARD_BLEND_PALETTE_H

1
include/cable_club.h
View File

@ -14,5 +14,6 @@ u8 sub_80B3050(void);
void sub_80B360C(void);
bool32 sub_80B2AF4(u16 *arg0, u16 *arg1);
void sub_80B3AF8(u8 taskId);
void task00_08081A90(u8 taskId);
#endif //GUARD_CABLE_CLUB_H

22
include/constants/apprentice.h Normal file
View File

@ -0,0 +1,22 @@
#ifndef GUARD_CONSTANTS_APPRENTICE_H
#define GUARD_CONSTANTS_APPRENTICE_H
#define APPRENTICE_ASK_WHICH_LEVEL 0
#define APPRENTICE_ASK_3SPECIES 1
#define APPRENTICE_ASK_2SPECIES 2
#define APPRENTICE_ASK_MOVES 3
#define APPRENTICE_ASK_GIVE 4
#define APPRENTICE_ASK_YES_NO 6
#define APPRENTICE_BUFF_SPECIES1 0
#define APPRENTICE_BUFF_SPECIES2 1
#define APPRENTICE_BUFF_SPECIES3 2
#define APPRENTICE_BUFF_MOVE1 3
#define APPRENTICE_BUFF_MOVE2 4
#define APPRENTICE_BUFF_ITEM 5
#define APPRENTICE_BUFF_NAME 6
#define APPRENTICE_BUFF_EASY_CHAT 7
#define APPRENTICE_BUFF_LEVEL 8
#define APPRENTICE_BUFF_SPECIES4 9
#endif // GUARD_CONSTANTS_APPRENTICE_H

6
include/event_object_movement.h
View File

@ -80,6 +80,7 @@ struct LockedAnimEventObjects
};
extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[];
extern const u8 gReflectionEffectPaletteMap[];
void sub_808D438(void);
u8 GetMoveDirectionAnimNum(u8);
@ -189,6 +190,10 @@ u8 GetMoveDirectionFasterAnimNum(u8);
u8 GetMoveDirectionFastestAnimNum(u8);
u8 GetLedgeJumpDirection(s16, s16, u8);
void CameraObjectSetFollowedObjectId(u8 objectId);
u16 GetObjectPaletteTag(u8 palSlot);
void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible);
s16 sub_809773C(s16 a1);
s16 sub_8097728(s16 a1);
void MovementType_None(struct Sprite *);
void MovementType_LookAround(struct Sprite *);
@ -249,6 +254,7 @@ u8 GetSlideMovementAction(u32);
u8 GetJumpInPlaceMovementAction(u32);
u8 GetJumpMovementAction(u32);
u8 GetJump2MovementAction(u32);
u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority);
u8 MovementType_WanderAround_Step0(struct EventObject *, struct Sprite *);
u8 MovementType_WanderAround_Step1(struct EventObject *, struct Sprite *);

10
include/field_message_box.h
View File

@ -1,10 +1,20 @@
#ifndef GUARD_FIELD_MESSAGE_BOX_H
#define GUARD_FIELD_MESSAGE_BOX_H
enum
{
FIELD_MESSAGE_BOX_HIDDEN,
FIELD_MESSAGE_BOX_UNUSED,
FIELD_MESSAGE_BOX_NORMAL,
FIELD_MESSAGE_BOX_AUTO_SCROLL,
};
bool8 ShowFieldMessage(const u8 *message);
bool8 sub_8098238(const u8 *message);
bool8 ShowFieldAutoScrollMessage(const u8 *message);
void HideFieldMessageBox(void);
bool8 IsFieldMessageBoxHidden(void);
u8 GetFieldMessageBoxMode(void);
void sub_8098374(void);
#endif // GUARD_FIELD_MESSAGE_BOX_H

1
include/field_specials.h
View File

@ -5,5 +5,6 @@ u8 GetLeadMonIndex(void);
u8 sub_813B260(void);
u16 get_unknown_box_id(void);
bool8 InMultiBattleRoom(void);
void sub_813BF10(void);
#endif // GUARD_FIELD_SPECIALS_H

2
include/field_weather.h
View File

@ -155,7 +155,7 @@ void sub_80AEDBC(void);
void SetSav1WeatherFromCurrMapHeader(void);
// ...
void DoCurrentWeather(void);
void sub_8080750();
void sub_8080750(void);
bool8 IsWeatherNotFadingIn(void);
bool8 IsWeatherChangeComplete(void);

67
include/global.h
View File

@ -67,8 +67,6 @@
#define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) >= (b) ? (a) : (b))
#define HEAP_SIZE 0x1C000
extern u8 gStringVar1[];
extern u8 gStringVar2[];
extern u8 gStringVar3[];
@ -96,24 +94,19 @@ extern u8 gStringVar4[];
// In Gens 6 and 7, invalid versions instead show "a distant land" in the summary screen.
// In Gen 4 only, migrated Pokemon with Diamond, Pearl, or Platinum's ID show as "----------".
// Gen 5 and up read Diamond, Pearl, or Platinum's ID as "Sinnoh".
// In Gen 4 and up, migrated Pokemon with HeartGold or SoulSilver's ID show the unused "Johto" string.
// In Gen 4 and up, migrated Pokemon with HeartGold or SoulSilver's ID show the otherwise unused "Johto" string.
enum
{
VERSION_INVALID_0 = 0,
VERSION_SAPPHIRE = 1,
VERSION_RUBY = 2,
VERSION_EMERALD = 3,
VERSION_FIRE_RED = 4,
VERSION_LEAF_GREEN = 5,
VERSION_INVALID_6 = 6,
VERSION_HEART_GOLD = 7,
VERSION_SOUL_SILVER = 8,
VERSION_INVALID_9 = 9,
VERSION_DIAMOND = 10,
VERSION_PEARL = 11,
VERSION_PLATINUM = 12,
VERSION_INVALID_13 = 13,
VERSION_INVALID_14 = 14,
VERSION_GAMECUBE = 15,
};
@ -189,12 +182,14 @@ enum
OPTIONS_BATTLE_STYLE_SET
};
struct Coords8 {
struct Coords8
{
s8 x;
s8 y;
};
struct UCoords8 {
struct UCoords8
{
u8 x;
u8 y;
};
@ -306,11 +301,25 @@ struct UnknownSaveBlock2Struct
u8 field_EB;
}; // sizeof = 0xEC
struct UnkRecordMixingStruct
struct ApprenticeMon
{
u8 field_0[0x34];
u16 species;
u16 moves[4];
u16 item;
};
struct Apprentice
{
u8 id:5;
u8 lvlMode:2; // + 1
u8 field_1;
u8 number;
struct ApprenticeMon monData[3];
u16 easyChatWords[6];
u8 playerId[4];
u8 field_38[10];
u8 playerName[PLAYER_NAME_LENGTH];
u8 language;
u32 unk40;
};
struct UnknownPokemonStruct
@ -477,6 +486,28 @@ struct BattleFrontier
/*0xEFC*/ struct FrontierMonData field_EFC[3];
};
struct Sav2_B8
{
u8 unk0_0:2;
u8 unk0_1:2;
u8 unk0_2:2;
u8 unk0_3:2;
u16 unk2;
};
struct PlayersApprentice
{
/*0xB0*/ u8 id;
/*0xB1*/ u8 activeLvlMode:2; // +1, 0 means not active
/*0xB1*/ u8 field_B1_1:4;
/*0xB1*/ u8 field_B1_2:2;
/*0xB2*/ u8 field_B2_0:3;
/*0xB2*/ u8 field_B2_1:2;
/*0xB3*/ u8 field_B3;
/*0xB4*/ u8 monIds[3];
/*0xB8*/ struct Sav2_B8 field_B8[9];
};
struct SaveBlock2
{
/*0x00*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
@ -500,14 +531,8 @@ struct SaveBlock2
/*0xA0*/ struct Time lastBerryTreeUpdate;
/*0xA8*/ u32 field_A8;
/*0xAC*/ u32 encryptionKey;
// TODO: fix and verify labels
/*0xB0*/ u8 field_B0;
/*0xB1*/ u8 field_B1;
/*0xB2*/ u8 field_B2_0:3;
/*0xB2*/ u8 field_B2_1:2;
/*0xB3*/ u8 field_B3[0x29];
/*0xDC*/ struct UnkRecordMixingStruct field_DC[4];
/*0xB0*/ struct PlayersApprentice playerApprentice;
/*0xDC*/ struct Apprentice apprentices[4];
/*0x1EC*/ struct BerryCrush berryCrush;
/*0x1FC*/ struct PokemonJumpResults pokeJump;
/*0x20C*/ struct BerryPickingResults berryPick;

1
include/item_menu.h
View File

@ -54,6 +54,7 @@ extern u16 gSpecialVar_ItemId;
void sub_81AAC14(void);
void sub_81AAC50(void);
void sub_81AAC70(void);
void sub_81AAC28(void);
void bag_menu_mail_related(void);
void CB2_BagMenuFromStartMenu(void);
u8 sub_81ABB2C(u8 pocketId);

11
include/link.h
View File

@ -97,7 +97,8 @@ enum
EXCHANGE_IN_PROGRESS,
EXCHANGE_STAT_4,
EXCHANGE_STAT_5,
EXCHANGE_STAT_6
EXCHANGE_STAT_6,
EXCHANGE_STAT_7
};
enum
@ -258,6 +259,8 @@ void sub_800AF18(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 un
void sub_800B348(void);
void sub_800B3A4(u32 who);
bool32 sub_800A07C(void);
void sub_800AB98(void);
void sub_800AA04(u8 a0);
extern u16 gLinkPartnersHeldKeys[6];
extern u32 gLinkDebugSeed;
@ -292,6 +295,7 @@ extern u32 gFiller_0300315c;
extern u32 gFiller_03004138;
extern u32 gFiller_0300413C;
extern u32 gFiller_03003080;
extern struct LinkPlayer gLocalLinkPlayer;
bool32 Link_AnyPartnersPlayingRubyOrSapphire(void);
bool32 sub_800A03C(void);
@ -302,5 +306,10 @@ bool8 sub_800A4D8(u8 a0);
u8 sub_800A9D8(void);
u8 sub_800A0C8(s32, s32);
u16 *sub_801B058(void);
u8 sub_800A9A8(void);
void sub_800AD10(void);
void sub_800AB18(void);
void sub_8009F18(void);
bool8 sub_800AA60(void);
#endif // GUARD_LINK_H

1
include/malloc.h
View File

@ -13,6 +13,7 @@
}
extern u8 gHeap[];
void *Alloc(u32 size);
void *AllocZeroed(u32 size);
void Free(void *pointer);

3
include/menu.h
View File

@ -50,7 +50,7 @@ void blit_move_info_icon(u8 winId, u8 a2, u16 x, u16 y);
void reset_temp_tile_data_buffers(void);
void *decompress_and_copy_tile_data_to_vram(u8 bgId, const void *src, int size, u16 offset, u8 mode);
bool8 free_temp_tile_data_buffers_if_possible(void);
struct WindowTemplate CreateWindowTemplate(u8, u8, u8, u8, u8, u8, u16);
struct WindowTemplate CreateWindowTemplate(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock);
void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos);
void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void *src, int size, u16 offset, u8 mode);
s8 Menu_ProcessInputNoWrap_(void);
@ -87,5 +87,6 @@ void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 left
void sub_8199C30(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
void sub_8199D3C(void *ptr, int delta, int width, int height, bool32 is8BPP);
void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyToVram);
void sub_8197AE8(bool8 copyToVram);
#endif // GUARD_MENU_H

3
include/overworld.h
View File

@ -25,6 +25,9 @@ extern u16 *gBGTilemapBuffers3;
extern void (*gFieldCallback)(void);
extern u8 gUnknown_03005DB4;
extern u8 gFieldLinkPlayerCount;
// Exported ROM declarations
extern const struct UCoords32 gDirectionToVectors[];

2
include/palette.h
View File

@ -55,7 +55,7 @@ bool8 unref_sub_8073D3C(u32, u8, u8, u8, u16);
void unref_sub_8073D84(u8, u32 *);
void ResetPaletteStructByUid(u16);
void ResetPaletteStruct(u8);
void ResetPaletteFadeControl();
void ResetPaletteFadeControl(void);
void unref_sub_8074168(u16);
void unref_sub_8074194(u16);
void InvertPlttBuffer(u32);

4
include/party_menu.h
View File

@ -50,8 +50,8 @@ void sub_81B1370(u8 taskId);
void display_pokemon_menu_message(u8 windowId);
void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func);
void sub_81B1B5C(void *a, u8 b);
u8 sub_81B1BD4();
void sub_81B8448();
u8 sub_81B1BD4(void);
void sub_81B8448(void);
void sub_81B8518(u8 unused);
u8 sub_81B1360(void);
void sub_81B8904(u8 arg0, void (*callback)(void));

28
include/pokemon.h
View File

@ -240,32 +240,6 @@ struct PokemonStorage
/*0x83C2*/ u8 boxWallpapers[14];
};
struct UnknownPokemonSubStruct2
{
u16 species;
u16 moves[4];
u16 item;
};
struct UnknownPokemonStruct2
{
u8 field_0_0 : 5;
u8 field_0_1 : 2;
u8 field_1;
u8 field_2;
u8 field_3;
struct UnknownPokemonSubStruct2 mons[3];
u8 field_28[23];
u8 language;
};
struct UnknownPokemonStruct3
{
u8 field_0[48];
u16 field_30;
u8 field_32[38];
};
struct Unknown_806F160_Struct
{
u8 field_0_0:4;
@ -471,7 +445,7 @@ void CreateMonWithIVsOTID(struct Pokemon *mon, u16 species, u8 level, u8 *ivs, u
void CreateMonWithEVSpread(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 evSpread);
void sub_806819C(struct Pokemon *mon, struct UnknownPokemonStruct *src);
void sub_8068338(struct Pokemon *mon, struct UnknownPokemonStruct *src, bool8 lvl50);
void sub_8068528(struct Pokemon *mon, const struct UnknownPokemonStruct2 *src, u8 monId);
void CreateApprenticeMon(struct Pokemon *mon, const struct Apprentice *src, u8 monId);
void CreateMonWithEVSpreadPersonalityOTID(struct Pokemon *mon, u16 species, u8 level, u8 nature, u8 fixedIV, u8 evSpread, u32 otId);
void sub_80686FC(struct Pokemon *mon, struct UnknownPokemonStruct *dest);
void CreateObedientMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId);

2
include/rom_8011DC0.h
View File

@ -9,5 +9,7 @@
void sub_8018438(void);
u16 mevent_081445C0(u8);
void sub_801B990(u32, u32);
u8 sub_8013F78(void);
#endif //GUARD_rom_8011DC0_H

2
include/rotating_gate.h
View File

@ -2,7 +2,7 @@
#define GUARD_ROTATING_GATE_H
void RotatingGatePuzzleCameraUpdate(s16, s16);
void RotatingGate_InitPuzzleAndGraphics();
void RotatingGate_InitPuzzleAndGraphics(void);
u32 CheckForRotatingGatePuzzleCollision(u8, s16, s16);
bool32 CheckForRotatingGatePuzzleCollisionWithoutAnimation(u8, s16, s16);

1
include/script_menu.h
View File

@ -13,5 +13,6 @@ s32 convert_pixel_width_to_tile_width(s32);
u8 CreateWindowFromRect(u8, u8, u8, u8);
void sub_80E2A78(u8);
u32 display_text_and_get_width(const u8*, u32);
u8 sub_80E2D5C(u8 arg0, u8 tileWidth);
#endif //GUARD_SCRIPT_MENU_H

1
include/script_pokemon_util_80F87D8.h
View File

@ -3,5 +3,6 @@
#define GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H
u16 sub_80F903C(void);
void ReducePlayerPartyToThree(void);
#endif // GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H

2
include/string_util.h
View File

@ -24,7 +24,7 @@ u8 *ConvertUIntToDecimalStringN(u8 *dest, u32 value, enum StringConvertMode mode
u8 *ConvertIntToHexStringN(u8 *dest, s32 value, enum StringConvertMode mode, u8 n);
u8 *StringExpandPlaceholders(u8 *dest, const u8 *src);
u8 *StringBraille(u8 *dest, const u8 *src);
u8 *GetExpandedPlaceholder(u32 id);
const u8 *GetExpandedPlaceholder(u32 id);
u8 *StringFill(u8 *dest, u8 c, u16 n);
u8 *StringCopyPadded(u8 *dest, const u8 *src, u8 c, u16 n);
u8 *StringFillWithTerminator(u8 *dest, u16 n);

10
include/strings.h
View File

@ -843,4 +843,14 @@ extern const u8 gText_TwoDashes[];
extern const u8 *const gReturnToXStringsTable2[];
extern const u8 gText_XPLink[];
extern const u8 gText_ConfirmLinkWhenPlayersReady[];
extern const u8 gText_ConfirmStartLinkWithXPlayers[];
extern const u8 gText_AwaitingLinkup[];
extern const u8 gText_PleaseWaitForLink[];
extern const u8 gText_BronzeCard[];
extern const u8 gText_CopperCard[];
extern const u8 gText_SilverCard[];
extern const u8 gText_GoldCard[];
#endif //GUARD_STRINGS_H

1
include/text.h
View File

@ -77,6 +77,7 @@
#define CHAR_y 0xED
#define CHAR_z 0xEE
#define CHAR_SPECIAL_F7 0xF7
#define CHAR_SPECIAL_F8 0xF8
#define CHAR_SPECIAL_F9 0xF9
#define CHAR_COLON 0xF0
#define CHAR_PROMPT_SCROLL 0xFA // waits for button press and scrolls dialog

9
include/trainer_card.h
View File

@ -27,13 +27,16 @@ struct TrainerCard
/*0x24*/ u32 money;
/*0x28*/ u16 var_28[4];
/*0x30*/ u8 playerName[8];
/*0x38*/ u8 emeraldAddedUnknownFields[0x64-0x38];
/*0x38*/ u8 emeraldAddedUnknownFields[0x54-0x38];
/*0x54*/ u16 monSpecies[2];
/*0x58*/ u8 emeraldAddedUnknownFields2[0x64-0x58];
};
extern struct TrainerCard gTrainerCards[4];
void sub_80C3120(struct TrainerCard *arg0, u16 *arg1, u8 gameVersion);
void sub_80C4E74(u8 arg0, void (*callback)(void));
void sub_80C30A4(u16 *arg0);
void TrainerCard_ShowLinkCard(u8 arg0, void (*callback)(void));
void TrainerCard_GenerateCardForPlayer(struct TrainerCard *);
u8 sub_80C4904(u8);
#endif // GUARD_TRAINER_CARD_H

1
include/util.h
View File

@ -13,5 +13,6 @@ int CountTrailingZeroBits(u32 value);
u16 CalcCRC16(u8 *data, s32 length);
u16 CalcCRC16WithTable(u8 *data, u32 length);
u32 CalcByteArraySum(const u8* data, u32 length);
void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor);
#endif // GUARD_UTIL_H

120
ld_script.txt
View File

@ -76,7 +76,6 @@ SECTIONS {
src/trig.o(.text);
src/random.o(.text);
src/util.o(.text);
src/blend_palette.o(.text);
src/daycare.o(.text);
src/egg_hatch.o(.text);
src/battle_interface.o(.text);
@ -118,7 +117,7 @@ SECTIONS {
src/title_screen.o(.text);
asm/field_screen.o(.text);
src/battle_setup.o(.text);
asm/cable_club.o(.text);
src/cable_club.o(.text);
src/trainer_see.o(.text);
src/wild_encounter.o(.text);
src/field_effect.o(.text);
@ -201,7 +200,7 @@ SECTIONS {
src/rom_81520A8.o(.text);
src/save.o(.text);
src/mystery_event_script.o(.text);
asm/field_effect_helpers.o(.text);
src/field_effect_helpers.o(.text);
src/contest_ai.o(.text);
src/battle_anim_sound_tasks.o(.text);
src/battle_controller_safari.o(.text);
@ -247,6 +246,7 @@ SECTIONS {
asm/battle_frontier_1.o(.text);
src/menu.o(.text);
src/battle_factory.o(.text);
src/apprentice.o(.text);
asm/battle_frontier_2.o(.text);
src/item_menu.o(.text);
src/list_menu.o(.text);
@ -428,7 +428,7 @@ SECTIONS {
src/title_screen.o(.rodata);
data/field_screen.o(.rodata);
src/battle_setup.o(.rodata);
data/cable_club.o(.rodata);
src/cable_club.o(.rodata);
src/trainer_see.o(.rodata);
src/wild_encounter.o(.rodata);
src/field_effect.o(.rodata);
@ -492,6 +492,7 @@ SECTIONS {
src/battle_message.o(.rodata);
data/cable_car.o(.rodata);
src/save.o(.rodata);
src/field_effect_helpers.o(.rodata);
data/field_effect_helpers.o(.rodata);
src/contest_ai.o(.rodata);
src/battle_controller_safari.o(.rodata);
@ -530,6 +531,7 @@ SECTIONS {
data/battle_frontier_1.o(.rodata);
src/menu.o(.rodata);
src/battle_factory.o(.rodata);
src/apprentice.o(.rodata);
data/battle_frontier_2.o(.rodata);
src/item_menu.o(.rodata);
src/list_menu.o(.rodata);
@ -567,65 +569,65 @@ SECTIONS {
ALIGN(4)
{
sound/songs/midi/mus_dummy.o(.rodata);
sound/songs/se_kaifuku.o(.rodata);
sound/songs/midi/se_kaifuku.o(.rodata);
sound/songs/se_pc_login.o(.rodata);
sound/songs/se_pc_off.o(.rodata);
sound/songs/se_pc_on.o(.rodata);
sound/songs/se_select.o(.rodata);
sound/songs/se_win_open.o(.rodata);
sound/songs/se_wall_hit.o(.rodata);
sound/songs/se_door.o(.rodata);
sound/songs/se_kaidan.o(.rodata);
sound/songs/se_dansa.o(.rodata);
sound/songs/se_jitensya.o(.rodata);
sound/songs/se_kouka_l.o(.rodata);
sound/songs/se_kouka_m.o(.rodata);
sound/songs/se_kouka_h.o(.rodata);
sound/songs/se_bowa2.o(.rodata);
sound/songs/midi/se_door.o(.rodata);
sound/songs/midi/se_kaidan.o(.rodata);
sound/songs/midi/se_dansa.o(.rodata);
sound/songs/midi/se_jitensya.o(.rodata);
sound/songs/midi/se_kouka_l.o(.rodata);
sound/songs/midi/se_kouka_m.o(.rodata);
sound/songs/midi/se_kouka_h.o(.rodata);
sound/songs/midi/se_bowa2.o(.rodata);
sound/songs/se_poke_dead.o(.rodata);
sound/songs/se_nigeru.o(.rodata);
sound/songs/se_jido_doa.o(.rodata);
sound/songs/midi/se_jido_doa.o(.rodata);
sound/songs/se_naminori.o(.rodata);
sound/songs/se_ban.o(.rodata);
sound/songs/midi/se_ban.o(.rodata);
sound/songs/se_pin.o(.rodata);
sound/songs/se_boo.o(.rodata);
sound/songs/se_bowa.o(.rodata);
sound/songs/se_jyuni.o(.rodata);
sound/songs/se_a.o(.rodata);
sound/songs/se_i.o(.rodata);
sound/songs/midi/se_boo.o(.rodata);
sound/songs/midi/se_bowa.o(.rodata);
sound/songs/midi/se_jyuni.o(.rodata);
sound/songs/midi/se_a.o(.rodata);
sound/songs/midi/se_i.o(.rodata);
sound/songs/se_u.o(.rodata);
sound/songs/se_e.o(.rodata);
sound/songs/midi/se_e.o(.rodata);
sound/songs/se_o.o(.rodata);
sound/songs/se_n.o(.rodata);
sound/songs/se_seikai.o(.rodata);
sound/songs/se_hazure.o(.rodata);
sound/songs/se_exp.o(.rodata);
sound/songs/se_jite_pyoko.o(.rodata);
sound/songs/midi/se_hazure.o(.rodata);
sound/songs/midi/se_exp.o(.rodata);
sound/songs/midi/se_jite_pyoko.o(.rodata);
sound/songs/se_mu_pachi.o(.rodata);
sound/songs/se_tk_kasya.o(.rodata);
sound/songs/se_fu_zaku.o(.rodata);
sound/songs/se_fu_zaku2.o(.rodata);
sound/songs/se_fu_zuzuzu.o(.rodata);
sound/songs/midi/se_fu_zaku.o(.rodata);
sound/songs/midi/se_fu_zaku2.o(.rodata);
sound/songs/midi/se_fu_zuzuzu.o(.rodata);
sound/songs/se_ru_gashin.o(.rodata);
sound/songs/se_ru_gasyan.o(.rodata);
sound/songs/se_ru_bari.o(.rodata);
sound/songs/se_ru_hyuu.o(.rodata);
sound/songs/se_ki_gasyan.o(.rodata);
sound/songs/midi/se_ki_gasyan.o(.rodata);
sound/songs/se_tk_warpin.o(.rodata);
sound/songs/se_tk_warpout.o(.rodata);
sound/songs/se_tu_saa.o(.rodata);
sound/songs/se_hi_turun.o(.rodata);
sound/songs/midi/se_hi_turun.o(.rodata);
sound/songs/se_track_move.o(.rodata);
sound/songs/se_track_stop.o(.rodata);
sound/songs/se_track_haiki.o(.rodata);
sound/songs/se_track_door.o(.rodata);
sound/songs/se_moter.o(.rodata);
sound/songs/se_card.o(.rodata);
sound/songs/midi/se_card.o(.rodata);
sound/songs/se_save.o(.rodata);
sound/songs/se_kon.o(.rodata);
sound/songs/se_kon2.o(.rodata);
sound/songs/se_kon3.o(.rodata);
sound/songs/se_kon4.o(.rodata);
sound/songs/midi/se_kon.o(.rodata);
sound/songs/midi/se_kon2.o(.rodata);
sound/songs/midi/se_kon3.o(.rodata);
sound/songs/midi/se_kon4.o(.rodata);
sound/songs/se_suikomu.o(.rodata);
sound/songs/se_nageru.o(.rodata);
sound/songs/se_toy_c.o(.rodata);
@ -637,16 +639,16 @@ SECTIONS {
sound/songs/se_toy_b.o(.rodata);
sound/songs/se_toy_c1.o(.rodata);
sound/songs/se_mizu.o(.rodata);
sound/songs/se_hashi.o(.rodata);
sound/songs/se_daugi.o(.rodata);
sound/songs/midi/se_hashi.o(.rodata);
sound/songs/midi/se_daugi.o(.rodata);
sound/songs/se_pinpon.o(.rodata);
sound/songs/se_fuusen1.o(.rodata);
sound/songs/se_fuusen2.o(.rodata);
sound/songs/se_fuusen3.o(.rodata);
sound/songs/midi/se_fuusen1.o(.rodata);
sound/songs/midi/se_fuusen2.o(.rodata);
sound/songs/midi/se_fuusen3.o(.rodata);
sound/songs/se_toy_kabe.o(.rodata);
sound/songs/se_toy_dango.o(.rodata);
sound/songs/se_doku.o(.rodata);
sound/songs/se_esuka.o(.rodata);
sound/songs/midi/se_doku.o(.rodata);
sound/songs/midi/se_esuka.o(.rodata);
sound/songs/se_t_ame.o(.rodata);
sound/songs/se_t_ame_e.o(.rodata);
sound/songs/se_t_ooame.o(.rodata);
@ -655,24 +657,24 @@ SECTIONS {
sound/songs/se_t_koame_e.o(.rodata);
sound/songs/se_t_kami.o(.rodata);
sound/songs/se_t_kami2.o(.rodata);
sound/songs/se_elebeta.o(.rodata);
sound/songs/se_hinsi.o(.rodata);
sound/songs/se_expmax.o(.rodata);
sound/songs/midi/se_elebeta.o(.rodata);
sound/songs/midi/se_hinsi.o(.rodata);
sound/songs/midi/se_expmax.o(.rodata);
sound/songs/se_tamakoro.o(.rodata);
sound/songs/se_tamakoro_e.o(.rodata);
sound/songs/se_basabasa.o(.rodata);
sound/songs/midi/se_basabasa.o(.rodata);
sound/songs/se_regi.o(.rodata);
sound/songs/se_c_gaji.o(.rodata);
sound/songs/se_c_maku_u.o(.rodata);
sound/songs/se_c_maku_d.o(.rodata);
sound/songs/se_c_pasi.o(.rodata);
sound/songs/se_c_syu.o(.rodata);
sound/songs/se_c_pikon.o(.rodata);
sound/songs/midi/se_c_gaji.o(.rodata);
sound/songs/midi/se_c_maku_u.o(.rodata);
sound/songs/midi/se_c_maku_d.o(.rodata);
sound/songs/midi/se_c_pasi.o(.rodata);
sound/songs/midi/se_c_syu.o(.rodata);
sound/songs/midi/se_c_pikon.o(.rodata);
sound/songs/se_reapoke.o(.rodata);
sound/songs/se_op_basyu.o(.rodata);
sound/songs/se_bt_start.o(.rodata);
sound/songs/se_dendou.o(.rodata);
sound/songs/se_jihanki.o(.rodata);
sound/songs/midi/se_bt_start.o(.rodata);
sound/songs/midi/se_dendou.o(.rodata);
sound/songs/midi/se_jihanki.o(.rodata);
sound/songs/se_tama.o(.rodata);
sound/songs/se_z_scroll.o(.rodata);
sound/songs/se_z_page.o(.rodata);
@ -683,7 +685,7 @@ SECTIONS {
sound/songs/se_tb_start.o(.rodata);
sound/songs/se_tb_kon.o(.rodata);
sound/songs/se_tb_kara.o(.rodata);
sound/songs/se_bidoro.o(.rodata);
sound/songs/midi/se_bidoro.o(.rodata);
sound/songs/se_w085.o(.rodata);
sound/songs/se_w085b.o(.rodata);
sound/songs/se_w231.o(.rodata);
@ -831,10 +833,10 @@ SECTIONS {
sound/songs/se_rg_nawamiss.o(.rodata);
sound/songs/se_toreeye.o(.rodata);
sound/songs/se_toreoff.o(.rodata);
sound/songs/se_hantei1.o(.rodata);
sound/songs/se_hantei2.o(.rodata);
sound/songs/se_curtain.o(.rodata);
sound/songs/se_curtain1.o(.rodata);
sound/songs/midi/se_hantei1.o(.rodata);
sound/songs/midi/se_hantei2.o(.rodata);
sound/songs/midi/se_curtain.o(.rodata);
sound/songs/midi/se_curtain1.o(.rodata);
sound/songs/se_ussoki.o(.rodata);
sound/songs/midi/mus_tetsuji.o(.rodata);
sound/songs/midi/mus_field13.o(.rodata);

165
songs.mk
View File

@ -786,5 +786,170 @@ $(MID_SUBDIR)/ph_trap_held.s: %.s: %.mid
$(MID_SUBDIR)/ph_trap_solo.s: %.s: %.mid
$(MID) $< $@ -E -G130 -P4
$(MID_SUBDIR)/se_a.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4
$(MID_SUBDIR)/se_ban.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
$(MID_SUBDIR)/se_basabasa.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P5
$(MID_SUBDIR)/se_bidoro.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P5
$(MID_SUBDIR)/se_boo.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4
$(MID_SUBDIR)/se_bowa.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V070 -P4
$(MID_SUBDIR)/se_bowa2.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
$(MID_SUBDIR)/se_bt_start.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5
$(MID_SUBDIR)/se_c_gaji.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5
$(MID_SUBDIR)/se_c_maku_d.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V070 -P5
$(MID_SUBDIR)/se_c_maku_u.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V070 -P5
$(MID_SUBDIR)/se_c_pasi.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5
$(MID_SUBDIR)/se_c_pikon.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5
$(MID_SUBDIR)/se_c_syu.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5
$(MID_SUBDIR)/se_card.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
$(MID_SUBDIR)/se_curtain.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
$(MID_SUBDIR)/se_curtain1.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
$(MID_SUBDIR)/se_dansa.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
$(MID_SUBDIR)/se_daugi.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
$(MID_SUBDIR)/se_dendou.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P5
$(MID_SUBDIR)/se_doku.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
$(MID_SUBDIR)/se_door.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5
$(MID_SUBDIR)/se_e.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4
$(MID_SUBDIR)/se_elebeta.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
$(MID_SUBDIR)/se_esuka.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
$(MID_SUBDIR)/se_exp.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5
$(MID_SUBDIR)/se_expmax.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V094 -P5
$(MID_SUBDIR)/se_fu_zaku.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P4
$(MID_SUBDIR)/se_fu_zaku2.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4
$(MID_SUBDIR)/se_fu_zuzuzu.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P4
$(MID_SUBDIR)/se_fuusen1.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4
$(MID_SUBDIR)/se_fuusen2.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4
$(MID_SUBDIR)/se_fuusen3.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4
$(MID_SUBDIR)/se_hantei1.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
$(MID_SUBDIR)/se_hantei2.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
$(MID_SUBDIR)/se_hashi.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4
$(MID_SUBDIR)/se_hazure.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P4
$(MID_SUBDIR)/se_hi_turun.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
$(MID_SUBDIR)/se_hinsi.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P3
$(MID_SUBDIR)/se_i.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4
$(MID_SUBDIR)/se_jido_doa.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4
$(MID_SUBDIR)/se_jihanki.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
$(MID_SUBDIR)/se_jite_pyoko.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4
$(MID_SUBDIR)/se_jitensya.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
$(MID_SUBDIR)/se_jyuni.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4
$(MID_SUBDIR)/se_kaidan.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P5
$(MID_SUBDIR)/se_kaifuku.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
$(MID_SUBDIR)/se_ki_gasyan.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
$(MID_SUBDIR)/se_kon.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
$(MID_SUBDIR)/se_kon2.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
$(MID_SUBDIR)/se_kon3.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
$(MID_SUBDIR)/se_kon4.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
$(MID_SUBDIR)/se_kouka_h.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
$(MID_SUBDIR)/se_kouka_l.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
$(MID_SUBDIR)/se_kouka_m.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
$(MID_SUBDIR)/se_z_search.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5

34
sound/song_table.inc
View File

@ -25,7 +25,7 @@ gSongTable:: @ 86B49F0
song se_pin, 1, 1 @ Exclamation Bubble
song se_boo, 1, 1 @ Contest Jam
song se_bowa, 1, 1 @ Giving Poké Ball to Nurse, Poké Ball Wiggle
song se_jyuni, 2, 2 @ Places in Contest Appearing
song se_jyuni, 2, 2 @ Contest - Rankings Revealed
song se_a, 1, 1 @ Bard A
song se_i, 1, 1 @ Bard I
song se_u, 1, 1 @ Bard U
@ -40,7 +40,7 @@ gSongTable:: @ 86B49F0
song se_tk_kasya, 1, 1 @ Mossdeep Gym/Trick House Switch
song se_fu_zaku, 1, 1
song se_fu_zaku2, 1, 1
song se_fu_zuzuzu, 1, 1 @ Lavaridge Gym Warp
song se_fu_zuzuzu, 1, 1 @ Lavaridge Gym - Warp
song se_ru_gashin, 1, 1 @ Sootopolis Gym - Stairs Appear
song se_ru_gasyan, 1, 1 @ Sootopolis Gym - Ice Breaking
song se_ru_bari, 1, 1 @ Sootopolis Gym - Walking on Ice
@ -49,7 +49,7 @@ gSongTable:: @ 86B49F0
song se_tk_warpin, 1, 1 @ Warp In
song se_tk_warpout, 1, 1 @ Warp Out
song se_tu_saa, 1, 1 @ Repel
song se_hi_turun, 1, 1 @ Moving Obstacle in Fortree Gym
song se_hi_turun, 1, 1 @ Fortree Gym - Obstacle
song se_track_move, 1, 1 @ Moving Truck
song se_track_stop, 1, 1 @ Moving Truck Stop
song se_track_haiki, 2, 2 @ Moving Truck Unload
@ -72,15 +72,15 @@ gSongTable:: @ 86B49F0
song se_toy_b, 2, 2 @ Note B
song se_toy_c1, 2, 2 @ Note High C
song se_mizu, 2, 2 @ Puddle
song se_hashi, 2, 2 @ Boardwalk
song se_daugi, 1, 1 @ Slots Credits
song se_hashi, 2, 2 @ Fortree Walkways
song se_daugi, 1, 1 @ Slots - Credits
song se_pinpon, 1, 1 @ Ding-dong!
song se_fuusen1, 2, 2 @ Red Balloon
song se_fuusen2, 2, 2 @ Blue Balloon
song se_fuusen3, 2, 2 @ Yellow Balloon
song se_toy_kabe, 2, 2 @ Breakable Door
song se_toy_dango, 2, 2 @ Mud Ball
song se_doku, 1, 1 @ Overworld Poison Damage
song se_doku, 1, 1 @ Overworld - Poison Damage
song se_esuka, 1, 1 @ Escalator
song se_t_ame, 3, 3 @ Rain
song se_t_ame_e, 3, 3 @ Rain Stop
@ -95,14 +95,14 @@ gSongTable:: @ 86B49F0
song se_expmax, 1, 1 @ Exp. Max
song se_tamakoro, 2, 2 @ Roulette Ball
song se_tamakoro_e, 2, 2 @ Roulette Ball 2
song se_basabasa, 1, 1
song se_basabasa, 1, 1 @ Wing Attack
song se_regi, 1, 1 @ Cash Register
song se_c_gaji, 1, 1 @ Contest Hearts
song se_c_maku_u, 1, 1 @ Contest Curtain rise
song se_c_maku_d, 1, 1 @ Contest Curtain fall
song se_c_pasi, 1, 1
song se_c_syu, 1, 1
song se_c_pikon, 1, 1 @ Pokémon Appears in Contest
song se_c_gaji, 1, 1 @ Contest - Hearts
song se_c_maku_u, 1, 1 @ Contest - Curtain Rises
song se_c_maku_d, 1, 1 @ Contest - Curtain Falls
song se_c_pasi, 1, 1 @ Contest - Inflict Status
song se_c_syu, 1, 1 @ Contest - Pokémon Switches Out
song se_c_pikon, 1, 1 @ Contest - Pokémon Switches In
song se_reapoke, 1, 1 @ Shiny Pokémon
song se_op_basyu, 1, 1 @ Opening Movie -> Title Screen whoosh
song se_bt_start, 1, 1 @ Battle Mugshot whoosh
@ -266,10 +266,10 @@ gSongTable:: @ 86B49F0
song se_rg_nawamiss, 1, 1
song se_toreeye, 1, 1 @ Trainer's Eye Call
song se_toreoff, 1, 1 @ Trainer's Eye Hang Up
song se_hantei1, 1, 1 @ Battle Arena Time's Up 1
song se_hantei2, 1, 1 @ Battle Arena Time's Up 2
song se_curtain, 1, 1 @ Battle Pike Curtain Open
song se_curtain1, 1, 1 @ Battle Pike Curtain Close
song se_hantei1, 1, 1 @ Battle Arena - Judgment 1
song se_hantei2, 1, 1 @ Battle Arena - Judgment 2
song se_curtain, 1, 1 @ Battle Pike - Curtain Opens
song se_curtain1, 1, 1 @ Battle Pike - Curtain Closes
song se_ussoki, 1, 1 @ Sudowoodo
song dummy_song_header, 0, 0
song dummy_song_header, 0, 0

BIN
sound/songs/midi/se_a.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_ban.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_basabasa.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_bidoro.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_boo.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_bowa.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_bowa2.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_bt_start.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_c_gaji.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_c_maku_d.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_c_maku_u.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_c_pasi.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_c_pikon.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_c_syu.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_card.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_curtain.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_curtain1.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_dansa.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_daugi.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_dendou.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_doku.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_door.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_e.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_elebeta.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_esuka.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_exp.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_expmax.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_fu_zaku.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_fu_zaku2.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_fu_zuzuzu.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_fuusen1.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_fuusen2.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_fuusen3.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_hantei1.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_hantei2.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_hashi.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_hazure.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_hi_turun.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_hinsi.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_i.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_jido_doa.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_jihanki.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_jite_pyoko.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_jitensya.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_jyuni.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_kaidan.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_kaifuku.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_ki_gasyan.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_kon.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_kon2.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_kon3.mid Normal file
View File

Binary file not shown.

BIN
sound/songs/midi/se_kon4.mid Normal file
View File

Binary file not shown.

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