diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/deco_constants.asm | 2 | ||||
| -rw-r--r-- | constants/engine_flags.asm | 28 | ||||
| -rw-r--r-- | constants/map_constants.asm | 8 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 4 |
4 files changed, 21 insertions, 21 deletions
diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm index 7546d9e1f..84fcdb94d 100644 --- a/constants/deco_constants.asm +++ b/constants/deco_constants.asm @@ -57,7 +57,7 @@ const_value = 1 deco: MACRO const DECO_\1 enum DECOFLAG_\1 -endm +ENDM ; decorations: ; - DecorationAttributes (see data/decorations/attributes.asm) diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 3c088596d..ad8632db0 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -16,14 +16,14 @@ const ENGINE_DST ; wUnusedTwoDayTimerOn const ENGINE_0A -; StatusFlags +; wStatusFlags const ENGINE_POKEDEX const ENGINE_UNOWN_DEX const ENGINE_POKERUS const ENGINE_ROCKET_SIGNAL_ON_CH20 const ENGINE_CREDITS_SKIP const ENGINE_BUG_CONTEST_ON ; 10 -; StatusFlags2 +; wStatusFlags2 const ENGINE_BUG_CONTEST_TIMER const ENGINE_SAFARI_ZONE const ENGINE_ROCKETS_IN_RADIO_TOWER @@ -31,11 +31,11 @@ const ENGINE_GIVE_POKERUS const ENGINE_FLORIA const ENGINE_ROCKETS_IN_MAHOGANY -; BikeFlags +; wBikeFlags const ENGINE_STRENGTH_ACTIVE const ENGINE_ALWAYS_ON_BIKE const ENGINE_DOWNHILL -; JohtoBadges +; wJohtoBadges const ENGINE_ZEPHYRBADGE const ENGINE_HIVEBADGE const ENGINE_PLAINBADGE @@ -44,7 +44,7 @@ const ENGINE_STORMBADGE ; 20 const ENGINE_GLACIERBADGE const ENGINE_RISINGBADGE -; KantoBadges +; wKantoBadges const ENGINE_BOULDERBADGE const ENGINE_CASCADEBADGE const ENGINE_THUNDERBADGE @@ -53,7 +53,7 @@ const ENGINE_MARSHBADGE const ENGINE_VOLCANOBADGE const ENGINE_EARTHBADGE -; UnlockedUnowns +; wUnlockedUnowns const ENGINE_UNLOCKED_UNOWNS_1 const ENGINE_UNLOCKED_UNOWNS_2 const ENGINE_UNLOCKED_UNOWNS_3 @@ -62,7 +62,7 @@ const ENGINE_UNLOCKED_UNOWNS_6 ; 30 const ENGINE_UNLOCKED_UNOWNS_7 const ENGINE_UNLOCKED_UNOWNS_8 -; VisitedSpawns +; wVisitedSpawns const ENGINE_FLYPOINT_KRISS_HOUSE const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER const ENGINE_FLYPOINT_PALLET @@ -92,9 +92,9 @@ const ENGINE_FLYPOINT_UNUSED ; wLuckyNumberShowFlag const ENGINE_LUCKY_NUMBER_SHOW -; StatusFlags2 +; wStatusFlags2 const ENGINE_4F -; DailyFlags +; wDailyFlags const ENGINE_KURT_MAKING_BALLS ; 50 const ENGINE_DAILY_BUG_CONTEST const ENGINE_SPECIAL_WILDDATA @@ -103,7 +103,7 @@ const ENGINE_SHUCKLE_GIVEN const ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED const ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY -; WeeklyFlags +; wWeeklyFlags const ENGINE_MT_MOON_SQUARE_CLEFAIRY const ENGINE_UNION_CAVE_LAPRAS const ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT @@ -112,12 +112,12 @@ const ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT const ENGINE_DAILY_MOVE_TUTOR const ENGINE_BUENAS_PASSWORD -; SwarmFlags +; wSwarmFlags const ENGINE_BUENAS_PASSWORD_2 ; 60 const ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON -; GameTimerPause +; wGameTimerPause const ENGINE_62 -; PlayerGender +; wPlayerGender const ENGINE_PLAYER_IS_FEMALE ; wCelebiEvent const ENGINE_HAVE_EXAMINED_GS_BALL @@ -184,7 +184,7 @@ const ENGINE_ERIN_SATURDAY_NIGHT ; wPlayerSpriteSetupFlags const ENGINE_KRIS_IN_CABLE_CLUB -; SwarmFlags +; wSwarmFlags const ENGINE_DUNSPARCE_SWARM ; a0 const ENGINE_YANMA_SWARM NUM_ENGINE_FLAGS EQU const_value diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 7e3a628b1..74e4f4ce0 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -1,9 +1,9 @@ -newgroup: macro +newgroup: MACRO const_value = const_value + 1 enum_start 1 -endm +ENDM -mapgroup: macro +mapgroup: MACRO ;\1: map id ;\2: height: in blocks ;\3: width: in blocks @@ -11,7 +11,7 @@ GROUP_\1 EQU const_value enum MAP_\1 \1_HEIGHT EQU \2 \1_WIDTH EQU \3 -endm +ENDM ; map group ids ; `newgroup` indexes are for: diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index c8c49621e..2e44208ef 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -131,7 +131,7 @@ DAY_CARE_DEPOSIT EQU 3 const DEXMODE_ABC const DEXMODE_UNOWN -; JohtoBadges: +; wJohtoBadges: const_def const ZEPHYRBADGE const HIVEBADGE @@ -143,7 +143,7 @@ DAY_CARE_DEPOSIT EQU 3 const RISINGBADGE NUM_JOHTO_BADGES EQU const_value -; KantoBadges: +; wKantoBadges: const_def const BOULDERBADGE const CASCADEBADGE |