diff --git a/src/code_8023144.c b/src/code_8023144.c index 709606e06..05f3b6f93 100644 --- a/src/code_8023144.c +++ b/src/code_8023144.c @@ -113,7 +113,7 @@ void sub_8022D2C(void) { loopMax += 1; } else { - if(GetItemCategory(gUnknown_203B294->item.id) == 5) + if(GetItemCategory(gUnknown_203B294->item.id) == CATEGORY_TMS_HMS) { gUnknown_203B294->unkF8[loopMax].text = gUnknown_80DC8F8; gUnknown_203B294->unkF8[loopMax].menuAction = 6; diff --git a/src/code_8048480.c b/src/code_8048480.c index 1eadb0d12..0790cf543 100644 --- a/src/code_8048480.c +++ b/src/code_8048480.c @@ -1,7 +1,9 @@ #include "global.h" +#include "constants/dungeon.h" #include "constants/dungeon_action.h" #include "constants/iq_skill.h" #include "constants/status.h" +#include "constants/type.h" #include "dungeon_action.h" #include "dungeon_entity.h" #include "dungeon_util.h" @@ -21,8 +23,8 @@ extern u8 gAvailablePokemonNames[]; extern u8 gUnknown_202DE58[]; -extern s16 gTypeGummiIQBoost[0x12][NUMBER_OF_GUMMIS]; -extern s16 gUnknown_810A808[0x12][NUMBER_OF_GUMMIS]; +extern s16 gTypeGummiIQBoost[NUM_TYPES][NUMBER_OF_GUMMIS]; +extern s16 gUnknown_810A808[NUM_TYPES][NUMBER_OF_GUMMIS]; extern u8 *gUnknown_80F89F4[]; extern u8 *gUnknown_80FB580[]; @@ -349,13 +351,13 @@ void sub_80487CC(struct Entity *pokemon, struct Entity * target, u32 param_3, u3 sub_8078B5C(pokemon, target, param_3, param_4, 1); } -static inline bool8 sub_80487E0_sub(struct EntityInfo *pokemonInfo) +static inline bool8 JoinLocationCannotUseItems_1(struct EntityInfo *pokemonInfo) { - if (pokemonInfo->joinedAt == 0x4A) + if (pokemonInfo->joinedAt == DUNGEON_JOIN_LOCATION_CLIENT_POKEMON) { return TRUE; } - if (pokemonInfo->joinedAt == 0x47) + if (pokemonInfo->joinedAt == DUNGEON_RESCUE_TEAM_BASE) { return TRUE; } @@ -379,7 +381,7 @@ void sub_80487E0(struct Entity *pokemon, struct Entity *target, u8 gummiIndex) gUnknown_810A808[targetInfo->types[0]][gummiIndex] + gUnknown_810A808[targetInfo->types[1]][gummiIndex],0,1); if (!targetInfo->isNotTeamMember) { - if (!sub_80487E0_sub(targetInfo)) { + if (!JoinLocationCannotUseItems_1(targetInfo)) { baseIQ = targetInfo->IQ; targetInfo->IQ += gummiBoost; currIQ = baseIQ + gummiBoost; @@ -435,13 +437,13 @@ void sub_8048940(struct Entity *pokemon, struct Entity *target) void nullsub_94(void) {} -static inline bool8 sub_8048950_sub(struct EntityInfo *pokemonInfo) +static inline bool8 JoinLocationCannotUseItems_2(struct EntityInfo *pokemonInfo) { - if (pokemonInfo->joinedAt == 0x4A) + if (pokemonInfo->joinedAt == DUNGEON_JOIN_LOCATION_CLIENT_POKEMON) { return TRUE; } - if (pokemonInfo->joinedAt == 0x47) + if (pokemonInfo->joinedAt == DUNGEON_RESCUE_TEAM_BASE) { return TRUE; } @@ -480,7 +482,7 @@ bool8 sub_8048950(u32 param_1,struct Item *item) if (entityInfo->clientType == CLIENT_TYPE_CLIENT) { flag = FALSE; } - if (sub_8048950_sub(entityInfo)) { + if (JoinLocationCannotUseItems_2(entityInfo)) { flag = FALSE; } entityInfo->unk157 = flag; @@ -500,13 +502,13 @@ bool8 sub_8048950(u32 param_1,struct Item *item) return FALSE; } -static inline bool8 sub_8048A68_sub(struct EntityInfo *pokemonInfo) +static inline bool8 JoinLocationCannotUseItems_3(struct EntityInfo *pokemonInfo) { - if (pokemonInfo->joinedAt == 0x4A) + if (pokemonInfo->joinedAt == DUNGEON_JOIN_LOCATION_CLIENT_POKEMON) { return TRUE; } - if (pokemonInfo->joinedAt == 0x47) + if (pokemonInfo->joinedAt == DUNGEON_RESCUE_TEAM_BASE) { return TRUE; } @@ -555,7 +557,7 @@ bool8 sub_8048A68(u32 param_1,struct Item *item) if (pEVar6->clientType == CLIENT_TYPE_CLIENT) { flag = FALSE; } - if (sub_8048A68_sub(pEVar6)) { + if (JoinLocationCannotUseItems_3(pEVar6)) { flag = FALSE; } if (pEVar6->isTeamLeader) { @@ -577,13 +579,13 @@ bool8 sub_8048A68(u32 param_1,struct Item *item) return FALSE; } -static inline bool8 sub_8048B9C_sub(struct EntityInfo *pokemonInfo) +static inline bool8 JoinLocationCannotUseItems_4(struct EntityInfo *pokemonInfo) { - if (pokemonInfo->joinedAt == 0x4A) + if (pokemonInfo->joinedAt == DUNGEON_JOIN_LOCATION_CLIENT_POKEMON) { return TRUE; } - if (pokemonInfo->joinedAt == 0x47) + if (pokemonInfo->joinedAt == DUNGEON_RESCUE_TEAM_BASE) { return TRUE; } @@ -631,7 +633,7 @@ bool32 sub_8048B9C(struct Entity *entity,struct Item *param_2) { flag = FALSE; } - if(sub_8048B9C_sub(entity1Info)) + if(JoinLocationCannotUseItems_4(entity1Info)) { flag = FALSE; } diff --git a/src/move_util.c b/src/move_util.c index 09f638352..635257fb4 100644 --- a/src/move_util.c +++ b/src/move_util.c @@ -27,7 +27,7 @@ u32 sub_8057144(struct Entity * pokemon) s32 counter; struct Move *moveStack [80]; struct Move **local_20; -#ifndef NONMATCING +#ifndef NONMATCHING register s32 counter_1 asm("r0"); register struct Move** move_1 asm("r1"); #else diff --git a/src/other_menus.c b/src/other_menus.c index 672d554d6..b3dd52903 100644 --- a/src/other_menus.c +++ b/src/other_menus.c @@ -50,7 +50,7 @@ const struct MenuItem gUnknown_80E656C[4] = { {NULL, 0x3}, }; -ALIGNED(4) const u8 sUnknown_80E658C[] = _("{CENTER_ALIGN}Don~27t turn the power off!"); +ALIGNED(4) const u8 sUnknown_80E658C[] = _("{CENTER_ALIGN}Don{APOSTROPHE}t turn the power off!"); ALIGNED(4) const u8 sUnknown_80E65AC[] = _("{CENTER_ALIGN}Item transmitting!"); ALIGNED(4) const u8 sUnknown_80E65C4[] = _("{CENTER_ALIGN}{COLOR_1 RED}Caution!{END_COLOR_TEXT_1} "); @@ -113,7 +113,7 @@ const struct MenuItem gUnknown_80E66D4[4] = { }; ALIGNED(4) const u8 sUnknown_80E66F4[] = _("{CENTER_ALIGN}Please press any button."); ALIGNED(4) const u8 sUnknown_80E6710[] = _("{CENTER_ALIGN}Your adventure will be continued."); -ALIGNED(4) const u8 sUnknown_80E6734[] = _("{CENTER_ALIGN}#CGSuccess!#R "); +ALIGNED(4) const u8 sUnknown_80E6734[] = _("{CENTER_ALIGN}{COLOR_1 LIGHT_BLUE_2}Success!{END_COLOR_TEXT_1} "); const struct UnkTextStruct2 gUnknown_80E6748 = { 0x00, 0x00, 0x00, 0x00, @@ -136,7 +136,7 @@ const struct MenuItem gUnknown_80E6760[4] = { }; ALIGNED(4) const u8 sUnknown_80E6780[] = _("{CENTER_ALIGN}please try again."); ALIGNED(4) const u8 sUnknown_80E6794[] = _("{CENTER_ALIGN}Check the Game Link cable and"); -ALIGNED(4) const u8 sUnknown_80E67B4[] = _("{CENTER_ALIGN}#C2Communication error!#R "); +ALIGNED(4) const u8 sUnknown_80E67B4[] = _("{CENTER_ALIGN}#C2Communication error!{END_COLOR_TEXT_1} "); const struct UnkTextStruct2 gUnknown_80E67D4 = { 0x00, 0x00, 0x00, 0x00, @@ -194,9 +194,9 @@ const struct MenuItem gUnknown_80E68B4[4] = { {sUnknown_80E68D4, 0x5}, {NULL, 0x3}, }; -ALIGNED(4) const u8 sUnknown_80E68D4[] = _("{CENTER_ALIGN}someone~27s storage space was full."); +ALIGNED(4) const u8 sUnknown_80E68D4[] = _("{CENTER_ALIGN}someone{APOSTROPHE}s storage space was full."); ALIGNED(4) const u8 sUnknown_80E68FC[] = _("{CENTER_ALIGN}An item could not be transferred because"); -ALIGNED(4) const u8 sUnknown_80E6928[] = _("{CENTER_ALIGN}#C2Error!#R "); +ALIGNED(4) const u8 sUnknown_80E6928[] = _("{CENTER_ALIGN}#C2Error!{END_COLOR_TEXT_1} "); const struct UnkTextStruct2 gUnknown_80E6938 = { 0x00, 0x00, 0x00, 0x00, @@ -216,7 +216,7 @@ const struct MenuItem gUnknown_80E6950[4] = { {NULL, 0x3}, }; ALIGNED(4) const u8 sUnknown_80E6970[] = _("{CENTER_ALIGN}Please check again."); -ALIGNED(4) const u8 sUnknown_80E6988[] = _("{CENTER_ALIGN}This #CGSOS Mail#R can~27t be used."); +ALIGNED(4) const u8 sUnknown_80E6988[] = _("{CENTER_ALIGN}This {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} can{APOSTROPHE}t be used."); const struct UnkTextStruct2 gUnknown_80E69B0 = { 0x00, 0x00, 0x00, 0x00, @@ -234,7 +234,7 @@ const struct MenuItem gUnknown_80E69C8[4] = { {sUnknown_80E6970, 0x5}, {NULL, 0x3}, }; -ALIGNED(4) const u8 sUnknown_80E69E8[] = _("{CENTER_ALIGN}This #CGA-OK Mail#R can~27t be used."); +ALIGNED(4) const u8 sUnknown_80E69E8[] = _("{CENTER_ALIGN}This {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} can{APOSTROPHE}t be used."); const struct UnkTextStruct2 gUnknown_80E6A10 = { 0x00, 0x00, 0x00, 0x00, @@ -252,7 +252,7 @@ const struct MenuItem gUnknown_80E6A28[4] = { {sUnknown_80E6970, 0x5}, {NULL, 0x3}, }; -ALIGNED(4) const u8 sUnknown_80E6A48[] = _("{CENTER_ALIGN}This #CGThank-You Mail#R can~27t be used."); +ALIGNED(4) const u8 sUnknown_80E6A48[] = _("{CENTER_ALIGN}This {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} can{APOSTROPHE}t be used."); const struct UnkTextStruct2 gUnknown_80E6A74 = { 0x00, 0x00, 0x00, 0x00, @@ -271,7 +271,7 @@ const struct MenuItem gUnknown_80E6A8C[4] = { {sUnknown_80E6AAC, 0x5}, {NULL, 0x3}, }; -ALIGNED(4) const u8 sUnknown_80E6AAC[] = _("{CENTER_ALIGN}It can~27t be received."); +ALIGNED(4) const u8 sUnknown_80E6AAC[] = _("{CENTER_ALIGN}It can{APOSTROPHE}t be received."); ALIGNED(4) const u8 sUnknown_80E6AC8[] = _("{CENTER_ALIGN}There is no space for new mail."); const struct UnkTextStruct2 gUnknown_80E6AEC = { @@ -292,7 +292,7 @@ const struct MenuItem gUnknown_80E6B04[4] = { {NULL, 0x3}, }; ALIGNED(4) const u8 sUnknown_80E6B24[] = _("{CENTER_ALIGN}You need to go further in the story."); -ALIGNED(4) const u8 sUnknown_80E6B4C[] = _("{CENTER_ALIGN}You may not go to that #CGdungeon#R yet."); +ALIGNED(4) const u8 sUnknown_80E6B4C[] = _("{CENTER_ALIGN}You may not go to that {COLOR_1 LIGHT_BLUE_2}dungeon{END_COLOR_TEXT_1} yet."); const struct UnkTextStruct2 gUnknown_80E6B78 = { 0x00, 0x00, 0x00, 0x00, @@ -312,7 +312,7 @@ const struct MenuItem gUnknown_80E6B90[4] = { {NULL, 0x3}, }; ALIGNED(4) const u8 sUnknown_80E6BB0[] = _("{CENTER_ALIGN}Please try again."); -ALIGNED(4) const u8 sUnknown_80E6BC4[] = _("{CENTER_ALIGN}There was a problem on your friend~27s end."); +ALIGNED(4) const u8 sUnknown_80E6BC4[] = _("{CENTER_ALIGN}There was a problem on your friend{APOSTROPHE}s end."); const struct UnkTextStruct2 gUnknown_80E6BF4 = { 0x00, 0x00, 0x00, 0x00, diff --git a/src/party_list_menu.c b/src/party_list_menu.c index 167cfedb8..810403234 100644 --- a/src/party_list_menu.c +++ b/src/party_list_menu.c @@ -750,7 +750,7 @@ void sub_8026A94(void) static inline bool8 sub_8026AB0_sub(void) { - if (gUnknown_203B2B8->pokeStruct->dungeonLocation.id == 0x44 || gUnknown_203B2B8->pokeStruct->dungeonLocation.id == 0x45) + if (gUnknown_203B2B8->pokeStruct->dungeonLocation.id == DUNGEON_HOWLING_FOREST_2 || gUnknown_203B2B8->pokeStruct->dungeonLocation.id == DUNGEON_POKEMON_SQUARE) return TRUE; else return FALSE; diff --git a/src/rescue_password_menu.c b/src/rescue_password_menu.c index 14a7a8121..eb7f8022c 100644 --- a/src/rescue_password_menu.c +++ b/src/rescue_password_menu.c @@ -144,7 +144,7 @@ const struct MenuItem gUnknown_80E73C4[4] = { {NULL, 0xA}, }; -ALIGNED(4) const u8 sUnknown_80E73E4[] = _("{CENTER_ALIGN}This is not an #CGA-OK Mail{END_COLOR_TEXT_1}."); +ALIGNED(4) const u8 sUnknown_80E73E4[] = _("{CENTER_ALIGN}This is not an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}."); const struct UnkTextStruct2 gUnknown_80E7408 = { 0x00, 0x00, 0x00, 0x00, @@ -165,7 +165,7 @@ const struct MenuItem gUnknown_80E7420[4] = { {NULL, 0xA}, }; -ALIGNED(4) const u8 sUnknown_80E7440[] = _("#+This #CGA-OK Mail#R cannot be used."); +ALIGNED(4) const u8 sUnknown_80E7440[] = _("{CENTER_ALIGN}This {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} cannot be used."); const struct UnkTextStruct2 gUnknown_80E7468 = { 0x00, 0x00, 0x00, 0x00, @@ -185,7 +185,7 @@ const struct MenuItem gUnknown_80E7480[4] = { {CheckAgain_80E7234, 0xC}, {NULL, 0xA}, }; -ALIGNED(4) const u8 sUnknown_80E74A0[] = _("#+This is not a #CGThank-You Mail#R."); +ALIGNED(4) const u8 sUnknown_80E74A0[] = _("{CENTER_ALIGN}This is not a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}."); const struct UnkTextStruct2 gUnknown_80E74C8 = { 0x00, 0x00, 0x00, 0x00, @@ -206,7 +206,7 @@ const struct MenuItem gUnknown_80E74E0[4] = { {NULL, 0xA}, }; -ALIGNED(4) const u8 sUnknown_80E7500[] = _("#+This #CGThank-You Mail#R cannot be used."); +ALIGNED(4) const u8 sUnknown_80E7500[] = _("{CENTER_ALIGN}This {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} cannot be used."); const struct UnkTextStruct2 gUnknown_80E752C = { 0x00, 0x00, 0x00, 0x00, @@ -226,7 +226,7 @@ const struct MenuItem gUnknown_80E7544[4] = { {CheckAgain_80E7234, 0xC}, {NULL, 0xA}, }; -ALIGNED(4) const u8 sUnknown_80E7564[] = _("#+This is not a #CGWonder Mail#R."); +ALIGNED(4) const u8 sUnknown_80E7564[] = _("{CENTER_ALIGN}This is not a {COLOR_1 LIGHT_BLUE_2}Wonder Mail{END_COLOR_TEXT_1}."); const struct UnkTextStruct2 gUnknown_80E7588 = { 0x00, 0x00, 0x00, 0x00, @@ -246,8 +246,8 @@ const struct MenuItem gUnknown_80E75A0[4] = { {sUnknown_80E75C0, 0xC}, {NULL, 0xA}, }; -ALIGNED(4) const u8 sUnknown_80E75C0[] = _("#+new mail."); -ALIGNED(4) const u8 sUnknown_80E75CC[] = _("#+There is no space for receiving"); +ALIGNED(4) const u8 sUnknown_80E75C0[] = _("{CENTER_ALIGN}new mail."); +ALIGNED(4) const u8 sUnknown_80E75CC[] = _("{CENTER_ALIGN}There is no space for receiving"); static const u8 fill0[] = "pksdir0";