Commit Graph

157 Commits

Author SHA1 Message Date
camthesaxman b4bb562363 rename battle_2.c to battle_main.c 2018-01-16 16:15:02 -06:00
camthesaxman c3c13d0acf more renaming 2018-01-16 15:12:38 -06:00
camthesaxman 157b88b6db identity -> position 2018-01-16 14:01:31 -06:00
DizzyEggg 4f950d698c dump battle animation scripts 2017-12-31 16:28:57 +01:00
DizzyEggg 7581218569 Merge branch 'master' into decompile_battle1 2017-12-19 17:37:53 +01:00
DizzyEggg 720bd555bc add constants trainers file 2017-12-17 21:19:08 +01:00
DizzyEggg eb8055eb07 battle 1 is decompiled 2017-12-17 20:10:57 +01:00
DizzyEggg bb82032208 battle setup review changes 2017-12-16 01:15:19 +01:00
DizzyEggg 44abbae60b nerge with master, fix conflicts 2017-12-16 01:08:55 +01:00
Cameron Hall fd75493bc6 Merge pull request #129 from DizzyEggg/dumb_naming
Name some battle labels
2017-12-05 12:05:06 -06:00
DizzyEggg 790df7159e more battlescript labels 2017-12-03 00:47:21 +01:00
DizzyEggg e10aea9a51 give some more labels to battle struct fields 2017-12-02 23:31:58 +01:00
DizzyEggg c27f7a8131 start working on pokeball 2017-12-02 19:39:07 +01:00
DizzyEggg d75e7ace1d label battle stuff 2017-12-02 14:08:55 +01:00
DizzyEggg 039c9f4bd8 merge with master 2017-12-01 21:27:29 +01:00
PikalaxALT 921011592c unsigned -> unsigned int; create header 2017-11-29 08:30:18 -05:00
DizzyEggg 10470ef536 start working on battle setup 2017-11-28 23:02:09 +01:00
DizzyEggg 9886eeb5d8 fix, rename, label battle labels and battlescripts 2017-11-26 13:26:58 +01:00
DizzyEggg cc572f7c00 clear battle code and battlescripts 2017-11-26 11:55:17 +01:00
DizzyEggg 76f4a8b195 clean up and use names for printfromtable 2017-11-26 00:33:40 +01:00
DizzyEggg 9151a6d094 dump battlescripts, rename battlescripts 2017-11-25 18:42:31 +01:00
DizzyEggg 716590c165 one more battle label change 2017-11-12 17:11:06 +01:00
DizzyEggg 9febe24d9f label some battle struct fields 2017-11-12 17:06:31 +01:00
DizzyEggg cd879d6f8a Merge branch 'battle4_fixes' into decompile_battle5 2017-11-12 16:46:44 +01:00
DizzyEggg 47a8c6c432 battle5 decompiled and renamed 2017-11-12 16:39:21 +01:00
DizzyEggg b7fa10d01e Merge branch 'master' into battle4_fixes 2017-11-12 00:17:38 +01:00
DizzyEggg 7472d639cf match one function in battlescript cmds 2017-11-11 20:01:04 +01:00
DizzyEggg 352102a07a Merge branch 'master' into decompile_battle_7 2017-11-04 16:12:45 +01:00
DizzyEggg 6c8155074b battle 7 is decompiled 2017-11-04 16:11:13 +01:00
DizzyEggg 5243285ab2 start working on battle 7 2017-11-02 18:19:49 +01:00
PikalaxALT 17fd3bccf7 Merge branch 'master' into secret_base 2017-11-01 23:39:54 -04:00
DizzyEggg 6cb1c4fd6e fix merge conflicts, evo scene 2017-10-31 19:36:25 +01:00
DizzyEggg 712ae56167 review change battle controllers 2017-10-31 18:04:08 +01:00
DizzyEggg e8903fb4dd start workin on evo scene 2017-10-27 18:52:21 +02:00
PikalaxALT fcaccb8501 through sub_80EA30C 2017-10-26 22:49:51 -04:00
DizzyEggg 1506184465 battle controller opponent is done 2017-10-26 23:12:48 +02:00
DizzyEggg 3ece244246 wally controller is done 2017-10-24 21:45:41 +02:00
DizzyEggg bffcd426cf link opponent controller is done 2017-10-24 15:25:20 +02:00
DizzyEggg 356eb34e32 undo revert 2017-10-23 14:40:22 +02:00
DizzyEggg 5b70307962 revert merge coz its bugged 2017-10-23 13:36:55 +02:00
DizzyEggg 7d1373e3fa Merge branch 'master' into decompile_battle_controllers 2017-10-23 13:33:32 +02:00
Diegoisawesome 88230e8d16 Merge pull request #91 from golemgalvanize/summary
partially decompile pokemon_summary_screen
2017-10-22 20:16:16 -05:00
DizzyEggg 26c79313d8 safari controller is done 2017-10-22 20:38:23 +02:00
DizzyEggg df4e32a307 player battle controller is done 2017-10-22 18:43:15 +02:00
DizzyEggg 813b1bfd4a label and do more work at player controller 2017-10-22 01:04:02 +02:00
DizzyEggg 3d1c16523e start working on battle controllers, especially player 2017-10-21 17:32:35 +02:00
DizzyEggg b65da491a9 merge with master, fix conflicts 2017-10-20 10:49:21 +02:00
DizzyEggg 36035518dc review battle anim changes 2017-10-20 00:01:17 +02:00
DizzyEggg dee6133076 fix merge conflicts 2017-10-19 19:46:37 +02:00
DizzyEggg 11bead31e9 battle interface is done 2017-10-19 15:28:41 +02:00