Merge branch 'master' of https://github.com/pret/pokered

10 files changed, 74 insertions, 74 deletions

diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm
index eaef75f6..e960d49b 100644
--- a/data/predef_pointers.asm
+++ b/data/predef_pointers.asm
@@ -101,7 +101,7 @@ PredefPointers::
 	add_predef EnterMapAnim, $1E ; wrong bank
 	add_predef GetTileTwoStepsInFrontOfPlayer
 	add_predef CheckForCollisionWhenPushingBoulder
-	add_predef PrintStrengthTxt
+	add_predef PrintStrengthText
 	add_predef PickUpItem
 	add_predef PrintMoveType
 	add_predef LoadMovePPs
diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm
index d3455d74..74eb2525 100644
--- a/data/sprites/facings.asm
+++ b/data/sprites/facings.asm
@@ -47,71 +47,71 @@ SpriteFacingAndAnimationTable:
 	db 4 ; #
 	db  0,  0, $00, 0
 	db  0,  8, $01, 0
-	db  8,  0, $02, OAMFLAG_CANBEMASKED
-	db  8,  8, $03, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA
+	db  8,  0, $02, UNDER_GRASS
+	db  8,  8, $03, UNDER_GRASS | FACING_END
 
 .WalkingDown:
 	db 4 ; #
 	db  0,  0, $80, 0
 	db  0,  8, $81, 0
-	db  8,  0, $82, OAMFLAG_CANBEMASKED
-	db  8,  8, $83, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA
+	db  8,  0, $82, UNDER_GRASS
+	db  8,  8, $83, UNDER_GRASS | FACING_END
 
 .WalkingDown2:
 	db 4 ; #
 	db  0,  8, $80, OAM_HFLIP
 	db  0,  0, $81, OAM_HFLIP
-	db  8,  8, $82, OAM_HFLIP | OAMFLAG_CANBEMASKED
-	db  8,  0, $83, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA
+	db  8,  8, $82, OAM_HFLIP | UNDER_GRASS
+	db  8,  0, $83, OAM_HFLIP | UNDER_GRASS | FACING_END
 
 .StandingUp:
 	db 4 ; #
 	db  0,  0, $04, 0
 	db  0,  8, $05, 0
-	db  8,  0, $06, OAMFLAG_CANBEMASKED
-	db  8,  8, $07, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA
+	db  8,  0, $06, UNDER_GRASS
+	db  8,  8, $07, UNDER_GRASS | FACING_END
 
 .WalkingUp:
 	db 4 ; #
 	db  0,  0, $84, 0
 	db  0,  8, $85, 0
-	db  8,  0, $86, OAMFLAG_CANBEMASKED
-	db  8,  8, $87, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA
+	db  8,  0, $86, UNDER_GRASS
+	db  8,  8, $87, UNDER_GRASS | FACING_END
 
 .WalkingUp2:
 	db 4 ; #
 	db  0,  8, $84, OAM_HFLIP
 	db  0,  0, $85, OAM_HFLIP
-	db  8,  8, $86, OAM_HFLIP | OAMFLAG_CANBEMASKED
-	db  8,  0, $87, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA
+	db  8,  8, $86, OAM_HFLIP | UNDER_GRASS
+	db  8,  0, $87, OAM_HFLIP | UNDER_GRASS | FACING_END
 
 .StandingLeft:
 	db 4 ; #
 	db  0,  0, $08, 0
 	db  0,  8, $09, 0
-	db  8,  0, $0a, OAMFLAG_CANBEMASKED
-	db  8,  8, $0b, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA
+	db  8,  0, $0a, UNDER_GRASS
+	db  8,  8, $0b, UNDER_GRASS | FACING_END
 
 .WalkingLeft:
 	db 4 ; #
 	db  0,  0, $88, 0
 	db  0,  8, $89, 0
-	db  8,  0, $8a, OAMFLAG_CANBEMASKED
-	db  8,  8, $8b, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA
+	db  8,  0, $8a, UNDER_GRASS
+	db  8,  8, $8b, UNDER_GRASS | FACING_END
 
 .StandingRight:
 	db 4 ; #
 	db  0,  8, $08, OAM_HFLIP
 	db  0,  0, $09, OAM_HFLIP
-	db  8,  8, $0a, OAM_HFLIP | OAMFLAG_CANBEMASKED
-	db  8,  0, $0b, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA
+	db  8,  8, $0a, OAM_HFLIP | UNDER_GRASS
+	db  8,  0, $0b, OAM_HFLIP | UNDER_GRASS | FACING_END
 
 .WalkingRight:
 	db 4 ; #
 	db  0,  8, $88, OAM_HFLIP
 	db  0,  0, $89, OAM_HFLIP
-	db  8,  8, $8a, OAM_HFLIP | OAMFLAG_CANBEMASKED
-	db  8,  0, $8b, OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA
+	db  8,  8, $8a, OAM_HFLIP | UNDER_GRASS
+	db  8,  0, $8b, OAM_HFLIP | UNDER_GRASS | FACING_END
 
 .SpecialCase:
 	db 9 ; #
@@ -121,6 +121,6 @@ SpriteFacingAndAnimationTable:
 	db  4, -4, $01, 0
 	db  4,  4, $02, 0
 	db  4, 12, $01, 0
-	db 12, -4, $00, OAM_VFLIP | OAMFLAG_CANBEMASKED
-	db 12,  4, $01, OAMFLAG_CANBEMASKED
-	db 12, 12, $00, OAM_VFLIP | OAM_HFLIP | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA
+	db 12, -4, $00, OAM_VFLIP | UNDER_GRASS
+	db 12,  4, $01, UNDER_GRASS
+	db 12, 12, $00, OAM_VFLIP | OAM_HFLIP | UNDER_GRASS | FACING_END
diff --git a/data/text/text_1.asm b/data/text/text_1.asm
index 7dac6d4f..74b834bf 100644
--- a/data/text/text_1.asm
+++ b/data/text/text_1.asm
@@ -14,7 +14,7 @@ _CardKeyFailText::
 	done
 
 _TrainerNameText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text ": @"
 	text_end
 
diff --git a/data/text/text_2.asm b/data/text/text_2.asm
index df8a26b3..31f0edb8 100644
--- a/data/text/text_2.asm
+++ b/data/text/text_2.asm
@@ -10,7 +10,7 @@ _AIBattleUseItemText::
 	text_ram wTrainerName
 	text_start
 	line "used @"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text_start
 	cont "on @"
 	text_ram wEnemyMonNick
@@ -45,7 +45,7 @@ _TradeSendsText::
 	text_ram wLinkEnemyTrainerName
 	text " sends"
 	line "@"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text "."
 	done
 
@@ -56,7 +56,7 @@ _TradeWavesFarewellText::
 	done
 
 _TradeTransferredText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " is"
 	line "transferred."
 	done
@@ -64,7 +64,7 @@ _TradeTransferredText::
 _TradeTakeCareText::
 	text "Take good care of"
 	line "@"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text "."
 	done
 
@@ -72,7 +72,7 @@ _TradeWillTradeText::
 	text_ram wLinkEnemyTrainerName
 	text " will"
 	line "trade @"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text_start
 	done
 
@@ -796,7 +796,7 @@ _VermilionGymTrashFailText::
 _FoundHiddenItemText::
 	text "<PLAYER> found"
 	line "@"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text "!@"
 	text_end
 
@@ -1119,7 +1119,7 @@ _CantMoveText::
 _MoveIsDisabledText::
 	text "<USER>'s"
 	line "@"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " is"
 	cont "disabled!"
 	prompt
@@ -1254,7 +1254,7 @@ _HitXTimesText::
 	prompt
 
 _GainedText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " gained"
 	line "@"
 	text_end
@@ -1275,10 +1275,10 @@ _ExpPointsText::
 	prompt
 
 _GrewLevelText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " grew"
 	line "to level @"
-	text_decimal wCurEnemyLVL, 1, 3
+	text_decimal wCurEnemyLevel, 1, 3
 	text "!@"
 	text_end
 
diff --git a/data/text/text_3.asm b/data/text/text_3.asm
index 832559f8..bb8302b4 100644
--- a/data/text/text_3.asm
+++ b/data/text/text_3.asm
@@ -113,7 +113,7 @@ _PartyMenuSwapMonText::
 	done
 
 _PotionText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text_start
 	line "recovered by @"
 	text_decimal wHPBarHPDifference, 2, 3
@@ -121,52 +121,52 @@ _PotionText::
 	done
 
 _AntidoteText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " was"
 	line "cured of poison!"
 	done
 
 _ParlyzHealText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text "'s"
 	line "rid of paralysis!"
 	done
 
 _BurnHealText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text "'s"
 	line "burn was healed!"
 	done
 
 _IceHealText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " was"
 	line "defrosted!"
 	done
 
 _AwakeningText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text_start
 	line "woke up!"
 	done
 
 _FullHealText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text "'s"
 	line "health returned!"
 	done
 
 _ReviveText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text_start
 	line "is revitalized!"
 	done
 
 _RareCandyText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " grew"
 	line "to level @"
-	text_decimal wCurEnemyLVL, 1, 3
+	text_decimal wCurEnemyLevel, 1, 3
 	text "!@"
 	text_end
 
@@ -218,7 +218,7 @@ _DepositHowManyText::
 	done
 
 _ItemWasStoredText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " was"
 	line "stored via PC."
 	prompt
@@ -245,7 +245,7 @@ _WithdrawHowManyText::
 _WithdrewItemText::
 	text "Withdrew"
 	line "@"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text "."
 	prompt
 
@@ -335,7 +335,7 @@ _CantTakeMonText::
 	prompt
 
 _PikachuUnhappyText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " looks"
 	line "unhappy about it!"
 	prompt
@@ -384,7 +384,7 @@ _HereYouGoText::
 _SoYouWantPrizeText::
 	text "So, you want"
 	line "@"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text "?"
 	done
 
@@ -493,7 +493,7 @@ _DoYouWantToNicknameText::
 	text "Do you want to"
 	line "give a nickname"
 	cont "to @"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text "?"
 	done
 
@@ -512,7 +512,7 @@ _WillBeTradedText::
 	text_ram wNameOfPlayerMonToBeTraded
 	text " and"
 	line "@"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " will"
 	cont "be traded."
 	done
@@ -578,19 +578,19 @@ _ColosseumTotalL50Text::
 	prompt
 
 _ColosseumHeightText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " is over"
 	line "6’8” tall!"
 	prompt
 
 _ColosseumWeightText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " weighs"
 	line "over 44 pounds!"
 	prompt
 
 _ColosseumEvolvedText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " is an"
 	line "evolved #MON!"
 	prompt
@@ -621,7 +621,7 @@ _ColosseumVersionText::
 	prompt
 
 _TextIDErrorText::
-	text_decimal hSpriteIndexOrTextID, 1, 2
+	text_decimal hTextID, 1, 2
 	text " error."
 	done
 
diff --git a/data/text/text_4.asm b/data/text/text_4.asm
index fd5caad2..935687b8 100644
--- a/data/text/text_4.asm
+++ b/data/text/text_4.asm
@@ -44,7 +44,7 @@ _EvolvedText::
 _IntoText::
 	text_start
 	line "into @"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text "!"
 	done
 
diff --git a/data/text/text_5.asm b/data/text/text_5.asm
index 834d89dc..47fc87e7 100644
--- a/data/text/text_5.asm
+++ b/data/text/text_5.asm
@@ -128,14 +128,14 @@ _MimicLearnedMoveText::
 	text "<USER>"
 	line "learned"
 	cont "@"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text "!"
 	prompt
 
 _MoveWasDisabledText::
 	text "<TARGET>'s"
 	line "@"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " was"
 	cont "disabled!"
 	prompt
@@ -233,7 +233,7 @@ _TransformedText::
 	text "<USER>"
 	line "transformed into"
 	cont "@"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text "!"
 	prompt
 
diff --git a/data/text/text_7.asm b/data/text/text_7.asm
index ddc51d59..f0017963 100644
--- a/data/text/text_7.asm
+++ b/data/text/text_7.asm
@@ -8,7 +8,7 @@ _PokemartGreetingText::
 	done
 
 _PokemonFaintedText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text_start
 	line "fainted!"
 	done
@@ -149,7 +149,7 @@ _ForgotAndText::
 	text_ram wLearnMoveMonName
 	text " forgot"
 	line "@"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text "!"
 
 	para "And..."
diff --git a/data/text/text_8.asm b/data/text/text_8.asm
index 67492354..1a56f352 100644
--- a/data/text/text_8.asm
+++ b/data/text/text_8.asm
@@ -43,13 +43,13 @@ _WarpToLastPokemonCenterText::
 	done
 
 _CannotUseTeleportNowText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " can't"
 	line "use TELEPORT now."
 	prompt
 
 _CannotFlyHereText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " can't"
 	line "FLY here."
 	prompt
@@ -75,13 +75,13 @@ _CannotGetOffHereText::
 	prompt
 
 _UsedStrengthText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " used"
 	line "STRENGTH.@"
 	text_end
 
 _CanMoveBouldersText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " can"
 	line "move boulders."
 	prompt
@@ -99,7 +99,7 @@ _CyclingIsFunText::
 _GotMonText::
 	text "<PLAYER> got"
 	line "@"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text "!@"
 	text_end
 
diff --git a/data/text/text_9.asm b/data/text/text_9.asm
index bb00403b..d9545694 100644
--- a/data/text/text_9.asm
+++ b/data/text/text_9.asm
@@ -59,7 +59,7 @@ _ItemUseBallText06::
 _SurfingGotOnText::
 	text "<PLAYER> got on"
 	line "@"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text "!"
 	prompt
 
@@ -69,13 +69,13 @@ _SurfingNoPlaceToGetOffText::
 	prompt
 
 _RefusingText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text_start
 	line "is refusing!"
 	prompt
 
 _VitaminStatRoseText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text "'s"
 	line "@"
 	text_ram wStringBuffer
@@ -180,7 +180,7 @@ _TeachMachineMoveText::
 	done
 
 _MonCannotLearnMachineMoveText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " is not"
 	line "compatible with"
 	cont "@"
@@ -226,7 +226,7 @@ _NoCyclingAllowedHereText::
 _NoSurfingHereText::
 	text "No SURFing on"
 	line "@"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " here!"
 	prompt
 
@@ -272,7 +272,7 @@ _GotOffBicycleText2::
 _ThrewAwayItemText::
 	text "Threw away"
 	line "@"
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text "."
 	prompt
 
@@ -289,7 +289,7 @@ _TooImportantToTossText::
 	prompt
 
 _AlreadyKnowsText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " knows"
 	line "@"
 	text_ram wStringBuffer
@@ -436,7 +436,7 @@ _NothingToCutText::
 	prompt
 
 _UsedCutText::
-	text_ram wcd6d
+	text_ram wNameBuffer
 	text " hacked"
 	line "away with CUT!"
 	prompt