From 6662ae2d83bcd7f34fd359e96278806dd612ca8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elouan=20App=C3=A9r=C3=A9?= Date: Sat, 12 Sep 2015 23:04:31 +0200 Subject: [PATCH] Fixed wrong rename --- .../LibPkmGC/GBA/Detail/GBACharTables.h | 43 +++++++++++++++++++ .../GC/Detail/CircularDependencies.cpp | 41 ------------------ 2 files changed, 43 insertions(+), 41 deletions(-) create mode 100644 LibPkmGC/include/LibPkmGC/GBA/Detail/GBACharTables.h delete mode 100644 LibPkmGC/src/LibPkmGC/GC/Detail/CircularDependencies.cpp diff --git a/LibPkmGC/include/LibPkmGC/GBA/Detail/GBACharTables.h b/LibPkmGC/include/LibPkmGC/GBA/Detail/GBACharTables.h new file mode 100644 index 0000000..bcd0299 --- /dev/null +++ b/LibPkmGC/include/LibPkmGC/GBA/Detail/GBACharTables.h @@ -0,0 +1,43 @@ +/* +* Copyright (C) TuxSH 2015 +* This file is part of LibPkmGC. +* +* LibPkmGC is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* LibPkmGC is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public License +* along with LibPkmGC. If not, see . +*/ + +#ifndef _LIBPKMGC_GBA_CHAR_TABLES_H +#define _LIBPKMGC_GBA_CHAR_TABLES_H + +#include + +namespace LibPkmGC { +namespace Detail { + +u32 GBAToUCS4(u8 val, bool jp = false, u32 deflt = '?'); +u8 UCS4ToGBA(u32 val, bool jp = false, u8 deflt = 0xac); + +} +} + +// We want to tell Git this file is not a rename + +/* + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam lobortis gravida nibh, eu euismod magna finibus vel. + In sit amet gravida est. Ut pretium ligula quis dolor tristique, eget malesuada quam dictum. Ut ut tempus sapien. + Morbi ac commodo sapien, ut luctus nisi. Nunc maximus aliquet ullamcorper. Cras laoreet condimentum facilisis. + Sed sit amet justo imperdiet risus fermentum condimentum. Nullam purus justo, lacinia sed nibh non, convallis sollicitudin felis. + Aliquam dignissim, leo ut varius vulputate, ante magna aliquet felis, congue tincidunt risus ante quis magna. Etiam at convallis mauris. + Nunc quis sodales mi. +*/ +#endif \ No newline at end of file diff --git a/LibPkmGC/src/LibPkmGC/GC/Detail/CircularDependencies.cpp b/LibPkmGC/src/LibPkmGC/GC/Detail/CircularDependencies.cpp deleted file mode 100644 index 5b50358..0000000 --- a/LibPkmGC/src/LibPkmGC/GC/Detail/CircularDependencies.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/* -* Copyright (C) TuxSH 2015 -* This file is part of LibPkmGC. -* -* LibPkmGC is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* LibPkmGC is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public License -* along with LibPkmGC. If not, see . -*/ - -#include -#include - -namespace LibPkmGC { - -LIBPKMGC_GEN_UNIMPLEMENTED_CONVERTER_CTOR(BagData) -LIBPKMGC_GEN_UNIMPLEMENTED_CONVERTER_CTOR(PCData) -LIBPKMGC_GEN_UNIMPLEMENTED_CONVERTER_CTOR(PlayerData) -LIBPKMGC_GEN_UNIMPLEMENTED_CONVERTER_CTOR(MailboxData) -LIBPKMGC_GEN_UNIMPLEMENTED_CONVERTER_CTOR(GroupBattleRule) -LIBPKMGC_GEN_UNIMPLEMENTED_CONVERTER_CTOR(BattleModeData) - - -LIBPKMGC_GEN_CONVERTER_CTOR(DaycareData) -LIBPKMGC_GEN_CONVERTER_CTOR(Pokemon) -LIBPKMGC_GEN_CONVERTER_CTOR(StrategyMemoData) -LIBPKMGC_GEN_CONVERTER_CTOR(PokemonBox) - - -LIBPKMGC_GEN_UNIMPLEMENTED_SAVE_EDITING_CONVERTER_CTOR(SaveSlot) -LIBPKMGC_GEN_UNIMPLEMENTED_SAVE_EDITING_CONVERTER_CTOR(Save) - -} \ No newline at end of file