summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/event_scripts.s12
-rw-r--r--data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s8
-rw-r--r--data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s8
-rw-r--r--data/scripts/maps/Route110_TrickHouseEntrance.s107
-rw-r--r--data/scripts/maps/Route111.s12
-rw-r--r--data/scripts/maps/Route128.s19
-rw-r--r--data/scripts/maps/RustboroCity.s93
-rw-r--r--data/scripts/maps/RusturfTunnel.s19
-rw-r--r--data/scripts/maps/SSTidalCorridor.s10
-rw-r--r--data/scripts/maps/SlateportCity.s29
-rw-r--r--data/scripts/maps/SlateportCity_ContestLobby.s9
-rw-r--r--data/scripts/maps/SootopolisCity_PokemonCenter_1F.s8
12 files changed, 312 insertions, 22 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 7963d2494..94c1fd0cf 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -912,7 +912,8 @@ Std_5:
yesnobox 20, 8
return
- .incbin "baserom.gba", 0x19f805, 0x1
+@ 819F805
+ return
BattleTower_Lobby_EventScript_19F806:: @ 819F806
FallarborTown_ContestLobby_EventScript_19F806:: @ 819F806
@@ -2715,7 +2716,9 @@ SlateportCity_SternsShipyard_1F_Movement_1A0839:: @ 81A0839
step_3e
step_end
- .incbin "baserom.gba", 0x1a083b, 0x2
+@ 81A083B
+ step_3f
+ step_end
EverGrandeCity_PokemonLeague_Movement_1A083D:: @ 81A083D
LilycoveCity_ContestHall_Movement_1A083D:: @ 81A083D
@@ -2902,7 +2905,10 @@ Route110_TrickHouseEntrance_Movement_1A0856:: @ 81A0856
step_up
step_end
- .incbin "baserom.gba", 0x1a0858, 0x3
+@ 81A0858
+ step_up
+ step_up
+ step_end
PictureBookShelfScript:: @ 81A085B
msgbox PictureBookShelfText, 3
diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s
index 6fa955c34..5dac78e75 100644
--- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s
@@ -6,7 +6,13 @@ PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105
sethealplace 19
end
- .incbin "baserom.gba", 0x154109, 0xe
+@ 8154109
+ setvar 0x800b, 1
+ call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B
+ waittext
+ waitbutton
+ release
+ end
PacifidlogTown_PokemonCenter_1F_EventScript_154117:: @ 8154117
msgbox PacifidlogTown_PokemonCenter_1F_Text_178E47, 2
diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s b/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s
index 026119917..0ac2d8a88 100644
--- a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s
@@ -4,7 +4,13 @@ PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8154132
map_script 1, PacifidlogTown_PokemonCenter_2F_MapScript1_1A3D32
.byte 0
- .incbin "baserom.gba", 0x154142, 0xc
+@ 8154142
+ call VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6
+ end
+
+@ 8154148
+ call VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC
+ end
PacifidlogTown_PokemonCenter_2F_EventScript_15414E:: @ 815414E
call PacifidlogTown_PokemonCenter_2F_EventScript_1A41FB
diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.s b/data/scripts/maps/Route110_TrickHouseEntrance.s
index 47b63c3cd..94763df3c 100644
--- a/data/scripts/maps/Route110_TrickHouseEntrance.s
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.s
@@ -588,10 +588,111 @@ Route110_TrickHouseEntrance_EventScript_1616D7:: @ 81616D7
releaseall
end
- .global gUnknown_081616E1
-gUnknown_081616E1: @ 81616E1
+gUnknown_081616E1:: @ 81616E1
+ lockall
+ switch 0x4044
+ case 0, 0x8161740
+ case 1, 0x8161769
+ case 2, 0x8161792
+ case 3, 0x81617BB
+ case 4, 0x81617E4
+ case 5, 0x816180D
+ case 6, 0x8161836
+ case 7, 0x816185F
+ end
+
+Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740
+ compare 0x40AB, 0
+ jumpeq Route110_TrickHouseEntrance_EventScript_161888
+ msgbox UnknownString_819CAD1, 4
+ playsfx SE_PIN
+ setvar 0x40AB, 2
+ setmaptile 13, 1, 523, 0
+ special 142
+ releaseall
+ end
+
+Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769
+ compare 0x40AC, 0
+ jumpeq Route110_TrickHouseEntrance_EventScript_161888
+ msgbox UnknownString_819CCCB, 4
+ playsfx SE_PIN
+ setvar 0x40AC, 2
+ setmaptile 13, 1, 523, 0
+ special 142
+ releaseall
+ end
- .incbin "baserom.gba", 0x1616e1, 0x1b1
+Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792
+ compare 0x40AD, 0
+ jumpeq Route110_TrickHouseEntrance_EventScript_161888
+ msgbox UnknownString_819CEF9, 4
+ playsfx SE_PIN
+ setvar 0x40AD, 2
+ setmaptile 13, 1, 523, 0
+ special 142
+ releaseall
+ end
+
+Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB
+ compare 0x40AE, 0
+ jumpeq Route110_TrickHouseEntrance_EventScript_161888
+ msgbox UnknownString_819D164, 4
+ playsfx SE_PIN
+ setvar 0x40AE, 2
+ setmaptile 13, 1, 523, 0
+ special 142
+ releaseall
+ end
+
+Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4
+ compare 0x40AF, 0
+ jumpeq Route110_TrickHouseEntrance_EventScript_161888
+ msgbox UnknownString_819D3A5, 4
+ playsfx SE_PIN
+ setvar 0x40AF, 2
+ setmaptile 13, 1, 523, 0
+ special 142
+ releaseall
+ end
+
+Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D
+ compare 0x40B0, 0
+ jumpeq Route110_TrickHouseEntrance_EventScript_161888
+ msgbox UnknownString_819DC0A, 4
+ playsfx SE_PIN
+ setvar 0x40B0, 2
+ setmaptile 13, 1, 523, 0
+ special 142
+ releaseall
+ end
+
+Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836
+ compare 0x40B1, 0
+ jumpeq Route110_TrickHouseEntrance_EventScript_161888
+ msgbox UnknownString_819DE8D, 4
+ playsfx SE_PIN
+ setvar 0x40B1, 2
+ setmaptile 13, 1, 523, 0
+ special 142
+ releaseall
+ end
+
+Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F
+ compare 0x40B2, 0
+ jumpeq Route110_TrickHouseEntrance_EventScript_161888
+ msgbox UnknownString_819E0FF, 4
+ playsfx SE_PIN
+ setvar 0x40B2, 2
+ setmaptile 13, 1, 523, 0
+ special 142
+ releaseall
+ end
+
+Route110_TrickHouseEntrance_EventScript_161888:: @ 8161888
+ msgbox UnknownString_819C21F, 4
+ releaseall
+ end
Route110_TrickHousePuzzle1_EventScript_161892:: @ 8161892
Route110_TrickHousePuzzle2_EventScript_161892:: @ 8161892
diff --git a/data/scripts/maps/Route111.s b/data/scripts/maps/Route111.s
index 4a977f132..b6e009427 100644
--- a/data/scripts/maps/Route111.s
+++ b/data/scripts/maps/Route111.s
@@ -138,7 +138,11 @@ Route111_EventScript_150100:: @ 8150100
release
end
- .incbin "baserom.gba", 0x15010a, 0xc
+@ 815010A
+ lockall
+ setvar 0x8004, 0
+ jump Route111_EventScript_15013A
+ end
Route111_EventScript_150116:: @ 8150116
lockall
@@ -152,7 +156,11 @@ Route111_EventScript_150122:: @ 8150122
jump Route111_EventScript_15013A
end
- .incbin "baserom.gba", 0x15012e, 0xc
+@ 815012E
+ lockall
+ setvar 0x8004, 3
+ jump Route111_EventScript_15013A
+ end
Route111_EventScript_15013A:: @ 815013A
checkitem ITEM_GO_GOGGLES, 1
diff --git a/data/scripts/maps/Route128.s b/data/scripts/maps/Route128.s
index 00fc7c863..f7bd30618 100644
--- a/data/scripts/maps/Route128.s
+++ b/data/scripts/maps/Route128.s
@@ -82,7 +82,24 @@ Route128_EventScript_15213F:: @ 815213F
releaseall
end
- .incbin "baserom.gba", 0x15225e, 0xf
+@ 815225E
+ step_17
+ step_end
+
+@ 8152260
+ step_left
+ step_left
+ step_left
+ step_left
+ step_left
+ step_left
+ step_up
+ step_up
+ step_up
+ step_up
+ step_up
+ step_up
+ step_end
Route128_Movement_15226D:: @ 815226D
step_up
diff --git a/data/scripts/maps/RustboroCity.s b/data/scripts/maps/RustboroCity.s
index d7664388f..9576c2ab7 100644
--- a/data/scripts/maps/RustboroCity.s
+++ b/data/scripts/maps/RustboroCity.s
@@ -191,7 +191,60 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4
releaseall
end
- .incbin "baserom.gba", 0x14c55d, 0x65
+@ 814C55D
+ msgbox RustboroCity_Text_166F6B, 4
+ return
+
+@ 814C566
+ msgbox RustboroCity_Text_166FB4, 4
+ return
+
+@ 814C56F
+ move 9, RustboroCity_Movement_14C5E3
+ waitmove 0
+ return
+
+@ 814C57A
+ move 9, RustboroCity_Movement_14C5E7
+ waitmove 0
+ return
+
+@ 814C585
+ move 9, RustboroCity_Movement_14C5EC
+ waitmove 0
+ return
+
+@ 814C590
+ move 9, RustboroCity_Movement_14C5F1
+ waitmove 0
+ return
+
+@ 814C59B
+ move 9, RustboroCity_Movement_14C5F7
+ waitmove 0
+ move 255, RustboroCity_Movement_1A0841
+ waitmove 0
+ return
+
+@ 814C5B0
+ step_30
+ step_30
+ step_18
+ step_18
+ step_18
+ step_18
+ step_16
+ step_16
+ step_16
+ step_16
+ step_16
+ step_16
+ step_16
+ step_16
+ step_16
+ step_16
+ step_16
+ step_end
RustboroCity_Movement_14C5C2:: @ 814C5C2
step_30
@@ -232,7 +285,43 @@ RustboroCity_Movement_14C5DB:: @ 814C5DB
step_up
step_end
- .incbin "baserom.gba", 0x14c5e3, 0x1c
+RustboroCity_Movement_14C5E3:: @ 814C5E3
+ step_down
+ step_right
+ step_right
+ step_end
+
+RustboroCity_Movement_14C5E7:: @ 814C5E7
+ step_down
+ step_down
+ step_right
+ step_right
+ step_end
+
+RustboroCity_Movement_14C5EC:: @ 814C5EC
+ step_down
+ step_down
+ step_right
+ step_right
+ step_end
+
+RustboroCity_Movement_14C5F1:: @ 814C5F1
+ step_down
+ step_down
+ step_down
+ step_right
+ step_right
+ step_end
+
+RustboroCity_Movement_14C5F7:: @ 814C5F7
+ step_down
+ step_down
+ step_down
+ step_right
+ step_right
+ step_right
+ step_25
+ step_end
RustboroCity_EventScript_14C5FF:: @ 814C5FF
lock
diff --git a/data/scripts/maps/RusturfTunnel.s b/data/scripts/maps/RusturfTunnel.s
index cd920e333..9922489cf 100644
--- a/data/scripts/maps/RusturfTunnel.s
+++ b/data/scripts/maps/RusturfTunnel.s
@@ -183,7 +183,24 @@ RusturfTunnel_Movement_15C951:: @ 815C951
step_down
step_end
- .incbin "baserom.gba", 0x15c95d, 0xd
+@ 815C95D
+ step_left
+ step_28
+ step_end
+
+@ 815C960
+ step_down
+ step_26
+ step_13
+ step_28
+ step_end
+
+@ 815C965
+ step_up
+ step_25
+ step_13
+ step_28
+ step_end
RusturfTunnel_Movement_15C96A:: @ 815C96A
step_left
diff --git a/data/scripts/maps/SSTidalCorridor.s b/data/scripts/maps/SSTidalCorridor.s
index c27c841eb..e5e8c0e7e 100644
--- a/data/scripts/maps/SSTidalCorridor.s
+++ b/data/scripts/maps/SSTidalCorridor.s
@@ -40,10 +40,12 @@ SSTidalRooms_EventScript_15FCF9:: @ 815FCF9
msgbox SSTidalRooms_Text_1990F8, 4
return
- .global gUnknown_0815FD0D
-gUnknown_0815FD0D: @ 815FD0D
-
- .incbin "baserom.gba", 0x15fd0d, 0x17
+gUnknown_0815FD0D:: @ 815FD0D
+ compare 0x40B4, 2
+ jumpeq SSTidalCorridor_EventScript_15FD24
+ compare 0x40B4, 7
+ jumpeq SSTidalCorridor_EventScript_15FD3A
+ end
SSTidalCorridor_EventScript_15FD24:: @ 815FD24
special 204
diff --git a/data/scripts/maps/SlateportCity.s b/data/scripts/maps/SlateportCity.s
index ca2c60a0c..97b128da3 100644
--- a/data/scripts/maps/SlateportCity.s
+++ b/data/scripts/maps/SlateportCity.s
@@ -439,7 +439,34 @@ SlateportCity_PokemartDecor_14BE40:: @ 814BE40
release
end
- .incbin "baserom.gba", 0x14be60, 0x3a
+@ 814BE60
+ lock
+ faceplayer
+ checkflag 96
+ jumpif 0, SlateportCity_EventScript_14BE16
+ message SlateportCity_Text_1A0BE4
+ waittext
+ pokemartdecor SlateportCity_PokemartDecor_14BE80
+ msgbox SlateportCity_Text_1A0C02, 4
+ release
+ end
+
+ .align 2
+SlateportCity_PokemartDecor_14BE80:: @ 814BE80
+ .2byte 39
+ .2byte 34
+ .2byte 35
+ .2byte 36
+ .2byte 37
+ .2byte 40
+ .2byte 33
+ .2byte 38
+ .2byte 45
+ .2byte 46
+ .2byte 47
+ .2byte 0
+ release
+ end
SlateportCity_EventScript_14BE9A:: @ 814BE9A
lock
diff --git a/data/scripts/maps/SlateportCity_ContestLobby.s b/data/scripts/maps/SlateportCity_ContestLobby.s
index 871f95f33..46b595034 100644
--- a/data/scripts/maps/SlateportCity_ContestLobby.s
+++ b/data/scripts/maps/SlateportCity_ContestLobby.s
@@ -126,5 +126,10 @@ SlateportCity_ContestLobby_EventScript_155536:: @ 8155536
msgbox SlateportCity_ContestLobby_Text_1B7225, 2
end
- .incbin "baserom.gba", 0x15553f, 0xc
-
+@ 815553F
+ lockall
+ special 259
+ waitbutton
+ hidebox 0, 0, 29, 19
+ releaseall
+ end
diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.s b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.s
index 1221fb845..d46d68dad 100644
--- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.s
@@ -6,7 +6,13 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196
sethealplace 10
end
- .incbin "baserom.gba", 0x15b19a, 0xe
+@ 815B19A
+ setvar 0x800B, 1
+ call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B
+ waittext
+ waitbutton
+ release
+ end
SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8
lock
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-25 22:12:15 +0000