mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-06 15:45:24 +13:00
Merge branch 'master' of https://github.com/huderlem/pokered into pull-data
Conflicts: main.asm text.asm text/maps/route_22.asm
This commit is contained in:
U-Fish-PC\Daniel
commit
1a0992a2f1
42 changed files with 916 additions and 1155 deletions
|
|
@ -25,9 +25,7 @@ BikeShopText1: ; 1d745 (7:5745)
|
|||
jr nc, .BagFull
|
||||
ld a, BIKE_VOUCHER
|
||||
ldh [$db], a
|
||||
ld b, BANK(RemoveItemByID)
|
||||
ld hl, RemoveItemByID
|
||||
call Bankswitch
|
||||
callba RemoveItemByID
|
||||
ld hl, $d75f
|
||||
set 0, [hl]
|
||||
ld hl, BikeShopText_1d824
|
||||
|
|
|
|||
|
|
@ -49,9 +49,7 @@ DirectorText: ; 487b2 (12:47b2)
|
|||
TX_FAR _CompletedDexText
|
||||
db $6
|
||||
db $8 ; asm
|
||||
ld hl, DisplayDiploma
|
||||
ld b, BANK(DisplayDiploma)
|
||||
call Bankswitch
|
||||
callab DisplayDiploma
|
||||
ld a, $1
|
||||
ld [$cc3c], a
|
||||
jp TextScriptEnd
|
||||
|
|
|
|||
|
|
@ -177,9 +177,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1)
|
|||
ld a, $ff
|
||||
ld [$c0ee], a
|
||||
call PlaySound
|
||||
ld b, BANK(Music_RivalAlternateStart)
|
||||
ld hl, Music_RivalAlternateStart
|
||||
call Bankswitch
|
||||
callba Music_RivalAlternateStart
|
||||
ld a, $1
|
||||
ld [$ff8c], a
|
||||
call SetSpriteMovementBytesToFF
|
||||
|
|
@ -304,9 +302,7 @@ CeruleanCityText2: ; 1967c (6:567c)
|
|||
ld [$cc3c], a
|
||||
ld hl, ReceivedTM28Text
|
||||
call PrintText
|
||||
ld b, BANK(Func_74872)
|
||||
ld hl, Func_74872
|
||||
call Bankswitch
|
||||
callba Func_74872
|
||||
.Done
|
||||
jp TextScriptEnd
|
||||
|
||||
|
|
|
|||
|
|
@ -31,9 +31,7 @@ CopycatsHouse2FText1: ; 5cc82 (17:4c82)
|
|||
call PrintText
|
||||
ld a, POKE_DOLL
|
||||
ldh [$db], a
|
||||
ld b, BANK(RemoveItemByID)
|
||||
ld hl, RemoveItemByID
|
||||
call Bankswitch
|
||||
callba RemoveItemByID
|
||||
ld hl, $d7af
|
||||
set 0, [hl]
|
||||
jr .asm_62ecd ; 0x5ccc1
|
||||
|
|
|
|||
|
|
@ -35,9 +35,7 @@ DayCareMText1: ; 56254 (15:6254)
|
|||
pop af
|
||||
ld hl, DayCareMText_56437
|
||||
jp c, DayCareMScript_56409
|
||||
ld hl, Func_2171b
|
||||
ld b, BANK(Func_2171b)
|
||||
call Bankswitch
|
||||
callab Func_2171b
|
||||
ld hl, DayCareMText_5644a
|
||||
jp c, DayCareMScript_56409
|
||||
xor a
|
||||
|
|
@ -67,16 +65,12 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
|
|||
ld a, $3
|
||||
ld [$cc49], a
|
||||
call LoadMonData
|
||||
ld hl, Func_58f43
|
||||
ld b, BANK(Func_58f43)
|
||||
call Bankswitch
|
||||
callab Func_58f43
|
||||
ld a, d
|
||||
cp $64
|
||||
jr c, .asm_56315
|
||||
ld d, $64
|
||||
ld hl, CalcExperience
|
||||
ld b, BANK(CalcExperience)
|
||||
call Bankswitch
|
||||
callab CalcExperience
|
||||
ld hl, $da6d
|
||||
ld a, [H_NUMTOPRINT]
|
||||
ld [hli], a
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
DiglettsCaveEntranceRoute11Script: ; 1e5ba (7:65ba)
|
||||
call EnableAutoTextBoxDrawing
|
||||
ld a, $16
|
||||
ld [$d365], a
|
||||
ld a, ROUTE_11
|
||||
ld [wLastMap], a
|
||||
ret
|
||||
|
||||
DiglettsCaveEntranceRoute11TextPointers: ; 1e5c3 (7:65c3)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
DiglettsCaveRoute2Script: ; 1deb0 (7:5eb0)
|
||||
ld a, $d
|
||||
ld [$d365], a
|
||||
ld a, ROUTE_2
|
||||
ld [wLastMap], a
|
||||
jp EnableAutoTextBoxDrawing
|
||||
|
||||
DiglettsCaveRoute2TextPointers: ; 1deb8 (7:5eb8)
|
||||
|
|
|
|||
|
|
@ -35,9 +35,7 @@ FuchsiaHouse2Text1: ; 750c2 (1d:50c2)
|
|||
call PrintText
|
||||
ld a, GOLD_TEETH
|
||||
ldh [$db], a
|
||||
ld b, BANK(RemoveItemByID)
|
||||
ld hl, RemoveItemByID
|
||||
call Bankswitch
|
||||
callba RemoveItemByID
|
||||
ld hl, $d78e
|
||||
set 1, [hl]
|
||||
.asm_60cba ; 0x75109
|
||||
|
|
|
|||
|
|
@ -109,9 +109,7 @@ GaryScript3: ; 75fbb (1d:5fbb)
|
|||
ret
|
||||
|
||||
GaryScript4: ; 75fe4 (1d:5fe4)
|
||||
ld b, BANK(Music_Cities1AlternateTempo)
|
||||
ld hl, Music_Cities1AlternateTempo
|
||||
call Bankswitch
|
||||
callba Music_Cities1AlternateTempo
|
||||
ld a, $2
|
||||
ld [$ff8c], a
|
||||
call GaryScript_760c8
|
||||
|
|
|
|||
|
|
@ -48,14 +48,12 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb)
|
|||
ld [hl], a
|
||||
xor a
|
||||
ld [W_HALLOFFAMEROOMCURSCRIPT], a
|
||||
ld a, $0
|
||||
ld [$d719], a
|
||||
ld b, BANK(SaveSAVtoSRAM)
|
||||
ld hl, SaveSAVtoSRAM
|
||||
call Bankswitch
|
||||
ld b, $5
|
||||
ld a, PALLET_TOWN
|
||||
ld [wLastBlackoutMap], a
|
||||
callba SaveSAVtoSRAM
|
||||
ld b, 5
|
||||
.asm_5a4ff
|
||||
ld c, $78
|
||||
ld c, 600 / 5
|
||||
call DelayFrames
|
||||
dec b
|
||||
jr nz, .asm_5a4ff ; 0x5a505 $f8
|
||||
|
|
|
|||
|
|
@ -55,9 +55,7 @@ Lab4Text1: ; 75d6c (1d:5d6c)
|
|||
ld a, [$cd37]
|
||||
and a
|
||||
jr z, .asm_75d8d ; 0x75d81 $a
|
||||
ld b, BANK(GiveFossilToCinnabarLab)
|
||||
ld hl, GiveFossilToCinnabarLab
|
||||
call Bankswitch
|
||||
callba GiveFossilToCinnabarLab
|
||||
jr .asm_75d93 ; 0x75d8b $6
|
||||
.asm_75d8d
|
||||
ld hl, Lab4Text_75dcb
|
||||
|
|
|
|||
|
|
@ -68,9 +68,7 @@ NameRaterText1: ; 1da56 (7:5a56)
|
|||
jr nz, .asm_1daae ; 0x1da93 $19
|
||||
ld hl, NameRaterText_1dac2
|
||||
call PrintText
|
||||
ld b, BANK(Func_655c)
|
||||
ld hl, Func_655c
|
||||
call Bankswitch
|
||||
callba Func_655c
|
||||
jr c, .asm_1daae ; 0x1daa3 $9
|
||||
ld hl, NameRaterText_1dac7
|
||||
.asm_1daa8
|
||||
|
|
|
|||
|
|
@ -425,9 +425,7 @@ OaksLabScript13: ; 1ce32 (7:4e32)
|
|||
ld a, $10
|
||||
ld [$ff8c], a
|
||||
call DisplayTextID
|
||||
ld b, BANK(Music_RivalAlternateStart)
|
||||
ld hl, Music_RivalAlternateStart
|
||||
call Bankswitch
|
||||
callba Music_RivalAlternateStart
|
||||
ld a, $1
|
||||
ld [$ff8c], a
|
||||
ld de, .RivalExitMovement
|
||||
|
|
@ -493,9 +491,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0)
|
|||
ld a, $ff
|
||||
ld [$c0ee], a
|
||||
call PlaySound
|
||||
ld b, BANK(Music_RivalAlternateStart)
|
||||
ld hl, Music_RivalAlternateStart
|
||||
call Bankswitch
|
||||
callba Music_RivalAlternateStart
|
||||
ld a, $15
|
||||
ld [$ff8c], a
|
||||
call DisplayTextID
|
||||
|
|
@ -603,9 +599,7 @@ OaksLabScript16: ; 1cf12 (7:4f12)
|
|||
ld a, $ff
|
||||
ld [$c0ee], a
|
||||
call PlaySound
|
||||
ld b, BANK(Music_RivalAlternateStart)
|
||||
ld hl, Music_RivalAlternateStart
|
||||
call Bankswitch
|
||||
callba Music_RivalAlternateStart
|
||||
ld a, $1
|
||||
ld [$ff8c], a
|
||||
ld de, $cc97
|
||||
|
|
|
|||
|
|
@ -83,9 +83,7 @@ PokemonTower2Script1: ; 60563 (18:4563)
|
|||
ld a, $ff
|
||||
ld [$c0ee], a
|
||||
call PlaySound
|
||||
ld b, BANK(Music_RivalAlternateStart)
|
||||
ld hl, Music_RivalAlternateStart
|
||||
call Bankswitch
|
||||
callba Music_RivalAlternateStart
|
||||
ld a, $2
|
||||
ld [W_POKEMONTOWER2CURSCRIPT], a
|
||||
ld [W_CURMAPSCRIPT], a
|
||||
|
|
|
|||
|
|
@ -77,8 +77,8 @@ PokemonTower7Script4: ; 60d86 (18:4d86)
|
|||
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
|
||||
ld a, $1
|
||||
ld [$d42f], a
|
||||
ld a, $4
|
||||
ld [$d365], a
|
||||
ld a, LAVENDER_TOWN
|
||||
ld [wLastMap], a
|
||||
ld hl, $d72d
|
||||
set 3, [hl]
|
||||
ld a, $0
|
||||
|
|
|
|||
|
|
@ -55,9 +55,7 @@ RocketHideoutElevatorWarpMaps: ; 45759 (11:5759)
|
|||
|
||||
RocketHideoutElevatorScript_4575f: ; 4575f (11:575f)
|
||||
call Delay3
|
||||
ld b, BANK(ShakeElevator)
|
||||
ld hl, ShakeElevator
|
||||
call Bankswitch
|
||||
callba ShakeElevator
|
||||
ret
|
||||
|
||||
RocketHideoutElevatorTextPointers: ; 4576b (11:576b)
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@ Route22Script_50ed6: ; 50ed6 (14:4ed6)
|
|||
ld [W_TRAINERNO], a ; $d05d
|
||||
ret
|
||||
|
||||
Route22Script_50ee6: ; 50ee6 (14:4ee6)
|
||||
ld de, MovementData_50efb ; $4efb
|
||||
Route22MoveRivalSprite: ; 50ee6 (14:4ee6)
|
||||
ld de, Route22RivalMovementData ; $4efb
|
||||
ld a, [$cf0d]
|
||||
cp $1
|
||||
jr z, .asm_50ef1
|
||||
|
|
@ -47,14 +47,14 @@ Route22Script_50ee6: ; 50ee6 (14:4ee6)
|
|||
ld [$ff8d], a
|
||||
jp Func_34a6
|
||||
|
||||
MovementData_50efb: ; 50efb (14:4efb)
|
||||
db $C0,$C0,$C0,$C0,$FF
|
||||
Route22RivalMovementData: ; 50efb (14:4efb)
|
||||
db $C0,$C0,$C0,$C0,$FF ; move right 4 times
|
||||
|
||||
Route22Script0: ; 50f00 (14:4f00)
|
||||
ld a, [$d7eb]
|
||||
bit 7, a
|
||||
ret z
|
||||
ld hl, .CoordsData_50f2d ; $4f2d
|
||||
ld hl, .Route22RivalBattleCoords ; $4f2d
|
||||
call ArePlayerCoordsInArray
|
||||
ret nc
|
||||
ld a, [$cd3d]
|
||||
|
|
@ -66,18 +66,18 @@ Route22Script0: ; 50f00 (14:4f00)
|
|||
ld a, $2
|
||||
ld [$d528], a
|
||||
ld a, [$d7eb]
|
||||
bit 0, a
|
||||
jr nz, .asm_50f32 ; 0x50f25 $b
|
||||
bit 1, a
|
||||
bit 0, a ; is this the rival battle at the beginning of the game?
|
||||
jr nz, .firstRivalBattle ; 0x50f25 $b
|
||||
bit 1, a ; is this the rival at the end of the game?
|
||||
jp nz, Route22Script_5104e
|
||||
ret
|
||||
|
||||
.CoordsData_50f2d
|
||||
.Route22RivalBattleCoords
|
||||
db $04, $1D
|
||||
db $05, $1D
|
||||
db $FF
|
||||
|
||||
.asm_50f32
|
||||
.firstRivalBattle
|
||||
ld a, $1
|
||||
ld [$cd4f], a
|
||||
xor a
|
||||
|
|
@ -96,7 +96,7 @@ Route22Script0: ; 50f00 (14:4f00)
|
|||
call PlayMusic
|
||||
ld a, $1
|
||||
ld [$ff8c], a
|
||||
call Route22Script_50ee6
|
||||
call Route22MoveRivalSprite
|
||||
ld a, $1
|
||||
ld [W_ROUTE22CURSCRIPT], a
|
||||
ret
|
||||
|
|
@ -127,7 +127,7 @@ Route22Script1: ; 50f62 (14:4f62)
|
|||
ld hl, $d72d
|
||||
set 6, [hl]
|
||||
set 7, [hl]
|
||||
ld hl, Route22Text_511b7
|
||||
ld hl, Route22RivalDefeatedText1
|
||||
ld de, Route22Text_511bc
|
||||
call PreBattleSaveRegisters
|
||||
ld a, SONY1 + $c8
|
||||
|
|
@ -139,6 +139,7 @@ Route22Script1: ; 50f62 (14:4f62)
|
|||
ret
|
||||
|
||||
StarterMons_50faf: ; 50faf (14:4faf)
|
||||
; starter the rival picked, rival trainer number
|
||||
db SQUIRTLE,$04
|
||||
db BULBASAUR,$05
|
||||
db CHARMANDER,$06
|
||||
|
|
@ -169,9 +170,7 @@ Route22Script2: ; 50fb5 (14:4fb5)
|
|||
ld a, $ff
|
||||
ld [$c0ee], a
|
||||
call PlaySound
|
||||
ld b, BANK(Music_RivalAlternateStart)
|
||||
ld hl, Music_RivalAlternateStart
|
||||
call Bankswitch
|
||||
callba Music_RivalAlternateStart
|
||||
ld a, [$cf0d]
|
||||
cp $1
|
||||
jr nz, .asm_50fff ; 0x50ff8 $5
|
||||
|
|
@ -185,20 +184,20 @@ Route22Script2: ; 50fb5 (14:4fb5)
|
|||
ret
|
||||
|
||||
Route22Script_51008: ; 51008 (14:5008)
|
||||
ld de, MovementData_51017 ; $5017
|
||||
ld de, Route22RivalExitMovementData1 ; $5017
|
||||
jr asm_51010
|
||||
|
||||
Route22Script_5100d: ; 5100d (14:500d)
|
||||
ld de, MovementData_5101f ; $501f
|
||||
ld de, Route22RivalExitMovementData2 ; $501f
|
||||
asm_51010
|
||||
ld a, $1
|
||||
ld [H_SPRITEHEIGHT], a
|
||||
jp MoveSprite
|
||||
|
||||
MovementData_51017: ; 51017 (14:5017)
|
||||
Route22RivalExitMovementData1: ; 51017 (14:5017)
|
||||
db $C0,$C0,$00,$00,$00,$00,$00,$FF
|
||||
|
||||
MovementData_5101f: ; 5101f (14:501f)
|
||||
Route22RivalExitMovementData2: ; 5101f (14:501f)
|
||||
db $40,$C0,$C0,$C0,$00,$00,$00,$00,$00,$00,$FF
|
||||
|
||||
Route22Script3: ; 5102a (14:502a)
|
||||
|
|
@ -236,12 +235,10 @@ Route22Script_5104e: ; 5104e (14:504e)
|
|||
ld a, $ff
|
||||
ld [$c0ee], a
|
||||
call PlaySound
|
||||
ld b, BANK(Music_RivalAlternateTempo)
|
||||
ld hl, Music_RivalAlternateTempo
|
||||
call Bankswitch
|
||||
callba Music_RivalAlternateTempo
|
||||
ld a, $2
|
||||
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
|
||||
call Route22Script_50ee6
|
||||
call Route22MoveRivalSprite
|
||||
ld a, $4
|
||||
ld [W_ROUTE22CURSCRIPT], a
|
||||
ret
|
||||
|
|
@ -274,7 +271,7 @@ Route22Script4: ; 51087 (14:5087)
|
|||
ld hl, $d72d
|
||||
set 6, [hl]
|
||||
set 7, [hl]
|
||||
ld hl, Route22Text_511cb ; $51cb
|
||||
ld hl, Route22RivalDefeatedText2 ; $51cb
|
||||
ld de, Route22Text_511d0 ; $51d0
|
||||
call PreBattleSaveRegisters
|
||||
ld a, SONY2 + $c8
|
||||
|
|
@ -320,9 +317,7 @@ Route22Script5: ; 510df (14:50df)
|
|||
ld a, $ff
|
||||
ld [$c0ee], a
|
||||
call PlaySound
|
||||
ld b, BANK(Music_RivalAlternateStartAndTempo)
|
||||
ld hl, Music_RivalAlternateStartAndTempo
|
||||
call Bankswitch
|
||||
callba Music_RivalAlternateStartAndTempo
|
||||
ld a, [$cf0d]
|
||||
cp $1
|
||||
jr nz, .asm_51134
|
||||
|
|
@ -347,10 +342,10 @@ asm_51145: ; 51145 (14:5145)
|
|||
jp MoveSprite
|
||||
|
||||
MovementData_5114c: ; 5114c (14:514c)
|
||||
db $80
|
||||
db $80 ; left
|
||||
|
||||
MovementData_5114d: ; 5114d (14:514d)
|
||||
db $80,$80,$80,$FF
|
||||
db $80,$80,$80,$FF ; left x3
|
||||
|
||||
Route22Script6: ; 51151 (14:5151)
|
||||
ld a, [$d730]
|
||||
|
|
@ -373,18 +368,18 @@ Route22Script6: ; 51151 (14:5151)
|
|||
Route22TextPointers: ; 51175 (14:5175)
|
||||
dw Route22Text1
|
||||
dw Route22Text2
|
||||
dw Route22Text3
|
||||
dw Route22FrontGateText
|
||||
|
||||
Route22Text1: ; 5117b (14:517b)
|
||||
db $08 ; asm
|
||||
ld a, [$d7eb]
|
||||
bit 5, a
|
||||
jr z, .asm_a88cf ; 0x51181
|
||||
ld hl, Route22Text_511b2
|
||||
ld hl, Route22RivalAfterBattleText1
|
||||
call PrintText
|
||||
jr .asm_48088 ; 0x51189
|
||||
.asm_a88cf ; 0x5118b
|
||||
ld hl, Route22Text_511ad
|
||||
ld hl, Route22RivalBeforeBattleText1
|
||||
call PrintText
|
||||
.asm_48088 ; 0x51191
|
||||
jp TextScriptEnd
|
||||
|
|
@ -394,47 +389,47 @@ Route22Text2: ; 51194 (14:5194)
|
|||
ld a, [$d7eb]
|
||||
bit 6, a
|
||||
jr z, .asm_58c0a ; 0x5119a
|
||||
ld hl, Route22Text_511c6
|
||||
ld hl, Route22RivalAfterBattleText2
|
||||
call PrintText
|
||||
jr .asm_673ee ; 0x511a2
|
||||
.asm_58c0a ; 0x511a4
|
||||
ld hl, Route22Text_511c1
|
||||
ld hl, Route22RivalBeforeBattleText2
|
||||
call PrintText
|
||||
.asm_673ee ; 0x511aa
|
||||
jp TextScriptEnd
|
||||
|
||||
Route22Text_511ad: ; 511ad (14:51ad)
|
||||
TX_FAR _Route22Text_511ad
|
||||
Route22RivalBeforeBattleText1: ; 511ad (14:51ad)
|
||||
TX_FAR _Route22RivalBeforeBattleText1
|
||||
db "@"
|
||||
|
||||
Route22Text_511b2: ; 511b2 (14:51b2)
|
||||
TX_FAR _Route22Text_511b2
|
||||
Route22RivalAfterBattleText1: ; 511b2 (14:51b2)
|
||||
TX_FAR _Route22RivalAfterBattleText1
|
||||
db "@"
|
||||
|
||||
Route22Text_511b7: ; 511b7 (14:51b7)
|
||||
TX_FAR _Route22Text_511b7
|
||||
Route22RivalDefeatedText1: ; 511b7 (14:51b7)
|
||||
TX_FAR _Route22RivalDefeatedText1
|
||||
db "@"
|
||||
|
||||
Route22Text_511bc: ; 511bc (14:51bc)
|
||||
TX_FAR _Route22Text_511bc
|
||||
db "@"
|
||||
|
||||
Route22Text_511c1: ; 511c1 (14:51c1)
|
||||
TX_FAR _Route22Text_511c1
|
||||
Route22RivalBeforeBattleText2: ; 511c1 (14:51c1)
|
||||
TX_FAR _Route22RivalBeforeBattleText2
|
||||
db "@"
|
||||
|
||||
Route22Text_511c6: ; 511c6 (14:51c6)
|
||||
TX_FAR _Route22Text_511c6
|
||||
Route22RivalAfterBattleText2: ; 511c6 (14:51c6)
|
||||
TX_FAR _Route22RivalAfterBattleText2
|
||||
db "@"
|
||||
|
||||
Route22Text_511cb: ; 511cb (14:51cb)
|
||||
TX_FAR _Route22Text_511cb
|
||||
Route22RivalDefeatedText2: ; 511cb (14:51cb)
|
||||
TX_FAR _Route22RivalDefeatedText2
|
||||
db "@"
|
||||
|
||||
Route22Text_511d0: ; 511d0 (14:51d0)
|
||||
TX_FAR _Route22Text_511d0
|
||||
db "@"
|
||||
|
||||
Route22Text3: ; 511d5 (14:51d5)
|
||||
TX_FAR _Route22Text3
|
||||
Route22FrontGateText: ; 511d5 (14:51d5)
|
||||
TX_FAR _Route22FrontGateText
|
||||
db "@"
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ Route22GateScript: ; 1e683 (7:6683)
|
|||
call CallFunctionInTable
|
||||
ld a, [W_YCOORD]
|
||||
cp $4
|
||||
ld a, $22
|
||||
ld a, ROUTE_23
|
||||
jr c, .asm_1e69a ; 0x1e696 $2
|
||||
ld a, $21
|
||||
ld a, ROUTE_22
|
||||
.asm_1e69a
|
||||
ld [$d365], a
|
||||
ld [wLastMap], a
|
||||
ret
|
||||
|
||||
Route22GateScriptPointers: ; 1e69e (7:669e)
|
||||
|
|
|
|||
|
|
@ -26,9 +26,7 @@ Route5GateScript0: ; 1df50 (7:5f50)
|
|||
ld [$d528], a
|
||||
xor a
|
||||
ld [H_CURRENTPRESSEDBUTTONS], a
|
||||
ld b, BANK(RemoveGuardDrink)
|
||||
ld hl, RemoveGuardDrink
|
||||
call Bankswitch
|
||||
callba RemoveGuardDrink
|
||||
ld a, [$ff00+$db]
|
||||
and a
|
||||
jr nz, .asm_1df82 ; 0x1df70 $10
|
||||
|
|
@ -75,9 +73,7 @@ Route5GateText1: ; 1dfaa (7:5faa)
|
|||
ld a, [$d728]
|
||||
bit 6, a
|
||||
jr nz, .asm_88856 ; 0x1dfb0 $2c
|
||||
ld b, BANK(RemoveGuardDrink)
|
||||
ld hl, RemoveGuardDrink
|
||||
call Bankswitch
|
||||
callba RemoveGuardDrink
|
||||
ld a, [$ff00+$db]
|
||||
and a
|
||||
jr nz, .asm_768a2 ; 0x1dfbd $11
|
||||
|
|
|
|||
|
|
@ -20,9 +20,7 @@ Route6GateScript0: ; 1e04e (7:604e)
|
|||
ld [$d528], a
|
||||
xor a
|
||||
ld [H_CURRENTPRESSEDBUTTONS], a
|
||||
ld b, BANK(RemoveGuardDrink)
|
||||
ld hl, RemoveGuardDrink
|
||||
call Bankswitch
|
||||
callba RemoveGuardDrink
|
||||
ld a, [$ffdb]
|
||||
and a
|
||||
jr nz, .asm_1e080 ; 0x1e06e $10
|
||||
|
|
|
|||
|
|
@ -32,9 +32,7 @@ Route7GateScript0: ; 1e128 (7:6128)
|
|||
ld [$d528], a
|
||||
xor a
|
||||
ld [H_CURRENTPRESSEDBUTTONS], a
|
||||
ld b, BANK(RemoveGuardDrink)
|
||||
ld hl, RemoveGuardDrink
|
||||
call Bankswitch
|
||||
callba RemoveGuardDrink
|
||||
ld a, [$ffdb]
|
||||
and a
|
||||
jr nz, .asm_1e15a ; 0x1e148 $10
|
||||
|
|
|
|||
|
|
@ -31,9 +31,7 @@ Route8GateScript0: ; 1e1ee (7:61ee)
|
|||
ld [$d528], a
|
||||
xor a
|
||||
ld [H_CURRENTPRESSEDBUTTONS], a
|
||||
ld b, BANK(RemoveGuardDrink)
|
||||
ld hl, RemoveGuardDrink
|
||||
call Bankswitch
|
||||
callba RemoveGuardDrink
|
||||
ld a, [$ffdb]
|
||||
and a
|
||||
jr nz, .asm_1e220 ; 0x1e20e $10
|
||||
|
|
|
|||
|
|
@ -221,9 +221,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8)
|
|||
ld a, $ff
|
||||
ld [$c0ee], a
|
||||
call PlaySound
|
||||
ld b, BANK(Music_RivalAlternateStart)
|
||||
ld hl, Music_RivalAlternateStart
|
||||
call Bankswitch
|
||||
callba Music_RivalAlternateStart
|
||||
ld de, MovementData_51d1d
|
||||
ld a, [$cf0d]
|
||||
cp $1
|
||||
|
|
|
|||
|
|
@ -63,9 +63,7 @@ SilphCoElevatorWarpMaps: ; 45811 (11:45811)
|
|||
|
||||
SilphCoElevatorScript_45827: ; 45827 (11:5827)
|
||||
call Delay3
|
||||
ld b, BANK(ShakeElevator)
|
||||
ld hl, ShakeElevator
|
||||
call Bankswitch
|
||||
callba ShakeElevator
|
||||
ret
|
||||
|
||||
SilphCoElevatorTextPointers: ; 45833 (11:5833)
|
||||
|
|
|
|||
|
|
@ -144,9 +144,7 @@ SSAnne2Script2: ; 6146d (18:546d)
|
|||
ld a, $ff
|
||||
ld [$c0ee], a
|
||||
call PlaySound
|
||||
ld b, BANK(Music_RivalAlternateStart)
|
||||
ld hl, Music_RivalAlternateStart
|
||||
call Bankswitch
|
||||
callba Music_RivalAlternateStart
|
||||
ld a, $3
|
||||
ld [W_SSANNE2CURSCRIPT], a
|
||||
ret
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
UndergroundPathEntranceRoute5Script: ; 5d6a9 (17:56a9)
|
||||
ld a, $10
|
||||
ld [$d365], a
|
||||
ld a, ROUTE_5
|
||||
ld [wLastMap], a
|
||||
ret
|
||||
|
||||
UndergroundPathEntranceRoute5_5d6af: ; 5d6af (17:56af)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
UndergroundPathEntranceRoute6Script: ; 5d6ef (17:56ef)
|
||||
ld a, $11
|
||||
ld [$d365], a
|
||||
ld a, ROUTE_6
|
||||
ld [wLastMap], a
|
||||
jp EnableAutoTextBoxDrawing
|
||||
|
||||
UndergroundPathEntranceRoute6TextPointers: ; 5d6f7 (17:56f7)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
UndergroundPathEntranceRoute7Script: ; 5d72c (17:572c)
|
||||
ld a, $12
|
||||
ld [$d365], a
|
||||
ld a, ROUTE_7
|
||||
ld [wLastMap], a
|
||||
jp EnableAutoTextBoxDrawing
|
||||
|
||||
UndergroundPathEntranceRoute7TextPointers: ; 5d734 (17:5734)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
UndergroundPathEntranceRoute7CopyScript: ; 5d769 (17:5769)
|
||||
ld a, $12
|
||||
ld [$d365], a
|
||||
ld a, ROUTE_7
|
||||
ld [wLastMap], a
|
||||
ret
|
||||
|
||||
UndergroundPathEntranceRoute7CopyTextPointers: ; 5d76f (17:576f)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
UndergroundPathEntranceRoute8Script: ; 1e289 (7:6289)
|
||||
ld a, $13
|
||||
ld [$d365], a
|
||||
ld a, ROUTE_8
|
||||
ld [wLastMap], a
|
||||
jp EnableAutoTextBoxDrawing
|
||||
|
||||
UndergroundPathEntranceRoute8TextPointers: ; 1e291 (7:6291)
|
||||
|
|
|
|||
|
|
@ -46,9 +46,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
|
|||
ld c, BANK(Music_Surfing)
|
||||
ld a, MUSIC_SURFING
|
||||
call PlayMusic
|
||||
ld b, BANK(LoadSmokeTileFourTimes)
|
||||
ld hl, LoadSmokeTileFourTimes
|
||||
call Bankswitch
|
||||
callba LoadSmokeTileFourTimes
|
||||
xor a
|
||||
ld [$c102], a
|
||||
ld c, $78
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue