thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rocket hideout improvements/changes

Browse source
This commit is contained in:
MementoMartha 2022-10-01 11:38:00 +01:00
parent 74c0622040
commit 91344e05e8
13 changed files with 182 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

118
scripts/RocketHideoutB1F.asm
View file

@ -1,11 +1,11 @@
RocketHideoutB1F_Script: ;all trainer references are commented out.
;call RocketHideout1Script_44be0
call EnableAutoTextBoxDrawing
;ld hl, RocketHideout1TrainerHeaders
;ld de, RocketHideoutB1F_ScriptPointers
;ld a, [wRocketHideoutB1FCurScript]
;call ExecuteCurMapScriptInTable
;ld [wRocketHideoutB1FCurScript], a
ld hl, RocketHideout1TrainerHeaders
ld de, RocketHideoutB1F_ScriptPointers
ld a, [wRocketHideoutB1FCurScript]
call ExecuteCurMapScriptInTable
ld [wRocketHideoutB1FCurScript], a
ret
;RocketHideout1Script_44be0:
@ -30,10 +30,106 @@ RocketHideoutB1F_Script: ;all trainer references are commented out.
; lb bc, 8, 12
; predef_jump ReplaceTileBlock
;RocketHideoutB1F_ScriptPointers:
;dw CheckFightingMapTrainers
;dw DisplayEnemyTrainerTextAndStartBattle
;dw EndTrainerBattle
RocketHideoutB1F_ScriptPointers:
dw RocketHideout1Script0
dw RocketHideout1Script4
dw DisplayEnemyTrainerTextAndStartBattle
dw EndTrainerBattle
RocketHideout1Script0:
ld a, [wYCoord]
ld b, a
ld a, [wXCoord]
ld c, a
ld hl, RocketHideout1ArrowTilePlayerMovement
call DecodeArrowMovementRLE
cp $ff
jp z, CheckFightingMapTrainers
ld hl, wd736
set 7, [hl]
call StartSimulatingJoypadStates
ld a, SFX_ARROW_TILES
call PlaySound
ld a, $ff
ld [wJoyIgnore], a
ld a, $3
ld [wCurMapScript], a
ret
RocketHideout1ArrowTilePlayerMovement:
map_coord_movement 12, 16, RocketHideout1ArrowMovement1
map_coord_movement 14, 15, RocketHideout1ArrowMovement2
map_coord_movement 10, 15, RocketHideout1ArrowMovement3
map_coord_movement 11, 14, RocketHideout1ArrowMovement4
map_coord_movement 13, 8, RocketHideout1ArrowMovement5
map_coord_movement 15, 8, RocketHideout1ArrowMovement7
map_coord_movement 12, 9, RocketHideout1ArrowMovement8
map_coord_movement 14, 9, RocketHideout1ArrowMovement9
map_coord_movement 13, 10, RocketHideout1ArrowMovement10
map_coord_movement 15, 10, RocketHideout1ArrowMovement11
map_coord_movement 12, 11, RocketHideout1ArrowMovement12
map_coord_movement 14, 11, RocketHideout1ArrowMovement13
db -1 ; end
RocketHideout1ArrowMovement1:
db D_UP, 2
db -1 ; end
RocketHideout1ArrowMovement2:
db D_LEFT, 4
db -1 ; end
RocketHideout1ArrowMovement3:
db D_UP, 9
db -1 ; end
RocketHideout1ArrowMovement4:
db D_RIGHT, 2
db -1 ; end
RocketHideout1ArrowMovement5:
db D_RIGHT, 2
db -1 ; end
RocketHideout1ArrowMovement7:
db D_DOWN, 2
db -1 ; end
RocketHideout1ArrowMovement8:
db D_RIGHT, 2
db -1 ; end
RocketHideout1ArrowMovement9:
db D_UP, 1
db -1 ; end
RocketHideout1ArrowMovement10:
db D_RIGHT, 2
db -1 ; end
RocketHideout1ArrowMovement11:
db D_RIGHT, 3
db -1 ; end
RocketHideout1ArrowMovement12:
db D_UP, 2
db -1 ; end
RocketHideout1ArrowMovement13:
db D_UP, 2
db -1 ; end
RocketHideout1Script4:
ld a, [wSimulatedJoypadStatesIndex]
and a
jp nz, LoadSpinnerArrowTiles
xor a
ld [wJoyIgnore], a
ld hl, wd736
res 7, [hl]
ld a, $0
ld [wCurMapScript], a
ret
RocketHideoutB1F_TextPointers:
dw RocketHideout1Text1
@ -43,8 +139,8 @@ RocketHideoutB1F_TextPointers:
dw PickUpItemText
dw PickUpItemText
;RocketHideout1TrainerHeaders:
; def_trainers
RocketHideout1TrainerHeaders:
def_trainers
;RocketHideout1TrainerHeader0:
; trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0, 3, RocketHideout1BattleText2, RocketHideout1EndBattleText2, RocketHideout1AfterBattleTxt2
;RocketHideout1TrainerHeader1:

42
scripts/ViridianCity.asm
View file

@ -12,6 +12,7 @@ ViridianCity_ScriptPointers:
ViridianCityScript0:
call ViridianCityScript_1900b
call ViridianCityScript_backdoor
jp ViridianCityScript_1903d
ViridianCityScript_1900b:
@ -113,6 +114,31 @@ ViridianCityScript3:
ld [wViridianCityCurScript], a
ret
ViridianCityScript_backdoor:
CheckEvent EVENT_VIRIDIAN_GYM_OPEN
ret nz
ld a, [wObtainedBadges]
cp ~(1 << BIT_EARTHBADGE)
jr nz, .gym_closed
SetEvent EVENT_VIRIDIAN_GYM_OPEN
ret
.gym_closed
ld a, [wYCoord]
cp 3
ret nz
ld a, [wXCoord]
cp 29
ret nz
ld a, $10
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
xor a
ldh [hJoyHeld], a
call ViridianCityScript_backdoor2
ld a, $3
ld [wViridianCityCurScript], a
ret
ViridianCityScript_190cf:
call StartSimulatingJoypadStates
ld a, $1
@ -124,6 +150,17 @@ ViridianCityScript_190cf:
ld [wJoyIgnore], a
ret
ViridianCityScript_backdoor2:
call StartSimulatingJoypadStates
ld a, $1
ld [wSimulatedJoypadStatesIndex], a
ld a, D_UP
ld [wSimulatedJoypadStatesEnd], a
xor a
ld [wSpritePlayerStateData1FacingDirection], a
ld [wJoyIgnore], a
ret
ViridianCity_TextPointers:
dw ViridianCityText1
dw ViridianCityText2
@ -140,6 +177,7 @@ ViridianCity_TextPointers:
dw ViridianCityText13
dw ViridianCityText14
dw ViridianCityText15
dw ViridianCityText16
ViridianCityText1:
text_far _ViridianCityText1
@ -325,3 +363,7 @@ ViridianCityText13:
ViridianCityText14:
text_far _ViridianCityText14
text_end
ViridianCityText16:
text_far _ViridianCityText16
text_end

11
scripts/ViridianGym.asm
View file

@ -54,9 +54,8 @@ ViridianGymArrowTilePlayerMovement:
map_coord_movement 19, 11, ViridianGymArrowMovement1
map_coord_movement 19, 1, ViridianGymArrowMovement2
map_coord_movement 18, 2, ViridianGymArrowMovement3
map_coord_movement 11, 2, ViridianGymArrowMovement4
map_coord_movement 10, 2, ViridianGymArrowMovement4
map_coord_movement 16, 10, ViridianGymArrowMovement5
map_coord_movement 4, 6, ViridianGymArrowMovement6
map_coord_movement 5, 13, ViridianGymArrowMovement7
map_coord_movement 4, 14, ViridianGymArrowMovement8
map_coord_movement 0, 15, ViridianGymArrowMovement9
@ -78,17 +77,13 @@ ViridianGymArrowMovement3:
db -1 ; end
ViridianGymArrowMovement4:
db D_RIGHT, 6
db D_RIGHT, 7
db -1 ; end
ViridianGymArrowMovement5:
db D_DOWN, 2
db -1 ; end
ViridianGymArrowMovement6:
db D_DOWN, 7
db -1 ; end
ViridianGymArrowMovement7:
db D_RIGHT, 8
db -1 ; end
@ -98,7 +93,7 @@ ViridianGymArrowMovement8:
db -1 ; end
ViridianGymArrowMovement9:
db D_UP, 8
db D_UP, 4
db -1 ; end
ViridianGymArrowMovement10: