diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-11-27 21:29:47 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 21:29:47 -0600 |
| commit | 61e0c62d2d2dbeba13aaeb49b89c9773b25f84b7 (patch) | |
| tree | d47f2074501d4e55e9a5b4b36fd6715f736d850d | |
| parent | b6934e4429a269240d2266663e1c3f75505e3d09 (diff) | |
| parent | 749ec00514ecedb822dbc9bab4dde32193e727c6 (diff) | |
Merge pull request #480 from camthesaxman/wild_encounter_data
convert wild_encounter data to C
40 files changed, 861 insertions, 773 deletions
diff --git a/asm/macros/map.inc b/asm/macros/map.inc index 41844b5cd..fd417fe9d 100644 --- a/asm/macros/map.inc +++ b/asm/macros/map.inc @@ -27,12 +27,6 @@ .space 2 .endm - .equiv GROUP_NONE, 0x7f - .equiv MAP_NONE, 0x7f - - .equiv GROUP_UNDEFINED, 0xff - .equiv MAP_UNDEFINED, 0xff - .macro map_script type, address .byte \type .4byte \address diff --git a/constants/map_constants.inc b/constants/map_constants.inc index 6d92c5e65..91f5f029c 100644 --- a/constants/map_constants.inc +++ b/constants/map_constants.inc @@ -461,4 +461,9 @@ new_map_group map_group Route124_DivingTreasureHuntersHouse @ 33.0 + + .set MAP_None, 0x7F + .set GROUP_None, 0x7F + .set MAP_Undefined, 0xFF + .set GROUP_Undefined, 0xFF diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 9ab639587..c5def2c8d 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -4915,7 +4915,7 @@ S_FallDownHole:: @ 81C6BC5 waitmovement 0 playse 43 delay 60 - warphole UNDEFINED + warphole Undefined waitstate end diff --git a/data/event_scripts.s b/data/event_scripts.s index faa9b8406..ebc1a0de8 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -4883,7 +4883,7 @@ S_FallDownHole:: @ 81C6BC5 waitmovement 0 playse 43 delay 60 - warphole UNDEFINED + warphole Undefined waitstate end diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/events/DoubleBattleColosseum.inc index f6142c4b4..a1dd533c1 100644 --- a/data/maps/events/DoubleBattleColosseum.inc +++ b/data/maps/events/DoubleBattleColosseum.inc @@ -1,8 +1,8 @@ DoubleBattleColosseum_MapWarps:: @ 8391428 - warp_def 5, 8, 3, 127, NONE - warp_def 6, 8, 3, 127, NONE - warp_def 7, 8, 3, 127, NONE - warp_def 8, 8, 3, 127, NONE + warp_def 5, 8, 3, 127, None + warp_def 6, 8, 3, 127, None + warp_def 7, 8, 3, 127, None + warp_def 8, 8, 3, 127, None DoubleBattleColosseum_MapCoordEvents:: @ 8391448 coord_event 3, 4, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A4383 diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc index faf7a5274..7656e2679 100644 --- a/data/maps/events/InsideOfTruck.inc +++ b/data/maps/events/InsideOfTruck.inc @@ -4,9 +4,9 @@ InsideOfTruck_MapObjects:: @ 8391618 object_event 3, MAP_OBJ_GFX_MOVING_BOX, 0, 2, 0, 3, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0 InsideOfTruck_MapWarps:: @ 8391660 - warp_def 4, 1, 0, 127, NONE - warp_def 4, 2, 0, 127, NONE - warp_def 4, 3, 0, 127, NONE + warp_def 4, 1, 0, 127, None + warp_def 4, 2, 0, 127, None + warp_def 4, 3, 0, 127, None InsideOfTruck_MapCoordEvents:: @ 8391678 coord_event 3, 1, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc index 896a96649..d35f50db9 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc @@ -2,8 +2,8 @@ LilycoveCity_DepartmentStoreElevator_MapObjects:: @ 838A624 object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0, 0, 0 LilycoveCity_DepartmentStoreElevator_MapWarps:: @ 838A63C - warp_def 1, 5, 3, 127, NONE - warp_def 2, 5, 3, 127, NONE + warp_def 1, 5, 3, 127, None + warp_def 2, 5, 3, 127, None LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 838A64C map_events LilycoveCity_DepartmentStoreElevator_MapObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc index 7062f61ea..6ef149ab4 100644 --- a/data/maps/events/RecordCorner.inc +++ b/data/maps/events/RecordCorner.inc @@ -2,10 +2,10 @@ RecordCorner_MapObjects:: @ 839139C object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 10, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0, 0, 0 RecordCorner_MapWarps:: @ 83913B4 - warp_def 8, 9, 3, 127, NONE - warp_def 9, 9, 3, 127, NONE - warp_def 11, 9, 3, 127, NONE - warp_def 10, 9, 3, 127, NONE + warp_def 8, 9, 3, 127, None + warp_def 9, 9, 3, 127, None + warp_def 11, 9, 3, 127, None + warp_def 10, 9, 3, 127, None RecordCorner_MapCoordEvents:: @ 83913D4 coord_event 6, 4, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A4418 diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc index 25bab40da..dd73f50a8 100644 --- a/data/maps/events/SecretBase_BlueCave1.inc +++ b/data/maps/events/SecretBase_BlueCave1.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave1_MapObjects:: @ 838F18C object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave1_MapWarps:: @ 838F2F4 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, None SecretBase_BlueCave1_MapEvents:: @ 838F2FC map_events SecretBase_BlueCave1_MapObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc index a7eac24a4..9b2b6e885 100644 --- a/data/maps/events/SecretBase_BlueCave2.inc +++ b/data/maps/events/SecretBase_BlueCave2.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave2_MapObjects:: @ 838FAA4 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave2_MapWarps:: @ 838FC0C - warp_def 7, 5, 0, 126, NONE + warp_def 7, 5, 0, 126, None SecretBase_BlueCave2_MapEvents:: @ 838FC14 map_events SecretBase_BlueCave2_MapObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc index 202c2bc4e..dd37c2ac5 100644 --- a/data/maps/events/SecretBase_BlueCave3.inc +++ b/data/maps/events/SecretBase_BlueCave3.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave3_MapObjects:: @ 83903BC object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave3_MapWarps:: @ 8390524 - warp_def 4, 15, 0, 126, NONE + warp_def 4, 15, 0, 126, None SecretBase_BlueCave3_MapEvents:: @ 839052C map_events SecretBase_BlueCave3_MapObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc index 2975c0b37..23ec030e7 100644 --- a/data/maps/events/SecretBase_BlueCave4.inc +++ b/data/maps/events/SecretBase_BlueCave4.inc @@ -16,7 +16,7 @@ SecretBase_BlueCave4_MapObjects:: @ 8390CD4 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BlueCave4_MapWarps:: @ 8390E3C - warp_def 4, 15, 0, 126, NONE + warp_def 4, 15, 0, 126, None SecretBase_BlueCave4_MapEvents:: @ 8390E44 map_events SecretBase_BlueCave4_MapObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc index 31e2d0117..0fcac5940 100644 --- a/data/maps/events/SecretBase_BrownCave1.inc +++ b/data/maps/events/SecretBase_BrownCave1.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave1_MapObjects:: @ 838F008 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave1_MapWarps:: @ 838F170 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, None SecretBase_BrownCave1_MapEvents:: @ 838F178 map_events SecretBase_BrownCave1_MapObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc index 93f9a3c03..c305485b8 100644 --- a/data/maps/events/SecretBase_BrownCave2.inc +++ b/data/maps/events/SecretBase_BrownCave2.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave2_MapObjects:: @ 838F920 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave2_MapWarps:: @ 838FA88 - warp_def 1, 7, 0, 126, NONE + warp_def 1, 7, 0, 126, None SecretBase_BrownCave2_MapEvents:: @ 838FA90 map_events SecretBase_BrownCave2_MapObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc index 5aa5aed7a..65b38542f 100644 --- a/data/maps/events/SecretBase_BrownCave3.inc +++ b/data/maps/events/SecretBase_BrownCave3.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave3_MapObjects:: @ 8390238 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave3_MapWarps:: @ 83903A0 - warp_def 11, 9, 0, 126, NONE + warp_def 11, 9, 0, 126, None SecretBase_BrownCave3_MapEvents:: @ 83903A8 map_events SecretBase_BrownCave3_MapObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc index fc66e8fb5..782671574 100644 --- a/data/maps/events/SecretBase_BrownCave4.inc +++ b/data/maps/events/SecretBase_BrownCave4.inc @@ -16,7 +16,7 @@ SecretBase_BrownCave4_MapObjects:: @ 8390B50 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_BrownCave4_MapWarps:: @ 8390CB8 - warp_def 2, 8, 0, 126, NONE + warp_def 2, 8, 0, 126, None SecretBase_BrownCave4_MapEvents:: @ 8390CC0 map_events SecretBase_BrownCave4_MapObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc index dbc8c7593..b30608dbc 100644 --- a/data/maps/events/SecretBase_RedCave1.inc +++ b/data/maps/events/SecretBase_RedCave1.inc @@ -16,7 +16,7 @@ SecretBase_RedCave1_MapObjects:: @ 838EE84 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave1_MapWarps:: @ 838EFEC - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, None SecretBase_RedCave1_MapEvents:: @ 838EFF4 map_events SecretBase_RedCave1_MapObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc index 910b2c074..eb247278b 100644 --- a/data/maps/events/SecretBase_RedCave2.inc +++ b/data/maps/events/SecretBase_RedCave2.inc @@ -16,7 +16,7 @@ SecretBase_RedCave2_MapObjects:: @ 838F79C object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave2_MapWarps:: @ 838F904 - warp_def 3, 14, 0, 126, NONE + warp_def 3, 14, 0, 126, None SecretBase_RedCave2_MapEvents:: @ 838F90C map_events SecretBase_RedCave2_MapObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc index 8745b272f..f71021236 100644 --- a/data/maps/events/SecretBase_RedCave3.inc +++ b/data/maps/events/SecretBase_RedCave3.inc @@ -16,7 +16,7 @@ SecretBase_RedCave3_MapObjects:: @ 83900B4 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave3_MapWarps:: @ 839021C - warp_def 3, 6, 0, 126, NONE + warp_def 3, 6, 0, 126, None SecretBase_RedCave3_MapEvents:: @ 8390224 map_events SecretBase_RedCave3_MapObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc index 60928ef5c..2ed7c8af5 100644 --- a/data/maps/events/SecretBase_RedCave4.inc +++ b/data/maps/events/SecretBase_RedCave4.inc @@ -16,7 +16,7 @@ SecretBase_RedCave4_MapObjects:: @ 83909CC object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_RedCave4_MapWarps:: @ 8390B34 - warp_def 2, 12, 0, 126, NONE + warp_def 2, 12, 0, 126, None SecretBase_RedCave4_MapEvents:: @ 8390B3C map_events SecretBase_RedCave4_MapObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc index 17c2f2530..23387eede 100644 --- a/data/maps/events/SecretBase_Shrub1.inc +++ b/data/maps/events/SecretBase_Shrub1.inc @@ -16,7 +16,7 @@ SecretBase_Shrub1_MapObjects:: @ 838F618 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub1_MapWarps:: @ 838F780 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, None SecretBase_Shrub1_MapEvents:: @ 838F788 map_events SecretBase_Shrub1_MapObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc index 6b973e730..090a9b0d6 100644 --- a/data/maps/events/SecretBase_Shrub2.inc +++ b/data/maps/events/SecretBase_Shrub2.inc @@ -16,7 +16,7 @@ SecretBase_Shrub2_MapObjects:: @ 838FF30 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub2_MapWarps:: @ 8390098 - warp_def 7, 5, 0, 126, NONE + warp_def 7, 5, 0, 126, None SecretBase_Shrub2_MapEvents:: @ 83900A0 map_events SecretBase_Shrub2_MapObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc index 12e2c7c81..7f4370f2d 100644 --- a/data/maps/events/SecretBase_Shrub3.inc +++ b/data/maps/events/SecretBase_Shrub3.inc @@ -16,7 +16,7 @@ SecretBase_Shrub3_MapObjects:: @ 8390848 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub3_MapWarps:: @ 83909B0 - warp_def 6, 9, 0, 126, NONE + warp_def 6, 9, 0, 126, None SecretBase_Shrub3_MapEvents:: @ 83909B8 map_events SecretBase_Shrub3_MapObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc index bd3b94522..6aa04277c 100644 --- a/data/maps/events/SecretBase_Shrub4.inc +++ b/data/maps/events/SecretBase_Shrub4.inc @@ -16,7 +16,7 @@ SecretBase_Shrub4_MapObjects:: @ 8391160 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Shrub4_MapWarps:: @ 83912C8 - warp_def 11, 8, 0, 126, NONE + warp_def 11, 8, 0, 126, None SecretBase_Shrub4_MapEvents:: @ 83912D0 map_events SecretBase_Shrub4_MapObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc index 465a0d2be..a5d9e2fad 100644 --- a/data/maps/events/SecretBase_Tree1.inc +++ b/data/maps/events/SecretBase_Tree1.inc @@ -16,7 +16,7 @@ SecretBase_Tree1_MapObjects:: @ 838F494 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree1_MapWarps:: @ 838F5FC - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, None SecretBase_Tree1_MapEvents:: @ 838F604 map_events SecretBase_Tree1_MapObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc index d780ed779..8089c6605 100644 --- a/data/maps/events/SecretBase_Tree2.inc +++ b/data/maps/events/SecretBase_Tree2.inc @@ -16,7 +16,7 @@ SecretBase_Tree2_MapObjects:: @ 838FDAC object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree2_MapWarps:: @ 838FF14 - warp_def 3, 14, 0, 126, NONE + warp_def 3, 14, 0, 126, None SecretBase_Tree2_MapEvents:: @ 838FF1C map_events SecretBase_Tree2_MapObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc index 0c8888764..a77f56364 100644 --- a/data/maps/events/SecretBase_Tree3.inc +++ b/data/maps/events/SecretBase_Tree3.inc @@ -16,7 +16,7 @@ SecretBase_Tree3_MapObjects:: @ 83906C4 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree3_MapWarps:: @ 839082C - warp_def 8, 6, 0, 126, NONE + warp_def 8, 6, 0, 126, None SecretBase_Tree3_MapEvents:: @ 8390834 map_events SecretBase_Tree3_MapObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc index 675ee1b8e..c687e3e48 100644 --- a/data/maps/events/SecretBase_Tree4.inc +++ b/data/maps/events/SecretBase_Tree4.inc @@ -16,7 +16,7 @@ SecretBase_Tree4_MapObjects:: @ 8390FDC object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_Tree4_MapWarps:: @ 8391144 - warp_def 7, 12, 0, 126, NONE + warp_def 7, 12, 0, 126, None SecretBase_Tree4_MapEvents:: @ 839114C map_events SecretBase_Tree4_MapObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc index 8c6999f9b..8d8e2bece 100644 --- a/data/maps/events/SecretBase_YellowCave1.inc +++ b/data/maps/events/SecretBase_YellowCave1.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave1_MapObjects:: @ 838F310 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave1_MapWarps:: @ 838F478 - warp_def 5, 7, 0, 126, NONE + warp_def 5, 7, 0, 126, None SecretBase_YellowCave1_MapEvents:: @ 838F480 map_events SecretBase_YellowCave1_MapObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc index 8825836bf..99cef474a 100644 --- a/data/maps/events/SecretBase_YellowCave2.inc +++ b/data/maps/events/SecretBase_YellowCave2.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave2_MapObjects:: @ 838FC28 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave2_MapWarps:: @ 838FD90 - warp_def 12, 7, 0, 126, NONE + warp_def 12, 7, 0, 126, None SecretBase_YellowCave2_MapEvents:: @ 838FD98 map_events SecretBase_YellowCave2_MapObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc index a88e44190..82eef2946 100644 --- a/data/maps/events/SecretBase_YellowCave3.inc +++ b/data/maps/events/SecretBase_YellowCave3.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave3_MapObjects:: @ 8390540 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave3_MapWarps:: @ 83906A8 - warp_def 5, 9, 0, 126, NONE + warp_def 5, 9, 0, 126, None SecretBase_YellowCave3_MapEvents:: @ 83906B0 map_events SecretBase_YellowCave3_MapObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc index 0280e088a..545f65e04 100644 --- a/data/maps/events/SecretBase_YellowCave4.inc +++ b/data/maps/events/SecretBase_YellowCave4.inc @@ -16,7 +16,7 @@ SecretBase_YellowCave4_MapObjects:: @ 8390E58 object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 SecretBase_YellowCave4_MapWarps:: @ 8390FC0 - warp_def 6, 12, 0, 126, NONE + warp_def 6, 12, 0, 126, None SecretBase_YellowCave4_MapEvents:: @ 8390FC8 map_events SecretBase_YellowCave4_MapObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc index 1d4b51476..68615ad3e 100644 --- a/data/maps/events/SingleBattleColosseum.inc +++ b/data/maps/events/SingleBattleColosseum.inc @@ -2,8 +2,8 @@ SingleBattleColosseum_MapObjects:: @ 83912E4 object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0, 0, 0 SingleBattleColosseum_MapWarps:: @ 83912FC - warp_def 6, 8, 3, 127, NONE - warp_def 7, 8, 3, 127, NONE + warp_def 6, 8, 3, 127, None + warp_def 7, 8, 3, 127, None SingleBattleColosseum_MapCoordEvents:: @ 839130C coord_event 3, 5, 3, 0, 0x4000, 0, 0, SingleBattleColosseum_EventScript_1A436F diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc index 8c5ff5578..f49e755f3 100644 --- a/data/maps/events/TradeCenter.inc +++ b/data/maps/events/TradeCenter.inc @@ -2,8 +2,8 @@ TradeCenter_MapObjects:: @ 8391340 object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0, 0, 0 TradeCenter_MapWarps:: @ 8391358 - warp_def 5, 8, 3, 127, NONE - warp_def 6, 8, 3, 127, NONE + warp_def 5, 8, 3, 127, None + warp_def 6, 8, 3, 127, None TradeCenter_MapCoordEvents:: @ 8391368 coord_event 4, 5, 3, 0, 0x4000, 0, 0, TradeCenter_EventScript_1A43F0 diff --git a/data/wild_encounter.s b/data/wild_encounter.s deleted file mode 100644 index b906a21f1..000000000 --- a/data/wild_encounter.s +++ /dev/null @@ -1,20 +0,0 @@ -#include "constants/maps.h" -#include "constants/species.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ 839B540 - .include "data/wild_mons.inc" - - .align 2 -gWildFeebasRoute119Data:: @ 839DBFC - .byte 20, 25 @ Min/Max level - .2byte SPECIES_FEEBAS - - .align 2 -gRoute119WaterTileData:: @ 839DC00 - .2byte 0x0, 0x2D, 0x0 - .2byte 0x2E, 0x5B, 0x83 - .2byte 0x5C, 0x8B, 0x12A diff --git a/data/wild_mons.inc b/data/wild_mons.inc deleted file mode 100644 index 01ebd8a16..000000000 --- a/data/wild_mons.inc +++ /dev/null @@ -1,688 +0,0 @@ - - .align 2 -gWildMonHeaders:: - map PetalburgCity - .2byte 0 @ padding - .4byte NULL - .4byte PetalburgCity_WaterMonsInfo - .4byte NULL - .4byte PetalburgCity_FishingMonsInfo - - map SlateportCity - .2byte 0 @ padding - .4byte NULL - .4byte SlateportCity_WaterMonsInfo - .4byte NULL - .4byte SlateportCity_FishingMonsInfo - - map LilycoveCity - .2byte 0 @ padding - .4byte NULL - .4byte LilycoveCity_WaterMonsInfo - .4byte NULL - .4byte LilycoveCity_FishingMonsInfo - - map MossdeepCity - .2byte 0 @ padding - .4byte NULL - .4byte MossdeepCity_WaterMonsInfo - .4byte NULL - .4byte MossdeepCity_FishingMonsInfo - - map SootopolisCity - .2byte 0 @ padding - .4byte NULL - .4byte SootopolisCity_WaterMonsInfo - .4byte NULL - .4byte SootopolisCity_FishingMonsInfo - - map EverGrandeCity - .2byte 0 @ padding - .4byte NULL - .4byte EverGrandeCity_WaterMonsInfo - .4byte NULL - .4byte EverGrandeCity_FishingMonsInfo - - map MeteorFalls_1F_1R - .2byte 0 @ padding - .4byte MeteorFalls_1F_1R_LandMonsInfo - .4byte MeteorFalls_1F_1R_WaterMonsInfo - .4byte NULL - .4byte MeteorFalls_1F_1R_FishingMonsInfo - - map MeteorFalls_1F_2R - .2byte 0 @ padding - .4byte MeteorFalls_1F_2R_LandMonsInfo - .4byte MeteorFalls_1F_2R_WaterMonsInfo - .4byte NULL - .4byte MeteorFalls_1F_2R_FishingMonsInfo - - map MeteorFalls_B1F_1R - .2byte 0 @ padding - .4byte MeteorFalls_B1F_1R_LandMonsInfo - .4byte MeteorFalls_B1F_1R_WaterMonsInfo - .4byte NULL - .4byte MeteorFalls_B1F_1R_FishingMonsInfo - - map MeteorFalls_B1F_2R - .2byte 0 @ padding - .4byte MeteorFalls_B1F_2R_LandMonsInfo - .4byte MeteorFalls_B1F_2R_WaterMonsInfo - .4byte NULL - .4byte MeteorFalls_B1F_2R_FishingMonsInfo - - map RusturfTunnel - .2byte 0 @ padding - .4byte RusturfTunnel_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map GraniteCave_1F - .2byte 0 @ padding - .4byte GraniteCave_1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map GraniteCave_B1F - .2byte 0 @ padding - .4byte GraniteCave_B1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map GraniteCave_B2F - .2byte 0 @ padding - .4byte GraniteCave_B2F_LandMonsInfo - .4byte NULL - .4byte GraniteCave_B2F_RockSmashMonsInfo - .4byte NULL - - map GraniteCave_StevensRoom - .2byte 0 @ padding - .4byte GraniteCave_StevensRoom_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map PetalburgWoods - .2byte 0 @ padding - .4byte PetalburgWoods_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map JaggedPass - .2byte 0 @ padding - .4byte JaggedPass_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map FieryPath - .2byte 0 @ padding - .4byte FieryPath_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_1F - .2byte 0 @ padding - .4byte MtPyre_1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_2F - .2byte 0 @ padding - .4byte MtPyre_2F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_3F - .2byte 0 @ padding - .4byte MtPyre_3F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_4F - .2byte 0 @ padding - .4byte MtPyre_4F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_5F - .2byte 0 @ padding - .4byte MtPyre_5F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_6F - .2byte 0 @ padding - .4byte MtPyre_6F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_Exterior - .2byte 0 @ padding - .4byte MtPyre_Exterior_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map MtPyre_Summit - .2byte 0 @ padding - .4byte MtPyre_Summit_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Entrance - .2byte 0 @ padding - .4byte NULL - .4byte SeafloorCavern_Entrance_WaterMonsInfo - .4byte NULL - .4byte SeafloorCavern_Entrance_FishingMonsInfo - - map SeafloorCavern_Room1 - .2byte 0 @ padding - .4byte SeafloorCavern_Room1_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Room2 - .2byte 0 @ padding - .4byte SeafloorCavern_Room2_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Room3 - .2byte 0 @ padding - .4byte SeafloorCavern_Room3_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Room4 - .2byte 0 @ padding - .4byte SeafloorCavern_Room4_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Room5 - .2byte 0 @ padding - .4byte SeafloorCavern_Room5_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SeafloorCavern_Room6 - .2byte 0 @ padding - .4byte SeafloorCavern_Room6_LandMonsInfo - .4byte SeafloorCavern_Room6_WaterMonsInfo - .4byte NULL - .4byte SeafloorCavern_Room6_FishingMonsInfo - - map SeafloorCavern_Room7 - .2byte 0 @ padding - .4byte SeafloorCavern_Room7_LandMonsInfo - .4byte SeafloorCavern_Room7_WaterMonsInfo - .4byte NULL - .4byte SeafloorCavern_Room7_FishingMonsInfo - - map SeafloorCavern_Room8 - .2byte 0 @ padding - .4byte SeafloorCavern_Room8_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map CaveOfOrigin_Entrance - .2byte 0 @ padding - .4byte CaveOfOrigin_Entrance_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map CaveOfOrigin_1F - .2byte 0 @ padding - .4byte CaveOfOrigin_1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map CaveOfOrigin_B1F - .2byte 0 @ padding - .4byte CaveOfOrigin_B1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map CaveOfOrigin_B2F - .2byte 0 @ padding - .4byte CaveOfOrigin_B2F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map CaveOfOrigin_B3F - .2byte 0 @ padding - .4byte CaveOfOrigin_B3F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map VictoryRoad_1F - .2byte 0 @ padding - .4byte VictoryRoad_1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map VictoryRoad_B1F - .2byte 0 @ padding - .4byte VictoryRoad_B1F_LandMonsInfo - .4byte NULL - .4byte VictoryRoad_B1F_RockSmashMonsInfo - .4byte NULL - - map VictoryRoad_B2F - .2byte 0 @ padding - .4byte VictoryRoad_B2F_LandMonsInfo - .4byte VictoryRoad_B2F_WaterMonsInfo - .4byte NULL - .4byte VictoryRoad_B2F_FishingMonsInfo - - map ShoalCave_LowTideEntranceRoom - .2byte 0 @ padding - .4byte ShoalCave_LowTideEntranceRoom_LandMonsInfo - .4byte ShoalCave_LowTideEntranceRoom_WaterMonsInfo - .4byte NULL - .4byte ShoalCave_LowTideEntranceRoom_FishingMonsInfo - - map ShoalCave_LowTideInnerRoom - .2byte 0 @ padding - .4byte ShoalCave_LowTideInnerRoom_LandMonsInfo - .4byte ShoalCave_LowTideInnerRoom_WaterMonsInfo - .4byte NULL - .4byte ShoalCave_LowTideInnerRoom_FishingMonsInfo - - map ShoalCave_LowTideStairsRoom - .2byte 0 @ padding - .4byte ShoalCave_LowTideStairsRoom_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map ShoalCave_LowTideLowerRoom - .2byte 0 @ padding - .4byte ShoalCave_LowTideLowerRoom_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map ShoalCave_LowTideIceRoom - .2byte 0 @ padding - .4byte ShoalCave_LowTideIceRoom_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map NewMauville_Entrance - .2byte 0 @ padding - .4byte NewMauville_Entrance_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map NewMauville_Inside - .2byte 0 @ padding - .4byte NewMauville_Inside_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map AbandonedShip_Rooms_B1F - .2byte 0 @ padding - .4byte NULL - .4byte AbandonedShip_Rooms_B1F_WaterMonsInfo - .4byte NULL - .4byte AbandonedShip_Rooms_B1F_FishingMonsInfo - - map AbandonedShip_HiddenFloorCorridors - .2byte 0 @ padding - .4byte NULL - .4byte AbandonedShip_HiddenFloorCorridors_WaterMonsInfo - .4byte NULL - .4byte AbandonedShip_HiddenFloorCorridors_FishingMonsInfo - - map SkyPillar_1F - .2byte 0 @ padding - .4byte SkyPillar_1F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SkyPillar_3F - .2byte 0 @ padding - .4byte SkyPillar_3F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map SkyPillar_5F - .2byte 0 @ padding - .4byte SkyPillar_5F_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map Route101 - .2byte 0 @ padding - .4byte Route101_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map Route102 - .2byte 0 @ padding - .4byte Route102_LandMonsInfo - .4byte Route102_WaterMonsInfo - .4byte NULL - .4byte Route102_FishingMonsInfo - - map Route103 - .2byte 0 @ padding - .4byte Route103_LandMonsInfo - .4byte Route103_WaterMonsInfo - .4byte NULL - .4byte Route103_FishingMonsInfo - - map Route104 - .2byte 0 @ padding - .4byte Route104_LandMonsInfo - .4byte Route104_WaterMonsInfo - .4byte NULL - .4byte Route104_FishingMonsInfo - - map Route105 - .2byte 0 @ padding - .4byte NULL - .4byte Route105_WaterMonsInfo - .4byte NULL - .4byte Route105_FishingMonsInfo - - map Route106 - .2byte 0 @ padding - .4byte NULL - .4byte Route106_WaterMonsInfo - .4byte NULL - .4byte Route106_FishingMonsInfo - - map Route107 - .2byte 0 @ padding - .4byte NULL - .4byte Route107_WaterMonsInfo - .4byte NULL - .4byte Route107_FishingMonsInfo - - map Route108 - .2byte 0 @ padding - .4byte NULL - .4byte Route108_WaterMonsInfo - .4byte NULL - .4byte Route108_FishingMonsInfo - - map Route109 - .2byte 0 @ padding - .4byte NULL - .4byte Route109_WaterMonsInfo - .4byte NULL - .4byte Route109_FishingMonsInfo - - map Route110 - .2byte 0 @ padding - .4byte Route110_LandMonsInfo - .4byte Route110_WaterMonsInfo - .4byte NULL - .4byte Route110_FishingMonsInfo - - map Route111 - .2byte 0 @ padding - .4byte Route111_LandMonsInfo - .4byte Route111_WaterMonsInfo - .4byte Route111_RockSmashMonsInfo - .4byte Route111_FishingMonsInfo - - map Route112 - .2byte 0 @ padding - .4byte Route112_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map Route113 - .2byte 0 @ padding - .4byte Route113_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map Route114 - .2byte 0 @ padding - .4byte Route114_LandMonsInfo - .4byte Route114_WaterMonsInfo - .4byte Route114_RockSmashMonsInfo - .4byte Route114_FishingMonsInfo - - map Route115 - .2byte 0 @ padding - .4byte Route115_LandMonsInfo - .4byte Route115_WaterMonsInfo - .4byte NULL - .4byte Route115_FishingMonsInfo - - map Route116 - .2byte 0 @ padding - .4byte Route116_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map Route117 - .2byte 0 @ padding - .4byte Route117_LandMonsInfo - .4byte Route117_WaterMonsInfo - .4byte NULL - .4byte Route117_FishingMonsInfo - - map Route118 - .2byte 0 @ padding - .4byte Route118_LandMonsInfo - .4byte Route118_WaterMonsInfo - .4byte NULL - .4byte Route118_FishingMonsInfo - - map Route119 - .2byte 0 @ padding - .4byte Route119_LandMonsInfo - .4byte Route119_WaterMonsInfo - .4byte NULL - .4byte Route119_FishingMonsInfo - - map Route120 - .2byte 0 @ padding - .4byte Route120_LandMonsInfo - .4byte Route120_WaterMonsInfo - .4byte NULL - .4byte Route120_FishingMonsInfo - - map Route121 - .2byte 0 @ padding - .4byte Route121_LandMonsInfo - .4byte Route121_WaterMonsInfo - .4byte NULL - .4byte Route121_FishingMonsInfo - - map Route122 - .2byte 0 @ padding - .4byte NULL - .4byte Route122_WaterMonsInfo - .4byte NULL - .4byte Route122_FishingMonsInfo - - map Route123 - .2byte 0 @ padding - .4byte Route123_LandMonsInfo - .4byte Route123_WaterMonsInfo - .4byte NULL - .4byte Route123_FishingMonsInfo - - map Route124 - .2byte 0 @ padding - .4byte NULL - .4byte Route124_WaterMonsInfo - .4byte NULL - .4byte Route124_FishingMonsInfo - - map Route125 - .2byte 0 @ padding - .4byte NULL - .4byte Route125_WaterMonsInfo - .4byte NULL - .4byte Route125_FishingMonsInfo - - map Route126 - .2byte 0 @ padding - .4byte NULL - .4byte Route126_WaterMonsInfo - .4byte NULL - .4byte Route126_FishingMonsInfo - - map Route127 - .2byte 0 @ padding - .4byte NULL - .4byte Route127_WaterMonsInfo - .4byte NULL - .4byte Route127_FishingMonsInfo - - map Route128 - .2byte 0 @ padding - .4byte NULL - .4byte Route128_WaterMonsInfo - .4byte NULL - .4byte Route128_FishingMonsInfo - - map Route129 - .2byte 0 @ padding - .4byte NULL - .4byte Route129_WaterMonsInfo - .4byte NULL - .4byte Route129_FishingMonsInfo - - map Route130 - .2byte 0 @ padding - .4byte Route130_LandMonsInfo - .4byte Route130_WaterMonsInfo - .4byte NULL - .4byte Route130_FishingMonsInfo - - map Route131 - .2byte 0 @ padding - .4byte NULL - .4byte Route131_WaterMonsInfo - .4byte NULL - .4byte Route131_FishingMonsInfo - - map Route132 - .2byte 0 @ padding - .4byte NULL - .4byte Route132_WaterMonsInfo - .4byte NULL - .4byte Route132_FishingMonsInfo - - map Route133 - .2byte 0 @ padding - .4byte NULL - .4byte Route133_WaterMonsInfo - .4byte NULL - .4byte Route133_FishingMonsInfo - - map Route134 - .2byte 0 @ padding - .4byte NULL - .4byte Route134_WaterMonsInfo - .4byte NULL - .4byte Route134_FishingMonsInfo - - map SafariZone_Northwest - .2byte 0 @ padding - .4byte SafariZone_Northwest_LandMonsInfo - .4byte SafariZone_Northwest_WaterMonsInfo - .4byte NULL - .4byte SafariZone_Northwest_FishingMonsInfo - - map SafariZone_Northeast - .2byte 0 @ padding - .4byte SafariZone_Northeast_LandMonsInfo - .4byte NULL - .4byte SafariZone_Northeast_RockSmashMonsInfo - .4byte NULL - - map SafariZone_Southwest - .2byte 0 @ padding - .4byte SafariZone_Southwest_LandMonsInfo - .4byte SafariZone_Southwest_WaterMonsInfo - .4byte NULL - .4byte SafariZone_Southwest_FishingMonsInfo - - map SafariZone_Southeast - .2byte 0 @ padding - .4byte SafariZone_Southeast_LandMonsInfo - .4byte NULL - .4byte NULL - .4byte NULL - - map DewfordTown - .2byte 0 @ padding - .4byte NULL - .4byte DewfordTown_WaterMonsInfo - .4byte NULL - .4byte DewfordTown_FishingMonsInfo - - map PacifidlogTown - .2byte 0 @ padding - .4byte NULL - .4byte PacifidlogTown_WaterMonsInfo - .4byte NULL - .4byte PacifidlogTown_FishingMonsInfo - - map Underwater1 - .2byte 0 @ padding - .4byte NULL - .4byte Underwater1_WaterMonsInfo - .4byte NULL - .4byte NULL - - map Underwater2 - .2byte 0 @ padding - .4byte NULL - .4byte Underwater2_WaterMonsInfo - .4byte NULL - .4byte NULL - - map UNDEFINED - .2byte 0 @ padding - .4byte NULL - .4byte NULL - .4byte NULL - .4byte NULL diff --git a/include/constants/maps.h b/include/constants/maps.h index 2fe255707..f96591f60 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -464,6 +464,10 @@ #define MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE (0 | (33 << 8)) +#define MAP_NONE (0x7F | (0x7F << 8)) +#define MAP_UNDEFINED (0xFF | (0xFF << 8)) + + #define MAP_GROUP(map) (MAP_##map >> 8) #define MAP_NUM(map) (MAP_##map & 0xFF) diff --git a/include/wild_encounter.h b/include/wild_encounter.h index d4b343126..c9d7c3fa1 100644 --- a/include/wild_encounter.h +++ b/include/wild_encounter.h @@ -18,13 +18,13 @@ struct WildPokemonHeader { u8 mapGroup; u8 mapNum; - struct WildPokemonInfo *landMonsInfo; - struct WildPokemonInfo *waterMonsInfo; - struct WildPokemonInfo *rockSmashMonsInfo; - struct WildPokemonInfo *fishingMonsInfo; + const struct WildPokemonInfo *landMonsInfo; + const struct WildPokemonInfo *waterMonsInfo; + const struct WildPokemonInfo *rockSmashMonsInfo; + const struct WildPokemonInfo *fishingMonsInfo; }; -extern struct WildPokemonHeader gWildMonHeaders[]; +extern const struct WildPokemonHeader gWildMonHeaders[]; void DisableWildEncounters(bool8 disabled); bool8 StandardWildEncounter(u16 a, u16 b); diff --git a/ld_script.txt b/ld_script.txt index 9d679395c..78844929a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -504,7 +504,6 @@ SECTIONS { src/field/trainer_see.o(.rodata); data/trainer_see.o(.rodata); src/field/wild_encounter.o(.rodata); - data/wild_encounter.o(.rodata); src/field/field_effect.o(.rodata); src/pokemon/pokemon_menu.o(.rodata); src/engine/option_menu.o(.rodata); diff --git a/src/field/wild_encounter.c b/src/field/wild_encounter.c index 9b3db1a52..64c88694c 100644 --- a/src/field/wild_encounter.c +++ b/src/field/wild_encounter.c @@ -2898,10 +2898,804 @@ const struct WildPokemon Underwater2_WaterMons [] = }; const struct WildPokemonInfo Underwater2_WaterMonsInfo = {4, Underwater2_WaterMons}; +const struct WildPokemonHeader gWildMonHeaders[] = +{ + { + .mapGroup = MAP_GROUP(PETALBURG_CITY), + .mapNum = MAP_NUM(PETALBURG_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &PetalburgCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &PetalburgCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SLATEPORT_CITY), + .mapNum = MAP_NUM(SLATEPORT_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &SlateportCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &SlateportCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(LILYCOVE_CITY), + .mapNum = MAP_NUM(LILYCOVE_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &LilycoveCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &LilycoveCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(MOSSDEEP_CITY), + .mapNum = MAP_NUM(MOSSDEEP_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &MossdeepCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &MossdeepCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SOOTOPOLIS_CITY), + .mapNum = MAP_NUM(SOOTOPOLIS_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &SootopolisCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &SootopolisCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(EVER_GRANDE_CITY), + .mapNum = MAP_NUM(EVER_GRANDE_CITY), + .landMonsInfo = NULL, + .waterMonsInfo = &EverGrandeCity_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &EverGrandeCity_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(METEOR_FALLS_1F_1R), + .mapNum = MAP_NUM(METEOR_FALLS_1F_1R), + .landMonsInfo = &MeteorFalls_1F_1R_LandMonsInfo, + .waterMonsInfo = &MeteorFalls_1F_1R_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &MeteorFalls_1F_1R_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(METEOR_FALLS_1F_2R), + .mapNum = MAP_NUM(METEOR_FALLS_1F_2R), + .landMonsInfo = &MeteorFalls_1F_2R_LandMonsInfo, + .waterMonsInfo = &MeteorFalls_1F_2R_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &MeteorFalls_1F_2R_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(METEOR_FALLS_B1F_1R), + .mapNum = MAP_NUM(METEOR_FALLS_B1F_1R), + .landMonsInfo = &MeteorFalls_B1F_1R_LandMonsInfo, + .waterMonsInfo = &MeteorFalls_B1F_1R_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &MeteorFalls_B1F_1R_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(METEOR_FALLS_B1F_2R), + .mapNum = MAP_NUM(METEOR_FALLS_B1F_2R), + .landMonsInfo = &MeteorFalls_B1F_2R_LandMonsInfo, + .waterMonsInfo = &MeteorFalls_B1F_2R_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &MeteorFalls_B1F_2R_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(RUSTURF_TUNNEL), + .mapNum = MAP_NUM(RUSTURF_TUNNEL), + .landMonsInfo = &RusturfTunnel_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(GRANITE_CAVE_1F), + .mapNum = MAP_NUM(GRANITE_CAVE_1F), + .landMonsInfo = &GraniteCave_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(GRANITE_CAVE_B1F), + .mapNum = MAP_NUM(GRANITE_CAVE_B1F), + .landMonsInfo = &GraniteCave_B1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(GRANITE_CAVE_B2F), + .mapNum = MAP_NUM(GRANITE_CAVE_B2F), + .landMonsInfo = &GraniteCave_B2F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = &GraniteCave_B2F_RockSmashMonsInfo, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(GRANITE_CAVE_STEVENS_ROOM), + .mapNum = MAP_NUM(GRANITE_CAVE_STEVENS_ROOM), + .landMonsInfo = &GraniteCave_StevensRoom_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(PETALBURG_WOODS), + .mapNum = MAP_NUM(PETALBURG_WOODS), + .landMonsInfo = &PetalburgWoods_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(JAGGED_PASS), + .mapNum = MAP_NUM(JAGGED_PASS), + .landMonsInfo = &JaggedPass_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(FIERY_PATH), + .mapNum = MAP_NUM(FIERY_PATH), + .landMonsInfo = &FieryPath_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_1F), + .mapNum = MAP_NUM(MT_PYRE_1F), + .landMonsInfo = &MtPyre_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_2F), + .mapNum = MAP_NUM(MT_PYRE_2F), + .landMonsInfo = &MtPyre_2F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_3F), + .mapNum = MAP_NUM(MT_PYRE_3F), + .landMonsInfo = &MtPyre_3F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_4F), + .mapNum = MAP_NUM(MT_PYRE_4F), + .landMonsInfo = &MtPyre_4F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_5F), + .mapNum = MAP_NUM(MT_PYRE_5F), + .landMonsInfo = &MtPyre_5F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_6F), + .mapNum = MAP_NUM(MT_PYRE_6F), + .landMonsInfo = &MtPyre_6F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_EXTERIOR), + .mapNum = MAP_NUM(MT_PYRE_EXTERIOR), + .landMonsInfo = &MtPyre_Exterior_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(MT_PYRE_SUMMIT), + .mapNum = MAP_NUM(MT_PYRE_SUMMIT), + .landMonsInfo = &MtPyre_Summit_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ENTRANCE), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ENTRANCE), + .landMonsInfo = NULL, + .waterMonsInfo = &SeafloorCavern_Entrance_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &SeafloorCavern_Entrance_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM1), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM1), + .landMonsInfo = &SeafloorCavern_Room1_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM2), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM2), + .landMonsInfo = &SeafloorCavern_Room2_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM3), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM3), + .landMonsInfo = &SeafloorCavern_Room3_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM4), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM4), + .landMonsInfo = &SeafloorCavern_Room4_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM5), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM5), + .landMonsInfo = &SeafloorCavern_Room5_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM6), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM6), + .landMonsInfo = &SeafloorCavern_Room6_LandMonsInfo, + .waterMonsInfo = &SeafloorCavern_Room6_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &SeafloorCavern_Room6_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM7), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM7), + .landMonsInfo = &SeafloorCavern_Room7_LandMonsInfo, + .waterMonsInfo = &SeafloorCavern_Room7_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &SeafloorCavern_Room7_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SEAFLOOR_CAVERN_ROOM8), + .mapNum = MAP_NUM(SEAFLOOR_CAVERN_ROOM8), + .landMonsInfo = &SeafloorCavern_Room8_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_ENTRANCE), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_ENTRANCE), + .landMonsInfo = &CaveOfOrigin_Entrance_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_1F), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_1F), + .landMonsInfo = &CaveOfOrigin_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_B1F), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_B1F), + .landMonsInfo = &CaveOfOrigin_B1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_B2F), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_B2F), + .landMonsInfo = &CaveOfOrigin_B2F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_B3F), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_B3F), + .landMonsInfo = &CaveOfOrigin_B3F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(VICTORY_ROAD_1F), + .mapNum = MAP_NUM(VICTORY_ROAD_1F), + .landMonsInfo = &VictoryRoad_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(VICTORY_ROAD_B1F), + .mapNum = MAP_NUM(VICTORY_ROAD_B1F), + .landMonsInfo = &VictoryRoad_B1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = &VictoryRoad_B1F_RockSmashMonsInfo, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(VICTORY_ROAD_B2F), + .mapNum = MAP_NUM(VICTORY_ROAD_B2F), + .landMonsInfo = &VictoryRoad_B2F_LandMonsInfo, + .waterMonsInfo = &VictoryRoad_B2F_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &VictoryRoad_B2F_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM), + .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM), + .landMonsInfo = &ShoalCave_LowTideEntranceRoom_LandMonsInfo, + .waterMonsInfo = &ShoalCave_LowTideEntranceRoom_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &ShoalCave_LowTideEntranceRoom_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_INNER_ROOM), + .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_INNER_ROOM), + .landMonsInfo = &ShoalCave_LowTideInnerRoom_LandMonsInfo, + .waterMonsInfo = &ShoalCave_LowTideInnerRoom_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &ShoalCave_LowTideInnerRoom_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM), + .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM), + .landMonsInfo = &ShoalCave_LowTideStairsRoom_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM), + .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_LOWER_ROOM), + .landMonsInfo = &ShoalCave_LowTideLowerRoom_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SHOAL_CAVE_LOW_TIDE_ICE_ROOM), + .mapNum = MAP_NUM(SHOAL_CAVE_LOW_TIDE_ICE_ROOM), + .landMonsInfo = &ShoalCave_LowTideIceRoom_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(NEW_MAUVILLE_ENTRANCE), + .mapNum = MAP_NUM(NEW_MAUVILLE_ENTRANCE), + .landMonsInfo = &NewMauville_Entrance_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(NEW_MAUVILLE_INSIDE), + .mapNum = MAP_NUM(NEW_MAUVILLE_INSIDE), + .landMonsInfo = &NewMauville_Inside_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ABANDONED_SHIP_ROOMS_B1F), + .mapNum = MAP_NUM(ABANDONED_SHIP_ROOMS_B1F), + .landMonsInfo = NULL, + .waterMonsInfo = &AbandonedShip_Rooms_B1F_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &AbandonedShip_Rooms_B1F_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS), + .mapNum = MAP_NUM(ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS), + .landMonsInfo = NULL, + .waterMonsInfo = &AbandonedShip_HiddenFloorCorridors_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &AbandonedShip_HiddenFloorCorridors_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SKY_PILLAR_1F), + .mapNum = MAP_NUM(SKY_PILLAR_1F), + .landMonsInfo = &SkyPillar_1F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SKY_PILLAR_3F), + .mapNum = MAP_NUM(SKY_PILLAR_3F), + .landMonsInfo = &SkyPillar_3F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SKY_PILLAR_5F), + .mapNum = MAP_NUM(SKY_PILLAR_5F), + .landMonsInfo = &SkyPillar_5F_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE101), + .mapNum = MAP_NUM(ROUTE101), + .landMonsInfo = &Route101_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE102), + .mapNum = MAP_NUM(ROUTE102), + .landMonsInfo = &Route102_LandMonsInfo, + .waterMonsInfo = &Route102_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route102_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE103), + .mapNum = MAP_NUM(ROUTE103), + .landMonsInfo = &Route103_LandMonsInfo, + .waterMonsInfo = &Route103_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route103_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE104), + .mapNum = MAP_NUM(ROUTE104), + .landMonsInfo = &Route104_LandMonsInfo, + .waterMonsInfo = &Route104_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route104_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE105), + .mapNum = MAP_NUM(ROUTE105), + .landMonsInfo = NULL, + .waterMonsInfo = &Route105_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route105_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE106), + .mapNum = MAP_NUM(ROUTE106), + .landMonsInfo = NULL, + .waterMonsInfo = &Route106_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route106_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE107), + .mapNum = MAP_NUM(ROUTE107), + .landMonsInfo = NULL, + .waterMonsInfo = &Route107_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route107_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE108), + .mapNum = MAP_NUM(ROUTE108), + .landMonsInfo = NULL, + .waterMonsInfo = &Route108_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route108_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE109), + .mapNum = MAP_NUM(ROUTE109), + .landMonsInfo = NULL, + .waterMonsInfo = &Route109_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route109_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE110), + .mapNum = MAP_NUM(ROUTE110), + .landMonsInfo = &Route110_LandMonsInfo, + .waterMonsInfo = &Route110_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route110_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE111), + .mapNum = MAP_NUM(ROUTE111), + .landMonsInfo = &Route111_LandMonsInfo, + .waterMonsInfo = &Route111_WaterMonsInfo, + .rockSmashMonsInfo = &Route111_RockSmashMonsInfo, + .fishingMonsInfo = &Route111_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE112), + .mapNum = MAP_NUM(ROUTE112), + .landMonsInfo = &Route112_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE113), + .mapNum = MAP_NUM(ROUTE113), + .landMonsInfo = &Route113_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE114), + .mapNum = MAP_NUM(ROUTE114), + .landMonsInfo = &Route114_LandMonsInfo, + .waterMonsInfo = &Route114_WaterMonsInfo, + .rockSmashMonsInfo = &Route114_RockSmashMonsInfo, + .fishingMonsInfo = &Route114_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE115), + .mapNum = MAP_NUM(ROUTE115), + .landMonsInfo = &Route115_LandMonsInfo, + .waterMonsInfo = &Route115_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route115_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE116), + .mapNum = MAP_NUM(ROUTE116), + .landMonsInfo = &Route116_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(ROUTE117), + .mapNum = MAP_NUM(ROUTE117), + .landMonsInfo = &Route117_LandMonsInfo, + .waterMonsInfo = &Route117_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route117_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE118), + .mapNum = MAP_NUM(ROUTE118), + .landMonsInfo = &Route118_LandMonsInfo, + .waterMonsInfo = &Route118_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route118_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE119), + .mapNum = MAP_NUM(ROUTE119), + .landMonsInfo = &Route119_LandMonsInfo, + .waterMonsInfo = &Route119_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route119_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE120), + .mapNum = MAP_NUM(ROUTE120), + .landMonsInfo = &Route120_LandMonsInfo, + .waterMonsInfo = &Route120_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route120_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE121), + .mapNum = MAP_NUM(ROUTE121), + .landMonsInfo = &Route121_LandMonsInfo, + .waterMonsInfo = &Route121_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route121_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE122), + .mapNum = MAP_NUM(ROUTE122), + .landMonsInfo = NULL, + .waterMonsInfo = &Route122_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route122_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE123), + .mapNum = MAP_NUM(ROUTE123), + .landMonsInfo = &Route123_LandMonsInfo, + .waterMonsInfo = &Route123_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route123_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE124), + .mapNum = MAP_NUM(ROUTE124), + .landMonsInfo = NULL, + .waterMonsInfo = &Route124_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route124_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE125), + .mapNum = MAP_NUM(ROUTE125), + .landMonsInfo = NULL, + .waterMonsInfo = &Route125_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route125_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE126), + .mapNum = MAP_NUM(ROUTE126), + .landMonsInfo = NULL, + .waterMonsInfo = &Route126_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route126_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE127), + .mapNum = MAP_NUM(ROUTE127), + .landMonsInfo = NULL, + .waterMonsInfo = &Route127_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route127_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE128), + .mapNum = MAP_NUM(ROUTE128), + .landMonsInfo = NULL, + .waterMonsInfo = &Route128_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route128_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE129), + .mapNum = MAP_NUM(ROUTE129), + .landMonsInfo = NULL, + .waterMonsInfo = &Route129_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route129_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE130), + .mapNum = MAP_NUM(ROUTE130), + .landMonsInfo = &Route130_LandMonsInfo, + .waterMonsInfo = &Route130_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route130_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE131), + .mapNum = MAP_NUM(ROUTE131), + .landMonsInfo = NULL, + .waterMonsInfo = &Route131_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route131_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE132), + .mapNum = MAP_NUM(ROUTE132), + .landMonsInfo = NULL, + .waterMonsInfo = &Route132_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route132_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE133), + .mapNum = MAP_NUM(ROUTE133), + .landMonsInfo = NULL, + .waterMonsInfo = &Route133_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route133_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(ROUTE134), + .mapNum = MAP_NUM(ROUTE134), + .landMonsInfo = NULL, + .waterMonsInfo = &Route134_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &Route134_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHWEST), + .mapNum = MAP_NUM(SAFARI_ZONE_NORTHWEST), + .landMonsInfo = &SafariZone_Northwest_LandMonsInfo, + .waterMonsInfo = &SafariZone_Northwest_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &SafariZone_Northwest_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHEAST), + .mapNum = MAP_NUM(SAFARI_ZONE_NORTHEAST), + .landMonsInfo = &SafariZone_Northeast_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = &SafariZone_Northeast_RockSmashMonsInfo, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHWEST), + .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHWEST), + .landMonsInfo = &SafariZone_Southwest_LandMonsInfo, + .waterMonsInfo = &SafariZone_Southwest_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &SafariZone_Southwest_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHEAST), + .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHEAST), + .landMonsInfo = &SafariZone_Southeast_LandMonsInfo, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(DEWFORD_TOWN), + .mapNum = MAP_NUM(DEWFORD_TOWN), + .landMonsInfo = NULL, + .waterMonsInfo = &DewfordTown_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &DewfordTown_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(PACIFIDLOG_TOWN), + .mapNum = MAP_NUM(PACIFIDLOG_TOWN), + .landMonsInfo = NULL, + .waterMonsInfo = &PacifidlogTown_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = &PacifidlogTown_FishingMonsInfo, + }, + { + .mapGroup = MAP_GROUP(UNDERWATER1), + .mapNum = MAP_NUM(UNDERWATER1), + .landMonsInfo = NULL, + .waterMonsInfo = &Underwater1_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(UNDERWATER2), + .mapNum = MAP_NUM(UNDERWATER2), + .landMonsInfo = NULL, + .waterMonsInfo = &Underwater2_WaterMonsInfo, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, + { + .mapGroup = MAP_GROUP(UNDEFINED), + .mapNum = MAP_NUM(UNDEFINED), + .landMonsInfo = NULL, + .waterMonsInfo = NULL, + .rockSmashMonsInfo = NULL, + .fishingMonsInfo = NULL, + }, +}; + +const struct WildPokemon gWildFeebasRoute119Data = {20, 25, SPECIES_FEEBAS}; + +const u16 gRoute119WaterTileData[] = +{ + 0, 0x2D, 0, + 0x2E, 0x5B, 0x83, + 0x5C, 0x8B, 0x12A, +}; -extern u16 gRoute119WaterTileData[]; extern u16 gScriptResult; -extern struct WildPokemon gWildFeebasRoute119Data; extern u8 S_RepelWoreOff[]; EWRAM_DATA static u8 sWildEncountersDisabled = 0; @@ -2967,7 +3761,7 @@ static bool8 CheckFeebas(void) route119section = 2; #else { - register u16 *arr asm("r0"); + register const u16 *arr asm("r0"); if (y >= (arr = gRoute119WaterTileData)[3 * 1 + 0] && y <= arr[3 * 1 + 1]) route119section = 1; if (y >= arr[3 * 2 + 0] && y <= arr[3 * 2 + 1]) @@ -3177,7 +3971,7 @@ static void CreateWildMon(u16 species, u8 b) CreateMonWithNature(&gEnemyParty[0], species, b, 0x20, PickWildMonNature()); } -static bool8 GenerateWildMon(struct WildPokemonInfo *wildMonInfo, u8 area, bool8 checkRepel) +static bool8 GenerateWildMon(const struct WildPokemonInfo *wildMonInfo, u8 area, bool8 checkRepel) { u8 wildMonIndex = 0; u8 level; @@ -3204,7 +3998,7 @@ static bool8 GenerateWildMon(struct WildPokemonInfo *wildMonInfo, u8 area, bool8 } } -static u16 GenerateFishingWildMon(struct WildPokemonInfo *wildMonInfo, u8 rod) +static u16 GenerateFishingWildMon(const struct WildPokemonInfo *wildMonInfo, u8 rod) { u8 wildMonIndex = ChooseWildMonIndex_Fishing(rod); u8 level = ChooseWildMonLevel(&wildMonInfo->wildPokemon[wildMonIndex]); @@ -3369,7 +4163,7 @@ void ScrSpecial_RockSmashWildEncounter(void) if (headerNum != 0xFFFF) { - struct WildPokemonInfo *wildPokemonInfo = gWildMonHeaders[headerNum].rockSmashMonsInfo; + const struct WildPokemonInfo *wildPokemonInfo = gWildMonHeaders[headerNum].rockSmashMonsInfo; if (wildPokemonInfo == NULL) { @@ -3393,7 +4187,7 @@ bool8 SweetScentWildEncounter(void) s16 x; s16 y; u16 headerNum; - struct WildPokemonInfo *wildPokemonInfo; + const struct WildPokemonInfo *wildPokemonInfo; PlayerGetDestCoords(&x, &y); if ((headerNum = GetCurrentMapWildMonHeader()) != 0xFFFF) @@ -3468,8 +4262,8 @@ void FishingWildEncounter(u8 rod) u16 GetLocalWildMon(bool8 *isWaterMon) { u16 headerNum; - struct WildPokemonInfo *landMonsInfo; - struct WildPokemonInfo *waterMonsInfo; + const struct WildPokemonInfo *landMonsInfo; + const struct WildPokemonInfo *waterMonsInfo; *isWaterMon = FALSE; headerNum = GetCurrentMapWildMonHeader(); @@ -3505,7 +4299,7 @@ u16 GetLocalWaterMon(void) if (headerNum != 0xFFFF) { - struct WildPokemonInfo *waterMonsInfo = gWildMonHeaders[headerNum].waterMonsInfo; + const struct WildPokemonInfo *waterMonsInfo = gWildMonHeaders[headerNum].waterMonsInfo; if (waterMonsInfo) return waterMonsInfo->wildPokemon[ChooseWildMonIndex_Water()].species; |