summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/field_specials.s6
-rw-r--r--data/event_scripts.s2
-rw-r--r--data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc22
-rw-r--r--data/maps/RocketHideout_Elevator/scripts.inc14
-rw-r--r--data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc6
-rw-r--r--data/maps/SilphCo_Elevator/scripts.inc46
-rw-r--r--data/specials.inc2
-rw-r--r--include/constants/vars.h10
-rw-r--r--include/menews_jisan.h3
9 files changed, 54 insertions, 57 deletions
diff --git a/asm/field_specials.s b/asm/field_specials.s
index d7297ba13..eba95e9cf 100644
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -1591,8 +1591,8 @@ _080CB1FE:
bx r1
thumb_func_end Special_CheckAddCoins
- thumb_func_start sub_80CB204
-sub_80CB204: @ 80CB204
+ thumb_func_start Special_GetElevatorFloor
+Special_GetElevatorFloor: @ 80CB204
push {r4,lr}
movs r3, 0x4
ldr r0, _080CB22C @ =gSaveBlock1Ptr
@@ -1742,7 +1742,7 @@ _080CB314:
bx r0
.align 2, 0
_080CB324: .4byte 0x0000403a
- thumb_func_end sub_80CB204
+ thumb_func_end Special_GetElevatorFloor
thumb_func_start sub_80CB328
sub_80CB328: @ 80CB328
diff --git a/data/event_scripts.s b/data/event_scripts.s
index b311df6c2..8f9e8ae26 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -3004,7 +3004,7 @@ Movement_1A7AB7:: @ 81A7AB7
step_end
EventScript_1A7AB9:: @ 81A7AB9
- special sub_80CB204
+ special Special_GetElevatorFloor
return
EventScript_1A7ABD:: @ 81A7ABD
diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
index d2a28e9e2..c4d07baff 100644
--- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
@@ -6,7 +6,7 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
setvar VAR_0x8004, 3
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_1A7AB9
- copyvar VAR_0x8005, VAR_0x403A
+ copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special sub_80CB580
message Text_1A535C
waitmessage
@@ -61,50 +61,50 @@ EventScript_16C1F3:: @ 816C1F3
EventScript_16C246:: @ 816C246
setvar VAR_0x8006, 4
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1
- compare_var_to_value VAR_0x403A, 4
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 4
goto_if eq, EventScript_16C30E
call EventScript_16C313
- setvar VAR_0x403A, 4
+ setvar VAR_ELEVATOR_FLOOR, 4
goto EventScript_16C30E
end
EventScript_16C26E:: @ 816C26E
setvar VAR_0x8006, 5
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1
- compare_var_to_value VAR_0x403A, 5
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 5
goto_if eq, EventScript_16C30E
call EventScript_16C313
- setvar VAR_0x403A, 5
+ setvar VAR_ELEVATOR_FLOOR, 5
goto EventScript_16C30E
end
EventScript_16C296:: @ 816C296
setvar VAR_0x8006, 6
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1
- compare_var_to_value VAR_0x403A, 6
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 6
goto_if eq, EventScript_16C30E
call EventScript_16C313
- setvar VAR_0x403A, 6
+ setvar VAR_ELEVATOR_FLOOR, 6
goto EventScript_16C30E
end
EventScript_16C2BE:: @ 816C2BE
setvar VAR_0x8006, 7
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1
- compare_var_to_value VAR_0x403A, 7
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 7
goto_if eq, EventScript_16C30E
call EventScript_16C313
- setvar VAR_0x403A, 7
+ setvar VAR_ELEVATOR_FLOOR, 7
goto EventScript_16C30E
end
EventScript_16C2E6:: @ 816C2E6
setvar VAR_0x8006, 8
setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1
- compare_var_to_value VAR_0x403A, 8
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 8
goto_if eq, EventScript_16C30E
call EventScript_16C313
- setvar VAR_0x403A, 8
+ setvar VAR_ELEVATOR_FLOOR, 8
goto EventScript_16C30E
end
diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc
index 1b42f6345..c83bc7fd9 100644
--- a/data/maps/RocketHideout_Elevator/scripts.inc
+++ b/data/maps/RocketHideout_Elevator/scripts.inc
@@ -8,7 +8,7 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
setvar VAR_0x8004, 2
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_1A7AB9
- copyvar VAR_0x8005, VAR_0x403A
+ copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special sub_80CB580
message Text_1A535C
waitmessage
@@ -53,10 +53,10 @@ EventScript_161554:: @ 8161554
EventScript_161591:: @ 8161591
setvar VAR_0x8006, 3
setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25
- compare_var_to_value VAR_0x403A, 3
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 3
goto_if eq, EventScript_161609
call EventScript_16160E
- setvar VAR_0x403A, 3
+ setvar VAR_ELEVATOR_FLOOR, 3
goto EventScript_161609
EventScript_1615B8:: @ 81615B8
@@ -65,10 +65,10 @@ EventScript_1615B8:: @ 81615B8
EventScript_1615B9:: @ 81615B9
setvar VAR_0x8006, 2
setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16
- compare_var_to_value VAR_0x403A, 2
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 2
goto_if eq, EventScript_161609
call EventScript_16160E
- setvar VAR_0x403A, 2
+ setvar VAR_ELEVATOR_FLOOR, 2
goto EventScript_161609
EventScript_1615E0:: @ 81615E0
@@ -77,10 +77,10 @@ EventScript_1615E0:: @ 81615E0
EventScript_1615E1:: @ 81615E1
setvar VAR_0x8006, 0
setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23
- compare_var_to_value VAR_0x403A, 0
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 0
goto_if eq, EventScript_161609
call EventScript_16160E
- setvar VAR_0x403A, 0
+ setvar VAR_ELEVATOR_FLOOR, 0
goto EventScript_161609
EventScript_161608:: @ 8161608
diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
index 7623c5c59..b1fc46abd 100644
--- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
+++ b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
@@ -8,7 +8,7 @@ SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03
setvar VAR_0x8004, 6
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_1A7AB9
- copyvar VAR_0x8005, VAR_0x403A
+ copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special sub_80CB580
message Text_1A535C
waitmessage
@@ -40,10 +40,10 @@ EventScript_164B5E:: @ 8164B5E
EventScript_164B90:: @ 8164B90
setvar VAR_0x8006, 3
setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8
- compare_var_to_value VAR_0x403A, 3
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 3
goto_if eq, EventScript_164BD3
call EventScript_164BD8
- setvar VAR_0x403A, 3
+ setvar VAR_ELEVATOR_FLOOR, 3
special sub_80CB63C
delay 25
applymovement 255, Movement_164BE5
diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc
index 5883cf799..9338e5c6e 100644
--- a/data/maps/SilphCo_Elevator/scripts.inc
+++ b/data/maps/SilphCo_Elevator/scripts.inc
@@ -6,7 +6,7 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F
setvar VAR_0x8004, 1
checkflag FLAG_TEMP_2
call_if FALSE, EventScript_1A7AB9
- copyvar VAR_0x8005, VAR_0x403A
+ copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
special sub_80CB580
message Text_1A535C
waitmessage
@@ -33,10 +33,10 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F
EventScript_16202F:: @ 816202F
setvar VAR_0x8006, 4
setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3
- compare_var_to_value VAR_0x403A, 4
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 4
goto_if eq, EventScript_1621E7
call EventScript_1621EC
- setvar VAR_0x403A, 4
+ setvar VAR_ELEVATOR_FLOOR, 4
goto EventScript_1621E7
EventScript_162056:: @ 8162056
@@ -45,10 +45,10 @@ EventScript_162056:: @ 8162056
EventScript_162057:: @ 8162057
setvar VAR_0x8006, 5
setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3
- compare_var_to_value VAR_0x403A, 5
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 5
goto_if eq, EventScript_1621E7
call EventScript_1621EC
- setvar VAR_0x403A, 5
+ setvar VAR_ELEVATOR_FLOOR, 5
goto EventScript_1621E7
EventScript_16207E:: @ 816207E
@@ -57,10 +57,10 @@ EventScript_16207E:: @ 816207E
EventScript_16207F:: @ 816207F
setvar VAR_0x8006, 6
setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3
- compare_var_to_value VAR_0x403A, 6
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 6
goto_if eq, EventScript_1621E7
call EventScript_1621EC
- setvar VAR_0x403A, 6
+ setvar VAR_ELEVATOR_FLOOR, 6
goto EventScript_1621E7
EventScript_1620A6:: @ 81620A6
@@ -69,10 +69,10 @@ EventScript_1620A6:: @ 81620A6
EventScript_1620A7:: @ 81620A7
setvar VAR_0x8006, 7
setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3
- compare_var_to_value VAR_0x403A, 7
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 7
goto_if eq, EventScript_1621E7
call EventScript_1621EC
- setvar VAR_0x403A, 7
+ setvar VAR_ELEVATOR_FLOOR, 7
goto EventScript_1621E7
EventScript_1620CE:: @ 81620CE
@@ -81,10 +81,10 @@ EventScript_1620CE:: @ 81620CE
EventScript_1620CF:: @ 81620CF
setvar VAR_0x8006, 8
setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3
- compare_var_to_value VAR_0x403A, 8
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 8
goto_if eq, EventScript_1621E7
call EventScript_1621EC
- setvar VAR_0x403A, 8
+ setvar VAR_ELEVATOR_FLOOR, 8
goto EventScript_1621E7
EventScript_1620F6:: @ 81620F6
@@ -93,10 +93,10 @@ EventScript_1620F6:: @ 81620F6
EventScript_1620F7:: @ 81620F7
setvar VAR_0x8006, 9
setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3
- compare_var_to_value VAR_0x403A, 9
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 9
goto_if eq, EventScript_1621E7
call EventScript_1621EC
- setvar VAR_0x403A, 9
+ setvar VAR_ELEVATOR_FLOOR, 9
goto EventScript_1621E7
EventScript_16211E:: @ 816211E
@@ -105,10 +105,10 @@ EventScript_16211E:: @ 816211E
EventScript_16211F:: @ 816211F
setvar VAR_0x8006, 10
setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3
- compare_var_to_value VAR_0x403A, 10
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 10
goto_if eq, EventScript_1621E7
call EventScript_1621EC
- setvar VAR_0x403A, 10
+ setvar VAR_ELEVATOR_FLOOR, 10
goto EventScript_1621E7
EventScript_162146:: @ 8162146
@@ -117,10 +117,10 @@ EventScript_162146:: @ 8162146
EventScript_162147:: @ 8162147
setvar VAR_0x8006, 11
setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3
- compare_var_to_value VAR_0x403A, 11
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 11
goto_if eq, EventScript_1621E7
call EventScript_1621EC
- setvar VAR_0x403A, 11
+ setvar VAR_ELEVATOR_FLOOR, 11
goto EventScript_1621E7
EventScript_16216E:: @ 816216E
@@ -129,10 +129,10 @@ EventScript_16216E:: @ 816216E
EventScript_16216F:: @ 816216F
setvar VAR_0x8006, 12
setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3
- compare_var_to_value VAR_0x403A, 12
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 12
goto_if eq, EventScript_1621E7
call EventScript_1621EC
- setvar VAR_0x403A, 12
+ setvar VAR_ELEVATOR_FLOOR, 12
goto EventScript_1621E7
EventScript_162196:: @ 8162196
@@ -141,10 +141,10 @@ EventScript_162196:: @ 8162196
EventScript_162197:: @ 8162197
setvar VAR_0x8006, 13
setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3
- compare_var_to_value VAR_0x403A, 13
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 13
goto_if eq, EventScript_1621E7
call EventScript_1621EC
- setvar VAR_0x403A, 13
+ setvar VAR_ELEVATOR_FLOOR, 13
goto EventScript_1621E7
EventScript_1621BE:: @ 81621BE
@@ -153,10 +153,10 @@ EventScript_1621BE:: @ 81621BE
EventScript_1621BF:: @ 81621BF
setvar VAR_0x8006, 14
setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3
- compare_var_to_value VAR_0x403A, 14
+ compare_var_to_value VAR_ELEVATOR_FLOOR, 14
goto_if eq, EventScript_1621E7
call EventScript_1621EC
- setvar VAR_0x403A, 14
+ setvar VAR_ELEVATOR_FLOOR, 14
goto EventScript_1621E7
EventScript_1621E6:: @ 81621E6
diff --git a/data/specials.inc b/data/specials.inc
index 005648174..bfb649961 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -225,7 +225,7 @@ gSpecials:: @ 815FD60
def_special sub_80CA524
def_special sub_80CA86C
def_special sub_80CA9A8
- def_special sub_80CB204
+ def_special Special_GetElevatorFloor
def_special nullsub_75
def_special nullsub_75
def_special sub_80BF93C
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 327dbabc0..59dbf8ebb 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -100,11 +100,11 @@
#define VAR_0x4037 0x4037
#define VAR_0x4038 0x4038
#define VAR_0x4039 0x4039
-#define VAR_0x403A 0x403A
+#define VAR_ELEVATOR_FLOOR 0x403A
#define VAR_0x403B 0x403B
#define VAR_0x403C 0x403C
#define VAR_0x403D 0x403D
-#define VAR_DEOXYS_INTERACTION_NUM 0x403E
+#define VAR_DEOXYS_INTERACTION_NUM 0x403E
#define VAR_0x403F 0x403F
#define VAR_DAYS 0x4040
#define VAR_0x4041 0x4041
@@ -115,9 +115,9 @@
#define VAR_NATIONAL_DEX 0x4046
#define VAR_SEEDOT_SIZE_RECORD 0x4047
#define VAR_ASH_GATHER_COUNT 0x4048
-#define VAR_HOF_BRAG_STATE 0x4049
-#define VAR_EGG_BRAG_STATE 0x404A
-#define VAR_LINK_WIN_BRAG_STATE 0x404B
+#define VAR_HOF_BRAG_STATE 0x4049
+#define VAR_EGG_BRAG_STATE 0x404A
+#define VAR_LINK_WIN_BRAG_STATE 0x404B
#define VAR_POKELOT_RND2 0x404C
#define VAR_0x404D 0x404D
#define VAR_0x404E 0x404E
diff --git a/include/menews_jisan.h b/include/menews_jisan.h
index 277c8162b..8e1c251f9 100644
--- a/include/menews_jisan.h
+++ b/include/menews_jisan.h
@@ -3,9 +3,6 @@
#include "global.h"
-#define MENEWS_JISAN_NO_NEWS 0
-#define MENEWS_JISAN_
-
void MENewsJisan_SetRandomReward(u32 a0);
void MENewsJisanReset(void);
void MENewsJisanStepCounter(void);
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 16:06:22 +0000