notwa/mm
1
0
Fork 0
mirror of https://github.com/notwa/mm synced 2024-05-18 05:23:22 -07:00
Code Issues Releases Wiki Activity
468 Commits 2 Branches 0 Tags 2.8 MiB
Commit Graph

372 Commits

Author SHA1 Message Date
Connor Olding d5c7097713 base spawn asms on one file 2015-12-18 23:46:30 -08:00
Connor Olding ce1d440bfb add OoT spawning 
the two asms will be partly merged once i have that ability
 2015-12-18 17:05:31 -08:00
Connor Olding 4e6f6a114b refactor inject as a function 2015-12-18 15:18:08 -08:00
Connor Olding faa95f6285 improve spawning 
add button hold delay and set actor variable to link's rotation
 2015-12-18 14:04:44 -08:00
Connor Olding 4dd384b62e more sophisticated spawning 2015-12-18 11:57:48 -08:00
Connor Olding 080bb9340d add barebones actor spawning asm 2015-12-18 10:00:15 -08:00
Connor Olding 9a2757d16d (attempt to) abide to calling conventions 
i haven't checked if i need double-word alignment
 2015-12-17 22:59:32 -08:00
Connor Olding 7c35d99a9f rename main.lua to be less misleading 2015-12-17 16:08:33 -08:00
Connor Olding e65ff9bae6 use new stack instructions 2015-12-17 08:52:48 -08:00
Connor Olding 54b0a63759 update lips 2015-12-17 08:52:34 -08:00
Connor Olding 9cd9381463 fix asm length calculation 2015-12-17 07:37:06 -08:00
Connor Olding 8a666f7dfc update lips 2015-12-17 07:28:30 -08:00
Connor Olding e29199c9e0 add asm injection scripts 2015-12-16 18:04:57 -08:00
Connor Olding c142d4df33 redo headers 2015-12-16 03:19:34 -08:00
Connor Olding 9af8b79ac2 add pt 2015-12-16 02:55:20 -08:00
Connor Olding 6bb341437b describe Lua scripts 2015-12-16 02:53:31 -08:00
Connor Olding b29bad17cc disable this until i bother writing a 5.3 bit op wrapper 2015-12-11 00:45:22 -08:00
Connor Olding bafaa7a1af update for new gui.text behaviour 2015-12-11 00:44:18 -08:00
Connor Olding a957617933 useless update 2015-12-11 00:43:39 -08:00
Connor Olding c450e7b535 fix actor lister 2015-12-11 00:41:57 -08:00
Connor Olding cfd57b391b Revert "Revert "update for new readbyterange behaviour"" 
This reverts commit adab471173.
 2015-12-11 00:38:50 -08:00
Connor Olding a087f2bff0 don't unpause the game if it wasn't already 2015-12-11 00:36:29 -08:00
Connor Olding 9ea38f25be add an observatory flag 2015-12-11 00:34:02 -08:00
Connor Olding fcbedca20f remove read-3/write-3 functions 2015-12-03 02:50:31 -08:00
Connor Olding b2817c9b5c implement m64p ROM reading and such 2015-12-03 02:06:18 -08:00
Connor Olding 90d30e218f support both bizhawk and m64p 2015-11-28 15:39:19 -08:00
Connor Olding fdbcc5d527 remove luanet crap 2015-11-27 21:37:48 -08:00
Connor Olding 44fdfdb684 basic mupen64plus support 2015-11-27 08:48:47 -08:00
Connor Olding 433a99cb43 misc monitor tweaks 2015-11-25 03:02:21 -08:00
Connor Olding 577d4a5b4f move assembler to https://github.com/notwa/lips 2015-11-22 13:40:01 -08:00
Connor Olding 7bd3e81713 ignore highest bit of .org directive 
are you *really* gonna be assembling files over 2GiB?
 2015-11-22 13:30:11 -08:00
Connor Olding 3cc511182a handle immediates in place of most offsets 2015-11-22 13:28:47 -08:00
Connor Olding 86ce3ea0d7 reimplement parsing; resolve defines after lexing 2015-11-22 12:30:55 -08:00
Connor Olding d808160d68 tokenize all at once (WIP) 2015-11-22 02:46:38 -08:00
Connor Olding 1b23db1a71 unfudge LI/LA a little 2015-11-22 00:24:28 -08:00
Connor Olding 5b35cc2155 use proper instruction type names 2015-11-22 00:09:54 -08:00
Connor Olding 9ec4d0f406 add reg# register aliases 2015-11-21 23:50:25 -08:00
Connor Olding cdeb4b0489 pseudo-instruction crap 2015-11-21 19:30:02 -08:00
Connor Olding f673308437 various 
fix jump and branch destinations.
note: branching is no longer compatible with CajeASM.

make LUI dumb: only use 'UPPER' with LI/LA.
note: this is very incompatible with CajeASM.
add LUUI pseudo-instruction to use 'UPPER' instead of 'LOWER'.

fix SUBI/SUBIU parsing.

fix LI for values under 0x10000.

pass filename through main().
tell Lexer our filename.
don't print filename in Dumper since it's irrelevant.
 2015-11-21 17:35:43 -08:00
Connor Olding 4a45b3c913 implement LI and LA 2015-11-21 15:36:54 -08:00
Connor Olding 5397085f01 various 
alias ZERO register to R0.
lex decimal numbers properly.
lex octal and negative numbers.
lex directives properly.
fix byte dumping.
fix UPPER behavior...?
 2015-11-21 15:04:30 -08:00
Connor Olding 39ffd10fff new dumper to support directives 
the old one could still have a place,
with its simplicity and speed.
also, screw versioning.
 2015-11-21 13:53:52 -08:00
Connor Olding 70827cd830 simplify size handling 2015-11-21 00:01:15 -08:00
Connor Olding 88b230d3c7 define formats in the instruction table 
this greatly reduces code bloat,
and made it easier to implement a few instructions.
everything is still very untested, however.
 2015-11-20 23:29:57 -08:00
Connor Olding 29de0e8d53 only specify one instruction list 2015-11-20 20:45:59 -08:00
Connor Olding 70e4d28442 add remaining fp instructions 2015-11-20 20:26:30 -08:00
Connor Olding bfcd75f5b6 add fp compare instructions 2015-11-20 19:36:52 -08:00
Connor Olding 05c3a18886 use filename in errors; fix JALR 2015-11-20 16:44:40 -08:00
Connor Olding 3b92aad4a0 set up as a proper module 2015-11-20 16:21:13 -08:00
Connor Olding cd8ea7b3d7 refactor to use classes; no hardcoded stuff 2015-11-20 15:27:22 -08:00
Connor Olding ebc9987a38 implement relative branches; fix register orders 2015-11-20 15:01:04 -08:00
Connor Olding cf413a7ab1 a little cleanup 2015-11-20 14:12:02 -08:00
Connor Olding 5822b592f1 add basic fp arithmetic 2015-11-20 14:00:02 -08:00
Connor Olding 301bfc99f8 add fpu registers and basic moves 2015-11-20 13:28:10 -08:00
Connor Olding 8407c4e016 recognize pseudo & fp instructions 
i hope this is all of them.
 2015-11-20 12:49:26 -08:00
Connor Olding c9671ef4b5 add semi-functional MIPS assembler 2015-11-20 11:53:09 -08:00
Connor Olding 0f59cdce5e race tweaks 2015-11-15 20:04:49 -08:00
Connor Olding 628bc7b49c add half-broken race file creator 2015-11-15 19:59:10 -08:00
Connor Olding eb73ba66b2 oot compat, basic timestop 2015-11-15 17:03:27 -08:00
Connor Olding 46280a4343 many many progress menu items 
looking to replace oneshot.lua
 2015-11-15 10:08:10 -08:00
Connor Olding f2839bb69c allow a single function for simple callbacks 2015-11-15 09:43:29 -08:00
Connor Olding f6d20caa4b OoT soft reset... kinda 2015-11-15 08:41:40 -08:00
Connor Olding b78b3567d0 use voidout type that works with OoT 2015-11-15 08:29:06 -08:00
Connor Olding 42493fd48c OoT "compatibility" 2015-11-15 08:05:33 -08:00
Connor Olding 8ed4aee8ce add necessary store/restore addrs for most versions 2015-11-15 07:13:57 -08:00
Connor Olding 1ccc4891be add more addresses across versions 2015-11-14 19:16:13 -08:00
Connor Olding a1babce6bb change L to Levitate to D-Up 
i know it's not as catchy :c
 2015-11-14 17:07:53 -08:00
Connor Olding 301acb98ea add any item any time cheat 2015-11-14 16:45:36 -08:00
Connor Olding 3f7e7a1a0d make L close menu in greedy mode 2015-11-14 16:42:50 -08:00
Connor Olding b169d1d11e implement greedy menu input handler 2015-11-14 16:30:04 -08:00
Connor Olding 2436eee982 alternate control scheme for menus 2015-11-14 14:59:37 -08:00
Connor Olding f0eac171f9 run menu handling while emu is paused 2015-11-14 13:46:04 -08:00
Connor Olding 454d59dcca typo 2015-11-14 13:25:48 -08:00
Connor Olding 20901442ba fixed soft reset 2015-11-14 11:22:41 -08:00
Connor Olding f45745d8b8 cleanup 2015-11-14 10:31:10 -08:00
Connor Olding 2bab9c7d27 use triforce transition if they aren't killed 2015-11-14 10:13:54 -08:00
Connor Olding 8792a100a5 add transition (fadein/fadeout) killer 
also took out soft reset since it's broken
 2015-11-14 09:20:36 -08:00
Connor Olding d7f18ed09b give days their names 2015-11-14 08:59:30 -08:00
Connor Olding bb2132a78f save scene & pos feature; serialize stored values 2015-11-14 08:57:37 -08:00
Connor Olding b392d2134f split most menus into files 2015-11-12 09:23:46 -08:00
Connor Olding 5590ffaa77 a few more known flags 2015-11-12 09:14:57 -08:00
Connor Olding 3ed1c091cd many more menus 2015-11-12 09:09:14 -08:00
Connor Olding adab471173 Revert "update for new readbyterange behaviour" 
This reverts commit 71f44db82e.
 2015-11-11 17:32:21 -08:00
Connor Olding 3342eb90d3 add map select (warp) menu 2015-11-10 05:59:03 -08:00
Connor Olding c082e4ee2f some deku king chamber flags 2015-10-27 17:55:12 -07:00
Connor Olding 71f44db82e update for new readbyterange behaviour 2015-10-27 17:54:52 -07:00
Connor Olding 35c853788f capitalization and such 2015-08-12 18:58:20 -07:00
Connor Olding e44eb31329 entrance names: the fixening 2015-08-12 18:36:34 -07:00
Connor Olding 0236ae8530 finish up exit dumper 2015-08-12 18:20:07 -07:00
Connor Olding 12b5e399fc fix up pirate room names 2015-08-12 17:58:14 -07:00
Connor Olding 31d4641bbe fix up entrance names a bit 2015-08-12 01:49:22 -07:00
Connor Olding 0b9d5ccb83 write dumper for all exit values 2015-08-12 01:35:56 -07:00
Connor Olding d4c612bc15 apparently this flag was set at some point 2015-08-12 01:35:10 -07:00
Connor Olding 61c71376c7 add some camera variables 2015-08-12 01:34:56 -07:00
Connor Olding 0fd6015fde lemon-scented cleanup 2015-07-23 15:23:29 -07:00
Connor Olding 727c74e6aa rough exit calculator, scene/entrance names 2015-07-22 23:00:27 -07:00
Connor Olding 7b147f9653 warn about printf truncation 2015-07-22 22:51:31 -07:00
Connor Olding c77eea55d1 addresses (active_sword -> sword_active) 2015-05-27 22:22:48 -07:00
Connor Olding 75446a692b many more MM addresses 2015-05-26 21:29:42 -07:00
Connor Olding 6dec3657a7 reverse order of messages 2015-05-26 11:02:58 -07:00
Connor Olding b6b224f580 use radio buttons for MM transformations 2015-05-26 10:44:34 -07:00
Connor Olding 307e3ac751 refactor "A" boilerplate 
less memory. maybe faster?
 2015-05-26 10:22:18 -07:00
Connor Olding e6ad4d05d8 abstract brush again, update titles 2015-05-26 08:43:23 -07:00
Connor Olding e75a9be4e3 working back/close buttons 2015-05-26 08:33:14 -07:00
Connor Olding 4c00f0b3fb abstract menu handling, make Text unselectable 2015-05-26 08:15:36 -07:00
Connor Olding 8395f3dc78 radio buttons! 2015-05-26 07:01:37 -07:00
Connor Olding b05b3621fb Play As submenu 2015-05-26 06:40:47 -07:00
Connor Olding 86173f3014 misc monitor for oot 2015-05-26 01:26:42 -07:00
Connor Olding abb05dc67e more (all?) magic addrs for oot 2015-05-26 01:18:49 -07:00
Connor Olding dc6b205d35 better name for magic field 2015-05-26 01:17:38 -07:00
Connor Olding 02af8b23f2 misc monitor for everything else 2015-05-26 00:40:12 -07:00
Connor Olding d306362f16 proper great spin and double magic 2015-05-26 00:37:06 -07:00
Connor Olding 3ff9b9289b convenience function 2015-05-25 22:17:43 -07:00
Connor Olding 19a0e65352 room stuff for oot; fixes 2015-05-25 22:17:37 -07:00
Connor Olding 464ef93b8f have some broken code 2015-05-25 21:24:29 -07:00
Connor Olding e6240fb72c add crappy old scene flag monitor 2015-05-25 20:25:30 -07:00
Connor Olding 6d0bf9dbe3 speed up printing 2015-05-25 20:22:47 -07:00
Connor Olding 637abc3684 one class per file 
...mostly
 2015-05-25 20:10:00 -07:00
Connor Olding 8701a54159 explicitly require boilerplate for A 
at some point this should be resolved in the addrs module
 2015-05-25 19:22:47 -07:00
Connor Olding 0149f3705b movement test "works" now on oot 2015-05-25 19:21:35 -07:00
Connor Olding 907e5dcd93 move up debug-watching variables 2015-05-25 19:20:42 -07:00
Connor Olding 28a2f9a059 show uncertain flags differently when set 2015-05-24 23:49:22 -07:00
Connor Olding 58fb468850 flags still 2015-05-24 07:18:31 -07:00
Connor Olding c1106f52de function to set all unknown flags 2015-05-24 06:25:22 -07:00
Connor Olding 996498b3bb flags added by hand (maybe errors!) 2015-05-24 06:23:32 -07:00
Connor Olding 3bbca2b221 flag wiping function; clean up flag addrs 2015-05-24 03:20:24 -07:00
Connor Olding 7b8c2fff87 getting things up to speed 2015-05-24 03:19:32 -07:00
Connor Olding 8774a3a5b3 debugging crap 2015-05-15 21:55:11 -07:00
Connor Olding f665b210d5 more work on actors 2015-05-15 21:52:44 -07:00
Connor Olding d958938234 more actor addresses, many unknowns 2015-05-15 20:20:37 -07:00
Connor Olding c142f4558c refactor to one loop for both games 2015-05-14 21:32:46 -07:00
Connor Olding 5f2babaef4 great fairy-related flags 2015-05-14 21:30:13 -07:00
Connor Olding 372a549f81 data 
finishing up side quests and such
 2015-05-14 13:50:00 -07:00
Connor Olding f1602b1ab2 defer printing to reduce lag 2015-05-14 01:14:52 -07:00
Connor Olding 9b6c63df2d prevent multiple focus 2015-05-14 00:58:23 -07:00
Connor Olding 391c51575c flag dumping 2015-05-14 00:50:47 -07:00
Connor Olding 9dc97426c7 another data bump 
beat OoT mostly legitimately
 2015-05-13 22:22:47 -07:00
Connor Olding 92f5583a2d gotta go fast 2015-05-13 11:16:02 -07:00
Connor Olding c234d67c06 more data 2015-05-13 11:15:49 -07:00
Connor Olding aaaa16a7c5 juggle some files around 2015-05-10 15:17:26 -07:00
Connor Olding 74164a2897 reduce globals, more refactoring 2015-05-10 15:01:51 -07:00
Connor Olding 914c3575fa split some files, begin refactor 2015-05-10 14:45:51 -07:00
Connor Olding 454233566d typo 2015-05-10 14:36:42 -07:00
Connor Olding e163532059 update data 2015-05-10 14:36:32 -07:00
Connor Olding afbf5fdc88 find some link actor addrs 2015-05-10 14:26:24 -07:00
Connor Olding 0e759ce1fa fix actor wiping on load state 2015-05-10 11:30:45 -07:00
Connor Olding 897b1a7b11 monitor unknown section of MM save data 2015-05-07 15:29:21 -07:00
Connor Olding 41980657cd various serialized files 2015-05-07 15:28:35 -07:00
Connor Olding aab7950976 extend flag monitoring to OoT 2015-05-07 15:27:50 -07:00
Connor Olding 5c76e9466a a dumb frame-based message renderer 2015-05-07 15:27:26 -07:00
Connor Olding 9dabf504d4 complete rewrite of cheat menu 2015-05-03 16:46:09 -07:00
Connor Olding 4c363dae6f clean up redundant tonumber() 2015-05-03 12:25:18 -07:00
Connor Olding 96bad6dbfd move save/loading to Monitor 2015-05-03 10:37:45 -07:00
Connor Olding daae4d4bd1 remember seen event flags 2015-05-03 10:00:49 -07:00
Connor Olding 84fef6ed4f reverse serialize's arguments 2015-05-03 08:35:50 -07:00
Connor Olding f553f837e2 a good commit message 2015-05-02 11:22:12 -07:00
Connor Olding 28f9ae6fff basic actor flag handling 2015-05-02 06:35:15 -07:00
Connor Olding 9bc0df3033 big refactor 2015-05-01 20:36:02 -07:00
Connor Olding d098b237f1 update animation watcher for oot 
not that it needs it
 2015-05-01 13:34:23 -07:00
Connor Olding 736804be40 tweaks 2015-05-01 11:48:49 -07:00
Connor Olding 6c89f9306b dump ordered tables to be git-friendly 2015-05-01 11:29:43 -07:00
Connor Olding 013b4d015a get older scripts up to speed; refactor 2015-05-01 11:15:53 -07:00
Connor Olding b29e57b57a move data files to subdirectory 2015-05-01 09:59:16 -07:00
Connor Olding 1ecb9cb382 get smart (small fixes) 2015-05-01 09:37:56 -07:00
Connor Olding fee7a6f2e2 Monitor class; class inheritance 2015-05-01 08:40:32 -07:00
Connor Olding 2c75c55dc3 off by one 2015-05-01 08:20:52 -07:00
Connor Olding 46b42a0421 remember modified values (add serialization) 2015-05-01 08:20:04 -07:00
Connor Olding ee5b7122ff debug memory editor monitoring thing 2015-05-01 06:16:44 -07:00
Connor Olding 306756573b mask_mask_bit address for US10 2015-05-01 06:16:38 -07:00
Connor Olding 671d7b4dee make event flag addrs generic 2015-04-26 00:18:33 -07:00
Connor Olding 30dff10c7e abstract to FlagMonitor class 2015-04-25 23:54:04 -07:00
Connor Olding 8d45fa0f42 more flags to ignore 2015-04-25 23:23:41 -07:00
Connor Olding 9ae0b7acc1 event flag monitor 2015-04-22 16:51:27 -07:00
Connor Olding cc11fc95a3 tweeks i did weaks ago 2015-04-15 22:39:36 -07:00
Connor Olding eed7ebda55 couple more name fixes 2015-03-27 02:50:13 -07:00
Connor Olding 7760598432 handle string formatting in T 2015-03-27 02:41:27 -07:00
Connor Olding aafdcfae69 a little refactoring 2015-03-27 02:32:23 -07:00
Connor Olding c64292bc29 iterate and count by pointers, validation 2015-03-27 01:59:40 -07:00
Connor Olding 95c746b3c9 fix a couple names 2015-03-26 23:54:23 -07:00
Connor Olding 1dbebeae84 correction 2015-03-26 20:24:21 -07:00
Connor Olding 429ef4af89 count scene setups 2015-03-26 17:01:19 -07:00
Connor Olding 72f4095761 show info on current Z-target 2015-03-26 16:48:29 -07:00
Connor Olding d83517d31b pointer boilerplate 
this also fixes a subtle bug with Z targets,
since `(not 0) == false` in Lua
 2015-03-26 16:36:44 -07:00
Connor Olding 9a57ee1975 more boilerplate 2015-03-26 07:27:36 -07:00
Connor Olding c772b03fdf sdfgsdgfdsfg 2015-03-26 07:27:30 -07:00
Connor Olding bbf1c042f0 i am out of it 2015-03-26 07:18:20 -07:00
Connor Olding 640d515a6e forgot one 2015-03-26 07:16:11 -07:00
Connor Olding b9ae991830 rework numbered addresses 2015-03-26 07:12:56 -07:00
Connor Olding 8afa6bd527 more common addresses 2015-03-26 06:56:27 -07:00
Connor Olding 5a3113af49 tiny fixes 2015-03-25 16:31:49 -07:00
Connor Olding fb9ff50c70 bad end 2015-03-25 11:27:38 -07:00
Connor Olding 3f397ea904 clean up object names a bit 2015-03-25 11:12:38 -07:00
Connor Olding d8c608899d implement alt headers; dump actors/objects 2015-03-25 10:27:18 -07:00
Connor Olding 1d1b237e19 differentiate Goron actors 2015-03-24 18:52:34 -07:00
Connor Olding 77192b3c71 find basic addresses for all ROMs 2015-03-23 20:41:46 -07:00
Connor Olding abc4555912 upgrades work the same in OoT and MM 2015-03-23 01:54:35 -07:00
Connor Olding 304790bd7e refactor addresses, tuck away in folder 2015-03-20 19:46:08 -07:00
Connor Olding 3b7c7ffcd6 refactor oneshot; merge oot 2015-03-20 17:39:55 -07:00
Connor Olding a12d1683a4 more work on actor names 2015-03-20 17:07:47 -07:00
Connor Olding 14dba9d59f highlight new actors; fix reversing 2015-03-19 01:23:50 -07:00