mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-11-17 03:57:38 +01:00
Merge branch 'master' of https://github.com/pret/pokeemerald into use_build
This commit is contained in:
ProjectRevoTPP
commit
f1d07acc48
@ -4401,7 +4401,7 @@ sub_8059B3C: @ 8059B3C
|
||||
ldrb r0, [r0]
|
||||
cmp r0, 0x1
|
||||
beq _08059B98
|
||||
bl sub_814FBAC
|
||||
bl SetPpNumbersPaletteInMoveSelection
|
||||
ldrb r1, [r7]
|
||||
lsls r4, r1, 9
|
||||
adds r0, r5, 0x4
|
||||
|
||||
@ -20577,7 +20577,7 @@ _081A5328:
|
||||
movs r0, 0x1
|
||||
negs r0, r0
|
||||
strb r0, [r1, 0x1]
|
||||
ldr r0, =gText_JapaneseHonorific
|
||||
ldr r0, =gText_PlayerMon1Name
|
||||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
ldr r4, =gDisplayedStringBattle
|
||||
adds r0, r4, 0
|
||||
@ -20586,7 +20586,7 @@ _081A5328:
|
||||
ldr r0, =gText_Vs
|
||||
movs r1, 0x10
|
||||
bl sub_814F9EC
|
||||
ldr r0, =gText_RivalBuffer
|
||||
ldr r0, =gText_OpponentMon1Name
|
||||
bl BattleStringExpandPlaceholdersToDisplayedString
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x11
|
||||
|
||||
@ -665,7 +665,7 @@ _0817D16C:
|
||||
bl _0817DFAC
|
||||
.pool
|
||||
_0817D1B8:
|
||||
ldr r1, =gUnknown_02022F5C
|
||||
ldr r1, =gBattleTextBuff1 + 4
|
||||
ldrb r0, [r1]
|
||||
cmp r0, 0
|
||||
beq _0817D1C4
|
||||
@ -917,7 +917,7 @@ _0817D3C0:
|
||||
bne _0817D3CC
|
||||
bl _0817E0A6
|
||||
_0817D3CC:
|
||||
ldr r1, =gUnknown_02022F6A
|
||||
ldr r1, =gBattleTextBuff2 + 2
|
||||
ldrh r0, [r1]
|
||||
cmp r0, 0xD1
|
||||
bne _0817D3E8
|
||||
@ -946,7 +946,7 @@ _0817D3FE:
|
||||
ldrb r1, [r1]
|
||||
cmp r0, r1
|
||||
bne _0817D436
|
||||
ldr r1, =gUnknown_02022F6A
|
||||
ldr r1, =gBattleTextBuff2 + 2
|
||||
ldrh r0, [r1]
|
||||
cmp r0, 0xD1
|
||||
bne _0817D42C
|
||||
@ -988,7 +988,7 @@ _0817D45C:
|
||||
bne _0817D468
|
||||
bl _0817E0A6
|
||||
_0817D468:
|
||||
ldr r1, =gUnknown_02022F6A
|
||||
ldr r1, =gBattleTextBuff2 + 2
|
||||
ldrh r0, [r1]
|
||||
cmp r0, 0xD3
|
||||
bne _0817D484
|
||||
@ -2182,7 +2182,7 @@ _0817DE10:
|
||||
b _0817DFAA
|
||||
.pool
|
||||
_0817DE58:
|
||||
ldr r1, =gUnknown_02022F5A
|
||||
ldr r1, =gBattleTextBuff1 + 2
|
||||
ldrh r0, [r1]
|
||||
cmp r0, 0x73
|
||||
bne _0817DE82
|
||||
@ -2204,7 +2204,7 @@ _0817DE58:
|
||||
ands r0, r2
|
||||
strb r0, [r1]
|
||||
_0817DE82:
|
||||
ldr r2, =gUnknown_02022F5A
|
||||
ldr r2, =gBattleTextBuff1 + 2
|
||||
ldrh r0, [r2]
|
||||
cmp r0, 0x71
|
||||
bne _0817DEAA
|
||||
@ -2225,7 +2225,7 @@ _0817DE82:
|
||||
ands r0, r2
|
||||
strb r0, [r1]
|
||||
_0817DEAA:
|
||||
ldr r1, =gUnknown_02022F5A
|
||||
ldr r1, =gBattleTextBuff1 + 2
|
||||
ldrh r0, [r1]
|
||||
cmp r0, 0x36
|
||||
beq _0817DEB4
|
||||
|
||||
3089
asm/battle_message.s
3089
asm/battle_message.s
File diff suppressed because it is too large
Load Diff
@ -2617,8 +2617,8 @@ _080B1C96:
|
||||
.pool
|
||||
thumb_func_end sub_80B1C7C
|
||||
|
||||
thumb_func_start sub_80B1CA4
|
||||
sub_80B1CA4: @ 80B1CA4
|
||||
thumb_func_start GetTrainer1LoseText
|
||||
GetTrainer1LoseText: @ 80B1CA4
|
||||
push {r4,lr}
|
||||
ldr r0, =gTrainerBattleOpponent_A
|
||||
ldrh r1, [r0]
|
||||
@ -2643,10 +2643,10 @@ _080B1CC0:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_80B1CA4
|
||||
thumb_func_end GetTrainer1LoseText
|
||||
|
||||
thumb_func_start sub_80B1CE0
|
||||
sub_80B1CE0: @ 80B1CE0
|
||||
thumb_func_start GetTrainer2LoseText
|
||||
GetTrainer2LoseText: @ 80B1CE0
|
||||
push {r4,lr}
|
||||
ldr r4, =gStringVar4
|
||||
ldr r0, =gUnknown_02038BE0
|
||||
@ -2660,7 +2660,7 @@ sub_80B1CE0: @ 80B1CE0
|
||||
pop {r1}
|
||||
bx r1
|
||||
.pool
|
||||
thumb_func_end sub_80B1CE0
|
||||
thumb_func_end GetTrainer2LoseText
|
||||
|
||||
thumb_func_start sub_80B1D04
|
||||
sub_80B1D04: @ 80B1D04
|
||||
|
||||
@ -5857,8 +5857,8 @@ sub_8165244: @ 8165244
|
||||
.pool
|
||||
thumb_func_end sub_8165244
|
||||
|
||||
thumb_func_start sub_8165264
|
||||
sub_8165264: @ 8165264
|
||||
thumb_func_start GetEreaderTrainerClassId
|
||||
GetEreaderTrainerClassId: @ 8165264
|
||||
ldr r1, =gTrainerClassToNameIndex
|
||||
ldr r0, =gSaveBlock2Ptr
|
||||
ldr r0, [r0]
|
||||
@ -5869,10 +5869,10 @@ sub_8165264: @ 8165264
|
||||
ldrb r0, [r0]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end sub_8165264
|
||||
thumb_func_end GetEreaderTrainerClassId
|
||||
|
||||
thumb_func_start sub_8165284
|
||||
sub_8165284: @ 8165284
|
||||
thumb_func_start GetEreaderTrainerName
|
||||
GetEreaderTrainerName: @ 8165284
|
||||
push {r4,lr}
|
||||
adds r3, r0, 0
|
||||
movs r2, 0
|
||||
@ -5896,7 +5896,7 @@ _08165294:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8165284
|
||||
thumb_func_end GetEreaderTrainerName
|
||||
|
||||
thumb_func_start sub_81652B4
|
||||
sub_81652B4: @ 81652B4
|
||||
|
||||
@ -7571,7 +7571,7 @@ sub_81C3B08: @ 81C3B08
|
||||
adds r7, r4, 0
|
||||
ldrb r0, [r5]
|
||||
adds r1, r6, 0
|
||||
bl sub_814FC20
|
||||
bl GetCurrentPpToMaxPpState
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
adds r5, r0, 0
|
||||
|
||||
@ -7347,7 +7347,7 @@ sub_8139228: @ 8139228
|
||||
sub_8139238: @ 8139238
|
||||
push {lr}
|
||||
ldr r0, =gStringVar1
|
||||
bl sub_8165284
|
||||
bl GetEreaderTrainerName
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
|
||||
@ -355,12 +355,12 @@ B_LINK_OPPONENT_MON1_NAME = FD 0A
|
||||
B_LINK_PLAYER_MON2_NAME = FD 0B
|
||||
B_LINK_OPPONENT_MON2_NAME = FD 0C
|
||||
B_ATK_NAME_WITH_PREFIX_MON1 = FD 0D
|
||||
B_ATK_NAME = FD 0E
|
||||
B_ATK_PARTNER_NAME = FD 0E
|
||||
B_ATK_NAME_WITH_PREFIX = FD 0F
|
||||
B_DEF_NAME_WITH_PREFIX = FD 10
|
||||
B_EFF_NAME_WITH_PREFIX = FD 11 @ EFF = short for gEffectBank
|
||||
B_SCR_ACTIVE_NAME_WITH_PREFIX = FD 12
|
||||
B_ACTIVE_NAME_WITH_PREFIX = FD 13
|
||||
B_ACTIVE_NAME_WITH_PREFIX = FD 12
|
||||
B_SCR_ACTIVE_NAME_WITH_PREFIX = FD 13
|
||||
B_CURRENT_MOVE = FD 14
|
||||
B_LAST_MOVE = FD 15
|
||||
B_LAST_ITEM = FD 16
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -604,7 +604,7 @@ struct BattleStruct
|
||||
u8 field_8B;
|
||||
u8 field_8C;
|
||||
u8 field_8D;
|
||||
u8 field_8E;
|
||||
u8 stringMoveType;
|
||||
u8 expGetterBank;
|
||||
u8 field_90;
|
||||
u8 field_91;
|
||||
|
||||
@ -15,6 +15,7 @@ void SwapTurnOrder(u8 id1, u8 id2);
|
||||
void BattleTurnPassed(void);
|
||||
void RunBattleScriptCommands_PopCallbacksStack(void);
|
||||
void RunBattleScriptCommands(void);
|
||||
u32 sub_80397C4(u32 setId, u32 tableId);
|
||||
void sub_8039E9C(struct Sprite *sprite);
|
||||
|
||||
extern const u8 gStatusConditionString_PoisonJpn[8];
|
||||
@ -25,6 +26,6 @@ extern const u8 gStatusConditionString_IceJpn[8];
|
||||
extern const u8 gStatusConditionString_ConfusionJpn[8];
|
||||
extern const u8 gStatusConditionString_LoveJpn[8];
|
||||
|
||||
extern const u8 * const gStatusConditionStringsTable[][2];
|
||||
extern const u8 * const gStatusConditionStringsTable[7][2];
|
||||
|
||||
#endif // GUARD_BATTLE_2_H
|
||||
|
||||
@ -39,8 +39,8 @@ struct MovePpInfo
|
||||
struct ChooseMoveStruct
|
||||
{
|
||||
u16 moves[4];
|
||||
u8 ppNumbers[4];
|
||||
u8 ppWithBonusNumbers[4];
|
||||
u8 currentPp[4];
|
||||
u8 maxPp[4];
|
||||
u16 species;
|
||||
u8 monType1;
|
||||
u8 monType2;
|
||||
|
||||
@ -3,59 +3,59 @@
|
||||
|
||||
// for 0xFD
|
||||
|
||||
#define B_TXT_BUFF1 00
|
||||
#define B_TXT_BUFF2 01
|
||||
#define B_TXT_COPY_VAR_1 02
|
||||
#define B_TXT_COPY_VAR_2 03
|
||||
#define B_TXT_COPY_VAR_3 04
|
||||
#define B_TXT_PLAYER_MON1_NAME 05
|
||||
#define B_TXT_OPPONENT_MON1_NAME 06
|
||||
#define B_TXT_PLAYER_MON2_NAME 07
|
||||
#define B_TXT_OPPONENT_MON2_NAME 08
|
||||
#define B_TXT_LINK_PLAYER_MON1_NAME 09
|
||||
#define B_TXT_LINK_OPPONENT_MON1_NAME 0A
|
||||
#define B_TXT_LINK_PLAYER_MON2_NAME 0B
|
||||
#define B_TXT_LINK_OPPONENT_MON2_NAME 0C
|
||||
#define B_TXT_ATK_NAME_WITH_PREFIX_MON1 0D
|
||||
#define B_TXT_ATK_NAME 0E
|
||||
#define B_TXT_ATK_NAME_WITH_PREFIX 0F
|
||||
#define B_TXT_DEF_NAME_WITH_PREFIX 10
|
||||
#define B_TXT_EFF_NAME_WITH_PREFIX 11 // EFF = short for gEffectBank
|
||||
#define B_TXT_SCR_ACTIVE_NAME_WITH_PREFIX 12
|
||||
#define B_TXT_ACTIVE_NAME_WITH_PREFIX 13
|
||||
#define B_TXT_CURRENT_MOVE 14
|
||||
#define B_TXT_LAST_MOVE 15
|
||||
#define B_TXT_LAST_ITEM 16
|
||||
#define B_TXT_LAST_ABILITY 17
|
||||
#define B_TXT_ATK_ABILITY 18
|
||||
#define B_TXT_DEF_ABILITY 19
|
||||
#define B_TXT_SCR_ACTIVE_ABILITY 1A
|
||||
#define B_TXT_EFF_ABILITY 1B
|
||||
#define B_TXT_TRAINER1_CLASS 1C
|
||||
#define B_TXT_TRAINER1_NAME 1D
|
||||
#define B_TXT_1E 1E // trainer name for a link player
|
||||
#define B_TXT_1F 1F // trainer name for a link player
|
||||
#define B_TXT_20 20 // trainer name for a link player
|
||||
#define B_TXT_21 21 // trainer name for a link player
|
||||
#define B_TXT_22 22 // trainer name for a link player
|
||||
#define B_TXT_PLAYER_NAME 23
|
||||
#define B_TXT_TRAINER1_LOSE_TEXT 24
|
||||
#define B_TXT_TRAINER1_WIN_TEXT 25
|
||||
#define B_TXT_26 26
|
||||
#define B_TXT_PC_CREATOR_NAME 27
|
||||
#define B_TXT_ATK_PREFIX1 28
|
||||
#define B_TXT_DEF_PREFIX1 29
|
||||
#define B_TXT_ATK_PREFIX2 2A
|
||||
#define B_TXT_DEF_PREFIX2 2B
|
||||
#define B_TXT_ATK_PREFIX3 2C
|
||||
#define B_TXT_DEF_PREFIX3 2D
|
||||
#define B_TXT_TRAINER2_CLASS 2E
|
||||
#define B_TXT_TRAINER2_NAME 2F
|
||||
#define B_TXT_TRAINER2_LOSE_TEXT 30
|
||||
#define B_TXT_TRAINER2_WIN_TEXT 31
|
||||
#define B_TXT_PARTNER_CLASS 32
|
||||
#define B_TXT_PARTNER_NAME 33
|
||||
#define B_TXT_BUFF3 34
|
||||
#define B_TXT_BUFF1 0x0
|
||||
#define B_TXT_BUFF2 0x1
|
||||
#define B_TXT_COPY_VAR_1 0x2
|
||||
#define B_TXT_COPY_VAR_2 0x3
|
||||
#define B_TXT_COPY_VAR_3 0x4
|
||||
#define B_TXT_PLAYER_MON1_NAME 0x5
|
||||
#define B_TXT_OPPONENT_MON1_NAME 0x6
|
||||
#define B_TXT_PLAYER_MON2_NAME 0x7
|
||||
#define B_TXT_OPPONENT_MON2_NAME 0x8
|
||||
#define B_TXT_LINK_PLAYER_MON1_NAME 0x9
|
||||
#define B_TXT_LINK_OPPONENT_MON1_NAME 0xA
|
||||
#define B_TXT_LINK_PLAYER_MON2_NAME 0xB
|
||||
#define B_TXT_LINK_OPPONENT_MON2_NAME 0xC
|
||||
#define B_TXT_ATK_NAME_WITH_PREFIX_MON1 0xD
|
||||
#define B_TXT_ATK_PARTNER_NAME 0xE
|
||||
#define B_TXT_ATK_NAME_WITH_PREFIX 0xF
|
||||
#define B_TXT_DEF_NAME_WITH_PREFIX 0x10
|
||||
#define B_TXT_EFF_NAME_WITH_PREFIX 0x11 // EFF = short for gEffectBank
|
||||
#define B_TXT_ACTIVE_NAME_WITH_PREFIX 0x12
|
||||
#define B_TXT_SCR_ACTIVE_NAME_WITH_PREFIX 0x13
|
||||
#define B_TXT_CURRENT_MOVE 0x14
|
||||
#define B_TXT_LAST_MOVE 0x15
|
||||
#define B_TXT_LAST_ITEM 0x16
|
||||
#define B_TXT_LAST_ABILITY 0x17
|
||||
#define B_TXT_ATK_ABILITY 0x18
|
||||
#define B_TXT_DEF_ABILITY 0x19
|
||||
#define B_TXT_SCR_ACTIVE_ABILITY 0x1A
|
||||
#define B_TXT_EFF_ABILITY 0x1B
|
||||
#define B_TXT_TRAINER1_CLASS 0x1C
|
||||
#define B_TXT_TRAINER1_NAME 0x1D
|
||||
#define B_TXT_1E 0x1E // trainer name for a link player
|
||||
#define B_TXT_1F 0x1F // trainer name for a link player
|
||||
#define B_TXT_20 0x20 // trainer name for a link player
|
||||
#define B_TXT_21 0x21 // trainer name for a link player
|
||||
#define B_TXT_22 0x22 // trainer name for a link player
|
||||
#define B_TXT_PLAYER_NAME 0x23
|
||||
#define B_TXT_TRAINER1_LOSE_TEXT 0x24
|
||||
#define B_TXT_TRAINER1_WIN_TEXT 0x25
|
||||
#define B_TXT_26 0x26
|
||||
#define B_TXT_PC_CREATOR_NAME 0x27
|
||||
#define B_TXT_ATK_PREFIX1 0x28
|
||||
#define B_TXT_DEF_PREFIX1 0x29
|
||||
#define B_TXT_ATK_PREFIX2 0x2A
|
||||
#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
|
||||
|
||||
// for B_TXT_BUFF1, B_TXT_BUFF2 and B_TXT_BUFF3
|
||||
|
||||
@ -205,12 +205,22 @@ void BufferStringBattle(u16 stringID);
|
||||
u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src);
|
||||
u32 BattleStringExpandPlaceholders(const u8* src, u8* dst);
|
||||
void sub_814F9EC(const u8* text, u8 arg1);
|
||||
void SetPpNumbersPaletteInMoveSelection(void);
|
||||
u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp);
|
||||
|
||||
extern u8 gBattleTextBuff1[];
|
||||
extern u8 gBattleTextBuff2[];
|
||||
extern u8 gBattleTextBuff3[];
|
||||
extern u8 gDisplayedStringBattle[];
|
||||
#define TEXT_BUFF_ARRAY_COUNT 16
|
||||
|
||||
extern u8 gDisplayedStringBattle[300];
|
||||
extern u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT];
|
||||
extern u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT];
|
||||
extern u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT];
|
||||
|
||||
extern const u8* const gStatNamesTable[];
|
||||
extern const u8* const gPokeblockWasTooXStringTable[];
|
||||
extern const u8* const gRefereeStringsTable[];
|
||||
extern const u8* const gStatNamesTable2[];
|
||||
|
||||
extern const u16 gMissStringIds[];
|
||||
extern const u16 gTrappingMoves[];
|
||||
|
||||
#endif // GUARD_BATTLE_MESSAGE_H
|
||||
|
||||
387
include/battle_string_ids.h
Normal file
387
include/battle_string_ids.h
Normal file
@ -0,0 +1,387 @@
|
||||
#ifndef GUARD_BATTLE_STRING_IDS_H
|
||||
#define GUARD_BATTLE_STRING_IDS_H
|
||||
|
||||
#define BATTLESTRINGS_COUNT 369
|
||||
|
||||
#define BATTLESTRINGS_ID_ADDER 12 // all battlestrings have its ID + 12, because first 5 are reserved
|
||||
|
||||
#define STRINGID_INTROMSG 0
|
||||
#define STRINGID_INTROSENDOUT 1
|
||||
#define STRINGID_RETURNMON 2
|
||||
#define STRINGID_SWITCHINMON 3
|
||||
#define STRINGID_USEDMOVE 4
|
||||
#define STRINGID_BATTLEEND 5
|
||||
|
||||
|
||||
// todo: make some of those names less vague: attacker/target vs pkmn, etc.
|
||||
#define STRINGID_TRAINER1LOSETEXT 12
|
||||
#define STRINGID_PKMNGAINEDEXP 13
|
||||
#define STRINGID_PKMNGREWTOLV 14
|
||||
#define STRINGID_PKMNLEARNEDMOVE 15
|
||||
#define STRINGID_TRYTOLEARNMOVE1 16
|
||||
#define STRINGID_TRYTOLEARNMOVE2 17
|
||||
#define STRINGID_TRYTOLEARNMOVE3 18
|
||||
#define STRINGID_PKMNFORGOTMOVE 19
|
||||
#define STRINGID_STOPLEARNINGMOVE 20
|
||||
#define STRINGID_DIDNOTLEARNMOVE 21
|
||||
#define STRINGID_PKMNLEARNEDMOVE2 22
|
||||
#define STRINGID_ATTACKMISSED 23
|
||||
#define STRINGID_PKMNPROTECTEDITSELF 24
|
||||
#define STRINGID_STATSWONTINCREASE2 25
|
||||
#define STRINGID_AVOIDEDDAMAGE 26
|
||||
#define STRINGID_ITDOESNTAFFECT 27
|
||||
#define STRINGID_ATTACKERFAINTED 28
|
||||
#define STRINGID_TARGETFAINTED 29
|
||||
#define STRINGID_PLAYERGOTMONEY 30
|
||||
#define STRINGID_PLAYERWHITEOUT 31
|
||||
#define STRINGID_PLAYERWHITEOUT2 32
|
||||
#define STRINGID_PREVENTSESCAPE 33
|
||||
#define STRINGID_HITXTIMES 34
|
||||
#define STRINGID_PKMNFELLASLEEP 35
|
||||
#define STRINGID_PKMNMADESLEEP 36
|
||||
#define STRINGID_PKMNALREADYASLEEP 37
|
||||
#define STRINGID_PKMNALREADYASLEEP2 38
|
||||
#define STRINGID_PKMNWASNTAFFECTED 39
|
||||
#define STRINGID_PKMNWASPOISONED 40
|
||||
#define STRINGID_PKMNPOISONEDBY 41
|
||||
#define STRINGID_PKMNHURTBYPOISON 42
|
||||
#define STRINGID_PKMNALREADYPOISONED 43
|
||||
#define STRINGID_PKMNBADLYPOISONED 44
|
||||
#define STRINGID_PKMNENERGYDRAINED 45
|
||||
#define STRINGID_PKMNWASBURNED 46
|
||||
#define STRINGID_PKMNBURNEDBY 47
|
||||
#define STRINGID_PKMNHURTBYBURN 48
|
||||
#define STRINGID_PKMNWASFROZEN 49
|
||||
#define STRINGID_PKMNFROZENBY 50
|
||||
#define STRINGID_PKMNISFROZEN 51
|
||||
#define STRINGID_PKMNWASDEFROSTED 52
|
||||
#define STRINGID_PKMNWASDEFROSTED2 53
|
||||
#define STRINGID_PKMNWASDEFROSTEDBY 54
|
||||
#define STRINGID_PKMNWASPARALYZED 55
|
||||
#define STRINGID_PKMNWASPARALYZEDBY 56
|
||||
#define STRINGID_PKMNISPARALYZED 57
|
||||
#define STRINGID_PKMNISALREADYPARALYZED 58
|
||||
#define STRINGID_PKMNHEALEDPARALYSIS 59
|
||||
#define STRINGID_PKMNDREAMEATEN 60
|
||||
#define STRINGID_STATSWONTINCREASE 61
|
||||
#define STRINGID_STATSWONTDECREASE 62
|
||||
#define STRINGID_TEAMSTOPPEDWORKING 63
|
||||
#define STRINGID_FOESTOPPEDWORKING 64
|
||||
#define STRINGID_PKMNISCONFUSED 65
|
||||
#define STRINGID_PKMNHEALEDCONFUSION 66
|
||||
#define STRINGID_PKMNWASCONFUSED 67
|
||||
#define STRINGID_PKMNALREADYCONFUSED 68
|
||||
#define STRINGID_PKMNFELLINLOVE 69
|
||||
#define STRINGID_PKMNINLOVE 70
|
||||
#define STRINGID_PKMNIMMOBILIZEDBYLOVE 71
|
||||
#define STRINGID_PKMNBLOWNAWAY 72
|
||||
#define STRINGID_PKMNCHANGEDTYPE 73
|
||||
#define STRINGID_PKMNFLINCHED 74
|
||||
#define STRINGID_PKMNREGAINEDHEALTH 75
|
||||
#define STRINGID_PKMNHPFULL 76
|
||||
#define STRINGID_PKMNRAISEDSPDEF 77
|
||||
#define STRINGID_PKMNRAISEDDEF 78
|
||||
#define STRINGID_PKMNCOVEREDBYVEIL 79
|
||||
#define STRINGID_PKMNUSEDSAFEGUARD 80
|
||||
#define STRINGID_PKMNSAFEGUARDEXPIRED 81
|
||||
#define STRINGID_PKMNWENTTOSLEEP 82
|
||||
#define STRINGID_PKMNSLEPTHEALTHY 83
|
||||
#define STRINGID_PKMNWHIPPEDWHIRLWIND 84
|
||||
#define STRINGID_PKMNTOOKSUNLIGHT 85
|
||||
#define STRINGID_PKMNLOWEREDHEAD 86
|
||||
#define STRINGID_PKMNISGLOWING 87
|
||||
#define STRINGID_PKMNFLEWHIGH 88
|
||||
#define STRINGID_PKMNDUGHOLE 89
|
||||
#define STRINGID_PKMNSQUEEZEDBYBIND 90
|
||||
#define STRINGID_PKMNTRAPPEDINVORTEX 91
|
||||
#define STRINGID_PKMNWRAPPEDBY 92
|
||||
#define STRINGID_PKMNCLAMPED 93
|
||||
#define STRINGID_PKMNHURTBY 94
|
||||
#define STRINGID_PKMNFREEDFROM 95
|
||||
#define STRINGID_PKMNCRASHED 96
|
||||
#define STRINGID_PKMNSHROUDEDINMIST 97
|
||||
#define STRINGID_PKMNPROTECTEDBYMIST 98
|
||||
#define STRINGID_PKMNGETTINGPUMPED 99
|
||||
#define STRINGID_PKMNHITWITHRECOIL 100
|
||||
#define STRINGID_PKMNPROTECTEDITSELF2 101
|
||||
#define STRINGID_PKMNBUFFETEDBYSANDSTORM 102
|
||||
#define STRINGID_PKMNPELTEDBYHAIL 103
|
||||
#define STRINGID_PKMNSEEDED 104
|
||||
#define STRINGID_PKMNEVADEDATTACK 105
|
||||
#define STRINGID_PKMNSAPPEDBYLEECHSEED 106
|
||||
#define STRINGID_PKMNFASTASLEEP 107
|
||||
#define STRINGID_PKMNWOKEUP 108
|
||||
#define STRINGID_PKMNUPROARKEPTAWAKE 109
|
||||
#define STRINGID_PKMNWOKEUPINUPROAR 110
|
||||
#define STRINGID_PKMNCAUSEDUPROAR 111
|
||||
#define STRINGID_PKMNMAKINGUPROAR 112
|
||||
#define STRINGID_PKMNCALMEDDOWN 113
|
||||
#define STRINGID_PKMNCANTSLEEPINUPROAR 114
|
||||
#define STRINGID_PKMNSTOCKPILED 115
|
||||
#define STRINGID_PKMNCANTSTOCKPILE 116
|
||||
#define STRINGID_PKMNCANTSLEEPINUPROAR2 117
|
||||
#define STRINGID_UPROARKEPTPKMNAWAKE 118
|
||||
#define STRINGID_PKMNSTAYEDAWAKEUSING 119
|
||||
#define STRINGID_PKMNSTORINGENERGY 120
|
||||
#define STRINGID_PKMNUNLEASHEDENERGY 121
|
||||
#define STRINGID_PKMNFATIGUECONFUSION 122
|
||||
#define STRINGID_PKMNPICKEDUPITEM 123
|
||||
#define STRINGID_PKMNUNAFFECTED 124
|
||||
#define STRINGID_PKMNTRANSFORMEDINTO 125
|
||||
#define STRINGID_PKMNMADESUBSTITUTE 126
|
||||
#define STRINGID_PKMNHASSUBSTITUTE 127
|
||||
#define STRINGID_SUBSTITUTEDAMAGED 128
|
||||
#define STRINGID_PKMNSUBSTITUTEFADED 129
|
||||
#define STRINGID_PKMNMUSTRECHARGE 130
|
||||
#define STRINGID_PKMNRAGEBUILDING 131
|
||||
#define STRINGID_PKMNMOVEWASDISABLED 132
|
||||
#define STRINGID_PKMNMOVEISDISABLED 133
|
||||
#define STRINGID_PKMNMOVEDISABLEDNOMORE 134
|
||||
#define STRINGID_PKMNGOTENCORE 135
|
||||
#define STRINGID_PKMNENCOREENDED 136
|
||||
#define STRINGID_PKMNTOOKAIM 137
|
||||
#define STRINGID_PKMNSKETCHEDMOVE 138
|
||||
#define STRINGID_PKMNTRYINGTOTAKEFOE 139
|
||||
#define STRINGID_PKMNTOOKFOE 140
|
||||
#define STRINGID_PKMNREDUCEDPP 141
|
||||
#define STRINGID_PKMNSTOLEITEM 142
|
||||
#define STRINGID_TARGETCANTESCAPENOW 143
|
||||
#define STRINGID_PKMNFELLINTONIGHTMARE 144
|
||||
#define STRINGID_PKMNLOCKEDINNIGHTMARE 145
|
||||
#define STRINGID_PKMNLAIDCURSE 146
|
||||
#define STRINGID_PKMNAFFLICTEDBYCURSE 147
|
||||
#define STRINGID_SPIKESSCATTERED 148
|
||||
#define STRINGID_PKMNHURTBYSPIKES 149
|
||||
#define STRINGID_PKMNIDENTIFIED 150
|
||||
#define STRINGID_PKMNPERISHCOUNTFELL 151
|
||||
#define STRINGID_PKMNBRACEDITSELF 152
|
||||
#define STRINGID_PKMNENDUREDHIT 153
|
||||
#define STRINGID_MAGNITUDESTRENGTH 154
|
||||
#define STRINGID_PKMNCUTHPMAXEDATTACK 155
|
||||
#define STRINGID_PKMNCOPIEDSTATCHANGES 156
|
||||
#define STRINGID_PKMNGOTFREE 157
|
||||
#define STRINGID_PKMNSHEDLEECHSEED 158
|
||||
#define STRINGID_PKMNBLEWAWAYSPIKES 159
|
||||
#define STRINGID_PKMNFLEDFROMBATTLE 160
|
||||
#define STRINGID_PKMNFORESAWATTACK 161
|
||||
#define STRINGID_PKMNTOOKATTACK 162
|
||||
#define STRINGID_PKMNATTACK 163
|
||||
#define STRINGID_PKMNCENTERATTENTION 164
|
||||
#define STRINGID_PKMNCHARGINGPOWER 165
|
||||
#define STRINGID_NATUREPOWERTURNEDINTO 166
|
||||
#define STRINGID_PKMNSTATUSNORMAL 167
|
||||
#define STRINGID_PKMNHASNOMOVESLEFT 168
|
||||
#define STRINGID_PKMNSUBJECTEDTOTORMENT 169
|
||||
#define STRINGID_PKMNCANTUSEMOVETORMENT 170
|
||||
#define STRINGID_PKMNTIGHTENINGFOCUS 171
|
||||
#define STRINGID_PKMNFELLFORTAUNT 172
|
||||
#define STRINGID_PKMNCANTUSEMOVETAUNT 173
|
||||
#define STRINGID_PKMNREADYTOHELP 174
|
||||
#define STRINGID_PKMNSWITCHEDITEMS 175
|
||||
#define STRINGID_PKMNCOPIEDFOE 176
|
||||
#define STRINGID_PKMNMADEWISH 177
|
||||
#define STRINGID_PKMNWISHCAMETRUE 178
|
||||
#define STRINGID_PKMNPLANTEDROOTS 179
|
||||
#define STRINGID_PKMNABSORBEDNUTRIENTS 180
|
||||
#define STRINGID_PKMNANCHOREDITSELF 181
|
||||
#define STRINGID_PKMNWASMADEDROWSY 182
|
||||
#define STRINGID_PKMNKNOCKEDOFF 183
|
||||
#define STRINGID_PKMNSWAPPEDABILITIES 184
|
||||
#define STRINGID_PKMNSEALEDOPPONENTMOVE 185
|
||||
#define STRINGID_PKMNCANTUSEMOVESEALED 186
|
||||
#define STRINGID_PKMNWANTSGRUDGE 187
|
||||
#define STRINGID_PKMNLOSTPPGRUDGE 188
|
||||
#define STRINGID_PKMNSHROUDEDITSELF 189
|
||||
#define STRINGID_PKMNMOVEBOUNCED 190
|
||||
#define STRINGID_PKMNWAITSFORTARGET 191
|
||||
#define STRINGID_PKMNSNATCHEDMOVE 192
|
||||
#define STRINGID_PKMNMADEITRAIN 193
|
||||
#define STRINGID_PKMNRAISEDSPEED 194
|
||||
#define STRINGID_PKMNPROTECTEDBY 195
|
||||
#define STRINGID_PKMNPREVENTSUSAGE 196
|
||||
#define STRINGID_PKMNRESTOREDHPUSING 197
|
||||
#define STRINGID_PKMNCHANGEDTYPEWITH 198
|
||||
#define STRINGID_PKMNPREVENTSPARALYSISWITH 199
|
||||
#define STRINGID_PKMNPREVENTSROMANCEWITH 200
|
||||
#define STRINGID_PKMNPREVENTSPOISONINGWITH 201
|
||||
#define STRINGID_PKMNPREVENTSCONFUSIONWITH 202
|
||||
#define STRINGID_PKMNRAISEDFIREPOWERWITH 203
|
||||
#define STRINGID_PKMNANCHORSITSELFWITH 204
|
||||
#define STRINGID_PKMNCUTSATTACKWITH 205
|
||||
#define STRINGID_PKMNPREVENTSSTATLOSSWITH 206
|
||||
#define STRINGID_PKMNHURTSWITH 207
|
||||
#define STRINGID_PKMNTRACED 208
|
||||
#define STRINGID_STATSHARPLY 209
|
||||
#define STRINGID_STATROSE 210
|
||||
#define STRINGID_STATHARSHLY 211
|
||||
#define STRINGID_STATFELL 212
|
||||
#define STRINGID_PKMNSSTATCHANGED 213
|
||||
#define STRINGID_PKMNSSTATCHANGED2 214
|
||||
#define STRINGID_PKMNSSTATCHANGED3 215
|
||||
#define STRINGID_PKMNSSTATCHANGED4 216
|
||||
#define STRINGID_CRITICALHIT 217
|
||||
#define STRINGID_ONEHITKO 218
|
||||
#define STRINGID_123POOF 219
|
||||
#define STRINGID_ANDELLIPSIS 220
|
||||
#define STRINGID_NOTVERYEFFECTIVE 221
|
||||
#define STRINGID_SUPEREFFECTIVE 222
|
||||
#define STRINGID_GOTAWAYSAFELY 223
|
||||
#define STRINGID_WILDPKMNFLED 224
|
||||
#define STRINGID_NORUNNINGFROMTRAINERS 225
|
||||
#define STRINGID_CANTESCAPE 226
|
||||
#define STRINGID_DONTLEAVEBIRCH 227
|
||||
#define STRINGID_BUTNOTHINGHAPPENED 228
|
||||
#define STRINGID_BUTITFAILED 229
|
||||
#define STRINGID_ITHURTCONFUSION 230
|
||||
#define STRINGID_MIRRORMOVEFAILED 231
|
||||
#define STRINGID_STARTEDTORAIN 232
|
||||
#define STRINGID_DOWNPOURSTARTED 233
|
||||
#define STRINGID_RAINCONTINUES 234
|
||||
#define STRINGID_DOWNPOURCONTINUES 235
|
||||
#define STRINGID_RAINSTOPPED 236
|
||||
#define STRINGID_SANDSTORMBREWED 237
|
||||
#define STRINGID_SANDSTORMRAGES 238
|
||||
#define STRINGID_SANDSTORMSUBSIDED 239
|
||||
#define STRINGID_SUNLIGHTGOTBRIGHT 240
|
||||
#define STRINGID_SUNLIGHTSTRONG 241
|
||||
#define STRINGID_SUNLIGHTFADED 242
|
||||
#define STRINGID_STARTEDHAIL 243
|
||||
#define STRINGID_HAILCONTINUES 244
|
||||
#define STRINGID_HAILSTOPPED 245
|
||||
#define STRINGID_FAILEDTOSPITUP 246
|
||||
#define STRINGID_FAILEDTOSWALLOW 247
|
||||
#define STRINGID_WINDBECAMEHEATWAVE 248
|
||||
#define STRINGID_STATCHANGESGONE 249
|
||||
#define STRINGID_COINSSCATTERED 250
|
||||
#define STRINGID_TOOWEAKFORSUBSTITUTE 251
|
||||
#define STRINGID_SHAREDPAIN 252
|
||||
#define STRINGID_BELLCHIMED 253
|
||||
#define STRINGID_FAINTINTHREE 254
|
||||
#define STRINGID_NOPPLEFT 255
|
||||
#define STRINGID_BUTNOPPLEFT 256
|
||||
#define STRINGID_PLAYERUSEDITEM 257
|
||||
#define STRINGID_WALLYUSEDITEM 258
|
||||
#define STRINGID_TRAINERBLOCKEDBALL 259
|
||||
#define STRINGID_DONTBEATHIEF 260
|
||||
#define STRINGID_ITDODGEDBALL 261
|
||||
#define STRINGID_YOUMISSEDPKMN 262
|
||||
#define STRINGID_PKMNBROKEFREE 263
|
||||
#define STRINGID_ITAPPEAREDCAUGHT 264
|
||||
#define STRINGID_AARGHALMOSTHADIT 265
|
||||
#define STRINGID_SHOOTSOCLOSE 266
|
||||
#define STRINGID_GOTCHAPKMNCAUGHT 267
|
||||
#define STRINGID_GOTCHAPKMNCAUGHT2 268
|
||||
#define STRINGID_GIVENICKNAMECAPTURED 269
|
||||
#define STRINGID_PKMNSENTTOPC 270
|
||||
#define STRINGID_PKMNDATAADDEDTODEX 271
|
||||
#define STRINGID_ITISRAINING 272
|
||||
#define STRINGID_SANDSTORMISRAGING 273
|
||||
#define STRINGID_CANTESCAPE2 274
|
||||
#define STRINGID_PKMNIGNORESASLEEP 275
|
||||
#define STRINGID_PKMNIGNOREDORDERS 276
|
||||
#define STRINGID_PKMNBEGANTONAP 277
|
||||
#define STRINGID_PKMNLOAFING 278
|
||||
#define STRINGID_PKMNWONTOBEY 279
|
||||
#define STRINGID_PKMNTURNEDAWAY 280
|
||||
#define STRINGID_PKMNPRETENDNOTNOTICE 281
|
||||
#define STRINGID_ENEMYABOUTTOSWITCHPKMN 282
|
||||
#define STRINGID_CREPTCLOSER 283
|
||||
#define STRINGID_CANTGETCLOSER 284
|
||||
#define STRINGID_PKMNWATCHINGCAREFULLY 285
|
||||
#define STRINGID_PKMNCURIOUSABOUTX 286
|
||||
#define STRINGID_PKMNENTHRALLEDBYX 287
|
||||
#define STRINGID_PKMNIGNOREDX 288
|
||||
#define STRINGID_THREWPOKEBLOCKATPKMN 289
|
||||
#define STRINGID_OUTOFSAFARIBALLS 290
|
||||
#define STRINGID_PKMNSITEMCUREDPARALYSIS 291
|
||||
#define STRINGID_PKMNSITEMCUREDPOISON 292
|
||||
#define STRINGID_PKMNSITEMHEALEDBURN 293
|
||||
#define STRINGID_PKMNSITEMDEFROSTEDIT 294
|
||||
#define STRINGID_PKMNSITEMWOKEIT 295
|
||||
#define STRINGID_PKMNSITEMSNAPPEDOUT 296
|
||||
#define STRINGID_PKMNSITEMCUREDPROBLEM 297
|
||||
#define STRINGID_PKMNSITEMRESTOREDHEALTH 298
|
||||
#define STRINGID_PKMNSITEMRESTOREDPP 299
|
||||
#define STRINGID_PKMNSITEMRESTOREDSTATUS 300
|
||||
#define STRINGID_PKMNSITEMRESTOREDHPALITTLE 301
|
||||
#define STRINGID_ITEMALLOWSONLYYMOVE 302
|
||||
#define STRINGID_PKMNHUNGONWITHX 303
|
||||
#define STRINGID_EMPTYSTRING3 304
|
||||
#define STRINGID_PKMNSXPREVENTSBURNS 305
|
||||
#define STRINGID_PKMNSXBLOCKSY 306
|
||||
#define STRINGID_PKMNSXRESTOREDHPALITTLE2 307
|
||||
#define STRINGID_PKMNSXWHIPPEDUPSANDSTORM 308
|
||||
#define STRINGID_PKMNSXPREVENTSYLOSS 309
|
||||
#define STRINGID_PKMNSXINFATUATEDY 310
|
||||
#define STRINGID_PKMNSXMADEYINEFFECTIVE 311
|
||||
#define STRINGID_PKMNSXCUREDYPROBLEM 312
|
||||
#define STRINGID_ITSUCKEDLIQUIDOOZE 313
|
||||
#define STRINGID_PKMNTRANSFORMED 314
|
||||
#define STRINGID_ELECTRICITYWEAKENED 315
|
||||
#define STRINGID_FIREWEAKENED 316
|
||||
#define STRINGID_PKMNHIDUNDERWATER 317
|
||||
#define STRINGID_PKMNSPRANGUP 318
|
||||
#define STRINGID_HMMOVESCANTBEFORGOTTEN 319
|
||||
#define STRINGID_XFOUNDONEY 320
|
||||
#define STRINGID_PLAYERDEFEATEDTRAINER1 321
|
||||
#define STRINGID_SOOTHINGAROMA 322
|
||||
#define STRINGID_ITEMSCANTBEUSEDNOW 323
|
||||
#define STRINGID_FORXCOMMAYZ 324
|
||||
#define STRINGID_USINGXTHEYOFZN 325
|
||||
#define STRINGID_PKMNUSEDXTOGETPUMPED 326
|
||||
#define STRINGID_PKMNSXMADEYUSELESS 327
|
||||
#define STRINGID_PKMNTRAPPEDBYSANDTOMB 328
|
||||
#define STRINGID_EMPTYSTRING4 329
|
||||
#define STRINGID_ABOOSTED 330
|
||||
#define STRINGID_PKMNSXINTENSIFIEDSUN 331
|
||||
#define STRINGID_PKMNMAKESGROUNDMISS 332
|
||||
#define STRINGID_YOUTHROWABALLNOWRIGHT 333
|
||||
#define STRINGID_PKMNSXTOOKATTACK 334
|
||||
#define STRINGID_PKMNCHOSEXASDESTINY 335
|
||||
#define STRINGID_PKMNLOSTFOCUS 336
|
||||
#define STRINGID_USENEXTPKMN 337
|
||||
#define STRINGID_PKMNFLEDUSINGITS 338
|
||||
#define STRINGID_PKMNFLEDUSING 339
|
||||
#define STRINGID_PKMNWASDRAGGEDOUT 340
|
||||
#define STRINGID_PREVENTEDFROMWORKING 341
|
||||
#define STRINGID_PKMNSITEMNORMALIZEDSTATUS 342
|
||||
#define STRINGID_TRAINER1USEDITEM 343
|
||||
#define STRINGID_BOXISFULL 344
|
||||
#define STRINGID_PKMNAVOIDEDATTACK 345
|
||||
#define STRINGID_PKMNSXMADEITINEFFECTIVE 346
|
||||
#define STRINGID_PKMNSXPREVENTSFLINCHING 347
|
||||
#define STRINGID_PKMNALREADYHASBURN 348
|
||||
#define STRINGID_STATSWONTDECREASE2 349
|
||||
#define STRINGID_PKMNSXBLOCKSY2 350
|
||||
#define STRINGID_PKMNSXWOREOFF 351
|
||||
#define STRINGID_PKMNRAISEDDEFALITTLE 352
|
||||
#define STRINGID_PKMNRAISEDSPDEFALITTLE 353
|
||||
#define STRINGID_THEWALLSHATTERED 354
|
||||
#define STRINGID_PKMNSXPREVENTSYSZ 355
|
||||
#define STRINGID_PKMNSXCUREDITSYPROBLEM 356
|
||||
#define STRINGID_ATTACKERCANTESCAPE 357
|
||||
#define STRINGID_PKMNOBTAINEDX 358
|
||||
#define STRINGID_PKMNOBTAINEDX2 359
|
||||
#define STRINGID_PKMNOBTAINEDXYOBTAINEDZ 360
|
||||
#define STRINGID_BUTNOEFFECT 361
|
||||
#define STRINGID_PKMNSXHADNOEFFECTONY 362
|
||||
#define STRINGID_TWOENEMIESDEFEATED 363
|
||||
#define STRINGID_TRAINER2LOSETEXT 364
|
||||
#define STRINGID_PKMNINCAPABLEOFPOWER 365
|
||||
#define STRINGID_GLINTAPPEARSINEYE 366
|
||||
#define STRINGID_PKMNGETTINGINTOPOSITION 367
|
||||
#define STRINGID_PKMNBEGANGROWLINGDEEPLY 368
|
||||
#define STRINGID_PKMNEAGERFORMORE 369
|
||||
#define STRINGID_DEFEATEDOPPONENTBYREFEREE 370
|
||||
#define STRINGID_LOSTTOOPPONENTBYREFEREE 371
|
||||
#define STRINGID_TIEDOPPONENTBYREFEREE 372
|
||||
#define STRINGID_QUESTIONFORFEITMATCH 373
|
||||
#define STRINGID_FORFEITEDMATCH 374
|
||||
#define STRINGID_PKMNTRANSFERREDSOMEONESPC 375
|
||||
#define STRINGID_PKMNTRANSFERREDLANETTESPC 376
|
||||
#define STRINGID_PKMNBOXSOMEONESPCFULL 377
|
||||
#define STRINGID_PKMNBOXLANETTESPCFULL 378
|
||||
#define STRINGID_TRAINER1WINTEXT 379
|
||||
#define STRINGID_TRAINER2WINTEXT 380
|
||||
|
||||
#endif // GUARD_BATTLE_STRING_IDS_H
|
||||
@ -225,24 +225,25 @@ extern struct SaveBlock2 *gSaveBlock2Ptr;
|
||||
|
||||
struct SecretBaseRecord
|
||||
{
|
||||
/*ID?*/ /*0x1A08*/ u8 sbr_field_0;
|
||||
/*0x1A09*/ u8 sbr_field_1_0:4;
|
||||
/*0x1A09*/ u8 gender:1;
|
||||
/*0x1A09*/ u8 sbr_field_1_5:1;
|
||||
/*0x1A09*/ u8 sbr_field_1_6:2;
|
||||
/*0x1A0A*/ u8 sbr_field_2[7]; // 0xFF bytes?
|
||||
/*0x1A12*/ u8 trainerId[4]; // byte 0 is used for determining trainer class
|
||||
/*0x1A16*/ u16 sbr_field_e;
|
||||
/*0x1A18*/ u8 sbr_field_10;
|
||||
/*0x1A19*/ u8 sbr_field_11;
|
||||
/*0x1A1A*/ u8 decorations[16];
|
||||
/*0x1A2A*/ u8 decorationPos[16];
|
||||
/*0x1A3A*/ u32 partyPersonality[6];
|
||||
/*0x1A54*/ u16 partyMoves[6 * 4];
|
||||
/*0x1A84*/ u16 partySpecies[6];
|
||||
/*0x1A90*/ u16 partyHeldItems[6];
|
||||
/*0x1A9C*/ u8 partyLevels[6];
|
||||
/*0x1AA2*/ u8 partyEVs[6];
|
||||
u8 sbr_field_0;
|
||||
u8 sbr_field_1_0:4;
|
||||
u8 gender:1;
|
||||
u8 sbr_field_1_5:1;
|
||||
u8 sbr_field_1_6:2;
|
||||
u8 trainerName[7];
|
||||
u8 trainerId[4]; // byte 0 is used for determining trainer class
|
||||
u8 language;
|
||||
u16 sbr_field_e;
|
||||
u8 sbr_field_10;
|
||||
u8 sbr_field_11;
|
||||
u8 decorations[16];
|
||||
u8 decorationPos[16];
|
||||
u32 partyPersonality[6];
|
||||
u16 partyMoves[6 * 4];
|
||||
u16 partySpecies[6];
|
||||
u16 partyHeldItems[6];
|
||||
u8 partyLevels[6];
|
||||
u8 partyEVs[6];
|
||||
};
|
||||
|
||||
#include "game_stat.h"
|
||||
|
||||
9
include/save_location.h
Normal file
9
include/save_location.h
Normal file
@ -0,0 +1,9 @@
|
||||
#ifndef GUARD_SAVE_LOCATION_H
|
||||
#define GUARD_SAVE_LOCATION_H
|
||||
|
||||
bool32 sub_81AFCEC(void);
|
||||
void TrySetMapSaveWarpStatus(void);
|
||||
void sub_81AFDA0(void);
|
||||
void sub_81AFDD0(void);
|
||||
|
||||
#endif // GUARD_SAVE_LOCATION_H
|
||||
@ -103,7 +103,7 @@ struct TextPrinterSubStruct
|
||||
|
||||
struct TextSubPrinter // TODO: Better name
|
||||
{
|
||||
u8* current_text_offset;
|
||||
const u8* current_text_offset;
|
||||
u8 windowId;
|
||||
u8 fontId;
|
||||
u8 x;
|
||||
|
||||
@ -189,7 +189,7 @@ SECTIONS {
|
||||
asm/fldeff_strength.o(.text);
|
||||
asm/battle_transition.o(.text);
|
||||
asm/battle_controller_linkpartner.o(.text);
|
||||
asm/battle_message.o(.text);
|
||||
src/battle_message.o(.text);
|
||||
asm/cable_car.o(.text);
|
||||
asm/math_util.o(.text);
|
||||
asm/roulette_util.o(.text);
|
||||
@ -411,7 +411,7 @@ SECTIONS {
|
||||
src/battle_ai_script_commands.o(.rodata);
|
||||
data/data4.o(.rodata);
|
||||
data/battle_controller_link_partner.o(.rodata);
|
||||
data/battle_message.o(.rodata);
|
||||
src/battle_message.o(.rodata);
|
||||
data/cable_car.o(.rodata);
|
||||
data/save.o(.rodata);
|
||||
data/field_effect_helpers.o(.rodata);
|
||||
|
||||
@ -41,6 +41,7 @@
|
||||
#include "evolution_scene.h"
|
||||
#include "roamer.h"
|
||||
#include "safari_zone.h"
|
||||
#include "battle_string_ids.h"
|
||||
|
||||
struct UnknownStruct6
|
||||
{
|
||||
@ -343,7 +344,7 @@ const u8 gStatusConditionString_IceJpn[8] = _("こおり$$$$");
|
||||
const u8 gStatusConditionString_ConfusionJpn[8] = _("こんらん$$$");
|
||||
const u8 gStatusConditionString_LoveJpn[8] = _("メロメロ$$$");
|
||||
|
||||
const u8 * const gStatusConditionStringsTable[][2] =
|
||||
const u8 * const gStatusConditionStringsTable[7][2] =
|
||||
{
|
||||
{gStatusConditionString_PoisonJpn, gText_Poison},
|
||||
{gStatusConditionString_SleepJpn, gText_Sleep},
|
||||
@ -3299,7 +3300,7 @@ static void BattleIntroPrintTrainerWantsToBattle(void)
|
||||
if (gBattleExecBuffer == 0)
|
||||
{
|
||||
gActiveBank = GetBankByIdentity(IDENTITY_OPPONENT_MON1);
|
||||
PrepareStringBattle(0, gActiveBank);
|
||||
PrepareStringBattle(STRINGID_INTROMSG, gActiveBank);
|
||||
gBattleMainFunc = BattleIntroPrintOpponentSendsOut;
|
||||
}
|
||||
}
|
||||
@ -3309,7 +3310,7 @@ static void BattleIntroPrintWildMonAttacked(void)
|
||||
if (gBattleExecBuffer == 0)
|
||||
{
|
||||
gBattleMainFunc = BattleIntroPrintPlayerSendsOut;
|
||||
PrepareStringBattle(0, 0);
|
||||
PrepareStringBattle(STRINGID_INTROMSG, 0);
|
||||
}
|
||||
}
|
||||
|
||||
@ -3332,7 +3333,7 @@ static void BattleIntroPrintOpponentSendsOut(void)
|
||||
else
|
||||
identity = IDENTITY_OPPONENT_MON1;
|
||||
|
||||
PrepareStringBattle(1, GetBankByIdentity(identity));
|
||||
PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByIdentity(identity));
|
||||
gBattleMainFunc = BattleIntroOpponent1SendsOutMonAnimation;
|
||||
}
|
||||
|
||||
@ -3535,7 +3536,7 @@ static void BattleIntroPrintPlayerSendsOut(void)
|
||||
identity = IDENTITY_PLAYER_MON1;
|
||||
|
||||
if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
|
||||
PrepareStringBattle(1, GetBankByIdentity(identity));
|
||||
PrepareStringBattle(STRINGID_INTROSENDOUT, GetBankByIdentity(identity));
|
||||
|
||||
gBattleMainFunc = BattleIntroPlayer1SendsOutMonAnimation;
|
||||
}
|
||||
@ -4006,8 +4007,8 @@ static void HandleTurnActionSelectionState(void)
|
||||
for (i = 0; i < 4; i++)
|
||||
{
|
||||
moveInfo.moves[i] = gBattleMons[gActiveBank].moves[i];
|
||||
moveInfo.ppNumbers[i] = gBattleMons[gActiveBank].pp[i];
|
||||
moveInfo.ppWithBonusNumbers[i] = CalculatePPWithBonus(
|
||||
moveInfo.currentPp[i] = gBattleMons[gActiveBank].pp[i];
|
||||
moveInfo.maxPp[i] = CalculatePPWithBonus(
|
||||
gBattleMons[gActiveBank].moves[i],
|
||||
gBattleMons[gActiveBank].ppBonuses,
|
||||
i);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
2333
src/battle_message.c
Normal file
2333
src/battle_message.c
Normal file
File diff suppressed because it is too large
Load Diff
@ -34,6 +34,7 @@
|
||||
#include "pokemon_storage_system.h"
|
||||
#include "task.h"
|
||||
#include "naming_screen.h"
|
||||
#include "battle_string_ids.h"
|
||||
|
||||
// variables
|
||||
|
||||
@ -1375,7 +1376,7 @@ static void atk02_attackstring(void)
|
||||
return;
|
||||
if (!(gHitMarker & (HITMARKER_NO_ATTACKSTRING | HITMARKER_ATTACKSTRING_PRINTED)))
|
||||
{
|
||||
PrepareStringBattle(4, gBankAttacker);
|
||||
PrepareStringBattle(STRINGID_USEDMOVE, gBankAttacker);
|
||||
gHitMarker |= HITMARKER_ATTACKSTRING_PRINTED;
|
||||
}
|
||||
gBattlescriptCurrInstr++;
|
||||
@ -2000,7 +2001,7 @@ static void atk0B_healthbarupdate(void)
|
||||
|
||||
if (gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBank].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE))
|
||||
{
|
||||
PrepareStringBattle(0x80, gActiveBank);
|
||||
PrepareStringBattle(STRINGID_SUBSTITUTEDAMAGED, gActiveBank);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -2157,7 +2158,7 @@ static void atk0D_critmessage(void)
|
||||
{
|
||||
if (gCritMultiplier == 2 && !(gBattleMoveFlags & MOVESTATUS_NOEFFECT))
|
||||
{
|
||||
PrepareStringBattle(0xD9, gBankAttacker);
|
||||
PrepareStringBattle(STRINGID_CRITICALHIT, gBankAttacker);
|
||||
gBattleCommunication[MSG_DISPLAY] = 1;
|
||||
}
|
||||
gBattlescriptCurrInstr++;
|
||||
@ -2229,22 +2230,22 @@ static void atk0F_resultmessage(void)
|
||||
switch (gBattleMoveFlags & (u8)(~(MOVESTATUS_MISSED)))
|
||||
{
|
||||
case MOVESTATUS_SUPEREFFECTIVE:
|
||||
stringId = 0xDE;
|
||||
stringId = STRINGID_SUPEREFFECTIVE;
|
||||
break;
|
||||
case MOVESTATUS_NOTVERYEFFECTIVE:
|
||||
stringId = 0xDD;
|
||||
stringId = STRINGID_NOTVERYEFFECTIVE;
|
||||
break;
|
||||
case MOVESTATUS_ONEHITKO:
|
||||
stringId = 0xDA;
|
||||
stringId = STRINGID_ONEHITKO;
|
||||
break;
|
||||
case MOVESTATUS_ENDURED:
|
||||
stringId = 0x99;
|
||||
stringId = STRINGID_PKMNENDUREDHIT;
|
||||
break;
|
||||
case MOVESTATUS_FAILED:
|
||||
stringId = 0xE5;
|
||||
stringId = STRINGID_BUTITFAILED;
|
||||
break;
|
||||
case MOVESTATUS_NOTAFFECTED:
|
||||
stringId = 0x1B;
|
||||
stringId = STRINGID_ITDOESNTAFFECT;
|
||||
break;
|
||||
case MOVESTATUS_HUNGON:
|
||||
gLastUsedItem = gBattleMons[gBankTarget].item;
|
||||
@ -2256,7 +2257,7 @@ static void atk0F_resultmessage(void)
|
||||
default:
|
||||
if (gBattleMoveFlags & MOVESTATUS_NOTAFFECTED)
|
||||
{
|
||||
stringId = 0x1B;
|
||||
stringId = STRINGID_ITDOESNTAFFECT;
|
||||
}
|
||||
else if (gBattleMoveFlags & MOVESTATUS_ONEHITKO)
|
||||
{
|
||||
@ -2285,7 +2286,7 @@ static void atk0F_resultmessage(void)
|
||||
}
|
||||
else if (gBattleMoveFlags & MOVESTATUS_FAILED)
|
||||
{
|
||||
stringId = 0xE5;
|
||||
stringId = STRINGID_BUTITFAILED;
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -3592,7 +3593,7 @@ static void atk23_getexp(void)
|
||||
|
||||
PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff3, 5, gBattleMoveDamage)
|
||||
|
||||
PrepareStringBattle(0xD, gBattleStruct->expGetterBank);
|
||||
PrepareStringBattle(STRINGID_PKMNGAINEDEXP, gBattleStruct->expGetterBank);
|
||||
MonGainEVs(&gPlayerParty[gBattleStruct->expGetterId], gBattleMons[gBank1].species);
|
||||
}
|
||||
gBattleStruct->sentInPokes >>= 1;
|
||||
@ -6181,7 +6182,7 @@ static void atk5A_yesnoboxlearnmove(void)
|
||||
u16 moveId = GetMonData(&gPlayerParty[gBattleStruct->expGetterId], MON_DATA_MOVE1 + movePosition);
|
||||
if (IsHMMove2(moveId))
|
||||
{
|
||||
PrepareStringBattle(0x13F, gActiveBank);
|
||||
PrepareStringBattle(STRINGID_HMMOVESCANTBEFORGOTTEN, gActiveBank);
|
||||
gBattleScripting.learnMoveState = 6;
|
||||
}
|
||||
else
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
#include "global.h"
|
||||
#include "save_location.h"
|
||||
#include "map_constants.h"
|
||||
|
||||
// used to make the list defines a little less ugly.
|
||||
@ -26,7 +27,7 @@ static bool32 IsCurMapInLocationList(const u16 *list)
|
||||
}
|
||||
|
||||
// TODO: Not require a packed u16 array for these lists
|
||||
static const u16 gSaveLocationPokeCenterList[] =
|
||||
static const u16 sSaveLocationPokeCenterList[] =
|
||||
{
|
||||
MAP(OLDALE_TOWN_POKEMON_CENTER_1F),
|
||||
MAP(OLDALE_TOWN_POKEMON_CENTER_2F),
|
||||
@ -71,10 +72,10 @@ static const u16 gSaveLocationPokeCenterList[] =
|
||||
|
||||
static bool32 IsCurMapPokeCenter(void)
|
||||
{
|
||||
return IsCurMapInLocationList(gSaveLocationPokeCenterList);
|
||||
return IsCurMapInLocationList(sSaveLocationPokeCenterList);
|
||||
}
|
||||
|
||||
static const u16 gSaveLocationReloadLocList[] = // there's only 1 location, and it's presumed its for the save reload feature for battle tower
|
||||
static const u16 sSaveLocationReloadLocList[] = // there's only 1 location, and it's presumed its for the save reload feature for battle tower
|
||||
{
|
||||
MAP(BATTLE_TOWER_LOBBY),
|
||||
0xFFFF,
|
||||
@ -82,18 +83,18 @@ static const u16 gSaveLocationReloadLocList[] = // there's only 1 location, and
|
||||
|
||||
static bool32 IsCurMapReloadLocation(void)
|
||||
{
|
||||
return IsCurMapInLocationList(gSaveLocationReloadLocList);
|
||||
return IsCurMapInLocationList(sSaveLocationReloadLocList);
|
||||
}
|
||||
|
||||
// nulled out list. unknown what this would have been
|
||||
static const u16 gUnknown_0861440E[] =
|
||||
static const u16 sUnknown_0861440E[] =
|
||||
{
|
||||
0xFFFF,
|
||||
};
|
||||
|
||||
bool32 sub_81AFCEC(void)
|
||||
{
|
||||
return IsCurMapInLocationList(gUnknown_0861440E);
|
||||
return IsCurMapInLocationList(sUnknown_0861440E);
|
||||
}
|
||||
|
||||
static void TrySetPokeCenterWarpStatus(void)
|
||||
|
||||
@ -238,26 +238,7 @@ gBattle_WIN1H: @ 2022E28
|
||||
gBattle_WIN1V: @ 2022E2A
|
||||
.space 0x2
|
||||
|
||||
gDisplayedStringBattle: @ 2022E2C
|
||||
.space 0x12C
|
||||
|
||||
gBattleTextBuff1: @ 2022F58
|
||||
.space 0x2
|
||||
|
||||
gUnknown_02022F5A: @ 2022F5A
|
||||
.space 0x2
|
||||
|
||||
gUnknown_02022F5C: @ 2022F5C
|
||||
.space 0xC
|
||||
|
||||
gBattleTextBuff2: @ 2022F68
|
||||
.space 0x2
|
||||
|
||||
gUnknown_02022F6A: @ 2022F6A
|
||||
.space 0xE
|
||||
|
||||
gBattleTextBuff3: @ 2022F78
|
||||
.space 0x10
|
||||
.include "src/battle_message.o"
|
||||
|
||||
gUnknown_02022F88: @ 2022F88
|
||||
.space 0x64
|
||||
|
||||
Loading…
Reference in New Issue
Block a user