diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/data_835B488.s | 2 | ||||
| -rw-r--r-- | data/map_event_scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/PalletTown_GarysHouse/scripts.inc | 2 | ||||
| -rw-r--r-- | data/pokedex_area_markers.s | 14 | ||||
| -rw-r--r-- | data/pokedex_area_markers/marker.pal | 19 | ||||
| -rw-r--r-- | data/pokedex_area_markers/marker_0.png | bin | 0 -> 157 bytes | |||
| -rw-r--r-- | data/pokedex_area_markers/marker_1.png | bin | 0 -> 165 bytes | |||
| -rw-r--r-- | data/pokedex_area_markers/marker_2.png | bin | 0 -> 165 bytes | |||
| -rw-r--r-- | data/pokedex_area_markers/marker_3.png | bin | 0 -> 175 bytes | |||
| -rw-r--r-- | data/pokedex_area_markers/marker_4.png | bin | 0 -> 177 bytes | |||
| -rw-r--r-- | data/pokedex_area_markers/marker_5.png | bin | 0 -> 180 bytes | |||
| -rw-r--r-- | data/pokedex_area_markers/marker_6.png | bin | 0 -> 186 bytes | |||
| -rw-r--r-- | data/wild_pokemon_area.s | 14 |
13 files changed, 22 insertions, 31 deletions
diff --git a/data/data_835B488.s b/data/data_835B488.s index c106c46c4..742224d2b 100644 --- a/data/data_835B488.s +++ b/data/data_835B488.s @@ -55,7 +55,7 @@ gUnknown_83C7294:: @ 83C7294 gUnknown_83C7388:: @ 83C7388 .incbin "baserom.gba", 0x3C7388, 0x2930 -gUnknown_83C9CB8:: @ 83C9CB8 +gWildMonHeaders:: @ 83C9CB8 .incbin "baserom.gba", 0x3C9CB8, 0xA64 gUnknown_83CA71C:: @ 83CA71C diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc index 233b73349..c333c6336 100644 --- a/data/map_event_scripts.inc +++ b/data/map_event_scripts.inc @@ -1485,7 +1485,7 @@ gUnknown_81A6481:: @ 81A6481 setflag FLAG_0x09F setflag FLAG_0x0A0 setflag FLAG_0x0AE - setvar VAR_MIRAGE_RND_L, 500 + setvar VAR_0x4025, 500 end EventScript_1A651A:: @ 81A651A diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index dd3f05aa9..9f304b583 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -51,7 +51,7 @@ EventScript_168DB9:: @ 8168DB9 compare_var_to_value VAR_RESULT, 2 goto_if_eq EventScript_1A7AE0 special sub_8112364 - compare_var_to_value VAR_MIRAGE_RND_L, 500 + compare_var_to_value VAR_0x4025, 500 goto_if 0, EventScript_168E46 msgbox gUnknown_818D7D3, MSGBOX_YESNO compare_var_to_value VAR_RESULT, 0 diff --git a/data/pokedex_area_markers.s b/data/pokedex_area_markers.s deleted file mode 100644 index bf63a3210..000000000 --- a/data/pokedex_area_markers.s +++ /dev/null @@ -1,14 +0,0 @@ - .section .rodata - .align 2 - -gUnknown_846341C:: @ 846341C - .incbin "baserom.gba", 0x46341C, 0x20 - -gUnknown_846343C:: @ 846343C - .incbin "baserom.gba", 0x46343C, 0x128 - -gUnknown_8463564:: @ 8463564 - .incbin "baserom.gba", 0x463564, 0x1C - -gUnknown_8463580:: @ 8463580 - .incbin "baserom.gba", 0x463580, 0x140 diff --git a/data/pokedex_area_markers/marker.pal b/data/pokedex_area_markers/marker.pal new file mode 100644 index 000000000..5a7190a3a --- /dev/null +++ b/data/pokedex_area_markers/marker.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 197 115 +255 139 57 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/pokedex_area_markers/marker_0.png b/data/pokedex_area_markers/marker_0.png Binary files differnew file mode 100644 index 000000000..10ef6d24b --- /dev/null +++ b/data/pokedex_area_markers/marker_0.png diff --git a/data/pokedex_area_markers/marker_1.png b/data/pokedex_area_markers/marker_1.png Binary files differnew file mode 100644 index 000000000..21db66b29 --- /dev/null +++ b/data/pokedex_area_markers/marker_1.png diff --git a/data/pokedex_area_markers/marker_2.png b/data/pokedex_area_markers/marker_2.png Binary files differnew file mode 100644 index 000000000..e25be6f5c --- /dev/null +++ b/data/pokedex_area_markers/marker_2.png diff --git a/data/pokedex_area_markers/marker_3.png b/data/pokedex_area_markers/marker_3.png Binary files differnew file mode 100644 index 000000000..1e8fe22d2 --- /dev/null +++ b/data/pokedex_area_markers/marker_3.png diff --git a/data/pokedex_area_markers/marker_4.png b/data/pokedex_area_markers/marker_4.png Binary files differnew file mode 100644 index 000000000..193697384 --- /dev/null +++ b/data/pokedex_area_markers/marker_4.png diff --git a/data/pokedex_area_markers/marker_5.png b/data/pokedex_area_markers/marker_5.png Binary files differnew file mode 100644 index 000000000..0919682f4 --- /dev/null +++ b/data/pokedex_area_markers/marker_5.png diff --git a/data/pokedex_area_markers/marker_6.png b/data/pokedex_area_markers/marker_6.png Binary files differnew file mode 100644 index 000000000..439d858e1 --- /dev/null +++ b/data/pokedex_area_markers/marker_6.png diff --git a/data/wild_pokemon_area.s b/data/wild_pokemon_area.s deleted file mode 100644 index 26913b7c6..000000000 --- a/data/wild_pokemon_area.s +++ /dev/null @@ -1,14 +0,0 @@ - .section .rodata - .align 2 - -gUnknown_8464148:: @ 8464148 - .incbin "baserom.gba", 0x464148, 0x174 - -gUnknown_84642BC:: @ 84642BC - .incbin "baserom.gba", 0x4642BC, 0x4 - -gUnknown_84642C0:: @ 84642C0 - .incbin "baserom.gba", 0x4642C0, 0x34 - -gUnknown_84642F4:: @ 84642F4 - .incbin "baserom.gba", 0x4642F4, 0xC |
