From e79b3ce9ff39fa48928e8adf84dab542e78c5d64 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Jan 2018 17:24:28 -0500 Subject: Fix file modes --- src/data/battle_strings_de.h | 0 src/data/battle_strings_en.h | 0 src/data/credits_de.h | 0 src/data/credits_en.h | 0 4 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 src/data/battle_strings_de.h mode change 100755 => 100644 src/data/battle_strings_en.h mode change 100755 => 100644 src/data/credits_de.h mode change 100755 => 100644 src/data/credits_en.h (limited to 'src/data') diff --git a/src/data/battle_strings_de.h b/src/data/battle_strings_de.h old mode 100755 new mode 100644 diff --git a/src/data/battle_strings_en.h b/src/data/battle_strings_en.h old mode 100755 new mode 100644 diff --git a/src/data/credits_de.h b/src/data/credits_de.h old mode 100755 new mode 100644 diff --git a/src/data/credits_en.h b/src/data/credits_en.h old mode 100755 new mode 100644 -- cgit v1.2.3 From 5d923c4d5f3d0786715663b3ad83bc9f3e778164 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 15 Jan 2018 20:41:55 -0600 Subject: import some battle_4.c code from emerald and get atk23_getexp matching --- src/data/battle_strings_de.h | 2 +- src/data/battle_strings_en.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/data') diff --git a/src/data/battle_strings_de.h b/src/data/battle_strings_de.h index a3d51f2a5..a19c0fc6c 100644 --- a/src/data/battle_strings_de.h +++ b/src/data/battle_strings_de.h @@ -1218,7 +1218,7 @@ const u8 *const gBattleStringsTable[] = }; // below are lists of battle string enums and NOT pointers to the strings. -const u16 gMissStrings[] = +const u16 gMissStringIds[] = { BATTLE_TEXT_AttackMissed, BATTLE_TEXT_ProtectedItself, diff --git a/src/data/battle_strings_en.h b/src/data/battle_strings_en.h index f29e48410..67eb70ee1 100644 --- a/src/data/battle_strings_en.h +++ b/src/data/battle_strings_en.h @@ -1218,7 +1218,7 @@ const u8 *const gBattleStringsTable[] = }; // below are lists of battle string enums and NOT pointers to the strings. -const u16 gMissStrings[] = +const u16 gMissStringIds[] = { BATTLE_TEXT_AttackMissed, BATTLE_TEXT_ProtectedItself, -- cgit v1.2.3