summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/events.asm22
-rw-r--r--engine/events_2.asm24
-rw-r--r--engine/specials.asm66
-rw-r--r--engine/std_scripts.asm126
4 files changed, 120 insertions, 118 deletions
diff --git a/engine/events.asm b/engine/events.asm
index b37f53d39..9435b4c49 100644
--- a/engine/events.asm
+++ b/engine/events.asm
@@ -358,7 +358,7 @@ CheckTileEvent: ; 96874
call CheckBit2_ScriptFlags3
jr z, .bit2
- callba Function104820
+ callba CheckMovingOffEdgeOfMap
jr c, .return4
call Function2238
@@ -368,7 +368,7 @@ CheckTileEvent: ; 96874
call CheckBit1_ScriptFlags3
jr z, .bit1
- call Function2ad4
+ call CheckCurrentMapXYTriggers
jr c, .movement
.bit1
@@ -398,12 +398,12 @@ CheckTileEvent: ; 96874
.return6
ld a, [StandingTile]
call CheckPitTile
- jr nz, .asm_968b6
+ jr nz, .pittile
ld a, 6
scf
ret
-.asm_968b6
+.pittile
ld a, 5
scf
ret
@@ -528,8 +528,8 @@ Function9693a: ; 9693a
ret
.elevator
- ld a, BANK(UnknownScript_0x135f8)
- ld hl, UnknownScript_0x135f8
+ ld a, BANK(BugCatchingContestOverScript)
+ ld hl, BugCatchingContestOverScript
call CallScript
scf
ret
@@ -764,8 +764,8 @@ TryReadSign: ; 96a38
ld de, EngineBuffer1
ld bc, 3
call FarCopyBytes
- ld a, BANK(UnknownScript_0x13625)
- ld hl, UnknownScript_0x13625
+ ld a, BANK(SignpostItemScript)
+ ld hl, SignpostItemScript
call CallScript
scf
ret
@@ -817,7 +817,7 @@ CheckSignFlag: ; 96ad8
call GetFarHalfword
ld e, l
ld d, h
- ld b, $2
+ ld b, $2 ; check
call EventFlagAction
ld a, c
and a
@@ -1024,8 +1024,8 @@ Function96bd7: ; 96bd7
dec a
ld [wdca1], a
ret nz
- ld a, BANK(UnknownScript_0x13619)
- ld hl, UnknownScript_0x13619
+ ld a, BANK(RepelWoreOffScript)
+ ld hl, RepelWoreOffScript
call CallScript
scf
ret
diff --git a/engine/events_2.asm b/engine/events_2.asm
index 506075c52..bbc883b56 100644
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -1,7 +1,7 @@
; More overworld event handling.
-Function97c28:: ; 97c28
+WarpToLastSpawn:: ; 97c28
ld hl, StatusFlags2
res 1, [hl]
res 2, [hl]
@@ -48,46 +48,46 @@ Function97c5f:: ; 97c5f
call GetFacingTileCoord
ld [EngineBuffer1], a
ld c, a
- callba Function1365b
- jr c, .asm_97cb9
+ callba CheckFacingTileForStd
+ jr c, .done
call CheckCutTreeTile
jr nz, .whirlpool
callba TryCutOW
- jr .asm_97cb9
+ jr .done
.whirlpool
ld a, [EngineBuffer1]
call CheckWhirlpoolTile
jr nz, .waterfall
callba TryWhirlpoolOW
- jr .asm_97cb9
+ jr .done
.waterfall
ld a, [EngineBuffer1]
call CheckWaterfallTile
jr nz, .headbutt
callba TryWaterfallOW
- jr .asm_97cb9
+ jr .done
.headbutt
ld a, [EngineBuffer1]
call CheckHeadbuttTreeTile
jr nz, .surf
callba TryHeadbuttOW
- jr c, .asm_97cb9
- jr .asm_97cb7
+ jr c, .done
+ jr .noevent
.surf
callba TrySurfOW
- jr nc, .asm_97cb7
- jr .asm_97cb9
+ jr nc, .noevent
+ jr .done
-.asm_97cb7
+.noevent
xor a
ret
-.asm_97cb9
+.done
call PlayClickSFX
ld a, $ff
scf
diff --git a/engine/specials.asm b/engine/specials.asm
index 949cf8b1b..2aa38b166 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -2,9 +2,7 @@
Special:: ; c01b
; Run script special de.
ld hl, SpecialsPointers
- add hl, de
- add hl, de
- add hl, de
+ add_n_times hl, de, 3
ld b, [hl]
inc hl
ld a, [hli]
@@ -16,32 +14,36 @@ Special:: ; c01b
; c029
SpecialsPointers:: ; c029
- add_special Function97c28
- add_special Function29ce8
- add_special Function29d11
- add_special Function29d92
- add_special Function29e66
- add_special Function29e82
- add_special Function29efa
- add_special Function29eee
- add_special Function29c92
- add_special Function29cf1
- add_special Function29cfa
- add_special Function29bfb
- add_special Function29c7b
- add_special Function29ec4
- add_special Function29ed9
- add_special Function29eaf
- add_special Function29f47
- add_special Functionc2f6
- add_special Functionc309
- add_special Function1050b9
+ add_special WarpToLastSpawn
+
+; Communications
+ add_special Special_SetBitsForLinkTradeRequest
+ add_special Special_WaitForLinkedFriend
+ add_special Special_CheckLinkTimeout
+ add_special Special_TryQuickSave
+ add_special Special_CheckBothSelectedSameRoom
+ add_special Special_FailedLinkToPast
+ add_special Special_CloseLink
+ add_special Special_AbortLink
+ add_special Special_SetBitsForBattleRequest
+ add_special Special_SetBitsForTimeCapsuleRequest
+ add_special Special_CheckTimeCapsuleCompatibility
+ add_special Special_EnterTimeCapsule
+ add_special Special_TradeCenter
+ add_special Special_Colosseum
+ add_special Special_TimeCapsule
+ add_special Special_CableClubCheckWhichChris
+ add_special Special_CheckMysteryGift
+ add_special Special_GetMysteryGiftItem
+ add_special Special_UnlockMysteryGift
+
+; Bug Catching Contest
add_special BugContestJudging
add_special CheckPartyFullAfterContest
- add_special Function13a12
+ add_special CheckFirstMonFainted
add_special ContestReturnMons
- add_special Function135db
- add_special Functionfbb32
+ add_special Special_GiveParkBalls
+ add_special Special_CheckMagikarpLength
add_special Functionfbcd2
add_special HealParty
add_special Function1559a
@@ -87,7 +89,7 @@ SpecialsPointers:: ; c029
add_special Functionc3ef
add_special Function17421
add_special Function17440
- add_special Function139a8
+ add_special Special_SelectRandomBugContestContestants
add_special Functionc3fc
add_special Function26feb
add_special Function27043
@@ -170,7 +172,7 @@ SpecialsPointers:: ; c029
add_special SpecialMonCheck
add_special Functionc225
add_special Function170bd2
- add_special Function10366e
+ add_special Mobile_SelectThreeMons
add_special Function1037eb
add_special Function10383c
add_special Mobile_HealParty
@@ -309,21 +311,21 @@ Functionc2e7: ; c2e7
ret
; c2f6
-Functionc2f6: ; c2f6
+Special_CheckMysteryGift: ; c2f6
ld a, $0
call GetSRAMBank
ld a, [$abe2]
and a
- jr z, .asm_c302
+ jr z, .no
inc a
-.asm_c302
+.no
ld [ScriptVar], a
call CloseSRAM
ret
; c309
-Functionc309: ; c309
+Special_GetMysteryGiftItem: ; c309
ld a, $0
call GetSRAMBank
ld a, [$abe2]
diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm
index 885bde7e9..108579fa1 100644
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -357,33 +357,33 @@ BugContestResults_CleanUp
loadmovesprites
dotrigger $0
domaptrigger GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE, $0
- setevent EVENT_716
- setevent EVENT_717
- setevent EVENT_718
- setevent EVENT_719
- setevent EVENT_71A
- setevent EVENT_71B
- setevent EVENT_71C
- setevent EVENT_71D
- setevent EVENT_71E
- setevent EVENT_71F
- setevent EVENT_720
- setevent EVENT_721
- setevent EVENT_722
- setevent EVENT_723
- setevent EVENT_724
- setevent EVENT_725
- setevent EVENT_726
- setevent EVENT_727
- setevent EVENT_728
- setevent EVENT_729
+ setevent EVENT_BUG_CATCHING_CONTESTANT_1A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_2A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_3A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_4A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_5A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_6A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_7A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_8A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_9A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_10A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_1B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_2B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_3B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_4B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_5B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_6B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_7B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_8B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_9B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_10B
setflag ENGINE_DAILY_BUG_CONTEST
special PlayMapMusic
end
; 0xbc31e
BugContestResults_FirstPlace ; 0xbc31e
- setevent EVENT_000
+ setevent EVENT_CHRIS1_IN_CABLE_CLUB
itemtotext SUN_STONE, $1
farwritetext ContestResults_PlayerWonAPrizeText
closetext
@@ -439,45 +439,45 @@ BugContestResults_NoRoomForBerry ; 0xbc375
; 0xbc380
BugContestResults_EnsureNoDuplicateSprites ; 0xbc380
- checkevent EVENT_716
+ checkevent EVENT_BUG_CATCHING_CONTESTANT_1A
iftrue .skip1
- clearevent EVENT_720
+ clearevent EVENT_BUG_CATCHING_CONTESTANT_1B
.skip1
- checkevent EVENT_717
+ checkevent EVENT_BUG_CATCHING_CONTESTANT_2A
iftrue .skip2
- clearevent EVENT_721
+ clearevent EVENT_BUG_CATCHING_CONTESTANT_2B
.skip2
- checkevent EVENT_718
+ checkevent EVENT_BUG_CATCHING_CONTESTANT_3A
iftrue .skip3
- clearevent EVENT_722
+ clearevent EVENT_BUG_CATCHING_CONTESTANT_3B
.skip3
- checkevent EVENT_719
+ checkevent EVENT_BUG_CATCHING_CONTESTANT_4A
iftrue .skip4
- clearevent EVENT_723
+ clearevent EVENT_BUG_CATCHING_CONTESTANT_4B
.skip4
- checkevent EVENT_71A
+ checkevent EVENT_BUG_CATCHING_CONTESTANT_5A
iftrue .skip5
- clearevent EVENT_724
+ clearevent EVENT_BUG_CATCHING_CONTESTANT_5B
.skip5
- checkevent EVENT_71B
+ checkevent EVENT_BUG_CATCHING_CONTESTANT_6A
iftrue .skip6
- clearevent EVENT_725
+ clearevent EVENT_BUG_CATCHING_CONTESTANT_6B
.skip6
- checkevent EVENT_71C
+ checkevent EVENT_BUG_CATCHING_CONTESTANT_7A
iftrue .skip7
- clearevent EVENT_726
+ clearevent EVENT_BUG_CATCHING_CONTESTANT_7B
.skip7
- checkevent EVENT_71D
+ checkevent EVENT_BUG_CATCHING_CONTESTANT_8A
iftrue .skip8
- clearevent EVENT_727
+ clearevent EVENT_BUG_CATCHING_CONTESTANT_8B
.skip8
- checkevent EVENT_71E
+ checkevent EVENT_BUG_CATCHING_CONTESTANT_9A
iftrue .skip9
- clearevent EVENT_728
+ clearevent EVENT_BUG_CATCHING_CONTESTANT_9B
.skip9
- checkevent EVENT_71F
+ checkevent EVENT_BUG_CATCHING_CONTESTANT_10A
iftrue .skip10
- clearevent EVENT_729
+ clearevent EVENT_BUG_CATCHING_CONTESTANT_10B
.skip10
end
@@ -503,7 +503,7 @@ InitializeEventsScript:
setevent EVENT_6FD
setevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE
setevent EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER
- setevent EVENT_702
+ setevent EVENT_COP_IN_ELMS_LAB
setevent EVENT_703
setevent EVENT_704
setevent EVENT_BOULDER_IN_ICE_PATH_1
@@ -511,26 +511,26 @@ InitializeEventsScript:
setevent EVENT_BOULDER_IN_ICE_PATH_3
setevent EVENT_BOULDER_IN_ICE_PATH_4
setevent EVENT_715
- setevent EVENT_716
- setevent EVENT_717
- setevent EVENT_718
- setevent EVENT_719
- setevent EVENT_71A
- setevent EVENT_71B
- setevent EVENT_71C
- setevent EVENT_71D
- setevent EVENT_71E
- setevent EVENT_71F
- setevent EVENT_720
- setevent EVENT_721
- setevent EVENT_722
- setevent EVENT_723
- setevent EVENT_724
- setevent EVENT_725
- setevent EVENT_726
- setevent EVENT_727
- setevent EVENT_728
- setevent EVENT_729
+ setevent EVENT_BUG_CATCHING_CONTESTANT_1A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_2A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_3A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_4A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_5A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_6A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_7A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_8A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_9A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_10A
+ setevent EVENT_BUG_CATCHING_CONTESTANT_1B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_2B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_3B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_4B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_5B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_6B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_7B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_8B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_9B
+ setevent EVENT_BUG_CATCHING_CONTESTANT_10B
setevent EVENT_72C
setevent EVENT_72F
setevent EVENT_72D
@@ -549,7 +549,7 @@ InitializeEventsScript:
setevent EVENT_74D
setevent EVENT_MET_BILL
setevent EVENT_713
- setevent EVENT_711
+ setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
setevent EVENT_6D4
setevent EVENT_WAREHOUSE_LAYOUT_1
setevent EVENT_WAREHOUSE_BLOCKED_OFF
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-06 16:42:25 +0000