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

callba/callab -> farcall/callfar; jpba/jpab -> farjp/jpfar

Browse source
This commit is contained in:
Rangi 2020-07-06 21:18:22 -04:00
parent 77ed5f3820
commit 06db7ec55b
90 changed files with 251 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/BikeShop.asm
View file

@ -24,7 +24,7 @@ BikeShopText1:
jr nc, .BagFull
ld a, BIKE_VOUCHER
ldh [hItemToRemoveID], a
callba RemoveItemByID
farcall RemoveItemByID
SetEvent EVENT_GOT_BICYCLE
ld hl, BikeShopText_1d824
call PrintText

2
scripts/CeladonMansion3F.asm
View file

@ -49,7 +49,7 @@ DirectorText:
text_far _CompletedDexText
text_promptbutton
text_asm
callab DisplayDiploma
callfar DisplayDiploma
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
jp TextScriptEnd

2
scripts/CeladonMartElevator.asm
View file

@ -60,7 +60,7 @@ CeladonMartElevatorWarpMaps:
CeladonMartElevatorWarpMapsEnd:
CeladonMartElevatorScript_48654:
jpba ShakeElevator
farjp ShakeElevator
CeladonMartElevator_TextPointers:
dw CeladonMartElevatorText1

2
scripts/CeladonMartRoof.asm
View file

@ -131,7 +131,7 @@ CeladonMartRoofScript_GiveDrinkToGirl:
jp PrintText
RemoveItemByIDBank12:
jpba RemoveItemByID
farjp RemoveItemByID
CeladonMartRoofText_484ee:
text_far _CeladonMartRoofText_484ee

4
scripts/CeruleanCity.asm
View file

@ -174,7 +174,7 @@ CeruleanCityScript2:
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStart
farcall Music_RivalAlternateStart
ld a, $1
ldh [hSpriteIndex], a
call SetSpriteMovementBytesToFF
@ -310,7 +310,7 @@ CeruleanCityText2:
ld [wDoNotWaitForButtonPressAfterDisplayingText], a
ld hl, ReceivedTM28Text
call PrintText
callba CeruleanHideRocket
farcall CeruleanHideRocket
.Done
jp TextScriptEnd

2
scripts/ChampionsRoom.asm
View file

@ -108,7 +108,7 @@ GaryScript3:
ret
GaryScript4:
callba Music_Cities1AlternateTempo
farcall Music_Cities1AlternateTempo
ld a, $2
ldh [hSpriteIndexOrTextID], a
call GaryScript_760c8

4
scripts/CinnabarLabFossilRoom.asm
View file

@ -56,7 +56,7 @@ Lab4Text1:
ld a, [wFilteredBagItemsCount]
and a
jr z, .asm_75d8d
callba GiveFossilToCinnabarLab
farcall GiveFossilToCinnabarLab
jr .asm_75d93
.asm_75d8d
ld hl, Lab4Text_75dcb
@ -106,4 +106,4 @@ Lab4Text2:
jp TextScriptEnd
LoadFossilItemAndMonNameBank1D:
jpba LoadFossilItemAndMonName
farjp LoadFossilItemAndMonName

2
scripts/CopycatsHouse2F.asm
View file

@ -30,7 +30,7 @@ CopycatsHouse2FText1:
call PrintText
ld a, POKE_DOLL
ldh [hItemToRemoveID], a
callba RemoveItemByID
farcall RemoveItemByID
SetEvent EVENT_GOT_TM31
jr .asm_62ecd
.BagFull

6
scripts/Daycare.asm
View file

@ -35,7 +35,7 @@ DayCareMText1:
pop af
ld hl, DayCareAllRightThenText
jp c, .done
callab KnowsHMMove
callfar KnowsHMMove
ld hl, DayCareCantAcceptMonWithHMText
jp c, .done
xor a
@ -65,13 +65,13 @@ DayCareMText1:
ld a, DAYCARE_DATA
ld [wMonDataLocation], a
call LoadMonData
callab CalcLevelFromExperience
callfar CalcLevelFromExperience
ld a, d
cp MAX_LEVEL
jr c, .skipCalcExp
ld d, MAX_LEVEL
callab CalcExperience
callfar CalcExperience
ld hl, wDayCareMonExp
ldh a, [hExperience]
ld [hli], a

2
scripts/HallOfFame.asm
View file

@ -45,7 +45,7 @@ HallofFameRoomScript2:
ld [wHallOfFameCurScript], a
ld a, PALLET_TOWN
ld [wLastBlackoutMap], a
callba SaveSAVtoSRAM
farcall SaveSAVtoSRAM
ld b, 5
.delayLoop
ld c, 600 / 5

2
scripts/NameRatersHouse.asm
View file

@ -68,7 +68,7 @@ NameRaterText1:
jr nz, .asm_1daae
ld hl, NameRaterText_1dac2
call PrintText
callba DisplayNameRaterScreen
farcall DisplayNameRaterScreen
jr c, .asm_1daae
ld hl, NameRaterText_1dac7
.asm_1daa8

6
scripts/OaksLab.asm
View file

@ -441,7 +441,7 @@ OaksLabScript13:
ld a, $10
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
callba Music_RivalAlternateStart
farcall Music_RivalAlternateStart
ld a, $1
ldh [hSpriteIndex], a
ld de, .RivalExitMovement
@ -513,7 +513,7 @@ OaksLabScript15:
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStart
farcall Music_RivalAlternateStart
ld a, $15
ldh [hSpriteIndexOrTextID], a
call DisplayTextID
@ -614,7 +614,7 @@ OaksLabScript16:
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStart
farcall Music_RivalAlternateStart
ld a, $1
ldh [hSpriteIndex], a
ld de, wNPCMovementDirections2

2
scripts/PokemonTower2F.asm
View file

@ -79,7 +79,7 @@ PokemonTower2Script1:
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStart
farcall Music_RivalAlternateStart
ld a, $2
ld [wPokemonTower2FCurScript], a
ld [wCurMapScript], a

2
scripts/RocketHideoutElevator.asm
View file

@ -58,7 +58,7 @@ RocketHideoutElevatorWarpMapsEnd:
RocketHideoutElevatorScript_4575f:
call Delay3
callba ShakeElevator
farcall ShakeElevator
ret
RocketHideoutElevator_TextPointers:

6
scripts/Route22.asm
View file

@ -170,7 +170,7 @@ Route22Script2:
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStart
farcall Music_RivalAlternateStart
ld a, [wcf0d]
cp $1
jr nz, .asm_50fff
@ -248,7 +248,7 @@ Route22Script_5104e:
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateTempo
farcall Music_RivalAlternateTempo
ld a, $2
ldh [hSpriteIndex], a
call Route22MoveRivalSprite
@ -329,7 +329,7 @@ Route22Script5:
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStartAndTempo
farcall Music_RivalAlternateStartAndTempo
ld a, [wcf0d]
cp $1
jr nz, .asm_51134

4
scripts/Route5Gate.asm
View file

@ -26,7 +26,7 @@ Route5GateScript0:
ld [wPlayerMovingDirection], a
xor a
ldh [hJoyHeld], a
callba RemoveGuardDrink
farcall RemoveGuardDrink
ldh a, [hItemToRemoveID]
and a
jr nz, .asm_1df82
@ -73,7 +73,7 @@ Route5GateText1:
ld a, [wd728]
bit 6, a
jr nz, .asm_88856
callba RemoveGuardDrink
farcall RemoveGuardDrink
ldh a, [hItemToRemoveID]
and a
jr nz, .asm_768a2

2
scripts/Route6Gate.asm
View file

@ -20,7 +20,7 @@ Route6GateScript0:
ld [wPlayerMovingDirection], a
xor a
ldh [hJoyHeld], a
callba RemoveGuardDrink
farcall RemoveGuardDrink
ldh a, [hItemToRemoveID]
and a
jr nz, .asm_1e080

2
scripts/Route7Gate.asm
View file

@ -32,7 +32,7 @@ Route7GateScript0:
ld [wPlayerMovingDirection], a
xor a
ldh [hJoyHeld], a
callba RemoveGuardDrink
farcall RemoveGuardDrink
ldh a, [hItemToRemoveID]
and a
jr nz, .asm_1e15a

2
scripts/Route8Gate.asm
View file

@ -31,7 +31,7 @@ Route8GateScript0:
ld [wPlayerMovingDirection], a
xor a
ldh [hJoyHeld], a
callba RemoveGuardDrink
farcall RemoveGuardDrink
ldh a, [hItemToRemoveID]
and a
jr nz, .asm_1e220

2
scripts/SSAnne2F.asm
View file

@ -148,7 +148,7 @@ SSAnne2Script2:
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStart
farcall Music_RivalAlternateStart
ld a, $3
ld [wSSAnne2FCurScript], a
ret

2
scripts/SilphCo7F.asm
View file

@ -222,7 +222,7 @@ SilphCo7Script4:
ld a, SFX_STOP_ALL_MUSIC
ld [wNewSoundID], a
call PlaySound
callba Music_RivalAlternateStart
farcall Music_RivalAlternateStart
ld de, MovementData_51d1d
ld a, [wcf0d]
cp $1

2
scripts/SilphCoElevator.asm
View file

@ -74,7 +74,7 @@ SilphCoElevatorWarpMapsEnd:
SilphCoElevatorScript_45827:
call Delay3
callba ShakeElevator
farcall ShakeElevator
ret
SilphCoElevator_TextPointers:

2
scripts/VermilionDock.asm
View file

@ -45,7 +45,7 @@ VermilionDock_1db9b:
ld c, BANK(Music_Surfing)
ld a, MUSIC_SURFING
call PlayMusic
callba LoadSmokeTileFourTimes
farcall LoadSmokeTileFourTimes
xor a
ld [wSpritePlayerStateData1ImageIndex], a
ld c, 120

2
scripts/ViridianGym.asm
View file

@ -128,7 +128,7 @@ ViridianGymScript4:
ld [wCurMapScript], a
ret
.asm_74980
jpba LoadSpinnerArrowTiles
farjp LoadSpinnerArrowTiles
ViridianGymScript3:
ld a, [wIsInBattle]

2
scripts/WardensHouse.asm
View file

@ -33,7 +33,7 @@ FuchsiaHouse2Text1:
call PrintText
ld a, GOLD_TEETH
ldh [hItemToRemoveID], a
callba RemoveItemByID
farcall RemoveItemByID
SetEvent EVENT_GAVE_GOLD_TEETH
.asm_60cba
ld hl, WardenThankYouText