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

Commented more sprite and map code

Browse source
This commit is contained in:
YamaArashi 2014-09-13 00:50:56 -07:00
parent 91793015e5
commit 0c916aea33
108 changed files with 1091 additions and 946 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/billshouse.asm
View file

@ -57,7 +57,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5)
ld a, $f0
ld [wJoyIgnore], a
ld a, $2
ld [wcf13], a
ld [wSpriteIndex], a
ld a, $c
ld [$ffeb], a
ld a, $40

6
scripts/celadongamecorner.asm
View file

@ -236,7 +236,7 @@ CeladonGameCornerText5: ; 48d4a (12:4d4a)
ld hl, wd77e
set 2, [hl]
ld a, $1
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, Received10CoinsText
jr .asm_c7d1a ; 0x48d87
.asm_d0957 ; 0x48d89
@ -411,7 +411,7 @@ CeladonGameCornerText11: ; 48e9d (12:4e9d)
ld de, CeladonGameCornerText_48ed3
call PreBattleSaveRegisters
ldh a, [$8c]
ld [wcf13], a
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
xor a
@ -437,7 +437,7 @@ CeladonGameCornerText13: ; 48ed8 (12:4ed8)
CeladonGameCornerText12: ; 48edd (12:4edd)
db $08 ; asm
ld a, $1
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, CeladonGameCornerText_48f09
call PrintText
call WaitForSoundToFinish

2
scripts/celadongym.asm
View file

@ -179,7 +179,7 @@ CeladonGymText1: ; 48a11 (12:4a11)
ld de, CeladonGymText_48a63
call PreBattleSaveRegisters
ldh a, [$8c]
ld [wcf13], a
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $4

2
scripts/celadonmansion3.asm
View file

@ -51,7 +51,7 @@ DirectorText: ; 487b2 (12:47b2)
db $8 ; asm
callab DisplayDiploma
ld a, $1
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
jp TextScriptEnd
GameFreakPCText1: ; 487eb (12:47eb)

6
scripts/celadonmartelevator.asm
View file

@ -9,13 +9,13 @@ CeladonMartElevatorScript: ; 48600 (12:4600)
res 7, [hl]
call nz, CeladonMartElevatorScript_48654
xor a
ld [wcf0c], a
ld [wAutoTextBoxDrawingControl], a
inc a
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ret
CeladonMartElevatorScript_4861c: ; 4861c (12:461c)
ld hl, wd3af
ld hl, wWarpEntries
ld a, [wd73b]
ld b, a
ld a, [wd73c]

2
scripts/celadonmartroof.asm
View file

@ -230,7 +230,7 @@ CeladonMartRoofText2: ; 4856c (12:456c)
and a
jr z, .asm_914b9 ; 0x48574
ld a, $1
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, CeladonMartRoofText4
call PrintText
call YesNoChoice

6
scripts/ceruleancity.asm
View file

@ -64,7 +64,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
ld hl, CeruleanCityCoords2
call ArePlayerCoordsInArray
ret nc
ld a, [wd700]
ld a, [wWalkBikeSurfState]
and a
jr z, .asm_19512 ; 0x19508 $8
ld a, $ff
@ -279,7 +279,7 @@ CeruleanCityText2: ; 1967c (6:567c)
ld de, CeruleanCityText_196ee
call PreBattleSaveRegisters
ld a, [$ff8c]
ld [wcf13], a
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $4
@ -296,7 +296,7 @@ CeruleanCityText2: ; 1967c (6:567c)
jr .Done
.Success
ld a, $1
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, ReceivedTM28Text
call PrintText
callba Func_74872

4
scripts/ceruleancity2.asm
View file

@ -2,7 +2,7 @@ Func_74872: ; 74872 (1d:4872)
; code similar to this appears in a lot of banks; this particular
; one is called after you beat the Rocket that gives you TM28 DIG.
; the screen then fades out, he disappears, and fades back in
call GBFadeIn1
call GBFadeOutToBlack
ld a, $07
ld [wcc4d], a
predef ShowObject
@ -12,5 +12,5 @@ Func_74872: ; 74872 (1d:4872)
ld a, $06
ld [wcc4d], a
predef HideObject
call GBFadeOut1
call GBFadeInFromBlack
ret

2
scripts/ceruleangym.asm
View file

@ -128,7 +128,7 @@ CeruleanGymText1: ; 5c771 (17:4771)
ld de, CeruleanGymText_5c7d8
call PreBattleSaveRegisters
ldh a, [$8c]
ld [wcf13], a
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $2

4
scripts/ceruleanhouse2.asm
View file

@ -1,8 +1,8 @@
CeruleanHouse2Script: ; 74e09 (1d:4e09)
ld a, $1
ld [wcf0c], a
ld [wAutoTextBoxDrawingControl], a
dec a
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ret
CeruleanHouse2TextPointers: ; 74e13 (1d:4e13)

4
scripts/cinnabargym.asm
View file

@ -187,13 +187,13 @@ CinnabarGymTextPointers: ; 7589f (1d:589f)
CinnabarGymScript_758b7: ; 758b7 (1d:58b7)
ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c
ld [wcf13], a
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld hl, wd72d
set 6, [hl]
set 7, [hl]
ld a, [wcf13]
ld a, [wSpriteIndex]
cp $1
jr z, .asm_758d4
ld a, $2

2
scripts/copycatshouse2f.asm
View file

@ -16,7 +16,7 @@ CopycatsHouse2FText1: ; 5cc82 (17:4c82)
bit 0, a
jr nz, .asm_7ccf3 ; 0x5cc88
ld a, $1
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, CopycatsHouse2FText_5ccd4
call PrintText
ld b, POKE_DOLL

2
scripts/daycarem.asm
View file

@ -24,7 +24,7 @@ DayCareMText1: ; 56254 (15:6254)
ld hl, DayCareMText_56414
call PrintText
xor a
ld [wcfcb], a
ld [wUpdateSpritesEnabled], a
ld [wd07d], a
ld [wMenuItemToSwap], a
call DisplayPartyMenu

2
scripts/fightingdojo.asm
View file

@ -149,7 +149,7 @@ FightingDojoText1: ; 5ce44 (17:4e44)
ld de, FightingDojoText_5ce93
call PreBattleSaveRegisters
ldh a, [$8c]
ld [wcf13], a
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $3

2
scripts/fuchsiagym.asm
View file

@ -168,7 +168,7 @@ FuchsiaGymText1: ; 75534 (1d:5534)
ld de, UnnamedText_75586
call PreBattleSaveRegisters
ldh a, [$8c]
ld [wcf13], a
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $5

2
scripts/mansion1.asm
View file

@ -106,7 +106,7 @@ Mansion1Text4: ; 4435a (11:435a)
and a
jr nz, .asm_4438c ; 0x44368 $22
ld a, $1
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, wd126
set 5, [hl]
ld hl, MansionSwitchPressedText

2
scripts/mansion2.asm
View file

@ -112,7 +112,7 @@ Mansion2Text5: ; 52087 (14:6087)
and a
jr nz, .asm_520b9 ; 0x52095 $22
ld a, $1
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, wd126
set 5, [hl]
ld hl, Mansion2Text_520c7

8
scripts/mansion3.asm
View file

@ -40,7 +40,7 @@ Mansion3ScriptPointers: ; 52235 (14:6235)
Mansion3Script0: ; 5223b (14:623b)
ld hl, CoordsData_52254
call Mansion3Script_5225b
ld a, [wd71e]
ld a, [wWhichDungeonWarp]
and a
jp z, CheckFightingMapTrainers
cp $3
@ -48,7 +48,7 @@ Mansion3Script0: ; 5223b (14:623b)
jr nz, .asm_52250
ld a, $d6
.asm_52250
ld [wd71d], a
ld [wDungeonWarpDestinationMap], a
ret
CoordsData_52254: ; 52254 (14:6254)
@ -59,14 +59,14 @@ CoordsData_52254: ; 52254 (14:6254)
Mansion3Script_5225b: ; 5225b (14:625b)
xor a
ld [wd71e], a
ld [wWhichDungeonWarp], a
ld a, [wd72d]
bit 4, a
ret nz
call ArePlayerCoordsInArray
ret nc
ld a, [wWhichTrade] ; wWhichTrade
ld [wd71e], a
ld [wWhichDungeonWarp], a
ld hl, wd72d
set 4, [hl]
ld hl, wd732

8
scripts/mtmoon3.asm
View file

@ -138,7 +138,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb)
ld a, $f0
ld [wJoyIgnore], a
ld a, $1
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld a, $a
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
@ -230,7 +230,7 @@ MtMoon3Text1: ; 49e79 (12:5e79)
ld de, MtMoon3Text_49f8a
call PreBattleSaveRegisters
ldh a, [$8c]
ld [wcf13], a
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $3
@ -270,7 +270,7 @@ MtMoon3Text5: ; 49edf (12:5edf)
MtMoon3Text6: ; 49ee9 (12:5ee9)
db $08 ; asm
ld a, $1
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, MtMoon3Text_49f24
call PrintText
call YesNoChoice
@ -299,7 +299,7 @@ MtMoon3Text_49f24: ; 49f24 (12:5f24)
MtMoon3Text7: ; 49f29 (12:5f29)
db $08 ; asm
ld a, $1
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, MtMoon3Text_49f64
call PrintText
call YesNoChoice

4
scripts/museum1f.asm
View file

@ -1,8 +1,8 @@
Museum1FScript: ; 5c0f7 (17:40f7)
ld a, $1
ld [wcf0c], a
ld [wAutoTextBoxDrawingControl], a
xor a
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, Museum1FScriptPointers
ld a, [W_MUSEUM1FCURSCRIPT]
jp CallFunctionInTable

2
scripts/namerater.asm
View file

@ -50,7 +50,7 @@ NameRaterText1: ; 1da56 (7:5a56)
call PrintText
xor a
ld [wd07d], a
ld [wcfcb], a
ld [wUpdateSpritesEnabled], a
ld [wMenuItemToSwap], a
call DisplayPartyMenu
push af

22
scripts/oakslab.asm
View file

@ -3,9 +3,9 @@ OaksLabScript: ; 1cb0e (7:4b0e)
bit 6, a
call nz, OaksLabScript_1d076
ld a, $1
ld [wcf0c], a
ld [wAutoTextBoxDrawingControl], a
xor a
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, OaksLabScriptPointers
ld a, [W_OAKSLABCURSCRIPT]
jp CallFunctionInTable
@ -374,7 +374,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9)
.done
ld [W_TRAINERNO], a
ld a, $1
ld [wcf13], a
ld [wSpriteIndex], a
call GetSpritePosition1
ld hl, OaksLabText_1d3be
ld de, OaksLabText_1d3c3
@ -397,7 +397,7 @@ OaksLabScript12: ; 1ce03 (7:4e03)
ld [wd528], a
call UpdateSprites
ld a, $1
ld [wcf13], a
ld [wSpriteIndex], a
call SetSpritePosition1
ld a, $1
ld [H_SPRITEINDEX], a
@ -680,7 +680,7 @@ OaksLabScript_1d02b: ; 1d02b (7:502b)
ld a, b
ld [$ffed], a
ld a, $1
ld [wcf13], a
ld [wSpriteIndex], a
call SetSpritePosition1
ret
@ -801,7 +801,7 @@ OaksLabScript_1d133: ; 1d133 (7:5133)
ld [wcf91], a
ld [wd11e], a
ld a, b
ld [wcf13], a
ld [wSpriteIndex], a
ld a, [wd74b]
bit 2, a
jp nz, OaksLabScript_1d22d
@ -837,7 +837,7 @@ OaksLabScript_1d157: ; 1d157 (7:5157)
call ReloadMapData
ld c, $a
call DelayFrames
ld a, [wcf13]
ld a, [wSpriteIndex]
cp $2
jr z, OaksLabLookAtCharmander
cp $3
@ -868,7 +868,7 @@ OaksLabBulbasaurText: ; 1d1ae (7:51ae)
OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3)
call PrintText
ld a, $1
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
call YesNoChoice ; yes/no menu
ld a, [wCurrentMenuItem]
and a
@ -877,7 +877,7 @@ OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3)
ld [W_PLAYERSTARTER], a
ld [wd11e], a
call GetMonName
ld a, [wcf13]
ld a, [wSpriteIndex]
cp $2
jr nz, asm_1d1db ; 0x1d1d5 $4
ld a, $2b
@ -893,7 +893,7 @@ asm_1d1e5: ; 1d1e5 (7:51e5)
ld [wcc4d], a
predef HideObject
ld a, $1
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, OaksLabMonEnergeticText
call PrintText
ld hl, OaksLabReceivedMonText
@ -956,7 +956,7 @@ OaksLabText5: ; 1d248 (7:5248)
ld hl, OaksLabText_1d31d
call PrintText
ld a, $1
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
predef DisplayDexRating
jp .asm_0f042
.asm_b28b0 ; 0x1d279

4
scripts/pallettown.asm
View file

@ -109,7 +109,7 @@ PalletTownScript3: ; 18f12 (6:4f12)
ld a,$FF
ld [wJoyIgnore],a
ld a,1
ld [wcf13],a
ld [wSpriteIndex],a
xor a
ld [wNPCMovementScriptFunctionNum],a
ld a,1
@ -171,7 +171,7 @@ PalletTownText1: ; 18f96 (6:4f96)
and a
jr nz,.next
ld a,1
ld [wcc3c],a
ld [wDoNotWaitForButtonPressAfterDisplayingText],a
ld hl,OakAppearsText
jr .done
.next

12
scripts/pewtercity.asm
View file

@ -68,7 +68,7 @@ PewterCityScript1: ; 19280 (6:5280)
ld a, $11
ld [$ffee], a
ld a, $3
ld [wcf13], a
ld [wSpriteIndex], a
call SetSpritePosition1
ld a, $3
ld [$ff8c], a
@ -94,7 +94,7 @@ PewterCityScript2: ; 192d3 (6:52d3)
PewterCityScript3: ; 192e9 (6:52e9)
ld a, $3
ld [wcf13], a
ld [wSpriteIndex], a
call SetSpritePosition2
ld a, $3
ld [wcc4d], a
@ -132,7 +132,7 @@ PewterCityScript4: ; 19305 (6:5305)
ld a, $10
ld [$ffee], a
ld a, $5
ld [wcf13], a
ld [wSpriteIndex], a
call SetSpritePosition1
ld a, $5
ld [$ff8c], a
@ -158,7 +158,7 @@ PewterCityScript5: ; 19359 (6:5359)
PewterCityScript6: ; 1936f (6:536f)
ld a, $5
ld [wcf13], a
ld [wSpriteIndex], a
call SetSpritePosition2
ld a, $4
ld [wcc4d], a
@ -216,7 +216,7 @@ PewterCityText3: ; 193b1 (6:53b1)
ldh a, [$b8]
ld [wNPCMovementScriptBank], a
ld a, $3
ld [wcf13], a
ld [wSpriteIndex], a
call GetSpritePosition2
ld a, $1
ld [W_PEWTERCITYCURSCRIPT], a
@ -280,7 +280,7 @@ PewterCityText5: ; 19436 (6:5436)
ldh a, [$b8]
ld [wNPCMovementScriptBank], a
ld a, $5
ld [wcf13], a
ld [wSpriteIndex], a
call GetSpritePosition2
ld a, $4
ld [W_PEWTERCITYCURSCRIPT], a

2
scripts/pewtergym.asm
View file

@ -128,7 +128,7 @@ PewterGymText1: ; 5c44e (17:444e)
ld de, PewterGymText_5c4bc
call PreBattleSaveRegisters
ldh a, [$8c]
ld [wcf13], a
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $1

2
scripts/pewtermart.asm
View file

@ -1,7 +1,7 @@
PewterMartScript: ; 74cad (1d:4cad)
call EnableAutoTextBoxDrawing
ld a, $1
ld [wcf0c], a
ld [wAutoTextBoxDrawingControl], a
ret
PewterMartTextPointers: ; 74cb6 (1d:4cb6)

2
scripts/pewterpokecenter.asm
View file

@ -18,7 +18,7 @@ PewterPokecenterText2: ; 5c596 (17:4596)
PewterPokecenterText3: ; 5c59b (17:459b)
db $8
ld a, $1
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, PewterPokecenterText5
call PrintText
ld a, $ff

4
scripts/pokemontower5.asm
View file

@ -33,10 +33,10 @@ PokemonTower5Script0: ; 6094b (18:494b)
ld hl, wd72e
set 4, [hl]
predef HealParty
call GBFadeOut2
call GBFadeOutToWhite
call Delay3
call Delay3
call GBFadeIn2
call GBFadeInFromWhite
ld a, $7
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID

12
scripts/pokemontower7.asm
View file

@ -30,7 +30,7 @@ PokemonTower7Script2: ; 60d23 (18:4d23)
call EndTrainerBattle
ld a, $f0
ld [wJoyIgnore], a
ld a, [wcf13]
ld a, [wSpriteIndex]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
call PokemonTower7Script_60db6
@ -44,7 +44,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56)
bit 0, a
ret nz
ld hl, W_MISSABLEOBJECTLIST
ld a, [wcf13]
ld a, [wSpriteIndex]
ld b, a
.missableObjectsListLoop
ld a, [hli]
@ -55,7 +55,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56)
predef HideObject
xor a
ld [wJoyIgnore], a
ld [wcf13], a
ld [wSpriteIndex], a
ld [wTrainerHeaderFlagBit], a
ld [wda38], a
ld a, $0
@ -74,7 +74,7 @@ PokemonTower7Script4: ; 60d86 (18:4d86)
ld a, $95
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
ld a, $1
ld [wd42f], a
ld [wDestinationWarpID], a
ld a, LAVENDER_TOWN
ld [wLastMap], a
ld hl, wd72d
@ -86,7 +86,7 @@ PokemonTower7Script4: ; 60d86 (18:4d86)
PokemonTower7Script_60db6: ; 60db6 (18:4db6)
ld hl, CoordsData_60de3 ; $4de3
ld a, [wcf13]
ld a, [wSpriteIndex]
dec a
swap a
ld d, $0
@ -106,7 +106,7 @@ PokemonTower7Script_60db6: ; 60db6 (18:4db6)
ld a, [hli]
ld d, [hl]
ld e, a
ld a, [wcf13]
ld a, [wSpriteIndex]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
jp MoveSprite
.asm_60dde

4
scripts/redshouse1f.asm
View file

@ -25,7 +25,7 @@ MomWakeUpText: ; 48185 (12:4185)
MomHealPokemon: ; 4818a (12:418a)
ld hl, MomHealText1
call PrintText
call GBFadeOut2
call GBFadeOutToWhite
call ReloadMapData
predef HealParty
ld a, MUSIC_PKMN_HEALED
@ -38,7 +38,7 @@ MomHealPokemon: ; 4818a (12:418a)
ld a, [wd35b]
ld [wc0ee], a
call PlaySound
call GBFadeIn2
call GBFadeInFromWhite
ld hl, MomHealText2
jp PrintText

6
scripts/rockethideout4.asm
View file

@ -58,7 +58,7 @@ RocketHideout4Script3: ; 454b6 (11:54b6)
ld a, $a
ld [H_SPRITEHEIGHT], a
call DisplayTextID
call GBFadeIn1
call GBFadeOutToBlack
ld a, $83
ld [wcc4d], a
predef HideObject
@ -66,7 +66,7 @@ RocketHideout4Script3: ; 454b6 (11:54b6)
ld [wcc4d], a
predef ShowObject
call UpdateSprites
call GBFadeOut1
call GBFadeInFromBlack
xor a
ld [wJoyIgnore], a
ld hl, wd126
@ -132,7 +132,7 @@ RocketHideout4Text1: ; 4553a (11:553a)
ld de, RocketHideout4Text_4557f
call PreBattleSaveRegisters
ldh a, [$8c]
ld [wcf13], a
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
xor a

6
scripts/rockethideoutelevator.asm
View file

@ -9,13 +9,13 @@ RocketHideoutElevatorScript: ; 45710 (11:5710)
res 7, [hl]
call nz, RocketHideoutElevatorScript_4575f
xor a
ld [wcf0c], a
ld [wAutoTextBoxDrawingControl], a
inc a
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ret
RocketHideoutElevatorScript_4572c: ; 4572c (11:572c)
ld hl, wd3af
ld hl, wWarpEntries
ld a, [wd73b]
ld b, a
ld a, [wd73c]

2
scripts/route12gateupstairs.asm
View file

@ -75,5 +75,5 @@ Route12GateUpstairsScript_495c9: ; 495c9 (12:55c9)
call PrintText
xor a
.asm_495d8
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
jp TextScriptEnd

4
scripts/route22.asm
View file

@ -83,7 +83,7 @@ Route22Script0: ; 50f00 (14:4f00)
xor a
ld [wcd50], a
predef EmotionBubble
ld a, [wd700]
ld a, [wWalkBikeSurfState]
and a
jr z, .asm_50f4e ; 0x50f44 $8
ld a, $ff
@ -222,7 +222,7 @@ Route22Script_5104e: ; 5104e (14:504e)
xor a
ld [wcd50], a
predef EmotionBubble
ld a, [wd700]
ld a, [wWalkBikeSurfState]
and a
jr z, .skipYVisibilityTesta
ld a, $ff

2
scripts/route24.asm
View file

@ -171,7 +171,7 @@ Route24Text1: ; 514a4 (14:54a4)
ld de, Route24Text_5152b
call PreBattleSaveRegisters
ld a, [$ff8c]
ld [wcf13], a
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
xor a

2
scripts/saffrongym.asm
View file

@ -180,7 +180,7 @@ SaffronGymText1: ; 5d118 (17:5118)
ld de, SaffronGymText_5d167
call PreBattleSaveRegisters
ldh a, [$8c]
ld [wcf13], a
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $6

2
scripts/seafoamislands1.asm
View file

@ -34,7 +34,7 @@ SeafoamIslands1Script: ; 447e9 (11:47e9)
predef_jump ShowObject
.asm_4483b
ld a, $9f
ld [wd71d], a
ld [wDungeonWarpDestinationMap], a
ld hl, Seafoam1HolesCoords
jp Func_46981

2
scripts/seafoamislands2.asm
View file

@ -32,7 +32,7 @@ SeafoamIslands2Script: ; 46315 (11:6315)
predef_jump ShowObject
.asm_46362
ld a, $a0
ld [wd71d], a
ld [wDungeonWarpDestinationMap], a
ld hl, Seafoam2HolesCoords
jp Func_46981

2
scripts/seafoamislands3.asm
View file

@ -32,7 +32,7 @@ SeafoamIslands3Script: ; 46451 (11:6451)
predef_jump ShowObject
.asm_4649e
ld a, $a1
ld [wd71d], a
ld [wDungeonWarpDestinationMap], a
ld hl, Seafoam3HolesCoords
jp Func_46981

2
scripts/seafoamislands4.asm
View file

@ -33,7 +33,7 @@ SeafoamIslands4Script: ; 4658d (11:658d)
jr .asm_465ed ; 0x465da $11
.asm_465dc
ld a, $a2
ld [wd71d], a
ld [wDungeonWarpDestinationMap], a
ld hl, Seafoam4HolesCoords
call Func_46981
ld a, [wd732]

4
scripts/seafoamislands5.asm
View file

@ -130,8 +130,8 @@ SeafoamIslands5Script3: ; 46860 (11:6860)
SeaFoamIslands5Script_46872: ; 46872 (11:6872)
xor a
ld [wd700], a
ld [wd11a], a
ld [wWalkBikeSurfState], a
ld [wWalkBikeSurfStateCopy], a
jp ForceBikeOrSurf
SeafoamIslands5TextPointers: ; 4687c (11:687c)

6
scripts/silphco11.asm
View file

@ -182,11 +182,11 @@ SilphCo11Script5: ; 62227 (18:6227)
ld a, $6
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
call DisplayTextID
call GBFadeIn1
call GBFadeOutToBlack
call SilphCo11Script_6216d
call UpdateSprites
call Delay3
call GBFadeOut1
call GBFadeInFromBlack
ld hl, wd838
set 7, [hl]
xor a
@ -223,7 +223,7 @@ SilphCo11Script4: ; 62293 (18:6293)
ld de, SilphCo10Text_62330 ; $6330
call PreBattleSaveRegisters
ld a, [H_DOWNARROWBLINKCNT2] ; $ff8c
ld [wcf13], a
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
xor a

4
scripts/silphco9.asm
View file

@ -164,9 +164,9 @@ SilphCo9Text1: ; 5d8b8 (17:58b8)
ld hl, SilphCo9Text_5d8e5
call PrintText
predef HealParty
call GBFadeOut2
call GBFadeOutToWhite
call Delay3
call GBFadeIn2
call GBFadeInFromWhite
ld hl, SilphCo9Text_5d8ea
call PrintText
jr .asm_b6e28 ; 0x5d8da

6
scripts/silphcoelevator.asm
View file

@ -9,13 +9,13 @@ SilphCoElevatorScript: ; 457c0 (11:57c0)
res 7, [hl]
call nz, SilphCoElevatorScript_45827
xor a
ld [wcf0c], a
ld [wAutoTextBoxDrawingControl], a
inc a
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ret
SilphCoElevatorScript_457dc: ; 457dc (11:57dc)
ld hl, wd3af
ld hl, wWarpEntries
ld a, [wd73b]
ld b, a
ld a, [wd73c]

4
scripts/ssanne9.asm
View file

@ -1,8 +1,8 @@
SSAnne9Script: ; 61b4b (18:5b4b)
ld a, $1
ld [wcf0c], a
ld [wAutoTextBoxDrawingControl], a
xor a
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, SSAnne9TrainerHeaders
ld de, SSAnne9ScriptPointers
ld a, [W_SSANNE9CURSCRIPT]

8
scripts/vermiliondock.asm
View file

@ -5,7 +5,7 @@ VermilionDockScript: ; 1db52 (7:5b52)
jr nz, .asm_1db8d ; 0x1db5a $31
bit 0, [hl]
ret z
ld a, [wd42f]
ld a, [wDestinationWarpID]
cp $1
ret nz
bit 2, [hl]
@ -75,7 +75,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
ld a, (SFX_02_54 - SFX_Headers_02) / 3
call PlaySoundWaitForCurrent
ld a, $ff
ld [wcfcb], a
ld [wUpdateSpritesEnabled], a
ld d, $0
ld e, $8
.asm_1dbfa
@ -111,14 +111,14 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
ld a, $90
ld [hVBlankWY], a
ld a, $1
ld [wcfcb], a
ld [wUpdateSpritesEnabled], a
pop hl
pop bc
ld [hl], b
dec hl
ld [hl], c
call LoadPlayerSpriteGraphics
ld hl, wd3ae
ld hl, wNumberOfWarps
dec [hl]
ret

2
scripts/vermiliongym.asm
View file

@ -158,7 +158,7 @@ VermilionGymText1: ; 5cb1d (17:4b1d)
ld de, ReceivedThunderbadgeText
call PreBattleSaveRegisters
ldh a, [$8c]
ld [wcf13], a
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $3

2
scripts/victoryroad3.asm
View file

@ -61,7 +61,7 @@ VictoryRoad3Script0: ; 449b7 (11:49b7)
.asm_449fe
ld a, $c2
ld [wd71d], a
ld [wDungeonWarpDestinationMap], a
ld hl, .coordsData_449f9 ; $49f9
call Func_46981
ld a, [wWhichTrade] ; wWhichTrade

8
scripts/viridiangym.asm
View file

@ -286,16 +286,16 @@ ViridianGymText1: ; 74a69 (1d:4a69)
jr .asm_6dff7 ; 0x74a7b
.asm_9fc95 ; 0x74a7d
ld a, $1
ld [wcc3c], a
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, ViridianGymText_74ad9
call PrintText
call GBFadeIn1
call GBFadeOutToBlack
ld a, $32
ld [wcc4d], a
predef HideObject
call UpdateSprites
call Delay3
call GBFadeOut1
call GBFadeInFromBlack
jr .asm_6dff7 ; 0x74a9e
.asm_6de66 ; 0x74aa0
ld hl, ViridianGymText_74ace
@ -307,7 +307,7 @@ ViridianGymText1: ; 74a69 (1d:4a69)
ld de, ViridianGymText_74ad3
call PreBattleSaveRegisters
ldh a, [$8c]
ld [wcf13], a
ld [wSpriteIndex], a
call EngageMapTrainer
call InitBattleEnemyParameters
ld a, $8