Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2025-03-04 11:09:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix post-error-archive maybe? Start naming init flags

Browse Source
This commit is contained in:
PikalaxALT 2022-01-01 17:51:09 -05:00
parent fdd92bbaa9
commit 1bfc04769f
26 changed files with 156 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/build.yml vendored
View File

@ -70,8 +70,7 @@ jobs:
- name: Post error archive
if: failure()
run:
tar -chzvf failure.tar.gz -T tar-on-error
run: find $(cat .github/workflows/tar-on-error) -exec tar -czvhf failure.tar.gz {} +
- name: Post error upload
if: failure()

0
tar-on-error → .github/workflows/tar-on-error vendored
View File

4
files/fielddata/eventdata/zone_event/030_R29.json
View File

@ -134,7 +134,7 @@
"ovid": "SPRITE_VAR_2",
"mvt": 0,
"type": 0,
"flag": "FLAG_UNK_1A4",
"flag": "FLAG_HIDE_ROUTE_29_FRIEND",
"scr": 0,
"dirn": 2,
"eye": 0,
@ -151,7 +151,7 @@
"ovid": "SPRITE_TSURE_POKE_611",
"mvt": 0,
"type": 0,
"flag": "FLAG_UNK_1A5",
"flag": "FLAG_HIDE_ROUTE_29_MARILL",
"scr": 0,
"dirn": 3,
"eye": 0,

8
files/fielddata/eventdata/zone_event/071_T23.json
View File

@ -149,7 +149,7 @@
"ovid": "SPRITE_TSURE_POKE_594",
"mvt": 15,
"type": 0,
"flag": "FLAG_UNK_1AB",
"flag": "FLAG_HIDE_AZALEA_SLOWPOKES",
"scr": "_EV_scr_seq_T23_001 + 1",
"dirn": 1,
"eye": 0,
@ -166,7 +166,7 @@
"ovid": "SPRITE_TSURE_POKE_594",
"mvt": 14,
"type": 0,
"flag": "FLAG_UNK_1AB",
"flag": "FLAG_HIDE_AZALEA_SLOWPOKES",
"scr": "_EV_scr_seq_T23_001 + 1",
"dirn": 0,
"eye": 0,
@ -183,7 +183,7 @@
"ovid": "SPRITE_TSURE_POKE_594",
"mvt": 17,
"type": 0,
"flag": "FLAG_UNK_1AB",
"flag": "FLAG_HIDE_AZALEA_SLOWPOKES",
"scr": "_EV_scr_seq_T23_001 + 1",
"dirn": 3,
"eye": 0,
@ -200,7 +200,7 @@
"ovid": "SPRITE_TSURE_POKE_594",
"mvt": 15,
"type": 0,
"flag": "FLAG_UNK_1AB",
"flag": "FLAG_HIDE_AZALEA_SLOWPOKES",
"scr": "_EV_scr_seq_T23_001 + 1",
"dirn": 1,
"eye": 0,

12
files/fielddata/eventdata/zone_event/114_D36R0101.json
View File

@ -96,7 +96,7 @@
"ovid": "SPRITE_TSURE_POKE_596",
"mvt": 17,
"type": 0,
"flag": "FLAG_UNK_1A7",
"flag": "FLAG_HIDE_FARFETCHD_1_LOST",
"scr": "_EV_scr_seq_D36R0101_001 + 1",
"dirn": 3,
"eye": 0,
@ -130,7 +130,7 @@
"ovid": "SPRITE_TSURE_POKE_596",
"mvt": 15,
"type": 0,
"flag": "FLAG_UNK_1A8",
"flag": "FLAG_HIDE_FARFETCHD_2_LOST",
"scr": "_EV_scr_seq_D36R0101_005 + 1",
"dirn": 1,
"eye": 0,
@ -147,7 +147,7 @@
"ovid": "SPRITE_GSBOY1",
"mvt": 15,
"type": 0,
"flag": "FLAG_UNK_1AD",
"flag": "FLAG_HIDE_ILEX_APPRENTICE",
"scr": "_EV_scr_seq_D36R0101_010 + 1",
"dirn": 1,
"eye": 0,
@ -164,7 +164,7 @@
"ovid": "SPRITE_GSFIGHTER",
"mvt": 14,
"type": 0,
"flag": "FLAG_UNK_1AF",
"flag": "FLAG_HIDE_ILEX_CUT_MASTER",
"scr": "_EV_scr_seq_D36R0101_011 + 1",
"dirn": 0,
"eye": 0,
@ -266,7 +266,7 @@
"ovid": "SPRITE_TSURE_POKE_596",
"mvt": 15,
"type": 0,
"flag": "FLAG_UNK_1D3",
"flag": "FLAG_HIDE_FARFETCHD_1_FOUND",
"scr": "_EV_scr_seq_D36R0101_014 + 1",
"dirn": 1,
"eye": 0,
@ -283,7 +283,7 @@
"ovid": "SPRITE_TSURE_POKE_596",
"mvt": 15,
"type": 0,
"flag": "FLAG_UNK_1D4",
"flag": "FLAG_HIDE_FARFETCHD_2_FOUND",
"scr": "_EV_scr_seq_D36R0101_014 + 1",
"dirn": 1,
"eye": 0,

2
files/fielddata/eventdata/zone_event/158_T23R0501.json
View File

@ -58,7 +58,7 @@
"ovid": "SPRITE_TSURE_POKE_594",
"mvt": 14,
"type": 0,
"flag": "FLAG_UNK_1AB",
"flag": "FLAG_HIDE_AZALEA_SLOWPOKES",
"scr": "_EV_scr_seq_T23R0501_003 + 1",
"dirn": 0,
"eye": 0,

2
files/fielddata/eventdata/zone_event/177_T25R0601.json
View File

@ -23,7 +23,7 @@
"ovid": "SPRITE_GSGIRL1",
"mvt": 0,
"type": 0,
"flag": "FLAG_UNK_1D0",
"flag": "FLAG_HIDE_GOLDENROD_FLOWERSHOP_GIRL",
"scr": "_EV_scr_seq_T25R0601_001 + 1",
"dirn": 1,
"eye": 0,

2
files/fielddata/eventdata/zone_event/204_D18R0102.json
View File

@ -75,7 +75,7 @@
"ovid": "SPRITE_MINAKI",
"mvt": 16,
"type": 0,
"flag": "FLAG_UNK_1C8",
"flag": "FLAG_HIDE_BURNED_TOWER_EUSINE",
"scr": 0,
"dirn": 2,
"eye": 0,

2
files/fielddata/eventdata/zone_event/404_D02R0103.json
View File

@ -2,7 +2,7 @@
"header": "fielddata/script/scr_seq/event_D02R0103.h",
"bgs": [
{
"scr": "std_hiddenitem_d02r0103_d02r0104_rare_can",
"scr": "std_hiddenitem_d02r0103_d02r0104_rare_candy",
"type": 2,
"x": 36,
"y": 2,

2
files/fielddata/eventdata/zone_event/465_D02R0104.json
View File

@ -10,7 +10,7 @@
"dir": 4
},
{
"scr": "std_hiddenitem_d02r0103_d02r0104_rare_can",
"scr": "std_hiddenitem_d02r0103_d02r0104_rare_candy",
"type": 2,
"x": 36,
"y": 2,

4
files/fielddata/script/scr_seq/scr_seq_0024_D18R0102.s
View File

@ -78,7 +78,7 @@ _00E2:
scrcmd_464 0
scrcmd_464 1
wait 15, VAR_SPECIAL_x800C
clearflag FLAG_UNK_1C8
clearflag FLAG_HIDE_BURNED_TOWER_EUSINE
play_se SEQ_SE_DP_KAIDAN2
show_person obj_D18R0102_minaki
lock obj_D18R0102_minaki
@ -123,7 +123,7 @@ _01D4:
wait 2, VAR_SPECIAL_x800C
hide_person obj_D18R0102_minaki
wait_se SEQ_SE_DP_KAIDAN2
setflag FLAG_UNK_1C8
setflag FLAG_HIDE_BURNED_TOWER_EUSINE
setflag FLAG_UNK_1C7
setflag FLAG_UNK_1CC
setflag FLAG_UNK_1DE

8
files/fielddata/script/scr_seq/scr_seq_0060_D26R0102.s
View File

@ -89,7 +89,7 @@ _0107:
npc_msg msg_0091_D26R0102_00000
closemsg
clearflag FLAG_UNK_19E
clearflag FLAG_UNK_1AB
clearflag FLAG_HIDE_AZALEA_SLOWPOKES
setflag FLAG_UNK_07B
setvar VAR_UNK_4075, 1
setvar VAR_UNK_4080, 2
@ -106,9 +106,9 @@ _0107:
setflag FLAG_UNK_1AA
setflag FLAG_UNK_1D5
setflag FLAG_UNK_1AC
clearflag FLAG_UNK_1AD
clearflag FLAG_UNK_1A7
clearflag FLAG_UNK_1A8
clearflag FLAG_HIDE_ILEX_APPRENTICE
clearflag FLAG_HIDE_FARFETCHD_1_LOST
clearflag FLAG_HIDE_FARFETCHD_2_LOST
setvar VAR_UNK_40F4, 1
releaseall
end

46
files/fielddata/script/scr_seq/scr_seq_0092_D36R0101.s
View File

@ -70,14 +70,14 @@ _00D0:
setvar VAR_TEMP_x4002, 0
setvar VAR_TEMP_x4003, 0
setvar VAR_TEMP_x4004, 0
checkflag FLAG_UNK_07D
checkflag FLAG_FOUND_FIRST_FARFETCHD
gotoif TRUE, _0124
checkflag FLAG_UNK_07E
checkflag FLAG_FOUND_SECOND_FARFETCHD
gotoif TRUE, _0145
end
_0124:
checkflag FLAG_UNK_07E
checkflag FLAG_FOUND_SECOND_FARFETCHD
gotoif TRUE, _0137
setvar VAR_UNK_4099, 2
end
@ -230,11 +230,11 @@ _0346:
closemsg
setvar VAR_UNK_4099, 2
setvar VAR_UNK_409B, 2
setflag FLAG_UNK_1A7
setflag FLAG_UNK_07D
checkflag FLAG_UNK_07E
setflag FLAG_HIDE_FARFETCHD_1_LOST
setflag FLAG_FOUND_FIRST_FARFETCHD
checkflag FLAG_FOUND_SECOND_FARFETCHD
gotoif TRUE, _1207
clearflag FLAG_UNK_1D3
clearflag FLAG_HIDE_FARFETCHD_1_FOUND
wait 20, VAR_SPECIAL_x8004
fade_screen 6, 1, 0, 0x00
wait_fade
@ -590,17 +590,17 @@ _08DF:
npc_msg msg_0115_D36R0101_00037
waitbutton
closemsg
checkflag FLAG_UNK_07D
checkflag FLAG_FOUND_FIRST_FARFETCHD
callif FALSE, _097A
setvar VAR_UNK_409A, 2
setvar VAR_UNK_409C, 2
setvar VAR_UNK_409D, 2
setvar VAR_UNK_409E, 2
setflag FLAG_UNK_1A8
setflag FLAG_UNK_07E
checkflag FLAG_UNK_07D
setflag FLAG_HIDE_FARFETCHD_2_LOST
setflag FLAG_FOUND_SECOND_FARFETCHD
checkflag FLAG_FOUND_FIRST_FARFETCHD
gotoif TRUE, _1207
clearflag FLAG_UNK_1D3
clearflag FLAG_HIDE_FARFETCHD_1_FOUND
wait 20, VAR_SPECIAL_x8004
fade_screen 6, 1, 0, 0x00
wait_fade
@ -1149,17 +1149,17 @@ _10E1:
goto _0F0B
.byte 0x02, 0x00
scr_seq_D36R0101_010:
checkflag FLAG_UNK_07D
checkflag FLAG_FOUND_FIRST_FARFETCHD
gotoif TRUE, _1104
goto _1115
_1104:
checkflag FLAG_UNK_07E
checkflag FLAG_FOUND_SECOND_FARFETCHD
gotoif TRUE, _1126
goto _1139
_1115:
checkflag FLAG_UNK_07E
checkflag FLAG_FOUND_SECOND_FARFETCHD
gotoif TRUE, _1139
goto _114C
@ -1248,9 +1248,9 @@ _11FD:
end
_1207:
clearflag FLAG_UNK_1AF
clearflag FLAG_HIDE_ILEX_CUT_MASTER
show_person obj_D36R0101_gsfighter
clearflag FLAG_UNK_1D4
clearflag FLAG_HIDE_FARFETCHD_2_FOUND
wait 20, VAR_SPECIAL_x8004
fade_screen 6, 1, 0, 0x00
wait_fade
@ -1269,12 +1269,12 @@ _1207:
npc_msg msg_0115_D36R0101_00006
goto_if_no_item_space ITEM_HM01, 1, _12C9
callstd std_give_item_verbose
setflag FLAG_UNK_1AF
setflag FLAG_UNK_1AD
setflag FLAG_UNK_1A7
setflag FLAG_UNK_1A8
setflag FLAG_UNK_1D3
setflag FLAG_UNK_1D4
setflag FLAG_HIDE_ILEX_CUT_MASTER
setflag FLAG_HIDE_ILEX_APPRENTICE
setflag FLAG_HIDE_FARFETCHD_1_LOST
setflag FLAG_HIDE_FARFETCHD_2_LOST
setflag FLAG_HIDE_FARFETCHD_1_FOUND
setflag FLAG_HIDE_FARFETCHD_2_FOUND
setflag FLAG_UNK_080
clearflag FLAG_UNK_1AE
clearflag FLAG_UNK_1AC

8
files/fielddata/script/scr_seq/scr_seq_0119_D47R0101.s
View File

@ -73,7 +73,7 @@ _00EE:
apply_movement obj_D47R0101_counterm_5, _01F4
wait_movement
call _08B7
setvar VAR_UNK_40E3, 0
setvar VAR_SCENE_SAFARI_ZONE_ENTRANCE, 0
npc_msg msg_0135_D47R0101_00008
npc_msg msg_0135_D47R0101_00009
waitbutton
@ -103,7 +103,7 @@ _017E:
apply_movement obj_player, _01BC
wait_movement
call _08B7
setvar VAR_UNK_40E3, 0
setvar VAR_SCENE_SAFARI_ZONE_ENTRANCE, 0
npc_msg msg_0135_D47R0101_00009
waitbutton
closemsg
@ -554,7 +554,7 @@ _0773:
apply_movement obj_player, _08D0
wait_movement
call _08B7
setvar VAR_UNK_40E3, 1
setvar VAR_SCENE_SAFARI_ZONE_ENTRANCE, 1
scrcmd_447 0, 0
scrcmd_240 173, 1, 5, 2, 1
play_se SEQ_SE_DP_KAIDAN2
@ -943,7 +943,7 @@ _0CCC:
apply_movement obj_player, _08D0
wait_movement
call _08B7
setvar VAR_UNK_40E3, 3
setvar VAR_SCENE_SAFARI_ZONE_ENTRANCE, 3
scrcmd_447 0, 1
scrcmd_240 173, 2, 19, 2, 1
play_se SEQ_SE_DP_KAIDAN2

22
files/fielddata/script/scr_seq/scr_seq_0149.s
View File

@ -10,21 +10,21 @@
scr_seq_0149_000:
setflag FLAG_HIDE_ELMS_LAB_OFFICER
setflag FLAG_UNK_1A4
setflag FLAG_UNK_1A5
setflag FLAG_HIDE_ROUTE_29_FRIEND
setflag FLAG_HIDE_ROUTE_29_MARILL
setflag FLAG_UNK_1A0
setflag FLAG_HIDE_NEW_BARK_FRIEND
setflag FLAG_HIDE_ELMS_LAB_FRIEND
setflag FLAG_HIDE_CHERRYGROVE_RIVAL
setflag FLAG_UNK_1AB
setflag FLAG_UNK_1AF
setflag FLAG_UNK_1AD
setflag FLAG_UNK_1A7
setflag FLAG_UNK_1A8
setflag FLAG_UNK_1D3
setflag FLAG_UNK_1D4
setflag FLAG_UNK_1D0
setflag FLAG_UNK_1C8
setflag FLAG_HIDE_AZALEA_SLOWPOKES
setflag FLAG_HIDE_ILEX_CUT_MASTER
setflag FLAG_HIDE_ILEX_APPRENTICE
setflag FLAG_HIDE_FARFETCHD_1_LOST
setflag FLAG_HIDE_FARFETCHD_2_LOST
setflag FLAG_HIDE_FARFETCHD_1_FOUND
setflag FLAG_HIDE_FARFETCHD_2_FOUND
setflag FLAG_HIDE_GOLDENROD_FLOWERSHOP_GIRL
setflag FLAG_HIDE_BURNED_TOWER_EUSINE
setflag FLAG_UNK_1D6
setflag FLAG_UNK_1D9
setflag FLAG_UNK_1DC

4
files/fielddata/script/scr_seq/scr_seq_0225_R29.s
View File

@ -317,8 +317,8 @@ _04DC:
wait_movement
hide_person obj_R29_var_2
hide_person obj_R29_tsure_poke_611
setflag FLAG_UNK_1A4
setflag FLAG_UNK_1A5
setflag FLAG_HIDE_ROUTE_29_FRIEND
setflag FLAG_HIDE_ROUTE_29_MARILL
setvar VAR_UNK_408B, 0
setflag FLAG_UNK_09A
releaseall

4
files/fielddata/script/scr_seq/scr_seq_0243_R36.s
View File

@ -44,7 +44,7 @@ _005C:
scr_seq_R36_000:
play_se SEQ_SE_DP_SELECT
lockall
checkflag FLAG_UNK_1D0
checkflag FLAG_HIDE_GOLDENROD_FLOWERSHOP_GIRL
gotoif FALSE, _0261
hasitem ITEM_SQUIRTBOTTLE, 1, VAR_SPECIAL_x800C
comparevartovalue VAR_SPECIAL_x800C, 1
@ -147,7 +147,7 @@ _0225:
_022F:
hide_person obj_R36_gsgirl1_2
setflag FLAG_UNK_1CF
clearflag FLAG_UNK_1D0
clearflag FLAG_HIDE_GOLDENROD_FLOWERSHOP_GIRL
releaseall
end

18
files/fielddata/script/scr_seq/scr_seq_0262.s
View File

@ -17,7 +17,7 @@
scr_seq_0262_000:
scrcmd_609
lockall
scrcmd_721 32780
scrcmd_721 VAR_SPECIAL_x800C
comparevartovalue VAR_SPECIAL_x800C, 0
gotoif eq, _006A
comparevartovalue VAR_SPECIAL_x800C, 1
@ -46,12 +46,12 @@ _006A:
fade_screen 6, 1, 0, 0x00
wait_fade
closemsg
scrcmd_717 32780
scrcmd_717 VAR_SPECIAL_x800C
fade_screen 6, 1, 1, 0x00
wait_fade
comparevartovalue VAR_SPECIAL_x800C, 255
gotoif eq, _00B7
scrcmd_718 0, 32780
scrcmd_718 0, VAR_SPECIAL_x800C
npc_msg msg_0427_00005
waitbutton
_00B5:
@ -64,10 +64,10 @@ _00B7:
scr_seq_0262_001:
scrcmd_609
lockall
scrcmd_719 32768, 32769
scrcmd_719 VAR_SPECIAL_x8000, VAR_SPECIAL_x8001
comparevartovalue VAR_SPECIAL_x8000, 255
gotoif eq, _0114
scrcmd_718 0, 32768
scrcmd_718 0, VAR_SPECIAL_x8000
npc_msg msg_0427_00006
touchscreen_menu_hide
getmenuchoice VAR_SPECIAL_x800C
@ -76,7 +76,7 @@ scr_seq_0262_001:
fade_screen 6, 1, 0, 0x00
wait_fade
closemsg
scrcmd_720 32769
scrcmd_720 VAR_SPECIAL_x8001
fade_screen 6, 1, 1, 0x00
wait_fade
npc_msg msg_0427_00007
@ -90,7 +90,7 @@ _0114:
_011A:
scrcmd_447 1, 0
comparevartovalue VAR_UNK_40E3, 3
comparevartovalue VAR_SCENE_SAFARI_ZONE_ENTRANCE, 3
gotoif ne, _0155
fade_screen 6, 1, 0, 0x00
wait_fade
@ -106,7 +106,7 @@ _0155:
fade_screen 6, 1, 1, 0x00
wait_fade
_0179:
setvar VAR_UNK_40E3, 2
setvar VAR_SCENE_SAFARI_ZONE_ENTRANCE, 2
return
scr_seq_0262_002:
@ -140,7 +140,7 @@ scr_seq_0262_004:
end
scr_seq_0262_005:
setvar VAR_UNK_40E3, 2
setvar VAR_SCENE_SAFARI_ZONE_ENTRANCE, 2
scrcmd_447 1, 0
end

6
files/fielddata/script/scr_seq/scr_seq_0380_D47R0101_hdr.s
View File

@ -8,9 +8,9 @@
.byte 0
scr_seq_D47R0101_map_scripts_2:
.short VAR_UNK_40E3, 1, _EV_scr_seq_D47R0101_006 + 1
.short VAR_UNK_40E3, 3, _EV_scr_seq_D47R0101_006 + 1
.short VAR_UNK_40E3, 2, _EV_scr_seq_D47R0101_007 + 1
.short VAR_SCENE_SAFARI_ZONE_ENTRANCE, 1, _EV_scr_seq_D47R0101_006 + 1
.short VAR_SCENE_SAFARI_ZONE_ENTRANCE, 3, _EV_scr_seq_D47R0101_006 + 1
.short VAR_SCENE_SAFARI_ZONE_ENTRANCE, 2, _EV_scr_seq_D47R0101_007 + 1
.short VAR_UNK_4057, 1, _EV_scr_seq_D47R0101_008 + 1
.short VAR_UNK_4057, 4, _EV_scr_seq_D47R0101_009 + 1
.short 0

4
files/fielddata/script/scr_seq/scr_seq_0843_T20R0101.s
View File

@ -738,8 +738,8 @@ _0904:
clearflag FLAG_HIDE_ROUTE_30_YOUNGSTER_JOEY
setvar VAR_SCENE_ELMS_LAB, 4
setvar VAR_UNK_408B, 1
clearflag FLAG_UNK_1A4
clearflag FLAG_UNK_1A5
clearflag FLAG_HIDE_ROUTE_29_FRIEND
clearflag FLAG_HIDE_ROUTE_29_MARILL
setvar VAR_SCENE_MR_POKEMONS_HOUSE, 2
setvar VAR_SCENE_NEW_BARK_TOWN_OW, 3
clearflag FLAG_UNK_194

4
files/fielddata/script/scr_seq/scr_seq_0874_T23R0501.s
View File

@ -17,11 +17,11 @@
scr_seq_T23R0501_000:
checkflag FLAG_UNK_07B
gotoif TRUE, _002F
setflag FLAG_UNK_1AB
setflag FLAG_HIDE_AZALEA_SLOWPOKES
end
_002F:
clearflag FLAG_UNK_1AB
clearflag FLAG_HIDE_AZALEA_SLOWPOKES
end
scr_seq_T23R0501_005:

38
include/constants/flags.h
View File

@ -134,8 +134,8 @@
#define FLAG_UNK_07A 0x7A
#define FLAG_UNK_07B 0x7B
#define FLAG_UNK_07C 0x7C
#define FLAG_UNK_07D 0x7D
#define FLAG_UNK_07E 0x7E
#define FLAG_FOUND_FIRST_FARFETCHD 0x7D
#define FLAG_FOUND_SECOND_FARFETCHD 0x7E
#define FLAG_UNK_07F 0x7F
#define FLAG_UNK_080 0x80
#define FLAG_UNK_081 0x81
@ -431,18 +431,18 @@
#define FLAG_HIDE_NEW_BARK_MARILL 0x1A1
#define FLAG_HIDE_NEW_BARK_FRIEND 0x1A2
#define FLAG_UNK_1A3 0x1A3
#define FLAG_UNK_1A4 0x1A4
#define FLAG_UNK_1A5 0x1A5
#define FLAG_HIDE_ROUTE_29_FRIEND 0x1A4
#define FLAG_HIDE_ROUTE_29_MARILL 0x1A5
#define FLAG_HIDE_ELMS_LAB_FRIEND 0x1A6
#define FLAG_UNK_1A7 0x1A7
#define FLAG_UNK_1A8 0x1A8
#define FLAG_HIDE_FARFETCHD_1_LOST 0x1A7
#define FLAG_HIDE_FARFETCHD_2_LOST 0x1A8
#define FLAG_UNK_1A9 0x1A9
#define FLAG_UNK_1AA 0x1AA
#define FLAG_UNK_1AB 0x1AB
#define FLAG_HIDE_AZALEA_SLOWPOKES 0x1AB
#define FLAG_UNK_1AC 0x1AC
#define FLAG_UNK_1AD 0x1AD
#define FLAG_HIDE_ILEX_APPRENTICE 0x1AD
#define FLAG_UNK_1AE 0x1AE
#define FLAG_UNK_1AF 0x1AF
#define FLAG_HIDE_ILEX_CUT_MASTER 0x1AF
#define FLAG_UNK_1B0 0x1B0
#define FLAG_UNK_1B1 0x1B1
#define FLAG_UNK_1B2 0x1B2
@ -467,7 +467,7 @@
#define FLAG_UNK_1C5 0x1C5
#define FLAG_UNK_1C6 0x1C6
#define FLAG_UNK_1C7 0x1C7
#define FLAG_UNK_1C8 0x1C8
#define FLAG_HIDE_BURNED_TOWER_EUSINE 0x1C8
#define FLAG_UNK_1C9 0x1C9
#define FLAG_UNK_1CA 0x1CA
#define FLAG_UNK_1CB 0x1CB
@ -475,11 +475,11 @@
#define FLAG_UNK_1CD 0x1CD
#define FLAG_UNK_1CE 0x1CE
#define FLAG_UNK_1CF 0x1CF
#define FLAG_UNK_1D0 0x1D0
#define FLAG_HIDE_GOLDENROD_FLOWERSHOP_GIRL 0x1D0
#define FLAG_UNK_1D1 0x1D1
#define FLAG_UNK_1D2 0x1D2
#define FLAG_UNK_1D3 0x1D3
#define FLAG_UNK_1D4 0x1D4
#define FLAG_HIDE_FARFETCHD_1_FOUND 0x1D3
#define FLAG_HIDE_FARFETCHD_2_FOUND 0x1D4
#define FLAG_UNK_1D5 0x1D5
#define FLAG_UNK_1D6 0x1D6
#define FLAG_UNK_1D7 0x1D7
@ -812,6 +812,7 @@
#define FLAG_UNK_31E 0x31E
#define FLAG_UNK_31F 0x31F
// Hidden items
#define HIDDEN_ITEMS_FLAG_BASE 800
#define FLAG_HIDDENITEM_T20_POTION 0x320
#define FLAG_HIDDENITEM_R29_R30_T21_NUGGET 0x321
@ -1378,7 +1379,8 @@
#define FLAG_UNK_54E 0x54E
#define FLAG_UNK_54F 0x54F
#define TRAINER_FLAG_BASE 0x550
// Trainer flags
#define TRAINER_FLAG_BASE 0x550
#define FLAG_TRAINER(tr) (TRAINER_FLAG_BASE+(tr))
#define FLAG_UNK_82E 0x82E
@ -1687,11 +1689,13 @@
#define FLAG_UNK_95D 0x95D
#define FLAG_UNK_95E 0x95E
#define FLAG_UNK_95F 0x95F
// System flags
#define FLAG_UNK_960 0x960
#define FLAG_HEAL_AFTER_BATTLE 0x961
#define FLAG_STRENGTH_ACTIVE 0x962
#define FLAG_HEAL_AFTER_BATTLE 0x961
#define FLAG_STRENGTH_ACTIVE 0x962
#define FLAG_UNK_963 0x963
#define FLAG_GAME_CLEAR 0x964
#define FLAG_GAME_CLEAR 0x964
#define FLAG_UNK_965 0x965
#define FLAG_UNK_966 0x966
#define FLAG_UNK_967 0x967

25
include/constants/std_script.h
View File

@ -529,13 +529,36 @@
#define std_hiddenitem_w20_deepseascale 8229
#define std_hiddenitem_r45_r46_pp_max 8230
#define _std_safari 8800
#define std_safari_place_object 8800
#define std_safari_remove_object 8801
#define std_safari_steps_out 8802
#define std_safari_balls_out 8803
#define std_safari_storage_out 8804
#define std_safari_enter 8805
#define std_safari_exit 8806
#define _std_chatot 8900
#define _std_communication 9000
#define _std_comm_reception 9000
#define std_wireless_colosseum 9001
#define std_union_room 9003
#define std_trainer_card_explain 9017
#define _std_colosseum 9100
#define _std_wifi_reception 9200
#define _std_group 9300
#define std_group 9300
#define _std_daycare 9500
#define std_daycare_man 9500
#define std_daycare_lady 9501
#define _std_init 9600
#define std_init 9600
#define _std_dex_evaluation 9950
#define std_via_pc_evaluate_dex 9950
#define std_in_person_evaluate_dex 9951

2
include/constants/vars.h
View File

@ -239,7 +239,7 @@
#define VAR_UNK_40E0 0x40E0
#define VAR_UNK_40E1 0x40E1
#define VAR_UNK_40E2 0x40E2
#define VAR_UNK_40E3 0x40E3
#define VAR_SCENE_SAFARI_ZONE_ENTRANCE 0x40E3
#define VAR_UNK_40E4 0x40E4
#define VAR_UNK_40E5 0x40E5
#define VAR_UNK_40E6 0x40E6

44
src/fieldmap.c
View File

@ -33,28 +33,28 @@ const struct ScriptBankMapping sScriptBankMapping[30] = {
{10300, NARC_scr_seq_scr_seq_0734_bin, NARC_msg_msg_0444_bin},
{_std_mystery_gift, NARC_scr_seq_scr_seq_0144_bin, NARC_msg_msg_0209_bin},
{10150, NARC_scr_seq_scr_seq_0955_bin, NARC_msg_msg_0732_bin},
{10100, NARC_scr_seq_scr_seq_0954_bin, NARC_msg_msg_0733_bin},
{_std_field_move, NARC_scr_seq_scr_seq_0146_bin, NARC_msg_msg_0211_bin},
{ _std_dex_evaluation, NARC_scr_seq_scr_seq_0148_bin, NARC_msg_msg_0666_bin},
{ 9900, NARC_scr_seq_scr_seq_0136_bin, NARC_msg_msg_0040_bin},
{ 9850, NARC_scr_seq_scr_seq_0167_bin, NARC_msg_msg_0312_bin},
{ 9800, NARC_scr_seq_scr_seq_0166_bin, NARC_msg_msg_0043_bin},
{ 9700, NARC_scr_seq_scr_seq_0163_bin, NARC_msg_msg_0266_bin},
{ 9600, NARC_scr_seq_scr_seq_0149_bin, NARC_msg_msg_0040_bin},
{ 9500, NARC_scr_seq_scr_seq_0265_bin, NARC_msg_msg_0439_bin},
{ 9300, NARC_scr_seq_scr_seq_0143_bin, NARC_msg_msg_0204_bin},
{ 9200, NARC_scr_seq_scr_seq_0164_bin, NARC_msg_msg_0267_bin},
{ 9100, NARC_scr_seq_scr_seq_0000_bin, NARC_msg_msg_0014_bin},
{ _std_communication, NARC_scr_seq_scr_seq_0004_bin, NARC_msg_msg_0046_bin},
{ _std_chatot, NARC_scr_seq_scr_seq_0165_bin, NARC_msg_msg_0268_bin},
{ 8800, NARC_scr_seq_scr_seq_0262_bin, NARC_msg_msg_0427_bin},
{ _std_hidden_item, NARC_scr_seq_scr_seq_0145_bin, NARC_msg_msg_0210_bin}, // Hidden Items
{ _std_item_ball, NARC_scr_seq_scr_seq_0141_bin, NARC_msg_msg_0199_bin},
{ _std_npc_trainer_2, NARC_scr_seq_scr_seq_0953_bin, NARC_msg_msg_0040_bin},
{ _std_npc_trainer, NARC_scr_seq_scr_seq_0953_bin, NARC_msg_msg_0040_bin},
{ _std_apricorn_tree, NARC_scr_seq_scr_seq_0150_bin, NARC_msg_msg_0023_bin},
{ _std_bookshelves, NARC_scr_seq_scr_seq_0001_bin, NARC_msg_msg_0020_bin},
{ _std_misc, NARC_scr_seq_scr_seq_0003_bin, NARC_msg_msg_0040_bin},
{10100, NARC_scr_seq_scr_seq_0954_bin, NARC_msg_msg_0733_bin},
{_std_field_move, NARC_scr_seq_scr_seq_0146_bin, NARC_msg_msg_0211_bin},
{_std_dex_evaluation, NARC_scr_seq_scr_seq_0148_bin, NARC_msg_msg_0666_bin},
{ 9900, NARC_scr_seq_scr_seq_0136_bin, NARC_msg_msg_0040_bin},
{ 9850, NARC_scr_seq_scr_seq_0167_bin, NARC_msg_msg_0312_bin},
{ 9800, NARC_scr_seq_scr_seq_0166_bin, NARC_msg_msg_0043_bin},
{ 9700, NARC_scr_seq_scr_seq_0163_bin, NARC_msg_msg_0266_bin},
{ _std_init, NARC_scr_seq_scr_seq_0149_bin, NARC_msg_msg_0040_bin},
{ _std_daycare, NARC_scr_seq_scr_seq_0265_bin, NARC_msg_msg_0439_bin},
{ _std_group, NARC_scr_seq_scr_seq_0143_bin, NARC_msg_msg_0204_bin},
{_std_wifi_reception, NARC_scr_seq_scr_seq_0164_bin, NARC_msg_msg_0267_bin},
{_std_colosseum, NARC_scr_seq_scr_seq_0000_bin, NARC_msg_msg_0014_bin},
{_std_comm_reception, NARC_scr_seq_scr_seq_0004_bin, NARC_msg_msg_0046_bin},
{_std_chatot, NARC_scr_seq_scr_seq_0165_bin, NARC_msg_msg_0268_bin},
{_std_safari, NARC_scr_seq_scr_seq_0262_bin, NARC_msg_msg_0427_bin},
{_std_hidden_item, NARC_scr_seq_scr_seq_0145_bin, NARC_msg_msg_0210_bin}, // Hidden Items
{_std_item_ball, NARC_scr_seq_scr_seq_0141_bin, NARC_msg_msg_0199_bin},
{_std_npc_trainer_2, NARC_scr_seq_scr_seq_0953_bin, NARC_msg_msg_0040_bin},
{_std_npc_trainer, NARC_scr_seq_scr_seq_0953_bin, NARC_msg_msg_0040_bin},
{_std_apricorn_tree, NARC_scr_seq_scr_seq_0150_bin, NARC_msg_msg_0023_bin},
{_std_bookshelves, NARC_scr_seq_scr_seq_0001_bin, NARC_msg_msg_0020_bin},
{_std_misc, NARC_scr_seq_scr_seq_0003_bin, NARC_msg_msg_0040_bin},
};
#define HEAP_ID_FIELDMAP 11

12
tools/py_scripts/scrcmd.json
View File

@ -4520,33 +4520,33 @@
{
"name": "scrcmd_717",
"args": [
2
"var"
]
},
{
"name": "scrcmd_718",
"args": [
1,
2
"var"
]
},
{
"name": "scrcmd_719",
"args": [
2,
2
"var",
"var"
]
},
{
"name": "scrcmd_720",
"args": [
2
"var"
]
},
{
"name": "scrcmd_721",
"args": [
2
"var"
]
},
{