summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-04-26 20:45:59 -0400
committerentrpntr <entrpntr@gmail.com>2020-04-26 22:15:31 -0400
commitd53f3afe500ad9e92f18a7e6de77982928a6061f (patch)
tree9fd2697a741c82a98104b1c23437907f061be034 /data
parent0b33dabae2d43591a964774154f8bec5bf7194b1 (diff)
Clean up some overworld code.
Diffstat (limited to 'data')
-rw-r--r--data/events/field_move_blocks.asm52
-rw-r--r--data/events/happiness_changes.asm21
-rwxr-xr-xdata/text/common_1.asm12
-rw-r--r--data/text/common_2.asm62
4 files changed, 110 insertions, 37 deletions
diff --git a/data/events/field_move_blocks.asm b/data/events/field_move_blocks.asm
new file mode 100644
index 00000000..fea80f53
--- /dev/null
+++ b/data/events/field_move_blocks.asm
@@ -0,0 +1,52 @@
+CutTreeBlockPointers:
+; tileset, block list pointer
+ dbw TILESET_JOHTO, .johto
+ dbw TILESET_JOHTO_MODERN, .johto_modern
+ dbw TILESET_KANTO, .kanto
+ dbw TILESET_PARK, .park
+ dbw TILESET_FOREST, .forest
+ db -1 ; end
+
+.johto:
+; facing block, replacement block, animation
+ db $03, $02, 1 ; grass
+ db $5b, $3c, 0 ; tree
+ db $5f, $3d, 0 ; tree
+ db $63, $3f, 0 ; tree
+ db $67, $3e, 0 ; tree
+ db -1 ; end
+
+.johto_modern:
+; facing block, replacement block, animation
+ db $03, $02, $01 ; grass
+ db -1 ; end
+
+.kanto:
+; facing block, replacement block, animation
+ db $0b, $0a, 1 ; grass
+ db $32, $6d, 0 ; tree
+ db $33, $6c, 0 ; tree
+ db $34, $6f, 0 ; tree
+ db $35, $4c, 0 ; tree
+ db $60, $6e, 0 ; tree
+ db -1 ; end
+
+.park:
+; facing block, replacement block, animation
+ db $13, $03, 1 ; grass
+ db $03, $04, 1 ; grass
+ db -1 ; end
+
+.forest:
+; facing block, replacement block, animation
+ db $0f, $17, 0
+ db -1 ; end
+
+WhirlpoolBlockPointers:
+ dbw TILESET_JOHTO, .johto
+ db -1 ; end
+
+.johto:
+; facing block, replacement block, animation
+ db $07, $36, 0
+ db -1 ; end
diff --git a/data/events/happiness_changes.asm b/data/events/happiness_changes.asm
new file mode 100644
index 00000000..aa154e4c
--- /dev/null
+++ b/data/events/happiness_changes.asm
@@ -0,0 +1,21 @@
+HappinessChanges:
+; entries correspond to HAPPINESS_* constants
+; change if happiness < 100, change if happiness < 200, change otherwise
+ db +5, +3, +2 ; Gained a level
+ db +5, +3, +2 ; Vitamin
+ db +1, +1, +0 ; X Item
+ db +3, +2, +1 ; Battled a Gym Leader
+ db +1, +1, +0 ; Learned a move
+ db -1, -1, -1 ; Lost to an enemy
+ db -5, -5, -10 ; Fainted due to poison
+ db -5, -5, -10 ; Lost to a much stronger enemy
+ db +1, +1, +1 ; Haircut (older brother) 1
+ db +3, +3, +1 ; Haircut (older brother) 2
+ db +5, +5, +2 ; Haircut (older brother) 3
+ db +1, +1, +1 ; Haircut (younger brother) 1
+ db +3, +3, +1 ; Haircut (younger brother) 2
+ db +10, +10, +4 ; Haircut (younger brother) 3
+ db -5, -5, -10 ; Used Heal Powder or Energypowder (bitter)
+ db -10, -10, -15 ; Used Energy Root (bitter)
+ db -15, -15, -20 ; Used Revival Herb (bitter)
+ db +3, +3, +1 ; Grooming
diff --git a/data/text/common_1.asm b/data/text/common_1.asm
index ca1a8e9a..8745b9ee 100755
--- a/data/text/common_1.asm
+++ b/data/text/common_1.asm
@@ -1803,34 +1803,34 @@ UnknownText_0x1c04fa::
text "'s home."
prompt
-BadgeRequiredText_::
+_BadgeRequiredText::
text "Sorry! A new BADGE"
line "is required."
prompt
-CantUseFieldMoveHereText_::
+_CantUseItemText::
text "Can't use that"
line "here."
prompt
-Text_UsedCut_::
+_UseCutText::
text_ram wStringBuffer2
text " used"
line "CUT!"
prompt
-Text_NothingToCut_::
+_CutNothingText::
text "There's nothing to"
line "CUT here."
prompt
-Text_UsedFlash_::
+_BlindingFlashText::
text "A blinding FLASH"
line "lights the area!@"
text_promptbutton
db "@@"
-UsedSurfText_::
+_UsedSurfText::
text_ram wStringBuffer2
text " used"
line "SURF!"
diff --git a/data/text/common_2.asm b/data/text/common_2.asm
index 78c3d703..05ee596f 100644
--- a/data/text/common_2.asm
+++ b/data/text/common_2.asm
@@ -1,80 +1,80 @@
-CantSurfText_::
+_CantSurfText::
text "You can't SURF"
line "here."
prompt
-AlreadySurfingText_::
+_AlreadySurfingText::
text "You're already"
line "SURFING."
prompt
-AskSurfText_::
+_AskSurfText::
text "The water is calm."
line "Want to SURF?"
done
-Text_UsedWaterfall_::
+_UseWaterfallText::
text_ram wStringBuffer2
text " used"
line "WATERFALL!"
done
-Text_CantDoWaterfall_::
+_HugeWaterfallText::
text "Wow, it's a huge"
line "waterfall."
done
-Text_AskUseWaterfall_::
+_AskWaterfallText::
text "Do you want to use"
line "WATERFALL?"
done
-Text_UsedDig_::
+_UseDigText::
text_ram wStringBuffer2
text " used"
line "DIG!"
done
-Text_UsedEscapeRope_::
+_UseEscapeRopeText::
text "<PLAYER> used an"
line "ESCAPE ROPE."
done
-Text_CantUseDigEscapeRopeHere_::
+_CantUseDigText::
text "Can't use that"
line "here."
done
-Text_ReturnToLastMonCenter_::
+_TeleportReturnText::
text "Return to the last"
line "#MON CENTER."
done
-Text_CantUseTeleportHere_::
+_CantUseTeleportText::
text "Can't use that"
line "here."
para ""
done
-Text_AlreadyUsingStrength_::
+_AlreadyUsingStrengthText::
text "A #MON is using"
line "STRENGTH already."
prompt
-Text_UsedStrength_::
+_UseStrengthText::
text_ram wStringBuffer2
text " used"
line "STRENGTH!"
done
-Text_AllowedToMoveBoulders_::
+_MoveBoulderText::
text_ram wStringBuffer1
text " can"
line "move boulders."
prompt
-Text_AskStrength_::
+_AskStrengthText::
text "A #MON may be"
line "able to move this."
@@ -82,23 +82,23 @@ Text_AskStrength_::
line "STRENGTH?"
done
-Text_BouldersMayNowBeMoved_::
+_BouldersMoveText::
text "Boulders may now"
line "be moved!"
done
-Text_MonMayBeAbleToMove_::
+_BouldersMayMoveText::
text "A #MON may be"
line "able to move this."
done
-Text_UsedWhirlpool_::
+_UseWhirlpoolText::
text_ram wStringBuffer2
text " used"
line "WHIRLPOOL!"
prompt
-Text_MightyWhirlpool_::
+_MayPassWhirlpoolText::
text "It's a vicious"
line "whirlpool!"
@@ -106,7 +106,7 @@ Text_MightyWhirlpool_::
line "able to pass it."
done
-Text_AskWhirlpool_::
+_AskWhirlpoolText::
text "A whirlpool is in"
line "the way."
@@ -114,17 +114,17 @@ Text_AskWhirlpool_::
line "WHIRLPOOL?"
done
-Text_DidAHeadbutt_::
+_UseHeadbuttText::
text_ram wStringBuffer2
text " did a"
line "HEADBUTT!"
prompt
-Text_NothingFromHeadbutt_::
+_HeadbuttNothingText::
text "Nope. Nothing…"
done
-Text_AskHeadbutt_::
+_AskHeadbuttText::
text "A #MON could be"
line "in this tree."
@@ -132,18 +132,18 @@ Text_AskHeadbutt_::
line "it?"
done
-Text_UsedRockSmash_::
+_UseRockSmashText::
text_ram wStringBuffer2
text " used"
line "ROCK SMASH!"
prompt
-Text_MayBeBreakable_::
+_MaySmashText::
text "A #MON may be"
line "able to break it."
done
-Text_AskRockSmash_::
+_AskRockSmashText::
text "This rock looks"
line "breakable."
@@ -151,16 +151,16 @@ Text_AskRockSmash_::
line "SMASH?"
done
-Text_OhABite_::
+_RodBiteText::
text "Oh!"
line "A bite!"
prompt
-Text_NotEvenANibble_::
+_RodNothingText::
text "Not even a nibble!"
prompt
-Text_NothingHereToFish_::
+_UnusedNothingHereText::
text "Looks like there's"
line "nothing here."
prompt
@@ -184,14 +184,14 @@ _GotOffBikeText::
text "."
done
-Text_AskCut_::
+_AskCutText::
text "This tree can be"
line "CUT!"
para "Want to use CUT?"
done
-Text_MonCanCutThis_::
+_CanCutText::
text "This tree can be"
line "CUT!"
done