From 24009ea941abb81068745926ca9960acf927dd4e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 24 Nov 2017 19:49:03 -0500 Subject: through Cb2_StartWallClock and associated data --- include/strings.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 08e2b4bba..17ecdd565 100644 --- a/include/strings.h +++ b/include/strings.h @@ -82,5 +82,6 @@ extern const u8 gText_NoRegistry[]; extern const u8 gText_OkayToDeleteFromRegistry[]; extern const u8 gText_RegisteredDataDeleted[]; extern const u8 gUnknown_085EA79D[]; +extern const u8 gText_Confirm3[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From efd23cb91b402ff44cf8139490ae37cf6990d1be Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 24 Nov 2017 20:06:29 -0500 Subject: Cb2_ViewWallClock --- include/strings.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 17ecdd565..b54c68c6e 100644 --- a/include/strings.h +++ b/include/strings.h @@ -83,5 +83,6 @@ extern const u8 gText_OkayToDeleteFromRegistry[]; extern const u8 gText_RegisteredDataDeleted[]; extern const u8 gUnknown_085EA79D[]; extern const u8 gText_Confirm3[]; +extern const u8 gText_Cancel4[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From b210d5f86b4c949b8e98c9117bc19b62fe0ed352 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 24 Nov 2017 21:06:46 -0500 Subject: through c3_80BF560 --- include/strings.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index b54c68c6e..030f46330 100644 --- a/include/strings.h +++ b/include/strings.h @@ -84,5 +84,6 @@ extern const u8 gText_RegisteredDataDeleted[]; extern const u8 gUnknown_085EA79D[]; extern const u8 gText_Confirm3[]; extern const u8 gText_Cancel4[]; +extern const u8 gText_IsThisTheCorrectTime[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 646664ff29afd8627626274a4fc12b05d584fe2c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 1 Dec 2017 21:25:13 +0100 Subject: battle setup file is decompiled --- include/strings.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 08e2b4bba..1a46dd5a8 100644 --- a/include/strings.h +++ b/include/strings.h @@ -82,5 +82,6 @@ extern const u8 gText_NoRegistry[]; extern const u8 gText_OkayToDeleteFromRegistry[]; extern const u8 gText_RegisteredDataDeleted[]; extern const u8 gUnknown_085EA79D[]; +extern const u8 gText_EmptyString2[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 6561b62986a003e83811abfc85bf07ebc6f3a1ae Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 9 Dec 2017 21:23:40 +0100 Subject: start pokeblock feed --- include/strings.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index a2745d382..d9e5921a1 100644 --- a/include/strings.h +++ b/include/strings.h @@ -84,5 +84,8 @@ extern const u8 gText_RegisteredDataDeleted[]; extern const u8 gUnknown_085EA79D[]; extern const u8 gText_PkmnFainted3[]; extern const u8 gText_Coins[]; +extern const u8 gText_Var1AteTheVar2[]; +extern const u8 gText_Var1HappilyAteVar2[]; +extern const u8 gText_Var1DisdainfullyAteVar2[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 8ac17e09486006c7d2d066173c8fa907aceb72de Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 11 Dec 2017 16:52:28 +0100 Subject: move data from asm to pokeblock.c --- include/strings.h | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index d9e5921a1..6a379ee19 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1,45 +1,50 @@ #ifndef GUARD_STRINGS_H #define GUARD_STRINGS_H -// Exported type declarations - -// Exported RAM declarations - -// Exported ROM declarations - extern const u8 gText_FromSpace[]; + extern const u8 gText_Lv50[]; extern const u8 gText_OpenLevel[]; + extern const u8 gText_Mom[]; extern const u8 gText_Dad[]; + extern const u8 gText_Cool[]; extern const u8 gText_Beauty[]; extern const u8 gText_Cute[]; extern const u8 gText_Smart[]; extern const u8 gText_Tough[]; + extern const u8 gText_Single[]; extern const u8 gText_Double[]; + extern const u8 gText_Spicy2[]; extern const u8 gText_Dry2[]; extern const u8 gText_Sweet2[]; extern const u8 gText_Bitter2[]; extern const u8 gText_Sour2[]; + extern const u8 gText_Excellent[]; extern const u8 gText_VeryGood[]; extern const u8 gText_Good[]; extern const u8 gText_SoSo[]; extern const u8 gText_Bad[]; extern const u8 gText_TheWorst[]; + extern const u8 gText_Slots[]; extern const u8 gText_Roulette[]; extern const u8 gText_Jackpot[]; + extern const u8 gText_First[]; extern const u8 gText_Second[]; extern const u8 gText_Third[]; + extern const u8 gText_NoDecorations[]; extern const u8 gText_NoDecorationsInUse[]; + extern const u8 gText_Exit[]; extern const u8 gText_Cancel[]; + extern const u8 gText_Color161Shadow161[]; extern const u8 gText_GoBackPrevMenu[]; extern const u8 gText_CantPlaceInRoom[]; @@ -56,12 +61,14 @@ extern const u8 gText_NoDecorationHere[]; extern const u8 gText_DecorationWillBeDiscarded[]; extern const u8 gText_CantThrowAwayInUse[]; extern const u8 gText_DecorationThrownAway[]; + extern const u8 gText_Desk[]; extern const u8 gText_Chair[]; extern const u8 gText_Plant[]; extern const u8 gText_Ornament[]; extern const u8 gText_Mat[]; extern const u8 gText_Poster[]; + extern const u8 gText_PutOutSelectedDecorItem[]; extern const u8 gText_StoreChosenDecorInPC[]; extern const u8 gText_ThrowAwayUnwantedDecors[]; @@ -84,8 +91,31 @@ extern const u8 gText_RegisteredDataDeleted[]; extern const u8 gUnknown_085EA79D[]; extern const u8 gText_PkmnFainted3[]; extern const u8 gText_Coins[]; + extern const u8 gText_Var1AteTheVar2[]; extern const u8 gText_Var1HappilyAteVar2[]; extern const u8 gText_Var1DisdainfullyAteVar2[]; +extern const u8 gText_RedPokeblock[]; +extern const u8 gText_BluePokeblock[]; +extern const u8 gText_PinkPokeblock[]; +extern const u8 gText_GreenPokeblock[]; +extern const u8 gText_YellowPokeblock[]; +extern const u8 gText_PurplePokeblock[]; +extern const u8 gText_IndigoPokeblock[]; +extern const u8 gText_BrownPokeblock[]; +extern const u8 gText_LiteBluePokeblock[]; +extern const u8 gText_OlivePokeblock[]; +extern const u8 gText_GrayPokeblock[]; +extern const u8 gText_BlackPokeblock[]; +extern const u8 gText_WhitePokeblock[]; +extern const u8 gText_GoldPokeblock[]; + +extern const u8 gMenuText_Use[]; +extern const u8 gMenuText_Toss[]; +extern const u8 gMenuText_Give[]; +extern const u8 gMenuText_Give2[]; + +extern const u8 gText_Cancel2[]; + #endif //GUARD_STRINGS_H -- cgit v1.2.3 From 435167674968749684710d7ad5c4f628c6b4ae86 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 16 Dec 2017 00:08:23 +0100 Subject: decompile more of pokeblock.s --- include/strings.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 6a379ee19..51027adff 100644 --- a/include/strings.h +++ b/include/strings.h @@ -18,6 +18,15 @@ extern const u8 gText_Tough[]; extern const u8 gText_Single[]; extern const u8 gText_Double[]; +extern const u8 gText_Spicy[]; +extern const u8 gText_Dry[]; +extern const u8 gText_Sweet[]; +extern const u8 gText_Bitter[]; +extern const u8 gText_Sour[]; + +extern const u8 gText_StowCase[]; +extern const u8 gText_LvVar1[]; + extern const u8 gText_Spicy2[]; extern const u8 gText_Dry2[]; extern const u8 gText_Sweet2[]; -- cgit v1.2.3 From 5b409d49edfa1102fdbf7a9d860aec387d7a523a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 16 Dec 2017 15:10:29 +0100 Subject: pokeblock.s is decompiled --- include/strings.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index 51027adff..15a6374a3 100644 --- a/include/strings.h +++ b/include/strings.h @@ -54,6 +54,9 @@ extern const u8 gText_NoDecorationsInUse[]; extern const u8 gText_Exit[]; extern const u8 gText_Cancel[]; +extern const u8 gText_ThrowAwayVar1[]; +extern const u8 gText_Var1ThrownAway[]; + extern const u8 gText_Color161Shadow161[]; extern const u8 gText_GoBackPrevMenu[]; extern const u8 gText_CantPlaceInRoom[]; -- cgit v1.2.3 From eb8055eb07f4ed6e3dd1d04d61e66ad9fb0d08b8 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 17 Dec 2017 20:10:57 +0100 Subject: battle 1 is decompiled --- include/strings.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/strings.h') diff --git a/include/strings.h b/include/strings.h index a2745d382..9c54e1b6e 100644 --- a/include/strings.h +++ b/include/strings.h @@ -84,5 +84,8 @@ extern const u8 gText_RegisteredDataDeleted[]; extern const u8 gUnknown_085EA79D[]; extern const u8 gText_PkmnFainted3[]; extern const u8 gText_Coins[]; +extern const u8 gText_Draw[]; +extern const u8 gText_Loss[]; +extern const u8 gText_Win[]; #endif //GUARD_STRINGS_H -- cgit v1.2.3