mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-06 15:45:24 +13:00
misc
This commit is contained in:
YamaArashi
parent
b96ef8d2d4
commit
c169073eed
61 changed files with 743 additions and 612 deletions
|
|
@ -67,7 +67,7 @@ AgathaScript0: ; 76490 (1d:6490)
|
|||
ld [hJoyHeld], a
|
||||
ld [wSimulatedJoypadStatesEnd], a
|
||||
ld [wSimulatedJoypadStatesIndex], a
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wCoordIndex]
|
||||
cp $3
|
||||
jr c, .asm_764b4
|
||||
ld hl, wd865
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ BrunoScript0: ; 76339 (1d:6339)
|
|||
ld [hJoyHeld], a
|
||||
ld [wSimulatedJoypadStatesEnd], a
|
||||
ld [wSimulatedJoypadStatesIndex], a
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wCoordIndex]
|
||||
cp $3
|
||||
jr c, .asm_7635d
|
||||
ld hl, wd864
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
|
|||
ld hl, CeruleanCityCoords1
|
||||
call ArePlayerCoordsInArray
|
||||
jr nc, .asm_194f7
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wCoordIndex]
|
||||
cp $1
|
||||
ld a, $8
|
||||
ld b, SPRITE_FACING_DOWN
|
||||
|
|
|
|||
|
|
@ -9,19 +9,19 @@ DayCareMText1: ; 56254 (15:6254)
|
|||
call SaveScreenTilesToBuffer2
|
||||
ld a, [W_DAYCARE_IN_USE]
|
||||
and a
|
||||
jp nz, DayCareMScript_562e1
|
||||
ld hl, DayCareMText_5640f
|
||||
jp nz, .daycareInUse
|
||||
ld hl, DayCareIntroText
|
||||
call PrintText
|
||||
call YesNoChoice
|
||||
ld a, [wCurrentMenuItem]
|
||||
and a
|
||||
ld hl, DayCareMText_5643b
|
||||
jp nz, DayCareMScript_56409
|
||||
ld hl, DayCareComeAgainText
|
||||
jp nz, .done
|
||||
ld a, [wPartyCount]
|
||||
dec a
|
||||
ld hl, DayCareMText_56445
|
||||
jp z, DayCareMScript_56409
|
||||
ld hl, DayCareMText_56414
|
||||
ld hl, DayCareOnlyHaveOneMonText
|
||||
jp z, .done
|
||||
ld hl, DayCareWhichMonText
|
||||
call PrintText
|
||||
xor a
|
||||
ld [wUpdateSpritesEnabled], a
|
||||
|
|
@ -33,17 +33,17 @@ DayCareMText1: ; 56254 (15:6254)
|
|||
call RestoreScreenTilesAndReloadTilePatterns
|
||||
call LoadGBPal
|
||||
pop af
|
||||
ld hl, DayCareMText_56437
|
||||
jp c, DayCareMScript_56409
|
||||
ld hl, DayCareAllRightThenText
|
||||
jp c, .done
|
||||
callab KnowsHMMove
|
||||
ld hl, DayCareMText_5644a
|
||||
jp c, DayCareMScript_56409
|
||||
ld hl, DayCareCantAcceptMonWithHMText
|
||||
jp c, .done
|
||||
xor a
|
||||
ld [wPartyAndBillsPCSavedMenuItem], a
|
||||
ld a, [wWhichPokemon]
|
||||
ld hl, wPartyMonNicks
|
||||
call GetPartyMonName
|
||||
ld hl, DayCareMText_56419
|
||||
ld hl, DayCareWillLookAfterMonText
|
||||
call PrintText
|
||||
ld a, 1
|
||||
ld [W_DAYCARE_IN_USE], a
|
||||
|
|
@ -55,10 +55,10 @@ DayCareMText1: ; 56254 (15:6254)
|
|||
call RemovePokemon
|
||||
ld a, [wcf91]
|
||||
call PlayCry
|
||||
ld hl, DayCareMText_5641e
|
||||
jp DayCareMScript_56409
|
||||
ld hl, DayCareComeSeeMeInAWhileText
|
||||
jp .done
|
||||
|
||||
DayCareMScript_562e1: ; 562e1 (15:62e1)
|
||||
.daycareInUse
|
||||
xor a
|
||||
ld hl, W_DAYCAREMONNAME
|
||||
call GetPartyMonName
|
||||
|
|
@ -68,40 +68,41 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
|
|||
callab CalcLevelFromExperience
|
||||
ld a, d
|
||||
cp MAX_LEVEL
|
||||
jr c, .asm_56315
|
||||
jr c, .skipCalcExp
|
||||
|
||||
ld d, MAX_LEVEL
|
||||
callab CalcExperience
|
||||
ld hl, wDayCareMonExp
|
||||
ld a, [H_NUMTOPRINT]
|
||||
ld a, [hExperience]
|
||||
ld [hli], a
|
||||
ld a, [$ff97]
|
||||
ld a, [hExperience + 1]
|
||||
ld [hli], a
|
||||
ld a, [$ff98]
|
||||
ld a, [hExperience + 2]
|
||||
ld [hl], a
|
||||
ld d, MAX_LEVEL
|
||||
|
||||
.asm_56315
|
||||
.skipCalcExp
|
||||
xor a
|
||||
ld [wTrainerEngageDistance], a
|
||||
ld [wDayCareNumLevelsGrown], a
|
||||
ld hl, wDayCareMonBoxLevel
|
||||
ld a, [hl]
|
||||
ld [wTrainerSpriteOffset], a
|
||||
ld [wDayCareStartLevel], a
|
||||
cp d
|
||||
ld [hl], d
|
||||
ld hl, DayCareMText_56432
|
||||
jr z, .asm_56333
|
||||
ld a, [wTrainerSpriteOffset]
|
||||
ld hl, DayCareMonNeedsMoreTimeText
|
||||
jr z, .next
|
||||
ld a, [wDayCareStartLevel]
|
||||
ld b, a
|
||||
ld a, d
|
||||
sub b
|
||||
ld [wTrainerEngageDistance], a
|
||||
ld hl, DayCareMText_56423
|
||||
ld [wDayCareNumLevelsGrown], a
|
||||
ld hl, DayCareMonHasGrownText
|
||||
|
||||
.asm_56333
|
||||
.next
|
||||
call PrintText
|
||||
ld a, [wPartyCount]
|
||||
cp PARTY_LENGTH
|
||||
ld hl, DayCareMText_56440
|
||||
ld hl, DayCareNoRoomForMonText
|
||||
jp z, .asm_56403
|
||||
ld de, wTrainerFacingDirection
|
||||
xor a
|
||||
|
|
@ -112,7 +113,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
|
|||
ld a, $1
|
||||
ld [hli], a
|
||||
ld [hl], $0
|
||||
ld a, [wTrainerEngageDistance]
|
||||
ld a, [wDayCareNumLevelsGrown]
|
||||
inc a
|
||||
ld b, a
|
||||
ld c, $2
|
||||
|
|
@ -126,13 +127,13 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
|
|||
pop hl
|
||||
dec b
|
||||
jr nz, .asm_56357
|
||||
ld hl, DayCareMText_56428
|
||||
ld hl, DayCareOweMoneyText
|
||||
call PrintText
|
||||
ld a, $13
|
||||
ld [wTextBoxID], a
|
||||
call DisplayTextBoxID
|
||||
call YesNoChoice
|
||||
ld hl, DayCareMText_56437
|
||||
ld hl, DayCareAllRightThenText
|
||||
ld a, [wCurrentMenuItem]
|
||||
and a
|
||||
jp nz, .asm_56403
|
||||
|
|
@ -144,13 +145,13 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
|
|||
ld [hMoney + 2], a
|
||||
call HasEnoughMoney
|
||||
jr nc, .asm_56396
|
||||
ld hl, DayCareMText_56454
|
||||
ld hl, DayCareNotEnoughMoneyText
|
||||
jp .asm_56403
|
||||
|
||||
.asm_56396
|
||||
xor a
|
||||
ld [W_DAYCARE_IN_USE], a
|
||||
ld hl, wTrainerEngageDistance
|
||||
ld hl, wDayCareNumLevelsGrown
|
||||
ld [hli], a
|
||||
inc hl
|
||||
ld de, wPlayerMoney + 2
|
||||
|
|
@ -161,7 +162,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
|
|||
ld a, MONEY_BOX
|
||||
ld [wTextBoxID], a
|
||||
call DisplayTextBoxID
|
||||
ld hl, DayCareMText_5644f
|
||||
ld hl, DayCareHeresYourMonText
|
||||
call PrintText
|
||||
ld a, DAYCARE_TO_PARTY
|
||||
ld [wMoveMonType], a
|
||||
|
|
@ -178,10 +179,12 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
|
|||
ld d, h
|
||||
ld e, l
|
||||
ld a, 1
|
||||
ld [wHPBarMaxHP], a
|
||||
ld [wLearningMovesFromDayCare], a
|
||||
predef WriteMonMoves
|
||||
pop bc
|
||||
pop af
|
||||
|
||||
; set mon's HP to max
|
||||
ld hl, wPartyMon1HP
|
||||
call AddNTimes
|
||||
ld d, h
|
||||
|
|
@ -193,73 +196,74 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
|
|||
inc de
|
||||
ld a, [hl]
|
||||
ld [de], a
|
||||
|
||||
ld a, [wcf91]
|
||||
call PlayCry
|
||||
ld hl, DayCareMText_5642d
|
||||
jr DayCareMScript_56409
|
||||
ld hl, DayCareGotMonBackText
|
||||
jr .done
|
||||
|
||||
.asm_56403
|
||||
ld a, [wTrainerSpriteOffset]
|
||||
ld a, [wDayCareStartLevel]
|
||||
ld [wDayCareMonBoxLevel], a
|
||||
|
||||
DayCareMScript_56409: ; 56409 (15:6409)
|
||||
.done
|
||||
call PrintText
|
||||
jp TextScriptEnd
|
||||
|
||||
DayCareMText_5640f: ; 5640f (15:640f)
|
||||
TX_FAR _DayCareMText_5640f
|
||||
DayCareIntroText: ; 5640f (15:640f)
|
||||
TX_FAR _DayCareIntroText
|
||||
db "@"
|
||||
|
||||
DayCareMText_56414: ; 56414 (15:6414)
|
||||
TX_FAR _DayCareMText_56414
|
||||
DayCareWhichMonText: ; 56414 (15:6414)
|
||||
TX_FAR _DayCareWhichMonText
|
||||
db "@"
|
||||
|
||||
DayCareMText_56419: ; 56419 (15:6419)
|
||||
TX_FAR _DayCareMText_56419
|
||||
DayCareWillLookAfterMonText: ; 56419 (15:6419)
|
||||
TX_FAR _DayCareWillLookAfterMonText
|
||||
db "@"
|
||||
|
||||
DayCareMText_5641e: ; 5641e (15:641e)
|
||||
TX_FAR _DayCareMText_5641e
|
||||
DayCareComeSeeMeInAWhileText: ; 5641e (15:641e)
|
||||
TX_FAR _DayCareComeSeeMeInAWhileText
|
||||
db "@"
|
||||
|
||||
DayCareMText_56423: ; 56423 (15:6423)
|
||||
TX_FAR _DayCareMText_56423
|
||||
DayCareMonHasGrownText: ; 56423 (15:6423)
|
||||
TX_FAR _DayCareMonHasGrownText
|
||||
db "@"
|
||||
|
||||
DayCareMText_56428: ; 56428 (15:6428)
|
||||
TX_FAR _DayCareMText_56428
|
||||
DayCareOweMoneyText: ; 56428 (15:6428)
|
||||
TX_FAR _DayCareOweMoneyText
|
||||
db "@"
|
||||
|
||||
DayCareMText_5642d: ; 5642d (15:642d)
|
||||
TX_FAR _DayCareMText_5642d
|
||||
DayCareGotMonBackText: ; 5642d (15:642d)
|
||||
TX_FAR _DayCareGotMonBackText
|
||||
db "@"
|
||||
|
||||
DayCareMText_56432: ; 56432 (15:6432)
|
||||
TX_FAR _DayCareMText_56432
|
||||
DayCareMonNeedsMoreTimeText: ; 56432 (15:6432)
|
||||
TX_FAR _DayCareMonNeedsMoreTimeText
|
||||
db "@"
|
||||
|
||||
DayCareMText_56437: ; 56437 (15:6437)
|
||||
TX_FAR _DayCareMText_56437
|
||||
DayCareMText_5643b: ; 5643b (15:643b)
|
||||
TX_FAR _DayCareMText_5643b
|
||||
DayCareAllRightThenText: ; 56437 (15:6437)
|
||||
TX_FAR _DayCareAllRightThenText
|
||||
DayCareComeAgainText: ; 5643b (15:643b)
|
||||
TX_FAR _DayCareComeAgainText
|
||||
db "@"
|
||||
|
||||
DayCareMText_56440: ; 56440 (15:6440)
|
||||
TX_FAR _DayCareMText_56440
|
||||
DayCareNoRoomForMonText: ; 56440 (15:6440)
|
||||
TX_FAR _DayCareNoRoomForMonText
|
||||
db "@"
|
||||
|
||||
DayCareMText_56445: ; 56445 (15:6445)
|
||||
TX_FAR _DayCareMText_56445
|
||||
DayCareOnlyHaveOneMonText: ; 56445 (15:6445)
|
||||
TX_FAR _DayCareOnlyHaveOneMonText
|
||||
db "@"
|
||||
|
||||
DayCareMText_5644a: ; 5644a (15:644a)
|
||||
TX_FAR _DayCareMText_5644a
|
||||
DayCareCantAcceptMonWithHMText: ; 5644a (15:644a)
|
||||
TX_FAR _DayCareCantAcceptMonWithHMText
|
||||
db "@"
|
||||
|
||||
DayCareMText_5644f: ; 5644f (15:644f)
|
||||
TX_FAR _DayCareMText_5644f
|
||||
DayCareHeresYourMonText: ; 5644f (15:644f)
|
||||
TX_FAR _DayCareHeresYourMonText
|
||||
db "@"
|
||||
|
||||
DayCareMText_56454: ; 56454 (15:6454)
|
||||
TX_FAR _DayCareMText_56454
|
||||
DayCareNotEnoughMoneyText: ; 56454 (15:6454)
|
||||
TX_FAR _DayCareNotEnoughMoneyText
|
||||
db "@"
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ LanceScript0: ; 5a305 (16:6305)
|
|||
jp nc, CheckFightingMapTrainers
|
||||
xor a
|
||||
ld [hJoyHeld], a
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wCoordIndex]
|
||||
cp $3
|
||||
jr nc, .asm_5a325
|
||||
ld a, $1
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ LoreleiScript0: ; 761e2 (1d:61e2)
|
|||
ld [hJoyHeld], a
|
||||
ld [wSimulatedJoypadStatesEnd], a
|
||||
ld [wSimulatedJoypadStatesIndex], a
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wCoordIndex]
|
||||
cp $3
|
||||
jr c, .asm_76206
|
||||
ld hl, wd863
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ Mansion3Script_5225b: ; 5225b (14:625b)
|
|||
ret nz
|
||||
call ArePlayerCoordsInArray
|
||||
ret nc
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wCoordIndex]
|
||||
ld [wWhichDungeonWarp], a
|
||||
ld hl, wd72d
|
||||
set 4, [hl]
|
||||
|
|
|
|||
|
|
@ -25,51 +25,51 @@ MtMoonPokecenterText4: ; 492ec (12:52ec)
|
|||
TX_ASM
|
||||
ld a, [wd7c6]
|
||||
add a
|
||||
jp c, .asm_49353
|
||||
jp c, .alreadyBoughtMagikarp
|
||||
ld hl, MtMoonPokecenterText_4935c
|
||||
call PrintText
|
||||
ld a, $13
|
||||
ld a, MONEY_BOX
|
||||
ld [wTextBoxID], a
|
||||
call DisplayTextBoxID
|
||||
call YesNoChoice
|
||||
ld a, [wCurrentMenuItem]
|
||||
and a
|
||||
jp nz, .asm_4934e
|
||||
jp nz, .choseNo
|
||||
ld [hMoney], a
|
||||
ld [hMoney + 2], a
|
||||
ld a, $5
|
||||
ld [hMoney + 1], a
|
||||
call HasEnoughMoney
|
||||
jr nc, .asm_faa09
|
||||
jr nc, .enoughMoney
|
||||
ld hl, MtMoonPokecenterText_49366
|
||||
jr .asm_49356
|
||||
.asm_faa09
|
||||
jr .printText
|
||||
.enoughMoney
|
||||
ld bc,(MAGIKARP << 8) | 5
|
||||
call GivePokemon
|
||||
jr nc, .asm_49359
|
||||
jr nc, .done
|
||||
xor a
|
||||
ld [wWhichTrade], a
|
||||
ld [wTrainerFacingDirection], a
|
||||
ld [wPriceTemp], a
|
||||
ld [wPriceTemp + 2], a
|
||||
ld a, $5
|
||||
ld [wTrainerEngageDistance], a
|
||||
ld hl, wTrainerFacingDirection
|
||||
ld [wPriceTemp + 1], a
|
||||
ld hl, wPriceTemp + 2
|
||||
ld de, wPlayerMoney + 2
|
||||
ld c, $3
|
||||
predef SubBCDPredef
|
||||
ld a, $13
|
||||
ld a, MONEY_BOX
|
||||
ld [wTextBoxID], a
|
||||
call DisplayTextBoxID
|
||||
ld hl, wd7c6
|
||||
set 7, [hl]
|
||||
jr .asm_49359
|
||||
.asm_4934e
|
||||
jr .done
|
||||
.choseNo
|
||||
ld hl, MtMoonPokecenterText_49361
|
||||
jr .asm_49356
|
||||
.asm_49353
|
||||
jr .printText
|
||||
.alreadyBoughtMagikarp
|
||||
ld hl, MtMoonPokecenterText_4936b
|
||||
.asm_49356
|
||||
.printText
|
||||
call PrintText
|
||||
.asm_49359
|
||||
.done
|
||||
jp TextScriptEnd
|
||||
|
||||
MtMoonPokecenterText_4935c: ; 4935c (12:535c)
|
||||
|
|
|
|||
|
|
@ -96,11 +96,11 @@ Museum1FText1: ; 5c135 (17:4135)
|
|||
ld hl, wd754
|
||||
set 0, [hl]
|
||||
xor a
|
||||
ld [wMuseumPriceTemp], a
|
||||
ld [wMuseumPriceTemp + 1], a
|
||||
ld [wPriceTemp], a
|
||||
ld [wPriceTemp + 1], a
|
||||
ld a, $50
|
||||
ld [wMuseumPriceTemp + 2], a
|
||||
ld hl, wMuseumPriceTemp + 2
|
||||
ld [wPriceTemp + 2], a
|
||||
ld hl, wPriceTemp + 2
|
||||
ld de, wPlayerMoney + 2
|
||||
ld c, $3
|
||||
predef SubBCDPredef
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@ OaksLabScript9: ; 1cd00 (7:4d00)
|
|||
ld a, $d
|
||||
ld [hSpriteIndexOrTextID], a
|
||||
call DisplayTextID
|
||||
ld a, [wTrainerEngageDistance]
|
||||
ld a, [wRivalStarterBallSpriteIndex]
|
||||
cp $2
|
||||
jr nz, .asm_1cd28
|
||||
ld a, HS_STARTER_BALL_1
|
||||
|
|
@ -323,7 +323,7 @@ OaksLabScript9: ; 1cd00 (7:4d00)
|
|||
ld [wcc4d], a
|
||||
predef HideObject
|
||||
call Delay3
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wRivalStarterTemp]
|
||||
ld [W_RIVALSTARTER], a
|
||||
ld [wcf91], a
|
||||
ld [wd11e], a
|
||||
|
|
@ -806,9 +806,9 @@ OaksLabText29: ; 1d102 (7:5102)
|
|||
OaksLabText2: ; 1d102 (7:5102)
|
||||
TX_ASM
|
||||
ld a, STARTER2
|
||||
ld [wWhichTrade], a
|
||||
ld [wRivalStarterTemp], a
|
||||
ld a, $3
|
||||
ld [wTrainerEngageDistance], a
|
||||
ld [wRivalStarterBallSpriteIndex], a
|
||||
ld a, STARTER1
|
||||
ld b, $2
|
||||
jr OaksLabScript_1d133
|
||||
|
|
@ -817,9 +817,9 @@ OaksLabText30: ; 1d113 (7:5113)
|
|||
OaksLabText3: ; 1d113 (7:5113)
|
||||
TX_ASM
|
||||
ld a, STARTER3
|
||||
ld [wWhichTrade], a
|
||||
ld [wRivalStarterTemp], a
|
||||
ld a, $4
|
||||
ld [wTrainerEngageDistance], a
|
||||
ld [wRivalStarterBallSpriteIndex], a
|
||||
ld a, STARTER2
|
||||
ld b, $3
|
||||
jr OaksLabScript_1d133
|
||||
|
|
@ -828,9 +828,9 @@ OaksLabText31: ; 1d124 (7:5124)
|
|||
OaksLabText4: ; 1d124 (7:5124)
|
||||
TX_ASM
|
||||
ld a, STARTER1
|
||||
ld [wWhichTrade], a
|
||||
ld [wRivalStarterTemp], a
|
||||
ld a, $2
|
||||
ld [wTrainerEngageDistance], a
|
||||
ld [wRivalStarterBallSpriteIndex], a
|
||||
ld a, STARTER3
|
||||
ld b, $4
|
||||
|
||||
|
|
@ -858,13 +858,13 @@ OaksLabScript_1d157: ; 1d157 (7:5157)
|
|||
ld a, $9
|
||||
ld [H_SPRITEDATAOFFSET], a
|
||||
call GetPointerWithinSpriteStateData1
|
||||
ld [hl], $0
|
||||
ld [hl], SPRITE_FACING_DOWN
|
||||
ld a, $1
|
||||
ld [H_SPRITEINDEX], a
|
||||
ld a, $9
|
||||
ld [H_SPRITEDATAOFFSET], a
|
||||
call GetPointerWithinSpriteStateData1
|
||||
ld [hl], $c
|
||||
ld [hl], SPRITE_FACING_RIGHT
|
||||
ld hl, wd730
|
||||
set 6, [hl]
|
||||
predef StarterDex ; StarterDex
|
||||
|
|
|
|||
|
|
@ -26,39 +26,45 @@ PewterPokecenterText3: ; 5c59b (17:459b)
|
|||
ld c, 32
|
||||
call DelayFrames
|
||||
ld hl, JigglypuffFacingDirections
|
||||
ld de, wTrainerFacingDirection
|
||||
ld bc, $0004
|
||||
ld de, wJigglypuffFacingDirections
|
||||
ld bc, 4
|
||||
call CopyData
|
||||
ld a, [wSpriteStateData1 + $32]
|
||||
ld hl, wTrainerFacingDirection
|
||||
.asm_5c5c3
|
||||
|
||||
ld a, [wSpriteStateData1 + 3 * $10 + $2]
|
||||
ld hl, wJigglypuffFacingDirections
|
||||
.findMatchingFacingDirectionLoop
|
||||
cp [hl]
|
||||
inc hl
|
||||
jr nz, .asm_5c5c3
|
||||
jr nz, .findMatchingFacingDirectionLoop
|
||||
dec hl
|
||||
push hl
|
||||
ld c, BANK(Music_JigglypuffSong)
|
||||
ld a, MUSIC_JIGGLYPUFF_SONG
|
||||
call PlayMusic
|
||||
pop hl
|
||||
.asm_5c5d1
|
||||
.loop
|
||||
ld a, [hl]
|
||||
ld [wSpriteStateData1 + $32], a
|
||||
ld [wSpriteStateData1 + 3 * $10 + $2], a
|
||||
|
||||
; rotate the array
|
||||
push hl
|
||||
ld hl, wTrainerFacingDirection
|
||||
ld de, wTrainerEngageDistance
|
||||
ld bc, $0004
|
||||
ld hl, wJigglypuffFacingDirections
|
||||
ld de, wJigglypuffFacingDirections - 1
|
||||
ld bc, 4
|
||||
call CopyData
|
||||
ld a, [wTrainerEngageDistance]
|
||||
ld [wcd42], a
|
||||
ld a, [wJigglypuffFacingDirections - 1]
|
||||
ld [wJigglypuffFacingDirections + 3], a
|
||||
pop hl
|
||||
|
||||
ld c, 24
|
||||
call DelayFrames
|
||||
|
||||
ld a, [wc026]
|
||||
ld b, a
|
||||
ld a, [wc027]
|
||||
or b
|
||||
jr nz, .asm_5c5d1
|
||||
jr nz, .loop
|
||||
|
||||
ld c, 48
|
||||
call DelayFrames
|
||||
call PlayDefaultMusic
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9)
|
|||
ld [hJoyHeld], a
|
||||
ld a, SPRITE_FACING_RIGHT
|
||||
ld [wSpriteStateData1 + 9], a
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wCoordIndex]
|
||||
cp $1
|
||||
jr z, .asm_7520f
|
||||
ld a, $2
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ SeafoamIslands1Script: ; 447e9 (11:47e9)
|
|||
call CheckBoulderCoords
|
||||
ret nc
|
||||
ld hl, wd7e8
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wCoordIndex]
|
||||
cp $1
|
||||
jr nz, .asm_44819
|
||||
set 6, [hl]
|
||||
|
|
@ -36,7 +36,7 @@ SeafoamIslands1Script: ; 447e9 (11:47e9)
|
|||
ld a, $9f
|
||||
ld [wDungeonWarpDestinationMap], a
|
||||
ld hl, Seafoam1HolesCoords
|
||||
jp Func_46981
|
||||
jp IsPlayerOnDungeonWarp
|
||||
|
||||
Seafoam1HolesCoords: ; 44846 (11:4846)
|
||||
db $06,$11
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ SeafoamIslands2Script: ; 46315 (11:6315)
|
|||
call CheckBoulderCoords
|
||||
ret nc
|
||||
ld hl, wd87f
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wCoordIndex]
|
||||
cp $1
|
||||
jr nz, .asm_46340
|
||||
set 0, [hl]
|
||||
|
|
@ -34,7 +34,7 @@ SeafoamIslands2Script: ; 46315 (11:6315)
|
|||
ld a, $a0
|
||||
ld [wDungeonWarpDestinationMap], a
|
||||
ld hl, Seafoam2HolesCoords
|
||||
jp Func_46981
|
||||
jp IsPlayerOnDungeonWarp
|
||||
|
||||
Seafoam2HolesCoords: ; 4636d (11:636d)
|
||||
db $06,$12
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ SeafoamIslands3Script: ; 46451 (11:6451)
|
|||
call CheckBoulderCoords
|
||||
ret nc
|
||||
ld hl, wd880
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wCoordIndex]
|
||||
cp $1
|
||||
jr nz, .asm_4647c
|
||||
set 0, [hl]
|
||||
|
|
@ -34,7 +34,7 @@ SeafoamIslands3Script: ; 46451 (11:6451)
|
|||
ld a, $a1
|
||||
ld [wDungeonWarpDestinationMap], a
|
||||
ld hl, Seafoam3HolesCoords
|
||||
jp Func_46981
|
||||
jp IsPlayerOnDungeonWarp
|
||||
|
||||
Seafoam3HolesCoords: ; 464a9 (11:64a9)
|
||||
db $06,$13
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ SeafoamIslands4Script: ; 4658d (11:658d)
|
|||
call CheckBoulderCoords
|
||||
ret nc
|
||||
ld hl, wd881
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wCoordIndex]
|
||||
cp $1
|
||||
jr nz, .asm_465b8
|
||||
set 0, [hl]
|
||||
|
|
@ -35,7 +35,7 @@ SeafoamIslands4Script: ; 4658d (11:658d)
|
|||
ld a, $a2
|
||||
ld [wDungeonWarpDestinationMap], a
|
||||
ld hl, Seafoam4HolesCoords
|
||||
call Func_46981
|
||||
call IsPlayerOnDungeonWarp
|
||||
ld a, [wd732]
|
||||
bit 4, a
|
||||
ret nz
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ SeafoamIslands5Script0: ; 467c7 (11:67c7)
|
|||
ld hl, CoordsData_467fe
|
||||
call ArePlayerCoordsInArray
|
||||
ret nc
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wCoordIndex]
|
||||
cp $3
|
||||
jr nc, .asm_467e6
|
||||
ld a, $40
|
||||
|
|
@ -81,7 +81,7 @@ SeafoamIslands5Script2: ; 46816 (11:6816)
|
|||
call ArePlayerCoordsInArray
|
||||
ld a, $0
|
||||
jr nc, .asm_46849
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wCoordIndex]
|
||||
cp $1
|
||||
jr nz, .asm_46837
|
||||
ld de, RLEMovementData_46859
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ SilphCo7Script0: ; 51c23 (14:5c23)
|
|||
ld [H_SPRITEINDEX], a
|
||||
call SetSpriteMovementBytesToFF
|
||||
ld de, MovementData_51c7d
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wCoordIndex]
|
||||
ld [wcf0d], a
|
||||
cp $1
|
||||
jr z, .asm_51c6c
|
||||
|
|
|
|||
|
|
@ -57,15 +57,15 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
|
|||
ld bc, $0078
|
||||
ld a, $14
|
||||
call FillMemory
|
||||
ld a, $1
|
||||
ld [$ffba], a
|
||||
ld a, 1
|
||||
ld [H_AUTOBGTRANSFERENABLED], a
|
||||
call Delay3
|
||||
xor a
|
||||
ld [$ffba], a
|
||||
ld [wWhichTrade], a
|
||||
ld [$ff49], a
|
||||
ld a, $58
|
||||
ld [wTrainerEngageDistance], a
|
||||
ld [H_AUTOBGTRANSFERENABLED], a
|
||||
ld [wSSAnneSmokeDriftAmount], a
|
||||
ld [rOBP1], a
|
||||
ld a, 88
|
||||
ld [wSSAnneSmokeX], a
|
||||
ld hl, wMapViewVRAMPointer
|
||||
ld c, [hl]
|
||||
inc hl
|
||||
|
|
@ -88,11 +88,11 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
|
|||
push hl
|
||||
push de
|
||||
call ScheduleEastColumnRedraw
|
||||
call VermilionDock_1dc59
|
||||
call VermilionDock_EmitSmokePuff
|
||||
pop de
|
||||
ld b, $10
|
||||
.asm_1dc11
|
||||
call VermilionDock_1dc42
|
||||
call VermilionDock_AnimSmokePuffDriftRight
|
||||
ld c, $8
|
||||
.asm_1dc16
|
||||
call VermilionDock_1dc7c
|
||||
|
|
@ -105,7 +105,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
|
|||
dec e
|
||||
jr nz, .asm_1dbfa
|
||||
xor a
|
||||
ld [$ff4a], a
|
||||
ld [rWY], a
|
||||
ld [hWY], a
|
||||
call VermilionDock_1dc94
|
||||
ld a, $90
|
||||
|
|
@ -122,33 +122,34 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
|
|||
dec [hl]
|
||||
ret
|
||||
|
||||
VermilionDock_1dc42: ; 1dc42 (7:5c42)
|
||||
VermilionDock_AnimSmokePuffDriftRight: ; 1dc42 (7:5c42)
|
||||
push bc
|
||||
push de
|
||||
ld hl, wOAMBuffer + $11
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wSSAnneSmokeDriftAmount]
|
||||
swap a
|
||||
ld c, a
|
||||
ld de, $0004
|
||||
.asm_1dc50
|
||||
ld de, 4
|
||||
.loop
|
||||
inc [hl]
|
||||
inc [hl]
|
||||
add hl, de
|
||||
dec c
|
||||
jr nz, .asm_1dc50
|
||||
jr nz, .loop
|
||||
pop de
|
||||
pop bc
|
||||
ret
|
||||
|
||||
VermilionDock_1dc59: ; 1dc59 (7:5c59)
|
||||
ld a, [wTrainerEngageDistance]
|
||||
sub $10
|
||||
ld [wTrainerEngageDistance], a
|
||||
VermilionDock_EmitSmokePuff: ; 1dc59 (7:5c59)
|
||||
; new smoke puff above the S.S. Anne's front smokestack
|
||||
ld a, [wSSAnneSmokeX]
|
||||
sub 16
|
||||
ld [wSSAnneSmokeX], a
|
||||
ld c, a
|
||||
ld b, $64
|
||||
ld a, [wWhichTrade]
|
||||
ld b, 100 ; Y
|
||||
ld a, [wSSAnneSmokeDriftAmount]
|
||||
inc a
|
||||
ld [wWhichTrade], a
|
||||
ld [wSSAnneSmokeDriftAmount], a
|
||||
ld a, $1
|
||||
ld de, VermilionDockOAMBlock
|
||||
call WriteOAMBlock
|
||||
|
|
@ -171,7 +172,7 @@ VermilionDock_1dc7c: ; 1dc7c (7:5c7c)
|
|||
cp l
|
||||
jr nz, .asm_1dc86
|
||||
ld a, h
|
||||
ld [$ff43], a
|
||||
ld [rSCX], a
|
||||
.asm_1dc8e
|
||||
ld a, [rLY]
|
||||
cp h
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ VictoryRoad2Script0: ; 517f1 (14:57f1)
|
|||
call CheckBoulderCoords
|
||||
jp nc, CheckFightingMapTrainers
|
||||
ld hl, wd7ee
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wCoordIndex]
|
||||
cp $2
|
||||
jr z, .asm_5180b
|
||||
bit 0, [hl]
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ VictoryRoad3Script0: ; 449b7 (11:49b7)
|
|||
ld hl, .coordsData_449f9
|
||||
call CheckBoulderCoords
|
||||
jp nc, .asm_449fe
|
||||
ld a, [wWhichTrade]
|
||||
ld a, [wCoordIndex]
|
||||
cp $1
|
||||
jr nz, .asm_449dc
|
||||
ld hl, wd126
|
||||
|
|
@ -60,11 +60,11 @@ VictoryRoad3Script0: ; 449b7 (11:49b7)
|
|||
db $FF
|
||||
|
||||
.asm_449fe
|
||||
ld a, $c2
|
||||
ld a, VICTORY_ROAD_2
|
||||
ld [wDungeonWarpDestinationMap], a
|
||||
ld hl, .coordsData_449f9
|
||||
call Func_46981
|
||||
ld a, [wWhichTrade]
|
||||
call IsPlayerOnDungeonWarp
|
||||
ld a, [wCoordIndex]
|
||||
cp $1
|
||||
jr nz, .asm_44a1b
|
||||
ld hl, wd72d
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue