Leahnaya/pokegold
1
0
Fork 0
mirror of https://github.com/pret/pokegold.git synced 2026-10-01 03:16:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove the spurious WEATHER_*_END constants
Some checks are pending
CI / build (push) Waiting to run
Details
CI / build-macos (push) Waiting to run
Details

Browse Source 
These were probably a mistake from confusing two consecutive
pointer tables, `.WeatherMessages` and `.WeatherEndedMessages`,
with one long table
This commit is contained in:
Rangi
2026-06-07 21:32:02 -04:00
parent 20df8e864d
commit 4a557cfebd
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
constants/battle_constants.asm
View File

@@ -229,9 +229,7 @@ DEF ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP_MASK
const WEATHER_RAIN
const WEATHER_SUN
const WEATHER_SANDSTORM
const WEATHER_RAIN_END
const WEATHER_SUN_END
const WEATHER_SANDSTORM_END
DEF NUM_WEATHERS EQU const_value - 1
; wBattleAction
const_def

6
engine/battle/core.asm
View File

@@ -1700,7 +1700,7 @@ HandleWeather:
.ended
ld hl, .WeatherEndedMessages
call .PrintWeatherMessage
xor a
xor a ; WEATHER_NONE
ld [wBattleWeather], a
ret
@@ -1718,15 +1718,19 @@ HandleWeather:
.WeatherMessages:
; entries correspond to WEATHER_* constants
table_width 2
dw BattleText_RainContinuesToFall
dw BattleText_TheSunlightIsStrong
dw BattleText_TheSandstormRages
assert_table_length NUM_WEATHERS
.WeatherEndedMessages:
; entries correspond to WEATHER_* constants
table_width 2
dw BattleText_TheRainStopped
dw BattleText_TheSunlightFaded
dw BattleText_TheSandstormSubsided
assert_table_length NUM_WEATHERS
SubtractHPFromTarget:
call SubtractHP