diff options
| author | Ebernacher90 <danielvonderbank@gmail.com> | 2020-09-13 03:46:21 +0200 |
|---|---|---|
| committer | Ebernacher90 <danielvonderbank@gmail.com> | 2020-09-13 03:46:21 +0200 |
| commit | d4315d68bdf5f011c7891468ffaed70180c20a9c (patch) | |
| tree | 7ab3ce737812e3bd8dd47954472400c7ecae5836 /data | |
| parent | 462b7521b221a3766d7f21a9e1c7c1f11f72c52a (diff) | |
Give all .asm and all .inc except of base_stats/???.inc new line at the end of file
Diffstat (limited to 'data')
246 files changed, 246 insertions, 246 deletions
diff --git a/data/collision/collision_type_table.asm b/data/collision/collision_type_table.asm index a4ec2ba..f4a75ce 100644 --- a/data/collision/collision_type_table.asm +++ b/data/collision/collision_type_table.asm @@ -66,4 +66,4 @@ CollisionTypeTable: ; 03:4664 db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, NEVER_SOLID ; $F4 db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, NEVER_SOLID ; $F8 db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, NEVER_SOLID ; $FC - db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, ALWAYS_SOLID ; $100
\ No newline at end of file + db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, ALWAYS_SOLID ; $100 diff --git a/data/maps/attributes/OldCityPokecenter2F.asm b/data/maps/attributes/OldCityPokecenter2F.asm index ebe5480..2f6ab03 100644 --- a/data/maps/attributes/OldCityPokecenter2F.asm +++ b/data/maps/attributes/OldCityPokecenter2F.asm @@ -21,4 +21,4 @@ OldCityPokecenter2F_MapEvents:: object_event 2, 3, SPRITE_GRAMPS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -OldCityPokecenter2F_Blocks:: INCBIN "maps/blk/OldCityPokecenter2F.blk"
\ No newline at end of file +OldCityPokecenter2F_Blocks:: INCBIN "maps/blk/OldCityPokecenter2F.blk" diff --git a/data/maps/attributes/OldCityPokecenterBattle.asm b/data/maps/attributes/OldCityPokecenterBattle.asm index 5b13157..daae3ac 100644 --- a/data/maps/attributes/OldCityPokecenterBattle.asm +++ b/data/maps/attributes/OldCityPokecenterBattle.asm @@ -15,4 +15,4 @@ OldCityPokecenterBattle_MapEvents:: db 1 ; person events object_event 3, 3, SPRITE_GOLD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -OldCityPokecenterBattle_Blocks:: INCBIN "maps/blk/OldCityPokecenterBattle.blk"
\ No newline at end of file +OldCityPokecenterBattle_Blocks:: INCBIN "maps/blk/OldCityPokecenterBattle.blk" diff --git a/data/maps/attributes/OldCityPokecenterTimeMachine.asm b/data/maps/attributes/OldCityPokecenterTimeMachine.asm index bbf048e..312e633 100644 --- a/data/maps/attributes/OldCityPokecenterTimeMachine.asm +++ b/data/maps/attributes/OldCityPokecenterTimeMachine.asm @@ -16,4 +16,4 @@ OldCityPokecenterTimeMachine_MapEvents:: db 1 ; person events object_event 13, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -OldCityPokecenterTimeMachine_Blocks:: INCBIN "maps/blk/OldCityPokecenterTimeMachine.blk"
\ No newline at end of file +OldCityPokecenterTimeMachine_Blocks:: INCBIN "maps/blk/OldCityPokecenterTimeMachine.blk" diff --git a/data/maps/attributes/OldCityPokecenterTrade.asm b/data/maps/attributes/OldCityPokecenterTrade.asm index 122f0b7..7c3abe7 100644 --- a/data/maps/attributes/OldCityPokecenterTrade.asm +++ b/data/maps/attributes/OldCityPokecenterTrade.asm @@ -15,4 +15,4 @@ OldCityPokecenterTrade_MapEvents:: db 1 ; person events object_event 3, 3, SPRITE_GOLD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -OldCityPokecenterTrade_Blocks:: INCBIN "maps/blk/OldCityPokecenterTrade.blk"
\ No newline at end of file +OldCityPokecenterTrade_Blocks:: INCBIN "maps/blk/OldCityPokecenterTrade.blk" diff --git a/data/maps/attributes/PlayerHouse1F.asm b/data/maps/attributes/PlayerHouse1F.asm index bb03326..a97559d 100644 --- a/data/maps/attributes/PlayerHouse1F.asm +++ b/data/maps/attributes/PlayerHouse1F.asm @@ -21,4 +21,4 @@ PlayerHouse1F_MapEvents:: db 1 ; person events object_event 7, 3, SPRITE_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -PlayerHouse1F_Blocks:: INCBIN "maps/blk/PlayerHouse1F.blk"
\ No newline at end of file +PlayerHouse1F_Blocks:: INCBIN "maps/blk/PlayerHouse1F.blk" diff --git a/data/maps/attributes/PlayerHouse2F.asm b/data/maps/attributes/PlayerHouse2F.asm index 9a889ec..66be90b 100644 --- a/data/maps/attributes/PlayerHouse2F.asm +++ b/data/maps/attributes/PlayerHouse2F.asm @@ -20,4 +20,4 @@ PlayerHouse2F_MapEvents:: object_event 8, 1, SPRITE_ROCKER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 1, SPRITE_PIPPI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -PlayerHouse2F_Blocks:: INCBIN "maps/blk/PlayerHouse2F.blk"
\ No newline at end of file +PlayerHouse2F_Blocks:: INCBIN "maps/blk/PlayerHouse2F.blk" diff --git a/data/maps/attributes/Route1Gate1F.asm b/data/maps/attributes/Route1Gate1F.asm index f6e6804..0329f21 100644 --- a/data/maps/attributes/Route1Gate1F.asm +++ b/data/maps/attributes/Route1Gate1F.asm @@ -19,4 +19,4 @@ Route1Gate1F_MapEvents:: object_event 6, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 1, 6, SPRITE_COOLTRAINER_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 -Route1Gate1F_Blocks:: INCBIN "maps/blk/Route1Gate1F.blk"
\ No newline at end of file +Route1Gate1F_Blocks:: INCBIN "maps/blk/Route1Gate1F.blk" diff --git a/data/maps/attributes/Route1Gate2F.asm b/data/maps/attributes/Route1Gate2F.asm index d38f281..dcfa07a 100644 --- a/data/maps/attributes/Route1Gate2F.asm +++ b/data/maps/attributes/Route1Gate2F.asm @@ -17,4 +17,4 @@ Route1Gate2F_MapEvents:: object_event 3, 3, SPRITE_LASS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 4, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -Route1Gate2F_Blocks:: INCBIN "maps/blk/Route1Gate2F.blk"
\ No newline at end of file +Route1Gate2F_Blocks:: INCBIN "maps/blk/Route1Gate2F.blk" diff --git a/data/maps/attributes/Route1P1.asm b/data/maps/attributes/Route1P1.asm index 4dfcd57..8332b67 100644 --- a/data/maps/attributes/Route1P1.asm +++ b/data/maps/attributes/Route1P1.asm @@ -20,4 +20,4 @@ Route1P1_MapEvents:: object_event 20, 5, SPRITE_SUPER_NERD, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 18, 12, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 -Route1P1_Blocks:: INCBIN "maps/blk/Route1P1.blk"
\ No newline at end of file +Route1P1_Blocks:: INCBIN "maps/blk/Route1P1.blk" diff --git a/data/maps/attributes/Route1P2.asm b/data/maps/attributes/Route1P2.asm index 52e1dbf..881d80e 100644 --- a/data/maps/attributes/Route1P2.asm +++ b/data/maps/attributes/Route1P2.asm @@ -21,4 +21,4 @@ Route1P2_MapEvents:: object_event 8, 6, SPRITE_SILVER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 7, 15, SPRITE_TEACHER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 -Route1P2_Blocks:: INCBIN "maps/blk/Route1P2.blk"
\ No newline at end of file +Route1P2_Blocks:: INCBIN "maps/blk/Route1P2.blk" diff --git a/data/maps/attributes/ShizukanaOka.asm b/data/maps/attributes/ShizukanaOka.asm index fe1b3e3..09978c1 100644 --- a/data/maps/attributes/ShizukanaOka.asm +++ b/data/maps/attributes/ShizukanaOka.asm @@ -30,4 +30,4 @@ ShizukanaOka_MapEvents:: object_event 36, 16, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 object_event 9, 25, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 -ShizukanaOka_Blocks:: INCBIN "maps/blk/ShizukanaOka.blk"
\ No newline at end of file +ShizukanaOka_Blocks:: INCBIN "maps/blk/ShizukanaOka.blk" diff --git a/data/maps/attributes/SilentHill.asm b/data/maps/attributes/SilentHill.asm index 022d75d..b791c37 100644 --- a/data/maps/attributes/SilentHill.asm +++ b/data/maps/attributes/SilentHill.asm @@ -29,4 +29,4 @@ SilentHill_MapEvents:: object_event 8, 6, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 13, SPRITE_SUPER_NERD, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 -SilentHill_Blocks:: INCBIN "maps/blk/SilentHill.blk"
\ No newline at end of file +SilentHill_Blocks:: INCBIN "maps/blk/SilentHill.blk" diff --git a/data/maps/attributes/SilentHillHouse.asm b/data/maps/attributes/SilentHillHouse.asm index d80a4c7..7aa6d92 100644 --- a/data/maps/attributes/SilentHillHouse.asm +++ b/data/maps/attributes/SilentHillHouse.asm @@ -22,4 +22,4 @@ SilentHillHouse_MapEvents:: object_event 5, 3, SPRITE_SILVERS_MOM, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 5, 4, SPRITE_ROCKER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -SilentHillHouse_Blocks:: INCBIN "maps/blk/SilentHillHouse.blk"
\ No newline at end of file +SilentHillHouse_Blocks:: INCBIN "maps/blk/SilentHillHouse.blk" diff --git a/data/maps/attributes/SilentHillLabBack.asm b/data/maps/attributes/SilentHillLabBack.asm index 9ebe949..fc069c4 100644 --- a/data/maps/attributes/SilentHillLabBack.asm +++ b/data/maps/attributes/SilentHillLabBack.asm @@ -24,4 +24,4 @@ SilentHillLabBack_MapEvents:: object_event 6, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 7, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -SilentHillLabBack_Blocks:: INCBIN "maps/blk/SilentHillLabBack.blk"
\ No newline at end of file +SilentHillLabBack_Blocks:: INCBIN "maps/blk/SilentHillLabBack.blk" diff --git a/data/maps/attributes/SilentHillLabFront.asm b/data/maps/attributes/SilentHillLabFront.asm index 4c11d62..fbae2f8 100644 --- a/data/maps/attributes/SilentHillLabFront.asm +++ b/data/maps/attributes/SilentHillLabFront.asm @@ -41,4 +41,4 @@ SilentHillLabFront_MapEvents:: object_event 0, 1, SPRITE_POKEDEX, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 1, 1, SPRITE_POKEDEX, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -SilentHillLabFront_Blocks:: INCBIN "maps/blk/SilentHillLabFront.blk"
\ No newline at end of file +SilentHillLabFront_Blocks:: INCBIN "maps/blk/SilentHillLabFront.blk" diff --git a/data/maps/attributes/SilentHillPokecenter.asm b/data/maps/attributes/SilentHillPokecenter.asm index 929def1..1f1bad8 100644 --- a/data/maps/attributes/SilentHillPokecenter.asm +++ b/data/maps/attributes/SilentHillPokecenter.asm @@ -20,4 +20,4 @@ SilentHillPokecenter_MapEvents:: object_event 9, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_SIDON, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -SilentHillPokecenter_Blocks:: INCBIN "maps/blk/SilentHillPokecenter.blk"
\ No newline at end of file +SilentHillPokecenter_Blocks:: INCBIN "maps/blk/SilentHillPokecenter.blk" diff --git a/data/maps/attributes/UnusedMap13.asm b/data/maps/attributes/UnusedMap13.asm index 6976d22..e178b08 100644 --- a/data/maps/attributes/UnusedMap13.asm +++ b/data/maps/attributes/UnusedMap13.asm @@ -4,4 +4,4 @@ SECTION "data/maps/attributes/UnusedMap13.asm", ROMX map_attributes UnusedMap13, UNUSED_MAP_13, 0 UnusedMap13_MapEvents:: -UnusedMap13_Blocks:: INCBIN "maps/blk/UnusedMap13.blk"
\ No newline at end of file +UnusedMap13_Blocks:: INCBIN "maps/blk/UnusedMap13.blk" diff --git a/data/maps/attributes/placeholder/Baadon.asm b/data/maps/attributes/placeholder/Baadon.asm index 0be8718..c6d8472 100644 --- a/data/maps/attributes/placeholder/Baadon.asm +++ b/data/maps/attributes/placeholder/Baadon.asm @@ -31,4 +31,4 @@ Baadon_MapEvents:: object_event 6, 9, SPRITE_YOUNGSTER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 14, SPRITE_TWIN, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -Baadon_Blocks:: INCBIN "maps/placeholder/blk/Baadon.blk"
\ No newline at end of file +Baadon_Blocks:: INCBIN "maps/placeholder/blk/Baadon.blk" diff --git a/data/maps/attributes/placeholder/BaadonHouse1.asm b/data/maps/attributes/placeholder/BaadonHouse1.asm index 5054e5f..df97af6 100644 --- a/data/maps/attributes/placeholder/BaadonHouse1.asm +++ b/data/maps/attributes/placeholder/BaadonHouse1.asm @@ -15,4 +15,4 @@ BaadonHouse1_MapEvents:: db 1 ; person events object_event 2, 3, SPRITE_ELDER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BaadonHouse1_Blocks:: INCBIN "maps/placeholder/blk/BaadonHouse1.blk"
\ No newline at end of file +BaadonHouse1_Blocks:: INCBIN "maps/placeholder/blk/BaadonHouse1.blk" diff --git a/data/maps/attributes/placeholder/BaadonHouse2.asm b/data/maps/attributes/placeholder/BaadonHouse2.asm index dafd2f2..0cd6f84 100644 --- a/data/maps/attributes/placeholder/BaadonHouse2.asm +++ b/data/maps/attributes/placeholder/BaadonHouse2.asm @@ -15,4 +15,4 @@ BaadonHouse2_MapEvents:: db 1 ; person events object_event 7, 5, SPRITE_GRANNY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BaadonHouse2_Blocks:: INCBIN "maps/placeholder/blk/BaadonHouse2.blk"
\ No newline at end of file +BaadonHouse2_Blocks:: INCBIN "maps/placeholder/blk/BaadonHouse2.blk" diff --git a/data/maps/attributes/placeholder/BaadonLeague1F.asm b/data/maps/attributes/placeholder/BaadonLeague1F.asm index e243c75..cd94f09 100644 --- a/data/maps/attributes/placeholder/BaadonLeague1F.asm +++ b/data/maps/attributes/placeholder/BaadonLeague1F.asm @@ -20,4 +20,4 @@ BaadonLeague1F_MapEvents:: object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 -BaadonLeague1F_Blocks:: INCBIN "maps/placeholder/blk/BaadonLeague1F.blk"
\ No newline at end of file +BaadonLeague1F_Blocks:: INCBIN "maps/placeholder/blk/BaadonLeague1F.blk" diff --git a/data/maps/attributes/placeholder/BaadonLeague2F.asm b/data/maps/attributes/placeholder/BaadonLeague2F.asm index f4b7ef7..0e49595 100644 --- a/data/maps/attributes/placeholder/BaadonLeague2F.asm +++ b/data/maps/attributes/placeholder/BaadonLeague2F.asm @@ -18,4 +18,4 @@ BaadonLeague2F_MapEvents:: object_event 9, 9, SPRITE_24, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 2, 11, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BaadonLeague2F_Blocks:: INCBIN "maps/placeholder/blk/BaadonLeague2F.blk"
\ No newline at end of file +BaadonLeague2F_Blocks:: INCBIN "maps/placeholder/blk/BaadonLeague2F.blk" diff --git a/data/maps/attributes/placeholder/BaadonMart.asm b/data/maps/attributes/placeholder/BaadonMart.asm index 2e4bb5a..2d680c6 100644 --- a/data/maps/attributes/placeholder/BaadonMart.asm +++ b/data/maps/attributes/placeholder/BaadonMart.asm @@ -17,4 +17,4 @@ BaadonMart_MapEvents:: object_event 10, 5, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 4, 1, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BaadonMart_Blocks:: INCBIN "maps/placeholder/blk/BaadonMart.blk"
\ No newline at end of file +BaadonMart_Blocks:: INCBIN "maps/placeholder/blk/BaadonMart.blk" diff --git a/data/maps/attributes/placeholder/BaadonPokecenter1F.asm b/data/maps/attributes/placeholder/BaadonPokecenter1F.asm index dd4a004..47bd993 100644 --- a/data/maps/attributes/placeholder/BaadonPokecenter1F.asm +++ b/data/maps/attributes/placeholder/BaadonPokecenter1F.asm @@ -18,4 +18,4 @@ BaadonPokecenter1F_MapEvents:: object_event 2, 5, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_POKEFAN_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BaadonPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/BaadonPokecenter1F.blk"
\ No newline at end of file +BaadonPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/BaadonPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/BaadonPokecenter2F.asm b/data/maps/attributes/placeholder/BaadonPokecenter2F.asm index d4e41dc..d6fd1a8 100644 --- a/data/maps/attributes/placeholder/BaadonPokecenter2F.asm +++ b/data/maps/attributes/placeholder/BaadonPokecenter2F.asm @@ -16,4 +16,4 @@ BaadonPokecenter2F_MapEvents:: object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BaadonPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/BaadonPokecenter2F.blk"
\ No newline at end of file +BaadonPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/BaadonPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/BaadonRoute1.asm b/data/maps/attributes/placeholder/BaadonRoute1.asm index 691357a..48c3a54 100644 --- a/data/maps/attributes/placeholder/BaadonRoute1.asm +++ b/data/maps/attributes/placeholder/BaadonRoute1.asm @@ -16,4 +16,4 @@ BaadonRoute1_MapEvents:: db 0 ; person events -BaadonRoute1_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute1.blk"
\ No newline at end of file +BaadonRoute1_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute1.blk" diff --git a/data/maps/attributes/placeholder/BaadonRoute2.asm b/data/maps/attributes/placeholder/BaadonRoute2.asm index 1f15949..cb5d9bc 100644 --- a/data/maps/attributes/placeholder/BaadonRoute2.asm +++ b/data/maps/attributes/placeholder/BaadonRoute2.asm @@ -14,4 +14,4 @@ BaadonRoute2_MapEvents:: db 0 ; person events -BaadonRoute2_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute2.blk"
\ No newline at end of file +BaadonRoute2_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute2.blk" diff --git a/data/maps/attributes/placeholder/BaadonRoute3.asm b/data/maps/attributes/placeholder/BaadonRoute3.asm index 1c78579..d0e468d 100644 --- a/data/maps/attributes/placeholder/BaadonRoute3.asm +++ b/data/maps/attributes/placeholder/BaadonRoute3.asm @@ -16,4 +16,4 @@ BaadonRoute3_MapEvents:: db 0 ; person events -BaadonRoute3_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute3.blk"
\ No newline at end of file +BaadonRoute3_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute3.blk" diff --git a/data/maps/attributes/placeholder/BaadonRouteGateNewtype.asm b/data/maps/attributes/placeholder/BaadonRouteGateNewtype.asm index 42eeb7b..d144ca5 100644 --- a/data/maps/attributes/placeholder/BaadonRouteGateNewtype.asm +++ b/data/maps/attributes/placeholder/BaadonRouteGateNewtype.asm @@ -16,4 +16,4 @@ BaadonRouteGateNewtype_MapEvents:: db 0 ; person events -BaadonRouteGateNewtype_Blocks:: INCBIN "maps/placeholder/blk/BaadonRouteGateNewtype.blk"
\ No newline at end of file +BaadonRouteGateNewtype_Blocks:: INCBIN "maps/placeholder/blk/BaadonRouteGateNewtype.blk" diff --git a/data/maps/attributes/placeholder/BaadonRouteGateWest.asm b/data/maps/attributes/placeholder/BaadonRouteGateWest.asm index a7a6fd0..7763028 100644 --- a/data/maps/attributes/placeholder/BaadonRouteGateWest.asm +++ b/data/maps/attributes/placeholder/BaadonRouteGateWest.asm @@ -16,4 +16,4 @@ BaadonRouteGateWest_MapEvents:: db 0 ; person events -BaadonRouteGateWest_Blocks:: INCBIN "maps/placeholder/blk/BaadonRouteGateWest.blk"
\ No newline at end of file +BaadonRouteGateWest_Blocks:: INCBIN "maps/placeholder/blk/BaadonRouteGateWest.blk" diff --git a/data/maps/attributes/placeholder/BaadonWallpaperHouse.asm b/data/maps/attributes/placeholder/BaadonWallpaperHouse.asm index 93a3ebf..5a4d361 100644 --- a/data/maps/attributes/placeholder/BaadonWallpaperHouse.asm +++ b/data/maps/attributes/placeholder/BaadonWallpaperHouse.asm @@ -14,4 +14,4 @@ BaadonWallpaperHouse_MapEvents:: db 0 ; person events -BaadonWallpaperHouse_Blocks:: INCBIN "maps/placeholder/blk/BaadonWallpaperHouse.blk"
\ No newline at end of file +BaadonWallpaperHouse_Blocks:: INCBIN "maps/placeholder/blk/BaadonWallpaperHouse.blk" diff --git a/data/maps/attributes/placeholder/BullForest.asm b/data/maps/attributes/placeholder/BullForest.asm index 4c282c5..9900661 100644 --- a/data/maps/attributes/placeholder/BullForest.asm +++ b/data/maps/attributes/placeholder/BullForest.asm @@ -31,4 +31,4 @@ BullForest_MapEvents:: object_event 20, 19, SPRITE_TEACHER, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 20, 29, SPRITE_BUG_CATCHER_BOY, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 -BullForest_Blocks:: INCBIN "maps/placeholder/blk/BullForest.blk"
\ No newline at end of file +BullForest_Blocks:: INCBIN "maps/placeholder/blk/BullForest.blk" diff --git a/data/maps/attributes/placeholder/BullForestRoute1.asm b/data/maps/attributes/placeholder/BullForestRoute1.asm index 23afabd..7df21a6 100644 --- a/data/maps/attributes/placeholder/BullForestRoute1.asm +++ b/data/maps/attributes/placeholder/BullForestRoute1.asm @@ -17,4 +17,4 @@ BullForestRoute1_MapEvents:: db 0 ; person events -BullForestRoute1_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute1.blk"
\ No newline at end of file +BullForestRoute1_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute1.blk" diff --git a/data/maps/attributes/placeholder/BullForestRoute1House.asm b/data/maps/attributes/placeholder/BullForestRoute1House.asm index 6ebf4ef..a6bafc4 100644 --- a/data/maps/attributes/placeholder/BullForestRoute1House.asm +++ b/data/maps/attributes/placeholder/BullForestRoute1House.asm @@ -15,4 +15,4 @@ BullForestRoute1House_MapEvents:: db 1 ; person events object_event 1, 5, SPRITE_COOLTRAINER_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BullForestRoute1House_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute1House.blk"
\ No newline at end of file +BullForestRoute1House_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute1House.blk" diff --git a/data/maps/attributes/placeholder/BullForestRoute2.asm b/data/maps/attributes/placeholder/BullForestRoute2.asm index d4f11e7..cd1fc03 100644 --- a/data/maps/attributes/placeholder/BullForestRoute2.asm +++ b/data/maps/attributes/placeholder/BullForestRoute2.asm @@ -16,4 +16,4 @@ BullForestRoute2_MapEvents:: db 0 ; person events -BullForestRoute2_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute2.blk"
\ No newline at end of file +BullForestRoute2_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute2.blk" diff --git a/data/maps/attributes/placeholder/BullForestRoute3.asm b/data/maps/attributes/placeholder/BullForestRoute3.asm index bede5f9..b014dcf 100644 --- a/data/maps/attributes/placeholder/BullForestRoute3.asm +++ b/data/maps/attributes/placeholder/BullForestRoute3.asm @@ -14,4 +14,4 @@ BullForestRoute3_MapEvents:: db 0 ; person events -BullForestRoute3_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute3.blk"
\ No newline at end of file +BullForestRoute3_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute3.blk" diff --git a/data/maps/attributes/placeholder/BullForestRouteGateStand.asm b/data/maps/attributes/placeholder/BullForestRouteGateStand.asm index abae74d..b7c56a4 100644 --- a/data/maps/attributes/placeholder/BullForestRouteGateStand.asm +++ b/data/maps/attributes/placeholder/BullForestRouteGateStand.asm @@ -16,4 +16,4 @@ BullForestRouteGateStand_MapEvents:: db 0 ; person events -BullForestRouteGateStand_Blocks:: INCBIN "maps/placeholder/blk/BullForestRouteGateStand.blk"
\ No newline at end of file +BullForestRouteGateStand_Blocks:: INCBIN "maps/placeholder/blk/BullForestRouteGateStand.blk" diff --git a/data/maps/attributes/placeholder/BullHouse1.asm b/data/maps/attributes/placeholder/BullHouse1.asm index 86e5a2e..68fbd68 100644 --- a/data/maps/attributes/placeholder/BullHouse1.asm +++ b/data/maps/attributes/placeholder/BullHouse1.asm @@ -15,4 +15,4 @@ BullHouse1_MapEvents:: db 1 ; person events object_event 2, 3, SPRITE_KIKUKO, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BullHouse1_Blocks:: INCBIN "maps/placeholder/blk/BullHouse1.blk"
\ No newline at end of file +BullHouse1_Blocks:: INCBIN "maps/placeholder/blk/BullHouse1.blk" diff --git a/data/maps/attributes/placeholder/BullHouse2.asm b/data/maps/attributes/placeholder/BullHouse2.asm index ce83926..116e167 100644 --- a/data/maps/attributes/placeholder/BullHouse2.asm +++ b/data/maps/attributes/placeholder/BullHouse2.asm @@ -15,4 +15,4 @@ BullHouse2_MapEvents:: db 1 ; person events object_event 8, 4, SPRITE_GRANNY, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 -BullHouse2_Blocks:: INCBIN "maps/placeholder/blk/BullHouse2.blk"
\ No newline at end of file +BullHouse2_Blocks:: INCBIN "maps/placeholder/blk/BullHouse2.blk" diff --git a/data/maps/attributes/placeholder/BullHouse3.asm b/data/maps/attributes/placeholder/BullHouse3.asm index 6041314..95f6f63 100644 --- a/data/maps/attributes/placeholder/BullHouse3.asm +++ b/data/maps/attributes/placeholder/BullHouse3.asm @@ -15,4 +15,4 @@ BullHouse3_MapEvents:: db 1 ; person events object_event 4, 3, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BullHouse3_Blocks:: INCBIN "maps/placeholder/blk/BullHouse3.blk"
\ No newline at end of file +BullHouse3_Blocks:: INCBIN "maps/placeholder/blk/BullHouse3.blk" diff --git a/data/maps/attributes/placeholder/BullHouse4.asm b/data/maps/attributes/placeholder/BullHouse4.asm index aeaa191..4f54fd9 100644 --- a/data/maps/attributes/placeholder/BullHouse4.asm +++ b/data/maps/attributes/placeholder/BullHouse4.asm @@ -14,4 +14,4 @@ BullHouse4_MapEvents:: db 0 ; person events -BullHouse4_Blocks:: INCBIN "maps/placeholder/blk/BullHouse4.blk"
\ No newline at end of file +BullHouse4_Blocks:: INCBIN "maps/placeholder/blk/BullHouse4.blk" diff --git a/data/maps/attributes/placeholder/BullLeague1F.asm b/data/maps/attributes/placeholder/BullLeague1F.asm index 7c68b24..49f4480 100644 --- a/data/maps/attributes/placeholder/BullLeague1F.asm +++ b/data/maps/attributes/placeholder/BullLeague1F.asm @@ -20,4 +20,4 @@ BullLeague1F_MapEvents:: object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 -BullLeague1F_Blocks:: INCBIN "maps/placeholder/blk/BullLeague1F.blk"
\ No newline at end of file +BullLeague1F_Blocks:: INCBIN "maps/placeholder/blk/BullLeague1F.blk" diff --git a/data/maps/attributes/placeholder/BullLeague2F.asm b/data/maps/attributes/placeholder/BullLeague2F.asm index 9d6a2dc..88195ba 100644 --- a/data/maps/attributes/placeholder/BullLeague2F.asm +++ b/data/maps/attributes/placeholder/BullLeague2F.asm @@ -18,4 +18,4 @@ BullLeague2F_MapEvents:: object_event 2, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 7, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BullLeague2F_Blocks:: INCBIN "maps/placeholder/blk/BullLeague2F.blk"
\ No newline at end of file +BullLeague2F_Blocks:: INCBIN "maps/placeholder/blk/BullLeague2F.blk" diff --git a/data/maps/attributes/placeholder/BullMart.asm b/data/maps/attributes/placeholder/BullMart.asm index d82e003..ab6406d 100644 --- a/data/maps/attributes/placeholder/BullMart.asm +++ b/data/maps/attributes/placeholder/BullMart.asm @@ -17,4 +17,4 @@ BullMart_MapEvents:: object_event 10, 5, SPRITE_FISHER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 4, 1, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BullMart_Blocks:: INCBIN "maps/placeholder/blk/BullMart.blk"
\ No newline at end of file +BullMart_Blocks:: INCBIN "maps/placeholder/blk/BullMart.blk" diff --git a/data/maps/attributes/placeholder/BullPokecenter1F.asm b/data/maps/attributes/placeholder/BullPokecenter1F.asm index b8c6702..8b1d201 100644 --- a/data/maps/attributes/placeholder/BullPokecenter1F.asm +++ b/data/maps/attributes/placeholder/BullPokecenter1F.asm @@ -19,4 +19,4 @@ BullPokecenter1F_MapEvents:: object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BullPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/BullPokecenter1F.blk"
\ No newline at end of file +BullPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/BullPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/BullPokecenter2F.asm b/data/maps/attributes/placeholder/BullPokecenter2F.asm index cf08eb9..7a3960e 100644 --- a/data/maps/attributes/placeholder/BullPokecenter2F.asm +++ b/data/maps/attributes/placeholder/BullPokecenter2F.asm @@ -16,4 +16,4 @@ BullPokecenter2F_MapEvents:: object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -BullPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/BullPokecenter2F.blk"
\ No newline at end of file +BullPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/BullPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/CaveMinecarts1.asm b/data/maps/attributes/placeholder/CaveMinecarts1.asm index c3143fc..5671702 100644 --- a/data/maps/attributes/placeholder/CaveMinecarts1.asm +++ b/data/maps/attributes/placeholder/CaveMinecarts1.asm @@ -12,4 +12,4 @@ CaveMinecarts1_MapEvents:: db 0 ; person events -CaveMinecarts1_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts1.blk"
\ No newline at end of file +CaveMinecarts1_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts1.blk" diff --git a/data/maps/attributes/placeholder/CaveMinecarts2.asm b/data/maps/attributes/placeholder/CaveMinecarts2.asm index 5e8105f..fd6af2e 100644 --- a/data/maps/attributes/placeholder/CaveMinecarts2.asm +++ b/data/maps/attributes/placeholder/CaveMinecarts2.asm @@ -12,4 +12,4 @@ CaveMinecarts2_MapEvents:: db 0 ; person events -CaveMinecarts2_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts2.blk"
\ No newline at end of file +CaveMinecarts2_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts2.blk" diff --git a/data/maps/attributes/placeholder/CaveMinecarts3.asm b/data/maps/attributes/placeholder/CaveMinecarts3.asm index 95c4016..4cca968 100644 --- a/data/maps/attributes/placeholder/CaveMinecarts3.asm +++ b/data/maps/attributes/placeholder/CaveMinecarts3.asm @@ -12,4 +12,4 @@ CaveMinecarts3_MapEvents:: db 0 ; person events -CaveMinecarts3_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts3.blk"
\ No newline at end of file +CaveMinecarts3_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts3.blk" diff --git a/data/maps/attributes/placeholder/CaveMinecarts4.asm b/data/maps/attributes/placeholder/CaveMinecarts4.asm index 3e540db..315527b 100644 --- a/data/maps/attributes/placeholder/CaveMinecarts4.asm +++ b/data/maps/attributes/placeholder/CaveMinecarts4.asm @@ -12,4 +12,4 @@ CaveMinecarts4_MapEvents:: db 0 ; person events -CaveMinecarts4_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts4.blk"
\ No newline at end of file +CaveMinecarts4_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts4.blk" diff --git a/data/maps/attributes/placeholder/CaveMinecarts5.asm b/data/maps/attributes/placeholder/CaveMinecarts5.asm index 3739e39..ba07065 100644 --- a/data/maps/attributes/placeholder/CaveMinecarts5.asm +++ b/data/maps/attributes/placeholder/CaveMinecarts5.asm @@ -12,4 +12,4 @@ CaveMinecarts5_MapEvents:: db 0 ; person events -CaveMinecarts5_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts5.blk"
\ No newline at end of file +CaveMinecarts5_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts5.blk" diff --git a/data/maps/attributes/placeholder/CaveMinecarts6.asm b/data/maps/attributes/placeholder/CaveMinecarts6.asm index 483434c..c4d435d 100644 --- a/data/maps/attributes/placeholder/CaveMinecarts6.asm +++ b/data/maps/attributes/placeholder/CaveMinecarts6.asm @@ -12,4 +12,4 @@ CaveMinecarts6_MapEvents:: db 0 ; person events -CaveMinecarts6_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts6.blk"
\ No newline at end of file +CaveMinecarts6_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts6.blk" diff --git a/data/maps/attributes/placeholder/CaveMinecarts7.asm b/data/maps/attributes/placeholder/CaveMinecarts7.asm index e758609..c411e1b 100644 --- a/data/maps/attributes/placeholder/CaveMinecarts7.asm +++ b/data/maps/attributes/placeholder/CaveMinecarts7.asm @@ -12,4 +12,4 @@ CaveMinecarts7_MapEvents:: db 0 ; person events -CaveMinecarts7_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts7.blk"
\ No newline at end of file +CaveMinecarts7_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts7.blk" diff --git a/data/maps/attributes/placeholder/Fonto.asm b/data/maps/attributes/placeholder/Fonto.asm index 7d6a1a0..278eba1 100644 --- a/data/maps/attributes/placeholder/Fonto.asm +++ b/data/maps/attributes/placeholder/Fonto.asm @@ -29,4 +29,4 @@ Fonto_MapEvents:: object_event 5, 14, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 16, 8, SPRITE_TWIN, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 -Fonto_Blocks:: INCBIN "maps/placeholder/blk/Fonto.blk"
\ No newline at end of file +Fonto_Blocks:: INCBIN "maps/placeholder/blk/Fonto.blk" diff --git a/data/maps/attributes/placeholder/FontoHouse.asm b/data/maps/attributes/placeholder/FontoHouse.asm index aa55258..6a3bcf8 100644 --- a/data/maps/attributes/placeholder/FontoHouse.asm +++ b/data/maps/attributes/placeholder/FontoHouse.asm @@ -15,4 +15,4 @@ FontoHouse_MapEvents:: db 1 ; person events object_event 8, 4, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 -FontoHouse_Blocks:: INCBIN "maps/placeholder/blk/FontoHouse.blk"
\ No newline at end of file +FontoHouse_Blocks:: INCBIN "maps/placeholder/blk/FontoHouse.blk" diff --git a/data/maps/attributes/placeholder/FontoLab.asm b/data/maps/attributes/placeholder/FontoLab.asm index d668975..ae79e99 100644 --- a/data/maps/attributes/placeholder/FontoLab.asm +++ b/data/maps/attributes/placeholder/FontoLab.asm @@ -16,4 +16,4 @@ FontoLab_MapEvents:: object_event 2, 2, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 8, 5, SPRITE_SCIENTIST, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 -FontoLab_Blocks:: INCBIN "maps/placeholder/blk/FontoLab.blk"
\ No newline at end of file +FontoLab_Blocks:: INCBIN "maps/placeholder/blk/FontoLab.blk" diff --git a/data/maps/attributes/placeholder/FontoMart.asm b/data/maps/attributes/placeholder/FontoMart.asm index 85537a8..76572c3 100644 --- a/data/maps/attributes/placeholder/FontoMart.asm +++ b/data/maps/attributes/placeholder/FontoMart.asm @@ -17,4 +17,4 @@ FontoMart_MapEvents:: object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -FontoMart_Blocks:: INCBIN "maps/placeholder/blk/FontoMart.blk"
\ No newline at end of file +FontoMart_Blocks:: INCBIN "maps/placeholder/blk/FontoMart.blk" diff --git a/data/maps/attributes/placeholder/FontoPokecenter1F.asm b/data/maps/attributes/placeholder/FontoPokecenter1F.asm index ffc51e4..10a0302 100644 --- a/data/maps/attributes/placeholder/FontoPokecenter1F.asm +++ b/data/maps/attributes/placeholder/FontoPokecenter1F.asm @@ -19,4 +19,4 @@ FontoPokecenter1F_MapEvents:: object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -FontoPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/FontoPokecenter1F.blk"
\ No newline at end of file +FontoPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/FontoPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/FontoPokecenter2F.asm b/data/maps/attributes/placeholder/FontoPokecenter2F.asm index 42d3758..6d6ff94 100644 --- a/data/maps/attributes/placeholder/FontoPokecenter2F.asm +++ b/data/maps/attributes/placeholder/FontoPokecenter2F.asm @@ -16,4 +16,4 @@ FontoPokecenter2F_MapEvents:: object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -FontoPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/FontoPokecenter2F.blk"
\ No newline at end of file +FontoPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/FontoPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/FontoRocketHouse.asm b/data/maps/attributes/placeholder/FontoRocketHouse.asm index 14671d7..a291669 100644 --- a/data/maps/attributes/placeholder/FontoRocketHouse.asm +++ b/data/maps/attributes/placeholder/FontoRocketHouse.asm @@ -18,4 +18,4 @@ FontoRocketHouse_MapEvents:: object_event 14, 2, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 12, 2, SPRITE_POPPO, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 -FontoRocketHouse_Blocks:: INCBIN "maps/placeholder/blk/FontoRocketHouse.blk"
\ No newline at end of file +FontoRocketHouse_Blocks:: INCBIN "maps/placeholder/blk/FontoRocketHouse.blk" diff --git a/data/maps/attributes/placeholder/FontoRoute1.asm b/data/maps/attributes/placeholder/FontoRoute1.asm index aff6754..7d7831a 100644 --- a/data/maps/attributes/placeholder/FontoRoute1.asm +++ b/data/maps/attributes/placeholder/FontoRoute1.asm @@ -15,4 +15,4 @@ FontoRoute1_MapEvents:: db 0 ; person events -FontoRoute1_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute1.blk"
\ No newline at end of file +FontoRoute1_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute1.blk" diff --git a/data/maps/attributes/placeholder/FontoRoute2.asm b/data/maps/attributes/placeholder/FontoRoute2.asm index 9c640bc..10957aa 100644 --- a/data/maps/attributes/placeholder/FontoRoute2.asm +++ b/data/maps/attributes/placeholder/FontoRoute2.asm @@ -14,4 +14,4 @@ FontoRoute2_MapEvents:: db 0 ; person events -FontoRoute2_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute2.blk"
\ No newline at end of file +FontoRoute2_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute2.blk" diff --git a/data/maps/attributes/placeholder/FontoRoute3.asm b/data/maps/attributes/placeholder/FontoRoute3.asm index fdc0bdd..a288f0b 100644 --- a/data/maps/attributes/placeholder/FontoRoute3.asm +++ b/data/maps/attributes/placeholder/FontoRoute3.asm @@ -14,4 +14,4 @@ FontoRoute3_MapEvents:: db 0 ; person events -FontoRoute3_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute3.blk"
\ No newline at end of file +FontoRoute3_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute3.blk" diff --git a/data/maps/attributes/placeholder/FontoRoute4.asm b/data/maps/attributes/placeholder/FontoRoute4.asm index a9221db..496c613 100644 --- a/data/maps/attributes/placeholder/FontoRoute4.asm +++ b/data/maps/attributes/placeholder/FontoRoute4.asm @@ -16,4 +16,4 @@ FontoRoute4_MapEvents:: db 0 ; person events -FontoRoute4_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute4.blk"
\ No newline at end of file +FontoRoute4_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute4.blk" diff --git a/data/maps/attributes/placeholder/FontoRoute5.asm b/data/maps/attributes/placeholder/FontoRoute5.asm index 0e2978a..85bb2f8 100644 --- a/data/maps/attributes/placeholder/FontoRoute5.asm +++ b/data/maps/attributes/placeholder/FontoRoute5.asm @@ -16,4 +16,4 @@ FontoRoute5_MapEvents:: db 0 ; person events -FontoRoute5_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute5.blk"
\ No newline at end of file +FontoRoute5_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute5.blk" diff --git a/data/maps/attributes/placeholder/FontoRoute6.asm b/data/maps/attributes/placeholder/FontoRoute6.asm index 08eb921..523f6d2 100644 --- a/data/maps/attributes/placeholder/FontoRoute6.asm +++ b/data/maps/attributes/placeholder/FontoRoute6.asm @@ -14,4 +14,4 @@ FontoRoute6_MapEvents:: db 0 ; person events -FontoRoute6_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute6.blk"
\ No newline at end of file +FontoRoute6_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute6.blk" diff --git a/data/maps/attributes/placeholder/FontoRouteGate1.asm b/data/maps/attributes/placeholder/FontoRouteGate1.asm index 19d1f41..7276e60 100644 --- a/data/maps/attributes/placeholder/FontoRouteGate1.asm +++ b/data/maps/attributes/placeholder/FontoRouteGate1.asm @@ -16,4 +16,4 @@ FontoRouteGate1_MapEvents:: db 0 ; person events -FontoRouteGate1_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate1.blk"
\ No newline at end of file +FontoRouteGate1_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate1.blk" diff --git a/data/maps/attributes/placeholder/FontoRouteGate2.asm b/data/maps/attributes/placeholder/FontoRouteGate2.asm index a777319..6180a67 100644 --- a/data/maps/attributes/placeholder/FontoRouteGate2.asm +++ b/data/maps/attributes/placeholder/FontoRouteGate2.asm @@ -16,4 +16,4 @@ FontoRouteGate2_MapEvents:: db 0 ; person events -FontoRouteGate2_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate2.blk"
\ No newline at end of file +FontoRouteGate2_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate2.blk" diff --git a/data/maps/attributes/placeholder/FontoRouteGate3.asm b/data/maps/attributes/placeholder/FontoRouteGate3.asm index 6bf661e..ff3341d 100644 --- a/data/maps/attributes/placeholder/FontoRouteGate3.asm +++ b/data/maps/attributes/placeholder/FontoRouteGate3.asm @@ -16,4 +16,4 @@ FontoRouteGate3_MapEvents:: db 0 ; person events -FontoRouteGate3_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate3.blk"
\ No newline at end of file +FontoRouteGate3_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate3.blk" diff --git a/data/maps/attributes/placeholder/Haiteku.asm b/data/maps/attributes/placeholder/Haiteku.asm index 3792fc9..211fccb 100644 --- a/data/maps/attributes/placeholder/Haiteku.asm +++ b/data/maps/attributes/placeholder/Haiteku.asm @@ -35,4 +35,4 @@ Haiteku_MapEvents:: object_event 26, 10, SPRITE_SAILOR, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 14, SPRITE_GENTLEMAN, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 -Haiteku_Blocks:: INCBIN "maps/placeholder/blk/Haiteku.blk"
\ No newline at end of file +Haiteku_Blocks:: INCBIN "maps/placeholder/blk/Haiteku.blk" diff --git a/data/maps/attributes/placeholder/HaitekuAquarium1F.asm b/data/maps/attributes/placeholder/HaitekuAquarium1F.asm index 0df596a..9eddea5 100644 --- a/data/maps/attributes/placeholder/HaitekuAquarium1F.asm +++ b/data/maps/attributes/placeholder/HaitekuAquarium1F.asm @@ -18,4 +18,4 @@ HaitekuAquarium1F_MapEvents:: object_event 12, 2, SPRITE_YOUNGSTER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 4, 5, SPRITE_LASS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 -HaitekuAquarium1F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuAquarium1F.blk"
\ No newline at end of file +HaitekuAquarium1F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuAquarium1F.blk" diff --git a/data/maps/attributes/placeholder/HaitekuAquarium2F.asm b/data/maps/attributes/placeholder/HaitekuAquarium2F.asm index dc4fde3..1b675f2 100644 --- a/data/maps/attributes/placeholder/HaitekuAquarium2F.asm +++ b/data/maps/attributes/placeholder/HaitekuAquarium2F.asm @@ -15,4 +15,4 @@ HaitekuAquarium2F_MapEvents:: object_event 7, 6, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 4, SPRITE_TEACHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -HaitekuAquarium2F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuAquarium2F.blk"
\ No newline at end of file +HaitekuAquarium2F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuAquarium2F.blk" diff --git a/data/maps/attributes/placeholder/HaitekuHouse1.asm b/data/maps/attributes/placeholder/HaitekuHouse1.asm index 7dbdea7..11c2bc0 100644 --- a/data/maps/attributes/placeholder/HaitekuHouse1.asm +++ b/data/maps/attributes/placeholder/HaitekuHouse1.asm @@ -15,4 +15,4 @@ HaitekuHouse1_MapEvents:: db 1 ; person events object_event 7, 3, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -HaitekuHouse1_Blocks:: INCBIN "maps/placeholder/blk/HaitekuHouse1.blk"
\ No newline at end of file +HaitekuHouse1_Blocks:: INCBIN "maps/placeholder/blk/HaitekuHouse1.blk" diff --git a/data/maps/attributes/placeholder/HaitekuHouse2.asm b/data/maps/attributes/placeholder/HaitekuHouse2.asm index 1fc331c..d254e09 100644 --- a/data/maps/attributes/placeholder/HaitekuHouse2.asm +++ b/data/maps/attributes/placeholder/HaitekuHouse2.asm @@ -15,4 +15,4 @@ HaitekuHouse2_MapEvents:: db 1 ; person events object_event 7, 3, SPRITE_SAILOR, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -HaitekuHouse2_Blocks:: INCBIN "maps/placeholder/blk/HaitekuHouse2.blk"
\ No newline at end of file +HaitekuHouse2_Blocks:: INCBIN "maps/placeholder/blk/HaitekuHouse2.blk" diff --git a/data/maps/attributes/placeholder/HaitekuImposterOakHouse.asm b/data/maps/attributes/placeholder/HaitekuImposterOakHouse.asm index 743fbca..68c7eaf 100644 --- a/data/maps/attributes/placeholder/HaitekuImposterOakHouse.asm +++ b/data/maps/attributes/placeholder/HaitekuImposterOakHouse.asm @@ -16,4 +16,4 @@ HaitekuImposterOakHouse_MapEvents:: object_event 7, 3, SPRITE_EVIL_OKIDO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 1, 2, SPRITE_POKEFAN_F, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 -HaitekuImposterOakHouse_Blocks:: INCBIN "maps/placeholder/blk/HaitekuImposterOakHouse.blk"
\ No newline at end of file +HaitekuImposterOakHouse_Blocks:: INCBIN "maps/placeholder/blk/HaitekuImposterOakHouse.blk" diff --git a/data/maps/attributes/placeholder/HaitekuLeague1F.asm b/data/maps/attributes/placeholder/HaitekuLeague1F.asm index eb3ed19..c45aba7 100644 --- a/data/maps/attributes/placeholder/HaitekuLeague1F.asm +++ b/data/maps/attributes/placeholder/HaitekuLeague1F.asm @@ -20,4 +20,4 @@ HaitekuLeague1F_MapEvents:: object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 -HaitekuLeague1F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuLeague1F.blk"
\ No newline at end of file +HaitekuLeague1F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuLeague1F.blk" diff --git a/data/maps/attributes/placeholder/HaitekuLeague2F.asm b/data/maps/attributes/placeholder/HaitekuLeague2F.asm index 2b428c8..c868dd5 100644 --- a/data/maps/attributes/placeholder/HaitekuLeague2F.asm +++ b/data/maps/attributes/placeholder/HaitekuLeague2F.asm @@ -18,4 +18,4 @@ HaitekuLeague2F_MapEvents:: object_event 2, 10, SPRITE_24, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 7, 7, SPRITE_COOLTRAINER_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -HaitekuLeague2F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuLeague2F.blk"
\ No newline at end of file +HaitekuLeague2F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuLeague2F.blk" diff --git a/data/maps/attributes/placeholder/HaitekuMart.asm b/data/maps/attributes/placeholder/HaitekuMart.asm index 434e750..53cd2dd 100644 --- a/data/maps/attributes/placeholder/HaitekuMart.asm +++ b/data/maps/attributes/placeholder/HaitekuMart.asm @@ -17,4 +17,4 @@ HaitekuMart_MapEvents:: object_event 10, 5, SPRITE_POKEFAN_M, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 4, 1, SPRITE_SAILOR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -HaitekuMart_Blocks:: INCBIN "maps/placeholder/blk/HaitekuMart.blk"
\ No newline at end of file +HaitekuMart_Blocks:: INCBIN "maps/placeholder/blk/HaitekuMart.blk" diff --git a/data/maps/attributes/placeholder/HaitekuPokecenter1F.asm b/data/maps/attributes/placeholder/HaitekuPokecenter1F.asm index 3ee57a0..a015908 100644 --- a/data/maps/attributes/placeholder/HaitekuPokecenter1F.asm +++ b/data/maps/attributes/placeholder/HaitekuPokecenter1F.asm @@ -19,4 +19,4 @@ HaitekuPokecenter1F_MapEvents:: object_event 2, 5, SPRITE_FISHER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_SAILOR, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -HaitekuPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuPokecenter1F.blk"
\ No newline at end of file +HaitekuPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/HaitekuPokecenter2F.asm b/data/maps/attributes/placeholder/HaitekuPokecenter2F.asm index 324a37d..0b88113 100644 --- a/data/maps/attributes/placeholder/HaitekuPokecenter2F.asm +++ b/data/maps/attributes/placeholder/HaitekuPokecenter2F.asm @@ -16,4 +16,4 @@ HaitekuPokecenter2F_MapEvents:: object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -HaitekuPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuPokecenter2F.blk"
\ No newline at end of file +HaitekuPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/HaitekuWestRoute.asm b/data/maps/attributes/placeholder/HaitekuWestRoute.asm index 49a7366..8806407 100644 --- a/data/maps/attributes/placeholder/HaitekuWestRoute.asm +++ b/data/maps/attributes/placeholder/HaitekuWestRoute.asm @@ -14,4 +14,4 @@ HaitekuWestRoute_MapEvents:: db 0 ; person events -HaitekuWestRoute_Blocks:: INCBIN "maps/placeholder/blk/HaitekuWestRoute.blk"
\ No newline at end of file +HaitekuWestRoute_Blocks:: INCBIN "maps/placeholder/blk/HaitekuWestRoute.blk" diff --git a/data/maps/attributes/placeholder/HaitekuWestRouteGate.asm b/data/maps/attributes/placeholder/HaitekuWestRouteGate.asm index 5160ea5..4a41b3b 100644 --- a/data/maps/attributes/placeholder/HaitekuWestRouteGate.asm +++ b/data/maps/attributes/placeholder/HaitekuWestRouteGate.asm @@ -16,4 +16,4 @@ HaitekuWestRouteGate_MapEvents:: db 0 ; person events -HaitekuWestRouteGate_Blocks:: INCBIN "maps/placeholder/blk/HaitekuWestRouteGate.blk"
\ No newline at end of file +HaitekuWestRouteGate_Blocks:: INCBIN "maps/placeholder/blk/HaitekuWestRouteGate.blk" diff --git a/data/maps/attributes/placeholder/HaitekuWestRouteOcean.asm b/data/maps/attributes/placeholder/HaitekuWestRouteOcean.asm index 9e7523c..931bef6 100644 --- a/data/maps/attributes/placeholder/HaitekuWestRouteOcean.asm +++ b/data/maps/attributes/placeholder/HaitekuWestRouteOcean.asm @@ -16,4 +16,4 @@ HaitekuWestRouteOcean_MapEvents:: db 0 ; person events -HaitekuWestRouteOcean_Blocks:: INCBIN "maps/placeholder/blk/HaitekuWestRouteOcean.blk"
\ No newline at end of file +HaitekuWestRouteOcean_Blocks:: INCBIN "maps/placeholder/blk/HaitekuWestRouteOcean.blk" diff --git a/data/maps/attributes/placeholder/Kanto.asm b/data/maps/attributes/placeholder/Kanto.asm index 54ebd21..657a2f6 100644 --- a/data/maps/attributes/placeholder/Kanto.asm +++ b/data/maps/attributes/placeholder/Kanto.asm @@ -56,4 +56,4 @@ Kanto_MapEvents:: db 0 ; person events -Kanto_Blocks:: INCBIN "maps/placeholder/blk/Kanto.blk"
\ No newline at end of file +Kanto_Blocks:: INCBIN "maps/placeholder/blk/Kanto.blk" diff --git a/data/maps/attributes/placeholder/KantoCeladonElevator.asm b/data/maps/attributes/placeholder/KantoCeladonElevator.asm index 3bebab3..b08d35d 100644 --- a/data/maps/attributes/placeholder/KantoCeladonElevator.asm +++ b/data/maps/attributes/placeholder/KantoCeladonElevator.asm @@ -14,4 +14,4 @@ KantoCeladonElevator_MapEvents:: db 0 ; person events -KantoCeladonElevator_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonElevator.blk"
\ No newline at end of file +KantoCeladonElevator_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonElevator.blk" diff --git a/data/maps/attributes/placeholder/KantoCeladonMart1F.asm b/data/maps/attributes/placeholder/KantoCeladonMart1F.asm index 09eb247..540b834 100644 --- a/data/maps/attributes/placeholder/KantoCeladonMart1F.asm +++ b/data/maps/attributes/placeholder/KantoCeladonMart1F.asm @@ -17,4 +17,4 @@ KantoCeladonMart1F_MapEvents:: db 1 ; person events object_event 7, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoCeladonMart1F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart1F.blk"
\ No newline at end of file +KantoCeladonMart1F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart1F.blk" diff --git a/data/maps/attributes/placeholder/KantoCeladonMart2F.asm b/data/maps/attributes/placeholder/KantoCeladonMart2F.asm index 330be99..e682e50 100644 --- a/data/maps/attributes/placeholder/KantoCeladonMart2F.asm +++ b/data/maps/attributes/placeholder/KantoCeladonMart2F.asm @@ -17,4 +17,4 @@ KantoCeladonMart2F_MapEvents:: object_event 14, 5, SPRITE_CLERK, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 5, 5, SPRITE_LASS, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoCeladonMart2F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart2F.blk"
\ No newline at end of file +KantoCeladonMart2F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart2F.blk" diff --git a/data/maps/attributes/placeholder/KantoCeladonMart3F.asm b/data/maps/attributes/placeholder/KantoCeladonMart3F.asm index 72d15b2..1c0bf1c 100644 --- a/data/maps/attributes/placeholder/KantoCeladonMart3F.asm +++ b/data/maps/attributes/placeholder/KantoCeladonMart3F.asm @@ -17,4 +17,4 @@ KantoCeladonMart3F_MapEvents:: object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 3, 5, SPRITE_GIRL, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoCeladonMart3F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart3F.blk"
\ No newline at end of file +KantoCeladonMart3F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart3F.blk" diff --git a/data/maps/attributes/placeholder/KantoCeladonMart4F.asm b/data/maps/attributes/placeholder/KantoCeladonMart4F.asm index 0d66d16..0cc7099 100644 --- a/data/maps/attributes/placeholder/KantoCeladonMart4F.asm +++ b/data/maps/attributes/placeholder/KantoCeladonMart4F.asm @@ -18,4 +18,4 @@ KantoCeladonMart4F_MapEvents:: object_event 8, 5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 2, 5, SPRITE_MEDIUM, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoCeladonMart4F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart4F.blk"
\ No newline at end of file +KantoCeladonMart4F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart4F.blk" diff --git a/data/maps/attributes/placeholder/KantoCeladonMart5F.asm b/data/maps/attributes/placeholder/KantoCeladonMart5F.asm index d4fde54..6727d30 100644 --- a/data/maps/attributes/placeholder/KantoCeladonMart5F.asm +++ b/data/maps/attributes/placeholder/KantoCeladonMart5F.asm @@ -17,4 +17,4 @@ KantoCeladonMart5F_MapEvents:: object_event 8, 3, SPRITE_SIDON, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 2, 5, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoCeladonMart5F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart5F.blk"
\ No newline at end of file +KantoCeladonMart5F_Blocks:: INCBIN "maps/placeholder/blk/KantoCeladonMart5F.blk" diff --git a/data/maps/attributes/placeholder/KantoCeruleanHouse.asm b/data/maps/attributes/placeholder/KantoCeruleanHouse.asm index c1e5f68..7570123 100644 --- a/data/maps/attributes/placeholder/KantoCeruleanHouse.asm +++ b/data/maps/attributes/placeholder/KantoCeruleanHouse.asm @@ -15,4 +15,4 @@ KantoCeruleanHouse_MapEvents:: db 1 ; person events object_event 3, 3, SPRITE_FISHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoCeruleanHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoCeruleanHouse.blk"
\ No newline at end of file +KantoCeruleanHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoCeruleanHouse.blk" diff --git a/data/maps/attributes/placeholder/KantoDiner.asm b/data/maps/attributes/placeholder/KantoDiner.asm index 7033f70..9906d4b 100644 --- a/data/maps/attributes/placeholder/KantoDiner.asm +++ b/data/maps/attributes/placeholder/KantoDiner.asm @@ -14,4 +14,4 @@ KantoDiner_MapEvents:: db 0 ; person events -KantoDiner_Blocks:: INCBIN "maps/placeholder/blk/KantoDiner.blk"
\ No newline at end of file +KantoDiner_Blocks:: INCBIN "maps/placeholder/blk/KantoDiner.blk" diff --git a/data/maps/attributes/placeholder/KantoEastRoute.asm b/data/maps/attributes/placeholder/KantoEastRoute.asm index 87f2f6f..f338935 100644 --- a/data/maps/attributes/placeholder/KantoEastRoute.asm +++ b/data/maps/attributes/placeholder/KantoEastRoute.asm @@ -16,4 +16,4 @@ KantoEastRoute_MapEvents:: db 0 ; person events -KantoEastRoute_Blocks:: INCBIN "maps/placeholder/blk/KantoEastRoute.blk"
\ No newline at end of file +KantoEastRoute_Blocks:: INCBIN "maps/placeholder/blk/KantoEastRoute.blk" diff --git a/data/maps/attributes/placeholder/KantoEldersHouse.asm b/data/maps/attributes/placeholder/KantoEldersHouse.asm index 15abce9..9587fd0 100644 --- a/data/maps/attributes/placeholder/KantoEldersHouse.asm +++ b/data/maps/attributes/placeholder/KantoEldersHouse.asm @@ -16,4 +16,4 @@ KantoEldersHouse_MapEvents:: object_event 7, 3, SPRITE_GRAMPS, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 1, 5, SPRITE_GRANNY, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoEldersHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoEldersHouse.blk"
\ No newline at end of file +KantoEldersHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoEldersHouse.blk" diff --git a/data/maps/attributes/placeholder/KantoFishingGuru.asm b/data/maps/attributes/placeholder/KantoFishingGuru.asm index b568dad..dd71611 100644 --- a/data/maps/attributes/placeholder/KantoFishingGuru.asm +++ b/data/maps/attributes/placeholder/KantoFishingGuru.asm @@ -15,4 +15,4 @@ KantoFishingGuru_MapEvents:: db 1 ; person events object_event 4, 3, SPRITE_FISHING_GURU, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoFishingGuru_Blocks:: INCBIN "maps/placeholder/blk/KantoFishingGuru.blk"
\ No newline at end of file +KantoFishingGuru_Blocks:: INCBIN "maps/placeholder/blk/KantoFishingGuru.blk" diff --git a/data/maps/attributes/placeholder/KantoGameCorner.asm b/data/maps/attributes/placeholder/KantoGameCorner.asm index 3f83d98..61c4092 100644 --- a/data/maps/attributes/placeholder/KantoGameCorner.asm +++ b/data/maps/attributes/placeholder/KantoGameCorner.asm @@ -26,4 +26,4 @@ KantoGameCorner_MapEvents:: object_event 17, 9, SPRITE_POKEFAN_M, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 13, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoGameCorner_Blocks:: INCBIN "maps/placeholder/blk/KantoGameCorner.blk"
\ No newline at end of file +KantoGameCorner_Blocks:: INCBIN "maps/placeholder/blk/KantoGameCorner.blk" diff --git a/data/maps/attributes/placeholder/KantoGameCornerPrizes.asm b/data/maps/attributes/placeholder/KantoGameCornerPrizes.asm index 092c0b9..62a312e 100644 --- a/data/maps/attributes/placeholder/KantoGameCornerPrizes.asm +++ b/data/maps/attributes/placeholder/KantoGameCornerPrizes.asm @@ -17,4 +17,4 @@ KantoGameCornerPrizes_MapEvents:: object_event 4, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 1, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoGameCornerPrizes_Blocks:: INCBIN "maps/placeholder/blk/KantoGameCornerPrizes.blk"
\ No newline at end of file +KantoGameCornerPrizes_Blocks:: INCBIN "maps/placeholder/blk/KantoGameCornerPrizes.blk" diff --git a/data/maps/attributes/placeholder/KantoGamefreakHQ1.asm b/data/maps/attributes/placeholder/KantoGamefreakHQ1.asm index b1a74e9..91158b4 100644 --- a/data/maps/attributes/placeholder/KantoGamefreakHQ1.asm +++ b/data/maps/attributes/placeholder/KantoGamefreakHQ1.asm @@ -21,4 +21,4 @@ KantoGamefreakHQ1_MapEvents:: object_event 0, 8, SPRITE_PIPPI, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 2, 7, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoGamefreakHQ1_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ1.blk"
\ No newline at end of file +KantoGamefreakHQ1_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ1.blk" diff --git a/data/maps/attributes/placeholder/KantoGamefreakHQ2.asm b/data/maps/attributes/placeholder/KantoGamefreakHQ2.asm index b374b0e..da4f3bc 100644 --- a/data/maps/attributes/placeholder/KantoGamefreakHQ2.asm +++ b/data/maps/attributes/placeholder/KantoGamefreakHQ2.asm @@ -17,4 +17,4 @@ KantoGamefreakHQ2_MapEvents:: db 1 ; person events object_event 2, 4, SPRITE_CLERK, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoGamefreakHQ2_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ2.blk"
\ No newline at end of file +KantoGamefreakHQ2_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ2.blk" diff --git a/data/maps/attributes/placeholder/KantoGamefreakHQ3.asm b/data/maps/attributes/placeholder/KantoGamefreakHQ3.asm index c640a2f..8844533 100644 --- a/data/maps/attributes/placeholder/KantoGamefreakHQ3.asm +++ b/data/maps/attributes/placeholder/KantoGamefreakHQ3.asm @@ -19,4 +19,4 @@ KantoGamefreakHQ3_MapEvents:: object_event 0, 7, SPRITE_BURGLAR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 2, 7, SPRITE_FISHER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoGamefreakHQ3_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ3.blk"
\ No newline at end of file +KantoGamefreakHQ3_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ3.blk" diff --git a/data/maps/attributes/placeholder/KantoGamefreakHQ4.asm b/data/maps/attributes/placeholder/KantoGamefreakHQ4.asm index 24a8f0f..8004d0d 100644 --- a/data/maps/attributes/placeholder/KantoGamefreakHQ4.asm +++ b/data/maps/attributes/placeholder/KantoGamefreakHQ4.asm @@ -15,4 +15,4 @@ KantoGamefreakHQ4_MapEvents:: db 0 ; person events -KantoGamefreakHQ4_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ4.blk"
\ No newline at end of file +KantoGamefreakHQ4_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ4.blk" diff --git a/data/maps/attributes/placeholder/KantoGamefreakHQ5.asm b/data/maps/attributes/placeholder/KantoGamefreakHQ5.asm index e58f806..4f9765b 100644 --- a/data/maps/attributes/placeholder/KantoGamefreakHQ5.asm +++ b/data/maps/attributes/placeholder/KantoGamefreakHQ5.asm @@ -14,4 +14,4 @@ KantoGamefreakHQ5_MapEvents:: db 0 ; person events -KantoGamefreakHQ5_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ5.blk"
\ No newline at end of file +KantoGamefreakHQ5_Blocks:: INCBIN "maps/placeholder/blk/KantoGamefreakHQ5.blk" diff --git a/data/maps/attributes/placeholder/KantoGreensHouse1F.asm b/data/maps/attributes/placeholder/KantoGreensHouse1F.asm index daf4a61..728448f 100644 --- a/data/maps/attributes/placeholder/KantoGreensHouse1F.asm +++ b/data/maps/attributes/placeholder/KantoGreensHouse1F.asm @@ -16,4 +16,4 @@ KantoGreensHouse1F_MapEvents:: db 1 ; person events object_event 5, 3, SPRITE_0F, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoGreensHouse1F_Blocks:: INCBIN "maps/placeholder/blk/KantoGreensHouse1F.blk"
\ No newline at end of file +KantoGreensHouse1F_Blocks:: INCBIN "maps/placeholder/blk/KantoGreensHouse1F.blk" diff --git a/data/maps/attributes/placeholder/KantoGreensHouse2F.asm b/data/maps/attributes/placeholder/KantoGreensHouse2F.asm index 8b9c572..b01b313 100644 --- a/data/maps/attributes/placeholder/KantoGreensHouse2F.asm +++ b/data/maps/attributes/placeholder/KantoGreensHouse2F.asm @@ -13,4 +13,4 @@ KantoGreensHouse2F_MapEvents:: db 0 ; person events -KantoGreensHouse2F_Blocks:: INCBIN "maps/placeholder/blk/KantoGreensHouse2F.blk"
\ No newline at end of file +KantoGreensHouse2F_Blocks:: INCBIN "maps/placeholder/blk/KantoGreensHouse2F.blk" diff --git a/data/maps/attributes/placeholder/KantoHospital.asm b/data/maps/attributes/placeholder/KantoHospital.asm index fe7dd25..9840695 100644 --- a/data/maps/attributes/placeholder/KantoHospital.asm +++ b/data/maps/attributes/placeholder/KantoHospital.asm @@ -17,4 +17,4 @@ KantoHospital_MapEvents:: object_event 10, 6, SPRITE_ROCKER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 12, 6, SPRITE_GIRL, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoHospital_Blocks:: INCBIN "maps/placeholder/blk/KantoHospital.blk"
\ No newline at end of file +KantoHospital_Blocks:: INCBIN "maps/placeholder/blk/KantoHospital.blk" diff --git a/data/maps/attributes/placeholder/KantoLavenderHouse.asm b/data/maps/attributes/placeholder/KantoLavenderHouse.asm index a744b11..3e8109d 100644 --- a/data/maps/attributes/placeholder/KantoLavenderHouse.asm +++ b/data/maps/attributes/placeholder/KantoLavenderHouse.asm @@ -16,4 +16,4 @@ KantoLavenderHouse_MapEvents:: object_event 7, 3, SPRITE_POKEFAN_M, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 1, 5, SPRITE_POKEFAN_F, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoLavenderHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoLavenderHouse.blk"
\ No newline at end of file +KantoLavenderHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoLavenderHouse.blk" diff --git a/data/maps/attributes/placeholder/KantoLeague1F.asm b/data/maps/attributes/placeholder/KantoLeague1F.asm index e2b8447..5790403 100644 --- a/data/maps/attributes/placeholder/KantoLeague1F.asm +++ b/data/maps/attributes/placeholder/KantoLeague1F.asm @@ -20,4 +20,4 @@ KantoLeague1F_MapEvents:: object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 -KantoLeague1F_Blocks:: INCBIN "maps/placeholder/blk/KantoLeague1F.blk"
\ No newline at end of file +KantoLeague1F_Blocks:: INCBIN "maps/placeholder/blk/KantoLeague1F.blk" diff --git a/data/maps/attributes/placeholder/KantoLeague21F.asm b/data/maps/attributes/placeholder/KantoLeague21F.asm index a9d44c5..b09f1bd 100644 --- a/data/maps/attributes/placeholder/KantoLeague21F.asm +++ b/data/maps/attributes/placeholder/KantoLeague21F.asm @@ -20,4 +20,4 @@ KantoLeague21F_MapEvents:: object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 -KantoLeague21F_Blocks:: INCBIN "maps/placeholder/blk/KantoLeague21F.blk"
\ No newline at end of file +KantoLeague21F_Blocks:: INCBIN "maps/placeholder/blk/KantoLeague21F.blk" diff --git a/data/maps/attributes/placeholder/KantoLeague22F.asm b/data/maps/attributes/placeholder/KantoLeague22F.asm index c663b14..f7c0061 100644 --- a/data/maps/attributes/placeholder/KantoLeague22F.asm +++ b/data/maps/attributes/placeholder/KantoLeague22F.asm @@ -18,4 +18,4 @@ KantoLeague22F_MapEvents:: object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoLeague22F_Blocks:: INCBIN "maps/placeholder/blk/KantoLeague22F.blk"
\ No newline at end of file +KantoLeague22F_Blocks:: INCBIN "maps/placeholder/blk/KantoLeague22F.blk" diff --git a/data/maps/attributes/placeholder/KantoLeague2F.asm b/data/maps/attributes/placeholder/KantoLeague2F.asm index 084a664..d3c8b48 100644 --- a/data/maps/attributes/placeholder/KantoLeague2F.asm +++ b/data/maps/attributes/placeholder/KantoLeague2F.asm @@ -18,4 +18,4 @@ KantoLeague2F_MapEvents:: object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoLeague2F_Blocks:: INCBIN "maps/placeholder/blk/KantoLeague2F.blk"
\ No newline at end of file +KantoLeague2F_Blocks:: INCBIN "maps/placeholder/blk/KantoLeague2F.blk" diff --git a/data/maps/attributes/placeholder/KantoMart.asm b/data/maps/attributes/placeholder/KantoMart.asm index 8e5f28b..a45bb75 100644 --- a/data/maps/attributes/placeholder/KantoMart.asm +++ b/data/maps/attributes/placeholder/KantoMart.asm @@ -17,4 +17,4 @@ KantoMart_MapEvents:: object_event 10, 5, SPRITE_TWIN, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 4, 1, SPRITE_GRAMPS, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoMart_Blocks:: INCBIN "maps/placeholder/blk/KantoMart.blk"
\ No newline at end of file +KantoMart_Blocks:: INCBIN "maps/placeholder/blk/KantoMart.blk" diff --git a/data/maps/attributes/placeholder/KantoOaksLab.asm b/data/maps/attributes/placeholder/KantoOaksLab.asm index 770d4d5..534f8a4 100644 --- a/data/maps/attributes/placeholder/KantoOaksLab.asm +++ b/data/maps/attributes/placeholder/KantoOaksLab.asm @@ -15,4 +15,4 @@ KantoOaksLab_MapEvents:: db 1 ; person events object_event 3, 2, SPRITE_NANAMI, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoOaksLab_Blocks:: INCBIN "maps/placeholder/blk/KantoOaksLab.blk"
\ No newline at end of file +KantoOaksLab_Blocks:: INCBIN "maps/placeholder/blk/KantoOaksLab.blk" diff --git a/data/maps/attributes/placeholder/KantoPokecenter1F.asm b/data/maps/attributes/placeholder/KantoPokecenter1F.asm index 4874b92..03fccc3 100644 --- a/data/maps/attributes/placeholder/KantoPokecenter1F.asm +++ b/data/maps/attributes/placeholder/KantoPokecenter1F.asm @@ -19,4 +19,4 @@ KantoPokecenter1F_MapEvents:: object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/KantoPokecenter1F.blk"
\ No newline at end of file +KantoPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/KantoPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/KantoPokecenter21F.asm b/data/maps/attributes/placeholder/KantoPokecenter21F.asm index a6ea2d3..9226222 100644 --- a/data/maps/attributes/placeholder/KantoPokecenter21F.asm +++ b/data/maps/attributes/placeholder/KantoPokecenter21F.asm @@ -19,4 +19,4 @@ KantoPokecenter21F_MapEvents:: object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoPokecenter21F_Blocks:: INCBIN "maps/placeholder/blk/KantoPokecenter21F.blk"
\ No newline at end of file +KantoPokecenter21F_Blocks:: INCBIN "maps/placeholder/blk/KantoPokecenter21F.blk" diff --git a/data/maps/attributes/placeholder/KantoPokecenter22F.asm b/data/maps/attributes/placeholder/KantoPokecenter22F.asm index 3316f0c..3e56c12 100644 --- a/data/maps/attributes/placeholder/KantoPokecenter22F.asm +++ b/data/maps/attributes/placeholder/KantoPokecenter22F.asm @@ -16,4 +16,4 @@ KantoPokecenter22F_MapEvents:: object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoPokecenter22F_Blocks:: INCBIN "maps/placeholder/blk/KantoPokecenter22F.blk"
\ No newline at end of file +KantoPokecenter22F_Blocks:: INCBIN "maps/placeholder/blk/KantoPokecenter22F.blk" diff --git a/data/maps/attributes/placeholder/KantoPokecenter2F.asm b/data/maps/attributes/placeholder/KantoPokecenter2F.asm index 6ec5a8e..c684143 100644 --- a/data/maps/attributes/placeholder/KantoPokecenter2F.asm +++ b/data/maps/attributes/placeholder/KantoPokecenter2F.asm @@ -16,4 +16,4 @@ KantoPokecenter2F_MapEvents:: object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/KantoPokecenter2F.blk"
\ No newline at end of file +KantoPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/KantoPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/KantoRedsHouse.asm b/data/maps/attributes/placeholder/KantoRedsHouse.asm index 8beee9a..dc9748c 100644 --- a/data/maps/attributes/placeholder/KantoRedsHouse.asm +++ b/data/maps/attributes/placeholder/KantoRedsHouse.asm @@ -16,4 +16,4 @@ KantoRedsHouse_MapEvents:: object_event 7, 3, SPRITE_SUPER_NERD, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 1, 5, SPRITE_TEACHER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoRedsHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoRedsHouse.blk"
\ No newline at end of file +KantoRedsHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoRedsHouse.blk" diff --git a/data/maps/attributes/placeholder/KantoSchool.asm b/data/maps/attributes/placeholder/KantoSchool.asm index d470f78..eb49456 100644 --- a/data/maps/attributes/placeholder/KantoSchool.asm +++ b/data/maps/attributes/placeholder/KantoSchool.asm @@ -19,4 +19,4 @@ KantoSchool_MapEvents:: object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 -KantoSchool_Blocks:: INCBIN "maps/placeholder/blk/KantoSchool.blk"
\ No newline at end of file +KantoSchool_Blocks:: INCBIN "maps/placeholder/blk/KantoSchool.blk" diff --git a/data/maps/attributes/placeholder/KantoSilphCo.asm b/data/maps/attributes/placeholder/KantoSilphCo.asm index bd2438d..29926be 100644 --- a/data/maps/attributes/placeholder/KantoSilphCo.asm +++ b/data/maps/attributes/placeholder/KantoSilphCo.asm @@ -16,4 +16,4 @@ KantoSilphCo_MapEvents:: object_event 2, 2, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 22, 1, SPRITE_OFFICER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoSilphCo_Blocks:: INCBIN "maps/placeholder/blk/KantoSilphCo.blk"
\ No newline at end of file +KantoSilphCo_Blocks:: INCBIN "maps/placeholder/blk/KantoSilphCo.blk" diff --git a/data/maps/attributes/placeholder/KantoUnusedArea.asm b/data/maps/attributes/placeholder/KantoUnusedArea.asm index d4dbb3d..cb8686e 100644 --- a/data/maps/attributes/placeholder/KantoUnusedArea.asm +++ b/data/maps/attributes/placeholder/KantoUnusedArea.asm @@ -12,4 +12,4 @@ KantoUnusedArea_MapEvents:: db 0 ; person events -KantoUnusedArea_Blocks:: INCBIN "maps/placeholder/blk/KantoUnusedArea.blk"
\ No newline at end of file +KantoUnusedArea_Blocks:: INCBIN "maps/placeholder/blk/KantoUnusedArea.blk" diff --git a/data/maps/attributes/placeholder/KantoViridianHouse.asm b/data/maps/attributes/placeholder/KantoViridianHouse.asm index eab8764..1699edc 100644 --- a/data/maps/attributes/placeholder/KantoViridianHouse.asm +++ b/data/maps/attributes/placeholder/KantoViridianHouse.asm @@ -16,4 +16,4 @@ KantoViridianHouse_MapEvents:: object_event 7, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 1, 5, SPRITE_TWIN, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -KantoViridianHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoViridianHouse.blk"
\ No newline at end of file +KantoViridianHouse_Blocks:: INCBIN "maps/placeholder/blk/KantoViridianHouse.blk" diff --git a/data/maps/attributes/placeholder/MtFuji.asm b/data/maps/attributes/placeholder/MtFuji.asm index 8a32eb7..8d31fa7 100644 --- a/data/maps/attributes/placeholder/MtFuji.asm +++ b/data/maps/attributes/placeholder/MtFuji.asm @@ -13,4 +13,4 @@ MtFuji_MapEvents:: db 0 ; person events -MtFuji_Blocks:: INCBIN "maps/placeholder/blk/MtFuji.blk"
\ No newline at end of file +MtFuji_Blocks:: INCBIN "maps/placeholder/blk/MtFuji.blk" diff --git a/data/maps/attributes/placeholder/MtFujiRoute.asm b/data/maps/attributes/placeholder/MtFujiRoute.asm index 32c9069..c4a2f08 100644 --- a/data/maps/attributes/placeholder/MtFujiRoute.asm +++ b/data/maps/attributes/placeholder/MtFujiRoute.asm @@ -14,4 +14,4 @@ MtFujiRoute_MapEvents:: db 0 ; person events -MtFujiRoute_Blocks:: INCBIN "maps/placeholder/blk/MtFujiRoute.blk"
\ No newline at end of file +MtFujiRoute_Blocks:: INCBIN "maps/placeholder/blk/MtFujiRoute.blk" diff --git a/data/maps/attributes/placeholder/Newtype.asm b/data/maps/attributes/placeholder/Newtype.asm index 7ce5bb6..32297bd 100644 --- a/data/maps/attributes/placeholder/Newtype.asm +++ b/data/maps/attributes/placeholder/Newtype.asm @@ -37,4 +37,4 @@ Newtype_MapEvents:: object_event 24, 9, SPRITE_ROCKER, FACE_UP, 2, 1, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 30, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 -Newtype_Blocks:: INCBIN "maps/placeholder/blk/Newtype.blk"
\ No newline at end of file +Newtype_Blocks:: INCBIN "maps/placeholder/blk/Newtype.blk" diff --git a/data/maps/attributes/placeholder/NewtypeDiner.asm b/data/maps/attributes/placeholder/NewtypeDiner.asm index a3866ee..968b478 100644 --- a/data/maps/attributes/placeholder/NewtypeDiner.asm +++ b/data/maps/attributes/placeholder/NewtypeDiner.asm @@ -18,4 +18,4 @@ NewtypeDiner_MapEvents:: object_event 5, 3, SPRITE_SAILOR, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 5, 1, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 -NewtypeDiner_Blocks:: INCBIN "maps/placeholder/blk/NewtypeDiner.blk"
\ No newline at end of file +NewtypeDiner_Blocks:: INCBIN "maps/placeholder/blk/NewtypeDiner.blk" diff --git a/data/maps/attributes/placeholder/NewtypeDojo.asm b/data/maps/attributes/placeholder/NewtypeDojo.asm index 9153fcd..7a0457b 100644 --- a/data/maps/attributes/placeholder/NewtypeDojo.asm +++ b/data/maps/attributes/placeholder/NewtypeDojo.asm @@ -19,4 +19,4 @@ NewtypeDojo_MapEvents:: object_event 3, 10, SPRITE_BLACKBELT, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 10, SPRITE_BLACKBELT, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -NewtypeDojo_Blocks:: INCBIN "maps/placeholder/blk/NewtypeDojo.blk"
\ No newline at end of file +NewtypeDojo_Blocks:: INCBIN "maps/placeholder/blk/NewtypeDojo.blk" diff --git a/data/maps/attributes/placeholder/NewtypeHouse1.asm b/data/maps/attributes/placeholder/NewtypeHouse1.asm index c838165..9b613ad 100644 --- a/data/maps/attributes/placeholder/NewtypeHouse1.asm +++ b/data/maps/attributes/placeholder/NewtypeHouse1.asm @@ -15,4 +15,4 @@ NewtypeHouse1_MapEvents:: db 1 ; person events object_event 7, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -NewtypeHouse1_Blocks:: INCBIN "maps/placeholder/blk/NewtypeHouse1.blk"
\ No newline at end of file +NewtypeHouse1_Blocks:: INCBIN "maps/placeholder/blk/NewtypeHouse1.blk" diff --git a/data/maps/attributes/placeholder/NewtypeHouse2.asm b/data/maps/attributes/placeholder/NewtypeHouse2.asm index cb4d116..ef7e650 100644 --- a/data/maps/attributes/placeholder/NewtypeHouse2.asm +++ b/data/maps/attributes/placeholder/NewtypeHouse2.asm @@ -15,4 +15,4 @@ NewtypeHouse2_MapEvents:: db 1 ; person events object_event 4, 3, SPRITE_GENTLEMAN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -NewtypeHouse2_Blocks:: INCBIN "maps/placeholder/blk/NewtypeHouse2.blk"
\ No newline at end of file +NewtypeHouse2_Blocks:: INCBIN "maps/placeholder/blk/NewtypeHouse2.blk" diff --git a/data/maps/attributes/placeholder/NewtypeHouse3.asm b/data/maps/attributes/placeholder/NewtypeHouse3.asm index 37ef2ba..fbe78a1 100644 --- a/data/maps/attributes/placeholder/NewtypeHouse3.asm +++ b/data/maps/attributes/placeholder/NewtypeHouse3.asm @@ -15,4 +15,4 @@ NewtypeHouse3_MapEvents:: db 1 ; person events object_event 4, 3, SPRITE_GRAMPS, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -NewtypeHouse3_Blocks:: INCBIN "maps/placeholder/blk/NewtypeHouse3.blk"
\ No newline at end of file +NewtypeHouse3_Blocks:: INCBIN "maps/placeholder/blk/NewtypeHouse3.blk" diff --git a/data/maps/attributes/placeholder/NewtypeLeague1F.asm b/data/maps/attributes/placeholder/NewtypeLeague1F.asm index 4c17058..227c641 100644 --- a/data/maps/attributes/placeholder/NewtypeLeague1F.asm +++ b/data/maps/attributes/placeholder/NewtypeLeague1F.asm @@ -20,4 +20,4 @@ NewtypeLeague1F_MapEvents:: object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 -NewtypeLeague1F_Blocks:: INCBIN "maps/placeholder/blk/NewtypeLeague1F.blk"
\ No newline at end of file +NewtypeLeague1F_Blocks:: INCBIN "maps/placeholder/blk/NewtypeLeague1F.blk" diff --git a/data/maps/attributes/placeholder/NewtypeLeague2F.asm b/data/maps/attributes/placeholder/NewtypeLeague2F.asm index 3c78ae4..3ee52b4 100644 --- a/data/maps/attributes/placeholder/NewtypeLeague2F.asm +++ b/data/maps/attributes/placeholder/NewtypeLeague2F.asm @@ -18,4 +18,4 @@ NewtypeLeague2F_MapEvents:: object_event 0, 11, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 9, 11, SPRITE_COOLTRAINER_F, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -NewtypeLeague2F_Blocks:: INCBIN "maps/placeholder/blk/NewtypeLeague2F.blk"
\ No newline at end of file +NewtypeLeague2F_Blocks:: INCBIN "maps/placeholder/blk/NewtypeLeague2F.blk" diff --git a/data/maps/attributes/placeholder/NewtypeMart.asm b/data/maps/attributes/placeholder/NewtypeMart.asm index c3f27af..a180396 100644 --- a/data/maps/attributes/placeholder/NewtypeMart.asm +++ b/data/maps/attributes/placeholder/NewtypeMart.asm @@ -17,4 +17,4 @@ NewtypeMart_MapEvents:: object_event 10, 5, SPRITE_POKEFAN_F, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -NewtypeMart_Blocks:: INCBIN "maps/placeholder/blk/NewtypeMart.blk"
\ No newline at end of file +NewtypeMart_Blocks:: INCBIN "maps/placeholder/blk/NewtypeMart.blk" diff --git a/data/maps/attributes/placeholder/NewtypePokecenter1F.asm b/data/maps/attributes/placeholder/NewtypePokecenter1F.asm index 8de05d9..196e153 100644 --- a/data/maps/attributes/placeholder/NewtypePokecenter1F.asm +++ b/data/maps/attributes/placeholder/NewtypePokecenter1F.asm @@ -19,4 +19,4 @@ NewtypePokecenter1F_MapEvents:: object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -NewtypePokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/NewtypePokecenter1F.blk"
\ No newline at end of file +NewtypePokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/NewtypePokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/NewtypePokecenter2F.asm b/data/maps/attributes/placeholder/NewtypePokecenter2F.asm index 5f3e7b8..89a35fa 100644 --- a/data/maps/attributes/placeholder/NewtypePokecenter2F.asm +++ b/data/maps/attributes/placeholder/NewtypePokecenter2F.asm @@ -16,4 +16,4 @@ NewtypePokecenter2F_MapEvents:: object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -NewtypePokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/NewtypePokecenter2F.blk"
\ No newline at end of file +NewtypePokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/NewtypePokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/NewtypeRoute.asm b/data/maps/attributes/placeholder/NewtypeRoute.asm index 160c6b0..ae23280 100644 --- a/data/maps/attributes/placeholder/NewtypeRoute.asm +++ b/data/maps/attributes/placeholder/NewtypeRoute.asm @@ -14,4 +14,4 @@ NewtypeRoute_MapEvents:: db 0 ; person events -NewtypeRoute_Blocks:: INCBIN "maps/placeholder/blk/NewtypeRoute.blk"
\ No newline at end of file +NewtypeRoute_Blocks:: INCBIN "maps/placeholder/blk/NewtypeRoute.blk" diff --git a/data/maps/attributes/placeholder/NewtypeRouteGate.asm b/data/maps/attributes/placeholder/NewtypeRouteGate.asm index 7eda332..b3546a6 100644 --- a/data/maps/attributes/placeholder/NewtypeRouteGate.asm +++ b/data/maps/attributes/placeholder/NewtypeRouteGate.asm @@ -16,4 +16,4 @@ NewtypeRouteGate_MapEvents:: db 0 ; person events -NewtypeRouteGate_Blocks:: INCBIN "maps/placeholder/blk/NewtypeRouteGate.blk"
\ No newline at end of file +NewtypeRouteGate_Blocks:: INCBIN "maps/placeholder/blk/NewtypeRouteGate.blk" diff --git a/data/maps/attributes/placeholder/NewtypeSailorHouse.asm b/data/maps/attributes/placeholder/NewtypeSailorHouse.asm index 6f9c3fa..ea7cb6b 100644 --- a/data/maps/attributes/placeholder/NewtypeSailorHouse.asm +++ b/data/maps/attributes/placeholder/NewtypeSailorHouse.asm @@ -15,4 +15,4 @@ NewtypeSailorHouse_MapEvents:: db 1 ; person events object_event 6, 3, SPRITE_47, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -NewtypeSailorHouse_Blocks:: INCBIN "maps/placeholder/blk/NewtypeSailorHouse.blk"
\ No newline at end of file +NewtypeSailorHouse_Blocks:: INCBIN "maps/placeholder/blk/NewtypeSailorHouse.blk" diff --git a/data/maps/attributes/placeholder/North.asm b/data/maps/attributes/placeholder/North.asm index b033507..fec500b 100644 --- a/data/maps/attributes/placeholder/North.asm +++ b/data/maps/attributes/placeholder/North.asm @@ -24,4 +24,4 @@ North_MapEvents:: object_event 10, 9, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 9, 9, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 -North_Blocks:: INCBIN "maps/placeholder/blk/North.blk"
\ No newline at end of file +North_Blocks:: INCBIN "maps/placeholder/blk/North.blk" diff --git a/data/maps/attributes/placeholder/NorthHouse1.asm b/data/maps/attributes/placeholder/NorthHouse1.asm index bbb9502..55ea98b 100644 --- a/data/maps/attributes/placeholder/NorthHouse1.asm +++ b/data/maps/attributes/placeholder/NorthHouse1.asm @@ -15,4 +15,4 @@ NorthHouse1_MapEvents:: db 1 ; person events object_event 2, 3, SPRITE_TWIN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -NorthHouse1_Blocks:: INCBIN "maps/placeholder/blk/NorthHouse1.blk"
\ No newline at end of file +NorthHouse1_Blocks:: INCBIN "maps/placeholder/blk/NorthHouse1.blk" diff --git a/data/maps/attributes/placeholder/NorthHouse2.asm b/data/maps/attributes/placeholder/NorthHouse2.asm index 7bbb1c9..42178a7 100644 --- a/data/maps/attributes/placeholder/NorthHouse2.asm +++ b/data/maps/attributes/placeholder/NorthHouse2.asm @@ -15,4 +15,4 @@ NorthHouse2_MapEvents:: db 1 ; person events object_event 2, 3, SPRITE_TWIN, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -NorthHouse2_Blocks:: INCBIN "maps/placeholder/blk/NorthHouse2.blk"
\ No newline at end of file +NorthHouse2_Blocks:: INCBIN "maps/placeholder/blk/NorthHouse2.blk" diff --git a/data/maps/attributes/placeholder/NorthMart.asm b/data/maps/attributes/placeholder/NorthMart.asm index 5623d36..f916cf1 100644 --- a/data/maps/attributes/placeholder/NorthMart.asm +++ b/data/maps/attributes/placeholder/NorthMart.asm @@ -17,4 +17,4 @@ NorthMart_MapEvents:: object_event 10, 5, SPRITE_GIRL, FACE_RIGHT, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -NorthMart_Blocks:: INCBIN "maps/placeholder/blk/NorthMart.blk"
\ No newline at end of file +NorthMart_Blocks:: INCBIN "maps/placeholder/blk/NorthMart.blk" diff --git a/data/maps/attributes/placeholder/NorthPokecenter1F.asm b/data/maps/attributes/placeholder/NorthPokecenter1F.asm index 36d9164..3b84a12 100644 --- a/data/maps/attributes/placeholder/NorthPokecenter1F.asm +++ b/data/maps/attributes/placeholder/NorthPokecenter1F.asm @@ -19,4 +19,4 @@ NorthPokecenter1F_MapEvents:: object_event 2, 5, SPRITE_24, FACE_RIGHT, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -NorthPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/NorthPokecenter1F.blk"
\ No newline at end of file +NorthPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/NorthPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/NorthPokecenter2F.asm b/data/maps/attributes/placeholder/NorthPokecenter2F.asm index 98c593d..6d678c3 100644 --- a/data/maps/attributes/placeholder/NorthPokecenter2F.asm +++ b/data/maps/attributes/placeholder/NorthPokecenter2F.asm @@ -16,4 +16,4 @@ NorthPokecenter2F_MapEvents:: object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -NorthPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/NorthPokecenter2F.blk"
\ No newline at end of file +NorthPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/NorthPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/Office1.asm b/data/maps/attributes/placeholder/Office1.asm index e33fd36..661e688 100644 --- a/data/maps/attributes/placeholder/Office1.asm +++ b/data/maps/attributes/placeholder/Office1.asm @@ -12,4 +12,4 @@ Office1_MapEvents:: db 0 ; person events -Office1_Blocks:: INCBIN "maps/placeholder/blk/Office1.blk"
\ No newline at end of file +Office1_Blocks:: INCBIN "maps/placeholder/blk/Office1.blk" diff --git a/data/maps/attributes/placeholder/Office2.asm b/data/maps/attributes/placeholder/Office2.asm index 6d456b7..7190b43 100644 --- a/data/maps/attributes/placeholder/Office2.asm +++ b/data/maps/attributes/placeholder/Office2.asm @@ -12,4 +12,4 @@ Office2_MapEvents:: db 0 ; person events -Office2_Blocks:: INCBIN "maps/placeholder/blk/Office2.blk"
\ No newline at end of file +Office2_Blocks:: INCBIN "maps/placeholder/blk/Office2.blk" diff --git a/data/maps/attributes/placeholder/Office3.asm b/data/maps/attributes/placeholder/Office3.asm index 5978cb2..752a0b4 100644 --- a/data/maps/attributes/placeholder/Office3.asm +++ b/data/maps/attributes/placeholder/Office3.asm @@ -12,4 +12,4 @@ Office3_MapEvents:: db 0 ; person events -Office3_Blocks:: INCBIN "maps/placeholder/blk/Office3.blk"
\ No newline at end of file +Office3_Blocks:: INCBIN "maps/placeholder/blk/Office3.blk" diff --git a/data/maps/attributes/placeholder/OldCity.asm b/data/maps/attributes/placeholder/OldCity.asm index 5318cd9..f1ffc71 100644 --- a/data/maps/attributes/placeholder/OldCity.asm +++ b/data/maps/attributes/placeholder/OldCity.asm @@ -45,4 +45,4 @@ OldCity_MapEvents:: object_event 10, 21, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 17, 19, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -OldCity_Blocks:: INCBIN "maps/placeholder/blk/OldCity.blk"
\ No newline at end of file +OldCity_Blocks:: INCBIN "maps/placeholder/blk/OldCity.blk" diff --git a/data/maps/attributes/placeholder/OldCityBillsHouse.asm b/data/maps/attributes/placeholder/OldCityBillsHouse.asm index dc9432d..e64ded4 100644 --- a/data/maps/attributes/placeholder/OldCityBillsHouse.asm +++ b/data/maps/attributes/placeholder/OldCityBillsHouse.asm @@ -21,4 +21,4 @@ OldCityBillsHouse_MapEvents:: db 1 ; person events object_event 5, 4, SPRITE_MASAKI, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -OldCityBillsHouse_Blocks:: INCBIN "maps/placeholder/blk/OldCityBillsHouse.blk"
\ No newline at end of file +OldCityBillsHouse_Blocks:: INCBIN "maps/placeholder/blk/OldCityBillsHouse.blk" diff --git a/data/maps/attributes/placeholder/OldCityGym.asm b/data/maps/attributes/placeholder/OldCityGym.asm index 710e683..d83f856 100644 --- a/data/maps/attributes/placeholder/OldCityGym.asm +++ b/data/maps/attributes/placeholder/OldCityGym.asm @@ -22,4 +22,4 @@ OldCityGym_MapEvents:: object_event 1, 9, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 object_event 7, 15, SPRITE_GYM_GUY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 1, 0, 0 -OldCityGym_Blocks:: INCBIN "maps/placeholder/blk/OldCityGym.blk"
\ No newline at end of file +OldCityGym_Blocks:: INCBIN "maps/placeholder/blk/OldCityGym.blk" diff --git a/data/maps/attributes/placeholder/OldCityHouse.asm b/data/maps/attributes/placeholder/OldCityHouse.asm index 4915f3b..085ed83 100644 --- a/data/maps/attributes/placeholder/OldCityHouse.asm +++ b/data/maps/attributes/placeholder/OldCityHouse.asm @@ -21,4 +21,4 @@ OldCityHouse_MapEvents:: object_event 0, 6, SPRITE_LASS, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 object_event 5, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -OldCityHouse_Blocks:: INCBIN "maps/placeholder/blk/OldCityHouse.blk"
\ No newline at end of file +OldCityHouse_Blocks:: INCBIN "maps/placeholder/blk/OldCityHouse.blk" diff --git a/data/maps/attributes/placeholder/OldCityKurtsHouse.asm b/data/maps/attributes/placeholder/OldCityKurtsHouse.asm index c5703cd..0e343fd 100644 --- a/data/maps/attributes/placeholder/OldCityKurtsHouse.asm +++ b/data/maps/attributes/placeholder/OldCityKurtsHouse.asm @@ -20,4 +20,4 @@ OldCityKurtsHouse_MapEvents:: db 1 ; person events object_event 2, 2, SPRITE_GANTETSU, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -OldCityKurtsHouse_Blocks:: INCBIN "maps/placeholder/blk/OldCityKurtsHouse.blk"
\ No newline at end of file +OldCityKurtsHouse_Blocks:: INCBIN "maps/placeholder/blk/OldCityKurtsHouse.blk" diff --git a/data/maps/attributes/placeholder/OldCityMart.asm b/data/maps/attributes/placeholder/OldCityMart.asm index ed74156..125dfa7 100644 --- a/data/maps/attributes/placeholder/OldCityMart.asm +++ b/data/maps/attributes/placeholder/OldCityMart.asm @@ -18,4 +18,4 @@ OldCityMart_MapEvents:: object_event 10, 5, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 4, 1, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -OldCityMart_Blocks:: INCBIN "maps/placeholder/blk/OldCityMart.blk"
\ No newline at end of file +OldCityMart_Blocks:: INCBIN "maps/placeholder/blk/OldCityMart.blk" diff --git a/data/maps/attributes/placeholder/OldCityMuseum.asm b/data/maps/attributes/placeholder/OldCityMuseum.asm index 1c4505b..28f3351 100644 --- a/data/maps/attributes/placeholder/OldCityMuseum.asm +++ b/data/maps/attributes/placeholder/OldCityMuseum.asm @@ -20,4 +20,4 @@ OldCityMuseum_MapEvents:: object_event 1, 5, SPRITE_FISHER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 13, 4, SPRITE_EGG, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -OldCityMuseum_Blocks:: INCBIN "maps/placeholder/blk/OldCityMuseum.blk"
\ No newline at end of file +OldCityMuseum_Blocks:: INCBIN "maps/placeholder/blk/OldCityMuseum.blk" diff --git a/data/maps/attributes/placeholder/OldCityPokecenter1F.asm b/data/maps/attributes/placeholder/OldCityPokecenter1F.asm index 19439fc..1b27e00 100644 --- a/data/maps/attributes/placeholder/OldCityPokecenter1F.asm +++ b/data/maps/attributes/placeholder/OldCityPokecenter1F.asm @@ -20,4 +20,4 @@ OldCityPokecenter1F_MapEvents:: object_event 2, 5, SPRITE_YOUNGSTER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_35, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -OldCityPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/OldCityPokecenter1F.blk"
\ No newline at end of file +OldCityPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/OldCityPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/OldCitySchool.asm b/data/maps/attributes/placeholder/OldCitySchool.asm index 3944fb2..b6640a5 100644 --- a/data/maps/attributes/placeholder/OldCitySchool.asm +++ b/data/maps/attributes/placeholder/OldCitySchool.asm @@ -24,4 +24,4 @@ OldCitySchool_MapEvents:: object_event 6, 6, SPRITE_TEACHER, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 2, 11, SPRITE_YOUNGSTER, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -OldCitySchool_Blocks:: INCBIN "maps/placeholder/blk/OldCitySchool.blk"
\ No newline at end of file +OldCitySchool_Blocks:: INCBIN "maps/placeholder/blk/OldCitySchool.blk" diff --git a/data/maps/attributes/placeholder/OldCityTower1F.asm b/data/maps/attributes/placeholder/OldCityTower1F.asm index ca6825a..39f8d17 100644 --- a/data/maps/attributes/placeholder/OldCityTower1F.asm +++ b/data/maps/attributes/placeholder/OldCityTower1F.asm @@ -22,4 +22,4 @@ OldCityTower1F_MapEvents:: object_event 5, 1, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 object_event 6, 4, SPRITE_SAGE, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 -OldCityTower1F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower1F.blk"
\ No newline at end of file +OldCityTower1F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower1F.blk" diff --git a/data/maps/attributes/placeholder/OldCityTower2F.asm b/data/maps/attributes/placeholder/OldCityTower2F.asm index 11f49bc..2231f4d 100644 --- a/data/maps/attributes/placeholder/OldCityTower2F.asm +++ b/data/maps/attributes/placeholder/OldCityTower2F.asm @@ -20,4 +20,4 @@ OldCityTower2F_MapEvents:: object_event 2, 6, SPRITE_MEDIUM, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 object_event 5, 6, SPRITE_MEDIUM, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 -OldCityTower2F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower2F.blk"
\ No newline at end of file +OldCityTower2F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower2F.blk" diff --git a/data/maps/attributes/placeholder/OldCityTower3F.asm b/data/maps/attributes/placeholder/OldCityTower3F.asm index cd40a15..d887263 100644 --- a/data/maps/attributes/placeholder/OldCityTower3F.asm +++ b/data/maps/attributes/placeholder/OldCityTower3F.asm @@ -20,4 +20,4 @@ OldCityTower3F_MapEvents:: object_event 4, 4, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 object_event 5, 5, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 -OldCityTower3F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower3F.blk"
\ No newline at end of file +OldCityTower3F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower3F.blk" diff --git a/data/maps/attributes/placeholder/OldCityTower4F.asm b/data/maps/attributes/placeholder/OldCityTower4F.asm index 36ee7e3..7a0902c 100644 --- a/data/maps/attributes/placeholder/OldCityTower4F.asm +++ b/data/maps/attributes/placeholder/OldCityTower4F.asm @@ -20,4 +20,4 @@ OldCityTower4F_MapEvents:: object_event 6, 7, SPRITE_SAGE, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 5, 0, 0 object_event 7, 1, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 4, 0, 0 -OldCityTower4F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower4F.blk"
\ No newline at end of file +OldCityTower4F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower4F.blk" diff --git a/data/maps/attributes/placeholder/OldCityTower5F.asm b/data/maps/attributes/placeholder/OldCityTower5F.asm index 98d5f3f..9056341 100644 --- a/data/maps/attributes/placeholder/OldCityTower5F.asm +++ b/data/maps/attributes/placeholder/OldCityTower5F.asm @@ -17,4 +17,4 @@ OldCityTower5F_MapEvents:: db 1 ; person events object_event 2, 3, SPRITE_SAGE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -OldCityTower5F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower5F.blk"
\ No newline at end of file +OldCityTower5F_Blocks:: INCBIN "maps/placeholder/blk/OldCityTower5F.blk" diff --git a/data/maps/attributes/placeholder/PowerPlant1.asm b/data/maps/attributes/placeholder/PowerPlant1.asm index 6706834..e06ccd2 100644 --- a/data/maps/attributes/placeholder/PowerPlant1.asm +++ b/data/maps/attributes/placeholder/PowerPlant1.asm @@ -12,4 +12,4 @@ PowerPlant1_MapEvents:: db 0 ; person events -PowerPlant1_Blocks:: INCBIN "maps/placeholder/blk/PowerPlant1.blk"
\ No newline at end of file +PowerPlant1_Blocks:: INCBIN "maps/placeholder/blk/PowerPlant1.blk" diff --git a/data/maps/attributes/placeholder/PowerPlant2.asm b/data/maps/attributes/placeholder/PowerPlant2.asm index 7d2b6d5..e14cdd9 100644 --- a/data/maps/attributes/placeholder/PowerPlant2.asm +++ b/data/maps/attributes/placeholder/PowerPlant2.asm @@ -12,4 +12,4 @@ PowerPlant2_MapEvents:: db 0 ; person events -PowerPlant2_Blocks:: INCBIN "maps/placeholder/blk/PowerPlant2.blk"
\ No newline at end of file +PowerPlant2_Blocks:: INCBIN "maps/placeholder/blk/PowerPlant2.blk" diff --git a/data/maps/attributes/placeholder/PowerPlant3.asm b/data/maps/attributes/placeholder/PowerPlant3.asm index 31db98a..8a3797d 100644 --- a/data/maps/attributes/placeholder/PowerPlant3.asm +++ b/data/maps/attributes/placeholder/PowerPlant3.asm @@ -12,4 +12,4 @@ PowerPlant3_MapEvents:: db 0 ; person events -PowerPlant3_Blocks:: INCBIN "maps/placeholder/blk/PowerPlant3.blk"
\ No newline at end of file +PowerPlant3_Blocks:: INCBIN "maps/placeholder/blk/PowerPlant3.blk" diff --git a/data/maps/attributes/placeholder/PowerPlant4.asm b/data/maps/attributes/placeholder/PowerPlant4.asm index 5e221f8..bdb33ba 100644 --- a/data/maps/attributes/placeholder/PowerPlant4.asm +++ b/data/maps/attributes/placeholder/PowerPlant4.asm @@ -12,4 +12,4 @@ PowerPlant4_MapEvents:: db 0 ; person events -PowerPlant4_Blocks:: INCBIN "maps/placeholder/blk/PowerPlant4.blk"
\ No newline at end of file +PowerPlant4_Blocks:: INCBIN "maps/placeholder/blk/PowerPlant4.blk" diff --git a/data/maps/attributes/placeholder/Prince.asm b/data/maps/attributes/placeholder/Prince.asm index b9f51e9..597d5eb 100644 --- a/data/maps/attributes/placeholder/Prince.asm +++ b/data/maps/attributes/placeholder/Prince.asm @@ -14,4 +14,4 @@ Prince_MapEvents:: db 0 ; person events -Prince_Blocks:: INCBIN "maps/placeholder/blk/Prince.blk"
\ No newline at end of file +Prince_Blocks:: INCBIN "maps/placeholder/blk/Prince.blk" diff --git a/data/maps/attributes/placeholder/PrinceRoute.asm b/data/maps/attributes/placeholder/PrinceRoute.asm index e96cfbf..28af3d3 100644 --- a/data/maps/attributes/placeholder/PrinceRoute.asm +++ b/data/maps/attributes/placeholder/PrinceRoute.asm @@ -14,4 +14,4 @@ PrinceRoute_MapEvents:: db 0 ; person events -PrinceRoute_Blocks:: INCBIN "maps/placeholder/blk/PrinceRoute.blk"
\ No newline at end of file +PrinceRoute_Blocks:: INCBIN "maps/placeholder/blk/PrinceRoute.blk" diff --git a/data/maps/attributes/placeholder/Route15.asm b/data/maps/attributes/placeholder/Route15.asm index b3c5612..08f1564 100644 --- a/data/maps/attributes/placeholder/Route15.asm +++ b/data/maps/attributes/placeholder/Route15.asm @@ -21,4 +21,4 @@ Route15_MapEvents:: db 0 ; person events -Route15_Blocks:: INCBIN "maps/placeholder/blk/Route15.blk"
\ No newline at end of file +Route15_Blocks:: INCBIN "maps/placeholder/blk/Route15.blk" diff --git a/data/maps/attributes/placeholder/Route15Pokecenter1F.asm b/data/maps/attributes/placeholder/Route15Pokecenter1F.asm index 0fc0944..52e9fc8 100644 --- a/data/maps/attributes/placeholder/Route15Pokecenter1F.asm +++ b/data/maps/attributes/placeholder/Route15Pokecenter1F.asm @@ -19,4 +19,4 @@ Route15Pokecenter1F_MapEvents:: object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -Route15Pokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/Route15Pokecenter1F.blk"
\ No newline at end of file +Route15Pokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/Route15Pokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/Route15Pokecenter2F.asm b/data/maps/attributes/placeholder/Route15Pokecenter2F.asm index 4ee1a50..758212d 100644 --- a/data/maps/attributes/placeholder/Route15Pokecenter2F.asm +++ b/data/maps/attributes/placeholder/Route15Pokecenter2F.asm @@ -13,4 +13,4 @@ Route15Pokecenter2F_MapEvents:: db 0 ; person events -Route15Pokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/Route15Pokecenter2F.blk"
\ No newline at end of file +Route15Pokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/Route15Pokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/Route18.asm b/data/maps/attributes/placeholder/Route18.asm index c8887dc..8c7809a 100644 --- a/data/maps/attributes/placeholder/Route18.asm +++ b/data/maps/attributes/placeholder/Route18.asm @@ -17,4 +17,4 @@ Route18_MapEvents:: db 0 ; person events -Route18_Blocks:: INCBIN "maps/placeholder/blk/Route18.blk"
\ No newline at end of file +Route18_Blocks:: INCBIN "maps/placeholder/blk/Route18.blk" diff --git a/data/maps/attributes/placeholder/Route18Pokecenter1F.asm b/data/maps/attributes/placeholder/Route18Pokecenter1F.asm index d2f2343..ba29f0d 100644 --- a/data/maps/attributes/placeholder/Route18Pokecenter1F.asm +++ b/data/maps/attributes/placeholder/Route18Pokecenter1F.asm @@ -19,4 +19,4 @@ Route18Pokecenter1F_MapEvents:: object_event 2, 5, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -Route18Pokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/Route18Pokecenter1F.blk"
\ No newline at end of file +Route18Pokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/Route18Pokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/Route18Pokecenter2F.asm b/data/maps/attributes/placeholder/Route18Pokecenter2F.asm index b6ce6a6..3c0502f 100644 --- a/data/maps/attributes/placeholder/Route18Pokecenter2F.asm +++ b/data/maps/attributes/placeholder/Route18Pokecenter2F.asm @@ -13,4 +13,4 @@ Route18Pokecenter2F_MapEvents:: db 0 ; person events -Route18Pokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/Route18Pokecenter2F.blk"
\ No newline at end of file +Route18Pokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/Route18Pokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/Route2.asm b/data/maps/attributes/placeholder/Route2.asm index fd58b0a..f3d876f 100644 --- a/data/maps/attributes/placeholder/Route2.asm +++ b/data/maps/attributes/placeholder/Route2.asm @@ -22,4 +22,4 @@ Route2_MapEvents:: object_event 15, 7, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 8, SPRITE_YOUNGSTER, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 3, 0, 0 -Route2_Blocks:: INCBIN "maps/placeholder/blk/Route2.blk"
\ No newline at end of file +Route2_Blocks:: INCBIN "maps/placeholder/blk/Route2.blk" diff --git a/data/maps/attributes/placeholder/Route2Gate1F.asm b/data/maps/attributes/placeholder/Route2Gate1F.asm index f307328..bb112f9 100644 --- a/data/maps/attributes/placeholder/Route2Gate1F.asm +++ b/data/maps/attributes/placeholder/Route2Gate1F.asm @@ -19,4 +19,4 @@ Route2Gate1F_MapEvents:: object_event 8, 3, SPRITE_BUG_CATCHER_BOY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 0, 1, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -Route2Gate1F_Blocks:: INCBIN "maps/placeholder/blk/Route2Gate1F.blk"
\ No newline at end of file +Route2Gate1F_Blocks:: INCBIN "maps/placeholder/blk/Route2Gate1F.blk" diff --git a/data/maps/attributes/placeholder/Route2Gate2F.asm b/data/maps/attributes/placeholder/Route2Gate2F.asm index 3c89e46..c9d2d82 100644 --- a/data/maps/attributes/placeholder/Route2Gate2F.asm +++ b/data/maps/attributes/placeholder/Route2Gate2F.asm @@ -17,4 +17,4 @@ Route2Gate2F_MapEvents:: object_event 2, 2, SPRITE_LASS, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 5, 4, SPRITE_TWIN, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 -Route2Gate2F_Blocks:: INCBIN "maps/placeholder/blk/Route2Gate2F.blk"
\ No newline at end of file +Route2Gate2F_Blocks:: INCBIN "maps/placeholder/blk/Route2Gate2F.blk" diff --git a/data/maps/attributes/placeholder/Route2House.asm b/data/maps/attributes/placeholder/Route2House.asm index a38e4fd..3600ea1 100644 --- a/data/maps/attributes/placeholder/Route2House.asm +++ b/data/maps/attributes/placeholder/Route2House.asm @@ -21,4 +21,4 @@ Route2House_MapEvents:: db 1 ; person events object_event 6, 6, SPRITE_SCIENTIST, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -Route2House_Blocks:: INCBIN "maps/placeholder/blk/Route2House.blk"
\ No newline at end of file +Route2House_Blocks:: INCBIN "maps/placeholder/blk/Route2House.blk" diff --git a/data/maps/attributes/placeholder/RouteSilentEast.asm b/data/maps/attributes/placeholder/RouteSilentEast.asm index 74838ba..661a9a7 100644 --- a/data/maps/attributes/placeholder/RouteSilentEast.asm +++ b/data/maps/attributes/placeholder/RouteSilentEast.asm @@ -15,4 +15,4 @@ RouteSilentEast_MapEvents:: db 0 ; person events -RouteSilentEast_Blocks:: INCBIN "maps/placeholder/blk/RouteSilentEast.blk"
\ No newline at end of file +RouteSilentEast_Blocks:: INCBIN "maps/placeholder/blk/RouteSilentEast.blk" diff --git a/data/maps/attributes/placeholder/RouteSilentEastGate.asm b/data/maps/attributes/placeholder/RouteSilentEastGate.asm index 3d7bfdb..9de74e1 100644 --- a/data/maps/attributes/placeholder/RouteSilentEastGate.asm +++ b/data/maps/attributes/placeholder/RouteSilentEastGate.asm @@ -16,4 +16,4 @@ RouteSilentEastGate_MapEvents:: db 0 ; person events -RouteSilentEastGate_Blocks:: INCBIN "maps/placeholder/blk/RouteSilentEastGate.blk"
\ No newline at end of file +RouteSilentEastGate_Blocks:: INCBIN "maps/placeholder/blk/RouteSilentEastGate.blk" diff --git a/data/maps/attributes/placeholder/RuinsOfAlphEntrance.asm b/data/maps/attributes/placeholder/RuinsOfAlphEntrance.asm index 1ac50cb..6394343 100644 --- a/data/maps/attributes/placeholder/RuinsOfAlphEntrance.asm +++ b/data/maps/attributes/placeholder/RuinsOfAlphEntrance.asm @@ -12,4 +12,4 @@ RuinsOfAlphEntrance_MapEvents:: db 0 ; person events -RuinsOfAlphEntrance_Blocks:: INCBIN "maps/placeholder/blk/RuinsOfAlphEntrance.blk"
\ No newline at end of file +RuinsOfAlphEntrance_Blocks:: INCBIN "maps/placeholder/blk/RuinsOfAlphEntrance.blk" diff --git a/data/maps/attributes/placeholder/RuinsOfAlphMain.asm b/data/maps/attributes/placeholder/RuinsOfAlphMain.asm index 1fb4cb0..bf6e073 100644 --- a/data/maps/attributes/placeholder/RuinsOfAlphMain.asm +++ b/data/maps/attributes/placeholder/RuinsOfAlphMain.asm @@ -12,4 +12,4 @@ RuinsOfAlphMain_MapEvents:: db 0 ; person events -RuinsOfAlphMain_Blocks:: INCBIN "maps/placeholder/blk/RuinsOfAlphMain.blk"
\ No newline at end of file +RuinsOfAlphMain_Blocks:: INCBIN "maps/placeholder/blk/RuinsOfAlphMain.blk" diff --git a/data/maps/attributes/placeholder/SlowpokeWellEntrance.asm b/data/maps/attributes/placeholder/SlowpokeWellEntrance.asm index 2c8b7d7..7e9a91e 100644 --- a/data/maps/attributes/placeholder/SlowpokeWellEntrance.asm +++ b/data/maps/attributes/placeholder/SlowpokeWellEntrance.asm @@ -12,4 +12,4 @@ SlowpokeWellEntrance_MapEvents:: db 0 ; person events -SlowpokeWellEntrance_Blocks:: INCBIN "maps/placeholder/blk/SlowpokeWellEntrance.blk"
\ No newline at end of file +SlowpokeWellEntrance_Blocks:: INCBIN "maps/placeholder/blk/SlowpokeWellEntrance.blk" diff --git a/data/maps/attributes/placeholder/SlowpokeWellMain.asm b/data/maps/attributes/placeholder/SlowpokeWellMain.asm index d6f3d39..5293965 100644 --- a/data/maps/attributes/placeholder/SlowpokeWellMain.asm +++ b/data/maps/attributes/placeholder/SlowpokeWellMain.asm @@ -12,4 +12,4 @@ SlowpokeWellMain_MapEvents:: db 0 ; person events -SlowpokeWellMain_Blocks:: INCBIN "maps/placeholder/blk/SlowpokeWellMain.blk"
\ No newline at end of file +SlowpokeWellMain_Blocks:: INCBIN "maps/placeholder/blk/SlowpokeWellMain.blk" diff --git a/data/maps/attributes/placeholder/South.asm b/data/maps/attributes/placeholder/South.asm index e67f8e9..682b5dc 100644 --- a/data/maps/attributes/placeholder/South.asm +++ b/data/maps/attributes/placeholder/South.asm @@ -33,4 +33,4 @@ South_MapEvents:: object_event 22, 16, SPRITE_ROCKER, SLOW_STEP_DOWN, 3, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 30, 11, SPRITE_FISHING_GURU, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 -South_Blocks:: INCBIN "maps/placeholder/blk/South.blk"
\ No newline at end of file +South_Blocks:: INCBIN "maps/placeholder/blk/South.blk" diff --git a/data/maps/attributes/placeholder/SouthHouse1.asm b/data/maps/attributes/placeholder/SouthHouse1.asm index fd0a19a..70c2f79 100644 --- a/data/maps/attributes/placeholder/SouthHouse1.asm +++ b/data/maps/attributes/placeholder/SouthHouse1.asm @@ -15,4 +15,4 @@ SouthHouse1_MapEvents:: db 1 ; person events object_event 2, 3, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -SouthHouse1_Blocks:: INCBIN "maps/placeholder/blk/SouthHouse1.blk"
\ No newline at end of file +SouthHouse1_Blocks:: INCBIN "maps/placeholder/blk/SouthHouse1.blk" diff --git a/data/maps/attributes/placeholder/SouthHouse2.asm b/data/maps/attributes/placeholder/SouthHouse2.asm index a864046..556c132 100644 --- a/data/maps/attributes/placeholder/SouthHouse2.asm +++ b/data/maps/attributes/placeholder/SouthHouse2.asm @@ -15,4 +15,4 @@ SouthHouse2_MapEvents:: db 1 ; person events object_event 1, 2, SPRITE_FISHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 -SouthHouse2_Blocks:: INCBIN "maps/placeholder/blk/SouthHouse2.blk"
\ No newline at end of file +SouthHouse2_Blocks:: INCBIN "maps/placeholder/blk/SouthHouse2.blk" diff --git a/data/maps/attributes/placeholder/SouthMart.asm b/data/maps/attributes/placeholder/SouthMart.asm index 4d4ebfa..89ed8a6 100644 --- a/data/maps/attributes/placeholder/SouthMart.asm +++ b/data/maps/attributes/placeholder/SouthMart.asm @@ -17,4 +17,4 @@ SouthMart_MapEvents:: object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -SouthMart_Blocks:: INCBIN "maps/placeholder/blk/SouthMart.blk"
\ No newline at end of file +SouthMart_Blocks:: INCBIN "maps/placeholder/blk/SouthMart.blk" diff --git a/data/maps/attributes/placeholder/SouthPokecenter1F.asm b/data/maps/attributes/placeholder/SouthPokecenter1F.asm index 9e9ba84..635a8e4 100644 --- a/data/maps/attributes/placeholder/SouthPokecenter1F.asm +++ b/data/maps/attributes/placeholder/SouthPokecenter1F.asm @@ -19,4 +19,4 @@ SouthPokecenter1F_MapEvents:: object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_YOUNGSTER, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -SouthPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/SouthPokecenter1F.blk"
\ No newline at end of file +SouthPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/SouthPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/SouthPokecenter2F.asm b/data/maps/attributes/placeholder/SouthPokecenter2F.asm index a796590..27c0b2e 100644 --- a/data/maps/attributes/placeholder/SouthPokecenter2F.asm +++ b/data/maps/attributes/placeholder/SouthPokecenter2F.asm @@ -16,4 +16,4 @@ SouthPokecenter2F_MapEvents:: object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -SouthPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/SouthPokecenter2F.blk"
\ No newline at end of file +SouthPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/SouthPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/Stand.asm b/data/maps/attributes/placeholder/Stand.asm index 73a4487..b5289c9 100644 --- a/data/maps/attributes/placeholder/Stand.asm +++ b/data/maps/attributes/placeholder/Stand.asm @@ -43,4 +43,4 @@ Stand_MapEvents:: object_event 14, 15, SPRITE_POPPO, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 21, SPRITE_SIDON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 -Stand_Blocks:: INCBIN "maps/placeholder/blk/Stand.blk"
\ No newline at end of file +Stand_Blocks:: INCBIN "maps/placeholder/blk/Stand.blk" diff --git a/data/maps/attributes/placeholder/StandHouse.asm b/data/maps/attributes/placeholder/StandHouse.asm index 6126d41..8560cec 100644 --- a/data/maps/attributes/placeholder/StandHouse.asm +++ b/data/maps/attributes/placeholder/StandHouse.asm @@ -15,4 +15,4 @@ StandHouse_MapEvents:: db 1 ; person events object_event 2, 3, SPRITE_SUPER_NERD, FACE_RIGHT, 0, 1, -1, -1, 0, 0, 0, 0, 0, 0 -StandHouse_Blocks:: INCBIN "maps/placeholder/blk/StandHouse.blk"
\ No newline at end of file +StandHouse_Blocks:: INCBIN "maps/placeholder/blk/StandHouse.blk" diff --git a/data/maps/attributes/placeholder/StandLab.asm b/data/maps/attributes/placeholder/StandLab.asm index 455bda8..cfaeb45 100644 --- a/data/maps/attributes/placeholder/StandLab.asm +++ b/data/maps/attributes/placeholder/StandLab.asm @@ -15,4 +15,4 @@ StandLab_MapEvents:: db 1 ; person events object_event 2, 3, SPRITE_NURSE, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -StandLab_Blocks:: INCBIN "maps/placeholder/blk/StandLab.blk"
\ No newline at end of file +StandLab_Blocks:: INCBIN "maps/placeholder/blk/StandLab.blk" diff --git a/data/maps/attributes/placeholder/StandLeague1F.asm b/data/maps/attributes/placeholder/StandLeague1F.asm index 78d7f35..a762b75 100644 --- a/data/maps/attributes/placeholder/StandLeague1F.asm +++ b/data/maps/attributes/placeholder/StandLeague1F.asm @@ -20,4 +20,4 @@ StandLeague1F_MapEvents:: object_event 3, 1, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 6, SPRITE_COOLTRAINER_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 -StandLeague1F_Blocks:: INCBIN "maps/placeholder/blk/StandLeague1F.blk"
\ No newline at end of file +StandLeague1F_Blocks:: INCBIN "maps/placeholder/blk/StandLeague1F.blk" diff --git a/data/maps/attributes/placeholder/StandLeague2F.asm b/data/maps/attributes/placeholder/StandLeague2F.asm index 8fff913..e88767b 100644 --- a/data/maps/attributes/placeholder/StandLeague2F.asm +++ b/data/maps/attributes/placeholder/StandLeague2F.asm @@ -18,4 +18,4 @@ StandLeague2F_MapEvents:: object_event 9, 6, SPRITE_24, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 5, 1, SPRITE_COOLTRAINER_F, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -StandLeague2F_Blocks:: INCBIN "maps/placeholder/blk/StandLeague2F.blk"
\ No newline at end of file +StandLeague2F_Blocks:: INCBIN "maps/placeholder/blk/StandLeague2F.blk" diff --git a/data/maps/attributes/placeholder/StandMart.asm b/data/maps/attributes/placeholder/StandMart.asm index b1f85ef..56b2581 100644 --- a/data/maps/attributes/placeholder/StandMart.asm +++ b/data/maps/attributes/placeholder/StandMart.asm @@ -17,4 +17,4 @@ StandMart_MapEvents:: object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -StandMart_Blocks:: INCBIN "maps/placeholder/blk/StandMart.blk"
\ No newline at end of file +StandMart_Blocks:: INCBIN "maps/placeholder/blk/StandMart.blk" diff --git a/data/maps/attributes/placeholder/StandOffice.asm b/data/maps/attributes/placeholder/StandOffice.asm index f66c676..7faa973 100644 --- a/data/maps/attributes/placeholder/StandOffice.asm +++ b/data/maps/attributes/placeholder/StandOffice.asm @@ -17,4 +17,4 @@ StandOffice_MapEvents:: object_event 5, 6, SPRITE_SUPER_NERD, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 7, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -StandOffice_Blocks:: INCBIN "maps/placeholder/blk/StandOffice.blk"
\ No newline at end of file +StandOffice_Blocks:: INCBIN "maps/placeholder/blk/StandOffice.blk" diff --git a/data/maps/attributes/placeholder/StandPokecenter1F.asm b/data/maps/attributes/placeholder/StandPokecenter1F.asm index c12095e..36fe312 100644 --- a/data/maps/attributes/placeholder/StandPokecenter1F.asm +++ b/data/maps/attributes/placeholder/StandPokecenter1F.asm @@ -19,4 +19,4 @@ StandPokecenter1F_MapEvents:: object_event 2, 5, SPRITE_GENTLEMAN, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_LASS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -StandPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/StandPokecenter1F.blk"
\ No newline at end of file +StandPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/StandPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/StandPokecenter2F.asm b/data/maps/attributes/placeholder/StandPokecenter2F.asm index 260829d..27cceef 100644 --- a/data/maps/attributes/placeholder/StandPokecenter2F.asm +++ b/data/maps/attributes/placeholder/StandPokecenter2F.asm @@ -16,4 +16,4 @@ StandPokecenter2F_MapEvents:: object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -StandPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/StandPokecenter2F.blk"
\ No newline at end of file +StandPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/StandPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/StandRocketHouse1F.asm b/data/maps/attributes/placeholder/StandRocketHouse1F.asm index e1e5122..e5c9553 100644 --- a/data/maps/attributes/placeholder/StandRocketHouse1F.asm +++ b/data/maps/attributes/placeholder/StandRocketHouse1F.asm @@ -16,4 +16,4 @@ StandRocketHouse1F_MapEvents:: db 1 ; person events object_event 11, 4, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -StandRocketHouse1F_Blocks:: INCBIN "maps/placeholder/blk/StandRocketHouse1F.blk"
\ No newline at end of file +StandRocketHouse1F_Blocks:: INCBIN "maps/placeholder/blk/StandRocketHouse1F.blk" diff --git a/data/maps/attributes/placeholder/StandRocketHouse2F.asm b/data/maps/attributes/placeholder/StandRocketHouse2F.asm index f2ade5f..6f7828d 100644 --- a/data/maps/attributes/placeholder/StandRocketHouse2F.asm +++ b/data/maps/attributes/placeholder/StandRocketHouse2F.asm @@ -14,4 +14,4 @@ StandRocketHouse2F_MapEvents:: db 1 ; person events object_event 5, 4, SPRITE_ROCKET_F, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 -StandRocketHouse2F_Blocks:: INCBIN "maps/placeholder/blk/StandRocketHouse2F.blk"
\ No newline at end of file +StandRocketHouse2F_Blocks:: INCBIN "maps/placeholder/blk/StandRocketHouse2F.blk" diff --git a/data/maps/attributes/placeholder/StandRoute.asm b/data/maps/attributes/placeholder/StandRoute.asm index 4a3b0e7..30186ce 100644 --- a/data/maps/attributes/placeholder/StandRoute.asm +++ b/data/maps/attributes/placeholder/StandRoute.asm @@ -16,4 +16,4 @@ StandRoute_MapEvents:: db 0 ; person events -StandRoute_Blocks:: INCBIN "maps/placeholder/blk/StandRoute.blk"
\ No newline at end of file +StandRoute_Blocks:: INCBIN "maps/placeholder/blk/StandRoute.blk" diff --git a/data/maps/attributes/placeholder/StandRouteGateKanto.asm b/data/maps/attributes/placeholder/StandRouteGateKanto.asm index ad40b40..2981852 100644 --- a/data/maps/attributes/placeholder/StandRouteGateKanto.asm +++ b/data/maps/attributes/placeholder/StandRouteGateKanto.asm @@ -16,4 +16,4 @@ StandRouteGateKanto_MapEvents:: db 0 ; person events -StandRouteGateKanto_Blocks:: INCBIN "maps/placeholder/blk/StandRouteGateKanto.blk"
\ No newline at end of file +StandRouteGateKanto_Blocks:: INCBIN "maps/placeholder/blk/StandRouteGateKanto.blk" diff --git a/data/maps/attributes/placeholder/Sugar.asm b/data/maps/attributes/placeholder/Sugar.asm index 8a8b2a0..6c5d6b4 100644 --- a/data/maps/attributes/placeholder/Sugar.asm +++ b/data/maps/attributes/placeholder/Sugar.asm @@ -24,4 +24,4 @@ Sugar_MapEvents:: object_event 9, 6, SPRITE_GRANNY, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 13, 11, SPRITE_GRAMPS, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 -Sugar_Blocks:: INCBIN "maps/placeholder/blk/Sugar.blk"
\ No newline at end of file +Sugar_Blocks:: INCBIN "maps/placeholder/blk/Sugar.blk" diff --git a/data/maps/attributes/placeholder/SugarHouse.asm b/data/maps/attributes/placeholder/SugarHouse.asm index 4dbcb53..eef5c56 100644 --- a/data/maps/attributes/placeholder/SugarHouse.asm +++ b/data/maps/attributes/placeholder/SugarHouse.asm @@ -17,4 +17,4 @@ SugarHouse_MapEvents:: object_event 4, 5, SPRITE_TWIN, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 3, 1, SPRITE_GRAMPS, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -SugarHouse_Blocks:: INCBIN "maps/placeholder/blk/SugarHouse.blk"
\ No newline at end of file +SugarHouse_Blocks:: INCBIN "maps/placeholder/blk/SugarHouse.blk" diff --git a/data/maps/attributes/placeholder/SugarHouse2.asm b/data/maps/attributes/placeholder/SugarHouse2.asm index 99fde32..9d86644 100644 --- a/data/maps/attributes/placeholder/SugarHouse2.asm +++ b/data/maps/attributes/placeholder/SugarHouse2.asm @@ -15,4 +15,4 @@ SugarHouse2_MapEvents:: db 1 ; person events object_event 2, 3, SPRITE_FISHING_GURU, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -SugarHouse2_Blocks:: INCBIN "maps/placeholder/blk/SugarHouse2.blk"
\ No newline at end of file +SugarHouse2_Blocks:: INCBIN "maps/placeholder/blk/SugarHouse2.blk" diff --git a/data/maps/attributes/placeholder/SugarMart.asm b/data/maps/attributes/placeholder/SugarMart.asm index f86e707..2da0c08 100644 --- a/data/maps/attributes/placeholder/SugarMart.asm +++ b/data/maps/attributes/placeholder/SugarMart.asm @@ -17,4 +17,4 @@ SugarMart_MapEvents:: object_event 10, 5, SPRITE_GIRL, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 4, 1, SPRITE_POKEFAN_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -SugarMart_Blocks:: INCBIN "maps/placeholder/blk/SugarMart.blk"
\ No newline at end of file +SugarMart_Blocks:: INCBIN "maps/placeholder/blk/SugarMart.blk" diff --git a/data/maps/attributes/placeholder/SugarPokecenter1F.asm b/data/maps/attributes/placeholder/SugarPokecenter1F.asm index 1dd019a..944c776 100644 --- a/data/maps/attributes/placeholder/SugarPokecenter1F.asm +++ b/data/maps/attributes/placeholder/SugarPokecenter1F.asm @@ -19,4 +19,4 @@ SugarPokecenter1F_MapEvents:: object_event 2, 5, SPRITE_24, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_GRANNY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -SugarPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/SugarPokecenter1F.blk"
\ No newline at end of file +SugarPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/SugarPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/SugarPokecenter2F.asm b/data/maps/attributes/placeholder/SugarPokecenter2F.asm index 31f2119..8141093 100644 --- a/data/maps/attributes/placeholder/SugarPokecenter2F.asm +++ b/data/maps/attributes/placeholder/SugarPokecenter2F.asm @@ -16,4 +16,4 @@ SugarPokecenter2F_MapEvents:: object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 14, 7, SPRITE_FISHING_GURU, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -SugarPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/SugarPokecenter2F.blk"
\ No newline at end of file +SugarPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/SugarPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/SugarRoute.asm b/data/maps/attributes/placeholder/SugarRoute.asm index 37e790e..20647d8 100644 --- a/data/maps/attributes/placeholder/SugarRoute.asm +++ b/data/maps/attributes/placeholder/SugarRoute.asm @@ -16,4 +16,4 @@ SugarRoute_MapEvents:: db 0 ; person events -SugarRoute_Blocks:: INCBIN "maps/placeholder/blk/SugarRoute.blk"
\ No newline at end of file +SugarRoute_Blocks:: INCBIN "maps/placeholder/blk/SugarRoute.blk" diff --git a/data/maps/attributes/placeholder/SugarRouteGate.asm b/data/maps/attributes/placeholder/SugarRouteGate.asm index dbfe76d..95acf84 100644 --- a/data/maps/attributes/placeholder/SugarRouteGate.asm +++ b/data/maps/attributes/placeholder/SugarRouteGate.asm @@ -16,4 +16,4 @@ SugarRouteGate_MapEvents:: db 0 ; person events -SugarRouteGate_Blocks:: INCBIN "maps/placeholder/blk/SugarRouteGate.blk"
\ No newline at end of file +SugarRouteGate_Blocks:: INCBIN "maps/placeholder/blk/SugarRouteGate.blk" diff --git a/data/maps/attributes/placeholder/West.asm b/data/maps/attributes/placeholder/West.asm index 85aa827..04d1e8d 100644 --- a/data/maps/attributes/placeholder/West.asm +++ b/data/maps/attributes/placeholder/West.asm @@ -40,4 +40,4 @@ West_MapEvents:: object_event 22, 19, SPRITE_COOLTRAINER_F, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 18, 13, SPRITE_36, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -West_Blocks:: INCBIN "maps/placeholder/blk/West.blk"
\ No newline at end of file +West_Blocks:: INCBIN "maps/placeholder/blk/West.blk" diff --git a/data/maps/attributes/placeholder/WestGym.asm b/data/maps/attributes/placeholder/WestGym.asm index 63a0a8c..f1bc752 100644 --- a/data/maps/attributes/placeholder/WestGym.asm +++ b/data/maps/attributes/placeholder/WestGym.asm @@ -22,4 +22,4 @@ WestGym_MapEvents:: object_event 4, 6, SPRITE_TWIN, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 2, 0, 0 object_event 7, 15, SPRITE_GYM_GUY, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -WestGym_Blocks:: INCBIN "maps/placeholder/blk/WestGym.blk"
\ No newline at end of file +WestGym_Blocks:: INCBIN "maps/placeholder/blk/WestGym.blk" diff --git a/data/maps/attributes/placeholder/WestHouse1.asm b/data/maps/attributes/placeholder/WestHouse1.asm index 9f750e3..6b9fb0c 100644 --- a/data/maps/attributes/placeholder/WestHouse1.asm +++ b/data/maps/attributes/placeholder/WestHouse1.asm @@ -21,4 +21,4 @@ WestHouse1_MapEvents:: object_event 1, 6, SPRITE_YOUNGSTER, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 object_event 1, 4, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -WestHouse1_Blocks:: INCBIN "maps/placeholder/blk/WestHouse1.blk"
\ No newline at end of file +WestHouse1_Blocks:: INCBIN "maps/placeholder/blk/WestHouse1.blk" diff --git a/data/maps/attributes/placeholder/WestHouse2.asm b/data/maps/attributes/placeholder/WestHouse2.asm index af5b55b..2e10b62 100644 --- a/data/maps/attributes/placeholder/WestHouse2.asm +++ b/data/maps/attributes/placeholder/WestHouse2.asm @@ -21,4 +21,4 @@ WestHouse2_MapEvents:: object_event 8, 6, SPRITE_YOUNGSTER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 1, 5, SPRITE_BUG_CATCHER_BOY, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 -WestHouse2_Blocks:: INCBIN "maps/placeholder/blk/WestHouse2.blk"
\ No newline at end of file +WestHouse2_Blocks:: INCBIN "maps/placeholder/blk/WestHouse2.blk" diff --git a/data/maps/attributes/placeholder/WestMart1F.asm b/data/maps/attributes/placeholder/WestMart1F.asm index 0cda9d3..8a9cdff 100644 --- a/data/maps/attributes/placeholder/WestMart1F.asm +++ b/data/maps/attributes/placeholder/WestMart1F.asm @@ -19,4 +19,4 @@ WestMart1F_MapEvents:: db 1 ; person events object_event 7, 1, SPRITE_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -WestMart1F_Blocks:: INCBIN "maps/placeholder/blk/WestMart1F.blk"
\ No newline at end of file +WestMart1F_Blocks:: INCBIN "maps/placeholder/blk/WestMart1F.blk" diff --git a/data/maps/attributes/placeholder/WestMart2F.asm b/data/maps/attributes/placeholder/WestMart2F.asm index 671cf44..97d1893 100644 --- a/data/maps/attributes/placeholder/WestMart2F.asm +++ b/data/maps/attributes/placeholder/WestMart2F.asm @@ -35,4 +35,4 @@ WestMart2F_MapEvents:: object_event 1, 5, SPRITE_BURGLAR, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 9, 2, SPRITE_ROCKET_M, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -WestMart2F_Blocks:: INCBIN "maps/placeholder/blk/WestMart2F.blk"
\ No newline at end of file +WestMart2F_Blocks:: INCBIN "maps/placeholder/blk/WestMart2F.blk" diff --git a/data/maps/attributes/placeholder/WestMart3F.asm b/data/maps/attributes/placeholder/WestMart3F.asm index b36fdf9..fe53d36 100644 --- a/data/maps/attributes/placeholder/WestMart3F.asm +++ b/data/maps/attributes/placeholder/WestMart3F.asm @@ -32,4 +32,4 @@ WestMart3F_MapEvents:: object_event 13, 4, SPRITE_GENTLEMAN, FACE_UP, 2, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 3, 5, SPRITE_SUPER_NERD, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -WestMart3F_Blocks:: INCBIN "maps/placeholder/blk/WestMart3F.blk"
\ No newline at end of file +WestMart3F_Blocks:: INCBIN "maps/placeholder/blk/WestMart3F.blk" diff --git a/data/maps/attributes/placeholder/WestMart4F.asm b/data/maps/attributes/placeholder/WestMart4F.asm index 62b5f49..f63a9b4 100644 --- a/data/maps/attributes/placeholder/WestMart4F.asm +++ b/data/maps/attributes/placeholder/WestMart4F.asm @@ -32,4 +32,4 @@ WestMart4F_MapEvents:: object_event 8, 6, SPRITE_24, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 7, 2, SPRITE_ROCKER, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 -WestMart4F_Blocks:: INCBIN "maps/placeholder/blk/WestMart4F.blk"
\ No newline at end of file +WestMart4F_Blocks:: INCBIN "maps/placeholder/blk/WestMart4F.blk" diff --git a/data/maps/attributes/placeholder/WestMart5F.asm b/data/maps/attributes/placeholder/WestMart5F.asm index 31dbbd5..c3bf314 100644 --- a/data/maps/attributes/placeholder/WestMart5F.asm +++ b/data/maps/attributes/placeholder/WestMart5F.asm @@ -20,4 +20,4 @@ WestMart5F_MapEvents:: object_event 13, 5, SPRITE_YOUNGSTER, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 13, 4, SPRITE_NYOROBON, SLOW_STEP_DOWN, 2, 0, -1, -1, 0, 0, 0, 0, 0, 0 -WestMart5F_Blocks:: INCBIN "maps/placeholder/blk/WestMart5F.blk"
\ No newline at end of file +WestMart5F_Blocks:: INCBIN "maps/placeholder/blk/WestMart5F.blk" diff --git a/data/maps/attributes/placeholder/WestMart6F.asm b/data/maps/attributes/placeholder/WestMart6F.asm index 02da6c8..1d2f81c 100644 --- a/data/maps/attributes/placeholder/WestMart6F.asm +++ b/data/maps/attributes/placeholder/WestMart6F.asm @@ -21,4 +21,4 @@ WestMart6F_MapEvents:: object_event 6, 4, SPRITE_SIDON, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 3, 6, SPRITE_POPPO, FACE_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -WestMart6F_Blocks:: INCBIN "maps/placeholder/blk/WestMart6F.blk"
\ No newline at end of file +WestMart6F_Blocks:: INCBIN "maps/placeholder/blk/WestMart6F.blk" diff --git a/data/maps/attributes/placeholder/WestMartElevator.asm b/data/maps/attributes/placeholder/WestMartElevator.asm index a824787..1e7c99a 100644 --- a/data/maps/attributes/placeholder/WestMartElevator.asm +++ b/data/maps/attributes/placeholder/WestMartElevator.asm @@ -14,4 +14,4 @@ WestMartElevator_MapEvents:: db 0 ; person events -WestMartElevator_Blocks:: INCBIN "maps/placeholder/blk/WestMartElevator.blk"
\ No newline at end of file +WestMartElevator_Blocks:: INCBIN "maps/placeholder/blk/WestMartElevator.blk" diff --git a/data/maps/attributes/placeholder/WestPokecenter1F.asm b/data/maps/attributes/placeholder/WestPokecenter1F.asm index 9e8d597..3135a9e 100644 --- a/data/maps/attributes/placeholder/WestPokecenter1F.asm +++ b/data/maps/attributes/placeholder/WestPokecenter1F.asm @@ -20,4 +20,4 @@ WestPokecenter1F_MapEvents:: object_event 2, 5, SPRITE_LASS, FACE_RIGHT, 0, 2, -1, -1, 0, 0, 0, 0, 0, 0 object_event 10, 1, SPRITE_ROCKET_M, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -WestPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/WestPokecenter1F.blk"
\ No newline at end of file +WestPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/WestPokecenter1F.blk" diff --git a/data/maps/attributes/placeholder/WestPokecenter2F.asm b/data/maps/attributes/placeholder/WestPokecenter2F.asm index 1857eab..f67f47e 100644 --- a/data/maps/attributes/placeholder/WestPokecenter2F.asm +++ b/data/maps/attributes/placeholder/WestPokecenter2F.asm @@ -17,4 +17,4 @@ WestPokecenter2F_MapEvents:: object_event 9, 2, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 13, 3, SPRITE_LINK_RECEPTIONIST, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -WestPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/WestPokecenter2F.blk"
\ No newline at end of file +WestPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/WestPokecenter2F.blk" diff --git a/data/maps/attributes/placeholder/WestRadioTower1F.asm b/data/maps/attributes/placeholder/WestRadioTower1F.asm index 93fc55d..8a7f33a 100644 --- a/data/maps/attributes/placeholder/WestRadioTower1F.asm +++ b/data/maps/attributes/placeholder/WestRadioTower1F.asm @@ -20,4 +20,4 @@ WestRadioTower1F_MapEvents:: object_event 2, 3, SPRITE_SUPER_NERD, FACE_UP, 1, 1, -1, -1, 0, 0, 0, 0, 0, 0 object_event 7, 4, SPRITE_ROCKER, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -WestRadioTower1F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower1F.blk"
\ No newline at end of file +WestRadioTower1F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower1F.blk" diff --git a/data/maps/attributes/placeholder/WestRadioTower2F.asm b/data/maps/attributes/placeholder/WestRadioTower2F.asm index d5519f1..c42b729 100644 --- a/data/maps/attributes/placeholder/WestRadioTower2F.asm +++ b/data/maps/attributes/placeholder/WestRadioTower2F.asm @@ -22,4 +22,4 @@ WestRadioTower2F_MapEvents:: object_event 6, 6, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 2, 7, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -WestRadioTower2F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower2F.blk"
\ No newline at end of file +WestRadioTower2F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower2F.blk" diff --git a/data/maps/attributes/placeholder/WestRadioTower3F.asm b/data/maps/attributes/placeholder/WestRadioTower3F.asm index bdfc9f1..87e3b7c 100644 --- a/data/maps/attributes/placeholder/WestRadioTower3F.asm +++ b/data/maps/attributes/placeholder/WestRadioTower3F.asm @@ -23,4 +23,4 @@ WestRadioTower3F_MapEvents:: object_event 1, 7, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 7, 6, SPRITE_36, SLOW_STEP_RIGHT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -WestRadioTower3F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower3F.blk"
\ No newline at end of file +WestRadioTower3F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower3F.blk" diff --git a/data/maps/attributes/placeholder/WestRadioTower4F.asm b/data/maps/attributes/placeholder/WestRadioTower4F.asm index e6c8cff..3f16e4f 100644 --- a/data/maps/attributes/placeholder/WestRadioTower4F.asm +++ b/data/maps/attributes/placeholder/WestRadioTower4F.asm @@ -24,4 +24,4 @@ WestRadioTower4F_MapEvents:: object_event 5, 1, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 1, 2, SPRITE_36, SLOW_STEP_LEFT, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -WestRadioTower4F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower4F.blk"
\ No newline at end of file +WestRadioTower4F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower4F.blk" diff --git a/data/maps/attributes/placeholder/WestRadioTower5F.asm b/data/maps/attributes/placeholder/WestRadioTower5F.asm index 4ad136f..da37bb0 100644 --- a/data/maps/attributes/placeholder/WestRadioTower5F.asm +++ b/data/maps/attributes/placeholder/WestRadioTower5F.asm @@ -24,4 +24,4 @@ WestRadioTower5F_MapEvents:: object_event 2, 4, SPRITE_36, STEP_DOWN, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 6, 7, SPRITE_TEACHER, SLOW_STEP_DOWN, 1, 0, -1, -1, 0, 0, 0, 0, 0, 0 -WestRadioTower5F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower5F.blk"
\ No newline at end of file +WestRadioTower5F_Blocks:: INCBIN "maps/placeholder/blk/WestRadioTower5F.blk" diff --git a/data/maps/attributes/placeholder/WestRocketRaidedHouse.asm b/data/maps/attributes/placeholder/WestRocketRaidedHouse.asm index 842f062..c3ea07d 100644 --- a/data/maps/attributes/placeholder/WestRocketRaidedHouse.asm +++ b/data/maps/attributes/placeholder/WestRocketRaidedHouse.asm @@ -26,4 +26,4 @@ WestRocketRaidedHouse_MapEvents:: object_event 1, 3, SPRITE_POKEFAN_F, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 object_event 7, 2, SPRITE_POKE_BALL, SLOW_STEP_UP, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0 -WestRocketRaidedHouse_Blocks:: INCBIN "maps/placeholder/blk/WestRocketRaidedHouse.blk"
\ No newline at end of file +WestRocketRaidedHouse_Blocks:: INCBIN "maps/placeholder/blk/WestRocketRaidedHouse.blk" diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index e53d1e0..796e6f7 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -47,4 +47,4 @@ LandmarkNames:: db "#りーぐ６@" ; POKEMON_LEAGUE_6 db "#りーぐ７@" ; POKEMON_LEAGUE_7 db "#りーぐ７@" ; POKEMON_LEAGUE_7_2 - db "しずかなおか@" ; SILENT_HILL
\ No newline at end of file + db "しずかなおか@" ; SILENT_HILL diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 8cdef24..aaa74aa 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -283,4 +283,4 @@ MapGroup_Misc: map SlowpokeWellEntrance, TILESET_CAVE, CAVE, LANDMARK_NONE map SlowpokeWellMain, TILESET_CAVE, CAVE, LANDMARK_NONE -MapGroup_Empty:
\ No newline at end of file +MapGroup_Empty: diff --git a/data/moves/names.asm b/data/moves/names.asm index 7936696..098e9e3 100644 --- a/data/moves/names.asm +++ b/data/moves/names.asm @@ -253,4 +253,4 @@ MoveNames:: db "てつわん@" ; STRONG_ARM db "ひかりゴケ@" ; BRIGHT_MOSS db "うずしお@" ; WHIRLPOOL - db "とびはねる@" ; BOUNCE
\ No newline at end of file + db "とびはねる@" ; BOUNCE diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index 84183ac..930d6ca 100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -65,4 +65,4 @@ TMHMMoves: ; 04:52d1 db MOVE_STRONG_ARM ; HM04 db MOVE_BRIGHT_MOSS ; HM05 db MOVE_WHIRLPOOL ; HM06 - db MOVE_BOUNCE ; HM07
\ No newline at end of file + db MOVE_BOUNCE ; HM07 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 6da691e..b6b524d 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -288,4 +288,4 @@ BaseStats_Houou:: INCLUDE "data/pokemon/base_stats/houou.inc" BaseStats_Togepy:: INCLUDE "data/pokemon/base_stats/togepy.inc" BaseStats_Bulu:: INCLUDE "data/pokemon/base_stats/bulu.inc" BaseStats_Tail:: INCLUDE "data/pokemon/base_stats/tail.inc" -BaseStats_Leafy:: INCLUDE "data/pokemon/base_stats/leafy.inc"
\ No newline at end of file +BaseStats_Leafy:: INCLUDE "data/pokemon/base_stats/leafy.inc" diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 6f0b804..424a6ce 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -255,4 +255,4 @@ AlphabeticalPokedexOrder: ; 0x40943 db DEX_ROKON db DEX_WARWOLF db DEX_WATANEKO - db DEX_WANRIKY
\ No newline at end of file + db DEX_WANRIKY diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm index fb94284..2b2043a 100644 --- a/data/pokemon/evos_attacks.asm +++ b/data/pokemon/evos_attacks.asm @@ -3296,4 +3296,4 @@ LeafyEvosAttacks: ; 43aa4 db 49, MOVE_MORNING_SUN db 56, MOVE_WRAP db 63, MOVE_SOLARBEAM - db 0 ; no more level-up moves
\ No newline at end of file + db 0 ; no more level-up moves diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 15475c9..c4e822b 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -253,4 +253,4 @@ PokemonNames:: db "トゲピー@" ; TOGEPY db "ブルー@@" ; BULU db "テイル@@" ; TAIL - db "りーフィ@" ; LEAFY
\ No newline at end of file + db "りーフィ@" ; LEAFY diff --git a/data/text/text_input_chars.asm b/data/text/text_input_chars.asm index f6798a3..ca54020 100644 --- a/data/text/text_input_chars.asm +++ b/data/text/text_input_chars.asm @@ -24,4 +24,4 @@ TextEntryKatakana: ; 04:5987 db "タチツテト ナニヌネノ ハヒフへホ" db "マミムメモ ヤユヨワン ラりルレロ" db "ャュョッヲ １２３４５ ６７８９０" - db " ﾞﾟ ー？！円"
\ No newline at end of file + db " ﾞﾟ ー？！円" diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index 2c00ffe..1ad858c 100644 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -283,4 +283,4 @@ Tileset_1b: ; 0xc9b6 db $77 ; talking over tile 1 db $40 ; talking over tile 2 db $00 ; talking over tile 3 - db $00 ; unknown
\ No newline at end of file + db $00 ; unknown diff --git a/data/trainers/class_names.asm b/data/trainers/class_names.asm index 02c8203..5b44258 100644 --- a/data/trainers/class_names.asm +++ b/data/trainers/class_names.asm @@ -66,4 +66,4 @@ TrainerClassNames:: ; 38d90 db "ふたごちゃん@" ; TWINS db "ゲルゲだんいん♂@" ; GERUGE_MEMBER_M_2 db "してんのう♂@" ; ELITE_FOUR_M - db "してんのう♀@" ; ELITE_FOUR_F
\ No newline at end of file + db "してんのう♀@" ; ELITE_FOUR_F diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index b8d8a20..ff3137e 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -809,4 +809,4 @@ SportsmanGroup:: db 9, DEX_DONPHAN, ITEM_NONE, MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_NONE, MOVE_NONE db -1 ; end -endc
\ No newline at end of file +endc diff --git a/data/types/names.asm b/data/types/names.asm index 7036847..601f2a0 100644 --- a/data/types/names.asm +++ b/data/types/names.asm @@ -50,4 +50,4 @@ TypeNames:: .Ghost: db "ゴースト@" .Metal: db "メタル@" .Dragon: db "ドラゴン@" -.Dark: db "あく@"
\ No newline at end of file +.Dark: db "あく@" diff --git a/data/types/search_strings.asm b/data/types/search_strings.asm index 905f478..5d33134 100644 --- a/data/types/search_strings.asm +++ b/data/types/search_strings.asm @@ -17,4 +17,4 @@ PokedexTypeSearchStrings:: db "むし @" ; BUG db "いわ @" ; ROCK db "ゴースト@" ; GHOST - db "ドラゴン@" ; DRAGON
\ No newline at end of file + db "ドラゴン@" ; DRAGON diff --git a/data/types/search_types.asm b/data/types/search_types.asm index ed41650..abcb0db 100644 --- a/data/types/search_types.asm +++ b/data/types/search_types.asm @@ -17,4 +17,4 @@ PokedexTypeSearchConversionTable:: db TYPE_BUG db TYPE_ROCK db TYPE_GHOST - db TYPE_DRAGON
\ No newline at end of file + db TYPE_DRAGON diff --git a/data/types/type_matchups.asm b/data/types/type_matchups.asm index e23227a..cebecfd 100644 --- a/data/types/type_matchups.asm +++ b/data/types/type_matchups.asm @@ -110,4 +110,4 @@ TypeMatchups: ; 3506d db TYPE_NORMAL, TYPE_GHOST, NO_EFFECT db -1 ; end -; 3519b
\ No newline at end of file +; 3519b diff --git a/data/wild.asm b/data/wild.asm index 2796e91..a451174 100644 --- a/data/wild.asm +++ b/data/wild.asm @@ -642,4 +642,4 @@ endc db 5, DEX_PIKACHU db -1 ; end -; f:6e3e
\ No newline at end of file +; f:6e3e |