summaryrefslogtreecommitdiff
path: root/maps/Route39Farmhouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route39Farmhouse.asm')
-rw-r--r--maps/Route39Farmhouse.asm49
1 files changed, 21 insertions, 28 deletions
diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm
index 9f46263de..510d6e5d5 100644
--- a/maps/Route39Farmhouse.asm
+++ b/maps/Route39Farmhouse.asm
@@ -1,13 +1,11 @@
-const_value set 2
+ const_def 2 ; object constants
const ROUTE39FARMHOUSE_POKEFAN_M
const ROUTE39FARMHOUSE_POKEFAN_F
Route39Farmhouse_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
PokefanM_DairyFarmer:
faceplayer
@@ -24,15 +22,15 @@ FarmerMScript_SellMilk:
checkitem MOOMOO_MILK
iftrue FarmerMScript_Milking
writetext FarmerMText_BuyMilk
- special Special_PlaceMoneyTopRight
+ special PlaceMoneyTopRight
yesorno
iffalse FarmerMScript_NoSale
checkmoney YOUR_MONEY, 500
- if_equal HAVE_LESS, FarmerMScript_NoMoney
+ ifequal HAVE_LESS, FarmerMScript_NoMoney
giveitem MOOMOO_MILK
iffalse FarmerMScript_NoRoom
takemoney YOUR_MONEY, 500
- special Special_PlaceMoneyTopRight
+ special PlaceMoneyTopRight
waitsfx
playsound SFX_TRANSACTION
writetext FarmerMText_GotMilk
@@ -193,23 +191,18 @@ FarmerFText_SnoreSpeech:
done
Route39Farmhouse_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 2
- warp_def 2, 7, 2, ROUTE_39
- warp_def 3, 7, 2, ROUTE_39
-
-.CoordEvents:
- db 0
-
-.BGEvents:
- db 2
- bg_event 0, 1, BGEVENT_READ, FarmhouseBookshelf
- bg_event 1, 1, BGEVENT_READ, FarmhouseBookshelf
-
-.ObjectEvents:
- db 2
- object_event 3, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1
- object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1
+ db 0, 0 ; filler
+
+ db 2 ; warp events
+ warp_event 2, 7, ROUTE_39, 2
+ warp_event 3, 7, ROUTE_39, 2
+
+ db 0 ; coord events
+
+ db 2 ; bg events
+ bg_event 0, 1, BGEVENT_READ, FarmhouseBookshelf
+ bg_event 1, 1, BGEVENT_READ, FarmhouseBookshelf
+
+ db 2 ; object events
+ object_event 3, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokefanM_DairyFarmer, -1
+ object_event 5, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, PokefanF_SnoreFarmer, -1