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

more naming variables

Browse source
This commit is contained in:
YamaArashi 2015-07-24 20:27:59 -07:00
parent 12db77201f
commit 7f6d0d49b6
57 changed files with 374 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/billshouse.asm
View file

@ -49,7 +49,7 @@ BillsHouseScript2: ; 1e7a6 (7:67a6)
bit 0, a
ret nz
ld a, HS_BILL_POKEMON
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
SetEvent EVENT_BILL_SAID_USE_CELL_SEPARATOR
xor a
@ -75,7 +75,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5)
ld [$ffee], a
call SetSpritePosition1
ld a, HS_BILL_1
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
ld c, 8
call DelayFrames
@ -170,10 +170,10 @@ BillsHouseText2: ; 1e874 (7:6874)
call PrintText
SetEvent EVENT_GOT_SS_TICKET
ld a, HS_CERULEAN_GUARD_1
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
ld a, HS_CERULEAN_GUARD_2
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
.asm_1e8a9
ld hl, BillsHouseText_1e8cb

2
scripts/blueshouse.asm
View file

@ -40,7 +40,7 @@ BluesHouseText1: ; 19b5d (6:5b5d)
call GiveItem
jr nc, .BagFull
ld a,HS_TOWN_MAP
ld [wcc4d],a
ld [wMissableObjectIndex],a
predef HideObject ; hide table map object
ld hl,GotMapText
call PrintText

2
scripts/celadongamecorner.asm
View file

@ -107,7 +107,7 @@ CeladonGameCornerScript2: ; 48c69 (12:4c69)
xor a
ld [wJoyIgnore], a
ld a, HS_GAME_CORNER_ROCKET
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld hl, wd126
set 5, [hl]

2
scripts/celadonmansion5.asm
View file

@ -15,7 +15,7 @@ CeladonMansion5Text2: ; 1dd46 (7:5d46)
call GivePokemon
jr nc, .asm_24365
ld a, HS_CELADON_MANSION_5_GIFT
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
.asm_24365
jp TextScriptEnd

6
scripts/ceruleancity.asm
View file

@ -9,7 +9,7 @@ CeruleanCityScript_1948c: ; 1948c (6:548c)
ld [wJoyIgnore], a
ld [W_CERULEANCITYCURSCRIPT], a
ld a, HS_CERULEAN_RIVAL
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef_jump HideObject
CeruleanCityScriptPointers: ; 1949d (6:549d)
@ -86,7 +86,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
ld [hl], $19
.asm_19535
ld a, HS_CERULEAN_RIVAL
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
ld de, CeruleanCityMovement1
ld a, $1
@ -218,7 +218,7 @@ CeruleanCityScript3: ; 19610 (6:5610)
bit 0, a
ret nz
ld a, HS_CERULEAN_RIVAL
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
xor a
ld [wJoyIgnore], a

6
scripts/ceruleancity2.asm
View file

@ -4,13 +4,13 @@ CeruleanHideRocket: ; 74872 (1d:4872)
; the screen then fades out, he disappears, and fades back in
call GBFadeOutToBlack
ld a, HS_CERULEAN_GUARD_1
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
ld a, HS_CERULEAN_GUARD_2
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld a, HS_CERULEAN_ROCKET
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
call GBFadeInFromBlack
ret

4
scripts/fightingdojo.asm
View file

@ -274,7 +274,7 @@ FightingDojoText6: ; 5cf06 (17:4f06)
; once Poké Ball is taken, hide sprite
ld a, HS_FIGHTING_DOJO_GIFT_1
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
SetEvents EVENT_GOT_HITMONLEE, EVENT_DEFEATED_FIGHTING_DOJO
.done
@ -310,7 +310,7 @@ FightingDojoText7: ; 5cf4e (17:4f4e)
; once Poké Ball is taken, hide sprite
ld a, HS_FIGHTING_DOJO_GIFT_2
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
.done
jp TextScriptEnd

4
scripts/gary.asm
View file

@ -120,7 +120,7 @@ GaryScript4: ; 75fe4 (1d:5fe4)
ld [H_SPRITEINDEX], a
call MoveSprite
ld a, HS_CHAMPIONS_ROOM_OAK
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
ld a, $5
ld [W_GARYCURSCRIPT], a
@ -197,7 +197,7 @@ GaryScript8: ; 76083 (1d:6083)
bit 0, a
ret nz
ld a, HS_CHAMPIONS_ROOM_OAK
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld a, $9
ld [W_GARYCURSCRIPT], a

2
scripts/halloffameroom.asm
View file

@ -95,7 +95,7 @@ HallofFameRoomScript1: ; 5a52b (16:652b)
ld a, $ff
ld [wJoyIgnore], a
ld a, HS_UNKNOWN_DUNGEON_GUY
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld a, $2
ld [W_HALLOFFAMEROOMCURSCRIPT], a

6
scripts/mtmoon3.asm
View file

@ -145,7 +145,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb)
.asm_49e1d
ld a, HS_MT_MOON_3_FOSSIL_1
.asm_49e1f
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
xor a
ld [wJoyIgnore], a
@ -276,7 +276,7 @@ MtMoon3Text6: ; 49ee9 (12:5ee9)
jp nc, MtMoon3Script_49f76
call MtMoon3Script_49f69
ld a, HS_MT_MOON_3_FOSSIL_1
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
SetEvent EVENT_GOT_DOME_FOSSIL
ld a, $4
@ -304,7 +304,7 @@ MtMoon3Text7: ; 49f29 (12:5f29)
jp nc, MtMoon3Script_49f76
call MtMoon3Script_49f69
ld a, HS_MT_MOON_3_FOSSIL_2
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
SetEvent EVENT_GOT_HELIX_FOSSIL
ld a, $4

2
scripts/museum1f.asm
View file

@ -196,7 +196,7 @@ Museum1FText3: ; 5c256 (17:4256)
jr nc, .BagFull
SetEvent EVENT_GOT_OLD_AMBER
ld a, HS_OLD_AMBER
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld hl, ReceivedOldAmberText
jr .asm_5c288

26
scripts/oakslab.asm
View file

@ -37,7 +37,7 @@ OaksLabScript0: ; 1cb4e (7:4b4e)
and a
ret nz
ld a, HS_OAKS_LAB_OAK_2
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
ld hl, wd72e
res 4, [hl]
@ -67,10 +67,10 @@ OaksLabScript2: ; 1cb82 (7:4b82)
bit 0, a
ret nz
ld a, HS_OAKS_LAB_OAK_2
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld a, HS_OAKS_LAB_OAK_1
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
ld a, $3
@ -315,7 +315,7 @@ OaksLabScript9: ; 1cd00 (7:4d00)
.asm_1cd30
ld a, HS_STARTER_BALL_3
.asm_1cd32
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
call Delay3
ld a, [wRivalStarterTemp]
@ -475,7 +475,7 @@ OaksLabScript14: ; 1ce6d (7:4e6d)
bit 0, a
jr nz, .asm_1ce8c
ld a, HS_OAKS_LAB_RIVAL
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
xor a
ld [wJoyIgnore], a
@ -519,7 +519,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0)
call DisplayTextID
call OaksLabScript_1d02b
ld a, HS_OAKS_LAB_RIVAL
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
ld a, [wNPCMovementDirections2Index]
ld [wd157], a
@ -578,10 +578,10 @@ OaksLabScript16: ; 1cf12 (7:4f12)
call DisplayTextID
call Delay3
ld a, HS_POKEDEX_1
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld a, HS_POKEDEX_2
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
call OaksLabScript_1cefd
ld a, $1a
@ -599,10 +599,10 @@ OaksLabScript16: ; 1cf12 (7:4f12)
SetEvent EVENT_GOT_POKEDEX
SetEvent EVENT_OAK_GOT_PARCEL
ld a, HS_LYING_OLD_MAN
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld a, HS_OLD_MAN
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
ld a, [wd157]
ld b, $0
@ -630,13 +630,13 @@ OaksLabScript17: ; 1cfd4 (7:4fd4)
ret nz
call PlayDefaultMusic
ld a, HS_OAKS_LAB_RIVAL
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
SetEvent EVENT_1ST_ROUTE22_RIVAL_BATTLE
ResetEventReuseHL EVENT_2ND_ROUTE22_RIVAL_BATTLE
SetEventReuseHL EVENT_ROUTE22_RIVAL_WANTS_BATTLE
ld a, HS_ROUTE_22_RIVAL_1
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
ld a, $5
ld [W_PALLETTOWNCURSCRIPT], a
@ -914,7 +914,7 @@ OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3)
.asm_1d1e3
ld a, HS_STARTER_BALL_3
.asm_1d1e5
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld a, $1
ld [wDoNotWaitForButtonPressAfterDisplayingText], a

6
scripts/pallettown.asm
View file

@ -51,7 +51,7 @@ PalletTownScript1: ; 18eb2 (6:4eb2)
ld a,$FF
ld [wJoyIgnore],a
ld a,HS_PALLET_TOWN_OAK
ld [wcc4d],a
ld [wMissableObjectIndex],a
predef ShowObject
; trigger the next script
@ -136,10 +136,10 @@ PalletTownScript5: ; 18f56 (6:4f56)
jr nz,.next
SetEvent EVENT_DAISY_WALKING
ld a,HS_DAISY_SITTING
ld [wcc4d],a
ld [wMissableObjectIndex],a
predef HideObject
ld a,HS_DAISY_WALKING
ld [wcc4d],a
ld [wMissableObjectIndex],a
predef_jump ShowObject
.next
CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK

8
scripts/pewtercity.asm
View file

@ -88,7 +88,7 @@ PewterCityScript2: ; 192d3 (6:52d3)
bit 0, a
ret nz
ld a, HS_MUSEUM_GUY
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld a, $3
ld [W_PEWTERCITYCURSCRIPT], a
@ -99,7 +99,7 @@ PewterCityScript3: ; 192e9 (6:52e9)
ld [wSpriteIndex], a
call SetSpritePosition2
ld a, HS_MUSEUM_GUY
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
xor a
ld [wJoyIgnore], a
@ -157,7 +157,7 @@ PewterCityScript5: ; 19359 (6:5359)
bit 0, a
ret nz
ld a, HS_GYM_GUY
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld a, $6
ld [W_PEWTERCITYCURSCRIPT], a
@ -168,7 +168,7 @@ PewterCityScript6: ; 1936f (6:536f)
ld [wSpriteIndex], a
call SetSpritePosition2
ld a, HS_GYM_GUY
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
xor a
ld [wJoyIgnore], a

4
scripts/pewtergym.asm
View file

@ -66,10 +66,10 @@ PewterGymScript_5c3df: ; 5c3df (17:43df)
set 0, [hl]
ld a, HS_GYM_GUY
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld a, HS_ROUTE_22_RIVAL_1
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ResetEvents EVENT_1ST_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE

2
scripts/pokemontower2.asm
View file

@ -112,7 +112,7 @@ PokemonTower2Script2: ; 605bb (18:45bb)
bit 0, a
ret nz
ld a, HS_POKEMONTOWER_2_RIVAL
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
xor a
ld [wJoyIgnore], a

10
scripts/pokemontower7.asm
View file

@ -51,7 +51,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56)
cp b ; search for sprite ID in missing objects list
ld a, [hli]
jr nz, .missableObjectsListLoop
ld [wcc4d], a ; remove missable object
ld [wMissableObjectIndex], a ; remove missable object
predef HideObject
xor a
ld [wJoyIgnore], a
@ -67,7 +67,7 @@ PokemonTower7Script4: ; 60d86 (18:4d86)
ld a, $ff
ld [wJoyIgnore], a
ld a, HS_POKEMONTOWER_7_MR_FUJI
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld a, SPRITE_FACING_UP
ld [wSpriteStateData1 + 9], a
@ -259,13 +259,13 @@ PokemonTower7FujiText:
SetEvent EVENT_RESCUED_MR_FUJI
SetEvent EVENT_RESCUED_MR_FUJI_2
ld a, HS_LAVENDER_HOUSE_1_MR_FUJI
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
ld a, HS_SAFFRON_CITY_E
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld a, HS_SAFFRON_CITY_F
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
ld a, $4
ld [W_POKEMONTOWER7CURSCRIPT], a

6
scripts/rockethideout4.asm
View file

@ -56,10 +56,10 @@ RocketHideout4Script3: ; 454b6 (11:54b6)
call DisplayTextID
call GBFadeOutToBlack
ld a, HS_ROCKET_HIDEOUT_4_GIOVANNI
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld a, HS_ROCKET_HIDEOUT_4_ITEM_4
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
call UpdateSprites
call GBFadeInFromBlack
@ -211,7 +211,7 @@ RocketHideout4AfterBattleText4: ; 455cf (11:55cf)
CheckAndSetEvent EVENT_ROCKET_DROPPED_LIFT_KEY
jr nz, .asm_455e9
ld a, HS_ROCKET_HIDEOUT_4_ITEM_5
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
.asm_455e9
jp TextScriptEnd

2
scripts/route12.asm
View file

@ -34,7 +34,7 @@ Route12Script0: ; 59619 (16:5619)
ld a, 30
ld [W_CURENEMYLVL], a
ld a, HS_ROUTE_12_SNORLAX
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld a, $3
ld [W_ROUTE12CURSCRIPT], a

2
scripts/route16.asm
View file

@ -34,7 +34,7 @@ Route16Script0: ; 59959 (16:5959)
ld a, 30
ld [W_CURENEMYLVL], a
ld a, HS_ROUTE_16_SNORLAX
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
call UpdateSprites
ld a, $3

4
scripts/route20.asm
View file

@ -49,11 +49,11 @@ Route20Script_50cc6: ; 50cc6 (14:4cc6)
ret
Route20Script_50d0c: ; 50d0c (14:4d0c)
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef_jump ShowObject
Route20Script_50d14: ; 50d14 (14:4d14)
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef_jump HideObject
Route20ScriptPointers: ; 50d1c (14:4d1c)

4
scripts/route22.asm
View file

@ -224,7 +224,7 @@ Route22Script3: ; 5102a (14:502a)
xor a
ld [wJoyIgnore], a
ld a, HS_ROUTE_22_RIVAL_1
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
call PlayDefaultMusic
ResetEvents EVENT_1ST_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE
@ -369,7 +369,7 @@ Route22Script6: ; 51151 (14:5151)
xor a
ld [wJoyIgnore], a
ld a, HS_ROUTE_22_RIVAL_2
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
call PlayDefaultMusic
ResetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE

4
scripts/route23.asm
View file

@ -13,10 +13,10 @@ Route23Script_511e9: ; 511e9 (14:51e9)
ResetEvents EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2
ResetEvents EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2
ld a, HS_VICTORY_ROAD_3_BOULDER
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
ld a, HS_VICTORY_ROAD_2_BOULDER
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef_jump HideObject
Route23ScriptPointers: ; 51213 (14:5213)

8
scripts/route25.asm
View file

@ -19,20 +19,20 @@ Route25Script_515e1: ; 515e1 (14:55e1)
jr nz, .asm_515ff
ResetEventReuseHL EVENT_BILL_SAID_USE_CELL_SEPARATOR
ld a, HS_BILL_POKEMON
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef_jump ShowObject
.asm_515ff
CheckEventAfterBranchReuseHL EVENT_GOT_SS_TICKET, EVENT_MET_BILL_2
ret z
SetEventReuseHL EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING
ld a, HS_NUGGET_BRIDGE_GUY
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld a, HS_BILL_1
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld a, HS_BILL_2
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef_jump ShowObject
Route25ScriptPointers: ; 51622 (14:5622)

16
scripts/seafoamislands1.asm
View file

@ -14,22 +14,22 @@ SeafoamIslands1Script: ; 447e9 (11:47e9)
jr nz, .asm_44819
SetEventReuseHL EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE
ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_1
ld [wd079], a
ld [wObjectToHide], a
ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_1
ld [wd07a], a
ld [wObjectToShow], a
jr .asm_44825
.asm_44819
SetEventAfterBranchReuseHL EVENT_SEAFOAM1_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE
ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_2
ld [wd079], a
ld [wObjectToHide], a
ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_2
ld [wd07a], a
ld [wObjectToShow], a
.asm_44825
ld a, [wd079]
ld [wcc4d], a
ld a, [wObjectToHide]
ld [wMissableObjectIndex], a
predef HideObject
ld a, [wd07a]
ld [wcc4d], a
ld a, [wObjectToShow]
ld [wMissableObjectIndex], a
predef_jump ShowObject
.asm_4483b
ld a, $9f

16
scripts/seafoamislands2.asm
View file

@ -13,22 +13,22 @@ SeafoamIslands2Script: ; 46315 (11:6315)
jr nz, .asm_46340
SetEventReuseHL EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE
ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_1
ld [wd079], a
ld [wObjectToHide], a
ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_1
ld [wd07a], a
ld [wObjectToShow], a
jr .asm_4634c
.asm_46340
SetEventAfterBranchReuseHL EVENT_SEAFOAM2_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE
ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_2
ld [wd079], a
ld [wObjectToHide], a
ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_2
ld [wd07a], a
ld [wObjectToShow], a
.asm_4634c
ld a, [wd079]
ld [wcc4d], a
ld a, [wObjectToHide]
ld [wMissableObjectIndex], a
predef HideObject
ld a, [wd07a]
ld [wcc4d], a
ld a, [wObjectToShow]
ld [wMissableObjectIndex], a
predef_jump ShowObject
.asm_46362
ld a, $a0

16
scripts/seafoamislands3.asm
View file

@ -13,22 +13,22 @@ SeafoamIslands3Script: ; 46451 (11:6451)
jr nz, .asm_4647c
SetEventReuseHL EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE
ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_1
ld [wd079], a
ld [wObjectToHide], a
ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_3
ld [wd07a], a
ld [wObjectToShow], a
jr .asm_46488
.asm_4647c
SetEventAfterBranchReuseHL EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE
ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_2
ld [wd079], a
ld [wObjectToHide], a
ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_4
ld [wd07a], a
ld [wObjectToShow], a
.asm_46488
ld a, [wd079]
ld [wcc4d], a
ld a, [wObjectToHide]
ld [wMissableObjectIndex], a
predef HideObject
ld a, [wd07a]
ld [wcc4d], a
ld a, [wObjectToShow]
ld [wMissableObjectIndex], a
predef_jump ShowObject
.asm_4649e
ld a, $a1

16
scripts/seafoamislands4.asm
View file

@ -13,22 +13,22 @@ SeafoamIslands4Script: ; 4658d (11:658d)
jr nz, .asm_465b8
SetEventReuseHL EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE
ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_1
ld [wd079], a
ld [wObjectToHide], a
ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_1
ld [wd07a], a
ld [wObjectToShow], a
jr .asm_465c4
.asm_465b8
SetEventAfterBranchReuseHL EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE
ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_2
ld [wd079], a
ld [wObjectToHide], a
ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_2
ld [wd07a], a
ld [wObjectToShow], a
.asm_465c4
ld a, [wd079]
ld [wcc4d], a
ld a, [wObjectToHide]
ld [wMissableObjectIndex], a
predef HideObject
ld a, [wd07a]
ld [wcc4d], a
ld a, [wObjectToShow]
ld [wMissableObjectIndex], a
predef ShowObject
jr .asm_465ed
.asm_465dc

2
scripts/silphco1.asm
View file

@ -5,7 +5,7 @@ SilphCo1Script: ; 5d44e (17:544e)
CheckAndSetEvent EVENT_SILPH_CO_RECEPTIONIST_AT_DESK
ret nz
ld a, HS_SILPH_CO_1F_RECEPTIONIST
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef_jump ShowObject
SilphCo1TextPointers: ; 5d469 (17:5469)

4
scripts/silphco11.asm
View file

@ -76,7 +76,7 @@ SilphCo11Script_6216d: ; 6216d (18:616d)
cp $ff
jr z, .asm_62181
push hl
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
pop hl
jr .asm_62170
@ -87,7 +87,7 @@ SilphCo11Script_6216d: ; 6216d (18:616d)
cp $ff
ret z
push hl
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
pop hl
jr .asm_62184

2
scripts/silphco7.asm
View file

@ -252,7 +252,7 @@ SilphCo7Script5: ; 51d25 (14:5d25)
bit 0, a
ret nz
ld a, HS_SILPH_CO_7F_RIVAL
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
call PlayDefaultMusic
xor a

4
scripts/ssanne2.asm
View file

@ -33,7 +33,7 @@ SSAnne2Script0: ; 613be (18:53be)
ld a, [wCoordIndex]
ld [$ffdb], a
ld a, HS_SS_ANNE_2_RIVAL
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
call Delay3
ld a, $2
@ -171,7 +171,7 @@ SSAnne2Script3: ; 614be (18:54be)
xor a
ld [wJoyIgnore], a
ld a, HS_SS_ANNE_2_RIVAL
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
call PlayDefaultMusic
ld a, $4

2
scripts/vermilioncity.asm
View file

@ -17,7 +17,7 @@ VermilionCityScript_197c0: ; 197c0 (6:57c0)
call Random
ld a, [$ffd4]
and $e
ld [wd743], a
ld [wFirstLockTrashCanIndex], a
ret
VermilionCityScript_197cb: ; 197cb (6:57cb)

4
scripts/victoryroad3.asm
View file

@ -44,10 +44,10 @@ VictoryRoad3Script0: ; 449b7 (11:49b7)
CheckAndSetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2
jr nz, .asm_449fe
ld a, HS_VICTORY_ROAD_3_BOULDER
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
ld a, HS_VICTORY_ROAD_2_BOULDER
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef_jump ShowObject
.coordsData_449f9: ; 449f9 (11:49f9)

4
scripts/viridiangym.asm
View file

@ -163,7 +163,7 @@ ViridianGymScript3_74995: ; 74995 (1d:4995)
SetEventRange EVENT_BEAT_VIRIDIAN_GYM_TRAINER_0, EVENT_BEAT_VIRIDIAN_GYM_TRAINER_7
ld a, HS_ROUTE_22_RIVAL_2
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef ShowObject
SetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE
jp ViridianGymScript_748d6
@ -275,7 +275,7 @@ ViridianGymText1: ; 74a69 (1d:4a69)
call PrintText
call GBFadeOutToBlack
ld a, HS_VIRIDIAN_GYM_GIOVANNI
ld [wcc4d], a
ld [wMissableObjectIndex], a
predef HideObject
call UpdateSprites
call Delay3