diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-03-17 03:37:31 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-03-17 11:55:02 -0400 |
| commit | 2101159b63fd4fd30499fe2ab639060d97f043e7 (patch) | |
| tree | c743e2081c973f8cd83e2ddf08fccc6d85ed46ac /engine | |
| parent | ef87a4f6267c61f5bf7aa8acbbb23d8caf165485 (diff) | |
Some cleanup before continuing.
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/sweet_scent.asm | 66 | ||||
| -rw-r--r-- | engine/pokemon/mon_menu.asm | 1 |
2 files changed, 0 insertions, 67 deletions
diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm deleted file mode 100644 index d382936d..00000000 --- a/engine/events/sweet_scent.asm +++ /dev/null @@ -1,66 +0,0 @@ -SweetScentFromMenu: - ld hl, .SweetScent - call QueueScript - ld a, $1 - ld [wFieldMoveSucceeded], a - ret - -.SweetScent: - reloadmappart - special UpdateTimePals - callasm GetPartyNick - writetext UseSweetScentText - waitbutton - callasm SweetScentEncounter - iffalse SweetScentNothing - checkflag ENGINE_BUG_CONTEST_TIMER - iftrue .BugCatchingContest - randomwildmon - startbattle - reloadmapafterbattle - end - -.BugCatchingContest: - farjump BugCatchingContestBattleScript - -SweetScentNothing: - writetext SweetScentNothingText - waitbutton - closetext - end - -SweetScentEncounter: - farcall CanUseSweetScent - jr nc, .no_battle - ld hl, wStatusFlags2 - bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl] - jr nz, .not_in_bug_contest - farcall GetMapEncounterRate - ld a, b - and a - jr z, .no_battle - farcall ChooseWildEncounter - jr nz, .no_battle - jr .start_battle - -.not_in_bug_contest - farcall ChooseWildEncounter_BugContest - -.start_battle - ld a, $1 - ld [wScriptVar], a - ret - -.no_battle - xor a - ld [wScriptVar], a - ld [wBattleType], a - ret - -UseSweetScentText: - text_far _UseSweetScentText - text_end - -SweetScentNothingText: - text_far _SweetScentNothingText - text_end diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index d40940be..71b86a8a 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -613,7 +613,6 @@ MonMenu_Fly: jr z, .Fail cp $0 jr z, .Error - ;farcall StubbedTrainerRankings_Fly ld b, $4 ld a, $2 ret |