diff options
Diffstat (limited to 'data')
23 files changed, 337 insertions, 822 deletions
diff --git a/data/data_835B488.s b/data/data_835B488.s index e5e7b9e90..88c12b035 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -542,492 +542,8 @@ sBerries:: @ 83DF7E8 gUnknown_83DFC9C:: @ 83DFC9C .incbin "baserom.gba", 0x3DFC9C, 0xB4 -gUnknown_83DFD50:: @ 83DFD50 - .4byte gUnknown_8417938, NULL - .4byte gUnknown_841793C, NULL - -gUnknown_83DFD60:: @ 83DFD60 - .4byte gUnknown_8417ADC, NULL - .4byte gUnknown_8417AE3, NULL - .4byte gUnknown_8417AE9, NULL - .4byte gUnknown_8417AEE, NULL - -gUnknown_83DFD80:: @ 83DFD80 - .4byte gUnknown_84178F0, NULL - .4byte gUnknown_8417907, NULL - -gUnknown_83DFD90:: @ 83DFD90 - .4byte gUnknown_84178EB, NULL - .4byte gUnknown_8417907, NULL - -gUnknown_83DFDA0:: @ 83DFDA0 - .4byte gUnknown_84178FD, NULL - .4byte gUnknown_8417907, NULL - -gUnknown_83DFDB0:: @ 83DFDB0 - .4byte gUnknown_84178F0, NULL - .4byte gUnknown_84178EB, NULL - .4byte gUnknown_8417907, NULL - -gUnknown_83DFDC8:: @ 83DFDC8 - .4byte gUnknown_84178F0, NULL - .4byte gUnknown_84178FD, NULL - .4byte gUnknown_8417907, NULL - -gUnknown_83DFDE0:: @ 83DFDE0 - .4byte gUnknown_84178EB, NULL - .4byte gUnknown_84178FD, NULL - .4byte gUnknown_8417907, NULL - -gUnknown_83DFDF8:: @ 83DFDF8 - .4byte gUnknown_84178F0, NULL - .4byte gUnknown_84178EB, NULL - .4byte gUnknown_84178FD, NULL - .4byte gUnknown_8417907, NULL - -gUnknown_83DFE18:: @ 83DFE18 - .4byte gUnknown_8417914, NULL - .4byte gUnknown_841790C, NULL - .4byte gUnknown_8417910, NULL - .4byte gUnknown_8417918, NULL - .4byte gUnknown_841791C, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83DFE48:: @ 83DFE48 - .4byte gUnknown_8417938, NULL - .4byte gUnknown_841793C, NULL - .4byte gUnknown_84178E6, NULL - -gUnknown_83DFE60:: @ 83DFE60 - .4byte gUnknown_8417944, NULL - .4byte gUnknown_8417952, NULL - .4byte gUnknown_8417960, NULL - .4byte gUnknown_84178E6, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83DFE88:: @ 83DFE88 - .4byte gUnknown_8417938, NULL - .4byte gUnknown_841793C, NULL - .4byte gUnknown_84178E6, NULL - -gUnknown_83DFEA0:: @ 83DFEA0 - .4byte gUnknown_841796D, NULL - .4byte gUnknown_841797F, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83DFEB8:: @ 83DFEB8 - .4byte gUnknown_841806D, NULL - .4byte gUnknown_841805D, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83DFED0:: @ 83DFED0 - .4byte gUnknown_8417D56, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83DFEE0:: @ 83DFEE0 - .4byte gUnknown_8417D63, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83DFEF0:: @ 83DFEF0 - .4byte gUnknown_8417D6F, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83DFF00:: @ 83DFF00 - .4byte gUnknown_8417D56, NULL - .4byte gUnknown_8417D6F, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83DFF18:: @ 83DFF18 - .4byte gUnknown_8417D63, NULL - .4byte gUnknown_8417D6F, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83DFF30:: @ 83DFF30 - .4byte gUnknown_8417984, NULL - .4byte gUnknown_841799A, NULL - .4byte gUnknown_84179AD, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83DFF50:: @ 83DFF50 - .4byte gUnknown_8417A42, NULL - .4byte gUnknown_8417A58, NULL - .4byte gUnknown_8417A6E, NULL - .4byte gUnknown_8417A84, NULL - .4byte gUnknown_8417A9A, NULL - .4byte gUnknown_8417D4C, NULL - -gUnknown_83DFF80:: @ 83DFF80 - .4byte gUnknown_8417F4D, NULL - .4byte gUnknown_8417ED9, NULL - .4byte gUnknown_8417EF7, NULL - .4byte gUnknown_8417F11, NULL - .4byte gUnknown_8417F2F, NULL - .4byte gUnknown_8417D4C, NULL - -gUnknown_83DFFB0:: @ 83DFFB0 - .4byte gUnknown_84179C0, NULL - .4byte gUnknown_84179D6, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83DFFC8:: @ 83DFFC8 - .4byte gUnknown_84179ED, NULL - .4byte gUnknown_84179F7, NULL - -gUnknown_83DFFD8:: @ 83DFFD8 - .4byte gUnknown_8417A37, NULL - .4byte gUnknown_8417A3D, NULL - -gUnknown_83DFFE8:: @ 83DFFE8 - .4byte gUnknown_8417ABC, NULL - .4byte gUnknown_8417AB9, NULL - .4byte gUnknown_8417AB6, NULL - .4byte gUnknown_8417AB3, NULL - .4byte gUnknown_8417AB0, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0018:: @ 83E0018 - .4byte gUnknown_8417C0F, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0028:: @ 83E0028 - .4byte gUnknown_8417C1B, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0038:: @ 83E0038 - .4byte gUnknown_8417C0F, NULL - .4byte gUnknown_8417C1B, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0050:: @ 83E0050 - .4byte gUnknown_8417C24, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0060:: @ 83E0060 - .4byte gUnknown_8417C0F, NULL - .4byte gUnknown_8417C24, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0078:: @ 83E0078 - .4byte gUnknown_8417C1B, NULL - .4byte gUnknown_8417C24, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0090:: @ 83E0090 - .4byte gUnknown_8417C0F, NULL - .4byte gUnknown_8417C1B, NULL - .4byte gUnknown_8417C24, NULL - .4byte gOtherText_Exit, NULL - .4byte gUnknown_8417A24, NULL - .4byte gOtherText_Exit, NULL - .4byte gUnknown_8417A02, NULL - .4byte gUnknown_8417A24, NULL - .4byte gOtherText_Exit, NULL - .4byte gUnknown_8417A0C, NULL - .4byte gUnknown_8417A24, NULL - .4byte gOtherText_Exit, NULL - .4byte gUnknown_8417A02, NULL - .4byte gUnknown_8417A0C, NULL - .4byte gUnknown_8417A24, NULL - .4byte gOtherText_Exit, NULL - .4byte gUnknown_8417A19, NULL - .4byte gUnknown_8417A24, NULL - .4byte gOtherText_Exit, NULL - .4byte gUnknown_8417A02, NULL - .4byte gUnknown_8417A19, NULL - .4byte gUnknown_8417A24, NULL - .4byte gOtherText_Exit, NULL - .4byte gUnknown_8417A0C, NULL - .4byte gUnknown_8417A19, NULL - .4byte gUnknown_8417A24, NULL - .4byte gOtherText_Exit, NULL - .4byte gUnknown_8417A02, NULL - .4byte gUnknown_8417A0C, NULL - .4byte gUnknown_8417A19, NULL - .4byte gUnknown_8417A24, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0190:: @ 83E0190 - .4byte gUnknown_8417BE2, NULL - .4byte gUnknown_8417BE8, NULL - .4byte gUnknown_8417BF0, NULL - .4byte gUnknown_8417BF8, NULL - .4byte gUnknown_8417C01, NULL - -gUnknown_83E01B8:: @ 83E01B8 - .4byte gUnknown_8417C33, NULL - .4byte gUnknown_8417C4B, NULL - -gUnknown_83E01C8:: @ 83E01C8 - .4byte gUnknown_8417C55, NULL - .4byte gUnknown_8417C6A, NULL - .4byte gUnknown_8417C83, NULL - .4byte gUnknown_8417C9D, NULL - .4byte gUnknown_8417CB7, NULL - .4byte gUnknown_8417D4C, NULL - -gUnknown_83E01F8:: @ 83E01F8 - .4byte gUnknown_8417D79, NULL - .4byte gUnknown_8417D86, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0210:: @ 83E0210 - .4byte gUnknown_8417D90, NULL - .4byte gUnknown_8417DA0, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0228:: @ 83E0228 - .4byte gUnknown_841805D, NULL - .4byte gUnknown_8418061, NULL - .4byte gUnknown_8418069, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0248:: @ 83E0248 - .4byte gUnknown_841807D, NULL - .4byte gUnknown_841808E, NULL - .4byte gUnknown_841809C, NULL - .4byte gOtherText_Quit, NULL - -gUnknown_83E0268:: @ 83E0268 - .4byte gUnknown_8417DFE, NULL - .4byte gUnknown_8417E09, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0280:: @ 83E0280 - .4byte gUnknown_8417DF3, NULL - .4byte gUnknown_8417E09, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0298:: @ 83E0298 - .4byte gUnknown_8417DF3, NULL - .4byte gUnknown_8417DFE, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E02B0:: @ 83E02B0 - .4byte gUnknown_8417D79, NULL - .4byte gUnknown_8417E50, NULL - .4byte gUnknown_8417E5A, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E02D0:: @ 83E02D0 - .4byte gUnknown_8417E66, NULL - .4byte gUnknown_8417E67, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E02E8:: @ 83E02E8 - .4byte gUnknown_8417D79, NULL - .4byte gUnknown_8417E50, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0300:: @ 83E0300 - .4byte gUnknown_8417E72, NULL - .4byte gUnknown_8417E7F, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0318:: @ 83E0318 - .4byte gUnknown_8417E94, NULL - .4byte gUnknown_8417EA4, NULL - -gUnknown_83E0328:: @ 83E0328 - .4byte gUnknown_8417D79, NULL - .4byte gUnknown_8417E50, NULL - .4byte gUnknown_8417E71, NULL - .4byte gUnknown_8417E5A, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0350:: @ 83E0350 - .4byte gUnknown_8417D79, NULL - .4byte gUnknown_8417E50, NULL - .4byte gUnknown_8417E71, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0370:: @ 83E0370 - .4byte gUnknown_8417EB3, NULL - .4byte gUnknown_8417EC1, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0388:: @ 83E0388 - .4byte gUnknown_8417EB3, NULL - .4byte gUnknown_8417ECC, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E03A0:: @ 83E03A0 - .4byte gUnknown_8417EB3, NULL - .4byte gUnknown_8417EC1, NULL - .4byte gUnknown_8417ECC, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E03C0:: @ 83E03C0 - .4byte gUnknown_8417DF3, NULL - .4byte gUnknown_8417DFE, NULL - .4byte gUnknown_8417E09, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E03E0:: @ 83E03E0 - .4byte gUnknown_8417E46, NULL - .4byte gUnknown_8417DFE, NULL - .4byte gUnknown_8417E09, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0400:: @ 83E0400 - .4byte gUnknown_8417E46, NULL - .4byte gUnknown_8417DF3, NULL - .4byte gUnknown_8417E09, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0420:: @ 83E0420 - .4byte gUnknown_8417E46, NULL - .4byte gUnknown_8417DF3, NULL - .4byte gUnknown_8417DFE, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0440:: @ 83E0440 - .4byte gUnknown_8417E46, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0450:: @ 83E0450 - .4byte gUnknown_8417F68, NULL - .4byte gUnknown_8417F67, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0468:: @ 83E0468 - .4byte gUnknown_8417F77, NULL - .4byte gUnknown_8417F69, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E0480:: @ 83E0480 - .4byte gOtherText_Single, NULL - .4byte gOtherText_Double, NULL - .4byte gOtherText_Knockout, NULL - .4byte gOtherText_Mixed, NULL - .4byte gOtherText_Exit, NULL - -gUnknown_83E04A8:: @ 83E04A8 - .4byte gOtherText_Exit, NULL - -gUnknown_83E04B0:: @ 83E04B0 - .4byte gUnknown_83DFD50, 2 - .4byte gUnknown_83E0190, 5 - .4byte gUnknown_83DFD60, 4 - .4byte gUnknown_83DFD80, 2 - .4byte gUnknown_83DFD90, 2 - .4byte gUnknown_83DFDA0, 2 - .4byte gUnknown_83DFDB0, 3 - .4byte gUnknown_83DFDC8, 3 - .4byte gUnknown_83DFDE0, 3 - .4byte gUnknown_83DFDF8, 4 - .4byte gUnknown_83E04A8, 1 - .4byte gUnknown_83E04A8, 1 - .4byte gUnknown_83E04A8, 1 - .4byte gUnknown_83E01B8, 2 - .4byte gUnknown_83E01C8, 6 - .4byte gUnknown_83DFE18, 6 - .4byte gUnknown_83DFE48, 3 - .4byte gUnknown_83DFE60, 5 - .4byte gUnknown_83DFE88, 3 - .4byte gUnknown_83DFEA0, 3 - .4byte gUnknown_83DFEB8, 3 - .4byte gUnknown_83DFED0, 2 - .4byte gUnknown_83DFEE0, 2 - .4byte gUnknown_83DFEF0, 2 - .4byte gUnknown_83DFF00, 3 - .4byte gUnknown_83DFF18, 3 - .4byte gUnknown_83DFF30, 4 - .4byte gUnknown_83DFFB0, 3 - .4byte gUnknown_83DFFC8, 2 - .4byte gUnknown_83DFFD8, 2 - .4byte gUnknown_83DFF50, 6 - .4byte gUnknown_83DFFE8, 6 - .4byte gUnknown_83E0018, 2 - .4byte gUnknown_83E0028, 2 - .4byte gUnknown_83E0038, 3 - .4byte gUnknown_83E0050, 2 - .4byte gUnknown_83E0060, 3 - .4byte gUnknown_83E0078, 3 - .4byte gUnknown_83E0090, 4 - .4byte gUnknown_83E01F8, 3 - .4byte gUnknown_83E0210, 3 - .4byte gUnknown_83DFF80, 6 - .4byte gUnknown_83E0228, 4 - .4byte gUnknown_83E0248, 4 - .4byte gUnknown_83E0268, 3 - .4byte gUnknown_83E0280, 3 - .4byte gUnknown_83E0298, 3 - .4byte gUnknown_83E02B0, 4 - .4byte gUnknown_83E02D0, 3 - .4byte gUnknown_83E0300, 3 - .4byte gUnknown_83E02E8, 3 - .4byte gUnknown_83E0318, 2 - .4byte gUnknown_83E0328, 5 - .4byte gUnknown_83E0350, 4 - .4byte gUnknown_83E0370, 3 - .4byte gUnknown_83E0388, 3 - .4byte gUnknown_83E03A0, 4 - .4byte gUnknown_83E03C0, 4 - .4byte gUnknown_83E03E0, 4 - .4byte gUnknown_83E0400, 4 - .4byte gUnknown_83E0420, 4 - .4byte gUnknown_83E0440, 2 - .4byte gUnknown_83E0450, 3 - .4byte gUnknown_83E0468, 3 - .4byte gUnknown_83E0480, 5 - -gStdStringPtrs:: @ 83E06B8 - .4byte gUnknown_8417ABF - .4byte gUnknown_8417AC4 - .4byte gUnknown_8417ACB - .4byte gUnknown_8417AD0 - .4byte gUnknown_8417AD6 - .4byte gUnknown_8417AF4 - .4byte gUnknown_8417AF9 - .4byte gUnknown_8417B00 - .4byte gUnknown_8417B05 - .4byte gUnknown_8417B0B - .4byte gUnknown_8417B11 - .4byte gUnknown_8417B17 - .4byte gUnknown_8417B21 - .4byte gUnknown_8417B2C - .4byte gUnknown_8417B36 - .4byte gUnknown_8417B3E - .4byte gUnknown_8417B4B - .4byte gUnknown_8417B58 - .4byte gUnknown_8417B65 - .4byte gUnknown_8417B72 - .4byte gUnknown_8417B7C - .4byte gUnknown_8417B87 - .4byte gUnknown_8417B94 - .4byte gUnknown_8417C2D - .4byte gUnknown_8417DA9 - .4byte gUnknown_8417DB6 - .4byte gUnknown_8417DC7 - .4byte gUnknown_8417DD9 - .4byte gUnknown_8417DE1 - -gUnknown_83E072C:: @ 83E072C - .incbin "baserom.gba", 0x3E072C, 0xC - -gUnknown_83E0738:: @ 83E0738 - .incbin "baserom.gba", 0x3E0738, 0x10 - -gUnknown_83E0748:: @ 83E0748 - .incbin "baserom.gba", 0x3E0748, 0x20 - -gUnknown_83E0768:: @ 83E0768 - .incbin "baserom.gba", 0x3E0768, 0x818 - -gUnknown_83E0F80:: @ 83E0F80 - .incbin "baserom.gba", 0x3E0F80, 0x820 - -gUnknown_83E17A0:: @ 83E17A0 - .incbin "baserom.gba", 0x3E17A0, 0x20 - -gUnknown_83E17C0:: @ 83E17C0 - .incbin "baserom.gba", 0x3E17C0, 0x10 - -gUnknown_83E17D0:: @ 83E17D0 - .incbin "baserom.gba", 0x3E17D0, 0x10 - -gUnknown_83E17E0:: @ 83E17E0 - .incbin "baserom.gba", 0x3E17E0, 0xAA0 + .section .rodata.83E2280 + .incbin "baserom.gba", 0x3E1800, 0xA80 gUnknown_83E2280:: @ 83E2280 .incbin "baserom.gba", 0x3E2280, 0x10 diff --git a/data/event_scripts.s b/data/event_scripts.s index 928d920f2..a3943d494 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -16,6 +16,7 @@ #include "constants/fame_checker.h" #include "constants/seagallop.h" #include "constants/game_stat.h" +#include "constants/menu.h" #include "constants/battle_setup.h" .include "asm/macros.inc" .include "asm/macros/event.inc" @@ -24,9 +25,9 @@ .section script_data, "aw", %progbits - .include "data/script_cmd_table.inc" + .include "data/script_cmd_table.inc" - .align 2 + .align 2 gSpecialVars:: @ 815FD0C .4byte gSpecialVar_0x8000 .4byte gSpecialVar_0x8001 @@ -50,9 +51,9 @@ gSpecialVars:: @ 815FD0C .4byte gSpecialVar_PrevTextColor .4byte gUnknown_20370DE - .include "data/specials.inc" + .include "data/specials.inc" - .align 2 + .align 2 gStdScripts:: @ 8160450 .4byte gStdScript_0 .4byte gStdScript_1 @@ -1593,11 +1594,11 @@ EventScript_1A6578:: @ 81A6578 goto_if eq, EventScript_1A7AE0 message Text_1A5483 waitmessage - multichoice 19, 8, 0, 2 + multichoice 19, 8, MULTICHOICE_YES_NO, FALSE | (TRUE << 1) switch VAR_RESULT case 0, EventScript_1A65B8 case 1 EventScript_1A6663 - case 127, EventScript_1A6663 + case SCR_MENU_CANCEL, EventScript_1A6663 end EventScript_1A65B8:: @ 81A65B8 @@ -1950,7 +1951,7 @@ EventScript_1A69A8:: @ 81A69A8 case 2, EventScript_1A6A7A case 3, EventScript_1A6A56 case 4, EventScript_1A6A46 - case 127, EventScript_1A6A46 + case SCR_MENU_CANCEL, EventScript_1A6A46 end EventScript_1A69F0:: @ 81A69F0 @@ -4160,22 +4161,22 @@ EventScript_1A8EC5:: @ 81A8EC5 goto_if ge, EventScript_1A911E compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 goto_if ge, EventScript_1A8F12 - multichoice 19, 6, 44, 0 + multichoice 19, 6, MULTICHOICE_ISLAND_23, FALSE switch VAR_RESULT case 0, EventScript_1A8FF9 case 1, EventScript_1A9004 case 2, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case SCR_MENU_CANCEL, EventScript_1A90F6 end EventScript_1A8F12:: @ 81A8F12 - multichoice 19, 5, 58, 0 + multichoice 19, 5, MULTICHOICE_SEAGALLOP_V23, FALSE switch VAR_RESULT case 0, EventScript_1A8FE3 case 1, EventScript_1A8FF9 case 2, EventScript_1A9004 case 3, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case SCR_MENU_CANCEL, EventScript_1A90F6 end EventScript_1A8F54:: @ 81A8F54 @@ -4183,22 +4184,22 @@ EventScript_1A8F54:: @ 81A8F54 goto_if ge, EventScript_1A911E compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 goto_if ge, EventScript_1A8FA1 - multichoice 19, 6, 45, 0 + multichoice 19, 6, MULTICHOICE_ISLAND_13, FALSE switch VAR_RESULT case 0, EventScript_1A8FEE case 1, EventScript_1A9004 case 2, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case SCR_MENU_CANCEL, EventScript_1A90F6 end EventScript_1A8FA1:: @ 81A8FA1 - multichoice 19, 5, 59, 0 + multichoice 19, 5, MULTICHOICE_SEAGALLOP_V13, FALSE switch VAR_RESULT case 0, EventScript_1A8FE3 case 1, EventScript_1A8FEE case 2, EventScript_1A9004 case 3, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case SCR_MENU_CANCEL, EventScript_1A90F6 end EventScript_1A8FE3:: @ 81A8FE3 @@ -4226,22 +4227,22 @@ EventScript_1A900F:: @ 81A900F goto_if ge, EventScript_1A911E compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 4 goto_if ge, EventScript_1A905C - multichoice 19, 6, 46, 0 + multichoice 19, 6, MULTICHOICE_ISLAND_12, FALSE switch VAR_RESULT case 0, EventScript_1A8FEE case 1, EventScript_1A8FF9 case 2, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case SCR_MENU_CANCEL, EventScript_1A90F6 end EventScript_1A905C:: @ 81A905C - multichoice 19, 5, 60, 0 + multichoice 19, 5, MULTICHOICE_SEAGALLOP_V12, FALSE switch VAR_RESULT case 0, EventScript_1A8FE3 case 1, EventScript_1A8FEE case 2, EventScript_1A8FF9 case 3, EventScript_1A90F6 - case 127, EventScript_1A90F6 + case SCR_MENU_CANCEL, EventScript_1A90F6 end EventScript_1A909E:: @ 81A909E @@ -4271,7 +4272,7 @@ EventScript_1A90DA:: @ 81A90DA goto_if eq, EventScript_1A7AE0 special sub_8112364 fadescreen 1 - special ScrSpecial_SeaGallopFerry + special ScrSpecial_SeagallopFerry waitstate end @@ -4296,31 +4297,31 @@ Movement_1A911C:: @ 81A911C EventScript_1A911E:: @ 81A911E setvar VAR_0x8005, 0 - special sub_809D764 + special Special_DrawSeagallopDestinationMenu waitstate - specialvar VAR_0x8006, sub_809D8C0 + specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination switch VAR_0x8006 - case 0, EventScript_1A91D5 - case 1, EventScript_1A91E0 - case 2, EventScript_1A91EB - case 3, EventScript_1A91F6 - case 4, EventScript_1A9201 - case 254, EventScript_1A917F - case 127, EventScript_1A90F6 + case SEAGALLOP_VERMILION_CITY, EventScript_1A91D5 + case SEAGALLOP_ONE_ISLAND, EventScript_1A91E0 + case SEAGALLOP_TWO_ISLAND, EventScript_1A91EB + case SEAGALLOP_THREE_ISLAND, EventScript_1A91F6 + case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201 + case SEAGALLOP_MORE, EventScript_1A917F + case SCR_MENU_CANCEL, EventScript_1A90F6 end EventScript_1A917F:: @ 81A917F setvar VAR_0x8005, 1 - special sub_809D764 + special Special_DrawSeagallopDestinationMenu waitstate - specialvar VAR_0x8006, sub_809D8C0 + specialvar VAR_0x8006, Special_GetSelectedSeagallopDestination switch VAR_0x8006 - case 4, EventScript_1A9201 - case 5, EventScript_1A920C - case 6, EventScript_1A9217 - case 7, EventScript_1A9222 - case 254, EventScript_1A911E - case 127, EventScript_1A90F6 + case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201 + case SEAGALLOP_FIVE_ISLAND, EventScript_1A920C + case SEAGALLOP_SIX_ISLAND, EventScript_1A9217 + case SEAGALLOP_SEVEN_ISLAND, EventScript_1A9222 + case SEAGALLOP_MORE, EventScript_1A911E + case SCR_MENU_CANCEL, EventScript_1A90F6 end EventScript_1A91D5:: @ 81A91D5 @@ -7877,7 +7878,7 @@ CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867 waitse message gUnknown_81B1E24 waitmessage - multichoice 21, 0, 2, 1 + multichoice 21, 0, MULTICHOICE_TRAINER_CARD_ICON_TINT, TRUE switch VAR_RESULT case 0, EventScript_1B28DB case 1, EventScript_1B28E6 @@ -8003,64 +8004,64 @@ EventScript_1B29D0:: @ 81B29D0 end EventScript_1B2A23:: @ 81B2A23 - multichoice 15, 8, 3, 0 + multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE switch VAR_RESULT case 0, EventScript_1B2B98 case 1, EventScript_1B2DF6 - case 127, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 end EventScript_1B2A4F:: @ 81B2A4F - multichoice 16, 8, 4, 0 + multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE switch VAR_RESULT case 0, EventScript_1B2C62 case 1, EventScript_1B2DF6 - case 127, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 end EventScript_1B2A7B:: @ 81B2A7B - multichoice 15, 8, 5, 0 + multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE switch VAR_RESULT case 0, EventScript_1B2D2C case 1, EventScript_1B2DF6 - case 127, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 end EventScript_1B2AA7:: @ 81B2AA7 - multichoice 15, 6, 6, 0 + multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE switch VAR_RESULT case 0, EventScript_1B2B98 case 1, EventScript_1B2C62 case 2, EventScript_1B2DF6 - case 127, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 end EventScript_1B2ADE:: @ 81B2ADE - multichoice 15, 6, 7, 0 + multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE switch VAR_RESULT case 0, EventScript_1B2B98 case 1, EventScript_1B2D2C case 2, EventScript_1B2DF6 - case 127, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 end EventScript_1B2B15:: @ 81B2B15 - multichoice 15, 6, 8, 0 + multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE switch VAR_RESULT case 0, EventScript_1B2C62 case 1, EventScript_1B2D2C case 2, EventScript_1B2DF6 - case 127, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 end EventScript_1B2B4C:: @ 81B2B4C - multichoice 15, 5, 9, 0 + multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE switch VAR_RESULT case 0, EventScript_1B2B98 case 1, EventScript_1B2C62 case 2, EventScript_1B2D2C case 3, EventScript_1B2DF6 - case 127, EventScript_1B2DF6 + case SCR_MENU_CANCEL, EventScript_1B2DF6 end EventScript_1B2B8E:: @ 81B2B8E @@ -8369,16 +8370,14 @@ ThreeIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED TwoIsland_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED VermilionCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED - multichoice 64, 1, 0, 39 - showelevmenu - compare_local_to_local 8, 111 - setdivewarp MAP_NAVEL_ROCK_EXTERIOR, 39, 7090, 28424 - setdivewarp MAP_VIRIDIAN_CITY_HOUSE1, 39, 7090, 28424 - setdivewarp MAP_PALLET_TOWN, 39, 7090, 28424 - setdivewarp MAP_PEWTER_CITY_MUSEUM_1F, 39, 7090, 28424 - setdivewarp MAP_CERULEAN_CITY_HOUSE1, 39, 7090, 28424 - setdivewarp MAP_LAVENDER_TOWN_POKEMON_CENTER_1F, 39, 7090, 8 - nop + map_script_2 VAR_0x406F, 1, EventScript_1BB227 + map_script_2 VAR_0x406F, 2, EventScript_1BB227 + map_script_2 VAR_0x406F, 5, EventScript_1BB227 + map_script_2 VAR_0x406F, 3, EventScript_1BB227 + map_script_2 VAR_0x406F, 6, EventScript_1BB227 + map_script_2 VAR_0x406F, 7, EventScript_1BB227 + map_script_2 VAR_0x406F, 8, EventScript_1BB227 + .2byte 0 EventScript_1BB227:: @ 81BB227 compare_var_to_value VAR_0x8007, 0 @@ -8608,12 +8607,12 @@ EventScript_1BB459:: @ 81BB459 EventScript_1BB467:: @ 81BB467 setvar VAR_0x8004, 0 - multichoice 0, 0, 39, 0 + multichoice 0, 0, MULTICHOICE_TRADE_CENTER_COLOSSEUM, FALSE switch VAR_RESULT case 0, EventScript_1BB6AB case 1, EventScript_1BB4A3 case 2, EventScript_1BB82F - case 127, EventScript_1BB82F + case SCR_MENU_CANCEL, EventScript_1BB82F end EventScript_1BB4A3:: @ 81BB4A3 @@ -8626,14 +8625,14 @@ EventScript_1BB4AD:: @ 81BB4AD EventScript_1BB4AE:: @ 81BB4AE message Text_1BD338 waitmessage - multichoice 0, 0, 17, 0 + multichoice 0, 0, MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT, FALSE switch VAR_RESULT case 0, EventScript_1BB50F case 1, EventScript_1BB51A case 2, EventScript_1BB541 case 3, EventScript_1BB501 case 4, EventScript_1BB82F - case 127, EventScript_1BB82F + case SCR_MENU_CANCEL, EventScript_1BB82F end EventScript_1BB501:: @ 81BB501 @@ -9199,12 +9198,12 @@ EventScript_1BBA50:: @ 81BBA50 end EventScript_1BBA51:: @ 81BBA51 - multichoice 18, 6, 16, 0 + multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE switch VAR_RESULT case 0, EventScript_1BBA94 case 1, EventScript_1BB82F case 2, EventScript_1BBA88 - case 127, EventScript_1BB82F + case SCR_MENU_CANCEL, EventScript_1BB82F end EventScript_1BBA88:: @ 81BBA88 @@ -9323,22 +9322,22 @@ EventScript_1BBBE6:: @ 81BBBE6 EventScript_1BBBE7:: @ 81BBBE7 checkflag FLAG_GOT_POWDER_JAR goto_if FALSE, EventScript_1BBC32 - multichoice 0, 0, 47, 0 + multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_CRUSH, FALSE switch VAR_RESULT case 0, EventScript_1BBC69 case 1, EventScript_1BBC97 case 2, EventScript_1BBD35 case 3, EventScript_1BB82F - case 127, EventScript_1BB82F + case SCR_MENU_CANCEL, EventScript_1BB82F end EventScript_1BBC32:: @ 81BBC32 - multichoice 0, 0, 50, 0 + multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_2, FALSE switch VAR_RESULT case 0, EventScript_1BBC69 case 1, EventScript_1BBC97 case 2, EventScript_1BB82F - case 127, EventScript_1BB82F + case SCR_MENU_CANCEL, EventScript_1BB82F end EventScript_1BBC69:: @ 81BBC69 @@ -9357,14 +9356,14 @@ EventScript_1BBC96:: @ 81BBC96 EventScript_1BBC97:: @ 81BBC97 message Text_1BD338 waitmessage - multichoice 0, 0, 17, 0 + multichoice 0, 0, MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT, FALSE switch VAR_RESULT case 0, EventScript_1BBCEA case 1, EventScript_1BBCF5 case 2, EventScript_1BBD1C case 3, EventScript_1BBD27 case 4, EventScript_1BB82F - case 127, EventScript_1BB82F + case SCR_MENU_CANCEL, EventScript_1BB82F end EventScript_1BBCEA:: @ 81BBCEA @@ -9442,12 +9441,12 @@ EventScript_1BBDBC:: @ 81BBDBC message Text_1BD51B waitmessage call EventScript_1A6675 - multichoice 13, 6, 63, 0 + multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT case 0, EventScript_1BBE28 case 1, EventScript_1BBE00 case 2, EventScript_1BB82F - case 127, EventScript_1BB82F + case SCR_MENU_CANCEL, EventScript_1BB82F end EventScript_1BBE00:: @ 81BBE00 @@ -9477,12 +9476,12 @@ EventScript_1BBE50:: @ 81BBE50 message Text_1BD582 waitmessage call EventScript_1A6675 - multichoice 13, 6, 63, 0 + multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT case 0, EventScript_1BBEBC case 1, EventScript_1BBE94 case 2, EventScript_1BB82F - case 127, EventScript_1BB82F + case SCR_MENU_CANCEL, EventScript_1BB82F end EventScript_1BBE94:: @ 81BBE94 @@ -9512,12 +9511,12 @@ EventScript_1BBEE4:: @ 81BBEE4 message Text_1BD5F1 waitmessage call EventScript_1A6675 - multichoice 13, 6, 63, 0 + multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT case 0, EventScript_1BBF50 case 1, EventScript_1BBF28 case 2, EventScript_1BB82F - case 127, EventScript_1BB82F + case SCR_MENU_CANCEL, EventScript_1BB82F end EventScript_1BBF28:: @ 81BBF28 @@ -9659,12 +9658,12 @@ EventScript_1BC060:: @ 81BC060 faceplayer message Text_1BCCFF waitmessage - multichoice 0, 0, 49, 0 + multichoice 0, 0, MULTICHOICE_POKEJUMP_DODRIO, FALSE switch VAR_RESULT case 0, EventScript_1BC0B0 case 1, EventScript_1BC0BA case 2, EventScript_1BC0C4 - case 127, EventScript_1BC0C4 + case SCR_MENU_CANCEL, EventScript_1BC0C4 end EventScript_1BC0B0:: @ 81BC0B0 @@ -9698,12 +9697,12 @@ EventScript_1BC0CE:: @ 81BC0CE special HelpSystem_Disable message Text_1BD02D waitmessage - multichoice 0, 0, 49, 0 + multichoice 0, 0, MULTICHOICE_POKEJUMP_DODRIO, FALSE switch VAR_RESULT case 0, EventScript_1BC13A case 1, EventScript_1BC184 case 2, EventScript_1BB83F - case 127, EventScript_1BB83F + case SCR_MENU_CANCEL, EventScript_1BB83F end EventScript_1BC13A:: @ 81BC13A @@ -9751,12 +9750,12 @@ EventScript_1BC1CE:: @ 81BC1CE message Text_1BD5F1 waitmessage call EventScript_1A6675 - multichoice 13, 6, 63, 0 + multichoice 13, 6, MULTICHOICE_JOIN_OR_LEAD, FALSE switch VAR_RESULT case 0, EventScript_1BC23A case 1, EventScript_1BC212 case 2, EventScript_1BB83F - case 127, EventScript_1BB83F + case SCR_MENU_CANCEL, EventScript_1BB83F end EventScript_1BC212:: @ 81BC212 @@ -11303,12 +11302,12 @@ EventScript_1BEE3A:: @ 81BEE3A EventScript_1BEE44:: @ 81BEE44 message Text_1BF017 waitmessage - multichoice 18, 6, 18, 0 + multichoice 18, 6, MULTICHOICE_YES_NO_INFO_2, FALSE switch VAR_RESULT case 0, EventScript_1BEE8F case 1, EventScript_1BEEC3 case 2, EventScript_1BEE81 - case 127, EventScript_1BEEC3 + case SCR_MENU_CANCEL, EventScript_1BEEC3 end EventScript_1BEE81:: @ 81BEE81 @@ -11350,12 +11349,12 @@ EventScript_1BEECD:: @ 81BEECD EventScript_1BEEDB:: @ 81BEEDB message Text_1BF1FB waitmessage - multichoice 18, 6, 18, 0 + multichoice 18, 6, MULTICHOICE_YES_NO_INFO_2, FALSE switch VAR_RESULT case 0, EventScript_1BEF26 case 1, EventScript_1BEF35 case 2, EventScript_1BEF18 - case 127, EventScript_1BEF35 + case SCR_MENU_CANCEL, EventScript_1BEF35 end EventScript_1BEF18:: @ 81BEF18 @@ -13429,7 +13428,7 @@ VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE goto_if eq, EventScript_1C4802 setflag FLAG_TUTOR_DOUBLE_EDGE goto EventScript_1C480C - end + end EventScript_1C4802:: @ 81C4802 msgbox Text_174ABC @@ -13459,7 +13458,7 @@ EventScript_1C4816:: @ 81C4816 goto_if eq, EventScript_1C486A setflag FLAG_TUTOR_THUNDER_WAVE goto EventScript_1C4874 - end + end EventScript_1C486A:: @ 81C486A msgbox Text_17579D @@ -13489,7 +13488,7 @@ RockTunnel_B1F_EventScript_1C487E:: @ 81C487E goto_if eq, EventScript_1C48D2 setflag FLAG_TUTOR_ROCK_SLIDE goto EventScript_1C48DC - end + end EventScript_1C48D2:: @ 81C48D2 msgbox Text_179AC0 @@ -13519,7 +13518,7 @@ MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6 goto_if eq, EventScript_1C493A setflag FLAG_TUTOR_EXPLOSION goto EventScript_1C4944 - end + end EventScript_1C493A:: @ 81C493A msgbox Text_17A6ED @@ -13549,7 +13548,7 @@ Route4_EventScript_1C494E:: @ 81C494E goto_if eq, EventScript_1C49A2 setflag FLAG_TUTOR_META_PUNCH goto EventScript_1C49AC - end + end EventScript_1C49A2:: @ 81C49A2 msgbox Text_183A83 @@ -13579,7 +13578,7 @@ Route4_EventScript_1C49B6:: @ 81C49B6 goto_if eq, EventScript_1C4A0A setflag FLAG_TUTOR_MEGA_KICK goto EventScript_1C4A14 - end + end EventScript_1C4A0A:: @ 81C4A0A msgbox Text_183C25 @@ -13609,7 +13608,7 @@ EventScript_1C4A1E:: @ 81C4A1E goto_if eq, EventScript_1C4A72 setflag FLAG_TUTOR_DREAM_EATER goto EventScript_1C4A7C - end + end EventScript_1C4A72:: @ 81C4A72 msgbox Text_17E3E9 @@ -13639,7 +13638,7 @@ EventScript_1C4A86:: @ 81C4A86 goto_if eq, EventScript_1C4ADA setflag FLAG_TUTOR_SOFT_BOILED goto EventScript_1C4AE4 - end + end EventScript_1C4ADA:: @ 81C4ADA msgbox Text_18043F @@ -13669,7 +13668,7 @@ FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE goto_if eq, EventScript_1C4B42 setflag FLAG_TUTOR_SUBSTITUTE goto EventScript_1C4B4C - end + end EventScript_1C4B42:: @ 81C4B42 msgbox Text_180A32 @@ -13699,7 +13698,7 @@ SevenIsland_EventScript_1C4B56:: @ 81C4B56 goto_if eq, EventScript_1C4BAA setflag FLAG_TUTOR_SWORDS_DANCE goto EventScript_1C4BB4 - end + end EventScript_1C4BAA:: @ 81C4BAA msgbox Text_182FC1 @@ -13729,7 +13728,7 @@ PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE goto_if eq, EventScript_1C4C12 setflag FLAG_TUTOR_SEISMIC_TOSS goto EventScript_1C4C1C - end + end EventScript_1C4C12:: @ 81C4C12 msgbox Text_190AA9 @@ -13759,7 +13758,7 @@ EventScript_1C4C26:: @ 81C4C26 goto_if eq, EventScript_1C4C7A setflag FLAG_TUTOR_COUNTER goto EventScript_1C4C84 - end + end EventScript_1C4C7A:: @ 81C4C7A msgbox Text_1959CC @@ -13789,7 +13788,7 @@ EventScript_1C4C8E:: @ 81C4C8E goto_if eq, EventScript_1C4CE2 setflag FLAG_TUTOR_METRONOME goto EventScript_1C4CEC - end + end EventScript_1C4CE2:: @ 81C4CE2 msgbox Text_19A1CB @@ -13820,7 +13819,7 @@ EventScript_1C4CF6:: @ 81C4CF6 removeitem ITEM_POKE_DOLL, 1 setflag FLAG_TUTOR_MIMIC goto EventScript_1C4D59 - end + end EventScript_1C4D4F:: @ 81C4D4F msgbox Text_19ADD8 @@ -13862,7 +13861,7 @@ FourIsland_House1_EventScript_1C4D84:: @ 81C4D84 goto_if eq, EventScript_1C4DD8 setflag FLAG_TUTOR_BODY_SLAM goto EventScript_1C4DE2 - end + end EventScript_1C4DD8:: @ 81C4DD8 msgbox Text_1A35C7 @@ -14503,7 +14502,7 @@ gText_PlayerSavedTheGame:: @ 81C5647 .string "{PLAYER} saved the game.$" gUnknown_81C565A:: - .string "セーブに しっぱい しました‥$" + .string "セーブに しっぱい しました‥$" gText_DifferentGameFile:: @ 81C566A .string "WARNING!\p" diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index ea213a771..6df635f1a 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -7,7 +7,7 @@ BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7 message Text_181726 waitmessage setvar VAR_0x8004, SEAGALLOP_BIRTH_ISLAND - multichoice 20, 8, 61, 0 + multichoice 20, 8, MULTICHOICE_SEAGALLOP_VERMILION, FALSE switch VAR_RESULT case 0, EventScript_1A91D5 case 1, EventScript_1A90F6 diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 3ffdd24f6..a18215910 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -68,7 +68,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522 message Text_1965F4 waitmessage setvar VAR_0x8004, 4 - multichoice 0, 0, 43, 0 + multichoice 0, 0, MULTICHOICE_LINKED_DIRECT_UNION, FALSE switch VAR_RESULT case 0, EventScript_16C5C0 case 1, EventScript_16C5CE @@ -80,7 +80,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522 EventScript_16C578:: @ 816C578 message Text_1965F4 waitmessage - multichoice 0, 0, 43, 0 + multichoice 0, 0, MULTICHOICE_LINKED_DIRECT_UNION, FALSE switch VAR_RESULT case 0, EventScript_16C5C0 case 1, EventScript_16C5CE diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 0e2673614..3fcd14e8a 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -21,29 +21,29 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 end EventScript_16C1B7:: @ 816C1B7 - multichoicedefault 0, 0, 31, 0, 0 + multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 0, FALSE goto EventScript_16C1F3 EventScript_16C1C2:: @ 816C1C2 end EventScript_16C1C3:: @ 816C1C3 - multichoicedefault 0, 0, 31, 1, 0 + multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 1, FALSE goto EventScript_16C1F3 end EventScript_16C1CF:: @ 816C1CF - multichoicedefault 0, 0, 31, 2, 0 + multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 2, FALSE goto EventScript_16C1F3 end EventScript_16C1DB:: @ 816C1DB - multichoicedefault 0, 0, 31, 3, 0 + multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 3, FALSE goto EventScript_16C1F3 end EventScript_16C1E7:: @ 816C1E7 - multichoicedefault 0, 0, 31, 4, 0 + multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 4, FALSE goto EventScript_16C1F3 end diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 805775505..6e5c8a284 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -58,7 +58,7 @@ EventScript_16BD3E:: @ 816BD3E end EventScript_16BDAE:: @ 816BDAE - multichoice 0, 0, 32, 0 + multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER, FALSE switch VAR_RESULT case 0, EventScript_16BF19 case 1, EventScript_16C00C @@ -66,7 +66,7 @@ EventScript_16BDAE:: @ 816BDAE end EventScript_16BDDA:: @ 816BDDA - multichoice 0, 0, 33, 0 + multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP, FALSE switch VAR_RESULT case 0, EventScript_16BF3A case 1, EventScript_16C00C @@ -74,7 +74,7 @@ EventScript_16BDDA:: @ 816BDDA end EventScript_16BE06:: @ 816BE06 - multichoice 0, 0, 34, 0 + multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP, FALSE switch VAR_RESULT case 0, EventScript_16BF19 case 1, EventScript_16BF3A @@ -83,7 +83,7 @@ EventScript_16BE06:: @ 816BE06 end EventScript_16BE3D:: @ 816BE3D - multichoice 0, 0, 35, 0 + multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_LEMONADE, FALSE switch VAR_RESULT case 0, EventScript_16BF5B case 1, EventScript_16C00C @@ -91,7 +91,7 @@ EventScript_16BE3D:: @ 816BE3D end EventScript_16BE69:: @ 816BE69 - multichoice 0, 0, 36, 0 + multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_LEMONADE, FALSE switch VAR_RESULT case 0, EventScript_16BF19 case 1, EventScript_16BF5B @@ -100,7 +100,7 @@ EventScript_16BE69:: @ 816BE69 end EventScript_16BEA0:: @ 816BEA0 - multichoice 0, 0, 37, 0 + multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP_LEMONADE, FALSE switch VAR_RESULT case 0, EventScript_16BF3A case 1, EventScript_16BF5B @@ -109,7 +109,7 @@ EventScript_16BEA0:: @ 816BEA0 end EventScript_16BED7:: @ 816BED7 - multichoice 0, 0, 38, 0 + multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP_LEMONADE, FALSE switch VAR_RESULT case 0, EventScript_16BF19 case 1, EventScript_16BF3A @@ -220,7 +220,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034 end EventScript_16C045:: @ 816C045 - multichoice 12, 0, 26, 0 + multichoice 12, 0, MULTICHOICE_CELADON_VENDING_MACHINE, FALSE copyvar VAR_0x4001, VAR_RESULT switch VAR_0x4001 case 0, EventScript_16C083 diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index dd528c1ec..487d9fa64 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -29,7 +29,7 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D showcoinsbox 0, 5 message Text_196984 waitmessage - multichoice 13, 0, 27, 0 + multichoice 13, 0, MULTICHOICE_GAME_CORNER_COIN_PURCHASE_COUNTER, FALSE copyvar VAR_0x8009, VAR_RESULT switch VAR_RESULT case 0, EventScript_16C6E6 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 70d9121eb..01ad2b414 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -25,7 +25,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 EventScript_16CBB2:: @ 816CBB2 message Text_19707A waitmessage - multichoice 11, 0, 14, 0 + multichoice 11, 0, MULTICHOICE_GAME_CORNER_POKEMON_PRIZES, FALSE switch VAR_RESULT case 0, EventScript_16CC15 case 1, EventScript_16CC25 @@ -204,7 +204,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D EventScript_16CE47:: @ 816CE47 message Text_19707A waitmessage - multichoice 11, 0, 30, 0 + multichoice 11, 0, MULTICHOICE_GAME_CORNER_TMPRIZES, FALSE switch VAR_RESULT case 0, EventScript_16CEA5 case 1, EventScript_16CEB9 @@ -302,7 +302,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 EventScript_16CFB2:: @ 816CFB2 message Text_19707A waitmessage - multichoice 10, 0, 41, 0 + multichoice 10, 0, MULTICHOICE_GAME_CORNER_BATTLE_ITEM_PRIZES, FALSE switch VAR_RESULT case 0, EventScript_16D010 case 1, EventScript_16D020 diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 1091e75cb..40302e25f 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -11,7 +11,7 @@ CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD showmoneybox 0, 0, 0 message Text_192755 waitmessage - multichoice 11, 0, 13, 0 + multichoice 11, 0, MULTICHOICE_BIKE_SHOP, FALSE switch VAR_RESULT case 0, EventScript_16AC07 case 1, EventScript_16AC15 diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index ad8b416cd..27fb47f63 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -103,7 +103,7 @@ EventScript_16E544:: @ 816E544 call EventScript_16E51C compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16E5FA - multichoice 0, 0, 21, 0 + multichoice 0, 0, MULTICHOICE_HELIX, FALSE switch VAR_RESULT case 0, EventScript_16E668 case 1, EventScript_16E53A @@ -116,7 +116,7 @@ EventScript_16E586:: @ 816E586 call EventScript_16E51C compare_var_to_value VAR_RESULT, 1 goto_if eq, EventScript_16E631 - multichoice 0, 0, 22, 0 + multichoice 0, 0, MULTICHOICE_DOME, FALSE switch VAR_RESULT case 0, EventScript_16E6A6 case 1, EventScript_16E53A @@ -126,7 +126,7 @@ EventScript_16E586:: @ 816E586 EventScript_16E5C8:: @ 816E5C8 message Text_19A282 waitmessage - multichoice 0, 0, 23, 0 + multichoice 0, 0, MULTICHOICE_AMBER, FALSE switch VAR_RESULT case 0, EventScript_16E6E4 case 1, EventScript_16E53A @@ -134,7 +134,7 @@ EventScript_16E5C8:: @ 816E5C8 end EventScript_16E5FA:: @ 816E5FA - multichoice 0, 0, 24, 0 + multichoice 0, 0, MULTICHOICE_HELIX_AMBER, FALSE switch VAR_RESULT case 0, EventScript_16E668 case 1, EventScript_16E6E4 @@ -143,7 +143,7 @@ EventScript_16E5FA:: @ 816E5FA end EventScript_16E631:: @ 816E631 - multichoice 0, 0, 25, 0 + multichoice 0, 0, MULTICHOICE_DOME_AMBER, FALSE switch VAR_RESULT case 0, EventScript_16E6A6 case 1, EventScript_16E6E4 diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 8cb8dd796..60832d168 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -8,7 +8,7 @@ NavelRock_Harbor_EventScript_165421:: @ 8165421 message Text_181726 waitmessage setvar VAR_0x8004, SEAGALLOP_NAVEL_ROCK - multichoice 20, 8, 61, 0 + multichoice 20, 8, MULTICHOICE_SEAGALLOP_VERMILION, FALSE switch VAR_RESULT case 0, EventScript_1A91D5 case 1, EventScript_1A90F6 diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 8a3bdd640..8d4f9dc6d 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -190,9 +190,9 @@ PewterCity_Museum_1F_EventScript_16A512:: @ 816A512 setvar VAR_0x8004, SPECIES_AERODACTYL setvar VAR_0x8005, 10 setvar VAR_0x8006, 3 - special sub_809D504 + special Special_OpenMuseumFossilPic msgbox gUnknown_8190945 - special sub_809D620 + special Special_CloseMuseumFossilPic releaseall end @@ -201,8 +201,8 @@ PewterCity_Museum_1F_EventScript_16A532:: @ 816A532 setvar VAR_0x8004, SPECIES_KABUTOPS setvar VAR_0x8005, 10 setvar VAR_0x8006, 3 - special sub_809D504 + special Special_OpenMuseumFossilPic msgbox gUnknown_8190975 - special sub_809D620 + special Special_CloseMuseumFossilPic releaseall end diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index c6a199a52..2b593b1bb 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -21,21 +21,21 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 end EventScript_161530:: @ 8161530 - multichoicedefault 0, 0, 42, 0, 0 + multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 0, FALSE goto EventScript_161554 EventScript_16153B:: @ 816153B end EventScript_16153C:: @ 816153C - multichoicedefault 0, 0, 42, 1, 0 + multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 1, FALSE goto EventScript_161554 EventScript_161547:: @ 8161547 end EventScript_161548:: @ 8161548 - multichoicedefault 0, 0, 42, 2, 0 + multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 2, FALSE goto EventScript_161554 EventScript_161553:: @ 8161553 diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 76be366f2..e8d016a02 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -248,7 +248,7 @@ EventScript_1707CA:: @ 81707CA EventScript_1707D8:: @ 81707D8 message Text_1A0479 waitmessage - multichoice 0, 0, 1, 0 + multichoice 0, 0, MULTICHOICE_EEVEELUTIONS, FALSE switch VAR_RESULT case 0, EventScript_17082B case 1, EventScript_170840 diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index a415190da..e8ee2450f 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -20,12 +20,12 @@ SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 end EventScript_164B46:: @ 8164B46 - multichoicedefault 0, 0, 20, 0, 0 + multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 0, FALSE goto EventScript_164B5E end EventScript_164B52:: @ 8164B52 - multichoicedefault 0, 0, 20, 1, 0 + multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 1, FALSE goto EventScript_164B5E end diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 24f2fd622..142f33ee3 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -169,7 +169,7 @@ EventScript_164A00:: @ 8164A00 EventScript_164A08:: @ 8164A08 message Text_17C88D waitmessage - multichoice 18, 6, 16, 0 + multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE switch VAR_RESULT case 0, EventScript_164A53 case 1, EventScript_164ABF @@ -183,7 +183,7 @@ EventScript_164A45:: @ 8164A45 end EventScript_164A53:: @ 8164A53 - multichoice 13, 3, 64, 0 + multichoice 13, 3, MULTICHOICE_TRAINER_TOWER_MODE, FALSE switch VAR_RESULT case 0, EventScript_164AA0 case 1, EventScript_164AA0 diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 33f6d42fd..40c68cb7e 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -98,7 +98,7 @@ EventScript_171741:: @ 8171741 EventScript_17175B:: @ 817175B message Text_1A2D43 waitmessage - multichoice 0, 0, 51, 1 + multichoice 0, 0, MULTICHOICE_MUSHROOMS, TRUE switch VAR_RESULT case 0, EventScript_171741 case 1, EventScript_171727 diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index d1d312add..fcacff2e3 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -110,7 +110,7 @@ EventScript_1669FD:: @ 81669FD call_if FALSE, EventScript_166A53 message Text_17FCC1 waitmessage - multichoice 17, 6, 54, 0 + multichoice 17, 6, MULTICHOICE_SEVII_NAVEL, FALSE switch VAR_RESULT case 0, EventScript_1A911E case 1, EventScript_166B0B @@ -128,7 +128,7 @@ EventScript_166A5F:: @ 8166A5F call_if FALSE, EventScript_166AA5 message Text_17FCC1 waitmessage - multichoice 13, 6, 55, 0 + multichoice 13, 6, MULTICHOICE_SEVII_BIRTH, FALSE switch VAR_RESULT case 0, EventScript_1A911E case 1, EventScript_166B23 @@ -148,7 +148,7 @@ EventScript_166AB1:: @ 8166AB1 call_if FALSE, EventScript_166AA5 message Text_17FCC1 waitmessage - multichoice 13, 5, 56, 0 + multichoice 13, 5, MULTICHOICE_SEVII_NAVEL_BIRTH, FALSE switch VAR_RESULT case 0, EventScript_1A911E case 1, EventScript_166B0B @@ -175,7 +175,7 @@ EventScript_166B3B:: @ 8166B3B message Text_17FB23 waitmessage setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY - multichoice 19, 5, 57, 0 + multichoice 19, 5, MULTICHOICE_SEAGALLOP_123, FALSE switch VAR_RESULT case 0, EventScript_1A8FEE case 1, EventScript_1A8FF9 diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index a31719b55..1c25dd3e4 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -56,7 +56,7 @@ ViridianCity_House2_EventScript_16A11D:: @ 816A11D EventScript_16A12C:: @ 816A12C message Text_18FF88 waitmessage - multichoicegrid 7, 1, 15, 3, 0 + multichoicegrid 7, 1, MULTICHOICE_TRAINER_SCHOOL_WHITEBOARD, 3, FALSE switch VAR_RESULT case 0, EventScript_16A18B case 1, EventScript_16A1A7 diff --git a/data/script_menu/aerodactyl_fossil.png b/data/script_menu/aerodactyl_fossil.png Binary files differnew file mode 100644 index 000000000..067483d6e --- /dev/null +++ b/data/script_menu/aerodactyl_fossil.png diff --git a/data/script_menu/kabutops_fossil.png b/data/script_menu/kabutops_fossil.png Binary files differnew file mode 100644 index 000000000..e396b080a --- /dev/null +++ b/data/script_menu/kabutops_fossil.png diff --git a/data/specials.inc b/data/specials.inc index 44d906656..516b5f768 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -387,7 +387,7 @@ gSpecials:: @ 815FD60 def_special IsThereMonInRoute5Daycare def_special GetNumLevelsGainedForRoute5DaycareMon def_special TakePokemonFromRoute5Daycare - def_special ScrSpecial_SeaGallopFerry + def_special ScrSpecial_SeagallopFerry def_special Special_PlayerPartyContainsSpecies def_special Special_SetSomeVariable def_special HelpSystem_BackupSomeVariable @@ -403,8 +403,8 @@ gSpecials:: @ 815FD60 def_special sub_8112364 def_special Special_GetMENewsJisanItemAndState def_special get_unknown_box_id - def_special sub_809D504 - def_special sub_809D620 + def_special Special_OpenMuseumFossilPic + def_special Special_CloseMuseumFossilPic def_special sub_812781C def_special sub_8127888 def_special SetBattledTrainerFlag @@ -431,8 +431,8 @@ gSpecials:: @ 815FD60 def_special Special_HasLearnedAllMovesFromCapeBrinkTutor def_special Special_Credits def_special sub_8153810 - def_special sub_809D764 - def_special sub_809D8C0 + def_special Special_DrawSeagallopDestinationMenu + def_special Special_GetSelectedSeagallopDestination def_special sub_8147500 def_special GetPlayerFacingDirection def_special Special_DeoxysSound diff --git a/data/strings.s b/data/strings.s index 546f40899..16666410c 100644 --- a/data/strings.s +++ b/data/strings.s @@ -1358,34 +1358,34 @@ gUnknown_84178DA:: @ 84178DA gUnknown_84178DF:: @ 0x84178DF .string "さんか する$" -gUnknown_84178E6:: @ 0x84178E6 +gText_Info:: @ 0x84178E6 .string "INFO$" -gUnknown_84178EB:: @ 0x84178EB +gText_Eggs:: @ 0x84178EB .string "EGGS$" -gUnknown_84178F0:: @ 0x84178F0 +gText_HallOfFame:: @ 0x84178F0 .string "HALL OF FAME$" -gUnknown_84178FD:: @ 0x84178FD +gText_Victories:: @ 0x84178FD .string "VICTORIES$" -gUnknown_8417907:: @ 0x8417907 +gText_Quit:: @ 0x8417907 .string "QUIT$" -gUnknown_841790C:: @ 0x841790C +gText_Psn:: @ 0x841790C .string "PSN$" -gUnknown_8417910:: @ 0x8417910 +gText_Par:: @ 0x8417910 .string "PAR$" -gUnknown_8417914:: @ 0x8417914 +gText_Slp:: @ 0x8417914 .string "SLP$" -gUnknown_8417918:: @ 0x8417918 +gText_Brn:: @ 0x8417918 .string "BRN$" -gUnknown_841791C:: @ 0x841791C +gText_Frz:: @ 0x841791C .string "FRZ$" gUnknown_8417920:: @ 0x8417920 @@ -1403,394 +1403,394 @@ gUnknown_841792E:: @ 0x841792E gUnknown_8417933:: @ 0x8417933 .string "これから$" -gUnknown_8417938:: @ 8417938 +gText_Yes:: @ 8417938 .string "YES$" -gUnknown_841793C:: @ 841793C +gText_No:: @ 841793C .string "NO$" gUnknown_841793F:: @ 0x841793F .string "せつめい$" -gUnknown_8417944:: @ 0x8417944 +gText_SingleBattle:: @ 0x8417944 .string "SINGLE BATTLE$" -gUnknown_8417952:: @ 0x8417952 +gText_DoubleBattle:: @ 0x8417952 .string "DOUBLE BATTLE$" -gUnknown_8417960:: @ 0x8417960 +gText_MultiBattle:: @ 0x8417960 .string "MULTI BATTLE$" -gUnknown_841796D:: @ 0x841796D +gText_MakeAChallenge:: @ 0x841796D .string "Make a challenge.$" -gUnknown_841797F:: @ 0x841797F +gText_Info_2:: @ 0x841797F .string "INFO$" -gUnknown_8417984:: @ 0x8417984 +gText_FreshWater_200:: @ 0x8417984 .string "FRESH WATER{CLEAR_TO 0x57}{SMALL}¥200$" -gUnknown_841799A:: @ 0x841799A +gText_SodaPop_300:: @ 0x841799A .string "SODA POP{CLEAR_TO 0x57}{SMALL}¥300$" -gUnknown_84179AD:: @ 0x84179AD +gText_Lemonade_350:: @ 0x84179AD .string "LEMONADE{CLEAR_TO 0x57}{SMALL}¥350$" -gUnknown_84179C0:: @ 0x84179C0 +gText_50Coins_1000:: @ 0x84179C0 .string "{SMALL} 50 COINS{CLEAR_TO 0x45}¥1,000$" -gUnknown_84179D6:: @ 0x84179D6 +gText_500Coins_10000:: @ 0x84179D6 .string "{SMALL}500 COINS{CLEAR_TO 0x40}¥10,000$" -gUnknown_84179ED:: @ 0x84179ED +gText_Excellent:: @ 0x84179ED .string "Excellent$" -gUnknown_84179F7:: @ 0x84179F7 +gText_NotSoBad:: @ 0x84179F7 .string "Not so bad$" -gUnknown_8417A02:: @ 0x8417A02 +gText_RedShard:: @ 0x8417A02 .string "RED SHARD$" -gUnknown_8417A0C:: @ 0x8417A0C +gText_YellowShard:: @ 0x8417A0C .string "YELLOW SHARD$" -gUnknown_8417A19:: @ 0x8417A19 +gText_BlueShard:: @ 0x8417A19 .string "BLUE SHARD$" -gUnknown_8417A24:: @ 0x8417A24 +gText_GreenShard:: @ 0x8417A24 .string "GREEN SHARD$" gUnknown_8417A30:: @ 0x8417A30 .string "バトルタワ-$" -gUnknown_8417A37:: @ 0x8417A37 +gText_Right:: @ 0x8417A37 .string "Right$" -gUnknown_8417A3D:: @ 0x8417A3D +gText_Left:: @ 0x8417A3D .string "Left$" -gUnknown_8417A42:: @ 0x8417A42 +gText_Tm13_4000Coins:: @ 0x8417A42 .string "TM13{CLEAR_TO 0x48}{SMALL}4,000 COINS$" -gUnknown_8417A58:: @ 0x8417A58 +gText_Tm23_3500Coins:: @ 0x8417A58 .string "TM23{CLEAR_TO 0x48}{SMALL}3,500 COINS$" -gUnknown_8417A6E:: @ 0x8417A6E +gText_Tm24_4000Coins:: @ 0x8417A6E .string "TM24{CLEAR_TO 0x48}{SMALL}4,000 COINS$" -gUnknown_8417A84:: @ 0x8417A84 +gText_Tm30_4500Coins:: @ 0x8417A84 .string "TM30{CLEAR_TO 0x48}{SMALL}4,500 COINS$" -gUnknown_8417A9A:: @ 0x8417A9A +gText_Tm35_4000Coins:: @ 0x8417A9A .string "TM35{CLEAR_TO 0x48}{SMALL}4,000 COINS$" -gUnknown_8417AB0:: @ 0x8417AB0 +gText_1F_2:: @ 0x8417AB0 .string "1F$" -gUnknown_8417AB3:: @ 0x8417AB3 +gText_2F_2:: @ 0x8417AB3 .string "2F$" -gUnknown_8417AB6:: @ 0x8417AB6 +gText_3F_2:: @ 0x8417AB6 .string "3F$" -gUnknown_8417AB9:: @ 0x8417AB9 +gText_4F_2:: @ 0x8417AB9 .string "4F$" -gUnknown_8417ABC:: @ 0x8417ABC +gText_5F_2:: @ 0x8417ABC .string "5F$" -gUnknown_8417ABF:: @ 0x8417ABF +gText_Cool:: @ 0x8417ABF .string "COOL$" -gUnknown_8417AC4:: @ 0x8417AC4 +gText_Beauty:: @ 0x8417AC4 .string "BEAUTY$" -gUnknown_8417ACB:: @ 0x8417ACB +gText_Cute:: @ 0x8417ACB .string "CUTE$" -gUnknown_8417AD0:: @ 0x8417AD0 +gText_Smart:: @ 0x8417AD0 .string "SMART$" -gUnknown_8417AD6:: @ 0x8417AD6 +gText_Tough:: @ 0x8417AD6 .string "TOUGH$" -gUnknown_8417ADC:: @ 0x8417ADC +gText_Normal:: @ 0x8417ADC .string "NORMAL$" -gUnknown_8417AE3:: @ 0x8417AE3 +gText_Black:: @ 0x8417AE3 .string "BLACK$" -gUnknown_8417AE9:: @ 0x8417AE9 +gText_Pink:: @ 0x8417AE9 .string "PINK$" -gUnknown_8417AEE:: @ 0x8417AEE +gText_Sepia:: @ 0x8417AEE .string "SEPIA$" -gUnknown_8417AF4:: @ 0x8417AF4 +gText_Cool_2:: @ 0x8417AF4 .string "COOL$" -gUnknown_8417AF9:: @ 0x8417AF9 +gText_Beauty_2:: @ 0x8417AF9 .string "BEAUTY$" -gUnknown_8417B00:: @ 0x8417B00 +gText_Cute_2:: @ 0x8417B00 .string "CUTE$" -gUnknown_8417B05:: @ 0x8417B05 +gText_Smart_2:: @ 0x8417B05 .string "SMART$" -gUnknown_8417B0B:: @ 0x8417B0B +gText_Tough_2:: @ 0x8417B0B .string "TOUGH$" -gUnknown_8417B11:: @ 0x8417B11 +gText_Items:: @ 0x8417B11 .string "ITEMS$" -gUnknown_8417B17:: @ 0x8417B17 +gText_KeyItems:: @ 0x8417B17 .string "KEY ITEMS$" -gUnknown_8417B21:: @ 0x8417B21 +gText_PokeBalls:: @ 0x8417B21 .string "POKé BALLS$" -gUnknown_8417B2C:: @ 0x8417B2C +gText_TmsgUnknown_8417B2CHms:: @ 0x8417B2C .string "TMs & HMs$" -gUnknown_8417B36:: @ 0x8417B36 +gText_Berries:: @ 0x8417B36 .string "BERRIES$" -gUnknown_8417B3E:: @ 0x8417B3E +gText_Boulderbadge:: @ 0x8417B3E .string "BOULDERBADGE$" -gUnknown_8417B4B:: @ 0x8417B4B +gText_Cascadebadge:: @ 0x8417B4B .string "CASCADEBADGE$" -gUnknown_8417B58:: @ 0x8417B58 +gText_Thunderbadge:: @ 0x8417B58 .string "THUNDERBADGE$" -gUnknown_8417B65:: @ 0x8417B65 +gText_Rainbowbadge:: @ 0x8417B65 .string "RAINBOWBADGE$" -gUnknown_8417B72:: @ 0x8417B72 +gText_Soulbadge:: @ 0x8417B72 .string "SOULBADGE$" -gUnknown_8417B7C:: @ 0x8417B7C +gText_Marshbadge:: @ 0x8417B7C .string "MARSHBADGE$" -gUnknown_8417B87:: @ 0x8417B87 +gText_Volcanobadge:: @ 0x8417B87 .string "VOLCANOBADGE$" -gUnknown_8417B94:: @ 0x8417B94 +gText_Earthbadge:: @ 0x8417B94 .string "EARTHBADGE$" -gUnknown_8417B9F:: @ 8417B9F +gText_SomeoneSPc:: @ 8417B9F .string "SOMEONE'S PC$" -gUnknown_8417BAC:: @ 8417BAC +gText_BillSPc:: @ 8417BAC .string "BILL'S PC$" -gUnknown_8417BB6:: @ 8417BB6 +gText_SPc:: @ 8417BB6 .string "{PLAYER}'s PC$" -gUnknown_8417BBE:: @ 8417BBE +gText_HallOfFame_2:: @ 8417BBE .string "HALL OF FAME$" -gUnknown_8417BCB:: @ 8417BCB +gText_LogOff:: @ 8417BCB .string "LOG OFF$" -gUnknown_8417BD3:: @ 8417BD3 +gText_ProfOakSPc:: @ 8417BD3 .string "PROF. OAK's PC$" -gUnknown_8417BE2:: @ 0x8417BE2 +gText_Eevee:: @ 0x8417BE2 .string "EEVEE$" -gUnknown_8417BE8:: @ 0x8417BE8 +gText_Flareon:: @ 0x8417BE8 .string "FLAREON$" -gUnknown_8417BF0:: @ 0x8417BF0 +gText_Jolteon:: @ 0x8417BF0 .string "JOLTEON$" -gUnknown_8417BF8:: @ 0x8417BF8 +gText_Vaporeon:: @ 0x8417BF8 .string "VAPOREON$" -gUnknown_8417C01:: @ 0x8417C01 +gText_QuitLooking:: @ 0x8417C01 .string "Quit looking.$" -gUnknown_8417C0F:: @ 0x8417C0F +gText_FreshWater:: @ 0x8417C0F .string "FRESH WATER$" -gUnknown_8417C1B:: @ 0x8417C1B +gText_SodaPop:: @ 0x8417C1B .string "SODA POP$" -gUnknown_8417C24:: @ 0x8417C24 +gText_Lemonade:: @ 0x8417C24 .string "LEMONADE$" -gUnknown_8417C2D:: @ 8417C2D +gText_Coins_2:: @ 8417C2D .string "COINS$" -gUnknown_8417C33:: @ 0x8417C33 +gText_Bicycle_1000000:: @ 0x8417C33 .string "BICYCLE{CLEAR_TO 0x49}{SMALL}¥1,000,000$" -gUnknown_8417C4B:: @ 0x8417C4B +gText_NoThanks:: @ 0x8417C4B .string "NO THANKS$" -gUnknown_8417C55:: @ 0x8417C55 +gText_Abra_180Coins:: @ 0x8417C55 .string "ABRA{CLEAR_TO 0x55}{SMALL} 180 COINS$" -gUnknown_8417C6A:: @ 0x8417C6A +gText_Clefairy_500Coins:: @ 0x8417C6A .string "CLEFAIRY{CLEAR_TO 0x55}{SMALL} 500 COINS$" -gUnknown_8417C83:: @ 0x8417C83 +gText_Dratini_2800Coins:: @ 0x8417C83 .string "DRATINI{CLEAR_TO 0x4B}{SMALL} 2,800 COINS$" -gUnknown_8417C9D:: @ 0x8417C9D +gText_Scyther_5500Coins:: @ 0x8417C9D .string "SCYTHER{CLEAR_TO 0x4B}{SMALL} 5,500 COINS$" -gUnknown_8417CB7:: @ 0x8417CB7 +gText_Porygon_9999Coins:: @ 0x8417CB7 .string "PORYGON{CLEAR_TO 0x4B}{SMALL} 9,999 COINS$" -gUnknown_8417CD1:: @ 0x8417CD1 +gText_Abra_120Coins:: @ 0x8417CD1 .string "ABRA{CLEAR_TO 0x55}{SMALL} 120 COINS$" -gUnknown_8417CE6:: @ 0x8417CE6 +gText_Clefairy_750Coins:: @ 0x8417CE6 .string "CLEFAIRY{CLEAR_TO 0x55}{SMALL} 750 COINS$" -gUnknown_8417CFF:: @ 0x8417CFF +gText_Pinsir_2500Coins:: @ 0x8417CFF .string "PINSIR{CLEAR_TO 0x4B}{SMALL} 2,500 COINS$" -gUnknown_8417D18:: @ 0x8417D18 +gText_Dratini_4600Coins:: @ 0x8417D18 .string "DRATINI{CLEAR_TO 0x4B}{SMALL} 4,600 COINS$" -gUnknown_8417D32:: @ 0x8417D32 +gText_Porygon_6500Coins:: @ 0x8417D32 .string "PORYGON{CLEAR_TO 0x4B}{SMALL} 6,500 COINS$" -gUnknown_8417D4C:: @ 0x8417D4C +gText_NoThanks_2:: @ 0x8417D4C .string "NO THANKS$" -gUnknown_8417D56:: @ 0x8417D56 +gText_HelixFossil:: @ 0x8417D56 .string "HELIX FOSSIL$" -gUnknown_8417D63:: @ 0x8417D63 +gText_DomeFossil:: @ 0x8417D63 .string "DOME FOSSIL$" -gUnknown_8417D6F:: @ 0x8417D6F +gText_OldAmber:: @ 0x8417D6F .string "OLD AMBER$" -gUnknown_8417D79:: @ 0x8417D79 +gText_TradeCenter:: @ 0x8417D79 .string "TRADE CENTER$" -gUnknown_8417D86:: @ 0x8417D86 +gText_Colosseum:: @ 0x8417D86 .string "COLOSSEUM$" -gUnknown_8417D90:: @ 0x8417D90 +gText_GameLinkCable:: @ 0x8417D90 .string "Game Link cable$" -gUnknown_8417DA0:: @ 0x8417DA0 +gText_Wireless:: @ 0x8417DA0 .string "Wireless$" -gUnknown_8417DA9:: @ 0x8417DA9 +gText_ItemsPocket:: @ 0x8417DA9 .string "ITEMS POCKET$" -gUnknown_8417DB6:: @ 0x8417DB6 +gText_KeyItemsPocket:: @ 0x8417DB6 .string "KEY ITEMS POCKET$" -gUnknown_8417DC7:: @ 0x8417DC7 +gText_PokeBallsPocket:: @ 0x8417DC7 .string "POKé BALLS POCKET$" -gUnknown_8417DD9:: @ 0x8417DD9 +gText_TmCase:: @ 0x8417DD9 .string "TM CASE$" -gUnknown_8417DE1:: @ 0x8417DE1 +gText_BerryPouch_2:: @ 0x8417DE1 .string "BERRY POUCH$" -gUnknown_8417DED:: @ 8417DED +gText_Other:: @ 8417DED .string "OTHER$" -gUnknown_8417DF3:: @ 0x8417DF3 +gText_OneIsland:: @ 0x8417DF3 .string "ONE ISLAND$" -gUnknown_8417DFE:: @ 0x8417DFE +gText_TwoIsland:: @ 0x8417DFE .string "TWO ISLAND$" -gUnknown_8417E09:: @ 0x8417E09 +gText_ThreeIsland:: @ 0x8417E09 .string "THREE ISLAND$" -gUnknown_8417E16:: @ 0x8417E16 +gText_FourIsland:: @ 0x8417E16 .string "FOUR ISLAND$" -gUnknown_8417E22:: @ 0x8417E22 +gText_FiveIsland:: @ 0x8417E22 .string "FIVE ISLAND$" -gUnknown_8417E2E:: @ 0x8417E2E +gText_SixIsland:: @ 0x8417E2E .string "SIX ISLAND$" -gUnknown_8417E39:: @ 0x8417E39 +gText_SevenIsland:: @ 0x8417E39 .string "SEVEN ISLAND$" -gUnknown_8417E46:: @ 0x8417E46 +gText_Vermilion:: @ 0x8417E46 .string "VERMILION$" -gUnknown_8417E50:: @ 0x8417E50 +gText_Colosseum_2:: @ 0x8417E50 .string "COLOSSEUM$" -gUnknown_8417E5A:: @ 0x8417E5A +gText_BerryCrush:: @ 0x8417E5A .string "BERRY CRUSH$" -gUnknown_8417E66:: @ 0x8417E66 +gText_Dummy_8417E66:: @ 0x8417E66 .string "$" -gUnknown_8417E67:: @ 0x8417E67 +gText_Dummy_8417E67:: @ 0x8417E67 .string "$" gUnknown_8417E68:: @ 0x8417E68 .string "せつめいを きく$" -gUnknown_8417E71:: @ 0x8417E71 +gText_Dummy_8417E71:: @ 0x8417E71 .string "$" -gUnknown_8417E72:: @ 0x8417E72 +gText_PokemonJump:: @ 0x8417E72 .string "POKéMON JUMP$" -gUnknown_8417E7F:: @ 0x8417E7F +gText_DodrioBerryPicking:: @ 0x8417E7F .string "DODRIO BERRY-PICKING$" -gUnknown_8417E94:: @ 0x8417E94 +gText_2Tinymushrooms:: @ 0x8417E94 .string "2 TINYMUSHROOMS$" -gUnknown_8417EA4:: @ 0x8417EA4 +gText_1BigMushroom:: @ 0x8417EA4 .string "1 BIG MUSHROOM$" -gUnknown_8417EB3:: @ 0x8417EB3 +gText_SeviiIslands:: @ 0x8417EB3 .string "SEVII ISLANDS$" -gUnknown_8417EC1:: @ 0x8417EC1 +gText_NavelRock:: @ 0x8417EC1 .string "NAVEL ROCK$" -gUnknown_8417ECC:: @ 0x8417ECC +gText_BirthIsland:: @ 0x8417ECC .string "BIRTH ISLAND$" -gUnknown_8417ED9:: @ 0x8417ED9 +gText_MiracleSeed_1000Coins:: @ 0x8417ED9 .string "MIRACLE SEED{CLEAR_TO 0x50}{SMALL}1,000 COINS$" -gUnknown_8417EF7:: @ 0x8417EF7 +gText_Charcoal_1000Coins:: @ 0x8417EF7 .string "CHARCOAL{CLEAR_TO 0x50}{SMALL}1,000 COINS$" -gUnknown_8417F11:: @ 0x8417F11 +gText_MysticWater_1000Coins:: @ 0x8417F11 .string "MYSTIC WATER{CLEAR_TO 0x50}{SMALL}1,000 COINS$" -gUnknown_8417F2F:: @ 0x8417F2F +gText_YellowFlute_1600Coins:: @ 0x8417F2F .string "YELLOW FLUTE{CLEAR_TO 0x50}{SMALL}1,600 COINS$" -gUnknown_8417F4D:: @ 0x8417F4D +gText_SmokeBall_800Coins:: @ 0x8417F4D .string "SMOKE BALL{CLEAR_TO 0x5A}{SMALL}800 COINS$" -gUnknown_8417F67:: @ 0x8417F67 +gText_Dummy_8417F67:: @ 0x8417F67 .string "$" -gUnknown_8417F68:: @ 0x8417F68 +gText_Dummy_8417F68:: @ 0x8417F68 .string "$" -gUnknown_8417F69:: @ 0x8417F69 +gText_BecomeLeader:: @ 0x8417F69 .string "BECOME LEADER$" -gUnknown_8417F77:: @ 0x8417F77 +gText_JoinGroup:: @ 0x8417F77 .string "JOIN GROUP$" gOtherText_Single:: @ 0x8417F82 @@ -1820,133 +1820,133 @@ gUnknown_8417FB6:: @ 0x8417FB6 gUnknown_8417FB9:: @ 8417FB9 .string ".$" -gUnknown_8417FBB:: @ 8417FBB +gText_BigGuy:: @ 8417FBB .string "Big guy$" -gUnknown_8417FC3:: @ 8417FC3 +gText_BigGirl:: @ 8417FC3 .string "Big girl$" -gUnknown_8417FCC:: @ 8417FCC +gText_Daughter:: @ 8417FCC .string "son$" -gUnknown_8417FD0:: @ 8417FD0 +gText_Son:: @ 8417FD0 .string "daughter$" -gUnknown_8417FD9:: @ 0x8417FD9 +gText_BoulderBadge:: @ 0x8417FD9 .string "BOULDERBADGE$" -gUnknown_8417FE6:: @ 0x8417FE6 +gText_CascadeBadge:: @ 0x8417FE6 .string "CASCADEBADGE$" -gUnknown_8417FF3:: @ 0x8417FF3 +gText_ThunderBadge:: @ 0x8417FF3 .string "THUNDERBADGE$" -gUnknown_8418000:: @ 0x8418000 +gText_RainbowBadge:: @ 0x8418000 .string "RAINBOWBADGE$" -gUnknown_841800D:: @ 0x841800D +gText_SoulBadge:: @ 0x841800D .string "SOULBADGE$" -gUnknown_8418017:: @ 0x8418017 +gText_MarshBadge:: @ 0x8418017 .string "MARSHBADGE$" -gUnknown_8418022:: @ 0x8418022 +gText_VolcanoBadge:: @ 0x8418022 .string "VOLCANOBADGE$" -gUnknown_841802F:: @ 0x841802F +gText_EarthBadge:: @ 0x841802F .string "EARTHBADGE$" -gUnknown_841803A:: @ 0x841803A +gText_1F:: @ 0x841803A .string "1F$" -gUnknown_841803D:: @ 0x841803D +gText_2F:: @ 0x841803D .string "2F$" -gUnknown_8418040:: @ 0x8418040 +gText_3F:: @ 0x8418040 .string "3F$" -gUnknown_8418043:: @ 0x8418043 +gText_4F:: @ 0x8418043 .string "4F$" -gUnknown_8418046:: @ 0x8418046 +gText_5F:: @ 0x8418046 .string "5F$" -gUnknown_8418049:: @ 0x8418049 +gText_6F:: @ 0x8418049 .string "6F$" -gUnknown_841804C:: @ 0x841804C +gText_7F:: @ 0x841804C .string "7F$" -gUnknown_841804F:: @ 0x841804F +gText_8F:: @ 0x841804F .string "8F$" -gUnknown_8418052:: @ 0x8418052 +gText_9F:: @ 0x8418052 .string "9F$" -gUnknown_8418055:: @ 0x8418055 +gText_10F:: @ 0x8418055 .string "10F$" -gUnknown_8418059:: @ 0x8418059 +gText_11F:: @ 0x8418059 .string "11F$" -gUnknown_841805D:: @ 0x841805D +gText_B1F:: @ 0x841805D .string "B1F$" -gUnknown_8418061:: @ 0x8418061 +gText_B2F:: @ 0x8418061 .string "B2F$" -gUnknown_8418065:: @ 0x8418065 +gText_B3F:: @ 0x8418065 .string "B3F$" -gUnknown_8418069:: @ 0x8418069 +gText_B4F:: @ 0x8418069 .string "B4F$" -gUnknown_841806D:: @ 0x841806D +gText_Rooftop:: @ 0x841806D .string "ROOFTOP$" -gUnknown_8418075:: @ 8418075 +gText_NowOn:: @ 8418075 .string "Now on:$" -gUnknown_841807D:: @ 0x841807D +gText_LinkedGamePlay:: @ 0x841807D .string "LINKED GAME PLAY$" -gUnknown_841808E:: @ 0x841808E +gText_DirectCorner:: @ 0x841808E .string "DIRECT CORNER$" -gUnknown_841809C:: @ 0x841809C +gText_UnionRoom:: @ 0x841809C .string "UNION ROOM$" -gUnknown_84180A7:: @ 0x84180A7 +gText_Energypowder_50:: @ 0x84180A7 .string "ENERGYPOWDER{CLEAR_TO 0x74}{SMALL}50$" -gUnknown_84180BC:: @ 0x84180BC +gText_EnergyRoot_80:: @ 0x84180BC .string "ENERGY ROOT{CLEAR_TO 0x74}{SMALL}80$" -gUnknown_84180D0:: @ 0x84180D0 +gText_HealPowder_50:: @ 0x84180D0 .string "HEAL POWDER{CLEAR_TO 0x74}{SMALL}50$" -gUnknown_84180E4:: @ 0x84180E4 +gText_RevivalHerb_300:: @ 0x84180E4 .string "REVIVAL HERB{CLEAR_TO 0x6F}{SMALL}300$" -gUnknown_84180FA:: @ 0x84180FA +gText_Protein_1000:: @ 0x84180FA .string "PROTEIN{CLEAR_TO 0x65}{SMALL}1,000$" -gUnknown_841810D:: @ 0x841810D +gText_Iron_1000:: @ 0x841810D .string "IRON{CLEAR_TO 0x65}{SMALL}1,000$" -gUnknown_841811D:: @ 0x841811D +gText_Carbos_1000:: @ 0x841811D .string "CARBOS{CLEAR_TO 0x65}{SMALL}1,000$" -gUnknown_841812F:: @ 0x841812F +gText_Calcium_1000:: @ 0x841812F .string "CALCIUM{CLEAR_TO 0x65}{SMALL}1,000$" -gUnknown_8418142:: @ 0x8418142 +gText_Zinc_1000:: @ 0x8418142 .string "ZINC{CLEAR_TO 0x65}{SMALL}1,000$" -gUnknown_8418152:: @ 0x8418152 +gText_HpUp_1000:: @ 0x8418152 .string "HP UP{CLEAR_TO 0x65}{SMALL}1,000$" -gUnknown_8418163:: @ 0x8418163 +gText_PpUp_3000:: @ 0x8418163 .string "PP UP{CLEAR_TO 0x65}{SMALL}3,000$" gString_BattleRecords_PlayersBattleResults:: @ 8418174 |
