Skip to content

Commit 7cb7b6e

Browse files
TheSylphIsInTheSylphIsIn
committed
Debugging commit
Did a test playthrough and fixed all the issues I found. Probably last dev commit.
1 parent bb86ccf commit 7cb7b6e

File tree

20 files changed

+99
-47
lines changed

20 files changed

+99
-47
lines changed

‎data/layouts/LittlerootTown/map.bin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
����������500������������������00����������000000000�1000000����0000000000000000��0000��2000000001�2��000�10�01100�10001�!1!110000011�*1000000(1!1!1�*10000�2(1)1*1�2�00000�2 1�*1�20000��20��400004�(1*1��000000000�1000�100000000000000000000000�100000000000�1000000000000000�011110�00000000000011!1!1�!11000�100000000(1)1�!1!1�"10000�1�10000000�2� 1!1�!1*1�0000000�1�1000��(1)1)1*1�00000000���1�100000000�10000�1�1����00000000000000�������1�1�1�1�1�1�1�1�1�1�1�1�1�1����
1+
����������500������������������00����������000000000�1000000����0000000000000000��0000��20000000011�2�000�10�01100�10001�!1110000011�*1000000(1!1!1�*10000�2(1)1*1�2�00000�2 1�*1�20000��20��400004�(1*1��000000000�1000�100000000000000000000000�100000000000�1000000000000000�011110�00000000000011!1!1�!11000�100000000(1)1�!1!1�"10000�1�10000000�2� 1!1�!1*1�0000000�1�1000��(1)1)1*1�00000000���1�100000000�10000�1�1����00000000000000�������1�1�1�1�1�1�1�1�1�1�1�1�1�1����

‎data/layouts/RustboroCity/map.bin

0 Bytes
Binary file not shown.

‎data/layouts/RustboroCity_Flat1_1F/map.bin

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8()*:888:8x88:H0 2B@@@B@�VWBP3+3+3+3+3+3+3+3+3+3�3^3_3+3+3D3,3,3,3,3,3,3{3|3|3|3|3}3+3h7i7,3,3,3,3,3�3�2H6I6�2�3+3p7q7E3,3,3,3,3�3>2P6Q6�2�3F3G3,3,3,3,3,3,3�3�3�3�3�3�3N7O7,3,3,3,3LM,3,3,3,3,3,3
1+
8888:888:8x88:H@@@B@@@B@�VWBP3+3+3+3+3+3+3+3+3+3�3^3_3+3+3D3,3,3,3,3,3,3{3|3|3|3|3}3+3h7i7,3,3,3,3,3�3�2H6I6�2�3+3p7q7E3,3,3,3,3�3>2P6Q6�2�3F3G3,3,3,3,3,3,3�3�3�3�3�3�3N7O7,3,3,3,3LM,3,3,3,3,3,3

‎data/maps/EndlessPlainRustboro/map.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"movement_range_y": 0,
3838
"trainer_type": "TRAINER_TYPE_NONE",
3939
"trainer_sight_or_berry_tree_id": "0",
40-
"script": "EndlessPlainRustboro_EventScript_Larry",
40+
"script": "EndlessPlainRustboro_EventScript_Barry",
4141
"flag": "0"
4242
},
4343
{

‎data/maps/EndlessPlainRustboro/scripts.inc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,18 @@ EndlessPlainRustboro_LarryShop:
102102
.2byte ITEM_NONE
103103
release
104104
end
105+
106+
EndlessPlainRustboro_EventScript_Barry::
107+
msgbox EndlessPlainRustboro_Text_Barry, MSGBOX_NPC
108+
end
109+
110+
EndlessPlainRustboro_Text_Barry:
111+
.string "I'm not LARRY the LOOTER.\n"
112+
.string "I'm his little brother, BARRY.\p"
113+
.string "He stepped outside for some fresh\n"
114+
.string "air.\p"
115+
.string "If you wanna buy his items, go look\n"
116+
.string "for a gap in the fence on the left.$"
105117

106118
EndlessPlainRustboro_EventScript_Girl::
107119
msgbox EndlessPlainRustboro_Text_Girl, MSGBOX_NPC

‎data/maps/OldaleTown/scripts.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ OldaleTown_OnFrameScript::
2929
applymovement LOCALID_BIRCH, OldaleTown_Movement_BirchWalkOffscreen
3030
waitmovement 0
3131
removeobject LOCALID_BIRCH
32+
setrespawn HEAL_LOCATION_OLDALE_TOWN
3233
setvar VAR_ROUTE101_STATE, 4
3334
releaseall
3435
end

‎data/maps/PetalburgCity/map.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@
218218
"y": 8,
219219
"elevation": 0,
220220
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
221-
"script": "NULL"
221+
"script": "PetalburgCity_EventScript_GymDoor"
222222
}
223223
]
224224
}

‎data/maps/PetalburgCity/scripts.inc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,3 +156,13 @@ PetalburgCity_Text_CitySign:
156156

157157
PetalburgCity_Text_WallyHouseSign:
158158
.string "WALLY'S HOUSE$"
159+
160+
PetalburgCity_EventScript_GymDoor::
161+
msgbox PetalburgCity_Text_BlockedDoor, MSGBOX_SIGN
162+
end
163+
164+
PetalburgCity_Text_BlockedDoor:
165+
.string "There's a mess of skulls and stuff\n"
166+
.string "wedged behind the door.\p"
167+
.string "Even if you could force your way\n"
168+
.string "in, you'd rather not.$"

‎data/maps/Route102/scripts.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Route102_Text_LootingTutorial:
7777
.string "{PLAYER}: But that's disgusting.\p"
7878
.string "It's the apocalypse, weenie. You\n"
7979
.string "gotta do what you can to survive.\l"
80-
.string "besides, it's mostly dust anyway.\p"
80+
.string "Besides, it's mostly dust anyway.\p"
8181
.string "{PLAYER}: Ugh, fine. Here goes…$"
8282

8383
Route102_EventScript_Rick::

‎data/maps/Route104/map.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"x": 12,
4949
"y": 52,
5050
"elevation": 3,
51-
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
51+
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
5252
"movement_range_x": 1,
5353
"movement_range_y": 1,
5454
"trainer_type": "TRAINER_TYPE_NONE",
@@ -456,7 +456,7 @@
456456
"movement_range_y": 0,
457457
"trainer_type": "TRAINER_TYPE_NORMAL",
458458
"trainer_sight_or_berry_tree_id": "0",
459-
"script": "DewfordTown_EventScript_OldRodFisherman",
459+
"script": "Route104_EventScript_Fisherman",
460460
"flag": "0"
461461
}
462462
],

‎data/maps/Route104/scripts.inc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,14 @@ Route104_EventScript_Darian::
840840
Route104_EventScript_Briney::
841841
msgbox Route104_Text_Briney, MSGBOX_NPC
842842
end
843-
843+
844+
Route104_EventScript_Fisherman::
845+
msgbox Route104_Text_Fisherman, MSGBOX_SIGN
846+
end
847+
848+
Route104_Text_Fisherman:
849+
.string "He's sound asleep at his rod.\p"
850+
.string "Let's leave him alone.$"
844851
Route104_Text_Briney:
845852
.string "Arrr! I be a pirate. Me name be\n"
846853
.string "CAPTAIN BRINEYBEARD!\p"

‎data/maps/RustboroCity/map.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,19 @@
315315
"trainer_sight_or_berry_tree_id": "0",
316316
"script": "RustboroCity_EventScript_IdleDemon1",
317317
"flag": "0"
318+
},
319+
{
320+
"graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M",
321+
"x": 3,
322+
"y": 38,
323+
"elevation": 0,
324+
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
325+
"movement_range_x": 0,
326+
"movement_range_y": 0,
327+
"trainer_type": "TRAINER_TYPE_NONE",
328+
"trainer_sight_or_berry_tree_id": "0",
329+
"script": "EndlessPlainRustboro_EventScript_Larry",
330+
"flag": "0"
318331
}
319332
],
320333
"warp_events": [

‎data/maps/RustboroCity/scripts.inc

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -555,19 +555,19 @@ RustboroCity_Movement_GleisBattleWalkAway:
555555
RustboroCity_EventScript_ZombiePitFirstTry::
556556
lockall
557557
msgbox RustboroCity_Text_PitDemonIdle, MSGBOX_DEFAULT
558-
goto_if_set FLAG_STARTED_ZOMBIE_PIT_EVENT, RustboroCity_EventScript_ZombiePitSecondTry
559-
trainerbattle_single TRAINER_JOEY, RustboroCity_Text_PitDemonFirstTryIntro, RustboroCity_Text_PitDemonDefeat, RustboroCity_EventScript_ZombiePitMain
560-
end
561-
562-
RustboroCity_EventScript_ZombiePitSecondTry::
563-
setflag FLAG_TEMP_1
564558
addobject LOCALID_GAUNTLET_4
565559
addobject LOCALID_GAUNTLET_5
566560
setobjectxy LOCALID_GAUNTLET_1, 8, 31
567561
setobjectxy LOCALID_GAUNTLET_2, 7, 31
568562
setobjectxy LOCALID_GAUNTLET_3, 9, 31
569563
setobjectxy LOCALID_GAUNTLET_4, 7, 32
570564
setobjectxy LOCALID_GAUNTLET_5, 9, 32
565+
goto_if_set FLAG_STARTED_ZOMBIE_PIT_EVENT, RustboroCity_EventScript_ZombiePitSecondTry
566+
trainerbattle_single TRAINER_JOEY, RustboroCity_Text_PitDemonFirstTryIntro, RustboroCity_Text_PitDemonDefeat, RustboroCity_EventScript_ZombiePitMain
567+
end
568+
569+
RustboroCity_EventScript_ZombiePitSecondTry::
570+
setflag FLAG_TEMP_1
571571
trainerbattle_single TRAINER_JOEY, RustboroCity_Text_PitDemonSecondTryIntro, RustboroCity_Text_PitDemonDefeat, RustboroCity_EventScript_ZombiePitMain
572572
end
573573

@@ -642,14 +642,15 @@ RustboroCity_EventScript_ZombiePitMain::
642642
addobject LOCALID_HIKER
643643
setobjectxy LOCALID_ROXANNE, 8, 32
644644
setobjectxy LOCALID_HIKER, 9, 32
645-
applymovement LOCALID_ROXANNE, Common_Movement_FaceUp
646-
applymovement LOCALID_HIKER, Common_Movement_FaceUp
647645
trainerbattle_no_intro TRAINER_JERRY_5, RustboroCity_Text_PitZombieDefeat
648-
lockall
649646
call Common_ZombieCrumble
650647
setvar VAR_TEMP_LOOT_ITEM, ITEM_DURIN_BERRY
651648
call_if_unset FLAG_TEMP_1, Common_LootCorpse
652649
closemessage
650+
applymovement LOCALID_ROXANNE, Common_Movement_FaceUp
651+
applymovement LOCALID_HIKER, Common_Movement_FaceUp
652+
waitmovement 0
653+
lockall
653654
delay 60
654655
msgbox RustboroCity_Text_LastZombieBeaten, MSGBOX_DEFAULT
655656
closemessage

‎data/maps/RustboroCity_Flat1_1F/map.json

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"allow_running": false,
1313
"show_map_name": false,
1414
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
15-
"connections": null,
15+
"connections": 0,
1616
"object_events": [
1717
{
18-
"graphics_id": "OBJ_EVENT_GFX_MAN_3",
18+
"graphics_id": "OBJ_EVENT_GFX_HIKER_SHIRTLESS",
1919
"x": 9,
2020
"y": 4,
2121
"elevation": 3,
@@ -28,7 +28,7 @@
2828
"flag": "0"
2929
},
3030
{
31-
"graphics_id": "OBJ_EVENT_GFX_WOMAN_5",
31+
"graphics_id": "OBJ_EVENT_GFX_ROXANNE",
3232
"x": 12,
3333
"y": 4,
3434
"elevation": 3,
@@ -55,15 +55,12 @@
5555
"elevation": 0,
5656
"dest_map": "MAP_RUSTBORO_CITY",
5757
"dest_warp_id": "1"
58-
},
59-
{
60-
"x": 2,
61-
"y": 1,
62-
"elevation": 0,
63-
"dest_map": "MAP_RUSTBORO_CITY_FLAT1_2F",
64-
"dest_warp_id": "0"
6558
}
6659
],
67-
"coord_events": [],
68-
"bg_events": []
60+
"coord_events": [
61+
62+
],
63+
"bg_events": [
64+
65+
]
6966
}

‎data/maps/RusturfTunnel/scripts.inc

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ RusturfTunnel_OnFrameScript::
2727
msgbox RusturfTunnel_Text_DemoOver, MSGBOX_DEFAULT
2828
closemessage
2929
setvar VAR_RUSTURF_TUNNEL_STATE, 3
30+
setrespawn HEAL_LOCATION_RUSTBORO_CITY
3031
release
3132
end
3233

@@ -221,21 +222,26 @@ RusturfTunnel_EventScript_TaoScript:
221222

222223
RusturfTunnel_EventScript_FaceleechScript:
223224
msgbox RusturfTunnel_Text_AskedFaceleech, MSGBOX_DEFAULT
224-
goto_if_set FLAG_BORROWED_FACELEECH, RusturfTunnel_EventScript_End
225+
goto_if_set FLAG_TEMP_2, RusturfTunnel_EventScript_End
225226
getpartysize
226227
goto_if_eq VAR_RESULT, PARTY_SIZE, RusturfTunnel_EventScript_End
227228
msgbox RusturfTunnel_Text_BorrowFaceleech, MSGBOX_DEFAULT
229+
closemessage
230+
setflag FLAG_BORROWED_FACELEECH
231+
setflag FLAG_TEMP_2
232+
release
233+
applymovement LOCALID_GLEIS, Common_Movement_FaceOriginalDirection
234+
end
235+
236+
RusturfTunnel_EventScript_GiveFaceleech:
228237
playfanfare MUS_OBTAIN_ITEM
229238
message RusturfTunnel_Text_BorrowedFaceleech
230239
waitfanfare
231240
waitbuttonpress
232241
givemon SPECIES_FACELEECH, 20, 0, 0, SPECIES_FACELEECH, 1
233242
msgbox RusturfTunnel_Text_FaceleechEnd, MSGBOX_DEFAULT
234243
closemessage
235-
setflag FLAG_BORROWED_FACELEECH
236-
release
237-
applymovement LOCALID_GLEIS, Common_Movement_FaceOriginalDirection
238-
end
244+
return
239245

240246
RusturfTunnel_EventScript_End:
241247
release
@@ -333,7 +339,9 @@ RusturfTunnel_Text_BorrowFaceleech:
333339
.string "It's our best shot at success, isn't\n"
334340
.string "it?\p"
335341
.string "{COLOR RED}{SHADOW LIGHT_RED}GLEIS: … … … … …\n"
336-
.string "I suppose you're right. Fine, here.$"
342+
.string "I suppose you're right. Fine.\p"
343+
.string "When I send you through the portal,\n"
344+
.string "I'll send FACELEECH with you.$"
337345

338346
RusturfTunnel_Text_BorrowedFaceleech:
339347
.string "{PLAYER} borrowed the FACELEECH\n"
@@ -370,7 +378,9 @@ RusturfTunnel_EventScript_Elise::
370378
msgbox RusturfTunnel_Text_PostFlashback, MSGBOX_DEFAULT
371379
closemessage
372380
setrespawn HEAL_LOCATION_ACTUAL_HELL_LANDING
381+
call_if_set FLAG_TEMP_2, RusturfTunnel_EventScript_GiveFaceleech
373382
playse SE_WARP_IN
383+
waitse
374384
warp MAP_ACTUAL_HELL_LANDING, 4, 4
375385
waitstate
376386
release
@@ -390,8 +400,8 @@ RusturfTunnel_Text_PostFlashback:
390400
.string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}{PLAYER}: Yeah. I just had a flashback.\n"
391401
.string "They're painful, but I remember who\l"
392402
.string "this girl is now.\p"
393-
.string "She's the CUT MAN's daughter. She\n"
394-
.string "was friends with MAY.\p"
403+
.string "She's the CUT MAN's daughter, ELISE.\n"
404+
.string "She was friends with MAY.\p"
395405
.string "{COLOR RED}{SHADOW LIGHT_RED}GLEIS: Well, that's quite nice. Now\n"
396406
.string "are you ready to close this portal?\p"
397407
.string "{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}{PLAYER}: Yeah, yeah. Send me in.$"

‎data/scripts/movement.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ Common_ZombieCrumble::
145145

146146
Common_LootCorpse::
147147
message Common_Text_PlayerLooted
148+
waitmessage
148149
waitbuttonpress
149150
finditem VAR_TEMP_LOOT_ITEM
150151
return

‎data/text/trainers.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ Route104_Text_WinstonDefeat:
298298
Route104_Text_WinstonPostBattle:
299299
.string "I'm lost, tired, and now my POKéMON\n"
300300
.string "is fainted…\p"
301-
.string "Maybe I can make it to OLDANE in\n"
301+
.string "Maybe I can make it to OLDALE in\n"
302302
.string "one piece if I run my heart out.$"
303303

304304
Route104_Text_WinstonRegister1:

‎graphics/trainers/front_pics/alicia.png

3 Bytes
Loading

‎src/data/pokemon/level_up_learnsets.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1764,7 +1764,7 @@ static const u16 sElectabuzzLevelUpLearnset[] = {
17641764

17651765
static const u16 sMagmarLevelUpLearnset[] = {
17661766
LEVEL_UP_MOVE( 1, MOVE_EMBER),
1767-
LEVEL_UP_MOVE( 6, MOVE_SUNNY_DAY),
1767+
LEVEL_UP_MOVE( 6, MOVE_LEER),
17681768
LEVEL_UP_MOVE(12, MOVE_VIRAL_COUGH),
17691769
LEVEL_UP_MOVE(18, MOVE_FIRE_PUNCH),
17701770
LEVEL_UP_MOVE(24, MOVE_CONFUSE_RAY),

‎src/data/trainer_parties.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3700,7 +3700,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jerry5[] = {
37003700
static const struct TrainerMonNoItemDefaultMoves sParty_Karen1[] = {
37013701
{
37023702
.iv = 10,
3703-
.lvl = 19,
3703+
.lvl = 18,
37043704
.species = SPECIES_ANORITH,
37053705
},
37063706
{
@@ -3752,22 +3752,22 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Karen3[] = {
37523752
static const struct TrainerMonNoItemDefaultMoves sParty_Karen4[] = {
37533753
{
37543754
.iv = 10,
3755-
.lvl = 20,
3755+
.lvl = 19,
37563756
.species = SPECIES_ANORITH,
37573757
},
37583758
{
37593759
.iv = 10,
3760-
.lvl = 20,
3760+
.lvl = 19,
37613761
.species = SPECIES_KABUTO,
37623762
},
37633763
{
37643764
.iv = 10,
3765-
.lvl = 19,
3765+
.lvl = 18,
37663766
.species = SPECIES_HOUNDOUR,
37673767
},
37683768
{
37693769
.iv = 10,
3770-
.lvl = 19,
3770+
.lvl = 18,
37713771
.species = SPECIES_MURKROW,
37723772
}
37733773
};
@@ -8352,17 +8352,17 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Alan[] = {
83528352
static const struct TrainerMonNoItemDefaultMoves sParty_Clark[] = {
83538353
{
83548354
.iv = 100,
8355-
.lvl = 22,
8355+
.lvl = 21,
83568356
.species = SPECIES_HOMBONE,
83578357
},
83588358
{
83598359
.iv = 100,
8360-
.lvl = 22,
8360+
.lvl = 21,
83618361
.species = SPECIES_ANORITH,
83628362
},
83638363
{
83648364
.iv = 100,
8365-
.lvl = 24,
8365+
.lvl = 22,
83668366
.species = SPECIES_MAGMAR,
83678367
},
83688368
};

0 commit comments

Comments
 (0)