summaryrefslogtreecommitdiff
path: root/event
diff options
context:
space:
mode:
Diffstat (limited to 'event')
-rwxr-xr-xevent/basement_key.asm2
-rwxr-xr-xevent/card_key.asm2
-rwxr-xr-xevent/halloffame.asm92
-rwxr-xr-xevent/itemball.asm6
-rwxr-xr-xevent/itemfinder.asm4
-rwxr-xr-xevent/magnet_train.asm4
-rwxr-xr-xevent/photo.asm2
-rwxr-xr-xevent/poisonstep.asm2
-rwxr-xr-xevent/sacred_ash.asm4
-rwxr-xr-xevent/sweet_scent.asm6
-rwxr-xr-xevent/whiteout.asm2
11 files changed, 63 insertions, 63 deletions
diff --git a/event/basement_key.asm b/event/basement_key.asm
index 605b2af88..2800bac8d 100755
--- a/event/basement_key.asm
+++ b/event/basement_key.asm
@@ -29,6 +29,6 @@ _BasementKey: ; 507b4
; 507e1
.BasementKeyScript: ; 0x507e1
- loadmovesprites
+ closetext
farjump BasementDoorScript
; 0x507e6
diff --git a/event/card_key.asm b/event/card_key.asm
index b442ba184..dc7393911 100755
--- a/event/card_key.asm
+++ b/event/card_key.asm
@@ -34,6 +34,6 @@ _CardKey: ; 50779
; 507af
.CardKeyScript: ; 0x507af
- loadmovesprites
+ closetext
farjump MapRadioTower3FSignpost2Script
; 0x507b4
diff --git a/event/halloffame.asm b/event/halloffame.asm
index d4b86286d..e2c120102 100755
--- a/event/halloffame.asm
+++ b/event/halloffame.asm
@@ -1,5 +1,5 @@
HallOfFame:: ; 0x8640e
- call Function8648e
+ call HallOfFame_FadeOutMusic
ld a, [StatusFlags]
push af
ld a, 1
@@ -12,7 +12,7 @@ HallOfFame:: ; 0x8640e
ld hl, StatusFlags
set 6, [hl] ; hall of fame
- callba Function14da0
+ callba HallOfFame_InitSaveIfNeeded
ld hl, wHallOfFameCount
ld a, [hl]
@@ -26,10 +26,10 @@ HallOfFame:: ; 0x8640e
xor a
ld [wc2cd], a
- call Function864c3
+ call AnimateHallOfFame
pop af
ld b, a
- callba Function109847
+ callba Credits
ret
; 0x86455
@@ -38,7 +38,7 @@ RedCredits:: ; 86455
ld [MusicFadeIDLo], a
ld a, MUSIC_NONE / $100
ld [MusicFadeIDHi], a
- ld a, $a
+ ld a, 10
ld [MusicFade], a
callba FadeOutPalettes
xor a
@@ -52,11 +52,11 @@ RedCredits:: ; 86455
ld [wSpawnAfterChampion], a
ld a, [StatusFlags]
ld b, a
- callba Function109847
+ callba Credits
ret
; 8648e
-Function8648e: ; 8648e
+HallOfFame_FadeOutMusic: ; 8648e
ld a, MUSIC_NONE % $100
ld [MusicFadeIDLo], a
ld a, MUSIC_NONE / $100
@@ -72,7 +72,7 @@ Function8648e: ; 8648e
jp DelayFrames
; 864b4
-Function864b4: ; 864b4
+HallOfFame_PlayMusicDE: ; 864b4
push de
ld de, MUSIC_NONE
call PlayMusic
@@ -82,29 +82,29 @@ Function864b4: ; 864b4
ret
; 864c3
-Function864c3: ; 864c3
+AnimateHallOfFame: ; 864c3
xor a
ld [wJumptableIndex], a
- call Function8671c
+ call LoadHOFTeam
jr c, .done
- ld de, SCREEN_WIDTH
- call Function864b4
+ ld de, MUSIC_HALL_OF_FAME
+ call HallOfFame_PlayMusicDE
xor a
ld [wcf64], a
.loop
ld a, [wcf64]
- cp 6
+ cp PARTY_LENGTH
jr nc, .done
- ld hl, wc608 + 1
- ld bc, $10
+ ld hl, wHallOfFameTempMon1
+ ld bc, wHallOfFameTempMon1End - wHallOfFameTempMon1
call AddNTimes
ld a, [hl]
cp -1
jr z, .done
push hl
- call Function865b5
+ call AnimateHOFMonEntrance
pop hl
- call Function8650c
+ call .DisplayNewHallOfFamer
jr c, .done
ld hl, wcf64
inc [hl]
@@ -120,9 +120,9 @@ Function864c3: ; 864c3
ret
; 8650c
-Function8650c: ; 8650c
- call Function86748
- ld de, String_8652c
+.DisplayNewHallOfFamer: ; 8650c
+ call DisplayHOFMon
+ ld de, .String_NewHallOfFamer
hlcoord 1, 2
call PlaceString
call WaitBGMap
@@ -135,7 +135,7 @@ Function8650c: ; 8650c
ret
; 8652c
-String_8652c:
+.String_NewHallOfFamer:
db "New Hall of Famer!@"
; 8653f
@@ -227,7 +227,7 @@ GetHallOfFameParty: ; 8653f
ret
; 865b5
-Function865b5: ; 865b5
+AnimateHOFMonEntrance: ; 865b5
push hl
call ClearBGPalettes
callba Function4e906
@@ -265,7 +265,7 @@ endr
ld b, SCGB_1A
call GetSGBLayout
call SetPalettes
- call Function86635
+ call HOF_SlideBackpic
xor a
ld [wc2c6], a
hlcoord 0, 0
@@ -278,23 +278,23 @@ endr
xor a
ld [hBGMapMode], a
ld [hSCY], a
- call Function86643
+ call HOF_SlideFrontpic
ret
; 86635
-Function86635: ; 86635
-.loop
+HOF_SlideBackpic:
+.backpicloop
ld a, [hSCX]
cp $70
ret z
add $4
ld [hSCX], a
call DelayFrame
- jr .loop
+ jr .backpicloop
; 86643
-Function86643: ; 86643
-.loop
+HOF_SlideFrontpic:
+.frontpicloop
ld a, [hSCX]
and a
ret z
@@ -303,7 +303,7 @@ rept 2
endr
ld [hSCX], a
call DelayFrame
- jr .loop
+ jr .frontpicloop
; 86650
_HallOfFamePC: ; 86650
@@ -311,7 +311,7 @@ _HallOfFamePC: ; 86650
xor a
ld [wJumptableIndex], a
.loop
- call Function8671c
+ call LoadHOFTeam
ret c
call Function86665
ret c
@@ -361,8 +361,8 @@ Function86692: ; 86692
ld a, [wcf64]
cp $6
jr nc, .fail
- ld hl, wc608 + 1
- ld bc, $10
+ ld hl, wHallOfFameTempMon1
+ ld bc, wHallOfFameTempMon1End - wHallOfFameTempMon1
call AddNTimes
ld a, [hl]
cp $ff
@@ -376,8 +376,8 @@ Function86692: ; 86692
push hl
call ClearBGPalettes
pop hl
- call Function86748
- ld a, [wc608]
+ call DisplayHOFMon
+ ld a, [wHallOfFameTempWinCount]
cp 200 + 1
jr c, .print_num_hof
ld de, String_866fc
@@ -391,7 +391,7 @@ Function86692: ; 86692
hlcoord 1, 2
call PlaceString
hlcoord 2, 2
- ld de, wc608
+ ld de, wHallOfFameTempWinCount
lb bc, 1, 3
call PrintNum
hlcoord 11, 2
@@ -423,10 +423,10 @@ String_8670c:
; 8671c
-Function8671c: ; 8671c
+LoadHOFTeam: ; 8671c
ld a, [wJumptableIndex]
cp NUM_HOF_TEAMS
- jr nc, .full
+ jr nc, .invalid
ld hl, sHallOfFame
ld bc, HOF_LENGTH
call AddNTimes
@@ -434,23 +434,23 @@ Function8671c: ; 8671c
call GetSRAMBank
ld a, [hl]
and a
- jr z, .fail
- ld de, wc608
+ jr z, .absent
+ ld de, wHallOfFameTemp
ld bc, HOF_LENGTH
call CopyBytes
call CloseSRAM
and a
ret
-.fail
+.absent
call CloseSRAM
-.full
+.invalid
scf
ret
; 86748
-Function86748: ; 86748
+DisplayHOFMon: ; 86748
xor a
ld [hBGMapMode], a
ld a, [hli]
@@ -466,7 +466,7 @@ Function86748: ; 86748
ld a, [hli]
ld [TempMonLevel], a
ld de, StringBuffer2
- ld bc, 10
+ ld bc, PKMN_NAME_LENGTH - 1
call CopyBytes
ld a, "@"
ld [StringBuffer2 + 10], a
@@ -564,7 +564,7 @@ Function86810: ; 86810
ld b, SCGB_1A
call GetSGBLayout
call SetPalettes
- call Function86635
+ call HOF_SlideBackpic
xor a
ld [wc2c6], a
hlcoord 0, 0
@@ -583,7 +583,7 @@ Function86810: ; 86810
xor a
ld [hBGMapMode], a
ld [hSCY], a
- call Function86643
+ call HOF_SlideFrontpic
xor a
ld [hBGMapMode], a
hlcoord 0, 2
diff --git a/event/itemball.asm b/event/itemball.asm
index 0e74cbd27..6c6f503e1 100755
--- a/event/itemball.asm
+++ b/event/itemball.asm
@@ -7,17 +7,17 @@ FindItemInBallScript:: ; 0x122ce
playsound SFX_ITEM
pause 60
itemnotify
- loadmovesprites
+ closetext
end
; 0x122e3
.no_room: ; 0x122e3
loadfont
writetext .text_found
- closetext
+ waitbutton
writetext .text_bag_full
+ waitbutton
closetext
- loadmovesprites
end
; 0x122ee
diff --git a/event/itemfinder.asm b/event/itemfinder.asm
index 23de57058..1bbec2a4f 100755
--- a/event/itemfinder.asm
+++ b/event/itemfinder.asm
@@ -33,7 +33,7 @@ ItemFinder: ; 12580
special UpdateTimePals
callasm .ItemfinderSound
writetext .Text_FoundSomething
- loadmovesprites
+ closetext
end
; 0x125ba
@@ -41,7 +41,7 @@ ItemFinder: ; 12580
reloadmappart
special UpdateTimePals
writetext .Text_FoundNothing
- loadmovesprites
+ closetext
end
; 0x125c3
diff --git a/event/magnet_train.asm b/event/magnet_train.asm
index d9c1a3ae9..dfc12b85a 100755
--- a/event/magnet_train.asm
+++ b/event/magnet_train.asm
@@ -43,7 +43,7 @@ Special_MagnetTrain: ; 8cc04
jr z, .initialize
bit 7, a
jr nz, .done
- callab Function8cf69
+ callab PlaySpriteAnimations
call Function8cdf7
call Function8cc99
call Function3b0c
@@ -426,7 +426,7 @@ Function8cea2: ; 8cea2
; 8ceae
Function8ceae: ; 8ceae
- callba Function8cf69
+ callba PlaySpriteAnimations
call Function8cdf7
call Function8cc99
call Function3b0c
diff --git a/event/photo.asm b/event/photo.asm
index 712107ed0..b35b38e04 100755
--- a/event/photo.asm
+++ b/event/photo.asm
@@ -162,7 +162,7 @@ Function16cff: ; 16cff
ld a, BANK(sScratch)
call GetSRAMBank
- ld de, w6_d000
+ ld de, wBackupTilemap
ld hl, sScratch
ld a, [hROMBank]
ld b, a
diff --git a/event/poisonstep.asm b/event/poisonstep.asm
index 1fafd63a5..29181f6b3 100755
--- a/event/poisonstep.asm
+++ b/event/poisonstep.asm
@@ -114,7 +114,7 @@ DoPoisonStep:: ; 505da
loadfont
callasm .CheckWhitedOut
iffalse .whiteout
- loadmovesprites
+ closetext
end
; 50677
diff --git a/event/sacred_ash.asm b/event/sacred_ash.asm
index 00b80bb46..88d49b935 100755
--- a/event/sacred_ash.asm
+++ b/event/sacred_ash.asm
@@ -58,12 +58,12 @@ SacredAshScript: ; 0x50821
special FadeInPalettes
special FadeOutPalettes
special FadeInPalettes
- waitbutton
+ waitsfx
writetext UnknownText_0x50845
playsound SFX_CAUGHT_MON
+ waitsfx
waitbutton
closetext
- loadmovesprites
end
; 0x50845
diff --git a/event/sweet_scent.asm b/event/sweet_scent.asm
index ebe0d4266..5493d8841 100755
--- a/event/sweet_scent.asm
+++ b/event/sweet_scent.asm
@@ -11,12 +11,12 @@ UnknownScript_0x506c8: ; 0x506c8
special UpdateTimePals
callasm GetPartyNick
writetext UnknownText_0x50726
- closetext
+ waitbutton
callasm SweetScentEncounter
iffalse UnknownScript_0x506e9
checkflag ENGINE_BUG_CONTEST_TIMER
iftrue UnknownScript_0x506e5
- battlecheck
+ setup_random_encounter
startbattle
returnafterbattle
end
@@ -28,8 +28,8 @@ UnknownScript_0x506e5: ; 0x506e5
UnknownScript_0x506e9: ; 0x506e9
writetext UnknownText_0x5072b
+ waitbutton
closetext
- loadmovesprites
end
; 0x506ef
diff --git a/event/whiteout.asm b/event/whiteout.asm
index 2e8774b8f..01985c1c9 100755
--- a/event/whiteout.asm
+++ b/event/whiteout.asm
@@ -9,7 +9,7 @@ Script_OverworldWhiteout:: ; 0x124c8
Script_Whiteout: ; 0x124ce
writetext .WhitedOutText
- closetext
+ waitbutton
special FadeOutPalettes
pause 40
special HealParty
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-08 23:43:27 +0000