diff options
| author | itskobold <itskobold@users.noreply.github.com> | 2017-11-17 09:25:40 +0000 |
|---|---|---|
| committer | itskobold <itskobold@users.noreply.github.com> | 2017-11-17 09:25:40 +0000 |
| commit | 370e47beeef3f115d071161a7b2f09dcfbd2168b (patch) | |
| tree | 648fdb13c6a341e8efc5ba5c734f7cd25d826b60 /data | |
| parent | 46ee15b96250d53b4100171c572f6e6b6e2c99c6 (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_frontier_1.s | 1254 | ||||
| -rw-r--r-- | data/event_scripts.s | 116 | ||||
| -rw-r--r-- | data/field_region_map.s | 14 | ||||
| -rw-r--r-- | data/heal_location.s | 11 | ||||
| -rw-r--r-- | data/menu_helpers.s | 2 | ||||
| -rw-r--r-- | data/region_map.s | 136 | ||||
| -rw-r--r-- | data/region_map_entries.inc | 809 | ||||
| -rw-r--r-- | data/scripts/cable_club.inc | 2 | ||||
| -rw-r--r-- | data/scripts/day_care.inc | 4 | ||||
| -rw-r--r-- | data/specials.inc | 4 | ||||
| -rw-r--r-- | data/strings.s | 4 |
11 files changed, 1094 insertions, 1262 deletions
diff --git a/data/battle_frontier_1.s b/data/battle_frontier_1.s index 7bfe075ec..4af6d1d58 100644 --- a/data/battle_frontier_1.s +++ b/data/battle_frontier_1.s @@ -11,27 +11,27 @@ gUnknown_0860C988:: @ 860C988 .incbin "baserom.gba", 0x60c988, 0x269 gUnknown_0860CBF1:: @ 860CBF1 -.byte 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x00, 0x02, 0x09, 0x10, 0x00, 0x02, 0x09, 0x10, 0x00, 0x02, 0x09, 0x10 -.byte 0x00, 0x02, 0x09, 0x10, 0x00, 0x02, 0x09, 0x10, 0x01, 0x03, 0x0a, 0x11, 0x01, 0x03, 0x0a, 0x11, 0x01, 0x03, 0x0a, 0x11, 0x01, 0x03, 0x0a, 0x11, 0x01, 0x03, 0x0a, 0x11, 0x02, 0x04, 0x0b, 0x11 -.byte 0x02, 0x04, 0x0b, 0x11, 0x02, 0x04, 0x0b, 0x11, 0x02, 0x04, 0x0b, 0x11, 0x02, 0x04, 0x0b, 0x11, 0x03, 0x05, 0x0c, 0x12, 0x03, 0x05, 0x0c, 0x12, 0x03, 0x05, 0x0c, 0x12, 0x03, 0x05, 0x0c, 0x12 -.byte 0x03, 0x05, 0x0c, 0x12, 0x04, 0x06, 0x0d, 0x12, 0x04, 0x06, 0x0d, 0x12, 0x04, 0x06, 0x0d, 0x12, 0x04, 0x06, 0x0d, 0x12, 0x04, 0x06, 0x0d, 0x12, 0x05, 0x07, 0x0e, 0x13, 0x05, 0x07, 0x0e, 0x13 -.byte 0x05, 0x07, 0x0e, 0x13, 0x05, 0x07, 0x0e, 0x13, 0x05, 0x07, 0x0e, 0x13, 0x06, 0x00, 0x0f, 0x13, 0x06, 0x00, 0x0f, 0x13, 0x06, 0x00, 0x0f, 0x13, 0x06, 0x00, 0x0f, 0x13, 0x06, 0x00, 0x0f, 0x13 -.byte 0x1f, 0x09, 0x14, 0x1f, 0x1f, 0x09, 0x14, 0x1f, 0x1f, 0x09, 0x14, 0x1f, 0x1f, 0x09, 0x14, 0x1f, 0x1f, 0x09, 0x14, 0x1f, 0x08, 0x0a, 0x14, 0x01, 0x08, 0x0a, 0x14, 0x01, 0x08, 0x0a, 0x14, 0x01 -.byte 0x08, 0x0a, 0x14, 0x01, 0x08, 0x0a, 0x14, 0x01, 0x09, 0x0b, 0x15, 0x02, 0x09, 0x0b, 0x15, 0x02, 0x09, 0x0b, 0x15, 0x02, 0x09, 0x0b, 0x15, 0x02, 0x09, 0x0b, 0x15, 0x02, 0x0a, 0x0c, 0x15, 0x03 -.byte 0x0a, 0x0c, 0x15, 0x03, 0x0a, 0x0c, 0x15, 0x03, 0x0a, 0x0c, 0x15, 0x03, 0x0a, 0x0c, 0x15, 0x03, 0x0b, 0x0d, 0x16, 0x04, 0x0b, 0x0d, 0x16, 0x04, 0x0b, 0x0d, 0x16, 0x04, 0x0b, 0x0d, 0x16, 0x04 -.byte 0x0b, 0x0d, 0x16, 0x04, 0x0c, 0x0e, 0x16, 0x05, 0x0c, 0x0e, 0x16, 0x05, 0x0c, 0x0e, 0x16, 0x05, 0x0c, 0x0e, 0x16, 0x05, 0x0c, 0x0e, 0x16, 0x05, 0x0d, 0x0f, 0x17, 0x06, 0x0d, 0x0f, 0x17, 0x06 -.byte 0x0d, 0x0f, 0x17, 0x06, 0x0d, 0x0f, 0x17, 0x06, 0x0d, 0x0f, 0x17, 0x06, 0x0e, 0x1f, 0x17, 0x07, 0x0e, 0x1f, 0x17, 0x07, 0x0e, 0x1f, 0x17, 0x07, 0x0e, 0x1f, 0x17, 0x07, 0x0e, 0x1f, 0x17, 0x07 -.byte 0x13, 0x11, 0x00, 0x14, 0x13, 0x11, 0x00, 0x18, 0x13, 0x11, 0x00, 0x18, 0x13, 0x11, 0x00, 0x18, 0x13, 0x11, 0x00, 0x18, 0x10, 0x12, 0x02, 0x15, 0x10, 0x12, 0x02, 0x18, 0x10, 0x12, 0x02, 0x18 -.byte 0x10, 0x12, 0x02, 0x18, 0x10, 0x12, 0x02, 0x18, 0x11, 0x13, 0x04, 0x16, 0x11, 0x13, 0x04, 0x19, 0x11, 0x13, 0x04, 0x19, 0x11, 0x13, 0x04, 0x19, 0x11, 0x13, 0x04, 0x19, 0x12, 0x10, 0x06, 0x17 -.byte 0x12, 0x10, 0x06, 0x19, 0x12, 0x10, 0x06, 0x19, 0x12, 0x10, 0x06, 0x19, 0x12, 0x10, 0x06, 0x19, 0x17, 0x15, 0x10, 0x08, 0x17, 0x15, 0x1a, 0x08, 0x17, 0x15, 0x1a, 0x08, 0x17, 0x15, 0x1a, 0x08 -.byte 0x17, 0x15, 0x1a, 0x08, 0x14, 0x16, 0x11, 0x0a, 0x14, 0x16, 0x1a, 0x0a, 0x14, 0x16, 0x1a, 0x0a, 0x14, 0x16, 0x1a, 0x0a, 0x14, 0x16, 0x1a, 0x0a, 0x15, 0x17, 0x12, 0x0c, 0x15, 0x17, 0x1b, 0x0c -.byte 0x15, 0x17, 0x1b, 0x0c, 0x15, 0x17, 0x1b, 0x0c, 0x15, 0x17, 0x1b, 0x0c, 0x16, 0x14, 0x13, 0x0e, 0x16, 0x14, 0x1b, 0x0e, 0x16, 0x14, 0x1b, 0x0e, 0x16, 0x14, 0x1b, 0x0e, 0x16, 0x14, 0x1b, 0x0e -.byte 0xff, 0xff, 0xff, 0xff, 0x19, 0x19, 0x10, 0x1a, 0x19, 0x19, 0x10, 0x1c, 0x19, 0x19, 0x10, 0x1c, 0x19, 0x19, 0x10, 0x1c, 0xff, 0xff, 0xff, 0xff, 0x18, 0x18, 0x12, 0x1b, 0x18, 0x18, 0x12, 0x1c -.byte 0x18, 0x18, 0x12, 0x1c, 0x18, 0x18, 0x12, 0x1c, 0xff, 0xff, 0xff, 0xff, 0x1b, 0x1b, 0x18, 0x14, 0x1b, 0x1b, 0x1d, 0x14, 0x1b, 0x1b, 0x1d, 0x14, 0x1b, 0x1b, 0x1d, 0x14, 0xff, 0xff, 0xff, 0xff -.byte 0x1a, 0x1a, 0x19, 0x16, 0x1a, 0x1a, 0x1d, 0x16, 0x1a, 0x1a, 0x1d, 0x16, 0x1a, 0x1a, 0x1d, 0x16, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x18, 0x1d, 0xff, 0xff, 0x18, 0x1e -.byte 0xff, 0xff, 0x18, 0x1e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1c, 0x1a, 0xff, 0xff, 0x1e, 0x1a, 0xff, 0xff, 0x1e, 0x1a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff -.byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1c, 0x1d, 0xff, 0xff, 0x1c, 0x1d, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00 -.byte 0x00, 0x00, 0x00 + .byte 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x07, 0x01, 0x08, 0x10, 0x00, 0x02, 0x09, 0x10, 0x00, 0x02, 0x09, 0x10, 0x00, 0x02, 0x09, 0x10 + .byte 0x00, 0x02, 0x09, 0x10, 0x00, 0x02, 0x09, 0x10, 0x01, 0x03, 0x0a, 0x11, 0x01, 0x03, 0x0a, 0x11, 0x01, 0x03, 0x0a, 0x11, 0x01, 0x03, 0x0a, 0x11, 0x01, 0x03, 0x0a, 0x11, 0x02, 0x04, 0x0b, 0x11 + .byte 0x02, 0x04, 0x0b, 0x11, 0x02, 0x04, 0x0b, 0x11, 0x02, 0x04, 0x0b, 0x11, 0x02, 0x04, 0x0b, 0x11, 0x03, 0x05, 0x0c, 0x12, 0x03, 0x05, 0x0c, 0x12, 0x03, 0x05, 0x0c, 0x12, 0x03, 0x05, 0x0c, 0x12 + .byte 0x03, 0x05, 0x0c, 0x12, 0x04, 0x06, 0x0d, 0x12, 0x04, 0x06, 0x0d, 0x12, 0x04, 0x06, 0x0d, 0x12, 0x04, 0x06, 0x0d, 0x12, 0x04, 0x06, 0x0d, 0x12, 0x05, 0x07, 0x0e, 0x13, 0x05, 0x07, 0x0e, 0x13 + .byte 0x05, 0x07, 0x0e, 0x13, 0x05, 0x07, 0x0e, 0x13, 0x05, 0x07, 0x0e, 0x13, 0x06, 0x00, 0x0f, 0x13, 0x06, 0x00, 0x0f, 0x13, 0x06, 0x00, 0x0f, 0x13, 0x06, 0x00, 0x0f, 0x13, 0x06, 0x00, 0x0f, 0x13 + .byte 0x1f, 0x09, 0x14, 0x1f, 0x1f, 0x09, 0x14, 0x1f, 0x1f, 0x09, 0x14, 0x1f, 0x1f, 0x09, 0x14, 0x1f, 0x1f, 0x09, 0x14, 0x1f, 0x08, 0x0a, 0x14, 0x01, 0x08, 0x0a, 0x14, 0x01, 0x08, 0x0a, 0x14, 0x01 + .byte 0x08, 0x0a, 0x14, 0x01, 0x08, 0x0a, 0x14, 0x01, 0x09, 0x0b, 0x15, 0x02, 0x09, 0x0b, 0x15, 0x02, 0x09, 0x0b, 0x15, 0x02, 0x09, 0x0b, 0x15, 0x02, 0x09, 0x0b, 0x15, 0x02, 0x0a, 0x0c, 0x15, 0x03 + .byte 0x0a, 0x0c, 0x15, 0x03, 0x0a, 0x0c, 0x15, 0x03, 0x0a, 0x0c, 0x15, 0x03, 0x0a, 0x0c, 0x15, 0x03, 0x0b, 0x0d, 0x16, 0x04, 0x0b, 0x0d, 0x16, 0x04, 0x0b, 0x0d, 0x16, 0x04, 0x0b, 0x0d, 0x16, 0x04 + .byte 0x0b, 0x0d, 0x16, 0x04, 0x0c, 0x0e, 0x16, 0x05, 0x0c, 0x0e, 0x16, 0x05, 0x0c, 0x0e, 0x16, 0x05, 0x0c, 0x0e, 0x16, 0x05, 0x0c, 0x0e, 0x16, 0x05, 0x0d, 0x0f, 0x17, 0x06, 0x0d, 0x0f, 0x17, 0x06 + .byte 0x0d, 0x0f, 0x17, 0x06, 0x0d, 0x0f, 0x17, 0x06, 0x0d, 0x0f, 0x17, 0x06, 0x0e, 0x1f, 0x17, 0x07, 0x0e, 0x1f, 0x17, 0x07, 0x0e, 0x1f, 0x17, 0x07, 0x0e, 0x1f, 0x17, 0x07, 0x0e, 0x1f, 0x17, 0x07 + .byte 0x13, 0x11, 0x00, 0x14, 0x13, 0x11, 0x00, 0x18, 0x13, 0x11, 0x00, 0x18, 0x13, 0x11, 0x00, 0x18, 0x13, 0x11, 0x00, 0x18, 0x10, 0x12, 0x02, 0x15, 0x10, 0x12, 0x02, 0x18, 0x10, 0x12, 0x02, 0x18 + .byte 0x10, 0x12, 0x02, 0x18, 0x10, 0x12, 0x02, 0x18, 0x11, 0x13, 0x04, 0x16, 0x11, 0x13, 0x04, 0x19, 0x11, 0x13, 0x04, 0x19, 0x11, 0x13, 0x04, 0x19, 0x11, 0x13, 0x04, 0x19, 0x12, 0x10, 0x06, 0x17 + .byte 0x12, 0x10, 0x06, 0x19, 0x12, 0x10, 0x06, 0x19, 0x12, 0x10, 0x06, 0x19, 0x12, 0x10, 0x06, 0x19, 0x17, 0x15, 0x10, 0x08, 0x17, 0x15, 0x1a, 0x08, 0x17, 0x15, 0x1a, 0x08, 0x17, 0x15, 0x1a, 0x08 + .byte 0x17, 0x15, 0x1a, 0x08, 0x14, 0x16, 0x11, 0x0a, 0x14, 0x16, 0x1a, 0x0a, 0x14, 0x16, 0x1a, 0x0a, 0x14, 0x16, 0x1a, 0x0a, 0x14, 0x16, 0x1a, 0x0a, 0x15, 0x17, 0x12, 0x0c, 0x15, 0x17, 0x1b, 0x0c + .byte 0x15, 0x17, 0x1b, 0x0c, 0x15, 0x17, 0x1b, 0x0c, 0x15, 0x17, 0x1b, 0x0c, 0x16, 0x14, 0x13, 0x0e, 0x16, 0x14, 0x1b, 0x0e, 0x16, 0x14, 0x1b, 0x0e, 0x16, 0x14, 0x1b, 0x0e, 0x16, 0x14, 0x1b, 0x0e + .byte 0xff, 0xff, 0xff, 0xff, 0x19, 0x19, 0x10, 0x1a, 0x19, 0x19, 0x10, 0x1c, 0x19, 0x19, 0x10, 0x1c, 0x19, 0x19, 0x10, 0x1c, 0xff, 0xff, 0xff, 0xff, 0x18, 0x18, 0x12, 0x1b, 0x18, 0x18, 0x12, 0x1c + .byte 0x18, 0x18, 0x12, 0x1c, 0x18, 0x18, 0x12, 0x1c, 0xff, 0xff, 0xff, 0xff, 0x1b, 0x1b, 0x18, 0x14, 0x1b, 0x1b, 0x1d, 0x14, 0x1b, 0x1b, 0x1d, 0x14, 0x1b, 0x1b, 0x1d, 0x14, 0xff, 0xff, 0xff, 0xff + .byte 0x1a, 0x1a, 0x19, 0x16, 0x1a, 0x1a, 0x1d, 0x16, 0x1a, 0x1a, 0x1d, 0x16, 0x1a, 0x1a, 0x1d, 0x16, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x18, 0x1d, 0xff, 0xff, 0x18, 0x1e + .byte 0xff, 0xff, 0x18, 0x1e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1c, 0x1a, 0xff, 0xff, 0x1e, 0x1a, 0xff, 0xff, 0x1e, 0x1a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff + .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1c, 0x1d, 0xff, 0xff, 0x1c, 0x1d, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00, 0x0f, 0x08, 0x08, 0x00 + .byte 0x00, 0x00, 0x00 gUnknown_0860CE74:: @ 860CE74 .incbin "baserom.gba", 0x60ce74, 0x10 @@ -87,295 +87,983 @@ gUnknown_0860D068:: @ 860D068 .incbin "baserom.gba", 0x60d068, 0x18 gUnknown_0860D080:: @ 860D080 -.byte 0x00, 0x08, 0x0c, 0x04, 0x07, 0x0f, 0x0b, 0x03, 0x02, 0x0a, 0x0e, 0x06, 0x05, 0x0d, 0x09, 0x01 + .byte 0x00, 0x08, 0x0c, 0x04, 0x07, 0x0f, 0x0b, 0x03, 0x02, 0x0a, 0x0e, 0x06, 0x05, 0x0d, 0x09, 0x01 gUnknown_0860D090:: @ 860D090 -.4byte sub_818E9CC -.4byte sub_818EA84 -.4byte sub_818ED28 -.4byte sub_818F9B0 -.4byte sub_818F9E0 -.4byte sub_818FA20 -.4byte sub_81903B8 -.4byte sub_81938A4 -.4byte sub_81938E0 -.4byte sub_8190298 -.4byte sub_81902E4 -.4byte sub_8193D40 -.4byte sub_8193D7C -.4byte sub_81902F8 -.4byte sub_819033C -.4byte sub_8194D48 -.4byte sub_8194D68 -.4byte sub_8194E44 -.4byte sub_8194EB4 -.4byte sub_8194EC0 -.4byte sub_8194EF8 -.4byte sub_8194F58 -.4byte sub_818F02C + .4byte sub_818E9CC + .4byte sub_818EA84 + .4byte sub_818ED28 + .4byte sub_818F9B0 + .4byte sub_818F9E0 + .4byte sub_818FA20 + .4byte sub_81903B8 + .4byte sub_81938A4 + .4byte sub_81938E0 + .4byte sub_8190298 + .4byte sub_81902E4 + .4byte sub_8193D40 + .4byte sub_8193D7C + .4byte sub_81902F8 + .4byte sub_819033C + .4byte sub_8194D48 + .4byte sub_8194D68 + .4byte sub_8194E44 + .4byte sub_8194EB4 + .4byte sub_8194EC0 + .4byte sub_8194EF8 + .4byte sub_8194F58 + .4byte sub_818F02C gUnknown_0860D0EC:: @ 860D0EC -.4byte 0x00000004, 0x00000008, 0x00100000, 0x00200000 + .4byte 0x00000004, 0x00000008, 0x00100000, 0x00200000 gUnknown_0860D0FC:: @ 860D0FC -.4byte 0xfffffffb, 0xfffffff7, 0xffefffff, 0xffdfffff + .4byte 0xfffffffb, 0xfffffff7, 0xffefffff, 0xffdfffff gUnknown_0860D10C:: @ 860D10C -.byte 0x08, 0x00, 0x04, 0x08, 0x09, 0x0c, 0x08, 0x00, 0x0a, 0x08, 0x0c, 0x00, 0x0b, 0x04, 0x00, 0x08, 0x0c, 0x00, 0x04, 0x08, 0x0d, 0x0c, 0x08, 0x00, 0x0e, 0x08, 0x0c, 0x00, 0x0f, 0x04, 0x00, 0x08 -.byte 0x00, 0x00, 0x04, 0x08, 0x01, 0x0c, 0x08, 0x00, 0x02, 0x08, 0x0c, 0x00, 0x03, 0x04, 0x00, 0x08, 0x04, 0x00, 0x04, 0x08, 0x05, 0x0c, 0x08, 0x00, 0x06, 0x08, 0x0c, 0x00, 0x07, 0x04, 0x00, 0x08 + .byte 0x08, 0x00, 0x04, 0x08, 0x09, 0x0c, 0x08, 0x00, 0x0a, 0x08, 0x0c, 0x00, 0x0b, 0x04, 0x00, 0x08, 0x0c, 0x00, 0x04, 0x08, 0x0d, 0x0c, 0x08, 0x00, 0x0e, 0x08, 0x0c, 0x00, 0x0f, 0x04, 0x00, 0x08 + .byte 0x00, 0x00, 0x04, 0x08, 0x01, 0x0c, 0x08, 0x00, 0x02, 0x08, 0x0c, 0x00, 0x03, 0x04, 0x00, 0x08, 0x04, 0x00, 0x04, 0x08, 0x05, 0x0c, 0x08, 0x00, 0x06, 0x08, 0x0c, 0x00, 0x07, 0x04, 0x00, 0x08 gUnknown_0860D14C:: @ 860D14C -.byte 0x00, 0x08, 0x04, 0x0c, 0x07, 0x0f, 0x03, 0x0b, 0x02, 0x0a, 0x06, 0x0e, 0x05, 0x0d, 0x01, 0x09 + .byte 0x00, 0x08, 0x04, 0x0c, 0x07, 0x0f, 0x03, 0x0b, 0x02, 0x0a, 0x06, 0x0e, 0x05, 0x0d, 0x01, 0x09 gUnknown_0860D15C:: @ 860D15C -.byte 0x00, 0x08, 0x0c, 0x0e, 0x00, 0x08, 0x0c, 0x0e, 0x01, 0x08, 0x0c, 0x0e, 0x01, 0x08, 0x0c, 0x0e, 0x02, 0x09, 0x0c, 0x0e, 0x02, 0x09, 0x0c, 0x0e, 0x03, 0x09, 0x0c, 0x0e, 0x03, 0x09, 0x0c, 0x0e -.byte 0x04, 0x0a, 0x0d, 0x0e, 0x04, 0x0a, 0x0d, 0x0e, 0x05, 0x0a, 0x0d, 0x0e, 0x05, 0x0a, 0x0d, 0x0e, 0x06, 0x0b, 0x0d, 0x0e, 0x06, 0x0b, 0x0d, 0x0e, 0x07, 0x0b, 0x0d, 0x0e, 0x07, 0x0b, 0x0d, 0x0e + .byte 0x00, 0x08, 0x0c, 0x0e, 0x00, 0x08, 0x0c, 0x0e, 0x01, 0x08, 0x0c, 0x0e, 0x01, 0x08, 0x0c, 0x0e, 0x02, 0x09, 0x0c, 0x0e, 0x02, 0x09, 0x0c, 0x0e, 0x03, 0x09, 0x0c, 0x0e, 0x03, 0x09, 0x0c, 0x0e + .byte 0x04, 0x0a, 0x0d, 0x0e, 0x04, 0x0a, 0x0d, 0x0e, 0x05, 0x0a, 0x0d, 0x0e, 0x05, 0x0a, 0x0d, 0x0e, 0x06, 0x0b, 0x0d, 0x0e, 0x06, 0x0b, 0x0d, 0x0e, 0x07, 0x0b, 0x0d, 0x0e, 0x07, 0x0b, 0x0d, 0x0e gUnknown_0860D19C:: @ 860D19C -.byte 0x17, 0x1b, 0x1d, 0x1e + .byte 0x17, 0x1b, 0x1d, 0x1e gUnknown_0860D1A0:: @ 860D1A0 -.byte 0x10, 0x18, 0x1c, 0x1e, 0x11, 0x18, 0x1c, 0x1e, 0x12, 0x19, 0x1c, 0x1e, 0x13, 0x19, 0x1c, 0x1e, 0x14, 0x1a, 0x1d, 0x1e, 0x15, 0x1a, 0x1d, 0x1e, 0x16, 0x1b, 0x1d, 0x1e, 0x17, 0x1b, 0x1d, 0x1e + .byte 0x10, 0x18, 0x1c, 0x1e, 0x11, 0x18, 0x1c, 0x1e, 0x12, 0x19, 0x1c, 0x1e, 0x13, 0x19, 0x1c, 0x1e, 0x14, 0x1a, 0x1d, 0x1e, 0x15, 0x1a, 0x1d, 0x1e, 0x16, 0x1b, 0x1d, 0x1e, 0x17, 0x1b, 0x1d, 0x1e gUnknown_0860D1C0:: @ 860D1C0 -.byte 0x00, 0x0f, 0x08, 0x07, 0x03, 0x0c, 0x0b, 0x04, 0x01, 0x0e, 0x09, 0x06, 0x02, 0x0d, 0x0a, 0x05 - -gUnknown_0860D1D0:: @ 860D1D0 -.4byte 0x82c3188 -.4byte 0x82c31aa -.4byte 0x82c31c0 -.4byte 0x82c31dd -.4byte 0x82c31fa -.4byte 0x82c321b -.4byte 0x82c3240 -.4byte 0x82c325c -.4byte 0x82c327c -.4byte 0x82c329b -.4byte 0x82c32b7 -.4byte 0x82c32d9 -.4byte 0x82c32fc -.4byte 0x82c3312 -.4byte 0x82c3332 -.4byte 0x82c3359 -.4byte 0x82c3378 - -gUnknown_0860D214:: @ 860D214 -.4byte 0x82c339b -.4byte 0x82c33c4 -.4byte 0x82c33e6 -.4byte 0x82c340b -.4byte 0x82c3428 -.4byte 0x82c344c -.4byte 0x82c3471 -.4byte 0x82c3492 -.4byte 0x82c34b6 -.4byte 0x82c34d2 -.4byte 0x82c34f5 -.4byte 0x82c3516 -.4byte 0x82c353b -.4byte 0x82c3562 -.4byte 0x82c3586 -.4byte 0x82c35ad -.4byte 0x82c35d4 -.4byte 0x82c35f4 -.4byte 0x82c361c -.4byte 0x82c3640 -.4byte 0x82c3659 -.4byte 0x82c367e -.4byte 0x82c369d -.4byte 0x82c36c2 -.4byte 0x82c36e3 -.4byte 0x82c3704 -.4byte 0x82c3727 -.4byte 0x82c374c -.4byte 0x82c376f -.4byte 0x82c3789 -.4byte 0x82c37a3 -.4byte 0x82c37bd - -gUnknown_0860D294:: @ 860D294 -.4byte 0x82c37d7 -.4byte 0x82c37f1 -.4byte 0x82c380c -.4byte 0x82c3825 -.4byte 0x82c3843 -.4byte 0x82c3862 -.4byte 0x82c3881 -.4byte 0x82c389e -.4byte 0x82c38c0 -.4byte 0x82c38e3 -.4byte 0x82c3901 -.4byte 0x82c3924 -.4byte 0x82c3948 -.4byte 0x82c3969 -.4byte 0x82c398b -.4byte 0x82c39b2 -.4byte 0x82c39c1 -.4byte 0x82c39d4 -.4byte 0x82c39e8 -.4byte 0x82c39fa -.4byte 0x82c3a11 -.4byte 0x82c3a29 -.4byte 0x82c3a41 -.4byte 0x82c3a5a -.4byte 0x82c3a71 -.4byte 0x82c3a8d -.4byte 0x82c3aaa -.4byte 0x82c3ac7 -.4byte 0x82c3ae2 -.4byte 0x82c3b02 -.4byte 0x82c3b23 -.4byte 0x82c3b3f -.4byte 0x82c3b60 -.4byte 0x82c3b82 -.4byte 0x82c3ba1 -.4byte 0x82c3bc1 -.4byte 0x82c3be6 -.4byte 0x82c3bf3 -.4byte 0x82c3c04 -.4byte 0x82c3c16 -.4byte 0x82c3c26 -.4byte 0x82c3c3b -.4byte 0x82c3c51 + .byte 0x00, 0x0f, 0x08, 0x07, 0x03, 0x0c, 0x0b, 0x04, 0x01, 0x0e, 0x09, 0x06, 0x02, 0x0d, 0x0a, 0x05 + +gBattleDomePotentialPointers:: @ 860D1D0 + .4byte gBattleDomeOpponentPotential1 + .4byte gBattleDomeOpponentPotential2 + .4byte gBattleDomeOpponentPotential3 + .4byte gBattleDomeOpponentPotential4 + .4byte gBattleDomeOpponentPotential5 + .4byte gBattleDomeOpponentPotential6 + .4byte gBattleDomeOpponentPotential7 + .4byte gBattleDomeOpponentPotential8 + .4byte gBattleDomeOpponentPotential9 + .4byte gBattleDomeOpponentPotential10 + .4byte gBattleDomeOpponentPotential11 + .4byte gBattleDomeOpponentPotential12 + .4byte gBattleDomeOpponentPotential13 + .4byte gBattleDomeOpponentPotential14 + .4byte gBattleDomeOpponentPotential15 + .4byte gBattleDomeOpponentPotential16 + .4byte gBattleDomeOpponentPotential17 + +gBattleDomeOpponentStylePointers:: @ 860D214 + .4byte gBattleDomeOpponentStyle1 + .4byte gBattleDomeOpponentStyle2 + .4byte gBattleDomeOpponentStyle3 + .4byte gBattleDomeOpponentStyle4 + .4byte gBattleDomeOpponentStyle5 + .4byte gBattleDomeOpponentStyle6 + .4byte gBattleDomeOpponentStyle7 + .4byte gBattleDomeOpponentStyle8 + .4byte gBattleDomeOpponentStyle9 + .4byte gBattleDomeOpponentStyle10 + .4byte gBattleDomeOpponentStyle11 + .4byte gBattleDomeOpponentStyle12 + .4byte gBattleDomeOpponentStyle13 + .4byte gBattleDomeOpponentStyle14 + .4byte gBattleDomeOpponentStyle15 + .4byte gBattleDomeOpponentStyle16 + .4byte gBattleDomeOpponentStyle17 + .4byte gBattleDomeOpponentStyle18 + .4byte gBattleDomeOpponentStyle19 + .4byte gBattleDomeOpponentStyle20 + .4byte gBattleDomeOpponentStyle21 + .4byte gBattleDomeOpponentStyle22 + .4byte gBattleDomeOpponentStyle23 + .4byte gBattleDomeOpponentStyle24 + .4byte gBattleDomeOpponentStyle25 + .4byte gBattleDomeOpponentStyle26 + .4byte gBattleDomeOpponentStyle27 + .4byte gBattleDomeOpponentStyle28 + .4byte gBattleDomeOpponentStyleUnused1 + .4byte gBattleDomeOpponentStyleUnused2 + .4byte gBattleDomeOpponentStyleUnused3 + .4byte gBattleDomeOpponentStyleUnused4 + +gBattleDomeOpponentStatsPointers:: @ 860D294 + .4byte gBattleDomeOpponentStats1 + .4byte gBattleDomeOpponentStats2 + .4byte gBattleDomeOpponentStats3 + .4byte gBattleDomeOpponentStats4 + .4byte gBattleDomeOpponentStats5 + .4byte gBattleDomeOpponentStats6 + .4byte gBattleDomeOpponentStats7 + .4byte gBattleDomeOpponentStats8 + .4byte gBattleDomeOpponentStats9 + .4byte gBattleDomeOpponentStats10 + .4byte gBattleDomeOpponentStats11 + .4byte gBattleDomeOpponentStats12 + .4byte gBattleDomeOpponentStats13 + .4byte gBattleDomeOpponentStats14 + .4byte gBattleDomeOpponentStats15 + .4byte gBattleDomeOpponentStats16 + .4byte gBattleDomeOpponentStats17 + .4byte gBattleDomeOpponentStats18 + .4byte gBattleDomeOpponentStats19 + .4byte gBattleDomeOpponentStats20 + .4byte gBattleDomeOpponentStats21 + .4byte gBattleDomeOpponentStats22 + .4byte gBattleDomeOpponentStats23 + .4byte gBattleDomeOpponentStats24 + .4byte gBattleDomeOpponentStats25 + .4byte gBattleDomeOpponentStats26 + .4byte gBattleDomeOpponentStats27 + .4byte gBattleDomeOpponentStats28 + .4byte gBattleDomeOpponentStats29 + .4byte gBattleDomeOpponentStats30 + .4byte gBattleDomeOpponentStats31 + .4byte gBattleDomeOpponentStats32 + .4byte gBattleDomeOpponentStats33 + .4byte gBattleDomeOpponentStats34 + .4byte gBattleDomeOpponentStats35 + .4byte gBattleDomeOpponentStats36 + .4byte gBattleDomeOpponentStats37 + .4byte gBattleDomeOpponentStats38 + .4byte gBattleDomeOpponentStats39 + .4byte gBattleDomeOpponentStats40 + .4byte gBattleDomeOpponentStats41 + .4byte gBattleDomeOpponentStats42 + .4byte gBattleDomeOpponentStats43 gUnknown_0860D340:: @ 860D340 -.byte 0x68, 0x88, 0x68 + .byte 0x68, 0x88, 0x68 gUnknown_0860D343:: @ 860D343 -.byte 0x26, 0x3e, 0x4e + .byte 0x26, 0x3e, 0x4e gUnknown_0860D346:: @ 860D346 -.byte 0x00, 0x04, 0x00 + .byte 0x00, 0x04, 0x00 gUnknown_0860D349:: @ 860D349 -.byte 0x00, 0x05, 0x09, 0x0c, 0x0e, 0x00, 0x00 - -gUnknown_0860D350:: @ 860D350 -.4byte 0x82c3d1f -.4byte 0x82c3d30 -.4byte 0x82c3d41 -.4byte 0x82c3d52 -.4byte 0x82c3d63 -.4byte 0x82c3d74 -.4byte 0x82c3d85 -.4byte 0x82c3d96 -.4byte 0x82c3da7 -.4byte 0x82c3db8 -.4byte 0x82c3dc9 -.4byte 0x82c3dda -.4byte 0x82c3deb -.4byte 0x82c3dfd -.4byte 0x82c3e0f - -gUnknown_0860D38C:: @ 860D38C -.4byte 0x82c3c78 -.4byte 0x82c3c8e -.4byte 0x82c3c9f -.4byte 0x82c3cb4 -.4byte 0x82c3cc7 -.4byte 0x82c3ce3 -.4byte 0x82c3d00 + .byte 0x00, 0x05, 0x09, 0x0c, 0x0e, 0x00, 0x00 + +gBattleDomeMatchNumberPointers:: @ 860D350 + .4byte gBattleDomeMatchNumber1 + .4byte gBattleDomeMatchNumber2 + .4byte gBattleDomeMatchNumber3 + .4byte gBattleDomeMatchNumber4 + .4byte gBattleDomeMatchNumber5 + .4byte gBattleDomeMatchNumber6 + .4byte gBattleDomeMatchNumber7 + .4byte gBattleDomeMatchNumber8 + .4byte gBattleDomeMatchNumber9 + .4byte gBattleDomeMatchNumber10 + .4byte gBattleDomeMatchNumber11 + .4byte gBattleDomeMatchNumber12 + .4byte gBattleDomeMatchNumber13 + .4byte gBattleDomeMatchNumber14 + .4byte gBattleDomeMatchNumber15 + +gBattleDomeWinStringsPointers:: @ 860D38C + .4byte gBattleDomeWinStrings1 + .4byte gBattleDomeWinStrings2 + .4byte gBattleDomeWinStrings3 + .4byte gBattleDomeWinStrings4 + .4byte gBattleDomeWinStrings5 + .4byte gBattleDomeWinStrings6 + .4byte gBattleDomeWinStrings7 gUnknown_0860D3A8:: @ 860D3A8 -.byte 0x60, 0x60, 0x60 + .byte 0x60, 0x60, 0x60 gUnknown_0860D3AB:: @ 860D3AB -.byte 0x38, 0x50, 0x68 + .byte 0x38, 0x50, 0x68 gUnknown_0860D3AE:: @ 860D3AE -.byte 0x90, 0x90, 0x90 + .byte 0x90, 0x90, 0x90 gUnknown_0860D3B1:: @ 860D3B1 -.byte 0x38, 0x50, 0x68 + .byte 0x38, 0x50, 0x68 gUnknown_0860D3B4:: @ 860D3B4 -.byte 0x00, 0x08, 0x0c, 0x04, 0x07, 0x0f, 0x0b, 0x03, 0x02, 0x0a, 0x0e, 0x06, 0x05, 0x0d, 0x09, 0x01 + .byte 0x00, 0x08, 0x0c, 0x04, 0x07, 0x0f, 0x0b, 0x03, 0x02, 0x0a, 0x0e, 0x06, 0x05, 0x0d, 0x09, 0x01 gUnknown_0860D3C4:: @ 860D3C4 -.byte 0x00, 0x02 + .byte 0x00, 0x02 gUnknown_0860D3C6:: @ 860D3C6 -.byte 0x00, 0x02, 0x02, 0x00, 0x04, 0x02, 0x00, 0x06, 0x02, 0x00, 0x08, 0x02, 0x00, 0x0a, 0x02, 0x00, 0x0c, 0x02, 0x00, 0x0e, 0x02, 0x00, 0x00, 0x04, 0x01, 0x04, 0x04, 0x01, 0x08, 0x04, 0x01, 0x0c -.byte 0x04, 0x01, 0x00, 0x08, 0x02, 0x08, 0x08, 0x02, 0x00, 0x10, 0x03 + .byte 0x00, 0x02, 0x02, 0x00, 0x04, 0x02, 0x00, 0x06, 0x02, 0x00, 0x08, 0x02, 0x00, 0x0a, 0x02, 0x00, 0x0c, 0x02, 0x00, 0x0e, 0x02, 0x00, 0x00, 0x04, 0x01, 0x04, 0x04, 0x01, 0x08, 0x04, 0x01, 0x0c + .byte 0x04, 0x01, 0x00, 0x08, 0x02, 0x08, 0x08, 0x02, 0x00, 0x10, 0x03 gUnknown_0860D3F1:: @ 860D3F1 -.byte 0x00 + .byte 0x00 gUnknown_0860D3F2:: @ 860D3F2 -.byte 0x00, 0x01, 0x70, 0x01, 0x00, 0x00, 0x70, 0x00, 0x30, 0x01, 0x40, 0x01, 0x30, 0x00, 0x40, 0x00, 0x10, 0x01, 0x60, 0x01, 0x10, 0x00, 0x60, 0x00, 0x20, 0x01, 0x50, 0x01, 0x20, 0x00, 0x50 + .byte 0x00, 0x01, 0x70, 0x01, 0x00, 0x00, 0x70, 0x00, 0x30, 0x01, 0x40, 0x01, 0x30, 0x00, 0x40, 0x00, 0x10, 0x01, 0x60, 0x01, 0x10, 0x00, 0x60, 0x00, 0x20, 0x01, 0x50, 0x01, 0x20, 0x00, 0x50 gUnknown_0860D411:: @ 860D411 - .incbin "baserom.gba", 0x60d411, 0x8ff //struct - byte 1 and 2 loaded seperately, 2 added to move 1 addr across + .incbin "baserom.gba", 0x60d411, 0x3f //struct - byte 1 and 2 loaded seperately, 2 added to move 1 addr across + +gUnknown_0860d450:: @ 860D450 + .4byte 0x60210409 + .4byte 0x6023040a + .4byte 0x6047050a + .4byte 0x6043050b + +gUnknown_0860d460:: @ 860D460 + .4byte 0x60210409 + .4byte 0x6023040a + .4byte 0x6047050a + .4byte 0x6023050b + .4byte 0x6027060b + .4byte 0x6047070b + .4byte 0x6043070c + +gUnknown_0860d47c:: @ 860D47C + .4byte 0x60210409 + .4byte 0x6023040a + .4byte 0x6047050a + .4byte 0x6023050b + .4byte 0x6027060b + .4byte 0x6047070b + .4byte 0x6023070c + .4byte 0x6027080c + .4byte 0x6027090c + .4byte 0x60270a0c + .4byte 0x603b0b0c + +gUnknown_0860d4a8:: @ 860D4A8 + .4byte 0x60210409 + .4byte 0x6023040a + .4byte 0x6047050a + .4byte 0x6023050b + .4byte 0x6027060b + .4byte 0x6047070b + .4byte 0x6023070c + .4byte 0x6027080c + .4byte 0x6027090c + .4byte 0x60270a0c + .4byte 0x603b0b0c + .4byte 0x602c0b0d + .4byte 0x602d0b0e + +gUnknown_0860d4dc:: @ 860D4DC + .4byte 0x60210609 + .4byte 0x6021060a + .4byte 0x6027050a + .4byte 0x6043050b + +gUnknown_0860d4ec:: @ 860D4EC + .4byte 0x60210609 + .4byte 0x6021060a + .4byte 0x6027050a + .4byte 0x6023050b + .4byte 0x6027060b + .4byte 0x6047070b + .4byte 0x6043070c + +gUnknown_0860d508:: @ 860D508 + .4byte 0x60210609 + .4byte 0x6021060a + .4byte 0x6027050a + .4byte 0x6023050b + .4byte 0x6027060b + .4byte 0x6047070b + .4byte 0x6023070c + .4byte 0x6027080c + .4byte 0x6027090c + .4byte 0x60270a0c + .4byte 0x603b0b0c + +gUnknown_0860d534:: @ 860D534 + .4byte 0x60210609 + .4byte 0x6021060a + .4byte 0x6027050a + .4byte 0x6023050b + .4byte 0x6027060b + .4byte 0x6047070b + .4byte 0x6023070c + .4byte 0x6027080c + .4byte 0x6027090c + .4byte 0x60270a0c + .4byte 0x603b0b0c + .4byte 0x602c0b0d + .4byte 0x602d0b0e + +gUnknown_0860d568:: @ 860D568 + .4byte 0x60210809 + .4byte 0x6023080a + .4byte 0x6047090a + .4byte 0x6021090b + +gUnknown_0860d578:: @ 860D578 + .4byte 0x60210809 + .4byte 0x6023080a + .4byte 0x6047090a + .4byte 0x6021090b + .4byte 0x6027080b + .4byte 0x6027070b + .4byte 0x6043070c + +gUnknown_0860d594:: @ 860D594 + .4byte 0x60210809 + .4byte 0x6023080a + .4byte 0x6047090a + .4byte 0x6021090b + .4byte 0x6027080b + .4byte 0x6027070b + .4byte 0x6023070c + .4byte 0x6027080c + .4byte 0x6027090c + .4byte 0x60270a0c + .4byte 0x603b0b0c + +gUnknown_0860d5c0:: @ 860D5C0 + .4byte 0x60210809 + .4byte 0x6023080a + .4byte 0x6047090a + .4byte 0x6021090b + .4byte 0x6027080b + .4byte 0x6027070b + .4byte 0x6023070c + .4byte 0x6027080c + .4byte 0x6027090c + .4byte 0x60270a0c + .4byte 0x603b0b0c + .4byte 0x602c0b0d + .4byte 0x602d0b0e + +gUnknown_0860d5f4:: @ 860D5F4 + .4byte 0x60210a09 + .4byte 0x60210a0a + .4byte 0x6027090a + .4byte 0x6021090b + +gUnknown_0860d604:: @ 860D604 + .4byte 0x60210a09 + .4byte 0x60210a0a + .4byte 0x6027090a + .4byte 0x6021090b + .4byte 0x6027080b + .4byte 0x6027070b + .4byte 0x6043070c + +gUnknown_0860d620:: @ 860D620 + .4byte 0x60210a09 + .4byte 0x60210a0a + .4byte 0x6027090a + .4byte 0x6021090b + .4byte 0x6027080b + .4byte 0x6027070b + .4byte 0x6023070c + .4byte 0x6027080c + .4byte 0x6027090c + .4byte 0x60270a0c + .4byte 0x603b0b0c + +gUnknown_0860d64c:: @ 860D64C + .4byte 0x60210a09 + .4byte 0x60210a0a + .4byte 0x6027090a + .4byte 0x6021090b + .4byte 0x6027080b + .4byte 0x6027070b + .4byte 0x6023070c + .4byte 0x6027080c + .4byte 0x6027090c + .4byte 0x60270a0c + .4byte 0x603b0b0c + .4byte 0x602c0b0d + .4byte 0x602d0b0e + +gUnknown_0860d680:: @ 860D680 + .4byte 0x60210c09 + .4byte 0x60230c0a + .4byte 0x60470d0a + .4byte 0x60430d0b + +gUnknown_0860d690:: @ 860D690 + .4byte 0x60210c09 + .4byte 0x60230c0a + .4byte 0x60470d0a + .4byte 0x60230d0b + .4byte 0x60270e0b + .4byte 0x60470f0b + .4byte 0x60210f0c + +gUnknown_0860d6ac:: @ 860D6AC + .4byte 0x60210c09 + .4byte 0x60230c0a + .4byte 0x60470d0a + .4byte 0x60230d0b + .4byte 0x60270e0b + .4byte 0x60470f0b + .4byte 0x60210f0c + .4byte 0x60330e0c + .4byte 0x60320d0c + .4byte 0x60310c0c + .4byte 0x60300b0c + +gUnknown_0860d6d8:: @ 860D6D8 + .4byte 0x60210c09 + .4byte 0x60230c0a + .4byte 0x60470d0a + .4byte 0x60230d0b + .4byte 0x60270e0b + .4byte 0x60470f0b + .4byte 0x60210f0c + .4byte 0x60330e0c + .4byte 0x60320d0c + .4byte 0x60310c0c + .4byte 0x60300b0c + .4byte 0x602c0b0d + .4byte 0x602d0b0e + +gUnknown_0860d70c:: @ 860D70C + .4byte 0x60210e09 + .4byte 0x60210e0a + .4byte 0x60270d0a + .4byte 0x60430d0b + +gUnknown_0860d71c:: @ 860D71C + .4byte 0x60210e09 + .4byte 0x60210e0a + .4byte 0x60270d0a + .4byte 0x60230d0b + .4byte 0x60270e0b + .4byte 0x60470f0b + .4byte 0x60210f0c + +gUnknown_0860d738:: @ 860D738 + .4byte 0x60210e09 + .4byte 0x60210e0a + .4byte 0x60270d0a + .4byte 0x60230d0b + .4byte 0x60270e0b + .4byte 0x60470f0b + .4byte 0x60210f0c + .4byte 0x60330e0c + .4byte 0x60320d0c + .4byte 0x60310c0c + .4byte 0x60300b0c + +gUnknown_0860d764:: @ 860D764 + .4byte 0x60210e09 + .4byte 0x60210e0a + .4byte 0x60270d0a + .4byte 0x60230d0b + .4byte 0x60270e0b + .4byte 0x60470f0b + .4byte 0x60210f0c + .4byte 0x60330e0c + .4byte 0x60320d0c + .4byte 0x60310c0c + .4byte 0x60300b0c + .4byte 0x602c0b0d + .4byte 0x602d0b0e + +gUnknown_0860d798:: @ 860D798 + .4byte 0x60211009 + .4byte 0x6023100a + .4byte 0x6047110a + .4byte 0x6021110b + +gUnknown_0860d7a8:: @ 860D7A8 + .4byte 0x60211009 + .4byte 0x6023100a + .4byte 0x6047110a + .4byte 0x6021110b + .4byte 0x6027100b + .4byte 0x60270f0b + .4byte 0x60210f0c + +gUnknown_0860d7c4:: @ 860D7C4 + .4byte 0x60211009 + .4byte 0x6023100a + .4byte 0x6047110a + .4byte 0x6021110b + .4byte 0x6027100b + .4byte 0x60270f0b + .4byte 0x60210f0c + .4byte 0x60330e0c + .4byte 0x60320d0c + .4byte 0x60310c0c + .4byte 0x60300b0c + +gUnknown_0860d7f0:: @ 860D7F0 + .4byte 0x60211009 + .4byte 0x6023100a + .4byte 0x6047110a + .4byte 0x6021110b + .4byte 0x6027100b + .4byte 0x60270f0b + .4byte 0x60210f0c + .4byte 0x60330e0c + .4byte 0x60320d0c + .4byte 0x60310c0c + .4byte 0x60300b0c + .4byte 0x602c0b0d + .4byte 0x602d0b0e + +gUnknown_0860d824:: @ 860D824 + .4byte 0x602b1209 + .4byte 0x602b120a + .4byte 0x6027110a + .4byte 0x6021110b + +gUnknown_0860d834:: @ 860D834 + .4byte 0x602b1209 + .4byte 0x602b120a + .4byte 0x6027110a + .4byte 0x6021110b + .4byte 0x6027100b + .4byte 0x60270f0b + .4byte 0x60210f0c + +gUnknown_0860d850:: @ 860D850 + .4byte 0x602b1209 + .4byte 0x602b120a + .4byte 0x6027110a + .4byte 0x6021110b + .4byte 0x6027100b + .4byte 0x60270f0b + .4byte 0x60210f0c + .4byte 0x60330e0c + .4byte 0x60320d0c + .4byte 0x60310c0c + .4byte 0x60300b0c + +gUnknown_0860d87c:: @ 860D87C + .4byte 0x602b1209 + .4byte 0x602b120a + .4byte 0x6027110a + .4byte 0x6021110b + .4byte 0x6027100b + .4byte 0x60270f0b + .4byte 0x60210f0c + .4byte 0x60330e0c + .4byte 0x60320d0c + .4byte 0x60310c0c + .4byte 0x60300b0c + .4byte 0x602c0b0d + .4byte 0x602d0b0e + +gUnknown_0860d8b0:: @ 860D8B0 + .4byte 0x60210414 + .4byte 0x60250413 + .4byte 0x60490513 + .4byte 0x60450512 + +gUnknown_0860d8c0:: @ 860D8C0 + .4byte 0x60210414 + .4byte 0x60250413 + .4byte 0x60490513 + .4byte 0x60250512 + .4byte 0x60290612 + .4byte 0x60490712 + .4byte 0x60450711 + +gUnknown_0860d8dc:: @ 860D8DC + .4byte 0x60210414 + .4byte 0x60250413 + .4byte 0x60490513 + .4byte 0x60250512 + .4byte 0x60290612 + .4byte 0x60490712 + .4byte 0x60250711 + .4byte 0x60290811 + .4byte 0x60290911 + .4byte 0x60290a11 + .4byte 0x603c0b11 + +gUnknown_0860d908:: @ 860D908 + .4byte 0x60210414 + .4byte 0x60250413 + .4byte 0x60490513 + .4byte 0x60250512 + .4byte 0x60290612 + .4byte 0x60490712 + .4byte 0x60250711 + .4byte 0x60290811 + .4byte 0x60290911 + .4byte 0x60290a11 + .4byte 0x603c0b11 + .4byte 0x602f0b10 + .4byte 0x602e0b0f + +gUnknown_0860d93c:: @ 860D93C + .4byte 0x60210614 + .4byte 0x60210613 + .4byte 0x60290513 + .4byte 0x60450512 + +gUnknown_0860d94c:: @ 860D94C + .4byte 0x60210614 + .4byte 0x60210613 + .4byte 0x60290513 + .4byte 0x60250512 + .4byte 0x60290612 + .4byte 0x60490712 + .4byte 0x60450711 + +gUnknown_0860d968:: @ 860D968 + .4byte 0x60210614 + .4byte 0x60210613 + .4byte 0x60290513 + .4byte 0x60250512 + .4byte 0x60290612 + .4byte 0x60490712 + .4byte 0x60250711 + .4byte 0x60290811 + .4byte 0x60290911 + .4byte 0x60290a11 + .4byte 0x603c0b11 + +gUnknown_0860d994:: @ 860D994 + .4byte 0x60210614 + .4byte 0x60210613 + .4byte 0x60290513 + .4byte 0x60250512 + .4byte 0x60290612 + .4byte 0x60490712 + .4byte 0x60250711 + .4byte 0x60290811 + .4byte 0x60290911 + .4byte 0x60290a11 + .4byte 0x603c0b11 + .4byte 0x602f0b10 + .4byte 0x602e0b0f + +gUnknown_0860d9c8:: @ 860D9C8 + .4byte 0x60210814 + .4byte 0x60250813 + .4byte 0x60490913 + .4byte 0x60210912 + +gUnknown_0860d9d8:: @ 860D9D8 + .4byte 0x60210814 + .4byte 0x60250813 + .4byte 0x60490913 + .4byte 0x60210912 + .4byte 0x60290812 + .4byte 0x60290712 + .4byte 0x60450711 + +gUnknown_0860d9f4:: @ 860D9F4 + .4byte 0x60210814 + .4byte 0x60250813 + .4byte 0x60490913 + .4byte 0x60210912 + .4byte 0x60290812 + .4byte 0x60290712 + .4byte 0x60250711 + .4byte 0x60290811 + .4byte 0x60290911 + .4byte 0x60290a11 + .4byte 0x603c0b11 + +gUnknown_0860da20:: @ 860DA20 + .4byte 0x60210814 + .4byte 0x60250813 + .4byte 0x60490913 + .4byte 0x60210912 + .4byte 0x60290812 + .4byte 0x60290712 + .4byte 0x60250711 + .4byte 0x60290811 + .4byte 0x60290911 + .4byte 0x60290a11 + .4byte 0x603c0b11 + .4byte 0x602f0b10 + .4byte 0x602e0b0f + +gUnknown_0860da54:: @ 860DA54 + .4byte 0x60210a14 + .4byte 0x60210a13 + .4byte 0x60290913 + .4byte 0x60210912 + +gUnknown_0860da64:: @ 860DA64 + .4byte 0x60210a14 + .4byte 0x60210a13 + .4byte 0x60290913 + .4byte 0x60210912 + .4byte 0x60290812 + .4byte 0x60290712 + .4byte 0x60450711 + +gUnknown_0860da80:: @ 860DA80 + .4byte 0x60210a14 + .4byte 0x60210a13 + .4byte 0x60290913 + .4byte 0x60210912 + .4byte 0x60290812 + .4byte 0x60290712 + .4byte 0x60250711 + .4byte 0x60290811 + .4byte 0x60290911 + .4byte 0x60290a11 + .4byte 0x603c0b11 + +gUnknown_0860daac:: @ 860DAAC + .4byte 0x60210a14 + .4byte 0x60210a13 + .4byte 0x60290913 + .4byte 0x60210912 + .4byte 0x60290812 + .4byte 0x60290712 + .4byte 0x60250711 + .4byte 0x60290811 + .4byte 0x60290911 + .4byte 0x60290a11 + .4byte 0x603c0b11 + .4byte 0x602f0b10 + .4byte 0x602e0b0f + +gUnknown_0860dae0:: @ 860DAE0 + .4byte 0x60210c14 + .4byte 0x60250c13 + .4byte 0x60490d13 + .4byte 0x60450d12 + +gUnknown_0860daf0:: @ 860DAF0 + .4byte 0x60210c14 + .4byte 0x60250c13 + .4byte 0x60490d13 + .4byte 0x60250d12 + .4byte 0x60290e12 + .4byte 0x60490f12 + .4byte 0x60210f11 + +gUnknown_0860db0c:: @ 860DB0C + .4byte 0x60210c14 + .4byte 0x60250c13 + .4byte 0x60490d13 + .4byte 0x60250d12 + .4byte 0x60290e12 + .4byte 0x60490f12 + .4byte 0x60210f11 + .4byte 0x60380e11 + .4byte 0x60370d11 + .4byte 0x60360c11 + .4byte 0x60350b11 + +gUnknown_0860db38:: @ 860DB38 + .4byte 0x60210c14 + .4byte 0x60250c13 + .4byte 0x60490d13 + .4byte 0x60250d12 + .4byte 0x60290e12 + .4byte 0x60490f12 + .4byte 0x60210f11 + .4byte 0x60380e11 + .4byte 0x60370d11 + .4byte 0x60360c11 + .4byte 0x60350b11 + .4byte 0x602f0b10 + .4byte 0x602e0b0f + +gUnknown_0860db6c:: @ 860DB6C + .4byte 0x60210e14 + .4byte 0x60210e13 + .4byte 0x60290d13 + .4byte 0x60450d12 + +gUnknown_0860db7c:: @ 860DB7C + .4byte 0x60210e14 + .4byte 0x60210e13 + .4byte 0x60290d13 + .4byte 0x60250d12 + .4byte 0x60290e12 + .4byte 0x60490f12 + .4byte 0x60210f11 + +gUnknown_0860db98:: @ 860DB98 + .4byte 0x60210e14 + .4byte 0x60210e13 + .4byte 0x60290d13 + .4byte 0x60250d12 + .4byte 0x60290e12 + .4byte 0x60490f12 + .4byte 0x60210f11 + .4byte 0x60380e11 + .4byte 0x60370d11 + .4byte 0x60360c11 + .4byte 0x60350b11 + +gUnknown_0860dbc4:: @ 860DBC4 + .4byte 0x60210e14 + .4byte 0x60210e13 + .4byte 0x60290d13 + .4byte 0x60250d12 + .4byte 0x60290e12 + .4byte 0x60490f12 + .4byte 0x60210f11 + .4byte 0x60380e11 + .4byte 0x60370d11 + .4byte 0x60360c11 + .4byte 0x60350b11 + .4byte 0x602f0b10 + .4byte 0x602e0b0f + +gUnknown_0860dbf8:: @ 860DBF8 + .4byte 0x60211014 + .4byte 0x60251013 + .4byte 0x60491113 + .4byte 0x60211112 + +gUnknown_0860dc08:: @ 860DC08 + .4byte 0x60211014 + .4byte 0x60251013 + .4byte 0x60491113 + .4byte 0x60211112 + .4byte 0x60291012 + .4byte 0x60290f12 + .4byte 0x60210f11 + +gUnknown_0860dc24:: @ 860DC24 + .4byte 0x60211014 + .4byte 0x60251013 + .4byte 0x60491113 + .4byte 0x60211112 + .4byte 0x60291012 + .4byte 0x60290f12 + .4byte 0x60210f11 + .4byte 0x60380e11 + .4byte 0x60370d11 + .4byte 0x60360c11 + .4byte 0x60350b11 + +gUnknown_0860dc50:: @ 860DC50 + .4byte 0x60211014 + .4byte 0x60251013 + .4byte 0x60491113 + .4byte 0x60211112 + .4byte 0x60291012 + .4byte 0x60290f12 + .4byte 0x60210f11 + .4byte 0x60380e11 + .4byte 0x60370d11 + .4byte 0x60360c11 + .4byte 0x60350b11 + .4byte 0x602f0b10 + .4byte 0x602e0b0f + +gUnknown_0860dc84:: @ 860DC84 + .4byte 0x602b1214 + .4byte 0x602b1213 + .4byte 0x60291113 + .4byte 0x60211112 + +gUnknown_0860dc94:: @ 860DC94 + .4byte 0x602b1214 + .4byte 0x602b1213 + .4byte 0x60291113 + .4byte 0x60211112 + .4byte 0x60291012 + .4byte 0x60290f12 + .4byte 0x60210f11 + +gUnknown_0860dcb0:: @ 860DCB0 + .4byte 0x602b1214 + .4byte 0x602b1213 + .4byte 0x60291113 + .4byte 0x60211112 + .4byte 0x60291012 + .4byte 0x60290f12 + .4byte 0x60210f11 + .4byte 0x60380e11 + .4byte 0x60370d11 + .4byte 0x60360c11 + .4byte 0x60350b11 + +gUnknown_0860dcdc:: @ 860DCDC + .4byte 0x602b1214 + .4byte 0x602b1213 + .4byte 0x60291113 + .4byte 0x60211112 + .4byte 0x60291012 + .4byte 0x60290f12 + .4byte 0x60210f11 + .4byte 0x60380e11 + .4byte 0x60370d11 + .4byte 0x60360c11 + .4byte 0x60350b11 + .4byte 0x602f0b10 + .4byte 0x602e0b0f gUnknown_0860DD10:: @ 860DD10 -.4byte 0x860d450 -.4byte 0x860d460 -.4byte 0x860d47c -.4byte 0x860d4a8 -.4byte 0x860dc84 -.4byte 0x860dc94 -.4byte 0x860dcb0 -.4byte 0x860dcdc -.4byte 0x860d8b0 -.4byte 0x860d8c0 -.4byte 0x860d8dc -.4byte 0x860d908 -.4byte 0x860d824 -.4byte 0x860d834 -.4byte 0x860d850 -.4byte 0x860d87c -.4byte 0x860d5f4 -.4byte 0x860d604 -.4byte 0x860d620 -.4byte 0x860d64c -.4byte 0x860dae0 -.4byte 0x860daf0 -.4byte 0x860db0c -.4byte 0x860db38 -.4byte 0x860da54 -.4byte 0x860da64 -.4byte 0x860da80 -.4byte 0x860daac -.4byte 0x860d680 -.4byte 0x860d690 -.4byte 0x860d6ac -.4byte 0x860d6d8 -.4byte 0x860d4dc -.4byte 0x860d4ec -.4byte 0x860d508 -.4byte 0x860d534 -.4byte 0x860dbf8 -.4byte 0x860dc08 -.4byte 0x860dc24 -.4byte 0x860dc50 -.4byte 0x860d93c -.4byte 0x860d94c -.4byte 0x860d968 -.4byte 0x860d994 -.4byte 0x860d798 -.4byte 0x860d7a8 -.4byte 0x860d7c4 -.4byte 0x860d7f0 -.4byte 0x860d568 -.4byte 0x860d578 -.4byte 0x860d594 -.4byte 0x860d5c0 -.4byte 0x860db6c -.4byte 0x860db7c -.4byte 0x860db98 -.4byte 0x860dbc4 -.4byte 0x860d9c8 -.4byte 0x860d9d8 -.4byte 0x860d9f4 -.4byte 0x860da20 -.4byte 0x860d70c -.4byte 0x860d71c -.4byte 0x860d738 -.4byte 0x860d764 + .4byte gUnknown_0860d450 + .4byte gUnknown_0860d460 + .4byte gUnknown_0860d47c + .4byte gUnknown_0860d4a8 + .4byte gUnknown_0860dc84 + .4byte gUnknown_0860dc94 + .4byte gUnknown_0860dcb0 + .4byte gUnknown_0860dcdc + .4byte gUnknown_0860d8b0 + .4byte gUnknown_0860d8c0 + .4byte gUnknown_0860d8dc + .4byte gUnknown_0860d908 + .4byte gUnknown_0860d824 + .4byte gUnknown_0860d834 + .4byte gUnknown_0860d850 + .4byte gUnknown_0860d87c + .4byte gUnknown_0860d5f4 + .4byte gUnknown_0860d604 + .4byte gUnknown_0860d620 + .4byte gUnknown_0860d64c + .4byte gUnknown_0860dae0 + .4byte gUnknown_0860daf0 + .4byte gUnknown_0860db0c + .4byte gUnknown_0860db38 + .4byte gUnknown_0860da54 + .4byte gUnknown_0860da64 + .4byte gUnknown_0860da80 + .4byte gUnknown_0860daac + .4byte gUnknown_0860d680 + .4byte gUnknown_0860d690 + .4byte gUnknown_0860d6ac + .4byte gUnknown_0860d6d8 + .4byte gUnknown_0860d4dc + .4byte gUnknown_0860d4ec + .4byte gUnknown_0860d508 + .4byte gUnknown_0860d534 + .4byte gUnknown_0860dbf8 + .4byte gUnknown_0860dc08 + .4byte gUnknown_0860dc24 + .4byte gUnknown_0860dc50 + .4byte gUnknown_0860d93c + .4byte gUnknown_0860d94c + .4byte gUnknown_0860d968 + .4byte gUnknown_0860d994 + .4byte gUnknown_0860d798 + .4byte gUnknown_0860d7a8 + .4byte gUnknown_0860d7c4 + .4byte gUnknown_0860d7f0 + .4byte gUnknown_0860d568 + .4byte gUnknown_0860d578 + .4byte gUnknown_0860d594 + .4byte gUnknown_0860d5c0 + .4byte gUnknown_0860db6c + .4byte gUnknown_0860db7c + .4byte gUnknown_0860db98 + .4byte gUnknown_0860dbc4 + .4byte gUnknown_0860d9c8 + .4byte gUnknown_0860d9d8 + .4byte gUnknown_0860d9f4 + .4byte gUnknown_0860da20 + .4byte gUnknown_0860d70c + .4byte gUnknown_0860d71c + .4byte gUnknown_0860d738 + .4byte gUnknown_0860d764 gUnknown_0860DE10:: @ 860DE10 -.byte 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d -.byte 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d + .byte 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d + .byte 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d, 0x04, 0x07, 0x0b, 0x0d gUnknown_0860DE50:: @ 860DE50 .4byte 0x8195981 @@ -390,16 +1078,16 @@ gUnknown_0860DE50:: @ 860DE50 .4byte 0x8195db9 gUnknown_0860DE78:: @ 860DE78 -.2byte 0x003f, 0x0040, 0x0041, 0x0043, 0x0042, 0x0046 + .2byte 0x003f, 0x0040, 0x0041, 0x0043, 0x0042, 0x0046 gUnknown_0860DE84:: @ 860DE84 -.2byte 0x00b3, 0x00b4, 0x00b7, 0x00c8, 0x00b9, 0x00bb, 0x00c4, 0x00c6, 0x00ba, 0x0000 + .2byte 0x00b3, 0x00b4, 0x00b7, 0x00c8, 0x00b9, 0x00bb, 0x00c4, 0x00c6, 0x00ba, 0x0000 gUnknown_0860DE98:: @ 860DE98 -.4byte 0x00000010, 0x00000020, 0x00400000, 0x00800000 + .4byte 0x00000010, 0x00000020, 0x00400000, 0x00800000 gUnknown_0860DEA8:: @ 860DEA8 -.4byte 0xffffffef, 0xffffffdf, 0xffbfffff, 0xff7fffff + .4byte 0xffffffef, 0xffffffdf, 0xffbfffff, 0xff7fffff gUnknown_0860DEB8:: @ 860DEB8 //struct .incbin "baserom.gba", 0x60deb8, 0xb68 @@ -437,34 +1125,34 @@ gUnknown_0860EF70:: @ 860EF70 .incbin "baserom.gba", 0x60ef70, 0x8 gUnknown_0860EF78:: @ 860EF78 -.4byte sub_819612C -.4byte sub_81961F0 -.4byte sub_8196274 -.4byte sub_81962B0 -.4byte sub_81962D8 -.4byte sub_8196330 -.4byte sub_8196390 -.4byte sub_81963F0 + .4byte sub_819612C + .4byte sub_81961F0 + .4byte sub_8196274 + .4byte sub_81962B0 + .4byte sub_81962D8 + .4byte sub_8196330 + .4byte sub_8196390 + .4byte sub_81963F0 gUnknown_0860EF98:: @ 860EF98 .incbin "baserom.gba", 0x60ef98, 0x8 gUnknown_0860EFA0:: @ 860EFA0 -.4byte 0x2021cc4 -.4byte 0x2021dc4 -.4byte 0x2021ec4 + .4byte 0x2021cc4 + .4byte 0x2021dc4 + .4byte 0x2021ec4 gUnknown_0860EFAC:: @ 860EFAC -.4byte sub_8196A44 -.4byte sub_8196A9C -.4byte sub_8196B98 -.4byte sub_8196C70 -.4byte sub_8196CF4 -.4byte sub_8196D14 + .4byte sub_8196A44 + .4byte sub_8196A9C + .4byte sub_8196B98 + .4byte sub_8196C70 + .4byte sub_8196CF4 + .4byte sub_8196D14 gUnknown_0860EFC4:: @ 860EFC4 -.2byte 0x0282, 0x0000, 0xfa72, 0x085e, 0x01e1, 0x0000, 0xfa77, 0x085e, 0x02a9, 0x0000, 0xfa7b, 0x085e, 0x02af, 0x0000, 0xfa80, 0x085e -.2byte 0x0033, 0x0000, 0xfa84, 0x085e, 0x011f, 0x0000, 0xfa8a, 0x085e + .2byte 0x0282, 0x0000, 0xfa72, 0x085e, 0x01e1, 0x0000, 0xfa77, 0x085e, 0x02a9, 0x0000, 0xfa7b, 0x085e, 0x02af, 0x0000, 0xfa80, 0x085e + .2byte 0x0033, 0x0000, 0xfa84, 0x085e, 0x011f, 0x0000, 0xfa8a, 0x085e gUnknown_0860EFF4:: @ 860EFF4 .4byte 0x85ed104 diff --git a/data/event_scripts.s b/data/event_scripts.s index e260b8689..66a998f42 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -12223,232 +12223,346 @@ BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 .string "Thank you, my mentor!\n" .string "I apologize for my skepticism!$" +gBattleDomeOpponentPotential1:: .string "The best candidate to be a champ!$" +gBattleDomeOpponentPotential2:: .string "A sure-finalist team.$" +gBattleDomeOpponentPotential3:: .string "A likely top-three finisher.$" - + +gBattleDomeOpponentPotential4:: .string "A candidate to finish first.$" +gBattleDomeOpponentPotential5:: .string "A team with top-class potential.$" +gBattleDomeOpponentPotential6:: .string "The dark horse team this tournament.$" +gBattleDomeOpponentPotential7:: .string "A better-than-average team.$" +gBattleDomeOpponentPotential8:: .string "This tournament’s average team.$" +gBattleDomeOpponentPotential9:: .string "A team with average potential.$" +gBattleDomeOpponentPotential10:: .string "A weaker-than-average team.$" +gBattleDomeOpponentPotential11:: .string "A team looking for its first win.$" +gBattleDomeOpponentPotential12:: .string "One win will make this team proud.$" +gBattleDomeOpponentPotential13:: .string "Overall, a weak team.$" +gBattleDomeOpponentPotential14:: .string "A team with very low potential.$" +gBattleDomeOpponentPotential15:: .string "A team unlikely to win the tournament.$" +gBattleDomeOpponentPotential16:: .string "The team most unlikely to win.$" +gBattleDomeOpponentPotential17:: .string "The perfect, invincible superstar!$" +gBattleDomeOpponentStyle1:: .string "Willing to risk total disaster at times.$" +gBattleDomeOpponentStyle2:: .string "Skilled at enduring long battles.$" +gBattleDomeOpponentStyle3:: .string "Varies tactics to suit the opponent.$" +gBattleDomeOpponentStyle4:: .string "Has a tough winning pattern.$" +gBattleDomeOpponentStyle5:: .string "Occasionally uses a very rare move.$" +gBattleDomeOpponentStyle6:: .string "Uses startling and disruptive moves.$" +gBattleDomeOpponentStyle7:: .string "Constantly watches HP in battle.$" +gBattleDomeOpponentStyle8:: .string "Good at storing then loosing power.$" +gBattleDomeOpponentStyle9:: .string "Skilled at enfeebling foes.$" +gBattleDomeOpponentStyle10:: .string "Prefers tactics that rely on luck.$" +gBattleDomeOpponentStyle11:: .string "Attacks with a regal atmosphere.$" +gBattleDomeOpponentStyle12:: .string "Attacks with powerful, low-PP moves.$" +gBattleDomeOpponentStyle13:: .string "Skilled at enfeebling, then attacking.$" +gBattleDomeOpponentStyle14:: .string "Battles while enduring all attacks.$" +gBattleDomeOpponentStyle15:: .string "Skilled at upsetting foes emotionally.$" +gBattleDomeOpponentStyle16:: .string "Uses strong and straightforward moves.$" +gBattleDomeOpponentStyle17:: .string "Aggressively uses strong moves.$" +gBattleDomeOpponentStyle18:: .string "Battles while cleverly dodging attacks.$" +gBattleDomeOpponentStyle19:: .string "Skilled at using upsetting attacks.$" +gBattleDomeOpponentStyle20:: .string "Uses many popular moves.$" +gBattleDomeOpponentStyle21:: .string "Has moves for powerful combinations.$" +gBattleDomeOpponentStyle22:: .string "Uses high-probability attacks.$" +gBattleDomeOpponentStyle23:: .string "Aggressively uses spectacular moves.$" +gBattleDomeOpponentStyle24:: .string "Emphasizes offense over defense.$" +gBattleDomeOpponentStyle25:: .string "Emphasizes defense over offense.$" +gBattleDomeOpponentStyle26:: .string "Attacks quickly with strong moves.$" +gBattleDomeOpponentStyle27:: .string "Often uses moves with added effects.$" +gBattleDomeOpponentStyle28:: .string "Uses a well-balanced mix of moves.$" +gBattleDomeOpponentStyleUnused1:: .string "This is sample message 1.$" +gBattleDomeOpponentStyleUnused2:: .string "This is sample message 2.$" +gBattleDomeOpponentStyleUnused3:: .string "This is sample message 3.$" +gBattleDomeOpponentStyleUnused4:: .string "This is sample message 4.$" +gBattleDomeOpponentStats1:: .string "Emphasizes HP and ATTACK.$" +gBattleDomeOpponentStats2:: .string "Emphasizes HP and DEFENSE.$" +gBattleDomeOpponentStats3:: .string "Emphasizes HP and SPEED.$" +gBattleDomeOpponentStats4:: .string "Emphasizes HP and SP. ATTACK.$" +gBattleDomeOpponentStats5:: .string "Emphasizes HP and SP. DEFENSE.$" +gBattleDomeOpponentStats6:: .string "Emphasizes ATTACK and DEFENSE.$" +gBattleDomeOpponentStats7:: .string "Emphasizes ATTACK and SPEED.$" +gBattleDomeOpponentStats8:: .string "Emphasizes ATTACK and SP. ATTACK.$" +gBattleDomeOpponentStats9:: .string "Emphasizes ATTACK and SP. DEFENSE.$" +gBattleDomeOpponentStats10:: .string "Emphasizes DEFENSE and SPEED.$" +gBattleDomeOpponentStats11:: .string "Emphasizes DEFENSE and SP. ATTACK.$" +gBattleDomeOpponentStats12:: .string "Emphasizes DEFENSE and SP. DEFENSE.$" +gBattleDomeOpponentStats13:: .string "Emphasizes SPEED and SP. ATTACK.$" +gBattleDomeOpponentStats14:: .string "Emphasizes SPEED and SP. DEFENSE.$" +gBattleDomeOpponentStats15:: .string "Emphasizes SP. ATTACK and SP. DEFENSE.$" +gBattleDomeOpponentStats16:: .string "Emphasizes HP.$" +gBattleDomeOpponentStats17:: .string "Emphasizes ATTACK.$" +gBattleDomeOpponentStats18:: .string "Emphasizes DEFENSE.$" +gBattleDomeOpponentStats19:: .string "Emphasizes SPEED.$" +gBattleDomeOpponentStats20:: .string "Emphasizes SP. ATTACK.$" +gBattleDomeOpponentStats21:: .string "Emphasizes SP. DEFENSE.$" +gBattleDomeOpponentStats22:: .string "Neglects HP and ATTACK.$" +gBattleDomeOpponentStats23:: .string "Neglects HP and DEFENSE.$" +gBattleDomeOpponentStats24:: .string "Neglects HP and SPEED.$" +gBattleDomeOpponentStats25:: .string "Neglects HP and SP. ATTACK.$" +gBattleDomeOpponentStats26:: .string "Neglects HP and SP. DEFENSE.$" +gBattleDomeOpponentStats27:: .string "Neglects ATTACK and DEFENSE.$" +gBattleDomeOpponentStats28:: .string "Neglects ATTACK and SPEED.$" +gBattleDomeOpponentStats29:: .string "Neglects ATTACK and SP. ATTACK.$" +gBattleDomeOpponentStats30:: .string "Neglects ATTACK and SP. DEFENSE.$" +gBattleDomeOpponentStats31:: .string "Neglects DEFENSE and SPEED.$" +gBattleDomeOpponentStats32:: .string "Neglects DEFENSE and SP. ATTACK.$" +gBattleDomeOpponentStats33:: .string "Neglects DEFENSE and SP. DEFENSE.$" +gBattleDomeOpponentStats34:: .string "Neglects SPEED and SP. ATTACK.$" +gBattleDomeOpponentStats35:: .string "Neglects SPEED and SP. DEFENSE.$" +gBattleDomeOpponentStats36:: .string "Neglects SP. ATTACK and SP. DEFENSE.$" +gBattleDomeOpponentStats37:: .string "Neglects HP.$" +gBattleDomeOpponentStats38:: .string "Neglects ATTACK.$" +gBattleDomeOpponentStats39:: .string "Neglects DEFENSE.$" +gBattleDomeOpponentStats40:: .string "Neglects SPEED.$" +gBattleDomeOpponentStats41:: .string "Neglects SP. ATTACK.$" +gBattleDomeOpponentStats42:: .string "Neglects SP. DEFENSE.$" +gBattleDomeOpponentStats43:: .string "Raises POKéMON in a well-balanced way.$" +gBattleDomeWinStrings1:: .string "Let the battle begin!$" +gBattleDomeWinStrings2:: .string "{STR_VAR_1} won using {STR_VAR_2}!$" +gBattleDomeWinStrings3:: .string "{STR_VAR_1} became the champ!$" +gBattleDomeWinStrings4:: .string "{STR_VAR_1} won by default!$" +gBattleDomeWinStrings5:: .string "{STR_VAR_1} won outright by default!$" +gBattleDomeWinStrings6:: .string "{STR_VAR_1} won without using a move!$" +gBattleDomeWinStrings7:: .string "{STR_VAR_1} won outright with no moves!$" +gBattleDomeMatchNumber1:: .string "Round 1, Match 1$" +gBattleDomeMatchNumber2:: .string "Round 1, Match 2$" +gBattleDomeMatchNumber3:: .string "Round 1, Match 3$" +gBattleDomeMatchNumber4:: .string "Round 1, Match 4$" +gBattleDomeMatchNumber5:: .string "Round 1, Match 5$" +gBattleDomeMatchNumber6:: .string "Round 1, Match 6$" +gBattleDomeMatchNumber7:: .string "Round 1, Match 7$" +gBattleDomeMatchNumber8:: .string "Round 1, Match 8$" +gBattleDomeMatchNumber9:: .string "Round 2, Match 1$" +gBattleDomeMatchNumber10:: .string "Round 2, Match 2$" +gBattleDomeMatchNumber11:: .string "Round 2, Match 3$" +gBattleDomeMatchNumber12:: .string "Round 2, Match 4$" +gBattleDomeMatchNumber13:: .string "Semifinal Match 1$" +gBattleDomeMatchNumber14:: .string "Semifinal Match 2$" +gBattleDomeMatchNumber15:: .string "Final Match$" BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B diff --git a/data/field_region_map.s b/data/field_region_map.s deleted file mode 100644 index f179ba8ce..000000000 --- a/data/field_region_map.s +++ /dev/null @@ -1,14 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_085E5068:: @ 85E5068 struct BgTemplate - .4byte 0x000001f0, 0x00002dca - - .align 2 -gUnknown_085E5070:: @ 85E5070 - window_template 0x00, 0x11, 0x11, 0x0c, 0x02, 0x0f, 0x0001 - window_template 0x00, 0x16, 0x01, 0x07, 0x02, 0x0f, 0x0019 - window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 diff --git a/data/heal_location.s b/data/heal_location.s deleted file mode 100644 index 31aa1a351..000000000 --- a/data/heal_location.s +++ /dev/null @@ -1,11 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_0859F534:: @ 859F534 - .incbin "baserom.gba", 0x59f534, 0x8 - -gUnknown_0859F53C:: @ 859F53C - .incbin "baserom.gba", 0x59f53c, 0xd0 diff --git a/data/menu_helpers.s b/data/menu_helpers.s index b43af0bc4..8d0e12939 100644 --- a/data/menu_helpers.s +++ b/data/menu_helpers.s @@ -11,4 +11,4 @@ gUnknown_0859F51C:: @ 859F51C .incbin "baserom.gba", 0x59f51c, 0x8 gUnknown_0859F524:: @ 859F524 - .incbin "baserom.gba", 0x59f524, 0x10 + .incbin "baserom.gba", 0x59f524, 0x18 diff --git a/data/region_map.s b/data/region_map.s deleted file mode 100644 index 9fe3c407e..000000000 --- a/data/region_map.s +++ /dev/null @@ -1,136 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2, 0 - -gUnknown_0859F60C:: @ 859F60C - .incbin "baserom.gba", 0x59f60c, 0x44 - -gUnknown_0859F650:: @ 859F650 - .incbin "baserom.gba", 0x59f650, 0xec - -gUnknown_0859F73C:: @ 859F73C - .incbin "baserom.gba", 0x59f73c, 0x40 - -gUnknown_0859F77C:: @ 859F77C - .incbin "baserom.gba", 0x59f77c, 0xd64 - -gUnknown_085A04E0:: @ 85A04E0 - .incbin "baserom.gba", 0x5a04e0, 0x34c - -gUnknown_085A082C:: @ 85A082C - .incbin "baserom.gba", 0x5a082c, 0x20 - -gUnknown_085A084C:: @ 85A084C - .incbin "baserom.gba", 0x5a084c, 0x80 - -gUnknown_085A08CC:: @ 85A08CC - .incbin "baserom.gba", 0x5a08cc, 0x20 - -gUnknown_085A08EC:: @ 85A08EC - .incbin "baserom.gba", 0x5a08ec, 0x80 - -gUnknown_085A096C:: @ 85A096C -@ replacing .incbin "baserom.gba", 0x005a096c, 0x1a4 -.byte 0xd5, 0x1d, 0x1d, 0x04, 0x1c, 0x1c, 0x1c, 0x1c, 0x1a, 0xd5, 0xd5, 0x22, 0x0b, 0x23, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x1d, 0xd5, 0xd5 -.byte 0xd5, 0xd5, 0x38, 0x38, 0x1a, 0xd5, 0xd5, 0x22, 0xd5, 0x23, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x1e, 0x1d, 0xd5, 0xd5, 0xd5, 0xd5, 0x38, 0x38 -.byte 0x1a, 0xd5, 0xd5, 0x22, 0xd5, 0x23, 0xd5, 0xd5, 0x39, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x1e, 0xd5, 0xd5, 0xd5, 0xd5, 0x03, 0x1b, 0x1b, 0x1a, 0xd5, 0xd5, 0x22 -.byte 0xd5, 0x23, 0x24, 0x24, 0x24, 0x24, 0x0c, 0x0c, 0x27, 0x27, 0x27, 0x27, 0x28, 0x28, 0xd5, 0xd5, 0x1e, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x1a, 0xd5, 0xd5, 0x22, 0xd5, 0xd5, 0xd5, 0xd5 -.byte 0x25, 0xd5, 0xd5, 0xd5, 0x27, 0x27, 0x27, 0x27, 0x28, 0x28, 0xd5, 0xd5, 0x0a, 0x1f, 0x1f, 0x1f, 0x1f, 0xd5, 0xd5, 0xd5, 0x1a, 0xd5, 0xd5, 0x22, 0xd5, 0xd5, 0xd5, 0xd5, 0x25, 0xd5, 0xd5, 0xd5 -.byte 0x27, 0x27, 0x27, 0x27, 0x0d, 0x0d, 0xd5, 0xd5, 0x0a, 0xd5, 0xd5, 0xd5, 0x05, 0x20, 0x20, 0x20, 0x09, 0x09, 0x21, 0x21, 0x26, 0x26, 0x26, 0x26, 0x26, 0xd5, 0xd5, 0xd5, 0x29, 0x29, 0x29, 0x2a -.byte 0x2a, 0x2a, 0xd5, 0xd5, 0x13, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x19, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x29, 0x0e, 0x29, 0x2a, 0x2a, 0x2a, 0xd5, 0xd5 -.byte 0x13, 0xd5, 0xd5, 0xd5, 0x12, 0x12, 0x12, 0x12, 0x19, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x29, 0x29, 0x29, 0x2a, 0x2a, 0x2a, 0xd5, 0x0f, 0x13, 0x07, 0x11, 0x11 -.byte 0x01, 0xd5, 0xd5, 0xd5, 0x19, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x2b, 0x2b, 0x2b, 0x2b, 0x0f, 0x14, 0xd5, 0xd5, 0xd5, 0x10, 0xd5, 0xd5, 0xd5 -.byte 0x08, 0x31, 0x31, 0x31, 0x30, 0x30, 0x30, 0x2f, 0x2f, 0x06, 0x2e, 0x2e, 0x2e, 0x2d, 0x2d, 0x2d, 0x2c, 0x2c, 0xd5, 0xd5, 0x14, 0xd5, 0xd5, 0xd5, 0x00, 0xd5, 0xd5, 0xd5, 0x08, 0xd5, 0xd5, 0xd5 -.byte 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x14, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x18, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5 -.byte 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x3a, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x15, 0x15, 0x15, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x18, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5 -.byte 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0x02, 0x16, 0x16, 0x16, 0x17, 0x17, 0x18, 0xd5, 0xd5, 0xd5, 0x49, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5, 0xd5 -.byte 0xd5, 0xd5, 0xd5, 0xd5 - -@ 85A0B10 - .include "data/region_map_entries.inc" - -gUnknown_085A1B24:: @ 85A1B24 -@ replacing .incbin "baserom.gba", 0x005a1b24, 0x60 -.2byte 0x00ce, 0x0014, 0x0032, 0x0027, 0x00cf, 0x002c, 0x0033, 0x0029, 0x0034, 0x002a, 0x0035, 0x002b, 0x00d0, 0x002c, 0x0036, 0x000e -.2byte 0x0045, 0x002b, 0x00c5, 0x000c, 0x0042, 0x000c, 0x00c6, 0x001b, 0x004f, 0x0031, 0x003b, 0x0013, 0x004c, 0x001b, 0x0041, 0x0025 -.2byte 0x0055, 0x002e, 0x00c7, 0x001a, 0x00d4, 0x001a, 0x00d1, 0x001d, 0x00d2, 0x0012, 0x00ca, 0x0012, 0x003d, 0x0017, 0x00d5, 0x00d5 - -gUnknown_085A1B84:: @ 85A1B84 -@ replacing .incbin "baserom.gba", 0x005a1b84, 0x6 -.2byte 0x00cb, 0x00cc, 0x00cc - -gUnknown_085A1B8A:: @ 85A1B8A -@ replacing .incbin "baserom.gba", 0x005a1b8a, 0x22 -.2byte 0x001d, 0x001d, 0x001e, 0x001e, 0x001f, 0x001f, 0x0021, 0x0021, 0x0014, 0x0014, 0x0028, 0x0028, 0x002a, 0x002a, 0x002c, 0x002c -.2byte 0x0000 - -gUnknown_085A1BAC:: @ 85A1BAC -@ replacing .incbin "baserom.gba", 0x005a1bac, 0x20 -.2byte 0x0000, 0x000a, 0x0000, 0x000c, 0x0018, 0x0003, 0x0019, 0x0004, 0x0019, 0x0006, 0x0019, 0x0007, 0x0018, 0x000a, 0x0018, 0x000a - -gUnknown_085A1BCC:: @ 85A1BCC -@ replacing .incbin "baserom.gba", 0x005a1bcc, 0x34 -.byte 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x04, 0x00, 0x14, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x10, 0x00, 0x0a, 0x00 -.byte 0x20, 0x00, 0x0a, 0x00, 0x10, 0x00, 0x0a, 0x00, 0xfe, 0xff, 0x00, 0x00, 0xd8, 0x1b, 0x5a, 0x08, 0xe4, 0x1b, 0x5a, 0x08 - -gUnknown_085A1C00:: @ 85A1C00 - .incbin "baserom.gba", 0x5a1c00, 0x8 - -gUnknown_085A1C08:: @ 85A1C08 - .incbin "baserom.gba", 0x5a1c08, 0x18 - -gUnknown_085A1C20:: @ 85A1C20 - .incbin "baserom.gba", 0x5a1c20, 0x10 - -gUnknown_085A1C30:: @ 85A1C30 -@ replacing .incbin "baserom.gba", 0x005a1c30, 0x4 -.4byte 0x85a1c28 - -gUnknown_085A1C34:: @ 85A1C34 -@ replacing .incbin "baserom.gba", 0x005a1c34, 0x4 -.byte 0xc8, 0xc9, 0xd3, 0x00 - -gUnknown_085A1C38:: @ 85A1C38 - .incbin "baserom.gba", 0x5a1c38, 0x20 - -gUnknown_085A1C58:: @ 85A1C58 - .incbin "baserom.gba", 0x5a1c58, 0x38 - -gUnknown_085A1C90:: @ 85A1C90 - .incbin "baserom.gba", 0x5a1c90, 0xd8 - -gUnknown_085A1D68:: @ 85A1D68 - .incbin "baserom.gba", 0x5a1d68, 0xd4 - -gUnknown_085A1E3C:: @ 85A1E3C -@ replacing .incbin "baserom.gba", 0x005a1e3c, 0xa0 -.byte 0x00, 0x09, 0x01, 0x00, 0x0a, 0x0e, 0x00, 0x0b, 0x0f, 0x00, 0x0c, 0x10, 0x00, 0x0d, 0x11, 0x00, 0x0e, 0x12, 0x00, 0x0f, 0x13, 0x00, 0x00, 0x03, 0x00, 0x01, 0x04, 0x00, 0x02, 0x05, 0x00, 0x03 -.byte 0x06, 0x00, 0x04, 0x07, 0x00, 0x05, 0x08, 0x00, 0x06, 0x09, 0x00, 0x07, 0x0a, 0x00, 0x08, 0x0b, 0x00, 0x10, 0x00, 0x00, 0x11, 0x00, 0x00, 0x12, 0x00, 0x00, 0x13, 0x00, 0x00, 0x14, 0x00, 0x00 -.byte 0x15, 0x00, 0x00, 0x16, 0x00, 0x00, 0x17, 0x00, 0x00, 0x18, 0x00, 0x00, 0x19, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x1f, 0x00 -.byte 0x00, 0x20, 0x00, 0x00, 0x21, 0x00, 0x00, 0x22, 0x00, 0x00, 0x23, 0x00, 0x00, 0x24, 0x00, 0x00, 0x25, 0x00, 0x00, 0x26, 0x00, 0x00, 0x27, 0x00, 0x00, 0x28, 0x00, 0x00, 0x29, 0x00, 0x00, 0x2a -.byte 0x00, 0x00, 0x2b, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x2d, 0x00, 0x00, 0x2e, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x30, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0x82, 0xc7, 0x5e, 0x08, 0x91, 0xc7, 0x5e, 0x08 - -gUnknown_085A1EDC:: @ 85A1EDC - .incbin "baserom.gba", 0x5a1edc, 0x8 - -gUnknown_085A1EE4:: @ 85A1EE4 - .incbin "baserom.gba", 0x5a1ee4, 0xc - -gUnknown_085A1EF0:: @ 85A1EF0 - .incbin "baserom.gba", 0x5a1ef0, 0x20 - -gUnknown_085A1F10:: @ 85A1F10 - .incbin "baserom.gba", 0x5a1f10, 0x8 - -gUnknown_085A1F18:: @ 85A1F18 -@ replacing .incbin "baserom.gba", 0x005a1f18, 0x64 -.2byte 0x08a8, 0x003a, 0xffff, 0x00d5, 0x0000, 0x0000, 0x0800, 0x0000, 0x0000, 0x0005, 0xffff, 0x0000, 0x0001, 0x0005, 0xffff, 0x0000 -.2byte 0x0003, 0x0005, 0xffff, 0x0000, 0x0005, 0x0005, 0xffff, 0x0000, 0x0006, 0x0005, 0xffff, 0x0000, 0x0008, 0x0005, 0xffff, 0x0000 -.2byte 0x000a, 0x0005, 0xffff, 0x0000, 0x1f28, 0x085a, 0x1f30, 0x085a, 0x1f38, 0x085a, 0x1f40, 0x085a, 0x1f48, 0x085a, 0x1f50, 0x085a -.2byte 0x1f58, 0x085a - -gUnknown_085A1F7C:: @ 85A1F7C - .incbin "baserom.gba", 0x5a1f7c, 0x18 - diff --git a/data/region_map_entries.inc b/data/region_map_entries.inc deleted file mode 100644 index ced01648c..000000000 --- a/data/region_map_entries.inc +++ /dev/null @@ -1,809 +0,0 @@ -gMapName_LittlerootTown:: @ 85A0B10 - .string "LITTLEROOT TOWN$" - -gMapName_OldaleTown:: @ 85A0B20 - .string "OLDALE TOWN$" - -gMapName_DewfordTown:: @ 85A0B2C - .string "DEWFORD TOWN$" - -gMapName_LavaridgeTown:: @ 85A0B39 - .string "LAVARIDGE TOWN$" - -gMapName_FallarborTown:: @ 85A0B48 - .string "FALLARBOR TOWN$" - -gMapName_VerdanturfTown:: @ 85A0B57 - .string "VERDANTURF TOWN$" - -gMapName_PacifidlogTown:: @ 85A0B67 - .string "PACIFIDLOG TOWN$" - -gMapName_PetalburgCity:: @ 85A0B77 - .string "PETALBURG CITY$" - -gMapName_SlateportCity:: @ 85A0B86 - .string "SLATEPORT CITY$" - -gMapName_MauvilleCity:: @ 85A0B95 - .string "MAUVILLE CITY$" - -gMapName_RustboroCity:: @ 85A0BA3 - .string "RUSTBORO CITY$" - -gMapName_FortreeCity:: @ 85A0BB1 - .string "FORTREE CITY$" - -gMapName_LilycoveCity:: @ 85A0BBE - .string "LILYCOVE CITY$" - -gMapName_MossdeepCity:: @ 85A0BCC - .string "MOSSDEEP CITY$" - -gMapName_SootopolisCity:: @ 85A0BDA - .string "SOOTOPOLIS CITY$" - -gMapName_EverGrandeCity:: @ 85A0BEA - .string "EVER GRANDE CITY$" - -gMapName_Route101:: @ 85A0BFB - .string "ROUTE 101$" - -gMapName_Route102:: @ 85A0C05 - .string "ROUTE 102$" - -gMapName_Route103:: @ 85A0C0F - .string "ROUTE 103$" - -gMapName_Route104:: @ 85A0C19 - .string "ROUTE 104$" - -gMapName_Route105:: @ 85A0C23 - .string "ROUTE 105$" - -gMapName_Route106:: @ 85A0C2D - .string "ROUTE 106$" - -gMapName_Route107:: @ 85A0C37 - .string "ROUTE 107$" - -gMapName_Route108:: @ 85A0C41 - .string "ROUTE 108$" - -gMapName_Route109:: @ 85A0C4B - .string "ROUTE 109$" - -gMapName_Route110:: @ 85A0C55 - .string "ROUTE 110$" - -gMapName_Route111:: @ 85A0C5F - .string "ROUTE 111$" - -gMapName_Route112:: @ 85A0C69 - .string "ROUTE 112$" - -gMapName_Route113:: @ 85A0C73 - .string "ROUTE 113$" - -gMapName_Route114:: @ 85A0C7D - .string "ROUTE 114$" - -gMapName_Route115:: @ 85A0C87 - .string "ROUTE 115$" - -gMapName_Route116:: @ 85A0C91 - .string "ROUTE 116$" - -gMapName_Route117:: @ 85A0C9B - .string "ROUTE 117$" - -gMapName_Route118:: @ 85A0CA5 - .string "ROUTE 118$" - -gMapName_Route119:: @ 85A0CAF - .string "ROUTE 119$" - -gMapName_Route120:: @ 85A0CB9 - .string "ROUTE 120$" - -gMapName_Route121:: @ 85A0CC3 - .string "ROUTE 121$" - -gMapName_Route122:: @ 85A0CCD - .string "ROUTE 122$" - -gMapName_Route123:: @ 85A0CD7 - .string "ROUTE 123$" - -gMapName_Route124:: @ 85A0CE1 - .string "ROUTE 124$" - -gMapName_Route125:: @ 85A0CEB - .string "ROUTE 125$" - -gMapName_Route126:: @ 85A0CF5 - .string "ROUTE 126$" - -gMapName_Route127:: @ 85A0CFF - .string "ROUTE 127$" - -gMapName_Route128:: @ 85A0D09 - .string "ROUTE 128$" - -gMapName_Route129:: @ 85A0D13 - .string "ROUTE 129$" - -gMapName_Route130:: @ 85A0D1D - .string "ROUTE 130$" - -gMapName_Route131:: @ 85A0D27 - .string "ROUTE 131$" - -gMapName_Route132:: @ 85A0D31 - .string "ROUTE 132$" - -gMapName_Route133:: @ 85A0D3B - .string "ROUTE 133$" - -gMapName_Route134:: @ 85A0D45 - .string "ROUTE 134$" - -gMapName_Underwater:: @ 85A0D4F - .string "UNDERWATER$" - -gMapName_GraniteCave:: @ 85A0D5A - .string "GRANITE CAVE$" - -gMapName_MtChimney:: @ 85A0D67 - .string "MT. CHIMNEY$" - -gMapName_SafariZone:: @ 85A0D73 - .string "SAFARI ZONE$" - -gMapName_BattleFrontier:: @ 85A0D7F - .string "BATTLE FRONTIER$" - -gMapName_PetalburgWoods:: @ 85A0D8F - .string "PETALBURG WOODS$" - -gMapName_RusturfTunnel:: @ 85A0D9F - .string "RUSTURF TUNNEL$" - -gMapName_AbandonedShip:: @ 85A0DAE - .string "ABANDONED SHIP$" - -gMapName_NewMauville:: @ 85A0DBD - .string "NEW MAUVILLE$" - -gMapName_MeteorFalls:: @ 85A0DCA - .string "METEOR FALLS$" - -gMapName_MtPyre:: @ 85A0DD7 - .string "MT. PYRE$" - -@ This was the Aqua or Magma hideout in Ruby/Sapphire, but each team has a -@ hideout in Emerald with their own new region map entries, and this name -@ doesn't seem to be used anymore. -gMapName_AquaHideoutOld:: @ 85A0DE0 - .string "{AQUA} HIDEOUT$" - -gMapName_ShoalCave:: @ 85A0DEB - .string "SHOAL CAVE$" - -gMapName_SeafloorCavern:: @ 85A0DF6 - .string "SEAFLOOR CAVERN$" - -gMapName_VictoryRoad:: @ 85A0E06 - .string "VICTORY ROAD$" - -gMapName_MirageIsland:: @ 85A0E13 - .string "MIRAGE ISLAND$" - -gMapName_CaveOfOrigin:: @ 85A0E21 - .string "CAVE OF ORIGIN$" - -gMapName_SouthernIsland:: @ 85A0E30 - .string "SOUTHERN ISLAND$" - -gMapName_FieryPath:: @ 85A0E40 - .string "FIERY PATH$" - -gMapName_JaggedPass:: @ 85A0E4B - .string "JAGGED PASS$" - -gMapName_SealedChamber:: @ 85A0E57 - .string "SEALED CHAMBER$" - -gMapName_ScorchedSlab:: @ 85A0E66 - .string "SCORCHED SLAB$" - -gMapName_IslandCave:: @ 85A0E74 - .string "ISLAND CAVE$" - -gMapName_DesertRuins:: @ 85A0E80 - .string "DESERT RUINS$" - -gMapName_AncientTomb:: @ 85A0E8D - .string "ANCIENT TOMB$" - -gMapName_InsideOfTruck:: @ 85A0E9A - .string "INSIDE OF TRUCK$" - -gMapName_SkyPillar:: @ 85A0EAA - .string "SKY PILLAR$" - -gMapName_SecretBase:: @ 85A0EB5 - .string "SECRET BASE$" - -gMapName_None:: @ 85A0EC1 - .string "$" - -gMapName_PalletTown:: @ 85A0EC2 - .string "PALLET TOWN$" - -gMapName_ViridianCity:: @ 85A0ECE - .string "VIRIDIAN CITY$" - -gMapName_PewterCity:: @ 85A0EDC - .string "PEWTER CITY$" - -gMapName_CeruleanCity:: @ 85A0EE8 - .string "CERULEAN CITY$" - -gMapName_LavenderTown:: @ 85A0EF6 - .string "LAVENDER TOWN$" - -gMapName_VermilionCity:: @ 85A0F04 - .string "VERMILION CITY$" - -gMapName_CeladonCity:: @ 85A0F13 - .string "CELADON CITY$" - -gMapName_FuchsiaCity:: @ 85A0F20 - .string "FUCHSIA CITY$" - -gMapName_CinnabarIsland:: @ 85A0F2D - .string "CINNABAR ISLAND$" - -gMapName_IndigoPlateau:: @ 85A0F3D - .string "INDIGO PLATEAU$" - -gMapName_SaffronCity:: @ 85A0F4C - .string "SAFFRON CITY$" - -gMapName_Route4:: @ 85A0F59 - .string "ROUTE 4$" - -gMapName_Route10:: @ 85A0F61 - .string "ROUTE 10$" - -gMapName_Route1:: @ 85A0F6A - .string "ROUTE 1$" - -gMapName_Route2:: @ 85A0F72 - .string "ROUTE 2$" - -gMapName_Route3:: @ 85A0F7A - .string "ROUTE 3$" - -gMapName_Route4_2:: @ 85A0F82 - .string "ROUTE 4$" - -gMapName_Route5:: @ 85A0F8A - .string "ROUTE 5$" - -gMapName_Route6:: @ 85A0F92 - .string "ROUTE 6$" - -gMapName_Route7:: @ 85A0F9A - .string "ROUTE 7$" - -gMapName_Route8:: @ 85A0FA2 - .string "ROUTE 8$" - -gMapName_Route9:: @ 85A0FAA - .string "ROUTE 9$" - -gMapName_Route10_2:: @ 85A0FB2 - .string "ROUTE 10$" - -gMapName_Route11:: @ 85A0FBB - .string "ROUTE 11$" - -gMapName_Route12:: @ 85A0FC4 - .string "ROUTE 12$" - -gMapName_Route13:: @ 85A0FCD - .string "ROUTE 13$" - -gMapName_Route14:: @ 85A0FD6 - .string "ROUTE 14$" - -gMapName_Route15:: @ 85A0FDF - .string "ROUTE 15$" - -gMapName_Route16:: @ 85A0FE8 - .string "ROUTE 16$" - -gMapName_Route17:: @ 85A0FF1 - .string "ROUTE 17$" - -gMapName_Route18:: @ 85A0FFA - .string "ROUTE 18$" - -gMapName_Route19:: @ 85A1003 - .string "ROUTE 19$" - -gMapName_Route20:: @ 85A100C - .string "ROUTE 20$" - -gMapName_Route21:: @ 85A1015 - .string "ROUTE 21$" - -gMapName_Route22:: @ 85A101E - .string "ROUTE 22$" - -gMapName_Route23:: @ 85A1027 - .string "ROUTE 23$" - -gMapName_Route24:: @ 85A1030 - .string "ROUTE 24$" - -gMapName_Route25:: @ 85A1039 - .string "ROUTE 25$" - -gMapName_ViridianForest:: @ 85A1042 - .string "VIRIDIAN FOREST$" - -gMapName_MtMoon:: @ 85A1052 - .string "MT. MOON$" - -gMapName_SSAnne:: @ 85A105B - .string "S.S. ANNE$" - -gMapName_UndergroundPath:: @ 85A1065 - .string "UNDERGROUND PATH$" - -gMapName_UndergroundPath2:: @ 85A1076 - .string "UNDERGROUND PATH$" - -gMapName_DiglettsCave:: @ 85A1087 - .string "DIGLETT’S CAVE$" - -gMapName_KantoVictoryRoad:: @ 85A1096 - .string "VICTORY ROAD$" - -gMapName_RocketHideout:: @ 85A10A3 - .string "ROCKET HIDEOUT$" - -gMapName_SilphCo:: @ 85A10B2 - .string "SILPH CO.$" - -gMapName_PokemonMansion:: @ 85A10BC - .string "POKéMON MANSION$" - -gMapName_KantoSafariZone:: @ 85A10CC - .string "SAFARI ZONE$" - -gMapName_PokemonLeague:: @ 85A10D8 - .string "POKéMON LEAGUE$" - -gMapName_RockTunnel:: @ 85A10E7 - .string "ROCK TUNNEL$" - -gMapName_SeafoamIslands:: @ 85A10F3 - .string "SEAFOAM ISLANDS$" - -gMapName_PokemonTower:: @ 85A1103 - .string "POKéMON TOWER$" - -gMapName_CeruleanCave:: @ 85A1111 - .string "CERULEAN CAVE$" - -gMapName_PowerPlant:: @ 85A111F - .string "POWER PLANT$" - -gMapName_OneIsland:: @ 85A112B - .string "ONE ISLAND$" - -gMapName_TwoIsland:: @ 85A1136 - .string "TWO ISLAND$" - -gMapName_ThreeIsland:: @ 85A1141 - .string "THREE ISLAND$" - -gMapName_FourIsland:: @ 85A114E - .string "FOUR ISLAND$" - -gMapName_FiveIsland:: @ 85A115A - .string "FIVE ISLAND$" - -gMapName_SevenIsland:: @ 85A1166 - .string "SEVEN ISLAND$" - -gMapName_SixIsland:: @ 85A1173 - .string "SIX ISLAND$" - -gMapName_KindleRoad:: @ 85A117E - .string "KINDLE ROAD$" - -gMapName_TreasureBeach:: @ 85A118A - .string "TREASURE BEACH$" - -gMapName_CapeBrink:: @ 85A1199 - .string "CAPE BRINK$" - -gMapName_BondBridge:: @ 85A11A4 - .string "BOND BRIDGE$" - -gMapName_ThreeIslePort:: @ 85A11B0 - .string "THREE ISLE PORT$" - -gMapName_SeviiIsle6:: @ 85A11C0 - .string "SEVII ISLE 6$" - -gMapName_SeviiIsle7:: @ 85A11CD - .string "SEVII ISLE 7$" - -gMapName_SeviiIsle8:: @ 85A11DA - .string "SEVII ISLE 8$" - -gMapName_SeviiIsle9:: @ 85A11E7 - .string "SEVII ISLE 9$" - -gMapName_ResortGorgeous:: @ 85A11F4 - .string "RESORT GORGEOUS$" - -gMapName_WaterLabyrinth:: @ 85A1204 - .string "WATER LABYRINTH$" - -gMapName_FiveIsleMeadow:: @ 85A1214 - .string "FIVE ISLE MEADOW$" - -gMapName_MemorialPillar:: @ 85A1225 - .string "MEMORIAL PILLAR$" - -gMapName_OutcastIsland:: @ 85A1235 - .string "OUTCAST ISLAND$" - -gMapName_GreenPath:: @ 85A1244 - .string "GREEN PATH$" - -gMapName_WaterPath:: @ 85A124F - .string "WATER PATH$" - -gMapName_RuinValley:: @ 85A125A - .string "RUIN VALLEY$" - -gMapName_TrainerTower:: @ 85A1266 - .string "TRAINER TOWER$" - -gMapName_CanyonEntrance:: @ 85A1274 - .string "CANYON ENTRANCE$" - -gMapName_SevaultCanyon:: @ 85A1284 - .string "SEVAULT CANYON$" - -gMapName_TanobyRuins:: @ 85A1293 - .string "TANOBY RUINS$" - -gMapName_SeviiIsle22:: @ 85A12A0 - .string "SEVII ISLE 22$" - -gMapName_SeviiIsle23:: @ 85A12AE - .string "SEVII ISLE 23$" - -gMapName_SeviiIsle24:: @ 85A12BC - .string "SEVII ISLE 24$" - -gMapName_NavelRock:: @ 85A12CA - .string "NAVEL ROCK$" - -gMapName_MtEmber:: @ 85A12D5 - .string "MT. EMBER$" - -gMapName_BerryForest:: @ 85A12DF - .string "BERRY FOREST$" - -gMapName_IcefallCave:: @ 85A12EC - .string "ICEFALL CAVE$" - -gMapName_RocketWarehouse:: @ 85A12F9 - .string "ROCKET WAREHOUSE$" - -gMapName_TrainerTower2:: @ 85A130A - .string "TRAINER TOWER$" - -gMapName_DottedHole:: @ 85A1318 - .string "DOTTED HOLE$" - -gMapName_LostCave:: @ 85A1324 - .string "LOST CAVE$" - -gMapName_PatternBush:: @ 85A132E - .string "PATTERN BUSH$" - -gMapName_AlteringCave:: @ 85A133B - .string "ALTERING CAVE$" - -gMapName_TanobyChambers:: @ 85A1349 - .string "TANOBY CHAMBERS$" - -gMapName_ThreeIslePath:: @ 85A1359 - .string "THREE ISLE PATH$" - -gMapName_TanobyKey:: @ 85A1369 - .string "TANOBY KEY$" - -gMapName_BirthIsland:: @ 85A1374 - .string "BIRTH ISLAND$" - -gMapName_MoneanChamber:: @ 85A1381 - .string "MONEAN CHAMBER$" - -gMapName_LiptooChamber:: @ 85A1390 - .string "LIPTOO CHAMBER$" - -gMapName_WeepthChamber:: @ 85A139F - .string "WEEPTH CHAMBER$" - -gMapName_DilfordChamber:: @ 85A13AE - .string "DILFORD CHAMBER$" - -gMapName_ScufibChamber:: @ 85A13BE - .string "SCUFIB CHAMBER$" - -gMapName_RixyChamber:: @ 85A13CD - .string "RIXY CHAMBER$" - -gMapName_ViapoisChamber:: @ 85A13DA - .string "VIAPOIS CHAMBER$" - -gMapName_EmberSpa:: @ 85A13EA - .string "EMBER SPA$" - -gMapName_SpecialArea:: @ 85A13F4 - .string "SPECIAL AREA$" - -gMapName_AquaHideout:: @ 85A1401 - .string "AQUA HIDEOUT$" - -gMapName_MagmaHideout:: @ 85A140E - .string "MAGMA HIDEOUT$" - -gMapName_MirageTower:: @ 85A141C - .string "MIRAGE TOWER$" - -gMapName_FarawayIsland:: @ 85A1429 - .string "FARAWAY ISLAND$" - -gMapName_ArtisanCave:: @ 85A1438 - .string "ARTISAN CAVE$" - -gMapName_MarineCave:: @ 85A1445 - .string "MARINE CAVE$" - -gMapName_TerraCave:: @ 85A1451 - .string "TERRA CAVE$" - -gMapName_DesertUnderpass:: @ 85A145C - .string "DESERT UNDERPASS$" - -gMapName_TrainerHill:: @ 85A146D - .string "TRAINER HILL$" - - .align 2 -gRegionMapEntries:: @ 85A147C - region_map_entry 4, 11, 1, 1, LittlerootTown - region_map_entry 4, 9, 1, 1, OldaleTown - region_map_entry 2, 14, 1, 1, DewfordTown - region_map_entry 5, 3, 1, 1, LavaridgeTown - region_map_entry 3, 0, 1, 1, FallarborTown - region_map_entry 4, 6, 1, 1, VerdanturfTown - region_map_entry 17, 10, 1, 1, PacifidlogTown - region_map_entry 1, 9, 1, 1, PetalburgCity - region_map_entry 8, 10, 1, 2, SlateportCity - region_map_entry 8, 6, 2, 1, MauvilleCity - region_map_entry 0, 5, 1, 2, RustboroCity - region_map_entry 12, 0, 1, 1, FortreeCity - region_map_entry 18, 3, 2, 1, LilycoveCity - region_map_entry 24, 5, 2, 1, MossdeepCity - region_map_entry 21, 7, 1, 1, SootopolisCity - region_map_entry 27, 8, 1, 2, EverGrandeCity - region_map_entry 4, 10, 1, 1, Route101 - region_map_entry 2, 9, 2, 1, Route102 - region_map_entry 4, 8, 4, 1, Route103 - region_map_entry 0, 7, 1, 3, Route104 - region_map_entry 0, 10, 1, 3, Route105 - region_map_entry 0, 13, 2, 1, Route106 - region_map_entry 3, 14, 3, 1, Route107 - region_map_entry 6, 14, 2, 1, Route108 - region_map_entry 8, 12, 1, 3, Route109 - region_map_entry 8, 7, 1, 3, Route110 - region_map_entry 8, 0, 1, 6, Route111 - region_map_entry 6, 3, 2, 1, Route112 - region_map_entry 4, 0, 4, 1, Route113 - region_map_entry 1, 0, 2, 3, Route114 - region_map_entry 0, 2, 1, 3, Route115 - region_map_entry 1, 5, 4, 1, Route116 - region_map_entry 5, 6, 3, 1, Route117 - region_map_entry 10, 6, 2, 1, Route118 - region_map_entry 11, 0, 1, 6, Route119 - region_map_entry 13, 0, 1, 4, Route120 - region_map_entry 14, 3, 4, 1, Route121 - region_map_entry 16, 4, 1, 2, Route122 - region_map_entry 12, 6, 5, 1, Route123 - region_map_entry 20, 3, 4, 3, Route124 - region_map_entry 24, 3, 2, 2, Route125 - region_map_entry 20, 6, 3, 3, Route126 - region_map_entry 23, 6, 3, 3, Route127 - region_map_entry 23, 9, 4, 1, Route128 - region_map_entry 24, 10, 2, 1, Route129 - region_map_entry 21, 10, 3, 1, Route130 - region_map_entry 18, 10, 3, 1, Route131 - region_map_entry 15, 10, 2, 1, Route132 - region_map_entry 12, 10, 3, 1, Route133 - region_map_entry 9, 10, 3, 1, Route134 - region_map_entry 20, 3, 4, 3, Underwater - region_map_entry 20, 6, 3, 3, Underwater - region_map_entry 23, 6, 3, 3, Underwater - region_map_entry 23, 9, 4, 1, Underwater - region_map_entry 21, 7, 1, 1, Underwater - region_map_entry 1, 13, 1, 1, GraniteCave - region_map_entry 6, 2, 1, 1, MtChimney - region_map_entry 16, 2, 1, 1, SafariZone - region_map_entry 22, 12, 1, 1, BattleFrontier - region_map_entry 0, 8, 1, 1, PetalburgWoods - region_map_entry 2, 5, 1, 1, RusturfTunnel - region_map_entry 6, 14, 1, 1, AbandonedShip - region_map_entry 8, 7, 1, 1, NewMauville - region_map_entry 0, 3, 1, 1, MeteorFalls - region_map_entry 1, 2, 1, 1, MeteorFalls - region_map_entry 16, 4, 1, 1, MtPyre - region_map_entry 19, 3, 1, 1, AquaHideoutOld - region_map_entry 24, 4, 1, 1, ShoalCave - region_map_entry 24, 9, 1, 1, SeafloorCavern - region_map_entry 24, 9, 1, 1, Underwater - region_map_entry 27, 9, 1, 1, VictoryRoad - region_map_entry 17, 10, 1, 1, MirageIsland - region_map_entry 21, 7, 1, 1, CaveOfOrigin - region_map_entry 12, 14, 1, 1, SouthernIsland - region_map_entry 6, 3, 1, 1, FieryPath - region_map_entry 7, 3, 1, 1, FieryPath - region_map_entry 6, 3, 1, 1, JaggedPass - region_map_entry 7, 2, 1, 1, JaggedPass - region_map_entry 11, 10, 1, 1, SealedChamber - region_map_entry 11, 10, 1, 1, Underwater - region_map_entry 13, 0, 1, 1, ScorchedSlab - region_map_entry 0, 10, 1, 1, IslandCave - region_map_entry 8, 3, 1, 1, DesertRuins - region_map_entry 13, 2, 1, 1, AncientTomb - region_map_entry 0, 0, 1, 1, InsideOfTruck - region_map_entry 19, 10, 1, 1, SkyPillar - region_map_entry 0, 0, 1, 1, SecretBase - region_map_entry 0, 0, 1, 1, None - region_map_entry 0, 0, 1, 1, PalletTown - region_map_entry 0, 0, 1, 1, ViridianCity - region_map_entry 0, 0, 1, 1, PewterCity - region_map_entry 0, 0, 1, 1, CeruleanCity - region_map_entry 0, 0, 1, 1, LavenderTown - region_map_entry 0, 0, 1, 1, VermilionCity - region_map_entry 0, 0, 1, 1, CeladonCity - region_map_entry 0, 0, 1, 1, FuchsiaCity - region_map_entry 0, 0, 1, 1, CinnabarIsland - region_map_entry 0, 0, 1, 1, IndigoPlateau - region_map_entry 0, 0, 1, 1, SaffronCity - region_map_entry 0, 0, 1, 1, Route4 - region_map_entry 0, 0, 1, 1, Route10 - region_map_entry 0, 0, 1, 1, Route1 - region_map_entry 0, 0, 1, 1, Route2 - region_map_entry 0, 0, 1, 1, Route3 - region_map_entry 0, 0, 1, 1, Route4_2 - region_map_entry 0, 0, 1, 1, Route5 - region_map_entry 0, 0, 1, 1, Route6 - region_map_entry 0, 0, 1, 1, Route7 - region_map_entry 0, 0, 1, 1, Route8 - region_map_entry 0, 0, 1, 1, Route9 - region_map_entry 0, 0, 1, 1, Route10_2 - region_map_entry 0, 0, 1, 1, Route11 - region_map_entry 0, 0, 1, 1, Route12 - region_map_entry 0, 0, 1, 1, Route13 - region_map_entry 0, 0, 1, 1, Route14 - region_map_entry 0, 0, 1, 1, Route15 - region_map_entry 0, 0, 1, 1, Route16 - region_map_entry 0, 0, 1, 1, Route17 - region_map_entry 0, 0, 1, 1, Route18 - region_map_entry 0, 0, 1, 1, Route19 - region_map_entry 0, 0, 1, 1, Route20 - region_map_entry 0, 0, 1, 1, Route21 - region_map_entry 0, 0, 1, 1, Route22 - region_map_entry 0, 0, 1, 1, Route23 - region_map_entry 0, 0, 1, 1, Route24 - region_map_entry 0, 0, 1, 1, Route25 - region_map_entry 0, 0, 1, 1, ViridianForest - region_map_entry 0, 0, 1, 1, MtMoon - region_map_entry 0, 0, 1, 1, SSAnne - region_map_entry 0, 0, 1, 1, UndergroundPath - region_map_entry 0, 0, 1, 1, UndergroundPath2 - region_map_entry 0, 0, 1, 1, DiglettsCave - region_map_entry 0, 0, 1, 1, KantoVictoryRoad - region_map_entry 0, 0, 1, 1, RocketHideout - region_map_entry 0, 0, 1, 1, SilphCo - region_map_entry 0, 0, 1, 1, PokemonMansion - region_map_entry 0, 0, 1, 1, KantoSafariZone - region_map_entry 0, 0, 1, 1, PokemonLeague - region_map_entry 0, 0, 1, 1, RockTunnel - region_map_entry 0, 0, 1, 1, SeafoamIslands - region_map_entry 0, 0, 1, 1, PokemonTower - region_map_entry 0, 0, 1, 1, CeruleanCave - region_map_entry 0, 0, 1, 1, PowerPlant - region_map_entry 0, 0, 1, 1, OneIsland - region_map_entry 0, 0, 1, 1, TwoIsland - region_map_entry 0, 0, 1, 1, ThreeIsland - region_map_entry 0, 0, 1, 1, FourIsland - region_map_entry 0, 0, 1, 1, FiveIsland - region_map_entry 0, 0, 1, 1, SevenIsland - region_map_entry 0, 0, 1, 1, SixIsland - region_map_entry 0, 0, 1, 1, KindleRoad - region_map_entry 0, 0, 1, 1, TreasureBeach - region_map_entry 0, 0, 1, 1, CapeBrink - region_map_entry 0, 0, 1, 1, BondBridge - region_map_entry 0, 0, 1, 1, ThreeIslePort - region_map_entry 0, 0, 1, 1, SeviiIsle6 - region_map_entry 0, 0, 1, 1, SeviiIsle7 - region_map_entry 0, 0, 1, 1, SeviiIsle8 - region_map_entry 0, 0, 1, 1, SeviiIsle9 - region_map_entry 0, 0, 1, 1, ResortGorgeous - region_map_entry 0, 0, 1, 1, WaterLabyrinth - region_map_entry 0, 0, 1, 1, FiveIsleMeadow - region_map_entry 0, 0, 1, 1, MemorialPillar - region_map_entry 0, 0, 1, 1, OutcastIsland - region_map_entry 0, 0, 1, 1, GreenPath - region_map_entry 0, 0, 1, 1, WaterPath - region_map_entry 0, 0, 1, 1, RuinValley - region_map_entry 0, 0, 1, 1, TrainerTower - region_map_entry 0, 0, 1, 1, CanyonEntrance - region_map_entry 0, 0, 1, 1, SevaultCanyon - region_map_entry 0, 0, 1, 1, TanobyRuins - region_map_entry 0, 0, 1, 1, SeviiIsle22 - region_map_entry 0, 0, 1, 1, SeviiIsle23 - region_map_entry 0, 0, 1, 1, SeviiIsle24 - region_map_entry 0, 0, 1, 1, NavelRock - region_map_entry 0, 0, 1, 1, MtEmber - region_map_entry 0, 0, 1, 1, BerryForest - region_map_entry 0, 0, 1, 1, IcefallCave - region_map_entry 0, 0, 1, 1, RocketWarehouse - region_map_entry 0, 0, 1, 1, TrainerTower2 - region_map_entry 0, 0, 1, 1, DottedHole - region_map_entry 0, 0, 1, 1, LostCave - region_map_entry 0, 0, 1, 1, PatternBush - region_map_entry 0, 0, 1, 1, AlteringCave - region_map_entry 0, 0, 1, 1, TanobyChambers - region_map_entry 0, 0, 1, 1, ThreeIslePath - region_map_entry 0, 0, 1, 1, TanobyKey - region_map_entry 0, 0, 1, 1, BirthIsland - region_map_entry 0, 0, 1, 1, MoneanChamber - region_map_entry 0, 0, 1, 1, LiptooChamber - region_map_entry 0, 0, 1, 1, WeepthChamber - region_map_entry 0, 0, 1, 1, DilfordChamber - region_map_entry 0, 0, 1, 1, ScufibChamber - region_map_entry 0, 0, 1, 1, RixyChamber - region_map_entry 0, 0, 1, 1, ViapoisChamber - region_map_entry 0, 0, 1, 1, EmberSpa - region_map_entry 0, 0, 1, 1, SpecialArea - region_map_entry 19, 3, 1, 1, AquaHideout - region_map_entry 6, 3, 1, 1, MagmaHideout - region_map_entry 8, 2, 1, 1, MirageTower - region_map_entry 0, 0, 1, 1, BirthIsland - region_map_entry 0, 0, 1, 1, FarawayIsland - region_map_entry 22, 12, 1, 1, ArtisanCave - region_map_entry 0, 0, 1, 1, MarineCave - region_map_entry 0, 0, 1, 1, Underwater - region_map_entry 0, 0, 1, 1, TerraCave - region_map_entry 0, 10, 1, 3, Underwater - region_map_entry 24, 3, 2, 2, Underwater - region_map_entry 24, 10, 2, 1, Underwater - region_map_entry 2, 0, 1, 1, DesertUnderpass - region_map_entry 6, 8, 1, 1, AlteringCave - region_map_entry 0, 0, 1, 1, NavelRock - region_map_entry 8, 4, 1, 1, TrainerHill diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index c38305f20..71e3303b5 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1058,7 +1058,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F end OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626 - specialvar VAR_RESULT, sub_80C7008 + specialvar VAR_RESULT, CountPartyNonEggMons compare_var_to_value VAR_RESULT, 2 goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27764C specialvar VAR_RESULT, sub_80F9370 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 63ebafe4f..a7000460b 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -95,7 +95,7 @@ Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11 end Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 - specialvar VAR_RESULT, sub_80C7008 + specialvar VAR_RESULT, CountPartyNonEggMons compare_var_to_value VAR_RESULT, 1 goto_eq Route117_PokemonDayCare_EventScript_291DED specialvar VAR_RESULT, sub_80722E0 @@ -107,7 +107,7 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56 waitstate compare_var_to_value VAR_0x8004, 255 goto_eq Route117_PokemonDayCare_EventScript_291DCA - specialvar VAR_RESULT, sub_80C70AC + specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot compare_var_to_value VAR_RESULT, 0 goto_eq Route117_PokemonDayCare_EventScript_291DF7 specialvar VAR_0x8005, sub_8070C58 diff --git a/data/specials.inc b/data/specials.inc index 49f6b91a0..d9cfcc6b0 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -142,8 +142,8 @@ gSpecials:: @ 81DBA64 def_special sub_8122A30 def_special sub_80D6EDC def_special CalculatePlayerPartyCount - def_special sub_80C7008 - def_special sub_80C70AC + def_special CountPartyNonEggMons + def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot def_special sub_80F88E8 def_special sub_80F88DC def_special sub_80F8864 diff --git a/data/strings.s b/data/strings.s index b858e2d52..641b84c4a 100644 --- a/data/strings.s +++ b/data/strings.s @@ -3150,10 +3150,10 @@ gText_SelectTheAnswer:: @ 85EC752 gText_LyricsCantBeDeleted:: @ 85EC765 .string "The lyrics can’t be deleted.$" -gUnknown_085EC782:: @ 85EC782 +gText_PokemonLeague:: @ 85EC782 .string "POKéMON LEAGUE$" -gUnknown_085EC791:: @ 85EC791 +gText_PokemonCenter:: @ 85EC791 .string "POKéMON CENTER$" gText_GetsAPokeBlockQuestion:: @ 85EC7A0 |