Commit Graph

1366 Commits

Author SHA1 Message Date
PikalaxALT 680e03618a Bump baserom.ips 2019-10-26 10:24:35 -04:00
PikalaxALT 93f0703fcd Merge branch 'master' of github.com:pret/pokefirered into script_menu 2019-10-26 10:23:13 -04:00
PikalaxALT 1f569f0136 Merge pull request #134 from jiangzhengwenjz/sub_8115748
real match sub_8115748
2019-10-26 06:46:02 -04:00
PikalaxALT eafb77fbb9 Merge pull request #125 from jiangzhengwenjz/battle
battle (3rd take)
2019-10-26 06:45:00 -04:00
jiangzhengwenjz 0ae4d58e98 resolve more review comments 2019-10-26 11:51:43 +08:00
jiangzhengwenjz bc61968e1b sub_8115748 2019-10-26 10:23:46 +08:00
jiangzhengwenjz d99119bad5 rename battle_bg.s 2019-10-26 07:55:16 +08:00
jiangzhengwenjz 1481f9e819 resolve review comments 2019-10-26 06:03:42 +08:00
PikalaxALT fd78afa5a7 Name remaining static routines in script_menu.c 2019-10-25 17:11:31 -04:00
PikalaxALT 4b052a2040 Resolve review comments 2019-10-25 17:01:05 -04:00
PikalaxALT 52ce0f21c6 Name strings for leafgreen mon prizes 2019-10-25 15:06:19 -04:00
PikalaxALT 2fce740005 Name strings used in field_specials 2019-10-25 14:59:46 -04:00
PikalaxALT 359ec8dde1 Name multichoice menus 2019-10-25 14:52:54 -04:00
PikalaxALT 15298c6cd1 Fix some string names 2019-10-25 14:01:40 -04:00
PikalaxALT d33509ec93 script_menu name strings 2019-10-25 13:56:01 -04:00
PikalaxALT 1f73aff8f4 script_menu static funcs and vars 2019-10-25 13:41:57 -04:00
jiangzhengwenjz 1230a5c48a clean up 2019-10-26 01:31:50 +08:00
PikalaxALT 00675eaafb script_menu data 2019-10-25 13:23:46 -04:00
PikalaxALT 0a440d658b Finish script_menu code decomp 2019-10-25 11:10:08 -04:00
jiangzhengwenjz 2f87855072 Merge branch 'master' into battle 2019-10-25 09:22:50 +08:00
jiangzhengwenjz 6ca932e5e9 revert some symbol documentation (I hate this) 2019-10-25 09:17:15 +08:00
jiangzhengwenjz b8c2d14f6a battle_controller_oak_old_man 2019-10-25 08:51:14 +08:00
PikalaxALT 283084cce4 script_menu through task_yes_no_maybe 2019-10-24 20:49:10 -04:00
jiangzhengwenjz 631eccb92d thru OakOldManHandleSwitchInAnim 2019-10-25 05:57:26 +08:00
PikalaxALT 7579fc65c1 Merge pull request #132 from PikalaxALT/field_specials
Field specials
2019-10-24 17:22:11 -04:00
PikalaxALT 4fae71a4b0 Fix alignment in flags.h 2019-10-24 16:54:01 -04:00
PikalaxALT c0f4afeb17 Fix multiline conditional parentheses and indentation 2019-10-24 16:37:44 -04:00
PikalaxALT a18e9c27e1 Rename specials according to Ruby 2019-10-24 16:31:38 -04:00
PikalaxALT 440d062936 fix erroneous var name reversion 2019-10-24 15:51:47 -04:00
PikalaxALT 4b98c7f6bc Static RAM variables 2019-10-24 15:33:25 -04:00
PikalaxALT 7c3d9df380 Finish field_specials 2019-10-24 15:28:43 -04:00
PikalaxALT 0d73967f6c field_specials through Special_BattleCardAction; field_specials rodata 2019-10-24 11:42:45 -04:00
PikalaxALT 779d6187c6 field_specials through sub_80CC534 2019-10-24 10:22:39 -04:00
jiangzhengwenjz b469207121 rename BATTLE_TYPE_OLD_MAN_TUTORIAL 2019-10-24 14:05:20 +08:00
PikalaxALT db3be6ef2e field_specials through sub_80CBFA0 2019-10-23 20:43:41 -04:00
PikalaxALT 54d6414654 field_specials through sub_80CBDE8 2019-10-23 20:12:14 -04:00
PikalaxALT 16ab70a12c through sub_80CBB28 2019-10-23 17:12:49 -04:00
PikalaxALT f33f58eff7 Finish fixing SEAVAULT to SEVAULT 2019-10-23 15:32:23 -04:00
PikalaxALT 661e5d9221 field_specials through Task_AnimateElevatorWindowView 2019-10-23 15:31:23 -04:00
jiangzhengwenjz 1dc0b25c1e Merge branch 'master' into battle 2019-10-24 01:42:52 +08:00
PikalaxALT 6e36c22920 Merge pull request #130 from PikalaxALT/trainers
Trainers, event flags, mystery_event_msg, map object gfx
2019-10-23 09:05:26 -04:00
PikalaxALT 3efd2e1210 Update back_pic_tables.h 2019-10-22 21:38:39 -04:00
PikalaxALT 14c10b1417 Update back_pic_anims.h 2019-10-22 21:38:13 -04:00
PikalaxALT 8249a58a2c Split trainers and port species and move names 2019-10-22 21:24:16 -04:00
PikalaxALT 4dfc6699fe Update code style in some places 2019-10-22 20:09:08 -04:00
PikalaxALT a5521e6b69 Remove incomplete menews_jison constant defs 2019-10-22 16:47:41 -04:00
PikalaxALT 2a584a0671 Partial documentation of trainer_tower 2019-10-22 16:36:47 -04:00
PikalaxALT 6742a901af Dump data/overworld.s 2019-10-22 13:40:01 -04:00
PikalaxALT 1de8b7b197 Document overworld whiteout funcs 2019-10-22 13:09:47 -04:00
PikalaxALT 949a4c3b5d Document unk_8159F40 (pokedude battle party info) 2019-10-22 11:24:09 -04:00