diff --git a/Makefile b/Makefile index 9c66400..c8582b0 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,6 @@ pokecrystal_vc_opt = -Cjv -t PM_CRYSTAL -i BYTE -n 0 -k 01 -l 0x33 -m 0x10 %.gbc: $$(%_obj) layout.link $(RGBLINK) -n $*.sym -m $*.map -l layout.link -o $@ $(filter %.o,$^) $(RGBFIX) $($*_opt) $@ - tools/stadium $@ ### LZ compression rules diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 27bc41e..2a89ca6 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -672,6 +672,7 @@ const EVENT_BEAT_FISHER_WILTON2 const EVENT_BEAT_FISHER_SCOTT const EVENT_BEAT_FISHER_WILTON3 + const EVENT_BEAT_FISHER_BRAN ; Twins const EVENT_BEAT_TWINS_AMY_AND_MAY const EVENT_BEAT_TWINS_ANN_AND_ANNE diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm index 2878238..a39c85b 100644 --- a/constants/landmark_constants.asm +++ b/constants/landmark_constants.asm @@ -127,6 +127,7 @@ DEF KANTO_LANDMARK EQU const_value const LANDMARK_SEVEN_ISLAND DEF NIHON_LANDMARK EQU const_value const LANDMARK_WINNERS_PATH + const LANDMARK_UNNUMBERED_ROUTE const LANDMARK_SILENT_HILLS const LANDMARK_DEBUG_ROOM const LANDMARK_ROUTE_49 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 92738d0..234ff96 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -617,19 +617,20 @@ ENDM newgroup SILENT_HILLS ; 35 map_const WINNERS_PATH, 10, 26 ; 1 - map_const WINNERS_PATH_OUTSIDE, 9, 30 ; 1 - map_const SILENT_HILLS, 10, 10 ; 2 - map_const DEBUG_ROOM, 20, 20 ; 3 - map_const ROUTE_49, 15, 9 ; 4 - map_const QUIET_CAVE, 27, 18 ; 5 - map_const ROUTE_49_2, 10, 19 ; 6 - map_const SILENT_HILLS_POKECENTER_1F, 10, 4 ; 7 - map_const SILVERS_HOUSE, 5, 5 ; 8 - map_const CALS_HOUSE_1F, 5, 4 ; 9 - map_const CALS_HOUSE_2F, 5, 4 ; 10 - map_const SINJOH_RUINS_EXTERIOR, 10, 10 ; 11 - map_const SINJOH_RUINS_INTERIOR, 10, 10 ; 12 - map_const ROUTE_49_OLD_CITY_GATE, 5, 4 ; 13 + map_const WINNERS_PATH_OUTSIDE, 9, 30 ; 2 + map_const UNNUMBERED_ROUTE, 31, 9 ; 3 + map_const SILENT_HILLS, 10, 10 ; 4 + map_const DEBUG_ROOM, 20, 20 ; 5 + map_const ROUTE_49, 15, 9 ; 6 + map_const QUIET_CAVE, 27, 18 ; 7 + map_const ROUTE_49_2, 10, 19 ; 8 + map_const SILENT_HILLS_POKECENTER_1F, 10, 4 ; 9 + map_const SILVERS_HOUSE, 5, 5 ; 10 + map_const CALS_HOUSE_1F, 5, 4 ; 11 + map_const CALS_HOUSE_2F, 5, 4 ; 12 + map_const SINJOH_RUINS_EXTERIOR, 10, 10 ; 13 + map_const SINJOH_RUINS_INTERIOR, 10, 10 ; 14 + map_const ROUTE_49_OLD_CITY_GATE, 5, 4 ; 15 endgroup newgroup BLUE_FOREST ; 36 diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index fea2577..87902d3 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -210,12 +210,12 @@ DEF KRIS EQU __trainer_class__ const GAVEN3 const BLAKE const BRIAN - const ERICK ; unused - const ANDY ; unused + const ERICK + const ANDY const TYLER ; unused const SEAN const KEVIN - const STEVE ; unused + const STEVE const ALLEN const DARIN @@ -384,6 +384,7 @@ DEF KRIS EQU __trainer_class__ const RALPH4 const RALPH5 const TULLY4 + const BRAN trainerclass SWIMMERM ; 26 const HAROLD @@ -447,7 +448,7 @@ DEF KRIS EQU __trainer_class__ trainerclass SUPER_NERD ; 29 const STAN const ERIC - const GREGG ; unused + const GREGG const JAY ; unused const DAVE ; unused const SAM @@ -734,8 +735,8 @@ DEF KRIS EQU __trainer_class__ const DORNYEI ; unused, Zoltan Dornyei, famous ELT teacher trainerclass PAINTER ; 51 - const RACHEL ; Famous figure in the prototype Pokemon community and unused general girl name, unused - const DALI ; unused + const RACHEL ; Famous figure in the prototype Pokemon community and unused general girl name, unused, give kotora, smeargle... + const DALI trainerclass SOLDIER ; 52 const PEPPINO ; unused, may change diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 25a2852..3365d3e 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -375,8 +375,9 @@ ENDM connection north, Route10North, ROUTE_10_NORTH, 0 connection south, LavenderTown, LAVENDER_TOWN, 0 - map_attributes SilentHills, SILENT_HILLS, $05, WEST ; Add Prince and east connections later + map_attributes SilentHills, SILENT_HILLS, $05, EAST | WEST ; Add Prince connections later connection west, Route49, ROUTE_49, 0 + connection east, UnnumberedRoute, UNNUMBERED_ROUTE, 0 map_attributes Route49, ROUTE_49, $05, EAST | WEST connection east, SilentHills, SILENT_HILLS, $05, 0 @@ -807,7 +808,13 @@ ENDM ; Nihon map_attributes WinnersPath, WINNERS_PATH, $00, 0 - map_attributes WinnersPathOutside, WINNERS_PATH_OUTSIDE, $05, 0 + map_attributes WinnersPathOutside, WINNERS_PATH_OUTSIDE, $05, NORTH + connection north, UnnumberedRoute, UNNUMBERED_ROUTE, 0 + + map_attributes UnnumberedRoute, UNNUMBERED_ROUTE, $05, WEST | SOUTH + connection south, WinnersPathOutside, WINNERS_PATH_OUTSIDE, 0 + connection west, SilentHills, SILENT_HILLS, 0 + map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later. map_attributes QuietCave, QUIET_CAVE, $76, 0 map_attributes SilentHillsPokecenter1F, SILENT_HILLS_POKECENTER_1F, $00, 0 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 93fc205..686a0cf 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1204,3 +1204,6 @@ WinnersPath_Blocks: WinnersPathOutside_Blocks: INCBIN "maps/WinnersPathOutside.ablk" + +UnnumberedRoute_Blocks: + INCBIN "maps/UnnumberedRoute.ablk" diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index 3bd67c4..06fa794 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -130,11 +130,12 @@ Landmarks: landmark 0, 0, UnknownName ; Six Island landmark 0, 0, UnknownName ; Seven Island assert_table_length NIHON_LANDMARK - landmark 0, 0, WinnersPathName - landmark 92, 108, SilentHillsName + landmark 108, 116, WinnersPathName + landmark 108, 108, UnknownName ; Unnumbered post-Winner's Path Route + landmark 92, 108, SilentHillsName landmark 20, 28, UnknownName ; Debug Room - landmark 91, 108, Route49Name ; probably not correct - landmark 91, 108, QuietCaveName ; probably not correct + landmark 84, 108, Route49Name + landmark 76, 108, QuietCaveName landmark 140, 60, BlueForestName assert_table_length NUM_LANDMARKS @@ -164,7 +165,7 @@ WhirlIslandsName: db "WHIRL¯ISLANDS@" MtMortarName: db "MT.MORTAR@" DragonsDenName: db "DRAGON'S¯DEN@" IcePathName: db "ICE PATH@" -NotApplicableName: db "N/A@" ; unreferenced ; "オバケやしき" ("HAUNTED HOUSE") in Japanese +HauntedHouseName: db "HAUNTED¯HOUSE@" ; unreferenced ; "オバケやしき" ("HAUNTED HOUSE") in Japanese PalletTownName: db "PALLET TOWN@" ViridianCityName: db "VIRIDIAN¯CITY@" PewterCityName: db "PEWTER CITY@" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 458960c..0409efd 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -675,6 +675,7 @@ MapGroup_SilentHills: table_width MAP_LENGTH, MapGroup_SilentHills map WinnersPath, TILESET_CAVE, CAVE, LANDMARK_WINNERS_PATH, MUSIC_VICTORY_ROAD, FALSE, PALETTE_NITE, FISHGROUP_DRATINI ; Sounds like a funny fishgroup map WinnersPathOutside, TILESET_NIHON_01, ROUTE, LANDMARK_WINNERS_PATH, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_NONE + map UnnumberedRoute, TILESET_NIHON_01, ROUTE, LANDMARK_UNNUMBERED_ROUTE, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_NONE map DebugRoom, TILESET_NIHON_01, TOWN, LANDMARK_DEBUG_ROOM, MUSIC_SINJOH_RUINS, TRUE, PALETTE_AUTO, FISHGROUP_SHORE map Route49, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm index 4086e26..c5e27e1 100644 --- a/data/maps/outdoor_sprites.asm +++ b/data/maps/outdoor_sprites.asm @@ -703,7 +703,7 @@ SilentHillsGroupSprites: db SPRITE_OLD_LINK_RECEPTIONIST db SPRITE_BIG_LAPRAS db SPRITE_BIG_ONIX - db SPRITE_SUDOWOODO + db SPRITE_SUPER_NERD db SPRITE_POKEFAN_M db SPRITE_RIVAL db SPRITE_TEACHER diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index d970be7..9edc155 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -594,3 +594,4 @@ SECTION "Map Scripts 29", ROMX INCLUDE "maps/Route49OldCityGate.asm" INCLUDE "maps/WinnersPath.asm" INCLUDE "maps/WinnersPathOutside.asm" +INCLUDE "maps/UnnumberedRoute.asm" diff --git a/data/tilesets/nihon01_attributes.bin b/data/tilesets/nihon01_attributes.bin index 9969f03..9b59fb1 100644 Binary files a/data/tilesets/nihon01_attributes.bin and b/data/tilesets/nihon01_attributes.bin differ diff --git a/data/tilesets/nihon01_collision.asm b/data/tilesets/nihon01_collision.asm index 77609b0..a6046d3 100644 --- a/data/tilesets/nihon01_collision.asm +++ b/data/tilesets/nihon01_collision.asm @@ -132,3 +132,12 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 83 tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 84 tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 85 + tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 86 + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 87 + tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 88 + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 89 + tilecoll WATER, WATER, WATER, WATER ; 8a + tilecoll WALL, WALL, WALL, DOOR ; 8b + tilecoll WALL, WALL, WALL, WALL ; 8c + tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 8d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 8e diff --git a/data/tilesets/nihon01_metatiles.bin b/data/tilesets/nihon01_metatiles.bin index 64b420b..3d7354c 100644 Binary files a/data/tilesets/nihon01_metatiles.bin and b/data/tilesets/nihon01_metatiles.bin differ diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index da3dd70..de5e72b 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -1161,10 +1161,9 @@ BirdKeeperGroup: LassGroup: next_list_item ; LASS (1) - db "CARRIE@", TRAINERTYPE_MOVES + db "CARRIE@", TRAINERTYPE_NORMAL db 18 dw SNUBBULL - dw SCARY_FACE, CHARM, BITE, LICK db -1 ; end next_list_item ; LASS (2) @@ -1353,16 +1352,13 @@ JanineGroup: CooltrainerMGroup: next_list_item ; COOLTRAINERM (1) - db "NICK@", TRAINERTYPE_MOVES + db "NICK@", TRAINERTYPE_NORMAL db 26 dw CHARMANDER - dw EMBER, SMOKESCREEN, RAGE, SCARY_FACE db 26 dw SQUIRTLE - dw WITHDRAW, WATER_GUN, BITE, CURSE db 26 dw BULBASAUR - dw LEECH_SEED, POISONPOWDER, SLEEP_POWDER, RAZOR_LEAF db -1 ; end next_list_item ; COOLTRAINERM (2) @@ -2837,6 +2833,14 @@ FisherGroup: dw ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN db -1 ; end + next_list_item ; FISHER (25) + db "BRAN@", TRAINERTYPE_NORMAL + db 54 + dw QWILFATHER + db 57 + dw KAZEPPELIN + db -1 ; end + end_list_items SwimmerMGroup: @@ -3318,13 +3322,13 @@ SuperNerdGroup: db -1 ; end next_list_item ; SUPER_NERD (3) - db "GREGG@", TRAINERTYPE_NORMAL ; seems to be unused - anything we can do? - db 20 - dw MAGNEMITE - db 20 - dw MAGNEMITE - db 20 - dw MAGNEMITE + db "GREGG@", TRAINERTYPE_NORMAL + db 50 + dw MAGNEZONE + db 51 + dw MUK + db 50 + dw BELLEDAM db -1 ; end next_list_item ; SUPER_NERD (4) @@ -5479,108 +5483,3 @@ MysticalmanGroup: db -1 ; end end_list_items -; RBY / unused trainer types. Mostly placeholders. -ChannelerGroup: - next_list_item ; CHANNELER (1) - db "SHANNA@", TRAINERTYPE_NORMAL - db 23 - dw GASTLY - db -1 ; end - end_list_items - -CueBallGroup: - next_list_item ; CUE_BALL (1) - db "KIRBY@", TRAINERTYPE_NORMAL - db 23 - dw CLEFFA - db -1 ; end - end_list_items - -EngineerGroup: - next_list_item ; ENGINEER (1) - db "DASHU@", TRAINERTYPE_NORMAL - db 52 - dw MAGNEZONE - db 54 - dw ELECTIVIRE - db -1 ; end - end_list_items - -RockerGroup: - next_list_item ; ROCKER (1) - db "BOWIE@", TRAINERTYPE_NORMAL - db 23 - dw VOLTORB - db -1 ; end - end_list_items - -TamerGroup: - next_list_item ; TAMER (1) - db "MOE@", TRAINERTYPE_NORMAL - db 23 - dw TAUROS - db -1 ; end - end_list_items - -FirefighterGroup: - next_list_item ; FIREFIGHTER (1) - db "REMY@", TRAINERTYPE_NORMAL - db 23 - dw POLIWAG - db -1 ; end - end_list_items - -TeacherMGroup: - next_list_item ; TEACHERM (1) - db "DORNYEI@", TRAINERTYPE_NORMAL - db 23 - dw BLISSEY - db -1 ; end - end_list_items - -PainterGroup: - next_list_item ; PAINTER (1) - db "RACHEL@", TRAINERTYPE_NORMAL - db 23 - dw SMEARGLE - db -1 ; end - - next_list_item ; PAINTER (1) - db "DALI@", TRAINERTYPE_NORMAL - db 23 - dw SMEARGLE - db -1 ; end - - end_list_items - -SoldierGroup: - next_list_item ; SOLDIER (1) - db "PEPPINO@", TRAINERTYPE_NORMAL - db 23 - dw FORRETRESS - db -1 ; end - end_list_items - -SportsmanGroup: - next_list_item ; SPORTSMAN (1) - db "JACQUES@", TRAINERTYPE_NORMAL - db 23 - dw DODUO - db -1 ; end - end_list_items - -AerofossilGroup: - next_list_item ; SPORTSMAN (1) - db "???@", TRAINERTYPE_NORMAL - db 99 - dw AERODACTYL - db -1 ; end - end_list_items - -KabufossilGroup: - next_list_item ; SPORTSMAN (1) - db "???@", TRAINERTYPE_NORMAL - db 99 - dw KABUTOPS - db -1 ; end - end_list_items diff --git a/data/trainers/parties_new_classes.asm b/data/trainers/parties_new_classes.asm new file mode 100644 index 0000000..9a30ef2 --- /dev/null +++ b/data/trainers/parties_new_classes.asm @@ -0,0 +1,108 @@ +SECTION "Enemy Trainer Parties 4", ROMX + +; RBY / unused trainer types. Mostly placeholders. +ChannelerGroup: + next_list_item ; CHANNELER (1) + db "SHANNA@", TRAINERTYPE_NORMAL + db 23 + dw GASTLY + db -1 ; end + end_list_items + +CueBallGroup: + next_list_item ; CUE_BALL (1) + db "KIRBY@", TRAINERTYPE_NORMAL + db 23 + dw CLEFFA + db -1 ; end + end_list_items + +EngineerGroup: + next_list_item ; ENGINEER (1) + db "DASHU@", TRAINERTYPE_NORMAL + db 52 + dw MAGNEZONE + db 54 + dw ELECTIVIRE + db -1 ; end + end_list_items + +RockerGroup: + next_list_item ; ROCKER (1) + db "BOWIE@", TRAINERTYPE_NORMAL + db 23 + dw VOLTORB + db -1 ; end + end_list_items + +TamerGroup: + next_list_item ; TAMER (1) + db "MOE@", TRAINERTYPE_NORMAL + db 23 + dw TAUROS + db -1 ; end + end_list_items + +FirefighterGroup: + next_list_item ; FIREFIGHTER (1) + db "REMY@", TRAINERTYPE_NORMAL + db 23 + dw POLIWAG + db -1 ; end + end_list_items + +TeacherMGroup: + next_list_item ; TEACHERM (1) + db "DORNYEI@", TRAINERTYPE_NORMAL + db 23 + dw BLISSEY + db -1 ; end + end_list_items + +PainterGroup: + next_list_item ; PAINTER (1) + db "RACHEL@", TRAINERTYPE_NORMAL + db 23 + dw SMEARGLE + db -1 ; end + + next_list_item ; PAINTER (1) + db "DALI@", TRAINERTYPE_MOVES + db 53 + dw SMEARGLE + dw EXTREMESPEED, BELLY_DRUM, NO_MOVE, NO_MOVE ; lol + db -1 ; end + + end_list_items + +SoldierGroup: + next_list_item ; SOLDIER (1) + db "PEPPINO@", TRAINERTYPE_NORMAL + db 23 + dw FORRETRESS + db -1 ; end + end_list_items + +SportsmanGroup: + next_list_item ; SPORTSMAN (1) + db "JACQUES@", TRAINERTYPE_NORMAL + db 23 + dw DODUO + db -1 ; end + end_list_items + +AerofossilGroup: + next_list_item ; SPORTSMAN (1) + db "???@", TRAINERTYPE_NORMAL + db 99 + dw AERODACTYL + db -1 ; end + end_list_items + +KabufossilGroup: + next_list_item ; SPORTSMAN (1) + db "???@", TRAINERTYPE_NORMAL + db 99 + dw KABUTOPS + db -1 ; end + end_list_items diff --git a/data/wild/nihon_grass.asm b/data/wild/nihon_grass.asm index b08a5e9..ea4cbc5 100644 --- a/data/wild/nihon_grass.asm +++ b/data/wild/nihon_grass.asm @@ -57,6 +57,37 @@ NihonGrassWildMons: dbw 55, AMPHAROS end_grass_wildmons + ; Route east of Silent Hills + ; Encounter data based on what is in the SW97 demo. + ; https://tcrf.net/Proto:Pok%C3%A9mon_Gold_and_Silver/Spaceworld_1997_Demo/Maps + def_grass_wildmons UNNUMBERED_ROUTE + db 2 percent, 2 percent, 4 percent ; encounter rates: morn/day/nite + ; morn + dbw 29, PICHU + dbw 29, SMEARGLE + dbw 28, PICHU + dbw 29, ODDISH + dbw 32, GLOOM + dbw 27, PIKACHU + dbw 27, SMEARGLE + ; day + dbw 29, ODDISH + dbw 29, SMEARGLE + dbw 28, PICHU + dbw 29, MEOWTH + dbw 32, RATICATE + dbw 27, MEOWTH + dbw 27, SMEARGLE + ; nite + dbw 29, RATICATE + dbw 29, HOOTHOOT + dbw 28, EKANS + dbw 29, HOOTHOOT + dbw 32, ARBOK + dbw 27, NOCTOWL + dbw 27, SMEARGLE + end_grass_wildmons + def_grass_wildmons QUIET_CAVE db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn diff --git a/data/wild/nihon_water.asm b/data/wild/nihon_water.asm index d2b2764..26abf11 100644 --- a/data/wild/nihon_water.asm +++ b/data/wild/nihon_water.asm @@ -6,6 +6,13 @@ NihonWaterWildMons: dbw 40, GRANBO ; SHARPOON end_water_wildmons + def_water_wildmons UNNUMBERED_ROUTE + db 4 percent ; encounter rates: morn/day/nite + dbw 30, MAGIKARP + dbw 31, ANGORE + dbw 30, MOLAMBINO + end_water_wildmons + ; Placeholder def_water_wildmons ROUTE_49_2 db 4 percent ; encounter rates: morn/day/nite diff --git a/layout.link b/layout.link index e5d64da..ad649eb 100644 --- a/layout.link +++ b/layout.link @@ -313,11 +313,12 @@ ROMX $7d ROMX $7e "Crystal Events" ROMX $7f - org $7de0 - "Stadium 2 Checksums" + ROMX $80 "Cries" "Pic Pointers" +ROMX $81 + "Enemy Trainer Parties 4" WRAM0 "Stack" "Audio RAM" diff --git a/main.asm b/main.asm index cfbe5f7..f952487 100644 --- a/main.asm +++ b/main.asm @@ -662,14 +662,12 @@ SECTION "European Mail", ROMX INCLUDE "engine/pokemon/european_mail.asm" - +if DEF(_DEBUG) SECTION "Debug Room", ROMX -if DEF(_DEBUG) INCLUDE "engine/debug/debug_room.asm" endc - SECTION "Battle Tower Text", ROMX INCLUDE "data/battle_tower/trainer_text.asm" @@ -691,7 +689,7 @@ INCLUDE "engine/events/battle_tower/load_trainer.asm" INCLUDE "engine/events/odd_egg.asm" -SECTION "Stadium 2 Checksums", ROMX[$7DE0], BANK[$7F] +;SECTION "Stadium 2 Checksums", ROMX[$7DE0], BANK[$7F] ; The end of the ROM is taken up by checksums of the content, apparently used ; by Pokémon Stadium 2 due to the checksums' "N64PS3" header. (In Japan, @@ -703,5 +701,6 @@ SECTION "16-bit ID stuff", ROMX INCLUDE "engine/16/table_functions.asm" -; own section +; own sections INCLUDE "data/trainers/parties.asm" +INCLUDE "data/trainers/parties_new_classes.asm" diff --git a/maps/SilentHills.ablk b/maps/SilentHills.ablk index 964b648..6b93fa7 100644 --- a/maps/SilentHills.ablk +++ b/maps/SilentHills.ablk @@ -1,2 +1 @@ -IJHF|}+BF~E/JIJ - !A|}G~E$AAAAAATnnnnUX5555Y \ No newline at end of file +IJHF|}+BF~E/JIJ !A|}G~E$AAAAAATnnnnUX5555Y \ No newline at end of file diff --git a/maps/UnnumberedRoute.ablk b/maps/UnnumberedRoute.ablk new file mode 100644 index 0000000..96e8514 --- /dev/null +++ b/maps/UnnumberedRoute.ablk @@ -0,0 +1,6 @@ +k))(k)))))))))))(efj''%eeeeeeeeeej'''''''''''%-`-TnnnUptt]^"C"X555Yb""X555Y`beeeeeee"eeeX555Yeee` + + + + +nnnnnnnnnnn555Y \ No newline at end of file diff --git a/maps/UnnumberedRoute.asm b/maps/UnnumberedRoute.asm new file mode 100644 index 0000000..74c2eea --- /dev/null +++ b/maps/UnnumberedRoute.asm @@ -0,0 +1,137 @@ + object_const_def + +UnnumberedRoute_MapScripts: + def_scene_scripts + + def_callbacks + +UnnumberedRouteSign1Script: + jumptext UnnumberedRouteSign1Text + +UnnumberedRouteSign1Text: + text "Route XX" + line "WEST: SILENT" + cont "HILLS" + + para "SOUTH: WINNER'S" + line "PATH" + done + +UnnumberedRouteSign2Script: + jumptext UnnumberedRouteSign2Text + +UnnumberedRouteSign2Text: + text "TRAINER TIPS" + + para "If you use DEF-" + line "ENSE CURL before" + cont "ROLLOUT, its" + cont "power doubles!" + done + +TrainerPainterDali: + trainer PAINTER, DALI, EVENT_BEAT_PAINTER_DALI, PainterDaliSeenText, PainterDaliBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext PainterDaliAfterBattleText + waitbutton + closetext + end + +PainterDaliSeenText: + text "I'm not strange!" + line "I'm just normal." + done + +PainterDaliBeatenText: + text "You're certainly" + line "not imitating!" + prompt + +PainterDaliAfterBattleText: + text "Have no fear" + line "of perfection!" + + para "You'll never" + line "reach it!" + done + +TrainerSuperNerdGregg: + trainer SUPER_NERD, GREGG, EVENT_BEAT_SUPER_NERD_GREGG, SuperNerdGreggSeenText, SuperNerdGreggBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext SuperNerdGreggAfterBattleText + waitbutton + closetext + end + +SuperNerdGreggSeenText: + text "We're on the" + line "verge of a" + cont "revolution!" + done + +SuperNerdGreggBeatenText: + text "It won't be" + line "televised!" + prompt + +SuperNerdGreggAfterBattleText: + text "Isn't it crazy?" + + para "Virtual reality!" + + para "The VIRTUAL BOY" + line "will change the" + cont "world!" + done + +TrainerFisherBran: + trainer FISHER, BRAN, EVENT_BEAT_FISHER_BRAN, FisherBranSeenText, FisherBranBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext FisherBranAfterBattleText + waitbutton + closetext + end + +FisherBranSeenText: + text "Agh! You made me" + line "lose my catch!" + done + +FisherBranBeatenText: + text "Now I can't catch" + line "any!" + prompt + +FisherBranAfterBattleText: + text "SILENT HILLS has" + line "a #MON CENTER" + + para "Isn't that just" + line "incredible?" + done + +UnnumberedRoute_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 57, 9, DEBUG_ROOM, 1 ; Unsure, probably the other route. + + def_coord_events + + def_bg_events + bg_event 2, 4, BGEVENT_READ, UnnumberedRouteSign1Script + bg_event 30, 6, BGEVENT_READ, UnnumberedRouteSign2Script + + def_object_events + object_event 47, 4, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerPainterDali, -1 + object_event 12, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerSuperNerdGregg, -1 + object_event 41, 8, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 1, TrainerFisherBran, -1 diff --git a/maps/WinnersPathOutside.ablk b/maps/WinnersPathOutside.ablk index 6931f67..14942ee 100644 --- a/maps/WinnersPathOutside.ablk +++ b/maps/WinnersPathOutside.ablk @@ -1 +1 @@ -WWWWWWWWWWWWWWWWWWWWWWWWEk))))("l**%"l**&l**&l**&l**&l***(l***&l***&l***&j''%EWWamC99WWWptttrq{{E \ No newline at end of file +WWWWWWWWWWWWWWWWWWWWWWWWEk))))("l**%"l**&l**&l**&l**&l***(l***&l***&l***&j''%EWWamC99WWWptttrq{{E \ No newline at end of file