Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-04-25 07:24:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved WEATHER_BALL_TYPE_TABLE to C

Browse Source
This commit is contained in:
AnonymousRandomPerson 2025-09-14 00:17:14 -04:00
parent 24ebfa50b2
commit 3fea459231
8 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
asm/include/overlay_10_rodata_022C464C.inc
View File

@ -1,2 +1 @@
#pragma once

1
asm/include/overlay_10_rodata_022C48E4.inc Normal file
View File

@ -0,0 +1 @@
#pragma once

12
asm/overlay_10_rodata_022C464C.s
View File

@ -485,15 +485,3 @@ ov10_022C48CC:
.global ov10_022C48D4
ov10_022C48D4:
.byte 0x4D, 0x00, 0x59, 0x00, 0x00, 0x00, 0x00, 0x00
.global WEATHER_BALL_TYPE_TABLE
WEATHER_BALL_TYPE_TABLE:
.byte 0x01, 0x02, 0x0D, 0x01, 0x03, 0x06, 0x01, 0x06
.global ov10_022C48E4
ov10_022C48E4:
.byte 0x20, 0x00, 0x20, 0x00, 0x47, 0x00, 0x47, 0x00
.global ov10_022C48EC
ov10_022C48EC:
.byte 0x00, 0x00, 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00
.global ov10_022C48F4
ov10_022C48F4:
.byte 0x7C, 0x05, 0x79, 0x05, 0x7A, 0x05, 0x7B, 0x05, 0x00, 0x00, 0x00, 0x00

13
asm/overlay_10_rodata_022C48E4.s Normal file
View File

@ -0,0 +1,13 @@
.include "asm/macros.inc"
.include "overlay_10_rodata_022C48E4.inc"
.rodata
.global ov10_022C48E4
ov10_022C48E4:
.byte 0x20, 0x00, 0x20, 0x00, 0x47, 0x00, 0x47, 0x00
.global ov10_022C48EC
ov10_022C48EC:
.byte 0x00, 0x00, 0x64, 0x00, 0x1E, 0x00, 0x1E, 0x00
.global ov10_022C48F4
ov10_022C48F4:
.byte 0x7C, 0x05, 0x79, 0x05, 0x7A, 0x05, 0x7B, 0x05, 0x00, 0x00, 0x00, 0x00

8
include/dungeon_parameters_2.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef PMDSKY_DUNGEON_PARAMETERS_1_H
#define PMDSKY_DUNGEON_PARAMETERS_1_H
#include "enums.h"
extern const enum type_id WEATHER_BALL_TYPE_TABLE[8];
#endif //PMDSKY_DUNGEON_PARAMETERS_1_H

2
main.lsf
View File

@ -203,6 +203,8 @@ Overlay OVY_10
Object asm/overlay_10_rodata_022C4584.o
Object src/dungeon_parameters_1.o
Object asm/overlay_10_rodata_022C464C.o
Object src/dungeon_parameters_2.o
Object asm/overlay_10_rodata_022C48E4.o
Object src/dungeon_ai_parameters.o
Object asm/overlay_10_rodata_022C490C.o
Object src/natural_gift_data.o

12
src/dungeon_parameters_2.c Normal file
View File

@ -0,0 +1,12 @@
#include "dungeon_parameters_2.h"
const enum type_id WEATHER_BALL_TYPE_TABLE[8] = {
TYPE_NORMAL,
TYPE_FIRE,
TYPE_ROCK,
TYPE_NORMAL,
TYPE_WATER,
TYPE_ICE,
TYPE_NORMAL,
TYPE_ICE
};

3
src/special_move_types.c
View File

@ -1,11 +1,10 @@
#include "special_move_types.h"
#include "dungeon_parameters_2.h"
#include "dungeon_util_static.h"
#include "natural_gift_data.h"
#include "overlay_29_0231A9D4.h"
#include "weather.h"
extern enum type_id WEATHER_BALL_TYPE_TABLE[8];
const struct natural_gift_item_info* GetEntityNaturalGiftInfo(struct entity* entity)
{
if (IsMonster__0231A9D4(entity)) {