Macro update, roam mon annotations

Updated map and mapgroup macros to get around an rgbds bug. Legendary beast locale handling annotated and relabeled. Added a new constant NUM_ENGINE_FLAGS for use in the EngineFlagAction function. This will make it easier for modders to add or remove engine flags.
2015-07-25 14:25:37 -04:00
parent 432df825d4
commit 6c3000efd2
26 changed files with 760 additions and 729 deletions
--- a/engine/engine_flags.asm
+++ b/engine/engine_flags.asm
@@ -115,8 +115,8 @@
 	dwb WeeklyFlags, %00001000 ; goldenrod mall happiness event floor05 person07
 	dwb WeeklyFlags, %00010000 ; tea in blues house
 	dwb WeeklyFlags, %00100000 ; indigo plateau rival fight
-	dwb WeeklyFlags, %01000000
-	dwb WeeklyFlags, %10000000
+	dwb WeeklyFlags, %01000000 ; move tutor
+	dwb WeeklyFlags, %10000000 ; buenas password

 	dwb SwarmFlags, %00000001 ; $60
 	dwb SwarmFlags, %00000010 ; goldenrod dept store sale is on
@@ -128,69 +128,69 @@
 	dwb wdbf3, %00000100 ; have gs ball after kurt examined it

 	; rematches
-	dwb wdc4c, %00000001 ; jack
-	dwb wdc4c, %00000010 ; huey
-	dwb wdc4c, %00000100 ; gaven
-	dwb wdc4c, %00001000 ; beth  ; $68
-	dwb wdc4c, %00010000 ; jose
-	dwb wdc4c, %00100000 ; reena
-	dwb wdc4c, %01000000 ; joey
-	dwb wdc4c, %10000000 ; wade
-	dwb wdc4c + 1, %00000001 ; ralph
-	dwb wdc4c + 1, %00000010 ; liz
-	dwb wdc4c + 1, %00000100 ; anthony
-	dwb wdc4c + 1, %00001000 ; todd  ; $70
-	dwb wdc4c + 1, %00010000 ; gina
-	dwb wdc4c + 1, %00100000 ; arnie
-	dwb wdc4c + 1, %01000000 ; alan
-	dwb wdc4c + 1, %10000000 ; dana
-	dwb wdc4c + 2, %00000001 ; chad
-	dwb wdc4c + 2, %00000010 ; tully
-	dwb wdc4c + 2, %00000100 ; brent
-	dwb wdc4c + 2, %00001000 ; tiffany  ; $78
-	dwb wdc4c + 2, %00010000 ; vance
-	dwb wdc4c + 2, %00100000 ; wilton
-	dwb wdc4c + 2, %01000000 ; parry
-	dwb wdc4c + 2, %10000000 ; erin
+	dwb wDailyRematchFlags, %00000001 ; jack
+	dwb wDailyRematchFlags, %00000010 ; huey
+	dwb wDailyRematchFlags, %00000100 ; gaven
+	dwb wDailyRematchFlags, %00001000 ; beth  ; $68
+	dwb wDailyRematchFlags, %00010000 ; jose
+	dwb wDailyRematchFlags, %00100000 ; reena
+	dwb wDailyRematchFlags, %01000000 ; joey
+	dwb wDailyRematchFlags, %10000000 ; wade
+	dwb wDailyRematchFlags + 1, %00000001 ; ralph
+	dwb wDailyRematchFlags + 1, %00000010 ; liz
+	dwb wDailyRematchFlags + 1, %00000100 ; anthony
+	dwb wDailyRematchFlags + 1, %00001000 ; todd  ; $70
+	dwb wDailyRematchFlags + 1, %00010000 ; gina
+	dwb wDailyRematchFlags + 1, %00100000 ; arnie
+	dwb wDailyRematchFlags + 1, %01000000 ; alan
+	dwb wDailyRematchFlags + 1, %10000000 ; dana
+	dwb wDailyRematchFlags + 2, %00000001 ; chad
+	dwb wDailyRematchFlags + 2, %00000010 ; tully
+	dwb wDailyRematchFlags + 2, %00000100 ; brent
+	dwb wDailyRematchFlags + 2, %00001000 ; tiffany  ; $78
+	dwb wDailyRematchFlags + 2, %00010000 ; vance
+	dwb wDailyRematchFlags + 2, %00100000 ; wilton
+	dwb wDailyRematchFlags + 2, %01000000 ; parry
+	dwb wDailyRematchFlags + 2, %10000000 ; erin

-	dwb wdc50, %00000001 ; beverly has nugget
-	dwb wdc50, %00000010 ; jose has star piece
-	dwb wdc50, %00000100 ; wade has item (see bittable1 $032b-e)
-	dwb wdc50, %00001000 ; gina has leaf stone  ; $80
-	dwb wdc50, %00010000 ; alan has fire stone
-	dwb wdc50, %00100000 ; liz has thunderstone
-	dwb wdc50, %01000000 ; derek has nugget
-	dwb wdc50, %10000000 ; tully has water stone
+	dwb wDailyPhoneItemFlags, %00000001 ; beverly has nugget
+	dwb wDailyPhoneItemFlags, %00000010 ; jose has star piece
+	dwb wDailyPhoneItemFlags, %00000100 ; wade has item (see bittable1 $032b-e)
+	dwb wDailyPhoneItemFlags, %00001000 ; gina has leaf stone  ; $80
+	dwb wDailyPhoneItemFlags, %00010000 ; alan has fire stone
+	dwb wDailyPhoneItemFlags, %00100000 ; liz has thunderstone
+	dwb wDailyPhoneItemFlags, %01000000 ; derek has nugget
+	dwb wDailyPhoneItemFlags, %10000000 ; tully has water stone

-	dwb wdc50 + 1, %00000001 ; tiffany has pink bow
-	dwb wdc50 + 1, %00000010 ; wilton has item (see bittable1 $032f-31)
+	dwb wDailyPhoneItemFlags + 1, %00000001 ; tiffany has pink bow
+	dwb wDailyPhoneItemFlags + 1, %00000010 ; wilton has item (see bittable1 $032f-31)

-	dwb wdc54, %00000001
-	dwb wdc54, %00000010  ; $88
-	dwb wdc54, %00000100
-	dwb wdc54, %00001000
-	dwb wdc54, %00010000
-	dwb wdc54, %00100000
-	dwb wdc54, %01000000
-	dwb wdc54, %10000000
+	dwb wDailyPhoneTimeOfDayFlags, %00000001
+	dwb wDailyPhoneTimeOfDayFlags, %00000010  ; $88
+	dwb wDailyPhoneTimeOfDayFlags, %00000100
+	dwb wDailyPhoneTimeOfDayFlags, %00001000
+	dwb wDailyPhoneTimeOfDayFlags, %00010000
+	dwb wDailyPhoneTimeOfDayFlags, %00100000
+	dwb wDailyPhoneTimeOfDayFlags, %01000000
+	dwb wDailyPhoneTimeOfDayFlags, %10000000

-	dwb wdc54 + 1, %00000001
-	dwb wdc54 + 1, %00000010  ; $90
-	dwb wdc54 + 1, %00000100
-	dwb wdc54 + 1, %00001000
-	dwb wdc54 + 1, %00010000
-	dwb wdc54 + 1, %00100000
-	dwb wdc54 + 1, %01000000
-	dwb wdc54 + 1, %10000000
+	dwb wDailyPhoneTimeOfDayFlags + 1, %00000001
+	dwb wDailyPhoneTimeOfDayFlags + 1, %00000010  ; $90
+	dwb wDailyPhoneTimeOfDayFlags + 1, %00000100
+	dwb wDailyPhoneTimeOfDayFlags + 1, %00001000
+	dwb wDailyPhoneTimeOfDayFlags + 1, %00010000
+	dwb wDailyPhoneTimeOfDayFlags + 1, %00100000
+	dwb wDailyPhoneTimeOfDayFlags + 1, %01000000
+	dwb wDailyPhoneTimeOfDayFlags + 1, %10000000

-	dwb wdc54 + 2, %00000001
-	dwb wdc54 + 2, %00000010  ; $98
-	dwb wdc54 + 2, %00000100
-	dwb wdc54 + 2, %00001000
-	dwb wdc54 + 2, %00010000
-	dwb wdc54 + 2, %00100000
-	dwb wdc54 + 2, %01000000
-	dwb wdc54 + 2, %10000000
+	dwb wDailyPhoneTimeOfDayFlags + 2, %00000001
+	dwb wDailyPhoneTimeOfDayFlags + 2, %00000010  ; $98
+	dwb wDailyPhoneTimeOfDayFlags + 2, %00000100
+	dwb wDailyPhoneTimeOfDayFlags + 2, %00001000
+	dwb wDailyPhoneTimeOfDayFlags + 2, %00010000
+	dwb wDailyPhoneTimeOfDayFlags + 2, %00100000
+	dwb wDailyPhoneTimeOfDayFlags + 2, %01000000
+	dwb wDailyPhoneTimeOfDayFlags + 2, %10000000

 	dwb wd45b, %00000100 ; female player has been transformed into male