Doc some event scripts

Doc decoration shops

Revert "Doc decoration shops"

This reverts commit 64d935ea0dc942c32b89487137e5703fce34b435.

Document through comments

Un-revert decor documentation
This commit is contained in:
Fontbane
2019-04-16 20:06:38 -04:00
committed by huderlem
parent 2c076f1f3e
commit 6cf06d5f95
9 changed files with 146 additions and 149 deletions

View File

@@ -3307,7 +3307,7 @@ AI_HPAware_DiscouragedEffectsWhenTargetLowHP: @ 82DE2B1
.byte EFFECT_TOXIC
.byte EFFECT_LIGHT_SCREEN
.byte EFFECT_OHKO
.byte EFFECT_SUPER_FANG
.byte EFFECT_SUPER_FANG //Maybe supposed to be EFFECT_RAZOR_WIND
.byte EFFECT_SUPER_FANG
.byte EFFECT_MIST
.byte EFFECT_FOCUS_ENERGY

View File

@@ -825,7 +825,7 @@ Std_10: @ 8271347
waitmessage
return
EventScript_27134E: @ 827134E
EventScript_UnusedReturn: @ 827134E
return
Common_EventScript_SaveGame:: @ 827134F
@@ -846,7 +846,7 @@ Std_MsgboxAutoclose:: @ 8271494
release
return
EventScript_27149D:: @ 827149D
EventScript_ResetAllBerries:: @ 827149D
setberrytree 2, 7, 5
setberrytree 1, 3, 5
setberrytree 11, 7, 5
@@ -1089,13 +1089,13 @@ EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
setflag FLAG_HIDE_SKY_PILLAR_WALLACE
setflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT
call EventScript_27149D
call EventScript_ResetAllBerries
end
EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
special sub_81AFDD0
setflag FLAG_IS_CHAMPION
call EverGrandeCity_HallOfFame_EventScript_271829
call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries
compare VAR_FOSSIL_MANIAC_STATE, 0
call_if_eq EverGrandeCity_HallOfFame_EventScript_271839
clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS
@@ -1120,7 +1120,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
call_if_eq EverGrandeCity_HallOfFame_EventScript_271851
return
EverGrandeCity_HallOfFame_EventScript_271829:: @ 8271829
EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829
clearflag FLAG_DEFEATED_MEW
clearflag FLAG_DEFEATED_LATIAS_OR_LATIOS
clearflag FLAG_DEFEATED_DEOXYS
@@ -2766,7 +2766,7 @@ EventScript_2736F8:: @ 82736F8
Common_EventScript_NopReturn:: @ 827374E
return
EventScript_27374F:: @ 827374F
EventScript_UnusedSetVarResult1:: @ 827374F
setvar VAR_RESULT, 1
return

View File

@@ -14,22 +14,22 @@ FortreeCity_DecorationShop_EventScript_218020:: @ 8218020
faceplayer
message gUnknown_08272A21
waitmessage
pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218038
pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Desks
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
FortreeCity_DecorationShop_PokemartDecor_218038: @ 8218038
.2byte 1
.2byte 2
.2byte 3
.2byte 4
.2byte 5
.2byte 7
.2byte 8
.2byte 9
.2byte 0
FortreeCity_DecorationShop_PokemartDecor_Desks: @ 8218038
.2byte DECOR_SMALL_DESK
.2byte DECOR_POKEMON_DESK
.2byte DECOR_HEAVY_DESK
.2byte DECOR_RAGGED_DESK
.2byte DECOR_COMFORT_DESK
.2byte DECOR_BRICK_DESK
.2byte DECOR_CAMP_DESK
.2byte DECOR_HARD_DESK
.2byte DECOR_NONE
release
end
@@ -38,22 +38,22 @@ FortreeCity_DecorationShop_EventScript_21804C:: @ 821804C
faceplayer
message gUnknown_08272A21
waitmessage
pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218064
pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Chairs
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
FortreeCity_DecorationShop_PokemartDecor_218064: @ 8218064
.2byte 10
.2byte 11
.2byte 12
.2byte 15
.2byte 14
.2byte 16
.2byte 17
.2byte 18
.2byte 0
FortreeCity_DecorationShop_PokemartDecor_Chairs: @ 8218064
.2byte DECOR_SMALL_CHAIR
.2byte DECOR_POKEMON_CHAIR
.2byte DECOR_HEAVY_CHAIR
.2byte DECOR_RAGGED_CHAIR
.2byte DECOR_COMFORT_CHAIR
.2byte DECOR_BRICK_CHAIR
.2byte DECOR_CAMP_CHAIR
.2byte DECOR_HARD_CHAIR
.2byte DECOR_NONE
release
end

View File

@@ -30,20 +30,20 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F
.align 2
LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248
.2byte 39
.2byte 35
.2byte 36
.2byte 37
.2byte 40
.2byte 33
.2byte 41
.2byte 38
.2byte 34
.2byte 45
.2byte 46
.2byte 47
.2byte 117
.2byte 112
.2byte DECOR_MUD_BALL
.2byte DECOR_FENCE_LENGTH
.2byte DECOR_FENCE_WIDTH
.2byte DECOR_TIRE
.2byte DECOR_BREAKABLE_DOOR
.2byte DECOR_SOLID_BOARD
.2byte DECOR_SAND_ORNAMENT
.2byte DECOR_STAND
.2byte DECOR_SLIDE
.2byte DECOR_TV
.2byte DECOR_ROUND_TV
.2byte DECOR_CUTE_TV
.2byte DECOR_WAILMER_DOLL
.2byte DECOR_RHYDON_DOLL
.2byte 0
release
end
@@ -235,4 +235,3 @@ LilycoveCity_DepartmentStoreRooftop_Text_2205F1: @ 82205F1
LilycoveCity_DepartmentStoreRooftop_Text_220603: @ 8220603
.string "Decided against buying a drink.$"

View File

@@ -18,26 +18,26 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6
faceplayer
message gUnknown_08272A21
waitmessage
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFC0
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Dolls
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
LilycoveCity_DepartmentStore_5F_Pokemart_21FFC0: @ 821FFC0
.2byte ITEM_X_DEFEND
.2byte ITEM_X_SPEED
.2byte ITEM_X_ACCURACY
.2byte ITEM_SUPER_REPEL
.2byte 91
.2byte 92
.2byte ITEM_SUN_STONE
.2byte ITEM_MOON_STONE
.2byte ITEM_FIRE_STONE
.2byte ITEM_THUNDER_STONE
.2byte ITEM_WATER_STONE
.2byte ITEM_LEAF_STONE
.2byte ITEM_NONE
LilycoveCity_DepartmentStore_5F_Pokemart_Dolls: @ 821FFC0
.2byte DECOR_PICHU_DOLL
.2byte DECOR_PIKACHU_DOLL
.2byte DECOR_MARILL_DOLL
.2byte DECOR_JIGGLYPUFF_DOLL
.2byte DECOR_DUSKULL_DOLL
.2byte DECOR_WYNAUT_DOLL
.2byte DECOR_BALTOY_DOLL
.2byte DECOR_KECLEON_DOLL
.2byte DECOR_AZURILL_DOLL
.2byte DECOR_SKITTY_DOLL
.2byte DECOR_SWABLU_DOLL
.2byte DECOR_GULPIN_DOLL
.2byte DECOR_NONE
release
end
@@ -46,23 +46,23 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FFDC:: @ 821FFDC
faceplayer
message gUnknown_08272A21
waitmessage
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFF4
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Cushions
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
LilycoveCity_DepartmentStore_5F_Pokemart_21FFF4: @ 821FFF4
.2byte 101
.2byte 102
.2byte ITEM_BIG_MUSHROOM
.2byte 105
.2byte ITEM_PEARL
.2byte ITEM_BIG_PEARL
.2byte ITEM_STARDUST
.2byte ITEM_STAR_PIECE
.2byte ITEM_NUGGET
.2byte ITEM_NONE
LilycoveCity_DepartmentStore_5F_Pokemart_Cushions: @ 821FFF4
.2byte DECOR_PIKA_CUSHION
.2byte DECOR_ROUND_CUSHION
.2byte DECOR_ZIGZAG_CUSHION
.2byte DECOR_SPIN_CUSHION
.2byte DECOR_DIAMOND_CUSHION
.2byte DECOR_BALL_CUSHION
.2byte DECOR_GRASS_CUSHION
.2byte DECOR_FIRE_CUSHION
.2byte DECOR_WATER_CUSHION
.2byte DECOR_NONE
release
end
@@ -71,23 +71,23 @@ LilycoveCity_DepartmentStore_5F_EventScript_22000A:: @ 822000A
faceplayer
message gUnknown_08272A21
waitmessage
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220024
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Posters
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
LilycoveCity_DepartmentStore_5F_Pokemart_220024: @ 8220024
.2byte ITEM_CARBOS
.2byte ITEM_CALCIUM
.2byte ITEM_RARE_CANDY
.2byte ITEM_PP_UP
.2byte ITEM_ZINC
.2byte ITEM_PP_MAX
.2byte 72
.2byte ITEM_GUARD_SPEC
.2byte ITEM_DIRE_HIT
.2byte ITEM_NONE
LilycoveCity_DepartmentStore_5F_Pokemart_Posters: @ 8220024
.2byte DECOR_BALL_POSTER
.2byte DECOR_GREEN_POSTER
.2byte DECOR_RED_POSTER
.2byte DECOR_BLUE_POSTER
.2byte DECOR_CUTE_POSTER
.2byte DECOR_PIKA_POSTER
.2byte DECOR_LONG_POSTER
.2byte DECOR_SEA_POSTER
.2byte DECOR_SKY_POSTER
.2byte DECOR_NONE
release
end
@@ -96,24 +96,24 @@ LilycoveCity_DepartmentStore_5F_EventScript_22003A:: @ 822003A
faceplayer
message gUnknown_08272A21
waitmessage
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220054
pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Mats
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
LilycoveCity_DepartmentStore_5F_Pokemart_220054: @ 8220054
.2byte 59
.2byte 60
.2byte 61
.2byte 62
.2byte ITEM_HP_UP
.2byte ITEM_PROTEIN
.2byte ITEM_IRON
.2byte ITEM_RED_SHARD
.2byte ITEM_BLUE_SHARD
.2byte ITEM_YELLOW_SHARD
.2byte ITEM_NONE
LilycoveCity_DepartmentStore_5F_Pokemart_Mats: @ 8220054
.2byte DECOR_SURF_MAT
.2byte DECOR_THUNDER_MAT
.2byte DECOR_FIRE_BLAST_MAT
.2byte DECOR_POWDER_SNOW_MAT
.2byte DECOR_ATTRACT_MAT
.2byte DECOR_FISSURE_MAT
.2byte DECOR_SPIKES_MAT
.2byte DECOR_GLITTER_MAT
.2byte DECOR_JUMP_MAT
.2byte DECOR_SPIN_MAT
.2byte DECOR_NONE
release
end
@@ -167,4 +167,3 @@ LilycoveCity_DepartmentStore_5F_Text_22016B: @ 822016B
LilycoveCity_DepartmentStore_5F_Text_2201C4: @ 82201C4
.string "I think they closed the rooftop\n"
.string "because the weather is wild today.$"

View File

@@ -48,20 +48,20 @@ Route104_PrettyPetalFlowerShop_EventScript_22A3DB:: @ 822A3DB
Route104_PrettyPetalFlowerShop_EventScript_22A3E4:: @ 822A3E4
message gUnknown_08272A52
waitmessage
pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_22A3FC
pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_Plants
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
Route104_PrettyPetalFlowerShop_Pokemart_22A3FC: @ 822A3FC
.2byte ITEM_FULL_RESTORE
.2byte ITEM_MAX_POTION
.2byte ITEM_HYPER_POTION
.2byte ITEM_SUPER_POTION
.2byte ITEM_FULL_HEAL
.2byte ITEM_REVIVE
.2byte ITEM_NONE
Route104_PrettyPetalFlowerShop_Pokemart_Plants: @ 822A3FC
.2byte DECOR_RED_PLANT
.2byte DECOR_TROPICAL_PLANT
.2byte DECOR_PRETTY_FLOWERS
.2byte DECOR_COLORFUL_PLANT
.2byte DECOR_BIG_PLANT
.2byte DECOR_GORGEOUS_PLANT
.2byte DECOR_NONE
release
end
@@ -101,4 +101,3 @@ Route104_PrettyPetalFlowerShop_EventScript_22A482:: @ 822A482
msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT
release
end

View File

@@ -491,17 +491,17 @@ SlateportCity_EventScript_1DD16A:: @ 81DD16A
faceplayer
message gUnknown_08272A21
waitmessage
pokemartdecoration SlateportCity_PokemartDecor_1DD184
pokemartdecoration SlateportCity_PokemartDecor_Dolls
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
SlateportCity_PokemartDecor_1DD184: @ 81DD184
.2byte 95
.2byte 78
.2byte 96
.2byte 0
SlateportCity_PokemartDecor_Dolls: @ 81DD184
.2byte DECOR_AZURILL_DOLL
.2byte DECOR_MARILL_DOLL
.2byte DECOR_SKITTY_DOLL
.2byte DECOR_NONE
release
end
@@ -522,21 +522,21 @@ SlateportCity_EventScript_1DD198:: @ 81DD198
end
SlateportCity_PokemartDecor_1DD1B8: @ 81DD1B8
.2byte 25
.2byte 27
.2byte 26
.2byte 28
.2byte 29
.2byte 30
.2byte 51
.2byte 52
.2byte 53
.2byte 54
.2byte 55
.2byte 56
.2byte 57
.2byte 58
.2byte 0
.2byte DECOR_RED_BRICK
.2byte DECOR_BLUE_BRICK
.2byte DECOR_YELLOW_BRICK
.2byte DECOR_RED_BALLOON
.2byte DECOR_BLUE_BALLOON
.2byte DECOR_YELLOW_BALLOON
.2byte DECOR_C_LOW_NOTE_MAT
.2byte DECOR_D_NOTE_MAT
.2byte DECOR_E_NOTE_MAT
.2byte DECOR_F_NOTE_MAT
.2byte DECOR_G_NOTE_MAT
.2byte DECOR_A_NOTE_MAT
.2byte DECOR_B_NOTE_MAT
.2byte DECOR_C_HIGH_NOTE_MAT
.2byte DECOR_NONE
release
end
@@ -1372,4 +1372,4 @@ SlateportCity_Text_1DF28C: @ 81DF28C
.string "That's a really great idea!\p"
.string "After all, a tough TRAINER is\n"
.string "the perfect fit for the BATTLE TENT!\p"
.string "Give it your best effort!$"
.string "Give it your best effort!$"

View File

@@ -5,9 +5,9 @@ extern EWRAM_DATA struct ItemSlot gMartPurchaseHistory[3];
enum
{
MART_TYPE_0, // normal mart
MART_TYPE_1,
MART_TYPE_2,
MART_TYPE_NORMAL, // normal mart
MART_TYPE_DECOR,
MART_TYPE_DECOR2,
};
// shop view window NPC info enum
@@ -49,4 +49,4 @@ void CreateDecorationShop1Menu(const u16 *);
void CreateDecorationShop2Menu(const u16 *);
void CB2_ExitSellMenu(void);
#endif // GUARD_SHOP_H
#endif // GUARD_SHOP_H

View File

@@ -276,7 +276,7 @@ static u8 CreateShopMenu(u8 martType)
ScriptContext2_Enable();
gMartInfo.martType = martType;
if (martType == MART_TYPE_0)
if (martType == MART_TYPE_NORMAL)
{
struct WindowTemplate winTemplate;
winTemplate = sShopMenuWindowTemplates[0];
@@ -396,7 +396,7 @@ static void Task_ReturnToShopMenu(u8 taskId)
{
if (IsWeatherNotFadingIn() == TRUE)
{
if (gMartInfo.martType == MART_TYPE_2)
if (gMartInfo.martType == MART_TYPE_DECOR2)
DisplayItemMessageOnField(taskId, gText_CanIHelpWithAnythingElse, ShowShopMenuAfterExitingBuyOrSellMenu);
else
DisplayItemMessageOnField(taskId, gText_AnythingElseICanHelp, ShowShopMenuAfterExitingBuyOrSellMenu);
@@ -511,7 +511,7 @@ static void BuyMenuBuildListMenuTemplate(void)
static void BuyMenuSetListEntry(struct ListMenuItem *menuItem, u16 item, u8 *name)
{
if (gMartInfo.martType == MART_TYPE_0)
if (gMartInfo.martType == MART_TYPE_NORMAL)
CopyItemName(item, name);
else
StringCopy(name, gDecorations[item].name);
@@ -535,7 +535,7 @@ static void BuyMenuPrintItemDescriptionAndShowItemIcon(int item, bool8 onInit, s
gShopDataPtr->iconSlot ^= 1;
if (item != -2)
{
if (gMartInfo.martType == MART_TYPE_0)
if (gMartInfo.martType == MART_TYPE_NORMAL)
description = ItemId_GetDescription(item);
else
description = gDecorations[item].description;
@@ -555,7 +555,7 @@ static void BuyMenuPrintPriceInList(u8 windowId, int item, u8 y)
if (item != -2)
{
if (gMartInfo.martType == MART_TYPE_0)
if (gMartInfo.martType == MART_TYPE_NORMAL)
{
ConvertIntToDecimalStringN(
gStringVar1,
@@ -616,7 +616,7 @@ static void BuyMenuAddItemIcon(u16 item, u8 iconSlot)
if (*spriteIdPtr != 0xFF)
return;
if (gMartInfo.martType == MART_TYPE_0 || item == 0xFFFF)
if (gMartInfo.martType == MART_TYPE_NORMAL || item == 0xFFFF)
{
spriteId = AddItemIconSprite(iconSlot + 2110, iconSlot + 2110, item);
if (spriteId != MAX_SPRITES)
@@ -929,7 +929,7 @@ static void Task_BuyMenu(u8 taskId)
BuyMenuRemoveScrollIndicatorArrows();
BuyMenuPrintCursor(tListTaskId, 2);
if (gMartInfo.martType == MART_TYPE_0)
if (gMartInfo.martType == MART_TYPE_NORMAL)
{
gShopDataPtr->totalCost = (ItemId_GetPrice(itemId) >> GetPriceReduction(1));
}
@@ -944,7 +944,7 @@ static void Task_BuyMenu(u8 taskId)
}
else
{
if (gMartInfo.martType == MART_TYPE_0)
if (gMartInfo.martType == MART_TYPE_NORMAL)
{
CopyItemName(itemId, gStringVar1);
if (ItemId_GetPocket(itemId) == POCKET_TM_HM)
@@ -962,7 +962,7 @@ static void Task_BuyMenu(u8 taskId)
StringCopy(gStringVar1, gDecorations[itemId].name);
ConvertIntToDecimalStringN(gStringVar2, gShopDataPtr->totalCost, STR_CONV_MODE_LEFT_ALIGN, 6);
if (gMartInfo.martType == MART_TYPE_1)
if (gMartInfo.martType == MART_TYPE_DECOR)
StringExpandPlaceholders(gStringVar4, gText_Var1IsItThatllBeVar2);
else
StringExpandPlaceholders(gStringVar4, gText_YouWantedVar1ThatllBeVar2);
@@ -1051,7 +1051,7 @@ static void BuyMenuTryMakePurchase(u8 taskId)
PutWindowTilemap(1);
if (gMartInfo.martType == MART_TYPE_0)
if (gMartInfo.martType == MART_TYPE_NORMAL)
{
if (AddBagItem(tItemId, tItemCount) == TRUE)
{
@@ -1067,7 +1067,7 @@ static void BuyMenuTryMakePurchase(u8 taskId)
{
if (DecorationAdd(tItemId))
{
if (gMartInfo.martType == MART_TYPE_1)
if (gMartInfo.martType == MART_TYPE_DECOR)
{
BuyMenuDisplayMessage(taskId, gText_ThankYouIllSendItHome, BuyMenuSubtractMoney);
}
@@ -1090,7 +1090,7 @@ static void BuyMenuSubtractMoney(u8 taskId)
PlaySE(SE_REGI);
PrintMoneyAmountInMoneyBox(0, GetMoney(&gSaveBlock1Ptr->money), 0);
if (gMartInfo.martType == MART_TYPE_0)
if (gMartInfo.martType == MART_TYPE_NORMAL)
{
gTasks[taskId].func = Task_ReturnToItemListAfterItemPurchase;
}
@@ -1211,7 +1211,7 @@ static void RecordItemPurchase(u8 taskId)
void CreatePokemartMenu(const u16 *itemsForSale)
{
CreateShopMenu(MART_TYPE_0);
CreateShopMenu(MART_TYPE_NORMAL);
SetShopItemsForSale(itemsForSale);
ClearItemPurchases();
SetShopMenuCallback(EnableBothScriptContexts);
@@ -1219,14 +1219,14 @@ void CreatePokemartMenu(const u16 *itemsForSale)
void CreateDecorationShop1Menu(const u16 *itemsForSale)
{
CreateShopMenu(MART_TYPE_1);
CreateShopMenu(MART_TYPE_DECOR);
SetShopItemsForSale(itemsForSale);
SetShopMenuCallback(EnableBothScriptContexts);
}
void CreateDecorationShop2Menu(const u16 *itemsForSale)
{
CreateShopMenu(MART_TYPE_2);
CreateShopMenu(MART_TYPE_DECOR2);
SetShopItemsForSale(itemsForSale);
SetShopMenuCallback(EnableBothScriptContexts);
}
}