1441
1441
c
Merge branch 'master' of https://github.com/shnlg/rc

Conflicts:
	Agb2SmartPhone/EventScriptBugFix.cpp
	Effect/BattleEffect.cpp
	Effect/BattleEffect.h
	Effect/Genjyu.cpp
	UI/EndingDemo.cpp
	UI/NaviGate.cpp
	UI/flb/Battle/UiFlbBattleCmd.h
	UI/flb/Battle/cBattleCommand.cpp
	UI/flb/Battle/cBattleCommandCharMenuModel.cpp
	UI/flb/Battle/cBattleCommandCommandButtonView.cpp
	UI/flb/Battle/cBattleCommandModel.cpp
	UI/flb/Battle/cBattleCommandModel.hpp
	UI/flb/Battle/cBattleCommandSelectTargetModel.cpp
	UI/flb/Battle/cBattleCommandSelectTargetView.cpp
	UI/flb/Battle/cBattleInfo.cpp
	UI/flb/Battle/cBattleInfo.hpp
	UI/flb/Battle/cUiFlbBattlePauseIcon.h
	battle/BattleHighReso.cpp
	core/ObjCharacter.cpp
	core/ObjCharacter.h
	core/graphics.c
	data/_binary_sp_all_mes_msg_bin.c
	data/bin/message/sp_all_mes.msg
	data/data.h
	iOS/CloudDocument.h
	iOS/CloudDocument.m
	iOS/iOSDevInfo.cpp
	iOS/iOSDevInfo.hpp
	main.c
	menu/Src/Menu/Main/Save/cCloudSaveMenu.cpp
	menu/Src/TopDebugMode/personal/m_uchikawa/font/cDebugPsersonalUchikawaFont.cpp
	sfx/harata/menu/end.c
	sfx/narita/event.c
	sfx/narita/my.c
	sfx/narita/objevent.c
	sfx/yoshii/COMMAND.c
	sys/narita.c
	sys/narita.h
	sys/saveload/cMobileSaveLoad.cpp
	sys/saveload/cMobileSaveLoad.h
	sys/saveload/mobile_saveload.cpp
	sys/saveload/mobile_saveload.h
Merge branch 'master' of https://github.com/shnlg/rc

Conflicts:
	sfx/narita/event.c
Merge branch 'master' into develop

Conflicts:
	sfx/narita/event.c
	sfx/narita/my.c
	sfx/narita/n_menu.c