summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-02-15 18:24:55 -0500
committerPhlosioneer <mattmdrr2@gmail.com>2019-02-15 18:24:55 -0500
commite90e3458cb0836a5a027b4ed59fd05f34f904bcf (patch)
treee169298ac707b68923d701919cb8401632e00d1a /data
parente95140270be790b03e693f539770abfd6473916e (diff)
Document the regi* code more
Fixed some confusing naming, named some unknown symbols, and fixed the names of some flags.
Diffstat (limited to 'data')
-rw-r--r--data/field_effect_scripts.s17
-rw-r--r--data/maps/AncientTomb/scripts.inc4
-rw-r--r--data/maps/DesertRuins/scripts.inc4
-rw-r--r--data/maps/IslandCave/scripts.inc14
-rw-r--r--data/specials.inc2
5 files changed, 27 insertions, 14 deletions
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 93fe33f8a..2edf13661 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -10,66 +10,79 @@ gFieldEffectScriptPointers:: @ 82DB9D4
.4byte gFieldEffectScript_UseCutOnTree
.4byte gFieldEffectScript_Shadow
.4byte gFieldEffectScript_TallGrass
+
.4byte gFieldEffectScript_Ripple
.4byte gFieldEffectScript_FieldMoveShowMon
.4byte gFieldEffectScript_Ash
.4byte gFieldEffectScript_SurfBlob
.4byte gFieldEffectScript_UseSurf
+
.4byte gFieldEffectScript_GroundImpactDust
.4byte gFieldEffectScript_Unknown11
.4byte gFieldEffectScript_BikeHopTallGrass
.4byte gFieldEffectScript_SandFootprints
.4byte gFieldEffectScript_BikeHopBigSplash
+
.4byte gFieldEffectScript_Splash
.4byte gFieldEffectScript_BikeHopSmallSplash
.4byte gFieldEffectScript_LongGrass
.4byte gFieldEffectScript_Unknown18
.4byte gFieldEffectScript_Unknown19
+
.4byte gFieldEffectScript_Unknown20
.4byte gFieldEffectScript_Unknown21
.4byte gFieldEffectScript_Unknown22
.4byte gFieldEffectScript_BerryTreeGrowthSparkle
.4byte gFieldEffectScript_DeepSandFootprints
+
.4byte gFieldEffectScript_Unknown25
.4byte gFieldEffectScript_Unknown26
.4byte gFieldEffectScript_Unknown27
.4byte gFieldEffectScript_TreeDisguise
.4byte gFieldEffectScript_MountainDisguise
+
.4byte gFieldEffectScript_Unknown30
.4byte gFieldEffectScript_UseFly
.4byte gFieldEffectScript_FlyIn
.4byte gFieldEffectScript_QuestionMarkIcon
.4byte gFieldEffectScript_FeetInFlowingWater
+
.4byte gFieldEffectScript_BikeTireTracks
.4byte gFieldEffectScript_SandDisguisePlaceholder
.4byte gFieldEffectScript_UseRockSmash
.4byte gFieldEffectScript_Unknown38
.4byte gFieldEffectScript_Unknown39
+
.4byte gFieldEffectScript_Unknown40
.4byte gFieldEffectScript_ShortGrass
.4byte gFieldEffectScript_HotSpringsWater
.4byte gFieldEffectScript_Unknown43
.4byte gFieldEffectScript_Unknown44
+
.4byte gFieldEffectScript_Unknown45
.4byte gFieldEffectScript_HeartIcon
.4byte gFieldEffectScript_Unknown47
.4byte gFieldEffectScript_Unknown48
.4byte gFieldEffectScript_JumpOutOfAsh
+
.4byte gFieldEffectScript_Unknown50
.4byte gFieldEffectScript_Unknown51
.4byte gFieldEffectScript_Unknown52
.4byte gFieldEffectScript_Bubbles
.4byte gFieldEffectScript_Unknown54
+
.4byte gFieldEffectScript_Unknown55
.4byte gFieldEffectScript_Unknown56
.4byte gFieldEffectScript_Unknown57
.4byte gFieldEffectScript_Unknown58
.4byte gFieldEffectScript_FieldMoveShowMonInit
- .4byte gFieldEffectScript_Unknown60
+
+ .4byte gFieldEffectScript_UsePuzzleEffect
.4byte gFieldEffectScript_Unknown61
.4byte gFieldEffectScript_Unknown62
.4byte gFieldEffectScript_Unknown63
.4byte gFieldEffectScript_Rayquaza
+
.4byte gFieldEffectScript_Unknown65
.4byte gFieldEffectScript_Unknown66
@@ -315,7 +328,7 @@ gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC
field_eff_callnative FldEff_FieldMoveShowMonInit
field_eff_end
-gFieldEffectScript_Unknown60:: @ 82DBCD2
+gFieldEffectScript_UsePuzzleEffect:: @ 82DBCD2
field_eff_callnative FldEff_UsePuzzleEffect
field_eff_end
diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc
index 45bb9e007..7e9b027b2 100644
--- a/data/maps/AncientTomb/scripts.inc
+++ b/data/maps/AncientTomb/scripts.inc
@@ -25,7 +25,7 @@ AncientTomb_EventScript_238FEE:: @ 8238FEE
return
AncientTomb_MapScript1_238FF2: @ 8238FF2
- call_if_unset FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_238FFC
+ call_if_unset FLAG_SYS_BRAILLE_REGISTEEL_HM, AncientTomb_EventScript_238FFC
end
AncientTomb_EventScript_238FFC:: @ 8238FFC
@@ -39,7 +39,7 @@ AncientTomb_EventScript_238FFC:: @ 8238FFC
AncientTomb_EventScript_239033:: @ 8239033
lockall
- goto_if_set FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_239046
+ goto_if_set FLAG_SYS_BRAILLE_REGISTEEL_HM, AncientTomb_EventScript_239046
braillemessage AncientTomb_Braille_2A6D06
waitbuttonpress
hidebox2
diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc
index 62828e971..ff58b3ba5 100644
--- a/data/maps/DesertRuins/scripts.inc
+++ b/data/maps/DesertRuins/scripts.inc
@@ -16,7 +16,7 @@ DesertRuins_EventScript_22D975:: @ 822D975
return
DesertRuins_MapScript1_22D989: @ 822D989
- call_if_unset FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D993
+ call_if_unset FLAG_SYS_BRAILLE_REGIROCK_HM, DesertRuins_EventScript_22D993
end
DesertRuins_EventScript_22D993:: @ 822D993
@@ -39,7 +39,7 @@ DesertRuins_EventScript_22D9D7:: @ 822D9D7
DesertRuins_EventScript_22D9DB:: @ 822D9DB
lockall
- goto_if_set FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D9EE
+ goto_if_set FLAG_SYS_BRAILLE_REGIROCK_HM, DesertRuins_EventScript_22D9EE
braillemessage DesertRuins_Braille_2A6CA0
waitbuttonpress
hidebox2
diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc
index 7b551b4a7..3b6d94f0b 100644
--- a/data/maps/IslandCave/scripts.inc
+++ b/data/maps/IslandCave/scripts.inc
@@ -16,7 +16,7 @@ IslandCave_EventScript_238E44:: @ 8238E44
return
IslandCave_MapScript1_238E58: @ 8238E58
- call_if_unset FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238E62
+ call_if_unset FLAG_SYS_BRAILLE_REGICE_PUZZLE, IslandCave_EventScript_238E62
end
IslandCave_EventScript_238E62:: @ 8238E62
@@ -47,13 +47,13 @@ IslandCave_EventScript_238EAF:: @ 8238EAF
setmetatile 9, 20, 564, 1
special DrawWholeMapView
playse SE_BAN
- setflag FLAG_SYS_BRAILLE_WAIT
+ setflag FLAG_SYS_BRAILLE_REGICE_PUZZLE
end
IslandCave_EventScript_238EEF:: @ 8238EEF
lockall
call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45
- goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F13
+ goto_if_set FLAG_SYS_BRAILLE_REGICE_PUZZLE, IslandCave_EventScript_238F13
braillemessage IslandCave_Braille_2A6CD4
setflag FLAG_TEMP_2
special ShouldDoBrailleRegicePuzzle
@@ -69,7 +69,7 @@ IslandCave_EventScript_238F1D:: @ 8238F1D
lockall
call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45
braillemessage IslandCave_Braille_2A6CD4
- goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F41
+ goto_if_set FLAG_SYS_BRAILLE_REGICE_PUZZLE, IslandCave_EventScript_238F41
setflag FLAG_TEMP_2
special ShouldDoBrailleRegicePuzzle
goto IslandCave_EventScript_238F41
@@ -82,9 +82,9 @@ IslandCave_EventScript_238F41:: @ 8238F41
end
IslandCave_EventScript_238F45:: @ 8238F45
- setvar VAR_0x403B, 0
- setvar VAR_0x403C, 0
- setvar VAR_0x403D, 0
+ setvar VAR_REGICE_STEPS_1, 0
+ setvar VAR_REGICE_STEPS_2, 0
+ setvar VAR_REGICE_STEPS_3, 0
clearflag FLAG_TEMP_3
return
diff --git a/data/specials.inc b/data/specials.inc
index b3ca15ed1..cbbd81dc1 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -291,7 +291,7 @@ gSpecials:: @ 81DBA64
def_special GetPokeblockNameByMonNature
def_special GetSecretBaseNearbyMapName
def_special CheckRelicanthWailord
- def_special ShouldDoBrailleStrengthEffectOld
+ def_special ShouldDoBrailleRegirockEffectOld
def_special sub_80B0534
def_special sub_80B058C
def_special WaitWeather