diff options
| author | chaos-lord <dd4791.mariokarter@hotmail.co.uk> | 2017-07-19 18:25:42 +0100 |
|---|---|---|
| committer | chaos-lord <dd4791.mariokarter@hotmail.co.uk> | 2017-07-19 18:25:42 +0100 |
| commit | 50092d9a52f85de8678bf003b8fc818812df91c2 (patch) | |
| tree | 4ab55ece782a543ec98ec9125eab7facee7f48a8 /constants | |
| parent | da4e2bbd49eadfa084341dd11df39a392047e404 (diff) | |
| parent | 504e04e292a309ca6e9a12c0c5e3fbd8bd7bab13 (diff) | |
Merge remote-tracking branch 'origin/master' into chaos_requests-tppfork
Diffstat (limited to 'constants')
| -rwxr-xr-x | constants/bonus_stage_order_constants.asm | 6 | ||||
| -rw-r--r-- | constants/stage_constants.asm | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/constants/bonus_stage_order_constants.asm b/constants/bonus_stage_order_constants.asm new file mode 100755 index 0000000..dd226a5 --- /dev/null +++ b/constants/bonus_stage_order_constants.asm @@ -0,0 +1,6 @@ +; See wNextBonusStage
+BONUS_STAGE_ORDER_GENGAR EQU 0
+BONUS_STAGE_ORDER_MEWTWO EQU 1
+BONUS_STAGE_ORDER_MEOWTH EQU 2
+BONUS_STAGE_ORDER_DIGLETT EQU 3
+BONUS_STAGE_ORDER_SEEL EQU 4
diff --git a/constants/stage_constants.asm b/constants/stage_constants.asm index 600abf9..7f4cd73 100644 --- a/constants/stage_constants.asm +++ b/constants/stage_constants.asm @@ -4,6 +4,8 @@ STAGE_RED_FIELD_BOTTOM EQU $1 ; XXX EQU $3 STAGE_BLUE_FIELD_TOP EQU $4 STAGE_BLUE_FIELD_BOTTOM EQU $5 + +FIRST_BONUS_STAGE EQU $6 ; STAGE_GENGAR_BONUS EQU $6 ; buggy STAGE_GENGAR_BONUS EQU $7 ; STAGE_MEWTWO_BONUS EQU $8 ; buggy |