Give all .asm and all .inc except of base_stats/???.inc new line at the end of file

This commit is contained in:
Ebernacher90 2020-09-13 03:46:21 +02:00
parent 462b7521b2
commit d4315d68bd
522 changed files with 520 additions and 523 deletions

View File

@ -2,4 +2,4 @@ INCLUDE "constants.asm"
SECTION "audio/cries.asm", ROMX
CryHeaders:: ; TODO: Rip the data, then INCBIN it
CryHeaders:: ; TODO: Rip the data, then INCBIN it

View File

@ -613,4 +613,4 @@ _PlayMusic:: ; 3a:4d66
; TODO
SECTION "audio/engine.asm@Song Header Pointers", ROMX
INCLUDE "audio/song_header_pointers.inc"
INCLUDE "audio/song_header_pointers.inc"

View File

@ -721,4 +721,4 @@ Song_Bicycle_branch_ed96e::
snare7 1
snare7 1
endchannel
; 0xed978
; 0xed978

View File

@ -123,4 +123,4 @@ Song_Evolution_branch_edba7::
A_ 2
rest 2
endchannel
; 0xedbbd
; 0xedbbd

View File

@ -59,4 +59,4 @@ Song_Heal_Ch2:: ; ed631 (3b:5631)
E_ 6
rest 2
endchannel
; 0xed63e
; 0xed63e

View File

@ -1412,4 +1412,4 @@ Song_LeaderBattle_branch_eccc9::
octave 4
G_ 6
loopchannel 0, Song_LeaderBattle_branch_eccc9
; 0xece31
; 0xece31

View File

@ -344,4 +344,4 @@ Song_NidorinoIntro_Ch3:: ; ec155 (3b:4155)
rest 16
rest 14
endchannel
; 0xec1b9
; 0xec1b9

View File

@ -17,4 +17,4 @@ Song_None_Ch1:: ; e92fa (3a:52fa)
Song_None_Ch2:: ; e92fa (3a:52fa)
Song_None_Ch3:: ; e92fa (3a:52fa)
endchannel
; 0xe92fb
; 0xe92fb

View File

@ -442,4 +442,4 @@ Song_OakIntro_branch_ec7e9::
rest 3
loopchannel 0, Song_OakIntro_branch_ec7e9
endchannel
; 0xec858
; 0xec858

View File

@ -423,4 +423,4 @@ Song_Route1_branch_ec625::
snare4 2
loopchannel 0, Song_Route1_branch_ec625
endchannel
; 0xec685
; 0xec685

View File

@ -92,4 +92,4 @@ Song_SpottedRocket_branch_ed9df::
rest 3
A# 4
loopchannel 0, Song_SpottedRocket_branch_ed9df
; 0xed9ea
; 0xed9ea

View File

@ -692,4 +692,4 @@ Song_Title_branch_f2645::
snare2 1
rest 3
endchannel
; 0xf264e
; 0xf264e

View File

@ -1869,4 +1869,4 @@ Song_TrainerBattle_branch_ed2f7::
D_ 2
C_ 2
loopchannel 0, Song_TrainerBattle_branch_ed2f7
; 0xed5f4
; 0xed5f4

View File

@ -275,4 +275,4 @@ Song_VictoryTrainer_branch_edacc::
octave 4
A_ 3
loopchannel 0, Song_VictoryTrainer_branch_edacc
; 0xedb1c
; 0xedb1c

View File

@ -674,4 +674,4 @@ Song_ViridianCity_branch_ec4bd::
triangle2 2
triangle2 2
endchannel
; 0xec4c2
; 0xec4c2

View File

@ -6,4 +6,4 @@ INCBIN "bin/unknown_aebc.bin"
SECTION "bin.asm@Unknownbb43", ROMX
Unknownbb43: ; 02:7b43
INCBIN "bin/unknown_bb43.bin"
INCBIN "bin/unknown_bb43.bin"

View File

@ -125,5 +125,3 @@ MAX_PC_ITEMS EQU 50
const HELD_BRIGHTPOWDER
const HELD_78
const HELD_FOCUS_BAND

View File

@ -9,4 +9,4 @@
const NEW_GAME
const OPTION
const PLAY_POKEMON
const SET_TIME
const SET_TIME

View File

@ -1,2 +1,2 @@
; Name Lists
ITEM_NAME EQU 4
ITEM_NAME EQU 4

View File

@ -15,4 +15,3 @@ SCRIPT_FINISHED_F EQU 7
SCRIPT_FINISHED_MASK EQU 1 << SCRIPT_FINISHED_F
SCRIPT_SUCCESS EQU $f
SCRIPT_FAIL EQU 0

View File

@ -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
db NEVER_SOLID, NEVER_SOLID, NEVER_SOLID, ALWAYS_SOLID ; $100

View File

@ -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"
OldCityPokecenter2F_Blocks:: INCBIN "maps/blk/OldCityPokecenter2F.blk"

View File

@ -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"
OldCityPokecenterBattle_Blocks:: INCBIN "maps/blk/OldCityPokecenterBattle.blk"

View File

@ -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"
OldCityPokecenterTimeMachine_Blocks:: INCBIN "maps/blk/OldCityPokecenterTimeMachine.blk"

View File

@ -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"
OldCityPokecenterTrade_Blocks:: INCBIN "maps/blk/OldCityPokecenterTrade.blk"

View File

@ -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"
PlayerHouse1F_Blocks:: INCBIN "maps/blk/PlayerHouse1F.blk"

View File

@ -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"
PlayerHouse2F_Blocks:: INCBIN "maps/blk/PlayerHouse2F.blk"

View File

@ -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"
Route1Gate1F_Blocks:: INCBIN "maps/blk/Route1Gate1F.blk"

View File

@ -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"
Route1Gate2F_Blocks:: INCBIN "maps/blk/Route1Gate2F.blk"

View File

@ -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"
Route1P1_Blocks:: INCBIN "maps/blk/Route1P1.blk"

View File

@ -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"
Route1P2_Blocks:: INCBIN "maps/blk/Route1P2.blk"

View File

@ -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"
ShizukanaOka_Blocks:: INCBIN "maps/blk/ShizukanaOka.blk"

View File

@ -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"
SilentHill_Blocks:: INCBIN "maps/blk/SilentHill.blk"

View File

@ -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"
SilentHillHouse_Blocks:: INCBIN "maps/blk/SilentHillHouse.blk"

View File

@ -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"
SilentHillLabBack_Blocks:: INCBIN "maps/blk/SilentHillLabBack.blk"

View File

@ -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"
SilentHillLabFront_Blocks:: INCBIN "maps/blk/SilentHillLabFront.blk"

View File

@ -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"
SilentHillPokecenter_Blocks:: INCBIN "maps/blk/SilentHillPokecenter.blk"

View File

@ -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"
UnusedMap13_Blocks:: INCBIN "maps/blk/UnusedMap13.blk"

View File

@ -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"
Baadon_Blocks:: INCBIN "maps/placeholder/blk/Baadon.blk"

View File

@ -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"
BaadonHouse1_Blocks:: INCBIN "maps/placeholder/blk/BaadonHouse1.blk"

View File

@ -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"
BaadonHouse2_Blocks:: INCBIN "maps/placeholder/blk/BaadonHouse2.blk"

View File

@ -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"
BaadonLeague1F_Blocks:: INCBIN "maps/placeholder/blk/BaadonLeague1F.blk"

View File

@ -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"
BaadonLeague2F_Blocks:: INCBIN "maps/placeholder/blk/BaadonLeague2F.blk"

View File

@ -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"
BaadonMart_Blocks:: INCBIN "maps/placeholder/blk/BaadonMart.blk"

View File

@ -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"
BaadonPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/BaadonPokecenter1F.blk"

View File

@ -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"
BaadonPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/BaadonPokecenter2F.blk"

View File

@ -16,4 +16,4 @@ BaadonRoute1_MapEvents::
db 0 ; person events
BaadonRoute1_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute1.blk"
BaadonRoute1_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute1.blk"

View File

@ -14,4 +14,4 @@ BaadonRoute2_MapEvents::
db 0 ; person events
BaadonRoute2_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute2.blk"
BaadonRoute2_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute2.blk"

View File

@ -16,4 +16,4 @@ BaadonRoute3_MapEvents::
db 0 ; person events
BaadonRoute3_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute3.blk"
BaadonRoute3_Blocks:: INCBIN "maps/placeholder/blk/BaadonRoute3.blk"

View File

@ -16,4 +16,4 @@ BaadonRouteGateNewtype_MapEvents::
db 0 ; person events
BaadonRouteGateNewtype_Blocks:: INCBIN "maps/placeholder/blk/BaadonRouteGateNewtype.blk"
BaadonRouteGateNewtype_Blocks:: INCBIN "maps/placeholder/blk/BaadonRouteGateNewtype.blk"

View File

@ -16,4 +16,4 @@ BaadonRouteGateWest_MapEvents::
db 0 ; person events
BaadonRouteGateWest_Blocks:: INCBIN "maps/placeholder/blk/BaadonRouteGateWest.blk"
BaadonRouteGateWest_Blocks:: INCBIN "maps/placeholder/blk/BaadonRouteGateWest.blk"

View File

@ -14,4 +14,4 @@ BaadonWallpaperHouse_MapEvents::
db 0 ; person events
BaadonWallpaperHouse_Blocks:: INCBIN "maps/placeholder/blk/BaadonWallpaperHouse.blk"
BaadonWallpaperHouse_Blocks:: INCBIN "maps/placeholder/blk/BaadonWallpaperHouse.blk"

View File

@ -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"
BullForest_Blocks:: INCBIN "maps/placeholder/blk/BullForest.blk"

View File

@ -17,4 +17,4 @@ BullForestRoute1_MapEvents::
db 0 ; person events
BullForestRoute1_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute1.blk"
BullForestRoute1_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute1.blk"

View File

@ -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"
BullForestRoute1House_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute1House.blk"

View File

@ -16,4 +16,4 @@ BullForestRoute2_MapEvents::
db 0 ; person events
BullForestRoute2_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute2.blk"
BullForestRoute2_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute2.blk"

View File

@ -14,4 +14,4 @@ BullForestRoute3_MapEvents::
db 0 ; person events
BullForestRoute3_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute3.blk"
BullForestRoute3_Blocks:: INCBIN "maps/placeholder/blk/BullForestRoute3.blk"

View File

@ -16,4 +16,4 @@ BullForestRouteGateStand_MapEvents::
db 0 ; person events
BullForestRouteGateStand_Blocks:: INCBIN "maps/placeholder/blk/BullForestRouteGateStand.blk"
BullForestRouteGateStand_Blocks:: INCBIN "maps/placeholder/blk/BullForestRouteGateStand.blk"

View File

@ -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"
BullHouse1_Blocks:: INCBIN "maps/placeholder/blk/BullHouse1.blk"

View File

@ -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"
BullHouse2_Blocks:: INCBIN "maps/placeholder/blk/BullHouse2.blk"

View File

@ -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"
BullHouse3_Blocks:: INCBIN "maps/placeholder/blk/BullHouse3.blk"

View File

@ -14,4 +14,4 @@ BullHouse4_MapEvents::
db 0 ; person events
BullHouse4_Blocks:: INCBIN "maps/placeholder/blk/BullHouse4.blk"
BullHouse4_Blocks:: INCBIN "maps/placeholder/blk/BullHouse4.blk"

View File

@ -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"
BullLeague1F_Blocks:: INCBIN "maps/placeholder/blk/BullLeague1F.blk"

View File

@ -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"
BullLeague2F_Blocks:: INCBIN "maps/placeholder/blk/BullLeague2F.blk"

View File

@ -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"
BullMart_Blocks:: INCBIN "maps/placeholder/blk/BullMart.blk"

View File

@ -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"
BullPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/BullPokecenter1F.blk"

View File

@ -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"
BullPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/BullPokecenter2F.blk"

View File

@ -12,4 +12,4 @@ CaveMinecarts1_MapEvents::
db 0 ; person events
CaveMinecarts1_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts1.blk"
CaveMinecarts1_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts1.blk"

View File

@ -12,4 +12,4 @@ CaveMinecarts2_MapEvents::
db 0 ; person events
CaveMinecarts2_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts2.blk"
CaveMinecarts2_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts2.blk"

View File

@ -12,4 +12,4 @@ CaveMinecarts3_MapEvents::
db 0 ; person events
CaveMinecarts3_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts3.blk"
CaveMinecarts3_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts3.blk"

View File

@ -12,4 +12,4 @@ CaveMinecarts4_MapEvents::
db 0 ; person events
CaveMinecarts4_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts4.blk"
CaveMinecarts4_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts4.blk"

View File

@ -12,4 +12,4 @@ CaveMinecarts5_MapEvents::
db 0 ; person events
CaveMinecarts5_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts5.blk"
CaveMinecarts5_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts5.blk"

View File

@ -12,4 +12,4 @@ CaveMinecarts6_MapEvents::
db 0 ; person events
CaveMinecarts6_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts6.blk"
CaveMinecarts6_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts6.blk"

View File

@ -12,4 +12,4 @@ CaveMinecarts7_MapEvents::
db 0 ; person events
CaveMinecarts7_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts7.blk"
CaveMinecarts7_Blocks:: INCBIN "maps/placeholder/blk/CaveMinecarts7.blk"

View File

@ -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"
Fonto_Blocks:: INCBIN "maps/placeholder/blk/Fonto.blk"

View File

@ -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"
FontoHouse_Blocks:: INCBIN "maps/placeholder/blk/FontoHouse.blk"

View File

@ -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"
FontoLab_Blocks:: INCBIN "maps/placeholder/blk/FontoLab.blk"

View File

@ -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"
FontoMart_Blocks:: INCBIN "maps/placeholder/blk/FontoMart.blk"

View File

@ -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"
FontoPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/FontoPokecenter1F.blk"

View File

@ -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"
FontoPokecenter2F_Blocks:: INCBIN "maps/placeholder/blk/FontoPokecenter2F.blk"

View File

@ -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"
FontoRocketHouse_Blocks:: INCBIN "maps/placeholder/blk/FontoRocketHouse.blk"

View File

@ -15,4 +15,4 @@ FontoRoute1_MapEvents::
db 0 ; person events
FontoRoute1_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute1.blk"
FontoRoute1_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute1.blk"

View File

@ -14,4 +14,4 @@ FontoRoute2_MapEvents::
db 0 ; person events
FontoRoute2_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute2.blk"
FontoRoute2_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute2.blk"

View File

@ -14,4 +14,4 @@ FontoRoute3_MapEvents::
db 0 ; person events
FontoRoute3_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute3.blk"
FontoRoute3_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute3.blk"

View File

@ -16,4 +16,4 @@ FontoRoute4_MapEvents::
db 0 ; person events
FontoRoute4_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute4.blk"
FontoRoute4_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute4.blk"

View File

@ -16,4 +16,4 @@ FontoRoute5_MapEvents::
db 0 ; person events
FontoRoute5_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute5.blk"
FontoRoute5_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute5.blk"

View File

@ -14,4 +14,4 @@ FontoRoute6_MapEvents::
db 0 ; person events
FontoRoute6_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute6.blk"
FontoRoute6_Blocks:: INCBIN "maps/placeholder/blk/FontoRoute6.blk"

View File

@ -16,4 +16,4 @@ FontoRouteGate1_MapEvents::
db 0 ; person events
FontoRouteGate1_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate1.blk"
FontoRouteGate1_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate1.blk"

View File

@ -16,4 +16,4 @@ FontoRouteGate2_MapEvents::
db 0 ; person events
FontoRouteGate2_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate2.blk"
FontoRouteGate2_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate2.blk"

View File

@ -16,4 +16,4 @@ FontoRouteGate3_MapEvents::
db 0 ; person events
FontoRouteGate3_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate3.blk"
FontoRouteGate3_Blocks:: INCBIN "maps/placeholder/blk/FontoRouteGate3.blk"

View File

@ -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"
Haiteku_Blocks:: INCBIN "maps/placeholder/blk/Haiteku.blk"

View File

@ -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"
HaitekuAquarium1F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuAquarium1F.blk"

View File

@ -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"
HaitekuAquarium2F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuAquarium2F.blk"

View File

@ -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"
HaitekuHouse1_Blocks:: INCBIN "maps/placeholder/blk/HaitekuHouse1.blk"

View File

@ -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"
HaitekuHouse2_Blocks:: INCBIN "maps/placeholder/blk/HaitekuHouse2.blk"

View File

@ -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"
HaitekuImposterOakHouse_Blocks:: INCBIN "maps/placeholder/blk/HaitekuImposterOakHouse.blk"

View File

@ -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"
HaitekuLeague1F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuLeague1F.blk"

View File

@ -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"
HaitekuLeague2F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuLeague2F.blk"

View File

@ -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"
HaitekuMart_Blocks:: INCBIN "maps/placeholder/blk/HaitekuMart.blk"

View File

@ -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"
HaitekuPokecenter1F_Blocks:: INCBIN "maps/placeholder/blk/HaitekuPokecenter1F.blk"

Some files were not shown because too many files have changed in this diff Show More