diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-23 09:05:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-23 09:05:26 -0400 |
| commit | 6e36c229200e083ca005cbc448e99210d111f3b2 (patch) | |
| tree | aec86bd0f081a7ff207f68cba33315991b629be1 /data | |
| parent | 4bc284ff2c7d0ec3f24df8d94a77860fbaed588b (diff) | |
| parent | 3efd2e1210b4149628197446d063df0fc11281ab (diff) | |
Merge pull request #130 from PikalaxALT/trainers
Trainers, event flags, mystery_event_msg, map object gfx
Diffstat (limited to 'data')
597 files changed, 14697 insertions, 9555 deletions
diff --git a/data/data.s b/data/data.s index 7f266c872..366d6bf46 100644 --- a/data/data.s +++ b/data/data.s @@ -1,51 +1,17 @@ #include "constants/region_map.h" #include "constants/trainer_classes.h" #include "constants/songs.h" +#include "constants/flags.h" #include "constants/region_map.h" +#include "constants/maps.h" .include "asm/macros.inc" .include "constants/constants.inc" .section .rodata - -gAnimCmd_8239EBC:: @ 8239EBC - .incbin "baserom.gba", 0x239EBC, 0xB8 - -gTrainerBackAnimsPtrTable:: @ 8239F74 - .incbin "baserom.gba", 0x239F74, 0x18 - -gTrainerBackPicCoords:: @ 8239F8C - .incbin "baserom.gba", 0x239F8C, 0x18 - -gTrainerBackPicTable:: @ 8239FA4 - .incbin "baserom.gba", 0x239FA4, 0x30 - -gTrainerBackPicPaletteTable:: @ 8239FD4 - .incbin "baserom.gba", 0x239FD4, 0x30 - -gEnemyMonElevation:: @ 823A004 - .incbin "baserom.gba", 0x23A004, 0x4554 - -gTrainerClassNames:: @ 823E558 - .include "data/text/trainer_class_names.inc" - .align 2, 0 -gTrainers:: @ 823EAD8 - .incbin "baserom.gba", 0x23EAC8, 0x7418 - -gSpeciesNames:: @ 8245EE0 - .include "data/text/species_names.inc" - -gMoveNames:: @ 8247094 - .incbin "baserom.gba", 0x247094, 0xF97 - -gUnknown_824802B:: @ 824802B - .incbin "baserom.gba", 0x24802B, 0xD -gUnknown_8248038:: @ 8248038 - .incbin "baserom.gba", 0x248038, 0x186 - -gUnknown_82481BE:: @ 82481BE - .incbin "baserom.gba", 0x2481BE, 0x12A +gUnknown_824829C:: @ 824829C + .incbin "baserom.gba", 0x24829C, 0x4c gUnknown_82482E8:: @ 82482E8 .incbin "baserom.gba", 0x2482E8, 0x18 @@ -400,52 +366,3 @@ gUnknown_826D1E4:: @ 826D1E4 gUnknown_826D250:: @ 826D250 .incbin "baserom.gba", 0x26D250, 0x44 - -gUnknown_826D294:: @ 826D294 - .incbin "baserom.gba", 0x26D294, 0xA - -gUnknown_826D29E:: @ 826D29E - .incbin "baserom.gba", 0x26D29E, 0x12 - -gUnknown_826D2B0:: @ 826D2B0 - .incbin "baserom.gba", 0x26D2B0, 0x28 - -gDirectionToVectors:: @ 826D2D8 - .4byte 0, 0 - .4byte 0, 1 - .4byte 0, -1 - .4byte -1, 0 - .4byte 1, 0 - .4byte -1, 1 - .4byte 1, 1 - .4byte -1, -1 - .4byte 1, -1 - -gUnknown_826D320:: @ 826D320 - .incbin "baserom.gba", 0x26D320, 0x10 - -gUnknown_826D330:: @ 826D330 - .incbin "baserom.gba", 0x26D330, 0xC - -gUnknown_826D33C:: @ 826D33C - .4byte sub_8058684 - .4byte sub_80586A4 - .4byte sub_80586A8 - -gUnknown_826D348:: @ 826D348 - .4byte sub_80586C8 - .4byte sub_80586CC - .4byte sub_80586CC - .4byte sub_80586CC - .4byte sub_80586CC - .4byte sub_80586C8 - .4byte sub_80586C8 - .4byte sub_8058734 - .4byte sub_8058734 - .4byte sub_8058734 - .4byte sub_8058734 - -gUnknown_826D374:: @ 826D374 - .4byte sub_805874C - .4byte sub_8058754 - diff --git a/data/data_835B488.s b/data/data_835B488.s index 10ade9a52..b2b76476c 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -562,13 +562,467 @@ sBerries:: @ 83DF7E8 .incbin "baserom.gba", 0x3DF7E8, 0x4B4 gUnknown_83DFC9C:: @ 83DFC9C - .incbin "baserom.gba", 0x3DFC9C, 0x814 + .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 gUnknown_8417929, 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 - .incbin "baserom.gba", 0x3E04B0, 0x208 + .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 - .incbin "baserom.gba", 0x3E06B8, 0x74 + .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 diff --git a/data/data_83F5738.s b/data/data_83F5738.s index 1dd697956..1f9839561 100644 --- a/data/data_83F5738.s +++ b/data/data_83F5738.s @@ -460,13 +460,26 @@ gUnknown_83FE88F:: @ 83FE88F .incbin "baserom.gba", 0x3FE88F, 0xF3 gUnknown_83FE982:: @ 83FE982 - .incbin "baserom.gba", 0x3FE982, 0x16 + .string "TIME BOARD$" + .string "CLEAR TIME$" gUnknown_83FE998:: @ 83FE998 - .incbin "baserom.gba", 0x3FE998, 0x2C + .string "{STR_VAR_1}MIN. {STR_VAR_2}.{STR_VAR_3}SEC.$" + .string "1F$" + .string "2F$" + .string "3F$" + .string "4F$" + .string "5F$" + .string "6F$" + .string "7F$" + .string "8F$" + .align 2 gUnknown_83FE9C4:: @ 83FE9C4 - .incbin "baserom.gba", 0x3FE9C4, 0x10 + .4byte gOtherText_Single + .4byte gOtherText_Double + .4byte gOtherText_Knockout + .4byte gOtherText_Mixed gUnknown_83FE9D4:: @ 83FE9D4 .incbin "baserom.gba", 0x3FE9D4, 0x10 diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index ce1f5aeeb..43fbd003f 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -1,5 +1,6 @@ #include "constants/region_map.h" #include "constants/flags.h" +#include "constants/moves.h" .include "asm/macros.inc" .include "constants/constants.inc" .section .rodata @@ -1089,12 +1090,438 @@ gUnknown_8459B30:: @ 8459B30 gUnknown_8459B48:: @ 8459B48 .incbin "baserom.gba", 0x459B48, 0x18 -gUnknown_8459B60:: @ 8459B60 - .incbin "baserom.gba", 0x459B60, 0x1E - -gUnknown_8459B7E:: @ 8459B7E - .incbin "baserom.gba", 0x459B7E, 0x33A +gMoveTutorMoves:: @ 8459B60 + .2byte MOVE_MEGA_PUNCH + .2byte MOVE_SWORDS_DANCE + .2byte MOVE_MEGA_KICK + .2byte MOVE_BODY_SLAM + .2byte MOVE_DOUBLE_EDGE + .2byte MOVE_COUNTER + .2byte MOVE_SEISMIC_TOSS + .2byte MOVE_MIMIC + .2byte MOVE_METRONOME + .2byte MOVE_SOFT_BOILED + .2byte MOVE_DREAM_EATER + .2byte MOVE_THUNDER_WAVE + .2byte MOVE_EXPLOSION + .2byte MOVE_ROCK_SLIDE + .2byte MOVE_SUBSTITUTE + +gMoveTutorMoveCompatibilityTable:: @ 8459B7E + .2byte 0x0000 + .2byte 0x409a + .2byte 0x409a + .2byte 0x409a + .2byte 0x60ff + .2byte 0x60ff + .2byte 0x60ff + .2byte 0x40fd + .2byte 0x40fd + .2byte 0x40fd + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x4490 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x4092 + .2byte 0x4090 + .2byte 0x4090 + .2byte 0x4090 + .2byte 0x48b8 + .2byte 0x48b8 + .2byte 0x4090 + .2byte 0x4090 + .2byte 0x6098 + .2byte 0x6098 + .2byte 0x48fd + .2byte 0x48fd + .2byte 0x60fa + .2byte 0x60fa + .2byte 0x40b8 + .2byte 0x40b8 + .2byte 0x60fd + .2byte 0x40b8 + .2byte 0x40b8 + .2byte 0x60fd + .2byte 0x4ffd + .2byte 0x4ffd + .2byte 0x4098 + .2byte 0x4098 + .2byte 0x4cfd + .2byte 0x4cfd + .2byte 0x4090 + .2byte 0x4090 + .2byte 0x4092 + .2byte 0x4092 + .2byte 0x409a + .2byte 0x40ba + .2byte 0x40ba + .2byte 0x4090 + .2byte 0x4090 + .2byte 0x6098 + .2byte 0x6098 + .2byte 0x4498 + .2byte 0x4498 + .2byte 0x40fd + .2byte 0x40fd + .2byte 0x61fd + .2byte 0x61fd + .2byte 0x4098 + .2byte 0x4098 + .2byte 0x4098 + .2byte 0x41fd + .2byte 0x41fd + .2byte 0x4dfd + .2byte 0x4dfd + .2byte 0x4dfd + .2byte 0x61fd + .2byte 0x61fd + .2byte 0x61fd + .2byte 0x4092 + .2byte 0x4092 + .2byte 0x409a + .2byte 0x4092 + .2byte 0x4092 + .2byte 0x71f9 + .2byte 0x71f9 + .2byte 0x71fd + .2byte 0x4098 + .2byte 0x4098 + .2byte 0x4c98 + .2byte 0x4cfd + .2byte 0x4890 + .2byte 0x4890 + .2byte 0x409a + .2byte 0x4098 + .2byte 0x4098 + .2byte 0x4098 + .2byte 0x4098 + .2byte 0x5088 + .2byte 0x5088 + .2byte 0x5090 + .2byte 0x5090 + .2byte 0x5480 + .2byte 0x5480 + .2byte 0x55fd + .2byte 0x7098 + .2byte 0x4dfd + .2byte 0x4dfd + .2byte 0x409a + .2byte 0x409a + .2byte 0x5880 + .2byte 0x5880 + .2byte 0x5490 + .2byte 0x5490 + .2byte 0x60ff + .2byte 0x60ff + .2byte 0x61fd + .2byte 0x61fd + .2byte 0x64ff + .2byte 0x5080 + .2byte 0x5080 + .2byte 0x60ba + .2byte 0x60ff + .2byte 0x4ffd + .2byte 0x409a + .2byte 0x60fd + .2byte 0x4090 + .2byte 0x4090 + .2byte 0x4090 + .2byte 0x4090 + .2byte 0x4890 + .2byte 0x4c90 + .2byte 0x4dfd + .2byte 0x40b2 + .2byte 0x45fd + .2byte 0x48fd + .2byte 0x40fd + .2byte 0x60da + .2byte 0x4098 + .2byte 0x0000 + .2byte 0x4898 + .2byte 0x4498 + .2byte 0x0000 + .2byte 0x4098 + .2byte 0x4098 + .2byte 0x4898 + .2byte 0x4098 + .2byte 0x4c90 + .2byte 0x6098 + .2byte 0x60d8 + .2byte 0x6098 + .2byte 0x60de + .2byte 0x6090 + .2byte 0x61fd + .2byte 0x4090 + .2byte 0x4890 + .2byte 0x4090 + .2byte 0x4898 + .2byte 0x4898 + .2byte 0x4898 + .2byte 0x4dfd + .2byte 0x7fff + .2byte 0x40ba + .2byte 0x40ba + .2byte 0x40ba + .2byte 0x4098 + .2byte 0x4098 + .2byte 0x60fd + .2byte 0x60ff + .2byte 0x60ff + .2byte 0x60ff + .2byte 0x4098 + .2byte 0x4098 + .2byte 0x4490 + .2byte 0x4490 + .2byte 0x4093 + .2byte 0x4093 + .2byte 0x4098 + .2byte 0x4098 + .2byte 0x4090 + .2byte 0x4890 + .2byte 0x4890 + .2byte 0x48fd + .2byte 0x4ffd + .2byte 0x4cfd + .2byte 0x4ffd + .2byte 0x4ffd + .2byte 0x4c90 + .2byte 0x4c90 + .2byte 0x4898 + .2byte 0x48fd + .2byte 0x48fd + .2byte 0x4092 + .2byte 0x40dd + .2byte 0x40dd + .2byte 0x70fd + .2byte 0x41fd + .2byte 0x4092 + .2byte 0x4092 + .2byte 0x4092 + .2byte 0x4dfd + .2byte 0x4092 + .2byte 0x4092 + .2byte 0x4490 + .2byte 0x4098 + .2byte 0x40fd + .2byte 0x4498 + .2byte 0x4498 + .2byte 0x4c90 + .2byte 0x4cfd + .2byte 0x4c90 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x4c98 + .2byte 0x70b8 + .2byte 0x70b8 + .2byte 0x6cb8 + .2byte 0x64b2 + .2byte 0x7098 + .2byte 0x49fd + .2byte 0x69fd + .2byte 0x4892 + .2byte 0x40b2 + .2byte 0x6098 + .2byte 0x60fa + .2byte 0x44b2 + .2byte 0x41ff + .2byte 0x61ff + .2byte 0x6098 + .2byte 0x6098 + .2byte 0x6098 + .2byte 0x6098 + .2byte 0x7098 + .2byte 0x4890 + .2byte 0x48d0 + .2byte 0x40fd + .2byte 0x4098 + .2byte 0x60b0 + .2byte 0x44b8 + .2byte 0x44b8 + .2byte 0x4098 + .2byte 0x40b8 + .2byte 0x60b8 + .2byte 0x4c90 + .2byte 0x4c98 + .2byte 0x0000 + .2byte 0x60fc + .2byte 0x60fc + .2byte 0x45fd + .2byte 0x48fd + .2byte 0x40fd + .2byte 0x69fd + .2byte 0x4ffd + .2byte 0x4898 + .2byte 0x4098 + .2byte 0x4098 + .2byte 0x6098 + .2byte 0x6098 + .2byte 0x68fd + .2byte 0x4c98 + .2byte 0x4c90 + .2byte 0x4592 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x40ff + .2byte 0x40ff + .2byte 0x40ff + .2byte 0x60ff + .2byte 0x60ff + .2byte 0x60ff + .2byte 0x4098 + .2byte 0x60fd + .2byte 0x60fd + .2byte 0x40b8 + .2byte 0x40b8 + .2byte 0x4898 + .2byte 0x4898 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x4090 + .2byte 0x0000 + .2byte 0x4090 + .2byte 0x409a + .2byte 0x409a + .2byte 0x41ff + .2byte 0x509a + .2byte 0x509e + .2byte 0x509e + .2byte 0x4090 + .2byte 0x4092 + .2byte 0x4490 + .2byte 0x40b0 + .2byte 0x40b0 + .2byte 0x409a + .2byte 0x40ff + .2byte 0x65fd + .2byte 0x4090 + .2byte 0x4090 + .2byte 0x4090 + .2byte 0x4090 + .2byte 0x4098 + .2byte 0x4098 + .2byte 0x4c98 + .2byte 0x4c98 + .2byte 0x69fd + .2byte 0x7490 + .2byte 0x7490 + .2byte 0x7898 + .2byte 0x7098 + .2byte 0x45fd + .2byte 0x4090 + .2byte 0x6090 + .2byte 0x4090 + .2byte 0x40ba + .2byte 0x40ba + .2byte 0x4090 + .2byte 0x4098 + .2byte 0x4090 + .2byte 0x4090 + .2byte 0x6098 + .2byte 0x6098 + .2byte 0x6098 + .2byte 0x61fd + .2byte 0x61fd + .2byte 0x4898 + .2byte 0x4898 + .2byte 0x6098 + .2byte 0x7098 + .2byte 0x6098 + .2byte 0x6098 + .2byte 0x6098 + .2byte 0x40fb + .2byte 0x40ff + .2byte 0x4098 + .2byte 0x5098 + .2byte 0x7498 + .2byte 0x7498 + .2byte 0x4098 + .2byte 0x4498 + .2byte 0x44fd + .2byte 0x49fd + .2byte 0x49fd + .2byte 0x60ff + .2byte 0x45fd + .2byte 0x65fd + .2byte 0x4498 + .2byte 0x4498 + .2byte 0x0000 + .2byte 0x4498 + .2byte 0x65fd + .2byte 0x409a + .2byte 0x60fd + .2byte 0x60fd + .2byte 0x60fd + .2byte 0x54b8 + .2byte 0x54b8 + .2byte 0x409a + .2byte 0x40fd + .2byte 0x60fd + .2byte 0x60fd + .2byte 0x4098 + .2byte 0x4098 + .2byte 0x4098 + .2byte 0x6cba + .2byte 0x4c98 + .2byte 0x4d98 + .2byte 0x4098 + .2byte 0x68ff + .2byte 0x6098 + .2byte 0x6098 + .2byte 0x6098 + .2byte 0x68fd + .2byte 0x4898 + .2byte 0x49fd + .2byte 0x49fd + .2byte 0x6098 + .2byte 0x6098 + .2byte 0x609a + .2byte 0x60da + .2byte 0x4c98 + .2byte 0x4c98 + .2byte 0x4c98 + .2byte 0x6098 + .2byte 0x6098 + .2byte 0x6098 + .2byte 0x0000 + .2byte 0x7098 + .2byte 0x7098 + .2byte 0x78fd + .2byte 0x78fd + .2byte 0x78fd + .2byte 0x6898 + .2byte 0x68ff + .2byte 0x6898 + .2byte 0x4c98 + .2byte 0x4c98 + .2byte 0x4d98 + .2byte 0x6cfd + .2byte 0x4490 + .align 2 gUnknown_8459EB8:: @ 8459EB8 .incbin "baserom.gba", 0x459EB8, 0xC diff --git a/data/data_8471F00.s b/data/data_8471F00.s index 364b5458d..bd77774a9 100644 --- a/data/data_8471F00.s +++ b/data/data_8471F00.s @@ -1,9 +1,12 @@ #include "constants/species.h" #include "constants/items.h" #include "constants/moves.h" +#include "constants/pokemon.h" #include "constants/easy_chat.h" #include "constants/facility_trainer_classes.h" +#define MALE 0 +#define FEMALE 1 #define NULL 0 .include "asm/macros.inc" @@ -210,10 +213,7 @@ gUnknown_84791CC:: @ 84791CC .incbin "baserom.gba", 0x4791CC, 0x1C gUnknown_84791E8:: @ 84791E8 - .incbin "baserom.gba", 0x4791E8, 0xE8 - -gUnknown_84792D0:: @ 84792D0 - .incbin "baserom.gba", 0x4792D0, 0x10 + .incbin "baserom.gba", 0x4791E8, 0x18 .section .rodata.8479668 diff --git a/data/event_scripts.s b/data/event_scripts.s index 98e63347e..8f9e8ae26 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -11,8 +11,14 @@ #include "constants/battle.h" #include "constants/spawn_points.h" #include "constants/field_effects.h" +#include "constants/trainers.h" +#include "constants/map_objects.h" +#include "constants/fame_checker.h" +#include "constants/seagallop.h" .include "asm/macros.inc" .include "asm/macros/event.inc" + .set FALSE, 0 + .set TRUE, 1 .section script_data, "aw", %progbits @@ -38,8 +44,8 @@ gSpecialVars:: @ 815FD0C .4byte gSpecialVar_LastTalked .4byte gSpecialVar_MonBoxId .4byte gSpecialVar_MonBoxPos - .4byte gUnknown_20370DA - .4byte gUnknown_20370DC + .4byte gSpecialVar_TextColor + .4byte gSpecialVar_PrevTextColor .4byte gUnknown_20370DE .include "data/specials.inc" @@ -58,8 +64,6 @@ gStdScripts:: @ 8160450 .4byte gStdScript_ItemMessageAndFanfare gStdScriptsEnd:: - - .include "data/maps/UnknownMap_00_00/scripts.inc" .include "data/maps/UnknownMap_00_01/scripts.inc" .include "data/maps/UnknownMap_00_02/scripts.inc" @@ -247,6 +251,7 @@ gStdScriptsEnd:: .include "data/maps/BirthIsland_Exterior/scripts.inc" .include "data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc" .include "data/maps/BirthIsland_Harbor/scripts.inc" + .include "data/maps/NavelRock_Harbor/scripts.inc" .include "data/maps/PalletTown/scripts.inc" .include "data/maps/ViridianCity/scripts.inc" .include "data/maps/PewterCity/scripts.inc" @@ -351,6 +356,7 @@ gStdScriptsEnd:: .include "data/maps/VermilionCity_PokemonCenter_1F/scripts.inc" .include "data/maps/VermilionCity_PokemonCenter_2F/scripts.inc" .include "data/maps/VermilionCity_PokemonFanClub/scripts.inc" + .include "data/maps/VermilionCity_House2/scripts.inc" .include "data/maps/VermilionCity_Mart/scripts.inc" .include "data/maps/VermilionCity_Gym/scripts.inc" .include "data/maps/VermilionCity_House3/scripts.inc" @@ -484,8 +490,6 @@ gStdScriptsEnd:: .include "data/maps/SixIsland_WaterPath_House2/scripts.inc" .include "data/maps/SevenIsland_SevaultCanyon_House/scripts.inc" - - .include "data/maps/ViridianForest/text.inc" .include "data/maps/MtMoon_1F/text.inc" .include "data/maps/MtMoon_B2F/text.inc" @@ -771,8 +775,6 @@ gStdScriptsEnd:: .include "data/maps/SixIsland_WaterPath_House2/text.inc" .include "data/maps/SevenIsland_SevaultCanyon_House/text.inc" - - gStdScript_2:: @ 81A4E3F lock faceplayer @@ -805,17 +807,15 @@ gStdScript_5:: @ 81A4E5C gStdScript_ItemMessageAndFanfare:: @ 81A4E66 textcolor 3 compare_var_to_value VAR_0x8002, MUS_FANFA1 - call_if 1, EventScript_1A4EA2 + call_if eq, EventScript_1A4EA2 compare_var_to_value VAR_0x8002, MUS_FAN5 - call_if 1, EventScript_1A4EA6 + call_if eq, EventScript_1A4EA6 message 0x0 waitmessage waitfanfare compare_var_to_value VAR_0x8002, MUS_FANFA1 - call_if 1, EventScript_1A4EAA - setorcopyvar VAR_0x8000, VAR_0x8000 - setorcopyvar VAR_0x8001, VAR_0x8001 - callstd 8 + call_if eq, EventScript_1A4EAA + giveitem VAR_0x8000, VAR_0x8001, 8 call EventScript_1A6675 return @@ -841,7 +841,7 @@ EventScript_1A4EAF:: @ 81A4EAF gUnknown_81A4EB4:: @ 81A4EB4 lock - special sub_8080628 + special PlayTrainerEncounterMusic special ScrSpecial_EndTrainerApproach waitstate goto EventScript_1A4FC7 @@ -853,8 +853,8 @@ gUnknown_81A4EC1:: @ 81A4EC1 waitmovement 0 specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_1A4EE8 - special sub_8080628 + goto_if ne, EventScript_1A4EE8 + special PlayTrainerEncounterMusic special sub_8080398 goto EventScript_1A4FC7 @@ -867,11 +867,11 @@ gUnknown_81A4EE9:: @ 81A4EE9 call EventScript_1A4FBA specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_1A4F20 + goto_if ne, EventScript_1A4F20 special CheckForAlivePartyMons compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_1A4F19 - special sub_8080628 + goto_if ne, EventScript_1A4F19 + special PlayTrainerEncounterMusic special sub_8080398 goto EventScript_1A4FC7 @@ -888,10 +888,10 @@ EventScript_1A4F20:: @ 81A4F20 gUnknown_81A4F21:: @ 81A4F21 applymovement VAR_LAST_TALKED, Movement_1A4FC5 waitmovement 0 - special sub_8080628 + special PlayTrainerEncounterMusic special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A501A + goto_if eq, EventScript_1A501A battlebegin ontrainerbattleend @@ -899,15 +899,15 @@ gUnknown_81A4F3E:: @ 81A4F3E call EventScript_1A4FBA specialvar VAR_RESULT, sub_810CEB4 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A4F72 - special sub_8080628 + goto_if eq, EventScript_1A4F72 + special PlayTrainerEncounterMusic special sub_8080398 special sub_80805D8 waitmessage waitbuttonpress special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A4FB8 + goto_if eq, EventScript_1A4FB8 special sub_80805B0 waitstate releaseall @@ -919,18 +919,18 @@ EventScript_1A4F72:: @ 81A4F72 gUnknown_81A4F73:: @ 81A4F73 specialvar VAR_RESULT, sub_810CEB4 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A4FB0 + goto_if eq, EventScript_1A4FB0 special CheckForAlivePartyMons compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_1A4FB1 - special sub_8080628 + goto_if ne, EventScript_1A4FB1 + special PlayTrainerEncounterMusic special sub_8080398 special sub_80805D8 waitmessage waitbuttonpress special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A4FB8 + goto_if eq, EventScript_1A4FB8 special sub_80805B0 waitstate releaseall @@ -965,19 +965,19 @@ EventScript_1A4FC7:: @ 81A4FC7 waitbuttonpress special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A501A + goto_if eq, EventScript_1A501A battlebegin specialvar VAR_RESULT, sub_80803CC compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A5017 + goto_if eq, EventScript_1A5017 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A5019 + goto_if eq, EventScript_1A5019 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1A5019 + goto_if eq, EventScript_1A5019 compare_var_to_value VAR_RESULT, 6 - goto_if_eq EventScript_1A5019 + goto_if eq, EventScript_1A5019 compare_var_to_value VAR_RESULT, 8 - goto_if_eq EventScript_1A5019 + goto_if eq, EventScript_1A5019 EventScript_1A5017:: @ 81A5017 releaseall @@ -1493,78 +1493,77 @@ Text_1A644F:: @ 81A644F .string "This move can be learned only\n" .string "once. Is that okay?$" - EventScript_ResetAllMapFlags:: @ 81A6481 - setflag FLAG_0x02B - setflag FLAG_0x02C - setflag FLAG_0x033 - setflag FLAG_0x092 - setflag FLAG_0x035 - setflag FLAG_0x036 - setflag FLAG_0x037 - setflag FLAG_0x03C - setflag FLAG_0x03D - setflag FLAG_0x0A1 - setflag FLAG_0x03F - setflag FLAG_0x04F - setflag FLAG_0x05A - setflag FLAG_0x0A3 - setflag FLAG_0x0A4 - setflag FLAG_0x062 - setflag FLAG_0x06B - setflag FLAG_0x0A2 - setflag FLAG_0x08C - setflag FLAG_0x06C - setflag FLAG_0x06D - setflag FLAG_0x06E - setflag FLAG_0x06F - setflag FLAG_0x075 - setflag FLAG_0x074 - setflag FLAG_0x07B - setflag FLAG_0x07C - setflag FLAG_0x07D - setflag FLAG_0x076 - setflag FLAG_0x091 - setflag FLAG_0x097 - setflag FLAG_0x090 - setflag FLAG_0x094 - setflag FLAG_0x095 - setflag FLAG_0x096 - setflag FLAG_0x099 - setflag FLAG_0x0A5 - setflag FLAG_0x0A6 - setflag FLAG_0x0A7 - setflag FLAG_0x0A8 - setflag FLAG_0x0A9 - setflag FLAG_0x0AA - setflag FLAG_0x0AB - setflag FLAG_0x0AC - setflag FLAG_0x09D - setflag FLAG_0x09E - setflag FLAG_0x09F - setflag FLAG_0x0A0 - setflag FLAG_0x0AE - setvar VAR_0x4025, 500 + setflag FLAG_HIDE_OAK_IN_HIS_LAB + setflag FLAG_HIDE_OAK_IN_PALLET_TOWN + setflag FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE + setflag FLAG_HIDE_PEWTER_CITY_RUNNING_SHOES_GUY + setflag FLAG_HIDE_POKEHOUSE_FUJI + setflag FLAG_HIDE_LIFT_KEY + setflag FLAG_HIDE_SILPH_SCOPE + setflag FLAG_HIDE_CERULEAN_RIVAL + setflag FLAG_HIDE_SS_ANNE_RIVAL + setflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE + setflag FLAG_HIDE_SAFFRON_CIVILIANS + setflag FLAG_HIDE_ROUTE_22_RIVAL + setflag FLAG_HIDE_OAK_IN_CHAMP_ROOM + setflag FLAG_HIDE_CREDITS_RIVAL + setflag FLAG_HIDE_CREDITS_OAK + setflag FLAG_HIDE_CINNABAR_BILL + setflag FLAG_HIDE_CINNABAR_SEAGALLOP + setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL + setflag FLAG_HIDE_LORELEI_IN_HER_HOUSE + setflag FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT + setflag FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER + setflag FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN + setflag FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY + setflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE + setflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER + setflag FLAG_HIDE_TWO_ISLAND_WOMAN + setflag FLAG_HIDE_TWO_ISLAND_BEAUTY + setflag FLAG_HIDE_TWO_ISLAND_SUPER_NERD + setflag FLAG_HIDE_LOSTELLE_IN_HER_HOME + setflag FLAG_HIDE_THREE_ISLAND_LONE_BIKER + setflag FLAG_HIDE_FOUR_ISLAND_RIVAL + setflag FLAG_HIDE_DOTTED_HOLE_SCIENTIST + setflag FLAG_HIDE_RESORT_GORGEOUS_SELPHY + setflag FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY + setflag FLAG_HIDE_SELPHYS_BUTLER + setflag FLAG_HIDE_DEOXYS + setflag FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL + setflag FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL + setflag FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL + setflag FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL + setflag FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL + setflag FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL + setflag FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL + setflag FLAG_HIDE_LORELEIS_HOUSE_LAPRAS_DOLL + setflag FLAG_HIDE_POSTGAME_GOSSIPERS + setflag FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS + setflag FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL + setflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL + setflag FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS + setvar VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 end EventScript_1A651A:: @ 81A651A - clearflag FLAG_0x09D + clearflag FLAG_HIDE_POSTGAME_GOSSIPERS call EventScript_1A6551 special sub_81130A8 specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_1A653B + call_if eq, EventScript_1A653B call EventScript_1A6541 return EventScript_1A653B:: @ 81A653B - setvar VAR_MAP_SCENE_PALLET_TOWN, 2 + setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 2 return EventScript_1A6541:: @ 81A6541 - clearflag FLAG_0x2F5 - clearflag FLAG_0x2F6 - clearflag FLAG_0x2F7 + clearflag FLAG_LUGIA_FLEW_AWAY + clearflag FLAG_HO_OH_FLEW_AWAY + clearflag FLAG_DEOXYS_FLEW_AWAY return gUnknown_81A654B:: @ 81A654B @@ -1572,24 +1571,24 @@ gUnknown_81A654B:: @ 81A654B end EventScript_1A6551:: @ 81A6551 - clearflag FLAG_0x4B8 - clearflag FLAG_0x4B9 - clearflag FLAG_0x4BA - clearflag FLAG_0x4BB - clearflag FLAG_0x4BC - cleartrainerflag 438 - cleartrainerflag 439 - cleartrainerflag 440 - cleartrainerflag 739 - cleartrainerflag 740 - cleartrainerflag 741 - setvar VAR_0x4068, 0 + clearflag FLAG_DEFEATED_LORELEI + clearflag FLAG_DEFEATED_BRUNO + clearflag FLAG_DEFEATED_AGATHA + clearflag FLAG_DEFEATED_LANCE + clearflag FLAG_DEFEATED_CHAMP + cleartrainerflag TRAINER_CHAMPION_FIRST_SQUIRTLE + cleartrainerflag TRAINER_CHAMPION_FIRST_BULBASAUR + cleartrainerflag TRAINER_CHAMPION_FIRST_CHARMANDER + cleartrainerflag TRAINER_CHAMPION_REMATCH_SQUIRTLE + cleartrainerflag TRAINER_CHAMPION_REMATCH_BULBASAUR + cleartrainerflag TRAINER_CHAMPION_REMATCH_CHARMANDER + setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 0 return EventScript_1A6578:: @ 81A6578 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 message Text_1A5483 waitmessage multichoice 19, 8, 0, 2 @@ -1621,13 +1620,13 @@ EventScript_1A65CE:: @ 81A65CE EventScript_1A65EC:: @ 81A65EC specialvar VAR_RESULT, sub_80CD074 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A661D + goto_if eq, EventScript_1A661D specialvar VAR_RESULT, sp182_move_string copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 0 - goto_if_eq EventScript_1A661D + goto_if eq, EventScript_1A661D compare_var_to_value VAR_0x8008, 1 - goto_if_eq EventScript_1A6636 + goto_if eq, EventScript_1A6636 end EventScript_1A661D:: @ 81A661D @@ -1639,10 +1638,10 @@ EventScript_1A661D:: @ 81A661D return EventScript_1A6636:: @ 81A6636 - checkflag 2114 - goto_if_eq EventScript_1A661D + checkflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER + goto_if TRUE, EventScript_1A661D msgbox Text_1A552B - setflag 2114 + setflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER message Text_1BCCCA waitmessage applymovement VAR_LAST_TALKED, Movement_1A666C @@ -1681,53 +1680,53 @@ EventScript_1A6697:: @ 81A6697 checkitemtype VAR_0x8000 call EventScript_1A66BC compare_var_to_value VAR_0x8007, 1 - call_if 1, EventScript_1A6749 + call_if eq, EventScript_1A6749 compare_var_to_value VAR_0x8007, 0 - call_if 1, EventScript_1A675E + call_if eq, EventScript_1A675E return EventScript_1A66BC:: @ 81A66BC - copyvar VAR_0x8000, VAR_RESULT + switch VAR_RESULT compare_var_to_value VAR_0x8000, 1 - goto_if_eq EventScript_1A66F9 + goto_if eq, EventScript_1A66F9 compare_var_to_value VAR_0x8000, 2 - goto_if_eq EventScript_1A6709 + goto_if eq, EventScript_1A6709 compare_var_to_value VAR_0x8000, 3 - goto_if_eq EventScript_1A6719 + goto_if eq, EventScript_1A6719 compare_var_to_value VAR_0x8000, 4 - goto_if_eq EventScript_1A6729 + goto_if eq, EventScript_1A6729 compare_var_to_value VAR_0x8000, 5 - goto_if_eq EventScript_1A6739 + goto_if eq, EventScript_1A6739 end EventScript_1A66F9:: @ 81A66F9 getstdstring 2, 24 compare_var_to_value VAR_0x8007, 1 - call_if 1, EventScript_1A6764 + call_if eq, EventScript_1A6764 return EventScript_1A6709:: @ 81A6709 getstdstring 2, 25 compare_var_to_value VAR_0x8007, 1 - call_if 1, EventScript_1A6764 + call_if eq, EventScript_1A6764 return EventScript_1A6719:: @ 81A6719 getstdstring 2, 26 compare_var_to_value VAR_0x8007, 1 - call_if 1, EventScript_1A6764 + call_if eq, EventScript_1A6764 return EventScript_1A6729:: @ 81A6729 getstdstring 2, 27 compare_var_to_value VAR_0x8007, 1 - call_if 1, EventScript_1A6768 + call_if eq, EventScript_1A6768 return EventScript_1A6739:: @ 81A6739 getstdstring 2, 28 compare_var_to_value VAR_0x8007, 1 - call_if 1, EventScript_1A6764 + call_if eq, EventScript_1A6764 return EventScript_1A6749:: @ 81A6749 @@ -1759,9 +1758,9 @@ gStdScript_7:: @ 81A676C EventScript_1A677A:: @ 81A677A getdecorname 1, VAR_0x8000 compare_var_to_value VAR_0x8007, 1 - call_if 1, EventScript_1A6795 + call_if eq, EventScript_1A6795 compare_var_to_value VAR_0x8007, 0 - call_if 1, EventScript_1A67AD + call_if eq, EventScript_1A67AD return EventScript_1A6795:: @ 81A6795 @@ -1789,9 +1788,9 @@ gStdScript_1:: @ 81A67B3 checkitemtype VAR_0x8000 call EventScript_1A66BC compare_var_to_value VAR_0x8007, 1 - call_if 1, EventScript_1A67EE + call_if eq, EventScript_1A67EE compare_var_to_value VAR_0x8007, 0 - call_if 1, EventScript_1A682D + call_if eq, EventScript_1A682D release return @@ -1801,9 +1800,9 @@ EventScript_1A67EE:: @ 81A67EE specialvar VAR_RESULT, sub_80CC8CC copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_1A6821 + call_if eq, EventScript_1A6821 compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_1A6827 + call_if eq, EventScript_1A6827 waitfanfare waitmessage msgbox gUnknown_81A5218 @@ -1828,12 +1827,12 @@ EventScript_PickUpHiddenItem:: @ 81A6843 textcolor 3 waitse compare_var_to_value VAR_0x8005, 0 - goto_if_eq EventScript_PickUpHiddenCoins + goto_if eq, EventScript_PickUpHiddenCoins call EventScript_GiveItem compare_var_to_value VAR_0x8007, 1 - goto_if_eq EventScript_ItemInPocketMessage + goto_if eq, EventScript_ItemInPocketMessage compare_var_to_value VAR_0x8007, 0 - goto_if_eq EventScript_BagIsFullMessage + goto_if eq, EventScript_BagIsFullMessage end EventScript_GiveItem:: @@ -1846,9 +1845,9 @@ EventScript_GiveItem:: EventScript_ItemInPocketMessage:: compare_var_to_value VAR_0x8006, 1 - call_if 1, EventScript_FoundSingleItemMessage + call_if eq, EventScript_FoundSingleItemMessage compare_var_to_value VAR_0x8006, 1 - call_if 5, EventScript_FoundMultipleItemsMessage + call_if ne, EventScript_FoundMultipleItemsMessage waitfanfare waitmessage msgbox gUnknown_81A5218 @@ -1879,11 +1878,11 @@ EventScript_BagIsFullMessage:: EventScript_PickUpHiddenCoins:: checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_HiddenCoinsButNoCoinCase + goto_if FALSE, EventScript_HiddenCoinsButNoCoinCase checkcoins VAR_RESULT specialvar VAR_RESULT, Special_CheckAddCoins compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_HiddenCoinsButTheCoinCaseIsFull + goto_if eq, EventScript_HiddenCoinsButTheCoinCaseIsFull givecoins VAR_0x8006 getstdstring 1, 0x17 call EventScript_1A6764 @@ -1916,10 +1915,10 @@ EventScript_HiddenCoinsButNoCoinCase:: gUnknown_81A6955:: @ 81A6955 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall - checkflag FLAG_0x841 - goto_if 1, EventScript_1A698E + checkflag FLAG_SYS_PC_STORAGE_DISABLED + goto_if TRUE, EventScript_1A698E setvar VAR_0x8004, 27 special Special_SetSomeVariable setvar VAR_0x8004, 0 @@ -1943,19 +1942,13 @@ EventScript_1A6998:: @ 81A6998 end EventScript_1A69A8:: @ 81A69A8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A6A05 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A69F0 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A6A7A - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A6A56 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1A6A46 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A6A46 + switch VAR_RESULT + case 0, EventScript_1A6A05 + case 1, EventScript_1A69F0 + case 2, EventScript_1A6A7A + case 3, EventScript_1A6A56 + case 4, EventScript_1A6A46 + case 127, EventScript_1A6A46 end EventScript_1A69F0:: @ 81A69F0 @@ -1969,9 +1962,9 @@ EventScript_1A69F0:: @ 81A69F0 EventScript_1A6A05:: @ 81A6A05 playse SE_PC_LOGIN checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if 0, EventScript_1A6A34 + call_if FALSE, EventScript_1A6A34 checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if 1, EventScript_1A6A3D + call_if TRUE, EventScript_1A6A3D msgbox Text_1A50BE special sub_808C6A8 waitstate @@ -1997,8 +1990,8 @@ EventScript_1A6A46:: @ 81A6A46 end EventScript_1A6A56:: @ 81A6A56 - checkflag FLAG_0x82C - goto_if 0, EventScript_1A6A46 + checkflag FLAG_SYS_GAME_CLEAR + goto_if FALSE, EventScript_1A6A46 playse SE_PC_LOGIN setvar VAR_0x8004, 31 special HelpSystem_BackupSomeVariable @@ -2010,16 +2003,16 @@ EventScript_1A6A56:: @ 81A6A56 end EventScript_1A6A7A:: @ 81A6A7A - checkflag FLAG_0x829 - goto_if 0, EventScript_1A6A46 + checkflag FLAG_SYS_POKEDEX_GET + goto_if FALSE, EventScript_1A6A46 playse SE_PC_LOGIN msgbox Text_1A5BC6 msgbox Text_1A5C03, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6AB2 - setflag FLAG_0x2FF + goto_if eq, EventScript_1A6AB2 + setflag FLAG_OAKS_RATING_IS_VIA_PC call EventScript_1A73E0 - clearflag FLAG_0x2FF + clearflag FLAG_OAKS_RATING_IS_VIA_PC goto EventScript_1A6AB2 end @@ -2037,16 +2030,16 @@ EventScript_1A6AC0:: @ 81A6AC0 EventScript_1A6AC8:: @ 81A6AC8 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A6AC8_End + goto_if eq, EventScript_1A6AC8_End checkpartymove MOVE_SURF compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1A6AC8_End + goto_if eq, EventScript_1A6AC8_End getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT lockall msgbox Text_1A556E, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6AC8_Release + goto_if eq, EventScript_1A6AC8_Release msgbox Text_1A55A5 dofieldeffect FLDEFF_USE_SURF EventScript_1A6AC8_Release:@ 81A6B0B @@ -2061,88 +2054,80 @@ gUnknown_81A6B0D:: @ 81A6B0D end EventScript_1A6B18:: @ 81A6B18 - copyvar VAR_0x8000, VAR_0x8008 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A6B76 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A6B7A - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A6B81 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1A6B8B - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1A6BA1 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_1A6BB4 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_1A6BCA - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_1A6BE0 + switch VAR_0x8008 + case 1, EventScript_1A6B76 + case 2, EventScript_1A6B7A + case 3, EventScript_1A6B81 + case 4, EventScript_1A6B8B + case 5, EventScript_1A6BA1 + case 6, EventScript_1A6BB4 + case 7, EventScript_1A6BCA + case 8, EventScript_1A6BE0 end EventScript_1A6B76:: @ 81A6B76 - settrainerflag 142 + settrainerflag TRAINER_CAMPER_LIAM return EventScript_1A6B7A:: @ 81A6B7A - settrainerflag 150 - settrainerflag 234 + settrainerflag TRAINER_PICNICKER_DIANA + settrainerflag TRAINER_SWIMMER_MALE_LUIS return EventScript_1A6B81:: @ 81A6B81 - settrainerflag 141 - settrainerflag 220 - settrainerflag 423 + settrainerflag TRAINER_SAILOR_DWAYNE + settrainerflag TRAINER_ENGINEER_BAILY + settrainerflag TRAINER_GENTLEMAN_TUCKER return EventScript_1A6B8B:: @ 81A6B8B - settrainerflag 132 - settrainerflag 133 - settrainerflag 160 - settrainerflag 265 - settrainerflag 266 - settrainerflag 267 - settrainerflag 402 + settrainerflag TRAINER_LASS_KAY + settrainerflag TRAINER_LASS_LISA + settrainerflag TRAINER_PICNICKER_TINA + settrainerflag TRAINER_BEAUTY_BRIDGET + settrainerflag TRAINER_BEAUTY_TAMIA + settrainerflag TRAINER_BEAUTY_LORI + settrainerflag TRAINER_COOLTRAINER_MARY return EventScript_1A6BA1:: @ 81A6BA1 - settrainerflag 294 - settrainerflag 295 - settrainerflag 288 - settrainerflag 289 - settrainerflag 292 - settrainerflag 293 + settrainerflag TRAINER_TAMER_PHIL + settrainerflag TRAINER_TAMER_EDGAR + settrainerflag TRAINER_JUGGLER_KIRK + settrainerflag TRAINER_JUGGLER_SHAWN + settrainerflag TRAINER_JUGGLER_KAYDEN + settrainerflag TRAINER_JUGGLER_NATE return EventScript_1A6BB4:: @ 81A6BB4 - settrainerflag 280 - settrainerflag 281 - settrainerflag 282 - settrainerflag 283 - settrainerflag 462 - settrainerflag 463 - settrainerflag 464 + settrainerflag TRAINER_PSYCHIC_JOHAN + settrainerflag TRAINER_PSYCHIC_TYRON + settrainerflag TRAINER_PSYCHIC_CAMERON + settrainerflag TRAINER_PSYCHIC_PRESTON + settrainerflag TRAINER_CHANNELER_AMANDA + settrainerflag TRAINER_CHANNELER_STACY + settrainerflag TRAINER_CHANNELER_TASHA return EventScript_1A6BCA:: @ 81A6BCA - settrainerflag 177 - settrainerflag 178 - settrainerflag 179 - settrainerflag 180 - settrainerflag 213 - settrainerflag 214 - settrainerflag 215 + settrainerflag TRAINER_SUPER_NERD_ERIK + settrainerflag TRAINER_SUPER_NERD_AVERY + settrainerflag TRAINER_SUPER_NERD_DEREK + settrainerflag TRAINER_SUPER_NERD_ZAC + settrainerflag TRAINER_BURGLAR_QUINN + settrainerflag TRAINER_BURGLAR_RAMON + settrainerflag TRAINER_BURGLAR_DUSTY return EventScript_1A6BE0:: @ 81A6BE0 - settrainerflag 296 - settrainerflag 297 - settrainerflag 322 - settrainerflag 323 - settrainerflag 324 - settrainerflag 392 - settrainerflag 400 - settrainerflag 401 + settrainerflag TRAINER_TAMER_JASON + settrainerflag TRAINER_TAMER_COLE + settrainerflag TRAINER_BLACK_BELT_ATSUSHI + settrainerflag TRAINER_BLACK_BELT_KIYO + settrainerflag TRAINER_BLACK_BELT_TAKASHI + settrainerflag TRAINER_COOLTRAINER_SAMUEL + settrainerflag TRAINER_COOLTRAINER_YUJI + settrainerflag TRAINER_COOLTRAINER_WARREN return EventScript_1A6BF9:: @ 81A6BF9 @@ -2169,7 +2154,7 @@ EventScript_1A6C21:: @ 81A6C21 waitfanfare return -EventScript_1A6C26:: @ 81A6C26 +EventScript_FadeOut_Heal_FadeIn:: @ 81A6C26 fadescreen 1 playfanfare MUS_ME_ASA waitfanfare @@ -2182,7 +2167,7 @@ gUnknown_81A6C32:: @ 81A6C32 msgbox Text_1C0DF1 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 fadescreen 1 special sub_80CA7EC waitstate @@ -2315,12 +2300,12 @@ Text_1A72F2:: @ 81A72F2 EventScript_1A737B:: @ 81A737B special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 - checkflag FLAG_0x2F4 - call_if 1, EventScript_1A73A4 - checkflag FLAG_0x2F4 - call_if 0, EventScript_1A73AD + checkflag FLAG_OAK_SAW_DEX_COMPLETION + call_if TRUE, EventScript_1A73A4 + checkflag FLAG_OAK_SAW_DEX_COMPLETION + call_if FALSE, EventScript_1A73AD call EventScript_1A73E0 return @@ -2337,9 +2322,9 @@ EventScript_1A73B6:: @ 81A73B6 special sub_80CA524 waitmessage compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_1A73D8 + call_if eq, EventScript_1A73D8 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_1A73DC + call_if eq, EventScript_1A73DC waitfanfare waitbuttonpress return @@ -2364,11 +2349,11 @@ EventScript_1A73E0:: @ 81A73E0 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 msgbox Text_1A6CA3 - checkflag FLAG_0x2FF - call_if 0, EventScript_1A746D + checkflag FLAG_OAKS_RATING_IS_VIA_PC + call_if FALSE, EventScript_1A746D call EventScript_1A73B6 compare_var_to_value VAR_0x800A, 0 - goto_if 1, EventScript_1A748F + goto_if eq, EventScript_1A748F setvar VAR_0x8004, 1 specialvar VAR_RESULT, Special_GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 @@ -2378,9 +2363,9 @@ EventScript_1A73E0:: @ 81A73E0 msgbox Text_1A71AA specialvar VAR_RESULT, HasAllMons compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7470 + goto_if eq, EventScript_1A7470 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A747E + goto_if eq, EventScript_1A747E end EventScript_1A746D:: @ 81A746D @@ -2393,7 +2378,7 @@ EventScript_1A7470:: @ 81A7470 end EventScript_1A747E:: @ 81A747E - setflag FLAG_0x2F4 + setflag FLAG_OAK_SAW_DEX_COMPLETION msgbox Text_1A722F goto EventScript_1A748F end @@ -2459,13 +2444,13 @@ EventScript_1A7506:: @ 81A7506 playse SE_DOOR call EventScript_1A7538 special DrawWholeMapView - setflag FLAG_0x004 + setflag FLAG_TEMP_4 return EventScript_1A751F:: @ 81A751F applymovement 255, Movement_1A75F3 waitmovement 0 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 playse SE_KI_GASYAN call EventScript_1A759C special DrawWholeMapView @@ -2493,7 +2478,7 @@ EventScript_1A7563:: @ 81A7563 setmetatile 6, 4, 654, 1 setmetatile 6, 5, 662, 0 special DrawWholeMapView - setflag FLAG_0x004 + setflag FLAG_TEMP_4 return EventScript_1A7589:: @ 81A7589 @@ -2714,7 +2699,7 @@ gUnknown_81A7702:: @ 81A7702 textcolor 3 msgbox Text_1A622C, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A778A + goto_if eq, EventScript_1A778A setvar VAR_0x8004, 14 call EventScript_1A6AC0 lock @@ -2722,11 +2707,11 @@ gUnknown_81A7702:: @ 81A7702 specialvar VAR_0x8008, sub_80CC4D4 textcolor 0 compare_var_to_value VAR_0x8004, 0 - goto_if 1, EventScript_1A774D + goto_if eq, EventScript_1A774D compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A778A + goto_if eq, EventScript_1A778A compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A778C + goto_if eq, EventScript_1A778C end EventScript_1A774D:: @ 81A774D @@ -2738,7 +2723,7 @@ EventScript_1A774D:: @ 81A774D applymovement VAR_0x8008, Movement_1A75DD waitmovement 0 msgbox Text_1A62D3 - setflag 2105 + setflag FLAG_SYS_MYSTERY_GIFT_ENABLED textcolor 3 special sub_80699BC signmsg @@ -2776,7 +2761,7 @@ EventScript_1A77B0:: @ 81A77B0 Route16_NorthEntrance_1F_EventScript_1A77B6:: @ 81A77B6 Route18_EastEntrance_1F_EventScript_1A77B6:: @ 81A77B6 lockall - clearflag FLAG_0x830 + clearflag FLAG_SYS_ON_CYCLING_ROAD setvar VAR_MAP_SCENE_ROUTE16, 0 releaseall end @@ -2820,94 +2805,78 @@ EventScript_1A77F9:: @ 81A77F9 end EventScript_1A7803:: @ 81A7803 - compare_var_to_var VAR_0x405F, VAR_0x4001 - goto_if 4, EventScript_1A77EC - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A78D5 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A78E4 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A78F3 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1A7902 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1A7911 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_1A7920 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_1A792F - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_1A793E + compare_var_to_var VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + goto_if ge, EventScript_1A77EC + switch VAR_0x4001 + case 1, EventScript_1A78D5 + case 2, EventScript_1A78E4 + case 3, EventScript_1A78F3 + case 4, EventScript_1A7902 + case 5, EventScript_1A7911 + case 6, EventScript_1A7920 + case 7, EventScript_1A792F + case 8, EventScript_1A793E end EventScript_1A786C:: @ 81A786C - compare_var_to_var VAR_0x405F, VAR_0x4001 - goto_if 4, EventScript_1A77F9 - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A78D5 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A78E4 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A78F3 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1A7902 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1A7911 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_1A7920 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_1A792F - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_1A793E + compare_var_to_var VAR_MAP_SCENE_ROUTE23, VAR_0x4001 + goto_if ge, EventScript_1A77F9 + switch VAR_0x4001 + case 1, EventScript_1A78D5 + case 2, EventScript_1A78E4 + case 3, EventScript_1A78F3 + case 4, EventScript_1A7902 + case 5, EventScript_1A7911 + case 6, EventScript_1A7920 + case 7, EventScript_1A792F + case 8, EventScript_1A793E end EventScript_1A78D5:: @ 81A78D5 - checkflag FLAG_UNK820 - goto_if 1, EventScript_1A794D + checkflag FLAG_BADGE01_GET + goto_if TRUE, EventScript_1A794D goto EventScript_1A77C9 end EventScript_1A78E4:: @ 81A78E4 - checkflag FLAG_0x821 - goto_if 1, EventScript_1A795F + checkflag FLAG_BADGE02_GET + goto_if TRUE, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A78F3:: @ 81A78F3 - checkflag FLAG_0x822 - goto_if 1, EventScript_1A795F + checkflag FLAG_BADGE03_GET + goto_if TRUE, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A7902:: @ 81A7902 - checkflag FLAG_0x823 - goto_if 1, EventScript_1A795F + checkflag FLAG_BADGE04_GET + goto_if TRUE, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A7911:: @ 81A7911 - checkflag FLAG_UNK824 - goto_if 1, EventScript_1A795F + checkflag FLAG_BADGE05_GET + goto_if TRUE, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A7920:: @ 81A7920 - checkflag FLAG_0x825 - goto_if 1, EventScript_1A795F + checkflag FLAG_BADGE06_GET + goto_if TRUE, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A792F:: @ 81A792F - checkflag FLAG_UNK826 - goto_if 1, EventScript_1A795F + checkflag FLAG_BADGE07_GET + goto_if TRUE, EventScript_1A795F goto EventScript_1A77DE end EventScript_1A793E:: @ 81A793E - checkflag FLAG_0x827 - goto_if 1, EventScript_1A795F + checkflag FLAG_BADGE08_GET + goto_if TRUE, EventScript_1A795F goto EventScript_1A77DE end @@ -2917,13 +2886,13 @@ EventScript_1A794D:: @ 81A794D playfanfare MUS_FANFA1 waitfanfare waitbuttonpress - copyvar VAR_0x405F, VAR_0x4001 + copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 release end EventScript_1A795F:: @ 81A795F msgbox Text_1A5839 - copyvar VAR_0x405F, VAR_0x4001 + copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 release end @@ -2931,70 +2900,62 @@ EventScript_1A796E:: @ 81A796E textcolor 0 applymovement VAR_0x8009, Movement_1A75E7 waitmovement 0 - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A79D8 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A79E7 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A79F6 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1A7A05 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1A7A14 - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_1A7A23 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_1A7A32 - compare_var_to_value VAR_0x8000, 8 - goto_if 1, EventScript_1A7A41 + switch VAR_0x4001 + case 1, EventScript_1A79D8 + case 2, EventScript_1A79E7 + case 3, EventScript_1A79F6 + case 4, EventScript_1A7A05 + case 5, EventScript_1A7A14 + case 6, EventScript_1A7A23 + case 7, EventScript_1A7A32 + case 8, EventScript_1A7A41 end EventScript_1A79D8:: @ 81A79D8 - checkflag FLAG_UNK820 - goto_if 1, EventScript_1A7A96 + checkflag FLAG_BADGE01_GET + goto_if TRUE, EventScript_1A7A96 goto EventScript_1A7A50 end EventScript_1A79E7:: @ 81A79E7 - checkflag FLAG_0x821 - goto_if 1, EventScript_1A7AA8 + checkflag FLAG_BADGE02_GET + goto_if TRUE, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A79F6:: @ 81A79F6 - checkflag FLAG_0x822 - goto_if 1, EventScript_1A7AA8 + checkflag FLAG_BADGE03_GET + goto_if TRUE, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A05:: @ 81A7A05 - checkflag FLAG_0x823 - goto_if 1, EventScript_1A7AA8 + checkflag FLAG_BADGE04_GET + goto_if TRUE, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A14:: @ 81A7A14 - checkflag FLAG_UNK824 - goto_if 1, EventScript_1A7AA8 + checkflag FLAG_BADGE05_GET + goto_if TRUE, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A23:: @ 81A7A23 - checkflag FLAG_0x825 - goto_if 1, EventScript_1A7AA8 + checkflag FLAG_BADGE06_GET + goto_if TRUE, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A32:: @ 81A7A32 - checkflag FLAG_UNK826 - goto_if 1, EventScript_1A7AA8 + checkflag FLAG_BADGE07_GET + goto_if TRUE, EventScript_1A7AA8 goto EventScript_1A7A77 end EventScript_1A7A41:: @ 81A7A41 - checkflag FLAG_0x827 - goto_if 1, EventScript_1A7AA8 + checkflag FLAG_BADGE08_GET + goto_if TRUE, EventScript_1A7AA8 goto EventScript_1A7A77 end @@ -3028,13 +2989,13 @@ EventScript_1A7A96:: @ 81A7A96 playfanfare MUS_FANFA1 waitfanfare waitbuttonpress - copyvar VAR_0x405F, VAR_0x4001 + copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 releaseall end EventScript_1A7AA8:: @ 81A7AA8 msgbox Text_1A5839 - copyvar VAR_0x405F, VAR_0x4001 + copyvar VAR_MAP_SCENE_ROUTE23, VAR_0x4001 releaseall end @@ -3043,7 +3004,7 @@ Movement_1A7AB7:: @ 81A7AB7 step_end EventScript_1A7AB9:: @ 81A7AB9 - special sub_80CB204 + special Special_GetElevatorFloor return EventScript_1A7ABD:: @ 81A7ABD @@ -3073,33 +3034,25 @@ EventScript_1A7AE0:: @ 81A7AE0 EventScript_1A7AE2:: @ 81A7AE2 msgbox Text_177460, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A7B70 + goto_if eq, EventScript_1A7B70 msgbox Text_17747B - checkflag FLAG_0x26C - goto_if 1, EventScript_1A7B3B - setflag FLAG_0x26C - copyvar VAR_0x8000, VAR_0x8004 - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A7B7A - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A7D3E - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A7E72 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A7F4C + checkflag FLAG_POKEMON_MANSION_SWITCH_STATE + goto_if TRUE, EventScript_1A7B3B + setflag FLAG_POKEMON_MANSION_SWITCH_STATE + switch VAR_0x8004 + case 0, EventScript_1A7B7A + case 1, EventScript_1A7D3E + case 2, EventScript_1A7E72 + case 3, EventScript_1A7F4C end EventScript_1A7B3B:: @ 81A7B3B - clearflag FLAG_0x26C - copyvar VAR_0x8000, VAR_0x8004 - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A7C5C - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A7DD8 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A7EDF - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A8025 + clearflag FLAG_POKEMON_MANSION_SWITCH_STATE + switch VAR_0x8004 + case 0, EventScript_1A7C5C + case 1, EventScript_1A7DD8 + case 2, EventScript_1A7EDF + case 3, EventScript_1A8025 end EventScript_1A7B70:: @ 81A7B70 @@ -3656,8 +3609,8 @@ SilphCo_2F_EventScript_1A891B:: @ 81A891B lockall setvar VAR_0x4001, 1 setvar VAR_0x8004, 634 - checkflag FLAG_0x27A - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_2F_DOOR_1 + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3665,8 +3618,8 @@ SilphCo_2F_EventScript_1A8935:: @ 81A8935 lockall setvar VAR_0x4001, 2 setvar VAR_0x8004, 635 - checkflag FLAG_0x27B - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_2F_DOOR_2 + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3674,8 +3627,8 @@ SilphCo_3F_EventScript_1A894F:: @ 81A894F lockall setvar VAR_0x4001, 3 setvar VAR_0x8004, 636 - checkflag FLAG_0x27C - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_3F_DOOR_1 + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3683,8 +3636,8 @@ SilphCo_3F_EventScript_1A8969:: @ 81A8969 lockall setvar VAR_0x4001, 4 setvar VAR_0x8004, 637 - checkflag FLAG_0x27D - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_3F_DOOR_2 + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3692,8 +3645,8 @@ SilphCo_4F_EventScript_1A8983:: @ 81A8983 lockall setvar VAR_0x4001, 5 setvar VAR_0x8004, 638 - checkflag FLAG_0x27E - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_4F_DOOR_1 + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3701,8 +3654,8 @@ SilphCo_4F_EventScript_1A899D:: @ 81A899D lockall setvar VAR_0x4001, 6 setvar VAR_0x8004, 639 - checkflag FLAG_0x27F - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_4F_DOOR_2 + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3710,8 +3663,8 @@ SilphCo_5F_EventScript_1A89B7:: @ 81A89B7 lockall setvar VAR_0x4001, 7 setvar VAR_0x8004, 640 - checkflag FLAG_0x280 - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_5F_DOOR_1 + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3719,8 +3672,8 @@ SilphCo_5F_EventScript_1A89D1:: @ 81A89D1 lockall setvar VAR_0x4001, 8 setvar VAR_0x8004, 641 - checkflag FLAG_0x281 - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_5F_DOOR_2 + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3728,8 +3681,8 @@ SilphCo_5F_EventScript_1A89EB:: @ 81A89EB lockall setvar VAR_0x4001, 9 setvar VAR_0x8004, 642 - checkflag FLAG_0x282 - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_5F_DOOR_3 + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3737,8 +3690,8 @@ SilphCo_6F_EventScript_1A8A05:: @ 81A8A05 lockall setvar VAR_0x4001, 10 setvar VAR_0x8004, 643 - checkflag FLAG_0x283 - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_6F_DOOR + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3746,8 +3699,8 @@ SilphCo_7F_EventScript_1A8A1F:: @ 81A8A1F lockall setvar VAR_0x4001, 11 setvar VAR_0x8004, 644 - checkflag FLAG_0x284 - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_7F_DOOR_1 + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3755,8 +3708,8 @@ SilphCo_7F_EventScript_1A8A39:: @ 81A8A39 lockall setvar VAR_0x4001, 12 setvar VAR_0x8004, 645 - checkflag FLAG_0x285 - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_7F_DOOR_2 + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3764,8 +3717,8 @@ SilphCo_7F_EventScript_1A8A53:: @ 81A8A53 lockall setvar VAR_0x4001, 13 setvar VAR_0x8004, 646 - checkflag FLAG_0x286 - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_7F_DOOR_3 + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3773,8 +3726,8 @@ SilphCo_8F_EventScript_1A8A6D:: @ 81A8A6D lockall setvar VAR_0x4001, 14 setvar VAR_0x8004, 647 - checkflag FLAG_0x287 - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_8F_DOOR + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3782,8 +3735,8 @@ SilphCo_9F_EventScript_1A8A87:: @ 81A8A87 lockall setvar VAR_0x4001, 15 setvar VAR_0x8004, 648 - checkflag FLAG_0x288 - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_9F_DOOR_1 + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3791,8 +3744,8 @@ SilphCo_9F_EventScript_1A8AA1:: @ 81A8AA1 lockall setvar VAR_0x4001, 16 setvar VAR_0x8004, 649 - checkflag FLAG_0x289 - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_9F_DOOR_2 + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3800,8 +3753,8 @@ SilphCo_9F_EventScript_1A8ABB:: @ 81A8ABB lockall setvar VAR_0x4001, 17 setvar VAR_0x8004, 650 - checkflag FLAG_0x28A - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_9F_DOOR_3 + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3809,8 +3762,8 @@ SilphCo_9F_EventScript_1A8AD5:: @ 81A8AD5 lockall setvar VAR_0x4001, 18 setvar VAR_0x8004, 651 - checkflag FLAG_0x28B - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_9F_DOOR_4 + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3818,8 +3771,8 @@ SilphCo_10F_EventScript_1A8AEF:: @ 81A8AEF lockall setvar VAR_0x4001, 19 setvar VAR_0x8004, 652 - checkflag FLAG_0x28C - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_10F_DOOR + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end @@ -3827,14 +3780,14 @@ SilphCo_11F_EventScript_1A8B09:: @ 81A8B09 lockall setvar VAR_0x4001, 20 setvar VAR_0x8004, 653 - checkflag FLAG_0x28D - goto_if 1, EventScript_1A813F + checkflag FLAG_SILPH_11F_DOOR + goto_if TRUE, EventScript_1A813F goto EventScript_1A8B23 end EventScript_1A8B23:: @ 81A8B23 - checkflag FLAG_0x192 - goto_if 1, EventScript_1A8B32 + checkflag FLAG_HIDE_SILPH_CO_5F_CARD_KEY + goto_if TRUE, EventScript_1A8B32 goto EventScript_1A8135 end @@ -3843,45 +3796,45 @@ EventScript_1A8B32:: @ 81A8B32 msgbox Text_1A5B88 waitfanfare compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1A8532 + call_if eq, EventScript_1A8532 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1A8560 + call_if eq, EventScript_1A8560 compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_1A858E + call_if eq, EventScript_1A858E compare_var_to_value VAR_0x4001, 4 - call_if 1, EventScript_1A85C5 + call_if eq, EventScript_1A85C5 compare_var_to_value VAR_0x4001, 5 - call_if 1, EventScript_1A85FC + call_if eq, EventScript_1A85FC compare_var_to_value VAR_0x4001, 6 - call_if 1, EventScript_1A862A + call_if eq, EventScript_1A862A compare_var_to_value VAR_0x4001, 7 - call_if 1, EventScript_1A8658 + call_if eq, EventScript_1A8658 compare_var_to_value VAR_0x4001, 8 - call_if 1, EventScript_1A868F + call_if eq, EventScript_1A868F compare_var_to_value VAR_0x4001, 9 - call_if 1, EventScript_1A86C6 + call_if eq, EventScript_1A86C6 compare_var_to_value VAR_0x4001, 10 - call_if 1, EventScript_1A86FD + call_if eq, EventScript_1A86FD compare_var_to_value VAR_0x4001, 11 - call_if 1, EventScript_1A8734 + call_if eq, EventScript_1A8734 compare_var_to_value VAR_0x4001, 12 - call_if 1, EventScript_1A8762 + call_if eq, EventScript_1A8762 compare_var_to_value VAR_0x4001, 13 - call_if 1, EventScript_1A8790 + call_if eq, EventScript_1A8790 compare_var_to_value VAR_0x4001, 14 - call_if 1, EventScript_1A87BE + call_if eq, EventScript_1A87BE compare_var_to_value VAR_0x4001, 15 - call_if 1, EventScript_1A87F5 + call_if eq, EventScript_1A87F5 compare_var_to_value VAR_0x4001, 16 - call_if 1, EventScript_1A882C + call_if eq, EventScript_1A882C compare_var_to_value VAR_0x4001, 17 - call_if 1, EventScript_1A8863 + call_if eq, EventScript_1A8863 compare_var_to_value VAR_0x4001, 18 - call_if 1, EventScript_1A8891 + call_if eq, EventScript_1A8891 compare_var_to_value VAR_0x4001, 19 - call_if 1, EventScript_1A88BF + call_if eq, EventScript_1A88BF compare_var_to_value VAR_0x4001, 20 - call_if 1, EventScript_1A88ED + call_if eq, EventScript_1A88ED waitse playse SE_KI_GASYAN special DrawWholeMapView @@ -3905,37 +3858,37 @@ EventScript_1A8C33:: @ 81A8C33 return EventScript_1A8C3C:: @ 81A8C3C - bufferboxname 0, 16439 - getspeciesname 1, 16385 + bufferboxname 0, VAR_0x4037 + getspeciesname 1, VAR_0x4001 checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if 0, EventScript_1A8C57 + call_if FALSE, EventScript_1A8C57 checkflag FLAG_SYS_NOT_SOMEONES_PC - call_if 1, EventScript_1A8C82 + call_if TRUE, EventScript_1A8C82 return EventScript_1A8C57:: @ 81A8C57 specialvar VAR_RESULT, sub_80CC7B4 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A8C70 + goto_if eq, EventScript_1A8C70 msgbox Text_1A5CF1 return EventScript_1A8C70:: @ 81A8C70 specialvar VAR_RESULT, get_unknown_box_id - bufferboxname 2, 32781 + bufferboxname 2, VAR_RESULT msgbox Text_1A5D6E return EventScript_1A8C82:: @ 81A8C82 specialvar VAR_RESULT, sub_80CC7B4 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A8C9B + goto_if eq, EventScript_1A8C9B msgbox Text_1A5D31 return EventScript_1A8C9B:: @ 81A8C9B specialvar VAR_RESULT, get_unknown_box_id - bufferboxname 2, 32781 + bufferboxname 2, VAR_RESULT msgbox Text_1A5DB1 return @@ -3946,7 +3899,7 @@ EventScript_1A8CAD:: @ 81A8CAD return EventScript_1A8CBD:: @ 81A8CBD - special sub_80BF8FC + special Special_ChooseMonFromParty waitstate lock faceplayer @@ -4048,15 +4001,13 @@ ViridianCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02 VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08 lock faceplayer - checkflag FLAG_0x292 - goto_if 1, EventScript_1A8D3F + checkflag FLAG_GOT_VS_SEEKER + goto_if TRUE, EventScript_1A8D3F msgbox Text_194234 - setflag FLAG_0x292 - setorcopyvar VAR_0x8000, 362 - setorcopyvar VAR_0x8001, 1 - callstd 0 + setflag FLAG_GOT_VS_SEEKER + giveitem ITEM_VS_SEEKER compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A6BF9 + goto_if eq, EventScript_1A6BF9 msgbox Text_19430F release end @@ -4072,9 +4023,9 @@ EventScript_ItemfinderDigUpUnderfootItem:: @ 81A8D49 waitse call EventScript_GiveItem compare_var_to_value VAR_0x8007, 1 - goto_if_eq EventScript_DigUpItemPutInPocket + goto_if eq, EventScript_DigUpItemPutInPocket compare_var_to_value VAR_0x8007, 0 - goto_if_eq EventScript_DigUpItemBagIsFull + goto_if eq, EventScript_DigUpItemBagIsFull end EventScript_DigUpItemPutInPocket:: @@ -4094,15 +4045,15 @@ EventScript_DigUpItemBagIsFull:: releaseall end -gUnknown_81A8D97:: @ 81A8D97 +EventScript_AfterWhiteOutHeal:: @ 81A8D97 lockall textcolor 1 msgbox Text_1A5E89 call EventScript_1A65CE - checkflag FLAG_0x4B0 - call_if 0, EventScript_1A8DC6 - checkflag FLAG_0x4B0 - call_if 1, EventScript_1A8DCF + checkflag FLAG_DEFEATED_BROCK + call_if FALSE, EventScript_1A8DC6 + checkflag FLAG_DEFEATED_BROCK + call_if TRUE, EventScript_1A8DCF applymovement VAR_LAST_TALKED, Movement_1A666C waitmovement 0 fadedefaultbgm @@ -4117,34 +4068,34 @@ EventScript_1A8DCF:: @ 81A8DCF msgbox Text_1A5F9B return -gUnknown_81A8DD8:: @ 81A8DD8 +EventScript_MomHeal:: @ 81A8DD8 lockall textcolor 1 applymovement 1, Movement_1A75ED waitmovement 0 msgbox Text_1A5FDF - call EventScript_1A6C26 + call EventScript_FadeOut_Heal_FadeIn msgbox Text_1A6046 fadedefaultbgm releaseall end -gUnknown_81A8DFD:: @ 81A8DFD +EventScript_PoisonWhiteOut:: @ 81A8DFD lockall textcolor 3 special ExecuteWhiteOut waitstate compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A8E11 + goto_if eq, EventScript_1A8E11 releaseall end EventScript_1A8E11:: @ 81A8E11 checkmoney 1, 0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1A8E2E + goto_if eq, EventScript_1A8E2E compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A8E3C + goto_if eq, EventScript_1A8E3C end EventScript_1A8E2E:: @ 81A8E2E @@ -4153,7 +4104,7 @@ EventScript_1A8E2E:: @ 81A8E2E end EventScript_1A8E3C:: @ 81A8E3C - special sub_8054C48 + special Special_OverworldWhiteOutGetMoneyLoss msgbox Text_1A6197 goto EventScript_1A8E4D end @@ -4174,17 +4125,12 @@ gStdScript_8:: @ 81A8E58 return EventScript_1A8E6F:: @ 81A8E6F - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A8EAC - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A8EB1 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A8EB6 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1A8EBB - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1A8EC0 + switch VAR_RESULT + case 1, EventScript_1A8EAC + case 2, EventScript_1A8EB1 + case 3, EventScript_1A8EB6 + case 4, EventScript_1A8EBB + case 5, EventScript_1A8EC0 end EventScript_1A8EAC:: @ 81A8EAC @@ -4209,127 +4155,100 @@ EventScript_1A8EC0:: @ 81A8EC0 EventScript_1A8EC5:: @ 81A8EC5 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if 4, EventScript_1A911E - compare_var_to_value VAR_0x4071, 4 - goto_if 4, EventScript_1A8F12 + 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 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A8FF9 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A9004 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A8FF9 + case 1, EventScript_1A9004 + case 2, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_1A8F12:: @ 81A8F12 multichoice 19, 5, 58, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A8FE3 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A8FF9 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A9004 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A8FE3 + case 1, EventScript_1A8FF9 + case 2, EventScript_1A9004 + case 3, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_1A8F54:: @ 81A8F54 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if 4, EventScript_1A911E - compare_var_to_value VAR_0x4071, 4 - goto_if 4, EventScript_1A8FA1 + 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 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A8FEE - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A9004 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A8FEE + case 1, EventScript_1A9004 + case 2, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_1A8FA1:: @ 81A8FA1 multichoice 19, 5, 59, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A8FE3 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A8FEE - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A9004 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A8FE3 + case 1, EventScript_1A8FEE + case 2, EventScript_1A9004 + case 3, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_1A8FE3:: @ 81A8FE3 - setvar VAR_0x8006, 0 + setvar VAR_0x8006, SEAGALLOP_VERMILION_CITY goto EventScript_1A909E end EventScript_1A8FEE:: @ 81A8FEE - setvar VAR_0x8006, 1 + setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND goto EventScript_1A909E end EventScript_1A8FF9:: @ 81A8FF9 - setvar VAR_0x8006, 2 + setvar VAR_0x8006, SEAGALLOP_TWO_ISLAND goto EventScript_1A909E end EventScript_1A9004:: @ 81A9004 - setvar VAR_0x8006, 3 + setvar VAR_0x8006, SEAGALLOP_THREE_ISLAND goto EventScript_1A909E end EventScript_1A900F:: @ 81A900F compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if 4, EventScript_1A911E - compare_var_to_value VAR_0x4071, 4 - goto_if 4, EventScript_1A905C + 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 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A8FEE - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A8FF9 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A8FEE + case 1, EventScript_1A8FF9 + case 2, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_1A905C:: @ 81A905C multichoice 19, 5, 60, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A8FE3 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A8FEE - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A8FF9 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A90F6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + switch VAR_RESULT + case 0, EventScript_1A8FE3 + case 1, EventScript_1A8FEE + case 2, EventScript_1A8FF9 + case 3, EventScript_1A90F6 + case 127, EventScript_1A90F6 end EventScript_1A909E:: @ 81A909E specialvar VAR_RESULT, sub_8147500 getnumberstring 0, VAR_RESULT - compare_var_to_value VAR_0x8004, 0 - goto_if 1, EventScript_1A90BE - compare_var_to_value VAR_0x8004, 0 - goto_if 5, EventScript_1A90CC + compare_var_to_value VAR_0x8004, SEAGALLOP_VERMILION_CITY + goto_if eq, EventScript_1A90BE + compare_var_to_value VAR_0x8004, SEAGALLOP_VERMILION_CITY + goto_if ne, EventScript_1A90CC end EventScript_1A90BE:: @ 81A90BE @@ -4347,7 +4266,7 @@ EventScript_1A90DA:: @ 81A90DA delay 20 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 fadescreen 1 special ScrSpecial_SeaGallopFerry @@ -4357,7 +4276,7 @@ EventScript_1A90DA:: @ 81A90DA EventScript_1A90F6:: @ 81A90F6 specialvar VAR_RESULT, sub_8147594 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9108 + goto_if eq, EventScript_1A9108 release end @@ -4378,21 +4297,14 @@ EventScript_1A911E:: @ 81A911E special sub_809D764 waitstate specialvar VAR_0x8006, sub_809D8C0 - copyvar VAR_0x8000, VAR_0x8006 - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1A91D5 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1A91E0 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1A91EB - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1A91F6 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1A9201 - compare_var_to_value VAR_0x8000, 254 - goto_if 1, EventScript_1A917F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + 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 end EventScript_1A917F:: @ 81A917F @@ -4400,58 +4312,52 @@ EventScript_1A917F:: @ 81A917F special sub_809D764 waitstate specialvar VAR_0x8006, sub_809D8C0 - copyvar VAR_0x8000, VAR_0x8006 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1A9201 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1A920C - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_1A9217 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_1A9222 - compare_var_to_value VAR_0x8000, 254 - goto_if 1, EventScript_1A911E - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1A90F6 + 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 end EventScript_1A91D5:: @ 81A91D5 - setvar VAR_0x8006, 0 + setvar VAR_0x8006, SEAGALLOP_VERMILION_CITY goto EventScript_1A909E end EventScript_1A91E0:: @ 81A91E0 - setvar VAR_0x8006, 1 + setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND goto EventScript_1A909E end EventScript_1A91EB:: @ 81A91EB - setvar VAR_0x8006, 2 + setvar VAR_0x8006, SEAGALLOP_TWO_ISLAND goto EventScript_1A909E end EventScript_1A91F6:: @ 81A91F6 - setvar VAR_0x8006, 3 + setvar VAR_0x8006, SEAGALLOP_THREE_ISLAND goto EventScript_1A909E end EventScript_1A9201:: @ 81A9201 - setvar VAR_0x8006, 4 + setvar VAR_0x8006, SEAGALLOP_FOUR_ISLAND goto EventScript_1A909E end EventScript_1A920C:: @ 81A920C - setvar VAR_0x8006, 5 + setvar VAR_0x8006, SEAGALLOP_FIVE_ISLAND goto EventScript_1A909E end EventScript_1A9217:: @ 81A9217 - setvar VAR_0x8006, 6 + setvar VAR_0x8006, SEAGALLOP_SIX_ISLAND goto EventScript_1A909E end EventScript_1A9222:: @ 81A9222 - setvar VAR_0x8006, 7 + setvar VAR_0x8006, SEAGALLOP_SEVEN_ISLAND goto EventScript_1A909E end @@ -4480,8 +4386,8 @@ EventScript_1A924B:: @ 81A924B return EventScript_1A925E:: @ 81A925E - checkflag FLAG_0x849 - goto_if 1, EventScript_1A77A9 + checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS + goto_if TRUE, EventScript_1A77A9 setweather 11 doweather return @@ -4618,3044 +4524,3044 @@ gUnknown_81A93C0:: @ 81A93C0 .braille "FOR YOU.$" Route3_EventScript_1A93C9:: @ 81A93C9 - trainerbattle 0, 89, 0, Text_183560, Text_1835A0 + trainerbattle 0, TRAINER_YOUNGSTER_BEN, 0, Text_183560, Text_1835A0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A93F0 + goto_if eq, EventScript_1A93F0 msgbox Text_1835B4, 6 end EventScript_1A93F0:: @ 81A93F0 - trainerbattle 5, 89, 0, Text_1C149D, Text_1835A0 + trainerbattle 5, TRAINER_YOUNGSTER_BEN, 0, Text_1C149D, Text_1835A0 msgbox Text_1835B4, 6 end Route3_EventScript_1A9407:: @ 81A9407 - trainerbattle 0, 90, 0, Text_183786, Text_1837BD + trainerbattle 0, TRAINER_YOUNGSTER_CALVIN, 0, Text_183786, Text_1837BD specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A942E + goto_if eq, EventScript_1A942E msgbox Text_1837CF, 6 end EventScript_1A942E:: @ 81A942E - trainerbattle 5, 90, 0, Text_1C1588, Text_1837BD + trainerbattle 5, TRAINER_YOUNGSTER_CALVIN, 0, Text_1C1588, Text_1837BD msgbox Text_1837CF, 6 end Route3_EventScript_1A9445:: @ 81A9445 - trainerbattle 0, 105, 0, Text_1834E6, Text_183509 + trainerbattle 0, TRAINER_BUG_CATCHER_COLTON, 0, Text_1834E6, Text_183509 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A946C + goto_if eq, EventScript_1A946C msgbox Text_18351C, 6 end EventScript_1A946C:: @ 81A946C - trainerbattle 5, 105, 0, Text_1C147A, Text_183509 + trainerbattle 5, TRAINER_BUG_CATCHER_COLTON, 0, Text_1C147A, Text_183509 msgbox Text_18351C, 6 end Route3_EventScript_1A9483:: @ 81A9483 - trainerbattle 0, 106, 0, Text_183682, Text_1836B3 + trainerbattle 0, TRAINER_BUG_CATCHER_GREG, 0, Text_183682, Text_1836B3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A94AA + goto_if eq, EventScript_1A94AA msgbox Text_1836D9, 6 end EventScript_1A94AA:: @ 81A94AA - trainerbattle 5, 106, 0, Text_1C1521, Text_1836B3 + trainerbattle 5, TRAINER_BUG_CATCHER_GREG, 0, Text_1C1521, Text_1836B3 msgbox Text_1836D9, 6 end Route3_EventScript_1A94C1:: @ 81A94C1 - trainerbattle 0, 107, 0, Text_183807, Text_183837 + trainerbattle 0, TRAINER_BUG_CATCHER_JAMES, 0, Text_183807, Text_183837 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A94E8 + goto_if eq, EventScript_1A94E8 msgbox Text_183849, 6 end EventScript_1A94E8:: @ 81A94E8 - trainerbattle 5, 107, 0, Text_1C15C5, Text_183837 + trainerbattle 5, TRAINER_BUG_CATCHER_JAMES, 0, Text_1C15C5, Text_183837 msgbox Text_183849, 6 end Route3_EventScript_1A94FF:: @ 81A94FF - trainerbattle 0, 116, 0, Text_183616, Text_18363F + trainerbattle 0, TRAINER_LASS_JANICE, 0, Text_183616, Text_18363F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9526 + goto_if eq, EventScript_1A9526 msgbox Text_18364C, 6 end EventScript_1A9526:: @ 81A9526 - trainerbattle 5, 116, 0, Text_1C14F3, Text_18363F + trainerbattle 5, TRAINER_LASS_JANICE, 0, Text_1C14F3, Text_18363F msgbox Text_18364C, 6 end Route3_EventScript_1A953D:: @ 81A953D - trainerbattle 0, 117, 0, Text_18371B, Text_183746 + trainerbattle 0, TRAINER_LASS_SALLY, 0, Text_18371B, Text_183746 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9564 + goto_if eq, EventScript_1A9564 msgbox Text_18374F, 6 end EventScript_1A9564:: @ 81A9564 - trainerbattle 5, 117, 0, Text_1C155D, Text_183746 + trainerbattle 5, TRAINER_LASS_SALLY, 0, Text_1C155D, Text_183746 msgbox Text_18374F, 6 end Route3_EventScript_1A957B:: @ 81A957B - trainerbattle 0, 118, 0, Text_18387A, Text_183891 + trainerbattle 0, TRAINER_LASS_ROBIN, 0, Text_18387A, Text_183891 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A95A2 + goto_if eq, EventScript_1A95A2 msgbox Text_18389C, 6 end EventScript_1A95A2:: @ 81A95A2 - trainerbattle 5, 118, 0, Text_1C15F9, Text_183891 + trainerbattle 5, TRAINER_LASS_ROBIN, 0, Text_1C15F9, Text_183891 msgbox Text_18389C, 6 end Route4_EventScript_1A95B9:: @ 81A95B9 - trainerbattle 0, 119, 0, Text_183906, Text_183938 + trainerbattle 0, TRAINER_LASS_CRISSY, 0, Text_183906, Text_183938 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A95E0 + goto_if eq, EventScript_1A95E0 msgbox Text_183957, 6 end EventScript_1A95E0:: @ 81A95E0 - trainerbattle 5, 119, 0, Text_1C160F, Text_183938 + trainerbattle 5, TRAINER_LASS_CRISSY, 0, Text_1C160F, Text_183938 msgbox Text_183957, 6 end Route24_EventScript_1A95F7:: @ 81A95F7 - trainerbattle 0, 92, 0, Text_188F76, Text_188F95 + trainerbattle 0, TRAINER_YOUNGSTER_TIMMY, 0, Text_188F76, Text_188F95 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A961E + goto_if eq, EventScript_1A961E msgbox Text_188FA7, 6 end EventScript_1A961E:: @ 81A961E - trainerbattle 5, 92, 0, Text_1C3657, Text_188F95 + trainerbattle 5, TRAINER_YOUNGSTER_TIMMY, 0, Text_1C3657, Text_188F95 msgbox Text_188FA7, 6 end Route24_EventScript_1A9635:: @ 81A9635 - trainerbattle 0, 110, 0, Text_18901B, Text_18908C + trainerbattle 0, TRAINER_BUG_CATCHER_CALE, 0, Text_18901B, Text_18908C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A965C + goto_if eq, EventScript_1A965C msgbox Text_18909E, 6 end EventScript_1A965C:: @ 81A965C - trainerbattle 5, 110, 0, Text_1C36DA, Text_18908C + trainerbattle 5, TRAINER_BUG_CATCHER_CALE, 0, Text_1C36DA, Text_18908C msgbox Text_18909E, 6 end Route24_EventScript_1A9673:: @ 81A9673 - trainerbattle 0, 122, 0, Text_188F2C, Text_188F46 + trainerbattle 0, TRAINER_LASS_RELI, 0, Text_188F2C, Text_188F46 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A969A + goto_if eq, EventScript_1A969A msgbox Text_188F53, 6 end EventScript_1A969A:: @ 81A969A - trainerbattle 5, 122, 0, Text_1C3624, Text_188F46 + trainerbattle 5, TRAINER_LASS_RELI, 0, Text_1C3624, Text_188F46 msgbox Text_188F53, 6 end Route24_EventScript_1A96B1:: @ 81A96B1 - trainerbattle 0, 123, 0, Text_188FC9, Text_188FE7 + trainerbattle 0, TRAINER_LASS_ALI, 0, Text_188FC9, Text_188FE7 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A96D8 + goto_if eq, EventScript_1A96D8 msgbox Text_188FF9, 6 end EventScript_1A96D8:: @ 81A96D8 - trainerbattle 5, 123, 0, Text_1C3685, Text_188FE7 + trainerbattle 5, TRAINER_LASS_ALI, 0, Text_1C3685, Text_188FE7 msgbox Text_188FF9, 6 end Route24_EventScript_1A96EF:: @ 81A96EF - trainerbattle 0, 143, 0, Text_188E74, Text_188E94 + trainerbattle 0, TRAINER_CAMPER_SHANE, 0, Text_188E74, Text_188E94 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9716 + goto_if eq, EventScript_1A9716 msgbox Text_188EA3, 6 end EventScript_1A9716:: @ 81A9716 - trainerbattle 5, 143, 0, Text_1C35EE, Text_188E94 + trainerbattle 5, TRAINER_CAMPER_SHANE, 0, Text_1C35EE, Text_188E94 msgbox Text_188EA3, 6 end Route24_EventScript_1A972D:: @ 81A972D - trainerbattle 0, 144, 0, Text_188ED9, Text_188EFA + trainerbattle 0, TRAINER_CAMPER_ETHAN, 0, Text_188ED9, Text_188EFA specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9754 + goto_if eq, EventScript_1A9754 msgbox Text_188F0A, 6 end EventScript_1A9754:: @ 81A9754 - trainerbattle 5, 144, 0, Text_1C360E, Text_188EFA + trainerbattle 5, TRAINER_CAMPER_ETHAN, 0, Text_1C360E, Text_188EFA msgbox Text_188F0A, 6 end Route25_EventScript_1A976B:: @ 81A976B - trainerbattle 0, 93, 0, Text_1890C0, Text_1890E6 + trainerbattle 0, TRAINER_YOUNGSTER_JOEY, 0, Text_1890C0, Text_1890E6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9792 + goto_if eq, EventScript_1A9792 msgbox Text_1890F5, 6 end EventScript_1A9792:: @ 81A9792 - trainerbattle 5, 93, 0, Text_1C33E7, Text_1890E6 + trainerbattle 5, TRAINER_YOUNGSTER_JOEY, 0, Text_1C33E7, Text_1890E6 msgbox Text_1890F5, 6 end Route25_EventScript_1A97A9:: @ 81A97A9 - trainerbattle 0, 94, 0, Text_189165, Text_1891A6 + trainerbattle 0, TRAINER_YOUNGSTER_DAN, 0, Text_189165, Text_1891A6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A97D0 + goto_if eq, EventScript_1A97D0 msgbox Text_1891B3, 6 end EventScript_1A97D0:: @ 81A97D0 - trainerbattle 5, 94, 0, Text_1C3404, Text_1891A6 + trainerbattle 5, TRAINER_YOUNGSTER_DAN, 0, Text_1C3404, Text_1891A6 msgbox Text_1891B3, 6 end Route25_EventScript_1A97E7:: @ 81A97E7 - trainerbattle 0, 95, 0, Text_1892A9, Text_1892D9 + trainerbattle 0, TRAINER_YOUNGSTER_CHAD, 0, Text_1892A9, Text_1892D9 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A980E + goto_if eq, EventScript_1A980E msgbox Text_1892EF, 6 end EventScript_1A980E:: @ 81A980E - trainerbattle 5, 95, 0, Text_1C34D4, Text_1892D9 + trainerbattle 5, TRAINER_YOUNGSTER_CHAD, 0, Text_1C34D4, Text_1892D9 msgbox Text_1892EF, 6 end Route25_EventScript_1A9825:: @ 81A9825 - trainerbattle 0, 153, 0, Text_189247, Text_189261 + trainerbattle 0, TRAINER_PICNICKER_KELSEY, 0, Text_189247, Text_189261 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A984C + goto_if eq, EventScript_1A984C msgbox Text_189281, 6 end EventScript_1A984C:: @ 81A984C - trainerbattle 5, 153, 0, Text_1C349C, Text_189261 + trainerbattle 5, TRAINER_PICNICKER_KELSEY, 0, Text_1C349C, Text_189261 msgbox Text_189281, 6 end Route25_EventScript_1A9863:: @ 81A9863 - trainerbattle 0, 125, 0, Text_189333, Text_189364 + trainerbattle 0, TRAINER_LASS_HALEY, 0, Text_189333, Text_189364 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A988A + goto_if eq, EventScript_1A988A msgbox Text_189378, 6 end EventScript_1A988A:: @ 81A988A - trainerbattle 5, 125, 0, Text_1C350A, Text_189364 + trainerbattle 5, TRAINER_LASS_HALEY, 0, Text_1C350A, Text_189364 msgbox Text_189378, 6 end Route25_EventScript_1A98A1:: @ 81A98A1 - trainerbattle 0, 182, 0, Text_1893A7, Text_1893EA + trainerbattle 0, TRAINER_HIKER_FRANKLIN, 0, Text_1893A7, Text_1893EA specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A98C8 + goto_if eq, EventScript_1A98C8 msgbox Text_1893FB, 6 end EventScript_1A98C8:: @ 81A98C8 - trainerbattle 5, 182, 0, Text_1C353B, Text_1893EA + trainerbattle 5, TRAINER_HIKER_FRANKLIN, 0, Text_1C353B, Text_1893EA msgbox Text_1893FB, 6 end Route25_EventScript_1A98DF:: @ 81A98DF - trainerbattle 0, 183, 0, Text_189423, Text_189459 + trainerbattle 0, TRAINER_HIKER_NOB, 0, Text_189423, Text_189459 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9906 + goto_if eq, EventScript_1A9906 msgbox Text_18947E, 6 end EventScript_1A9906:: @ 81A9906 - trainerbattle 5, 183, 0, Text_1C357E, Text_189459 + trainerbattle 5, TRAINER_HIKER_NOB, 0, Text_1C357E, Text_189459 msgbox Text_18947E, 6 end Route25_EventScript_1A991D:: @ 81A991D - trainerbattle 0, 184, 0, Text_1894DE, Text_18950A + trainerbattle 0, TRAINER_HIKER_WAYNE, 0, Text_1894DE, Text_18950A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9944 + goto_if eq, EventScript_1A9944 msgbox Text_18951C, 6 end EventScript_1A9944:: @ 81A9944 - trainerbattle 5, 184, 0, Text_1C35BC, Text_18950A + trainerbattle 5, TRAINER_HIKER_WAYNE, 0, Text_1C35BC, Text_18950A msgbox Text_18951C, 6 end Route25_EventScript_1A995B:: @ 81A995B - trainerbattle 0, 471, 0, Text_1891EB, Text_189212 + trainerbattle 0, TRAINER_CAMPER_FLINT, 0, Text_1891EB, Text_189212 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9982 + goto_if eq, EventScript_1A9982 msgbox Text_18921D, 6 end EventScript_1A9982:: @ 81A9982 - trainerbattle 5, 471, 0, Text_1C3445, Text_189212 + trainerbattle 5, TRAINER_CAMPER_FLINT, 0, Text_1C3445, Text_189212 msgbox Text_18921D, 6 end Route6_EventScript_1A9999:: @ 81A9999 - trainerbattle 0, 111, 0, Text_183E9F, Text_183EC0 + trainerbattle 0, TRAINER_BUG_CATCHER_KEIGO, 0, Text_183E9F, Text_183EC0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A99C0 + goto_if eq, EventScript_1A99C0 msgbox Text_183ED4, 6 end EventScript_1A99C0:: @ 81A99C0 - trainerbattle 5, 111, 0, Text_1C16E2, Text_183EC0 + trainerbattle 5, TRAINER_BUG_CATCHER_KEIGO, 0, Text_1C16E2, Text_183EC0 msgbox Text_183ED4, 6 end Route6_EventScript_1A99D7:: @ 81A99D7 - trainerbattle 0, 112, 0, Text_183FF0, Text_18401A + trainerbattle 0, TRAINER_BUG_CATCHER_ELIJAH, 0, Text_183FF0, Text_18401A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A99FE + goto_if eq, EventScript_1A99FE msgbox Text_18402B, 6 end EventScript_1A99FE:: @ 81A99FE - trainerbattle 5, 112, 0, Text_1C176B, Text_18401A + trainerbattle 5, TRAINER_BUG_CATCHER_ELIJAH, 0, Text_1C176B, Text_18401A msgbox Text_18402B, 6 end Route6_EventScript_1A9A15:: @ 81A9A15 - trainerbattle 0, 145, 0, Text_183E04, Text_183E2A + trainerbattle 0, TRAINER_CAMPER_RICKY, 0, Text_183E04, Text_183E2A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9A3C + goto_if eq, EventScript_1A9A3C msgbox Text_183E3C, 6 end EventScript_1A9A3C:: @ 81A9A3C - trainerbattle 5, 145, 0, Text_1C163C, Text_183E2A + trainerbattle 5, TRAINER_CAMPER_RICKY, 0, Text_1C163C, Text_183E2A msgbox Text_183E3C, 6 end Route6_EventScript_1A9A53:: @ 81A9A53 - trainerbattle 0, 146, 0, Text_183F07, Text_183F24 + trainerbattle 0, TRAINER_CAMPER_JEFF, 0, Text_183F07, Text_183F24 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9A7A + goto_if eq, EventScript_1A9A7A msgbox Text_183F51, 6 end EventScript_1A9A7A:: @ 81A9A7A - trainerbattle 5, 146, 0, Text_1C1723, Text_183F24 + trainerbattle 5, TRAINER_CAMPER_JEFF, 0, Text_1C1723, Text_183F24 msgbox Text_183F51, 6 end Route6_EventScript_1A9A91:: @ 81A9A91 - trainerbattle 0, 151, 0, Text_183E4E, Text_183E79 + trainerbattle 0, TRAINER_PICNICKER_NANCY, 0, Text_183E4E, Text_183E79 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9AB8 + goto_if eq, EventScript_1A9AB8 msgbox Text_183E8D, 6 end EventScript_1A9AB8:: @ 81A9AB8 - trainerbattle 5, 151, 0, Text_1C166D, Text_183E79 + trainerbattle 5, TRAINER_PICNICKER_NANCY, 0, Text_1C166D, Text_183E79 msgbox Text_183E8D, 6 end Route6_EventScript_1A9ACF:: @ 81A9ACF - trainerbattle 0, 152, 0, Text_183F90, Text_183FAB + trainerbattle 0, TRAINER_PICNICKER_ISABELLE, 0, Text_183F90, Text_183FAB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9AF6 + goto_if eq, EventScript_1A9AF6 msgbox Text_183FC4, 6 end EventScript_1A9AF6:: @ 81A9AF6 - trainerbattle 5, 152, 0, Text_1C1746, Text_183FAB + trainerbattle 5, TRAINER_PICNICKER_ISABELLE, 0, Text_1C1746, Text_183FAB msgbox Text_183FC4, 6 end Route11_EventScript_1A9B0D:: @ 81A9B0D - trainerbattle 0, 97, 0, Text_184FBD, Text_184FD8 + trainerbattle 0, TRAINER_YOUNGSTER_EDDIE, 0, Text_184FBD, Text_184FD8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9B34 + goto_if eq, EventScript_1A9B34 msgbox Text_184FEF, 6 end EventScript_1A9B34:: @ 81A9B34 - trainerbattle 5, 97, 0, Text_1C1DB5, Text_184FD8 + trainerbattle 5, TRAINER_YOUNGSTER_EDDIE, 0, Text_1C1DB5, Text_184FD8 msgbox Text_184FEF, 6 end Route11_EventScript_1A9B4B:: @ 81A9B4B - trainerbattle 0, 98, 0, Text_18506A, Text_18509B + trainerbattle 0, TRAINER_YOUNGSTER_DILLON, 0, Text_18506A, Text_18509B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9B72 + goto_if eq, EventScript_1A9B72 msgbox Text_1850CF, 6 end EventScript_1A9B72:: @ 81A9B72 - trainerbattle 5, 98, 0, Text_1C1E1F, Text_18509B + trainerbattle 5, TRAINER_YOUNGSTER_DILLON, 0, Text_1C1E1F, Text_18509B msgbox Text_1850CF, 6 end Route11_EventScript_1A9B89:: @ 81A9B89 - trainerbattle 0, 99, 0, Text_18517B, Text_1851AC + trainerbattle 0, TRAINER_YOUNGSTER_YASU, 0, Text_18517B, Text_1851AC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9BB0 + goto_if eq, EventScript_1A9BB0 msgbox Text_1851D2, 6 end EventScript_1A9BB0:: @ 81A9BB0 - trainerbattle 5, 99, 0, Text_1C1EE2, Text_1851AC + trainerbattle 5, TRAINER_YOUNGSTER_YASU, 0, Text_1C1EE2, Text_1851AC msgbox Text_1851D2, 6 end Route11_EventScript_1A9BC7:: @ 81A9BC7 - trainerbattle 0, 100, 0, Text_185285, Text_1852C1 + trainerbattle 0, TRAINER_YOUNGSTER_DAVE, 0, Text_185285, Text_1852C1 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9BEE + goto_if eq, EventScript_1A9BEE msgbox Text_1852E3, 6 end EventScript_1A9BEE:: @ 81A9BEE - trainerbattle 5, 100, 0, Text_1C1F40, Text_1852C1 + trainerbattle 5, TRAINER_YOUNGSTER_DAVE, 0, Text_1C1F40, Text_1852C1 msgbox Text_1852E3, 6 end Route11_EventScript_1A9C05:: @ 81A9C05 - trainerbattle 0, 221, 0, Text_185011, Text_185037 + trainerbattle 0, TRAINER_ENGINEER_BRAXTON, 0, Text_185011, Text_185037 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9C2C + goto_if eq, EventScript_1A9C2C msgbox Text_18504A, 6 end EventScript_1A9C2C:: @ 81A9C2C - trainerbattle 5, 221, 0, Text_1C1DE1, Text_185037 + trainerbattle 5, TRAINER_ENGINEER_BRAXTON, 0, Text_1C1DE1, Text_185037 msgbox Text_18504A, 6 end Route11_EventScript_1A9C43:: @ 81A9C43 - trainerbattle 0, 222, 0, Text_185236, Text_185250 + trainerbattle 0, TRAINER_ENGINEER_BERNIE, 0, Text_185236, Text_185250 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9C6A + goto_if eq, EventScript_1A9C6A msgbox Text_185266, 6 end EventScript_1A9C6A:: @ 81A9C6A - trainerbattle 5, 222, 0, Text_1C1F1D, Text_185250 + trainerbattle 5, TRAINER_ENGINEER_BERNIE, 0, Text_1C1F1D, Text_185250 msgbox Text_185266, 6 end Route11_EventScript_1A9C81:: @ 81A9C81 - trainerbattle 0, 258, 0, Text_184F01, Text_184F15 + trainerbattle 0, TRAINER_GAMER_HUGO, 0, Text_184F01, Text_184F15 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9CA8 + goto_if eq, EventScript_1A9CA8 msgbox Text_184F2E, 6 end EventScript_1A9CA8:: @ 81A9CA8 - trainerbattle 5, 258, 0, Text_1C1D50, Text_184F15 + trainerbattle 5, TRAINER_GAMER_HUGO, 0, Text_1C1D50, Text_184F15 msgbox Text_184F2E, 6 end Route11_EventScript_1A9CBF:: @ 81A9CBF - trainerbattle 0, 259, 0, Text_184F5D, Text_184F7E + trainerbattle 0, TRAINER_GAMER_JASPER, 0, Text_184F5D, Text_184F7E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9CE6 + goto_if eq, EventScript_1A9CE6 msgbox Text_184F8E, 6 end EventScript_1A9CE6:: @ 81A9CE6 - trainerbattle 5, 259, 0, Text_1C1D79, Text_184F7E + trainerbattle 5, TRAINER_GAMER_JASPER, 0, Text_1C1D79, Text_184F7E msgbox Text_184F8E, 6 end Route11_EventScript_1A9CFD:: @ 81A9CFD - trainerbattle 0, 260, 0, Text_1850E9, Text_185105 + trainerbattle 0, TRAINER_GAMER_DIRK, 0, Text_1850E9, Text_185105 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9D24 + goto_if eq, EventScript_1A9D24 msgbox Text_185114, 6 end EventScript_1A9D24:: @ 81A9D24 - trainerbattle 5, 260, 0, Text_1C1E57, Text_185105 + trainerbattle 5, TRAINER_GAMER_DIRK, 0, Text_1C1E57, Text_185105 msgbox Text_185114, 6 end Route11_EventScript_1A9D3B:: @ 81A9D3B - trainerbattle 0, 261, 0, Text_185135, Text_18514E + trainerbattle 0, TRAINER_GAMER_DARIAN, 0, Text_185135, Text_18514E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9D62 + goto_if eq, EventScript_1A9D62 msgbox Text_185161, 6 end EventScript_1A9D62:: @ 81A9D62 - trainerbattle 5, 261, 0, Text_1C1E9F, Text_18514E + trainerbattle 5, TRAINER_GAMER_DARIAN, 0, Text_1C1E9F, Text_18514E msgbox Text_185161, 6 end Route9_EventScript_1A9D79:: @ 81A9D79 - trainerbattle 0, 114, 0, Text_184A2F, Text_184A6A + trainerbattle 0, TRAINER_BUG_CATCHER_BRENT, 0, Text_184A2F, Text_184A6A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9DA0 + goto_if eq, EventScript_1A9DA0 msgbox Text_184A8C, 6 end EventScript_1A9DA0:: @ 81A9DA0 - trainerbattle 5, 114, 0, Text_1C1B83, Text_184A6A + trainerbattle 5, TRAINER_BUG_CATCHER_BRENT, 0, Text_1C1B83, Text_184A6A msgbox Text_184A8C, 6 end Route9_EventScript_1A9DB7:: @ 81A9DB7 - trainerbattle 0, 115, 0, Text_184B18, Text_184B32 + trainerbattle 0, TRAINER_BUG_CATCHER_CONNER, 0, Text_184B18, Text_184B32 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9DDE + goto_if eq, EventScript_1A9DDE msgbox Text_184B3B, 6 end EventScript_1A9DDE:: @ 81A9DDE - trainerbattle 5, 115, 0, Text_1C1BDC, Text_184B32 + trainerbattle 5, TRAINER_BUG_CATCHER_CONNER, 0, Text_1C1BDC, Text_184B32 msgbox Text_184B3B, 6 end Route9_EventScript_1A9DF5:: @ 81A9DF5 - trainerbattle 0, 148, 0, Text_184844, Text_18487E + trainerbattle 0, TRAINER_CAMPER_CHRIS, 0, Text_184844, Text_18487E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9E1C + goto_if eq, EventScript_1A9E1C msgbox Text_184890, 6 end EventScript_1A9E1C:: @ 81A9E1C - trainerbattle 5, 148, 0, Text_1C1A5D, Text_18487E + trainerbattle 5, TRAINER_CAMPER_CHRIS, 0, Text_1C1A5D, Text_18487E msgbox Text_184890, 6 end Route9_EventScript_1A9E33:: @ 81A9E33 - trainerbattle 0, 149, 0, Text_18489E, Text_1848CC + trainerbattle 0, TRAINER_CAMPER_DREW, 0, Text_18489E, Text_1848CC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9E5A + goto_if eq, EventScript_1A9E5A msgbox Text_1848DE, 6 end EventScript_1A9E5A:: @ 81A9E5A - trainerbattle 5, 149, 0, Text_1C1A9B, Text_1848CC + trainerbattle 5, TRAINER_CAMPER_DREW, 0, Text_1C1A9B, Text_1848CC msgbox Text_1848DE, 6 end Route9_EventScript_1A9E71:: @ 81A9E71 - trainerbattle 0, 154, 0, Text_1847B7, Text_1847DF + trainerbattle 0, TRAINER_PICNICKER_ALICIA, 0, Text_1847B7, Text_1847DF specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9E98 + goto_if eq, EventScript_1A9E98 msgbox Text_1847F0, 6 end EventScript_1A9E98:: @ 81A9E98 - trainerbattle 5, 154, 0, Text_1C1A2E, Text_1847DF + trainerbattle 5, TRAINER_PICNICKER_ALICIA, 0, Text_1C1A2E, Text_1847DF msgbox Text_1847F0, 6 end Route9_EventScript_1A9EAF:: @ 81A9EAF - trainerbattle 0, 155, 0, Text_1848FF, Text_18491C + trainerbattle 0, TRAINER_PICNICKER_CAITLIN, 0, Text_1848FF, Text_18491C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9ED6 + goto_if eq, EventScript_1A9ED6 msgbox Text_184931, 6 end EventScript_1A9ED6:: @ 81A9ED6 - trainerbattle 5, 155, 0, Text_1C1AFB, Text_18491C + trainerbattle 5, TRAINER_PICNICKER_CAITLIN, 0, Text_1C1AFB, Text_18491C msgbox Text_184931, 6 end Route9_EventScript_1A9EED:: @ 81A9EED - trainerbattle 0, 185, 0, Text_184ABE, Text_184AD5 + trainerbattle 0, TRAINER_HIKER_ALAN, 0, Text_184ABE, Text_184AD5 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9F14 + goto_if eq, EventScript_1A9F14 msgbox Text_184AF1, 6 end EventScript_1A9F14:: @ 81A9F14 - trainerbattle 5, 185, 0, Text_1C1BBE, Text_184AD5 + trainerbattle 5, TRAINER_HIKER_ALAN, 0, Text_1C1BBE, Text_184AD5 msgbox Text_184AF1, 6 end Route9_EventScript_1A9F2B:: @ 81A9F2B - trainerbattle 0, 186, 0, Text_1849DF, Text_184A04 + trainerbattle 0, TRAINER_HIKER_BRICE, 0, Text_1849DF, Text_184A04 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9F52 + goto_if eq, EventScript_1A9F52 msgbox Text_184A11, 6 end EventScript_1A9F52:: @ 81A9F52 - trainerbattle 5, 186, 0, Text_1C1B5E, Text_184A04 + trainerbattle 5, TRAINER_HIKER_BRICE, 0, Text_1C1B5E, Text_184A04 msgbox Text_184A11, 6 end Route9_EventScript_1A9F69:: @ 81A9F69 - trainerbattle 0, 465, 0, Text_18495E, Text_18497F + trainerbattle 0, TRAINER_HIKER_JEREMY, 0, Text_18495E, Text_18497F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9F90 + goto_if eq, EventScript_1A9F90 msgbox Text_1849B0, 6 end EventScript_1A9F90:: @ 81A9F90 - trainerbattle 5, 465, 0, Text_1C1B37, Text_18497F + trainerbattle 5, TRAINER_HIKER_JEREMY, 0, Text_1C1B37, Text_18497F msgbox Text_1849B0, 6 end Route10_EventScript_1A9FA7:: @ 81A9FA7 - trainerbattle 0, 156, 0, Text_184CF1, Text_184D31 + trainerbattle 0, TRAINER_PICNICKER_HEIDI, 0, Text_184CF1, Text_184D31 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1A9FCE + goto_if eq, EventScript_1A9FCE msgbox Text_184D4D, 6 end EventScript_1A9FCE:: @ 81A9FCE - trainerbattle 5, 156, 0, Text_1C1C9A, Text_184D31 + trainerbattle 5, TRAINER_PICNICKER_HEIDI, 0, Text_1C1C9A, Text_184D31 msgbox Text_184D4D, 6 end Route10_EventScript_1A9FE5:: @ 81A9FE5 - trainerbattle 0, 157, 0, Text_184E04, Text_184E3B + trainerbattle 0, TRAINER_PICNICKER_CAROL, 0, Text_184E04, Text_184E3B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA00C + goto_if eq, EventScript_1AA00C msgbox Text_184E5E, 6 end EventScript_1AA00C:: @ 81AA00C - trainerbattle 5, 157, 0, Text_1C1D14, Text_184E3B + trainerbattle 5, TRAINER_PICNICKER_CAROL, 0, Text_1C1D14, Text_184E3B msgbox Text_184E5E, 6 end Route10_EventScript_1AA023:: @ 81AA023 - trainerbattle 0, 162, 0, Text_184B8A, Text_184BE5 + trainerbattle 0, TRAINER_POKEMANIAC_MARK, 0, Text_184B8A, Text_184BE5 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA04A + goto_if eq, EventScript_1AA04A msgbox Text_184BFB, 6 end EventScript_1AA04A:: @ 81AA04A - trainerbattle 5, 162, 0, Text_1C1BFA, Text_184BE5 + trainerbattle 5, TRAINER_POKEMANIAC_MARK, 0, Text_1C1BFA, Text_184BE5 msgbox Text_184BFB, 6 end Route10_EventScript_1AA061:: @ 81AA061 - trainerbattle 0, 163, 0, Text_184C86, Text_184CA7 + trainerbattle 0, TRAINER_POKEMANIAC_HERMAN, 0, Text_184C86, Text_184CA7 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA088 + goto_if eq, EventScript_1AA088 msgbox Text_184CBB, 6 end EventScript_1AA088:: @ 81AA088 - trainerbattle 5, 163, 0, Text_1C1C76, Text_184CA7 + trainerbattle 5, TRAINER_POKEMANIAC_HERMAN, 0, Text_1C1C76, Text_184CA7 msgbox Text_184CBB, 6 end Route10_EventScript_1AA09F:: @ 81AA09F - trainerbattle 0, 187, 0, Text_184C1D, Text_184C2D + trainerbattle 0, TRAINER_HIKER_CLARK, 0, Text_184C1D, Text_184C2D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA0C6 + goto_if eq, EventScript_1AA0C6 msgbox Text_184C60, 6 end EventScript_1AA0C6:: @ 81AA0C6 - trainerbattle 5, 187, 0, Text_1C1C4F, Text_184C2D + trainerbattle 5, TRAINER_HIKER_CLARK, 0, Text_1C1C4F, Text_184C2D msgbox Text_184C60, 6 end Route10_EventScript_1AA0DD:: @ 81AA0DD - trainerbattle 0, 188, 0, Text_184DAA, Text_184DCE + trainerbattle 0, TRAINER_HIKER_TRENT, 0, Text_184DAA, Text_184DCE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA104 + goto_if eq, EventScript_1AA104 msgbox Text_184DE4, 6 end EventScript_1AA104:: @ 81AA104 - trainerbattle 5, 188, 0, Text_1C1CD3, Text_184DCE + trainerbattle 5, TRAINER_HIKER_TRENT, 0, Text_1C1CD3, Text_184DCE msgbox Text_184DE4, 6 end Route8_EventScript_1AA11B:: @ 81AA11B - trainerbattle 0, 128, 0, Text_1841ED, Text_184210 + trainerbattle 0, TRAINER_LASS_PAIGE, 0, Text_1841ED, Text_184210 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA142 + goto_if eq, EventScript_1AA142 msgbox Text_18421B, 6 end EventScript_1AA142:: @ 81AA142 - trainerbattle 5, 128, 0, Text_1C1834, Text_184210 + trainerbattle 5, TRAINER_LASS_PAIGE, 0, Text_1C1834, Text_184210 msgbox Text_18421B, 6 end Route8_EventScript_1AA159:: @ 81AA159 - trainerbattle 0, 129, 0, Text_184321, Text_184346 + trainerbattle 0, TRAINER_LASS_ANDREA, 0, Text_184321, Text_184346 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA180 + goto_if eq, EventScript_1AA180 msgbox Text_184350, 6 end EventScript_1AA180:: @ 81AA180 - trainerbattle 5, 129, 0, Text_1C18AA, Text_184346 + trainerbattle 5, TRAINER_LASS_ANDREA, 0, Text_1C18AA, Text_184346 msgbox Text_184350, 6 end Route8_EventScript_1AA197:: @ 81AA197 - trainerbattle 0, 130, 0, Text_18437A, Text_1843A6 + trainerbattle 0, TRAINER_LASS_MEGAN, 0, Text_18437A, Text_1843A6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA1BE + goto_if eq, EventScript_1AA1BE msgbox Text_1843D2, 6 end EventScript_1AA1BE:: @ 81AA1BE - trainerbattle 5, 130, 0, Text_1C18DC, Text_1843A6 + trainerbattle 5, TRAINER_LASS_MEGAN, 0, Text_1C18DC, Text_1843A6 msgbox Text_1843D2, 6 end Route8_EventScript_1AA1D5:: @ 81AA1D5 - trainerbattle 0, 131, 0, Text_1844AC, Text_1844D6 + trainerbattle 0, TRAINER_LASS_JULIA, 0, Text_1844AC, Text_1844D6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA1FC + goto_if eq, EventScript_1AA1FC msgbox Text_1844FD, 6 end EventScript_1AA1FC:: @ 81AA1FC - trainerbattle 5, 131, 0, Text_1C1955, Text_1844D6 + trainerbattle 5, TRAINER_LASS_JULIA, 0, Text_1C1955, Text_1844D6 msgbox Text_1844FD, 6 end Route8_EventScript_1AA213:: @ 81AA213 - trainerbattle 0, 171, 0, Text_1840C5, Text_184100 + trainerbattle 0, TRAINER_SUPER_NERD_AIDAN, 0, Text_1840C5, Text_184100 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA23A + goto_if eq, EventScript_1AA23A msgbox Text_18410E, 6 end EventScript_1AA23A:: @ 81AA23A - trainerbattle 5, 171, 0, Text_1C1793, Text_184100 + trainerbattle 5, TRAINER_SUPER_NERD_AIDAN, 0, Text_1C1793, Text_184100 msgbox Text_18410E, 6 end Route8_EventScript_1AA251:: @ 81AA251 - trainerbattle 0, 172, 0, Text_18417C, Text_1841B6 + trainerbattle 0, TRAINER_SUPER_NERD_GLENN, 0, Text_18417C, Text_1841B6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA278 + goto_if eq, EventScript_1AA278 msgbox Text_1841C8, 6 end EventScript_1AA278:: @ 81AA278 - trainerbattle 5, 172, 0, Text_1C17F1, Text_1841B6 + trainerbattle 5, TRAINER_SUPER_NERD_GLENN, 0, Text_1C17F1, Text_1841B6 msgbox Text_1841C8, 6 end Route8_EventScript_1AA28F:: @ 81AA28F - trainerbattle 0, 173, 0, Text_184257, Text_18427A + trainerbattle 0, TRAINER_SUPER_NERD_LESLIE, 0, Text_184257, Text_18427A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA2B6 + goto_if eq, EventScript_1AA2B6 msgbox Text_1842B3, 6 end EventScript_1AA2B6:: @ 81AA2B6 - trainerbattle 5, 173, 0, Text_1C1873, Text_18427A + trainerbattle 5, TRAINER_SUPER_NERD_LESLIE, 0, Text_1C1873, Text_18427A msgbox Text_1842B3, 6 end Route8_EventScript_1AA2CD:: @ 81AA2CD - trainerbattle 0, 262, 0, Text_18412F, Text_18414D + trainerbattle 0, TRAINER_GAMER_STAN, 0, Text_18412F, Text_18414D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA2F4 + goto_if eq, EventScript_1AA2F4 msgbox Text_184162, 6 end EventScript_1AA2F4:: @ 81AA2F4 - trainerbattle 5, 262, 0, Text_1C17CD, Text_18414D + trainerbattle 5, TRAINER_GAMER_STAN, 0, Text_1C17CD, Text_18414D msgbox Text_184162, 6 end Route8_EventScript_1AA30B:: @ 81AA30B - trainerbattle 0, 264, 0, Text_184432, Text_18444F + trainerbattle 0, TRAINER_GAMER_RICH, 0, Text_184432, Text_18444F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA332 + goto_if eq, EventScript_1AA332 msgbox Text_184466, 6 end EventScript_1AA332:: @ 81AA332 - trainerbattle 5, 264, 0, Text_1C191F, Text_18444F + trainerbattle 5, TRAINER_GAMER_RICH, 0, Text_1C191F, Text_18444F msgbox Text_184466, 6 end Route8_EventScript_1AA349:: @ 81AA349 - trainerbattle 4, 484, 0, Text_1845A4, Text_1845D0, Text_184616 + trainerbattle 4, TRAINER_TWINS_ELI_ANNE, 0, Text_1845A4, Text_1845D0, Text_184616 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA374 + goto_if eq, EventScript_1AA374 msgbox Text_1845F2, 6 end EventScript_1AA374:: @ 81AA374 - trainerbattle 7, 484, 0, Text_1C19E5, Text_1845D0, Text_184616 + trainerbattle 7, TRAINER_TWINS_ELI_ANNE, 0, Text_1C19E5, Text_1845D0, Text_184616 msgbox Text_1845F2, 6 end Route8_EventScript_1AA38F:: @ 81AA38F - trainerbattle 4, 484, 0, Text_18464A, Text_184675, Text_1846AF + trainerbattle 4, TRAINER_TWINS_ELI_ANNE, 0, Text_18464A, Text_184675, Text_1846AF specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA3BA + goto_if eq, EventScript_1AA3BA msgbox Text_18468B, 6 end EventScript_1AA3BA:: @ 81AA3BA - trainerbattle 7, 484, 0, Text_1C1A0D, Text_184675, Text_1846AF + trainerbattle 7, TRAINER_TWINS_ELI_ANNE, 0, Text_1C1A0D, Text_184675, Text_1846AF msgbox Text_18468B, 6 end Route8_EventScript_1AA3D5:: @ 81AA3D5 - trainerbattle 0, 535, 0, Text_1846E2, Text_1846FC + trainerbattle 0, TRAINER_BIKER_RICARDO, 0, Text_1846E2, Text_1846FC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA3FC + goto_if eq, EventScript_1AA3FC msgbox Text_184719, 6 end EventScript_1AA3FC:: @ 81AA3FC - trainerbattle 5, 535, 0, Text_1C199C, Text_1846FC + trainerbattle 5, TRAINER_BIKER_RICARDO, 0, Text_1C199C, Text_1846FC msgbox Text_184719, 6 end Route8_EventScript_1AA413:: @ 81AA413 - trainerbattle 0, 536, 0, Text_184742, Text_184767 + trainerbattle 0, TRAINER_BIKER_JAREN, 0, Text_184742, Text_184767 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA43A + goto_if eq, EventScript_1AA43A msgbox Text_18477A, 6 end EventScript_1AA43A:: @ 81AA43A - trainerbattle 5, 536, 0, Text_1C19BC, Text_184767 + trainerbattle 5, TRAINER_BIKER_JAREN, 0, Text_1C19BC, Text_184767 msgbox Text_18477A, 6 end Route12_EventScript_1AA451:: @ 81AA451 - trainerbattle 0, 225, 0, Text_185402, Text_18541B + trainerbattle 0, TRAINER_FISHERMAN_NED, 0, Text_185402, Text_18541B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA478 + goto_if eq, EventScript_1AA478 msgbox Text_185432, 6 end EventScript_1AA478:: @ 81AA478 - trainerbattle 5, 225, 0, Text_1C1F9D, Text_18541B + trainerbattle 5, TRAINER_FISHERMAN_NED, 0, Text_1C1F9D, Text_18541B msgbox Text_185432, 6 end Route12_EventScript_1AA48F:: @ 81AA48F - trainerbattle 0, 226, 0, Text_18544E, Text_185475 + trainerbattle 0, TRAINER_FISHERMAN_CHIP, 0, Text_18544E, Text_185475 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA4B6 + goto_if eq, EventScript_1AA4B6 msgbox Text_185488, 6 end EventScript_1AA4B6:: @ 81AA4B6 - trainerbattle 5, 226, 0, Text_1C1FD8, Text_185475 + trainerbattle 5, TRAINER_FISHERMAN_CHIP, 0, Text_1C1FD8, Text_185475 msgbox Text_185488, 6 end Route12_EventScript_1AA4CD:: @ 81AA4CD - trainerbattle 0, 227, 0, Text_1855E1, Text_185606 + trainerbattle 0, TRAINER_FISHERMAN_HANK, 0, Text_1855E1, Text_185606 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA4F4 + goto_if eq, EventScript_1AA4F4 msgbox Text_185616, 6 end EventScript_1AA4F4:: @ 81AA4F4 - trainerbattle 5, 227, 0, Text_1C209C, Text_185606 + trainerbattle 5, TRAINER_FISHERMAN_HANK, 0, Text_1C209C, Text_185606 msgbox Text_185616, 6 end Route12_EventScript_1AA50B:: @ 81AA50B - trainerbattle 0, 228, 0, Text_185682, Text_1856D0 + trainerbattle 0, TRAINER_FISHERMAN_ELLIOT, 0, Text_185682, Text_1856D0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA532 + goto_if eq, EventScript_1AA532 msgbox Text_1856DF, 6 end EventScript_1AA532:: @ 81AA532 - trainerbattle 5, 228, 0, Text_1C20D4, Text_1856D0 + trainerbattle 5, TRAINER_FISHERMAN_ELLIOT, 0, Text_1C20D4, Text_1856D0 msgbox Text_1856DF, 6 end Route12_EventScript_1AA549:: @ 81AA549 - trainerbattle 0, 233, 0, Text_18570E, Text_185744 + trainerbattle 0, TRAINER_FISHERMAN_ANDREW, 0, Text_18570E, Text_185744 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA570 + goto_if eq, EventScript_1AA570 msgbox Text_18574D, 6 end EventScript_1AA570:: @ 81AA570 - trainerbattle 5, 233, 0, Text_1C2134, Text_185744 + trainerbattle 5, TRAINER_FISHERMAN_ANDREW, 0, Text_1C2134, Text_185744 msgbox Text_18574D, 6 end Route12_EventScript_1AA587:: @ 81AA587 - trainerbattle 0, 285, 0, Text_185547, Text_18559B + trainerbattle 0, TRAINER_ROCKER_LUCA, 0, Text_185547, Text_18559B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA5AE + goto_if eq, EventScript_1AA5AE msgbox Text_1855A6, 6 end EventScript_1AA5AE:: @ 81AA5AE - trainerbattle 5, 285, 0, Text_1C203B, Text_18559B + trainerbattle 5, TRAINER_ROCKER_LUCA, 0, Text_1C203B, Text_18559B msgbox Text_1855A6, 6 end Route12_EventScript_1AA5C5:: @ 81AA5C5 - trainerbattle 0, 477, 0, Text_1854B9, Text_1854ED + trainerbattle 0, TRAINER_CAMPER_JUSTIN, 0, Text_1854B9, Text_1854ED specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA5EC + goto_if eq, EventScript_1AA5EC msgbox Text_1854F2, 6 end EventScript_1AA5EC:: @ 81AA5EC - trainerbattle 5, 477, 0, Text_1C2008, Text_1854ED + trainerbattle 5, TRAINER_CAMPER_JUSTIN, 0, Text_1C2008, Text_1854ED msgbox Text_1854F2, 6 end Route12_EventScript_1AA603:: @ 81AA603 - trainerbattle 4, 486, 0, Text_1857C5, Text_1857F1, Text_185842 + trainerbattle 4, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1857C5, Text_1857F1, Text_185842 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA62E + goto_if eq, EventScript_1AA62E msgbox Text_18581F, 6 end EventScript_1AA62E:: @ 81AA62E - trainerbattle 7, 486, 0, Text_1C216B, Text_1857F1, Text_185842 + trainerbattle 7, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1C216B, Text_1857F1, Text_185842 msgbox Text_18581F, 6 end Route12_EventScript_1AA649:: @ 81AA649 - trainerbattle 4, 486, 0, Text_1858A6, Text_1858D0, Text_185908 + trainerbattle 4, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1858A6, Text_1858D0, Text_185908 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA674 + goto_if eq, EventScript_1AA674 msgbox Text_1858E2, 6 end EventScript_1AA674:: @ 81AA674 - trainerbattle 7, 486, 0, Text_1C219B, Text_1858D0, Text_185908 + trainerbattle 7, TRAINER_YOUNG_COUPLE_GIA_JES, 0, Text_1C219B, Text_1858D0, Text_185908 msgbox Text_1858E2, 6 end Route13_EventScript_1AA68F:: @ 81AA68F - trainerbattle 0, 195, 0, Text_185D05, Text_185D1D + trainerbattle 0, TRAINER_BIKER_JARED, 0, Text_185D05, Text_185D1D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA6B6 + goto_if eq, EventScript_1AA6B6 msgbox Text_185D33, 6 end EventScript_1AA6B6:: @ 81AA6B6 - trainerbattle 5, 195, 0, Text_1C236B, Text_185D1D + trainerbattle 5, TRAINER_BIKER_JARED, 0, Text_1C236B, Text_185D1D msgbox Text_185D33, 6 end Route13_EventScript_1AA6CD:: @ 81AA6CD - trainerbattle 0, 268, 0, Text_185BFC, Text_185C1F + trainerbattle 0, TRAINER_BEAUTY_LOLA, 0, Text_185BFC, Text_185C1F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA6F4 + goto_if eq, EventScript_1AA6F4 msgbox Text_185C35, 6 end EventScript_1AA6F4:: @ 81AA6F4 - trainerbattle 5, 268, 0, Text_1C2306, Text_185C1F + trainerbattle 5, TRAINER_BEAUTY_LOLA, 0, Text_1C2306, Text_185C1F msgbox Text_185C35, 6 end Route13_EventScript_1AA70B:: @ 81AA70B - trainerbattle 0, 269, 0, Text_185C69, Text_185C95 + trainerbattle 0, TRAINER_BEAUTY_SHEILA, 0, Text_185C69, Text_185C95 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA732 + goto_if eq, EventScript_1AA732 msgbox Text_185CA8, 6 end EventScript_1AA732:: @ 81AA732 - trainerbattle 5, 269, 0, Text_1C2340, Text_185C95 + trainerbattle 5, TRAINER_BEAUTY_SHEILA, 0, Text_1C2340, Text_185C95 msgbox Text_185CA8, 6 end Route13_EventScript_1AA749:: @ 81AA749 - trainerbattle 0, 300, 0, Text_185955, Text_18597E + trainerbattle 0, TRAINER_BIRD_KEEPER_SEBASTIAN, 0, Text_185955, Text_18597E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA770 + goto_if eq, EventScript_1AA770 msgbox Text_1859A2, 6 end EventScript_1AA770:: @ 81AA770 - trainerbattle 5, 300, 0, Text_1C21EE, Text_18597E + trainerbattle 5, TRAINER_BIRD_KEEPER_SEBASTIAN, 0, Text_1C21EE, Text_18597E msgbox Text_1859A2, 6 end Route13_EventScript_1AA787:: @ 81AA787 - trainerbattle 0, 301, 0, Text_185B8F, Text_185BCA + trainerbattle 0, TRAINER_BIRD_KEEPER_PERRY, 0, Text_185B8F, Text_185BCA specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA7AE + goto_if eq, EventScript_1AA7AE msgbox Text_185BDB, 6 end EventScript_1AA7AE:: @ 81AA7AE - trainerbattle 5, 301, 0, Text_1C22CA, Text_185BCA + trainerbattle 5, TRAINER_BIRD_KEEPER_PERRY, 0, Text_1C22CA, Text_185BCA msgbox Text_185BDB, 6 end Route13_EventScript_1AA7C5:: @ 81AA7C5 - trainerbattle 0, 302, 0, Text_185D3D, Text_185D7B + trainerbattle 0, TRAINER_BIRD_KEEPER_ROBERT, 0, Text_185D3D, Text_185D7B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA7EC + goto_if eq, EventScript_1AA7EC msgbox Text_185D89, 6 end EventScript_1AA7EC:: @ 81AA7EC - trainerbattle 5, 302, 0, Text_1C2383, Text_185D7B + trainerbattle 5, TRAINER_BIRD_KEEPER_ROBERT, 0, Text_1C2383, Text_185D7B msgbox Text_185D89, 6 end Route13_EventScript_1AA803:: @ 81AA803 - trainerbattle 0, 466, 0, Text_185B12, Text_185B48 + trainerbattle 0, TRAINER_PICNICKER_ALMA, 0, Text_185B12, Text_185B48 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA82A + goto_if eq, EventScript_1AA82A msgbox Text_185B67, 6 end EventScript_1AA82A:: @ 81AA82A - trainerbattle 5, 466, 0, Text_1C2299, Text_185B48 + trainerbattle 5, TRAINER_PICNICKER_ALMA, 0, Text_1C2299, Text_185B48 msgbox Text_185B67, 6 end Route13_EventScript_1AA841:: @ 81AA841 - trainerbattle 0, 467, 0, Text_1859CF, Text_1859EC + trainerbattle 0, TRAINER_PICNICKER_SUSIE, 0, Text_1859CF, Text_1859EC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA868 + goto_if eq, EventScript_1AA868 msgbox Text_1859F9, 6 end EventScript_1AA868:: @ 81AA868 - trainerbattle 5, 467, 0, Text_1C220C, Text_1859EC + trainerbattle 5, TRAINER_PICNICKER_SUSIE, 0, Text_1C220C, Text_1859EC msgbox Text_1859F9, 6 end Route13_EventScript_1AA87F:: @ 81AA87F - trainerbattle 0, 468, 0, Text_185A37, Text_185A56 + trainerbattle 0, TRAINER_PICNICKER_VALERIE, 0, Text_185A37, Text_185A56 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA8A6 + goto_if eq, EventScript_1AA8A6 msgbox Text_185A62, 6 end EventScript_1AA8A6:: @ 81AA8A6 - trainerbattle 5, 468, 0, Text_1C223C, Text_185A56 + trainerbattle 5, TRAINER_PICNICKER_VALERIE, 0, Text_1C223C, Text_185A56 msgbox Text_185A62, 6 end Route13_EventScript_1AA8BD:: @ 81AA8BD - trainerbattle 0, 469, 0, Text_185A91, Text_185AC1 + trainerbattle 0, TRAINER_PICNICKER_GWEN, 0, Text_185A91, Text_185AC1 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA8E4 + goto_if eq, EventScript_1AA8E4 msgbox Text_185ADE, 6 end EventScript_1AA8E4:: @ 81AA8E4 - trainerbattle 5, 469, 0, Text_1C225B, Text_185AC1 + trainerbattle 5, TRAINER_PICNICKER_GWEN, 0, Text_1C225B, Text_185AC1 msgbox Text_185ADE, 6 end Route14_EventScript_1AA8FB:: @ 81AA8FB - trainerbattle 0, 196, 0, Text_186344, Text_186362 + trainerbattle 0, TRAINER_BIKER_MALIK, 0, Text_186344, Text_186362 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA922 + goto_if eq, EventScript_1AA922 msgbox Text_18636E, 6 end EventScript_1AA922:: @ 81AA922 - trainerbattle 5, 196, 0, Text_1C25D6, Text_186362 + trainerbattle 5, TRAINER_BIKER_MALIK, 0, Text_1C25D6, Text_186362 msgbox Text_18636E, 6 end Route14_EventScript_1AA939:: @ 81AA939 - trainerbattle 0, 207, 0, Text_1861F7, Text_186223 + trainerbattle 0, TRAINER_BIKER_LUKAS, 0, Text_1861F7, Text_186223 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA960 + goto_if eq, EventScript_1AA960 msgbox Text_186239, 6 end EventScript_1AA960:: @ 81AA960 - trainerbattle 5, 207, 0, Text_1C2531, Text_186223 + trainerbattle 5, TRAINER_BIKER_LUKAS, 0, Text_1C2531, Text_186223 msgbox Text_186239, 6 end Route14_EventScript_1AA977:: @ 81AA977 - trainerbattle 0, 208, 0, Text_186263, Text_186291 + trainerbattle 0, TRAINER_BIKER_ISAAC, 0, Text_186263, Text_186291 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA99E + goto_if eq, EventScript_1AA99E msgbox Text_18629D, 6 end EventScript_1AA99E:: @ 81AA99E - trainerbattle 5, 208, 0, Text_1C2572, Text_186291 + trainerbattle 5, TRAINER_BIKER_ISAAC, 0, Text_1C2572, Text_186291 msgbox Text_18629D, 6 end Route14_EventScript_1AA9B5:: @ 81AA9B5 - trainerbattle 0, 209, 0, Text_1862BD, Text_1862EF + trainerbattle 0, TRAINER_BIKER_GERALD, 0, Text_1862BD, Text_1862EF specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AA9DC + goto_if eq, EventScript_1AA9DC msgbox Text_1862F8, 6 end EventScript_1AA9DC:: @ 81AA9DC - trainerbattle 5, 209, 0, Text_1C259E, Text_1862EF + trainerbattle 5, TRAINER_BIKER_GERALD, 0, Text_1C259E, Text_1862EF msgbox Text_1862F8, 6 end Route14_EventScript_1AA9F3:: @ 81AA9F3 - trainerbattle 0, 303, 0, Text_1860D9, Text_18610A + trainerbattle 0, TRAINER_BIRD_KEEPER_DONALD, 0, Text_1860D9, Text_18610A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAA1A + goto_if eq, EventScript_1AAA1A msgbox Text_18611D, 6 end EventScript_1AAA1A:: @ 81AAA1A - trainerbattle 5, 303, 0, Text_1C24CB, Text_18610A + trainerbattle 5, TRAINER_BIRD_KEEPER_DONALD, 0, Text_1C24CB, Text_18610A msgbox Text_18611D, 6 end Route14_EventScript_1AAA31:: @ 81AAA31 - trainerbattle 0, 304, 0, Text_18618E, Text_1861B3 + trainerbattle 0, TRAINER_BIRD_KEEPER_BENNY, 0, Text_18618E, Text_1861B3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAA58 + goto_if eq, EventScript_1AAA58 msgbox Text_1861BE, 6 end EventScript_1AAA58:: @ 81AAA58 - trainerbattle 5, 304, 0, Text_1C2505, Text_1861B3 + trainerbattle 5, TRAINER_BIRD_KEEPER_BENNY, 0, Text_1C2505, Text_1861B3 msgbox Text_1861BE, 6 end Route14_EventScript_1AAA6F:: @ 81AAA6F - trainerbattle 0, 313, 0, Text_185E4D, Text_185E81 + trainerbattle 0, TRAINER_BIRD_KEEPER_CARTER, 0, Text_185E4D, Text_185E81 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAA96 + goto_if eq, EventScript_1AAA96 msgbox Text_185E9C, 6 end EventScript_1AAA96:: @ 81AAA96 - trainerbattle 5, 313, 0, Text_1C23C1, Text_185E81 + trainerbattle 5, TRAINER_BIRD_KEEPER_CARTER, 0, Text_1C23C1, Text_185E81 msgbox Text_185E9C, 6 end Route14_EventScript_1AAAAD:: @ 81AAAAD - trainerbattle 0, 314, 0, Text_185EDF, Text_185F0B + trainerbattle 0, TRAINER_BIRD_KEEPER_MITCH, 0, Text_185EDF, Text_185F0B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAAD4 + goto_if eq, EventScript_1AAAD4 msgbox Text_185F1A, 6 end EventScript_1AAAD4:: @ 81AAAD4 - trainerbattle 5, 314, 0, Text_1C23EF, Text_185F0B + trainerbattle 5, TRAINER_BIRD_KEEPER_MITCH, 0, Text_1C23EF, Text_185F0B msgbox Text_185F1A, 6 end Route14_EventScript_1AAAEB:: @ 81AAAEB - trainerbattle 0, 315, 0, Text_185F46, Text_185FAE + trainerbattle 0, TRAINER_BIRD_KEEPER_BECK, 0, Text_185F46, Text_185FAE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAB12 + goto_if eq, EventScript_1AAB12 msgbox Text_185FBB, 6 end EventScript_1AAB12:: @ 81AAB12 - trainerbattle 5, 315, 0, Text_1C2425, Text_185FAE + trainerbattle 5, TRAINER_BIRD_KEEPER_BECK, 0, Text_1C2425, Text_185FAE msgbox Text_185FBB, 6 end Route14_EventScript_1AAB29:: @ 81AAB29 - trainerbattle 0, 316, 0, Text_186021, Text_18607C + trainerbattle 0, TRAINER_BIRD_KEEPER_MARLON, 0, Text_186021, Text_18607C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAB50 + goto_if eq, EventScript_1AAB50 msgbox Text_186091, 6 end EventScript_1AAB50:: @ 81AAB50 - trainerbattle 5, 316, 0, Text_1C2461, Text_18607C + trainerbattle 5, TRAINER_BIRD_KEEPER_MARLON, 0, Text_1C2461, Text_18607C msgbox Text_186091, 6 end Route14_EventScript_1AAB67:: @ 81AAB67 - trainerbattle 4, 487, 0, Text_1863B7, Text_1863EA, Text_18642E + trainerbattle 4, TRAINER_TWINS_KIRI_JAN, 0, Text_1863B7, Text_1863EA, Text_18642E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAB92 + goto_if eq, EventScript_1AAB92 msgbox Text_18640D, 6 end EventScript_1AAB92:: @ 81AAB92 - trainerbattle 7, 487, 0, Text_1C25FB, Text_1863EA, Text_18642E + trainerbattle 7, TRAINER_TWINS_KIRI_JAN, 0, Text_1C25FB, Text_1863EA, Text_18642E msgbox Text_18640D, 6 end Route14_EventScript_1AABAD:: @ 81AABAD - trainerbattle 4, 487, 0, Text_18645B, Text_186487, Text_1864D3 + trainerbattle 4, TRAINER_TWINS_KIRI_JAN, 0, Text_18645B, Text_186487, Text_1864D3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AABD8 + goto_if eq, EventScript_1AABD8 msgbox Text_18649C, 6 end EventScript_1AABD8:: @ 81AABD8 - trainerbattle 7, 487, 0, Text_1C261B, Text_186487, Text_1864D3 + trainerbattle 7, TRAINER_TWINS_KIRI_JAN, 0, Text_1C261B, Text_186487, Text_1864D3 msgbox Text_18649C, 6 end Route15_EventScript_1AABF3:: @ 81AABF3 - trainerbattle 0, 197, 0, Text_1868B6, Text_1868E8 + trainerbattle 0, TRAINER_BIKER_ERNEST, 0, Text_1868B6, Text_1868E8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAC1A + goto_if eq, EventScript_1AAC1A msgbox Text_1868F1, 6 end EventScript_1AAC1A:: @ 81AAC1A - trainerbattle 5, 197, 0, Text_1C27E7, Text_1868E8 + trainerbattle 5, TRAINER_BIKER_ERNEST, 0, Text_1C27E7, Text_1868E8 msgbox Text_1868F1, 6 end Route15_EventScript_1AAC31:: @ 81AAC31 - trainerbattle 0, 198, 0, Text_186936, Text_186968 + trainerbattle 0, TRAINER_BIKER_ALEX, 0, Text_186936, Text_186968 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAC58 + goto_if eq, EventScript_1AAC58 msgbox Text_18697C, 6 end EventScript_1AAC58:: @ 81AAC58 - trainerbattle 5, 198, 0, Text_1C2814, Text_186968 + trainerbattle 5, TRAINER_BIKER_ALEX, 0, Text_1C2814, Text_186968 msgbox Text_18697C, 6 end Route15_EventScript_1AAC6F:: @ 81AAC6F - trainerbattle 0, 273, 0, Text_18678B, Text_1867C1 + trainerbattle 0, TRAINER_BEAUTY_GRACE, 0, Text_18678B, Text_1867C1 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAC96 + goto_if eq, EventScript_1AAC96 msgbox Text_1867DA, 6 end EventScript_1AAC96:: @ 81AAC96 - trainerbattle 5, 273, 0, Text_1C2753, Text_1867C1 + trainerbattle 5, TRAINER_BEAUTY_GRACE, 0, Text_1C2753, Text_1867C1 msgbox Text_1867DA, 6 end Route15_EventScript_1AACAD:: @ 81AACAD - trainerbattle 0, 274, 0, Text_18680C, Text_186841 + trainerbattle 0, TRAINER_BEAUTY_OLIVIA, 0, Text_18680C, Text_186841 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AACD4 + goto_if eq, EventScript_1AACD4 msgbox Text_18686F, 6 end EventScript_1AACD4:: @ 81AACD4 - trainerbattle 5, 274, 0, Text_1C279D, Text_186841 + trainerbattle 5, TRAINER_BEAUTY_OLIVIA, 0, Text_1C279D, Text_186841 msgbox Text_18686F, 6 end Route15_EventScript_1AACEB:: @ 81AACEB - trainerbattle 0, 305, 0, Text_18664F, Text_18667A + trainerbattle 0, TRAINER_BIRD_KEEPER_EDWIN, 0, Text_18664F, Text_18667A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAD12 + goto_if eq, EventScript_1AAD12 msgbox Text_18668D, 6 end EventScript_1AAD12:: @ 81AAD12 - trainerbattle 5, 305, 0, Text_1C26D3, Text_18667A + trainerbattle 5, TRAINER_BIRD_KEEPER_EDWIN, 0, Text_1C26D3, Text_18667A msgbox Text_18668D, 6 end Route15_EventScript_1AAD29:: @ 81AAD29 - trainerbattle 0, 306, 0, Text_1866D1, Text_186707 + trainerbattle 0, TRAINER_BIRD_KEEPER_CHESTER, 0, Text_1866D1, Text_186707 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAD50 + goto_if eq, EventScript_1AAD50 msgbox Text_18671A, 6 end EventScript_1AAD50:: @ 81AAD50 - trainerbattle 5, 306, 0, Text_1C2717, Text_186707 + trainerbattle 5, TRAINER_BIRD_KEEPER_CHESTER, 0, Text_1C2717, Text_186707 msgbox Text_18671A, 6 end Route15_EventScript_1AAD67:: @ 81AAD67 - trainerbattle 0, 478, 0, Text_186A22, Text_186A40 + trainerbattle 0, TRAINER_PICNICKER_YAZMIN, 0, Text_186A22, Text_186A40 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAD8E + goto_if eq, EventScript_1AAD8E msgbox Text_186A55, 6 end EventScript_1AAD8E:: @ 81AAD8E - trainerbattle 5, 478, 0, Text_1C287D, Text_186A40 + trainerbattle 5, TRAINER_PICNICKER_YAZMIN, 0, Text_1C287D, Text_186A40 msgbox Text_186A55, 6 end Route15_EventScript_1AADA5:: @ 81AADA5 - trainerbattle 0, 479, 0, Text_18650B, Text_186549 + trainerbattle 0, TRAINER_PICNICKER_KINDRA, 0, Text_18650B, Text_186549 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AADCC + goto_if eq, EventScript_1AADCC msgbox Text_18655A, 6 end EventScript_1AADCC:: @ 81AADCC - trainerbattle 5, 479, 0, Text_1C2650, Text_186549 + trainerbattle 5, TRAINER_PICNICKER_KINDRA, 0, Text_1C2650, Text_186549 msgbox Text_18655A, 6 end Route15_EventScript_1AADE3:: @ 81AADE3 - trainerbattle 0, 480, 0, Text_1865D3, Text_186612 + trainerbattle 0, TRAINER_PICNICKER_BECKY, 0, Text_1865D3, Text_186612 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAE0A + goto_if eq, EventScript_1AAE0A msgbox Text_18661D, 6 end EventScript_1AAE0A:: @ 81AAE0A - trainerbattle 5, 480, 0, Text_1C268D, Text_186612 + trainerbattle 5, TRAINER_PICNICKER_BECKY, 0, Text_1C268D, Text_186612 msgbox Text_18661D, 6 end Route15_EventScript_1AAE21:: @ 81AAE21 - trainerbattle 0, 481, 0, Text_1869BA, Text_1869E6 + trainerbattle 0, TRAINER_PICNICKER_CELIA, 0, Text_1869BA, Text_1869E6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAE48 + goto_if eq, EventScript_1AAE48 msgbox Text_1869F4, 6 end EventScript_1AAE48:: @ 81AAE48 - trainerbattle 5, 481, 0, Text_1C2846, Text_1869E6 + trainerbattle 5, TRAINER_PICNICKER_CELIA, 0, Text_1C2846, Text_1869E6 msgbox Text_1869F4, 6 end Route15_EventScript_1AAE5F:: @ 81AAE5F - trainerbattle 4, 488, 0, Text_186A95, Text_186ACB, Text_186B46 + trainerbattle 4, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186A95, Text_186ACB, Text_186B46 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAE8A + goto_if eq, EventScript_1AAE8A msgbox Text_186B0A, 6 end EventScript_1AAE8A:: @ 81AAE8A - trainerbattle 7, 488, 0, Text_1C28A1, Text_186ACB, Text_186B46 + trainerbattle 7, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_1C28A1, Text_186ACB, Text_186B46 msgbox Text_186B0A, 6 end Route15_EventScript_1AAEA5:: @ 81AAEA5 - trainerbattle 4, 488, 0, Text_186B89, Text_186BB1, Text_186BFE + trainerbattle 4, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_186B89, Text_186BB1, Text_186BFE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAED0 + goto_if eq, EventScript_1AAED0 msgbox Text_186BD2, 6 end EventScript_1AAED0:: @ 81AAED0 - trainerbattle 7, 488, 0, Text_1C28EC, Text_186BB1, Text_186BFE + trainerbattle 7, TRAINER_CRUSH_KIN_RON_MYA, 0, Text_1C28EC, Text_186BB1, Text_186BFE msgbox Text_186BD2, 6 end Route16_EventScript_1AAEEB:: @ 81AAEEB - trainerbattle 0, 199, 0, Text_186C4D, Text_186C5F + trainerbattle 0, TRAINER_BIKER_LAO, 0, Text_186C4D, Text_186C5F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAF12 + goto_if eq, EventScript_1AAF12 msgbox Text_186C75, 6 end EventScript_1AAF12:: @ 81AAF12 - trainerbattle 5, 199, 0, Text_1C2913, Text_186C5F + trainerbattle 5, TRAINER_BIKER_LAO, 0, Text_1C2913, Text_186C5F msgbox Text_186C75, 6 end Route16_EventScript_1AAF29:: @ 81AAF29 - trainerbattle 0, 201, 0, Text_186D39, Text_186D52 + trainerbattle 0, TRAINER_BIKER_HIDEO, 0, Text_186D39, Text_186D52 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAF50 + goto_if eq, EventScript_1AAF50 msgbox Text_186D5A, 6 end EventScript_1AAF50:: @ 81AAF50 - trainerbattle 5, 201, 0, Text_1C297B, Text_186D52 + trainerbattle 5, TRAINER_BIKER_HIDEO, 0, Text_1C297B, Text_186D52 msgbox Text_186D5A, 6 end Route16_EventScript_1AAF67:: @ 81AAF67 - trainerbattle 0, 202, 0, Text_186E86, Text_186EB4 + trainerbattle 0, TRAINER_BIKER_RUBEN, 0, Text_186E86, Text_186EB4 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAF8E + goto_if eq, EventScript_1AAF8E msgbox Text_186EC7, 6 end EventScript_1AAF8E:: @ 81AAF8E - trainerbattle 5, 202, 0, Text_1C29EB, Text_186EB4 + trainerbattle 5, TRAINER_BIKER_RUBEN, 0, Text_1C29EB, Text_186EB4 msgbox Text_186EC7, 6 end Route16_EventScript_1AAFA5:: @ 81AAFA5 - trainerbattle 0, 249, 0, Text_186CA2, Text_186CBB + trainerbattle 0, TRAINER_CUE_BALL_KOJI, 0, Text_186CA2, Text_186CBB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AAFCC + goto_if eq, EventScript_1AAFCC msgbox Text_186CC5, 6 end EventScript_1AAFCC:: @ 81AAFCC - trainerbattle 5, 249, 0, Text_1C2925, Text_186CBB + trainerbattle 5, TRAINER_CUE_BALL_KOJI, 0, Text_1C2925, Text_186CBB msgbox Text_186CC5, 6 end Route16_EventScript_1AAFE3:: @ 81AAFE3 - trainerbattle 0, 250, 0, Text_186CE5, Text_186D06 + trainerbattle 0, TRAINER_CUE_BALL_LUKE, 0, Text_186CE5, Text_186D06 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB00A + goto_if eq, EventScript_1AB00A msgbox Text_186D16, 6 end EventScript_1AB00A:: @ 81AB00A - trainerbattle 5, 250, 0, Text_1C2944, Text_186D06 + trainerbattle 5, TRAINER_CUE_BALL_LUKE, 0, Text_1C2944, Text_186D06 msgbox Text_186D16, 6 end Route16_EventScript_1AB021:: @ 81AB021 - trainerbattle 0, 251, 0, Text_186DD9, Text_186E0D + trainerbattle 0, TRAINER_CUE_BALL_CAMRON, 0, Text_186DD9, Text_186E0D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB048 + goto_if eq, EventScript_1AB048 msgbox Text_186E1C, 6 end EventScript_1AB048:: @ 81AB048 - trainerbattle 5, 251, 0, Text_1C29B0, Text_186E0D + trainerbattle 5, TRAINER_CUE_BALL_CAMRON, 0, Text_1C29B0, Text_186E0D msgbox Text_186E1C, 6 end Route16_EventScript_1AB05F:: @ 81AB05F - trainerbattle 4, 489, 0, Text_186FBD, Text_186FFA, Text_187057 + trainerbattle 4, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_186FBD, Text_186FFA, Text_187057 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB08A + goto_if eq, EventScript_1AB08A msgbox Text_187027, 6 end EventScript_1AB08A:: @ 81AB08A - trainerbattle 7, 489, 0, Text_1C2A19, Text_186FFA, Text_187057 + trainerbattle 7, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_1C2A19, Text_186FFA, Text_187057 msgbox Text_187027, 6 end Route16_EventScript_1AB0A5:: @ 81AB0A5 - trainerbattle 4, 489, 0, Text_187097, Text_1870CC, Text_187120 + trainerbattle 4, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_187097, Text_1870CC, Text_187120 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB0D0 + goto_if eq, EventScript_1AB0D0 msgbox Text_1870F9, 6 end EventScript_1AB0D0:: @ 81AB0D0 - trainerbattle 7, 489, 0, Text_1C2A53, Text_1870CC, Text_187120 + trainerbattle 7, TRAINER_YOUNG_COUPLE_LEA_JED, 0, Text_1C2A53, Text_1870CC, Text_187120 msgbox Text_1870F9, 6 end Route17_EventScript_1AB0EB:: @ 81AB0EB - trainerbattle 0, 203, 0, Text_1872BD, Text_1872E3 + trainerbattle 0, TRAINER_BIKER_BILLY, 0, Text_1872BD, Text_1872E3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB112 + goto_if eq, EventScript_1AB112 msgbox Text_1872EB, 6 end EventScript_1AB112:: @ 81AB112 - trainerbattle 5, 203, 0, Text_1C2B06, Text_1872E3 + trainerbattle 5, TRAINER_BIKER_BILLY, 0, Text_1C2B06, Text_1872E3 msgbox Text_1872EB, 6 end Route17_EventScript_1AB129:: @ 81AB129 - trainerbattle 0, 204, 0, Text_18730A, Text_187325 + trainerbattle 0, TRAINER_BIKER_NIKOLAS, 0, Text_18730A, Text_187325 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB150 + goto_if eq, EventScript_1AB150 msgbox Text_187333, 6 end EventScript_1AB150:: @ 81AB150 - trainerbattle 5, 204, 0, Text_1C2B2C, Text_187325 + trainerbattle 5, TRAINER_BIKER_NIKOLAS, 0, Text_1C2B2C, Text_187325 msgbox Text_187333, 6 end Route17_EventScript_1AB167:: @ 81AB167 - trainerbattle 0, 205, 0, Text_187456, Text_187472 + trainerbattle 0, TRAINER_BIKER_JAXON, 0, Text_187456, Text_187472 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB18E + goto_if eq, EventScript_1AB18E msgbox Text_187479, 6 end EventScript_1AB18E:: @ 81AB18E - trainerbattle 5, 205, 0, Text_1C2BE6, Text_187472 + trainerbattle 5, TRAINER_BIKER_JAXON, 0, Text_1C2BE6, Text_187472 msgbox Text_187479, 6 end Route17_EventScript_1AB1A5:: @ 81AB1A5 - trainerbattle 0, 206, 0, Text_18749B, Text_1874B6 + trainerbattle 0, TRAINER_BIKER_WILLIAM, 0, Text_18749B, Text_1874B6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB1CC + goto_if eq, EventScript_1AB1CC msgbox Text_1874C9, 6 end EventScript_1AB1CC:: @ 81AB1CC - trainerbattle 5, 206, 0, Text_1C2C10, Text_1874B6 + trainerbattle 5, TRAINER_BIKER_WILLIAM, 0, Text_1C2C10, Text_1874B6 msgbox Text_1874C9, 6 end Route17_EventScript_1AB1E3:: @ 81AB1E3 - trainerbattle 0, 252, 0, Text_18717E, Text_1871AE + trainerbattle 0, TRAINER_CUE_BALL_RAUL, 0, Text_18717E, Text_1871AE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB20A + goto_if eq, EventScript_1AB20A msgbox Text_1871BA, 6 end EventScript_1AB20A:: @ 81AB20A - trainerbattle 5, 252, 0, Text_1C2A88, Text_1871AE + trainerbattle 5, TRAINER_CUE_BALL_RAUL, 0, Text_1C2A88, Text_1871AE msgbox Text_1871BA, 6 end Route17_EventScript_1AB221:: @ 81AB221 - trainerbattle 0, 253, 0, Text_187228, Text_187254 + trainerbattle 0, TRAINER_CUE_BALL_ISAIAH, 0, Text_187228, Text_187254 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB248 + goto_if eq, EventScript_1AB248 msgbox Text_18725A, 6 end EventScript_1AB248:: @ 81AB248 - trainerbattle 5, 253, 0, Text_1C2AC4, Text_187254 + trainerbattle 5, TRAINER_CUE_BALL_ISAIAH, 0, Text_1C2AC4, Text_187254 msgbox Text_18725A, 6 end Route17_EventScript_1AB25F:: @ 81AB25F - trainerbattle 0, 254, 0, Text_187362, Text_187395 + trainerbattle 0, TRAINER_CUE_BALL_ZEEK, 0, Text_187362, Text_187395 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB286 + goto_if eq, EventScript_1AB286 msgbox Text_18739F, 6 end EventScript_1AB286:: @ 81AB286 - trainerbattle 5, 254, 0, Text_1C2B5E, Text_187395 + trainerbattle 5, TRAINER_CUE_BALL_ZEEK, 0, Text_1C2B5E, Text_187395 msgbox Text_18739F, 6 end Route17_EventScript_1AB29D:: @ 81AB29D - trainerbattle 0, 255, 0, Text_1873D1, Text_1873EB + trainerbattle 0, TRAINER_CUE_BALL_JAMAL, 0, Text_1873D1, Text_1873EB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB2C4 + goto_if eq, EventScript_1AB2C4 msgbox Text_1873FF, 6 end EventScript_1AB2C4:: @ 81AB2C4 - trainerbattle 5, 255, 0, Text_1C2B9C, Text_1873EB + trainerbattle 5, TRAINER_CUE_BALL_JAMAL, 0, Text_1C2B9C, Text_1873EB msgbox Text_1873FF, 6 end Route17_EventScript_1AB2DB:: @ 81AB2DB - trainerbattle 0, 256, 0, Text_18741D, Text_187429 + trainerbattle 0, TRAINER_CUE_BALL_COREY, 0, Text_18741D, Text_187429 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB302 + goto_if eq, EventScript_1AB302 msgbox Text_187432, 6 end EventScript_1AB302:: @ 81AB302 - trainerbattle 5, 256, 0, Text_1C2BDA, Text_187429 + trainerbattle 5, TRAINER_CUE_BALL_COREY, 0, Text_1C2BDA, Text_187429 msgbox Text_187432, 6 end Route17_EventScript_1AB319:: @ 81AB319 - trainerbattle 0, 470, 0, Text_18727D, Text_187295 + trainerbattle 0, TRAINER_BIKER_VIRGIL, 0, Text_18727D, Text_187295 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB340 + goto_if eq, EventScript_1AB340 msgbox Text_1872A5, 6 end EventScript_1AB340:: @ 81AB340 - trainerbattle 5, 470, 0, Text_1C2AF0, Text_187295 + trainerbattle 5, TRAINER_BIKER_VIRGIL, 0, Text_1C2AF0, Text_187295 msgbox Text_1872A5, 6 end Route18_EventScript_1AB357:: @ 81AB357 - trainerbattle 0, 307, 0, Text_187640, Text_187672 + trainerbattle 0, TRAINER_BIRD_KEEPER_WILTON, 0, Text_187640, Text_187672 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB37E + goto_if eq, EventScript_1AB37E msgbox Text_187677, 6 end EventScript_1AB37E:: @ 81AB37E - trainerbattle 5, 307, 0, Text_1C2C2B, Text_187672 + trainerbattle 5, TRAINER_BIRD_KEEPER_WILTON, 0, Text_1C2C2B, Text_187672 msgbox Text_187677, 6 end Route18_EventScript_1AB395:: @ 81AB395 - trainerbattle 0, 308, 0, Text_18768C, Text_1876B3 + trainerbattle 0, TRAINER_BIRD_KEEPER_RAMIRO, 0, Text_18768C, Text_1876B3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB3BC + goto_if eq, EventScript_1AB3BC msgbox Text_1876C5, 6 end EventScript_1AB3BC:: @ 81AB3BC - trainerbattle 5, 308, 0, Text_1C2C7B, Text_1876B3 + trainerbattle 5, TRAINER_BIRD_KEEPER_RAMIRO, 0, Text_1C2C7B, Text_1876B3 msgbox Text_1876C5, 6 end Route18_EventScript_1AB3D3:: @ 81AB3D3 - trainerbattle 0, 309, 0, Text_187704, Text_187726 + trainerbattle 0, TRAINER_BIRD_KEEPER_JACOB, 0, Text_187704, Text_187726 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB3FA + goto_if eq, EventScript_1AB3FA msgbox Text_18772C, 6 end EventScript_1AB3FA:: @ 81AB3FA - trainerbattle 5, 309, 0, Text_1C2CA8, Text_187726 + trainerbattle 5, TRAINER_BIRD_KEEPER_JACOB, 0, Text_1C2CA8, Text_187726 msgbox Text_18772C, 6 end Route19_EventScript_1AB411:: @ 81AB411 - trainerbattle 0, 235, 0, Text_1877A3, Text_1877DF + trainerbattle 0, TRAINER_SWIMMER_MALE_RICHARD, 0, Text_1877A3, Text_1877DF specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB438 + goto_if eq, EventScript_1AB438 msgbox Text_1877EE, 6 end EventScript_1AB438:: @ 81AB438 - trainerbattle 5, 235, 0, Text_1C2CEE, Text_1877DF + trainerbattle 5, TRAINER_SWIMMER_MALE_RICHARD, 0, Text_1C2CEE, Text_1877DF msgbox Text_1877EE, 6 end Route19_EventScript_1AB44F:: @ 81AB44F - trainerbattle 0, 236, 0, Text_187811, Text_18783E + trainerbattle 0, TRAINER_SWIMMER_MALE_REECE, 0, Text_187811, Text_18783E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB476 + goto_if eq, EventScript_1AB476 msgbox Text_187852, 6 end EventScript_1AB476:: @ 81AB476 - trainerbattle 5, 236, 0, Text_1C2D19, Text_18783E + trainerbattle 5, TRAINER_SWIMMER_MALE_REECE, 0, Text_1C2D19, Text_18783E msgbox Text_187852, 6 end Route19_EventScript_1AB48D:: @ 81AB48D - trainerbattle 0, 237, 0, Text_187884, Text_1878A5 + trainerbattle 0, TRAINER_SWIMMER_MALE_MATTHEW, 0, Text_187884, Text_1878A5 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB4B4 + goto_if eq, EventScript_1AB4B4 msgbox Text_1878B1, 6 end EventScript_1AB4B4:: @ 81AB4B4 - trainerbattle 5, 237, 0, Text_1C2D4B, Text_1878A5 + trainerbattle 5, TRAINER_SWIMMER_MALE_MATTHEW, 0, Text_1C2D4B, Text_1878A5 msgbox Text_1878B1, 6 end Route19_EventScript_1AB4CB:: @ 81AB4CB - trainerbattle 0, 238, 0, Text_1878DD, Text_1878F8 + trainerbattle 0, TRAINER_SWIMMER_MALE_DOUGLAS, 0, Text_1878DD, Text_1878F8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB4F2 + goto_if eq, EventScript_1AB4F2 msgbox Text_1878FE, 6 end EventScript_1AB4F2:: @ 81AB4F2 - trainerbattle 5, 238, 0, Text_1C2D7D, Text_1878F8 + trainerbattle 5, TRAINER_SWIMMER_MALE_DOUGLAS, 0, Text_1C2D7D, Text_1878F8 msgbox Text_1878FE, 6 end Route19_EventScript_1AB509:: @ 81AB509 - trainerbattle 0, 239, 0, Text_187925, Text_187955 + trainerbattle 0, TRAINER_SWIMMER_MALE_DAVID, 0, Text_187925, Text_187955 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB530 + goto_if eq, EventScript_1AB530 msgbox Text_18795B, 6 end EventScript_1AB530:: @ 81AB530 - trainerbattle 5, 239, 0, Text_1C2DA7, Text_187955 + trainerbattle 5, TRAINER_SWIMMER_MALE_DAVID, 0, Text_1C2DA7, Text_187955 msgbox Text_18795B, 6 end Route19_EventScript_1AB547:: @ 81AB547 - trainerbattle 0, 240, 0, Text_187985, Text_1879C3 + trainerbattle 0, TRAINER_SWIMMER_MALE_TONY, 0, Text_187985, Text_1879C3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB56E + goto_if eq, EventScript_1AB56E msgbox Text_1879D3, 6 end EventScript_1AB56E:: @ 81AB56E - trainerbattle 5, 240, 0, Text_1C2DE9, Text_1879C3 + trainerbattle 5, TRAINER_SWIMMER_MALE_TONY, 0, Text_1C2DE9, Text_1879C3 msgbox Text_1879D3, 6 end Route19_EventScript_1AB585:: @ 81AB585 - trainerbattle 0, 241, 0, Text_187AFA, Text_187B25 + trainerbattle 0, TRAINER_SWIMMER_MALE_AXLE, 0, Text_187AFA, Text_187B25 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB5AC + goto_if eq, EventScript_1AB5AC msgbox Text_187B35, 6 end EventScript_1AB5AC:: @ 81AB5AC - trainerbattle 5, 241, 0, Text_1C2EC0, Text_187B25 + trainerbattle 5, TRAINER_SWIMMER_MALE_AXLE, 0, Text_1C2EC0, Text_187B25 msgbox Text_187B35, 6 end Route19_EventScript_1AB5C3:: @ 81AB5C3 - trainerbattle 0, 276, 0, Text_187A11, Text_187A44 + trainerbattle 0, TRAINER_SWIMMER_FEMALE_ANYA, 0, Text_187A11, Text_187A44 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB5EA + goto_if eq, EventScript_1AB5EA msgbox Text_187A50, 6 end EventScript_1AB5EA:: @ 81AB5EA - trainerbattle 5, 276, 0, Text_1C2E4A, Text_187A44 + trainerbattle 5, TRAINER_SWIMMER_FEMALE_ANYA, 0, Text_1C2E4A, Text_187A44 msgbox Text_187A50, 6 end Route19_EventScript_1AB601:: @ 81AB601 - trainerbattle 0, 277, 0, Text_187A9E, Text_187AC1 + trainerbattle 0, TRAINER_SWIMMER_FEMALE_ALICE, 0, Text_187A9E, Text_187AC1 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB628 + goto_if eq, EventScript_1AB628 msgbox Text_187ACA, 6 end EventScript_1AB628:: @ 81AB628 - trainerbattle 5, 277, 0, Text_1C2E9D, Text_187AC1 + trainerbattle 5, TRAINER_SWIMMER_FEMALE_ALICE, 0, Text_1C2E9D, Text_187AC1 msgbox Text_187ACA, 6 end Route19_EventScript_1AB63F:: @ 81AB63F - trainerbattle 0, 278, 0, Text_187B5D, Text_187B85 + trainerbattle 0, TRAINER_SWIMMER_FEMALE_CONNIE, 0, Text_187B5D, Text_187B85 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB666 + goto_if eq, EventScript_1AB666 msgbox Text_187B94, 6 end EventScript_1AB666:: @ 81AB666 - trainerbattle 5, 278, 0, Text_1C2EFC, Text_187B85 + trainerbattle 5, TRAINER_SWIMMER_FEMALE_CONNIE, 0, Text_1C2EFC, Text_187B85 msgbox Text_187B94, 6 end Route19_EventScript_1AB67D:: @ 81AB67D - trainerbattle 4, 490, 0, Text_187C32, Text_187C6F, Text_187CF2 + trainerbattle 4, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187C32, Text_187C6F, Text_187CF2 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB6A8 + goto_if eq, EventScript_1AB6A8 msgbox Text_187C9E, 6 end EventScript_1AB6A8:: @ 81AB6A8 - trainerbattle 7, 490, 0, Text_1C2F41, Text_187C6F, Text_187CF2 + trainerbattle 7, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_1C2F41, Text_187C6F, Text_187CF2 msgbox Text_187C9E, 6 end Route19_EventScript_1AB6C3:: @ 81AB6C3 - trainerbattle 4, 490, 0, Text_187D45, Text_187D7E, Text_187DE8 + trainerbattle 4, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_187D45, Text_187D7E, Text_187DE8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB6EE + goto_if eq, EventScript_1AB6EE msgbox Text_187DAD, 6 end EventScript_1AB6EE:: @ 81AB6EE - trainerbattle 7, 490, 0, Text_1C2FAE, Text_187D7E, Text_187DE8 + trainerbattle 7, TRAINER_SIS_AND_BRO_LIA_LUC, 0, Text_1C2FAE, Text_187D7E, Text_187DE8 msgbox Text_187DAD, 6 end Route20_EventScript_1AB709:: @ 81AB709 - trainerbattle 0, 242, 0, Text_187E40, Text_187E7B + trainerbattle 0, TRAINER_SWIMMER_MALE_BARRY, 0, Text_187E40, Text_187E7B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB730 + goto_if eq, EventScript_1AB730 msgbox Text_187E83, 6 end EventScript_1AB730:: @ 81AB730 - trainerbattle 5, 242, 0, Text_1C2FF3, Text_187E7B + trainerbattle 5, TRAINER_SWIMMER_MALE_BARRY, 0, Text_1C2FF3, Text_187E7B msgbox Text_187E83, 6 end Route20_EventScript_1AB747:: @ 81AB747 - trainerbattle 0, 243, 0, Text_187FDB, Text_187FF7 + trainerbattle 0, TRAINER_SWIMMER_MALE_DEAN, 0, Text_187FDB, Text_187FF7 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB76E + goto_if eq, EventScript_1AB76E msgbox Text_187FFE, 6 end EventScript_1AB76E:: @ 81AB76E - trainerbattle 5, 243, 0, Text_1C30B0, Text_187FF7 + trainerbattle 5, TRAINER_SWIMMER_MALE_DEAN, 0, Text_1C30B0, Text_187FF7 msgbox Text_187FFE, 6 end Route20_EventScript_1AB785:: @ 81AB785 - trainerbattle 0, 244, 0, Text_18802E, Text_18805C + trainerbattle 0, TRAINER_SWIMMER_MALE_DARRIN, 0, Text_18802E, Text_18805C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB7AC + goto_if eq, EventScript_1AB7AC msgbox Text_18806D, 6 end EventScript_1AB7AC:: @ 81AB7AC - trainerbattle 5, 244, 0, Text_1C30ED, Text_18805C + trainerbattle 5, TRAINER_SWIMMER_MALE_DARRIN, 0, Text_1C30ED, Text_18805C msgbox Text_18806D, 6 end Route20_EventScript_1AB7C3:: @ 81AB7C3 - trainerbattle 0, 270, 0, Text_187F24, Text_187F5A + trainerbattle 0, TRAINER_SWIMMER_FEMALE_TIFFANY, 0, Text_187F24, Text_187F5A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB7EA + goto_if eq, EventScript_1AB7EA msgbox Text_187F61, 6 end EventScript_1AB7EA:: @ 81AB7EA - trainerbattle 5, 270, 0, Text_1C305F, Text_187F5A + trainerbattle 5, TRAINER_SWIMMER_FEMALE_TIFFANY, 0, Text_1C305F, Text_187F5A msgbox Text_187F61, 6 end Route20_EventScript_1AB801:: @ 81AB801 - trainerbattle 0, 271, 0, Text_1880F8, Text_188119 + trainerbattle 0, TRAINER_SWIMMER_FEMALE_NORA, 0, Text_1880F8, Text_188119 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB828 + goto_if eq, EventScript_1AB828 msgbox Text_188139, 6 end EventScript_1AB828:: @ 81AB828 - trainerbattle 5, 271, 0, Text_1C3149, Text_188119 + trainerbattle 5, TRAINER_SWIMMER_FEMALE_NORA, 0, Text_1C3149, Text_188119 msgbox Text_188139, 6 end Route20_EventScript_1AB83F:: @ 81AB83F - trainerbattle 0, 272, 0, Text_188218, Text_18825C + trainerbattle 0, TRAINER_SWIMMER_FEMALE_MELISSA, 0, Text_188218, Text_18825C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB866 + goto_if eq, EventScript_1AB866 msgbox Text_18827B, 6 end EventScript_1AB866:: @ 81AB866 - trainerbattle 5, 272, 0, Text_1C31C4, Text_18825C + trainerbattle 5, TRAINER_SWIMMER_FEMALE_MELISSA, 0, Text_1C31C4, Text_18825C msgbox Text_18827B, 6 end Route20_EventScript_1AB87D:: @ 81AB87D - trainerbattle 0, 279, 0, Text_187EBB, Text_187EED + trainerbattle 0, TRAINER_SWIMMER_FEMALE_SHIRLEY, 0, Text_187EBB, Text_187EED specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB8A4 + goto_if eq, EventScript_1AB8A4 msgbox Text_187EF6, 6 end EventScript_1AB8A4:: @ 81AB8A4 - trainerbattle 5, 279, 0, Text_1C302E, Text_187EED + trainerbattle 5, TRAINER_SWIMMER_FEMALE_SHIRLEY, 0, Text_1C302E, Text_187EED msgbox Text_187EF6, 6 end Route20_EventScript_1AB8BB:: @ 81AB8BB - trainerbattle 0, 310, 0, Text_18808E, Text_1880AB + trainerbattle 0, TRAINER_BIRD_KEEPER_ROGER, 0, Text_18808E, Text_1880AB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB8E2 + goto_if eq, EventScript_1AB8E2 msgbox Text_1880C8, 6 end EventScript_1AB8E2:: @ 81AB8E2 - trainerbattle 5, 310, 0, Text_1C312C, Text_1880AB + trainerbattle 5, TRAINER_BIRD_KEEPER_ROGER, 0, Text_1C312C, Text_1880AB msgbox Text_1880C8, 6 end Route20_EventScript_1AB8F9:: @ 81AB8F9 - trainerbattle 0, 472, 0, Text_188165, Text_1881A3 + trainerbattle 0, TRAINER_PICNICKER_MISSY, 0, Text_188165, Text_1881A3 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB920 + goto_if eq, EventScript_1AB920 msgbox Text_1881B8, 6 end EventScript_1AB920:: @ 81AB920 - trainerbattle 5, 472, 0, Text_1C3185, Text_1881A3 + trainerbattle 5, TRAINER_PICNICKER_MISSY, 0, Text_1C3185, Text_1881A3 msgbox Text_1881B8, 6 end Route20_EventScript_1AB937:: @ 81AB937 - trainerbattle 0, 473, 0, Text_187F78, Text_187F92 + trainerbattle 0, TRAINER_PICNICKER_IRENE, 0, Text_187F78, Text_187F92 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB95E + goto_if eq, EventScript_1AB95E msgbox Text_187FA3, 6 end EventScript_1AB95E:: @ 81AB95E - trainerbattle 5, 473, 0, Text_1C3095, Text_187F92 + trainerbattle 5, TRAINER_PICNICKER_IRENE, 0, Text_1C3095, Text_187F92 msgbox Text_187FA3, 6 end Route21_North_EventScript_1AB975:: @ 81AB975 - trainerbattle 0, 229, 0, Text_18835A, Text_188383 + trainerbattle 0, TRAINER_FISHERMAN_RONALD, 0, Text_18835A, Text_188383 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB99C + goto_if eq, EventScript_1AB99C msgbox Text_188389, 6 end EventScript_1AB99C:: @ 81AB99C - trainerbattle 5, 229, 0, Text_1C3208, Text_188383 + trainerbattle 5, TRAINER_FISHERMAN_RONALD, 0, Text_1C3208, Text_188383 msgbox Text_188389, 6 end Route21_South_EventScript_1AB9B3:: @ 81AB9B3 - trainerbattle 0, 230, 0, Text_1885D8, Text_1885F8 + trainerbattle 0, TRAINER_FISHERMAN_CLAUDE, 0, Text_1885D8, Text_1885F8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AB9DA + goto_if eq, EventScript_1AB9DA msgbox Text_188632, 6 end EventScript_1AB9DA:: @ 81AB9DA - trainerbattle 5, 230, 0, Text_1C331D, Text_1885F8 + trainerbattle 5, TRAINER_FISHERMAN_CLAUDE, 0, Text_1C331D, Text_1885F8 msgbox Text_188632, 6 end Route21_North_EventScript_1AB9F1:: @ 81AB9F1 - trainerbattle 0, 231, 0, Text_1883C6, Text_1883E9 + trainerbattle 0, TRAINER_FISHERMAN_WADE, 0, Text_1883C6, Text_1883E9 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABA18 + goto_if eq, EventScript_1ABA18 msgbox Text_18841D, 6 end EventScript_1ABA18:: @ 81ABA18 - trainerbattle 5, 231, 0, Text_1C3231, Text_1883E9 + trainerbattle 5, TRAINER_FISHERMAN_WADE, 0, Text_1C3231, Text_1883E9 msgbox Text_18841D, 6 end Route21_South_EventScript_1ABA2F:: @ 81ABA2F - trainerbattle 0, 232, 0, Text_18868C, Text_1886AE + trainerbattle 0, TRAINER_FISHERMAN_NOLAN, 0, Text_18868C, Text_1886AE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABA56 + goto_if eq, EventScript_1ABA56 msgbox Text_1886C5, 6 end EventScript_1ABA56:: @ 81ABA56 - trainerbattle 5, 232, 0, Text_1C3356, Text_1886AE + trainerbattle 5, TRAINER_FISHERMAN_NOLAN, 0, Text_1C3356, Text_1886AE msgbox Text_1886C5, 6 end Route21_North_EventScript_1ABA6D:: @ 81ABA6D - trainerbattle 0, 245, 0, Text_18843C, Text_18845F + trainerbattle 0, TRAINER_SWIMMER_MALE_SPENCER, 0, Text_18843C, Text_18845F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABA94 + goto_if eq, EventScript_1ABA94 msgbox Text_188465, 6 end EventScript_1ABA94:: @ 81ABA94 - trainerbattle 5, 245, 0, Text_1C3264, Text_18845F + trainerbattle 5, TRAINER_SWIMMER_MALE_SPENCER, 0, Text_1C3264, Text_18845F msgbox Text_188465, 6 end Route21_South_EventScript_1ABAAB:: @ 81ABAAB - trainerbattle 0, 246, 0, Text_1884D4, Text_1884F0 + trainerbattle 0, TRAINER_SWIMMER_MALE_JACK, 0, Text_1884D4, Text_1884F0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABAD2 + goto_if eq, EventScript_1ABAD2 msgbox Text_1884FF, 6 end EventScript_1ABAD2:: @ 81ABAD2 - trainerbattle 5, 246, 0, Text_1C3298, Text_1884F0 + trainerbattle 5, TRAINER_SWIMMER_MALE_JACK, 0, Text_1C3298, Text_1884F0 msgbox Text_1884FF, 6 end Route21_South_EventScript_1ABAE9:: @ 81ABAE9 - trainerbattle 0, 247, 0, Text_18851F, Text_188543 + trainerbattle 0, TRAINER_SWIMMER_MALE_JEROME, 0, Text_18851F, Text_188543 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABB10 + goto_if eq, EventScript_1ABB10 msgbox Text_188555, 6 end EventScript_1ABB10:: @ 81ABB10 - trainerbattle 5, 247, 0, Text_1C32D3, Text_188543 + trainerbattle 5, TRAINER_SWIMMER_MALE_JEROME, 0, Text_1C32D3, Text_188543 msgbox Text_188555, 6 end Route21_South_EventScript_1ABB27:: @ 81ABB27 - trainerbattle 0, 248, 0, Text_188592, Text_1885B2 + trainerbattle 0, TRAINER_SWIMMER_MALE_ROLAND, 0, Text_188592, Text_1885B2 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABB4E + goto_if eq, EventScript_1ABB4E msgbox Text_1885BF, 6 end EventScript_1ABB4E:: @ 81ABB4E - trainerbattle 5, 248, 0, Text_1C32FD, Text_1885B2 + trainerbattle 5, TRAINER_SWIMMER_MALE_ROLAND, 0, Text_1C32FD, Text_1885B2 msgbox Text_1885BF, 6 end Route21_North_EventScript_1ABB65:: @ 81ABB65 - trainerbattle 4, 491, 0, Text_1886E2, Text_188712, Text_18875E + trainerbattle 4, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1886E2, Text_188712, Text_18875E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABB90 + goto_if eq, EventScript_1ABB90 msgbox Text_188734, 6 end EventScript_1ABB90:: @ 81ABB90 - trainerbattle 7, 491, 0, Text_1C3378, Text_188712, Text_18875E + trainerbattle 7, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1C3378, Text_188712, Text_18875E msgbox Text_188734, 6 end Route21_North_EventScript_1ABBAB:: @ 81ABBAB - trainerbattle 4, 491, 0, Text_1887B4, Text_1887F1, Text_188850 + trainerbattle 4, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1887B4, Text_1887F1, Text_188850 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABBD6 + goto_if eq, EventScript_1ABBD6 msgbox Text_188812, 6 end EventScript_1ABBD6:: @ 81ABBD6 - trainerbattle 7, 491, 0, Text_1C33AE, Text_1887F1, Text_188850 + trainerbattle 7, TRAINER_SIS_AND_BRO_LIL_IAN, 0, Text_1C33AE, Text_1887F1, Text_188850 msgbox Text_188812, 6 end OneIsland_KindleRoad_EventScript_1ABBF1:: @ 81ABBF1 - trainerbattle 0, 547, 0, Text_18961F, Text_18964D + trainerbattle 0, TRAINER_SWIMMER_FEMALE_MARIA, 0, Text_18961F, Text_18964D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABC18 + goto_if eq, EventScript_1ABC18 msgbox Text_189657, 6 end EventScript_1ABC18:: @ 81ABC18 - trainerbattle 5, 547, 0, Text_1C37B5, Text_18964D + trainerbattle 5, TRAINER_SWIMMER_FEMALE_MARIA, 0, Text_1C37B5, Text_18964D msgbox Text_189657, 6 end OneIsland_KindleRoad_EventScript_1ABC2F:: @ 81ABC2F - trainerbattle 0, 548, 0, Text_18968C, Text_1896AC + trainerbattle 0, TRAINER_SWIMMER_FEMALE_ABIGAIL, 0, Text_18968C, Text_1896AC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABC56 + goto_if eq, EventScript_1ABC56 msgbox Text_1896C1, 6 end EventScript_1ABC56:: @ 81ABC56 - trainerbattle 5, 548, 0, Text_1C37E7, Text_1896AC + trainerbattle 5, TRAINER_SWIMMER_FEMALE_ABIGAIL, 0, Text_1C37E7, Text_1896AC msgbox Text_1896C1, 6 end OneIsland_KindleRoad_EventScript_1ABC6D:: @ 81ABC6D - trainerbattle 0, 549, 0, Text_1896F9, Text_189728 + trainerbattle 0, TRAINER_SWIMMER_MALE_FINN, 0, Text_1896F9, Text_189728 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABC94 + goto_if eq, EventScript_1ABC94 msgbox Text_189740, 6 end EventScript_1ABC94:: @ 81ABC94 - trainerbattle 5, 549, 0, Text_1C3807, Text_189728 + trainerbattle 5, TRAINER_SWIMMER_MALE_FINN, 0, Text_1C3807, Text_189728 msgbox Text_189740, 6 end OneIsland_KindleRoad_EventScript_1ABCAB:: @ 81ABCAB - trainerbattle 0, 550, 0, Text_189767, Text_1897A4 + trainerbattle 0, TRAINER_SWIMMER_MALE_GARRETT, 0, Text_189767, Text_1897A4 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABCD2 + goto_if eq, EventScript_1ABCD2 msgbox Text_1897C5, 6 end EventScript_1ABCD2:: @ 81ABCD2 - trainerbattle 5, 550, 0, Text_1C3835, Text_1897A4 + trainerbattle 5, TRAINER_SWIMMER_MALE_GARRETT, 0, Text_1C3835, Text_1897A4 msgbox Text_1897C5, 6 end OneIsland_KindleRoad_EventScript_1ABCE9:: @ 81ABCE9 - trainerbattle 0, 551, 0, Text_1897FF, Text_189833 + trainerbattle 0, TRAINER_FISHERMAN_TOMMY, 0, Text_1897FF, Text_189833 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABD10 + goto_if eq, EventScript_1ABD10 msgbox Text_18984B, 6 end EventScript_1ABD10:: @ 81ABD10 - trainerbattle 5, 551, 0, Text_1C386A, Text_189833 + trainerbattle 5, TRAINER_FISHERMAN_TOMMY, 0, Text_1C386A, Text_189833 msgbox Text_18984B, 6 end OneIsland_KindleRoad_EventScript_1ABD27:: @ 81ABD27 - trainerbattle 0, 518, 0, Text_189883, Text_1898AB + trainerbattle 0, TRAINER_CRUSH_GIRL_SHARON, 0, Text_189883, Text_1898AB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABD4E + goto_if eq, EventScript_1ABD4E msgbox Text_1898C4, 6 end EventScript_1ABD4E:: @ 81ABD4E - trainerbattle 5, 518, 0, Text_1C389F, Text_1898AB + trainerbattle 5, TRAINER_CRUSH_GIRL_SHARON, 0, Text_1C389F, Text_1898AB msgbox Text_1898C4, 6 end OneIsland_KindleRoad_EventScript_1ABD65:: @ 81ABD65 - trainerbattle 0, 552, 0, Text_1898F0, Text_18991B + trainerbattle 0, TRAINER_CRUSH_GIRL_TANYA, 0, Text_1898F0, Text_18991B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABD8C + goto_if eq, EventScript_1ABD8C msgbox Text_18992C, 6 end EventScript_1ABD8C:: @ 81ABD8C - trainerbattle 5, 552, 0, Text_1C38CA, Text_18991B + trainerbattle 5, TRAINER_CRUSH_GIRL_TANYA, 0, Text_1C38CA, Text_18991B msgbox Text_18992C, 6 end OneIsland_KindleRoad_EventScript_1ABDA3:: @ 81ABDA3 - trainerbattle 0, 553, 0, Text_189950, Text_18998C + trainerbattle 0, TRAINER_BLACK_BELT_SHEA, 0, Text_189950, Text_18998C specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABDCA + goto_if eq, EventScript_1ABDCA msgbox Text_189998, 6 end EventScript_1ABDCA:: @ 81ABDCA - trainerbattle 5, 553, 0, Text_1C38FA, Text_18998C + trainerbattle 5, TRAINER_BLACK_BELT_SHEA, 0, Text_1C38FA, Text_18998C msgbox Text_189998, 6 end OneIsland_KindleRoad_EventScript_1ABDE1:: @ 81ABDE1 - trainerbattle 0, 554, 0, Text_1899CE, Text_189A0A + trainerbattle 0, TRAINER_BLACK_BELT_HUGH, 0, Text_1899CE, Text_189A0A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABE08 + goto_if eq, EventScript_1ABE08 msgbox Text_189A13, 6 end EventScript_1ABE08:: @ 81ABE08 - trainerbattle 5, 554, 0, Text_1C3943, Text_189A0A + trainerbattle 5, TRAINER_BLACK_BELT_HUGH, 0, Text_1C3943, Text_189A0A msgbox Text_189A13, 6 end OneIsland_KindleRoad_EventScript_1ABE1F:: @ 81ABE1F - trainerbattle 0, 555, 0, Text_189A53, Text_189A92 + trainerbattle 0, TRAINER_CAMPER_BRYCE, 0, Text_189A53, Text_189A92 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABE46 + goto_if eq, EventScript_1ABE46 msgbox Text_189A9F, 6 end EventScript_1ABE46:: @ 81ABE46 - trainerbattle 5, 555, 0, Text_1C3987, Text_189A92 + trainerbattle 5, TRAINER_CAMPER_BRYCE, 0, Text_1C3987, Text_189A92 msgbox Text_189A9F, 6 end OneIsland_KindleRoad_EventScript_1ABE5D:: @ 81ABE5D - trainerbattle 0, 556, 0, Text_189ACB, Text_189B0B + trainerbattle 0, TRAINER_PICNICKER_CLAIRE, 0, Text_189ACB, Text_189B0B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABE84 + goto_if eq, EventScript_1ABE84 msgbox Text_189B24, 6 end EventScript_1ABE84:: @ 81ABE84 - trainerbattle 5, 556, 0, Text_1C39C6, Text_189B0B + trainerbattle 5, TRAINER_PICNICKER_CLAIRE, 0, Text_1C39C6, Text_189B0B msgbox Text_189B24, 6 end OneIsland_KindleRoad_EventScript_1ABE9B:: @ 81ABE9B - trainerbattle 4, 557, 0, Text_189B4D, Text_189B84, Text_189BDE + trainerbattle 4, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189B4D, Text_189B84, Text_189BDE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABEC6 + goto_if eq, EventScript_1ABEC6 msgbox Text_189BA3, 6 end EventScript_1ABEC6:: @ 81ABEC6 - trainerbattle 7, 557, 0, Text_1C3A05, Text_189B84, Text_189BDE + trainerbattle 7, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_1C3A05, Text_189B84, Text_189BDE msgbox Text_189BA3, 6 end OneIsland_KindleRoad_EventScript_1ABEE1:: @ 81ABEE1 - trainerbattle 4, 557, 0, Text_189C33, Text_189C62, Text_189CAB + trainerbattle 4, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_189C33, Text_189C62, Text_189CAB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABF0C + goto_if eq, EventScript_1ABF0C msgbox Text_189C7E, 6 end EventScript_1ABF0C:: @ 81ABF0C - trainerbattle 7, 557, 0, Text_1C3A55, Text_189C62, Text_189CAB + trainerbattle 7, TRAINER_CRUSH_KIN_MIK_KIA, 0, Text_1C3A55, Text_189C62, Text_189CAB msgbox Text_189C7E, 6 end OneIsland_TreasureBeach_EventScript_1ABF27:: @ 81ABF27 - trainerbattle 0, 546, 0, Text_189D5A, Text_189D8B + trainerbattle 0, TRAINER_SWIMMER_FEMALE_AMARA, 0, Text_189D5A, Text_189D8B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABF4E + goto_if eq, EventScript_1ABF4E msgbox Text_189DA3, 6 end EventScript_1ABF4E:: @ 81ABF4E - trainerbattle 5, 546, 0, Text_1C3773, Text_189D8B + trainerbattle 5, TRAINER_SWIMMER_FEMALE_AMARA, 0, Text_1C3773, Text_189D8B msgbox Text_189DA3, 6 end ThreeIsland_BondBridge_EventScript_1ABF65:: @ 81ABF65 - trainerbattle 0, 523, 0, Text_189E42, Text_189E72 + trainerbattle 0, TRAINER_AROMA_LADY_NIKKI, 0, Text_189E42, Text_189E72 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABF8C + goto_if eq, EventScript_1ABF8C msgbox Text_189E9E, 6 end EventScript_1ABF8C:: @ 81ABF8C - trainerbattle 5, 523, 0, Text_1C3AA7, Text_189E72 + trainerbattle 5, TRAINER_AROMA_LADY_NIKKI, 0, Text_1C3AA7, Text_189E72 msgbox Text_189E9E, 6 end ThreeIsland_BondBridge_EventScript_1ABFA3:: @ 81ABFA3 - trainerbattle 0, 558, 0, Text_189ED4, Text_189EFA + trainerbattle 0, TRAINER_AROMA_LADY_VIOLET, 0, Text_189ED4, Text_189EFA specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ABFCA + goto_if eq, EventScript_1ABFCA msgbox Text_189F21, 6 end EventScript_1ABFCA:: @ 81ABFCA - trainerbattle 5, 558, 0, Text_1C3ABF, Text_189EFA + trainerbattle 5, TRAINER_AROMA_LADY_VIOLET, 0, Text_1C3ABF, Text_189EFA msgbox Text_189F21, 6 end ThreeIsland_BondBridge_EventScript_1ABFE1:: @ 81ABFE1 - trainerbattle 0, 519, 0, Text_189F63, Text_189F9A + trainerbattle 0, TRAINER_TUBER_AMIRA, 0, Text_189F63, Text_189F9A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC008 + goto_if eq, EventScript_1AC008 msgbox Text_189FA8, 6 end EventScript_1AC008:: @ 81AC008 - trainerbattle 5, 519, 0, Text_1C3AF2, Text_189F9A + trainerbattle 5, TRAINER_TUBER_AMIRA, 0, Text_1C3AF2, Text_189F9A msgbox Text_189FA8, 6 end ThreeIsland_BondBridge_EventScript_1AC01F:: @ 81AC01F - trainerbattle 0, 559, 0, Text_189FDB, Text_189FEE + trainerbattle 0, TRAINER_TUBER_ALEXIS, 0, Text_189FDB, Text_189FEE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC046 + goto_if eq, EventScript_1AC046 msgbox Text_18A000, 6 end EventScript_1AC046:: @ 81AC046 - trainerbattle 5, 559, 0, Text_1C3B1D, Text_189FEE + trainerbattle 5, TRAINER_TUBER_ALEXIS, 0, Text_1C3B1D, Text_189FEE msgbox Text_18A000, 6 end ThreeIsland_BondBridge_EventScript_1AC05D:: @ 81AC05D - trainerbattle 0, 561, 0, Text_18A01F, Text_18A053 + trainerbattle 0, TRAINER_SWIMMER_FEMALE_TISHA, 0, Text_18A01F, Text_18A053 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC084 + goto_if eq, EventScript_1AC084 msgbox Text_18A082, 6 end EventScript_1AC084:: @ 81AC084 - trainerbattle 5, 561, 0, Text_1C3B30, Text_18A053 + trainerbattle 5, TRAINER_SWIMMER_FEMALE_TISHA, 0, Text_1C3B30, Text_18A053 msgbox Text_18A082, 6 end ThreeIsland_BondBridge_EventScript_1AC09B:: @ 81AC09B - trainerbattle 4, 560, 0, Text_18A0C4, Text_18A0F7, Text_18A138 + trainerbattle 4, TRAINER_TWINS_JOY_MEG, 0, Text_18A0C4, Text_18A0F7, Text_18A138 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC0C6 + goto_if eq, EventScript_1AC0C6 msgbox Text_18A106, 6 end EventScript_1AC0C6:: @ 81AC0C6 - trainerbattle 7, 560, 0, Text_1C3B6E, Text_18A0F7, Text_18A138 + trainerbattle 7, TRAINER_TWINS_JOY_MEG, 0, Text_1C3B6E, Text_18A0F7, Text_18A138 msgbox Text_18A106, 6 end ThreeIsland_BondBridge_EventScript_1AC0E1:: @ 81AC0E1 - trainerbattle 4, 560, 0, Text_18A179, Text_18A1A3, Text_18A1CD + trainerbattle 4, TRAINER_TWINS_JOY_MEG, 0, Text_18A179, Text_18A1A3, Text_18A1CD specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC10C + goto_if eq, EventScript_1AC10C msgbox Text_18A1B2, 6 end EventScript_1AC10C:: @ 81AC10C - trainerbattle 7, 560, 0, Text_1C3B99, Text_18A1A3, Text_18A1CD + trainerbattle 7, TRAINER_TWINS_JOY_MEG, 0, Text_1C3B99, Text_18A1A3, Text_18A1CD msgbox Text_18A1B2, 6 end FiveIsland_ResortGorgeous_EventScript_1AC127:: @ 81AC127 - trainerbattle 0, 526, 0, Text_18A3E2, Text_18A40E + trainerbattle 0, TRAINER_PAINTER_DAISY, 0, Text_18A3E2, Text_18A40E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC14E + goto_if eq, EventScript_1AC14E msgbox Text_18A430, 6 end EventScript_1AC14E:: @ 81AC14E - trainerbattle 5, 526, 0, Text_1C3BF6, Text_18A40E + trainerbattle 5, TRAINER_PAINTER_DAISY, 0, Text_1C3BF6, Text_18A40E msgbox Text_18A430, 6 end FiveIsland_ResortGorgeous_EventScript_1AC165:: @ 81AC165 - trainerbattle 0, 562, 0, Text_18A461, Text_18A49E + trainerbattle 0, TRAINER_PAINTER_CELINA, 0, Text_18A461, Text_18A49E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC18C + goto_if eq, EventScript_1AC18C msgbox Text_18A4C6, 6 end EventScript_1AC18C:: @ 81AC18C - trainerbattle 5, 562, 0, Text_1C3C28, Text_18A49E + trainerbattle 5, TRAINER_PAINTER_CELINA, 0, Text_1C3C28, Text_18A49E msgbox Text_18A4C6, 6 end FiveIsland_ResortGorgeous_EventScript_1AC1A3:: @ 81AC1A3 - trainerbattle 0, 563, 0, Text_18A50E, Text_18A535 + trainerbattle 0, TRAINER_PAINTER_RAYNA, 0, Text_18A50E, Text_18A535 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC1CA + goto_if eq, EventScript_1AC1CA msgbox Text_18A555, 6 end EventScript_1AC1CA:: @ 81AC1CA - trainerbattle 5, 563, 0, Text_1C3C70, Text_18A535 + trainerbattle 5, TRAINER_PAINTER_RAYNA, 0, Text_1C3C70, Text_18A535 msgbox Text_18A555, 6 end FiveIsland_ResortGorgeous_EventScript_1AC1E1:: @ 81AC1E1 - trainerbattle 0, 525, 0, Text_18A5B9, Text_18A5EE + trainerbattle 0, TRAINER_LADY_JACKI, 0, Text_18A5B9, Text_18A5EE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC208 + goto_if eq, EventScript_1AC208 msgbox Text_18A601, 6 end EventScript_1AC208:: @ 81AC208 - trainerbattle 5, 525, 0, Text_1C3CB0, Text_18A5EE + trainerbattle 5, TRAINER_LADY_JACKI, 0, Text_1C3CB0, Text_18A5EE msgbox Text_18A601, 6 end FiveIsland_ResortGorgeous_EventScript_1AC21F:: @ 81AC21F - trainerbattle 0, 564, 0, Text_18A645, Text_18A67F + trainerbattle 0, TRAINER_LADY_GILLIAN, 0, Text_18A645, Text_18A67F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC246 + goto_if eq, EventScript_1AC246 msgbox Text_18A699, 6 end EventScript_1AC246:: @ 81AC246 - trainerbattle 5, 564, 0, Text_1C3CF1, Text_18A67F + trainerbattle 5, TRAINER_LADY_GILLIAN, 0, Text_1C3CF1, Text_18A67F msgbox Text_18A699, 6 end FiveIsland_ResortGorgeous_EventScript_1AC25D:: @ 81AC25D - trainerbattle 0, 565, 0, Text_18A6DA, Text_18A6FE + trainerbattle 0, TRAINER_YOUNGSTER_DESTIN, 0, Text_18A6DA, Text_18A6FE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC284 + goto_if eq, EventScript_1AC284 msgbox Text_18A715, 6 end EventScript_1AC284:: @ 81AC284 - trainerbattle 5, 565, 0, Text_1C3D47, Text_18A6FE + trainerbattle 5, TRAINER_YOUNGSTER_DESTIN, 0, Text_1C3D47, Text_18A6FE msgbox Text_18A715, 6 end FiveIsland_ResortGorgeous_EventScript_1AC29B:: @ 81AC29B - trainerbattle 0, 566, 0, Text_18A74A, Text_18A786 + trainerbattle 0, TRAINER_SWIMMER_MALE_TOBY, 0, Text_18A74A, Text_18A786 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC2C2 + goto_if eq, EventScript_1AC2C2 msgbox Text_18A7AC, 6 end EventScript_1AC2C2:: @ 81AC2C2 - trainerbattle 5, 566, 0, Text_1C3D73, Text_18A786 + trainerbattle 5, TRAINER_SWIMMER_MALE_TOBY, 0, Text_1C3D73, Text_18A786 msgbox Text_18A7AC, 6 end FiveIsland_WaterLabyrinth_EventScript_1AC2D9:: @ 81AC2D9 - trainerbattle 0, 520, 0, Text_18AAD5, Text_18AB0B + trainerbattle 0, TRAINER_PKMN_BREEDER_ALIZE, 0, Text_18AAD5, Text_18AB0B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC300 + goto_if eq, EventScript_1AC300 msgbox Text_18AB37, 6 end EventScript_1AC300:: @ 81AC300 - trainerbattle 5, 520, 0, Text_1C3BB7, Text_18AB0B + trainerbattle 5, TRAINER_PKMN_BREEDER_ALIZE, 0, Text_1C3BB7, Text_18AB0B msgbox Text_18AB37, 6 end FiveIsland_MemorialPillar_EventScript_1AC317:: @ 81AC317 - trainerbattle 0, 570, 0, Text_18AE50, Text_18AEA8 + trainerbattle 0, TRAINER_BIRD_KEEPER_MILO, 0, Text_18AE50, Text_18AEA8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC33E + goto_if eq, EventScript_1AC33E msgbox Text_18AEB6, 6 end EventScript_1AC33E:: @ 81AC33E - trainerbattle 5, 570, 0, Text_1C3DA2, Text_18AEA8 + trainerbattle 5, TRAINER_BIRD_KEEPER_MILO, 0, Text_1C3DA2, Text_18AEA8 msgbox Text_18AEB6, 6 end FiveIsland_MemorialPillar_EventScript_1AC355:: @ 81AC355 - trainerbattle 0, 571, 0, Text_18AEDC, Text_18AF39 + trainerbattle 0, TRAINER_BIRD_KEEPER_CHAZ, 0, Text_18AEDC, Text_18AF39 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC37C + goto_if eq, EventScript_1AC37C msgbox Text_18AF45, 6 end EventScript_1AC37C:: @ 81AC37C - trainerbattle 5, 571, 0, Text_1C3E0F, Text_18AF39 + trainerbattle 5, TRAINER_BIRD_KEEPER_CHAZ, 0, Text_1C3E0F, Text_18AF39 msgbox Text_18AF45, 6 end FiveIsland_MemorialPillar_EventScript_1AC393:: @ 81AC393 - trainerbattle 0, 572, 0, Text_18AF72, Text_18AFCC + trainerbattle 0, TRAINER_BIRD_KEEPER_HAROLD, 0, Text_18AF72, Text_18AFCC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC3BA + goto_if eq, EventScript_1AC3BA msgbox Text_18AFF2, 6 end EventScript_1AC3BA:: @ 81AC3BA - trainerbattle 5, 572, 0, Text_1C3E6A, Text_18AFCC + trainerbattle 5, TRAINER_BIRD_KEEPER_HAROLD, 0, Text_1C3E6A, Text_18AFCC msgbox Text_18AFF2, 6 end SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1 - trainerbattle 0, 573, 0, Text_18B400, Text_18B43B + trainerbattle 0, TRAINER_FISHERMAN_TYLOR, 0, Text_18B400, Text_18B43B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC3F8 + goto_if eq, EventScript_1AC3F8 msgbox Text_18B451, 6 end EventScript_1AC3F8:: @ 81AC3F8 - trainerbattle 5, 573, 0, Text_1C3ED0, Text_18B43B + trainerbattle 5, TRAINER_FISHERMAN_TYLOR, 0, Text_1C3ED0, Text_18B43B msgbox Text_18B451, 6 end SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F - trainerbattle 0, 574, 0, Text_18B48F, Text_18B4C5 + trainerbattle 0, TRAINER_SWIMMER_MALE_MYMO, 0, Text_18B48F, Text_18B4C5 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC436 + goto_if eq, EventScript_1AC436 msgbox Text_18B4D1, 6 end EventScript_1AC436:: @ 81AC436 - trainerbattle 5, 574, 0, Text_1C3F11, Text_18B4C5 + trainerbattle 5, TRAINER_SWIMMER_MALE_MYMO, 0, Text_1C3F11, Text_18B4C5 msgbox Text_18B4D1, 6 end SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D - trainerbattle 0, 575, 0, Text_18B4FA, Text_18B539 + trainerbattle 0, TRAINER_SWIMMER_FEMALE_NICOLE, 0, Text_18B4FA, Text_18B539 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC474 + goto_if eq, EventScript_1AC474 msgbox Text_18B573, 6 end EventScript_1AC474:: @ 81AC474 - trainerbattle 5, 575, 0, Text_1C3F51, Text_18B539 + trainerbattle 5, TRAINER_SWIMMER_FEMALE_NICOLE, 0, Text_1C3F51, Text_18B539 msgbox Text_18B573, 6 end SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B - trainerbattle 4, 576, 0, Text_18B5C8, Text_18B5F4, Text_18B660 + trainerbattle 4, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B5C8, Text_18B5F4, Text_18B660 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC4B6 + goto_if eq, EventScript_1AC4B6 msgbox Text_18B62E, 6 end EventScript_1AC4B6:: @ 81AC4B6 - trainerbattle 7, 576, 0, Text_1C3F7B, Text_18B5F4, Text_18B660 + trainerbattle 7, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_1C3F7B, Text_18B5F4, Text_18B660 msgbox Text_18B62E, 6 end SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1 - trainerbattle 4, 576, 0, Text_18B6C1, Text_18B6EF, Text_18B762 + trainerbattle 4, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_18B6C1, Text_18B6EF, Text_18B762 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC4FC + goto_if eq, EventScript_1AC4FC msgbox Text_18B720, 6 end EventScript_1AC4FC:: @ 81AC4FC - trainerbattle 7, 576, 0, Text_1C3FB3, Text_18B6EF, Text_18B762 + trainerbattle 7, TRAINER_SIS_AND_BRO_AVA_GEB, 0, Text_1C3FB3, Text_18B6EF, Text_18B762 msgbox Text_18B720, 6 end SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517 - trainerbattle 0, 517, 0, Text_18B7B0, Text_18B7F0 + trainerbattle 0, TRAINER_PSYCHIC_JACLYN, 0, Text_18B7B0, Text_18B7F0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC53E + goto_if eq, EventScript_1AC53E msgbox Text_18B7FD, 6 end EventScript_1AC53E:: @ 81AC53E - trainerbattle 5, 517, 0, Text_1C3FE9, Text_18B7F0 + trainerbattle 5, TRAINER_PSYCHIC_JACLYN, 0, Text_1C3FE9, Text_18B7F0 msgbox Text_18B7FD, 6 end SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555 - trainerbattle 0, 577, 0, Text_18B896, Text_18B8C8 + trainerbattle 0, TRAINER_AROMA_LADY_ROSE, 0, Text_18B896, Text_18B8C8 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC57C + goto_if eq, EventScript_1AC57C msgbox Text_18B8F7, 6 end EventScript_1AC57C:: @ 81AC57C - trainerbattle 5, 577, 0, Text_1C4028, Text_18B8C8 + trainerbattle 5, TRAINER_AROMA_LADY_ROSE, 0, Text_1C4028, Text_18B8C8 msgbox Text_18B8F7, 6 end SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593 - trainerbattle 0, 291, 0, Text_18B959, Text_18B988 + trainerbattle 0, TRAINER_JUGGLER_EDWARD, 0, Text_18B959, Text_18B988 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC5BA + goto_if eq, EventScript_1AC5BA msgbox Text_18B9A5, 6 end EventScript_1AC5BA:: @ 81AC5BA - trainerbattle 5, 291, 0, Text_1C4057, Text_18B988 + trainerbattle 5, TRAINER_JUGGLER_EDWARD, 0, Text_1C4057, Text_18B988 msgbox Text_18B9A5, 6 end SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1 - trainerbattle 0, 578, 0, Text_18B9EC, Text_18BA47 + trainerbattle 0, TRAINER_SWIMMER_MALE_SAMIR, 0, Text_18B9EC, Text_18BA47 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC5F8 + goto_if eq, EventScript_1AC5F8 msgbox Text_18BA57, 6 end EventScript_1AC5F8:: @ 81AC5F8 - trainerbattle 5, 578, 0, Text_1C407F, Text_18BA47 + trainerbattle 5, TRAINER_SWIMMER_MALE_SAMIR, 0, Text_1C407F, Text_18BA47 msgbox Text_18BA57, 6 end SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F - trainerbattle 0, 579, 0, Text_18BA86, Text_18BAC0 + trainerbattle 0, TRAINER_SWIMMER_FEMALE_DENISE, 0, Text_18BA86, Text_18BAC0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC636 + goto_if eq, EventScript_1AC636 msgbox Text_18BAE0, 6 end EventScript_1AC636:: @ 81AC636 - trainerbattle 5, 579, 0, Text_1C40D9, Text_18BAC0 + trainerbattle 5, TRAINER_SWIMMER_FEMALE_DENISE, 0, Text_1C40D9, Text_18BAC0 msgbox Text_18BAE0, 6 end SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D - trainerbattle 4, 580, 0, Text_18BBBA, Text_18BBE2, Text_18BC24 + trainerbattle 4, TRAINER_TWINS_MIU_MIA, 0, Text_18BBBA, Text_18BBE2, Text_18BC24 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC678 + goto_if eq, EventScript_1AC678 msgbox Text_18BBF6, 6 end EventScript_1AC678:: @ 81AC678 - trainerbattle 7, 580, 0, Text_1C4138, Text_18BBE2, Text_18BC24 + trainerbattle 7, TRAINER_TWINS_MIU_MIA, 0, Text_1C4138, Text_18BBE2, Text_18BC24 msgbox Text_18BBF6, 6 end SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693 - trainerbattle 4, 580, 0, Text_18BC5A, Text_18BC84, Text_18BCCF + trainerbattle 4, TRAINER_TWINS_MIU_MIA, 0, Text_18BC5A, Text_18BC84, Text_18BCCF specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC6BE + goto_if eq, EventScript_1AC6BE msgbox Text_18BCAE, 6 end EventScript_1AC6BE:: @ 81AC6BE - trainerbattle 7, 580, 0, Text_1C4166, Text_18BC84, Text_18BCCF + trainerbattle 7, TRAINER_TWINS_MIU_MIA, 0, Text_1C4166, Text_18BC84, Text_18BCCF msgbox Text_18BCAE, 6 end SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9 - trainerbattle 0, 581, 0, Text_18BB2D, Text_18BB62 + trainerbattle 0, TRAINER_HIKER_EARL, 0, Text_18BB2D, Text_18BB62 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC700 + goto_if eq, EventScript_1AC700 msgbox Text_18BB8B, 6 end EventScript_1AC700:: @ 81AC700 - trainerbattle 5, 581, 0, Text_1C40FA, Text_18BB62 + trainerbattle 5, TRAINER_HIKER_EARL, 0, Text_1C40FA, Text_18BB62 msgbox Text_18BB8B, 6 end SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717 - trainerbattle 0, 524, 0, Text_18BE5D, Text_18BE9B + trainerbattle 0, TRAINER_RUIN_MANIAC_STANLY, 0, Text_18BE5D, Text_18BE9B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC73E + goto_if eq, EventScript_1AC73E msgbox Text_18BEA0, 6 end EventScript_1AC73E:: @ 81AC73E - trainerbattle 5, 524, 0, Text_1C4196, Text_18BE9B + trainerbattle 5, TRAINER_RUIN_MANIAC_STANLY, 0, Text_1C4196, Text_18BE9B msgbox Text_18BEA0, 6 end SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755 - trainerbattle 0, 582, 0, Text_18BF05, Text_18BF33 + trainerbattle 0, TRAINER_RUIN_MANIAC_FOSTER, 0, Text_18BF05, Text_18BF33 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC77C + goto_if eq, EventScript_1AC77C msgbox Text_18BF6C, 6 end EventScript_1AC77C:: @ 81AC77C - trainerbattle 5, 582, 0, Text_1C41D4, Text_18BF33 + trainerbattle 5, TRAINER_RUIN_MANIAC_FOSTER, 0, Text_1C41D4, Text_18BF33 msgbox Text_18BF6C, 6 end SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793 - trainerbattle 0, 583, 0, Text_18BFC5, Text_18C03B + trainerbattle 0, TRAINER_RUIN_MANIAC_LARRY, 0, Text_18BFC5, Text_18C03B specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC7BA + goto_if eq, EventScript_1AC7BA msgbox Text_18C04C, 6 end EventScript_1AC7BA:: @ 81AC7BA - trainerbattle 5, 583, 0, Text_1C4210, Text_18C03B + trainerbattle 5, TRAINER_RUIN_MANIAC_LARRY, 0, Text_1C4210, Text_18C03B msgbox Text_18C04C, 6 end SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1 - trainerbattle 0, 584, 0, Text_18C09C, Text_18C0BB + trainerbattle 0, TRAINER_HIKER_DARYL, 0, Text_18C09C, Text_18C0BB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC7F8 + goto_if eq, EventScript_1AC7F8 msgbox Text_18C0EA, 6 end EventScript_1AC7F8:: @ 81AC7F8 - trainerbattle 5, 584, 0, Text_1C4280, Text_18C0BB + trainerbattle 5, TRAINER_HIKER_DARYL, 0, Text_1C4280, Text_18C0BB msgbox Text_18C0EA, 6 end SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F - trainerbattle 0, 585, 0, Text_18C10A, Text_18C140 + trainerbattle 0, TRAINER_POKEMANIAC_HECTOR, 0, Text_18C10A, Text_18C140 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC836 + goto_if eq, EventScript_1AC836 msgbox Text_18C17A, 6 end EventScript_1AC836:: @ 81AC836 - trainerbattle 5, 585, 0, Text_1C42A0, Text_18C140 + trainerbattle 5, TRAINER_POKEMANIAC_HECTOR, 0, Text_1C42A0, Text_18C140 msgbox Text_18C17A, 6 end SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D - trainerbattle 0, 586, 0, Text_18C1ED, Text_18C205 + trainerbattle 0, TRAINER_PSYCHIC_DARIO, 0, Text_18C1ED, Text_18C205 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC874 + goto_if eq, EventScript_1AC874 msgbox Text_18C20E, 6 end EventScript_1AC874:: @ 81AC874 - trainerbattle 5, 586, 0, Text_1C42D6, Text_18C205 + trainerbattle 5, TRAINER_PSYCHIC_DARIO, 0, Text_1C42D6, Text_18C205 msgbox Text_18C20E, 6 end SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B - trainerbattle 0, 587, 0, Text_18C283, Text_18C2BC + trainerbattle 0, TRAINER_PSYCHIC_RODETTE, 0, Text_18C283, Text_18C2BC specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC8B2 + goto_if eq, EventScript_1AC8B2 msgbox Text_18C2D5, 6 end EventScript_1AC8B2:: @ 81AC8B2 - trainerbattle 5, 587, 0, Text_1C42EE, Text_18C2BC + trainerbattle 5, TRAINER_PSYCHIC_RODETTE, 0, Text_1C42EE, Text_18C2BC msgbox Text_18C2D5, 6 end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9 - trainerbattle 0, 588, 0, Text_18C3BC, Text_18C3E7 + trainerbattle 0, TRAINER_AROMA_LADY_MIAH, 0, Text_18C3BC, Text_18C3E7 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC8F0 + goto_if eq, EventScript_1AC8F0 msgbox Text_18C3FF, 6 end EventScript_1AC8F0:: @ 81AC8F0 - trainerbattle 5, 588, 0, Text_1C4327, Text_18C3E7 + trainerbattle 5, TRAINER_AROMA_LADY_MIAH, 0, Text_1C4327, Text_18C3E7 msgbox Text_18C3FF, 6 end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907 - trainerbattle 4, 589, 0, Text_18C632, Text_18C662, Text_18C6AB + trainerbattle 4, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C632, Text_18C662, Text_18C6AB specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC932 + goto_if eq, EventScript_1AC932 msgbox Text_18C683, 6 end EventScript_1AC932:: @ 81AC932 - trainerbattle 7, 589, 0, Text_1C4416, Text_18C662, Text_18C6AB + trainerbattle 7, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_1C4416, Text_18C662, Text_18C6AB msgbox Text_18C683, 6 end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D - trainerbattle 4, 589, 0, Text_18C700, Text_18C73B, Text_18C7BD + trainerbattle 4, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_18C700, Text_18C73B, Text_18C7BD specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC978 + goto_if eq, EventScript_1AC978 msgbox Text_18C773, 6 end EventScript_1AC978:: @ 81AC978 - trainerbattle 7, 589, 0, Text_1C444C, Text_18C73B, Text_18C7BD + trainerbattle 7, TRAINER_YOUNG_COUPLE_EVE_JON, 0, Text_1C444C, Text_18C73B, Text_18C7BD msgbox Text_18C773, 6 end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993 - trainerbattle 0, 590, 0, Text_18C44B, Text_18C473 + trainerbattle 0, TRAINER_JUGGLER_MASON, 0, Text_18C44B, Text_18C473 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC9BA + goto_if eq, EventScript_1AC9BA msgbox Text_18C4BA, 6 end EventScript_1AC9BA:: @ 81AC9BA - trainerbattle 5, 590, 0, Text_1C4374, Text_18C473 + trainerbattle 5, TRAINER_JUGGLER_MASON, 0, Text_1C4374, Text_18C473 msgbox Text_18C4BA, 6 end SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1 - trainerbattle 0, 521, 0, Text_18C500, Text_18C543 + trainerbattle 0, TRAINER_PKMN_RANGER_NICOLAS, 0, Text_18C500, Text_18C543 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1AC9F8 + goto_if eq, EventScript_1AC9F8 msgbox Text_18C54B, 6 end EventScript_1AC9F8:: @ 81AC9F8 - trainerbattle 5, 521, 0, Text_1C43AD, Text_18C543 + trainerbattle 5, TRAINER_PKMN_RANGER_NICOLAS, 0, Text_1C43AD, Text_18C543 msgbox Text_18C54B, 6 end SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F - trainerbattle 0, 522, 0, Text_18C5AA, Text_18C5CD + trainerbattle 0, TRAINER_PKMN_RANGER_MADELINE, 0, Text_18C5AA, Text_18C5CD specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACA36 + goto_if eq, EventScript_1ACA36 msgbox Text_18C5F5, 6 end EventScript_1ACA36:: @ 81ACA36 - trainerbattle 5, 522, 0, Text_1C43EC, Text_18C5CD + trainerbattle 5, TRAINER_PKMN_RANGER_MADELINE, 0, Text_1C43EC, Text_18C5CD msgbox Text_18C5F5, 6 end SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D - trainerbattle 0, 591, 0, Text_18C887, Text_18C8A6 + trainerbattle 0, TRAINER_CRUSH_GIRL_CYNDY, 0, Text_18C887, Text_18C8A6 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACA74 + goto_if eq, EventScript_1ACA74 msgbox Text_18C8C2, 6 end EventScript_1ACA74:: @ 81ACA74 - trainerbattle 5, 591, 0, Text_1C4491, Text_18C8A6 + trainerbattle 5, TRAINER_CRUSH_GIRL_CYNDY, 0, Text_1C4491, Text_18C8A6 msgbox Text_18C8C2, 6 end SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B - trainerbattle 0, 593, 0, Text_18C8FD, Text_18C980 + trainerbattle 0, TRAINER_TAMER_EVAN, 0, Text_18C8FD, Text_18C980 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACAB2 + goto_if eq, EventScript_1ACAB2 msgbox Text_18C999, 6 end EventScript_1ACAB2:: @ 81ACAB2 - trainerbattle 5, 593, 0, Text_1C44CB, Text_18C980 + trainerbattle 5, TRAINER_TAMER_EVAN, 0, Text_1C44CB, Text_18C980 msgbox Text_18C999, 6 end SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9 - trainerbattle 0, 596, 0, Text_18CA2F, Text_18CA6F + trainerbattle 0, TRAINER_PKMN_RANGER_JACKSON, 0, Text_18CA2F, Text_18CA6F specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACAF0 + goto_if eq, EventScript_1ACAF0 msgbox Text_18CA9C, 6 end EventScript_1ACAF0:: @ 81ACAF0 - trainerbattle 5, 596, 0, Text_1C454E, Text_18CA6F + trainerbattle 5, TRAINER_PKMN_RANGER_JACKSON, 0, Text_1C454E, Text_18CA6F msgbox Text_18CA9C, 6 end SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07 - trainerbattle 0, 598, 0, Text_18CB16, Text_18CB3E + trainerbattle 0, TRAINER_PKMN_RANGER_KATELYN, 0, Text_18CB16, Text_18CB3E specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACB2E + goto_if eq, EventScript_1ACB2E msgbox Text_18CB6C, 6 end EventScript_1ACB2E:: @ 81ACB2E - trainerbattle 5, 598, 0, Text_1C458E, Text_18CB3E + trainerbattle 5, TRAINER_PKMN_RANGER_KATELYN, 0, Text_1C458E, Text_18CB3E msgbox Text_18CB6C, 6 end SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45 - trainerbattle 0, 599, 0, Text_18CBB4, Text_18CBE0 + trainerbattle 0, TRAINER_COOLTRAINER_LEROY, 0, Text_18CBB4, Text_18CBE0 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACB6C + goto_if eq, EventScript_1ACB6C msgbox Text_18CC09, 6 end EventScript_1ACB6C:: @ 81ACB6C - trainerbattle 5, 599, 0, Text_1C45C2, Text_18CBE0 + trainerbattle 5, TRAINER_COOLTRAINER_LEROY, 0, Text_1C45C2, Text_18CBE0 msgbox Text_18CC09, 6 end SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83 - trainerbattle 0, 600, 0, Text_18CC4F, Text_18CCAE + trainerbattle 0, TRAINER_COOLTRAINER_MICHELLE, 0, Text_18CC4F, Text_18CCAE specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACBAA + goto_if eq, EventScript_1ACBAA msgbox Text_18CCEA, 6 end EventScript_1ACBAA:: @ 81ACBAA - trainerbattle 5, 600, 0, Text_1C45FB, Text_18CCAE + trainerbattle 5, TRAINER_COOLTRAINER_MICHELLE, 0, Text_1C45FB, Text_18CCAE msgbox Text_18CCEA, 6 end SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1 - trainerbattle 4, 601, 0, Text_18CD49, Text_18CD75, Text_18CDE2 + trainerbattle 4, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CD49, Text_18CD75, Text_18CDE2 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACBEC + goto_if eq, EventScript_1ACBEC msgbox Text_18CD9C, 6 end EventScript_1ACBEC:: @ 81ACBEC - trainerbattle 7, 601, 0, Text_1C4662, Text_18CD75, Text_18CDE2 + trainerbattle 7, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_1C4662, Text_18CD75, Text_18CDE2 msgbox Text_18CD9C, 6 end SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07 - trainerbattle 4, 601, 0, Text_18CE20, Text_18CE5A, Text_18CEF4 + trainerbattle 4, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_18CE20, Text_18CE5A, Text_18CEF4 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACC32 + goto_if eq, EventScript_1ACC32 msgbox Text_18CE78, 6 end EventScript_1ACC32:: @ 81ACC32 - trainerbattle 7, 601, 0, Text_1C4699, Text_18CE5A, Text_18CEF4 + trainerbattle 7, TRAINER_COOL_COUPLE_LEX_NYA, 0, Text_1C4699, Text_18CE5A, Text_18CEF4 msgbox Text_18CE78, 6 end SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D - trainerbattle 0, 602, 0, Text_18CFFB, Text_18D02A + trainerbattle 0, TRAINER_RUIN_MANIAC_BRANDON, 0, Text_18CFFB, Text_18D02A specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACC74 + goto_if eq, EventScript_1ACC74 msgbox Text_18D061, 6 end EventScript_1ACC74:: @ 81ACC74 - trainerbattle 5, 602, 0, Text_1C46D3, Text_18D02A + trainerbattle 5, TRAINER_RUIN_MANIAC_BRANDON, 0, Text_1C46D3, Text_18D02A msgbox Text_18D061, 6 end SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B - trainerbattle 0, 603, 0, Text_18D0D9, Text_18D108 + trainerbattle 0, TRAINER_RUIN_MANIAC_BENJAMIN, 0, Text_18D0D9, Text_18D108 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACCB2 + goto_if eq, EventScript_1ACCB2 msgbox Text_18D125, 6 end EventScript_1ACCB2:: @ 81ACCB2 - trainerbattle 5, 603, 0, Text_1C470A, Text_18D108 + trainerbattle 5, TRAINER_RUIN_MANIAC_BENJAMIN, 0, Text_1C470A, Text_18D108 msgbox Text_18D125, 6 end SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9 - trainerbattle 0, 604, 0, Text_18D18F, Text_18D1B5 + trainerbattle 0, TRAINER_PAINTER_EDNA, 0, Text_18D18F, Text_18D1B5 specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACCF0 + goto_if eq, EventScript_1ACCF0 msgbox Text_18D1E3, 6 end EventScript_1ACCF0:: @ 81ACCF0 - trainerbattle 5, 604, 0, Text_1C4739, Text_18D1B5 + trainerbattle 5, TRAINER_PAINTER_EDNA, 0, Text_1C4739, Text_18D1B5 msgbox Text_18D1E3, 6 end SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07 - trainerbattle 0, 605, 0, Text_18D22F, Text_18D26D + trainerbattle 0, TRAINER_GENTLEMAN_CLIFFORD, 0, Text_18D22F, Text_18D26D specialvar VAR_RESULT, sub_810CD4C compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1ACD2E + goto_if eq, EventScript_1ACD2E msgbox Text_18D284, 6 end EventScript_1ACD2E:: @ 81ACD2E - trainerbattle 5, 605, 0, Text_1C476A, Text_18D26D + trainerbattle 5, TRAINER_GENTLEMAN_CLIFFORD, 0, Text_1C476A, Text_18D26D msgbox Text_18D284, 6 end @@ -7668,12 +7574,8 @@ Text_1ACD45:: @ 81ACD45 ViridianCity_House2_EventScript_1ACD65:: @ 81ACD65 lock faceplayer - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_OAK, 3 + famechecker FAMECHECKER_DAISY, 3 textcolor 3 msgbox gUnknown_81B1AB9 release @@ -7682,12 +7584,8 @@ ViridianCity_House2_EventScript_1ACD65:: @ 81ACD65 EventScript_1ACD8D:: @ 81ACD8D lock faceplayer - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_DAISY, 1 + famechecker FAMECHECKER_OAK, 4 textcolor 3 msgbox gUnknown_81B1AB9 release @@ -7696,9 +7594,7 @@ EventScript_1ACD8D:: @ 81ACD8D EventScript_1ACDB5:: @ 81ACDB5 lock faceplayer - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_DAISY, 4 textcolor 3 msgbox gUnknown_81B1AB9 release @@ -7706,9 +7602,7 @@ EventScript_1ACDB5:: @ 81ACDB5 FourIsland_PokemonCenter_1F_EventScript_1ACDD0:: @ 81ACDD0 lockall - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_DAISY, 5 textcolor 3 msgbox gUnknown_81B1B3D releaseall @@ -7717,9 +7611,7 @@ FourIsland_PokemonCenter_1F_EventScript_1ACDD0:: @ 81ACDD0 Route4_EventScript_1ACDEA:: @ 81ACDEA lock faceplayer - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BROCK, 3 msgbox Text_183D26 release end @@ -7727,18 +7619,14 @@ Route4_EventScript_1ACDEA:: @ 81ACDEA MtMoon_1F_EventScript_1ACE03:: @ 81ACE03 lock faceplayer - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BROCK, 4 msgbox Text_172B00 release end PewterCity_Museum_1F_EventScript_1ACE1C:: @ 81ACE1C lockall - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BROCK, 5 textcolor 3 msgbox gUnknown_81B146A releaseall @@ -7747,9 +7635,7 @@ PewterCity_Museum_1F_EventScript_1ACE1C:: @ 81ACE1C Route20_EventScript_1ACE36:: @ 81ACE36 lock faceplayer - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_MISTY, 3 msgbox Text_1882E1 release end @@ -7757,9 +7643,7 @@ Route20_EventScript_1ACE36:: @ 81ACE36 Route25_EventScript_1ACE4F:: @ 81ACE4F lock faceplayer - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_MISTY, 4 msgbox Text_189569 release end @@ -7767,9 +7651,7 @@ Route25_EventScript_1ACE4F:: @ 81ACE4F CeruleanCity_PokemonCenter_1F_EventScript_1ACE68:: @ 81ACE68 lock faceplayer - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_MISTY, 5 textcolor 3 msgbox gUnknown_81B14E8 release @@ -7777,9 +7659,7 @@ CeruleanCity_PokemonCenter_1F_EventScript_1ACE68:: @ 81ACE68 VermilionCity_PokemonCenter_1F_EventScript_1ACE83:: @ 81ACE83 lockall - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_LTSURGE, 5 textcolor 3 msgbox gUnknown_81B1558 releaseall @@ -7788,9 +7668,7 @@ VermilionCity_PokemonCenter_1F_EventScript_1ACE83:: @ 81ACE83 CeladonCity_Condominiums_2F_EventScript_1ACE9D:: @ 81ACE9D lock faceplayer - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_ERIKA, 5 textcolor 3 msgbox gUnknown_81B161B release @@ -7799,9 +7677,7 @@ CeladonCity_Condominiums_2F_EventScript_1ACE9D:: @ 81ACE9D FuchsiaCity_Building1_EventScript_1ACEB8:: @ 81ACEB8 lock faceplayer - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_KOGA, 4 textcolor 3 msgbox gUnknown_81B16A8 release @@ -7810,9 +7686,7 @@ FuchsiaCity_Building1_EventScript_1ACEB8:: @ 81ACEB8 SafariZone_Building3_EventScript_1ACED3:: @ 81ACED3 lock faceplayer - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_KOGA, 5 msgbox Text_177C47 release end @@ -7820,9 +7694,7 @@ SafariZone_Building3_EventScript_1ACED3:: @ 81ACED3 SaffronCity_PokemonCenter_1F_EventScript_1ACEEC:: @ 81ACEEC lock faceplayer - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_SABRINA, 4 textcolor 3 msgbox gUnknown_81B1753 release @@ -7830,21 +7702,15 @@ SaffronCity_PokemonCenter_1F_EventScript_1ACEEC:: @ 81ACEEC CinnabarIsland_Gym_EventScript_1ACF07:: @ 81ACF07 lockall - setvar VAR_0x8004, 8 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BLAINE, 4 + famechecker FAMECHECKER_MRFUJI, 4 msgbox Text_199E8A releaseall end FiveIsland_ResortGorgeous_House_EventScript_1ACF2C:: @ 81ACF2C lockall - setvar VAR_0x8004, 8 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BLAINE, 5 textcolor 3 msgbox gUnknown_81B17E9 releaseall @@ -7853,9 +7719,7 @@ FiveIsland_ResortGorgeous_House_EventScript_1ACF2C:: @ 81ACF2C FourIsland_Mart_EventScript_1ACF46:: @ 81ACF46 lock faceplayer - setvar VAR_0x8004, 9 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_LORELEI, 2 msgbox Text_1A3A60 release end @@ -7863,9 +7727,7 @@ FourIsland_Mart_EventScript_1ACF46:: @ 81ACF46 FiveIsland_PokemonCenter_1F_EventScript_1ACF5F:: @ 81ACF5F lock faceplayer - setvar VAR_0x8004, 9 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_LORELEI, 3 textcolor 3 msgbox gUnknown_81B187F release @@ -7874,9 +7736,7 @@ FiveIsland_PokemonCenter_1F_EventScript_1ACF5F:: @ 81ACF5F SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A:: @ 81ACF7A lock faceplayer - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BRUNO, 2 textcolor 3 msgbox gUnknown_81B1913 release @@ -7885,9 +7745,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A:: @ 81ACF7A SevenIsland_SevaultCanyon_EventScript_1ACF95:: @ 81ACF95 lock faceplayer - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BRUNO, 5 msgbox Text_18CF4D release end @@ -7895,12 +7753,8 @@ SevenIsland_SevaultCanyon_EventScript_1ACF95:: @ 81ACF95 IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE:: @ 81ACFAE lock faceplayer - setvar VAR_0x8004, 11 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - setvar VAR_0x8004, 11 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_AGATHA, 1 + famechecker FAMECHECKER_AGATHA, 2 msgbox Text_19A9E7 release end @@ -7908,9 +7762,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE:: @ 81ACFAE SevenIsland_PokemonCenter_1F_EventScript_1ACFD4:: @ 81ACFD4 lock faceplayer - setvar VAR_0x8004, 11 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_AGATHA, 3 textcolor 3 msgbox gUnknown_81B19A8 release @@ -7919,9 +7771,7 @@ SevenIsland_PokemonCenter_1F_EventScript_1ACFD4:: @ 81ACFD4 SixIsland_Mart_EventScript_1ACFEF:: @ 81ACFEF lock faceplayer - setvar VAR_0x8004, 11 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_AGATHA, 5 msgbox Text_1A41CA release end @@ -7929,9 +7779,7 @@ SixIsland_Mart_EventScript_1ACFEF:: @ 81ACFEF EventScript_1AD008:: @ 81AD008 lock faceplayer - setvar VAR_0x8004, 12 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_LANCE, 0 msgbox gFameCheckerFlavorText_Lance0 release end @@ -7939,9 +7787,7 @@ EventScript_1AD008:: @ 81AD008 EventScript_1AD021:: @ 81AD021 lock faceplayer - setvar VAR_0x8004, 12 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_LANCE, 1 msgbox Text_181569 release end @@ -7949,9 +7795,7 @@ EventScript_1AD021:: @ 81AD021 SaffronCity_EventScript_1AD03A:: @ 81AD03A lock faceplayer - setvar VAR_0x8004, 12 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_LANCE, 2 msgbox Text_181569 release end @@ -7959,9 +7803,7 @@ SaffronCity_EventScript_1AD03A:: @ 81AD03A CeladonCity_DepartmentStore_2F_EventScript_1AD053:: @ 81AD053 lock faceplayer - setvar VAR_0x8004, 12 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_LANCE, 3 msgbox Text_19566B release end @@ -7969,9 +7811,7 @@ CeladonCity_DepartmentStore_2F_EventScript_1AD053:: @ 81AD053 IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C:: @ 81AD06C lock faceplayer - setvar VAR_0x8004, 12 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_LANCE, 4 textcolor 3 msgbox gUnknown_81B1A31 release @@ -7980,9 +7820,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C:: @ 81AD06C IndigoPlateau_PokemonCenter_1F_EventScript_1AD087:: @ 81AD087 lock faceplayer - setvar VAR_0x8004, 12 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_LANCE, 5 msgbox Text_19AB16 release end @@ -7990,9 +7828,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_1AD087:: @ 81AD087 LavenderTown_PokemonCenter_1F_EventScript_1AD0A0:: @ 81AD0A0 lock faceplayer - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_MRFUJI, 3 msgbox Text_19358E release end @@ -8000,9 +7836,7 @@ LavenderTown_PokemonCenter_1F_EventScript_1AD0A0:: @ 81AD0A0 CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9:: @ 81AD0B9 lock faceplayer - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_MRFUJI, 5 textcolor 3 msgbox gUnknown_81B1BD1 release @@ -8011,18 +7845,15 @@ CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9:: @ 81AD0B9 SilphCo_5F_EventScript_1AD0D4:: @ 81AD0D4 lock faceplayer - setvar VAR_0x8004, 15 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_GIOVANNI, 1 msgbox Text_175E99 release end + SilphCo_8F_EventScript_1AD0ED:: @ 81AD0ED lock faceplayer - setvar VAR_0x8004, 15 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_GIOVANNI, 2 msgbox Text_176ACB release end @@ -8034,10 +7865,10 @@ CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867 showmoneybox 0, 0, 0 msgbox gUnknown_81B1D7D, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1B2926 + goto_if eq, EventScript_1B2926 checkmoney 50, 0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1B292B + goto_if eq, EventScript_1B292B playse SE_SHOP takemoney 50, 0 updatemoneybox 0, 0, 0 @@ -8045,15 +7876,11 @@ CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867 message gUnknown_81B1E24 waitmessage multichoice 21, 0, 2, 1 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1B28DB - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B28E6 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1B28F1 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1B28FC + switch VAR_RESULT + case 0, EventScript_1B28DB + case 1, EventScript_1B28E6 + case 2, EventScript_1B28F1 + case 3, EventScript_1B28FC end EventScript_1B28DB:: @ 81B28DB @@ -8116,14 +7943,14 @@ EventScript_1B292B:: @ 81B292B FourIsland_House2_EventScript_1B2938:: @ 81B2938 lock specialvar VAR_0x8008, sub_80CC3CC - checkflag FLAG_0x290 - goto_if 0, EventScript_1B2951 - checkflag FLAG_0x290 - goto_if 1, EventScript_1B2994 + checkflag FLAG_MET_STICKER_LADY + goto_if FALSE, EventScript_1B2951 + checkflag FLAG_MET_STICKER_LADY + goto_if TRUE, EventScript_1B2994 end EventScript_1B2951:: @ 81B2951 - setflag FLAG_0x290 + setflag FLAG_MET_STICKER_LADY msgbox gUnknown_81B1EB3 applymovement 1, Movement_1A75E1 waitmovement 0 @@ -8133,7 +7960,7 @@ EventScript_1B2951:: @ 81B2951 applymovement 1, Movement_1A75DD waitmovement 0 compare_var_to_value VAR_0x8008, 0 - goto_if 1, EventScript_1B2B8E + goto_if eq, EventScript_1B2B8E message gUnknown_81B1EF8 waitmessage goto EventScript_1B29D0 @@ -8146,10 +7973,10 @@ EventScript_1B2994:: @ 81B2994 waitmovement 0 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 compare_var_to_value VAR_0x8008, 0 - goto_if 1, EventScript_1B29C6 + goto_if eq, EventScript_1B29C6 message gUnknown_81B2025 waitmessage goto EventScript_1B29D0 @@ -8163,108 +7990,75 @@ EventScript_1B29C6:: @ 81B29C6 end EventScript_1B29D0:: @ 81B29D0 - copyvar VAR_0x8000, VAR_0x8008 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B2A23 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1B2A4F - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1B2A7B - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1B2AA7 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1B2ADE - compare_var_to_value VAR_0x8000, 6 - goto_if 1, EventScript_1B2B15 - compare_var_to_value VAR_0x8000, 7 - goto_if 1, EventScript_1B2B4C + switch VAR_0x8008 + case 1, EventScript_1B2A23 + case 2, EventScript_1B2A4F + case 4, EventScript_1B2A7B + case 3, EventScript_1B2AA7 + case 5, EventScript_1B2ADE + case 6, EventScript_1B2B15 + case 7, EventScript_1B2B4C end EventScript_1B2A23:: @ 81B2A23 multichoice 15, 8, 3, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1B2B98 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B2DF6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1B2DF6 + switch VAR_RESULT + case 0, EventScript_1B2B98 + case 1, EventScript_1B2DF6 + case 127, EventScript_1B2DF6 end EventScript_1B2A4F:: @ 81B2A4F multichoice 16, 8, 4, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1B2C62 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B2DF6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1B2DF6 + switch VAR_RESULT + case 0, EventScript_1B2C62 + case 1, EventScript_1B2DF6 + case 127, EventScript_1B2DF6 end EventScript_1B2A7B:: @ 81B2A7B multichoice 15, 8, 5, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1B2D2C - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B2DF6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1B2DF6 + switch VAR_RESULT + case 0, EventScript_1B2D2C + case 1, EventScript_1B2DF6 + case 127, EventScript_1B2DF6 end EventScript_1B2AA7:: @ 81B2AA7 multichoice 15, 6, 6, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1B2B98 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B2C62 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1B2DF6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1B2DF6 + switch VAR_RESULT + case 0, EventScript_1B2B98 + case 1, EventScript_1B2C62 + case 2, EventScript_1B2DF6 + case 127, EventScript_1B2DF6 end EventScript_1B2ADE:: @ 81B2ADE multichoice 15, 6, 7, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1B2B98 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B2D2C - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1B2DF6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1B2DF6 + switch VAR_RESULT + case 0, EventScript_1B2B98 + case 1, EventScript_1B2D2C + case 2, EventScript_1B2DF6 + case 127, EventScript_1B2DF6 end EventScript_1B2B15:: @ 81B2B15 multichoice 15, 6, 8, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1B2C62 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B2D2C - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1B2DF6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1B2DF6 + switch VAR_RESULT + case 0, EventScript_1B2C62 + case 1, EventScript_1B2D2C + case 2, EventScript_1B2DF6 + case 127, EventScript_1B2DF6 end EventScript_1B2B4C:: @ 81B2B4C multichoice 15, 5, 9, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1B2B98 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1B2C62 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1B2D2C - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1B2DF6 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1B2DF6 + switch VAR_RESULT + case 0, EventScript_1B2B98 + case 1, EventScript_1B2C62 + case 2, EventScript_1B2D2C + case 3, EventScript_1B2DF6 + case 127, EventScript_1B2DF6 end EventScript_1B2B8E:: @ 81B2B8E @@ -8274,19 +8068,19 @@ EventScript_1B2B8E:: @ 81B2B8E EventScript_1B2B98:: @ 81B2B98 compare_var_to_value VAR_0x8004, 39 - goto_if 3, EventScript_1B2BC5 + goto_if le, EventScript_1B2BC5 compare_var_to_value VAR_0x8004, 99 - goto_if 3, EventScript_1B2BE3 + goto_if le, EventScript_1B2BE3 compare_var_to_value VAR_0x8004, 199 - goto_if 3, EventScript_1B2C01 + goto_if le, EventScript_1B2C01 compare_var_to_value VAR_0x8004, 200 - goto_if 4, EventScript_1B2C1F + goto_if ge, EventScript_1B2C1F end EventScript_1B2BC5:: @ 81B2BC5 - compare_var_to_value VAR_BIRCH_STATE, 1 - goto_if 1, EventScript_1B2C3D - setvar VAR_BIRCH_STATE, 1 + compare_var_to_value VAR_HOF_BRAG_STATE, 1 + goto_if eq, EventScript_1B2C3D + setvar VAR_HOF_BRAG_STATE, 1 msgbox gUnknown_81B206E goto EventScript_1B2C51 @@ -8294,9 +8088,9 @@ EventScript_1B2BE2:: @ 81B2BE2 end EventScript_1B2BE3:: @ 81B2BE3 - compare_var_to_value VAR_BIRCH_STATE, 2 - goto_if 1, EventScript_1B2C3D - setvar VAR_BIRCH_STATE, 2 + compare_var_to_value VAR_HOF_BRAG_STATE, 2 + goto_if eq, EventScript_1B2C3D + setvar VAR_HOF_BRAG_STATE, 2 msgbox gUnknown_81B20CF goto EventScript_1B2C51 @@ -8304,9 +8098,9 @@ EventScript_1B2C00:: @ 81B2C00 end EventScript_1B2C01:: @ 81B2C01 - compare_var_to_value VAR_BIRCH_STATE, 3 - goto_if 1, EventScript_1B2C3D - setvar VAR_BIRCH_STATE, 3 + compare_var_to_value VAR_HOF_BRAG_STATE, 3 + goto_if eq, EventScript_1B2C3D + setvar VAR_HOF_BRAG_STATE, 3 msgbox gUnknown_81B2133 goto EventScript_1B2C51 @@ -8314,9 +8108,9 @@ EventScript_1B2C1E:: @ 81B2C1E end EventScript_1B2C1F:: @ 81B2C1F - compare_var_to_value VAR_BIRCH_STATE, 4 - goto_if 1, EventScript_1B2C47 - setvar VAR_BIRCH_STATE, 4 + compare_var_to_value VAR_HOF_BRAG_STATE, 4 + goto_if eq, EventScript_1B2C47 + setvar VAR_HOF_BRAG_STATE, 4 msgbox gUnknown_81B21C4 goto EventScript_1B2C51 @@ -8345,19 +8139,19 @@ EventScript_1B2C51:: @ 81B2C51 EventScript_1B2C62:: @ 81B2C62 compare_var_to_value VAR_0x8005, 99 - goto_if 3, EventScript_1B2C8F + goto_if le, EventScript_1B2C8F compare_var_to_value VAR_0x8005, 199 - goto_if 3, EventScript_1B2CAD + goto_if le, EventScript_1B2CAD compare_var_to_value VAR_0x8005, 299 - goto_if 3, EventScript_1B2CCB + goto_if le, EventScript_1B2CCB compare_var_to_value VAR_0x8005, 300 - goto_if 4, EventScript_1B2CE9 + goto_if ge, EventScript_1B2CE9 end EventScript_1B2C8F:: @ 81B2C8F - compare_var_to_value VAR_CRUISE_STEP_COUNT, 1 - goto_if 1, EventScript_1B2D07 - setvar VAR_CRUISE_STEP_COUNT, 1 + compare_var_to_value VAR_EGG_BRAG_STATE, 1 + goto_if eq, EventScript_1B2D07 + setvar VAR_EGG_BRAG_STATE, 1 msgbox gUnknown_81B2308 goto EventScript_1B2D1B @@ -8365,9 +8159,9 @@ EventScript_1B2CAC:: @ 81B2CAC end EventScript_1B2CAD:: @ 81B2CAD - compare_var_to_value VAR_CRUISE_STEP_COUNT, 2 - goto_if 1, EventScript_1B2D07 - setvar VAR_CRUISE_STEP_COUNT, 2 + compare_var_to_value VAR_EGG_BRAG_STATE, 2 + goto_if eq, EventScript_1B2D07 + setvar VAR_EGG_BRAG_STATE, 2 msgbox gUnknown_81B2372 goto EventScript_1B2D1B @@ -8375,9 +8169,9 @@ EventScript_1B2CCA:: @ 81B2CCA end EventScript_1B2CCB:: @ 81B2CCB - compare_var_to_value VAR_CRUISE_STEP_COUNT, 3 - goto_if 1, EventScript_1B2D07 - setvar VAR_CRUISE_STEP_COUNT, 3 + compare_var_to_value VAR_EGG_BRAG_STATE, 3 + goto_if eq, EventScript_1B2D07 + setvar VAR_EGG_BRAG_STATE, 3 msgbox gUnknown_81B23E0 goto EventScript_1B2D1B @@ -8385,9 +8179,9 @@ EventScript_1B2CE8:: @ 81B2CE8 end EventScript_1B2CE9:: @ 81B2CE9 - compare_var_to_value VAR_CRUISE_STEP_COUNT, 4 - goto_if 1, EventScript_1B2D11 - setvar VAR_CRUISE_STEP_COUNT, 4 + compare_var_to_value VAR_EGG_BRAG_STATE, 4 + goto_if eq, EventScript_1B2D11 + setvar VAR_EGG_BRAG_STATE, 4 msgbox gUnknown_81B2448 goto EventScript_1B2D1B @@ -8416,19 +8210,19 @@ EventScript_1B2D1B:: @ 81B2D1B EventScript_1B2D2C:: @ 81B2D2C compare_var_to_value VAR_0x8006, 19 - goto_if 3, EventScript_1B2D59 + goto_if le, EventScript_1B2D59 compare_var_to_value VAR_0x8006, 49 - goto_if 3, EventScript_1B2D77 + goto_if le, EventScript_1B2D77 compare_var_to_value VAR_0x8006, 99 - goto_if 3, EventScript_1B2D95 + goto_if le, EventScript_1B2D95 compare_var_to_value VAR_0x8006, 100 - goto_if 4, EventScript_1B2DB3 + goto_if ge, EventScript_1B2DB3 end EventScript_1B2D59:: @ 81B2D59 - compare_var_to_value VAR_POKELOT_RND1, 1 - goto_if 1, EventScript_1B2DD1 - setvar VAR_POKELOT_RND1, 1 + compare_var_to_value VAR_LINK_WIN_BRAG_STATE, 1 + goto_if eq, EventScript_1B2DD1 + setvar VAR_LINK_WIN_BRAG_STATE, 1 msgbox gUnknown_81B25A7 goto EventScript_1B2DE5 @@ -8436,9 +8230,9 @@ EventScript_1B2D76:: @ 81B2D76 end EventScript_1B2D77:: @ 81B2D77 - compare_var_to_value VAR_POKELOT_RND1, 2 - goto_if 1, EventScript_1B2DD1 - setvar VAR_POKELOT_RND1, 2 + compare_var_to_value VAR_LINK_WIN_BRAG_STATE, 2 + goto_if eq, EventScript_1B2DD1 + setvar VAR_LINK_WIN_BRAG_STATE, 2 msgbox gUnknown_81B2609 goto EventScript_1B2DE5 @@ -8446,9 +8240,9 @@ EventScript_1B2D94:: @ 81B2D94 end EventScript_1B2D95:: @ 81B2D95 - compare_var_to_value VAR_POKELOT_RND1, 3 - goto_if 1, EventScript_1B2DD1 - setvar VAR_POKELOT_RND1, 3 + compare_var_to_value VAR_LINK_WIN_BRAG_STATE, 3 + goto_if eq, EventScript_1B2DD1 + setvar VAR_LINK_WIN_BRAG_STATE, 3 msgbox gUnknown_81B267B goto EventScript_1B2DE5 @@ -8456,9 +8250,9 @@ EventScript_1B2DB2:: @ 81B2DB2 end EventScript_1B2DB3:: @ 81B2DB3 - compare_var_to_value VAR_POKELOT_RND1, 4 - goto_if 1, EventScript_1B2DDB - setvar VAR_POKELOT_RND1, 4 + compare_var_to_value VAR_LINK_WIN_BRAG_STATE, 4 + goto_if eq, EventScript_1B2DDB + setvar VAR_LINK_WIN_BRAG_STATE, 4 msgbox gUnknown_81B26F6 goto EventScript_1B2DE5 @@ -8516,12 +8310,12 @@ ViridianCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4 EventScript_1BB1BA:: @ 81BB1BA specialvar VAR_RESULT, ValidateReceivedWonderCard compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB1CE - clearflag FLAG_0x070 + goto_if eq, EventScript_1BB1CE + clearflag FLAG_HIDE_MG_DELIVERYMEN return EventScript_1BB1CE:: @ 81BB1CE - setflag FLAG_0x070 + setflag FLAG_HIDE_MG_DELIVERYMEN return CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 @@ -8546,7 +8340,7 @@ LavenderTown_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 ViridianCity_PokemonCenter_2F_EventScript_1BB1D2:: @ 81BB1D2 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 execram @@ -8586,7 +8380,7 @@ ViridianCity_PokemonCenter_2F_MapScript2_1BB1ED:: @ 81BB1ED EventScript_1BB227:: @ 81BB227 compare_var_to_value VAR_0x8007, 0 - goto_if 1, EventScript_1BB236 + goto_if eq, EventScript_1BB236 turnobject VAR_0x8007, 3 EventScript_1BB236: end @@ -8612,19 +8406,19 @@ TwoIsland_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 VermilionCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 ViridianCity_PokemonCenter_2F_MapScript3_1BB237:: @ 81BB237 compare_var_to_value VAR_0x406F, 1 - goto_if 1, EventScript_1BB285 + goto_if eq, EventScript_1BB285 compare_var_to_value VAR_0x406F, 2 - goto_if 1, EventScript_1BB285 + goto_if eq, EventScript_1BB285 compare_var_to_value VAR_0x406F, 5 - goto_if 1, EventScript_1BB285 + goto_if eq, EventScript_1BB285 compare_var_to_value VAR_0x406F, 3 - goto_if 1, EventScript_1BB28B + goto_if eq, EventScript_1BB28B compare_var_to_value VAR_0x406F, 6 - goto_if 1, EventScript_1BB291 + goto_if eq, EventScript_1BB291 compare_var_to_value VAR_0x406F, 7 - goto_if 1, EventScript_1BB297 + goto_if eq, EventScript_1BB297 compare_var_to_value VAR_0x406F, 8 - goto_if 1, EventScript_1BB29D + goto_if eq, EventScript_1BB29D end EventScript_1BB285:: @ 81BB285 @@ -8666,7 +8460,7 @@ ThreeIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 TwoIsland_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 VermilionCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 ViridianCity_PokemonCenter_2F_MapScript1_1BB2A3:: @ 81BB2A3 - map_script_2 VAR_0x407C, 1, EventScript_1BB415 + map_script_2 VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1, EventScript_1BB415 map_script_2 VAR_0x406F, 1, EventScript_1BB2E5 map_script_2 VAR_0x406F, 2, EventScript_1BB2E5 map_script_2 VAR_0x406F, 5, EventScript_1BB2E5 @@ -8703,7 +8497,7 @@ EventScript_1BB315:: @ 81BB315 setvar VAR_0x406F, 0 textcolor 1 compare_var_to_value VAR_0x8007, 0 - goto_if 1, EventScript_1BB40A + goto_if eq, EventScript_1BB40A applymovement VAR_0x8007, Movement_1BB88F waitmovement 0 applymovement 255, Movement_1BB891 @@ -8729,7 +8523,7 @@ EventScript_1BB367:: @ 81BB367 setvar VAR_0x406F, 0 textcolor 1 compare_var_to_value VAR_0x8007, 0 - goto_if 1, EventScript_1BB40A + goto_if eq, EventScript_1BB40A applymovement 255, Movement_1BB8A0 waitmovement 0 applymovement VAR_0x8007, Movement_1BB88F @@ -8753,7 +8547,7 @@ EventScript_1BB3B4:: @ 81BB3B4 setvar VAR_0x406F, 0 textcolor 1 compare_var_to_value VAR_0x8007, 0 - goto_if 1, EventScript_1BB40A + goto_if eq, EventScript_1BB40A applymovement 255, Movement_1BB8A0 waitmovement 0 applymovement VAR_0x8007, Movement_1BB88F @@ -8789,7 +8583,7 @@ EventScript_1BB415:: @ 81BB415 waitmovement 0 delay 30 msgbox gUnknown_81BD966 - setvar VAR_0x407C, 2 + setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 2 releaseall end @@ -8813,15 +8607,11 @@ EventScript_1BB459:: @ 81BB459 EventScript_1BB467:: @ 81BB467 setvar VAR_0x8004, 0 multichoice 0, 0, 39, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BB6AB - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BB4A3 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + switch VAR_RESULT + case 0, EventScript_1BB6AB + case 1, EventScript_1BB4A3 + case 2, EventScript_1BB82F + case 127, EventScript_1BB82F end EventScript_1BB4A3:: @ 81BB4A3 @@ -8835,19 +8625,13 @@ EventScript_1BB4AE:: @ 81BB4AE message Text_1BD338 waitmessage multichoice 0, 0, 17, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BB50F - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BB51A - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB541 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1BB501 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + 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 end EventScript_1BB501:: @ 81BB501 @@ -8867,7 +8651,7 @@ EventScript_1BB519:: @ 81BB519 EventScript_1BB51A:: @ 81BB51A special CheckForAlivePartyMons compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_1BB533 + goto_if ne, EventScript_1BB533 setvar VAR_0x8004, 2 goto EventScript_1BB54C @@ -8891,7 +8675,7 @@ EventScript_1BB54B:: @ 81BB54B EventScript_1BB54C:: @ 81BB54C call EventScript_1A4EAF compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F message gUnknown_81BC4AC waitmessage special HelpSystem_Disable @@ -8900,17 +8684,17 @@ EventScript_1BB54C:: @ 81BB54C waitstate call EventScript_1A6675 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BB5B3 + goto_if eq, EventScript_1BB5B3 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1BB80F + goto_if eq, EventScript_1BB80F compare_var_to_value VAR_RESULT, 3 - goto_if 1, EventScript_1BB81F + goto_if eq, EventScript_1BB81F compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_1BB63C + goto_if eq, EventScript_1BB63C compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BB7FF + goto_if eq, EventScript_1BB7FF end EventScript_1BB5B3:: @ 81BB5B3 @@ -8938,7 +8722,7 @@ EventScript_1BB5B3:: @ 81BB5B3 waitdooranim release compare_var_to_value VAR_0x8004, 5 - goto_if 1, EventScript_1BB62C + goto_if eq, EventScript_1BB62C special SetCableClubWarp warp MAP_UNKNOWN_MAP_00_00, 255, 6, 8 special sub_807E654 @@ -8958,13 +8742,10 @@ EventScript_1BB62C:: @ 81BB62C end EventScript_1BB63C:: @ 81BB63C - copyvar VAR_0x8000, VAR_0x8004 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BB68A - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB679 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1BB668 + switch VAR_0x8004 + case 1, EventScript_1BB68A + case 2, EventScript_1BB679 + case 5, EventScript_1BB668 goto EventScript_1BB857 EventScript_1BB667:: @ 81BB667 @@ -9005,10 +8786,10 @@ EventScript_1BB6AB:: @ 81BB6AB copyvar VAR_0x8007, VAR_LAST_TALKED call EventScript_1BB79C compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F call EventScript_1A4EAF compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F message gUnknown_81BC4AC waitmessage special HelpSystem_Disable @@ -9017,21 +8798,21 @@ EventScript_1BB6AB:: @ 81BB6AB waitstate call EventScript_1A6675 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BB73D + goto_if eq, EventScript_1BB73D compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1BB80F + goto_if eq, EventScript_1BB80F compare_var_to_value VAR_RESULT, 3 - goto_if 1, EventScript_1BB81F + goto_if eq, EventScript_1BB81F compare_var_to_value VAR_RESULT, 4 - goto_if 1, EventScript_1BB857 + goto_if eq, EventScript_1BB857 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BB7FF + goto_if eq, EventScript_1BB7FF compare_var_to_value VAR_RESULT, 7 - goto_if 1, EventScript_1BB7DF + goto_if eq, EventScript_1BB7DF compare_var_to_value VAR_RESULT, 9 - goto_if 1, EventScript_1BB7EF + goto_if eq, EventScript_1BB7EF end EventScript_1BB73D:: @ 81BB73D @@ -9065,10 +8846,10 @@ EventScript_1BB73D:: @ 81BB73D EventScript_1BB79C:: @ 81BB79C specialvar VAR_RESULT, CalculatePlayerPartyCount compare_var_to_value VAR_RESULT, 2 - goto_if 0, EventScript_1BB7C2 + goto_if lt, EventScript_1BB7C2 specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BB7D0 + goto_if eq, EventScript_1BB7D0 setvar VAR_RESULT, 1 return @@ -9215,7 +8996,7 @@ Movement_1BB8A2:: @ 81BB8A2 gUnknown_81BB8A7:: @ 81BB8A7 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall fadescreen 1 setvar VAR_0x8004, 0 @@ -9246,7 +9027,7 @@ UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB special sub_80A0334 waitstate compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB94F + goto_if eq, EventScript_1BB94F setvar VAR_0x8005, 0 textcolor 3 special sub_80819C8 @@ -9259,7 +9040,7 @@ UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8 special sub_80A0334 waitstate compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB94F + goto_if eq, EventScript_1BB94F setvar VAR_0x8005, 1 textcolor 3 special sub_80819C8 @@ -9272,7 +9053,7 @@ UnknownMap_00_03_EventScript_1BB915:: @ 81BB915 special sub_80A0334 waitstate compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB94F + goto_if eq, EventScript_1BB94F setvar VAR_0x8005, 2 textcolor 3 special sub_80819C8 @@ -9285,7 +9066,7 @@ UnknownMap_00_03_EventScript_1BB932:: @ 81BB932 special sub_80A0334 waitstate compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB94F + goto_if eq, EventScript_1BB94F setvar VAR_0x8005, 3 textcolor 3 special sub_80819C8 @@ -9374,7 +9155,7 @@ gUnknown_81BB9D4:: @ 81BB9D4 textcolor 3 msgbox gUnknown_81BC7A1, 5 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BB9F0 + goto_if eq, EventScript_1BB9F0 erasebox 0, 0, 29, 19 releaseall end @@ -9395,19 +9176,19 @@ gUnknown_81BB9FC:: @ 81BB9FC EventScript_1BBA04:: @ 81BBA04 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer - checkflag FLAG_0x829 - goto_if 0, EventScript_1BB877 + checkflag FLAG_SYS_POKEDEX_GET + goto_if FALSE, EventScript_1BB877 specialvar VAR_RESULT, sub_80CD034 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BB867 + goto_if eq, EventScript_1BB867 copyvar VAR_0x8007, VAR_LAST_TALKED specialvar VAR_RESULT, IsWirelessAdapterConnected compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BBB60 + goto_if eq, EventScript_1BBB60 message Text_1BD65B waitmessage goto EventScript_1BBA51 @@ -9417,15 +9198,11 @@ EventScript_1BBA50:: @ 81BBA50 EventScript_1BBA51:: @ 81BBA51 multichoice 18, 6, 16, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BBA94 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BBA88 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + switch VAR_RESULT + case 0, EventScript_1BBA94 + case 1, EventScript_1BB82F + case 2, EventScript_1BBA88 + case 127, EventScript_1BB82F end EventScript_1BBA88:: @ 81BBA88 @@ -9439,10 +9216,10 @@ EventScript_1BBA93:: @ 81BBA93 EventScript_1BBA94:: @ 81BBA94 call EventScript_1BBB1E compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F call EventScript_1A4EAF compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F msgbox gUnknown_81BD86A closemessage special sp000_heal_pokemon @@ -9475,10 +9252,10 @@ EventScript_1BBA94:: @ 81BBA94 EventScript_1BBB1E:: @ 81BBB1E specialvar VAR_RESULT, CountPartyNonEggMons compare_var_to_value VAR_RESULT, 2 - goto_if 0, EventScript_1BBB44 + goto_if lt, EventScript_1BBB44 specialvar VAR_RESULT, GetNameOfEnigmaBerryInPlayerParty compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BBB52 + goto_if eq, EventScript_1BBB52 setvar VAR_RESULT, 1 return @@ -9504,11 +9281,11 @@ EventScript_1BBB60:: @ 81BBB60 EventScript_1BBB6A:: @ 81BBB6A lock faceplayer - checkflag FLAG_0x829 - goto_if 0, EventScript_1BB877 + checkflag FLAG_SYS_POKEDEX_GET + goto_if FALSE, EventScript_1BB877 msgbox gUnknown_81BDB85, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BBB92 + goto_if eq, EventScript_1BBB92 msgbox gUnknown_81BDBF8 release return @@ -9521,18 +9298,18 @@ EventScript_1BBB92:: @ 81BBB92 EventScript_1BBB9C:: @ 81BBB9C special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer - checkflag FLAG_0x829 - goto_if 0, EventScript_1BB877 + checkflag FLAG_SYS_POKEDEX_GET + goto_if FALSE, EventScript_1BB877 specialvar VAR_RESULT, sub_80CD034 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BB867 + goto_if eq, EventScript_1BB867 specialvar VAR_RESULT, IsWirelessAdapterConnected compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB44A + goto_if eq, EventScript_1BB44A message Text_1BD28D waitmessage delay 15 @@ -9542,42 +9319,33 @@ EventScript_1BBBE6:: @ 81BBBE6 end EventScript_1BBBE7:: @ 81BBBE7 - checkflag FLAG_0x2BB - goto_if 0, EventScript_1BBC32 + checkflag FLAG_GOT_POWDER_JAR + goto_if FALSE, EventScript_1BBC32 multichoice 0, 0, 47, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BBC69 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BBC97 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BBD35 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + switch VAR_RESULT + case 0, EventScript_1BBC69 + case 1, EventScript_1BBC97 + case 2, EventScript_1BBD35 + case 3, EventScript_1BB82F + case 127, EventScript_1BB82F end EventScript_1BBC32:: @ 81BBC32 multichoice 0, 0, 50, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BBC69 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BBC97 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + switch VAR_RESULT + case 0, EventScript_1BBC69 + case 1, EventScript_1BBC97 + case 2, EventScript_1BB82F + case 127, EventScript_1BB82F end EventScript_1BBC69:: @ 81BBC69 msgbox gUnknown_81BD317, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F call EventScript_1BB79C compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F setvar VAR_0x8004, 3 goto EventScript_1BBD6F @@ -9588,19 +9356,13 @@ EventScript_1BBC97:: @ 81BBC97 message Text_1BD338 waitmessage multichoice 0, 0, 17, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BBCEA - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BBCF5 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BBD1C - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1BBD27 - compare_var_to_value VAR_0x8000, 4 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + 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 end EventScript_1BBCEA:: @ 81BBCEA @@ -9613,7 +9375,7 @@ EventScript_1BBCF4:: @ 81BBCF4 EventScript_1BBCF5:: @ 81BBCF5 special CheckForAlivePartyMons compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_1BBD0E + goto_if ne, EventScript_1BBD0E setvar VAR_0x8004, 1 goto EventScript_1BBD6F @@ -9644,10 +9406,10 @@ EventScript_1BBD34:: @ 81BBD34 EventScript_1BBD35:: @ 81BBD35 msgbox gUnknown_81BD362, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F + goto_if eq, EventScript_1BB82F special CheckHasAtLeastOneBerry compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BBD61 + goto_if eq, EventScript_1BBD61 setvar VAR_0x8004, 5 goto EventScript_1BBD6F @@ -9664,18 +9426,13 @@ EventScript_1BBD6E:: @ 81BBD6E EventScript_1BBD6F:: @ 81BBD6F call EventScript_1A4EAF compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB82F - copyvar VAR_0x8000, VAR_0x8004 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1BBDBC - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BBDBC - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BBDBC - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BBE50 - compare_var_to_value VAR_0x8000, 5 - goto_if 1, EventScript_1BBEE4 + goto_if eq, EventScript_1BB82F + switch VAR_0x8004 + case 3, EventScript_1BBDBC + case 0, EventScript_1BBDBC + case 1, EventScript_1BBDBC + case 2, EventScript_1BBE50 + case 5, EventScript_1BBEE4 end EventScript_1BBDBC:: @ 81BBDBC @@ -9684,36 +9441,32 @@ EventScript_1BBDBC:: @ 81BBDBC waitmessage call EventScript_1A6675 multichoice 13, 6, 63, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BBE28 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BBE00 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + switch VAR_RESULT + case 0, EventScript_1BBE28 + case 1, EventScript_1BBE00 + case 2, EventScript_1BB82F + case 127, EventScript_1BB82F end EventScript_1BBE00:: @ 81BBE00 call EventScript_1BBF78 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BBF88 + goto_if eq, EventScript_1BBF88 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BBDBC + goto_if eq, EventScript_1BBDBC compare_var_to_value VAR_RESULT, 8 - goto_if 1, EventScript_1BBE00 + goto_if eq, EventScript_1BBE00 release return EventScript_1BBE28:: @ 81BBE28 call EventScript_1BBF80 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BBF88 + goto_if eq, EventScript_1BBF88 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BBDBC + goto_if eq, EventScript_1BBDBC compare_var_to_value VAR_RESULT, 8 - goto_if 1, EventScript_1BBE28 + goto_if eq, EventScript_1BBE28 release return @@ -9723,36 +9476,32 @@ EventScript_1BBE50:: @ 81BBE50 waitmessage call EventScript_1A6675 multichoice 13, 6, 63, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BBEBC - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BBE94 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + switch VAR_RESULT + case 0, EventScript_1BBEBC + case 1, EventScript_1BBE94 + case 2, EventScript_1BB82F + case 127, EventScript_1BB82F end EventScript_1BBE94:: @ 81BBE94 call EventScript_1BBF78 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BBF88 + goto_if eq, EventScript_1BBF88 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BBE50 + goto_if eq, EventScript_1BBE50 compare_var_to_value VAR_RESULT, 8 - goto_if 1, EventScript_1BBE94 + goto_if eq, EventScript_1BBE94 release return EventScript_1BBEBC:: @ 81BBEBC call EventScript_1BBF80 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BBF88 + goto_if eq, EventScript_1BBF88 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BBE50 + goto_if eq, EventScript_1BBE50 compare_var_to_value VAR_RESULT, 8 - goto_if 1, EventScript_1BBEBC + goto_if eq, EventScript_1BBEBC release return @@ -9762,36 +9511,32 @@ EventScript_1BBEE4:: @ 81BBEE4 waitmessage call EventScript_1A6675 multichoice 13, 6, 63, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BBF50 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BBF28 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB82F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB82F + switch VAR_RESULT + case 0, EventScript_1BBF50 + case 1, EventScript_1BBF28 + case 2, EventScript_1BB82F + case 127, EventScript_1BB82F end EventScript_1BBF28:: @ 81BBF28 call EventScript_1BBF78 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BBF88 + goto_if eq, EventScript_1BBF88 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BBEE4 + goto_if eq, EventScript_1BBEE4 compare_var_to_value VAR_RESULT, 8 - goto_if 1, EventScript_1BBF28 + goto_if eq, EventScript_1BBF28 release return EventScript_1BBF50:: @ 81BBF50 call EventScript_1BBF80 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BBF88 + goto_if eq, EventScript_1BBF88 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BBEE4 + goto_if eq, EventScript_1BBEE4 compare_var_to_value VAR_RESULT, 8 - goto_if 1, EventScript_1BBF50 + goto_if eq, EventScript_1BBF50 release return @@ -9836,13 +9581,13 @@ EventScript_1BBF88:: @ 81BBF88 gUnknown_81BBFD8:: @ 81BBFD8 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall - checkflag FLAG_0x829 - goto_if 0, EventScript_1BB881 + checkflag FLAG_SYS_POKEDEX_GET + goto_if FALSE, EventScript_1BB881 specialvar VAR_RESULT, IsWirelessAdapterConnected compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BC016 + goto_if eq, EventScript_1BC016 special HelpSystem_Disable fadescreen 1 special sub_814F1D4 @@ -9906,22 +9651,18 @@ ViridianCity_PokemonCenter_1F_MapScript2_1BC05C:: @ 81BC05C EventScript_1BC060:: @ 81BC060 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer message Text_1BCCFF waitmessage multichoice 0, 0, 49, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BC0B0 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BC0BA - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BC0C4 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BC0C4 + switch VAR_RESULT + case 0, EventScript_1BC0B0 + case 1, EventScript_1BC0BA + case 2, EventScript_1BC0C4 + case 127, EventScript_1BC0C4 end EventScript_1BC0B0:: @ 81BC0B0 @@ -9942,7 +9683,7 @@ EventScript_1BC0C4:: @ 81BC0C4 EventScript_1BC0CE:: @ 81BC0CE special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -9950,37 +9691,33 @@ EventScript_1BC0CE:: @ 81BC0CE waitmessage specialvar VAR_RESULT, IsWirelessAdapterConnected compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BC29C + goto_if eq, EventScript_1BC29C delay 60 special HelpSystem_Disable message Text_1BD02D waitmessage multichoice 0, 0, 49, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BC13A - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BC184 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB83F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB83F + switch VAR_RESULT + case 0, EventScript_1BC13A + case 1, EventScript_1BC184 + case 2, EventScript_1BB83F + case 127, EventScript_1BB83F end EventScript_1BC13A:: @ 81BC13A setvar VAR_0x8005, 0 special sub_8149A18 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BC2A6 + goto_if eq, EventScript_1BC2A6 msgbox gUnknown_81BD059 setvar VAR_0x8005, 0 special sub_8127888 waitstate compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_1BB83F + goto_if ge, EventScript_1BB83F call EventScript_1A4EAF compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB83F + goto_if eq, EventScript_1BB83F setvar VAR_0x8004, 4 goto EventScript_1BC1CE @@ -9991,16 +9728,16 @@ EventScript_1BC184:: @ 81BC184 setvar VAR_0x8005, 1 special sub_81537C0 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BC2A6 + goto_if eq, EventScript_1BC2A6 msgbox gUnknown_81BD059 setvar VAR_0x8005, 1 special sub_8127888 waitstate compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_1BB83F + goto_if ge, EventScript_1BB83F call EventScript_1A4EAF compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB83F + goto_if eq, EventScript_1BB83F setvar VAR_0x8004, 6 goto EventScript_1BC1CE @@ -10013,36 +9750,32 @@ EventScript_1BC1CE:: @ 81BC1CE waitmessage call EventScript_1A6675 multichoice 13, 6, 63, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BC23A - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BC212 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BB83F - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BB83F + switch VAR_RESULT + case 0, EventScript_1BC23A + case 1, EventScript_1BC212 + case 2, EventScript_1BB83F + case 127, EventScript_1BB83F end EventScript_1BC212:: @ 81BC212 call EventScript_1BBF78 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BC262 + goto_if eq, EventScript_1BC262 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BC1CE + goto_if eq, EventScript_1BC1CE compare_var_to_value VAR_RESULT, 8 - goto_if 1, EventScript_1BC212 + goto_if eq, EventScript_1BC212 release return EventScript_1BC23A:: @ 81BC23A call EventScript_1BBF80 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BC262 + goto_if eq, EventScript_1BC262 compare_var_to_value VAR_RESULT, 5 - goto_if 1, EventScript_1BC1CE + goto_if eq, EventScript_1BC1CE compare_var_to_value VAR_RESULT, 8 - goto_if 1, EventScript_1BC23A + goto_if eq, EventScript_1BC23A release return @@ -10074,11 +9807,11 @@ EventScript_1BC29C:: @ 81BC29C EventScript_1BC2A6:: @ 81BC2A6 msgbox gUnknown_81BD0CF, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BB83F + goto_if eq, EventScript_1BB83F compare_var_to_value VAR_0x8005, 0 - call_if 1, EventScript_1BC2D5 + call_if eq, EventScript_1BC2D5 compare_var_to_value VAR_0x8005, 1 - call_if 1, EventScript_1BC2DE + call_if eq, EventScript_1BC2DE goto EventScript_1BB83F EventScript_1BC2D4:: @ 81BC2D4 @@ -10095,7 +9828,7 @@ EventScript_1BC2DE:: @ 81BC2DE TwoIsland_JoyfulGameCorner_EventScript_1BC2E7:: @ 81BC2E7 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall special sub_814B504 waitstate @@ -10105,7 +9838,7 @@ TwoIsland_JoyfulGameCorner_EventScript_1BC2E7:: @ 81BC2E7 TwoIsland_JoyfulGameCorner_EventScript_1BC2FC:: @ 81BC2FC special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall special sub_8153810 waitstate @@ -10566,43 +10299,22 @@ gUnknown_81BDEDF:: @ 81BDEDF .string "I hope you enjoy the Wireless\n" .string "Communication System.$" -CeladonCity_EventScript_1BDF13:: @ 81BDF13 -CeladonCity_Gym_EventScript_1BDF13:: @ 81BDF13 -FiveIsland_Meadow_EventScript_1BDF13:: @ 81BDF13 -PewterCity_EventScript_1BDF13:: @ 81BDF13 -Route10_EventScript_1BDF13:: @ 81BDF13 -Route12_EventScript_1BDF13:: @ 81BDF13 -Route14_EventScript_1BDF13:: @ 81BDF13 -Route16_EventScript_1BDF13:: @ 81BDF13 -Route25_EventScript_1BDF13:: @ 81BDF13 -Route2_EventScript_1BDF13:: @ 81BDF13 -Route8_EventScript_1BDF13:: @ 81BDF13 -ThreeIsland_BerryForest_EventScript_1BDF13:: @ 81BDF13 -ThreeIsland_BondBridge_EventScript_1BDF13:: @ 81BDF13 -ThreeIsland_EventScript_1BDF13:: @ 81BDF13 -Route9_EventScript_1BDF13:: @ 81BDF13 -Route13_EventScript_1BDF13:: @ 81BDF13 -TwoIsland_EventScript_1BDF13:: @ 81BDF13 -FuchsiaCity_EventScript_1BDF13:: @ 81BDF13 -VermilionCity_EventScript_1BDF13:: @ 81BDF13 -VermilionCity_EventScript_1BDF13:: @ 81BDF13 -CeruleanCity_EventScript_1BDF13:: @ 81BDF13 -ViridianCity_EventScript_1BDF13:: @ 81BDF13 +EventScript_InteractWithCutTreeObject:: @ 81BDF13 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall - checkflag FLAG_0x821 - goto_if 0, EventScript_1BDF87 + checkflag FLAG_BADGE02_GET + goto_if FALSE, EventScript_1BDF87 checkpartymove MOVE_CUT compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BDF87 + goto_if eq, EventScript_1BDF87 setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_CUT msgbox gUnknown_81BDF94, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BDF91 + goto_if eq, EventScript_1BDF91 msgbox gUnknown_81BDFD7 closemessage dofieldeffect FLDEFF_USE_CUT_ON_TREE @@ -10650,37 +10362,22 @@ gUnknown_81BDFE3:: @ 81BDFE3 .string "This tree looks like it can be CUT\n" .string "down!$" -CeruleanCave_2F_EventScript_1BE00C:: @ 81BE00C -MtEmber_Exterior_EventScript_1BE00C:: @ 81BE00C -MtEmber_RubyPath_B1F_Stairs_EventScript_1BE00C:: @ 81BE00C -MtEmber_RubyPath_B2F_EventScript_1BE00C:: @ 81BE00C -MtEmber_SummitPath_2F_EventScript_1BE00C:: @ 81BE00C -MtEmber_RubyPath_1F_EventScript_1BE00C:: @ 81BE00C -SevenIsland_SevaultCanyon_EventScript_1BE00C:: @ 81BE00C -FourIsland_EventScript_1BE00C:: @ 81BE00C -OneIsland_KindleRoad_EventScript_1BE00C:: @ 81BE00C -MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C:: @ 81BE00C -MtEmber_RubyPath_B3F_EventScript_1BE00C:: @ 81BE00C -MtEmber_RubyPath_B1F_EventScript_1BE00C:: @ 81BE00C -MtEmber_RubyPath_B1F_EventScript_1BE00C:: @ 81BE00C -RockTunnel_B1F_EventScript_1BE00C:: @ 81BE00C -CeruleanCave_B1F_EventScript_1BE00C:: @ 81BE00C -CeruleanCave_1F_EventScript_1BE00C:: @ 81BE00C +EventScript_InteractWithRockSmashRockObject:: @ 81BE00C special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall - checkflag FLAG_0x825 - goto_if 0, EventScript_1BE091 + checkflag FLAG_BADGE06_GET + goto_if FALSE, EventScript_1BE091 checkpartymove MOVE_ROCK_SMASH compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BE091 + goto_if eq, EventScript_1BE091 setfieldeffectarg 0, VAR_RESULT getpartymonname 0, VAR_RESULT getmovename 1, MOVE_ROCK_SMASH msgbox Text_1BE09D, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BE09A + goto_if eq, EventScript_1BE09A msgbox gUnknown_81BDFD7 closemessage dofieldeffect FLDEFF_USE_ROCK_SMASH @@ -10699,9 +10396,9 @@ EventScript_1BE06F:: @ 81BE06F applymovement VAR_LAST_TALKED, Movement_1BE08F waitmovement 0 removeobject VAR_LAST_TALKED - special sub_8082E54 + special Special_RockSmashEncounter compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BE08D + goto_if eq, EventScript_1BE08D waitstate releaseall end @@ -10731,37 +10428,22 @@ gUnknown_81BE0E2:: @ 81BE0E2 .string "It's a rugged rock, but a POKéMON\n" .string "may be able to smash it.$" -MtEmber_Exterior_EventScript_1BE11D:: @ 81BE11D -MtEmber_RubyPath_B2F_EventScript_1BE11D:: @ 81BE11D -MtEmber_Summit_EventScript_1BE11D:: @ 81BE11D -SeafoamIslands_1F_EventScript_1BE11D:: @ 81BE11D -SeafoamIslands_B2F_EventScript_1BE11D:: @ 81BE11D -SevenIsland_SevaultCanyon_EventScript_1BE11D:: @ 81BE11D -VictoryRoad_1F_EventScript_1BE11D:: @ 81BE11D -VictoryRoad_3F_EventScript_1BE11D:: @ 81BE11D -SixIsland_RuinValley_EventScript_1BE11D:: @ 81BE11D -FuchsiaCity_Building1_EventScript_1BE11D:: @ 81BE11D -SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D:: @ 81BE11D -MtEmber_RubyPath_B3F_EventScript_1BE11D:: @ 81BE11D -SeafoamIslands_B3F_EventScript_1BE11D:: @ 81BE11D -SeafoamIslands_B3F_EventScript_1BE11D:: @ 81BE11D -SeafoamIslands_B1F_EventScript_1BE11D:: @ 81BE11D -VictoryRoad_2F_EventScript_1BE11D:: @ 81BE11D +EventScript_InteractWithStrengthBoulderObject:: @ 81BE11D special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall - checkflag FLAG_0x823 - goto_if 0, EventScript_1BE185 - checkflag FLAG_0x805 - goto_if 1, EventScript_1BE18E + checkflag FLAG_BADGE04_GET + goto_if FALSE, EventScript_1BE185 + checkflag FLAG_SYS_STRENGTH_ACTIVE + goto_if TRUE, EventScript_1BE18E checkpartymove MOVE_STRENGTH compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BE185 + goto_if eq, EventScript_1BE185 setfieldeffectarg 0, VAR_RESULT msgbox gUnknown_81BE19A, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BE197 + goto_if eq, EventScript_1BE197 closemessage dofieldeffect FLDEFF_USE_STRENGTH waitstate @@ -10776,7 +10458,7 @@ EventScript_FldEffStrength:: @ 81BE16E end EventScript_1BE179:: @ 81BE179 - setflag FLAG_0x805 + setflag FLAG_SYS_STRENGTH_ACTIVE msgbox gUnknown_81BE1FA, 3 end @@ -10814,16 +10496,16 @@ gUnknown_81BE284:: @ 81BE284 gUnknown_81BE2B7:: @ 81BE2B7 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall checkpartymove MOVE_WATERFALL compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BE300 + goto_if eq, EventScript_1BE300 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT msgbox gUnknown_81BE33F, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BE308 + goto_if eq, EventScript_1BE308 msgbox gUnknown_81BE378 dofieldeffect FLDEFF_USE_WATERFALL goto EventScript_1BE308 @@ -10847,17 +10529,18 @@ gUnknown_81BE33F:: @ 81BE33F gUnknown_81BE378:: @ 81BE378 .string "{STR_VAR_1} used WATERFALL.$" +@ Unused leftover from R/S EventScript_1BE38B:: @ 81BE38B lockall checkpartymove MOVE_DIVE compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BE3CA + goto_if eq, EventScript_1BE3CA getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 msgbox gUnknown_81BE469, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BE3D2 + goto_if eq, EventScript_1BE3D2 msgbox gUnknown_81BE49B dofieldeffect FLDEFF_USE_DIVE goto EventScript_1BE3D2 @@ -10874,13 +10557,13 @@ EventScript_1BE3D4:: @ 81BE3D4 lockall checkpartymove MOVE_DIVE compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BE412 + goto_if eq, EventScript_1BE412 getpartymonname 0, VAR_RESULT setfieldeffectarg 0, VAR_RESULT setfieldeffectarg 1, 1 msgbox gUnknown_81BE4EF, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BE429 + goto_if eq, EventScript_1BE429 msgbox gUnknown_81BE49B dofieldeffect FLDEFF_USE_DIVE goto EventScript_1BE429 @@ -10928,1020 +10611,684 @@ Text_1BE56D:: @ 81BE56D .string "Looks like there's nothing here…$" Route2_EventScript_1BE58E:: @ 81BE58E - setorcopyvar VAR_0x8000, 34 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ETHER, 1, 1 end Route2_EventScript_1BE59B:: @ 81BE59B - setorcopyvar VAR_0x8000, 18 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_PARALYZE_HEAL, 1, 1 end ViridianForest_EventScript_1BE5A8:: @ 81BE5A8 - setorcopyvar VAR_0x8000, 4 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_POKE_BALL, 1, 1 end ViridianForest_EventScript_1BE5B5:: @ 81BE5B5 - setorcopyvar VAR_0x8000, 14 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ANTIDOTE, 1, 1 end ViridianForest_EventScript_1BE5C2:: @ 81BE5C2 - setorcopyvar VAR_0x8000, 13 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_POTION, 1, 1 end MtMoon_1F_EventScript_1BE5CF:: @ 81BE5CF - setorcopyvar VAR_0x8000, 18 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_PARALYZE_HEAL, 1, 1 end MtMoon_1F_EventScript_1BE5DC:: @ 81BE5DC - setorcopyvar VAR_0x8000, 297 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM09, 1, 1 end MtMoon_1F_EventScript_1BE5E9:: @ 81BE5E9 - setorcopyvar VAR_0x8000, 13 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_POTION, 1, 1 end MtMoon_1F_EventScript_1BE5F6:: @ 81BE5F6 - setorcopyvar VAR_0x8000, 68 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_RARE_CANDY, 1, 1 end MtMoon_1F_EventScript_1BE603:: @ 81BE603 - setorcopyvar VAR_0x8000, 85 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ESCAPE_ROPE, 1, 1 end MtMoon_1F_EventScript_1BE610:: @ 81BE610 - setorcopyvar VAR_0x8000, 94 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MOON_STONE, 1, 1 end MtMoon_B2F_EventScript_1BE61D:: @ 81BE61D - setorcopyvar VAR_0x8000, 109 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_STAR_PIECE, 1, 1 end MtMoon_B2F_EventScript_1BE62A:: @ 81BE62A - setorcopyvar VAR_0x8000, 334 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM46, 1, 1 end Route4_EventScript_1BE637:: @ 81BE637 - setorcopyvar VAR_0x8000, 293 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM05, 1, 1 end Route24_EventScript_1BE644:: @ 81BE644 - setorcopyvar VAR_0x8000, 333 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM45, 1, 1 end Route25_EventScript_1BE651:: @ 81BE651 - setorcopyvar VAR_0x8000, 331 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM43, 1, 1 end SSAnne_1F_Room2_EventScript_1BE65E:: @ 81BE65E - setorcopyvar VAR_0x8000, 319 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM31, 1, 1 end SSAnne_2F_Room2_EventScript_1BE66B:: @ 81BE66B - setorcopyvar VAR_0x8000, 108 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_STARDUST, 1, 1 end SSAnne_2F_Room4_EventScript_1BE678:: @ 81BE678 - setorcopyvar VAR_0x8000, 75 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_X_ATTACK, 1, 1 end SSAnne_B1F_Room2_EventScript_1BE685:: @ 81BE685 - setorcopyvar VAR_0x8000, 332 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM44, 1, 1 end SSAnne_B1F_Room3_EventScript_1BE692:: @ 81BE692 - setorcopyvar VAR_0x8000, 34 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ETHER, 1, 1 end SSAnne_B1F_Room5_EventScript_1BE69F:: @ 81BE69F - setorcopyvar VAR_0x8000, 22 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_SUPER_POTION, 1, 1 end SSAnne_Kitchen_EventScript_1BE6AC:: @ 81BE6AC - setorcopyvar VAR_0x8000, 3 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_GREAT_BALL, 1, 1 end Route9_EventScript_1BE6B9:: @ 81BE6B9 - setorcopyvar VAR_0x8000, 328 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM40, 1, 1 end RocketHideout_B1F_EventScript_1BE6C6:: @ 81BE6C6 - setorcopyvar VAR_0x8000, 85 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ESCAPE_ROPE, 1, 1 end RocketHideout_B1F_EventScript_1BE6D3:: @ 81BE6D3 - setorcopyvar VAR_0x8000, 21 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_HYPER_POTION, 1, 1 end RocketHideout_B2F_EventScript_1BE6E0:: @ 81BE6E0 - setorcopyvar VAR_0x8000, 77 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_X_SPEED, 1, 1 end RocketHideout_B2F_EventScript_1BE6ED:: @ 81BE6ED - setorcopyvar VAR_0x8000, 94 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MOON_STONE, 1, 1 end RocketHideout_B2F_EventScript_1BE6FA:: @ 81BE6FA - setorcopyvar VAR_0x8000, 300 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM12, 1, 1 end RocketHideout_B2F_EventScript_1BE707:: @ 81BE707 - setorcopyvar VAR_0x8000, 22 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_SUPER_POTION, 1, 1 end RocketHideout_B3F_EventScript_1BE714:: @ 81BE714 - setorcopyvar VAR_0x8000, 68 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_RARE_CANDY, 1, 1 end RocketHideout_B3F_EventScript_1BE721:: @ 81BE721 - setorcopyvar VAR_0x8000, 309 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM21, 1, 1 end RocketHideout_B4F_EventScript_1BE72E:: @ 81BE72E - setorcopyvar VAR_0x8000, 337 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM49, 1, 1 end RocketHideout_B4F_EventScript_1BE73B:: @ 81BE73B - setorcopyvar VAR_0x8000, 35 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MAX_ETHER, 1, 1 end RocketHideout_B4F_EventScript_1BE748:: @ 81BE748 - setorcopyvar VAR_0x8000, 67 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_CALCIUM, 1, 1 end PokemonTower_3F_EventScript_1BE755:: @ 81BE755 - setorcopyvar VAR_0x8000, 85 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ESCAPE_ROPE, 1, 1 end PokemonTower_4F_EventScript_1BE762:: @ 81BE762 - setorcopyvar VAR_0x8000, 36 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ELIXIR, 1, 1 end PokemonTower_4F_EventScript_1BE76F:: @ 81BE76F - setorcopyvar VAR_0x8000, 17 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_AWAKENING, 1, 1 end PokemonTower_4F_EventScript_1BE77C:: @ 81BE77C - setorcopyvar VAR_0x8000, 3 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_GREAT_BALL, 1, 1 end PokemonTower_5F_EventScript_1BE789:: @ 81BE789 - setorcopyvar VAR_0x8000, 110 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_NUGGET, 1, 1 end PokemonTower_6F_EventScript_1BE796:: @ 81BE796 - setorcopyvar VAR_0x8000, 68 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_RARE_CANDY, 1, 1 end PokemonTower_6F_EventScript_1BE7A3:: @ 81BE7A3 - setorcopyvar VAR_0x8000, 78 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_X_ACCURACY, 1, 1 end Route12_EventScript_1BE7B0:: @ 81BE7B0 - setorcopyvar VAR_0x8000, 336 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM48, 1, 1 end Route12_EventScript_1BE7BD:: @ 81BE7BD - setorcopyvar VAR_0x8000, 65 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_IRON, 1, 1 end Route15_EventScript_1BE7CA:: @ 81BE7CA - setorcopyvar VAR_0x8000, 306 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM18, 1, 1 end SafariZone_Center_EventScript_1BE7D7:: @ 81BE7D7 - setorcopyvar VAR_0x8000, 110 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_NUGGET, 1, 1 end SafariZone_East_EventScript_1BE7E4:: @ 81BE7E4 - setorcopyvar VAR_0x8000, 20 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MAX_POTION, 1, 1 end SafariZone_East_EventScript_1BE7F1:: @ 81BE7F1 - setorcopyvar VAR_0x8000, 19 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_FULL_RESTORE, 1, 1 end SafariZone_East_EventScript_1BE7FE:: @ 81BE7FE - setorcopyvar VAR_0x8000, 299 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM11, 1, 1 end SafariZone_East_EventScript_1BE80B:: @ 81BE80B - setorcopyvar VAR_0x8000, 98 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_LEAF_STONE, 1, 1 end SafariZone_North_EventScript_1BE818:: @ 81BE818 - setorcopyvar VAR_0x8000, 64 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_PROTEIN, 1, 1 end SafariZone_North_EventScript_1BE825:: @ 81BE825 - setorcopyvar VAR_0x8000, 335 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM47, 1, 1 end SafariZone_West_EventScript_1BE832:: @ 81BE832 - setorcopyvar VAR_0x8000, 320 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM32, 1, 1 end SafariZone_West_EventScript_1BE83F:: @ 81BE83F - setorcopyvar VAR_0x8000, 353 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_GOLD_TEETH, 1, 1 end SafariZone_West_EventScript_1BE84C:: @ 81BE84C - setorcopyvar VAR_0x8000, 20 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MAX_POTION, 1, 1 end SafariZone_West_EventScript_1BE859:: @ 81BE859 - setorcopyvar VAR_0x8000, 25 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MAX_REVIVE, 1, 1 end SilphCo_3F_EventScript_1BE866:: @ 81BE866 - setorcopyvar VAR_0x8000, 21 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_HYPER_POTION, 1, 1 end SilphCo_4F_EventScript_1BE873:: @ 81BE873 - setorcopyvar VAR_0x8000, 25 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MAX_REVIVE, 1, 1 end SilphCo_4F_EventScript_1BE880:: @ 81BE880 - setorcopyvar VAR_0x8000, 85 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ESCAPE_ROPE, 1, 1 end SilphCo_4F_EventScript_1BE88D:: @ 81BE88D - setorcopyvar VAR_0x8000, 23 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_FULL_HEAL, 1, 1 end SilphCo_5F_EventScript_1BE89A:: @ 81BE89A - setorcopyvar VAR_0x8000, 64 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_PROTEIN, 1, 1 end SilphCo_5F_EventScript_1BE8A7:: @ 81BE8A7 - setorcopyvar VAR_0x8000, 289 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM01, 1, 1 end SilphCo_5F_EventScript_1BE8B4:: @ 81BE8B4 - setorcopyvar VAR_0x8000, 355 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_CARD_KEY, 1, 1 end SilphCo_6F_EventScript_1BE8C1:: @ 81BE8C1 - setorcopyvar VAR_0x8000, 63 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_HP_UP, 1, 1 end SilphCo_6F_EventScript_1BE8CE:: @ 81BE8CE - setorcopyvar VAR_0x8000, 79 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_X_SPECIAL, 1, 1 end SilphCo_7F_EventScript_1BE8DB:: @ 81BE8DB - setorcopyvar VAR_0x8000, 67 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_CALCIUM, 1, 1 end SilphCo_7F_EventScript_1BE8E8:: @ 81BE8E8 - setorcopyvar VAR_0x8000, 296 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM08, 1, 1 end SilphCo_10F_EventScript_1BE8F5:: @ 81BE8F5 - setorcopyvar VAR_0x8000, 66 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_CARBOS, 1, 1 end SilphCo_10F_EventScript_1BE902:: @ 81BE902 - setorcopyvar VAR_0x8000, 2 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ULTRA_BALL, 1, 1 end SilphCo_10F_EventScript_1BE90F:: @ 81BE90F - setorcopyvar VAR_0x8000, 68 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_RARE_CANDY, 1, 1 end PowerPlant_EventScript_1BE91C:: @ 81BE91C - setorcopyvar VAR_0x8000, 20 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MAX_POTION, 1, 1 end PowerPlant_EventScript_1BE929:: @ 81BE929 - setorcopyvar VAR_0x8000, 305 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM17, 1, 1 end PowerPlant_EventScript_1BE936:: @ 81BE936 - setorcopyvar VAR_0x8000, 313 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM25, 1, 1 end PowerPlant_EventScript_1BE943:: @ 81BE943 - setorcopyvar VAR_0x8000, 96 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_THUNDER_STONE, 1, 1 end PowerPlant_EventScript_1BE950:: @ 81BE950 - setorcopyvar VAR_0x8000, 36 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ELIXIR, 1, 1 end PokemonMansion_1F_EventScript_1BE95D:: @ 81BE95D - setorcopyvar VAR_0x8000, 66 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_CARBOS, 1, 1 end PokemonMansion_1F_EventScript_1BE96A:: @ 81BE96A - setorcopyvar VAR_0x8000, 85 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ESCAPE_ROPE, 1, 1 end PokemonMansion_2F_EventScript_1BE977:: @ 81BE977 - setorcopyvar VAR_0x8000, 67 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_CALCIUM, 1, 1 end PokemonMansion_3F_EventScript_1BE984:: @ 81BE984 - setorcopyvar VAR_0x8000, 20 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MAX_POTION, 1, 1 end PokemonMansion_3F_EventScript_1BE991:: @ 81BE991 - setorcopyvar VAR_0x8000, 65 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_IRON, 1, 1 end PokemonMansion_B1F_EventScript_1BE99E:: @ 81BE99E - setorcopyvar VAR_0x8000, 302 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM14, 1, 1 end PokemonMansion_B1F_EventScript_1BE9AB:: @ 81BE9AB - setorcopyvar VAR_0x8000, 19 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_FULL_RESTORE, 1, 1 end PokemonMansion_B1F_EventScript_1BE9B8:: @ 81BE9B8 - setorcopyvar VAR_0x8000, 310 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM22, 1, 1 end PokemonMansion_B1F_EventScript_1BE9C5:: @ 81BE9C5 - setorcopyvar VAR_0x8000, 351 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_SECRET_KEY, 1, 1 end VictoryRoad_1F_EventScript_1BE9D2:: @ 81BE9D2 - setorcopyvar VAR_0x8000, 68 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_RARE_CANDY, 1, 1 end VictoryRoad_1F_EventScript_1BE9DF:: @ 81BE9DF - setorcopyvar VAR_0x8000, 290 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM02, 1, 1 end VictoryRoad_2F_EventScript_1BE9EC:: @ 81BE9EC - setorcopyvar VAR_0x8000, 73 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_GUARD_SPEC, 1, 1 end VictoryRoad_2F_EventScript_1BE9F9:: @ 81BE9F9 - setorcopyvar VAR_0x8000, 295 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM07, 1, 1 end VictoryRoad_2F_EventScript_1BEA06:: @ 81BEA06 - setorcopyvar VAR_0x8000, 23 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_FULL_HEAL, 1, 1 end VictoryRoad_2F_EventScript_1BEA13:: @ 81BEA13 - setorcopyvar VAR_0x8000, 325 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM37, 1, 1 end VictoryRoad_3F_EventScript_1BEA20:: @ 81BEA20 - setorcopyvar VAR_0x8000, 25 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MAX_REVIVE, 1, 1 end VictoryRoad_3F_EventScript_1BEA2D:: @ 81BEA2D - setorcopyvar VAR_0x8000, 338 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM50, 1, 1 end CeruleanCave_1F_EventScript_1BEA3A:: @ 81BEA3A - setorcopyvar VAR_0x8000, 37 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MAX_ELIXIR, 1, 1 end CeruleanCave_1F_EventScript_1BEA47:: @ 81BEA47 - setorcopyvar VAR_0x8000, 110 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_NUGGET, 1, 1 end CeruleanCave_1F_EventScript_1BEA54:: @ 81BEA54 - setorcopyvar VAR_0x8000, 19 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_FULL_RESTORE, 1, 1 end CeruleanCave_2F_EventScript_1BEA61:: @ 81BEA61 - setorcopyvar VAR_0x8000, 19 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_FULL_RESTORE, 1, 1 end CeruleanCave_2F_EventScript_1BEA6E:: @ 81BEA6E - setorcopyvar VAR_0x8000, 69 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_PP_UP, 1, 1 end CeruleanCave_2F_EventScript_1BEA7B:: @ 81BEA7B - setorcopyvar VAR_0x8000, 2 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ULTRA_BALL, 1, 1 end CeruleanCave_B1F_EventScript_1BEA88:: @ 81BEA88 - setorcopyvar VAR_0x8000, 25 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MAX_REVIVE, 1, 1 end CeruleanCave_B1F_EventScript_1BEA95:: @ 81BEA95 - setorcopyvar VAR_0x8000, 2 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ULTRA_BALL, 1, 1 end FuchsiaCity_Building1_EventScript_1BEAA2:: @ 81BEAA2 - setorcopyvar VAR_0x8000, 68 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_RARE_CANDY, 1, 1 end TwoIsland_EventScript_1BEAAF:: @ 81BEAAF - setorcopyvar VAR_0x8000, 24 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_REVIVE, 1, 1 end ThreeIsland_EventScript_1BEABC:: @ 81BEABC - setorcopyvar VAR_0x8000, 70 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ZINC, 1, 1 end ViridianForest_EventScript_1BEAC9:: @ 81BEAC9 - setorcopyvar VAR_0x8000, 13 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_POTION, 1, 1 end MtMoon_B2F_EventScript_1BEAD6:: @ 81BEAD6 - setorcopyvar VAR_0x8000, 24 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_REVIVE, 1, 1 end MtMoon_B2F_EventScript_1BEAE3:: @ 81BEAE3 - setorcopyvar VAR_0x8000, 14 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ANTIDOTE, 1, 1 end Route11_EventScript_1BEAF0:: @ 81BEAF0 - setorcopyvar VAR_0x8000, 76 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_X_DEFEND, 1, 1 end Route9_EventScript_1BEAFD:: @ 81BEAFD - setorcopyvar VAR_0x8000, 15 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_BURN_HEAL, 1, 1 end RockTunnel_1F_EventScript_1BEB0A:: @ 81BEB0A - setorcopyvar VAR_0x8000, 86 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_REPEL, 1, 1 end RockTunnel_1F_EventScript_1BEB17:: @ 81BEB17 - setorcopyvar VAR_0x8000, 106 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_PEARL, 1, 1 end RockTunnel_1F_EventScript_1BEB24:: @ 81BEB24 - setorcopyvar VAR_0x8000, 85 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ESCAPE_ROPE, 1, 1 end RockTunnel_B1F_EventScript_1BEB31:: @ 81BEB31 - setorcopyvar VAR_0x8000, 24 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_REVIVE, 1, 1 end RockTunnel_B1F_EventScript_1BEB3E:: @ 81BEB3E - setorcopyvar VAR_0x8000, 35 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MAX_ETHER, 1, 1 end SilphCo_8F_EventScript_1BEB4B:: @ 81BEB4B - setorcopyvar VAR_0x8000, 65 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_IRON, 1, 1 end SilphCo_11F_EventScript_1BEB58:: @ 81BEB58 - setorcopyvar VAR_0x8000, 70 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ZINC, 1, 1 end PokemonMansion_1F_EventScript_1BEB65:: @ 81BEB65 - setorcopyvar VAR_0x8000, 64 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_PROTEIN, 1, 1 end PokemonMansion_2F_EventScript_1BEB72:: @ 81BEB72 - setorcopyvar VAR_0x8000, 70 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ZINC, 1, 1 end PokemonMansion_2F_EventScript_1BEB7F:: @ 81BEB7F - setorcopyvar VAR_0x8000, 63 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_HP_UP, 1, 1 end ViridianCity_EventScript_1BEB8C:: @ 81BEB8C - setorcopyvar VAR_0x8000, 13 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_POTION, 1, 1 end Route11_EventScript_1BEB99:: @ 81BEB99 - setorcopyvar VAR_0x8000, 3 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_GREAT_BALL, 1, 1 end Route11_EventScript_1BEBA6:: @ 81BEBA6 - setorcopyvar VAR_0x8000, 17 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_AWAKENING, 1, 1 end PokemonTower_5F_EventScript_1BEBB3:: @ 81BEBB3 - setorcopyvar VAR_0x8000, 190 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_CLEANSE_TAG, 1, 1 end CeladonCity_EventScript_1BEBC0:: @ 81BEBC0 - setorcopyvar VAR_0x8000, 34 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ETHER, 1, 1 end RocketHideout_B3F_EventScript_1BEBCD:: @ 81BEBCD - setorcopyvar VAR_0x8000, 206 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_BLACK_GLASSES, 1, 1 end SafariZone_North_EventScript_1BEBDA:: @ 81BEBDA - setorcopyvar VAR_0x8000, 183 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_QUICK_CLAW, 1, 1 end SeafoamIslands_1F_EventScript_1BEBE7:: @ 81BEBE7 - setorcopyvar VAR_0x8000, 16 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ICE_HEAL, 1, 1 end SeafoamIslands_B1F_EventScript_1BEBF4:: @ 81BEBF4 - setorcopyvar VAR_0x8000, 97 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_WATER_STONE, 1, 1 end SeafoamIslands_B1F_EventScript_1BEC01:: @ 81BEC01 - setorcopyvar VAR_0x8000, 24 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_REVIVE, 1, 1 end SeafoamIslands_B2F_EventScript_1BEC0E:: @ 81BEC0E - setorcopyvar VAR_0x8000, 107 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_BIG_PEARL, 1, 1 end SeafoamIslands_B4F_EventScript_1BEC1B:: @ 81BEC1B - setorcopyvar VAR_0x8000, 2 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ULTRA_BALL, 1, 1 end FourIsland_EventScript_1BEC28:: @ 81BEC28 - setorcopyvar VAR_0x8000, 109 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_STAR_PIECE, 1, 1 end FourIsland_EventScript_1BEC35:: @ 81BEC35 - setorcopyvar VAR_0x8000, 108 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_STARDUST, 1, 1 end OneIsland_KindleRoad_EventScript_1BEC42:: @ 81BEC42 - setorcopyvar VAR_0x8000, 34 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ETHER, 1, 1 end OneIsland_KindleRoad_EventScript_1BEC4F:: @ 81BEC4F - setorcopyvar VAR_0x8000, 84 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MAX_REPEL, 1, 1 end OneIsland_KindleRoad_EventScript_1BEC5C:: @ 81BEC5C - setorcopyvar VAR_0x8000, 66 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_CARBOS, 1, 1 end FiveIsland_Meadow_EventScript_1BEC69:: @ 81BEC69 - setorcopyvar VAR_0x8000, 20 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MAX_POTION, 1, 1 end FiveIsland_Meadow_EventScript_1BEC76:: @ 81BEC76 - setorcopyvar VAR_0x8000, 69 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_PP_UP, 1, 1 end FiveIsland_MemorialPillar_EventScript_1BEC83:: @ 81BEC83 - setorcopyvar VAR_0x8000, 199 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_METAL_COAT, 1, 1 end SixIsland_OutcastIsland_EventScript_1BEC90:: @ 81BEC90 - setorcopyvar VAR_0x8000, 69 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_PP_UP, 1, 1 end SixIsland_WaterPath_EventScript_1BEC9D:: @ 81BEC9D - setorcopyvar VAR_0x8000, 36 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ELIXIR, 1, 1 end SixIsland_WaterPath_EventScript_1BECAA:: @ 81BECAA - setorcopyvar VAR_0x8000, 201 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_DRAGON_SCALE, 1, 1 end SixIsland_RuinValley_EventScript_1BECB7:: @ 81BECB7 - setorcopyvar VAR_0x8000, 19 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_FULL_RESTORE, 1, 1 end SixIsland_RuinValley_EventScript_1BECC4:: @ 81BECC4 - setorcopyvar VAR_0x8000, 63 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_HP_UP, 1, 1 end SixIsland_RuinValley_EventScript_1BECD1:: @ 81BECD1 - setorcopyvar VAR_0x8000, 93 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_SUN_STONE, 1, 1 end SevenIsland_SevaultCanyon_EventScript_1BECDE:: @ 81BECDE - setorcopyvar VAR_0x8000, 187 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_KINGS_ROCK, 1, 1 end SevenIsland_SevaultCanyon_EventScript_1BECEB:: @ 81BECEB - setorcopyvar VAR_0x8000, 37 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MAX_ELIXIR, 1, 1 end SevenIsland_SevaultCanyon_EventScript_1BECF8:: @ 81BECF8 - setorcopyvar VAR_0x8000, 110 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_NUGGET, 1, 1 end ThreeIsland_BerryForest_EventScript_1BED05:: @ 81BED05 - setorcopyvar VAR_0x8000, 35 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MAX_ETHER, 1, 1 end ThreeIsland_BerryForest_EventScript_1BED12:: @ 81BED12 - setorcopyvar VAR_0x8000, 23 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_FULL_HEAL, 1, 1 end ThreeIsland_BerryForest_EventScript_1BED1F:: @ 81BED1F - setorcopyvar VAR_0x8000, 37 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MAX_ELIXIR, 1, 1 end MtEmber_Exterior_EventScript_1BED2C:: @ 81BED2C - setorcopyvar VAR_0x8000, 2 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ULTRA_BALL, 1, 1 end MtEmber_Exterior_EventScript_1BED39:: @ 81BED39 - setorcopyvar VAR_0x8000, 95 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_FIRE_STONE, 1, 1 end MtEmber_Exterior_EventScript_1BED46:: @ 81BED46 - setorcopyvar VAR_0x8000, 74 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_DIRE_HIT, 1, 1 end FourIsland_IcefallCave_1F_EventScript_1BED53:: @ 81BED53 - setorcopyvar VAR_0x8000, 2 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_ULTRA_BALL, 1, 1 end FourIsland_IcefallCave_1F_EventScript_1BED60:: @ 81BED60 - setorcopyvar VAR_0x8000, 345 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_HM07, 1, 1 end FourIsland_IcefallCave_B1F_EventScript_1BED6D:: @ 81BED6D - setorcopyvar VAR_0x8000, 19 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_FULL_RESTORE, 1, 1 end FourIsland_IcefallCave_B1F_EventScript_1BED7A:: @ 81BED7A - setorcopyvar VAR_0x8000, 212 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_NEVER_MELT_ICE, 1, 1 end FiveIsland_RocketWarehouse_EventScript_1BED87:: @ 81BED87 - setorcopyvar VAR_0x8000, 107 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_BIG_PEARL, 1, 1 end FiveIsland_RocketWarehouse_EventScript_1BED94:: @ 81BED94 - setorcopyvar VAR_0x8000, 324 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM36, 1, 1 end FiveIsland_RocketWarehouse_EventScript_1BEDA1:: @ 81BEDA1 - setorcopyvar VAR_0x8000, 106 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_PEARL, 1, 1 end FiveIsland_RocketWarehouse_EventScript_1BEDAE:: @ 81BEDAE - setorcopyvar VAR_0x8000, 218 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_UP_GRADE, 1, 1 end FiveIsland_LostCave_Room10_EventScript_1BEDBB:: @ 81BEDBB - setorcopyvar VAR_0x8000, 217 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_SILK_SCARF, 1, 1 end FiveIsland_LostCave_Room11_EventScript_1BEDC8:: @ 81BEDC8 - setorcopyvar VAR_0x8000, 221 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_LAX_INCENSE, 1, 1 end FiveIsland_LostCave_Room12_EventScript_1BEDD5:: @ 81BEDD5 - setorcopyvar VAR_0x8000, 220 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_SEA_INCENSE, 1, 1 end FiveIsland_LostCave_Room13_EventScript_1BEDE2:: @ 81BEDE2 - setorcopyvar VAR_0x8000, 25 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_MAX_REVIVE, 1, 1 end FiveIsland_LostCave_Room14_EventScript_1BEDEF:: @ 81BEDEF - setorcopyvar VAR_0x8000, 68 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_RARE_CANDY, 1, 1 end SevenIsland_SevaultCanyon_House_EventScript_1BEDFC:: @ 81BEDFC - setorcopyvar VAR_0x8000, 222 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_LUCKY_PUNCH, 1, 1 end SilphCo_4F_EventScript_1BEE09:: @ 81BEE09 - setorcopyvar VAR_0x8000, 329 - setorcopyvar VAR_0x8001, 1 - callstd 1 + giveitem ITEM_TM41, 1, 1 end PewterCity_PokemonCenter_1F_EventScript_1BEE16:: @ 81BEE16 lock faceplayer compare_var_to_value VAR_0x4001, 1 - goto_if 1, EventScript_1BEE3A - checkflag 2093 - goto_if 1, EventScript_1BEECD + goto_if eq, EventScript_1BEE3A + checkflag FLAG_SYS_SET_TRAINER_CARD_PROFILE + goto_if TRUE, EventScript_1BEECD msgbox Text_1BEF88 goto EventScript_1BEE44 end @@ -11955,15 +11302,11 @@ EventScript_1BEE44:: @ 81BEE44 message Text_1BF017 waitmessage multichoice 18, 6, 18, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BEE8F - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BEEC3 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BEE81 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BEEC3 + switch VAR_RESULT + case 0, EventScript_1BEE8F + case 1, EventScript_1BEEC3 + case 2, EventScript_1BEE81 + case 127, EventScript_1BEEC3 end EventScript_1BEE81:: @ 81BEE81 @@ -12006,15 +11349,11 @@ EventScript_1BEEDB:: @ 81BEEDB message Text_1BF1FB waitmessage multichoice 18, 6, 18, 0 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1BEF26 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1BEF35 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1BEF18 - compare_var_to_value VAR_0x8000, 127 - goto_if 1, EventScript_1BEF35 + switch VAR_RESULT + case 0, EventScript_1BEF26 + case 1, EventScript_1BEF35 + case 2, EventScript_1BEF18 + case 127, EventScript_1BEF35 end EventScript_1BEF18:: @ 81BEF18 @@ -12049,11 +11388,11 @@ EventScript_1BEF5A:: @ 81BEF5A lock faceplayer compare_var_to_value VAR_0x8004, 0 - goto_if 1, EventScript_1BEF3F + goto_if eq, EventScript_1BEF3F compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BEE9E + goto_if eq, EventScript_1BEE9E compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BEEA8 + goto_if eq, EventScript_1BEEA8 end Text_1BEF88:: @ 81BEF88 @@ -12127,16 +11466,16 @@ gUnknown_81BF36A:: @ 81BF36A Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer showmoneybox 0, 0, 0 specialvar VAR_RESULT, IsThereMonInRoute5Daycare compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BF46E + goto_if eq, EventScript_1BF46E msgbox Text_19DD66, 5 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BF3DD + goto_if eq, EventScript_1BF3DD msgbox Text_19DDB2 goto EventScript_1BF541 end @@ -12144,7 +11483,7 @@ Route5_PokemonDayCare_EventScript_1BF398:: @ 81BF398 EventScript_1BF3DD:: @ 81BF3DD specialvar VAR_RESULT, CountPartyNonEggMons compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BF452 + goto_if eq, EventScript_1BF452 msgbox Text_19DDBE fadescreen 1 hidemoneybox @@ -12154,10 +11493,10 @@ EventScript_1BF3DD:: @ 81BF3DD waitstate showmoneybox 0, 0, 0 compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_1BF444 + goto_if ge, EventScript_1BF444 specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1BF460 + goto_if eq, EventScript_1BF460 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies msgbox Text_19DDF9 waitse @@ -12188,13 +11527,13 @@ EventScript_1BF46E:: @ 81BF46E setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetNumLevelsGainedForRoute5DaycareMon compare_var_to_value VAR_RESULT, 0 - call_if 5, EventScript_1BF4AA + call_if ne, EventScript_1BF4AA compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_1BF4B3 + call_if eq, EventScript_1BF4B3 special GetCostToWithdrawRoute5DaycareMon msgbox Text_19DE80, 5 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BF4BC + goto_if eq, EventScript_1BF4BC goto EventScript_1BF444 end @@ -12209,10 +11548,10 @@ EventScript_1BF4B3:: @ 81BF4B3 EventScript_1BF4BC:: @ 81BF4BC specialvar VAR_RESULT, CalculatePlayerPartyCount compare_var_to_value VAR_RESULT, 6 - goto_if 1, EventScript_1BF533 + goto_if eq, EventScript_1BF533 specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BF4EA + goto_if eq, EventScript_1BF4EA msgbox Text_19E001 goto EventScript_1BF541 end @@ -12415,7 +11754,7 @@ EventScript_SafariRetire:: @ 81BFBAA lockall msgbox Text_1BFBE9, 5 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1BFBC0 + goto_if eq, EventScript_1BFBC0 releaseall end @@ -14073,20 +13412,20 @@ Text_1C476A:: @ 81C476A VictoryRoad_2F_EventScript_1C47AE:: @ 81C47AE lock faceplayer - checkflag FLAG_0x2C0 - goto_if 1, EventScript_1C480C + checkflag FLAG_TUTOR_DOUBLE_EDGE + goto_if TRUE, EventScript_1C480C msgbox Text_1749F9, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4802 + goto_if eq, EventScript_1C4802 call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4802 + goto_if eq, EventScript_1C4802 msgbox Text_174AE2 - setvar VAR_0x8005, 4 + setvar VAR_0x8005, MOVETUTOR_DOUBLE_EDGE call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4802 - setflag FLAG_0x2C0 + goto_if eq, EventScript_1C4802 + setflag FLAG_TUTOR_DOUBLE_EDGE goto EventScript_1C480C end @@ -14103,20 +13442,20 @@ EventScript_1C480C:: @ 81C480C EventScript_1C4816:: @ 81C4816 lock faceplayer - checkflag FLAG_0x2C1 - goto_if 1, EventScript_1C4874 + checkflag FLAG_TUTOR_THUNDER_WAVE + goto_if TRUE, EventScript_1C4874 msgbox Text_175711, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C486A + goto_if eq, EventScript_1C486A call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C486A + goto_if eq, EventScript_1C486A msgbox Text_1757C1 - setvar VAR_0x8005, 11 + setvar VAR_0x8005, MOVETUTOR_THUNDER_WAVE call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C486A - setflag FLAG_0x2C1 + goto_if eq, EventScript_1C486A + setflag FLAG_TUTOR_THUNDER_WAVE goto EventScript_1C4874 end @@ -14133,20 +13472,20 @@ EventScript_1C4874:: @ 81C4874 RockTunnel_B1F_EventScript_1C487E:: @ 81C487E lock faceplayer - checkflag FLAG_0x2C2 - goto_if 1, EventScript_1C48DC + checkflag FLAG_TUTOR_ROCK_SLIDE + goto_if TRUE, EventScript_1C48DC msgbox Text_1799E0, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C48D2 + goto_if eq, EventScript_1C48D2 call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C48D2 + goto_if eq, EventScript_1C48D2 msgbox Text_179AE1 - setvar VAR_0x8005, 13 + setvar VAR_0x8005, MOVETUTOR_ROCK_SLIDE call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C48D2 - setflag FLAG_0x2C2 + goto_if eq, EventScript_1C48D2 + setflag FLAG_TUTOR_ROCK_SLIDE goto EventScript_1C48DC end @@ -14163,20 +13502,20 @@ EventScript_1C48DC:: @ 81C48DC MtEmber_Exterior_EventScript_1C48E6:: @ 81C48E6 lock faceplayer - checkflag FLAG_0x2C3 - goto_if 1, EventScript_1C4944 + checkflag FLAG_TUTOR_EXPLOSION + goto_if TRUE, EventScript_1C4944 msgbox Text_17A642, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C493A + goto_if eq, EventScript_1C493A call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C493A + goto_if eq, EventScript_1C493A msgbox Text_17A717 - setvar VAR_0x8005, 12 + setvar VAR_0x8005, MOVETUTOR_EXPLOSION call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C493A - setflag FLAG_0x2C3 + goto_if eq, EventScript_1C493A + setflag FLAG_TUTOR_EXPLOSION goto EventScript_1C4944 end @@ -14193,20 +13532,20 @@ EventScript_1C4944:: @ 81C4944 Route4_EventScript_1C494E:: @ 81C494E lock faceplayer - checkflag FLAG_0x2C4 - goto_if 1, EventScript_1C49AC + checkflag FLAG_TUTOR_META_PUNCH + goto_if TRUE, EventScript_1C49AC msgbox Text_1839D5, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C49A2 + goto_if eq, EventScript_1C49A2 call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C49A2 + goto_if eq, EventScript_1C49A2 msgbox Text_183ABF - setvar VAR_0x8005, 0 + setvar VAR_0x8005, MOVETUTOR_MEGA_PUNCH call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C49A2 - setflag FLAG_0x2C4 + goto_if eq, EventScript_1C49A2 + setflag FLAG_TUTOR_META_PUNCH goto EventScript_1C49AC end @@ -14223,20 +13562,20 @@ EventScript_1C49AC:: @ 81C49AC Route4_EventScript_1C49B6:: @ 81C49B6 lock faceplayer - checkflag FLAG_0x2C5 - goto_if 1, EventScript_1C4A14 + checkflag FLAG_TUTOR_MEGA_KICK + goto_if TRUE, EventScript_1C4A14 msgbox Text_183B74, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4A0A + goto_if eq, EventScript_1C4A0A call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4A0A + goto_if eq, EventScript_1C4A0A msgbox Text_183C68 - setvar VAR_0x8005, 2 + setvar VAR_0x8005, MOVETUTOR_MEGA_KICK call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4A0A - setflag FLAG_0x2C5 + goto_if eq, EventScript_1C4A0A + setflag FLAG_TUTOR_MEGA_KICK goto EventScript_1C4A14 end @@ -14253,20 +13592,20 @@ EventScript_1C4A14:: @ 81C4A14 EventScript_1C4A1E:: @ 81C4A1E lock faceplayer - checkflag FLAG_0x2C6 - goto_if 1, EventScript_1C4A7C + checkflag FLAG_TUTOR_DREAM_EATER + goto_if TRUE, EventScript_1C4A7C msgbox Text_17E316, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4A72 + goto_if eq, EventScript_1C4A72 call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4A72 + goto_if eq, EventScript_1C4A72 msgbox Text_17E3F1 - setvar VAR_0x8005, 10 + setvar VAR_0x8005, MOVETUTOR_DREAM_EATER call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4A72 - setflag FLAG_0x2C6 + goto_if eq, EventScript_1C4A72 + setflag FLAG_TUTOR_DREAM_EATER goto EventScript_1C4A7C end @@ -14283,20 +13622,20 @@ EventScript_1C4A7C:: @ 81C4A7C EventScript_1C4A86:: @ 81C4A86 lock faceplayer - checkflag FLAG_0x2C7 - goto_if 1, EventScript_1C4AE4 + checkflag FLAG_TUTOR_SOFT_BOILED + goto_if TRUE, EventScript_1C4AE4 msgbox Text_180388, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4ADA + goto_if eq, EventScript_1C4ADA call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4ADA + goto_if eq, EventScript_1C4ADA msgbox Text_180484 - setvar VAR_0x8005, 9 + setvar VAR_0x8005, MOVETUTOR_SOFT_BOILED call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4ADA - setflag FLAG_0x2C7 + goto_if eq, EventScript_1C4ADA + setflag FLAG_TUTOR_SOFT_BOILED goto EventScript_1C4AE4 end @@ -14313,20 +13652,20 @@ EventScript_1C4AE4:: @ 81C4AE4 FuchsiaCity_EventScript_1C4AEE:: @ 81C4AEE lock faceplayer - checkflag FLAG_0x2C8 - goto_if 1, EventScript_1C4B4C + checkflag FLAG_TUTOR_SUBSTITUTE + goto_if TRUE, EventScript_1C4B4C msgbox Text_180948, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4B42 + goto_if eq, EventScript_1C4B42 call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4B42 + goto_if eq, EventScript_1C4B42 msgbox Text_180A57 - setvar VAR_0x8005, 14 + setvar VAR_0x8005, MOVETUTOR_SUBSTITUTE call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4B42 - setflag FLAG_0x2C8 + goto_if eq, EventScript_1C4B42 + setflag FLAG_TUTOR_SUBSTITUTE goto EventScript_1C4B4C end @@ -14343,20 +13682,20 @@ EventScript_1C4B4C:: @ 81C4B4C SevenIsland_EventScript_1C4B56:: @ 81C4B56 lock faceplayer - checkflag FLAG_0x2C9 - goto_if 1, EventScript_1C4BB4 + checkflag FLAG_TUTOR_SWORDS_DANCE + goto_if TRUE, EventScript_1C4BB4 msgbox Text_182F01, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4BAA + goto_if eq, EventScript_1C4BAA call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4BAA + goto_if eq, EventScript_1C4BAA msgbox Text_182FD9 - setvar VAR_0x8005, 1 + setvar VAR_0x8005, MOVETUTOR_SWORDS_DANCE call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4BAA - setflag FLAG_0x2C9 + goto_if eq, EventScript_1C4BAA + setflag FLAG_TUTOR_SWORDS_DANCE goto EventScript_1C4BB4 end @@ -14373,20 +13712,20 @@ EventScript_1C4BB4:: @ 81C4BB4 PewterCity_Museum_1F_EventScript_1C4BBE:: @ 81C4BBE lock faceplayer - checkflag FLAG_0x2CA - goto_if 1, EventScript_1C4C1C + checkflag FLAG_TUTOR_SEISMIC_TOSS + goto_if TRUE, EventScript_1C4C1C msgbox Text_1909A3, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4C12 + goto_if eq, EventScript_1C4C12 call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4C12 + goto_if eq, EventScript_1C4C12 msgbox Text_190AD5 - setvar VAR_0x8005, 6 + setvar VAR_0x8005, MOVETUTOR_SEISMIC_TOSS call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4C12 - setflag FLAG_0x2CA + goto_if eq, EventScript_1C4C12 + setflag FLAG_TUTOR_SEISMIC_TOSS goto EventScript_1C4C1C end @@ -14403,20 +13742,20 @@ EventScript_1C4C1C:: @ 81C4C1C EventScript_1C4C26:: @ 81C4C26 lock faceplayer - checkflag FLAG_0x2CB - goto_if 1, EventScript_1C4C84 + checkflag FLAG_TUTOR_COUNTER + goto_if TRUE, EventScript_1C4C84 msgbox Text_195928, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4C7A + goto_if eq, EventScript_1C4C7A call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4C7A + goto_if eq, EventScript_1C4C7A msgbox Text_195A08 - setvar VAR_0x8005, 5 + setvar VAR_0x8005, MOVETUTOR_COUNTER call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4C7A - setflag FLAG_0x2CB + goto_if eq, EventScript_1C4C7A + setflag FLAG_TUTOR_COUNTER goto EventScript_1C4C84 end @@ -14433,20 +13772,20 @@ EventScript_1C4C84:: @ 81C4C84 EventScript_1C4C8E:: @ 81C4C8E lock faceplayer - checkflag FLAG_0x2CC - goto_if 1, EventScript_1C4CEC + checkflag FLAG_TUTOR_METRONOME + goto_if TRUE, EventScript_1C4CEC msgbox Text_19A137, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4CE2 + goto_if eq, EventScript_1C4CE2 call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4CE2 + goto_if eq, EventScript_1C4CE2 msgbox Text_19A1EA - setvar VAR_0x8005, 8 + setvar VAR_0x8005, MOVETUTOR_METRONOME call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4CE2 - setflag FLAG_0x2CC + goto_if eq, EventScript_1C4CE2 + setflag FLAG_TUTOR_METRONOME goto EventScript_1C4CEC end @@ -14461,23 +13800,23 @@ EventScript_1C4CEC:: @ 81C4CEC end EventScript_1C4CF6:: @ 81C4CF6 - checkflag FLAG_0x2CD - goto_if 1, EventScript_1C4D59 + checkflag FLAG_TUTOR_MIMIC + goto_if TRUE, EventScript_1C4D59 msgbox Text_19AD85, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4D4F + goto_if eq, EventScript_1C4D4F call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4D4F + goto_if eq, EventScript_1C4D4F msgbox Text_19ADEE - setvar VAR_0x8005, 7 + setvar VAR_0x8005, MOVETUTOR_MIMIC call EventScript_1C4F30 lock faceplayer compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4D4F + goto_if eq, EventScript_1C4D4F removeitem ITEM_POKE_DOLL, 1 - setflag FLAG_0x2CD + setflag FLAG_TUTOR_MIMIC goto EventScript_1C4D59 end @@ -14489,9 +13828,9 @@ EventScript_1C4D4F:: @ 81C4D4F EventScript_1C4D59:: @ 81C4D59 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_1C4D72 + call_if eq, EventScript_1C4D72 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_1C4D7B + call_if eq, EventScript_1C4D7B release end @@ -14506,20 +13845,20 @@ EventScript_1C4D7B:: @ 81C4D7B FourIsland_House1_EventScript_1C4D84:: @ 81C4D84 lock faceplayer - checkflag FLAG_0x2CE - goto_if 1, EventScript_1C4DE2 + checkflag FLAG_TUTOR_BODY_SLAM + goto_if TRUE, EventScript_1C4DE2 msgbox Text_1A3505, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4DD8 + goto_if eq, EventScript_1C4DD8 call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4DD8 + goto_if eq, EventScript_1C4DD8 msgbox Text_1A35DA - setvar VAR_0x8005, 3 + setvar VAR_0x8005, MOVETUTOR_BODY_SLAM call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4DD8 - setflag FLAG_0x2CE + goto_if eq, EventScript_1C4DD8 + setflag FLAG_TUTOR_BODY_SLAM goto EventScript_1C4DE2 end @@ -14536,34 +13875,34 @@ EventScript_1C4DE2:: @ 81C4DE2 TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if 1, EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer - checkflag FLAG_0x2E1 - goto_if 1, EventScript_1C4EA1 - checkflag FLAG_0x002 - goto_if 1, EventScript_1C4E97 + checkflag FLAG_LEARNED_MOVE_AT_CAPE_BRINK + goto_if TRUE, EventScript_1C4EA1 + checkflag FLAG_TEMP_2 + goto_if TRUE, EventScript_1C4E97 getfirstpartymonname 0 msgbox Text_1A46C6 specialvar VAR_RESULT, sub_80CCB94 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4F26 + goto_if eq, EventScript_1C4F26 copyvar VAR_0x8009, VAR_0x8005 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1C4EF0 + call_if eq, EventScript_1C4EF0 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1C4EFB + call_if eq, EventScript_1C4EFB compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_1C4F06 + call_if eq, EventScript_1C4F06 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_1C4F11 + call_if eq, EventScript_1C4F11 msgbox Text_1A4751, 5 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4F1C + goto_if eq, EventScript_1C4F1C call EventScript_1C4F37 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4F1C + goto_if eq, EventScript_1C4F1C msgbox Text_1A4814 closemessage fadescreen 1 @@ -14588,22 +13927,22 @@ EventScript_1C4EAB:: @ 81C4EAB copyvar VAR_0x8005, VAR_0x8009 specialvar VAR_RESULT, sub_80CCCF8 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1C4ECD + goto_if eq, EventScript_1C4ECD msgbox Text_1A4865 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 release end EventScript_1C4ECD:: @ 81C4ECD msgbox Text_1A48F3 - setflag FLAG_0x2E1 + setflag FLAG_LEARNED_MOVE_AT_CAPE_BRINK release end EventScript_1C4EDA:: @ 81C4EDA call EventScript_1C4F30 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C4F1C + goto_if eq, EventScript_1C4F1C goto EventScript_1C4EAB end @@ -14694,38 +14033,35 @@ SevenIsland_TrainerTower_7F_MapScript2_1C4F62:: @ 81C4F62 SevenIsland_TrainerTower_8F_MapScript2_1C4F62:: @ 81C4F62 setvar VAR_0x8004, 0 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C4FA7 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C4FC5 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C5019 - setflag FLAG_0x002 - setflag FLAG_0x003 - setflag FLAG_0x004 - setflag FLAG_0x005 + switch VAR_RESULT + case 0, EventScript_1C4FA7 + case 1, EventScript_1C4FC5 + case 2, EventScript_1C5019 + setflag FLAG_TEMP_2 + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_4 + setflag FLAG_TEMP_5 setvar VAR_0x400E, 1 setvar VAR_0x400F, 1 end EventScript_1C4FA7:: @ 81C4FA7 - setflag FLAG_0x002 - setflag FLAG_0x004 - setflag FLAG_0x005 + setflag FLAG_TEMP_2 + setflag FLAG_TEMP_4 + setflag FLAG_TEMP_5 setvar VAR_0x400F, 1 setobjectxyperm 3, 15, 13 setobjectmovementtype 3, 9 goto EventScript_1C5042 EventScript_1C4FC5:: @ 81C4FC5 - setflag FLAG_0x003 - setflag FLAG_0x004 + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_4 setvar VAR_0x400E, 1 setvar VAR_0x8004, 5 special sub_815D9E8 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1C4FFE + goto_if eq, EventScript_1C4FFE setobjectxyperm 2, 10, 12 setobjectmovementtype 2, 9 setobjectxyperm 5, 10, 13 @@ -14740,7 +14076,7 @@ EventScript_1C4FFE:: @ 81C4FFE goto EventScript_1C5042 EventScript_1C5019:: @ 81C5019 - setflag FLAG_0x005 + setflag FLAG_TEMP_5 setvar VAR_0x400F, 1 setobjectxyperm 2, 10, 10 setobjectmovementtype 2, 8 @@ -14749,7 +14085,7 @@ EventScript_1C5019:: @ 81C5019 setobjectxyperm 4, 10, 16 setobjectmovementtype 4, 7 EventScript_1C5042: - setflag FLAG_0x006 + setflag FLAG_TEMP_6 end SevenIsland_TrainerTower_1F_MapScript3_1C5046:: @ 81C5046 @@ -14770,14 +14106,14 @@ EventScript_1C5050:: @ 81C5050 setvar VAR_0x8004, 5 special sub_815D9E8 compare_var_to_value VAR_RESULT, 0 - goto_if 1, EventScript_1C5072 + goto_if eq, EventScript_1C5072 setvar VAR_0x400E, 1 setvar VAR_0x400F, 1 EventScript_1C5072: setvar VAR_0x8004, 18 special sub_815D9E8 compare_var_to_value VAR_RESULT, 1 - goto_if 1, EventScript_1C5086 + goto_if eq, EventScript_1C5086 end EventScript_1C5086:: @ 81C5086 @@ -14787,13 +14123,10 @@ EventScript_1C508F:: setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C50C2 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C510D - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C515C + switch VAR_RESULT + case 0, EventScript_1C50C2 + case 1, EventScript_1C510D + case 2, EventScript_1C515C EventScript_1C50C2: setvar VAR_0x8004, 19 special sub_815D9E8 @@ -14822,7 +14155,7 @@ EventScript_1C510D:: @ 81C510D setvar VAR_0x8005, 2 addvar VAR_0x4003, 1 compare_var_to_value VAR_0x4003, 1 - goto_if 1, EventScript_1C5146 + goto_if eq, EventScript_1C5146 setvar VAR_0x4003, 0 EventScript_1C5146: copyvar VAR_0x8006, VAR_0x4003 @@ -14832,13 +14165,10 @@ EventScript_1C5146: goto EventScript_1C5219 EventScript_1C515C:: @ 81C515C - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C5182 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C51AD - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C51D8 + switch VAR_0x4001 + case 0, EventScript_1C5182 + case 1, EventScript_1C51AD + case 2, EventScript_1C51D8 EventScript_1C5182: setvar VAR_0x8004, 19 special sub_815D9E8 @@ -14882,32 +14212,23 @@ EventScript_1C5219: setvar VAR_0x8005, 0 special sub_815D9E8 waitstate - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C524D - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C52E0 - compare_var_to_value VAR_0x8000, 3 - goto_if 1, EventScript_1C52E0 + switch VAR_RESULT + case 1, EventScript_1C524D + case 2, EventScript_1C52E0 + case 3, EventScript_1C52E0 EventScript_1C524D: setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C52D7 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C52BA - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C5280 + switch VAR_RESULT + case 0, EventScript_1C52D7 + case 1, EventScript_1C52BA + case 2, EventScript_1C5280 EventScript_1C5280: - copyvar VAR_0x8000, VAR_0x4001 - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C52A6 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C52B0 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C52D0 + switch VAR_0x4001 + case 0, EventScript_1C52A6 + case 1, EventScript_1C52B0 + case 2, EventScript_1C52D0 EventScript_1C52A6: addvar VAR_0x4001, 1 goto EventScript_1C515C @@ -14940,13 +14261,10 @@ EventScript_1C52F4:: @ 81C52F4 setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C5327 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C5327 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C5331 + switch VAR_RESULT + case 0, EventScript_1C5327 + case 1, EventScript_1C5327 + case 2, EventScript_1C5331 EventScript_1C5327: setvar VAR_0x8006, 0 goto EventScript_1C5391 @@ -14959,13 +14277,10 @@ EventScript_1C533B:: @ 81C533B setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C536E - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C536E - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C5378 + switch VAR_RESULT + case 0, EventScript_1C536E + case 1, EventScript_1C536E + case 2, EventScript_1C5378 EventScript_1C536E: setvar VAR_0x8006, 0 goto EventScript_1C5391 @@ -14995,25 +14310,19 @@ EventScript_1C53AA:: @ 81C53AA faceplayer setvar VAR_0x8004, 7 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C53DA - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C53E2 - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C5492 + switch VAR_RESULT + case 0, EventScript_1C53DA + case 1, EventScript_1C53E2 + case 2, EventScript_1C5492 EventScript_1C53DA: msgbox Text_17CA5A EventScript_1C53E2: setvar VAR_0x8004, 8 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C5410 - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C543A - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C544F + switch VAR_RESULT + case 0, EventScript_1C5410 + case 1, EventScript_1C543A + case 2, EventScript_1C544F EventScript_1C5410: msgbox Text_17CB09 textcolor 3 @@ -15034,13 +14343,10 @@ EventScript_1C543A:: @ 81C543A EventScript_1C544F:: @ 81C544F setvar VAR_0x8004, 9 special sub_815D9E8 - copyvar VAR_0x8000, VAR_RESULT - compare_var_to_value VAR_0x8000, 0 - goto_if 1, EventScript_1C547D - compare_var_to_value VAR_0x8000, 1 - goto_if 1, EventScript_1C548A - compare_var_to_value VAR_0x8000, 2 - goto_if 1, EventScript_1C5492 + switch VAR_RESULT + case 0, EventScript_1C547D + case 1, EventScript_1C548A + case 2, EventScript_1C5492 EventScript_1C547D: msgbox Text_17CB1A goto EventScript_1C5492 @@ -15082,7 +14388,7 @@ SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4 setvar VAR_0x8004, 16 special sub_815D9E8 compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_1C5528 + goto_if ne, EventScript_1C5528 setvar VAR_0x8004, 19 special sub_815D9E8 applymovement 2, Movement_1A75DB @@ -15102,7 +14408,7 @@ SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA setvar VAR_0x8004, 16 special sub_815D9E8 compare_var_to_value VAR_RESULT, 0 - goto_if 5, EventScript_1C5528 + goto_if ne, EventScript_1C5528 setvar VAR_0x8004, 19 special sub_815D9E8 applymovement 5, Movement_1A75DB diff --git a/data/field_map_obj.s b/data/field_map_obj.s index 72d20cd4e..deae90e8f 100644 --- a/data/field_map_obj.s +++ b/data/field_map_obj.s @@ -1,3 +1,5 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" .section .rodata .align 2 gUnknown_835B934:: @ 835B934 @@ -7,7 +9,529 @@ gUnknown_835B944:: @ 835B944 .incbin "baserom.gba", 0x35B944, 0x18 gUnknown_835B95C:: @ 835B95C - .incbin "baserom.gba", 0x35B95C, 0x3DA2C + .incbin "baserom.gba", 0x35B95C, 0xC + +gUnknown_835B968:: @ 835B968 + .incbin "graphics/map_objects/0.gbapal" + +gUnknown_835B988:: + .incbin "baserom.gba", 0x35B988, 0x1E0 + +gUnknown_835BB68:: @ 835BB68 + .incbin "graphics/map_objects/000.4bpp" + +gUnknown_835C468:: @ 835C468 + .incbin "graphics/map_objects/002.4bpp" + +gUnknown_835D268:: @ 835D268 + .incbin "graphics/map_objects/007.4bpp" + +gUnknown_835DB68:: @ 835DB68 + .incbin "graphics/map_objects/009.4bpp" + +gUnknown_835E968:: @ 835E968 + .incbin "graphics/map_objects/1.gbapal" + +gUnknown_835E988:: @ 835E988 + .incbin "graphics/map_objects/2.gbapal" + +gUnknown_835E9A8:: @ 835E9A8 + .incbin "graphics/map_objects/005.4bpp" + +gUnknown_835F2A8:: @ 835F2A8 + .incbin "graphics/map_objects/012.4bpp" + +@ 35FBA8 + .incbin "graphics/map_objects/male_surf.4bpp" + +@ 360DA8 + .incbin "graphics/map_objects/female_surf.4bpp" + +gUnknown_8361FA8:: @ 8361FA8 + .incbin "graphics/map_objects/001.4bpp" + +gUnknown_83631A8:: @ 83631A8 + .incbin "graphics/map_objects/006.4bpp" + +gUnknown_8363DA8:: @ 8363DA8 + .incbin "graphics/map_objects/008.4bpp" + +gUnknown_8364FA8:: @ 8364FA8 + .incbin "graphics/map_objects/013.4bpp" + +gUnknown_8365BA8:: @ 8365BA8 + .incbin "graphics/map_objects/014.4bpp" + +gUnknown_83664A8:: @ 83664A8 + .incbin "graphics/map_objects/015.4bpp" + +gUnknown_8366DA8:: @ 8366DA8 + .incbin "graphics/map_objects/004.4bpp" + +gUnknown_83685A8:: @ 83685A8 + .incbin "graphics/map_objects/011.4bpp" + +gUnknown_8369DA8:: @ 8369DA8 + .incbin "graphics/map_objects/094.4bpp" + +gUnknown_8369E28:: @ 8369E28 + .incbin "graphics/map_objects/093.4bpp" + +@ 8369F28 + .incbin "graphics/map_objects/unk_8369F28.4bpp" + +gUnknown_836A228:: @ 836A228 + .incbin "graphics/map_objects/087.4bpp" + +gUnknown_836AB28:: @ 836AB28 + .incbin "graphics/map_objects/086.4bpp" + +gUnknown_836AE28:: @ 836AE28 + .incbin "graphics/map_objects/085.4bpp" + +gUnknown_836B128:: @ 836B128 + .incbin "graphics/map_objects/076.4bpp" + +gUnknown_836BA28:: @ 836BA28 + .incbin "graphics/map_objects/077.4bpp" + +gUnknown_836C328:: @ 836C328 + .incbin "graphics/map_objects/083.4bpp" + +gUnknown_836C628:: @ 836C628 + .incbin "graphics/map_objects/084.4bpp" + +gUnknown_836C928:: @ 836C928 + .incbin "graphics/map_objects/080.4bpp" + +gUnknown_836CC28:: @ 836CC28 + .incbin "graphics/map_objects/082.4bpp" + +gUnknown_836CF28:: @ 836CF28 + .incbin "graphics/map_objects/073.4bpp" + +gUnknown_836D828:: @ 836D828 + .incbin "graphics/map_objects/3.gbapal" + +gUnknown_836D848:: @ 836D848 + .incbin "graphics/map_objects/4.gbapal" + +gUnknown_836D868:: @ 836D868 + .incbin "graphics/map_objects/5.gbapal" + +gUnknown_836D888:: @ 836D888 + .incbin "graphics/map_objects/6.gbapal" + +gUnknown_836D8A8:: @ 836D8A8 + .incbin "graphics/map_objects/7.gbapal" + +gUnknown_836D8C8:: @ 836D8C8 + .incbin "graphics/map_objects/8.gbapal" + +gUnknown_836D8E8:: @ 836D8E8 + .incbin "graphics/map_objects/9.gbapal" + +gUnknown_836D908:: @ 836D908 + .incbin "graphics/map_objects/10.gbapal" + +gUnknown_836D928:: @ 836D928 + .incbin "graphics/map_objects/016.4bpp" + +gUnknown_836DDA8:: @ 836DDA8 + .incbin "graphics/map_objects/017.4bpp" + +gUnknown_836E2A8:: @ 836E2A8 + .incbin "graphics/map_objects/021.4bpp" + +gUnknown_836E5A8:: @ 836E5A8 + .incbin "graphics/map_objects/022.4bpp" + +gUnknown_836EFA8:: @ 836EFA8 + .incbin "graphics/map_objects/018.4bpp" + +gUnknown_836F9A8:: @ 836F9A8 + .incbin "graphics/map_objects/019.4bpp" + +gUnknown_83703A8:: @ 83703A8 + .incbin "graphics/map_objects/023.4bpp" + +gUnknown_8370DA8:: @ 8370DA8 + .incbin "graphics/map_objects/031.4bpp" + +gUnknown_83716A8:: @ 83716A8 + .incbin "graphics/map_objects/020.4bpp" + +gUnknown_83720A8:: @ 83720A8 + .incbin "graphics/map_objects/024.4bpp" + +@ 8372AA8 + .incbin "graphics/map_objects/unk_8372AA8.4bpp" + +gUnknown_83733A8:: @ 83733A8 + .incbin "graphics/map_objects/027.4bpp" + +gUnknown_8373CA8:: @ 8373CA8 + .incbin "graphics/map_objects/030.4bpp" + +gUnknown_83746A8:: @ 83746A8 + .incbin "graphics/map_objects/028.4bpp" + +gUnknown_83750A8:: @ 83750A8 + .incbin "graphics/map_objects/032.4bpp" + +gUnknown_8375AA8:: @ 8375AA8 + .incbin "graphics/map_objects/034.4bpp" + +gUnknown_8375CA8:: @ 8375CA8 + .incbin "graphics/map_objects/047.4bpp" + +gUnknown_83766A8:: @ 83766A8 + .incbin "graphics/map_objects/048.4bpp" + +gUnknown_83770A8:: @ 83770A8 + .incbin "graphics/map_objects/029.4bpp" + +gUnknown_8377AA8:: @ 8377AA8 + .incbin "graphics/map_objects/059.4bpp" + +gUnknown_83783A8:: @ 83783A8 + .incbin "graphics/map_objects/033.4bpp" + +gUnknown_8378CA8:: @ 8378CA8 + .incbin "graphics/map_objects/035.4bpp" + +gUnknown_83795A8:: @ 83795A8 + .incbin "graphics/map_objects/039.4bpp" + +gUnknown_8379FA8:: @ 8379FA8 + .incbin "graphics/map_objects/040.4bpp" + +gUnknown_837A9A8:: @ 837A9A8 + .incbin "graphics/map_objects/041.4bpp" + +gUnknown_837B3A8:: @ 837B3A8 + .incbin "graphics/map_objects/042.4bpp" + +gUnknown_837BDA8:: @ 837BDA8 + .incbin "graphics/map_objects/121.4bpp" + +gUnknown_837BF28:: @ 837BF28 + .incbin "graphics/map_objects/052.4bpp" + +gUnknown_837C928:: @ 837C928 + .incbin "graphics/map_objects/058.4bpp" + +gUnknown_837D328:: @ 837D328 + .incbin "graphics/map_objects/050.4bpp" + +gUnknown_837DC28:: @ 837DC28 + .incbin "graphics/map_objects/043.4bpp" + +gUnknown_837E628:: @ 837E628 + .incbin "graphics/map_objects/044.4bpp" + +gUnknown_837F028:: @ 837F028 + .incbin "graphics/map_objects/045.4bpp" + +gUnknown_837FA28:: @ 837FA28 + .incbin "graphics/map_objects/046.4bpp" + +gUnknown_8380428:: @ 8380428 + .incbin "graphics/map_objects/054.4bpp" + +gUnknown_8380E28:: @ 8380E28 + .incbin "graphics/map_objects/055.4bpp" + +gUnknown_8381828:: @ 8381828 + .incbin "graphics/map_objects/061.4bpp" + +gUnknown_8382228:: @ 8382228 + .incbin "graphics/map_objects/062.4bpp" + +gUnknown_8382C28:: @ 8382C28 + .incbin "graphics/map_objects/063.4bpp" + +gUnknown_8383528:: @ 8383528 + .incbin "graphics/map_objects/057.4bpp" + +gUnknown_8383F28:: @ 8383F28 + .incbin "graphics/map_objects/090.4bpp" + +gUnknown_8384828:: @ 8384828 + .incbin "graphics/map_objects/152.4bpp" + +gUnknown_8385128:: @ 8385128 + .incbin "graphics/map_objects/037.4bpp" + +gUnknown_8385628:: @ 8385628 + .incbin "graphics/map_objects/036.4bpp" + +gUnknown_8385B28:: @ 8385B28 + .incbin "graphics/map_objects/038.4bpp" + +gUnknown_8386028:: @ 8386028 + .incbin "graphics/map_objects/056.4bpp" + +gUnknown_8386A28:: @ 8386A28 + .incbin "graphics/map_objects/053.4bpp" + +gUnknown_8387E28:: @ 8387E28 + .incbin "graphics/map_objects/091.4bpp" + +gUnknown_8388728:: @ 8388728 + .incbin "graphics/map_objects/025.4bpp" + +gUnknown_8389128:: @ 8389128 + .incbin "graphics/map_objects/026.4bpp" + +gUnknown_8389B28:: @ 8389B28 + .incbin "graphics/map_objects/071.4bpp" + +gUnknown_838A428:: @ 838A428 + .incbin "graphics/map_objects/072.4bpp" + +gUnknown_838AD28:: @ 838AD28 + .incbin "graphics/map_objects/064.4bpp" + +gUnknown_838B128:: @ 838B128 + .incbin "graphics/map_objects/065.4bpp" + +gUnknown_838B428:: @ 838B428 + .incbin "graphics/map_objects/066.4bpp" + +gUnknown_838B728:: @ 838B728 + .incbin "graphics/map_objects/067.4bpp" + +gUnknown_838BA28:: @ 838BA28 + .incbin "graphics/map_objects/092.4bpp" + +gUnknown_838BAA8:: @ 838BAA8 + .incbin "graphics/map_objects/078.4bpp" + +gUnknown_838C3A8:: @ 838C3A8 + .incbin "graphics/map_objects/079.4bpp" + +gUnknown_838C6A8:: @ 838C6A8 + .incbin "graphics/map_objects/068.4bpp" + +gUnknown_838CFA8:: @ 838CFA8 + .incbin "graphics/map_objects/069.4bpp" + +gUnknown_838D2A8:: @ 838D2A8 + .incbin "graphics/map_objects/070.4bpp" + +gUnknown_838D5A8:: @ 838D5A8 + .incbin "graphics/map_objects/unk_838D5A8.4bpp" + +gUnknown_838DEA8:: @ 838DEA8 + .incbin "graphics/map_objects/049.4bpp" + +gUnknown_838E7A8:: @ 838E7A8 + .incbin "graphics/map_objects/089.4bpp" + +gUnknown_838F0A8:: @ 838F0A8 + .incbin "graphics/map_objects/135.4bpp" + +gUnknown_838F228:: @ 838F228 + .incbin "graphics/map_objects/136.4bpp" + +gUnknown_838F428:: @ 838F428 + .incbin "graphics/map_objects/137.4bpp" + +gUnknown_838F628:: @ 838F628 + .incbin "graphics/map_objects/138.4bpp" + +gUnknown_838F828:: @ 838F828 + .incbin "graphics/map_objects/139.4bpp" + +gUnknown_838F8A8:: @ 838F8A8 + .incbin "graphics/map_objects/140.4bpp" + +gUnknown_838F928:: @ 838F928 + .incbin "graphics/map_objects/141.4bpp" + +gUnknown_838F9A8:: @ 838F9A8 + .incbin "graphics/map_objects/143.4bpp" + +gUnknown_838FA28:: @ 838FA28 + .incbin "graphics/map_objects/142.4bpp" + +gUnknown_838FAA8:: @ 838FAA8 + .incbin "graphics/map_objects/144.4bpp" + +gUnknown_838FEA8:: @ 838FEA8 + .incbin "graphics/map_objects/145.4bpp" + +gUnknown_83902A8:: @ 83902A8 + .incbin "graphics/map_objects/146.4bpp" + +gUnknown_8390328:: @ 8390328 + .incbin "graphics/map_objects/148.4bpp" + +gUnknown_8390728:: @ 8390728 + .incbin "graphics/map_objects/149.4bpp" + +gUnknown_8390B28:: @ 8390B28 + .incbin "graphics/map_objects/150.4bpp" + +gUnknown_8390F28:: @ 8390F28 + .incbin "graphics/map_objects/075.4bpp" + +gUnknown_8391228:: @ 8391228 + .incbin "graphics/map_objects/081.4bpp" + +gUnknown_8391528:: @ 8391528 + .incbin "graphics/map_objects/074.4bpp" + +gUnknown_8391828:: @ 8391828 + .incbin "graphics/map_objects/051.4bpp" + +gUnknown_8391B28:: @ 8391B28 + .incbin "graphics/map_objects/088.4bpp" + +gUnknown_8391E28:: @ 8391E28 + .incbin "graphics/map_objects/114.4bpp" + +gUnknown_8391FA8:: @ 8391FA8 + .incbin "graphics/map_objects/118.4bpp" + +gUnknown_8392128:: @ 8392128 + .incbin "graphics/map_objects/119.4bpp" + +gUnknown_83922A8:: @ 83922A8 + .incbin "graphics/map_objects/122.4bpp" + +gUnknown_8392428:: @ 8392428 + .incbin "graphics/map_objects/123.4bpp" + +gUnknown_83925A8:: @ 83925A8 + .incbin "graphics/map_objects/124.4bpp" + +gUnknown_8392728:: @ 8392728 + .incbin "graphics/map_objects/125.4bpp" + +gUnknown_83928A8:: @ 83928A8 + .incbin "graphics/map_objects/126.4bpp" + +gUnknown_8392A28:: @ 8392A28 + .incbin "graphics/map_objects/127.4bpp" + +gUnknown_8392BA8:: @ 8392BA8 + .incbin "graphics/map_objects/128.4bpp" + +gUnknown_8392D28:: @ 8392D28 + .incbin "graphics/map_objects/129.4bpp" + +gUnknown_8392EA8:: @ 8392EA8 + .incbin "graphics/map_objects/130.4bpp" + +gUnknown_8393028:: @ 8393028 + .incbin "graphics/map_objects/131.4bpp" + +gUnknown_83931A8:: @ 83931A8 + .incbin "graphics/map_objects/132.4bpp" + +gUnknown_8393328:: @ 8393328 + .incbin "graphics/map_objects/133.4bpp" + +gUnknown_83934A8:: @ 83934A8 + .incbin "graphics/map_objects/147.4bpp" + +gUnknown_8393628:: @ 8393628 + .incbin "graphics/map_objects/134.4bpp" + +gUnknown_83937A8:: @ 83937A8 + .incbin "graphics/map_objects/109.4bpp" + +gUnknown_83939A8:: @ 83939A8 + .incbin "graphics/map_objects/110.4bpp" + +gUnknown_8393B28:: @ 8393B28 + .incbin "graphics/map_objects/111.4bpp" + +gUnknown_8393CA8:: @ 8393CA8 + .incbin "graphics/map_objects/112.4bpp" + +gUnknown_8393E28:: @ 8393E28 + .incbin "graphics/map_objects/117.4bpp" + +gUnknown_8393FA8:: @ 8393FA8 + .incbin "graphics/map_objects/120.4bpp" + +gUnknown_8394128:: @ 8394128 + .incbin "graphics/map_objects/115.4bpp" + +gUnknown_83942A8:: @ 83942A8 + .incbin "graphics/map_objects/116.4bpp" + +gUnknown_8394428:: @ 8394428 + .incbin "graphics/map_objects/113.4bpp" + +gUnknown_83945A8:: @ 83945A8 + .incbin "graphics/map_objects/095.4bpp" + +gUnknown_83947A8:: @ 83947A8 + .incbin "graphics/map_objects/096.4bpp" + +gUnknown_83949A8:: @ 83949A8 + .incbin "graphics/map_objects/097.4bpp" + +gUnknown_8394A28:: @ 8394A28 + .incbin "graphics/map_objects/098.4bpp" + +gUnknown_8394AA8:: @ 8394AA8 + .incbin "graphics/map_objects/099.4bpp" + +gUnknown_8394B28:: @ 8394B28 + .incbin "graphics/map_objects/100.4bpp" + +gUnknown_8394BA8:: @ 8394BA8 + .incbin "graphics/map_objects/101.4bpp" + +gUnknown_8394C28:: @ 8394C28 + .incbin "graphics/map_objects/102.4bpp" + +gUnknown_8394D28:: @ 8394D28 + .incbin "graphics/map_objects/103.4bpp" + +gUnknown_8394DA8:: @ 8394DA8 + .incbin "graphics/map_objects/104.4bpp" + +gUnknown_8394E28:: @ 8394E28 + .incbin "graphics/map_objects/105.4bpp" + +gUnknown_8394EA8:: @ 8394EA8 + .incbin "graphics/map_objects/19.gbapal" + +gUnknown_8394EC8:: @ 8394EC8 + .incbin "graphics/map_objects/106.4bpp" + +gUnknown_83950C8:: @ 83950C8 + .incbin "graphics/map_objects/107.4bpp" + +gUnknown_83952C8:: @ 83952C8 + .incbin "graphics/map_objects/20.gbapal" + +gUnknown_83952E8:: @ 83952E8 + .incbin "graphics/map_objects/108.4bpp" + +gUnknown_8395AE8:: @ 8395AE8 + .incbin "graphics/map_objects/21.gbapal" + +gUnknown_8395B08:: @ 8395B08 + .incbin "graphics/map_objects/151.4bpp" + .incbin "graphics/map_objects/unk_396B08.4bpp" + +gUnknown_8397708:: @ 8397708 + .incbin "graphics/map_objects/060.4bpp" + +gUnknown_8398008:: @ 8398008 + .incbin "graphics/map_objects/11.gbapal" + +gUnknown_8398028:: @ 8398028 + .incbin "graphics/map_objects/12.gbapal" + + .incbin "baserom.gba", 0x398048, 0x1340 gUnknown_8399388:: @ 8399388 .incbin "baserom.gba", 0x399388, 0x908 @@ -24,20 +548,4796 @@ gUnknown_839FD0C:: @ 839FD0C gUnknown_839FD5D:: @ 839FD5D .incbin "baserom.gba", 0x39FD5D, 0x53 -gUnknown_839FDB0:: @ 839FDB0 - .incbin "baserom.gba", 0x39FDB0, 0x260 +gMapObjectGraphicsInfoPointers:: @ 839FDB0 + .4byte gMapObjectGraphicsInfo_83A3BB0 + .4byte gMapObjectGraphicsInfo_83A3BD4 + .4byte gMapObjectGraphicsInfo_83A3BF8 + .4byte gMapObjectGraphicsInfo_83A3C1C + .4byte gMapObjectGraphicsInfo_83A4858 + .4byte gMapObjectGraphicsInfo_83A48A0 + .4byte gMapObjectGraphicsInfo_83A48C4 + .4byte gMapObjectGraphicsInfo_83A4564 + .4byte gMapObjectGraphicsInfo_83A4588 + .4byte gMapObjectGraphicsInfo_83A45AC + .4byte gMapObjectGraphicsInfo_83A45D0 + .4byte gMapObjectGraphicsInfo_83A487C + .4byte gMapObjectGraphicsInfo_83A48E8 + .4byte gMapObjectGraphicsInfo_83A490C + .4byte gMapObjectGraphicsInfo_83A3C64 + .4byte gMapObjectGraphicsInfo_83A3C88 + .4byte gMapObjectGraphicsInfo_83A3CAC + .4byte gMapObjectGraphicsInfo_83A3CD0 + .4byte gMapObjectGraphicsInfo_83A3D3C + .4byte gMapObjectGraphicsInfo_83A3DA8 + .4byte gMapObjectGraphicsInfo_83A3DF0 + .4byte gMapObjectGraphicsInfo_83A3CF4 + .4byte gMapObjectGraphicsInfo_83A3D18 + .4byte gMapObjectGraphicsInfo_83A3D60 + .4byte gMapObjectGraphicsInfo_83A3DCC + .4byte gMapObjectGraphicsInfo_83A4390 + .4byte gMapObjectGraphicsInfo_83A43B4 + .4byte gMapObjectGraphicsInfo_83A3E14 + .4byte gMapObjectGraphicsInfo_83A3E5C + .4byte gMapObjectGraphicsInfo_83A3EEC + .4byte gMapObjectGraphicsInfo_83A3E38 + .4byte gMapObjectGraphicsInfo_83A3D84 + .4byte gMapObjectGraphicsInfo_83A3E80 + .4byte gMapObjectGraphicsInfo_83A3F34 + .4byte gMapObjectGraphicsInfo_83A4420 + .4byte gMapObjectGraphicsInfo_83A3F58 + .4byte gMapObjectGraphicsInfo_83A424C + .4byte gMapObjectGraphicsInfo_83A4228 + .4byte gMapObjectGraphicsInfo_83A4270 + .4byte gMapObjectGraphicsInfo_83A3F7C + .4byte gMapObjectGraphicsInfo_83A3FA0 + .4byte gMapObjectGraphicsInfo_83A3FC4 + .4byte gMapObjectGraphicsInfo_83A3FE8 + .4byte gMapObjectGraphicsInfo_83A4078 + .4byte gMapObjectGraphicsInfo_83A409C + .4byte gMapObjectGraphicsInfo_83A40C0 + .4byte gMapObjectGraphicsInfo_83A40E4 + .4byte gMapObjectGraphicsInfo_83A3EA4 + .4byte gMapObjectGraphicsInfo_83A3EC8 + .4byte gMapObjectGraphicsInfo_83A4618 + .4byte gMapObjectGraphicsInfo_83A4054 + .4byte gMapObjectGraphicsInfo_83A4978 + .4byte gMapObjectGraphicsInfo_83A400C + .4byte gMapObjectGraphicsInfo_83A42B8 + .4byte gMapObjectGraphicsInfo_83A4108 + .4byte gMapObjectGraphicsInfo_83A412C + .4byte gMapObjectGraphicsInfo_83A4294 + .4byte gMapObjectGraphicsInfo_83A41BC + .4byte gMapObjectGraphicsInfo_83A4030 + .4byte gMapObjectGraphicsInfo_83A3F10 + .4byte gMapObjectGraphicsInfo_83A3C40 + .4byte gMapObjectGraphicsInfo_83A4150 + .4byte gMapObjectGraphicsInfo_83A4174 + .4byte gMapObjectGraphicsInfo_83A4198 + .4byte gMapObjectGraphicsInfo_83A4300 + .4byte gMapObjectGraphicsInfo_83A44D4 + .4byte gMapObjectGraphicsInfo_83A44F8 + .4byte gMapObjectGraphicsInfo_83A4324 + .4byte gMapObjectGraphicsInfo_83A4468 + .4byte gMapObjectGraphicsInfo_83A448C + .4byte gMapObjectGraphicsInfo_83A44B0 + .4byte gMapObjectGraphicsInfo_83A436C + .4byte gMapObjectGraphicsInfo_83A4834 + .4byte gMapObjectGraphicsInfo_83A47A4 + .4byte gMapObjectGraphicsInfo_83A4810 + .4byte gMapObjectGraphicsInfo_83A4660 + .4byte gMapObjectGraphicsInfo_83A47C8 + .4byte gMapObjectGraphicsInfo_83A47EC + .4byte gMapObjectGraphicsInfo_83A43D8 + .4byte gMapObjectGraphicsInfo_83A43FC + .4byte gMapObjectGraphicsInfo_83A4684 + .4byte gMapObjectGraphicsInfo_83A46A8 + .4byte gMapObjectGraphicsInfo_83A46CC + .4byte gMapObjectGraphicsInfo_83A46F0 + .4byte gMapObjectGraphicsInfo_83A4714 + .4byte gMapObjectGraphicsInfo_83A4780 + .4byte gMapObjectGraphicsInfo_83A475C + .4byte gMapObjectGraphicsInfo_83A4738 + .4byte gMapObjectGraphicsInfo_83A50EC + .4byte gMapObjectGraphicsInfo_83A463C + .4byte gMapObjectGraphicsInfo_83A41E0 + .4byte gMapObjectGraphicsInfo_83A42DC + .4byte gMapObjectGraphicsInfo_83A4348 + .4byte gMapObjectGraphicsInfo_83A4930 + .4byte gMapObjectGraphicsInfo_83A4954 + .4byte gMapObjectGraphicsInfo_83A4444 + .4byte gMapObjectGraphicsInfo_83A451C + .4byte gMapObjectGraphicsInfo_83A4540 + .4byte gMapObjectGraphicsInfo_83A49C0 + .4byte gMapObjectGraphicsInfo_83A49E4 + .4byte gMapObjectGraphicsInfo_83A4A08 + .4byte gMapObjectGraphicsInfo_83A4A2C + .4byte gMapObjectGraphicsInfo_83A4A50 + .4byte gMapObjectGraphicsInfo_83A4A74 + .4byte gMapObjectGraphicsInfo_83A4A98 + .4byte gMapObjectGraphicsInfo_83A4ABC + .4byte gMapObjectGraphicsInfo_83A4AE0 + .4byte gMapObjectGraphicsInfo_83A4B04 + .4byte gMapObjectGraphicsInfo_83A5110 + .4byte gMapObjectGraphicsInfo_83A499C + .4byte gMapObjectGraphicsInfo_83A4B28 + .4byte gMapObjectGraphicsInfo_83A4F84 + .4byte gMapObjectGraphicsInfo_83A4FF0 + .4byte gMapObjectGraphicsInfo_83A50C8 + .4byte gMapObjectGraphicsInfo_83A5014 + .4byte gMapObjectGraphicsInfo_83A5080 + .4byte gMapObjectGraphicsInfo_83A50A4 + .4byte gMapObjectGraphicsInfo_83A5038 + .4byte gMapObjectGraphicsInfo_83A4B4C + .4byte gMapObjectGraphicsInfo_83A4B70 + .4byte gMapObjectGraphicsInfo_83A505C + .4byte gMapObjectGraphicsInfo_83A4B94 + .4byte gMapObjectGraphicsInfo_83A4BB8 + .4byte gMapObjectGraphicsInfo_83A4BDC + .4byte gMapObjectGraphicsInfo_83A4C00 + .4byte gMapObjectGraphicsInfo_83A4C24 + .4byte gMapObjectGraphicsInfo_83A4C48 + .4byte gMapObjectGraphicsInfo_83A4C6C + .4byte gMapObjectGraphicsInfo_83A4C90 + .4byte gMapObjectGraphicsInfo_83A4CB4 + .4byte gMapObjectGraphicsInfo_83A4CD8 + .4byte gMapObjectGraphicsInfo_83A4CFC + .4byte gMapObjectGraphicsInfo_83A4D20 + .4byte gMapObjectGraphicsInfo_83A4D44 + .4byte gMapObjectGraphicsInfo_83A4FA8 + .4byte gMapObjectGraphicsInfo_83A4D68 + .4byte gMapObjectGraphicsInfo_83A4D8C + .4byte gMapObjectGraphicsInfo_83A4DB0 + .4byte gMapObjectGraphicsInfo_83A4DD4 + .4byte gMapObjectGraphicsInfo_83A4E64 + .4byte gMapObjectGraphicsInfo_83A4E88 + .4byte gMapObjectGraphicsInfo_83A4EAC + .4byte gMapObjectGraphicsInfo_83A4EF4 + .4byte gMapObjectGraphicsInfo_83A4ED0 + .4byte gMapObjectGraphicsInfo_83A4F18 + .4byte gMapObjectGraphicsInfo_83A4F3C + .4byte gMapObjectGraphicsInfo_83A4F60 + .4byte gMapObjectGraphicsInfo_83A4FCC + .4byte gMapObjectGraphicsInfo_83A4DF8 + .4byte gMapObjectGraphicsInfo_83A4E1C + .4byte gMapObjectGraphicsInfo_83A4E40 + .4byte gMapObjectGraphicsInfo_83A5134 gUnknown_83A0010:: @ 83A0010 - .incbin "baserom.gba", 0x3A0010, 0x3688 + .incbin "baserom.gba", 0x3A0010, 0x90 + + +gSpriteImages_83A00A0:: @ 83A00A0 + obj_frame_tiles gUnknown_835BB68, 0x100 + obj_frame_tiles gUnknown_835BB68 + 0x100, 0x100 + obj_frame_tiles gUnknown_835BB68 + 0x200, 0x100 + obj_frame_tiles gUnknown_835BB68 + 0x300, 0x100 + obj_frame_tiles gUnknown_835BB68 + 0x400, 0x100 + obj_frame_tiles gUnknown_835BB68 + 0x500, 0x100 + obj_frame_tiles gUnknown_835BB68 + 0x600, 0x100 + obj_frame_tiles gUnknown_835BB68 + 0x700, 0x100 + obj_frame_tiles gUnknown_835BB68 + 0x800, 0x100 + obj_frame_tiles gUnknown_835C468 + 0x300, 0x100 + obj_frame_tiles gUnknown_835C468 + 0x400, 0x100 + obj_frame_tiles gUnknown_835C468 + 0x500, 0x100 + obj_frame_tiles gUnknown_835C468 + 0x600, 0x100 + obj_frame_tiles gUnknown_835C468 + 0x700, 0x100 + obj_frame_tiles gUnknown_835C468 + 0x800, 0x100 + obj_frame_tiles gUnknown_835C468 + 0x900, 0x100 + obj_frame_tiles gUnknown_835C468 + 0xA00, 0x100 + obj_frame_tiles gUnknown_835C468 + 0xB00, 0x100 + obj_frame_tiles gUnknown_835C468 + 0xC00, 0x100 + obj_frame_tiles gUnknown_835C468 + 0xD00, 0x100 + +gSpriteImages_83A0140:: @ 83A0140 + obj_frame_tiles gUnknown_8361FA8, 0x200 + obj_frame_tiles gUnknown_8361FA8 + 0x200, 0x200 + obj_frame_tiles gUnknown_8361FA8 + 0x400, 0x200 + obj_frame_tiles gUnknown_8361FA8 + 0x600, 0x200 + obj_frame_tiles gUnknown_8361FA8 + 0x800, 0x200 + obj_frame_tiles gUnknown_8361FA8 + 0xA00, 0x200 + obj_frame_tiles gUnknown_8361FA8 + 0xC00, 0x200 + obj_frame_tiles gUnknown_8361FA8 + 0xE00, 0x200 + obj_frame_tiles gUnknown_8361FA8 + 0x1000, 0x200 + +gSpriteImages_83A0188:: @ 83A0188 + obj_frame_tiles gUnknown_835D268, 0x100 + obj_frame_tiles gUnknown_835D268 + 0x100, 0x100 + obj_frame_tiles gUnknown_835D268 + 0x200, 0x100 + obj_frame_tiles gUnknown_835D268 + 0x300, 0x100 + obj_frame_tiles gUnknown_835D268 + 0x400, 0x100 + obj_frame_tiles gUnknown_835D268 + 0x500, 0x100 + obj_frame_tiles gUnknown_835D268 + 0x600, 0x100 + obj_frame_tiles gUnknown_835D268 + 0x700, 0x100 + obj_frame_tiles gUnknown_835D268 + 0x800, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0x300, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0x400, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0x500, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0x600, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0x700, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0x800, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0x900, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0xA00, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0xB00, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0xC00, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0xD00, 0x100 + +gSpriteImages_83A0228:: @ 83A0228 + obj_frame_tiles gUnknown_8363DA8, 0x200 + obj_frame_tiles gUnknown_8363DA8 + 0x200, 0x200 + obj_frame_tiles gUnknown_8363DA8 + 0x400, 0x200 + obj_frame_tiles gUnknown_8363DA8 + 0x600, 0x200 + obj_frame_tiles gUnknown_8363DA8 + 0x800, 0x200 + obj_frame_tiles gUnknown_8363DA8 + 0xA00, 0x200 + obj_frame_tiles gUnknown_8363DA8 + 0xC00, 0x200 + obj_frame_tiles gUnknown_8363DA8 + 0xE00, 0x200 + obj_frame_tiles gUnknown_8363DA8 + 0x1000, 0x200 + +gSpriteImages_83A0270:: @ 83A0270 + obj_frame_tiles gUnknown_835C468, 0x100 + obj_frame_tiles gUnknown_835C468 + 0x100, 0x100 + obj_frame_tiles gUnknown_835C468 + 0x200, 0x100 + obj_frame_tiles gUnknown_835C468, 0x100 + obj_frame_tiles gUnknown_835C468, 0x100 + obj_frame_tiles gUnknown_835C468 + 0x100, 0x100 + obj_frame_tiles gUnknown_835C468 + 0x100, 0x100 + obj_frame_tiles gUnknown_835C468 + 0x200, 0x100 + obj_frame_tiles gUnknown_835C468 + 0x200, 0x100 + obj_frame_tiles gUnknown_835C468, 0x100 + obj_frame_tiles gUnknown_835C468 + 0x100, 0x100 + obj_frame_tiles gUnknown_835C468 + 0x200, 0x100 + +gSpriteImages_83A02D0:: @ 83A02D0 + obj_frame_tiles gUnknown_835DB68, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0x100, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0x200, 0x100 + obj_frame_tiles gUnknown_835DB68, 0x100 + obj_frame_tiles gUnknown_835DB68, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0x100, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0x100, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0x200, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0x200, 0x100 + obj_frame_tiles gUnknown_835DB68, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0x100, 0x100 + obj_frame_tiles gUnknown_835DB68 + 0x200, 0x100 + +gSpriteImages_83A0330:: @ 83A0330 + obj_frame_tiles gUnknown_835E9A8, 0x100 + obj_frame_tiles gUnknown_835E9A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_835E9A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_835E9A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_835E9A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_835E9A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_835E9A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_835E9A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_835E9A8 + 0x800, 0x100 + +gSpriteImages_83A0378:: @ 83A0378 + obj_frame_tiles gUnknown_835F2A8, 0x100 + obj_frame_tiles gUnknown_835F2A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_835F2A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_835F2A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_835F2A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_835F2A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_835F2A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_835F2A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_835F2A8 + 0x800, 0x100 + +gSpriteImages_83A03C0:: @ 83A03C0 + obj_frame_tiles gUnknown_83631A8, 0x200 + obj_frame_tiles gUnknown_83631A8 + 0x200, 0x200 + obj_frame_tiles gUnknown_83631A8 + 0x400, 0x200 + obj_frame_tiles gUnknown_83631A8 + 0x600, 0x200 + obj_frame_tiles gUnknown_83631A8 + 0x800, 0x200 + obj_frame_tiles gUnknown_83631A8 + 0xA00, 0x200 + +gSpriteImages_83A03F0:: @ 83A03F0 + obj_frame_tiles gUnknown_8364FA8, 0x200 + obj_frame_tiles gUnknown_8364FA8 + 0x200, 0x200 + obj_frame_tiles gUnknown_8364FA8 + 0x400, 0x200 + obj_frame_tiles gUnknown_8364FA8 + 0x600, 0x200 + obj_frame_tiles gUnknown_8364FA8 + 0x800, 0x200 + obj_frame_tiles gUnknown_8364FA8 + 0xA00, 0x200 + +gSpriteImages_83A0420:: @ 83A0420 + obj_frame_tiles gUnknown_8365BA8, 0x100 + obj_frame_tiles gUnknown_8365BA8 + 0x100, 0x100 + obj_frame_tiles gUnknown_8365BA8 + 0x200, 0x100 + obj_frame_tiles gUnknown_8365BA8 + 0x300, 0x100 + obj_frame_tiles gUnknown_8365BA8 + 0x400, 0x100 + obj_frame_tiles gUnknown_8365BA8 + 0x500, 0x100 + obj_frame_tiles gUnknown_8365BA8 + 0x600, 0x100 + obj_frame_tiles gUnknown_8365BA8 + 0x700, 0x100 + obj_frame_tiles gUnknown_8365BA8 + 0x800, 0x100 + obj_frame_tiles gUnknown_83664A8, 0x100 + +gSpriteImages_83A0470:: @ 83A0470 + obj_frame_tiles gUnknown_83664A8, 0x100 + obj_frame_tiles gUnknown_83664A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_83664A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_83664A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_83664A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_83664A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_83664A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_83664A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_83664A8 + 0x800, 0x100 + obj_frame_tiles gUnknown_8366DA8, 0x100 + +gSpriteImages_83A04C0:: @ 83A04C0 + obj_frame_tiles gUnknown_8397708, 0x100 + obj_frame_tiles gUnknown_8397708 + 0x100, 0x100 + obj_frame_tiles gUnknown_8397708 + 0x200, 0x100 + obj_frame_tiles gUnknown_8397708 + 0x300, 0x100 + obj_frame_tiles gUnknown_8397708 + 0x400, 0x100 + obj_frame_tiles gUnknown_8397708 + 0x500, 0x100 + obj_frame_tiles gUnknown_8397708 + 0x600, 0x100 + obj_frame_tiles gUnknown_8397708 + 0x700, 0x100 + obj_frame_tiles gUnknown_8397708 + 0x800, 0x100 + +gSpriteImages_83A0508:: @ 83A0508 + obj_frame_tiles gUnknown_836D928, 0x80 + obj_frame_tiles gUnknown_836D928 + 0x80, 0x80 + obj_frame_tiles gUnknown_836D928 + 0x100, 0x80 + obj_frame_tiles gUnknown_836D928 + 0x180, 0x80 + obj_frame_tiles gUnknown_836D928 + 0x200, 0x80 + obj_frame_tiles gUnknown_836D928 + 0x280, 0x80 + obj_frame_tiles gUnknown_836D928 + 0x300, 0x80 + obj_frame_tiles gUnknown_836D928 + 0x380, 0x80 + obj_frame_tiles gUnknown_836D928 + 0x400, 0x80 + +gSpriteImages_83A0550:: @ 83A0550 + obj_frame_tiles gUnknown_836DDA8, 0x80 + obj_frame_tiles gUnknown_836DDA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_836DDA8 + 0x100, 0x80 + obj_frame_tiles gUnknown_836DDA8 + 0x180, 0x80 + obj_frame_tiles gUnknown_836DDA8 + 0x200, 0x80 + obj_frame_tiles gUnknown_836DDA8 + 0x280, 0x80 + obj_frame_tiles gUnknown_836DDA8 + 0x300, 0x80 + obj_frame_tiles gUnknown_836DDA8 + 0x380, 0x80 + obj_frame_tiles gUnknown_836DDA8 + 0x400, 0x80 + obj_frame_tiles gUnknown_836DDA8 + 0x480, 0x80 + +gSpriteImages_83A05A0:: @ 83A05A0 + obj_frame_tiles gUnknown_836E2A8, 0x100 + obj_frame_tiles gUnknown_836E2A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_836E2A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_836E2A8, 0x100 + obj_frame_tiles gUnknown_836E2A8, 0x100 + obj_frame_tiles gUnknown_836E2A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_836E2A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_836E2A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_836E2A8 + 0x100, 0x100 + +gSpriteImages_83A05E8:: @ 83A05E8 + obj_frame_tiles gUnknown_836E5A8, 0x100 + obj_frame_tiles gUnknown_836E5A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_836E5A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_836E5A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_836E5A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_836E5A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_836E5A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_836E5A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_836E5A8 + 0x800, 0x100 + obj_frame_tiles gUnknown_836E5A8 + 0x900, 0x100 + +gSpriteImages_83A0638:: @ 83A0638 + obj_frame_tiles gUnknown_836EFA8, 0x100 + obj_frame_tiles gUnknown_836EFA8 + 0x100, 0x100 + obj_frame_tiles gUnknown_836EFA8 + 0x200, 0x100 + obj_frame_tiles gUnknown_836EFA8 + 0x300, 0x100 + obj_frame_tiles gUnknown_836EFA8 + 0x400, 0x100 + obj_frame_tiles gUnknown_836EFA8 + 0x500, 0x100 + obj_frame_tiles gUnknown_836EFA8 + 0x600, 0x100 + obj_frame_tiles gUnknown_836EFA8 + 0x700, 0x100 + obj_frame_tiles gUnknown_836EFA8 + 0x800, 0x100 + obj_frame_tiles gUnknown_836EFA8 + 0x900, 0x100 + +gSpriteImages_83A0688:: @ 83A0688 + obj_frame_tiles gUnknown_83703A8, 0x100 + obj_frame_tiles gUnknown_83703A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_83703A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_83703A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_83703A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_83703A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_83703A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_83703A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_83703A8 + 0x800, 0x100 + obj_frame_tiles gUnknown_83703A8 + 0x900, 0x100 + +gSpriteImages_83A06D8:: @ 83A06D8 + obj_frame_tiles gUnknown_8370DA8, 0x100 + obj_frame_tiles gUnknown_8370DA8 + 0x100, 0x100 + obj_frame_tiles gUnknown_8370DA8 + 0x200, 0x100 + obj_frame_tiles gUnknown_8370DA8 + 0x300, 0x100 + obj_frame_tiles gUnknown_8370DA8 + 0x400, 0x100 + obj_frame_tiles gUnknown_8370DA8 + 0x500, 0x100 + obj_frame_tiles gUnknown_8370DA8 + 0x600, 0x100 + obj_frame_tiles gUnknown_8370DA8 + 0x700, 0x100 + obj_frame_tiles gUnknown_8370DA8 + 0x800, 0x100 + +gSpriteImages_83A0720:: @ 83A0720 + obj_frame_tiles gUnknown_83720A8, 0x100 + obj_frame_tiles gUnknown_83720A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_83720A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_83720A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_83720A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_83720A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_83720A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_83720A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_83720A8 + 0x800, 0x100 + obj_frame_tiles gUnknown_83720A8 + 0x900, 0x100 + +gSpriteImages_83A0770:: @ 83A0770 + obj_frame_tiles gUnknown_83716A8, 0x100 + obj_frame_tiles gUnknown_83716A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_83716A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_83716A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_83716A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_83716A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_83716A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_83716A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_83716A8 + 0x800, 0x100 + obj_frame_tiles gUnknown_83716A8 + 0x900, 0x100 + +gSpriteImages_83A07C0:: @ 83A07C0 + obj_frame_tiles gUnknown_83733A8, 0x100 + obj_frame_tiles gUnknown_83733A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_83733A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_83733A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_83733A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_83733A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_83733A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_83733A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_83733A8 + 0x800, 0x100 + +gSpriteImages_83A0808:: @ 83A0808 + obj_frame_tiles gUnknown_8373CA8, 0x100 + obj_frame_tiles gUnknown_8373CA8 + 0x100, 0x100 + obj_frame_tiles gUnknown_8373CA8 + 0x200, 0x100 + obj_frame_tiles gUnknown_8373CA8 + 0x300, 0x100 + obj_frame_tiles gUnknown_8373CA8 + 0x400, 0x100 + obj_frame_tiles gUnknown_8373CA8 + 0x500, 0x100 + obj_frame_tiles gUnknown_8373CA8 + 0x600, 0x100 + obj_frame_tiles gUnknown_8373CA8 + 0x700, 0x100 + obj_frame_tiles gUnknown_8373CA8 + 0x800, 0x100 + obj_frame_tiles gUnknown_8373CA8 + 0x900, 0x100 + +gSpriteImages_83A0858:: @ 83A0858 + obj_frame_tiles gUnknown_83746A8, 0x100 + obj_frame_tiles gUnknown_83746A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_83746A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_83746A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_83746A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_83746A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_83746A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_83746A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_83746A8 + 0x800, 0x100 + obj_frame_tiles gUnknown_83746A8 + 0x900, 0x100 + +gSpriteImages_83A08A8:: @ 83A08A8 + obj_frame_tiles gUnknown_83750A8, 0x100 + obj_frame_tiles gUnknown_83750A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_83750A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_83750A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_83750A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_83750A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_83750A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_83750A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_83750A8 + 0x800, 0x100 + obj_frame_tiles gUnknown_83750A8 + 0x900, 0x100 + +gSpriteImages_83A08F8:: @ 83A08F8 + obj_frame_tiles gUnknown_8375CA8, 0x100 + obj_frame_tiles gUnknown_8375CA8 + 0x100, 0x100 + obj_frame_tiles gUnknown_8375CA8 + 0x200, 0x100 + obj_frame_tiles gUnknown_8375CA8 + 0x300, 0x100 + obj_frame_tiles gUnknown_8375CA8 + 0x400, 0x100 + obj_frame_tiles gUnknown_8375CA8 + 0x500, 0x100 + obj_frame_tiles gUnknown_8375CA8 + 0x600, 0x100 + obj_frame_tiles gUnknown_8375CA8 + 0x700, 0x100 + obj_frame_tiles gUnknown_8375CA8 + 0x800, 0x100 + +gSpriteImages_83A0940:: @ 83A0940 + obj_frame_tiles gUnknown_83766A8, 0x100 + obj_frame_tiles gUnknown_83766A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_83766A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_83766A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_83766A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_83766A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_83766A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_83766A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_83766A8 + 0x800, 0x100 + +gSpriteImages_83A0988:: @ 83A0988 + obj_frame_tiles gUnknown_83770A8, 0x100 + obj_frame_tiles gUnknown_83770A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_83770A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_83770A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_83770A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_83770A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_83770A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_83770A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_83770A8 + 0x800, 0x100 + obj_frame_tiles gUnknown_83770A8 + 0x900, 0x100 + +gSpriteImages_83A09D8:: @ 83A09D8 + obj_frame_tiles gUnknown_8377AA8, 0x100 + obj_frame_tiles gUnknown_8377AA8 + 0x100, 0x100 + obj_frame_tiles gUnknown_8377AA8 + 0x200, 0x100 + obj_frame_tiles gUnknown_8377AA8 + 0x300, 0x100 + obj_frame_tiles gUnknown_8377AA8 + 0x400, 0x100 + obj_frame_tiles gUnknown_8377AA8 + 0x500, 0x100 + obj_frame_tiles gUnknown_8377AA8 + 0x600, 0x100 + obj_frame_tiles gUnknown_8377AA8 + 0x700, 0x100 + obj_frame_tiles gUnknown_8377AA8 + 0x800, 0x100 + +gSpriteImages_83A0A20:: @ 83A0A20 + obj_frame_tiles gUnknown_83783A8, 0x100 + obj_frame_tiles gUnknown_83783A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_83783A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_83783A8, 0x100 + obj_frame_tiles gUnknown_83783A8, 0x100 + obj_frame_tiles gUnknown_83783A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_83783A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_83783A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_83783A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_8378CA8, 0x100 + +gSpriteImages_83A0A70:: @ 83A0A70 + obj_frame_tiles gUnknown_8375AA8, 0x200 + obj_frame_tiles gUnknown_8375AA8, 0x200 + obj_frame_tiles gUnknown_8375AA8, 0x200 + obj_frame_tiles gUnknown_8375AA8, 0x200 + obj_frame_tiles gUnknown_8375AA8, 0x200 + obj_frame_tiles gUnknown_8375AA8, 0x200 + obj_frame_tiles gUnknown_8375AA8, 0x200 + obj_frame_tiles gUnknown_8375AA8, 0x200 + obj_frame_tiles gUnknown_8375AA8, 0x200 + +gSpriteImages_83A0AB8:: @ 83A0AB8 + obj_frame_tiles gUnknown_8378CA8, 0x100 + obj_frame_tiles gUnknown_8378CA8 + 0x100, 0x100 + obj_frame_tiles gUnknown_8378CA8 + 0x200, 0x100 + obj_frame_tiles gUnknown_8378CA8 + 0x300, 0x100 + obj_frame_tiles gUnknown_8378CA8 + 0x400, 0x100 + obj_frame_tiles gUnknown_8378CA8 + 0x500, 0x100 + obj_frame_tiles gUnknown_8378CA8 + 0x600, 0x100 + obj_frame_tiles gUnknown_8378CA8 + 0x700, 0x100 + obj_frame_tiles gUnknown_8378CA8 + 0x800, 0x100 + +gSpriteImages_83A0B00:: @ 83A0B00 + obj_frame_tiles gUnknown_83795A8, 0x100 + obj_frame_tiles gUnknown_83795A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_83795A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_83795A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_83795A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_83795A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_83795A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_83795A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_83795A8 + 0x800, 0x100 + obj_frame_tiles gUnknown_83795A8 + 0x900, 0x100 + +gSpriteImages_83A0B50:: @ 83A0B50 + obj_frame_tiles gUnknown_8379FA8, 0x100 + obj_frame_tiles gUnknown_8379FA8 + 0x100, 0x100 + obj_frame_tiles gUnknown_8379FA8 + 0x200, 0x100 + obj_frame_tiles gUnknown_8379FA8 + 0x300, 0x100 + obj_frame_tiles gUnknown_8379FA8 + 0x400, 0x100 + obj_frame_tiles gUnknown_8379FA8 + 0x500, 0x100 + obj_frame_tiles gUnknown_8379FA8 + 0x600, 0x100 + obj_frame_tiles gUnknown_8379FA8 + 0x700, 0x100 + obj_frame_tiles gUnknown_8379FA8 + 0x800, 0x100 + obj_frame_tiles gUnknown_8379FA8 + 0x900, 0x100 + +gSpriteImages_83A0BA0:: @ 83A0BA0 + obj_frame_tiles gUnknown_837A9A8, 0x100 + obj_frame_tiles gUnknown_837A9A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_837A9A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_837A9A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_837A9A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_837A9A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_837A9A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_837A9A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_837A9A8 + 0x800, 0x100 + obj_frame_tiles gUnknown_837A9A8 + 0x900, 0x100 + +gSpriteImages_83A0BF0:: @ 83A0BF0 + obj_frame_tiles gUnknown_837B3A8, 0x100 + obj_frame_tiles gUnknown_837B3A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_837B3A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_837B3A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_837B3A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_837B3A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_837B3A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_837B3A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_837B3A8 + 0x800, 0x100 + obj_frame_tiles gUnknown_837B3A8 + 0x900, 0x100 + +gSpriteImages_83A0C40:: @ 83A0C40 + obj_frame_tiles gUnknown_836F9A8, 0x100 + obj_frame_tiles gUnknown_836F9A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_836F9A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_836F9A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_836F9A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_836F9A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_836F9A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_836F9A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_836F9A8 + 0x800, 0x100 + obj_frame_tiles gUnknown_836F9A8 + 0x900, 0x100 + +gSpriteImages_83A0C90:: @ 83A0C90 + obj_frame_tiles gUnknown_837BF28, 0x100 + obj_frame_tiles gUnknown_837BF28 + 0x100, 0x100 + obj_frame_tiles gUnknown_837BF28 + 0x200, 0x100 + obj_frame_tiles gUnknown_837BF28 + 0x300, 0x100 + obj_frame_tiles gUnknown_837BF28 + 0x400, 0x100 + obj_frame_tiles gUnknown_837BF28 + 0x500, 0x100 + obj_frame_tiles gUnknown_837BF28 + 0x600, 0x100 + obj_frame_tiles gUnknown_837BF28 + 0x700, 0x100 + obj_frame_tiles gUnknown_837BF28 + 0x800, 0x100 + obj_frame_tiles gUnknown_837BF28 + 0x900, 0x100 + +gSpriteImages_83A0CE0:: @ 83A0CE0 + obj_frame_tiles gUnknown_837C928, 0x100 + obj_frame_tiles gUnknown_837C928 + 0x100, 0x100 + obj_frame_tiles gUnknown_837C928 + 0x200, 0x100 + obj_frame_tiles gUnknown_837C928 + 0x300, 0x100 + obj_frame_tiles gUnknown_837C928 + 0x400, 0x100 + obj_frame_tiles gUnknown_837C928 + 0x500, 0x100 + obj_frame_tiles gUnknown_837C928 + 0x600, 0x100 + obj_frame_tiles gUnknown_837C928 + 0x700, 0x100 + obj_frame_tiles gUnknown_837C928 + 0x800, 0x100 + obj_frame_tiles gUnknown_837C928 + 0x900, 0x100 + +gSpriteImages_83A0D30:: @ 83A0D30 + obj_frame_tiles gUnknown_837D328, 0x100 + obj_frame_tiles gUnknown_837D328 + 0x100, 0x100 + obj_frame_tiles gUnknown_837D328 + 0x200, 0x100 + obj_frame_tiles gUnknown_837D328 + 0x300, 0x100 + obj_frame_tiles gUnknown_837D328 + 0x400, 0x100 + obj_frame_tiles gUnknown_837D328 + 0x500, 0x100 + obj_frame_tiles gUnknown_837D328 + 0x600, 0x100 + obj_frame_tiles gUnknown_837D328 + 0x700, 0x100 + obj_frame_tiles gUnknown_837D328 + 0x800, 0x100 + +gSpriteImages_83A0D78:: @ 83A0D78 + obj_frame_tiles gUnknown_837DC28, 0x100 + obj_frame_tiles gUnknown_837DC28 + 0x100, 0x100 + obj_frame_tiles gUnknown_837DC28 + 0x200, 0x100 + obj_frame_tiles gUnknown_837DC28 + 0x300, 0x100 + obj_frame_tiles gUnknown_837DC28 + 0x400, 0x100 + obj_frame_tiles gUnknown_837DC28 + 0x500, 0x100 + obj_frame_tiles gUnknown_837DC28 + 0x600, 0x100 + obj_frame_tiles gUnknown_837DC28 + 0x700, 0x100 + obj_frame_tiles gUnknown_837DC28 + 0x800, 0x100 + obj_frame_tiles gUnknown_837DC28 + 0x900, 0x100 + +gSpriteImages_83A0DC8:: @ 83A0DC8 + obj_frame_tiles gUnknown_837E628, 0x100 + obj_frame_tiles gUnknown_837E628 + 0x100, 0x100 + obj_frame_tiles gUnknown_837E628 + 0x200, 0x100 + obj_frame_tiles gUnknown_837E628 + 0x300, 0x100 + obj_frame_tiles gUnknown_837E628 + 0x400, 0x100 + obj_frame_tiles gUnknown_837E628 + 0x500, 0x100 + obj_frame_tiles gUnknown_837E628 + 0x600, 0x100 + obj_frame_tiles gUnknown_837E628 + 0x700, 0x100 + obj_frame_tiles gUnknown_837E628 + 0x800, 0x100 + obj_frame_tiles gUnknown_837E628 + 0x900, 0x100 + +gSpriteImages_83A0E18:: @ 83A0E18 + obj_frame_tiles gUnknown_837F028, 0x100 + obj_frame_tiles gUnknown_837F028 + 0x100, 0x100 + obj_frame_tiles gUnknown_837F028 + 0x200, 0x100 + obj_frame_tiles gUnknown_837F028 + 0x300, 0x100 + obj_frame_tiles gUnknown_837F028 + 0x400, 0x100 + obj_frame_tiles gUnknown_837F028 + 0x500, 0x100 + obj_frame_tiles gUnknown_837F028 + 0x600, 0x100 + obj_frame_tiles gUnknown_837F028 + 0x700, 0x100 + obj_frame_tiles gUnknown_837F028 + 0x800, 0x100 + obj_frame_tiles gUnknown_837F028 + 0x900, 0x100 + +gSpriteImages_83A0E68:: @ 83A0E68 + obj_frame_tiles gUnknown_837FA28, 0x100 + obj_frame_tiles gUnknown_837FA28 + 0x100, 0x100 + obj_frame_tiles gUnknown_837FA28 + 0x200, 0x100 + obj_frame_tiles gUnknown_837FA28 + 0x300, 0x100 + obj_frame_tiles gUnknown_837FA28 + 0x400, 0x100 + obj_frame_tiles gUnknown_837FA28 + 0x500, 0x100 + obj_frame_tiles gUnknown_837FA28 + 0x600, 0x100 + obj_frame_tiles gUnknown_837FA28 + 0x700, 0x100 + obj_frame_tiles gUnknown_837FA28 + 0x800, 0x100 + obj_frame_tiles gUnknown_837FA28 + 0x900, 0x100 + +gSpriteImages_83A0EB8:: @ 83A0EB8 + obj_frame_tiles gUnknown_8380428, 0x100 + obj_frame_tiles gUnknown_8380428 + 0x100, 0x100 + obj_frame_tiles gUnknown_8380428 + 0x200, 0x100 + obj_frame_tiles gUnknown_8380428 + 0x300, 0x100 + obj_frame_tiles gUnknown_8380428 + 0x400, 0x100 + obj_frame_tiles gUnknown_8380428 + 0x500, 0x100 + obj_frame_tiles gUnknown_8380428 + 0x600, 0x100 + obj_frame_tiles gUnknown_8380428 + 0x700, 0x100 + obj_frame_tiles gUnknown_8380428 + 0x800, 0x100 + obj_frame_tiles gUnknown_8380428 + 0x900, 0x100 + +gSpriteImages_83A0F08:: @ 83A0F08 + obj_frame_tiles gUnknown_8380E28, 0x100 + obj_frame_tiles gUnknown_8380E28 + 0x100, 0x100 + obj_frame_tiles gUnknown_8380E28 + 0x200, 0x100 + obj_frame_tiles gUnknown_8380E28 + 0x300, 0x100 + obj_frame_tiles gUnknown_8380E28 + 0x400, 0x100 + obj_frame_tiles gUnknown_8380E28 + 0x500, 0x100 + obj_frame_tiles gUnknown_8380E28 + 0x600, 0x100 + obj_frame_tiles gUnknown_8380E28 + 0x700, 0x100 + obj_frame_tiles gUnknown_8380E28 + 0x800, 0x100 + obj_frame_tiles gUnknown_8380E28 + 0x900, 0x100 + +gSpriteImages_83A0F58:: @ 83A0F58 + obj_frame_tiles gUnknown_8381828, 0x100 + obj_frame_tiles gUnknown_8381828 + 0x100, 0x100 + obj_frame_tiles gUnknown_8381828 + 0x200, 0x100 + obj_frame_tiles gUnknown_8381828 + 0x300, 0x100 + obj_frame_tiles gUnknown_8381828 + 0x400, 0x100 + obj_frame_tiles gUnknown_8381828 + 0x500, 0x100 + obj_frame_tiles gUnknown_8381828 + 0x600, 0x100 + obj_frame_tiles gUnknown_8381828 + 0x700, 0x100 + obj_frame_tiles gUnknown_8381828 + 0x800, 0x100 + obj_frame_tiles gUnknown_8381828 + 0x900, 0x100 + +gSpriteImages_83A0FA8:: @ 83A0FA8 + obj_frame_tiles gUnknown_8382228, 0x100 + obj_frame_tiles gUnknown_8382228 + 0x100, 0x100 + obj_frame_tiles gUnknown_8382228 + 0x200, 0x100 + obj_frame_tiles gUnknown_8382228 + 0x300, 0x100 + obj_frame_tiles gUnknown_8382228 + 0x400, 0x100 + obj_frame_tiles gUnknown_8382228 + 0x500, 0x100 + obj_frame_tiles gUnknown_8382228 + 0x600, 0x100 + obj_frame_tiles gUnknown_8382228 + 0x700, 0x100 + obj_frame_tiles gUnknown_8382228 + 0x800, 0x100 + obj_frame_tiles gUnknown_8382228 + 0x900, 0x100 + +gSpriteImages_83A0FF8:: @ 83A0FF8 + obj_frame_tiles gUnknown_8382C28, 0x100 + obj_frame_tiles gUnknown_8382C28 + 0x100, 0x100 + obj_frame_tiles gUnknown_8382C28 + 0x200, 0x100 + obj_frame_tiles gUnknown_8382C28 + 0x300, 0x100 + obj_frame_tiles gUnknown_8382C28 + 0x400, 0x100 + obj_frame_tiles gUnknown_8382C28 + 0x500, 0x100 + obj_frame_tiles gUnknown_8382C28 + 0x600, 0x100 + obj_frame_tiles gUnknown_8382C28 + 0x700, 0x100 + obj_frame_tiles gUnknown_8382C28 + 0x800, 0x100 + +gSpriteImages_83A1040:: @ 83A1040 + obj_frame_tiles gUnknown_8383528, 0x100 + obj_frame_tiles gUnknown_8383528 + 0x100, 0x100 + obj_frame_tiles gUnknown_8383528 + 0x200, 0x100 + obj_frame_tiles gUnknown_8383528 + 0x300, 0x100 + obj_frame_tiles gUnknown_8383528 + 0x400, 0x100 + obj_frame_tiles gUnknown_8383528 + 0x500, 0x100 + obj_frame_tiles gUnknown_8383528 + 0x600, 0x100 + obj_frame_tiles gUnknown_8383528 + 0x700, 0x100 + obj_frame_tiles gUnknown_8383528 + 0x800, 0x100 + obj_frame_tiles gUnknown_8383528 + 0x900, 0x100 + +gSpriteImages_83A1090:: @ 83A1090 + obj_frame_tiles gUnknown_8383F28, 0x100 + obj_frame_tiles gUnknown_8383F28 + 0x100, 0x100 + obj_frame_tiles gUnknown_8383F28 + 0x200, 0x100 + obj_frame_tiles gUnknown_8383F28 + 0x300, 0x100 + obj_frame_tiles gUnknown_8383F28 + 0x400, 0x100 + obj_frame_tiles gUnknown_8383F28 + 0x500, 0x100 + obj_frame_tiles gUnknown_8383F28 + 0x600, 0x100 + obj_frame_tiles gUnknown_8383F28 + 0x700, 0x100 + obj_frame_tiles gUnknown_8383F28 + 0x800, 0x100 + +gSpriteImages_83A10D8:: @ 83A10D8 + obj_frame_tiles gUnknown_8384828, 0x100 + obj_frame_tiles gUnknown_8384828 + 0x100, 0x100 + obj_frame_tiles gUnknown_8384828 + 0x200, 0x100 + obj_frame_tiles gUnknown_8384828 + 0x300, 0x100 + obj_frame_tiles gUnknown_8384828 + 0x400, 0x100 + obj_frame_tiles gUnknown_8384828 + 0x500, 0x100 + obj_frame_tiles gUnknown_8384828 + 0x600, 0x100 + obj_frame_tiles gUnknown_8384828 + 0x700, 0x100 + obj_frame_tiles gUnknown_8384828 + 0x800, 0x100 + +gSpriteImages_83A1120:: @ 83A1120 + obj_frame_tiles gUnknown_8385128, 0x80 + obj_frame_tiles gUnknown_8385128 + 0x80, 0x80 + obj_frame_tiles gUnknown_8385128 + 0x100, 0x80 + obj_frame_tiles gUnknown_8385128 + 0x180, 0x80 + obj_frame_tiles gUnknown_8385128 + 0x200, 0x80 + obj_frame_tiles gUnknown_8385128 + 0x280, 0x80 + obj_frame_tiles gUnknown_8385128 + 0x300, 0x80 + obj_frame_tiles gUnknown_8385128 + 0x380, 0x80 + obj_frame_tiles gUnknown_8385128 + 0x400, 0x80 + obj_frame_tiles gUnknown_8385128 + 0x480, 0x80 + +gSpriteImages_83A1170:: @ 83A1170 + obj_frame_tiles gUnknown_8385628, 0x80 + obj_frame_tiles gUnknown_8385628 + 0x80, 0x80 + obj_frame_tiles gUnknown_8385628 + 0x100, 0x80 + obj_frame_tiles gUnknown_8385628 + 0x180, 0x80 + obj_frame_tiles gUnknown_8385628 + 0x200, 0x80 + obj_frame_tiles gUnknown_8385628 + 0x280, 0x80 + obj_frame_tiles gUnknown_8385628 + 0x300, 0x80 + obj_frame_tiles gUnknown_8385628 + 0x380, 0x80 + obj_frame_tiles gUnknown_8385628 + 0x400, 0x80 + obj_frame_tiles gUnknown_8385628 + 0x480, 0x80 + +gSpriteImages_83A11C0:: @ 83A11C0 + obj_frame_tiles gUnknown_8385B28, 0x80 + obj_frame_tiles gUnknown_8385B28 + 0x80, 0x80 + obj_frame_tiles gUnknown_8385B28 + 0x100, 0x80 + obj_frame_tiles gUnknown_8385B28 + 0x180, 0x80 + obj_frame_tiles gUnknown_8385B28 + 0x200, 0x80 + obj_frame_tiles gUnknown_8385B28 + 0x280, 0x80 + obj_frame_tiles gUnknown_8385B28 + 0x300, 0x80 + obj_frame_tiles gUnknown_8385B28 + 0x380, 0x80 + obj_frame_tiles gUnknown_8385B28 + 0x400, 0x80 + obj_frame_tiles gUnknown_8385B28 + 0x480, 0x80 + +gSpriteImages_83A1210:: @ 83A1210 + obj_frame_tiles gUnknown_8386028, 0x100 + obj_frame_tiles gUnknown_8386028 + 0x100, 0x100 + obj_frame_tiles gUnknown_8386028 + 0x200, 0x100 + obj_frame_tiles gUnknown_8386028 + 0x300, 0x100 + obj_frame_tiles gUnknown_8386028 + 0x400, 0x100 + obj_frame_tiles gUnknown_8386028 + 0x500, 0x100 + obj_frame_tiles gUnknown_8386028 + 0x600, 0x100 + obj_frame_tiles gUnknown_8386028 + 0x700, 0x100 + obj_frame_tiles gUnknown_8386028 + 0x800, 0x100 + obj_frame_tiles gUnknown_8386028 + 0x900, 0x100 + +gSpriteImages_83A1260:: @ 83A1260 + obj_frame_tiles gUnknown_8386A28, 0x200 + obj_frame_tiles gUnknown_8386A28 + 0x200, 0x200 + obj_frame_tiles gUnknown_8386A28 + 0x400, 0x200 + obj_frame_tiles gUnknown_8386A28 + 0x600, 0x200 + obj_frame_tiles gUnknown_8386A28 + 0x800, 0x200 + obj_frame_tiles gUnknown_8386A28 + 0xA00, 0x200 + obj_frame_tiles gUnknown_8386A28 + 0xC00, 0x200 + obj_frame_tiles gUnknown_8386A28 + 0xE00, 0x200 + obj_frame_tiles gUnknown_8386A28 + 0x1000, 0x200 + obj_frame_tiles gUnknown_8386A28 + 0x1200, 0x200 + +gSpriteImages_83A12B0:: @ 83A12B0 + obj_frame_tiles gUnknown_8387E28, 0x100 + obj_frame_tiles gUnknown_8387E28 + 0x100, 0x100 + obj_frame_tiles gUnknown_8387E28 + 0x200, 0x100 + obj_frame_tiles gUnknown_8387E28 + 0x300, 0x100 + obj_frame_tiles gUnknown_8387E28 + 0x400, 0x100 + obj_frame_tiles gUnknown_8387E28 + 0x500, 0x100 + obj_frame_tiles gUnknown_8387E28 + 0x600, 0x100 + obj_frame_tiles gUnknown_8387E28 + 0x700, 0x100 + obj_frame_tiles gUnknown_8387E28 + 0x800, 0x100 + +gSpriteImages_83A12F8:: @ 83A12F8 + obj_frame_tiles gUnknown_838AD28, 0x100 + obj_frame_tiles gUnknown_838AD28 + 0x100, 0x100 + obj_frame_tiles gUnknown_838AD28 + 0x200, 0x100 + obj_frame_tiles gUnknown_838AD28, 0x100 + obj_frame_tiles gUnknown_838AD28, 0x100 + obj_frame_tiles gUnknown_838AD28 + 0x100, 0x100 + obj_frame_tiles gUnknown_838AD28 + 0x100, 0x100 + obj_frame_tiles gUnknown_838AD28 + 0x200, 0x100 + obj_frame_tiles gUnknown_838AD28 + 0x200, 0x100 + obj_frame_tiles gUnknown_838AD28 + 0x300, 0x100 + +gSpriteImages_83A1348:: @ 83A1348 + obj_frame_tiles gUnknown_838B728, 0x100 + obj_frame_tiles gUnknown_838B728 + 0x100, 0x100 + obj_frame_tiles gUnknown_838B728 + 0x200, 0x100 + obj_frame_tiles gUnknown_838B728, 0x100 + obj_frame_tiles gUnknown_838B728, 0x100 + obj_frame_tiles gUnknown_838B728 + 0x100, 0x100 + obj_frame_tiles gUnknown_838B728 + 0x100, 0x100 + obj_frame_tiles gUnknown_838B728 + 0x200, 0x100 + obj_frame_tiles gUnknown_838B728 + 0x200, 0x100 + +gSpriteImages_83A1390:: @ 83A1390 + obj_frame_tiles gUnknown_838BA28, 0x80 + +gSpriteImages_83A1398:: @ 83A1398 + obj_frame_tiles gUnknown_8389B28, 0x100 + obj_frame_tiles gUnknown_8389B28 + 0x100, 0x100 + obj_frame_tiles gUnknown_8389B28 + 0x200, 0x100 + obj_frame_tiles gUnknown_8389B28 + 0x300, 0x100 + obj_frame_tiles gUnknown_8389B28 + 0x400, 0x100 + obj_frame_tiles gUnknown_8389B28 + 0x500, 0x100 + obj_frame_tiles gUnknown_8389B28 + 0x600, 0x100 + obj_frame_tiles gUnknown_8389B28 + 0x700, 0x100 + obj_frame_tiles gUnknown_8389B28 + 0x800, 0x100 + +gSpriteImages_83A13E0:: @ 83A13E0 + obj_frame_tiles gUnknown_8388728, 0x100 + obj_frame_tiles gUnknown_8388728 + 0x100, 0x100 + obj_frame_tiles gUnknown_8388728 + 0x200, 0x100 + obj_frame_tiles gUnknown_8388728 + 0x300, 0x100 + obj_frame_tiles gUnknown_8388728 + 0x400, 0x100 + obj_frame_tiles gUnknown_8388728 + 0x500, 0x100 + obj_frame_tiles gUnknown_8388728 + 0x600, 0x100 + obj_frame_tiles gUnknown_8388728 + 0x700, 0x100 + obj_frame_tiles gUnknown_8388728 + 0x800, 0x100 + obj_frame_tiles gUnknown_8388728 + 0x900, 0x100 + +gSpriteImages_83A1430:: @ 83A1430 + obj_frame_tiles gUnknown_8389128, 0x100 + obj_frame_tiles gUnknown_8389128 + 0x100, 0x100 + obj_frame_tiles gUnknown_8389128 + 0x200, 0x100 + obj_frame_tiles gUnknown_8389128 + 0x300, 0x100 + obj_frame_tiles gUnknown_8389128 + 0x400, 0x100 + obj_frame_tiles gUnknown_8389128 + 0x500, 0x100 + obj_frame_tiles gUnknown_8389128 + 0x600, 0x100 + obj_frame_tiles gUnknown_8389128 + 0x700, 0x100 + obj_frame_tiles gUnknown_8389128 + 0x800, 0x100 + obj_frame_tiles gUnknown_8389128 + 0x900, 0x100 + +gSpriteImages_83A1480:: @ 83A1480 + obj_frame_tiles gUnknown_838BAA8, 0x100 + obj_frame_tiles gUnknown_838BAA8 + 0x100, 0x100 + obj_frame_tiles gUnknown_838BAA8 + 0x200, 0x100 + obj_frame_tiles gUnknown_838BAA8 + 0x300, 0x100 + obj_frame_tiles gUnknown_838BAA8 + 0x400, 0x100 + obj_frame_tiles gUnknown_838BAA8 + 0x500, 0x100 + obj_frame_tiles gUnknown_838BAA8 + 0x600, 0x100 + obj_frame_tiles gUnknown_838BAA8 + 0x700, 0x100 + obj_frame_tiles gUnknown_838BAA8 + 0x800, 0x100 + +gSpriteImages_83A14C8:: @ 83A14C8 + obj_frame_tiles gUnknown_838C3A8, 0x100 + obj_frame_tiles gUnknown_838C3A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_838C3A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_838C3A8, 0x100 + obj_frame_tiles gUnknown_838C3A8, 0x100 + obj_frame_tiles gUnknown_838C3A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_838C3A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_838C3A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_838C3A8 + 0x200, 0x100 + +gSpriteImages_83A1510:: @ 83A1510 + obj_frame_tiles gUnknown_83945A8, 0x80 + obj_frame_tiles gUnknown_83945A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83945A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_83945A8 + 0x180, 0x80 + +gSpriteImages_83A1530:: @ 83A1530 + obj_frame_tiles gUnknown_838C6A8, 0x100 + obj_frame_tiles gUnknown_838C6A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_838C6A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_838C6A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_838C6A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_838C6A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_838C6A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_838C6A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_838C6A8 + 0x800, 0x100 + +gSpriteImages_83A1578:: @ 83A1578 + obj_frame_tiles gUnknown_838CFA8, 0x100 + obj_frame_tiles gUnknown_838CFA8 + 0x100, 0x100 + obj_frame_tiles gUnknown_838CFA8 + 0x200, 0x100 + obj_frame_tiles gUnknown_838CFA8, 0x100 + obj_frame_tiles gUnknown_838CFA8, 0x100 + obj_frame_tiles gUnknown_838CFA8 + 0x100, 0x100 + obj_frame_tiles gUnknown_838CFA8 + 0x100, 0x100 + obj_frame_tiles gUnknown_838CFA8 + 0x200, 0x100 + obj_frame_tiles gUnknown_838CFA8 + 0x200, 0x100 + +gSpriteImages_83A15C0:: @ 83A15C0 + obj_frame_tiles gUnknown_838D2A8, 0x100 + obj_frame_tiles gUnknown_838D2A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_838D2A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_838D2A8, 0x100 + obj_frame_tiles gUnknown_838D2A8, 0x100 + obj_frame_tiles gUnknown_838D2A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_838D2A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_838D2A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_838D2A8 + 0x200, 0x100 + +gSpriteImages_83A1608:: @ 83A1608 + obj_frame_tiles gUnknown_838B128, 0x100 + obj_frame_tiles gUnknown_838B128 + 0x100, 0x100 + obj_frame_tiles gUnknown_838B128 + 0x200, 0x100 + obj_frame_tiles gUnknown_838B128, 0x100 + obj_frame_tiles gUnknown_838B128, 0x100 + obj_frame_tiles gUnknown_838B128 + 0x100, 0x100 + obj_frame_tiles gUnknown_838B128 + 0x100, 0x100 + obj_frame_tiles gUnknown_838B128 + 0x200, 0x100 + obj_frame_tiles gUnknown_838B128 + 0x200, 0x100 + +gSpriteImages_83A1650:: @ 83A1650 + obj_frame_tiles gUnknown_838B428, 0x100 + obj_frame_tiles gUnknown_838B428 + 0x100, 0x100 + obj_frame_tiles gUnknown_838B428 + 0x200, 0x100 + obj_frame_tiles gUnknown_838B428, 0x100 + obj_frame_tiles gUnknown_838B428, 0x100 + obj_frame_tiles gUnknown_838B428 + 0x100, 0x100 + obj_frame_tiles gUnknown_838B428 + 0x100, 0x100 + obj_frame_tiles gUnknown_838B428 + 0x200, 0x100 + obj_frame_tiles gUnknown_838B428 + 0x200, 0x100 + +gSpriteImages_83A1698:: @ 83A1698 + obj_frame_tiles gUnknown_83947A8, 0x80 + obj_frame_tiles gUnknown_83947A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83947A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_83947A8 + 0x180, 0x80 + +gSpriteImages_83A16B8:: @ 83A16B8 + obj_frame_tiles gUnknown_83949A8, 0x80 + +gSpriteImages_83A16C0:: @ 83A16C0 + obj_frame_tiles gUnknown_838DEA8, 0x100 + obj_frame_tiles gUnknown_838DEA8 + 0x100, 0x100 + obj_frame_tiles gUnknown_838DEA8 + 0x200, 0x100 + obj_frame_tiles gUnknown_838DEA8 + 0x300, 0x100 + obj_frame_tiles gUnknown_838DEA8 + 0x400, 0x100 + obj_frame_tiles gUnknown_838DEA8 + 0x500, 0x100 + obj_frame_tiles gUnknown_838DEA8 + 0x600, 0x100 + obj_frame_tiles gUnknown_838DEA8 + 0x700, 0x100 + obj_frame_tiles gUnknown_838DEA8 + 0x800, 0x100 + +gSpriteImages_83A1708:: @ 83A1708 + obj_frame_tiles gUnknown_838E7A8, 0x100 + obj_frame_tiles gUnknown_838E7A8 + 0x100, 0x100 + obj_frame_tiles gUnknown_838E7A8 + 0x200, 0x100 + obj_frame_tiles gUnknown_838E7A8 + 0x300, 0x100 + obj_frame_tiles gUnknown_838E7A8 + 0x400, 0x100 + obj_frame_tiles gUnknown_838E7A8 + 0x500, 0x100 + obj_frame_tiles gUnknown_838E7A8 + 0x600, 0x100 + obj_frame_tiles gUnknown_838E7A8 + 0x700, 0x100 + obj_frame_tiles gUnknown_838E7A8 + 0x800, 0x100 + +gSpriteImages_83A1750:: @ 83A1750 + obj_frame_tiles gUnknown_8390F28, 0x100 + obj_frame_tiles gUnknown_8390F28 + 0x100, 0x100 + obj_frame_tiles gUnknown_8390F28 + 0x200, 0x100 + obj_frame_tiles gUnknown_8390F28, 0x100 + obj_frame_tiles gUnknown_8390F28, 0x100 + obj_frame_tiles gUnknown_8390F28 + 0x100, 0x100 + obj_frame_tiles gUnknown_8390F28 + 0x100, 0x100 + obj_frame_tiles gUnknown_8390F28 + 0x200, 0x100 + obj_frame_tiles gUnknown_8390F28 + 0x200, 0x100 + +gSpriteImages_83A1798:: @ 83A1798 + obj_frame_tiles gUnknown_836C928, 0x100 + obj_frame_tiles gUnknown_836C928 + 0x100, 0x100 + obj_frame_tiles gUnknown_836C928 + 0x200, 0x100 + obj_frame_tiles gUnknown_836C928, 0x100 + obj_frame_tiles gUnknown_836C928, 0x100 + obj_frame_tiles gUnknown_836C928 + 0x100, 0x100 + obj_frame_tiles gUnknown_836C928 + 0x100, 0x100 + obj_frame_tiles gUnknown_836C928 + 0x200, 0x100 + obj_frame_tiles gUnknown_836C928 + 0x200, 0x100 + +gSpriteImages_83A17E0:: @ 83A17E0 + obj_frame_tiles gUnknown_8391228, 0x100 + obj_frame_tiles gUnknown_8391228 + 0x100, 0x100 + obj_frame_tiles gUnknown_8391228 + 0x200, 0x100 + obj_frame_tiles gUnknown_8391228, 0x100 + obj_frame_tiles gUnknown_8391228, 0x100 + obj_frame_tiles gUnknown_8391228 + 0x100, 0x100 + obj_frame_tiles gUnknown_8391228 + 0x100, 0x100 + obj_frame_tiles gUnknown_8391228 + 0x200, 0x100 + obj_frame_tiles gUnknown_8391228 + 0x200, 0x100 + +gSpriteImages_83A1828:: @ 83A1828 + obj_frame_tiles gUnknown_836CC28, 0x100 + obj_frame_tiles gUnknown_836CC28 + 0x100, 0x100 + obj_frame_tiles gUnknown_836CC28 + 0x200, 0x100 + obj_frame_tiles gUnknown_836CC28, 0x100 + obj_frame_tiles gUnknown_836CC28, 0x100 + obj_frame_tiles gUnknown_836CC28 + 0x100, 0x100 + obj_frame_tiles gUnknown_836CC28 + 0x100, 0x100 + obj_frame_tiles gUnknown_836CC28 + 0x200, 0x100 + obj_frame_tiles gUnknown_836CC28 + 0x200, 0x100 + +gSpriteImages_83A1870:: @ 83A1870 + obj_frame_tiles gUnknown_836C328, 0x100 + obj_frame_tiles gUnknown_836C328 + 0x100, 0x100 + obj_frame_tiles gUnknown_836C328 + 0x200, 0x100 + obj_frame_tiles gUnknown_836C328, 0x100 + obj_frame_tiles gUnknown_836C328, 0x100 + obj_frame_tiles gUnknown_836C328 + 0x100, 0x100 + obj_frame_tiles gUnknown_836C328 + 0x100, 0x100 + obj_frame_tiles gUnknown_836C328 + 0x200, 0x100 + obj_frame_tiles gUnknown_836C328 + 0x200, 0x100 + +gSpriteImages_83A18B8:: @ 83A18B8 + obj_frame_tiles gUnknown_836C628, 0x100 + obj_frame_tiles gUnknown_836C628 + 0x100, 0x100 + obj_frame_tiles gUnknown_836C628 + 0x200, 0x100 + obj_frame_tiles gUnknown_836C628, 0x100 + obj_frame_tiles gUnknown_836C628, 0x100 + obj_frame_tiles gUnknown_836C628 + 0x100, 0x100 + obj_frame_tiles gUnknown_836C628 + 0x100, 0x100 + obj_frame_tiles gUnknown_836C628 + 0x200, 0x100 + obj_frame_tiles gUnknown_836C628 + 0x200, 0x100 + +gSpriteImages_83A1900:: @ 83A1900 + obj_frame_tiles gUnknown_836A228, 0x100 + obj_frame_tiles gUnknown_836A228 + 0x100, 0x100 + obj_frame_tiles gUnknown_836A228 + 0x200, 0x100 + obj_frame_tiles gUnknown_836A228 + 0x300, 0x100 + obj_frame_tiles gUnknown_836A228 + 0x400, 0x100 + obj_frame_tiles gUnknown_836A228 + 0x500, 0x100 + obj_frame_tiles gUnknown_836A228 + 0x600, 0x100 + obj_frame_tiles gUnknown_836A228 + 0x700, 0x100 + obj_frame_tiles gUnknown_836A228 + 0x800, 0x100 + +gSpriteImages_83A1948:: @ 83A1948 + obj_frame_tiles gUnknown_836AB28, 0x100 + obj_frame_tiles gUnknown_836AB28 + 0x100, 0x100 + obj_frame_tiles gUnknown_836AB28 + 0x200, 0x100 + obj_frame_tiles gUnknown_836AB28, 0x100 + obj_frame_tiles gUnknown_836AB28, 0x100 + obj_frame_tiles gUnknown_836AB28 + 0x100, 0x100 + obj_frame_tiles gUnknown_836AB28 + 0x100, 0x100 + obj_frame_tiles gUnknown_836AB28 + 0x200, 0x100 + obj_frame_tiles gUnknown_836AB28 + 0x200, 0x100 + +gSpriteImages_83A1990:: @ 83A1990 + obj_frame_tiles gUnknown_836AE28, 0x100 + obj_frame_tiles gUnknown_836AE28 + 0x100, 0x100 + obj_frame_tiles gUnknown_836AE28 + 0x200, 0x100 + obj_frame_tiles gUnknown_836AE28, 0x100 + obj_frame_tiles gUnknown_836AE28, 0x100 + obj_frame_tiles gUnknown_836AE28 + 0x100, 0x100 + obj_frame_tiles gUnknown_836AE28 + 0x100, 0x100 + obj_frame_tiles gUnknown_836AE28 + 0x200, 0x100 + obj_frame_tiles gUnknown_836AE28 + 0x200, 0x100 + +gSpriteImages_83A19D8:: @ 83A19D8 + obj_frame_tiles gUnknown_836CF28, 0x100 + obj_frame_tiles gUnknown_836CF28 + 0x100, 0x100 + obj_frame_tiles gUnknown_836CF28 + 0x200, 0x100 + obj_frame_tiles gUnknown_836CF28 + 0x300, 0x100 + obj_frame_tiles gUnknown_836CF28 + 0x400, 0x100 + obj_frame_tiles gUnknown_836CF28 + 0x500, 0x100 + obj_frame_tiles gUnknown_836CF28 + 0x600, 0x100 + obj_frame_tiles gUnknown_836CF28 + 0x700, 0x100 + obj_frame_tiles gUnknown_836CF28 + 0x800, 0x100 + +gSpriteImages_83A1A20:: @ 83A1A20 + obj_frame_tiles gUnknown_836B128, 0x100 + obj_frame_tiles gUnknown_836B128 + 0x100, 0x100 + obj_frame_tiles gUnknown_836B128 + 0x200, 0x100 + obj_frame_tiles gUnknown_836B128 + 0x300, 0x100 + obj_frame_tiles gUnknown_836B128 + 0x400, 0x100 + obj_frame_tiles gUnknown_836B128 + 0x500, 0x100 + obj_frame_tiles gUnknown_836B128 + 0x600, 0x100 + obj_frame_tiles gUnknown_836B128 + 0x700, 0x100 + obj_frame_tiles gUnknown_836B128 + 0x800, 0x100 + +gSpriteImages_83A1A68:: @ 83A1A68 + obj_frame_tiles gUnknown_836BA28, 0x100 + obj_frame_tiles gUnknown_836BA28 + 0x100, 0x100 + obj_frame_tiles gUnknown_836BA28 + 0x200, 0x100 + obj_frame_tiles gUnknown_836BA28 + 0x300, 0x100 + obj_frame_tiles gUnknown_836BA28 + 0x400, 0x100 + obj_frame_tiles gUnknown_836BA28 + 0x500, 0x100 + obj_frame_tiles gUnknown_836BA28 + 0x600, 0x100 + obj_frame_tiles gUnknown_836BA28 + 0x700, 0x100 + obj_frame_tiles gUnknown_836BA28 + 0x800, 0x100 + +gSpriteImages_83A1AB0:: @ 83A1AB0 + obj_frame_tiles gUnknown_8391528, 0x100 + obj_frame_tiles gUnknown_8391528 + 0x100, 0x100 + obj_frame_tiles gUnknown_8391528 + 0x200, 0x100 + obj_frame_tiles gUnknown_8391528, 0x100 + obj_frame_tiles gUnknown_8391528, 0x100 + obj_frame_tiles gUnknown_8391528 + 0x100, 0x100 + obj_frame_tiles gUnknown_8391528 + 0x100, 0x100 + obj_frame_tiles gUnknown_8391528 + 0x200, 0x100 + obj_frame_tiles gUnknown_8391528 + 0x200, 0x100 + +gSpriteImages_83A1AF8:: @ 83A1AF8 + obj_frame_tiles gUnknown_838A428, 0x100 + obj_frame_tiles gUnknown_838A428 + 0x100, 0x100 + obj_frame_tiles gUnknown_838A428 + 0x200, 0x100 + obj_frame_tiles gUnknown_838A428 + 0x300, 0x100 + obj_frame_tiles gUnknown_838A428 + 0x400, 0x100 + obj_frame_tiles gUnknown_838A428 + 0x500, 0x100 + obj_frame_tiles gUnknown_838A428 + 0x600, 0x100 + obj_frame_tiles gUnknown_838A428 + 0x700, 0x100 + obj_frame_tiles gUnknown_838A428 + 0x800, 0x100 + +gSpriteImages_83A1B40:: @ 83A1B40 + obj_frame_tiles gUnknown_8366DA8, 0x200 + obj_frame_tiles gUnknown_8366DA8 + 0x200, 0x200 + obj_frame_tiles gUnknown_8366DA8 + 0x400, 0x200 + obj_frame_tiles gUnknown_8366DA8 + 0x600, 0x200 + obj_frame_tiles gUnknown_8366DA8 + 0x800, 0x200 + obj_frame_tiles gUnknown_8366DA8 + 0xA00, 0x200 + obj_frame_tiles gUnknown_8366DA8 + 0xC00, 0x200 + obj_frame_tiles gUnknown_8366DA8 + 0xE00, 0x200 + obj_frame_tiles gUnknown_8366DA8 + 0x1000, 0x200 + obj_frame_tiles gUnknown_8366DA8 + 0x1200, 0x200 + obj_frame_tiles gUnknown_8366DA8 + 0x1400, 0x200 + obj_frame_tiles gUnknown_8366DA8 + 0x1600, 0x200 + +gSpriteImages_83A1BA0:: @ 83A1BA0 + obj_frame_tiles gUnknown_83685A8, 0x200 + obj_frame_tiles gUnknown_83685A8 + 0x200, 0x200 + obj_frame_tiles gUnknown_83685A8 + 0x400, 0x200 + obj_frame_tiles gUnknown_83685A8 + 0x600, 0x200 + obj_frame_tiles gUnknown_83685A8 + 0x800, 0x200 + obj_frame_tiles gUnknown_83685A8 + 0xA00, 0x200 + obj_frame_tiles gUnknown_83685A8 + 0xC00, 0x200 + obj_frame_tiles gUnknown_83685A8 + 0xE00, 0x200 + obj_frame_tiles gUnknown_83685A8 + 0x1000, 0x200 + obj_frame_tiles gUnknown_83685A8 + 0x1200, 0x200 + obj_frame_tiles gUnknown_83685A8 + 0x1400, 0x200 + obj_frame_tiles gUnknown_83685A8 + 0x1600, 0x200 + +gSpriteImages_83A1C00:: @ 83A1C00 + obj_frame_tiles gUnknown_8369E28, 0x100 + +gSpriteImages_83A1C08:: @ 83A1C08 + obj_frame_tiles gUnknown_8369DA8, 0x80 + +gSpriteImages_83A1C10:: @ 83A1C10 + obj_frame_tiles gUnknown_8391828, 0x100 + obj_frame_tiles gUnknown_8391828 + 0x100, 0x100 + obj_frame_tiles gUnknown_8391828 + 0x200, 0x100 + obj_frame_tiles gUnknown_8391828, 0x100 + obj_frame_tiles gUnknown_8391828, 0x100 + obj_frame_tiles gUnknown_8391828 + 0x100, 0x100 + obj_frame_tiles gUnknown_8391828 + 0x100, 0x100 + obj_frame_tiles gUnknown_8391828 + 0x200, 0x100 + obj_frame_tiles gUnknown_8391828 + 0x200, 0x100 + +gSpriteImages_83A1C58:: @ 83A1C58 + obj_frame_tiles gUnknown_8394A28, 0x80 + +gSpriteImages_83A1C60:: @ 83A1C60 + obj_frame_tiles gUnknown_8394AA8, 0x80 + +gSpriteImages_83A1C68:: @ 83A1C68 + obj_frame_tiles gUnknown_8394B28, 0x80 + +gSpriteImages_83A1C70:: @ 83A1C70 + obj_frame_tiles gUnknown_8394BA8, 0x80 + +gSpriteImages_83A1C78:: @ 83A1C78 + obj_frame_tiles gUnknown_8394C28, 0x100 + +gSpriteImages_83A1C80:: @ 83A1C80 + obj_frame_tiles gUnknown_8394D28, 0x80 + +gSpriteImages_83A1C88:: @ 83A1C88 + obj_frame_tiles gUnknown_8394DA8, 0x80 + +gSpriteImages_83A1C90:: @ 83A1C90 + obj_frame_tiles gUnknown_8394E28, 0x80 + +gSpriteImages_83A1C98:: @ 83A1C98 + obj_frame_tiles gUnknown_8394EC8, 0x200 + +gSpriteImages_83A1CA0:: @ 83A1CA0 + obj_frame_tiles gUnknown_83950C8, 0x200 + +gSpriteImages_83A1CA8:: @ 83A1CA8 + obj_frame_tiles gUnknown_83952E8, 0x800 + obj_frame_tiles gUnknown_83952E8, 0x800 + obj_frame_tiles gUnknown_83952E8, 0x800 + obj_frame_tiles gUnknown_83952E8, 0x800 + obj_frame_tiles gUnknown_83952E8, 0x800 + obj_frame_tiles gUnknown_83952E8, 0x800 + obj_frame_tiles gUnknown_83952E8, 0x800 + obj_frame_tiles gUnknown_83952E8, 0x800 + obj_frame_tiles gUnknown_83952E8, 0x800 + +gSpriteImages_83A1CF0:: @ 83A1CF0 + obj_frame_tiles gUnknown_8395B08, 0x1000 + obj_frame_tiles gUnknown_8395B08, 0x1000 + obj_frame_tiles gUnknown_8395B08, 0x1000 + obj_frame_tiles gUnknown_8395B08, 0x1000 + obj_frame_tiles gUnknown_8395B08, 0x1000 + obj_frame_tiles gUnknown_8395B08, 0x1000 + obj_frame_tiles gUnknown_8395B08, 0x1000 + obj_frame_tiles gUnknown_8395B08, 0x1000 + obj_frame_tiles gUnknown_8395B08, 0x1000 + +gSpriteImages_83A1D38:: @ 83A1D38 + obj_frame_tiles gUnknown_83937A8, 0x200 + obj_frame_tiles gUnknown_83937A8, 0x200 + obj_frame_tiles gUnknown_83937A8, 0x200 + obj_frame_tiles gUnknown_83937A8, 0x200 + obj_frame_tiles gUnknown_83937A8, 0x200 + obj_frame_tiles gUnknown_83937A8, 0x200 + obj_frame_tiles gUnknown_83937A8, 0x200 + obj_frame_tiles gUnknown_83937A8, 0x200 + obj_frame_tiles gUnknown_83937A8, 0x200 + +gSpriteImages_83A1D80:: @ 83A1D80 + obj_frame_tiles gUnknown_83939A8, 0x80 + obj_frame_tiles gUnknown_83939A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83939A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_83939A8, 0x80 + obj_frame_tiles gUnknown_83939A8, 0x80 + obj_frame_tiles gUnknown_83939A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83939A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83939A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_83939A8 + 0x100, 0x80 + +gSpriteImages_83A1DC8:: @ 83A1DC8 + obj_frame_tiles gUnknown_8391E28, 0x80 + obj_frame_tiles gUnknown_8391E28 + 0x80, 0x80 + obj_frame_tiles gUnknown_8391E28 + 0x100, 0x80 + obj_frame_tiles gUnknown_8391E28, 0x80 + obj_frame_tiles gUnknown_8391E28, 0x80 + obj_frame_tiles gUnknown_8391E28 + 0x80, 0x80 + obj_frame_tiles gUnknown_8391E28 + 0x80, 0x80 + obj_frame_tiles gUnknown_8391E28 + 0x100, 0x80 + obj_frame_tiles gUnknown_8391E28 + 0x100, 0x80 + +gSpriteImages_83A1E10:: @ 83A1E10 + obj_frame_tiles gUnknown_8391FA8, 0x80 + obj_frame_tiles gUnknown_8391FA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_8391FA8 + 0x100, 0x80 + obj_frame_tiles gUnknown_8391FA8, 0x80 + obj_frame_tiles gUnknown_8391FA8, 0x80 + obj_frame_tiles gUnknown_8391FA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_8391FA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_8391FA8 + 0x100, 0x80 + obj_frame_tiles gUnknown_8391FA8 + 0x100, 0x80 + +gSpriteImages_83A1E58:: @ 83A1E58 + obj_frame_tiles gUnknown_8392128, 0x80 + obj_frame_tiles gUnknown_8392128 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392128 + 0x100, 0x80 + obj_frame_tiles gUnknown_8392128, 0x80 + obj_frame_tiles gUnknown_8392128, 0x80 + obj_frame_tiles gUnknown_8392128 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392128 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392128 + 0x100, 0x80 + obj_frame_tiles gUnknown_8392128 + 0x100, 0x80 + +gSpriteImages_83A1EA0:: @ 83A1EA0 + obj_frame_tiles gUnknown_837BDA8, 0x80 + obj_frame_tiles gUnknown_837BDA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_837BDA8 + 0x100, 0x80 + obj_frame_tiles gUnknown_837BDA8, 0x80 + obj_frame_tiles gUnknown_837BDA8, 0x80 + obj_frame_tiles gUnknown_837BDA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_837BDA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_837BDA8 + 0x100, 0x80 + obj_frame_tiles gUnknown_837BDA8 + 0x100, 0x80 + +gSpriteImages_83A1EE8:: @ 83A1EE8 + obj_frame_tiles gUnknown_83922A8, 0x80 + obj_frame_tiles gUnknown_83922A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83922A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_83922A8, 0x80 + obj_frame_tiles gUnknown_83922A8, 0x80 + obj_frame_tiles gUnknown_83922A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83922A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83922A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_83922A8 + 0x100, 0x80 + +gSpriteImages_83A1F30:: @ 83A1F30 + obj_frame_tiles gUnknown_8392428, 0x80 + obj_frame_tiles gUnknown_8392428 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392428 + 0x100, 0x80 + obj_frame_tiles gUnknown_8392428, 0x80 + obj_frame_tiles gUnknown_8392428, 0x80 + obj_frame_tiles gUnknown_8392428 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392428 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392428 + 0x100, 0x80 + obj_frame_tiles gUnknown_8392428 + 0x100, 0x80 + +gSpriteImages_83A1F78:: @ 83A1F78 + obj_frame_tiles gUnknown_83925A8, 0x80 + obj_frame_tiles gUnknown_83925A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83925A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_83925A8, 0x80 + obj_frame_tiles gUnknown_83925A8, 0x80 + obj_frame_tiles gUnknown_83925A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83925A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83925A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_83925A8 + 0x100, 0x80 + +gSpriteImages_83A1FC0:: @ 83A1FC0 + obj_frame_tiles gUnknown_8392728, 0x80 + obj_frame_tiles gUnknown_8392728 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392728 + 0x100, 0x80 + obj_frame_tiles gUnknown_8392728, 0x80 + obj_frame_tiles gUnknown_8392728, 0x80 + obj_frame_tiles gUnknown_8392728 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392728 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392728 + 0x100, 0x80 + obj_frame_tiles gUnknown_8392728 + 0x100, 0x80 + +gSpriteImages_83A2008:: @ 83A2008 + obj_frame_tiles gUnknown_83928A8, 0x80 + obj_frame_tiles gUnknown_83928A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83928A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_83928A8, 0x80 + obj_frame_tiles gUnknown_83928A8, 0x80 + obj_frame_tiles gUnknown_83928A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83928A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83928A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_83928A8 + 0x100, 0x80 + +gSpriteImages_83A2050:: @ 83A2050 + obj_frame_tiles gUnknown_8392A28, 0x80 + obj_frame_tiles gUnknown_8392A28 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392A28 + 0x100, 0x80 + obj_frame_tiles gUnknown_8392A28, 0x80 + obj_frame_tiles gUnknown_8392A28, 0x80 + obj_frame_tiles gUnknown_8392A28 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392A28 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392A28 + 0x100, 0x80 + obj_frame_tiles gUnknown_8392A28 + 0x100, 0x80 + +gSpriteImages_83A2098:: @ 83A2098 + obj_frame_tiles gUnknown_8392BA8, 0x80 + obj_frame_tiles gUnknown_8392BA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392BA8 + 0x100, 0x80 + obj_frame_tiles gUnknown_8392BA8, 0x80 + obj_frame_tiles gUnknown_8392BA8, 0x80 + obj_frame_tiles gUnknown_8392BA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392BA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392BA8 + 0x100, 0x80 + obj_frame_tiles gUnknown_8392BA8 + 0x100, 0x80 + +gSpriteImages_83A20E0:: @ 83A20E0 + obj_frame_tiles gUnknown_8392D28, 0x80 + obj_frame_tiles gUnknown_8392D28 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392D28 + 0x100, 0x80 + obj_frame_tiles gUnknown_8392D28, 0x80 + obj_frame_tiles gUnknown_8392D28, 0x80 + obj_frame_tiles gUnknown_8392D28 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392D28 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392D28 + 0x100, 0x80 + obj_frame_tiles gUnknown_8392D28 + 0x100, 0x80 + +gSpriteImages_83A2128:: @ 83A2128 + obj_frame_tiles gUnknown_8392EA8, 0x80 + obj_frame_tiles gUnknown_8392EA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392EA8 + 0x100, 0x80 + obj_frame_tiles gUnknown_8392EA8, 0x80 + obj_frame_tiles gUnknown_8392EA8, 0x80 + obj_frame_tiles gUnknown_8392EA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392EA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_8392EA8 + 0x100, 0x80 + obj_frame_tiles gUnknown_8392EA8 + 0x100, 0x80 + +gSpriteImages_83A2170:: @ 83A2170 + obj_frame_tiles gUnknown_8393028, 0x80 + obj_frame_tiles gUnknown_8393028 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393028 + 0x100, 0x80 + obj_frame_tiles gUnknown_8393028, 0x80 + obj_frame_tiles gUnknown_8393028, 0x80 + obj_frame_tiles gUnknown_8393028 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393028 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393028 + 0x100, 0x80 + obj_frame_tiles gUnknown_8393028 + 0x100, 0x80 + +gSpriteImages_83A21B8:: @ 83A21B8 + obj_frame_tiles gUnknown_83931A8, 0x80 + obj_frame_tiles gUnknown_83931A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83931A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_83931A8, 0x80 + obj_frame_tiles gUnknown_83931A8, 0x80 + obj_frame_tiles gUnknown_83931A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83931A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83931A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_83931A8 + 0x100, 0x80 + +gSpriteImages_83A2200:: @ 83A2200 + obj_frame_tiles gUnknown_8393328, 0x80 + obj_frame_tiles gUnknown_8393328 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393328 + 0x100, 0x80 + obj_frame_tiles gUnknown_8393328, 0x80 + obj_frame_tiles gUnknown_8393328, 0x80 + obj_frame_tiles gUnknown_8393328 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393328 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393328 + 0x100, 0x80 + obj_frame_tiles gUnknown_8393328 + 0x100, 0x80 + +gSpriteImages_83A2248:: @ 83A2248 + obj_frame_tiles gUnknown_838F0A8, 0x80 + obj_frame_tiles gUnknown_838F0A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_838F0A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_838F0A8, 0x80 + obj_frame_tiles gUnknown_838F0A8, 0x80 + obj_frame_tiles gUnknown_838F0A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_838F0A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_838F0A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_838F0A8 + 0x100, 0x80 + +gSpriteImages_83A2290:: @ 83A2290 + obj_frame_tiles gUnknown_838F228, 0x200 + obj_frame_tiles gUnknown_838F228, 0x200 + obj_frame_tiles gUnknown_838F228, 0x200 + obj_frame_tiles gUnknown_838F228, 0x200 + obj_frame_tiles gUnknown_838F228, 0x200 + obj_frame_tiles gUnknown_838F228, 0x200 + obj_frame_tiles gUnknown_838F228, 0x200 + obj_frame_tiles gUnknown_838F228, 0x200 + obj_frame_tiles gUnknown_838F228, 0x200 + +gSpriteImages_83A22D8:: @ 83A22D8 + obj_frame_tiles gUnknown_838F428, 0x200 + obj_frame_tiles gUnknown_838F428, 0x200 + obj_frame_tiles gUnknown_838F428, 0x200 + obj_frame_tiles gUnknown_838F428, 0x200 + obj_frame_tiles gUnknown_838F428, 0x200 + obj_frame_tiles gUnknown_838F428, 0x200 + obj_frame_tiles gUnknown_838F428, 0x200 + obj_frame_tiles gUnknown_838F428, 0x200 + obj_frame_tiles gUnknown_838F428, 0x200 + +gSpriteImages_83A2320:: @ 83A2320 + obj_frame_tiles gUnknown_838F628, 0x200 + obj_frame_tiles gUnknown_838F628, 0x200 + obj_frame_tiles gUnknown_838F628, 0x200 + obj_frame_tiles gUnknown_838F628, 0x200 + obj_frame_tiles gUnknown_838F628, 0x200 + obj_frame_tiles gUnknown_838F628, 0x200 + obj_frame_tiles gUnknown_838F628, 0x200 + obj_frame_tiles gUnknown_838F628, 0x200 + obj_frame_tiles gUnknown_838F628, 0x200 + +gSpriteImages_83A2368:: @ 83A2368 + obj_frame_tiles gUnknown_8390328, 0x200 + obj_frame_tiles gUnknown_8390328, 0x200 + obj_frame_tiles gUnknown_8390328, 0x200 + obj_frame_tiles gUnknown_8390328, 0x200 + obj_frame_tiles gUnknown_8390328 + 0x200, 0x200 + obj_frame_tiles gUnknown_8390328, 0x200 + obj_frame_tiles gUnknown_8390328 + 0x200, 0x200 + obj_frame_tiles gUnknown_8390328, 0x200 + obj_frame_tiles gUnknown_8390328 + 0x200, 0x200 + +gSpriteImages_83A23B0:: @ 83A23B0 + obj_frame_tiles gUnknown_8390728, 0x200 + obj_frame_tiles gUnknown_8390728, 0x200 + obj_frame_tiles gUnknown_8390728, 0x200 + obj_frame_tiles gUnknown_8390728, 0x200 + obj_frame_tiles gUnknown_8390728 + 0x200, 0x200 + obj_frame_tiles gUnknown_8390728, 0x200 + obj_frame_tiles gUnknown_8390728 + 0x200, 0x200 + obj_frame_tiles gUnknown_8390728, 0x200 + obj_frame_tiles gUnknown_8390728 + 0x200, 0x200 + +gSpriteImages_83A23F8:: @ 83A23F8 + obj_frame_tiles gUnknown_8390B28, 0x200 + obj_frame_tiles gUnknown_8390B28, 0x200 + obj_frame_tiles gUnknown_8390B28, 0x200 + obj_frame_tiles gUnknown_8390B28, 0x200 + obj_frame_tiles gUnknown_8390B28 + 0x200, 0x200 + obj_frame_tiles gUnknown_8390B28, 0x200 + obj_frame_tiles gUnknown_8390B28 + 0x200, 0x200 + obj_frame_tiles gUnknown_8390B28, 0x200 + obj_frame_tiles gUnknown_8390B28 + 0x200, 0x200 + +gSpriteImages_83A2440:: @ 83A2440 + obj_frame_tiles gUnknown_838F828, 0x80 + obj_frame_tiles gUnknown_838F828, 0x80 + obj_frame_tiles gUnknown_838F828, 0x80 + obj_frame_tiles gUnknown_838F828, 0x80 + obj_frame_tiles gUnknown_838F828, 0x80 + obj_frame_tiles gUnknown_838F828, 0x80 + obj_frame_tiles gUnknown_838F828, 0x80 + obj_frame_tiles gUnknown_838F828, 0x80 + obj_frame_tiles gUnknown_838F828, 0x80 + +gSpriteImages_83A2488:: @ 83A2488 + obj_frame_tiles gUnknown_838F8A8, 0x80 + obj_frame_tiles gUnknown_838F8A8, 0x80 + obj_frame_tiles gUnknown_838F8A8, 0x80 + obj_frame_tiles gUnknown_838F8A8, 0x80 + obj_frame_tiles gUnknown_838F8A8, 0x80 + obj_frame_tiles gUnknown_838F8A8, 0x80 + obj_frame_tiles gUnknown_838F8A8, 0x80 + obj_frame_tiles gUnknown_838F8A8, 0x80 + obj_frame_tiles gUnknown_838F8A8, 0x80 + +gSpriteImages_83A24D0:: @ 83A24D0 + obj_frame_tiles gUnknown_838F928, 0x80 + obj_frame_tiles gUnknown_838F928, 0x80 + obj_frame_tiles gUnknown_838F928, 0x80 + obj_frame_tiles gUnknown_838F928, 0x80 + obj_frame_tiles gUnknown_838F928, 0x80 + obj_frame_tiles gUnknown_838F928, 0x80 + obj_frame_tiles gUnknown_838F928, 0x80 + obj_frame_tiles gUnknown_838F928, 0x80 + obj_frame_tiles gUnknown_838F928, 0x80 + +gSpriteImages_83A2518:: @ 83A2518 + obj_frame_tiles gUnknown_838F9A8, 0x80 + obj_frame_tiles gUnknown_838F9A8, 0x80 + obj_frame_tiles gUnknown_838F9A8, 0x80 + obj_frame_tiles gUnknown_838F9A8, 0x80 + obj_frame_tiles gUnknown_838F9A8, 0x80 + obj_frame_tiles gUnknown_838F9A8, 0x80 + obj_frame_tiles gUnknown_838F9A8, 0x80 + obj_frame_tiles gUnknown_838F9A8, 0x80 + obj_frame_tiles gUnknown_838F9A8, 0x80 + +gSpriteImages_83A2560:: @ 83A2560 + obj_frame_tiles gUnknown_838FA28, 0x80 + obj_frame_tiles gUnknown_838FA28, 0x80 + obj_frame_tiles gUnknown_838FA28, 0x80 + obj_frame_tiles gUnknown_838FA28, 0x80 + obj_frame_tiles gUnknown_838FA28, 0x80 + obj_frame_tiles gUnknown_838FA28, 0x80 + obj_frame_tiles gUnknown_838FA28, 0x80 + obj_frame_tiles gUnknown_838FA28, 0x80 + obj_frame_tiles gUnknown_838FA28, 0x80 + +gSpriteImages_83A25A8:: @ 83A25A8 + obj_frame_tiles gUnknown_838FAA8, 0x200 + obj_frame_tiles gUnknown_838FAA8, 0x200 + obj_frame_tiles gUnknown_838FAA8, 0x200 + obj_frame_tiles gUnknown_838FAA8, 0x200 + obj_frame_tiles gUnknown_838FAA8 + 0x200, 0x200 + obj_frame_tiles gUnknown_838FAA8, 0x200 + obj_frame_tiles gUnknown_838FAA8 + 0x200, 0x200 + obj_frame_tiles gUnknown_838FAA8, 0x200 + obj_frame_tiles gUnknown_838FAA8 + 0x200, 0x200 + +gSpriteImages_83A25F0:: @ 83A25F0 + obj_frame_tiles gUnknown_838FEA8, 0x200 + obj_frame_tiles gUnknown_838FEA8, 0x200 + obj_frame_tiles gUnknown_838FEA8, 0x200 + obj_frame_tiles gUnknown_838FEA8, 0x200 + obj_frame_tiles gUnknown_838FEA8 + 0x200, 0x200 + obj_frame_tiles gUnknown_838FEA8, 0x200 + obj_frame_tiles gUnknown_838FEA8 + 0x200, 0x200 + obj_frame_tiles gUnknown_838FEA8, 0x200 + obj_frame_tiles gUnknown_838FEA8 + 0x200, 0x200 + +gSpriteImages_83A2638:: @ 83A2638 + obj_frame_tiles gUnknown_83902A8, 0x80 + obj_frame_tiles gUnknown_83902A8, 0x80 + obj_frame_tiles gUnknown_83902A8, 0x80 + obj_frame_tiles gUnknown_83902A8, 0x80 + obj_frame_tiles gUnknown_83902A8, 0x80 + obj_frame_tiles gUnknown_83902A8, 0x80 + obj_frame_tiles gUnknown_83902A8, 0x80 + obj_frame_tiles gUnknown_83902A8, 0x80 + obj_frame_tiles gUnknown_83902A8, 0x80 + +gSpriteImages_83A2680:: @ 83A2680 + obj_frame_tiles gUnknown_8393B28, 0x80 + obj_frame_tiles gUnknown_8393B28 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393B28 + 0x100, 0x80 + obj_frame_tiles gUnknown_8393B28, 0x80 + obj_frame_tiles gUnknown_8393B28, 0x80 + obj_frame_tiles gUnknown_8393B28 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393B28 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393B28 + 0x100, 0x80 + obj_frame_tiles gUnknown_8393B28 + 0x100, 0x80 + +gSpriteImages_83A26C8:: @ 83A26C8 + obj_frame_tiles gUnknown_8393CA8, 0x80 + obj_frame_tiles gUnknown_8393CA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393CA8 + 0x100, 0x80 + obj_frame_tiles gUnknown_8393CA8, 0x80 + obj_frame_tiles gUnknown_8393CA8, 0x80 + obj_frame_tiles gUnknown_8393CA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393CA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393CA8 + 0x100, 0x80 + obj_frame_tiles gUnknown_8393CA8 + 0x100, 0x80 + +gSpriteImages_83A2710:: @ 83A2710 + obj_frame_tiles gUnknown_8393E28, 0x80 + obj_frame_tiles gUnknown_8393E28 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393E28 + 0x100, 0x80 + obj_frame_tiles gUnknown_8393E28, 0x80 + obj_frame_tiles gUnknown_8393E28, 0x80 + obj_frame_tiles gUnknown_8393E28 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393E28 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393E28 + 0x100, 0x80 + obj_frame_tiles gUnknown_8393E28 + 0x100, 0x80 + +gSpriteImages_83A2758:: @ 83A2758 + obj_frame_tiles gUnknown_8393FA8, 0x80 + obj_frame_tiles gUnknown_8393FA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393FA8 + 0x100, 0x80 + obj_frame_tiles gUnknown_8393FA8, 0x80 + obj_frame_tiles gUnknown_8393FA8, 0x80 + obj_frame_tiles gUnknown_8393FA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393FA8 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393FA8 + 0x100, 0x80 + obj_frame_tiles gUnknown_8393FA8 + 0x100, 0x80 + +gSpriteImages_83A27A0:: @ 83A27A0 + obj_frame_tiles gUnknown_8394128, 0x80 + obj_frame_tiles gUnknown_8394128 + 0x80, 0x80 + obj_frame_tiles gUnknown_8394128 + 0x100, 0x80 + obj_frame_tiles gUnknown_8394128, 0x80 + obj_frame_tiles gUnknown_8394128, 0x80 + obj_frame_tiles gUnknown_8394128 + 0x80, 0x80 + obj_frame_tiles gUnknown_8394128 + 0x80, 0x80 + obj_frame_tiles gUnknown_8394128 + 0x100, 0x80 + obj_frame_tiles gUnknown_8394128 + 0x100, 0x80 + +gSpriteImages_83A27E8:: @ 83A27E8 + obj_frame_tiles gUnknown_83942A8, 0x80 + obj_frame_tiles gUnknown_83942A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83942A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_83942A8, 0x80 + obj_frame_tiles gUnknown_83942A8, 0x80 + obj_frame_tiles gUnknown_83942A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83942A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83942A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_83942A8 + 0x100, 0x80 + +gSpriteImages_83A2830:: @ 83A2830 + obj_frame_tiles gUnknown_8394428, 0x80 + obj_frame_tiles gUnknown_8394428 + 0x80, 0x80 + obj_frame_tiles gUnknown_8394428 + 0x100, 0x80 + obj_frame_tiles gUnknown_8394428, 0x80 + obj_frame_tiles gUnknown_8394428, 0x80 + obj_frame_tiles gUnknown_8394428 + 0x80, 0x80 + obj_frame_tiles gUnknown_8394428 + 0x80, 0x80 + obj_frame_tiles gUnknown_8394428 + 0x100, 0x80 + obj_frame_tiles gUnknown_8394428 + 0x100, 0x80 + +gSpriteImages_83A2878:: @ 83A2878 + obj_frame_tiles gUnknown_8393628, 0x80 + obj_frame_tiles gUnknown_8393628 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393628 + 0x100, 0x80 + obj_frame_tiles gUnknown_8393628, 0x80 + obj_frame_tiles gUnknown_8393628, 0x80 + obj_frame_tiles gUnknown_8393628 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393628 + 0x80, 0x80 + obj_frame_tiles gUnknown_8393628 + 0x100, 0x80 + obj_frame_tiles gUnknown_8393628 + 0x100, 0x80 + +gSpriteImages_83A28C0:: @ 83A28C0 + obj_frame_tiles gUnknown_83934A8, 0x80 + obj_frame_tiles gUnknown_83934A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83934A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_83934A8, 0x80 + obj_frame_tiles gUnknown_83934A8, 0x80 + obj_frame_tiles gUnknown_83934A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83934A8 + 0x80, 0x80 + obj_frame_tiles gUnknown_83934A8 + 0x100, 0x80 + obj_frame_tiles gUnknown_83934A8 + 0x100, 0x80 + +gSpriteImages_83A2908:: @ 83A2908 + obj_frame_tiles gUnknown_8391B28, 0x100 + obj_frame_tiles gUnknown_8391B28 + 0x100, 0x100 + obj_frame_tiles gUnknown_8391B28 + 0x200, 0x100 + obj_frame_tiles gUnknown_8391B28, 0x100 + obj_frame_tiles gUnknown_8391B28, 0x100 + obj_frame_tiles gUnknown_8391B28 + 0x100, 0x100 + obj_frame_tiles gUnknown_8391B28 + 0x100, 0x100 + obj_frame_tiles gUnknown_8391B28 + 0x200, 0x100 + obj_frame_tiles gUnknown_8391B28 + 0x200, 0x100 + +gAnimCmd_83A2950:: @ 83A2950 + obj_image_anim_frame 0, 8 + obj_image_anim_frame 0, 8 + obj_image_anim_frame 0, 8 + obj_image_anim_frame 0, 8 + obj_image_anim_jump 0 + +gAnimCmd_83A2964:: @ 83A2964 + obj_image_anim_frame 0, 16 + obj_image_anim_jump 0 + +gAnimCmd_83A296C:: @ 83A296C + obj_image_anim_frame 1, 16 + obj_image_anim_jump 0 + +gAnimCmd_83A2974:: @ 83A2974 + obj_image_anim_frame 2, 16 + obj_image_anim_jump 0 + +gAnimCmd_83A297C:: @ 83A297C + obj_image_anim_frame 2, 16, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A2984:: @ 83A2984 + obj_image_anim_frame 3, 8 + obj_image_anim_frame 0, 8 + obj_image_anim_frame 3, 8, 0x40 + obj_image_anim_frame 0, 8 + obj_image_anim_jump 0 + +gAnimCmd_83A2998:: @ 83A2998 + obj_image_anim_frame 4, 8 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 4, 8, 0x40 + obj_image_anim_frame 1, 8 + obj_image_anim_jump 0 + +gAnimCmd_83A29AC:: @ 83A29AC + obj_image_anim_frame 5, 8 + obj_image_anim_frame 2, 8 + obj_image_anim_frame 6, 8 + obj_image_anim_frame 2, 8 + obj_image_anim_jump 0 + +gAnimCmd_83A29C0:: @ 83A29C0 + obj_image_anim_frame 5, 8, 0x40 + obj_image_anim_frame 2, 8, 0x40 + obj_image_anim_frame 6, 8, 0x40 + obj_image_anim_frame 2, 8, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A29D4:: @ 83A29D4 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 3, 4, 0x40 + obj_image_anim_frame 0, 4 + obj_image_anim_jump 0 + +gAnimCmd_83A29E8:: @ 83A29E8 + obj_image_anim_frame 4, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 4, 4, 0x40 + obj_image_anim_frame 1, 4 + obj_image_anim_jump 0 + +gAnimCmd_83A29FC:: @ 83A29FC + obj_image_anim_frame 5, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 6, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_jump 0 + +gAnimCmd_83A2A10:: @ 83A2A10 + obj_image_anim_frame 5, 4, 0x40 + obj_image_anim_frame 2, 4, 0x40 + obj_image_anim_frame 6, 4, 0x40 + obj_image_anim_frame 2, 4, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A2A24:: @ 83A2A24 + obj_image_anim_frame 3, 2 + obj_image_anim_frame 0, 2 + obj_image_anim_frame 3, 2, 0x40 + obj_image_anim_frame 0, 2 + obj_image_anim_jump 0 + +gAnimCmd_83A2A38:: @ 83A2A38 + obj_image_anim_frame 4, 2 + obj_image_anim_frame 1, 2 + obj_image_anim_frame 4, 2, 0x40 + obj_image_anim_frame 1, 2 + obj_image_anim_jump 0 + +gAnimCmd_83A2A4C:: @ 83A2A4C + obj_image_anim_frame 5, 2 + obj_image_anim_frame 2, 2 + obj_image_anim_frame 6, 2 + obj_image_anim_frame 2, 2 + obj_image_anim_jump 0 + +gAnimCmd_83A2A60:: @ 83A2A60 + obj_image_anim_frame 5, 2, 0x40 + obj_image_anim_frame 2, 2, 0x40 + obj_image_anim_frame 6, 2, 0x40 + obj_image_anim_frame 2, 2, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A2A74:: @ 83A2A74 + obj_image_anim_frame 3, 1 + obj_image_anim_frame 0, 1 + obj_image_anim_frame 3, 1, 0x40 + obj_image_anim_frame 0, 1 + obj_image_anim_jump 0 + +gAnimCmd_83A2A88:: @ 83A2A88 + obj_image_anim_frame 4, 1 + obj_image_anim_frame 1, 1 + obj_image_anim_frame 4, 1, 0x40 + obj_image_anim_frame 1, 1 + obj_image_anim_jump 0 + +gAnimCmd_83A2A9C:: @ 83A2A9C + obj_image_anim_frame 5, 1 + obj_image_anim_frame 2, 1 + obj_image_anim_frame 6, 1 + obj_image_anim_frame 2, 1 + obj_image_anim_jump 0 + +gAnimCmd_83A2AB0:: @ 83A2AB0 + obj_image_anim_frame 5, 1, 0x40 + obj_image_anim_frame 2, 1, 0x40 + obj_image_anim_frame 6, 1, 0x40 + obj_image_anim_frame 2, 1, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A2AC4:: @ 83A2AC4 + obj_image_anim_frame 0, 16 + obj_image_anim_jump 0 + +gAnimCmd_83A2ACC:: @ 83A2ACC + obj_image_anim_frame 1, 16 + obj_image_anim_jump 0 + +gAnimCmd_83A2AD4:: @ 83A2AD4 + obj_image_anim_frame 2, 16 + obj_image_anim_jump 0 + +gAnimCmd_83A2ADC:: @ 83A2ADC + obj_image_anim_frame 2, 16, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A2AE4:: @ 83A2AE4 + obj_image_anim_frame 3, 8 + obj_image_anim_frame 0, 8 + obj_image_anim_frame 4, 8 + obj_image_anim_frame 0, 8 + obj_image_anim_jump 0 + +gAnimCmd_83A2AF8:: @ 83A2AF8 + obj_image_anim_frame 5, 8 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 6, 8 + obj_image_anim_frame 1, 8 + obj_image_anim_jump 0 + +gAnimCmd_83A2B0C:: @ 83A2B0C + obj_image_anim_frame 7, 8 + obj_image_anim_frame 2, 8 + obj_image_anim_frame 8, 8 + obj_image_anim_frame 2, 8 + obj_image_anim_jump 0 + +gAnimCmd_83A2B20:: @ 83A2B20 + obj_image_anim_frame 7, 8, 0x40 + obj_image_anim_frame 2, 8, 0x40 + obj_image_anim_frame 8, 8, 0x40 + obj_image_anim_frame 2, 8, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A2B34:: @ 83A2B34 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 4, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_jump 0 + +gAnimCmd_83A2B48:: @ 83A2B48 + obj_image_anim_frame 5, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 6, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_jump 0 + +gAnimCmd_83A2B5C:: @ 83A2B5C + obj_image_anim_frame 7, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 8, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_jump 0 + +gAnimCmd_83A2B70:: @ 83A2B70 + obj_image_anim_frame 7, 4, 0x40 + obj_image_anim_frame 2, 4, 0x40 + obj_image_anim_frame 8, 4, 0x40 + obj_image_anim_frame 2, 4, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A2B84:: @ 83A2B84 + obj_image_anim_frame 3, 2 + obj_image_anim_frame 0, 2 + obj_image_anim_frame 4, 2 + obj_image_anim_frame 0, 2 + obj_image_anim_jump 0 + +gAnimCmd_83A2B98:: @ 83A2B98 + obj_image_anim_frame 5, 2 + obj_image_anim_frame 1, 2 + obj_image_anim_frame 6, 2 + obj_image_anim_frame 1, 2 + obj_image_anim_jump 0 + +gAnimCmd_83A2BAC:: @ 83A2BAC + obj_image_anim_frame 7, 2 + obj_image_anim_frame 2, 2 + obj_image_anim_frame 8, 2 + obj_image_anim_frame 2, 2 + obj_image_anim_jump 0 + +gAnimCmd_83A2BC0:: @ 83A2BC0 + obj_image_anim_frame 7, 2, 0x40 + obj_image_anim_frame 2, 2, 0x40 + obj_image_anim_frame 8, 2, 0x40 + obj_image_anim_frame 2, 2, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A2BD4:: @ 83A2BD4 + obj_image_anim_frame 3, 1 + obj_image_anim_frame 0, 1 + obj_image_anim_frame 4, 1 + obj_image_anim_frame 0, 1 + obj_image_anim_jump 0 + +gAnimCmd_83A2BE8:: @ 83A2BE8 + obj_image_anim_frame 5, 1 + obj_image_anim_frame 1, 1 + obj_image_anim_frame 6, 1 + obj_image_anim_frame 1, 1 + obj_image_anim_jump 0 + +gAnimCmd_83A2BFC:: @ 83A2BFC + obj_image_anim_frame 7, 1 + obj_image_anim_frame 2, 1 + obj_image_anim_frame 8, 1 + obj_image_anim_frame 2, 1 + obj_image_anim_jump 0 + +gAnimCmd_83A2C10:: @ 83A2C10 + obj_image_anim_frame 7, 1, 0x40 + obj_image_anim_frame 2, 1, 0x40 + obj_image_anim_frame 8, 1, 0x40 + obj_image_anim_frame 2, 1, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A2C24:: @ 83A2C24 + obj_image_anim_frame 9, 0 + obj_image_anim_end + +gAnimCmd_83A2C2C:: @ 83A2C2C + obj_image_anim_frame 3, 8 + obj_image_anim_frame 4, 8 + obj_image_anim_frame 3, 8 + obj_image_anim_frame 4, 8 + obj_image_anim_jump 0 + +gAnimCmd_83A2C40:: @ 83A2C40 + obj_image_anim_frame 3, 16 + obj_image_anim_jump 0 + +gAnimCmd_83A2C48:: @ 83A2C48 + obj_image_anim_frame 0, 60 + obj_image_anim_jump 0 + +gAnimCmd_83A2C50:: @ 83A2C50 + obj_image_anim_frame 1, 60 + obj_image_anim_jump 0 + +gAnimCmd_83A2C58:: @ 83A2C58 + obj_image_anim_frame 2, 60 + obj_image_anim_jump 0 + +gAnimCmd_83A2C60:: @ 83A2C60 + obj_image_anim_frame 2, 60, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A2C68:: @ 83A2C68 + obj_image_anim_frame 0, 16 + obj_image_anim_jump 0 + +gAnimCmd_83A2C70:: @ 83A2C70 + obj_image_anim_frame 1, 16 + obj_image_anim_jump 0 + +gAnimCmd_83A2C78:: @ 83A2C78 + obj_image_anim_frame 2, 16 + obj_image_anim_jump 0 + +gAnimCmd_83A2C80:: @ 83A2C80 + obj_image_anim_frame 2, 16, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A2C88:: @ 83A2C88 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 4, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 5, 4 + obj_image_anim_frame 6, 4 + obj_image_anim_frame 5, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_jump 0 + +gAnimCmd_83A2CAC:: @ 83A2CAC + obj_image_anim_frame 7, 4 + obj_image_anim_frame 8, 4 + obj_image_anim_frame 7, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 9, 4 + obj_image_anim_frame 10, 4 + obj_image_anim_frame 9, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_jump 0 + +gAnimCmd_83A2CD0:: @ 83A2CD0 + obj_image_anim_frame 11, 4 + obj_image_anim_frame 12, 4 + obj_image_anim_frame 11, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 13, 4 + obj_image_anim_frame 14, 4 + obj_image_anim_frame 13, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_jump 0 + +gAnimCmd_83A2CF4:: @ 83A2CF4 + obj_image_anim_frame 11, 4, 0x40 + obj_image_anim_frame 12, 4, 0x40 + obj_image_anim_frame 11, 4, 0x40 + obj_image_anim_frame 2, 4, 0x40 + obj_image_anim_frame 13, 4, 0x40 + obj_image_anim_frame 14, 4, 0x40 + obj_image_anim_frame 13, 4, 0x40 + obj_image_anim_frame 2, 4, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A2D18:: @ 83A2D18 + obj_image_anim_frame 3, 2 + obj_image_anim_frame 4, 2 + obj_image_anim_frame 3, 2 + obj_image_anim_frame 0, 2 + obj_image_anim_frame 5, 2 + obj_image_anim_frame 6, 2 + obj_image_anim_frame 5, 2 + obj_image_anim_frame 0, 2 + obj_image_anim_jump 0 + +gAnimCmd_83A2D3C:: @ 83A2D3C + obj_image_anim_frame 7, 2 + obj_image_anim_frame 8, 2 + obj_image_anim_frame 7, 2 + obj_image_anim_frame 1, 2 + obj_image_anim_frame 9, 2 + obj_image_anim_frame 10, 2 + obj_image_anim_frame 9, 2 + obj_image_anim_frame 1, 2 + obj_image_anim_jump 0 + +gAnimCmd_83A2D60:: @ 83A2D60 + obj_image_anim_frame 11, 2 + obj_image_anim_frame 12, 2 + obj_image_anim_frame 11, 2 + obj_image_anim_frame 2, 2 + obj_image_anim_frame 13, 2 + obj_image_anim_frame 14, 2 + obj_image_anim_frame 13, 2 + obj_image_anim_frame 2, 2 + obj_image_anim_jump 0 + +gAnimCmd_83A2D84:: @ 83A2D84 + obj_image_anim_frame 11, 2, 0x40 + obj_image_anim_frame 12, 2, 0x40 + obj_image_anim_frame 11, 2, 0x40 + obj_image_anim_frame 2, 2, 0x40 + obj_image_anim_frame 13, 2, 0x40 + obj_image_anim_frame 14, 2, 0x40 + obj_image_anim_frame 13, 2, 0x40 + obj_image_anim_frame 2, 2, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A2DA8:: @ 83A2DA8 + obj_image_anim_frame 3, 1 + obj_image_anim_frame 4, 1 + obj_image_anim_frame 3, 1 + obj_image_anim_frame 0, 1 + obj_image_anim_frame 5, 1 + obj_image_anim_frame 6, 1 + obj_image_anim_frame 5, 1 + obj_image_anim_frame 0, 1 + obj_image_anim_jump 0 + +gAnimCmd_83A2DCC:: @ 83A2DCC + obj_image_anim_frame 7, 1 + obj_image_anim_frame 8, 1 + obj_image_anim_frame 7, 1 + obj_image_anim_frame 1, 1 + obj_image_anim_frame 9, 1 + obj_image_anim_frame 10, 1 + obj_image_anim_frame 9, 1 + obj_image_anim_frame 1, 1 + obj_image_anim_jump 0 + +gAnimCmd_83A2DF0:: @ 83A2DF0 + obj_image_anim_frame 11, 1 + obj_image_anim_frame 12, 1 + obj_image_anim_frame 11, 1 + obj_image_anim_frame 2, 1 + obj_image_anim_frame 13, 1 + obj_image_anim_frame 14, 1 + obj_image_anim_frame 13, 1 + obj_image_anim_frame 2, 1 + obj_image_anim_jump 0 + +gAnimCmd_83A2E14:: @ 83A2E14 + obj_image_anim_frame 11, 1, 0x40 + obj_image_anim_frame 12, 1, 0x40 + obj_image_anim_frame 11, 1, 0x40 + obj_image_anim_frame 2, 1, 0x40 + obj_image_anim_frame 13, 1, 0x40 + obj_image_anim_frame 14, 1, 0x40 + obj_image_anim_frame 13, 1, 0x40 + obj_image_anim_frame 2, 1, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A2E38:: @ 83A2E38 + obj_image_anim_frame 3, 0 + obj_image_anim_frame 4, 0 + obj_image_anim_frame 3, 0 + obj_image_anim_frame 0, 0 + obj_image_anim_frame 5, 0 + obj_image_anim_frame 6, 0 + obj_image_anim_frame 5, 0 + obj_image_anim_frame 0, 0 + obj_image_anim_jump 0 + +gAnimCmd_83A2E5C:: @ 83A2E5C + obj_image_anim_frame 7, 0 + obj_image_anim_frame 8, 0 + obj_image_anim_frame 7, 0 + obj_image_anim_frame 1, 0 + obj_image_anim_frame 9, 0 + obj_image_anim_frame 10, 0 + obj_image_anim_frame 9, 0 + obj_image_anim_frame 1, 0 + obj_image_anim_jump 0 + +gAnimCmd_83A2E80:: @ 83A2E80 + obj_image_anim_frame 11, 0 + obj_image_anim_frame 12, 0 + obj_image_anim_frame 11, 0 + obj_image_anim_frame 2, 0 + obj_image_anim_frame 13, 0 + obj_image_anim_frame 14, 0 + obj_image_anim_frame 13, 0 + obj_image_anim_frame 2, 0 + obj_image_anim_jump 0 + +gAnimCmd_83A2EA4:: @ 83A2EA4 + obj_image_anim_frame 11, 0, 0x40 + obj_image_anim_frame 12, 0, 0x40 + obj_image_anim_frame 11, 0, 0x40 + obj_image_anim_frame 2, 0, 0x40 + obj_image_anim_frame 13, 0, 0x40 + obj_image_anim_frame 14, 0, 0x40 + obj_image_anim_frame 13, 0, 0x40 + obj_image_anim_frame 2, 0, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A2EC8:: @ 83A2EC8 + obj_image_anim_frame 0, 2 + obj_image_anim_frame 2, 2, 0x40 + obj_image_anim_frame 1, 2 + obj_image_anim_frame 2, 2 + obj_image_anim_loop 1 + obj_image_anim_end + +gAnimCmd_83A2EE0:: @ 83A2EE0 + obj_image_anim_frame 1, 2 + obj_image_anim_frame 2, 2 + obj_image_anim_frame 0, 2 + obj_image_anim_frame 2, 2, 0x40 + obj_image_anim_loop 1 + obj_image_anim_end + +gAnimCmd_83A2EF8:: @ 83A2EF8 + obj_image_anim_frame 2, 2, 0x40 + obj_image_anim_frame 1, 2 + obj_image_anim_frame 2, 2 + obj_image_anim_frame 0, 2 + obj_image_anim_loop 1 + obj_image_anim_end + +gAnimCmd_83A2F10:: @ 83A2F10 + obj_image_anim_frame 2, 2 + obj_image_anim_frame 0, 2 + obj_image_anim_frame 2, 2, 0x40 + obj_image_anim_frame 1, 2 + obj_image_anim_loop 1 + obj_image_anim_end + +gAnimCmd_83A2F28:: @ 83A2F28 + obj_image_anim_frame 18, 16 + obj_image_anim_frame 0, 16 + obj_image_anim_frame 19, 16 + obj_image_anim_frame 0, 32 + obj_image_anim_loop 1 + obj_image_anim_end + +gAnimCmd_83A2F40:: @ 83A2F40 + obj_image_anim_frame 9, 5 + obj_image_anim_frame 10, 3 + obj_image_anim_frame 9, 5 + obj_image_anim_frame 11, 3 + obj_image_anim_jump 0 + +gAnimCmd_83A2F54:: @ 83A2F54 + obj_image_anim_frame 12, 5 + obj_image_anim_frame 13, 3 + obj_image_anim_frame 12, 5 + obj_image_anim_frame 14, 3 + obj_image_anim_jump 0 + +gAnimCmd_83A2F68:: @ 83A2F68 + obj_image_anim_frame 15, 5 + obj_image_anim_frame 16, 3 + obj_image_anim_frame 15, 5 + obj_image_anim_frame 17, 3 + obj_image_anim_jump 0 + +gAnimCmd_83A2F7C:: @ 83A2F7C + obj_image_anim_frame 15, 5, 0x40 + obj_image_anim_frame 16, 3, 0x40 + obj_image_anim_frame 15, 5, 0x40 + obj_image_anim_frame 17, 3, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A2F90:: @ 83A2F90 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 4, 8 + obj_image_anim_end + +gAnimCmd_83A2FA8:: @ 83A2FA8 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 5, 4 + obj_image_anim_frame 6, 4 + obj_image_anim_loop 0 + obj_image_anim_frame 7, 4 + obj_image_anim_frame 8, 4 + obj_image_anim_loop 6 + obj_image_anim_frame 6, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_end + +gAnimCmd_83A2FD8:: @ 83A2FD8 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_loop 0 + obj_image_anim_frame 4, 4 + obj_image_anim_frame 5, 4 + obj_image_anim_loop 6 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_end + +gAnimCmd_83A300C:: @ 83A300C + obj_image_anim_frame 9, 32 + obj_image_anim_jump 0 + +gAnimCmd_83A3014:: @ 83A3014 + obj_image_anim_frame 10, 32 + obj_image_anim_jump 0 + +gAnimCmd_83A301C:: @ 83A301C + obj_image_anim_frame 11, 32 + obj_image_anim_jump 0 + +gAnimCmd_83A3024:: @ 83A3024 + obj_image_anim_frame 11, 32, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A302C:: @ 83A302C + obj_image_anim_frame 15, 4 + obj_image_anim_frame 16, 4 + obj_image_anim_end + +gAnimCmd_83A3038:: @ 83A3038 + obj_image_anim_frame 19, 4 + obj_image_anim_frame 20, 4 + obj_image_anim_end + +gAnimCmd_83A3044:: @ 83A3044 + obj_image_anim_frame 23, 4 + obj_image_anim_frame 24, 4 + obj_image_anim_end + +gAnimCmd_83A3050:: @ 83A3050 + obj_image_anim_frame 23, 4, 0x40 + obj_image_anim_frame 24, 4, 0x40 + obj_image_anim_end + +gAnimCmd_83A305C:: @ 83A305C + obj_image_anim_frame 17, 4 + obj_image_anim_frame 18, 4 + obj_image_anim_end + +gAnimCmd_83A3068:: @ 83A3068 + obj_image_anim_frame 21, 4 + obj_image_anim_frame 22, 4 + obj_image_anim_end + +gAnimCmd_83A3074:: @ 83A3074 + obj_image_anim_frame 25, 4 + obj_image_anim_frame 26, 4 + obj_image_anim_end + +gAnimCmd_83A3080:: @ 83A3080 + obj_image_anim_frame 25, 4, 0x40 + obj_image_anim_frame 26, 4, 0x40 + obj_image_anim_end + +gAnimCmd_83A308C:: @ 83A308C + obj_image_anim_frame 15, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_end + +gAnimCmd_83A3098:: @ 83A3098 + obj_image_anim_frame 19, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_end + +gAnimCmd_83A30A4:: @ 83A30A4 + obj_image_anim_frame 23, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_end + +gAnimCmd_83A30B0:: @ 83A30B0 + obj_image_anim_frame 23, 4, 0x40 + obj_image_anim_frame 2, 4, 0x40 + obj_image_anim_end + +gAnimCmd_83A30BC:: @ 83A30BC + obj_image_anim_frame 17, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_end + +gAnimCmd_83A30C8:: @ 83A30C8 + obj_image_anim_frame 21, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_end + +gAnimCmd_83A30D4:: @ 83A30D4 + obj_image_anim_frame 25, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_end + +gAnimCmd_83A30E0:: @ 83A30E0 + obj_image_anim_frame 25, 4, 0x40 + obj_image_anim_frame 2, 4, 0x40 + obj_image_anim_end + +gAnimCmd_83A30EC:: @ 83A30EC + obj_image_anim_frame 27, 4 + obj_image_anim_frame 16, 4 + obj_image_anim_frame 28, 4 + obj_image_anim_frame 16, 4 + obj_image_anim_jump 0 + +gAnimCmd_83A3100:: @ 83A3100 + obj_image_anim_frame 29, 4 + obj_image_anim_frame 20, 4 + obj_image_anim_frame 30, 4 + obj_image_anim_frame 20, 4 + obj_image_anim_jump 0 + +gAnimCmd_83A3114:: @ 83A3114 + obj_image_anim_frame 31, 4 + obj_image_anim_frame 24, 4 + obj_image_anim_frame 32, 4 + obj_image_anim_frame 24, 4 + obj_image_anim_jump 0 + +gAnimCmd_83A3128:: @ 83A3128 + obj_image_anim_frame 31, 4, 0x40 + obj_image_anim_frame 24, 4, 0x40 + obj_image_anim_frame 32, 4, 0x40 + obj_image_anim_frame 24, 4, 0x40 + obj_image_anim_jump 0 + +gAnimCmd_83A313C:: @ 83A313C + obj_image_anim_frame 0, 32 + obj_image_anim_end + +gAnimCmd_83A3144:: @ 83A3144 + obj_image_anim_frame 1, 32 + obj_image_anim_frame 2, 32 + obj_image_anim_end + +gAnimCmd_83A3150:: @ 83A3150 + obj_image_anim_frame 3, 48 + obj_image_anim_frame 4, 48 + obj_image_anim_end + +gAnimCmd_83A315C:: @ 83A315C + obj_image_anim_frame 5, 32 + obj_image_anim_frame 5, 32 + obj_image_anim_frame 6, 32 + obj_image_anim_frame 6, 32 + obj_image_anim_end + +gAnimCmd_83A3170:: @ 83A3170 + obj_image_anim_frame 7, 48 + obj_image_anim_frame 7, 48 + obj_image_anim_frame 8, 48 + obj_image_anim_frame 8, 48 + obj_image_anim_end + +gAnimCmd_83A3184:: @ 83A3184 + obj_image_anim_frame 0, 8 + obj_image_anim_frame 9, 32 + obj_image_anim_frame 0, 8 + obj_image_anim_end + +gAnimCmd_83A3194:: @ 83A3194 + obj_image_anim_frame 0, 8 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 2, 8 + obj_image_anim_frame 3, 8 + obj_image_anim_end + +gAnimCmd_83A31A8:: @ 83A31A8 + obj_image_anim_frame 0, 6 + obj_image_anim_frame 1, 6 + obj_image_anim_frame 2, 6 + obj_image_anim_frame 3, 6 + obj_image_anim_end + +gAnimCmd_83A31BC:: @ 83A31BC + obj_image_anim_frame 8, 4 + obj_image_anim_frame 9, 4 + obj_image_anim_frame 10, 4 + obj_image_anim_frame 11, 4 + obj_image_anim_end + +gAnimCmd_83A31D0:: @ 83A31D0 + obj_image_anim_frame 4, 4 + obj_image_anim_frame 5, 4 + obj_image_anim_frame 6, 4 + obj_image_anim_frame 7, 4 + obj_image_anim_end + +gAnimCmd_83A31E4:: @ 83A31E4 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_end + +gAnimCmd_83A31F8:: @ 83A31F8 + obj_image_anim_frame 0, 4, 0x40 + obj_image_anim_frame 1, 4, 0x40 + obj_image_anim_frame 2, 4, 0x40 + obj_image_anim_frame 3, 4, 0x40 + obj_image_anim_end + +gAnimCmd_83A320C:: @ 83A320C + obj_image_anim_frame 11, 4 + obj_image_anim_frame 10, 6 + obj_image_anim_frame 9, 6 + obj_image_anim_frame 8, 6 + obj_image_anim_end + +gAnimCmd_83A3220:: @ 83A3220 + obj_image_anim_frame 7, 4 + obj_image_anim_frame 6, 6 + obj_image_anim_frame 5, 6 + obj_image_anim_frame 4, 6 + obj_image_anim_end + +gAnimCmd_83A3234:: @ 83A3234 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_end + +gAnimCmd_83A3248:: @ 83A3248 + obj_image_anim_frame 3, 4, 0x40 + obj_image_anim_frame 2, 4, 0x40 + obj_image_anim_frame 1, 4, 0x40 + obj_image_anim_frame 0, 4, 0x40 + obj_image_anim_end + +gAnimCmd_83A325C:: @ 83A325C + obj_image_anim_frame 10, 6 + obj_image_anim_frame 11, 6 + obj_image_anim_loop 1 + obj_image_anim_frame 11, 30 + obj_image_anim_jump 0 + +gAnimCmd_83A3270:: @ 83A3270 + obj_image_anim_frame 6, 6 + obj_image_anim_frame 7, 6 + obj_image_anim_loop 1 + obj_image_anim_frame 7, 30 + obj_image_anim_jump 0 + +gAnimCmd_83A3284:: @ 83A3284 + obj_image_anim_frame 2, 6 + obj_image_anim_frame 3, 6 + obj_image_anim_loop 1 + obj_image_anim_frame 3, 30 + obj_image_anim_jump 0 + +gAnimCmd_83A3298:: @ 83A3298 + obj_image_anim_frame 2, 6, 0x40 + obj_image_anim_frame 3, 6, 0x40 + obj_image_anim_loop 1 + obj_image_anim_frame 3, 30, 0x40 + obj_image_anim_jump 0 + + .incbin "baserom.gba", 0x3A32AC, 0x68 + +gAnimTable_83A3314:: @ 83A3314 + .4byte gAnimCmd_83A2950 +gAnimTable_83A3318:: @ 83A3318 + .4byte gAnimCmd_83A2964 + .4byte gAnimCmd_83A296C + .4byte gAnimCmd_83A2974 + .4byte gAnimCmd_83A297C + .4byte gAnimCmd_83A2984 + .4byte gAnimCmd_83A2998 + .4byte gAnimCmd_83A29AC + .4byte gAnimCmd_83A29C0 + .4byte gAnimCmd_83A29D4 + .4byte gAnimCmd_83A29E8 + .4byte gAnimCmd_83A29FC + .4byte gAnimCmd_83A2A10 + .4byte gAnimCmd_83A2A24 + .4byte gAnimCmd_83A2A38 + .4byte gAnimCmd_83A2A4C + .4byte gAnimCmd_83A2A60 + .4byte gAnimCmd_83A2A74 + .4byte gAnimCmd_83A2A88 + .4byte gAnimCmd_83A2A9C + .4byte gAnimCmd_83A2AB0 + +gAnimTable_83A3368:: @ 83A3368 + .4byte gAnimCmd_83A2AC4 + .4byte gAnimCmd_83A2ACC + .4byte gAnimCmd_83A2AD4 + .4byte gAnimCmd_83A2ADC + .4byte gAnimCmd_83A2AE4 + .4byte gAnimCmd_83A2AF8 + .4byte gAnimCmd_83A2B0C + .4byte gAnimCmd_83A2B20 + .4byte gAnimCmd_83A2B34 + .4byte gAnimCmd_83A2B48 + .4byte gAnimCmd_83A2B5C + .4byte gAnimCmd_83A2B70 + .4byte gAnimCmd_83A2B84 + .4byte gAnimCmd_83A2B98 + .4byte gAnimCmd_83A2BAC + .4byte gAnimCmd_83A2BC0 + .4byte gAnimCmd_83A2BD4 + .4byte gAnimCmd_83A2BE8 + .4byte gAnimCmd_83A2BFC + .4byte gAnimCmd_83A2C10 + .4byte gAnimCmd_83A2C24 + +gAnimTable_83A33BC:: @ 83A33BC + .4byte gAnimCmd_83A2AC4 + .4byte gAnimCmd_83A2ACC + .4byte gAnimCmd_83A2AD4 + .4byte gAnimCmd_83A2ADC + .4byte gAnimCmd_83A2C2C + .4byte gAnimCmd_83A2C40 + .4byte gAnimCmd_83A2B0C + .4byte gAnimCmd_83A2B20 + .4byte gAnimCmd_83A2B34 + .4byte gAnimCmd_83A2B48 + .4byte gAnimCmd_83A2B5C + .4byte gAnimCmd_83A2B70 + .4byte gAnimCmd_83A2B84 + .4byte gAnimCmd_83A2B98 + .4byte gAnimCmd_83A2BAC + .4byte gAnimCmd_83A2BC0 + .4byte gAnimCmd_83A2BD4 + .4byte gAnimCmd_83A2BE8 + .4byte gAnimCmd_83A2BFC + .4byte gAnimCmd_83A2C10 + .4byte gAnimCmd_83A2C24 + +gAnimTable_83A3410:: + .4byte gAnimCmd_83A2C68 + .4byte gAnimCmd_83A2C70 + .4byte gAnimCmd_83A2C78 + .4byte gAnimCmd_83A2C80 + .4byte gAnimCmd_83A2C88 + .4byte gAnimCmd_83A2CAC + .4byte gAnimCmd_83A2CD0 + .4byte gAnimCmd_83A2CF4 + .4byte gAnimCmd_83A2D18 + .4byte gAnimCmd_83A2D3C + .4byte gAnimCmd_83A2D60 + .4byte gAnimCmd_83A2D84 + .4byte gAnimCmd_83A2DA8 + .4byte gAnimCmd_83A2DCC + .4byte gAnimCmd_83A2DF0 + .4byte gAnimCmd_83A2E14 + .4byte gAnimCmd_83A2E38 + .4byte gAnimCmd_83A2E5C + .4byte gAnimCmd_83A2E80 + .4byte gAnimCmd_83A2EA4 + .4byte gAnimCmd_83A2F40 + .4byte gAnimCmd_83A2F54 + .4byte gAnimCmd_83A2F68 + .4byte gAnimCmd_83A2F7C + +gAnimTable_83A3470:: @ 83A3470 + .4byte gAnimCmd_83A2AC4 + .4byte gAnimCmd_83A2ACC + .4byte gAnimCmd_83A2AD4 + .4byte gAnimCmd_83A2ADC + .4byte gAnimCmd_83A2AE4 + .4byte gAnimCmd_83A2AF8 + .4byte gAnimCmd_83A2B0C + .4byte gAnimCmd_83A2B20 + .4byte gAnimCmd_83A2B34 + .4byte gAnimCmd_83A2B48 + .4byte gAnimCmd_83A2B5C + .4byte gAnimCmd_83A2B70 + .4byte gAnimCmd_83A2B84 + .4byte gAnimCmd_83A2B98 + .4byte gAnimCmd_83A2BAC + .4byte gAnimCmd_83A2BC0 + .4byte gAnimCmd_83A2BD4 + .4byte gAnimCmd_83A2BE8 + .4byte gAnimCmd_83A2BFC + .4byte gAnimCmd_83A2C10 + .4byte gAnimCmd_83A2F40 + .4byte gAnimCmd_83A2F54 + .4byte gAnimCmd_83A2F68 + .4byte gAnimCmd_83A2F7C + .4byte gAnimCmd_83A2EC8 + .4byte gAnimCmd_83A2EE0 + .4byte gAnimCmd_83A2EF8 + .4byte gAnimCmd_83A2F10 + .4byte gAnimCmd_83A2F28 + +gAnimTable_83A34E4:: + .4byte gAnimCmd_83A2AC4 + .4byte gAnimCmd_83A2ACC + .4byte gAnimCmd_83A2AD4 + .4byte gAnimCmd_83A2ADC + .4byte gAnimCmd_83A2AE4 + .4byte gAnimCmd_83A2AF8 + .4byte gAnimCmd_83A2B0C + .4byte gAnimCmd_83A2B20 + .4byte gAnimCmd_83A2B34 + .4byte gAnimCmd_83A2B48 + .4byte gAnimCmd_83A2B5C + .4byte gAnimCmd_83A2B70 + .4byte gAnimCmd_83A2B84 + .4byte gAnimCmd_83A2B98 + .4byte gAnimCmd_83A2BAC + .4byte gAnimCmd_83A2BC0 + .4byte gAnimCmd_83A2BD4 + .4byte gAnimCmd_83A2BE8 + .4byte gAnimCmd_83A2BFC + .4byte gAnimCmd_83A2C10 + .4byte gAnimCmd_83A302C + .4byte gAnimCmd_83A3038 + .4byte gAnimCmd_83A3044 + .4byte gAnimCmd_83A3050 + .4byte gAnimCmd_83A305C + .4byte gAnimCmd_83A3068 + .4byte gAnimCmd_83A3074 + .4byte gAnimCmd_83A3080 + .4byte gAnimCmd_83A308C + .4byte gAnimCmd_83A3098 + .4byte gAnimCmd_83A30A4 + .4byte gAnimCmd_83A30B0 + .4byte gAnimCmd_83A30BC + .4byte gAnimCmd_83A30C8 + .4byte gAnimCmd_83A30D4 + .4byte gAnimCmd_83A30E0 + .4byte gAnimCmd_83A30EC + .4byte gAnimCmd_83A3100 + .4byte gAnimCmd_83A3114 + .4byte gAnimCmd_83A3128 + +gAnimTable_83A3584:: @ 83A3584 + .4byte gAnimCmd_83A2C48 + .4byte gAnimCmd_83A2C50 + .4byte gAnimCmd_83A2C58 + .4byte gAnimCmd_83A2C60 + .4byte gAnimCmd_83A2C48 + .4byte gAnimCmd_83A2C50 + .4byte gAnimCmd_83A2C58 + .4byte gAnimCmd_83A2C60 + .4byte gAnimCmd_83A2C48 + .4byte gAnimCmd_83A2C50 + .4byte gAnimCmd_83A2C58 + .4byte gAnimCmd_83A2C60 + .4byte gAnimCmd_83A2C48 + .4byte gAnimCmd_83A2C50 + .4byte gAnimCmd_83A2C58 + .4byte gAnimCmd_83A2C60 + .4byte gAnimCmd_83A2C48 + .4byte gAnimCmd_83A2C50 + .4byte gAnimCmd_83A2C58 + .4byte gAnimCmd_83A2C60 + .4byte gAnimCmd_83A300C + .4byte gAnimCmd_83A3014 + .4byte gAnimCmd_83A301C + .4byte gAnimCmd_83A3024 + +gAnimTable_83A35E4:: @ 83A35E4 + .4byte gAnimCmd_83A2AC4 + .4byte gAnimCmd_83A2ACC + .4byte gAnimCmd_83A2AD4 + .4byte gAnimCmd_83A2ADC + .4byte gAnimCmd_83A2AE4 + .4byte gAnimCmd_83A2AF8 + .4byte gAnimCmd_83A2B0C + .4byte gAnimCmd_83A2B20 + .4byte gAnimCmd_83A2B34 + .4byte gAnimCmd_83A2B48 + .4byte gAnimCmd_83A2B5C + .4byte gAnimCmd_83A2B70 + .4byte gAnimCmd_83A2B84 + .4byte gAnimCmd_83A2B98 + .4byte gAnimCmd_83A2BAC + .4byte gAnimCmd_83A2BC0 + .4byte gAnimCmd_83A2BD4 + .4byte gAnimCmd_83A2BE8 + .4byte gAnimCmd_83A2BFC + .4byte gAnimCmd_83A2C10 + .4byte gAnimCmd_83A3184 + +gAnimTable_83A3638:: @ 83A3638 + .4byte gAnimCmd_83A2F90 + +gAnimTable_83A363C:: @ 83A363C + .4byte gAnimCmd_83A2FA8 + +gAnimTable_83A3640:: @ 83A3640 + .4byte gAnimCmd_83A2FD8 + .4byte gAnimCmd_83A313C + .4byte gAnimCmd_83A3144 + .4byte gAnimCmd_83A3150 + .4byte gAnimCmd_83A315C + .4byte gAnimCmd_83A3170 + +gAnimTable_83A3658:: @ 83A3658 + .4byte gAnimCmd_83A2950 + .4byte gAnimCmd_83A3194 + +gAnimTable_83A3660:: @ 83A3660 + .4byte gAnimCmd_83A2950 + .4byte gAnimCmd_83A31A8 + +gAnimTable_83A3668:: @ 83A3668 + .4byte gAnimCmd_83A31BC + .4byte gAnimCmd_83A31D0 + .4byte gAnimCmd_83A31E4 + .4byte gAnimCmd_83A31F8 + .4byte gAnimCmd_83A320C + .4byte gAnimCmd_83A3220 + .4byte gAnimCmd_83A3234 + .4byte gAnimCmd_83A3248 + .4byte gAnimCmd_83A325C + .4byte gAnimCmd_83A3270 + .4byte gAnimCmd_83A3284 + .4byte gAnimCmd_83A3298 gUnknown_83A3698:: @ 83A3698 - .incbin "baserom.gba", 0x3A3698, 0x80 + .4byte gAnimTable_83A3318 + .byte 1, 3, 0, 2 + .4byte gAnimTable_83A3368 + .byte 1, 3, 0, 2 + .4byte gAnimTable_83A3470 + .byte 1, 3, 0, 2 + .4byte gAnimTable_83A34E4 + .byte 1, 3, 0, 2 + .4byte gAnimTable_83A3584 + .byte 1, 3, 0, 2 + .4byte gAnimTable_83A35E4 + .byte 1, 3, 0, 2 + .4byte gAnimTable_83A3668 + .byte 1, 3, 0, 2 + .4byte gAnimTable_83A3410 + .byte 3, 7, 0, 4 + .4byte 0x00000000, 0x00000000 + +gEventObjectBaseOam_128x64:: + .4byte 0x00000000, 0x00000800 + .4byte 0x00004000, 0x00000800 + +gEventObjectBaseOam_16x16:: + .4byte 0x40000000, 0x00000800 + +gEventObjectBaseOam_32x16:: + .4byte 0x80004000, 0x00000800 + .4byte 0x40004000, 0x00000800 + .4byte 0xc0004000, 0x00000800 + +gEventObjectBaseOam_16x32:: + .4byte 0x80008000, 0x00000800 gEventObjectBaseOam_32x32:: @ 83A3718 - .incbin "baserom.gba", 0x3A3718, 0x8 + .4byte 0x80000000, 0x00000800 + +gEventObjectBaseOam_64x64:: @ 83A3720 + .4byte 0xc0000000, 0x00000800 + +gSubsprites_83A3728:: @ 83A3728 + subsprite 248, 248, 2, 0x0000, 16x16 + +gSubsprites_83A372C:: @ 83A372C + subsprite 248, 248, 1, 0x0000, 16x16 + +gSubsprites_83A3730:: @ 83A3730 + subsprite 248, 248, 2, 0x0000, 16x8 + subsprite 248, 0, 3, 0x0002, 16x8 + +gSubsprites_83A3738:: @ 83A3738 + subsprite 248, 248, 2, 0x0000, 16x16 + subsprite 248, 248, 3, 0x0000, 16x16 + +gSubsprites_83A3740:: @ 83A3740 + subsprite 248, 248, 1, 0x0000, 16x16 + subsprite 248, 248, 3, 0x0000, 16x16 + +gSubspriteTables_83A3748:: @ 83A3748 + .byte 0 + .align 2 + .4byte NULL + .byte 1 + .align 2 + .4byte gSubsprites_83A3728 + .byte 1 + .align 2 + .4byte gSubsprites_83A372C + .byte 2 + .align 2 + .4byte gSubsprites_83A3730 + .byte 2 + .align 2 + .4byte gSubsprites_83A3738 + .byte 2 + .align 2 + .4byte gSubsprites_83A3740 + +gSubsprites_83A3778:: @ 83A3778 + subsprite 248, 240, 2, 0x0000, 16x32 + +gSubsprites_83A377C:: @ 83A377C + subsprite 248, 240, 1, 0x0000, 16x32 + +gSubsprites_83A3780:: @ 83A3780 + subsprite 248, 240, 2, 0x0000, 16x16 + subsprite 248, 0, 2, 0x0004, 16x8 + subsprite 248, 8, 3, 0x0006, 16x8 + +gSubsprites_83A378C:: @ 83A378C + subsprite 248, 240, 2, 0x0000, 16x16 + subsprite 248, 0, 3, 0x0004, 16x16 + +gSubsprites_83A3794:: @ 83A3794 + subsprite 248, 240, 1, 0x0000, 16x16 + subsprite 248, 0, 3, 0x0004, 16x16 -gUnknown_83A3720:: @ 83A3720 - .incbin "baserom.gba", 0x3A3720, 0x1a38 +gSubspriteTables_83A379C:: @ 83A379C + .byte 0 + .align 2 + .4byte NULL + .byte 1 + .align 2 + .4byte gSubsprites_83A3778 + .byte 1 + .align 2 + .4byte gSubsprites_83A377C + .byte 3 + .align 2 + .4byte gSubsprites_83A3780 + .byte 2 + .align 2 + .4byte gSubsprites_83A378C + .byte 2 + .align 2 + .4byte gSubsprites_83A3794 + +gSubsprites_83A37CC:: @ 83A37CC + subsprite 240, 240, 2, 0x0000, 32x32 + +gSubsprites_83A37D0:: @ 83A37D0 + subsprite 240, 240, 1, 0x0000, 32x32 + +gSubsprites_83A37D4:: @ 83A37D4 + subsprite 240, 240, 2, 0x0000, 32x16 + subsprite 240, 0, 2, 0x0008, 32x8 + subsprite 240, 8, 3, 0x000c, 32x8 + +gSubsprites_83A37E0:: @ 83A37E0 + subsprite 240, 240, 2, 0x0000, 32x16 + subsprite 240, 0, 3, 0x0008, 32x16 + +gSubsprites_83A37E8:: @ 83A37E8 + subsprite 240, 240, 1, 0x0000, 32x16 + subsprite 240, 0, 3, 0x0008, 32x16 + +gSubspriteTables_83A37F0:: @ 83A37F0 + .byte 0 + .align 2 + .4byte NULL + .byte 1 + .align 2 + .4byte gSubsprites_83A37CC + .byte 1 + .align 2 + .4byte gSubsprites_83A37D0 + .byte 3 + .align 2 + .4byte gSubsprites_83A37D4 + .byte 2 + .align 2 + .4byte gSubsprites_83A37E0 + .byte 2 + .align 2 + .4byte gSubsprites_83A37E8 + + .incbin "baserom.gba", 0x3a3820, 0xa0 + +gSubsprites_83A38C0:: @ 83A38C0 + subsprite 224, 224, 2, 0x0000, 64x64 + +gSubsprites_83A38C4:: @ 83A38C4 + subsprite 224, 224, 1, 0x0000, 64x64 + +gSubsprites_83A38C8:: @ 83A38C8 + subsprite 224, 224, 2, 0x0000, 64x64 + +gSubsprites_83A38CC:: @ 83A38CC + subsprite 224, 224, 2, 0x0000, 64x64 + +gSubspriteTables_83A38D0:: @ 83A38D0 + .byte 0 + .align 2 + .4byte NULL + .byte 1 + .align 2 + .4byte gSubsprites_83A38C0 + .byte 1 + .align 2 + .4byte gSubsprites_83A38C4 + .byte 1 + .align 2 + .4byte gSubsprites_83A38C8 + .byte 1 + .align 2 + .4byte gSubsprites_83A38CC + .byte 1 + .align 2 + .4byte gSubsprites_83A38CC + + .incbin "baserom.gba", 0x3a3900, 0x120 + +gSubsprites_83A3A20:: @ 83A3A20 + subsprite 224, 240, 2, 0x0000, 64x32 + subsprite 32, 240, 2, 0x0020, 64x32 + subsprite 224, 16, 2, 0x0040, 64x32 + subsprite 32, 16, 2, 0x0060, 64x32 + +gSubsprites_83A3A30:: @ 83A3A30 + subsprite 224, 240, 1, 0x0000, 64x32 + subsprite 32, 240, 1, 0x0020, 64x32 + subsprite 224, 16, 1, 0x0040, 64x32 + subsprite 32, 16, 1, 0x0060, 64x32 + +gSubsprites_83A3A40:: @ 83A3A40 + subsprite 224, 240, 1, 0x0000, 64x32 + subsprite 32, 240, 1, 0x0020, 64x32 + subsprite 224, 16, 2, 0x0040, 64x32 + subsprite 32, 16, 2, 0x0060, 64x32 + +gSubspriteTables_83A3A50:: @ 83A3A50 + .byte 4 + .align 2 + .4byte gSubsprites_83A3A20 + .byte 4 + .align 2 + .4byte gSubsprites_83A3A20 + .byte 4 + .align 2 + .4byte gSubsprites_83A3A30 + .byte 4 + .align 2 + .4byte gSubsprites_83A3A40 + .byte 4 + .align 2 + .4byte gSubsprites_83A3A40 + .byte 4 + .align 2 + .4byte gSubsprites_83A3A40 + + .incbin "baserom.gba", 0x3A3A80, 0x130 + +gMapObjectGraphicsInfo_83A3BB0:: @ 83A3BB0 + .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 16, 32 + .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3470 + .4byte gSpriteImages_83A00A0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3BD4:: @ 83A3BD4 + .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 + .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 2 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0140 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3BF8:: @ 83A3BF8 + .2byte 0xFFFF, 0x1100, 0x11FF, 0x100, 16, 32 + .byte 0 | (1 << 4) | (0 << 6) | (1 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3584 + .4byte gSpriteImages_83A0270 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3C1C:: @ 83A3C1C + .2byte 0xFFFF, 0x1100, 0x1102, 0x100, 16, 32 + .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3638 + .4byte gSpriteImages_83A0330 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3C40:: @ 83A3C40 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A04C0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3C64:: @ 83A3C64 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0420 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3C88:: @ 83A3C88 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0470 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3CAC:: @ 83A3CAC + .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0508 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3CD0:: @ 83A3CD0 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0550 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3CF4:: @ 83A3CF4 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A05A0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3D18:: @ 83A3D18 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A05E8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3D3C:: @ 83A3D3C + .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0638 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3D60:: @ 83A3D60 + .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 + .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0688 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3D84:: @ 83A3D84 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A06D8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3DA8:: @ 83A3DA8 + .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 + .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0C40 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3DCC:: @ 83A3DCC + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0720 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3DF0:: @ 83A3DF0 + .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 + .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0770 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3E14:: @ 83A3E14 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A07C0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3E38:: @ 83A3E38 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0808 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3E5C:: @ 83A3E5C + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0858 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3E80:: @ 83A3E80 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A08A8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3EA4:: @ 83A3EA4 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A08F8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3EC8:: @ 83A3EC8 + .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 + .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0940 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3EEC:: @ 83A3EEC + .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0988 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3F10:: @ 83A3F10 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A09D8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3F34:: @ 83A3F34 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0A20 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3F58:: @ 83A3F58 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0AB8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3F7C:: @ 83A3F7C + .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 + .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0B00 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3FA0:: @ 83A3FA0 + .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 + .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0B50 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3FC4:: @ 83A3FC4 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0BA0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A3FE8:: @ 83A3FE8 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0BF0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A400C:: @ 83A400C + .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0C90 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4030:: @ 83A4030 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0CE0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4054:: @ 83A4054 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0D30 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4078:: @ 83A4078 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0D78 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A409C:: @ 83A409C + .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 + .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0DC8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A40C0:: @ 83A40C0 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0E18 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A40E4:: @ 83A40E4 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0E68 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4108:: @ 83A4108 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0EB8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A412C:: @ 83A412C + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0F08 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4150:: @ 83A4150 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0F58 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4174:: @ 83A4174 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0FA8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4198:: @ 83A4198 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0FF8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A41BC:: @ 83A41BC + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1040 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A41E0:: @ 83A41E0 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1090 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4204:: @ 83A4204 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A10D8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4228:: @ 83A4228 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1120 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A424C:: @ 83A424C + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1170 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4270:: @ 83A4270 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A11C0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4294:: @ 83A4294 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1210 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A42B8:: @ 83A42B8 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 2 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1260 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A42DC:: @ 83A42DC + .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 2 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A12B0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4300:: @ 83A4300 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A35E4 + .4byte gSpriteImages_83A12F8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4324:: @ 83A4324 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1348 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4348:: @ 83A4348 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 + .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3314 + .4byte gSpriteImages_83A1390 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A436C:: @ 83A436C + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1398 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4390:: @ 83A4390 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A13E0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A43B4:: @ 83A43B4 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1430 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A43D8:: @ 83A43D8 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1480 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A43FC:: @ 83A43FC + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A14C8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4420:: @ 83A4420 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0A70 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4444:: @ 83A4444 + .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 + .byte 4 | (0 << 4) | (1 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3660 + .4byte gSpriteImages_83A1510 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4468:: @ 83A4468 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1530 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A448C:: @ 83A448C + .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 + .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1578 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A44B0:: @ 83A44B0 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A15C0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A44D4:: @ 83A44D4 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1608 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A44F8:: @ 83A44F8 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1650 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A451C:: @ 83A451C + .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 + .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3658 + .4byte gSpriteImages_83A1698 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4540:: @ 83A4540 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 + .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3314 + .4byte gSpriteImages_83A16B8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4564:: @ 83A4564 + .2byte 0xFFFF, 0x1110, 0x1102, 0x200, 16, 32 + .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3470 + .4byte gSpriteImages_83A0188 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4588:: @ 83A4588 + .2byte 0xFFFF, 0x1110, 0x1102, 0x200, 32, 32 + .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 2 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0228 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A45AC:: @ 83A45AC + .2byte 0xFFFF, 0x1110, 0x11FF, 0x100, 16, 32 + .byte 0 | (1 << 4) | (0 << 6) | (1 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3584 + .4byte gSpriteImages_83A02D0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A45D0:: @ 83A45D0 + .2byte 0xFFFF, 0x1110, 0x1102, 0x100, 16, 32 + .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3638 + .4byte gSpriteImages_83A0378 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A45F4:: @ 83A45F4 + .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 + .byte 10 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 2 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A0140 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4618:: @ 83A4618 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A16C0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A463C:: @ 83A463C + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1708 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4660:: @ 83A4660 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1750 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4684:: @ 83A4684 + .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 + .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1798 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A46A8:: @ 83A46A8 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A17E0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A46CC:: @ 83A46CC + .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 + .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1828 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A46F0:: @ 83A46F0 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1870 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4714:: @ 83A4714 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A18B8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4738:: @ 83A4738 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1900 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A475C:: @ 83A475C + .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1948 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4780:: @ 83A4780 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1990 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A47A4:: @ 83A47A4 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A19D8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A47C8:: @ 83A47C8 + .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 + .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1A20 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A47EC:: @ 83A47EC + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1A68 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4810:: @ 83A4810 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1AB0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4834:: @ 83A4834 + .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 + .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1AF8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4858:: @ 83A4858 + .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 + .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3668 + .4byte gSpriteImages_83A1B40 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A487C:: @ 83A487C + .2byte 0xFFFF, 0x1110, 0x1102, 0x200, 32, 32 + .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3668 + .4byte gSpriteImages_83A1BA0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A48A0:: @ 83A48A0 + .2byte 0xFFFF, 0x1100, 0x1102, 0x100, 16, 32 + .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A363C + .4byte gSpriteImages_83A0330 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A48C4:: @ 83A48C4 + .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 + .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3640 + .4byte gSpriteImages_83A03C0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A48E8:: @ 83A48E8 + .2byte 0xFFFF, 0x1100, 0x1102, 0x100, 16, 32 + .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A363C + .4byte gSpriteImages_83A0378 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A490C:: @ 83A490C + .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 + .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3640 + .4byte gSpriteImages_83A03F0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4930:: @ 83A4930 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 32, 16 + .byte 2 | (0 << 4) | (1 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_32x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3314 + .4byte gSpriteImages_83A1C00 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4954:: @ 83A4954 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (0 << 4) | (1 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3314 + .4byte gSpriteImages_83A1C08 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4978:: @ 83A4978 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1C10 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A499C:: @ 83A499C + .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1D38 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A49C0:: @ 83A49C0 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 + .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3314 + .4byte gSpriteImages_83A1C58 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A49E4:: @ 83A49E4 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (0 << 4) | (1 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3314 + .4byte gSpriteImages_83A1C60 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4A08:: @ 83A4A08 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (0 << 4) | (1 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3314 + .4byte gSpriteImages_83A1C68 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4A2C:: @ 83A4A2C + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (0 << 4) | (1 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3314 + .4byte gSpriteImages_83A1C70 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4A50:: @ 83A4A50 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 + .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3314 + .4byte gSpriteImages_83A1C78 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4A74:: @ 83A4A74 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 + .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3314 + .4byte gSpriteImages_83A1C80 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4A98:: @ 83A4A98 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 + .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3314 + .4byte gSpriteImages_83A1C88 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4ABC:: @ 83A4ABC + .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 + .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3314 + .4byte gSpriteImages_83A1C90 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4AE0:: @ 83A4AE0 + .2byte 0xFFFF, 0x1113, 0x11FF, 0x200, 32, 32 + .byte 10 | (0 << 4) | (1 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3314 + .4byte gSpriteImages_83A1C98 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4B04:: @ 83A4B04 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 + .byte 3 | (0 << 4) | (1 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3314 + .4byte gSpriteImages_83A1CA0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4B28:: @ 83A4B28 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1D80 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4B4C:: @ 83A4B4C + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1E10 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4B70:: @ 83A4B70 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1E58 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4B94:: @ 83A4B94 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1EA0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4BB8:: @ 83A4BB8 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1EE8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4BDC:: @ 83A4BDC + .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 + .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1F30 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4C00:: @ 83A4C00 + .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 + .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1F78 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4C24:: @ 83A4C24 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1FC0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4C48:: @ 83A4C48 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2008 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4C6C:: @ 83A4C6C + .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2050 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4C90:: @ 83A4C90 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2098 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4CB4:: @ 83A4CB4 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A20E0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4CD8:: @ 83A4CD8 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2128 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4CFC:: @ 83A4CFC + .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2170 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4D20:: @ 83A4D20 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A21B8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4D44:: @ 83A4D44 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2200 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4D68:: @ 83A4D68 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2248 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4D8C:: @ 83A4D8C + .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2290 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4DB0:: @ 83A4DB0 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A22D8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4DD4:: @ 83A4DD4 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2320 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4DF8:: @ 83A4DF8 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2368 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4E1C:: @ 83A4E1C + .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A23B0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4E40:: @ 83A4E40 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A23F8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4E64:: @ 83A4E64 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2440 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4E88:: @ 83A4E88 + .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 + .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2488 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4EAC:: @ 83A4EAC + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A24D0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4ED0:: @ 83A4ED0 + .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 + .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2518 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4EF4:: @ 83A4EF4 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2560 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4F18:: @ 83A4F18 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A25A8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4F3C:: @ 83A4F3C + .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_32x32 + .4byte gSubspriteTables_83A37F0 + .4byte gAnimTable_83A33BC + .4byte gSpriteImages_83A25F0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4F60:: @ 83A4F60 + .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 + .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2638 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4F84:: @ 83A4F84 + .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 + .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2680 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4FA8:: @ 83A4FA8 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2878 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4FCC:: @ 83A4FCC + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A28C0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A4FF0:: @ 83A4FF0 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A26C8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A5014:: @ 83A5014 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1DC8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A5038:: @ 83A5038 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2710 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A505C:: @ 83A505C + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2758 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A5080:: @ 83A5080 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A27A0 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A50A4:: @ 83A50A4 + .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A27E8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A50C8:: @ 83A50C8 + .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 + .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x16 + .4byte gSubspriteTables_83A3748 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2830 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A50EC:: @ 83A50EC + .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 + .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 1 + .align 2 + .4byte gEventObjectBaseOam_16x32 + .4byte gSubspriteTables_83A379C + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A2908 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A5110:: @ 83A5110 + .2byte 0xFFFF, 0x1114, 0x11FF, 0x800, 64, 64 + .byte 10 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_64x64 + .4byte gSubspriteTables_83A38D0 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1CA8 + .4byte gDummySpriteAffineAnimTable + +gMapObjectGraphicsInfo_83A5134:: @ 83A5134 + .2byte 0xFFFF, 0x1115, 0x11FF, 0x1000, 128, 64 + .byte 10 | (1 << 4) | (0 << 6) | (0 << 7) + .byte 0 + .align 2 + .4byte gEventObjectBaseOam_128x64 + .4byte gSubspriteTables_83A3A50 + .4byte gAnimTable_83A3368 + .4byte gSpriteImages_83A1CF0 + .4byte gDummySpriteAffineAnimTable gUnknown_83A5158:: @ 83A5158 .incbin "baserom.gba", 0x3A5158, 0xB0 diff --git a/data/graphics.s b/data/graphics.s index 721cc2a3e..9a7a19312 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -2589,7 +2589,7 @@ gFile_graphics_battle_anims_sprites_257_palette:: @ 8D2FB94 .align 2 gUnknown_8D2FBB4:: @ 8D2FBB4 - .incbin "baserom.gba", 0xD2FBB4, 0x20 + .incbin "graphics/interface/unk_8D2FBB4.gbapal" .align 2 gMonFrontPic_Bulbasaur:: @ 8D2FBD4 @@ -7724,7 +7724,7 @@ gMonIcon_Heracross:: @ 8DC21A0 .incbin "graphics/pokemon/heracross/icon.4bpp" gUnknown_heracross_icon:: @ 8DC25A0 - .incbin "baserom.gba", 0xDC25A0, 0x400 + .incbin "graphics/pokemon/heracross/unk_icon.4bpp" .align 2 gMonFootprint_Heracross:: @ 8DC29A0 @@ -13420,11 +13420,11 @@ gTrainerBackPic_RSMay:: @ 8E74EBC .incbin "graphics/trainers/back_pics/ruby_sapphire_may_back_pic.4bpp" .align 2 -gTrainerPalette_LeafBackPic:: @ 8E76EBC +gTrainerPalette_RedBackPic:: @ 8E76EBC .incbin "graphics/trainers/palettes/leaf_back_pic.gbapal.lz" .align 2 -gTrainerPalette_RedBackPic:: @ 8E76EE4 +gTrainerPalette_LeafBackPic:: @ 8E76EE4 .incbin "graphics/trainers/palettes/red_back_pic.gbapal.lz" .align 2 @@ -13936,13 +13936,13 @@ gUnknown_8E83604:: @ 8E83604 .incbin "baserom.gba", 0xE83604, 0x28 gUnknown_8E8362C:: @ 8E8362C - .incbin "baserom.gba", 0xE8362C, 0x790 + .incbin "graphics/interface/unk_8E8362C.4bpp.lz" gUnknown_8E83DBC:: @ 8E83DBC - .incbin "baserom.gba", 0xE83DBC, 0x7A4 + .incbin "graphics/interface/unk_8E83DBC.4bpp.lz" gUnknown_8E84560:: @ 8E84560 - .incbin "baserom.gba", 0xE84560, 0x28 + .incbin "graphics/interface/unk_8E84560.gbapal.lz" .align 2 gFile_graphics_interface_bag_swap_sheet:: @ 8E84588 diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 2f0942f7e..0b1685e5a 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -3620,7 +3620,7 @@ "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/map.bin" }, { - "id": "LAYOUT_UNUSED_LAYOUT_83453C0", + "id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2", "name": "UnusedLayout_83453C0_Layout", "width": 30, "height": 7, diff --git a/data/map_events.s b/data/map_events.s index 583802155..a36cd149f 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -10,6 +10,7 @@ #include "constants/vars.h" #include "constants/weather.h" @#include "constants/trainer_hill.h" +#include "constants/map_objects.h" .include "asm/macros.inc" .include "constants/constants.inc" .include "constants/item_data_constants.inc" diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 5ee37131f..8e78364f6 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "106", + "graphics_id": "MAP_OBJ_GFX_METEORITE", "x": 15, "y": 12, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "BirthIsland_Exterior_EventScript_165271", - "flag": "154" + "flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 15, "y": 3, "elevation": 3, @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "153" + "flag": "FLAG_HIDE_DEOXYS" } ], "warp_events": [ diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 136a57b6a..f23c73615 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -10,36 +10,36 @@ BirthIsland_Exterior_MapScript3_165213:: @ 8165213 BirthIsland_Exterior_MapScript1_165217:: @ 8165217 setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR - setvar VAR_0x4010, 150 - setvar VAR_SECRET_BASE_MAP, 0 - setvar VAR_ALTERING_CAVE_WILD_SET, 0 - checkflag FLAG_0x2E4 - call_if 1, EventScript_16523C - checkflag FLAG_0x2E4 - call_if 0, EventScript_165243 + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_DEOXYS_N + setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0 + setvar VAR_DEOXYS_INTERACTION_NUM, 0 + checkflag FLAG_FOUGHT_DEOXYS + call_if TRUE, EventScript_16523C + checkflag FLAG_FOUGHT_DEOXYS + call_if FALSE, EventScript_165243 end EventScript_16523C:: @ 816523C - setflag FLAG_0x099 - setflag FLAG_0x09A + setflag FLAG_HIDE_DEOXYS + setflag FLAG_HIDE_BIRTH_ISLAND_METEORITE return EventScript_165243:: @ 8165243 - checkflag FLAG_0x2F7 - goto_if_eq EventScript_1A77A9 - clearflag FLAG_0x09A - clearflag FLAG_0x848 + checkflag FLAG_DEOXYS_FLEW_AWAY + goto_if TRUE, EventScript_1A77A9 + clearflag FLAG_HIDE_BIRTH_ISLAND_METEORITE + clearflag FLAG_SYS_DEOXYS_AWAKENED return BirthIsland_Exterior_MapScript2_165253:: @ 8165253 - checkflag FLAG_0x807 - call_if 1, EventScript_16525D + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_16525D end EventScript_16525D:: @ 816525D - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + goto_if ne, EventScript_1A77A9 removeobject 2 return @@ -48,7 +48,7 @@ BirthIsland_Exterior_EventScript_165271:: @ 8165271 faceplayer special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 special sub_80CCDFC waitstate @@ -91,23 +91,23 @@ EventScript_1652C0:: @ 81652C0 setvar VAR_0x8005, 30 setvar VAR_0x8006, 0 special CreateObedientEnemyMon - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_807F9D8 waitstate - clearflag FLAG_0x807 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16533A - compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_165348 - compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_165348 - setflag FLAG_0x2E4 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_WON + goto_if eq, EventScript_16533A + compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + goto_if eq, EventScript_165348 + compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if eq, EventScript_165348 + setflag FLAG_FOUGHT_DEOXYS release end EventScript_16533A:: @ 816533A - setflag FLAG_0x2F7 + setflag FLAG_DEOXYS_FLEW_AWAY setvar VAR_0x8004, SPECIES_DEOXYS goto EventScript_1A9236 end diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index cecda6ec5..eed07d984 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index 487cae2f1..ea213a771 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -6,23 +6,7 @@ BirthIsland_Harbor_EventScript_1653E7:: @ 81653E7 faceplayer message Text_181726 waitmessage - setvar VAR_0x8004, 10 - multichoice 20, 8, 61, 0 - switch VAR_RESULT - case 0, EventScript_1A91D5 - case 1, EventScript_1A90F6 - case 127, EventScript_1A90F6 - end - -NavelRock_Harbor_MapScripts:: @ 8165420 - .byte 0 - -NavelRock_Harbor_EventScript_165421:: @ 8165421 - lock - faceplayer - message Text_181726 - waitmessage - setvar VAR_0x8004, 9 + setvar VAR_0x8004, SEAGALLOP_BIRTH_ISLAND multichoice 20, 8, 61, 0 switch VAR_RESULT case 0, EventScript_1A91D5 diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index f1133090e..0f323d993 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 48, "y": 15, "elevation": 3, @@ -35,10 +35,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_EventScript_166CFA", - "flag": "95" + "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 38, "y": 14, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "112", + "graphics_id": "MAP_OBJ_GFX_POLIWRATH", "x": 36, "y": 14, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 11, "y": 18, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 18, "y": 22, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 30, "y": 24, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 26, "y": 19, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 38, "y": 31, "elevation": 3, @@ -126,10 +126,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_EventScript_166D03", - "flag": "95" + "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 9, "y": 30, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 52, "y": 22, "elevation": 3, @@ -151,11 +151,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_1BDF13", - "flag": "20" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 40, "y": 35, "elevation": 0, @@ -164,11 +164,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_EventScript_1BDF13", - "flag": "19" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 25, "y": 10, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -204,10 +204,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_EventScript_1BEBC0", - "flag": "465" + "flag": "FLAG_HIDE_CELADON_CITY_ETHER" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 47, "y": 24, "elevation": 3, @@ -217,7 +217,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_EventScript_166D15", - "flag": "95" + "flag": "FLAG_HIDE_CELADON_ROCKETS" } ], "warp_events": [ @@ -377,8 +377,9 @@ "y": 20, "elevation": 3, "item": "ITEM_PP_UP", - "flag": "47", - "unknown": 1 + "flag": "HIDDEN_ITEM_CELADON_CITY_PP_UP", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index 9f7dc58c2..b5e32115f 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -77,9 +77,7 @@ CeladonCity_EventScript_166D27:: @ 8166D27 CeladonCity_EventScript_166D30:: @ 8166D30 lockall - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_ERIKA, 0 msgbox gUnknown_81801A2 releaseall end diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index cb315ade8..eed6a38a6 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "125", + "graphics_id": "MAP_OBJ_GFX_MEOWTH", "x": 1, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "113", + "graphics_id": "MAP_OBJ_GFX_CLEFAIRY", "x": 5, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "122", + "graphics_id": "MAP_OBJ_GFX_NIDORAN_F", "x": 5, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 2, "y": 9, "elevation": 3, diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index c9f358f44..fe1da2c67 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -4,17 +4,17 @@ CeladonCity_Condominiums_1F_MapScripts:: @ 816C320 CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321 lock faceplayer - checkflag FLAG_0x2F8 - goto_if_eq EventScript_16C36A - checkflag FLAG_0x82C - goto_if_eq EventScript_16C374 - checkflag FLAG_0x2A6 - goto_if_eq EventScript_16C36A + checkflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF + goto_if TRUE, EventScript_16C36A + checkflag FLAG_SYS_GAME_CLEAR + goto_if TRUE, EventScript_16C374 + checkflag FLAG_GOT_TEA + goto_if TRUE, EventScript_16C36A msgbox gUnknown_81960C9 - setflag FLAG_0x2A6 + setflag FLAG_GOT_TEA giveitem ITEM_TEA compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A6BF9 + goto_if eq, EventScript_1A6BF9 msgbox gUnknown_8196109 release end @@ -25,10 +25,8 @@ EventScript_16C36A:: @ 816C36A end EventScript_16C374:: @ 816C374 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars - setflag FLAG_0x2F8 + famechecker FAMECHECKER_DAISY, 4 + setflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF msgbox gUnknown_8196188 release end diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index e460de793..9f80e8e96 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D", - "flag": "158" + "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS" }, { "graphics_id": "0", @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D", - "flag": "158" + "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS" } ], "warp_events": [ diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 4a405c3f1..41561f349 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 0, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 3, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 4, "y": 10, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 0, "y": 13, "elevation": 3, diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index 990b7adb3..b69ad021a 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -18,7 +18,7 @@ CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6 faceplayer specialvar VAR_RESULT, HasAllKantoMons compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16C412 + goto_if eq, EventScript_16C412 msgbox gUnknown_8196356 release end @@ -33,7 +33,7 @@ EventScript_16C418:: @ 816C418 delay 60 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_80CA618 waitstate release diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index aee589439..b66f7bc8a 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 7, "y": 3, "elevation": 0, @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C46D", - "flag": "87" + "flag": "FLAG_HIDE_EEVEE_BALL" } ], "warp_events": [ diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 8e8bb2b6b..3ffdd24f6 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -11,11 +11,11 @@ CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D setvar VAR_0x4001, SPECIES_EEVEE givemon SPECIES_EEVEE, 25, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C4A6 + goto_if eq, EventScript_16C4A6 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16C4DA + goto_if eq, EventScript_16C4DA compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A927C + goto_if eq, EventScript_1A927C release end @@ -28,7 +28,7 @@ EventScript_16C4A6:: @ 816C4A6 getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C514 + goto_if eq, EventScript_16C514 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16C514 @@ -43,7 +43,7 @@ EventScript_16C4DA:: @ 816C4DA getspeciesname 0, SPECIES_EEVEE msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C509 + goto_if eq, EventScript_16C509 call EventScript_1A8C33 goto EventScript_16C509 end @@ -54,7 +54,7 @@ EventScript_16C509:: @ 816C509 end EventScript_16C514:: @ 816C514 - setflag FLAG_0x263 + setflag FLAG_GOT_EEVEE release end diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index 412eb4008..f40f5c2fe 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 6, "y": 10, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index 42d5c76f5..f5333e88a 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 5, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 1, "y": 8, "elevation": 0, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 1, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 11, "y": 6, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_DepartmentStore_2F_EventScript_1AD053", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index 8d859502e..0627bf3a0 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07 CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 @@ -44,7 +44,7 @@ Items_16BB38:: @ 816BB38 CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index 21780d544..3ac411820 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 10, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "51", + "graphics_id": "MAP_OBJ_GFX_GBA_KID", "x": 11, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "51", + "graphics_id": "MAP_OBJ_GFX_GBA_KID", "x": 4, "y": 9, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "51", + "graphics_id": "MAP_OBJ_GFX_GBA_KID", "x": 1, "y": 9, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 9, "y": 14, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 8598fbae4..e68119e01 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 6, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 10, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 3, "y": 13, "elevation": 0, diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index 2aad6e02b..84f290500 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01 CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 12e86270d..2c30cb8b5 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 11, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 6, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 1, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index 05aff00cd..66bc95b26 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -16,7 +16,7 @@ CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53 CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 @@ -42,7 +42,7 @@ Items_16BC84:: @ 816BC84 CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index 6f104041e..c4d07baff 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -4,9 +4,9 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152 CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153 lockall setvar VAR_0x8004, 3 - checkflag FLAG_0x002 - call_if 0, EventScript_1A7AB9 - copyvar VAR_0x8005, VAR_0x403A + checkflag FLAG_TEMP_2 + call_if FALSE, EventScript_1A7AB9 + copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special sub_80CB580 message Text_1A535C waitmessage @@ -61,50 +61,50 @@ EventScript_16C1F3:: @ 816C1F3 EventScript_16C246:: @ 816C246 setvar VAR_0x8006, 4 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1 - compare_var_to_value VAR_0x403A, 4 - goto_if_eq EventScript_16C30E + compare_var_to_value VAR_ELEVATOR_FLOOR, 4 + goto_if eq, EventScript_16C30E call EventScript_16C313 - setvar VAR_0x403A, 4 + setvar VAR_ELEVATOR_FLOOR, 4 goto EventScript_16C30E end EventScript_16C26E:: @ 816C26E setvar VAR_0x8006, 5 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1 - compare_var_to_value VAR_0x403A, 5 - goto_if_eq EventScript_16C30E + compare_var_to_value VAR_ELEVATOR_FLOOR, 5 + goto_if eq, EventScript_16C30E call EventScript_16C313 - setvar VAR_0x403A, 5 + setvar VAR_ELEVATOR_FLOOR, 5 goto EventScript_16C30E end EventScript_16C296:: @ 816C296 setvar VAR_0x8006, 6 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1 - compare_var_to_value VAR_0x403A, 6 - goto_if_eq EventScript_16C30E + compare_var_to_value VAR_ELEVATOR_FLOOR, 6 + goto_if eq, EventScript_16C30E call EventScript_16C313 - setvar VAR_0x403A, 6 + setvar VAR_ELEVATOR_FLOOR, 6 goto EventScript_16C30E end EventScript_16C2BE:: @ 816C2BE setvar VAR_0x8006, 7 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1 - compare_var_to_value VAR_0x403A, 7 - goto_if_eq EventScript_16C30E + compare_var_to_value VAR_ELEVATOR_FLOOR, 7 + goto_if eq, EventScript_16C30E call EventScript_16C313 - setvar VAR_0x403A, 7 + setvar VAR_ELEVATOR_FLOOR, 7 goto EventScript_16C30E end EventScript_16C2E6:: @ 816C2E6 setvar VAR_0x8006, 8 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1 - compare_var_to_value VAR_0x403A, 8 - goto_if_eq EventScript_16C30E + compare_var_to_value VAR_ELEVATOR_FLOOR, 8 + goto_if eq, EventScript_16C30E call EventScript_16C313 - setvar VAR_0x403A, 8 + setvar VAR_ELEVATOR_FLOOR, 8 goto EventScript_16C30E end @@ -119,5 +119,5 @@ EventScript_16C313:: @ 816C313 waitse special sub_80CB498 waitstate - setflag FLAG_0x002 + setflag FLAG_TEMP_2 return diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index fc4f32491..1d499c195 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 9, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 9bdd93dee..805775505 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -4,13 +4,13 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer call EventScript_16BCF6 compare_var_to_value VAR_0x4001, 0 - goto_if_eq EventScript_16C00E + goto_if eq, EventScript_16C00E goto EventScript_16BD3E end @@ -18,13 +18,13 @@ EventScript_16BCF6:: @ 816BCF6 setvar VAR_0x4001, 0 checkitem ITEM_FRESH_WATER, 1 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16BD2C + call_if eq, EventScript_16BD2C checkitem ITEM_SODA_POP, 1 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16BD32 + call_if eq, EventScript_16BD32 checkitem ITEM_LEMONADE, 1 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16BD38 + call_if eq, EventScript_16BD38 return EventScript_16BD2C:: @ 816BD2C @@ -42,7 +42,7 @@ EventScript_16BD38:: @ 816BD38 EventScript_16BD3E:: @ 816BD3E msgbox gUnknown_8195D22, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C00C + goto_if eq, EventScript_16C00C textcolor 3 message Text_195D5F waitmessage @@ -121,8 +121,8 @@ EventScript_16BED7:: @ 816BED7 EventScript_16BF19:: @ 816BF19 setvar VAR_0x8008, ITEM_FRESH_WATER setvar VAR_0x8009, ITEM_TM16 - checkflag FLAG_0x296 - goto_if_eq EventScript_16C018 + checkflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL + goto_if TRUE, EventScript_16C018 msgbox gUnknown_8195D75 goto EventScript_16BF7C end @@ -130,8 +130,8 @@ EventScript_16BF19:: @ 816BF19 EventScript_16BF3A:: @ 816BF3A setvar VAR_0x8008, ITEM_SODA_POP setvar VAR_0x8009, ITEM_TM20 - checkflag FLAG_0x295 - goto_if_eq EventScript_16C018 + checkflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL + goto_if TRUE, EventScript_16C018 msgbox gUnknown_8195E33 goto EventScript_16BF7C end @@ -139,8 +139,8 @@ EventScript_16BF3A:: @ 816BF3A EventScript_16BF5B:: @ 816BF5B setvar VAR_0x8008, ITEM_LEMONADE setvar VAR_0x8009, ITEM_TM33 - checkflag FLAG_0x294 - goto_if_eq EventScript_16C018 + checkflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL + goto_if TRUE, EventScript_16C018 msgbox gUnknown_8195EBF goto EventScript_16BF7C end @@ -151,7 +151,7 @@ EventScript_16BF7C:: @ 816BF7C removeitem VAR_0x8008, 1 checkitemspace VAR_0x8009, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C002 + goto_if eq, EventScript_16C002 additem VAR_0x8009, 1 textcolor 3 playfanfare MUS_FANFA1 @@ -161,26 +161,26 @@ EventScript_16BF7C:: @ 816BF7C giveitem VAR_0x8009, 1, 8 call EventScript_1A6675 compare_var_to_value VAR_0x8008, ITEM_FRESH_WATER - call_if 1, EventScript_16BFDE + call_if eq, EventScript_16BFDE compare_var_to_value VAR_0x8008, ITEM_SODA_POP - call_if 1, EventScript_16BFEA + call_if eq, EventScript_16BFEA compare_var_to_value VAR_0x8008, ITEM_LEMONADE - call_if 1, EventScript_16BFF6 + call_if eq, EventScript_16BFF6 release end EventScript_16BFDE:: @ 816BFDE - setflag FLAG_0x296 + setflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL msgbox gUnknown_8195DD4 return EventScript_16BFEA:: @ 816BFEA - setflag FLAG_0x295 + setflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL msgbox gUnknown_8195E68 return EventScript_16BFF6:: @ 816BFF6 - setflag FLAG_0x294 + setflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL msgbox gUnknown_8195EF4 return @@ -262,16 +262,16 @@ EventScript_16C0C4:: @ 816C0C4 EventScript_16C0CB:: @ 816C0CB compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C131 + goto_if eq, EventScript_16C131 checkitemspace VAR_0x4000, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C13F + goto_if eq, EventScript_16C13F compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16C0B6 + call_if eq, EventScript_16C0B6 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16C0BD + call_if eq, EventScript_16C0BD compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16C0C4 + call_if eq, EventScript_16C0C4 updatemoneybox 0, 0, 0 getitemname 0, VAR_0x4000 playse SE_JIHANKI diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 006c6ae0b..31a03a047 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 4, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 1, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 1, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 4, "y": 7, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 7, "y": 10, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 7, "y": 8, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 10, "y": 9, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 13, "y": 7, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 16, "y": 10, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 11, "y": 2, "elevation": 3, @@ -154,7 +154,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_GameCorner_EventScript_16CAF5", - "flag": "91" + "flag": "FLAG_HIDE_GAME_CORNER_ROCKET" } ], "warp_events": [ @@ -195,8 +195,9 @@ "y": 4, "elevation": 3, "item": "ITEM_NONE", - "flag": "51", - "unknown": 10 + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS", + "quantity": 10, + "underfoot": false }, { "type": "hidden_item", @@ -204,8 +205,9 @@ "y": 8, "elevation": 3, "item": "ITEM_NONE", - "flag": "52", - "unknown": 10 + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_2", + "quantity": 10, + "underfoot": false }, { "type": "hidden_item", @@ -213,8 +215,9 @@ "y": 11, "elevation": 3, "item": "ITEM_NONE", - "flag": "53", - "unknown": 20 + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_3", + "quantity": 20, + "underfoot": false }, { "type": "hidden_item", @@ -222,8 +225,9 @@ "y": 12, "elevation": 3, "item": "ITEM_NONE", - "flag": "54", - "unknown": 10 + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_4", + "quantity": 10, + "underfoot": false }, { "type": "hidden_item", @@ -231,8 +235,9 @@ "y": 9, "elevation": 3, "item": "ITEM_NONE", - "flag": "55", - "unknown": 10 + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_5", + "quantity": 10, + "underfoot": false }, { "type": "hidden_item", @@ -240,8 +245,9 @@ "y": 5, "elevation": 3, "item": "ITEM_NONE", - "flag": "56", - "unknown": 20 + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_6", + "quantity": 20, + "underfoot": false }, { "type": "hidden_item", @@ -249,8 +255,9 @@ "y": 4, "elevation": 3, "item": "ITEM_NONE", - "flag": "57", - "unknown": 10 + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_7", + "quantity": 10, + "underfoot": false }, { "type": "hidden_item", @@ -258,8 +265,9 @@ "y": 3, "elevation": 3, "item": "ITEM_NONE", - "flag": "58", - "unknown": 10 + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_8", + "quantity": 10, + "underfoot": false }, { "type": "hidden_item", @@ -267,8 +275,9 @@ "y": 5, "elevation": 3, "item": "ITEM_NONE", - "flag": "59", - "unknown": 10 + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_9", + "quantity": 10, + "underfoot": false }, { "type": "hidden_item", @@ -276,8 +285,9 @@ "y": 5, "elevation": 3, "item": "ITEM_NONE", - "flag": "60", - "unknown": 40 + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_10", + "quantity": 40, + "underfoot": false }, { "type": "hidden_item", @@ -285,8 +295,9 @@ "y": 13, "elevation": 3, "item": "ITEM_NONE", - "flag": "61", - "unknown": 100 + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_11", + "quantity": 100, + "underfoot": false }, { "type": "hidden_item", @@ -294,8 +305,9 @@ "y": 12, "elevation": 3, "item": "ITEM_NONE", - "flag": "62", - "unknown": 10 + "flag": "HIDDEN_ITEM_CELADON_CITY_GAME_CORNER_COINS_12", + "quantity": 10, + "underfoot": false }, { "type": "bg_event_type_4", diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 1ab7bcdf4..7a95e7bf7 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -3,8 +3,8 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646 .byte 0 CeladonCity_GameCorner_MapScript1_16C64C:: @ 816C64C - checkflag FLAG_0x26D - call_if 0, EventScript_16C656 + checkflag FLAG_OPENED_ROCKET_HIDEOUT + call_if FALSE, EventScript_16C656 end EventScript_16C656:: @ 816C656 @@ -22,7 +22,7 @@ CeladonCity_GameCorner_EventScript_16C684:: @ 816C684 CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer showmoneybox 0, 0, 0 @@ -40,20 +40,20 @@ CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D EventScript_16C6E6:: @ 816C6E6 checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16C790 + goto_if FALSE, EventScript_16C790 compare_var_to_value VAR_0x8009, 0 - goto_if_eq EventScript_16C734 + goto_if eq, EventScript_16C734 compare_var_to_value VAR_0x8009, 1 - goto_if_eq EventScript_16C706 + goto_if eq, EventScript_16C706 end EventScript_16C706:: @ 816C706 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9500 - goto_if 4, EventScript_16C79E + goto_if ge, EventScript_16C79E checkmoney 10000, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C7AC + goto_if eq, EventScript_16C7AC givecoins 500 takemoney 10000, 0 goto EventScript_16C762 @@ -62,10 +62,10 @@ EventScript_16C706:: @ 816C706 EventScript_16C734:: @ 816C734 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9950 - goto_if 4, EventScript_16C79E + goto_if ge, EventScript_16C79E checkmoney 1000, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C7AC + goto_if eq, EventScript_16C7AC givecoins 50 takemoney 1000, 0 goto EventScript_16C762 @@ -131,20 +131,20 @@ CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7 CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7 lock faceplayer - checkflag FLAG_0x26E - goto_if_eq EventScript_16C849 + checkflag FLAG_GOT_10_COINS_FROM_GAMBLER + goto_if TRUE, EventScript_16C849 msgbox gUnknown_8196AF3 checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16C839 + goto_if FALSE, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9990 - goto_if 4, EventScript_16C82B + goto_if ge, EventScript_16C82B givecoins 10 textcolor 3 msgbox gUnknown_8196B0D playse SE_SHOP waitse - setflag FLAG_0x26E + setflag FLAG_GOT_10_COINS_FROM_GAMBLER goto EventScript_16C7CA end @@ -167,8 +167,8 @@ EventScript_16C849:: @ 816C849 CeladonCity_GameCorner_EventScript_16C857:: @ 816C857 lock faceplayer - checkflag FLAG_0x4B3 - goto_if_eq EventScript_16C870 + checkflag FLAG_DEFEATED_ERIKA + goto_if TRUE, EventScript_16C870 msgbox gUnknown_8196BAD goto EventScript_16C7CA end @@ -195,20 +195,20 @@ CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E lock faceplayer - checkflag FLAG_0x26F - goto_if_eq EventScript_16C8F0 + checkflag FLAG_GOT_20_COINS_FROM_GAMBLER + goto_if TRUE, EventScript_16C8F0 msgbox gUnknown_8196D2B checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16C839 + goto_if FALSE, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9980 - goto_if 4, EventScript_16C8E2 + goto_if ge, EventScript_16C8E2 givecoins 20 textcolor 3 msgbox gUnknown_8196D47 playse SE_SHOP waitse - setflag FLAG_0x26F + setflag FLAG_GOT_20_COINS_FROM_GAMBLER goto EventScript_16C7CA end @@ -225,20 +225,20 @@ EventScript_16C8F0:: @ 816C8F0 CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE lock faceplayer - checkflag FLAG_0x270 - goto_if_eq EventScript_16C950 + checkflag FLAG_GOT_20_COINS_FROM_GAMBLER_2 + goto_if TRUE, EventScript_16C950 msgbox gUnknown_8196DB7 checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16C839 + goto_if FALSE, EventScript_16C839 checkcoins VAR_0x4001 compare_var_to_value VAR_0x4001, 9980 - goto_if 4, EventScript_16C942 + goto_if ge, EventScript_16C942 givecoins 20 textcolor 3 msgbox gUnknown_8196DF8 playse SE_SHOP waitse - setflag FLAG_0x270 + setflag FLAG_GOT_20_COINS_FROM_GAMBLER_2 goto EventScript_16C7CA end @@ -264,10 +264,10 @@ EventScript_16C96A:: @ 816C96A EventScript_16C96C:: @ 816C96C checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16CAA0 + goto_if FALSE, EventScript_16CAA0 msgbox gUnknown_8196F46, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16C96A + goto_if eq, EventScript_16C96A setfieldeffectarg 0, 255 setfieldeffectarg 1, 10 setfieldeffectarg 2, 14 @@ -412,8 +412,8 @@ EventScript_16CAA0:: @ 816CAA0 CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA lockall msgbox gUnknown_8196EDC - checkflag FLAG_0x26D - call_if 0, EventScript_16CABE + checkflag FLAG_OPENED_ROCKET_HIDEOUT + call_if FALSE, EventScript_16CABE releaseall end @@ -425,11 +425,11 @@ EventScript_16CABE:: @ 816CABE setmetatile 16, 3, 678, 1 setmetatile 17, 3, 679, 1 special DrawWholeMapView - setflag FLAG_0x26D + setflag FLAG_OPENED_ROCKET_HIDEOUT return CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 - trainerbattle 2, 357, 0, Text_196E69, Text_196E95, EventScript_16CB10 + trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_7, 0, Text_196E69, Text_196E95, EventScript_16CB10 msgbox gUnknown_8196E9B, 6 end @@ -437,9 +437,9 @@ EventScript_16CB10:: @ 816CB10 msgbox gUnknown_8196E9B closemessage compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16CB34 + call_if eq, EventScript_16CB34 compare_var_to_value VAR_FACING, 3 - call_if 5, EventScript_16CB3F + call_if ne, EventScript_16CB3F removeobject 11 release end diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index d4085c047..658ec5bd4 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 2, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 6, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 4, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 6, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 4a60c9814..70d9121eb 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -13,10 +13,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88 lock faceplayer checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16CD99 + goto_if FALSE, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CBB2 @@ -75,10 +75,10 @@ EventScript_16CC65:: @ 816CC65 getspeciesname 0, VAR_0x4001 msgbox gUnknown_819709D, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16CC10 + goto_if eq, EventScript_16CC10 checkcoins VAR_RESULT compare_var_to_var VAR_RESULT, VAR_0x4002 - goto_if 0, EventScript_16CDA5 + goto_if lt, EventScript_16CDA5 textcolor 3 switch VAR_0x4001 case SPECIES_ABRA, EventScript_16CCD4 @@ -121,11 +121,11 @@ EventScript_16CD3D:: @ 816CD3D EventScript_16CD52:: @ 816CD52 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16CDB3 + goto_if eq, EventScript_16CDB3 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16CDE0 + goto_if eq, EventScript_16CDE0 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_16CD74 + goto_if eq, EventScript_16CD74 end EventScript_16CD74:: @ 816CD74 @@ -164,7 +164,7 @@ EventScript_16CDB3:: @ 816CDB3 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16CD83 + goto_if eq, EventScript_16CD83 goto EventScript_16CC10 end @@ -178,7 +178,7 @@ EventScript_16CDE0:: @ 816CDE0 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16CE12 + goto_if eq, EventScript_16CE12 call EventScript_1A8C33 goto EventScript_16CE12 end @@ -192,10 +192,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D lock faceplayer checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16CD99 + goto_if FALSE, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CE47 @@ -253,7 +253,7 @@ EventScript_16CEF5:: @ 816CEF5 EventScript_16CF09:: @ 816CF09 msgbox gUnknown_81970B2, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16CC10 + goto_if eq, EventScript_16CC10 goto EventScript_16CF3F end @@ -261,7 +261,7 @@ EventScript_16CF22:: @ 816CF22 getitemname 0, VAR_0x4001 msgbox gUnknown_819709D, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16CC10 + goto_if eq, EventScript_16CC10 goto EventScript_16CF3F end @@ -269,10 +269,10 @@ EventScript_16CF3F:: @ 816CF3F getitemname 0, VAR_0x4001 checkcoins VAR_RESULT compare_var_to_var VAR_RESULT, VAR_0x4002 - goto_if 0, EventScript_16CDA5 + goto_if lt, EventScript_16CDA5 checkitemspace VAR_0x4001, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16CF79 + goto_if eq, EventScript_16CF79 takecoins VAR_0x4002 updatecoinsbox 0, 5 giveitem VAR_0x4001 @@ -290,10 +290,10 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88 lock faceplayer checkflag FLAG_GOT_COIN_CASE - goto_if 0, EventScript_16CD99 + goto_if FALSE, EventScript_16CD99 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 showcoinsbox 0, 0 msgbox gUnknown_8197057 goto EventScript_16CFB2 diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 15647d28f..539f0cb0d 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 3, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 9, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 10, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 2, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 5, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 7, "y": 4, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "83", + "graphics_id": "MAP_OBJ_GFX_ERIKA", "x": 6, "y": 4, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 8, "y": 7, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 6, "y": 8, "elevation": 3, @@ -127,11 +127,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Gym_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 3, "y": 5, "elevation": 3, @@ -140,11 +140,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Gym_EventScript_1BDF13", - "flag": "19" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 9, "y": 6, "elevation": 3, @@ -153,8 +153,8 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeladonCity_Gym_EventScript_1BDF13", - "flag": "20" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_14" } ], "warp_events": [ diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index 9131602c2..e0c5c4306 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -2,28 +2,21 @@ CeladonCity_Gym_MapScripts:: @ 816D060 .byte 0 CeladonCity_Gym_EventScript_16D061:: @ 816D061 - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 417, 0, Text_197114, Text_197260, EventScript_16D0A0 - checkflag FLAG_0x293 - goto_if 0, EventScript_16D0C6 - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + trainerbattle 1, TRAINER_LEADER_ERIKA, 0, Text_197114, Text_197260, EventScript_16D0A0 + checkflag FLAG_GOT_TM19_FROM_ERIKA + goto_if FALSE, EventScript_16D0C6 + famechecker FAMECHECKER_ERIKA, 4 msgbox gUnknown_81972B8 release end EventScript_16D0A0:: @ 816D0A0 - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - clearflag FLAG_0x09E - setflag FLAG_0x4B3 - setflag FLAG_0x823 - setvar VAR_0x8008, 4 - call EventScript_1A6B18 + famechecker FAMECHECKER_ERIKA, 1 + clearflag FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS + setflag FLAG_DEFEATED_ERIKA + setflag FLAG_BADGE04_GET + set_gym_trainers 4 goto EventScript_16D0C6 end @@ -31,14 +24,10 @@ EventScript_16D0C6:: @ 816D0C6 msgbox gUnknown_8197327 checkitemspace ITEM_TM19, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16D107 + goto_if eq, EventScript_16D107 additem ITEM_TM19, 1 - loadword 0, gUnknown_81973BA - setorcopyvar VAR_0x8000, ITEM_TM19 - setorcopyvar VAR_0x8001, 1 - setorcopyvar VAR_0x8002, MUS_FANFA1 - callstd 9 @ gStdScript_ItemMessageAndFanfare - setflag FLAG_0x293 + giveitemfanfaremsg gUnknown_81973BA, ITEM_TM19 + setflag FLAG_GOT_TM19_FROM_ERIKA msgbox gUnknown_81973D7 release end @@ -49,50 +38,46 @@ EventScript_16D107:: @ 816D107 end CeladonCity_Gym_EventScript_16D111:: @ 816D111 - trainerbattle 0, 132, 0, Text_19747C, Text_1974C4 + trainerbattle 0, TRAINER_LASS_KAY, 0, Text_19747C, Text_1974C4 msgbox gUnknown_81974D6, 6 end CeladonCity_Gym_EventScript_16D128:: @ 816D128 - trainerbattle 0, 133, 0, Text_1976C5, Text_1976FF - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + trainerbattle 0, TRAINER_LASS_LISA, 0, Text_1976C5, Text_1976FF + famechecker FAMECHECKER_ERIKA, 2 msgbox gUnknown_8197708, 6 end CeladonCity_Gym_EventScript_16D14C:: @ 816D14C - trainerbattle 0, 160, 0, Text_197595, Text_1975BB + trainerbattle 0, TRAINER_PICNICKER_TINA, 0, Text_197595, Text_1975BB msgbox gUnknown_81975D1, 6 end CeladonCity_Gym_EventScript_16D163:: @ 816D163 - trainerbattle 0, 265, 0, Text_1974FA, Text_19751C + trainerbattle 0, TRAINER_BEAUTY_BRIDGET, 0, Text_1974FA, Text_19751C msgbox gUnknown_8197527, 6 end CeladonCity_Gym_EventScript_16D17A:: @ 816D17A - trainerbattle 0, 266, 0, Text_19760B, Text_197660 - setvar VAR_0x8004, 5 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars + trainerbattle 0, TRAINER_BEAUTY_TAMIA, 0, Text_19760B, Text_197660 + famechecker FAMECHECKER_ERIKA, 3 msgbox gUnknown_8197664, 6 end CeladonCity_Gym_EventScript_16D19E:: @ 816D19E - trainerbattle 0, 267, 0, Text_197747, Text_19777A + trainerbattle 0, TRAINER_BEAUTY_LORI, 0, Text_197747, Text_19777A msgbox gUnknown_8197788, 6 end CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5 - trainerbattle 0, 402, 0, Text_1977E5, Text_197832 + trainerbattle 0, TRAINER_COOLTRAINER_MARY, 0, Text_1977E5, Text_197832 msgbox gUnknown_819783E, 6 end CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC lockall - checkflag FLAG_0x823 - goto_if_eq EventScript_16D1E0 + checkflag FLAG_BADGE04_GET + goto_if TRUE, EventScript_16D1E0 msgbox gUnknown_8197874 releaseall end diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index 0bb559faf..4d1d99203 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 5, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 3, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 9, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index 40d610292..ea37835d1 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 2, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 8, "y": 4, "elevation": 3, diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 57eee5a1d..c29be0604 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 10, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 12, "y": 5, "elevation": 3, diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index faa029c1f..e5bc26a2a 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeladonCity_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index 1abb5c5ae..1e96149ad 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 12, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 11, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 9, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 1, "y": 2, "elevation": 0, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 3, "y": 7, "elevation": 0, diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index 379d07271..82ecb417e 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -13,11 +13,11 @@ CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD lock faceplayer checkflag FLAG_GOT_COIN_CASE - goto_if_eq EventScript_16D24B + goto_if TRUE, EventScript_16D24B msgbox gUnknown_81979C1 checkitemspace ITEM_COIN_CASE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16D241 + goto_if eq, EventScript_16D241 additem ITEM_COIN_CASE, 1 giveitemfanfaremsg gUnknown_8197A38, ITEM_COIN_CASE setflag FLAG_GOT_COIN_CASE diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index 4479d1792..a2373d45c 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 7, "y": 3, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_1F_EventScript_1BEA47", - "flag": "434" + "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 16, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_1F_EventScript_1BEA54", - "flag": "435" + "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 25, "y": 5, "elevation": 4, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_1F_EventScript_1BEA3A", - "flag": "433" + "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 21, "elevation": 3, @@ -62,11 +62,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_1F_EventScript_1BE00C", - "flag": "18" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 21, "elevation": 3, @@ -75,11 +75,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_1F_EventScript_1BE00C", - "flag": "19" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 20, "elevation": 3, @@ -88,11 +88,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_1F_EventScript_1BE00C", - "flag": "20" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 14, "y": 20, "elevation": 3, @@ -101,11 +101,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_1F_EventScript_1BE00C", - "flag": "21" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_15" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 21, "elevation": 3, @@ -114,11 +114,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_1F_EventScript_1BE00C", - "flag": "22" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_16" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 18, "elevation": 3, @@ -127,8 +127,8 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_1F_EventScript_1BE00C", - "flag": "23" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_17" } ], "warp_events": [ @@ -196,9 +196,10 @@ "x": 12, "y": 2, "elevation": 3, - "item": "POCKET_KEY_ITEMS", - "flag": "39", - "unknown": 1 + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_CERULEAN_CAVE_1F_ULTRA_BALL", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index 73fd1877f..d52fa3da5 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 9, "y": 18, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_2F_EventScript_1BEA6E", - "flag": "437" + "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 29, "y": 16, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_2F_EventScript_1BEA7B", - "flag": "438" + "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 33, "y": 12, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_2F_EventScript_1BEA61", - "flag": "436" + "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 10, "elevation": 3, @@ -62,11 +62,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "18" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 9, "elevation": 3, @@ -75,11 +75,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "19" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 25, "y": 11, "elevation": 3, @@ -88,11 +88,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "20" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 28, "y": 20, "elevation": 3, @@ -101,11 +101,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "21" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_15" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 30, "y": 20, "elevation": 3, @@ -114,11 +114,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "22" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_16" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 13, "elevation": 3, @@ -127,11 +127,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "23" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_17" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 16, "elevation": 3, @@ -140,11 +140,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "24" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_18" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 6, "elevation": 3, @@ -153,11 +153,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "25" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_19" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 12, "elevation": 3, @@ -166,11 +166,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "26" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 20, "elevation": 3, @@ -179,8 +179,8 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_2F_EventScript_1BE00C", - "flag": "27" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_1B" } ], "warp_events": [ diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 8ad1ef685..9f93a9557 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 31, "y": 9, "elevation": 4, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_B1F_EventScript_1BEA95", - "flag": "440" + "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 32, "y": 2, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_B1F_EventScript_1BEA88", - "flag": "439" + "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE" }, { - "graphics_id": "139", + "graphics_id": "MAP_OBJ_GFX_MEWTWO", "x": 7, "y": 12, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCave_B1F_EventScript_1624F5", - "flag": "129" + "flag": "FLAG_HIDE_MEWTWO" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 37, "y": 1, "elevation": 3, @@ -62,11 +62,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "18" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 38, "y": 2, "elevation": 3, @@ -75,11 +75,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "19" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 35, "y": 1, "elevation": 3, @@ -88,11 +88,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "20" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 37, "y": 4, "elevation": 3, @@ -101,11 +101,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "21" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_15" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 35, "y": 5, "elevation": 3, @@ -114,11 +114,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "22" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_16" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 2, "y": 2, "elevation": 3, @@ -127,11 +127,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "23" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_17" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 1, "elevation": 3, @@ -140,11 +140,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "24" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_18" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 1, "elevation": 3, @@ -153,11 +153,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "25" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_19" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 4, "elevation": 3, @@ -166,8 +166,8 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCave_B1F_EventScript_1BE00C", - "flag": "26" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_1A" } ], "warp_events": [ diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index c12eaff5a..ad68f84bc 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -4,30 +4,30 @@ CeruleanCave_B1F_MapScripts:: @ 81624BE .byte 0 CeruleanCave_B1F_MapScript1_1624C9:: @ 81624C9 - checkflag FLAG_0x807 - call_if 1, EventScript_1624D3 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_1624D3 end EventScript_1624D3:: @ 81624D3 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return CeruleanCave_B1F_MapScript2_1624E7:: @ 81624E7 - checkflag FLAG_0x2BC - call_if 0, EventScript_1624F1 + checkflag FLAG_FOUGHT_MEWTWO + call_if FALSE, EventScript_1624F1 end EventScript_1624F1:: @ 81624F1 - clearflag FLAG_0x081 + clearflag FLAG_HIDE_MEWTWO return CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -40,23 +40,23 @@ CeruleanCave_B1F_EventScript_1624F5:: @ 81624F5 playbgm MUS_EXEYE, 0 waitbuttonpress setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_807F9D8 waitstate - clearflag FLAG_0x807 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_162558 - compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_162561 - compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_162561 - setflag FLAG_0x2BC + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_WON + goto_if eq, EventScript_162558 + compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + goto_if eq, EventScript_162561 + compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if eq, EventScript_162561 + setflag FLAG_FOUGHT_MEWTWO release end EventScript_162558:: @ 8162558 - setflag FLAG_0x2BC + setflag FLAG_FOUGHT_MEWTWO goto EventScript_1A922D EventScript_162560:: @ 8162560 diff --git a/data/maps/CeruleanCity/events_bad.inc b/data/maps/CeruleanCity/events_bad.inc deleted file mode 100644 index f523a18d5..000000000 --- a/data/maps/CeruleanCity/events_bad.inc +++ /dev/null @@ -1,43 +0,0 @@ -CeruleanCity_EventObjects: - object_event 1, 60, 0, 31, 0, 12, 0, 3, 8, 17, 0, 0, 0 - object_event 2, 49, 0, 33, 0, 6, 0, 3, 1, 17, 0, 0, 0 - object_event 3, 16, 0, 16, 0, 21, 0, 3, 3, 49, 0, 0, 0 - object_event 4, 30, 0, 9, 0, 23, 0, 3, 2, 17, 0, 0, 0 - object_event 5, 129, 0, 32, 0, 29, 0, 3, 8, 17, 0, 0, 0 - object_event 6, 22, 0, 33, 0, 29, 0, 3, 9, 17, 0, 0, 0 - object_event 7, 18, 0, 34, 0, 22, 0, 3, 8, 17, 0, 0, 0 - object_event 8, 72, 0, 22, 0, 0, 0, 3, 8, 17, 0, 0, 0 - object_event 9, 95, 0, 26, 0, 32, 0, 3, 8, 17, 0, 0, 0 - object_event 10, 65375, 0, 50, 0, 18, 0, 10, 0, 0, 0, 27, 0 - object_event 11, 23, 0, 12, 0, 30, 0, 3, 7, 17, 0, 0, 0 - object_event 12, 41, 0, 1, 0, 13, 0, 3, 8, 17, 0, 0, 0 - -CeruleanCity_MapWarps: - warp_def 10, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE1 - warp_def 30, 11, 0, 1, MAP_CERULEAN_CITY_HOUSE2 - warp_def 15, 17, 0, 1, MAP_CERULEAN_CITY_HOUSE3 - warp_def 22, 19, 0, 1, MAP_CERULEAN_CITY_POKEMONCENTER_1F - warp_def 31, 21, 0, 1, MAP_CERULEAN_CITY_GYM - warp_def 13, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP - warp_def 29, 28, 0, 1, MAP_CERULEAN_CITY_MART - warp_def 1, 12, 0, 0, MAP_CERULEAN_CAVE_1F - warp_def 10, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE1 - warp_def 31, 8, 3, 3, MAP_CERULEAN_CITY_HOUSE2 - warp_def 31, 9, 3, 3, MAP_CERULEAN_CITY_HOUSE2 - warp_def 14, 28, 3, 1, MAP_CERULEAN_CITY_BIKESHOP - warp_def 23, 28, 0, 0, MAP_CERULEAN_CITY_HOUSE4 - warp_def 17, 11, 0, 0, MAP_CERULEAN_CITY_HOUSE5 - -CeruleanCity_MapCoordEvents: - coord_event 22, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_16649A - coord_event 23, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664A6 - coord_event 24, 6, 3, VAR_0x4052, , CeruleanCity_EventScript_1664B9 - coord_event 33, 5, 3, VAR_0x407D, , CeruleanCity_EventScript_166683 - coord_event 33, 7, 3, VAR_0x407D, , CeruleanCity_EventScript_1666A3 - -CeruleanCity_MapBGEvents: - bg_hidden_item_event 18, 7, 3, ITEM_RARE_CANDY, - -CeruleanCity_MapEvents:: - map_events CeruleanCity_EventObjects, CeruleanCity_MapWarps, CeruleanCity_MapCoordEvents, CeruleanCity_MapBGEvents - diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index a387eeb28..f3fcae4ab 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -35,7 +35,7 @@ ], "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 31, "y": 12, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 33, "y": 6, "elevation": 3, @@ -58,10 +58,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCity_EventScript_166603", - "flag": "59" + "flag": "FLAG_HIDE_CERULEAN_ROCKET" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 16, "y": 21, "elevation": 3, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 9, "y": 23, "elevation": 3, @@ -87,7 +87,7 @@ "flag": "0" }, { - "graphics_id": "129", + "graphics_id": "MAP_OBJ_GFX_SLOWBRO", "x": 32, "y": 29, "elevation": 3, @@ -100,7 +100,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 33, "y": 29, "elevation": 3, @@ -113,7 +113,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 34, "y": 22, "elevation": 3, @@ -126,7 +126,7 @@ "flag": "0" }, { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 22, "y": 0, "elevation": 3, @@ -136,10 +136,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "60" + "flag": "FLAG_HIDE_CERULEAN_RIVAL" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 26, "y": 32, "elevation": 3, @@ -148,8 +148,8 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "CeruleanCity_EventScript_1BDF13", - "flag": "19" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_13" }, { "graphics_id": "65375", @@ -165,7 +165,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 12, "y": 30, "elevation": 3, @@ -178,7 +178,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 1, "y": 13, "elevation": 3, @@ -188,7 +188,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCity_EventScript_16672F", - "flag": "92" + "flag": "FLAG_HIDE_CERULEAN_CAVE_GUARD" } ], "warp_events": [ @@ -297,7 +297,7 @@ "x": 22, "y": 6, "elevation": 3, - "var": "VAR_0x4052", + "var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL", "var_value": 0, "script": "CeruleanCity_EventScript_16649A" }, @@ -306,7 +306,7 @@ "x": 23, "y": 6, "elevation": 3, - "var": "VAR_0x4052", + "var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL", "var_value": 0, "script": "CeruleanCity_EventScript_1664A6" }, @@ -315,7 +315,7 @@ "x": 24, "y": 6, "elevation": 3, - "var": "VAR_0x4052", + "var": "VAR_MAP_SCENE_CERULEAN_CITY_RIVAL", "var_value": 0, "script": "CeruleanCity_EventScript_1664B9" }, @@ -324,7 +324,7 @@ "x": 33, "y": 5, "elevation": 3, - "var": "VAR_0x407D", + "var": "VAR_MAP_SCENE_CERULEAN_CITY_ROCKET", "var_value": 0, "script": "CeruleanCity_EventScript_166683" }, @@ -333,7 +333,7 @@ "x": 33, "y": 7, "elevation": 3, - "var": "VAR_0x407D", + "var": "VAR_MAP_SCENE_CERULEAN_CITY_ROCKET", "var_value": 0, "script": "CeruleanCity_EventScript_1666A3" } @@ -373,8 +373,9 @@ "y": 7, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "49", - "unknown": 1 + "flag": "HIDDEN_ITEM_CERULEAN_CITY_RARE_CANDY", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 658d2a393..588df6ccd 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -4,8 +4,8 @@ CeruleanCity_MapScripts:: @ 8166471 CeruleanCity_MapScript1_166477:: @ 8166477 setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY - checkflag FLAG_0x234 - call_if 0, EventScript_166484 + checkflag FLAG_GOT_SS_TICKET + call_if FALSE, EventScript_166484 end EventScript_166484:: @ 8166484 @@ -36,7 +36,7 @@ CeruleanCity_EventScript_1664B9:: @ 81664B9 EventScript_1664CC:: @ 81664CC textcolor 0 - setvar VAR_0x4054, 2 + setvar VAR_MAP_SCENE_ROUTE22, 2 playbgm MUS_RIVAL1, 0 addobject 8 applymovement 8, Movement_1665D3 @@ -44,26 +44,24 @@ EventScript_1664CC:: @ 81664CC msgbox gUnknown_817EAD7 setvar VAR_LAST_TALKED, 8 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_166582 + call_if eq, EventScript_166582 compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_16658D + call_if eq, EventScript_16658D compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_166598 - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars + call_if eq, EventScript_166598 + famechecker FAMECHECKER_BILL, 0 msgbox gUnknown_817EB95 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1665A3 + call_if eq, EventScript_1665A3 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1665A3 + call_if eq, EventScript_1665A3 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1665B5 + call_if eq, EventScript_1665B5 msgbox gUnknown_817ECD4 - setvar VAR_0x4052, 1 - setflag FLAG_0x29B + setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 + setflag FLAG_GOT_FAME_CHECKER giveitem ITEM_FAME_CHECKER msgbox gUnknown_817ED5D closemessage @@ -75,15 +73,15 @@ EventScript_1664CC:: @ 81664CC end EventScript_166582:: @ 8166582 - trainerbattle 3, 332, 0, Text_17EB71 + trainerbattle 3, TRAINER_RIVAL_CERULEAN_SQUIRTLE, 0, Text_17EB71 return EventScript_16658D:: @ 816658D - trainerbattle 3, 333, 0, Text_17EB71 + trainerbattle 3, TRAINER_RIVAL_CERULEAN_BULBASAUR, 0, Text_17EB71 return EventScript_166598:: @ 8166598 - trainerbattle 3, 334, 0, Text_17EB71 + trainerbattle 3, TRAINER_RIVAL_CERULEAN_CHARMANDER, 0, Text_17EB71 return EventScript_1665A3:: @ 81665A3 @@ -173,14 +171,14 @@ Movement_1665FB:: @ 81665FB CeruleanCity_EventScript_166603:: @ 8166603 lock faceplayer - checktrainerflag FLAG_0x163 - goto_if_eq EventScript_16662E + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_5 + goto_if eq, EventScript_16662E message Text_17EE0E waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress - trainerbattle 3, 355, 0, Text_17EE70 - setvar VAR_0x407D, 1 + trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70 + setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 goto EventScript_16662E end @@ -188,7 +186,7 @@ EventScript_16662E:: @ 816662E msgbox gUnknown_817EE9C checkitemspace ITEM_TM28, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_166677 + goto_if eq, EventScript_166677 additem ITEM_TM28, 1 giveitemfanfaremsg gUnknown_817EEBF, ITEM_TM28 msgbox gUnknown_817EEED @@ -196,7 +194,7 @@ EventScript_16662E:: @ 816662E fadescreen 1 removeobject 2 fadescreen 0 - setflag FLAG_0x23F + setflag FLAG_GOT_TM28_FROM_ROCKET release end @@ -230,8 +228,8 @@ EventScript_1666C3:: @ 81666C3 textcolor 0 msgbox Text_17EE0E setvar VAR_LAST_TALKED, 2 - trainerbattle 3, 355, 0, Text_17EE70 - setvar VAR_0x407D, 1 + trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_5, 0, Text_17EE70 + setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 goto EventScript_16662E end @@ -248,8 +246,8 @@ CeruleanCity_EventScript_1666E7:: @ 81666E7 CeruleanCity_EventScript_1666FE:: @ 81666FE lock faceplayer - checkflag FLAG_0x234 - goto_if_eq EventScript_166713 + checkflag FLAG_GOT_SS_TICKET + goto_if TRUE, EventScript_166713 msgbox gUnknown_817F01D release end @@ -286,11 +284,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F random 3 copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_1667B0 + call_if eq, EventScript_1667B0 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_1667B6 + call_if eq, EventScript_1667B6 compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_1667BC + call_if eq, EventScript_1667BC waitmessage delay 40 playse SE_PIN @@ -298,11 +296,11 @@ CeruleanCity_EventScript_16674F:: @ 816674F waitmovement 0 delay 30 compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_1667C2 + call_if eq, EventScript_1667C2 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_1667CB + call_if eq, EventScript_1667CB compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_1667D4 + call_if eq, EventScript_1667D4 release end @@ -335,13 +333,13 @@ CeruleanCity_EventScript_1667DD:: @ 81667DD random 4 copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_166814 + call_if eq, EventScript_166814 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_16681D + call_if eq, EventScript_16681D compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_166826 + call_if eq, EventScript_166826 compare_var_to_value VAR_0x8008, 3 - call_if 1, EventScript_16682F + call_if eq, EventScript_16682F release end @@ -375,9 +373,7 @@ CeruleanCity_EventScript_16684A:: @ 816684A CeruleanCity_EventScript_166853:: @ 8166853 lockall - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_MISTY, 0 msgbox gUnknown_817F4EF releaseall end diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index 0f56bc949..34b8b351a 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 9, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 9, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index df14fb201..1091e75cb 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -4,10 +4,10 @@ CeruleanCity_BikeShop_MapScripts:: @ 816ABBC CeruleanCity_BikeShop_EventScript_16ABBD:: @ 816ABBD lock faceplayer - checkflag FLAG_0x271 - goto_if_eq EventScript_16AC58 - checkflag FLAG_0x241 - goto_if_eq EventScript_16AC22 + checkflag FLAG_GOT_BICYCLE + goto_if TRUE, EventScript_16AC58 + checkflag FLAG_GOT_BIKE_VOUCHER + goto_if TRUE, EventScript_16AC22 showmoneybox 0, 0, 0 message Text_192755 waitmessage @@ -34,7 +34,7 @@ EventScript_16AC15:: @ 816AC15 EventScript_16AC22:: @ 816AC22 msgbox gUnknown_81927B2 giveitemfanfaremsg gUnknown_81927E1, ITEM_BICYCLE, 1, MUS_FAN5 - setflag FLAG_0x271 + setflag FLAG_GOT_BICYCLE additem ITEM_BICYCLE, 1 removeitem ITEM_BIKE_VOUCHER, 1 msgbox gUnknown_819280E @@ -58,8 +58,8 @@ CeruleanCity_BikeShop_EventScript_16AC6C:: @ 816AC6C CeruleanCity_BikeShop_EventScript_16AC75:: @ 816AC75 lock faceplayer - checkflag FLAG_0x271 - goto_if_eq EventScript_16AC8A + checkflag FLAG_GOT_BICYCLE + goto_if TRUE, EventScript_16AC8A msgbox gUnknown_8192937 release end diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index ad41f1e70..6cf69cf3e 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 10, "y": 12, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 4, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "81", + "graphics_id": "MAP_OBJ_GFX_MISTY", "x": 8, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 7, "y": 16, "elevation": 3, diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index d8fe70407..c53c9718b 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -2,25 +2,20 @@ CeruleanCity_Gym_MapScripts:: @ 816AAA0 .byte 0 CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 415, 0, Text_1921EF, Text_19242D, EventScript_16AAD3 - checkflag FLAG_0x297 - goto_if 0, EventScript_16AAF9 + famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + trainerbattle 1, TRAINER_LEADER_MISTY, 0, Text_1921EF, Text_19242D, EventScript_16AAD3 + checkflag FLAG_GOT_TM03_FROM_MISTY + goto_if FALSE, EventScript_16AAF9 msgbox gUnknown_81922BF release end EventScript_16AAD3:: @ 816AAD3 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - setflag FLAG_0x4B1 - setflag FLAG_0x821 + famechecker FAMECHECKER_MISTY, 1 + setflag FLAG_DEFEATED_MISTY + setflag FLAG_BADGE02_GET setrespawn SPAWN_CERULEAN_CITY - setvar VAR_0x8008, 2 - call EventScript_1A6B18 + set_gym_trainers 2 goto EventScript_16AAF9 end @@ -28,10 +23,10 @@ EventScript_16AAF9:: @ 816AAF9 msgbox gUnknown_81922F7 checkitemspace ITEM_TM03, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16AB3A + goto_if eq, EventScript_16AB3A additem ITEM_TM03, 1 giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03 - setflag FLAG_0x297 + setflag FLAG_GOT_TM03_FROM_MISTY msgbox gUnknown_81922BF release end @@ -42,23 +37,21 @@ EventScript_16AB3A:: @ 816AB3A end CeruleanCity_Gym_EventScript_16AB44:: @ 816AB44 - trainerbattle 0, 150, 0, Text_192481, Text_1924D0 + trainerbattle 0, TRAINER_PICNICKER_DIANA, 0, Text_192481, Text_1924D0 msgbox gUnknown_81924E4, 6 end CeruleanCity_Gym_EventScript_16AB5B:: @ 816AB5B - trainerbattle 0, 234, 0, Text_192524, Text_192547 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + trainerbattle 0, TRAINER_SWIMMER_MALE_LUIS, 0, Text_192524, Text_192547 + famechecker FAMECHECKER_MISTY, 2 msgbox gUnknown_8192556, 6 end CeruleanCity_Gym_EventScript_16AB7F:: @ 816AB7F lock faceplayer - checkflag FLAG_0x4B1 - goto_if_eq EventScript_16AB94 + checkflag FLAG_DEFEATED_MISTY + goto_if TRUE, EventScript_16AB94 msgbox gUnknown_81925AC release end @@ -70,8 +63,8 @@ EventScript_16AB94:: @ 816AB94 CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E lockall - checkflag FLAG_0x821 - goto_if_eq EventScript_16ABB2 + checkflag FLAG_BADGE02_GET + goto_if TRUE, EventScript_16ABB2 msgbox gUnknown_81926E1 releaseall end diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index 51f0db0ca..9326a9234 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index 6865c93a0..44fcd2b45 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 1, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 7, "y": 6, "elevation": 3, diff --git a/data/maps/CeruleanCity_House2/scripts.inc b/data/maps/CeruleanCity_House2/scripts.inc index 092e7d1a6..bdd52e3b0 100644 --- a/data/maps/CeruleanCity_House2/scripts.inc +++ b/data/maps/CeruleanCity_House2/scripts.inc @@ -4,8 +4,8 @@ CeruleanCity_House2_MapScripts:: @ 816A975 CeruleanCity_House2_EventScript_16A976:: @ 816A976 lock faceplayer - checkflag FLAG_0x23F - goto_if_eq EventScript_16A98B + checkflag FLAG_GOT_TM28_FROM_ROCKET + goto_if TRUE, EventScript_16A98B msgbox gUnknown_8191E13 release end diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index 829ae2084..c1ce74bf3 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 2, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index 5bcdb0bea..36ce99bdb 100644 --- a/data/maps/CeruleanCity_House3/scripts.inc +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -10,20 +10,20 @@ CeruleanCity_House3_EventScript_16A9B1:: @ 816A9B1 faceplayer setvar VAR_0x8008, 1 call EventScript_1A8CAD - checkflag FLAG_0x24A - goto_if_eq EventScript_16AA23 + checkflag FLAG_DID_ZYNX_TRADE + goto_if TRUE, EventScript_16AA23 msgbox gUnknown_81A59FE, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16AA0B + goto_if eq, EventScript_16AA0B call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16AA0B + goto_if ge, EventScript_16AA0B call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16AA15 + goto_if ne, EventScript_16AA15 call EventScript_1A8CD9 msgbox gUnknown_81A5A9D - setflag FLAG_0x24A + setflag FLAG_DID_ZYNX_TRADE release end diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index ee56f7d91..13ef69f13 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index bbc762b3f..afbb35c5f 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -4,83 +4,83 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE CeruleanCity_House4_EventScript_16ACEF:: @ 816ACEF special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock - specialvar VAR_0x8004, sub_8146CE8 + specialvar VAR_0x8004, Special_GetMENewsJisanItemAndState copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8004, 0 - goto_if_eq EventScript_16AD59 + goto_if eq, EventScript_CeruleanCity_House4_NoNews compare_var_to_value VAR_0x8004, 1 - goto_if_eq EventScript_16AD63 + goto_if eq, EventScript_CeruleanCity_House4_News1 compare_var_to_value VAR_0x8004, 2 - goto_if_eq EventScript_16AD89 + goto_if eq, EventScript_CeruleanCity_House4_News2 compare_var_to_value VAR_0x8004, 3 - goto_if_eq EventScript_16ADAF + goto_if eq, EventScript_CeruleanCity_House4_NewsNotSpread compare_var_to_value VAR_0x8004, 4 - goto_if_eq EventScript_16ADC3 + goto_if eq, EventScript_CeruleanCity_House4_NewsSpread1 compare_var_to_value VAR_0x8004, 5 - goto_if_eq EventScript_16ADE9 + goto_if eq, EventScript_CeruleanCity_House4_NewsSpread2 compare_var_to_value VAR_0x8004, 6 - goto_if_eq EventScript_16AE0F + goto_if eq, EventScript_CeruleanCity_House4_NewsDone end -EventScript_16AD59:: @ 816AD59 +EventScript_CeruleanCity_House4_NoNews:: @ 816AD59 msgbox gUnknown_8192AF0 release end -EventScript_16AD63:: @ 816AD63 - call EventScript_16AE23 +EventScript_CeruleanCity_House4_News1:: @ 816AD63 + call EventScript_CeruleanCity_House4_MovementReactionToNews msgbox gUnknown_8192B43 giveitem VAR_0x8008 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16AE45 + goto_if eq, EventScript_16AE45 release end -EventScript_16AD89:: @ 816AD89 - call EventScript_16AE23 +EventScript_CeruleanCity_House4_News2:: @ 816AD89 + call EventScript_CeruleanCity_House4_MovementReactionToNews msgbox gUnknown_8192C07 giveitem VAR_0x8008, 4 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16AE45 + goto_if eq, EventScript_16AE45 release end -EventScript_16ADAF:: @ 816ADAF +EventScript_CeruleanCity_House4_NewsNotSpread:: @ 816ADAF applymovement 1, Movement_1A75E1 waitmovement 0 msgbox gUnknown_8192CD5 release end -EventScript_16ADC3:: @ 816ADC3 - call EventScript_16AE23 +EventScript_CeruleanCity_House4_NewsSpread1:: @ 816ADC3 + call EventScript_CeruleanCity_House4_MovementReactionToNews msgbox gUnknown_8192D4B giveitem VAR_0x8008 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16AE45 + goto_if eq, EventScript_16AE45 release end -EventScript_16ADE9:: @ 816ADE9 - call EventScript_16AE23 +EventScript_CeruleanCity_House4_NewsSpread2:: @ 816ADE9 + call EventScript_CeruleanCity_House4_MovementReactionToNews msgbox gUnknown_8192DE3 giveitem VAR_0x8008, 4 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16AE45 + goto_if eq, EventScript_16AE45 release end -EventScript_16AE0F:: @ 816AE0F +EventScript_CeruleanCity_House4_NewsDone:: @ 816AE0F applymovement 1, Movement_1A75E1 waitmovement 0 msgbox gUnknown_8192EC5 release end -EventScript_16AE23:: @ 816AE23 +EventScript_CeruleanCity_House4_MovementReactionToNews:: @ 816AE23 playse SE_PIN applymovement 1, Movement_1A75DB waitmovement 0 diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index 489ae791f..9feb1ced4 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index d7d3e0222..1f5d8899a 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -4,18 +4,18 @@ CeruleanCity_House5_MapScripts:: @ 816AE4F CeruleanCity_House5_EventScript_16AE50:: @ 816AE50 lock faceplayer - checkflag FLAG_0x2BB - goto_if_eq EventScript_16AEB7 + checkflag FLAG_GOT_POWDER_JAR + goto_if TRUE, EventScript_16AEB7 msgbox gUnknown_8192F67, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16AEAD - checkflag FLAG_0x847 - goto_if 0, EventScript_16AEA3 + goto_if eq, EventScript_16AEAD + checkflag FLAG_SYS_GOT_BERRY_POUCH + goto_if FALSE, EventScript_16AEA3 msgbox gUnknown_8193003 - setflag FLAG_0x2BB + setflag FLAG_GOT_POWDER_JAR giveitem ITEM_POWDER_JAR compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A6BF9 + goto_if eq, EventScript_1A6BF9 msgbox gUnknown_8193033 release end @@ -144,20 +144,20 @@ EventScript_16B048:: @ 816B048 EventScript_16B055:: @ 816B055 msgbox gUnknown_819331E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16AEC8 + goto_if eq, EventScript_16AEC8 copyvar VAR_0x8004, VAR_0x8009 specialvar VAR_RESULT, sub_815EEB0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B0CC + goto_if eq, EventScript_16B0CC giveitem VAR_0x8008 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B0BF + goto_if eq, EventScript_16B0BF copyvar VAR_0x8004, VAR_0x8009 special sub_815EF5C special sub_815F070 msgbox gUnknown_819337A, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16AEC8 + goto_if eq, EventScript_16AEC8 msgbox gUnknown_81933FB special sub_815F114 release @@ -178,7 +178,7 @@ CeruleanCity_House5_EventScript_16B0DA:: @ 816B0DA lockall special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_814EA7C waitstate releaseall diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index e29ff56dd..182e8ccf6 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 9, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 1, "y": 7, "elevation": 3, diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc index 6f05c3e80..c99795d35 100644 --- a/data/maps/CeruleanCity_Mart/scripts.inc +++ b/data/maps/CeruleanCity_Mart/scripts.inc @@ -12,7 +12,7 @@ CeruleanCity_Mart_EventScript_16ACA7:: @ 816ACA7 CeruleanCity_Mart_EventScript_16ACB0:: @ 816ACB0 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index f80669fac..85e02720a 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 5, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 4, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 3, "y": 3, "elevation": 3, @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { "graphics_id": "0", @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCity_PokemonCenter_1F_EventScript_1ACE68", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc index dcace7aee..6a67f0fe1 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc @@ -25,9 +25,7 @@ CeruleanCity_PokemonCenter_1F_EventScript_16AA4E:: @ 816AA4E CeruleanCity_PokemonCenter_1F_EventScript_16AA57:: @ 816AA57 lock faceplayer - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BILL, 1 msgbox gUnknown_8192116 release end diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index 228bfa8a3..a5f191ced 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CeruleanCity_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index 5e2726a36..f5ab2fb9f 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 14, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 11, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "73", + "graphics_id": "MAP_OBJ_GFX_BILL", "x": 20, "y": 7, "elevation": 3, @@ -61,10 +61,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "98" + "flag": "FLAG_HIDE_CINNABAR_BILL" }, { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 23, "y": 7, "elevation": 1, @@ -74,7 +74,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "107" + "flag": "FLAG_HIDE_CINNABAR_SEAGALLOP" } ], "warp_events": [ diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 556fde4de..2ebce51b7 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -6,17 +6,17 @@ CinnabarIsland_MapScripts:: @ 8166ED6 CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND call EventScript_166F5E - compare_var_to_value VAR_0x4071, 1 - call_if 1, EventScript_166F24 - compare_var_to_value VAR_0x4071, 3 - call_if 1, EventScript_166F52 compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 1 - call_if 1, EventScript_166F0B + call_if eq, EventScript_166F24 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 3 + call_if eq, EventScript_166F52 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 + call_if eq, EventScript_166F0B end EventScript_166F0B:: @ 8166F0B savebgm MUS_ANNAI - setflag FLAG_0x002 + setflag FLAG_TEMP_2 setobjectxyperm 3, 15, 12 setobjectmovementtype 3, 9 setobjectxyperm 4, 30, 12 @@ -25,8 +25,8 @@ EventScript_166F0B:: @ 8166F0B EventScript_166F24:: @ 8166F24 getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 18 - goto_if 4, EventScript_166F4A - setflag FLAG_0x002 + goto_if ge, EventScript_166F4A + setflag FLAG_TEMP_2 setobjectxyperm 3, 18, 12 setobjectmovementtype 3, 7 setobjectxyperm 4, 30, 12 @@ -42,8 +42,8 @@ EventScript_166F52:: @ 8166F52 return EventScript_166F5E:: @ 8166F5E - checkflag FLAG_0x1A8 - goto_if_eq EventScript_166F68 + checkflag FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY + goto_if TRUE, EventScript_166F68 return EventScript_166F68:: @ 8166F68 @@ -51,9 +51,9 @@ EventScript_166F68:: @ 8166F68 return CinnabarIsland_MapScript2_166F6E:: @ 8166F6E - map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, EventScript_166F88 - map_script_2 VAR_0x4071, 1, EventScript_166FCD - map_script_2 VAR_0x4071, 3, EventScript_166FA0 + map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1, EventScript_166F88 + map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, EventScript_166FCD + map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 3, EventScript_166FA0 .2byte 0 EventScript_166F88:: @ 8166F88 @@ -61,7 +61,7 @@ EventScript_166F88:: @ 8166F88 clearflag FLAG_SPECIAL_FLAG_0x4001 savebgm MUS_DUMMY textcolor 0 - setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 2 delay 20 call EventScript_1670E6 releaseall @@ -75,9 +75,9 @@ EventScript_166FA0:: @ 8166FA0 applymovement 3, Movement_166FC6 waitmovement 0 removeobject 3 - setvar VAR_0x4071, 4 - setflag FLAG_0x075 - clearflag FLAG_0x076 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 4 + setflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE + clearflag FLAG_HIDE_LOSTELLE_IN_HER_HOME releaseall end @@ -93,25 +93,25 @@ Movement_166FC6:: @ 8166FC6 EventScript_166FCD:: @ 8166FCD lockall textcolor 0 - checkflag FLAG_0x002 - call_if 0, EventScript_167032 - checkflag FLAG_0x002 - call_if 1, EventScript_16703D + checkflag FLAG_TEMP_2 + call_if FALSE, EventScript_167032 + checkflag FLAG_TEMP_2 + call_if TRUE, EventScript_16703D playse SE_PIN applymovement 3, Movement_1A75DB waitmovement 0 applymovement 3, Movement_1A75DD waitmovement 0 - checkflag FLAG_0x002 - call_if 0, EventScript_167048 - checkflag FLAG_0x002 - call_if 1, EventScript_167053 + checkflag FLAG_TEMP_2 + call_if FALSE, EventScript_167048 + checkflag FLAG_TEMP_2 + call_if TRUE, EventScript_167053 msgbox gUnknown_8180C90 msgbox gUnknown_8180CAA, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_167068 + goto_if eq, EventScript_167068 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_167078 + goto_if eq, EventScript_167078 end EventScript_167032:: @ 8167032 @@ -146,13 +146,13 @@ EventScript_167068:: @ 8167068 EventScript_167078:: @ 8167078 msgbox gUnknown_8180DF8 closemessage - checkflag FLAG_0x002 - call_if 0, EventScript_1670A0 - checkflag FLAG_0x002 - call_if 1, EventScript_1670B3 + checkflag FLAG_TEMP_2 + call_if FALSE, EventScript_1670A0 + checkflag FLAG_TEMP_2 + call_if TRUE, EventScript_1670B3 removeobject 3 - setvar VAR_0x4071, 2 - clearflag FLAG_0x0A2 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 + clearflag FLAG_HIDE_CINNABAR_POKECENTER_BILL releaseall end @@ -201,26 +201,26 @@ Movement_1670E2:: @ 81670E2 step_end EventScript_1670E6:: @ 81670E6 - checkflag FLAG_0x002 - call_if 1, EventScript_167142 + checkflag FLAG_TEMP_2 + call_if TRUE, EventScript_167142 addobject 4 - checkflag FLAG_0x002 - call_if 0, EventScript_167154 - checkflag FLAG_0x002 - call_if 1, EventScript_167166 + checkflag FLAG_TEMP_2 + call_if FALSE, EventScript_167154 + checkflag FLAG_TEMP_2 + call_if TRUE, EventScript_167166 msgbox gUnknown_8180EAD closemessage - checkflag FLAG_0x002 - call_if 0, EventScript_167171 - checkflag FLAG_0x002 - call_if 1, EventScript_167183 - setvar VAR_0x4071, 2 + checkflag FLAG_TEMP_2 + call_if FALSE, EventScript_167171 + checkflag FLAG_TEMP_2 + call_if TRUE, EventScript_167183 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 removeobject 3 delay 40 - setflag FLAG_0x06B + setflag FLAG_HIDE_CINNABAR_SEAGALLOP setvar VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1 - setvar VAR_0x8004, 8 - setvar VAR_0x8006, 1 + setvar VAR_0x8004, SEAGALLOP_CINNABAR_ISLAND + setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND goto EventScript_1A90DA end @@ -343,9 +343,7 @@ Movement_1671ED:: @ 81671ED CinnabarIsland_EventScript_1671EF:: @ 81671EF lock faceplayer - setvar VAR_0x8004, 8 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BLAINE, 3 msgbox gUnknown_8180B34 release end @@ -364,9 +362,7 @@ CinnabarIsland_EventScript_16721A:: @ 816721A CinnabarIsland_EventScript_167223:: @ 8167223 lockall - setvar VAR_0x8004, 8 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BLAINE, 0 msgbox gUnknown_8180C4A releaseall end diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index 83cc3ffc0..f442fb26a 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 25, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 25, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 17, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 16, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 16, "y": 18, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 4, "y": 19, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 4, "y": 11, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "86", + "graphics_id": "MAP_OBJ_GFX_BLAINE", "x": 5, "y": 4, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 24, "y": 20, "elevation": 3, diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 20c00f117..88df6972a 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -3,20 +3,20 @@ CinnabarIsland_Gym_MapScripts:: @ 816D94B .byte 0 CinnabarIsland_Gym_MapScript1_16D951:: @ 816D951 - checkflag FLAG_0x4B6 - goto_if_eq EventScript_16D991 - checkflag FLAG_0x265 - call_if 1, EventScript_16D9B0 - checkflag FLAG_0x267 - call_if 1, EventScript_16D9B6 - checkflag FLAG_0x268 - call_if 1, EventScript_16D9BC - checkflag FLAG_0x269 - call_if 1, EventScript_16D9C2 - checkflag FLAG_0x26A - call_if 1, EventScript_16D9C8 - checkflag FLAG_0x26B - call_if 1, EventScript_16D9CE + checkflag FLAG_DEFEATED_BLAINE + goto_if TRUE, EventScript_16D991 + checkflag FLAG_CINNABAR_GYM_QUIZ_1 + call_if TRUE, EventScript_16D9B0 + checkflag FLAG_CINNABAR_GYM_QUIZ_2 + call_if TRUE, EventScript_16D9B6 + checkflag FLAG_CINNABAR_GYM_QUIZ_3 + call_if TRUE, EventScript_16D9BC + checkflag FLAG_CINNABAR_GYM_QUIZ_4 + call_if TRUE, EventScript_16D9C2 + checkflag FLAG_CINNABAR_GYM_QUIZ_5 + call_if TRUE, EventScript_16D9C8 + checkflag FLAG_CINNABAR_GYM_QUIZ_6 + call_if TRUE, EventScript_16D9CE end EventScript_16D991:: @ 816D991 @@ -53,27 +53,22 @@ EventScript_16D9CE:: @ 816D9CE return CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4 - setvar VAR_0x8004, 8 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 419, 0, Text_199543, Text_1995FA, EventScript_16DA06 - checkflag FLAG_0x24E - goto_if 0, EventScript_16DA34 + famechecker FAMECHECKER_BLAINE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + trainerbattle 1, TRAINER_LEADER_BLAINE, 0, Text_199543, Text_1995FA, EventScript_16DA06 + checkflag FLAG_GOT_TM38_FROM_BLAINE + goto_if FALSE, EventScript_16DA34 msgbox gUnknown_819971D release end EventScript_16DA06:: @ 816DA06 - setvar VAR_0x8004, 8 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - setflag FLAG_0x4B6 - setflag FLAG_UNK826 + famechecker FAMECHECKER_BLAINE, 1 + setflag FLAG_DEFEATED_BLAINE + setflag FLAG_BADGE07_GET setrespawn SPAWN_CINNABAR_ISLAND - setvar VAR_0x4071, 1 - clearflag FLAG_0x062 - setvar VAR_0x8008, 7 - call EventScript_1A6B18 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1 + clearflag FLAG_HIDE_CINNABAR_BILL + set_gym_trainers 7 goto EventScript_16DA34 end @@ -81,10 +76,10 @@ EventScript_16DA34:: @ 816DA34 msgbox gUnknown_819969E checkitemspace ITEM_TM38, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16DA75 + goto_if eq, EventScript_16DA75 additem ITEM_TM38, 1 giveitemfanfaremsg gUnknown_81996FF, ITEM_TM38 - setflag FLAG_0x24E + setflag FLAG_GOT_TM38_FROM_BLAINE msgbox gUnknown_8199652 release end @@ -95,18 +90,18 @@ EventScript_16DA75:: @ 816DA75 end CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F - trainerbattle 0, 177, 0, Text_1997A5, Text_1997D6 + trainerbattle 0, TRAINER_SUPER_NERD_ERIK, 0, Text_1997A5, Text_1997D6 msgbox gUnknown_81997EA, 6 end CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96 - trainerbattle 2, 178, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1 + trainerbattle 2, TRAINER_SUPER_NERD_AVERY, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1 msgbox gUnknown_8199911, 6 end EventScript_16DAB1:: @ 816DAB1 - checkflag FLAG_0x267 - call_if 0, EventScript_16DABC + checkflag FLAG_CINNABAR_GYM_QUIZ_2 + call_if FALSE, EventScript_16DABC release end @@ -115,16 +110,14 @@ EventScript_16DABC:: @ 816DABC return CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2 - trainerbattle 2, 179, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA - setvar VAR_0x8004, 8 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + trainerbattle 2, TRAINER_SUPER_NERD_DEREK, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA + famechecker FAMECHECKER_BLAINE, 2 msgbox gUnknown_81999DF, 6 end EventScript_16DAEA:: @ 816DAEA - checkflag FLAG_0x269 - call_if 0, EventScript_16DAF5 + checkflag FLAG_CINNABAR_GYM_QUIZ_4 + call_if FALSE, EventScript_16DAF5 release end @@ -133,13 +126,13 @@ EventScript_16DAF5:: @ 816DAF5 return CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB - trainerbattle 2, 180, 0, Text_199AFC, Text_199B16, EventScript_16DB16 + trainerbattle 2, TRAINER_SUPER_NERD_ZAC, 0, Text_199AFC, Text_199B16, EventScript_16DB16 msgbox gUnknown_8199B27, 6 end EventScript_16DB16:: @ 816DB16 - checkflag FLAG_0x26B - call_if 0, EventScript_16DB21 + checkflag FLAG_CINNABAR_GYM_QUIZ_6 + call_if FALSE, EventScript_16DB21 release end @@ -148,13 +141,13 @@ EventScript_16DB21:: @ 816DB21 return CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27 - trainerbattle 2, 213, 0, Text_19983F, Text_199870, EventScript_16DB42 + trainerbattle 2, TRAINER_BURGLAR_QUINN, 0, Text_19983F, Text_199870, EventScript_16DB42 msgbox gUnknown_819987D, 6 end EventScript_16DB42:: @ 816DB42 - checkflag FLAG_0x265 - call_if 0, EventScript_16DB4D + checkflag FLAG_CINNABAR_GYM_QUIZ_1 + call_if FALSE, EventScript_16DB4D release end @@ -163,13 +156,13 @@ EventScript_16DB4D:: @ 816DB4D return CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53 - trainerbattle 2, 214, 0, Text_199948, Text_199973, EventScript_16DB6E + trainerbattle 2, TRAINER_BURGLAR_RAMON, 0, Text_199948, Text_199973, EventScript_16DB6E msgbox gUnknown_8199986, 6 end EventScript_16DB6E:: @ 816DB6E - checkflag FLAG_0x268 - call_if 0, EventScript_16DB79 + checkflag FLAG_CINNABAR_GYM_QUIZ_3 + call_if FALSE, EventScript_16DB79 release end @@ -178,13 +171,13 @@ EventScript_16DB79:: @ 816DB79 return CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F - trainerbattle 2, 215, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A + trainerbattle 2, TRAINER_BURGLAR_DUSTY, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A msgbox gUnknown_8199AC9, 6 end EventScript_16DB9A:: @ 816DB9A - checkflag FLAG_0x26A - call_if 0, EventScript_16DBA5 + checkflag FLAG_CINNABAR_GYM_QUIZ_5 + call_if FALSE, EventScript_16DBA5 release end @@ -195,8 +188,8 @@ EventScript_16DBA5:: @ 816DBA5 CinnabarIsland_Gym_EventScript_16DBAB:: @ 816DBAB lock faceplayer - checkflag FLAG_0x4B6 - goto_if_eq EventScript_16DBC0 + checkflag FLAG_DEFEATED_BLAINE + goto_if TRUE, EventScript_16DBC0 msgbox gUnknown_8199B81 release end @@ -208,8 +201,8 @@ EventScript_16DBC0:: @ 816DBC0 CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA lockall - checkflag FLAG_UNK826 - goto_if_eq EventScript_16DBDE + checkflag FLAG_BADGE07_GET + goto_if TRUE, EventScript_16DBDE msgbox gUnknown_8199C29 releaseall end @@ -235,9 +228,9 @@ EventScript_16DC00:: @ 816DC00 msgbox gUnknown_8199C9F msgbox gUnknown_8199D5A, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16DC43 + goto_if eq, EventScript_16DC43 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16DC6A + goto_if eq, EventScript_16DC6A end EventScript_16DC27:: @ 816DC27 @@ -256,8 +249,8 @@ EventScript_16DC34:: @ 816DC34 EventScript_16DC43:: @ 816DC43 call EventScript_16DC27 - checkflag FLAG_0x265 - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_1 + goto_if TRUE, EventScript_16DC68 call EventScript_16DC58 releaseall end @@ -267,7 +260,7 @@ EventScript_16DC58:: @ 816DC58 waitse call EventScript_16E117 special DrawWholeMapView - setflag FLAG_0x265 + setflag FLAG_CINNABAR_GYM_QUIZ_1 return EventScript_16DC68:: @ 816DC68 @@ -276,21 +269,21 @@ EventScript_16DC68:: @ 816DC68 EventScript_16DC6A:: @ 816DC6A call EventScript_16DC34 - checktrainerflag FLAG_0x0D5 - goto_if 0, EventScript_16DC7A + checktrainerflag TRAINER_BURGLAR_QUINN + goto_if lt, EventScript_16DC7A releaseall end EventScript_16DC7A:: @ 816DC7A compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16DCB4 + call_if eq, EventScript_16DCB4 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16DCC6 + call_if eq, EventScript_16DCC6 textcolor 0 msgbox gUnknown_819983F - trainerbattle 3, 213, 0, Text_199870 - checkflag FLAG_0x265 - goto_if_eq EventScript_16DC68 + trainerbattle 3, TRAINER_BURGLAR_QUINN, 0, Text_199870 + checkflag FLAG_CINNABAR_GYM_QUIZ_1 + goto_if TRUE, EventScript_16DC68 call EventScript_16DC58 releaseall end @@ -332,15 +325,15 @@ EventScript_16DCF5:: @ 816DCF5 msgbox gUnknown_8199C9F msgbox gUnknown_8199D79, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16DD41 + goto_if eq, EventScript_16DD41 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16DD1C + goto_if eq, EventScript_16DD1C end EventScript_16DD1C:: @ 816DD1C call EventScript_16DC27 - checkflag FLAG_0x267 - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_2 + goto_if TRUE, EventScript_16DC68 call EventScript_16DD31 releaseall end @@ -350,26 +343,26 @@ EventScript_16DD31:: @ 816DD31 waitse call EventScript_16E157 special DrawWholeMapView - setflag FLAG_0x267 + setflag FLAG_CINNABAR_GYM_QUIZ_2 return EventScript_16DD41:: @ 816DD41 call EventScript_16DC34 - checktrainerflag FLAG_0x0B2 - goto_if 0, EventScript_16DD51 + checktrainerflag TRAINER_SUPER_NERD_AVERY + goto_if lt, EventScript_16DD51 releaseall end EventScript_16DD51:: @ 816DD51 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16DD8B + call_if eq, EventScript_16DD8B compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16DD9D + call_if eq, EventScript_16DD9D textcolor 0 msgbox gUnknown_81998BD - trainerbattle 3, 178, 0, Text_1998ED - checkflag FLAG_0x267 - goto_if_eq EventScript_16DC68 + trainerbattle 3, TRAINER_SUPER_NERD_AVERY, 0, Text_1998ED + checkflag FLAG_CINNABAR_GYM_QUIZ_2 + goto_if TRUE, EventScript_16DC68 call EventScript_16DD31 releaseall end @@ -420,15 +413,15 @@ EventScript_16DDD3:: @ 816DDD3 msgbox gUnknown_8199C9F msgbox gUnknown_8199DA9, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16DE1F + goto_if eq, EventScript_16DE1F compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16DDFA + goto_if eq, EventScript_16DDFA end EventScript_16DDFA:: @ 816DDFA call EventScript_16DC27 - checkflag FLAG_0x268 - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_3 + goto_if TRUE, EventScript_16DC68 call EventScript_16DE0F releaseall end @@ -438,26 +431,26 @@ EventScript_16DE0F:: @ 816DE0F waitse call EventScript_16E197 special DrawWholeMapView - setflag FLAG_0x268 + setflag FLAG_CINNABAR_GYM_QUIZ_3 return EventScript_16DE1F:: @ 816DE1F call EventScript_16DC34 - checktrainerflag FLAG_0x0D6 - goto_if 0, EventScript_16DE2F + checktrainerflag TRAINER_BURGLAR_RAMON + goto_if lt, EventScript_16DE2F releaseall end EventScript_16DE2F:: @ 816DE2F compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16DE69 + call_if eq, EventScript_16DE69 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16DE7B + call_if eq, EventScript_16DE7B textcolor 0 msgbox gUnknown_8199948 - trainerbattle 3, 214, 0, Text_199973 - checkflag FLAG_0x268 - goto_if_eq EventScript_16DC68 + trainerbattle 3, TRAINER_BURGLAR_RAMON, 0, Text_199973 + checkflag FLAG_CINNABAR_GYM_QUIZ_3 + goto_if TRUE, EventScript_16DC68 call EventScript_16DE0F releaseall end @@ -499,15 +492,15 @@ EventScript_16DEAA:: @ 816DEAA msgbox gUnknown_8199C9F msgbox gUnknown_8199DC6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16DEF6 + goto_if eq, EventScript_16DEF6 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16DED1 + goto_if eq, EventScript_16DED1 end EventScript_16DED1:: @ 816DED1 call EventScript_16DC27 - checkflag FLAG_0x269 - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_4 + goto_if TRUE, EventScript_16DC68 call EventScript_16DEE6 releaseall end @@ -517,26 +510,26 @@ EventScript_16DEE6:: @ 816DEE6 waitse call EventScript_16E1D7 special DrawWholeMapView - setflag FLAG_0x269 + setflag FLAG_CINNABAR_GYM_QUIZ_4 return EventScript_16DEF6:: @ 816DEF6 call EventScript_16DC34 - checktrainerflag FLAG_0x0B3 - goto_if 0, EventScript_16DF06 + checktrainerflag TRAINER_SUPER_NERD_DEREK + goto_if lt, EventScript_16DF06 releaseall end EventScript_16DF06:: @ 816DF06 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16DF40 + call_if eq, EventScript_16DF40 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16DF52 + call_if eq, EventScript_16DF52 textcolor 0 msgbox gUnknown_81999B7 - trainerbattle 3, 179, 0, Text_1999DB - checkflag FLAG_0x269 - goto_if_eq EventScript_16DC68 + trainerbattle 3, TRAINER_SUPER_NERD_DEREK, 0, Text_1999DB + checkflag FLAG_CINNABAR_GYM_QUIZ_4 + goto_if TRUE, EventScript_16DC68 call EventScript_16DEE6 releaseall end @@ -578,15 +571,15 @@ EventScript_16DF81:: @ 816DF81 msgbox gUnknown_8199C9F msgbox gUnknown_8199E00, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16DFA8 + goto_if eq, EventScript_16DFA8 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16DFCD + goto_if eq, EventScript_16DFCD end EventScript_16DFA8:: @ 816DFA8 call EventScript_16DC27 - checkflag FLAG_0x26A - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_5 + goto_if TRUE, EventScript_16DC68 call EventScript_16DFBD releaseall end @@ -596,26 +589,26 @@ EventScript_16DFBD:: @ 816DFBD waitse call EventScript_16E1F3 special DrawWholeMapView - setflag FLAG_0x26A + setflag FLAG_CINNABAR_GYM_QUIZ_5 return EventScript_16DFCD:: @ 816DFCD call EventScript_16DC34 - checktrainerflag FLAG_0x0D7 - goto_if 0, EventScript_16DFDD + checktrainerflag TRAINER_BURGLAR_DUSTY + goto_if lt, EventScript_16DFDD releaseall end EventScript_16DFDD:: @ 816DFDD compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16E017 + call_if eq, EventScript_16E017 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16E029 + call_if eq, EventScript_16E029 textcolor 0 msgbox gUnknown_8199A7F - trainerbattle 3, 215, 0, Text_199AB9 - checkflag FLAG_0x26A - goto_if_eq EventScript_16DC68 + trainerbattle 3, TRAINER_BURGLAR_DUSTY, 0, Text_199AB9 + checkflag FLAG_CINNABAR_GYM_QUIZ_5 + goto_if TRUE, EventScript_16DC68 call EventScript_16DFBD releaseall end @@ -657,15 +650,15 @@ EventScript_16E058:: @ 816E058 msgbox gUnknown_8199C9F msgbox gUnknown_8199E36, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E0A4 + goto_if eq, EventScript_16E0A4 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E07F + goto_if eq, EventScript_16E07F end EventScript_16E07F:: @ 816E07F call EventScript_16DC27 - checkflag FLAG_0x26B - goto_if_eq EventScript_16DC68 + checkflag FLAG_CINNABAR_GYM_QUIZ_6 + goto_if TRUE, EventScript_16DC68 call EventScript_16E094 releaseall end @@ -675,26 +668,26 @@ EventScript_16E094:: @ 816E094 waitse call EventScript_16E233 special DrawWholeMapView - setflag FLAG_0x26B + setflag FLAG_CINNABAR_GYM_QUIZ_6 return EventScript_16E0A4:: @ 816E0A4 call EventScript_16DC34 - checktrainerflag FLAG_0x0B4 - goto_if 0, EventScript_16E0B4 + checktrainerflag TRAINER_SUPER_NERD_ZAC + goto_if lt, EventScript_16E0B4 releaseall end EventScript_16E0B4:: @ 816E0B4 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16E0EE + call_if eq, EventScript_16E0EE compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16E100 + call_if eq, EventScript_16E100 textcolor 0 msgbox gUnknown_8199AFC - trainerbattle 3, 180, 0, Text_199B16 - checkflag FLAG_0x26B - goto_if_eq EventScript_16DC68 + trainerbattle 3, TRAINER_SUPER_NERD_ZAC, 0, Text_199B16 + checkflag FLAG_CINNABAR_GYM_QUIZ_6 + goto_if TRUE, EventScript_16DC68 call EventScript_16E094 releaseall end diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index 1d40fc33d..59430b7ed 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 8, "y": 2, "elevation": 3, diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index c82034dd0..85ad79e4e 100644 --- a/data/maps/CinnabarIsland_Mart/scripts.inc +++ b/data/maps/CinnabarIsland_Mart/scripts.inc @@ -12,7 +12,7 @@ CinnabarIsland_Mart_EventScript_16EA19:: @ 816EA19 CinnabarIsland_Mart_EventScript_16EA22:: @ 816EA22 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index e14c68123..e45fcd735 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 2, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 9, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 14, "y": 6, "elevation": 3, @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { "graphics_id": "0", @@ -89,10 +89,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CinnabarIsland_PokemonCenter_1F_EventScript_1AD0B9", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "73", + "graphics_id": "MAP_OBJ_GFX_BILL", "x": 11, "y": 5, "elevation": 3, @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CinnabarIsland_PokemonCenter_1F_EventScript_16E90A", - "flag": "162" + "flag": "FLAG_HIDE_CINNABAR_POKECENTER_BILL" } ], "warp_events": [ diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index e85ebefc9..640446bf0 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -31,23 +31,23 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A faceplayer msgbox gUnknown_819A725, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E9A5 + goto_if eq, EventScript_16E9A5 msgbox gUnknown_819A785 closemessage playbgm MUS_ANNAI, 1 savebgm MUS_ANNAI setflag FLAG_SPECIAL_FLAG_0x4001 - setflag FLAG_0x0A2 + setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_16E96F + call_if eq, EventScript_16E96F compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16E981 + call_if eq, EventScript_16E981 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16E993 + call_if eq, EventScript_16E993 removeobject 7 - setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 1 - clearflag FLAG_0x062 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 + clearflag FLAG_HIDE_CINNABAR_BILL warp MAP_CINNABAR_ISLAND, 255, 14, 11 waitstate release diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 258320b9b..527b4a67d 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "CinnabarIsland_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index 4c0d5d33a..1e35330d9 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc index 5da8c3e89..780103629 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -3,12 +3,12 @@ CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273 .byte 0 CinnabarIsland_PokemonLab_Entrance_MapScript1_16E279:: @ 816E279 - compare_var_to_value VAR_0x406A, 1 - call_if 1, EventScript_16E285 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 + call_if eq, EventScript_16E285 end EventScript_16E285:: @ 816E285 - setvar VAR_0x406A, 2 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 return CinnabarIsland_PokemonLab_Entrance_EventScript_16E28B:: @ 816E28B diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index c0bd22e9d..a942a9ca8 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 11, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 12, "y": 3, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index 3b415bfab..ad8b416cd 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -6,20 +6,20 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E401:: @ 816E401 faceplayer setvar VAR_0x8008, 8 call EventScript_1A8CAD - checkflag FLAG_0x276 - goto_if_eq EventScript_16E473 + checkflag FLAG_DID_SEELOR_TRADE + goto_if TRUE, EventScript_16E473 msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E45B + goto_if eq, EventScript_16E45B call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16E45B + goto_if ge, EventScript_16E45B call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16E465 + goto_if ne, EventScript_16E465 call EventScript_1A8CD9 msgbox gUnknown_81A59DA - setflag FLAG_0x276 + setflag FLAG_DID_SEELOR_TRADE release end @@ -43,48 +43,48 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_16E47D:: @ 816E47D lock faceplayer setvar VAR_RESULT, 0 - checkflag FLAG_0x2EE - call_if 1, EventScript_16E8A1 + checkflag FLAG_REVIVED_AMBER + call_if TRUE, EventScript_16E8A1 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E897 - compare_var_to_value VAR_0x406A, 2 - goto_if_eq EventScript_16E736 - compare_var_to_value VAR_0x406A, 1 - goto_if_eq EventScript_16E72C + goto_if eq, EventScript_16E897 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 + goto_if eq, EventScript_16E736 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 + goto_if eq, EventScript_16E72C call EventScript_16E4EC compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E544 + goto_if eq, EventScript_16E544 call EventScript_16E504 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E586 + goto_if eq, EventScript_16E586 call EventScript_16E51C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E5C8 + goto_if eq, EventScript_16E5C8 msgbox gUnknown_819A282 goto EventScript_16E53A end EventScript_16E4EC:: @ 816E4EC - checkflag FLAG_0x273 - goto_if 0, EventScript_16E534 - checkflag FLAG_0x2ED - goto_if_eq EventScript_16E534 + checkflag FLAG_GOT_HELIX_FOSSIL + goto_if FALSE, EventScript_16E534 + checkflag FLAG_REVIVED_HELIX + goto_if TRUE, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E504:: @ 816E504 - checkflag FLAG_0x272 - goto_if 0, EventScript_16E534 - checkflag FLAG_0x2EC - goto_if_eq EventScript_16E534 + checkflag FLAG_GOT_DOME_FOSSIL + goto_if FALSE, EventScript_16E534 + checkflag FLAG_REVIVED_DOME + goto_if TRUE, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E51C:: @ 816E51C - checkflag FLAG_0x25E - goto_if 0, EventScript_16E534 - checkflag FLAG_0x2EE - goto_if_eq EventScript_16E534 + checkflag FLAG_GOT_OLD_AMBER + goto_if FALSE, EventScript_16E534 + checkflag FLAG_REVIVED_AMBER + goto_if TRUE, EventScript_16E534 setvar VAR_RESULT, 1 return @@ -102,7 +102,7 @@ EventScript_16E544:: @ 816E544 waitmessage call EventScript_16E51C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E5FA + goto_if eq, EventScript_16E5FA multichoice 0, 0, 21, 0 switch VAR_RESULT case 0, EventScript_16E668 @@ -115,7 +115,7 @@ EventScript_16E586:: @ 816E586 waitmessage call EventScript_16E51C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E631 + goto_if eq, EventScript_16E631 multichoice 0, 0, 22, 0 switch VAR_RESULT case 0, EventScript_16E6A6 @@ -156,13 +156,13 @@ EventScript_16E668:: @ 816E668 getitemname 1, ITEM_HELIX_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E722 + goto_if eq, EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_HELIX_FOSSIL, 1 msgbox gUnknown_819A4AB - setvar VAR_0x406A, 1 - setvar VAR_0x4069, 1 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1 release end @@ -171,13 +171,13 @@ EventScript_16E6A6:: @ 816E6A6 getitemname 1, ITEM_DOME_FOSSIL msgbox gUnknown_819A3D4, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E722 + goto_if eq, EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_DOME_FOSSIL, 1 msgbox gUnknown_819A4AB - setvar VAR_0x406A, 1 - setvar VAR_0x4069, 2 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2 release end @@ -186,13 +186,13 @@ EventScript_16E6E4:: @ 816E6E4 getitemname 1, ITEM_OLD_AMBER msgbox gUnknown_819A3D4, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E722 + goto_if eq, EventScript_16E722 msgbox gUnknown_819A45D textcolor 0 removeitem ITEM_OLD_AMBER, 1 msgbox gUnknown_819A4AB - setvar VAR_0x406A, 1 - setvar VAR_0x4069, 3 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3 release end @@ -207,54 +207,54 @@ EventScript_16E72C:: @ 816E72C end EventScript_16E736:: @ 816E736 - compare_var_to_value VAR_0x4069, 1 - goto_if_eq EventScript_16E758 - compare_var_to_value VAR_0x4069, 2 - goto_if_eq EventScript_16E79D - compare_var_to_value VAR_0x4069, 3 - goto_if_eq EventScript_16E7E2 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 1 + goto_if eq, EventScript_16E758 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 2 + goto_if eq, EventScript_16E79D + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, 3 + goto_if eq, EventScript_16E7E2 end EventScript_16E758:: @ 816E758 - setvar VAR_0x4001, 138 + setvar VAR_0x4001, SPECIES_OMANYTE getspeciesname 0, SPECIES_OMANYTE msgbox gUnknown_819A34F givemon SPECIES_OMANYTE, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A927C - setflag FLAG_0x2ED + goto_if eq, EventScript_1A927C + setflag FLAG_REVIVED_HELIX compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E827 + goto_if eq, EventScript_16E827 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E85B + goto_if eq, EventScript_16E85B end EventScript_16E79D:: @ 816E79D - setvar VAR_0x4001, 140 + setvar VAR_0x4001, SPECIES_KABUTO getspeciesname 0, SPECIES_KABUTO msgbox gUnknown_819A34F givemon SPECIES_KABUTO, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A927C - setflag FLAG_0x2EC + goto_if eq, EventScript_1A927C + setflag FLAG_REVIVED_DOME compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E827 + goto_if eq, EventScript_16E827 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E85B + goto_if eq, EventScript_16E85B end EventScript_16E7E2:: @ 816E7E2 - setvar VAR_0x4001, 142 + setvar VAR_0x4001, SPECIES_AERODACTYL getspeciesname 0, SPECIES_AERODACTYL msgbox gUnknown_819A34F givemon SPECIES_AERODACTYL, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A927C - setflag FLAG_0x2EE + goto_if eq, EventScript_1A927C + setflag FLAG_REVIVED_AMBER compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E827 + goto_if eq, EventScript_16E827 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16E85B + goto_if eq, EventScript_16E85B end EventScript_16E827:: @ 816E827 @@ -263,10 +263,10 @@ EventScript_16E827:: @ 816E827 message Text_19A39E waitmessage waitfanfare - setvar VAR_0x406A, 0 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E895 + goto_if eq, EventScript_16E895 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16E895 @@ -278,10 +278,10 @@ EventScript_16E85B:: @ 816E85B message Text_19A39E waitmessage waitfanfare - setvar VAR_0x406A, 0 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 0 msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E88A + goto_if eq, EventScript_16E88A call EventScript_1A8C33 goto EventScript_16E88A end @@ -301,21 +301,21 @@ EventScript_16E897:: @ 816E897 end EventScript_16E8A1:: @ 816E8A1 - checkflag FLAG_0x273 - goto_if_eq EventScript_16E8B9 - checkflag FLAG_0x272 - goto_if_eq EventScript_16E8C8 + checkflag FLAG_GOT_HELIX_FOSSIL + goto_if TRUE, EventScript_16E8B9 + checkflag FLAG_GOT_DOME_FOSSIL + goto_if TRUE, EventScript_16E8C8 goto EventScript_16E534 end EventScript_16E8B9:: @ 816E8B9 - checkflag FLAG_0x2ED - goto_if 0, EventScript_16E534 + checkflag FLAG_REVIVED_HELIX + goto_if FALSE, EventScript_16E534 setvar VAR_RESULT, 1 return EventScript_16E8C8:: @ 816E8C8 - checkflag FLAG_0x2EC - goto_if 0, EventScript_16E534 + checkflag FLAG_REVIVED_DOME + goto_if FALSE, EventScript_16E534 setvar VAR_RESULT, 1 return diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index a7af3e0c9..6542e543c 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 5, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 4, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 10, "y": 5, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 651fe0c76..6cf717fe5 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -10,20 +10,20 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E2C2:: @ 816E2C2 faceplayer setvar VAR_0x8008, 6 call EventScript_1A8CAD - checkflag FLAG_0x274 - goto_if_eq EventScript_16E334 + checkflag FLAG_DID_ESPHERE_TRADE + goto_if TRUE, EventScript_16E334 msgbox gUnknown_81A59FE, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E31C + goto_if eq, EventScript_16E31C call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16E31C + goto_if ge, EventScript_16E31C call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16E326 + goto_if ne, EventScript_16E326 call EventScript_1A8CD9 msgbox gUnknown_81A5A9D - setflag FLAG_0x274 + setflag FLAG_DID_ESPHERE_TRADE release end @@ -50,28 +50,28 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_16E33E:: @ 816E33E copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_8053A9C copyvar VAR_0x8009, VAR_RESULT - checkflag FLAG_0x275 - goto_if_eq EventScript_16E3D4 + checkflag FLAG_DID_TANGENY_TRADE + goto_if TRUE, EventScript_16E3D4 msgbox gUnknown_81A5AD6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16E3BC - special sub_80BF8FC + goto_if eq, EventScript_16E3BC + special Special_ChooseMonFromParty waitstate copyvar VAR_0x800A, VAR_0x8004 compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16E3BC + goto_if ge, EventScript_16E3BC copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, sub_8053D2C copyvar VAR_0x800B, VAR_RESULT compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16E3C6 + goto_if ne, EventScript_16E3C6 copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special sub_8053D68 special sub_8054440 waitstate msgbox gUnknown_81A5B4A - setflag FLAG_0x275 + setflag FLAG_DID_TANGENY_TRADE release end diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 42fc53a4c..0402b218a 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 5, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 10, "y": 3, "elevation": 3, diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index 1ee6434d7..ac1360466 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index c62cc1258..9b1a1ce89 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 5dd4a4ac4..ecb5fb9d9 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 8, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 16, "y": 10, "elevation": 3, diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index 835b1ef31..d1220b637 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/FiveIsland_Harbor/scripts.inc b/data/maps/FiveIsland_Harbor/scripts.inc index f5d12f8a4..9ab26aa3a 100644 --- a/data/maps/FiveIsland_Harbor/scripts.inc +++ b/data/maps/FiveIsland_Harbor/scripts.inc @@ -6,6 +6,6 @@ FiveIsland_Harbor_EventScript_171D43:: @ 8171D43 faceplayer message Text_181726 waitmessage - setvar VAR_0x8004, 5 + setvar VAR_0x8004, SEAGALLOP_FIVE_ISLAND goto EventScript_1A900F end diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index 45ac73f0f..00af7faf1 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 10, "y": 2, "elevation": 3, diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index d9b1ca36e..b7e3229c8 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index 46a9371be..05d20f0d4 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room1/scripts.inc b/data/maps/FiveIsland_LostCave_Room1/scripts.inc index 49ab5a14f..a5e25d092 100644 --- a/data/maps/FiveIsland_LostCave_Room1/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room1/scripts.inc @@ -2,6 +2,6 @@ FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6 .byte 0 FiveIsland_LostCave_Room1_EventScript_164BF7:: @ 8164BF7 - trainerbattle 0, 607, 0, Text_17CEF5, Text_17CF42 + trainerbattle 0, TRAINER_RUIN_MANIAC_LAWSON, 0, Text_17CEF5, Text_17CF42 msgbox gUnknown_817CF54, 6 end diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index af59dbf68..5626f8a64 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 5, "y": 5, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "147" + "flag": "FLAG_HIDE_LOST_CAVE_SELPHY" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 2, "elevation": 3, @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_LostCave_Room10_EventScript_1BEDBB", - "flag": "504" + "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM10_SILK_SCARF" } ], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index cd21dbcbd..0829a0273 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -4,8 +4,8 @@ FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D .byte 0 FiveIsland_LostCave_Room10_MapScript1_164C38:: @ 8164C38 - checktrainerflag FLAG_0x25E - call_if 1, EventScript_164C42 + checktrainerflag TRAINER_LADY_SELPHY + call_if eq, EventScript_164C42 end EventScript_164C42:: @ 8164C42 @@ -27,8 +27,8 @@ EventScript_164C52:: @ 8164C52 msgbox gUnknown_817D062 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_164CB6 - trainerbattle 3, 606, 0, Text_17D086 + goto_if eq, EventScript_164CB6 + trainerbattle 3, TRAINER_LADY_SELPHY, 0, Text_17D086 msgbox gUnknown_817D0B2 closemessage call EventScript_164CA5 @@ -38,14 +38,14 @@ EventScript_164C52:: @ 8164C52 end EventScript_164CA5:: @ 8164CA5 - setflag FLAG_0x093 - clearflag FLAG_0x094 + setflag FLAG_HIDE_LOST_CAVE_SELPHY + clearflag FLAG_HIDE_RESORT_GORGEOUS_SELPHY setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1 setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1 return EventScript_164CB6:: @ 8164CB6 - settrainerflag FLAG_0x25E + settrainerflag TRAINER_LADY_SELPHY call EventScript_164CA5 releaseall end diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index 1bb718599..82463cc38 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_LostCave_Room11_EventScript_1BEDC8", - "flag": "505" + "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM11_LAX_INCENSE" } ], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index 19a4d07fb..6e3a0ffc7 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_LostCave_Room12_EventScript_1BEDD5", - "flag": "506" + "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM12_SEA_INCENSE" } ], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index 12c0a2295..dc558c6b2 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_LostCave_Room13_EventScript_1BEDE2", - "flag": "507" + "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM13_MAX_REVIVE" } ], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index 0d5204697..046685c55 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_LostCave_Room14_EventScript_1BEDEF", - "flag": "508" + "flag": "FLAG_HIDE_FIVE_ISLAND_LOST_CAVE_ROOM14_RARE_CANDY" } ], "warp_events": [ diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index da9555287..5a6782d59 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room4/scripts.inc b/data/maps/FiveIsland_LostCave_Room4/scripts.inc index 68104231a..4b73aecb8 100644 --- a/data/maps/FiveIsland_LostCave_Room4/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room4/scripts.inc @@ -2,6 +2,6 @@ FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10 .byte 0 FiveIsland_LostCave_Room4_EventScript_164C11:: @ 8164C11 - trainerbattle 0, 608, 0, Text_17CFC1, Text_17CFFB + trainerbattle 0, TRAINER_PSYCHIC_LAURA, 0, Text_17CFC1, Text_17CFFB msgbox gUnknown_817D037, 6 end diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 2d374bd56..1ac91ff3c 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "50", + "graphics_id": "MAP_OBJ_GFX_ROCKET_F", "x": 18, "y": 18, "elevation": 3, @@ -35,10 +35,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "FiveIsland_Meadow_EventScript_1689BB", - "flag": "136" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 17, "y": 5, "elevation": 3, @@ -48,10 +48,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, "script": "FiveIsland_Meadow_EventScript_16898D", - "flag": "136" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 11, "y": 27, "elevation": 3, @@ -61,10 +61,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "FiveIsland_Meadow_EventScript_1689A4", - "flag": "136" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 8, "y": 9, "elevation": 3, @@ -73,11 +73,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_Meadow_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 19, "y": 12, "elevation": 3, @@ -86,11 +86,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FiveIsland_Meadow_EventScript_1BDF13", - "flag": "19" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 11, "elevation": 3, @@ -100,10 +100,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_Meadow_EventScript_1BEC69", - "flag": "478" + "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_MAX_POTION" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 3, "y": 22, "elevation": 3, @@ -113,7 +113,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_Meadow_EventScript_1BEC76", - "flag": "479" + "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_PP_UP" } ], "warp_events": [ diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index 4b3b4d895..23f3e40f3 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -3,22 +3,22 @@ FiveIsland_Meadow_MapScripts:: @ 8168932 .byte 0 FiveIsland_Meadow_MapScript1_168938:: @ 8168938 - checkflag FLAG_0x2D6 - call_if 1, EventScript_168983 + checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE + call_if TRUE, EventScript_168983 end FiveIsland_Meadow_EventScript_168942:: @ 8168942 lockall - checkflag FLAG_0x2D6 - goto_if_eq EventScript_168979 - checkflag FLAG_0x2D8 - goto_if_eq EventScript_16895F + checkflag FLAG_UNLOCKED_ROCKET_WAREHOUSE + goto_if TRUE, EventScript_168979 + checkflag FLAG_LEARNED_YES_NAH_CHANSEY + goto_if TRUE, EventScript_16895F msgbox gUnknown_818AB8E releaseall end EventScript_16895F:: @ 816895F - setflag FLAG_0x2D6 + setflag FLAG_UNLOCKED_ROCKET_WAREHOUSE message Text_18ABF4 waitmessage delay 60 @@ -39,16 +39,16 @@ EventScript_168983:: @ 8168983 return FiveIsland_Meadow_EventScript_16898D:: @ 816898D - trainerbattle 0, 567, 0, Text_18AC88, Text_18ACB3 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_49, 0, Text_18AC88, Text_18ACB3 msgbox gUnknown_818ACC5, 6 end FiveIsland_Meadow_EventScript_1689A4:: @ 81689A4 - trainerbattle 0, 568, 0, Text_18ACF0, Text_18AD39 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_50, 0, Text_18ACF0, Text_18AD39 msgbox gUnknown_818AD59, 6 end FiveIsland_Meadow_EventScript_1689BB:: @ 81689BB - trainerbattle 0, 569, 0, Text_18ADC6, Text_18ADFB + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_51, 0, Text_18ADC6, Text_18ADFB msgbox gUnknown_818AE16, 6 end diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 0f7ba8199..33ee6f13c 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 8, "y": 44, "elevation": 4, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 12, "y": 6, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 14, "y": 17, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 17, "y": 31, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 4, "y": 47, "elevation": 3, @@ -82,7 +82,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_MemorialPillar_EventScript_1BEC83", - "flag": "480" + "flag": "FLAG_HIDE_FIVE_ISLAND_MEMORIAL_PILLAR_METAL_COAT" } ], "warp_events": [], @@ -101,8 +101,9 @@ "y": 52, "elevation": 3, "item": "ITEM_BIG_PEARL", - "flag": "170", - "unknown": 1 + "flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BIG_PEARL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -110,8 +111,9 @@ "y": 7, "elevation": 3, "item": "ITEM_RAZZ_BERRY", - "flag": "171", - "unknown": 1 + "flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_RAZZ_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -119,8 +121,9 @@ "y": 22, "elevation": 3, "item": "ITEM_SITRUS_BERRY", - "flag": "172", - "unknown": 1 + "flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_SITRUS_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -128,8 +131,9 @@ "y": 25, "elevation": 3, "item": "ITEM_BLUK_BERRY", - "flag": "173", - "unknown": 1 + "flag": "HIDDEN_ITEM_FIVE_ISLAND_MEMORIAL_PILLAR_BLUK_BERRY", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 23b3527f7..a47767ca0 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -3,10 +3,10 @@ FiveIsland_MemorialPillar_MapScripts:: @ 81689D2 FiveIsland_MemorialPillar_EventScript_1689D3:: @ 81689D3 lock - checkflag FLAG_0x236 - goto_if_eq EventScript_168A18 - checkflag FLAG_0x2D7 - goto_if_eq EventScript_168A22 + checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR + goto_if TRUE, EventScript_168A18 + checkflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR + goto_if TRUE, EventScript_168A22 msgbox gUnknown_818B02E closemessage applymovement 1, Movement_1A75E1 @@ -28,7 +28,7 @@ EventScript_168A22:: @ 8168A22 msgbox gUnknown_818B282 giveitem ITEM_TM42 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_168AFE + goto_if eq, EventScript_168AFE call EventScript_168AE8 release end @@ -36,24 +36,24 @@ EventScript_168A22:: @ 8168A22 FiveIsland_MemorialPillar_EventScript_168A48:: @ 8168A48 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lockall - checkflag FLAG_0x236 - goto_if_eq EventScript_168B0B - checkflag FLAG_0x2D7 - goto_if_eq EventScript_168B0B + checkflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR + goto_if TRUE, EventScript_168B0B + checkflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR + goto_if TRUE, EventScript_168B0B msgbox gUnknown_818B095 checkitem ITEM_LEMONADE, 1 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_168A86 + goto_if eq, EventScript_168A86 releaseall end EventScript_168A86:: @ 8168A86 msgbox gUnknown_818B105, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_168A9B + goto_if eq, EventScript_168A9B releaseall end @@ -70,7 +70,7 @@ EventScript_168A9B:: @ 8168A9B msgbox gUnknown_818B171 giveitem ITEM_TM42 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_168AFE + goto_if eq, EventScript_168AFE call EventScript_168AE8 releaseall end @@ -79,11 +79,11 @@ EventScript_168AE8:: @ 8168AE8 msgbox gUnknown_818B219 applymovement 1, Movement_1A75E9 waitmovement 0 - setflag FLAG_0x236 + setflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR return EventScript_168AFE:: @ 8168AFE - setflag FLAG_0x2D7 + setflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR msgbox gUnknown_818B23E releaseall end diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index af0f12fde..053a14a62 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 9, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 4, "y": 8, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { "graphics_id": "0", @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_PokemonCenter_1F_EventScript_1ACF5F", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index d1c083cb7..8a64b44fa 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index b9f0c8179..ba96caa5a 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 44, "y": 10, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 33, "y": 12, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 12, "y": 10, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 23, "y": 9, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 33, "y": 8, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 33, "y": 3, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 56, "y": 7, "elevation": 1, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 39, "y": 9, "elevation": 3, @@ -121,7 +121,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "148" + "flag": "FLAG_HIDE_RESORT_GORGEOUS_SELPHY" } ], "warp_events": [ @@ -148,8 +148,9 @@ "y": 7, "elevation": 3, "item": "ITEM_NEST_BALL", - "flag": "174", - "unknown": 1 + "flag": "HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_NEST_BALL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -157,8 +158,9 @@ "y": 11, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "175", - "unknown": 1 + "flag": "HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -166,8 +168,9 @@ "y": 12, "elevation": 3, "item": "ITEM_STAR_PIECE", - "flag": "176", - "unknown": 1 + "flag": "HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STAR_PIECE", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -175,8 +178,9 @@ "y": 5, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "177", - "unknown": 1 + "flag": "HIDDEN_ITEM_FIVE_ISLAND_RESORT_GORGEOUS_STARDUST_2", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index a37695954..a4d49de1b 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -29,7 +29,7 @@ EventScript_168808:: @ 8168808 closedoor 39, 8 waitdooranim removeobject 8 - clearflag FLAG_0x095 + clearflag FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 2 releaseall end diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 60c8196d3..cb950d16f 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 4, "y": 4, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_ResortGorgeous_House_EventScript_171EBE", - "flag": "149" + "flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 6, "y": 2, "elevation": 3, @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_ResortGorgeous_House_EventScript_172062", - "flag": "150" + "flag": "FLAG_HIDE_SELPHYS_BUTLER" } ], "warp_events": [ diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index a4dc96f91..18a6d0b14 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -4,16 +4,16 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD FiveIsland_ResortGorgeous_House_EventScript_171EBE:: @ 8171EBE special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer - checkflag FLAG_0x002 - goto_if_eq EventScript_172043 + checkflag FLAG_TEMP_2 + goto_if TRUE, EventScript_172043 compare_var_to_value VAR_STORAGE_UNKNOWN, 65535 - goto_if_eq EventScript_171F0B + goto_if eq, EventScript_171F0B compare_var_to_value VAR_STORAGE_UNKNOWN, 0 - goto_if 5, EventScript_171F19 + goto_if ne, EventScript_171F19 msgbox gUnknown_81A42A0 goto EventScript_171EFE end @@ -33,7 +33,7 @@ EventScript_171F19:: @ 8171F19 copyvar VAR_0x8004, VAR_STORAGE_UNKNOWN specialvar VAR_RESULT, sub_80CC48C compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171F34 + goto_if eq, EventScript_171F34 goto EventScript_171EFE end @@ -53,19 +53,19 @@ EventScript_171F34:: @ 8171F34 msgbox gUnknown_81A4566 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_171FCD + call_if eq, EventScript_171FCD compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_171FE9 + call_if eq, EventScript_171FE9 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_171FFE + call_if eq, EventScript_171FFE compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_17201A + call_if eq, EventScript_17201A moveobjectoffscreen 2 msgbox gUnknown_81A458E giveitem VAR_0x403B compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_172025 - setflag FLAG_0x002 + goto_if eq, EventScript_172025 + setflag FLAG_TEMP_2 setvar VAR_STORAGE_UNKNOWN, 0 release end @@ -103,7 +103,7 @@ EventScript_172025:: @ 8172025 msgbox gUnknown_81A45E8 textcolor 1 msgbox gUnknown_81A461B - setflag FLAG_0x002 + setflag FLAG_TEMP_2 setvar VAR_STORAGE_UNKNOWN, 0 release end diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index bf53c4597..7ac00f1cc 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 15, "y": 11, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "FiveIsland_RocketWarehouse_EventScript_163FE6", - "flag": "136" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 17, "y": 15, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "FiveIsland_RocketWarehouse_EventScript_163FFD", - "flag": "136" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "50", + "graphics_id": "MAP_OBJ_GFX_ROCKET_F", "x": 27, "y": 16, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "FiveIsland_RocketWarehouse_EventScript_164087", - "flag": "136" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 25, "y": 11, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "FiveIsland_RocketWarehouse_EventScript_164014", - "flag": "136" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "50", + "graphics_id": "MAP_OBJ_GFX_ROCKET_F", "x": 6, "y": 6, "elevation": 3, @@ -76,10 +76,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "FiveIsland_RocketWarehouse_EventScript_164070", - "flag": "136" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 27, "y": 4, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 8, "y": 25, "elevation": 3, @@ -102,10 +102,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_RocketWarehouse_EventScript_1BED87", - "flag": "500" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_BIG_PEARL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 3, "elevation": 0, @@ -115,10 +115,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_RocketWarehouse_EventScript_1BED94", - "flag": "501" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_TM36" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 1, "y": 16, "elevation": 3, @@ -128,10 +128,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_RocketWarehouse_EventScript_1BEDA1", - "flag": "502" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_PEARL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 4, "y": 5, "elevation": 3, @@ -141,7 +141,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FiveIsland_RocketWarehouse_EventScript_1BEDAE", - "flag": "503" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_UP_GRADE" } ], "warp_events": [ @@ -159,7 +159,7 @@ "x": 22, "y": 11, "elevation": 3, - "var": "VAR_0x4088", + "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE", "var_value": 0, "script": "FiveIsland_RocketWarehouse_EventScript_163F81" }, @@ -168,7 +168,7 @@ "x": 23, "y": 11, "elevation": 3, - "var": "VAR_0x4088", + "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE", "var_value": 0, "script": "FiveIsland_RocketWarehouse_EventScript_163F81" }, @@ -177,7 +177,7 @@ "x": 24, "y": 11, "elevation": 3, - "var": "VAR_0x4088", + "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE", "var_value": 0, "script": "FiveIsland_RocketWarehouse_EventScript_163F81" } @@ -203,8 +203,9 @@ "y": 2, "elevation": 0, "item": "ITEM_NEST_BALL", - "flag": "68", - "unknown": 1 + "flag": "HIDDEN_ITEM_FIVE_ISLAND_ROCKET_WAREHOUSE_NEST_BALL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -212,8 +213,9 @@ "y": 16, "elevation": 0, "item": "ITEM_NET_BALL", - "flag": "69", - "unknown": 1 + "flag": "HIDDEN_ITEM_FIVE_ISLAND_ROCKET_WAREHOUSE_NET_BALL", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 490afe501..25416a6b4 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -8,8 +8,8 @@ FiveIsland_RocketWarehouse_MapScript2_163F39:: @ 8163F39 end FiveIsland_RocketWarehouse_MapScript1_163F3D:: @ 8163F3D - checktrainerflag FLAG_0x21F - call_if 1, EventScript_163F47 + checktrainerflag TRAINER_TEAM_ROCKET_ADMIN + call_if eq, EventScript_163F47 end EventScript_163F47:: @ 8163F47 @@ -19,8 +19,8 @@ EventScript_163F47:: @ 8163F47 FiveIsland_RocketWarehouse_EventScript_163F5A:: @ 8163F5A lockall - checkflag FLAG_0x2D5 - goto_if_eq EventScript_163F6E + checkflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE + goto_if TRUE, EventScript_163F6E msgbox gUnknown_817B4E3 releaseall end @@ -38,50 +38,48 @@ FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81 lockall applymovement 4, Movement_1A75E7 waitmovement 0 - setvar VAR_0x4088, 1 + setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 releaseall end FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93 - trainerbattle 2, 545, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD - checkflag FLAG_0x844 - goto_if_eq EventScript_163FB7 + trainerbattle 2, TRAINER_SCIENTIST_GIDEON, 0, Text_17BBAF, Text_17BC55, EventScript_163FCD + checkflag FLAG_SYS_CAN_LINK_WITH_RS + goto_if TRUE, EventScript_163FB7 msgbox gUnknown_817BCA3, 6 end EventScript_163FB7:: @ 8163FB7 - setvar VAR_0x8004, 15 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_GIOVANNI, 5 msgbox gUnknown_817BCD7, 6 end EventScript_163FCD:: @ 8163FCD msgbox gUnknown_817BC6C - setflag FLAG_0x2DC + setflag FLAG_RECOVERED_SAPPHIRE giveitem ITEM_SAPPHIRE release end FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6 - trainerbattle 0, 541, 0, Text_17B54D, Text_17B585 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_47, 0, Text_17B54D, Text_17B585 msgbox gUnknown_817B5A6, 6 end FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD - trainerbattle 0, 542, 0, Text_17B677, Text_17B6D9 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_48, 0, Text_17B677, Text_17B6D9 msgbox gUnknown_817B6EF, 6 end FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014 - trainerbattle 2, 544, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F + trainerbattle 2, TRAINER_TEAM_ROCKET_ADMIN_2, 0, Text_17B8DA, Text_17B9FB, EventScript_16402F msgbox gUnknown_817BA64, 6 end EventScript_16402F:: @ 816402F getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164065 + call_if le, EventScript_164065 msgbox gUnknown_817BA64 closemessage fadescreen 1 @@ -89,10 +87,10 @@ EventScript_16402F:: @ 816402F removeobject 2 removeobject 4 removeobject 3 - setflag FLAG_0x088 + setflag FLAG_HIDE_FIVE_ISLAND_ROCKETS fadescreen 0 - setvar VAR_0x4088, 1 - setflag FLAG_0x2D5 + setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1 + setflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE release end @@ -102,12 +100,12 @@ EventScript_164065:: @ 8164065 return FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070 - trainerbattle 0, 516, 0, Text_17B5D6, Text_17B62F + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_42, 0, Text_17B5D6, Text_17B62F msgbox gUnknown_817B642, 6 end FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087 - trainerbattle 2, 543, 0, Text_17B72D, Text_17B79C, EventScript_1640A2 + trainerbattle 2, TRAINER_TEAM_ROCKET_ADMIN, 0, Text_17B72D, Text_17B79C, EventScript_1640A2 msgbox gUnknown_817B7FA, 6 end @@ -115,36 +113,36 @@ EventScript_1640A2:: @ 81640A2 getplayerxy VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, GetPlayerFacingDirection compare_var_to_value VAR_RESULT, 2 - call_if 1, EventScript_16412E + call_if eq, EventScript_16412E msgbox gUnknown_817B7AE closemessage compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164144 + call_if le, EventScript_164144 compare_var_to_value VAR_0x8004, 25 - call_if 1, EventScript_16414F + call_if eq, EventScript_16414F compare_var_to_value VAR_0x8004, 26 - call_if 1, EventScript_16415A + call_if eq, EventScript_16415A compare_var_to_value VAR_0x8004, 27 - call_if 1, EventScript_16415A + call_if eq, EventScript_16415A playse SE_PIN call EventScript_163F47 special DrawWholeMapView waitse compare_var_to_value VAR_0x8004, 24 - call_if 3, EventScript_164165 + call_if le, EventScript_164165 compare_var_to_value VAR_0x8004, 25 - call_if 1, EventScript_164165 + call_if eq, EventScript_164165 compare_var_to_value VAR_0x8004, 26 - call_if 1, EventScript_164165 + call_if eq, EventScript_164165 compare_var_to_value VAR_0x8004, 27 - call_if 1, EventScript_164170 + call_if eq, EventScript_164170 msgbox gUnknown_817B7FA release end EventScript_16412E:: @ 816412E compare_var_to_value VAR_0x8004, 27 - goto_if_eq EventScript_1A77A9 + goto_if eq, EventScript_1A77A9 applymovement 255, Movement_1A75EB waitmovement 0 return diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index 173c247da..e9f0eb16a 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 14, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 9, "y": 7, "elevation": 3, diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index b3b6243ab..979486b7c 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -4,26 +4,24 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D FiveIsland_WaterLabyrinth_EventScript_16884E:: @ 816884E special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer - checkflag FLAG_0x2DA - goto_if_eq EventScript_1688E3 - checkflag FLAG_0x2DB - goto_if_eq EventScript_16892C + checkflag FLAG_GOT_TOGEPI_EGG + goto_if TRUE, EventScript_1688E3 + checkflag FLAG_NO_ROOM_FOR_TOGEPI_EGG + goto_if TRUE, EventScript_16892C msgbox gUnknown_818A80D specialvar VAR_RESULT, sub_80CA76C compare_var_to_value VAR_RESULT, 6 - goto_if_eq EventScript_1688AC + goto_if eq, EventScript_1688AC msgbox gUnknown_818A88F release end EventScript_168895:: @ 8168895 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_DAISY, 2 msgbox gUnknown_818AA0C release end @@ -36,8 +34,8 @@ EventScript_1688AC:: @ 81688AC EventScript_1688BA:: @ 81688BA countpokemon compare_var_to_value VAR_RESULT, 6 - goto_if_eq EventScript_16891F - setflag FLAG_0x2DA + goto_if eq, EventScript_16891F + setflag FLAG_GOT_TOGEPI_EGG giveegg SPECIES_TOGEPI textcolor 3 playfanfare MUS_FANFA1 @@ -50,21 +48,21 @@ EventScript_1688BA:: @ 81688BA EventScript_1688E3:: @ 81688E3 getspeciesname 1, SPECIES_TOGEPI - setvar VAR_0x8004, 175 + setvar VAR_0x8004, SPECIES_TOGEPI specialvar VAR_RESULT, sub_80CD0F4 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_168895 + goto_if eq, EventScript_168895 getspeciesname 1, SPECIES_TOGETIC - setvar VAR_0x8004, 176 + setvar VAR_0x8004, SPECIES_TOGETIC specialvar VAR_RESULT, sub_80CD0F4 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_168895 + goto_if eq, EventScript_168895 msgbox gUnknown_818A9C0 release end EventScript_16891F:: @ 816891F - setflag FLAG_0x2DB + setflag FLAG_NO_ROOM_FOR_TOGEPI_EGG msgbox gUnknown_818A940 release end diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index e920ba0af..54e4e9849 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 16, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "132", + "graphics_id": "MAP_OBJ_GFX_DODUO", "x": 12, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "122", + "graphics_id": "MAP_OBJ_GFX_NIDORAN_F", "x": 13, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "123", + "graphics_id": "MAP_OBJ_GFX_NIDORAN_M", "x": 14, "y": 7, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "121", + "graphics_id": "MAP_OBJ_GFX_PSYDUCK", "x": 17, "y": 9, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 26, "y": 19, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 11, "elevation": 3, @@ -101,11 +101,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FourIsland_EventScript_1BE00C", - "flag": "18" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 6, "elevation": 3, @@ -115,10 +115,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_EventScript_1BEC28", - "flag": "473" + "flag": "FLAG_HIDE_FOUR_ISLAND_STAR_PIECE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 32, "y": 19, "elevation": 3, @@ -128,10 +128,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_EventScript_1BEC35", - "flag": "474" + "flag": "FLAG_HIDE_FOUR_ISLAND_STARDUST" }, { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 8, "y": 25, "elevation": 3, @@ -141,10 +141,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "151" + "flag": "FLAG_HIDE_FOUR_ISLAND_RIVAL" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 36, "y": 13, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 31, "y": 21, "elevation": 3, @@ -243,17 +243,19 @@ "y": 34, "elevation": 3, "item": "ITEM_PEARL", - "flag": "168", - "unknown": 1 + "flag": "HIDDEN_ITEM_FOUR_ISLAND_PEARL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", "x": 6, "y": 21, "elevation": 3, - "item": "POCKET_KEY_ITEMS", - "flag": "169", - "unknown": 1 + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_FOUR_ISLAND_ULTRA_BALL", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 8da7aef54..3ef1f2054 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -6,17 +6,17 @@ FourIsland_MapScripts:: @ 8167CAE FourIsland_MapScript1_167CB9:: @ 8167CB9 setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND compare_var_to_value VAR_MAP_SCENE_FOUR_ISLAND, 0 - call_if 1, EventScript_167CCD + call_if eq, EventScript_167CCD call EventScript_167CD1 end EventScript_167CCD:: @ 8167CCD - clearflag FLAG_0x097 + clearflag FLAG_HIDE_FOUR_ISLAND_RIVAL return EventScript_167CD1:: @ 8167CD1 checkflag FLAG_PENDING_DAYCARE_EGG - goto_if 0, EventScript_167CE1 + goto_if FALSE, EventScript_167CE1 setobjectxyperm 1, 16, 14 EventScript_167CE1:: @ 8167CE1 @@ -73,18 +73,18 @@ Movement_167D52:: @ 8167D52 FourIsland_EventScript_167D55:: @ 8167D55 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer special GetDaycareMonNicknames specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_167D9B + goto_if eq, EventScript_167D9B compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_167E0C + goto_if eq, EventScript_167E0C compare_var_to_value VAR_RESULT, 3 - goto_if_eq EventScript_167E19 + goto_if eq, EventScript_167E19 msgbox gUnknown_81BF555 release end @@ -92,10 +92,10 @@ FourIsland_EventScript_167D55:: @ 8167D55 EventScript_167D9B:: @ 8167D9B msgbox gUnknown_81BF5E3, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_167DD1 + goto_if eq, EventScript_167DD1 msgbox gUnknown_81BF7B6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_167DD1 + goto_if eq, EventScript_167DD1 msgbox gUnknown_81BF6CF clearflag FLAG_PENDING_DAYCARE_EGG special RejectEggFromDayCare @@ -105,7 +105,7 @@ EventScript_167D9B:: @ 8167D9B EventScript_167DD1:: @ 8167DD1 specialvar VAR_RESULT, CalculatePlayerPartyCount compare_var_to_value VAR_RESULT, 6 - goto_if 5, EventScript_167DEB + goto_if ne, EventScript_167DEB msgbox gUnknown_81BF6F0 release end @@ -142,16 +142,14 @@ EventScript_167E19:: @ 8167E19 FourIsland_EventScript_167E2E:: @ 8167E2E lock faceplayer - checkflag FLAG_0x844 - goto_if_eq EventScript_167E43 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + goto_if TRUE, EventScript_167E43 msgbox gUnknown_8182A2B release end EventScript_167E43:: @ 8167E43 - setvar VAR_0x8004, 9 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_LORELEI, 5 msgbox gUnknown_8182A75 release end @@ -159,9 +157,7 @@ EventScript_167E43:: @ 8167E43 FourIsland_EventScript_167E5A:: @ 8167E5A lock faceplayer - setvar VAR_0x8004, 9 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_LORELEI, 4 msgbox gUnknown_8182CE3 release end diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index e7507d3fe..5b550da70 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/FourIsland_Harbor/scripts.inc b/data/maps/FourIsland_Harbor/scripts.inc index 2c7fce02f..b9c632972 100644 --- a/data/maps/FourIsland_Harbor/scripts.inc +++ b/data/maps/FourIsland_Harbor/scripts.inc @@ -6,6 +6,6 @@ FourIsland_Harbor_EventScript_171C99:: @ 8171C99 faceplayer message Text_181726 waitmessage - setvar VAR_0x8004, 4 + setvar VAR_0x8004, SEAGALLOP_FOUR_ISLAND goto EventScript_1A900F end diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index a33509d0c..c47859aff 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 8, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index bfb59deeb..a11437ab1 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 9a9bb955a..995ac7728 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 7, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_IcefallCave_1F_EventScript_1BED53", - "flag": "496" + "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_ULTRA_BALL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 16, "elevation": 3, @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_IcefallCave_1F_EventScript_1BED60", - "flag": "497" + "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_HM07" } ], "warp_events": [ diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index 709b24259..0fbf41a57 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 10, "y": 14, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_IcefallCave_B1F_EventScript_1BED6D", - "flag": "498" + "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_FULL_RESTORE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 21, "y": 7, "elevation": 3, @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_IcefallCave_B1F_EventScript_1BED7A", - "flag": "499" + "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_NEVER_MELT_ICE" } ], "warp_events": [ diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index 6be98b468..12e4daece 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 11, "y": 14, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "141" + "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 13, "y": 14, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "141" + "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" }, { - "graphics_id": "77", + "graphics_id": "MAP_OBJ_GFX_LORELEI", "x": 12, "y": 16, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_IcefallCave_Back_EventScript_163F25", - "flag": "139" + "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 10, "y": 15, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "141" + "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" } ], "warp_events": [ @@ -81,7 +81,7 @@ "x": 11, "y": 18, "elevation": 3, - "var": "VAR_0x4080", + "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", "var_value": 0, "script": "FourIsland_IcefallCave_Back_EventScript_163D98" }, @@ -90,7 +90,7 @@ "x": 12, "y": 18, "elevation": 3, - "var": "VAR_0x4080", + "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", "var_value": 0, "script": "FourIsland_IcefallCave_Back_EventScript_163D98" }, @@ -99,7 +99,7 @@ "x": 13, "y": 18, "elevation": 3, - "var": "VAR_0x4080", + "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK", "var_value": 0, "script": "FourIsland_IcefallCave_Back_EventScript_163D98" } diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 7054d0a18..eadc1f469 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -3,12 +3,12 @@ FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 .byte 0 FourIsland_IcefallCave_Back_MapScript1_163D88:: @ 8163D88 - compare_var_to_value VAR_0x4080, 1 - call_if 1, EventScript_163D94 + compare_var_to_value VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 + call_if eq, EventScript_163D94 end EventScript_163D94:: @ 8163D94 - setflag FLAG_0x08B + setflag FLAG_HIDE_ICEFALL_CAVE_LORELEI return FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 @@ -46,7 +46,7 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 textcolor 0 msgbox gUnknown_817B20B setvar VAR_LAST_TALKED, 4 - trainerbattle 3, 539, 0, Text_17B251 + trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_45, 0, Text_17B251 applymovement 3, Movement_163F1B waitmovement 0 textcolor 1 @@ -81,9 +81,9 @@ FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98 waitmovement 0 textcolor 1 msgbox gUnknown_817B457 - setflag FLAG_0x08E - clearflag FLAG_0x08C - setvar VAR_0x4080, 1 + setflag FLAG_HIDE_RUIN_VALLEY_SCIENTIST + clearflag FLAG_HIDE_LORELEI_IN_HER_HOUSE + setvar VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 releaseall end diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index 45784f529..b40738201 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "77", + "graphics_id": "MAP_OBJ_GFX_LORELEI", "x": 7, "y": 4, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C58", - "flag": "140" + "flag": "FLAG_HIDE_LORELEI_IN_HER_HOUSE" }, { - "graphics_id": "131", + "graphics_id": "MAP_OBJ_GFX_WIGGLYTUFF", "x": 0, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "126", + "graphics_id": "MAP_OBJ_GFX_SEEL", "x": 10, "y": 3, "elevation": 0, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "120", + "graphics_id": "MAP_OBJ_GFX_PIKACHU", "x": 9, "y": 3, "elevation": 0, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "128", + "graphics_id": "MAP_OBJ_GFX_SLOWPOKE", "x": 7, "y": 2, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "129", + "graphics_id": "MAP_OBJ_GFX_SLOWBRO", "x": 6, "y": 2, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "121", + "graphics_id": "MAP_OBJ_GFX_PSYDUCK", "x": 6, "y": 4, "elevation": 0, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "125", + "graphics_id": "MAP_OBJ_GFX_MEOWTH", "x": 9, "y": 4, "elevation": 0, @@ -115,10 +115,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C8D", - "flag": "165" + "flag": "FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL" }, { - "graphics_id": "117", + "graphics_id": "MAP_OBJ_GFX_CHANSEY", "x": 10, "y": 4, "elevation": 0, @@ -128,10 +128,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C8D", - "flag": "166" + "flag": "FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL" }, { - "graphics_id": "115", + "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF", "x": 0, "y": 3, "elevation": 3, @@ -141,10 +141,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C8D", - "flag": "168" + "flag": "FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL" }, { - "graphics_id": "122", + "graphics_id": "MAP_OBJ_GFX_NIDORAN_F", "x": 0, "y": 5, "elevation": 3, @@ -154,10 +154,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C8D", - "flag": "167" + "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL" }, { - "graphics_id": "123", + "graphics_id": "MAP_OBJ_GFX_NIDORAN_M", "x": 1, "y": 5, "elevation": 3, @@ -167,10 +167,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C8D", - "flag": "169" + "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL" }, { - "graphics_id": "114", + "graphics_id": "MAP_OBJ_GFX_PIDGEOT", "x": 9, "y": 0, "elevation": 3, @@ -180,10 +180,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C8D", - "flag": "171" + "flag": "FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL" }, { - "graphics_id": "133", + "graphics_id": "MAP_OBJ_GFX_FEAROW", "x": 10, "y": 0, "elevation": 3, @@ -193,10 +193,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C8D", - "flag": "170" + "flag": "FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL" }, { - "graphics_id": "107", + "graphics_id": "MAP_OBJ_GFX_LAPRAS_DOLL", "x": 9, "y": 6, "elevation": 3, @@ -206,7 +206,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_LoreleisHouse_EventScript_171C8D", - "flag": "172" + "flag": "FLAG_HIDE_LORELEIS_HOUSE_LAPRAS_DOLL" } ], "warp_events": [ diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc index ab7196c62..6a8915d83 100644 --- a/data/maps/FourIsland_LoreleisHouse/scripts.inc +++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc @@ -3,22 +3,22 @@ FourIsland_LoreleisHouse_MapScripts:: @ 8171C4E .byte 0 FourIsland_LoreleisHouse_MapScript1_171C54:: @ 8171C54 - special sub_80CD154 + special Special_ComputeLoreleiDollCollection end FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58 lock faceplayer - checkflag FLAG_0x2D4 - goto_if_eq EventScript_171C83 - checkflag FLAG_0x2D5 - goto_if_eq EventScript_171C76 + checkflag FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE + goto_if TRUE, EventScript_171C83 + checkflag FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE + goto_if TRUE, EventScript_171C76 msgbox gUnknown_81A3826 release end EventScript_171C76:: @ 8171C76 - setflag FLAG_0x2D4 + setflag FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE msgbox gUnknown_81A390C release end diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index ca5cba0ec..5b9164382 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 6, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 8, "y": 3, "elevation": 3, diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index 026d172a9..c74ac396a 100644 --- a/data/maps/FourIsland_Mart/scripts.inc +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -4,7 +4,7 @@ FourIsland_Mart_MapScripts:: @ 8171CAD FourIsland_Mart_EventScript_171CAE:: @ 8171CAE special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index 45d65222d..f6db941e8 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 10, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 5, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index a118bf9bb..dbb6bb145 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FourIsland_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index 812097722..be2f8dc9d 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 394b29334..7ca07b4ba 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -4,19 +4,19 @@ FourIsland_PokemonDayCare_MapScripts:: @ 817193F FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171A2E + goto_if eq, EventScript_171A2E compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_171A52 + goto_if eq, EventScript_171A52 compare_var_to_value VAR_RESULT, 3 - goto_if_eq EventScript_171B86 + goto_if eq, EventScript_171B86 msgbox gUnknown_81BF7E4, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171993 + goto_if eq, EventScript_171993 msgbox gUnknown_81BF916 release end @@ -24,16 +24,16 @@ FourIsland_PokemonDayCare_EventScript_171940:: @ 8171940 EventScript_171993:: @ 8171993 specialvar VAR_RESULT, CountPartyNonEggMons compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171A1A + goto_if eq, EventScript_171A1A msgbox gUnknown_81BF839 fadescreen 1 special ChooseSendDaycareMon waitstate compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_1719F7 + goto_if ge, EventScript_1719F7 specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_171A24 + goto_if eq, EventScript_171A24 specialvar VAR_0x8005, GetSelectedMonNickAndSpecies waitse playmoncry VAR_0x8005, 0 @@ -43,7 +43,7 @@ EventScript_171993:: @ 8171993 incrementgamestat 47 specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_171A01 + goto_if eq, EventScript_171A01 release end @@ -55,7 +55,7 @@ EventScript_1719F7:: @ 81719F7 EventScript_171A01:: @ 8171A01 msgbox gUnknown_81BF89F, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171993 + goto_if eq, EventScript_171993 goto EventScript_1719F7 end @@ -81,7 +81,7 @@ EventScript_171A38:: @ 8171A38 EventScript_171A41:: @ 8171A41 specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare compare_var_to_value VAR_RESULT, 0 - call_if 5, EventScript_171A38 + call_if ne, EventScript_171A38 return EventScript_171A52:: @ 8171A52 @@ -90,26 +90,26 @@ EventScript_171A52:: @ 8171A52 call EventScript_171A41 msgbox gUnknown_81BF89F, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171993 + goto_if eq, EventScript_171993 msgbox gUnknown_81BFAE8, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171A90 + goto_if eq, EventScript_171A90 goto EventScript_1719F7 end EventScript_171A90:: @ 8171A90 specialvar VAR_RESULT, CalculatePlayerPartyCount compare_var_to_value VAR_RESULT, 6 - goto_if_eq EventScript_171B67 + goto_if eq, EventScript_171B67 specialvar VAR_RESULT, GetDaycareState setvar VAR_0x8004, 0 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_171ACF + goto_if eq, EventScript_171ACF special ShowDaycareLevelMenu waitstate copyvar VAR_0x8004, VAR_RESULT compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1719F7 + goto_if eq, EventScript_1719F7 goto EventScript_171ACF end @@ -117,14 +117,14 @@ EventScript_171ACF:: @ 8171ACF special GetDaycareCost msgbox gUnknown_81BFA3B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171AEB + goto_if eq, EventScript_171AEB goto EventScript_1719F7 end EventScript_171AEB:: @ 8171AEB specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171B05 + goto_if eq, EventScript_171B05 msgbox gUnknown_81BF932 release end @@ -144,14 +144,14 @@ EventScript_171B05:: @ 8171B05 waitmoncry specialvar VAR_RESULT, GetDaycareState compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_171B4E + goto_if eq, EventScript_171B4E goto EventScript_1719F7 end EventScript_171B4E:: @ 8171B4E msgbox gUnknown_81BF94F, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171A90 + goto_if eq, EventScript_171A90 goto EventScript_1719F7 end @@ -193,7 +193,7 @@ EventScript_171B86:: @ 8171B86 call EventScript_171A41 msgbox gUnknown_81BFAE8, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171A90 + goto_if eq, EventScript_171A90 msgbox gUnknown_81BF976 release end @@ -202,7 +202,7 @@ EventScript_171BBF:: @ 8171BBF special ShowDaycareLevelMenu waitstate compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1719F7 + goto_if eq, EventScript_1719F7 copyvar VAR_0x8004, VAR_RESULT specialvar VAR_RESULT, TakePokemonFromDaycare msgbox gUnknown_81BFA67 diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index deb0dc7c0..9b484daec 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 37, "y": 17, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "128", + "graphics_id": "MAP_OBJ_GFX_SLOWPOKE", "x": 36, "y": 15, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "0" }, { - "graphics_id": "127", + "graphics_id": "MAP_OBJ_GFX_VOLTORB", "x": 33, "y": 8, "elevation": 3, @@ -69,7 +69,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 33, "y": 11, "elevation": 3, @@ -82,7 +82,7 @@ "flag": "0" }, { - "graphics_id": "117", + "graphics_id": "MAP_OBJ_GFX_CHANSEY", "x": 39, "y": 8, "elevation": 3, @@ -95,7 +95,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 14, "y": 15, "elevation": 3, @@ -108,7 +108,7 @@ "flag": "0" }, { - "graphics_id": "135", + "graphics_id": "MAP_OBJ_GFX_LAPRAS", "x": 12, "y": 20, "elevation": 1, @@ -121,7 +121,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 36, "y": 20, "elevation": 3, @@ -134,7 +134,7 @@ "flag": "0" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 8, "y": 8, "elevation": 1, @@ -147,7 +147,7 @@ "flag": "0" }, { - "graphics_id": "119", + "graphics_id": "MAP_OBJ_GFX_KANGASKHAN", "x": 16, "y": 9, "elevation": 3, @@ -160,7 +160,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 30, "y": 10, "elevation": 3, @@ -169,11 +169,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 21, "y": 13, "elevation": 3, @@ -182,11 +182,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_EventScript_1BDF13", - "flag": "19" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 32, "y": 16, "elevation": 3, @@ -195,11 +195,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_EventScript_1BDF13", - "flag": "20" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 24, "y": 22, "elevation": 3, @@ -208,11 +208,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_EventScript_1BDF13", - "flag": "21" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_15" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 15, "y": 11, "elevation": 3, @@ -225,7 +225,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 40, "y": 6, "elevation": 3, @@ -235,7 +235,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FuchsiaCity_EventScript_166DC1", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ @@ -402,8 +402,9 @@ "y": 26, "elevation": 3, "item": "ITEM_MAX_REVIVE", - "flag": "133", - "unknown": 1 + "flag": "HIDDEN_ITEM_FUCHSIA_CITY_MAX_REVIVE", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index 9fefb3d86..d62d5252d 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -4,18 +4,18 @@ FuchsiaCity_MapScripts:: @ 8166D75 FuchsiaCity_MapScript1_166D7B:: @ 8166D7B setworldmapflag FLAG_WORLD_MAP_FUCHSIA_CITY - checkflag FLAG_0x272 - call_if 1, EventScript_166D91 - checkflag FLAG_0x272 - call_if 0, EventScript_166D97 + checkflag FLAG_GOT_DOME_FOSSIL + call_if TRUE, EventScript_166D91 + checkflag FLAG_GOT_DOME_FOSSIL + call_if FALSE, EventScript_166D97 end EventScript_166D91:: @ 8166D91 - setvar VAR_0x4010, 118 + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_OMANYTE return EventScript_166D97:: @ 8166D97 - setvar VAR_0x4010, 147 + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_KABUTO return FuchsiaCity_EventScript_166D9D:: @ 8166D9D @@ -37,9 +37,7 @@ FuchsiaCity_EventScript_166DB8:: @ 8166DB8 FuchsiaCity_EventScript_166DC1:: @ 8166DC1 lock faceplayer - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_KOGA, 3 msgbox gUnknown_8180ABD release end @@ -66,9 +64,7 @@ EventScript_166DFE:: @ 8166DFE FuchsiaCity_EventScript_166E07:: @ 8166E07 lockall - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_KOGA, 0 msgbox gUnknown_8180768 releaseall end @@ -125,8 +121,8 @@ FuchsiaCity_EventScript_166E83:: @ 8166E83 FuchsiaCity_EventScript_166E9C:: @ 8166E9C lockall - checkflag FLAG_0x272 - goto_if_eq EventScript_166EBE + checkflag FLAG_GOT_DOME_FOSSIL + goto_if TRUE, EventScript_166EBE setvar VAR_0x8004, SPECIES_KABUTO special sub_80CBDCC drawmonpic SPECIES_KABUTO, 10, 3 diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json index 2d567eaaf..7fbd2870c 100644 --- a/data/maps/FuchsiaCity_Building1/map.json +++ b/data/maps/FuchsiaCity_Building1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 11, "y": 6, "elevation": 3, @@ -36,11 +36,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "FuchsiaCity_Building1_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 5, "elevation": 3, @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FuchsiaCity_Building1_EventScript_1BEAA2", - "flag": "441" + "flag": "FLAG_HIDE_FUCHSIA_CITY_BUILDING1_RARE_CANDY" }, { "graphics_id": "0", @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FuchsiaCity_Building1_EventScript_1ACEB8", - "flag": "159" + "flag": "FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL" } ], "warp_events": [ diff --git a/data/maps/FuchsiaCity_Building1/scripts.inc b/data/maps/FuchsiaCity_Building1/scripts.inc index 58cacf92e..2a07b6bb0 100644 --- a/data/maps/FuchsiaCity_Building1/scripts.inc +++ b/data/maps/FuchsiaCity_Building1/scripts.inc @@ -4,15 +4,15 @@ FuchsiaCity_Building1_MapScripts:: @ 816D74B FuchsiaCity_Building1_EventScript_16D74C:: @ 816D74C lock faceplayer - checkflag FLAG_0x23A - goto_if_eq EventScript_16D7FA - checkflag FLAG_0x189 - goto_if_eq EventScript_16D780 + checkflag FLAG_GOT_HM04 + goto_if TRUE, EventScript_16D7FA + checkflag FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH + goto_if TRUE, EventScript_16D780 msgbox gUnknown_8198DF9, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16D7E8 + call_if eq, EventScript_16D7E8 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16D7F1 + call_if eq, EventScript_16D7F1 release end @@ -26,12 +26,12 @@ EventScript_16D780:: @ 816D780 call EventScript_1A6675 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16D7D6 + call_if eq, EventScript_16D7D6 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16D7DF + call_if eq, EventScript_16D7DF additem ITEM_HM04, 1 giveitemfanfaremsg gUnknown_8199068, ITEM_HM04 - setflag FLAG_0x23A + setflag FLAG_GOT_HM04 removeitem ITEM_GOLD_TEETH, 1 release end diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index ff7e432c2..4ee96a265 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 12, "y": 16, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 2, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 11, "y": 11, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 13, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 4, "y": 6, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 2, "y": 16, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "84", + "graphics_id": "MAP_OBJ_GFX_KOGA", "x": 7, "y": 13, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 11, "y": 19, "elevation": 3, diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 6b57f6377..57d866f6b 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -2,25 +2,20 @@ FuchsiaCity_Gym_MapScripts:: @ 816D54D .byte 0 FuchsiaCity_Gym_EventScript_16D54E:: @ 816D54E - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 418, 0, Text_19832E, Text_198444, EventScript_16D580 - checkflag FLAG_0x259 - goto_if 0, EventScript_16D5A6 + famechecker FAMECHECKER_KOGA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + trainerbattle 1, TRAINER_LEADER_KOGA, 0, Text_19832E, Text_198444, EventScript_16D580 + checkflag FLAG_GOT_TM06_FROM_KOGA + goto_if FALSE, EventScript_16D5A6 msgbox gUnknown_8198481 release end EventScript_16D580:: @ 816D580 - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - clearflag FLAG_0x09F - setflag FLAG_0x4B4 - setflag FLAG_UNK824 - setvar VAR_0x8008, 5 - call EventScript_1A6B18 + famechecker FAMECHECKER_KOGA, 1 + clearflag FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL + setflag FLAG_DEFEATED_KOGA + setflag FLAG_BADGE05_GET + set_gym_trainers 5 goto EventScript_16D5A6 end @@ -28,10 +23,10 @@ EventScript_16D5A6:: @ 816D5A6 msgbox gUnknown_819850E checkitemspace ITEM_TM06, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16D5E7 + goto_if eq, EventScript_16D5E7 additem ITEM_TM06, 1 giveitemfanfaremsg gUnknown_819858F, ITEM_TM06 - setflag FLAG_0x259 + setflag FLAG_GOT_TM06_FROM_KOGA msgbox gUnknown_81985AB release end @@ -42,43 +37,41 @@ EventScript_16D5E7:: @ 816D5E7 end FuchsiaCity_Gym_EventScript_16D5F1:: @ 816D5F1 - trainerbattle 0, 294, 0, Text_198866, Text_1988B6 + trainerbattle 0, TRAINER_TAMER_PHIL, 0, Text_198866, Text_1988B6 msgbox gUnknown_81988CB, 6 end FuchsiaCity_Gym_EventScript_16D608:: @ 816D608 - trainerbattle 0, 295, 0, Text_19891F, Text_19897F + trainerbattle 0, TRAINER_TAMER_EDGAR, 0, Text_19891F, Text_19897F msgbox gUnknown_8198985, 6 end FuchsiaCity_Gym_EventScript_16D61F:: @ 816D61F - trainerbattle 0, 288, 0, Text_19871E, Text_198779 - setvar VAR_0x8004, 6 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + trainerbattle 0, TRAINER_JUGGLER_KIRK, 0, Text_19871E, Text_198779 + famechecker FAMECHECKER_KOGA, 2 msgbox gUnknown_8198787, 6 end FuchsiaCity_Gym_EventScript_16D643:: @ 816D643 - trainerbattle 0, 289, 0, Text_1989A1, Text_1989EA + trainerbattle 0, TRAINER_JUGGLER_SHAWN, 0, Text_1989A1, Text_1989EA msgbox gUnknown_8198A10, 6 end FuchsiaCity_Gym_EventScript_16D65A:: @ 816D65A - trainerbattle 0, 292, 0, Text_198629, Text_1986B4 + trainerbattle 0, TRAINER_JUGGLER_KAYDEN, 0, Text_198629, Text_1986B4 msgbox gUnknown_81986C9, 6 end FuchsiaCity_Gym_EventScript_16D671:: @ 816D671 - trainerbattle 0, 293, 0, Text_1987E8, Text_198812 + trainerbattle 0, TRAINER_JUGGLER_NATE, 0, Text_1987E8, Text_198812 msgbox gUnknown_8198825, 6 end FuchsiaCity_Gym_EventScript_16D688:: @ 816D688 lock faceplayer - checkflag FLAG_0x4B4 - goto_if_eq EventScript_16D69D + checkflag FLAG_DEFEATED_KOGA + goto_if TRUE, EventScript_16D69D msgbox gUnknown_8198A5E release end @@ -90,8 +83,8 @@ EventScript_16D69D:: @ 816D69D FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7 lockall - checkflag FLAG_UNK824 - goto_if_eq EventScript_16D6BB + checkflag FLAG_BADGE05_GET + goto_if TRUE, EventScript_16D6BB msgbox gUnknown_8198B4B releaseall end diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index 7f6e645b4..a0b11d62e 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 1, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 2, "y": 5, "elevation": 3, diff --git a/data/maps/FuchsiaCity_House1/scripts.inc b/data/maps/FuchsiaCity_House1/scripts.inc index 9ff2ecb93..32be06c57 100644 --- a/data/maps/FuchsiaCity_House1/scripts.inc +++ b/data/maps/FuchsiaCity_House1/scripts.inc @@ -8,9 +8,7 @@ FuchsiaCity_House1_EventScript_16D6C6:: @ 816D6C6 FuchsiaCity_House1_EventScript_16D6CF:: @ 816D6CF lock faceplayer - setvar VAR_0x8004, 13 @ FAMECHECKER_BILL - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BILL, 2 msgbox gUnknown_8198C1F release end diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index 5aeaa2b32..2f57e17fb 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index 0568d4e4f..4470655ff 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -4,11 +4,11 @@ FuchsiaCity_House2_MapScripts:: @ 816D816 FuchsiaCity_House2_EventScript_16D817:: @ 816D817 lock faceplayer - checkflag FLAG_0x244 - goto_if_eq EventScript_16D83F + checkflag FLAG_GOT_GOOD_ROD + goto_if TRUE, EventScript_16D83F msgbox gUnknown_819918E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16D849 + goto_if eq, EventScript_16D849 msgbox gUnknown_8199337 release end @@ -22,11 +22,11 @@ EventScript_16D849:: @ 816D849 msgbox gUnknown_8199207 checkitemspace ITEM_GOOD_ROD, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16D88A + goto_if eq, EventScript_16D88A additem ITEM_GOOD_ROD, 1 giveitemfanfaremsg gUnknown_819925E, ITEM_GOOD_ROD msgbox gUnknown_8199296 - setflag FLAG_0x244 + setflag FLAG_GOT_GOOD_ROD release end diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index 2267848fc..4e47edc91 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index e295ad46d..f08f9371d 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -6,37 +6,37 @@ FuchsiaCity_House3_EventScript_16D895:: @ 816D895 faceplayer msgbox gUnknown_81993B9, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16D8B0 + goto_if eq, EventScript_16D8B0 goto EventScript_16D941 end EventScript_16D8B0:: @ 816D8B0 msgbox gUnknown_8199421 - special sub_80BF8FC + special Special_ChooseMonFromParty waitstate compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16D941 + goto_if ge, EventScript_16D941 special sub_80BFC14 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16D937 + goto_if eq, EventScript_16D937 special ScrSpecial_CountPokemonMoves compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16D92A + goto_if eq, EventScript_16D92A msgbox gUnknown_8199445 fadescreen 1 - special sub_80BF9BC + special Special_ChooseMoveToDelete fadescreen 0 compare_var_to_value VAR_0x8005, 4 - goto_if_eq EventScript_16D8B0 + goto_if eq, EventScript_16D8B0 special ScrSpecial_GetPokemonNicknameAndMoveName msgbox gUnknown_8199485, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16D919 + goto_if eq, EventScript_16D919 goto EventScript_16D941 end EventScript_16D919:: @ 816D919 - special sub_80BFBA8 + special Special_DeleteSelectedMove playfanfare MUS_ME_WASURE waitfanfare msgbox gUnknown_81994B1 diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index fcdd61d33..d8da727b1 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 6, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc index fe95c748c..dea51b320 100644 --- a/data/maps/FuchsiaCity_Mart/scripts.inc +++ b/data/maps/FuchsiaCity_Mart/scripts.inc @@ -12,7 +12,7 @@ FuchsiaCity_Mart_EventScript_16D4EA:: @ 816D4EA FuchsiaCity_Mart_EventScript_16D4F3:: @ 816D4F3 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index 4b711686d..6246ddfb2 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 12, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 13, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 4, "y": 8, "elevation": 3, diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 6b0547ad4..c54ed2085 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "FuchsiaCity_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index bbfc3846f..d0451f0aa 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 7, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index d9bcea13d..e1031e737 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -39,7 +39,7 @@ EventScript_16D312:: @ 816D312 textcolor 0 msgbox gUnknown_8197E1A, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16D345 + goto_if eq, EventScript_16D345 msgbox gUnknown_8197E48 closemessage applymovement 255, Movement_16D362 @@ -103,7 +103,7 @@ EventScript_16D391:: @ 816D391 showmoneybox 0, 0, 0 msgbox gUnknown_8197C87, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16D3CA + goto_if eq, EventScript_16D3CA msgbox gUnknown_8197DE9 goto EventScript_16D49A end @@ -112,7 +112,7 @@ EventScript_16D3CA:: @ 816D3CA call EventScript_16D462 checkmoney 500, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16D48C + goto_if eq, EventScript_16D48C takemoney 500, 0 updatemoneybox 0, 0, 0 msgbox gUnknown_8197D07 @@ -127,11 +127,11 @@ EventScript_16D3CA:: @ 816D3CA .byte 0 .byte 0 compare_var_to_value VAR_0x4002, 0 - call_if 1, EventScript_16D44C + call_if eq, EventScript_16D44C compare_var_to_value VAR_0x4002, 1 - call_if 1, EventScript_16D441 + call_if eq, EventScript_16D441 compare_var_to_value VAR_0x4002, 2 - call_if 1, EventScript_16D457 + call_if eq, EventScript_16D457 special EnterSafariMode setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2 warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30 @@ -156,10 +156,10 @@ EventScript_16D457:: @ 816D457 EventScript_16D462:: @ 816D462 countpokemon compare_var_to_value VAR_RESULT, 6 - goto_if 5, EventScript_1A77A9 + goto_if ne, EventScript_1A77A9 specialvar VAR_RESULT, sub_80CABD0 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1A77A9 + goto_if eq, EventScript_1A77A9 msgbox gUnknown_81BFEAC goto EventScript_16D49A end @@ -205,7 +205,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_16D4B7:: @ 816D4B7 faceplayer msgbox gUnknown_8197EB0, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16D4D6 + goto_if eq, EventScript_16D4D6 msgbox gUnknown_819809E release end diff --git a/data/maps/FuchsiaCity_ZooBuilding/map.json b/data/maps/FuchsiaCity_ZooBuilding/map.json index 39114ccdb..42e36142c 100644 --- a/data/maps/FuchsiaCity_ZooBuilding/map.json +++ b/data/maps/FuchsiaCity_ZooBuilding/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 2, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 12, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 6, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 10, "y": 8, "elevation": 3, diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index 90973993a..9a4761ba7 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 11, "y": 6, "elevation": 0, @@ -30,10 +30,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "163" + "flag": "FLAG_HIDE_CREDITS_RIVAL" }, { - "graphics_id": "71", + "graphics_id": "MAP_OBJ_GFX_PROF_OAK", "x": 11, "y": 6, "elevation": 0, @@ -43,7 +43,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "164" + "flag": "FLAG_HIDE_CREDITS_OAK" } ], "warp_events": [ diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index a3112a2cf..01f9f6a62 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -6,33 +6,43 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B IndigoPlateau_Exterior_MapScript1_167246:: @ 8167246 setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR compare_var_to_value VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1 - call_if 1, EventScript_167255 + call_if eq, EventScript_IndigoPlateau_Exterior_PlayCreditsMusic end -EventScript_167255:: @ 8167255 +EventScript_IndigoPlateau_Exterior_PlayCreditsMusic:: @ 8167255 playbgm MUS_ENDING, 0 return IndigoPlateau_Exterior_MapScript2_16725A:: @ 816725A - map_script_2 VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, EventScript_167264 + map_script_2 VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, EventScript_IndigoPlateau_Exterior_Credits .2byte 0 -EventScript_167264:: @ 8167264 +EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264 + @ After beating the champion, you are warped to the main + @ entrance of Indigo Plateau. This script starts running + @ immediately after your walking animation. + @ The script is timed to the music. lockall delay 105 + + @ Rival exits building. Spawn a dummy object to lock the camera. opendoor 11, 6 waitdooranim - special SpawnScriptFieldObject + special SpawnCameraObject addobject 1 applymovement 1, Movement_167346 applymovement 255, Movement_167337 waitmovement 0 closedoor 11, 6 waitdooranim + + @ Rival runs off applymovement 255, Movement_16731B applymovement 1, Movement_16733E waitmovement 0 delay 100 + + @ Oak exits building opendoor 11, 6 waitdooranim addobject 2 @@ -41,6 +51,8 @@ EventScript_167264:: @ 8167264 closedoor 11, 6 waitdooranim delay 160 + + @ Oak looks at player, then walks off applymovement 255, Movement_16731F applymovement 2, Movement_167348 waitmovement 0 @@ -48,18 +60,24 @@ EventScript_167264:: @ 8167264 applymovement 255, Movement_16732E waitmovement 0 delay 155 + + @ Player turns to face the League applymovement 255, Movement_16733C waitmovement 0 delay 90 + + @ Player runs off applymovement 255, Movement_167335 waitmovement 0 applymovement 255, Movement_167311 waitmovement 0 - special RemoveScriptFieldObject + + @ Reset the map state and roll the credits + special RemoveCameraObject setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0 removeobject 1 removeobject 2 - special Special_Credits + special Special_Credits @ noreturn waitstate releaseall end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index 3d9919ed1..f86588559 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 0, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 13, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 7, "y": 14, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 5, "y": 3, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 23, "y": 13, "elevation": 3, @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { "graphics_id": "0", @@ -89,10 +89,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 16, "y": 15, "elevation": 3, @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD087", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { "graphics_id": "0", @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 048ca96d6..f3c9c7c3f 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -7,12 +7,12 @@ IndigoPlateau_PokemonCenter_1F_MapScript1_16EA65:: @ 816EA65 setrespawn SPAWN_INDIGO_PLATEAU specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16EA79 + call_if eq, EventScript_16EA79 end EventScript_16EA79:: @ 816EA79 - checkflag FLAG_0x844 - goto_if_eq EventScript_1A77A9 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + goto_if TRUE, EventScript_1A77A9 setobjectxyperm 4, 4, 2 return @@ -21,14 +21,14 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A faceplayer specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16EAA6 + goto_if eq, EventScript_16EAA6 msgbox gUnknown_819A8D8 release end EventScript_16EAA6:: @ 816EAA6 - checkflag FLAG_0x844 - goto_if_eq EventScript_16EAB9 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + goto_if TRUE, EventScript_16EAB9 msgbox gUnknown_819A943 release end @@ -45,7 +45,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3 IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 646c4d178..7da5e0706 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "IndigoPlateau_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index a7c2dcd10..ff8bd94a4 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 19, "y": 10, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 12, "y": 12, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 10, "y": 7, "elevation": 3, diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index 999662e6e..dfd6cb3d7 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -4,8 +4,8 @@ LavenderTown_MapScripts:: @ 816686B LavenderTown_MapScript1_166871:: @ 8166871 setworldmapflag FLAG_WORLD_MAP_LAVENDER_TOWN - setvar VAR_0x405B, 1 - setflag FLAG_0x03D + setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 + setflag FLAG_HIDE_SS_ANNE_RIVAL end LavenderTown_EventScript_16687D:: @ 816687D @@ -13,7 +13,7 @@ LavenderTown_EventScript_16687D:: @ 816687D faceplayer msgbox gUnknown_817F52E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16689C + goto_if eq, EventScript_16689C msgbox gUnknown_817F568 release end diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index d733b6630..8cd810223 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 4, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "111", + "graphics_id": "MAP_OBJ_GFX_CUBONE", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/LavenderTown_House1/scripts.inc b/data/maps/LavenderTown_House1/scripts.inc index 8f7ba9d44..2469d4503 100644 --- a/data/maps/LavenderTown_House1/scripts.inc +++ b/data/maps/LavenderTown_House1/scripts.inc @@ -4,8 +4,8 @@ LavenderTown_House1_MapScripts:: @ 816B232 LavenderTown_House1_EventScript_16B233:: @ 816B233 lock faceplayer - checkflag FLAG_0x23C - goto_if_eq EventScript_16B248 + checkflag FLAG_RESCUED_MR_FUJI + goto_if TRUE, EventScript_16B248 msgbox gUnknown_819397D release end diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index aa17b7d39..5d754bc7c 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index 0a5c708ab..213e84754 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -6,19 +6,19 @@ LavenderTown_House2_EventScript_16B266:: @ 816B266 faceplayer msgbox gUnknown_8193A4B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16B287 + goto_if eq, EventScript_16B287 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B2AA + goto_if eq, EventScript_16B2AA end EventScript_16B287:: @ 816B287 msgbox gUnknown_8193AA6 - special sub_80BF8FC + special Special_ChooseMonFromParty waitstate compare_var_to_value VAR_0x8004, 6 - goto_if 0, EventScript_16B2B4 + goto_if lt, EventScript_16B2B4 compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16B2AA + goto_if ge, EventScript_16B2AA end EventScript_16B2AA:: @ 816B2AA @@ -29,20 +29,20 @@ EventScript_16B2AA:: @ 816B2AA EventScript_16B2B4:: @ 816B2B4 specialvar VAR_RESULT, sub_80CAD54 compare_var_to_value VAR_RESULT, SPECIES_EGG - goto_if_eq EventScript_16B307 + goto_if eq, EventScript_16B307 special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16B311 + goto_if eq, EventScript_16B311 specialvar VAR_RESULT, sub_80CAD7C special TV_CopyNicknameToStringVar1AndEnsureTerminated compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16B311 + goto_if eq, EventScript_16B311 msgbox gUnknown_8193AD2, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16B31B + goto_if eq, EventScript_16B31B compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B2AA + goto_if eq, EventScript_16B2AA end EventScript_16B307:: @ 816B307 @@ -61,7 +61,7 @@ EventScript_16B31B:: @ 816B31B specialvar VAR_RESULT, sub_80CBFA0 special TV_CopyNicknameToStringVar1AndEnsureTerminated compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16B345 + goto_if eq, EventScript_16B345 msgbox gUnknown_8193BF0 release end diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index b944ac24e..fab6c58ac 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 9, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc index 380af6e9d..47cef8633 100644 --- a/data/maps/LavenderTown_Mart/scripts.inc +++ b/data/maps/LavenderTown_Mart/scripts.inc @@ -16,7 +16,7 @@ LavenderTown_Mart_EventScript_16B362:: @ 816B362 LavenderTown_Mart_EventScript_16B36B:: @ 816B36B special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 4ef87ccf2..3c3062b4b 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 9, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 5, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 2, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 14, "y": 6, "elevation": 3, @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "LavenderTown_PokemonCenter_1F_EventScript_1AD0A0", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index 31112697f..c99020e41 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "LavenderTown_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index 7a917e264..617fae94b 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "78", + "graphics_id": "MAP_OBJ_GFX_MR_FUJI", "x": 3, "y": 3, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "LavenderTown_VolunteerPokemonHouse_EventScript_16B14A", - "flag": "53" + "flag": "FLAG_HIDE_POKEHOUSE_FUJI" }, { - "graphics_id": "124", + "graphics_id": "MAP_OBJ_GFX_NIDORINO", "x": 1, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "121", + "graphics_id": "MAP_OBJ_GFX_PSYDUCK", "x": 9, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 9, "y": 5, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 3, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 7, "y": 2, "elevation": 3, diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index 6229bf246..d82308203 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -4,13 +4,13 @@ LavenderTown_VolunteerPokemonHouse_MapScripts:: @ 816B149 LavenderTown_VolunteerPokemonHouse_EventScript_16B14A:: @ 816B14A lock faceplayer - checkflag FLAG_0x23D - goto_if_eq EventScript_16B196 + checkflag FLAG_GOT_POKE_FLUTE + goto_if TRUE, EventScript_16B196 msgbox gUnknown_81936FF checkitemspace ITEM_POKE_FLUTE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B1A0 - setflag FLAG_0x23D + goto_if eq, EventScript_16B1A0 + setflag FLAG_GOT_POKE_FLUTE additem ITEM_POKE_FLUTE, 1 giveitemfanfaremsg gUnknown_81937BD, ITEM_POKE_FLUTE, 1, MUS_FAN5 msgbox gUnknown_81937E5 @@ -30,9 +30,7 @@ EventScript_16B1A0:: @ 816B1A0 LavenderTown_VolunteerPokemonHouse_EventScript_16B1AA:: @ 816B1AA lock faceplayer - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_MRFUJI, 0 msgbox gUnknown_8193652 release end @@ -44,8 +42,8 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1C3:: @ 816B1C3 LavenderTown_VolunteerPokemonHouse_EventScript_16B1CC:: @ 816B1CC lock faceplayer - checkflag FLAG_0x23C - goto_if_eq EventScript_16B1E1 + checkflag FLAG_RESCUED_MR_FUJI + goto_if TRUE, EventScript_16B1E1 msgbox gUnknown_81935ED release end @@ -77,9 +75,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_16B1FE:: @ 816B1FE LavenderTown_VolunteerPokemonHouse_EventScript_16B211:: @ 816B211 lockall - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_MRFUJI, 2 msgbox gUnknown_81938A0 releaseall end diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 7da817efd..1b6927eb8 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 29, "y": 45, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 41, "y": 40, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_Exterior_EventScript_16397F", - "flag": "137" + "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 42, "y": 40, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_Exterior_EventScript_1639F0", - "flag": "137" + "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS" }, { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 22, "y": 35, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 15, "y": 28, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 14, "y": 42, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 29, "y": 41, "elevation": 3, @@ -101,11 +101,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE00C", - "flag": "18" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 30, "y": 42, "elevation": 3, @@ -114,11 +114,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE00C", - "flag": "19" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 22, "y": 45, "elevation": 3, @@ -127,11 +127,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 17, "y": 46, "elevation": 3, @@ -140,11 +140,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 36, "y": 14, "elevation": 3, @@ -153,11 +153,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 34, "y": 14, "elevation": 3, @@ -166,11 +166,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE00C", - "flag": "20" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 36, "y": 15, "elevation": 3, @@ -179,11 +179,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE00C", - "flag": "21" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_15" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 35, "y": 14, "elevation": 3, @@ -192,11 +192,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 35, "y": 17, "elevation": 3, @@ -205,11 +205,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 39, "elevation": 3, @@ -218,11 +218,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE00C", - "flag": "22" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_16" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 19, "y": 40, "elevation": 3, @@ -231,11 +231,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Exterior_EventScript_1BE00C", - "flag": "23" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_17" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 13, "y": 6, "elevation": 3, @@ -245,10 +245,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_Exterior_EventScript_1BED2C", - "flag": "493" + "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ULTRA_BALL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 38, "y": 10, "elevation": 3, @@ -258,10 +258,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_Exterior_EventScript_1BED39", - "flag": "494" + "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_FIRE_STONE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 48, "y": 20, "elevation": 3, @@ -271,7 +271,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_Exterior_EventScript_1BED46", - "flag": "495" + "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_DIRE_HIT" } ], "warp_events": [ @@ -324,7 +324,7 @@ "x": 37, "y": 43, "elevation": 0, - "var": "VAR_0x407F", + "var": "VAR_MAP_SCENE_MT_EMBER_EXTERIOR", "var_value": 1, "script": "MtEmber_Exterior_EventScript_163A4E" }, @@ -333,7 +333,7 @@ "x": 38, "y": 43, "elevation": 0, - "var": "VAR_0x407F", + "var": "VAR_MAP_SCENE_MT_EMBER_EXTERIOR", "var_value": 1, "script": "MtEmber_Exterior_EventScript_163A4E" }, @@ -342,7 +342,7 @@ "x": 39, "y": 43, "elevation": 0, - "var": "VAR_0x407F", + "var": "VAR_MAP_SCENE_MT_EMBER_EXTERIOR", "var_value": 1, "script": "MtEmber_Exterior_EventScript_163A4E" } @@ -354,17 +354,19 @@ "y": 17, "elevation": 0, "item": "ITEM_FIRE_STONE", - "flag": "158", - "unknown": 1 + "flag": "HIDDEN_ITEM_MT_EMBER_EXTERIOR_FIRE_STONE", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", "x": 8, "y": 30, "elevation": 3, - "item": "POCKET_KEY_ITEMS", - "flag": "162", - "unknown": 1 + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_MT_EMBER_EXTERIOR_ULTRA_BALL", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index acd440a97..cea59adfc 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -5,8 +5,8 @@ MtEmber_Exterior_MapScripts:: @ 8163946 MtEmber_Exterior_MapScript1_163951:: @ 8163951 setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR - compare_var_to_value VAR_0x407F, 2 - call_if 1, EventScript_163960 + compare_var_to_value VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2 + call_if eq, EventScript_163960 end EventScript_163960:: @ 8163960 @@ -16,7 +16,7 @@ EventScript_163960:: @ 8163960 MtEmber_Exterior_MapScript2_163969:: @ 8163969 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - call_if 4, EventScript_163975 + call_if ge, EventScript_163975 end EventScript_163975:: @ 8163975 @@ -25,10 +25,10 @@ EventScript_163975:: @ 8163975 MtEmber_Exterior_EventScript_16397F:: @ 816397F lock - checktrainerflag FLAG_0x219 - goto_if_eq EventScript_16399E + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43 + goto_if eq, EventScript_16399E compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if_eq EventScript_1639A8 + goto_if eq, EventScript_1639A8 msgbox gUnknown_817A82A release end @@ -43,10 +43,10 @@ EventScript_1639A8:: @ 81639A8 waitmovement 0 playbgm MUS_ROCKET, 0 msgbox gUnknown_817AA06 - trainerbattle 3, 537, 0, Text_17AA34 + trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_43, 0, Text_17AA34 msgbox gUnknown_817AA3F - checktrainerflag FLAG_0x21A - goto_if_eq EventScript_1639DB + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44 + goto_if eq, EventScript_1639DB release end @@ -63,10 +63,10 @@ EventScript_1639DB:: @ 81639DB MtEmber_Exterior_EventScript_1639F0:: @ 81639F0 lock faceplayer - checktrainerflag FLAG_0x21A - goto_if_eq EventScript_163A1B + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_44 + goto_if eq, EventScript_163A1B compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if_eq EventScript_163A25 + goto_if eq, EventScript_163A25 msgbox gUnknown_817A88C closemessage applymovement 3, Movement_1A75E5 @@ -82,10 +82,10 @@ EventScript_163A1B:: @ 8163A1B EventScript_163A25:: @ 8163A25 playbgm MUS_ROCKET, 0 msgbox gUnknown_817AA56 - trainerbattle 3, 538, 0, Text_17AA8A + trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_44, 0, Text_17AA8A msgbox gUnknown_817AA99 - checktrainerflag FLAG_0x219 - goto_if_eq EventScript_1639DB + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_43 + goto_if eq, EventScript_1639DB release end @@ -111,21 +111,21 @@ MtEmber_Exterior_EventScript_163A4E:: @ 8163A4E waitmovement 0 call EventScript_163960 msgbox gUnknown_817A9E1 - setvar VAR_0x407F, 2 + setvar VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2 releaseall end MtEmber_Exterior_EventScript_163AB4:: @ 8163AB4 - trainerbattle 0, 595, 0, Text_17AB73, Text_17ABAA + trainerbattle 0, TRAINER_PKMN_RANGER_LOGAN, 0, Text_17AB73, Text_17ABAA msgbox gUnknown_817ABD8, 6 end MtEmber_Exterior_EventScript_163ACB:: @ 8163ACB - trainerbattle 0, 597, 0, Text_17AC55, Text_17AC82 + trainerbattle 0, TRAINER_PKMN_RANGER_BETH, 0, Text_17AC55, Text_17AC82 msgbox gUnknown_817ACA2, 6 end MtEmber_Exterior_EventScript_163AE2:: @ 8163AE2 - trainerbattle 0, 592, 0, Text_17AD06, Text_17AD6B + trainerbattle 0, TRAINER_CRUSH_GIRL_JOCELYN, 0, Text_17AD06, Text_17AD6B msgbox gUnknown_817AD89, 6 end diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index af7c2032f..b0d678752 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 11, "elevation": 3, @@ -23,11 +23,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", - "flag": "18" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 16, "elevation": 3, @@ -36,11 +36,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", - "flag": "19" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 20, "y": 12, "elevation": 3, @@ -49,11 +49,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", - "flag": "20" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 19, "y": 7, "elevation": 3, @@ -62,11 +62,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", - "flag": "21" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_15" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 21, "y": 15, "elevation": 3, @@ -75,8 +75,8 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_1F_EventScript_1BE00C", - "flag": "22" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_16" } ], "warp_events": [ diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index 3a95580b2..b56e52770 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 8, "elevation": 3, @@ -23,11 +23,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", - "flag": "18" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 11, "elevation": 3, @@ -36,11 +36,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", - "flag": "19" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 12, "elevation": 3, @@ -49,11 +49,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", - "flag": "20" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 14, "elevation": 3, @@ -62,8 +62,8 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B1F_EventScript_1BE00C", - "flag": "21" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_15" } ], "warp_events": [ diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index 78149246d..76a7c17e2 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 2, "elevation": 3, @@ -23,8 +23,8 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B1F_Stairs_EventScript_1BE00C", - "flag": "18" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_12" } ], "warp_events": [ diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index e296e9318..5fd04b480 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 9, "y": 3, "elevation": 3, @@ -23,11 +23,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B2F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 12, "y": 5, "elevation": 3, @@ -36,11 +36,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B2F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 12, "y": 2, "elevation": 3, @@ -49,11 +49,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B2F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 8, "elevation": 3, @@ -62,11 +62,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C", - "flag": "18" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 8, "elevation": 3, @@ -75,11 +75,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C", - "flag": "19" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 5, "elevation": 3, @@ -88,11 +88,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C", - "flag": "20" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 5, "elevation": 3, @@ -101,8 +101,8 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B2F_EventScript_1BE00C", - "flag": "21" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_15" } ], "warp_events": [ diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index 42576cb8d..5b72aa5c3 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 3, "elevation": 3, @@ -23,11 +23,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C", - "flag": "18" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 2, "elevation": 3, @@ -36,8 +36,8 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B2F_Stairs_EventScript_1BE00C", - "flag": "19" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_13" } ], "warp_events": [ diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 5bc2edf77..ac41ffbcb 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 10, "y": 4, "elevation": 3, @@ -23,11 +23,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 26, "y": 12, "elevation": 3, @@ -36,11 +36,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 28, "y": 8, "elevation": 3, @@ -49,11 +49,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 2, "elevation": 3, @@ -62,11 +62,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "18" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 3, "elevation": 3, @@ -75,11 +75,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "19" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 6, "elevation": 3, @@ -88,11 +88,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "20" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 6, "elevation": 3, @@ -101,11 +101,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "21" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_15" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 5, "elevation": 3, @@ -114,11 +114,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "22" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_16" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 2, "elevation": 3, @@ -127,11 +127,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE00C", - "flag": "23" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_17" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 15, "y": 13, "elevation": 3, @@ -140,7 +140,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_RubyPath_B3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" } ], diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index fb7b397e2..17d276620 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -5,7 +5,7 @@ MtEmber_RubyPath_B3F_EventScript_163C49:: @ 8163C49 MtEmber_RubyPath_B5F_EventScript_163C49:: @ 8163C49 lock faceplayer - setflag FLAG_0x2DD + setflag FLAG_GOT_RUBY removeobject 1 additem ITEM_RUBY, 1 giveitemfanfaremsg gUnknown_817ADC5, ITEM_RUBY, 1, MUS_FAN5 diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index 637afcde5..ce5dbc269 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "99", + "graphics_id": "MAP_OBJ_GFX_RUBY", "x": 7, "y": 7, "elevation": 0, @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_RubyPath_B5F_EventScript_163C49", - "flag": "138" + "flag": "FLAG_HIDE_RUBY" } ], "warp_events": [ diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index 34eb9d6a7..1715ccf58 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "137", + "graphics_id": "MAP_OBJ_GFX_MOLTRES", "x": 9, "y": 6, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtEmber_Summit_EventScript_163B33", - "flag": "82" + "flag": "FLAG_HIDE_MOLTRES" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 10, "y": 12, "elevation": 3, @@ -36,11 +36,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Summit_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 9, "y": 12, "elevation": 3, @@ -49,11 +49,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Summit_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 8, "y": 11, "elevation": 3, @@ -62,11 +62,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Summit_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 8, "y": 10, "elevation": 3, @@ -75,7 +75,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_Summit_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" } ], diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 05472f91c..8287d1d93 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -4,30 +4,30 @@ MtEmber_Summit_MapScripts:: @ 8163AFC .byte 0 MtEmber_Summit_MapScript2_163B07:: @ 8163B07 - checkflag FLAG_0x807 - call_if 1, EventScript_163B11 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_163B11 end EventScript_163B11:: @ 8163B11 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return MtEmber_Summit_MapScript1_163B25:: @ 8163B25 - checkflag FLAG_0x2BD - call_if 0, EventScript_163B2F + checkflag FLAG_FOUGHT_MOLTRES + call_if FALSE, EventScript_163B2F end EventScript_163B2F:: @ 8163B2F - clearflag FLAG_0x052 + clearflag FLAG_HIDE_MOLTRES return MtEmber_Summit_EventScript_163B33:: @ 8163B33 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -40,23 +40,23 @@ MtEmber_Summit_EventScript_163B33:: @ 8163B33 delay 10 playbgm MUS_EXEYE, 0 waitbuttonpress - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_807F9D8 waitstate - clearflag FLAG_0x807 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_163B96 - compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_163B9F - compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_163B9F - setflag FLAG_0x2BD + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_WON + goto_if eq, EventScript_163B96 + compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + goto_if eq, EventScript_163B9F + compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if eq, EventScript_163B9F + setflag FLAG_FOUGHT_MOLTRES release end EventScript_163B96:: @ 8163B96 - setflag FLAG_0x2BD + setflag FLAG_FOUGHT_MOLTRES goto EventScript_1A922D end diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index 62da287fd..5712426b2 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 40, "y": 7, "elevation": 3, @@ -23,11 +23,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "18" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 5, "elevation": 3, @@ -36,11 +36,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "19" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 19, "elevation": 3, @@ -49,11 +49,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "20" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 23, "elevation": 3, @@ -62,11 +62,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "21" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_15" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 21, "elevation": 3, @@ -75,11 +75,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "22" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_16" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 38, "elevation": 3, @@ -88,11 +88,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "23" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_17" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 35, "elevation": 3, @@ -101,11 +101,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "24" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_18" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 34, "elevation": 3, @@ -114,11 +114,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "25" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_19" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 26, "elevation": 3, @@ -127,8 +127,8 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "MtEmber_SummitPath_2F_EventScript_1BE00C", - "flag": "26" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_1A" } ], "warp_events": [ diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 135f731fc..2701adad6 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 20, "y": 26, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 36, "y": 30, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 30, "y": 35, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 33, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 7, "y": 26, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 13, "y": 17, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 7, "y": 10, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 22, "elevation": 3, @@ -115,10 +115,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtMoon_1F_EventScript_1BE5CF", - "flag": "345" + "flag": "FLAG_HIDE_MT_MOON_1F_PARALYZE_HEAL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 35, "elevation": 3, @@ -128,10 +128,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtMoon_1F_EventScript_1BE5DC", - "flag": "346" + "flag": "FLAG_HIDE_MT_MOON_1F_TM09" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 26, "y": 32, "elevation": 3, @@ -141,10 +141,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtMoon_1F_EventScript_1BE5E9", - "flag": "347" + "flag": "FLAG_HIDE_MT_MOON_1F_POTION" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 42, "y": 35, "elevation": 3, @@ -154,10 +154,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtMoon_1F_EventScript_1BE5F6", - "flag": "348" + "flag": "FLAG_HIDE_MT_MOON_1F_RARE_CANDY" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 44, "y": 21, "elevation": 3, @@ -167,10 +167,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtMoon_1F_EventScript_1BE603", - "flag": "349" + "flag": "FLAG_HIDE_MT_MOON_1F_ESCAPE_ROPE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 3, "y": 2, "elevation": 3, @@ -180,10 +180,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtMoon_1F_EventScript_1BE610", - "flag": "350" + "flag": "FLAG_HIDE_MT_MOON_1F_MOON_STONE" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 42, "y": 7, "elevation": 3, diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index cd8feb26c..df67e7c8a 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -11,36 +11,36 @@ MtMoon_1F_EventScript_1605EE:: @ 81605EE end MtMoon_1F_EventScript_1605F7:: @ 81605F7 - trainerbattle 0, 181, 0, Text_17279D, Text_1727CB + trainerbattle 0, TRAINER_HIKER_MARCOS, 0, Text_17279D, Text_1727CB msgbox gUnknown_81727DF, 6 end MtMoon_1F_EventScript_16060E:: @ 816060E - trainerbattle 0, 91, 0, Text_17281D, Text_172844 + trainerbattle 0, TRAINER_YOUNGSTER_JOSH, 0, Text_17281D, Text_172844 msgbox gUnknown_8172863, 6 end MtMoon_1F_EventScript_160625:: @ 8160625 - trainerbattle 0, 120, 0, Text_172896, Text_1728C3 + trainerbattle 0, TRAINER_LASS_MIRIAM, 0, Text_172896, Text_1728C3 msgbox gUnknown_81728D2, 6 end MtMoon_1F_EventScript_16063C:: @ 816063C - trainerbattle 0, 121, 0, Text_172972, Text_1729A4 + trainerbattle 0, TRAINER_LASS_IRIS, 0, Text_172972, Text_1729A4 msgbox gUnknown_81729AC, 6 end MtMoon_1F_EventScript_160653:: @ 8160653 - trainerbattle 0, 169, 0, Text_17290B, Text_172927 + trainerbattle 0, TRAINER_SUPER_NERD_JOVAN, 0, Text_17290B, Text_172927 msgbox gUnknown_817293C, 6 end MtMoon_1F_EventScript_16066A:: @ 816066A - trainerbattle 0, 108, 0, Text_1729EA, Text_172A1A + trainerbattle 0, TRAINER_BUG_CATCHER_KENT, 0, Text_1729EA, Text_172A1A msgbox gUnknown_8172A26, 6 end MtMoon_1F_EventScript_160681:: @ 8160681 - trainerbattle 0, 109, 0, Text_172A55, Text_172A8F + trainerbattle 0, TRAINER_BUG_CATCHER_ROBBY, 0, Text_172A55, Text_172A8F msgbox gUnknown_8172A97, 6 end diff --git a/data/maps/MtMoon_B1F/map.json b/data/maps/MtMoon_B1F/map.json index efa18b859..8bb52bddf 100644 --- a/data/maps/MtMoon_B1F/map.json +++ b/data/maps/MtMoon_B1F/map.json @@ -79,8 +79,9 @@ "y": 2, "elevation": 0, "item": "ITEM_TINY_MUSHROOM", - "flag": "84", - "unknown": 1 + "flag": "HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -88,8 +89,9 @@ "y": 2, "elevation": 0, "item": "ITEM_TINY_MUSHROOM", - "flag": "85", - "unknown": 1 + "flag": "HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_2", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -97,8 +99,9 @@ "y": 34, "elevation": 0, "item": "ITEM_TINY_MUSHROOM", - "flag": "86", - "unknown": 1 + "flag": "HIDDEN_ITEM_MT_MOON_B1F_TINY_MUSHROOM_3", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -106,8 +109,9 @@ "y": 35, "elevation": 0, "item": "ITEM_BIG_MUSHROOM", - "flag": "87", - "unknown": 1 + "flag": "HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -115,8 +119,9 @@ "y": 12, "elevation": 0, "item": "ITEM_BIG_MUSHROOM", - "flag": "88", - "unknown": 1 + "flag": "HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_2", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -124,8 +129,9 @@ "y": 34, "elevation": 0, "item": "ITEM_BIG_MUSHROOM", - "flag": "89", - "unknown": 1 + "flag": "HIDDEN_ITEM_MT_MOON_B1F_BIG_MUSHROOM_3", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index ad5ea2d86..652a883b3 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "98", + "graphics_id": "MAP_OBJ_GFX_FOSSIL", "x": 13, "y": 7, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtMoon_B2F_EventScript_16071B", - "flag": "47" + "flag": "FLAG_HIDE_DOME_FOSSIL" }, { - "graphics_id": "98", + "graphics_id": "MAP_OBJ_GFX_FOSSIL", "x": 14, "y": 7, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtMoon_B2F_EventScript_16077F", - "flag": "48" + "flag": "FLAG_HIDE_HELIX_FOSSIL" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 13, "y": 11, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 37, "y": 21, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "MtMoon_B2F_EventScript_160829", - "flag": "173" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 12, "y": 20, "elevation": 3, @@ -76,10 +76,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "MtMoon_B2F_EventScript_1607E4", - "flag": "173" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 35, "y": 12, "elevation": 3, @@ -89,10 +89,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "MtMoon_B2F_EventScript_160812", - "flag": "173" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 18, "y": 27, "elevation": 3, @@ -102,10 +102,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "MtMoon_B2F_EventScript_1607FB", - "flag": "173" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 30, "y": 26, "elevation": 3, @@ -115,10 +115,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtMoon_B2F_EventScript_1BE61D", - "flag": "351" + "flag": "FLAG_HIDE_MT_MOON_B2F_STAR_PIECE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 35, "y": 5, "elevation": 3, @@ -128,10 +128,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtMoon_B2F_EventScript_1BE62A", - "flag": "352" + "flag": "FLAG_HIDE_MT_MOON_B2F_TM46" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 24, "y": 6, "elevation": 3, @@ -141,10 +141,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtMoon_B2F_EventScript_1BEAD6", - "flag": "447" + "flag": "FLAG_HIDE_MT_MOON_B2F_REVIVE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 3, "y": 11, "elevation": 3, @@ -154,7 +154,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "MtMoon_B2F_EventScript_1BEAE3", - "flag": "448" + "flag": "FLAG_HIDE_MT_MOON_B2F_ANTIDOTE" } ], "warp_events": [ @@ -193,7 +193,7 @@ "x": 14, "y": 11, "elevation": 3, - "var": "VAR_0x408B", + "var": "VAR_MAP_SCENE_MT_MOON_B2F", "var_value": 0, "script": "MtMoon_B2F_EventScript_1606B0" } @@ -205,8 +205,9 @@ "y": 16, "elevation": 3, "item": "ITEM_MOON_STONE", - "flag": "2", - "unknown": 1 + "flag": "HIDDEN_ITEM_MT_MOON_B2F_MOON_STONE", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -214,8 +215,9 @@ "y": 11, "elevation": 3, "item": "ITEM_ETHER", - "flag": "3", - "unknown": 1 + "flag": "HIDDEN_ITEM_MT_MOON_B2F_ETHER", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index c8cf811c0..caf90c005 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -3,13 +3,13 @@ MtMoon_B2F_MapScripts:: @ 8160699 .byte 0 MtMoon_B2F_MapScript1_16069F:: @ 816069F - checkflag FLAG_0x232 - call_if 0, EventScript_1606A9 + checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON + call_if FALSE, EventScript_1606A9 end EventScript_1606A9:: @ 81606A9 - clearflag FLAG_0x02F - clearflag FLAG_0x030 + clearflag FLAG_HIDE_DOME_FOSSIL + clearflag FLAG_HIDE_HELIX_FOSSIL return MtMoon_B2F_EventScript_1606B0:: @ 81606B0 @@ -23,10 +23,10 @@ MtMoon_B2F_EventScript_1606B0:: @ 81606B0 MtMoon_B2F_EventScript_1606C2:: @ 81606C2 lock faceplayer - checkflag FLAG_0x232 - goto_if_eq EventScript_160707 - checktrainerflag FLAG_0x0AA - goto_if_eq EventScript_160711 + checkflag FLAG_GOT_FOSSIL_FROM_MT_MOON + goto_if TRUE, EventScript_160707 + checktrainerflag TRAINER_SUPER_NERD_MIGUEL + goto_if eq, EventScript_160711 call EventScript_1606DD release end @@ -38,8 +38,8 @@ EventScript_1606DD:: @ 81606DD playbgm MUS_EXEYE, 0 waitbuttonpress setvar VAR_LAST_TALKED, 3 - trainerbattle 3, 170, 0, Text_172B99 - setvar VAR_0x408B, 1 + trainerbattle 3, TRAINER_SUPER_NERD_MIGUEL, 0, Text_172B99 + setvar VAR_MAP_SCENE_MT_MOON_B2F, 1 msgbox gUnknown_8172BAB return @@ -58,7 +58,7 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B faceplayer msgbox gUnknown_8172E77, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1607DE + goto_if eq, EventScript_1607DE removeobject 1 additem ITEM_DOME_FOSSIL, 1 giveitemfanfaremsg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5 @@ -74,8 +74,8 @@ MtMoon_B2F_EventScript_16071B:: @ 816071B waitmessage waitfanfare removeobject 2 - setflag FLAG_0x272 - setflag FLAG_0x232 + setflag FLAG_GOT_DOME_FOSSIL + setflag FLAG_GOT_FOSSIL_FROM_MT_MOON release end @@ -91,7 +91,7 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F faceplayer msgbox gUnknown_8172E94, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1607DE + goto_if eq, EventScript_1607DE removeobject 2 additem ITEM_HELIX_FOSSIL, 1 giveitemfanfaremsg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 @@ -107,8 +107,8 @@ MtMoon_B2F_EventScript_16077F:: @ 816077F waitmessage waitfanfare removeobject 1 - setflag FLAG_0x273 - setflag FLAG_0x232 + setflag FLAG_GOT_HELIX_FOSSIL + setflag FLAG_GOT_FOSSIL_FROM_MT_MOON release end @@ -123,21 +123,21 @@ Movement_1607E0:: @ 81607E0 step_end MtMoon_B2F_EventScript_1607E4:: @ 81607E4 - trainerbattle 0, 351, 0, Text_172C5A, Text_172CB8 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT, 0, Text_172C5A, Text_172CB8 msgbox gUnknown_8172CCB, 6 end MtMoon_B2F_EventScript_1607FB:: @ 81607FB - trainerbattle 0, 352, 0, Text_172CFC, Text_172D46 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_2, 0, Text_172CFC, Text_172D46 msgbox gUnknown_8172D51, 6 end MtMoon_B2F_EventScript_160812:: @ 8160812 - trainerbattle 0, 353, 0, Text_172D82, Text_172DAF + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_3, 0, Text_172D82, Text_172DAF msgbox gUnknown_8172DC1, 6 end MtMoon_B2F_EventScript_160829:: @ 8160829 - trainerbattle 0, 354, 0, Text_172DF0, Text_172E3E + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_4, 0, Text_172DF0, Text_172E3E msgbox gUnknown_8172E4B, 6 end diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index aa97091ec..0441624ed 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "144", + "graphics_id": "MAP_OBJ_GFX_LUGIA", "x": 10, "y": 15, "elevation": 3, @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "NavelRock_Base_EventScript_165134", - "flag": "155" + "flag": "FLAG_HIDE_LUGIA" } ], "warp_events": [ diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 78c468022..98bb6f920 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -4,38 +4,38 @@ NavelRock_Base_MapScripts:: @ 81650E7 .byte 0 NavelRock_Base_MapScript1_1650F2:: @ 81650F2 - checkflag FLAG_0x2F2 - call_if 1, EventScript_165105 - checkflag FLAG_0x2F2 - call_if 0, EventScript_165109 + checkflag FLAG_FOUGHT_LUGIA + call_if TRUE, EventScript_165105 + checkflag FLAG_FOUGHT_LUGIA + call_if FALSE, EventScript_165109 end EventScript_165105:: @ 8165105 - setflag FLAG_0x09B + setflag FLAG_HIDE_LUGIA return EventScript_165109:: @ 8165109 - checkflag FLAG_0x2F5 - goto_if_eq EventScript_1A77A9 - clearflag FLAG_0x09B + checkflag FLAG_LUGIA_FLEW_AWAY + goto_if TRUE, EventScript_1A77A9 + clearflag FLAG_HIDE_LUGIA return NavelRock_Base_MapScript2_165116:: @ 8165116 - checkflag FLAG_0x807 - call_if 1, EventScript_165120 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_165120 end EventScript_165120:: @ 8165120 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + goto_if ne, EventScript_1A77A9 removeobject 1 return NavelRock_Base_EventScript_165134:: @ 8165134 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -64,23 +64,23 @@ NavelRock_Base_EventScript_165134:: @ 8165134 setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 special CreateObedientEnemyMon - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_807F9D8 waitstate - clearflag FLAG_0x807 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1651D9 - compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_1651E7 - compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_1651E7 - setflag FLAG_0x2F2 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_WON + goto_if eq, EventScript_1651D9 + compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + goto_if eq, EventScript_1651E7 + compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if eq, EventScript_1651E7 + setflag FLAG_FOUGHT_LUGIA release end EventScript_1651D9:: @ 81651D9 - setflag FLAG_0x2F5 + setflag FLAG_LUGIA_FLEW_AWAY setvar VAR_0x8004, SPECIES_LUGIA goto EventScript_1A9236 end diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index dee041a54..cdbf54da8 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index 6e630ca01..8cb8dd796 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -1 +1,16 @@ -@ .include "data/maps/NavelRock_Harbor/scripts.inc" + +NavelRock_Harbor_MapScripts:: @ 8165420 + .byte 0 + +NavelRock_Harbor_EventScript_165421:: @ 8165421 + lock + faceplayer + message Text_181726 + waitmessage + setvar VAR_0x8004, SEAGALLOP_NAVEL_ROCK + multichoice 20, 8, 61, 0 + switch VAR_RESULT + case 0, EventScript_1A91D5 + case 1, EventScript_1A90F6 + case 127, EventScript_1A90F6 + end diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index 62a375525..fe7c5dd8b 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "145", + "graphics_id": "MAP_OBJ_GFX_HO_OH", "x": 9, "y": 6, "elevation": 0, @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "156" + "flag": "FLAG_HIDE_HO_OH" } ], "warp_events": [ @@ -54,8 +54,9 @@ "y": 11, "elevation": 3, "item": "ITEM_SACRED_ASH", - "flag": "160", - "unknown": 129 + "flag": "HIDDEN_ITEM_NAVEL_ROCK_SUMMIT_SACRED_ASH", + "quantity": 1, + "underfoot": true } ] } diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index d359d4d25..f73aaf1ec 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -4,45 +4,45 @@ NavelRock_Summit_MapScripts:: @ 8164F9F .byte 0 NavelRock_Summit_MapScript1_164FAA:: @ 8164FAA - checkflag FLAG_0x2F3 - call_if 1, EventScript_164FBD - checkflag FLAG_0x2F3 - call_if 0, EventScript_164FC6 + checkflag FLAG_FOUGHT_HO_OH + call_if TRUE, EventScript_164FBD + checkflag FLAG_FOUGHT_HO_OH + call_if FALSE, EventScript_164FC6 end EventScript_164FBD:: @ 8164FBD setvar VAR_0x4001, 1 - setflag FLAG_0x09C + setflag FLAG_HIDE_HO_OH return EventScript_164FC6:: @ 8164FC6 setvar VAR_0x4001, 1 - checkflag FLAG_0x2F6 - goto_if_eq EventScript_1A77A9 + checkflag FLAG_HO_OH_FLEW_AWAY + goto_if TRUE, EventScript_1A77A9 setvar VAR_0x4001, 0 - clearflag FLAG_0x09C + clearflag FLAG_HIDE_HO_OH return NavelRock_Summit_MapScript2_164FDD:: @ 8164FDD - checkflag FLAG_0x807 - call_if 1, EventScript_164FE7 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_164FE7 end EventScript_164FE7:: @ 8164FE7 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + goto_if ne, EventScript_1A77A9 removeobject 1 return NavelRock_Summit_EventScript_164FFB:: @ 8164FFB special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lockall setvar VAR_0x4001, 1 - special SpawnScriptFieldObject + special SpawnCameraObject setvar VAR_0x8004, 3 setvar VAR_0x8005, 35 special sub_80CD1B4 @@ -63,29 +63,29 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB applymovement 127, Movement_1650D1 applymovement 1, Movement_1650D7 waitmovement 0 - special RemoveScriptFieldObject + special RemoveCameraObject setvar VAR_0x8004, SPECIES_HO_OH setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 special CreateObedientEnemyMon - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_807F9D8 waitstate - clearflag FLAG_0x807 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE setvar VAR_LAST_TALKED, 1 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1650B4 - compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_1650C2 - compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_1650C2 - setflag FLAG_0x2F3 + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_WON + goto_if eq, EventScript_1650B4 + compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + goto_if eq, EventScript_1650C2 + compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if eq, EventScript_1650C2 + setflag FLAG_FOUGHT_HO_OH releaseall end EventScript_1650B4:: @ 81650B4 - setflag FLAG_0x2F6 + setflag FLAG_HO_OH_FLEW_AWAY setvar VAR_0x8004, SPECIES_HO_OH goto EventScript_1A9236 end diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index 0bd30ba71..fb1e43775 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "73", + "graphics_id": "MAP_OBJ_GFX_BILL", "x": 12, "y": 16, "elevation": 3, @@ -35,10 +35,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "113" + "flag": "FLAG_HIDE_ONE_ISLAND_BILL" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 16, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 13, "y": 9, "elevation": 3, diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index 540980a3e..16830e056 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -83,10 +83,10 @@ Movement_167514:: @ 8167514 OneIsland_EventScript_167517:: @ 8167517 lock faceplayer - checkflag FLAG_0x844 - goto_if_eq EventScript_16753F - checkflag FLAG_0x2A1 - goto_if_eq EventScript_167535 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + goto_if TRUE, EventScript_16753F + checkflag FLAG_SEVII_DETOUR_FINISHED + goto_if TRUE, EventScript_167535 msgbox gUnknown_818174E release end diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index 6a8cbe4b2..861731295 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index 44c18ff60..75e74dad7 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -37,6 +37,6 @@ OneIsland_Harbor_EventScript_1713BD:: @ 81713BD faceplayer message Text_181726 waitmessage - setvar VAR_0x8004, 1 + setvar VAR_0x8004, SEAGALLOP_ONE_ISLAND goto EventScript_1A8EC5 end diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index 7367836f7..216436861 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 4, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index d88b79750..06f7031e1 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 9, "y": 4, "elevation": 3, diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index 74023f6d0..b618253aa 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 11, "y": 32, "elevation": 1, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "46", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_LAND", "x": 17, "y": 132, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 7, "y": 39, "elevation": 1, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "45", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_LAND", "x": 19, "y": 79, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 15, "y": 25, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 9, "y": 53, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 18, "y": 105, "elevation": 4, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 16, "y": 64, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 11, "y": 64, "elevation": 3, @@ -137,7 +137,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 11, "y": 89, "elevation": 3, @@ -150,7 +150,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 9, "y": 108, "elevation": 3, @@ -163,7 +163,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 8, "y": 68, "elevation": 3, @@ -176,7 +176,7 @@ "flag": "0" }, { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 9, "y": 68, "elevation": 3, @@ -189,7 +189,7 @@ "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 8, "y": 104, "elevation": 3, @@ -198,11 +198,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "19" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 95, "elevation": 3, @@ -211,11 +211,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "21" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_15" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 12, "y": 96, "elevation": 3, @@ -224,11 +224,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "22" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_16" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 95, "elevation": 3, @@ -237,11 +237,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "23" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_17" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 105, "elevation": 3, @@ -250,11 +250,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "24" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_18" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 75, "elevation": 3, @@ -263,11 +263,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "25" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_19" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 84, "elevation": 3, @@ -276,11 +276,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "26" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 74, "elevation": 3, @@ -289,11 +289,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "27" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 73, "elevation": 3, @@ -302,11 +302,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "28" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 111, "elevation": 4, @@ -315,11 +315,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "29" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_1D" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 86, "elevation": 3, @@ -328,11 +328,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "30" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_1E" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 110, "elevation": 3, @@ -341,11 +341,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "31" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_1F" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 112, "elevation": 4, @@ -354,11 +354,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "OneIsland_KindleRoad_EventScript_1BE00C", - "flag": "17" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_11" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 15, "y": 70, "elevation": 3, @@ -368,10 +368,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EventScript_1BEC42", - "flag": "475" + "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_ETHER" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 103, "elevation": 3, @@ -381,10 +381,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EventScript_1BEC4F", - "flag": "476" + "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_MAX_REPEL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 18, "y": 114, "elevation": 4, @@ -394,7 +394,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EventScript_1BEC5C", - "flag": "477" + "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_CARBOS" } ], "warp_events": [ diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index 71bbbe0dd..cefa0b75b 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 11, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 15, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 6, "y": 8, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_KindleRoad_EmberSpa_EventScript_165380", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 20, "y": 7, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 10, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 11, "y": 20, "elevation": 3, diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index fbb4fb622..71c8cf0ee 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -20,9 +20,7 @@ OneIsland_KindleRoad_EmberSpa_EventScript_165377:: @ 8165377 OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380 lock faceplayer - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BRUNO, 3 msgbox gUnknown_817D550 release end @@ -30,11 +28,11 @@ OneIsland_KindleRoad_EmberSpa_EventScript_165380:: @ 8165380 OneIsland_KindleRoad_EmberSpa_EventScript_165399:: @ 8165399 lock faceplayer - checkflag FLAG_0x2EF - goto_if_eq EventScript_1653C5 + checkflag FLAG_GOT_HM06 + goto_if TRUE, EventScript_1653C5 msgbox gUnknown_817D622 giveitem ITEM_HM06 - setflag FLAG_0x2EF + setflag FLAG_GOT_HM06 msgbox gUnknown_817D6F3 release end diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index 4c6527a0a..b5575d3fd 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "73", + "graphics_id": "MAP_OBJ_GFX_BILL", "x": 14, "y": 6, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_PokemonCenter_1F_EventScript_170E9D", - "flag": "114" + "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL" }, { - "graphics_id": "89", + "graphics_id": "MAP_OBJ_GFX_CELIO", "x": 15, "y": 6, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_PokemonCenter_1F_EventScript_170EC5", - "flag": "115" + "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_CELIO" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 6, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 3, "y": 7, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index bb4e0f765..a1d5b25a7 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -7,9 +7,9 @@ OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 OneIsland_PokemonCenter_1F_MapScript3_170C0D:: @ 8170C0D compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - call_if 4, EventScript_170C22 - checkflag FLAG_0x844 - call_if 1, EventScript_170C36 + call_if ge, EventScript_170C22 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + call_if TRUE, EventScript_170C36 end EventScript_170C22:: @ 8170C22 @@ -29,11 +29,11 @@ EventScript_170C36:: @ 8170C36 OneIsland_PokemonCenter_1F_MapScript1_170C4E:: @ 8170C4E setrespawn SPAWN_ONE_ISLAND compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 - call_if 1, EventScript_170C73 + call_if eq, EventScript_170C73 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0 - call_if 1, EventScript_170C79 + call_if eq, EventScript_170C79 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 - call_if 1, EventScript_170C90 + call_if eq, EventScript_170C90 end EventScript_170C73:: @ 8170C73 @@ -84,10 +84,10 @@ EventScript_170CB1:: @ 8170CB1 waitmovement 0 applymovement 255, Movement_1A75EB waitmovement 0 - checkflag FLAG_0x82C - call_if 1, EventScript_170E34 - checkflag FLAG_0x82C - call_if 0, EventScript_170E3D + checkflag FLAG_SYS_GAME_CLEAR + call_if TRUE, EventScript_170E34 + checkflag FLAG_SYS_GAME_CLEAR + call_if FALSE, EventScript_170E3D applymovement 3, Movement_1A75ED waitmovement 0 msgbox gUnknown_81A0E17 @@ -112,18 +112,18 @@ EventScript_170CB1:: @ 8170CB1 additem ITEM_TRI_PASS, 1 giveitemfanfaremsg gUnknown_81A231B, ITEM_TRI_PASS, 1, MUS_FAN5 msgbox gUnknown_81A1150 - compare_var_to_value VAR_0x4058, 2 - call_if 4, EventScript_170E46 - compare_var_to_value VAR_0x4058, 2 - call_if 0, EventScript_170E58 - setflag FLAG_0x845 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + call_if ge, EventScript_170E46 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + call_if lt, EventScript_170E58 + setflag FLAG_SYS_SEVII_MAP_123 msgbox gUnknown_81A1230 closemessage applymovement 2, Movement_1A75E9 waitmovement 0 applymovement 3, Movement_1A75E9 waitmovement 0 - setflag FLAG_0x841 + setflag FLAG_SYS_PC_STORAGE_DISABLED setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 releaseall end @@ -146,8 +146,8 @@ EventScript_170E46:: @ 8170E46 return EventScript_170E58:: @ 8170E58 - setflag FLAG_0x039 - setvar VAR_0x4058, 2 + setflag FLAG_HIDE_TOWN_MAP + setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 additem ITEM_TOWN_MAP, 1 giveitemfanfaremsg gUnknown_81A1218, ITEM_TOWN_MAP, 1, MUS_FAN5 return @@ -192,8 +192,8 @@ OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94 OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D lock - checkflag FLAG_0x2A1 - goto_if_eq EventScript_170EB1 + checkflag FLAG_SEVII_DETOUR_FINISHED + goto_if TRUE, EventScript_170EB1 msgbox gUnknown_81A1266 release end @@ -209,22 +209,22 @@ OneIsland_PokemonCenter_1F_EventScript_170EC5:: @ 8170EC5 lock faceplayer compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 - goto_if_eq EventScript_170F35 + goto_if eq, EventScript_170F35 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 - goto_if_eq EventScript_170F9B - checkflag FLAG_0x2DC - goto_if_eq EventScript_170FA5 + goto_if eq, EventScript_170F9B + checkflag FLAG_RECOVERED_SAPPHIRE + goto_if TRUE, EventScript_170FA5 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if_eq EventScript_17103A - checkflag FLAG_0x2DD - goto_if_eq EventScript_171044 + goto_if eq, EventScript_17103A + checkflag FLAG_GOT_RUBY + goto_if TRUE, EventScript_171044 compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 - goto_if_eq EventScript_1710F2 + goto_if eq, EventScript_1710F2 specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1710FC + goto_if eq, EventScript_1710FC compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 - goto_if_eq EventScript_171134 + goto_if eq, EventScript_171134 msgbox gUnknown_81A1321 closemessage applymovement 3, Movement_1A75E5 @@ -236,28 +236,22 @@ EventScript_170F35:: @ 8170F35 msgbox gUnknown_81A1EBD random 3 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_170F6D + goto_if eq, EventScript_170F6D compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_170F84 - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars + goto_if eq, EventScript_170F84 + famechecker FAMECHECKER_BILL, 5 msgbox gUnknown_81A2076 release end EventScript_170F6D:: @ 8170F6D - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BILL, 3 msgbox gUnknown_81A1EF3 release end EventScript_170F84:: @ 8170F84 - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BILL, 4 msgbox gUnknown_81A1F7C release end @@ -299,9 +293,9 @@ EventScript_170FA5:: @ 8170FA5 waitmovement 0 msgbox gUnknown_81A1D7D special sub_810B82C - setflag FLAG_0x844 - setflag FLAG_0x05C - setflag FLAG_0x08C + setflag FLAG_SYS_CAN_LINK_WITH_RS + setflag FLAG_HIDE_CERULEAN_CAVE_GUARD + setflag FLAG_HIDE_LORELEI_IN_HER_HOUSE setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 special InitRoamer release @@ -331,14 +325,14 @@ EventScript_171044:: @ 8171044 waitmovement 0 msgbox gUnknown_81A19AA, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_171099 + goto_if eq, EventScript_171099 goto EventScript_1710B2 end EventScript_171099:: @ 8171099 msgbox gUnknown_81A1A08, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_171099 + goto_if eq, EventScript_171099 goto EventScript_1710B2 end @@ -348,7 +342,7 @@ EventScript_1710B2:: @ 81710B2 removeitem ITEM_TRI_PASS, 1 setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 additem ITEM_RAINBOW_PASS, 1 - setflag FLAG_0x846 + setflag FLAG_SYS_SEVII_MAP_4567 textcolor 3 playfanfare MUS_FAN5 message Text_1A1B56 @@ -375,7 +369,7 @@ EventScript_1710FC:: @ 81710FC applymovement 3, Movement_1A75E1 waitmovement 0 msgbox gUnknown_81A17DF - setvar VAR_0x407F, 1 + setvar VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 1 setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 release end @@ -410,8 +404,8 @@ OneIsland_PokemonCenter_1F_EventScript_171151:: @ 8171151 OneIsland_PokemonCenter_1F_EventScript_17115A:: @ 817115A lock faceplayer - checkflag FLAG_0x844 - goto_if_eq EventScript_17116F + checkflag FLAG_SYS_CAN_LINK_WITH_RS + goto_if TRUE, EventScript_17116F msgbox gUnknown_81A218D release end @@ -423,10 +417,10 @@ EventScript_17116F:: @ 817116F OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179 lockall - checkflag FLAG_0x844 - goto_if_eq EventScript_1711A0 - checkflag FLAG_0x2A1 - goto_if_eq EventScript_171196 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + goto_if TRUE, EventScript_1711A0 + checkflag FLAG_SEVII_DETOUR_FINISHED + goto_if TRUE, EventScript_171196 msgbox gUnknown_81A223F releaseall end @@ -473,13 +467,13 @@ EventScript_1711DA:: @ 81711DA msgbox gUnknown_81A13B8 closemessage compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1712E4 + call_if eq, EventScript_1712E4 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1712EF + call_if eq, EventScript_1712EF compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_1712FA + call_if eq, EventScript_1712FA compare_var_to_value VAR_0x4001, 4 - call_if 1, EventScript_171305 + call_if eq, EventScript_171305 delay 10 msgbox gUnknown_81A13CB applymovement 255, Movement_1A75ED @@ -514,12 +508,12 @@ EventScript_1711DA:: @ 81711DA applymovement 2, Movement_17132D waitmovement 0 playse SE_KAIDAN - setflag FLAG_0x072 + setflag FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 - clearflag FLAG_0x062 - setvar VAR_0x4071, 3 - setvar VAR_0x8004, 1 - setvar VAR_0x8006, 8 + clearflag FLAG_HIDE_CINNABAR_BILL + setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 3 + setvar VAR_0x8004, SEAGALLOP_ONE_ISLAND + setvar VAR_0x8006, SEAGALLOP_CINNABAR_ISLAND goto EventScript_1A90DA end diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 616c96a7c..aacfae373 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "OneIsland_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index b1e946ea0..2d351ae47 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 8, "y": 11, "elevation": 1, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 13, "y": 20, "elevation": 3, @@ -55,8 +55,9 @@ "y": 20, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "103", - "unknown": 1 + "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -64,8 +65,9 @@ "y": 27, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "104", - "unknown": 1 + "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STARDUST_2", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -73,8 +75,9 @@ "y": 31, "elevation": 3, "item": "ITEM_PEARL", - "flag": "105", - "unknown": 1 + "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -82,26 +85,29 @@ "y": 34, "elevation": 3, "item": "ITEM_PEARL", - "flag": "106", - "unknown": 1 + "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_PEARL_2", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", "x": 15, "y": 22, "elevation": 3, - "item": "POCKET_KEY_ITEMS", - "flag": "107", - "unknown": 1 + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", "x": 16, "y": 33, "elevation": 3, - "item": "POCKET_KEY_ITEMS", - "flag": "108", - "unknown": 1 + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_ULTRA_BALL_2", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -109,8 +115,9 @@ "y": 29, "elevation": 3, "item": "ITEM_STAR_PIECE", - "flag": "109", - "unknown": 1 + "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_STAR_PIECE", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -118,8 +125,9 @@ "y": 27, "elevation": 3, "item": "ITEM_BIG_PEARL", - "flag": "110", - "unknown": 1 + "flag": "HIDDEN_ITEM_ONE_ISLAND_TREASURE_BEACH_BIG_PEARL", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 4b4acaf09..344d30be7 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 3, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 13, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "71", + "graphics_id": "MAP_OBJ_GFX_PROF_OAK", "x": 10, "y": 8, "elevation": 3, @@ -61,7 +61,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "44" + "flag": "FLAG_HIDE_OAK_IN_PALLET_TOWN" } ], "warp_events": [ @@ -93,7 +93,7 @@ "x": 12, "y": 1, "elevation": 3, - "var": "VAR_MAP_SCENE_PALLET_TOWN", + "var": "VAR_MAP_SCENE_PALLET_TOWN_OAK", "var_value": 0, "script": "PalletTown_EventScript_1655ED" }, @@ -102,7 +102,7 @@ "x": 13, "y": 1, "elevation": 3, - "var": "VAR_MAP_SCENE_PALLET_TOWN", + "var": "VAR_MAP_SCENE_PALLET_TOWN_OAK", "var_value": 0, "script": "PalletTown_EventScript_1655F9" }, diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index ed53b8518..d4e6c0cf3 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -5,29 +5,29 @@ PalletTown_MapScripts:: @ 816545A PalletTown_MapScript1_165465:: @ 8165465 setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN - checkflag FLAG_0x291 - call_if 1, EventScript_165488 - compare_var_to_value VAR_0x4070, 0 - call_if 1, EventScript_1654A8 - compare_var_to_value VAR_0x4070, 1 - call_if 1, EventScript_1654A2 + checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN + call_if TRUE, EventScript_165488 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0 + call_if eq, EventScript_1654A8 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 + call_if eq, EventScript_1654A2 end EventScript_165488:: @ 8165488 - checkflag FLAG_0x83E - goto_if 0, EventScript_1A77A9 - compare_var_to_value VAR_0x4070, 1 - goto_if 4, EventScript_1A77A9 - setvar VAR_0x4070, 1 + checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN + goto_if FALSE, EventScript_1A77A9 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 + goto_if ge, EventScript_1A77A9 + setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return EventScript_1654A2:: @ 81654A2 - setvar VAR_0x4070, 2 + setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 return EventScript_1654A8:: @ 81654A8 - checkflag FLAG_0x291 - goto_if_eq EventScript_1654BD + checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN + goto_if TRUE, EventScript_1654BD setobjectxyperm 1, 5, 15 setobjectmovementtype 1, 7 return @@ -39,7 +39,7 @@ EventScript_1654BD:: @ 81654BD return PalletTown_MapScript2_1654CE:: @ 81654CE - map_script_2 VAR_MAP_SCENE_PALLET_TOWN, 2, EventScript_1654D8 + map_script_2 VAR_MAP_SCENE_PALLET_TOWN_OAK, 2, EventScript_1654D8 .2byte 0 EventScript_1654D8:: @ 81654D8 @@ -50,8 +50,8 @@ EventScript_1654D8:: @ 81654D8 addobject 3 applymovement 3, Movement_1655AF waitmovement 0 - checkflag FLAG_SYS_RIBBON_GET - goto_if 0, EventScript_1655A1 + checkflag FLAG_WORLD_MAP_ONE_ISLAND + goto_if FALSE, EventScript_1655A1 msgbox gUnknown_817D8BF setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount @@ -60,7 +60,7 @@ EventScript_1654D8:: @ 81654D8 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 compare_var_to_value VAR_0x8009, 60 - goto_if 0, EventScript_165593 + goto_if lt, EventScript_165593 msgbox gUnknown_817D9AA closemessage playbgm MUS_ANNAI, 0 @@ -75,8 +75,8 @@ EventScript_1654D8:: @ 81654D8 closedoor 16, 13 waitdooranim setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 - setvar VAR_MAP_SCENE_PALLET_TOWN, 3 - setflag FLAG_0x02C + setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 3 + setflag FLAG_HIDE_OAK_IN_PALLET_TOWN warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 waitstate releaseall @@ -87,7 +87,7 @@ EventScript_16557E:: @ 816557E applymovement 3, Movement_1655BE waitmovement 0 removeobject 3 - setvar VAR_MAP_SCENE_PALLET_TOWN, 3 + setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 3 releaseall end @@ -184,9 +184,7 @@ PalletTown_EventScript_1655F9:: @ 81655F9 end EventScript_165605:: @ 8165605 - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 + famechecker FAMECHECKER_OAK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 textcolor 0 delay 30 playbgm MUS_OHKIDO, 0 @@ -202,17 +200,17 @@ EventScript_165605:: @ 8165605 delay 30 addobject 3 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1656B8 + call_if eq, EventScript_1656B8 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1656C3 + call_if eq, EventScript_1656C3 delay 30 msgbox gUnknown_817D74A closemessage delay 30 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1656CE + call_if eq, EventScript_1656CE compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1656E0 + call_if eq, EventScript_1656E0 opendoor 16, 13 waitdooranim applymovement 3, Movement_16572E @@ -221,9 +219,9 @@ EventScript_165605:: @ 8165605 closedoor 16, 13 waitdooranim setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - clearflag FLAG_0x02B - setvar VAR_MAP_SCENE_PALLET_TOWN, 1 - setflag FLAG_0x02C + clearflag FLAG_HIDE_OAK_IN_HIS_LAB + setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 1 + setflag FLAG_HIDE_OAK_IN_PALLET_TOWN setflag FLAG_SPECIAL_FLAG_0x4001 warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 waitstate @@ -376,14 +374,14 @@ Movement_165758:: @ 8165758 PalletTown_EventScript_16575C:: @ 816575C lock - compare_var_to_value VAR_0x4070, 2 - goto_if_eq EventScript_1657ED - compare_var_to_value VAR_0x4070, 1 - goto_if_eq EventScript_165815 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 + goto_if eq, EventScript_1657ED + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 + goto_if eq, EventScript_165815 compare_var_to_value VAR_0x4002, 1 - goto_if_eq EventScript_1658C2 - checkflag FLAG_0x002 - goto_if_eq EventScript_165801 + goto_if eq, EventScript_1658C2 + checkflag FLAG_TEMP_2 + goto_if TRUE, EventScript_165801 msgbox gUnknown_81B1C8B applymovement 1, Movement_1A75E1 waitmovement 0 @@ -395,11 +393,11 @@ PalletTown_EventScript_16575C:: @ 816575C msgbox gUnknown_81B1C9F closemessage compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_1657D7 + call_if eq, EventScript_1657D7 compare_var_to_value VAR_FACING, 4 - call_if 5, EventScript_1657E2 + call_if ne, EventScript_1657E2 moveobjectoffscreen 1 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 release end @@ -450,9 +448,7 @@ PalletTown_EventScript_16582F:: @ 816582F PalletTown_EventScript_165838:: @ 8165838 lockall - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_OAK, 0 msgbox gUnknown_817D866 releaseall end @@ -472,7 +468,7 @@ PalletTown_EventScript_165862:: @ 8165862 PalletTown_EventScript_16586B:: @ 816586B lockall msgbox gUnknown_81B1CC1 - setvar VAR_0x4070, 1 + setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 releaseall end @@ -491,8 +487,8 @@ EventScript_165894:: @ 8165894 closemessage delay 20 textcolor 3 - setflag FLAG_0x83E - setvar VAR_0x4070, 1 + setflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN + setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 setvar VAR_0x4002, 0 special sub_80699E0 special sub_80699BC diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index c5522db0b..c2c15b1b8 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "76", + "graphics_id": "MAP_OBJ_GFX_DAISY", "x": 10, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "93", + "graphics_id": "MAP_OBJ_GFX_TOWN_MAP", "x": 6, "y": 4, "elevation": 3, @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PalletTown_GarysHouse_EventScript_168F63", - "flag": "57" + "flag": "FLAG_HIDE_TOWN_MAP" } ], "warp_events": [ diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index d165036fb..7900d62e8 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -3,10 +3,10 @@ PalletTown_GarysHouse_MapScripts:: @ 8168D27 .byte 0 PalletTown_GarysHouse_MapScript1_168D2D:: @ 8168D2D - compare_var_to_value VAR_0x4058, 2 - call_if 0, EventScript_168D44 - compare_var_to_value VAR_0x4058, 2 - call_if 4, EventScript_168D50 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + call_if lt, EventScript_168D44 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + call_if ge, EventScript_168D50 end EventScript_168D44:: @ 8168D44 @@ -21,19 +21,17 @@ EventScript_168D50:: @ 8168D50 PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56 lock faceplayer - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - checkflag FLAG_0x82C - goto_if_eq EventScript_168DB9 + famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + checkflag FLAG_SYS_GAME_CLEAR + goto_if TRUE, EventScript_168DB9 compare_var_to_value VAR_0x4001, 1 - goto_if_eq EventScript_168EEC - compare_var_to_value VAR_0x4058, 2 - goto_if_eq EventScript_168F59 - compare_var_to_value VAR_0x4058, 1 - goto_if_eq EventScript_168EF6 + goto_if eq, EventScript_168EEC + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + goto_if eq, EventScript_168F59 + compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 + goto_if eq, EventScript_168EF6 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - goto_if 4, EventScript_168DAF + goto_if ge, EventScript_168DAF msgbox gUnknown_818D58C closemessage applymovement 1, Movement_1A75E5 @@ -49,29 +47,29 @@ EventScript_168DAF:: @ 8168DAF EventScript_168DB9:: @ 8168DB9 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 - compare_var_to_value VAR_0x4025, 500 - goto_if 0, EventScript_168E46 + compare_var_to_value VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 + goto_if lt, EventScript_168E46 msgbox gUnknown_818D7D3, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_168E3C + goto_if eq, EventScript_168E3C msgbox gUnknown_818D8B2 - special sub_80BF8FC + special Special_ChooseMonFromParty waitstate lock faceplayer compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_168E3C + goto_if ge, EventScript_168E3C specialvar VAR_RESULT, sub_80CAD54 compare_var_to_value VAR_RESULT, SPECIES_EGG - goto_if_eq EventScript_168E32 + goto_if eq, EventScript_168E32 msgbox gUnknown_818D8CC closemessage fadescreen 1 playfanfare MUS_ME_ASA waitfanfare - special sub_80CC948 + special Special_DaisyMassageServices fadescreen 0 special TV_CopyNicknameToStringVar1AndEnsureTerminated msgbox gUnknown_818D8FE @@ -146,11 +144,11 @@ EventScript_168EF6:: @ 8168EF6 closemessage checkitemspace ITEM_TOWN_MAP, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_168F4F + goto_if eq, EventScript_168F4F applymovement 1, Movement_1A75EB waitmovement 0 removeobject 2 - setvar VAR_0x4058, 2 + setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 delay 15 applymovement 1, Movement_1A75E1 waitmovement 0 diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index ad29c0e04..4e281c43a 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "88", + "graphics_id": "MAP_OBJ_GFX_MOM", "x": 8, "y": 4, "elevation": 3, diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 89eabeea1..900dd06aa 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -4,13 +4,13 @@ PalletTown_PlayersHouse_1F_MapScripts:: @ 8168C08 PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 lock faceplayer - checkflag FLAG_0x258 - goto_if_eq EventScript_168C4A + checkflag FLAG_BEAT_RIVAL_IN_OAKS_LAB + goto_if TRUE, EventScript_168C4A checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_168C38 + call_if eq, EventScript_168C38 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_168C41 + call_if eq, EventScript_168C41 closemessage applymovement 1, Movement_1A75E5 waitmovement 0 @@ -28,7 +28,7 @@ EventScript_168C41:: @ 8168C41 EventScript_168C4A:: @ 8168C4A msgbox gUnknown_818D3D1 closemessage - call EventScript_1A6C26 + call EventScript_FadeOut_Heal_FadeIn msgbox gUnknown_818D3F8 release end @@ -36,7 +36,7 @@ EventScript_168C4A:: @ 8168C4A PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 lockall compare_var_to_value VAR_FACING, 2 - goto_if_eq EventScript_168C78 + goto_if eq, EventScript_168C78 msgbox gUnknown_818D4F9 releaseall end @@ -44,9 +44,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 EventScript_168C78:: @ 8168C78 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_168C91 + call_if eq, EventScript_168C91 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_168C9A + call_if eq, EventScript_168C9A releaseall end diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 51865301c..80249e6c4 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -5,7 +5,7 @@ PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 PalletTown_PlayersHouse_2F_MapScript1_168CAE:: @ 8168CAE compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 - call_if 1, EventScript_168CBA + call_if eq, EventScript_168CBA end EventScript_168CBA:: @ 8168CBA @@ -33,7 +33,7 @@ gUnknown_8168CE4:: @ 8168CE4 PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lockall setvar VAR_0x8004, 32 special Special_SetSomeVariable diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index c7440708c..9ff650466 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 3, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 2, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 11, "y": 10, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "71", + "graphics_id": "MAP_OBJ_GFX_PROF_OAK", "x": 6, "y": 3, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PalletTown_ProfessorOaksLab_EventScript_169595", - "flag": "43" + "flag": "FLAG_HIDE_OAK_IN_HIS_LAB" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 8, "y": 4, "elevation": 0, @@ -76,10 +76,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PalletTown_ProfessorOaksLab_EventScript_169BAB", - "flag": "40" + "flag": "FLAG_HIDE_BULBASAUR_BALL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 9, "y": 4, "elevation": 0, @@ -89,10 +89,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PalletTown_ProfessorOaksLab_EventScript_169D78", - "flag": "41" + "flag": "FLAG_HIDE_SQUIRTLE_BALL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 10, "y": 4, "elevation": 0, @@ -102,10 +102,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PalletTown_ProfessorOaksLab_EventScript_169DAE", - "flag": "42" + "flag": "FLAG_HIDE_CHARMANDER_BALL" }, { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 5, "y": 4, "elevation": 3, @@ -115,10 +115,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PalletTown_ProfessorOaksLab_EventScript_16955F", - "flag": "45" + "flag": "FLAG_HIDE_RIVAL_IN_LAB" }, { - "graphics_id": "94", + "graphics_id": "MAP_OBJ_GFX_POKEDEX", "x": 4, "y": 1, "elevation": 0, @@ -128,10 +128,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F", - "flag": "58" + "flag": "FLAG_HIDE_POKEDEX" }, { - "graphics_id": "94", + "graphics_id": "MAP_OBJ_GFX_POKEDEX", "x": 5, "y": 1, "elevation": 0, @@ -141,7 +141,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PalletTown_ProfessorOaksLab_EventScript_169E5F", - "flag": "58" + "flag": "FLAG_HIDE_POKEDEX" } ], "warp_events": [ diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 64bec30b1..1cdb53ca1 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -5,19 +5,19 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E .byte 0 PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E - setflag FLAG_0x2CF + setflag FLAG_VISITED_OAKS_LAB compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 - call_if 1, EventScript_168FC6 + call_if eq, EventScript_168FC6 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7 - call_if 1, EventScript_168FD5 + call_if eq, EventScript_168FD5 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 - call_if 1, EventScript_168FC0 - checkflag FLAG_0x247 - call_if 1, EventScript_168FBC + call_if eq, EventScript_168FC0 + checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL + call_if TRUE, EventScript_168FBC end EventScript_168FBC:: @ 8168FBC - setflag FLAG_0x24F + setflag FLAG_OAK_SKIP_22_RIVAL_CHECK return EventScript_168FC0:: @ 8168FC0 @@ -57,7 +57,7 @@ EventScript_169002:: @ 8169002 removeobject 4 setobjectxyperm 4, 6, 3 setobjectmovementtype 4, 8 - clearflag FLAG_0x02B + clearflag FLAG_HIDE_OAK_IN_HIS_LAB applymovement 255, Movement_1692B7 waitmovement 0 goto EventScript_169035 @@ -67,32 +67,32 @@ EventScript_169035:: @ 8169035 msgbox gUnknown_818EE60 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169174 + call_if eq, EventScript_169174 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1691BB + call_if eq, EventScript_1691BB compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169194 + call_if eq, EventScript_169194 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169194 + call_if eq, EventScript_169194 msgbox gUnknown_818EF59 fadedefaultbgm msgbox gUnknown_818F004 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1691DB + call_if eq, EventScript_1691DB compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_1691E6 + call_if eq, EventScript_1691E6 textcolor 3 msgbox gUnknown_818F062 closemessage call EventScript_1A6675 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1691F1 + call_if eq, EventScript_1691F1 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1691FC + call_if eq, EventScript_1691FC compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169215 + call_if eq, EventScript_169215 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169227 + call_if eq, EventScript_169227 addobject 9 addobject 10 delay 30 @@ -102,13 +102,13 @@ EventScript_169035:: @ 8169035 removeobject 10 delay 30 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169845 + call_if eq, EventScript_169845 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169850 + call_if eq, EventScript_169850 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16985B + call_if eq, EventScript_16985B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16986D + call_if eq, EventScript_16986D textcolor 3 playfanfare MUS_FAN5 message Text_18F0E8 @@ -121,13 +121,13 @@ EventScript_169035:: @ 8169035 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169B69 + call_if eq, EventScript_169B69 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B removeobject 8 fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 @@ -219,7 +219,7 @@ EventScript_16923E:: @ 816923E removeobject 4 setobjectxyperm 4, 6, 3 setobjectmovementtype 4, 8 - clearflag FLAG_0x02B + clearflag FLAG_HIDE_OAK_IN_HIS_LAB applymovement 255, Movement_1692B7 waitmovement 0 applymovement 8, Movement_1A75E9 @@ -312,20 +312,20 @@ EventScript_16930B:: @ 816930B applymovement 4, Movement_1A75F1 waitmovement 0 compare_var_to_value VAR_STARTER_MON, 0 - goto_if_eq EventScript_1693D2 + goto_if eq, EventScript_1693D2 compare_var_to_value VAR_STARTER_MON, 1 - goto_if_eq EventScript_16944D + goto_if eq, EventScript_16944D compare_var_to_value VAR_STARTER_MON, 2 - goto_if_eq EventScript_16935A + goto_if eq, EventScript_16935A end EventScript_16935A:: @ 816935A compare_var_to_value VAR_0x4002, 1 - goto_if_eq EventScript_16937C + goto_if eq, EventScript_16937C compare_var_to_value VAR_0x4002, 2 - goto_if_eq EventScript_16938C + goto_if eq, EventScript_16938C compare_var_to_value VAR_0x4002, 3 - goto_if_eq EventScript_16939C + goto_if eq, EventScript_16939C end EventScript_16937C:: @ 816937C @@ -347,7 +347,7 @@ EventScript_16939C:: @ 816939C end EventScript_1693AC:: @ 81693AC - trainerbattle 9, 326, 3, Text_18DDEA, Text_18DE1A + trainerbattle 9, TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A goto EventScript_1694C2 end @@ -377,11 +377,11 @@ Movement_1693CD:: @ 81693CD EventScript_1693D2:: @ 81693D2 compare_var_to_value VAR_0x4002, 1 - goto_if_eq EventScript_1693F4 + goto_if eq, EventScript_1693F4 compare_var_to_value VAR_0x4002, 2 - goto_if_eq EventScript_169404 + goto_if eq, EventScript_169404 compare_var_to_value VAR_0x4002, 3 - goto_if_eq EventScript_169414 + goto_if eq, EventScript_169414 end EventScript_1693F4:: @ 81693F4 @@ -403,7 +403,7 @@ EventScript_169414:: @ 8169414 end EventScript_169424:: @ 8169424 - trainerbattle 9, 328, 3, Text_18DDEA, Text_18DE1A + trainerbattle 9, TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A goto EventScript_1694C2 end @@ -436,11 +436,11 @@ Movement_169447:: @ 8169447 EventScript_16944D:: @ 816944D compare_var_to_value VAR_0x4002, 1 - goto_if_eq EventScript_16946F + goto_if eq, EventScript_16946F compare_var_to_value VAR_0x4002, 2 - goto_if_eq EventScript_16947F + goto_if eq, EventScript_16947F compare_var_to_value VAR_0x4002, 3 - goto_if_eq EventScript_16948F + goto_if eq, EventScript_16948F end EventScript_16946F:: @ 816946F @@ -462,7 +462,7 @@ EventScript_16948F:: @ 816948F end EventScript_16949F:: @ 816949F - trainerbattle 9, 327, 3, Text_18DDEA, Text_18DE1A + trainerbattle 9, TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A goto EventScript_1694C2 end @@ -493,16 +493,16 @@ EventScript_1694C2:: @ 81694C2 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4002, 1 - call_if 1, EventScript_169504 + call_if eq, EventScript_169504 compare_var_to_value VAR_0x4002, 2 - call_if 1, EventScript_169516 + call_if eq, EventScript_169516 compare_var_to_value VAR_0x4002, 3 - call_if 1, EventScript_169528 + call_if eq, EventScript_169528 removeobject 8 playse SE_KAIDAN fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 - setflag FLAG_0x258 + setflag FLAG_BEAT_RIVAL_IN_OAKS_LAB releaseall end @@ -575,9 +575,9 @@ PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F lock faceplayer compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if_eq EventScript_16958B + goto_if eq, EventScript_16958B compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if_eq EventScript_169581 + goto_if eq, EventScript_169581 msgbox gUnknown_818DC67 release end @@ -595,24 +595,24 @@ EventScript_16958B:: @ 816958B PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595 lock faceplayer - checkflag FLAG_0x002 - goto_if_eq EventScript_169600 + checkflag FLAG_TEMP_2 + goto_if TRUE, EventScript_169600 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 - goto_if_eq EventScript_169903 + goto_if eq, EventScript_169903 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8 - goto_if_eq EventScript_169A6E - checkflag FLAG_0x82C - goto_if_eq EventScript_1699CE - compare_var_to_value VAR_0x4052, 1 - goto_if_eq EventScript_169903 + goto_if eq, EventScript_169A6E + checkflag FLAG_SYS_GAME_CLEAR + goto_if TRUE, EventScript_1699CE + compare_var_to_value VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1 + goto_if eq, EventScript_169903 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 - goto_if_eq EventScript_1698D6 + goto_if eq, EventScript_1698D6 compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - goto_if 4, EventScript_16961E + goto_if ge, EventScript_16961E compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 - goto_if_eq EventScript_169614 + goto_if eq, EventScript_169614 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if_eq EventScript_16960A + goto_if eq, EventScript_16960A msgbox gUnknown_818E116 release end @@ -646,13 +646,13 @@ EventScript_16961E:: @ 816961E msgbox gUnknown_818DE8D closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169A82 + call_if eq, EventScript_169A82 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169AC1 + call_if eq, EventScript_169AC1 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169A9E + call_if eq, EventScript_169A9E compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169A9E + call_if eq, EventScript_169A9E fadedefaultbgm msgbox gUnknown_818DE99 closemessage @@ -663,23 +663,23 @@ EventScript_16961E:: @ 816961E applymovement 4, Movement_1A75DD waitmovement 0 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169ADD + call_if eq, EventScript_169ADD compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169B14 + call_if eq, EventScript_169B14 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169AF5 + call_if eq, EventScript_169AF5 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169B86 + call_if eq, EventScript_169B86 msgbox gUnknown_818E508 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169882 + call_if eq, EventScript_169882 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_16988D + call_if eq, EventScript_16988D compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_1698A6 + call_if eq, EventScript_1698A6 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_1698B8 + call_if eq, EventScript_1698B8 msgbox gUnknown_818E536 closemessage delay 40 @@ -692,13 +692,13 @@ EventScript_16961E:: @ 816961E removeobject 10 delay 25 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169845 + call_if eq, EventScript_169845 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169850 + call_if eq, EventScript_169850 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16985B + call_if eq, EventScript_16985B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16986D + call_if eq, EventScript_16986D delay 10 textcolor 3 playfanfare MUS_FAN5 @@ -706,44 +706,42 @@ EventScript_16961E:: @ 816961E waitmessage waitfanfare call EventScript_1A6675 - setflag FLAG_0x829 + setflag FLAG_SYS_POKEDEX_GET special sub_810B810 - setvar VAR_0x407C, 1 + setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1 msgbox gUnknown_818E612 additem ITEM_POKE_BALL, 5 giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5 msgbox gUnknown_818E6D0 - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_OAK, 1 msgbox gUnknown_818E784 msgbox gUnknown_818DEC8 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169B33 + call_if eq, EventScript_169B33 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169B45 + call_if eq, EventScript_169B45 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169B57 + call_if eq, EventScript_169B57 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169B57 + call_if eq, EventScript_169B57 msgbox gUnknown_818DEF3 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169B69 + call_if eq, EventScript_169B69 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169B7B + call_if eq, EventScript_169B7B removeobject 8 fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 2 - setvar VAR_0x4051, 1 - setvar VAR_0x4058, 1 - setvar VAR_0x4054, 1 + setvar VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 + setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 1 + setvar VAR_MAP_SCENE_ROUTE22, 1 release end @@ -842,14 +840,14 @@ EventScript_1698D6:: @ 81698D6 getnumberstring 0, VAR_0x8008 getnumberstring 1, VAR_0x8009 compare_var_to_value VAR_0x8009, 1 - goto_if_eq EventScript_1699FB + goto_if eq, EventScript_1699FB goto EventScript_169903 end EventScript_169903:: @ 8169903 call EventScript_1A737B - checkflag FLAG_0x2F4 - goto_if_eq EventScript_169913 + checkflag FLAG_OAK_SAW_DEX_COMPLETION + goto_if TRUE, EventScript_169913 release end @@ -859,19 +857,19 @@ EventScript_169913:: @ 8169913 message Text_1A7291 waitmessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_169964 + call_if eq, EventScript_169964 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_16996F + call_if eq, EventScript_16996F compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16997A + call_if eq, EventScript_16997A compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_169985 + call_if eq, EventScript_169985 applymovement 4, Movement_1A75E1 waitmovement 0 closemessage delay 70 msgbox gUnknown_81A72AD - setflag FLAG_0x002 + setflag FLAG_TEMP_2 release end @@ -973,9 +971,9 @@ EventScript_1699CE:: @ 81699CE call EventScript_1A737B closemessage compare_var_to_value VAR_0x8009, 60 - goto_if 0, EventScript_1699F9 - checkflag FLAG_SYS_RIBBON_GET - goto_if 0, EventScript_1699F9 + goto_if lt, EventScript_1699F9 + checkflag FLAG_WORLD_MAP_ONE_ISLAND + goto_if FALSE, EventScript_1699F9 delay 30 msgbox gUnknown_818EDF5 goto EventScript_169035 @@ -988,21 +986,21 @@ EventScript_1699F9:: @ 81699F9 EventScript_1699FB:: @ 81699FB special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 - checkflag FLAG_0x24F - goto_if_eq EventScript_169A6E - checkflag FLAG_0x247 - goto_if_eq EventScript_169A78 + checkflag FLAG_OAK_SKIP_22_RIVAL_CHECK + goto_if TRUE, EventScript_169A6E + checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL + goto_if TRUE, EventScript_169A78 checkitem ITEM_POKE_BALL, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_169A34 + goto_if eq, EventScript_169A34 goto EventScript_169A6E end EventScript_169A34:: @ 8169A34 - compare_var_to_value VAR_0x4054, 2 - goto_if 4, EventScript_169A45 + compare_var_to_value VAR_MAP_SCENE_ROUTE22, 2 + goto_if ge, EventScript_169A45 goto EventScript_169A6E end @@ -1010,7 +1008,7 @@ EventScript_169A45:: @ 8169A45 msgbox gUnknown_818E89C additem ITEM_POKE_BALL, 5 giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5 - setflag FLAG_0x247 + setflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL release end @@ -1143,17 +1141,22 @@ Movement_169BA4:: @ 8169BA4 step_10 step_end + .equ VAR_OAKSLAB_PLAYER_STARTER_NO, VAR_0x4001 + .equ VAR_OAKSLAB_PLAYER_STARTER_SPECIES, VAR_0x4002 + .equ VAR_OAKSLAB_RIVAL_STARTER_SPECIES, VAR_0x4003 + .equ VAR_OAKSLAB_RIVAL_STARTER_OBJID, VAR_0x4004 + PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB lock faceplayer - setvar VAR_0x4001, 0 - setvar VAR_0x4002, 1 - setvar VAR_0x4003, 4 - setvar VAR_0x4004, 7 + setvar VAR_OAKSLAB_PLAYER_STARTER_NO, 0 + setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_BULBASAUR + setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER + setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 7 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if 4, EventScript_169DE4 + goto_if ge, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if_eq EventScript_169BE1 + goto_if eq, EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1161,121 +1164,121 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB EventScript_169BE1:: @ 8169BE1 applymovement 4, Movement_1A75EF waitmovement 0 - drawmonpic VAR_0x4002, 10, 3 + drawmonpic VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 10, 3 textcolor 0 - compare_var_to_value VAR_0x4001, 0 - goto_if_eq EventScript_169C14 - compare_var_to_value VAR_0x4001, 1 - goto_if_eq EventScript_169C33 - compare_var_to_value VAR_0x4001, 2 - goto_if_eq EventScript_169C52 + compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 0 + goto_if eq, EventScript_OakDescribesBulbasaur + compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 1 + goto_if eq, EventScript_OakDescribesCharmander + compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 2 + goto_if eq, EventScript_OakDescribesSquirtle end -EventScript_169C14:: @ 8169C14 +EventScript_OakDescribesBulbasaur:: @ 8169C14 msgbox gUnknown_818E272, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_169C74 + goto_if eq, EventScript_ThisPokeIsRealyEnergetic compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_169C71 + goto_if eq, EventScript_DeclinedStarter end -EventScript_169C33:: @ 8169C33 +EventScript_OakDescribesCharmander:: @ 8169C33 msgbox gUnknown_818E207, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_169C74 + goto_if eq, EventScript_ThisPokeIsRealyEnergetic compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_169C71 + goto_if eq, EventScript_DeclinedStarter end -EventScript_169C52:: @ 8169C52 +EventScript_OakDescribesSquirtle:: @ 8169C52 msgbox gUnknown_818E194, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_169C74 + goto_if eq, EventScript_ThisPokeIsRealyEnergetic compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_169C71 + goto_if eq, EventScript_DeclinedStarter end -EventScript_169C71:: @ 8169C71 +EventScript_DeclinedStarter:: @ 8169C71 erasemonpic release end -EventScript_169C74:: @ 8169C74 +EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74 erasemonpic removeobject VAR_LAST_TALKED msgbox gUnknown_818E2E5 call EventScript_1A6675 - setflag FLAG_0x828 - setflag FLAG_0x291 - givemon VAR_0x4002, 5, ITEM_NONE, 0, 0, 0 - copyvar VAR_STARTER_MON, VAR_0x4001 - getspeciesname 0, VAR_0x4002 + setflag FLAG_SYS_POKEMON_GET + setflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN + givemon VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 5, ITEM_NONE, 0, 0, 0 + copyvar VAR_STARTER_MON, VAR_OAKSLAB_PLAYER_STARTER_NO + getspeciesname 0, VAR_OAKSLAB_PLAYER_STARTER_SPECIES message Text_18E30D waitmessage playfanfare MUS_FAN5 waitfanfare msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_169CCC + goto_if eq, EventScript_GiveNicknameToStarter compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_169CDC + goto_if eq, EventScript_SkipGiveNicknameToStarter end -EventScript_169CCC:: @ 8169CCC +EventScript_GiveNicknameToStarter:: @ 8169CCC setvar VAR_0x8004, 0 call EventScript_1A74EB - goto EventScript_169CDC + goto EventScript_SkipGiveNicknameToStarter end -EventScript_169CDC:: @ 8169CDC +EventScript_SkipGiveNicknameToStarter:: @ 8169CDC closemessage - compare_var_to_value VAR_0x4001, 0 - goto_if_eq EventScript_169CFF - compare_var_to_value VAR_0x4001, 1 - goto_if_eq EventScript_169D1F - compare_var_to_value VAR_0x4001, 2 - goto_if_eq EventScript_169D0F + compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 0 + goto_if eq, EventScript_RivalWalksToCharmander + compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 1 + goto_if eq, EventScript_RivalWalksToSquirtle + compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 2 + goto_if eq, EventScript_RivalWalksToBulbasaur end -EventScript_169CFF:: @ 8169CFF - applymovement 8, Movement_169D62 +EventScript_RivalWalksToCharmander:: @ 8169CFF + applymovement 8, Movement_RivalWalksToCharmander waitmovement 0 - goto EventScript_169D2F + goto Movement_RivalTakesHisStarter end -EventScript_169D0F:: @ 8169D0F - applymovement 8, Movement_169D6B +EventScript_RivalWalksToBulbasaur:: @ 8169D0F + applymovement 8, Movement_RivalWalksToBulbasaur waitmovement 0 - goto EventScript_169D2F + goto Movement_RivalTakesHisStarter end -EventScript_169D1F:: @ 8169D1F - applymovement 8, Movement_169D72 +EventScript_RivalWalksToSquirtle:: @ 8169D1F + applymovement 8, Movement_RivalWalksToSquirtle waitmovement 0 - goto EventScript_169D2F + goto Movement_RivalTakesHisStarter end -EventScript_169D2F:: @ 8169D2F +Movement_RivalTakesHisStarter:: @ 8169D2F textcolor 0 msgbox gUnknown_818DD34 - removeobject VAR_0x4004 + removeobject VAR_OAKSLAB_RIVAL_STARTER_OBJID textcolor 3 - getspeciesname 0, VAR_0x4003 + getspeciesname 0, VAR_OAKSLAB_RIVAL_STARTER_SPECIES message Text_18DD52 waitmessage playfanfare MUS_FAN5 waitfanfare setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - checkflag FLAG_0x83E - call_if 1, EventScript_169D5C + checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN + call_if TRUE, EventScript_169D5C release end EventScript_169D5C:: @ 8169D5C - setvar VAR_0x4070, 1 + setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return -Movement_169D62:: @ 8169D62 +Movement_RivalWalksToCharmander:: @ 8169D62 step_10 step_10 step_13 @@ -1286,7 +1289,7 @@ Movement_169D62:: @ 8169D62 step_11 step_end -Movement_169D6B:: @ 8169D6B +Movement_RivalWalksToBulbasaur:: @ 8169D6B step_10 step_13 step_13 @@ -1295,7 +1298,7 @@ Movement_169D6B:: @ 8169D6B step_2e step_end -Movement_169D72:: @ 8169D72 +Movement_RivalWalksToSquirtle:: @ 8169D72 step_10 step_13 step_13 @@ -1306,14 +1309,14 @@ Movement_169D72:: @ 8169D72 PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 lock faceplayer - setvar VAR_0x4001, 1 - setvar VAR_0x4002, 7 - setvar VAR_0x4003, 1 - setvar VAR_0x4004, 5 + setvar VAR_OAKSLAB_PLAYER_STARTER_NO, 1 + setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_SQUIRTLE + setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR + setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 5 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if 4, EventScript_169DE4 + goto_if ge, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if_eq EventScript_169BE1 + goto_if eq, EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1321,14 +1324,14 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78 PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE lock faceplayer - setvar VAR_0x4001, 2 - setvar VAR_0x4002, 4 - setvar VAR_0x4003, 7 - setvar VAR_0x4004, 6 + setvar VAR_OAKSLAB_PLAYER_STARTER_NO, 2 + setvar VAR_OAKSLAB_PLAYER_STARTER_SPECIES, SPECIES_CHARMANDER + setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE + setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 6 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - goto_if 4, EventScript_169DE4 + goto_if ge, EventScript_169DE4 compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2 - goto_if_eq EventScript_169BE1 + goto_if eq, EventScript_169BE1 msgbox gUnknown_818EA19 release end @@ -1341,16 +1344,14 @@ EventScript_169DE4:: @ 8169DE4 PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE lock faceplayer - checkflag FLAG_0x82C - goto_if_eq EventScript_169E03 + checkflag FLAG_SYS_GAME_CLEAR + goto_if TRUE, EventScript_169E03 msgbox gUnknown_818EBE6 release end EventScript_169E03:: @ 8169E03 - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_OAK, 5 msgbox gUnknown_818ED15 release end @@ -1358,16 +1359,14 @@ EventScript_169E03:: @ 8169E03 PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A lock faceplayer - checkflag FLAG_0x82C - goto_if_eq EventScript_169E2F + checkflag FLAG_SYS_GAME_CLEAR + goto_if TRUE, EventScript_169E2F msgbox gUnknown_818EBE6 release end EventScript_169E2F:: @ 8169E2F - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_DAISY, 0 msgbox gUnknown_818EC0B release end @@ -1375,9 +1374,7 @@ EventScript_169E2F:: @ 8169E2F PalletTown_ProfessorOaksLab_EventScript_169E46:: @ 8169E46 lock faceplayer - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_OAK, 2 msgbox gUnknown_818ED81 release end @@ -1397,7 +1394,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71 PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A lockall compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 - goto_if 4, EventScript_169E90 + goto_if ge, EventScript_169E90 msgbox gUnknown_818EA84 releaseall end diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index a3e8f4d40..2f51e7462 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 6, "y": 15, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 33, "y": 17, "elevation": 3, @@ -48,10 +48,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PewterCity_EventScript_16607E", - "flag": "80" + "flag": "FLAG_HIDE_PEWTER_MUSEUM_GUIDE" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 21, "y": 28, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 33, "y": 27, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 42, "y": 20, "elevation": 3, @@ -87,10 +87,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PewterCity_EventScript_165B9D", - "flag": "46" + "flag": "FLAG_HIDE_PEWTER_CITY_GYM_GUIDE" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 30, "y": 5, "elevation": 3, @@ -99,11 +99,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "PewterCity_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 46, "y": 20, "elevation": 3, @@ -113,7 +113,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PewterCity_EventScript_1662A9", - "flag": "146" + "flag": "FLAG_HIDE_PEWTER_CITY_RUNNING_SHOES_GUY" } ], "warp_events": [ @@ -173,7 +173,7 @@ "x": 42, "y": 21, "elevation": 3, - "var": "VAR_0x406C", + "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 0, "script": "PewterCity_EventScript_165D8E" }, @@ -182,7 +182,7 @@ "x": 42, "y": 22, "elevation": 3, - "var": "VAR_0x406C", + "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 0, "script": "PewterCity_EventScript_165D9A" }, @@ -191,7 +191,7 @@ "x": 42, "y": 23, "elevation": 3, - "var": "VAR_0x406C", + "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 0, "script": "PewterCity_EventScript_165DA6" }, @@ -200,7 +200,7 @@ "x": 43, "y": 23, "elevation": 3, - "var": "VAR_0x406C", + "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 0, "script": "PewterCity_EventScript_165DB2" }, @@ -209,7 +209,7 @@ "x": 46, "y": 21, "elevation": 3, - "var": "VAR_0x406C", + "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 1, "script": "PewterCity_EventScript_1662B7" }, @@ -218,7 +218,7 @@ "x": 46, "y": 22, "elevation": 3, - "var": "VAR_0x406C", + "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 1, "script": "PewterCity_EventScript_1662C4" }, @@ -227,7 +227,7 @@ "x": 46, "y": 23, "elevation": 3, - "var": "VAR_0x406C", + "var": "VAR_MAP_SCENE_PEWTER_CITY", "var_value": 1, "script": "PewterCity_EventScript_1662D1" } @@ -273,9 +273,10 @@ "x": 6, "y": 3, "elevation": 3, - "item": "POCKET_TM_CASE", - "flag": "112", - "unknown": 1 + "item": "ITEM_POKE_BALL", + "flag": "HIDDEN_ITEM_PEWTER_CITY_POKE_BALL", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index d4c461de2..352da6d31 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -4,7 +4,7 @@ PewterCity_MapScripts:: @ 8165B8E PewterCity_MapScript1_165B94:: @ 8165B94 setworldmapflag FLAG_WORLD_MAP_PEWTER_CITY - setvar VAR_0x4061, 0 + setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 0 end PewterCity_EventScript_165B9D:: @ 8165B9D @@ -14,14 +14,14 @@ PewterCity_EventScript_165B9D:: @ 8165B9D closemessage playbgm MUS_ANNAI, 0 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_165BD3 + call_if eq, EventScript_165BD3 msgbox gUnknown_817E6C7 closemessage applymovement 5, Movement_165D83 waitmovement 0 fadedefaultbgm removeobject 5 - clearflag FLAG_0x02E + clearflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE release end @@ -446,18 +446,18 @@ EventScript_165DBE:: @ 8165DBE closemessage playbgm MUS_ANNAI, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_165E0A + call_if eq, EventScript_165E0A compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_165E26 + call_if eq, EventScript_165E26 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_165E42 + call_if eq, EventScript_165E42 msgbox gUnknown_817E6C7 closemessage applymovement 5, Movement_165D83 waitmovement 0 fadedefaultbgm removeobject 5 - clearflag FLAG_0x02E + clearflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE releaseall end @@ -1033,19 +1033,19 @@ PewterCity_EventScript_16607E:: @ 816607E faceplayer msgbox gUnknown_817E53E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_166136 + goto_if eq, EventScript_166136 msgbox gUnknown_817E589 closemessage delay 10 playbgm MUS_ANNAI, 0 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1660EE + call_if eq, EventScript_1660EE compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_166100 + call_if eq, EventScript_166100 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_166112 + call_if eq, EventScript_166112 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_166124 + call_if eq, EventScript_166124 msgbox gUnknown_817E5AC closemessage delay 10 @@ -1053,7 +1053,7 @@ PewterCity_EventScript_16607E:: @ 816607E waitmovement 0 fadedefaultbgm removeobject 2 - clearflag FLAG_0x050 + clearflag FLAG_HIDE_PEWTER_MUSEUM_GUIDE release end @@ -1342,9 +1342,7 @@ Movement_16621C:: @ 816621C PewterCity_EventScript_16622B:: @ 816622B lock faceplayer - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BROCK, 2 msgbox gUnknown_817E49F release end @@ -1354,7 +1352,7 @@ PewterCity_EventScript_166244:: @ 8166244 faceplayer msgbox gUnknown_817E602, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_166263 + goto_if eq, EventScript_166263 msgbox gUnknown_817E644 release end @@ -1378,9 +1376,7 @@ PewterCity_EventScript_16627F:: @ 816627F PewterCity_EventScript_166288:: @ 8166288 lockall - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BROCK, 0 msgbox gUnknown_817E7DE releaseall end @@ -1421,11 +1417,11 @@ PewterCity_EventScript_1662D1:: @ 81662D1 EventScript_1662DE:: @ 81662DE textcolor 0 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1663CA + call_if eq, EventScript_1663CA compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1663CA + call_if eq, EventScript_1663CA compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_1663CA + call_if eq, EventScript_1663CA waitse playse SE_PIN applymovement 7, Movement_1A75DB @@ -1434,13 +1430,13 @@ EventScript_1662DE:: @ 81662DE waitmovement 0 msgbox gUnknown_817E902 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1663D5 + call_if eq, EventScript_1663D5 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1663DA + call_if eq, EventScript_1663DA compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1663E6 + call_if eq, EventScript_1663E6 compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_1663FC + call_if eq, EventScript_1663FC msgbox gUnknown_817E90C textcolor 3 playfanfare MUS_FAN5 @@ -1456,20 +1452,20 @@ EventScript_1662DE:: @ 81662DE msgbox gUnknown_817EA06 closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_166412 + call_if eq, EventScript_166412 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16641D + call_if eq, EventScript_16641D compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_166428 + call_if eq, EventScript_166428 compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_166433 + call_if eq, EventScript_166433 delay 30 textcolor 3 msgbox gUnknown_817EA36 closemessage removeobject 7 - setflag FLAG_0x82F - setvar VAR_0x406C, 2 + setflag FLAG_SYS_RUNNING_SHOES + setvar VAR_MAP_SCENE_PEWTER_CITY, 2 return EventScript_1663CA:: @ 81663CA diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index 5893d6954..16d0992be 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "80", + "graphics_id": "MAP_OBJ_GFX_BROCK", "x": 6, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 3, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 7, "y": 12, "elevation": 3, diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 5990bf1e3..e496769c7 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -2,27 +2,22 @@ PewterCity_Gym_MapScripts:: @ 816A592 .byte 0 PewterCity_Gym_EventScript_16A593:: @ 816A593 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 414, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5 - checkflag FLAG_0x254 - goto_if 0, EventScript_16A5F3 + famechecker FAMECHECKER_BROCK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + trainerbattle 1, TRAINER_LEADER_BROCK, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5 + checkflag FLAG_GOT_TM39_FROM_BROCK + goto_if FALSE, EventScript_16A5F3 msgbox gUnknown_819110F release end EventScript_16A5C5:: @ 816A5C5 - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - setflag FLAG_0x4B0 - setflag FLAG_UNK820 - setvar VAR_0x406C, 1 - setflag FLAG_0x02E - clearflag FLAG_0x092 - setvar VAR_0x8008, 1 - call EventScript_1A6B18 + famechecker FAMECHECKER_BROCK, 1 + setflag FLAG_DEFEATED_BROCK + setflag FLAG_BADGE01_GET + setvar VAR_MAP_SCENE_PEWTER_CITY, 1 + setflag FLAG_HIDE_PEWTER_CITY_GYM_GUIDE + clearflag FLAG_HIDE_PEWTER_CITY_RUNNING_SHOES_GUY + set_gym_trainers 1 goto EventScript_16A5F3 end @@ -30,10 +25,10 @@ EventScript_16A5F3:: @ 816A5F3 msgbox gUnknown_8190FC1 checkitemspace ITEM_TM39, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16A634 + goto_if eq, EventScript_16A634 additem ITEM_TM39, 1 giveitemfanfaremsg gUnknown_8190FDB, ITEM_TM39 - setflag FLAG_0x254 + setflag FLAG_GOT_TM39_FROM_BROCK msgbox gUnknown_8190FF8 release end @@ -44,20 +39,20 @@ EventScript_16A634:: @ 816A634 end PewterCity_Gym_EventScript_16A63E:: @ 816A63E - trainerbattle 0, 142, 0, Text_1911EC, Text_191237 + trainerbattle 0, TRAINER_CAMPER_LIAM, 0, Text_1911EC, Text_191237 msgbox gUnknown_819126B, 6 end PewterCity_Gym_EventScript_16A655:: @ 816A655 lock faceplayer - checkflag FLAG_0x4B0 - goto_if_eq EventScript_16A67F + checkflag FLAG_DEFEATED_BROCK + goto_if TRUE, EventScript_16A67F msgbox gUnknown_8191298, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16A689 + goto_if eq, EventScript_16A689 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16A697 + goto_if eq, EventScript_16A697 end EventScript_16A67F:: @ 816A67F @@ -82,8 +77,8 @@ EventScript_16A6A5:: @ 816A6A5 PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF lockall - checkflag FLAG_UNK820 - goto_if_eq EventScript_16A6C3 + checkflag FLAG_BADGE01_GET + goto_if TRUE, EventScript_16A6C3 msgbox gUnknown_819146E releaseall end diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index d44ec63bf..5f177362a 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 1, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 5, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "123", + "graphics_id": "MAP_OBJ_GFX_NIDORAN_M", "x": 6, "y": 3, "elevation": 3, diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index 83aaf23bf..83699d95f 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 3, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index 8b9c5e575..08555943c 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 8, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 6, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index 9e6fc4375..e45959442 100644 --- a/data/maps/PewterCity_Mart/scripts.inc +++ b/data/maps/PewterCity_Mart/scripts.inc @@ -12,7 +12,7 @@ PewterCity_Mart_EventScript_16A6D7:: @ 816A6D7 PewterCity_Mart_EventScript_16A6E0:: @ 816A6E0 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 8a4e54380..7dcbbe776 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 16, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 2, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 21, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "101", + "graphics_id": "MAP_OBJ_GFX_OLD_AMBER", "x": 22, "y": 3, "elevation": 0, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PewterCity_Museum_1F_EventScript_16A509", - "flag": "86" + "flag": "FLAG_HIDE_OLD_AMBER" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 26, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 26, "y": 7, "elevation": 3, @@ -142,7 +142,7 @@ "x": 12, "y": 5, "elevation": 3, - "var": "VAR_0x4061", + "var": "VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F", "var_value": 0, "script": "PewterCity_Museum_1F_EventScript_16A38F" }, @@ -151,7 +151,7 @@ "x": 13, "y": 5, "elevation": 3, - "var": "VAR_0x4061", + "var": "VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F", "var_value": 0, "script": "PewterCity_Museum_1F_EventScript_16A3A5" }, @@ -160,7 +160,7 @@ "x": 14, "y": 5, "elevation": 3, - "var": "VAR_0x4061", + "var": "VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F", "var_value": 0, "script": "PewterCity_Museum_1F_EventScript_16A3BB" } diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 275282638..8a3bdd640 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -5,11 +5,11 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B lock faceplayer compare_var_to_value VAR_FACING, 3 - goto_if_eq EventScript_16A348 + goto_if eq, EventScript_16A348 compare_var_to_value VAR_FACING, 1 - goto_if_eq EventScript_16A348 + goto_if eq, EventScript_16A348 compare_var_to_value VAR_FACING, 2 - goto_if_eq EventScript_16A348 + goto_if eq, EventScript_16A348 msgbox gUnknown_8190539 release end @@ -17,9 +17,9 @@ PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B EventScript_16A348:: @ 816A348 msgbox gUnknown_8190550, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16A367 + goto_if eq, EventScript_16A367 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16A37B + goto_if eq, EventScript_16A37B end EventScript_16A367:: @ 816A367 @@ -65,7 +65,7 @@ EventScript_16A3D1:: @ 816A3D1 showmoneybox 0, 0, 0 msgbox gUnknown_81904B5, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16A402 + goto_if eq, EventScript_16A402 msgbox gUnknown_81904F9 closemessage hidemoneybox @@ -79,20 +79,20 @@ EventScript_16A3D1:: @ 816A3D1 EventScript_16A402:: @ 816A402 checkmoney 50, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16A476 + goto_if eq, EventScript_16A476 closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16A455 + call_if eq, EventScript_16A455 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16A460 + call_if eq, EventScript_16A460 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16A46B + call_if eq, EventScript_16A46B playse SE_SHOP takemoney 50, 0 updatemoneybox 0, 0, 0 waitse msgbox gUnknown_8190505 - setvar VAR_0x4061, 1 + setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 1 hidemoneybox .byte 0 .byte 0 @@ -158,13 +158,13 @@ PewterCity_Museum_1F_EventScript_16A4A5:: @ 816A4A5 PewterCity_Museum_1F_EventScript_16A4AE:: @ 816A4AE lock faceplayer - checkflag FLAG_0x25E - goto_if_eq EventScript_16A4FF + checkflag FLAG_GOT_OLD_AMBER + goto_if TRUE, EventScript_16A4FF msgbox gUnknown_8190717 checkitemspace ITEM_OLD_AMBER, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16A4F5 - setflag FLAG_0x25E + goto_if eq, EventScript_16A4F5 + setflag FLAG_GOT_OLD_AMBER removeobject 4 additem ITEM_OLD_AMBER, 1 giveitemfanfaremsg gUnknown_8190866, ITEM_OLD_AMBER, 1, MUS_FAN5 diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index 317926b39..069f33249 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 10, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 4, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 0, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 15, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 16, "y": 8, "elevation": 3, diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index 6807511b1..a4a4bee9f 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "115", + "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF", "x": 2, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 4, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 1, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 13, "y": 2, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "51", + "graphics_id": "MAP_OBJ_GFX_GBA_KID", "x": 10, "y": 7, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "51", + "graphics_id": "MAP_OBJ_GFX_GBA_KID", "x": 14, "y": 6, "elevation": 3, diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index 37dd74cef..32a9afe45 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PewterCity_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 16b98cfda..30d6cc36c 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "75", + "graphics_id": "MAP_OBJ_GFX_AGATHA", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 2a46b544d..4d4bcee59 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -11,10 +11,10 @@ PokemonLeague_AgathasRoom_MapScript1_162825:: @ 8162825 end PokemonLeague_AgathasRoom_MapScript2_162830:: @ 8162830 - checkflag FLAG_0x4BA - call_if 1, EventScript_16284B - compare_var_to_value VAR_0x4068, 3 - call_if 1, EventScript_162845 + checkflag FLAG_DEFEATED_AGATHA + call_if TRUE, EventScript_16284B + compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 3 + call_if eq, EventScript_162845 end EventScript_162845:: @ 8162845 @@ -34,44 +34,36 @@ EventScript_16285B:: @ 816285B end PokemonLeague_AgathasRoom_MapScript4_162860:: @ 8162860 - map_script_2 VAR_0x4068, 2, EventScript_16286A + map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 2, EventScript_16286A .2byte 0 EventScript_16286A:: @ 816286A lockall call EventScript_1A751F - setvar VAR_0x4068, 3 + setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 3 releaseall end PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877 lock faceplayer - setvar VAR_0x8004, 11 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - checkflag FLAG_0x4BA - goto_if_eq EventScript_162911 - setvar VAR_0x8004, 11 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - setvar VAR_0x8004, 11 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars - setvar VAR_0x8004, 0 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars - checkflag FLAG_0x82C - call_if 0, EventScript_1628E9 - checkflag FLAG_0x82C - call_if 1, EventScript_1628F2 - setflag FLAG_0x003 - setflag FLAG_0x005 - checkflag FLAG_0x844 - call_if 0, EventScript_1628FB - checkflag FLAG_0x844 - call_if 1, EventScript_162906 - clearflag FLAG_0x005 + famechecker FAMECHECKER_AGATHA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + checkflag FLAG_DEFEATED_AGATHA + goto_if TRUE, EventScript_162911 + famechecker FAMECHECKER_AGATHA, 0 + famechecker FAMECHECKER_AGATHA, 4 + famechecker FAMECHECKER_OAK, 4 + checkflag FLAG_SYS_GAME_CLEAR + call_if FALSE, EventScript_1628E9 + checkflag FLAG_SYS_GAME_CLEAR + call_if TRUE, EventScript_1628F2 + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_5 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + call_if FALSE, EventScript_1628FB + checkflag FLAG_SYS_CAN_LINK_WITH_RS + call_if TRUE, EventScript_162906 + clearflag FLAG_TEMP_5 goto EventScript_16291B EventScript_1628E8:: @ 81628E8 @@ -86,11 +78,11 @@ EventScript_1628F2:: @ 81628F2 return EventScript_1628FB:: @ 81628FB - trainerbattle 3, 412, 0, Text_1786D7 + trainerbattle 3, TRAINER_ELITE_FOUR_AGATHA, 0, Text_1786D7 return EventScript_162906:: @ 8162906 - trainerbattle 3, 737, 0, Text_1786D7 + trainerbattle 3, TRAINER_ELITE_FOUR_AGATHA_2, 0, Text_1786D7 return EventScript_162911:: @ 8162911 @@ -99,7 +91,7 @@ EventScript_162911:: @ 8162911 end EventScript_16291B:: @ 816291B - setflag FLAG_0x4BA + setflag FLAG_DEFEATED_AGATHA call EventScript_1A7506 msgbox gUnknown_8178700 release diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index 05cc19dbe..b3ff9a6e6 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "79", + "graphics_id": "MAP_OBJ_GFX_BRUNO", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 6cc4a23a4..66c688505 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -11,10 +11,10 @@ PokemonLeague_BrunosRoom_MapScript1_16269A:: @ 816269A end PokemonLeague_BrunosRoom_MapScript2_1626A5:: @ 81626A5 - checkflag FLAG_0x4B9 - call_if 1, EventScript_1626C0 - compare_var_to_value VAR_0x4068, 2 - call_if 1, EventScript_1626BA + checkflag FLAG_DEFEATED_BRUNO + call_if TRUE, EventScript_1626C0 + compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 2 + call_if eq, EventScript_1626BA end EventScript_1626BA:: @ 81626BA @@ -34,41 +34,35 @@ EventScript_1626D0:: @ 81626D0 end PokemonLeague_BrunosRoom_MapScript4_1626D5:: @ 81626D5 - map_script_2 VAR_0x4068, 1, EventScript_1626DF + map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 1, EventScript_1626DF .2byte 0 EventScript_1626DF:: @ 81626DF lockall call EventScript_1A751F - setvar VAR_0x4068, 2 + setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 2 releaseall end PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC lock faceplayer - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - checkflag FLAG_0x4B9 - goto_if_eq EventScript_162779 - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - checkflag FLAG_0x82C - call_if 0, EventScript_162751 - checkflag FLAG_0x82C - call_if 1, EventScript_16275A - setflag FLAG_0x003 - setflag FLAG_0x005 - checkflag FLAG_0x844 - call_if 0, EventScript_162763 - checkflag FLAG_0x844 - call_if 1, EventScript_16276E - clearflag FLAG_0x005 + famechecker FAMECHECKER_BRUNO, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + checkflag FLAG_DEFEATED_BRUNO + goto_if TRUE, EventScript_162779 + famechecker FAMECHECKER_BRUNO, 0 + famechecker FAMECHECKER_BRUNO, 1 + checkflag FLAG_SYS_GAME_CLEAR + call_if FALSE, EventScript_162751 + checkflag FLAG_SYS_GAME_CLEAR + call_if TRUE, EventScript_16275A + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_5 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + call_if FALSE, EventScript_162763 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + call_if TRUE, EventScript_16276E + clearflag FLAG_TEMP_5 goto EventScript_1627B0 EventScript_162750:: @ 8162750 @@ -83,40 +77,40 @@ EventScript_16275A:: @ 816275A return EventScript_162763:: @ 8162763 - trainerbattle 3, 411, 0, Text_178409 + trainerbattle 3, TRAINER_ELITE_FOUR_BRUNO, 0, Text_178409 return EventScript_16276E:: @ 816276E - trainerbattle 3, 736, 0, Text_178409 + trainerbattle 3, TRAINER_ELITE_FOUR_BRUNO_2, 0, Text_178409 return EventScript_162779:: @ 8162779 msgbox gUnknown_8178420 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1627FA + call_if eq, EventScript_1627FA compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1627EF + call_if eq, EventScript_1627EF compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_162805 + call_if eq, EventScript_162805 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_162805 + call_if eq, EventScript_162805 release end EventScript_1627B0:: @ 81627B0 - setflag FLAG_0x4B9 + setflag FLAG_DEFEATED_BRUNO call EventScript_1A7506 msgbox gUnknown_8178420 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1627FA + call_if eq, EventScript_1627FA compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1627EF + call_if eq, EventScript_1627EF compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_162805 + call_if eq, EventScript_162805 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_162805 + call_if eq, EventScript_162805 release end diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index 90e243652..2154adc3a 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 6, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "71", + "graphics_id": "MAP_OBJ_GFX_PROF_OAK", "x": 6, "y": 15, "elevation": 0, @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "90" + "flag": "FLAG_HIDE_OAK_IN_CHAMP_ROOM" } ], "warp_events": [ diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index b705e8c54..f4f2427b4 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -8,32 +8,32 @@ PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2 setvar VAR_0x8004, 4 call EventScript_1A75D5 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_162B1E + call_if eq, EventScript_162B1E compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_162B31 + call_if eq, EventScript_162B31 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_162B44 + call_if eq, EventScript_162B44 end EventScript_162B1E:: @ 8162B1E - checktrainerflag FLAG_0x1B6 - goto_if_eq EventScript_162B57 - checktrainerflag FLAG_0x2E3 - goto_if_eq EventScript_162B57 + checktrainerflag TRAINER_CHAMPION_FIRST_SQUIRTLE + goto_if eq, EventScript_162B57 + checktrainerflag TRAINER_CHAMPION_REMATCH_SQUIRTLE + goto_if eq, EventScript_162B57 return EventScript_162B31:: @ 8162B31 - checktrainerflag FLAG_0x1B7 - goto_if_eq EventScript_162B57 - checktrainerflag FLAG_0x2E4 - goto_if_eq EventScript_162B57 + checktrainerflag TRAINER_CHAMPION_FIRST_BULBASAUR + goto_if eq, EventScript_162B57 + checktrainerflag TRAINER_CHAMPION_REMATCH_BULBASAUR + goto_if eq, EventScript_162B57 return EventScript_162B44:: @ 8162B44 - checktrainerflag FLAG_0x1B8 - goto_if_eq EventScript_162B57 - checktrainerflag FLAG_0x2E5 - goto_if_eq EventScript_162B57 + checktrainerflag TRAINER_CHAMPION_FIRST_CHARMANDER + goto_if eq, EventScript_162B57 + checktrainerflag TRAINER_CHAMPION_REMATCH_CHARMANDER + goto_if eq, EventScript_162B57 return EventScript_162B57:: @ 8162B57 @@ -55,28 +55,28 @@ PokemonLeague_ChampionsRoom_MapScript3_162B6C:: @ 8162B6C EventScript_162B76:: @ 8162B76 lockall textcolor 0 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 applymovement 255, Movement_162D07 waitmovement 0 delay 20 - checkflag FLAG_0x82C - call_if 0, EventScript_162CB3 - checkflag FLAG_0x82C - call_if 1, EventScript_162CBC + checkflag FLAG_SYS_GAME_CLEAR + call_if FALSE, EventScript_162CB3 + checkflag FLAG_SYS_GAME_CLEAR + call_if TRUE, EventScript_162CBC special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_162C68 - setflag FLAG_0x003 - setflag FLAG_0x005 + goto_if eq, EventScript_162C68 + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_5 savebgm MUS_WIN_GYM - checkflag FLAG_0x844 - call_if 0, EventScript_162C6F - checkflag FLAG_0x844 - call_if 1, EventScript_162C91 - setflag FLAG_0x004 - clearflag FLAG_0x005 - setflag FLAG_0x4BC - setflag FLAG_0x004 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + call_if FALSE, EventScript_162C6F + checkflag FLAG_SYS_CAN_LINK_WITH_RS + call_if TRUE, EventScript_162C91 + setflag FLAG_TEMP_4 + clearflag FLAG_TEMP_5 + setflag FLAG_DEFEATED_CHAMP + setflag FLAG_TEMP_4 msgbox gUnknown_8178F2F playbgm MUS_SLOWMASARA, 0 addobject 2 @@ -117,20 +117,20 @@ EventScript_162C68:: @ 8162C68 EventScript_162C6F:: @ 8162C6F compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_162CC5 + call_if eq, EventScript_162CC5 compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_162CD0 + call_if eq, EventScript_162CD0 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_162CDB + call_if eq, EventScript_162CDB return EventScript_162C91:: @ 8162C91 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_162CE6 + call_if eq, EventScript_162CE6 compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_162CF1 + call_if eq, EventScript_162CF1 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_162CFC + call_if eq, EventScript_162CFC return EventScript_162CB3:: @ 8162CB3 @@ -142,27 +142,27 @@ EventScript_162CBC:: @ 8162CBC return EventScript_162CC5:: @ 8162CC5 - trainerbattle 3, 438, 0, Text_178E3F + trainerbattle 3, TRAINER_CHAMPION_FIRST_SQUIRTLE, 0, Text_178E3F return EventScript_162CD0:: @ 8162CD0 - trainerbattle 3, 439, 0, Text_178E3F + trainerbattle 3, TRAINER_CHAMPION_FIRST_BULBASAUR, 0, Text_178E3F return EventScript_162CDB:: @ 8162CDB - trainerbattle 3, 440, 0, Text_178E3F + trainerbattle 3, TRAINER_CHAMPION_FIRST_CHARMANDER, 0, Text_178E3F return EventScript_162CE6:: @ 8162CE6 - trainerbattle 3, 739, 0, Text_178E3F + trainerbattle 3, TRAINER_CHAMPION_REMATCH_SQUIRTLE, 0, Text_178E3F return EventScript_162CF1:: @ 8162CF1 - trainerbattle 3, 740, 0, Text_178E3F + trainerbattle 3, TRAINER_CHAMPION_REMATCH_BULBASAUR, 0, Text_178E3F return EventScript_162CFC:: @ 8162CFC - trainerbattle 3, 741, 0, Text_178E3F + trainerbattle 3, TRAINER_CHAMPION_REMATCH_CHARMANDER, 0, Text_178E3F return Movement_162D07:: @ 8162D07 diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index a2146d74b..cacd686ab 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "71", + "graphics_id": "MAP_OBJ_GFX_PROF_OAK", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index 1d962ccba..0a995986e 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "74", + "graphics_id": "MAP_OBJ_GFX_LANCE", "x": 6, "y": 8, "elevation": 3, diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index b0a378a98..09cdb49b8 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -11,10 +11,10 @@ PokemonLeague_LancesRoom_MapScript1_162942:: @ 8162942 end PokemonLeague_LancesRoom_MapScript2_16294D:: @ 816294D - compare_var_to_value VAR_0x4068, 4 - call_if 1, EventScript_162962 - checkflag FLAG_0x4BB - call_if 1, EventScript_162968 + compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 4 + call_if eq, EventScript_162962 + checkflag FLAG_DEFEATED_LANCE + call_if TRUE, EventScript_162968 end EventScript_162962:: @ 8162962 @@ -34,19 +34,19 @@ EventScript_162978:: @ 8162978 end PokemonLeague_LancesRoom_MapScript4_16297D:: @ 816297D - map_script_2 VAR_0x4068, 3, EventScript_162987 + map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 3, EventScript_162987 .2byte 0 EventScript_162987:: @ 8162987 lockall applymovement 255, Movement_1629F1 waitmovement 0 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 call EventScript_1629A8 playse SE_KI_GASYAN special DrawWholeMapView waitse - setvar VAR_0x4068, 4 + setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 4 releaseall end @@ -101,28 +101,22 @@ Movement_1629F1:: @ 81629F1 PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14 lock faceplayer - setvar VAR_0x8004, 12 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - checkflag FLAG_0x4BB - goto_if_eq EventScript_162AA1 - setvar VAR_0x8004, 12 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - setvar VAR_0x8004, 12 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - checkflag FLAG_0x82C - call_if 0, EventScript_162A79 - checkflag FLAG_0x82C - call_if 1, EventScript_162A82 - setflag FLAG_0x003 - setflag FLAG_0x005 - checkflag FLAG_0x844 - call_if 0, EventScript_162A8B - checkflag FLAG_0x844 - call_if 1, EventScript_162A96 - clearflag FLAG_0x005 + famechecker FAMECHECKER_LANCE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + checkflag FLAG_DEFEATED_LANCE + goto_if TRUE, EventScript_162AA1 + famechecker FAMECHECKER_LANCE, 0 + famechecker FAMECHECKER_LANCE, 1 + checkflag FLAG_SYS_GAME_CLEAR + call_if FALSE, EventScript_162A79 + checkflag FLAG_SYS_GAME_CLEAR + call_if TRUE, EventScript_162A82 + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_5 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + call_if FALSE, EventScript_162A8B + checkflag FLAG_SYS_CAN_LINK_WITH_RS + call_if TRUE, EventScript_162A96 + clearflag FLAG_TEMP_5 goto EventScript_162AAB EventScript_162A78:: @ 8162A78 @@ -137,11 +131,11 @@ EventScript_162A82:: @ 8162A82 return EventScript_162A8B:: @ 8162A8B - trainerbattle 3, 413, 0, Text_178A15 + trainerbattle 3, TRAINER_ELITE_FOUR_LANCE, 0, Text_178A15 return EventScript_162A96:: @ 8162A96 - trainerbattle 3, 738, 0, Text_178A15 + trainerbattle 3, TRAINER_ELITE_FOUR_LANCE_2, 0, Text_178A15 return EventScript_162AA1:: @ 8162AA1 @@ -152,7 +146,7 @@ EventScript_162AA1:: @ 8162AA1 EventScript_162AAB:: @ 8162AAB setvar VAR_0x8004, 0 special sub_8113530 - setflag FLAG_0x4BB + setflag FLAG_DEFEATED_LANCE call EventScript_1A7563 msgbox gUnknown_8178A52 closemessage diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json index 6435fd40f..1a8512901 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "77", + "graphics_id": "MAP_OBJ_GFX_LORELEI", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index 60e2b5086..705308e02 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -12,10 +12,10 @@ PokemonLeague_LoreleisRoom_MapScript1_162586:: @ 8162586 end PokemonLeague_LoreleisRoom_MapScript2_162591:: @ 8162591 - checkflag FLAG_0x4B8 - call_if 1, EventScript_1625AC - compare_var_to_value VAR_0x4068, 1 - call_if 1, EventScript_1625A6 + checkflag FLAG_DEFEATED_LORELEI + call_if TRUE, EventScript_1625AC + compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 1 + call_if eq, EventScript_1625A6 end EventScript_1625A6:: @ 81625A6 @@ -39,41 +39,35 @@ EventScript_1625C0:: @ 81625C0 end PokemonLeague_LoreleisRoom_MapScript5_1625C5:: @ 81625C5 - map_script_2 VAR_0x4068, 0, EventScript_1625CF + map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 0, EventScript_1625CF .2byte 0 EventScript_1625CF:: @ 81625CF lockall call EventScript_1A751F - setvar VAR_0x4068, 1 + setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 1 releaseall end PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC lock faceplayer - setvar VAR_0x8004, 9 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - checkflag FLAG_0x4B8 - goto_if_eq EventScript_162669 - setvar VAR_0x8004, 9 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars - setvar VAR_0x8004, 9 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - checkflag FLAG_0x844 - call_if 0, EventScript_162641 - checkflag FLAG_0x844 - call_if 1, EventScript_16264A - setflag FLAG_0x003 - setflag FLAG_0x005 - checkflag FLAG_0x844 - call_if 0, EventScript_162653 - checkflag FLAG_0x844 - call_if 1, EventScript_16265E - clearflag FLAG_0x005 + famechecker FAMECHECKER_LORELEI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + checkflag FLAG_DEFEATED_LORELEI + goto_if TRUE, EventScript_162669 + famechecker FAMECHECKER_LORELEI, 0 + famechecker FAMECHECKER_LORELEI, 1 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + call_if FALSE, EventScript_162641 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + call_if TRUE, EventScript_16264A + setflag FLAG_TEMP_3 + setflag FLAG_TEMP_5 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + call_if FALSE, EventScript_162653 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + call_if TRUE, EventScript_16265E + clearflag FLAG_TEMP_5 goto EventScript_162673 EventScript_162640:: @ 8162640 @@ -88,11 +82,11 @@ EventScript_16264A:: @ 816264A return EventScript_162653:: @ 8162653 - trainerbattle 3, 410, 0, Text_178191 + trainerbattle 3, TRAINER_ELITE_FOUR_LORELEI, 0, Text_178191 return EventScript_16265E:: @ 816265E - trainerbattle 3, 735, 0, Text_178191 + trainerbattle 3, TRAINER_ELITE_FOUR_LORELEI_2, 0, Text_178191 return EventScript_162669:: @ 8162669 @@ -101,7 +95,7 @@ EventScript_162669:: @ 8162669 end EventScript_162673:: @ 8162673 - setflag FLAG_0x4B8 + setflag FLAG_DEFEATED_LORELEI call EventScript_1A7506 msgbox gUnknown_81781B0 release diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index 8c28b8d4a..3c015536e 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 22, "y": 24, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 29, "y": 32, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonMansion_1F_EventScript_1BE95D", - "flag": "415" + "flag": "FLAG_HIDE_POKEMON_MANSION_1F_CARBOS" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 22, "y": 6, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonMansion_1F_EventScript_1BE96A", - "flag": "416" + "flag": "FLAG_HIDE_POKEMON_MANSION_1F_ESCAPE_ROPE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 27, "y": 15, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonMansion_1F_EventScript_1BEB65", - "flag": "458" + "flag": "FLAG_HIDE_POKEMON_MANSION_1F_PROTEIN" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 8, "y": 8, "elevation": 3, @@ -166,8 +166,9 @@ "y": 21, "elevation": 0, "item": "ITEM_MOON_STONE", - "flag": "31", - "unknown": 1 + "flag": "HIDDEN_ITEM_POKEMON_MANSION_1F_MOON_STONE", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index 04a15a5e5..7e934c833 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -4,8 +4,8 @@ PokemonMansion_1F_MapScripts:: @ 81621F9 .byte 0 PokemonMansion_1F_MapScript1_162204:: @ 8162204 - checkflag FLAG_0x26C - call_if 1, EventScript_1A7B7A + checkflag FLAG_POKEMON_MANSION_SWITCH_STATE + call_if TRUE, EventScript_1A7B7A end PokemonMansion_1F_MapScript2_16220E:: @ 816220E @@ -23,11 +23,11 @@ PokemonMansion_1F_EventScript_162212:: @ 8162212 end PokemonMansion_1F_EventScript_162226:: @ 8162226 - trainerbattle 0, 335, 0, Text_177364, Text_177391 + trainerbattle 0, TRAINER_SCIENTIST_TED, 0, Text_177364, Text_177391 msgbox gUnknown_8177397, 6 end PokemonMansion_1F_EventScript_16223D:: @ 816223D - trainerbattle 0, 534, 0, Text_1773C6, Text_1773FD + trainerbattle 0, TRAINER_YOUNGSTER_JOHNSON, 0, Text_1773C6, Text_1773FD msgbox gUnknown_8177418, 6 end diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index 6a85dbb1e..4a618c86d 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 5, "y": 23, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 36, "y": 8, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonMansion_2F_EventScript_1BE977", - "flag": "417" + "flag": "FLAG_HIDE_POKEMON_MANSION_2F_CALCIUM" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 18, "y": 23, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonMansion_2F_EventScript_1BEB72", - "flag": "459" + "flag": "FLAG_HIDE_POKEMON_MANSION_2F_ZINC" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 35, "y": 17, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonMansion_2F_EventScript_1BEB7F", - "flag": "460" + "flag": "FLAG_HIDE_POKEMON_MANSION_2F_HP_UP" } ], "warp_events": [ diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index b9f052a4f..aaec8ebfd 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -3,8 +3,8 @@ PokemonMansion_2F_MapScripts:: @ 8162254 .byte 0 PokemonMansion_2F_MapScript1_16225A:: @ 816225A - checkflag FLAG_0x26C - call_if 1, EventScript_1A7D3E + checkflag FLAG_POKEMON_MANSION_SWITCH_STATE + call_if TRUE, EventScript_1A7D3E end PokemonMansion_2F_EventScript_162264:: @ 8162264 @@ -26,6 +26,6 @@ PokemonMansion_2F_EventScript_162281:: @ 8162281 end PokemonMansion_2F_EventScript_16228A:: @ 816228A - trainerbattle 0, 216, 0, Text_177498, Text_1774CB + trainerbattle 0, TRAINER_BURGLAR_ARNIE, 0, Text_177498, Text_1774CB msgbox gUnknown_81774E3, 6 end diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index c693a9d7a..b76f6bb0b 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 7, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 22, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 9, "y": 19, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonMansion_3F_EventScript_1BE984", - "flag": "418" + "flag": "FLAG_HIDE_POKEMON_MANSION_3F_MAX_POTION" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 32, "y": 6, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonMansion_3F_EventScript_1BE991", - "flag": "419" + "flag": "FLAG_HIDE_POKEMON_MANSION_3F_IRON" } ], "warp_events": [ @@ -146,8 +146,9 @@ "y": 13, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "32", - "unknown": 1 + "flag": "HIDDEN_ITEM_POKEMON_MANSION_3F_RARE_CANDY", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index 4fb9e8bf0..27da3d538 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -3,8 +3,8 @@ PokemonMansion_3F_MapScripts:: @ 81622A1 .byte 0 PokemonMansion_3F_MapScript1_1622A7:: @ 81622A7 - checkflag FLAG_0x26C - call_if 1, EventScript_1A7E72 + checkflag FLAG_POKEMON_MANSION_SWITCH_STATE + call_if TRUE, EventScript_1A7E72 end PokemonMansion_3F_EventScript_1622B1:: @ 81622B1 @@ -22,11 +22,11 @@ PokemonMansion_3F_EventScript_1622C5:: @ 81622C5 end PokemonMansion_3F_EventScript_1622CE:: @ 81622CE - trainerbattle 0, 218, 0, Text_1775E7, Text_177602 + trainerbattle 0, TRAINER_BURGLAR_SIMON, 0, Text_1775E7, Text_177602 msgbox gUnknown_8177608, 6 end PokemonMansion_3F_EventScript_1622E5:: @ 81622E5 - trainerbattle 0, 346, 0, Text_177628, Text_177643 + trainerbattle 0, TRAINER_SCIENTIST_BRAYDON, 0, Text_177628, Text_177643 msgbox gUnknown_8177657, 6 end diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index 15627f664..cbbc3f9a2 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 6, "y": 21, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonMansion_B1F_EventScript_1BE9B8", - "flag": "423" + "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM22" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 20, "y": 25, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 34, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 23, "y": 4, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonMansion_B1F_EventScript_1BE99E", - "flag": "420" + "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM14" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 29, "elevation": 3, @@ -76,10 +76,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonMansion_B1F_EventScript_1BE9AB", - "flag": "421" + "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_FULL_RESTORE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 7, "elevation": 3, @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonMansion_B1F_EventScript_1BE9C5", - "flag": "424" + "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY" } ], "warp_events": [ @@ -130,8 +130,9 @@ "y": 5, "elevation": 3, "item": "ITEM_ELIXIR", - "flag": "33", - "unknown": 1 + "flag": "HIDDEN_ITEM_POKEMON_MANSION_B1F_ELIXIR", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index 0997ae9f9..12f8b79e0 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -3,8 +3,8 @@ PokemonMansion_B1F_MapScripts:: @ 81622FC .byte 0 PokemonMansion_B1F_MapScript1_162302:: @ 8162302 - checkflag FLAG_0x26C - call_if 1, EventScript_1A7F4C + checkflag FLAG_POKEMON_MANSION_SWITCH_STATE + call_if TRUE, EventScript_1A7F4C end PokemonMansion_B1F_EventScript_16230C:: @ 816230C @@ -22,11 +22,11 @@ PokemonMansion_B1F_EventScript_162320:: @ 8162320 end PokemonMansion_B1F_EventScript_162329:: @ 8162329 - trainerbattle 0, 219, 0, Text_1776C0, Text_1776D7 + trainerbattle 0, TRAINER_BURGLAR_LEWIS, 0, Text_1776C0, Text_1776D7 msgbox gUnknown_81776DE, 6 end PokemonMansion_B1F_EventScript_162340:: @ 8162340 - trainerbattle 0, 347, 0, Text_177720, Text_177757 + trainerbattle 0, TRAINER_SCIENTIST_IVAN, 0, Text_177720, Text_177757 msgbox gUnknown_817776A, 6 end diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index ad49dce83..5185ebec7 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 18, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 18, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 15, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 7, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 8, "y": 12, "elevation": 3, diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index c86280b74..e98796864 100644 --- a/data/maps/PokemonTower_1F/scripts.inc +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -23,7 +23,7 @@ PokemonTower_1F_EventScript_16325A:: @ 816325A faceplayer checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_163272 + goto_if eq, EventScript_163272 msgbox gUnknown_8179BFC release end diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 4aea2b3b7..a155ee492 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 16, "y": 5, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "81" + "flag": "FLAG_HIDE_TOWER_RIVAL" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 3, "y": 7, "elevation": 0, @@ -62,7 +62,7 @@ "x": 17, "y": 5, "elevation": 3, - "var": "VAR_0x405D", + "var": "VAR_MAP_SCENE_POKEMON_TOWER_2F", "var_value": 0, "script": "PokemonTower_2F_EventScript_16328F" }, @@ -71,7 +71,7 @@ "x": 16, "y": 6, "elevation": 3, - "var": "VAR_0x405D", + "var": "VAR_MAP_SCENE_POKEMON_TOWER_2F", "var_value": 0, "script": "PokemonTower_2F_EventScript_16329B" } diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 929c24f60..4a7eb0efb 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -21,9 +21,9 @@ EventScript_1632A7:: @ 81632A7 textcolor 0 playbgm MUS_RIVAL1, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_163339 + call_if eq, EventScript_163339 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16334B + call_if eq, EventScript_16334B applymovement 1, Movement_1A75DB waitmovement 0 applymovement 1, Movement_1A75DD @@ -31,23 +31,23 @@ EventScript_1632A7:: @ 81632A7 msgbox gUnknown_8179CFF setvar VAR_LAST_TALKED, 1 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_16335D + call_if eq, EventScript_16335D compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_163368 + call_if eq, EventScript_163368 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_163373 + call_if eq, EventScript_163373 msgbox gUnknown_8179DD4 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16337E + call_if eq, EventScript_16337E compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_163389 + call_if eq, EventScript_163389 playse SE_KAIDAN delay 25 fadedefaultbgm removeobject 1 - setvar VAR_0x405D, 1 + setvar VAR_MAP_SCENE_POKEMON_TOWER_2F, 1 releaseall end @@ -64,15 +64,15 @@ EventScript_16334B:: @ 816334B return EventScript_16335D:: @ 816335D - trainerbattle 3, 429, 0, Text_179D73 + trainerbattle 3, TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, 0, Text_179D73 return EventScript_163368:: @ 8163368 - trainerbattle 3, 430, 0, Text_179D73 + trainerbattle 3, TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, 0, Text_179D73 return EventScript_163373:: @ 8163373 - trainerbattle 3, 431, 0, Text_179D73 + trainerbattle 3, TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, 0, Text_179D73 return EventScript_16337E:: @ 816337E diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index dcba6c23f..49ca729a0 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 10, "y": 14, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 9, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 12, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 13, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonTower_3F_EventScript_1BE755", - "flag": "375" + "flag": "FLAG_HIDE_POKEMON_TOWER_3F_ESCAPE_ROPE" } ], "warp_events": [ diff --git a/data/maps/PokemonTower_3F/scripts.inc b/data/maps/PokemonTower_3F/scripts.inc index 30591aba5..8549cd256 100644 --- a/data/maps/PokemonTower_3F/scripts.inc +++ b/data/maps/PokemonTower_3F/scripts.inc @@ -2,16 +2,16 @@ PokemonTower_3F_MapScripts:: @ 81633A6 .byte 0 PokemonTower_3F_EventScript_1633A7:: @ 81633A7 - trainerbattle 0, 441, 0, Text_179FA0, Text_179FBC + trainerbattle 0, TRAINER_CHANNELER_PATRICIA, 0, Text_179FA0, Text_179FBC msgbox gUnknown_8179FD3, 6 end PokemonTower_3F_EventScript_1633BE:: @ 81633BE - trainerbattle 0, 442, 0, Text_179F62, Text_179F72 + trainerbattle 0, TRAINER_CHANNELER_CARLY, 0, Text_179F62, Text_179F72 msgbox gUnknown_8179F88, 6 end PokemonTower_3F_EventScript_1633D5:: @ 81633D5 - trainerbattle 0, 443, 0, Text_179F09, Text_179F21 + trainerbattle 0, TRAINER_CHANNELER_HOPE, 0, Text_179F09, Text_179F21 msgbox gUnknown_8179F31, 6 end diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index b567872bf..94832e3da 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 17, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 15, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 4, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 11, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonTower_4F_EventScript_1BE762", - "flag": "376" + "flag": "FLAG_HIDE_POKEMON_TOWER_4F_ELIXIR" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 8, "y": 11, "elevation": 3, @@ -76,10 +76,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonTower_4F_EventScript_1BE76F", - "flag": "377" + "flag": "FLAG_HIDE_POKEMON_TOWER_4F_AWAKENING" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 16, "elevation": 3, @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonTower_4F_EventScript_1BE77C", - "flag": "378" + "flag": "FLAG_HIDE_POKEMON_TOWER_4F_GREAT_BALL" } ], "warp_events": [ diff --git a/data/maps/PokemonTower_4F/scripts.inc b/data/maps/PokemonTower_4F/scripts.inc index 0837c5b9b..0047e6060 100644 --- a/data/maps/PokemonTower_4F/scripts.inc +++ b/data/maps/PokemonTower_4F/scripts.inc @@ -2,16 +2,16 @@ PokemonTower_4F_MapScripts:: @ 81633EC .byte 0 PokemonTower_4F_EventScript_1633ED:: @ 81633ED - trainerbattle 0, 444, 0, Text_17A004, Text_17A017 + trainerbattle 0, TRAINER_CHANNELER_PAULA, 0, Text_17A004, Text_17A017 msgbox gUnknown_817A02B, 6 end PokemonTower_4F_EventScript_163404:: @ 8163404 - trainerbattle 0, 445, 0, Text_17A046, Text_17A061 + trainerbattle 0, TRAINER_CHANNELER_LAUREL, 0, Text_17A046, Text_17A061 msgbox gUnknown_817A067, 6 end PokemonTower_4F_EventScript_16341B:: @ 816341B - trainerbattle 0, 446, 0, Text_17A096, Text_17A0AB + trainerbattle 0, TRAINER_CHANNELER_JODY, 0, Text_17A096, Text_17A0AB msgbox gUnknown_817A0BB, 6 end diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index f8fb23938..7f06f059d 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 11, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 19, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 7, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 11, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 12, "y": 8, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 6, "y": 16, "elevation": 3, @@ -89,10 +89,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonTower_5F_EventScript_1BE789", - "flag": "379" + "flag": "FLAG_HIDE_POKEMON_TOWER_5F_NUGGET" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 9, "elevation": 3, @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonTower_5F_EventScript_1BEBB3", - "flag": "464" + "flag": "FLAG_HIDE_POKEMON_TOWER_5F_CLEANSE_TAG" } ], "warp_events": [ @@ -283,8 +283,9 @@ "y": 3, "elevation": 3, "item": "ITEM_BIG_MUSHROOM", - "flag": "14", - "unknown": 1 + "flag": "HIDDEN_ITEM_POKEMON_TOWER_5F_BIG_MUSHROOM", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index 67c6b27f4..0e6d48bc4 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -22,21 +22,21 @@ PokemonTower_5F_EventScript_163453:: @ 8163453 end PokemonTower_5F_EventScript_16345B:: @ 816345B - trainerbattle 0, 447, 0, Text_17A11F, Text_17A132 + trainerbattle 0, TRAINER_CHANNELER_TAMMY, 0, Text_17A11F, Text_17A132 msgbox gUnknown_817A138, 6 end PokemonTower_5F_EventScript_163472:: @ 8163472 - trainerbattle 0, 448, 0, Text_17A150, Text_17A164 + trainerbattle 0, TRAINER_CHANNELER_RUTH, 0, Text_17A150, Text_17A164 msgbox gUnknown_817A176, 6 end PokemonTower_5F_EventScript_163489:: @ 8163489 - trainerbattle 0, 449, 0, Text_17A187, Text_17A190 + trainerbattle 0, TRAINER_CHANNELER_KARINA, 0, Text_17A187, Text_17A190 msgbox gUnknown_817A194, 6 end PokemonTower_5F_EventScript_1634A0:: @ 81634A0 - trainerbattle 0, 450, 0, Text_17A1AA, Text_17A1B7 + trainerbattle 0, TRAINER_CHANNELER_JANAE, 0, Text_17A1AA, Text_17A1B7 msgbox gUnknown_817A1BD, 6 end diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index b331bed20..4f1934e2c 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 13, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 18, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 9, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 15, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonTower_6F_EventScript_1BE796", - "flag": "380" + "flag": "FLAG_HIDE_POKEMON_TOWER_6F_RARE_CANDY" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 15, "y": 15, "elevation": 3, @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonTower_6F_EventScript_1BE7A3", - "flag": "381" + "flag": "FLAG_HIDE_POKEMON_TOWER_6F_X_ACCURACY" } ], "warp_events": [ @@ -101,7 +101,7 @@ "x": 11, "y": 15, "elevation": 3, - "var": "VAR_0x4059", + "var": "VAR_MAP_SCENE_POKEMON_TOWER_6F", "var_value": 0, "script": "PokemonTower_6F_EventScript_1634B8" }, @@ -110,7 +110,7 @@ "x": 12, "y": 16, "elevation": 3, - "var": "VAR_0x4059", + "var": "VAR_MAP_SCENE_POKEMON_TOWER_6F", "var_value": 0, "script": "PokemonTower_6F_EventScript_1634B8" } diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index dd2bdff80..ee40d071b 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -7,13 +7,13 @@ PokemonTower_6F_EventScript_1634B8:: @ 81634B8 msgbox gUnknown_817A2F8 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE special sub_807F904 waitstate special sub_8112364 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1634F5 + goto_if eq, EventScript_1634F5 applymovement 255, Movement_163512 waitmovement 0 releaseall @@ -27,7 +27,7 @@ EventScript_1634F5:: @ 81634F5 waitbuttonpress waitmoncry msgbox gUnknown_817A342 - setvar VAR_0x4059, 1 + setvar VAR_MAP_SCENE_POKEMON_TOWER_6F, 1 releaseall end @@ -36,16 +36,16 @@ Movement_163512:: @ 8163512 step_end PokemonTower_6F_EventScript_163514:: @ 8163514 - trainerbattle 0, 451, 0, Text_17A243, Text_17A253 + trainerbattle 0, TRAINER_CHANNELER_ANGELICA, 0, Text_17A243, Text_17A253 msgbox gUnknown_817A25A, 6 end PokemonTower_6F_EventScript_16352B:: @ 816352B - trainerbattle 0, 452, 0, Text_17A272, Text_17A27F + trainerbattle 0, TRAINER_CHANNELER_EMILIA, 0, Text_17A272, Text_17A27F msgbox gUnknown_817A293, 6 end PokemonTower_6F_EventScript_163542:: @ 8163542 - trainerbattle 0, 453, 0, Text_17A2C8, Text_17A2DC + trainerbattle 0, TRAINER_CHANNELER_JENNIFER, 0, Text_17A2C8, Text_17A2DC msgbox gUnknown_817A2E2, 6 end diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index 3f2fd739d..bb49bbecd 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "78", + "graphics_id": "MAP_OBJ_GFX_MR_FUJI", "x": 11, "y": 4, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PokemonTower_7F_EventScript_16355A", - "flag": "52" + "flag": "FLAG_HIDE_TOWER_FUJI" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 9, "y": 10, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "PokemonTower_7F_EventScript_163586", - "flag": "94" + "flag": "FLAG_HIDE_TOWER_ROCKET_1" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 13, "y": 8, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "PokemonTower_7F_EventScript_16363D", - "flag": "131" + "flag": "FLAG_HIDE_TOWER_ROCKET_2" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 9, "y": 6, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "PokemonTower_7F_EventScript_1636D6", - "flag": "132" + "flag": "FLAG_HIDE_TOWER_ROCKET_3" } ], "warp_events": [ @@ -83,8 +83,9 @@ "y": 4, "elevation": 3, "item": "ITEM_SOOTHE_BELL", - "flag": "159", - "unknown": 129 + "flag": "HIDDEN_ITEM_POKEMON_TOWER_7F_SOOTHE_BELL", + "quantity": 1, + "underfoot": true } ] } diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 7f319287e..20fd57e6f 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -4,12 +4,10 @@ PokemonTower_7F_MapScripts:: @ 8163559 PokemonTower_7F_EventScript_16355A:: @ 816355A lock faceplayer - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - setflag FLAG_0x034 - clearflag FLAG_0x035 - setflag FLAG_0x23C + famechecker FAMECHECKER_MRFUJI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + setflag FLAG_HIDE_TOWER_FUJI + clearflag FLAG_HIDE_POKEHOUSE_FUJI + setflag FLAG_RESCUED_MR_FUJI msgbox gUnknown_817A529 closemessage warp MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE, 255, 4, 7 @@ -18,7 +16,7 @@ PokemonTower_7F_EventScript_16355A:: @ 816355A end PokemonTower_7F_EventScript_163586:: @ 8163586 - trainerbattle 2, 369, 0, Text_17A380, Text_17A3A4, EventScript_1635A1 + trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_19, 0, Text_17A380, Text_17A3A4, EventScript_1635A1 msgbox gUnknown_817A3AF, 6 end @@ -27,11 +25,11 @@ EventScript_1635A1:: @ 81635A1 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 10 - goto_if_eq EventScript_1635E0 + goto_if eq, EventScript_1635E0 compare_var_to_value VAR_0x8004, 11 - goto_if_eq EventScript_1635F0 + goto_if eq, EventScript_1635F0 compare_var_to_value VAR_0x8004, 9 - goto_if_eq EventScript_163600 + goto_if eq, EventScript_163600 applymovement 2, Movement_16362C waitmovement 0 goto EventScript_163616 @@ -105,21 +103,19 @@ Movement_163633:: @ 8163633 step_end PokemonTower_7F_EventScript_16363D:: @ 816363D - trainerbattle 2, 370, 0, Text_17A3CD, Text_17A466, EventScript_163658 + trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_20, 0, Text_17A3CD, Text_17A466, EventScript_163658 msgbox gUnknown_817A477, 6 end EventScript_163658:: @ 8163658 - setvar VAR_0x8004, 14 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_MRFUJI, 1 msgbox gUnknown_817A477 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 12 - goto_if_eq EventScript_163699 + goto_if eq, EventScript_163699 compare_var_to_value VAR_0x8004, 13 - goto_if_eq EventScript_1636A9 + goto_if eq, EventScript_1636A9 applymovement 3, Movement_1636C6 waitmovement 0 goto EventScript_1636B9 @@ -173,7 +169,7 @@ Movement_1636CD:: @ 81636CD step_end PokemonTower_7F_EventScript_1636D6:: @ 81636D6 - trainerbattle 2, 371, 0, Text_17A4CF, Text_17A4EE, EventScript_1636F1 + trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_21, 0, Text_17A4CF, Text_17A4EE, EventScript_1636F1 msgbox gUnknown_817A506, 6 end @@ -182,9 +178,9 @@ EventScript_1636F1:: @ 81636F1 closemessage getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 10 - goto_if_eq EventScript_163725 + goto_if eq, EventScript_163725 compare_var_to_value VAR_0x8004, 9 - goto_if_eq EventScript_163735 + goto_if eq, EventScript_163735 applymovement 4, Movement_163754 waitmovement 0 goto EventScript_163745 diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 8647b0ae1..7a8d2c1f2 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 7, "y": 27, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PowerPlant_EventScript_1BE91C", - "flag": "410" + "flag": "FLAG_HIDE_POWER_PLANT_MAX_POTION" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 40, "y": 22, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PowerPlant_EventScript_1BE929", - "flag": "411" + "flag": "FLAG_HIDE_POWER_PLANT_TM17" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 46, "y": 37, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PowerPlant_EventScript_1BE936", - "flag": "412" + "flag": "FLAG_HIDE_POWER_PLANT_TM25" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 45, "y": 4, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PowerPlant_EventScript_1BE943", - "flag": "413" + "flag": "FLAG_HIDE_POWER_PLANT_THUNDER_STONE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 26, "y": 22, "elevation": 3, @@ -76,10 +76,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PowerPlant_EventScript_1BE950", - "flag": "414" + "flag": "FLAG_HIDE_POWER_PLANT_ELIXIR" }, { - "graphics_id": "136", + "graphics_id": "MAP_OBJ_GFX_ZAPDOS", "x": 5, "y": 11, "elevation": 3, @@ -89,10 +89,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PowerPlant_EventScript_1637B8", - "flag": "93" + "flag": "FLAG_HIDE_ZAPDOS" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 36, "y": 5, "elevation": 3, @@ -102,10 +102,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PowerPlant_EventScript_16388D", - "flag": "134" + "flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_2" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 30, "y": 38, "elevation": 3, @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "PowerPlant_EventScript_16382F", - "flag": "133" + "flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_1" } ], "warp_events": [ @@ -163,8 +163,9 @@ "y": 16, "elevation": 3, "item": "ITEM_MAX_ELIXIR", - "flag": "27", - "unknown": 1 + "flag": "HIDDEN_ITEM_POWER_PLANT_MAX_ELIXIR", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -172,8 +173,9 @@ "y": 12, "elevation": 3, "item": "ITEM_THUNDER_STONE", - "flag": "28", - "unknown": 1 + "flag": "HIDDEN_ITEM_POWER_PLANT_THUNDER_STONE", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index b70dc0f22..aa6fa42b0 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -4,43 +4,43 @@ PowerPlant_MapScripts:: @ 8163764 .byte 0 PowerPlant_MapScript1_16376F:: @ 816376F - checkflag FLAG_0x807 - call_if 1, EventScript_163779 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_163779 end EventScript_163779:: @ 8163779 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return PowerPlant_MapScript2_16378D:: @ 816378D setworldmapflag FLAG_WORLD_MAP_POWER_PLANT - checkflag FLAG_0x2BF - call_if 0, EventScript_1637AC - checkflag FLAG_0x2D0 - call_if 0, EventScript_1637B0 - checkflag FLAG_0x2D1 - call_if 0, EventScript_1637B4 + checkflag FLAG_FOUGHT_ZAPDOS + call_if FALSE, EventScript_1637AC + checkflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 + call_if FALSE, EventScript_1637B0 + checkflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 + call_if FALSE, EventScript_1637B4 end EventScript_1637AC:: @ 81637AC - clearflag FLAG_0x05D + clearflag FLAG_HIDE_ZAPDOS return EventScript_1637B0:: @ 81637B0 - clearflag FLAG_0x085 + clearflag FLAG_HIDE_POWER_PLANT_ELECTRODE_1 return EventScript_1637B4:: @ 81637B4 - clearflag FLAG_0x086 + clearflag FLAG_HIDE_POWER_PLANT_ELECTRODE_2 return PowerPlant_EventScript_1637B8:: @ 81637B8 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -53,23 +53,23 @@ PowerPlant_EventScript_1637B8:: @ 81637B8 delay 10 playbgm MUS_EXEYE, 0 waitbuttonpress - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_807F9D8 waitstate - clearflag FLAG_0x807 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16381B - compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_163824 - compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_163824 - setflag FLAG_0x2BF + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_WON + goto_if eq, EventScript_16381B + compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + goto_if eq, EventScript_163824 + compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if eq, EventScript_163824 + setflag FLAG_FOUGHT_ZAPDOS release end EventScript_16381B:: @ 816381B - setflag FLAG_0x2BF + setflag FLAG_FOUGHT_ZAPDOS goto EventScript_1A922D end @@ -81,7 +81,7 @@ EventScript_163824:: @ 8163824 PowerPlant_EventScript_16382F:: @ 816382F special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE @@ -89,30 +89,30 @@ PowerPlant_EventScript_16382F:: @ 816382F playmoncry SPECIES_ELECTRODE, 2 delay 40 waitmoncry - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE dowildbattle - clearflag FLAG_0x807 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_8112364 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_163884 - compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_163884 - compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_163884 - setflag FLAG_0x2D0 + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_WON + goto_if eq, EventScript_163884 + compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + goto_if eq, EventScript_163884 + compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if eq, EventScript_163884 + setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 release end EventScript_163884:: @ 8163884 - setflag FLAG_0x2D0 + setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 goto EventScript_1A922D end PowerPlant_EventScript_16388D:: @ 816388D special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE @@ -120,22 +120,22 @@ PowerPlant_EventScript_16388D:: @ 816388D playmoncry SPECIES_ELECTRODE, 2 delay 40 waitmoncry - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE dowildbattle - clearflag FLAG_0x807 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_8112364 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1638E2 - compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_1638E2 - compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_1638E2 - setflag FLAG_0x2D1 + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_WON + goto_if eq, EventScript_1638E2 + compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + goto_if eq, EventScript_1638E2 + compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if eq, EventScript_1638E2 + setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 release end EventScript_1638E2:: @ 81638E2 - setflag FLAG_0x2D1 + setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 goto EventScript_1A922D end diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index 59abc79f0..ab85b27d2 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 26, "y": 28, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 39, "y": 27, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 45, "y": 24, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 20, "y": 17, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 5, "y": 20, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 7, "y": 5, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 27, "y": 10, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 37, "y": 5, "elevation": 3, @@ -115,10 +115,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_1F_EventScript_1BEB0A", - "flag": "451" + "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_REPEL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 33, "y": 22, "elevation": 3, @@ -128,10 +128,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_1F_EventScript_1BEB17", - "flag": "452" + "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_PEARL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 22, "y": 22, "elevation": 3, @@ -141,7 +141,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_1F_EventScript_1BEB24", - "flag": "453" + "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_ESCAPE_ROPE" } ], "warp_events": [ diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc index 846154c97..f16127dc0 100644 --- a/data/maps/RockTunnel_1F/scripts.inc +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -11,36 +11,36 @@ RockTunnel_1F_EventScript_162DE0:: @ 8162DE0 end RockTunnel_1F_EventScript_162DE9:: @ 8162DE9 - trainerbattle 0, 192, 0, Text_179366, Text_179388 + trainerbattle 0, TRAINER_HIKER_LENNY, 0, Text_179366, Text_179388 msgbox gUnknown_8179396, 6 end RockTunnel_1F_EventScript_162E00:: @ 8162E00 - trainerbattle 0, 193, 0, Text_1793F1, Text_17940E + trainerbattle 0, TRAINER_HIKER_OLIVER, 0, Text_1793F1, Text_17940E msgbox gUnknown_817943A, 6 end RockTunnel_1F_EventScript_162E17:: @ 8162E17 - trainerbattle 0, 194, 0, Text_17947B, Text_1794AC + trainerbattle 0, TRAINER_HIKER_LUCAS, 0, Text_17947B, Text_1794AC msgbox gUnknown_81794B4, 6 end RockTunnel_1F_EventScript_162E2E:: @ 8162E2E - trainerbattle 0, 168, 0, Text_1794D4, Text_1794EE + trainerbattle 0, TRAINER_POKEMANIAC_ASHTON, 0, Text_1794D4, Text_1794EE msgbox gUnknown_81794F9, 6 end RockTunnel_1F_EventScript_162E45:: @ 8162E45 - trainerbattle 0, 476, 0, Text_17951C, Text_179547 + trainerbattle 0, TRAINER_PICNICKER_LEAH, 0, Text_17951C, Text_179547 msgbox gUnknown_8179558, 6 end RockTunnel_1F_EventScript_162E5C:: @ 8162E5C - trainerbattle 0, 475, 0, Text_1795E5, Text_179604 + trainerbattle 0, TRAINER_PICNICKER_ARIANA, 0, Text_1795E5, Text_179604 msgbox gUnknown_8179613, 6 end RockTunnel_1F_EventScript_162E73:: @ 8162E73 - trainerbattle 0, 474, 0, Text_179577, Text_1795A1 + trainerbattle 0, TRAINER_PICNICKER_DANA, 0, Text_179577, Text_1795A1 msgbox gUnknown_81795B5, 6 end diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index 0d2d1696e..c904e3b4b 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 2, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 5, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 11, "y": 15, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 36, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 41, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 23, "y": 23, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 15, "y": 33, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 29, "y": 35, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 2, "y": 29, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 37, "elevation": 3, @@ -141,10 +141,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_B1F_EventScript_1BEB31", - "flag": "454" + "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_REVIVE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 9, "y": 2, "elevation": 3, @@ -154,10 +154,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RockTunnel_B1F_EventScript_1BEB3E", - "flag": "455" + "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_MAX_ETHER" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 20, "elevation": 3, @@ -166,11 +166,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "18" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 22, "elevation": 3, @@ -179,11 +179,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "19" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 23, "elevation": 3, @@ -192,11 +192,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "20" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 2, "y": 23, "elevation": 3, @@ -205,11 +205,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "21" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_15" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 39, "y": 26, "elevation": 3, @@ -218,11 +218,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "22" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_16" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 42, "y": 26, "elevation": 3, @@ -231,11 +231,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "23" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_17" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 43, "y": 28, "elevation": 3, @@ -244,11 +244,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "24" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_18" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 45, "y": 30, "elevation": 3, @@ -257,11 +257,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "25" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_19" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 45, "y": 33, "elevation": 3, @@ -270,11 +270,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "26" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 25, "y": 1, "elevation": 3, @@ -283,11 +283,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "27" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 27, "y": 4, "elevation": 3, @@ -296,11 +296,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "28" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 2, "elevation": 3, @@ -309,11 +309,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "29" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_1D" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 26, "y": 2, "elevation": 3, @@ -322,11 +322,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "30" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_1E" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 24, "y": 7, "elevation": 3, @@ -335,11 +335,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "31" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_1F" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 27, "y": 6, "elevation": 3, @@ -348,8 +348,8 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "RockTunnel_B1F_EventScript_1BE00C", - "flag": "17" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_11" } ], "warp_events": [ diff --git a/data/maps/RockTunnel_B1F/scripts.inc b/data/maps/RockTunnel_B1F/scripts.inc index 12611a767..7ca22dde0 100644 --- a/data/maps/RockTunnel_B1F/scripts.inc +++ b/data/maps/RockTunnel_B1F/scripts.inc @@ -2,41 +2,41 @@ RockTunnel_B1F_MapScripts:: @ 8162E8A .byte 0 RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B - trainerbattle 0, 158, 0, Text_179657, Text_1796B9 + trainerbattle 0, TRAINER_PICNICKER_SOFIA, 0, Text_179657, Text_1796B9 msgbox gUnknown_81796CE, 6 end RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2 - trainerbattle 0, 159, 0, Text_1798AD, Text_1798DD + trainerbattle 0, TRAINER_PICNICKER_MARTHA, 0, Text_1798AD, Text_1798DD msgbox gUnknown_81798E9, 6 end RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9 - trainerbattle 0, 189, 0, Text_1796E1, Text_179700 + trainerbattle 0, TRAINER_HIKER_DUDLEY, 0, Text_1796E1, Text_179700 msgbox gUnknown_8179712, 6 end RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0 - trainerbattle 0, 190, 0, Text_179829, Text_179856 + trainerbattle 0, TRAINER_HIKER_ALLEN, 0, Text_179829, Text_179856 msgbox gUnknown_817987A, 6 end RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7 - trainerbattle 0, 191, 0, Text_179916, Text_179932 + trainerbattle 0, TRAINER_HIKER_ERIC, 0, Text_179916, Text_179932 msgbox gUnknown_817993E, 6 end RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE - trainerbattle 0, 164, 0, Text_17973A, Text_17975F + trainerbattle 0, TRAINER_POKEMANIAC_COOPER, 0, Text_17973A, Text_17975F msgbox gUnknown_8179777, 6 end RockTunnel_B1F_EventScript_162F15:: @ 8162F15 - trainerbattle 0, 165, 0, Text_1797A4, Text_1797CB + trainerbattle 0, TRAINER_POKEMANIAC_STEVE, 0, Text_1797A4, Text_1797CB msgbox gUnknown_81797DE, 6 end RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C - trainerbattle 0, 166, 0, Text_179968, Text_179997 + trainerbattle 0, TRAINER_POKEMANIAC_WINSTON, 0, Text_179968, Text_179997 msgbox gUnknown_81799AC, 6 end diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 66aa5aad7..5e1e205d8 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 4, "y": 9, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, "script": "RocketHideout_B1F_EventScript_1611C5", - "flag": "173" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 24, "y": 12, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "RocketHideout_B1F_EventScript_1611AE", - "flag": "173" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 6, "y": 32, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "RocketHideout_B1F_EventScript_1611F3", - "flag": "173" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 10, "y": 22, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "RocketHideout_B1F_EventScript_1611DC", - "flag": "173" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 21, "y": 27, "elevation": 3, @@ -76,10 +76,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "RocketHideout_B1F_EventScript_16120A", - "flag": "173" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 16, "elevation": 0, @@ -89,10 +89,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B1F_EventScript_1BE6C6", - "flag": "364" + "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_ESCAPE_ROPE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 1, "y": 22, "elevation": 3, @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B1F_EventScript_1BE6D3", - "flag": "365" + "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_HYPER_POTION" } ], "warp_events": [ @@ -157,8 +157,9 @@ "y": 17, "elevation": 0, "item": "ITEM_PP_UP", - "flag": "11", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROCKET_HIDEOUT_B1F_PP_UP", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index 1b4068e14..1e8f1b9d2 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -4,8 +4,8 @@ RocketHideout_B1F_MapScripts:: @ 8161195 .byte 0 RocketHideout_B1F_MapScript1_1611A0:: @ 81611A0 - checktrainerflag FLAG_0x16A - call_if 0, EventScript_161233 + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_12 + call_if lt, EventScript_161233 end RocketHideout_B1F_MapScript2_1611AA:: @ 81611AA @@ -13,27 +13,27 @@ RocketHideout_B1F_MapScript2_1611AA:: @ 81611AA end RocketHideout_B1F_EventScript_1611AE:: @ 81611AE - trainerbattle 0, 358, 0, Text_174ECA, Text_174EED + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_8, 0, Text_174ECA, Text_174EED msgbox gUnknown_8174EFA, 6 end RocketHideout_B1F_EventScript_1611C5:: @ 81611C5 - trainerbattle 0, 359, 0, Text_174F2C, Text_174F60 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_9, 0, Text_174F2C, Text_174F60 msgbox gUnknown_8174F66, 6 end RocketHideout_B1F_EventScript_1611DC:: @ 81611DC - trainerbattle 0, 360, 0, Text_174F94, Text_174FA4 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_10, 0, Text_174F94, Text_174FA4 msgbox gUnknown_8174FB3, 6 end RocketHideout_B1F_EventScript_1611F3:: @ 81611F3 - trainerbattle 0, 361, 0, Text_174FE1, Text_174FF8 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_11, 0, Text_174FE1, Text_174FF8 msgbox gUnknown_8175007, 6 end RocketHideout_B1F_EventScript_16120A:: @ 816120A - trainerbattle 2, 362, 0, Text_17503A, Text_17505A, EventScript_161225 + trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_12, 0, Text_17503A, Text_17505A, EventScript_161225 msgbox gUnknown_8175060, 6 end diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index eff2b29af..c306907fd 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 20, "y": 6, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "RocketHideout_B2F_EventScript_1612A2", - "flag": "173" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 15, "y": 3, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B2F_EventScript_1BE6E0", - "flag": "366" + "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 5, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B2F_EventScript_1BE6ED", - "flag": "367" + "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 7, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B2F_EventScript_1BE6FA", - "flag": "368" + "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 0, "y": 14, "elevation": 3, @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B2F_EventScript_1BE707", - "flag": "369" + "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_SUPER_POTION" } ], "warp_events": [ diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc index 80c102179..e3ed4b499 100644 --- a/data/maps/RocketHideout_B2F/scripts.inc +++ b/data/maps/RocketHideout_B2F/scripts.inc @@ -2,6 +2,6 @@ RocketHideout_B2F_MapScripts:: @ 81612A1 .byte 0 RocketHideout_B2F_EventScript_1612A2:: @ 81612A2 - trainerbattle 0, 363, 0, Text_17508C, Text_1750BF + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_13, 0, Text_17508C, Text_1750BF msgbox gUnknown_81750CC, 6 end diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 77790c353..84326943e 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 19, "y": 9, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "RocketHideout_B3F_EventScript_1612D1", - "flag": "173" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 2, "y": 20, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "RocketHideout_B3F_EventScript_1612BA", - "flag": "173" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 12, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B3F_EventScript_1BE714", - "flag": "370" + "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_RARE_CANDY" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 19, "y": 14, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B3F_EventScript_1BE721", - "flag": "371" + "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_TM21" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 14, "y": 24, "elevation": 3, @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B3F_EventScript_1BEBCD", - "flag": "466" + "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_BLACK_GLASSES" } ], "warp_events": [ @@ -103,8 +103,9 @@ "y": 3, "elevation": 3, "item": "ITEM_NUGGET", - "flag": "12", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROCKET_HIDEOUT_B3F_NUGGET", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc index 82fc7aa26..d322a36fb 100644 --- a/data/maps/RocketHideout_B3F/scripts.inc +++ b/data/maps/RocketHideout_B3F/scripts.inc @@ -2,11 +2,11 @@ RocketHideout_B3F_MapScripts:: @ 81612B9 .byte 0 RocketHideout_B3F_EventScript_1612BA:: @ 81612BA - trainerbattle 0, 364, 0, Text_17511A, Text_17514A + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_14, 0, Text_17511A, Text_17514A msgbox gUnknown_817515B, 6 end RocketHideout_B3F_EventScript_1612D1:: @ 81612D1 - trainerbattle 0, 365, 0, Text_17519E, Text_1751CE + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_15, 0, Text_17519E, Text_1751CE msgbox gUnknown_81751E0, 6 end diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 37df23d8f..6a88db1a7 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "87", + "graphics_id": "MAP_OBJ_GFX_GIOVANNI", "x": 19, "y": 4, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B4F_EventScript_161317", - "flag": "56" + "flag": "FLAG_HIDE_HIDEOUT_GIOVANNI" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 20, "y": 5, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B4F_EventScript_161363", - "flag": "55" + "flag": "FLAG_HIDE_SILPH_SCOPE" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 4, "y": 2, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "RocketHideout_B4F_EventScript_161381", - "flag": "173" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 3, "y": 2, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B4F_EventScript_1613AD", - "flag": "54" + "flag": "FLAG_HIDE_LIFT_KEY" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 19, "y": 14, "elevation": 3, @@ -76,10 +76,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B4F_EventScript_161418", - "flag": "173" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 16, "y": 14, "elevation": 3, @@ -89,10 +89,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B4F_EventScript_1613CE", - "flag": "173" + "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 1, "y": 6, "elevation": 3, @@ -102,10 +102,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B4F_EventScript_1BE72E", - "flag": "372" + "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_TM49" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 4, "y": 14, "elevation": 0, @@ -115,10 +115,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B4F_EventScript_1BE73B", - "flag": "373" + "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_MAX_ETHER" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 6, "y": 23, "elevation": 0, @@ -128,7 +128,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "RocketHideout_B4F_EventScript_1BE748", - "flag": "374" + "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_CALCIUM" } ], "warp_events": [ @@ -162,8 +162,9 @@ "y": 6, "elevation": 3, "item": "ITEM_NEST_BALL", - "flag": "13", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROCKET_HIDEOUT_B4F_NEST_BALL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -171,8 +172,9 @@ "y": 6, "elevation": 3, "item": "ITEM_NET_BALL", - "flag": "134", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROCKET_HIDEOUT_B4F_NET_BALL", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index f56e0a211..655ef389a 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -4,12 +4,12 @@ RocketHideout_B4F_MapScripts:: @ 81612E8 RocketHideout_B4F_MapScript1_1612EE:: @ 81612EE setvar VAR_0x4001, 0 - checktrainerflag FLAG_0x16E - call_if 1, EventScript_161311 - checktrainerflag FLAG_0x16F - call_if 1, EventScript_161311 + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 + call_if eq, EventScript_161311 + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 + call_if eq, EventScript_161311 compare_var_to_value VAR_0x4001, 2 - call_if 5, EventScript_16146A + call_if ne, EventScript_16146A end EventScript_161311:: @ 8161311 @@ -19,24 +19,20 @@ EventScript_161311:: @ 8161311 RocketHideout_B4F_EventScript_161317:: @ 8161317 lock faceplayer - setvar VAR_0x8004, 15 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_GIOVANNI, 0 message Text_175226 waitmessage playbgm MUS_ROCKET, 0 waitbuttonpress - trainerbattle 3, 348, 0, Text_175318 + trainerbattle 3, TRAINER_BOSS_GIOVANNI, 0, Text_175318 msgbox gUnknown_817532D fadescreen 1 closemessage removeobject 1 addobject 2 - clearflag FLAG_0x037 - setflag FLAG_0x05F - setvar VAR_0x8004, 15 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 + clearflag FLAG_HIDE_SILPH_SCOPE + setflag FLAG_HIDE_CELADON_ROCKETS + famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 fadescreen 0 release end @@ -47,12 +43,12 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363 removeobject 2 giveitem ITEM_SILPH_SCOPE compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A6BF9 + goto_if eq, EventScript_1A6BF9 release end RocketHideout_B4F_EventScript_161381:: @ 8161381 - trainerbattle 2, 368, 0, Text_175488, Text_1754B9, EventScript_16139D + trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_18, 0, Text_175488, Text_1754B9, EventScript_16139D msgbox gUnknown_81754BD release end @@ -60,54 +56,54 @@ RocketHideout_B4F_EventScript_161381:: @ 8161381 EventScript_16139D:: @ 816139D msgbox gUnknown_81754BD addobject 4 - clearflag FLAG_0x036 + clearflag FLAG_HIDE_LIFT_KEY release end RocketHideout_B4F_EventScript_1613AD:: @ 81613AD lock faceplayer - setflag FLAG_0x2A5 + setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT removeobject 4 giveitem ITEM_LIFT_KEY compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A6BF9 + goto_if eq, EventScript_1A6BF9 release end RocketHideout_B4F_EventScript_1613CE:: @ 81613CE - trainerbattle 2, 366, 0, Text_1753D0, Text_1753FE, EventScript_1613E9 + trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_16, 0, Text_1753D0, Text_1753FE, EventScript_1613E9 msgbox gUnknown_817540C, 6 end EventScript_1613E9:: @ 81613E9 setvar VAR_0x4001, 0 - checktrainerflag FLAG_0x16E - call_if 1, EventScript_161311 - checktrainerflag FLAG_0x16F - call_if 1, EventScript_161311 + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 + call_if eq, EventScript_161311 + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 + call_if eq, EventScript_161311 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1614A1 + call_if eq, EventScript_1614A1 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_161462 + call_if eq, EventScript_161462 release end RocketHideout_B4F_EventScript_161418:: @ 8161418 - trainerbattle 2, 367, 0, Text_175437, Text_175463, EventScript_161433 + trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_17, 0, Text_175437, Text_175463, EventScript_161433 msgbox gUnknown_817546A, 6 end EventScript_161433:: @ 8161433 setvar VAR_0x4001, 0 - checktrainerflag FLAG_0x16E - call_if 1, EventScript_161311 - checktrainerflag FLAG_0x16F - call_if 1, EventScript_161311 + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16 + call_if eq, EventScript_161311 + checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17 + call_if eq, EventScript_161311 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1614A1 + call_if eq, EventScript_1614A1 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_161462 + call_if eq, EventScript_161462 release end diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index 884335234..c83bc7fd9 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -3,12 +3,12 @@ RocketHideout_Elevator_MapScripts:: @ 81614D8 RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9 lockall - checkflag FLAG_0x2A5 - goto_if 0, EventScript_16161B + checkflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT + goto_if FALSE, EventScript_16161B setvar VAR_0x8004, 2 - checkflag FLAG_0x002 - call_if 0, EventScript_1A7AB9 - copyvar VAR_0x8005, VAR_0x403A + checkflag FLAG_TEMP_2 + call_if FALSE, EventScript_1A7AB9 + copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special sub_80CB580 message Text_1A535C waitmessage @@ -53,10 +53,10 @@ EventScript_161554:: @ 8161554 EventScript_161591:: @ 8161591 setvar VAR_0x8006, 3 setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25 - compare_var_to_value VAR_0x403A, 3 - goto_if_eq EventScript_161609 + compare_var_to_value VAR_ELEVATOR_FLOOR, 3 + goto_if eq, EventScript_161609 call EventScript_16160E - setvar VAR_0x403A, 3 + setvar VAR_ELEVATOR_FLOOR, 3 goto EventScript_161609 EventScript_1615B8:: @ 81615B8 @@ -65,10 +65,10 @@ EventScript_1615B8:: @ 81615B8 EventScript_1615B9:: @ 81615B9 setvar VAR_0x8006, 2 setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16 - compare_var_to_value VAR_0x403A, 2 - goto_if_eq EventScript_161609 + compare_var_to_value VAR_ELEVATOR_FLOOR, 2 + goto_if eq, EventScript_161609 call EventScript_16160E - setvar VAR_0x403A, 2 + setvar VAR_ELEVATOR_FLOOR, 2 goto EventScript_161609 EventScript_1615E0:: @ 81615E0 @@ -77,10 +77,10 @@ EventScript_1615E0:: @ 81615E0 EventScript_1615E1:: @ 81615E1 setvar VAR_0x8006, 0 setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23 - compare_var_to_value VAR_0x403A, 0 - goto_if_eq EventScript_161609 + compare_var_to_value VAR_ELEVATOR_FLOOR, 0 + goto_if eq, EventScript_161609 call EventScript_16160E - setvar VAR_0x403A, 0 + setvar VAR_ELEVATOR_FLOOR, 0 goto EventScript_161609 EventScript_161608:: @ 8161608 @@ -97,7 +97,7 @@ EventScript_16160E:: @ 816160E waitse special sub_80CB498 waitstate - setflag FLAG_0x002 + setflag FLAG_TEMP_2 return EventScript_16161B:: @ 816161B diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index 9532ffe65..265822796 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 6, "y": 28, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 19, "y": 16, "elevation": 3, diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index 16bd02597..ef784e8ee 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -4,13 +4,13 @@ Route1_MapScripts:: @ 8167EFD Route1_EventScript_167EFE:: @ 8167EFE lock faceplayer - checkflag FLAG_0x230 - goto_if_eq EventScript_167F48 + checkflag FLAG_GOT_POTION_ON_ROUTE_1 + goto_if TRUE, EventScript_167F48 msgbox gUnknown_818329D textcolor 3 checkitemspace ITEM_POTION, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A6BF9 + goto_if eq, EventScript_1A6BF9 getitemname 1, ITEM_POTION playfanfare MUS_FANFA1 message Text_1A51F6 @@ -19,7 +19,7 @@ Route1_EventScript_167EFE:: @ 8167EFE additem ITEM_POTION, 1 msgbox gUnknown_8183387 call EventScript_1A6675 - setflag FLAG_0x230 + setflag FLAG_GOT_POTION_ON_ROUTE_1 release end diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index d7ec8b3c9..04ea2bf57 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 7, "y": 60, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 4, "y": 62, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 15, "y": 70, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 4, "y": 68, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 13, "y": 44, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 9, "y": 27, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 10, "y": 20, "elevation": 0, @@ -112,11 +112,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 10, "y": 22, "elevation": 0, @@ -125,11 +125,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_EventScript_1BDF13", - "flag": "19" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 10, "y": 24, "elevation": 0, @@ -138,11 +138,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_EventScript_1BDF13", - "flag": "20" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 10, "y": 26, "elevation": 0, @@ -151,8 +151,8 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route10_EventScript_1BDF13", - "flag": "21" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_15" } ], "warp_events": [ @@ -221,8 +221,9 @@ "y": 19, "elevation": 0, "item": "ITEM_SUPER_POTION", - "flag": "9", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE10_SUPER_POTION", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -230,8 +231,9 @@ "y": 40, "elevation": 3, "item": "ITEM_MAX_ETHER", - "flag": "10", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE10_MAX_ETHER", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -239,8 +241,9 @@ "y": 26, "elevation": 3, "item": "ITEM_CHERI_BERRY", - "flag": "126", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE10_CHERI_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -248,8 +251,9 @@ "y": 29, "elevation": 3, "item": "ITEM_PERSIM_BERRY", - "flag": "125", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE10_PERSIM_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -257,8 +261,9 @@ "y": 57, "elevation": 3, "item": "ITEM_NANAB_BERRY", - "flag": "151", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE10_NANAB_BERRY", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index ad6d1d426..c6a6d57c6 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 9, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 2, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 14, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 12, "y": 5, "elevation": 3, diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index 7d47d07df..44d9939c0 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -31,24 +31,24 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65 lock faceplayer call EventScript_16FCF1 - checkflag FLAG_0x2FA - goto_if_eq EventScript_16FCE7 + checkflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE + goto_if TRUE, EventScript_16FCE7 msgbox gUnknown_819E5FB, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AD1 + goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FCF1 compare_var_to_value VAR_0x8006, 20 - goto_if 0, EventScript_1A7ABD + goto_if lt, EventScript_1A7ABD msgbox gUnknown_819E733 checkitemspace ITEM_EVERSTONE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AC7 + goto_if eq, EventScript_1A7AC7 additem ITEM_EVERSTONE, 1 giveitemfanfaremsg gUnknown_819E786, ITEM_EVERSTONE - setflag FLAG_0x2FA + setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE msgbox gUnknown_819E7AF release end diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index ccb14b3db..ba0d61e30 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route10_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index 27e2a7d76..a7cf69d51 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 19, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 16, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 31, "y": 8, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 28, "y": 10, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 38, "y": 15, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 50, "y": 4, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 42, "y": 8, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 50, "y": 14, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 57, "y": 16, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 32, "y": 18, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 42, "y": 12, "elevation": 3, @@ -165,10 +165,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route11_EventScript_1BEAF0", - "flag": "449" + "flag": "FLAG_HIDE_ROUTE11_X_DEFEND" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 63, "y": 13, "elevation": 3, @@ -178,10 +178,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route11_EventScript_1BEB99", - "flag": "462" + "flag": "FLAG_HIDE_ROUTE11_GREAT_BALL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 13, "y": 3, "elevation": 3, @@ -191,7 +191,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route11_EventScript_1BEBA6", - "flag": "463" + "flag": "FLAG_HIDE_ROUTE11_AWAKENING" } ], "warp_events": [ @@ -232,8 +232,9 @@ "y": 5, "elevation": 0, "item": "ITEM_ESCAPE_ROPE", - "flag": "41", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE11_ESCAPE_ROPE", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index 752346bbd..2806f681c 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 4, "y": 10, "elevation": 0, diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index 767612c7b..dfe0c5030 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 7, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 334e71ec4..0140d8de3 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -3,8 +3,8 @@ Route11_EastEntrance_2F_MapScripts:: @ 816FD34 Route11_EastEntrance_2F_EventScript_16FD35:: @ 816FD35 lockall - checkflag FLAG_0x253 - goto_if_eq EventScript_16FD49 + checkflag FLAG_WOKE_UP_ROUTE_12_SNORLAX + goto_if TRUE, EventScript_16FD49 msgbox gUnknown_819EC8A releaseall end @@ -23,20 +23,20 @@ Route11_EastEntrance_2F_EventScript_16FD5C:: @ 816FD5C faceplayer setvar VAR_0x8008, 4 call EventScript_1A8CAD - checkflag FLAG_0x251 - goto_if_eq EventScript_16FDCE + checkflag FLAG_DID_NINA_TRADE + goto_if TRUE, EventScript_16FDCE msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16FDB6 + goto_if eq, EventScript_16FDB6 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16FDB6 + goto_if ge, EventScript_16FDB6 call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16FDC0 + goto_if ne, EventScript_16FDC0 call EventScript_1A8CD9 msgbox gUnknown_81A59DA - setflag FLAG_0x251 + setflag FLAG_DID_NINA_TRADE release end @@ -60,24 +60,24 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8 lock faceplayer call EventScript_16FE64 - checkflag FLAG_0x252 - goto_if_eq EventScript_16FE5A + checkflag FLAG_GOT_ITEMFINDER + goto_if TRUE, EventScript_16FE5A msgbox gUnknown_819E9E5, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AD1 + goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16FE64 compare_var_to_value VAR_0x8006, 30 - goto_if 0, EventScript_1A7ABD + goto_if lt, EventScript_1A7ABD msgbox gUnknown_819EAE4 checkitemspace ITEM_ITEMFINDER, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AC7 + goto_if eq, EventScript_1A7AC7 additem ITEM_ITEMFINDER, 1 giveitemfanfaremsg gUnknown_819EB37, ITEM_ITEMFINDER - setflag FLAG_0x252 + setflag FLAG_GOT_ITEMFINDER msgbox gUnknown_819EB59 release end diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index b15dc4525..9d660528e 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 17, "y": 32, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 9, "y": 40, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 16, "y": 47, "elevation": 3, @@ -69,7 +69,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 13, "y": 59, "elevation": 3, @@ -82,7 +82,7 @@ "flag": "0" }, { - "graphics_id": "109", + "graphics_id": "MAP_OBJ_GFX_SNORLAX", "x": 14, "y": 70, "elevation": 3, @@ -92,10 +92,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route12_EventScript_168014", - "flag": "84" + "flag": "FLAG_HIDE_ROUTE_12_SNORLAX" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 13, "y": 92, "elevation": 3, @@ -108,7 +108,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 10, "y": 99, "elevation": 3, @@ -121,7 +121,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 18, "y": 108, "elevation": 3, @@ -134,7 +134,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 11, "y": 100, "elevation": 3, @@ -143,11 +143,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 18, "y": 36, "elevation": 3, @@ -157,10 +157,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route12_EventScript_1BE7B0", - "flag": "382" + "flag": "FLAG_HIDE_ROUTE12_TM48" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 9, "y": 101, "elevation": 3, @@ -170,10 +170,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route12_EventScript_1BE7BD", - "flag": "383" + "flag": "FLAG_HIDE_ROUTE12_IRON" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 19, "y": 64, "elevation": 3, @@ -186,7 +186,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 19, "y": 63, "elevation": 3, @@ -199,7 +199,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 12, "y": 111, "elevation": 3, @@ -208,8 +208,8 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route12_EventScript_1BDF13", - "flag": "19" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_13" } ], "warp_events": [ @@ -264,8 +264,9 @@ "y": 57, "elevation": 3, "item": "ITEM_HYPER_POTION", - "flag": "42", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE12_HYPER_POTION", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -273,8 +274,9 @@ "y": 70, "elevation": 3, "item": "ITEM_LEFTOVERS", - "flag": "131", - "unknown": 129 + "flag": "HIDDEN_ITEM_ROUTE12_LEFTOVERS", + "quantity": 1, + "underfoot": true }, { "type": "hidden_item", @@ -282,8 +284,9 @@ "y": 116, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "130", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE12_RARE_CANDY", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 81be7952e..446d9047d 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -3,8 +3,8 @@ Route12_MapScripts:: @ 8168000 .byte 0 Route12_MapScript1_168006:: @ 8168006 - checkflag FLAG_0x807 - call_if 1, EventScript_168010 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_168010 end EventScript_168010:: @ 8168010 @@ -14,33 +14,33 @@ EventScript_168010:: @ 8168010 Route12_EventScript_168014:: @ 8168014 lock faceplayer - checkflag FLAG_0x23D - goto_if 0, EventScript_168099 + checkflag FLAG_GOT_POKE_FLUTE + goto_if FALSE, EventScript_168099 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16808D + goto_if eq, EventScript_16808D call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse playmoncry SPECIES_SNORLAX, 2 delay 40 waitmoncry - setflag FLAG_0x054 - setflag FLAG_0x807 - setflag FLAG_0x253 + setflag FLAG_HIDE_ROUTE_12_SNORLAX + setflag FLAG_SYS_SPECIAL_WILD_BATTLE + setflag FLAG_WOKE_UP_ROUTE_12_SNORLAX dowildbattle - clearflag FLAG_0x807 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16808F - compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_16808F - compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_16808F + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_WON + goto_if eq, EventScript_16808F + compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + goto_if eq, EventScript_16808F + compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if eq, EventScript_16808F release end diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index 6706d8b02..366c3e2c7 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index d4472473f..927bc3bea 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -4,11 +4,11 @@ Route12_FishingHouse_MapScripts:: @ 816FF0B Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C lock faceplayer - checkflag FLAG_0x255 - goto_if_eq EventScript_16FF7F + checkflag FLAG_GOT_SUPER_ROD + goto_if TRUE, EventScript_16FF7F msgbox gUnknown_819EFE0, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16FF34 + goto_if eq, EventScript_16FF34 msgbox gUnknown_819F1FA release end @@ -16,11 +16,11 @@ Route12_FishingHouse_EventScript_16FF0C:: @ 816FF0C EventScript_16FF34:: @ 816FF34 checkitemspace ITEM_SUPER_ROD, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16FF75 + goto_if eq, EventScript_16FF75 additem ITEM_SUPER_ROD, 1 msgbox gUnknown_819F05B giveitemfanfaremsg gUnknown_819F0B2, ITEM_SUPER_ROD - setflag FLAG_0x255 + setflag FLAG_GOT_SUPER_ROD msgbox gUnknown_819F0EB release end @@ -33,28 +33,28 @@ EventScript_16FF75:: @ 816FF75 EventScript_16FF7F:: @ 816FF7F special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_MAGIKARP specialvar VAR_RESULT, sub_80CC48C compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16FFF5 + goto_if eq, EventScript_16FFF5 special sub_80A096C msgbox gUnknown_819F2DB - special sub_80BF8FC + special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 compare_var_to_value VAR_RESULT, 6 - goto_if 4, EventScript_16FFFF + goto_if ge, EventScript_16FFFF special sub_80A0984 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_170001 + goto_if eq, EventScript_170001 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_17000B + goto_if eq, EventScript_17000B compare_var_to_value VAR_RESULT, 3 - goto_if_eq EventScript_170031 + goto_if eq, EventScript_170031 compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_17001E + goto_if eq, EventScript_17001E release end @@ -73,25 +73,25 @@ EventScript_170001:: @ 8170001 end EventScript_17000B:: @ 817000B - checkflag FLAG_0x29C - goto_if 0, EventScript_170031 + checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP + goto_if FALSE, EventScript_170031 msgbox gUnknown_819F40A release end EventScript_17001E:: @ 817001E - checkflag FLAG_0x29C - goto_if 0, EventScript_170031 + checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP + goto_if FALSE, EventScript_170031 msgbox gUnknown_819F3CB release end EventScript_170031:: @ 8170031 - setflag FLAG_0x29C + setflag FLAG_GOT_RECORD_SETTING_MAGIKARP msgbox gUnknown_819F31B giveitem ITEM_NET_BALL compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_17005D + goto_if eq, EventScript_17005D msgbox gUnknown_819F395 release end @@ -103,8 +103,8 @@ EventScript_17005D:: @ 817005D Route12_FishingHouse_EventScript_170067:: @ 8170067 lockall - checkflag FLAG_0x29C - goto_if_eq EventScript_17007B + checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP + goto_if TRUE, EventScript_17007B msgbox gUnknown_819F50C releaseall end diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index 7c4beb37a..a133ae23f 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 1, "y": 5, "elevation": 3, diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 4b1ed933e..687ac9bf6 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index 3c8727208..fe288a6d1 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -12,20 +12,20 @@ Route12_NorthEntrance_2F_EventScript_16FE81:: @ 816FE81 Route12_NorthEntrance_2F_EventScript_16FE8A:: @ 816FE8A lock faceplayer - checkflag FLAG_0x25B - goto_if_eq EventScript_16FF01 + checkflag FLAG_GOT_TM27 + goto_if TRUE, EventScript_16FF01 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16FEE5 + call_if eq, EventScript_16FEE5 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16FEEE + call_if eq, EventScript_16FEEE checkitemspace ITEM_TM27, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16FEF7 + goto_if eq, EventScript_16FEF7 additem ITEM_TM27, 1 giveitemfanfaremsg gUnknown_819EE9F, ITEM_TM27 msgbox gUnknown_819EEC6 - setflag FLAG_0x25B + setflag FLAG_GOT_TM27 release end diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 919048b8d..86a682dfb 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 62, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 63, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 54, "y": 11, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 42, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 43, "y": 7, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 35, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 29, "y": 11, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 9, "y": 14, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 16, "y": 5, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 14, "y": 8, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 44, "y": 5, "elevation": 3, @@ -164,8 +164,8 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route13_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" } ], "warp_events": [], @@ -198,8 +198,9 @@ "y": 14, "elevation": 3, "item": "ITEM_PP_UP", - "flag": "15", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE13_PP_UP", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 38dc65678..831e178d6 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 7, "y": 37, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 18, "y": 35, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 10, "y": 14, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 16, "y": 16, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 7, "y": 31, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 7, "y": 34, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 8, "y": 9, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 7, "y": 6, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 10, "y": 37, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 18, "y": 47, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 7, "y": 26, "elevation": 3, @@ -164,11 +164,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route14_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 12, "y": 35, "elevation": 3, @@ -177,11 +177,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route14_EventScript_1BDF13", - "flag": "19" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 1, "y": 47, "elevation": 3, @@ -190,11 +190,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route14_EventScript_1BDF13", - "flag": "20" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 13, "y": 51, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 12, "y": 51, "elevation": 3, @@ -236,8 +236,9 @@ "y": 20, "elevation": 3, "item": "ITEM_ZINC", - "flag": "149", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE14_ZINC", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -245,8 +246,9 @@ "y": 53, "elevation": 3, "item": "ITEM_PINAP_BERRY", - "flag": "157", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE14_PINAP_BERRY", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index cdf6e21d1..6d33098a6 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 22, "y": 13, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 31, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 37, "y": 14, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 44, "y": 13, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 50, "y": 12, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 59, "y": 12, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 63, "y": 13, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 52, "y": 8, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 54, "y": 12, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 28, "y": 6, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 20, "y": 6, "elevation": 3, @@ -165,10 +165,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route15_EventScript_1BE7CA", - "flag": "384" + "flag": "FLAG_HIDE_ROUTE15_TM18" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 39, "y": 7, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 40, "y": 7, "elevation": 3, diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index 5d94699d2..745e9e2c2 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index aa86a9719..fc6391217 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 1e06c0394..7ec851931 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -21,24 +21,24 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9 lock faceplayer call EventScript_170145 - checkflag FLAG_0x256 - goto_if_eq EventScript_17013B + checkflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE + goto_if TRUE, EventScript_17013B msgbox gUnknown_819F5AB, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AD1 + goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_170145 compare_var_to_value VAR_0x8006, 50 - goto_if 0, EventScript_1A7ABD + goto_if lt, EventScript_1A7ABD msgbox gUnknown_819F6AA checkitemspace ITEM_EXP_SHARE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AC7 + goto_if eq, EventScript_1A7AC7 additem ITEM_EXP_SHARE, 1 giveitemfanfaremsg gUnknown_819F6FD, ITEM_EXP_SHARE - setflag FLAG_0x256 + setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE msgbox gUnknown_819F71F release end diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index 528dd30b6..f6dc03f3e 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 16, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 14, "y": 14, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 12, "y": 12, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 8, "y": 12, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 10, "y": 14, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 6, "y": 14, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 41, "y": 11, "elevation": 3, @@ -112,11 +112,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route16_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 30, "y": 5, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 31, "y": 5, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "109", + "graphics_id": "MAP_OBJ_GFX_SNORLAX", "x": 31, "y": 13, "elevation": 3, @@ -152,7 +152,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route16_EventScript_168121", - "flag": "128" + "flag": "FLAG_HIDE_ROUTE_16_SNORLAX" } ], "warp_events": [ @@ -214,8 +214,9 @@ "y": 13, "elevation": 3, "item": "ITEM_LEFTOVERS", - "flag": "132", - "unknown": 129 + "flag": "HIDDEN_ITEM_ROUTE16_LEFTOVERS", + "quantity": 1, + "underfoot": true } ] } diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index e5fd83934..b20a716ca 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -5,8 +5,8 @@ Route16_MapScripts:: @ 81680E5 .byte 0 Route16_MapScript1_1680F5:: @ 81680F5 - checkflag FLAG_0x807 - call_if 1, EventScript_1680FF + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_1680FF end EventScript_1680FF:: @ 81680FF @@ -15,11 +15,11 @@ EventScript_1680FF:: @ 81680FF Route16_MapScript2_168103:: @ 8168103 compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1 - call_if 1, EventScript_16810F + call_if eq, EventScript_16810F end EventScript_16810F:: @ 816810F - setflag FLAG_0x830 + setflag FLAG_SYS_ON_CYCLING_ROAD return Route16_MapScript3_168113:: @ 8168113 @@ -33,32 +33,32 @@ EventScript_16811D:: @ 816811D Route16_EventScript_168121:: @ 8168121 lock faceplayer - checkflag FLAG_0x23D - goto_if 0, EventScript_1681A3 + checkflag FLAG_GOT_POKE_FLUTE + goto_if FALSE, EventScript_1681A3 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 msgbox gUnknown_81853CC, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_168197 + goto_if eq, EventScript_168197 call EventScript_1A924B setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse playmoncry SPECIES_SNORLAX, 2 delay 40 waitmoncry - setflag FLAG_0x080 - setflag FLAG_0x807 + setflag FLAG_HIDE_ROUTE_16_SNORLAX + setflag FLAG_SYS_SPECIAL_WILD_BATTLE dowildbattle - clearflag FLAG_0x807 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_168199 - compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_168199 - compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_168199 + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_WON + goto_if eq, EventScript_168199 + compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + goto_if eq, EventScript_168199 + compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if eq, EventScript_168199 release end diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index c848e5b76..eb7e79232 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 4, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "133", + "graphics_id": "MAP_OBJ_GFX_FEAROW", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index 82cc7a6f4..6da2bb12a 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -4,16 +4,16 @@ Route16_House_MapScripts:: @ 817014E Route16_House_EventScript_17014F:: @ 817014F lock faceplayer - checkflag FLAG_0x238 - goto_if_eq EventScript_1701A5 + checkflag FLAG_GOT_HM02 + goto_if TRUE, EventScript_1701A5 msgbox gUnknown_819F851 checkitemspace ITEM_HM02, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_17019B + goto_if eq, EventScript_17019B additem ITEM_HM02, 1 giveitemfanfaremsg gUnknown_819F8C0, ITEM_HM02 msgbox gUnknown_819F8E0 - setflag FLAG_0x238 + setflag FLAG_GOT_HM02 release end diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 8ee9a145a..52272f873 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 6, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index c30f309fd..32d392818 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -3,9 +3,9 @@ Route16_NorthEntrance_1F_MapScripts:: @ 81701C2 .byte 0 Route16_NorthEntrance_1F_MapScript1_1701C8:: @ 81701C8 - clearflag FLAG_0x830 - checkflag FLAG_0x271 - call_if 1, EventScript_1701D5 + clearflag FLAG_SYS_ON_CYCLING_ROAD + checkflag FLAG_GOT_BICYCLE + call_if TRUE, EventScript_1701D5 end EventScript_1701D5:: @ 81701D5 @@ -54,13 +54,13 @@ EventScript_170220:: @ 8170220 waitmovement 0 delay 20 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_170279 + call_if eq, EventScript_170279 compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_170284 + call_if eq, EventScript_170284 compare_var_to_value VAR_0x8008, 3 - call_if 1, EventScript_17028F + call_if eq, EventScript_17028F compare_var_to_value VAR_0x8008, 4 - call_if 1, EventScript_17029A + call_if eq, EventScript_17029A msgbox gUnknown_819F95F closemessage applymovement 255, Movement_1702B3 diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index 22f87439e..adec1e6b3 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 6, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 4, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 10, "y": 6, "elevation": 0, diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 6fa870c27..777967038 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -21,24 +21,24 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3 lock faceplayer call EventScript_17036F - checkflag FLAG_0x2FD - goto_if_eq EventScript_170365 + checkflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE + goto_if TRUE, EventScript_170365 msgbox gUnknown_819FB0E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AD1 + goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_17036F compare_var_to_value VAR_0x8006, 40 - goto_if 0, EventScript_1A7ABD + goto_if lt, EventScript_1A7ABD msgbox gUnknown_819FC15 checkitemspace ITEM_AMULET_COIN, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AC7 + goto_if eq, EventScript_1A7AC7 additem ITEM_AMULET_COIN, 1 giveitemfanfaremsg gUnknown_819FC68, ITEM_AMULET_COIN - setflag FLAG_0x2FD + setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE msgbox gUnknown_819FC93 release end diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 104649674..7158ae516 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 4, "y": 18, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 11, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 15, "y": 24, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 18, "y": 41, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 7, "y": 38, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 2, "y": 61, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 21, "y": 61, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 18, "y": 94, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 16, "y": 134, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 4, "y": 116, "elevation": 3, @@ -206,8 +206,9 @@ "y": 83, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "17", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE17_RARE_CANDY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -215,8 +216,9 @@ "y": 53, "elevation": 3, "item": "ITEM_FULL_RESTORE", - "flag": "18", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE17_FULL_RESTORE", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -224,8 +226,9 @@ "y": 68, "elevation": 3, "item": "ITEM_PP_UP", - "flag": "19", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE17_PP_UP", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -233,8 +236,9 @@ "y": 125, "elevation": 3, "item": "ITEM_MAX_REVIVE", - "flag": "20", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE17_MAX_REVIVE", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -242,8 +246,9 @@ "y": 157, "elevation": 3, "item": "ITEM_MAX_ELIXIR", - "flag": "21", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE17_MAX_ELIXIR", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 48301e386..9ced2a41f 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 46, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 41, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 39, "y": 12, "elevation": 3, diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index 548fdeeb6..dfc5f8578 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -5,11 +5,11 @@ Route18_MapScripts:: @ 81681F6 Route18_MapScript1_168201:: @ 8168201 compare_var_to_value VAR_MAP_SCENE_ROUTE16, 1 - call_if 1, EventScript_16820D + call_if eq, EventScript_16820D end EventScript_16820D:: @ 816820D - setflag FLAG_0x830 + setflag FLAG_SYS_ON_CYCLING_ROAD return Route18_MapScript2_168211:: @ 8168211 diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 610a84f34..803722807 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 70a8d196b..784d1d37f 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -3,9 +3,9 @@ Route18_EastEntrance_1F_MapScripts:: @ 8170378 .byte 0 Route18_EastEntrance_1F_MapScript1_17037E:: @ 817037E - clearflag FLAG_0x830 - checkflag FLAG_0x271 - call_if 1, EventScript_17038B + clearflag FLAG_SYS_ON_CYCLING_ROAD + checkflag FLAG_GOT_BICYCLE + call_if TRUE, EventScript_17038B end EventScript_17038B:: @ 817038B @@ -54,13 +54,13 @@ EventScript_1703D6:: @ 81703D6 waitmovement 0 delay 20 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_17042F + call_if eq, EventScript_17042F compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_17043A + call_if eq, EventScript_17043A compare_var_to_value VAR_0x8008, 3 - call_if 1, EventScript_170445 + call_if eq, EventScript_170445 compare_var_to_value VAR_0x8008, 4 - call_if 1, EventScript_170450 + call_if eq, EventScript_170450 msgbox gUnknown_819FD0C closemessage applymovement 255, Movement_170469 diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index 3f981016e..5731ecd8c 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index 204a0f879..d262aad30 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -14,20 +14,20 @@ Route18_EastEntrance_2F_EventScript_17047E:: @ 817047E faceplayer setvar VAR_0x8008, 5 call EventScript_1A8CAD - checkflag FLAG_0x257 - goto_if_eq EventScript_1704F0 + checkflag FLAG_DID_MARC_TRADE + goto_if TRUE, EventScript_1704F0 msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1704D8 + goto_if eq, EventScript_1704D8 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_1704D8 + goto_if ge, EventScript_1704D8 call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_1704E2 + goto_if ne, EventScript_1704E2 call EventScript_1A8CD9 msgbox gUnknown_81A59DA - setflag FLAG_0x257 + setflag FLAG_DID_MARC_TRADE release end diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index 111cf1b71..439c5f405 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "45", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_LAND", "x": 15, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "45", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_LAND", "x": 10, "y": 9, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 12, "y": 17, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 18, "y": 33, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 8, "y": 27, "elevation": 1, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 16, "y": 22, "elevation": 1, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 11, "y": 47, "elevation": 1, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 14, "y": 48, "elevation": 1, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 12, "y": 49, "elevation": 1, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 9, "y": 48, "elevation": 1, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 8, "y": 41, "elevation": 1, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "36", + "graphics_id": "MAP_OBJ_GFX_TUBER_M_1", "x": 9, "y": 41, "elevation": 1, diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 33ed43697..c211c5b72 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 16, "y": 62, "elevation": 3, @@ -34,11 +34,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BDF13", - "flag": "20" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 15, "y": 69, "elevation": 3, @@ -47,11 +47,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BDF13", - "flag": "19" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 11, "y": 13, "elevation": 3, @@ -60,11 +60,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BDF13", - "flag": "21" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_15" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 18, "y": 26, "elevation": 3, @@ -73,11 +73,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route2_EventScript_1BDF13", - "flag": "22" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_16" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 54, "elevation": 3, @@ -87,10 +87,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BE58E", - "flag": "340" + "flag": "FLAG_HIDE_ROUTE2_ETHER" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 64, "elevation": 3, @@ -100,7 +100,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route2_EventScript_1BE59B", - "flag": "341" + "flag": "FLAG_HIDE_ROUTE2_PARALYZE_HEAL" }, { "graphics_id": "65375", diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 8f1011ad4..231efcf51 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 8, "y": 11, "elevation": 1, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 16, "y": 14, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 34, "y": 7, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 43, "y": 9, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 23, "y": 10, "elevation": 1, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 73, "y": 16, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 111, "y": 9, "elevation": 1, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 106, "y": 11, "elevation": 1, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 93, "y": 10, "elevation": 1, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 54, "y": 11, "elevation": 1, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 69, "y": 3, "elevation": 3, @@ -206,8 +206,9 @@ "y": 6, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "153", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE20_STARDUST", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc index d99bebdd7..be0098a71 100644 --- a/data/maps/Route20/scripts.inc +++ b/data/maps/Route20/scripts.inc @@ -3,30 +3,30 @@ Route20_MapScripts:: @ 816823B .byte 0 Route20_MapScript1_168241:: @ 8168241 - checkflag FLAG_0x2D2 - call_if 0, EventScript_168254 - checkflag FLAG_0x2D3 - call_if 0, EventScript_16826D + checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT + call_if FALSE, EventScript_168254 + checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT + call_if FALSE, EventScript_16826D end EventScript_168254:: @ 8168254 - clearflag FLAG_0x040 - clearflag FLAG_0x041 - setflag FLAG_0x042 - setflag FLAG_0x043 - setflag FLAG_0x044 - setflag FLAG_0x045 - setflag FLAG_0x046 - setflag FLAG_0x047 + clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_1 + clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_2 + setflag FLAG_HIDE_SEAFOAM_B1F_BOULDER_1 + setflag FLAG_HIDE_SEAFOAM_B1F_BOULDER_2 + setflag FLAG_HIDE_SEAFOAM_B2F_BOULDER_1 + setflag FLAG_HIDE_SEAFOAM_B2F_BOULDER_2 + setflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 + setflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 return EventScript_16826D:: @ 816826D - clearflag FLAG_0x048 - clearflag FLAG_0x049 - clearflag FLAG_0x04A - clearflag FLAG_0x04B - setflag FLAG_0x04C - setflag FLAG_0x04D + clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_3 + clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_4 + clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_5 + clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_6 + setflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 + setflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 return Route20_EventScript_168280:: @ 8168280 diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index e52d7ff94..8d504c75c 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 7, "y": 27, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 16, "y": 26, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 12, "y": 44, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 14, "y": 35, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "36", + "graphics_id": "MAP_OBJ_GFX_TUBER_M_1", "x": 15, "y": 35, "elevation": 1, @@ -112,8 +112,9 @@ "y": 42, "elevation": 3, "item": "ITEM_PEARL", - "flag": "154", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE21_NORTH_PEARL", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index e863fbdb9..0895e18f1 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 11, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 14, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 15, "y": 24, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 15, "y": 38, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 10, "y": 29, "elevation": 1, diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index c03b8068d..1b3e558b4 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 25, "y": 4, "elevation": 3, @@ -35,7 +35,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "79" + "flag": "FLAG_HIDE_ROUTE_22_RIVAL" } ], "warp_events": [ @@ -60,7 +60,7 @@ "x": 33, "y": 4, "elevation": 3, - "var": "VAR_0x4054", + "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 1, "script": "Route22_EventScript_16828C" }, @@ -69,7 +69,7 @@ "x": 33, "y": 5, "elevation": 3, - "var": "VAR_0x4054", + "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 1, "script": "Route22_EventScript_168298" }, @@ -78,7 +78,7 @@ "x": 33, "y": 6, "elevation": 0, - "var": "VAR_0x4054", + "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 1, "script": "Route22_EventScript_1682AB" }, @@ -87,7 +87,7 @@ "x": 33, "y": 4, "elevation": 3, - "var": "VAR_0x4054", + "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 3, "script": "Route22_EventScript_1683ED" }, @@ -96,7 +96,7 @@ "x": 33, "y": 5, "elevation": 3, - "var": "VAR_0x4054", + "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 3, "script": "Route22_EventScript_1683F9" }, @@ -105,7 +105,7 @@ "x": 33, "y": 6, "elevation": 0, - "var": "VAR_0x4054", + "var": "VAR_MAP_SCENE_ROUTE22", "var_value": 3, "script": "Route22_EventScript_16840C" } diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 6df018f2f..0996b20a0 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -32,32 +32,32 @@ EventScript_1682BE:: @ 81682BE playbgm MUS_RIVAL1, 0 addobject 1 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_168350 + call_if eq, EventScript_168350 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_168350 + call_if eq, EventScript_168350 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16835B + call_if eq, EventScript_16835B delay 6 msgbox gUnknown_8188890 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_16836D + call_if eq, EventScript_16836D compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_16837C + call_if eq, EventScript_16837C compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_16838B + call_if eq, EventScript_16838B msgbox gUnknown_8188974 closemessage delay 10 playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16839A + call_if eq, EventScript_16839A compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16839A + call_if eq, EventScript_16839A compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1683A5 + call_if eq, EventScript_1683A5 fadedefaultbgm removeobject 1 - setvar VAR_0x4054, 2 + setvar VAR_MAP_SCENE_ROUTE22, 2 releaseall end @@ -73,15 +73,15 @@ EventScript_16835B:: @ 816835B return EventScript_16836D:: @ 816836D - trainerbattle 9, 329, 0, Text_188959, Text_18DE1A + trainerbattle 9, TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A return EventScript_16837C:: @ 816837C - trainerbattle 9, 330, 0, Text_188959, Text_18DE1A + trainerbattle 9, TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A return EventScript_16838B:: @ 816838B - trainerbattle 9, 331, 0, Text_188959, Text_18DE1A + trainerbattle 9, TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A return EventScript_16839A:: @ 816839A @@ -198,19 +198,19 @@ EventScript_16841F:: @ 816841F playbgm MUS_RIVAL1, 0 addobject 1 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16849C + call_if eq, EventScript_16849C compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16849C + call_if eq, EventScript_16849C compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1684A7 + call_if eq, EventScript_1684A7 msgbox gUnknown_8188A3C setvar VAR_LAST_TALKED, 1 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_1684B9 + call_if eq, EventScript_1684B9 compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_1684C4 + call_if eq, EventScript_1684C4 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_1684CF + call_if eq, EventScript_1684CF msgbox gUnknown_8188B29 closemessage delay 10 @@ -219,7 +219,7 @@ EventScript_16841F:: @ 816841F waitmovement 0 fadedefaultbgm removeobject 1 - setvar VAR_0x4054, 4 + setvar VAR_MAP_SCENE_ROUTE22, 4 releaseall end @@ -235,15 +235,15 @@ EventScript_1684A7:: @ 81684A7 return EventScript_1684B9:: @ 81684B9 - trainerbattle 3, 435, 0, Text_188B08 + trainerbattle 3, TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, 0, Text_188B08 return EventScript_1684C4:: @ 81684C4 - trainerbattle 3, 436, 0, Text_188B08 + trainerbattle 3, TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, 0, Text_188B08 return EventScript_1684CF:: @ 81684CF - trainerbattle 3, 437, 0, Text_188B08 + trainerbattle 3, TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, 0, Text_188B08 return Movement_1684DA:: @ 81684DA diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index f1f379416..1a034d844 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 8, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "x": 7, "y": 2, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 0, "script": "Route22_NorthEntrance_EventScript_17050D" } diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 0daa60650..f9d0f142e 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 15, "y": 149, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 8, "y": 140, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 14, "y": 123, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 16, "y": 112, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 10, "y": 94, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 14, "y": 61, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 6, "y": 35, "elevation": 3, @@ -152,7 +152,7 @@ "x": 13, "y": 149, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 1, "script": "Route23_EventScript_168583" }, @@ -161,7 +161,7 @@ "x": 7, "y": 140, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 2, "script": "Route23_EventScript_168598" }, @@ -170,7 +170,7 @@ "x": 12, "y": 123, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 3, "script": "Route23_EventScript_1685AD" }, @@ -179,7 +179,7 @@ "x": 11, "y": 111, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -188,7 +188,7 @@ "x": 9, "y": 94, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 5, "script": "Route23_EventScript_1685D7" }, @@ -197,7 +197,7 @@ "x": 12, "y": 61, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 6, "script": "Route23_EventScript_1685EC" }, @@ -206,7 +206,7 @@ "x": 1, "y": 35, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 7, "script": "Route23_EventScript_168601" }, @@ -215,7 +215,7 @@ "x": 1, "y": 34, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 7, "script": "Route23_EventScript_168601" }, @@ -224,7 +224,7 @@ "x": 1, "y": 32, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 7, "script": "Route23_EventScript_168601" }, @@ -233,7 +233,7 @@ "x": 1, "y": 33, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 7, "script": "Route23_EventScript_168601" }, @@ -242,7 +242,7 @@ "x": 1, "y": 31, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 7, "script": "Route23_EventScript_168601" }, @@ -251,7 +251,7 @@ "x": 1, "y": 36, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 7, "script": "Route23_EventScript_168601" }, @@ -260,7 +260,7 @@ "x": 5, "y": 35, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 7, "script": "Route23_EventScript_168601" }, @@ -269,7 +269,7 @@ "x": 4, "y": 35, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 7, "script": "Route23_EventScript_168601" }, @@ -278,7 +278,7 @@ "x": 10, "y": 60, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 6, "script": "Route23_EventScript_1685EC" }, @@ -287,7 +287,7 @@ "x": 13, "y": 61, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 6, "script": "Route23_EventScript_1685EC" }, @@ -296,7 +296,7 @@ "x": 11, "y": 60, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 6, "script": "Route23_EventScript_1685EC" }, @@ -305,7 +305,7 @@ "x": 8, "y": 94, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 5, "script": "Route23_EventScript_1685D7" }, @@ -314,7 +314,7 @@ "x": 5, "y": 92, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 5, "script": "Route23_EventScript_1685D7" }, @@ -323,7 +323,7 @@ "x": 7, "y": 94, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 5, "script": "Route23_EventScript_1685D7" }, @@ -332,7 +332,7 @@ "x": 4, "y": 92, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 5, "script": "Route23_EventScript_1685D7" }, @@ -341,7 +341,7 @@ "x": 3, "y": 92, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 5, "script": "Route23_EventScript_1685D7" }, @@ -350,7 +350,7 @@ "x": 2, "y": 92, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 5, "script": "Route23_EventScript_1685D7" }, @@ -359,7 +359,7 @@ "x": 4, "y": 139, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 2, "script": "Route23_EventScript_168598" }, @@ -368,7 +368,7 @@ "x": 5, "y": 139, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 2, "script": "Route23_EventScript_168598" }, @@ -377,7 +377,7 @@ "x": 6, "y": 140, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 2, "script": "Route23_EventScript_168598" }, @@ -386,7 +386,7 @@ "x": 10, "y": 122, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 3, "script": "Route23_EventScript_1685AD" }, @@ -395,7 +395,7 @@ "x": 11, "y": 122, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 3, "script": "Route23_EventScript_1685AD" }, @@ -404,7 +404,7 @@ "x": 13, "y": 123, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 3, "script": "Route23_EventScript_1685AD" }, @@ -413,7 +413,7 @@ "x": 8, "y": 109, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -422,7 +422,7 @@ "x": 9, "y": 109, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -431,7 +431,7 @@ "x": 10, "y": 109, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -440,7 +440,7 @@ "x": 11, "y": 109, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -449,7 +449,7 @@ "x": 12, "y": 109, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -458,7 +458,7 @@ "x": 12, "y": 111, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -467,7 +467,7 @@ "x": 14, "y": 112, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -476,7 +476,7 @@ "x": 13, "y": 112, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -485,7 +485,7 @@ "x": 15, "y": 112, "elevation": 1, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 4, "script": "Route23_EventScript_1685C2" }, @@ -494,7 +494,7 @@ "x": 12, "y": 148, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 1, "script": "Route23_EventScript_168583" }, @@ -503,7 +503,7 @@ "x": 11, "y": 148, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 1, "script": "Route23_EventScript_168583" }, @@ -512,7 +512,7 @@ "x": 14, "y": 149, "elevation": 3, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 1, "script": "Route23_EventScript_168583" }, @@ -521,7 +521,7 @@ "x": 10, "y": 148, "elevation": 0, - "var": "VAR_0x405F", + "var": "VAR_MAP_SCENE_ROUTE23", "var_value": 1, "script": "Route23_EventScript_168583" } @@ -533,17 +533,19 @@ "y": 42, "elevation": 0, "item": "ITEM_FULL_RESTORE", - "flag": "34", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE23_FULL_RESTORE", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", "x": 20, "y": 72, "elevation": 0, - "item": "POCKET_KEY_ITEMS", - "flag": "35", - "unknown": 1 + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_ROUTE23_ULTRA_BALL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -551,8 +553,9 @@ "y": 101, "elevation": 3, "item": "ITEM_MAX_ETHER", - "flag": "36", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE23_MAX_ETHER", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -560,8 +563,9 @@ "y": 18, "elevation": 3, "item": "ITEM_LUM_BERRY", - "flag": "145", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE23_LUM_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -569,8 +573,9 @@ "y": 29, "elevation": 3, "item": "ITEM_SITRUS_BERRY", - "flag": "146", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE23_SITRUS_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -578,8 +583,9 @@ "y": 67, "elevation": 3, "item": "ITEM_ASPEAR_BERRY", - "flag": "147", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE23_ASPEAR_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -587,8 +593,9 @@ "y": 128, "elevation": 3, "item": "ITEM_LEPPA_BERRY", - "flag": "148", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE23_LEPPA_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -596,8 +603,9 @@ "y": 8, "elevation": 3, "item": "ITEM_MAX_ELIXIR", - "flag": "155", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE23_MAX_ELIXIR", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc index f5c504650..ed827114c 100644 --- a/data/maps/Route23/scripts.inc +++ b/data/maps/Route23/scripts.inc @@ -3,12 +3,12 @@ Route23_MapScripts:: @ 81684EB .byte 0 Route23_MapScript1_1684F1:: @ 81684F1 - clearflag FLAG_0x059 - setflag FLAG_0x058 - setvar VAR_0x4064, 0 - setvar VAR_0x4065, 0 - setvar VAR_0x4066, 0 - setvar VAR_0x4067, 0 + clearflag FLAG_HIDE_VICTORY_ROAD_3F_BOULDER + setflag FLAG_HIDE_VICTORY_ROAD_2F_BOULDER + setvar VAR_MAP_SCENE_VICTORY_ROAD_1F, 0 + setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 0 + setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 0 + setvar VAR_MAP_SCENE_VICTORY_ROAD_3F, 0 end Route23_EventScript_16850C:: @ 816850C diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 93dd519c1..9fe5db518 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 12, "y": 15, "elevation": 3, @@ -35,10 +35,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route24_EventScript_168620", - "flag": "49" + "flag": "FLAG_HIDE_NUGGET_BRIDGE_ROCKET" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 12, "y": 19, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 10, "y": 22, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 12, "y": 25, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 10, "y": 28, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 12, "y": 31, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 5, "y": 21, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 4, "elevation": 3, @@ -126,7 +126,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route24_EventScript_1BE644", - "flag": "354" + "flag": "FLAG_HIDE_ROUTE24_TM45" } ], "warp_events": [], @@ -136,7 +136,7 @@ "x": 10, "y": 15, "elevation": 3, - "var": "VAR_0x406B", + "var": "VAR_MAP_SCENE_ROUTE24", "var_value": 0, "script": "Route24_EventScript_168660" }, @@ -145,7 +145,7 @@ "x": 11, "y": 15, "elevation": 3, - "var": "VAR_0x406B", + "var": "VAR_MAP_SCENE_ROUTE24", "var_value": 0, "script": "Route24_EventScript_16866C" } @@ -157,8 +157,9 @@ "y": 4, "elevation": 3, "item": "ITEM_PECHA_BERRY", - "flag": "115", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE24_PECHA_BERRY", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index dede3df50..175cc7210 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -4,12 +4,12 @@ Route24_MapScripts:: @ 816861F Route24_EventScript_168620:: @ 8168620 lock faceplayer - compare_var_to_value VAR_0x406B, 1 - goto_if_eq EventScript_168656 + compare_var_to_value VAR_MAP_SCENE_ROUTE24, 1 + goto_if eq, EventScript_168656 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16864C + goto_if eq, EventScript_16864C call EventScript_1686B9 release end @@ -39,15 +39,15 @@ Route24_EventScript_16866C:: @ 816866C EventScript_168678:: @ 8168678 textcolor 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1686FD + call_if eq, EventScript_1686FD compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_168708 + call_if eq, EventScript_168708 applymovement 255, Movement_1A75EB waitmovement 0 msgbox gUnknown_8188C3C checkitemspace ITEM_NUGGET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_168713 + goto_if eq, EventScript_168713 call EventScript_1686B9 releaseall end @@ -60,9 +60,9 @@ EventScript_1686B9:: @ 81686B9 playbgm MUS_ROCKET, 0 waitbuttonpress setvar VAR_LAST_TALKED, 1 - trainerbattle 3, 356, 0, Text_188DDC + trainerbattle 3, TRAINER_TEAM_ROCKET_GRUNT_6, 0, Text_188DDC msgbox gUnknown_8188DF1 - setvar VAR_0x406B, 1 + setvar VAR_MAP_SCENE_ROUTE24, 1 return EventScript_1686FD:: @ 81686FD @@ -81,7 +81,7 @@ EventScript_168713:: @ 8168713 applymovement 255, Movement_168743 waitmovement 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_168733 + call_if eq, EventScript_168733 release end diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index 9e10ec246..a17f32488 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 11, "y": 4, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 18, "y": 2, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 17, "y": 7, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 22, "y": 4, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 22, "y": 8, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 27, "y": 9, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 28, "y": 4, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 36, "y": 4, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 42, "y": 5, "elevation": 3, @@ -137,7 +137,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 26, "y": 2, "elevation": 3, @@ -147,10 +147,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route25_EventScript_1BE651", - "flag": "355" + "flag": "FLAG_HIDE_ROUTE25_TM43" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 30, "y": 3, "elevation": 3, @@ -159,11 +159,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route25_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 49, "y": 10, "elevation": 3, @@ -176,7 +176,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 49, "y": 11, "elevation": 3, @@ -213,8 +213,9 @@ "y": 2, "elevation": 3, "item": "ITEM_ELIXIR", - "flag": "4", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE25_ELIXIR", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -222,8 +223,9 @@ "y": 6, "elevation": 3, "item": "ITEM_ETHER", - "flag": "5", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE25_ETHER", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -231,8 +233,9 @@ "y": 8, "elevation": 3, "item": "ITEM_ORAN_BERRY", - "flag": "116", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE25_ORAN_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -240,8 +243,9 @@ "y": 3, "elevation": 3, "item": "ITEM_BLUK_BERRY", - "flag": "117", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE25_BLUK_BERRY", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index ec9a5c284..ac63be354 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "73", + "graphics_id": "MAP_OBJ_GFX_BILL", "x": 7, "y": 5, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route25_SeaCottage_EventScript_17054B", - "flag": "51" + "flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE" }, { - "graphics_id": "113", + "graphics_id": "MAP_OBJ_GFX_CLEFAIRY", "x": 10, "y": 6, "elevation": 3, @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route25_SeaCottage_EventScript_17054B", - "flag": "50" + "flag": "FLAG_HIDE_BILL_CLEFAIRY" } ], "warp_events": [ diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index d613b42a5..b3c8e79ed 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -3,35 +3,35 @@ Route25_SeaCottage_MapScripts:: @ 8170523 .byte 0 Route25_SeaCottage_MapScript1_170529:: @ 8170529 - checkflag FLAG_0x233 - call_if 0, EventScript_17053C - checkflag FLAG_0x234 - call_if 1, EventScript_170547 + checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE + call_if FALSE, EventScript_17053C + checkflag FLAG_GOT_SS_TICKET + call_if TRUE, EventScript_170547 end EventScript_17053C:: @ 817053C - clearflag FLAG_0x032 + clearflag FLAG_HIDE_BILL_CLEFAIRY setobjectxyperm 1, 3, 3 return EventScript_170547:: @ 8170547 - setflag FLAG_0x003 + setflag FLAG_TEMP_3 return Route25_SeaCottage_EventScript_17054B:: @ 817054B lock faceplayer - checkflag FLAG_0x003 - goto_if_eq EventScript_1706C8 - checkflag FLAG_0x234 - goto_if_eq EventScript_170640 - checkflag FLAG_0x233 - goto_if_eq EventScript_17064A + checkflag FLAG_TEMP_3 + goto_if TRUE, EventScript_1706C8 + checkflag FLAG_GOT_SS_TICKET + goto_if TRUE, EventScript_170640 + checkflag FLAG_HELPED_BILL_IN_SEA_COTTAGE + goto_if TRUE, EventScript_17064A checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_170580 + goto_if eq, EventScript_170580 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_17058E + goto_if eq, EventScript_17058E end EventScript_170580:: @ 8170580 @@ -46,18 +46,18 @@ EventScript_17058E:: @ 817058E EventScript_17059C:: @ 817059C compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_170600 + call_if eq, EventScript_170600 msgbox gUnknown_819FFD3 closemessage delay 10 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_17062A + call_if eq, EventScript_17062A compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_170635 + call_if eq, EventScript_170635 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_170635 + call_if eq, EventScript_170635 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_170635 + call_if eq, EventScript_170635 opendoor 10, 3 waitdooranim applymovement 2, Movement_1706DB @@ -66,16 +66,16 @@ EventScript_17059C:: @ 817059C playse SE_C_MAKU_D closedoor 10, 3 waitdooranim - setflag FLAG_0x002 + setflag FLAG_TEMP_2 release end EventScript_170600:: @ 8170600 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_170618 + call_if eq, EventScript_170618 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_170621 + call_if eq, EventScript_170621 return EventScript_170618:: @ 8170618 @@ -102,22 +102,20 @@ EventScript_170640:: @ 8170640 end EventScript_17064A:: @ 817064A - setvar VAR_0x8004, 13 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 + famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_1706AC + call_if eq, EventScript_1706AC compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_1706B5 + call_if eq, EventScript_1706B5 checkitemspace ITEM_SS_TICKET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1706BE + goto_if eq, EventScript_1706BE additem ITEM_SS_TICKET, 1 giveitemfanfaremsg gUnknown_81A028E, ITEM_SS_TICKET, 1, MUS_FAN5 - setflag FLAG_0x235 - setflag FLAG_0x031 - setflag FLAG_0x234 + setflag FLAG_GOT_SS_TICKET_DUP + setflag FLAG_HIDE_NUGGET_BRIDGE_ROCKET + setflag FLAG_GOT_SS_TICKET setflag FLAG_SYS_NOT_SOMEONES_PC goto EventScript_170640 end @@ -159,10 +157,10 @@ Movement_1706DB:: @ 81706DB Route25_SeaCottage_EventScript_1706DD:: @ 81706DD lockall - checkflag FLAG_0x003 - goto_if_eq EventScript_1707CA - checkflag FLAG_0x002 - goto_if_eq EventScript_1706FA + checkflag FLAG_TEMP_3 + goto_if TRUE, EventScript_1707CA + checkflag FLAG_TEMP_2 + goto_if TRUE, EventScript_1706FA msgbox gUnknown_81A0402 releaseall end @@ -171,9 +169,9 @@ EventScript_1706FA:: @ 81706FA fadeoutbgm 0 msgbox gUnknown_81A042D closemessage - clearflag FLAG_0x002 - setflag FLAG_0x233 - special SpawnScriptFieldObject + clearflag FLAG_TEMP_2 + setflag FLAG_HELPED_BILL_IN_SEA_COTTAGE + special SpawnCameraObject applymovement 127, Movement_1707BE waitmovement 0 delay 35 @@ -203,7 +201,7 @@ EventScript_1706FA:: @ 81706FA waitdooranim fadeinbgm 0 addobject 1 - clearflag FLAG_0x033 + clearflag FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE delay 50 playfanfare MUS_FANFA1 applymovement 1, Movement_170888 @@ -216,7 +214,7 @@ EventScript_1706FA:: @ 81706FA waitdooranim applymovement 1, Movement_170881 waitmovement 0 - special RemoveScriptFieldObject + special RemoveCameraObject releaseall end diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index de3df77b1..e895e6c89 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 4, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 10, "y": 3, "elevation": 3, diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index a1b2d0e7a..de3889bf4 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -5,24 +5,24 @@ Route2_EastBuilding_EventScript_16F67F:: @ 816F67F lock faceplayer call EventScript_16F70B - checkflag FLAG_0x23B - goto_if_eq EventScript_16F701 + checkflag FLAG_GOT_HM05 + goto_if TRUE, EventScript_16F701 msgbox gUnknown_819D64F, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AD1 + goto_if eq, EventScript_1A7AD1 setvar VAR_0x8004, 0 specialvar VAR_RESULT, Special_GetPokedexCount getnumberstring 2, VAR_0x8006 call EventScript_16F70B compare_var_to_value VAR_0x8006, 10 - goto_if 0, EventScript_1A7ABD + goto_if lt, EventScript_1A7ABD msgbox gUnknown_819D74E checkitemspace ITEM_HM05, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A7AC7 + goto_if eq, EventScript_1A7AC7 additem ITEM_HM05, 1 giveitemfanfaremsg gUnknown_819D7A1, ITEM_HM05 - setflag FLAG_0x23B + setflag FLAG_GOT_HM05 msgbox gUnknown_819D7C1 release end diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index 639be8eb0..9833021a2 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 4, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "51", + "graphics_id": "MAP_OBJ_GFX_GBA_KID", "x": 7, "y": 2, "elevation": 3, diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index fd7ac6c05..62367586d 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -10,20 +10,20 @@ Route2_House_EventScript_16F602:: @ 816F602 faceplayer setvar VAR_0x8008, 0 call EventScript_1A8CAD - checkflag FLAG_0x248 - goto_if_eq EventScript_16F674 + checkflag FLAG_DID_MIMIEN_TRADE + goto_if TRUE, EventScript_16F674 msgbox gUnknown_81A597B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F65C + goto_if eq, EventScript_16F65C call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16F65C + goto_if ge, EventScript_16F65C call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16F666 + goto_if ne, EventScript_16F666 call EventScript_1A8CD9 msgbox gUnknown_81A59DA - setflag FLAG_0x248 + setflag FLAG_DID_MIMIEN_TRADE release end diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index fab8a8b03..1ee618faa 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 5, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 4, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 10, "y": 5, "elevation": 3, diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 3f4e03f3e..808232f30 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 10, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 4, "y": 7, "elevation": 3, diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index de3d20cc8..837e483b8 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 70, "y": 13, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 40, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 32, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 30, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 25, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 29, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 19, "y": 9, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 12, "y": 6, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 17, "y": 4, "elevation": 3, @@ -158,8 +158,9 @@ "y": 9, "elevation": 3, "item": "ITEM_ORAN_BERRY", - "flag": "113", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE3_ORAN_BERRY", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 7f4958b26..dc2f902d7 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 9, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 75, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 67, "y": 5, "elevation": 3, @@ -61,10 +61,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route4_EventScript_1BE637", - "flag": "353" + "flag": "FLAG_HIDE_ROUTE4_TM05" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 15, "y": 14, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 47, "y": 3, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 50, "y": 3, "elevation": 3, @@ -160,9 +160,10 @@ "x": 43, "y": 2, "elevation": 3, - "item": "POCKET_POKE_BALLS", - "flag": "50", - "unknown": 1 + "item": "ITEM_GREAT_BALL", + "flag": "HIDDEN_ITEM_ROUTE4_GREAT_BALL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -170,8 +171,9 @@ "y": 4, "elevation": 3, "item": "ITEM_PERSIM_BERRY", - "flag": "114", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE4_PERSIM_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -179,8 +181,9 @@ "y": 17, "elevation": 3, "item": "ITEM_RAZZ_BERRY", - "flag": "156", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE4_RAZZ_BERRY", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index f3401744c..936900208 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 1, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 5, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 14, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "105", + "graphics_id": "MAP_OBJ_GFX_CLIPBOARD", "x": 12, "y": 6, "elevation": 0, diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 6788cc0c8..e1a823cb5 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -21,14 +21,14 @@ Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F lock faceplayer - checkflag FLAG_0x249 - goto_if_eq EventScript_16F8A2 + checkflag FLAG_BOUGHT_MAGIKARP + goto_if TRUE, EventScript_16F8A2 showmoneybox 0, 0, 0 checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F786 + goto_if eq, EventScript_16F786 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F794 + goto_if eq, EventScript_16F794 end EventScript_16F786:: @ 816F786 @@ -43,26 +43,26 @@ EventScript_16F794:: @ 816F794 EventScript_16F7A2:: @ 816F7A2 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F888 + goto_if eq, EventScript_16F888 checkmoney 500, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F895 + goto_if eq, EventScript_16F895 textcolor 3 setvar VAR_0x4001, 129 givemon SPECIES_MAGIKARP, 5, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F7F6 + goto_if eq, EventScript_16F7F6 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F822 + goto_if eq, EventScript_16F822 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_16F8AC + goto_if eq, EventScript_16F8AC end EventScript_16F7F6:: @ 816F7F6 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F861 + goto_if eq, EventScript_16F861 call EventScript_1A8C27 fadescreen 1 hidemoneybox @@ -77,7 +77,7 @@ EventScript_16F822:: @ 816F822 call EventScript_16F86F msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F84B + goto_if eq, EventScript_16F84B fadescreen 1 hidemoneybox .byte 0 @@ -107,7 +107,7 @@ EventScript_16F861:: @ 816F861 end EventScript_16F86A:: @ 816F86A - setflag FLAG_0x249 + setflag FLAG_BOUGHT_MAGIKARP release end diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index c6f93c618..a4189df66 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route4_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index ca5aec3d2..efa1789d8 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index d4b2409d3..7cf88dbcb 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 1, "y": 5, "elevation": 3, @@ -63,7 +63,7 @@ "x": 3, "y": 5, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route5_SouthEntrance_EventScript_16F90A" }, @@ -72,7 +72,7 @@ "x": 4, "y": 5, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route5_SouthEntrance_EventScript_16F916" }, @@ -81,7 +81,7 @@ "x": 5, "y": 5, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route5_SouthEntrance_EventScript_16F922" } diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index 1ac21c6b1..fd8a5f6fc 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -27,8 +27,8 @@ EventScript_16F92E:: @ 816F92E textcolor 0 applymovement 255, Movement_1A75E7 waitmovement 0 - checkflag FLAG_0x2A6 - goto_if_eq EventScript_16F958 + checkflag FLAG_GOT_TEA + goto_if TRUE, EventScript_16F958 msgbox gUnknown_819E04B closemessage applymovement 255, Movement_16F9C4 @@ -45,13 +45,13 @@ EventScript_16F963:: @ 816F963 msgbox gUnknown_819E09B closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16F99C + call_if eq, EventScript_16F99C compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16F9A7 + call_if eq, EventScript_16F9A7 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16F9B2 + call_if eq, EventScript_16F9B2 msgbox gUnknown_819E0C1 - setvar VAR_0x4062, 1 + setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 24a67ce53..b5f66bf88 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 3, "y": 16, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 12, "y": 21, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 13, "y": 21, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 20, "y": 25, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 13, "y": 32, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 13, "y": 33, "elevation": 3, @@ -141,8 +141,9 @@ "y": 5, "elevation": 3, "item": "ITEM_SITRUS_BERRY", - "flag": "118", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE6_SITRUS_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -150,8 +151,9 @@ "y": 5, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "119", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE6_RARE_CANDY", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index efa911ca9..f354d825c 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 7, "y": 5, "elevation": 3, @@ -63,7 +63,7 @@ "x": 3, "y": 5, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route6_NorthEntrance_EventScript_16F9D0" }, @@ -72,7 +72,7 @@ "x": 4, "y": 5, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route6_NorthEntrance_EventScript_16F9DC" }, @@ -81,7 +81,7 @@ "x": 5, "y": 5, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route6_NorthEntrance_EventScript_16F9E8" } diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 9537d2e82..6edd20f21 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -27,8 +27,8 @@ EventScript_16F9F4:: @ 816F9F4 textcolor 0 applymovement 255, Movement_1A75EB waitmovement 0 - checkflag FLAG_0x2A6 - goto_if_eq EventScript_16FA1E + checkflag FLAG_GOT_TEA + goto_if TRUE, EventScript_16FA1E msgbox gUnknown_819E181 closemessage applymovement 255, Movement_16FA8A @@ -45,13 +45,13 @@ EventScript_16FA29:: @ 816FA29 msgbox gUnknown_819E1D1 closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16FA62 + call_if eq, EventScript_16FA62 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16FA6D + call_if eq, EventScript_16FA6D compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16FA78 + call_if eq, EventScript_16FA78 msgbox gUnknown_819E1F7 - setvar VAR_0x4062, 1 + setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 72556b9fd..76d9ab07c 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -69,8 +69,9 @@ "y": 15, "elevation": 3, "item": "ITEM_WEPEAR_BERRY", - "flag": "152", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE7_WEPEAR_BERRY", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index 1609edf7d..baf05fc78 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "x": 6, "y": 4, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route7_EastEntrance_EventScript_16FA97" }, @@ -72,7 +72,7 @@ "x": 6, "y": 5, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route7_EastEntrance_EventScript_16FAA3" }, @@ -81,7 +81,7 @@ "x": 6, "y": 6, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route7_EastEntrance_EventScript_16FAAF" } diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index 845eab835..f8885b53d 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -27,8 +27,8 @@ EventScript_16FABB:: @ 816FABB textcolor 0 applymovement 255, Movement_1A75E9 waitmovement 0 - checkflag FLAG_0x2A6 - goto_if_eq EventScript_16FAE5 + checkflag FLAG_GOT_TEA + goto_if TRUE, EventScript_16FAE5 msgbox gUnknown_819E2B7 closemessage applymovement 255, Movement_16FB51 @@ -45,13 +45,13 @@ EventScript_16FAF0:: @ 816FAF0 msgbox gUnknown_819E307 closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16FB29 + call_if eq, EventScript_16FB29 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16FB34 + call_if eq, EventScript_16FB34 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16FB3F + call_if eq, EventScript_16FB3F msgbox gUnknown_819E32D - setvar VAR_0x4062, 1 + setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 45b8cbec0..9a15eca59 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 62, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 55, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 51, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 29, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 29, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 29, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 29, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 21, "y": 3, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 9, "y": 6, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 33, "y": 15, "elevation": 3, @@ -151,11 +151,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route8_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 47, "y": 12, "elevation": 3, @@ -164,11 +164,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route8_EventScript_1BDF13", - "flag": "19" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 40, "y": 3, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 41, "y": 3, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 14, "y": 16, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 24, "y": 17, "elevation": 3, @@ -251,8 +251,9 @@ "y": 10, "elevation": 3, "item": "ITEM_RAWST_BERRY", - "flag": "127", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE8_RAWST_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -260,8 +261,9 @@ "y": 11, "elevation": 3, "item": "ITEM_LUM_BERRY", - "flag": "128", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE8_LUM_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -269,8 +271,9 @@ "y": 15, "elevation": 3, "item": "ITEM_LEPPA_BERRY", - "flag": "129", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE8_LEPPA_BERRY", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index 2ad2abb9b..9a8bd58ba 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "60", + "graphics_id": "MAP_OBJ_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "x": 6, "y": 4, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route8_WestEntrance_EventScript_16FB5D" }, @@ -72,7 +72,7 @@ "x": 6, "y": 5, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route8_WestEntrance_EventScript_16FB69" }, @@ -81,7 +81,7 @@ "x": 6, "y": 6, "elevation": 3, - "var": "VAR_0x4062", + "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES", "var_value": 0, "script": "Route8_WestEntrance_EventScript_16FB75" } diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index 1d347d2d0..dfdb0b7ae 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -27,8 +27,8 @@ EventScript_16FB81:: @ 816FB81 textcolor 0 applymovement 255, Movement_1A75E9 waitmovement 0 - checkflag FLAG_0x2A6 - goto_if_eq EventScript_16FBAB + checkflag FLAG_GOT_TEA + goto_if TRUE, EventScript_16FBAB msgbox gUnknown_819E3ED closemessage applymovement 255, Movement_16FC2D @@ -55,13 +55,13 @@ EventScript_16FBCC:: @ 816FBCC msgbox gUnknown_819E43D closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_16FC05 + call_if eq, EventScript_16FC05 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_16FC10 + call_if eq, EventScript_16FC10 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16FC1B + call_if eq, EventScript_16FC1B msgbox gUnknown_819E463 - setvar VAR_0x4062, 1 + setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1 releaseall end diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index fa56d8ed2..e6fff0498 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 14, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 20, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 61, "y": 16, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 26, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 26, "y": 1, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 49, "y": 7, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 53, "y": 2, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 60, "y": 9, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 36, "y": 6, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 2, "y": 8, "elevation": 3, @@ -151,11 +151,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route9_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 17, "elevation": 3, @@ -165,10 +165,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route9_EventScript_1BE6B9", - "flag": "363" + "flag": "FLAG_HIDE_ROUTE9_TM40" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 65, "y": 17, "elevation": 3, @@ -178,7 +178,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "Route9_EventScript_1BEAFD", - "flag": "450" + "flag": "FLAG_HIDE_ROUTE9_BURN_HEAL" } ], "warp_events": [], @@ -197,8 +197,9 @@ "y": 7, "elevation": 0, "item": "ITEM_ETHER", - "flag": "6", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE9_ETHER", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -206,8 +207,9 @@ "y": 2, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "123", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE9_RARE_CANDY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -215,8 +217,9 @@ "y": 2, "elevation": 3, "item": "ITEM_CHESTO_BERRY", - "flag": "150", - "unknown": 1 + "flag": "HIDDEN_ITEM_ROUTE9_CHESTO_BERRY", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index b2ceb6810..fff50854a 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 18, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 12, "y": 9, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index 104a568ab..784405a63 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 2, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index fcc3d6bf0..1895ff07a 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 5, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 0, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 2, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 7, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SSAnne_1F_Room2_EventScript_1BE65E", - "flag": "356" + "flag": "FLAG_HIDE_SSANNE_1F_ROOM2_TM31" } ], "warp_events": [ diff --git a/data/maps/SSAnne_1F_Room2/scripts.inc b/data/maps/SSAnne_1F_Room2/scripts.inc index 4f1ef996b..9e37f8eb8 100644 --- a/data/maps/SSAnne_1F_Room2/scripts.inc +++ b/data/maps/SSAnne_1F_Room2/scripts.inc @@ -6,11 +6,11 @@ SSAnne_1F_Room2_EventScript_160BE6:: @ 8160BE6 end SSAnne_1F_Room2_EventScript_160BEF:: @ 8160BEF - trainerbattle 0, 126, 0, Text_173A1A, Text_173A4F + trainerbattle 0, TRAINER_LASS_ANN, 0, Text_173A1A, Text_173A4F msgbox gUnknown_8173A7A, 6 end SSAnne_1F_Room2_EventScript_160C06:: @ 8160C06 - trainerbattle 0, 96, 0, Text_173999, Text_1739B1 + trainerbattle 0, TRAINER_YOUNGSTER_TYLER, 0, Text_173999, Text_1739B1 msgbox gUnknown_81739C5, 6 end diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index 615f4c9b1..da0466b37 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 3, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "131", + "graphics_id": "MAP_OBJ_GFX_WIGGLYTUFF", "x": 4, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 0, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index c12b81c2d..4f8d00d91 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room4/scripts.inc b/data/maps/SSAnne_1F_Room4/scripts.inc index aa243949e..2bede7e12 100644 --- a/data/maps/SSAnne_1F_Room4/scripts.inc +++ b/data/maps/SSAnne_1F_Room4/scripts.inc @@ -6,7 +6,7 @@ SSAnne_1F_Room4_EventScript_160C44:: @ 8160C44 faceplayer checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_160C5C + goto_if eq, EventScript_160C5C msgbox gUnknown_8173BA4 release end diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index 6e86a11e8..bd987f990 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room5/scripts.inc b/data/maps/SSAnne_1F_Room5/scripts.inc index 553a72b52..3d42c7860 100644 --- a/data/maps/SSAnne_1F_Room5/scripts.inc +++ b/data/maps/SSAnne_1F_Room5/scripts.inc @@ -2,6 +2,6 @@ SSAnne_1F_Room5_MapScripts:: @ 8160C66 .byte 0 SSAnne_1F_Room5_EventScript_160C67:: @ 8160C67 - trainerbattle 0, 422, 0, Text_173BD1, Text_173BFA + trainerbattle 0, TRAINER_GENTLEMAN_ARTHUR, 0, Text_173BD1, Text_173BFA msgbox gUnknown_8173C30, 6 end diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index c8e98e62a..8eca10460 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 3, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc index 1c6c0004c..755c01a91 100644 --- a/data/maps/SSAnne_1F_Room6/scripts.inc +++ b/data/maps/SSAnne_1F_Room6/scripts.inc @@ -6,9 +6,9 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 faceplayer msgbox gUnknown_817445B, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_160E18 + goto_if eq, EventScript_160E18 closemessage - call EventScript_1A6C26 + call EventScript_FadeOut_Heal_FadeIn msgbox gUnknown_8174490 release end @@ -16,7 +16,7 @@ SSAnne_1F_Room6_EventScript_160DF3:: @ 8160DF3 EventScript_160E18:: @ 8160E18 checkplayergender compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_160E2E + goto_if eq, EventScript_160E2E msgbox gUnknown_8174515 release end diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index aa2732f36..b93710fe4 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 4, "y": 3, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room7/scripts.inc b/data/maps/SSAnne_1F_Room7/scripts.inc index bc6e0cd88..560764b08 100644 --- a/data/maps/SSAnne_1F_Room7/scripts.inc +++ b/data/maps/SSAnne_1F_Room7/scripts.inc @@ -2,6 +2,6 @@ SSAnne_1F_Room7_MapScripts:: @ 8160C7E .byte 0 SSAnne_1F_Room7_EventScript_160C7F:: @ 8160C7F - trainerbattle 0, 421, 0, Text_173C52, Text_173CB4 + trainerbattle 0, TRAINER_GENTLEMAN_THOMAS, 0, Text_173C52, Text_173CB4 msgbox gUnknown_8173CC4, 6 end diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index 80641f2ed..b45106629 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 30, "y": 2, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "61" + "flag": "FLAG_HIDE_SS_ANNE_RIVAL" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 2, "y": 7, "elevation": 3, @@ -111,7 +111,7 @@ "x": 30, "y": 6, "elevation": 3, - "var": "VAR_0x405B", + "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR", "var_value": 0, "script": "SSAnne_2F_Corridor_EventScript_1608DF" }, @@ -120,7 +120,7 @@ "x": 31, "y": 6, "elevation": 3, - "var": "VAR_0x405B", + "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR", "var_value": 0, "script": "SSAnne_2F_Corridor_EventScript_1608EB" }, @@ -129,7 +129,7 @@ "x": 32, "y": 6, "elevation": 3, - "var": "VAR_0x405B", + "var": "VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR", "var_value": 0, "script": "SSAnne_2F_Corridor_EventScript_1608F7" } diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 12871cff0..22916f1be 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -36,32 +36,32 @@ EventScript_160903:: @ 8160903 waitmovement 0 delay 20 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1609AD + call_if eq, EventScript_1609AD compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_1609B8 + call_if eq, EventScript_1609B8 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_1609CA + call_if eq, EventScript_1609CA msgbox gUnknown_8173035 setvar VAR_LAST_TALKED, 1 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_1609DC + call_if eq, EventScript_1609DC compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_1609E7 + call_if eq, EventScript_1609E7 compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_1609F2 + call_if eq, EventScript_1609F2 msgbox gUnknown_8173164 closemessage delay 10 playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_1609FD + call_if eq, EventScript_1609FD compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_160A08 + call_if eq, EventScript_160A08 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_160A13 + call_if eq, EventScript_160A13 fadedefaultbgm removeobject 1 - setvar VAR_0x405B, 1 + setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 releaseall end @@ -83,15 +83,15 @@ EventScript_1609CA:: @ 81609CA return EventScript_1609DC:: @ 81609DC - trainerbattle 3, 426, 0, Text_173110 + trainerbattle 3, TRAINER_RIVAL_SS_ANNE_SQUIRTLE, 0, Text_173110 return EventScript_1609E7:: @ 81609E7 - trainerbattle 3, 427, 0, Text_173110 + trainerbattle 3, TRAINER_RIVAL_SS_ANNE_BULBASAUR, 0, Text_173110 return EventScript_1609F2:: @ 81609F2 - trainerbattle 3, 428, 0, Text_173110 + trainerbattle 3, TRAINER_RIVAL_SS_ANNE_CHARMANDER, 0, Text_173110 return EventScript_1609FD:: @ 81609FD diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index 6b7950e26..c590cad89 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 1, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index 66f6c2e97..124f37b4f 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 5, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 1, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 3, "y": 3, "elevation": 0, @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SSAnne_2F_Room2_EventScript_1BE66B", - "flag": "357" + "flag": "FLAG_HIDE_SSANNE_2F_ROOM2_STARDUST" } ], "warp_events": [ diff --git a/data/maps/SSAnne_2F_Room2/scripts.inc b/data/maps/SSAnne_2F_Room2/scripts.inc index cb18a010a..af5c392c2 100644 --- a/data/maps/SSAnne_2F_Room2/scripts.inc +++ b/data/maps/SSAnne_2F_Room2/scripts.inc @@ -2,11 +2,11 @@ SSAnne_2F_Room2_MapScripts:: @ 8160CB0 .byte 0 SSAnne_2F_Room2_EventScript_160CB1:: @ 8160CB1 - trainerbattle 0, 223, 0, Text_173DDB, Text_173DF7 + trainerbattle 0, TRAINER_FISHERMAN_DALE, 0, Text_173DDB, Text_173DF7 msgbox gUnknown_8173E04, 6 end SSAnne_2F_Room2_EventScript_160CC8:: @ 8160CC8 - trainerbattle 0, 482, 0, Text_173D63, Text_173D92 + trainerbattle 0, TRAINER_GENTLEMAN_BROOKS, 0, Text_173D63, Text_173D92 msgbox gUnknown_8173DB6, 6 end diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index ed032b4b3..cec02b750 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 2, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 3, "y": 2, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 5fee6f393..966b86cf6 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 0, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 3, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 4, "elevation": 3, @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SSAnne_2F_Room4_EventScript_1BE678", - "flag": "358" + "flag": "FLAG_HIDE_SSANNE_2F_ROOM4_X_ATTACK" } ], "warp_events": [ diff --git a/data/maps/SSAnne_2F_Room4/scripts.inc b/data/maps/SSAnne_2F_Room4/scripts.inc index 26efb8bd5..506059759 100644 --- a/data/maps/SSAnne_2F_Room4/scripts.inc +++ b/data/maps/SSAnne_2F_Room4/scripts.inc @@ -2,11 +2,11 @@ SSAnne_2F_Room4_MapScripts:: @ 8160CF2 .byte 0 SSAnne_2F_Room4_EventScript_160CF3:: @ 8160CF3 - trainerbattle 0, 483, 0, Text_173F07, Text_173F42 + trainerbattle 0, TRAINER_GENTLEMAN_LAMAR, 0, Text_173F07, Text_173F42 msgbox gUnknown_8173F55, 6 end SSAnne_2F_Room4_EventScript_160D0A:: @ 8160D0A - trainerbattle 0, 127, 0, Text_173F83, Text_173FAB + trainerbattle 0, TRAINER_LASS_DAWN, 0, Text_173F83, Text_173FAB msgbox gUnknown_8173FB9, 6 end diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index c9f3fe809..3759a810b 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 3, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index 4f92d7599..4583c0fcb 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 1, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index 3318b3553..654973f7d 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 10, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Corridor/map.json b/data/maps/SSAnne_B1F_Corridor/map.json index 1ac031188..c50752f50 100644 --- a/data/maps/SSAnne_B1F_Corridor/map.json +++ b/data/maps/SSAnne_B1F_Corridor/map.json @@ -65,8 +65,9 @@ "y": 5, "elevation": 3, "item": "ITEM_HYPER_POTION", - "flag": "8", - "unknown": 1 + "flag": "HIDDEN_ITEM_SSANNE_B1F_CORRIDOR_HYPER_POTION", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index 2db8e4478..4a7460d85 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 3, "y": 2, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room1/scripts.inc b/data/maps/SSAnne_B1F_Room1/scripts.inc index ec931102e..337066e8c 100644 --- a/data/maps/SSAnne_B1F_Room1/scripts.inc +++ b/data/maps/SSAnne_B1F_Room1/scripts.inc @@ -2,11 +2,11 @@ SSAnne_B1F_Room1_MapScripts:: @ 8160D47 .byte 0 SSAnne_B1F_Room1_EventScript_160D48:: @ 8160D48 - trainerbattle 0, 224, 0, Text_174177, Text_1741EF + trainerbattle 0, TRAINER_FISHERMAN_BARNY, 0, Text_174177, Text_1741EF msgbox gUnknown_817420E, 6 end SSAnne_B1F_Room1_EventScript_160D5F:: @ 8160D5F - trainerbattle 0, 140, 0, Text_1740F6, Text_174123 + trainerbattle 0, TRAINER_SAILOR_PHILLIP, 0, Text_1740F6, Text_174123 msgbox gUnknown_817413A, 6 end diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index 635c1aadc..c69229610 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 3, "y": 2, "elevation": 3, @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SSAnne_B1F_Room2_EventScript_1BE685", - "flag": "359" + "flag": "FLAG_HIDE_SSANNE_B1F_ROOM2_TM44" } ], "warp_events": [ diff --git a/data/maps/SSAnne_B1F_Room2/scripts.inc b/data/maps/SSAnne_B1F_Room2/scripts.inc index 71acf74be..04c9b1c33 100644 --- a/data/maps/SSAnne_B1F_Room2/scripts.inc +++ b/data/maps/SSAnne_B1F_Room2/scripts.inc @@ -2,6 +2,6 @@ SSAnne_B1F_Room2_MapScripts:: @ 8160D76 .byte 0 SSAnne_B1F_Room2_EventScript_160D77:: @ 8160D77 - trainerbattle 0, 138, 0, Text_174239, Text_17425C + trainerbattle 0, TRAINER_SAILOR_HUEY, 0, Text_174239, Text_17425C msgbox gUnknown_8174272, 6 end diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index caf5fb525..d4f6b9c97 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 4, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 1, "y": 5, "elevation": 3, @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SSAnne_B1F_Room3_EventScript_1BE692", - "flag": "360" + "flag": "FLAG_HIDE_SSANNE_B1F_ROOM3_ETHER" } ], "warp_events": [ diff --git a/data/maps/SSAnne_B1F_Room3/scripts.inc b/data/maps/SSAnne_B1F_Room3/scripts.inc index 3a1ff97c6..fcf19823a 100644 --- a/data/maps/SSAnne_B1F_Room3/scripts.inc +++ b/data/maps/SSAnne_B1F_Room3/scripts.inc @@ -2,6 +2,6 @@ SSAnne_B1F_Room3_MapScripts:: @ 8160D8E .byte 0 SSAnne_B1F_Room3_EventScript_160D8F:: @ 8160D8F - trainerbattle 0, 139, 0, Text_1742A6, Text_1742C3 + trainerbattle 0, TRAINER_SAILOR_DYLAN, 0, Text_1742A6, Text_1742C3 msgbox gUnknown_81742D2, 6 end diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index fbbf0545e..8fb8e9349 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 3, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room4/scripts.inc b/data/maps/SSAnne_B1F_Room4/scripts.inc index 02860ab54..8a6b8fa8c 100644 --- a/data/maps/SSAnne_B1F_Room4/scripts.inc +++ b/data/maps/SSAnne_B1F_Room4/scripts.inc @@ -2,11 +2,11 @@ SSAnne_B1F_Room4_MapScripts:: @ 8160DA6 .byte 0 SSAnne_B1F_Room4_EventScript_160DA7:: @ 8160DA7 - trainerbattle 0, 136, 0, Text_174315, Text_174348 + trainerbattle 0, TRAINER_SAILOR_LEONARD, 0, Text_174315, Text_174348 msgbox gUnknown_8174362, 6 end SSAnne_B1F_Room4_EventScript_160DBE:: @ 8160DBE - trainerbattle 0, 137, 0, Text_174385, Text_1743B3 + trainerbattle 0, TRAINER_SAILOR_DUNCAN, 0, Text_174385, Text_1743B3 msgbox gUnknown_81743C8, 6 end diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index f80ab4f82..bd70e785b 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "134", + "graphics_id": "MAP_OBJ_GFX_MACHOKE", "x": 2, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 2, "elevation": 0, @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SSAnne_B1F_Room5_EventScript_1BE69F", - "flag": "361" + "flag": "FLAG_HIDE_SSANNE_B1F_ROOM5_SUPER_POTION" } ], "warp_events": [ diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index 664266e47..3c5b166f4 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "63", + "graphics_id": "MAP_OBJ_GFX_CAPTAIN", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 4dad097a0..114ba084a 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -3,8 +3,8 @@ SSAnne_CaptainsOffice_MapScripts:: @ 8160B39 SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A lock - checkflag FLAG_0x237 - goto_if_eq EventScript_160BB5 + checkflag FLAG_GOT_HM01 + goto_if TRUE, EventScript_160BB5 msgbox gUnknown_8173646 textcolor 3 message Text_173676 @@ -19,7 +19,7 @@ SSAnne_CaptainsOffice_EventScript_160B3A:: @ 8160B3A additem ITEM_HM01, 1 giveitemfanfaremsg gUnknown_81737AF, ITEM_HM01, 1, MUS_FAN5 msgbox gUnknown_81737D2 - setflag FLAG_0x237 + setflag FLAG_GOT_HM01 setvar VAR_MAP_SCENE_VERMILION_CITY, 1 release end diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index bd1e16bf3..fcf2204fe 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 12, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 14, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 13, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 6, "y": 9, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_Deck/scripts.inc b/data/maps/SSAnne_Deck/scripts.inc index 3f835e568..bf12690af 100644 --- a/data/maps/SSAnne_Deck/scripts.inc +++ b/data/maps/SSAnne_Deck/scripts.inc @@ -14,11 +14,11 @@ SSAnne_Deck_EventScript_160A7B:: @ 8160A7B end SSAnne_Deck_EventScript_160A84:: @ 8160A84 - trainerbattle 0, 134, 0, Text_173308, Text_17332B + trainerbattle 0, TRAINER_SAILOR_EDMOND, 0, Text_173308, Text_17332B msgbox gUnknown_817333E, 6 end SSAnne_Deck_EventScript_160A9B:: @ 8160A9B - trainerbattle 0, 135, 0, Text_173382, Text_1733A0 + trainerbattle 0, TRAINER_SAILOR_TREVOR, 0, Text_173382, Text_1733A0 msgbox gUnknown_81733B5, 6 end diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index b0a63e5c9..65461e33a 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "151", + "graphics_id": "MAP_OBJ_GFX_SS_ANNE", "x": 30, "y": 16, "elevation": 1, @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "135" + "flag": "FLAG_HIDE_SS_ANNE" } ], "warp_events": [ @@ -72,8 +72,9 @@ "y": 28, "elevation": 3, "item": "ITEM_LAVA_COOKIE", - "flag": "190", - "unknown": 1 + "flag": "HIDDEN_ITEM_SSANNE_EXTERIOR_LAVA_COOKIE", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 8b622c54a..15cc43b1f 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -15,9 +15,9 @@ SSAnne_Exterior_160859:: @ 8160859 lockall getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8005, 6 - call_if 3, EventScript_1608A1 + call_if le, EventScript_1608A1 compare_var_to_value VAR_0x8005, 7 - call_if 4, EventScript_1608AC + call_if ge, EventScript_1608AC fadenewbgm MUS_NAMINORI delay 50 special Special_SSAnneDepartureCutscene diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 19e7eac4e..45404e0cc 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 1, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 6, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 10, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 8, "y": 9, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 14, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 14, "y": 7, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "59", + "graphics_id": "MAP_OBJ_GFX_CHEF", "x": 14, "y": 9, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 1, "y": 10, "elevation": 3, @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SSAnne_Kitchen_EventScript_1BE6AC", - "flag": "362" + "flag": "FLAG_HIDE_SSANNE_KITCHEN_GREAT_BALL" } ], "warp_events": [ @@ -135,8 +135,9 @@ "y": 8, "elevation": 0, "item": "ITEM_CHESTO_BERRY", - "flag": "122", - "unknown": 1 + "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_CHESTO_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -144,8 +145,9 @@ "y": 4, "elevation": 0, "item": "ITEM_PECHA_BERRY", - "flag": "120", - "unknown": 1 + "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_PECHA_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -153,8 +155,9 @@ "y": 6, "elevation": 0, "item": "ITEM_CHERI_BERRY", - "flag": "121", - "unknown": 1 + "flag": "HIDDEN_ITEM_SSANNE_KITCHEN_CHERI_BERRY", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index b1b60056d..8ab022028 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -20,11 +20,11 @@ SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE random 3 copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_160B03 + call_if eq, EventScript_160B03 compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_160B0C + call_if eq, EventScript_160B0C compare_var_to_value VAR_0x8008, 2 - call_if 1, EventScript_160B15 + call_if eq, EventScript_160B15 release end diff --git a/data/maps/SafariZone_Building1/map.json b/data/maps/SafariZone_Building1/map.json index 3173c5dae..700aa87d1 100644 --- a/data/maps/SafariZone_Building1/map.json +++ b/data/maps/SafariZone_Building1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 3, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SafariZone_Building2/map.json b/data/maps/SafariZone_Building2/map.json index 2aade6512..17b2fb57a 100644 --- a/data/maps/SafariZone_Building2/map.json +++ b/data/maps/SafariZone_Building2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 6, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SafariZone_Building3/map.json b/data/maps/SafariZone_Building3/map.json index fae8637ea..de59e1575 100644 --- a/data/maps/SafariZone_Building3/map.json +++ b/data/maps/SafariZone_Building3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 3, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 7, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 6, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 11, "y": 2, "elevation": 3, diff --git a/data/maps/SafariZone_Building4/map.json b/data/maps/SafariZone_Building4/map.json index a2ccec451..09b1e09a7 100644 --- a/data/maps/SafariZone_Building4/map.json +++ b/data/maps/SafariZone_Building4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 3, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 2, "y": 2, "elevation": 0, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index 6a21b2a3e..39b950060 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 24, "y": 15, "elevation": 3, @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SafariZone_Center_EventScript_1BE7D7", - "flag": "385" + "flag": "FLAG_HIDE_SAFARI_ZONE_CENTER_NUGGET" } ], "warp_events": [ @@ -142,8 +142,9 @@ "y": 15, "elevation": 3, "item": "ITEM_LEAF_STONE", - "flag": "22", - "unknown": 1 + "flag": "HIDDEN_ITEM_SAFARI_ZONE_CENTER_LEAF_STONE", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index e9b4475cf..dae5d93f8 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 13, "y": 12, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SafariZone_East_EventScript_1BE7E4", - "flag": "386" + "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_MAX_POTION" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 37, "y": 15, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SafariZone_East_EventScript_1BE7F1", - "flag": "387" + "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_FULL_RESTORE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 31, "y": 18, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SafariZone_East_EventScript_1BE7FE", - "flag": "388" + "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_TM11" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 36, "y": 17, "elevation": 4, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SafariZone_East_EventScript_1BE80B", - "flag": "389" + "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_LEAF_STONE" } ], "warp_events": [ diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index e02b44909..5d15f61f9 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 33, "y": 5, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SafariZone_North_EventScript_1BE818", - "flag": "390" + "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_PROTEIN" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 28, "y": 9, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SafariZone_North_EventScript_1BE825", - "flag": "391" + "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_TM47" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 29, "y": 17, "elevation": 3, @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SafariZone_North_EventScript_1BEBDA", - "flag": "467" + "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_QUICK_CLAW" } ], "warp_events": [ diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index 7eff5e68f..88838d5ff 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc index 67987618d..a4b3b1910 100644 --- a/data/maps/SafariZone_SecretHouse/scripts.inc +++ b/data/maps/SafariZone_SecretHouse/scripts.inc @@ -4,16 +4,16 @@ SafariZone_SecretHouse_MapScripts:: @ 8162452 SafariZone_SecretHouse_EventScript_162453:: @ 8162453 lock faceplayer - checkflag FLAG_0x239 - goto_if_eq EventScript_1624A9 + checkflag FLAG_GOT_HM03 + goto_if TRUE, EventScript_1624A9 msgbox gUnknown_8177DC1 checkitemspace ITEM_HM03, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16249F + goto_if eq, EventScript_16249F additem ITEM_HM03, 1 giveitemfanfaremsg gUnknown_8177E92, ITEM_HM03 msgbox gUnknown_8177EB7 - setflag FLAG_0x239 + setflag FLAG_GOT_HM03 release end diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index 4a9558841..bad880c1b 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 28, "y": 14, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SafariZone_West_EventScript_1BE83F", - "flag": "393" + "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 13, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SafariZone_West_EventScript_1BE832", - "flag": "392" + "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_TM32" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 16, "y": 27, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SafariZone_West_EventScript_1BE84C", - "flag": "394" + "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_POTION" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 27, "y": 24, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SafariZone_West_EventScript_1BE859", - "flag": "395" + "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_REVIVE" } ], "warp_events": [ @@ -181,8 +181,9 @@ "y": 11, "elevation": 3, "item": "ITEM_REVIVE", - "flag": "23", - "unknown": 1 + "flag": "HIDDEN_ITEM_SAFARI_ZONE_WEST_REVIVE", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 48eba64e0..b70aa83c1 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -36,7 +36,7 @@ "connections_no_include": true, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 22, "y": 15, "elevation": 3, @@ -46,10 +46,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_16737A", - "flag": "62" + "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 26, "y": 16, "elevation": 3, @@ -59,10 +59,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_167383", - "flag": "62" + "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 46, "y": 13, "elevation": 3, @@ -72,10 +72,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_16738C", - "flag": "62" + "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 27, "y": 22, "elevation": 3, @@ -85,10 +85,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_167395", - "flag": "62" + "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 25, "y": 33, "elevation": 3, @@ -98,10 +98,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_16739E", - "flag": "62" + "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 34, "y": 31, "elevation": 3, @@ -111,10 +111,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_1673B9", - "flag": "62" + "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 30, "y": 39, "elevation": 3, @@ -124,10 +124,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_1673B0", - "flag": "62" + "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 48, "y": 24, "elevation": 3, @@ -137,10 +137,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_1673A7", - "flag": "62" + "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 37, "y": 32, "elevation": 3, @@ -150,10 +150,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_1673EC", - "flag": "63" + "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 21, "y": 23, "elevation": 3, @@ -163,10 +163,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_1673E3", - "flag": "63" + "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 39, "y": 16, "elevation": 3, @@ -176,10 +176,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_16741A", - "flag": "63" + "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 44, "y": 22, "elevation": 3, @@ -189,10 +189,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_1673FE", - "flag": "63" + "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "114", + "graphics_id": "MAP_OBJ_GFX_PIDGEOT", "x": 45, "y": 22, "elevation": 3, @@ -202,10 +202,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_167407", - "flag": "63" + "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 32, "y": 39, "elevation": 3, @@ -215,10 +215,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_1673F5", - "flag": "63" + "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 47, "y": 24, "elevation": 3, @@ -228,7 +228,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_EventScript_1AD03A", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 9d591eec0..498557ddb 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -4,8 +4,8 @@ SaffronCity_MapScripts:: @ 816735F SaffronCity_MapScript1_167365:: @ 8167365 setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY - checkflag FLAG_0x23C - call_if 0, EventScript_167372 + checkflag FLAG_RESCUED_MR_FUJI + call_if FALSE, EventScript_167372 end EventScript_167372:: @ 8167372 @@ -42,8 +42,8 @@ SaffronCity_EventScript_1673B0:: @ 81673B0 SaffronCity_EventScript_1673B9:: @ 81673B9 lock - checkflag FLAG_0x23C - goto_if_eq EventScript_1673D7 + checkflag FLAG_RESCUED_MR_FUJI + goto_if TRUE, EventScript_1673D7 applymovement 6, Movement_1A75E1 waitmovement 0 msgbox gUnknown_81812CA @@ -96,9 +96,7 @@ SaffronCity_EventScript_16742C:: @ 816742C SaffronCity_EventScript_167435:: @ 8167435 lockall - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_SABRINA, 0 msgbox gUnknown_8181362 releaseall end diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 85f44168e..91bf8e662 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 11, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 1, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 11, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 1, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 6, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -89,10 +89,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_Dojo_EventScript_16EC00", - "flag": "96" + "flag": "FLAG_HIDE_DOJO_HITMONLEE_BALL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 7, "y": 3, "elevation": 3, @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_Dojo_EventScript_16EC46", - "flag": "97" + "flag": "FLAG_HIDE_DOJO_HITMONCHAN_BALL" } ], "warp_events": [ @@ -134,7 +134,7 @@ "x": 5, "y": 5, "elevation": 3, - "var": "VAR_0x4081", + "var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO", "var_value": 0, "script": "SaffronCity_Dojo_EventScript_16EBDC" }, @@ -143,7 +143,7 @@ "x": 7, "y": 5, "elevation": 3, - "var": "VAR_0x4081", + "var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO", "var_value": 0, "script": "SaffronCity_Dojo_EventScript_16EBEE" } diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 8be7e27a6..9c0f5cba8 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -3,7 +3,7 @@ SaffronCity_Dojo_MapScripts:: @ 816EBDB SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC lockall - setvar VAR_0x4081, 1 + setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 applymovement 5, Movement_1A75E7 waitmovement 0 releaseall @@ -11,7 +11,7 @@ SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE lockall - setvar VAR_0x4081, 1 + setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 applymovement 5, Movement_1A75EB waitmovement 0 releaseall @@ -20,8 +20,8 @@ SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 lock faceplayer - checkflag FLAG_0x278 - goto_if_eq EventScript_16EC3C + checkflag FLAG_GOT_HITMON_FROM_DOJO + goto_if TRUE, EventScript_16EC3C drawmonpic SPECIES_HITMONLEE, 10, 3 setvar VAR_0x4001, SPECIES_HITMONLEE applymovement 5, Movement_1A75E9 @@ -30,7 +30,7 @@ SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00 msgbox gUnknown_819B44E, MSGBOX_YESNO call EventScript_1A6675 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16EC82 + goto_if eq, EventScript_16EC82 erasemonpic release end @@ -43,8 +43,8 @@ EventScript_16EC3C:: @ 816EC3C SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 lock faceplayer - checkflag FLAG_0x278 - goto_if_eq EventScript_16EC3C + checkflag FLAG_GOT_HITMON_FROM_DOJO + goto_if TRUE, EventScript_16EC3C drawmonpic SPECIES_HITMONCHAN, 10, 3 setvar VAR_0x4001, SPECIES_HITMONCHAN applymovement 5, Movement_1A75E9 @@ -53,7 +53,7 @@ SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46 msgbox gUnknown_819B49E, MSGBOX_YESNO call EventScript_1A6675 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16EC82 + goto_if eq, EventScript_16EC82 erasemonpic release end @@ -62,11 +62,11 @@ EventScript_16EC82:: @ 816EC82 erasemonpic givemon VAR_0x4001, 25, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16ECB5 + goto_if eq, EventScript_16ECB5 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16ECEC + goto_if eq, EventScript_16ECEC compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A927C + goto_if eq, EventScript_1A927C release end @@ -77,10 +77,10 @@ EventScript_16ECB5:: @ 816ECB5 message Text_19B473 waitmessage waitfanfare - setflag FLAG_0x278 + setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16ED29 + goto_if eq, EventScript_16ED29 call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_16ED29 @@ -93,10 +93,10 @@ EventScript_16ECEC:: @ 816ECEC message Text_19B473 waitmessage waitfanfare - setflag FLAG_0x278 + setflag FLAG_GOT_HITMON_FROM_DOJO msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16ED1E + goto_if eq, EventScript_16ED1E call EventScript_1A8C33 goto EventScript_16ED1E end @@ -123,29 +123,29 @@ SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D end SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46 - trainerbattle 0, 321, 0, Text_19B3DF, Text_19B40F + trainerbattle 0, TRAINER_BLACK_BELT_HITOSHI, 0, Text_19B3DF, Text_19B40F msgbox gUnknown_819B41F, 6 end SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D - trainerbattle 0, 319, 0, Text_19B2E0, Text_19B2FD + trainerbattle 0, TRAINER_BLACK_BELT_HIDEKI, 0, Text_19B2E0, Text_19B2FD msgbox gUnknown_819B30F, 6 end SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74 - trainerbattle 0, 320, 0, Text_19B341, Text_19B396 + trainerbattle 0, TRAINER_BLACK_BELT_AARON, 0, Text_19B341, Text_19B396 msgbox gUnknown_819B3AC, 6 end SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B - trainerbattle 0, 318, 0, Text_19B275, Text_19B292 + trainerbattle 0, TRAINER_BLACK_BELT_MIKE, 0, Text_19B275, Text_19B292 msgbox gUnknown_819B29D, 6 end SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2 - trainerbattle 2, 317, 0, Text_19B12C, Text_19B193, EventScript_16EDD0 - checkflag FLAG_0x278 - goto_if_eq EventScript_16EDC6 + trainerbattle 2, TRAINER_BLACK_BELT_KOICHI, 0, Text_19B12C, Text_19B193, EventScript_16EDD0 + checkflag FLAG_GOT_HITMON_FROM_DOJO + goto_if TRUE, EventScript_16EDC6 msgbox gUnknown_819B1A7, 6 end @@ -155,6 +155,6 @@ EventScript_16EDC6:: @ 816EDC6 end EventScript_16EDD0:: @ 816EDD0 - setvar VAR_0x4081, 1 + setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 release end diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index 24cd66c55..4f6f13afc 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 24, "y": 18, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 24, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 4, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 14, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 4, "y": 10, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 4, "y": 18, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "85", + "graphics_id": "MAP_OBJ_GFX_SABRINA", "x": 14, "y": 11, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 24, "y": 10, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 15, "y": 20, "elevation": 3, diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index cbd8b2d02..ebfc595c7 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -2,28 +2,21 @@ SaffronCity_Gym_MapScripts:: @ 816EDD7 .byte 0 SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8 - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 420, 0, Text_19B53C, Text_19B602, EventScript_16EE0A - checkflag FLAG_0x29A - goto_if 0, EventScript_16EE3D + famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + trainerbattle 1, TRAINER_LEADER_SABRINA, 0, Text_19B53C, Text_19B602, EventScript_16EE0A + checkflag FLAG_GOT_TM04_FROM_SABRINA + goto_if FALSE, EventScript_16EE3D msgbox gUnknown_819B7F2 release end EventScript_16EE0A:: @ 816EE0A - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars - clearflag FLAG_0x0AE - setflag FLAG_0x4B5 - setflag FLAG_0x825 - setvar VAR_0x8008, 6 - call EventScript_1A6B18 + famechecker FAMECHECKER_SABRINA, 2 + famechecker FAMECHECKER_SABRINA, 3 + clearflag FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS + setflag FLAG_DEFEATED_SABRINA + setflag FLAG_BADGE06_GET + set_gym_trainers 6 goto EventScript_16EE3D end @@ -31,10 +24,10 @@ EventScript_16EE3D:: @ 816EE3D msgbox gUnknown_819B6FA checkitemspace ITEM_TM04, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16EE7E + goto_if eq, EventScript_16EE7E additem ITEM_TM04, 1 giveitemfanfaremsg gUnknown_819B7D3, ITEM_TM04 - setflag FLAG_0x29A + setflag FLAG_GOT_TM04_FROM_SABRINA msgbox gUnknown_819B685 release end @@ -45,48 +38,46 @@ EventScript_16EE7E:: @ 816EE7E end SaffronCity_Gym_EventScript_16EE88:: @ 816EE88 - trainerbattle 0, 280, 0, Text_19B936, Text_19B957 + trainerbattle 0, TRAINER_PSYCHIC_JOHAN, 0, Text_19B936, Text_19B957 msgbox gUnknown_819B96D, 6 end SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F - trainerbattle 0, 281, 0, Text_19BA45, Text_19BA9E - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 5 - special SetFlavorTextFlagFromSpecialVars + trainerbattle 0, TRAINER_PSYCHIC_TYRON, 0, Text_19BA45, Text_19BA9E + famechecker FAMECHECKER_SABRINA, 5 msgbox gUnknown_819BAB4, 6 end SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3 - trainerbattle 0, 282, 0, Text_19BB49, Text_19BBA1 + trainerbattle 0, TRAINER_PSYCHIC_CAMERON, 0, Text_19BB49, Text_19BBA1 msgbox gUnknown_819BBB3, 6 end SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA - trainerbattle 0, 283, 0, Text_19BC57, Text_19BCBC + trainerbattle 0, TRAINER_PSYCHIC_PRESTON, 0, Text_19BC57, Text_19BCBC msgbox gUnknown_819BCC4, 6 end SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1 - trainerbattle 0, 462, 0, Text_19B86A, Text_19B8A8 + trainerbattle 0, TRAINER_CHANNELER_AMANDA, 0, Text_19B86A, Text_19B8A8 msgbox gUnknown_819B8B9, 6 end SaffronCity_Gym_EventScript_16EF08:: @ 816EF08 - trainerbattle 0, 463, 0, Text_19B998, Text_19B9EC + trainerbattle 0, TRAINER_CHANNELER_STACY, 0, Text_19B998, Text_19B9EC msgbox gUnknown_819B9F7, 6 end SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F - trainerbattle 0, 464, 0, Text_19BAE8, Text_19BB0D + trainerbattle 0, TRAINER_CHANNELER_TASHA, 0, Text_19BAE8, Text_19BB0D msgbox gUnknown_819BB1F, 6 end SaffronCity_Gym_EventScript_16EF36:: @ 816EF36 lock faceplayer - checkflag FLAG_0x4B5 - goto_if_eq EventScript_16EF4B + checkflag FLAG_DEFEATED_SABRINA + goto_if TRUE, EventScript_16EF4B msgbox gUnknown_819BCF6 release end @@ -98,8 +89,8 @@ EventScript_16EF4B:: @ 816EF4B SaffronCity_Gym_EventScript_16EF55:: @ 816EF55 lockall - checkflag FLAG_0x825 - goto_if_eq EventScript_16EF69 + checkflag FLAG_BADGE06_GET + goto_if TRUE, EventScript_16EF69 msgbox gUnknown_819BDFE releaseall end diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_House1_1F/map.json index 287f760d8..6a233f785 100644 --- a/data/maps/SaffronCity_House1_1F/map.json +++ b/data/maps/SaffronCity_House1_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 8, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 3, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "117", + "graphics_id": "MAP_OBJ_GFX_CHANSEY", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_House1_2F/map.json index fe34076ae..8598b129a 100644 --- a/data/maps/SaffronCity_House1_2F/map.json +++ b/data/maps/SaffronCity_House1_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "132", + "graphics_id": "MAP_OBJ_GFX_DODUO", "x": 6, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "120", + "graphics_id": "MAP_OBJ_GFX_PIKACHU", "x": 4, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "115", + "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF", "x": 7, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 9, "y": 6, "elevation": 3, @@ -97,8 +97,9 @@ "y": 1, "elevation": 0, "item": "ITEM_NUGGET", - "flag": "26", - "unknown": 1 + "flag": "HIDDEN_ITEM_SAFFRON_CITY_HOUSE1_2F_NUGGET", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc index 8a6227b38..54b0a5a65 100644 --- a/data/maps/SaffronCity_House1_2F/scripts.inc +++ b/data/maps/SaffronCity_House1_2F/scripts.inc @@ -20,18 +20,18 @@ SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70 SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer checkitem ITEM_POKE_DOLL, 1 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1C4CF6 + goto_if eq, EventScript_1C4CF6 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16EBB7 + call_if eq, EventScript_16EBB7 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_16EBC0 + call_if eq, EventScript_16EBC0 release end diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House2/map.json index 0b87576cd..4c6e64a1d 100644 --- a/data/maps/SaffronCity_House2/map.json +++ b/data/maps/SaffronCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "116", + "graphics_id": "MAP_OBJ_GFX_PIDGEY", "x": 0, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 4, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 6, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "105", + "graphics_id": "MAP_OBJ_GFX_CLIPBOARD", "x": 5, "y": 4, "elevation": 0, diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_House3/map.json index f4b227795..51f9c8294 100644 --- a/data/maps/SaffronCity_House3/map.json +++ b/data/maps/SaffronCity_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc index 89a44eecd..8a1ec97b5 100644 --- a/data/maps/SaffronCity_House3/scripts.inc +++ b/data/maps/SaffronCity_House3/scripts.inc @@ -4,16 +4,16 @@ SaffronCity_House3_MapScripts:: @ 816F05E SaffronCity_House3_EventScript_16F05F:: @ 816F05F lock faceplayer - checkflag FLAG_0x245 - goto_if_eq EventScript_16F0B5 + checkflag FLAG_GOT_TM29_FROM_MR_PSYCHIC + goto_if TRUE, EventScript_16F0B5 msgbox gUnknown_819C142 checkitemspace ITEM_TM29, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16F0AB + goto_if eq, EventScript_16F0AB additem ITEM_TM29, 1 giveitemfanfaremsg gUnknown_819C16C, ITEM_TM29 msgbox gUnknown_819C18F - setflag FLAG_0x245 + setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC release end diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index 1bfe45aca..d4248d680 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 1, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index 509fd37b6..5b77e5864 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -12,7 +12,7 @@ SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index 118936b0e..9fbefc7f3 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 14, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 4, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 9, "y": 6, "elevation": 3, @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC", - "flag": "174" + "flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS" }, { "graphics_id": "0", @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC", - "flag": "174" + "flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS" } ], "warp_events": [ diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index 65c37eaf3..0f2b92262 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -25,8 +25,8 @@ SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016 lock faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if_eq EventScript_16F02D + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if eq, EventScript_16F02D msgbox gUnknown_819C0B4 release end diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index 8fdf8ac26..dd7076a54 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index e702db16e..dbeccc674 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 7, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 6, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 3, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 3, "y": 12, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 9, "y": 11, "elevation": 3, @@ -76,10 +76,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F45D", - "flag": "110" + "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 7, "y": 12, "elevation": 3, @@ -89,10 +89,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF", - "flag": "109" + "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 9, "y": 12, "elevation": 3, @@ -102,10 +102,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F521", - "flag": "111" + "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 5, "y": 11, "elevation": 3, @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F583", - "flag": "108" + "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT" }, { "graphics_id": "0", @@ -128,7 +128,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { "graphics_id": "0", @@ -141,7 +141,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index dce3faa1b..30d528791 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -72,9 +72,9 @@ Movement_16F13E:: @ 816F13E SaffronCity_PokemonTrainerFanClub_MapScript2_16F144:: @ 816F144 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 - goto_if_eq EventScript_16F267 + goto_if eq, EventScript_16F267 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 - goto_if_eq EventScript_16F15B + goto_if eq, EventScript_16F15B end EventScript_16F15B:: @ 816F15B @@ -82,35 +82,35 @@ EventScript_16F15B:: @ 816F15B setvar VAR_0x8004, 0 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F207 + call_if eq, EventScript_16F207 setvar VAR_0x8004, 1 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F213 + call_if eq, EventScript_16F213 setvar VAR_0x8004, 2 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F21F + call_if eq, EventScript_16F21F setvar VAR_0x8004, 3 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F22B + call_if eq, EventScript_16F22B setvar VAR_0x8004, 4 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F237 + call_if eq, EventScript_16F237 setvar VAR_0x8004, 5 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F243 + call_if eq, EventScript_16F243 setvar VAR_0x8004, 6 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F24F + call_if eq, EventScript_16F24F setvar VAR_0x8004, 7 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_16F25B + call_if eq, EventScript_16F25B end EventScript_16F207:: @ 816F207 @@ -167,13 +167,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 setvar VAR_0x8004, 0 special sub_81133A4 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F2EE + goto_if eq, EventScript_16F2EE specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F2C0 + goto_if eq, EventScript_16F2C0 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if_eq EventScript_16F2E4 + goto_if eq, EventScript_16F2E4 msgbox gUnknown_819C420 release end @@ -181,7 +181,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281 EventScript_16F2C0:: @ 816F2C0 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F2DA + goto_if eq, EventScript_16F2DA msgbox gUnknown_819C390 release end @@ -207,13 +207,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 setvar VAR_0x8004, 3 special sub_81133A4 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F365 + goto_if eq, EventScript_16F365 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F337 + goto_if eq, EventScript_16F337 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if_eq EventScript_16F35B + goto_if eq, EventScript_16F35B msgbox gUnknown_819CBD3 release end @@ -221,7 +221,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8 EventScript_16F337:: @ 816F337 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F351 + goto_if eq, EventScript_16F351 msgbox gUnknown_819CB32 release end @@ -247,13 +247,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F setvar VAR_0x8004, 1 special sub_81133A4 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F3DC + goto_if eq, EventScript_16F3DC specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F3AE + goto_if eq, EventScript_16F3AE specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if_eq EventScript_16F3D2 + goto_if eq, EventScript_16F3D2 msgbox gUnknown_819C6BA release end @@ -261,7 +261,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F EventScript_16F3AE:: @ 816F3AE specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F3C8 + goto_if eq, EventScript_16F3C8 msgbox gUnknown_819C5A9 release end @@ -287,13 +287,13 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 setvar VAR_0x8004, 2 special sub_81133A4 compare_var_to_value VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0 - goto_if_eq EventScript_16F453 + goto_if eq, EventScript_16F453 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F425 + goto_if eq, EventScript_16F425 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if_eq EventScript_16F449 + goto_if eq, EventScript_16F449 msgbox gUnknown_819C986 release end @@ -301,7 +301,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6 EventScript_16F425:: @ 816F425 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F43F + goto_if eq, EventScript_16F43F msgbox gUnknown_819C81E release end @@ -328,10 +328,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D special sub_81133A4 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F491 + goto_if eq, EventScript_16F491 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if_eq EventScript_16F4B5 + goto_if eq, EventScript_16F4B5 msgbox gUnknown_819D01F release end @@ -339,7 +339,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D EventScript_16F491:: @ 816F491 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F4AB + goto_if eq, EventScript_16F4AB msgbox gUnknown_819CEDF release end @@ -361,10 +361,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF special sub_81133A4 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F4F3 + goto_if eq, EventScript_16F4F3 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if_eq EventScript_16F517 + goto_if eq, EventScript_16F517 msgbox gUnknown_819CDDA release end @@ -372,7 +372,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF EventScript_16F4F3:: @ 816F4F3 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F50D + goto_if eq, EventScript_16F50D msgbox gUnknown_819CCF3 release end @@ -394,10 +394,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 special sub_81133A4 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F555 + goto_if eq, EventScript_16F555 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if_eq EventScript_16F579 + goto_if eq, EventScript_16F579 msgbox gUnknown_819D1AE release end @@ -405,7 +405,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521 EventScript_16F555:: @ 816F555 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F56F + goto_if eq, EventScript_16F56F msgbox gUnknown_819D0E3 release end @@ -427,10 +427,10 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 special sub_81133A4 specialvar VAR_RESULT, sub_8113364 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F5B7 + goto_if eq, EventScript_16F5B7 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 7 - goto_if_eq EventScript_16F5DB + goto_if eq, EventScript_16F5DB msgbox gUnknown_819D3D2 release end @@ -438,7 +438,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583 EventScript_16F5B7:: @ 816F5B7 specialvar VAR_RESULT, sub_8113288 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16F5D1 + goto_if eq, EventScript_16F5D1 msgbox gUnknown_819D2B4 release end diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index a40335f0d..95261f368 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 22, "y": 12, "elevation": 3, @@ -23,11 +23,11 @@ "movement_range_y": 0, "trainer_type": 66, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_1F_EventScript_1BE11D", - "flag": "64" + "script": "EventScript_InteractWithStrengthBoulderObject", + "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 32, "y": 9, "elevation": 3, @@ -36,11 +36,11 @@ "movement_range_y": 0, "trainer_type": 67, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_1F_EventScript_1BE11D", - "flag": "65" + "script": "EventScript_InteractWithStrengthBoulderObject", + "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_2" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 8, "elevation": 3, @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SeafoamIslands_1F_EventScript_1BEBE7", - "flag": "468" + "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_1F_ICE_HEAL" } ], "warp_events": [ diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index c1003895d..ded9935d2 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 22, "y": 8, "elevation": 3, @@ -23,11 +23,11 @@ "movement_range_y": 0, "trainer_type": 68, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B1F_EventScript_1BE11D", - "flag": "66" + "script": "EventScript_InteractWithStrengthBoulderObject", + "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 30, "y": 8, "elevation": 3, @@ -36,11 +36,11 @@ "movement_range_y": 0, "trainer_type": 69, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B1F_EventScript_1BE11D", - "flag": "67" + "script": "EventScript_InteractWithStrengthBoulderObject", + "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_2" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 19, "y": 18, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SeafoamIslands_B1F_EventScript_1BEBF4", - "flag": "469" + "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_WATER_STONE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 24, "y": 14, "elevation": 4, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SeafoamIslands_B1F_EventScript_1BEC01", - "flag": "470" + "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_REVIVE" } ], "warp_events": [ diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index fdc44c9a5..cc9d54955 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 22, "y": 8, "elevation": 3, @@ -23,11 +23,11 @@ "movement_range_y": 0, "trainer_type": 70, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B2F_EventScript_1BE11D", - "flag": "68" + "script": "EventScript_InteractWithStrengthBoulderObject", + "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 30, "y": 8, "elevation": 3, @@ -36,11 +36,11 @@ "movement_range_y": 0, "trainer_type": 71, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B2F_EventScript_1BE11D", - "flag": "69" + "script": "EventScript_InteractWithStrengthBoulderObject", + "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_2" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 18, "y": 15, "elevation": 3, @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SeafoamIslands_B2F_EventScript_1BEC0E", - "flag": "471" + "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B2F_BIG_PEARL" } ], "warp_events": [ diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 043dea721..a1068f489 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 23, "y": 8, "elevation": 1, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "70" + "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_1" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 24, "y": 8, "elevation": 1, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "71" + "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_2" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 12, "y": 16, "elevation": 3, @@ -49,11 +49,11 @@ "movement_range_y": 0, "trainer_type": 77, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B3F_EventScript_1BE11D", - "flag": "74" + "script": "EventScript_InteractWithStrengthBoulderObject", + "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 13, "y": 16, "elevation": 3, @@ -62,11 +62,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B3F_EventScript_1BE11D", - "flag": "75" + "script": "EventScript_InteractWithStrengthBoulderObject", + "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 9, "y": 16, "elevation": 3, @@ -75,11 +75,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B3F_EventScript_1BE11D", - "flag": "73" + "script": "EventScript_InteractWithStrengthBoulderObject", + "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 6, "y": 17, "elevation": 3, @@ -88,8 +88,8 @@ "movement_range_y": 0, "trainer_type": 76, "trainer_sight_or_berry_tree_id": 0, - "script": "SeafoamIslands_B3F_EventScript_1BE11D", - "flag": "72" + "script": "EventScript_InteractWithStrengthBoulderObject", + "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_3" } ], "warp_events": [ @@ -165,8 +165,9 @@ "y": 12, "elevation": 0, "item": "ITEM_NUGGET", - "flag": "29", - "unknown": 1 + "flag": "HIDDEN_ITEM_SEAFOAM_ISLANDS_B3F_NUGGET", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index e54e7ceb7..c566ab522 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -4,24 +4,24 @@ SeafoamIslands_B3F_MapScripts:: @ 8162F4F .byte 0 SeafoamIslands_B3F_MapScript1_162F5A:: @ 8162F5A - checkflag FLAG_0x2D2 - call_if 0, EventScript_162F6D - checkflag FLAG_0x2D2 - call_if 1, EventScript_162F94 + checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT + call_if FALSE, EventScript_162F6D + checkflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT + call_if TRUE, EventScript_162F94 end EventScript_162F6D:: @ 8162F6D setvar VAR_0x4002, 0 - checkflag FLAG_0x046 - call_if 0, EventScript_162FF0 - checkflag FLAG_0x047 - call_if 0, EventScript_162FF0 + checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 + call_if FALSE, EventScript_162FF0 + checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 + call_if FALSE, EventScript_162FF0 compare_var_to_value VAR_0x4002, 2 - call_if 1, EventScript_162F90 + call_if eq, EventScript_162F90 return EventScript_162F90:: @ 8162F90 - setflag FLAG_0x2D2 + setflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT return EventScript_162F94:: @ 8162F94 @@ -35,17 +35,17 @@ SeafoamIslands_B3F_MapScript2_162F98:: @ 8162F98 EventScript_162FA2:: @ 8162FA2 lockall setvar VAR_0x4002, 0 - checkflag FLAG_0x046 - call_if 0, EventScript_162FF0 - checkflag FLAG_0x047 - call_if 0, EventScript_162FF0 + checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_1 + call_if FALSE, EventScript_162FF0 + checkflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 + call_if FALSE, EventScript_162FF0 compare_var_to_value VAR_0x4002, 2 - goto_if_eq EventScript_16300C + goto_if eq, EventScript_16300C getplayerxy VAR_0x8008, VAR_0x8009 compare_var_to_value VAR_0x8008, 24 - call_if 0, EventScript_162FF6 + call_if lt, EventScript_162FF6 compare_var_to_value VAR_0x8008, 24 - call_if 4, EventScript_163001 + call_if ge, EventScript_163001 setvar VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1 warp MAP_SEAFOAM_ISLANDS_B4F, 255, 27, 21 waitstate diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 09da347d3..8ef4ca3b2 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 8, "y": 18, "elevation": 1, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "76" + "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_1" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 9, "y": 18, "elevation": 1, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "77" + "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_2" }, { - "graphics_id": "138", + "graphics_id": "MAP_OBJ_GFX_ARTICUNO", "x": 9, "y": 2, "elevation": 4, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SeafoamIslands_B4F_EventScript_1631AC", - "flag": "130" + "flag": "FLAG_HIDE_ARTICUNO" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 22, "y": 19, "elevation": 4, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SeafoamIslands_B4F_EventScript_1BEC1B", - "flag": "472" + "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B4F_ULTRA_BALL" } ], "warp_events": [ @@ -132,8 +132,9 @@ "y": 8, "elevation": 0, "item": "ITEM_WATER_STONE", - "flag": "30", - "unknown": 1 + "flag": "HIDDEN_ITEM_SEAFOAM_ISLANDS_B4F_WATER_STONE", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index c0bcc1196..3b618448c 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -7,38 +7,38 @@ SeafoamIslands_B4F_MapScripts:: @ 816302E .byte 0 SeafoamIslands_B4F_MapScript2_163048:: @ 8163048 - checkflag FLAG_0x807 - call_if 1, EventScript_163052 + checkflag FLAG_SYS_SPECIAL_WILD_BATTLE + call_if TRUE, EventScript_163052 end EventScript_163052:: @ 8163052 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 7 - goto_if 5, EventScript_1A77A9 + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_CAUGHT + goto_if ne, EventScript_1A77A9 removeobject VAR_LAST_TALKED return SeafoamIslands_B4F_MapScript1_163066:: @ 8163066 - checkflag FLAG_0x2BE - call_if 0, EventScript_1630AD - checkflag FLAG_0x2D3 - call_if 0, EventScript_163082 - checkflag FLAG_0x2D3 - call_if 1, EventScript_1630A9 + checkflag FLAG_FOUGHT_ARTICUNO + call_if FALSE, EventScript_1630AD + checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT + call_if FALSE, EventScript_163082 + checkflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT + call_if TRUE, EventScript_1630A9 end EventScript_163082:: @ 8163082 setvar VAR_0x4002, 0 - checkflag FLAG_0x04C - call_if 0, EventScript_163169 - checkflag FLAG_0x04D - call_if 0, EventScript_163169 + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 + call_if FALSE, EventScript_163169 + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 + call_if FALSE, EventScript_163169 compare_var_to_value VAR_0x4002, 2 - call_if 1, EventScript_1630A5 + call_if eq, EventScript_1630A5 return EventScript_1630A5:: @ 81630A5 - setflag FLAG_0x2D3 + setflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT return EventScript_1630A9:: @ 81630A9 @@ -46,17 +46,17 @@ EventScript_1630A9:: @ 81630A9 return EventScript_1630AD:: @ 81630AD - clearflag FLAG_0x082 + clearflag FLAG_HIDE_ARTICUNO return SeafoamIslands_B4F_MapScript3_1630B1:: @ 81630B1 setvar VAR_0x4002, 0 - checkflag FLAG_0x04C - call_if 0, EventScript_163169 - checkflag FLAG_0x04D - call_if 0, EventScript_163169 + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 + call_if FALSE, EventScript_163169 + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 + call_if FALSE, EventScript_163169 compare_var_to_value VAR_0x4002, 2 - goto_if_eq EventScript_1630D4 + goto_if eq, EventScript_1630D4 end EventScript_1630D4:: @ 81630D4 @@ -95,17 +95,17 @@ Movement_16311D:: @ 816311D EventScript_163121:: @ 8163121 lockall setvar VAR_0x4002, 0 - checkflag FLAG_0x04C - call_if 0, EventScript_163169 - checkflag FLAG_0x04D - call_if 0, EventScript_163169 + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_1 + call_if FALSE, EventScript_163169 + checkflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 + call_if FALSE, EventScript_163169 compare_var_to_value VAR_0x4002, 2 - goto_if_eq EventScript_163185 + goto_if eq, EventScript_163185 getplayerxy VAR_0x8008, VAR_0x8009 compare_var_to_value VAR_0x8008, 9 - call_if 0, EventScript_16316F + call_if lt, EventScript_16316F compare_var_to_value VAR_0x8008, 9 - call_if 4, EventScript_16317A + call_if ge, EventScript_16317A special sub_805D1A8 setvar VAR_0x4001, 0 releaseall @@ -165,7 +165,7 @@ Movement_1631AA:: @ 81631AA SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer @@ -178,23 +178,23 @@ SeafoamIslands_B4F_EventScript_1631AC:: @ 81631AC delay 10 playbgm MUS_EXEYE, 0 waitbuttonpress - setflag FLAG_0x807 + setflag FLAG_SYS_SPECIAL_WILD_BATTLE special sub_807F9D8 waitstate - clearflag FLAG_0x807 - specialvar VAR_RESULT, sub_80CA74C - compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16320F - compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_163218 - compare_var_to_value VAR_RESULT, 5 - goto_if_eq EventScript_163218 - setflag FLAG_0x2BE + clearflag FLAG_SYS_SPECIAL_WILD_BATTLE + specialvar VAR_RESULT, Special_GetBattleOutcome + compare_var_to_value VAR_RESULT, B_OUTCOME_WON + goto_if eq, EventScript_16320F + compare_var_to_value VAR_RESULT, B_OUTCOME_RAN + goto_if eq, EventScript_163218 + compare_var_to_value VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED + goto_if eq, EventScript_163218 + setflag FLAG_FOUGHT_ARTICUNO release end EventScript_16320F:: @ 816320F - setflag FLAG_0x2BE + setflag FLAG_FOUGHT_ARTICUNO goto EventScript_1A922D EventScript_163217:: @ 8163217 diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index a227a7121..c9fe0c17b 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 7, "y": 18, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 9, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 15, "y": 5, "elevation": 3, diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index d33245efd..cd88eae20 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/SevenIsland_Harbor/scripts.inc b/data/maps/SevenIsland_Harbor/scripts.inc index c4777e1ac..8fa30cfa5 100644 --- a/data/maps/SevenIsland_Harbor/scripts.inc +++ b/data/maps/SevenIsland_Harbor/scripts.inc @@ -6,6 +6,6 @@ SevenIsland_Harbor_EventScript_170BE5:: @ 8170BE5 faceplayer message Text_181726 waitmessage - setvar VAR_0x8004, 7 + setvar VAR_0x8004, SEAGALLOP_SEVEN_ISLAND goto EventScript_1A900F end diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index d319db640..066f3d18d 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 107b91ad7..70813ddba 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -6,9 +6,9 @@ SevenIsland_House_Room1_MapScripts:: @ 817088A SevenIsland_House_Room1_MapScript1_170895:: @ 8170895 special ValidateEReaderTrainer compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_1708AF + call_if eq, EventScript_1708AF compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 - call_if 5, EventScript_1708C3 + call_if ne, EventScript_1708C3 end EventScript_1708AF:: @ 81708AF @@ -40,11 +40,11 @@ EventScript_1708E9:: @ 1708E9 applymovement 255, Movement_1A75E9 waitmovement 0 compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 - call_if 1, EventScript_170938 + call_if eq, EventScript_170938 compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 - call_if 1, EventScript_170941 + call_if eq, EventScript_170941 compare_var_to_value VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 - call_if 1, EventScript_17094A + call_if eq, EventScript_17094A special LoadPlayerParty setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0 releaseall @@ -76,9 +76,9 @@ SevenIsland_House_Room1_EventScript_170958:: @ 8170958 faceplayer special ValidateEReaderTrainer compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_17097D + call_if eq, EventScript_17097D compare_var_to_value VAR_0x4001, 1 - goto_if_eq EventScript_170987 + goto_if eq, EventScript_170987 msgbox gUnknown_81A049B release end @@ -93,27 +93,27 @@ EventScript_170987:: @ 8170987 special sub_80CAAAC msgbox gUnknown_81A0598, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_170A11 + goto_if eq, EventScript_170A11 call EventScript_170A1E compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_170A11 + goto_if eq, EventScript_170A11 msgbox gUnknown_81A0788, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_170A11 + goto_if eq, EventScript_170A11 special LoadPlayerParty call EventScript_1A4EAF compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_170A11 + goto_if eq, EventScript_170A11 special SavePlayerParty special sub_80A03D8 msgbox gUnknown_81A07C4 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_170A2D + call_if eq, EventScript_170A2D compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_170A3F + call_if eq, EventScript_170A3F compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_170A51 + call_if eq, EventScript_170A51 warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 waitstate release diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index 131c2531f..2336916fa 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 6, "y": 5, "elevation": 0, diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index db52423e4..d77eda077 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -16,19 +16,18 @@ EventScript_170A97:: @ 8170A97 applymovement 255, Movement_170B22 waitmovement 0 special sub_80E7538 - loadword 0, gStringVar4 @ 2021D18 - callstd 4 + msgbox gStringVar4 closemessage setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 special sub_80E6900 waitstate compare_var_to_value VAR_RESULT, 3 - call_if 1, EventScript_170AFE + call_if eq, EventScript_170AFE compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_170B0C + call_if eq, EventScript_170B0C compare_var_to_value VAR_RESULT, 2 - call_if 1, EventScript_170B17 + call_if eq, EventScript_170B17 closemessage special sp000_heal_pokemon applymovement 255, Movement_170B28 diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index 64f56ce7f..94f07f060 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 9, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc index ce9ad21ed..58312009f 100644 --- a/data/maps/SevenIsland_Mart/scripts.inc +++ b/data/maps/SevenIsland_Mart/scripts.inc @@ -4,7 +4,7 @@ SevenIsland_Mart_MapScripts:: @ 8170B30 SevenIsland_Mart_EventScript_170B31:: @ 8170B31 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index cac3cd8f6..702c10d3b 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 11, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 14, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 4, "y": 4, "elevation": 3, @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { "graphics_id": "0", @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4", - "flag": "157" + "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index 5952fb9b3..9817d6ff1 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json index f6af3773a..f8c9c1a1f 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 7, "y": 6, "elevation": 3, @@ -23,11 +23,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 8, "y": 6, "elevation": 3, @@ -36,11 +36,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 8, "y": 9, "elevation": 3, @@ -49,11 +49,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 6, "y": 10, "elevation": 3, @@ -62,11 +62,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 8, "y": 10, "elevation": 3, @@ -75,11 +75,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 6, "y": 9, "elevation": 3, @@ -88,11 +88,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 6, "y": 6, "elevation": 3, @@ -101,7 +101,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SeavaultCanyon_TanobyKey_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" } ], diff --git a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc index b1cf1bc89..44dd71179 100644 --- a/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SeavaultCanyon_TanobyKey/scripts.inc @@ -4,8 +4,8 @@ SevenIsland_SeavaultCanyon_TanobyKey_MapScripts:: @ 8164DCC SevenIsland_SeavaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY - checkflag FLAG_0x849 - call_if 1, EventScript_164E07 + checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS + call_if TRUE, EventScript_164E07 setvar VAR_0x4001, 0 setvar VAR_0x4002, 0 setvar VAR_0x4003, 0 @@ -29,77 +29,77 @@ EventScript_164E07:: @ 8164E07 SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39 lockall compare_var_to_value VAR_0x4001, 100 - goto_if_eq EventScript_164F8A + goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4001, 100 compare_var_to_value VAR_0x4008, 7 - goto_if_eq EventScript_164F8C + goto_if eq, EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C lockall compare_var_to_value VAR_0x4002, 100 - goto_if_eq EventScript_164F8A + goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4002, 100 compare_var_to_value VAR_0x4008, 7 - goto_if_eq EventScript_164F8C + goto_if eq, EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F lockall compare_var_to_value VAR_0x4003, 100 - goto_if_eq EventScript_164F8A + goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4003, 100 compare_var_to_value VAR_0x4008, 7 - goto_if_eq EventScript_164F8C + goto_if eq, EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2 lockall compare_var_to_value VAR_0x4004, 100 - goto_if_eq EventScript_164F8A + goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4004, 100 compare_var_to_value VAR_0x4008, 7 - goto_if_eq EventScript_164F8C + goto_if eq, EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5 lockall compare_var_to_value VAR_0x4005, 100 - goto_if_eq EventScript_164F8A + goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4005, 100 compare_var_to_value VAR_0x4008, 7 - goto_if_eq EventScript_164F8C + goto_if eq, EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8 lockall compare_var_to_value VAR_0x4006, 100 - goto_if_eq EventScript_164F8A + goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4006, 100 compare_var_to_value VAR_0x4008, 7 - goto_if_eq EventScript_164F8C + goto_if eq, EventScript_164F8C releaseall end SevenIsland_SeavaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B lockall compare_var_to_value VAR_0x4007, 100 - goto_if_eq EventScript_164F8A + goto_if eq, EventScript_164F8A call EventScript_164F2E setvar VAR_0x4007, 100 compare_var_to_value VAR_0x4008, 7 - goto_if_eq EventScript_164F8C + goto_if eq, EventScript_164F8C releaseall end @@ -138,6 +138,6 @@ EventScript_164F8A:: @ 8164F8A EventScript_164F8C:: @ 8164F8C call EventScript_164F51 msgbox gUnknown_817D31B - setflag FLAG_0x849 + setflag FLAG_SYS_UNLOCKED_TANOBY_RUINS releaseall end diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 96721c128..ecc28a62d 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "24", + "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", "x": 13, "y": 43, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 13, "y": 36, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 3, "y": 35, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 3, "y": 36, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 7, "y": 56, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 11, "y": 63, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 14, "y": 13, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 14, "y": 14, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 41, "elevation": 3, @@ -138,11 +138,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", - "flag": "18" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 13, "y": 47, "elevation": 3, @@ -151,11 +151,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 44, "elevation": 3, @@ -164,11 +164,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", - "flag": "19" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 12, "y": 47, "elevation": 3, @@ -177,11 +177,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", - "flag": "21" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_15" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 46, "elevation": 3, @@ -190,11 +190,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", - "flag": "22" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_16" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 16, "y": 47, "elevation": 3, @@ -203,11 +203,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", - "flag": "23" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_17" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 17, "y": 47, "elevation": 3, @@ -216,11 +216,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "96", + "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 31, "elevation": 3, @@ -229,11 +229,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SevenIsland_SevaultCanyon_EventScript_1BE00C", - "flag": "27" + "script": "EventScript_InteractWithRockSmashRockObject", + "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 18, "y": 45, "elevation": 3, @@ -243,10 +243,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_SevaultCanyon_EventScript_1BECDE", - "flag": "487" + "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_KINGS_ROCK" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 7, "y": 38, "elevation": 3, @@ -256,10 +256,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_SevaultCanyon_EventScript_1BECEB", - "flag": "488" + "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_MAX_ELIXIR" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 23, "elevation": 3, @@ -269,10 +269,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_SevaultCanyon_EventScript_1BECF8", - "flag": "489" + "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_NUGGET" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 8, "y": 26, "elevation": 3, @@ -309,8 +309,9 @@ "y": 66, "elevation": 3, "item": "ITEM_CHERI_BERRY", - "flag": "63", - "unknown": 1 + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_SEVAULT_CANYON_CHERI_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 32435d020..90a26bff2 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 12, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 3, "y": 34, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 4, "y": 34, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 11, "y": 26, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 10, "y": 26, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 11, "y": 17, "elevation": 5, @@ -125,8 +125,9 @@ "y": 29, "elevation": 5, "item": "ITEM_RAWST_BERRY", - "flag": "188", - "unknown": 1 + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE_RAWST_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index 3b38de1a7..8fa5f28fb 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 2, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "117", + "graphics_id": "MAP_OBJ_GFX_CHANSEY", "x": 4, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 6, "y": 4, "elevation": 0, @@ -50,7 +50,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_SevaultCanyon_House_EventScript_1BEDFC", - "flag": "509" + "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE_LUCKY_PUNCH" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index ed5f0d95d..dcf37028d 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -3,8 +3,8 @@ SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182 SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 lock - checkflag FLAG_0x002 - goto_if_eq EventScript_172211 + checkflag FLAG_TEMP_2 + goto_if TRUE, EventScript_172211 playbgm MUS_P_SCHOOL, 0 applymovement 1, Movement_172231 waitmovement 0 @@ -16,21 +16,21 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 textcolor 3 msgbox gUnknown_81A4DAF, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_172225 + goto_if eq, EventScript_172225 msgbox gUnknown_81A4DD8 closemessage call EventScript_1A6675 compare_var_to_value VAR_FACING, 1 - call_if 5, EventScript_172206 + call_if ne, EventScript_172206 delay 30 playbgm MUS_P_SCHOOL, 0 applymovement 255, Movement_172231 waitmovement 0 fadedefaultbgm delay 30 - call EventScript_1A6C26 + call EventScript_FadeOut_Heal_FadeIn msgbox gUnknown_81A4DF5 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 release end diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index 46cd52796..812fa7fc3 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 35, "y": 7, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 121, "y": 11, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 85, "y": 8, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 85, "y": 5, "elevation": 3, @@ -131,8 +131,9 @@ "y": 10, "elevation": 3, "item": "ITEM_HEART_SCALE", - "flag": "65", - "unknown": 1 + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -140,8 +141,9 @@ "y": 9, "elevation": 3, "item": "ITEM_HEART_SCALE", - "flag": "66", - "unknown": 1 + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_2", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -149,8 +151,9 @@ "y": 5, "elevation": 3, "item": "ITEM_HEART_SCALE", - "flag": "67", - "unknown": 1 + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_3", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -158,8 +161,9 @@ "y": 2, "elevation": 3, "item": "ITEM_HEART_SCALE", - "flag": "64", - "unknown": 1 + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TANOBY_RUINS_HEART_SCALE_4", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index fcf63e782..9d9244f89 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 56, "y": 26, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 56, "y": 29, "elevation": 3, @@ -63,8 +63,9 @@ "y": 27, "elevation": 3, "item": "ITEM_BIG_PEARL", - "flag": "185", - "unknown": 1 + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_BIG_PEARL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -72,8 +73,9 @@ "y": 30, "elevation": 3, "item": "ITEM_PEARL", - "flag": "186", - "unknown": 1 + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_PEARL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -81,8 +83,9 @@ "y": 32, "elevation": 3, "item": "ITEM_NANAB_BERRY", - "flag": "187", - "unknown": 1 + "flag": "HIDDEN_ITEM_SEVEN_ISLAND_TRAINER_TOWER_NANAB_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/SevenIsland_TrainerTower/scripts.inc b/data/maps/SevenIsland_TrainerTower/scripts.inc index 74902ebc8..e0b5f78c0 100644 --- a/data/maps/SevenIsland_TrainerTower/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower/scripts.inc @@ -3,7 +3,7 @@ SevenIsland_TrainerTower_MapScripts:: @ 8168BD5 .byte 0 SevenIsland_TrainerTower_MapScript1_168BDB:: @ 8168BDB - setvar VAR_0x4082, 0 + setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 end SevenIsland_TrainerTower_EventScript_168BE1:: @ 8168BE1 diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json index a830c85d0..8340ada47 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/map.json +++ b/data/maps/SevenIsland_TrainerTower_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "6" + "flag": "FLAG_TEMP_6" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 11, "y": 10, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_1F_EventScript_1646C8", - "flag": "2" + "flag": "FLAG_TEMP_2" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_1F_EventScript_1646CE", - "flag": "3" + "flag": "FLAG_TEMP_3" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_1F_EventScript_1646D4", - "flag": "4" + "flag": "FLAG_TEMP_4" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 10, "y": 10, "elevation": 3, @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_1F_EventScript_1646DA", - "flag": "5" + "flag": "FLAG_TEMP_5" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json index 6fdc50198..3cab31165 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/map.json +++ b/data/maps/SevenIsland_TrainerTower_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1646E0", - "flag": "6" + "flag": "FLAG_TEMP_6" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1646C8", - "flag": "2" + "flag": "FLAG_TEMP_2" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1646CE", - "flag": "3" + "flag": "FLAG_TEMP_3" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1646D4", - "flag": "4" + "flag": "FLAG_TEMP_4" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_2F_EventScript_1646DA", - "flag": "5" + "flag": "FLAG_TEMP_5" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json index d697f3adb..32b53f781 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/map.json +++ b/data/maps/SevenIsland_TrainerTower_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1646E0", - "flag": "6" + "flag": "FLAG_TEMP_6" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1646C8", - "flag": "2" + "flag": "FLAG_TEMP_2" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1646CE", - "flag": "3" + "flag": "FLAG_TEMP_3" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1646D4", - "flag": "4" + "flag": "FLAG_TEMP_4" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_3F_EventScript_1646DA", - "flag": "5" + "flag": "FLAG_TEMP_5" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json index f6b7336ee..cfb7f97c7 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/map.json +++ b/data/maps/SevenIsland_TrainerTower_4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1646E0", - "flag": "6" + "flag": "FLAG_TEMP_6" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1646C8", - "flag": "2" + "flag": "FLAG_TEMP_2" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1646CE", - "flag": "3" + "flag": "FLAG_TEMP_3" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1646D4", - "flag": "4" + "flag": "FLAG_TEMP_4" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_4F_EventScript_1646DA", - "flag": "5" + "flag": "FLAG_TEMP_5" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json index c5ce3d4c7..7aae856d4 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/map.json +++ b/data/maps/SevenIsland_TrainerTower_5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1646E0", - "flag": "6" + "flag": "FLAG_TEMP_6" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1646C8", - "flag": "2" + "flag": "FLAG_TEMP_2" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1646CE", - "flag": "3" + "flag": "FLAG_TEMP_3" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1646D4", - "flag": "4" + "flag": "FLAG_TEMP_4" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_5F_EventScript_1646DA", - "flag": "5" + "flag": "FLAG_TEMP_5" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json index 5fc6fc1df..6c9ab9fa5 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/map.json +++ b/data/maps/SevenIsland_TrainerTower_6F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1646E0", - "flag": "6" + "flag": "FLAG_TEMP_6" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1646C8", - "flag": "2" + "flag": "FLAG_TEMP_2" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1646CE", - "flag": "3" + "flag": "FLAG_TEMP_3" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1646D4", - "flag": "4" + "flag": "FLAG_TEMP_4" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_6F_EventScript_1646DA", - "flag": "5" + "flag": "FLAG_TEMP_5" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json index 2ede0ac79..e3984966b 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/map.json +++ b/data/maps/SevenIsland_TrainerTower_7F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1646E0", - "flag": "6" + "flag": "FLAG_TEMP_6" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1646C8", - "flag": "2" + "flag": "FLAG_TEMP_2" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1646CE", - "flag": "3" + "flag": "FLAG_TEMP_3" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1646D4", - "flag": "4" + "flag": "FLAG_TEMP_4" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_7F_EventScript_1646DA", - "flag": "5" + "flag": "FLAG_TEMP_5" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json index a04a282bf..c83e9128b 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/map.json +++ b/data/maps/SevenIsland_TrainerTower_8F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1646E0", - "flag": "6" + "flag": "FLAG_TEMP_6" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1646C8", - "flag": "2" + "flag": "FLAG_TEMP_2" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1646CE", - "flag": "3" + "flag": "FLAG_TEMP_3" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1646D4", - "flag": "4" + "flag": "FLAG_TEMP_4" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, @@ -76,7 +76,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_8F_EventScript_1646DA", - "flag": "5" + "flag": "FLAG_TEMP_5" } ], "warp_events": [ diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc index de508c706..b1fc46abd 100644 --- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc @@ -6,9 +6,9 @@ SevenIsland_TrainerTower_Elevator_MapScripts:: @ 8164AF8 SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03 lockall setvar VAR_0x8004, 6 - checkflag FLAG_0x002 - call_if 0, EventScript_1A7AB9 - copyvar VAR_0x8005, VAR_0x403A + checkflag FLAG_TEMP_2 + call_if FALSE, EventScript_1A7AB9 + copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special sub_80CB580 message Text_1A535C waitmessage @@ -40,10 +40,10 @@ EventScript_164B5E:: @ 8164B5E EventScript_164B90:: @ 8164B90 setvar VAR_0x8006, 3 setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8 - compare_var_to_value VAR_0x403A, 3 - goto_if_eq EventScript_164BD3 + compare_var_to_value VAR_ELEVATOR_FLOOR, 3 + goto_if eq, EventScript_164BD3 call EventScript_164BD8 - setvar VAR_0x403A, 3 + setvar VAR_ELEVATOR_FLOOR, 3 special sub_80CB63C delay 25 applymovement 255, Movement_164BE5 @@ -68,7 +68,7 @@ EventScript_164BD8:: @ 8164BD8 waitse special sub_80CB498 waitstate - setflag FLAG_0x002 + setflag FLAG_TEMP_2 return Movement_164BE5:: @ 8164BE5 diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/SevenIsland_TrainerTower_Lobby/map.json index ac93f0992..0b3bc2fc5 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/map.json +++ b/data/maps/SevenIsland_TrainerTower_Lobby/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 4, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "66", + "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", "x": 14, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "66", + "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", "x": 11, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 12, "y": 13, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 2, "y": 12, "elevation": 3, @@ -108,7 +108,7 @@ "x": 9, "y": 7, "elevation": 3, - "var": "VAR_0x4082", + "var": "VAR_MAP_SCENE_TRAINER_TOWER", "var_value": 0, "script": "SevenIsland_TrainerTower_Lobby_EventScript_1649CE" } diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc index 5515316cb..24f2fd622 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc @@ -13,7 +13,7 @@ SevenIsland_TrainerTower_Lobby_MapScript1_164853:: @ 8164853 setvar VAR_0x8004, 18 special sub_815D9E8 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_164886 + goto_if eq, EventScript_164886 setvar VAR_0x4000, 0 setobjectxy 255, 9, 7 applymovement 255, Movement_164AD4 @@ -31,7 +31,7 @@ SevenIsland_TrainerTower_Lobby_MapScript2_164887:: @ 8164887 SevenIsland_TrainerTower_Lobby_MapScript4_164897:: @ 8164897 compare_var_to_value VAR_0x400D, 17 - call_if 1, EventScript_1648A3 + call_if eq, EventScript_1648A3 end EventScript_1648A3:: @ 81648A3 @@ -93,7 +93,7 @@ EventScript_16494B:: @ 816494B closemessage applymovement 255, Movement_164AD6 waitmovement 0 - setvar VAR_0x4082, 0 + setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 release EventScript_16495C:: @ 816495C @@ -112,7 +112,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966 setvar VAR_0x8004, 20 special sub_815D9E8 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_164988 + goto_if eq, EventScript_164988 msgbox gUnknown_817C9A2 goto EventScript_164990 @@ -126,7 +126,7 @@ EventScript_164990:: @ 8164990 SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 @@ -159,7 +159,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE setvar VAR_0x8004, 17 special sub_815D9E8 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_164A00 + goto_if eq, EventScript_164A00 msgbox gUnknown_817C7D9 goto EventScript_164A08 @@ -195,7 +195,7 @@ EventScript_164A53:: @ 8164A53 EventScript_164AA0:: @ 8164AA0 copyvar VAR_0x8005, VAR_RESULT - setvar VAR_0x4082, 1 + setvar VAR_MAP_SCENE_TRAINER_TOWER, 1 special sp000_heal_pokemon msgbox gUnknown_817C8BF setvar VAR_0x8004, 6 diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/SevenIsland_TrainerTower_Roof/map.json index ade5bc46c..4fb265a15 100644 --- a/data/maps/SevenIsland_TrainerTower_Roof/map.json +++ b/data/maps/SevenIsland_TrainerTower_Roof/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "70", + "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SevenIsland_TrainerTower_Roof_EventScript_1646E0", - "flag": "6" + "flag": "FLAG_TEMP_6" } ], "warp_events": [ diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index bc8c5fe00..666d811f8 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 2, "y": 7, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "SilphCo_10F_EventScript_161DC0", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 10, "y": 17, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 0, "y": 13, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "SilphCo_10F_EventScript_161DD7", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 15, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_10F_EventScript_1BE8F5", - "flag": "407" + "flag": "FLAG_HIDE_SILPH_CO_10F_CARBOS" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 15, "elevation": 3, @@ -76,10 +76,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_10F_EventScript_1BE902", - "flag": "408" + "flag": "FLAG_HIDE_SILPH_CO_10F_ULTRA_BALL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 3, "y": 17, "elevation": 3, @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_10F_EventScript_1BE90F", - "flag": "409" + "flag": "FLAG_HIDE_SILPH_CO_10F_RARE_CANDY" } ], "warp_events": [ @@ -172,8 +172,9 @@ "y": 9, "elevation": 0, "item": "ITEM_HP_UP", - "flag": "143", - "unknown": 1 + "flag": "HIDDEN_ITEM_SILPH_CO_10F_HP_UP", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index dea6b7af4..58f28c644 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -3,15 +3,15 @@ SilphCo_10F_MapScripts:: @ 8161D86 .byte 0 SilphCo_10F_MapScript1_161D8C:: @ 8161D8C - checkflag FLAG_0x28C - call_if 0, EventScript_1A84D6 + checkflag FLAG_SILPH_10F_DOOR + call_if FALSE, EventScript_1A84D6 end SilphCo_10F_EventScript_161D96:: @ 8161D96 lock faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_161DAD + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if ge, EventScript_161DAD msgbox gUnknown_8176DBA release end @@ -26,11 +26,11 @@ SilphCo_10F_EventScript_161DB7:: @ 8161DB7 end SilphCo_10F_EventScript_161DC0:: @ 8161DC0 - trainerbattle 0, 345, 0, Text_176D57, Text_176D73 + trainerbattle 0, TRAINER_SCIENTIST_TRAVIS, 0, Text_176D57, Text_176D73 msgbox gUnknown_8176D86, 6 end SilphCo_10F_EventScript_161DD7:: @ 8161DD7 - trainerbattle 0, 389, 0, Text_176CED, Text_176D18 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_39, 0, Text_176CED, Text_176D18 msgbox gUnknown_8176D25, 6 end diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 3406c6a7b..10f0bc778 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 9, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 11, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "87", + "graphics_id": "MAP_OBJ_GFX_GIOVANNI", "x": 6, "y": 11, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 16, "y": 12, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, "script": "SilphCo_11F_EventScript_161F40", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 16, "y": 18, "elevation": 3, @@ -76,10 +76,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_11F_EventScript_1BEB58", - "flag": "457" + "flag": "FLAG_HIDE_SILPH_CO_11F_ZINC" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 2, "y": 19, "elevation": 3, @@ -89,7 +89,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, "script": "SilphCo_11F_EventScript_161F57", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" } ], "warp_events": [ @@ -121,7 +121,7 @@ "x": 5, "y": 15, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_MAP_SCENE_SILPH_CO_11F", "var_value": 0, "script": "SilphCo_11F_EventScript_161E88" }, @@ -130,7 +130,7 @@ "x": 6, "y": 15, "elevation": 3, - "var": "VAR_0x4060", + "var": "VAR_MAP_SCENE_SILPH_CO_11F", "var_value": 0, "script": "SilphCo_11F_EventScript_161E94" } @@ -170,8 +170,9 @@ "y": 18, "elevation": 0, "item": "ITEM_REVIVE", - "flag": "144", - "unknown": 1 + "flag": "HIDDEN_ITEM_SILPH_CO_11F_REVIVE", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 3eade43f5..d418848ea 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -3,27 +3,27 @@ SilphCo_11F_MapScripts:: @ 8161DEE .byte 0 SilphCo_11F_MapScript1_161DF4:: @ 8161DF4 - checkflag FLAG_0x28D - call_if 0, EventScript_1A8504 + checkflag FLAG_SILPH_11F_DOOR + call_if FALSE, EventScript_1A8504 end SilphCo_11F_EventScript_161DFE:: @ 8161DFE lock faceplayer - checkflag FLAG_0x250 - goto_if_eq EventScript_161E75 + checkflag FLAG_GOT_MASTER_BALL_FROM_SILPH + goto_if TRUE, EventScript_161E75 checkplayergender compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_161E59 + call_if eq, EventScript_161E59 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_161E62 + call_if eq, EventScript_161E62 checkitemspace ITEM_MASTER_BALL, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_161E6B + goto_if eq, EventScript_161E6B additem ITEM_MASTER_BALL, 1 giveitemfanfaremsg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5 msgbox gUnknown_8176FEB - setflag FLAG_0x250 + setflag FLAG_GOT_MASTER_BALL_FROM_SILPH release end @@ -73,11 +73,11 @@ EventScript_161EA0:: @ 8161EA0 msgbox gUnknown_8177108 closemessage compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_161F00 + call_if eq, EventScript_161F00 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_161F12 + call_if eq, EventScript_161F12 setvar VAR_LAST_TALKED, 3 - trainerbattle 3, 349, 0, Text_1771AB + trainerbattle 3, TRAINER_BOSS_GIOVANNI_2, 0, Text_1771AB msgbox gUnknown_81771C2 closemessage fadescreen 1 @@ -85,9 +85,9 @@ EventScript_161EA0:: @ 8161EA0 removeobject 4 removeobject 6 fadescreen 0 - setvar VAR_0x4060, 1 - setflag FLAG_0x03E - clearflag FLAG_0x03F + setvar VAR_MAP_SCENE_SILPH_CO_11F, 1 + setflag FLAG_HIDE_SAFFRON_ROCKETS + clearflag FLAG_HIDE_SAFFRON_CIVILIANS releaseall end @@ -134,11 +134,11 @@ SilphCo_11F_EventScript_161F37:: @ 8161F37 end SilphCo_11F_EventScript_161F40:: @ 8161F40 - trainerbattle 0, 390, 0, Text_1772B8, Text_1772E7 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_40, 0, Text_1772B8, Text_1772E7 msgbox gUnknown_81772F9, 6 end SilphCo_11F_EventScript_161F57:: @ 8161F57 - trainerbattle 0, 391, 0, Text_17726A, Text_17728C + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_41, 0, Text_17726A, Text_17728C msgbox gUnknown_817729B, 6 end diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index d82ff755d..1adffa9bf 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 3, "y": 7, "elevation": 3, @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_1F_EventScript_16162F", - "flag": "63" + "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" } ], "warp_events": [ diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index 13c6b8584..8abb2ed86 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 29, "y": 12, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, "script": "SilphCo_2F_EventScript_1616AE", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 28, "y": 18, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "SilphCo_2F_EventScript_161680", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 20, "y": 14, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "SilphCo_2F_EventScript_161697", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 5, "y": 19, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_2F_EventScript_161669", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 10, "y": 4, "elevation": 0, @@ -193,9 +193,10 @@ "x": 11, "y": 21, "elevation": 0, - "item": "POCKET_KEY_ITEMS", - "flag": "135", - "unknown": 1 + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_SILPH_CO_2F_ULTRA_BALL", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 309ee5d13..e0ca5906b 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -3,10 +3,10 @@ SilphCo_2F_MapScripts:: @ 8161641 .byte 0 SilphCo_2F_MapScript1_161647:: @ 8161647 - checkflag FLAG_0x27A - call_if 0, EventScript_1A8149 - checkflag FLAG_0x27B - call_if 0, EventScript_1A8177 + checkflag FLAG_SILPH_2F_DOOR_1 + call_if FALSE, EventScript_1A8149 + checkflag FLAG_SILPH_2F_DOOR_2 + call_if FALSE, EventScript_1A8177 end SilphCo_2F_EventScript_16165A:: @ 816165A @@ -20,21 +20,21 @@ SilphCo_2F_EventScript_161660:: @ 8161660 end SilphCo_2F_EventScript_161669:: @ 8161669 - trainerbattle 0, 336, 0, Text_175562, Text_17557E + trainerbattle 0, TRAINER_SCIENTIST_CONNOR, 0, Text_175562, Text_17557E msgbox gUnknown_817559F, 6 end SilphCo_2F_EventScript_161680:: @ 8161680 - trainerbattle 0, 337, 0, Text_1755C6, Text_1755E5 + trainerbattle 0, TRAINER_SCIENTIST_JERRY, 0, Text_1755C6, Text_1755E5 msgbox gUnknown_81755F2, 6 end SilphCo_2F_EventScript_161697:: @ 8161697 - trainerbattle 0, 373, 0, Text_17562D, Text_17564A + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_23, 0, Text_17562D, Text_17564A msgbox gUnknown_8175651, 6 end SilphCo_2F_EventScript_1616AE:: @ 81616AE - trainerbattle 0, 374, 0, Text_1756AD, Text_1756D8 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_24, 0, Text_1756AD, Text_1756D8 msgbox gUnknown_81756E2, 6 end diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 99ef61e01..ced5b0efa 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 25, "y": 9, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "SilphCo_3F_EventScript_16171F", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 31, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 4, "y": 12, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_3F_EventScript_161708", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 8, "y": 10, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_3F_EventScript_1BE866", - "flag": "396" + "flag": "FLAG_HIDE_SILPH_CO_3F_HYPER_POTION" } ], "warp_events": [ @@ -202,8 +202,9 @@ "y": 18, "elevation": 0, "item": "ITEM_PROTEIN", - "flag": "136", - "unknown": 1 + "flag": "HIDDEN_ITEM_SILPH_CO_3F_PROTEIN", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index d4b7458ce..0ef319f8c 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -3,17 +3,17 @@ SilphCo_3F_MapScripts:: @ 81616C5 .byte 0 SilphCo_3F_MapScript1_1616CB:: @ 81616CB - checkflag FLAG_0x27C - call_if 0, EventScript_1A81A5 - checkflag FLAG_0x27D - call_if 0, EventScript_1A81DC + checkflag FLAG_SILPH_3F_DOOR_1 + call_if FALSE, EventScript_1A81A5 + checkflag FLAG_SILPH_3F_DOOR_2 + call_if FALSE, EventScript_1A81DC end SilphCo_3F_EventScript_1616DE:: @ 81616DE lock faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_1616F5 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if ge, EventScript_1616F5 msgbox gUnknown_81758AD release end @@ -28,11 +28,11 @@ SilphCo_3F_EventScript_1616FF:: @ 81616FF end SilphCo_3F_EventScript_161708:: @ 8161708 - trainerbattle 0, 338, 0, Text_175948, Text_17597D + trainerbattle 0, TRAINER_SCIENTIST_JOSE, 0, Text_175948, Text_17597D msgbox gUnknown_8175990, 6 end SilphCo_3F_EventScript_16171F:: @ 816171F - trainerbattle 0, 375, 0, Text_1758F6, Text_175911 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_25, 0, Text_1758F6, Text_175911 msgbox gUnknown_817591C, 6 end diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index aed1bd4a5..37566a737 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 33, "y": 16, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "SilphCo_4F_EventScript_1617A7", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 10, "y": 19, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, "script": "SilphCo_4F_EventScript_161790", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 14, "y": 8, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "SilphCo_4F_EventScript_161779", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 5, "y": 5, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 3, "y": 11, "elevation": 3, @@ -76,10 +76,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_4F_EventScript_1BE873", - "flag": "397" + "flag": "FLAG_HIDE_SILPH_CO_4F_MAX_REVIVE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 4, "y": 12, "elevation": 3, @@ -89,10 +89,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_4F_EventScript_1BE880", - "flag": "398" + "flag": "FLAG_HIDE_SILPH_CO_4F_ESCAPE_ROPE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 13, "elevation": 3, @@ -102,10 +102,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_4F_EventScript_1BE88D", - "flag": "399" + "flag": "FLAG_HIDE_SILPH_CO_4F_FULL_HEAL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 30, "y": 18, "elevation": 0, @@ -115,7 +115,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_4F_EventScript_1BEE09", - "flag": "510" + "flag": "FLAG_HIDE_SILPH_CO_4F_TM41" } ], "warp_events": [ @@ -233,8 +233,9 @@ "y": 20, "elevation": 0, "item": "ITEM_IRON", - "flag": "137", - "unknown": 1 + "flag": "HIDDEN_ITEM_SILPH_CO_4F_IRON", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index 884f2e410..f2fadd471 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -3,17 +3,17 @@ SilphCo_4F_MapScripts:: @ 8161736 .byte 0 SilphCo_4F_MapScript1_16173C:: @ 816173C - checkflag FLAG_0x27E - call_if 0, EventScript_1A8213 - checkflag FLAG_0x27F - call_if 0, EventScript_1A8241 + checkflag FLAG_SILPH_4F_DOOR_1 + call_if FALSE, EventScript_1A8213 + checkflag FLAG_SILPH_4F_DOOR_2 + call_if FALSE, EventScript_1A8241 end SilphCo_4F_EventScript_16174F:: @ 816174F lock faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_161766 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if ge, EventScript_161766 msgbox gUnknown_81759F5 release end @@ -28,16 +28,16 @@ SilphCo_4F_EventScript_161770:: @ 8161770 end SilphCo_4F_EventScript_161779:: @ 8161779 - trainerbattle 0, 339, 0, Text_175A90, Text_175AB0 + trainerbattle 0, TRAINER_SCIENTIST_RODNEY, 0, Text_175A90, Text_175AB0 msgbox gUnknown_8175AC8, 6 end SilphCo_4F_EventScript_161790:: @ 8161790 - trainerbattle 0, 376, 0, Text_175A2F, Text_175A5B + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_26, 0, Text_175A2F, Text_175A5B msgbox gUnknown_8175A62, 6 end SilphCo_4F_EventScript_1617A7:: @ 81617A7 - trainerbattle 0, 377, 0, Text_175B19, Text_175B2B + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_27, 0, Text_175B19, Text_175B2B msgbox gUnknown_8175B38, 6 end diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 5582db2ca..0391f0718 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 35, "y": 7, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "SilphCo_5F_EventScript_161853", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 23, "y": 13, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "SilphCo_5F_EventScript_16186A", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 16, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 11, "y": 6, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "SilphCo_5F_EventScript_161825", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 9, "y": 21, "elevation": 3, @@ -76,10 +76,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "SilphCo_5F_EventScript_16183C", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 4, "y": 9, "elevation": 3, @@ -89,10 +89,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_5F_EventScript_1BE89A", - "flag": "400" + "flag": "FLAG_HIDE_SILPH_CO_5F_PROTEIN" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 1, "y": 18, "elevation": 3, @@ -102,10 +102,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_5F_EventScript_1BE8A7", - "flag": "401" + "flag": "FLAG_HIDE_SILPH_CO_5F_TM01" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 22, "y": 21, "elevation": 3, @@ -115,10 +115,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_5F_EventScript_1BE8B4", - "flag": "402" + "flag": "FLAG_HIDE_SILPH_CO_5F_CARD_KEY" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 2, "y": 7, "elevation": 3, @@ -190,8 +190,9 @@ "y": 16, "elevation": 0, "item": "ITEM_ELIXIR", - "flag": "24", - "unknown": 1 + "flag": "HIDDEN_ITEM_SILPH_CO_5F_ELIXIR", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", @@ -304,8 +305,9 @@ "y": 9, "elevation": 0, "item": "ITEM_PP_UP", - "flag": "138", - "unknown": 1 + "flag": "HIDDEN_ITEM_SILPH_CO_5F_PP_UP", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index e17c791b9..6630007c5 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -3,19 +3,19 @@ SilphCo_5F_MapScripts:: @ 81617BE .byte 0 SilphCo_5F_MapScript1_1617C4:: @ 81617C4 - checkflag FLAG_0x280 - call_if 0, EventScript_1A826F - checkflag FLAG_0x281 - call_if 0, EventScript_1A82A6 - checkflag FLAG_0x282 - call_if 0, EventScript_1A82DD + checkflag FLAG_SILPH_5F_DOOR_1 + call_if FALSE, EventScript_1A826F + checkflag FLAG_SILPH_5F_DOOR_2 + call_if FALSE, EventScript_1A82A6 + checkflag FLAG_SILPH_5F_DOOR_3 + call_if FALSE, EventScript_1A82DD end SilphCo_5F_EventScript_1617E0:: @ 81617E0 lock faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_1617F7 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if ge, EventScript_1617F7 msgbox gUnknown_8175B70 release end @@ -42,21 +42,21 @@ SilphCo_5F_EventScript_16181C:: @ 816181C end SilphCo_5F_EventScript_161825:: @ 8161825 - trainerbattle 0, 340, 0, Text_175C40, Text_175C6D + trainerbattle 0, TRAINER_SCIENTIST_BEAU, 0, Text_175C40, Text_175C6D msgbox gUnknown_8175C7D, 6 end SilphCo_5F_EventScript_16183C:: @ 816183C - trainerbattle 0, 378, 0, Text_175BE5, Text_175C09 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_28, 0, Text_175BE5, Text_175C09 msgbox gUnknown_8175C0F, 6 end SilphCo_5F_EventScript_161853:: @ 8161853 - trainerbattle 0, 379, 0, Text_175D28, Text_175D4B + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_29, 0, Text_175D28, Text_175D4B msgbox gUnknown_8175D59, 6 end SilphCo_5F_EventScript_16186A:: @ 816186A - trainerbattle 0, 286, 0, Text_175CBD, Text_175CEB + trainerbattle 0, TRAINER_JUGGLER_DALTON, 0, Text_175CBD, Text_175CEB msgbox gUnknown_8175CF9, 6 end diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index 2d057a7c2..bdb8020b4 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 21, "y": 5, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "SilphCo_6F_EventScript_161956", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 23, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 24, "y": 9, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 22, "y": 13, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 14, "y": 9, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 16, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 9, "y": 11, "elevation": 3, @@ -102,10 +102,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "SilphCo_6F_EventScript_16193F", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 2, "y": 14, "elevation": 3, @@ -115,10 +115,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_6F_EventScript_1BE8C1", - "flag": "403" + "flag": "FLAG_HIDE_SILPH_CO_6F_HP_UP" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 1, "y": 17, "elevation": 3, @@ -128,10 +128,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_6F_EventScript_1BE8CE", - "flag": "404" + "flag": "FLAG_HIDE_SILPH_CO_6F_X_SPECIAL" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 18, "y": 17, "elevation": 3, @@ -141,7 +141,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "SilphCo_6F_EventScript_16196D", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" } ], "warp_events": [ @@ -217,8 +217,9 @@ "y": 8, "elevation": 0, "item": "ITEM_CARBOS", - "flag": "139", - "unknown": 1 + "flag": "HIDDEN_ITEM_SILPH_CO_6F_CARBOS", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index caeedd216..2ac42a2b3 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -3,15 +3,15 @@ SilphCo_6F_MapScripts:: @ 8161881 .byte 0 SilphCo_6F_MapScript1_161887:: @ 8161887 - checkflag FLAG_0x283 - call_if 0, EventScript_1A8314 + checkflag FLAG_SILPH_6F_DOOR + call_if FALSE, EventScript_1A8314 end SilphCo_6F_EventScript_161891:: @ 8161891 lock faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_1618A8 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if ge, EventScript_1618A8 msgbox gUnknown_817607E release end @@ -24,8 +24,8 @@ EventScript_1618A8:: @ 81618A8 SilphCo_6F_EventScript_1618B2:: @ 81618B2 lock faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_1618C9 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if ge, EventScript_1618C9 msgbox gUnknown_8175F24 release end @@ -38,8 +38,8 @@ EventScript_1618C9:: @ 81618C9 SilphCo_6F_EventScript_1618D3:: @ 81618D3 lock faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_1618EA + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if ge, EventScript_1618EA msgbox gUnknown_8175F70 release end @@ -52,8 +52,8 @@ EventScript_1618EA:: @ 81618EA SilphCo_6F_EventScript_1618F4:: @ 81618F4 lock faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_16190B + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if ge, EventScript_16190B msgbox gUnknown_8175FAA release end @@ -66,8 +66,8 @@ EventScript_16190B:: @ 816190B SilphCo_6F_EventScript_161915:: @ 8161915 lock faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_16192C + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if ge, EventScript_16192C msgbox gUnknown_8176012 release end @@ -82,16 +82,16 @@ SilphCo_6F_EventScript_161936:: @ 8161936 end SilphCo_6F_EventScript_16193F:: @ 816193F - trainerbattle 0, 341, 0, Text_176136, Text_1761BD + trainerbattle 0, TRAINER_SCIENTIST_TAYLOR, 0, Text_176136, Text_1761BD msgbox gUnknown_81761C4, 6 end SilphCo_6F_EventScript_161956:: @ 8161956 - trainerbattle 0, 380, 0, Text_1760DE, Text_176104 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_30, 0, Text_1760DE, Text_176104 msgbox gUnknown_817610F, 6 end SilphCo_6F_EventScript_16196D:: @ 816196D - trainerbattle 0, 381, 0, Text_1761F1, Text_17620E + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_31, 0, Text_1761F1, Text_17620E msgbox gUnknown_817621B, 6 end diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index e106c5ad8..fcaeaef00 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 2, "y": 6, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "78" + "flag": "FLAG_HIDE_SILPH_RIVAL" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 0, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 24, "y": 5, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "SilphCo_7F_EventScript_161C1A", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 24, "y": 15, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "SilphCo_7F_EventScript_161C31", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 13, "y": 4, "elevation": 3, @@ -76,10 +76,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "SilphCo_7F_EventScript_161C48", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 10, "y": 10, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 13, "y": 14, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 9, "y": 14, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 3, "y": 13, "elevation": 3, @@ -128,10 +128,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "SilphCo_7F_EventScript_161C03", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 0, "y": 12, "elevation": 3, @@ -141,10 +141,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_7F_EventScript_1BE8DB", - "flag": "405" + "flag": "FLAG_HIDE_SILPH_CO_7F_CALCIUM" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 30, "y": 11, "elevation": 3, @@ -154,7 +154,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_7F_EventScript_1BE8E8", - "flag": "406" + "flag": "FLAG_HIDE_SILPH_CO_7F_TM08" } ], "warp_events": [ @@ -207,7 +207,7 @@ "x": 2, "y": 4, "elevation": 3, - "var": "VAR_0x405C", + "var": "VAR_MAP_SCENE_SILPH_CO_7F", "var_value": 0, "script": "SilphCo_7F_EventScript_1619BC" }, @@ -216,7 +216,7 @@ "x": 2, "y": 5, "elevation": 3, - "var": "VAR_0x405C", + "var": "VAR_MAP_SCENE_SILPH_CO_7F", "var_value": 0, "script": "SilphCo_7F_EventScript_1619C8" } @@ -312,8 +312,9 @@ "y": 11, "elevation": 0, "item": "ITEM_ZINC", - "flag": "140", - "unknown": 1 + "flag": "HIDDEN_ITEM_SILPH_CO_7F_ZINC", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 22fd4114c..c76aac197 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -4,17 +4,17 @@ SilphCo_7F_MapScripts:: @ 8161984 .byte 0 SilphCo_7F_MapScript1_16198F:: @ 816198F - checkflag FLAG_0x284 - call_if 0, EventScript_1A834B - checkflag FLAG_0x285 - call_if 0, EventScript_1A8379 - checkflag FLAG_0x286 - call_if 0, EventScript_1A83A7 + checkflag FLAG_SILPH_7F_DOOR_1 + call_if FALSE, EventScript_1A834B + checkflag FLAG_SILPH_7F_DOOR_2 + call_if FALSE, EventScript_1A8379 + checkflag FLAG_SILPH_7F_DOOR_3 + call_if FALSE, EventScript_1A83A7 end SilphCo_7F_MapScript2_1619AB:: @ 81619AB - compare_var_to_value VAR_0x4060, 1 - call_if 4, EventScript_1619B7 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + call_if ge, EventScript_1619B7 end EventScript_1619B7:: @ 81619B7 @@ -47,29 +47,29 @@ EventScript_1619D4:: @ 81619D4 waitmovement 0 msgbox gUnknown_8176710 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_161A73 + call_if eq, EventScript_161A73 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_161A7F + call_if eq, EventScript_161A7F msgbox gUnknown_8176727 setvar VAR_LAST_TALKED, 1 compare_var_to_value VAR_STARTER_MON, 2 - call_if 1, EventScript_161A80 + call_if eq, EventScript_161A80 compare_var_to_value VAR_STARTER_MON, 1 - call_if 1, EventScript_161A8B + call_if eq, EventScript_161A8B compare_var_to_value VAR_STARTER_MON, 0 - call_if 1, EventScript_161A96 + call_if eq, EventScript_161A96 msgbox gUnknown_8176827 closemessage playbgm MUS_RIVAL2, 0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_161AA1 + call_if eq, EventScript_161AA1 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_161AAC + call_if eq, EventScript_161AAC playse SE_TK_WARPIN fadedefaultbgm removeobject 1 waitse - setvar VAR_0x405C, 1 + setvar VAR_MAP_SCENE_SILPH_CO_7F, 1 releaseall end @@ -83,15 +83,15 @@ EventScript_161A7F:: @ 8161A7F return EventScript_161A80:: @ 8161A80 - trainerbattle 3, 432, 0, Text_1767D0 + trainerbattle 3, TRAINER_RIVAL_SILPH_SQUIRTLE, 0, Text_1767D0 return EventScript_161A8B:: @ 8161A8B - trainerbattle 3, 433, 0, Text_1767D0 + trainerbattle 3, TRAINER_RIVAL_SILPH_BULBASAUR, 0, Text_1767D0 return EventScript_161A96:: @ 8161A96 - trainerbattle 3, 434, 0, Text_1767D0 + trainerbattle 3, TRAINER_RIVAL_SILPH_CHARMANDER, 0, Text_1767D0 return EventScript_161AA1:: @ 8161AA1 @@ -130,17 +130,17 @@ Movement_161ABF:: @ 8161ABF SilphCo_7F_EventScript_161AC8:: @ 8161AC8 lock faceplayer - checkflag FLAG_0x246 - goto_if_eq EventScript_161B8D + checkflag FLAG_GOT_LAPRAS_FROM_SILPH + goto_if TRUE, EventScript_161B8D msgbox gUnknown_8176266 setvar VAR_0x4001, SPECIES_LAPRAS givemon SPECIES_LAPRAS, 25, ITEM_NONE, 0, 0, 0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_161B12 + goto_if eq, EventScript_161B12 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_161B45 + goto_if eq, EventScript_161B45 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A927C + goto_if eq, EventScript_1A927C release end @@ -153,7 +153,7 @@ EventScript_161B12:: @ 8161B12 getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_161B7E + goto_if eq, EventScript_161B7E call EventScript_1A8C27 call EventScript_1A74EB goto EventScript_161B7E @@ -170,7 +170,7 @@ EventScript_161B45:: @ 8161B45 getspeciesname 0, SPECIES_LAPRAS msgbox gUnknown_81A56A7, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_161B73 + goto_if eq, EventScript_161B73 call EventScript_1A8C33 goto EventScript_161B73 @@ -187,7 +187,7 @@ EventScript_161B7D:: @ 8161B7D EventScript_161B7E:: @ 8161B7E textcolor 0 msgbox gUnknown_8176305 - setflag FLAG_0x246 + setflag FLAG_GOT_LAPRAS_FROM_SILPH release end @@ -199,8 +199,8 @@ EventScript_161B8D:: @ 8161B8D SilphCo_7F_EventScript_161B97:: @ 8161B97 lock faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_161BAE + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if ge, EventScript_161BAE msgbox gUnknown_8176444 release end @@ -213,8 +213,8 @@ EventScript_161BAE:: @ 8161BAE SilphCo_7F_EventScript_161BB8:: @ 8161BB8 lock faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_161BCF + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if ge, EventScript_161BCF msgbox gUnknown_81764C2 release end @@ -227,8 +227,8 @@ EventScript_161BCF:: @ 8161BCF SilphCo_7F_EventScript_161BD9:: @ 8161BD9 lock faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_161BF0 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if ge, EventScript_161BF0 msgbox gUnknown_8176532 release end @@ -243,21 +243,21 @@ SilphCo_7F_EventScript_161BFA:: @ 8161BFA end SilphCo_7F_EventScript_161C03:: @ 8161C03 - trainerbattle 0, 342, 0, Text_1765E2, Text_17660C + trainerbattle 0, TRAINER_SCIENTIST_JOSHUA, 0, Text_1765E2, Text_17660C msgbox gUnknown_8176616, 6 end SilphCo_7F_EventScript_161C1A:: @ 8161C1A - trainerbattle 0, 383, 0, Text_176643, Text_176669 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_33, 0, Text_176643, Text_176669 msgbox gUnknown_8176681, 6 end SilphCo_7F_EventScript_161C31:: @ 8161C31 - trainerbattle 0, 384, 0, Text_1766B3, Text_1766D7 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_34, 0, Text_1766B3, Text_1766D7 msgbox gUnknown_81766E5, 6 end SilphCo_7F_EventScript_161C48:: @ 8161C48 - trainerbattle 0, 385, 0, Text_176586, Text_1765A5 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_35, 0, Text_176586, Text_1765A5 msgbox gUnknown_81765B1, 6 end diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 437b935dd..05f29bbd3 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 28, "y": 5, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, "script": "SilphCo_8F_EventScript_161CB0", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 10, "y": 17, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, "script": "SilphCo_8F_EventScript_161CC7", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 9, "y": 4, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "SilphCo_8F_EventScript_161C99", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "47", + "graphics_id": "MAP_OBJ_GFX_WORKER_M", "x": 2, "y": 5, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 24, "y": 8, "elevation": 3, @@ -76,10 +76,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SilphCo_8F_EventScript_1BEB4B", - "flag": "456" + "flag": "FLAG_HIDE_SILPH_CO_8F_IRON" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 29, "y": 9, "elevation": 3, @@ -179,8 +179,9 @@ "y": 10, "elevation": 0, "item": "ITEM_NUGGET", - "flag": "141", - "unknown": 1 + "flag": "HIDDEN_ITEM_SILPH_CO_8F_NUGGET", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index 99112ee5e..70bc954cc 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -3,15 +3,15 @@ SilphCo_8F_MapScripts:: @ 8161C5F .byte 0 SilphCo_8F_MapScript1_161C65:: @ 8161C65 - checkflag FLAG_0x287 - call_if 0, EventScript_1A83D5 + checkflag FLAG_SILPH_8F_DOOR + call_if FALSE, EventScript_1A83D5 end SilphCo_8F_EventScript_161C6F:: @ 8161C6F lock faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_161C86 + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if ge, EventScript_161C86 msgbox gUnknown_817696D release end @@ -26,16 +26,16 @@ SilphCo_8F_EventScript_161C90:: @ 8161C90 end SilphCo_8F_EventScript_161C99:: @ 8161C99 - trainerbattle 0, 343, 0, Text_1769FD, Text_176A19 + trainerbattle 0, TRAINER_SCIENTIST_PARKER, 0, Text_1769FD, Text_176A19 msgbox gUnknown_8176A26, 6 end SilphCo_8F_EventScript_161CB0:: @ 8161CB0 - trainerbattle 0, 382, 0, Text_1769A2, Text_1769BE + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_32, 0, Text_1769A2, Text_1769BE msgbox gUnknown_81769CF, 6 end SilphCo_8F_EventScript_161CC7:: @ 8161CC7 - trainerbattle 0, 386, 0, Text_176A56, Text_176A7C + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_36, 0, Text_176A56, Text_176A7C msgbox gUnknown_8176A90, 6 end diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index 026b8d83c..7d3227d08 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 26, "y": 16, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, "script": "SilphCo_9F_EventScript_161D41", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 15, "y": 18, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, "script": "SilphCo_9F_EventScript_161D6F", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 2, "y": 16, "elevation": 0, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 1, "y": 6, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, "script": "SilphCo_9F_EventScript_161D58", - "flag": "83" + "flag": "FLAG_HIDE_SILPH_ROCKETS" } ], "warp_events": [ @@ -111,8 +111,9 @@ "y": 14, "elevation": 3, "item": "ITEM_MAX_POTION", - "flag": "25", - "unknown": 1 + "flag": "HIDDEN_ITEM_SILPH_CO_9F_MAX_POTION", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", @@ -232,8 +233,9 @@ "y": 8, "elevation": 0, "item": "ITEM_CALCIUM", - "flag": "142", - "unknown": 1 + "flag": "HIDDEN_ITEM_SILPH_CO_9F_CALCIUM", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index 530ae7c1a..3a69c169a 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -3,24 +3,24 @@ SilphCo_9F_MapScripts:: @ 8161CDE .byte 0 SilphCo_9F_MapScript1_161CE4:: @ 8161CE4 - checkflag FLAG_0x288 - call_if 0, EventScript_1A840C - checkflag FLAG_0x289 - call_if 0, EventScript_1A8443 - checkflag FLAG_0x28A - call_if 0, EventScript_1A847A - checkflag FLAG_0x28B - call_if 0, EventScript_1A84A8 + checkflag FLAG_SILPH_9F_DOOR_1 + call_if FALSE, EventScript_1A840C + checkflag FLAG_SILPH_9F_DOOR_2 + call_if FALSE, EventScript_1A8443 + checkflag FLAG_SILPH_9F_DOOR_3 + call_if FALSE, EventScript_1A847A + checkflag FLAG_SILPH_9F_DOOR_4 + call_if FALSE, EventScript_1A84A8 end SilphCo_9F_EventScript_161D09:: @ 8161D09 lock faceplayer - compare_var_to_value VAR_0x4060, 1 - goto_if 4, EventScript_161D2E + compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1 + goto_if ge, EventScript_161D2E msgbox gUnknown_8176B54 closemessage - call EventScript_1A6C26 + call EventScript_FadeOut_Heal_FadeIn msgbox gUnknown_8176B81 release end @@ -35,16 +35,16 @@ SilphCo_9F_EventScript_161D38:: @ 8161D38 end SilphCo_9F_EventScript_161D41:: @ 8161D41 - trainerbattle 0, 344, 0, Text_176BFB, Text_176C2B + trainerbattle 0, TRAINER_SCIENTIST_ED, 0, Text_176BFB, Text_176C2B msgbox gUnknown_8176C3C, 6 end SilphCo_9F_EventScript_161D58:: @ 8161D58 - trainerbattle 0, 387, 0, Text_176BA3, Text_176BC8 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_37, 0, Text_176BA3, Text_176BC8 msgbox gUnknown_8176BD0, 6 end SilphCo_9F_EventScript_161D6F:: @ 8161D6F - trainerbattle 0, 388, 0, Text_176C7A, Text_176CA0 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_38, 0, Text_176C7A, Text_176CA0 msgbox gUnknown_8176CB8, 6 end diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index d36334429..9338e5c6e 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -4,9 +4,9 @@ SilphCo_Elevator_MapScripts:: @ 8161F6E SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F lockall setvar VAR_0x8004, 1 - checkflag FLAG_0x002 - call_if 0, EventScript_1A7AB9 - copyvar VAR_0x8005, VAR_0x403A + checkflag FLAG_TEMP_2 + call_if FALSE, EventScript_1A7AB9 + copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR special sub_80CB580 message Text_1A535C waitmessage @@ -33,10 +33,10 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F EventScript_16202F:: @ 816202F setvar VAR_0x8006, 4 setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3 - compare_var_to_value VAR_0x403A, 4 - goto_if_eq EventScript_1621E7 + compare_var_to_value VAR_ELEVATOR_FLOOR, 4 + goto_if eq, EventScript_1621E7 call EventScript_1621EC - setvar VAR_0x403A, 4 + setvar VAR_ELEVATOR_FLOOR, 4 goto EventScript_1621E7 EventScript_162056:: @ 8162056 @@ -45,10 +45,10 @@ EventScript_162056:: @ 8162056 EventScript_162057:: @ 8162057 setvar VAR_0x8006, 5 setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3 - compare_var_to_value VAR_0x403A, 5 - goto_if_eq EventScript_1621E7 + compare_var_to_value VAR_ELEVATOR_FLOOR, 5 + goto_if eq, EventScript_1621E7 call EventScript_1621EC - setvar VAR_0x403A, 5 + setvar VAR_ELEVATOR_FLOOR, 5 goto EventScript_1621E7 EventScript_16207E:: @ 816207E @@ -57,10 +57,10 @@ EventScript_16207E:: @ 816207E EventScript_16207F:: @ 816207F setvar VAR_0x8006, 6 setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3 - compare_var_to_value VAR_0x403A, 6 - goto_if_eq EventScript_1621E7 + compare_var_to_value VAR_ELEVATOR_FLOOR, 6 + goto_if eq, EventScript_1621E7 call EventScript_1621EC - setvar VAR_0x403A, 6 + setvar VAR_ELEVATOR_FLOOR, 6 goto EventScript_1621E7 EventScript_1620A6:: @ 81620A6 @@ -69,10 +69,10 @@ EventScript_1620A6:: @ 81620A6 EventScript_1620A7:: @ 81620A7 setvar VAR_0x8006, 7 setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3 - compare_var_to_value VAR_0x403A, 7 - goto_if_eq EventScript_1621E7 + compare_var_to_value VAR_ELEVATOR_FLOOR, 7 + goto_if eq, EventScript_1621E7 call EventScript_1621EC - setvar VAR_0x403A, 7 + setvar VAR_ELEVATOR_FLOOR, 7 goto EventScript_1621E7 EventScript_1620CE:: @ 81620CE @@ -81,10 +81,10 @@ EventScript_1620CE:: @ 81620CE EventScript_1620CF:: @ 81620CF setvar VAR_0x8006, 8 setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3 - compare_var_to_value VAR_0x403A, 8 - goto_if_eq EventScript_1621E7 + compare_var_to_value VAR_ELEVATOR_FLOOR, 8 + goto_if eq, EventScript_1621E7 call EventScript_1621EC - setvar VAR_0x403A, 8 + setvar VAR_ELEVATOR_FLOOR, 8 goto EventScript_1621E7 EventScript_1620F6:: @ 81620F6 @@ -93,10 +93,10 @@ EventScript_1620F6:: @ 81620F6 EventScript_1620F7:: @ 81620F7 setvar VAR_0x8006, 9 setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3 - compare_var_to_value VAR_0x403A, 9 - goto_if_eq EventScript_1621E7 + compare_var_to_value VAR_ELEVATOR_FLOOR, 9 + goto_if eq, EventScript_1621E7 call EventScript_1621EC - setvar VAR_0x403A, 9 + setvar VAR_ELEVATOR_FLOOR, 9 goto EventScript_1621E7 EventScript_16211E:: @ 816211E @@ -105,10 +105,10 @@ EventScript_16211E:: @ 816211E EventScript_16211F:: @ 816211F setvar VAR_0x8006, 10 setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3 - compare_var_to_value VAR_0x403A, 10 - goto_if_eq EventScript_1621E7 + compare_var_to_value VAR_ELEVATOR_FLOOR, 10 + goto_if eq, EventScript_1621E7 call EventScript_1621EC - setvar VAR_0x403A, 10 + setvar VAR_ELEVATOR_FLOOR, 10 goto EventScript_1621E7 EventScript_162146:: @ 8162146 @@ -117,10 +117,10 @@ EventScript_162146:: @ 8162146 EventScript_162147:: @ 8162147 setvar VAR_0x8006, 11 setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3 - compare_var_to_value VAR_0x403A, 11 - goto_if_eq EventScript_1621E7 + compare_var_to_value VAR_ELEVATOR_FLOOR, 11 + goto_if eq, EventScript_1621E7 call EventScript_1621EC - setvar VAR_0x403A, 11 + setvar VAR_ELEVATOR_FLOOR, 11 goto EventScript_1621E7 EventScript_16216E:: @ 816216E @@ -129,10 +129,10 @@ EventScript_16216E:: @ 816216E EventScript_16216F:: @ 816216F setvar VAR_0x8006, 12 setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3 - compare_var_to_value VAR_0x403A, 12 - goto_if_eq EventScript_1621E7 + compare_var_to_value VAR_ELEVATOR_FLOOR, 12 + goto_if eq, EventScript_1621E7 call EventScript_1621EC - setvar VAR_0x403A, 12 + setvar VAR_ELEVATOR_FLOOR, 12 goto EventScript_1621E7 EventScript_162196:: @ 8162196 @@ -141,10 +141,10 @@ EventScript_162196:: @ 8162196 EventScript_162197:: @ 8162197 setvar VAR_0x8006, 13 setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3 - compare_var_to_value VAR_0x403A, 13 - goto_if_eq EventScript_1621E7 + compare_var_to_value VAR_ELEVATOR_FLOOR, 13 + goto_if eq, EventScript_1621E7 call EventScript_1621EC - setvar VAR_0x403A, 13 + setvar VAR_ELEVATOR_FLOOR, 13 goto EventScript_1621E7 EventScript_1621BE:: @ 81621BE @@ -153,10 +153,10 @@ EventScript_1621BE:: @ 81621BE EventScript_1621BF:: @ 81621BF setvar VAR_0x8006, 14 setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3 - compare_var_to_value VAR_0x403A, 14 - goto_if_eq EventScript_1621E7 + compare_var_to_value VAR_ELEVATOR_FLOOR, 14 + goto_if eq, EventScript_1621E7 call EventScript_1621EC - setvar VAR_0x403A, 14 + setvar VAR_ELEVATOR_FLOOR, 14 goto EventScript_1621E7 EventScript_1621E6:: @ 81621E6 @@ -173,5 +173,5 @@ EventScript_1621EC:: @ 81621EC waitse special sub_80CB498 waitstate - setflag FLAG_0x002 + setflag FLAG_TEMP_2 return diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index a45d77e70..072d78313 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 10, "y": 15, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 15, "y": 13, "elevation": 3, @@ -91,8 +91,9 @@ "y": 7, "elevation": 3, "item": "ITEM_LEPPA_BERRY", - "flag": "184", - "unknown": 1 + "flag": "HIDDEN_ITEM_SIX_ISLAND_LEPPA_BERRY", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 0f78765b5..9f1c986c9 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "100", + "graphics_id": "MAP_OBJ_GFX_SAPPHIRE", "x": 7, "y": 7, "elevation": 0, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SixIsland_DottedHole_SapphireRoom_EventScript_1641B5", - "flag": "143" + "flag": "FLAG_HIDE_SAPPHIRE" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 5, "y": 9, "elevation": 3, @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "144" + "flag": "FLAG_HIDE_DOTTED_HOLE_SCIENTIST" } ], "warp_events": [ diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index 618a5dd4c..bf2e1eb6d 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -17,13 +17,13 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 waitmovement 0 playse SE_W070 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_16430F + call_if eq, EventScript_16430F compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_16430F + call_if eq, EventScript_16430F compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16431A + call_if eq, EventScript_16431A compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_16431A + call_if eq, EventScript_16431A setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 setvar VAR_0x8006, 12 @@ -31,47 +31,47 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 special sub_80CAC28 delay 60 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_164325 + call_if eq, EventScript_164325 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_164330 + call_if eq, EventScript_164330 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16433B + call_if eq, EventScript_16433B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_164346 + call_if eq, EventScript_164346 textcolor 0 msgbox gUnknown_817BD97 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_164351 + call_if eq, EventScript_164351 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_164366 + call_if eq, EventScript_164366 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_16437B + call_if eq, EventScript_16437B compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_164390 + call_if eq, EventScript_164390 removeobject 1 compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1642F9 + call_if eq, EventScript_1642F9 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1642F9 + call_if eq, EventScript_1642F9 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_164304 + call_if eq, EventScript_164304 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_164304 + call_if eq, EventScript_164304 msgbox gUnknown_817BDD4 closemessage compare_var_to_value VAR_FACING, 2 - call_if 1, EventScript_1643A5 + call_if eq, EventScript_1643A5 compare_var_to_value VAR_FACING, 1 - call_if 1, EventScript_1643B7 + call_if eq, EventScript_1643B7 compare_var_to_value VAR_FACING, 4 - call_if 1, EventScript_1643C9 + call_if eq, EventScript_1643C9 compare_var_to_value VAR_FACING, 3 - call_if 1, EventScript_1643DB + call_if eq, EventScript_1643DB playse SE_KAIDAN delay 35 removeobject 2 - setflag FLAG_0x2D8 + setflag FLAG_LEARNED_YES_NAH_CHANSEY release end diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index bb106cb7f..c104478d5 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 11, "y": 8, "elevation": 3, @@ -89,9 +89,10 @@ "x": 12, "y": 9, "elevation": 3, - "item": "POCKET_KEY_ITEMS", - "flag": "180", - "unknown": 1 + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_SIX_ISLAND_GREEN_PATH_ULTRA_BALL", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index c86d93e32..4469af84e 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/SixIsland_Harbor/scripts.inc b/data/maps/SixIsland_Harbor/scripts.inc index 1e4e34a16..0730e3b72 100644 --- a/data/maps/SixIsland_Harbor/scripts.inc +++ b/data/maps/SixIsland_Harbor/scripts.inc @@ -6,6 +6,6 @@ SixIsland_Harbor_EventScript_171E48:: @ 8171E48 faceplayer message Text_181726 waitmessage - setvar VAR_0x8004, 6 + setvar VAR_0x8004, SEAGALLOP_SIX_ISLAND goto EventScript_1A900F end diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index 1e82148ef..447c0a10c 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index 74cf54daa..e0852cc49 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "35", + "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", "x": 8, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 7, "y": 7, "elevation": 3, diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc index 495a0a991..1bdf7756b 100644 --- a/data/maps/SixIsland_Mart/scripts.inc +++ b/data/maps/SixIsland_Mart/scripts.inc @@ -4,7 +4,7 @@ SixIsland_Mart_MapScripts:: @ 8171E65 SixIsland_Mart_EventScript_171E66:: @ 8171E66 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index a643d0dcd..47e361882 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "49", + "graphics_id": "MAP_OBJ_GFX_ROCKET_M", "x": 9, "y": 24, "elevation": 3, @@ -30,10 +30,10 @@ "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, "script": "SixIsland_OutcastIsland_EventScript_168B16", - "flag": "136" + "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 12, "y": 15, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 13, "y": 34, "elevation": 1, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 14, "y": 61, "elevation": 1, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 10, "y": 44, "elevation": 1, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "36", + "graphics_id": "MAP_OBJ_GFX_TUBER_M_1", "x": 11, "y": 44, "elevation": 1, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 11, "y": 16, "elevation": 3, @@ -108,7 +108,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SixIsland_OutcastIsland_EventScript_1BEC90", - "flag": "481" + "flag": "FLAG_HIDE_SIX_ISLAND_OUTCAST_ISLAND_PP_UP" } ], "warp_events": [ @@ -128,8 +128,9 @@ "y": 23, "elevation": 3, "item": "ITEM_STAR_PIECE", - "flag": "178", - "unknown": 1 + "flag": "HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_STAR_PIECE", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -137,8 +138,9 @@ "y": 24, "elevation": 3, "item": "ITEM_NET_BALL", - "flag": "179", - "unknown": 1 + "flag": "HIDDEN_ITEM_SIX_ISLAND_OUTCAST_ISLAND_NET_BALL", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/SixIsland_OutcastIsland/scripts.inc b/data/maps/SixIsland_OutcastIsland/scripts.inc index 9682f1cbe..33d4d315c 100644 --- a/data/maps/SixIsland_OutcastIsland/scripts.inc +++ b/data/maps/SixIsland_OutcastIsland/scripts.inc @@ -2,6 +2,6 @@ SixIsland_OutcastIsland_MapScripts:: @ 8168B15 .byte 0 SixIsland_OutcastIsland_EventScript_168B16:: @ 8168B16 - trainerbattle 0, 540, 0, Text_18B35A, Text_18B3C2 + trainerbattle 0, TRAINER_TEAM_ROCKET_GRUNT_46, 0, Text_18B35A, Text_18B3C2 msgbox gUnknown_818B3C8, 6 end diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 52ce32061..8763c72fa 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 48, "y": 15, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 10, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 51, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 12, "y": 13, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 37, "y": 23, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 32, "y": 5, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 52, "y": 20, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 8, "y": 21, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 39, "y": 6, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "39", + "graphics_id": "MAP_OBJ_GFX_CAMPER", "x": 3, "y": 9, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 19, "y": 24, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 30, "y": 19, "elevation": 3, diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index 0575b4855..fb1ee80ad 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -6,9 +6,9 @@ SixIsland_PatternBush_MapScript1_16455F:: @ 816455F setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH getplayerxy VAR_0x4001, VAR_0x4002 compare_var_to_value VAR_0x4001, 50 - call_if 4, EventScript_16457E + call_if ge, EventScript_16457E compare_var_to_value VAR_0x4001, 49 - call_if 3, EventScript_164587 + call_if le, EventScript_164587 end EventScript_16457E:: @ 816457E @@ -20,61 +20,61 @@ EventScript_164587:: @ 8164587 return SixIsland_PatternBush_EventScript_164590:: @ 8164590 - trainerbattle 0, 609, 0, Text_17BF3A, Text_17BF66 + trainerbattle 0, TRAINER_PKMN_BREEDER_BETHANY, 0, Text_17BF3A, Text_17BF66 msgbox gUnknown_817BF97, 6 end SixIsland_PatternBush_EventScript_1645A7:: @ 81645A7 - trainerbattle 0, 610, 0, Text_17BFEB, Text_17C028 + trainerbattle 0, TRAINER_PKMN_BREEDER_ALLISON, 0, Text_17BFEB, Text_17C028 msgbox gUnknown_817C056, 6 end SixIsland_PatternBush_EventScript_1645BE:: @ 81645BE - trainerbattle 0, 611, 0, Text_17C0BE, Text_17C0F2 + trainerbattle 0, TRAINER_BUG_CATCHER_GARRET, 0, Text_17C0BE, Text_17C0F2 msgbox gUnknown_817C113, 6 end SixIsland_PatternBush_EventScript_1645D5:: @ 81645D5 - trainerbattle 0, 612, 0, Text_17C155, Text_17C196 + trainerbattle 0, TRAINER_BUG_CATCHER_JONAH, 0, Text_17C155, Text_17C196 msgbox gUnknown_817C1D0, 6 end SixIsland_PatternBush_EventScript_1645EC:: @ 81645EC - trainerbattle 0, 613, 0, Text_17C246, Text_17C275 + trainerbattle 0, TRAINER_BUG_CATCHER_VANCE, 0, Text_17C246, Text_17C275 msgbox gUnknown_817C2A4, 6 end SixIsland_PatternBush_EventScript_164603:: @ 8164603 - trainerbattle 0, 614, 0, Text_17C2D9, Text_17C30D + trainerbattle 0, TRAINER_YOUNGSTER_NASH, 0, Text_17C2D9, Text_17C30D msgbox gUnknown_817C31C, 6 end SixIsland_PatternBush_EventScript_16461A:: @ 816461A - trainerbattle 0, 615, 0, Text_17C373, Text_17C3A5 + trainerbattle 0, TRAINER_YOUNGSTER_CORDELL, 0, Text_17C373, Text_17C3A5 msgbox gUnknown_817C3CE, 6 end SixIsland_PatternBush_EventScript_164631:: @ 8164631 - trainerbattle 0, 616, 0, Text_17C42B, Text_17C458 + trainerbattle 0, TRAINER_LASS_DALIA, 0, Text_17C42B, Text_17C458 msgbox gUnknown_817C490, 6 end SixIsland_PatternBush_EventScript_164648:: @ 8164648 - trainerbattle 0, 617, 0, Text_17C4FE, Text_17C552 + trainerbattle 0, TRAINER_LASS_JOANA, 0, Text_17C4FE, Text_17C552 msgbox gUnknown_817C590, 6 end SixIsland_PatternBush_EventScript_16465F:: @ 816465F - trainerbattle 0, 618, 0, Text_17C5DB, Text_17C609 + trainerbattle 0, TRAINER_CAMPER_RILEY, 0, Text_17C5DB, Text_17C609 msgbox gUnknown_817C615, 6 end SixIsland_PatternBush_EventScript_164676:: @ 8164676 - trainerbattle 0, 619, 0, Text_17C63E, Text_17C660 + trainerbattle 0, TRAINER_PICNICKER_MARCY, 0, Text_17C63E, Text_17C660 msgbox gUnknown_817C68E, 6 end SixIsland_PatternBush_EventScript_16468D:: @ 816468D - trainerbattle 0, 620, 0, Text_17C6C9, Text_17C6FB + trainerbattle 0, TRAINER_RUIN_MANIAC_LAYTON, 0, Text_17C6C9, Text_17C6FB msgbox gUnknown_817C728, 6 end diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index 9b3a2b671..eae20e595 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "72", + "graphics_id": "MAP_OBJ_GFX_BLUE", "x": 5, "y": 5, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "152" + "flag": "FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 13, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 12, "y": 5, "elevation": 3, diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 769a5d86f..1ad4df1ed 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -7,11 +7,11 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A SixIsland_PokemonCenter_1F_MapScript1_171D7A:: @ 8171D7A setrespawn SPAWN_SIX_ISLAND compare_var_to_value VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 - call_if 1, EventScript_171D89 + call_if eq, EventScript_171D89 end EventScript_171D89:: @ 8171D89 - clearflag FLAG_0x098 + clearflag FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL return SixIsland_PokemonCenter_1F_MapScript3_171D8D:: @ 8171D8D diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 2a0b353b1..bf48ee91c 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SixIsland_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index eea1088f5..d31b0fe31 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 24, "y": 25, "elevation": 3, @@ -30,10 +30,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SixIsland_RuinValley_EventScript_168B6D", - "flag": "142" + "flag": "FLAG_HIDE_RUIN_VALLEY_SCIENTIST" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 32, "y": 11, "elevation": 5, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 33, "y": 16, "elevation": 5, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 31, "y": 24, "elevation": 5, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 14, "y": 10, "elevation": 5, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 21, "y": 29, "elevation": 5, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 17, "y": 10, "elevation": 5, @@ -107,11 +107,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 17, "y": 12, "elevation": 5, @@ -120,11 +120,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 18, "y": 11, "elevation": 5, @@ -133,11 +133,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 6, "y": 33, "elevation": 3, @@ -146,11 +146,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 6, "y": 34, "elevation": 3, @@ -159,11 +159,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 41, "y": 32, "elevation": 3, @@ -172,11 +172,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 41, "y": 33, "elevation": 3, @@ -185,11 +185,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 42, "y": 33, "elevation": 3, @@ -198,11 +198,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "SixIsland_RuinValley_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 33, "elevation": 3, @@ -212,10 +212,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SixIsland_RuinValley_EventScript_1BECC4", - "flag": "485" + "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_HP_UP" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 19, "y": 11, "elevation": 5, @@ -225,10 +225,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SixIsland_RuinValley_EventScript_1BECB7", - "flag": "484" + "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_FULL_RESTORE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 43, "y": 32, "elevation": 3, @@ -238,7 +238,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SixIsland_RuinValley_EventScript_1BECD1", - "flag": "486" + "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_SUN_STONE" } ], "warp_events": [ diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 11c1b730f..2b7ecf655 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -3,8 +3,8 @@ SixIsland_RuinValley_MapScripts:: @ 8168B53 .byte 0 SixIsland_RuinValley_MapScript1_168B59:: @ 8168B59 - checkflag FLAG_0x2E3 - call_if 1, EventScript_168B63 + checkflag FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE + call_if TRUE, EventScript_168B63 end EventScript_168B63:: @ 8168B63 @@ -24,11 +24,11 @@ SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D SixIsland_RuinValley_EventScript_168B94:: @ 8168B94 lockall - checkflag FLAG_0x2E3 - goto_if_eq EventScript_168BC1 + checkflag FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE + goto_if TRUE, EventScript_168BC1 msgbox gUnknown_818BDC0, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_168BCB + goto_if eq, EventScript_168BCB msgbox gUnknown_818BE11 braillemessage gUnknown_81A929B waitbuttonpress diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index dc5768d72..470b708c5 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 12, "y": 13, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 11, "y": 52, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "0" }, { - "graphics_id": "43", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", "x": 13, "y": 35, "elevation": 1, @@ -69,7 +69,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 15, "y": 45, "elevation": 1, @@ -82,7 +82,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 6, "y": 21, "elevation": 3, @@ -95,7 +95,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 7, "y": 21, "elevation": 3, @@ -108,7 +108,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 11, "y": 76, "elevation": 3, @@ -121,7 +121,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 19, "elevation": 0, @@ -131,10 +131,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SixIsland_WaterPath_EventScript_1BEC9D", - "flag": "482" + "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_ELIXIR" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 87, "elevation": 3, @@ -144,7 +144,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "SixIsland_WaterPath_EventScript_1BECAA", - "flag": "483" + "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_DRAGON_SCALE" } ], "warp_events": [ @@ -178,8 +178,9 @@ "y": 76, "elevation": 3, "item": "ITEM_ASPEAR_BERRY", - "flag": "181", - "unknown": 1 + "flag": "HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_ASPEAR_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -187,8 +188,9 @@ "y": 8, "elevation": 3, "item": "ITEM_ORAN_BERRY", - "flag": "182", - "unknown": 1 + "flag": "HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_ORAN_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -196,8 +198,9 @@ "y": 63, "elevation": 3, "item": "ITEM_PINAP_BERRY", - "flag": "183", - "unknown": 1 + "flag": "HIDDEN_ITEM_SIX_ISLAND_WATER_PATH_PINAP_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index 482b278be..c889d7a5a 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 3, "y": 4, "elevation": 3, diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index f9df42396..be9e12915 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -6,28 +6,28 @@ SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D faceplayer special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 setvar VAR_0x8004, SPECIES_HERACROSS specialvar VAR_RESULT, sub_80CC48C compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1720E5 + goto_if eq, EventScript_1720E5 special sub_80A0918 msgbox gUnknown_81A4A3F - special sub_80BF8FC + special Special_ChooseMonFromParty waitstate copyvar VAR_RESULT, VAR_0x8004 compare_var_to_value VAR_RESULT, 6 - goto_if 4, EventScript_1720EF + goto_if ge, EventScript_1720EF special sub_80A0930 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1720F1 + goto_if eq, EventScript_1720F1 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1720FB + goto_if eq, EventScript_1720FB compare_var_to_value VAR_RESULT, 3 - goto_if_eq EventScript_172121 + goto_if eq, EventScript_172121 compare_var_to_value VAR_RESULT, 4 - goto_if_eq EventScript_17210E + goto_if eq, EventScript_17210E release end @@ -46,25 +46,25 @@ EventScript_1720F1:: @ 81720F1 end EventScript_1720FB:: @ 81720FB - checkflag FLAG_0x2D9 - goto_if 0, EventScript_172121 + checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 + goto_if FALSE, EventScript_172121 msgbox gUnknown_81A4B7A release end EventScript_17210E:: @ 817210E - checkflag FLAG_0x2D9 - goto_if 0, EventScript_172121 + checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 + goto_if FALSE, EventScript_172121 msgbox gUnknown_81A4B39 release end EventScript_172121:: @ 8172121 - setflag FLAG_0x2D9 + setflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 msgbox gUnknown_81A4A88 giveitem ITEM_NEST_BALL compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_17214D + goto_if eq, EventScript_17214D msgbox gUnknown_81A4AD9 release end @@ -76,8 +76,8 @@ EventScript_17214D:: @ 817214D SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157 lockall - checkflag FLAG_0x2D9 - goto_if_eq EventScript_17216B + checkflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 + goto_if TRUE, EventScript_17216B msgbox gUnknown_81A4CB9 releaseall end diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index dbe2dfc1e..818e179f4 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 635f1a356..49100e7a0 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 7, "y": 24, "elevation": 3, @@ -35,10 +35,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_1677E5", - "flag": "126" + "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 8, "y": 23, "elevation": 3, @@ -48,10 +48,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_167989", - "flag": "126" + "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 8, "y": 24, "elevation": 3, @@ -61,10 +61,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_1677D8", - "flag": "145" + "flag": "FLAG_HIDE_THREE_ISLAND_LONE_BIKER" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 9, "y": 23, "elevation": 3, @@ -74,10 +74,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_1677D8", - "flag": "121" + "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 9, "y": 24, "elevation": 3, @@ -87,10 +87,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_1677D8", - "flag": "121" + "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 10, "y": 22, "elevation": 3, @@ -100,10 +100,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_1677D8", - "flag": "121" + "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 10, "y": 24, "elevation": 3, @@ -113,10 +113,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_1677D8", - "flag": "121" + "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 11, "y": 23, "elevation": 3, @@ -126,10 +126,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_1677D8", - "flag": "121" + "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 20, "y": 7, "elevation": 3, @@ -138,11 +138,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 18, "y": 17, "elevation": 3, @@ -152,10 +152,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_1BEABC", - "flag": "443" + "flag": "FLAG_HIDE_THREE_ISLAND_ZINC" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 15, "y": 7, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 14, "y": 14, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "132", + "graphics_id": "MAP_OBJ_GFX_DODUO", "x": 15, "y": 14, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 15, "y": 31, "elevation": 3, @@ -204,7 +204,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_EventScript_167CA5", - "flag": "121" + "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" } ], "warp_events": [ @@ -264,7 +264,7 @@ "x": 7, "y": 27, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, "script": "ThreeIsland_EventScript_1679B5" }, @@ -273,7 +273,7 @@ "x": 8, "y": 27, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, "script": "ThreeIsland_EventScript_1679B5" }, @@ -282,7 +282,7 @@ "x": 9, "y": 27, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, "script": "ThreeIsland_EventScript_1679B5" }, @@ -291,7 +291,7 @@ "x": 10, "y": 27, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, "script": "ThreeIsland_EventScript_1679B5" }, @@ -300,7 +300,7 @@ "x": 7, "y": 26, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, "script": "ThreeIsland_EventScript_167A1D" }, @@ -309,7 +309,7 @@ "x": 8, "y": 26, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, "script": "ThreeIsland_EventScript_167A29" }, @@ -318,7 +318,7 @@ "x": 9, "y": 26, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, "script": "ThreeIsland_EventScript_167A35" }, @@ -327,7 +327,7 @@ "x": 11, "y": 27, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 2, "script": "ThreeIsland_EventScript_1679B5" }, @@ -336,7 +336,7 @@ "x": 10, "y": 26, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, "script": "ThreeIsland_EventScript_167A41" }, @@ -345,7 +345,7 @@ "x": 11, "y": 26, "elevation": 3, - "var": "VAR_0x407B", + "var": "VAR_MAP_SCENE_THREE_ISLAND", "var_value": 3, "script": "ThreeIsland_EventScript_167A4D" } @@ -364,8 +364,9 @@ "y": 13, "elevation": 3, "item": "ITEM_PP_UP", - "flag": "164", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_PP_UP", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 39a3688fe..b3d27f9a8 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -4,14 +4,14 @@ ThreeIsland_MapScripts:: @ 81677AD ThreeIsland_MapScript1_1677B3:: @ 81677B3 setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND - checkflag FLAG_0x2A3 - call_if 1, EventScript_1677CB - compare_var_to_value VAR_0x407B, 4 - call_if 1, EventScript_1677CF + checkflag FLAG_RESCUED_LOSTELLE + call_if TRUE, EventScript_1677CB + compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 + call_if eq, EventScript_1677CF end EventScript_1677CB:: @ 81677CB - setflag FLAG_0x07E + setflag FLAG_HIDE_THREE_ISLAND_ANTIBIKERS return EventScript_1677CF:: @ 81677CF @@ -28,10 +28,10 @@ ThreeIsland_EventScript_1677D8:: @ 81677D8 ThreeIsland_EventScript_1677E5:: @ 81677E5 lock - checkflag FLAG_0x2FC - goto_if_eq EventScript_167806 - compare_var_to_value VAR_0x407B, 4 - goto_if_eq EventScript_16781A + checkflag FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER + goto_if TRUE, EventScript_167806 + compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 + goto_if eq, EventScript_16781A setvar VAR_0x4001, 0 call EventScript_16786F release @@ -50,10 +50,10 @@ EventScript_16781A:: @ 816781A msgbox gUnknown_818275A checkitemspace ITEM_FULL_RESTORE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_167865 + goto_if eq, EventScript_167865 giveitemfanfaremsg gUnknown_81827BE, ITEM_FULL_RESTORE additem ITEM_FULL_RESTORE, 1 - setflag FLAG_0x2FC + setflag FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER msgbox gUnknown_81827F1 release end @@ -65,36 +65,36 @@ EventScript_167865:: @ 8167865 EventScript_16786F:: @ 816786F compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167947 + call_if eq, EventScript_167947 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_167947 + call_if eq, EventScript_167947 applymovement 1, Movement_167A1B waitmovement 0 msgbox gUnknown_81820C0 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_167952 + call_if eq, EventScript_167952 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167952 + call_if eq, EventScript_167952 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16795D + call_if eq, EventScript_16795D applymovement 5, Movement_167A19 waitmovement 0 msgbox gUnknown_8182125 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_167931 + call_if eq, EventScript_167931 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167931 + call_if eq, EventScript_167931 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_167973 + call_if eq, EventScript_167973 applymovement 2, Movement_167A1B waitmovement 0 msgbox gUnknown_81821A9 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_167952 + call_if eq, EventScript_167952 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167952 + call_if eq, EventScript_167952 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_16795D + call_if eq, EventScript_16795D applymovement 4, Movement_167A19 waitmovement 0 msgbox gUnknown_81821DC @@ -123,21 +123,21 @@ EventScript_167952:: @ 8167952 EventScript_16795D:: @ 816795D getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 9 - goto_if 4, EventScript_167931 + goto_if ge, EventScript_167931 goto EventScript_167952 end EventScript_167973:: @ 8167973 getplayerxy VAR_0x8004, VAR_0x8005 compare_var_to_value VAR_0x8004, 9 - goto_if 4, EventScript_167947 + goto_if ge, EventScript_167947 goto EventScript_167931 end ThreeIsland_EventScript_167989:: @ 8167989 lock - compare_var_to_value VAR_0x407B, 4 - goto_if_eq EventScript_1679A1 + compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 + goto_if eq, EventScript_1679A1 setvar VAR_0x4001, 1 call EventScript_16786F release @@ -168,7 +168,7 @@ ThreeIsland_EventScript_1679B5:: @ 81679B5 applymovement 1, Movement_167A1B waitmovement 0 msgbox gUnknown_81823C7 - setvar VAR_0x407B, 3 + setvar VAR_MAP_SCENE_THREE_ISLAND, 3 releaseall end @@ -224,10 +224,10 @@ EventScript_167A59:: @ 8167A59 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81823ED, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_167C35 + goto_if eq, EventScript_167C35 msgbox gUnknown_818247D setvar VAR_LAST_TALKED, 5 - trainerbattle 3, 527, 0, Text_1824B7 + trainerbattle 3, TRAINER_BIKER_GOON, 0, Text_1824B7 applymovement 5, Movement_167C5C waitmovement 0 msgbox gUnknown_81824CF @@ -237,7 +237,7 @@ EventScript_167A59:: @ 8167A59 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_81824EF setvar VAR_LAST_TALKED, 7 - trainerbattle 3, 528, 0, Text_182521 + trainerbattle 3, TRAINER_BIKER_GOON_2, 0, Text_182521 applymovement 7, Movement_167C5C waitmovement 0 msgbox gUnknown_8182536 @@ -247,7 +247,7 @@ EventScript_167A59:: @ 8167A59 playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182582 setvar VAR_LAST_TALKED, 4 - trainerbattle 3, 529, 0, Text_1825D4 + trainerbattle 3, TRAINER_BIKER_GOON_3, 0, Text_1825D4 applymovement 4, Movement_1A75E7 waitmovement 0 applymovement 6, Movement_1A75ED @@ -257,19 +257,19 @@ EventScript_167A59:: @ 8167A59 closemessage delay 45 compare_var_to_value VAR_0x4001, 0 - call_if 1, EventScript_167BC6 + call_if eq, EventScript_167BC6 compare_var_to_value VAR_0x4001, 1 - call_if 1, EventScript_167BD8 + call_if eq, EventScript_167BD8 compare_var_to_value VAR_0x4001, 2 - call_if 1, EventScript_167BEA + call_if eq, EventScript_167BEA compare_var_to_value VAR_0x4001, 3 - call_if 1, EventScript_167C03 + call_if eq, EventScript_167C03 compare_var_to_value VAR_0x4001, 4 - call_if 1, EventScript_167C1C + call_if eq, EventScript_167C1C playbgm MUS_SHOUNEN, 0 msgbox gUnknown_8182623 setvar VAR_LAST_TALKED, 3 - trainerbattle 3, 742, 0, Text_1826B7 + trainerbattle 3, TRAINER_CUE_BALL_PAXTON, 0, Text_1826B7 msgbox gUnknown_818271D closemessage fadescreen 1 @@ -281,7 +281,7 @@ EventScript_167A59:: @ 8167A59 removeobject 8 removeobject 14 fadescreen 0 - setvar VAR_0x407B, 4 + setvar VAR_MAP_SCENE_THREE_ISLAND, 4 releaseall end diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 04ccdb273..0e14592f6 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 4, "y": 8, "elevation": 3, @@ -24,10 +24,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_BerryForest_EventScript_163C83", - "flag": "122" + "flag": "FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 12, "y": 11, "elevation": 3, @@ -36,11 +36,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 19, "y": 7, "elevation": 3, @@ -49,11 +49,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "19" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_13" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 23, "y": 17, "elevation": 3, @@ -62,11 +62,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "20" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_14" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 38, "y": 23, "elevation": 3, @@ -75,11 +75,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "21" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_15" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 44, "y": 23, "elevation": 3, @@ -88,11 +88,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "22" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_16" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 44, "y": 29, "elevation": 3, @@ -101,11 +101,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "23" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_17" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 16, "y": 43, "elevation": 3, @@ -114,11 +114,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "24" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_18" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 17, "y": 39, "elevation": 3, @@ -127,11 +127,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "25" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_19" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 14, "y": 39, "elevation": 3, @@ -140,11 +140,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "26" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 11, "y": 39, "elevation": 3, @@ -153,11 +153,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BerryForest_EventScript_1BDF13", - "flag": "27" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 5, "elevation": 3, @@ -167,10 +167,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_BerryForest_EventScript_1BED05", - "flag": "490" + "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ETHER" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 27, "y": 11, "elevation": 3, @@ -180,10 +180,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_BerryForest_EventScript_1BED12", - "flag": "491" + "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_FULL_HEAL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 43, "elevation": 3, @@ -193,7 +193,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_BerryForest_EventScript_1BED1F", - "flag": "492" + "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ELIXIR" } ], "warp_events": [ @@ -241,8 +241,9 @@ "y": 25, "elevation": 3, "item": "ITEM_RAZZ_BERRY", - "flag": "90", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAZZ_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -250,8 +251,9 @@ "y": 15, "elevation": 3, "item": "ITEM_BLUK_BERRY", - "flag": "91", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_BLUK_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -259,8 +261,9 @@ "y": 24, "elevation": 3, "item": "ITEM_NANAB_BERRY", - "flag": "92", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_NANAB_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -268,8 +271,9 @@ "y": 24, "elevation": 3, "item": "ITEM_WEPEAR_BERRY", - "flag": "93", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_WEPEAR_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -277,8 +281,9 @@ "y": 18, "elevation": 3, "item": "ITEM_ORAN_BERRY", - "flag": "94", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ORAN_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -286,8 +291,9 @@ "y": 23, "elevation": 3, "item": "ITEM_CHERI_BERRY", - "flag": "95", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHERI_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -295,8 +301,9 @@ "y": 5, "elevation": 3, "item": "ITEM_CHESTO_BERRY", - "flag": "96", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_CHESTO_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -304,8 +311,9 @@ "y": 30, "elevation": 3, "item": "ITEM_PECHA_BERRY", - "flag": "97", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PECHA_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -313,8 +321,9 @@ "y": 5, "elevation": 3, "item": "ITEM_RAWST_BERRY", - "flag": "98", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_RAWST_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -322,8 +331,9 @@ "y": 6, "elevation": 3, "item": "ITEM_ASPEAR_BERRY", - "flag": "99", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_ASPEAR_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -331,8 +341,9 @@ "y": 32, "elevation": 3, "item": "ITEM_PERSIM_BERRY", - "flag": "100", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PERSIM_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -340,8 +351,9 @@ "y": 16, "elevation": 3, "item": "ITEM_PINAP_BERRY", - "flag": "101", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_PINAP_BERRY", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -349,8 +361,9 @@ "y": 5, "elevation": 3, "item": "ITEM_LUM_BERRY", - "flag": "102", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_BERRY_FOREST_LUM_BERRY", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index ec85582ef..739b926b0 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -19,7 +19,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 msgbox gUnknown_817AE8E special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 waitse playmoncry SPECIES_HYPNO, 2 waitmoncry @@ -31,14 +31,14 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83 msgbox gUnknown_817AEE1 giveitem ITEM_IAPAPA_BERRY compare_var_to_value VAR_RESULT, 0 - call_if 1, EventScript_163D19 + call_if eq, EventScript_163D19 special sub_80CA6DC msgbox gUnknown_817AF3B closemessage - setflag FLAG_0x2A3 - setflag FLAG_0x07A + setflag FLAG_RESCUED_LOSTELLE + setflag FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 - clearflag FLAG_0x075 + clearflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE warp MAP_TWO_ISLAND_JOYFUL_GAME_CORNER, 255, 6, 6 waitstate release diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 474a4063a..02ac7426c 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 27, "y": 10, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 68, "y": 10, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "37", + "graphics_id": "MAP_OBJ_GFX_TUBER_F", "x": 33, "y": 13, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "37", + "graphics_id": "MAP_OBJ_GFX_TUBER_F", "x": 50, "y": 11, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "44", + "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", "x": 36, "y": 4, "elevation": 1, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 77, "y": 5, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 78, "y": 5, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 72, "y": 8, "elevation": 3, @@ -120,11 +120,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BondBridge_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 86, "y": 13, "elevation": 3, @@ -133,8 +133,8 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ThreeIsland_BondBridge_EventScript_1BDF13", - "flag": "19" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_13" } ], "warp_events": [ @@ -168,8 +168,9 @@ "y": 5, "elevation": 0, "item": "ITEM_MAX_REPEL", - "flag": "165", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_MAX_REPEL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -177,8 +178,9 @@ "y": 12, "elevation": 3, "item": "ITEM_PEARL", - "flag": "166", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_PEARL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -186,8 +188,9 @@ "y": 7, "elevation": 3, "item": "ITEM_STARDUST", - "flag": "167", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_BOND_BRIDGE_STARDUST", + "quantity": 1, + "underfoot": false }, { "type": "bg_event_type_0", diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index c4616ad9c..317fb6580 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 23, "y": 2, "elevation": 3, @@ -51,8 +51,9 @@ "y": 3, "elevation": 0, "item": "ITEM_NUGGET", - "flag": "163", - "unknown": 1 + "flag": "HIDDEN_ITEM_THREE_ISLAND_DUNSPARCE_TUNNEL_NUGGET", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index 7cdedc60c..8d5b37ed7 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -7,13 +7,13 @@ ThreeIsland_DunsparceTunnel_MapScript1_164D2C:: @ 8164D2C specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT compare_var_to_value VAR_0x8008, 1 - call_if 1, EventScript_164D50 + call_if eq, EventScript_164D50 compare_var_to_value VAR_0x8008, 0 - call_if 1, EventScript_164D54 + call_if eq, EventScript_164D54 end EventScript_164D50:: @ 8164D50 - setmaplayoutindex LAYOUT_UNUSED_LAYOUT_83453C0 + setmaplayoutindex LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2 return EventScript_164D54:: @ 8164D54 @@ -24,11 +24,11 @@ EventScript_164D54:: @ 8164D54 ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60 lock faceplayer - checkflag FLAG_0x2E2 - goto_if_eq EventScript_164DC2 + checkflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL + goto_if TRUE, EventScript_164DC2 specialvar VAR_RESULT, IsNationalPokedexEnabled compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_164D90 + goto_if eq, EventScript_164D90 msgbox gUnknown_817D13B closemessage applymovement 1, Movement_1A75E5 @@ -40,8 +40,8 @@ EventScript_164D90:: @ 8164D90 msgbox gUnknown_817D1C9 giveitem ITEM_NUGGET compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_164DB8 - setflag FLAG_0x2E2 + goto_if eq, EventScript_164DB8 + setflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL goto EventScript_164DC2 end diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index 58cee2b93..dfce743a3 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/ThreeIsland_Harbor/scripts.inc b/data/maps/ThreeIsland_Harbor/scripts.inc index 3678385c0..9fd44c116 100644 --- a/data/maps/ThreeIsland_Harbor/scripts.inc +++ b/data/maps/ThreeIsland_Harbor/scripts.inc @@ -6,6 +6,6 @@ ThreeIsland_Harbor_EventScript_171EAA:: @ 8171EAA faceplayer message Text_181726 waitmessage - setvar VAR_0x8004, 3 + setvar VAR_0x8004, SEAGALLOP_THREE_ISLAND goto EventScript_1A900F end diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index dc2b5321f..e21901499 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 3, "y": 4, "elevation": 0, @@ -24,7 +24,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_House1_EventScript_17181A", - "flag": "118" + "flag": "FLAG_HIDE_LOSTELLE_IN_HER_HOME" } ], "warp_events": [ diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index a596b88c0..681380cc9 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 4, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/ThreeIsland_House2/scripts.inc b/data/maps/ThreeIsland_House2/scripts.inc index 297f6e3dc..6c45d3f2f 100644 --- a/data/maps/ThreeIsland_House2/scripts.inc +++ b/data/maps/ThreeIsland_House2/scripts.inc @@ -4,9 +4,7 @@ ThreeIsland_House2_MapScripts:: @ 81718DF ThreeIsland_House2_EventScript_1718E0:: @ 81718E0 lock faceplayer - setvar VAR_0x8004, 7 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_SABRINA, 1 msgbox gUnknown_81A32CA release end diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index 0ba900bc6..df96d64eb 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 8, "y": 2, "elevation": 3, diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index c1ceda273..a518b76d8 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 6, "y": 3, "elevation": 3, diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index b36be2276..c5f567825 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 2, "y": 5, "elevation": 3, diff --git a/data/maps/ThreeIsland_House5/scripts.inc b/data/maps/ThreeIsland_House5/scripts.inc index d93696c0a..3dee5e153 100644 --- a/data/maps/ThreeIsland_House5/scripts.inc +++ b/data/maps/ThreeIsland_House5/scripts.inc @@ -4,8 +4,8 @@ ThreeIsland_House5_MapScripts:: @ 817191F ThreeIsland_House5_EventScript_171920:: @ 8171920 lock faceplayer - checkflag FLAG_0x2A3 - goto_if_eq EventScript_171935 + checkflag FLAG_RESCUED_LOSTELLE + goto_if TRUE, EventScript_171935 msgbox gUnknown_81A3469 release end diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index 14e94407b..f27177490 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "40", + "graphics_id": "MAP_OBJ_GFX_PICNICKER", "x": 2, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 7, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index 6986607e3..ec0caa100 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -4,7 +4,7 @@ ThreeIsland_Mart_MapScripts:: @ 817188C ThreeIsland_Mart_EventScript_17188D:: @ 817188D special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index b3e593a18..83fec9da8 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 12, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 3, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index 02fd95e39..bb174d2f2 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index bbc809fc1..e49bb1224 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 14, "y": 9, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 8, "y": 8, "elevation": 3, @@ -43,10 +43,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_Port_EventScript_1687CC", - "flag": "121" + "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 13, "y": 10, "elevation": 3, @@ -56,7 +56,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ThreeIsland_Port_EventScript_1687D5", - "flag": "121" + "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" } ], "warp_events": [ diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index 8fb20ce26..1aff12731 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -3,17 +3,17 @@ ThreeIsland_Port_MapScripts:: @ 8168789 .byte 0 ThreeIsland_Port_MapScript1_16878F:: @ 816878F - clearflag FLAG_0x841 - setflag FLAG_0x2A1 + clearflag FLAG_SYS_PC_STORAGE_DISABLED + setflag FLAG_SEVII_DETOUR_FINISHED end ThreeIsland_Port_EventScript_168796:: @ 8168796 lock faceplayer compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 - goto_if 4, EventScript_1687B8 - compare_var_to_value VAR_0x407B, 4 - goto_if 4, EventScript_1687C2 + goto_if ge, EventScript_1687B8 + compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4 + goto_if ge, EventScript_1687C2 msgbox gUnknown_818A307 release end diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index ff7b3c601..64aba9d7f 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 28, "y": 4, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 31, "y": 6, "elevation": 3, @@ -43,10 +43,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "TwoIsland_EventScript_167755", - "flag": "123" + "flag": "FLAG_HIDE_TWO_ISLAND_WOMAN" }, { - "graphics_id": "29", + "graphics_id": "MAP_OBJ_GFX_BEAUTY", "x": 30, "y": 11, "elevation": 3, @@ -56,10 +56,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "TwoIsland_EventScript_16775E", - "flag": "124" + "flag": "FLAG_HIDE_TWO_ISLAND_BEAUTY" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 26, "y": 5, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 27, "y": 6, "elevation": 3, @@ -82,10 +82,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "TwoIsland_EventScript_167777", - "flag": "125" + "flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 30, "y": 16, "elevation": 3, @@ -94,11 +94,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "TwoIsland_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 39, "y": 16, "elevation": 3, @@ -108,10 +108,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "TwoIsland_EventScript_1BEAAF", - "flag": "442" + "flag": "FLAG_HIDE_TWO_ISLAND_REVIVE" }, { - "graphics_id": "16", + "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", "x": 37, "y": 12, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 24, "y": 12, "elevation": 3, diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index a9a42eda5..3d35a89c1 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -4,43 +4,43 @@ TwoIsland_MapScripts:: @ 8167564 TwoIsland_MapScript1_16756A:: @ 816756A setworldmapflag FLAG_WORLD_MAP_TWO_ISLAND - setflag FLAG_0x2A2 + setflag FLAG_VISITED_TWO_ISLAND call EventScript_167576 end EventScript_167576:: @ 8167576 - checkflag FLAG_0x844 - goto_if_eq EventScript_167597 - checkflag FLAG_0x82C - goto_if_eq EventScript_1675B8 - checkflag FLAG_0x2A3 - goto_if_eq EventScript_1675D9 + checkflag FLAG_SYS_CAN_LINK_WITH_RS + goto_if TRUE, EventScript_167597 + checkflag FLAG_SYS_GAME_CLEAR + goto_if TRUE, EventScript_1675B8 + checkflag FLAG_RESCUED_LOSTELLE + goto_if TRUE, EventScript_1675D9 goto EventScript_1675E8 end EventScript_167597:: @ 8167597 - checkflag FLAG_0x29D - goto_if 0, EventScript_1675EE - checkflag FLAG_0x29E - goto_if 0, EventScript_1675F4 - checkflag FLAG_0x29F - goto_if 0, EventScript_1675FD + checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED + goto_if FALSE, EventScript_1675EE + checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 + goto_if FALSE, EventScript_1675F4 + checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2 + goto_if FALSE, EventScript_1675FD goto EventScript_167606 end EventScript_1675B8:: @ 81675B8 - checkflag FLAG_0x29D - goto_if 0, EventScript_1675EE - checkflag FLAG_0x2A3 - goto_if 0, EventScript_1675EE - checkflag FLAG_0x29E - goto_if 0, EventScript_1675F4 + checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED + goto_if FALSE, EventScript_1675EE + checkflag FLAG_RESCUED_LOSTELLE + goto_if FALSE, EventScript_1675EE + checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 + goto_if FALSE, EventScript_1675F4 goto EventScript_1675FD end EventScript_1675D9:: @ 81675D9 - checkflag FLAG_0x29D - goto_if 0, EventScript_1675EE + checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED + goto_if FALSE, EventScript_1675EE goto EventScript_1675F4 end @@ -49,70 +49,70 @@ EventScript_1675E8:: @ 81675E8 end EventScript_1675EE:: @ 81675EE - setvar VAR_0x4078, 1 + setvar VAR_MAP_SCENE_TWO_ISLAND, 1 return EventScript_1675F4:: @ 81675F4 - setvar VAR_0x4078, 2 - clearflag FLAG_0x07B + setvar VAR_MAP_SCENE_TWO_ISLAND, 2 + clearflag FLAG_HIDE_TWO_ISLAND_WOMAN return EventScript_1675FD:: @ 81675FD - setvar VAR_0x4078, 3 - clearflag FLAG_0x07C + setvar VAR_MAP_SCENE_TWO_ISLAND, 3 + clearflag FLAG_HIDE_TWO_ISLAND_BEAUTY return EventScript_167606:: @ 8167606 - setvar VAR_0x4078, 4 - clearflag FLAG_0x07D + setvar VAR_MAP_SCENE_TWO_ISLAND, 4 + clearflag FLAG_HIDE_TWO_ISLAND_SUPER_NERD return TwoIsland_EventScript_16760F:: @ 816760F special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer - compare_var_to_value VAR_0x4078, 4 - goto_if_eq EventScript_167646 - compare_var_to_value VAR_0x4078, 3 - goto_if_eq EventScript_16765E - compare_var_to_value VAR_0x4078, 2 - goto_if_eq EventScript_167676 + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 4 + goto_if eq, EventScript_167646 + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 3 + goto_if eq, EventScript_16765E + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 2 + goto_if eq, EventScript_167676 goto EventScript_16768E end EventScript_167646:: @ 8167646 - checkflag FLAG_0x2A0 - goto_if_eq EventScript_1676A6 - setflag FLAG_0x2A0 + checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3 + goto_if TRUE, EventScript_1676A6 + setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3 message Text_181CAE waitmessage goto EventScript_167728 end EventScript_16765E:: @ 816765E - checkflag FLAG_0x29F - goto_if_eq EventScript_1676A6 - setflag FLAG_0x29F + checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2 + goto_if TRUE, EventScript_1676A6 + setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2 message Text_181C77 waitmessage goto EventScript_167708 end EventScript_167676:: @ 8167676 - checkflag FLAG_0x29E - goto_if_eq EventScript_1676A6 - setflag FLAG_0x29E + checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 + goto_if TRUE, EventScript_1676A6 + setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 message Text_181B7C waitmessage goto EventScript_1676EC end EventScript_16768E:: @ 816768E - checkflag FLAG_0x29D - goto_if_eq EventScript_1676A6 - setflag FLAG_0x29D + checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED + goto_if TRUE, EventScript_1676A6 + setflag FLAG_TWO_ISLAND_SHOP_INTRODUCED message Text_181AFE waitmessage goto EventScript_1676D3 @@ -121,12 +121,12 @@ EventScript_16768E:: @ 816768E EventScript_1676A6:: @ 81676A6 message Text_1A6211 waitmessage - compare_var_to_value VAR_0x4078, 4 - goto_if_eq EventScript_167728 - compare_var_to_value VAR_0x4078, 3 - goto_if_eq EventScript_167708 - compare_var_to_value VAR_0x4078, 2 - goto_if_eq EventScript_1676EC + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 4 + goto_if eq, EventScript_167728 + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 3 + goto_if eq, EventScript_167708 + compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND, 2 + goto_if eq, EventScript_1676EC goto EventScript_1676D3 end @@ -209,9 +209,7 @@ TwoIsland_EventScript_167755:: @ 8167755 TwoIsland_EventScript_16775E:: @ 816775E lock faceplayer - setvar VAR_0x8004, 10 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_BRUNO, 4 msgbox gUnknown_8181E47 release end diff --git a/data/maps/TwoIsland_CapeBrink/map.json b/data/maps/TwoIsland_CapeBrink/map.json index 39a203e72..a6a957d2c 100644 --- a/data/maps/TwoIsland_CapeBrink/map.json +++ b/data/maps/TwoIsland_CapeBrink/map.json @@ -36,8 +36,9 @@ "y": 28, "elevation": 3, "item": "ITEM_PP_MAX", - "flag": "161", - "unknown": 129 + "flag": "HIDDEN_ITEM_TWO_ISLAND_CAPE_BRINK_PP_MAX", + "quantity": 1, + "underfoot": true }, { "type": "hidden_item", @@ -45,8 +46,9 @@ "y": 13, "elevation": 3, "item": "ITEM_RARE_CANDY", - "flag": "111", - "unknown": 1 + "flag": "HIDDEN_ITEM_TWO_ISLAND_CAPE_BRINK_RARE_CANDY", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 75b7fb2eb..93538a4c9 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "58", + "graphics_id": "MAP_OBJ_GFX_CHANNELER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index 0fed41496..0fb8e4f6b 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "108", + "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/TwoIsland_Harbor/scripts.inc b/data/maps/TwoIsland_Harbor/scripts.inc index 0fd4e9789..919239a0b 100644 --- a/data/maps/TwoIsland_Harbor/scripts.inc +++ b/data/maps/TwoIsland_Harbor/scripts.inc @@ -6,6 +6,6 @@ TwoIsland_Harbor_EventScript_171806:: @ 8171806 faceplayer message Text_181726 waitmessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, SEAGALLOP_TWO_ISLAND goto EventScript_1A8F54 end diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index fe6e2a80c..66f6aabed 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 0f940dd39..564ee8481 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -4,50 +4,50 @@ TwoIsland_House_MapScripts:: @ 8171618 TwoIsland_House_EventScript_171619:: @ 8171619 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 lock faceplayer - clearflag FLAG_0x002 - clearflag FLAG_0x003 - clearflag FLAG_0x004 - checkflag FLAG_0x001 - goto_if_eq EventScript_17164F + clearflag FLAG_TEMP_2 + clearflag FLAG_TEMP_3 + clearflag FLAG_TEMP_4 + checkflag FLAG_TEMP_1 + goto_if TRUE, EventScript_17164F msgbox gUnknown_81A2B88 - setflag FLAG_0x001 + setflag FLAG_TEMP_1 goto EventScript_17164F end EventScript_17164F:: @ 817164F checkitem ITEM_BIG_MUSHROOM, 1 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_1717A8 + call_if eq, EventScript_1717A8 checkitem ITEM_TINY_MUSHROOM, 2 compare_var_to_value VAR_RESULT, 1 - call_if 1, EventScript_1717AC - checkflag FLAG_0x002 - goto_if_eq EventScript_171687 - checkflag FLAG_0x003 - goto_if_eq EventScript_171696 + call_if eq, EventScript_1717AC + checkflag FLAG_TEMP_2 + goto_if TRUE, EventScript_171687 + checkflag FLAG_TEMP_3 + goto_if TRUE, EventScript_171696 goto EventScript_17179E end EventScript_171687:: @ 8171687 - checkflag FLAG_0x003 - call_if 1, EventScript_1717B0 + checkflag FLAG_TEMP_3 + call_if TRUE, EventScript_1717B0 goto EventScript_1716A5 end EventScript_171696:: @ 8171696 - checkflag FLAG_0x002 - call_if 1, EventScript_1717B0 + checkflag FLAG_TEMP_2 + call_if TRUE, EventScript_1717B0 goto EventScript_1716A5 end EventScript_1716A5:: @ 81716A5 msgbox gUnknown_81A2C63, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_17179E + goto_if eq, EventScript_17179E goto EventScript_1716BE end @@ -56,12 +56,12 @@ EventScript_1716BE:: @ 81716BE special sub_80BF93C waitstate compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_17179E + goto_if ge, EventScript_17179E special sub_80BFC14 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_171790 + goto_if eq, EventScript_171790 compare_var_to_value VAR_0x8005, 0 - goto_if_eq EventScript_171782 + goto_if eq, EventScript_171782 goto EventScript_1716F4 end @@ -70,13 +70,13 @@ EventScript_1716F4:: @ 81716F4 special sub_80E4634 waitstate compare_var_to_value VAR_0x8004, 0 - goto_if_eq EventScript_1716BE - checkflag FLAG_0x004 - goto_if_eq EventScript_17175B - checkflag FLAG_0x002 - goto_if_eq EventScript_171727 - checkflag FLAG_0x003 - goto_if_eq EventScript_171741 + goto_if eq, EventScript_1716BE + checkflag FLAG_TEMP_4 + goto_if TRUE, EventScript_17175B + checkflag FLAG_TEMP_2 + goto_if TRUE, EventScript_171727 + checkflag FLAG_TEMP_3 + goto_if TRUE, EventScript_171741 end EventScript_171727:: @ 8171727 @@ -120,13 +120,13 @@ EventScript_17179E:: @ 817179E end EventScript_1717A8:: @ 81717A8 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 return EventScript_1717AC:: @ 81717AC - setflag FLAG_0x003 + setflag FLAG_TEMP_3 return EventScript_1717B0:: @ 81717B0 - setflag FLAG_0x004 + setflag FLAG_TEMP_4 return diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 3b0ef6e54..fd3c9fac2 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 5, "y": 5, "elevation": 1, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "53", + "graphics_id": "MAP_OBJ_GFX_BIKER", "x": 5, "y": 8, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "116" + "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 6, "y": 5, "elevation": 1, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "TwoIsland_JoyfulGameCorner_EventScript_17160C", - "flag": "117" + "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 4, "y": 2, "elevation": 3, diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 94a0e4445..7d4bb6684 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -6,8 +6,8 @@ TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0 .byte 0 TwoIsland_JoyfulGameCorner_MapScript1_1713E5:: @ 81713E5 - checkflag FLAG_0x2FB - call_if 1, EventScript_1713EF + checkflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER + call_if TRUE, EventScript_1713EF end EventScript_1713EF:: @ 81713EF @@ -87,8 +87,8 @@ EventScript_17145F:: @ 817145F fadedefaultbgm delay 60 msgbox gUnknown_81A270C - clearflag FLAG_0x091 - setvar VAR_0x407B, 2 + clearflag FLAG_HIDE_THREE_ISLAND_LONE_BIKER + setvar VAR_MAP_SCENE_THREE_ISLAND, 2 setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 1 releaseall end @@ -126,9 +126,9 @@ TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535 lock faceplayer compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if_eq EventScript_1BC060 - checkflag FLAG_0x2A3 - goto_if_eq EventScript_171555 + goto_if eq, EventScript_1BC060 + checkflag FLAG_RESCUED_LOSTELLE + goto_if TRUE, EventScript_171555 msgbox gUnknown_81A285C release end @@ -142,18 +142,18 @@ TwoIsland_JoyfulGameCorner_EventScript_17155F:: @ 817155F lock faceplayer compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 - goto_if_eq EventScript_1BC0CE - checkflag FLAG_0x2FB - goto_if_eq EventScript_1715F5 + goto_if eq, EventScript_1BC0CE + checkflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER + goto_if TRUE, EventScript_1715F5 compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 3 - goto_if_eq EventScript_17158A + goto_if eq, EventScript_17158A msgbox gUnknown_81A2743 release end EventScript_17158A:: @ 817158A - checkflag FLAG_0x2FE - goto_if_eq EventScript_1715C4 + checkflag FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE + goto_if TRUE, EventScript_1715C4 msgbox gUnknown_81A296A setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 textcolor 3 @@ -170,9 +170,9 @@ EventScript_17158A:: @ 817158A EventScript_1715C4:: @ 81715C4 checkitemspace ITEM_MOON_STONE, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1715FF + goto_if eq, EventScript_1715FF additem ITEM_MOON_STONE, 1 - setflag FLAG_0x2FB + setflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER giveitemfanfaremsg gUnknown_81A2A9A, ITEM_MOON_STONE release end @@ -183,7 +183,7 @@ EventScript_1715F5:: @ 81715F5 end EventScript_1715FF:: @ 81715FF - setflag FLAG_0x2FE + setflag FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE msgbox gUnknown_81A2ACA release end diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index 104e8fb2e..4b227d7b7 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "51", + "graphics_id": "MAP_OBJ_GFX_GBA_KID", "x": 11, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index 89ef1c015..43f5eb4ad 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "TwoIsland_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index c6a7a20ef..107b622f6 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UndergroundPath_EastWestTunnel/map.json b/data/maps/UndergroundPath_EastWestTunnel/map.json index a1acbf716..6a4f5d9b4 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/map.json +++ b/data/maps/UndergroundPath_EastWestTunnel/map.json @@ -37,8 +37,9 @@ "y": 3, "elevation": 3, "item": "ITEM_POTION", - "flag": "77", - "unknown": 1 + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_POTION", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -46,8 +47,9 @@ "y": 5, "elevation": 3, "item": "ITEM_PARALYZE_HEAL", - "flag": "79", - "unknown": 1 + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_PARALYZE_HEAL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -55,8 +57,9 @@ "y": 4, "elevation": 3, "item": "ITEM_AWAKENING", - "flag": "80", - "unknown": 1 + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_AWAKENING", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -64,8 +67,9 @@ "y": 3, "elevation": 3, "item": "ITEM_BURN_HEAL", - "flag": "81", - "unknown": 1 + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_BURN_HEAL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -73,8 +77,9 @@ "y": 3, "elevation": 3, "item": "ITEM_ICE_HEAL", - "flag": "82", - "unknown": 1 + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ICE_HEAL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -82,8 +87,9 @@ "y": 2, "elevation": 3, "item": "ITEM_ETHER", - "flag": "83", - "unknown": 1 + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ETHER", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -91,8 +97,9 @@ "y": 5, "elevation": 3, "item": "ITEM_ANTIDOTE", - "flag": "78", - "unknown": 1 + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_EAST_WEST_TUNNEL_ANTIDOTE", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index 3620937c7..a839da159 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index a88b1a55c..4d5a806e2 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -6,20 +6,20 @@ UndergroundPath_NorthEntrance_EventScript_160E39:: @ 8160E39 faceplayer setvar VAR_0x8008, 2 call EventScript_1A8CAD - checkflag FLAG_0x24B - goto_if_eq EventScript_160EAB + checkflag FLAG_DID_MS_NIDO_TRADE + goto_if TRUE, EventScript_160EAB msgbox gUnknown_81A5AD6, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_160E93 + goto_if eq, EventScript_160E93 call EventScript_1A8CBD compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_160E93 + goto_if ge, EventScript_160E93 call EventScript_1A8CC9 compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_160E9D + goto_if ne, EventScript_160E9D call EventScript_1A8CD9 msgbox gUnknown_81A5B4A - setflag FLAG_0x24B + setflag FLAG_DID_MS_NIDO_TRADE release end diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/map.json b/data/maps/UndergroundPath_NorthSouthTunnel/map.json index 9d0408768..0f0482504 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/map.json +++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json @@ -37,8 +37,9 @@ "y": 30, "elevation": 3, "item": "ITEM_POTION", - "flag": "70", - "unknown": 1 + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_POTION", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -46,8 +47,9 @@ "y": 6, "elevation": 3, "item": "ITEM_ANTIDOTE", - "flag": "71", - "unknown": 1 + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ANTIDOTE", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -55,8 +57,9 @@ "y": 57, "elevation": 3, "item": "ITEM_BURN_HEAL", - "flag": "74", - "unknown": 1 + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_BURN_HEAL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -64,8 +67,9 @@ "y": 24, "elevation": 3, "item": "ITEM_AWAKENING", - "flag": "73", - "unknown": 1 + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_AWAKENING", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -73,8 +77,9 @@ "y": 53, "elevation": 3, "item": "ITEM_ICE_HEAL", - "flag": "75", - "unknown": 1 + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ICE_HEAL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -82,8 +87,9 @@ "y": 15, "elevation": 3, "item": "ITEM_PARALYZE_HEAL", - "flag": "72", - "unknown": 1 + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_PARALYZE_HEAL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -91,8 +97,9 @@ "y": 39, "elevation": 3, "item": "ITEM_ETHER", - "flag": "76", - "unknown": 1 + "flag": "HIDDEN_ITEM_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL_ETHER", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index ef8888b06..cce927999 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index 6791d7100..dd73060a4 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/UnknownMap_00_00/map.json index ffebedc43..dc4ac7d19 100644 --- a/data/maps/UnknownMap_00_00/map.json +++ b/data/maps/UnknownMap_00_00/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "66", + "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/UnknownMap_00_01/map.json index 5d40fa820..65c7875bb 100644 --- a/data/maps/UnknownMap_00_01/map.json +++ b/data/maps/UnknownMap_00_01/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "66", + "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/UnknownMap_00_02/map.json index 742239cd3..de002c33f 100644 --- a/data/maps/UnknownMap_00_02/map.json +++ b/data/maps/UnknownMap_00_02/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "66", + "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", "x": 10, "y": 5, "elevation": 0, diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnknownMap_00_04/map.json index ed9be424f..3c0340f01 100644 --- a/data/maps/UnknownMap_00_04/map.json +++ b/data/maps/UnknownMap_00_04/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "66", + "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", "x": 3, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "243", + "graphics_id": "MAP_OBJ_GFX_VAR_3", "x": 1, "y": 8, "elevation": 3, @@ -37,10 +37,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "UnknownMap_00_04_EventScript_1604DA", - "flag": "102" + "flag": "FLAG_HIDE_UNION_ROOM_4" }, { - "graphics_id": "247", + "graphics_id": "MAP_OBJ_GFX_VAR_7", "x": 7, "y": 8, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "UnknownMap_00_04_EventScript_160502", - "flag": "106" + "flag": "FLAG_HIDE_UNION_ROOM_8" }, { - "graphics_id": "246", + "graphics_id": "MAP_OBJ_GFX_VAR_6", "x": 1, "y": 4, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "UnknownMap_00_04_EventScript_1604F8", - "flag": "105" + "flag": "FLAG_HIDE_UNION_ROOM_7" }, { - "graphics_id": "245", + "graphics_id": "MAP_OBJ_GFX_VAR_5", "x": 7, "y": 4, "elevation": 3, @@ -76,10 +76,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "UnknownMap_00_04_EventScript_1604EE", - "flag": "104" + "flag": "FLAG_HIDE_UNION_ROOM_6" }, { - "graphics_id": "244", + "graphics_id": "MAP_OBJ_GFX_VAR_4", "x": 13, "y": 4, "elevation": 3, @@ -89,10 +89,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "UnknownMap_00_04_EventScript_1604E4", - "flag": "103" + "flag": "FLAG_HIDE_UNION_ROOM_5" }, { - "graphics_id": "242", + "graphics_id": "MAP_OBJ_GFX_VAR_2", "x": 10, "y": 6, "elevation": 3, @@ -102,10 +102,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "UnknownMap_00_04_EventScript_1604D0", - "flag": "101" + "flag": "FLAG_HIDE_UNION_ROOM_3" }, { - "graphics_id": "241", + "graphics_id": "MAP_OBJ_GFX_VAR_1", "x": 13, "y": 8, "elevation": 3, @@ -115,10 +115,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "UnknownMap_00_04_EventScript_1604C6", - "flag": "100" + "flag": "FLAG_HIDE_UNION_ROOM_2" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 4, "y": 6, "elevation": 3, @@ -128,7 +128,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "UnknownMap_00_04_EventScript_1604BC", - "flag": "99" + "flag": "FLAG_HIDE_UNION_ROOM_1" } ], "warp_events": [ diff --git a/data/maps/UnknownMap_00_04/scripts.inc b/data/maps/UnknownMap_00_04/scripts.inc index 94056b155..0358b7d8a 100644 --- a/data/maps/UnknownMap_00_04/scripts.inc +++ b/data/maps/UnknownMap_00_04/scripts.inc @@ -4,14 +4,14 @@ UnknownMap_00_04_MapScripts:: @ 816047C .byte 0 UnknownMap_00_04_MapScript1_160487:: @ 8160487 - setflag FLAG_0x063 - setflag FLAG_0x064 - setflag FLAG_0x065 - setflag FLAG_0x066 - setflag FLAG_0x067 - setflag FLAG_0x068 - setflag FLAG_0x069 - setflag FLAG_0x06A + setflag FLAG_HIDE_UNION_ROOM_1 + setflag FLAG_HIDE_UNION_ROOM_2 + setflag FLAG_HIDE_UNION_ROOM_3 + setflag FLAG_HIDE_UNION_ROOM_4 + setflag FLAG_HIDE_UNION_ROOM_5 + setflag FLAG_HIDE_UNION_ROOM_6 + setflag FLAG_HIDE_UNION_ROOM_7 + setflag FLAG_HIDE_UNION_ROOM_8 removeobject 9 removeobject 8 removeobject 7 diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 88387daef..e9d3a097d 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 22, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 17, "y": 9, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "33", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", "x": 36, "y": 10, "elevation": 0, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "130", + "graphics_id": "MAP_OBJ_GFX_MACHOP", "x": 35, "y": 11, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 31, "y": 30, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 24, "y": 33, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 19, "y": 24, "elevation": 3, @@ -112,11 +112,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VermilionCity_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "55", + "graphics_id": "MAP_OBJ_GFX_SCIENTIST", "x": 25, "y": 7, "elevation": 3, @@ -126,7 +126,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VermilionCity_EventScript_166C20", - "flag": "161" + "flag": "FLAG_HIDE_VERMILION_CITY_OAKS_AIDE" } ], "warp_events": [ @@ -281,8 +281,9 @@ "y": 11, "elevation": 3, "item": "ITEM_MAX_ETHER", - "flag": "48", - "unknown": 1 + "flag": "HIDDEN_ITEM_VERMILION_CITY_MAX_ETHER", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index c809fd7bd..d1d312add 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -22,12 +22,12 @@ Movement_166903:: @ 8166903 VermilionCity_MapScript1_166906:: @ 8166906 setworldmapflag FLAG_WORLD_MAP_VERMILION_CITY - checkflag FLAG_0x2F9 - call_if 1, EventScript_166913 + checkflag FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION + call_if TRUE, EventScript_166913 end EventScript_166913:: @ 8166913 - setflag FLAG_0x0A1 + setflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE return VermilionCity_EventScript_166917:: @ 8166917 @@ -38,7 +38,7 @@ VermilionCity_EventScript_166920:: @ 8166920 lock faceplayer compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if_eq EventScript_166937 + goto_if eq, EventScript_166937 msgbox gUnknown_817F776 release end @@ -52,35 +52,35 @@ VermilionCity_EventScript_166941:: @ 8166941 lock faceplayer compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if_eq EventScript_166996 + goto_if eq, EventScript_166996 msgbox gUnknown_817FA22 release end EventScript_166958:: @ 8166958 - checkflag FLAG_0x84A - goto_if 0, EventScript_1A77B0 + checkflag FLAG_SYS_GOT_MYSTIC_TICKET + goto_if FALSE, EventScript_1A77B0 checkitem ITEM_MYSTIC_TICKET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A77B0 + goto_if eq, EventScript_1A77B0 goto EventScript_1A77AA end EventScript_166977:: @ 8166977 - checkflag FLAG_0x84B - goto_if 0, EventScript_1A77B0 + checkflag FLAG_SYS_GOT_AURORA_TICKET + goto_if FALSE, EventScript_1A77B0 checkitem ITEM_AURORA_TICKET, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_1A77B0 + goto_if eq, EventScript_1A77B0 goto EventScript_1A77AA end EventScript_166996:: @ 8166996 - setvar VAR_0x8004, 0 + setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if 4, EventScript_1669BB + goto_if ge, EventScript_1669BB compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 - goto_if 4, EventScript_166B3B + goto_if ge, EventScript_166B3B msgbox gUnknown_817FB10 release end @@ -88,15 +88,15 @@ EventScript_166996:: @ 8166996 EventScript_1669BB:: @ 81669BB special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 call EventScript_166958 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_1669FD + goto_if eq, EventScript_1669FD call EventScript_166977 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_166A5F - setvar VAR_0x8004, 0 + goto_if eq, EventScript_166A5F + setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY message Text_17FBB8 waitmessage goto EventScript_1A911E @@ -105,9 +105,9 @@ EventScript_1669BB:: @ 81669BB EventScript_1669FD:: @ 81669FD call EventScript_166977 compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_166AB1 - checkflag FLAG_0x2F0 - call_if 0, EventScript_166A53 + goto_if eq, EventScript_166AB1 + checkflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN + call_if FALSE, EventScript_166A53 message Text_17FCC1 waitmessage multichoice 17, 6, 54, 0 @@ -119,13 +119,13 @@ EventScript_1669FD:: @ 81669FD end EventScript_166A53:: @ 8166A53 - setflag FLAG_0x2F0 + setflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN msgbox gUnknown_817FC00 return EventScript_166A5F:: @ 8166A5F - checkflag FLAG_0x2F1 - call_if 0, EventScript_166AA5 + checkflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN + call_if FALSE, EventScript_166AA5 message Text_17FCC1 waitmessage multichoice 13, 6, 55, 0 @@ -137,15 +137,15 @@ EventScript_166A5F:: @ 8166A5F end EventScript_166AA5:: @ 8166AA5 - setflag FLAG_0x2F1 + setflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN msgbox gUnknown_817FC5F return EventScript_166AB1:: @ 8166AB1 - checkflag FLAG_0x2F0 - call_if 0, EventScript_166A53 - checkflag FLAG_0x2F1 - call_if 0, EventScript_166AA5 + checkflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN + call_if FALSE, EventScript_166A53 + checkflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN + call_if FALSE, EventScript_166AA5 message Text_17FCC1 waitmessage multichoice 13, 5, 56, 0 @@ -159,22 +159,22 @@ EventScript_166AB1:: @ 8166AB1 EventScript_166B0B:: @ 8166B0B msgbox gUnknown_817FCEC - setvar VAR_0x8004, 0 - setvar VAR_0x8006, 9 + setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY + setvar VAR_0x8006, SEAGALLOP_NAVEL_ROCK goto EventScript_1A90DA end EventScript_166B23:: @ 8166B23 msgbox gUnknown_817FD5F - setvar VAR_0x8004, 0 - setvar VAR_0x8006, 10 + setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY + setvar VAR_0x8006, SEAGALLOP_BIRTH_ISLAND goto EventScript_1A90DA end EventScript_166B3B:: @ 8166B3B message Text_17FB23 waitmessage - setvar VAR_0x8004, 0 + setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY multichoice 19, 5, 57, 0 switch VAR_RESULT case 0, EventScript_1A8FEE @@ -210,10 +210,10 @@ EventScript_166BA0:: @ 8166BA0 applymovement 255, Movement_1A75EB waitmovement 0 compare_var_to_value VAR_MAP_SCENE_VERMILION_CITY, 3 - goto_if_eq EventScript_166BED + goto_if eq, EventScript_166BED msgbox gUnknown_817FA3C - checkflag FLAG_0x234 - goto_if 0, EventScript_166BDE + checkflag FLAG_GOT_SS_TICKET + goto_if FALSE, EventScript_166BDE msgbox gUnknown_817FA77 setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 1 releaseall @@ -226,11 +226,11 @@ EventScript_166BDE:: @ 8166BDE end EventScript_166BED:: @ 8166BED - setvar VAR_0x8004, 0 + setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 - goto_if 4, EventScript_1669BB + goto_if ge, EventScript_1669BB compare_var_to_value VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1 - goto_if 4, EventScript_166B3B + goto_if ge, EventScript_166B3B msgbox gUnknown_817FB10 closemessage goto EventScript_1A9108 @@ -243,7 +243,7 @@ VermilionCity_EventScript_166C17:: @ 8166C17 VermilionCity_EventScript_166C20:: @ 8166C20 lock faceplayer - setflag FLAG_0x2F9 + setflag FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION msgbox gUnknown_817FDD2 release end @@ -277,9 +277,7 @@ VermilionCity_EventScript_166C65:: @ 8166C65 VermilionCity_EventScript_166C6E:: @ 8166C6E lockall - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 0 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_LTSURGE, 0 msgbox gUnknown_817F9CC releaseall end diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index dfb904da2..c5a9d6d38 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "82", + "graphics_id": "MAP_OBJ_GFX_LT_SURGE", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 2, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "62", + "graphics_id": "MAP_OBJ_GFX_SAILOR", "x": 8, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 4, "y": 17, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 7, "y": 8, "elevation": 3, diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 36430c676..48fa76fe0 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -4,10 +4,10 @@ VermilionCity_Gym_MapScripts:: @ 816B69E .byte 0 VermilionCity_Gym_MapScript1_16B6A9:: @ 816B6A9 - checkflag FLAG_0x001 - call_if 1, EventScript_16B6BC - checkflag FLAG_0x264 - call_if 1, EventScript_16B717 + checkflag FLAG_TEMP_1 + call_if TRUE, EventScript_16B6BC + checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES + call_if TRUE, EventScript_16B717 end EventScript_16B6BC:: @ 816B6BC @@ -41,9 +41,9 @@ VermilionCity_Gym_MapScript2_16B772:: @ 816B772 end EventScript_16B778:: @ 816B778 - checkflag FLAG_0x264 - goto_if_eq EventScript_1A77A9 - special sub_80CADEC + checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES + goto_if TRUE, EventScript_1A77A9 + special Special_SetVermilionTrashCans copyvar VAR_0x4000, VAR_0x8004 copyvar VAR_0x4001, VAR_0x8005 return @@ -141,16 +141,16 @@ VermilionCity_Gym_EventScript_16B837:: @ 816B837 EventScript_16B843:: @ 816B843 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 copyvar VAR_0x8004, VAR_0x4000 copyvar VAR_0x8005, VAR_0x4001 - checkflag FLAG_0x264 - goto_if_eq EventScript_16B8E5 - checkflag FLAG_0x001 - goto_if_eq EventScript_16B89E + checkflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES + goto_if TRUE, EventScript_16B8E5 + checkflag FLAG_TEMP_1 + goto_if TRUE, EventScript_16B89E compare_var_to_var VAR_0x8004, VAR_0x8008 - goto_if_eq EventScript_16B885 + goto_if eq, EventScript_16B885 msgbox gUnknown_8195289 releaseall end @@ -161,16 +161,16 @@ EventScript_16B885:: @ 816B885 waitse call EventScript_16B6BC special DrawWholeMapView - setflag FLAG_0x001 + setflag FLAG_TEMP_1 releaseall end EventScript_16B89E:: @ 816B89E compare_var_to_var VAR_0x8005, VAR_0x8008 - goto_if_eq EventScript_16B8CB + goto_if eq, EventScript_16B8CB msgbox gUnknown_819536C - clearflag FLAG_0x001 - special sub_80CADEC + clearflag FLAG_TEMP_1 + special Special_SetVermilionTrashCans copyvar VAR_0x4000, VAR_0x8004 copyvar VAR_0x4001, VAR_0x8005 call EventScript_16B8EF @@ -185,7 +185,7 @@ EventScript_16B8CB:: @ 816B8CB special DrawWholeMapView playse SE_KI_GASYAN waitse - setflag FLAG_0x264 + setflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES releaseall end @@ -208,42 +208,37 @@ EventScript_16B8EF:: @ 816B8EF return VermilionCity_Gym_EventScript_16B94A:: @ 816B94A - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 416, 0, Text_194BA4, Text_194E03, EventScript_16B97C - checkflag FLAG_0x231 - goto_if 0, EventScript_16B9AF + famechecker FAMECHECKER_LTSURGE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + trainerbattle 1, TRAINER_LEADER_LT_SURGE, 0, Text_194BA4, Text_194E03, EventScript_16B97C + checkflag FLAG_GOT_TM34_FROM_SURGE + goto_if FALSE, EventScript_16B9AF msgbox gUnknown_8194C8E release end EventScript_16B97C:: @ 816B97C - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars - checkflag FLAG_0x23B - call_if 0, EventScript_16B9AB - clearflag FLAG_0x0A0 - setflag FLAG_0x4B2 - setflag FLAG_0x822 - setvar VAR_0x8008, 3 - call EventScript_1A6B18 + famechecker FAMECHECKER_LTSURGE, 1 + checkflag FLAG_GOT_HM05 + call_if FALSE, EventScript_16B9AB + clearflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL + setflag FLAG_DEFEATED_LT_SURGE + setflag FLAG_BADGE03_GET + set_gym_trainers 3 goto EventScript_16B9AF end EventScript_16B9AB:: @ 816B9AB - clearflag FLAG_0x0A1 + clearflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE return EventScript_16B9AF:: @ 816B9AF msgbox gUnknown_8194CFA checkitemspace ITEM_TM34, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B9F0 + goto_if eq, EventScript_16B9F0 additem ITEM_TM34, 1 giveitemfanfaremsg gUnknown_8194D87, ITEM_TM34 - setflag FLAG_0x231 + setflag FLAG_GOT_TM34_FROM_SURGE msgbox gUnknown_8194DA8 release end @@ -254,38 +249,32 @@ EventScript_16B9F0:: @ 816B9F0 end VermilionCity_Gym_EventScript_16B9FA:: @ 816B9FA - trainerbattle 0, 141, 0, Text_194FBD, Text_194FF1 - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars + trainerbattle 0, TRAINER_SAILOR_DWAYNE, 0, Text_194FBD, Text_194FF1 + famechecker FAMECHECKER_LTSURGE, 4 msgbox gUnknown_8195004, 6 end VermilionCity_Gym_EventScript_16BA1E:: @ 816BA1E - trainerbattle 0, 220, 0, Text_194F1F, Text_194F6F + trainerbattle 0, TRAINER_ENGINEER_BAILY, 0, Text_194F1F, Text_194F6F msgbox gUnknown_8194F76, 6 end VermilionCity_Gym_EventScript_16BA35:: @ 816BA35 - trainerbattle 2, 423, 0, Text_194E57, Text_194EA5, EventScript_16BA5D - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars + trainerbattle 2, TRAINER_GENTLEMAN_TUCKER, 0, Text_194E57, Text_194EA5, EventScript_16BA5D + famechecker FAMECHECKER_LTSURGE, 3 msgbox gUnknown_8194EBD, 6 end EventScript_16BA5D:: @ 816BA5D - setvar VAR_0x8004, 4 - setvar VAR_0x8005, 2 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_LTSURGE, 2 release end VermilionCity_Gym_EventScript_16BA6C:: @ 816BA6C lock faceplayer - checkflag FLAG_0x4B2 - goto_if_eq EventScript_16BA81 + checkflag FLAG_DEFEATED_LT_SURGE + goto_if TRUE, EventScript_16BA81 msgbox gUnknown_81950B4 release end @@ -297,8 +286,8 @@ EventScript_16BA81:: @ 816BA81 VermilionCity_Gym_EventScript_16BA8B:: @ 816BA8B lockall - checkflag FLAG_0x822 - goto_if_eq EventScript_16BA9F + checkflag FLAG_BADGE03_GET + goto_if TRUE, EventScript_16BA9F msgbox gUnknown_819520B releaseall end diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index f83e884a9..c45c3f65f 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "57", + "graphics_id": "MAP_OBJ_GFX_FISHER", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index a7de85e8f..6020f9cb0 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -4,11 +4,11 @@ VermilionCity_House1_MapScripts:: @ 816B3A6 VermilionCity_House1_EventScript_16B3A7:: @ 816B3A7 lock faceplayer - checkflag FLAG_0x240 - goto_if_eq EventScript_16B3CF + checkflag FLAG_GOT_OLD_ROD + goto_if TRUE, EventScript_16B3CF msgbox gUnknown_8193EC1, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16B3D9 + goto_if eq, EventScript_16B3D9 msgbox gUnknown_8194028 release end @@ -21,11 +21,11 @@ EventScript_16B3CF:: @ 816B3CF EventScript_16B3D9:: @ 816B3D9 checkitemspace ITEM_OLD_ROD, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B41A + goto_if eq, EventScript_16B41A additem ITEM_OLD_ROD, 1 msgbox gUnknown_8193F2A giveitemfanfaremsg gUnknown_8193F81, ITEM_OLD_ROD - setflag FLAG_0x240 + setflag FLAG_GOT_OLD_ROD msgbox gUnknown_8193FAF release end diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index 980e3eae8..94cbf7c94 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_House2/scripts.inc b/data/maps/VermilionCity_House2/scripts.inc index 9179fa716..fa9fd6453 100644 --- a/data/maps/VermilionCity_House2/scripts.inc +++ b/data/maps/VermilionCity_House2/scripts.inc @@ -1 +1,40 @@ -@ .include "data/maps/VermilionCity_House2/scripts.inc" +VermilionCity_House2_MapScripts:: @ 816B5D6 + .byte 0 + +VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 + lock + faceplayer + setvar VAR_0x8008, 3 + call EventScript_1A8CAD + checkflag FLAG_DID_CH_DING_TRADE + goto_if TRUE, EventScript_16B649 + msgbox gUnknown_81949CB, MSGBOX_YESNO + compare_var_to_value VAR_RESULT, 0 + goto_if eq, EventScript_16B631 + call EventScript_1A8CBD + compare_var_to_value VAR_0x8004, 6 + goto_if ge, EventScript_16B631 + call EventScript_1A8CC9 + compare_var_to_var VAR_RESULT, VAR_0x8009 + goto_if ne, EventScript_16B63B + call EventScript_1A8CD9 + msgbox gUnknown_8194A44 + setflag FLAG_DID_CH_DING_TRADE + release + end + +EventScript_16B631:: @ 816B631 + msgbox gUnknown_81949FD + release + end + +EventScript_16B63B:: @ 816B63B + getspeciesname 0, VAR_0x8009 + msgbox gUnknown_8194A0D + release + end + +EventScript_16B649:: @ 816B649 + msgbox gUnknown_8194A4F + release + end diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index 4ef4347b3..d1a3688f0 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "116", + "graphics_id": "MAP_OBJ_GFX_PIDGEY", "x": 2, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "105", + "graphics_id": "MAP_OBJ_GFX_CLIPBOARD", "x": 6, "y": 4, "elevation": 0, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index 519227231..f53ba795a 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 4, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 9, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index c83e239d9..d7beb6e7e 100644 --- a/data/maps/VermilionCity_Mart/scripts.inc +++ b/data/maps/VermilionCity_Mart/scripts.inc @@ -12,7 +12,7 @@ VermilionCity_Mart_EventScript_16B65D:: @ 816B65D VermilionCity_Mart_EventScript_16B666:: @ 816B666 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 lock faceplayer message Text_1A6211 diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index 750104631..aaf4bc861 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 4, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "56", + "graphics_id": "MAP_OBJ_GFX_HIKER", "x": 12, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 14, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 6, "y": 4, "elevation": 3, @@ -89,7 +89,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83", - "flag": "160" + "flag": "FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL" }, { "graphics_id": "0", @@ -102,7 +102,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VermilionCity_PokemonCenter_1F_EventScript_1ACE83", - "flag": "160" + "flag": "FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL" } ], "warp_events": [ diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 7c0a45d41..789cc891a 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VermilionCity_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index 4d5c86771..f4ec8fe14 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 5, "y": 4, "elevation": 4, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "48", + "graphics_id": "MAP_OBJ_GFX_WORKER_F", "x": 6, "y": 4, "elevation": 4, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "120", + "graphics_id": "MAP_OBJ_GFX_PIKACHU", "x": 7, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "126", + "graphics_id": "MAP_OBJ_GFX_SEEL", "x": 4, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 4, "y": 5, "elevation": 0, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 7, "y": 5, "elevation": 0, diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index fc1625e39..397c174ea 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -4,11 +4,11 @@ VermilionCity_PokemonFanClub_MapScripts:: @ 816B47E VermilionCity_PokemonFanClub_EventScript_16B47F:: @ 816B47F lock faceplayer - checkflag FLAG_0x241 - goto_if_eq EventScript_16B4A7 + checkflag FLAG_GOT_BIKE_VOUCHER + goto_if TRUE, EventScript_16B4A7 msgbox gUnknown_819457E, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_16B4B1 + goto_if eq, EventScript_16B4B1 msgbox gUnknown_8194860 release end @@ -22,8 +22,8 @@ EventScript_16B4B1:: @ 816B4B1 msgbox gUnknown_8194628 checkitemspace ITEM_BIKE_VOUCHER, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B4F2 - setflag FLAG_0x241 + goto_if eq, EventScript_16B4F2 + setflag FLAG_GOT_BIKE_VOUCHER additem ITEM_BIKE_VOUCHER, 1 giveitemfanfaremsg gUnknown_819474E, ITEM_BIKE_VOUCHER, 1, MUS_FAN5 msgbox gUnknown_819477C @@ -38,16 +38,14 @@ EventScript_16B4F2:: @ 816B4F2 VermilionCity_PokemonFanClub_EventScript_16B4FC:: @ 816B4FC lock faceplayer - checkflag FLAG_0x82C - goto_if_eq EventScript_16B511 + checkflag FLAG_SYS_GAME_CLEAR + goto_if TRUE, EventScript_16B511 msgbox gUnknown_81948E6 release end EventScript_16B511:: @ 816B511 - setvar VAR_0x8004, 1 - setvar VAR_0x8005, 1 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_DAISY, 1 msgbox gUnknown_8194960 release end @@ -55,13 +53,13 @@ EventScript_16B511:: @ 816B511 VermilionCity_PokemonFanClub_EventScript_16B528:: @ 816B528 lock faceplayer - checkflag FLAG_0x003 - goto_if_eq EventScript_16B54B + checkflag FLAG_TEMP_3 + goto_if TRUE, EventScript_16B54B msgbox gUnknown_81944CC closemessage applymovement 5, Movement_1A75E5 waitmovement 0 - setflag FLAG_0x002 + setflag FLAG_TEMP_2 release end @@ -70,20 +68,20 @@ EventScript_16B54B:: @ 816B54B closemessage applymovement 5, Movement_1A75E5 waitmovement 0 - clearflag FLAG_0x003 + clearflag FLAG_TEMP_3 release end VermilionCity_PokemonFanClub_EventScript_16B563:: @ 816B563 lock faceplayer - checkflag FLAG_0x002 - goto_if_eq EventScript_16B586 + checkflag FLAG_TEMP_2 + goto_if TRUE, EventScript_16B586 msgbox gUnknown_819446F closemessage applymovement 6, Movement_1A75E5 waitmovement 0 - setflag FLAG_0x003 + setflag FLAG_TEMP_3 release end @@ -92,7 +90,7 @@ EventScript_16B586:: @ 816B586 closemessage applymovement 6, Movement_1A75E5 waitmovement 0 - clearflag FLAG_0x002 + clearflag FLAG_TEMP_2 release end @@ -123,44 +121,3 @@ VermilionCity_PokemonFanClub_EventScript_16B5C4:: @ 816B5C4 VermilionCity_PokemonFanClub_EventScript_16B5CD:: @ 816B5CD msgbox gUnknown_819493D, 3 end - -VermilionCity_House2_MapScripts:: @ 816B5D6 - .byte 0 - -VermilionCity_House2_EventScript_16B5D7:: @ 816B5D7 - lock - faceplayer - setvar VAR_0x8008, 3 - call EventScript_1A8CAD - checkflag FLAG_0x24D - goto_if_eq EventScript_16B649 - msgbox gUnknown_81949CB, MSGBOX_YESNO - compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16B631 - call EventScript_1A8CBD - compare_var_to_value VAR_0x8004, 6 - goto_if 4, EventScript_16B631 - call EventScript_1A8CC9 - compare_var_to_var VAR_RESULT, VAR_0x8009 - goto_if 5, EventScript_16B63B - call EventScript_1A8CD9 - msgbox gUnknown_8194A44 - setflag FLAG_0x24D - release - end - -EventScript_16B631:: @ 816B631 - msgbox gUnknown_81949FD - release - end - -EventScript_16B63B:: @ 816B63B - getspeciesname 0, VAR_0x8009 - msgbox gUnknown_8194A0D - release - end - -EventScript_16B649:: @ 816B649 - msgbox gUnknown_8194A4F - release - end diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index f509d6232..4fb068476 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 14, "y": 6, "elevation": 4, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 3, "elevation": 3, @@ -50,10 +50,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VictoryRoad_1F_EventScript_1BE9D2", - "flag": "425" + "flag": "FLAG_HIDE_VICTORY_ROAD_1F_RARE_CANDY" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 14, "y": 1, "elevation": 3, @@ -63,10 +63,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VictoryRoad_1F_EventScript_1BE9DF", - "flag": "426" + "flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 7, "y": 18, "elevation": 3, @@ -75,11 +75,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_1F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 4, "y": 12, "elevation": 3, @@ -88,11 +88,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_1F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 16, "y": 3, "elevation": 3, @@ -101,7 +101,7 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_1F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" } ], @@ -127,7 +127,7 @@ "x": 20, "y": 16, "elevation": 3, - "var": "VAR_0x4064", + "var": "VAR_MAP_SCENE_VICTORY_ROAD_1F", "var_value": 99, "script": "VictoryRoad_1F_EventScript_160F33" } @@ -138,9 +138,10 @@ "x": 12, "y": 12, "elevation": 0, - "item": "POCKET_KEY_ITEMS", - "flag": "37", - "unknown": 1 + "item": "ITEM_ULTRA_BALL", + "flag": "HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -148,8 +149,9 @@ "y": 1, "elevation": 0, "item": "ITEM_FULL_RESTORE", - "flag": "38", - "unknown": 1 + "flag": "HIDDEN_ITEM_VICTORY_ROAD_1F_FULL_RESTORE", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 1406ef4e5..a5b2a201d 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -4,8 +4,8 @@ VictoryRoad_1F_MapScripts:: @ 8160F05 .byte 0 VictoryRoad_1F_MapScript1_160F10:: @ 8160F10 - compare_var_to_value VAR_0x4064, 100 - call_if 5, EventScript_160F1C + compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 + call_if ne, EventScript_160F1C end EventScript_160F1C:: @ 8160F1C @@ -19,15 +19,15 @@ VictoryRoad_1F_MapScript2_160F2F:: @ 8160F2F VictoryRoad_1F_EventScript_160F33:: @ 8160F33 lockall - compare_var_to_value VAR_0x4064, 100 - goto_if_eq EventScript_160F62 + compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 + goto_if eq, EventScript_160F62 setmetatile 12, 14, 721, 0 setmetatile 12, 15, 737, 0 playse SE_RU_GASYAN special DrawWholeMapView waitse moveobjectoffscreen 5 - setvar VAR_0x4064, 100 + setvar VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 releaseall end @@ -36,11 +36,11 @@ EventScript_160F62:: @ 8160F62 end VictoryRoad_1F_EventScript_160F64:: @ 8160F64 - trainerbattle 0, 406, 0, Text_174710, Text_174738 + trainerbattle 0, TRAINER_COOLTRAINER_NAOMI, 0, Text_174710, Text_174738 msgbox gUnknown_8174744, 6 end VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B - trainerbattle 0, 396, 0, Text_174784, Text_1747B8 + trainerbattle 0, TRAINER_COOLTRAINER_ROLANDO, 0, Text_174784, Text_1747B8 msgbox gUnknown_81747C8, 6 end diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 1591bf1ee..dfbe906bd 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "52", + "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 20, "y": 11, "elevation": 4, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 31, "y": 16, "elevation": 4, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 26, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "26", + "graphics_id": "MAP_OBJ_GFX_ROCKER", "x": 36, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 6, "elevation": 3, @@ -89,10 +89,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VictoryRoad_2F_EventScript_1BE9EC", - "flag": "427" + "flag": "FLAG_HIDE_VICTORY_ROAD_2F_GUARD_SPEC" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 40, "y": 7, "elevation": 3, @@ -102,10 +102,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VictoryRoad_2F_EventScript_1BE9F9", - "flag": "428" + "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM07" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 25, "y": 13, "elevation": 3, @@ -115,10 +115,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VictoryRoad_2F_EventScript_1BEA06", - "flag": "429" + "flag": "FLAG_HIDE_VICTORY_ROAD_2F_FULL_HEAL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 14, "y": 13, "elevation": 3, @@ -128,10 +128,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VictoryRoad_2F_EventScript_1BEA13", - "flag": "430" + "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 8, "y": 7, "elevation": 3, @@ -140,11 +140,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 6, "y": 17, "elevation": 3, @@ -153,11 +153,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 33, "y": 19, "elevation": 3, @@ -166,11 +166,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_2F_EventScript_1BE11D", - "flag": "88" + "script": "EventScript_InteractWithStrengthBoulderObject", + "flag": "FLAG_HIDE_VICTORY_ROAD_2F_BOULDER" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 40, "y": 9, "elevation": 3, @@ -254,7 +254,7 @@ "x": 2, "y": 19, "elevation": 3, - "var": "VAR_0x4065", + "var": "VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1", "var_value": 99, "script": "VictoryRoad_2F_EventScript_160FD5" }, @@ -263,7 +263,7 @@ "x": 14, "y": 19, "elevation": 3, - "var": "VAR_0x4066", + "var": "VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2", "var_value": 99, "script": "VictoryRoad_2F_EventScript_161006" } diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index ba4d835f4..2118560fd 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -3,10 +3,10 @@ VictoryRoad_2F_MapScripts:: @ 8160F92 .byte 0 VictoryRoad_2F_MapScript1_160F98:: @ 8160F98 - compare_var_to_value VAR_0x4065, 100 - call_if 5, EventScript_160FAF - compare_var_to_value VAR_0x4066, 100 - call_if 5, EventScript_160FC2 + compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 + call_if ne, EventScript_160FAF + compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 + call_if ne, EventScript_160FC2 end EventScript_160FAF:: @ 8160FAF @@ -21,15 +21,15 @@ EventScript_160FC2:: @ 8160FC2 VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5 lockall - compare_var_to_value VAR_0x4065, 100 - goto_if_eq EventScript_161004 + compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 + goto_if eq, EventScript_161004 setmetatile 13, 10, 721, 0 setmetatile 13, 11, 737, 0 playse SE_RU_GASYAN special DrawWholeMapView waitse moveobjectoffscreen 11 - setvar VAR_0x4065, 100 + setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 releaseall end @@ -39,15 +39,15 @@ EventScript_161004:: @ 8161004 VictoryRoad_2F_EventScript_161006:: @ 8161006 lockall - compare_var_to_value VAR_0x4066, 100 - goto_if_eq EventScript_161035 + compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 + goto_if eq, EventScript_161035 setmetatile 33, 16, 721, 0 setmetatile 33, 17, 737, 0 playse SE_RU_GASYAN special DrawWholeMapView waitse moveobjectoffscreen 12 - setvar VAR_0x4066, 100 + setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 releaseall end @@ -56,26 +56,26 @@ EventScript_161035:: @ 8161035 end VictoryRoad_2F_EventScript_161037:: @ 8161037 - trainerbattle 0, 167, 0, Text_1747EF, Text_17482C + trainerbattle 0, TRAINER_POKEMANIAC_DAWSON, 0, Text_1747EF, Text_17482C msgbox gUnknown_817483E, 6 end VictoryRoad_2F_EventScript_16104E:: @ 816104E - trainerbattle 0, 325, 0, Text_174877, Text_1748B4 + trainerbattle 0, TRAINER_BLACK_BELT_DAISUKE, 0, Text_174877, Text_1748B4 msgbox gUnknown_81748BB, 6 end VictoryRoad_2F_EventScript_161065:: @ 8161065 - trainerbattle 0, 287, 0, Text_1748EE, Text_17491B + trainerbattle 0, TRAINER_JUGGLER_NELSON, 0, Text_1748EE, Text_17491B msgbox gUnknown_8174927, 6 end VictoryRoad_2F_EventScript_16107C:: @ 816107C - trainerbattle 0, 290, 0, Text_174995, Text_1749B0 + trainerbattle 0, TRAINER_JUGGLER_GREGORY, 0, Text_174995, Text_1749B0 msgbox gUnknown_81749BB, 6 end VictoryRoad_2F_EventScript_161093:: @ 8161093 - trainerbattle 0, 298, 0, Text_174942, Text_17495A + trainerbattle 0, TRAINER_TAMER_VINCENT, 0, Text_174942, Text_17495A msgbox gUnknown_8174969, 6 end diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 32eb36734..13e9e1481 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 40, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 21, "y": 5, "elevation": 4, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 10, "y": 17, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 11, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 38, "y": 7, "elevation": 3, @@ -76,10 +76,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VictoryRoad_3F_EventScript_1BEA20", - "flag": "431" + "flag": "FLAG_HIDE_VICTORY_ROAD_3F_MAX_REVIVE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 12, "y": 9, "elevation": 3, @@ -89,10 +89,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "VictoryRoad_3F_EventScript_1BEA2D", - "flag": "432" + "flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 19, "y": 15, "elevation": 3, @@ -101,11 +101,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 33, "y": 18, "elevation": 0, @@ -114,11 +114,11 @@ "movement_range_y": 0, "trainer_type": 88, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_3F_EventScript_1BE11D", - "flag": "89" + "script": "EventScript_InteractWithStrengthBoulderObject", + "flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 35, "y": 13, "elevation": 3, @@ -127,11 +127,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "97", + "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", "x": 32, "y": 5, "elevation": 3, @@ -140,11 +140,11 @@ "movement_range_y": 0, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "VictoryRoad_3F_EventScript_1BE11D", + "script": "EventScript_InteractWithStrengthBoulderObject", "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 38, "y": 13, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "42", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", "x": 39, "y": 13, "elevation": 3, @@ -213,7 +213,7 @@ "x": 7, "y": 7, "elevation": 3, - "var": "VAR_0x4067", + "var": "VAR_MAP_SCENE_VICTORY_ROAD_3F", "var_value": 99, "script": "VictoryRoad_3F_EventScript_1610CF" } diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 1a4c42953..75d60e4d3 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -3,8 +3,8 @@ VictoryRoad_3F_MapScripts:: @ 81610AA .byte 0 VictoryRoad_3F_MapScript1_1610B0:: @ 81610B0 - compare_var_to_value VAR_0x4067, 100 - call_if 5, EventScript_1610BC + compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 + call_if ne, EventScript_1610BC end EventScript_1610BC:: @ 81610BC @@ -14,8 +14,8 @@ EventScript_1610BC:: @ 81610BC VictoryRoad_3F_EventScript_1610CF:: @ 81610CF lockall - compare_var_to_value VAR_0x4067, 100 - goto_if_eq EventScript_161101 + compare_var_to_value VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 + goto_if eq, EventScript_161101 setmetatile 12, 12, 721, 0 setmetatile 12, 13, 737, 0 playse SE_RU_GASYAN @@ -23,7 +23,7 @@ VictoryRoad_3F_EventScript_1610CF:: @ 81610CF waitse moveobjectoffscreen 7 moveobjectoffscreen 10 - setvar VAR_0x4067, 100 + setvar VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 releaseall end @@ -32,31 +32,31 @@ EventScript_161101:: @ 8161101 end VictoryRoad_3F_EventScript_161103:: @ 8161103 - trainerbattle 0, 393, 0, Text_174B60, Text_174B83 + trainerbattle 0, TRAINER_COOLTRAINER_GEORGE, 0, Text_174B60, Text_174B83 msgbox gUnknown_8174B99, 6 end VictoryRoad_3F_EventScript_16111A:: @ 816111A - trainerbattle 0, 394, 0, Text_174C8A, Text_174CA9 + trainerbattle 0, TRAINER_COOLTRAINER_COLBY, 0, Text_174C8A, Text_174CA9 msgbox gUnknown_8174CBD, 6 end VictoryRoad_3F_EventScript_161131:: @ 8161131 - trainerbattle 0, 403, 0, Text_174C30, Text_174C5A + trainerbattle 0, TRAINER_COOLTRAINER_CAROLINE, 0, Text_174C30, Text_174C5A msgbox gUnknown_8174C67, 6 end VictoryRoad_3F_EventScript_161148:: @ 8161148 - trainerbattle 0, 404, 0, Text_174BCA, Text_174BF4 + trainerbattle 0, TRAINER_COOLTRAINER_ALEXA, 0, Text_174BCA, Text_174BF4 msgbox gUnknown_8174C03, 6 end VictoryRoad_3F_EventScript_16115F:: @ 816115F - trainerbattle 4, 485, 0, Text_174D0C, Text_174D45, Text_174D96 + trainerbattle 4, TRAINER_COOL_COUPLE_RAY_TYRA, 0, Text_174D0C, Text_174D45, Text_174D96 msgbox gUnknown_8174D64, 6 end VictoryRoad_3F_EventScript_16117A:: @ 816117A - trainerbattle 4, 485, 0, Text_174E08, Text_174E39, Text_174E8D + trainerbattle 4, TRAINER_COOL_COUPLE_RAY_TYRA, 0, Text_174E08, Text_174E39, Text_174E8D msgbox gUnknown_8174E48, 6 end diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index de9ff3465..081e17e98 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "27", + "graphics_id": "MAP_OBJ_GFX_FAT_MAN", "x": 8, "y": 26, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 11, "y": 24, "elevation": 3, @@ -52,11 +52,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_EventScript_1BDF13", - "flag": "17" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_11" }, { - "graphics_id": "32", + "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", "x": 34, "y": 11, "elevation": 3, @@ -69,7 +69,7 @@ "flag": "0" }, { - "graphics_id": "240", + "graphics_id": "MAP_OBJ_GFX_VAR_0", "x": 21, "y": 6, "elevation": 3, @@ -82,7 +82,7 @@ "flag": "0" }, { - "graphics_id": "31", + "graphics_id": "MAP_OBJ_GFX_WOMAN_3", "x": 20, "y": 12, "elevation": 3, @@ -95,7 +95,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 33, "y": 26, "elevation": 3, @@ -108,7 +108,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 16, "y": 22, "elevation": 3, @@ -121,7 +121,7 @@ "flag": "0" }, { - "graphics_id": "95", + "graphics_id": "MAP_OBJ_GFX_CUT_TREE", "x": 18, "y": 5, "elevation": 3, @@ -130,11 +130,11 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "ViridianCity_EventScript_1BDF13", - "flag": "18" + "script": "EventScript_InteractWithCutTreeObject", + "flag": "FLAG_TEMP_12" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 17, "y": 5, "elevation": 3, @@ -144,7 +144,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ViridianCity_EventScript_1BEB8C", - "flag": "461" + "flag": "FLAG_HIDE_VIRIDIAN_CITY_POTION" } ], "warp_events": [ @@ -190,7 +190,7 @@ "x": 22, "y": 11, "elevation": 3, - "var": "VAR_0x4051", + "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN", "var_value": 0, "script": "ViridianCity_EventScript_165AF6" }, @@ -199,7 +199,7 @@ "x": 36, "y": 11, "elevation": 3, - "var": "VAR_0x405A", + "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR", "var_value": 0, "script": "ViridianCity_EventScript_16596D" }, @@ -208,7 +208,7 @@ "x": 20, "y": 8, "elevation": 3, - "var": "VAR_0x4051", + "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN", "var_value": 1, "script": "ViridianCity_EventScript_165B10" }, @@ -217,7 +217,7 @@ "x": 22, "y": 8, "elevation": 3, - "var": "VAR_0x4051", + "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN", "var_value": 1, "script": "ViridianCity_EventScript_165B2E" } diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 5434fa1fa..5c5cebf82 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -4,46 +4,46 @@ ViridianCity_MapScripts:: @ 81658D3 ViridianCity_MapScript1_1658D9:: @ 81658D9 setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY - compare_var_to_value VAR_0x4051, 0 - call_if 1, EventScript_165920 - compare_var_to_value VAR_0x4051, 1 - call_if 1, EventScript_16590F - compare_var_to_value VAR_0x4051, 2 - call_if 4, EventScript_165909 - compare_var_to_value VAR_0x405A, 0 - call_if 1, EventScript_165931 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 + call_if eq, EventScript_165920 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 + call_if eq, EventScript_16590F + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 + call_if ge, EventScript_165909 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 0 + call_if eq, EventScript_165931 end EventScript_165909:: @ 8165909 - setvar VAR_0x4010, 32 + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_OLD_MAN_1 return EventScript_16590F:: @ 816590F - setvar VAR_0x4010, 32 + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_OLD_MAN_1 setobjectxyperm 4, 21, 8 setobjectmovementtype 4, 1 return EventScript_165920:: @ 8165920 - setvar VAR_0x4010, 34 + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_VIRIDIAN_DRUNK setobjectxyperm 4, 21, 11 setobjectmovementtype 4, 8 return EventScript_165931:: @ 8165931 - checkflag FLAG_0x821 - goto_if 0, EventScript_1A77A9 - checkflag FLAG_0x822 - goto_if 0, EventScript_1A77A9 - checkflag FLAG_0x823 - goto_if 0, EventScript_1A77A9 - checkflag FLAG_UNK824 - goto_if 0, EventScript_1A77A9 - checkflag FLAG_0x825 - goto_if 0, EventScript_1A77A9 - checkflag FLAG_UNK826 - goto_if 0, EventScript_1A77A9 - setvar VAR_0x405A, 1 + checkflag FLAG_BADGE02_GET + goto_if FALSE, EventScript_1A77A9 + checkflag FLAG_BADGE03_GET + goto_if FALSE, EventScript_1A77A9 + checkflag FLAG_BADGE04_GET + goto_if FALSE, EventScript_1A77A9 + checkflag FLAG_BADGE05_GET + goto_if FALSE, EventScript_1A77A9 + checkflag FLAG_BADGE06_GET + goto_if FALSE, EventScript_1A77A9 + checkflag FLAG_BADGE07_GET + goto_if FALSE, EventScript_1A77A9 + setvar VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 return ViridianCity_EventScript_16596D:: @ 816596D @@ -90,8 +90,8 @@ ViridianCity_EventScript_1659C1:: @ 81659C1 ViridianCity_EventScript_1659CA:: @ 81659CA lock faceplayer - compare_var_to_value VAR_0x405A, 1 - goto_if_eq EventScript_1659EC + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 + goto_if eq, EventScript_1659EC msgbox gUnknown_817DB39 closemessage applymovement 3, Movement_1A75E5 @@ -107,20 +107,20 @@ EventScript_1659EC:: @ 81659EC ViridianCity_EventScript_1659F6:: @ 81659F6 lock faceplayer - checkflag FLAG_UNK820 - goto_if_eq EventScript_165A23 - compare_var_to_value VAR_0x4051, 2 - goto_if 4, EventScript_165A4A - compare_var_to_value VAR_0x4051, 1 - goto_if_eq EventScript_165A54 - compare_var_to_value VAR_0x4051, 0 - goto_if_eq EventScript_165A84 + checkflag FLAG_BADGE01_GET + goto_if TRUE, EventScript_165A23 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 + goto_if ge, EventScript_165A4A + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1 + goto_if eq, EventScript_165A54 + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 + goto_if eq, EventScript_165A84 end EventScript_165A23:: @ 8165A23 msgbox gUnknown_817E046, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_165A40 + goto_if eq, EventScript_165A40 msgbox gUnknown_817E0EA release end @@ -149,7 +149,7 @@ EventScript_165A65:: @ 8165A65 msgbox gUnknown_817DE9B special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 special sub_807F888 waitstate @@ -167,9 +167,9 @@ ViridianCity_EventScript_165A8F:: @ 8165A8F faceplayer msgbox gUnknown_817DB98, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 1 - goto_if_eq EventScript_165AB0 + goto_if eq, EventScript_165AB0 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_165ABA + goto_if eq, EventScript_165ABA end EventScript_165AB0:: @ 8165AB0 @@ -185,8 +185,8 @@ EventScript_165ABA:: @ 8165ABA ViridianCity_EventScript_165AC4:: @ 8165AC4 lock faceplayer - compare_var_to_value VAR_0x4051, 0 - goto_if_eq EventScript_165ADB + compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 + goto_if eq, EventScript_165ADB msgbox gUnknown_817DC99 release end @@ -244,14 +244,14 @@ EventScript_165B4C:: @ 8165B4C closemessage special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 special sub_8112364 special sub_807F888 waitstate lock faceplayer msgbox gUnknown_817DE9B - setvar VAR_0x4051, 2 + setvar VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2 giveitem ITEM_TEACHY_TV msgbox gUnknown_817DEEB return diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index f862217e0..451a6a6e2 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 10, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 12, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 11, "y": 14, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 10, "y": 10, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "25", + "graphics_id": "MAP_OBJ_GFX_MAN", "x": 2, "y": 21, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "54", + "graphics_id": "MAP_OBJ_GFX_BLACKBELT", "x": 3, "y": 11, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 6, "y": 8, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "87", + "graphics_id": "MAP_OBJ_GFX_GIOVANNI", "x": 2, "y": 2, "elevation": 3, @@ -115,10 +115,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ViridianCity_Gym_EventScript_169ECA", - "flag": "85" + "flag": "FLAG_HIDE_VIRIDIAN_GIOVANNI" }, { - "graphics_id": "41", + "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", "x": 13, "y": 7, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "91", + "graphics_id": "MAP_OBJ_GFX_GYM_GUY", "x": 16, "y": 20, "elevation": 3, @@ -189,8 +189,9 @@ "y": 2, "elevation": 3, "item": "ITEM_MACHO_BRACE", - "flag": "189", - "unknown": 129 + "flag": "HIDDEN_ITEM_VIRIDIAN_CITY_GYM_MACHO_BRACE", + "quantity": 1, + "underfoot": true } ] } diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index b03bc5d93..197a38b74 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -2,12 +2,10 @@ ViridianCity_Gym_MapScripts:: @ 8169EC9 .byte 0 ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA - setvar VAR_0x8004, 15 - setvar VAR_0x8005, 2 - special UpdatePickStateFromSpecialVar8005 - trainerbattle 1, 350, 0, Text_18F352, Text_18F43F, EventScript_169F04 - checkflag FLAG_0x298 - goto_if 0, EventScript_169F2F + famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 + trainerbattle 1, TRAINER_LEADER_GIOVANNI, 0, Text_18F352, Text_18F43F, EventScript_169F04 + checkflag FLAG_GOT_TM26_FROM_GIOVANNI + goto_if FALSE, EventScript_169F2F msgbox gUnknown_818F4A2 closemessage fadescreen 1 @@ -17,15 +15,12 @@ ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA end EventScript_169F04:: @ 8169F04 - setvar VAR_0x8004, 15 - setvar VAR_0x8005, 3 - special SetFlavorTextFlagFromSpecialVars - setflag FLAG_0x0AD - setflag FLAG_0x4B7 - setflag FLAG_0x827 - setvar VAR_0x4054, 3 - setvar VAR_0x8008, 8 - call EventScript_1A6B18 + famechecker FAMECHECKER_GIOVANNI, 3 + setflag FLAG_HIDE_MISC_KANTO_ROCKETS + setflag FLAG_DEFEATED_LEADER_GIOVANNI + setflag FLAG_BADGE08_GET + setvar VAR_MAP_SCENE_ROUTE22, 3 + set_gym_trainers 8 goto EventScript_169F2F end @@ -33,10 +28,10 @@ EventScript_169F2F:: @ 8169F2F msgbox gUnknown_818F586 checkitemspace ITEM_TM26, 1 compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_169F70 + goto_if eq, EventScript_169F70 additem ITEM_TM26, 1 giveitemfanfaremsg gUnknown_818F675, ITEM_TM26 - setflag FLAG_0x298 + setflag FLAG_GOT_TM26_FROM_GIOVANNI msgbox gUnknown_818F695 release end @@ -47,66 +42,64 @@ EventScript_169F70:: @ 8169F70 end ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A - trainerbattle 0, 296, 0, Text_18F7F3, Text_18F824 + trainerbattle 0, TRAINER_TAMER_JASON, 0, Text_18F7F3, Text_18F824 msgbox gUnknown_818F840, 6 end ViridianCity_Gym_EventScript_169F91:: @ 8169F91 - trainerbattle 0, 297, 0, Text_18F98A, Text_18F9BB + trainerbattle 0, TRAINER_TAMER_COLE, 0, Text_18F98A, Text_18F9BB msgbox gUnknown_818F9CC, 6 end ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8 - trainerbattle 0, 322, 0, Text_18F7AD, Text_18F7D6 + trainerbattle 0, TRAINER_BLACK_BELT_ATSUSHI, 0, Text_18F7AD, Text_18F7D6 msgbox gUnknown_818F7DD, 6 end ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF - trainerbattle 0, 323, 0, Text_18F86C, Text_18F899 + trainerbattle 0, TRAINER_BLACK_BELT_KIYO, 0, Text_18F86C, Text_18F899 msgbox gUnknown_818F8A0, 6 end ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6 - trainerbattle 0, 324, 0, Text_18F92C, Text_18F95A + trainerbattle 0, TRAINER_BLACK_BELT_TAKASHI, 0, Text_18F92C, Text_18F95A msgbox gUnknown_818F960, 6 end ViridianCity_Gym_EventScript_169FED:: @ 8169FED - trainerbattle 0, 392, 0, Text_18F9E7, Text_18FA2D + trainerbattle 0, TRAINER_COOLTRAINER_SAMUEL, 0, Text_18F9E7, Text_18FA2D msgbox gUnknown_818FA3B, 6 end ViridianCity_Gym_EventScript_16A004:: @ 816A004 - trainerbattle 0, 400, 0, Text_18F73B, Text_18F769 + trainerbattle 0, TRAINER_COOLTRAINER_YUJI, 0, Text_18F73B, Text_18F769 msgbox gUnknown_818F77B, 6 end ViridianCity_Gym_EventScript_16A01B:: @ 816A01B - trainerbattle 0, 401, 0, Text_18F8CB, Text_18F8EE + trainerbattle 0, TRAINER_COOLTRAINER_WARREN, 0, Text_18F8CB, Text_18F8EE msgbox gUnknown_818F8FE, 6 end ViridianCity_Gym_EventScript_16A032:: @ 816A032 lock faceplayer - checkflag FLAG_0x4B7 - goto_if_eq EventScript_16A047 + checkflag FLAG_DEFEATED_LEADER_GIOVANNI + goto_if TRUE, EventScript_16A047 msgbox gUnknown_818FA81 release end EventScript_16A047:: @ 816A047 - setvar VAR_0x8004, 15 - setvar VAR_0x8005, 4 - special SetFlavorTextFlagFromSpecialVars + famechecker FAMECHECKER_GIOVANNI, 4 msgbox gUnknown_818FB56 release end ViridianCity_Gym_EventScript_16A05E:: @ 816A05E lockall - checkflag FLAG_0x827 - goto_if_eq EventScript_16A072 + checkflag FLAG_BADGE08_GET + goto_if TRUE, EventScript_16A072 msgbox gUnknown_818FB8D releaseall end diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index 628b66dd0..edc6072ab 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "30", + "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "17", + "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", "x": 2, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "110", + "graphics_id": "MAP_OBJ_GFX_SPEAROW", "x": 6, "y": 6, "elevation": 3, diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index 3b3bc76a0..a3abf9f9d 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "28", + "graphics_id": "MAP_OBJ_GFX_WOMAN_2", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "22", + "graphics_id": "MAP_OBJ_GFX_LASS", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index c8388e2f7..a31719b55 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -26,15 +26,15 @@ ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB msgbox gUnknown_818FC65 msgbox gUnknown_818FF19, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16A11B + goto_if eq, EventScript_16A11B msgbox gUnknown_818FD23 msgbox gUnknown_818FF19, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16A11B + goto_if eq, EventScript_16A11B msgbox gUnknown_818FDA8 msgbox gUnknown_818FF19, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 - goto_if_eq EventScript_16A11B + goto_if eq, EventScript_16A11B msgbox gUnknown_818FE5C applymovement 2, Movement_1A75E9 waitmovement 0 diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 122ef65d3..350ed4020 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "68", + "graphics_id": "MAP_OBJ_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "23", + "graphics_id": "MAP_OBJ_GFX_WOMAN_1", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 02ed8b57c..95c45ea7d 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -4,8 +4,8 @@ ViridianCity_Mart_MapScripts:: @ 816A1D3 .byte 0 ViridianCity_Mart_MapScript1_16A1DE:: @ 816A1DE - checkflag FLAG_0x829 - goto_if 0, EventScript_16A1E8 + checkflag FLAG_SYS_POKEDEX_GET + goto_if FALSE, EventScript_16A1E8 end EventScript_16A1E8:: @ 816A1E8 @@ -55,10 +55,10 @@ ViridianCity_Mart_EventScript_16A268:: @ 816A268 lock faceplayer compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - goto_if_eq EventScript_16A2A4 + goto_if eq, EventScript_16A2A4 special sub_8110AB4 compare_var_to_value VAR_RESULT, 2 - goto_if_eq EventScript_1A7AE0 + goto_if eq, EventScript_1A7AE0 message Text_1A6211 waitmessage pokemart Items_16A298 diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index 0d2f95957..419e7b4ca 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "64", + "graphics_id": "MAP_OBJ_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "61", + "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 4, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index 16c5033d1..3711140e9 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "65", + "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "69", + "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, @@ -63,7 +63,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ViridianCity_PokemonCenter_2F_EventScript_1BB1D2", - "flag": "112" + "flag": "FLAG_HIDE_MG_DELIVERYMEN" } ], "warp_events": [ diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 89d9a9f03..7a17aca4c 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "18", + "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", "x": 29, "y": 58, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "19", + "graphics_id": "MAP_OBJ_GFX_BOY", "x": 45, "y": 58, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 47, "y": 45, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 47, "y": 29, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 7, "y": 22, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 5, "y": 41, "elevation": 3, @@ -89,10 +89,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ViridianForest_EventScript_1BE5A8", - "flag": "342" + "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POKE_BALL" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 40, "y": 21, "elevation": 3, @@ -102,10 +102,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ViridianForest_EventScript_1BE5B5", - "flag": "343" + "flag": "FLAG_HIDE_VIRIDIAN_FOREST_ANTIDOTE" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 21, "y": 34, "elevation": 3, @@ -115,10 +115,10 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ViridianForest_EventScript_1BE5C2", - "flag": "344" + "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 43, "y": 6, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "20", + "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", "x": 16, "y": 5, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "92", + "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", "x": 49, "y": 60, "elevation": 3, @@ -154,7 +154,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "ViridianForest_EventScript_1BEAC9", - "flag": "446" + "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION_2" } ], "warp_events": [ @@ -251,8 +251,9 @@ "y": 22, "elevation": 3, "item": "ITEM_POTION", - "flag": "0", - "unknown": 1 + "flag": "HIDDEN_ITEM_VIRIDIAN_FOREST_POTION", + "quantity": 1, + "underfoot": false }, { "type": "hidden_item", @@ -260,8 +261,9 @@ "y": 57, "elevation": 0, "item": "ITEM_ANTIDOTE", - "flag": "1", - "unknown": 1 + "flag": "HIDDEN_ITEM_VIRIDIAN_FOREST_ANTIDOTE", + "quantity": 1, + "underfoot": false } ] } diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc index bf8438d65..f4e4ee898 100644 --- a/data/maps/ViridianForest/scripts.inc +++ b/data/maps/ViridianForest/scripts.inc @@ -39,26 +39,26 @@ ViridianForest_EventScript_160568:: @ 8160568 end ViridianForest_EventScript_160571:: @ 8160571 - trainerbattle 0, 102, 0, Text_1722C7, Text_1722F9 + trainerbattle 0, TRAINER_BUG_CATCHER_RICK, 0, Text_1722C7, Text_1722F9 msgbox gUnknown_8172315, 6 end ViridianForest_EventScript_160588:: @ 8160588 - trainerbattle 0, 103, 0, Text_17234A, Text_17237D + trainerbattle 0, TRAINER_BUG_CATCHER_DOUG, 0, Text_17234A, Text_17237D msgbox gUnknown_8172398, 6 end ViridianForest_EventScript_16059F:: @ 816059F - trainerbattle 0, 104, 0, Text_1723D4, Text_172402 + trainerbattle 0, TRAINER_BUG_CATCHER_SAMMY, 0, Text_1723D4, Text_172402 msgbox gUnknown_817241F, 6 end ViridianForest_EventScript_1605B6:: @ 81605B6 - trainerbattle 0, 531, 0, Text_172482, Text_1724BF + trainerbattle 0, TRAINER_BUG_CATCHER_ANTHONY, 0, Text_172482, Text_1724BF msgbox gUnknown_81724DC, 6 end ViridianForest_EventScript_1605CD:: @ 81605CD - trainerbattle 0, 532, 0, Text_1724F9, Text_17251B + trainerbattle 0, TRAINER_BUG_CATCHER_CHARLIE, 0, Text_1724F9, Text_17251B msgbox gUnknown_8172527, 6 end diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index c33228bb6..a62ebb8b8 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -1,8 +1,11 @@ +@ These are event scripts. They should not be moved to C. + #include "constants/flags.h" #include "constants/moves.h" #include "constants/songs.h" #include "constants/species.h" #include "constants/vars.h" +#include "constants/items.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" @@ -10,333 +13,353 @@ .section .rodata .align 2 -MysteryEventScript_StampCard:: @ 8488E2 - .incbin "baserom.gba", 0x488E28, 0xB40 - -@ setvaddress MysteryEventScript_StampCard -@ setorcopyvar VAR_RESULT, 1 -@ specialvar VAR_0x8008, sub_813986C -@ setorcopyvar VAR_RESULT, 0 -@ specialvar VAR_0x8009, sub_813986C -@ subvar VAR_0x8008, 32777 -@ getnumberstring 0, VAR_0x8008 -@ lock -@ faceplayer -@ vmessage sText_MysteryGiftStampCard -@ waitmessage -@ waitbutton -@ release -@ end -@ -@ sText_MysteryGiftStampCard: -@ .string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$" -@ -@ MysteryEventScript_SurfPichu:: @ 8674D3D -@ setvaddress MysteryEventScript_SurfPichu -@ checkflag FLAG_MYSTERY_EVENT_DONE -@ vgoto_if 0, SurfPichu_GiveIfPossible -@ gotoram -@ -@ SurfPichu_GiveIfPossible: @ 8674D4C -@ specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount -@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 6 -@ vgoto_if 1, SurfPichu_FullParty -@ setflag FLAG_MYSTERY_EVENT_DONE -@ vcall SurfPichu_GiveEgg -@ lock -@ faceplayer -@ vmessage sText_MysteryGiftEgg -@ waitmessage -@ waitbutton -@ playfanfare MUS_FANFA4 -@ waitfanfare -@ release -@ end -@ -@ SurfPichu_FullParty: @ 8674D73 -@ lock -@ faceplayer -@ vmessage sText_FullParty -@ waitmessage -@ waitbutton -@ release -@ end -@ -@ SurfPichu_GiveEgg: @ 8674D7E -@ giveegg SPECIES_PICHU -@ setobedience VAR_EVENT_PICHU_SLOT -@ setcatchlocale VAR_EVENT_PICHU_SLOT, 255 -@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 -@ vgoto_if 1, SurfPichu_Slot1 -@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 -@ vgoto_if 1, SurfPichu_Slot2 -@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 -@ vgoto_if 1, SurfPichu_Slot3 -@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 -@ vgoto_if 1, SurfPichu_Slot4 -@ compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 -@ vgoto_if 1, SurfPichu_Slot5 -@ return -@ -@ SurfPichu_Slot1: @ 8674DC0 -@ setpokemove 1, 2, MOVE_SURF -@ return -@ -@ SurfPichu_Slot2:: @ 8674DC6 -@ setpokemove 2, 2, MOVE_SURF -@ return -@ -@ SurfPichu_Slot3: @ 8674DCC -@ setpokemove 3, 2, MOVE_SURF -@ return -@ -@ SurfPichu_Slot4: @ 8674DD2 -@ setpokemove 4, 2, MOVE_SURF -@ return -@ -@ SurfPichu_Slot5: @ 8674DD8 -@ setpokemove 5, 2, MOVE_SURF -@ return -@ -@ sText_MysteryGiftEgg: -@ .string "Thank you for using the MYSTERY\nGIFT System.\pFrom the POKéMON CENTER we\nhave a gift--a POKéMON EGG!\pPlease raise it with love and\nkindness.$" -@ -@ sText_FullParty: -@ .string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$" -@ -@ MysteryEventScript_VisitingTrainer:: @ 8674EC1 -@ setvaddress MysteryEventScript_VisitingTrainer -@ special ValidateEReaderTrainer -@ compare_var_to_value VAR_RESULT, 0 -@ vgoto_if 1, MysteryEventScript_VisitingTrainerArrived -@ lock -@ faceplayer -@ vmessage sText_MysteryGiftVisitingTrainer -@ waitmessage -@ waitbutton -@ release -@ end -@ -@ MysteryEventScript_VisitingTrainerArrived: @ 8674EDF -@ lock -@ faceplayer -@ vmessage sText_MysteryGiftVisitingTrainer_2 -@ waitmessage -@ waitbutton -@ release -@ end -@ -@ sText_MysteryGiftVisitingTrainer: -@ .string "Thank you for using the MYSTERY\nGIFT System.\pBy holding this WONDER CARD, you\nmay take part in a survey at a\lPOKéMON MART.\pUse these surveys to invite\nTRAINERS to SOOTOPOLIS CITY.\p…Let me give you a secret\npassword for a survey:\p“GIVE ME\nAWESOME TRAINER”\pWrite that in on a survey and send\nit to the WIRELESS\lCOMMUNICATION SYSTEM.$" -@ -@ sText_MysteryGiftVisitingTrainer_2: -@ .string "Thank you for using the MYSTERY\nGIFT System.\pA TRAINER has arrived in\nSOOTOPOLIS CITY looking for you.\pWe hope you will enjoy\nbattling the visiting TRAINER.\pYou may invite other TRAINERS by\nentering other passwords.\pTry looking for other passwords\nthat may work.$" -@ -@ MysteryEventScript_BattleCard:: @ 867513C -@ setvaddress MysteryEventScript_BattleCard -@ checkflag FLAG_MYSTERY_EVENT_DONE -@ vgoto_if 1, MysteryEventScript_BattleCardInfo -@ setorcopyvar VAR_RESULT, 2 -@ specialvar VAR_0x8008, sub_813986C -@ compare_var_to_value VAR_0x8008, 3 -@ vgoto_if 0, MysteryEventScript_BattleCardInfo -@ lock -@ faceplayer -@ vmessage sText_MysteryGiftBattleCountCard_2 -@ waitmessage -@ waitbutton -@ giveitem ITEM_POTION -@ release -@ setflag FLAG_MYSTERY_EVENT_DONE -@ end -@ -@ MysteryEventScript_BattleCardInfo: @ 8675179 -@ lock -@ faceplayer -@ vmessage sText_MysteryGiftBattleCountCard -@ waitmessage -@ waitbutton -@ release -@ end -@ -@ sText_MysteryGiftBattleCountCard: -@ .string "Thank you for using the MYSTERY\nGIFT System.\pYour BATTLE COUNT CARD keeps\ntrack of your battle record against\lTRAINERS with the same CARD.\pLook for and battle TRAINERS who\nhave the same CARD as you.\pYou may check the overall rankings\nby reading the NEWS.\pPlease do give it a try!$" -@ -@ sText_MysteryGiftBattleCountCard_2: -@ .string "Thank you for using the MYSTERY\nGIFT System.\pCongratulations!\pYou have won a prize for winning\nthree battles!\pWe hope you will be inspired to\nbattle some more.$" -@ -@ MysteryEventScript_AuroraTicket:: @ 867533C -@ setvaddress MysteryEventScript_AuroraTicket -@ lock -@ faceplayer -@ checkflag FLAG_0x13A -@ vgoto_if 1, AuroraTicket_Obtained -@ checkflag FLAG_0x1AD -@ vgoto_if 1, AuroraTicket_Obtained -@ checkitem ITEM_AURORA_TICKET, 1 -@ compare_var_to_value VAR_RESULT, 1 -@ vgoto_if 1, AuroraTicket_Obtained -@ vmessage sText_AuroraTicket1 -@ waitmessage -@ waitbutton -@ checkitemspace ITEM_AURORA_TICKET, 1 -@ compare_var_to_value VAR_RESULT, 0 -@ vgoto_if 1, AuroraTicket_NoBagSpace -@ giveitem ITEM_AURORA_TICKET -@ setflag FLAG_0x8D5 -@ setflag FLAG_0x13A -@ vmessage sText_AuroraTicket2 -@ waitmessage -@ waitbutton -@ release -@ end -@ -@ AuroraTicket_NoBagSpace: @ 8675397 -@ vmessage sText_AuroraTicketNoPlace -@ waitmessage -@ waitbutton -@ release -@ end -@ -@ AuroraTicket_Obtained: @ 86753A0 -@ vmessage sText_AuroraTicketGot -@ waitmessage -@ waitbutton -@ release -@ end -@ -@ sText_AuroraTicket1: -@ .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" -@ -@ sText_AuroraTicket2: -@ .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" -@ -@ sText_AuroraTicketGot: -@ .string "Thank you for using the MYSTERY\nGIFT System.$" -@ -@ sText_AuroraTicketNoPlace: -@ .string "Oh, I'm sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" -@ -@ MysteryEventScript_MysticTicket:: @ 867550B -@ setvaddress MysteryEventScript_MysticTicket -@ lock -@ faceplayer -@ checkflag FLAG_0x13B -@ vgoto_if 1, MysticTicket_Obtained -@ checkflag FLAG_0x091 -@ vgoto_if 1, MysticTicket_Obtained -@ checkflag FLAG_0x092 -@ vgoto_if 1, MysticTicket_Obtained -@ checkitem ITEM_MYSTIC_TICKET, 1 -@ compare_var_to_value VAR_RESULT, 1 -@ vgoto_if 1, MysticTicket_Obtained -@ vmessage sText_MysticTicket2 -@ waitmessage -@ waitbutton -@ checkitemspace ITEM_MYSTIC_TICKET, 1 -@ compare_var_to_value VAR_RESULT, 0 -@ vgoto_if 1, MysticTicket_NoBagSpace -@ giveitem ITEM_MYSTIC_TICKET -@ setflag FLAG_0x8E0 -@ setflag FLAG_0x13B -@ vmessage sText_MysticTicket1 -@ waitmessage -@ waitbutton -@ release -@ end -@ -@ MysticTicket_NoBagSpace: @ 867556F -@ vmessage sText_MysticTicketNoPlace -@ waitmessage -@ waitbutton -@ release -@ end -@ -@ MysticTicket_Obtained: @ 8675578 -@ vmessage sText_MysticTicketGot -@ waitmessage -@ waitbutton -@ release -@ end -@ -@ sText_MysticTicket2: -@ .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" -@ -@ sText_MysticTicket1: -@ .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" -@ -@ sText_MysticTicketGot: -@ .string "Thank you for using the MYSTERY\nGIFT System.$" -@ -@ sText_MysticTicketNoPlace: -@ .string "Oh, I'm sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" -@ -@ MysteryEventScript_AlteringCave:: @ 86756E3 -@ setvaddress MysteryEventScript_AlteringCave -@ addvar VAR_ALTERING_CAVE_WILD_SET, 1 -@ compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 -@ vgoto_if 0, MysteryEventScript_AlteringCave_ -@ setvar VAR_ALTERING_CAVE_WILD_SET, 0 -@ MysteryEventScript_AlteringCave_: @ 86756FD -@ lock -@ faceplayer -@ vmessage sText_MysteryGiftAlteringCave -@ waitmessage -@ waitbutton -@ release -@ end -@ -@ sText_MysteryGiftAlteringCave:: -@ .string "Thank you for using the MYSTERY\nGIFT System.\pThere appears to be a rumor about\nrare POKéMON sightings.\pThe sightings reportedly came from\nthe ALTERING CAVE on ROUTE 103.\pPerhaps it would be worthwhile for\nyou to investigate this rumor.$" -@ -@ MysteryEventScript_OldSeaMap:: @ 86757F4 -@ setvaddress MysteryEventScript_OldSeaMap -@ lock -@ faceplayer -@ checkflag FLAG_0x13C -@ vgoto_if 1, OldSeaMap_Obtained -@ checkflag FLAG_0x1CA -@ vgoto_if 1, OldSeaMap_Obtained -@ checkitem ITEM_OLD_SEA_MAP, 1 -@ compare_var_to_value VAR_RESULT, 1 -@ vgoto_if 1, OldSeaMap_Obtained -@ vmessage sText_MysteryGiftOldSeaMap -@ waitmessage -@ waitbutton -@ checkitemspace ITEM_OLD_SEA_MAP, 1 -@ compare_var_to_value VAR_RESULT, 0 -@ vgoto_if 1, OldSeaMap_NoBagSpace -@ giveitem ITEM_OLD_SEA_MAP -@ setflag FLAG_0x8D6 -@ setflag FLAG_0x13C -@ vmessage sText_MysteryGiftOldSeaMap_1 -@ waitmessage -@ waitbutton -@ release -@ end -@ -@ OldSeaMap_NoBagSpace: @ 867584F -@ vmessage sText_MysteryGiftOldSeaMap_3 -@ waitmessage -@ waitbutton -@ release -@ end -@ -@ OldSeaMap_Obtained: @ 8675858 -@ vmessage sText_MysteryGiftOldSeaMap_2 -@ waitmessage -@ waitbutton -@ release -@ end -@ -@ sText_MysteryGiftOldSeaMap: -@ .string "Thank you for using the MYSTERY\nGIFT System.\pLet me confirm--you are {PLAYER}?\pWe received this OLD SEA MAP\naddressed to you.$" -@ -@ sText_MysteryGiftOldSeaMap_1: -@ .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" -@ -@ sText_MysteryGiftOldSeaMap_2: -@ .string "Thank you for using the MYSTERY\nGIFT System.$" -@ -@ sText_MysteryGiftOldSeaMap_3: -@ .string "Oh, I'm sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" +MysteryEventScript_StampCard:: @ 8488E28 + setvaddress MysteryEventScript_StampCard + setorcopyvar VAR_RESULT, 1 + specialvar VAR_0x8008, Special_BattleCardAction + setorcopyvar VAR_RESULT, 0 + specialvar VAR_0x8009, Special_BattleCardAction + subvar VAR_0x8008, VAR_0x8009 + getnumberstring 0, VAR_0x8008 + lock + faceplayer + vmessage sText_MysteryGiftStampCard + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftStampCard: @ 8488E55 + .string "Thank you for using the STAMP CARD\n" + .string "System.\p" + .string "You have {STR_VAR_1} more to collect to\n" + .string "fill your STAMP CARD.$" + +MysteryEventScript_SurfPichu:: @ 8488EB5 + setvaddress MysteryEventScript_SurfPichu + checkflag FLAG_MYSTERY_EVENT_DONE + vgoto_if FALSE, SurfPichu_GiveIfPossible + gotoram + +SurfPichu_GiveIfPossible: @ 8488EC4 + specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount + compare_var_to_value VAR_EVENT_PICHU_SLOT, 6 + vgoto_if TRUE, SurfPichu_FullParty + setflag FLAG_MYSTERY_EVENT_DONE + vcall SurfPichu_GiveEgg + lock + faceplayer + vmessage sText_MysteryGiftEgg + waitmessage + waitbuttonpress + playfanfare MUS_FANFA4 + waitfanfare + release + end + +SurfPichu_FullParty: @ 8488EEB + lock + faceplayer + vmessage sText_FullParty + waitmessage + waitbuttonpress + release + end + +SurfPichu_GiveEgg: @ 8488EF6 + giveegg SPECIES_PICHU + setmonobedient VAR_EVENT_PICHU_SLOT + setmonmetlocation VAR_EVENT_PICHU_SLOT, 0xff + compare_var_to_value VAR_EVENT_PICHU_SLOT, 1 + vgoto_if TRUE, SurfPichu_Slot1 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 2 + vgoto_if TRUE, SurfPichu_Slot2 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 3 + vgoto_if TRUE, SurfPichu_Slot3 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 4 + vgoto_if TRUE, SurfPichu_Slot4 + compare_var_to_value VAR_EVENT_PICHU_SLOT, 5 + vgoto_if TRUE, SurfPichu_Slot5 + return + +SurfPichu_Slot1: @ 8488F38 + setmonmove 1, 2, MOVE_SURF + return + +SurfPichu_Slot2: @ 8488F3E + setmonmove 2, 2, MOVE_SURF + return + +SurfPichu_Slot3: @ 8488F44 + setmonmove 3, 2, MOVE_SURF + return + +SurfPichu_Slot4: @ 8488F4A + setmonmove 4, 2, MOVE_SURF + return + +SurfPichu_Slot5: @ 8488F50 + setmonmove 5, 2, MOVE_SURF + return + +sText_MysteryGiftEgg: @ 8488F56 + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "From the POKéMON CENTER we\n" + .string "have a gift - a POKéMON EGG!\p" + .string "Please raise it with love and\n" + .string "kindness.$" + +sText_FullParty: @ 8488FE3 + .string "Oh, your party appears to be full.\p" + .string "Please come see me after storing\n" + .string "a POKéMON on a PC.$" + +MysteryEventScript_VisitingTrainer:: @ 848903A + setvaddress MysteryEventScript_VisitingTrainer + special ValidateEReaderTrainer + compare_var_to_value VAR_RESULT, 0 + vgoto_if TRUE, MysteryEventScript_VisitingTrainerArrived + lock + faceplayer + vmessage sText_MysteryGiftVisitingTrainer + waitmessage + waitbuttonpress + release + end + +MysteryEventScript_VisitingTrainerArrived: @ 8489058 + lock + faceplayer + vmessage sText_MysteryGiftVisitingTrainer_2 + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftVisitingTrainer: @ 8489063 + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "By holding this WONDER CARD, you\n" + .string "may take part in a survey at a\l" + .string "POKéMON MART.\p" + .string "Use these surveys to invite\n" + .string "TRAINERS to the SEVII ISLANDS.\p" + .string "…Let me give you a secret\n" + .string "password for a survey:\p" + .string "“GIVE ME\n" + .string "AWESOME TRAINER”\p" + .string "Write that in on a survey and send\n" + .string "it to the WIRELESS\l" + .string "COMMUNICATION SYSTEM.$" + +sText_MysteryGiftVisitingTrainer_2: @ 84891B0 + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "A TRAINER has arrived in the SEVII\n" + .string "ISLANDS looking for you.\p" + .string "We hope you will enjoy\n" + .string "battling the visiting TRAINER.\p" + .string "You may invite other TRAINERS by\n" + .string "entering other passwords.\p" + .string "Try looking for other passwords\n" + .string "that may work.$" + +MysteryEventScript_BattleCard:: @ 84892B9 + setvaddress MysteryEventScript_BattleCard + checkflag FLAG_MYSTERY_EVENT_DONE + vgoto_if TRUE, MysteryEventScript_BattleCardInfo + setorcopyvar VAR_RESULT, 2 + specialvar VAR_0x8008, Special_BattleCardAction + compare_var_to_value VAR_0x8008, 3 + vgoto_if FALSE, MysteryEventScript_BattleCardInfo + lock + faceplayer + vmessage sText_MysteryGiftBattleCountCard_2 + waitmessage + waitbuttonpress + giveitem ITEM_POTION + release + setflag FLAG_MYSTERY_EVENT_DONE + end + +MysteryEventScript_BattleCardInfo: @ 84892F6 + lock + faceplayer + vmessage sText_MysteryGiftBattleCountCard + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftBattleCountCard: @ 8489301 + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Your BATTLE COUNT CARD keeps\n" + .string "track of your battle record against\l" + .string "TRAINERS with the same CARD.\p" + .string "Look for and battle TRAINERS who\n" + .string "have the same CARD as you.\p" + .string "You may check the overall rankings\n" + .string "by reading the NEWS.\p" + .string "Please do give it a try!$" + +sText_MysteryGiftBattleCountCard_2: @ 8489419 + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Congratulations!\p" + .string "You have won a prize for winning\n" + .string "three battles!\p" + .string "We hope you will be inspired to\n" + .string "battle some more.$" + +MysteryEventScript_AuroraTicket:: @ 84894B9 + setvaddress MysteryEventScript_AuroraTicket + lock + faceplayer + checkflag FLAG_GOT_AURORA_TICKET + vgoto_if TRUE, AuroraTicket_Obtained + checkflag FLAG_FOUGHT_DEOXYS + vgoto_if TRUE, AuroraTicket_Obtained + checkitem ITEM_AURORA_TICKET, 1 + compare_var_to_value VAR_RESULT, 1 + vgoto_if TRUE, AuroraTicket_Obtained + vmessage sText_AuroraTicket1 + waitmessage + waitbuttonpress + checkitemspace ITEM_AURORA_TICKET, 1 + compare_var_to_value VAR_RESULT, 0 + vgoto_if TRUE, AuroraTicket_NoBagSpace + giveitem ITEM_AURORA_TICKET + setflag FLAG_SYS_GOT_AURORA_TICKET + setflag FLAG_GOT_AURORA_TICKET + vmessage sText_AuroraTicket2 + waitmessage + waitbuttonpress + release + end + +AuroraTicket_NoBagSpace: @ 8489514 + vmessage sText_AuroraTicketNoPlace + waitmessage + waitbuttonpress + release + end + +AuroraTicket_Obtained: @ 848951D + vmessage sText_AuroraTicketGot + waitmessage + waitbuttonpress + release + end + +sText_AuroraTicket1: @ 8489526 + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "You must be {PLAYER}.\n" + .string "There is a ticket here for you.$" + +sText_AuroraTicket2: @ 8489583 + .string "It appears to be for use at the\n" + .string "VERMILION CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" + +sText_AuroraTicketGot: @ 84895E8 + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.$" + +sText_AuroraTicketNoPlace: @ 8489615 + .string "Oh, I'm sorry, {PLAYER}. Your BAG's\n" + .string "KEY ITEMS POCKET is full.\p" + .string "Please store something on your PC,\n" + .string "then come back for this.$" + +MysteryEventScript_MysticTicket:: @ 8489689 + setvaddress MysteryEventScript_MysticTicket + lock + faceplayer + checkflag FLAG_GOT_MYSTIC_TICKET + vgoto_if TRUE, MysticTicket_Obtained + checkflag FLAG_FOUGHT_LUGIA + vgoto_if TRUE, MysticTicket_Obtained + checkflag FLAG_FOUGHT_HO_OH + vgoto_if TRUE, MysticTicket_Obtained + checkitem ITEM_MYSTIC_TICKET, 1 + compare_var_to_value VAR_RESULT, 1 + vgoto_if TRUE, MysticTicket_Obtained + vmessage sText_MysticTicket2 + waitmessage + waitbuttonpress + checkitemspace ITEM_MYSTIC_TICKET, 1 + compare_var_to_value VAR_RESULT, 0 + vgoto_if TRUE, MysticTicket_NoBagSpace + giveitem ITEM_MYSTIC_TICKET + setflag FLAG_SYS_GOT_MYSTIC_TICKET + setflag FLAG_GOT_MYSTIC_TICKET + vmessage sText_MysticTicket1 + waitmessage + waitbuttonpress + release + end + +MysticTicket_NoBagSpace: @ 84896ED + vmessage sText_MysticTicketNoPlace + waitmessage + waitbuttonpress + release + end + +MysticTicket_Obtained: @ 84896F6 + vmessage sText_MysticTicketGot + waitmessage + waitbuttonpress + release + end + +sText_MysticTicket2: @ 84896FF + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "You must be {PLAYER}.\n" + .string "There is a ticket here for you.$" + +sText_MysticTicket1: @ 848975C + .string "It appears to be for use at the\n" + .string "VERMILION CITY port.\p" + .string "Why not give it a try and see what\n" + .string "it is about?$" + +sText_MysticTicketGot: @ 84897C1 + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.$" + +sText_MysticTicketNoPlace: @ 84897EE + .string "Oh, I'm sorry, {PLAYER}. Your BAG's\n" + .string "KEY ITEMS POCKET is full.\p" + .string "Please store something on your PC,\n" + .string "then come back for this.$" + +MysteryEventScript_AlteringCave:: @ 8489862 + setvaddress MysteryEventScript_AlteringCave + addvar VAR_ALTERING_CAVE_WILD_SET, 1 + compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10 + vgoto_if FALSE, MysteryEventScript_AlteringCave_ + setvar VAR_ALTERING_CAVE_WILD_SET, 0 +MysteryEventScript_AlteringCave_: @ 848987C + lock + faceplayer + vmessage sText_MysteryGiftAlteringCave + waitmessage + waitbuttonpress + release + end + +sText_MysteryGiftAlteringCave: @ 8489887 + .string "Thank you for using the MYSTERY\n" + .string "GIFT System.\p" + .string "Recently, there have been rumors\n" + .string "of rare POKéMON appearances.\p" + .string "The rumors are about ALTERING\n" + .string "CAVE on OUTCAST ISLAND.\p" + .string "Why not visit there and check if\n" + .string "the rumors are indeed true?$" diff --git a/data/overworld.s b/data/overworld.s new file mode 100644 index 000000000..b305b3002 --- /dev/null +++ b/data/overworld.s @@ -0,0 +1,126 @@ +#include "constants/flags.h" +#include "constants/maps.h" + .include "asm/macros.inc" + .include "constants/constants.inc" + .section .rodata + .align 2, 0 + +sWhiteOutMoneyLossMultipliers:: @ 826D294 + .byte 2 + .byte 4 + .byte 6 + .byte 9 + .byte 12 + .byte 16 + .byte 20 + .byte 25 + .byte 30 + + .align 1 +sWhiteOutMoneyLossBadgeFlagIDs:: @ 826D29E + .2byte FLAG_BADGE01_GET + .2byte FLAG_BADGE02_GET + .2byte FLAG_BADGE03_GET + .2byte FLAG_BADGE04_GET + .2byte FLAG_BADGE05_GET + .2byte FLAG_BADGE06_GET + .2byte FLAG_BADGE07_GET + .2byte FLAG_BADGE08_GET + + .align 2 +sDummyWarpData:: @ 826D2B0 + map MAP_UNDEFINED + .byte 0xFF + .align 1 + .2byte 0xFFFF, 0xFFFF + +sUnusedData:: @ 826D2B8 + .4byte 1200 + .4byte 3600 + .4byte 1200 + .4byte 2400 + .4byte 50 + .4byte 80 + .4byte -44 + .4byte 44 + +gDirectionToVectors:: @ 826D2D8 + .4byte 0, 0 + .4byte 0, 1 + .4byte 0, -1 + .4byte -1, 0 + .4byte 1, 0 + .4byte -1, 1 + .4byte 1, 1 + .4byte -1, -1 + .4byte 1, -1 + +gUnknown_826D320:: @ 826D320 + .4byte 0x000001f8 + @ { + @ .bg = 0, + @ .charBaseIndex = 2, + @ .mapBaseIndex = 31, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 0, + @ .baseTile = 0x0000 + @ } + .4byte 0x000011d1 + @ { + @ .bg = 1, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 29, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 1, + @ .baseTile = 0x0000 + @ } + .4byte 0x000021c2 + @ { + @ .bg = 2, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 28, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 2, + @ .baseTile = 0x0000 + @ } + .4byte 0x000031e3 + @ { + @ .bg = 3, + @ .charBaseIndex = 0, + @ .mapBaseIndex = 30, + @ .screenSize = 0, + @ .paletteMode = 0, + @ .priority = 3, + @ .baseTile = 0x0000 + @ } + +gUnknown_826D330:: @ 826D330 + .4byte REG_WIN0H + .4byte (2 >> 1) | ((DMA_16BIT | DMA_DEST_RELOAD | DMA_SRC_INC | DMA_REPEAT | DMA_START_HBLANK | DMA_ENABLE) << 16) + .byte 1, 0 + + .align 2 +gUnknown_826D33C:: @ 826D33C + .4byte sub_8058684 + .4byte sub_80586A4 + .4byte sub_80586A8 + +gUnknown_826D348:: @ 826D348 + .4byte sub_80586C8 + .4byte sub_80586CC + .4byte sub_80586CC + .4byte sub_80586CC + .4byte sub_80586CC + .4byte sub_80586C8 + .4byte sub_80586C8 + .4byte sub_8058734 + .4byte sub_8058734 + .4byte sub_8058734 + .4byte sub_8058734 + +gUnknown_826D374:: @ 826D374 + .4byte sub_805874C + .4byte sub_8058754 diff --git a/data/specials.inc b/data/specials.inc index d8d208d43..bfb649961 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -65,7 +65,7 @@ gSpecials:: @ 815FD60 def_special sub_8080618 def_special ScrSpecial_HasTrainerBeenFought def_special ScrSpecial_EndTrainerApproach - def_special sub_8080628 + def_special PlayTrainerEncounterMusic def_special sub_810CD4C def_special sub_810CEB4 def_special sub_80805B0 @@ -168,7 +168,7 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special sub_807F888 def_special ChangePokemonNickname - def_special sub_80BF8FC + def_special Special_ChooseMonFromParty def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 @@ -180,7 +180,7 @@ gSpecials:: @ 815FD60 def_special sub_8113510 def_special sub_81130A8 def_special sub_8113530 - def_special sub_8082E54 + def_special Special_RockSmashEncounter def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 @@ -189,7 +189,7 @@ gSpecials:: @ 815FD60 def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 - def_special sub_80CA74C + def_special Special_GetBattleOutcome def_special GetDaycareMonNicknames def_special GetDaycareState def_special RejectEggFromDayCare @@ -225,12 +225,12 @@ gSpecials:: @ 815FD60 def_special sub_80CA524 def_special sub_80CA86C def_special sub_80CA9A8 - def_special sub_80CB204 + def_special Special_GetElevatorFloor def_special nullsub_75 def_special nullsub_75 def_special sub_80BF93C - def_special sub_80BF9BC - def_special sub_80BFBA8 + def_special Special_ChooseMoveToDelete + def_special Special_DeleteSelectedMove def_special ScrSpecial_GetPokemonNicknameAndMoveName def_special ScrSpecial_CountPokemonMoves def_special sub_80E4634 @@ -284,8 +284,8 @@ gSpecials:: @ 815FD60 def_special Special_HallOfFame def_special sub_80CB498 def_special nullsub_75 - def_special SpawnScriptFieldObject - def_special RemoveScriptFieldObject + def_special SpawnCameraObject + def_special RemoveCameraObject def_special nullsub_75 def_special nullsub_75 def_special nullsub_75 @@ -356,7 +356,7 @@ gSpecials:: @ 815FD60 def_special sub_80CB7C4 def_special sub_80CBC5C def_special sub_80CADC4 - def_special sub_80CADEC + def_special Special_SetVermilionTrashCans def_special sub_805D1A8 def_special sub_80CB0A8 def_special Special_CheckAddCoins @@ -382,7 +382,7 @@ gSpecials:: @ 815FD60 def_special sub_810C3A4 def_special SetFlavorTextFlagFromSpecialVars def_special UpdatePickStateFromSpecialVar8005 - def_special sub_8054C48 + def_special Special_OverworldWhiteOutGetMoneyLoss def_special PutMonInRoute5Daycare def_special GetCostToWithdrawRoute5DaycareMon def_special IsThereMonInRoute5Daycare @@ -399,10 +399,10 @@ gSpecials:: @ 815FD60 def_special sp182_move_string def_special sub_811390C def_special sub_80CC4D4 - def_special sub_80CC730 + def_special Special_BattleCardAction def_special sub_8110AB4 def_special sub_8112364 - def_special sub_8146CE8 + def_special Special_GetMENewsJisanItemAndState def_special get_unknown_box_id def_special sub_809D504 def_special sub_809D620 @@ -416,7 +416,7 @@ gSpecials:: @ 815FD60 def_special sub_815D9E8 def_special sub_814B504 def_special sub_80CC8CC - def_special sub_80CC948 + def_special Special_DaisyMassageServices def_special HelpSystem_Disable def_special HelpSystem_Enable def_special sub_810B82C @@ -450,7 +450,7 @@ gSpecials:: @ 815FD60 def_special sub_81537C0 def_special sub_809C5FC def_special sub_80CB328 - def_special sub_80CD154 + def_special Special_ComputeLoreleiDollCollection def_special sub_80CD1B4 def_special CreateObedientEnemyMon gSpecialsEnd:: diff --git a/data/strings.s b/data/strings.s index f9fea0e1d..1d086f4c8 100644 --- a/data/strings.s +++ b/data/strings.s @@ -1551,7 +1551,7 @@ gUnknown_8417B21:: @ 0x8417B21 .string "POKé BALLS$" gUnknown_8417B2C:: @ 0x8417B2C - .string "TMs を HMs$" + .string "TMs & HMs$" gUnknown_8417B36:: @ 0x8417B36 .string "BERRIES$" @@ -1793,16 +1793,16 @@ gUnknown_8417F69:: @ 0x8417F69 gUnknown_8417F77:: @ 0x8417F77 .string "JOIN GROUP$" -gUnknown_8417F82:: @ 0x8417F82 +gOtherText_Single:: @ 0x8417F82 .string "SINGLE$" -gUnknown_8417F89:: @ 0x8417F89 +gOtherText_Double:: @ 0x8417F89 .string "DOUBLE$" -gUnknown_8417F90:: @ 0x8417F90 +gOtherText_Knockout:: @ 0x8417F90 .string "KNOCKOUT$" -gUnknown_8417F99:: @ 0x8417F99 +gOtherText_Mixed:: @ 0x8417F99 .string "MIXED$" gUnknown_8417F9F:: @ 0x8417F9F @@ -2890,7 +2890,7 @@ gUnknown_8419D57:: @ 8419D57 .string "POKéMON TRADES$" gUnknown_8419D66:: @ 8419D66 - .string "UNION TRADES を BATTLES$" + .string "UNION TRADES & BATTLES$" gUnknown_8419D7D:: @ 8419D7D .string "BERRY CRUSH$" @@ -4072,7 +4072,7 @@ gCreditsString_Teruki_Murakawa_Souichi_Yamamoto_Yuichiro_Ito_Akira_Kinashi:: @ 0 .align 2 gCreditsString_Environment_Tool_Programmers:: @ 0x841DB7C .string "\n" - .string "Environment を Tool Programmers\n" + .string "Environment & Tool Programmers\n" .string "\n\n" .string "\n\n" .string "$" diff --git a/data/text/quest_log.inc b/data/text/quest_log.inc index 62315aed3..7a605b239 100644 --- a/data/text/quest_log.inc +++ b/data/text/quest_log.inc @@ -378,104 +378,104 @@ gUnknown_841B073:: @ 841B073 .string "And {PLAYER} saved the game at this\n" .string "location: {STR_VAR_1}.$" -gUnknown_841B09F:: @ 841B09F +gQuestLogString_Home:: @ 841B09F .string "HOME$" -gUnknown_841B0A4:: @ 841B0A4 +gQuestLogString_OakResearchLab:: @ 841B0A4 .string "OAK RESEARCH LAB$" -gUnknown_841B0B5:: @ 841B0B5 +gQuestLogString_Gym:: @ 841B0B5 .string "GYM$" -gUnknown_841B0B9:: @ 841B0B9 +gQuestLogString_PokemonLeagueGate:: @ 841B0B9 .string "POKéMON LEAGUE GATE$" -gUnknown_841B0CD:: @ 841B0CD +gQuestLogString_ViridianForest:: @ 841B0CD .string "VIRIDIAN FOREST$" -gUnknown_841B0DD:: @ 841B0DD +gQuestLogString_PewterMuseumOfScience:: @ 841B0DD .string "PEWTER MUSEUM OF SCIENCE$" -gUnknown_841B0F6:: @ 841B0F6 +gQuestLogString_MtMoon:: @ 841B0F6 .string "MT. MOON$" -gUnknown_841B0FF:: @ 841B0FF +gQuestLogString_BikeShop:: @ 841B0FF .string "BIKE SHOP$" -gUnknown_841B109:: @ 841B109 +gQuestLogString_BillSHouse:: @ 841B109 .string "BILL'S HOUSE$" -gUnknown_841B116:: @ 841B116 +gQuestLogString_DayCare:: @ 841B116 .string "DAY CARE$" -gUnknown_841B11F:: @ 841B11F +gQuestLogString_UndergroundPath:: @ 841B11F .string "UNDERGROUND PATH$" -gUnknown_841B130:: @ 841B130 +gQuestLogString_PokemonFanClub:: @ 841B130 .string "POKéMON FAN CLUB$" -gUnknown_841B141:: @ 841B141 +gQuestLogString_SSAnne:: @ 841B141 .string "S.S. ANNE$" -gUnknown_841B14B:: @ 841B14B +gQuestLogString_DiglettSCave:: @ 841B14B .string "DIGLETT'S CAVE$" -gUnknown_841B15A:: @ 841B15A +gQuestLogString_RockTunnel:: @ 841B15A .string "ROCK TUNNEL$" -gUnknown_841B166:: @ 841B166 +gQuestLogString_PowerPlant:: @ 841B166 .string "POWER PLANT$" -gUnknown_841B172:: @ 841B172 +gQuestLogString_PokemonTower:: @ 841B172 .string "POKéMON TOWER$" -gUnknown_841B180:: @ 841B180 +gQuestLogString_VolunteerHouse:: @ 841B180 .string "VOLUNTEER HOUSE$" -gUnknown_841B190:: @ 841B190 +gQuestLogString_NameRaterSHouse:: @ 841B190 .string "NAME RATER'S HOUSE$" -gUnknown_841B1A3:: @ 841B1A3 +gQuestLogString_CeladonDeptStore:: @ 841B1A3 .string "CELADON DEPT. STORE$" -gUnknown_841B1B7:: @ 841B1B7 +gQuestLogString_CeladonMansion:: @ 841B1B7 .string "CELADON MANSION$" -gUnknown_841B1C7:: @ 841B1C7 +gQuestLogString_RocketGameCorner:: @ 841B1C7 .string "ROCKET GAME CORNER$" -gUnknown_841B1DA:: @ 841B1DA +gQuestLogString_Restaurant:: @ 841B1DA .string "RESTAURANT$" -gUnknown_841B1E5:: @ 841B1E5 +gQuestLogString_RocketHideout:: @ 841B1E5 .string "ROCKET HIDEOUT$" -gUnknown_841B1F4:: @ 841B1F4 +gQuestLogString_SafariZone:: @ 841B1F4 .string "SAFARI ZONE$" -gUnknown_841B200:: @ 841B200 +gQuestLogString_WardenSHome:: @ 841B200 .string "WARDEN'S HOME$" -gUnknown_841B20E:: @ 841B20E +gQuestLogString_FightingDojo:: @ 841B20E .string "FIGHTING DOJO$" -gUnknown_841B21C:: @ 841B21C +gQuestLogString_SilphCo:: @ 841B21C .string "SILPH CO.$" -gUnknown_841B226:: @ 841B226 +gQuestLogString_SeafoamIslands:: @ 841B226 .string "SEAFOAM ISLANDS$" -gUnknown_841B236:: @ 841B236 +gQuestLogString_PokemonMansion:: @ 841B236 .string "POKéMON MANSION$" -gUnknown_841B246:: @ 841B246 +gQuestLogString_PokemonResearchLab:: @ 841B246 .string "POKéMON RESEARCH LAB$" -gUnknown_841B25B:: @ 841B25B +gQuestLogString_VictoryRoad:: @ 841B25B .string "VICTORY ROAD$" -gUnknown_841B268:: @ 841B268 +gQuestLogString_PokemonLeague:: @ 841B268 .string "POKéMON LEAGUE$" -gUnknown_841B277:: @ 841B277 +gQuestLogString_CeruleanCave:: @ 841B277 .string "CERULEAN CAVE$" diff --git a/data/text/species_names.inc b/data/text/species_names.inc deleted file mode 100644 index 04907c86e..000000000 --- a/data/text/species_names.inc +++ /dev/null @@ -1,412 +0,0 @@ - .string "??????????$", 11 - .string "BULBASAUR$", 11 - .string "IVYSAUR$", 11 - .string "VENUSAUR$", 11 - .string "CHARMANDER$", 11 - .string "CHARMELEON$", 11 - .string "CHARIZARD$", 11 - .string "SQUIRTLE$", 11 - .string "WARTORTLE$", 11 - .string "BLASTOISE$", 11 - .string "CATERPIE$", 11 - .string "METAPOD$", 11 - .string "BUTTERFREE$", 11 - .string "WEEDLE$", 11 - .string "KAKUNA$", 11 - .string "BEEDRILL$", 11 - .string "PIDGEY$", 11 - .string "PIDGEOTTO$", 11 - .string "PIDGEOT$", 11 - .string "RATTATA$", 11 - .string "RATICATE$", 11 - .string "SPEAROW$", 11 - .string "FEAROW$", 11 - .string "EKANS$", 11 - .string "ARBOK$", 11 - .string "PIKACHU$", 11 - .string "RAICHU$", 11 - .string "SANDSHREW$", 11 - .string "SANDSLASH$", 11 - .string "NIDORAN♀$", 11 - .string "NIDORINA$", 11 - .string "NIDOQUEEN$", 11 - .string "NIDORAN♂$", 11 - .string "NIDORINO$", 11 - .string "NIDOKING$", 11 - .string "CLEFAIRY$", 11 - .string "CLEFABLE$", 11 - .string "VULPIX$", 11 - .string "NINETALES$", 11 - .string "JIGGLYPUFF$", 11 - .string "WIGGLYTUFF$", 11 - .string "ZUBAT$", 11 - .string "GOLBAT$", 11 - .string "ODDISH$", 11 - .string "GLOOM$", 11 - .string "VILEPLUME$", 11 - .string "PARAS$", 11 - .string "PARASECT$", 11 - .string "VENONAT$", 11 - .string "VENOMOTH$", 11 - .string "DIGLETT$", 11 - .string "DUGTRIO$", 11 - .string "MEOWTH$", 11 - .string "PERSIAN$", 11 - .string "PSYDUCK$", 11 - .string "GOLDUCK$", 11 - .string "MANKEY$", 11 - .string "PRIMEAPE$", 11 - .string "GROWLITHE$", 11 - .string "ARCANINE$", 11 - .string "POLIWAG$", 11 - .string "POLIWHIRL$", 11 - .string "POLIWRATH$", 11 - .string "ABRA$", 11 - .string "KADABRA$", 11 - .string "ALAKAZAM$", 11 - .string "MACHOP$", 11 - .string "MACHOKE$", 11 - .string "MACHAMP$", 11 - .string "BELLSPROUT$", 11 - .string "WEEPINBELL$", 11 - .string "VICTREEBEL$", 11 - .string "TENTACOOL$", 11 - .string "TENTACRUEL$", 11 - .string "GEODUDE$", 11 - .string "GRAVELER$", 11 - .string "GOLEM$", 11 - .string "PONYTA$", 11 - .string "RAPIDASH$", 11 - .string "SLOWPOKE$", 11 - .string "SLOWBRO$", 11 - .string "MAGNEMITE$", 11 - .string "MAGNETON$", 11 - .string "FARFETCH'D$", 11 - .string "DODUO$", 11 - .string "DODRIO$", 11 - .string "SEEL$", 11 - .string "DEWGONG$", 11 - .string "GRIMER$", 11 - .string "MUK$", 11 - .string "SHELLDER$", 11 - .string "CLOYSTER$", 11 - .string "GASTLY$", 11 - .string "HAUNTER$", 11 - .string "GENGAR$", 11 - .string "ONIX$", 11 - .string "DROWZEE$", 11 - .string "HYPNO$", 11 - .string "KRABBY$", 11 - .string "KINGLER$", 11 - .string "VOLTORB$", 11 - .string "ELECTRODE$", 11 - .string "EXEGGCUTE$", 11 - .string "EXEGGUTOR$", 11 - .string "CUBONE$", 11 - .string "MAROWAK$", 11 - .string "HITMONLEE$", 11 - .string "HITMONCHAN$", 11 - .string "LICKITUNG$", 11 - .string "KOFFING$", 11 - .string "WEEZING$", 11 - .string "RHYHORN$", 11 - .string "RHYDON$", 11 - .string "CHANSEY$", 11 - .string "TANGELA$", 11 - .string "KANGASKHAN$", 11 - .string "HORSEA$", 11 - .string "SEADRA$", 11 - .string "GOLDEEN$", 11 - .string "SEAKING$", 11 - .string "STARYU$", 11 - .string "STARMIE$", 11 - .string "MR. MIME$", 11 - .string "SCYTHER$", 11 - .string "JYNX$", 11 - .string "ELECTABUZZ$", 11 - .string "MAGMAR$", 11 - .string "PINSIR$", 11 - .string "TAUROS$", 11 - .string "MAGIKARP$", 11 - .string "GYARADOS$", 11 - .string "LAPRAS$", 11 - .string "DITTO$", 11 - .string "EEVEE$", 11 - .string "VAPOREON$", 11 - .string "JOLTEON$", 11 - .string "FLAREON$", 11 - .string "PORYGON$", 11 - .string "OMANYTE$", 11 - .string "OMASTAR$", 11 - .string "KABUTO$", 11 - .string "KABUTOPS$", 11 - .string "AERODACTYL$", 11 - .string "SNORLAX$", 11 - .string "ARTICUNO$", 11 - .string "ZAPDOS$", 11 - .string "MOLTRES$", 11 - .string "DRATINI$", 11 - .string "DRAGONAIR$", 11 - .string "DRAGONITE$", 11 - .string "MEWTWO$", 11 - .string "MEW$", 11 - .string "CHIKORITA$", 11 - .string "BAYLEEF$", 11 - .string "MEGANIUM$", 11 - .string "CYNDAQUIL$", 11 - .string "QUILAVA$", 11 - .string "TYPHLOSION$", 11 - .string "TOTODILE$", 11 - .string "CROCONAW$", 11 - .string "FERALIGATR$", 11 - .string "SENTRET$", 11 - .string "FURRET$", 11 - .string "HOOTHOOT$", 11 - .string "NOCTOWL$", 11 - .string "LEDYBA$", 11 - .string "LEDIAN$", 11 - .string "SPINARAK$", 11 - .string "ARIADOS$", 11 - .string "CROBAT$", 11 - .string "CHINCHOU$", 11 - .string "LANTURN$", 11 - .string "PICHU$", 11 - .string "CLEFFA$", 11 - .string "IGGLYBUFF$", 11 - .string "TOGEPI$", 11 - .string "TOGETIC$", 11 - .string "NATU$", 11 - .string "XATU$", 11 - .string "MAREEP$", 11 - .string "FLAAFFY$", 11 - .string "AMPHAROS$", 11 - .string "BELLOSSOM$", 11 - .string "MARILL$", 11 - .string "AZUMARILL$", 11 - .string "SUDOWOODO$", 11 - .string "POLITOED$", 11 - .string "HOPPIP$", 11 - .string "SKIPLOOM$", 11 - .string "JUMPLUFF$", 11 - .string "AIPOM$", 11 - .string "SUNKERN$", 11 - .string "SUNFLORA$", 11 - .string "YANMA$", 11 - .string "WOOPER$", 11 - .string "QUAGSIRE$", 11 - .string "ESPEON$", 11 - .string "UMBREON$", 11 - .string "MURKROW$", 11 - .string "SLOWKING$", 11 - .string "MISDREAVUS$", 11 - .string "UNOWN$", 11 - .string "WOBBUFFET$", 11 - .string "GIRAFARIG$", 11 - .string "PINECO$", 11 - .string "FORRETRESS$", 11 - .string "DUNSPARCE$", 11 - .string "GLIGAR$", 11 - .string "STEELIX$", 11 - .string "SNUBBULL$", 11 - .string "GRANBULL$", 11 - .string "QWILFISH$", 11 - .string "SCIZOR$", 11 - .string "SHUCKLE$", 11 - .string "HERACROSS$", 11 - .string "SNEASEL$", 11 - .string "TEDDIURSA$", 11 - .string "URSARING$", 11 - .string "SLUGMA$", 11 - .string "MAGCARGO$", 11 - .string "SWINUB$", 11 - .string "PILOSWINE$", 11 - .string "CORSOLA$", 11 - .string "REMORAID$", 11 - .string "OCTILLERY$", 11 - .string "DELIBIRD$", 11 - .string "MANTINE$", 11 - .string "SKARMORY$", 11 - .string "HOUNDOUR$", 11 - .string "HOUNDOOM$", 11 - .string "KINGDRA$", 11 - .string "PHANPY$", 11 - .string "DONPHAN$", 11 - .string "PORYGON2$", 11 - .string "STANTLER$", 11 - .string "SMEARGLE$", 11 - .string "TYROGUE$", 11 - .string "HITMONTOP$", 11 - .string "SMOOCHUM$", 11 - .string "ELEKID$", 11 - .string "MAGBY$", 11 - .string "MILTANK$", 11 - .string "BLISSEY$", 11 - .string "RAIKOU$", 11 - .string "ENTEI$", 11 - .string "SUICUNE$", 11 - .string "LARVITAR$", 11 - .string "PUPITAR$", 11 - .string "TYRANITAR$", 11 - .string "LUGIA$", 11 - .string "HO-OH$", 11 - .string "CELEBI$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "?$", 11 - .string "TREECKO$", 11 - .string "GROVYLE$", 11 - .string "SCEPTILE$", 11 - .string "TORCHIC$", 11 - .string "COMBUSKEN$", 11 - .string "BLAZIKEN$", 11 - .string "MUDKIP$", 11 - .string "MARSHTOMP$", 11 - .string "SWAMPERT$", 11 - .string "POOCHYENA$", 11 - .string "MIGHTYENA$", 11 - .string "ZIGZAGOON$", 11 - .string "LINOONE$", 11 - .string "WURMPLE$", 11 - .string "SILCOON$", 11 - .string "BEAUTIFLY$", 11 - .string "CASCOON$", 11 - .string "DUSTOX$", 11 - .string "LOTAD$", 11 - .string "LOMBRE$", 11 - .string "LUDICOLO$", 11 - .string "SEEDOT$", 11 - .string "NUZLEAF$", 11 - .string "SHIFTRY$", 11 - .string "NINCADA$", 11 - .string "NINJASK$", 11 - .string "SHEDINJA$", 11 - .string "TAILLOW$", 11 - .string "SWELLOW$", 11 - .string "SHROOMISH$", 11 - .string "BRELOOM$", 11 - .string "SPINDA$", 11 - .string "WINGULL$", 11 - .string "PELIPPER$", 11 - .string "SURSKIT$", 11 - .string "MASQUERAIN$", 11 - .string "WAILMER$", 11 - .string "WAILORD$", 11 - .string "SKITTY$", 11 - .string "DELCATTY$", 11 - .string "KECLEON$", 11 - .string "BALTOY$", 11 - .string "CLAYDOL$", 11 - .string "NOSEPASS$", 11 - .string "TORKOAL$", 11 - .string "SABLEYE$", 11 - .string "BARBOACH$", 11 - .string "WHISCASH$", 11 - .string "LUVDISC$", 11 - .string "CORPHISH$", 11 - .string "CRAWDAUNT$", 11 - .string "FEEBAS$", 11 - .string "MILOTIC$", 11 - .string "CARVANHA$", 11 - .string "SHARPEDO$", 11 - .string "TRAPINCH$", 11 - .string "VIBRAVA$", 11 - .string "FLYGON$", 11 - .string "MAKUHITA$", 11 - .string "HARIYAMA$", 11 - .string "ELECTRIKE$", 11 - .string "MANECTRIC$", 11 - .string "NUMEL$", 11 - .string "CAMERUPT$", 11 - .string "SPHEAL$", 11 - .string "SEALEO$", 11 - .string "WALREIN$", 11 - .string "CACNEA$", 11 - .string "CACTURNE$", 11 - .string "SNORUNT$", 11 - .string "GLALIE$", 11 - .string "LUNATONE$", 11 - .string "SOLROCK$", 11 - .string "AZURILL$", 11 - .string "SPOINK$", 11 - .string "GRUMPIG$", 11 - .string "PLUSLE$", 11 - .string "MINUN$", 11 - .string "MAWILE$", 11 - .string "MEDITITE$", 11 - .string "MEDICHAM$", 11 - .string "SWABLU$", 11 - .string "ALTARIA$", 11 - .string "WYNAUT$", 11 - .string "DUSKULL$", 11 - .string "DUSCLOPS$", 11 - .string "ROSELIA$", 11 - .string "SLAKOTH$", 11 - .string "VIGOROTH$", 11 - .string "SLAKING$", 11 - .string "GULPIN$", 11 - .string "SWALOT$", 11 - .string "TROPIUS$", 11 - .string "WHISMUR$", 11 - .string "LOUDRED$", 11 - .string "EXPLOUD$", 11 - .string "CLAMPERL$", 11 - .string "HUNTAIL$", 11 - .string "GOREBYSS$", 11 - .string "ABSOL$", 11 - .string "SHUPPET$", 11 - .string "BANETTE$", 11 - .string "SEVIPER$", 11 - .string "ZANGOOSE$", 11 - .string "RELICANTH$", 11 - .string "ARON$", 11 - .string "LAIRON$", 11 - .string "AGGRON$", 11 - .string "CASTFORM$", 11 - .string "VOLBEAT$", 11 - .string "ILLUMISE$", 11 - .string "LILEEP$", 11 - .string "CRADILY$", 11 - .string "ANORITH$", 11 - .string "ARMALDO$", 11 - .string "RALTS$", 11 - .string "KIRLIA$", 11 - .string "GARDEVOIR$", 11 - .string "BAGON$", 11 - .string "SHELGON$", 11 - .string "SALAMENCE$", 11 - .string "BELDUM$", 11 - .string "METANG$", 11 - .string "METAGROSS$", 11 - .string "REGIROCK$", 11 - .string "REGICE$", 11 - .string "REGISTEEL$", 11 - .string "KYOGRE$", 11 - .string "GROUDON$", 11 - .string "RAYQUAZA$", 11 - .string "LATIAS$", 11 - .string "LATIOS$", 11 - .string "JIRACHI$", 11 - .string "DEOXYS$", 11 - .string "CHIMECHO$", 11 |