Commit Graph

  • 83137b4005 Merge branch 'master' of github.com:pret/pokefirered into dodrio_berry_picking PikalaxALT 2020-03-05 14:38:26 -05:00
  • 3d5d298c63 Merge pull request #287 from GriffinRichards/move-strings PikalaxALT 2020-03-05 14:35:42 -05:00
  • 5ab4af2d0e Fix some JP character mapping GriffinR 2020-03-05 14:26:48 -05:00
  • eb4327a714 Move strings.s to src GriffinR 2020-03-05 13:33:00 -05:00
  • 7f81fdc8df Port dodrio_berry_picking_3 from emerald PikalaxALT 2020-03-05 14:03:23 -05:00
  • b56c2b75b4 Finish dodrio_berry_picking_2.c PikalaxALT 2020-03-05 13:58:14 -05:00
  • cb99443c51 through sub_81556E0 PikalaxALT 2020-03-05 10:31:31 -05:00
  • 362cddc0f5 Merge pull request #285 from GriffinRichards/doc-scriptclean PikalaxALT 2020-03-05 06:06:51 -05:00
  • 102744163b Use explicit initializers for help text GriffinR 2020-03-05 01:12:29 -05:00
  • a82a7b5fcb Lowercase new pokedude labels GriffinR 2020-03-04 18:29:32 -05:00
  • 4df660dc76 Add enums for help system text, label help context GriffinR 2020-03-04 10:42:40 -05:00
  • e9c3b78d9f through sub_8154A2C; reorganize dbp files a bit PikalaxALT 2020-03-04 17:21:41 -05:00
  • ff13649f47 through sub_81537AC PikalaxALT 2020-03-04 15:14:59 -05:00
  • 6871f3dd33 through sub_8153048 PikalaxALT 2020-03-04 14:58:44 -05:00
  • 171e4bbea4 through sub_815184C PikalaxALT 2020-03-04 13:56:54 -05:00
  • 8dcae92a5f port/decomp through sub_8150FDC PikalaxALT 2020-03-04 11:19:39 -05:00
  • 13e06bf7f8 Combine special prefixes, drop more GriffinR 2020-03-04 10:42:16 -05:00
  • ce3e1b8af0 Add missing movement type constant use GriffinR 2020-03-03 22:25:48 -05:00
  • 4c1d30a832 Add more metatile labels GriffinR 2020-03-03 22:09:22 -05:00
  • 9fbe7e14a8 Label remaining JP script text GriffinR 2020-03-03 17:50:24 -05:00
  • 7af1b35d17 Sync some specials/drop unnecessary prefixes GriffinR 2020-03-03 16:18:45 -05:00
  • 437fe6631a Merge pull request #286 from jiangzhengwenjz/nonmatching PikalaxALT 2020-03-03 16:55:56 -05:00
  • d6352f7429 sub_814DFA4 jiangzhengwenjz 2020-03-04 05:43:50 +08:00
  • 0e468b49bb Merge pull request #284 from PikalaxALT/berry_crush PikalaxALT 2020-03-03 15:55:58 -05:00
  • c2f85a5326 Address review comments PikalaxALT 2020-03-03 15:42:14 -05:00
  • 11ce98c7ac Remove empty data/berry_crush.s PikalaxALT 2020-03-03 15:19:33 -05:00
  • 1aa1f18972 Sync trainer_battle.inc GriffinR 2020-03-03 14:42:15 -05:00
  • df08e8645b Port some standalone rodata objects to C PikalaxALT 2020-03-03 14:05:38 -05:00
  • 4c4b19da7e Label help system text GriffinR 2020-03-03 01:39:10 -05:00
  • d047e66310 Duplicate data in dodrio_berry_picking.c PikalaxALT 2020-03-03 13:59:54 -05:00
  • 89e5082d51 Merge branch 'master' of github.com:pret/pokefirered into berry_crush PikalaxALT 2020-03-03 13:47:35 -05:00
  • dd22d97814 Merge pull request #283 from GriffinRichards/fix-eventticket PikalaxALT 2020-03-03 13:47:29 -05:00
  • 8a7c2ded11 Port berry_crush_3 from Emerald PikalaxALT 2020-03-03 12:24:18 -05:00
  • 2e8570499d Sync event ticket flag names GriffinR 2020-03-03 01:44:06 -05:00
  • 8594e7f72d Port berry_crush_2 from emerald PikalaxALT 2020-03-02 21:36:30 -05:00
  • f77b0feba6 Port berry_crush.c part 1 from Emerald PikalaxALT 2020-03-02 16:57:00 -05:00
  • 63e0b54f96 Label pokedude text GriffinR 2020-03-02 16:35:52 -05:00
  • 1261a414cd Update calcrom.pl for optionally more verbose output PikalaxALT 2020-03-02 16:28:02 -05:00
  • 42e6e9bd9c Remove interactwith from field move scripts GriffinR 2020-03-02 14:55:20 -05:00
  • fdc2a0b40e Fix undetected issue in #282 PikalaxALT 2020-03-02 14:46:42 -05:00
  • f5011a27d6 Merge pull request #282 from PikalaxALT/field_effect_helpers PikalaxALT 2020-03-02 14:11:32 -05:00
  • e2a29e9db9 Address review comments PikalaxALT 2020-03-02 13:59:38 -05:00
  • dd5f3c3c3d Add missing script labels GriffinR 2020-03-02 13:52:16 -05:00
  • 6363d39e99 port field_effect_helpers from emerald PikalaxALT 2020-03-02 13:34:34 -05:00
  • 40af0d1302 Merge pull request #281 from GriffinRichards/fix-specialvars PikalaxALT 2020-03-02 13:15:48 -05:00
  • 4ab3d77d80 Fix special var names GriffinR 2020-03-02 12:57:54 -05:00
  • 9803cb612e Merge pull request #280 from GriffinRichards/fix-signs PikalaxALT 2020-03-02 12:31:02 -05:00
  • 6191739a4d Label sign bg events GriffinR 2020-03-02 12:24:05 -05:00
  • 0169a98c68 Merge pull request #278 from GriffinRichards/doc-miscscript PikalaxALT 2020-03-02 12:19:18 -05:00
  • e8504c7a3f Merge pull request #276 from GriffinRichards/doc-sixisland PikalaxALT 2020-03-02 12:17:52 -05:00
  • ae08a40290 Merge pull request #279 from PikalaxALT/field_effect PikalaxALT 2020-03-02 12:11:22 -05:00
  • 2d820809d7 Revert erroneous use of SPRITE_INVALID_TAG PikalaxALT 2020-03-02 12:01:57 -05:00
  • b3803dcc99 Address review comments, 2 PikalaxALT 2020-03-02 11:53:08 -05:00
  • d12dd578b8 Address review comments PikalaxALT 2020-03-02 11:16:34 -05:00
  • 6280a3786b Merge branch 'master' into doc-sixisland GriffinR 2020-03-02 10:48:56 -05:00
  • 5198a05272 Merge pull request #275 from GriffinRichards/doc-fiveisland PikalaxALT 2020-03-02 10:48:13 -05:00
  • 55e00e0c13 Merge pull request #274 from GriffinRichards/doc-fourisland PikalaxALT 2020-03-02 10:43:01 -05:00
  • a1995d8029 Fix alignment GriffinR 2020-03-02 10:35:41 -05:00
  • 8ff7977b89 Merge branch 'master' into doc-fourisland GriffinR 2020-03-02 10:26:39 -05:00
  • ff0034d597 Merge pull request #273 from GriffinRichards/doc-threeisland PikalaxALT 2020-03-02 10:28:59 -05:00
  • d975572a6a Fix some extern declarations PikalaxALT 2020-03-02 10:26:42 -05:00
  • d758ae0dc2 Merge branch 'master' of github.com:pret/pokefirered into field_effect PikalaxALT 2020-03-02 10:15:07 -05:00
  • fc51c579d4 Merge pull request #277 from PikalaxALT/cable_club PikalaxALT 2020-03-02 10:13:06 -05:00
  • 2f8ac698c8 Static symbols in field_effect.c PikalaxALT 2020-03-02 09:57:54 -05:00
  • 875dde7a0c Rename remaining field effect callbacks PikalaxALT 2020-03-02 09:51:21 -05:00
  • a7966b5047 Finish field_effect.c PikalaxALT 2020-03-02 09:47:33 -05:00
  • a506860558 field effect 0x43 PikalaxALT 2020-03-02 09:18:32 -05:00
  • 358f785a03 Resolve some JP text GriffinR 2020-03-02 00:53:22 -05:00
  • 62100376b7 Split/label some common event scripts GriffinR 2020-03-02 00:19:11 -05:00
  • c36ef94a0d address review comments PikalaxALT 2020-02-29 21:00:31 -05:00
  • cbd380f2bf Name many functions in cable_club.c PikalaxALT 2020-02-29 17:01:03 -05:00
  • 13687bb97f Static symbols in cable_club.c PikalaxALT 2020-02-29 16:35:23 -05:00
  • 21dddd5760 Finish cable_club.c PikalaxALT 2020-02-29 16:31:57 -05:00
  • 9b9ae3d337 through sub_8080E6C PikalaxALT 2020-02-29 14:30:01 -05:00
  • 47f6e9f973 Document missed Vermilion house script GriffinR 2020-02-28 23:01:37 -05:00
  • 575e8da6a9 Document Seven Island scripts GriffinR 2020-02-28 20:24:19 -05:00
  • fb064f17ba Fly field effect PikalaxALT 2020-02-28 17:10:06 -05:00
  • f825186655 Use VS Seeker field effect PikalaxALT 2020-02-28 15:55:12 -05:00
  • 80e5031619 Use Surf field effect PikalaxALT 2020-02-28 15:29:16 -05:00
  • 0c492c087e Show Mon field effect PikalaxALT 2020-02-28 15:19:50 -05:00
  • 410aaa00ff Teleport field effect PikalaxALT 2020-02-28 14:26:54 -05:00
  • fb56341fe4 Escape Rope field effect PikalaxALT 2020-02-28 14:14:34 -05:00
  • 8f42b7b56d Lavaridge Gym 1F Warp field effect PikalaxALT 2020-02-28 13:23:51 -05:00
  • 9cf19244fa Port Lavaridge Gym B1F Warp from Emerald PikalaxALT 2020-02-28 13:18:21 -05:00
  • 8a09273846 Unused dive field effect PikalaxALT 2020-02-28 11:16:03 -05:00
  • c117bc6864 Waterfall field effect PikalaxALT 2020-02-28 10:19:34 -05:00
  • 1779aedbf0 Escalator field effect PikalaxALT 2020-02-28 10:02:40 -05:00
  • 948b695ad4 Document Six Island scripts GriffinR 2020-02-28 08:16:21 -05:00
  • db12644f00 FallWarpEffect funcs PikalaxALT 2020-02-28 09:06:19 -05:00
  • 7d7c51973c Document Five Island scripts GriffinR 2020-02-28 00:22:34 -05:00
  • 968ac4742a Sync trainer_card.c GriffinR 2020-02-27 17:15:27 -05:00
  • e07c771f18 through Task_FallWarpFieldEffect PikalaxALT 2020-02-27 16:59:05 -05:00
  • 9c03c850a2 Fly field effect PikalaxALT 2020-02-27 16:35:06 -05:00
  • 701d4635b4 Pokecenter heal and HOF field effects PikalaxALT 2020-02-27 16:19:33 -05:00
  • 2d9327a1ff Document Four Island scripts, trainer_card.inc GriffinR 2020-02-27 14:21:13 -05:00
  • 0d88e2d1de through MultiplyPaletteRGBComponents PikalaxALT 2020-02-27 14:08:26 -05:00
  • d3adca3f9d Document Three Island scripts GriffinR 2020-02-26 16:02:29 -05:00
  • c93915120f Port many field_effect.c names from Emerald PikalaxALT 2020-02-27 11:45:08 -05:00
  • 456c817338 Decompile fldeff hooks PikalaxALT 2020-02-27 09:18:54 -05:00
  • 43f66fce55 Merge pull request #271 from GriffinRichards/doc-twoisland PikalaxALT 2020-02-26 14:08:45 -05:00