diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2016-11-11 20:07:15 -0600 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-11-11 18:07:15 -0800 |
| commit | 510f104706cb1420b41a0ca8d96cb2b522b38c01 (patch) | |
| tree | 94dc7a8da5d3374f3c51cdac2d88dbec2b22509f /data | |
| parent | 52aba81f3498eb2cdccbb2819bf2202cd8b4b755 (diff) | |
more cleanup (#98)
Diffstat (limited to 'data')
| -rw-r--r-- | data/data2.s | 5 | ||||
| -rw-r--r-- | data/specials.inc | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/data/data2.s b/data/data2.s index abc0ff1e3..320dfdf2f 100644 --- a/data/data2.s +++ b/data/data2.s @@ -11192,9 +11192,8 @@ gWildFeebasRoute119Data:: @ 839DBFC .byte 20, 25 @ Min/Max level .2byte SPECIES_FEEBAS -@ Some Feebas tile related data .align 2 -gUnknown_0839DC00:: @ 839DC00 +gRoute119WaterTileData:: @ 839DC00 .2byte 0x0, 0x2D, 0x0 .2byte 0x2E, 0x5B, 0x83 .2byte 0x5C, 0x8B, 0x12A @@ -24244,7 +24243,7 @@ gUnknown_083F7EA8:: @ 83F7EA8 .4byte sub_802E424, c2_exit_to_overworld_2_switch .align 2 -gUnknown_083F7EB8:: @ 83F7EB8 +gPokeblockNames:: @ 83F7EB8 .4byte NULL .4byte ContestStatsText_RedPokeBlock .4byte ContestStatsText_BluePokeBlock diff --git a/data/specials.inc b/data/specials.inc index ead3d5fab..852372ce0 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -205,9 +205,9 @@ gSpecials:: .4byte sub_80C8080 .4byte SetSSTidalFlag .4byte ResetSSTidalFlag - .4byte sub_80C81B8 - .4byte sub_80C81E4 - .4byte sub_80C82EC + .4byte EnterSafariMode + .4byte ExitSafariMode + .4byte SafariZoneGetPokeblockNameInFeeder .4byte sub_810BAF4 .4byte sub_810D32C .4byte sub_810D378 |