mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-17 02:40:50 +12:00
No more ldh
This commit is contained in:
parent
8431fa7756
commit
5d9d26bd5c
2
home.asm
2
home.asm
|
@ -2354,7 +2354,7 @@ CheckFightingMapTrainers:: ; 3219 (0:3219)
|
|||
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
|
||||
ld [wJoyIgnore], a
|
||||
xor a
|
||||
ldh [$b4], a
|
||||
ld [hJoyHeld], a
|
||||
call TrainerWalkUpToPlayer_Bank0
|
||||
ld hl, W_CURMAPSCRIPT
|
||||
inc [hl] ; increment map script index (next script function is usually DisplayEnemyTrainerTextAndStartBattle)
|
||||
|
|
|
@ -57,13 +57,13 @@ _UncompressSpriteData:: ; 251a (0:251a)
|
|||
; note that this is an endless loop which is terminated during a call to MoveToNextBufferPosition by manipulating the stack
|
||||
UncompressSpriteDataLoop:: ; 2556 (0:2556)
|
||||
ld hl, S_SPRITEBUFFER1
|
||||
ld a, [W_SPRITELOADFLAGS]
|
||||
ld a, [W_SPRITELOADFLAGS]
|
||||
bit 0, a
|
||||
jr z, .useSpriteBuffer1 ; check which buffer to use
|
||||
ld hl, S_SPRITEBUFFER2
|
||||
.useSpriteBuffer1
|
||||
call StoreSpriteOutputPointer
|
||||
ld a, [W_SPRITELOADFLAGS]
|
||||
ld a, [W_SPRITELOADFLAGS]
|
||||
bit 1, a
|
||||
jr z, .startDecompression ; check if last iteration
|
||||
call ReadNextInputBit ; if last chunk, read 1-2 bit unpacking mode
|
||||
|
|
|
@ -24,7 +24,7 @@ BikeShopText1: ; 1d745 (7:5745)
|
|||
call GiveItem
|
||||
jr nc, .BagFull
|
||||
ld a, BIKE_VOUCHER
|
||||
ldh [$db], a
|
||||
ld [$ffdb], a
|
||||
callba RemoveItemByID
|
||||
ld hl, wd75f
|
||||
set 0, [hl]
|
||||
|
|
|
@ -138,29 +138,29 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9)
|
|||
call Has9990Coins
|
||||
jr nc, .asm_48d14
|
||||
xor a
|
||||
ldh [$9f], a
|
||||
ldh [$a1], a
|
||||
ld [$ff9f], a
|
||||
ld [$ffa1], a
|
||||
ld a, $10
|
||||
ldh [$a0], a
|
||||
ld [$ffa0], a
|
||||
call HasEnoughMoney
|
||||
jr nc, .asm_48cdb
|
||||
ld hl, CeladonGameCornerText_48d31
|
||||
jr .asm_48d1c
|
||||
.asm_48cdb
|
||||
xor a
|
||||
ldh [$9f], a
|
||||
ldh [$a1], a
|
||||
ld [$ff9f], a
|
||||
ld [$ffa1], a
|
||||
ld a, $10
|
||||
ldh [$a0], a
|
||||
ld [$ffa0], a
|
||||
ld hl, $ffa1
|
||||
ld de, wPlayerMoney + 2
|
||||
ld c, $3
|
||||
predef SubBCDPredef
|
||||
xor a
|
||||
ldh [$9f], a
|
||||
ldh [$a0], a
|
||||
ld [$ff9f], a
|
||||
ld [$ffa0], a
|
||||
ld a, $50
|
||||
ldh [$a1], a
|
||||
ld [$ffa1], a
|
||||
ld de, wPlayerCoins + 1
|
||||
ld hl, $ffa1
|
||||
ld c, $2
|
||||
|
@ -225,10 +225,10 @@ CeladonGameCornerText5: ; 48d4a (12:4d4a)
|
|||
call Has9990Coins
|
||||
jr nc, .asm_48d8e
|
||||
xor a
|
||||
ldh [$9f], a
|
||||
ldh [$a0], a
|
||||
ld [$ff9f], a
|
||||
ld [$ffa0], a
|
||||
ld a, $10
|
||||
ldh [$a1], a
|
||||
ld [$ffa1], a
|
||||
ld de, wPlayerCoins + 1
|
||||
ld hl, $ffa1
|
||||
ld c, $2
|
||||
|
@ -307,10 +307,10 @@ CeladonGameCornerText9: ; 48dd9 (12:4dd9)
|
|||
call Has9990Coins
|
||||
jr nc, .asm_48e18
|
||||
xor a
|
||||
ldh [$9f], a
|
||||
ldh [$a0], a
|
||||
ld [$ff9f], a
|
||||
ld [$ffa0], a
|
||||
ld a, $20
|
||||
ldh [$a1], a
|
||||
ld [$ffa1], a
|
||||
ld de, wPlayerCoins + 1
|
||||
ld hl, $ffa1
|
||||
ld c, $2
|
||||
|
@ -360,10 +360,10 @@ CeladonGameCornerText10: ; 48e3b (12:4e3b)
|
|||
call Has9990Coins
|
||||
jr z, .asm_48e7a
|
||||
xor a
|
||||
ldh [$9f], a
|
||||
ldh [$a0], a
|
||||
ld [$ff9f], a
|
||||
ld [$ffa0], a
|
||||
ld a, $20
|
||||
ldh [$a1], a
|
||||
ld [$ffa1], a
|
||||
ld de, wPlayerCoins + 1
|
||||
ld hl, $ffa1
|
||||
ld c, $2
|
||||
|
@ -410,14 +410,14 @@ CeladonGameCornerText11: ; 48e9d (12:4e9d)
|
|||
ld hl, CeladonGameCornerText_48ed3
|
||||
ld de, CeladonGameCornerText_48ed3
|
||||
call SaveEndBattleTextPointers
|
||||
ldh a, [$8c]
|
||||
ld a, [H_SPRITEINDEX]
|
||||
ld [wSpriteIndex], a
|
||||
call EngageMapTrainer
|
||||
call InitBattleEnemyParameters
|
||||
xor a
|
||||
ldh [$b4], a
|
||||
ldh [$b3], a
|
||||
ldh [$b2], a
|
||||
ld [hJoyHeld], a
|
||||
ld [hJoyPressed], a
|
||||
ld [hJoyReleased], a
|
||||
ld a, $1
|
||||
ld [W_CELADONGAMECORNERCURSCRIPT], a
|
||||
jp TextScriptEnd
|
||||
|
|
|
@ -178,7 +178,7 @@ CeladonGymText1: ; 48a11 (12:4a11)
|
|||
ld hl, CeladonGymText_48a63
|
||||
ld de, CeladonGymText_48a63
|
||||
call SaveEndBattleTextPointers
|
||||
ldh a, [$8c]
|
||||
ld a, [H_SPRITEINDEX]
|
||||
ld [wSpriteIndex], a
|
||||
call EngageMapTrainer
|
||||
call InitBattleEnemyParameters
|
||||
|
|
|
@ -344,7 +344,7 @@ CeruleanCityText6: ; 19707 (6:5707)
|
|||
|
||||
CeruleanCityText7: ; 1970c (6:570c)
|
||||
TX_ASM
|
||||
ldh a, [$d3]
|
||||
ld a, [hRandomAdd]
|
||||
cp $b4
|
||||
jr c, .asm_e9fc9
|
||||
ld hl, CeruleanCityText_19730
|
||||
|
|
|
@ -127,14 +127,14 @@ CeruleanGymText1: ; 5c771 (17:4771)
|
|||
ld hl, CeruleanGymText_5c7d8
|
||||
ld de, CeruleanGymText_5c7d8
|
||||
call SaveEndBattleTextPointers
|
||||
ldh a, [$8c]
|
||||
ld a, [H_SPRITEINDEX]
|
||||
ld [wSpriteIndex], a
|
||||
call EngageMapTrainer
|
||||
call InitBattleEnemyParameters
|
||||
ld a, $2
|
||||
ld [W_GYMLEADERNO], a
|
||||
xor a
|
||||
ldh [$b4], a
|
||||
ld [hJoyHeld], a
|
||||
ld a, $3
|
||||
ld [W_CERULEANGYMCURSCRIPT], a
|
||||
.asm_5c7bb
|
||||
|
|
|
@ -30,7 +30,7 @@ CopycatsHouse2FText1: ; 5cc82 (17:4c82)
|
|||
ld hl, ReceivedTM31Text
|
||||
call PrintText
|
||||
ld a, POKE_DOLL
|
||||
ldh [$db], a
|
||||
ld [$ffdb], a
|
||||
callba RemoveItemByID
|
||||
ld hl, wd7af
|
||||
set 0, [hl]
|
||||
|
|
|
@ -148,7 +148,7 @@ FightingDojoText1: ; 5ce44 (17:4e44)
|
|||
ld hl, FightingDojoText_5ce93
|
||||
ld de, FightingDojoText_5ce93
|
||||
call SaveEndBattleTextPointers
|
||||
ldh a, [$8c]
|
||||
ld a, [H_SPRITEINDEX]
|
||||
ld [wSpriteIndex], a
|
||||
call EngageMapTrainer
|
||||
call InitBattleEnemyParameters
|
||||
|
|
|
@ -167,14 +167,14 @@ FuchsiaGymText1: ; 75534 (1d:5534)
|
|||
ld hl, KogaAfterBattleText
|
||||
ld de, KogaAfterBattleText
|
||||
call SaveEndBattleTextPointers
|
||||
ldh a, [$8c]
|
||||
ld a, [H_SPRITEINDEX]
|
||||
ld [wSpriteIndex], a
|
||||
call EngageMapTrainer
|
||||
call InitBattleEnemyParameters
|
||||
ld a, $5
|
||||
ld [W_GYMLEADERNO], a
|
||||
xor a
|
||||
ldh [$b4], a
|
||||
ld [hJoyHeld], a
|
||||
ld a, $3
|
||||
ld [W_FUCHSIAGYMCURSCRIPT], a
|
||||
.asm_e84c6
|
||||
|
|
|
@ -34,7 +34,7 @@ FuchsiaHouse2Text1: ; 750c2 (1d:50c2)
|
|||
ld hl, WardenTeethText1
|
||||
call PrintText
|
||||
ld a, GOLD_TEETH
|
||||
ldh [$db], a
|
||||
ld [$ffdb], a
|
||||
callba RemoveItemByID
|
||||
ld hl, wd78e
|
||||
set 1, [hl]
|
||||
|
@ -98,7 +98,7 @@ HM04NoRoomText: ; 7515e (1d:515e)
|
|||
FuchsiaHouse2Text5: ; 75163 (1d:5163)
|
||||
FuchsiaHouse2Text4: ; 75163 (1d:5163)
|
||||
TX_ASM
|
||||
ldh a, [$8c]
|
||||
ld a, [H_SPRITEINDEX]
|
||||
cp $4
|
||||
ld hl, FuchsiaHouse2Text_7517b
|
||||
jr nz, .asm_4c9a2
|
||||
|
|
|
@ -229,7 +229,7 @@ MtMoon3Text1: ; 49e79 (12:5e79)
|
|||
ld hl, MtMoon3Text_49f8a
|
||||
ld de, MtMoon3Text_49f8a
|
||||
call SaveEndBattleTextPointers
|
||||
ldh a, [$8c]
|
||||
ld a, [H_SPRITEINDEX]
|
||||
ld [wSpriteIndex], a
|
||||
call EngageMapTrainer
|
||||
call InitBattleEnemyParameters
|
||||
|
|
|
@ -35,10 +35,10 @@ MtMoonPokecenterText4: ; 492ec (12:52ec)
|
|||
ld a, [wCurrentMenuItem]
|
||||
and a
|
||||
jp nz, .asm_4934e
|
||||
ldh [$9f], a
|
||||
ldh [$a1], a
|
||||
ld [$ff9f], a
|
||||
ld [$ffa1], a
|
||||
ld a, $5
|
||||
ldh [$a0], a
|
||||
ld [$ffa0], a
|
||||
call HasEnoughMoney
|
||||
jr nc, .asm_faa09
|
||||
ld hl, MtMoonPokecenterText_49366
|
||||
|
|
|
@ -208,12 +208,12 @@ PewterCityText3: ; 193b1 (6:53b1)
|
|||
ld hl, PewterCityText_193fb
|
||||
call PrintText
|
||||
xor a
|
||||
ldh [$b3], a
|
||||
ldh [$b4], a
|
||||
ld [hJoyPressed], a
|
||||
ld [hJoyHeld], a
|
||||
ld [wNPCMovementScriptFunctionNum], a
|
||||
ld a, $2
|
||||
ld [wNPCMovementScriptPointerTableNum], a
|
||||
ldh a, [$b8]
|
||||
ld a, [H_LOADEDROMBANK]
|
||||
ld [wNPCMovementScriptBank], a
|
||||
ld a, $3
|
||||
ld [wSpriteIndex], a
|
||||
|
@ -273,11 +273,11 @@ PewterCityText5: ; 19436 (6:5436)
|
|||
ld hl, PewterCityText_1945d
|
||||
call PrintText
|
||||
xor a
|
||||
ldh [$b4], a
|
||||
ld [hJoyHeld], a
|
||||
ld [wNPCMovementScriptFunctionNum], a
|
||||
ld a, $3
|
||||
ld [wNPCMovementScriptPointerTableNum], a
|
||||
ldh a, [$b8]
|
||||
ld a, [H_LOADEDROMBANK]
|
||||
ld [wNPCMovementScriptBank], a
|
||||
ld a, $5
|
||||
ld [wSpriteIndex], a
|
||||
|
|
|
@ -127,14 +127,14 @@ PewterGymText1: ; 5c44e (17:444e)
|
|||
ld hl, PewterGymText_5c4bc
|
||||
ld de, PewterGymText_5c4bc
|
||||
call SaveEndBattleTextPointers
|
||||
ldh a, [$8c]
|
||||
ld a, [H_SPRITEINDEX]
|
||||
ld [wSpriteIndex], a
|
||||
call EngageMapTrainer
|
||||
call InitBattleEnemyParameters
|
||||
ld a, $1
|
||||
ld [W_GYMLEADERNO], a
|
||||
xor a
|
||||
ldh [$b4], a
|
||||
ld [hJoyHeld], a
|
||||
ld a, $3
|
||||
ld [W_PEWTERGYMCURSCRIPT], a
|
||||
ld [W_CURMAPSCRIPT], a
|
||||
|
|
|
@ -131,12 +131,12 @@ RocketHideout4Text1: ; 4553a (11:553a)
|
|||
ld hl, RocketHideout4Text_4557f
|
||||
ld de, RocketHideout4Text_4557f
|
||||
call SaveEndBattleTextPointers
|
||||
ldh a, [$8c]
|
||||
ld a, [H_SPRITEINDEX]
|
||||
ld [wSpriteIndex], a
|
||||
call EngageMapTrainer
|
||||
call InitBattleEnemyParameters
|
||||
xor a
|
||||
ldh [$b4], a
|
||||
ld [hJoyHeld], a
|
||||
ld a, $3
|
||||
ld [W_ROCKETHIDEOUT4CURSCRIPT], a
|
||||
ld [W_CURMAPSCRIPT], a
|
||||
|
|
|
@ -11,9 +11,9 @@ Route2GateText1: ; 5d5db (17:55db)
|
|||
bit 0, a
|
||||
jr nz, .asm_5d60d
|
||||
ld a, 10 ; pokemon needed
|
||||
ldh [$db], a
|
||||
ld [$ffdb], a
|
||||
ld a, HM_05 ; oak's aide reward
|
||||
ldh [$dc], a
|
||||
ld [$ffdc], a
|
||||
ld [wd11e], a
|
||||
call GetItemName
|
||||
ld hl, wcd6d
|
||||
|
@ -21,7 +21,7 @@ Route2GateText1: ; 5d5db (17:55db)
|
|||
ld bc, $000d
|
||||
call CopyData
|
||||
predef OaksAideScript ; call oak's aide script
|
||||
ldh a, [$db]
|
||||
ld a, [$ffdb]
|
||||
cp $1
|
||||
jr nz, .asm_5d613
|
||||
ld hl, wd7c2
|
||||
|
|
|
@ -179,7 +179,7 @@ SaffronGymText1: ; 5d118 (17:5118)
|
|||
ld hl, SaffronGymText_5d167
|
||||
ld de, SaffronGymText_5d167
|
||||
call SaveEndBattleTextPointers
|
||||
ldh a, [$8c]
|
||||
ld a, [H_SPRITEINDEX]
|
||||
ld [wSpriteIndex], a
|
||||
call EngageMapTrainer
|
||||
call InitBattleEnemyParameters
|
||||
|
|
|
@ -39,7 +39,7 @@ SSAnne6Text7: ; 617e3 (18:57e3)
|
|||
TX_ASM
|
||||
ld hl, SSAnne6Text_61807
|
||||
call PrintText
|
||||
ldh a, [$d3]
|
||||
ld a, [hRandomAdd]
|
||||
bit 7, a
|
||||
jr z, .asm_93eb1
|
||||
ld hl, SSAnne6Text_6180c
|
||||
|
|
|
@ -157,14 +157,14 @@ VermilionGymText1: ; 5cb1d (17:4b1d)
|
|||
ld hl, ReceivedThunderbadgeText
|
||||
ld de, ReceivedThunderbadgeText
|
||||
call SaveEndBattleTextPointers
|
||||
ldh a, [$8c]
|
||||
ld a, [H_SPRITEINDEX]
|
||||
ld [wSpriteIndex], a
|
||||
call EngageMapTrainer
|
||||
call InitBattleEnemyParameters
|
||||
ld a, $3
|
||||
ld [W_GYMLEADERNO], a
|
||||
xor a
|
||||
ldh [$b4], a
|
||||
ld [hJoyHeld], a
|
||||
ld a, $3
|
||||
ld [W_VERMILIONGYMCURSCRIPT], a
|
||||
ld [W_CURMAPSCRIPT], a
|
||||
|
|
|
@ -306,7 +306,7 @@ ViridianGymText1: ; 74a69 (1d:4a69)
|
|||
ld hl, ViridianGymText_74ad3
|
||||
ld de, ViridianGymText_74ad3
|
||||
call SaveEndBattleTextPointers
|
||||
ldh a, [$8c]
|
||||
ld a, [H_SPRITEINDEX]
|
||||
ld [wSpriteIndex], a
|
||||
call EngageMapTrainer
|
||||
call InitBattleEnemyParameters
|
||||
|
|
Loading…
Reference in a new issue