dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity
1,412 Commits 4 Branches 0 Tags
4a4a10a990fe2fa29a4c4470de31337ed42f280e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DizzyEggg bcffcb0c1c pokeblock merge conflicts 2017-12-21 23:12:36 +01:00
DizzyEggg 78f35494a3 fix trainer see pr 2017-12-21 17:51:48 +01:00
DizzyEggg b4b3fe04ee pr dump review changes 2017-12-20 17:24:37 +01:00
DizzyEggg 8380fc63dc Merge branch 'master' into kobold_fixes 2017-12-20 17:22:25 +01:00
DizzyEggg 504363f2a6 Merge branch 'master' into decompile_trainer_see 2017-12-20 17:21:46 +01:00
DizzyEggg df479661ff pokeblock review changes 2017-12-20 17:20:41 +01:00
DizzyEggg b615af4184 fix pokeblock merge conflicts 2017-12-20 17:16:56 +01:00
DizzyEggg 38af0f78ea hopefully fix kobold PR 2017-12-19 20:52:52 +01:00
DizzyEggg 37a6e1b6c7 Merge branch 'master' of https://github.com/itskobold/pokeemerald into kobold_fixes 2017-12-19 20:09:28 +01:00
DizzyEggg 4949411f3e make battle bg compile 2017-12-19 17:41:05 +01:00
DizzyEggg 7581218569 Merge branch 'master' into decompile_battle1 2017-12-19 17:37:53 +01:00
DizzyEggg 4abc2eea8a ram vars to C files 2017-12-19 17:33:07 +01:00
DizzyEggg b7a2335347 clean up trainer see file 2017-12-19 17:18:44 +01:00
DizzyEggg 5744356989 decompile trainer see 2017-12-18 23:26:44 +01:00
DizzyEggg a612ef12a0 start working on trainer see 2017-12-18 19:35:50 +01:00
DizzyEggg cb229f56e8 fix pokeblock conflicts 2017-12-18 16:58:14 +01:00
DizzyEggg 314b96af46 static names given s prefix 2017-12-17 23:45:27 +01:00
DizzyEggg 720bd555bc add constants trainers file 2017-12-17 21:19:08 +01:00
DizzyEggg 54dccc8512 give batter script command names 2017-12-17 20:38:01 +01:00
DizzyEggg 7517f6a030 fix battle setup conflicts 2017-12-17 20:26:13 +01:00
DizzyEggg 46fa2557d7 merge mail with master, fix conflicts 2017-12-17 20:22:56 +01:00
DizzyEggg eb8055eb07 battle 1 is decompiled 2017-12-17 20:10:57 +01:00
DizzyEggg c3abe2863f rename 2017-12-16 15:12:55 +01:00
DizzyEggg 5b409d49ed pokeblock.s is decompiled 2017-12-16 15:10:29 +01:00
DizzyEggg f4ab21ee67 Merge branch 'master' into decompile_use_pokeblock 2017-12-16 11:42:59 +01:00
DizzyEggg 930fea6fad mail review changes 2017-12-16 01:18:31 +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
DizzyEggg 4351676749 decompile more of pokeblock.s 2017-12-16 00:08:23 +01:00
DizzyEggg 8ac17e0948 move data from asm to pokeblock.c 2017-12-11 16:52:28 +01:00
DizzyEggg b4d10ab7ab split pokeblock files 2017-12-10 19:02:51 +01:00
DizzyEggg 37ae6a7758 move more pokeblock data to C and label 2017-12-10 16:38:27 +01:00
DizzyEggg fb30acbc30 pokeblock feed is decompiled 2017-12-10 15:04:03 +01:00
DizzyEggg bb1ae5f857 Merge branch 'master' into decompile_use_pokeblock 2017-12-09 21:24:47 +01:00
DizzyEggg 6561b62986 start pokeblock feed 2017-12-09 21:23:40 +01:00
DizzyEggg ddcf52bcae get rid of ball pal files 2017-12-04 23:22:48 +01:00
DizzyEggg ad07843f2d start working on use pokeblock 2017-12-04 23:09:44 +01:00
DizzyEggg 4faa442d5a decompile and label mail 2017-12-03 19:19:11 +01: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 ce6e97fa0b sprite data fields to array 2017-12-02 21:44:50 +01:00
DizzyEggg 2fe25da65a move pokeball data to rom 2017-12-02 21:27:00 +01:00
DizzyEggg c2fdde3a49 pokeball file is decompiled 2017-12-02 20:38:26 +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 273474d57a give names to some battlescripts 2017-12-02 00:03:46 +01:00
DizzyEggg 039c9f4bd8 merge with master 2017-12-01 21:27:29 +01:00
DizzyEggg 646664ff29 battle setup file is decompiled 2017-12-01 21:25:13 +01:00
DizzyEggg e8ecb01ab2 more work on battle setup 2017-11-29 19:54:15 +01:00
DizzyEggg 10470ef536 start working on battle setup 2017-11-28 23:02:09 +01:00
DizzyEggg 7275585d56 its flavour, not flavor 2017-11-27 21:54:15 +01:00
DizzyEggg 7144b3b7af fix flavour flavor not building, fuccing americans 2017-11-27 21:24:34 +01:00
DizzyEggg 237261e193 berry blender review changes 2017-11-27 20:03:41 +01:00
DizzyEggg 77a6c30bd4 make various macros 2017-11-26 21:04:00 +01:00
DizzyEggg b0657350a4 berry blender fix merge conflicts 2017-11-26 19:21:51 +01:00
DizzyEggg d48392e677 change battle variables names 2017-11-26 18:07:00 +01:00
DizzyEggg 59f64c622b name more battlescripts 2017-11-26 17:26:11 +01:00
DizzyEggg 1bb5b1fd07 more battle labels 2017-11-26 17:15:28 +01:00
DizzyEggg 8c30c42c36 more labelling and changes 2017-11-26 14:17:02 +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 938d346b6d fixes and labels 2017-11-26 01:19:57 +01:00
DizzyEggg 76f4a8b195 clean up and use names for printfromtable 2017-11-26 00:33:40 +01:00
DizzyEggg 847bfa1540 add more battlescript macros 2017-11-25 21:32:17 +01:00
DizzyEggg fe658cc2fd create setword macro 2017-11-25 21:11:20 +01:00
DizzyEggg 9151a6d094 dump battlescripts, rename battlescripts 2017-11-25 18:42:31 +01:00
DizzyEggg 4e25ef10f2 wild encounter review changes 2017-11-20 16:40:02 +01:00
DizzyEggg ad3a97e178 berry blender merge conflicts 2017-11-19 22:58:13 +01:00
DizzyEggg a3b5af17ea berry blender is done 2017-11-19 22:48:46 +01:00
DizzyEggg 3de416662b wild encounter, fix merge conflicts 2017-11-18 21:45:52 +01:00
DizzyEggg 185402fe21 more work on berry blender 2017-11-18 21:38:57 +01:00
DizzyEggg 8fd3081306 start working on berry blender 2017-11-18 16:11:34 +01:00
DizzyEggg f8b40754c7 wild encounter done 2017-11-18 12:27:10 +01:00
DizzyEggg ca43536242 make recorded battle compile 2017-11-17 22:33:36 +01:00
DizzyEggg 6b075ae0ff wild encounter file is decompiled 2017-11-17 22:28:55 +01:00
DizzyEggg d0245cf8d2 recorded battle merge conflicts fix 2017-11-17 19:34:55 +01:00
DizzyEggg 1b7246395d merge conflicts, review changes, daycare 2017-11-17 19:31:03 +01:00
DizzyEggg a2a17bba92 more work on wild encounter 2017-11-17 17:50:07 +01:00
DizzyEggg b37d8c0821 start decompiling wild encounter 2017-11-16 20:38:10 +01:00
DizzyEggg ba00a1c688 daycare file fully done 2017-11-15 22:12:18 +01:00
DizzyEggg 616edd6c3f daycare file is decompiled 2017-11-15 20:08:31 +01:00
DizzyEggg 1e79d53d2f merge daycare with master 2017-11-15 17:18:05 +01:00
DizzyEggg 6e2b1d4315 starter choose sym bss space to align 2017-11-14 23:27:22 +01:00
DizzyEggg 0310be3007 more of daycare done 2017-11-14 23:25:07 +01:00
DizzyEggg 95949c772e more of daycare done 2017-11-14 21:43:23 +01:00
DizzyEggg a972de7bca start working on daycare 2017-11-14 20:23:25 +01:00
DizzyEggg 048dc4aa28 fix graphics rules file 2017-11-13 22:10:25 +01:00
DizzyEggg 8a56532d35 fix graphics rules file 2017-11-13 22:08:50 +01:00
DizzyEggg 5c44c64050 add hof graphics 2017-11-13 21:55:38 +01:00
DizzyEggg 516a5b2219 fix merge conflicts, review changes 2017-11-13 20:00:20 +01:00
DizzyEggg ea575ee217 fix typo in a string 2017-11-13 19:42:03 +01:00
DizzyEggg 4d615350c8 added berry blender start gfx 2017-11-13 19:36:23 +01:00
DizzyEggg 3e1f3d0e1e recorded battle file is decompiled 2017-11-13 19:01:23 +01:00
DizzyEggg bb9c928330 starter choose review changes 2017-11-13 18:30:17 +01:00
DizzyEggg ac68187895 review changes adding a pal file 2017-11-13 18:18:12 +01:00
DizzyEggg 209b6eb467 more of recorded battle done 2017-11-13 18:07:23 +01:00
DizzyEggg 8ceea171b3 leave out pss for now 2017-11-13 00:15:07 +01:00
DizzyEggg 3b43668286 more recorded battle done 2017-11-13 00:10:34 +01:00
DizzyEggg c4674735d2 start working on recorded battle 2017-11-12 22:59:36 +01:00
DizzyEggg c967ba1d5f dump couple of baseroms review changes 2017-11-12 18:41:04 +01:00