Merge pull request #315 from PikalaxALT/overworld

Overworld

7 files changed, 13 insertions, 135 deletions

diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc
index e0260dac5..40e8288cd 100644
--- a/data/maps/CinnabarIsland/scripts.inc
+++ b/data/maps/CinnabarIsland/scripts.inc
@@ -60,7 +60,7 @@ CinnabarIsland_OnFrame:: @ 8166F6E
 
 CinnabarIsland_EventScript_ExitPokeCenterForOneIsland:: @ 8166F88
 	lockall
-	clearflag FLAG_SPECIAL_FLAG_0x4001
+	clearflag FLAG_DONT_TRANSITION_MUSIC
 	savebgm MUS_DUMMY
 	textcolor 0
 	setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 2
diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
index c96169d1d..844c38997 100644
--- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
@@ -36,7 +36,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: @ 816E90A
 	closemessage
 	playbgm MUS_ANNAI, 1
 	savebgm MUS_ANNAI
-	setflag FLAG_SPECIAL_FLAG_0x4001
+	setflag FLAG_DONT_TRANSITION_MUSIC
 	setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
 	delay 20
 	compare VAR_FACING, DIR_SOUTH
diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc
index b165ae6b9..1b98d4cb4 100644
--- a/data/maps/PalletTown/scripts.inc
+++ b/data/maps/PalletTown/scripts.inc
@@ -224,7 +224,7 @@ PalletTown_EventScript_OakTrigger:: @ 8165605
 	clearflag FLAG_HIDE_OAK_IN_HIS_LAB
 	setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 1
 	setflag FLAG_HIDE_OAK_IN_PALLET_TOWN
-	setflag FLAG_SPECIAL_FLAG_0x4001
+	setflag FLAG_DONT_TRANSITION_MUSIC
 	warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12
 	waitstate
 	releaseall
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index 461318e35..facebea6b 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -238,7 +238,7 @@ PalletTown_ProfessorOaksLab_ChooseStarterScene:: @ 816923E
 	waitmovement 0
 	applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	clearflag FLAG_SPECIAL_FLAG_0x4001
+	clearflag FLAG_DONT_TRANSITION_MUSIC
 	savebgm SE_STOP
 	fadedefaultbgm
 	msgbox PalletTown_ProfessorOaksLab_Text_RivalFedUpWithWaiting
diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCenter/map.json
index 19b310814..ad4308513 100644
--- a/data/maps/RecordCenter/map.json
+++ b/data/maps/RecordCenter/map.json
@@ -67,7 +67,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "RecordCenter_EventScript_Spot"
+      "script": "RecordCenter_EventScript_Spot0"
     },
     {
       "type": "trigger",
@@ -76,7 +76,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "RecordCenter_EventScript_Spot"
+      "script": "RecordCenter_EventScript_Spot1"
     },
     {
       "type": "trigger",
@@ -85,7 +85,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "RecordCenter_EventScript_Spot"
+      "script": "RecordCenter_EventScript_Spot2"
     },
     {
       "type": "trigger",
@@ -94,7 +94,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_0",
       "var_value": "0",
-      "script": "RecordCenter_EventScript_Spot"
+      "script": "RecordCenter_EventScript_Spot3"
     }
   ],
   "bg_events": []
diff --git a/data/overworld.s b/data/overworld.s
deleted file mode 100644
index 245ee3696..000000000
--- a/data/overworld.s
+++ /dev/null
@@ -1,126 +0,0 @@
-#include "constants/flags.h"
-#include "constants/maps.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-	.section .rodata
-	.align 2, 0
-
-sWhiteOutMoneyLossMultipliers:: @ 826D294
-	.byte  2
-	.byte  4
-	.byte  6
-	.byte  9
-	.byte 12
-	.byte 16
-	.byte 20
-	.byte 25
-	.byte 30
-
-	.align 1
-sWhiteOutMoneyLossBadgeFlagIDs:: @ 826D29E
-	.2byte FLAG_BADGE01_GET
-    .2byte FLAG_BADGE02_GET
-    .2byte FLAG_BADGE03_GET
-    .2byte FLAG_BADGE04_GET
-    .2byte FLAG_BADGE05_GET
-    .2byte FLAG_BADGE06_GET
-    .2byte FLAG_BADGE07_GET
-    .2byte FLAG_BADGE08_GET
-
-	.align 2
-sDummyWarpData:: @ 826D2B0
-	map MAP_UNDEFINED
-	.byte 0xFF
-	.align 1
-	.2byte 0xFFFF, 0xFFFF
-
-sUnusedData:: @ 826D2B8
-	.4byte 1200
-	.4byte 3600
-	.4byte 1200
-	.4byte 2400
-	.4byte   50
-	.4byte   80
-	.4byte  -44
-	.4byte   44
-
-gDirectionToVectors:: @ 826D2D8
-	.4byte  0,  0
-	.4byte  0,  1
-	.4byte  0, -1
-	.4byte -1,  0
-	.4byte  1,  0
-	.4byte -1,  1
-	.4byte  1,  1
-	.4byte -1, -1
-	.4byte  1, -1
-
-gUnknown_826D320:: @ 826D320
-	.4byte 0x000001f8
-	@ {
-	@ 	.bg = 0,
-	@ 	.charBaseIndex = 2,
-	@ 	.mapBaseIndex = 31,
-	@ 	.screenSize = 0,
-	@ 	.paletteMode = 0,
-	@ 	.priority = 0,
-	@ 	.baseTile = 0x0000
-	@ }
-	.4byte 0x000011d1
-	@ {
-	@ 	.bg = 1,
-	@ 	.charBaseIndex = 0,
-	@ 	.mapBaseIndex = 29,
-	@ 	.screenSize = 0,
-	@ 	.paletteMode = 0,
-	@ 	.priority = 1,
-	@ 	.baseTile = 0x0000
-	@ }
-	.4byte 0x000021c2
-	@ {
-	@ 	.bg = 2,
-	@ 	.charBaseIndex = 0,
-	@ 	.mapBaseIndex = 28,
-	@ 	.screenSize = 0,
-	@ 	.paletteMode = 0,
-	@ 	.priority = 2,
-	@ 	.baseTile = 0x0000
-	@ }
-	.4byte 0x000031e3
-	@ {
-	@ 	.bg = 3,
-	@ 	.charBaseIndex = 0,
-	@ 	.mapBaseIndex = 30,
-	@ 	.screenSize = 0,
-	@ 	.paletteMode = 0,
-	@ 	.priority = 3,
-	@ 	.baseTile = 0x0000
-	@ }
-
-gFlashEffectParams:: @ 826D330
-	.4byte REG_WIN0H
-	.4byte (2 >> 1) | ((DMA_16BIT | DMA_DEST_RELOAD | DMA_SRC_INC | DMA_REPEAT | DMA_START_HBLANK | DMA_ENABLE) << 16)
-	.byte 1, 0
-
-	.align 2
-gUnknown_826D33C:: @ 826D33C
-	.4byte sub_8058684
-	.4byte sub_80586A4
-	.4byte sub_80586A8
-
-gUnknown_826D348:: @ 826D348
-	.4byte sub_80586C8
-	.4byte sub_80586CC
-	.4byte sub_80586CC
-	.4byte sub_80586CC
-	.4byte sub_80586CC
-	.4byte sub_80586C8
-	.4byte sub_80586C8
-	.4byte sub_8058734
-	.4byte sub_8058734
-	.4byte sub_8058734
-	.4byte sub_8058734
-
-gUnknown_826D374:: @ 826D374
-	.4byte sub_805874C
-	.4byte sub_8058754
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 01b0d9b34..1053c1028 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -702,7 +702,11 @@ TradeCenter_EventScript_Chair3:: @ 81BB974
 	end
 
 @ Nop in FRLG
-RecordCenter_EventScript_Spot:: @ 81BB980
+@ Separate labels to match GetDirectionForEventScript
+RecordCenter_EventScript_Spot0:: @ 81BB980
+RecordCenter_EventScript_Spot1:: @ 81BB980
+RecordCenter_EventScript_Spot2:: @ 81BB980
+RecordCenter_EventScript_Spot3:: @ 81BB980
 	end
 
 CableClub_EventScript_ReadTrainerCard:: @ 81BB981