5.0.1

FlagBrew · Nov 20, 2017 · ceb2866 · ceb2866
1 parent db04784
commit ceb2866
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -46,7 +46,7 @@ PRODUCT_CODE        :=	CTR-HB-PKSM
 
 VERSION_MAJOR := 5
 VERSION_MINOR := 0
-VERSION_MICRO := 0
+VERSION_MICRO := 1
 
 ROSALINA := 0
 

diff --git a/assets/romfs/i18n/it/app.txt b/assets/romfs/i18n/it/app.txt
@@ -572,5 +572,5 @@ Errore nel download dei dati!
 Installando l'ultima release...
 Ultima release installata!
 Avviare il gioco?
-Ultra Sole
-Ultra Luna
+Ultrasole
+Ultraluna
diff --git a/source/editor.c b/source/editor.c
@@ -111,12 +111,12 @@ void setWC(u8* mainbuf, u8* wcbuf, int i, int nInjected[]) {
 
 		mainbuf[GBO + 72] = (u8)((mainbuf[GBO + 72] & 0xFE) | 1);
 		if (game == GAME_HG || game == GAME_SS) {
-			*(mainbuf + ofs.wondercardLocation - 0x100 + GBO + (2047 >> 3)) = 0x80;
-			memcpy(&mainbuf[ofs.wondercardLocation + GBO + nInjected[0] * ofs.wondercardSize], wcbuf, ofs.wondercardSize);
+			*(mainbuf + 0x9D3C + GBO + (2047 >> 3)) = 0x80;
+			memcpy(&mainbuf[0x9E3C + GBO + nInjected[0] * ofs.wondercardSize], wcbuf, ofs.wondercardSize);
 		}
 		else if (game == GAME_PLATINUM) {
-			*(mainbuf + ofs.wondercardLocation - 0x100 + GBO + (2047 >> 3)) = 0x80;
-			memcpy(&mainbuf[ofs.wondercardLocation + GBO + nInjected[0] * ofs.wondercardSize], wcbuf, ofs.wondercardSize);
+			*(mainbuf + 0xB4C0 + GBO + (2047 >> 3)) = 0x80;
+			memcpy(&mainbuf[0xB5C0 + GBO + nInjected[0] * ofs.wondercardSize], wcbuf, ofs.wondercardSize);
 		}
 		else if (game == GAME_DIAMOND || game == GAME_PEARL) {
 			memcpy(&mainbuf[0xA7D0 + GBO + nInjected[0] * 4], &DPActiveFlag[0], 4);

diff --git a/source/main.c b/source/main.c
@@ -286,26 +286,29 @@ int main() {
 				{
 					bank(mainbuf);
 				}
+				else
+					infoDisp(L"This hasn't been implemented (yet).");
 			}
 
 			if (touch.px > 165 && touch.px < 305 && touch.py > 20 && touch.py < 73) {
 				if (game_is3DS())
 				{
 					pokemonEditor(mainbuf);
 				}
+				else
+					infoDisp(L"This hasn't been implemented (yet).");
 			}
 
 			if (touch.px > 15 && touch.px < 155 && touch.py > 83 && touch.py < 136) {
 				eventDatabase(mainbuf);
 			}
 
 			if (touch.px > 165 && touch.px < 305 && touch.py > 83 && touch.py < 136) {
-
+				infoDisp(L"This hasn't been implemented (yet).");
 			}
 
 			if (touch.px > 15 && touch.px < 155 && touch.py > 146 && touch.py < 199) {
 				configMenu();
-				continue;
 			}
 
 			if (touch.px > 165 && touch.px < 305 && touch.py > 146 && touch.py < 199) {

diff --git a/source/pkx.c b/source/pkx.c
@@ -452,6 +452,11 @@ FormData *pkx_get_legal_form_data(const u16 species, const int game) {
 			forms->max = 1;
 			forms->editable = false;
 			break;
+		case 744 :
+			forms->spriteNum = 0;
+			forms->max = 1;
+			forms->editable = false;
+			break;
 		case 745 :
 			forms->spriteNum = 136;
 			forms->stringNum = 130;