Merge pull request from iimarckus/decimal1

Decimal1
This commit is contained in:
Bryan Bishop 2012-07-08 23:25:49 -07:00
commit 0c3ba03d37
4 changed files with 3299 additions and 2050 deletions

View File

@ -2969,3 +2969,11 @@ MR_POKEMONS_HOUSE_HEIGHT EQU 4
MR_POKEMONS_HOUSE_WIDTH EQU 4
ROUTE_31_VIOLET_GATE_HEIGHT EQU 4
ROUTE_31_VIOLET_GATE_WIDTH EQU 5
; the menu items at the beginning of the game
CONTINUE EQU 0
NEW_GAME EQU 1
OPTION EQU 2
MYSTERY_GIFT EQU 3
MOBILE EQU 4
MOBILE_STUDIUM EQU 5

View File

@ -164,7 +164,7 @@ temp_opt_table = [
[ "INC L", 0x2c, 0 ],
[ "INC SP", 0x33, 0 ],
[ "JP C, ?", 0xda, 2 ],
[ "JP HL", 0xe9, 0 ],
[ "JP [HL]", 0xe9, 0 ],
[ "JP NC, ?", 0xd2, 2 ],
[ "JP NZ, ?", 0xc2, 2 ],
[ "JP Z, ?", 0xca, 2 ],

5338
main.asm

File diff suppressed because it is too large Load Diff

View File

@ -272,6 +272,7 @@ chars = {
"&": 0xE9,
"é": 0xEA,
"": 0xEB,
"": 0xED,
"": 0xEF,
"¥": 0xF0,
"×": 0xF1,