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

battle_message 1

Browse Source
This commit is contained in:
PikalaxALT
2019-11-23 16:51:05 -05:00
committed by Evan
parent 1ffe7f78cb
commit aa0d8cdaa0
14 changed files with 2236 additions and 5293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_message.s
+28 -2202
View File
File diff suppressed because it is too large Load Diff
data/battle_message.s
-2923
View File
File diff suppressed because it is too large Load Diff
include/battle.h
+1 -2
View File
@@ -24,8 +24,7 @@
#define TRAINER_OPPONENT_3FE 0x3FE
#define TRAINER_OPPONENT_C00 0xC00
#define TRAINER_OPPONENT_800 0x800
#define STEVEN_PARTNER_ID 0xC03
#define TRAINER_LINK_OPPONENT 0x800
#define SECRET_BASE_OPPONENT 0x400
#define B_ACTION_USE_MOVE 0
include/battle_message.h
+3 -7
View File
@@ -51,13 +51,9 @@
#define B_TXT_DEF_PREFIX2 0x2B
#define B_TXT_ATK_PREFIX3 0x2C
#define B_TXT_DEF_PREFIX3 0x2D
#define B_TXT_TRAINER2_CLASS 0x2E
#define B_TXT_TRAINER2_NAME 0x2F
#define B_TXT_TRAINER2_LOSE_TEXT 0x30
#define B_TXT_TRAINER2_WIN_TEXT 0x31
#define B_TXT_PARTNER_CLASS 0x32
#define B_TXT_PARTNER_NAME 0x33
#define B_TXT_BUFF3 0x34
#define B_TXT_TRAINER2_LOSE_TEXT 0x2E
#define B_TXT_TRAINER2_WIN_TEXT 0x2F
#define B_TXT_BUFF3 0x30
// for B_TXT_BUFF1, B_TXT_BUFF2 and B_TXT_BUFF3
include/battle_string_ids.h
+1 -1
View File
@@ -387,6 +387,6 @@
#define STRINGID_TRAINER1MON2COMEBACK 384
#define STRINGID_TRAINER1MON1AND2COMEBACK 385
#define BATTLESTRINGS_COUNT 386
#define BATTLESTRINGS_COUNT 374
#endif // GUARD_BATTLE_STRING_IDS_H
include/battle_tower.h
+5
View File
@@ -33,5 +33,10 @@ void ValidateEReaderTrainer(void);
u8 GetBattleTowerTrainerFrontSpriteId(void);
u8 GetEreaderTrainerFrontSpriteId(void);
void CopyEReaderTrainerName5(u8 *dest);
void sub_815DC40(u8 *dest, u8 opponentIdx);
void sub_815DBF4(u8 *dest, u8 opponentIdx);
void GetBattleTowerTrainerName(u8 *text);
u8 GetEreaderTrainerClassId(void);
u8 GetBattleTowerTrainerClassNameId(void);
#endif //GUARD_BATTLE_TOWER_H
include/constants/trainers.h
-149
View File
@@ -170,155 +170,6 @@
#define F_TRAINER_FEMALE (1 << 7)
#define TRAINER_PIC_AQUA_LEADER_ARCHIE 0
#define TRAINER_PIC_AQUA_GRUNT_M 1
#define TRAINER_PIC_AQUA_GRUNT_F 2
#define TRAINER_PIC_RS_AROMA_LADY 3
#define TRAINER_PIC_RS_RUIN_MANIAC 4
#define TRAINER_PIC_INTERVIEWER 5
#define TRAINER_PIC_RS_TUBER_F 6
#define TRAINER_PIC_TUBER_M 7
#define TRAINER_PIC_RS_COOLTRAINER_M 8
#define TRAINER_PIC_RS_COOLTRAINER_F 9
#define TRAINER_PIC_HEX_MANIAC 10
#define TRAINER_PIC_RS_LADY 11
#define TRAINER_PIC_RS_BEAUTY 12
#define TRAINER_PIC_RICH_BOY 13
#define TRAINER_PIC_RS_POKEMANIAC 14
#define TRAINER_PIC_RS_SWIMMER_M 15
#define TRAINER_PIC_RS_BLACK_BELT 16
#define TRAINER_PIC_GUITARIST 17
#define TRAINER_PIC_KINDLER 18
#define TRAINER_PIC_RS_CAMPER 19
#define TRAINER_PIC_BUG_MANIAC 20
#define TRAINER_PIC_RS_PSYCHIC_M 21
#define TRAINER_PIC_RS_PSYCHIC_F 22
#define TRAINER_PIC_RS_GENTLEMAN 23
#define TRAINER_PIC_ELITE_FOUR_SIDNEY 24
#define TRAINER_PIC_ELITE_FOUR_PHOEBE 25
#define TRAINER_PIC_LEADER_ROXANNE 26
#define TRAINER_PIC_LEADER_BRAWLY 27
#define TRAINER_PIC_LEADER_TATE_AND_LIZA 28
#define TRAINER_PIC_SCHOOL_KID_M 29
#define TRAINER_PIC_SCHOOL_KID_F 30
#define TRAINER_PIC_SR_AND_JR 31
#define TRAINER_PIC_POKEFAN_M 32
#define TRAINER_PIC_POKEFAN_F 33
#define TRAINER_PIC_EXPERT_M 34
#define TRAINER_PIC_EXPERT_F 35
#define TRAINER_PIC_RS_YOUNGSTER 36
#define TRAINER_PIC_CHAMPION_STEVEN 37
#define TRAINER_PIC_RS_FISHERMAN 38
#define TRAINER_PIC_CYCLING_TRIATHLETE_M 39
#define TRAINER_PIC_CYCLING_TRIATHLETE_F 40
#define TRAINER_PIC_RUNNING_TRIATHLETE_M 41
#define TRAINER_PIC_RUNNING_TRIATHLETE_F 42
#define TRAINER_PIC_SWIMMING_TRIATHLETE_M 43
#define TRAINER_PIC_SWIMMING_TRIATHLETE_F 44
#define TRAINER_PIC_DRAGON_TAMER 45
#define TRAINER_PIC_RS_BIRD_KEEPER 46
#define TRAINER_PIC_NINJA_BOY 47
#define TRAINER_PIC_BATTLE_GIRL 48
#define TRAINER_PIC_PARASOL_LADY 49
#define TRAINER_PIC_RS_SWIMMER_F 50
#define TRAINER_PIC_RS_PICNICKER 51
#define TRAINER_PIC_RS_TWINS 52
#define TRAINER_PIC_RS_SAILOR 53
#define TRAINER_PIC_COLLECTOR 54
#define TRAINER_PIC_WALLY 55
#define TRAINER_PIC_RS_BRENDAN_1 56
#define TRAINER_PIC_RS_MAY_1 57
#define TRAINER_PIC_POKEMON_BREEDER_M 58
#define TRAINER_PIC_RS_POKEMON_BREEDER_F 59
#define TRAINER_PIC_RS_POKEMON_RANGER_M 60
#define TRAINER_PIC_RS_POKEMON_RANGER_F 61
#define TRAINER_PIC_MAGMA_LEADER_MAXIE 62
#define TRAINER_PIC_MAGMA_GRUNT_M 63
#define TRAINER_PIC_MAGMA_GRUNT_F 64
#define TRAINER_PIC_RS_LASS 65
#define TRAINER_PIC_RS_BUG_CATCHER 66
#define TRAINER_PIC_RS_HIKER 67
#define TRAINER_PIC_RS_YOUNG_COUPLE 68
#define TRAINER_PIC_OLD_COUPLE 69
#define TRAINER_PIC_RS_SIS_AND_BRO 70
#define TRAINER_PIC_AQUA_ADMIN_M 71
#define TRAINER_PIC_AQUA_ADMIN_F 72
#define TRAINER_PIC_MAGMA_ADMIN_M 73
#define TRAINER_PIC_MAGMA_ADMIN_F 74
#define TRAINER_PIC_LEADER_WATTSON 75
#define TRAINER_PIC_LEADER_FLANNERY 76
#define TRAINER_PIC_LEADER_NORMAN 77
#define TRAINER_PIC_LEADER_WINONA 78
#define TRAINER_PIC_LEADER_WALLACE 79
#define TRAINER_PIC_ELITE_FOUR_GLACIA 80
#define TRAINER_PIC_ELITE_FOUR_DRAKE 81
#define TRAINER_PIC_YOUNGSTER 82
#define TRAINER_PIC_BUG_CATCHER 83
#define TRAINER_PIC_LASS 84
#define TRAINER_PIC_SAILOR 85
#define TRAINER_PIC_CAMPER 86
#define TRAINER_PIC_PICNICKER 87
#define TRAINER_PIC_POKEMANIAC 88
#define TRAINER_PIC_SUPER_NERD 89
#define TRAINER_PIC_HIKER 90
#define TRAINER_PIC_BIKER 91
#define TRAINER_PIC_BURGLAR 92
#define TRAINER_PIC_ENGINEER 93
#define TRAINER_PIC_FISHERMAN 94
#define TRAINER_PIC_SWIMMER_M 95
#define TRAINER_PIC_CUE_BALL 96
#define TRAINER_PIC_GAMER 97
#define TRAINER_PIC_BEAUTY 98
#define TRAINER_PIC_SWIMMER_F 99
#define TRAINER_PIC_PSYCHIC_M 100
#define TRAINER_PIC_ROCKER 101
#define TRAINER_PIC_JUGGLER 102
#define TRAINER_PIC_TAMER 103
#define TRAINER_PIC_BIRD_KEEPER 104
#define TRAINER_PIC_BLACK_BELT 105
#define TRAINER_PIC_RIVAL_1 106
#define TRAINER_PIC_SCIENTIST 107
#define TRAINER_PIC_LEADER_GIOVANNI 108
#define TRAINER_PIC_ROCKET_GRUNT_M 109
#define TRAINER_PIC_COOLTRAINER_M 110
#define TRAINER_PIC_COOLTRAINER_F 111
#define TRAINER_PIC_ELITE_FOUR_LORELEI 112
#define TRAINER_PIC_ELITE_FOUR_BRUNO 113
#define TRAINER_PIC_ELITE_FOUR_AGATHA 114
#define TRAINER_PIC_ELITE_FOUR_LANCE 115
#define TRAINER_PIC_LEADER_BROCK 116
#define TRAINER_PIC_LEADER_MISTY 117
#define TRAINER_PIC_LEADER_LT_SURGE 118
#define TRAINER_PIC_LEADER_ERIKA 119
#define TRAINER_PIC_LEADER_KOGA 120
#define TRAINER_PIC_LEADER_BLAINE 121
#define TRAINER_PIC_LEADER_SABRINA 122
#define TRAINER_PIC_GENTLEMAN 123
#define TRAINER_PIC_RIVAL_2 124
#define TRAINER_PIC_CHAMPION_RIVAL 125
#define TRAINER_PIC_CHANNELER 126
#define TRAINER_PIC_TWINS 127
#define TRAINER_PIC_COOL_COUPLE 128
#define TRAINER_PIC_YOUNG_COUPLE 129
#define TRAINER_PIC_CRUSH_KIN 130
#define TRAINER_PIC_SIS_AND_BRO 131
#define TRAINER_PIC_PROFESSOR_OAK 132
#define TRAINER_PIC_RS_BRENDAN_2 133
#define TRAINER_PIC_RS_MAY_2 134
#define TRAINER_PIC_RED 135
#define TRAINER_PIC_LEAF 136
#define TRAINER_PIC_ROCKET_GRUNT_F 137
#define TRAINER_PIC_PSYCHIC_F 138
#define TRAINER_PIC_CRUSH_GIRL 139
#define TRAINER_PIC_TUBER_F 140
#define TRAINER_PIC_POKEMON_BREEDER_F 141
#define TRAINER_PIC_POKEMON_RANGER_M 142
#define TRAINER_PIC_POKEMON_RANGER_F 143
#define TRAINER_PIC_AROMA_LADY 144
#define TRAINER_PIC_RUIN_MANIAC 145
#define TRAINER_PIC_LADY 146
#define TRAINER_PIC_PAINTER 147
#define TRAINER_NONE 0
#define TRAINER_AQUA_LEADER_1 1
#define TRAINER_TEAM_AQUA_1 2
include/data.h
+2
View File
@@ -22,6 +22,8 @@ extern const u16 gUnknown_8251FEE[];
extern const u16 gUnknown_8252324[];
extern const u16 gUnknown_82539D4[];
extern const u8 gTrainerClassNames[][13];
extern const struct MonCoords gMonFrontPicCoords[];
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
extern const struct MonCoords gMonBackPicCoords[];
include/event_scripts.h
+6
View File
@@ -1188,4 +1188,10 @@ extern const u8 Text_1BCAF2[];
extern const u8 EventScript_RepelWoreOff[];
// battle_message
extern const u8 Text_1A5CF1[];
extern const u8 Text_1A5D31[];
extern const u8 Text_1A5D6E[];
extern const u8 Text_1A5DB1[];
#endif //GUARD_EVENT_SCRIPTS_H
include/strings.h
+1 -1
View File
@@ -193,7 +193,7 @@ extern const u8 BattleText_GetPumped[];
extern const u8 BattleText_MistShroud[];
extern const u8 gText_BadEgg[];
extern const u8 gText_PkmnsXPreventsSwitching[];
extern u8 *gUnknown_83FD5D0[];
extern const u8 *const gUnknown_83FD5D0[];
// diploma
extern const u8 gUnknown_841B60E[];
include/trainer_tower.h
+2
View File
@@ -6,5 +6,7 @@ void InitTrainerTowerBattleStruct(void);
void FreeTrainerTowerBattleStruct(void);
u8 GetTrainerTowerTrainerFrontSpriteId(void);
void ResetTrainerTowerResults(void);
void sub_815DA28(u8 *text);
u8 sub_815DA10(void);
#endif //GUARD_TRAINER_TOWER_H
ld_script.txt
+2 -1
View File
@@ -195,6 +195,7 @@ SECTIONS {
src/fldeff_strength.o(.text);
src/battle_transition.o(.text);
src/battle_controller_link_partner.o(.text);
src/battle_message.o(.text);
asm/battle_message.o(.text);
src/math_util.o(.text);
src/roulette_util.o(.text);
@@ -477,7 +478,7 @@ SECTIONS {
src/evolution_scene.o(.rodata);
src/battle_transition.o(.rodata);
src/battle_controller_link_partner.o(.rodata);
data/battle_message.o(.rodata);
src/battle_message.o(.rodata);
src/save.o(.rodata);
data/field_effect_helpers.o(.rodata);
src/battle_controller_safari.o(.rodata);
src/battle_message.c
+2184
View File
File diff suppressed because it is too large Load Diff
sym_ewram.txt
+1 -7
View File
@@ -426,14 +426,8 @@ gPlayerFacingPosition: @ 2039A04
.include "src/coins.o"
.align 2
.include "src/battle_transition.o"
.align 2
gUnknown_2039A30: @ 2039A30
.space 0x4
gUnknown_2039A34: @ 2039A34
.space 0x4
.include "src/battle_message.o"
.align 2
.include "src/save.o"
.align 2