Add constants for checkcodes.

From PikalaxALT.
2025-04-09 05:44:44 -07:00 · 2015-07-09 20:08:03 -06:00
parent e79f04e32d
commit 6f3b2d6de8
79 changed files with 265 additions and 237 deletions
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -24,7 +24,7 @@ BugsyScript_0x18ec1e: ; 0x18ec1e
 	playsound SFX_GET_BADGE
 	waitbutton
 	setflag $001c
-	checkcode $7
+	checkcode VAR_BADGES
 	scall UnknownScript_0x18ec73
 UnknownScript_0x18ec48: ; 0x18ec48
 	checkevent EVENT_GOT_TM49_FURY_CUTTER
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -14,7 +14,7 @@ BlackthornCity_MapScriptHeader:
 	return

 .Santos
-	checkcode $b
+	checkcode VAR_WEEKDAY
 	if_equal SATURDAY, .SantosAppears
 	disappear $9
 	return
@@ -83,7 +83,7 @@ SantosScript:
 	loadfont
 	checkevent EVENT_GOT_SPELL_TAG_FROM_SANTOS
 	iftrue SantosSaturdayScript
-	checkcode $b
+	checkcode VAR_WEEKDAY
 	if_not_equal SATURDAY, SantosNotSaturdayScript
 	checkevent EVENT_MET_SANTOS_OF_SATURDAY
 	iftrue .MetSantos
--- a/maps/BluesHouse.asm
+++ b/maps/BluesHouse.asm
@@ -9,7 +9,7 @@ BluesHouse_MapScriptHeader: ; 0x19b0ce
 DaisyScript_0x19b0d0: ; 0x19b0d0
 	faceplayer
 	loadfont
-	checkcode $a
+	checkcode VAR_HOUR
 	if_equal $f, UnknownScript_0x19b0de
 	writetext UnknownText_0x19b130
 	closetext
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -104,7 +104,7 @@ SuperNerdScript_0x186212: ; 0x186212
 	writetext UnknownText_0x18626a
 	closetext
 	loadmovesprites
-	checkcode $9
+	checkcode VAR_FACING
 	if_equal $1, UnknownScript_0x186226
 	applymovement $a, MovementData_0x186263
 	jump UnknownScript_0x18622a
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -152,7 +152,7 @@ UnknownScript_0x727d3: ; 0x727d3
 UnknownScript_0x727ed: ; 0x727ed
 	checkcoins 2222
 	if_equal $2, UnknownScript_0x72778
-	checkcode $1
+	checkcode VAR_PARTYCOUNT
 	if_equal $6, UnknownScript_0x7277e
 	pokenamemem PIKACHU, $0
 	scall UnknownScript_0x72768
@@ -171,7 +171,7 @@ UnknownScript_0x727ed: ; 0x727ed
 UnknownScript_0x7281b: ; 0x7281b
 	checkcoins 5555
 	if_equal $2, UnknownScript_0x72778
-	checkcode $1
+	checkcode VAR_PARTYCOUNT
 	if_equal $6, UnknownScript_0x7277e
 	pokenamemem PORYGON, $0
 	scall UnknownScript_0x72768
@@ -190,7 +190,7 @@ UnknownScript_0x7281b: ; 0x7281b
 UnknownScript_0x72849: ; 0x72849
 	checkcoins 8888
 	if_equal $2, UnknownScript_0x72778
-	checkcode $1
+	checkcode VAR_PARTYCOUNT
 	if_equal $6, UnknownScript_0x7277e
 	pokenamemem LARVITAR, $0
 	scall UnknownScript_0x72768
--- a/maps/CeladonMansion3F.asm
+++ b/maps/CeladonMansion3F.asm
@@ -10,7 +10,7 @@ CooltrainerMScript_0x71670: ; 0x71670
 	faceplayer
 	loadfont
 	writetext UnknownText_0x716ce
-	checkcode $5
+	checkcode VAR_DEXCAUGHT
 	if_greater_than $f8, UnknownScript_0x7167e
 	closetext
 	loadmovesprites
--- a/maps/CeladonPokeCenter1F.asm
+++ b/maps/CeladonPokeCenter1F.asm
@@ -43,7 +43,7 @@ UnknownScript_0x71e48: ; 0x71e48
 	writetext UnknownText_0x71f65
 	closetext
 	loadmovesprites
-	checkcode $9
+	checkcode VAR_FACING
 	if_equal $1, UnknownScript_0x71e5a
 	applymovement $6, MovementData_0x71e6b
 	jump UnknownScript_0x71e5e
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -120,7 +120,7 @@ UnknownScript_0x19c0ae:
 	winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6
 	setlasttalked $3
 	loadtrainer RIVAL1, RIVAL1_3
-	writecode $3, BATTLETYPE_CANLOSE
+	writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
 	startbattle
 	reloadmapmusic
 	reloadmap
@@ -131,7 +131,7 @@ UnknownScript_0x19c0ee:
 	winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6
 	setlasttalked $3
 	loadtrainer RIVAL1, RIVAL1_1
-	writecode $3, BATTLETYPE_CANLOSE
+	writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
 	startbattle
 	reloadmapmusic
 	reloadmap
@@ -142,7 +142,7 @@ UnknownScript_0x19c104:
 	winlosstext UnknownText_0x19c57f, UnknownText_0x19c5e6
 	setlasttalked $3
 	loadtrainer RIVAL1, RIVAL1_2
-	writecode $3, BATTLETYPE_CANLOSE
+	writecode VAR_BATTLETYPE, BATTLETYPE_CANLOSE
 	startbattle
 	reloadmapmusic
 	reloadmap
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -39,7 +39,7 @@ ChuckScript_0x9d60f: ; 0x9d60f
 	playsound SFX_GET_BADGE
 	waitbutton
 	setflag $0020
-	checkcode $7
+	checkcode VAR_BADGES
 	scall UnknownScript_0x9d681
 UnknownScript_0x9d656: ; 0x9d656
 	checkevent EVENT_GOT_TM01_DYNAMICPUNCH
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -32,7 +32,7 @@ GrampsScript_0x62f8f: ; 0x62f8f
 	writetext UnknownText_0x630ce
 	keeptextopen
 	loadmovesprites
-	checkcode $1
+	checkcode VAR_PARTYCOUNT
 	if_equal $6, UnknownScript_0x62fb6
 	special Function117656
 	loadfont
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -212,7 +212,7 @@ ElderScript_0x18d1a5: ; 0x18d1a5
 UnknownScript_0x18d1c5: ; 0x18d1c5
 	writetext UnknownText_0x18d604
 	closetext
-	checkcode $1
+	checkcode VAR_PARTYCOUNT
 	if_equal $6, UnknownScript_0x18d1ed
 	writetext UnknownText_0x18d697
 	playsound SFX_CAUGHT_MON
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -30,7 +30,7 @@ UnknownScript_0x18c89f: ; 0x18c89f
 ; 0x18c8a8

 UnknownScript_0x18c8a8: ; 0x18c8a8
-	checkcode $b
+	checkcode VAR_WEEKDAY
 	if_equal TUESDAY, UnknownScript_0x18c8b5
 	if_equal THURSDAY, UnknownScript_0x18c8b5
 	disappear $4
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -37,7 +37,7 @@ MortyScript_0x99d58: ; 0x99d58
 	playsound SFX_GET_BADGE
 	waitbutton
 	setflag $001e
-	checkcode $7
+	checkcode VAR_BADGES
 	scall UnknownScript_0x99db7
 	domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $1
 	setevent $0766
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -193,7 +193,7 @@ CyndaquilPokeBallScript: ; 0x78c73
 	keeptextopen
 	givepoke CYNDAQUIL, 5, BERRY, 0
 	loadmovesprites
-	checkcode $9
+	checkcode VAR_FACING
 	if_equal $3, ElmDirectionsScript
 	applymovement $0, AfterCyndaquilMovement
 	jump ElmDirectionsScript
@@ -450,7 +450,7 @@ ElmGiveTicketScript: ; 0x78e2f

 ElmJumpBackScript1: ; 0x78e3f
 	loadmovesprites
-	checkcode $9
+	checkcode VAR_FACING
 	if_equal $0, UnknownScript_0x78e6d
 	if_equal $1, UnknownScript_0x78e67
 	if_equal $2, UnknownScript_0x78e73
@@ -460,7 +460,7 @@ ElmJumpBackScript1: ; 0x78e3f

 ElmJumpBackScript2: ; 0x78e53
 	loadmovesprites
-	checkcode $9
+	checkcode VAR_FACING
 	if_equal $0, UnknownScript_0x78e67
 	if_equal $1, UnknownScript_0x78e6d
 	if_equal $2, UnknownScript_0x78e79
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -95,7 +95,7 @@ UnknownScript_0x7519c: ; 0x7519c
 ; 0x751b8

 UnknownScript_0x751b8: ; 0x751b8
-	checkcode $9
+	checkcode VAR_FACING
 	if_equal $3, UnknownScript_0x751c7
 	applymovement $2, MovementData_0x7520e
 	applymovement $0, MovementData_0x75235
--- a/maps/FastShipCabins_NNW_NNE_NE.asm
+++ b/maps/FastShipCabins_NNW_NNE_NE.asm
@@ -199,7 +199,7 @@ SailorScript_0x755f1: ; 0x755f1
 	loadmovesprites
 	setevent $0033
 	domaptrigger GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F, $1
-	checkcode $9
+	checkcode VAR_FACING
 	if_equal $3, UnknownScript_0x75629
 	applymovement $6, MovementData_0x75637
 	playsound SFX_EXIT_BUILDING
--- a/maps/GoldenrodBillsHouse.asm
+++ b/maps/GoldenrodBillsHouse.asm
@@ -17,7 +17,7 @@ BillsHouseBill:
 	writetext UnknownText_0x54d3f
 	keeptextopen
 	waitbutton
-	checkcode $1
+	checkcode VAR_PARTYCOUNT
 	if_equal $6, UnknownScript_0x54c13
 	writetext UnknownText_0x54dae
 	playsound SFX_CAUGHT_MON
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -23,7 +23,7 @@ GoldenrodCity_MapScriptHeader:
 	iffalse .MoveTutorDone
 	checkitem COIN_CASE
 	iffalse .MoveTutorDisappear
-	checkcode $b
+	checkcode VAR_WEEKDAY
 	if_equal WEDNESDAY, .MoveTutorAppear
 	if_equal SATURDAY, .MoveTutorAppear
 .MoveTutorDisappear
@@ -118,7 +118,7 @@ UnknownScript_0x1989a6:
 	writetext UnknownText_0x19918b
 	closetext
 	loadmovesprites
-	checkcode $9
+	checkcode VAR_FACING
 	if_equal $2, UnknownScript_0x1989c6
 	applymovement $10, MovementData_0x198a5f
 	jump UnknownScript_0x1989ca
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -10,7 +10,7 @@ GoldenrodDeptStore5F_MapScriptHeader:
 	dbw 2, UnknownScript_0x56090

 UnknownScript_0x56090:
-	checkcode $b
+	checkcode VAR_WEEKDAY
 	if_equal SUNDAY, UnknownScript_0x56099
 	disappear $7
 	return
@@ -56,7 +56,7 @@ UnknownScript_0x560c8:
 ReceptionistScript_0x560ce:
 	faceplayer
 	loadfont
-	checkcode $b
+	checkcode VAR_WEEKDAY
 	if_not_equal SUNDAY, UnknownScript_0x56112
 	checkflag $005b
 	iftrue UnknownScript_0x56112
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -15,7 +15,7 @@ UnknownScript_0x56bf9: ; 0x56bf9
 	iffalse UnknownScript_0x56c19
 	checkitem COIN_CASE
 	iffalse UnknownScript_0x56c0e
-	checkcode $b
+	checkcode VAR_WEEKDAY
 	if_equal WEDNESDAY, UnknownScript_0x56c11
 	if_equal SATURDAY, UnknownScript_0x56c11
 UnknownScript_0x56c0e: ; 0x56c0e
@@ -183,7 +183,7 @@ UnknownScript_0x56d0c: ; 0x56d0c
 UnknownScript_0x56d26: ; 0x56d26
 	checkcoins 100
 	if_equal $2, UnknownScript_0x56cb1
-	checkcode $1
+	checkcode VAR_PARTYCOUNT
 	if_equal $6, UnknownScript_0x56cb7
 	pokenamemem ABRA, $0
 	scall UnknownScript_0x56ca1
@@ -202,7 +202,7 @@ UnknownScript_0x56d26: ; 0x56d26
 UnknownScript_0x56d54: ; 0x56d54
 	checkcoins 800
 	if_equal $2, UnknownScript_0x56cb1
-	checkcode $1
+	checkcode VAR_PARTYCOUNT
 	if_equal $6, UnknownScript_0x56cb7
 	pokenamemem CUBONE, $0
 	scall UnknownScript_0x56ca1
@@ -221,7 +221,7 @@ UnknownScript_0x56d54: ; 0x56d54
 UnknownScript_0x56d82: ; 0x56d82
 	checkcoins 1500
 	if_equal $2, UnknownScript_0x56cb1
-	checkcode $1
+	checkcode VAR_PARTYCOUNT
 	if_equal $6, UnknownScript_0x56cb7
 	pokenamemem WOBBUFFET, $0
 	scall UnknownScript_0x56ca1
--- a/Show More
+++ b/Show More