Added day/night system

This commit is contained in:
Ninjdai 2023-11-11 20:08:20 +01:00
parent a722911e4e
commit 56d3506a6f
236 changed files with 3652 additions and 10504 deletions

View File

@ -16,12 +16,13 @@ If you have suggestions, found bugs, or just want to talk, feel free to DM me on
* Bigger bag (Up to 999 of each item) * Bigger bag (Up to 999 of each item)
* X/Y-style wrapping summary screen ([Zeturic](https://www.pokecommunity.com/showpost.php?p=10060875&postcount=27)) * X/Y-style wrapping summary screen ([Zeturic](https://www.pokecommunity.com/showpost.php?p=10060875&postcount=27))
* Options default to fast text speed and set battle type * Options default to fast text speed and set battle type
* Day/Night system [by quocmanh94](https://github.com/quocmanh94/pokeemerald/commit/a0fd237009a1bd1f999e3ab25ca07508985b4435)
**WIP** **WIP**
- Brand new region of ??????? - Brand new region of ???????
**For the future** **For the future (TODO list)**
- D/N System with adapted encounters - Adapt encounters to D/N system
- Every pokemon obtainable, including mythicals/legendaries - Every pokemon obtainable, including mythicals/legendaries
------ ------

View File

@ -22,9 +22,8 @@
@ Defines an object event template for map data, to be used by a normal object. Mirrors the struct layout of ObjectEventTemplate in include/global.fieldmap.h @ Defines an object event template for map data, to be used by a normal object. Mirrors the struct layout of ObjectEventTemplate in include/global.fieldmap.h
.macro object_event index:req, gfx:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req .macro object_event index:req, gfx:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req
.byte \index .byte \index
.byte \gfx .2byte \gfx
.byte OBJ_KIND_NORMAL .byte OBJ_KIND_NORMAL
.space 1 @ Padding
.2byte \x, \y .2byte \x, \y
.byte \elevation .byte \elevation
.byte \movement_type .byte \movement_type

View File

@ -6,3 +6,6 @@ gFieldCallback
gFieldCallback2 gFieldCallback2
gLocalLinkPlayerId gLocalLinkPlayerId
gFieldLinkPlayerCount gFieldLinkPlayerCount
gTimeOfDay
currentTimeBlend
gTimeUpdateCounter

Binary file not shown.

View File

@ -357,6 +357,32 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_OutsideEast_EventScript_Camper", "script": "BattleFrontier_OutsideEast_EventScript_Camper",
"flag": "0" "flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 5,
"y": 51,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": -3,
"y": 51,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -331,6 +331,32 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "BattleFrontier_OutsideWest_EventScript_PokefanF", "script": "BattleFrontier_OutsideWest_EventScript_PokefanF",
"flag": "0" "flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 61,
"y": 51,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 53,
"y": 51,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -14,7 +14,19 @@
"battle_scene": "MAP_BATTLE_SCENE_NORMAL", "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": 0, "connections": 0,
"object_events": [ "object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 7,
"y": 21,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
}
], ],
"warp_events": [ "warp_events": [
{ {

View File

@ -89,6 +89,19 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "DewfordTown_EventScript_TrendyPhraseBoy", "script": "DewfordTown_EventScript_TrendyPhraseBoy",
"flag": "0" "flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 4,
"y": 10,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -20,7 +20,19 @@
} }
], ],
"object_events": [ "object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 29,
"y": 48,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
}
], ],
"warp_events": [ "warp_events": [
{ {

View File

@ -76,6 +76,32 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_EventScript_Azurill", "script": "FallarborTown_EventScript_Azurill",
"flag": "FLAG_HIDE_FALLARBOR_AZURILL" "flag": "FLAG_HIDE_FALLARBOR_AZURILL"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 16,
"y": 7,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 17,
"y": 15,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -115,6 +115,32 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_EventScript_Kecleon", "script": "FortreeCity_EventScript_Kecleon",
"flag": "FLAG_HIDE_FORTREE_CITY_KECLEON" "flag": "FLAG_HIDE_FORTREE_CITY_KECLEON"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 7,
"y": 6,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 6,
"y": 14,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -136,6 +136,32 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LavaridgeTown_EventScript_EggWoman", "script": "LavaridgeTown_EventScript_EggWoman",
"flag": "0" "flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 11,
"y": 6,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 17,
"y": 5,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -310,6 +310,19 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_EventScript_FatMan", "script": "LilycoveCity_EventScript_FatMan",
"flag": "0" "flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 26,
"y": 14,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -177,6 +177,32 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "0x0", "script": "0x0",
"flag": "FLAG_HIDE_MAUVILLE_CITY_SCOTT" "flag": "FLAG_HIDE_MAUVILLE_CITY_SCOTT"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 24,
"y": 5,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 25,
"y": 14,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -250,6 +250,32 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_EventScript_BlackBelt", "script": "MossdeepCity_EventScript_BlackBelt",
"flag": "0" "flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 30,
"y": 16,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 39,
"y": 18,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -81,6 +81,32 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "OldaleTown_EventScript_Rival", "script": "OldaleTown_EventScript_Rival",
"flag": "FLAG_HIDE_OLDALE_TOWN_RIVAL" "flag": "FLAG_HIDE_OLDALE_TOWN_RIVAL"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 8,
"y": 16,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 16,
"y": 6,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -63,6 +63,19 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PacifidlogTown_EventScript_NinjaBoy", "script": "PacifidlogTown_EventScript_NinjaBoy",
"flag": "0" "flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 10,
"y": 15,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -141,6 +141,32 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "0x0", "script": "0x0",
"flag": "FLAG_HIDE_PETALBURG_CITY_SCOTT" "flag": "FLAG_HIDE_PETALBURG_CITY_SCOTT"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 22,
"y": 16,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 27,
"y": 12,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -89,6 +89,19 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route101_EventScript_Boy", "script": "Route101_EventScript_Boy",
"flag": "FLAG_HIDE_ROUTE_101_BOY" "flag": "FLAG_HIDE_ROUTE_101_BOY"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 8,
"y": -4,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -141,6 +141,19 @@
"trainer_sight_or_berry_tree_id": "3", "trainer_sight_or_berry_tree_id": "3",
"script": "Route102_EventScript_Allen", "script": "Route102_EventScript_Allen",
"flag": "0" "flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": -3,
"y": 2,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -211,6 +211,19 @@
"trainer_sight_or_berry_tree_id": "3", "trainer_sight_or_berry_tree_id": "3",
"script": "Route112_EventScript_Shayla", "script": "Route112_EventScript_Shayla",
"flag": "0" "flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": -3,
"y": 45,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -237,6 +237,32 @@
"trainer_sight_or_berry_tree_id": "6", "trainer_sight_or_berry_tree_id": "6",
"script": "Route113_EventScript_Coby", "script": "Route113_EventScript_Coby",
"flag": "0" "flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": -4,
"y": 7,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": -3,
"y": 15,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -583,6 +583,32 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "0x0", "script": "0x0",
"flag": "FLAG_HIDE_ROUTE_119_SCOTT" "flag": "FLAG_HIDE_ROUTE_119_SCOTT"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 47,
"y": 6,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 46,
"y": 14,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -237,6 +237,253 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "RustboroCity_EventScript_Boy1", "script": "RustboroCity_EventScript_Boy1",
"flag": "0" "flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 19,
"y": 37,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 22,
"y": 37,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 19,
"y": 30,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 22,
"y": 30,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 19,
"y": 23,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 22,
"y": 23,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 22,
"y": 44,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 19,
"y": 44,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 29,
"y": 48,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 14,
"y": 19,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 15,
"y": 17,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 9,
"y": 19,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 8,
"y": 17,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 19,
"y": 15,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 22,
"y": 15,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 14,
"y": 54,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 17,
"y": 54,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 18,
"y": 38,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 18,
"y": 45,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -484,6 +484,32 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "0x0", "script": "0x0",
"flag": "FLAG_HIDE_SLATEPORT_CITY_SCOTT" "flag": "FLAG_HIDE_SLATEPORT_CITY_SCOTT"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 21,
"y": 19,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 15,
"y": 26,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -247,6 +247,32 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SootopolisCity_EventScript_Wallace", "script": "SootopolisCity_EventScript_Wallace",
"flag": "FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE" "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 45,
"y": 31,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 19,
"y": 29,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -76,6 +76,32 @@
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "VerdanturfTown_EventScript_Camper", "script": "VerdanturfTown_EventScript_Camper",
"flag": "0" "flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 18,
"y": 3,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 14,
"y": 3,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
} }
], ],
"warp_events": [ "warp_events": [

View File

@ -1,14 +1,14 @@
JASC-PAL JASC-PAL
0100 0100
16 16
24 41 82 0 0 0
255 255 255 216 224 232
222 230 238 222 230 238
255 0 255 184 200 224
255 0 255 152 176 216
255 0 255 112 184 240
156 164 189 156 164 189
82 106 213 80 104 208
65 90 189 65 90 189
57 82 156 57 82 156
41 65 139 41 65 139
@ -16,4 +16,4 @@ JASC-PAL
139 164 222 139 164 222
106 131 213 106 131 213
82 106 213 82 106 213
115 197 164 96 168 232

View File

@ -0,0 +1,6 @@
# Color indices to set high bit
1
3
4
5
15

View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
0 0 0 232 0 128
0 0 0 232 228 216
0 0 0 222 230 238
0 0 0 224 214 184
0 0 0 216 200 152
0 0 0 244 226 171
0 0 0 156 164 189
0 0 0 80 104 208
0 0 0 65 90 189
0 0 0 57 82 156
0 0 0 41 65 139
0 0 0 172 197 230
0 0 0 139 164 222
0 0 0 106 131 213
0 0 0 82 106 213
0 0 0 221 205 143

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 231 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
24 41 82
255 255 255
222 230 238
189 205 230
156 180 222
131 131 139
98 98 123
65 74 106
255 0 255
115 189 246
98 172 238
115 189 246
98 164 222
82 139 197
74 115 172
115 197 164

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
24 41 82
255 255 255
222 230 238
189 205 230
156 180 222
131 131 139
98 98 123
65 74 106
41 49 90
115 189 246
98 172 238
255 189 131
238 148 115
222 106 98
205 65 82
115 197 164

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
24 41 82
180 255 131
131 197 98
57 139 49
57 82 0
222 148 115
106 90 90
164 98 90
65 57 49
255 197 148
222 106 98
205 65 82
164 213 197
115 197 164
65 180 131
24 164 106

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
24 41 82
255 255 255
213 213 213
189 189 189
164 164 164
131 131 139
255 0 255
255 0 255
65 49 65
238 213 205
222 180 164
189 148 139
156 115 115
131 90 90
98 65 82
115 197 164

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
24 41 82
255 255 255
222 230 238
255 0 255
255 0 255
255 0 255
255 0 255
82 106 213
65 90 189
57 82 164
49 74 148
172 197 230
139 164 222
106 131 213
82 106 213
115 197 164

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
24 41 82
255 255 255
222 230 238
189 205 230
156 180 222
131 131 139
98 98 123
65 74 106
41 49 90
115 189 246
98 172 238
238 230 164
222 205 131
213 180 106
205 156 82
115 197 164

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
24 41 82
255 255 255
230 230 238
205 205 222
197 180 222
123 131 156
98 98 123
65 74 106
41 49 90
205 205 148
172 148 90
222 213 238
197 180 189
164 156 164
131 106 172
115 197 164

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
24 41 82
213 106 255
255 156 0
205 205 222
148 139 164
65 74 106
255 255 222
222 205 148
172 164 106
139 115 74
238 57 32
197 82 16
197 148 57
230 222 57
0 213 156
65 164 115

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
24 41 82
230 230 205
222 222 180
189 189 156
164 156 131
131 131 90
115 115 123
65 74 106
41 49 90
115 189 246
98 172 238
189 230 222
148 213 197
98 172 180
98 148 123
115 197 164

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
24 41 82
246 180 131
230 139 98
189 106 82
123 98 65
246 230 172
222 180 115
197 131 65
205 222 172
131 172 123
238 246 230
189 197 246
123 148 246
82 123 180
90 115 98
65 74 106

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
24 41 82
222 205 148
189 172 82
156 131 32
115 106 49
148 148 156
98 98 123
65 74 106
41 49 90
238 246 246
148 205 255
222 222 189
90 148 156
156 197 90
115 139 65
115 197 164

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
24 41 82
255 255 255
222 230 238
189 205 230
156 180 222
255 189 139
246 115 74
156 82 49
189 246 197
148 230 115
8 139 65
90 197 238
98 164 172
255 230 156
230 197 65
65 74 106

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 197 164
255 213 180
255 197 148
222 148 115
123 65 65
57 74 123
41 57 98
24 41 82
16 32 57
222 230 238
255 197 90
189 156 90
255 98 90
197 65 65
255 255 255
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -1,7 +1,7 @@
JASC-PAL JASC-PAL
0100 0100
16 16
24 41 82 0 0 0
255 255 255 255 255 255
230 230 238 230 230 238
205 205 222 205 205 222
@ -16,4 +16,4 @@ JASC-PAL
197 180 189 197 180 189
164 156 164 164 156 164
131 106 172 131 106 172
115 197 164 112 192 160

View File

@ -0,0 +1,2 @@
# Color indices to set high bit
8

View File

@ -2,18 +2,18 @@ JASC-PAL
0100 0100
16 16
0 0 0 0 0 0
222 205 148
184 168 80
168 224 200
216 216 176
148 148 156
98 98 123
64 72 104
184 184 152
0 0 0
148 205 255
184 224 216
0 0 0 0 0 0
0 0 0 0 0 0
0 0 0 0 0 0
0 0 0 248 224 120
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,6 @@
# Color indices to set high bit
3
4
8
10
11

View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
115 197 164 0 32 0
255 213 180
255 197 148
222 148 115
123 65 65
57 74 123
41 57 98
24 41 82
16 32 57
222 230 238
255 197 90
189 156 90
255 98 90
197 65 65
255 255 255 255 255 255
0 0 0 230 230 238
205 205 222
197 180 222
123 131 156
98 98 123
65 74 106
255 231 138
205 205 148
172 148 90
222 213 238
197 180 189
164 156 164
131 106 172
112 192 160

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
24 41 82 0 197 0
255 255 255 246 197 123
222 230 238 238 156 90
189 205 230 205 115 41
156 180 222 164 90 49
131 131 139 131 131 139
98 98 123 98 98 123
65 74 106 65 74 106
41 49 90 41 49 90
115 189 246 224 226 171
98 172 238 216 200 152
255 189 131 255 255 238
238 148 115 222 222 197
222 106 98 197 197 164
205 65 82 164 172 123
115 197 164 255 255 115

View File

@ -1,7 +1,7 @@
JASC-PAL JASC-PAL
0100 0100
16 16
24 41 82 0 0 0
246 197 123 246 197 123
238 156 90 238 156 90
205 115 41 205 115 41

View File

@ -0,0 +1,3 @@
# Color indices to set high bit
9
10

View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
115 197 164 0 192 0
255 255 255 222 230 164
222 230 238 180 197 115
189 205 230 148 156 82
156 180 222 123 131 65
131 131 139 131 131 139
98 98 123 98 98 123
65 74 106 65 74 106
189 189 131 88 168 168
115 189 246 221 205 143
98 172 238 244 226 171
115 189 246 255 205 82
98 164 222 230 156 49
82 139 197 222 123 32
74 115 172 156 98 41
115 197 164 128 192 216

View File

@ -1,7 +1,7 @@
JASC-PAL JASC-PAL
0100 0100
16 16
24 41 82 0 0 0
222 230 164 222 230 164
180 197 115 180 197 115
148 156 82 148 156 82
@ -9,11 +9,11 @@ JASC-PAL
131 131 139 131 131 139
98 98 123 98 98 123
65 74 106 65 74 106
41 49 90 88 168 168
90 172 172 90 172 172
131 197 222 131 197 222
255 205 82 255 205 82
230 156 49 230 156 49
222 123 32 222 123 32
156 98 41 156 98 41
115 197 164 128 192 216

View File

@ -0,0 +1,3 @@
# Color indices to set high bit
9
10

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

View File

@ -1,7 +1,7 @@
JASC-PAL JASC-PAL
0100 0100
16 16
255 255 255 176 184 200
255 255 255 255 255 255
246 238 189 246 238 189
230 213 172 230 213 172
@ -16,4 +16,4 @@ JASC-PAL
0 0 0 0 0 0
172 180 197 172 180 197
123 123 123 123 123 123
115 197 164 176 184 200

View File

@ -0,0 +1,6 @@
# Color indices to set high bit
0
8
9
11
15

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
0 0 0 224 40 0
65 74 106 64 72 104
197 205 0 192 200 0
230 238 238 224 232 232
255 255 255 248 248 248
255 115 65 248 112 64
230 115 65 224 112 64
180 98 90 176 96 88
164 82 82 160 80 80
205 49 0 200 48 0
148 49 0 144 48 0
246 24 24 240 24 24
246 148 0 240 144 0
148 164 65 144 160 64
106 123 139 104 120 136
222 222 0 224 40 0

View File

@ -0,0 +1,7 @@
# Color indices to set high bit
0
9
10
11
12
15

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

@ -2,17 +2,17 @@ JASC-PAL
0100 0100
16 16
0 0 0 0 0 0
0 0 0 168 184 240
0 0 0 112 144 208
0 0 0 115 148 213
0 0 0 90 115 189
0 0 0 131 131 139
0 0 0 216 208 216
0 0 0 65 74 106
0 0 0 222 213 222
0 0 0 112 144 208
0 0 0 131 197 213
0 0 0 248 248 248
0 0 0 0 0 0
0 0 0 0 0 0
0 0 0 0 0 0

View File

@ -0,0 +1,6 @@
# Color indices to set high bit
1
2
6
9
10

View File

@ -1,19 +1,19 @@
JASC-PAL JASC-PAL
0100 0100
16 16
115 197 164 24 200 0
255 213 180 244 226 171
255 197 148 221 205 143
222 148 115 115 148 213
123 65 65 90 115 189
57 74 123 131 131 139
41 57 98 232 228 216
24 41 82 65 74 106
16 32 57 222 213 222
222 230 238 221 205 143
255 197 90 244 226 171
189 156 90 248 248 248
255 98 90 0 0 0
197 65 65 0 0 0
255 255 255 0 0 0
0 0 0 0 0 0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

@ -9,11 +9,11 @@ JASC-PAL
131 131 139 131 131 139
98 98 123 98 98 123
65 74 106 65 74 106
41 49 90 40 48 88
213 213 213 213 213 213
164 164 172 164 164 172
230 197 246 230 197 246
213 139 222 213 139 222
197 115 164 197 115 164
148 98 106 148 98 106
172 205 230 168 200 224

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