Master #174
Closed
Master #174
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 5b170fd. Conflicts: src/emu/cpu/hmcs40/hmcs40.c
This reverts commit 4b68634.
This reverts commit 2e60c82.
This reverts commit 74454f7.
This reverts commit 39448d3.
Got what I could find from manual/test menus. Still a lot to finish.
This reverts commit 824419d.
Updated what I could from manuals. Changed the .lay to include most used/sensible layout. Can these be flagged as working? More to be done & figured out though...
|
Sorry about the foul up. Please ignore the first 8. |
|
Sorry, but you've screwed up this pull request again. Look at the preview under the "Files changed" tab on this page. It has all the crud from a conflicted merge gone badly wrong in the HMCS40 CPU core. |
|
I think you've somehow got your branch into a state where you'd be better off forcibly overwriting it with mainline MAME and doing the change again. |
|
Not sure why it won't let me close or remove those. I'll try that tomorrow. Sorry about the hassle. |
ICEknigh7
added a commit
to ICEknigh7/mame
that referenced
this pull request
Jun 8, 2022
- Balalín (type-in, MicroHobby mamedev#125) [Ignacio Prini] - Magnus Zone (type-in, MicroHobby mamedev#126) [Ignacio Prini] - Oráculo Egipcio (type-in, MicroHobby mamedev#127) [Ignacio Prini] - Demolition (type-in, MicroHobby mamedev#128) [Ignacio Prini] - Basket Trainer (type-in, MicroHobby mamedev#129) [Ignacio Prini] - Galaxy Fun (type-in, MicroHobby mamedev#130) [Ignacio Prini] - Micro Draw (type-in, MicroHobby mamedev#131, mamedev#132) [Ignacio Prini] - El Alambrista (type-in, MicroHobby mamedev#133) [Ignacio Prini] - Ranamirez (type-in, MicroHobby mamedev#134) [Ignacio Prini] - Fórmula Suicida (type-in, MicroHobby mamedev#135) [Ignacio Prini] - Phantasmas (type-in, MicroHobby mamedev#136) [Ignacio Prini] - Dardos (type-in, MicroHobby mamedev#137) [Ignacio Prini] - S.E.M.I.S.I.S. (type-in, MicroHobby mamedev#138, mamedev#139) [Ignacio Prini] - Alley's Gun (type-in, MicroHobby mamedev#140) [Ignacio Prini] - Kleingeld (type-in, MicroHobby mamedev#141, mamedev#142) [Ignacio Prini] - Caribe’s Day (type-in, MicroHobby mamedev#143) [Ignacio Prini] - Rally (type-in, MicroHobby mamedev#144) [Ignacio Prini] - La Profecía (type-in, MicroHobby mamedev#145) [Ignacio Prini] - Mine Alert (type-in, MicroHobby mamedev#146, mamedev#147) [Ignacio Prini] - Freddy (type-in, MicroHobby mamedev#148) [Ignacio Prini] - Russian's Attack (type-in, MicroHobby mamedev#149, mamedev#150) [Ignacio Prini] - En Ruta (type-in, MicroHobby mamedev#151) [Ignacio Prini] - Zinco (type-in, MicroHobby mamedev#152) [Ignacio Prini] - Ruffo’s Dream (type-in, MicroHobby mamedev#153) [Ignacio Prini] - Crozet (type-in, MicroHobby mamedev#154) [Ignacio Prini] - Rock Animation (type-in, MicroHobby mamedev#155) [Ignacio Prini] - Bunker (type-in, MicroHobby mamedev#156) [Ignacio Prini] - Telepuzzle (type-in, MicroHobby mamedev#157) [Ignacio Prini] - Golfo Pérsico (type-in, MicroHobby mamedev#158) [Ignacio Prini] - Mad Drivers (type-in, MicroHobby mamedev#159) [Ignacio Prini] - Bowling Star (type-in, MicroHobby mamedev#160) [Ignacio Prini] - Gas-Car (type-in, MicroHobby mamedev#161) [Ignacio Prini] - Ghost Like (type-in, MicroHobby mamedev#162) [Ignacio Prini] - Sky Invaders (type-in, MicroHobby mamedev#163) [Ignacio Prini] - Perico Jones (type-in, MicroHobby mamedev#164) [Ignacio Prini] - Brad Zotes (type-in, MicroHobby mamedev#165) [Ignacio Prini] - Striker (type-in, MicroHobby mamedev#166) [Ignacio Prini] - Indy (type-in, MicroHobby mamedev#167) [Ignacio Prini] - Topin (type-in, MicroHobby mamedev#168) [Ignacio Prini] - Starlike (type-in, MicroHobby mamedev#169) [Ignacio Prini] - Tres en Raya (type-in, MicroHobby mamedev#170) [Ignacio Prini] - Goteras (type-in, MicroHobby mamedev#171) [Ignacio Prini] - Parvision (type-in, MicroHobby mamedev#172) [Ignacio Prini] - Furax (type-in, MicroHobby mamedev#173) [Ignacio Prini] - Duck Shooting (type-in, MicroHobby mamedev#174) [Ignacio Prini] - Nomen Rosae (type-in, MicroHobby mamedev#175) [Ignacio Prini] - PunkyMan (type-in, MicroHobby mamedev#176) [Ignacio Prini] - El Retorno del Yedi (type-in, MicroHobby mamedev#177) [Ignacio Prini] - Sky Warrior (type-in, MicroHobby mamedev#178) [Ignacio Prini] - Reptkon (type-in, MicroHobby mamedev#179) [Ignacio Prini] - Intro (type-in, MicroHobby mamedev#180) [Ignacio Prini] - Keops (type-in, MicroHobby mamedev#181) [Ignacio Prini] - Sir Gawain (type-in, MicroHobby mamedev#182) [Ignacio Prini] - Snake (type-in, MicroHobby mamedev#183) [Ignacio Prini] - Microbowl (type-in, MicroHobby mamedev#184) [Ignacio Prini] - God Save the Punk (type-in, MicroHobby mamedev#185) [Ignacio Prini]
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
sigmab52.c updates