dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #543 from pret/mapdata

Browse Source 
Convert map data to JSON
This commit is contained in:
huderlem
2019-02-04 21:36:18 -06:00
committed by GitHub
parent 646533cfa3 d4125fef9b
commit b0ee100975
2108 changed files with 74254 additions and 27034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tv.c
View File

@@ -38,6 +38,7 @@
#include "secret_base.h"
#include "tv.h"
#include "data2.h"
#include "constants/layouts.h"
// Static type declarations
@@ -6264,7 +6265,9 @@ static void DoTVShowTodaysRivalTrainer(void)
case MAPSEC_DYNAMIC:
switch (show->rivalTrainer.mapLayoutId)
{
case 0x115 ... 0x117:
case LAYOUT_SS_TIDAL_CORRIDOR:
case LAYOUT_SS_TIDAL_LOWER_DECK:
case LAYOUT_SS_TIDAL_ROOMS:
sTVShowState = 10;
break;
default:
@@ -6463,7 +6466,9 @@ static void DoTVShowHoennTreasureInvestigators(void)
{
switch (show->treasureInvestigators.mapLayoutId)
{
case 0x115 ... 0x117:
case LAYOUT_SS_TIDAL_CORRIDOR:
case LAYOUT_SS_TIDAL_LOWER_DECK:
case LAYOUT_SS_TIDAL_ROOMS:
sTVShowState = 2;
break;
default: