Skip to content

Tarc2 #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DizzyEggg merged 4 commits into from
Oct 19, 2025
Merged

Tarc2 #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af4a7ad
misc bugfixes
unfoldingdev Oct 3, 2025
6f71362
merge resolve
unfoldingdev Oct 17, 2025
9c48362
Merge branch 'tarc2' of https://github.com/DizzyEggg/pokeemerald into…
unfoldingdev Oct 17, 2025
ac032db
several fixes and minor dialogue rewrites, documented in todolist
unfoldingdev Oct 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/layouts/MansionFloor1Treasure4/map.bin
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222228::;:9::<22222222@+£-=+¤-D22222222@345E3žŸD22222222@ÙÒÒ¹2222D22222222@ 2à2á2á2á2â2¨2D22222222P 2è2é22ê2 2D22222222P 2è2222ê2 2D22222222PÁè22Ú2ê2 2D22222222P 2ð2ñ2ñ2ñ2ò2 2D22222222P™2 2 2 2 2ª2 2D22222222XYYYYYYY\22222222222
2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222228::;:9::<22222222@+£-=+¤-D22222222@345E3žŸD22222222@ÙÒÒ¹2222D22222222@ 2à2á2á2á2â2¨2D22222222P 2è2é22ê2 2D22222222P 2è2222ê2 2D22222222PÁè22Ú22ê2 2D22222222P 2ð2ñ2ñ2ñ2ò2 2D22222222P™2 2 2 2 2ª2 2D22222222XYYYYYYY\22222222222
8 changes: 4 additions & 4 deletions data/maps/MansionFloor2Hallway2/map.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "EventScript_DoMansionBattle",
"flag": "FLAG_H1_ENEMYA"
"flag": "FLAG_H2_ENEMYA"
},
{
"graphics_id": "OBJ_EVENT_GFX_SPECIES(GURDURR)",
Expand All @@ -38,7 +38,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "EventScript_DoMansionBattle",
"flag": "FLAG_H1_ENEMYB"
"flag": "FLAG_H2_ENEMYB"
},
{
"graphics_id": "OBJ_EVENT_GFX_SPECIES(LAMPENT)",
Expand All @@ -51,7 +51,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "EventScript_DoMansionBattle",
"flag": "FLAG_H1_ENEMYC"
"flag": "FLAG_H2_ENEMYC"
},
{
"graphics_id": "OBJ_EVENT_GFX_SPECIES(COMFEY)",
Expand All @@ -64,7 +64,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "EventScript_DoMansionBattle",
"flag": "FLAG_H1_ENEMYD"
"flag": "FLAG_H2_ENEMYD"
}
],
"warp_events": [
Expand Down
8 changes: 4 additions & 4 deletions data/maps/MansionFloor3Hallway2/map.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
"trainer_sight_or_berry_tree_id": "1",
"script": "EventScript_DoMansionBattle",
"flag": "FLAG_H1_ENEMYA"
"flag": "FLAG_H2_ENEMYA"
},
{
"graphics_id": "OBJ_EVENT_GFX_SPECIES(CONKELDURR)",
Expand All @@ -38,7 +38,7 @@
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
"trainer_sight_or_berry_tree_id": "1",
"script": "EventScript_DoMansionBattle",
"flag": "FLAG_H1_ENEMYB"
"flag": "FLAG_H2_ENEMYB"
},
{
"graphics_id": "OBJ_EVENT_GFX_SPECIES(ROTOM)",
Expand All @@ -51,7 +51,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "EventScript_DoMansionBattle",
"flag": "FLAG_H1_ENEMYC"
"flag": "FLAG_H2_ENEMYC"
},
{
"graphics_id": "OBJ_EVENT_GFX_SPECIES(CONKELDURR)",
Expand All @@ -64,7 +64,7 @@
"trainer_type": "TRAINER_TYPE_SEE_ALL_DIRECTIONS",
"trainer_sight_or_berry_tree_id": "1",
"script": "EventScript_DoMansionBattle",
"flag": "FLAG_H1_ENEMYD"
"flag": "FLAG_H2_ENEMYD"
}
],
"warp_events": [
Expand Down
2 changes: 1 addition & 1 deletion data/maps/MansionFloor3RoomFinal/map.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"y": 19,
"elevation": 0,
"dest_map": "MAP_MANSION_FLOOR3ROOM_BOSS",
"dest_warp_id": "0"
"dest_warp_id": "1"
}
],
"coord_events": [
Expand Down
50 changes: 32 additions & 18 deletions data/maps/MansionFloor3RoomFinal/scripts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ sText_CradilyNickname:
MansionFloor3RoomFinal_Text_Craftily1:
.string "I cannot bear to look at you. Everyone\n"
.string "else has forgotten.\p"
.string "Just go back the way you came, jump\n"
.string "into the Fountain, and try to forget.\p"
.string "Please.$"
.string "Just go back the way you came.\n"
.string "The window is just outside this door.\p"
.string "Please. Please just leave me alone.$"


MansionFloor3RoomFinal_EventScript_Trigger2::
Expand All @@ -37,7 +37,6 @@ MansionFloor3RoomFinal_EventScript_Trigger2::
applymovement LOCALID_CRADILY, MansionFloor1RoomBoss_LookDown
delay 100
msgbox_portrait MansionFloor3RoomFinal_Text_Craftily4, FIELD_PIC_CRADILY_DETERMINED

setflag FLAG_BATTLE_START_LEECH_SEED
@settotemboost B_POSITION_OPPONENT_LEFT, 0, 1, 0, 0, 1
setwildbattle SPECIES_CRADILY, 96, ITEM_LIFE_ORB
Expand Down Expand Up @@ -139,7 +138,7 @@ MansionFloor3RoomFinal_Text_Craftily4:

MansionFloor3RoomFinal_Text_CraftilyLose01:
.string "Craftily: Well… well fought. This cursed\n"
.string "body of mine… is truly broken.\p"
.string "body of mine… has finally given in.\p"
.string "…what?\p"
.string "You still want to hear about the past?\p"
.string "In my final moments, you want me to \n"
Expand Down Expand Up @@ -228,10 +227,10 @@ MansionFloor3RoomFinal_Text_CraftilyLose07:
@other Pokemon shift
MansionFloor3RoomFinal_Text_CraftilyLose08:
.string "Our joy knew no bounds.\p"
.string "Eternal life was be our ultimate reward\n"
.string "for the decades of fruitless search.\p"
.string "Eternal life was to be our ultimate\n"
.string "reward for all these fruitless years.\p"
.string "We all gathered around the Fountain to\n"
.string "drink and be restored. \p"
.string "drink and be restored.\p"
.string "I watched as your bodies shifted and\n"
.string "changed into your earlier forms,\l"
.string "and we laughed and danced and cried.$"
Expand Down Expand Up @@ -292,7 +291,7 @@ MansionFloor3RoomFinal_Text_CraftilyLose14:
.string "But the damage was done.\p"
.string "Humans don’t have eggs.\p"
.string "What was left of Ada was a shriveled\n"
.string "pink thing that wasn’t moving.\p"
.string "pink thing. It… quickly became still.\p"
.string "It couldn’t survive on its own.\p"
.string "I… I had killed her.$"

Expand Down Expand Up @@ -339,12 +338,15 @@ MansionFloor3RoomFinal_Text_CraftilyLose19:
.string "I don’t regret talking about the past.\p"
.string "It… felt like it was a long time coming.\p"
.string "And now I’ve given you the choice,\n"
.string "rather than make it for you. \p"
.string "rather than make it for you.\p"
.string "You don’t have to carry the burdens\n"
.string "I’ve given you.\p"
.string "You can remember, or you can choose to\n"
.string "jump into the Fountain.\p"
.string "But, that’s enough from me.\n"
.string "You don’t have to feel the pain of Ada's\n"
.string "death, or guilt or discomfort at mine.\p"
.string "You have the choice I never had. You\n"
.string "can choose to jump into the Fountain.\p"
.string "…\p"
.string "That's… that’s enough from me.\n"
.string "Leave me, so I may die in peace.\p"
.string "I’m sorry for the pain I’ve caused.\n"
.string "Goodbye, old friends.$"
Expand Down Expand Up @@ -373,8 +375,8 @@ MansionFloor3RoomFinal_Text_SecretEnding2:
.string "The water of the Fountain…\n"
.string "It's not draining away.\p"
.string "Ah, the memories are releasing me.\p"
.string "My cursed body… have you taken my\n"
.string "curse upon yourself?$"
.string "My cursed body… how have you\n"
.string "defeated my curse?$"

MansionFloor3RoomFinal_Text_SecretEnding3:
.string "You've saved me.\p"
Expand All @@ -400,10 +402,22 @@ MansionFloor3RoomFinal_BadEnding::
delay 80
msgbox MansionFloor3RoomFinal_Text_BadEnding2, MSGBOX_NPC
closemessage
delay 80
delay 140
msgbox MansionFloor3RoomFinal_Text_BadEnding3, MSGBOX_NPC
closemessage
delay 40
delay 100
playse SE_M_DIVE
waitse
delay 80
playse SE_M_DIVE
waitse
delay 20
playse SE_M_DIVE
waitse
delay 20
playse SE_M_DIVE
waitse
delay 50
playse SE_M_DIVE
waitse
delay 80
Expand Down Expand Up @@ -462,7 +476,7 @@ MansionFloor3RoomFinal_Text_BadEnding2:
.string "Go on.$"

MansionFloor3RoomFinal_Text_BadEnding3:
.string "Dali: Go.$"
.string "Dali: Go. Do it.$"



Expand Down
Binary file modified data/tilesets/secondary/dojo_interior/metatile_attributes.bin
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/data/moves_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5060,7 +5060,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.power = 20,
.type = TYPE_WATER,
.accuracy = 95,
.pp = 30,
.pp = 20,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.category = DAMAGE_CATEGORY_SPECIAL,
Expand Down Expand Up @@ -19298,7 +19298,7 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_ALL] =
.power = 40,
.type = TYPE_WATER,
.accuracy = 100,
.pp = 25,
.pp = 15,
.target = MOVE_TARGET_SELECTED,
.priority = 0,
.category = DAMAGE_CATEGORY_SPECIAL,
Expand Down
21 changes: 7 additions & 14 deletions src/data/region_map/region_map_sections.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,8 +689,7 @@
"name": "SECRET BASE"
},
{
"id": "MAPSEC_DYNAMIC",
"name": ""
"id": "MAPSEC_DYNAMIC"
},
{
"id": "MAPSEC_PALLET_TOWN",
Expand Down Expand Up @@ -738,13 +737,11 @@
},
{
"id": "MAPSEC_ROUTE_4_POKECENTER",
"name": "ROUTE 4",
"name_clone": true
"name": "ROUTE 4"
},
{
"id": "MAPSEC_ROUTE_10_POKECENTER",
"name": "ROUTE 10",
"name_clone": true
"name": "ROUTE 10"
},
{
"id": "MAPSEC_ROUTE_1",
Expand Down Expand Up @@ -864,17 +861,15 @@
},
{
"id": "MAPSEC_UNDERGROUND_PATH_2",
"name": "UNDERGROUND PATH",
"name_clone": true
"name": "UNDERGROUND PATH"
},
{
"id": "MAPSEC_DIGLETTS_CAVE",
"name": "DIGLETT'S CAVE"
},
{
"id": "MAPSEC_KANTO_VICTORY_ROAD",
"name": "VICTORY ROAD",
"name_clone": true
"name": "VICTORY ROAD"
},
{
"id": "MAPSEC_ROCKET_HIDEOUT",
Expand All @@ -890,8 +885,7 @@
},
{
"id": "MAPSEC_KANTO_SAFARI_ZONE",
"name": "SAFARI ZONE",
"name_clone": true
"name": "SAFARI ZONE"
},
{
"id": "MAPSEC_POKEMON_LEAGUE",
Expand Down Expand Up @@ -1063,8 +1057,7 @@
},
{
"id": "MAPSEC_TRAINER_TOWER_2",
"name": "TRAINER TOWER",
"name_clone": true
"name": "TRAINER TOWER"
},
{
"id": "MAPSEC_DOTTED_HOLE",
Expand Down
17 changes: 8 additions & 9 deletions tools/learnset_helpers/porymoves_files/b2w2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,8 +833,8 @@
],
"PreEvoMoves": [],
"TMMoves": [
"MOVE_TOXIC",
"MOVE_HAIL",
"MOVE_FIRE_FANG",
"MOVE_HELPING_HAND",
"MOVE_HIDDEN_POWER",
"MOVE_ICE_BEAM",
"MOVE_BLIZZARD",
Expand Down Expand Up @@ -28563,7 +28563,7 @@
],
"PreEvoMoves": [],
"TMMoves": [
"MOVE_ROAR",
"MOVE_FIRE_FANG",
"MOVE_TOXIC",
"MOVE_HIDDEN_POWER",
"MOVE_SUNNY_DAY",
Expand Down Expand Up @@ -28607,7 +28607,6 @@
"MOVE_IRON_TAIL",
"MOVE_KNOCK_OFF",
"MOVE_LAST_RESORT",
"MOVE_SEED_BOMB",
"MOVE_SLEEP_TALK",
"MOVE_SNORE",
"MOVE_STEALTH_ROCK",
Expand Down Expand Up @@ -41008,8 +41007,8 @@
],
"PreEvoMoves": [],
"TMMoves": [
"MOVE_TOXIC",
"MOVE_HIDDEN_POWER",
"MOVE_HELPING_HAND",
"MOVE_SEED_BOMB",
"MOVE_SUNNY_DAY",
"MOVE_ICE_BEAM",
"MOVE_PROTECT",
Expand Down Expand Up @@ -66516,9 +66515,9 @@
],
"PreEvoMoves": [],
"TMMoves": [
"MOVE_TOXIC",
"MOVE_VENOSHOCK",
"MOVE_HIDDEN_POWER",
"MOVE_FIRE_FANG",
"MOVE_SEED_BOMB",
"MOVE_KNOCK_OFF",
"MOVE_SUNNY_DAY",
"MOVE_PROTECT",
"MOVE_FRUSTRATION",
Expand Down
Loading