diff options
| author | IIMarckus <iimarckus@gmail.com> | 2016-04-11 09:12:32 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2016-04-11 09:12:32 -0600 |
| commit | 62b244899c74560e8614da7a3c831325c9fbc914 (patch) | |
| tree | 59e91df88d79fadb9dd1fa07f01d51ae1c441d4c | |
| parent | 803b574928e8849599a807bd2becd0a0284ad475 (diff) | |
Add Time Capsule item exceptions.
| -rw-r--r-- | stadiumgs/constants/item_constants.s | 11 | ||||
| -rw-r--r-- | stadiumgs/main.s | 22 |
2 files changed, 32 insertions, 1 deletions
diff --git a/stadiumgs/constants/item_constants.s b/stadiumgs/constants/item_constants.s index 325febb..f1ca2ba 100644 --- a/stadiumgs/constants/item_constants.s +++ b/stadiumgs/constants/item_constants.s @@ -22,6 +22,7 @@ MAX_ELIXER EQU 0x15 FIRE_STONE EQU 0x16 THUNDERSTONE EQU 0x17 WATER_STONE EQU 0x18 +ITEM_19 EQU 0x19 HP_UP EQU 0x1A PROTEIN EQU 0x1B IRON EQU 0x1C @@ -41,10 +42,12 @@ GUARD_SPEC EQU 0x29 SUPER_REPEL EQU 0x2A MAX_REPEL EQU 0x2B DIRE_HIT EQU 0x2C +ITEM_2D EQU 0x2D FRESH_WATER EQU 0x2E SODA_POP EQU 0x2F LEMONADE EQU 0x30 X_ATTACK EQU 0x31 +ITEM_32 EQU 0x32 X_DEFEND EQU 0x33 X_SPEED EQU 0x34 X_SPECIAL EQU 0x35 @@ -83,6 +86,7 @@ TINYMUSHROOM EQU 0x56 BIG_MUSHROOM EQU 0x57 SILVERPOWDER EQU 0x58 BLU_APRICORN EQU 0x59 +ITEM_5A EQU 0x5A AMULET_COIN EQU 0x5B YLW_APRICORN EQU 0x5C GRN_APRICORN EQU 0x5D @@ -92,6 +96,7 @@ TWISTEDSPOON EQU 0x60 WHT_APRICORN EQU 0x61 BLACKBELT EQU 0x62 BLK_APRICORN EQU 0x63 +ITEM_64 EQU 0x64 PNK_APRICORN EQU 0x65 BLACKGLASSES EQU 0x66 SLOWPOKETAIL EQU 0x67 @@ -111,6 +116,7 @@ BLUE_CARD EQU 0x74 MIRACLE_SEED EQU 0x75 THICK_CLUB EQU 0x76 FOCUS_BAND EQU 0x77 +ITEM_78 EQU 0x78 ENERGYPOWDER EQU 0x79 ENERGY_ROOT EQU 0x7A HEAL_POWDER EQU 0x7B @@ -125,6 +131,7 @@ STARDUST EQU 0x83 STAR_PIECE EQU 0x84 BASEMENT_KEY EQU 0x85 PASS EQU 0x86 +ITEM_87 EQU 0x87 CHARCOAL EQU 0x8A BERRY_JUICE EQU 0x8B SCOPE_LENS EQU 0x8C @@ -164,10 +171,12 @@ MORPH_MAIL EQU 0xBA BLUESKY_MAIL EQU 0xBB MUSIC_MAIL EQU 0xBC MIRAGE_MAIL EQU 0xBD +ITEM_BE EQU 0xBE TM_01 EQU 0xBF TM_02 EQU 0xC0 TM_03 EQU 0xC1 TM_04 EQU 0xC2 +ITEM_C3 EQU 0xC3 TM_05 EQU 0xC4 TM_06 EQU 0xC5 TM_07 EQU 0xC6 @@ -192,6 +201,7 @@ TM_25 EQU 0xD8 TM_26 EQU 0xD9 TM_27 EQU 0xDA TM_28 EQU 0xDB +ITEM_DC EQU 0xDC TM_29 EQU 0xDD TM_30 EQU 0xDE TM_31 EQU 0xDF @@ -221,6 +231,7 @@ HM_04 EQU 0xF6 HM_05 EQU 0xF7 HM_06 EQU 0xF8 HM_07 EQU 0xF9 +HM_08 EQU 0xFA ; held item effects HELD_BERRY EQU 1 diff --git a/stadiumgs/main.s b/stadiumgs/main.s index daba28d..29e999f 100644 --- a/stadiumgs/main.s +++ b/stadiumgs/main.s @@ -116,7 +116,27 @@ CharMap3: .db 0xA5,0xD7,0x2E,0x2F,0x2C,0xBE,0x30,0x31 ; ¥ × . / , ♀ 0 1 .db 0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39 ; 2 3 4 5 6 7 8 9 -.incbin "baseromgs.n64",0x98280,0x98370-0x98280 +UnknownData0x98290: ; XXX what is this? + .dw 0x80097380 + +TimeCapsuleAltItems: + .db ITEM_19, LEFTOVERS + .db ITEM_2D, BITTER_BERRY + .db ITEM_32, GOLD_BERRY + .db ITEM_5A, BERRY + .db ITEM_64, BERRY + .db ITEM_78, BERRY + .db ITEM_87, BERRY + .db ITEM_BE, BERRY + .db ITEM_C3, BERRY + .db ITEM_DC, BERRY + .db HM_08, BERRY + .db -1, BERRY + .db 0 + + .align + +.incbin "baseromgs.n64",0x982a0,0x98370-0x982a0 Pokered_MonIndices: .db RHYDON |