From c236f2b9bc33715c8d6900b2a735310a38d8c503 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 31 Mar 2025 15:12:54 +0200 Subject: [PATCH] dungeon wind file --- data/data_8107010.s | 2 -- ld_script.txt | 3 ++- src/{code_807E1A0.c => dungeon_wind.c} | 19 ++++++------------- 3 files changed, 8 insertions(+), 16 deletions(-) rename src/{code_807E1A0.c => dungeon_wind.c} (84%) diff --git a/data/data_8107010.s b/data/data_8107010.s index 2134db64f..fd3e04b4d 100644 --- a/data/data_8107010.s +++ b/data/data_8107010.s @@ -18,6 +18,4 @@ .string "pksdir0\0" @ ??? .string "pksdir0\0" -@ ??? -.string "pksdir0\0" .align 2,0 \ No newline at end of file diff --git a/ld_script.txt b/ld_script.txt index 556b57c6c..817b0a7f1 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -268,7 +268,7 @@ SECTIONS { src/one_room_orb.o(.text); src/explosion.o(.text); src/switcher_orb.o(.text); - src/code_807E1A0.o(.text); + src/dungeon_wind.o(.text); src/weather.o(.text); src/code_807E5AC.o(.text); src/trap.o(.text); @@ -613,6 +613,7 @@ SECTIONS { data/pksdir_2.o(.rodata); src/explosion.o(.rodata); src/switcher_orb.o(.rodata); + src/dungeon_wind.o(.rodata); data/data_8107010.o(.rodata); src/dungeon_serializer.o(.rodata); data/data_8107224.o(.rodata); diff --git a/src/code_807E1A0.c b/src/dungeon_wind.c similarity index 84% rename from src/code_807E1A0.c rename to src/dungeon_wind.c index ee9054717..3479d0c23 100644 --- a/src/code_807E1A0.c +++ b/src/dungeon_wind.c @@ -1,4 +1,5 @@ #include "global.h" +#include "globaldata.h" #include "dungeon_misc.h" #include "code_804267C.h" #include "dungeon_message.h" @@ -10,6 +11,7 @@ #include "dungeon_logic.h" #include "dungeon_util.h" #include "dungeon_config.h" +#include "dungeon_strings.h" #include "move_util.h" #include "moves.h" #include "structs/str_dungeon.h" @@ -23,15 +25,6 @@ extern void sub_806F370(Entity *pokemon, Entity *target, u32, u32, u8 *, u8 move extern void sub_807EC28(bool8); extern void sub_806A5B8(Entity *); -extern u8 *gUnknown_80F9C4C[]; -extern u8 *gUnknown_80F9C70[]; -extern u8 *gUnknown_80F9C8C[]; -extern u8 *gUnknown_80F9CBC[]; -extern u8 *gUnknown_80FCAC0[]; - - - - void sub_807E378(void) { u16 uVar2; @@ -52,7 +45,7 @@ void sub_807E378(void) sub_806A2BC(leader,1); UseAttack(leader); if (sub_8044B28() == 0) { - LogMessageByIdWithPopupCheckUser(leader,*gUnknown_80F9C4C); + LogMessageByIdWithPopupCheckUser(leader,gUnknown_80F9C4C); sub_80426C8(gUnknown_80F5FAC[gDungeon->tileset],0); gDungeon->unk644.unk36 = 1; } @@ -64,7 +57,7 @@ void sub_807E378(void) sub_806A2BC(leader,1); UseAttack(leader); if (sub_8044B28() == 0) { - LogMessageByIdWithPopupCheckUser(leader,*gUnknown_80F9C70); + LogMessageByIdWithPopupCheckUser(leader,gUnknown_80F9C70); sub_80426C8(gUnknown_80F5FAC[gDungeon->tileset],1); gDungeon->unk644.unk36 = 2; } @@ -76,7 +69,7 @@ void sub_807E378(void) sub_806A2BC(leader,1); UseAttack(leader); if (sub_8044B28() == 0) { - LogMessageByIdWithPopupCheckUser(leader,*gUnknown_80F9C8C); + LogMessageByIdWithPopupCheckUser(leader,gUnknown_80F9C8C); sub_80426C8(gUnknown_80F5FAC[gDungeon->tileset],2); gDungeon->unk644.unk36 = 3; } @@ -87,7 +80,7 @@ void sub_807E378(void) sub_806A2BC(leader,1); UseAttack(leader); if (sub_8044B28() == 0) { - LogMessageByIdWithPopupCheckUser(leader,*gUnknown_80F9CBC); + LogMessageByIdWithPopupCheckUser(leader,gUnknown_80F9CBC); sub_80426C8(gUnknown_80F5FAC[gDungeon->tileset],3); gDungeon->unk644.unk36 = 4; sub_8068FE0(leader,0x21e,leader);