Commit Graph

393 Commits

Author SHA1 Message Date
obskyr d4bb6b990a Merge branch 'master' of https://github.com/pret/pokegold-spaceworld 2018-07-07 03:49:57 +02:00
obskyr d3f356a1dc Symfile for corrected ROM; rename zero_checksum.inc 2018-07-07 03:49:30 +02:00
luckytyphlosion f3f0e711bf Fix uncaught build errors. 2018-07-03 14:10:28 -04:00
luckytyphlosion 9824a57620 Merge branch 'master' of https://github.com/pret/pokegold-spaceworld 2018-07-03 13:37:21 -04:00
luckytyphlosion 75e4f78492 Merge branch 'master' of https://github.com/luckytyphlosion/pokegold-spaceworld 2018-07-03 13:36:50 -04:00
luckytyphlosion a655783735 Add .pic as binary. 2018-07-03 13:28:18 -04:00
luckytyphlosion 870d85fc27 Merge branch 'master' of https://github.com/pret/pokegold-spaceworld 2018-07-03 13:27:51 -04:00
obskyr 3fab27f221 Yet a few more formatting fixes 2018-07-03 05:07:59 +02:00
obskyr e596d41c17 A few small formatting fixes 2018-07-03 04:59:38 +02:00
obskyr 382fd4b50e Merge branch 'collisions-movements' of https://github.com/Pokeglitch/pokegold-spaceworld into master
And that's the last of the manual merges for now! Hooray!
2018-07-03 04:50:33 +02:00
obskyr d26c5f6937 Merge branch 'mid-kid-master' 2018-07-03 04:27:39 +02:00
obskyr 9ee9fe5c8f Merge branch 'master' of https://github.com/mid-kid/pokegold-spaceworld into master
Once again, manually. Hoo boy.
2018-07-03 04:27:25 +02:00
obskyr 5a8a294140 Merge branch 'master' of https://github.com/2Tie/pokegold-spaceworld into master
Long overdue!
2018-07-03 03:29:47 +02:00
luckytyphlosion 264748172d Add .gitattributes. 2018-06-29 13:16:00 -04:00
Pokeglitch 2dfc7fc635 Moved CollisionTypeTable to separate file 2018-06-25 22:55:48 -04:00
Pokeglitch 3c966f7df4 Disassembled all routines related to sprite movement/collisions. Added in constants 2018-06-25 22:43:31 -04:00
2Tie f3de47a1d5 fixed the 3-dot leaders at SatoMew's request 2018-06-24 17:01:24 -06:00
2Tie 3d44a33494 all the non-dummy map scripts until Silent Hill are disassebled. five left! 2018-06-24 16:43:11 -06:00
Tauwasser 906ea8bdfc engine: disassemble player movement (WIP)
Signed-off-by: Tauwasser <Tauwasser@tauwasser.eu>
2018-06-24 23:15:07 +02:00
Tauwasser 57481cc942 home/copy2: rename Function0d02 to RedrawPlayerSprite
Signed-off-by: Tauwasser <Tauwasser@tauwasser.eu>
2018-06-24 23:10:16 +02:00
Tauwasser 147d0964d8 hram: rename hTextErrno to hEventID
Signed-off-by: Tauwasser <Tauwasser@tauwasser.eu>
2018-06-24 23:09:15 +02:00
2Tie 0369ef51b4 split the oak speeches and game setup into two files 2018-06-23 10:19:49 -06:00
pfero 67388aeeda Disassemble all map attributes 2018-06-23 14:25:46 +02:00
IIMarckus d65cb5004e Extract a little more from Oak's speech. 2018-06-23 05:15:40 -06:00
IIMarckus 6ecb818d5f Disassemble Oak's speech. 2018-06-23 04:52:34 -06:00
IIMarckus d3bd2fe6e5 Disassemble main menu selection logic. 2018-06-23 03:38:29 -06:00
pfero 368f929da2 Fix landmark constants 2018-06-22 17:18:23 +02:00
2Tie 26edac4db6 additional menu data tidying up/figuring out 2018-06-19 12:48:42 -06:00
2Tie beae22ccbd spoilers: it wasn't 2018-06-18 23:25:39 -06:00
2Tie 2f0b152e5a this is how you fix conflicts, right? 2018-06-18 22:53:06 -06:00
2Tie b44077ed31 this was a silly mistake 2018-06-18 22:36:17 -06:00
2Tie 753cec9bd6 forgot to save this change, oops 2018-06-18 22:17:42 -06:00
2Tie a1d5ddac4c more bank 1 disasm 2018-06-18 22:15:42 -06:00
2Tie 0a2d5a66cd more disassembly in bank 1 2018-06-18 19:37:04 -06:00
Pokeglitch 61f84aa254 Merge pull request #22 from Pokeglitch/master
More Bank 03 Routines
2018-06-18 21:32:52 -04:00
Pokeglitch a6c1d2d458 Merge branch 'master' into master 2018-06-18 21:29:19 -04:00
obskyr f25d7c2299 Merge pull request #24 from obskyr/includes-touchup
Touch up scan_includes.py for versatility
2018-06-18 20:27:04 +02:00
obskyr 0f034bfbc1 Touch up scan_includes for versatility
Along with a label fix...?
2018-06-18 20:24:52 +02:00
obskyr 3ac4eb121f Merge pull request #23 from obskyr/build-nicely
Fix makefile dependencies and make_shim.py
2018-06-18 18:24:19 +02:00
obskyr d6f9ff5cf7 Fix and use make_shim.py 2018-06-18 18:18:46 +02:00
obskyr 0cd5e3d610 Calculate dependencies more reliably
Until now, dependencies weren't correct on first run or if you'd added includes since last compile.
2018-06-18 15:45:28 +02:00
Pokeglitch e7af9f4f5a added newline at end of some files 2018-06-18 09:01:29 -04:00
Pokeglitch 966b29e811 Removed SCRIPT_FINISHED constant, it was misleading 2018-06-18 09:00:51 -04:00
Pokeglitch f7ec78851c Forgot to add changes to previous commit. 2018-06-18 08:45:05 -04:00
Pokeglitch 12823eea3e Added in macros for scripts, queue 2018-06-18 08:41:39 -04:00
2Tie c557bd6613 main menu progress for the day, still have a bunch more to go. 2018-06-17 23:04:49 -06:00
2Tie b095e62630 some more tidying up 2018-06-17 11:16:28 -06:00
Pokeglitch a9ae89792c Renamed overworld.asm to field_moves.asm 2018-06-17 08:26:23 -04:00
Pokeglitch f00dbc8015 Added some constants, removed todos for overworld.asm 2018-06-17 08:23:27 -04:00
Pokeglitch d0e5e20dfe Merge remote-tracking branch 'upstream/master' 2018-06-17 07:41:17 -04:00