summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-10-25 13:23:46 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2019-10-25 13:23:46 -0400
commit00675eaafba7605bdbf5c16984975e4ed6ad6bde (patch)
tree11256735c3a94000f56101ce0c5d3ff393ca8a2e /data
parent0a440d658b2d4a311381b1d297872e7eece7486f (diff)
script_menu data
Diffstat (limited to 'data')
-rw-r--r--data/data_835B488.s494
-rw-r--r--data/event_scripts.s93
-rw-r--r--data/script_menu/aerodactyl_fossil.pngbin0 -> 767 bytes
-rw-r--r--data/script_menu/kabutops_fossil.pngbin0 -> 747 bytes
-rw-r--r--data/specials.inc4
5 files changed, 51 insertions, 540 deletions
diff --git a/data/data_835B488.s b/data/data_835B488.s
index a909cfbff..61e8e3cfd 100644
--- a/data/data_835B488.s
+++ b/data/data_835B488.s
@@ -564,498 +564,8 @@ sBerries:: @ 83DF7E8
gUnknown_83DFC9C:: @ 83DFC9C
.incbin "baserom.gba", 0x3DFC9C, 0xB4
-gUnknown_83DFD50:: @ 83DFD50
- .4byte gUnknown_8417938, NULL
- .4byte gUnknown_841793C, NULL
-
-gUnknown_83DFD60:: @ 83DFD60
- .4byte gUnknown_8417ADC, NULL
- .4byte gUnknown_8417AE3, NULL
- .4byte gUnknown_8417AE9, NULL
- .4byte gUnknown_8417AEE, NULL
-
-gUnknown_83DFD80:: @ 83DFD80
- .4byte gUnknown_84178F0, NULL
- .4byte gUnknown_8417907, NULL
-
-gUnknown_83DFD90:: @ 83DFD90
- .4byte gUnknown_84178EB, NULL
- .4byte gUnknown_8417907, NULL
-
-gUnknown_83DFDA0:: @ 83DFDA0
- .4byte gUnknown_84178FD, NULL
- .4byte gUnknown_8417907, NULL
-
-gUnknown_83DFDB0:: @ 83DFDB0
- .4byte gUnknown_84178F0, NULL
- .4byte gUnknown_84178EB, NULL
- .4byte gUnknown_8417907, NULL
-
-gUnknown_83DFDC8:: @ 83DFDC8
- .4byte gUnknown_84178F0, NULL
- .4byte gUnknown_84178FD, NULL
- .4byte gUnknown_8417907, NULL
-
-gUnknown_83DFDE0:: @ 83DFDE0
- .4byte gUnknown_84178EB, NULL
- .4byte gUnknown_84178FD, NULL
- .4byte gUnknown_8417907, NULL
-
-gUnknown_83DFDF8:: @ 83DFDF8
- .4byte gUnknown_84178F0, NULL
- .4byte gUnknown_84178EB, NULL
- .4byte gUnknown_84178FD, NULL
- .4byte gUnknown_8417907, NULL
-
-gUnknown_83DFE18:: @ 83DFE18
- .4byte gUnknown_8417914, NULL
- .4byte gUnknown_841790C, NULL
- .4byte gUnknown_8417910, NULL
- .4byte gUnknown_8417918, NULL
- .4byte gUnknown_841791C, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83DFE48:: @ 83DFE48
- .4byte gUnknown_8417938, NULL
- .4byte gUnknown_841793C, NULL
- .4byte gUnknown_84178E6, NULL
-
-gUnknown_83DFE60:: @ 83DFE60
- .4byte gUnknown_8417944, NULL
- .4byte gUnknown_8417952, NULL
- .4byte gUnknown_8417960, NULL
- .4byte gUnknown_84178E6, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83DFE88:: @ 83DFE88
- .4byte gUnknown_8417938, NULL
- .4byte gUnknown_841793C, NULL
- .4byte gUnknown_84178E6, NULL
-
-gUnknown_83DFEA0:: @ 83DFEA0
- .4byte gUnknown_841796D, NULL
- .4byte gUnknown_841797F, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83DFEB8:: @ 83DFEB8
- .4byte gUnknown_841806D, NULL
- .4byte gUnknown_841805D, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83DFED0:: @ 83DFED0
- .4byte gUnknown_8417D56, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83DFEE0:: @ 83DFEE0
- .4byte gUnknown_8417D63, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83DFEF0:: @ 83DFEF0
- .4byte gUnknown_8417D6F, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83DFF00:: @ 83DFF00
- .4byte gUnknown_8417D56, NULL
- .4byte gUnknown_8417D6F, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83DFF18:: @ 83DFF18
- .4byte gUnknown_8417D63, NULL
- .4byte gUnknown_8417D6F, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83DFF30:: @ 83DFF30
- .4byte gUnknown_8417984, NULL
- .4byte gUnknown_841799A, NULL
- .4byte gUnknown_84179AD, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83DFF50:: @ 83DFF50
- .4byte gUnknown_8417A42, NULL
- .4byte gUnknown_8417A58, NULL
- .4byte gUnknown_8417A6E, NULL
- .4byte gUnknown_8417A84, NULL
- .4byte gUnknown_8417A9A, NULL
- .4byte gUnknown_8417D4C, NULL
-
-gUnknown_83DFF80:: @ 83DFF80
- .4byte gUnknown_8417F4D, NULL
- .4byte gUnknown_8417ED9, NULL
- .4byte gUnknown_8417EF7, NULL
- .4byte gUnknown_8417F11, NULL
- .4byte gUnknown_8417F2F, NULL
- .4byte gUnknown_8417D4C, NULL
-
-gUnknown_83DFFB0:: @ 83DFFB0
- .4byte gUnknown_84179C0, NULL
- .4byte gUnknown_84179D6, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83DFFC8:: @ 83DFFC8
- .4byte gUnknown_84179ED, NULL
- .4byte gUnknown_84179F7, NULL
-
-gUnknown_83DFFD8:: @ 83DFFD8
- .4byte gUnknown_8417A37, NULL
- .4byte gUnknown_8417A3D, NULL
-
-gUnknown_83DFFE8:: @ 83DFFE8
- .4byte gUnknown_8417ABC, NULL
- .4byte gUnknown_8417AB9, NULL
- .4byte gUnknown_8417AB6, NULL
- .4byte gUnknown_8417AB3, NULL
- .4byte gUnknown_8417AB0, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0018:: @ 83E0018
- .4byte gUnknown_8417C0F, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0028:: @ 83E0028
- .4byte gUnknown_8417C1B, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0038:: @ 83E0038
- .4byte gUnknown_8417C0F, NULL
- .4byte gUnknown_8417C1B, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0050:: @ 83E0050
- .4byte gUnknown_8417C24, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0060:: @ 83E0060
- .4byte gUnknown_8417C0F, NULL
- .4byte gUnknown_8417C24, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0078:: @ 83E0078
- .4byte gUnknown_8417C1B, NULL
- .4byte gUnknown_8417C24, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0090:: @ 83E0090
- .4byte gUnknown_8417C0F, NULL
- .4byte gUnknown_8417C1B, NULL
- .4byte gUnknown_8417C24, NULL
- .4byte gOtherText_Exit, NULL
- .4byte gUnknown_8417A24, NULL
- .4byte gOtherText_Exit, NULL
- .4byte gUnknown_8417A02, NULL
- .4byte gUnknown_8417A24, NULL
- .4byte gOtherText_Exit, NULL
- .4byte gUnknown_8417A0C, NULL
- .4byte gUnknown_8417A24, NULL
- .4byte gOtherText_Exit, NULL
- .4byte gUnknown_8417A02, NULL
- .4byte gUnknown_8417A0C, NULL
- .4byte gUnknown_8417A24, NULL
- .4byte gOtherText_Exit, NULL
- .4byte gUnknown_8417A19, NULL
- .4byte gUnknown_8417A24, NULL
- .4byte gOtherText_Exit, NULL
- .4byte gUnknown_8417A02, NULL
- .4byte gUnknown_8417A19, NULL
- .4byte gUnknown_8417A24, NULL
- .4byte gOtherText_Exit, NULL
- .4byte gUnknown_8417A0C, NULL
- .4byte gUnknown_8417A19, NULL
- .4byte gUnknown_8417A24, NULL
- .4byte gOtherText_Exit, NULL
- .4byte gUnknown_8417A02, NULL
- .4byte gUnknown_8417A0C, NULL
- .4byte gUnknown_8417A19, NULL
- .4byte gUnknown_8417A24, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0190:: @ 83E0190
- .4byte gUnknown_8417BE2, NULL
- .4byte gUnknown_8417BE8, NULL
- .4byte gUnknown_8417BF0, NULL
- .4byte gUnknown_8417BF8, NULL
- .4byte gUnknown_8417C01, NULL
-
-gUnknown_83E01B8:: @ 83E01B8
- .4byte gUnknown_8417C33, NULL
- .4byte gUnknown_8417C4B, NULL
-
-gUnknown_83E01C8:: @ 83E01C8
- .4byte gUnknown_8417C55, NULL
- .4byte gUnknown_8417C6A, NULL
- .4byte gUnknown_8417C83, NULL
- .4byte gUnknown_8417C9D, NULL
- .4byte gUnknown_8417CB7, NULL
- .4byte gUnknown_8417D4C, NULL
-
-gUnknown_83E01F8:: @ 83E01F8
- .4byte gUnknown_8417D79, NULL
- .4byte gUnknown_8417D86, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0210:: @ 83E0210
- .4byte gUnknown_8417D90, NULL
- .4byte gUnknown_8417DA0, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0228:: @ 83E0228
- .4byte gUnknown_841805D, NULL
- .4byte gUnknown_8418061, NULL
- .4byte gUnknown_8418069, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0248:: @ 83E0248
- .4byte gUnknown_841807D, NULL
- .4byte gUnknown_841808E, NULL
- .4byte gUnknown_841809C, NULL
- .4byte gOtherText_Quit, NULL
-
-gUnknown_83E0268:: @ 83E0268
- .4byte gUnknown_8417DFE, NULL
- .4byte gUnknown_8417E09, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0280:: @ 83E0280
- .4byte gUnknown_8417DF3, NULL
- .4byte gUnknown_8417E09, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0298:: @ 83E0298
- .4byte gUnknown_8417DF3, NULL
- .4byte gUnknown_8417DFE, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E02B0:: @ 83E02B0
- .4byte gUnknown_8417D79, NULL
- .4byte gUnknown_8417E50, NULL
- .4byte gUnknown_8417E5A, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E02D0:: @ 83E02D0
- .4byte gUnknown_8417E66, NULL
- .4byte gUnknown_8417E67, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E02E8:: @ 83E02E8
- .4byte gUnknown_8417D79, NULL
- .4byte gUnknown_8417E50, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0300:: @ 83E0300
- .4byte gUnknown_8417E72, NULL
- .4byte gUnknown_8417E7F, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0318:: @ 83E0318
- .4byte gUnknown_8417E94, NULL
- .4byte gUnknown_8417EA4, NULL
-
-gUnknown_83E0328:: @ 83E0328
- .4byte gUnknown_8417D79, NULL
- .4byte gUnknown_8417E50, NULL
- .4byte gUnknown_8417E71, NULL
- .4byte gUnknown_8417E5A, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0350:: @ 83E0350
- .4byte gUnknown_8417D79, NULL
- .4byte gUnknown_8417E50, NULL
- .4byte gUnknown_8417E71, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0370:: @ 83E0370
- .4byte gUnknown_8417EB3, NULL
- .4byte gUnknown_8417EC1, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0388:: @ 83E0388
- .4byte gUnknown_8417EB3, NULL
- .4byte gUnknown_8417ECC, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E03A0:: @ 83E03A0
- .4byte gUnknown_8417EB3, NULL
- .4byte gUnknown_8417EC1, NULL
- .4byte gUnknown_8417ECC, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E03C0:: @ 83E03C0
- .4byte gUnknown_8417DF3, NULL
- .4byte gUnknown_8417DFE, NULL
- .4byte gUnknown_8417E09, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E03E0:: @ 83E03E0
- .4byte gUnknown_8417E46, NULL
- .4byte gUnknown_8417DFE, NULL
- .4byte gUnknown_8417E09, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0400:: @ 83E0400
- .4byte gUnknown_8417E46, NULL
- .4byte gUnknown_8417DF3, NULL
- .4byte gUnknown_8417E09, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0420:: @ 83E0420
- .4byte gUnknown_8417E46, NULL
- .4byte gUnknown_8417DF3, NULL
- .4byte gUnknown_8417DFE, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0440:: @ 83E0440
- .4byte gUnknown_8417E46, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0450:: @ 83E0450
- .4byte gUnknown_8417F68, NULL
- .4byte gUnknown_8417F67, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0468:: @ 83E0468
- .4byte gUnknown_8417F77, NULL
- .4byte gUnknown_8417F69, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E0480:: @ 83E0480
- .4byte gOtherText_Single, NULL
- .4byte gOtherText_Double, NULL
- .4byte gOtherText_Knockout, NULL
- .4byte gOtherText_Mixed, NULL
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E04A8:: @ 83E04A8
- .4byte gOtherText_Exit, NULL
-
-gUnknown_83E04B0:: @ 83E04B0
- .4byte gUnknown_83DFD50, 2
- .4byte gUnknown_83E0190, 5
- .4byte gUnknown_83DFD60, 4
- .4byte gUnknown_83DFD80, 2
- .4byte gUnknown_83DFD90, 2
- .4byte gUnknown_83DFDA0, 2
- .4byte gUnknown_83DFDB0, 3
- .4byte gUnknown_83DFDC8, 3
- .4byte gUnknown_83DFDE0, 3
- .4byte gUnknown_83DFDF8, 4
- .4byte gUnknown_83E04A8, 1
- .4byte gUnknown_83E04A8, 1
- .4byte gUnknown_83E04A8, 1
- .4byte gUnknown_83E01B8, 2
- .4byte gUnknown_83E01C8, 6
- .4byte gUnknown_83DFE18, 6
- .4byte gUnknown_83DFE48, 3
- .4byte gUnknown_83DFE60, 5
- .4byte gUnknown_83DFE88, 3
- .4byte gUnknown_83DFEA0, 3
- .4byte gUnknown_83DFEB8, 3
- .4byte gUnknown_83DFED0, 2
- .4byte gUnknown_83DFEE0, 2
- .4byte gUnknown_83DFEF0, 2
- .4byte gUnknown_83DFF00, 3
- .4byte gUnknown_83DFF18, 3
- .4byte gUnknown_83DFF30, 4
- .4byte gUnknown_83DFFB0, 3
- .4byte gUnknown_83DFFC8, 2
- .4byte gUnknown_83DFFD8, 2
- .4byte gUnknown_83DFF50, 6
- .4byte gUnknown_83DFFE8, 6
- .4byte gUnknown_83E0018, 2
- .4byte gUnknown_83E0028, 2
- .4byte gUnknown_83E0038, 3
- .4byte gUnknown_83E0050, 2
- .4byte gUnknown_83E0060, 3
- .4byte gUnknown_83E0078, 3
- .4byte gUnknown_83E0090, 4
- .4byte gUnknown_83E01F8, 3
- .4byte gUnknown_83E0210, 3
- .4byte gUnknown_83DFF80, 6
- .4byte gUnknown_83E0228, 4
- .4byte gUnknown_83E0248, 4
- .4byte gUnknown_83E0268, 3
- .4byte gUnknown_83E0280, 3
- .4byte gUnknown_83E0298, 3
- .4byte gUnknown_83E02B0, 4
- .4byte gUnknown_83E02D0, 3
- .4byte gUnknown_83E0300, 3
- .4byte gUnknown_83E02E8, 3
- .4byte gUnknown_83E0318, 2
- .4byte gUnknown_83E0328, 5
- .4byte gUnknown_83E0350, 4
- .4byte gUnknown_83E0370, 3
- .4byte gUnknown_83E0388, 3
- .4byte gUnknown_83E03A0, 4
- .4byte gUnknown_83E03C0, 4
- .4byte gUnknown_83E03E0, 4
- .4byte gUnknown_83E0400, 4
- .4byte gUnknown_83E0420, 4
- .4byte gUnknown_83E0440, 2
- .4byte gUnknown_83E0450, 3
- .4byte gUnknown_83E0468, 3
- .4byte gUnknown_83E0480, 5
-
-gStdStringPtrs:: @ 83E06B8
- .4byte gUnknown_8417ABF
- .4byte gUnknown_8417AC4
- .4byte gUnknown_8417ACB
- .4byte gUnknown_8417AD0
- .4byte gUnknown_8417AD6
- .4byte gUnknown_8417AF4
- .4byte gUnknown_8417AF9
- .4byte gUnknown_8417B00
- .4byte gUnknown_8417B05
- .4byte gUnknown_8417B0B
- .4byte gUnknown_8417B11
- .4byte gUnknown_8417B17
- .4byte gUnknown_8417B21
- .4byte gUnknown_8417B2C
- .4byte gUnknown_8417B36
- .4byte gUnknown_8417B3E
- .4byte gUnknown_8417B4B
- .4byte gUnknown_8417B58
- .4byte gUnknown_8417B65
- .4byte gUnknown_8417B72
- .4byte gUnknown_8417B7C
- .4byte gUnknown_8417B87
- .4byte gUnknown_8417B94
- .4byte gUnknown_8417C2D
- .4byte gUnknown_8417DA9
- .4byte gUnknown_8417DB6
- .4byte gUnknown_8417DC7
- .4byte gUnknown_8417DD9
- .4byte gUnknown_8417DE1
-
-gUnknown_83E072C:: @ 83E072C
- .incbin "baserom.gba", 0x3E072C, 0xC
-
-gUnknown_83E0738:: @ 83E0738
- .incbin "baserom.gba", 0x3E0738, 0x10
-
-gUnknown_83E0748:: @ 83E0748
- .incbin "baserom.gba", 0x3E0748, 0x20
-
-sMuseumFossilSprTemplate:: @ 83E0768
- .incbin "baserom.gba", 0x3E0768, 0x18
-
-gUnknown_83E7080::
- .incbin "baserom.gba", 0x3E0780, 0x800
-
-sMuseumAerodactylSprPalette:: @ 83E0F80
- .incbin "baserom.gba", 0x3E0F80, 0x20
-
-gUnknown_83E0FA0::
- .incbin "baserom.gba", 0x3E0FA0, 0x800
-
-sMuseumKabutopsSprPalette:: @ 83E17A0
- .incbin "baserom.gba", 0x3E17A0, 0x20
-
-sMuseumKabutopsSprSheets:: @ 83E17C0
- .incbin "baserom.gba", 0x3E17C0, 0x10
-
-sMuseumAerodactylSprSheets:: @ 83E17D0
- .incbin "baserom.gba", 0x3E17D0, 0x10
-
-gUnknown_83E17E0:: @ 83E17E0
- .incbin "baserom.gba", 0x3E17E0, 0xAA0
+ .section .rodata.83E2280
+ .incbin "baserom.gba", 0x3E1800, 0xA80
gUnknown_83E2280:: @ 83E2280
.incbin "baserom.gba", 0x3E2280, 0x10
diff --git a/data/event_scripts.s b/data/event_scripts.s
index da56bcf96..ccb9c9446 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -16,6 +16,7 @@
#include "constants/fame_checker.h"
#include "constants/seagallop.h"
#include "constants/game_stat.h"
+#include "constants/menu.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.set FALSE, 0
@@ -1596,7 +1597,7 @@ EventScript_1A6578:: @ 81A6578
switch VAR_RESULT
case 0, EventScript_1A65B8
case 1 EventScript_1A6663
- case 127, EventScript_1A6663
+ case SCR_MENU_CANCEL, EventScript_1A6663
end
EventScript_1A65B8:: @ 81A65B8
@@ -1949,7 +1950,7 @@ EventScript_1A69A8:: @ 81A69A8
case 2, EventScript_1A6A7A
case 3, EventScript_1A6A56
case 4, EventScript_1A6A46
- case 127, EventScript_1A6A46
+ case SCR_MENU_CANCEL, EventScript_1A6A46
end
EventScript_1A69F0:: @ 81A69F0
@@ -4164,7 +4165,7 @@ EventScript_1A8EC5:: @ 81A8EC5
case 0, EventScript_1A8FF9
case 1, EventScript_1A9004
case 2, EventScript_1A90F6
- case 127, EventScript_1A90F6
+ case SCR_MENU_CANCEL, EventScript_1A90F6
end
EventScript_1A8F12:: @ 81A8F12
@@ -4174,7 +4175,7 @@ EventScript_1A8F12:: @ 81A8F12
case 1, EventScript_1A8FF9
case 2, EventScript_1A9004
case 3, EventScript_1A90F6
- case 127, EventScript_1A90F6
+ case SCR_MENU_CANCEL, EventScript_1A90F6
end
EventScript_1A8F54:: @ 81A8F54
@@ -4187,7 +4188,7 @@ EventScript_1A8F54:: @ 81A8F54
case 0, EventScript_1A8FEE
case 1, EventScript_1A9004
case 2, EventScript_1A90F6
- case 127, EventScript_1A90F6
+ case SCR_MENU_CANCEL, EventScript_1A90F6
end
EventScript_1A8FA1:: @ 81A8FA1
@@ -4197,7 +4198,7 @@ EventScript_1A8FA1:: @ 81A8FA1
case 1, EventScript_1A8FEE
case 2, EventScript_1A9004
case 3, EventScript_1A90F6
- case 127, EventScript_1A90F6
+ case SCR_MENU_CANCEL, EventScript_1A90F6
end
EventScript_1A8FE3:: @ 81A8FE3
@@ -4230,7 +4231,7 @@ EventScript_1A900F:: @ 81A900F
case 0, EventScript_1A8FEE
case 1, EventScript_1A8FF9
case 2, EventScript_1A90F6
- case 127, EventScript_1A90F6
+ case SCR_MENU_CANCEL, EventScript_1A90F6
end
EventScript_1A905C:: @ 81A905C
@@ -4240,7 +4241,7 @@ EventScript_1A905C:: @ 81A905C
case 1, EventScript_1A8FEE
case 2, EventScript_1A8FF9
case 3, EventScript_1A90F6
- case 127, EventScript_1A90F6
+ case SCR_MENU_CANCEL, EventScript_1A90F6
end
EventScript_1A909E:: @ 81A909E
@@ -4295,31 +4296,31 @@ Movement_1A911C:: @ 81A911C
EventScript_1A911E:: @ 81A911E
setvar VAR_0x8005, 0
- special sub_809D764
+ special Special_DrawSeaGallopDestinationMenu
waitstate
- specialvar VAR_0x8006, sub_809D8C0
+ specialvar VAR_0x8006, Special_GetSelectedSeaGallopDestination
switch VAR_0x8006
- case 0, EventScript_1A91D5
- case 1, EventScript_1A91E0
- case 2, EventScript_1A91EB
- case 3, EventScript_1A91F6
- case 4, EventScript_1A9201
- case 254, EventScript_1A917F
- case 127, EventScript_1A90F6
+ case SEAGALLOP_VERMILION_CITY, EventScript_1A91D5
+ case SEAGALLOP_ONE_ISLAND, EventScript_1A91E0
+ case SEAGALLOP_TWO_ISLAND, EventScript_1A91EB
+ case SEAGALLOP_THREE_ISLAND, EventScript_1A91F6
+ case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201
+ case SEAGALLOP_MORE, EventScript_1A917F
+ case SCR_MENU_CANCEL, EventScript_1A90F6
end
EventScript_1A917F:: @ 81A917F
setvar VAR_0x8005, 1
- special sub_809D764
+ special Special_DrawSeaGallopDestinationMenu
waitstate
- specialvar VAR_0x8006, sub_809D8C0
+ specialvar VAR_0x8006, Special_GetSelectedSeaGallopDestination
switch VAR_0x8006
- case 4, EventScript_1A9201
- case 5, EventScript_1A920C
- case 6, EventScript_1A9217
- case 7, EventScript_1A9222
- case 254, EventScript_1A911E
- case 127, EventScript_1A90F6
+ case SEAGALLOP_FOUR_ISLAND, EventScript_1A9201
+ case SEAGALLOP_FIVE_ISLAND, EventScript_1A920C
+ case SEAGALLOP_SIX_ISLAND, EventScript_1A9217
+ case SEAGALLOP_SEVEN_ISLAND, EventScript_1A9222
+ case SEAGALLOP_MORE, EventScript_1A911E
+ case SCR_MENU_CANCEL, EventScript_1A90F6
end
EventScript_1A91D5:: @ 81A91D5
@@ -8006,7 +8007,7 @@ EventScript_1B2A23:: @ 81B2A23
switch VAR_RESULT
case 0, EventScript_1B2B98
case 1, EventScript_1B2DF6
- case 127, EventScript_1B2DF6
+ case SCR_MENU_CANCEL, EventScript_1B2DF6
end
EventScript_1B2A4F:: @ 81B2A4F
@@ -8014,7 +8015,7 @@ EventScript_1B2A4F:: @ 81B2A4F
switch VAR_RESULT
case 0, EventScript_1B2C62
case 1, EventScript_1B2DF6
- case 127, EventScript_1B2DF6
+ case SCR_MENU_CANCEL, EventScript_1B2DF6
end
EventScript_1B2A7B:: @ 81B2A7B
@@ -8022,7 +8023,7 @@ EventScript_1B2A7B:: @ 81B2A7B
switch VAR_RESULT
case 0, EventScript_1B2D2C
case 1, EventScript_1B2DF6
- case 127, EventScript_1B2DF6
+ case SCR_MENU_CANCEL, EventScript_1B2DF6
end
EventScript_1B2AA7:: @ 81B2AA7
@@ -8031,7 +8032,7 @@ EventScript_1B2AA7:: @ 81B2AA7
case 0, EventScript_1B2B98
case 1, EventScript_1B2C62
case 2, EventScript_1B2DF6
- case 127, EventScript_1B2DF6
+ case SCR_MENU_CANCEL, EventScript_1B2DF6
end
EventScript_1B2ADE:: @ 81B2ADE
@@ -8040,7 +8041,7 @@ EventScript_1B2ADE:: @ 81B2ADE
case 0, EventScript_1B2B98
case 1, EventScript_1B2D2C
case 2, EventScript_1B2DF6
- case 127, EventScript_1B2DF6
+ case SCR_MENU_CANCEL, EventScript_1B2DF6
end
EventScript_1B2B15:: @ 81B2B15
@@ -8049,7 +8050,7 @@ EventScript_1B2B15:: @ 81B2B15
case 0, EventScript_1B2C62
case 1, EventScript_1B2D2C
case 2, EventScript_1B2DF6
- case 127, EventScript_1B2DF6
+ case SCR_MENU_CANCEL, EventScript_1B2DF6
end
EventScript_1B2B4C:: @ 81B2B4C
@@ -8059,7 +8060,7 @@ EventScript_1B2B4C:: @ 81B2B4C
case 1, EventScript_1B2C62
case 2, EventScript_1B2D2C
case 3, EventScript_1B2DF6
- case 127, EventScript_1B2DF6
+ case SCR_MENU_CANCEL, EventScript_1B2DF6
end
EventScript_1B2B8E:: @ 81B2B8E
@@ -8612,7 +8613,7 @@ EventScript_1BB467:: @ 81BB467
case 0, EventScript_1BB6AB
case 1, EventScript_1BB4A3
case 2, EventScript_1BB82F
- case 127, EventScript_1BB82F
+ case SCR_MENU_CANCEL, EventScript_1BB82F
end
EventScript_1BB4A3:: @ 81BB4A3
@@ -8632,7 +8633,7 @@ EventScript_1BB4AE:: @ 81BB4AE
case 2, EventScript_1BB541
case 3, EventScript_1BB501
case 4, EventScript_1BB82F
- case 127, EventScript_1BB82F
+ case SCR_MENU_CANCEL, EventScript_1BB82F
end
EventScript_1BB501:: @ 81BB501
@@ -9203,7 +9204,7 @@ EventScript_1BBA51:: @ 81BBA51
case 0, EventScript_1BBA94
case 1, EventScript_1BB82F
case 2, EventScript_1BBA88
- case 127, EventScript_1BB82F
+ case SCR_MENU_CANCEL, EventScript_1BB82F
end
EventScript_1BBA88:: @ 81BBA88
@@ -9328,7 +9329,7 @@ EventScript_1BBBE7:: @ 81BBBE7
case 1, EventScript_1BBC97
case 2, EventScript_1BBD35
case 3, EventScript_1BB82F
- case 127, EventScript_1BB82F
+ case SCR_MENU_CANCEL, EventScript_1BB82F
end
EventScript_1BBC32:: @ 81BBC32
@@ -9337,7 +9338,7 @@ EventScript_1BBC32:: @ 81BBC32
case 0, EventScript_1BBC69
case 1, EventScript_1BBC97
case 2, EventScript_1BB82F
- case 127, EventScript_1BB82F
+ case SCR_MENU_CANCEL, EventScript_1BB82F
end
EventScript_1BBC69:: @ 81BBC69
@@ -9363,7 +9364,7 @@ EventScript_1BBC97:: @ 81BBC97
case 2, EventScript_1BBD1C
case 3, EventScript_1BBD27
case 4, EventScript_1BB82F
- case 127, EventScript_1BB82F
+ case SCR_MENU_CANCEL, EventScript_1BB82F
end
EventScript_1BBCEA:: @ 81BBCEA
@@ -9446,7 +9447,7 @@ EventScript_1BBDBC:: @ 81BBDBC
case 0, EventScript_1BBE28
case 1, EventScript_1BBE00
case 2, EventScript_1BB82F
- case 127, EventScript_1BB82F
+ case SCR_MENU_CANCEL, EventScript_1BB82F
end
EventScript_1BBE00:: @ 81BBE00
@@ -9481,7 +9482,7 @@ EventScript_1BBE50:: @ 81BBE50
case 0, EventScript_1BBEBC
case 1, EventScript_1BBE94
case 2, EventScript_1BB82F
- case 127, EventScript_1BB82F
+ case SCR_MENU_CANCEL, EventScript_1BB82F
end
EventScript_1BBE94:: @ 81BBE94
@@ -9516,7 +9517,7 @@ EventScript_1BBEE4:: @ 81BBEE4
case 0, EventScript_1BBF50
case 1, EventScript_1BBF28
case 2, EventScript_1BB82F
- case 127, EventScript_1BB82F
+ case SCR_MENU_CANCEL, EventScript_1BB82F
end
EventScript_1BBF28:: @ 81BBF28
@@ -9663,7 +9664,7 @@ EventScript_1BC060:: @ 81BC060
case 0, EventScript_1BC0B0
case 1, EventScript_1BC0BA
case 2, EventScript_1BC0C4
- case 127, EventScript_1BC0C4
+ case SCR_MENU_CANCEL, EventScript_1BC0C4
end
EventScript_1BC0B0:: @ 81BC0B0
@@ -9702,7 +9703,7 @@ EventScript_1BC0CE:: @ 81BC0CE
case 0, EventScript_1BC13A
case 1, EventScript_1BC184
case 2, EventScript_1BB83F
- case 127, EventScript_1BB83F
+ case SCR_MENU_CANCEL, EventScript_1BB83F
end
EventScript_1BC13A:: @ 81BC13A
@@ -9755,7 +9756,7 @@ EventScript_1BC1CE:: @ 81BC1CE
case 0, EventScript_1BC23A
case 1, EventScript_1BC212
case 2, EventScript_1BB83F
- case 127, EventScript_1BB83F
+ case SCR_MENU_CANCEL, EventScript_1BB83F
end
EventScript_1BC212:: @ 81BC212
@@ -11307,7 +11308,7 @@ EventScript_1BEE44:: @ 81BEE44
case 0, EventScript_1BEE8F
case 1, EventScript_1BEEC3
case 2, EventScript_1BEE81
- case 127, EventScript_1BEEC3
+ case SCR_MENU_CANCEL, EventScript_1BEEC3
end
EventScript_1BEE81:: @ 81BEE81
@@ -11354,7 +11355,7 @@ EventScript_1BEEDB:: @ 81BEEDB
case 0, EventScript_1BEF26
case 1, EventScript_1BEF35
case 2, EventScript_1BEF18
- case 127, EventScript_1BEF35
+ case SCR_MENU_CANCEL, EventScript_1BEF35
end
EventScript_1BEF18:: @ 81BEF18
diff --git a/data/script_menu/aerodactyl_fossil.png b/data/script_menu/aerodactyl_fossil.png
new file mode 100644
index 000000000..067483d6e
--- /dev/null
+++ b/data/script_menu/aerodactyl_fossil.png
Binary files differ
diff --git a/data/script_menu/kabutops_fossil.png b/data/script_menu/kabutops_fossil.png
new file mode 100644
index 000000000..e396b080a
--- /dev/null
+++ b/data/script_menu/kabutops_fossil.png
Binary files differ
diff --git a/data/specials.inc b/data/specials.inc
index ac15812e3..1e38298a2 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -431,8 +431,8 @@ gSpecials:: @ 815FD60
def_special Special_HasLearnedAllMovesFromCapeBrinkTutor
def_special Special_Credits
def_special sub_8153810
- def_special sub_809D764
- def_special sub_809D8C0
+ def_special Special_DrawSeaGallopDestinationMenu
+ def_special Special_GetSelectedSeaGallopDestination
def_special sub_8147500
def_special GetPlayerFacingDirection
def_special Special_DeoxysSound