From 52a8f2cf20e45541c9a1222ca23978edad53d101 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Mon, 9 Dec 2024 22:29:07 -0500 Subject: [PATCH] Aventurine City, Bank Split, Initial KEP Fuchsia Port Had to split bank 2 because I ran out of unreferenced code to comment out when adding Aventurine Fuchsia was pissing me off so I applied the changes from KEP when adding the safari zone graphics, though it's not currently super close to what it was like in LGPE Aventurine is very early stages but it's in there :V --- constants/engine_flags.asm | 1 + constants/landmark_constants.asm | 1 + constants/map_constants.asm | 6 ++++- constants/map_data_constants.asm | 2 ++ constants/scgb_constants.asm | 2 ++ data/events/engine_flags.asm | 1 + data/maps/attributes.asm | 2 ++ data/maps/blocks.asm | 3 +++ data/maps/flypoints.asm | 1 + data/maps/landmarks.asm | 2 ++ data/maps/maps.asm | 8 +++++- data/maps/outdoor_sprites.asm | 8 +++--- data/maps/roofs.asm | 3 ++- data/maps/scripts.asm | 3 ++- data/maps/sgb_roof_pal_inds.asm | 2 ++ data/maps/spawn_points.asm | 1 + data/tilesets/kanto_attributes.bin | Bin 2944 -> 3024 bytes data/tilesets/kanto_collision.asm | 5 ++++ data/tilesets/kanto_metatiles.bin | Bin 2944 -> 3024 bytes data/tilesets/nihon01_attributes.bin | Bin 2304 -> 2624 bytes data/tilesets/nihon01_collision.asm | 20 +++++++++++++++ data/tilesets/nihon01_metatiles.bin | Bin 2304 -> 2624 bytes gfx/sgb/predef.pal | 4 ++- gfx/tilesets/kanto.png | Bin 5235 -> 2357 bytes gfx/tilesets/nihon01.png | Bin 1471 -> 1607 bytes gfx/tilesets/roofs.pal | 6 ++++- main.asm | 4 +++ maps/AventurineCity.ablk | 1 + maps/AventurineCity.asm | 25 +++++++++++++++++++ maps/DebugRoom.asm | 2 +- maps/FuchsiaCity.ablk | 36 ++++++++++++++------------- maps/FuchsiaCity.asm | 10 ++++---- 32 files changed, 127 insertions(+), 32 deletions(-) create mode 100644 maps/AventurineCity.ablk create mode 100644 maps/AventurineCity.asm diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 1420c28..0e9a0c0 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -110,6 +110,7 @@ const ENGINE_FLYPOINT_SAVOY const ENGINE_FLYPOINT_CORAL const ENGINE_FLYPOINT_RUDDY + const ENGINE_FLYPOINT_AVENTURINE const ENGINE_FLYPOINT_UNUSED ; wLuckyNumberShowFlag const ENGINE_LUCKY_NUMBER_SHOW diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm index 795da4f..4ed06ae 100644 --- a/constants/landmark_constants.asm +++ b/constants/landmark_constants.asm @@ -143,6 +143,7 @@ DEF NIHON_LANDMARK EQU const_value const LANDMARK_ROUTE_52 const LANDMARK_RUDDY_TOWN const LANDMARK_BLUE_FOREST + const LANDMARK_AVENTURINE_CITY const LANDMARK_ROUTE_66 const LANDMARK_WHITE_CITY DEF NUM_LANDMARKS EQU const_value diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 7abdfe0..3e31372 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -687,7 +687,11 @@ ENDM map_const BLUE_FOREST, 20, 18 ; 1 endgroup - newgroup WHITE_CITY ; 41 + newgroup AVENTURINE_CITY ; 41 + map_const AVENTURINE_CITY, 20, 18 ; 1 + endgroup + + newgroup WHITE_CITY ; 42 map_const WHITE_CITY, 30, 27 ; 1 map_const ROUTE_66_WHITE_CITY_GATE, 5, 4 ; 2 endgroup diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 05cb2ce..f39e6c1 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -118,6 +118,7 @@ DEF NUM_FISHGROUPS EQU const_value - 1 const SPAWN_SAVOY_CITY const SPAWN_CORAL_CITY const SPAWN_RUDDY_TOWN + const SPAWN_AVENTURINE_CITY DEF NUM_SPAWNS EQU const_value DEF SPAWN_N_A EQU -1 @@ -167,6 +168,7 @@ DEF NIHON_FLYPOINT EQU const_value const FLY_SAVOY_CITY const FLY_CORAL_CITY const FLY_RUDDY_TOWN + const FLY_AVENTURINE_CITY DEF NUM_FLYPOINTS EQU const_value DEF MAX_OUTDOOR_SPRITES EQU 23 ; see engine/overworld/overworld.asm diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm index 01afbe0..e90c518 100644 --- a/constants/scgb_constants.asm +++ b/constants/scgb_constants.asm @@ -184,6 +184,8 @@ DEF SCGB_DEFAULT EQU $ff const PREDEFPAL_GATES_NIHON_MORN const PREDEFPAL_RUDDY_TOWN const PREDEFPAL_RUDDY_TOWN_MORN + const PREDEFPAL_AVENTURINE + const PREDEFPAL_AVENTURINE_MORN DEF NUM_PREDEF_PALS EQU const_value ; SGB system command codes diff --git a/data/events/engine_flags.asm b/data/events/engine_flags.asm index 75c2567..3e66626 100644 --- a/data/events/engine_flags.asm +++ b/data/events/engine_flags.asm @@ -120,6 +120,7 @@ EngineFlags: engine_flag wVisitedSpawns, SPAWN_SAVOY_CITY engine_flag wVisitedSpawns, SPAWN_CORAL_CITY engine_flag wVisitedSpawns, SPAWN_RUDDY_TOWN + engine_flag wVisitedSpawns, SPAWN_AVENTURINE_CITY engine_flag wVisitedSpawns, NUM_SPAWNS ; unused engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 744a644..81c80ab 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -908,6 +908,8 @@ ENDM map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later. + map_attributes AventurineCity, AVENTURINE_CITY, $05, 0 ; this is on its own for now. add connections later. + map_attributes WhiteCity, WHITE_CITY, $01, 0 ; this is on its own for now. add connections later. map_attributes Route66WhiteCityGate, ROUTE_66_WHITE_CITY_GATE, $00, 0 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 645e596..f19d538 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1325,3 +1325,6 @@ Route52_Blocks: RuddyTown_Blocks: INCBIN "maps/RuddyTown.ablk" + +AventurineCity_Blocks: + INCBIN "maps/AventurineCity.ablk" diff --git a/data/maps/flypoints.asm b/data/maps/flypoints.asm index 8c28094..1c2c547 100644 --- a/data/maps/flypoints.asm +++ b/data/maps/flypoints.asm @@ -42,4 +42,5 @@ Flypoints: db LANDMARK_SAVOY_CITY, SPAWN_SAVOY_CITY db LANDMARK_CORAL_CITY, SPAWN_CORAL_CITY db LANDMARK_RUDDY_TOWN, SPAWN_RUDDY_TOWN + db LANDMARK_AVENTURINE_CITY, SPAWN_AVENTURINE_CITY db -1 ; end diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index 003a296..e5ee525 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -147,6 +147,7 @@ Landmarks: landmark 12, 84, Route53Name landmark 12, 68, RuddyTownName landmark 140, 60, BlueForestName + landmark 140, 84, AventurineCityName landmark 108, 108, Route66Name landmark 124, 108, WhiteCityName assert_table_length NUM_LANDMARKS @@ -279,4 +280,5 @@ SavoyCityName: db "SAVOY¯CITY@" CoralCityName: db "CORAL¯CITY@" RuddyTownName: db "RUDDY¯TOWN@" BlueForestName: db "BLUE¯FOREST@" +AventurineCityName: db "AVENTURINE¯CITY@" WhiteCityName: db "WHITE¯CITY@" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 5934489..be4af97 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -57,7 +57,8 @@ MapGroupPointers:: dw MapGroup_CoralCity ; 38 dw MapGroup_RuddyTown ; 39 dw MapGroup_BlueForest ; 40 - dw MapGroup_WhiteCity ; 41 + dw MapGroup_Aventurine ; 41 + dw MapGroup_WhiteCity ; 42 assert_table_length NUM_MAP_GROUPS MapGroup_Olivine: @@ -754,6 +755,11 @@ MapGroup_BlueForest: map BlueForest, TILESET_NIHON_SNOWY, TOWN, LANDMARK_BLUE_FOREST, MUSIC_SINJOH_RUINS, FALSE, PALETTE_AUTO, FISHGROUP_SHORE assert_table_length NUM_BLUE_FOREST_MAPS +MapGroup_Aventurine: + table_width MAP_LENGTH, MapGroup_Aventurine + map AventurineCity, TILESET_NIHON_01, TOWN, LANDMARK_AVENTURINE_CITY, MUSIC_MART, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + assert_table_length NUM_AVENTURINE_CITY_MAPS + MapGroup_WhiteCity: table_width MAP_LENGTH, MapGroup_WhiteCity map WhiteCity, TILESET_NIHON_WHITECITY, TOWN, LANDMARK_WHITE_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm index 0075191..2dbc16c 100644 --- a/data/maps/outdoor_sprites.asm +++ b/data/maps/outdoor_sprites.asm @@ -44,6 +44,7 @@ OutdoorSprites: dw CoralCityGroupSprites dw RuddyTownGroupSprites dw BlueForestGroupSprites + dw AventurineCityGroupSprites dw WhiteCityGroupSprites assert_table_length NUM_MAP_GROUPS @@ -332,9 +333,10 @@ IndigoGroupSprites: db SPRITE_POKE_BALL db SPRITE_BOULDER -BlueForestGroupSprites: ; Will have its own thing eventually -WhiteCityGroupSprites: ; Ditto -RuddyTownGroupSprites: ; Ditto +BlueForestGroupSprites: ; Will have its own thing eventually +AventurineCityGroupSprites: ; Ditto +WhiteCityGroupSprites: ; Ditto +RuddyTownGroupSprites: ; Ditto NewBarkGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY diff --git a/data/maps/roofs.asm b/data/maps/roofs.asm index df2db6e..085e35b 100644 --- a/data/maps/roofs.asm +++ b/data/maps/roofs.asm @@ -52,7 +52,8 @@ MapGroupRoofs: db ROOF_NEW_BARK ; 38 (Coral City) db ROOF_NEW_BARK ; 38 (Ruddy Town) db ROOF_NEW_BARK ; 40 (Blue Forest) - db ROOF_NEW_BARK ; 41 (White City) + db ROOF_NEW_BARK ; 41 (Aventurine City) + db ROOF_NEW_BARK ; 42 (White City) assert_table_length NUM_MAP_GROUPS + 1 Roofs: diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 6eaabee..e8e8364 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -638,4 +638,5 @@ INCLUDE "maps/Route50SavoyCityGate.asm" INCLUDE "maps/CoralCity.asm" INCLUDE "maps/Route51.asm" INCLUDE "maps/Route52.asm" -INCLUDE "maps/RuddyTown.asm" \ No newline at end of file +INCLUDE "maps/RuddyTown.asm" +INCLUDE "maps/AventurineCity.asm" \ No newline at end of file diff --git a/data/maps/sgb_roof_pal_inds.asm b/data/maps/sgb_roof_pal_inds.asm index e6e920a..8e0e1d8 100644 --- a/data/maps/sgb_roof_pal_inds.asm +++ b/data/maps/sgb_roof_pal_inds.asm @@ -44,6 +44,7 @@ MapGroupRoofSGBPalInds: db PREDEFPAL_CORAL_CITY db PREDEFPAL_RUDDY_TOWN db PREDEFPAL_BLUE_FOREST + db PREDEFPAL_AVENTURINE db PREDEFPAL_WHITE_CITY assert_table_length NUM_MAP_GROUPS + 1 @@ -91,5 +92,6 @@ MapGroupRoofSGBPalIndsMorn: db PREDEFPAL_CORAL_CITY_MORN db PREDEFPAL_RUDDY_TOWN_MORN db PREDEFPAL_BLUE_FOREST_MORN + db PREDEFPAL_AVENTURINE_MORN db PREDEFPAL_WHITE_CITY_MORN assert_table_length NUM_MAP_GROUPS + 1 \ No newline at end of file diff --git a/data/maps/spawn_points.asm b/data/maps/spawn_points.asm index caef55a..108cfad 100644 --- a/data/maps/spawn_points.asm +++ b/data/maps/spawn_points.asm @@ -52,6 +52,7 @@ SpawnPoints: spawn SAVOY_CITY, 25, 15 spawn CORAL_CITY, 31, 11 spawn RUDDY_TOWN, 31, 15 + spawn AVENTURINE_CITY, 33, 21 spawn N_A, -1, -1 diff --git a/data/tilesets/kanto_attributes.bin b/data/tilesets/kanto_attributes.bin index 6c02998682a042279b0d66de9e666d2c7ce1ece3..3d972271369ec4ca2aadcd2dc4959efd685115db 100644 GIT binary patch delta 61 scmZn=zaYM$fm?xvkB=1uSb%_)m4Sf`8SwG3O}1cE5CDoZz%fuU0Mg(jc^e695Ql0uTTI diff --git a/data/tilesets/nihon01_collision.asm b/data/tilesets/nihon01_collision.asm index 30168b8..a180e4c 100644 --- a/data/tilesets/nihon01_collision.asm +++ b/data/tilesets/nihon01_collision.asm @@ -142,3 +142,23 @@ tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 8d tilecoll WALL, WALL, WALL, WALL ; 8e tilecoll WALL, WALL, WALL, WALL ; 8f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 90 + tilecoll WALL, WALL, FLOOR, FLOOR ; 91 + tilecoll WALL, WALL, DOOR, WALL ; 92 + tilecoll WALL, WALL, FLOOR, FLOOR ; 93 + tilecoll WALL, WALL, WALL, WALL ; 94 + tilecoll WALL, WALL, DOOR, WALL ; 95 + tilecoll WALL, WALL, FLOOR, FLOOR ; 96 + tilecoll WALL, WALL, DOOR, DOOR ; 97 + tilecoll WALL, WALL, WALL, WALL ; 98 + tilecoll WALL, WALL, WALL, WALL ; 99 + tilecoll WALL, WALL, WALL, WALL ; 9a + tilecoll WALL, WALL, WALL, WALL ; 9b + tilecoll WALL, WALL, WALL, DOOR ; 9c + tilecoll WALL, WALL, WALL, WALL ; 9d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 9e + tilecoll FLOOR, FLOOR, WALL, WALL ; 9f + tilecoll WALL, WALL, WALL, WALL ; a0 + tilecoll WALL, WALL, WALL, WALL ; a1 + tilecoll WALL, WALL, WALL, WALL ; a2 + tilecoll WALL, WALL, DOOR, WALL ; a3 diff --git a/data/tilesets/nihon01_metatiles.bin b/data/tilesets/nihon01_metatiles.bin index db4951edd91ababc2ae19d552cafc5abc862de66..e6ebd2bc285eb3129e18e0b8c043fb6c001eaf4b 100644 GIT binary patch delta 348 zcmYjN-AcnS7;SqIWU1{^q|<&u^Oc#T4b=`rP(e2b+j`@rKX>{D`ULYC+=Z_p_yRtH zkK{Kr%tHh93D$6IOV%F8%lh9;_>s#=0|=27~UyW delta 25 hcmX>g(jc^95+kGF=E;oH+1LV1R8&+0CL3^E003q!2Z8_q diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index c62a15c..4716007 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -135,4 +135,6 @@ RGB 31,31,31, 21,21,16, 12,15,20, 00,00,00 ; PREDEFPAL_ROUTES_NIHON_MORN RGB 31,31,31, 16,16,16, 12,15,20, 00,00,00 ; PREDEFPAL_GATES_NIHON_MORN RGB 31,31,31, 26,10,06, 15,20,20, 00,00,00 ; PREDEFPAL_RUDDY_TOWN - RGB 31,31,31, 23,09,04, 12,15,20, 00,00,00 ; PREDEFPAL_RUDDY_TOWN_MORN # \ No newline at end of file + RGB 31,31,31, 23,09,04, 12,15,20, 00,00,00 ; PREDEFPAL_RUDDY_TOWN_MORN # + RGB 31,31,31, 03,29,11, 15,20,20, 00,00,00 ; PREDEFPAL_AVENTURINE + RGB 31,31,31, 08,25,12, 12,15,20, 00,00,00 ; PREDEFPAL_AVENTURINE_MORN \ No newline at end of file diff --git a/gfx/tilesets/kanto.png b/gfx/tilesets/kanto.png index 9265b60f7e7d95f5d06008580b6a30a70c1511c7..0af15098531b2ce35a8207bc52b95f09db3e271f 100644 GIT binary patch literal 2357 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 b0owipDMT#o+qTlg00000NkvXXu0mjfl>BQz literal 5235 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 E4-^inG5`Po diff --git a/gfx/tilesets/nihon01.png b/gfx/tilesets/nihon01.png index 8a510306e485953a24b72065165db509a9e64a73..60069a115911c2c9db3fcb7098cb27f0b3f09064 100644 GIT binary patch delta 1603 zcmV-J2E6&d3&#wQ7k^*^00000x}iNZ000IKNklr&VZI_9OSmAclO)_14 ze^3NAhIK_YjsBrvHjNUkoz=+J`tHtajcg|GabEM1=6(7--+y!NJ+}`SyZu;_q<0yU zdKm`Acp-rCW%>>Zz}UUO*x0S;eVGOU<9Xl=W2e_{+a|TLUK$MXj6DwoD80P){p0d| zC56Fg3Ox@TBc$p0)eZ?w1gUu?XPQYcRy_mmEJk3%<%Z}jCI_h_%$WeDoFFhE0Qg&v zwJ=FZVKSObi+>e`HB$fG&j5h+ zL~`nanIS%2N2_Pgy7ji^Kgxy(!dZvZpUck z=Z;a_ClZuQ7I#G=hP=afD#hWN9RL{vgd9ZRLdU4gWCjkStu7J?c_ivWg*}9(OuK5KcS$J^4glkB zsP?tL)!4?^K(&ZE@d(F{p9svxDtLH}(l0JT)q73(S1l}Q^FS_-3LIA@b?2t~z^#80 z9)E!Yz5_Fx4Xl4a5UY2gLMAs{+*pR4l!3c;E&LEVZKAHumgIHNmfgk2`nj?jn=GmQ z3>;%&+1V{*wCn2o69anh68|pc!DmGD;9|<~Dj_Qck$s};C4^7d>TGrXuA;`G#-9kO zVC)b{0buzX#tQ&S6SjH;ycgUT+&6qp2!AvXSj5;6=*H*X$kqu6wE7S@y(8o6;bxzQ zGktss768lu%SctbYxSPe#N31*fkuF$^JfDdj^A=9t&r`^+i39&mL?Jjzu)h@0i}X8GOE`X6zZ3*;j@VUNo*B zD6gGEX($t#H)TJ}YWDe4z@(K=TJycQ>9YT_h$|>{7{RCOO@w?CEy}@B+E>QpK9~19 zfZ4L%j6X3tpm8`F6^lOlR@s?vSbvu@`L=Z)R*^Nib#Dn{nISlMzSXz-#SK3wDReGn z8ruZihK4(b11*FgP<9U|VrRo61+W$=>*uv@v{(!iZ+;L=rP%*~`dka^FDV`n!0=kv zh~mb7Dh`}XnVj{fpU&8=oG?hdtSDU3y8=oa>0)^&6b0|~&f=aPcbQskyaDmIL@!SCd2yGe}La+)f7EM3^ zy>prrI%+|H`jDsgkl_a^ z0amEVCzssi6%Pe!1|AH0_A7u}%|Li__adl81vTItrMo~Bz^#^|h*B>&%}}6bQaL+7 zFM?aG%>1t6PQX?ar~$=Chr944M{uj9Si0}jH@Fvsd^MAiUwh)X)I36#TA9k(fk3TJ z4TvZC2&NDPwG>Ilcr@u$oeO4)F)UNBIv2{j+`q;30?K%}o5lbD002ovPDHLkV1k=~ B`}qI> delta 1466 zcmV;r1x5PD48IGI7k_X900000xpzOW000GsNklvWDT9aRYY0NtVxwn$eUglR`VK6fPyNx1$2@?3LCbAPXUKkw)He4bAWl-{@_ z%kmqP%6$|=!dMi>_#$@)6`=HHIGMbjn#xKMz<3xqL+R;FJ9fxjv`>mC9HkEfVM)5U z>8)egDK&-JVpSdnjuO&->~cs(6A{U_jRqtac`QFX*N#})TmA`Q(OOwv}RC-z&xFZDqztxGyTk>j!H_ya)d zx1bY%t4=F9h0jw6%qcVzxqh?LKWJfDHs@hnj?F2kb$_MGHg@_4S(j@XQ)H9QBim!j zeE?t!k==%fQQ23*&C0WOAbxc3d0RM0p>*sIe@@OD3PUE3NDMIDIQn+vgAR9y@YJY z0fW9!LVru)vQ*9vHn2q}B))sNVGlrg4*2;s1k%==f|-w>ds}Q|5=)0DT^^Mr1V&Jy z4-GUM9%m-$)uE(=sZ&hY-CWt^AK*hPUVL!`lKbTV}beFU;{=uqDCKC(>1D60+ zlusV7Wv!dH!_$P+LSeLSpP~V`N)c!UFneA(;$=Cq18N9qgq9kHOA~@XzXyT!IDf#; z?CM_Pv$k*2mb-*P&#Im+EmfHryS+3Rz~}S#w%NUuzD__Co6Mrv-hn;CGW)$K5kTXn zXiejjlB5`+V_V^^f(|jL0W)@P)?OOGO;`9QBdnDqmjy&aUq%rpJJo}us^3eq{hq)# z01LAw8@^(3LECUDB~-lswYoE3vVX6p*&FsHSVh6iyPs83YEu^$XZr8OA*M@;ebN#lF8J(erfk1=Rxr7ysH3akf)(FJ%gx$~qj*mO-|2)bqBS)kts{C{H7O@RR9F^Run z`hCa)s2=jAVDj~0LB2ke=?????????;_t - - -7N$ WWWW%_89NX0|rY1<=01NX11111111Y_Vw1wNZ\\[11PRRt>?;RRRRRRRR>?;FJ11(,) \ No newline at end of file +11ttt>?;RRRRRRRR>?;FJtt(,) \ No newline at end of file diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index a65d6e8..a5d918e 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -118,12 +118,12 @@ FuchsiaCity_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 5, 13, FUCHSIA_MART, 2 + warp_event 15, 19, FUCHSIA_MART, 2 warp_event 22, 13, SAFARI_ZONE_MAIN_OFFICE, 1 warp_event 8, 27, FUCHSIA_GYM, 1 warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1 warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1 - warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1 + warp_event 28, 27, SAFARI_ZONE_WARDENS_HOME, 1 warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 warp_event 37, 22, ROUTE_15_FUCHSIA_GATE, 1 warp_event 37, 23, ROUTE_15_FUCHSIA_GATE, 2 @@ -133,14 +133,14 @@ FuchsiaCity_MapEvents: def_coord_events def_bg_events - bg_event 21, 15, BGEVENT_READ, FuchsiaCitySign + bg_event 21, 17, BGEVENT_READ, FuchsiaCitySign bg_event 5, 29, BGEVENT_READ, FuchsiaGymSign - bg_event 25, 15, BGEVENT_READ, SafariZoneOfficeSign + bg_event 25, 17, BGEVENT_READ, SafariZoneOfficeSign bg_event 27, 29, BGEVENT_READ, WardensHomeSign bg_event 17, 5, BGEVENT_READ, SafariZoneClosedSign bg_event 13, 15, BGEVENT_READ, NoLitteringSign bg_event 20, 27, BGEVENT_READ, FuchsiaCityPokecenterSign - bg_event 6, 13, BGEVENT_READ, FuchsiaCityMartSign + bg_event 16, 19, BGEVENT_READ, FuchsiaCityMartSign def_object_events object_event 23, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1