diff options
Diffstat (limited to 'scripts/rockethideout2.asm')
| -rwxr-xr-x | scripts/rockethideout2.asm | 285 |
1 files changed, 140 insertions, 145 deletions
diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm index 99754658..c5f026d5 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/rockethideout2.asm @@ -1,22 +1,22 @@ -RocketHideout2Script: ; 44e27 (11:4e27) +RocketHideout2Script: call EnableAutoTextBoxDrawing - ld hl, RocketHideout2TrainerHeaders + ld hl, RocketHideout2TrainerHeader0 ld de, RocketHideout2ScriptPointers - ld a, [W_ROCKETHIDEOUT2CURSCRIPT] + ld a, [wRocketHideout2CurScript] call ExecuteCurMapScriptInTable - ld [W_ROCKETHIDEOUT2CURSCRIPT], a + ld [wRocketHideout2CurScript], a ret -RocketHideout2ScriptPointers: ; 44e3a (11:4e3a) +RocketHideout2ScriptPointers: dw RocketHideout2Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw RocketHideout2Script3 -RocketHideout2Script0: ; 44e42 (11:4e42) - ld a, [W_YCOORD] +RocketHideout2Script0: + ld a, [wYCoord] ld b, a - ld a, [W_XCOORD] + ld a, [wXCoord] ld c, a ld hl, RocketHideout2ArrowTilePlayerMovement call DecodeArrowMovementRLE @@ -25,18 +25,18 @@ RocketHideout2Script0: ; 44e42 (11:4e42) ld hl, wd736 set 7, [hl] call StartSimulatingJoypadStates - ld a, (SFX_02_52 - SFX_Headers_02) / 3 + ld a, SFX_ARROW_TILES call PlaySound ld a, $ff ld [wJoyIgnore], a ld a, $3 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret ;format: ;db y,x ;dw pointer to movement -RocketHideout2ArrowTilePlayerMovement: ; 44e6d (11:4e6d) +RocketHideout2ArrowTilePlayerMovement: db $9,$4 dw RocketHideout2ArrowMovement1 db $b,$4 @@ -126,186 +126,182 @@ RocketHideout2ArrowTilePlayerMovement: ; 44e6d (11:4e6d) db $FF ;format: direction, count -;right: $10 -;left: $20 -;up: $40 -;down: $80 ;each list is read starting from the $FF and working backwards -RocketHideout2ArrowMovement1: ; 44f1a (11:4f1a) - db $20,$02 +RocketHideout2ArrowMovement1: + db D_LEFT,$02 db $FF -RocketHideout2ArrowMovement2: ; 44f1d (11:4f1d) - db $10,$04 +RocketHideout2ArrowMovement2: + db D_RIGHT,$04 db $FF -RocketHideout2ArrowMovement3: ; 44f20 (11:4f20) - db $40,$04 - db $10,$04 +RocketHideout2ArrowMovement3: + db D_UP,$04 + db D_RIGHT,$04 db $FF -RocketHideout2ArrowMovement4: ; 44f25 (11:4f25) - db $40,$04 - db $10,$04 - db $40,$01 +RocketHideout2ArrowMovement4: + db D_UP,$04 + db D_RIGHT,$04 + db D_UP,$01 db $FF -RocketHideout2ArrowMovement5: ; 44f2c (11:4f2c) - db $20,$02 - db $40,$03 +RocketHideout2ArrowMovement5: + db D_LEFT,$02 + db D_UP,$03 db $FF -RocketHideout2ArrowMovement6: ; 44f31 (11:4f31) - db $80,$02 - db $10,$04 +RocketHideout2ArrowMovement6: + db D_DOWN,$02 + db D_RIGHT,$04 db $FF -RocketHideout2ArrowMovement7: ; 44f36 (11:4f36) - db $40,$02 +RocketHideout2ArrowMovement7: + db D_UP,$02 db $FF -RocketHideout2ArrowMovement8: ; 44f39 (11:4f39) - db $40,$04 +RocketHideout2ArrowMovement8: + db D_UP,$04 db $FF -RocketHideout2ArrowMovement9: ; 44f3c (11:4f3c) - db $20,$06 +RocketHideout2ArrowMovement9: + db D_LEFT,$06 db $FF -RocketHideout2ArrowMovement10: ; 44f3f (11:4f3f) - db $40,$01 +RocketHideout2ArrowMovement10: + db D_UP,$01 db $FF -RocketHideout2ArrowMovement11: ; 44f42 (11:4f42) - db $20,$06 - db $40,$04 +RocketHideout2ArrowMovement11: + db D_LEFT,$06 + db D_UP,$04 db $FF -RocketHideout2ArrowMovement12: ; 44f47 (11:4f47) - db $80,$02 +RocketHideout2ArrowMovement12: + db D_DOWN,$02 db $FF -RocketHideout2ArrowMovement13: ; 44f4a (11:4f4a) - db $20,$08 +RocketHideout2ArrowMovement13: + db D_LEFT,$08 db $FF -RocketHideout2ArrowMovement14: ; 44f4d (11:4f4d) - db $20,$08 - db $40,$01 +RocketHideout2ArrowMovement14: + db D_LEFT,$08 + db D_UP,$01 db $FF -RocketHideout2ArrowMovement15: ; 44f52 (11:4f52) - db $20,$08 - db $40,$06 +RocketHideout2ArrowMovement15: + db D_LEFT,$08 + db D_UP,$06 db $FF -RocketHideout2ArrowMovement16: ; 44f57 (11:4f57) - db $40,$02 - db $10,$04 +RocketHideout2ArrowMovement16: + db D_UP,$02 + db D_RIGHT,$04 db $FF -RocketHideout2ArrowMovement17: ; 44f5c (11:4f5c) - db $40,$02 - db $10,$04 - db $40,$02 +RocketHideout2ArrowMovement17: + db D_UP,$02 + db D_RIGHT,$04 + db D_UP,$02 db $FF -RocketHideout2ArrowMovement18: ; 44f63 (11:4f63) - db $80,$02 - db $10,$04 - db $80,$02 +RocketHideout2ArrowMovement18: + db D_DOWN,$02 + db D_RIGHT,$04 + db D_DOWN,$02 db $FF -RocketHideout2ArrowMovement19: ; 44f6a (11:4f6a) - db $80,$02 - db $10,$04 +RocketHideout2ArrowMovement19: + db D_DOWN,$02 + db D_RIGHT,$04 db $FF -RocketHideout2ArrowMovement20: ; 44f6f (11:4f6f) - db $20,$0A +RocketHideout2ArrowMovement20: + db D_LEFT,$0A db $FF -RocketHideout2ArrowMovement21: ; 44f72 (11:4f72) - db $20,$0A - db $40,$02 +RocketHideout2ArrowMovement21: + db D_LEFT,$0A + db D_UP,$02 db $FF -RocketHideout2ArrowMovement22: ; 44f77 (11:4f77) - db $20,$0A - db $40,$04 +RocketHideout2ArrowMovement22: + db D_LEFT,$0A + db D_UP,$04 db $FF -RocketHideout2ArrowMovement23: ; 44f7c (11:4f7c) - db $40,$02 - db $10,$02 +RocketHideout2ArrowMovement23: + db D_UP,$02 + db D_RIGHT,$02 db $FF -RocketHideout2ArrowMovement24: ; 44f81 (11:4f81) - db $10,$01 - db $80,$02 +RocketHideout2ArrowMovement24: + db D_RIGHT,$01 + db D_DOWN,$02 db $FF -RocketHideout2ArrowMovement25: ; 44f86 (11:4f86) - db $10,$01 +RocketHideout2ArrowMovement25: + db D_RIGHT,$01 db $FF -RocketHideout2ArrowMovement26: ; 44f89 (11:4f89) - db $80,$02 - db $10,$02 +RocketHideout2ArrowMovement26: + db D_DOWN,$02 + db D_RIGHT,$02 db $FF -RocketHideout2ArrowMovement27: ; 44f8e (11:4f8e) - db $80,$02 - db $20,$02 +RocketHideout2ArrowMovement27: + db D_DOWN,$02 + db D_LEFT,$02 db $FF -RocketHideout2ArrowMovement28: ; 44f93 (11:4f93) - db $40,$02 - db $10,$04 - db $40,$02 - db $20,$03 +RocketHideout2ArrowMovement28: + db D_UP,$02 + db D_RIGHT,$04 + db D_UP,$02 + db D_LEFT,$03 db $FF -RocketHideout2ArrowMovement29: ; 44f9c (11:4f9c) - db $80,$02 - db $20,$04 +RocketHideout2ArrowMovement29: + db D_DOWN,$02 + db D_LEFT,$04 db $FF -RocketHideout2ArrowMovement30: ; 44fa1 (11:4fa1) - db $20,$06 - db $40,$04 - db $20,$05 +RocketHideout2ArrowMovement30: + db D_LEFT,$06 + db D_UP,$04 + db D_LEFT,$05 db $FF -RocketHideout2ArrowMovement31: ; 44fa8 (11:4fa8) - db $40,$02 +RocketHideout2ArrowMovement31: + db D_UP,$02 db $FF -RocketHideout2ArrowMovement32: ; 44fab (11:4fab) - db $40,$01 +RocketHideout2ArrowMovement32: + db D_UP,$01 db $FF -RocketHideout2ArrowMovement33: ; 44fae (11:4fae) - db $40,$03 +RocketHideout2ArrowMovement33: + db D_UP,$03 db $FF -RocketHideout2ArrowMovement34: ; 44fb1 (11:4fb1) - db $40,$05 +RocketHideout2ArrowMovement34: + db D_UP,$05 db $FF -RocketHideout2ArrowMovement35: ; 44fb4 (11:4fb4) - db $10,$01 - db $80,$02 - db $20,$04 +RocketHideout2ArrowMovement35: + db D_RIGHT,$01 + db D_DOWN,$02 + db D_LEFT,$04 db $FF -RocketHideout2ArrowMovement36: ; 44fbb (11:4fbb) - db $20,$0A - db $40,$02 - db $20,$05 +RocketHideout2ArrowMovement36: + db D_LEFT,$0A + db D_UP,$02 + db D_LEFT,$05 db $FF -RocketHideout2Script3: ; 44fc2 (11:4fc2) +RocketHideout2Script3: ld a, [wSimulatedJoypadStatesIndex] and a jr nz, LoadSpinnerArrowTiles @@ -314,24 +310,24 @@ RocketHideout2Script3: ; 44fc2 (11:4fc2) ld hl, wd736 res 7, [hl] ld a, $0 - ld [W_CURMAPSCRIPT], a + ld [wCurMapScript], a ret -LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7) +LoadSpinnerArrowTiles: ld a, [wSpriteStateData1 + 2] srl a srl a - ld hl, SpinnerPlayerFacingDirections ; $5083 + ld hl, SpinnerPlayerFacingDirections ld c, a ld b, $0 add hl, bc ld a, [hl] ld [wSpriteStateData1 + 2], a - ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET + ld a, [wCurMapTileset] cp FACILITY - ld hl, FacilitySpinnerArrows ; $5023 + ld hl, FacilitySpinnerArrows jr z, .asm_44ff6 - ld hl, GymSpinnerArrows ; $5053 + ld hl, GymSpinnerArrows .asm_44ff6 ld a, [wSimulatedJoypadStatesIndex] bit 0, a @@ -404,7 +400,7 @@ vGymSpinner EQU vTileset + GYM_SPINNER spinner Gym_GFX, GYM_SPINNER + $100, 1, vGymSpinner + $100 spinner Gym_GFX, GYM_SPINNER + $110, 1, vGymSpinner + $110 -SpinnerPlayerFacingDirections: ; 45083 (11:5083) +SpinnerPlayerFacingDirections: ; This isn't the order of the facing directions. Rather, it's a list of ; the facing directions that come next. For example, when the player is ; facing down (00), the next facing direction is left (08). @@ -414,42 +410,41 @@ SpinnerPlayerFacingDirections: ; 45083 (11:5083) db $00 ; right -> down ; these tiles are the animation for the tiles that push the player in dungeons like Rocket HQ -SpinnerArrowAnimTiles: ; 45087 (11:5087) +SpinnerArrowAnimTiles: INCBIN "gfx/spinner_arrow.2bpp" -RocketHideout2TextPointers: ; 450c7 (11:50c7) +RocketHideout2TextPointers: dw RocketHideout2Text1 - dw Predef5CText - dw Predef5CText - dw Predef5CText - dw Predef5CText - -RocketHideout2TrainerHeaders: ; 450d1 (11:50d1) -RocketHideout2TrainerHeader0: ; 450d1 (11:50d1) - db $1 ; flag's bit + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + +RocketHideout2TrainerHeader0: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 db ($4 << 4) ; trainer's view range - dw wd817 ; flag's byte - dw RocketHideout2BattleText2 ; 0x50e8 TextBeforeBattle - dw RocketHideout2AfterBattleTxt2 ; 0x50f2 TextAfterBattle - dw RocketHideout2EndBattleText2 ; 0x50ed TextEndBattle - dw RocketHideout2EndBattleText2 ; 0x50ed TextEndBattle + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_2_TRAINER_0 + dw RocketHideout2BattleText2 ; TextBeforeBattle + dw RocketHideout2AfterBattleTxt2 ; TextAfterBattle + dw RocketHideout2EndBattleText2 ; TextEndBattle + dw RocketHideout2EndBattleText2 ; TextEndBattle db $ff -RocketHideout2Text1: ; 450de (11:50de) - db $08 ; asm +RocketHideout2Text1: + TX_ASM ld hl, RocketHideout2TrainerHeader0 call TalkToTrainer jp TextScriptEnd -RocketHideout2BattleText2: ; 450e8 (11:50e8) +RocketHideout2BattleText2: TX_FAR _RocketHideout2BattleText2 db "@" -RocketHideout2EndBattleText2: ; 450ed (11:50ed) +RocketHideout2EndBattleText2: TX_FAR _RocketHideout2EndBattleText2 db "@" -RocketHideout2AfterBattleTxt2: ; 450f2 (11:50f2) +RocketHideout2AfterBattleTxt2: TX_FAR _RocketHideout2AfterBattleTxt2 db "@" |