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

Initial trainers dump

Browse Source
This commit is contained in:
PikalaxALT
2019-10-17 16:13:02 -04:00
parent b919702f7d
commit 0b708aeade
8 changed files with 20779 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_setup.s
+6 -3
View File
@@ -2033,8 +2033,8 @@ sub_8080618: @ 8080618
bx r0
thumb_func_end sub_8080618
thumb_func_start sub_8080628
sub_8080628: @ 8080628
thumb_func_start PlayTrainerEncounterMusic
PlayTrainerEncounterMusic: @ 8080628
push {lr}
ldr r0, _08080660 @ =gUnknown_203ADFA
ldrb r0, [r0]
@@ -2083,15 +2083,18 @@ _08080670:
.4byte _080806AE
.4byte _080806AE
_080806A8:
@ MUS_SHOUJO
movs r0, 0x8E
lsls r0, 1
b _080806BA
_080806AE:
@ MUS_SHOUNEN
ldr r0, _080806B4 @ =0x0000011d
b _080806BA
.align 2, 0
_080806B4: .4byte 0x0000011d
_080806B8:
@ MUS_ROCKET
ldr r0, _080806C4 @ =0x0000011b
_080806BA:
bl PlayNewMapMusic
@@ -2100,7 +2103,7 @@ _080806BE:
bx r0
.align 2, 0
_080806C4: .4byte 0x0000011b
thumb_func_end sub_8080628
thumb_func_end PlayTrainerEncounterMusic
thumb_func_start sub_80806C8
sub_80806C8: @ 80806C8
data/data.s
+2 -7
View File
@@ -35,15 +35,10 @@ gTrainerBackPicPaletteTable:: @ 8239FD4
.incbin "baserom.gba", 0x239FD4, 0x30
gEnemyMonElevation:: @ 823A004
.incbin "baserom.gba", 0x23A004, 0x4554
gTrainerClassNames:: @ 823E558
.include "data/text/trainer_class_names.inc"
.incbin "baserom.gba", 0x23A004, 0x19C
.section .rodata.8245EE0
.align 2, 0
gTrainers:: @ 823EAD8
.incbin "baserom.gba", 0x23EAC8, 0x7418
gSpeciesNames:: @ 8245EE0
.include "data/text/species_names.inc"
data/map_event_scripts.inc
+6 -6
View File
@@ -780,7 +780,7 @@ EventScript_1A4EAF:: @ 81A4EAF
gUnknown_81A4EB4:: @ 81A4EB4
lock
special sub_8080628
special PlayTrainerEncounterMusic
special ScrSpecial_EndTrainerApproach
waitstate
goto EventScript_1A4FC7
@@ -793,7 +793,7 @@ gUnknown_81A4EC1:: @ 81A4EC1
specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
compare_var_to_value VAR_RESULT, 0
goto_if 5, EventScript_1A4EE8
special sub_8080628
special PlayTrainerEncounterMusic
special sub_8080398
goto EventScript_1A4FC7
@@ -810,7 +810,7 @@ gUnknown_81A4EE9:: @ 81A4EE9
special CheckForAlivePartyMons
compare_var_to_value VAR_RESULT, 0
goto_if 5, EventScript_1A4F19
special sub_8080628
special PlayTrainerEncounterMusic
special sub_8080398
goto EventScript_1A4FC7
@@ -827,7 +827,7 @@ EventScript_1A4F20:: @ 81A4F20
gUnknown_81A4F21:: @ 81A4F21
applymovement VAR_LAST_TALKED, Movement_1A4FC5
waitmovement 0
special sub_8080628
special PlayTrainerEncounterMusic
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A501A
@@ -839,7 +839,7 @@ gUnknown_81A4F3E:: @ 81A4F3E
specialvar VAR_RESULT, sub_810CEB4
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_1A4F72
special sub_8080628
special PlayTrainerEncounterMusic
special sub_8080398
special sub_80805D8
waitmessage
@@ -862,7 +862,7 @@ gUnknown_81A4F73:: @ 81A4F73
special CheckForAlivePartyMons
compare_var_to_value VAR_RESULT, 0
goto_if 5, EventScript_1A4FB1
special sub_8080628
special PlayTrainerEncounterMusic
special sub_8080398
special sub_80805D8
waitmessage
data/specials.inc
+1 -1
View File
@@ -65,7 +65,7 @@ gSpecials:: @ 815FD60
def_special sub_8080618
def_special ScrSpecial_HasTrainerBeenFought
def_special ScrSpecial_EndTrainerApproach
def_special sub_8080628
def_special PlayTrainerEncounterMusic
def_special sub_810CD4C
def_special sub_810CEB4
def_special sub_80805B0
include/battle.h
+5 -5
View File
@@ -190,10 +190,10 @@ struct TrainerMonItemCustomMoves
union TrainerMonPtr
{
struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves;
struct TrainerMonNoItemCustomMoves *NoItemCustomMoves;
struct TrainerMonItemDefaultMoves *ItemDefaultMoves;
struct TrainerMonItemCustomMoves *ItemCustomMoves;
const struct TrainerMonNoItemDefaultMoves *NoItemDefaultMoves;
const struct TrainerMonNoItemCustomMoves *NoItemCustomMoves;
const struct TrainerMonItemDefaultMoves *ItemDefaultMoves;
const struct TrainerMonItemCustomMoves *ItemCustomMoves;
};
struct Trainer
@@ -207,7 +207,7 @@ struct Trainer
/*0x18*/ bool8 doubleBattle;
/*0x1C*/ u32 aiFlags;
/*0x20*/ u8 partySize;
/*0x24*/ union TrainerMonPtr party;
/*0x24*/ const union TrainerMonPtr party;
};
#define PARTY_FLAG_CUSTOM_MOVES 0x1
include/constants/trainers.h
+164
View File
@@ -1,8 +1,172 @@
#ifndef GUARD_TRAINERS_H
#define GUARD_TRAINERS_H
#define TRAINER_ENCOUNTER_MUSIC_MALE 0 // standard male encounter music
#define TRAINER_ENCOUNTER_MUSIC_FEMALE 1 // standard female encounter music
#define TRAINER_ENCOUNTER_MUSIC_GIRL 2 // used for male Tubers and Young Couples too
#define TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS 3
#define TRAINER_ENCOUNTER_MUSIC_INTENSE 4
#define TRAINER_ENCOUNTER_MUSIC_COOL 5
#define TRAINER_ENCOUNTER_MUSIC_AQUA 6
#define TRAINER_ENCOUNTER_MUSIC_MAGMA 7
#define TRAINER_ENCOUNTER_MUSIC_SWIMMER 8
#define TRAINER_ENCOUNTER_MUSIC_TWINS 9 // used for other trainer classes too
#define TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR 10
#define TRAINER_ENCOUNTER_MUSIC_HIKER 11 // used for other trainer classes too
#define TRAINER_ENCOUNTER_MUSIC_INTERVIEWER 12
#define TRAINER_ENCOUNTER_MUSIC_RICH 13 // Rich Boys and Gentlemen
#define F_TRAINER_FEMALE (1 << 7)
#define TRAINER_PIC_AQUA_LEADER 0
#define TRAINER_PIC_TEAM_AQUA 1
#define TRAINER_PIC_TEAM_AQUA_2 2
#define TRAINER_PIC_AROMA_LADY 3
#define TRAINER_PIC_RUIN_MANIAC 4
#define TRAINER_PIC_INTERVIEWER 5
#define TRAINER_PIC_TUBER 6
#define TRAINER_PIC_TUBER_2 7
#define TRAINER_PIC_COOLTRAINER 8
#define TRAINER_PIC_COOLTRAINER_2 9
#define TRAINER_PIC_HEX_MANIAC 10
#define TRAINER_PIC_LADY 11
#define TRAINER_PIC_BEAUTY 12
#define TRAINER_PIC_RICH_BOY 13
#define TRAINER_PIC_POKEMANIAC 14
#define TRAINER_PIC_SWIMMER_MALE 15
#define TRAINER_PIC_BLACK_BELT 16
#define TRAINER_PIC_GUITARIST 17
#define TRAINER_PIC_KINDLER 18
#define TRAINER_PIC_CAMPER 19
#define TRAINER_PIC_BUG_MANIAC 20
#define TRAINER_PIC_PSYCHIC 21
#define TRAINER_PIC_PSYCHIC_2 22
#define TRAINER_PIC_GENTLEMAN 23
#define TRAINER_PIC_SIDNEY 24
#define TRAINER_PIC_PHOEBE 25
#define TRAINER_PIC_ROXANNE 26
#define TRAINER_PIC_BRAWLY 27
#define TRAINER_PIC_TATE_LIZA 28
#define TRAINER_PIC_SCHOOL_KID 29
#define TRAINER_PIC_SCHOOL_KID_2 30
#define TRAINER_PIC_SR_AND_JR 31
#define TRAINER_PIC_POKEFAN 32
#define TRAINER_PIC_POKEFAN_2 33
#define TRAINER_PIC_EXPERT 34
#define TRAINER_PIC_EXPERT_2 35
#define TRAINER_PIC_BOARDER 36
#define TRAINER_PIC_CHAMPION 37
#define TRAINER_PIC_FISHERMAN 38
#define TRAINER_PIC_TRIATHLETE 39
#define TRAINER_PIC_TRIATHLETE_2 40
#define TRAINER_PIC_TRIATHLETE_3 41
#define TRAINER_PIC_TRIATHLETE_4 42
#define TRAINER_PIC_TRIATHLETE_5 43
#define TRAINER_PIC_TRIATHLETE_6 44
#define TRAINER_PIC_DRAGON_TAMER 45
#define TRAINER_PIC_BIRD_KEEPER 46
#define TRAINER_PIC_NINJA_BOY 47
#define TRAINER_PIC_BATTLE_GIRL 48
#define TRAINER_PIC_PARASOL_LADY 49
#define TRAINER_PIC_SWIMMER_FEMALE 50
#define TRAINER_PIC_PICNICKER 51
#define TRAINER_PIC_TWINS 52
#define TRAINER_PIC_SAILOR 53
#define TRAINER_PIC_COLLECTOR 54
#define TRAINER_PIC_PKMN_TRAINER 55
#define TRAINER_PIC_PKMN_TRAINER_2 56
#define TRAINER_PIC_PKMN_TRAINER_3 57
#define TRAINER_PIC_PKMN_BREEDER 58
#define TRAINER_PIC_PKMN_BREEDER_2 59
#define TRAINER_PIC_PKMN_RANGER 60
#define TRAINER_PIC_PKMN_RANGER_2 61
#define TRAINER_PIC_MAGMA_LEADER 62
#define TRAINER_PIC_TEAM_MAGMA 63
#define TRAINER_PIC_TEAM_MAGMA_2 64
#define TRAINER_PIC_LASS 65
#define TRAINER_PIC_BUG_CATCHER 66
#define TRAINER_PIC_HIKER 67
#define TRAINER_PIC_YOUNG_COUPLE 68
#define TRAINER_PIC_OLD_COUPLE 69
#define TRAINER_PIC_SIS_AND_BRO 70
#define TRAINER_PIC_MATT 71
#define TRAINER_PIC_SHELLY 72
#define TRAINER_PIC_TABITHA 73
#define TRAINER_PIC_COURTNEY 74
#define TRAINER_PIC_WATTSON 75
#define TRAINER_PIC_FLANNERY 76
#define TRAINER_PIC_NORMAN 77
#define TRAINER_PIC_WINONA 78
#define TRAINER_PIC_WALLACE 79
#define TRAINER_PIC_GLACIA 80
#define TRAINER_PIC_DRAKE 81
#define TRAINER_PIC_YOUNGSTER 82
#define TRAINER_PIC_BUG_CATCHER_2 83
#define TRAINER_PIC_LASS_2 84
#define TRAINER_PIC_SAILOR_2 85
#define TRAINER_PIC_CAMPER_2 86
#define TRAINER_PIC_PICNICKER_2 87
#define TRAINER_PIC_POKEMANIAC_2 88
#define TRAINER_PIC_SUPER_NERD 89
#define TRAINER_PIC_HIKER_2 90
#define TRAINER_PIC_BIKER 91
#define TRAINER_PIC_BURGLAR 92
#define TRAINER_PIC_ENGINEER 93
#define TRAINER_PIC_FISHERMAN_2 94
#define TRAINER_PIC_SWIMMER_MALE_2 95
#define TRAINER_PIC_CUE_BALL 96
#define TRAINER_PIC_GAMER 97
#define TRAINER_PIC_BEAUTY_2 98
#define TRAINER_PIC_SWIMMER_FEMALE_2 99
#define TRAINER_PIC_PSYCHIC_3 100
#define TRAINER_PIC_ROCKER 101
#define TRAINER_PIC_JUGGLER 102
#define TRAINER_PIC_TAMER 103
#define TRAINER_PIC_BIRD_KEEPER_2 104
#define TRAINER_PIC_BLACK_BELT_2 105
#define TRAINER_PIC_RIVAL 106
#define TRAINER_PIC_SCIENTIST 107
#define TRAINER_PIC_BOSS 108
#define TRAINER_PIC_TEAM_ROCKET 109
#define TRAINER_PIC_COOLTRAINER_3 110
#define TRAINER_PIC_COOLTRAINER_4 111
#define TRAINER_PIC_LORELEI 112
#define TRAINER_PIC_BRUNO 113
#define TRAINER_PIC_AGATHA 114
#define TRAINER_PIC_LANCE 115
#define TRAINER_PIC_BROCK 116
#define TRAINER_PIC_MISTY 117
#define TRAINER_PIC_LT_SURGE 118
#define TRAINER_PIC_ERIKA 119
#define TRAINER_PIC_KOGA 120
#define TRAINER_PIC_BLAINE 121
#define TRAINER_PIC_SABRINA 122
#define TRAINER_PIC_GENTLEMAN_2 123
#define TRAINER_PIC_RIVAL_2 124
#define TRAINER_PIC_RIVAL_3 125
#define TRAINER_PIC_CHANNELER 126
#define TRAINER_PIC_TWINS_2 127
#define TRAINER_PIC_COOL_COUPLE 128
#define TRAINER_PIC_YOUNG_COUPLE_2 129
#define TRAINER_PIC_CRUSH_KIN 130
#define TRAINER_PIC_SIS_AND_BRO_2 131
#define TRAINER_PIC_PROF_OAK 132
#define TRAINER_PIC_BRENDAN 133
#define TRAINER_PIC_MAY 134
#define TRAINER_PIC_RED 135
#define TRAINER_PIC_LEAF 136
#define TRAINER_PIC_TEAM_ROCKET_2 137
#define TRAINER_PIC_PSYCHIC_4 138
#define TRAINER_PIC_CRUSH_GIRL 139
#define TRAINER_PIC_TUBER_3 140
#define TRAINER_PIC_PKMN_BREEDER_3 141
#define TRAINER_PIC_PKMN_RANGER_3 142
#define TRAINER_PIC_PKMN_RANGER_4 143
#define TRAINER_PIC_AROMA_LADY_2 144
#define TRAINER_PIC_RUIN_MANIAC_2 145
#define TRAINER_PIC_LADY_2 146
#define TRAINER_PIC_PAINTER 147
// All trainer parties specify the IV, level, and species for each Pokémon in the
// party. Some trainer parties also specify held items and custom moves for each
// Pokémon.
ld_script.txt
+2
View File
@@ -384,6 +384,8 @@ SECTIONS {
src/main_menu.o(.rodata);
src/data.o(.rodata);
data/data.o(.rodata);
src/trainers.o(.rodata);
data/data.o(.rodata.8245EE0);
src/battle_util.o(.rodata);
src/battle_script_commands.o(.rodata);
src/battle_controller_player.o(.rodata);
src/trainers.c
+20593
View File
File diff suppressed because it is too large Load Diff