More mobile-related labels; remove unneeded map object constants

2025-04-09 05:44:44 -07:00 · 2015-12-26 11:31:56 -05:00
parent 7683b78fb4
commit f485a45cda
52 changed files with 383 additions and 381 deletions
--- a/constants.asm
+++ b/constants.asm
@@ -4,6 +4,7 @@ INCLUDE "gbhw.asm"
 INCLUDE "hram.asm"

 INCLUDE "constants/wram_constants.asm"
+INCLUDE "constants/sram_constants.asm"
 INCLUDE "constants/pokemon_constants.asm"
 INCLUDE "constants/type_constants.asm"
 INCLUDE "constants/move_constants.asm"
--- a/constants/engine_flags.asm
+++ b/constants/engine_flags.asm
@@ -18,7 +18,7 @@
 	const ENGINE_CREDITS_SKIP
 	const ENGINE_BUG_CONTEST_ON ; 10
 	const ENGINE_BUG_CONTEST_TIMER
-	const ENGINE_12
+	const ENGINE_SAFARI_ZONE
 	const ENGINE_ROCKETS_IN_RADIO_TOWER
 	const ENGINE_BIKE_SHOP_CALL_ENABLED
 	const ENGINE_GIVE_POKERUS
--- a/constants/sram_constants.asm
+++ b/constants/sram_constants.asm
@@ -0,0 +1,3 @@
+; Mobile bank 5
+sMobileLoginPassword EQU $aa4b
+LOGIN_PASSWORD_LENGTH EQU 17
--- a/engine/engine_flags.asm
+++ b/engine/engine_flags.asm
@@ -118,7 +118,7 @@ ENDM
 	engine_flag StatusFlags, 6 ; credits skip
 	engine_flag StatusFlags, 7 ; bug contest on   ; $10
 	engine_flag StatusFlags2, 2 ; bug contest timer
-	engine_flag StatusFlags2, 1 ; ???
+	engine_flag StatusFlags2, 1 ; safari zone?
 	engine_flag StatusFlags2, 0 ; rockets in radio tower
 	engine_flag StatusFlags2, 4 ; bike shop call enabled (1024 bike steps reqd)
 	engine_flag StatusFlags2, 5 ; give pokerus
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -3,7 +3,7 @@

 WarpToSpawnPoint:: ; 97c28
 	ld hl, StatusFlags2
-	res 1, [hl] ; ??
+	res 1, [hl] ; safari zone?
 	res 2, [hl] ; bug contest
 	ret
 ; 97c30
--- a/maps/CeladonDeptStoreElevator.asm
+++ b/maps/CeladonDeptStoreElevator.asm
@@ -1,4 +1,3 @@
-const_value set 2

 CeladonDeptStoreElevator_MapScriptHeader:
 .MapTriggers:
--- a/maps/CeladonMansion2F.asm
+++ b/maps/CeladonMansion2F.asm
@@ -1,4 +1,3 @@
-const_value set 2

 CeladonMansion2F_MapScriptHeader:
 .MapTriggers:
--- a/maps/CeladonPokeCenter2FBeta.asm
+++ b/maps/CeladonPokeCenter2FBeta.asm
@@ -1,4 +1,3 @@
-const_value set 2

 CeladonPokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
--- a/maps/CeruleanPokeCenter2FBeta.asm
+++ b/maps/CeruleanPokeCenter2FBeta.asm
@@ -1,4 +1,3 @@
-const_value set 2

 CeruleanPokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
--- a/maps/CinnabarPokeCenter2FBeta.asm
+++ b/maps/CinnabarPokeCenter2FBeta.asm
@@ -1,4 +1,3 @@
-const_value set 2

 CinnabarPokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
--- a/maps/DragonsDen1F.asm
+++ b/maps/DragonsDen1F.asm
@@ -1,4 +1,3 @@
-const_value set 2

 DragonsDen1F_MapScriptHeader:
 .MapTriggers:
--- a/maps/FuchsiaPokeCenter2FBeta.asm
+++ b/maps/FuchsiaPokeCenter2FBeta.asm
@@ -1,4 +1,3 @@
-const_value set 2

 FuchsiaPokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
--- a/maps/GoldenrodDeptStoreElevator.asm
+++ b/maps/GoldenrodDeptStoreElevator.asm
@@ -1,4 +1,3 @@
-const_value set 2

 GoldenrodDeptStoreElevator_MapScriptHeader:
 .MapTriggers:
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -146,10 +146,10 @@ GoldenrodGameCornerTMVendorMenuData:
 	db $40 ; flags
 	db 02, 00 ; start coords
 	db 11, 15 ; end coords
-	dw MenuData2_0x56cd1
+	dw .MenuData2
 	db 1 ; default option

-MenuData2_0x56cd1:
+.MenuData2
 	db $80 ; flags
 	db 4 ; items
 	db "TM25    5500@"
--- a/maps/LavenderPokeCenter2FBeta.asm
+++ b/maps/LavenderPokeCenter2FBeta.asm
@@ -1,4 +1,3 @@
-const_value set 2

 LavenderPokeCenter2FBeta_MapScriptHeader:
 .MapTriggers:
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -1,4 +1,3 @@
-const_value set 2

 MobileBattleRoom_MapScriptHeader:
 .MapTriggers:
--- a/maps/MobileTradeRoomMobile.asm
+++ b/maps/MobileTradeRoomMobile.asm
@@ -1,4 +1,3 @@
-const_value set 2

 MobileTradeRoomMobile_MapScriptHeader:
 .MapTriggers:
--- a/maps/PewterPokeCEnter2FBeta.asm
+++ b/maps/PewterPokeCEnter2FBeta.asm
@@ -1,4 +1,3 @@
-const_value set 2

 PewterPokeCEnter2FBeta_MapScriptHeader:
 .MapTriggers:
--- a/maps/RedsHouse2F.asm
+++ b/maps/RedsHouse2F.asm
@@ -1,4 +1,3 @@
-const_value set 2

 RedsHouse2F_MapScriptHeader:
 .MapTriggers:
--- a/maps/Route10North.asm
+++ b/maps/Route10North.asm
@@ -1,4 +1,3 @@
-const_value set 2

 Route10North_MapScriptHeader:
 .MapTriggers:
--- a/Show More
+++ b/Show More