summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/specials.inc6
-rw-r--r--data/time_events.s31
2 files changed, 3 insertions, 34 deletions
diff --git a/data/specials.inc b/data/specials.inc
index 11572e1f3..76763781d 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -209,9 +209,9 @@ gSpecials::
.4byte ExitSafariMode
.4byte SafariZoneGetPokeblockNameInFeeder
.4byte sub_810BAF4
- .4byte sub_810D32C
+ .4byte IsMirageIslandPresent
.4byte UpdateShoalTideFlag
- .4byte sub_810D3FC
+ .4byte InitBirchState
.4byte ScriptGetPokedexInfo
.4byte ShowPokedexRatingMessage
.4byte DoPCTurnOnEffect
@@ -284,7 +284,7 @@ gSpecials::
.4byte sub_80818A4
.4byte sub_80818FC
.4byte ShowBattleTowerRecords
- .4byte sub_810D3E8
+ .4byte WaitWeather
.4byte sub_810F414
.4byte sub_810F424
.4byte player_get_direction_lower_nybble
diff --git a/data/time_events.s b/data/time_events.s
deleted file mode 100644
index bccafb3ef..000000000
--- a/data/time_events.s
+++ /dev/null
@@ -1,31 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gUnknown_083F8340:: @ 83F8340
- .byte 1
- .byte 1
- .byte 1
- .byte 0
- .byte 0
- .byte 0
- .byte 0
- .byte 0
- .byte 0
- .byte 1
- .byte 1
- .byte 1
- .byte 1
- .byte 1
- .byte 1
- .byte 0
- .byte 0
- .byte 0
- .byte 0
- .byte 0
- .byte 0
- .byte 1
- .byte 1
- .byte 1