diff --git a/data/scripts/repel.inc b/data/scripts/repel.inc index fc178603c0..980fdce3e8 100644 --- a/data/scripts/repel.inc +++ b/data/scripts/repel.inc @@ -1,6 +1,152 @@ -EventScript_RepelWoreOff:: - msgbox Text_RepelWoreOff, MSGBOX_SIGN +.set LOCAL_VAR_SPRAY, VAR_0x8004 +.set LOCAL_VAR_NUM_SPRAY_STRENGTH, VAR_0x8005 +.set LOCAL_VAR_SPRAY_TYPE, VAR_0x8009 +.set LOCAL_VAR_NEW_SPRAY, VAR_0x8007 + +EventScript_BufferSprayName:: +.if VAR_LAST_REPEL_LURE_USED != 0 + bufferitemname STR_VAR_1, VAR_LAST_REPEL_LURE_USED + return +.endif + specialvar LOCAL_VAR_SPRAY_TYPE, GetLastUsedSprayType + compare LOCAL_VAR_SPRAY_TYPE, ITEM_REPEL + goto_if_eq EventScript_BufferSprayName_2 + bufferitemname STR_VAR_1, ITEM_LURE +EventScript_BufferSprayName_1: + return + +EventScript_BufferSprayName_2: + bufferitemname STR_VAR_1, ITEM_REPEL + goto EventScript_BufferSprayName_1 + + +EventScript_SprayWoreOff:: + lock + call EventScript_BufferSprayName + specialvar LOCAL_VAR_NUM_SPRAY_STRENGTH, GetNumberSprayStrength + switch LOCAL_VAR_NUM_SPRAY_STRENGTH + case 0, EventScript_SprayWoreOffMessage + case 1, EventScript_UseSingleSpray + goto EventScript_HandleMultipleSprays + return + +EventScript_HandleMultipleSprays:: +.if I_REPEL_LURE_MENU == TRUE + goto EventScript_ChooseWhichSpray +.else + goto EventScript_UseSingleSpray +.endif + return + + +EventScript_SprayWoreOffMessage:: + msgbox Text_SprayWoreOff, MSGBOX_SIGN + releaseall end -Text_RepelWoreOff: - .string "REPEL's effect wore off…$" + +EventScript_UseSingleSpray:: +.if VAR_LAST_REPEL_LURE_USED == 0 + call EventScript_UseDifferentSpray +.else + checkitem VAR_LAST_REPEL_LURE_USED, 1 + compare VAR_RESULT, TRUE + goto_if_eq EventScript_UseSingleSpray_2 + call EventScript_UseDifferentSpray +.endif +EventScript_UseSingleSpray_1: + closemessage + releaseall + end + +.if VAR_LAST_REPEL_LURE_USED != 0 +EventScript_UseSingleSpray_2: + call EventScript_UseLastUsedSpray + goto EventScript_UseSingleSpray_1 +.endif + + +EventScript_SetSingleSprayAndUse:: + setvar VAR_RESULT, 0 + call EventScript_UseSpray + return + + +EventScript_UseDifferentSpray:: + specialvar LOCAL_VAR_NEW_SPRAY, GetSprayId + bufferitemname STR_VAR_2, LOCAL_VAR_NEW_SPRAY + msgbox Text_SprayWoreOffAskUseX, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq EventScript_UseDifferentSpray_2 +EventScript_UseDifferentSpray_1: + return + +EventScript_UseDifferentSpray_2: + copyvar LOCAL_VAR_SPRAY, LOCAL_VAR_NEW_SPRAY + call EventScript_SetSingleSprayAndUse + goto EventScript_UseDifferentSpray_1 + + +.if VAR_LAST_REPEL_LURE_USED != 0 +EventScript_UseLastUsedSpray:: + msgbox Text_SprayWoreOffAskUseAnother, MSGBOX_YESNO + compare VAR_RESULT, YES + goto_if_eq EventScript_UseLastUsedSpray_2 +EventScript_UseLastUsedSpray_1: + return + +EventScript_UseLastUsedSpray_2: + copyvar LOCAL_VAR_SPRAY, VAR_LAST_REPEL_LURE_USED + call EventScript_SetSingleSprayAndUse + goto EventScript_UseLastUsedSpray_1 +.endif + + +.if I_REPEL_LURE_MENU == TRUE +EventScript_ChooseWhichSpray:: + message Text_SprayWoreOffAskUseAnother + waitmessage + callnative DrawSprayMenu + waitstate + compare VAR_RESULT, MULTI_B_PRESSED + goto_if_ne EventScript_ChooseWhichSpray_3 +EventScript_ChooseWhichSpray_1: + closemessage + releaseall + end + +EventScript_ChooseWhichSpray_2: + call EventScript_UseSpray + goto EventScript_ChooseWhichSpray_1 + +EventScript_ChooseWhichSpray_3: + compare VAR_RESULT, VAR_0x8003 + goto_if_ne EventScript_ChooseWhichSpray_2 + goto EventScript_ChooseWhichSpray_1 +.endif + + +EventScript_UseSpray:: + playse SE_REPEL + waitse + callnative HandleSprayMenuChoice + removeitem LOCAL_VAR_SPRAY, 1 + bufferitemname STR_VAR_2, LOCAL_VAR_SPRAY + msgbox Text_SprayWoreOffUseX, MSGBOX_SIGN + return + + +Text_SprayWoreOff:: + .string "{STR_VAR_1}的效果消失了……$" + +Text_SprayWoreOffAskUseAnother:: + .string "{STR_VAR_1}的效果消失了！\n" + .string "要再使用一个吗？$" + +Text_SprayWoreOffAskUseX:: + .string "{STR_VAR_1}的效果消失了！\n" + .string "要使用{STR_VAR_2}吗？$" + +Text_SprayWoreOffUseX:: + .string "{PLAYER}使用了\n" + .string "{STR_VAR_2}.$" diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 58ddc8ce55..9b9b0a5d2a 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -1,37 +1,35 @@ Route111_Text_MakingRoomUseTMToMakeYourOwn: - .string "What's that?\n" - .string "What am I doing?\p" - .string "I'm thinking about making my own room\n" - .string "here using a POKéMON move.\p" - .string "I know! I'll give you this TM.\n" - .string "Will you use it to make your own room?$" + .string "哎？你问我在干什么？\p" + .string "我正想用宝可梦的技能\n" + .string "在这里建一个只有\l" + .string "我自己才能住进去的房间呐！\p" + .string "对了！要不我给你这个技能机器\n" + .string "你也试试看吧！怎么样？$" Route111_Text_ExplainSecretPower: - .string "Find a big tree that looks like it might\n" - .string "drop some vines.\p" - .string "Use SECRET POWER in front of the tree.\n" - .string "Some vines should get free and drop\l" - .string "down, so you can climb the tree.\p" - .string "You'll find a lot of space for putting\n" - .string "your favorite things.\p" - .string "It'll be your own secret room…\n" - .string "A SECRET BASE!\p" - .string "You should make one, too.\p" - .string "Another thing, you don't always have\n" - .string "to make your SECRET BASE in a tree.\p" - .string "Try using SECRET POWER on rock walls\n" - .string "that have small indents in them.\p" - .string "I'm going to look for other places, too.\n" - .string "Okay, bye!$" + .string "对着面前这种藤蔓快要落下来的树\n" + .string "使用秘密力量这个技能试试看吧！\l" + .string "藤蔓落下来，就可以爬上去了！\p" + .string "那样的话，树顶有十分宽敞的空间\n" + .string "我还在那里放了许多我喜欢的东西！\l" + .string "只属于我一个人的房间……\l" + .string "就是，我的秘密基地了！\l" + .string "你也可以试试做一个的！\p" + .string "还有还有，制造秘密基地的场所\n" + .string "可不仅仅只有树上的！\p" + .string "在有小坑的墙壁前\n" + .string "也使用秘密力量试试看吧！\p" + .string "我去找找有没有别的地方去！\n" + .string "就这样吧！拜拜！$" Route111_Text_DontWantThis: - .string "Oh, you don't want this?\n" - .string "If you change your mind, tell me, okay?$" + .string "啊，原来你不要啊！\n" + .string "什么时候想要了，再来找我吧！$" Route111_Text_DontHaveAnyRoom: - .string "Oh, you don't have any room for this.\p" - .string "I'll hold on to it, so come back for it\n" - .string "another time, okay?$" + .string "啊，你的背包好像满了！\p" + .string "我先帮你拿着，等下次背包\n" + .string "空出来了，再过来拿吧！$" Route111_EventScript_SecretPowerMan:: lock diff --git a/data/scripts/test_signpost.inc b/data/scripts/test_signpost.inc index 6a8be547ba..e630f5846a 100644 --- a/data/scripts/test_signpost.inc +++ b/data/scripts/test_signpost.inc @@ -1,6 +1,6 @@ Text_ThisIsATestSignpostMsg:: - .string "This is a test message.\n" - .string "This is a signpost.$" + .string "测试用信息，\n" + .string "看板。$" EventScript_TestSignpostMsg:: msgbox Text_ThisIsATestSignpostMsg, MSGBOX_SIGN diff --git a/graphics/pokenav/header.bin b/graphics/pokenav/header.bin index f405a6dfcf..2f8008694c 100644 Binary files a/graphics/pokenav/header.bin and b/graphics/pokenav/header.bin differ diff --git a/graphics/pokenav/header.png b/graphics/pokenav/header.png index 7fe891e22f..e768ad1194 100644 Binary files a/graphics/pokenav/header.png and b/graphics/pokenav/header.png differ diff --git a/graphics/pokenav/region_map/city_zoom_text.png b/graphics/pokenav/region_map/city_zoom_text.png index 4e2b41be6d..9875e03d6c 100644 Binary files a/graphics/pokenav/region_map/city_zoom_text.png and b/graphics/pokenav/region_map/city_zoom_text.png differ diff --git a/graphics/shop/money.png b/graphics/shop/money.png index d11fe06d1e..8e93238454 100644 Binary files a/graphics/shop/money.png and b/graphics/shop/money.png differ diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c index 761f572d6b..4fc317f084 100644 --- a/src/pokenav_main_menu.c +++ b/src/pokenav_main_menu.c @@ -79,7 +79,11 @@ static const struct WindowTemplate sHelpBarWindowTemplate[] = .width = 16, .height = 2, .paletteNum = 0, - .baseBlock = 0x36, + //.baseBlock = 0x36, + //修改，修改地图左下角「放大/缩小」窗口基块 + //为了给主页面顶部和底部的「精灵导航」一栏的图片汉化留出空间 + //如果不想修改该基块的话，打开graphic/pokenav/header.png，删除最后面的「欢迎您」三个字的tiles即可 + .baseBlock = 0x3F, }, DUMMY_WIN_TEMPLATE };